From: DongHun Kwak Date: Mon, 16 Oct 2017 11:03:16 +0000 (+0900) Subject: Imported Upstream version 3.6.0 X-Git-Tag: upstream/3.6.3~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F155903%2F1;p=platform%2Fupstream%2Fpython3.git Imported Upstream version 3.6.0 Change-Id: I22cf884321a13b63f2eeb2e20f9ebef3ab00860e Signed-off-by: DongHun Kwak --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..4ce80d8 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,9 @@ +## CPython Mirror + +https://github.com/python/cpython is a cpython mirror repository. Pull requests +are not accepted on this repo and will be automatically closed. + +### Submit patches at https://bugs.python.org + +For additional information about contributing to CPython, see the +[developer's guide](https://docs.python.org/devguide/#contributing). diff --git a/Doc/Makefile b/Doc/Makefile index 04da82f..91f937f 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -4,14 +4,13 @@ # # You can set these variables from the command line. -PYTHON = python3 +PYTHON = python SPHINXBUILD = sphinx-build -BLURB = $(PYTHON) -m blurb PAPER = SOURCES = DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) -ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \ +ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) .PHONY: help build html htmlhelp latex text changes linkcheck \ @@ -39,20 +38,6 @@ help: @echo " serve to serve the documentation on the localhost (8000)" build: - -mkdir -p build -# Look first for a Misc/NEWS file (building from a source release tarball -# or old repo) and use that, otherwise look for a Misc/NEWS.d directory -# (building from a newer repo) and use blurb to generate the NEWS file. - @if [ -f ../Misc/NEWS ] ; then \ - echo "Using existing Misc/NEWS file"; \ - cp ../Misc/NEWS build/NEWS; \ - elif [ -d ../Misc/NEWS.d ]; then \ - echo "Building NEWS from Misc/NEWS.d with blurb"; \ - $(BLURB) merge -f build/NEWS; \ - else \ - echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \ - exit 1; \ - fi $(SPHINXBUILD) $(ALLSPHINXOPTS) @echo @@ -122,7 +107,7 @@ clean: venv: $(PYTHON) -m venv venv - ./venv/bin/python3 -m pip install -U Sphinx blurb + ./venv/bin/python3 -m pip install -U Sphinx dist: rm -rf dist @@ -168,7 +153,7 @@ dist: cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub check: - $(PYTHON) tools/rstlint.py -i tools + $(PYTHON) tools/rstlint.py -i tools -i venv serve: ../Tools/scripts/serve.py build/html diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index 1123972..e8e7e0d 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -223,8 +223,7 @@ which disallows mutable objects such as :class:`bytearray`. :c:func:`PyArg_ParseTuple` will use this location as the buffer and interpret the initial value of *\*buffer_length* as the buffer size. It will then copy the encoded data into the buffer and NUL-terminate it. If the buffer is not large - enough, a :exc:`TypeError` will be set. - Note: starting from Python 3.6 a :exc:`ValueError` will be set. + enough, a :exc:`ValueError` will be set. In both cases, *\*buffer_length* is set to the length of the encoded data without the trailing NUL byte. @@ -266,15 +265,12 @@ Numbers Convert a Python integer to a C :c:type:`unsigned long` without overflow checking. -``L`` (:class:`int`) [PY_LONG_LONG] - Convert a Python integer to a C :c:type:`long long`. This format is only - available on platforms that support :c:type:`long long` (or :c:type:`_int64` on - Windows). +``L`` (:class:`int`) [long long] + Convert a Python integer to a C :c:type:`long long`. -``K`` (:class:`int`) [unsigned PY_LONG_LONG] +``K`` (:class:`int`) [unsigned long long] Convert a Python integer to a C :c:type:`unsigned long long` - without overflow checking. This format is only available on platforms that - support :c:type:`unsigned long long` (or :c:type:`unsigned _int64` on Windows). + without overflow checking. ``n`` (:class:`int`) [Py_ssize_t] Convert a Python integer to a C :c:type:`Py_ssize_t`. @@ -424,8 +420,15 @@ API Functions .. c:function:: int PyArg_ParseTupleAndKeywords(PyObject *args, PyObject *kw, const char *format, char *keywords[], ...) Parse the parameters of a function that takes both positional and keyword - parameters into local variables. Returns true on success; on failure, it - returns false and raises the appropriate exception. + parameters into local variables. The *keywords* argument is a + *NULL*-terminated array of keyword parameter names. Empty names denote + :ref:`positional-only parameters `. + Returns true on success; on failure, it returns false and raises the + appropriate exception. + + .. versionchanged:: 3.6 + Added support for :ref:`positional-only parameters + `. .. c:function:: int PyArg_VaParseTupleAndKeywords(PyObject *args, PyObject *kw, const char *format, char *keywords[], va_list vargs) @@ -588,15 +591,11 @@ Building values ``k`` (:class:`int`) [unsigned long] Convert a C :c:type:`unsigned long` to a Python integer object. - ``L`` (:class:`int`) [PY_LONG_LONG] - Convert a C :c:type:`long long` to a Python integer object. Only available - on platforms that support :c:type:`long long` (or :c:type:`_int64` on - Windows). + ``L`` (:class:`int`) [long long] + Convert a C :c:type:`long long` to a Python integer object. - ``K`` (:class:`int`) [unsigned PY_LONG_LONG] - Convert a C :c:type:`unsigned long long` to a Python integer object. Only - available on platforms that support :c:type:`unsigned long long` (or - :c:type:`unsigned _int64` on Windows). + ``K`` (:class:`int`) [unsigned long long] + Convert a C :c:type:`unsigned long long` to a Python integer object. ``n`` (:class:`int`) [Py_ssize_t] Convert a C :c:type:`Py_ssize_t` to a Python integer. diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index 6454eb5..ee51791 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -291,16 +291,28 @@ an error value). is the function calling :c:func:`PyErr_WarnEx`, 2 is the function above that, and so forth. - Warning categories must be subclasses of :c:data:`PyExc_Warning`; - :c:data:`PyExc_Warning` is a subclass of :c:data:`PyExc_Exception`; - the default warning category is :c:data:`PyExc_RuntimeWarning`. The standard - Python warning categories are available as global variables whose names are - enumerated at :ref:`standardwarningcategories`. + Warning categories must be subclasses of :c:data:`Warning`; the default warning + category is :c:data:`RuntimeWarning`. The standard Python warning categories are + available as global variables whose names are ``PyExc_`` followed by the Python + exception name. These have the type :c:type:`PyObject\*`; they are all class + objects. Their names are :c:data:`PyExc_Warning`, :c:data:`PyExc_UserWarning`, + :c:data:`PyExc_UnicodeWarning`, :c:data:`PyExc_DeprecationWarning`, + :c:data:`PyExc_SyntaxWarning`, :c:data:`PyExc_RuntimeWarning`, and + :c:data:`PyExc_FutureWarning`. :c:data:`PyExc_Warning` is a subclass of + :c:data:`PyExc_Exception`; the other warning categories are subclasses of + :c:data:`PyExc_Warning`. For information about warning control, see the documentation for the :mod:`warnings` module and the :option:`-W` option in the command line documentation. There is no C API for warning control. +.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *msg, PyObject *name, PyObject *path) + + Much like :c:func:`PyErr_SetImportError` but this function allows for + specifying a subclass of :exc:`ImportError` to raise. + + .. versionadded:: 3.6 + .. c:function:: int PyErr_WarnExplicitObject(PyObject *category, PyObject *message, PyObject *filename, int lineno, PyObject *module, PyObject *registry) @@ -329,6 +341,14 @@ an error value). .. versionadded:: 3.2 +.. c:function:: int PyErr_ResourceWarning(PyObject *source, Py_ssize_t stack_level, const char *format, ...) + + Function similar to :c:func:`PyErr_WarnFormat`, but *category* is + :exc:`ResourceWarning` and pass *source* to :func:`warnings.WarningMessage`. + + .. versionadded:: 3.6 + + Querying the error indicator ============================ @@ -376,7 +396,7 @@ Querying the error indicator by code that needs to save and restore the error indicator temporarily, e.g.:: { - PyObject *type, *value, *traceback; + PyObject **type, **value, **traceback; PyErr_Fetch(&type, &value, &traceback); /* ... code that might produce other errors ... */ @@ -730,60 +750,6 @@ All standard Python exceptions are available as global variables whose names are :c:type:`PyObject\*`; they are all class objects. For completeness, here are all the variables: -.. index:: - single: PyExc_BaseException - single: PyExc_Exception - single: PyExc_ArithmeticError - single: PyExc_AssertionError - single: PyExc_AttributeError - single: PyExc_BlockingIOError - single: PyExc_BrokenPipeError - single: PyExc_BufferError - single: PyExc_ChildProcessError - single: PyExc_ConnectionAbortedError - single: PyExc_ConnectionError - single: PyExc_ConnectionRefusedError - single: PyExc_ConnectionResetError - single: PyExc_EOFError - single: PyExc_FileExistsError - single: PyExc_FileNotFoundError - single: PyExc_FloatingPointError - single: PyExc_GeneratorExit - single: PyExc_ImportError - single: PyExc_IndentationError - single: PyExc_IndexError - single: PyExc_InterruptedError - single: PyExc_IsADirectoryError - single: PyExc_KeyError - single: PyExc_KeyboardInterrupt - single: PyExc_LookupError - single: PyExc_MemoryError - single: PyExc_NameError - single: PyExc_NotADirectoryError - single: PyExc_NotImplementedError - single: PyExc_OSError - single: PyExc_OverflowError - single: PyExc_PermissionError - single: PyExc_ProcessLookupError - single: PyExc_RecursionError - single: PyExc_ReferenceError - single: PyExc_RuntimeError - single: PyExc_StopAsyncIteration - single: PyExc_StopIteration - single: PyExc_SyntaxError - single: PyExc_SystemError - single: PyExc_SystemExit - single: PyExc_TabError - single: PyExc_TimeoutError - single: PyExc_TypeError - single: PyExc_UnboundLocalError - single: PyExc_UnicodeDecodeError - single: PyExc_UnicodeEncodeError - single: PyExc_UnicodeError - single: PyExc_UnicodeTranslateError - single: PyExc_ValueError - single: PyExc_ZeroDivisionError - +-----------------------------------------+---------------------------------+----------+ | C Name | Python Name | Notes | +=========================================+=================================+==========+ @@ -793,6 +759,8 @@ the variables: +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ArithmeticError` | :exc:`ArithmeticError` | \(1) | +-----------------------------------------+---------------------------------+----------+ +| :c:data:`PyExc_LookupError` | :exc:`LookupError` | \(1) | ++-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_AssertionError` | :exc:`AssertionError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_AttributeError` | :exc:`AttributeError` | | @@ -801,31 +769,27 @@ the variables: +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_BrokenPipeError` | :exc:`BrokenPipeError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_BufferError` | :exc:`BufferError` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ChildProcessError` | :exc:`ChildProcessError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_ConnectionAbortedError` | :exc:`ConnectionAbortedError` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ConnectionError` | :exc:`ConnectionError` | | +-----------------------------------------+---------------------------------+----------+ +| :c:data:`PyExc_ConnectionAbortedError` | :exc:`ConnectionAbortedError` | | ++-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ConnectionRefusedError` | :exc:`ConnectionRefusedError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ConnectionResetError` | :exc:`ConnectionResetError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_EOFError` | :exc:`EOFError` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_FileExistsError` | :exc:`FileExistsError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_FileNotFoundError` | :exc:`FileNotFoundError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_FloatingPointError` | :exc:`FloatingPointError` | | +| :c:data:`PyExc_EOFError` | :exc:`EOFError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_GeneratorExit` | :exc:`GeneratorExit` | | +| :c:data:`PyExc_FloatingPointError` | :exc:`FloatingPointError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ImportError` | :exc:`ImportError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_IndentationError` | :exc:`IndentationError` | | +| :c:data:`PyExc_ModuleNotFoundError` | :exc:`ModuleNotFoundError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_IndexError` | :exc:`IndexError` | | +-----------------------------------------+---------------------------------+----------+ @@ -837,8 +801,6 @@ the variables: +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_KeyboardInterrupt` | :exc:`KeyboardInterrupt` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_LookupError` | :exc:`LookupError` | \(1) | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_MemoryError` | :exc:`MemoryError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_NameError` | :exc:`NameError` | | @@ -861,31 +823,15 @@ the variables: +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_RuntimeError` | :exc:`RuntimeError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_StopAsyncIteration` | :exc:`StopAsyncIteration` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_StopIteration` | :exc:`StopIteration` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_SyntaxError` | :exc:`SyntaxError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_SystemError` | :exc:`SystemError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_SystemExit` | :exc:`SystemExit` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_TabError` | :exc:`TabError` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_TimeoutError` | :exc:`TimeoutError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_TypeError` | :exc:`TypeError` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnboundLocalError` | :exc:`UnboundLocalError` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnicodeDecodeError` | :exc:`UnicodeDecodeError` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnicodeEncodeError` | :exc:`UnicodeEncodeError` | | -+-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnicodeError` | :exc:`UnicodeError` | | +| :c:data:`PyExc_SystemExit` | :exc:`SystemExit` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnicodeTranslateError` | :exc:`UnicodeTranslateError` | | +| :c:data:`PyExc_TypeError` | :exc:`TypeError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ValueError` | :exc:`ValueError` | | +-----------------------------------------+---------------------------------+----------+ @@ -903,14 +849,10 @@ the variables: and :c:data:`PyExc_TimeoutError` were introduced following :pep:`3151`. .. versionadded:: 3.5 - :c:data:`PyExc_StopAsyncIteration` and :c:data:`PyExc_RecursionError`. + :c:data:`PyExc_RecursionError`. -These are compatibility aliases to :c:data:`PyExc_OSError`: -.. index:: - single: PyExc_EnvironmentError - single: PyExc_IOError - single: PyExc_WindowsError +These are compatibility aliases to :c:data:`PyExc_OSError`: +-------------------------------------+----------+ | C Name | Notes | @@ -925,6 +867,52 @@ These are compatibility aliases to :c:data:`PyExc_OSError`: .. versionchanged:: 3.3 These aliases used to be separate exception types. + +.. index:: + single: PyExc_BaseException + single: PyExc_Exception + single: PyExc_ArithmeticError + single: PyExc_LookupError + single: PyExc_AssertionError + single: PyExc_AttributeError + single: PyExc_BlockingIOError + single: PyExc_BrokenPipeError + single: PyExc_ConnectionError + single: PyExc_ConnectionAbortedError + single: PyExc_ConnectionRefusedError + single: PyExc_ConnectionResetError + single: PyExc_EOFError + single: PyExc_FileExistsError + single: PyExc_FileNotFoundError + single: PyExc_FloatingPointError + single: PyExc_ImportError + single: PyExc_IndexError + single: PyExc_InterruptedError + single: PyExc_IsADirectoryError + single: PyExc_KeyError + single: PyExc_KeyboardInterrupt + single: PyExc_MemoryError + single: PyExc_NameError + single: PyExc_NotADirectoryError + single: PyExc_NotImplementedError + single: PyExc_OSError + single: PyExc_OverflowError + single: PyExc_PermissionError + single: PyExc_ProcessLookupError + single: PyExc_RecursionError + single: PyExc_ReferenceError + single: PyExc_RuntimeError + single: PyExc_SyntaxError + single: PyExc_SystemError + single: PyExc_SystemExit + single: PyExc_TimeoutError + single: PyExc_TypeError + single: PyExc_ValueError + single: PyExc_ZeroDivisionError + single: PyExc_EnvironmentError + single: PyExc_IOError + single: PyExc_WindowsError + Notes: (1) @@ -936,60 +924,3 @@ Notes: (3) Only defined on Windows; protect code that uses this by testing that the preprocessor macro ``MS_WINDOWS`` is defined. - -.. _standardwarningcategories: - -Standard Warning Categories -=========================== - -All standard Python warning categories are available as global variables whose -names are ``PyExc_`` followed by the Python exception name. These have the type -:c:type:`PyObject\*`; they are all class objects. For completeness, here are all -the variables: - -.. index:: - single: PyExc_Warning - single: PyExc_BytesWarning - single: PyExc_DeprecationWarning - single: PyExc_FutureWarning - single: PyExc_ImportWarning - single: PyExc_PendingDeprecationWarning - single: PyExc_ResourceWarning - single: PyExc_RuntimeWarning - single: PyExc_SyntaxWarning - single: PyExc_UnicodeWarning - single: PyExc_UserWarning - -+------------------------------------------+---------------------------------+----------+ -| C Name | Python Name | Notes | -+==========================================+=================================+==========+ -| :c:data:`PyExc_Warning` | :exc:`Warning` | \(1) | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_BytesWarning` | :exc:`BytesWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_DeprecationWarning` | :exc:`DeprecationWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_FutureWarning` | :exc:`FutureWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_ImportWarning` | :exc:`ImportWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_PendingDeprecationWarning`| :exc:`PendingDeprecationWarning`| | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_ResourceWarning` | :exc:`ResourceWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_RuntimeWarning` | :exc:`RuntimeWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_SyntaxWarning` | :exc:`SyntaxWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UnicodeWarning` | :exc:`UnicodeWarning` | | -+------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_UserWarning` | :exc:`UserWarning` | | -+------------------------------------------+---------------------------------+----------+ - -.. versionadded:: 3.2 - :c:data:`PyExc_ResourceWarning`. - -Notes: - -(1) - This is a base class for other standard warning categories. diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 70b98ae..2965bc9 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -25,7 +25,7 @@ Initializing and finalizing the interpreter triple: module; search; path single: PySys_SetArgv() single: PySys_SetArgvEx() - single: Py_Finalize() + single: Py_FinalizeEx() Initialize the Python interpreter. In an application embedding Python, this should be called before using any other Python/C API functions; with the @@ -34,7 +34,7 @@ Initializing and finalizing the interpreter modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`. It also initializes the module search path (``sys.path``). It does not set ``sys.argv``; use :c:func:`PySys_SetArgvEx` for that. This is a no-op when called for a second time - (without calling :c:func:`Py_Finalize` first). There is no return value; it is a + (without calling :c:func:`Py_FinalizeEx` first). There is no return value; it is a fatal error if the initialization fails. .. note:: @@ -52,19 +52,20 @@ Initializing and finalizing the interpreter .. c:function:: int Py_IsInitialized() Return true (nonzero) when the Python interpreter has been initialized, false - (zero) if not. After :c:func:`Py_Finalize` is called, this returns false until + (zero) if not. After :c:func:`Py_FinalizeEx` is called, this returns false until :c:func:`Py_Initialize` is called again. -.. c:function:: void Py_Finalize() +.. c:function:: int Py_FinalizeEx() Undo all initializations made by :c:func:`Py_Initialize` and subsequent use of Python/C API functions, and destroy all sub-interpreters (see :c:func:`Py_NewInterpreter` below) that were created and not yet destroyed since the last call to :c:func:`Py_Initialize`. Ideally, this frees all memory allocated by the Python interpreter. This is a no-op when called for a second - time (without calling :c:func:`Py_Initialize` again first). There is no return - value; errors during finalization are ignored. + time (without calling :c:func:`Py_Initialize` again first). Normally the + return value is 0. If there were errors during finalization + (flushing buffered data), -1 is returned. This function is provided for a number of reasons. An embedding application might want to restart Python without having to restart the application itself. @@ -83,7 +84,15 @@ Initializing and finalizing the interpreter freed. Some memory allocated by extension modules may not be freed. Some extensions may not work properly if their initialization routine is called more than once; this can happen if an application calls :c:func:`Py_Initialize` and - :c:func:`Py_Finalize` more than once. + :c:func:`Py_FinalizeEx` more than once. + + .. versionadded:: 3.6 + + +.. c:function:: void Py_Finalize() + + This is a backwards-compatible version of :c:func:`Py_FinalizeEx` that + disregards the return value. Process-wide parameters @@ -111,7 +120,7 @@ Process-wide parameters Note that :data:`sys.stderr` always uses the "backslashreplace" error handler, regardless of this (or any other) setting. - If :c:func:`Py_Finalize` is called, this function will need to be called + If :c:func:`Py_FinalizeEx` is called, this function will need to be called again in order to affect subsequent calls to :c:func:`Py_Initialize`. Returns ``0`` if successful, a nonzero value on error (e.g. calling after the @@ -922,7 +931,7 @@ using the following functions: entry.) .. index:: - single: Py_Finalize() + single: Py_FinalizeEx() single: Py_Initialize() Extension modules are shared between (sub-)interpreters as follows: the first @@ -932,7 +941,7 @@ using the following functions: and filled with the contents of this copy; the extension's ``init`` function is not called. Note that this is different from what happens when an extension is imported after the interpreter has been completely re-initialized by calling - :c:func:`Py_Finalize` and :c:func:`Py_Initialize`; in that case, the extension's + :c:func:`Py_FinalizeEx` and :c:func:`Py_Initialize`; in that case, the extension's ``initmodule`` function *is* called again. .. index:: single: close() (in module os) @@ -940,14 +949,14 @@ using the following functions: .. c:function:: void Py_EndInterpreter(PyThreadState *tstate) - .. index:: single: Py_Finalize() + .. index:: single: Py_FinalizeEx() Destroy the (sub-)interpreter represented by the given thread state. The given thread state must be the current thread state. See the discussion of thread states below. When the call returns, the current thread state is *NULL*. All thread states associated with this interpreter are destroyed. (The global interpreter lock must be held before calling this function and is still held - when it returns.) :c:func:`Py_Finalize` will destroy all sub-interpreters that + when it returns.) :c:func:`Py_FinalizeEx` will destroy all sub-interpreters that haven't been explicitly destroyed at that point. diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst index bc3a752..74681d2 100644 --- a/Doc/c-api/intro.rst +++ b/Doc/c-api/intro.rst @@ -64,9 +64,10 @@ The header files are typically installed with Python. On Unix, these are located in the directories :file:`{prefix}/include/pythonversion/` and :file:`{exec_prefix}/include/pythonversion/`, where :envvar:`prefix` and :envvar:`exec_prefix` are defined by the corresponding parameters to Python's -:program:`configure` script and *version* is ``sys.version[:3]``. On Windows, -the headers are installed in :file:`{prefix}/include`, where :envvar:`prefix` is -the installation directory specified to the installer. +:program:`configure` script and *version* is +``'%d.%d' % sys.version_info[:2]``. On Windows, the headers are installed +in :file:`{prefix}/include`, where :envvar:`prefix` is the installation +directory specified to the installer. To include the headers, place both directories (if different) on your compiler's search path for includes. Do *not* place the parent directories on the search @@ -578,9 +579,9 @@ Sometimes, it is desirable to "uninitialize" Python. For instance, the application may want to start over (make another call to :c:func:`Py_Initialize`) or the application is simply done with its use of Python and wants to free memory allocated by Python. This can be accomplished -by calling :c:func:`Py_Finalize`. The function :c:func:`Py_IsInitialized` returns +by calling :c:func:`Py_FinalizeEx`. The function :c:func:`Py_IsInitialized` returns true if Python is currently in the initialized state. More information about -these functions is given in a later chapter. Notice that :c:func:`Py_Finalize` +these functions is given in a later chapter. Notice that :c:func:`Py_FinalizeEx` does *not* free all memory allocated by the Python interpreter, e.g. memory allocated by extension modules currently cannot be released. diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst index 78e555c..f592cb6 100644 --- a/Doc/c-api/long.rst +++ b/Doc/c-api/long.rst @@ -62,13 +62,13 @@ All integers are implemented as "long" integer objects of arbitrary size. *NULL* on failure. -.. c:function:: PyObject* PyLong_FromLongLong(PY_LONG_LONG v) +.. c:function:: PyObject* PyLong_FromLongLong(long long v) Return a new :c:type:`PyLongObject` object from a C :c:type:`long long`, or *NULL* on failure. -.. c:function:: PyObject* PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG v) +.. c:function:: PyObject* PyLong_FromUnsignedLongLong(unsigned long long v) Return a new :c:type:`PyLongObject` object from a C :c:type:`unsigned long long`, or *NULL* on failure. @@ -85,12 +85,13 @@ All integers are implemented as "long" integer objects of arbitrary size. Return a new :c:type:`PyLongObject` based on the string value in *str*, which is interpreted according to the radix in *base*. If *pend* is non-*NULL*, *\*pend* will point to the first character in *str* which follows the - representation of the number. If *base* is ``0``, *str* is interpreted using - the :ref:`integers` definition; in this case, leading zeros in a - non-zero decimal number raises a :exc:`ValueError`. If *base* is not ``0``, - it must be between ``2`` and ``36``, inclusive. Leading spaces and single - underscores after a base specifier and between digits are ignored. If there - are no digits, :exc:`ValueError` will be raised. + representation of the number. If *base* is ``0``, the radix will be + determined based on the leading characters of *str*: if *str* starts with + ``'0x'`` or ``'0X'``, radix 16 will be used; if *str* starts with ``'0o'`` or + ``'0O'``, radix 8 will be used; if *str* starts with ``'0b'`` or ``'0B'``, + radix 2 will be used; otherwise radix 10 will be used. If *base* is not + ``0``, it must be between ``2`` and ``36``, inclusive. Leading spaces are + ignored. If there are no digits, :exc:`ValueError` will be raised. .. c:function:: PyObject* PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base) @@ -147,7 +148,7 @@ All integers are implemented as "long" integer objects of arbitrary size. occurs set *\*overflow* to ``0`` and return ``-1`` as usual. -.. c:function:: PY_LONG_LONG PyLong_AsLongLong(PyObject *obj) +.. c:function:: long long PyLong_AsLongLong(PyObject *obj) .. index:: single: OverflowError (built-in exception) @@ -160,7 +161,7 @@ All integers are implemented as "long" integer objects of arbitrary size. :c:type:`long`. -.. c:function:: PY_LONG_LONG PyLong_AsLongLongAndOverflow(PyObject *obj, int *overflow) +.. c:function:: long long PyLong_AsLongLongAndOverflow(PyObject *obj, int *overflow) Return a C :c:type:`long long` representation of *obj*. If *obj* is not an instance of :c:type:`PyLongObject`, first call its :meth:`__int__` method @@ -209,16 +210,16 @@ All integers are implemented as "long" integer objects of arbitrary size. :c:type:`size_t`. -.. c:function:: unsigned PY_LONG_LONG PyLong_AsUnsignedLongLong(PyObject *pylong) +.. c:function:: unsigned long long PyLong_AsUnsignedLongLong(PyObject *pylong) .. index:: single: OverflowError (built-in exception) - Return a C :c:type:`unsigned PY_LONG_LONG` representation of *pylong*. - *pylong* must be an instance of :c:type:`PyLongObject`. + Return a C :c:type:`unsigned long long` representation of *pylong*. *pylong* + must be an instance of :c:type:`PyLongObject`. Raise :exc:`OverflowError` if the value of *pylong* is out of range for an - :c:type:`unsigned PY_LONG_LONG`. + :c:type:`unsigned long long`. .. versionchanged:: 3.1 A negative *pylong* now raises :exc:`OverflowError`, not :exc:`TypeError`. @@ -234,7 +235,7 @@ All integers are implemented as "long" integer objects of arbitrary size. return the reduction of that value modulo ``ULONG_MAX + 1``. -.. c:function:: unsigned PY_LONG_LONG PyLong_AsUnsignedLongLongMask(PyObject *obj) +.. c:function:: unsigned long long PyLong_AsUnsignedLongLongMask(PyObject *obj) Return a C :c:type:`unsigned long long` representation of *obj*. If *obj* is not an instance of :c:type:`PyLongObject`, first call its :meth:`__int__` diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst index c6d1d02..a6d0f46 100644 --- a/Doc/c-api/marshal.rst +++ b/Doc/c-api/marshal.rst @@ -34,7 +34,7 @@ unmarshalling. Version 2 uses a binary format for floating point numbers. .. c:function:: PyObject* PyMarshal_WriteObjectToString(PyObject *value, int version) - Return a bytes object containing the marshalled representation of *value*. + Return a string object containing the marshalled representation of *value*. *version* indicates the file format. @@ -88,10 +88,10 @@ written using these routines? :exc:`TypeError`) and returns *NULL*. -.. c:function:: PyObject* PyMarshal_ReadObjectFromString(const char *data, Py_ssize_t len) +.. c:function:: PyObject* PyMarshal_ReadObjectFromString(const char *string, Py_ssize_t len) - Return a Python object from the data stream in a byte buffer - containing *len* bytes pointed to by *data*. + Return a Python object from the data stream in a character buffer + containing *len* bytes pointed to by *string*. On error, sets the appropriate exception (:exc:`EOFError` or :exc:`TypeError`) and returns *NULL*. diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst index 290ef09..3ff5452 100644 --- a/Doc/c-api/memory.rst +++ b/Doc/c-api/memory.rst @@ -85,9 +85,12 @@ for the I/O buffer escapes completely the Python memory manager. .. seealso:: + The :envvar:`PYTHONMALLOC` environment variable can be used to configure + the memory allocators used by Python. + The :envvar:`PYTHONMALLOCSTATS` environment variable can be used to print - memory allocation statistics every time a new object arena is created, and - on shutdown. + statistics of the :ref:`pymalloc memory allocator ` every time a + new pymalloc object arena is created, and on shutdown. Raw Memory Interface @@ -162,15 +165,17 @@ The following function sets, modeled after the ANSI C standard, but specifying behavior when requesting zero bytes, are available for allocating and releasing memory from the Python heap. -The default memory block allocator uses the following functions: -:c:func:`malloc`, :c:func:`calloc`, :c:func:`realloc` and :c:func:`free`; call -``malloc(1)`` (or ``calloc(1, 1)``) when requesting zero bytes. +By default, these functions use :ref:`pymalloc memory allocator `. .. warning:: The :term:`GIL ` must be held when using these functions. +.. versionchanged:: 3.6 + + The default allocator is now pymalloc instead of system :c:func:`malloc`. + .. c:function:: void* PyMem_Malloc(size_t n) Allocates *n* bytes and returns a pointer of type :c:type:`void\*` to the @@ -292,15 +297,32 @@ Customize Memory Allocators Enum used to identify an allocator domain. Domains: - * :c:data:`PYMEM_DOMAIN_RAW`: functions :c:func:`PyMem_RawMalloc`, - :c:func:`PyMem_RawRealloc`, :c:func:`PyMem_RawCalloc` and - :c:func:`PyMem_RawFree` - * :c:data:`PYMEM_DOMAIN_MEM`: functions :c:func:`PyMem_Malloc`, - :c:func:`PyMem_Realloc`, :c:func:`PyMem_Calloc` and :c:func:`PyMem_Free` - * :c:data:`PYMEM_DOMAIN_OBJ`: functions :c:func:`PyObject_Malloc`, - :c:func:`PyObject_Realloc`, :c:func:`PyObject_Calloc` and - :c:func:`PyObject_Free` + .. c:var:: PYMEM_DOMAIN_RAW + + Functions: + + * :c:func:`PyMem_RawMalloc` + * :c:func:`PyMem_RawRealloc` + * :c:func:`PyMem_RawCalloc` + * :c:func:`PyMem_RawFree` + + .. c:var:: PYMEM_DOMAIN_MEM + + Functions: + + * :c:func:`PyMem_Malloc`, + * :c:func:`PyMem_Realloc` + * :c:func:`PyMem_Calloc` + * :c:func:`PyMem_Free` + .. c:var:: PYMEM_DOMAIN_OBJ + + Functions: + + * :c:func:`PyObject_Malloc` + * :c:func:`PyObject_Realloc` + * :c:func:`PyObject_Calloc` + * :c:func:`PyObject_Free` .. c:function:: void PyMem_GetAllocator(PyMemAllocatorDomain domain, PyMemAllocatorEx *allocator) @@ -325,43 +347,62 @@ Customize Memory Allocators .. c:function:: void PyMem_SetupDebugHooks(void) - Setup hooks to detect bugs in the following Python memory allocator - functions: - - - :c:func:`PyMem_RawMalloc`, :c:func:`PyMem_RawRealloc`, - :c:func:`PyMem_RawCalloc`, :c:func:`PyMem_RawFree` - - :c:func:`PyMem_Malloc`, :c:func:`PyMem_Realloc`, :c:func:`PyMem_Calloc`, - :c:func:`PyMem_Free` - - :c:func:`PyObject_Malloc`, :c:func:`PyObject_Realloc`, - :c:func:`PyObject_Calloc`, :c:func:`PyObject_Free` + Setup hooks to detect bugs in the Python memory allocator functions. Newly allocated memory is filled with the byte ``0xCB``, freed memory is - filled with the byte ``0xDB``. Additional checks: + filled with the byte ``0xDB``. - - detect API violations, ex: :c:func:`PyObject_Free` called on a buffer + Runtime checks: + + - Detect API violations, ex: :c:func:`PyObject_Free` called on a buffer allocated by :c:func:`PyMem_Malloc` - - detect write before the start of the buffer (buffer underflow) - - detect write after the end of the buffer (buffer overflow) + - Detect write before the start of the buffer (buffer underflow) + - Detect write after the end of the buffer (buffer overflow) + - Check that the :term:`GIL ` is held when + allocator functions of :c:data:`PYMEM_DOMAIN_OBJ` (ex: + :c:func:`PyObject_Malloc`) and :c:data:`PYMEM_DOMAIN_MEM` (ex: + :c:func:`PyMem_Malloc`) domains are called + + On error, the debug hooks use the :mod:`tracemalloc` module to get the + traceback where a memory block was allocated. The traceback is only + displayed if :mod:`tracemalloc` is tracing Python memory allocations and the + memory block was traced. - The function does nothing if Python is not compiled is debug mode. + These hooks are installed by default if Python is compiled in debug + mode. The :envvar:`PYTHONMALLOC` environment variable can be used to install + debug hooks on a Python compiled in release mode. + .. versionchanged:: 3.6 + This function now also works on Python compiled in release mode. + On error, the debug hooks now use :mod:`tracemalloc` to get the traceback + where a memory block was allocated. The debug hooks now also check + if the GIL is held when functions of :c:data:`PYMEM_DOMAIN_OBJ` and + :c:data:`PYMEM_DOMAIN_MEM` domains are called. -Customize PyObject Arena Allocator -================================== -Python has a *pymalloc* allocator for allocations smaller than 512 bytes. This -allocator is optimized for small objects with a short lifetime. It uses memory -mappings called "arenas" with a fixed size of 256 KB. It falls back to -:c:func:`PyMem_RawMalloc` and :c:func:`PyMem_RawRealloc` for allocations larger -than 512 bytes. *pymalloc* is the default allocator used by -:c:func:`PyObject_Malloc`. +.. _pymalloc: -The default arena allocator uses the following functions: +The pymalloc allocator +====================== + +Python has a *pymalloc* allocator optimized for small objects (smaller or equal +to 512 bytes) with a short lifetime. It uses memory mappings called "arenas" +with a fixed size of 256 KB. It falls back to :c:func:`PyMem_RawMalloc` and +:c:func:`PyMem_RawRealloc` for allocations larger than 512 bytes. + +*pymalloc* is the default allocator of the :c:data:`PYMEM_DOMAIN_MEM` (ex: +:c:func:`PyObject_Malloc`) and :c:data:`PYMEM_DOMAIN_OBJ` (ex: +:c:func:`PyObject_Malloc`) domains. + +The arena allocator uses the following functions: * :c:func:`VirtualAlloc` and :c:func:`VirtualFree` on Windows, * :c:func:`mmap` and :c:func:`munmap` if available, * :c:func:`malloc` and :c:func:`free` otherwise. +Customize pymalloc Arena Allocator +---------------------------------- + .. versionadded:: 3.4 .. c:type:: PyObjectArenaAllocator diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst index d3125b8..7724350 100644 --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -50,7 +50,7 @@ Module Objects .. c:function:: PyObject* PyModule_New(const char *name) - Similar to :c:func:`PyModule_NewObject`, but the name is a UTF-8 encoded + Similar to :c:func:`PyImport_NewObject`, but the name is a UTF-8 encoded string instead of a Unicode object. diff --git a/Doc/c-api/slice.rst b/Doc/c-api/slice.rst index 8b695e0..a825164 100644 --- a/Doc/c-api/slice.rst +++ b/Doc/c-api/slice.rst @@ -56,14 +56,3 @@ Slice Objects .. versionchanged:: 3.2 The parameter type for the *slice* parameter was ``PySliceObject*`` before. - - -Ellipsis Object ---------------- - - -.. c:var:: PyObject *Py_Ellipsis - - The Python ``Ellipsis`` object. This object has no methods. It needs to be - treated just like any other object with respect to reference counts. Like - :c:data:`Py_None` it is a singleton object. diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst index c080f31..837ac7d 100644 --- a/Doc/c-api/structures.rst +++ b/Doc/c-api/structures.rst @@ -150,8 +150,9 @@ specific C type of the *self* object. The :attr:`ml_flags` field is a bitfield which can include the following flags. The individual flags indicate either a calling convention or a binding convention. Of the calling convention flags, only :const:`METH_VARARGS` and -:const:`METH_KEYWORDS` can be combined. Any of the calling convention flags -can be combined with a binding flag. +:const:`METH_KEYWORDS` can be combined (but note that :const:`METH_KEYWORDS` +alone is equivalent to ``METH_VARARGS | METH_KEYWORDS``). Any of the calling +convention flags can be combined with a binding flag. .. data:: METH_VARARGS @@ -168,7 +169,7 @@ can be combined with a binding flag. Methods with these flags must be of type :c:type:`PyCFunctionWithKeywords`. The function expects three parameters: *self*, *args*, and a dictionary of - all the keyword arguments. The flag must be combined with + all the keyword arguments. The flag is typically combined with :const:`METH_VARARGS`, and the parameters are typically processed using :c:func:`PyArg_ParseTupleAndKeywords`. @@ -241,7 +242,7 @@ definition with the same method name. +==================+=============+===============================+ | :attr:`name` | char \* | name of the member | +------------------+-------------+-------------------------------+ - | :attr:`!type` | int | the type of the member in the | + | :attr:`type` | int | the type of the member in the | | | | C struct | +------------------+-------------+-------------------------------+ | :attr:`offset` | Py_ssize_t | the offset in bytes that the | @@ -256,7 +257,7 @@ definition with the same method name. | | | docstring | +------------------+-------------+-------------------------------+ - :attr:`!type` can be one of many ``T_`` macros corresponding to various C + :attr:`type` can be one of many ``T_`` macros corresponding to various C types. When the member is accessed in Python, it will be converted to the equivalent Python type. diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst index 3d83b27..035cdc1 100644 --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -5,6 +5,17 @@ Operating System Utilities ========================== +.. c:function:: PyObject* PyOS_FSPath(PyObject *path) + + Return the file system representation for *path*. If the object is a + :class:`str` or :class:`bytes` object, then its reference count is + incremented. If the object implements the :class:`os.PathLike` interface, + then :meth:`~os.PathLike.__fspath__` is returned as long as it is a + :class:`str` or :class:`bytes` object. Otherwise :exc:`TypeError` is raised + and ``NULL`` is returned. + + .. versionadded:: 3.6 + .. c:function:: int Py_FdIsInteractive(FILE *fp, const char *filename) @@ -212,20 +223,24 @@ Process Control .. c:function:: void Py_Exit(int status) .. index:: - single: Py_Finalize() + single: Py_FinalizeEx() single: exit() - Exit the current process. This calls :c:func:`Py_Finalize` and then calls the - standard C library function ``exit(status)``. + Exit the current process. This calls :c:func:`Py_FinalizeEx` and then calls the + standard C library function ``exit(status)``. If :c:func:`Py_FinalizeEx` + indicates an error, the exit status is set to 120. + + .. versionchanged:: 3.6 + Errors from finalization no longer ignored. .. c:function:: int Py_AtExit(void (*func) ()) .. index:: - single: Py_Finalize() + single: Py_FinalizeEx() single: cleanup functions - Register a cleanup function to be called by :c:func:`Py_Finalize`. The cleanup + Register a cleanup function to be called by :c:func:`Py_FinalizeEx`. The cleanup function will be called with no arguments and should return no value. At most 32 cleanup functions can be registered. When the registration is successful, :c:func:`Py_AtExit` returns ``0``; on failure, it returns ``-1``. The cleanup diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst index ac6fd0b..323f017 100644 --- a/Doc/c-api/typeobj.rst +++ b/Doc/c-api/typeobj.rst @@ -199,9 +199,8 @@ type objects) *must* have the :attr:`ob_size` field. This field is deprecated. When it is defined, it should point to a function that acts the same as the :c:member:`~PyTypeObject.tp_getattro` function, but taking a C string - instead of a Python string object to give the attribute name. The signature is :: - - PyObject * tp_getattr(PyObject *o, char *attr_name); + instead of a Python string object to give the attribute name. The signature is + the same as for :c:func:`PyObject_GetAttrString`. This field is inherited by subtypes together with :c:member:`~PyTypeObject.tp_getattro`: a subtype inherits both :c:member:`~PyTypeObject.tp_getattr` and :c:member:`~PyTypeObject.tp_getattro` from its base type when @@ -214,11 +213,10 @@ type objects) *must* have the :attr:`ob_size` field. This field is deprecated. When it is defined, it should point to a function that acts the same as the :c:member:`~PyTypeObject.tp_setattro` function, but taking a C string - instead of a Python string object to give the attribute name. The signature is :: - - PyObject * tp_setattr(PyObject *o, char *attr_name, PyObject *v); + instead of a Python string object to give the attribute name. The signature is + the same as for :c:func:`PyObject_SetAttrString`, but setting + *v* to *NULL* to delete an attribute must be supported. - The *v* argument is set to *NULL* to delete the attribute. This field is inherited by subtypes together with :c:member:`~PyTypeObject.tp_setattro`: a subtype inherits both :c:member:`~PyTypeObject.tp_setattr` and :c:member:`~PyTypeObject.tp_setattro` from its base type when the subtype's :c:member:`~PyTypeObject.tp_setattr` and :c:member:`~PyTypeObject.tp_setattro` are both *NULL*. diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 54d0373..c11e049 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -440,7 +440,6 @@ APIs: .. % because not all compilers support the %z width modifier -- we fake it .. % when necessary via interpolating PY_FORMAT_SIZE_T. .. % Similar comments apply to the %ll width modifier and - .. % PY_FORMAT_LONG_LONG. .. tabularcolumns:: |l|l|L| @@ -525,11 +524,6 @@ APIs: copied as-is to the result string, and any extra arguments discarded. .. note:: - - The `"%lld"` and `"%llu"` format specifiers are only available - when :const:`HAVE_LONG_LONG` is defined. - - .. note:: The width formatter unit is number of characters rather than bytes. The precision formatter unit is number of bytes for ``"%s"`` and ``"%V"`` (if the ``PyObject*`` argument is NULL), and a number of @@ -811,38 +805,47 @@ File System Encoding """""""""""""""""""" To encode and decode file names and other environment strings, -:c:data:`Py_FileSystemEncoding` should be used as the encoding, and -``"surrogateescape"`` should be used as the error handler (:pep:`383`). To -encode file names during argument parsing, the ``"O&"`` converter should be -used, passing :c:func:`PyUnicode_FSConverter` as the conversion function: +:c:data:`Py_FileSystemDefaultEncoding` should be used as the encoding, and +:c:data:`Py_FileSystemDefaultEncodeErrors` should be used as the error handler +(:pep:`383` and :pep:`529`). To encode file names to :class:`bytes` during +argument parsing, the ``"O&"`` converter should be used, passing +:c:func:`PyUnicode_FSConverter` as the conversion function: .. c:function:: int PyUnicode_FSConverter(PyObject* obj, void* result) - ParseTuple converter: encode :class:`str` objects to :class:`bytes` using + ParseTuple converter: encode :class:`str` objects -- obtained directly or + through the :class:`os.PathLike` interface -- to :class:`bytes` using :c:func:`PyUnicode_EncodeFSDefault`; :class:`bytes` objects are output as-is. *result* must be a :c:type:`PyBytesObject*` which must be released when it is no longer used. .. versionadded:: 3.1 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. -To decode file names during argument parsing, the ``"O&"`` converter should be -used, passing :c:func:`PyUnicode_FSDecoder` as the conversion function: +To decode file names to :class:`str` during argument parsing, the ``"O&"`` +converter should be used, passing :c:func:`PyUnicode_FSDecoder` as the +conversion function: .. c:function:: int PyUnicode_FSDecoder(PyObject* obj, void* result) - ParseTuple converter: decode :class:`bytes` objects to :class:`str` using - :c:func:`PyUnicode_DecodeFSDefaultAndSize`; :class:`str` objects are output - as-is. *result* must be a :c:type:`PyUnicodeObject*` which must be released - when it is no longer used. + ParseTuple converter: decode :class:`bytes` objects -- obtained either + directly or indirectly through the :class:`os.PathLike` interface -- to + :class:`str` using :c:func:`PyUnicode_DecodeFSDefaultAndSize`; :class:`str` + objects are output as-is. *result* must be a :c:type:`PyUnicodeObject*` which + must be released when it is no longer used. .. versionadded:: 3.2 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. c:function:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) Decode a string using :c:data:`Py_FileSystemDefaultEncoding` and the - ``"surrogateescape"`` error handler, or ``"strict"`` on Windows. + :c:data:`Py_FileSystemDefaultEncodeErrors` error handler. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the locale encoding. @@ -856,28 +859,28 @@ used, passing :c:func:`PyUnicode_FSDecoder` as the conversion function: The :c:func:`Py_DecodeLocale` function. - .. versionchanged:: 3.2 - Use ``"strict"`` error handler on Windows. + .. versionchanged:: 3.6 + Use :c:data:`Py_FileSystemDefaultEncodeErrors` error handler. .. c:function:: PyObject* PyUnicode_DecodeFSDefault(const char *s) Decode a null-terminated string using :c:data:`Py_FileSystemDefaultEncoding` - and the ``"surrogateescape"`` error handler, or ``"strict"`` on Windows. + and the :c:data:`Py_FileSystemDefaultEncodeErrors` error handler. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the locale encoding. Use :c:func:`PyUnicode_DecodeFSDefaultAndSize` if you know the string length. - .. versionchanged:: 3.2 - Use ``"strict"`` error handler on Windows. + .. versionchanged:: 3.6 + Use :c:data:`Py_FileSystemDefaultEncodeErrors` error handler. .. c:function:: PyObject* PyUnicode_EncodeFSDefault(PyObject *unicode) Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the - ``"surrogateescape"`` error handler, or ``"strict"`` on Windows, and return + :c:data:`Py_FileSystemDefaultEncodeErrors` error handler, and return :class:`bytes`. Note that the resulting :class:`bytes` object may contain null bytes. @@ -894,6 +897,8 @@ used, passing :c:func:`PyUnicode_FSDecoder` as the conversion function: .. versionadded:: 3.2 + .. versionchanged:: 3.6 + Use :c:data:`Py_FileSystemDefaultEncodeErrors` error handler. wchar_t Support """"""""""""""" @@ -937,6 +942,26 @@ wchar_t Support .. versionadded:: 3.2 +UCS4 Support +"""""""""""" + +.. versionadded:: 3.3 + +.. XXX are these meant to be public? + +.. c:function:: size_t Py_UCS4_strlen(const Py_UCS4 *u) + Py_UCS4* Py_UCS4_strcpy(Py_UCS4 *s1, const Py_UCS4 *s2) + Py_UCS4* Py_UCS4_strncpy(Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) + Py_UCS4* Py_UCS4_strcat(Py_UCS4 *s1, const Py_UCS4 *s2) + int Py_UCS4_strcmp(const Py_UCS4 *s1, const Py_UCS4 *s2) + int Py_UCS4_strncmp(const Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) + Py_UCS4* Py_UCS4_strchr(const Py_UCS4 *s, Py_UCS4 c) + Py_UCS4* Py_UCS4_strrchr(const Py_UCS4 *s, Py_UCS4 c) + + These utility functions work on strings of :c:type:`Py_UCS4` characters and + otherwise behave like the C standard library functions with the same name. + + .. _builtincodecs: Built-in Codecs @@ -1388,78 +1413,77 @@ Character Map Codecs This codec is special in that it can be used to implement many different codecs (and this is in fact what was done to obtain most of the standard codecs included in the :mod:`encodings` package). The codec uses mapping to encode and -decode characters. The mapping objects provided must support the -:meth:`__getitem__` mapping interface; dictionaries and sequences work well. +decode characters. + +Decoding mappings must map single string characters to single Unicode +characters, integers (which are then interpreted as Unicode ordinals) or ``None`` +(meaning "undefined mapping" and causing an error). + +Encoding mappings must map single Unicode characters to single string +characters, integers (which are then interpreted as Latin-1 ordinals) or ``None`` +(meaning "undefined mapping" and causing an error). + +The mapping objects provided must only support the __getitem__ mapping +interface. + +If a character lookup fails with a LookupError, the character is copied as-is +meaning that its ordinal value will be interpreted as Unicode or Latin-1 ordinal +resp. Because of this, mappings only need to contain those mappings which map +characters to different code points. These are the mapping codec APIs: -.. c:function:: PyObject* PyUnicode_DecodeCharmap(const char *data, Py_ssize_t size, \ +.. c:function:: PyObject* PyUnicode_DecodeCharmap(const char *s, Py_ssize_t size, \ PyObject *mapping, const char *errors) - Create a Unicode object by decoding *size* bytes of the encoded string *s* - using the given *mapping* object. Return *NULL* if an exception was raised - by the codec. - - If *mapping* is *NULL*, Latin-1 decoding will be applied. Else - *mapping* must map bytes ordinals (integers in the range from 0 to 255) - to Unicode strings, integers (which are then interpreted as Unicode - ordinals) or ``None``. Unmapped data bytes -- ones which cause a - :exc:`LookupError`, as well as ones which get mapped to ``None``, - ``0xFFFE`` or ``'\ufffe'``, are treated as undefined mappings and cause - an error. + Create a Unicode object by decoding *size* bytes of the encoded string *s* using + the given *mapping* object. Return *NULL* if an exception was raised by the + codec. If *mapping* is *NULL* latin-1 decoding will be done. Else it can be a + dictionary mapping byte or a unicode string, which is treated as a lookup table. + Byte values greater that the length of the string and U+FFFE "characters" are + treated as "undefined mapping". .. c:function:: PyObject* PyUnicode_AsCharmapString(PyObject *unicode, PyObject *mapping) - Encode a Unicode object using the given *mapping* object and return the - result as a bytes object. Error handling is "strict". Return *NULL* if an + Encode a Unicode object using the given *mapping* object and return the result + as Python string object. Error handling is "strict". Return *NULL* if an exception was raised by the codec. - The *mapping* object must map Unicode ordinal integers to bytes objects, - integers in the range from 0 to 255 or ``None``. Unmapped character - ordinals (ones which cause a :exc:`LookupError`) as well as mapped to - ``None`` are treated as "undefined mapping" and cause an error. - - -.. c:function:: PyObject* PyUnicode_EncodeCharmap(const Py_UNICODE *s, Py_ssize_t size, \ - PyObject *mapping, const char *errors) +The following codec API is special in that maps Unicode to Unicode. - Encode the :c:type:`Py_UNICODE` buffer of the given *size* using the given - *mapping* object and return the result as a bytes object. Return *NULL* if - an exception was raised by the codec. - - .. deprecated-removed:: 3.3 4.0 - Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using - :c:func:`PyUnicode_AsCharmapString` or - :c:func:`PyUnicode_AsEncodedString`. +.. c:function:: PyObject* PyUnicode_TranslateCharmap(const Py_UNICODE *s, Py_ssize_t size, \ + PyObject *table, const char *errors) -The following codec API is special in that maps Unicode to Unicode. + Translate a :c:type:`Py_UNICODE` buffer of the given *size* by applying a + character mapping *table* to it and return the resulting Unicode object. Return + *NULL* when an exception was raised by the codec. -.. c:function:: PyObject* PyUnicode_Translate(PyObject *unicode, \ - PyObject *mapping, const char *errors) + The *mapping* table must map Unicode ordinal integers to Unicode ordinal + integers or ``None`` (causing deletion of the character). - Translate a Unicode object using the given *mapping* object and return the - resulting Unicode object. Return *NULL* if an exception was raised by the - codec. + Mapping tables need only provide the :meth:`__getitem__` interface; dictionaries + and sequences work well. Unmapped character ordinals (ones which cause a + :exc:`LookupError`) are left untouched and are copied as-is. - The *mapping* object must map Unicode ordinal integers to Unicode strings, - integers (which are then interpreted as Unicode ordinals) or ``None`` - (causing deletion of the character). Unmapped character ordinals (ones - which cause a :exc:`LookupError`) are left untouched and are copied as-is. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_Translate`. or :ref:`generic codec based API + ` -.. c:function:: PyObject* PyUnicode_TranslateCharmap(const Py_UNICODE *s, Py_ssize_t size, \ +.. c:function:: PyObject* PyUnicode_EncodeCharmap(const Py_UNICODE *s, Py_ssize_t size, \ PyObject *mapping, const char *errors) - Translate a :c:type:`Py_UNICODE` buffer of the given *size* by applying a - character *mapping* table to it and return the resulting Unicode object. - Return *NULL* when an exception was raised by the codec. + Encode the :c:type:`Py_UNICODE` buffer of the given *size* using the given + *mapping* object and return a Python string object. Return *NULL* if an + exception was raised by the codec. .. deprecated-removed:: 3.3 4.0 Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using - :c:func:`PyUnicode_Translate`. or :ref:`generic codec based API - ` + :c:func:`PyUnicode_AsCharmapString` or + :c:func:`PyUnicode_AsEncodedString`. MBCS codecs for Windows @@ -1644,6 +1668,10 @@ They all return *NULL* or ``-1`` if an exception occurs. * :const:`Py_True` or :const:`Py_False` for successful comparisons * :const:`Py_NotImplemented` in case the type combination is unknown + Note that :const:`Py_EQ` and :const:`Py_NE` comparisons can cause a + :exc:`UnicodeWarning` in case the conversion of the arguments to Unicode fails + with a :exc:`UnicodeDecodeError`. + Possible values for *op* are :const:`Py_GT`, :const:`Py_GE`, :const:`Py_EQ`, :const:`Py_NE`, :const:`Py_LT`, and :const:`Py_LE`. diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst index 6ab5942..d0ceb05 100644 --- a/Doc/c-api/veryhigh.rst +++ b/Doc/c-api/veryhigh.rst @@ -300,13 +300,12 @@ the same library that the Python runtime is using. set to *NULL*. -.. c:function:: PyObject* PyEval_EvalCodeEx(PyObject *co, PyObject *globals, PyObject *locals, PyObject **args, int argcount, PyObject **kws, int kwcount, PyObject **defs, int defcount, PyObject *kwdefs, PyObject *closure) +.. c:function:: PyObject* PyEval_EvalCodeEx(PyObject *co, PyObject *globals, PyObject *locals, PyObject **args, int argcount, PyObject **kws, int kwcount, PyObject **defs, int defcount, PyObject *closure) Evaluate a precompiled code object, given a particular environment for its evaluation. This environment consists of a dictionary of global variables, a mapping object of local variables, arrays of arguments, keywords and - defaults, a dictionary of default values for :ref:`keyword-only\ - ` arguments and a closure tuple of cells. + defaults, and a closure tuple of cells. .. c:type:: PyFrameObject diff --git a/Doc/conf.py b/Doc/conf.py index b3f26d5..b1bb620 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -88,24 +88,11 @@ html_split_index = True # Options for LaTeX output # ------------------------ -# Get LaTeX to handle Unicode correctly -latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} - -# Additional stuff for the LaTeX preamble. -latex_elements['preamble'] = r''' -\authoraddress{ - \strong{Python Software Foundation}\\ - Email: \email{docs@python.org} -} -\let\Verbatim=\OriginalVerbatim -\let\endVerbatim=\endOriginalVerbatim -''' - # The paper size ('letter' or 'a4'). -latex_elements['papersize'] = 'a4' +latex_paper_size = 'a4' # The font size ('10pt', '11pt' or '12pt'). -latex_elements['font_size'] = '10pt' +latex_font_size = '10pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). @@ -138,9 +125,22 @@ latex_documents.extend(('howto/' + fn[:-4], 'howto-' + fn[:-4] + '.tex', for fn in os.listdir('howto') if fn.endswith('.rst') and fn != 'index.rst') +# Additional stuff for the LaTeX preamble. +latex_preamble = r''' +\authoraddress{ + \strong{Python Software Foundation}\\ + Email: \email{docs@python.org} +} +\let\Verbatim=\OriginalVerbatim +\let\endVerbatim=\endOriginalVerbatim +''' + # Documents to append as an appendix to all manuals. latex_appendices = ['glossary', 'about', 'license', 'copyright'] +# Get LaTeX to handle Unicode correctly +latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} + # Options for Epub output # ----------------------- diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 2b5400c..22d7705 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2017 Python Software Foundation. All rights reserved. +Copyright © 2001-2016 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat index e388195..8b469f4 100644 --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -921,6 +921,9 @@ PyNumber_Xor:PyObject*:o2:0: PyObject_AsFileDescriptor:int::: PyObject_AsFileDescriptor:PyObject*:o:0: +PyOS_FSPath:PyObject*::+1: +PyOS_FSPath:PyObject*:path:0: + PyObject_Call:PyObject*::+1: PyObject_Call:PyObject*:callable_object:0: PyObject_Call:PyObject*:args:0: diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst index 4e2761d..1f5be9c 100644 --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -321,7 +321,7 @@ You can read back this static file, by using the >>> metadata.description 'Easily download, build, install, upgrade, and uninstall Python packages' -Notice that the class can also be instantiated with a metadata file path to +Notice that the class can also be instanciated with a metadata file path to loads its values:: >>> pkg_info_path = 'distribute-0.6.8-py2.7.egg-info' diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst index 44556e3..28ad128 100644 --- a/Doc/distutils/packageindex.rst +++ b/Doc/distutils/packageindex.rst @@ -173,7 +173,7 @@ name of all sections describing a repository. Each section describing a repository defines three variables: - *repository*, that defines the url of the PyPI server. Defaults to - ``https://upload.pypi.org/legacy/``. + ``https://www.python.org/pypi``. - *username*, which is the registered username on the PyPI server. - *password*, that will be used to authenticate. If omitted the user will be prompt to type it when needed. diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst index 64033dc..ab2f616 100644 --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -67,7 +67,9 @@ perform some operation on a file. :: Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + exit(120); + } PyMem_RawFree(program); return 0; } @@ -76,7 +78,7 @@ The :c:func:`Py_SetProgramName` function should be called before :c:func:`Py_Initialize` to inform the interpreter about paths to Python run-time libraries. Next, the Python interpreter is initialized with :c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that prints the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts +that prints the date and time. Afterwards, the :c:func:`Py_FinalizeEx` call shuts the interpreter down, followed by the end of the program. In a real program, you may want to get the Python script from another source, perhaps a text-editor routine, a file, or a database. Getting the Python code from a file can better diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst index 003b4e5..b8ce437 100644 --- a/Doc/extending/newtypes.rst +++ b/Doc/extending/newtypes.rst @@ -124,7 +124,7 @@ our objects and in some error messages, for example:: >>> "" + noddy.new_noddy() Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: cannot add type "noddy.Noddy" to string Note that the name is a dotted name that includes both the module name and the diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index 108df6d..1bd800b 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -366,33 +366,11 @@ is exactly the same type of object that a lambda expression yields) is assigned! Can Python be compiled to machine code, C or some other language? ----------------------------------------------------------------- -Practical answer: - -`Cython `_ and `Pyrex `_ -compile a modified version of Python with optional annotations into C -extensions. `Weave `_ makes it easy to -intermingle Python and C code in various ways to increase performance. -`Nuitka `_ is an up-and-coming compiler of Python -into C++ code, aiming to support the full Python language. - -Theoretical answer: - - .. XXX not sure what to make of this - -Not trivially. Python's high level data types, dynamic typing of objects and -run-time invocation of the interpreter (using :func:`eval` or :func:`exec`) -together mean that a naïvely "compiled" Python program would probably consist -mostly of calls into the Python run-time system, even for seemingly simple -operations like ``x+1``. - -Several projects described in the Python newsgroup or at past `Python -conferences `_ have shown that this -approach is feasible, although the speedups reached so far are only modest -(e.g. 2x). Jython uses the same strategy for compiling to Java bytecode. (Jim -Hugunin has demonstrated that in combination with whole-program analysis, -speedups of 1000x are feasible for small demo programs. See the proceedings -from the `1997 Python conference -`_ for more information.) +`Cython `_ compiles a modified version of Python with +optional annotations into C extensions. `Nuitka `_ is +an up-and-coming compiler of Python into C++ code, aiming to support the full +Python language. For compiling to Java you can consider +`VOC `_. How does Python manage memory? diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 8f6a907..f1e33af 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -159,7 +159,7 @@ How do I obtain a copy of the Python source? The latest Python source distribution is always available from python.org, at https://www.python.org/downloads/. The latest development sources can be obtained -at https://github.com/python/cpython/. +via anonymous Mercurial access at https://hg.python.org/cpython. The source distribution is a gzipped tar file containing the complete C source, Sphinx-formatted documentation, Python library modules, example programs, and @@ -222,8 +222,8 @@ releases are announced on the comp.lang.python and comp.lang.python.announce newsgroups and on the Python home page at https://www.python.org/; an RSS feed of news is available. -You can also access the development version of Python through Git. See -`The Python Developer's Guide `_ for details. +You can also access the development version of Python through Mercurial. See +https://docs.python.org/devguide/faq.html for details. How do I submit bug reports and patches for Python? diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index 38e1796..98a28c3 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -77,16 +77,6 @@ for Python allow you to write GTK+ 3 applications. There is also a The older PyGtk bindings for the `Gtk+ 2 toolkit `_ have been implemented by James Henstridge; see . -Kivy ----- - -`Kivy `_ is a cross-platform GUI library supporting both -desktop operating systems (Windows, macOS, Linux) and mobile devices (Android, -iOS). It is written in Python and Cython, and can use a range of windowing -backends. - -Kivy is free and open source software distributed under the MIT license. - FLTK ---- @@ -94,6 +84,15 @@ Python bindings for `the FLTK toolkit `_, a simple yet powerful and mature cross-platform windowing system, are available from `the PyFLTK project `_. + +FOX +---- + +A wrapper for `the FOX toolkit `_ called `FXpy +`_ is available. FOX supports both Unix variants +and Windows. + + OpenGL ------ diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 694753e..9c5e20d 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -838,7 +838,8 @@ How do I convert a number to a string? To convert, e.g., the number 144 to the string '144', use the built-in type constructor :func:`str`. If you want a hexadecimal or octal representation, use the built-in functions :func:`hex` or :func:`oct`. For fancy formatting, see -the :ref:`formatstrings` section, e.g. ``"{:04d}".format(144)`` yields +the :ref:`f-strings` and :ref:`formatstrings` sections, +e.g. ``"{:04d}".format(144)`` yields ``'0144'`` and ``"{:.3f}".format(1.0/3.0)`` yields ``'0.333'``. diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst index 6ac83e4..d725343 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -300,10 +300,9 @@ this respect, and is easily configured to use spaces: Take :menuselection:`Tools --> Options --> Tabs`, and for file type "Default" set "Tab size" and "Indent size" to 4, and select the "Insert spaces" radio button. -Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs -and spaces are causing problems in leading whitespace. -You may also run the :mod:`tabnanny` module to check a directory tree -in batch mode. +If you suspect mixed tabs and spaces are causing problems in leading whitespace, +run Python with the :option:`-t` switch or run ``Tools/Scripts/tabnanny.py`` to +check a directory tree in batch mode. How do I check for a keypress without blocking? diff --git a/Doc/glossary.rst b/Doc/glossary.rst index f474a6d..41ee3d8 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -74,6 +74,34 @@ Glossary :keyword:`async with` statement by defining :meth:`__aenter__` and :meth:`__aexit__` methods. Introduced by :pep:`492`. + asynchronous generator + A function which returns an :term:`asynchronous generator iterator`. It + looks like a coroutine function defined with :keyword:`async def` except + that it contains :keyword:`yield` expressions for producing a series of + values usable in an :keyword:`async for` loop. + + Usually refers to a asynchronous generator function, but may refer to an + *asynchronous generator iterator* in some contexts. In cases where the + intended meaning isn't clear, using the full terms avoids ambiguity. + + An asynchronous generator function may contain :keyword:`await` + expressions as well as :keyword:`async for`, and :keyword:`async with` + statements. + + asynchronous generator iterator + An object created by a :term:`asynchronous generator` function. + + This is an :term:`asynchronous iterator` which when called using the + :meth:`__anext__` method returns an awaitable object which will execute + that the body of the asynchronous generator function until the + next :keyword:`yield` expression. + + Each :keyword:`yield` temporarily suspends processing, remembering the + location execution state (including local variables and pending + try-statements). When the *asynchronous generator iterator* effectively + resumes with another awaitable returned by :meth:`__anext__`, it + picks-up where it left-off. See :pep:`492` and :pep:`525`. + asynchronous iterable An object, that can be used in an :keyword:`async for` statement. Must return an :term:`asynchronous iterator` from its @@ -103,10 +131,6 @@ Glossary binary file A :term:`file object` able to read and write :term:`bytes-like objects `. - Examples of binary files are files opened in binary mode (``'rb'``, - ``'wb'`` or ``'rb+'``), :data:`sys.stdin.buffer`, - :data:`sys.stdout.buffer`, and instances of :class:`io.BytesIO` and - :class:`gzip.GzipFile`. .. seealso:: A :term:`text file` reads and writes :class:`str` objects. @@ -131,7 +155,7 @@ Glossary bytecode Python source code is compiled into bytecode, the internal representation of a Python program in the CPython interpreter. The bytecode is also - cached in ``.pyc`` files so that executing the same file is + cached in ``.pyc`` and ``.pyo`` files so that executing the same file is faster the second time (recompilation from source to bytecode can be avoided). This "intermediate language" is said to run on a :term:`virtual machine` that executes the machine code corresponding to @@ -434,9 +458,9 @@ Glossary Hashability makes an object usable as a dictionary key and a set member, because these data structures use the hash value internally. - All of Python's immutable built-in objects are hashable; mutable - containers (such as lists or dictionaries) are not. Objects which are - instances of user-defined classes are hashable by default. They all + All of Python's immutable built-in objects are hashable, while no mutable + containers (such as lists or dictionaries) are. Objects which are + instances of user-defined classes are hashable by default; they all compare unequal (except with themselves), and their hash value is derived from their :func:`id`. @@ -722,6 +746,8 @@ Glossary def func(foo, bar=None): ... + .. _positional-only_parameter: + * :dfn:`positional-only`: specifies an argument that can be supplied only by position. Python has no syntax for defining positional-only parameters. However, some built-in functions have positional-only @@ -780,6 +806,16 @@ Glossary One of the default :term:`meta path finders ` which searches an :term:`import path` for modules. + path-like object + An object representing a file system path. A path-like object is either + a :class:`str` or :class:`bytes` object representing a path, or an object + implementing the :class:`os.PathLike` protocol. An object that supports + the :class:`os.PathLike` protocol can be converted to a :class:`str` or + :class:`bytes` file system path by calling the :func:`os.fspath` function; + :func:`os.fsdecode` and :func:`os.fsencode` can be used to guarantee a + :class:`str` or :class:`bytes` result instead, respectively. Introduced + by :pep:`519`. + portion A set of files in a single directory (possibly stored in a zip file) that contribute to a namespace package, as defined in :pep:`420`. @@ -930,9 +966,6 @@ Glossary A :term:`file object` able to read and write :class:`str` objects. Often, a text file actually accesses a byte-oriented datastream and handles the :term:`text encoding` automatically. - Examples of text files are files opened in text mode (``'r'`` or ``'w'``), - :data:`sys.stdin`, :data:`sys.stdout`, and instances of - :class:`io.StringIO`. .. seealso:: A :term:`binary file` reads and write :class:`bytes` objects. @@ -959,13 +992,25 @@ Glossary ``'\r'``. See :pep:`278` and :pep:`3116`, as well as :func:`bytes.splitlines` for an additional use. + variable annotation + A type metadata value associated with a module global variable or + a class attribute. Its syntax is explained in section :ref:`annassign`. + Annotations are stored in the :attr:`__annotations__` special + attribute of a class or module object and can be accessed using + :func:`typing.get_type_hints`. + + Python itself does not assign any particular meaning to variable + annotations. They are intended to be interpreted by third-party libraries + or type checking tools. See :pep:`526`, :pep:`484` which describe + some of their potential uses. + virtual environment A cooperatively isolated runtime environment that allows Python users and applications to install and upgrade Python distribution packages without interfering with the behaviour of other Python applications running on the same system. - See also :ref:`scripts-pyvenv`. + See also :mod:`venv`. virtual machine A computer defined entirely in software. Python's virtual machine diff --git a/Doc/howto/argparse.rst b/Doc/howto/argparse.rst index fac1a35..7e161a5 100644 --- a/Doc/howto/argparse.rst +++ b/Doc/howto/argparse.rst @@ -221,7 +221,7 @@ before proceeding. Introducing Optional arguments ============================== -So far we have been playing with positional arguments. Let us +So far we, have been playing with positional arguments. Let us have a look on how to add optional ones:: import argparse @@ -547,7 +547,8 @@ And this is what it gives: Traceback (most recent call last): File "prog.py", line 11, in if args.verbosity >= 2: - TypeError: unorderable types: NoneType() >= int() + TypeError: '>=' not supported between instances of 'NoneType' and 'int' + * First output went well, and fixes the bug we had before. That is, we want any value >= 2 to be as verbose as possible. diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst index 8b2fc74..4742d84 100644 --- a/Doc/howto/clinic.rst +++ b/Doc/howto/clinic.rst @@ -1,5 +1,3 @@ -.. highlightlang:: c - ********************** Argument Clinic How-To ********************** @@ -80,23 +78,17 @@ Basic Concepts And Usage ======================== Argument Clinic ships with CPython; you'll find it in ``Tools/clinic/clinic.py``. -If you run that script, specifying a C file as an argument: - -.. code-block:: shell-session +If you run that script, specifying a C file as an argument:: - $ python3 Tools/clinic/clinic.py foo.c + % python3 Tools/clinic/clinic.py foo.c Argument Clinic will scan over the file looking for lines that -look exactly like this: - -.. code-block:: none +look exactly like this:: /*[clinic input] When it finds one, it reads everything up to a line that looks -exactly like this: - -.. code-block:: none +exactly like this:: [clinic start generated code]*/ @@ -107,9 +99,7 @@ lines, are collectively called an Argument Clinic "block". When Argument Clinic parses one of these blocks, it generates output. This output is rewritten into the C file immediately after the block, followed by a comment containing a checksum. -The Argument Clinic block now looks like this: - -.. code-block:: none +The Argument Clinic block now looks like this:: /*[clinic input] ... clinic input goes here ... @@ -385,10 +375,15 @@ Let's dive in! Write a pickled representation of obj to the open file. [clinic start generated code]*/ -12. Save and close the file, then run ``Tools/clinic/clinic.py`` on - it. With luck everything worked---your block now has output, and - a ``.c.h`` file has been generated! Reopen the file in your - text editor to see:: +12. Save and close the file, then run ``Tools/clinic/clinic.py`` on it. + With luck everything worked and your block now has output! Reopen + the file in your text editor to see:: + + /*[clinic input] + module _pickle + class _pickle.Pickler "PicklerObject *" "&Pickler_Type" + [clinic start generated code]*/ + /*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/ /*[clinic input] _pickle.Pickler.dump @@ -400,20 +395,18 @@ Let's dive in! Write a pickled representation of obj to the open file. [clinic start generated code]*/ + PyDoc_STRVAR(_pickle_Pickler_dump__doc__, + "Write a pickled representation of obj to the open file.\n" + "\n" + ... static PyObject * - _pickle_Pickler_dump(PicklerObject *self, PyObject *obj) - /*[clinic end generated code: output=87ecad1261e02ac7 input=552eb1c0f52260d9]*/ + _pickle_Pickler_dump_impl(PicklerObject *self, PyObject *obj) + /*[clinic end generated code: checksum=3bd30745bf206a48f8b576a1da3d90f55a0a4187]*/ Obviously, if Argument Clinic didn't produce any output, it's because it found an error in your input. Keep fixing your errors and retrying until Argument Clinic processes your file without complaint. - For readability, most of the glue code has been generated to a ``.c.h`` - file. You'll need to include that in your original ``.c`` file, - typically right after the clinic module block:: - - #include "clinic/_pickle.c.h" - 13. Double-check that the argument-parsing code Argument Clinic generated looks basically the same as the existing code. @@ -834,9 +827,9 @@ on the right is the text you'd replace it with. ``'i'`` ``int`` ``'I'`` ``unsigned_int(bitwise=True)`` ``'k'`` ``unsigned_long(bitwise=True)`` -``'K'`` ``unsigned_PY_LONG_LONG(bitwise=True)`` +``'K'`` ``unsigned_long_long(bitwise=True)`` ``'l'`` ``long`` -``'L'`` ``PY_LONG_LONG`` +``'L'`` ``long long`` ``'n'`` ``Py_ssize_t`` ``'O'`` ``object`` ``'O!'`` ``object(subclass_of='&PySomething_Type')`` @@ -1034,9 +1027,7 @@ that value, and an error has been set (``PyErr_Occurred()`` returns a true value), then the generated code will propagate the error. Otherwise it will encode the value you return like normal. -Currently Argument Clinic supports only a few return converters: - -.. code-block:: none +Currently Argument Clinic supports only a few return converters:: bool int @@ -1407,8 +1398,8 @@ Let's start with defining some terminology: ``two-pass`` A buffer like ``buffer``. However, a two-pass buffer can only - be dumped once, and it prints out all text sent to it during - all processing, even from Clinic blocks *after* the dumping point. + be written once, and it prints out all text sent to it during + all of processing, even from Clinic blocks *after* the ``suppress`` The text is suppressed—thrown away. @@ -1471,7 +1462,7 @@ preset configurations, as follows: The default filename is ``"{dirname}/clinic/{basename}.h"``. ``buffer`` - Save up most of the output from Clinic, to be written into + Save up all most of the output from Clinic, to be written into your file near the end. For Python files implementing modules or builtin types, it's recommended that you dump the buffer just above the static structures for your module or @@ -1615,9 +1606,7 @@ code probably looks like this:: #endif /* HAVE_FUNCTIONNAME */ And then in the ``PyMethodDef`` structure at the bottom the existing code -will have: - -.. code-block:: none +will have:: #ifdef HAVE_FUNCTIONNAME {'functionname', ... }, @@ -1667,9 +1656,7 @@ extra code when using the "block" output preset? It can't go in the output bloc because that could be deactivated by the ``#ifdef``. (That's the whole point!) In this situation, Argument Clinic writes the extra code to the "buffer" destination. -This may mean that you get a complaint from Argument Clinic: - -.. code-block:: none +This may mean that you get a complaint from Argument Clinic:: Warning in file "Modules/posixmodule.c" on line 12357: Destination buffer 'buffer' not empty at end of file, emptying. @@ -1689,9 +1676,7 @@ wouldn't make any sense to the Python interpreter. But using Argument Clinic to run Python blocks lets you use Python as a Python preprocessor! Since Python comments are different from C comments, Argument Clinic -blocks embedded in Python files look slightly different. They look like this: - -.. code-block:: python3 +blocks embedded in Python files look slightly different. They look like this:: #/*[python input] #print("def foo(): pass") diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst index b349375..c2bf473 100644 --- a/Doc/howto/descriptor.rst +++ b/Doc/howto/descriptor.rst @@ -252,10 +252,10 @@ to wrap access to the value attribute in a property data descriptor:: class Cell(object): . . . - def getvalue(self): - "Recalculate the cell before returning value" + def getvalue(self, obj): + "Recalculate cell before returning value" self.recalc() - return self._value + return obj._value value = property(getvalue) @@ -282,7 +282,7 @@ this:: . . . def __get__(self, obj, objtype=None): "Simulate func_descr_get() in Objects/funcobject.c" - return types.MethodType(self, obj) + return types.MethodType(self, obj, objtype) Running the interpreter shows how the function descriptor works in practice:: diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst index 4060181..8ae9679 100644 --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -210,7 +210,7 @@ You can experiment with the iteration interface manually: 3 >>> next(it) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? StopIteration >>> @@ -474,7 +474,7 @@ Here's a sample usage of the ``generate_ints()`` generator: 2 >>> next(gen) Traceback (most recent call last): - File "stdin", line 1, in + File "stdin", line 1, in ? File "stdin", line 2, in generate_ints StopIteration @@ -577,7 +577,7 @@ And here's an example of changing the counter: 9 >>> next(it) #doctest: +SKIP Traceback (most recent call last): - File "t.py", line 15, in + File "t.py", line 15, in ? it.next() StopIteration @@ -653,9 +653,8 @@ This can also be written as a list comprehension: [0, 2, 4, 6, 8] -:func:`enumerate(iter, start=0) ` counts off the elements in the -iterable returning 2-tuples containing the count (from *start*) and -each element. :: +:func:`enumerate(iter) ` counts off the elements in the iterable, +returning 2-tuples containing the count and each element. :: >>> for item in enumerate(['subject', 'verb', 'object']): ... print(item) @@ -748,16 +747,14 @@ The module's functions fall into a few broad classes: Creating new iterators ---------------------- -:func:`itertools.count(start, step) ` returns an infinite -stream of evenly spaced values. You can optionally supply the starting number, -which defaults to 0, and the interval between numbers, which defaults to 1:: +:func:`itertools.count(n) ` returns an infinite stream of +integers, increasing by 1 each time. You can optionally supply the starting +number, which defaults to 0:: itertools.count() => 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... itertools.count(10) => 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ... - itertools.count(10, 5) => - 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, ... :func:`itertools.cycle(iter) ` saves a copy of the contents of a provided iterable and returns a new iterator that returns its elements from @@ -1063,10 +1060,10 @@ write the obvious :keyword:`for` loop:: for i in [1,2,3]: product *= i -A related function is :func:`itertools.accumulate(iterable, func=operator.add) -`. It performs the same calculation, but instead of -returning only the final result, :func:`accumulate` returns an iterator that -also yields each partial result:: +A related function is `itertools.accumulate(iterable, func=operator.add) 1, 3, 6, 10, 15 @@ -1238,8 +1235,6 @@ Python documentation Documentation for the :mod:`itertools` module. -Documentation for the :mod:`functools` module. - Documentation for the :mod:`operator` module. :pep:`289`: "Generator Expressions" diff --git a/Doc/howto/index.rst b/Doc/howto/index.rst index de65950..593341c 100644 --- a/Doc/howto/index.rst +++ b/Doc/howto/index.rst @@ -28,4 +28,5 @@ Currently, the HOWTOs are: argparse.rst ipaddress.rst clinic.rst + instrumentation.rst diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst new file mode 100644 index 0000000..7fca9aa --- /dev/null +++ b/Doc/howto/instrumentation.rst @@ -0,0 +1,408 @@ +.. highlight:: shell-session + +.. _instrumentation: + +=============================================== +Instrumenting CPython with DTrace and SystemTap +=============================================== + +:author: David Malcolm +:author: Łukasz Langa + +DTrace and SystemTap are monitoring tools, each providing a way to inspect +what the processes on a computer system are doing. They both use +domain-specific languages allowing a user to write scripts which: + + - filter which processes are to be observed + - gather data from the processes of interest + - generate reports on the data + +As of Python 3.6, CPython can be built with embedded "markers", also +known as "probes", that can be observed by a DTrace or SystemTap script, +making it easier to monitor what the CPython processes on a system are +doing. + +.. impl-detail:: + + DTrace markers are implementation details of the CPython interpreter. + No guarantees are made about probe compatibility between versions of + CPython. DTrace scripts can stop working or work incorrectly without + warning when changing CPython versions. + + +Enabling the static markers +--------------------------- + +macOS comes with built-in support for DTrace. On Linux, in order to +build CPython with the embedded markers for SystemTap, the SystemTap +development tools must be installed. + +On a Linux machine, this can be done via:: + + $ yum install systemtap-sdt-devel + +or:: + + $ sudo apt-get install systemtap-sdt-dev + + +CPython must then be configured ``--with-dtrace``: + +.. code-block:: none + + checking for --with-dtrace... yes + +On macOS, you can list available DTrace probes by running a Python +process in the background and listing all probes made available by the +Python provider:: + + $ python3.6 -q & + $ sudo dtrace -l -P python$! # or: dtrace -l -m python3.6 + + ID PROVIDER MODULE FUNCTION NAME + 29564 python18035 python3.6 _PyEval_EvalFrameDefault function-entry + 29565 python18035 python3.6 dtrace_function_entry function-entry + 29566 python18035 python3.6 _PyEval_EvalFrameDefault function-return + 29567 python18035 python3.6 dtrace_function_return function-return + 29568 python18035 python3.6 collect gc-done + 29569 python18035 python3.6 collect gc-start + 29570 python18035 python3.6 _PyEval_EvalFrameDefault line + 29571 python18035 python3.6 maybe_dtrace_line line + +On Linux, you can verify if the SystemTap static markers are present in +the built binary by seeing if it contains a ".note.stapsdt" section. + +:: + + $ readelf -S ./python | grep .note.stapsdt + [30] .note.stapsdt NOTE 0000000000000000 00308d78 + +If you've built Python as a shared library (with --enable-shared), you +need to look instead within the shared library. For example:: + + $ readelf -S libpython3.3dm.so.1.0 | grep .note.stapsdt + [29] .note.stapsdt NOTE 0000000000000000 00365b68 + +Sufficiently modern readelf can print the metadata:: + + $ readelf -n ./python + + Displaying notes found at file offset 0x00000254 with length 0x00000020: + Owner Data size Description + GNU 0x00000010 NT_GNU_ABI_TAG (ABI version tag) + OS: Linux, ABI: 2.6.32 + + Displaying notes found at file offset 0x00000274 with length 0x00000024: + Owner Data size Description + GNU 0x00000014 NT_GNU_BUILD_ID (unique build ID bitstring) + Build ID: df924a2b08a7e89f6e11251d4602022977af2670 + + Displaying notes found at file offset 0x002d6c30 with length 0x00000144: + Owner Data size Description + stapsdt 0x00000031 NT_STAPSDT (SystemTap probe descriptors) + Provider: python + Name: gc__start + Location: 0x00000000004371c3, Base: 0x0000000000630ce2, Semaphore: 0x00000000008d6bf6 + Arguments: -4@%ebx + stapsdt 0x00000030 NT_STAPSDT (SystemTap probe descriptors) + Provider: python + Name: gc__done + Location: 0x00000000004374e1, Base: 0x0000000000630ce2, Semaphore: 0x00000000008d6bf8 + Arguments: -8@%rax + stapsdt 0x00000045 NT_STAPSDT (SystemTap probe descriptors) + Provider: python + Name: function__entry + Location: 0x000000000053db6c, Base: 0x0000000000630ce2, Semaphore: 0x00000000008d6be8 + Arguments: 8@%rbp 8@%r12 -4@%eax + stapsdt 0x00000046 NT_STAPSDT (SystemTap probe descriptors) + Provider: python + Name: function__return + Location: 0x000000000053dba8, Base: 0x0000000000630ce2, Semaphore: 0x00000000008d6bea + Arguments: 8@%rbp 8@%r12 -4@%eax + +The above metadata contains information for SystemTap describing how it +can patch strategically-placed machine code instructions to enable the +tracing hooks used by a SystemTap script. + + +Static DTrace probes +-------------------- + +The following example DTrace script can be used to show the call/return +hierarchy of a Python script, only tracing within the invocation of +a function called "start". In other words, import-time function +invocations are not going to be listed: + +.. code-block:: none + + self int indent; + + python$target:::function-entry + /copyinstr(arg1) == "start"/ + { + self->trace = 1; + } + + python$target:::function-entry + /self->trace/ + { + printf("%d\t%*s:", timestamp, 15, probename); + printf("%*s", self->indent, ""); + printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); + self->indent++; + } + + python$target:::function-return + /self->trace/ + { + self->indent--; + printf("%d\t%*s:", timestamp, 15, probename); + printf("%*s", self->indent, ""); + printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); + } + + python$target:::function-return + /copyinstr(arg1) == "start"/ + { + self->trace = 0; + } + +It can be invoked like this:: + + $ sudo dtrace -q -s call_stack.d -c "python3.6 script.py" + +The output looks like this: + +.. code-block:: none + + 156641360502280 function-entry:call_stack.py:start:23 + 156641360518804 function-entry: call_stack.py:function_1:1 + 156641360532797 function-entry: call_stack.py:function_3:9 + 156641360546807 function-return: call_stack.py:function_3:10 + 156641360563367 function-return: call_stack.py:function_1:2 + 156641360578365 function-entry: call_stack.py:function_2:5 + 156641360591757 function-entry: call_stack.py:function_1:1 + 156641360605556 function-entry: call_stack.py:function_3:9 + 156641360617482 function-return: call_stack.py:function_3:10 + 156641360629814 function-return: call_stack.py:function_1:2 + 156641360642285 function-return: call_stack.py:function_2:6 + 156641360656770 function-entry: call_stack.py:function_3:9 + 156641360669707 function-return: call_stack.py:function_3:10 + 156641360687853 function-entry: call_stack.py:function_4:13 + 156641360700719 function-return: call_stack.py:function_4:14 + 156641360719640 function-entry: call_stack.py:function_5:18 + 156641360732567 function-return: call_stack.py:function_5:21 + 156641360747370 function-return:call_stack.py:start:28 + + +Static SystemTap markers +------------------------ + +The low-level way to use the SystemTap integration is to use the static +markers directly. This requires you to explicitly state the binary file +containing them. + +For example, this SystemTap script can be used to show the call/return +hierarchy of a Python script: + +.. code-block:: none + + probe process("python").mark("function__entry") { + filename = user_string($arg1); + funcname = user_string($arg2); + lineno = $arg3; + + printf("%s => %s in %s:%d\\n", + thread_indent(1), funcname, filename, lineno); + } + + probe process("python").mark("function__return") { + filename = user_string($arg1); + funcname = user_string($arg2); + lineno = $arg3; + + printf("%s <= %s in %s:%d\\n", + thread_indent(-1), funcname, filename, lineno); + } + +It can be invoked like this:: + + $ stap \ + show-call-hierarchy.stp \ + -c "./python test.py" + +The output looks like this: + +.. code-block:: none + + 11408 python(8274): => __contains__ in Lib/_abcoll.py:362 + 11414 python(8274): => __getitem__ in Lib/os.py:425 + 11418 python(8274): => encode in Lib/os.py:490 + 11424 python(8274): <= encode in Lib/os.py:493 + 11428 python(8274): <= __getitem__ in Lib/os.py:426 + 11433 python(8274): <= __contains__ in Lib/_abcoll.py:366 + +where the columns are: + + - time in microseconds since start of script + + - name of executable + + - PID of process + +and the remainder indicates the call/return hierarchy as the script executes. + +For a `--enable-shared` build of CPython, the markers are contained within the +libpython shared library, and the probe's dotted path needs to reflect this. For +example, this line from the above example:: + + probe process("python").mark("function__entry") { + +should instead read:: + + probe process("python").library("libpython3.6dm.so.1.0").mark("function__entry") { + +(assuming a debug build of CPython 3.6) + + +Available static markers +------------------------ + +.. I'm reusing the "c:function" type for markers + +.. c:function:: function__entry(str filename, str funcname, int lineno) + + This marker indicates that execution of a Python function has begun. + It is only triggered for pure-Python (bytecode) functions. + + The filename, function name, and line number are provided back to the + tracing script as positional arguments, which must be accessed using + ``$arg1``, ``$arg2``, ``$arg3``: + + * ``$arg1`` : ``(const char *)`` filename, accessible using ``user_string($arg1)`` + + * ``$arg2`` : ``(const char *)`` function name, accessible using + ``user_string($arg2)`` + + * ``$arg3`` : ``int`` line number + +.. c:function:: function__return(str filename, str funcname, int lineno) + + This marker is the converse of :c:func:`function__entry`, and indicates that + execution of a Python function has ended (either via ``return``, or via an + exception). It is only triggered for pure-Python (bytecode) functions. + + The arguments are the same as for :c:func:`function__entry` + +.. c:function:: line(str filename, str funcname, int lineno) + + This marker indicates a Python line is about to be executed. It is + the equivalent of line-by-line tracing with a Python profiler. It is + not triggered within C functions. + + The arguments are the same as for :c:func:`function__entry`. + +.. c:function:: gc__start(int generation) + + Fires when the Python interpreter starts a garbage collection cycle. + ``arg0`` is the generation to scan, like :func:`gc.collect()`. + +.. c:function:: gc__done(long collected) + + Fires when the Python interpreter finishes a garbage collection + cycle. ``arg0`` is the number of collected objects. + + +SystemTap Tapsets +----------------- + +The higher-level way to use the SystemTap integration is to use a "tapset": +SystemTap's equivalent of a library, which hides some of the lower-level +details of the static markers. + +Here is a tapset file, based on a non-shared build of CPython: + +.. code-block:: none + + /* + Provide a higher-level wrapping around the function__entry and + function__return markers: + \*/ + probe python.function.entry = process("python").mark("function__entry") + { + filename = user_string($arg1); + funcname = user_string($arg2); + lineno = $arg3; + frameptr = $arg4 + } + probe python.function.return = process("python").mark("function__return") + { + filename = user_string($arg1); + funcname = user_string($arg2); + lineno = $arg3; + frameptr = $arg4 + } + +If this file is installed in SystemTap's tapset directory (e.g. +``/usr/share/systemtap/tapset``), then these additional probepoints become +available: + +.. c:function:: python.function.entry(str filename, str funcname, int lineno, frameptr) + + This probe point indicates that execution of a Python function has begun. + It is only triggered for pure-python (bytecode) functions. + +.. c:function:: python.function.return(str filename, str funcname, int lineno, frameptr) + + This probe point is the converse of :c:func:`python.function.return`, and + indicates that execution of a Python function has ended (either via + ``return``, or via an exception). It is only triggered for pure-python + (bytecode) functions. + + +Examples +-------- +This SystemTap script uses the tapset above to more cleanly implement the +example given above of tracing the Python function-call hierarchy, without +needing to directly name the static markers: + +.. code-block:: none + + probe python.function.entry + { + printf("%s => %s in %s:%d\n", + thread_indent(1), funcname, filename, lineno); + } + + probe python.function.return + { + printf("%s <= %s in %s:%d\n", + thread_indent(-1), funcname, filename, lineno); + } + + +The following script uses the tapset above to provide a top-like view of all +running CPython code, showing the top 20 most frequently-entered bytecode +frames, each second, across the whole system: + +.. code-block:: none + + global fn_calls; + + probe python.function.entry + { + fn_calls[pid(), filename, funcname, lineno] += 1; + } + + probe timer.ms(1000) { + printf("\033[2J\033[1;1H") /* clear screen \*/ + printf("%6s %80s %6s %30s %6s\n", + "PID", "FILENAME", "LINE", "FUNCTION", "CALLS") + foreach ([pid, filename, funcname, lineno] in fn_calls- limit 20) { + printf("%6d %80s %6d %30s %6d\n", + pid, filename, lineno, funcname, + fn_calls[pid, filename, funcname, lineno]); + } + delete fn_calls; + } + diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 6498ea5..f962cd8 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1683,7 +1683,7 @@ Implementing structured logging ------------------------------- Although most logging messages are intended for reading by humans, and thus not -readily machine-parseable, there might be circumstances where you want to output +readily machine-parseable, there might be cirumstances where you want to output messages in a structured format which *is* capable of being parsed by a program (without needing complex regular expressions to parse the log message). This is straightforward to achieve using the logging package. There are a number of @@ -2165,8 +2165,8 @@ Speaking logging messages ------------------------- There might be situations when it is desirable to have logging messages rendered -in an audible rather than a visible format. This is easy to do if you have -text-to-speech (TTS) functionality available in your system, even if it doesn't have +in an audible rather than a visible format. This is easy to do if you have text- +to-speech (TTS) functionality available in your system, even if it doesn't have a Python binding. Most TTS systems have a command line program you can run, and this can be invoked from a handler using :mod:`subprocess`. It's assumed here that TTS command line programs won't expect to interact with users or take a diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index 8562d23..696f8e7 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -17,8 +17,7 @@ Porting Python 2 Code to Python 3 please see :ref:`cporting-howto`. If you would like to read one core Python developer's take on why Python 3 - came into existence, you can read Nick Coghlan's `Python 3 Q & A`_ or - Brett Cannon's `Why Python 3 exists`_. + came into existence, you can read Nick Coghlan's `Python 3 Q & A`_. For help with porting, you can email the python-porting_ mailing list with questions. @@ -33,7 +32,8 @@ are: #. Make sure you have good test coverage (coverage.py_ can help; ``pip install coverage``) #. Learn the differences between Python 2 & 3 -#. Use Futurize_ (or Modernize_) to update your code (e.g. ``pip install future``) +#. Use Modernize_ or Futurize_ to update your code (``pip install modernize`` or + ``pip install future``, respectively) #. Use Pylint_ to help make sure you don't regress on your Python 3 support (``pip install pylint``) #. Use caniusepython3_ to find out which of your dependencies are blocking your @@ -41,9 +41,10 @@ are: #. Once your dependencies are no longer blocking you, use continuous integration to make sure you stay compatible with Python 2 & 3 (tox_ can help test against multiple versions of Python; ``pip install tox``) -#. Consider using optional static type checking to make sure your type usage - works in both Python 2 & 3 (e.g. use mypy_ to check your typing under both - Python 2 & Python 3). + +If you are dropping support for Python 2 entirely, then after you learn the +differences between Python 2 & 3 you can run 2to3_ over your code and skip the +rest of the steps outlined above. Details @@ -53,7 +54,7 @@ A key point about supporting Python 2 & 3 simultaneously is that you can start **today**! Even if your dependencies are not supporting Python 3 yet that does not mean you can't modernize your code **now** to support Python 3. Most changes required to support Python 3 lead to cleaner code using newer practices even in -Python 2 code. +Python 2. Another key point is that modernizing your Python 2 code to also support Python 3 is largely automated for you. While you might have to make some API @@ -81,13 +82,12 @@ have to import a function instead of using a built-in one, but otherwise the overall transformation should not feel foreign to you. But you should aim for only supporting Python 2.7. Python 2.6 is no longer -freely supported and thus is not receiving bugfixes. This means **you** will have -to work around any issues you come across with Python 2.6. There are also some +supported and thus is not receiving bugfixes. This means **you** will have to +work around any issues you come across with Python 2.6. There are also some tools mentioned in this HOWTO which do not support Python 2.6 (e.g., Pylint_), and this will become more commonplace as time goes on. It will simply be easier for you if you only support the versions of Python that you have to support. - Make sure you specify the proper version support in your ``setup.py`` file -------------------------------------------------------------------------- @@ -98,7 +98,6 @@ Python 3 yet you should at least have also specify each major/minor version of Python that you do support, e.g. ``Programming Language :: Python :: 2.7``. - Have good test coverage ----------------------- @@ -107,10 +106,9 @@ to, you will want to make sure your test suite has good coverage. A good rule of thumb is that if you want to be confident enough in your test suite that any failures that appear after having tools rewrite your code are actual bugs in the tools and not in your code. If you want a number to aim for, try to get over 80% -coverage (and don't feel bad if you find it hard to get better than 90% -coverage). If you don't already have a tool to measure test coverage then -coverage.py_ is recommended. - +coverage (and don't feel bad if you can't easily get past 90%). If you +don't already have a tool to measure test coverage then coverage.py_ is +recommended. Learn the differences between Python 2 & 3 ------------------------------------------- @@ -129,15 +127,13 @@ Update your code Once you feel like you know what is different in Python 3 compared to Python 2, it's time to update your code! You have a choice between two tools in porting -your code automatically: Futurize_ and Modernize_. Which tool you choose will +your code automatically: Modernize_ and Futurize_. Which tool you choose will depend on how much like Python 3 you want your code to be. Futurize_ does its best to make Python 3 idioms and practices exist in Python 2, e.g. backporting the ``bytes`` type from Python 3 so that you have semantic parity between the major versions of Python. Modernize_, on the other hand, is more conservative and targets a Python 2/3 subset of -Python, directly relying on six_ to help provide compatibility. As Python 3 is -the future, it might be best to consider Futurize to begin adjusting to any new -practices that Python 3 introduces which you are not accustomed to yet. +Python, relying on six_ to help provide compatibility. Regardless of which tool you choose, they will update your code to run under Python 3 while staying compatible with the version of Python 2 you started with. @@ -157,7 +153,6 @@ the built-in ``open()`` function is off by default in Modernize). Luckily, though, there are only a couple of things to watch out for which can be considered large issues that may be hard to debug if not watched for. - Division ++++++++ @@ -178,7 +173,6 @@ an object defines a ``__truediv__`` method but not ``__floordiv__`` then your code would begin to fail (e.g. a user-defined class that uses ``/`` to signify some operation but not ``//`` for the same thing or at all). - Text versus binary data +++++++++++++++++++++++ @@ -195,7 +189,7 @@ To make the distinction between text and binary data clearer and more pronounced, Python 3 did what most languages created in the age of the internet have done and made text and binary data distinct types that cannot blindly be mixed together (Python predates widespread access to the internet). For any code -that deals only with text or only binary data, this separation doesn't pose an +that only deals with text or only binary data, this separation doesn't pose an issue. But for code that has to deal with both, it does mean you might have to now care about when you are using text compared to binary data, which is why this cannot be entirely automated. @@ -204,15 +198,15 @@ To start, you will need to decide which APIs take text and which take binary (it is **highly** recommended you don't design APIs that can take both due to the difficulty of keeping the code working; as stated earlier it is difficult to do well). In Python 2 this means making sure the APIs that take text can work -with ``unicode`` and those that work with binary data work with the -``bytes`` type from Python 3 (which is a subset of ``str`` in Python 2 and acts -as an alias for ``bytes`` type in Python 2). Usually the biggest issue is -realizing which methods exist on which types in Python 2 & 3 simultaneously +with ``unicode`` in Python 2 and those that work with binary data work with the +``bytes`` type from Python 3 and thus a subset of ``str`` in Python 2 (which the +``bytes`` type in Python 2 is an alias for). Usually the biggest issue is +realizing which methods exist for which types in Python 2 & 3 simultaneously (for text that's ``unicode`` in Python 2 and ``str`` in Python 3, for binary that's ``str``/``bytes`` in Python 2 and ``bytes`` in Python 3). The following table lists the **unique** methods of each data type across Python 2 & 3 (e.g., the ``decode()`` method is usable on the equivalent binary data type in -either Python 2 or 3, but it can't be used by the textual data type consistently +either Python 2 or 3, but it can't be used by the text data type consistently between Python 2 and 3 because ``str`` in Python 3 doesn't have the method). Do note that as of Python 3.5 the ``__mod__`` method was added to the bytes type. @@ -238,11 +232,10 @@ This allows your code to work with only text internally and thus eliminates having to keep track of what type of data you are working with. The next issue is making sure you know whether the string literals in your code -represent text or binary data. You should add a ``b`` prefix to any -literal that presents binary data. For text you should add a ``u`` prefix to -the text literal. (there is a :mod:`__future__` import to force all unspecified -literals to be Unicode, but usage has shown it isn't as effective as adding a -``b`` or ``u`` prefix to all literals explicitly) +represent text or binary data. At minimum you should add a ``b`` prefix to any +literal that presents binary data. For text you should either use the +``from __future__ import unicode_literals`` statement or add a ``u`` prefix to +the text literal. As part of this dichotomy you also need to be careful about opening files. Unless you have been working on Windows, there is a chance you have not always @@ -250,13 +243,11 @@ bothered to add the ``b`` mode when opening a binary file (e.g., ``rb`` for binary reading). Under Python 3, binary files and text files are clearly distinct and mutually incompatible; see the :mod:`io` module for details. Therefore, you **must** make a decision of whether a file will be used for -binary access (allowing binary data to be read and/or written) or textual access +binary access (allowing binary data to be read and/or written) or text access (allowing text data to be read and/or written). You should also use :func:`io.open` for opening files instead of the built-in :func:`open` function as the :mod:`io` module is consistent from Python 2 to 3 while the built-in :func:`open` function -is not (in Python 3 it's actually :func:`io.open`). Do not bother with the -outdated practice of using :func:`codecs.open` as that's only necessary for -keeping compatibility with Python 2.5. +is not (in Python 3 it's actually :func:`io.open`). The constructors of both ``str`` and ``bytes`` have different semantics for the same arguments between Python 2 & 3. Passing an integer to ``bytes`` in Python 2 @@ -283,22 +274,21 @@ To summarize: #. Make sure that your code that works with text also works with ``unicode`` and code for binary data works with ``bytes`` in Python 2 (see the table above for what methods you cannot use for each type) -#. Mark all binary literals with a ``b`` prefix, textual literals with a ``u`` - prefix +#. Mark all binary literals with a ``b`` prefix, use a ``u`` prefix or + :mod:`__future__` import statement for text literals #. Decode binary data to text as soon as possible, encode text as binary data as late as possible #. Open files using :func:`io.open` and make sure to specify the ``b`` mode when appropriate -#. Be careful when indexing into binary data +#. Be careful when indexing binary data Use feature detection instead of version detection ++++++++++++++++++++++++++++++++++++++++++++++++++ - Inevitably you will have code that has to choose what to do based on what version of Python is running. The best way to do this is with feature detection of whether the version of Python you're running under supports what you need. -If for some reason that doesn't work then you should make the version check be +If for some reason that doesn't work then you should make the version check is against Python 2 and not Python 3. To help explain this, let's look at an example. @@ -350,12 +340,14 @@ at least the following block of code at the top of it:: from __future__ import absolute_import from __future__ import division from __future__ import print_function + from __future__ import unicode_literals You can also run Python 2 with the ``-3`` flag to be warned about various compatibility issues your code triggers during execution. If you turn warnings into errors with ``-Werror`` then you can make sure that you don't accidentally miss a warning. + You can also use the Pylint_ project and its ``--py3k`` flag to lint your code to receive warnings when your code begins to deviate from Python 3 compatibility. This also prevents you from having to run Modernize_ or Futurize_ @@ -372,23 +364,22 @@ care about whether your dependencies have also been ported. The caniusepython3_ project was created to help you determine which projects -- directly or indirectly -- are blocking you from supporting Python 3. There is both a command-line tool as well as a web interface at -https://caniusepython3.com. +https://caniusepython3.com . The project also provides code which you can integrate into your test suite so that you will have a failing test when you no longer have dependencies blocking you from using Python 3. This allows you to avoid having to manually check your dependencies and to be notified quickly when you can start running on Python 3. - Update your ``setup.py`` file to denote Python 3 compatibility -------------------------------------------------------------- Once your code works under Python 3, you should update the classifiers in your ``setup.py`` to contain ``Programming Language :: Python :: 3`` and to not -specify sole Python 2 support. This will tell anyone using your code that you -support Python 2 **and** 3. Ideally you will also want to add classifiers for -each major/minor version of Python you now support. - +specify sole Python 2 support. This will tell +anyone using your code that you support Python 2 **and** 3. Ideally you will +also want to add classifiers for each major/minor version of Python you now +support. Use continuous integration to stay compatible --------------------------------------------- @@ -413,17 +404,20 @@ don't accidentally break Python 2 or 3 compatibility regardless of which version you typically run your tests under while developing. -Consider using optional static type checking --------------------------------------------- +Dropping Python 2 support completely +==================================== + +If you are able to fully drop support for Python 2, then the steps required +to transition to Python 3 simplify greatly. + +#. Update your code to only support Python 2.7 +#. Make sure you have good test coverage (coverage.py_ can help) +#. Learn the differences between Python 2 & 3 +#. Use 2to3_ to rewrite your code to run only under Python 3 -Another way to help port your code is to use a static type checker like -mypy_ or pytype_ on your code. These tools can be used to analyze your code as -if it's being run under Python 2, then you can run the tool a second time as if -your code is running under Python 3. By running a static type checker twice like -this you can discover if you're e.g. misusing binary data type in one version -of Python compared to another. If you add optional type hints to your code you -can also explicitly state whether your APIs use textual or binary data, helping -to make sure everything functions as expected in both versions of Python. +After this your code will be fully Python 3 compliant but in a way that is not +supported by Python 2. You should also update the classifiers in your +``setup.py`` to contain ``Programming Language :: Python :: 3 :: Only``. .. _2to3: https://docs.python.org/3/library/2to3.html @@ -434,19 +428,13 @@ to make sure everything functions as expected in both versions of Python. .. _importlib: https://docs.python.org/3/library/importlib.html#module-importlib .. _importlib2: https://pypi.python.org/pypi/importlib2 .. _Modernize: https://python-modernize.readthedocs.org/en/latest/ -.. _mypy: http://mypy-lang.org/ .. _Porting to Python 3: http://python3porting.com/ .. _Pylint: https://pypi.python.org/pypi/pylint - .. _Python 3 Q & A: https://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html -.. _pytype: https://github.com/google/pytype .. _python-future: http://python-future.org/ .. _python-porting: https://mail.python.org/mailman/listinfo/python-porting .. _six: https://pypi.python.org/pypi/six .. _tox: https://pypi.python.org/pypi/tox .. _trove classifier: https://pypi.python.org/pypi?%3Aaction=list_classifiers - .. _"What's New": https://docs.python.org/3/whatsnew/index.html - -.. _Why Python 3 exists: http://www.snarky.ca/why-python-3-exists diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index 9649b9c..a48ae1f 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -43,9 +43,9 @@ hold values ranging from 0 to 255. ASCII codes only went up to 127, so some machines assigned values between 128 and 255 to accented characters. Different machines had different codes, however, which led to problems exchanging files. Eventually various commonly used sets of values for the 128--255 range emerged. -Some were true standards, defined by the International Organization for -Standardization, and some were *de facto* conventions that were invented by one -company or another and managed to catch on. +Some were true standards, defined by the International Standards Organization, +and some were *de facto* conventions that were invented by one company or +another and managed to catch on. 255 characters aren't very many. For example, you can't fit both the accented characters used in Western Europe and the Cyrillic alphabet used for Russian diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst index 8d383e0..712b4b7 100644 --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -34,8 +34,8 @@ handling common situations - like basic authentication, cookies, proxies and so on. These are provided by objects called handlers and openers. urllib.request supports fetching URLs for many "URL schemes" (identified by the string -before the ``":"`` in URL - for example ``"ftp"`` is the URL scheme of -``"ftp://python.org/"``) using their associated network protocols (e.g. FTP, HTTP). +before the ":" in URL - for example "ftp" is the URL scheme of +"ftp://python.org/") using their associated network protocols (e.g. FTP, HTTP). This tutorial focuses on the most common case, HTTP. For straightforward situations *urlopen* is very easy to use. But as soon as you @@ -511,10 +511,10 @@ than the URL you pass to .add_password() will also match. :: ``top_level_url`` is in fact *either* a full URL (including the 'http:' scheme component and the hostname and optionally the port number) -e.g. ``"http://example.com/"`` *or* an "authority" (i.e. the hostname, -optionally including the port number) e.g. ``"example.com"`` or ``"example.com:8080"`` +e.g. "http://example.com/" *or* an "authority" (i.e. the hostname, +optionally including the port number) e.g. "example.com" or "example.com:8080" (the latter example includes a port number). The authority, if present, must -NOT contain the "userinfo" component - for example ``"joe:password@example.com"`` is +NOT contain the "userinfo" component - for example "joe:password@example.com" is not correct. @@ -578,7 +578,7 @@ Footnotes This document was reviewed and revised by John Lee. .. [#] Google for example. -.. [#] Browser sniffing is a very bad practice for website design - building +.. [#] Browser sniffing is a very bad practise for website design - building sites using web standards is much more sensible. Unfortunately a lot of sites still send different versions to different browsers. .. [#] The user agent for MSIE 6 is diff --git a/Doc/includes/email-alternative-new-api.py b/Doc/includes/email-alternative-new-api.py deleted file mode 100644 index 321f727..0000000 --- a/Doc/includes/email-alternative-new-api.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python3 - -import smtplib - -from email.message import EmailMessage -from email.headerregistry import Address -from email.utils import make_msgid - -# Create the base text message. -msg = EmailMessage() -msg['Subject'] = "Ayons asperges pour le déjeuner" -msg['From'] = Address("Pepé Le Pew", "pepe", "example.com") -msg['To'] = (Address("Penelope Pussycat", "penelope", "example.com"), - Address("Fabrette Pussycat", "fabrette", "example.com")) -msg.set_content("""\ -Salut! - -Cela ressemble à un excellent recipie[1] déjeuner. - -[1] http://www.yummly.com/recipe/Roasted-Asparagus-Epicurious-203718 - ---Pepé -""") - -# Add the html version. This converts the message into a multipart/alternative -# container, with the original text message as the first part and the new html -# message as the second part. -asparagus_cid = make_msgid() -msg.add_alternative("""\ - - - -

Salut!<\p> -

Cela ressemble à un excellent - - - -""".format(asparagus_cid=asparagus_cid[1:-1]), subtype='html') -# note that we needed to peel the <> off the msgid for use in the html. - -# Now add the related image to the html part. -with open("roasted-asparagus.jpg", 'rb') as img: - msg.get_payload()[1].add_related(img.read(), 'image', 'jpeg', - cid=asparagus_cid) - -# Make a local copy of what we are going to send. -with open('outgoing.msg', 'wb') as f: - f.write(bytes(msg)) - -# Send the message via local SMTP server. -with smtplib.SMTP('localhost') as s: - s.send_message(msg) diff --git a/Doc/includes/email-alternative.py b/Doc/includes/email-alternative.py old mode 100755 new mode 100644 index 85070f3..2e142b1 --- a/Doc/includes/email-alternative.py +++ b/Doc/includes/email-alternative.py @@ -2,47 +2,55 @@ import smtplib -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText - -# me == my email address -# you == recipient's email address -me = "my@email.com" -you = "your@email.com" - -# Create message container - the correct MIME type is multipart/alternative. -msg = MIMEMultipart('alternative') -msg['Subject'] = "Link" -msg['From'] = me -msg['To'] = you - -# Create the body of the message (a plain-text and an HTML version). -text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org" -html = """\ +from email.message import EmailMessage +from email.headerregistry import Address +from email.utils import make_msgid + +# Create the base text message. +msg = EmailMessage() +msg['Subject'] = "Ayons asperges pour le déjeuner" +msg['From'] = Address("Pepé Le Pew", "pepe", "example.com") +msg['To'] = (Address("Penelope Pussycat", "penelope", "example.com"), + Address("Fabrette Pussycat", "fabrette", "example.com")) +msg.set_content("""\ +Salut! + +Cela ressemble à un excellent recipie[1] déjeuner. + +[1] http://www.yummly.com/recipe/Roasted-Asparagus-Epicurious-203718 + +--Pepé +""") + +# Add the html version. This converts the message into a multipart/alternative +# container, with the original text message as the first part and the new html +# message as the second part. +asparagus_cid = make_msgid() +msg.add_alternative("""\ -

Hi!
- How are you?
- Here is the link you wanted. +

Salut!

+

Cela ressemble à un excellent + -""" +""".format(asparagus_cid=asparagus_cid[1:-1]), subtype='html') +# note that we needed to peel the <> off the msgid for use in the html. -# Record the MIME types of both parts - text/plain and text/html. -part1 = MIMEText(text, 'plain') -part2 = MIMEText(html, 'html') +# Now add the related image to the html part. +with open("roasted-asparagus.jpg", 'rb') as img: + msg.get_payload()[1].add_related(img.read(), 'image', 'jpeg', + cid=asparagus_cid) -# Attach parts into message container. -# According to RFC 2046, the last part of a multipart message, in this case -# the HTML message, is best and preferred. -msg.attach(part1) -msg.attach(part2) +# Make a local copy of what we are going to send. +with open('outgoing.msg', 'wb') as f: + f.write(bytes(msg)) # Send the message via local SMTP server. -s = smtplib.SMTP('localhost') -# sendmail function takes 3 arguments: sender's address, recipient's address -# and message to send - here it is sent as one string. -s.sendmail(me, you, msg.as_string()) -s.quit() +with smtplib.SMTP('localhost') as s: + s.send_message(msg) diff --git a/Doc/includes/email-dir.py b/Doc/includes/email-dir.py index 3c7c770..0dcfbfb 100644 --- a/Doc/includes/email-dir.py +++ b/Doc/includes/email-dir.py @@ -3,22 +3,14 @@ """Send the contents of a directory as a MIME message.""" import os -import sys import smtplib # For guessing MIME type based on file name extension import mimetypes from argparse import ArgumentParser -from email import encoders -from email.message import Message -from email.mime.audio import MIMEAudio -from email.mime.base import MIMEBase -from email.mime.image import MIMEImage -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText - -COMMASPACE = ', ' +from email.message import EmailMessage +from email.policy import SMTP def main(): @@ -47,12 +39,12 @@ must be running an SMTP server. directory = args.directory if not directory: directory = '.' - # Create the enclosing (outer) message - outer = MIMEMultipart() - outer['Subject'] = 'Contents of directory %s' % os.path.abspath(directory) - outer['To'] = COMMASPACE.join(args.recipients) - outer['From'] = args.sender - outer.preamble = 'You will not see this in a MIME-aware mail reader.\n' + # Create the message + msg = EmailMessage() + msg['Subject'] = 'Contents of directory %s' % os.path.abspath(directory) + msg['To'] = ', '.join(args.recipients) + msg['From'] = args.sender + msg.preamble = 'You will not see this in a MIME-aware mail reader.\n' for filename in os.listdir(directory): path = os.path.join(directory, filename) @@ -67,33 +59,18 @@ must be running an SMTP server. # use a generic bag-of-bits type. ctype = 'application/octet-stream' maintype, subtype = ctype.split('/', 1) - if maintype == 'text': - with open(path) as fp: - # Note: we should handle calculating the charset - msg = MIMEText(fp.read(), _subtype=subtype) - elif maintype == 'image': - with open(path, 'rb') as fp: - msg = MIMEImage(fp.read(), _subtype=subtype) - elif maintype == 'audio': - with open(path, 'rb') as fp: - msg = MIMEAudio(fp.read(), _subtype=subtype) - else: - with open(path, 'rb') as fp: - msg = MIMEBase(maintype, subtype) - msg.set_payload(fp.read()) - # Encode the payload using Base64 - encoders.encode_base64(msg) - # Set the filename parameter - msg.add_header('Content-Disposition', 'attachment', filename=filename) - outer.attach(msg) + with open(path, 'rb') as fp: + msg.add_attachment(fp.read(), + maintype=maintype, + subtype=subtype, + filename=filename) # Now send or store the message - composed = outer.as_string() if args.output: - with open(args.output, 'w') as fp: - fp.write(composed) + with open(args.output, 'wb') as fp: + fp.write(msg.as_bytes(policy=SMTP)) else: with smtplib.SMTP('localhost') as s: - s.sendmail(args.sender, args.recipients, composed) + s.send_message(msg) if __name__ == '__main__': diff --git a/Doc/includes/email-headers.py b/Doc/includes/email-headers.py index 89c8f3a..2c42145 100644 --- a/Doc/includes/email-headers.py +++ b/Doc/includes/email-headers.py @@ -1,18 +1,24 @@ # Import the email modules we'll need -from email.parser import Parser +from email.parser import BytesParser, Parser +from email.policy import default # If the e-mail headers are in a file, uncomment these two lines: -# with open(messagefile) as fp: -# headers = Parser().parse(fp) +# with open(messagefile, 'rb') as fp: +# headers = BytesParser(policy=default).parse(fp) -# Or for parsing headers in a string, use: -headers = Parser().parsestr('From: \n' +# Or for parsing headers in a string (this is an uncommon operation), use: +headers = Parser(policy=default).parsestr( + 'From: Foo Bar \n' 'To: \n' 'Subject: Test message\n' '\n' 'Body would go here\n') # Now the header items can be accessed as a dictionary: -print('To: %s' % headers['to']) -print('From: %s' % headers['from']) -print('Subject: %s' % headers['subject']) +print('To: {}'.format(headers['to'])) +print('From: {}'.format(headers['from'])) +print('Subject: {}'.format(headers['subject'])) + +# You can also access the parts of the addresses: +print('Recipient username: {}'.format(headers['to'].addresses[0].username)) +print('Sender name: {}'.format(headers['from'].addresses[0].display_name)) diff --git a/Doc/includes/email-mime.py b/Doc/includes/email-mime.py index 61d0830..c610242 100644 --- a/Doc/includes/email-mime.py +++ b/Doc/includes/email-mime.py @@ -1,30 +1,29 @@ # Import smtplib for the actual sending function import smtplib -# Here are the email package modules we'll need -from email.mime.image import MIMEImage -from email.mime.multipart import MIMEMultipart +# And imghdr to find the types of our images +import imghdr -COMMASPACE = ', ' +# Here are the email package modules we'll need +from email.message import EmailMessage -# Create the container (outer) email message. -msg = MIMEMultipart() +# Create the container email message. +msg = EmailMessage() msg['Subject'] = 'Our family reunion' # me == the sender's email address # family = the list of all recipients' email addresses msg['From'] = me -msg['To'] = COMMASPACE.join(family) +msg['To'] = ', '.join(family) msg.preamble = 'Our family reunion' -# Assume we know that the image files are all in PNG format +# Open the files in binary mode. Use imghdr to figure out the +# MIME subtype for each specific image. for file in pngfiles: - # Open the files in binary mode. Let the MIMEImage class automatically - # guess the specific image type. with open(file, 'rb') as fp: - img = MIMEImage(fp.read()) - msg.attach(img) + img_data = fp.read() + msg.add_attachment(img_data, maintype='image', + subtype=imghdr.what(None, img_data)) # Send the email via our own SMTP server. -s = smtplib.SMTP('localhost') -s.send_message(msg) -s.quit() +with smtplib.SMTP('localhost') as s: + s.send_message(msg) diff --git a/Doc/includes/email-read-alternative-new-api.py b/Doc/includes/email-read-alternative.py similarity index 100% rename from Doc/includes/email-read-alternative-new-api.py rename to Doc/includes/email-read-alternative.py diff --git a/Doc/includes/email-simple.py b/Doc/includes/email-simple.py index b9b8b41..f69ef40 100644 --- a/Doc/includes/email-simple.py +++ b/Doc/includes/email-simple.py @@ -2,13 +2,13 @@ import smtplib # Import the email modules we'll need -from email.mime.text import MIMEText +from email.message import EmailMessage -# Open a plain text file for reading. For this example, assume that -# the text file contains only ASCII characters. +# Open the plain text file whose name is in textfile for reading. with open(textfile) as fp: # Create a text/plain message - msg = MIMEText(fp.read()) + msg = EmailMessage() + msg.set_content(fp.read()) # me == the sender's email address # you == the recipient's email address diff --git a/Doc/includes/email-unpack.py b/Doc/includes/email-unpack.py index 574a0b6..e0a7f01 100644 --- a/Doc/includes/email-unpack.py +++ b/Doc/includes/email-unpack.py @@ -3,11 +3,11 @@ """Unpack a MIME message into a directory of files.""" import os -import sys import email -import errno import mimetypes +from email.policy import default + from argparse import ArgumentParser @@ -22,8 +22,8 @@ Unpack a MIME message into a directory of files. parser.add_argument('msgfile') args = parser.parse_args() - with open(args.msgfile) as fp: - msg = email.message_from_file(fp) + with open(args.msgfile, 'rb') as fp: + msg = email.message_from_binary_file(fp, policy=default) try: os.mkdir(args.directory) diff --git a/Doc/includes/run-func.c b/Doc/includes/run-func.c index 986d670..ead7bdd 100644 --- a/Doc/includes/run-func.c +++ b/Doc/includes/run-func.c @@ -63,6 +63,8 @@ main(int argc, char *argv[]) fprintf(stderr, "Failed to load \"%s\"\n", argv[1]); return 1; } - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + return 120; + } return 0; } diff --git a/Doc/includes/setup.py b/Doc/includes/setup.py index a38a39d..b853d23 100644 --- a/Doc/includes/setup.py +++ b/Doc/includes/setup.py @@ -5,5 +5,4 @@ setup(name="noddy", version="1.0", Extension("noddy2", ["noddy2.c"]), Extension("noddy3", ["noddy3.c"]), Extension("noddy4", ["noddy4.c"]), - Extension("shoddy", ["shoddy.c"]), ]) diff --git a/Doc/includes/shoddy.c b/Doc/includes/shoddy.c index 0c6d412..07a2721 100644 --- a/Doc/includes/shoddy.c +++ b/Doc/includes/shoddy.c @@ -31,7 +31,7 @@ Shoddy_init(Shoddy *self, PyObject *args, PyObject *kwds) static PyTypeObject ShoddyType = { - PyVarObject_HEAD_INIT(NULL, 0) + PyObject_HEAD_INIT(NULL) "shoddy.Shoddy", /* tp_name */ sizeof(Shoddy), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/Doc/includes/test.py b/Doc/includes/test.py index 7ebf46a..9e9d4a6 100644 --- a/Doc/includes/test.py +++ b/Doc/includes/test.py @@ -204,7 +204,7 @@ Test cyclic gc(?) import os import sys from distutils.util import get_platform -PLAT_SPEC = "%s-%s" % (get_platform(), sys.version[0:3]) +PLAT_SPEC = "%s-%d.%d" % (get_platform(), *sys.version_info[:2]) src = os.path.join("build", "lib.%s" % PLAT_SPEC) sys.path.append(src) diff --git a/Doc/includes/tzinfo-examples.py b/Doc/includes/tzinfo-examples.py index 3a8cf47..ae5a509 100644 --- a/Doc/includes/tzinfo-examples.py +++ b/Doc/includes/tzinfo-examples.py @@ -1,46 +1,13 @@ -from datetime import tzinfo, timedelta, datetime +from datetime import tzinfo, timedelta, datetime, timezone ZERO = timedelta(0) HOUR = timedelta(hours=1) - -# A UTC class. - -class UTC(tzinfo): - """UTC""" - - def utcoffset(self, dt): - return ZERO - - def tzname(self, dt): - return "UTC" - - def dst(self, dt): - return ZERO - -utc = UTC() - -# A class building tzinfo objects for fixed-offset time zones. -# Note that FixedOffset(0, "UTC") is a different way to build a -# UTC tzinfo object. - -class FixedOffset(tzinfo): - """Fixed offset in minutes east from UTC.""" - - def __init__(self, offset, name): - self.__offset = timedelta(minutes=offset) - self.__name = name - - def utcoffset(self, dt): - return self.__offset - - def tzname(self, dt): - return self.__name - - def dst(self, dt): - return ZERO +SECOND = timedelta(seconds=1) # A class capturing the platform's idea of local time. - +# (May result in wrong values on historical times in +# timezones where UTC offset and/or the DST rules had +# changed in the past.) import time as _time STDOFFSET = timedelta(seconds = -_time.timezone) @@ -53,6 +20,16 @@ DSTDIFF = DSTOFFSET - STDOFFSET class LocalTimezone(tzinfo): + def fromutc(self, dt): + assert dt.tzinfo is self + stamp = (dt - datetime(1970, 1, 1, tzinfo=self)) // SECOND + args = _time.localtime(stamp)[:6] + dst_diff = DSTDIFF // SECOND + # Detect fold + fold = (args == _time.localtime(stamp - dst_diff)) + return datetime(*args, microsecond=dt.microsecond, + tzinfo=self, fold=fold) + def utcoffset(self, dt): if self._isdst(dt): return DSTOFFSET @@ -99,20 +76,37 @@ def first_sunday_on_or_after(dt): # In the US, since 2007, DST starts at 2am (standard time) on the second # Sunday in March, which is the first Sunday on or after Mar 8. DSTSTART_2007 = datetime(1, 3, 8, 2) -# and ends at 2am (DST time; 1am standard time) on the first Sunday of Nov. -DSTEND_2007 = datetime(1, 11, 1, 1) +# and ends at 2am (DST time) on the first Sunday of Nov. +DSTEND_2007 = datetime(1, 11, 1, 2) # From 1987 to 2006, DST used to start at 2am (standard time) on the first -# Sunday in April and to end at 2am (DST time; 1am standard time) on the last +# Sunday in April and to end at 2am (DST time) on the last # Sunday of October, which is the first Sunday on or after Oct 25. DSTSTART_1987_2006 = datetime(1, 4, 1, 2) -DSTEND_1987_2006 = datetime(1, 10, 25, 1) +DSTEND_1987_2006 = datetime(1, 10, 25, 2) # From 1967 to 1986, DST used to start at 2am (standard time) on the last -# Sunday in April (the one on or after April 24) and to end at 2am (DST time; -# 1am standard time) on the last Sunday of October, which is the first Sunday +# Sunday in April (the one on or after April 24) and to end at 2am (DST time) +# on the last Sunday of October, which is the first Sunday # on or after Oct 25. DSTSTART_1967_1986 = datetime(1, 4, 24, 2) DSTEND_1967_1986 = DSTEND_1987_2006 +def us_dst_range(year): + # Find start and end times for US DST. For years before 1967, return + # start = end for no DST. + if 2006 < year: + dststart, dstend = DSTSTART_2007, DSTEND_2007 + elif 1986 < year < 2007: + dststart, dstend = DSTSTART_1987_2006, DSTEND_1987_2006 + elif 1966 < year < 1987: + dststart, dstend = DSTSTART_1967_1986, DSTEND_1967_1986 + else: + return (datetime(year, 1, 1), ) * 2 + + start = first_sunday_on_or_after(dststart.replace(year=year)) + end = first_sunday_on_or_after(dstend.replace(year=year)) + return start, end + + class USTimeZone(tzinfo): def __init__(self, hours, reprname, stdname, dstname): @@ -141,27 +135,39 @@ class USTimeZone(tzinfo): # implementation) passes a datetime with dt.tzinfo is self. return ZERO assert dt.tzinfo is self - - # Find start and end times for US DST. For years before 1967, return - # ZERO for no DST. - if 2006 < dt.year: - dststart, dstend = DSTSTART_2007, DSTEND_2007 - elif 1986 < dt.year < 2007: - dststart, dstend = DSTSTART_1987_2006, DSTEND_1987_2006 - elif 1966 < dt.year < 1987: - dststart, dstend = DSTSTART_1967_1986, DSTEND_1967_1986 - else: - return ZERO - - start = first_sunday_on_or_after(dststart.replace(year=dt.year)) - end = first_sunday_on_or_after(dstend.replace(year=dt.year)) - + start, end = us_dst_range(dt.year) # Can't compare naive to aware objects, so strip the timezone from # dt first. - if start <= dt.replace(tzinfo=None) < end: + dt = dt.replace(tzinfo=None) + if start + HOUR <= dt < end - HOUR: + # DST is in effect. return HOUR - else: - return ZERO + if end - HOUR <= dt < end: + # Fold (an ambiguous hour): use dt.fold to disambiguate. + return ZERO if dt.fold else HOUR + if start <= dt < start + HOUR: + # Gap (a non-existent hour): reverse the fold rule. + return HOUR if dt.fold else ZERO + # DST is off. + return ZERO + + def fromutc(self, dt): + assert dt.tzinfo is self + start, end = us_dst_range(dt.year) + start = start.replace(tzinfo=self) + end = end.replace(tzinfo=self) + std_time = dt + self.stdoffset + dst_time = std_time + HOUR + if end <= dst_time < end + HOUR: + # Repeated hour + return std_time.replace(fold=1) + if std_time < start or dst_time >= end: + # Standard time + return std_time + if start <= std_time < end - HOUR: + # Daylight saving time + return dst_time + Eastern = USTimeZone(-5, "Eastern", "EST", "EDT") Central = USTimeZone(-6, "Central", "CST", "CDT") diff --git a/Doc/installing/index.rst b/Doc/installing/index.rst index 1ef3149..b22465d 100644 --- a/Doc/installing/index.rst +++ b/Doc/installing/index.rst @@ -2,9 +2,9 @@ .. _installing-index: -***************************** - Installing Python Modules -***************************** +************************* +Installing Python Modules +************************* :Email: distutils-sig@python.org @@ -34,24 +34,24 @@ Key terms * ``pip`` is the preferred installer program. Starting with Python 3.4, it is included by default with the Python binary installers. -* a virtual environment is a semi-isolated Python environment that allows +* A *virtual environment* is a semi-isolated Python environment that allows packages to be installed for use by a particular application, rather than - being installed system wide -* ``pyvenv`` is the standard tool for creating virtual environments, and has + being installed system wide. +* ``venv`` is the standard tool for creating virtual environments, and has been part of Python since Python 3.3. Starting with Python 3.4, it - defaults to installing ``pip`` into all created virtual environments + defaults to installing ``pip`` into all created virtual environments. * ``virtualenv`` is a third party alternative (and predecessor) to - ``pyvenv``. It allows virtual environments to be used on versions of - Python prior to 3.4, which either don't provide ``pyvenv`` at all, or + ``venv``. It allows virtual environments to be used on versions of + Python prior to 3.4, which either don't provide ``venv`` at all, or aren't able to automatically install ``pip`` into created environments. -* the `Python Packaging Index `__ is a public +* The `Python Packaging Index `__ is a public repository of open source licensed packages made available for use by - other Python users + other Python users. * the `Python Packaging Authority `__ are the group of developers and documentation authors responsible for the maintenance and evolution of the standard packaging tools and the associated metadata and - file format standards. They maintain a variety of tools, documentation + file format standards. They maintain a variety of tools, documentation, and issue trackers on both `GitHub `__ and `BitBucket `__. * ``distutils`` is the original build and distribution system first added to @@ -62,6 +62,19 @@ Key terms of the mailing list used to coordinate Python packaging standards development). +.. deprecated:: 3.6 + ``pyvenv`` was the recommended tool for creating virtual environments for + Python 3.3 and 3.4, and is `deprecated in Python 3.6 + `_. + +.. versionchanged:: 3.5 + The use of ``venv`` is now recommended for creating virtual environments. + +.. seealso:: + + `Python Packaging User Guide: Creating and using virtual environments + `__ + Basic usage =========== @@ -100,13 +113,14 @@ explicitly:: More information and resources regarding ``pip`` and its capabilities can be found in the `Python Packaging User Guide `__. -``pyvenv`` has its own documentation at :ref:`scripts-pyvenv`. Installing -into an active virtual environment uses the commands shown above. +Creation of virtual environments is done through the :mod:`venv` module. +Installing packages into an active virtual environment uses the commands shown +above. .. seealso:: `Python Packaging User Guide: Installing Python Distribution Packages - `__ + `__ How do I ...? @@ -124,7 +138,7 @@ User Guide. .. seealso:: `Python Packaging User Guide: Requirements for Installing Packages - `__ + `__ .. installing-per-user-installation: @@ -142,20 +156,19 @@ package just for the current user, rather than for all users of the system. A number of scientific Python packages have complex binary dependencies, and aren't currently easy to install using ``pip`` directly. At this point in time, it will often be easier for users to install these packages by -`other means -`__ +`other means `__ rather than attempting to install them with ``pip``. .. seealso:: `Python Packaging User Guide: Installing Scientific Packages - `__ + `__ ... work with multiple versions of Python installed in parallel? ---------------------------------------------------------------- -On Linux, Mac OS X and other POSIX systems, use the versioned Python commands +On Linux, Mac OS X, and other POSIX systems, use the versioned Python commands in combination with the ``-m`` switch to run the appropriate copy of ``pip``:: @@ -164,7 +177,7 @@ in combination with the ``-m`` switch to run the appropriate copy of python3 -m pip install SomePackage # default Python 3 python3.4 -m pip install SomePackage # specifically Python 3.4 -(appropriately versioned ``pip`` commands may also be available) +Appropriately versioned ``pip`` commands may also be available. On Windows, use the ``py`` Python launcher in combination with the ``-m`` switch:: @@ -212,11 +225,11 @@ as users are more regularly able to install pre-built extensions rather than needing to build them themselves. Some of the solutions for installing `scientific software -`__ -that is not yet available as pre-built ``wheel`` files may also help with +`__ +that are not yet available as pre-built ``wheel`` files may also help with obtaining other binary extensions without needing to build them locally. .. seealso:: `Python Packaging User Guide: Binary Extensions - `__ + `__ diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index 4c9a528..ace1bfa 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -199,6 +199,13 @@ and off individually. They are described here in more detail. because the :class:`memoryview` API is similar but not exactly the same as that of :class:`buffer`. +.. 2to3fixer:: callable + + Converts ``callable(x)`` to ``isinstance(x, collections.Callable)``, adding + an import to :mod:`collections` if needed. Note ``callable(x)`` has returned + in Python 3.2, so if you do not intend to support Python 3.1, you can disable + this fixer. + .. 2to3fixer:: dict Fixes dictionary iteration methods. :meth:`dict.iteritems` is converted to diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index 4530304..c6b2bf6 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -174,7 +174,7 @@ ArgumentParser objects * conflict_handler_ - The strategy for resolving conflicting optionals (usually unnecessary) - * add_help_ - Add a ``-h/--help`` option to the parser (default: ``True``) + * add_help_ - Add a -h/--help option to the parser (default: ``True``) * allow_abbrev_ - Allows long options to be abbreviated if the abbreviation is unambiguous. (default: ``True``) @@ -211,7 +211,7 @@ The help for this program will display ``myprogram.py`` as the program name -h, --help show this help message and exit --foo FOO foo help $ cd .. - $ python subdir/myprogram.py --help + $ python subdir\myprogram.py --help usage: myprogram.py [-h] [--foo FOO] optional arguments: diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst index ae72d26..9e51416 100644 --- a/Doc/library/asynchat.rst +++ b/Doc/library/asynchat.rst @@ -9,6 +9,9 @@ **Source code:** :source:`Lib/asynchat.py` +.. deprecated:: 3.6 + Please use :mod:`asyncio` instead. + -------------- .. note:: @@ -58,13 +61,13 @@ connection requests. The asynchronous output buffer size (default ``4096``). Unlike :class:`asyncore.dispatcher`, :class:`async_chat` allows you to - define a first-in-first-out queue (fifo) of *producers*. A producer need + define a :abbr:`FIFO (first-in, first-out)` queue of *producers*. A producer need have only one method, :meth:`more`, which should return data to be transmitted on the channel. The producer indicates exhaustion (*i.e.* that it contains no more data) by having its :meth:`more` method return the empty bytes object. At this point - the :class:`async_chat` object removes the producer from the fifo and starts - using the next producer, if any. When the producer fifo is empty the + the :class:`async_chat` object removes the producer from the queue and starts + using the next producer, if any. When the producer queue is empty the :meth:`handle_write` method does nothing. You use the channel object's :meth:`set_terminator` method to describe how to recognize the end of, or an important breakpoint in, an incoming transmission from the remote @@ -78,8 +81,8 @@ connection requests. .. method:: async_chat.close_when_done() - Pushes a ``None`` on to the producer fifo. When this producer is popped off - the fifo it causes the channel to be closed. + Pushes a ``None`` on to the producer queue. When this producer is popped off + the queue it causes the channel to be closed. .. method:: async_chat.collect_incoming_data(data) @@ -92,7 +95,7 @@ connection requests. .. method:: async_chat.discard_buffers() In emergencies this method will discard any data held in the input and/or - output buffers and the producer fifo. + output buffers and the producer queue. .. method:: async_chat.found_terminator() @@ -110,7 +113,7 @@ connection requests. .. method:: async_chat.push(data) - Pushes data on to the channel's fifo to ensure its transmission. + Pushes data on to the channel's queue to ensure its transmission. This is all you need to do to have the channel write the data out to the network, although it is possible to use your own producers in more complex schemes to implement encryption and chunking, for example. @@ -118,7 +121,7 @@ connection requests. .. method:: async_chat.push_with_producer(producer) - Takes a producer object and adds it to the producer fifo associated with + Takes a producer object and adds it to the producer queue associated with the channel. When all currently-pushed producers have been exhausted the channel will consume this producer's data by calling its :meth:`more` method and send the data to the remote endpoint. diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index d720160..fa6a296 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -88,6 +88,24 @@ Run an event loop This is idempotent and irreversible. No other methods should be called after this one. + +.. coroutinemethod:: AbstractEventLoop.shutdown_asyncgens() + + Schedule all currently open :term:`asynchronous generator` objects to + close with an :meth:`~agen.aclose()` call. After calling this method, + the event loop will issue a warning whenever a new asynchronous generator + is iterated. Should be used to finalize all scheduled asynchronous + generators reliably. Example:: + + try: + loop.run_forever() + finally: + loop.run_until_complete(loop.shutdown_asyncgens()) + loop.close() + + .. versionadded:: 3.6 + + .. _asyncio-pass-keywords: Calls @@ -110,8 +128,9 @@ keywords to your callback, use :func:`functools.partial`. For example, called after :meth:`call_soon` returns, when control returns to the event loop. - This operates as a FIFO queue, callbacks are called in the order in - which they are registered. Each callback will be called exactly once. + This operates as a :abbr:`FIFO (first-in, first-out)` queue, callbacks + are called in the order in which they are registered. Each callback + will be called exactly once. Any positional arguments after the callback will be passed to the callback when it is called. diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 435eb3b..3fbf510 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -25,6 +25,9 @@ the transport's kind. The transport classes are :ref:`not thread safe `. +.. versionchanged:: 3.6 + The socket option ``TCP_NODELAY`` is now set by default. + BaseTransport ------------- @@ -33,7 +36,7 @@ BaseTransport Base class for transports. - .. method:: close() + .. method:: close(self) Close the transport. If the transport has a buffer for outgoing data, buffered data will be flushed asynchronously. No more data @@ -41,7 +44,7 @@ BaseTransport protocol's :meth:`connection_lost` method will be called with :const:`None` as its argument. - .. method:: is_closing() + .. method:: is_closing(self) Return ``True`` if the transport is closing or is closed. @@ -160,17 +163,11 @@ WriteTransport Set the *high*- and *low*-water limits for write flow control. - These two values (measured in number of - bytes) control when the protocol's + These two values control when call the protocol's :meth:`pause_writing` and :meth:`resume_writing` methods are called. If specified, the low-water limit must be less than or equal to the high-water limit. Neither *high* nor *low* can be negative. - :meth:`pause_writing` is called when the buffer size becomes greater - than or equal to the *high* value. If writing has been paused, - :meth:`resume_writing` is called when the buffer size becomes less - than or equal to the *low* value. - The defaults are implementation-specific. If only the high-water limit is given, the low-water limit defaults to an implementation-specific value less than or equal to the @@ -254,7 +251,7 @@ BaseSubprocessTransport if it hasn't returned, similarly to the :attr:`subprocess.Popen.returncode` attribute. - .. method:: kill() + .. method:: kill(self) Kill the subprocess, as in :meth:`subprocess.Popen.kill`. @@ -387,7 +384,7 @@ The following callbacks are called on :class:`Protocol` instances: .. method:: Protocol.eof_received() - Called when the other end signals it won't send any more data + Calls when the other end signals it won't send any more data (for example by calling :meth:`write_eof`, if the other end also uses asyncio). diff --git a/Doc/library/asyncio-subprocess.rst b/Doc/library/asyncio-subprocess.rst index 16ba9a3..dc93a74 100644 --- a/Doc/library/asyncio-subprocess.rst +++ b/Doc/library/asyncio-subprocess.rst @@ -80,7 +80,7 @@ Run subprocesses asynchronously using the :mod:`subprocess` module. however, where :class:`~subprocess.Popen` takes a single argument which is list of strings, :func:`subprocess_exec` takes multiple string arguments. - The *protocol_factory* must instantiate a subclass of the + The *protocol_factory* must instanciate a subclass of the :class:`asyncio.SubprocessProtocol` class. Other parameters: @@ -123,7 +123,7 @@ Run subprocesses asynchronously using the :mod:`subprocess` module. using the platform's "shell" syntax. This is similar to the standard library :class:`subprocess.Popen` class called with ``shell=True``. - The *protocol_factory* must instantiate a subclass of the + The *protocol_factory* must instanciate a subclass of the :class:`asyncio.SubprocessProtocol` class. See :meth:`~AbstractEventLoop.subprocess_exec` for more details about diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index 804f192..9bff1c4 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -136,6 +136,17 @@ using the :meth:`sleep` function:: loop.run_until_complete(display_date(loop)) loop.close() +The same coroutine implemented using a generator:: + + @asyncio.coroutine + def display_date(loop): + end_time = loop.time() + 5.0 + while True: + print(datetime.datetime.now()) + if (loop.time() + 1.0) >= end_time: + break + yield from asyncio.sleep(1) + .. seealso:: The :ref:`display the current date with call_later() @@ -298,8 +309,9 @@ Example combining a :class:`Future` and a :ref:`coroutine function import asyncio - async def slow_operation(future): - await asyncio.sleep(1) + @asyncio.coroutine + def slow_operation(future): + yield from asyncio.sleep(1) future.set_result('Future is done!') loop = asyncio.get_event_loop() @@ -329,8 +341,9 @@ flow:: import asyncio - async def slow_operation(future): - await asyncio.sleep(1) + @asyncio.coroutine + def slow_operation(future): + yield from asyncio.sleep(1) future.set_result('Future is done!') def got_result(future): @@ -459,20 +472,21 @@ Example executing 3 tasks (A, B, C) in parallel:: import asyncio - async def factorial(name, number): + @asyncio.coroutine + def factorial(name, number): f = 1 for i in range(2, number+1): print("Task %s: Compute factorial(%s)..." % (name, i)) - await asyncio.sleep(1) + yield from asyncio.sleep(1) f *= i print("Task %s: factorial(%s) = %s" % (name, number, f)) loop = asyncio.get_event_loop() - loop.run_until_complete(asyncio.gather( - factorial("A", 2), - factorial("B", 3), - factorial("C", 4), - )) + tasks = [ + asyncio.ensure_future(factorial("A", 2)), + asyncio.ensure_future(factorial("B", 3)), + asyncio.ensure_future(factorial("C", 4))] + loop.run_until_complete(asyncio.gather(*tasks)) loop.close() Output:: @@ -540,11 +554,6 @@ Task functions .. deprecated:: 3.4.4 -.. function:: wrap_future(future, \*, loop=None) - - Wrap a :class:`concurrent.futures.Future` object in a :class:`Future` - object. - .. function:: gather(\*coros_or_futures, loop=None, return_exceptions=False) Return a future aggregating results from the given coroutine objects or diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst index 76bd9e9..b076b7d 100644 --- a/Doc/library/asyncio.rst +++ b/Doc/library/asyncio.rst @@ -8,13 +8,6 @@ **Source code:** :source:`Lib/asyncio/` -.. note:: - - The asyncio package has been included in the standard library on a - :term:`provisional basis `. Backwards incompatible - changes (up to and including removal of the module) may occur if deemed - necessary by the core developers. - -------------- This module provides infrastructure for writing single-threaded concurrent diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst index c838be7..11d3616 100644 --- a/Doc/library/asyncore.rst +++ b/Doc/library/asyncore.rst @@ -12,6 +12,9 @@ **Source code:** :source:`Lib/asyncore.py` +.. deprecated:: 3.6 + Please use :mod:`asyncio` instead. + -------------- .. note:: diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst index ceecf17..080d9d7 100644 --- a/Doc/library/base64.rst +++ b/Doc/library/base64.rst @@ -237,18 +237,14 @@ The legacy interface: .. function:: decodebytes(s) + decodestring(s) Decode the :term:`bytes-like object` *s*, which must contain one or more lines of base64 encoded data, and return the decoded :class:`bytes`. + ``decodestring`` is a deprecated alias. .. versionadded:: 3.1 -.. function:: decodestring(s) - - Deprecated alias of :func:`decodebytes`. - - .. deprecated:: 3.1 - .. function:: encode(input, output) @@ -261,19 +257,14 @@ The legacy interface: .. function:: encodebytes(s) + encodestring(s) Encode the :term:`bytes-like object` *s*, which can contain arbitrary binary data, and return :class:`bytes` containing the base64-encoded data, with newlines (``b'\n'``) inserted after every 76 bytes of output, and ensuring that there is a trailing newline, as per :rfc:`2045` (MIME). - .. versionadded:: 3.1 - -.. function:: encodestring(s) - - Deprecated alias of :func:`encodebytes`. - - .. deprecated:: 3.1 + ``encodestring`` is a deprecated alias. An example usage of the module: diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 49da59a..4f5f0f2 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -53,13 +53,14 @@ The :mod:`binascii` module defines the following functions: than one line may be passed at a time. -.. function:: b2a_base64(data) +.. function:: b2a_base64(data, \*, newline=True) Convert binary data to a line of ASCII characters in base64 coding. The return - value is the converted line, including a newline char. The newline is - added because the original use case for this function was to feed it a - series of 57 byte input lines to get output lines that conform to the - MIME-base64 standard. Otherwise the output conforms to :rfc:`3548`. + value is the converted line, including a newline char if *newline* is + true. The output of this function conforms to :rfc:`3548`. + + .. versionchanged:: 3.6 + Added the *newline* parameter. .. function:: a2b_qp(data, header=False) @@ -115,10 +116,8 @@ The :mod:`binascii` module defines the following functions: .. function:: crc_hqx(data, value) - Compute a 16-bit CRC value of *data*, starting with *value* as the - initial CRC, and return the result. This uses the CRC-CCITT polynomial - *x*:sup:`16` + *x*:sup:`12` + *x*:sup:`5` + 1, often represented as - 0x1021. This CRC is used in the binhex4 format. + Compute the binhex4 crc value of *data*, starting with *value* as the + initial crc, and return the result. .. function:: crc32(data[, value]) diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst index 2966e0d..359ab23 100644 --- a/Doc/library/binhex.rst +++ b/Doc/library/binhex.rst @@ -55,3 +55,5 @@ the source for details. If you code or decode textfiles on non-Macintosh platforms they will still use the old Macintosh newline convention (carriage-return as end of line). +As of this writing, :func:`hexbin` appears to not work in all cases. + diff --git a/Doc/library/bz2.rst b/Doc/library/bz2.rst index 6c49d9f..d5f6225 100644 --- a/Doc/library/bz2.rst +++ b/Doc/library/bz2.rst @@ -61,6 +61,9 @@ All of the classes in this module may safely be accessed from multiple threads. .. versionchanged:: 3.4 The ``'x'`` (exclusive creation) mode was added. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. class:: BZ2File(filename, mode='r', buffering=None, compresslevel=9) @@ -128,6 +131,9 @@ All of the classes in this module may safely be accessed from multiple threads. The :meth:`~io.BufferedIOBase.read` method now accepts an argument of ``None``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + Incremental (de)compression --------------------------- diff --git a/Doc/library/cmath.rst b/Doc/library/cmath.rst index e113ffc..c819a66 100644 --- a/Doc/library/cmath.rst +++ b/Doc/library/cmath.rst @@ -253,6 +253,40 @@ Constants The mathematical constant *e*, as a float. +.. data:: tau + + The mathematical constant *τ*, as a float. + + .. versionadded:: 3.6 + +.. data:: inf + + Floating-point positive infinity. Equivalent to ``float('inf')``. + + .. versionadded:: 3.6 + +.. data:: infj + + Complex number with zero real part and positive infinity imaginary + part. Equivalent to ``complex(0.0, float('inf'))``. + + .. versionadded:: 3.6 + +.. data:: nan + + A floating-point "not a number" (NaN) value. Equivalent to + ``float('nan')``. + + .. versionadded:: 3.6 + +.. data:: nanj + + Complex number with zero real part and NaN imaginary part. Equivalent to + ``complex(0.0, float('nan'))``. + + .. versionadded:: 3.6 + + .. index:: module: math Note that the selection of functions is similar, but not identical, to that in @@ -276,5 +310,3 @@ cuts for numerical purposes, a good reference should be the following: Kahan, W: Branch cuts for complex elementary functions; or, Much ado about nothing's sign bit. In Iserles, A., and Powell, M. (eds.), The state of the art in numerical analysis. Clarendon Press (1987) pp165--211. - - diff --git a/Doc/library/cmd.rst b/Doc/library/cmd.rst index 3b4a8ff..f40cfdf 100644 --- a/Doc/library/cmd.rst +++ b/Doc/library/cmd.rst @@ -266,10 +266,10 @@ immediate playback:: 'Draw circle with given radius an options extent and steps: CIRCLE 50' circle(*parse(arg)) def do_position(self, arg): - 'Print the current turtle position: POSITION' + 'Print the current turle position: POSITION' print('Current position is %d %d\n' % position()) def do_heading(self, arg): - 'Print the current turtle heading in degrees: HEADING' + 'Print the current turle heading in degrees: HEADING' print('Current heading is %d\n' % (heading(),)) def do_color(self, arg): 'Set the color: COLOR BLUE' diff --git a/Doc/library/code.rst b/Doc/library/code.rst index 443af69..e2c47ba 100644 --- a/Doc/library/code.rst +++ b/Doc/library/code.rst @@ -30,15 +30,19 @@ build applications which provide an interactive interpreter prompt. ``sys.ps1`` and ``sys.ps2``, and input buffering. -.. function:: interact(banner=None, readfunc=None, local=None) +.. function:: interact(banner=None, readfunc=None, local=None, exitmsg=None) Convenience function to run a read-eval-print loop. This creates a new instance of :class:`InteractiveConsole` and sets *readfunc* to be used as the :meth:`InteractiveConsole.raw_input` method, if provided. If *local* is provided, it is passed to the :class:`InteractiveConsole` constructor for use as the default namespace for the interpreter loop. The :meth:`interact` - method of the instance is then run with *banner* passed as the banner to - use, if provided. The console object is discarded after use. + method of the instance is then run with *banner* and *exitmsg* passed as the + banner and exit message to use, if provided. The console object is discarded + after use. + + .. versionchanged:: 3.6 + Added *exitmsg* parameter. .. function:: compile_command(source, filename="", symbol="single") @@ -136,7 +140,7 @@ The :class:`InteractiveConsole` class is a subclass of interpreter objects as well as the following additions. -.. method:: InteractiveConsole.interact(banner=None) +.. method:: InteractiveConsole.interact(banner=None, exitmsg=None) Closely emulate the interactive Python console. The optional *banner* argument specify the banner to print before the first interaction; by default it prints a @@ -144,9 +148,16 @@ interpreter objects as well as the following additions. by the class name of the console object in parentheses (so as not to confuse this with the real interpreter -- since it's so close!). + The optional *exitmsg* argument specifies an exit message printed when exiting. + Pass the empty string to suppress the exit message. If *exitmsg* is not given or + ``None``, a default message is printed. + .. versionchanged:: 3.4 To suppress printing any banner, pass an empty string. + .. versionchanged:: 3.6 + Print an exit message when exiting. + .. method:: InteractiveConsole.push(line) diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index f38e41b..0ecd89b 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -1263,10 +1263,16 @@ encodings. | | | Only ``errors='strict'`` | | | | is supported. | +--------------------+---------+---------------------------+ -| mbcs | dbcs | Windows only: Encode | -| | | operand according to the | +| mbcs | ansi, | Windows only: Encode | +| | dbcs | operand according to the | | | | ANSI codepage (CP_ACP) | +--------------------+---------+---------------------------+ +| oem | | Windows only: Encode | +| | | operand according to the | +| | | OEM codepage (CP_OEMCP) | +| | | | +| | | .. versionadded:: 3.6 | ++--------------------+---------+---------------------------+ | palmos | | Encoding of PalmOS 3.5 | +--------------------+---------+---------------------------+ | punycode | | Implements :rfc:`3492`. | diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index aeb6a73..58b03b9 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -41,13 +41,16 @@ ABC Inherits from Abstract Methods Mixin :class:`Hashable` ``__hash__`` :class:`Iterable` ``__iter__`` :class:`Iterator` :class:`Iterable` ``__next__`` ``__iter__`` +:class:`Reversible` :class:`Iterable` ``__reversed__`` :class:`Generator` :class:`Iterator` ``send``, ``throw`` ``close``, ``__iter__``, ``__next__`` :class:`Sized` ``__len__`` :class:`Callable` ``__call__`` +:class:`Collection` :class:`Sized`, ``__contains__``, + :class:`Iterable`, ``__iter__``, + :class:`Container` ``__len__`` -:class:`Sequence` :class:`Sized`, ``__getitem__``, ``__contains__``, ``__iter__``, ``__reversed__``, - :class:`Iterable`, ``__len__`` ``index``, and ``count`` - :class:`Container` +:class:`Sequence` :class:`Reversible`, ``__getitem__``, ``__contains__``, ``__iter__``, ``__reversed__``, + :class:`Collection` ``__len__`` ``index``, and ``count`` :class:`MutableSequence` :class:`Sequence` ``__getitem__``, Inherited :class:`Sequence` methods and ``__setitem__``, ``append``, ``reverse``, ``extend``, ``pop``, @@ -58,9 +61,9 @@ ABC Inherits from Abstract Methods Mixin :class:`ByteString` :class:`Sequence` ``__getitem__``, Inherited :class:`Sequence` methods ``__len__`` -:class:`Set` :class:`Sized`, ``__contains__``, ``__le__``, ``__lt__``, ``__eq__``, ``__ne__``, - :class:`Iterable`, ``__iter__``, ``__gt__``, ``__ge__``, ``__and__``, ``__or__``, - :class:`Container` ``__len__`` ``__sub__``, ``__xor__``, and ``isdisjoint`` +:class:`Set` :class:`Collection` ``__contains__``, ``__le__``, ``__lt__``, ``__eq__``, ``__ne__``, + ``__iter__``, ``__gt__``, ``__ge__``, ``__and__``, ``__or__``, + ``__len__`` ``__sub__``, ``__xor__``, and ``isdisjoint`` :class:`MutableSet` :class:`Set` ``__contains__``, Inherited :class:`Set` methods and ``__iter__``, ``clear``, ``pop``, ``remove``, ``__ior__``, @@ -68,9 +71,9 @@ ABC Inherits from Abstract Methods Mixin ``add``, ``discard`` -:class:`Mapping` :class:`Sized`, ``__getitem__``, ``__contains__``, ``keys``, ``items``, ``values``, - :class:`Iterable`, ``__iter__``, ``get``, ``__eq__``, and ``__ne__`` - :class:`Container` ``__len__`` +:class:`Mapping` :class:`Collection` ``__getitem__``, ``__contains__``, ``keys``, ``items``, ``values``, + ``__iter__``, ``get``, ``__eq__``, and ``__ne__`` + ``__len__`` :class:`MutableMapping` :class:`Mapping` ``__getitem__``, Inherited :class:`Mapping` methods and ``__setitem__``, ``pop``, ``popitem``, ``clear``, ``update``, @@ -89,6 +92,7 @@ ABC Inherits from Abstract Methods Mixin :class:`Coroutine` :class:`Awaitable` ``send``, ``throw`` ``close`` :class:`AsyncIterable` ``__aiter__`` :class:`AsyncIterator` :class:`AsyncIterable` ``__anext__`` ``__aiter__`` +:class:`AsyncGenerator` :class:`AsyncIterator` ``asend``, ``athrow`` ``aclose``, ``__aiter__``, ``__anext__`` ========================== ====================== ======================= ==================================================== @@ -105,12 +109,25 @@ ABC Inherits from Abstract Methods Mixin ABC for classes that provide the :meth:`__iter__` method. See also the definition of :term:`iterable`. +.. class:: Collection + + ABC for sized iterable container classes. + + .. versionadded:: 3.6 + .. class:: Iterator ABC for classes that provide the :meth:`~iterator.__iter__` and :meth:`~iterator.__next__` methods. See also the definition of :term:`iterator`. +.. class:: Reversible + + ABC for iterable classes that also provide the :meth:`__reversed__` + method. + + .. versionadded:: 3.6 + .. class:: Generator ABC for generator classes that implement the protocol defined in @@ -206,6 +223,13 @@ ABC Inherits from Abstract Methods Mixin .. versionadded:: 3.5 +.. class:: AsyncGenerator + + ABC for asynchronous generator classes that implement the protocol + defined in :pep:`525` and :pep:`492`. + + .. versionadded:: 3.6 + These ABCs allow us to ask classes or instances if they provide particular functionality, for example:: diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 674cb20..9f3f5dc 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -763,7 +763,7 @@ Named tuples assign meaning to each position in a tuple and allow for more reada self-documenting code. They can be used wherever regular tuples are used, and they add the ability to access fields by name instead of position index. -.. function:: namedtuple(typename, field_names, verbose=False, rename=False) +.. function:: namedtuple(typename, field_names, *, verbose=False, rename=False, module=None) Returns a new tuple subclass named *typename*. The new subclass is used to create tuple-like objects that have fields accessible by attribute lookup as @@ -790,12 +790,21 @@ they add the ability to access fields by name instead of position index. built. This option is outdated; instead, it is simpler to print the :attr:`_source` attribute. + If *module* is defined, the ``__module__`` attribute of the named tuple is + set to that value. + Named tuple instances do not have per-instance dictionaries, so they are lightweight and require no more memory than regular tuples. .. versionchanged:: 3.1 - Added support for *rename*. + Added support for *rename*. + + .. versionchanged:: 3.6 + The *verbose* and *rename* parameters became + :ref:`keyword-only arguments `. + .. versionchanged:: 3.6 + Added the *module* parameter. .. doctest:: :options: +NORMALIZE_WHITESPACE @@ -846,7 +855,9 @@ field names, the method and attribute names start with an underscore. .. method:: somenamedtuple._asdict() Return a new :class:`OrderedDict` which maps field names to their corresponding - values:: + values: + + .. doctest:: >>> p = Point(x=11, y=22) >>> p._asdict() @@ -855,7 +866,7 @@ field names, the method and attribute names start with an underscore. .. versionchanged:: 3.1 Returns an :class:`OrderedDict` instead of a regular :class:`dict`. -.. method:: somenamedtuple._replace(**kwargs) +.. method:: somenamedtuple._replace(kwargs) Return a new instance of the named tuple replacing specified fields with new values:: @@ -908,7 +919,9 @@ Since a named tuple is a regular Python class, it is easy to add or change functionality with a subclass. Here is how to add a calculated field and a fixed-width print format: - >>> class Point(namedtuple('Point', 'x y')): +.. doctest:: + + >>> class Point(namedtuple('Point', ['x', 'y'])): ... __slots__ = () ... @property ... def hypot(self): @@ -959,6 +972,11 @@ customize a prototype instance: constructor that is convenient for use cases where named tuples are being subclassed. + * See :meth:`types.SimpleNamespace` for a mutable namespace based on an + underlying dictionary instead of a tuple. + + * See :meth:`typing.NamedTuple` for a way to add type hints for named tuples. + :class:`OrderedDict` objects ---------------------------- @@ -980,8 +998,9 @@ the items are returned in the order their keys were first added. .. method:: popitem(last=True) The :meth:`popitem` method for ordered dictionaries returns and removes a - (key, value) pair. The pairs are returned in LIFO order if *last* is true - or FIFO order if false. + (key, value) pair. The pairs are returned in + :abbr:`LIFO (last-in, first-out)` order if *last* is true + or :abbr:`FIFO (first-in, first-out)` order if false. .. method:: move_to_end(key, last=True) diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst index 511c581..c1af02b 100644 --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -102,7 +102,8 @@ Public functions .. function:: compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1, workers=1) Recursively descend the directory tree named by *dir*, compiling all :file:`.py` - files along the way. + files along the way. Return a true value if all the files compiled successfully, + and a false value otherwise. The *maxlevels* parameter is used to limit the depth of the recursion; it defaults to ``10``. @@ -152,9 +153,13 @@ Public functions The *legacy* parameter only writes out ``.pyc`` files, not ``.pyo`` files no matter what the value of *optimize* is. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1) - Compile the file with path *fullname*. + Compile the file with path *fullname*. Return a true value if the file + compiled successfully, and a false value otherwise. If *ddir* is given, it is prepended to the path to the file being compiled for use in compilation time tracebacks, and is also compiled in to the @@ -190,8 +195,10 @@ Public functions .. function:: compile_path(skip_curdir=True, maxlevels=0, force=False, quiet=0, legacy=False, optimize=-1) - Byte-compile all the :file:`.py` files found along ``sys.path``. If - *skip_curdir* is true (the default), the current directory is not included + Byte-compile all the :file:`.py` files found along ``sys.path``. Return a + true value if all the files compiled successfully, and a false value otherwise. + + If *skip_curdir* is true (the default), the current directory is not included in the search. All other parameters are passed to the :func:`compile_dir` function. Note that unlike the other compile functions, ``maxlevels`` defaults to ``0``. @@ -217,6 +224,9 @@ subdirectory and all its subdirectories:: import re compileall.compile_dir('Lib/', rx=re.compile(r'[/\\][.]svn'), force=True) + # pathlib.Path objects can also be used. + import pathlib + compileall.compile_dir(pathlib.Path('Lib/'), force=True) .. seealso:: diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst index ae03f4b..d85576b 100644 --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -124,7 +124,7 @@ And:: executor.submit(wait_on_future) -.. class:: ThreadPoolExecutor(max_workers=None) +.. class:: ThreadPoolExecutor(max_workers=None, thread_name_prefix='') An :class:`Executor` subclass that uses a pool of at most *max_workers* threads to execute calls asynchronously. @@ -137,6 +137,10 @@ And:: should be higher than the number of workers for :class:`ProcessPoolExecutor`. + .. versionadded:: 3.6 + The *thread_name_prefix* argument was added to allow users to + control the threading.Thread names for worker threads created by + the pool for easier debugging. .. _threadpoolexecutor-example: diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 6f1c55e..8d141a2 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -34,8 +34,8 @@ can be customized by end users easily. .. seealso:: Module :mod:`shlex` - Support for creating Unix shell-like mini-languages which can be used as - an alternate format for application configuration files. + Support for a creating Unix shell-like mini-languages which can be used + as an alternate format for application configuration files. Module :mod:`json` The json module implements a subset of JavaScript syntax which can also @@ -1161,20 +1161,20 @@ ConfigParser Objects Use :meth:`read_file` instead. .. versionchanged:: 3.2 - :meth:`readfp` now iterates on *fp* instead of calling ``fp.readline()``. + :meth:`readfp` now iterates on *f* instead of calling ``f.readline()``. For existing code calling :meth:`readfp` with arguments which don't support iteration, the following generator may be used as a wrapper around the file-like object:: - def readline_generator(fp): - line = fp.readline() + def readline_generator(f): + line = f.readline() while line: yield line - line = fp.readline() + line = f.readline() - Instead of ``parser.readfp(fp)`` use - ``parser.read_file(readline_generator(fp))``. + Instead of ``parser.readfp(f)`` use + ``parser.read_file(readline_generator(f))``. .. data:: MAX_INTERPOLATION_DEPTH diff --git a/Doc/library/constants.rst b/Doc/library/constants.rst index d5a0f09..f0742ce 100644 --- a/Doc/library/constants.rst +++ b/Doc/library/constants.rst @@ -33,16 +33,22 @@ A small number of constants live in the built-in namespace. They are: (e.g. :meth:`__imul__`, :meth:`__iand__`, etc.) for the same purpose. Its truth value is true. -.. note:: + .. note:: + + When a binary (or in-place) method returns ``NotImplemented`` the + interpreter will try the reflected operation on the other type (or some + other fallback, depending on the operator). If all attempts return + ``NotImplemented``, the interpreter will raise an appropriate exception. + Incorrectly returning ``NotImplemented`` will result in a misleading + error message or the ``NotImplemented`` value being returned to Python code. + + See :ref:`implementing-the-arithmetic-operations` for examples. - When ``NotImplemented`` is returned, the interpreter will then try the - reflected operation on the other type, or some other fallback, depending - on the operator. If all attempted operations return ``NotImplemented``, the - interpreter will raise an appropriate exception. + .. note:: - See - :ref:`implementing-the-arithmetic-operations` - for more details. + ``NotImplentedError`` and ``NotImplemented`` are not interchangeable, + even though they have similar names and purposes. + See :exc:`NotImplementedError` for details on when to use it. .. data:: Ellipsis diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index cf85fcd..dd34c96 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -18,6 +18,18 @@ Utilities Functions and classes provided: +.. class:: AbstractContextManager + + An :term:`abstract base class` for classes that implement + :meth:`object.__enter__` and :meth:`object.__exit__`. A default + implementation for :meth:`object.__enter__` is provided which returns + ``self`` while :meth:`object.__exit__` is an abstract method which by default + returns ``None``. See also the definition of :ref:`typecontextmanager`. + + .. versionadded:: 3.6 + + + .. decorator:: contextmanager This function is a :term:`decorator` that can be used to define a factory @@ -447,9 +459,9 @@ Here's an example of doing this for a context manager that accepts resource acquisition and release functions, along with an optional validation function, and maps them to the context management protocol:: - from contextlib import contextmanager, ExitStack + from contextlib import contextmanager, AbstractContextManager, ExitStack - class ResourceManager: + class ResourceManager(AbstractContextManager): def __init__(self, acquire_resource, release_resource, check_resource_ok=None): self.acquire_resource = acquire_resource @@ -578,10 +590,10 @@ single definition:: self.name = name def __enter__(self): - logging.info('Entering: {}'.format(self.name)) + logging.info('Entering: %s', self.name) def __exit__(self, exc_type, exc, exc_tb): - logging.info('Exiting: {}'.format(self.name)) + logging.info('Exiting: %s', self.name) Instances of this class can be used as both a context manager:: diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst index 2041d91..d0b861d 100644 --- a/Doc/library/copy.rst +++ b/Doc/library/copy.rst @@ -47,8 +47,8 @@ copy operations: * Recursive objects (compound objects that, directly or indirectly, contain a reference to themselves) may cause a recursive loop. -* Because deep copy copies everything it may copy too much, such as data - which is intended to be shared between copies. +* Because deep copy copies *everything* it may copy too much, e.g., + even administrative data structures that should be shared even between copies. The :func:`deepcopy` function avoids these problems by: diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst index a21c1e7..dbd4274 100644 --- a/Doc/library/crypt.rst +++ b/Doc/library/crypt.rst @@ -68,7 +68,7 @@ Module Attributes A list of available password hashing algorithms, as ``crypt.METHOD_*`` objects. This list is sorted from strongest to - weakest, and is guaranteed to have at least ``crypt.METHOD_CRYPT``. + weakest. Module Functions diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst index 1eddfdc..8eb4b81 100644 --- a/Doc/library/crypto.rst +++ b/Doc/library/crypto.rst @@ -15,4 +15,6 @@ Here's an overview: .. toctree:: hashlib.rst + hashlib-blake2.rst hmac.rst + secrets.rst diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst index 21353e3..f916572 100644 --- a/Doc/library/csv.rst +++ b/Doc/library/csv.rst @@ -149,18 +149,25 @@ The :mod:`csv` module defines the following classes: .. class:: DictReader(csvfile, fieldnames=None, restkey=None, restval=None, \ dialect='excel', *args, **kwds) - Create an object which operates like a regular reader but maps the - information read into a dict whose keys are given by the optional - *fieldnames* parameter. The *fieldnames* parameter is a :mod:`sequence - ` whose elements are associated with the fields of the - input data in order. These elements become the keys of the resulting - dictionary. If the *fieldnames* parameter is omitted, the values in the - first row of the *csvfile* will be used as the fieldnames. If the row read - has more fields than the fieldnames sequence, the remaining data is added as - a sequence keyed by the value of *restkey*. If the row read has fewer - fields than the fieldnames sequence, the remaining keys take the value of - the optional *restval* parameter. Any other optional or keyword arguments - are passed to the underlying :class:`reader` instance. + Create an object that operates like a regular reader but maps the + information in each row to an :mod:`OrderedDict ` + whose keys are given by the optional *fieldnames* parameter. + + The *fieldnames* parameter is a :term:`sequence`. If *fieldnames* is + omitted, the values in the first row of the *csvfile* will be used as the + fieldnames. Regardless of how the fieldnames are determined, the ordered + dictionary preserves their original ordering. + + If a row has more fields than fieldnames, the remaining data is put in a + list and stored with the fieldname specified by *restkey* (which defaults + to ``None``). If a non-blank row has fewer fields than fieldnames, the + missing values are filled-in with ``None``. + + All other optional or keyword arguments are passed to the underlying + :class:`reader` instance. + + .. versionchanged:: 3.6 + Returned rows are now of type :class:`OrderedDict`. A short usage example:: @@ -170,9 +177,11 @@ The :mod:`csv` module defines the following classes: ... for row in reader: ... print(row['first_name'], row['last_name']) ... - Baked Beans - Lovely Spam - Wonderful Spam + Eric Idle + John Cleese + + >>> print(row) + OrderedDict([('first_name', 'John'), ('last_name', 'Cleese')]) .. class:: DictWriter(csvfile, fieldnames, restval='', extrasaction='raise', \ @@ -186,10 +195,12 @@ The :mod:`csv` module defines the following classes: written if the dictionary is missing a key in *fieldnames*. If the dictionary passed to the :meth:`writerow` method contains a key not found in *fieldnames*, the optional *extrasaction* parameter indicates what action to - take. If it is set to ``'raise'`` a :exc:`ValueError` is raised. If it is - set to ``'ignore'``, extra values in the dictionary are ignored. Any other - optional or keyword arguments are passed to the underlying :class:`writer` - instance. + take. + If it is set to ``'raise'``, the default value, a :exc:`ValueError` + is raised. + If it is set to ``'ignore'``, extra values in the dictionary are ignored. + Any other optional or keyword arguments are passed to the underlying + :class:`writer` instance. Note that unlike the :class:`DictReader` class, the *fieldnames* parameter of the :class:`DictWriter` is not optional. Since Python's :class:`dict` @@ -390,10 +401,8 @@ Reader objects (:class:`DictReader` instances and objects returned by the .. method:: csvreader.__next__() - Return the next row of the reader's iterable object as a list (if the object - was returned from :func:`reader`) or a dict (if it is a :class:`DictReader` - instance), parsed according to the current dialect. Usually you should call - this as ``next(reader)``. + Return the next row of the reader's iterable object as a list, parsed according + to the current dialect. Usually you should call this as ``next(reader)``. Reader objects have the following public attributes: diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 97a59a7..3840935 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -97,7 +97,7 @@ Functions are accessed as attributes of dll objects:: <_FuncPtr object at 0x...> >>> print(windll.kernel32.MyOwnFunction) # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? File "ctypes.py", line 239, in __getattr__ func = _StdcallFuncPtr(name, self) AttributeError: function 'MyOwnFunction' not found @@ -135,7 +135,7 @@ functions can be accessed by indexing the dll object with the ordinal number:: <_FuncPtr object at 0x...> >>> cdll.kernel32[0] # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? File "ctypes.py", line 310, in __getitem__ func = _StdcallFuncPtr(name, self) AttributeError: function ordinal 0 not found @@ -168,11 +168,11 @@ although an error is raised the function *has* been called:: >>> windll.kernel32.GetModuleHandleA() # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: Procedure probably called with not enough arguments (4 bytes missing) >>> windll.kernel32.GetModuleHandleA(0, 0) # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: Procedure probably called with too many arguments (4 bytes in excess) >>> @@ -181,13 +181,13 @@ The same exception is raised when you call an ``stdcall`` function with the >>> cdll.kernel32.GetModuleHandleA(None) # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: Procedure probably called with not enough arguments (4 bytes missing) >>> >>> windll.msvcrt.printf(b"spam") # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: Procedure probably called with too many arguments (4 bytes in excess) >>> @@ -200,7 +200,7 @@ argument values:: >>> windll.kernel32.GetModuleHandleA(32) # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? OSError: exception: access violation reading 0x00000020 >>> @@ -284,7 +284,7 @@ the correct type and value:: >>> c_int() c_long(0) >>> c_wchar_p("Hello, World") - c_wchar_p(140018365411392) + c_wchar_p('Hello, World') >>> c_ushort(-3) c_ushort(65533) >>> @@ -309,15 +309,11 @@ bytes objects are immutable):: >>> s = "Hello, World" >>> c_s = c_wchar_p(s) >>> print(c_s) - c_wchar_p(139966785747344) - >>> print(c_s.value) - Hello World + c_wchar_p('Hello, World') >>> c_s.value = "Hi, there" - >>> print(c_s) # the memory location has changed - c_wchar_p(139966783348904) - >>> print(c_s.value) - Hi, there - >>> print(s) # first object is unchanged + >>> print(c_s) + c_wchar_p('Hi, there') + >>> print(s) # first object is unchanged Hello, World >>> @@ -373,7 +369,7 @@ from within *IDLE* or *PythonWin*:: 19 >>> printf(b"%f bottles of beer\n", 42.5) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ArgumentError: argument 2: exceptions.TypeError: Don't know how to convert parameter 2 >>> @@ -436,7 +432,7 @@ prototype for a C function), and tries to convert the arguments to valid types:: >>> printf(b"%d %d %d", 1, 2, 3) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ArgumentError: argument 2: exceptions.TypeError: wrong type >>> printf(b"%s %d %f\n", b"X", 2, 3) X 2 3.000000 @@ -486,7 +482,7 @@ single character Python bytes object into a C char:: 'def' >>> strchr(b"abcdef", b"def") Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ArgumentError: argument 2: exceptions.TypeError: one character string expected >>> print(strchr(b"abcdef", b"x")) None @@ -512,7 +508,7 @@ useful to check for error return values and automatically raise an exception:: 486539264 >>> GetModuleHandle("something silly") # doctest: +WINDOWS Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? File "", line 3, in ValidHandle OSError: [Errno 126] The specified module could not be found. >>> @@ -583,7 +579,7 @@ Here is a simple example of a POINT structure, which contains two integers named 0 5 >>> POINT(1, 2, 3) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: too many initializers >>> @@ -786,7 +782,7 @@ new type:: >>> PI(42) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: expected c_long instead of int >>> PI(c_int(42)) @@ -862,7 +858,7 @@ but not instances of other types:: >>> bar.values = (c_byte * 4)() Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: incompatible types, c_byte_Array_4 instance instead of LP_c_long instance >>> @@ -913,7 +909,7 @@ work:: ... ("next", POINTER(cell))] ... Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? File "", line 2, in cell NameError: name 'cell' is not defined >>> @@ -1243,9 +1239,10 @@ When programming in a compiled language, shared libraries are accessed when compiling/linking a program, and when the program is run. The purpose of the :func:`find_library` function is to locate a library in a way -similar to what the compiler does (on platforms with several versions of a -shared library the most recent should be loaded), while the ctypes library -loaders act like when a program is run, and call the runtime loader directly. +similar to what the compiler or runtime loader does (on platforms with several +versions of a shared library the most recent should be loaded), while the ctypes +library loaders act like when a program is run, and call the runtime loader +directly. The :mod:`ctypes.util` module provides a function which can help to determine the library to load. @@ -1263,8 +1260,14 @@ the library to load. The exact functionality is system dependent. On Linux, :func:`find_library` tries to run external programs -(``/sbin/ldconfig``, ``gcc``, and ``objdump``) to find the library file. It -returns the filename of the library file. Here are some examples:: +(``/sbin/ldconfig``, ``gcc``, ``objdump`` and ``ld``) to find the library file. +It returns the filename of the library file. + +.. versionchanged:: 3.6 + On Linux, the value of the environment variable ``LD_LIBRARY_PATH`` is used + when searching for libraries, if a library cannot be found by any other means. + +Here are some examples:: >>> from ctypes.util import find_library >>> find_library("m") diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst index 668d282..d746eaf 100644 --- a/Doc/library/curses.rst +++ b/Doc/library/curses.rst @@ -290,8 +290,8 @@ The module :mod:`curses` defines the following functions: .. function:: initscr() - Initialize the library. Return a :ref:`window ` object - which represents the whole screen. + Initialize the library. Return a :class:`WindowObject` which represents the + whole screen. .. note:: @@ -383,8 +383,8 @@ The module :mod:`curses` defines the following functions: .. function:: newwin(nlines, ncols) newwin(nlines, ncols, begin_y, begin_x) - Return a new :ref:`window `, whose left-upper corner - is at ``(begin_y, begin_x)``, and whose height/width is *nlines*/*ncols*. + Return a new window, whose left-upper corner is at ``(begin_y, begin_x)``, and + whose height/width is *nlines*/*ncols*. By default, the window will extend from the specified position to the lower right corner of the screen. @@ -1271,63 +1271,27 @@ The :mod:`curses` module defines the following data members: A string representing the current version of the module. Also available as :const:`__version__`. -Some constants are available to specify character cell attributes. -The exact constants available are system dependent. +Several constants are available to specify character cell attributes: +------------------+-------------------------------+ | Attribute | Meaning | +==================+===============================+ -| ``A_ALTCHARSET`` | Alternate character set mode | +| ``A_ALTCHARSET`` | Alternate character set mode. | +------------------+-------------------------------+ -| ``A_BLINK`` | Blink mode | +| ``A_BLINK`` | Blink mode. | +------------------+-------------------------------+ -| ``A_BOLD`` | Bold mode | +| ``A_BOLD`` | Bold mode. | +------------------+-------------------------------+ -| ``A_DIM`` | Dim mode | +| ``A_DIM`` | Dim mode. | +------------------+-------------------------------+ -| ``A_INVIS`` | Invisible or blank mode | -+------------------+-------------------------------+ -| ``A_NORMAL`` | Normal attribute | -+------------------+-------------------------------+ -| ``A_PROTECT`` | Protected mode | +| ``A_NORMAL`` | Normal attribute. | +------------------+-------------------------------+ | ``A_REVERSE`` | Reverse background and | -| | foreground colors | -+------------------+-------------------------------+ -| ``A_STANDOUT`` | Standout mode | -+------------------+-------------------------------+ -| ``A_UNDERLINE`` | Underline mode | -+------------------+-------------------------------+ -| ``A_HORIZONTAL`` | Horizontal highlight | -+------------------+-------------------------------+ -| ``A_LEFT`` | Left highlight | -+------------------+-------------------------------+ -| ``A_LOW`` | Low highlight | -+------------------+-------------------------------+ -| ``A_RIGHT`` | Right highlight | -+------------------+-------------------------------+ -| ``A_TOP`` | Top highlight | -+------------------+-------------------------------+ -| ``A_VERTICAL`` | Vertical highlight | -+------------------+-------------------------------+ -| ``A_CHARTEXT`` | Bit-mask to extract a | -| | character | -+------------------+-------------------------------+ - -Several constants are available to extract corresponding attributes returned -by some methods. - -+------------------+-------------------------------+ -| Bit-mask | Meaning | -+==================+===============================+ -| ``A_ATTRIBUTES`` | Bit-mask to extract | -| | attributes | +| | foreground colors. | +------------------+-------------------------------+ -| ``A_CHARTEXT`` | Bit-mask to extract a | -| | character | +| ``A_STANDOUT`` | Standout mode. | +------------------+-------------------------------+ -| ``A_COLOR`` | Bit-mask to extract | -| | color-pair field information | +| ``A_UNDERLINE`` | Underline mode. | +------------------+-------------------------------+ Keys are referred to by integer constants with names starting with ``KEY_``. @@ -1479,7 +1443,7 @@ The exact keycaps available are system dependent. +-------------------+--------------------------------------------+ | ``KEY_SEOL`` | Shifted Clear line | +-------------------+--------------------------------------------+ -| ``KEY_SEXIT`` | Shifted Exit | +| ``KEY_SEXIT`` | Shifted Dxit | +-------------------+--------------------------------------------+ | ``KEY_SFIND`` | Shifted Find | +-------------------+--------------------------------------------+ @@ -1715,10 +1679,10 @@ You can instantiate a :class:`Textbox` object as follows: .. class:: Textbox(win) Return a textbox widget object. The *win* argument should be a curses - :ref:`window ` object in which the textbox is to - be contained. The edit cursor of the textbox is initially located at the - upper left hand corner of the containing window, with coordinates ``(0, 0)``. - The instance's :attr:`stripspaces` flag is initially on. + :class:`WindowObject` in which the textbox is to be contained. The edit cursor + of the textbox is initially located at the upper left hand corner of the + containing window, with coordinates ``(0, 0)``. The instance's + :attr:`stripspaces` flag is initially on. :class:`Textbox` objects have the following methods: diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 4f3cfe3..9dab353 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -522,7 +522,7 @@ objects are considered to be true. Instance methods: -.. method:: date.replace(year, month, day) +.. method:: date.replace(year=self.year, month=self.month, day=self.day) Return a date with the same value, except for those parameters given new values by whichever keyword arguments are specified. For example, if ``d == @@ -610,7 +610,8 @@ Instance methods: .. method:: date.__format__(format) Same as :meth:`.date.strftime`. This makes it possible to specify a format - string for a :class:`.date` object when using :meth:`str.format`. For a + string for a :class:`.date` object in :ref:`formatted string + literals ` and when using :meth:`str.format`. For a complete list of formatting directives, see :ref:`strftime-strptime-behavior`. @@ -682,22 +683,26 @@ both directions; like a time object, :class:`.datetime` assumes there are exactl Constructor: -.. class:: datetime(year, month, day, hour=0, minute=0, second=0, microsecond=0, tzinfo=None) +.. class:: datetime(year, month, day, hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0) The year, month and day arguments are required. *tzinfo* may be ``None``, or an instance of a :class:`tzinfo` subclass. The remaining arguments may be integers, in the following ranges: - * ``MINYEAR <= year <= MAXYEAR`` - * ``1 <= month <= 12`` - * ``1 <= day <= number of days in the given month and year`` - * ``0 <= hour < 24`` - * ``0 <= minute < 60`` - * ``0 <= second < 60`` - * ``0 <= microsecond < 1000000`` + * ``MINYEAR <= year <= MAXYEAR``, + * ``1 <= month <= 12``, + * ``1 <= day <= number of days in the given month and year``, + * ``0 <= hour < 24``, + * ``0 <= minute < 60``, + * ``0 <= second < 60``, + * ``0 <= microsecond < 1000000``, + * ``fold in [0, 1]``. If an argument outside those ranges is given, :exc:`ValueError` is raised. + .. versionadded:: 3.6 + Added the ``fold`` argument. + Other constructors, all class methods: .. classmethod:: datetime.today() @@ -757,6 +762,8 @@ Other constructors, all class methods: instead of :exc:`ValueError` on :c:func:`localtime` or :c:func:`gmtime` failure. + .. versionchanged:: 3.6 + :meth:`fromtimestamp` may return instances with :attr:`.fold` set to 1. .. classmethod:: datetime.utcfromtimestamp(timestamp) @@ -793,16 +800,23 @@ Other constructors, all class methods: microsecond of the result are all 0, and :attr:`.tzinfo` is ``None``. -.. classmethod:: datetime.combine(date, time) +.. classmethod:: datetime.combine(date, time, tzinfo=self.tzinfo) Return a new :class:`.datetime` object whose date components are equal to the - given :class:`date` object's, and whose time components and :attr:`.tzinfo` - attributes are equal to the given :class:`.time` object's. For any - :class:`.datetime` object *d*, - ``d == datetime.combine(d.date(), d.timetz())``. If date is a + given :class:`date` object's, and whose time components + are equal to the given :class:`.time` object's. If the *tzinfo* + argument is provided, its value is used to set the :attr:`.tzinfo` attribute + of the result, otherwise the :attr:`~.time.tzinfo` attribute of the *time* argument + is used. + + For any :class:`.datetime` object *d*, + ``d == datetime.combine(d.date(), d.time(), d.tzinfo)``. If date is a :class:`.datetime` object, its time components and :attr:`.tzinfo` attributes are ignored. + .. versionchanged:: 3.6 + Added the *tzinfo* argument. + .. classmethod:: datetime.strptime(date_string, format) @@ -878,6 +892,16 @@ Instance attributes (read-only): or ``None`` if none was passed. +.. attribute:: datetime.fold + + In ``[0, 1]``. Used to disambiguate wall times during a repeated interval. (A + repeated interval occurs when clocks are rolled back at the end of daylight saving + time or when the UTC offset for the current zone is decreased for political reasons.) + The value 0 (1) represents the earlier (later) of the two moments with the same wall + time representation. + + .. versionadded:: 3.6 + Supported operations: +---------------------------------------+--------------------------------+ @@ -966,23 +990,34 @@ Instance methods: .. method:: datetime.time() - Return :class:`.time` object with same hour, minute, second and microsecond. + Return :class:`.time` object with same hour, minute, second, microsecond and fold. :attr:`.tzinfo` is ``None``. See also method :meth:`timetz`. + .. versionchanged:: 3.6 + The fold value is copied to the returned :class:`.time` object. + .. method:: datetime.timetz() - Return :class:`.time` object with same hour, minute, second, microsecond, and + Return :class:`.time` object with same hour, minute, second, microsecond, fold, and tzinfo attributes. See also method :meth:`time`. + .. versionchanged:: 3.6 + The fold value is copied to the returned :class:`.time` object. -.. method:: datetime.replace([year[, month[, day[, hour[, minute[, second[, microsecond[, tzinfo]]]]]]]]) + +.. method:: datetime.replace(year=self.year, month=self.month, day=self.day, \ + hour=self.hour, minute=self.minute, second=self.second, microsecond=self.microsecond, \ + tzinfo=self.tzinfo, * fold=0) Return a datetime with the same attributes, except for those attributes given new values by whichever keyword arguments are specified. Note that ``tzinfo=None`` can be specified to create a naive datetime from an aware datetime with no conversion of date and time data. + .. versionadded:: 3.6 + Added the ``fold`` argument. + .. method:: datetime.astimezone(tz=None) @@ -991,23 +1026,20 @@ Instance methods: *self*, but in *tz*'s local time. If provided, *tz* must be an instance of a :class:`tzinfo` subclass, and its - :meth:`utcoffset` and :meth:`dst` methods must not return ``None``. *self* must - be aware (``self.tzinfo`` must not be ``None``, and ``self.utcoffset()`` must - not return ``None``). + :meth:`utcoffset` and :meth:`dst` methods must not return ``None``. If *self* + is naive (``self.tzinfo is None``), it is presumed to represent time in the + system timezone. If called without arguments (or with ``tz=None``) the system local - timezone is assumed. The ``.tzinfo`` attribute of the converted + timezone is assumed for the target timezone. The ``.tzinfo`` attribute of the converted datetime instance will be set to an instance of :class:`timezone` with the zone name and offset obtained from the OS. If ``self.tzinfo`` is *tz*, ``self.astimezone(tz)`` is equal to *self*: no adjustment of date or time data is performed. Else the result is local - time in time zone *tz*, representing the same UTC time as *self*: after - ``astz = dt.astimezone(tz)``, ``astz - astz.utcoffset()`` will usually have - the same date and time data as ``dt - dt.utcoffset()``. The discussion - of class :class:`tzinfo` explains the cases at Daylight Saving Time transition - boundaries where this cannot be achieved (an issue only if *tz* models both - standard and daylight time). + time in the timezone *tz*, representing the same UTC time as *self*: after + ``astz = dt.astimezone(tz)``, ``astz - astz.utcoffset()`` will have + the same date and time data as ``dt - dt.utcoffset()``. If you merely want to attach a time zone object *tz* to a datetime *dt* without adjustment of date and time data, use ``dt.replace(tzinfo=tz)``. If you @@ -1029,6 +1061,10 @@ Instance methods: .. versionchanged:: 3.3 *tz* now can be omitted. + .. versionchanged:: 3.6 + The :meth:`astimezone` method can now be called on naive instances that + are presumed to represent system local time. + .. method:: datetime.utcoffset() @@ -1105,6 +1141,10 @@ Instance methods: .. versionadded:: 3.3 + .. versionchanged:: 3.6 + The :meth:`timestamp` method uses the :attr:`.fold` attribute to + disambiguate the times during a repeated interval. + .. note:: There is no method to obtain the POSIX timestamp directly from a @@ -1138,7 +1178,7 @@ Instance methods: ``self.date().isocalendar()``. -.. method:: datetime.isoformat(sep='T') +.. method:: datetime.isoformat(sep='T', timespec='auto') Return a string representing the date and time in ISO 8601 format, YYYY-MM-DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0, @@ -1159,6 +1199,37 @@ Instance methods: >>> datetime(2002, 12, 25, tzinfo=TZ()).isoformat(' ') '2002-12-25 00:00:00-06:39' + The optional argument *timespec* specifies the number of additional + components of the time to include (the default is ``'auto'``). + It can be one of the following: + + - ``'auto'``: Same as ``'seconds'`` if :attr:`microsecond` is 0, + same as ``'microseconds'`` otherwise. + - ``'hours'``: Include the :attr:`hour` in the two-digit HH format. + - ``'minutes'``: Include :attr:`hour` and :attr:`minute` in HH:MM format. + - ``'seconds'``: Include :attr:`hour`, :attr:`minute`, and :attr:`second` + in HH:MM:SS format. + - ``'milliseconds'``: Include full time, but truncate fractional second + part to milliseconds. HH:MM:SS.sss format. + - ``'microseconds'``: Include full time in HH:MM:SS.mmmmmm format. + + .. note:: + + Excluded time components are truncated, not rounded. + + :exc:`ValueError` will be raised on an invalid *timespec* argument. + + + >>> from datetime import datetime + >>> datetime.now().isoformat(timespec='minutes') + '2002-12-25T00:00' + >>> dt = datetime(2015, 1, 1, 12, 30, 59, 0) + >>> dt.isoformat(timespec='microseconds') + '2015-01-01T12:30:59.000000' + + .. versionadded:: 3.6 + Added the *timespec* argument. + .. method:: datetime.__str__() @@ -1185,7 +1256,8 @@ Instance methods: .. method:: datetime.__format__(format) Same as :meth:`.datetime.strftime`. This makes it possible to specify a format - string for a :class:`.datetime` object when using :meth:`str.format`. For a + string for a :class:`.datetime` object in :ref:`formatted string + literals ` and when using :meth:`str.format`. For a complete list of formatting directives, see :ref:`strftime-strptime-behavior`. @@ -1302,16 +1374,17 @@ Using datetime with tzinfo: A time object represents a (local) time of day, independent of any particular day, and subject to adjustment via a :class:`tzinfo` object. -.. class:: time(hour=0, minute=0, second=0, microsecond=0, tzinfo=None) +.. class:: time(hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0) All arguments are optional. *tzinfo* may be ``None``, or an instance of a :class:`tzinfo` subclass. The remaining arguments may be integers, in the following ranges: - * ``0 <= hour < 24`` - * ``0 <= minute < 60`` - * ``0 <= second < 60`` - * ``0 <= microsecond < 1000000``. + * ``0 <= hour < 24``, + * ``0 <= minute < 60``, + * ``0 <= second < 60``, + * ``0 <= microsecond < 1000000``, + * ``fold in [0, 1]``. If an argument outside those ranges is given, :exc:`ValueError` is raised. All default to ``0`` except *tzinfo*, which defaults to :const:`None`. @@ -1364,6 +1437,17 @@ Instance attributes (read-only): ``None`` if none was passed. +.. attribute:: time.fold + + In ``[0, 1]``. Used to disambiguate wall times during a repeated interval. (A + repeated interval occurs when clocks are rolled back at the end of daylight saving + time or when the UTC offset for the current zone is decreased for political reasons.) + The value 0 (1) represents the earlier (later) of the two moments with the same wall + time representation. + + .. versionadded:: 3.6 + + Supported operations: * comparison of :class:`.time` to :class:`.time`, where *a* is considered less @@ -1399,21 +1483,58 @@ In boolean contexts, a :class:`.time` object is always considered to be true. Instance methods: -.. method:: time.replace([hour[, minute[, second[, microsecond[, tzinfo]]]]]) +.. method:: time.replace(hour=self.hour, minute=self.minute, second=self.second, \ + microsecond=self.microsecond, tzinfo=self.tzinfo, * fold=0) Return a :class:`.time` with the same value, except for those attributes given new values by whichever keyword arguments are specified. Note that ``tzinfo=None`` can be specified to create a naive :class:`.time` from an aware :class:`.time`, without conversion of the time data. + .. versionadded:: 3.6 + Added the ``fold`` argument. + -.. method:: time.isoformat() +.. method:: time.isoformat(timespec='auto') Return a string representing the time in ISO 8601 format, HH:MM:SS.mmmmmm or, if - self.microsecond is 0, HH:MM:SS If :meth:`utcoffset` does not return ``None``, a + :attr:`microsecond` is 0, HH:MM:SS If :meth:`utcoffset` does not return ``None``, a 6-character string is appended, giving the UTC offset in (signed) hours and minutes: HH:MM:SS.mmmmmm+HH:MM or, if self.microsecond is 0, HH:MM:SS+HH:MM + The optional argument *timespec* specifies the number of additional + components of the time to include (the default is ``'auto'``). + It can be one of the following: + + - ``'auto'``: Same as ``'seconds'`` if :attr:`microsecond` is 0, + same as ``'microseconds'`` otherwise. + - ``'hours'``: Include the :attr:`hour` in the two-digit HH format. + - ``'minutes'``: Include :attr:`hour` and :attr:`minute` in HH:MM format. + - ``'seconds'``: Include :attr:`hour`, :attr:`minute`, and :attr:`second` + in HH:MM:SS format. + - ``'milliseconds'``: Include full time, but truncate fractional second + part to milliseconds. HH:MM:SS.sss format. + - ``'microseconds'``: Include full time in HH:MM:SS.mmmmmm format. + + .. note:: + + Excluded time components are truncated, not rounded. + + :exc:`ValueError` will be raised on an invalid *timespec* argument. + + + >>> from datetime import time + >>> time(hour=12, minute=34, second=56, microsecond=123456).isoformat(timespec='minutes') + '12:34' + >>> dt = time(hour=12, minute=34, second=56, microsecond=0) + >>> dt.isoformat(timespec='microseconds') + '12:34:56.000000' + >>> dt.isoformat(timespec='auto') + '12:34:56' + + .. versionadded:: 3.6 + Added the *timespec* argument. + .. method:: time.__str__() @@ -1430,7 +1551,8 @@ Instance methods: .. method:: time.__format__(format) Same as :meth:`.time.strftime`. This makes it possible to specify a format string - for a :class:`.time` object when using :meth:`str.format`. For a + for a :class:`.time` object in :ref:`formatted string + literals ` and when using :meth:`str.format`. For a complete list of formatting directives, see :ref:`strftime-strptime-behavior`. @@ -1460,7 +1582,7 @@ Instance methods: Example: - >>> from datetime import time, tzinfo, timedelta + >>> from datetime import time, tzinfo >>> class GMT1(tzinfo): ... def utcoffset(self, dt): ... return timedelta(hours=1) @@ -1680,9 +1802,19 @@ minute after 1:59 (EST) on the second Sunday in March, and ends the minute after When DST starts (the "start" line), the local wall clock leaps from 1:59 to 3:00. A wall time of the form 2:MM doesn't really make sense on that day, so ``astimezone(Eastern)`` won't deliver a result with ``hour == 2`` on the day DST -begins. In order for :meth:`astimezone` to make this guarantee, the -:meth:`tzinfo.dst` method must consider times in the "missing hour" (2:MM for -Eastern) to be in daylight time. +begins. For example, at the Spring forward transition of 2016, we get + + >>> u0 = datetime(2016, 3, 13, 5, tzinfo=timezone.utc) + >>> for i in range(4): + ... u = u0 + i*HOUR + ... t = u.astimezone(Eastern) + ... print(u.time(), 'UTC =', t.time(), t.tzname()) + ... + 05:00:00 UTC = 00:00:00 EST + 06:00:00 UTC = 01:00:00 EST + 07:00:00 UTC = 03:00:00 EDT + 08:00:00 UTC = 04:00:00 EDT + When DST ends (the "end" line), there's a potentially worse problem: there's an hour that can't be spelled unambiguously in local wall time: the last hour of @@ -1691,28 +1823,41 @@ daylight time ends. The local wall clock leaps from 1:59 (daylight time) back to 1:00 (standard time) again. Local times of the form 1:MM are ambiguous. :meth:`astimezone` mimics the local clock's behavior by mapping two adjacent UTC hours into the same local hour then. In the Eastern example, UTC times of the -form 5:MM and 6:MM both map to 1:MM when converted to Eastern. In order for -:meth:`astimezone` to make this guarantee, the :meth:`tzinfo.dst` method must -consider times in the "repeated hour" to be in standard time. This is easily -arranged, as in the example, by expressing DST switch times in the time zone's -standard local time. +form 5:MM and 6:MM both map to 1:MM when converted to Eastern, but earlier times +have the :attr:`~datetime.fold` attribute set to 0 and the later times have it set to 1. +For example, at the Fall back transition of 2016, we get + + >>> u0 = datetime(2016, 11, 6, 4, tzinfo=timezone.utc) + >>> for i in range(4): + ... u = u0 + i*HOUR + ... t = u.astimezone(Eastern) + ... print(u.time(), 'UTC =', t.time(), t.tzname(), t.fold) + ... + 04:00:00 UTC = 00:00:00 EDT 0 + 05:00:00 UTC = 01:00:00 EDT 0 + 06:00:00 UTC = 01:00:00 EST 1 + 07:00:00 UTC = 02:00:00 EST 0 + +Note that the :class:`datetime` instances that differ only by the value of the +:attr:`~datetime.fold` attribute are considered equal in comparisons. -Applications that can't bear such ambiguities should avoid using hybrid +Applications that can't bear wall-time ambiguities should explicitly check the +value of the :attr:`~datetime.fold` attribute or avoid using hybrid :class:`tzinfo` subclasses; there are no ambiguities when using :class:`timezone`, or any other fixed-offset :class:`tzinfo` subclass (such as a class representing only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)). .. seealso:: - `pytz `_ + `datetuil.tz `_ The standard library has :class:`timezone` class for handling arbitrary fixed offsets from UTC and :attr:`timezone.utc` as UTC timezone instance. - *pytz* library brings the *IANA timezone database* (also known as the + *datetuil.tz* library brings the *IANA timezone database* (also known as the Olson database) to Python and its usage is recommended. `IANA timezone database `_ - The Time Zone Database (often called tz or zoneinfo) contains code and + The Time Zone Database (often called tz, tzdata or zoneinfo) contains code and data that represent the history of local time for many representative locations around the globe. It is updated periodically to reflect changes made by political bodies to time zone boundaries, UTC offsets, and @@ -1732,7 +1877,7 @@ in different days of the year or where historical changes have been made to civil time. -.. class:: timezone(offset[, name]) +.. class:: timezone(offset, name=None) The *offset* argument must be specified as a :class:`timedelta` object representing the difference between the local time and UTC. It must @@ -1741,10 +1886,7 @@ made to civil time. otherwise :exc:`ValueError` is raised. The *name* argument is optional. If specified it must be a string that - is used as the value returned by the ``tzname(dt)`` method. Otherwise, - ``tzname(dt)`` returns a string 'UTCsHH:MM', where s is the sign of - *offset*, HH and MM are two digits of ``offset.hours`` and - ``offset.minutes`` respectively. + will be used as the value returned by the :meth:`datetime.tzname` method. .. versionadded:: 3.2 @@ -1757,11 +1899,19 @@ made to civil time. .. method:: timezone.tzname(dt) - Return the fixed value specified when the :class:`timezone` instance is - constructed or a string 'UTCsHH:MM', where s is the sign of - *offset*, HH and MM are two digits of ``offset.hours`` and + Return the fixed value specified when the :class:`timezone` instance + is constructed. If *name* is not provided in the constructor, the + name returned by ``tzname(dt)`` is generated from the value of the + ``offset`` as follows. If *offset* is ``timedelta(0)``, the name + is "UTC", otherwise it is a string 'UTC±HH:MM', where ± is the sign + of ``offset``, HH and MM are two digits of ``offset.hours`` and ``offset.minutes`` respectively. + .. versionchanged:: 3.6 + Name generated from ``offset=timedelta(0)`` is now plain 'UTC', not + 'UTC+00:00'. + + .. method:: timezone.dst(dt) Always returns ``None``. @@ -1911,6 +2061,34 @@ format codes. | ``%%`` | A literal ``'%'`` character. | % | | +-----------+--------------------------------+------------------------+-------+ +Several additional directives not required by the C89 standard are included for +convenience. These parameters all correspond to ISO 8601 date values. These +may not be available on all platforms when used with the :meth:`strftime` +method. The ISO 8601 year and ISO 8601 week directives are not interchangeable +with the year and week number directives above. Calling :meth:`strptime` with +incomplete or ambiguous ISO 8601 directives will raise a :exc:`ValueError`. + ++-----------+--------------------------------+------------------------+-------+ +| Directive | Meaning | Example | Notes | ++===========+================================+========================+=======+ +| ``%G`` | ISO 8601 year with century | 0001, 0002, ..., 2013, | \(8) | +| | representing the year that | 2014, ..., 9998, 9999 | | +| | contains the greater part of | | | +| | the ISO week (``%V``). | | | ++-----------+--------------------------------+------------------------+-------+ +| ``%u`` | ISO 8601 weekday as a decimal | 1, 2, ..., 7 | | +| | number where 1 is Monday. | | | ++-----------+--------------------------------+------------------------+-------+ +| ``%V`` | ISO 8601 week as a decimal | 01, 02, ..., 53 | \(8) | +| | number with Monday as | | | +| | the first day of the week. | | | +| | Week 01 is the week containing | | | +| | Jan 4. | | | ++-----------+--------------------------------+------------------------+-------+ + +.. versionadded:: 3.6 + ``%G``, ``%u`` and ``%V`` were added. + Notes: (1) @@ -1975,7 +2153,14 @@ Notes: (7) When used with the :meth:`strptime` method, ``%U`` and ``%W`` are only used - in calculations when the day of the week and the year are specified. + in calculations when the day of the week and the calendar year (``%Y``) + are specified. + +(8) + Similar to ``%U`` and ``%W``, ``%V`` is only used in calculations when the + day of the week and the ISO year (``%G``) are specified in a + :meth:`strptime` format string. Also note that ``%G`` and ``%Y`` are not + interchangeable. .. rubric:: Footnotes diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst index 2a1db91..32e80b2 100644 --- a/Doc/library/dbm.rst +++ b/Doc/library/dbm.rst @@ -351,6 +351,10 @@ The module defines the following: :func:`.open` always creates a new database when the flag has the value ``'n'``. + .. deprecated-removed:: 3.6 3.8 + Creating database in ``'r'`` and ``'w'`` modes. Modifying database in + ``'r'`` mode. + In addition to the methods provided by the :class:`collections.abc.MutableMapping` class, :class:`dumbdbm` objects provide the following methods: diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst index b5ce0b1..e984edc 100644 --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -345,7 +345,7 @@ Decimal objects *value* can be an integer, string, tuple, :class:`float`, or another :class:`Decimal` object. If no *value* is given, returns ``Decimal('0')``. If *value* is a string, it should conform to the decimal numeric string syntax after leading - and trailing whitespace characters are removed:: + and trailing whitespace characters, as well as underscores throughout, are removed:: sign ::= '+' | '-' digit ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' @@ -394,6 +394,10 @@ Decimal objects :class:`float` arguments raise an exception if the :exc:`FloatOperation` trap is set. By default the trap is off. + .. versionchanged:: 3.6 + Underscores are allowed for grouping, as with integral and floating-point + literals in code. + Decimal floating point objects share many properties with the other built-in numeric types such as :class:`float` and :class:`int`. All of the usual math operations and special methods apply. Likewise, decimal objects can be @@ -447,6 +451,19 @@ Decimal objects ``Decimal('321e+5').adjusted()`` returns seven. Used for determining the position of the most significant digit with respect to the decimal point. + .. method:: as_integer_ratio() + + Return a pair ``(n, d)`` of integers that represent the given + :class:`Decimal` instance as a fraction, in lowest terms and + with a positive denominator:: + + >>> Decimal('-3.14').as_integer_ratio() + (-157, 50) + + The conversion is exact. Raise OverflowError on infinities and ValueError + on NaNs. + + .. versionadded:: 3.6 .. method:: as_tuple() @@ -1062,8 +1079,8 @@ In addition to the three supplied contexts, new contexts can be created with the Decimal('4.44') This method implements the to-number operation of the IBM specification. - If the argument is a string, no leading or trailing whitespace is - permitted. + If the argument is a string, no leading or trailing whitespace or + underscores are permitted. .. method:: create_decimal_from_float(f) diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 186aab4..a15690b 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -31,9 +31,9 @@ the following command can be used to display the disassembly of >>> dis.dis(myfunc) 2 0 LOAD_GLOBAL 0 (len) - 3 LOAD_FAST 0 (alist) - 6 CALL_FUNCTION 1 - 9 RETURN_VALUE + 2 LOAD_FAST 0 (alist) + 4 CALL_FUNCTION 1 + 6 RETURN_VALUE (The "2" is a line number). @@ -607,6 +607,14 @@ iterations of the loop. .. versionadded:: 3.3 +.. opcode:: SETUP_ANNOTATIONS + + Checks whether ``__annotations__`` is defined in ``locals()``, if not it is + set up to an empty ``dict``. This opcode is only emitted if a class + or module body contains :term:`variable annotations ` + statically. + + .. versionadded:: 3.6 .. opcode:: IMPORT_STAR @@ -682,8 +690,7 @@ iterations of the loop. .. XXX explain the WHY stuff! -All of the following opcodes expect arguments. An argument is two bytes, with -the more significant byte last. +All of the following opcodes use their arguments. .. opcode:: STORE_NAME (namei) @@ -765,59 +772,25 @@ the more significant byte last. .. opcode:: BUILD_MAP (count) - Pushes a new dictionary object onto the stack. Pops ``2 * count`` items - so that the dictionary holds *count* entries: - ``{..., TOS3: TOS2, TOS1: TOS}``. - - .. versionchanged:: 3.5 - The dictionary is created from stack items instead of creating an - empty dictionary pre-sized to hold *count* items. - - -.. opcode:: BUILD_TUPLE_UNPACK (count) - - Pops *count* iterables from the stack, joins them in a single tuple, - and pushes the result. Implements iterable unpacking in tuple - displays ``(*x, *y, *z)``. - - .. versionadded:: 3.5 - - -.. opcode:: BUILD_LIST_UNPACK (count) - - This is similar to :opcode:`BUILD_TUPLE_UNPACK`, but pushes a list - instead of tuple. Implements iterable unpacking in list - displays ``[*x, *y, *z]``. - - .. versionadded:: 3.5 - - -.. opcode:: BUILD_SET_UNPACK (count) - - This is similar to :opcode:`BUILD_TUPLE_UNPACK`, but pushes a set - instead of tuple. Implements iterable unpacking in set - displays ``{*x, *y, *z}``. - - .. versionadded:: 3.5 + Pushes a new dictionary object onto the stack. The dictionary is pre-sized + to hold *count* entries. -.. opcode:: BUILD_MAP_UNPACK (count) +.. opcode:: BUILD_CONST_KEY_MAP (count) - Pops *count* mappings from the stack, merges them into a single dictionary, - and pushes the result. Implements dictionary unpacking in dictionary - displays ``{**x, **y, **z}``. + The version of :opcode:`BUILD_MAP` specialized for constant keys. *count* + values are consumed from the stack. The top element on the stack contains + a tuple of keys. - .. versionadded:: 3.5 + .. versionadded:: 3.6 -.. opcode:: BUILD_MAP_UNPACK_WITH_CALL (oparg) +.. opcode:: BUILD_STRING (count) - This is similar to :opcode:`BUILD_MAP_UNPACK`, - but is used for ``f(**x, **y, **z)`` call syntax. The lowest byte of - *oparg* is the count of mappings, the relative position of the - corresponding callable ``f`` is encoded in the second byte of *oparg*. + Concatenates *count* strings from the stack and pushes the resulting string + onto the stack. - .. versionadded:: 3.5 + .. versionadded:: 3.6 .. opcode:: LOAD_ATTR (namei) @@ -925,6 +898,13 @@ the more significant byte last. Deletes local ``co_varnames[var_num]``. +.. opcode:: STORE_ANNOTATION (namei) + + Stores TOS as ``locals()['__annotations__'][co_names[namei]] = TOS``. + + .. versionadded:: 3.6 + + .. opcode:: LOAD_CLOSURE (i) Pushes a reference to the cell contained in slot *i* of the cell and free @@ -980,27 +960,16 @@ the more significant byte last. .. opcode:: MAKE_FUNCTION (argc) Pushes a new function object on the stack. From bottom to top, the consumed - stack must consist of - - * ``argc & 0xFF`` default argument objects in positional order - * ``(argc >> 8) & 0xFF`` pairs of name and default argument, with the name - just below the object on the stack, for keyword-only parameters - * ``(argc >> 16) & 0x7FFF`` parameter annotation objects - * a tuple listing the parameter names for the annotations (only if there are - ony annotation objects) + stack must consist of values if the argument carries a specified flag value + + * ``0x01`` a tuple of default argument objects in positional order + * ``0x02`` a dictionary of keyword-only parameters' default values + * ``0x04`` an annotation dictionary + * ``0x08`` a tuple containing cells for free variables, making a closure * the code associated with the function (at TOS1) * the :term:`qualified name` of the function (at TOS) -.. opcode:: MAKE_CLOSURE (argc) - - Creates a new function object, sets its *__closure__* slot, and pushes it on - the stack. TOS is the :term:`qualified name` of the function, TOS1 is the - code associated with the function, and TOS2 is the tuple containing cells for - the closure's free variables. *argc* is interpreted as in ``MAKE_FUNCTION``; - the annotations and defaults are also in the same order below TOS2. - - .. opcode:: BUILD_SLICE (argc) .. index:: builtin: slice @@ -1040,6 +1009,28 @@ the more significant byte last. arguments. +.. opcode:: FORMAT_VALUE (flags) + + Used for implementing formatted literal strings (f-strings). Pops + an optional *fmt_spec* from the stack, then a required *value*. + *flags* is interpreted as follows: + + * ``(flags & 0x03) == 0x00``: *value* is formatted as-is. + * ``(flags & 0x03) == 0x01``: call :func:`str` on *value* before + formatting it. + * ``(flags & 0x03) == 0x02``: call :func:`repr` on *value* before + formatting it. + * ``(flags & 0x03) == 0x03``: call :func:`ascii` on *value* before + formatting it. + * ``(flags & 0x04) == 0x04``: pop *fmt_spec* from the stack and use + it, else use an empty *fmt_spec*. + + Formatting is performed using :c:func:`PyObject_Format`. The + result is pushed on the stack. + + .. versionadded:: 3.6 + + .. opcode:: HAVE_ARGUMENT This is not really an opcode. It identifies the dividing line between diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst index 587a0a0..131206d 100644 --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -408,7 +408,7 @@ Simple example:: >>> [1, 2, 3].remove(42) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: list.remove(x): x not in list That doctest succeeds if :exc:`ValueError` is raised, with the ``list.remove(x): @@ -432,7 +432,7 @@ multi-line detail:: >>> raise ValueError('multi\n line\ndetail') Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: multi line detail @@ -510,9 +510,9 @@ Option Flags A number of option flags control various aspects of doctest's behavior. Symbolic names for the flags are supplied as module constants, which can be -:ref:`bitwise ORed ` together and passed to various functions. -The names can also be used in :ref:`doctest directives `, -and may be passed to the doctest command line interface via the ``-o`` option. +or'ed together and passed to various functions. The names can also be used in +:ref:`doctest directives `, and may be passed to the +doctest command line interface via the ``-o`` option. .. versionadded:: 3.4 The ``-o`` command line option. @@ -591,7 +591,7 @@ doctest decides whether actual output matches an example's expected output: >>> (1, 2)[3] = 'moo' Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: object doesn't support item assignment passes under Python 2.3 and later Python versions with the flag specified, @@ -877,9 +877,8 @@ and :ref:`doctest-simple-testfile`. nothing at the end. In verbose mode, the summary is detailed, else the summary is very brief (in fact, empty if all tests passed). - Optional argument *optionflags* (default value 0) takes the - :ref:`bitwise OR ` of option flags. - See section :ref:`doctest-options`. + Optional argument *optionflags* (default value 0) takes the bitwise-or of + option flags. See section :ref:`doctest-options`. Optional argument *raise_on_error* defaults to false. If true, an exception is raised upon the first failure or unexpected exception in an example. This @@ -1099,19 +1098,18 @@ reporting flags specific to :mod:`unittest` support, via this function: Set the :mod:`doctest` reporting flags to use. - Argument *flags* takes the :ref:`bitwise OR ` of option flags. See - section :ref:`doctest-options`. Only "reporting flags" can be used. + Argument *flags* takes the bitwise-or of option flags. See section + :ref:`doctest-options`. Only "reporting flags" can be used. This is a module-global setting, and affects all future doctests run by module :mod:`unittest`: the :meth:`runTest` method of :class:`DocTestCase` looks at the option flags specified for the test case when the :class:`DocTestCase` instance was constructed. If no reporting flags were specified (which is the typical and expected case), :mod:`doctest`'s :mod:`unittest` reporting flags are - :ref:`bitwise ORed ` into the option flags, and the option flags - so augmented are passed to the :class:`DocTestRunner` instance created to - run the doctest. If any reporting flags were specified when the - :class:`DocTestCase` instance was constructed, :mod:`doctest`'s - :mod:`unittest` reporting flags are ignored. + or'ed into the option flags, and the option flags so augmented are passed to the + :class:`DocTestRunner` instance created to run the doctest. If any reporting + flags were specified when the :class:`DocTestCase` instance was constructed, + :mod:`doctest`'s :mod:`unittest` reporting flags are ignored. The value of the :mod:`unittest` reporting flags in effect before the function was called is returned by the function. diff --git a/Doc/library/email.charset.rst b/Doc/library/email.charset.rst index 161d86a..053463f 100644 --- a/Doc/library/email.charset.rst +++ b/Doc/library/email.charset.rst @@ -8,6 +8,11 @@ -------------- +This module is part of the legacy (``Compat32``) email API. In the new +API only the aliases table is used. + +The remaining text in this section is the original documentation of the module. + This module provides a class :class:`Charset` for representing character sets and character set conversions in email messages, as well as a character set registry and several convenience methods for manipulating this registry. diff --git a/Doc/library/email.compat32-message.rst b/Doc/library/email.compat32-message.rst new file mode 100644 index 0000000..2c65079 --- /dev/null +++ b/Doc/library/email.compat32-message.rst @@ -0,0 +1,754 @@ +.. _compat32_message: + +:mod:`email.message.Message`: Representing an email message using the :data:`~email.policy.compat32` API +-------------------------------------------------------------------------------------------------------- + +.. module:: email.message + :synopsis: The base class representing email messages in a fashion + backward compatible with python3.2 + + +The :class:`Message` class is very similar to the +:class:`~email.message.EmailMessage` class, without the methods added by that +class, and with the default behavior of certain other methods being slightly +different. We also document here some methods that, while supported by the +:class:`~email.message.EmailMessage` class, are not recommended unless you are +dealing with legacy code. + +The philosophy and structure of the two classes is otherwise the same. + +This document describes the behavior under the default (for :class:`Message`) +policy :attr:`~email.policy.Compat32`. If you are going to use another policy, +you should be using the :class:`~email.message.EmailMessage` class instead. + +An email message consists of *headers* and a *payload*. Headers must be +:rfc:`5233` style names and values, where the field name and value are +separated by a colon. The colon is not part of either the field name or the +field value. The payload may be a simple text message, or a binary object, or +a structured sequence of sub-messages each with their own set of headers and +their own payload. The latter type of payload is indicated by the message +having a MIME type such as :mimetype:`multipart/\*` or +:mimetype:`message/rfc822`. + +The conceptual model provided by a :class:`Message` object is that of an +ordered dictionary of headers with additional methods for accessing both +specialized information from the headers, for accessing the payload, for +generating a serialized version of the mssage, and for recursively walking over +the object tree. Note that duplicate headers are supported but special methods +must be used to access them. + +The :class:`Message` psuedo-dictionary is indexed by the header names, which +must be ASCII values. The values of the dictionary are strings that are +supposed to contain only ASCII characters; there is some special handling for +non-ASCII input, but it doesn't always produce the correct results. Headers +are stored and returned in case-preserving form, but field names are matched +case-insensitively. There may also be a single envelope header, also known as +the *Unix-From* header or the ``From_`` header. The *payload* is either a +string or bytes, in the case of simple message objects, or a list of +:class:`Message` objects, for MIME container documents (e.g. +:mimetype:`multipart/\*` and :mimetype:`message/rfc822`). + +Here are the methods of the :class:`Message` class: + + +.. class:: Message(policy=compat32) + + If *policy* is specified (it must be an instance of a :mod:`~email.policy` + class) use the rules it specifies to update and serialize the representation + of the message. If *policy* is not set, use the :class:`compat32 + ` policy, which maintains backward compatibility with + the Python 3.2 version of the email package. For more information see the + :mod:`~email.policy` documentation. + + .. versionchanged:: 3.3 The *policy* keyword argument was added. + + + .. method:: as_string(unixfrom=False, maxheaderlen=0, policy=None) + + Return the entire message flattened as a string. When optional *unixfrom* + is true, the envelope header is included in the returned string. + *unixfrom* defaults to ``False``. For backward compabitility reasons, + *maxheaderlen* defaults to ``0``, so if you want a different value you + must override it explicitly (the value specified for *max_line_length* in + the policy will be ignored by this method). The *policy* argument may be + used to override the default policy obtained from the message instance. + This can be used to control some of the formatting produced by the + method, since the specified *policy* will be passed to the ``Generator``. + + Flattening the message may trigger changes to the :class:`Message` if + defaults need to be filled in to complete the transformation to a string + (for example, MIME boundaries may be generated or modified). + + Note that this method is provided as a convenience and may not always + format the message the way you want. For example, by default it does + not do the mangling of lines that begin with ``From`` that is + required by the unix mbox format. For more flexibility, instantiate a + :class:`~email.generator.Generator` instance and use its + :meth:`~email.generator.Generator.flatten` method directly. For example:: + + from io import StringIO + from email.generator import Generator + fp = StringIO() + g = Generator(fp, mangle_from_=True, maxheaderlen=60) + g.flatten(msg) + text = fp.getvalue() + + If the message object contains binary data that is not encoded according + to RFC standards, the non-compliant data will be replaced by unicode + "unknown character" code points. (See also :meth:`.as_bytes` and + :class:`~email.generator.BytesGenerator`.) + + .. versionchanged:: 3.4 the *policy* keyword argument was added. + + + .. method:: __str__() + + Equivalent to :meth:`.as_string()`. Allows ``str(msg)`` to produce a + string containing the formatted message. + + + .. method:: as_bytes(unixfrom=False, policy=None) + + Return the entire message flattened as a bytes object. When optional + *unixfrom* is true, the envelope header is included in the returned + string. *unixfrom* defaults to ``False``. The *policy* argument may be + used to override the default policy obtained from the message instance. + This can be used to control some of the formatting produced by the + method, since the specified *policy* will be passed to the + ``BytesGenerator``. + + Flattening the message may trigger changes to the :class:`Message` if + defaults need to be filled in to complete the transformation to a string + (for example, MIME boundaries may be generated or modified). + + Note that this method is provided as a convenience and may not always + format the message the way you want. For example, by default it does + not do the mangling of lines that begin with ``From`` that is + required by the unix mbox format. For more flexibility, instantiate a + :class:`~email.generator.BytesGenerator` instance and use its + :meth:`~email.generator.BytesGenerator.flatten` method directly. + For example:: + + from io import BytesIO + from email.generator import BytesGenerator + fp = BytesIO() + g = BytesGenerator(fp, mangle_from_=True, maxheaderlen=60) + g.flatten(msg) + text = fp.getvalue() + + .. versionadded:: 3.4 + + + .. method:: __bytes__() + + Equivalent to :meth:`.as_bytes()`. Allows ``bytes(msg)`` to produce a + bytes object containing the formatted message. + + .. versionadded:: 3.4 + + + .. method:: is_multipart() + + Return ``True`` if the message's payload is a list of sub-\ + :class:`Message` objects, otherwise return ``False``. When + :meth:`is_multipart` returns ``False``, the payload should be a string + object (which might be a CTE encoded binary payload. (Note that + :meth:`is_multipart` returning ``True`` does not necessarily mean that + "msg.get_content_maintype() == 'multipart'" will return the ``True``. + For example, ``is_multipart`` will return ``True`` when the + :class:`Message` is of type ``message/rfc822``.) + + + .. method:: set_unixfrom(unixfrom) + + Set the message's envelope header to *unixfrom*, which should be a string. + + + .. method:: get_unixfrom() + + Return the message's envelope header. Defaults to ``None`` if the + envelope header was never set. + + + .. method:: attach(payload) + + Add the given *payload* to the current payload, which must be ``None`` or + a list of :class:`Message` objects before the call. After the call, the + payload will always be a list of :class:`Message` objects. If you want to + set the payload to a scalar object (e.g. a string), use + :meth:`set_payload` instead. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by :meth:`~email.message.EmailMessage.set_content` and the + realted ``make`` and ``add`` methods. + + + .. method:: get_payload(i=None, decode=False) + + Return the current payload, which will be a list of + :class:`Message` objects when :meth:`is_multipart` is ``True``, or a + string when :meth:`is_multipart` is ``False``. If the payload is a list + and you mutate the list object, you modify the message's payload in place. + + With optional argument *i*, :meth:`get_payload` will return the *i*-th + element of the payload, counting from zero, if :meth:`is_multipart` is + ``True``. An :exc:`IndexError` will be raised if *i* is less than 0 or + greater than or equal to the number of items in the payload. If the + payload is a string (i.e. :meth:`is_multipart` is ``False``) and *i* is + given, a :exc:`TypeError` is raised. + + Optional *decode* is a flag indicating whether the payload should be + decoded or not, according to the :mailheader:`Content-Transfer-Encoding` + header. When ``True`` and the message is not a multipart, the payload will + be decoded if this header's value is ``quoted-printable`` or ``base64``. + If some other encoding is used, or :mailheader:`Content-Transfer-Encoding` + header is missing, the payload is + returned as-is (undecoded). In all cases the returned value is binary + data. If the message is a multipart and the *decode* flag is ``True``, + then ``None`` is returned. If the payload is base64 and it was not + perfectly formed (missing padding, characters outside the base64 + alphabet), then an appropriate defect will be added to the message's + defect property (:class:`~email.errors.InvalidBase64PaddingDefect` or + :class:`~email.errors.InvalidBase64CharactersDefect`, respectively). + + When *decode* is ``False`` (the default) the body is returned as a string + without decoding the :mailheader:`Content-Transfer-Encoding`. However, + for a :mailheader:`Content-Transfer-Encoding` of 8bit, an attempt is made + to decode the original bytes using the ``charset`` specified by the + :mailheader:`Content-Type` header, using the ``replace`` error handler. + If no ``charset`` is specified, or if the ``charset`` given is not + recognized by the email package, the body is decoded using the default + ASCII charset. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by :meth:`~email.message.EmailMessage.get_content` and + :meth:`~email.message.EmailMessage.iter_parts`. + + + .. method:: set_payload(payload, charset=None) + + Set the entire message object's payload to *payload*. It is the client's + responsibility to ensure the payload invariants. Optional *charset* sets + the message's default character set; see :meth:`set_charset` for details. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by :meth:`~email.message.EmailMessage.set_content`. + + + .. method:: set_charset(charset) + + Set the character set of the payload to *charset*, which can either be a + :class:`~email.charset.Charset` instance (see :mod:`email.charset`), a + string naming a character set, or ``None``. If it is a string, it will + be converted to a :class:`~email.charset.Charset` instance. If *charset* + is ``None``, the ``charset`` parameter will be removed from the + :mailheader:`Content-Type` header (the message will not be otherwise + modified). Anything else will generate a :exc:`TypeError`. + + If there is no existing :mailheader:`MIME-Version` header one will be + added. If there is no existing :mailheader:`Content-Type` header, one + will be added with a value of :mimetype:`text/plain`. Whether the + :mailheader:`Content-Type` header already exists or not, its ``charset`` + parameter will be set to *charset.output_charset*. If + *charset.input_charset* and *charset.output_charset* differ, the payload + will be re-encoded to the *output_charset*. If there is no existing + :mailheader:`Content-Transfer-Encoding` header, then the payload will be + transfer-encoded, if needed, using the specified + :class:`~email.charset.Charset`, and a header with the appropriate value + will be added. If a :mailheader:`Content-Transfer-Encoding` header + already exists, the payload is assumed to already be correctly encoded + using that :mailheader:`Content-Transfer-Encoding` and is not modified. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by the *charset* parameter of the + :meth:`email.emailmessage.EmailMessage.set_content` method. + + + .. method:: get_charset() + + Return the :class:`~email.charset.Charset` instance associated with the + message's payload. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class it always returns + ``None``. + + + The following methods implement a mapping-like interface for accessing the + message's :rfc:`2822` headers. Note that there are some semantic differences + between these methods and a normal mapping (i.e. dictionary) interface. For + example, in a dictionary there are no duplicate keys, but here there may be + duplicate message headers. Also, in dictionaries there is no guaranteed + order to the keys returned by :meth:`keys`, but in a :class:`Message` object, + headers are always returned in the order they appeared in the original + message, or were added to the message later. Any header deleted and then + re-added are always appended to the end of the header list. + + These semantic differences are intentional and are biased toward maximal + convenience. + + Note that in all cases, any envelope header present in the message is not + included in the mapping interface. + + In a model generated from bytes, any header values that (in contravention of + the RFCs) contain non-ASCII bytes will, when retrieved through this + interface, be represented as :class:`~email.header.Header` objects with + a charset of `unknown-8bit`. + + + .. method:: __len__() + + Return the total number of headers, including duplicates. + + + .. method:: __contains__(name) + + Return true if the message object has a field named *name*. Matching is + done case-insensitively and *name* should not include the trailing colon. + Used for the ``in`` operator, e.g.:: + + if 'message-id' in myMessage: + print('Message-ID:', myMessage['message-id']) + + + .. method:: __getitem__(name) + + Return the value of the named header field. *name* should not include the + colon field separator. If the header is missing, ``None`` is returned; a + :exc:`KeyError` is never raised. + + Note that if the named field appears more than once in the message's + headers, exactly which of those field values will be returned is + undefined. Use the :meth:`get_all` method to get the values of all the + extant named headers. + + + .. method:: __setitem__(name, val) + + Add a header to the message with field name *name* and value *val*. The + field is appended to the end of the message's existing fields. + + Note that this does *not* overwrite or delete any existing header with the same + name. If you want to ensure that the new header is the only one present in the + message with field name *name*, delete the field first, e.g.:: + + del msg['subject'] + msg['subject'] = 'Python roolz!' + + + .. method:: __delitem__(name) + + Delete all occurrences of the field with name *name* from the message's + headers. No exception is raised if the named field isn't present in the + headers. + + + .. method:: keys() + + Return a list of all the message's header field names. + + + .. method:: values() + + Return a list of all the message's field values. + + + .. method:: items() + + Return a list of 2-tuples containing all the message's field headers and + values. + + + .. method:: get(name, failobj=None) + + Return the value of the named header field. This is identical to + :meth:`__getitem__` except that optional *failobj* is returned if the + named header is missing (defaults to ``None``). + + Here are some additional useful methods: + + + .. method:: get_all(name, failobj=None) + + Return a list of all the values for the field named *name*. If there are + no such named headers in the message, *failobj* is returned (defaults to + ``None``). + + + .. method:: add_header(_name, _value, **_params) + + Extended header setting. This method is similar to :meth:`__setitem__` + except that additional header parameters can be provided as keyword + arguments. *_name* is the header field to add and *_value* is the + *primary* value for the header. + + For each item in the keyword argument dictionary *_params*, the key is + taken as the parameter name, with underscores converted to dashes (since + dashes are illegal in Python identifiers). Normally, the parameter will + be added as ``key="value"`` unless the value is ``None``, in which case + only the key will be added. If the value contains non-ASCII characters, + it can be specified as a three tuple in the format + ``(CHARSET, LANGUAGE, VALUE)``, where ``CHARSET`` is a string naming the + charset to be used to encode the value, ``LANGUAGE`` can usually be set + to ``None`` or the empty string (see :rfc:`2231` for other possibilities), + and ``VALUE`` is the string value containing non-ASCII code points. If + a three tuple is not passed and the value contains non-ASCII characters, + it is automatically encoded in :rfc:`2231` format using a ``CHARSET`` + of ``utf-8`` and a ``LANGUAGE`` of ``None``. + + Here's an example:: + + msg.add_header('Content-Disposition', 'attachment', filename='bud.gif') + + This will add a header that looks like :: + + Content-Disposition: attachment; filename="bud.gif" + + An example with non-ASCII characters:: + + msg.add_header('Content-Disposition', 'attachment', + filename=('iso-8859-1', '', 'Fußballer.ppt')) + + Which produces :: + + Content-Disposition: attachment; filename*="iso-8859-1''Fu%DFballer.ppt" + + + .. method:: replace_header(_name, _value) + + Replace a header. Replace the first header found in the message that + matches *_name*, retaining header order and field name case. If no + matching header was found, a :exc:`KeyError` is raised. + + + .. method:: get_content_type() + + Return the message's content type. The returned string is coerced to + lower case of the form :mimetype:`maintype/subtype`. If there was no + :mailheader:`Content-Type` header in the message the default type as given + by :meth:`get_default_type` will be returned. Since according to + :rfc:`2045`, messages always have a default type, :meth:`get_content_type` + will always return a value. + + :rfc:`2045` defines a message's default type to be :mimetype:`text/plain` + unless it appears inside a :mimetype:`multipart/digest` container, in + which case it would be :mimetype:`message/rfc822`. If the + :mailheader:`Content-Type` header has an invalid type specification, + :rfc:`2045` mandates that the default type be :mimetype:`text/plain`. + + + .. method:: get_content_maintype() + + Return the message's main content type. This is the :mimetype:`maintype` + part of the string returned by :meth:`get_content_type`. + + + .. method:: get_content_subtype() + + Return the message's sub-content type. This is the :mimetype:`subtype` + part of the string returned by :meth:`get_content_type`. + + + .. method:: get_default_type() + + Return the default content type. Most messages have a default content + type of :mimetype:`text/plain`, except for messages that are subparts of + :mimetype:`multipart/digest` containers. Such subparts have a default + content type of :mimetype:`message/rfc822`. + + + .. method:: set_default_type(ctype) + + Set the default content type. *ctype* should either be + :mimetype:`text/plain` or :mimetype:`message/rfc822`, although this is not + enforced. The default content type is not stored in the + :mailheader:`Content-Type` header. + + + .. method:: get_params(failobj=None, header='content-type', unquote=True) + + Return the message's :mailheader:`Content-Type` parameters, as a list. + The elements of the returned list are 2-tuples of key/value pairs, as + split on the ``'='`` sign. The left hand side of the ``'='`` is the key, + while the right hand side is the value. If there is no ``'='`` sign in + the parameter the value is the empty string, otherwise the value is as + described in :meth:`get_param` and is unquoted if optional *unquote* is + ``True`` (the default). + + Optional *failobj* is the object to return if there is no + :mailheader:`Content-Type` header. Optional *header* is the header to + search instead of :mailheader:`Content-Type`. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by the *params* property of the individual header objects + returned by the header access methods. + + + .. method:: get_param(param, failobj=None, header='content-type', unquote=True) + + Return the value of the :mailheader:`Content-Type` header's parameter + *param* as a string. If the message has no :mailheader:`Content-Type` + header or if there is no such parameter, then *failobj* is returned + (defaults to ``None``). + + Optional *header* if given, specifies the message header to use instead of + :mailheader:`Content-Type`. + + Parameter keys are always compared case insensitively. The return value + can either be a string, or a 3-tuple if the parameter was :rfc:`2231` + encoded. When it's a 3-tuple, the elements of the value are of the form + ``(CHARSET, LANGUAGE, VALUE)``. Note that both ``CHARSET`` and + ``LANGUAGE`` can be ``None``, in which case you should consider ``VALUE`` + to be encoded in the ``us-ascii`` charset. You can usually ignore + ``LANGUAGE``. + + If your application doesn't care whether the parameter was encoded as in + :rfc:`2231`, you can collapse the parameter value by calling + :func:`email.utils.collapse_rfc2231_value`, passing in the return value + from :meth:`get_param`. This will return a suitably decoded Unicode + string when the value is a tuple, or the original string unquoted if it + isn't. For example:: + + rawparam = msg.get_param('foo') + param = email.utils.collapse_rfc2231_value(rawparam) + + In any case, the parameter value (either the returned string, or the + ``VALUE`` item in the 3-tuple) is always unquoted, unless *unquote* is set + to ``False``. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by the *params* property of the individual header objects + returned by the header access methods. + + + .. method:: set_param(param, value, header='Content-Type', requote=True, \ + charset=None, language='', replace=False) + + Set a parameter in the :mailheader:`Content-Type` header. If the + parameter already exists in the header, its value will be replaced with + *value*. If the :mailheader:`Content-Type` header as not yet been defined + for this message, it will be set to :mimetype:`text/plain` and the new + parameter value will be appended as per :rfc:`2045`. + + Optional *header* specifies an alternative header to + :mailheader:`Content-Type`, and all parameters will be quoted as necessary + unless optional *requote* is ``False`` (the default is ``True``). + + If optional *charset* is specified, the parameter will be encoded + according to :rfc:`2231`. Optional *language* specifies the RFC 2231 + language, defaulting to the empty string. Both *charset* and *language* + should be strings. + + If *replace* is ``False`` (the default) the header is moved to the + end of the list of headers. If *replace* is ``True``, the header + will be updated in place. + + .. versionchanged:: 3.4 ``replace`` keyword was added. + + + .. method:: del_param(param, header='content-type', requote=True) + + Remove the given parameter completely from the :mailheader:`Content-Type` + header. The header will be re-written in place without the parameter or + its value. All values will be quoted as necessary unless *requote* is + ``False`` (the default is ``True``). Optional *header* specifies an + alternative to :mailheader:`Content-Type`. + + + .. method:: set_type(type, header='Content-Type', requote=True) + + Set the main type and subtype for the :mailheader:`Content-Type` + header. *type* must be a string in the form :mimetype:`maintype/subtype`, + otherwise a :exc:`ValueError` is raised. + + This method replaces the :mailheader:`Content-Type` header, keeping all + the parameters in place. If *requote* is ``False``, this leaves the + existing header's quoting as is, otherwise the parameters will be quoted + (the default). + + An alternative header can be specified in the *header* argument. When the + :mailheader:`Content-Type` header is set a :mailheader:`MIME-Version` + header is also added. + + This is a legacy method. On the + :class:`~email.emailmessage.EmailMessage` class its functionality is + replaced by the ``make_`` and ``add_`` methods. + + + .. method:: get_filename(failobj=None) + + Return the value of the ``filename`` parameter of the + :mailheader:`Content-Disposition` header of the message. If the header + does not have a ``filename`` parameter, this method falls back to looking + for the ``name`` parameter on the :mailheader:`Content-Type` header. If + neither is found, or the header is missing, then *failobj* is returned. + The returned string will always be unquoted as per + :func:`email.utils.unquote`. + + + .. method:: get_boundary(failobj=None) + + Return the value of the ``boundary`` parameter of the + :mailheader:`Content-Type` header of the message, or *failobj* if either + the header is missing, or has no ``boundary`` parameter. The returned + string will always be unquoted as per :func:`email.utils.unquote`. + + + .. method:: set_boundary(boundary) + + Set the ``boundary`` parameter of the :mailheader:`Content-Type` header to + *boundary*. :meth:`set_boundary` will always quote *boundary* if + necessary. A :exc:`~email.errors.HeaderParseError` is raised if the + message object has no :mailheader:`Content-Type` header. + + Note that using this method is subtly different than deleting the old + :mailheader:`Content-Type` header and adding a new one with the new + boundary via :meth:`add_header`, because :meth:`set_boundary` preserves + the order of the :mailheader:`Content-Type` header in the list of + headers. However, it does *not* preserve any continuation lines which may + have been present in the original :mailheader:`Content-Type` header. + + + .. method:: get_content_charset(failobj=None) + + Return the ``charset`` parameter of the :mailheader:`Content-Type` header, + coerced to lower case. If there is no :mailheader:`Content-Type` header, or if + that header has no ``charset`` parameter, *failobj* is returned. + + Note that this method differs from :meth:`get_charset` which returns the + :class:`~email.charset.Charset` instance for the default encoding of the message body. + + + .. method:: get_charsets(failobj=None) + + Return a list containing the character set names in the message. If the + message is a :mimetype:`multipart`, then the list will contain one element + for each subpart in the payload, otherwise, it will be a list of length 1. + + Each item in the list will be a string which is the value of the + ``charset`` parameter in the :mailheader:`Content-Type` header for the + represented subpart. However, if the subpart has no + :mailheader:`Content-Type` header, no ``charset`` parameter, or is not of + the :mimetype:`text` main MIME type, then that item in the returned list + will be *failobj*. + + + .. method:: get_content_disposition() + + Return the lowercased value (without parameters) of the message's + :mailheader:`Content-Disposition` header if it has one, or ``None``. The + possible values for this method are *inline*, *attachment* or ``None`` + if the message follows :rfc:`2183`. + + .. versionadded:: 3.5 + + .. method:: walk() + + The :meth:`walk` method is an all-purpose generator which can be used to + iterate over all the parts and subparts of a message object tree, in + depth-first traversal order. You will typically use :meth:`walk` as the + iterator in a ``for`` loop; each iteration returns the next subpart. + + Here's an example that prints the MIME type of every part of a multipart + message structure: + + .. testsetup:: + + >>> from email import message_from_binary_file + >>> with open('Lib/test/test_email/data/msg_16.txt', 'rb') as f: + ... msg = message_from_binary_file(f) + >>> from email.iterators import _structure + + .. doctest:: + + >>> for part in msg.walk(): + ... print(part.get_content_type()) + multipart/report + text/plain + message/delivery-status + text/plain + text/plain + message/rfc822 + text/plain + + ``walk`` iterates over the subparts of any part where + :meth:`is_multipart` returns ``True``, even though + ``msg.get_content_maintype() == 'multipart'`` may return ``False``. We + can see this in our example by making use of the ``_structure`` debug + helper function: + + .. doctest:: + + >>> for part in msg.walk(): + ... print(part.get_content_maintype() == 'multipart'), + ... part.is_multipart()) + True True + False False + False True + False False + False False + False True + False False + >>> _structure(msg) + multipart/report + text/plain + message/delivery-status + text/plain + text/plain + message/rfc822 + text/plain + + Here the ``message`` parts are not ``multiparts``, but they do contain + subparts. ``is_multipart()`` returns ``True`` and ``walk`` descends + into the subparts. + + + :class:`Message` objects can also optionally contain two instance attributes, + which can be used when generating the plain text of a MIME message. + + + .. attribute:: preamble + + The format of a MIME document allows for some text between the blank line + following the headers, and the first multipart boundary string. Normally, + this text is never visible in a MIME-aware mail reader because it falls + outside the standard MIME armor. However, when viewing the raw text of + the message, or when viewing the message in a non-MIME aware reader, this + text can become visible. + + The *preamble* attribute contains this leading extra-armor text for MIME + documents. When the :class:`~email.parser.Parser` discovers some text + after the headers but before the first boundary string, it assigns this + text to the message's *preamble* attribute. When the + :class:`~email.generator.Generator` is writing out the plain text + representation of a MIME message, and it finds the + message has a *preamble* attribute, it will write this text in the area + between the headers and the first boundary. See :mod:`email.parser` and + :mod:`email.generator` for details. + + Note that if the message object has no preamble, the *preamble* attribute + will be ``None``. + + + .. attribute:: epilogue + + The *epilogue* attribute acts the same way as the *preamble* attribute, + except that it contains text that appears between the last boundary and + the end of the message. + + You do not need to set the epilogue to the empty string in order for the + :class:`~email.generator.Generator` to print a newline at the end of the + file. + + + .. attribute:: defects + + The *defects* attribute contains a list of all the problems found when + parsing this message. See :mod:`email.errors` for a detailed description + of the possible parsing defects. diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index 5302b12..57743d5 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -7,251 +7,12 @@ .. moduleauthor:: R. David Murray .. sectionauthor:: R. David Murray -.. versionadded:: 3.4 - as a :term:`provisional module `. - **Source code:** :source:`Lib/email/contentmanager.py` -.. note:: - - The contentmanager module has been included in the standard library on a - :term:`provisional basis `. Backwards incompatible - changes (up to and including removal of the module) may occur if deemed - necessary by the core developers. - --------------- - -The :mod:`~email.message` module provides a class that can represent an -arbitrary email message. That basic message model has a useful and flexible -API, but it provides only a lower-level API for interacting with the generic -parts of a message (the headers, generic header parameters, and the payload, -which may be a list of sub-parts). This module provides classes and tools -that provide an enhanced and extensible API for dealing with various specific -types of content, including the ability to retrieve the content of the message -as a specialized object type rather than as a simple bytes object. The module -automatically takes care of the RFC-specified MIME details (required headers -and parameters, etc.) for the certain common content types content properties, -and support for additional types can be added by an application using the -extension mechanisms. - -This module defines the eponymous "Content Manager" classes. The base -:class:`.ContentManager` class defines an API for registering content -management functions which extract data from ``Message`` objects or insert data -and headers into ``Message`` objects, thus providing a way of converting -between ``Message`` objects containing data and other representations of that -data (Python data types, specialized Python objects, external files, etc). The -module also defines one concrete content manager: :data:`raw_data_manager` -converts between MIME content types and ``str`` or ``bytes`` data. It also -provides a convenient API for managing the MIME parameters when inserting -content into ``Message``\ s. It also handles inserting and extracting -``Message`` objects when dealing with the ``message/rfc822`` content type. - -Another part of the enhanced interface is subclasses of -:class:`~email.message.Message` that provide new convenience API functions, -including convenience methods for calling the Content Managers derived from -this module. - -.. note:: - - Although :class:`.EmailMessage` and :class:`.MIMEPart` are currently - documented in this module because of the provisional nature of the code, the - implementation lives in the :mod:`email.message` module. - -.. currentmodule:: email.message - -.. class:: EmailMessage(policy=default) - - If *policy* is specified (it must be an instance of a :mod:`~email.policy` - class) use the rules it specifies to update and serialize the representation - of the message. If *policy* is not set, use the - :class:`~email.policy.default` policy, which follows the rules of the email - RFCs except for line endings (instead of the RFC mandated ``\r\n``, it uses - the Python standard ``\n`` line endings). For more information see the - :mod:`~email.policy` documentation. - - This class is a subclass of :class:`~email.message.Message`. It adds - the following methods: - - - .. method:: is_attachment - - Return ``True`` if there is a :mailheader:`Content-Disposition` header - and its (case insensitive) value is ``attachment``, ``False`` otherwise. - - .. versionchanged:: 3.4.2 - is_attachment is now a method instead of a property, for consistency - with :meth:`~email.message.Message.is_multipart`. - - - .. method:: get_body(preferencelist=('related', 'html', 'plain')) - - Return the MIME part that is the best candidate to be the "body" of the - message. - - *preferencelist* must be a sequence of strings from the set ``related``, - ``html``, and ``plain``, and indicates the order of preference for the - content type of the part returned. - - Start looking for candidate matches with the object on which the - ``get_body`` method is called. - - If ``related`` is not included in *preferencelist*, consider the root - part (or subpart of the root part) of any related encountered as a - candidate if the (sub-)part matches a preference. - - When encountering a ``multipart/related``, check the ``start`` parameter - and if a part with a matching :mailheader:`Content-ID` is found, consider - only it when looking for candidate matches. Otherwise consider only the - first (default root) part of the ``multipart/related``. - - If a part has a :mailheader:`Content-Disposition` header, only consider - the part a candidate match if the value of the header is ``inline``. - - If none of the candidates matches any of the preferences in - *preferencelist*, return ``None``. - - Notes: (1) For most applications the only *preferencelist* combinations - that really make sense are ``('plain',)``, ``('html', 'plain')``, and the - default, ``('related', 'html', 'plain')``. (2) Because matching starts - with the object on which ``get_body`` is called, calling ``get_body`` on - a ``multipart/related`` will return the object itself unless - *preferencelist* has a non-default value. (3) Messages (or message parts) - that do not specify a :mailheader:`Content-Type` or whose - :mailheader:`Content-Type` header is invalid will be treated as if they - are of type ``text/plain``, which may occasionally cause ``get_body`` to - return unexpected results. - - - .. method:: iter_attachments() - - Return an iterator over all of the parts of the message that are not - candidate "body" parts. That is, skip the first occurrence of each of - ``text/plain``, ``text/html``, ``multipart/related``, or - ``multipart/alternative`` (unless they are explicitly marked as - attachments via :mailheader:`Content-Disposition: attachment`), and - return all remaining parts. When applied directly to a - ``multipart/related``, return an iterator over the all the related parts - except the root part (ie: the part pointed to by the ``start`` parameter, - or the first part if there is no ``start`` parameter or the ``start`` - parameter doesn't match the :mailheader:`Content-ID` of any of the - parts). When applied directly to a ``multipart/alternative`` or a - non-``multipart``, return an empty iterator. - - - .. method:: iter_parts() - - Return an iterator over all of the immediate sub-parts of the message, - which will be empty for a non-``multipart``. (See also - :meth:`~email.message.walk`.) - - - .. method:: get_content(*args, content_manager=None, **kw) - - Call the ``get_content`` method of the *content_manager*, passing self - as the message object, and passing along any other arguments or keywords - as additional arguments. If *content_manager* is not specified, use - the ``content_manager`` specified by the current :mod:`~email.policy`. +------------ +.. versionadded:: 3.6 [1]_ - .. method:: set_content(*args, content_manager=None, **kw) - - Call the ``set_content`` method of the *content_manager*, passing self - as the message object, and passing along any other arguments or keywords - as additional arguments. If *content_manager* is not specified, use - the ``content_manager`` specified by the current :mod:`~email.policy`. - - - .. method:: make_related(boundary=None) - - Convert a non-``multipart`` message into a ``multipart/related`` message, - moving any existing :mailheader:`Content-` headers and payload into a - (new) first part of the ``multipart``. If *boundary* is specified, use - it as the boundary string in the multipart, otherwise leave the boundary - to be automatically created when it is needed (for example, when the - message is serialized). - - - .. method:: make_alternative(boundary=None) - - Convert a non-``multipart`` or a ``multipart/related`` into a - ``multipart/alternative``, moving any existing :mailheader:`Content-` - headers and payload into a (new) first part of the ``multipart``. If - *boundary* is specified, use it as the boundary string in the multipart, - otherwise leave the boundary to be automatically created when it is - needed (for example, when the message is serialized). - - - .. method:: make_mixed(boundary=None) - - Convert a non-``multipart``, a ``multipart/related``, or a - ``multipart-alternative`` into a ``multipart/mixed``, moving any existing - :mailheader:`Content-` headers and payload into a (new) first part of the - ``multipart``. If *boundary* is specified, use it as the boundary string - in the multipart, otherwise leave the boundary to be automatically - created when it is needed (for example, when the message is serialized). - - - .. method:: add_related(*args, content_manager=None, **kw) - - If the message is a ``multipart/related``, create a new message - object, pass all of the arguments to its :meth:`set_content` method, - and :meth:`~email.message.Message.attach` it to the ``multipart``. If - the message is a non-``multipart``, call :meth:`make_related` and then - proceed as above. If the message is any other type of ``multipart``, - raise a :exc:`TypeError`. If *content_manager* is not specified, use - the ``content_manager`` specified by the current :mod:`~email.policy`. - If the added part has no :mailheader:`Content-Disposition` header, - add one with the value ``inline``. - - - .. method:: add_alternative(*args, content_manager=None, **kw) - - If the message is a ``multipart/alternative``, create a new message - object, pass all of the arguments to its :meth:`set_content` method, and - :meth:`~email.message.Message.attach` it to the ``multipart``. If the - message is a non-``multipart`` or ``multipart/related``, call - :meth:`make_alternative` and then proceed as above. If the message is - any other type of ``multipart``, raise a :exc:`TypeError`. If - *content_manager* is not specified, use the ``content_manager`` specified - by the current :mod:`~email.policy`. - - - .. method:: add_attachment(*args, content_manager=None, **kw) - - If the message is a ``multipart/mixed``, create a new message object, - pass all of the arguments to its :meth:`set_content` method, and - :meth:`~email.message.Message.attach` it to the ``multipart``. If the - message is a non-``multipart``, ``multipart/related``, or - ``multipart/alternative``, call :meth:`make_mixed` and then proceed as - above. If *content_manager* is not specified, use the ``content_manager`` - specified by the current :mod:`~email.policy`. If the added part - has no :mailheader:`Content-Disposition` header, add one with the value - ``attachment``. This method can be used both for explicit attachments - (:mailheader:`Content-Disposition: attachment` and ``inline`` attachments - (:mailheader:`Content-Disposition: inline`), by passing appropriate - options to the ``content_manager``. - - - .. method:: clear() - - Remove the payload and all of the headers. - - - .. method:: clear_content() - - Remove the payload and all of the :exc:`Content-` headers, leaving - all other headers intact and in their original order. - - -.. class:: MIMEPart(policy=default) - - This class represents a subpart of a MIME message. It is identical to - :class:`EmailMessage`, except that no :mailheader:`MIME-Version` headers are - added when :meth:`~EmailMessage.set_content` is called, since sub-parts do - not need their own :mailheader:`MIME-Version` headers. - - -.. currentmodule:: email.contentmanager .. class:: ContentManager() @@ -362,7 +123,7 @@ Currently the email package provides only one concrete content manager, set_content(msg, <'bytes'>, maintype, subtype, cte="base64", \ disposition=None, filename=None, cid=None, \ params=None, headers=None) - set_content(msg, <'Message'>, cte=None, \ + set_content(msg, <'EmailMessage'>, cte=None, \ disposition=None, filename=None, cid=None, \ params=None, headers=None) set_content(msg, <'list'>, subtype='mixed', \ @@ -378,14 +139,14 @@ Currently the email package provides only one concrete content manager, subtype to *subtype* if it is specified, or ``plain`` if it is not. * For ``bytes``, use the specified *maintype* and *subtype*, or raise a :exc:`TypeError` if they are not specified. - * For :class:`~email.message.Message` objects, set the maintype to - ``message``, and set the subtype to *subtype* if it is specified - or ``rfc822`` if it is not. If *subtype* is ``partial``, raise an - error (``bytes`` objects must be used to construct - ``message/partial`` parts). + * For :class:`~email.message.EmailMessage` objects, set the maintype + to ``message``, and set the subtype to *subtype* if it is + specified or ``rfc822`` if it is not. If *subtype* is + ``partial``, raise an error (``bytes`` objects must be used to + construct ``message/partial`` parts). * For *<'list'>*, which should be a list of - :class:`~email.message.Message` objects, set the ``maintype`` to - ``multipart``, and the ``subtype`` to *subtype* if it is + :class:`~email.message.EmailMessage` objects, set the ``maintype`` + to ``multipart``, and the ``subtype`` to *subtype* if it is specified, and ``mixed`` if it is not. If the message parts in the *<'list'>* have :mailheader:`MIME-Version` headers, remove them. @@ -396,33 +157,36 @@ Currently the email package provides only one concrete content manager, MIME charset name, use the standard charset instead. If *cte* is set, encode the payload using the specified content transfer - encoding, and set the :mailheader:`Content-Transfer-Encoding` header to - that value. For ``str`` objects, if it is not set use heuristics to - determine the most compact encoding. Possible values for *cte* are - ``quoted-printable``, ``base64``, ``7bit``, ``8bit``, and ``binary``. - If the input cannot be encoded in the specified encoding (eg: ``7bit``), - raise a :exc:`ValueError`. For :class:`~email.message.Message`, per - :rfc:`2046`, raise an error if a *cte* of ``quoted-printable`` or - ``base64`` is requested for *subtype* ``rfc822``, and for any *cte* - other than ``7bit`` for *subtype* ``external-body``. For - ``message/rfc822``, use ``8bit`` if *cte* is not specified. For all - other values of *subtype*, use ``7bit``. + encoding, and set the :mailheader:`Content-Transfer-Endcoding` header to + that value. Possible values for *cte* are ``quoted-printable``, + ``base64``, ``7bit``, ``8bit``, and ``binary``. If the input cannot be + encoded in the specified encoding (for example, specifying a *cte* of + ``7bit`` for an input that contains non-ASCII values), raise a + :exc:`ValueError`. + + * For ``str`` objects, if *cte* is not set use heuristics to + determine the most compact encoding. + * For :class:`~email.message.EmailMessage`, per :rfc:`2046`, raise + an error if a *cte* of ``quoted-printable`` or ``base64`` is + requested for *subtype* ``rfc822``, and for any *cte* other than + ``7bit`` for *subtype* ``external-body``. For + ``message/rfc822``, use ``8bit`` if *cte* is not specified. For + all other values of *subtype*, use ``7bit``. .. note:: A *cte* of ``binary`` does not actually work correctly yet. - The ``Message`` object as modified by ``set_content`` is correct, but - :class:`~email.generator.BytesGenerator` does not serialize it - correctly. + The ``EmailMessage`` object as modified by ``set_content`` is + correct, but :class:`~email.generator.BytesGenerator` does not + serialize it correctly. If *disposition* is set, use it as the value of the :mailheader:`Content-Disposition` header. If not specified, and *filename* is specified, add the header with the value ``attachment``. - If it is not specified and *filename* is also not specified, do not add - the header. The only valid values for *disposition* are ``attachment`` - and ``inline``. + If *disposition* is not specified and *filename* is also not specified, + do not add the header. The only valid values for *disposition* are + ``attachment`` and ``inline``. If *filename* is specified, use it as the value of the ``filename`` - parameter of the :mailheader:`Content-Disposition` header. There is no - default. + parameter of the :mailheader:`Content-Disposition` header. If *cid* is specified, add a :mailheader:`Content-ID` header with *cid* as its value. @@ -435,3 +199,9 @@ Currently the email package provides only one concrete content manager, ``headername: headervalue`` or a list of ``header`` objects (distinguished from strings by having a ``name`` attribute), add the headers to *msg*. + + +.. rubric:: Footnotes + +.. [1] Oringally added in 3.4 as a :term:`provisional module ` diff --git a/Doc/library/email.encoders.rst b/Doc/library/email.encoders.rst index 9d7f9bf..e24ac7b 100644 --- a/Doc/library/email.encoders.rst +++ b/Doc/library/email.encoders.rst @@ -8,6 +8,12 @@ -------------- +This module is part of the legacy (``Compat32``) email API. In the +new API the functionality is provided by the *cte* parameter of +the :meth:`~email.message.EmailMessage.set_content` method. + +The remaining text in this section is the original documentation of the module. + When creating :class:`~email.message.Message` objects from scratch, you often need to encode the payloads for transport through compliant mail servers. This is especially true for :mimetype:`image/\*` and :mimetype:`text/\*` type messages diff --git a/Doc/library/email.errors.rst b/Doc/library/email.errors.rst index b5b78f3..2d0d192 100644 --- a/Doc/library/email.errors.rst +++ b/Doc/library/email.errors.rst @@ -20,33 +20,27 @@ The following exception classes are defined in the :mod:`email.errors` module: .. exception:: MessageParseError() - This is the base class for exceptions raised by the :class:`~email.parser.Parser` - class. It is derived from :exc:`MessageError`. + This is the base class for exceptions raised by the + :class:`~email.parser.Parser` class. It is derived from + :exc:`MessageError`. This class is also used internally by the parser used + by :mod:`~email.headerregistry`. .. exception:: HeaderParseError() - Raised under some error conditions when parsing the :rfc:`2822` headers of a - message, this class is derived from :exc:`MessageParseError`. It can be raised - from the :meth:`Parser.parse ` or - :meth:`Parser.parsestr ` methods. - - Situations where it can be raised include finding an envelope header after the - first :rfc:`2822` header of the message, finding a continuation line before the - first :rfc:`2822` header is found, or finding a line in the headers which is - neither a header or a continuation line. + Raised under some error conditions when parsing the :rfc:`5322` headers of a + message, this class is derived from :exc:`MessageParseError`. The + :meth:`~email.message.EmailMessage.set_boundary` method will raise this + error if the content type is unknown when the method is called. + :class:`~email.header.Header` may raise this error for certain base64 + decoding errors, and when an attempt is made to create a header that appears + to contain an embedded header (that is, there is what is supposed to be a + continuation line that has no leading whitespace and looks like a header). .. exception:: BoundaryError() - Raised under some error conditions when parsing the :rfc:`2822` headers of a - message, this class is derived from :exc:`MessageParseError`. It can be raised - from the :meth:`Parser.parse ` or - :meth:`Parser.parsestr ` methods. - - Situations where it can be raised include not being able to find the starting or - terminating boundary in a :mimetype:`multipart/\*` message when strict parsing - is used. + Deprecated and no longer used. .. exception:: MultipartConversionError() @@ -64,14 +58,14 @@ The following exception classes are defined in the :mod:`email.errors` module: :class:`~email.mime.nonmultipart.MIMENonMultipart` (e.g. :class:`~email.mime.image.MIMEImage`). -Here's the list of the defects that the :class:`~email.parser.FeedParser` + +Here is the list of the defects that the :class:`~email.parser.FeedParser` can find while parsing messages. Note that the defects are added to the message where the problem was found, so for example, if a message nested inside a :mimetype:`multipart/alternative` had a malformed header, that nested message object would have a defect, but the containing messages would not. -All defect classes are subclassed from :class:`email.errors.MessageDefect`, but -this class is *not* an exception! +All defect classes are subclassed from :class:`email.errors.MessageDefect`. * :class:`NoBoundaryInMultipartDefect` -- A message claimed to be a multipart, but had no :mimetype:`boundary` parameter. @@ -108,9 +102,9 @@ this class is *not* an exception! return false even though its content type claims to be :mimetype:`multipart`. * :class:`InvalidBase64PaddingDefect` -- When decoding a block of base64 - encoded bytes, the padding was not correct. Enough padding is added to + enocded bytes, the padding was not correct. Enough padding is added to perform the decode, but the resulting decoded bytes may be invalid. * :class:`InvalidBase64CharactersDefect` -- When decoding a block of base64 - encoded bytes, characters outside the base64 alphabet were encountered. + enocded bytes, characters outside the base64 alphebet were encountered. The characters are ignored, but the resulting decoded bytes may be invalid. diff --git a/Doc/library/email-examples.rst b/Doc/library/email.examples.rst similarity index 57% rename from Doc/library/email-examples.rst rename to Doc/library/email.examples.rst index ad93b5c..84e9aee 100644 --- a/Doc/library/email-examples.rst +++ b/Doc/library/email.examples.rst @@ -6,13 +6,14 @@ Here are a few examples of how to use the :mod:`email` package to read, write, and send simple email messages, as well as more complex MIME messages. -First, let's see how to create and send a simple text message: +First, let's see how to create and send a simple text message (both the +text content and the addresses may contain unicode characters): .. literalinclude:: ../includes/email-simple.py -And parsing RFC822 headers can easily be done by the parse(filename) or -parsestr(message_as_string) methods of the Parser() class: +Parsing RFC822 headers can easily be done by the using the classes +from the :mod:`~email.parser` module: .. literalinclude:: ../includes/email-headers.py @@ -34,30 +35,19 @@ above, into a directory of files: .. literalinclude:: ../includes/email-unpack.py + Here's an example of how to create an HTML message with an alternative plain -text version: [2]_ +text version. To make things a bit more interesting, we include a related +image in the html part, and we save a copy of what we are going to send to +disk, as well as sending it. .. literalinclude:: ../includes/email-alternative.py -.. _email-contentmanager-api-examples: - -Examples using the Provisional API -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Here is a reworking of the last example using the provisional API. To make -things a bit more interesting, we include a related image in the html part, and -we save a copy of what we are going to send to disk, as well as sending it. - -This example also shows how easy it is to include non-ASCII, and simplifies the -sending of the message using the :meth:`.send_message` method of the -:mod:`smtplib` module. - -.. literalinclude:: ../includes/email-alternative-new-api.py - -If we were instead sent the message from the last example, here is one -way we could process it: +If we were sent the message from the last example, here is one way we could +process it: -.. literalinclude:: ../includes/email-read-alternative-new-api.py +.. literalinclude:: ../includes/email-read-alternative.py Up to the prompt, the output from the above is: @@ -75,4 +65,3 @@ Up to the prompt, the output from the above is: .. rubric:: Footnotes .. [1] Thanks to Matthew Dixon Cowles for the original inspiration and examples. -.. [2] Contributed by Martin Matejek. diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst index d596ed8..ab0fbc2 100644 --- a/Doc/library/email.generator.rst +++ b/Doc/library/email.generator.rst @@ -8,210 +8,244 @@ -------------- -One of the most common tasks is to generate the flat text of the email message -represented by a message object structure. You will need to do this if you want -to send your message via the :mod:`smtplib` module or the :mod:`nntplib` module, -or print the message on the console. Taking a message object structure and -producing a flat text document is the job of the :class:`Generator` class. - -Again, as with the :mod:`email.parser` module, you aren't limited to the -functionality of the bundled generator; you could write one from scratch -yourself. However the bundled generator knows how to generate most email in a -standards-compliant way, should handle MIME and non-MIME email messages just -fine, and is designed so that the transformation from flat text, to a message -structure via the :class:`~email.parser.Parser` class, and back to flat text, -is idempotent (the input is identical to the output) [#]_. On the other hand, -using the Generator on a :class:`~email.message.Message` constructed by program -may result in changes to the :class:`~email.message.Message` object as defaults -are filled in. - -:class:`bytes` output can be generated using the :class:`BytesGenerator` class. -If the message object structure contains non-ASCII bytes, this generator's -:meth:`~BytesGenerator.flatten` method will emit the original bytes. Parsing a -binary message and then flattening it with :class:`BytesGenerator` should be -idempotent for standards compliant messages. - -Here are the public methods of the :class:`Generator` class, imported from the -:mod:`email.generator` module: - - -.. class:: Generator(outfp, mangle_from_=True, maxheaderlen=78, *, policy=None) - - The constructor for the :class:`Generator` class takes a :term:`file-like object` - called *outfp* for an argument. *outfp* must support the :meth:`write` method - and be usable as the output file for the :func:`print` function. - - Optional *mangle_from_* is a flag that, when ``True``, puts a ``>`` character in - front of any line in the body that starts exactly as ``From``, i.e. ``From`` - followed by a space at the beginning of the line. This is the only guaranteed - portable way to avoid having such lines be mistaken for a Unix mailbox format - envelope header separator (see `WHY THE CONTENT-LENGTH FORMAT IS BAD - `_ for details). *mangle_from_* - defaults to ``True``, but you might want to set this to ``False`` if you are not - writing Unix mailbox format files. - - Optional *maxheaderlen* specifies the longest length for a non-continued header. - When a header line is longer than *maxheaderlen* (in characters, with tabs - expanded to 8 spaces), the header will be split as defined in the - :class:`~email.header.Header` class. Set to zero to disable header wrapping. - The default is 78, as recommended (but not required) by :rfc:`2822`. - - The *policy* keyword specifies a :mod:`~email.policy` object that controls a - number of aspects of the generator's operation. If no *policy* is specified, - then the *policy* attached to the message object passed to :attr:`flatten` - is used. +One of the most common tasks is to generate the flat (serialized) version of +the email message represented by a message object structure. You will need to +do this if you want to send your message via :meth:`smtplib.SMTP.sendmail` or +the :mod:`nntplib` module, or print the message on the console. Taking a +message object structure and producing a serialized representation is the job +of the generator classes. + +As with the :mod:`email.parser` module, you aren't limited to the functionality +of the bundled generator; you could write one from scratch yourself. However +the bundled generator knows how to generate most email in a standards-compliant +way, should handle MIME and non-MIME email messages just fine, and is designed +so that the bytes-oriented parsing and generation operations are inverses, +assuming the same non-transforming :mod:`~email.policy` is used for both. That +is, parsing the serialized byte stream via the +:class:`~email.parser.BytesParser` class and then regenerating the serialized +byte stream using :class:`BytesGenerator` should produce output identical to +the input [#]_. (On the other hand, using the generator on an +:class:`~email.message.EmailMessage` constructed by program may result in +changes to the :class:`~email.message.EmailMessage` object as defaults are +filled in.) + +The :class:`Generator` class can be used to flatten a message into a text (as +opposed to binary) serialized representation, but since Unicode cannot +represent binary data directly, the message is of necessity transformed into +something that contains only ASCII characters, using the standard email RFC +Content Transfer Encoding techniques for encoding email messages for transport +over channels that are not "8 bit clean". + + +.. class:: BytesGenerator(outfp, mangle_from_=None, maxheaderlen=None, *, \ + policy=None) - .. versionchanged:: 3.3 Added the *policy* keyword. + Return a :class:`BytesGenerator` object that will write any message provided + to the :meth:`flatten` method, or any surrogateescape encoded text provided + to the :meth:`write` method, to the :term:`file-like object` *outfp*. + *outfp* must support a ``write`` method that accepts binary data. + + If optional *mangle_from_* is ``True``, put a ``>`` character in front of + any line in the body that starts with the exact string ``"From "``, that is + ``From`` followed by a space at the beginning of a line. *mangle_from_* + defaults to the value of the :attr:`~email.policy.Policy.mangle_from_` + setting of the *policy* (which is ``True`` for the + :data:`~email.policy.compat32` policy and ``False`` for all others). + *mangle_from_* is intended for use when messages are stored in unix mbox + format (see :mod:`mailbox` and `WHY THE CONTENT-LENGTH FORMAT IS BAD + `_). + + If *maxheaderlen* is not ``None``, refold any header lines that are longer + than *maxheaderlen*, or if ``0``, do not rewrap any headers. If + *manheaderlen* is ``None`` (the default), wrap headers and other message + lines according to the *policy* settings. + + If *policy* is specified, use that policy to control message generation. If + *policy* is ``None`` (the default), use the policy associated with the + :class:`~email.message.Message` or :class:`~email.message.EmailMessage` + object passed to ``flatten`` to control the message generation. See + :mod:`email.policy` for details on what *policy* controls. - The other public :class:`Generator` methods are: + .. versionadded:: 3.2 + .. versionchanged:: 3.3 Added the *policy* keyword. - .. method:: flatten(msg, unixfrom=False, linesep=None) + .. versionchanged:: 3.6 The default behavior of the *mangle_from_* + and *maxheaderlen* parameters is to follow the policy. - Print the textual representation of the message object structure rooted at - *msg* to the output file specified when the :class:`Generator` instance - was created. Subparts are visited depth-first and the resulting text will - be properly MIME encoded. - Optional *unixfrom* is a flag that forces the printing of the envelope - header delimiter before the first :rfc:`2822` header of the root message - object. If the root object has no envelope header, a standard one is - crafted. By default, this is set to ``False`` to inhibit the printing of - the envelope delimiter. + .. method:: flatten(msg, unixfrom=False, linesep=None) + Print the textual representation of the message object structure rooted + at *msg* to the output file specified when the :class:`BytesGenerator` + instance was created. + + If the :mod:`~email.policy` option :attr:`~email.policy.Policy.cte_type` + is ``8bit`` (the default), copy any headers in the original parsed + message that have not been modified to the output with any bytes with the + high bit set reproduced as in the original, and preserve the non-ASCII + :mailheader:`Content-Transfer-Encoding` of any body parts that have them. + If ``cte_type`` is ``7bit``, convert the bytes with the high bit set as + needed using an ASCII-compatible :mailheader:`Content-Transfer-Encoding`. + That is, transform parts with non-ASCII + :mailheader:`Cotnent-Transfer-Encoding` + (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatibile + :mailheader:`Content-Transfer-Encoding`, and encode RFC-invalid non-ASCII + bytes in headers using the MIME ``unknown-8bit`` character set, thus + rendering them RFC-compliant. + + .. XXX: There should be an option that just does the RFC + compliance transformation on headers but leaves CTE 8bit parts alone. + + If *unixfrom* is ``True``, print the envelope header delimiter used by + the Unix mailbox format (see :mod:`mailbox`) before the first of the + :rfc:`5322` headers of the root message object. If the root object has + no envelope header, craft a standard one. The default is ``False``. Note that for subparts, no envelope header is ever printed. - Optional *linesep* specifies the line separator character used to - terminate lines in the output. If specified it overrides the value - specified by the *msg*\'s or ``Generator``\'s ``policy``. + If *linesep* is not ``None``, use it as the separator character between + all the lines of the flattened message. If *linesep* is ``None`` (the + default), use the value specified in the *policy*. - Because strings cannot represent non-ASCII bytes, if the policy that - applies when ``flatten`` is run has :attr:`~email.policy.Policy.cte_type` - set to ``8bit``, ``Generator`` will operate as if it were set to - ``7bit``. This means that messages parsed with a Bytes parser that have - a :mailheader:`Content-Transfer-Encoding` of ``8bit`` will be converted - to a use a ``7bit`` Content-Transfer-Encoding. Non-ASCII bytes in the - headers will be :rfc:`2047` encoded with a charset of ``unknown-8bit``. + .. XXX: flatten should take a *policy* keyword. - .. versionchanged:: 3.2 - Added support for re-encoding ``8bit`` message bodies, and the - *linesep* argument. .. method:: clone(fp) - Return an independent clone of this :class:`Generator` instance with the - exact same options. - - .. method:: write(s) - - Write the string *s* to the underlying file object, i.e. *outfp* passed to - :class:`Generator`'s constructor. This provides just enough file-like API - for :class:`Generator` instances to be used in the :func:`print` function. + Return an independent clone of this :class:`BytesGenerator` instance with + the exact same option settings, and *fp* as the new *outfp*. -As a convenience, see the :class:`~email.message.Message` methods -:meth:`~email.message.Message.as_string` and ``str(aMessage)``, a.k.a. -:meth:`~email.message.Message.__str__`, which simplify the generation of a -formatted string representation of a message object. For more detail, see -:mod:`email.message`. -.. class:: BytesGenerator(outfp, mangle_from_=True, maxheaderlen=78, *, \ - policy=None) + .. method:: write(s) - The constructor for the :class:`BytesGenerator` class takes a binary - :term:`file-like object` called *outfp* for an argument. *outfp* must - support a :meth:`write` method that accepts binary data. + Encode *s* using the ``ASCII`` codec and the ``surrogateescape`` error + handler, and pass it to the *write* method of the *outfp* passed to the + :class:`BytesGenerator`'s constructor. - Optional *mangle_from_* is a flag that, when ``True``, puts a ``>`` - character in front of any line in the body that starts exactly as ``From``, - i.e. ``From`` followed by a space at the beginning of the line. This is the - only guaranteed portable way to avoid having such lines be mistaken for a - Unix mailbox format envelope header separator (see `WHY THE CONTENT-LENGTH - FORMAT IS BAD `_ for details). - *mangle_from_* defaults to ``True``, but you might want to set this to - ``False`` if you are not writing Unix mailbox format files. - Optional *maxheaderlen* specifies the longest length for a non-continued - header. When a header line is longer than *maxheaderlen* (in characters, - with tabs expanded to 8 spaces), the header will be split as defined in the - :class:`~email.header.Header` class. Set to zero to disable header - wrapping. The default is 78, as recommended (but not required) by - :rfc:`2822`. +As a convenience, :class:`~email.message.EmailMessage` provides the methods +:meth:`~email.message.EmailMessage.as_bytes` and ``bytes(aMessage)`` (a.k.a. +:meth:`~email.message.EmailMessage.__bytes__`), which simplify the generation of +a serialized binary representation of a message object. For more detail, see +:mod:`email.message`. - The *policy* keyword specifies a :mod:`~email.policy` object that controls a - number of aspects of the generator's operation. If no *policy* is specified, - then the *policy* attached to the message object passed to :attr:`flatten` - is used. +Because strings cannot represent binary data, the :class:`Generator` class must +convert any binary data in any message it flattens to an ASCII compatible +format, by converting them to an ASCII compatible +:mailheader:`Content-Transfer_Encoding`. Using the terminology of the email +RFCs, you can think of this as :class:`Generator` serializing to an I/O stream +that is not "8 bit clean". In other words, most applications will want +to be using :class:`BytesGenerator`, and not :class:`Generator`. + +.. class:: Generator(outfp, mangle_from_=None, maxheaderlen=None, *, \ + policy=None) + + Return a :class:`Generator` object that will write any message provided + to the :meth:`flatten` method, or any text provided to the :meth:`write` + method, to the :term:`file-like object` *outfp*. *outfp* must support a + ``write`` method that accepts string data. + + If optional *mangle_from_* is ``True``, put a ``>`` character in front of + any line in the body that starts with the exact string ``"From "``, that is + ``From`` followed by a space at the beginning of a line. *mangle_from_* + defaults to the value of the :attr:`~email.policy.Policy.mangle_from_` + setting of the *policy* (which is ``True`` for the + :data:`~email.policy.compat32` policy and ``False`` for all others). + *mangle_from_* is intended for use when messages are stored in unix mbox + format (see :mod:`mailbox` and `WHY THE CONTENT-LENGTH FORMAT IS BAD + `_). + + If *maxheaderlen* is not ``None``, refold any header lines that are longer + than *maxheaderlen*, or if ``0``, do not rewrap any headers. If + *manheaderlen* is ``None`` (the default), wrap headers and other message + lines according to the *policy* settings. + + If *policy* is specified, use that policy to control message generation. If + *policy* is ``None`` (the default), use the policy associated with the + :class:`~email.message.Message` or :class:`~email.message.EmailMessage` + object passed to ``flatten`` to control the message generation. See + :mod:`email.policy` for details on what *policy* controls. .. versionchanged:: 3.3 Added the *policy* keyword. - The other public :class:`BytesGenerator` methods are: + .. versionchanged:: 3.6 The default behavior of the *mangle_from_* + and *maxheaderlen* parameters is to follow the policy. .. method:: flatten(msg, unixfrom=False, linesep=None) Print the textual representation of the message object structure rooted - at *msg* to the output file specified when the :class:`BytesGenerator` - instance was created. Subparts are visited depth-first and the resulting - text will be properly MIME encoded. If the :mod:`~email.policy` option - :attr:`~email.policy.Policy.cte_type` is ``8bit`` (the default), - then any bytes with the high bit set in the original parsed message that - have not been modified will be copied faithfully to the output. If - ``cte_type`` is ``7bit``, the bytes will be converted as needed - using an ASCII-compatible Content-Transfer-Encoding. In particular, - RFC-invalid non-ASCII bytes in headers will be encoded using the MIME - ``unknown-8bit`` character set, thus rendering them RFC-compliant. - - .. XXX: There should be a complementary option that just does the RFC - compliance transformation but leaves CTE 8bit parts alone. - - Messages parsed with a Bytes parser that have a - :mailheader:`Content-Transfer-Encoding` of 8bit will be reconstructed - as 8bit if they have not been modified. - - Optional *unixfrom* is a flag that forces the printing of the envelope - header delimiter before the first :rfc:`2822` header of the root message - object. If the root object has no envelope header, a standard one is - crafted. By default, this is set to ``False`` to inhibit the printing of - the envelope delimiter. - + at *msg* to the output file specified when the :class:`Generator` + instance was created. + + If the :mod:`~email.policy` option :attr:`~email.policy.Policy.cte_type` + is ``8bit``, generate the message as if the option were set to ``7bit``. + (This is required because strings cannot represent non-ASCII bytes.) + Convert any bytes with the high bit set as needed using an + ASCII-compatible :mailheader:`Content-Transfer-Encoding`. That is, + transform parts with non-ASCII :mailheader:`Cotnent-Transfer-Encoding` + (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatibile + :mailheader:`Content-Transfer-Encoding`, and encode RFC-invalid non-ASCII + bytes in headers using the MIME ``unknown-8bit`` character set, thus + rendering them RFC-compliant. + + If *unixfrom* is ``True``, print the envelope header delimiter used by + the Unix mailbox format (see :mod:`mailbox`) before the first of the + :rfc:`5322` headers of the root message object. If the root object has + no envelope header, craft a standard one. The default is ``False``. Note that for subparts, no envelope header is ever printed. - Optional *linesep* specifies the line separator character used to - terminate lines in the output. If specified it overrides the value - specified by the ``Generator``\ or *msg*\ 's ``policy``. + If *linesep* is not ``None``, use it as the separator character between + all the lines of the flattened message. If *linesep* is ``None`` (the + default), use the value specified in the *policy*. + + .. XXX: flatten should take a *policy* keyword. + + .. versionchanged:: 3.2 + Added support for re-encoding ``8bit`` message bodies, and the + *linesep* argument. + .. method:: clone(fp) - Return an independent clone of this :class:`BytesGenerator` instance with - the exact same options. + Return an independent clone of this :class:`Generator` instance with the + exact same options, and *fp* as the new *outfp*. + .. method:: write(s) - Write the string *s* to the underlying file object. *s* is encoded using - the ``ASCII`` codec and written to the *write* method of the *outfp* - *outfp* passed to the :class:`BytesGenerator`'s constructor. This - provides just enough file-like API for :class:`BytesGenerator` instances - to be used in the :func:`print` function. + Write *s* to the *write* method of the *outfp* passed to the + :class:`Generator`'s constructor. This provides just enough file-like + API for :class:`Generator` instances to be used in the :func:`print` + function. - .. versionadded:: 3.2 -The :mod:`email.generator` module also provides a derived class, called -:class:`DecodedGenerator` which is like the :class:`Generator` base class, -except that non-\ :mimetype:`text` parts are substituted with a format string -representing the part. +As a convenience, :class:`~email.message.EmailMessage` provides the methods +:meth:`~email.message.EmailMessage.as_string` and ``str(aMessage)`` (a.k.a. +:meth:`~email.message.EmailMessage.__str__`), which simplify the generation of +a formatted string representation of a message object. For more detail, see +:mod:`email.message`. + +The :mod:`email.generator` module also provides a derived class, +:class:`DecodedGenerator`, which is like the :class:`Generator` base class, +except that non-\ :mimetype:`text` parts are not serialized, but are instead +represented in the output stream by a string derived from a template filled +in with information about the part. -.. class:: DecodedGenerator(outfp, mangle_from_=True, maxheaderlen=78, fmt=None) +.. class:: DecodedGenerator(outfp, mangle_from_=None, maxheaderlen=None, \ + fmt=None, *, policy=None) - This class, derived from :class:`Generator` walks through all the subparts of a - message. If the subpart is of main type :mimetype:`text`, then it prints the - decoded payload of the subpart. Optional *_mangle_from_* and *maxheaderlen* are - as with the :class:`Generator` base class. + Act like :class:`Generator`, except that for any subpart of the message + passed to :meth:`Generator.flatten`, if the subpart is of main type + :mimetype:`text`, print the decoded payload of the subpart, and if the main + type is not :mimetype:`text`, instead of printing it fill in the string + *fmt* using information from the part and print the resulting + filled-in string. - If the subpart is not of main type :mimetype:`text`, optional *fmt* is a format - string that is used instead of the message payload. *fmt* is expanded with the - following keywords, ``%(keyword)s`` format: + To fill in *fmt*, execute ``fmt % part_info``, where ``part_info`` + is a dictionary composed of the following keys and values: * ``type`` -- Full MIME type of the non-\ :mimetype:`text` part @@ -225,15 +259,21 @@ representing the part. * ``encoding`` -- Content transfer encoding of the non-\ :mimetype:`text` part - The default value for *fmt* is ``None``, meaning :: + If *fmt* is ``None``, use the following default *fmt*: + + "[Non-text (%(type)s) part of message omitted, filename %(filename)s]" - [Non-text (%(type)s) part of message omitted, filename %(filename)s] + Optional *_mangle_from_* and *maxheaderlen* are as with the + :class:`Generator` base class. .. rubric:: Footnotes -.. [#] This statement assumes that you use the appropriate setting for the - ``unixfrom`` argument, and that you set maxheaderlen=0 (which will - preserve whatever the input line lengths were). It is also not strictly - true, since in many cases runs of whitespace in headers are collapsed - into single blanks. The latter is a bug that will eventually be fixed. +.. [#] This statement assumes that you use the appropriate setting for + ``unixfrom``, and that there are no :mod:`policy` settings calling for + automatic adjustments (for example, + :attr:`~email.policy.Policy.refold_source` must be ``none``, which is + *not* the default). It is also not 100% true, since if the message + does not conform to the RFC standards occasionally information about the + exact original text is lost during parsing error recovery. It is a goal + to fix these latter edge cases when possible. diff --git a/Doc/library/email.header.rst b/Doc/library/email.header.rst index e94837c..07152c2 100644 --- a/Doc/library/email.header.rst +++ b/Doc/library/email.header.rst @@ -8,6 +8,14 @@ -------------- +This module is part of the legacy (``Compat32``) email API. In the current API +encoding and decoding of headers is handled transparently by the +dictionary-like API of the :class:`~email.message.EmailMessage` class. In +addition to uses in legacy code, this module can be useful in applications that +need to completely control the character sets used when encoding headers. + +The remaining text in this section is the original documentation of the module. + :rfc:`2822` is the base standard that describes the format of email messages. It derives from the older :rfc:`822` standard which came into widespread use at a time when most email was composed of ASCII characters only. :rfc:`2822` is a diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst index 0707bd8..2c830cf 100644 --- a/Doc/library/email.headerregistry.rst +++ b/Doc/library/email.headerregistry.rst @@ -7,20 +7,12 @@ .. moduleauthor:: R. David Murray .. sectionauthor:: R. David Murray -.. versionadded:: 3.3 - as a :term:`provisional module `. - **Source code:** :source:`Lib/email/headerregistry.py` -.. note:: - - The headerregistry module has been included in the standard library on a - :term:`provisional basis `. Backwards incompatible - changes (up to and including removal of the module) may occur if deemed - necessary by the core developers. - -------------- +.. versionadded:: 3.6 [1]_ + Headers are represented by customized subclasses of :class:`str`. The particular class used to represent a given header is determined by the :attr:`~email.policy.EmailPolicy.header_factory` of the :mod:`~email.policy` in @@ -86,10 +78,11 @@ headers. .. method:: fold(*, policy) Return a string containing :attr:`~email.policy.Policy.linesep` - characters as required to correctly fold the header according - to *policy*. A :attr:`~email.policy.Policy.cte_type` of - ``8bit`` will be treated as if it were ``7bit``, since strings - may not contain binary data. + characters as required to correctly fold the header according to + *policy*. A :attr:`~email.policy.Policy.cte_type` of ``8bit`` will be + treated as if it were ``7bit``, since headers may not contain arbitrary + binary data. If :attr:`~email.policy.EmailPolicy.utf8` is ``False``, + non-ASCII data will be :rfc:`2047` encoded. ``BaseHeader`` by itself cannot be used to create a header object. It @@ -106,7 +99,7 @@ headers. values for at least the keys ``decoded`` and ``defects``. ``decoded`` should be the string value for the header (that is, the header value fully decoded to unicode). The parse method should assume that *string* may - contain transport encoded parts, but should correctly handle all valid + contain content-transfer-encoded parts, but should correctly handle all valid unicode characters as well so that it can parse un-encoded header values. ``BaseHeader``'s ``__new__`` then creates the header instance, and calls its @@ -135,11 +128,10 @@ headers. mechanism for encoding non-ASCII text as ASCII characters within a header value. When a *value* containing encoded words is passed to the constructor, the ``UnstructuredHeader`` parser converts such encoded words - back in to the original unicode, following the :rfc:`2047` rules for - unstructured text. The parser uses heuristics to attempt to decode certain - non-compliant encoded words. Defects are registered in such cases, as well - as defects for issues such as invalid characters within the encoded words or - the non-encoded text. + into unicode, following the :rfc:`2047` rules for unstructured text. The + parser uses heuristics to attempt to decode certain non-compliant encoded + words. Defects are registered in such cases, as well as defects for issues + such as invalid characters within the encoded words or the non-encoded text. This header type provides no additional attributes. @@ -213,15 +205,16 @@ headers. the list of addresses is "flattened" into a one dimensional list). The ``decoded`` value of the header will have all encoded words decoded to - unicode. :class:`~encodings.idna` encoded domain names are also decoded to unicode. The - ``decoded`` value is set by :attr:`~str.join`\ ing the :class:`str` value of - the elements of the ``groups`` attribute with ``', '``. + unicode. :class:`~encodings.idna` encoded domain names are also decoded to + unicode. The ``decoded`` value is set by :attr:`~str.join`\ ing the + :class:`str` value of the elements of the ``groups`` attribute with ``', + '``. A list of :class:`.Address` and :class:`.Group` objects in any combination may be used to set the value of an address header. ``Group`` objects whose ``display_name`` is ``None`` will be interpreted as single addresses, which allows an address list to be copied with groups intact by using the list - obtained ``groups`` attribute of the source header. + obtained from the ``groups`` attribute of the source header. .. class:: SingleAddressHeader @@ -267,7 +260,7 @@ variant, :attr:`~.BaseHeader.max_count` is set to 1. .. class:: ParameterizedMIMEHeader - MOME headers all start with the prefix 'Content-'. Each specific header has + MIME headers all start with the prefix 'Content-'. Each specific header has a certain value, described under the class for that header. Some can also take a list of supplemental parameters, which have a common format. This class serves as a base for all the MIME headers that take parameters. @@ -454,3 +447,9 @@ construct structured values to assign to specific headers. ``display_name`` is none and there is a single ``Address`` in the ``addresses`` list, the ``str`` value will be the same as the ``str`` of that single ``Address``. + + +.. rubric:: Footnotes + +.. [1] Oringally added in 3.3 as a :term:`provisional module ` diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst index 3dae8a9..32852e7 100644 --- a/Doc/library/email.message.rst +++ b/Doc/library/email.message.rst @@ -3,91 +3,102 @@ .. module:: email.message :synopsis: The base class representing email messages. +.. moduleauthor:: R. David Murray +.. sectionauthor:: R. David Murray , + Barry A. Warsaw **Source code:** :source:`Lib/email/message.py` -------------- -The central class in the :mod:`email` package is the :class:`Message` class, -imported from the :mod:`email.message` module. It is the base class for the -:mod:`email` object model. :class:`Message` provides the core functionality for -setting and querying header fields, and for accessing message bodies. - -Conceptually, a :class:`Message` object consists of *headers* and *payloads*. -Headers are :rfc:`2822` style field names and values where the field name and -value are separated by a colon. The colon is not part of either the field name -or the field value. - -Headers are stored and returned in case-preserving form but are matched -case-insensitively. There may also be a single envelope header, also known as -the *Unix-From* header or the ``From_`` header. The payload is either a string -in the case of simple message objects or a list of :class:`Message` objects for -MIME container documents (e.g. :mimetype:`multipart/\*` and -:mimetype:`message/rfc822`). - -:class:`Message` objects provide a mapping style interface for accessing the -message headers, and an explicit interface for accessing both the headers and -the payload. It provides convenience methods for generating a flat text -representation of the message object tree, for accessing commonly used header -parameters, and for recursively walking over the object tree. - -Here are the methods of the :class:`Message` class: - - -.. class:: Message(policy=compat32) - - If *policy* is specified (it must be an instance of a :mod:`~email.policy` - class) use the rules it specifies to update and serialize the representation - of the message. If *policy* is not set, use the :class:`compat32 - ` policy, which maintains backward compatibility with - the Python 3.2 version of the email package. For more information see the +.. versionadded:: 3.6 [1]_ + +The central class in the :mod:`email` package is the :class:`EmailMessage` +class, imported from the :mod:`email.message` module. It is the base class for +the :mod:`email` object model. :class:`EmailMessage` provides the core +functionality for setting and querying header fields, for accessing message +bodies, and for creating or modifying structured messages. + +An email message consists of *headers* and a *payload* (which is also referred +to as the *content*). Headers are :rfc:`5322` or :rfc:`6532` style field names +and values, where the field name and value are separated by a colon. The colon +is not part of either the field name or the field value. The payload may be a +simple text message, or a binary object, or a structured sequence of +sub-messages each with their own set of headers and their own payload. The +latter type of payload is indicated by the message having a MIME type such as +:mimetype:`multipart/\*` or :mimetype:`message/rfc822`. + +The conceptual model provided by an :class:`EmailMessage` object is that of an +ordered dictionary of headers coupled with a *payload* that represents the +:rfc:`5322` body of the message, which might be a list of sub-``EmailMessage`` +objects. In addition to the normal dictionary methods for accessing the header +names and values, there are methods for accessing specialized information from +the headers (for example the MIME content type), for operating on the payload, +for generating a serialized version of the message, and for recursively walking +over the object tree. + +The :class:`EmailMessage` dictionary-like interface is indexed by the header +names, which must be ASCII values. The values of the dictionary are strings +with some extra methods. Headers are stored and returned in case-preserving +form, but field names are matched case-insensitively. Unlike a real dict, +there is an ordering to the keys, and there can be duplicate keys. Additional +methods are provided for working with headers that have duplicate keys. + +The *payload* is either a string or bytes object, in the case of simple message +objects, or a list of :class:`EmailMessage` objects, for MIME container +documents such as :mimetype:`multipart/\*` and :mimetype:`message/rfc822` +message objects. + + +.. class:: EmailMessage(policy=default) + + If *policy* is specified use the rules it specifies to udpate and serialize + the representation of the message. If *policy* is not set, use the + :class:`~email.policy.default` policy, which follows the rules of the email + RFCs except for line endings (instead of the RFC mandated ``\r\n``, it uses + the Python standard ``\n`` line endings). For more information see the :mod:`~email.policy` documentation. - .. versionchanged:: 3.3 The *policy* keyword argument was added. - - - .. method:: as_string(unixfrom=False, maxheaderlen=0, policy=None) - - Return the entire message flattened as a string. When optional *unixfrom* - is true, the envelope header is included in the returned string. - *unixfrom* defaults to ``False``. For backward compatibility reasons, - *maxheaderlen* defaults to ``0``, so if you want a different value you - must override it explicitly (the value specified for *max_line_length* in - the policy will be ignored by this method). The *policy* argument may be - used to override the default policy obtained from the message instance. - This can be used to control some of the formatting produced by the - method, since the specified *policy* will be passed to the ``Generator``. - - Flattening the message may trigger changes to the :class:`Message` if - defaults need to be filled in to complete the transformation to a string - (for example, MIME boundaries may be generated or modified). - - Note that this method is provided as a convenience and may not always - format the message the way you want. For example, by default it does - not do the mangling of lines that begin with ``From`` that is - required by the unix mbox format. For more flexibility, instantiate a - :class:`~email.generator.Generator` instance and use its - :meth:`~email.generator.Generator.flatten` method directly. For example:: - - from io import StringIO - from email.generator import Generator - fp = StringIO() - g = Generator(fp, mangle_from_=True, maxheaderlen=60) - g.flatten(msg) - text = fp.getvalue() + .. method:: as_string(unixfrom=False, maxheaderlen=None, policy=None) - If the message object contains binary data that is not encoded according - to RFC standards, the non-compliant data will be replaced by unicode - "unknown character" code points. (See also :meth:`.as_bytes` and - :class:`~email.generator.BytesGenerator`.) - - .. versionchanged:: 3.4 the *policy* keyword argument was added. + Return the entire message flattened as a string. When optional + *unixfrom* is true, the envelope header is included in the returned + string. *unixfrom* defaults to ``False``. For backward compabitility + with the base :class:`~email.message.Message` class *maxheaderlen* is + accepted, but defaults to ``None``, which means that by default the line + length is controlled by the + :attr:`~email.policy.EmailPolicy.max_line_length` of the policy. The + *policy* argument may be used to override the default policy obtained + from the message instance. This can be used to control some of the + formatting produced by the method, since the specified *policy* will be + passed to the :class:`~email.generator.Generator`. + + Flattening the message may trigger changes to the :class:`EmailMessage` + if defaults need to be filled in to complete the transformation to a + string (for example, MIME boundaries may be generated or modified). + + Note that this method is provided as a convenience and may not be the + most useful way to serialize messages in your application, especially if + you are dealing with multiple messages. See + :class:`email.generator.Generator` for a more flexible API for + serializing messages. Note also that this method is restricted to + producing messages serialized as "7 bit clean" when + :attr:`~email.policy.EmailPolicy.utf8` is ``False``, which is the default. + + .. versionchanged:: 3.6 the default behavior when *maxheaderlen* + is not specified was changed from defaulting to 0 to defaulting + to the value of *max_line_length* from the policy. .. method:: __str__() - Equivalent to :meth:`.as_string()`. Allows ``str(msg)`` to produce a - string containing the formatted message. + Equivalent to `as_string(policy=self.policy.clone(utf8=True)`. Allows + ``str(msg)`` to produce a string containing the serialized message in a + readable format. + + .. versionchanged:: 3.4 the method was changed to use ``utf8=True``, + thus producing an :rfc:`6531`-like message representation, instead of + being a direct alias for :meth:`as_string`. .. method:: as_bytes(unixfrom=False, policy=None) @@ -98,52 +109,42 @@ Here are the methods of the :class:`Message` class: used to override the default policy obtained from the message instance. This can be used to control some of the formatting produced by the method, since the specified *policy* will be passed to the - ``BytesGenerator``. - - Flattening the message may trigger changes to the :class:`Message` if - defaults need to be filled in to complete the transformation to a string - (for example, MIME boundaries may be generated or modified). + :class:`~email.generator.BytesGenerator`. - Note that this method is provided as a convenience and may not always - format the message the way you want. For example, by default it does - not do the mangling of lines that begin with ``From`` that is - required by the unix mbox format. For more flexibility, instantiate a - :class:`~email.generator.BytesGenerator` instance and use its - :meth:`~email.generator.BytesGenerator.flatten` method directly. - For example:: + Flattening the message may trigger changes to the :class:`EmailMessage` + if defaults need to be filled in to complete the transformation to a + string (for example, MIME boundaries may be generated or modified). - from io import BytesIO - from email.generator import BytesGenerator - fp = BytesIO() - g = BytesGenerator(fp, mangle_from_=True, maxheaderlen=60) - g.flatten(msg) - text = fp.getvalue() - - .. versionadded:: 3.4 + Note that this method is provided as a convenience and may not be the + most useful way to serialize messages in your application, especially if + you are dealing with multiple messages. See + :class:`email.generator.BytesGenerator` for a more flexible API for + serializing messages. .. method:: __bytes__() Equivalent to :meth:`.as_bytes()`. Allows ``bytes(msg)`` to produce a - bytes object containing the formatted message. - - .. versionadded:: 3.4 + bytes object containing the serialized message. .. method:: is_multipart() Return ``True`` if the message's payload is a list of sub-\ - :class:`Message` objects, otherwise return ``False``. When + :class:`EmailMessage` objects, otherwise return ``False``. When :meth:`is_multipart` returns ``False``, the payload should be a string - object. (Note that :meth:`is_multipart` returning ``True`` does not - necessarily mean that "msg.get_content_maintype() == 'multipart'" will - return the ``True``. For example, ``is_multipart`` will return ``True`` - when the :class:`Message` is of type ``message/rfc822``.) + object (which might be a CTE encoded binary payload). Note that + :meth:`is_multipart` returning ``True`` does not necessarily mean that + "msg.get_content_maintype() == 'multipart'" will return the ``True``. + For example, ``is_multipart`` will return ``True`` when the + :class:`EmailMessage` is of type ``message/rfc822``. .. method:: set_unixfrom(unixfrom) - Set the message's envelope header to *unixfrom*, which should be a string. + Set the message's envelope header to *unixfrom*, which should be a + string. (See :class:`~mailbox.mboxMessage` for a brief description of + this header.) .. method:: get_unixfrom() @@ -152,109 +153,23 @@ Here are the methods of the :class:`Message` class: envelope header was never set. - .. method:: attach(payload) - - Add the given *payload* to the current payload, which must be ``None`` or - a list of :class:`Message` objects before the call. After the call, the - payload will always be a list of :class:`Message` objects. If you want to - set the payload to a scalar object (e.g. a string), use - :meth:`set_payload` instead. - - - .. method:: get_payload(i=None, decode=False) - - Return the current payload, which will be a list of - :class:`Message` objects when :meth:`is_multipart` is ``True``, or a - string when :meth:`is_multipart` is ``False``. If the payload is a list - and you mutate the list object, you modify the message's payload in place. - - With optional argument *i*, :meth:`get_payload` will return the *i*-th - element of the payload, counting from zero, if :meth:`is_multipart` is - ``True``. An :exc:`IndexError` will be raised if *i* is less than 0 or - greater than or equal to the number of items in the payload. If the - payload is a string (i.e. :meth:`is_multipart` is ``False``) and *i* is - given, a :exc:`TypeError` is raised. - - Optional *decode* is a flag indicating whether the payload should be - decoded or not, according to the :mailheader:`Content-Transfer-Encoding` - header. When ``True`` and the message is not a multipart, the payload will - be decoded if this header's value is ``quoted-printable`` or ``base64``. - If some other encoding is used, or :mailheader:`Content-Transfer-Encoding` - header is missing, the payload is - returned as-is (undecoded). In all cases the returned value is binary - data. If the message is a multipart and the *decode* flag is ``True``, - then ``None`` is returned. If the payload is base64 and it was not - perfectly formed (missing padding, characters outside the base64 - alphabet), then an appropriate defect will be added to the message's - defect property (:class:`~email.errors.InvalidBase64PaddingDefect` or - :class:`~email.errors.InvalidBase64CharactersDefect`, respectively). - - When *decode* is ``False`` (the default) the body is returned as a string - without decoding the :mailheader:`Content-Transfer-Encoding`. However, - for a :mailheader:`Content-Transfer-Encoding` of 8bit, an attempt is made - to decode the original bytes using the ``charset`` specified by the - :mailheader:`Content-Type` header, using the ``replace`` error handler. - If no ``charset`` is specified, or if the ``charset`` given is not - recognized by the email package, the body is decoded using the default - ASCII charset. - - - .. method:: set_payload(payload, charset=None) - - Set the entire message object's payload to *payload*. It is the client's - responsibility to ensure the payload invariants. Optional *charset* sets - the message's default character set; see :meth:`set_charset` for details. - - .. method:: set_charset(charset) - - Set the character set of the payload to *charset*, which can either be a - :class:`~email.charset.Charset` instance (see :mod:`email.charset`), a - string naming a character set, or ``None``. If it is a string, it will - be converted to a :class:`~email.charset.Charset` instance. If *charset* - is ``None``, the ``charset`` parameter will be removed from the - :mailheader:`Content-Type` header (the message will not be otherwise - modified). Anything else will generate a :exc:`TypeError`. - - If there is no existing :mailheader:`MIME-Version` header one will be - added. If there is no existing :mailheader:`Content-Type` header, one - will be added with a value of :mimetype:`text/plain`. Whether the - :mailheader:`Content-Type` header already exists or not, its ``charset`` - parameter will be set to *charset.output_charset*. If - *charset.input_charset* and *charset.output_charset* differ, the payload - will be re-encoded to the *output_charset*. If there is no existing - :mailheader:`Content-Transfer-Encoding` header, then the payload will be - transfer-encoded, if needed, using the specified - :class:`~email.charset.Charset`, and a header with the appropriate value - will be added. If a :mailheader:`Content-Transfer-Encoding` header - already exists, the payload is assumed to already be correctly encoded - using that :mailheader:`Content-Transfer-Encoding` and is not modified. - - .. method:: get_charset() - - Return the :class:`~email.charset.Charset` instance associated with the - message's payload. - - The following methods implement a mapping-like interface for accessing the - message's :rfc:`2822` headers. Note that there are some semantic differences + The following methods implement the mapping-like interface for accessing the + message's headers. Note that there are some semantic differences between these methods and a normal mapping (i.e. dictionary) interface. For example, in a dictionary there are no duplicate keys, but here there may be duplicate message headers. Also, in dictionaries there is no guaranteed - order to the keys returned by :meth:`keys`, but in a :class:`Message` object, - headers are always returned in the order they appeared in the original - message, or were added to the message later. Any header deleted and then - re-added are always appended to the end of the header list. + order to the keys returned by :meth:`keys`, but in an :class:`EmailMessage` + object, headers are always returned in the order they appeared in the + original message, or in which they were added to the message later. Any + header deleted and then re-added is always appended to the end of the + header list. - These semantic differences are intentional and are biased toward maximal - convenience. + These semantic differences are intentional and are biased toward + convenience in the most common use cases. Note that in all cases, any envelope header present in the message is not included in the mapping interface. - In a model generated from bytes, any header values that (in contravention of - the RFCs) contain non-ASCII bytes will, when retrieved through this - interface, be represented as :class:`~email.header.Header` objects with - a charset of `unknown-8bit`. - .. method:: __len__() @@ -264,8 +179,8 @@ Here are the methods of the :class:`Message` class: .. method:: __contains__(name) Return true if the message object has a field named *name*. Matching is - done case-insensitively and *name* should not include the trailing colon. - Used for the ``in`` operator, e.g.:: + done without regard to case and *name* does not include the trailing + colon. Used for the ``in`` operator. For example:: if 'message-id' in myMessage: print('Message-ID:', myMessage['message-id']) @@ -273,20 +188,23 @@ Here are the methods of the :class:`Message` class: .. method:: __getitem__(name) - Return the value of the named header field. *name* should not include the + Return the value of the named header field. *name* does not include the colon field separator. If the header is missing, ``None`` is returned; a :exc:`KeyError` is never raised. Note that if the named field appears more than once in the message's headers, exactly which of those field values will be returned is undefined. Use the :meth:`get_all` method to get the values of all the - extant named headers. + extant headers named *name*. + + Using the standard (non-``compat32``) policies, the returned value is an + instance of a subclass of :class:`email.headerregistry.BaseHeader`. .. method:: __setitem__(name, val) Add a header to the message with field name *name* and value *val*. The - field is appended to the end of the message's existing fields. + field is appended to the end of the message's existing headers. Note that this does *not* overwrite or delete any existing header with the same name. If you want to ensure that the new header is the only one present in the @@ -295,6 +213,13 @@ Here are the methods of the :class:`Message` class: del msg['subject'] msg['subject'] = 'Python roolz!' + If the :mod:`policy` defines certain haders to be unique (as the standard + policies do), this method may raise a :exc:`ValueError` when an attempt + is made to assign a value to such a header when one already exists. This + behavior is intentional for consistency's sake, but do not depend on it + as we may choose to make such assignments do an automatic deletion of the + existing header in the future. + .. method:: __delitem__(name) @@ -323,9 +248,10 @@ Here are the methods of the :class:`Message` class: Return the value of the named header field. This is identical to :meth:`__getitem__` except that optional *failobj* is returned if the - named header is missing (defaults to ``None``). + named header is missing (*failobj* defaults to ``None``). - Here are some additional useful methods: + + Here are some additional useful header related methods: .. method:: get_all(name, failobj=None) @@ -346,17 +272,19 @@ Here are the methods of the :class:`Message` class: taken as the parameter name, with underscores converted to dashes (since dashes are illegal in Python identifiers). Normally, the parameter will be added as ``key="value"`` unless the value is ``None``, in which case - only the key will be added. If the value contains non-ASCII characters, - it can be specified as a three tuple in the format - ``(CHARSET, LANGUAGE, VALUE)``, where ``CHARSET`` is a string naming the - charset to be used to encode the value, ``LANGUAGE`` can usually be set - to ``None`` or the empty string (see :rfc:`2231` for other possibilities), - and ``VALUE`` is the string value containing non-ASCII code points. If - a three tuple is not passed and the value contains non-ASCII characters, - it is automatically encoded in :rfc:`2231` format using a ``CHARSET`` - of ``utf-8`` and a ``LANGUAGE`` of ``None``. - - Here's an example:: + only the key will be added. + + If the value contains non-ASCII characters, the charset and language may + be explicitly controlled by specifying the value as a three tuple in the + format ``(CHARSET, LANGUAGE, VALUE)``, where ``CHARSET`` is a string + naming the charset to be used to encode the value, ``LANGUAGE`` can + usually be set to ``None`` or the empty string (see :rfc:`2231` for other + possibilities), and ``VALUE`` is the string value containing non-ASCII + code points. If a three tuple is not passed and the value contains + non-ASCII characters, it is automatically encoded in :rfc:`2231` format + using a ``CHARSET`` of ``utf-8`` and a ``LANGUAGE`` of ``None``. + + Here is an example:: msg.add_header('Content-Disposition', 'attachment', filename='bud.gif') @@ -364,37 +292,35 @@ Here are the methods of the :class:`Message` class: Content-Disposition: attachment; filename="bud.gif" - An example with non-ASCII characters:: + An example of the extended interface with non-ASCII characters:: msg.add_header('Content-Disposition', 'attachment', filename=('iso-8859-1', '', 'Fußballer.ppt')) - Which produces :: - - Content-Disposition: attachment; filename*="iso-8859-1''Fu%DFballer.ppt" - .. method:: replace_header(_name, _value) Replace a header. Replace the first header found in the message that - matches *_name*, retaining header order and field name case. If no - matching header was found, a :exc:`KeyError` is raised. + matches *_name*, retaining header order and field name case of the + original header. If no matching header is found, raise a + :exc:`KeyError`. .. method:: get_content_type() - Return the message's content type. The returned string is coerced to - lower case of the form :mimetype:`maintype/subtype`. If there was no - :mailheader:`Content-Type` header in the message the default type as given - by :meth:`get_default_type` will be returned. Since according to - :rfc:`2045`, messages always have a default type, :meth:`get_content_type` - will always return a value. + Return the message's content type, coerced to lower case of the form + :mimetype:`maintype/subtype`. If there is no :mailheader:`Content-Type` + header in the message return the value returned by + :meth:`get_default_type`. If the :mailheader:`Content-Type` header is + invalid, return ``text/plain``. - :rfc:`2045` defines a message's default type to be :mimetype:`text/plain` - unless it appears inside a :mimetype:`multipart/digest` container, in - which case it would be :mimetype:`message/rfc822`. If the - :mailheader:`Content-Type` header has an invalid type specification, - :rfc:`2045` mandates that the default type be :mimetype:`text/plain`. + (According to :rfc:`2045`, messages always have a default type, + :meth:`get_content_type` will always return a value. :rfc:`2045` defines + a message's default type to be :mimetype:`text/plain` unless it appears + inside a :mimetype:`multipart/digest` container, in which case it would + be :mimetype:`message/rfc822`. If the :mailheader:`Content-Type` header + has an invalid type specification, :rfc:`2045` mandates that the default + type be :mimetype:`text/plain`.) .. method:: get_content_maintype() @@ -420,81 +346,41 @@ Here are the methods of the :class:`Message` class: .. method:: set_default_type(ctype) Set the default content type. *ctype* should either be - :mimetype:`text/plain` or :mimetype:`message/rfc822`, although this is not - enforced. The default content type is not stored in the - :mailheader:`Content-Type` header. - - - .. method:: get_params(failobj=None, header='content-type', unquote=True) - - Return the message's :mailheader:`Content-Type` parameters, as a list. - The elements of the returned list are 2-tuples of key/value pairs, as - split on the ``'='`` sign. The left hand side of the ``'='`` is the key, - while the right hand side is the value. If there is no ``'='`` sign in - the parameter the value is the empty string, otherwise the value is as - described in :meth:`get_param` and is unquoted if optional *unquote* is - ``True`` (the default). - - Optional *failobj* is the object to return if there is no - :mailheader:`Content-Type` header. Optional *header* is the header to - search instead of :mailheader:`Content-Type`. - - - .. method:: get_param(param, failobj=None, header='content-type', unquote=True) - - Return the value of the :mailheader:`Content-Type` header's parameter - *param* as a string. If the message has no :mailheader:`Content-Type` - header or if there is no such parameter, then *failobj* is returned - (defaults to ``None``). - - Optional *header* if given, specifies the message header to use instead of - :mailheader:`Content-Type`. - - Parameter keys are always compared case insensitively. The return value - can either be a string, or a 3-tuple if the parameter was :rfc:`2231` - encoded. When it's a 3-tuple, the elements of the value are of the form - ``(CHARSET, LANGUAGE, VALUE)``. Note that both ``CHARSET`` and - ``LANGUAGE`` can be ``None``, in which case you should consider ``VALUE`` - to be encoded in the ``us-ascii`` charset. You can usually ignore - ``LANGUAGE``. - - If your application doesn't care whether the parameter was encoded as in - :rfc:`2231`, you can collapse the parameter value by calling - :func:`email.utils.collapse_rfc2231_value`, passing in the return value - from :meth:`get_param`. This will return a suitably decoded Unicode - string when the value is a tuple, or the original string unquoted if it - isn't. For example:: - - rawparam = msg.get_param('foo') - param = email.utils.collapse_rfc2231_value(rawparam) - - In any case, the parameter value (either the returned string, or the - ``VALUE`` item in the 3-tuple) is always unquoted, unless *unquote* is set - to ``False``. + :mimetype:`text/plain` or :mimetype:`message/rfc822`, although this is + not enforced. The default content type is not stored in the + :mailheader:`Content-Type` header, so it only affects the return value of + the ``get_content_type`` methods when no :mailheader:`Content-Type` + header is present in the message. .. method:: set_param(param, value, header='Content-Type', requote=True, \ charset=None, language='', replace=False) Set a parameter in the :mailheader:`Content-Type` header. If the - parameter already exists in the header, its value will be replaced with - *value*. If the :mailheader:`Content-Type` header as not yet been defined - for this message, it will be set to :mimetype:`text/plain` and the new - parameter value will be appended as per :rfc:`2045`. - - Optional *header* specifies an alternative header to - :mailheader:`Content-Type`, and all parameters will be quoted as necessary - unless optional *requote* is ``False`` (the default is ``True``). - - If optional *charset* is specified, the parameter will be encoded - according to :rfc:`2231`. Optional *language* specifies the RFC 2231 - language, defaulting to the empty string. Both *charset* and *language* - should be strings. + parameter already exists in the header, replace its value with *value*. + When *header* is ``Content-Type`` (the default) and the header does not + yet exist in the message, add it, set its value to + :mimetype:`text/plain`, and append the new parameter value. Optional + *header* specifies an alternative header to :mailheader:`Content-Type`. + + If the value contains non-ASCII characters, the charset and language may + be explicity specified using the optional *charset* and *language* + parameters. Optional *language* specifies the :rfc:`2231` language, + defaulting to the empty string. Both *charset* and *language* should be + strings. The default is to use the ``utf8`` *charset* and ``None`` for + the *language*. If *replace* is ``False`` (the default) the header is moved to the end of the list of headers. If *replace* is ``True``, the header will be updated in place. + Use of the *requote* parameter with :class:`EmailMessage` objects is + deprecated. + + Note that existing parameter values of headers may be accessed through + the :attr:`~email.headerregistry.BaseHeader.params` attribute of the + header value (for example, ``msg['Content-Type'].params['charset']``. + .. versionchanged:: 3.4 ``replace`` keyword was added. @@ -502,25 +388,11 @@ Here are the methods of the :class:`Message` class: Remove the given parameter completely from the :mailheader:`Content-Type` header. The header will be re-written in place without the parameter or - its value. All values will be quoted as necessary unless *requote* is - ``False`` (the default is ``True``). Optional *header* specifies an - alternative to :mailheader:`Content-Type`. - - - .. method:: set_type(type, header='Content-Type', requote=True) - - Set the main type and subtype for the :mailheader:`Content-Type` - header. *type* must be a string in the form :mimetype:`maintype/subtype`, - otherwise a :exc:`ValueError` is raised. - - This method replaces the :mailheader:`Content-Type` header, keeping all - the parameters in place. If *requote* is ``False``, this leaves the - existing header's quoting as is, otherwise the parameters will be quoted - (the default). + its value. Optional *header* specifies an alternative to + :mailheader:`Content-Type`. - An alternative header can be specified in the *header* argument. When the - :mailheader:`Content-Type` header is set a :mailheader:`MIME-Version` - header is also added. + Use of the *requote* parameter with :class:`EmailMessage` objects is + deprecated. .. method:: get_filename(failobj=None) @@ -549,12 +421,11 @@ Here are the methods of the :class:`Message` class: necessary. A :exc:`~email.errors.HeaderParseError` is raised if the message object has no :mailheader:`Content-Type` header. - Note that using this method is subtly different than deleting the old + Note that using this method is subtly different from deleting the old :mailheader:`Content-Type` header and adding a new one with the new boundary via :meth:`add_header`, because :meth:`set_boundary` preserves the order of the :mailheader:`Content-Type` header in the list of - headers. However, it does *not* preserve any continuation lines which may - have been present in the original :mailheader:`Content-Type` header. + headers. .. method:: get_content_charset(failobj=None) @@ -563,9 +434,6 @@ Here are the methods of the :class:`Message` class: coerced to lower case. If there is no :mailheader:`Content-Type` header, or if that header has no ``charset`` parameter, *failobj* is returned. - Note that this method differs from :meth:`get_charset` which returns the - :class:`~email.charset.Charset` instance for the default encoding of the message body. - .. method:: get_charsets(failobj=None) @@ -575,10 +443,19 @@ Here are the methods of the :class:`Message` class: Each item in the list will be a string which is the value of the ``charset`` parameter in the :mailheader:`Content-Type` header for the - represented subpart. However, if the subpart has no - :mailheader:`Content-Type` header, no ``charset`` parameter, or is not of - the :mimetype:`text` main MIME type, then that item in the returned list - will be *failobj*. + represented subpart. If the subpart has no :mailheader:`Content-Type` + header, no ``charset`` parameter, or is not of the :mimetype:`text` main + MIME type, then that item in the returned list will be *failobj*. + + + .. method:: is_attachment + + Return ``True`` if there is a :mailheader:`Content-Disposition` header + and its (case insensitive) value is ``attachment``, ``False`` otherwise. + + .. versionchanged:: 3.4.2 + is_attachment is now a method instead of a property, for consistency + with :meth:`~email.message.Message.is_multipart`. .. method:: get_content_disposition() @@ -590,6 +467,11 @@ Here are the methods of the :class:`Message` class: .. versionadded:: 3.5 + + The following methods relate to interrogating and manipulating the content + (payload) of the message. + + .. method:: walk() The :meth:`walk` method is an all-purpose generator which can be used to @@ -651,8 +533,169 @@ Here are the methods of the :class:`Message` class: into the subparts. - :class:`Message` objects can also optionally contain two instance attributes, - which can be used when generating the plain text of a MIME message. + .. method:: get_body(preferencelist=('related', 'html', 'plain')) + + Return the MIME part that is the best candidate to be the "body" of the + message. + + *preferencelist* must be a sequence of strings from the set ``related``, + ``html``, and ``plain``, and indicates the order of preference for the + content type of the part returned. + + Start looking for candidate matches with the object on which the + ``get_body`` method is called. + + If ``related`` is not included in *preferencelist*, consider the root + part (or subpart of the root part) of any related encountered as a + candidate if the (sub-)part matches a preference. + + When encountering a ``multipart/related``, check the ``start`` parameter + and if a part with a matching :mailheader:`Content-ID` is found, consider + only it when looking for candidate matches. Otherwise consider only the + first (default root) part of the ``multipart/related``. + + If a part has a :mailheader:`Content-Disposition` header, only consider + the part a candidate match if the value of the header is ``inline``. + + If none of the candidates matches any of the preferences in + *preferneclist*, return ``None``. + + Notes: (1) For most applications the only *preferencelist* combinations + that really make sense are ``('plain',)``, ``('html', 'plain')``, and the + default ``('related', 'html', 'plain')``. (2) Because matching starts + with the object on which ``get_body`` is called, calling ``get_body`` on + a ``multipart/related`` will return the object itself unless + *preferencelist* has a non-default value. (3) Messages (or message parts) + that do not specify a :mailheader:`Content-Type` or whose + :mailheader:`Content-Type` header is invalid will be treated as if they + are of type ``text/plain``, which may occasionally cause ``get_body`` to + return unexpected results. + + + .. method:: iter_attachments() + + Return an iterator over all of the immediate sub-parts of the message + that are not candidate "body" parts. That is, skip the first occurrence + of each of ``text/plain``, ``text/html``, ``multipart/related``, or + ``multipart/alternative`` (unless they are explicitly marked as + attachments via :mailheader:`Content-Disposition: attachment`), and + return all remaining parts. When applied directly to a + ``multipart/related``, return an iterator over the all the related parts + except the root part (ie: the part pointed to by the ``start`` parameter, + or the first part if there is no ``start`` parameter or the ``start`` + parameter doesn't match the :mailheader:`Content-ID` of any of the + parts). When applied directly to a ``multipart/alternative`` or a + non-``multipart``, return an empty iterator. + + + .. method:: iter_parts() + + Return an iterator over all of the immediate sub-parts of the message, + which will be empty for a non-``multipart``. (See also + :meth:`~email.message.EmailMessage.walk`.) + + + .. method:: get_content(*args, content_manager=None, **kw) + + Call the :meth:`~email.contentmanager.ContentManager.get_content` method + of the *content_manager*, passing self as the message object, and passing + along any other arguments or keywords as additional arguments. If + *content_manager* is not specified, use the ``content_manager`` specified + by the current :mod:`~email.policy`. + + + .. method:: set_content(*args, content_manager=None, **kw) + + Call the :meth:`~email.contentmanager.ContentManager.set_content` method + of the *content_manager*, passing self as the message object, and passing + along any other arguments or keywords as additional arguments. If + *content_manager* is not specified, use the ``content_manager`` specified + by the current :mod:`~email.policy`. + + + .. method:: make_related(boundary=None) + + Convert a non-``multipart`` message into a ``multipart/related`` message, + moving any existing :mailheader:`Content-` headers and payload into a + (new) first part of the ``multipart``. If *boundary* is specified, use + it as the boundary string in the multipart, otherwise leave the boundary + to be automatically created when it is needed (for example, when the + message is serialized). + + + .. method:: make_alternative(boundary=None) + + Convert a non-``multipart`` or a ``multipart/related`` into a + ``multipart/alternative``, moving any existing :mailheader:`Content-` + headers and payload into a (new) first part of the ``multipart``. If + *boundary* is specified, use it as the boundary string in the multipart, + otherwise leave the boundary to be automatically created when it is + needed (for example, when the message is serialized). + + + .. method:: make_mixed(boundary=None) + + Convert a non-``multipart``, a ``multipart/related``, or a + ``multipart-alternative`` into a ``multipart/mixed``, moving any existing + :mailheader:`Content-` headers and payload into a (new) first part of the + ``multipart``. If *boundary* is specified, use it as the boundary string + in the multipart, otherwise leave the boundary to be automatically + created when it is needed (for example, when the message is serialized). + + + .. method:: add_related(*args, content_manager=None, **kw) + + If the message is a ``multipart/related``, create a new message + object, pass all of the arguments to its :meth:`set_content` method, + and :meth:`~email.message.Message.attach` it to the ``multipart``. If + the message is a non-``multipart``, call :meth:`make_related` and then + proceed as above. If the message is any other type of ``multipart``, + raise a :exc:`TypeError`. If *content_manager* is not specified, use + the ``content_manager`` specified by the current :mod:`~email.policy`. + If the added part has no :mailheader:`Content-Disposition` header, + add one with the value ``inline``. + + + .. method:: add_alternative(*args, content_manager=None, **kw) + + If the message is a ``multipart/alternative``, create a new message + object, pass all of the arguments to its :meth:`set_content` method, and + :meth:`~email.message.Message.attach` it to the ``multipart``. If the + message is a non-``multipart`` or ``multipart/related``, call + :meth:`make_alternative` and then proceed as above. If the message is + any other type of ``multipart``, raise a :exc:`TypeError`. If + *content_manager* is not specified, use the ``content_manager`` specified + by the current :mod:`~email.policy`. + + + .. method:: add_attachment(*args, content_manager=None, **kw) + + If the message is a ``multipart/mixed``, create a new message object, + pass all of the arguments to its :meth:`set_content` method, and + :meth:`~email.message.Message.attach` it to the ``multipart``. If the + message is a non-``multipart``, ``multipart/related``, or + ``multipart/alternative``, call :meth:`make_mixed` and then proceed as + above. If *content_manager* is not specified, use the ``content_manager`` + specified by the current :mod:`~email.policy`. If the added part + has no :mailheader:`Content-Disposition` header, add one with the value + ``attachment``. This method can be used both for explicit attachments + (:mailheader:`Content-Disposition: attachment` and ``inline`` attachments + (:mailheader:`Content-Disposition: inline`), by passing appropriate + options to the ``content_manager``. + + + .. method:: clear() + + Remove the payload and all of the headers. + + + .. method:: clear_content() + + Remove the payload and all of the :exc:`Content-` headers, leaving + all other headers intact and in their original order. + + + :class:`EmailMessage` objects have the following instance attributes: .. attribute:: preamble @@ -682,11 +725,8 @@ Here are the methods of the :class:`Message` class: The *epilogue* attribute acts the same way as the *preamble* attribute, except that it contains text that appears between the last boundary and - the end of the message. - - You do not need to set the epilogue to the empty string in order for the - :class:`~email.generator.Generator` to print a newline at the end of the - file. + the end of the message. As with the :attr:`~EmailMessage.preamble`, + if there is no epilog text this attribute will be ``None``. .. attribute:: defects @@ -694,3 +734,18 @@ Here are the methods of the :class:`Message` class: The *defects* attribute contains a list of all the problems found when parsing this message. See :mod:`email.errors` for a detailed description of the possible parsing defects. + + +.. class:: MIMEPart(policy=default) + + This class represents a subpart of a MIME message. It is identical to + :class:`EmailMessage`, except that no :mailheader:`MIME-Version` headers are + added when :meth:`~EmailMessage.set_content` is called, since sub-parts do + not need their own :mailheader:`MIME-Version` headers. + + +.. rubric:: Footnotes + +.. [1] Oringally added in 3.4 as a :term:`provisional module `. Docs for legacy message class moved to + :ref:`compat32_message`. diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst index bd007c0..d9dae9f 100644 --- a/Doc/library/email.mime.rst +++ b/Doc/library/email.mime.rst @@ -8,6 +8,11 @@ -------------- +This module is part of the legacy (``Compat32``) email API. Its functionality +is partially replaced by the :mod:`~email.contentmanager` in the new API, but +in certain applications these classes may still be useful, even in non-legacy +code. + Ordinarily, you get a message object structure by passing a file or some text to a parser, which parses the text and returns the root message object. However you can also build a complete message structure from scratch, or even individual @@ -25,7 +30,7 @@ Here are the classes: .. currentmodule:: email.mime.base -.. class:: MIMEBase(_maintype, _subtype, **_params) +.. class:: MIMEBase(_maintype, _subtype, *, policy=compat32, **_params) Module: :mod:`email.mime.base` @@ -41,10 +46,17 @@ Here are the classes: key/value dictionary and is passed directly to :meth:`Message.add_header `. + If *policy* is specified, (defaults to the + :class:`compat32 ` policy) it will be passed to + :class:`~email.message.Message`. + The :class:`MIMEBase` class always adds a :mailheader:`Content-Type` header (based on *_maintype*, *_subtype*, and *_params*), and a :mailheader:`MIME-Version` header (always set to ``1.0``). + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. + .. currentmodule:: email.mime.nonmultipart @@ -62,7 +74,8 @@ Here are the classes: .. currentmodule:: email.mime.multipart -.. class:: MIMEMultipart(_subtype='mixed', boundary=None, _subparts=None, **_params) +.. class:: MIMEMultipart(_subtype='mixed', boundary=None, _subparts=None, \ + *, policy=compat32, **_params) Module: :mod:`email.mime.multipart` @@ -82,14 +95,20 @@ Here are the classes: to the message by using the :meth:`Message.attach ` method. + Optional *policy* argument defaults to :class:`compat32 `. + Additional parameters for the :mailheader:`Content-Type` header are taken from the keyword arguments, or passed into the *_params* argument, which is a keyword dictionary. + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. .. currentmodule:: email.mime.application -.. class:: MIMEApplication(_data, _subtype='octet-stream', _encoder=email.encoders.encode_base64, **_params) +.. class:: MIMEApplication(_data, _subtype='octet-stream', \ + _encoder=email.encoders.encode_base64, \ + *, policy=compat32, **_params) Module: :mod:`email.mime.application` @@ -109,12 +128,18 @@ Here are the classes: object as necessary. The default encoding is base64. See the :mod:`email.encoders` module for a list of the built-in encoders. + Optional *policy* argument defaults to :class:`compat32 `. + *_params* are passed straight through to the base class constructor. + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. .. currentmodule:: email.mime.audio -.. class:: MIMEAudio(_audiodata, _subtype=None, _encoder=email.encoders.encode_base64, **_params) +.. class:: MIMEAudio(_audiodata, _subtype=None, \ + _encoder=email.encoders.encode_base64, \ + *, policy=compat32, **_params) Module: :mod:`email.mime.audio` @@ -137,12 +162,18 @@ Here are the classes: object as necessary. The default encoding is base64. See the :mod:`email.encoders` module for a list of the built-in encoders. + Optional *policy* argument defaults to :class:`compat32 `. + *_params* are passed straight through to the base class constructor. + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. .. currentmodule:: email.mime.image -.. class:: MIMEImage(_imagedata, _subtype=None, _encoder=email.encoders.encode_base64, **_params) +.. class:: MIMEImage(_imagedata, _subtype=None, \ + _encoder=email.encoders.encode_base64, \ + *, policy=compat32, **_params) Module: :mod:`email.mime.image` @@ -165,13 +196,17 @@ Here are the classes: object as necessary. The default encoding is base64. See the :mod:`email.encoders` module for a list of the built-in encoders. + Optional *policy* argument defaults to :class:`compat32 `. + *_params* are passed straight through to the :class:`~email.mime.base.MIMEBase` constructor. + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. .. currentmodule:: email.mime.message -.. class:: MIMEMessage(_msg, _subtype='rfc822') +.. class:: MIMEMessage(_msg, _subtype='rfc822', *, policy=compat32) Module: :mod:`email.mime.message` @@ -184,10 +219,14 @@ Here are the classes: Optional *_subtype* sets the subtype of the message; it defaults to :mimetype:`rfc822`. + Optional *policy* argument defaults to :class:`compat32 `. + + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. .. currentmodule:: email.mime.text -.. class:: MIMEText(_text, _subtype='plain', _charset=None) +.. class:: MIMEText(_text, _subtype='plain', _charset=None, *, policy=compat32) Module: :mod:`email.mime.text` @@ -203,7 +242,7 @@ Here are the classes: Unless the *_charset* argument is explicitly set to ``None``, the MIMEText object created will have both a :mailheader:`Content-Type` header - with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Encoding` + with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding` header. This means that a subsequent ``set_payload`` call will not result in an encoded payload, even if a charset is passed in the ``set_payload`` command. You can "reset" this behavior by deleting the @@ -211,5 +250,10 @@ Here are the classes: will automatically encode the new payload (and add a new :mailheader:`Content-Transfer-Encoding` header). + Optional *policy* argument defaults to :class:`compat32 `. + .. versionchanged:: 3.5 *_charset* also accepts :class:`~email.charset.Charset` instances. + + .. versionchanged:: 3.6 + Added *policy* keyword-only parameter. diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst index b8eb7c5..c323ebc 100644 --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -8,210 +8,223 @@ -------------- -Message object structures can be created in one of two ways: they can be created -from whole cloth by instantiating :class:`~email.message.Message` objects and -stringing them together via :meth:`~email.message.Message.attach` and -:meth:`~email.message.Message.set_payload` calls, or they -can be created by parsing a flat text representation of the email message. +Message object structures can be created in one of two ways: they can be +created from whole cloth by creating an :class:`~email.message.EmailMessage` +object, adding headers using the dictionary interface, and adding payload(s) +using :meth:`~email.message.EmailMessage.set_content` and related methods, or +they can be created by parsing a serialized representation of the email +message. The :mod:`email` package provides a standard parser that understands most email -document structures, including MIME documents. You can pass the parser a string -or a file object, and the parser will return to you the root -:class:`~email.message.Message` instance of the object structure. For simple, -non-MIME messages the payload of this root object will likely be a string -containing the text of the message. For MIME messages, the root object will -return ``True`` from its :meth:`~email.message.Message.is_multipart` method, and -the subparts can be accessed via the :meth:`~email.message.Message.get_payload` -and :meth:`~email.message.Message.walk` methods. - -There are actually two parser interfaces available for use, the classic -:class:`Parser` API and the incremental :class:`FeedParser` API. The classic -:class:`Parser` API is fine if you have the entire text of the message in memory -as a string, or if the entire message lives in a file on the file system. -:class:`FeedParser` is more appropriate for when you're reading the message from -a stream which might block waiting for more input (e.g. reading an email message -from a socket). The :class:`FeedParser` can consume and parse the message -incrementally, and only returns the root object when you close the parser [#]_. +document structures, including MIME documents. You can pass the parser a +bytes, string or file object, and the parser will return to you the root +:class:`~email.message.EmailMessage` instance of the object structure. For +simple, non-MIME messages the payload of this root object will likely be a +string containing the text of the message. For MIME messages, the root object +will return ``True`` from its :meth:`~email.message.EmailMessage.is_multipart` +method, and the subparts can be accessed via the payload manipulation methods, +such as :meth:`~email.message.EmailMessage.get_body`, +:meth:`~email.message.EmailMessage.iter_parts`, and +:meth:`~email.message.EmailMessage.walk`. + +There are actually two parser interfaces available for use, the :class:`Parser` +API and the incremental :class:`FeedParser` API. The :class:`Parser` API is +most useful if you have the entire text of the message in memory, or if the +entire message lives in a file on the file system. :class:`FeedParser` is more +appropriate when you are reading the message from a stream which might block +waiting for more input (such as reading an email message from a socket). The +:class:`FeedParser` can consume and parse the message incrementally, and only +returns the root object when you close the parser. Note that the parser can be extended in limited ways, and of course you can -implement your own parser completely from scratch. There is no magical -connection between the :mod:`email` package's bundled parser and the -:class:`~email.message.Message` class, so your custom parser can create message -object trees any way it finds necessary. +implement your own parser completely from scratch. All of the logic that +connects the :mod:`email` package's bundled parser and the +:class:`~email.message.EmailMessage` class is embodied in the :mod:`policy` +class, so a custom parser can create message object trees any way it finds +necessary by implementing custom versions of the appropriate :mod:`policy` +methods. FeedParser API ^^^^^^^^^^^^^^ -The :class:`FeedParser`, imported from the :mod:`email.feedparser` module, -provides an API that is conducive to incremental parsing of email messages, such -as would be necessary when reading the text of an email message from a source -that can block (e.g. a socket). The :class:`FeedParser` can of course be used -to parse an email message fully contained in a string or a file, but the classic -:class:`Parser` API may be more convenient for such use cases. The semantics -and results of the two parser APIs are identical. - -The :class:`FeedParser`'s API is simple; you create an instance, feed it a bunch -of text until there's no more to feed it, then close the parser to retrieve the -root message object. The :class:`FeedParser` is extremely accurate when parsing -standards-compliant messages, and it does a very good job of parsing -non-compliant messages, providing information about how a message was deemed -broken. It will populate a message object's *defects* attribute with a list of -any problems it found in a message. See the :mod:`email.errors` module for the +The :class:`BytesFeedParser`, imported from the :mod:`email.feedparser` module, +provides an API that is conducive to incremental parsing of email messages, +such as would be necessary when reading the text of an email message from a +source that can block (such as a socket). The :class:`BytesFeedParser` can of +course be used to parse an email message fully contained in a :term:`bytes-like +object`, string, or file, but the :class:`BytesParser` API may be more +convenient for such use cases. The semantics and results of the two parser +APIs are identical. + +The :class:`BytesFeedParser`'s API is simple; you create an instance, feed it a +bunch of bytes until there's no more to feed it, then close the parser to +retrieve the root message object. The :class:`BytesFeedParser` is extremely +accurate when parsing standards-compliant messages, and it does a very good job +of parsing non-compliant messages, providing information about how a message +was deemed broken. It will populate a message object's +:attr:`~email.message.EmailMessage.defects` attribute with a list of any +problems it found in a message. See the :mod:`email.errors` module for the list of defects that it can find. -Here is the API for the :class:`FeedParser`: +Here is the API for the :class:`BytesFeedParser`: -.. class:: FeedParser(_factory=email.message.Message, *, policy=policy.compat32) +.. class:: BytesFeedParser(_factory=None, *, policy=policy.compat32) - Create a :class:`FeedParser` instance. Optional *_factory* is a no-argument - callable that will be called whenever a new message object is needed. It - defaults to the :class:`email.message.Message` class. + Create a :class:`BytesFeedParser` instance. Optional *_factory* is a + no-argument callable; if not specified use the + :attr:`~email.policy.Policy.message_factory` from the *policy*. Call + *_factory* whenever a new message object is needed. - If *policy* is specified (it must be an instance of a :mod:`~email.policy` - class) use the rules it specifies to update the representation of the - message. If *policy* is not set, use the :class:`compat32 - ` policy, which maintains backward compatibility with - the Python 3.2 version of the email package. For more information see the + If *policy* is specified use the rules it specifies to update the + representation of the message. If *policy* is not set, use the + :class:`compat32 ` policy, which maintains backward + compatibility with the Python 3.2 version of the email package and provides + :class:`~email.message.Message` as the default factory. All other policies + provide :class:`~email.message.EmailMessage` as the default *_factory*. For + more information on what else *policy* controls, see the :mod:`~email.policy` documentation. + Note: **The policy keyword should always be specified**; The default will + change to :data:`email.policy.default` in a future version of Python. + + .. versionadded:: 3.2 + .. versionchanged:: 3.3 Added the *policy* keyword. + .. versionchanged:: 3.6 *_factory* defaults to the policy ``message_factory``. + .. method:: feed(data) - Feed the :class:`FeedParser` some more data. *data* should be a string - containing one or more lines. The lines can be partial and the - :class:`FeedParser` will stitch such partial lines together properly. The - lines in the string can have any of the common three line endings, - carriage return, newline, or carriage return and newline (they can even be - mixed). + Feed the parser some more data. *data* should be a :term:`bytes-like + object` containing one or more lines. The lines can be partial and the + parser will stitch such partial lines together properly. The lines can + have any of the three common line endings: carriage return, newline, or + carriage return and newline (they can even be mixed). + .. method:: close() - Closing a :class:`FeedParser` completes the parsing of all previously fed - data, and returns the root message object. It is undefined what happens - if you feed more data to a closed :class:`FeedParser`. + Complete the parsing of all previously fed data and return the root + message object. It is undefined what happens if :meth:`~feed` is called + after this method has been called. -.. class:: BytesFeedParser(_factory=email.message.Message) +.. class:: FeedParser(_factory=None, *, policy=policy.compat32) - Works exactly like :class:`FeedParser` except that the input to the - :meth:`~FeedParser.feed` method must be bytes and not string. + Works like :class:`BytesFeedParser` except that the input to the + :meth:`~BytesFeedParser.feed` method must be a string. This is of limited + utility, since the only way for such a message to be valid is for it to + contain only ASCII text or, if :attr:`~email.policy.Policy.utf8` is + ``True``, no binary attachments. - .. versionadded:: 3.2 + .. versionchanged:: 3.3 Added the *policy* keyword. -Parser class API -^^^^^^^^^^^^^^^^ +Parser API +^^^^^^^^^^ -The :class:`Parser` class, imported from the :mod:`email.parser` module, +The :class:`BytesParser` class, imported from the :mod:`email.parser` module, provides an API that can be used to parse a message when the complete contents -of the message are available in a string or file. The :mod:`email.parser` -module also provides header-only parsers, called :class:`HeaderParser` and -:class:`BytesHeaderParser`, which can be used if you're only interested in the -headers of the message. :class:`HeaderParser` and :class:`BytesHeaderParser` +of the message are available in a :term:`bytes-like object` or file. The +:mod:`email.parser` module also provides :class:`Parser` for parsing strings, +and header-only parsers, :class:`BytesHeaderParser` and +:class:`HeaderParser`, which can be used if you're only interested in the +headers of the message. :class:`BytesHeaderParser` and :class:`HeaderParser` can be much faster in these situations, since they do not attempt to parse the -message body, instead setting the payload to the raw body as a string. They -have the same API as the :class:`Parser` and :class:`BytesParser` classes. +message body, instead setting the payload to the raw body. -.. versionadded:: 3.3 - The BytesHeaderParser class. +.. class:: BytesParser(_class=None, *, policy=policy.compat32) -.. class:: Parser(_class=email.message.Message, *, policy=policy.compat32) + Create a :class:`BytesParser` instance. The *_class* and *policy* + arguments have the same meaning and sematnics as the *_factory* + and *policy* arguments of :class:`BytesFeedParser`. - The constructor for the :class:`Parser` class takes an optional argument - *_class*. This must be a callable factory (such as a function or a class), and - it is used whenever a sub-message object needs to be created. It defaults to - :class:`~email.message.Message` (see :mod:`email.message`). The factory will - be called without arguments. - - If *policy* is specified (it must be an instance of a :mod:`~email.policy` - class) use the rules it specifies to update the representation of the - message. If *policy* is not set, use the :class:`compat32 - ` policy, which maintains backward compatibility with - the Python 3.2 version of the email package. For more information see the - :mod:`~email.policy` documentation. + Note: **The policy keyword should always be specified**; The default will + change to :data:`email.policy.default` in a future version of Python. .. versionchanged:: 3.3 Removed the *strict* argument that was deprecated in 2.4. Added the *policy* keyword. - - The other public :class:`Parser` methods are: + .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``. .. method:: parse(fp, headersonly=False) - Read all the data from the file-like object *fp*, parse the resulting - text, and return the root message object. *fp* must support both the - :meth:`~io.TextIOBase.readline` and the :meth:`~io.TextIOBase.read` - methods on file-like objects. + Read all the data from the binary file-like object *fp*, parse the + resulting bytes, and return the message object. *fp* must support + both the :meth:`~io.IOBase.readline` and the :meth:`~io.IOBase.read` + methods. - The text contained in *fp* must be formatted as a block of :rfc:`2822` + The bytes contained in *fp* must be formatted as a block of :rfc:`5322` + (or, if :attr:`~email.policy.Policy.utf8` is ``True``, :rfc:`6532`) style headers and header continuation lines, optionally preceded by an envelope header. The header block is terminated either by the end of the data or by a blank line. Following the header block is the body of the - message (which may contain MIME-encoded subparts). + message (which may contain MIME-encoded subparts, including subparts + with a :mailheader:`Content-Transfer-Encoding` of ``8bit``. Optional *headersonly* is a flag specifying whether to stop parsing after reading the headers or not. The default is ``False``, meaning it parses the entire contents of the file. - .. method:: parsestr(text, headersonly=False) - Similar to the :meth:`parse` method, except it takes a string object - instead of a file-like object. Calling this method on a string is exactly - equivalent to wrapping *text* in a :class:`~io.StringIO` instance first and - calling :meth:`parse`. + .. method:: parsebytes(bytes, headersonly=False) + + Similar to the :meth:`parse` method, except it takes a :term:`bytes-like + object` instead of a file-like object. Calling this method on a + :term:`bytes-like object` is equivalent to wrapping *bytes* in a + :class:`~io.BytesIO` instance first and calling :meth:`parse`. Optional *headersonly* is as with the :meth:`parse` method. + .. versionadded:: 3.2 -.. class:: BytesParser(_class=email.message.Message, *, policy=policy.compat32) - This class is exactly parallel to :class:`Parser`, but handles bytes input. - The *_class* and *strict* arguments are interpreted in the same way as for - the :class:`Parser` constructor. +.. class:: BytesHeaderParser(_class=None, *, policy=policy.compat32) - If *policy* is specified (it must be an instance of a :mod:`~email.policy` - class) use the rules it specifies to update the representation of the - message. If *policy* is not set, use the :class:`compat32 - ` policy, which maintains backward compatibility with - the Python 3.2 version of the email package. For more information see the - :mod:`~email.policy` documentation. + Exactly like :class:`BytesParser`, except that *headersonly* + defaults to ``True``. + + .. versionadded:: 3.3 + + +.. class:: Parser(_class=None, *, policy=policy.compat32) + + This class is parallel to :class:`BytesParser`, but handles string input. .. versionchanged:: 3.3 Removed the *strict* argument. Added the *policy* keyword. + .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``. + .. method:: parse(fp, headersonly=False) - Read all the data from the binary file-like object *fp*, parse the - resulting bytes, and return the message object. *fp* must support - both the :meth:`~io.IOBase.readline` and the :meth:`~io.IOBase.read` - methods on file-like objects. + Read all the data from the text-mode file-like object *fp*, parse the + resulting text, and return the root message object. *fp* must support + both the :meth:`~io.TextIOBase.readline` and the + :meth:`~io.TextIOBase.read` methods on file-like objects. - The bytes contained in *fp* must be formatted as a block of :rfc:`2822` - style headers and header continuation lines, optionally preceded by an - envelope header. The header block is terminated either by the end of the - data or by a blank line. Following the header block is the body of the - message (which may contain MIME-encoded subparts, including subparts - with a :mailheader:`Content-Transfer-Encoding` of ``8bit``. + Other than the text mode requirement, this method operates like + :meth:`BytesParser.parse`. - Optional *headersonly* is a flag specifying whether to stop parsing after - reading the headers or not. The default is ``False``, meaning it parses - the entire contents of the file. - .. method:: parsebytes(text, headersonly=False) + .. method:: parsestr(text, headersonly=False) - Similar to the :meth:`parse` method, except it takes a :term:`bytes-like - object` instead of a file-like object. Calling this method is equivalent - to wrapping *text* in a :class:`~io.BytesIO` instance first and calling - :meth:`parse`. + Similar to the :meth:`parse` method, except it takes a string object + instead of a file-like object. Calling this method on a string is + equivalent to wrapping *text* in a :class:`~io.StringIO` instance first + and calling :meth:`parse`. Optional *headersonly* is as with the :meth:`parse` method. - .. versionadded:: 3.2 + +.. class:: HeaderParser(_class=None, *, policy=policy.compat32) + + Exactly like :class:`Parser`, except that *headersonly* + defaults to ``True``. Since creating a message object structure from a string or a file object is such @@ -220,55 +233,58 @@ in the top-level :mod:`email` package namespace. .. currentmodule:: email -.. function:: message_from_string(s, _class=email.message.Message, *, \ - policy=policy.compat32) - Return a message object structure from a string. This is exactly equivalent to - ``Parser().parsestr(s)``. *_class* and *policy* are interpreted as - with the :class:`~email.parser.Parser` class constructor. +.. function:: message_from_bytes(s, _class=None, *, policy=policy.compat32) + + Return a message object structure from a :term:`bytes-like object`. This is + equivalent to ``BytesParser().parsebytes(s)``. Optional *_class* and + *strict* are interpreted as with the :class:`~email.parser.BytesParser` class + constructor. + .. versionadded:: 3.2 .. versionchanged:: 3.3 Removed the *strict* argument. Added the *policy* keyword. -.. function:: message_from_bytes(s, _class=email.message.Message, *, \ - policy=policy.compat32) - Return a message object structure from a :term:`bytes-like object`. This is exactly - equivalent to ``BytesParser().parsebytes(s)``. Optional *_class* and - *strict* are interpreted as with the :class:`~email.parser.Parser` class +.. function:: message_from_binary_file(fp, _class=None, *, + policy=policy.compat32) + + Return a message object structure tree from an open binary :term:`file + object`. This is equivalent to ``BytesParser().parse(fp)``. *_class* and + *policy* are interpreted as with the :class:`~email.parser.BytesParser` class constructor. .. versionadded:: 3.2 .. versionchanged:: 3.3 Removed the *strict* argument. Added the *policy* keyword. -.. function:: message_from_file(fp, _class=email.message.Message, *, \ - policy=policy.compat32) - Return a message object structure tree from an open :term:`file object`. - This is exactly equivalent to ``Parser().parse(fp)``. *_class* - and *policy* are interpreted as with the :class:`~email.parser.Parser` class - constructor. +.. function:: message_from_string(s, _class=None, *, policy=policy.compat32) + + Return a message object structure from a string. This is equivalent to + ``Parser().parsestr(s)``. *_class* and *policy* are interpreted as + with the :class:`~email.parser.Parser` class constructor. .. versionchanged:: 3.3 Removed the *strict* argument. Added the *policy* keyword. -.. function:: message_from_binary_file(fp, _class=email.message.Message, *, \ - policy=policy.compat32) - Return a message object structure tree from an open binary :term:`file - object`. This is exactly equivalent to ``BytesParser().parse(fp)``. - *_class* and *policy* are interpreted as with the - :class:`~email.parser.Parser` class constructor. +.. function:: message_from_file(fp, _class=None, *, policy=policy.compat32) + + Return a message object structure tree from an open :term:`file object`. + This is equivalent to ``Parser().parse(fp)``. *_class* and *policy* are + interpreted as with the :class:`~email.parser.Parser` class constructor. - .. versionadded:: 3.2 .. versionchanged:: 3.3 Removed the *strict* argument. Added the *policy* keyword. + .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``. -Here's an example of how you might use this at an interactive Python prompt:: + +Here's an example of how you might use :func:`message_from_bytes` at an +interactive Python prompt:: >>> import email - >>> msg = email.message_from_string(myString) # doctest: +SKIP + >>> msg = email.message_from_bytes(myBytes) # doctest: +SKIP Additional notes @@ -278,35 +294,27 @@ Here are some notes on the parsing semantics: * Most non-\ :mimetype:`multipart` type messages are parsed as a single message object with a string payload. These objects will return ``False`` for - :meth:`~email.message.Message.is_multipart`. Their - :meth:`~email.message.Message.get_payload` method will return a string object. + :meth:`~email.message.EmailMessage.is_multipart`, and + :meth:`~email.message.EmailMessage.iter_parts` will yield an empty list. * All :mimetype:`multipart` type messages will be parsed as a container message object with a list of sub-message objects for their payload. The outer container message will return ``True`` for - :meth:`~email.message.Message.is_multipart` and their - :meth:`~email.message.Message.get_payload` method will return the list of - :class:`~email.message.Message` subparts. + :meth:`~email.message.EmailMessage.is_multipart`, and + :meth:`~email.message.EmailMessage.iter_parts` will yield a list of subparts. -* Most messages with a content type of :mimetype:`message/\*` (e.g. - :mimetype:`message/delivery-status` and :mimetype:`message/rfc822`) will also be - parsed as container object containing a list payload of length 1. Their - :meth:`~email.message.Message.is_multipart` method will return ``True``. - The single element in the list payload will be a sub-message object. +* Most messages with a content type of :mimetype:`message/\*` (such as + :mimetype:`message/delivery-status` and :mimetype:`message/rfc822`) will also + be parsed as container object containing a list payload of length 1. Their + :meth:`~email.message.EmailMessage.is_multipart` method will return ``True``. + The single element yielded by :meth:`~email.message.EmailMessage.iter_parts` + will be a sub-message object. -* Some non-standards compliant messages may not be internally consistent about +* Some non-standards-compliant messages may not be internally consistent about their :mimetype:`multipart`\ -edness. Such messages may have a :mailheader:`Content-Type` header of type :mimetype:`multipart`, but their - :meth:`~email.message.Message.is_multipart` method may return ``False``. + :meth:`~email.message.EmailMessage.is_multipart` method may return ``False``. If such messages were parsed with the :class:`~email.parser.FeedParser`, they will have an instance of the :class:`~email.errors.MultipartInvariantViolationDefect` class in their *defects* attribute list. See :mod:`email.errors` for details. - -.. rubric:: Footnotes - -.. [#] As of email package version 3.0, introduced in Python 2.4, the classic - :class:`~email.parser.Parser` was re-implemented in terms of the - :class:`~email.parser.FeedParser`, so the semantics and results are - identical between the two parsers. - diff --git a/Doc/library/email.policy.rst b/Doc/library/email.policy.rst index 7010091..8a41877 100644 --- a/Doc/library/email.policy.rst +++ b/Doc/library/email.policy.rst @@ -18,9 +18,12 @@ described by the various email and MIME RFCs. However, the general format of email messages (a block of header fields each consisting of a name followed by a colon followed by a value, the whole block followed by a blank line and an arbitrary 'body'), is a format that has found utility outside of the realm of -email. Some of these uses conform fairly closely to the main RFCs, some do -not. And even when working with email, there are times when it is desirable to -break strict compliance with the RFCs. +email. Some of these uses conform fairly closely to the main email RFCs, some +do not. Even when working with email, there are times when it is desirable to +break strict compliance with the RFCs, such as generating emails that +interoperate with email servers that do not themselves follow the standards, or +that implement extensions you want to use in ways that violate the +standards. Policy objects give the email package the flexibility to handle all these disparate use cases. @@ -31,27 +34,40 @@ control the behavior of various components of the email package during use. email package to alter the default behavior. The settable values and their defaults are described below. -There is a default policy used by all classes in the email package. This -policy is named :class:`Compat32`, with a corresponding pre-defined instance -named :const:`compat32`. It provides for complete backward compatibility (in -some cases, including bug compatibility) with the pre-Python3.3 version of the -email package. +There is a default policy used by all classes in the email package. For all of +the :mod:`~email.parser` classes and the related convenience functions, and for +the :class:`~email.message.Message` class, this is the :class:`Compat32` +policy, via its corresponding pre-defined instance :const:`compat32`. This +policy provides for complete backward compatibility (in some cases, including +bug compatibility) with the pre-Python3.3 version of the email package. + +This default value for the *policy* keyword to +:class:`~email.message.EmailMessage` is the :class:`EmailPolicy` policy, via +its pre-defined instance :data:`~default`. + +When a :class:`~email.message.Message` or :class:`~email.message.EmailMessage` +object is created, it acquires a policy. If the message is created by a +:mod:`~email.parser`, a policy passed to the parser will be the policy used by +the message it creates. If the message is created by the program, then the +policy can be specified when it is created. When a message is passed to a +:mod:`~email.generator`, the generator uses the policy from the message by +default, but you can also pass a specific policy to the generator that will +override the one stored on the message object. + +The default value for the *policy* keyword for the :mod:`email.parser` classes +and the parser convenience functions **will be changing** in a future version of +Python. Therefore you should **always specify explicitly which policy you want +to use** when calling any of the classes and functions described in the +:mod:`~email.parser` module. The first part of this documentation covers the features of :class:`Policy`, an -:term:`abstract base class` that defines the features that are common to all +:term:`abstract base class` that defines the features that are common to all policy objects, including :const:`compat32`. This includes certain hook methods that are called internally by the email package, which a custom policy -could override to obtain different behavior. - -When a :class:`~email.message.Message` object is created, it acquires a policy. -By default this will be :const:`compat32`, but a different policy can be -specified. If the ``Message`` is created by a :mod:`~email.parser`, a policy -passed to the parser will be the policy used by the ``Message`` it creates. If -the ``Message`` is created by the program, then the policy can be specified -when it is created. When a ``Message`` is passed to a :mod:`~email.generator`, -the generator uses the policy from the ``Message`` by default, but you can also -pass a specific policy to the generator that will override the one stored on -the ``Message`` object. +could override to obtain different behavior. The second part describes the +concrete classes :class:`EmailPolicy` and :class:`Compat32`, which implement +the hooks that provide the standard behavior and the backward compatible +behavior and features, respectively. :class:`Policy` instances are immutable, but they can be cloned, accepting the same keyword arguments as the class constructor and returning a new @@ -147,6 +163,7 @@ added matters. To illustrate:: This class defines the following properties, and thus values for the following may be passed in the constructor of any policy class: + .. attribute:: max_line_length The maximum length of any line in the serialized output, not counting the @@ -154,12 +171,14 @@ added matters. To illustrate:: ``0`` or :const:`None` indicates that no line wrapping should be done at all. + .. attribute:: linesep The string to be used to terminate lines in serialized output. The default is ``\n`` because that's the internal end-of-line discipline used by Python, though ``\r\n`` is required by the RFCs. + .. attribute:: cte_type Controls the type of Content Transfer Encodings that may be or are @@ -174,8 +193,8 @@ added matters. To illustrate:: ``8bit`` data is not constrained to be 7 bit clean. Data in headers is still required to be ASCII-only and so will be encoded (see - 'binary_fold' below for an exception), but body parts may use - the ``8bit`` CTE. + :meth:`fold_binary` and :attr:`~EmailPolicy.utf8` below for + exceptions), but body parts may use the ``8bit`` CTE. ======== =============================================================== A ``cte_type`` value of ``8bit`` only works with ``BytesGenerator``, not @@ -183,6 +202,7 @@ added matters. To illustrate:: ``Generator`` is operating under a policy that specifies ``cte_type=8bit``, it will act as if ``cte_type`` is ``7bit``. + .. attribute:: raise_on_defect If :const:`True`, any defects encountered will be raised as errors. If @@ -190,7 +210,6 @@ added matters. To illustrate:: :meth:`register_defect` method. - .. attribute:: mangle_from\_ If :const:`True`, lines starting with *"From "* in the body are @@ -201,19 +220,31 @@ added matters. To illustrate:: .. versionadded:: 3.5 The *mangle_from_* parameter. + + .. attribute:: message_factory + + A factory function for constructing a new empty message object. Used + by the parser when building messages. Defaults to ``None``, in + which case :class:`~email.message.Message` is used. + + .. versionadded:: 3.6 + The following :class:`Policy` method is intended to be called by code using the email library to create policy instances with custom settings: + .. method:: clone(**kw) Return a new :class:`Policy` instance whose attributes have the same values as the current instance, except where those attributes are given new values by the keyword arguments. + The remaining :class:`Policy` methods are called by the email package code, and are not intended to be called by an application using the email package. A custom policy must implement all of these methods. + .. method:: handle_defect(obj, defect) Handle a *defect* found on *obj*. When the email package calls this @@ -224,6 +255,7 @@ added matters. To illustrate:: it is ``True``, *defect* is raised as an exception. If it is ``False`` (the default), *obj* and *defect* are passed to :meth:`register_defect`. + .. method:: register_defect(obj, defect) Register a *defect* on *obj*. In the email package, *defect* will always @@ -236,14 +268,16 @@ added matters. To illustrate:: custom ``Message`` objects) should also provide such an attribute, otherwise defects in parsed messages will raise unexpected errors. + .. method:: header_max_count(name) Return the maximum allowed number of headers named *name*. - Called when a header is added to a :class:`~email.message.Message` - object. If the returned value is not ``0`` or ``None``, and there are - already a number of headers with the name *name* equal to the value - returned, a :exc:`ValueError` is raised. + Called when a header is added to an :class:`~email.message.EmailMessage` + or :class:`~email.message.Message` object. If the returned value is not + ``0`` or ``None``, and there are already a number of headers with the + name *name* greather than or equal to the value returned, a + :exc:`ValueError` is raised. Because the default behavior of ``Message.__setitem__`` is to append the value to the list of headers, it is easy to create duplicate headers @@ -255,6 +289,7 @@ added matters. To illustrate:: The default implementation returns ``None`` for all header names. + .. method:: header_source_parse(sourcelines) The email package calls this method with a list of strings, each string @@ -274,6 +309,7 @@ added matters. To illustrate:: There is no default implementation + .. method:: header_store_parse(name, value) The email package calls this method with the name and value provided by @@ -289,6 +325,7 @@ added matters. To illustrate:: There is no default implementation + .. method:: header_fetch_parse(name, value) The email package calls this method with the *name* and *value* currently @@ -304,6 +341,7 @@ added matters. To illustrate:: There is no default implementation + .. method:: fold(name, value) The email package calls this method with the *name* and *value* currently @@ -316,6 +354,7 @@ added matters. To illustrate:: *value* may contain surrogateescaped binary data. There should be no surrogateescaped binary data in the string returned by the method. + .. method:: fold_binary(name, value) The same as :meth:`fold`, except that the returned value should be a @@ -325,73 +364,6 @@ added matters. To illustrate:: converted back into binary data in the returned bytes object. -.. class:: Compat32(**kw) - - This concrete :class:`Policy` is the backward compatibility policy. It - replicates the behavior of the email package in Python 3.2. The - :mod:`~email.policy` module also defines an instance of this class, - :const:`compat32`, that is used as the default policy. Thus the default - behavior of the email package is to maintain compatibility with Python 3.2. - - The following attributes have values that are different from the - :class:`Policy` default: - - .. attribute:: mangle_from_ - - The default is ``True``. - - The class provides the following concrete implementations of the - abstract methods of :class:`Policy`: - - .. method:: header_source_parse(sourcelines) - - The name is parsed as everything up to the '``:``' and returned - unmodified. The value is determined by stripping leading whitespace off - the remainder of the first line, joining all subsequent lines together, - and stripping any trailing carriage return or linefeed characters. - - .. method:: header_store_parse(name, value) - - The name and value are returned unmodified. - - .. method:: header_fetch_parse(name, value) - - If the value contains binary data, it is converted into a - :class:`~email.header.Header` object using the ``unknown-8bit`` charset. - Otherwise it is returned unmodified. - - .. method:: fold(name, value) - - Headers are folded using the :class:`~email.header.Header` folding - algorithm, which preserves existing line breaks in the value, and wraps - each resulting line to the ``max_line_length``. Non-ASCII binary data are - CTE encoded using the ``unknown-8bit`` charset. - - .. method:: fold_binary(name, value) - - Headers are folded using the :class:`~email.header.Header` folding - algorithm, which preserves existing line breaks in the value, and wraps - each resulting line to the ``max_line_length``. If ``cte_type`` is - ``7bit``, non-ascii binary data is CTE encoded using the ``unknown-8bit`` - charset. Otherwise the original source header is used, with its existing - line breaks and any (RFC invalid) binary data it may contain. - - -An instance of :class:`Compat32` is provided as a module constant: - -.. data:: compat32 - - An instance of :class:`Compat32`, providing backward compatibility with the - behavior of the email package in Python 3.2. - - -.. note:: - - The documentation below describes new policies that are included in the - standard library on a :term:`provisional basis `. - Backwards incompatible changes (up to and including removal of the feature) - may occur if deemed necessary by the core developers. - .. class:: EmailPolicy(**kw) @@ -404,9 +376,15 @@ An instance of :class:`Compat32` is provided as a module constant: on the type of the field. The parsing and folding algorithm fully implement :rfc:`2047` and :rfc:`5322`. + The default value for the :attr:`~email.policy.Policy.message_factory` + attribute is :class:`~email.message.EmailMessage`. + In addition to the settable attributes listed above that apply to all policies, this policy adds the following additional attributes: + .. versionadded:: 3.6 [1]_ + + .. attribute:: utf8 If ``False``, follow :rfc:`5322`, supporting non-ASCII characters in @@ -415,13 +393,14 @@ An instance of :class:`Compat32` is provided as a module constant: formatted in this way may be passed to SMTP servers that support the ``SMTPUTF8`` extension (:rfc:`6531`). + .. attribute:: refold_source If the value for a header in the ``Message`` object originated from a :mod:`~email.parser` (as opposed to being set by a program), this attribute indicates whether or not a generator should refold that value - when transforming the message back into stream form. The possible values - are: + when transforming the message back into serialized form. The possible + values are: ======== =============================================================== ``none`` all source values use original folding @@ -434,23 +413,24 @@ An instance of :class:`Compat32` is provided as a module constant: The default is ``long``. + .. attribute:: header_factory A callable that takes two arguments, ``name`` and ``value``, where ``name`` is a header field name and ``value`` is an unfolded header field value, and returns a string subclass that represents that header. A default ``header_factory`` (see :mod:`~email.headerregistry`) is provided - that understands some of the :RFC:`5322` header field types. (Currently - address fields and date fields have special treatment, while all other - fields are treated as unstructured. This list will be completed before - the extension is marked stable.) + that supports custom parsing for the various address and date :RFC:`5322` + header field types, and the major MIME header field stypes. Support for + additional custom parsing will be added in the future. + .. attribute:: content_manager An object with at least two methods: get_content and set_content. When - the :meth:`~email.message.Message.get_content` or - :meth:`~email.message.Message.set_content` method of a - :class:`~email.message.Message` object is called, it calls the + the :meth:`~email.message.EmailMessage.get_content` or + :meth:`~email.message.EmailMessage.set_content` method of an + :class:`~email.message.EmailMessage` object is called, it calls the corresponding method of this object, passing it the message object as its first argument, and any arguments or keywords that were passed to it as additional arguments. By default ``content_manager`` is set to @@ -462,16 +442,22 @@ An instance of :class:`Compat32` is provided as a module constant: The class provides the following concrete implementations of the abstract methods of :class:`Policy`: + .. method:: header_max_count(name) Returns the value of the :attr:`~email.headerregistry.BaseHeader.max_count` attribute of the specialized class used to represent the header with the given name. + .. method:: header_source_parse(sourcelines) - The implementation of this method is the same as that for the - :class:`Compat32` policy. + + The name is parsed as everything up to the '``:``' and returned + unmodified. The value is determined by stripping leading whitespace off + the remainder of the first line, joining all subsequent lines together, + and stripping any trailing carriage return or linefeed characters. + .. method:: header_store_parse(name, value) @@ -482,6 +468,7 @@ An instance of :class:`Compat32` is provided as a module constant: the value. In this case a ``ValueError`` is raised if the input value contains CR or LF characters. + .. method:: header_fetch_parse(name, value) If the value has a ``name`` attribute, it is returned to unmodified. @@ -490,6 +477,7 @@ An instance of :class:`Compat32` is provided as a module constant: header object is returned. Any surrogateescaped bytes get turned into the unicode unknown-character glyph. + .. method:: fold(name, value) Header folding is controlled by the :attr:`refold_source` policy setting. @@ -508,6 +496,7 @@ An instance of :class:`Compat32` is provided as a module constant: regardless of the ``refold_source`` setting, which causes the binary data to be CTE encoded using the ``unknown-8bit`` charset. + .. method:: fold_binary(name, value) The same as :meth:`fold` if :attr:`~Policy.cte_type` is ``7bit``, except @@ -519,36 +508,42 @@ An instance of :class:`Compat32` is provided as a module constant: ``refold_header`` setting, since there is no way to know whether the binary data consists of single byte characters or multibyte characters. + The following instances of :class:`EmailPolicy` provide defaults suitable for specific application domains. Note that in the future the behavior of these instances (in particular the ``HTTP`` instance) may be adjusted to conform even more closely to the RFCs relevant to their domains. + .. data:: default An instance of ``EmailPolicy`` with all defaults unchanged. This policy uses the standard Python ``\n`` line endings rather than the RFC-correct ``\r\n``. + .. data:: SMTP Suitable for serializing messages in conformance with the email RFCs. Like ``default``, but with ``linesep`` set to ``\r\n``, which is RFC compliant. + .. data:: SMTPUTF8 The same as ``SMTP`` except that :attr:`~EmailPolicy.utf8` is ``True``. Useful for serializing messages to a message store without using encoded - words in the headers. Should only be used for SMTP transmission if the + words in the headers. Should only be used for SMTP trasmission if the sender or recipient addresses have non-ASCII characters (the :meth:`smtplib.SMTP.send_message` method handles this automatically). + .. data:: HTTP Suitable for serializing headers with for use in HTTP traffic. Like ``SMTP`` except that ``max_line_length`` is set to ``None`` (unlimited). + .. data:: strict Convenience instance. The same as ``default`` except that @@ -557,6 +552,7 @@ more closely to the RFCs relevant to their domains. somepolicy + policy.strict + With all of these :class:`EmailPolicies <.EmailPolicy>`, the effective API of the email package is changed from the Python 3.2 API in the following ways: @@ -573,7 +569,7 @@ the email package is changed from the Python 3.2 API in the following ways: and allowed. From the application view, this means that any header obtained through the -:class:`~email.message.Message` is a header object with extra +:class:`~email.message.EmailMessage` is a header object with extra attributes, whose string value is the fully decoded unicode value of the header. Likewise, a header may be assigned a new value, or a new header created, using a unicode string, and the policy will take care of converting @@ -581,3 +577,75 @@ the unicode string into the correct RFC encoded form. The header objects and their attributes are described in :mod:`~email.headerregistry`. + + + +.. class:: Compat32(**kw) + + This concrete :class:`Policy` is the backward compatibility policy. It + replicates the behavior of the email package in Python 3.2. The + :mod:`~email.policy` module also defines an instance of this class, + :const:`compat32`, that is used as the default policy. Thus the default + behavior of the email package is to maintain compatibility with Python 3.2. + + The following attributes have values that are different from the + :class:`Policy` default: + + + .. attribute:: mangle_from_ + + The default is ``True``. + + + The class provides the following concrete implementations of the + abstract methods of :class:`Policy`: + + + .. method:: header_source_parse(sourcelines) + + The name is parsed as everything up to the '``:``' and returned + unmodified. The value is determined by stripping leading whitespace off + the remainder of the first line, joining all subsequent lines together, + and stripping any trailing carriage return or linefeed characters. + + + .. method:: header_store_parse(name, value) + + The name and value are returned unmodified. + + + .. method:: header_fetch_parse(name, value) + + If the value contains binary data, it is converted into a + :class:`~email.header.Header` object using the ``unknown-8bit`` charset. + Otherwise it is returned unmodified. + + + .. method:: fold(name, value) + + Headers are folded using the :class:`~email.header.Header` folding + algorithm, which preserves existing line breaks in the value, and wraps + each resulting line to the ``max_line_length``. Non-ASCII binary data are + CTE encoded using the ``unknown-8bit`` charset. + + + .. method:: fold_binary(name, value) + + Headers are folded using the :class:`~email.header.Header` folding + algorithm, which preserves existing line breaks in the value, and wraps + each resulting line to the ``max_line_length``. If ``cte_type`` is + ``7bit``, non-ascii binary data is CTE encoded using the ``unknown-8bit`` + charset. Otherwise the original source header is used, with its existing + line breaks and any (RFC invalid) binary data it may contain. + + +.. data:: compat32 + + An instance of :class:`Compat32`, providing backward compatibility with the + behavior of the email package in Python 3.2. + + +.. rubric:: Footnotes + +.. [1] Oringally added in 3.3 as a :term:`provisional feature `. diff --git a/Doc/library/email.rst b/Doc/library/email.rst index e8bb02b..c4187dd 100644 --- a/Doc/library/email.rst +++ b/Doc/library/email.rst @@ -3,50 +3,104 @@ .. module:: email :synopsis: Package supporting the parsing, manipulating, and generating - email messages, including MIME documents. - -.. moduleauthor:: Barry A. Warsaw -.. sectionauthor:: Barry A. Warsaw -.. Copyright (C) 2001-2010 Python Software Foundation + email messages. +.. moduleauthor:: Barry A. Warsaw , + R. David Murray +.. sectionauthor:: R. David Murray **Source code:** :source:`Lib/email/__init__.py` -------------- -The :mod:`email` package is a library for managing email messages, including -MIME and other :rfc:`2822`\ -based message documents. It is specifically *not* -designed to do any sending of email messages to SMTP (:rfc:`2821`), NNTP, or -other servers; those are functions of modules such as :mod:`smtplib` and -:mod:`nntplib`. The :mod:`email` package attempts to be as RFC-compliant as -possible, supporting in addition to :rfc:`2822`, such MIME-related RFCs as -:rfc:`2045`, :rfc:`2046`, :rfc:`2047`, and :rfc:`2231`. - -The primary distinguishing feature of the :mod:`email` package is that it splits -the parsing and generating of email messages from the internal *object model* -representation of email. Applications using the :mod:`email` package deal -primarily with objects; you can add sub-objects to messages, remove sub-objects -from messages, completely re-arrange the contents, etc. There is a separate -parser and a separate generator which handles the transformation from flat text -to the object model, and then back to flat text again. There are also handy -subclasses for some common MIME object types, and a few miscellaneous utilities -that help with such common tasks as extracting and parsing message field values, -creating RFC-compliant dates, etc. +The :mod:`email` package is a library for managing email messages. It is +specifically *not* designed to do any sending of email messages to SMTP +(:rfc:`2821`), NNTP, or other servers; those are functions of modules such as +:mod:`smtplib` and :mod:`nntplib`. The :mod:`email` package attempts to be as +RFC-compliant as possible, supporting :rfc:`5233` and :rfc:`6532`, as well as +such MIME-related RFCs as :rfc:`2045`, :rfc:`2046`, :rfc:`2047`, :rfc:`2183`, +and :rfc:`2231`. + +The overall structure of the email package can be divided into three major +components, plus a fourth component that controls the behavior of the other +components. + +The central component of the package is an "object model" that represents email +messages. An application interacts with the package primarily through the +object model interface defined in the :mod:`~email.message` sub-module. The +application can use this API to ask questions about an existing email, to +construct a new email, or to add or remove email subcomponents that themselves +use the same object model interface. That is, following the nature of email +messages and their MIME subcomponents, the email object model is a tree +structure of objects that all provide the :class:`~email.message.EmailMessage` +API. + +The other two major components of the package are the :mod:`~email.parser` and +the :mod:`~email.generator`. The parser takes the serialized version of an +email message (a stream of bytes) and converts it into a tree of +:class:`~email.message.EmailMessage` objects. The generator takes an +:class:`~email.message.EmailMessage` and turns it back into a serialized byte +stream. (The parser and generator also handle streams of text characters, but +this usage is discouraged as it is too easy to end up with messages that are +not valid in one way or another.) + +The control component is the :mod:`~email.policy` module. Every +:class:`~email.message.EmailMessage`, every :mod:`~email.generator`, and every +:mod:`~email.parser` has an associated :mod:`~email.policy` object that +controls its behavior. Usually an application only needs to specify the policy +when an :class:`~email.message.EmailMessage` is created, either by directly +instantiating an :class:`~email.message.EmailMessage` to create a new email, +or by parsing an input stream using a :mod:`~email.parser`. But the policy can +be changed when the message is serialized using a :mod:`~email.generator`. +This allows, for example, a generic email message to be parsed from disk, but +to serialize it using standard SMTP settings when sending it to an email +server. + +The email package does its best to hide the details of the various governing +RFCs from the application. Conceptually the application should be able to +treat the email message as a structured tree of unicode text and binary +attachments, without having to worry about how these are represented when +serialized. In practice, however, it is often necessary to be aware of at +least some of the rules governing MIME messages and their structure, +specifically the names and nature of the MIME "content types" and how they +identify multipart documents. For the most part this knowledge should only be +required for more complex applications, and even then it should only be the +high level structure in question, and not the details of how those structures +are represented. Since MIME content types are used widely in modern internet +software (not just email), this will be a familiar concept to many programmers. The following sections describe the functionality of the :mod:`email` package. -The ordering follows a progression that should be common in applications: an -email message is read as flat text from a file or other source, the text is -parsed to produce the object structure of the email message, this structure is -manipulated, and finally, the object tree is rendered back into flat text. - -It is perfectly feasible to create the object structure out of whole cloth --- -i.e. completely from scratch. From there, a similar progression can be taken as -above. - -Also included are detailed specifications of all the classes and modules that -the :mod:`email` package provides, the exception classes you might encounter -while using the :mod:`email` package, some auxiliary utilities, and a few -examples. For users of the older :mod:`mimelib` package, or previous versions -of the :mod:`email` package, a section on differences and porting is provided. +We start with the :mod:`~email.message` object model, which is the primary +interface an application will use, and follow that with the +:mod:`~email.parser` and :mod:`~email.generator` components. Then we cover the +:mod:`~email.policy` controls, which completes the treatment of the main +components of the library. + +The next three sections cover the exceptions the package may raise and the +defects (non-compliance with the RFCs) that the :mod:`~email.parser` may +detect. Then we cover the :mod:`~email.headerregistry` and the +:mod:`~email.contentmanager` sub-components, which provide tools for doing more +detailed manipulation of headers and payloads, respectively. Both of these +components contain features relevant to consuming and producing non-trivial +messages, but also document their extensibility APIs, which will be of interest +to advanced applications. + +Following those is a set of examples of using the fundamental parts of the APIs +covered in the preceding sections. + +The forgoing represent the modern (unicode friendly) API of the email package. +The remaining sections, starting with the :class:`~email.message.Message` +class, cover the legacy :data:`~email.policy.compat32` API that deals much more +directly with the details of how email messages are represented. The +:data:`~email.policy.compat32` API does *not* hide the details of the RFCs from +the application, but for applications that need to operate at that level, they +can be useful tools. This documentation is also relevant for applications that +are still using the :mod:`~email.policy.compat32` API for backward +compatibility reasons. + +.. versionchanged:: 3.6 + Docs reorganized and rewritten to promote the new + :class:`~email.message.EmailMessage`/:class:`~email.policy.EmailPolicy` + API. Contents of the :mod:`email` package documentation: @@ -56,335 +110,43 @@ Contents of the :mod:`email` package documentation: email.parser.rst email.generator.rst email.policy.rst + + email.errors.rst email.headerregistry.rst email.contentmanager.rst + + email.examples.rst + +Legacy API: + +.. toctree:: + + email.compat32-message.rst email.mime.rst email.header.rst email.charset.rst email.encoders.rst - email.errors.rst email.util.rst email.iterators.rst - email-examples.rst .. seealso:: Module :mod:`smtplib` - SMTP protocol client - - Module :mod:`nntplib` - NNTP protocol client - - -.. _email-pkg-history: - -Package History ---------------- - -This table describes the release history of the email package, corresponding to -the version of Python that the package was released with. For purposes of this -document, when you see a note about change or added versions, these refer to the -Python version the change was made in, *not* the email package version. This -table also describes the Python compatibility of each version of the package. - -+---------------+------------------------------+-----------------------+ -| email version | distributed with | compatible with | -+===============+==============================+=======================+ -| :const:`1.x` | Python 2.2.0 to Python 2.2.1 | *no longer supported* | -+---------------+------------------------------+-----------------------+ -| :const:`2.5` | Python 2.2.2+ and Python 2.3 | Python 2.1 to 2.5 | -+---------------+------------------------------+-----------------------+ -| :const:`3.0` | Python 2.4 and Python 2.5 | Python 2.3 to 2.6 | -+---------------+------------------------------+-----------------------+ -| :const:`4.0` | Python 2.5 to Python 2.7 | Python 2.3 to 2.7 | -+---------------+------------------------------+-----------------------+ -| :const:`5.0` | Python 3.0 and Python 3.1 | Python 3.0 to 3.2 | -+---------------+------------------------------+-----------------------+ -| :const:`5.1` | Python 3.2 | Python 3.2 | -+---------------+------------------------------+-----------------------+ - -After Version 5.1 (Python 3.2), the email package no longer has a version that -is separate from the Python version. (See the :ref:`whatsnew-index` documents -for the respective Python versions for details on changes.) - -Here are the major differences between :mod:`email` version 5.1 and -version 5.0: - -* It is once again possible to parse messages containing non-ASCII bytes, - and to reproduce such messages if the data containing the non-ASCII - bytes is not modified. - -* New functions :func:`message_from_bytes` and :func:`message_from_binary_file`, - and new classes :class:`~email.parser.BytesFeedParser` and - :class:`~email.parser.BytesParser` allow binary message data to be parsed - into model objects. - -* Given bytes input to the model, :meth:`~email.message.Message.get_payload` - will by default decode a message body that has a - :mailheader:`Content-Transfer-Encoding` of ``8bit`` using the charset - specified in the MIME headers and return the resulting string. - -* Given bytes input to the model, :class:`~email.generator.Generator` will - convert message bodies that have a :mailheader:`Content-Transfer-Encoding` of - 8bit to instead have a 7bit Content-Transfer-Encoding. - -* New class :class:`~email.generator.BytesGenerator` produces bytes - as output, preserving any unchanged non-ASCII data that was - present in the input used to build the model, including message bodies - with a :mailheader:`Content-Transfer-Encoding` of 8bit. - -Here are the major differences between :mod:`email` version 5.0 and version 4: - -* All operations are on unicode strings. Text inputs must be strings, - text outputs are strings. Outputs are limited to the ASCII character - set and so can be encoded to ASCII for transmission. Inputs are also - limited to ASCII; this is an acknowledged limitation of email 5.0 and - means it can only be used to parse email that is 7bit clean. - -Here are the major differences between :mod:`email` version 4 and version 3: - -* All modules have been renamed according to :pep:`8` standards. For example, - the version 3 module :mod:`email.Message` was renamed to :mod:`email.message` in - version 4. - -* A new subpackage :mod:`email.mime` was added and all the version 3 - :mod:`email.MIME\*` modules were renamed and situated into the :mod:`email.mime` - subpackage. For example, the version 3 module :mod:`email.MIMEText` was renamed - to :mod:`email.mime.text`. - - *Note that the version 3 names will continue to work until Python 2.6*. - -* The :mod:`email.mime.application` module was added, which contains the - :class:`~email.mime.application.MIMEApplication` class. - -* Methods that were deprecated in version 3 have been removed. These include - :meth:`Generator.__call__`, :meth:`Message.get_type`, - :meth:`Message.get_main_type`, :meth:`Message.get_subtype`. - -* Fixes have been added for :rfc:`2231` support which can change some of the - return types for :func:`Message.get_param ` - and friends. Under some - circumstances, values which used to return a 3-tuple now return simple strings - (specifically, if all extended parameter segments were unencoded, there is no - language and charset designation expected, so the return type is now a simple - string). Also, %-decoding used to be done for both encoded and unencoded - segments; this decoding is now done only for encoded segments. - -Here are the major differences between :mod:`email` version 3 and version 2: - -* The :class:`~email.parser.FeedParser` class was introduced, and the - :class:`~email.parser.Parser` class was implemented in terms of the - :class:`~email.parser.FeedParser`. All parsing therefore is - non-strict, and parsing will make a best effort never to raise an exception. - Problems found while parsing messages are stored in the message's *defect* - attribute. - -* All aspects of the API which raised :exc:`DeprecationWarning`\ s in version 2 - have been removed. These include the *_encoder* argument to the - :class:`~email.mime.text.MIMEText` constructor, the - :meth:`Message.add_payload` method, the :func:`Utils.dump_address_pair` - function, and the functions :func:`Utils.decode` and :func:`Utils.encode`. - -* New :exc:`DeprecationWarning`\ s have been added to: - :meth:`Generator.__call__`, :meth:`Message.get_type`, - :meth:`Message.get_main_type`, :meth:`Message.get_subtype`, and the *strict* - argument to the :class:`~email.parser.Parser` class. These are expected to - be removed in future versions. - -* Support for Pythons earlier than 2.3 has been removed. - -Here are the differences between :mod:`email` version 2 and version 1: - -* The :mod:`email.Header` and :mod:`email.Charset` modules have been added. - -* The pickle format for :class:`~email.message.Message` instances has changed. - Since this was never (and still isn't) formally defined, this isn't - considered a backward incompatibility. However if your application pickles - and unpickles :class:`~email.message.Message` instances, be aware that in - :mod:`email` version 2, :class:`~email.message.Message` instances now have - private variables *_charset* and *_default_type*. - -* Several methods in the :class:`~email.message.Message` class have been - deprecated, or their signatures changed. Also, many new methods have been - added. See the documentation for the :class:`~email.message.Message` class - for details. The changes should be completely backward compatible. + SMTP (Simple Mail Transport Protcol) client -* The object structure has changed in the face of :mimetype:`message/rfc822` - content types. In :mod:`email` version 1, such a type would be represented - by a scalar payload, i.e. the container message's - :meth:`~email.message.Message.is_multipart` returned false, - :meth:`~email.message.Message.get_payload` was not a list object, but a - single :class:`~email.message.Message` instance. + Module :mod:`poplib` + POP (Post Office Protocol) client - This structure was inconsistent with the rest of the package, so the object - representation for :mimetype:`message/rfc822` content types was changed. In - :mod:`email` version 2, the container *does* return ``True`` from - :meth:`~email.message.Message.is_multipart`, and - :meth:`~email.message.Message.get_payload` returns a list containing a single - :class:`~email.message.Message` item. + Module :mod:`imaplib` + IMAP (Internet Message Access Protocol) client - Note that this is one place that backward compatibility could not be - completely maintained. However, if you're already testing the return type of - :meth:`~email.message.Message.get_payload`, you should be fine. You just need - to make sure your code doesn't do a :meth:`~email.message.Message.set_payload` - with a :class:`~email.message.Message` instance on a container with a content - type of :mimetype:`message/rfc822`. - -* The :class:`~email.parser.Parser` constructor's *strict* argument was added, - and its :meth:`~email.parser.Parser.parse` and - :meth:`~email.parser.Parser.parsestr` methods grew a *headersonly* argument. - The *strict* flag was also added to functions :func:`email.message_from_file` - and :func:`email.message_from_string`. - -* :meth:`Generator.__call__` is deprecated; use :meth:`Generator.flatten - ` instead. The - :class:`~email.generator.Generator` class has also grown the - :meth:`~email.generator.Generator.clone` method. - -* The :class:`~email.generator.DecodedGenerator` class in the - :mod:`email.generator` module was added. - -* The intermediate base classes - :class:`~email.mime.nonmultipart.MIMENonMultipart` and - :class:`~email.mime.multipart.MIMEMultipart` have been added, and interposed - in the class hierarchy for most of the other MIME-related derived classes. - -* The *_encoder* argument to the :class:`~email.mime.text.MIMEText` constructor - has been deprecated. Encoding now happens implicitly based on the - *_charset* argument. - -* The following functions in the :mod:`email.Utils` module have been deprecated: - :func:`dump_address_pairs`, :func:`decode`, and :func:`encode`. The following - functions have been added to the module: :func:`make_msgid`, - :func:`decode_rfc2231`, :func:`encode_rfc2231`, and :func:`decode_params`. - -* The non-public function :func:`email.Iterators._structure` was added. - - -Differences from :mod:`mimelib` -------------------------------- - -The :mod:`email` package was originally prototyped as a separate library called -`mimelib `_. Changes have been made so that method names -are more consistent, and some methods or modules have either been added or -removed. The semantics of some of the methods have also changed. For the most -part, any functionality available in :mod:`mimelib` is still available in the -:mod:`email` package, albeit often in a different way. Backward compatibility -between the :mod:`mimelib` package and the :mod:`email` package was not a -priority. - -Here is a brief description of the differences between the :mod:`mimelib` and -the :mod:`email` packages, along with hints on how to port your applications. - -Of course, the most visible difference between the two packages is that the -package name has been changed to :mod:`email`. In addition, the top-level -package has the following differences: - -* :func:`messageFromString` has been renamed to :func:`message_from_string`. - -* :func:`messageFromFile` has been renamed to :func:`message_from_file`. - -The :class:`~email.message.Message` class has the following differences: - -* The method :meth:`asString` was renamed to - :meth:`~email.message.Message.as_string`. - -* The method :meth:`ismultipart` was renamed to - :meth:`~email.message.Message.is_multipart`. - -* The :meth:`~email.message.Message.get_payload` method has grown a *decode* - optional argument. - -* The method :meth:`getall` was renamed to - :meth:`~email.message.Message.get_all`. - -* The method :meth:`addheader` was renamed to - :meth:`~email.message.Message.add_header`. - -* The method :meth:`gettype` was renamed to :meth:`get_type`. - -* The method :meth:`getmaintype` was renamed to :meth:`get_main_type`. - -* The method :meth:`getsubtype` was renamed to :meth:`get_subtype`. - -* The method :meth:`getparams` was renamed to - :meth:`~email.message.Message.get_params`. Also, whereas :meth:`getparams` - returned a list of strings, :meth:`~email.message.Message.get_params` returns - a list of 2-tuples, effectively the key/value pairs of the parameters, split - on the ``'='`` sign. - -* The method :meth:`getparam` was renamed to - :meth:`~email.message.Message.get_param`. - -* The method :meth:`getcharsets` was renamed to - :meth:`~email.message.Message.get_charsets`. - -* The method :meth:`getfilename` was renamed to - :meth:`~email.message.Message.get_filename`. - -* The method :meth:`getboundary` was renamed to - :meth:`~email.message.Message.get_boundary`. - -* The method :meth:`setboundary` was renamed to - :meth:`~email.message.Message.set_boundary`. - -* The method :meth:`getdecodedpayload` was removed. To get similar - functionality, pass the value 1 to the *decode* flag of the - :meth:`~email.message.Message.get_payload` method. - -* The method :meth:`getpayloadastext` was removed. Similar functionality is - supported by the :class:`~email.generator.DecodedGenerator` class in the - :mod:`email.generator` module. - -* The method :meth:`getbodyastext` was removed. You can get similar - functionality by creating an iterator with - :func:`~email.iterators.typed_subpart_iterator` in the :mod:`email.iterators` - module. - -The :class:`~email.parser.Parser` class has no differences in its public -interface. It does have some additional smarts to recognize -:mimetype:`message/delivery-status` type messages, which it represents as a -:class:`~email.message.Message` instance containing separate -:class:`~email.message.Message` subparts for each header block in the delivery -status notification [#]_. - -The :class:`~email.generator.Generator` class has no differences in its public -interface. There is a new class in the :mod:`email.generator` module though, -called :class:`~email.generator.DecodedGenerator` which provides most of the -functionality previously available in the :meth:`Message.getpayloadastext` -method. - -The following modules and classes have been changed: - -* The :class:`~email.mime.base.MIMEBase` class constructor arguments *_major* - and *_minor* have changed to *_maintype* and *_subtype* respectively. - -* The ``Image`` class/module has been renamed to ``MIMEImage``. The *_minor* - argument has been renamed to *_subtype*. - -* The ``Text`` class/module has been renamed to ``MIMEText``. The *_minor* - argument has been renamed to *_subtype*. - -* The ``MessageRFC822`` class/module has been renamed to ``MIMEMessage``. Note - that an earlier version of :mod:`mimelib` called this class/module ``RFC822``, - but that clashed with the Python standard library module :mod:`rfc822` on some - case-insensitive file systems. - - Also, the :class:`~email.mime.message.MIMEMessage` class now represents any - kind of MIME message - with main type :mimetype:`message`. It takes an optional argument *_subtype* - which is used to set the MIME subtype. *_subtype* defaults to - :mimetype:`rfc822`. - -:mod:`mimelib` provided some utility functions in its :mod:`address` and -:mod:`date` modules. All of these functions have been moved to the -:mod:`email.utils` module. - -The ``MsgReader`` class/module has been removed. Its functionality is most -closely supported in the :func:`~email.iterators.body_line_iterator` function -in the :mod:`email.iterators` module. + Module :mod:`nntplib` + NNTP (Net News Transport Protocol) client -.. rubric:: Footnotes + Module :mod:`mailbox` + Tools for creating, reading, and managing collections of messages on disk + using a variety standard formats. -.. [#] Delivery Status Notifications (DSN) are defined in :rfc:`1894`. + Module :mod:`smtpd` + SMTP server framework (primarily useful for testing) diff --git a/Doc/library/email.util.rst b/Doc/library/email.util.rst index 5cff746..63fae2a 100644 --- a/Doc/library/email.util.rst +++ b/Doc/library/email.util.rst @@ -8,7 +8,43 @@ -------------- -There are several useful utilities provided in the :mod:`email.utils` module: +There are a couple of useful utilities provided in the :mod:`email.utils` +module: + +.. function:: localtime(dt=None) + + Return local time as an aware datetime object. If called without + arguments, return current time. Otherwise *dt* argument should be a + :class:`~datetime.datetime` instance, and it is converted to the local time + zone according to the system time zone database. If *dt* is naive (that + is, ``dt.tzinfo`` is ``None``), it is assumed to be in local time. In this + case, a positive or zero value for *isdst* causes ``localtime`` to presume + initially that summer time (for example, Daylight Saving Time) is or is not + (respectively) in effect for the specified time. A negative value for + *isdst* causes the ``localtime`` to attempt to divine whether summer time + is in effect for the specified time. + + .. versionadded:: 3.3 + + +.. function:: make_msgid(idstring=None, domain=None) + + Returns a string suitable for an :rfc:`2822`\ -compliant + :mailheader:`Message-ID` header. Optional *idstring* if given, is a string + used to strengthen the uniqueness of the message id. Optional *domain* if + given provides the portion of the msgid after the '@'. The default is the + local hostname. It is not normally necessary to override this default, but + may be useful certain cases, such as a constructing distributed system that + uses a consistent domain name across multiple hosts. + + .. versionchanged:: 3.2 + Added the *domain* keyword. + + +The remaining functions are part of the legacy (``Compat32``) email API. There +is no need to directly use these with the new API, since the parsing and +formatting they provide is done automatically by the header parsing machinery +of the new API. .. function:: quote(str) @@ -141,36 +177,6 @@ There are several useful utilities provided in the :mod:`email.utils` module: .. versionadded:: 3.3 -.. function:: localtime(dt=None) - - Return local time as an aware datetime object. If called without - arguments, return current time. Otherwise *dt* argument should be a - :class:`~datetime.datetime` instance, and it is converted to the local time - zone according to the system time zone database. If *dt* is naive (that - is, ``dt.tzinfo`` is ``None``), it is assumed to be in local time. In this - case, a positive or zero value for *isdst* causes ``localtime`` to presume - initially that summer time (for example, Daylight Saving Time) is or is not - (respectively) in effect for the specified time. A negative value for - *isdst* causes the ``localtime`` to attempt to divine whether summer time - is in effect for the specified time. - - .. versionadded:: 3.3 - - -.. function:: make_msgid(idstring=None, domain=None) - - Returns a string suitable for an :rfc:`2822`\ -compliant - :mailheader:`Message-ID` header. Optional *idstring* if given, is a string - used to strengthen the uniqueness of the message id. Optional *domain* if - given provides the portion of the msgid after the '@'. The default is the - local hostname. It is not normally necessary to override this default, but - may be useful certain cases, such as a constructing distributed system that - uses a consistent domain name across multiple hosts. - - .. versionchanged:: 3.2 - Added the *domain* keyword. - - .. function:: decode_rfc2231(s) Decode the string *s* according to :rfc:`2231`. diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index a3d5afc..ddcc286 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -23,9 +23,10 @@ by identity, and the enumeration itself can be iterated over. Module Contents --------------- -This module defines two enumeration classes that can be used to define unique -sets of names and values: :class:`Enum` and :class:`IntEnum`. It also defines -one decorator, :func:`unique`. +This module defines four enumeration classes that can be used to define unique +sets of names and values: :class:`Enum`, :class:`IntEnum`, and +:class:`IntFlags`. It also defines one decorator, :func:`unique`, and one +helper, :class:`auto`. .. class:: Enum @@ -37,10 +38,27 @@ one decorator, :func:`unique`. Base class for creating enumerated constants that are also subclasses of :class:`int`. +.. class:: IntFlag + + Base class for creating enumerated constants that can be combined using + the bitwise operators without losing their :class:`IntFlag` membership. + :class:`IntFlag` members are also subclasses of :class:`int`. + +.. class:: Flag + + Base class for creating enumerated constants that can be combined using + the bitwise operations without losing their :class:`Flag` membership. + .. function:: unique Enum class decorator that ensures only one name is bound to any one value. +.. class:: auto + + Instances are replaced with an appropriate value for Enum members. + +.. versionadded:: 3.6 ``Flag``, ``IntFlag``, ``auto`` + Creating an Enum ---------------- @@ -52,18 +70,25 @@ follows:: >>> from enum import Enum >>> class Color(Enum): - ... red = 1 - ... green = 2 - ... blue = 3 + ... RED = 1 + ... GREEN = 2 + ... BLUE = 3 ... +.. note:: Enum member values + + Member values can be anything: :class:`int`, :class:`str`, etc.. If + the exact value is unimportant you may use :class:`auto` instances and an + appropriate value will be chosen for you. Care must be taken if you mix + :class:`auto` with other values. + .. note:: Nomenclature - The class :class:`Color` is an *enumeration* (or *enum*) - - The attributes :attr:`Color.red`, :attr:`Color.green`, etc., are - *enumeration members* (or *enum members*). + - The attributes :attr:`Color.RED`, :attr:`Color.GREEN`, etc., are + *enumeration members* (or *enum members*) and are functionally constants. - The enum members have *names* and *values* (the name of - :attr:`Color.red` is ``red``, the value of :attr:`Color.blue` is + :attr:`Color.RED` is ``RED``, the value of :attr:`Color.BLUE` is ``3``, etc.) .. note:: @@ -74,49 +99,49 @@ follows:: Enumeration members have human readable string representations:: - >>> print(Color.red) - Color.red + >>> print(Color.RED) + Color.RED ...while their ``repr`` has more information:: - >>> print(repr(Color.red)) - + >>> print(repr(Color.RED)) + The *type* of an enumeration member is the enumeration it belongs to:: - >>> type(Color.red) + >>> type(Color.RED) - >>> isinstance(Color.green, Color) + >>> isinstance(Color.GREEN, Color) True >>> Enum members also have a property that contains just their item name:: - >>> print(Color.red.name) - red + >>> print(Color.RED.name) + RED Enumerations support iteration, in definition order:: >>> class Shake(Enum): - ... vanilla = 7 - ... chocolate = 4 - ... cookies = 9 - ... mint = 3 + ... VANILLA = 7 + ... CHOCOLATE = 4 + ... COOKIES = 9 + ... MINT = 3 ... >>> for shake in Shake: ... print(shake) ... - Shake.vanilla - Shake.chocolate - Shake.cookies - Shake.mint + Shake.VANILLA + Shake.CHOCOLATE + Shake.COOKIES + Shake.MINT Enumeration members are hashable, so they can be used in dictionaries and sets:: >>> apples = {} - >>> apples[Color.red] = 'red delicious' - >>> apples[Color.green] = 'granny smith' - >>> apples == {Color.red: 'red delicious', Color.green: 'granny smith'} + >>> apples[Color.RED] = 'red delicious' + >>> apples[Color.GREEN] = 'granny smith' + >>> apples == {Color.RED: 'red delicious', Color.GREEN: 'granny smith'} True @@ -124,26 +149,26 @@ Programmatic access to enumeration members and their attributes --------------------------------------------------------------- Sometimes it's useful to access members in enumerations programmatically (i.e. -situations where ``Color.red`` won't do because the exact color is not known +situations where ``Color.RED`` won't do because the exact color is not known at program-writing time). ``Enum`` allows such access:: >>> Color(1) - + >>> Color(3) - + If you want to access enum members by *name*, use item access:: - >>> Color['red'] - - >>> Color['green'] - + >>> Color['RED'] + + >>> Color['GREEN'] + If you have an enum member and need its :attr:`name` or :attr:`value`:: - >>> member = Color.red + >>> member = Color.RED >>> member.name - 'red' + 'RED' >>> member.value 1 @@ -154,12 +179,12 @@ Duplicating enum members and values Having two enum members with the same name is invalid:: >>> class Shape(Enum): - ... square = 2 - ... square = 3 + ... SQUARE = 2 + ... SQUARE = 3 ... Traceback (most recent call last): ... - TypeError: Attempted to reuse key: 'square' + TypeError: Attempted to reuse key: 'SQUARE' However, two enum members are allowed to have the same value. Given two members A and B with the same value (and A defined first), B is an alias to A. By-value @@ -167,17 +192,17 @@ lookup of the value of A and B will return A. By-name lookup of B will also return A:: >>> class Shape(Enum): - ... square = 2 - ... diamond = 1 - ... circle = 3 - ... alias_for_square = 2 - ... - >>> Shape.square - - >>> Shape.alias_for_square - + ... SQUARE = 2 + ... DIAMOND = 1 + ... CIRCLE = 3 + ... ALIAS_FOR_SQUARE = 2 + ... + >>> Shape.SQUARE + + >>> Shape.ALIAS_FOR_SQUARE + >>> Shape(2) - + .. note:: @@ -202,15 +227,51 @@ found :exc:`ValueError` is raised with the details:: >>> from enum import Enum, unique >>> @unique ... class Mistake(Enum): - ... one = 1 - ... two = 2 - ... three = 3 - ... four = 3 + ... ONE = 1 + ... TWO = 2 + ... THREE = 3 + ... FOUR = 3 ... Traceback (most recent call last): ... - ValueError: duplicate values found in : four -> three + ValueError: duplicate values found in : FOUR -> THREE + + +Using automatic values +---------------------- + +If the exact value is unimportant you can use :class:`auto`:: + + >>> from enum import Enum, auto + >>> class Color(Enum): + ... RED = auto() + ... BLUE = auto() + ... GREEN = auto() + ... + >>> list(Color) + [, , ] + +The values are chosen by :func:`_generate_next_value_`, which can be +overridden:: + + >>> class AutoName(Enum): + ... def _generate_next_value_(name, start, count, last_values): + ... return name + ... + >>> class Ordinal(AutoName): + ... NORTH = auto() + ... SOUTH = auto() + ... EAST = auto() + ... WEST = auto() + ... + >>> list(Ordinal) + [, , , ] + +.. note:: + The goal of the default :meth:`_generate_next_value_` methods is to provide + the next :class:`int` in sequence with the last :class:`int` provided, but + the way it does this is an implementation detail and may change. Iteration --------- @@ -218,7 +279,7 @@ Iteration Iterating over the members of an enum does not provide the aliases:: >>> list(Shape) - [, , ] + [, , ] The special attribute ``__members__`` is an ordered dictionary mapping names to members. It includes all names defined in the enumeration, including the @@ -227,16 +288,16 @@ aliases:: >>> for name, member in Shape.__members__.items(): ... name, member ... - ('square', ) - ('diamond', ) - ('circle', ) - ('alias_for_square', ) + ('SQUARE', ) + ('DIAMOND', ) + ('CIRCLE', ) + ('ALIAS_FOR_SQUARE', ) The ``__members__`` attribute can be used for detailed programmatic access to the enumeration members. For example, finding all the aliases:: >>> [name for name, member in Shape.__members__.items() if member.name != name] - ['alias_for_square'] + ['ALIAS_FOR_SQUARE'] Comparisons @@ -244,35 +305,35 @@ Comparisons Enumeration members are compared by identity:: - >>> Color.red is Color.red + >>> Color.RED is Color.RED True - >>> Color.red is Color.blue + >>> Color.RED is Color.BLUE False - >>> Color.red is not Color.blue + >>> Color.RED is not Color.BLUE True Ordered comparisons between enumeration values are *not* supported. Enum members are not integers (but see `IntEnum`_ below):: - >>> Color.red < Color.blue + >>> Color.RED < Color.BLUE Traceback (most recent call last): File "", line 1, in - TypeError: unorderable types: Color() < Color() + TypeError: '<' not supported between instances of 'Color' and 'Color' Equality comparisons are defined though:: - >>> Color.blue == Color.red + >>> Color.BLUE == Color.RED False - >>> Color.blue != Color.red + >>> Color.BLUE != Color.RED True - >>> Color.blue == Color.blue + >>> Color.BLUE == Color.BLUE True Comparisons against non-enumeration values will always compare not equal (again, :class:`IntEnum` was explicitly designed to behave differently, see below):: - >>> Color.blue == 2 + >>> Color.BLUE == 2 False @@ -289,8 +350,8 @@ Enumerations are Python classes, and can have methods and special methods as usual. If we have this enumeration:: >>> class Mood(Enum): - ... funky = 1 - ... happy = 3 + ... FUNKY = 1 + ... HAPPY = 3 ... ... def describe(self): ... # self is the member here @@ -302,16 +363,16 @@ usual. If we have this enumeration:: ... @classmethod ... def favorite_mood(cls): ... # cls here is the enumeration - ... return cls.happy + ... return cls.HAPPY ... Then:: >>> Mood.favorite_mood() - - >>> Mood.happy.describe() - ('happy', 3) - >>> str(Mood.funky) + + >>> Mood.HAPPY.describe() + ('HAPPY', 3) + >>> str(Mood.FUNKY) 'my custom str! 1' The rules for what is allowed are as follows: names that start and end with @@ -332,7 +393,7 @@ Subclassing an enumeration is allowed only if the enumeration does not define any members. So this is forbidden:: >>> class MoreColor(Color): - ... pink = 17 + ... PINK = 17 ... Traceback (most recent call last): ... @@ -345,8 +406,8 @@ But this is allowed:: ... pass ... >>> class Bar(Foo): - ... happy = 1 - ... sad = 2 + ... HAPPY = 1 + ... SAD = 2 ... Allowing subclassing of enums that define members would lead to a violation of @@ -362,7 +423,7 @@ Enumerations can be pickled and unpickled:: >>> from test.test_enum import Fruit >>> from pickle import dumps, loads - >>> Fruit.tomato is loads(dumps(Fruit.tomato)) + >>> Fruit.TOMATO is loads(dumps(Fruit.TOMATO)) True The usual restrictions for pickling apply: picklable enums must be defined in @@ -383,15 +444,15 @@ Functional API The :class:`Enum` class is callable, providing the following functional API:: - >>> Animal = Enum('Animal', 'ant bee cat dog') + >>> Animal = Enum('Animal', 'ANT BEE CAT DOG') >>> Animal - >>> Animal.ant - - >>> Animal.ant.value + >>> Animal.ANT + + >>> Animal.ANT.value 1 >>> list(Animal) - [, , , ] + [, , , ] The semantics of this API resemble :class:`~collections.namedtuple`. The first argument of the call to :class:`Enum` is the name of the enumeration. @@ -406,10 +467,10 @@ new class derived from :class:`Enum` is returned. In other words, the above assignment to :class:`Animal` is equivalent to:: >>> class Animal(Enum): - ... ant = 1 - ... bee = 2 - ... cat = 3 - ... dog = 4 + ... ANT = 1 + ... BEE = 2 + ... CAT = 3 + ... DOG = 4 ... The reason for defaulting to ``1`` as the starting number and not ``0`` is @@ -422,7 +483,7 @@ enumeration is being created in (e.g. it will fail if you use a utility function in separate module, and also may not work on IronPython or Jython). The solution is to specify the module name explicitly as follows:: - >>> Animal = Enum('Animal', 'ant bee cat dog', module=__name__) + >>> Animal = Enum('Animal', 'ANT BEE CAT DOG', module=__name__) .. warning:: @@ -435,7 +496,7 @@ The new pickle protocol 4 also, in some circumstances, relies on to find the class. For example, if the class was made available in class SomeData in the global scope:: - >>> Animal = Enum('Animal', 'ant bee cat dog', qualname='SomeData.Animal') + >>> Animal = Enum('Animal', 'ANT BEE CAT DOG', qualname='SomeData.Animal') The complete signature is:: @@ -446,19 +507,19 @@ The complete signature is:: :names: The Enum members. This can be a whitespace or comma separated string (values will start at 1 unless otherwise specified):: - 'red green blue' | 'red,green,blue' | 'red, green, blue' + 'RED GREEN BLUE' | 'RED,GREEN,BLUE' | 'RED, GREEN, BLUE' or an iterator of names:: - ['red', 'green', 'blue'] + ['RED', 'GREEN', 'BLUE'] or an iterator of (name, value) pairs:: - [('cyan', 4), ('magenta', 5), ('yellow', 6)] + [('CYAN', 4), ('MAGENTA', 5), ('YELLOW', 6)] or a mapping:: - {'chartreuse': 7, 'sea_green': 11, 'rosemary': 42} + {'CHARTREUSE': 7, 'SEA_GREEN': 11, 'ROSEMARY': 42} :module: name of module where new Enum class can be found. @@ -478,56 +539,167 @@ Derived Enumerations IntEnum ^^^^^^^ -A variation of :class:`Enum` is provided which is also a subclass of +The first variation of :class:`Enum` that is provided is also a subclass of :class:`int`. Members of an :class:`IntEnum` can be compared to integers; by extension, integer enumerations of different types can also be compared to each other:: >>> from enum import IntEnum >>> class Shape(IntEnum): - ... circle = 1 - ... square = 2 + ... CIRCLE = 1 + ... SQUARE = 2 ... >>> class Request(IntEnum): - ... post = 1 - ... get = 2 + ... POST = 1 + ... GET = 2 ... >>> Shape == 1 False - >>> Shape.circle == 1 + >>> Shape.CIRCLE == 1 True - >>> Shape.circle == Request.post + >>> Shape.CIRCLE == Request.POST True However, they still can't be compared to standard :class:`Enum` enumerations:: >>> class Shape(IntEnum): - ... circle = 1 - ... square = 2 + ... CIRCLE = 1 + ... SQUARE = 2 ... >>> class Color(Enum): - ... red = 1 - ... green = 2 + ... RED = 1 + ... GREEN = 2 ... - >>> Shape.circle == Color.red + >>> Shape.CIRCLE == Color.RED False :class:`IntEnum` values behave like integers in other ways you'd expect:: - >>> int(Shape.circle) + >>> int(Shape.CIRCLE) 1 - >>> ['a', 'b', 'c'][Shape.circle] + >>> ['a', 'b', 'c'][Shape.CIRCLE] 'b' - >>> [i for i in range(Shape.square)] + >>> [i for i in range(Shape.SQUARE)] [0, 1] -For the vast majority of code, :class:`Enum` is strongly recommended, -since :class:`IntEnum` breaks some semantic promises of an enumeration (by -being comparable to integers, and thus by transitivity to other -unrelated enumerations). It should be used only in special cases where -there's no other choice; for example, when integer constants are -replaced with enumerations and backwards compatibility is required with code -that still expects integers. + +IntFlag +^^^^^^^ + +The next variation of :class:`Enum` provided, :class:`IntFlag`, is also based +on :class:`int`. The difference being :class:`IntFlag` members can be combined +using the bitwise operators (&, \|, ^, ~) and the result is still an +:class:`IntFlag` member. However, as the name implies, :class:`IntFlag` +members also subclass :class:`int` and can be used wherever an :class:`int` is +used. Any operation on an :class:`IntFlag` member besides the bit-wise +operations will lose the :class:`IntFlag` membership. + +.. versionadded:: 3.6 + +Sample :class:`IntFlag` class:: + + >>> from enum import IntFlag + >>> class Perm(IntFlag): + ... R = 4 + ... W = 2 + ... X = 1 + ... + >>> Perm.R | Perm.W + + >>> Perm.R + Perm.W + 6 + >>> RW = Perm.R | Perm.W + >>> Perm.R in RW + True + +It is also possible to name the combinations:: + + >>> class Perm(IntFlag): + ... R = 4 + ... W = 2 + ... X = 1 + ... RWX = 7 + >>> Perm.RWX + + >>> ~Perm.RWX + + +Another important difference between :class:`IntFlag` and :class:`Enum` is that +if no flags are set (the value is 0), its boolean evaluation is :data:`False`:: + + >>> Perm.R & Perm.X + + >>> bool(Perm.R & Perm.X) + False + +Because :class:`IntFlag` members are also subclasses of :class:`int` they can +be combined with them:: + + >>> Perm.X | 8 + + + +Flag +^^^^ + +The last variation is :class:`Flag`. Like :class:`IntFlag`, :class:`Flag` +members can be combined using the bitwise operators (&, \|, ^, ~). Unlike +:class:`IntFlag`, they cannot be combined with, nor compared against, any +other :class:`Flag` enumeration, nor :class:`int`. While it is possible to +specify the values directly it is recommended to use :class:`auto` as the +value and let :class:`Flag` select an appropriate value. + +.. versionadded:: 3.6 + +Like :class:`IntFlag`, if a combination of :class:`Flag` members results in no +flags being set, the boolean evaluation is :data:`False`:: + + >>> from enum import Flag + >>> class Color(Flag): + ... RED = auto() + ... BLUE = auto() + ... GREEN = auto() + ... + >>> Color.RED & Color.GREEN + + >>> bool(Color.RED & Color.GREEN) + False + +Individual flags should have values that are powers of two (1, 2, 4, 8, ...), +while combinations of flags won't:: + + >>> class Color(Flag): + ... RED = auto() + ... BLUE = auto() + ... GREEN = auto() + ... WHITE = RED | BLUE | GREEN + ... + >>> Color.WHITE + + +Giving a name to the "no flags set" condition does not change its boolean +value:: + + >>> class Color(Flag): + ... BLACK = 0 + ... RED = auto() + ... BLUE = auto() + ... GREEN = auto() + ... + >>> Color.BLACK + + >>> bool(Color.BLACK) + False + +.. note:: + + For the majority of new code, :class:`Enum` and :class:`Flag` are strongly + recommended, since :class:`IntEnum` and :class:`IntFlag` break some + semantic promises of an enumeration (by being comparable to integers, and + thus by transitivity to other unrelated enumerations). :class:`IntEnum` + and :class:`IntFlag` should be used only in cases where :class:`Enum` and + :class:`Flag` will not do; for example, when integer constants are replaced + with enumerations, or for interoperability with other systems. Others @@ -558,7 +730,8 @@ Some rules: 4. %-style formatting: `%s` and `%r` call the :class:`Enum` class's :meth:`__str__` and :meth:`__repr__` respectively; other codes (such as `%i` or `%h` for IntEnum) treat the enum member as its mixed-in type. -5. :meth:`str.format` (or :func:`format`) will use the mixed-in +5. :ref:`Formatted string literals `, :meth:`str.format`, + and :func:`format` will use the mixed-in type's :meth:`__format__`. If the :class:`Enum` class's :func:`str` or :func:`repr` is desired, use the `!s` or `!r` format codes. @@ -566,18 +739,87 @@ Some rules: Interesting examples -------------------- -While :class:`Enum` and :class:`IntEnum` are expected to cover the majority of -use-cases, they cannot cover them all. Here are recipes for some different -types of enumerations that can be used directly, or as examples for creating -one's own. +While :class:`Enum`, :class:`IntEnum`, :class:`IntFlag`, and :class:`Flag` are +expected to cover the majority of use-cases, they cannot cover them all. Here +are recipes for some different types of enumerations that can be used directly, +or as examples for creating one's own. -AutoNumber -^^^^^^^^^^ +Omitting values +^^^^^^^^^^^^^^^ -Avoids having to specify the value for each enumeration member:: +In many use-cases one doesn't care what the actual value of an enumeration +is. There are several ways to define this type of simple enumeration: - >>> class AutoNumber(Enum): +- use instances of :class:`auto` for the value +- use instances of :class:`object` as the value +- use a descriptive string as the value +- use a tuple as the value and a custom :meth:`__new__` to replace the + tuple with an :class:`int` value + +Using any of these methods signifies to the user that these values are not +important, and also enables one to add, remove, or reorder members without +having to renumber the remaining members. + +Whichever method you choose, you should provide a :meth:`repr` that also hides +the (unimportant) value:: + + >>> class NoValue(Enum): + ... def __repr__(self): + ... return '<%s.%s>' % (self.__class__.__name__, self.name) + ... + + +Using :class:`auto` +""""""""""""""""""" + +Using :class:`object` would look like:: + + >>> class Color(NoValue): + ... RED = auto() + ... BLUE = auto() + ... GREEN = auto() + ... + >>> Color.GREEN + + + +Using :class:`object` +""""""""""""""""""""" + +Using :class:`object` would look like:: + + >>> class Color(NoValue): + ... RED = object() + ... GREEN = object() + ... BLUE = object() + ... + >>> Color.GREEN + + + +Using a descriptive string +"""""""""""""""""""""""""" + +Using a string as the value would look like:: + + >>> class Color(NoValue): + ... RED = 'stop' + ... GREEN = 'go' + ... BLUE = 'too fast!' + ... + >>> Color.GREEN + + >>> Color.GREEN.value + 'go' + + +Using a custom :meth:`__new__` +"""""""""""""""""""""""""""""" + +Using an auto-numbering :meth:`__new__` would look like:: + + >>> class AutoNumber(NoValue): ... def __new__(cls): ... value = len(cls.__members__) + 1 ... obj = object.__new__(cls) @@ -585,12 +827,15 @@ Avoids having to specify the value for each enumeration member:: ... return obj ... >>> class Color(AutoNumber): - ... red = () - ... green = () - ... blue = () + ... RED = () + ... GREEN = () + ... BLUE = () ... - >>> Color.green.value == 2 - True + >>> Color.GREEN + + >>> Color.GREEN.value + 2 + .. note:: @@ -652,14 +897,14 @@ alias:: ... % (a, e)) ... >>> class Color(DuplicateFreeEnum): - ... red = 1 - ... green = 2 - ... blue = 3 - ... grene = 2 + ... RED = 1 + ... GREEN = 2 + ... BLUE = 3 + ... GRENE = 2 ... Traceback (most recent call last): ... - ValueError: aliases not allowed in DuplicateFreeEnum: 'grene' --> 'green' + ValueError: aliases not allowed in DuplicateFreeEnum: 'GRENE' --> 'GREEN' .. note:: @@ -730,10 +975,61 @@ member instances. Finer Points ^^^^^^^^^^^^ -:class:`Enum` members are instances of an :class:`Enum` class, and even -though they are accessible as `EnumClass.member`, they should not be accessed -directly from the member as that lookup may fail or, worse, return something -besides the :class:`Enum` member you looking for:: +Supported ``__dunder__`` names +"""""""""""""""""""""""""""""" + +:attr:`__members__` is an :class:`OrderedDict` of ``member_name``:``member`` +items. It is only available on the class. + +:meth:`__new__`, if specified, must create and return the enum members; it is +also a very good idea to set the member's :attr:`_value_` appropriately. Once +all the members are created it is no longer used. + + +Supported ``_sunder_`` names +"""""""""""""""""""""""""""" + +- ``_name_`` -- name of the member +- ``_value_`` -- value of the member; can be set / modified in ``__new__`` + +- ``_missing_`` -- a lookup function used when a value is not found; may be + overridden +- ``_order_`` -- used in Python 2/3 code to ensure member order is consistent + (class attribute, removed during class creation) +- ``_generate_next_value_`` -- used by the `Functional API`_ and by + :class:`auto` to get an appropriate value for an enum member; may be + overridden + +.. versionadded:: 3.6 ``_missing_``, ``_order_``, ``_generate_next_value_`` + +To help keep Python 2 / Python 3 code in sync an :attr:`_order_` attribute can +be provided. It will be checked against the actual order of the enumeration +and raise an error if the two do not match:: + + >>> class Color(Enum): + ... _order_ = 'RED GREEN BLUE' + ... RED = 1 + ... BLUE = 3 + ... GREEN = 2 + ... + Traceback (most recent call last): + ... + TypeError: member order does not match _order_ + +.. note:: + + In Python 2 code the :attr:`_order_` attribute is necessary as definition + order is lost before it can be recorded. + +``Enum`` member type +"""""""""""""""""""" + +:class:`Enum` members are instances of their :class:`Enum` class, and are +normally accessed as ``EnumClass.member``. Under certain circumstances they +can also be accessed as ``EnumClass.member.member``, but you should never do +this as that lookup may fail or, worse, return something besides the +:class:`Enum` member you are looking for (this is another good reason to use +all-uppercase names for members):: >>> class FieldTypes(Enum): ... name = 0 @@ -747,7 +1043,24 @@ besides the :class:`Enum` member you looking for:: .. versionchanged:: 3.5 -The :attr:`__members__` attribute is only available on the class. + +Boolean value of ``Enum`` classes and members +""""""""""""""""""""""""""""""""""""""""""""" + +:class:`Enum` members that are mixed with non-:class:`Enum` types (such as +:class:`int`, :class:`str`, etc.) are evaluated according to the mixed-in +type's rules; otherwise, all members evaluate as :data:`True`. To make your +own Enum's boolean evaluation depend on the member's value add the following to +your class:: + + def __bool__(self): + return bool(self.value) + +:class:`Enum` classes always evaluate as :data:`True`. + + +``Enum`` classes with methods +""""""""""""""""""""""""""""" If you give your :class:`Enum` subclass extra methods, like the `Planet`_ class above, those methods will show up in a :func:`dir` of the member, @@ -758,11 +1071,23 @@ but not of the class:: >>> dir(Planet.EARTH) ['__class__', '__doc__', '__module__', 'name', 'surface_gravity', 'value'] -The :meth:`__new__` method will only be used for the creation of the -:class:`Enum` members -- after that it is replaced. Any custom :meth:`__new__` -method must create the object and set the :attr:`_value_` attribute -appropriately. -If you wish to change how :class:`Enum` members are looked up you should either -write a helper function or a :func:`classmethod` for the :class:`Enum` -subclass. +Combining members of ``Flag`` +""""""""""""""""""""""""""""" + +If a combination of Flag members is not named, the :func:`repr` will include +all named flags and all named combinations of flags that are in the value:: + + >>> class Color(Flag): + ... RED = auto() + ... GREEN = auto() + ... BLUE = auto() + ... MAGENTA = RED | BLUE + ... YELLOW = RED | GREEN + ... CYAN = GREEN | BLUE + ... + >>> Color(3) # named combination + + >>> Color(7) # not named combination + + diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 5a71933..a428f51 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -170,8 +170,9 @@ The following exceptions are the exceptions that are usually raised. .. exception:: ImportError - Raised when an :keyword:`import` statement fails to find the module definition - or when a ``from ... import`` fails to find a name that is to be imported. + Raised when the :keyword:`import` statement has troubles trying to + load a module. Also raised when the "from list" in ``from ... import`` + has a name that cannot be found. The :attr:`name` and :attr:`path` attributes can be set using keyword-only arguments to the constructor. When set they represent the name of the module @@ -181,6 +182,14 @@ The following exceptions are the exceptions that are usually raised. .. versionchanged:: 3.3 Added the :attr:`name` and :attr:`path` attributes. +.. exception:: ModuleNotFoundError + + A subclass of :exc:`ImportError` which is raised by :keyword:`import` + when a module could not be located. It is also raised when ``None`` + is found in :data:`sys.modules`. + + .. versionadded:: 3.6 + .. exception:: IndexError @@ -228,9 +237,21 @@ The following exceptions are the exceptions that are usually raised. .. exception:: NotImplementedError This exception is derived from :exc:`RuntimeError`. In user defined base - classes, abstract methods should raise this exception when they require derived - classes to override the method. + classes, abstract methods should raise this exception when they require + derived classes to override the method, or while the class is being + developed to indicate that the real implementation still needs to be added. + + .. note:: + It should not be used to indicate that an operater or method is not + meant to be supported at all -- in that case either leave the operator / + method undefined or, if a subclass, set it to :data:`None`. + + .. note:: + + ``NotImplementedError`` and ``NotImplemented`` are not interchangeable, + even though they have similar names and purposes. See + :data:`NotImplemented` for details on when to use it. .. exception:: OSError([arg]) OSError(errno, strerror[, filename[, winerror[, filename2]]]) @@ -436,6 +457,15 @@ The following exceptions are the exceptions that are usually raised. Raised when an operation or function is applied to an object of inappropriate type. The associated value is a string giving details about the type mismatch. + This exception may be raised by user code to indicate that an attempted + operation on an object is not supported, and is not meant to be. If an object + is meant to support a given operation but has not yet provided an + implementation, :exc:`NotImplementedError` is the proper exception to raise. + + Passing arguments of the wrong type (e.g. passing a :class:`list` when an + :class:`int` is expected) should result in a :exc:`TypeError`, but passing + arguments with the wrong value (e.g. a number outside expected boundaries) + should result in a :exc:`ValueError`. .. exception:: UnboundLocalError diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst index deedea1..d0c4cd0 100644 --- a/Doc/library/faulthandler.rst +++ b/Doc/library/faulthandler.rst @@ -70,6 +70,9 @@ Fault handler state .. versionchanged:: 3.5 Added support for passing file descriptor to this function. + .. versionchanged:: 3.6 + On Windows, a handler for Windows exception is also installed. + .. function:: disable() Disable the fault handler: uninstall the signal handlers installed by diff --git a/Doc/library/fileinput.rst b/Doc/library/fileinput.rst index aa4c529..5881fef 100644 --- a/Doc/library/fileinput.rst +++ b/Doc/library/fileinput.rst @@ -72,9 +72,8 @@ The following function is the primary interface of this module: .. versionchanged:: 3.2 Can be used as a context manager. - .. versionchanged:: 3.5.2 - The *bufsize* parameter is no longer used. - + .. deprecated-removed:: 3.6 3.8 + The *bufsize* parameter. The following functions use the global state created by :func:`fileinput.input`; if there is no active state, :exc:`RuntimeError` is raised. @@ -167,8 +166,8 @@ available for subclassing as well: .. deprecated:: 3.4 The ``'rU'`` and ``'U'`` modes. - .. versionchanged:: 3.5.2 - The *bufsize* parameter is no longer used. + .. deprecated-removed:: 3.6 3.8 + The *bufsize* parameter. **Optional in-place filtering:** if the keyword argument ``inplace=True`` is @@ -195,10 +194,14 @@ The two following opening hooks are provided by this module: Usage example: ``fi = fileinput.FileInput(openhook=fileinput.hook_compressed)`` -.. function:: hook_encoded(encoding) +.. function:: hook_encoded(encoding, errors=None) Returns a hook which opens each file with :func:`open`, using the given - *encoding* to read the file. + *encoding* and *errors* to read the file. Usage example: ``fi = - fileinput.FileInput(openhook=fileinput.hook_encoded("iso-8859-1"))`` + fileinput.FileInput(openhook=fileinput.hook_encoded("utf-8", + "surrogateescape"))`` + + .. versionchanged:: 3.6 + Added the optional *errors* parameter. diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst index 670b176..c03a9d3 100644 --- a/Doc/library/fnmatch.rst +++ b/Doc/library/fnmatch.rst @@ -43,8 +43,9 @@ patterns. .. function:: fnmatch(filename, pattern) Test whether the *filename* string matches the *pattern* string, returning - :const:`True` or :const:`False`. Both parameters are case-normalized - using :func:`os.path.normcase`. :func:`fnmatchcase` can be used to perform a + :const:`True` or :const:`False`. If the operating system is case-insensitive, + then both parameters will be normalized to all lower- or upper-case before + the comparison is performed. :func:`fnmatchcase` can be used to perform a case-sensitive comparison, regardless of whether that's standard for the operating system. @@ -62,8 +63,7 @@ patterns. .. function:: fnmatchcase(filename, pattern) Test whether *filename* matches *pattern*, returning :const:`True` or - :const:`False`; the comparison is case-sensitive and does not apply - :func:`os.path.normcase`. + :const:`False`; the comparison is case-sensitive. .. function:: filter(names, pattern) @@ -83,7 +83,7 @@ patterns. >>> >>> regex = fnmatch.translate('*.txt') >>> regex - '.*\\.txt\\Z(?ms)' + '(?s:.*\\.txt)\\Z' >>> reobj = re.compile(regex) >>> reobj.match('foobar.txt') <_sre.SRE_Match object; span=(0, 10), match='foobar.txt'> diff --git a/Doc/library/fpectl.rst b/Doc/library/fpectl.rst index 9660716..e4b528c 100644 --- a/Doc/library/fpectl.rst +++ b/Doc/library/fpectl.rst @@ -89,7 +89,7 @@ The following example demonstrates how to start up and test operation of the >>> import math >>> math.exp(1000) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? FloatingPointError: in math_1 diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index f0e19bd..b8c1dcf 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -97,6 +97,13 @@ The module defines the following items: :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :data:`ssl.HAS_SNI`). + .. deprecated:: 3.6 + + *keyfile* and *certfile* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + Here's a sample session using the :class:`FTP_TLS` class:: >>> ftps = FTP_TLS('ftp.pureftpd.org') @@ -228,7 +235,7 @@ followed by ``lines`` for the text version or ``binary`` for the binary version. Retrieve a file in binary transfer mode. *cmd* should be an appropriate ``RETR`` command: ``'RETR filename'``. The *callback* function is called for - each block of data received, with a single bytes argument giving the data + each block of data received, with a single string argument giving the data block. The optional *blocksize* argument specifies the maximum chunk size to read on the low-level socket object created to do the actual transfer (which will also be the largest size of the data blocks passed to *callback*). A @@ -248,9 +255,9 @@ followed by ``lines`` for the text version or ``binary`` for the binary version. prints the line to ``sys.stdout``. -.. method:: FTP.set_pasv(val) +.. method:: FTP.set_pasv(boolean) - Enable "passive" mode if *val* is true, otherwise disable passive mode. + Enable "passive" mode if *boolean* is true, other disable passive mode. Passive mode is on by default. diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index d6fa35a..c26037b 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -271,6 +271,9 @@ are always available. They are listed here in alphabetical order. The complex type is described in :ref:`typesnumeric`. + .. versionchanged:: 3.6 + Grouping digits with underscores as in code literals is allowed. + .. function:: delattr(object, name) @@ -531,11 +534,14 @@ are always available. They are listed here in alphabetical order. The float type is described in :ref:`typesnumeric`. - .. index:: - single: __format__ - single: string; format() (built-in function) + .. versionchanged:: 3.6 + Grouping digits with underscores as in code literals is allowed. +.. index:: + single: __format__ + single: string; format() (built-in function) + .. function:: format(value[, format_spec]) Convert a *value* to a "formatted" representation, as controlled by @@ -604,7 +610,7 @@ are always available. They are listed here in alphabetical order. .. note:: - For objects with custom :meth:`__hash__` methods, note that :func:`hash` + For object's with custom :meth:`__hash__` methods, note that :func:`hash` truncates the return value based on the bit width of the host machine. See :meth:`__hash__` for details. @@ -702,6 +708,10 @@ are always available. They are listed here in alphabetical order. :meth:`base.__int__ ` instead of :meth:`base.__index__ `. + .. versionchanged:: 3.6 + Grouping digits with underscores as in code literals is allowed. + + .. function:: isinstance(object, classinfo) Return true if the *object* argument is an instance of the *classinfo* @@ -878,11 +888,11 @@ are always available. They are listed here in alphabetical order. Open *file* and return a corresponding :term:`file object`. If the file cannot be opened, an :exc:`OSError` is raised. - *file* is either a string or bytes object giving the pathname (absolute or - relative to the current working directory) of the file to be opened or - an integer file descriptor of the file to be wrapped. (If a file descriptor - is given, it is closed when the returned I/O object is closed, unless - *closefd* is set to ``False``.) + *file* is a :term:`path-like object` giving the pathname (absolute or + relative to the current working directory) of the file to be opened or an + integer file descriptor of the file to be wrapped. (If a file descriptor is + given, it is closed when the returned I/O object is closed, unless *closefd* + is set to ``False``.) *mode* is an optional string that specifies the mode in which the file is opened. It defaults to ``'r'`` which means open for reading in text mode. @@ -1055,27 +1065,38 @@ are always available. They are listed here in alphabetical order. (where :func:`open` is declared), :mod:`os`, :mod:`os.path`, :mod:`tempfile`, and :mod:`shutil`. - .. versionchanged:: 3.3 - The *opener* parameter was added. - The ``'x'`` mode was added. - :exc:`IOError` used to be raised, it is now an alias of :exc:`OSError`. - :exc:`FileExistsError` is now raised if the file opened in exclusive - creation mode (``'x'``) already exists. + .. versionchanged:: + 3.3 - .. versionchanged:: 3.4 - The file is now non-inheritable. + * The *opener* parameter was added. + * The ``'x'`` mode was added. + * :exc:`IOError` used to be raised, it is now an alias of :exc:`OSError`. + * :exc:`FileExistsError` is now raised if the file opened in exclusive + * creation mode (``'x'``) already exists. + + .. versionchanged:: + 3.4 + + * The file is now non-inheritable. .. deprecated-removed:: 3.4 4.0 The ``'U'`` mode. - .. versionchanged:: 3.5 - If the system call is interrupted and the signal handler does not raise an - exception, the function now retries the system call instead of raising an - :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. versionchanged:: + 3.5 - .. versionchanged:: 3.5 - The ``'namereplace'`` error handler was added. + * If the system call is interrupted and the signal handler does not raise an + exception, the function now retries the system call instead of raising an + :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + * The ``'namereplace'`` error handler was added. + + .. versionchanged:: + 3.6 + + * Support added to accept objects implementing :class:`os.PathLike`. + * On Windows, opening a console buffer may return a subclass of + :class:`io.RawIOBase` other than :class:`io.FileIO`. .. function:: ord(c) @@ -1104,7 +1125,7 @@ are always available. They are listed here in alphabetical order. .. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False) Print *objects* to the text stream *file*, separated by *sep* and followed - by *end*. *sep*, *end*, *file* and *flush*, if present, must be given as keyword + by *end*. *sep*, *end* and *file*, if present, must be given as keyword arguments. All non-keyword arguments are converted to strings like :func:`str` does and @@ -1233,21 +1254,17 @@ are always available. They are listed here in alphabetical order. .. function:: round(number[, ndigits]) - Return *number* rounded to *ndigits* precision after the decimal - point. If *ndigits* is omitted or is ``None``, it returns the - nearest integer to its input. + Return the floating point value *number* rounded to *ndigits* digits after + the decimal point. If *ndigits* is omitted or is ``None``, it returns the + nearest integer to its input. Delegates to ``number.__round__(ndigits)``. For the built-in types supporting :func:`round`, values are rounded to the closest multiple of 10 to the power minus *ndigits*; if two multiples are equally close, rounding is done toward the even choice (so, for example, both ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is - ``2``). Any integer value is valid for *ndigits* (positive, zero, or - negative). The return value is an integer if called with one argument, + ``2``). The return value is an integer if called with one argument, otherwise of the same type as *number*. - For a general Python object ``number``, ``round(number, ndigits)`` delegates to - ``number.__round__(ndigits)``. - .. note:: The behavior of :func:`round` for floats can be surprising: for example, @@ -1464,6 +1481,9 @@ are always available. They are listed here in alphabetical order. See also :ref:`bltin-type-objects`. + .. versionchanged:: 3.6 + Subclasses of :class:`type` which don't override ``type.__new__`` may no + longer use the one-argument form to get the type of an object. .. function:: vars([object]) diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst index 053d9d3..3a87bf5 100644 --- a/Doc/library/gettext.rst +++ b/Doc/library/gettext.rst @@ -48,10 +48,9 @@ class-based API instead. .. function:: bind_textdomain_codeset(domain, codeset=None) - Bind the *domain* to *codeset*, changing the encoding of byte strings - returned by the :func:`lgettext`, :func:`ldgettext`, :func:`lngettext` - and :func:`ldngettext` functions. - If *codeset* is omitted, then the current binding is returned. + Bind the *domain* to *codeset*, changing the encoding of strings returned by the + :func:`gettext` family of functions. If *codeset* is omitted, then the current + binding is returned. .. function:: textdomain(domain=None) @@ -68,14 +67,28 @@ class-based API instead. :func:`_` in the local namespace (see examples below). +.. function:: lgettext(message) + + Equivalent to :func:`gettext`, but the translation is returned in the + preferred system encoding, if no other encoding was explicitly set with + :func:`bind_textdomain_codeset`. + + .. function:: dgettext(domain, message) - Like :func:`.gettext`, but look the message up in the specified *domain*. + Like :func:`gettext`, but look the message up in the specified *domain*. + + +.. function:: ldgettext(domain, message) + + Equivalent to :func:`dgettext`, but the translation is returned in the + preferred system encoding, if no other encoding was explicitly set with + :func:`bind_textdomain_codeset`. .. function:: ngettext(singular, plural, n) - Like :func:`.gettext`, but consider plural forms. If a translation is found, + Like :func:`gettext`, but consider plural forms. If a translation is found, apply the plural formula to *n*, and return the resulting message (some languages have more than two plural forms). If no translation is found, return *singular* if *n* is 1; return *plural* otherwise. @@ -88,33 +101,24 @@ class-based API instead. formulas for a variety of languages. +.. function:: lngettext(singular, plural, n) + + Equivalent to :func:`ngettext`, but the translation is returned in the + preferred system encoding, if no other encoding was explicitly set with + :func:`bind_textdomain_codeset`. + + .. function:: dngettext(domain, singular, plural, n) Like :func:`ngettext`, but look the message up in the specified *domain*. -.. function:: lgettext(message) -.. function:: ldgettext(domain, message) -.. function:: lngettext(singular, plural, n) .. function:: ldngettext(domain, singular, plural, n) - Equivalent to the corresponding functions without the ``l`` prefix - (:func:`.gettext`, :func:`dgettext`, :func:`ngettext` and :func:`dngettext`), - but the translation is returned as a byte string encoded in the preferred - system encoding if no other encoding was explicitly set with + Equivalent to :func:`dngettext`, but the translation is returned in the + preferred system encoding, if no other encoding was explicitly set with :func:`bind_textdomain_codeset`. - .. warning:: - - These functions should be avoided in Python 3, because they return - encoded bytes. It's much better to use alternatives which return - Unicode strings instead, since most Python applications will want to - manipulate human readable text as strings instead of bytes. Further, - it's possible that you may get unexpected Unicode-related exceptions - if there are encoding problems with the translated strings. It is - possible that the ``l*()`` functions will be deprecated in future Python - versions due to their inherent problems and limitations. - Note that GNU :program:`gettext` also defines a :func:`dcgettext` method, but this was deemed not useful and so it is currently unimplemented. @@ -175,9 +179,8 @@ class can also install themselves in the built-in namespace as the function names are cached. The actual class instantiated is either *class_* if provided, otherwise :class:`GNUTranslations`. The class's constructor must take a single :term:`file object` argument. If provided, *codeset* will change - the charset used to encode translated strings in the - :meth:`~NullTranslations.lgettext` and :meth:`~NullTranslations.lngettext` - methods. + the charset used to encode translated strings in the :meth:`lgettext` and + :meth:`lngettext` methods. If multiple files are found, later files are used as fallbacks for earlier ones. To allow setting the fallback, :func:`copy.copy` is used to clone each @@ -247,29 +250,26 @@ are the methods of :class:`NullTranslations`: .. method:: gettext(message) - If a fallback has been set, forward :meth:`.gettext` to the fallback. - Otherwise, return *message*. Overridden in derived classes. + If a fallback has been set, forward :meth:`gettext` to the fallback. + Otherwise, return the translated message. Overridden in derived classes. + + + .. method:: lgettext(message) + + If a fallback has been set, forward :meth:`lgettext` to the fallback. + Otherwise, return the translated message. Overridden in derived classes. .. method:: ngettext(singular, plural, n) If a fallback has been set, forward :meth:`ngettext` to the fallback. - Otherwise, return *singular* if *n* is 1; return *plural* otherwise. - Overridden in derived classes. + Otherwise, return the translated message. Overridden in derived classes. - .. method:: lgettext(message) .. method:: lngettext(singular, plural, n) - Equivalent to :meth:`.gettext` and :meth:`ngettext`, but the translation - is returned as a byte string encoded in the preferred system encoding - if no encoding was explicitly set with :meth:`set_output_charset`. - Overridden in derived classes. - - .. warning:: - - These methods should be avoided in Python 3. See the warning for the - :func:`lgettext` function. + If a fallback has been set, forward :meth:`lngettext` to the fallback. + Otherwise, return the translated message. Overridden in derived classes. .. method:: info() @@ -279,28 +279,32 @@ are the methods of :class:`NullTranslations`: .. method:: charset() - Return the encoding of the message catalog file. + Return the "protected" :attr:`_charset` variable, which is the encoding of + the message catalog file. .. method:: output_charset() - Return the encoding used to return translated messages in :meth:`.lgettext` - and :meth:`.lngettext`. + Return the "protected" :attr:`_output_charset` variable, which defines the + encoding used to return translated messages in :meth:`lgettext` and + :meth:`lngettext`. .. method:: set_output_charset(charset) - Change the encoding used to return translated messages. + Change the "protected" :attr:`_output_charset` variable, which defines the + encoding used to return translated messages. .. method:: install(names=None) - This method installs :meth:`.gettext` into the built-in namespace, + This method installs :meth:`self.gettext` into the built-in namespace, binding it to ``_``. If the *names* parameter is given, it must be a sequence containing the names of functions you want to install in the builtins namespace in - addition to :func:`_`. Supported names are ``'gettext'``, ``'ngettext'``, + addition to :func:`_`. Supported names are ``'gettext'`` (bound to + :meth:`self.gettext`), ``'ngettext'`` (bound to :meth:`self.ngettext`), ``'lgettext'`` and ``'lngettext'``. Note that this is only one way, albeit the most convenient way, to make @@ -345,52 +349,49 @@ If the :file:`.mo` file's magic number is invalid, the major version number is unexpected, or if other problems occur while reading the file, instantiating a :class:`GNUTranslations` class can raise :exc:`OSError`. -.. class:: GNUTranslations +The following methods are overridden from the base class implementation: - The following methods are overridden from the base class implementation: - .. method:: gettext(message) +.. method:: GNUTranslations.gettext(message) - Look up the *message* id in the catalog and return the corresponding message - string, as a Unicode string. If there is no entry in the catalog for the - *message* id, and a fallback has been set, the look up is forwarded to the - fallback's :meth:`~NullTranslations.gettext` method. Otherwise, the - *message* id is returned. + Look up the *message* id in the catalog and return the corresponding message + string, as a Unicode string. If there is no entry in the catalog for the + *message* id, and a fallback has been set, the look up is forwarded to the + fallback's :meth:`gettext` method. Otherwise, the *message* id is returned. - .. method:: ngettext(singular, plural, n) +.. method:: GNUTranslations.lgettext(message) - Do a plural-forms lookup of a message id. *singular* is used as the message id - for purposes of lookup in the catalog, while *n* is used to determine which - plural form to use. The returned message string is a Unicode string. + Equivalent to :meth:`gettext`, but the translation is returned as a + bytestring encoded in the selected output charset, or in the preferred system + encoding if no encoding was explicitly set with :meth:`set_output_charset`. - If the message id is not found in the catalog, and a fallback is specified, - the request is forwarded to the fallback's :meth:`~NullTranslations.ngettext` - method. Otherwise, when *n* is 1 *singular* is returned, and *plural* is - returned in all other cases. - Here is an example:: +.. method:: GNUTranslations.ngettext(singular, plural, n) - n = len(os.listdir('.')) - cat = GNUTranslations(somefile) - message = cat.ngettext( - 'There is %(num)d file in this directory', - 'There are %(num)d files in this directory', - n) % {'num': n} + Do a plural-forms lookup of a message id. *singular* is used as the message id + for purposes of lookup in the catalog, while *n* is used to determine which + plural form to use. The returned message string is a Unicode string. + If the message id is not found in the catalog, and a fallback is specified, the + request is forwarded to the fallback's :meth:`ngettext` method. Otherwise, when + *n* is 1 *singular* is returned, and *plural* is returned in all other cases. - .. method:: lgettext(message) - .. method:: lngettext(singular, plural, n) + Here is an example:: + + n = len(os.listdir('.')) + cat = GNUTranslations(somefile) + message = cat.ngettext( + 'There is %(num)d file in this directory', + 'There are %(num)d files in this directory', + n) % {'num': n} - Equivalent to :meth:`.gettext` and :meth:`.ngettext`, but the translation - is returned as a byte string encoded in the preferred system encoding - if no encoding was explicitly set with - :meth:`~NullTranslations.set_output_charset`. - .. warning:: +.. method:: GNUTranslations.lngettext(singular, plural, n) - These methods should be avoided in Python 3. See the warning for the - :func:`lgettext` function. + Equivalent to :meth:`gettext`, but the translation is returned as a + bytestring encoded in the selected output charset, or in the preferred system + encoding if no encoding was explicitly set with :meth:`set_output_charset`. Solaris message catalog support @@ -508,7 +509,7 @@ module:: import gettext t = gettext.translation('spam', '/usr/share/locale') - _ = t.gettext + _ = t.lgettext Localizing your application diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst index 328eef3..a8a5a50 100644 --- a/Doc/library/glob.rst +++ b/Doc/library/glob.rst @@ -14,7 +14,7 @@ The :mod:`glob` module finds all the pathnames matching a specified pattern according to the rules used by the Unix shell, although results are returned in arbitrary order. No tilde expansion is done, but ``*``, ``?``, and character ranges expressed with ``[]`` will be correctly matched. This is done by using -the :func:`os.listdir` and :func:`fnmatch.fnmatch` functions in concert, and +the :func:`os.scandir` and :func:`fnmatch.fnmatch` functions in concert, and not by actually invoking a subshell. Note that unlike :func:`fnmatch.fnmatch`, :mod:`glob` treats filenames beginning with a dot (``.``) as special cases. (For tilde and shell variable expansion, use :func:`os.path.expanduser` and diff --git a/Doc/library/grp.rst b/Doc/library/grp.rst index a30e622..74de3f9 100644 --- a/Doc/library/grp.rst +++ b/Doc/library/grp.rst @@ -43,6 +43,9 @@ It defines the following items: Return the group database entry for the given numeric group ID. :exc:`KeyError` is raised if the entry asked for cannot be found. + .. deprecated:: 3.6 + Since Python 3.6 the support of non-integer arguments like floats or + strings in :func:`getgrgid` is deprecated. .. function:: getgrnam(name) diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst index 792d57a..9c6b722 100644 --- a/Doc/library/gzip.rst +++ b/Doc/library/gzip.rst @@ -56,6 +56,8 @@ The module defines the following items: .. versionchanged:: 3.4 Added support for the ``'x'``, ``'xb'`` and ``'xt'`` modes. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. .. class:: GzipFile(filename=None, mode=None, compresslevel=9, fileobj=None, mtime=None) @@ -151,6 +153,9 @@ The module defines the following items: The :meth:`~io.BufferedIOBase.read` method now accepts an argument of ``None``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: compress(data, compresslevel=9) diff --git a/Doc/library/hashlib-blake2-tree.png b/Doc/library/hashlib-blake2-tree.png new file mode 100644 index 0000000..010dcba Binary files /dev/null and b/Doc/library/hashlib-blake2-tree.png differ diff --git a/Doc/library/hashlib-blake2.rst b/Doc/library/hashlib-blake2.rst new file mode 100644 index 0000000..436aa4f --- /dev/null +++ b/Doc/library/hashlib-blake2.rst @@ -0,0 +1,444 @@ +.. _hashlib-blake2: + +:mod:`hashlib` --- BLAKE2 hash functions +======================================== + +.. module:: hashlib + :synopsis: BLAKE2 hash function for Python +.. sectionauthor:: Dmitry Chestnykh + +.. index:: + single: blake2b, blake2s + +BLAKE2_ is a cryptographic hash function defined in RFC-7693_ that comes in two +flavors: + +* **BLAKE2b**, optimized for 64-bit platforms and produces digests of any size + between 1 and 64 bytes, + +* **BLAKE2s**, optimized for 8- to 32-bit platforms and produces digests of any + size between 1 and 32 bytes. + +BLAKE2 supports **keyed mode** (a faster and simpler replacement for HMAC_), +**salted hashing**, **personalization**, and **tree hashing**. + +Hash objects from this module follow the API of standard library's +:mod:`hashlib` objects. + + +Module +====== + +Creating hash objects +--------------------- + +New hash objects are created by calling constructor functions: + + +.. function:: blake2b(data=b'', digest_size=64, key=b'', salt=b'', \ + person=b'', fanout=1, depth=1, leaf_size=0, node_offset=0, \ + node_depth=0, inner_size=0, last_node=False) + +.. function:: blake2s(data=b'', digest_size=32, key=b'', salt=b'', \ + person=b'', fanout=1, depth=1, leaf_size=0, node_offset=0, \ + node_depth=0, inner_size=0, last_node=False) + + +These functions return the corresponding hash objects for calculating +BLAKE2b or BLAKE2s. They optionally take these general parameters: + +* *data*: initial chunk of data to hash, which must be interpretable as buffer + of bytes. + +* *digest_size*: size of output digest in bytes. + +* *key*: key for keyed hashing (up to 64 bytes for BLAKE2b, up to 32 bytes for + BLAKE2s). + +* *salt*: salt for randomized hashing (up to 16 bytes for BLAKE2b, up to 8 + bytes for BLAKE2s). + +* *person*: personalization string (up to 16 bytes for BLAKE2b, up to 8 bytes + for BLAKE2s). + +The following table shows limits for general parameters (in bytes): + +======= =========== ======== ========= =========== +Hash digest_size len(key) len(salt) len(person) +======= =========== ======== ========= =========== +BLAKE2b 64 64 16 16 +BLAKE2s 32 32 8 8 +======= =========== ======== ========= =========== + +.. note:: + + BLAKE2 specification defines constant lengths for salt and personalization + parameters, however, for convenience, this implementation accepts byte + strings of any size up to the specified length. If the length of the + parameter is less than specified, it is padded with zeros, thus, for + example, ``b'salt'`` and ``b'salt\x00'`` is the same value. (This is not + the case for *key*.) + +These sizes are available as module `constants`_ described below. + +Constructor functions also accept the following tree hashing parameters: + +* *fanout*: fanout (0 to 255, 0 if unlimited, 1 in sequential mode). + +* *depth*: maximal depth of tree (1 to 255, 255 if unlimited, 1 in + sequential mode). + +* *leaf_size*: maximal byte length of leaf (0 to 2**32-1, 0 if unlimited or in + sequential mode). + +* *node_offset*: node offset (0 to 2**64-1 for BLAKE2b, 0 to 2**48-1 for + BLAKE2s, 0 for the first, leftmost, leaf, or in sequential mode). + +* *node_depth*: node depth (0 to 255, 0 for leaves, or in sequential mode). + +* *inner_size*: inner digest size (0 to 64 for BLAKE2b, 0 to 32 for + BLAKE2s, 0 in sequential mode). + +* *last_node*: boolean indicating whether the processed node is the last + one (`False` for sequential mode). + +.. figure:: hashlib-blake2-tree.png + :alt: Explanation of tree mode parameters. + +See section 2.10 in `BLAKE2 specification +`_ for comprehensive review of tree +hashing. + + +Constants +--------- + +.. data:: blake2b.SALT_SIZE +.. data:: blake2s.SALT_SIZE + +Salt length (maximum length accepted by constructors). + + +.. data:: blake2b.PERSON_SIZE +.. data:: blake2s.PERSON_SIZE + +Personalization string length (maximum length accepted by constructors). + + +.. data:: blake2b.MAX_KEY_SIZE +.. data:: blake2s.MAX_KEY_SIZE + +Maximum key size. + + +.. data:: blake2b.MAX_DIGEST_SIZE +.. data:: blake2s.MAX_DIGEST_SIZE + +Maximum digest size that the hash function can output. + + +Examples +======== + +Simple hashing +-------------- + +To calculate hash of some data, you should first construct a hash object by +calling the appropriate constructor function (:func:`blake2b` or +:func:`blake2s`), then update it with the data by calling :meth:`update` on the +object, and, finally, get the digest out of the object by calling +:meth:`digest` (or :meth:`hexdigest` for hex-encoded string). + + >>> from hashlib import blake2b + >>> h = blake2b() + >>> h.update(b'Hello world') + >>> h.hexdigest() + '6ff843ba685842aa82031d3f53c48b66326df7639a63d128974c5c14f31a0f33343a8c65551134ed1ae0f2b0dd2bb495dc81039e3eeb0aa1bb0388bbeac29183' + + +As a shortcut, you can pass the first chunk of data to update directly to the +constructor as the first argument (or as *data* keyword argument): + + >>> from hashlib import blake2b + >>> blake2b(b'Hello world').hexdigest() + '6ff843ba685842aa82031d3f53c48b66326df7639a63d128974c5c14f31a0f33343a8c65551134ed1ae0f2b0dd2bb495dc81039e3eeb0aa1bb0388bbeac29183' + +You can call :meth:`hash.update` as many times as you need to iteratively +update the hash: + + >>> from hashlib import blake2b + >>> items = [b'Hello', b' ', b'world'] + >>> h = blake2b() + >>> for item in items: + ... h.update(item) + >>> h.hexdigest() + '6ff843ba685842aa82031d3f53c48b66326df7639a63d128974c5c14f31a0f33343a8c65551134ed1ae0f2b0dd2bb495dc81039e3eeb0aa1bb0388bbeac29183' + + +Using different digest sizes +---------------------------- + +BLAKE2 has configurable size of digests up to 64 bytes for BLAKE2b and up to 32 +bytes for BLAKE2s. For example, to replace SHA-1 with BLAKE2b without changing +the size of output, we can tell BLAKE2b to produce 20-byte digests: + + >>> from hashlib import blake2b + >>> h = blake2b(digest_size=20) + >>> h.update(b'Replacing SHA1 with the more secure function') + >>> h.hexdigest() + 'd24f26cf8de66472d58d4e1b1774b4c9158b1f4c' + >>> h.digest_size + 20 + >>> len(h.digest()) + 20 + +Hash objects with different digest sizes have completely different outputs +(shorter hashes are *not* prefixes of longer hashes); BLAKE2b and BLAKE2s +produce different outputs even if the output length is the same: + + >>> from hashlib import blake2b, blake2s + >>> blake2b(digest_size=10).hexdigest() + '6fa1d8fcfd719046d762' + >>> blake2b(digest_size=11).hexdigest() + 'eb6ec15daf9546254f0809' + >>> blake2s(digest_size=10).hexdigest() + '1bf21a98c78a1c376ae9' + >>> blake2s(digest_size=11).hexdigest() + '567004bf96e4a25773ebf4' + + +Keyed hashing +------------- + +Keyed hashing can be used for authentication as a faster and simpler +replacement for `Hash-based message authentication code +`_ (HMAC). +BLAKE2 can be securely used in prefix-MAC mode thanks to the +indifferentiability property inherited from BLAKE. + +This example shows how to get a (hex-encoded) 128-bit authentication code for +message ``b'message data'`` with key ``b'pseudorandom key'``:: + + >>> from hashlib import blake2b + >>> h = blake2b(key=b'pseudorandom key', digest_size=16) + >>> h.update(b'message data') + >>> h.hexdigest() + '3d363ff7401e02026f4a4687d4863ced' + + +As a practical example, a web application can symmetrically sign cookies sent +to users and later verify them to make sure they weren't tampered with:: + + >>> from hashlib import blake2b + >>> from hmac import compare_digest + >>> + >>> SECRET_KEY = b'pseudorandomly generated server secret key' + >>> AUTH_SIZE = 16 + >>> + >>> def sign(cookie): + ... h = blake2b(data=cookie, digest_size=AUTH_SIZE, key=SECRET_KEY) + ... return h.hexdigest() + >>> + >>> cookie = b'user:vatrogasac' + >>> sig = sign(cookie) + >>> print("{0},{1}".format(cookie.decode('utf-8'), sig)) + user:vatrogasac,349cf904533767ed2d755279a8df84d0 + >>> compare_digest(cookie, sig) + True + >>> compare_digest(b'user:policajac', sig) + False + >>> compare_digesty(cookie, '0102030405060708090a0b0c0d0e0f00') + False + +Even though there's a native keyed hashing mode, BLAKE2 can, of course, be used +in HMAC construction with :mod:`hmac` module:: + + >>> import hmac, hashlib + >>> m = hmac.new(b'secret key', digestmod=hashlib.blake2s) + >>> m.update(b'message') + >>> m.hexdigest() + 'e3c8102868d28b5ff85fc35dda07329970d1a01e273c37481326fe0c861c8142' + + +Randomized hashing +------------------ + +By setting *salt* parameter users can introduce randomization to the hash +function. Randomized hashing is useful for protecting against collision attacks +on the hash function used in digital signatures. + + Randomized hashing is designed for situations where one party, the message + preparer, generates all or part of a message to be signed by a second + party, the message signer. If the message preparer is able to find + cryptographic hash function collisions (i.e., two messages producing the + same hash value), then she might prepare meaningful versions of the message + that would produce the same hash value and digital signature, but with + different results (e.g., transferring $1,000,000 to an account, rather than + $10). Cryptographic hash functions have been designed with collision + resistance as a major goal, but the current concentration on attacking + cryptographic hash functions may result in a given cryptographic hash + function providing less collision resistance than expected. Randomized + hashing offers the signer additional protection by reducing the likelihood + that a preparer can generate two or more messages that ultimately yield the + same hash value during the digital signature generation process --- even if + it is practical to find collisions for the hash function. However, the use + of randomized hashing may reduce the amount of security provided by a + digital signature when all portions of the message are prepared + by the signer. + + (`NIST SP-800-106 "Randomized Hashing for Digital Signatures" + `_) + +In BLAKE2 the salt is processed as a one-time input to the hash function during +initialization, rather than as an input to each compression function. + +.. warning:: + + *Salted hashing* (or just hashing) with BLAKE2 or any other general-purpose + cryptographic hash function, such as SHA-256, is not suitable for hashing + passwords. See `BLAKE2 FAQ `_ for more + information. +.. + + >>> import os + >>> from hashlib import blake2b + >>> msg = b'some message' + >>> # Calculate the first hash with a random salt. + >>> salt1 = os.urandom(blake2b.SALT_SIZE) + >>> h1 = blake2b(salt=salt1) + >>> h1.update(msg) + >>> # Calculate the second hash with a different random salt. + >>> salt2 = os.urandom(blake2b.SALT_SIZE) + >>> h2 = blake2b(salt=salt2) + >>> h2.update(msg) + >>> # The digests are different. + >>> h1.digest() != h2.digest() + True + + +Personalization +--------------- + +Sometimes it is useful to force hash function to produce different digests for +the same input for different purposes. Quoting the authors of the Skein hash +function: + + We recommend that all application designers seriously consider doing this; + we have seen many protocols where a hash that is computed in one part of + the protocol can be used in an entirely different part because two hash + computations were done on similar or related data, and the attacker can + force the application to make the hash inputs the same. Personalizing each + hash function used in the protocol summarily stops this type of attack. + + (`The Skein Hash Function Family + `_, + p. 21) + +BLAKE2 can be personalized by passing bytes to the *person* argument:: + + >>> from hashlib import blake2b + >>> FILES_HASH_PERSON = b'MyApp Files Hash' + >>> BLOCK_HASH_PERSON = b'MyApp Block Hash' + >>> h = blake2b(digest_size=32, person=FILES_HASH_PERSON) + >>> h.update(b'the same content') + >>> h.hexdigest() + '20d9cd024d4fb086aae819a1432dd2466de12947831b75c5a30cf2676095d3b4' + >>> h = blake2b(digest_size=32, person=BLOCK_HASH_PERSON) + >>> h.update(b'the same content') + >>> h.hexdigest() + 'cf68fb5761b9c44e7878bfb2c4c9aea52264a80b75005e65619778de59f383a3' + +Personalization together with the keyed mode can also be used to derive different +keys from a single one. + + >>> from hashlib import blake2s + >>> from base64 import b64decode, b64encode + >>> orig_key = b64decode(b'Rm5EPJai72qcK3RGBpW3vPNfZy5OZothY+kHY6h21KM=') + >>> enc_key = blake2s(key=orig_key, person=b'kEncrypt').digest() + >>> mac_key = blake2s(key=orig_key, person=b'kMAC').digest() + >>> print(b64encode(enc_key).decode('utf-8')) + rbPb15S/Z9t+agffno5wuhB77VbRi6F9Iv2qIxU7WHw= + >>> print(b64encode(mac_key).decode('utf-8')) + G9GtHFE1YluXY1zWPlYk1e/nWfu0WSEb0KRcjhDeP/o= + +Tree mode +--------- + +Here's an example of hashing a minimal tree with two leaf nodes:: + + 10 + / \ + 00 01 + +This example uses 64-byte internal digests, and returns the 32-byte final +digest:: + + >>> from hashlib import blake2b + >>> + >>> FANOUT = 2 + >>> DEPTH = 2 + >>> LEAF_SIZE = 4096 + >>> INNER_SIZE = 64 + >>> + >>> buf = bytearray(6000) + >>> + >>> # Left leaf + ... h00 = blake2b(buf[0:LEAF_SIZE], fanout=FANOUT, depth=DEPTH, + ... leaf_size=LEAF_SIZE, inner_size=INNER_SIZE, + ... node_offset=0, node_depth=0, last_node=False) + >>> # Right leaf + ... h01 = blake2b(buf[LEAF_SIZE:], fanout=FANOUT, depth=DEPTH, + ... leaf_size=LEAF_SIZE, inner_size=INNER_SIZE, + ... node_offset=1, node_depth=0, last_node=True) + >>> # Root node + ... h10 = blake2b(digest_size=32, fanout=FANOUT, depth=DEPTH, + ... leaf_size=LEAF_SIZE, inner_size=INNER_SIZE, + ... node_offset=0, node_depth=1, last_node=True) + >>> h10.update(h00.digest()) + >>> h10.update(h01.digest()) + >>> h10.hexdigest() + '3ad2a9b37c6070e374c7a8c508fe20ca86b6ed54e286e93a0318e95e881db5aa' + +Credits +======= + +BLAKE2_ was designed by *Jean-Philippe Aumasson*, *Samuel Neves*, *Zooko +Wilcox-O'Hearn*, and *Christian Winnerlein* based on SHA-3_ finalist BLAKE_ +created by *Jean-Philippe Aumasson*, *Luca Henzen*, *Willi Meier*, and +*Raphael C.-W. Phan*. + +It uses core algorithm from ChaCha_ cipher designed by *Daniel J. Bernstein*. + +The stdlib implementation is based on pyblake2_ module. It was written by +*Dmitry Chestnykh* based on C implementation written by *Samuel Neves*. The +documentation was copied from pyblake2_ and written by *Dmitry Chestnykh*. + +The C code was partly rewritten for Python by *Christian Heimes*. + +The following public domain dedication applies for both C hash function +implementation, extension code, and this documentation: + + To the extent possible under law, the author(s) have dedicated all copyright + and related and neighboring rights to this software to the public domain + worldwide. This software is distributed without any warranty. + + You should have received a copy of the CC0 Public Domain Dedication along + with this software. If not, see + http://creativecommons.org/publicdomain/zero/1.0/. + +The following people have helped with development or contributed their changes +to the project and the public domain according to the Creative Commons Public +Domain Dedication 1.0 Universal: + +* *Alexandr Sokolovskiy* + +.. seealso:: Official BLAKE2 website: https://blake2.net + +.. _RFC-7693: https://tools.ietf.org/html/rfc7693 +.. _BLAKE2: https://blake2.net +.. _HMAC: https://en.wikipedia.org/wiki/Hash-based_message_authentication_code +.. _BLAKE: https://131002.net/blake/ +.. _SHA-3: https://en.wikipedia.org/wiki/NIST_hash_function_competition +.. _ChaCha: https://cr.yp.to/chacha.html +.. _pyblake2: https://pythonhosted.org/pyblake2/ + diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index a2e96ca..2cb3c78 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -44,8 +44,8 @@ Hash algorithms --------------- There is one constructor method named for each type of :dfn:`hash`. All return -a hash object with the same simple interface. For example: use :func:`sha1` to -create a SHA1 hash object. You can now feed this object with :term:`bytes-like +a hash object with the same simple interface. For example: use :func:`sha256` to +create a SHA-256 hash object. You can now feed this object with :term:`bytes-like objects ` (normally :class:`bytes`) using the :meth:`update` method. At any point you can ask it for the :dfn:`digest` of the concatenation of the data fed to it so far using the :meth:`digest` or @@ -64,21 +64,33 @@ concatenation of the data fed to it so far using the :meth:`digest` or .. index:: single: OpenSSL; (use in module hashlib) Constructors for hash algorithms that are always present in this module are -:func:`md5`, :func:`sha1`, :func:`sha224`, :func:`sha256`, :func:`sha384`, -and :func:`sha512`. Additional algorithms may also be available depending upon -the OpenSSL library that Python uses on your platform. +:func:`sha1`, :func:`sha224`, :func:`sha256`, :func:`sha384`, +:func:`sha512`, :func:`blake2b`, and :func:`blake2s`. +:func:`md5` is normally available as well, though it +may be missing if you are using a rare "FIPS compliant" build of Python. +Additional algorithms may also be available depending upon the OpenSSL +library that Python uses on your platform. On most platforms the +:func:`sha3_224`, :func:`sha3_256`, :func:`sha3_384`, :func:`sha3_512`, +:func:`shake_128`, :func:`shake_256` are also available. + +.. versionadded:: 3.6 + SHA3 (Keccak) and SHAKE constructors :func:`sha3_224`, :func:`sha3_256`, + :func:`sha3_384`, :func:`sha3_512`, :func:`shake_128`, :func:`shake_256`. + +.. versionadded:: 3.6 + :func:`blake2b` and :func:`blake2s` were added. For example, to obtain the digest of the byte string ``b'Nobody inspects the spammish repetition'``:: >>> import hashlib - >>> m = hashlib.md5() + >>> m = hashlib.sha256() >>> m.update(b"Nobody inspects") >>> m.update(b" the spammish repetition") >>> m.digest() - b'\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9' + b'\x03\x1e\xdd}Ae\x15\x93\xc5\xfe\\\x00o\xa5u+7\xfd\xdf\xf7\xbcN\x84:\xa6\xaf\x0c\x95\x0fK\x94\x06' >>> m.digest_size - 16 + 32 >>> m.block_size 64 @@ -107,7 +119,9 @@ Hashlib provides the following constant attributes: .. data:: algorithms_guaranteed A set containing the names of the hash algorithms guaranteed to be supported - by this module on all platforms. + by this module on all platforms. Note that 'md5' is in this list despite + some upstream vendors offering an odd "FIPS compliant" Python build that + excludes it. .. versionadded:: 3.2 @@ -181,6 +195,28 @@ A hash object has the following methods: compute the digests of data sharing a common initial substring. +SHAKE variable length digests +----------------------------- + +The :func:`shake_128` and :func:`shake_256` algorithms provide variable +length digests with length_in_bits//2 up to 128 or 256 bits of security. +As such, their digest methods require a length. Maximum length is not limited +by the SHAKE algorithm. + +.. method:: shake.digest(length) + + Return the digest of the data passed to the :meth:`update` method so far. + This is a bytes object of size ``length`` which may contain bytes in + the whole range from 0 to 255. + + +.. method:: shake.hexdigest(length) + + Like :meth:`digest` except the digest is returned as a string object of + double length, containing only hexadecimal digits. This may be used to + exchange the value safely in email or other non-binary environments. + + Key derivation -------------- @@ -221,6 +257,29 @@ include a `salt `_. Python implementation uses an inline version of :mod:`hmac`. It is about three times slower and doesn't release the GIL. +.. function:: scrypt(password, *, salt, n, r, p, maxmem=0, dklen=64) + + The function provides scrypt password-based key derivation function as + defined in :rfc:`7914`. + + *password* and *salt* must be bytes-like objects. Applications and + libraries should limit *password* to a sensible length (e.g. 1024). *salt* + should be about 16 or more bytes from a proper source, e.g. :func:`os.urandom`. + + *n* is the CPU/Memory cost factor, *r* the block size, *p* parallelization + factor and *maxmem* limits memory (OpenSSL 1.1.0 defaults to 32 MB). + *dklen* is the length of the derived key. + + Availability: OpenSSL 1.1+ + + .. versionadded:: 3.6 + + +BLAKE2 +------ + +BLAKE2 takes additional arguments, see :ref:`hashlib-blake2`. + .. seealso:: @@ -230,6 +289,8 @@ include a `salt `_. Module :mod:`base64` Another way to encode binary hashes for non-binary environments. + See :ref:`hashlib-blake2`. + http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf The FIPS 180-2 publication on Secure Hash Algorithms. diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index e1acf92..2f59ece 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -69,13 +69,6 @@ The module provides the following classes: must be a :class:`ssl.SSLContext` instance describing the various SSL options. - *key_file* and *cert_file* are deprecated, please use - :meth:`ssl.SSLContext.load_cert_chain` instead, or let - :func:`ssl.create_default_context` select the system's trusted CA - certificates for you. The *check_hostname* parameter is also deprecated; the - :attr:`ssl.SSLContext.check_hostname` attribute of *context* should be used - instead. - Please read :ref:`ssl-security` for more information on best practices. .. versionchanged:: 3.2 @@ -95,6 +88,17 @@ The module provides the following classes: :func:`ssl._create_unverified_context` can be passed to the *context* parameter. + .. deprecated:: 3.6 + + *key_file* and *cert_file* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + + The *check_hostname* parameter is also deprecated; the + :attr:`ssl.SSLContext.check_hostname` attribute of *context* should + be used instead. + .. class:: HTTPResponse(sock, debuglevel=0, method=None, url=None) @@ -217,39 +221,61 @@ HTTPConnection Objects :class:`HTTPConnection` instances have the following methods: -.. method:: HTTPConnection.request(method, url, body=None, headers={}) +.. method:: HTTPConnection.request(method, url, body=None, headers={}, *, \ + encode_chunked=False) This will send a request to the server using the HTTP request method *method* and the selector *url*. If *body* is specified, the specified data is sent after the headers are - finished. It may be a string, a :term:`bytes-like object`, an open - :term:`file object`, or an iterable of :term:`bytes-like object`\s. If - *body* is a string, it is encoded as ISO-8859-1, the default for HTTP. If - it is a bytes-like object the bytes are sent as is. If it is a :term:`file - object`, the contents of the file is sent; this file object should support - at least the ``read()`` method. If the file object has a ``mode`` - attribute, the data returned by the ``read()`` method will be encoded as - ISO-8859-1 unless the ``mode`` attribute contains the substring ``b``, - otherwise the data returned by ``read()`` is sent as is. If *body* is an - iterable, the elements of the iterable are sent as is until the iterable is - exhausted. - - The *headers* argument should be a mapping of extra HTTP - headers to send with the request. - - If *headers* does not contain a Content-Length item, one is added - automatically if possible. If *body* is ``None``, the Content-Length header - is set to ``0`` for methods that expect a body (``PUT``, ``POST``, and - ``PATCH``). If *body* is a string or bytes object, the Content-Length - header is set to its length. If *body* is a :term:`file object` and it - works to call :func:`~os.fstat` on the result of its ``fileno()`` method, - then the Content-Length header is set to the ``st_size`` reported by the - ``fstat`` call. Otherwise no Content-Length header is added. + finished. It may be a :class:`str`, a :term:`bytes-like object`, an + open :term:`file object`, or an iterable of :class:`bytes`. If *body* + is a string, it is encoded as ISO-8859-1, the default for HTTP. If it + is a bytes-like object, the bytes are sent as is. If it is a :term:`file + object`, the contents of the file is sent; this file object should + support at least the ``read()`` method. If the file object is an + instance of :class:`io.TextIOBase`, the data returned by the ``read()`` + method will be encoded as ISO-8859-1, otherwise the data returned by + ``read()`` is sent as is. If *body* is an iterable, the elements of the + iterable are sent as is until the iterable is exhausted. + + The *headers* argument should be a mapping of extra HTTP headers to send + with the request. + + If *headers* contains neither Content-Length nor Transfer-Encoding, + but there is a request body, one of those + header fields will be added automatically. If + *body* is ``None``, the Content-Length header is set to ``0`` for + methods that expect a body (``PUT``, ``POST``, and ``PATCH``). If + *body* is a string or a bytes-like object that is not also a + :term:`file `, the Content-Length header is + set to its length. Any other type of *body* (files + and iterables in general) will be chunk-encoded, and the + Transfer-Encoding header will automatically be set instead of + Content-Length. + + The *encode_chunked* argument is only relevant if Transfer-Encoding is + specified in *headers*. If *encode_chunked* is ``False``, the + HTTPConnection object assumes that all encoding is handled by the + calling code. If it is ``True``, the body will be chunk-encoded. + + .. note:: + Chunked transfer encoding has been added to the HTTP protocol + version 1.1. Unless the HTTP server is known to handle HTTP 1.1, + the caller must either specify the Content-Length, or must pass a + :class:`str` or bytes-like object that is not also a file as the + body representation. .. versionadded:: 3.2 *body* can now be an iterable. + .. versionchanged:: 3.6 + If neither Content-Length nor Transfer-Encoding are set in + *headers*, file and iterable *body* objects are now chunk-encoded. + The *encode_chunked* argument was added. + No attempt is made to determine the Content-Length for file + objects. + .. method:: HTTPConnection.getresponse() Should be called after a request is sent to get the response from the server. @@ -335,13 +361,32 @@ also send your request step by step, by using the four functions below. an argument. -.. method:: HTTPConnection.endheaders(message_body=None) +.. method:: HTTPConnection.endheaders(message_body=None, *, encode_chunked=False) Send a blank line to the server, signalling the end of the headers. The optional *message_body* argument can be used to pass a message body - associated with the request. The message body will be sent in the same - packet as the message headers if it is string, otherwise it is sent in a - separate packet. + associated with the request. + + If *encode_chunked* is ``True``, the result of each iteration of + *message_body* will be chunk-encoded as specified in :rfc:`7230`, + Section 3.3.1. How the data is encoded is dependent on the type of + *message_body*. If *message_body* implements the :ref:`buffer interface + ` the encoding will result in a single chunk. + If *message_body* is a :class:`collections.Iterable`, each iteration + of *message_body* will result in a chunk. If *message_body* is a + :term:`file object`, each call to ``.read()`` will result in a chunk. + The method automatically signals the end of the chunk-encoded data + immediately after *message_body*. + + .. note:: Due to the chunked encoding specification, empty chunks + yielded by an iterator body will be ignored by the chunk-encoder. + This is to avoid premature termination of the read of the request by + the target server due to malformed encoding. + + .. versionadded:: 3.6 + Chunked encoding support. The *encode_chunked* parameter was + added. + .. method:: HTTPConnection.send(data) diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst index 6e71c8a..fb5c1df 100644 --- a/Doc/library/http.server.rst +++ b/Doc/library/http.server.rst @@ -98,15 +98,17 @@ of which this module provides three different variants: .. attribute:: rfile - Contains an input stream, positioned at the start of the optional input - data. + An :class:`io.BufferedIOBase` input stream, ready to read from + the start of the optional input data. .. attribute:: wfile Contains the output stream for writing a response back to the client. Proper adherence to the HTTP protocol must be used when writing to - this stream in order to achieve successful interoperation with HTTP - clients. + this stream. + + .. versionchanged:: 3.6 + This is an :class:`io.BufferedIOBase` stream. :class:`BaseHTTPRequestHandler` has the following attributes: @@ -370,10 +372,9 @@ the current directory:: Handler = http.server.SimpleHTTPRequestHandler - httpd = socketserver.TCPServer(("", PORT), Handler) - - print("serving at port", PORT) - httpd.serve_forever() + with socketserver.TCPServer(("", PORT), Handler) as httpd: + print("serving at port", PORT) + httpd.serve_forever() .. _http-server-cli: diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 80dd6fa..a629bc5 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -244,7 +244,7 @@ Go to File/Line single: stack viewer Debugger (toggle) - When activated, code entered in the Shell or run from an Editor will run + When actived, code entered in the Shell or run from an Editor will run under the debugger. In the Editor, breakpoints can be set with the context menu. This feature is still incomplete and somewhat experimental. @@ -372,7 +372,7 @@ the :kbd:`Command` key on Mac OSX. * :kbd:`C-l` center window around the insertion point - * :kbd:`C-b` go backward one character without deleting (usually you can + * :kbd:`C-b` go backwards one character without deleting (usually you can also use the cursor key for this) * :kbd:`C-f` go forward one character without deleting (usually you can @@ -394,7 +394,7 @@ After a block-opening statement, the next line is indented by 4 spaces (in the Python Shell window by one tab). After certain keywords (break, return etc.) the next line is dedented. In leading indentation, :kbd:`Backspace` deletes up to 4 spaces if they are there. :kbd:`Tab` inserts spaces (in the Python -Shell window one tab), number depends on Indent width. Currently, tabs +Shell window one tab), number depends on Indent width. Currently tabs are restricted to four spaces due to Tcl/Tk limitations. See also the indent/dedent region commands in the edit menu. @@ -418,7 +418,7 @@ If there is only one possible completion for the characters entered, a :kbd:`C-space` will open a completions window. In an empty string, this will contain the files in the current directory. On a blank line, it will contain the built-in and user-defined functions and -classes in the current namespaces, plus any modules imported. If some +classes in the current name spaces, plus any modules imported. If some characters have been entered, the ACW will attempt to be more specific. If a string of characters is typed, the ACW selection will jump to the @@ -557,7 +557,7 @@ IDLE-console differences As much as possible, the result of executing Python code with IDLE is the same as executing the same code in a console window. However, the different -interface and operation occasionally affect visible results. For instance, +interface and operation occasionally affects visible results. For instance, ``sys.modules`` starts with more entries. IDLE also replaces ``sys.stdin``, ``sys.stdout``, and ``sys.stderr`` with @@ -583,7 +583,7 @@ If firewall software complains anyway, you can ignore it. If the attempt to make the socket connection fails, Idle will notify you. Such failures are sometimes transient, but if persistent, the problem -may be either a firewall blocking the connection or misconfiguration of +may be either a firewall blocking the connecton or misconfiguration of a particular system. Until the problem is fixed, one can run Idle with the -n command line switch. @@ -619,14 +619,14 @@ Setting preferences The font preferences, highlighting, keys, and general preferences can be changed via Configure IDLE on the Option menu. Keys can be user defined; -IDLE ships with four built-in key sets. In addition, a user can create a +IDLE ships with four built in key sets. In addition a user can create a custom key set in the Configure IDLE dialog under the keys tab. Extensions ^^^^^^^^^^ -IDLE contains an extension facility. Preferences for extensions can be +IDLE contains an extension facility. Peferences for extensions can be changed with Configure Extensions. See the beginning of config-extensions.def in the idlelib directory for further information. The default extensions are currently: diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst index 771ca43..1632eb7 100644 --- a/Doc/library/imaplib.rst +++ b/Doc/library/imaplib.rst @@ -103,6 +103,14 @@ There's also a subclass for secure connections: :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :data:`ssl.HAS_SNI`). + .. deprecated:: 3.6 + + *keyfile* and *certfile* are deprecated in favor of *ssl_context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + + The second subclass allows for connections created by a child process: @@ -500,6 +508,17 @@ An :class:`IMAP4` instance has the following methods: M.store(num, '+FLAGS', '\\Deleted') M.expunge() + .. note:: + + Creating flags containing ']' (for example: "[test]") violates + :rfc:`3501` (the IMAP protocol). However, imaplib has historically + allowed creation of such tags, and popular IMAP servers, such as Gmail, + accept and produce such flags. There are non-Python programs which also + create such tags. Although it is an RFC violation and IMAP clients and + servers are supposed to be strict, imaplib nonetheless continues to allow + such tags to be created for backward compatibility reasons, and as of + python 3.6, handles them if they are sent from the server, since this + improves real-world compatibility. .. method:: IMAP4.subscribe(mailbox) diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst index f11f6dc..800e919 100644 --- a/Doc/library/imghdr.rst +++ b/Doc/library/imghdr.rst @@ -20,6 +20,9 @@ The :mod:`imghdr` module defines the following function: string describing the image type. If optional *h* is provided, the *filename* is ignored and *h* is assumed to contain the byte stream to test. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + The following image types are recognized, as listed below with the return value from :func:`what`: diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst index 9828ba6..ccf5f92 100644 --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -85,7 +85,9 @@ This module provides an interface to the mechanisms used to implement the .. deprecated:: 3.3 Use :func:`importlib.util.find_spec` instead unless Python 3.3 compatibility is required, in which case use - :func:`importlib.find_loader`. + :func:`importlib.find_loader`. For example usage of the former case, + see the :ref:`importlib-examples` section of the :mod:`importlib` + documentation. .. function:: load_module(name, file, pathname, description) @@ -112,9 +114,12 @@ This module provides an interface to the mechanisms used to implement the If previously used in conjunction with :func:`imp.find_module` then consider using :func:`importlib.import_module`, otherwise use the loader returned by the replacement you chose for :func:`imp.find_module`. If you - called :func:`imp.load_module` and related functions directly then use the - classes in :mod:`importlib.machinery`, e.g. - ``importlib.machinery.SourceFileLoader(name, path).load_module()``. + called :func:`imp.load_module` and related functions directly with file + path arguments then use a combination of + :func:`importlib.util.spec_from_file_location` and + :func:`importlib.util.module_from_spec`. See the :ref:`importlib-examples` + section of the :mod:`importlib` documentation for details of the various + approaches. .. function:: new_module(name) @@ -123,7 +128,7 @@ This module provides an interface to the mechanisms used to implement the in ``sys.modules``. .. deprecated:: 3.4 - Use :class:`types.ModuleType` instead. + Use :func:`importlib.util.module_from_spec` instead. .. function:: reload(module) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst index 526c9f3..1fd5698 100644 --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -267,7 +267,7 @@ ABC hierarchy:: module and *path* will be the value of :attr:`__path__` from the parent package. If a spec cannot be found, ``None`` is returned. When passed in, ``target`` is a module object that the finder may - use to make a more educated about what spec to return. + use to make a more educated guess about what spec to return. .. versionadded:: 3.4 @@ -317,7 +317,7 @@ ABC hierarchy:: within the :term:`path entry` to which it is assigned. If a spec cannot be found, ``None`` is returned. When passed in, ``target`` is a module object that the finder may use to make a more educated - about what spec to return. + guess about what spec to return. .. versionadded:: 3.4 @@ -379,10 +379,14 @@ ABC hierarchy:: An abstract method that executes the module in its own namespace when a module is imported or reloaded. The module should already - be initialized when exec_module() is called. + be initialized when ``exec_module()`` is called. When this method exists, + :meth:`~importlib.abc.Loader.create_module` must be defined. .. versionadded:: 3.4 + .. versionchanged:: 3.6 + :meth:`~importlib.abc.Loader.create_module` must also be defined. + .. method:: load_module(fullname) A legacy method for loading a module. If the module cannot be @@ -802,6 +806,10 @@ find and load modules. .. versionadded:: 3.3 + .. deprecated:: 3.6 + Use :mod:`site` configuration instead. Future versions of Python may + not enable this finder by default. + .. class:: PathFinder @@ -936,6 +944,10 @@ find and load modules. Concrete implementation of :meth:`importlib.abc.Loader.load_module` where specifying the name of the module to load is optional. + .. deprecated:: 3.6 + + Use :meth:`importlib.abc.Loader.exec_module` instead. + .. class:: SourcelessFileLoader(fullname, path) @@ -975,6 +987,10 @@ find and load modules. Concrete implementation of :meth:`importlib.abc.Loader.load_module` where specifying the name of the module to load is optional. + .. deprecated:: 3.6 + + Use :meth:`importlib.abc.Loader.exec_module` instead. + .. class:: ExtensionFileLoader(fullname, path) @@ -1137,6 +1153,9 @@ an :term:`importer`. The *optimization* parameter was added and the *debug_override* parameter was deprecated. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: source_from_cache(path) @@ -1150,6 +1169,9 @@ an :term:`importer`. .. versionadded:: 3.4 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: decode_source(source_bytes) Decode the given bytes representing source code and return it as a string @@ -1192,12 +1214,13 @@ an :term:`importer`. .. function:: module_from_spec(spec) - Create a new module based on **spec** and ``spec.loader.create_module()``. + Create a new module based on **spec** and + :meth:`spec.loader.create_module `. - If ``spec.loader.create_module()`` does not return ``None``, then any - pre-existing attributes will not be reset. Also, no :exc:`AttributeError` - will be raised if triggered while accessing **spec** or setting an attribute - on the module. + If :meth:`spec.loader.create_module ` + does not return ``None``, then any pre-existing attributes will not be reset. + Also, no :exc:`AttributeError` will be raised if triggered while accessing + **spec** or setting an attribute on the module. This function is preferred over using :class:`types.ModuleType` to create a new module as **spec** is used to set as many import-controlled attributes on @@ -1259,7 +1282,8 @@ an :term:`importer`. .. decorator:: set_package - A :term:`decorator` for :meth:`importlib.abc.Loader.load_module` to set the :attr:`__package__` attribute on the returned module. If :attr:`__package__` + A :term:`decorator` for :meth:`importlib.abc.Loader.load_module` to set the + :attr:`__package__` attribute on the returned module. If :attr:`__package__` is set and has a value other than ``None`` it will not be changed. .. deprecated:: 3.4 @@ -1284,6 +1308,9 @@ an :term:`importer`. .. versionadded:: 3.4 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. class:: LazyLoader(loader) A class which postpones the execution of the loader of a module until the @@ -1292,13 +1319,12 @@ an :term:`importer`. This class **only** works with loaders that define :meth:`~importlib.abc.Loader.exec_module` as control over what module type is used for the module is required. For those same reasons, the loader's - :meth:`~importlib.abc.Loader.create_module` method will be ignored (i.e., the - loader's method should only return ``None``; this excludes - :class:`BuiltinImporter` and :class:`ExtensionFileLoader`). Finally, - modules which substitute the object placed into :attr:`sys.modules` will - not work as there is no way to properly replace the module references - throughout the interpreter safely; :exc:`ValueError` is raised if such a - substitution is detected. + :meth:`~importlib.abc.Loader.create_module` method must return ``None`` or a + type for which its ``__class__`` attribute can be mutated along with not + using :term:`slots <__slots__>`. Finally, modules which substitute the object + placed into :attr:`sys.modules` will not work as there is no way to properly + replace the module references throughout the interpreter safely; + :exc:`ValueError` is raised if such a substitution is detected. .. note:: For projects where startup time is critical, this class allows for @@ -1309,6 +1335,11 @@ an :term:`importer`. .. versionadded:: 3.5 + .. versionchanged:: 3.6 + Began calling :meth:`~importlib.abc.Loader.create_module`, removing the + compatibility warning for :class:`importlib.machinery.BuiltinImporter` and + :class:`importlib.machinery.ExtensionFileLoader`. + .. classmethod:: factory(loader) A static method which returns a callable that creates a lazy loader. This @@ -1320,3 +1351,139 @@ an :term:`importer`. loader = importlib.machinery.SourceFileLoader lazy_loader = importlib.util.LazyLoader.factory(loader) finder = importlib.machinery.FileFinder(path, (lazy_loader, suffixes)) + +.. _importlib-examples: + +Examples +-------- + +Importing programmatically +'''''''''''''''''''''''''' + +To programmatically import a module, use :func:`importlib.import_module`. +:: + + import importlib + + itertools = importlib.import_module('itertools') + + +Checking if a module can be imported +'''''''''''''''''''''''''''''''''''' + +If you need to find out if a module can be imported without actually doing the +import, then you should use :func:`importlib.util.find_spec`. +:: + + import importlib.util + import sys + + # For illustrative purposes. + name = 'itertools' + + spec = importlib.util.find_spec(name) + if spec is None: + print("can't find the itertools module") + else: + # If you chose to perform the actual import ... + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + # Adding the module to sys.modules is optional. + sys.modules[name] = module + + +Importing a source file directly +'''''''''''''''''''''''''''''''' + +To import a Python source file directly, use the following recipe +(Python 3.4 and newer only):: + + import importlib.util + import sys + + # For illustrative purposes. + import tokenize + file_path = tokenize.__file__ + module_name = tokenize.__name__ + + spec = importlib.util.spec_from_file_location(module_name, file_path) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + # Optional; only necessary if you want to be able to import the module + # by name later. + sys.modules[module_name] = module + + +Setting up an importer +'''''''''''''''''''''' + +For deep customizations of import, you typically want to implement an +:term:`importer`. This means managing both the :term:`finder` and :term:`loader` +side of things. For finders there are two flavours to choose from depending on +your needs: a :term:`meta path finder` or a :term:`path entry finder`. The +former is what you would put on :attr:`sys.meta_path` while the latter is what +you create using a :term:`path entry hook` on :attr:`sys.path_hooks` which works +with :attr:`sys.path` entries to potentially create a finder. This example will +show you how to register your own importers so that import will use them (for +creating an importer for yourself, read the documentation for the appropriate +classes defined within this package):: + + import importlib.machinery + import sys + + # For illustrative purposes only. + SpamMetaPathFinder = importlib.machinery.PathFinder + SpamPathEntryFinder = importlib.machinery.FileFinder + loader_details = (importlib.machinery.SourceFileLoader, + importlib.machinery.SOURCE_SUFFIXES) + + # Setting up a meta path finder. + # Make sure to put the finder in the proper location in the list in terms of + # priority. + sys.meta_path.append(SpamMetaPathFinder) + + # Setting up a path entry finder. + # Make sure to put the path hook in the proper location in the list in terms + # of priority. + sys.path_hooks.append(SpamPathEntryFinder.path_hook(loader_details)) + + +Approximating :func:`importlib.import_module` +''''''''''''''''''''''''''''''''''''''''''''' + +Import itself is implemented in Python code, making it possible to +expose most of the import machinery through importlib. The following +helps illustrate the various APIs that importlib exposes by providing an +approximate implementation of +:func:`importlib.import_module` (Python 3.4 and newer for the importlib usage, +Python 3.6 and newer for other parts of the code). +:: + + import importlib.util + import sys + + def import_module(name, package=None): + """An approximate implementation of import.""" + absolute_name = importlib.util.resolve_name(name, package) + try: + return sys.modules[absolute_name] + except KeyError: + pass + + path = None + if '.' in absolute_name: + parent_name, _, child_name = absolute_name.rpartition('.') + parent_module = import_module(parent_name) + path = parent_module.spec.submodule_search_locations + for finder in sys.meta_path: + spec = finder.find_spec(absolute_name, path) + if spec is not None: + break + else: + raise ImportError(f'No module named {absolute_name!r}') + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + sys.modules[absolute_name] = module + if path is not None: + setattr(parent_module, child_name, module) + return module diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 16e33f0..41a784d 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -34,198 +34,185 @@ provided as convenient choices for the second argument to :func:`getmembers`. They also help you determine when you can expect to find the following special attributes: -+-----------+-------------------+---------------------------+ -| Type | Attribute | Description | -+===========+===================+===========================+ -| module | __doc__ | documentation string | -+-----------+-------------------+---------------------------+ -| | __file__ | filename (missing for | -| | | built-in modules) | -+-----------+-------------------+---------------------------+ -| class | __doc__ | documentation string | -+-----------+-------------------+---------------------------+ -| | __name__ | name with which this | -| | | class was defined | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | __module__ | name of module in which | -| | | this class was defined | -+-----------+-------------------+---------------------------+ -| method | __doc__ | documentation string | -+-----------+-------------------+---------------------------+ -| | __name__ | name with which this | -| | | method was defined | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | __func__ | function object | -| | | containing implementation | -| | | of method | -+-----------+-------------------+---------------------------+ -| | __self__ | instance to which this | -| | | method is bound, or | -| | | ``None`` | -+-----------+-------------------+---------------------------+ -| function | __doc__ | documentation string | -+-----------+-------------------+---------------------------+ -| | __name__ | name with which this | -| | | function was defined | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | __code__ | code object containing | -| | | compiled function | -| | | :term:`bytecode` | -+-----------+-------------------+---------------------------+ -| | __defaults__ | tuple of any default | -| | | values for positional or | -| | | keyword parameters | -+-----------+-------------------+---------------------------+ -| | __kwdefaults__ | mapping of any default | -| | | values for keyword-only | -| | | parameters | -+-----------+-------------------+---------------------------+ -| | __globals__ | global namespace in which | -| | | this function was defined | -+-----------+-------------------+---------------------------+ -| | __annotations__ | mapping of parameters | -| | | names to annotations; | -| | | ``"return"`` key is | -| | | reserved for return | -| | | annotations. | -+-----------+-------------------+---------------------------+ -| traceback | tb_frame | frame object at this | -| | | level | -+-----------+-------------------+---------------------------+ -| | tb_lasti | index of last attempted | -| | | instruction in bytecode | -+-----------+-------------------+---------------------------+ -| | tb_lineno | current line number in | -| | | Python source code | -+-----------+-------------------+---------------------------+ -| | tb_next | next inner traceback | -| | | object (called by this | -| | | level) | -+-----------+-------------------+---------------------------+ -| frame | f_back | next outer frame object | -| | | (this frame's caller) | -+-----------+-------------------+---------------------------+ -| | f_builtins | builtins namespace seen | -| | | by this frame | -+-----------+-------------------+---------------------------+ -| | f_code | code object being | -| | | executed in this frame | -+-----------+-------------------+---------------------------+ -| | f_globals | global namespace seen by | -| | | this frame | -+-----------+-------------------+---------------------------+ -| | f_lasti | index of last attempted | -| | | instruction in bytecode | -+-----------+-------------------+---------------------------+ -| | f_lineno | current line number in | -| | | Python source code | -+-----------+-------------------+---------------------------+ -| | f_locals | local namespace seen by | -| | | this frame | -+-----------+-------------------+---------------------------+ -| | f_restricted | 0 or 1 if frame is in | -| | | restricted execution mode | -+-----------+-------------------+---------------------------+ -| | f_trace | tracing function for this | -| | | frame, or ``None`` | -+-----------+-------------------+---------------------------+ -| code | co_argcount | number of arguments (not | -| | | including keyword only | -| | | arguments, \* or \*\* | -| | | args) | -+-----------+-------------------+---------------------------+ -| | co_code | string of raw compiled | -| | | bytecode | -+-----------+-------------------+---------------------------+ -| | co_cellvars | tuple of names of cell | -| | | variables (referenced by | -| | | containing scopes) | -+-----------+-------------------+---------------------------+ -| | co_consts | tuple of constants used | -| | | in the bytecode | -+-----------+-------------------+---------------------------+ -| | co_filename | name of file in which | -| | | this code object was | -| | | created | -+-----------+-------------------+---------------------------+ -| | co_firstlineno | number of first line in | -| | | Python source code | -+-----------+-------------------+---------------------------+ -| | co_flags | bitmap of ``CO_*`` flags, | -| | | read more :ref:`here | -| | | `| -+-----------+-------------------+---------------------------+ -| | co_lnotab | encoded mapping of line | -| | | numbers to bytecode | -| | | indices | -+-----------+-------------------+---------------------------+ -| | co_freevars | tuple of names of free | -| | | variables (referenced via | -| | | a function's closure) | -+-----------+-------------------+---------------------------+ -| | co_kwonlyargcount | number of keyword only | -| | | arguments (not including | -| | | \*\* arg) | -+-----------+-------------------+---------------------------+ -| | co_name | name with which this code | -| | | object was defined | -+-----------+-------------------+---------------------------+ -| | co_names | tuple of names of local | -| | | variables | -+-----------+-------------------+---------------------------+ -| | co_nlocals | number of local variables | -+-----------+-------------------+---------------------------+ -| | co_stacksize | virtual machine stack | -| | | space required | -+-----------+-------------------+---------------------------+ -| | co_varnames | tuple of names of | -| | | arguments and local | -| | | variables | -+-----------+-------------------+---------------------------+ -| generator | __name__ | name | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | gi_frame | frame | -+-----------+-------------------+---------------------------+ -| | gi_running | is the generator running? | -+-----------+-------------------+---------------------------+ -| | gi_code | code | -+-----------+-------------------+---------------------------+ -| | gi_yieldfrom | object being iterated by | -| | | ``yield from``, or | -| | | ``None`` | -+-----------+-------------------+---------------------------+ -| coroutine | __name__ | name | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | cr_await | object being awaited on, | -| | | or ``None`` | -+-----------+-------------------+---------------------------+ -| | cr_frame | frame | -+-----------+-------------------+---------------------------+ -| | cr_running | is the coroutine running? | -+-----------+-------------------+---------------------------+ -| | cr_code | code | -+-----------+-------------------+---------------------------+ -| builtin | __doc__ | documentation string | -+-----------+-------------------+---------------------------+ -| | __name__ | original name of this | -| | | function or method | -+-----------+-------------------+---------------------------+ -| | __qualname__ | qualified name | -+-----------+-------------------+---------------------------+ -| | __self__ | instance to which a | -| | | method is bound, or | -| | | ``None`` | -+-----------+-------------------+---------------------------+ ++-----------+-----------------+---------------------------+ +| Type | Attribute | Description | ++===========+=================+===========================+ +| module | __doc__ | documentation string | ++-----------+-----------------+---------------------------+ +| | __file__ | filename (missing for | +| | | built-in modules) | ++-----------+-----------------+---------------------------+ +| class | __doc__ | documentation string | ++-----------+-----------------+---------------------------+ +| | __name__ | name with which this | +| | | class was defined | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | __module__ | name of module in which | +| | | this class was defined | ++-----------+-----------------+---------------------------+ +| method | __doc__ | documentation string | ++-----------+-----------------+---------------------------+ +| | __name__ | name with which this | +| | | method was defined | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | __func__ | function object | +| | | containing implementation | +| | | of method | ++-----------+-----------------+---------------------------+ +| | __self__ | instance to which this | +| | | method is bound, or | +| | | ``None`` | ++-----------+-----------------+---------------------------+ +| function | __doc__ | documentation string | ++-----------+-----------------+---------------------------+ +| | __name__ | name with which this | +| | | function was defined | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | __code__ | code object containing | +| | | compiled function | +| | | :term:`bytecode` | ++-----------+-----------------+---------------------------+ +| | __defaults__ | tuple of any default | +| | | values for positional or | +| | | keyword parameters | ++-----------+-----------------+---------------------------+ +| | __kwdefaults__ | mapping of any default | +| | | values for keyword-only | +| | | parameters | ++-----------+-----------------+---------------------------+ +| | __globals__ | global namespace in which | +| | | this function was defined | ++-----------+-----------------+---------------------------+ +| | __annotations__ | mapping of parameters | +| | | names to annotations; | +| | | ``"return"`` key is | +| | | reserved for return | +| | | annotations. | ++-----------+-----------------+---------------------------+ +| traceback | tb_frame | frame object at this | +| | | level | ++-----------+-----------------+---------------------------+ +| | tb_lasti | index of last attempted | +| | | instruction in bytecode | ++-----------+-----------------+---------------------------+ +| | tb_lineno | current line number in | +| | | Python source code | ++-----------+-----------------+---------------------------+ +| | tb_next | next inner traceback | +| | | object (called by this | +| | | level) | ++-----------+-----------------+---------------------------+ +| frame | f_back | next outer frame object | +| | | (this frame's caller) | ++-----------+-----------------+---------------------------+ +| | f_builtins | builtins namespace seen | +| | | by this frame | ++-----------+-----------------+---------------------------+ +| | f_code | code object being | +| | | executed in this frame | ++-----------+-----------------+---------------------------+ +| | f_globals | global namespace seen by | +| | | this frame | ++-----------+-----------------+---------------------------+ +| | f_lasti | index of last attempted | +| | | instruction in bytecode | ++-----------+-----------------+---------------------------+ +| | f_lineno | current line number in | +| | | Python source code | ++-----------+-----------------+---------------------------+ +| | f_locals | local namespace seen by | +| | | this frame | ++-----------+-----------------+---------------------------+ +| | f_restricted | 0 or 1 if frame is in | +| | | restricted execution mode | ++-----------+-----------------+---------------------------+ +| | f_trace | tracing function for this | +| | | frame, or ``None`` | ++-----------+-----------------+---------------------------+ +| code | co_argcount | number of arguments (not | +| | | including \* or \*\* | +| | | args) | ++-----------+-----------------+---------------------------+ +| | co_code | string of raw compiled | +| | | bytecode | ++-----------+-----------------+---------------------------+ +| | co_consts | tuple of constants used | +| | | in the bytecode | ++-----------+-----------------+---------------------------+ +| | co_filename | name of file in which | +| | | this code object was | +| | | created | ++-----------+-----------------+---------------------------+ +| | co_firstlineno | number of first line in | +| | | Python source code | ++-----------+-----------------+---------------------------+ +| | co_flags | bitmap of ``CO_*`` flags, | +| | | read more :ref:`here | +| | | `| ++-----------+-----------------+---------------------------+ +| | co_lnotab | encoded mapping of line | +| | | numbers to bytecode | +| | | indices | ++-----------+-----------------+---------------------------+ +| | co_name | name with which this code | +| | | object was defined | ++-----------+-----------------+---------------------------+ +| | co_names | tuple of names of local | +| | | variables | ++-----------+-----------------+---------------------------+ +| | co_nlocals | number of local variables | ++-----------+-----------------+---------------------------+ +| | co_stacksize | virtual machine stack | +| | | space required | ++-----------+-----------------+---------------------------+ +| | co_varnames | tuple of names of | +| | | arguments and local | +| | | variables | ++-----------+-----------------+---------------------------+ +| generator | __name__ | name | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | gi_frame | frame | ++-----------+-----------------+---------------------------+ +| | gi_running | is the generator running? | ++-----------+-----------------+---------------------------+ +| | gi_code | code | ++-----------+-----------------+---------------------------+ +| | gi_yieldfrom | object being iterated by | +| | | ``yield from``, or | +| | | ``None`` | ++-----------+-----------------+---------------------------+ +| coroutine | __name__ | name | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | cr_await | object being awaited on, | +| | | or ``None`` | ++-----------+-----------------+---------------------------+ +| | cr_frame | frame | ++-----------+-----------------+---------------------------+ +| | cr_running | is the coroutine running? | ++-----------+-----------------+---------------------------+ +| | cr_code | code | ++-----------+-----------------+---------------------------+ +| builtin | __doc__ | documentation string | ++-----------+-----------------+---------------------------+ +| | __name__ | original name of this | +| | | function or method | ++-----------+-----------------+---------------------------+ +| | __qualname__ | qualified name | ++-----------+-----------------+---------------------------+ +| | __self__ | instance to which a | +| | | method is bound, or | +| | | ``None`` | ++-----------+-----------------+---------------------------+ .. versionchanged:: 3.5 @@ -248,24 +235,6 @@ attributes: listed in the metaclass' custom :meth:`__dir__`. -.. function:: getmoduleinfo(path) - - Returns a :term:`named tuple` ``ModuleInfo(name, suffix, mode, module_type)`` - of values that describe how Python will interpret the file identified by - *path* if it is a module, or ``None`` if it would not be identified as a - module. In that tuple, *name* is the name of the module without the name of - any enclosing package, *suffix* is the trailing part of the file name (which - may not be a dot-delimited extension), *mode* is the :func:`open` mode that - would be used (``'r'`` or ``'rb'``), and *module_type* is an integer giving - the type of the module. *module_type* will have a value which can be - compared to the constants defined in the :mod:`imp` module; see the - documentation for that module for more information on module types. - - .. deprecated:: 3.3 - You may check the file path's suffix against the supported suffixes - listed in :mod:`importlib.machinery` to infer the same information. - - .. function:: getmodulename(path) Return the name of the module named by the file *path*, without including the @@ -279,8 +248,7 @@ attributes: still return ``None``. .. versionchanged:: 3.3 - This function is now based directly on :mod:`importlib` rather than the - deprecated :func:`getmoduleinfo`. + The function is based directly on :mod:`importlib`. .. function:: ismodule(object) @@ -350,6 +318,27 @@ attributes: .. versionadded:: 3.5 +.. function:: isasyncgenfunction(object) + + Return true if the object is an :term:`asynchronous generator` function, + for example:: + + >>> async def agen(): + ... yield 1 + ... + >>> inspect.isasyncgenfunction(agen) + True + + .. versionadded:: 3.6 + + +.. function:: isasyncgen(object) + + Return true if the object is an :term:`asynchronous generator iterator` + created by an :term:`asynchronous generator` function. + + .. versionadded:: 3.6 + .. function:: istraceback(object) Return true if the object is a traceback. @@ -453,9 +442,7 @@ Retrieving source code Return in a single string any lines of comments immediately preceding the object's source code (for a class, function, or method), or at the top of the - Python source file (if the object is a module). If the object's source code - is unavailable, return ``None``. This could happen if the object has been - defined in C or the interactive shell. + Python source file (if the object is a module). .. function:: getfile(object) @@ -661,6 +648,16 @@ function. The name of the parameter as a string. The name must be a valid Python identifier. + .. impl-detail:: + + CPython generates implicit parameter names of the form ``.0`` on the + code objects used to implement comprehensions and generator + expressions. + + .. versionchanged:: 3.6 + These parameter names are exposed by this module as names like + ``implicit0``. + .. attribute:: Parameter.default The default value for the parameter. If the parameter has no default @@ -839,47 +836,65 @@ Classes and functions .. function:: getargspec(func) - Get the names and default values of a Python function's arguments. A + Get the names and default values of a Python function's parameters. A :term:`named tuple` ``ArgSpec(args, varargs, keywords, defaults)`` is - returned. *args* is a list of the argument names. *varargs* and *keywords* - are the names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a + returned. *args* is a list of the parameter names. *varargs* and *keywords* + are the names of the ``*`` and ``**`` parameters or ``None``. *defaults* is a tuple of default argument values or ``None`` if there are no default arguments; if this tuple has *n* elements, they correspond to the last *n* elements listed in *args*. .. deprecated:: 3.0 - Use :func:`signature` and + Use :func:`getfullargspec` for an updated API that is usually a drop-in + replacement, but also correctly handles function annotations and + keyword-only parameters. + + Alternatively, use :func:`signature` and :ref:`Signature Object `, which provide a - better introspecting API for callables. + more structured introspection API for callables. .. function:: getfullargspec(func) - Get the names and default values of a Python function's arguments. A + Get the names and default values of a Python function's parameters. A :term:`named tuple` is returned: ``FullArgSpec(args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations)`` - *args* is a list of the argument names. *varargs* and *varkw* are the names - of the ``*`` and ``**`` arguments or ``None``. *defaults* is an *n*-tuple - of the default values of the last *n* arguments, or ``None`` if there are no - default arguments. *kwonlyargs* is a list of - keyword-only argument names. *kwonlydefaults* is a dictionary mapping names - from kwonlyargs to defaults. *annotations* is a dictionary mapping argument - names to annotations. - - The first four items in the tuple correspond to :func:`getargspec`. + *args* is a list of the positional parameter names. + *varargs* is the name of the ``*`` parameter or ``None`` if arbitrary + positional arguments are not accepted. + *varkw* is the name of the ``**`` parameter or ``None`` if arbitrary + keyword arguments are not accepted. + *defaults* is an *n*-tuple of default argument values corresponding to the + last *n* positional parameters, or ``None`` if there are no such defaults + defined. + *kwonlyargs* is a list of keyword-only parameter names. + *kwonlydefaults* is a dictionary mapping parameter names from *kwonlyargs* + to the default values used if no argument is supplied. + *annotations* is a dictionary mapping parameter names to annotations. + The special key ``"return"`` is used to report the function return value + annotation (if any). + + Note that :func:`signature` and + :ref:`Signature Object ` provide the recommended + API for callable introspection, and support additional behaviours (like + positional-only arguments) that are sometimes encountered in extension module + APIs. This function is retained primarily for use in code that needs to + maintain compatibility with the Python 2 ``inspect`` module API. .. versionchanged:: 3.4 This function is now based on :func:`signature`, but still ignores ``__wrapped__`` attributes and includes the already bound first parameter in the signature output for bound methods. - .. deprecated:: 3.5 - Use :func:`signature` and - :ref:`Signature Object `, which provide a - better introspecting API for callables. + .. versionchanged:: 3.6 + This method was previously documented as deprecated in favour of + :func:`signature` in Python 3.5, but that decision has been reversed + in order to restore a clearly supported standard interface for + single-source Python 2/3 code migrating away from the legacy + :func:`getargspec` API. .. function:: getargvalues(frame) @@ -890,14 +905,16 @@ Classes and functions are the names of the ``*`` and ``**`` arguments or ``None``. *locals* is the locals dictionary of the given frame. - .. note:: - This function was inadvertently marked as deprecated in Python 3.5. + .. deprecated:: 3.5 + Use :func:`signature` and + :ref:`Signature Object `, which provide a + better introspecting API for callables. .. function:: formatargspec(args[, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations[, formatarg, formatvarargs, formatvarkw, formatvalue, formatreturns, formatannotations]]) Format a pretty argument spec from the values returned by - :func:`getargspec` or :func:`getfullargspec`. + :func:`getfullargspec`. The first seven arguments are (``args``, ``varargs``, ``varkw``, ``defaults``, ``kwonlyargs``, ``kwonlydefaults``, ``annotations``). @@ -927,8 +944,10 @@ Classes and functions :func:`getargvalues`. The format\* arguments are the corresponding optional formatting functions that are called to turn names and values into strings. - .. note:: - This function was inadvertently marked as deprecated in Python 3.5. + .. deprecated:: 3.5 + Use :func:`signature` and + :ref:`Signature Object `, which provide a + better introspecting API for callables. .. function:: getmro(cls) @@ -1251,10 +1270,6 @@ Code Objects Bit Flags Python code objects have a ``co_flags`` attribute, which is a bitmap of the following flags: -.. data:: CO_OPTIMIZED - - The code object is optimized, using fast locals. - .. data:: CO_NEWLOCALS If set, a new dict will be created for the frame's ``f_locals`` when @@ -1268,10 +1283,6 @@ the following flags: The code object has a variable keyword parameter (``**kwargs``-like). -.. data:: CO_NESTED - - The flag is set when the code object is a nested function. - .. data:: CO_GENERATOR The flag is set when the code object is a generator function, i.e. @@ -1283,20 +1294,29 @@ the following flags: .. data:: CO_COROUTINE - The flag is set when the code object is a coroutine function, i.e. - a coroutine object is returned when the code object is executed. See - :pep:`492` for more details. + The flag is set when the code object is a coroutine function. + When the code object is executed it returns a coroutine object. + See :pep:`492` for more details. .. versionadded:: 3.5 .. data:: CO_ITERABLE_COROUTINE - Used to turn generators into generator-based coroutines. Generator - objects with this flag can be used in ``await`` expression, and can - ``yield from`` coroutine objects. See :pep:`492` for more details. + The flag is used to transform generators into generator-based + coroutines. Generator objects with this flag can be used in + ``await`` expression, and can ``yield from`` coroutine objects. + See :pep:`492` for more details. .. versionadded:: 3.5 +.. data:: CO_ASYNC_GENERATOR + + The flag is set when the code object is an asynchronous generator + function. When the code object is executed it returns an + asynchronous generator object. See :pep:`525` for more details. + + .. versionadded:: 3.6 + .. note:: The flags are specific to CPython, and may not be defined in other Python implementations. Furthermore, the flags are an implementation @@ -1305,7 +1325,6 @@ the following flags: for any introspection needs. - .. _inspect-module-cli: Command Line Interface diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index dfc1ddc..b0d0a8c 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -591,7 +591,13 @@ loops that truncate the stream. .. function:: tee(iterable, n=2) - Return *n* independent iterators from a single iterable. Roughly equivalent to:: + Return *n* independent iterators from a single iterable. + + The following Python code helps explain what *tee* does (although the actual + implementation is more complex and uses only a single underlying + :abbr:`FIFO (first-in, first-out)` queue). + + Roughly equivalent to:: def tee(iterable, n=2): it = iter(iterable) diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 30c2911..76e936f 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -126,7 +126,7 @@ See :ref:`json-commandline` for detailed documentation. Basic Usage ----------- -.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, \ +.. function:: dump(obj, fp, *, skipkeys=False, ensure_ascii=True, \ check_circular=True, allow_nan=True, cls=None, \ indent=None, separators=None, default=None, \ sort_keys=False, **kw) @@ -187,8 +187,11 @@ Basic Usage :meth:`default` method to serialize additional types), specify it with the *cls* kwarg; otherwise :class:`JSONEncoder` is used. + .. versionchanged:: 3.6 + All optional parameters are now :ref:`keyword-only `. -.. function:: dumps(obj, skipkeys=False, ensure_ascii=True, \ + +.. function:: dumps(obj, *, skipkeys=False, ensure_ascii=True, \ check_circular=True, allow_nan=True, cls=None, \ indent=None, separators=None, default=None, \ sort_keys=False, **kw) @@ -212,7 +215,7 @@ Basic Usage the original one. That is, ``loads(dumps(x)) != x`` if x has non-string keys. -.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw) +.. function:: load(fp, *, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw) Deserialize *fp* (a ``.read()``-supporting :term:`file-like object` containing a JSON document) to a Python object using this :ref:`conversion @@ -260,10 +263,14 @@ Basic Usage If the data being deserialized is not a valid JSON document, a :exc:`JSONDecodeError` will be raised. -.. function:: loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw) + .. versionchanged:: 3.6 + All optional parameters are now :ref:`keyword-only `. + +.. function:: loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw) - Deserialize *s* (a :class:`str` instance containing a JSON document) to a - Python object using this :ref:`conversion table `. + Deserialize *s* (a :class:`str`, :class:`bytes` or :class:`bytearray` + instance containing a JSON document) to a Python object using this + :ref:`conversion table `. The other arguments have the same meaning as in :func:`load`, except *encoding* which is ignored and deprecated. @@ -274,7 +281,7 @@ Basic Usage Encoders and Decoders --------------------- -.. class:: JSONDecoder(object_hook=None, parse_float=None, parse_int=None, parse_constant=None, strict=True, object_pairs_hook=None) +.. class:: JSONDecoder(*, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, strict=True, object_pairs_hook=None) Simple JSON decoder. @@ -344,6 +351,9 @@ Encoders and Decoders If the data being deserialized is not a valid JSON document, a :exc:`JSONDecodeError` will be raised. + .. versionchanged:: 3.6 + All parameters are now :ref:`keyword-only `. + .. method:: decode(s) Return the Python representation of *s* (a :class:`str` instance @@ -362,7 +372,7 @@ Encoders and Decoders extraneous data at the end. -.. class:: JSONEncoder(skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, default=None) +.. class:: JSONEncoder(*, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, default=None) Extensible JSON encoder for Python data structures. @@ -443,6 +453,9 @@ Encoders and Decoders the object or raise a :exc:`TypeError`. If not specified, :exc:`TypeError` is raised. + .. versionchanged:: 3.6 + All parameters are now :ref:`keyword-only `. + .. method:: default(o) @@ -485,29 +498,29 @@ Encoders and Decoders Exceptions ---------- -.. exception:: JSONDecodeError(msg, doc, pos) +.. exception:: JSONDecodeError(msg, doc, pos, end=None) - Subclass of :exc:`ValueError` with the following additional attributes: + Subclass of :exc:`ValueError` with the following additional attributes: - .. attribute:: msg + .. attribute:: msg - The unformatted error message. + The unformatted error message. - .. attribute:: doc + .. attribute:: doc - The JSON document being parsed. + The JSON document being parsed. - .. attribute:: pos + .. attribute:: pos - The start index of *doc* where parsing failed. + The start index of *doc* where parsing failed. - .. attribute:: lineno + .. attribute:: lineno - The line corresponding to *pos*. + The line corresponding to *pos*. - .. attribute:: colno + .. attribute:: colno - The column corresponding to *pos*. + The column corresponding to *pos*. .. versionadded:: 3.5 diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst index a7928a0..a68a890 100644 --- a/Doc/library/logging.config.rst +++ b/Doc/library/logging.config.rst @@ -105,8 +105,8 @@ in :mod:`logging` itself) and defining handlers which are declared either in :param disable_existing_loggers: If specified as ``False``, loggers which exist when this call is made are left enabled. The default is ``True`` because this - enables old behaviour in a - backward-compatible way. This behaviour is to + enables old behaviour in a backward- + compatible way. This behaviour is to disable any existing loggers unless they or their ancestors are explicitly named in the logging configuration. diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst index b16eef0..6be3279 100644 --- a/Doc/library/logging.handlers.rst +++ b/Doc/library/logging.handlers.rst @@ -84,6 +84,9 @@ sends logging output to a disk file. It inherits the output functionality from with that encoding. If *delay* is true, then file opening is deferred until the first call to :meth:`emit`. By default, the file grows indefinitely. + .. versionchanged:: 3.6 + As well as string values, :class:`~pathlib.Path` objects are also accepted + for the *filename* argument. .. method:: close() @@ -160,12 +163,23 @@ for this value. with that encoding. If *delay* is true, then file opening is deferred until the first call to :meth:`emit`. By default, the file grows indefinitely. + .. versionchanged:: 3.6 + As well as string values, :class:`~pathlib.Path` objects are also accepted + for the *filename* argument. + + .. method:: reopenIfNeeded() + + Checks to see if the file has changed. If it has, the existing stream is + flushed and closed and the file opened again, typically as a precursor to + outputting the record to the file. + + .. versionadded:: 3.6 + .. method:: emit(record) - Outputs the record to the file, but first checks to see if the file has - changed. If it has, the existing stream is flushed and closed and the - file opened again, before outputting the record to the file. + Outputs the record to the file, but first calls :meth:`reopenIfNeeded` to + reopen the file if it has changed. .. _base-rotating-handler: @@ -279,6 +293,9 @@ module, supports rotation of disk log files. :file:`app.log.2`, etc. exist, then they are renamed to :file:`app.log.2`, :file:`app.log.3` etc. respectively. + .. versionchanged:: 3.6 + As well as string values, :class:`~pathlib.Path` objects are also accepted + for the *filename* argument. .. method:: doRollover() @@ -310,21 +327,24 @@ timed intervals. You can use the *when* to specify the type of *interval*. The list of possible values is below. Note that they are not case sensitive. - +----------------+-----------------------+ - | Value | Type of interval | - +================+=======================+ - | ``'S'`` | Seconds | - +----------------+-----------------------+ - | ``'M'`` | Minutes | - +----------------+-----------------------+ - | ``'H'`` | Hours | - +----------------+-----------------------+ - | ``'D'`` | Days | - +----------------+-----------------------+ - | ``'W0'-'W6'`` | Weekday (0=Monday) | - +----------------+-----------------------+ - | ``'midnight'`` | Roll over at midnight | - +----------------+-----------------------+ + +----------------+----------------------------+-------------------------+ + | Value | Type of interval | If/how *atTime* is used | + +================+============================+=========================+ + | ``'S'`` | Seconds | Ignored | + +----------------+----------------------------+-------------------------+ + | ``'M'`` | Minutes | Ignored | + +----------------+----------------------------+-------------------------+ + | ``'H'`` | Hours | Ignored | + +----------------+----------------------------+-------------------------+ + | ``'D'`` | Days | Ignored | + +----------------+----------------------------+-------------------------+ + | ``'W0'-'W6'`` | Weekday (0=Monday) | Used to compute initial | + | | | rollover time | + +----------------+----------------------------+-------------------------+ + | ``'midnight'`` | Roll over at midnight, if | Used to compute initial | + | | *atTime* not specified, | rollover time | + | | else at time *atTime* | | + +----------------+----------------------------+-------------------------+ When using weekday-based rotation, specify 'W0' for Monday, 'W1' for Tuesday, and so on up to 'W6' for Sunday. In this case, the value passed for @@ -352,16 +372,35 @@ timed intervals. If *atTime* is not ``None``, it must be a ``datetime.time`` instance which specifies the time of day when rollover occurs, for the cases where rollover - is set to happen "at midnight" or "on a particular weekday". + is set to happen "at midnight" or "on a particular weekday". Note that in + these cases, the *atTime* value is effectively used to compute the *initial* + rollover, and subsequent rollovers would be calculated via the normal + interval calculation. + + .. note:: Calculation of the initial rollover time is done when the handler + is initialised. Calculation of subsequent rollover times is done only + when rollover occurs, and rollover occurs only when emitting output. If + this is not kept in mind, it might lead to some confusion. For example, + if an interval of "every minute" is set, that does not mean you will + always see log files with times (in the filename) separated by a minute; + if, during application execution, logging output is generated more + frequently than once a minute, *then* you can expect to see log files + with times separated by a minute. If, on the other hand, logging messages + are only output once every five minutes (say), then there will be gaps in + the file times corresponding to the minutes where no output (and hence no + rollover) occurred. .. versionchanged:: 3.4 *atTime* parameter was added. + .. versionchanged:: 3.6 + As well as string values, :class:`~pathlib.Path` objects are also accepted + for the *filename* argument. + .. method:: doRollover() Does a rollover, as described above. - .. method:: emit(record) Outputs the record to the file, catering for rollover as described above. @@ -798,12 +837,18 @@ should, then :meth:`flush` is expected to do the flushing. overridden to implement custom flushing strategies. -.. class:: MemoryHandler(capacity, flushLevel=ERROR, target=None) +.. class:: MemoryHandler(capacity, flushLevel=ERROR, target=None, flushOnClose=True) Returns a new instance of the :class:`MemoryHandler` class. The instance is initialized with a buffer size of *capacity*. If *flushLevel* is not specified, :const:`ERROR` is used. If no *target* is specified, the target will need to be - set using :meth:`setTarget` before this handler does anything useful. + set using :meth:`setTarget` before this handler does anything useful. If + *flushOnClose* is specified as ``False``, then the buffer is *not* flushed when + the handler is closed. If not specified or specified as ``True``, the previous + behaviour of flushing the buffer will occur when the handler is closed. + + .. versionchanged:: 3.6 + The *flushOnClose* parameter was added. .. method:: close() @@ -900,8 +945,8 @@ possible, while any potentially slow operations (such as sending an email via .. class:: QueueHandler(queue) Returns a new instance of the :class:`QueueHandler` class. The instance is - initialized with the queue to send messages to. The queue can be any - queue-like object; it's used as-is by the :meth:`enqueue` method, which needs + initialized with the queue to send messages to. The queue can be any queue- + like object; it's used as-is by the :meth:`enqueue` method, which needs to know how to send messages to it. @@ -956,8 +1001,8 @@ possible, while any potentially slow operations (such as sending an email via Returns a new instance of the :class:`QueueListener` class. The instance is initialized with the queue to send messages to and a list of handlers which - will handle entries placed on the queue. The queue can be any queue-like - object; it's passed as-is to the :meth:`dequeue` method, which needs + will handle entries placed on the queue. The queue can be any queue- + like object; it's passed as-is to the :meth:`dequeue` method, which needs to know how to get messages from it. If ``respect_handler_level`` is ``True``, a handler's level is respected (compared with the level for the message) when deciding whether to pass messages to that handler; otherwise, the behaviour diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst index 61b3ba3..5edb23d 100644 --- a/Doc/library/lzma.rst +++ b/Doc/library/lzma.rst @@ -39,8 +39,9 @@ Reading and writing compressed files object`. The *filename* argument can be either an actual file name (given as a - :class:`str` or :class:`bytes` object), in which case the named file is - opened, or it can be an existing file object to read from or write to. + :class:`str`, :class:`bytes` or :term:`path-like object` object), in + which case the named file is opened, or it can be an existing file object + to read from or write to. The *mode* argument can be any of ``"r"``, ``"rb"``, ``"w"``, ``"wb"``, ``"x"``, ``"xb"``, ``"a"`` or ``"ab"`` for binary mode, or ``"rt"``, @@ -64,6 +65,9 @@ Reading and writing compressed files .. versionchanged:: 3.4 Added support for the ``"x"``, ``"xb"`` and ``"xt"`` modes. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. class:: LZMAFile(filename=None, mode="r", \*, format=None, check=-1, preset=None, filters=None) @@ -71,9 +75,10 @@ Reading and writing compressed files An :class:`LZMAFile` can wrap an already-open :term:`file object`, or operate directly on a named file. The *filename* argument specifies either the file - object to wrap, or the name of the file to open (as a :class:`str` or - :class:`bytes` object). When wrapping an existing file object, the wrapped - file will not be closed when the :class:`LZMAFile` is closed. + object to wrap, or the name of the file to open (as a :class:`str`, + :class:`bytes` or :term:`path-like object` object). When wrapping an + existing file object, the wrapped file will not be closed when the + :class:`LZMAFile` is closed. The *mode* argument can be either ``"r"`` for reading (default), ``"w"`` for overwriting, ``"x"`` for exclusive creation, or ``"a"`` for appending. These @@ -118,6 +123,9 @@ Reading and writing compressed files The :meth:`~io.BufferedIOBase.read` method now accepts an argument of ``None``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + Compressing and decompressing data in memory -------------------------------------------- diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst index d65afc2..1ffc6ef 100644 --- a/Doc/library/marshal.rst +++ b/Doc/library/marshal.rst @@ -49,7 +49,7 @@ For format *version* lower than 3, recursive lists, sets and dictionaries cannot be written (see below). There are functions that read/write files as well as functions operating on -bytes-like objects. +strings. The module defines these functions: @@ -57,7 +57,9 @@ The module defines these functions: .. function:: dump(value, file[, version]) Write the value on the open file. The value must be a supported type. The - file must be a writeable :term:`binary file`. + file must be an open file object such as ``sys.stdout`` or returned by + :func:`open` or :func:`os.popen`. It must be opened in binary mode (``'wb'`` + or ``'w+b'``). If the value has (or contains an object that has) an unsupported type, a :exc:`ValueError` exception is raised --- but garbage data will also be written @@ -72,7 +74,8 @@ The module defines these functions: Read one value from the open file and return it. If no valid value is read (e.g. because the data has a different Python version's incompatible marshal format), raise :exc:`EOFError`, :exc:`ValueError` or :exc:`TypeError`. The - file must be a readable :term:`binary file`. + file must be an open file object opened in binary mode (``'rb'`` or + ``'r+b'``). .. note:: @@ -82,7 +85,7 @@ The module defines these functions: .. function:: dumps(value[, version]) - Return the bytes object that would be written to a file by ``dump(value, file)``. The + Return the string that would be written to a file by ``dump(value, file)``. The value must be a supported type. Raise a :exc:`ValueError` exception if value has (or contains an object that has) an unsupported type. @@ -90,11 +93,11 @@ The module defines these functions: (see below). -.. function:: loads(bytes) +.. function:: loads(string) - Convert the :term:`bytes-like object` to a value. If no valid value is found, raise - :exc:`EOFError`, :exc:`ValueError` or :exc:`TypeError`. Extra bytes in the - input are ignored. + Convert the string to a value. If no valid value is found, raise + :exc:`EOFError`, :exc:`ValueError` or :exc:`TypeError`. Extra characters in the + string are ignored. In addition, the following constants are defined: diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 3fdea18..da2b8cc 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -426,6 +426,15 @@ Constants The mathematical constant e = 2.718281..., to available precision. +.. data:: tau + + The mathematical constant τ = 6.283185..., to available precision. + Tau is a circle constant equal to 2π, the ratio of a circle's circumference to + its radius. To learn more about Tau, check out Vi Hart's video `Pi is (still) + Wrong `_, and start celebrating + `Tau day `_ by eating twice as much pie! + + .. versionadded:: 3.6 .. data:: inf diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst index 67b7a71..464248c 100644 --- a/Doc/library/mimetypes.rst +++ b/Doc/library/mimetypes.rst @@ -186,78 +186,78 @@ than one MIME-type database; it provides an interface similar to the one of the loaded "on top" of the default database. - .. attribute:: MimeTypes.suffix_map +.. attribute:: MimeTypes.suffix_map - Dictionary mapping suffixes to suffixes. This is used to allow recognition of - encoded files for which the encoding and the type are indicated by the same - extension. For example, the :file:`.tgz` extension is mapped to :file:`.tar.gz` - to allow the encoding and type to be recognized separately. This is initially a - copy of the global :data:`suffix_map` defined in the module. + Dictionary mapping suffixes to suffixes. This is used to allow recognition of + encoded files for which the encoding and the type are indicated by the same + extension. For example, the :file:`.tgz` extension is mapped to :file:`.tar.gz` + to allow the encoding and type to be recognized separately. This is initially a + copy of the global :data:`suffix_map` defined in the module. - .. attribute:: MimeTypes.encodings_map +.. attribute:: MimeTypes.encodings_map - Dictionary mapping filename extensions to encoding types. This is initially a - copy of the global :data:`encodings_map` defined in the module. + Dictionary mapping filename extensions to encoding types. This is initially a + copy of the global :data:`encodings_map` defined in the module. - .. attribute:: MimeTypes.types_map +.. attribute:: MimeTypes.types_map - Tuple containing two dictionaries, mapping filename extensions to MIME types: - the first dictionary is for the non-standards types and the second one is for - the standard types. They are initialized by :data:`common_types` and - :data:`types_map`. + Tuple containing two dictionaries, mapping filename extensions to MIME types: + the first dictionary is for the non-standards types and the second one is for + the standard types. They are initialized by :data:`common_types` and + :data:`types_map`. - .. attribute:: MimeTypes.types_map_inv +.. attribute:: MimeTypes.types_map_inv - Tuple containing two dictionaries, mapping MIME types to a list of filename - extensions: the first dictionary is for the non-standards types and the - second one is for the standard types. They are initialized by - :data:`common_types` and :data:`types_map`. + Tuple containing two dictionaries, mapping MIME types to a list of filename + extensions: the first dictionary is for the non-standards types and the + second one is for the standard types. They are initialized by + :data:`common_types` and :data:`types_map`. - .. method:: MimeTypes.guess_extension(type, strict=True) +.. method:: MimeTypes.guess_extension(type, strict=True) - Similar to the :func:`guess_extension` function, using the tables stored as part - of the object. + Similar to the :func:`guess_extension` function, using the tables stored as part + of the object. - .. method:: MimeTypes.guess_type(url, strict=True) +.. method:: MimeTypes.guess_type(url, strict=True) - Similar to the :func:`guess_type` function, using the tables stored as part of - the object. + Similar to the :func:`guess_type` function, using the tables stored as part of + the object. - .. method:: MimeTypes.guess_all_extensions(type, strict=True) +.. method:: MimeTypes.guess_all_extensions(type, strict=True) - Similar to the :func:`guess_all_extensions` function, using the tables stored - as part of the object. + Similar to the :func:`guess_all_extensions` function, using the tables stored + as part of the object. - .. method:: MimeTypes.read(filename, strict=True) +.. method:: MimeTypes.read(filename, strict=True) - Load MIME information from a file named *filename*. This uses :meth:`readfp` to - parse the file. + Load MIME information from a file named *filename*. This uses :meth:`readfp` to + parse the file. - If *strict* is ``True``, information will be added to list of standard types, - else to the list of non-standard types. + If *strict* is ``True``, information will be added to list of standard types, + else to the list of non-standard types. - .. method:: MimeTypes.readfp(fp, strict=True) +.. method:: MimeTypes.readfp(fp, strict=True) - Load MIME type information from an open file *fp*. The file must have the format of - the standard :file:`mime.types` files. + Load MIME type information from an open file *fp*. The file must have the format of + the standard :file:`mime.types` files. - If *strict* is ``True``, information will be added to the list of standard - types, else to the list of non-standard types. + If *strict* is ``True``, information will be added to the list of standard + types, else to the list of non-standard types. - .. method:: MimeTypes.read_windows_registry(strict=True) +.. method:: MimeTypes.read_windows_registry(strict=True) - Load MIME type information from the Windows registry. Availability: Windows. + Load MIME type information from the Windows registry. Availability: Windows. - If *strict* is ``True``, information will be added to the list of standard - types, else to the list of non-standard types. + If *strict* is ``True``, information will be added to the list of standard + types, else to the list of non-standard types. - .. versionadded:: 3.2 + .. versionadded:: 3.2 diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst index 2f2945f..f46bf66 100644 --- a/Doc/library/mmap.rst +++ b/Doc/library/mmap.rst @@ -264,13 +264,18 @@ To map anonymous memory, -1 should be passed as the fileno along with the length .. method:: write(bytes) Write the bytes in *bytes* into memory at the current position of the - file pointer; the file position is updated to point after the bytes that - were written. If the mmap was created with :const:`ACCESS_READ`, then + file pointer and return the number of bytes written (never less than + ``len(bytes)``, since if the write fails, a :exc:`ValueError` will be + raised). The file position is updated to point after the bytes that + were written. If the mmap was created with :const:`ACCESS_READ`, then writing to it will raise a :exc:`TypeError` exception. .. versionchanged:: 3.5 Writable :term:`bytes-like object` is now accepted. + .. versionchanged:: 3.6 + The number of bytes written is now returned. + .. method:: write_byte(byte) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 04ce8d8..96d1424 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -650,8 +650,9 @@ primitives like locks. For passing messages one can use :func:`Pipe` (for a connection between two processes) or a queue (which allows multiple producers and consumers). -The :class:`Queue`, :class:`SimpleQueue` and :class:`JoinableQueue` types are multi-producer, -multi-consumer FIFO queues modelled on the :class:`queue.Queue` class in the +The :class:`Queue`, :class:`SimpleQueue` and :class:`JoinableQueue` types +are multi-producer, multi-consumer :abbr:`FIFO (first-in, first-out)` +queues modelled on the :class:`queue.Queue` class in the standard library. They differ in that :class:`Queue` lacks the :meth:`~queue.Queue.task_done` and :meth:`~queue.Queue.join` methods introduced into Python 2.5's :class:`queue.Queue` class. @@ -889,8 +890,13 @@ Miscellaneous .. function:: cpu_count() - Return the number of CPUs in the system. May raise - :exc:`NotImplementedError`. + Return the number of CPUs in the system. + + This number is not equivalent to the number of CPUs the current process can + use. The number of usable CPUs can be obtained with + ``len(os.sched_getaffinity(0))`` + + May raise :exc:`NotImplementedError`. .. seealso:: :func:`os.cpu_count` @@ -1018,7 +1024,7 @@ Connection objects are usually created using :func:`Pipe` -- see also .. method:: recv() Return an object sent from the other end of the connection using - :meth:`send`. Blocks until there is something to receive. Raises + :meth:`send`. Blocks until there its something to receive. Raises :exc:`EOFError` if there is nothing left to receive and the other end was closed. @@ -1679,7 +1685,9 @@ their parent process exits. The manager classes are defined in the of processes. Objects of this type are returned by :func:`multiprocessing.Manager`. - It also supports creation of shared lists and dictionaries. + Its methods create and return :ref:`multiprocessing-proxy_objects` for a + number of commonly used data types to be synchronized across processes. + This notably includes shared lists and dictionaries. .. method:: Barrier(parties[, action[, timeout]]) @@ -1742,31 +1750,17 @@ their parent process exits. The manager classes are defined in the dict(mapping) dict(sequence) - Create a shared ``dict`` object and return a proxy for it. + Create a shared :class:`dict` object and return a proxy for it. .. method:: list() list(sequence) - Create a shared ``list`` object and return a proxy for it. - - .. note:: - - Modifications to mutable values or items in dict and list proxies will not - be propagated through the manager, because the proxy has no way of knowing - when its values or items are modified. To modify such an item, you can - re-assign the modified object to the container proxy:: - - # create a list proxy and append a mutable object (a dictionary) - lproxy = manager.list() - lproxy.append({}) - # now mutate the dictionary - d = lproxy[0] - d['a'] = 1 - d['b'] = 2 - # at this point, the changes to d are not yet synced, but by - # reassigning the dictionary, the proxy is notified of the change - lproxy[0] = d + Create a shared :class:`list` object and return a proxy for it. + .. versionchanged:: 3.6 + Shared objects are capable of being nested. For example, a shared + container object such as a shared list can contain other shared objects + which will all be managed and synchronized by the :class:`SyncManager`. .. class:: Namespace @@ -1878,6 +1872,8 @@ client to access it remotely:: >>> s = m.get_server() >>> s.serve_forever() +.. _multiprocessing-proxy_objects: + Proxy Objects ~~~~~~~~~~~~~ @@ -1887,8 +1883,7 @@ proxy. Multiple proxy objects may have the same referent. A proxy object has methods which invoke corresponding methods of its referent (although not every method of the referent will necessarily be available through -the proxy). A proxy can usually be used in most of the same ways that its -referent can: +the proxy). In this way, a proxy can be used just like its referent can: .. doctest:: @@ -1909,9 +1904,9 @@ the referent, whereas applying :func:`repr` will return the representation of the proxy. An important feature of proxy objects is that they are picklable so they can be -passed between processes. Note, however, that if a proxy is sent to the -corresponding manager's process then unpickling it will produce the referent -itself. This means, for example, that one shared object can contain a second: +passed between processes. As such, a referent can contain +:ref:`multiprocessing-proxy_objects`. This permits nesting of these managed +lists, dicts, and other :ref:`multiprocessing-proxy_objects`: .. doctest:: @@ -1919,10 +1914,46 @@ itself. This means, for example, that one shared object can contain a second: >>> b = manager.list() >>> a.append(b) # referent of a now contains referent of b >>> print(a, b) - [[]] [] + [] [] >>> b.append('hello') - >>> print(a, b) - [['hello']] ['hello'] + >>> print(a[0], b) + ['hello'] ['hello'] + +Similarly, dict and list proxies may be nested inside one another:: + + >>> l_outer = manager.list([ manager.dict() for i in range(2) ]) + >>> d_first_inner = l_outer[0] + >>> d_first_inner['a'] = 1 + >>> d_first_inner['b'] = 2 + >>> l_outer[1]['c'] = 3 + >>> l_outer[1]['z'] = 26 + >>> print(l_outer[0]) + {'a': 1, 'b': 2} + >>> print(l_outer[1]) + {'c': 3, 'z': 26} + +If standard (non-proxy) :class:`list` or :class:`dict` objects are contained +in a referent, modifications to those mutable values will not be propagated +through the manager because the proxy has no way of knowing when the values +contained within are modified. However, storing a value in a container proxy +(which triggers a ``__setitem__`` on the proxy object) does propagate through +the manager and so to effectively modify such an item, one could re-assign the +modified value to the container proxy:: + + # create a list proxy and append a mutable object (a dictionary) + lproxy = manager.list() + lproxy.append({}) + # now mutate the dictionary + d = lproxy[0] + d['a'] = 1 + d['b'] = 2 + # at this point, the changes to d are not yet synced, but by + # updating the dictionary, the proxy is notified of the change + lproxy[0] = d + +This approach is perhaps less convenient than employing nested +:ref:`multiprocessing-proxy_objects` for most use cases but also +demonstrates a level of control over the synchronization. .. note:: diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index bf0dfac..406054e 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -61,6 +61,9 @@ the :mod:`glob` module.) platforms, this is equivalent to calling the function :func:`normpath` as follows: ``normpath(join(os.getcwd(), path))``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: basename(path) @@ -71,6 +74,9 @@ the :mod:`glob` module.) ``'/foo/bar/'`` returns ``'bar'``, the :func:`basename` function returns an empty string (``''``). + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: commonpath(paths) @@ -83,6 +89,9 @@ the :mod:`glob` module.) .. versionadded:: 3.5 + .. versionchanged:: 3.6 + Accepts a sequence of :term:`path-like objects `. + .. function:: commonprefix(list) @@ -104,12 +113,18 @@ the :mod:`glob` module.) >>> os.path.commonpath(['/usr/lib', '/usr/local/lib']) '/usr' + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: dirname(path) Return the directory name of pathname *path*. This is the first element of the pair returned by passing *path* to the function :func:`split`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: exists(path) @@ -123,6 +138,9 @@ the :mod:`glob` module.) *path* can now be an integer: ``True`` is returned if it is an open file descriptor, ``False`` otherwise. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: lexists(path) @@ -130,6 +148,9 @@ the :mod:`glob` module.) broken symbolic links. Equivalent to :func:`exists` on platforms lacking :func:`os.lstat`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: expanduser(path) @@ -151,6 +172,9 @@ the :mod:`glob` module.) If the expansion fails or if the path does not begin with a tilde, the path is returned unchanged. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: expandvars(path) @@ -162,6 +186,9 @@ the :mod:`glob` module.) On Windows, ``%name%`` expansions are supported in addition to ``$name`` and ``${name}``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: getatime(path) @@ -182,6 +209,9 @@ the :mod:`glob` module.) If :func:`os.stat_float_times` returns ``True``, the result is a floating point number. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: getctime(path) @@ -191,12 +221,18 @@ the :mod:`glob` module.) the :mod:`time` module). Raise :exc:`OSError` if the file does not exist or is inaccessible. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: getsize(path) Return the size, in bytes, of *path*. Raise :exc:`OSError` if the file does not exist or is inaccessible. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: isabs(path) @@ -204,24 +240,36 @@ the :mod:`glob` module.) begins with a slash, on Windows that it begins with a (back)slash after chopping off a potential drive letter. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: isfile(path) Return ``True`` if *path* is an existing regular file. This follows symbolic links, so both :func:`islink` and :func:`isfile` can be true for the same path. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: isdir(path) Return ``True`` if *path* is an existing directory. This follows symbolic links, so both :func:`islink` and :func:`isdir` can be true for the same path. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: islink(path) Return ``True`` if *path* refers to a directory entry that is a symbolic link. Always ``False`` if symbolic links are not supported by the Python runtime. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: ismount(path) @@ -237,6 +285,9 @@ the :mod:`glob` module.) .. versionadded:: 3.4 Support for detecting non-root mount points on Windows. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: join(path, *paths) @@ -255,13 +306,20 @@ the :mod:`glob` module.) ``os.path.join("c:", "foo")`` represents a path relative to the current directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *path* and *paths*. + .. function:: normcase(path) Normalize the case of a pathname. On Unix and Mac OS X, this returns the path unchanged; on case-insensitive filesystems, it converts the path to lowercase. On Windows, it also converts forward slashes to backward slashes. - Raise a TypeError if the type of *path* is not ``str`` or ``bytes``. + Raise a TypeError if the type of *path* is not ``str`` or ``bytes`` (directly + or indirectly through the :class:`os.PathLike` interface). + + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. .. function:: normpath(path) @@ -272,12 +330,18 @@ the :mod:`glob` module.) that contains symbolic links. On Windows, it converts forward slashes to backward slashes. To normalize case, use :func:`normcase`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: realpath(path) Return the canonical path of the specified filename, eliminating any symbolic links encountered in the path (if they are supported by the operating system). + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: relpath(path, start=os.curdir) @@ -290,6 +354,9 @@ the :mod:`glob` module.) Availability: Unix, Windows. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: samefile(path1, path2) @@ -305,6 +372,9 @@ the :mod:`glob` module.) .. versionchanged:: 3.4 Windows now uses the same implementation as all other platforms. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: sameopenfile(fp1, fp2) @@ -315,6 +385,9 @@ the :mod:`glob` module.) .. versionchanged:: 3.2 Added Windows support. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: samestat(stat1, stat2) @@ -328,6 +401,9 @@ the :mod:`glob` module.) .. versionchanged:: 3.4 Added Windows support. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: split(path) @@ -341,6 +417,9 @@ the :mod:`glob` module.) (but the strings may differ). Also see the functions :func:`dirname` and :func:`basename`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: splitdrive(path) @@ -359,6 +438,9 @@ the :mod:`glob` module.) and share, up to but not including the fourth separator. e.g. ``splitdrive("//host/computer/dir")`` returns ``("//host/computer", "/dir")`` + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: splitext(path) @@ -367,6 +449,9 @@ the :mod:`glob` module.) period. Leading periods on the basename are ignored; ``splitext('.cshrc')`` returns ``('.cshrc', '')``. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: splitunc(path) diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 3aee501..988cb7c 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -57,7 +57,7 @@ Notes on the availability of these functions: The name of the operating system dependent module imported. The following names have currently been registered: ``'posix'``, ``'nt'``, - ``'ce'``, ``'java'``. + ``'java'``. .. seealso:: :attr:`sys.platform` has a finer granularity. :func:`os.uname` gives @@ -171,23 +171,60 @@ process and user. .. function:: fsencode(filename) - Encode *filename* to the filesystem encoding with ``'surrogateescape'`` - error handler, or ``'strict'`` on Windows; return :class:`bytes` unchanged. + Encode :term:`path-like ` *filename* to the filesystem + encoding with ``'surrogateescape'`` error handler, or ``'strict'`` on + Windows; return :class:`bytes` unchanged. :func:`fsdecode` is the reverse function. .. versionadded:: 3.2 + .. versionchanged:: 3.6 + Support added to accept objects implementing the :class:`os.PathLike` + interface. + .. function:: fsdecode(filename) - Decode *filename* from the filesystem encoding with ``'surrogateescape'`` - error handler, or ``'strict'`` on Windows; return :class:`str` unchanged. + Decode the :term:`path-like ` *filename* from the + filesystem encoding with ``'surrogateescape'`` error handler, or ``'strict'`` + on Windows; return :class:`str` unchanged. :func:`fsencode` is the reverse function. .. versionadded:: 3.2 + .. versionchanged:: 3.6 + Support added to accept objects implementing the :class:`os.PathLike` + interface. + + +.. function:: fspath(path) + + Return the file system representation of the path. + + If :class:`str` or :class:`bytes` is passed in, it is returned unchanged. + Otherwise :meth:`~os.PathLike.__fspath__` is called and its value is + returned as long as it is a :class:`str` or :class:`bytes` object. + In all other cases, :exc:`TypeError` is raised. + + .. versionadded:: 3.6 + + +.. class:: PathLike + + An :term:`abstract base class` for objects representing a file system path, + e.g. :class:`pathlib.PurePath`. + + .. versionadded:: 3.6 + + .. abstractmethod:: __fspath__() + + Return the file system path representation of the object. + + The method should only return a :class:`str` or :class:`bytes` object, + with the preference being for :class:`str`. + .. function:: getenv(key, default=None) @@ -896,6 +933,9 @@ as internal buffering of data. exception, the function now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + The following constants are options for the *flags* parameter to the :func:`~os.open` function. They can be combined using the bitwise OR operator ``|``. Some of them are not available on all platforms. For descriptions of @@ -1392,6 +1432,9 @@ features: .. versionchanged:: 3.3 Added the *dir_fd*, *effective_ids*, and *follow_symlinks* parameters. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. data:: F_OK R_OK @@ -1416,6 +1459,9 @@ features: Added support for specifying *path* as a file descriptor on some platforms. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: chflags(path, flags, *, follow_symlinks=True) @@ -1442,6 +1488,9 @@ features: .. versionadded:: 3.3 The *follow_symlinks* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: chmod(path, mode, *, dir_fd=None, follow_symlinks=True) @@ -1483,6 +1532,9 @@ features: Added support for specifying *path* as an open file descriptor, and the *dir_fd* and *follow_symlinks* arguments. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: chown(path, uid, gid, *, dir_fd=None, follow_symlinks=True) @@ -1502,6 +1554,9 @@ features: Added support for specifying an open file descriptor for *path*, and the *dir_fd* and *follow_symlinks* arguments. + .. versionchanged:: 3.6 + Supports a :term:`path-like object`. + .. function:: chroot(path) @@ -1509,6 +1564,9 @@ features: Availability: Unix. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: fchdir(fd) @@ -1537,6 +1595,9 @@ features: Availability: Unix. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: lchmod(path, mode) @@ -1547,6 +1608,8 @@ features: Availability: Unix. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. .. function:: lchown(path, uid, gid) @@ -1556,6 +1619,9 @@ features: Availability: Unix. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: link(src, dst, *, src_dir_fd=None, dst_dir_fd=None, follow_symlinks=True) @@ -1573,6 +1639,9 @@ features: .. versionadded:: 3.3 Added the *src_dir_fd*, *dst_dir_fd*, and *follow_symlinks* arguments. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *src* and *dst*. + .. function:: listdir(path='.') @@ -1580,8 +1649,9 @@ features: *path*. The list is in arbitrary order, and does not include the special entries ``'.'`` and ``'..'`` even if they are present in the directory. - *path* may be either of type ``str`` or of type ``bytes``. If *path* - is of type ``bytes``, the filenames returned will also be of type ``bytes``; + *path* may be a :term:`path-like object`. If *path* is of type ``bytes`` + (directly or indirectly through the :class:`PathLike` interface), + the filenames returned will also be of type ``bytes``; in all other circumstances, they will be of type ``str``. This function can also support :ref:`specifying a file descriptor @@ -1602,6 +1672,9 @@ features: .. versionadded:: 3.3 Added support for specifying an open file descriptor for *path*. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: lstat(path, \*, dir_fd=None) @@ -1628,6 +1701,9 @@ features: .. versionchanged:: 3.3 Added the *dir_fd* parameter. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *src* and *dst*. + .. function:: mkdir(path, mode=0o777, *, dir_fd=None) @@ -1652,6 +1728,9 @@ features: .. versionadded:: 3.3 The *dir_fd* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: makedirs(name, mode=0o777, exist_ok=False) @@ -1685,6 +1764,9 @@ features: mode of the existing directory. Since this behavior was impossible to implement safely, it was removed in Python 3.4.1. See :issue:`21082`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: mkfifo(path, mode=0o666, *, dir_fd=None) @@ -1705,6 +1787,9 @@ features: .. versionadded:: 3.3 The *dir_fd* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: mknod(path, mode=0o600, device=0, *, dir_fd=None) @@ -1724,6 +1809,9 @@ features: .. versionadded:: 3.3 The *dir_fd* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: major(device) @@ -1762,6 +1850,9 @@ features: Availability: Unix. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. data:: pathconf_names @@ -1779,9 +1870,10 @@ features: may be converted to an absolute pathname using ``os.path.join(os.path.dirname(path), result)``. - If the *path* is a string object, the result will also be a string object, + If the *path* is a string object (directly or indirectly through a + :class:`PathLike` interface), the result will also be a string object, and the call may raise a UnicodeDecodeError. If the *path* is a bytes - object, the result will be a bytes object. + object (direct or indirectly), the result will be a bytes object. This function can also support :ref:`paths relative to directory descriptors `. @@ -1794,6 +1886,9 @@ features: .. versionadded:: 3.3 The *dir_fd* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: remove(path, *, dir_fd=None) @@ -1812,6 +1907,9 @@ features: .. versionadded:: 3.3 The *dir_fd* argument. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: removedirs(name) @@ -1826,6 +1924,9 @@ features: they are empty. Raises :exc:`OSError` if the leaf directory could not be successfully removed. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: rename(src, dst, *, src_dir_fd=None, dst_dir_fd=None) @@ -1845,6 +1946,9 @@ features: .. versionadded:: 3.3 The *src_dir_fd* and *dst_dir_fd* arguments. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *src* and *dst*. + .. function:: renames(old, new) @@ -1858,6 +1962,9 @@ features: This function can fail with the new directory structure made if you lack permissions needed to remove the leaf directory or file. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *old* and *new*. + .. function:: replace(src, dst, *, src_dir_fd=None, dst_dir_fd=None) @@ -1872,6 +1979,9 @@ features: .. versionadded:: 3.3 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *src* and *dst*. + .. function:: rmdir(path, *, dir_fd=None) @@ -1885,38 +1995,56 @@ features: .. versionadded:: 3.3 The *dir_fd* parameter. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: scandir(path='.') - Return an iterator of :class:`DirEntry` objects corresponding to the entries - in the directory given by *path*. The entries are yielded in arbitrary - order, and the special entries ``'.'`` and ``'..'`` are not included. + Return an iterator of :class:`os.DirEntry` objects corresponding to the + entries in the directory given by *path*. The entries are yielded in + arbitrary order, and the special entries ``'.'`` and ``'..'`` are not + included. Using :func:`scandir` instead of :func:`listdir` can significantly increase the performance of code that also needs file type or file - attribute information, because :class:`DirEntry` objects expose this + attribute information, because :class:`os.DirEntry` objects expose this information if the operating system provides it when scanning a directory. - All :class:`DirEntry` methods may perform a system call, but - :func:`~DirEntry.is_dir` and :func:`~DirEntry.is_file` usually only - require a system call for symbolic links; :func:`DirEntry.stat` + All :class:`os.DirEntry` methods may perform a system call, but + :func:`~os.DirEntry.is_dir` and :func:`~os.DirEntry.is_file` usually only + require a system call for symbolic links; :func:`os.DirEntry.stat` always requires a system call on Unix but only requires one for symbolic links on Windows. - On Unix, *path* can be of type :class:`str` or :class:`bytes` (use - :func:`~os.fsencode` and :func:`~os.fsdecode` to encode and decode - :class:`bytes` paths). On Windows, *path* must be of type :class:`str`. - On both systems, the type of the :attr:`~DirEntry.name` and - :attr:`~DirEntry.path` attributes of each :class:`DirEntry` will be of - the same type as *path*. + *path* may be a :term:`path-like object`. If *path* is of type ``bytes`` + (directly or indirectly through the :class:`PathLike` interface), + the type of the :attr:`~os.DirEntry.name` and :attr:`~os.DirEntry.path` + attributes of each :class:`os.DirEntry` will be ``bytes``; in all other + circumstances, they will be of type ``str``. + + The :func:`scandir` iterator supports the :term:`context manager` protocol + and has the following method: + + .. method:: scandir.close() + + Close the iterator and free acquired resources. + + This is called automatically when the iterator is exhausted or garbage + collected, or when an error happens during iterating. However it + is advisable to call it explicitly or use the :keyword:`with` + statement. + + .. versionadded:: 3.6 The following example shows a simple use of :func:`scandir` to display all the files (excluding directories) in the given *path* that don't start with ``'.'``. The ``entry.is_file()`` call will generally not make an additional system call:: - for entry in os.scandir(path): - if not entry.name.startswith('.') and entry.is_file(): - print(entry.name) + with os.scandir(path) as it: + for entry in it: + if not entry.name.startswith('.') and entry.is_file(): + print(entry.name) .. note:: @@ -1932,6 +2060,14 @@ features: .. versionadded:: 3.5 + .. versionadded:: 3.6 + Added support for the :term:`context manager` protocol and the + :func:`~scandir.close()` method. If a :func:`scandir` iterator is neither + exhausted nor explicitly closed a :exc:`ResourceWarning` will be emitted + in its destructor. + + The function accepts a :term:`path-like object`. + .. class:: DirEntry @@ -1940,27 +2076,30 @@ features: :func:`scandir` will provide as much of this information as possible without making additional system calls. When a ``stat()`` or ``lstat()`` system call - is made, the ``DirEntry`` object will cache the result. + is made, the ``os.DirEntry`` object will cache the result. - ``DirEntry`` instances are not intended to be stored in long-lived data + ``os.DirEntry`` instances are not intended to be stored in long-lived data structures; if you know the file metadata has changed or if a long time has elapsed since calling :func:`scandir`, call ``os.stat(entry.path)`` to fetch up-to-date information. - Because the ``DirEntry`` methods can make operating system calls, they may + Because the ``os.DirEntry`` methods can make operating system calls, they may also raise :exc:`OSError`. If you need very fine-grained control over errors, you can catch :exc:`OSError` when calling one of the - ``DirEntry`` methods and handle as appropriate. + ``os.DirEntry`` methods and handle as appropriate. - Attributes and methods on a ``DirEntry`` instance are as follows: + To be directly usable as a :term:`path-like object`, ``os.DirEntry`` + implements the :class:`PathLike` interface. + + Attributes and methods on a ``os.DirEntry`` instance are as follows: .. attribute:: name The entry's base filename, relative to the :func:`scandir` *path* argument. - The :attr:`name` attribute will be of the same type (``str`` or - ``bytes``) as the :func:`scandir` *path* argument. Use + The :attr:`name` attribute will be ``bytes`` if the :func:`scandir` + *path* argument is of type ``bytes`` and ``str`` otherwise. Use :func:`~os.fsdecode` to decode byte filenames. .. attribute:: path @@ -1970,16 +2109,17 @@ features: argument. The path is only absolute if the :func:`scandir` *path* argument was absolute. - The :attr:`path` attribute will be of the same type (``str`` or - ``bytes``) as the :func:`scandir` *path* argument. Use + The :attr:`path` attribute will be ``bytes`` if the :func:`scandir` + *path* argument is of type ``bytes`` and ``str`` otherwise. Use :func:`~os.fsdecode` to decode byte filenames. .. method:: inode() Return the inode number of the entry. - The result is cached on the ``DirEntry`` object. Use ``os.stat(entry.path, - follow_symlinks=False).st_ino`` to fetch up-to-date information. + The result is cached on the ``os.DirEntry`` object. Use + ``os.stat(entry.path, follow_symlinks=False).st_ino`` to fetch up-to-date + information. On the first, uncached call, a system call is required on Windows but not on Unix. @@ -1994,7 +2134,7 @@ features: is a directory (without following symlinks); return ``False`` if the entry is any other kind of file or if it doesn't exist anymore. - The result is cached on the ``DirEntry`` object, with a separate cache + The result is cached on the ``os.DirEntry`` object, with a separate cache for *follow_symlinks* ``True`` and ``False``. Call :func:`os.stat` along with :func:`stat.S_ISDIR` to fetch up-to-date information. @@ -2018,8 +2158,8 @@ features: is a file (without following symlinks); return ``False`` if the entry is a directory or other non-file entry, or if it doesn't exist anymore. - The result is cached on the ``DirEntry`` object. Caching, system calls - made, and exceptions raised are as per :func:`~DirEntry.is_dir`. + The result is cached on the ``os.DirEntry`` object. Caching, system calls + made, and exceptions raised are as per :func:`~os.DirEntry.is_dir`. .. method:: is_symlink() @@ -2027,7 +2167,7 @@ features: return ``False`` if the entry points to a directory or any kind of file, or if it doesn't exist anymore. - The result is cached on the ``DirEntry`` object. Call + The result is cached on the ``os.DirEntry`` object. Call :func:`os.path.islink` to fetch up-to-date information. On the first, uncached call, no system call is required in most cases. @@ -2052,23 +2192,29 @@ features: :class:`stat_result` are always set to zero. Call :func:`os.stat` to get these attributes. - The result is cached on the ``DirEntry`` object, with a separate cache + The result is cached on the ``os.DirEntry`` object, with a separate cache for *follow_symlinks* ``True`` and ``False``. Call :func:`os.stat` to fetch up-to-date information. Note that there is a nice correspondence between several attributes - and methods of ``DirEntry`` and of :class:`pathlib.Path`. In - particular, the ``name`` attribute has the same meaning, as do the - ``is_dir()``, ``is_file()``, ``is_symlink()`` and ``stat()`` methods. + and methods of ``os.DirEntry`` and of :class:`pathlib.Path`. In + particular, the ``name`` attribute has the same + meaning, as do the ``is_dir()``, ``is_file()``, ``is_symlink()`` + and ``stat()`` methods. .. versionadded:: 3.5 + .. versionchanged:: 3.6 + Added support for the :class:`~os.PathLike` interface. Added support + for :class:`bytes` paths on Windows. + .. function:: stat(path, \*, dir_fd=None, follow_symlinks=True) Get the status of a file or a file descriptor. Perform the equivalent of a :c:func:`stat` system call on the given path. *path* may be specified as - either a string, a bytes or as an open file descriptor. Return a :class:`stat_result` + either a string -- directly or indirectly through the :class:`PathLike` + interface -- or as an open file descriptor. Return a :class:`stat_result` object. This function normally follows symlinks; to stat a symlink add the argument @@ -2098,6 +2244,9 @@ features: Added the *dir_fd* and *follow_symlinks* arguments, specifying a file descriptor instead of a path. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. class:: stat_result @@ -2319,19 +2468,22 @@ features: This function can support :ref:`specifying a file descriptor `. + Availability: Unix. + .. versionchanged:: 3.2 The :const:`ST_RDONLY` and :const:`ST_NOSUID` constants were added. + .. versionadded:: 3.3 + Added support for specifying an open file descriptor for *path*. + .. versionchanged:: 3.4 The :const:`ST_NODEV`, :const:`ST_NOEXEC`, :const:`ST_SYNCHRONOUS`, :const:`ST_MANDLOCK`, :const:`ST_WRITE`, :const:`ST_APPEND`, :const:`ST_IMMUTABLE`, :const:`ST_NOATIME`, :const:`ST_NODIRATIME`, and :const:`ST_RELATIME` constants were added. - Availability: Unix. - - .. versionadded:: 3.3 - Added support for specifying an open file descriptor for *path*. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. .. data:: supports_dir_fd @@ -2452,6 +2604,9 @@ features: Added the *dir_fd* argument, and now allow *target_is_directory* on non-Windows platforms. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *src* and *dst*. + .. function:: sync() @@ -2476,6 +2631,10 @@ features: .. versionchanged:: 3.5 Added support for Windows + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + + .. function:: unlink(path, *, dir_fd=None) Remove (delete) the file *path*. This function is semantically @@ -2486,6 +2645,9 @@ features: .. versionadded:: 3.3 The *dir_fd* parameter. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: utime(path, times=None, *[, ns], dir_fd=None, follow_symlinks=True) @@ -2523,6 +2685,9 @@ features: Added support for specifying an open file descriptor for *path*, and the *dir_fd*, *follow_symlinks*, and *ns* parameters. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: walk(top, topdown=True, onerror=None, followlinks=False) @@ -2613,6 +2778,9 @@ features: This function now calls :func:`os.scandir` instead of :func:`os.listdir`, making it faster by reducing the number of calls to :func:`os.stat`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: fwalk(top='.', topdown=True, onerror=None, *, follow_symlinks=False, dir_fd=None) @@ -2669,6 +2837,9 @@ features: .. versionadded:: 3.3 + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + Linux extended attributes ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2680,12 +2851,16 @@ These functions are all available on Linux only. .. function:: getxattr(path, attribute, *, follow_symlinks=True) Return the value of the extended filesystem attribute *attribute* for - *path*. *attribute* can be bytes or str. If it is str, it is encoded - with the filesystem encoding. + *path*. *attribute* can be bytes or str (directly or indirectly through the + :class:`PathLike` interface). If it is str, it is encoded with the filesystem + encoding. This function can support :ref:`specifying a file descriptor ` and :ref:`not following symlinks `. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` fpr *path* and *attribute*. + .. function:: listxattr(path=None, *, follow_symlinks=True) @@ -2697,21 +2872,29 @@ These functions are all available on Linux only. This function can support :ref:`specifying a file descriptor ` and :ref:`not following symlinks `. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: removexattr(path, attribute, *, follow_symlinks=True) Removes the extended filesystem attribute *attribute* from *path*. - *attribute* should be bytes or str. If it is a string, it is encoded + *attribute* should be bytes or str (directly or indirectly through the + :class:`PathLike` interface). If it is a string, it is encoded with the filesystem encoding. This function can support :ref:`specifying a file descriptor ` and :ref:`not following symlinks `. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *path* and *attribute*. + .. function:: setxattr(path, attribute, value, flags=0, *, follow_symlinks=True) Set the extended filesystem attribute *attribute* on *path* to *value*. - *attribute* must be a bytes or str with no embedded NULs. If it is a str, + *attribute* must be a bytes or str with no embedded NULs (directly or + indirectly through the :class:`PathLike` interface). If it is a str, it is encoded with the filesystem encoding. *flags* may be :data:`XATTR_REPLACE` or :data:`XATTR_CREATE`. If :data:`XATTR_REPLACE` is given and the attribute does not exist, ``EEXISTS`` will be raised. @@ -2726,6 +2909,9 @@ These functions are all available on Linux only. A bug in Linux kernel versions less than 2.6.39 caused the flags argument to be ignored on some filesystems. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object` for *path* and *attribute*. + .. data:: XATTR_SIZE_MAX @@ -2827,6 +3013,9 @@ to be ignored. Added support for specifying an open file descriptor for *path* for :func:`execve`. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: _exit(n) Exit the process with status *n*, without calling cleanup handlers, flushing @@ -3137,6 +3326,9 @@ written in Python, such as a mail server's external command delivery program. :func:`spawnve` are not thread-safe on Windows; we advise you to use the :mod:`subprocess` module instead. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. data:: P_NOWAIT P_NOWAITO @@ -3623,6 +3815,11 @@ Miscellaneous System Information Return the number of CPUs in the system. Returns ``None`` if undetermined. + This number is not equivalent to the number of CPUs the current process can + use. The number of usable CPUs can be obtained with + ``len(os.sched_getaffinity(0))`` + + .. versionadded:: 3.4 @@ -3738,35 +3935,89 @@ Higher-level operations on pathnames are defined in the :mod:`os.path` module. .. versionadded:: 3.3 -.. _os-miscfunc: -Miscellaneous Functions ------------------------ +Random numbers +-------------- + + +.. function:: getrandom(size, flags=0) + + Get up to *size* random bytes. The function can return less bytes than + requested. + + These bytes can be used to seed user-space random number generators or for + cryptographic purposes. + + ``getrandom()`` relies on entropy gathered from device drivers and other + sources of environmental noise. Unnecessarily reading large quantities of + data will have a negative impact on other users of the ``/dev/random`` and + ``/dev/urandom`` devices. + + The flags argument is a bit mask that can contain zero or more of the + following values ORed together: :py:data:`os.GRND_RANDOM` and + :py:data:`GRND_NONBLOCK`. + + See also the `Linux getrandom() manual page + `_. + + Availability: Linux 3.17 and newer. + .. versionadded:: 3.6 -.. function:: urandom(n) +.. function:: urandom(size) - Return a string of *n* random bytes suitable for cryptographic use. + Return a string of *size* random bytes suitable for cryptographic use. This function returns random bytes from an OS-specific randomness source. The returned data should be unpredictable enough for cryptographic applications, though its exact quality depends on the OS implementation. - On Linux, ``getrandom()`` syscall is used if available and the urandom - entropy pool is initialized (``getrandom()`` does not block). - On a Unix-like system this will query ``/dev/urandom``. On Windows, it - will use ``CryptGenRandom()``. If a randomness source is not found, - :exc:`NotImplementedError` will be raised. + On Linux, if the ``getrandom()`` syscall is available, it is used in + blocking mode: block until the system urandom entropy pool is initialized + (128 bits of entropy are collected by the kernel). See the :pep:`524` for + the rationale. On Linux, the :func:`getrandom` function can be used to get + random bytes in non-blocking mode (using the :data:`GRND_NONBLOCK` flag) or + to poll until the system urandom entropy pool is initialized. - For an easy-to-use interface to the random number generator - provided by your platform, please see :class:`random.SystemRandom`. + On a Unix-like system, random bytes are read from the ``/dev/urandom`` + device. If the ``/dev/urandom`` device is not available or not readable, the + :exc:`NotImplementedError` exception is raised. + + On Windows, it will use ``CryptGenRandom()``. + + .. seealso:: + The :mod:`secrets` module provides higher level functions. For an + easy-to-use interface to the random number generator provided by your + platform, please see :class:`random.SystemRandom`. + + .. versionchanged:: 3.6.0 + On Linux, ``getrandom()`` is now used in blocking mode to increase the + security. .. versionchanged:: 3.5.2 - On Linux, if ``getrandom()`` blocks (the urandom entropy pool is not - initialized yet), fall back on reading ``/dev/urandom``. + On Linux, if the ``getrandom()`` syscall blocks (the urandom entropy pool + is not initialized yet), fall back on reading ``/dev/urandom``. .. versionchanged:: 3.5 On Linux 3.17 and newer, the ``getrandom()`` syscall is now used when available. On OpenBSD 5.6 and newer, the C ``getentropy()`` function is now used. These functions avoid the usage of an internal file descriptor. + +.. data:: GRND_NONBLOCK + + By default, when reading from ``/dev/random``, :func:`getrandom` blocks if + no random bytes are available, and when reading from ``/dev/urandom``, it blocks + if the entropy pool has not yet been initialized. + + If the :py:data:`GRND_NONBLOCK` flag is set, then :func:`getrandom` does not + block in these cases, but instead immediately raises :exc:`BlockingIOError`. + + .. versionadded:: 3.6 + +.. data:: GRND_RANDOM + + If this bit is set, then random bytes are drawn from the + ``/dev/random`` pool instead of the ``/dev/urandom`` pool. + + .. versionadded:: 3.6 diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst index d40abe1..ee1ce50 100644 --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -9,15 +9,14 @@ available for Python: .. seealso:: `PyGObject `_ - PyGObject provides introspection bindings for C libraries using + provides introspection bindings for C libraries using `GObject `_. One of these libraries is the `GTK+ 3 `_ widget set. GTK+ comes with many more widgets than Tkinter provides. An online `Python GTK+ 3 Tutorial `_ is available. - `PyGTK `_ - PyGTK provides bindings for an older version + `PyGTK `_ provides bindings for an older version of the library, GTK+ 2. It provides an object oriented interface that is slightly higher level than the C one. There are also bindings to `GNOME `_. An online `tutorial @@ -28,10 +27,15 @@ available for Python: extensive C++ GUI application development framework that is available for Unix, Windows and Mac OS X. :program:`sip` is a tool for generating bindings for C++ libraries as Python classes, and - is specifically designed for Python. + is specifically designed for Python. The *PyQt3* bindings have a + book, `GUI Programming with Python: QT Edition + `_ by Boudewijn + Rempt. The *PyQt4* bindings also have a book, `Rapid GUI Programming + with Python and Qt `_, by Mark + Summerfield. `PySide `_ - PySide is a newer binding to the Qt toolkit, provided by Nokia. + is a newer binding to the Qt toolkit, provided by Nokia. Compared to PyQt, its licensing scheme is friendlier to non-open source applications. @@ -45,7 +49,9 @@ available for Python: documentation and context sensitive help, printing, HTML viewing, low-level device context drawing, drag and drop, system clipboard access, an XML-based resource format and more, including an ever growing library - of user-contributed modules. + of user-contributed modules. wxPython has a book, `wxPython in Action + `_, by Noel Rappin and + Robin Dunn. PyGTK, PyQt, and wxPython, all have a modern look and feel and more widgets than Tkinter. In addition, there are many other GUI toolkits for diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst index 7b90a1f..34ab3b8 100644 --- a/Doc/library/pathlib.rst +++ b/Doc/library/pathlib.rst @@ -35,12 +35,6 @@ Pure paths are useful in some special cases; for example: accessing the OS. In this case, instantiating one of the pure classes may be useful since those simply don't have any OS-accessing operations. -.. note:: - This module has been included in the standard library on a - :term:`provisional basis `. Backwards incompatible - changes (up to and including removal of the package) may occur if deemed - necessary by the core developers. - .. seealso:: :pep:`428`: The pathlib module -- object-oriented filesystem paths. @@ -111,7 +105,8 @@ we also call *flavours*: PurePosixPath('setup.py') Each element of *pathsegments* can be either a string representing a - path segment, or another path object:: + path segment, an object implementing the :class:`os.PathLike` interface + which returns a string, or another path object:: >>> PurePath('foo', 'some/path', 'bar') PurePosixPath('foo/some/path/bar') @@ -152,6 +147,12 @@ we also call *flavours*: to ``PurePosixPath('bar')``, which is wrong if ``foo`` is a symbolic link to another directory) + Pure path objects implement the :class:`os.PathLike` interface, allowing them + to be used anywhere the interface is accepted. + + .. versionchanged:: 3.6 + Added support for the :class:`os.PathLike` interface. + .. class:: PurePosixPath(*pathsegments) A subclass of :class:`PurePath`, this path flavour represents non-Windows @@ -199,7 +200,7 @@ Paths of a different flavour compare unequal and cannot be ordered:: >>> PureWindowsPath('foo') < PurePosixPath('foo') Traceback (most recent call last): File "", line 1, in - TypeError: unorderable types: PureWindowsPath() < PurePosixPath() + TypeError: '<' not supported between instances of 'PureWindowsPath' and 'PurePosixPath' Operators @@ -216,6 +217,14 @@ The slash operator helps create child paths, similarly to :func:`os.path.join`:: >>> '/usr' / q PurePosixPath('/usr/bin') +A path object can be used anywhere an object implementing :class:`os.PathLike` +is accepted:: + + >>> import os + >>> p = PurePath('/etc') + >>> os.fspath(p) + '/etc' + The string representation of a path is the raw filesystem path itself (in native form, e.g. with backslashes under Windows), which you can pass to any function taking a file path as a string:: @@ -910,7 +919,7 @@ call fails (for example because the path doesn't exist): to an existing file or directory, it will be unconditionally replaced. -.. method:: Path.resolve() +.. method:: Path.resolve(strict=False) Make the path absolute, resolving any symlinks. A new path object is returned:: @@ -927,10 +936,14 @@ call fails (for example because the path doesn't exist): >>> p.resolve() PosixPath('/home/antoine/pathlib/setup.py') - If the path doesn't exist, :exc:`FileNotFoundError` is raised. If an - infinite loop is encountered along the resolution path, - :exc:`RuntimeError` is raised. + If the path doesn't exist and *strict* is ``True``, :exc:`FileNotFoundError` + is raised. If *strict* is ``False``, the path is resolved as far as possible + and any remainder is appended without checking whether it exists. If an + infinite loop is encountered along the resolution path, :exc:`RuntimeError` + is raised. + .. versionadded:: 3.6 + The *strict* argument. .. method:: Path.rglob(pattern) diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst index 7bc729c..7c37bb7 100644 --- a/Doc/library/pdb.rst +++ b/Doc/library/pdb.rst @@ -76,7 +76,7 @@ The typical usage to inspect a crashed program is:: >>> import mymodule >>> mymodule.test() Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? File "./mymodule.py", line 4, in test test2() File "./mymodule.py", line 3, in test2 @@ -144,7 +144,7 @@ The ``run*`` functions and :func:`set_trace` are aliases for instantiating the access further features, you have to do this yourself: .. class:: Pdb(completekey='tab', stdin=None, stdout=None, skip=None, \ - nosigint=False) + nosigint=False, readrc=True) :class:`Pdb` is the debugger class. @@ -160,6 +160,9 @@ access further features, you have to do this yourself: This allows you to break into the debugger again by pressing :kbd:`Ctrl-C`. If you want Pdb not to touch the SIGINT handler, set *nosigint* to true. + The *readrc* argument defaults to true and controls whether Pdb will load + .pdbrc files from the filesystem. + Example call to enable tracing with *skip*:: import pdb; pdb.Pdb(skip=['django.*']).set_trace() @@ -171,6 +174,9 @@ access further features, you have to do this yourself: The *nosigint* argument. Previously, a SIGINT handler was never set by Pdb. + .. versionchanged:: 3.6 + The *readrc* argument. + .. method:: run(statement, globals=None, locals=None) runeval(expression, globals=None, locals=None) runcall(function, *args, **kwds) diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index 0d64191..6e8430f 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -492,7 +492,7 @@ methods: .. method:: object.__getnewargs_ex__() - In protocols 4 and newer, classes that implements the + In protocols 2 and newer, classes that implements the :meth:`__getnewargs_ex__` method can dictate the values passed to the :meth:`__new__` method upon unpickling. The method must return a pair ``(args, kwargs)`` where *args* is a tuple of positional arguments @@ -504,15 +504,22 @@ methods: class requires keyword-only arguments. Otherwise, it is recommended for compatibility to implement :meth:`__getnewargs__`. + .. versionchanged:: 3.6 + :meth:`__getnewargs_ex__` is now used in protocols 2 and 3. + .. method:: object.__getnewargs__() - This method serve a similar purpose as :meth:`__getnewargs_ex__` but - for protocols 2 and newer. It must return a tuple of arguments ``args`` - which will be passed to the :meth:`__new__` method upon unpickling. + This method serve a similar purpose as :meth:`__getnewargs_ex__`, but + supports only positional arguments. It must return a tuple of arguments + ``args`` which will be passed to the :meth:`__new__` method upon unpickling. + + :meth:`__getnewargs__` will not be called if :meth:`__getnewargs_ex__` is + defined. - In protocols 4 and newer, :meth:`__getnewargs__` will not be called if - :meth:`__getnewargs_ex__` is defined. + .. versionchanged:: 3.6 + Before Python 3.6, :meth:`__getnewargs__` was called instead of + :meth:`__getnewargs_ex__` in protocols 2 and 3. .. method:: object.__getstate__() diff --git a/Doc/library/pkgutil.rst b/Doc/library/pkgutil.rst index b9e76f7..90d69e4 100644 --- a/Doc/library/pkgutil.rst +++ b/Doc/library/pkgutil.rst @@ -11,6 +11,11 @@ This module provides utilities for the import system, in particular package support. +.. class:: ModuleInfo(module_finder, name, ispkg) + + A namedtuple that holds a brief summary of a module's info. + + .. versionadded:: 3.6 .. function:: extend_path(path, name) @@ -139,7 +144,7 @@ support. .. function:: iter_modules(path=None, prefix='') - Yields ``(module_finder, name, ispkg)`` for all submodules on *path*, or, if + Yields :class:`ModuleInfo` for all submodules on *path*, or, if *path* is ``None``, all top-level modules on ``sys.path``. *path* should be either ``None`` or a list of paths to look for modules in. @@ -160,7 +165,7 @@ support. .. function:: walk_packages(path=None, prefix='', onerror=None) - Yields ``(module_finder, name, ispkg)`` for all modules recursively on + Yields :class:`ModuleInfo` for all modules recursively on *path*, or, if *path* is ``None``, all accessible modules. *path* should be either ``None`` or a list of paths to look for modules in. @@ -219,6 +224,4 @@ support. If the package cannot be located or loaded, or it uses a :term:`loader` which does not support :meth:`get_data `, - then ``None`` is returned. In particular, the :term:`loader` for - :term:`namespace packages ` does not support - :meth:`get_data `. + then ``None`` is returned. diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst index ffabc32..d72b660 100644 --- a/Doc/library/poplib.rst +++ b/Doc/library/poplib.rst @@ -62,6 +62,13 @@ The :mod:`poplib` module provides two classes: :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :data:`ssl.HAS_SNI`). + .. deprecated:: 3.6 + + *keyfile* and *certfile* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + One exception is defined as an attribute of the :mod:`poplib` module: diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst index 5796e3a..959d9b9 100644 --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -85,11 +85,11 @@ next line: ``Ordered by: standard name``, indicates that the text string in the far right column was used to sort the output. The column headings include: ncalls - for the number of calls. + for the number of calls, tottime - for the total time spent in the given function (and excluding time made in - calls to sub-functions) + for the total time spent in the given function (and excluding time made in + calls to sub-functions) percall is the quotient of ``tottime`` divided by ``ncalls`` @@ -215,11 +215,11 @@ functions: and gathers profiling statistics from the execution. If no file name is present, then this function automatically creates a :class:`~pstats.Stats` - instance and prints a simple profiling report. If the sort value is specified, + instance and prints a simple profiling report. If the sort value is specified it is passed to this :class:`~pstats.Stats` instance to control how the results are sorted. -.. function:: runctx(command, globals, locals, filename=None, sort=-1) +.. function:: runctx(command, globals, locals, filename=None) This function is similar to :func:`run`, with added arguments to supply the globals and locals dictionaries for the *command* string. This routine @@ -444,10 +444,9 @@ Analysis of the profiler data is done using the :class:`~pstats.Stats` class. significant entries. Initially, the list is taken to be the complete set of profiled functions. Each restriction is either an integer (to select a count of lines), or a decimal fraction between 0.0 and 1.0 inclusive (to - select a percentage of lines), or a string that will interpreted as a - regular expression (to pattern match the standard name that is printed). - If several restrictions are provided, then they are applied sequentially. - For example:: + select a percentage of lines), or a regular expression (to pattern match + the standard name that is printed. If several restrictions are provided, + then they are applied sequentially. For example:: print_stats(.1, 'foo:') diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst index e43b9ae..075a8b5 100644 --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -869,7 +869,7 @@ The ``errors`` module has the following attributes: .. rubric:: Footnotes -.. [1] The encoding string included in XML output should conform to the +.. [#] The encoding string included in XML output should conform to the appropriate standards. For example, "UTF-8" is valid, but "UTF8" is not. See https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl and https://www.iana.org/assignments/character-sets/character-sets.xhtml. diff --git a/Doc/library/queue.rst b/Doc/library/queue.rst index 924be5a..bd0fc2d 100644 --- a/Doc/library/queue.rst +++ b/Doc/library/queue.rst @@ -16,8 +16,9 @@ availability of thread support in Python; see the :mod:`threading` module. The module implements three types of queue, which differ only in the order in -which the entries are retrieved. In a FIFO queue, the first tasks added are -the first retrieved. In a LIFO queue, the most recently added entry is +which the entries are retrieved. In a :abbr:`FIFO (first-in, first-out)` +queue, the first tasks added are the first retrieved. In a +:abbr:`LIFO (last-in, first-out)` queue, the most recently added entry is the first retrieved (operating like a stack). With a priority queue, the entries are kept sorted (using the :mod:`heapq` module) and the lowest valued entry is retrieved first. @@ -29,14 +30,16 @@ The :mod:`queue` module defines the following classes and exceptions: .. class:: Queue(maxsize=0) - Constructor for a FIFO queue. *maxsize* is an integer that sets the upperbound + Constructor for a :abbr:`FIFO (first-in, first-out)` queue. *maxsize* is + an integer that sets the upperbound limit on the number of items that can be placed in the queue. Insertion will block once this size has been reached, until queue items are consumed. If *maxsize* is less than or equal to zero, the queue size is infinite. .. class:: LifoQueue(maxsize=0) - Constructor for a LIFO queue. *maxsize* is an integer that sets the upperbound + Constructor for a :abbr:`LIFO (last-in, first-out)` queue. *maxsize* is + an integer that sets the upperbound limit on the number of items that can be placed in the queue. Insertion will block once this size has been reached, until queue items are consumed. If *maxsize* is less than or equal to zero, the queue size is infinite. diff --git a/Doc/library/quopri.rst b/Doc/library/quopri.rst index a3f94a0..ef2b5f2 100644 --- a/Doc/library/quopri.rst +++ b/Doc/library/quopri.rst @@ -32,8 +32,8 @@ sending a graphics file. .. function:: encode(input, output, quotetabs, header=False) - Encode the contents of the *input* file and write the resulting quoted-printable - data to the *output* file. *input* and *output* must be + Encode the contents of the *input* file and write the resulting quoted- + printable data to the *output* file. *input* and *output* must be :term:`binary file objects `. *quotetabs*, a flag which controls whether to encode embedded spaces and tabs must be provideda and when true it encodes such embedded whitespace, and when false it leaves them unencoded. diff --git a/Doc/library/random.rst b/Doc/library/random.rst index 8ae242c..4f25157 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -46,10 +46,24 @@ from sources provided by the operating system. .. warning:: The pseudo-random generators of this module should not be used for - security purposes. + security purposes. For security or cryptographic uses, see the + :mod:`secrets` module. +.. seealso:: + + M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-dimensionally + equidistributed uniform pseudorandom number generator", ACM Transactions on + Modeling and Computer Simulation Vol. 8, No. 1, January pp.3--30 1998. + + + `Complementary-Multiply-with-Carry recipe + `_ for a compatible alternative + random number generator with a long period and comparatively simple update + operations. -Bookkeeping functions: + +Bookkeeping functions +--------------------- .. function:: seed(a=None, version=2) @@ -93,7 +107,8 @@ Bookkeeping functions: :meth:`randrange` to handle arbitrarily large ranges. -Functions for integers: +Functions for integers +---------------------- .. function:: randrange(stop) randrange(start, stop[, step]) @@ -116,23 +131,55 @@ Functions for integers: ``randrange(a, b+1)``. -Functions for sequences: +Functions for sequences +----------------------- .. function:: choice(seq) Return a random element from the non-empty sequence *seq*. If *seq* is empty, raises :exc:`IndexError`. +.. function:: choices(population, weights=None, *, cum_weights=None, k=1) + + Return a *k* sized list of elements chosen from the *population* with replacement. + If the *population* is empty, raises :exc:`IndexError`. + + If a *weights* sequence is specified, selections are made according to the + relative weights. Alternatively, if a *cum_weights* sequence is given, the + selections are made according to the cumulative weights (perhaps computed + using :func:`itertools.accumulate`). For example, the relative weights + ``[10, 5, 30, 5]`` are equivalent to the cumulative weights + ``[10, 15, 45, 50]``. Internally, the relative weights are converted to + cumulative weights before making selections, so supplying the cumulative + weights saves work. + + If neither *weights* nor *cum_weights* are specified, selections are made + with equal probability. If a weights sequence is supplied, it must be + the same length as the *population* sequence. It is a :exc:`TypeError` + to specify both *weights* and *cum_weights*. + + The *weights* or *cum_weights* can use any numeric type that interoperates + with the :class:`float` values returned by :func:`random` (that includes + integers, floats, and fractions but excludes decimals). + + .. versionadded:: 3.6 + .. function:: shuffle(x[, random]) - Shuffle the sequence *x* in place. The optional argument *random* is a - 0-argument function returning a random float in [0.0, 1.0); by default, this is - the function :func:`.random`. + Shuffle the sequence *x* in place. + + The optional argument *random* is a 0-argument function returning a random + float in [0.0, 1.0); by default, this is the function :func:`.random`. + + To shuffle an immutable sequence and return a new shuffled list, use + ``sample(x, k=len(x))`` instead. - Note that for even rather small ``len(x)``, the total number of permutations of - *x* is larger than the period of most random number generators; this implies - that most permutations of a long sequence can never be generated. + Note that even for small ``len(x)``, the total number of permutations of *x* + can quickly grow larger than the period of most random number generators. + This implies that most permutations of a long sequence can never be + generated. For example, a sequence of length 2080 is the largest that + can fit within the period of the Mersenne Twister random number generator. .. function:: sample(population, k) @@ -149,13 +196,16 @@ Functions for sequences: Members of the population need not be :term:`hashable` or unique. If the population contains repeats, then each occurrence is a possible selection in the sample. - To choose a sample from a range of integers, use an :func:`range` object as an + To choose a sample from a range of integers, use a :func:`range` object as an argument. This is especially fast and space efficient for sampling from a large - population: ``sample(range(10000000), 60)``. + population: ``sample(range(10000000), k=60)``. If the sample size is larger than the population size, a :exc:`ValueError` is raised. +Real-valued distributions +------------------------- + The following functions generate specific real-valued distributions. Function parameters are named after the corresponding variables in the distribution's equation, as used in common mathematical practice; most of these equations can @@ -250,7 +300,8 @@ be found in any statistics text. parameter. -Alternative Generator: +Alternative Generator +--------------------- .. class:: SystemRandom([seed]) @@ -262,19 +313,6 @@ Alternative Generator: :exc:`NotImplementedError` if called. -.. seealso:: - - M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-dimensionally - equidistributed uniform pseudorandom number generator", ACM Transactions on - Modeling and Computer Simulation Vol. 8, No. 1, January pp.3--30 1998. - - - `Complementary-Multiply-with-Carry recipe - `_ for a compatible alternative - random number generator with a long period and comparatively simple update - operations. - - Notes on Reproducibility ------------------------ @@ -296,53 +334,146 @@ change across Python versions, but two aspects are guaranteed not to change: Examples and Recipes -------------------- -Basic usage:: +Basic examples:: - >>> random.random() # Random float x, 0.0 <= x < 1.0 + >>> random() # Random float: 0.0 <= x < 1.0 0.37444887175646646 - >>> random.uniform(1, 10) # Random float x, 1.0 <= x < 10.0 - 1.1800146073117523 + >>> uniform(2.5, 10.0) # Random float: 2.5 <= x < 10.0 + 3.1800146073117523 + + >>> expovariate(1 / 5) # Interval between arrivals averaging 5 seconds + 5.148957571865031 - >>> random.randrange(10) # Integer from 0 to 9 + >>> randrange(10) # Integer from 0 to 9 inclusive 7 - >>> random.randrange(0, 101, 2) # Even integer from 0 to 100 + >>> randrange(0, 101, 2) # Even integer from 0 to 100 inclusive 26 - >>> random.choice('abcdefghij') # Single random element - 'c' - - >>> items = [1, 2, 3, 4, 5, 6, 7] - >>> random.shuffle(items) - >>> items - [7, 3, 2, 5, 6, 4, 1] - - >>> random.sample([1, 2, 3, 4, 5], 3) # Three samples without replacement - [4, 1, 5] - -A common task is to make a :func:`random.choice` with weighted probabilities. + >>> choice(['win', 'lose', 'draw']) # Single random element from a sequence + 'draw' + + >>> deck = 'ace two three four'.split() + >>> shuffle(deck) # Shuffle a list + >>> deck + ['four', 'two', 'ace', 'three'] + + >>> sample([10, 20, 30, 40, 50], k=4) # Four samples without replacement + [40, 10, 50, 30] + +Simulations:: + + >>> # Six roulette wheel spins (weighted sampling with replacement) + >>> choices(['red', 'black', 'green'], [18, 18, 2], k=6) + ['red', 'green', 'black', 'black', 'red', 'black'] + + >>> # Deal 20 cards without replacement from a deck of 52 playing cards + >>> # and determine the proportion of cards with a ten-value + >>> # (a ten, jack, queen, or king). + >>> deck = collections.Counter(tens=16, low_cards=36) + >>> seen = sample(list(deck.elements()), k=20) + >>> seen.count('tens') / 20 + 0.15 + + >>> # Estimate the probability of getting 5 or more heads from 7 spins + >>> # of a biased coin that settles on heads 60% of the time. + >>> trial = lambda: choices('HT', cum_weights=(0.60, 1.00), k=7).count('H') >= 5 + >>> sum(trial() for i in range(10000)) / 10000 + 0.4169 + + >>> # Probability of the median of 5 samples being in middle two quartiles + >>> trial = lambda : 2500 <= sorted(choices(range(10000), k=5))[2] < 7500 + >>> sum(trial() for i in range(10000)) / 10000 + 0.7958 + +Example of `statistical bootstrapping +`_ using resampling +with replacement to estimate a confidence interval for the mean of a sample of +size five:: + + # http://statistics.about.com/od/Applications/a/Example-Of-Bootstrapping.htm + from statistics import mean + from random import choices + + data = 1, 2, 4, 4, 10 + means = sorted(mean(choices(data, k=5)) for i in range(20)) + print(f'The sample mean of {mean(data):.1f} has a 90% confidence ' + f'interval from {means[1]:.1f} to {means[-2]:.1f}') + +Example of a `resampling permutation test +`_ +to determine the statistical significance or `p-value +`_ of an observed difference +between the effects of a drug versus a placebo:: + + # Example from "Statistics is Easy" by Dennis Shasha and Manda Wilson + from statistics import mean + from random import shuffle + + drug = [54, 73, 53, 70, 73, 68, 52, 65, 65] + placebo = [54, 51, 58, 44, 55, 52, 42, 47, 58, 46] + observed_diff = mean(drug) - mean(placebo) + + n = 10000 + count = 0 + combined = drug + placebo + for i in range(n): + shuffle(combined) + new_diff = mean(combined[:len(drug)]) - mean(combined[len(drug):]) + count += (new_diff >= observed_diff) + + print(f'{n} label reshufflings produced only {count} instances with a difference') + print(f'at least as extreme as the observed difference of {observed_diff:.1f}.') + print(f'The one-sided p-value of {count / n:.4f} leads us to reject the null') + print(f'hypothesis that there is no difference between the drug and the placebo.') + +Simulation of arrival times and service deliveries in a single server queue:: + + from random import expovariate, gauss + from statistics import mean, median, stdev + + average_arrival_interval = 5.6 + average_service_time = 5.0 + stdev_service_time = 0.5 + + num_waiting = 0 + arrivals = [] + starts = [] + arrival = service_end = 0.0 + for i in range(20000): + if arrival <= service_end: + num_waiting += 1 + arrival += expovariate(1.0 / average_arrival_interval) + arrivals.append(arrival) + else: + num_waiting -= 1 + service_start = service_end if num_waiting else arrival + service_time = gauss(average_service_time, stdev_service_time) + service_end = service_start + service_time + starts.append(service_start) + + waits = [start - arrival for arrival, start in zip(arrivals, starts)] + print(f'Mean wait: {mean(waits):.1f}. Stdev wait: {stdev(waits):.1f}.') + print(f'Median wait: {median(waits):.1f}. Max wait: {max(waits):.1f}.') -If the weights are small integer ratios, a simple technique is to build a sample -population with repeats:: - - >>> weighted_choices = [('Red', 3), ('Blue', 2), ('Yellow', 1), ('Green', 4)] - >>> population = [val for val, cnt in weighted_choices for i in range(cnt)] - >>> population - ['Red', 'Red', 'Red', 'Blue', 'Blue', 'Yellow', 'Green', 'Green', 'Green', 'Green'] - - >>> random.choice(population) - 'Green' - -A more general approach is to arrange the weights in a cumulative distribution -with :func:`itertools.accumulate`, and then locate the random value with -:func:`bisect.bisect`:: - - >>> choices, weights = zip(*weighted_choices) - >>> cumdist = list(itertools.accumulate(weights)) - >>> cumdist # [3, 3+2, 3+2+1, 3+2+1+4] - [3, 5, 6, 10] +.. seealso:: - >>> x = random.random() * cumdist[-1] - >>> choices[bisect.bisect(cumdist, x)] - 'Blue' + `Statistics for Hackers `_ + a video tutorial by + `Jake Vanderplas `_ + on statistical analysis using just a few fundamental concepts + including simulation, sampling, shuffling, and cross-validation. + + `Economics Simulation + `_ + a simulation of a marketplace by + `Peter Norvig `_ that shows effective + use of many of the tools and distributions provided by this module + (gauss, uniform, sample, betavariate, choice, triangular, and randrange). + + `A Concrete Introduction to Probability (using Python) + `_ + a tutorial by `Peter Norvig `_ covering + the basics of probability theory, how to write simulations, and + how to perform data analysis using Python. diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 26d2558..a298d97 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -42,12 +42,6 @@ module-level functions and methods on that don't require you to compile a regex object first, but miss some fine-tuning parameters. -.. seealso:: - - The third-party `regex `_ module, - which has an API compatible with the standard library :mod:`re` module, - but offers additional functionality and a more thorough Unicode support. - .. _re-syntax: @@ -236,12 +230,8 @@ The special characters are: flags are described in :ref:`contents-of-module-re`.) This is useful if you wish to include the flags as part of the regular expression, instead of passing a *flag* argument to the - :func:`re.compile` function. - - Note that the ``(?x)`` flag changes how the expression is parsed. It should be - used first in the expression string, or after one or more whitespace characters. - If there are non-whitespace characters before the flag, the results are - undefined. + :func:`re.compile` function. Flags should be used first in the + expression string. ``(?:...)`` A non-capturing version of regular parentheses. Matches whatever regular @@ -249,6 +239,16 @@ The special characters are: *cannot* be retrieved after performing a match or referenced later in the pattern. +``(?imsx-imsx:...)`` + (Zero or more letters from the set ``'i'``, ``'m'``, ``'s'``, ``'x'``, + optionally followed by ``'-'`` followed by one or more letters from the + same set.) The letters set or removes the corresponding flags: + :const:`re.I` (ignore case), :const:`re.M` (multi-line), :const:`re.S` + (dot matches all), and :const:`re.X` (verbose), for the part of the + expression. (The flags are described in :ref:`contents-of-module-re`.) + + .. versionadded:: 3.6 + ``(?P...)`` Similar to regular parentheses, but the substring matched by the group is accessible via the symbolic group name *name*. Group names must be valid @@ -333,8 +333,9 @@ The special characters are: The special sequences consist of ``'\'`` and a character from the list below. -If the ordinary character is not on the list, then the resulting RE will match -the second character. For example, ``\$`` matches the character ``'$'``. +If the ordinary character is not an ASCII digit or an ASCII letter, then the +resulting RE will match the second character. For example, ``\$`` matches the +character ``'$'``. ``\number`` Matches the contents of the group of the same number. Groups are numbered @@ -454,9 +455,8 @@ three digits in length. .. versionchanged:: 3.3 The ``'\u'`` and ``'\U'`` escape sequences have been added. -.. deprecated-removed:: 3.5 3.6 - Unknown escapes consisting of ``'\'`` and ASCII letter now raise a - deprecation warning and will be forbidden in Python 3.6. +.. versionchanged:: 3.6 + Unknown escapes consisting of ``'\'`` and an ASCII letter now are errors. .. seealso:: @@ -478,6 +478,9 @@ functions are simplified versions of the full featured methods for compiled regular expressions. Most non-trivial applications always use the compiled form. +.. versionchanged:: 3.6 + Flag constants are now instances of :class:`RegexFlag`, which is a subclass of + :class:`enum.IntFlag`. .. function:: compile(pattern, flags=0) @@ -544,11 +547,11 @@ form. current locale. The use of this flag is discouraged as the locale mechanism is very unreliable, and it only handles one "culture" at a time anyway; you should use Unicode matching instead, which is the default in Python 3 - for Unicode (str) patterns. This flag makes sense only with bytes patterns. + for Unicode (str) patterns. This flag can be used only with bytes patterns. - .. deprecated-removed:: 3.5 3.6 - Deprecated the use of :const:`re.LOCALE` with string patterns or - :const:`re.ASCII`. + .. versionchanged:: 3.6 + :const:`re.LOCALE` can be used only with bytes patterns and is + not compatible with :const:`re.ASCII`. .. data:: M @@ -754,9 +757,13 @@ form. .. versionchanged:: 3.5 Unmatched groups are replaced with an empty string. - .. deprecated-removed:: 3.5 3.6 - Unknown escapes consist of ``'\'`` and ASCII letter now raise a - deprecation warning and will be forbidden in Python 3.6. + .. versionchanged:: 3.6 + Unknown escapes in *pattern* consisting of ``'\'`` and an ASCII letter + now are errors. + + .. deprecated-removed:: 3.5 3.7 + Unknown escapes in *repl* consist of ``'\'`` and ASCII letter now raise + a deprecation warning and will be forbidden in Python 3.7. .. function:: subn(pattern, repl, string, count=0, flags=0) @@ -771,22 +778,11 @@ form. Unmatched groups are replaced with an empty string. -.. function:: escape(pattern) +.. function:: escape(string) - Escape all the characters in *pattern* except ASCII letters, numbers and ``'_'``. + Escape all the characters in pattern except ASCII letters, numbers and ``'_'``. This is useful if you want to match an arbitrary literal string that may - have regular expression metacharacters in it. For example:: - - >>> print(re.escape('python.exe')) - python\.exe - - >>> legal_chars = string.ascii_lowercase + string.digits + "!#$%&'*+-.^_`|~:" - >>> print('[%s]+' % re.escape(legal_chars)) - [abcdefghijklmnopqrstuvwxyz0123456789\!\#\$\%\&\'\*\+\-\.\^_\`\|\~\:]+ - - >>> operators = ['+', '-', '*', '/', '**'] - >>> print('|'.join(map(re.escape, sorted(operators, reverse=True)))) - \/|\-|\+|\*\*|\* + have regular expression metacharacters in it. .. versionchanged:: 3.3 The ``'_'`` character is no longer escaped. @@ -815,15 +811,15 @@ form. .. attribute:: pos - The index in *pattern* where compilation failed (may be ``None``). + The index of *pattern* where compilation failed. .. attribute:: lineno - The line corresponding to *pos* (may be ``None``). + The line corresponding to *pos*. .. attribute:: colno - The column corresponding to *pos* (may be ``None``). + The column corresponding to *pos*. .. versionchanged:: 3.5 Added additional attributes. @@ -1033,6 +1029,22 @@ Match objects support the following methods and attributes: 'c3' +.. method:: match.__getitem__(g) + + This is identical to ``m.group(g)``. This allows easier access to + an individual group from a match: + + >>> m = re.match(r"(\w+) (\w+)", "Isaac Newton, physicist") + >>> m[0] # The entire match + 'Isaac Newton' + >>> m[1] # The first parenthesized subgroup. + 'Isaac' + >>> m[2] # The second parenthesized subgroup. + 'Newton' + + .. versionadded:: 3.6 + + .. method:: match.groups(default=None) Return a tuple containing all the subgroups of the match, from 1 up to however diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst index 4d3c099..54c54b4 100644 --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -167,6 +167,20 @@ The following functions operate on a global history list: This calls :c:func:`add_history` in the underlying library. +.. function:: set_auto_history(enabled) + + Enable or disable automatic calls to :c:func:`add_history` when reading + input via readline. The *enabled* argument should be a Boolean value + that when true, enables auto history, and that when false, disables + auto history. + + .. versionadded:: 3.6 + + .. impl-detail:: + Auto history is enabled by default, and changes to this do not persist + across multiple sessions. + + Startup hooks ------------- diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst new file mode 100644 index 0000000..9bf848f --- /dev/null +++ b/Doc/library/secrets.rst @@ -0,0 +1,198 @@ +:mod:`secrets` --- Generate secure random numbers for managing secrets +====================================================================== + +.. module:: secrets + :synopsis: Generate secure random numbers for managing secrets. + +.. moduleauthor:: Steven D'Aprano +.. sectionauthor:: Steven D'Aprano +.. versionadded:: 3.6 + +.. testsetup:: + + from secrets import * + __name__ = '' + +**Source code:** :source:`Lib/secrets.py` + +------------- + +The :mod:`secrets` module is used for generating cryptographically strong +random numbers suitable for managing data such as passwords, account +authentication, security tokens, and related secrets. + +In particularly, :mod:`secrets` should be used in preference to the +default pseudo-random number generator in the :mod:`random` module, which +is designed for modelling and simulation, not security or cryptography. + +.. seealso:: + + :pep:`506` + + +Random numbers +-------------- + +The :mod:`secrets` module provides access to the most secure source of +randomness that your operating system provides. + +.. class:: SystemRandom + + A class for generating random numbers using the highest-quality + sources provided by the operating system. See + :class:`random.SystemRandom` for additional details. + +.. function:: choice(sequence) + + Return a randomly-chosen element from a non-empty sequence. + +.. function:: randbelow(n) + + Return a random int in the range [0, *n*). + +.. function:: randbits(k) + + Return an int with *k* random bits. + + +Generating tokens +----------------- + +The :mod:`secrets` module provides functions for generating secure +tokens, suitable for applications such as password resets, +hard-to-guess URLs, and similar. + +.. function:: token_bytes([nbytes=None]) + + Return a random byte string containing *nbytes* number of bytes. + If *nbytes* is ``None`` or not supplied, a reasonable default is + used. + + .. doctest:: + + >>> token_bytes(16) #doctest:+SKIP + b'\xebr\x17D*t\xae\xd4\xe3S\xb6\xe2\xebP1\x8b' + + +.. function:: token_hex([nbytes=None]) + + Return a random text string, in hexadecimal. The string has *nbytes* + random bytes, each byte converted to two hex digits. If *nbytes* is + ``None`` or not supplied, a reasonable default is used. + + .. doctest:: + + >>> token_hex(16) #doctest:+SKIP + 'f9bf78b9a18ce6d46a0cd2b0b86df9da' + +.. function:: token_urlsafe([nbytes=None]) + + Return a random URL-safe text string, containing *nbytes* random + bytes. The text is Base64 encoded, so on average each byte results + in approximately 1.3 characters. If *nbytes* is ``None`` or not + supplied, a reasonable default is used. + + .. doctest:: + + >>> token_urlsafe(16) #doctest:+SKIP + 'Drmhze6EPcv0fN_81Bj-nA' + + +How many bytes should tokens use? +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +To be secure against +`brute-force attacks `_, +tokens need to have sufficient randomness. Unfortunately, what is +considered sufficient will necessarily increase as computers get more +powerful and able to make more guesses in a shorter period. As of 2015, +it is believed that 32 bytes (256 bits) of randomness is sufficient for +the typical use-case expected for the :mod:`secrets` module. + +For those who want to manage their own token length, you can explicitly +specify how much randomness is used for tokens by giving an :class:`int` +argument to the various ``token_*`` functions. That argument is taken +as the number of bytes of randomness to use. + +Otherwise, if no argument is provided, or if the argument is ``None``, +the ``token_*`` functions will use a reasonable default instead. + +.. note:: + + That default is subject to change at any time, including during + maintenance releases. + + +Other functions +--------------- + +.. function:: compare_digest(a, b) + + Return ``True`` if strings *a* and *b* are equal, otherwise ``False``, + in such a way as to reduce the risk of + `timing attacks `_. + See :func:`hmac.compare_digest` for additional details. + + +Recipes and best practices +-------------------------- + +This section shows recipes and best practices for using :mod:`secrets` +to manage a basic level of security. + +Generate an eight-character alphanumeric password: + +.. testcode:: + + import string + alphabet = string.ascii_letters + string.digits + password = ''.join(choice(alphabet) for i in range(8)) + + +.. note:: + + Applications should not + `store passwords in a recoverable format `_, + whether plain text or encrypted. They should be salted and hashed + using a cryptographically-strong one-way (irreversible) hash function. + + +Generate a ten-character alphanumeric password with at least one +lowercase character, at least one uppercase character, and at least +three digits: + +.. testcode:: + + import string + alphabet = string.ascii_letters + string.digits + while True: + password = ''.join(choice(alphabet) for i in range(10)) + if (any(c.islower() for c in password) + and any(c.isupper() for c in password) + and sum(c.isdigit() for c in password) >= 3): + break + + +Generate an `XKCD-style passphrase `_: + +.. testcode:: + + # On standard Linux systems, use a convenient dictionary file. + # Other platforms may need to provide their own word-list. + with open('/usr/share/dict/words') as f: + words = [word.strip() for word in f] + password = ' '.join(choice(words) for i in range(4)) + + +Generate a hard-to-guess temporary URL containing a security token +suitable for password recovery applications: + +.. testcode:: + + url = 'https://mydomain.com/reset=' + token_urlsafe() + + + +.. + # This modeline must appear within the last ten lines of the file. + kate: indent-width 3; remove-trailing-space on; replace-tabs on; encoding utf-8; diff --git a/Doc/library/select.rst b/Doc/library/select.rst index a81386a..f97118e 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -268,35 +268,43 @@ Edge and Level Trigger Polling (epoll) Objects *eventmask* - +-----------------------+-----------------------------------------------+ - | Constant | Meaning | - +=======================+===============================================+ - | :const:`EPOLLIN` | Available for read | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLOUT` | Available for write | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLPRI` | Urgent data for read | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLERR` | Error condition happened on the assoc. fd | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLHUP` | Hang up happened on the assoc. fd | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLET` | Set Edge Trigger behavior, the default is | - | | Level Trigger behavior | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLONESHOT` | Set one-shot behavior. After one event is | - | | pulled out, the fd is internally disabled | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLRDNORM` | Equivalent to :const:`EPOLLIN` | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLRDBAND` | Priority data band can be read. | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLWRNORM` | Equivalent to :const:`EPOLLOUT` | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLWRBAND` | Priority data may be written. | - +-----------------------+-----------------------------------------------+ - | :const:`EPOLLMSG` | Ignored. | - +-----------------------+-----------------------------------------------+ + +-------------------------+-----------------------------------------------+ + | Constant | Meaning | + +=========================+===============================================+ + | :const:`EPOLLIN` | Available for read | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLOUT` | Available for write | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLPRI` | Urgent data for read | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLERR` | Error condition happened on the assoc. fd | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLHUP` | Hang up happened on the assoc. fd | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLET` | Set Edge Trigger behavior, the default is | + | | Level Trigger behavior | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLONESHOT` | Set one-shot behavior. After one event is | + | | pulled out, the fd is internally disabled | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLEXCLUSIVE` | Wake only one epoll object when the | + | | associated fd has an event. The default (if | + | | this flag is not set) is to wake all epoll | + | | objects polling on on a fd. | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLRDHUP` | Stream socket peer closed connection or shut | + | | down writing half of connection. | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLRDNORM` | Equivalent to :const:`EPOLLIN` | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLRDBAND` | Priority data band can be read. | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLWRNORM` | Equivalent to :const:`EPOLLOUT` | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLWRBAND` | Priority data may be written. | + +-------------------------+-----------------------------------------------+ + | :const:`EPOLLMSG` | Ignored. | + +-------------------------+-----------------------------------------------+ .. method:: epoll.close() @@ -385,6 +393,9 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while +-------------------+------------------------------------------+ | :const:`POLLHUP` | Hung up | +-------------------+------------------------------------------+ + | :const:`POLLRDHUP`| Stream socket peer closed connection, or | + | | shut down writing half of connection | + +-------------------+------------------------------------------+ | :const:`POLLNVAL` | Invalid request: descriptor not open | +-------------------+------------------------------------------+ diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst index 6d864a8..1624d88 100644 --- a/Doc/library/selectors.rst +++ b/Doc/library/selectors.rst @@ -68,7 +68,7 @@ constants below: .. class:: SelectorKey A :class:`SelectorKey` is a :class:`~collections.namedtuple` used to - associate a file object to its underlying file descriptor, selected event + associate a file object to its underlying file decriptor, selected event mask and attached data. It is returned by several :class:`BaseSelector` methods. diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst index e81f982..1a89bf6 100644 --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -73,11 +73,11 @@ The :mod:`shlex` module defines the following functions: The :mod:`shlex` module defines the following class: -.. class:: shlex(instream=None, infile=None, posix=False) +.. class:: shlex(instream=None, infile=None, posix=False, punctuation_chars=False) A :class:`~shlex.shlex` instance or subclass instance is a lexical analyzer object. The initialization argument, if present, specifies where to read - characters from. It must be a file-/stream-like object with + characters from. It must be a file-/stream-like object with :meth:`~io.TextIOBase.read` and :meth:`~io.TextIOBase.readline` methods, or a string. If no argument is given, input will be taken from ``sys.stdin``. The second optional argument is a filename string, which sets the initial @@ -87,8 +87,19 @@ The :mod:`shlex` module defines the following class: when *posix* is not true (default), the :class:`~shlex.shlex` instance will operate in compatibility mode. When operating in POSIX mode, :class:`~shlex.shlex` will try to be as close as possible to the POSIX shell - parsing rules. - + parsing rules. The *punctuation_chars* argument provides a way to make the + behaviour even closer to how real shells parse. This can take a number of + values: the default value, ``False``, preserves the behaviour seen under + Python 3.5 and earlier. If set to ``True``, then parsing of the characters + ``();<>|&`` is changed: any run of these characters (considered punctuation + characters) is returned as a single token. If set to a non-empty string of + characters, those characters will be used as the punctuation characters. Any + characters in the :attr:`wordchars` attribute that appear in + *punctuation_chars* will be removed from :attr:`wordchars`. See + :ref:`improved-shell-compatibility` for more information. + + .. versionchanged:: 3.6 + The *punctuation_chars* parameter was added. .. seealso:: @@ -191,7 +202,13 @@ variables which either control lexical analysis or can be used for debugging: .. attribute:: shlex.wordchars The string of characters that will accumulate into multi-character tokens. By - default, includes all ASCII alphanumerics and underscore. + default, includes all ASCII alphanumerics and underscore. In POSIX mode, the + accented characters in the Latin-1 set are also included. If + :attr:`punctuation_chars` is not empty, the characters ``~-./*?=``, which can + appear in filename specifications and command line parameters, will also be + included in this attribute, and any characters which appear in + ``punctuation_chars`` will be removed from ``wordchars`` if they are present + there. .. attribute:: shlex.whitespace @@ -222,9 +239,13 @@ variables which either control lexical analysis or can be used for debugging: .. attribute:: shlex.whitespace_split - If ``True``, tokens will only be split in whitespaces. This is useful, for + If ``True``, tokens will only be split in whitespaces. This is useful, for example, for parsing command lines with :class:`~shlex.shlex`, getting - tokens in a similar way to shell arguments. + tokens in a similar way to shell arguments. If this attribute is ``True``, + :attr:`punctuation_chars` will have no effect, and splitting will happen + only on whitespaces. When using :attr:`punctuation_chars`, which is + intended to provide parsing closer to that implemented by shells, it is + advisable to leave ``whitespace_split`` as ``False`` (the default value). .. attribute:: shlex.infile @@ -245,10 +266,9 @@ variables which either control lexical analysis or can be used for debugging: This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will be opened as a filename and input will - be taken from that stream until EOF, at which - point the :meth:`~io.IOBase.close` method of that stream will be called and - the input source will again become the original input stream. Source + will be opened as a filename and input will be taken from that stream until + EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be + called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. @@ -275,6 +295,16 @@ variables which either control lexical analysis or can be used for debugging: (``''``), in non-POSIX mode, and to ``None`` in POSIX mode. +.. attribute:: shlex.punctuation_chars + + Characters that will be considered punctuation. Runs of punctuation + characters will be returned as a single token. However, note that no + semantic validity checking will be performed: for example, '>>>' could be + returned as a token, even though it may not be recognised as such by shells. + + .. versionadded:: 3.6 + + .. _shlex-parsing-rules: Parsing Rules @@ -327,3 +357,62 @@ following parsing rules. * EOF is signaled with a :const:`None` value; * Quoted empty strings (``''``) are allowed. + +.. _improved-shell-compatibility: + +Improved Compatibility with Shells +---------------------------------- + +.. versionadded:: 3.6 + +The :class:`shlex` class provides compatibility with the parsing performed by +common Unix shells like ``bash``, ``dash``, and ``sh``. To take advantage of +this compatibility, specify the ``punctuation_chars`` argument in the +constructor. This defaults to ``False``, which preserves pre-3.6 behaviour. +However, if it is set to ``True``, then parsing of the characters ``();<>|&`` +is changed: any run of these characters is returned as a single token. While +this is short of a full parser for shells (which would be out of scope for the +standard library, given the multiplicity of shells out there), it does allow +you to perform processing of command lines more easily than you could +otherwise. To illustrate, you can see the difference in the following snippet:: + + import shlex + + for punct in (False, True): + if punct: + message = 'Old' + else: + message = 'New' + text = "a && b; c && d || e; f >'abc'; (def \"ghi\")" + s = shlex.shlex(text, punctuation_chars=punct) + print('%s: %s' % (message, list(s))) + +which prints out:: + + Old: ['a', '&', '&', 'b', ';', 'c', '&', '&', 'd', '|', '|', 'e', ';', 'f', '>', "'abc'", ';', '(', 'def', '"ghi"', ')'] + New: ['a', '&&', 'b', ';', 'c', '&&', 'd', '||', 'e', ';', 'f', '>', "'abc'", ';', '(', 'def', '"ghi"', ')'] + +Of course, tokens will be returned which are not valid for shells, and you'll +need to implement your own error checks on the returned tokens. + +Instead of passing ``True`` as the value for the punctuation_chars parameter, +you can pass a string with specific characters, which will be used to determine +which characters constitute punctuation. For example:: + + >>> import shlex + >>> s = shlex.shlex("a && b || c", punctuation_chars="|") + >>> list(s) + ['a', '&', '&', 'b', '||', 'c'] + +.. note:: When ``punctuation_chars`` is specified, the :attr:`~shlex.wordchars` + attribute is augmented with the characters ``~-./*?=``. That is because these + characters can appear in file names (including wildcards) and command-line + arguments (e.g. ``--color=auto``). Hence:: + + >>> import shlex + >>> s = shlex.shlex('~/a && b-c --color=auto || d *.py?', + ... punctuation_chars=True) + >>> list(s) + ['~/a', '&&', 'b-c', '--color=auto', '||', 'd', '*.py?'] + + diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 3580811..f559ca0 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -153,7 +153,7 @@ Directory and files operations is true and *src* is a symbolic link, *dst* will be a copy of the file *src* refers to. - :func:`~shutil.copy` copies the file data and the file's permission + :func:`copy` copies the file data and the file's permission mode (see :func:`os.chmod`). Other metadata, like the file's creation and modification times, is not preserved. To preserve all file metadata from the original, use @@ -302,7 +302,7 @@ Directory and files operations *src* and *dst*, and will be used to copy *src* to *dest* if :func:`os.rename` cannot be used. If the source is a directory, :func:`copytree` is called, passing it the :func:`copy_function`. The - default *copy_function* is :func:`copy2`. Using :func:`~shutil.copy` as the + default *copy_function* is :func:`copy2`. Using :func:`copy` as the *copy_function* allows the move to succeed when it is not possible to also copy the metadata, at the expense of not copying any of the metadata. @@ -425,7 +425,7 @@ Another example that uses the *ignore* argument to add a logging call:: import logging def _logpath(path, names): - logging.info('Working in %s' % path) + logging.info('Working in %s', path) return [] # nothing will be ignored copytree(source, destination, ignore=_logpath) @@ -458,10 +458,6 @@ Archiving operations .. versionadded:: 3.2 -.. versionchanged:: 3.5 - Added support for the *xztar* format. - - High-level utilities to create and read compressed and archived files are also provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. @@ -471,9 +467,8 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. *base_name* is the name of the file to create, including the path, minus any format-specific extension. *format* is the archive format: one of - "zip" (if the :mod:`zlib` module is available), "tar", "gztar" (if the - :mod:`zlib` module is available), "bztar" (if the :mod:`bz2` module is - available), or "xztar" (if the :mod:`lzma` module is available). + "zip", "tar", "bztar" (if the :mod:`bz2` module is available), "xztar" + (if the :mod:`lzma` module is available) or "gztar". *root_dir* is a directory that will be the root directory of the archive; for example, we typically chdir into *root_dir* before creating the @@ -496,6 +491,9 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. The *verbose* argument is unused and deprecated. + .. versionchanged:: 3.5 + Added support for the *xztar* format. + .. function:: get_archive_formats() @@ -504,11 +502,11 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. By default :mod:`shutil` provides these formats: - - *zip*: ZIP file (if the :mod:`zlib` module is available). - - *tar*: uncompressed tar file. - - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available). - - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available). - - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available). + - *gztar*: gzip'ed tar-file + - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available.) + - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available.) + - *tar*: uncompressed tar file + - *zip*: ZIP file You can register new formats or provide your own archiver for any existing formats, by using :func:`register_archive_format`. @@ -543,12 +541,11 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. *extract_dir* is the name of the target directory where the archive is unpacked. If not provided, the current working directory is used. - *format* is the archive format: one of "zip", "tar", "gztar", "bztar", or - "xztar". Or any other format registered with - :func:`register_unpack_format`. If not provided, :func:`unpack_archive` - will use the archive file name extension and see if an unpacker was - registered for that extension. In case none is found, - a :exc:`ValueError` is raised. + *format* is the archive format: one of "zip", "tar", or "gztar". Or any + other format registered with :func:`register_unpack_format`. If not + provided, :func:`unpack_archive` will use the archive file name extension + and see if an unpacker was registered for that extension. In case none is + found, a :exc:`ValueError` is raised. .. function:: register_unpack_format(name, extensions, function[, extra_args[, description]]) @@ -581,12 +578,11 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. By default :mod:`shutil` provides these formats: - - *zip*: ZIP file (unpacking compressed files works only if the corresponding - module is available). - - *tar*: uncompressed tar file. - - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available). - - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available). - - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available). + - *gztar*: gzip'ed tar-file + - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available.) + - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available.) + - *tar*: uncompressed tar file + - *zip*: ZIP file You can register new formats or provide your own unpacker for any existing formats, by using :func:`register_unpack_format`. @@ -625,6 +621,8 @@ The resulting archive contains: Querying the size of the output terminal ---------------------------------------- +.. versionadded:: 3.3 + .. function:: get_terminal_size(fallback=(columns, lines)) Get the size of the terminal window. @@ -648,8 +646,6 @@ Querying the size of the output terminal See also: The Single UNIX Specification, Version 2, `Other Environment Variables`_. - .. versionadded:: 3.3 - .. _`Other Environment Variables`: http://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html#tag_002_003 diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst index 46d71de..039b666 100644 --- a/Doc/library/signal.rst +++ b/Doc/library/signal.rst @@ -306,10 +306,8 @@ The :mod:`signal` module defines the following functions: a library to wakeup a poll or select call, allowing the signal to be fully processed. - The old wakeup fd is returned (or -1 if file descriptor wakeup was not - enabled). If *fd* is -1, file descriptor wakeup is disabled. - If not -1, *fd* must be non-blocking. It is up to the library to remove - any bytes from *fd* before calling poll or select again. + The old wakeup fd is returned. *fd* must be non-blocking. It is up to the + library to remove any bytes before calling poll or select again. Use for example ``struct.unpack('%uB' % len(data), data)`` to decode the signal numbers list. diff --git a/Doc/library/site.rst b/Doc/library/site.rst index 0a73f5a..43daf79 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -52,7 +52,8 @@ searched for site-packages; otherwise they won't. A path configuration file is a file whose name has the form :file:`{name}.pth` and exists in one of the four directories mentioned above; its contents are additional items (one per line) to be added to ``sys.path``. Non-existing items -are never added to ``sys.path``. No item is added to ``sys.path`` more than +are never added to ``sys.path``, and no check is made that the item refers to a +directory rather than a file. No item is added to ``sys.path`` more than once. Blank lines and lines beginning with ``#`` are skipped. Lines starting with ``import`` (followed by space or tab) are executed. diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst index 4d5a0ce..e383201 100644 --- a/Doc/library/smtpd.rst +++ b/Doc/library/smtpd.rst @@ -13,12 +13,6 @@ This module offers several classes to implement SMTP (email) servers. -.. seealso:: - - The `aiosmtpd `_ package is a recommended - replacement for this module. It is based on :mod:`asyncio` and provides a - more straightforward API. :mod:`smtpd` should be considered deprecated. - Several server implementations are present; one is a generic do-nothing implementation, which can be overridden, while the other two offer specific mail-sending strategies. @@ -35,7 +29,7 @@ SMTPServer Objects .. class:: SMTPServer(localaddr, remoteaddr, data_size_limit=33554432,\ - map=None, enable_SMTPUTF8=False, decode_data=True) + map=None, enable_SMTPUTF8=False, decode_data=False) Create a new :class:`SMTPServer` object, which binds to local address *localaddr*. It will treat *remoteaddr* as an upstream SMTP relayer. Both @@ -52,20 +46,19 @@ SMTPServer Objects global socket map is used. *enable_SMTPUTF8* determines whether the ``SMTPUTF8`` extension (as defined - in :RFC:`6531`) should be enabled. The default is ``False``. If set to - ``True``, *decode_data* must be ``False`` (otherwise an error is raised). + in :RFC:`6531`) should be enabled. The default is ``False``. When ``True``, ``SMTPUTF8`` is accepted as a parameter to the ``MAIL`` command and when present is passed to :meth:`process_message` in the - ``kwargs['mail_options']`` list. + ``kwargs['mail_options']`` list. *decode_data* and *enable_SMTPUTF8* + cannot be set to ``True`` at the same time. *decode_data* specifies whether the data portion of the SMTP transaction - should be decoded using UTF-8. The default is ``True`` for backward - compatibility reasons, but will change to ``False`` in Python 3.6; specify - the keyword value explicitly to avoid the :exc:`DeprecationWarning`. When - *decode_data* is set to ``False`` the server advertises the ``8BITMIME`` + should be decoded using UTF-8. When *decode_data* is ``False`` (the + default), the server advertises the ``8BITMIME`` extension (:rfc:`6152`), accepts the ``BODY=8BITMIME`` parameter to the ``MAIL`` command, and when present passes it to :meth:`process_message` - in the ``kwargs['mail_options']`` list. + in the ``kwargs['mail_options']`` list. *decode_data* and *enable_SMTPUTF8* + cannot be set to ``True`` at the same time. .. method:: process_message(peer, mailfrom, rcpttos, data, **kwargs) @@ -82,9 +75,8 @@ SMTPServer Objects will be a bytes object. *kwargs* is a dictionary containing additional information. It is empty - unless at least one of ``decode_data=False`` or ``enable_SMTPUTF8=True`` - was given as an init parameter, in which case it contains the following - keys: + if ``decode_data=True`` was given as an init argument, otherwise + it contains the following keys: *mail_options*: a list of all received parameters to the ``MAIL`` @@ -115,9 +107,12 @@ SMTPServer Objects *localaddr* and *remoteaddr* may now contain IPv6 addresses. .. versionadded:: 3.5 - the *decode_data* and *enable_SMTPUTF8* constructor arguments, and the - *kwargs* argument to :meth:`process_message` when one or more of these is - specified. + The *decode_data* and *enable_SMTPUTF8* constructor parameters, and the + *kwargs* parameter to :meth:`process_message` when *decode_data* is + ``False``. + + .. versionchanged:: 3.6 + *decode_data* is now ``False`` by default. DebuggingServer Objects @@ -157,7 +152,7 @@ SMTPChannel Objects ------------------- .. class:: SMTPChannel(server, conn, addr, data_size_limit=33554432,\ - map=None, enable_SMTPUTF8=False, decode_data=True) + map=None, enable_SMTPUTF8=False, decode_data=False) Create a new :class:`SMTPChannel` object which manages the communication between the server and a single SMTP client. @@ -169,22 +164,25 @@ SMTPChannel Objects limit. *enable_SMTPUTF8* determines whether the ``SMTPUTF8`` extension (as defined - in :RFC:`6531`) should be enabled. The default is ``False``. A - :exc:`ValueError` is raised if both *enable_SMTPUTF8* and *decode_data* are - set to ``True`` at the same time. + in :RFC:`6531`) should be enabled. The default is ``False``. + *decode_data* and *enable_SMTPUTF8* cannot be set to ``True`` at the same + time. A dictionary can be specified in *map* to avoid using a global socket map. *decode_data* specifies whether the data portion of the SMTP transaction - should be decoded using UTF-8. The default is ``True`` for backward - compatibility reasons, but will change to ``False`` in Python 3.6. Specify - the keyword value explicitly to avoid the :exc:`DeprecationWarning`. + should be decoded using UTF-8. The default is ``False``. + *decode_data* and *enable_SMTPUTF8* cannot be set to ``True`` at the same + time. To use a custom SMTPChannel implementation you need to override the :attr:`SMTPServer.channel_class` of your :class:`SMTPServer`. .. versionchanged:: 3.5 - the *decode_data* and *enable_SMTPUTF8* arguments were added. + The *decode_data* and *enable_SMTPUTF8* parameters were added. + + .. versionchanged:: 3.6 + *decode_data* is now ``False`` by default. The :class:`SMTPChannel` has the following instance variables: diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 8b98ccf..86e769e 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -95,6 +95,14 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :data:`ssl.HAS_SNI`). + .. deprecated:: 3.6 + + *keyfile* and *certfile* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. + + .. class:: LMTP(host='', port=LMTP_PORT, local_hostname=None, source_address=None) The LMTP protocol, which is very similar to ESMTP, is heavily based on the diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index f8ba847..9c10867 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -133,6 +133,22 @@ created. Socket addresses are represented as follows: string format. (ex. ``b'12:23:34:45:56:67'``) This protocol is not supported under FreeBSD. +- :const:`AF_ALG` is a Linux-only socket based interface to Kernel + cryptography. An algorithm socket is configured with a tuple of two to four + elements ``(type, name [, feat [, mask]])``, where: + + - *type* is the algorithm type as string, e.g. ``aead``, ``hash``, + ``skcipher`` or ``rng``. + + - *name* is the algorithm name and operation mode as string, e.g. + ``sha256``, ``hmac(sha256)``, ``cbc(aes)`` or ``drbg_nopr_ctr_aes256``. + + - *feat* and *mask* are unsigned 32bit integers. + + Availability Linux 2.6.38, some algorithm types require more recent Kernels. + + .. versionadded:: 3.6 + - Certain other address families (:const:`AF_PACKET`, :const:`AF_CAN`) support specific representations. @@ -283,6 +299,10 @@ Constants in the Unix header files are defined; for a few symbols, default values are provided. + .. versionchanged:: 3.6 + ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC`` + were added. + .. data:: AF_CAN PF_CAN SOL_CAN_* @@ -331,18 +351,33 @@ Constants .. versionadded:: 3.3 -.. data:: SIO_* +.. data:: SIO_RCVALL + SIO_KEEPALIVE_VALS + SIO_LOOPBACK_FAST_PATH RCVALL_* Constants for Windows' WSAIoctl(). The constants are used as arguments to the :meth:`~socket.socket.ioctl` method of socket objects. + .. versionchanged:: 3.6 + ``SIO_LOOPBACK_FAST_PATH`` was added. + .. data:: TIPC_* TIPC related constants, matching the ones exported by the C socket API. See the TIPC documentation for more information. +.. data:: AF_ALG + SOL_ALG + ALG_* + + Constants for Linux Kernel cryptography. + + Availability: Linux >= 2.6.38. + + .. versionadded:: 3.6 + .. data:: AF_LINK Availability: BSD, OSX. @@ -874,6 +909,10 @@ to sockets. it is recommended to :meth:`close` them explicitly, or to use a :keyword:`with` statement around them. + .. versionchanged:: 3.6 + :exc:`OSError` is now raised if an error occurs when the underlying + :c:func:`close` call is made. + .. note:: :meth:`close()` releases the resource associated with a connection but @@ -994,6 +1033,12 @@ to sockets. On other platforms, the generic :func:`fcntl.fcntl` and :func:`fcntl.ioctl` functions may be used; they accept a socket object as their first argument. + Currently only the following control codes are supported: + ``SIO_RCVALL``, ``SIO_KEEPALIVE_VALS``, and ``SIO_LOOPBACK_FAST_PATH``. + + .. versionchanged:: 3.6 + ``SIO_LOOPBACK_FAST_PATH`` was added. + .. method:: socket.listen([backlog]) Enable a server to accept connections. If *backlog* is specified, it must @@ -1277,6 +1322,15 @@ to sockets. an exception, the method now retries the system call instead of raising an :exc:`InterruptedError` exception (see :pep:`475` for the rationale). +.. method:: socket.sendmsg_afalg([msg], *, op[, iv[, assoclen[, flags]]]) + + Specialized version of :meth:`~socket.sendmsg` for :const:`AF_ALG` socket. + Set mode, IV, AEAD associated data length and flags for :const:`AF_ALG` socket. + + Availability: Linux >= 2.6.38 + + .. versionadded:: 3.6 + .. method:: socket.sendfile(file, offset=0, count=None) Send a file until EOF is reached by using high-performance @@ -1288,8 +1342,8 @@ to sockets. to transmit as opposed to sending the file until EOF is reached. File position is updated on return or also in case of error in which case :meth:`file.tell() ` can be used to figure out the number of - bytes which were sent. The socket must be of :const:`SOCK_STREAM` type. - Non-blocking sockets are not supported. + bytes which were sent. The socket must be of :const:`SOCK_STREAM` type. Non- + blocking sockets are not supported. .. versionadded:: 3.5 @@ -1325,21 +1379,29 @@ to sockets. For further information, please consult the :ref:`notes on socket timeouts `. -.. method:: socket.setsockopt(level, optname, value) +.. method:: socket.setsockopt(level, optname, value: int) +.. method:: socket.setsockopt(level, optname, value: buffer) +.. method:: socket.setsockopt(level, optname, None, optlen: int) .. index:: module: struct Set the value of the given socket option (see the Unix manual page :manpage:`setsockopt(2)`). The needed symbolic constants are defined in the - :mod:`socket` module (:const:`SO_\*` etc.). The value can be an integer or - a :term:`bytes-like object` representing a buffer. In the latter case it is - up to the caller to - ensure that the bytestring contains the proper bits (see the optional built-in - module :mod:`struct` for a way to encode C structures as bytestrings). + :mod:`socket` module (:const:`SO_\*` etc.). The value can be an integer, + ``None`` or a :term:`bytes-like object` representing a buffer. In the later + case it is up to the caller to ensure that the bytestring contains the + proper bits (see the optional built-in module :mod:`struct` for a way to + encode C structures as bytestrings). When value is set to ``None``, + optlen argument is required. It's equivalent to call setsockopt C + function with optval=NULL and optlen=optlen. + .. versionchanged:: 3.5 Writable :term:`bytes-like object` is now accepted. + .. versionchanged:: 3.6 + setsockopt(level, optname, None, optlen: int) form added. + .. method:: socket.shutdown(how) diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 087f4e0..218a31c 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -52,11 +52,12 @@ handler class by subclassing the :class:`BaseRequestHandler` class and overriding its :meth:`~BaseRequestHandler.handle` method; this method will process incoming requests. Second, you must instantiate one of the server classes, passing it -the server's address and the request handler class. Then call the +the server's address and the request handler class. It is recommended to use +the server in a :keyword:`with` statement. Then call the :meth:`~BaseServer.handle_request` or :meth:`~BaseServer.serve_forever` method of the server object to process one or many requests. Finally, call :meth:`~BaseServer.server_close` -to close the socket. +to close the socket (unless you used a :keyword:`with` statement). When inheriting from :class:`ThreadingMixIn` for threaded connection behavior, you should explicitly declare how you want your threads to behave on an abrupt @@ -111,6 +112,8 @@ server classes. :class:`UDPServer`. Setting the various attributes also changes the behavior of the underlying server mechanism. + :class:`ForkingMixIn` and the Forking classes mentioned below are + only available on POSIX platforms that support :func:`~os.fork`. .. class:: ForkingTCPServer ForkingUDPServer @@ -304,7 +307,11 @@ Server Objects This function is called if the :meth:`~BaseRequestHandler.handle` method of a :attr:`RequestHandlerClass` instance raises an exception. The default action is to print the traceback to - standard output and continue handling further requests. + standard error and continue handling further requests. + + .. versionchanged:: 3.6 + Now only called for exceptions derived from the :exc:`Exception` + class. .. method:: handle_timeout() @@ -349,6 +356,11 @@ Server Objects default implementation always returns :const:`True`. + .. versionchanged:: 3.6 + Support for the :term:`context manager` protocol was added. Exiting the + context manager is equivalent to calling :meth:`server_close`. + + Request Handler Objects ----------------------- @@ -397,6 +409,15 @@ Request Handler Objects read or written, respectively, to get the request data or return data to the client. + The :attr:`rfile` attributes of both classes support the + :class:`io.BufferedIOBase` readable interface, and + :attr:`DatagramRequestHandler.wfile` supports the + :class:`io.BufferedIOBase` writable interface. + + .. versionchanged:: 3.6 + :attr:`StreamRequestHandler.wfile` also supports the + :class:`io.BufferedIOBase` writable interface. + Examples -------- @@ -429,11 +450,10 @@ This is the server side:: HOST, PORT = "localhost", 9999 # Create the server, binding to localhost on port 9999 - server = socketserver.TCPServer((HOST, PORT), MyTCPHandler) - - # Activate the server; this will keep running until you - # interrupt the program with Ctrl-C - server.serve_forever() + with socketserver.TCPServer((HOST, PORT), MyTCPHandler) as server: + # Activate the server; this will keep running until you + # interrupt the program with Ctrl-C + server.serve_forever() An alternative request handler class that makes use of streams (file-like objects that simplify communication by providing the standard file interface):: @@ -525,8 +545,8 @@ This is the server side:: if __name__ == "__main__": HOST, PORT = "localhost", 9999 - server = socketserver.UDPServer((HOST, PORT), MyUDPHandler) - server.serve_forever() + with socketserver.UDPServer((HOST, PORT), MyUDPHandler) as server: + server.serve_forever() This is the client side:: @@ -585,22 +605,22 @@ An example for the :class:`ThreadingMixIn` class:: HOST, PORT = "localhost", 0 server = ThreadedTCPServer((HOST, PORT), ThreadedTCPRequestHandler) - ip, port = server.server_address + with server: + ip, port = server.server_address - # Start a thread with the server -- that thread will then start one - # more thread for each request - server_thread = threading.Thread(target=server.serve_forever) - # Exit the server thread when the main thread terminates - server_thread.daemon = True - server_thread.start() - print("Server loop running in thread:", server_thread.name) + # Start a thread with the server -- that thread will then start one + # more thread for each request + server_thread = threading.Thread(target=server.serve_forever) + # Exit the server thread when the main thread terminates + server_thread.daemon = True + server_thread.start() + print("Server loop running in thread:", server_thread.name) - client(ip, port, "Hello World 1") - client(ip, port, "Hello World 2") - client(ip, port, "Hello World 3") + client(ip, port, "Hello World 1") + client(ip, port, "Hello World 2") + client(ip, port, "Hello World 3") - server.shutdown() - server.server_close() + server.shutdown() The output of the example should look something like this: @@ -616,3 +636,5 @@ The output of the example should look something like this: The :class:`ForkingMixIn` class is used in the same way, except that the server will spawn a new process for each request. +Available only on POSIX platforms that support :func:`~os.fork`. + diff --git a/Doc/library/spwd.rst b/Doc/library/spwd.rst index fd3c9ad..c6cad2a 100644 --- a/Doc/library/spwd.rst +++ b/Doc/library/spwd.rst @@ -55,6 +55,9 @@ The following functions are defined: Return the shadow password database entry for the given user name. + .. versionchanged:: 3.6 + Raises a :exc:`PermissionError` instead of :exc:`KeyError` if the user + doesn't have privileges. .. function:: getspall() diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 1419ce0..5635577 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -629,14 +629,16 @@ Cursor Objects .. attribute:: lastrowid This read-only attribute provides the rowid of the last modified row. It is - only set if you issued an ``INSERT`` statement using the :meth:`execute` - method. For operations other than ``INSERT`` or when :meth:`executemany` is - called, :attr:`lastrowid` is set to :const:`None`. + only set if you issued an ``INSERT`` or a ``REPLACE`` statement using the + :meth:`execute` method. For operations other than ``INSERT`` or + ``REPLACE`` or when :meth:`executemany` is called, :attr:`lastrowid` is + set to :const:`None`. - .. attribute:: arraysize + If the ``INSERT`` or ``REPLACE`` statement failed to insert the previous + successful rowid is returned. - Read/write attribute that controls the number of rows returned by :meth:`fetchmany`. - The default value is 1 which means a single row would be fetched per call. + .. versionchanged:: 3.6 + Added support for the ``REPLACE`` statement. .. attribute:: description @@ -923,9 +925,7 @@ Controlling Transactions By default, the :mod:`sqlite3` module opens transactions implicitly before a Data Modification Language (DML) statement (i.e. -``INSERT``/``UPDATE``/``DELETE``/``REPLACE``), and commits transactions -implicitly before a non-DML, non-query statement (i. e. -anything other than ``SELECT`` or the aforementioned). +``INSERT``/``UPDATE``/``DELETE``/``REPLACE``). So if you are within a transaction and issue a command like ``CREATE TABLE ...``, ``VACUUM``, ``PRAGMA``, the :mod:`sqlite3` module will commit implicitly @@ -945,6 +945,9 @@ Otherwise leave it at its default, which will result in a plain "BEGIN" statement, or set it to one of SQLite's supported isolation levels: "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". +.. versionchanged:: 3.6 + :mod:`sqlite3` used to implicitly commit an open transaction before DDL + statements. This is no longer the case. Using :mod:`sqlite3` efficiently diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index a2f0083..eee4849 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -49,6 +49,12 @@ For more sophisticated applications, the :class:`ssl.SSLContext` class helps manage settings and certificates, which can then be inherited by SSL sockets created through the :meth:`SSLContext.wrap_socket` method. +.. versionchanged:: 3.6 + + OpenSSL 0.9.8, 1.0.0 and 1.0.1 are deprecated and no longer supported. + In the future the ssl module will require at least OpenSSL 1.0.2 or + 1.1.0. + Functions, Constants, and Exceptions ------------------------------------ @@ -186,16 +192,20 @@ instead. .. table:: - ======================== ========= ========= ========== ========= =========== =========== - *client* / **server** **SSLv2** **SSLv3** **TLS** **TLSv1** **TLSv1.1** **TLSv1.2** - ------------------------ --------- --------- ---------- --------- ----------- ----------- - *SSLv2* yes no yes no no no - *SSLv3* no yes yes no no no - *TLS* (*SSLv23*) no yes yes yes yes yes - *TLSv1* no no yes yes no no - *TLSv1.1* no no yes no yes no - *TLSv1.2* no no yes no no yes - ======================== ========= ========= ========== ========= =========== =========== + ======================== ============ ============ ============= ========= =========== =========== + *client* / **server** **SSLv2** **SSLv3** **TLS** **TLSv1** **TLSv1.1** **TLSv1.2** + ------------------------ ------------ ------------ ------------- --------- ----------- ----------- + *SSLv2* yes no no [1]_ no no no + *SSLv3* no yes no [2]_ no no no + *TLS* (*SSLv23*) no [1]_ no [2]_ yes yes yes yes + *TLSv1* no no yes yes no no + *TLSv1.1* no no yes no yes no + *TLSv1.2* no no yes no no yes + ======================== ============ ============ ============= ========= =========== =========== + + .. rubric:: Footnotes + .. [1] :class:`SSLContext` disables SSLv2 with :data:`OP_NO_SSLv2` by default. + .. [2] :class:`SSLContext` disables SSLv3 with :data:`OP_NO_SSLv3` by default. .. note:: @@ -224,7 +234,6 @@ instead. .. versionchanged:: 3.2 New optional argument *ciphers*. - Context creation ^^^^^^^^^^^^^^^^ @@ -279,7 +288,7 @@ purposes. RC4 was dropped from the default cipher string. - .. versionchanged:: 3.5.3 + .. versionchanged:: 3.6 ChaCha20/Poly1305 was added to the default cipher string. @@ -322,7 +331,7 @@ Random generation .. versionadded:: 3.3 - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has deprecated :func:`ssl.RAND_pseudo_bytes`, use :func:`ssl.RAND_bytes` instead. @@ -509,6 +518,10 @@ Certificate handling Constants ^^^^^^^^^ + All constants are now :class:`enum.IntEnum` or :class:`enum.IntFlag` collections. + + .. versionadded:: 3.6 + .. data:: CERT_NONE Possible value for :attr:`SSLContext.verify_mode`, or the ``cert_reqs`` @@ -542,6 +555,12 @@ Constants be passed, either to :meth:`SSLContext.load_verify_locations` or as a value of the ``ca_certs`` parameter to :func:`wrap_socket`. +.. class:: VerifyMode + + :class:`enum.IntEnum` collection of CERT_* constants. + + .. versionadded:: 3.6 + .. data:: VERIFY_DEFAULT Possible value for :attr:`SSLContext.verify_flags`. In this mode, certificate @@ -582,18 +601,40 @@ Constants .. versionadded:: 3.4.4 +.. class:: VerifyFlags + + :class:`enum.IntFlag` collection of VERIFY_* constants. + + .. versionadded:: 3.6 + .. data:: PROTOCOL_TLS Selects the highest protocol version that both the client and server support. Despite the name, this option can select "TLS" protocols as well as "SSL". - .. versionadded:: 3.5.3 + .. versionadded:: 3.6 + +.. data:: PROTOCOL_TLS_CLIENT + + Auto-negotiate the the highest protocol version like :data:`PROTOCOL_SSLv23`, + but only support client-side :class:`SSLSocket` connections. The protocol + enables :data:`CERT_REQUIRED` and :attr:`~SSLContext.check_hostname` by + default. + + .. versionadded:: 3.6 + +.. data:: PROTOCOL_TLS_SERVER + + Auto-negotiate the the highest protocol version like :data:`PROTOCOL_SSLv23`, + but only support server-side :class:`SSLSocket` connections. + + .. versionadded:: 3.6 .. data:: PROTOCOL_SSLv23 Alias for data:`PROTOCOL_TLS`. - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 Use data:`PROTOCOL_TLS` instead. @@ -608,7 +649,7 @@ Constants SSL version 2 is insecure. Its use is highly discouraged. - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has removed support for SSLv2. @@ -623,7 +664,7 @@ Constants SSL version 3 is insecure. Its use is highly discouraged. - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has deprecated all version specific protocols. Use the default protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. @@ -632,7 +673,7 @@ Constants Selects TLS version 1.0 as the channel encryption protocol. - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has deprecated all version specific protocols. Use the default protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. @@ -644,7 +685,7 @@ Constants .. versionadded:: 3.4 - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has deprecated all version specific protocols. Use the default protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. @@ -657,7 +698,7 @@ Constants .. versionadded:: 3.4 - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 OpenSSL has deprecated all version specific protocols. Use the default protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. @@ -678,7 +719,7 @@ Constants .. versionadded:: 3.2 - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 SSLv2 is deprecated @@ -691,7 +732,7 @@ Constants .. versionadded:: 3.2 - .. deprecated:: 3.5.3 + .. deprecated:: 3.6 SSLv3 is deprecated @@ -751,6 +792,16 @@ Constants .. versionadded:: 3.3 +.. class:: Options + + :class:`enum.IntFlag` collection of OP_* constants. + +.. data:: OP_NO_TICKET + + Prevent client side from requesting a session ticket. + + .. versionadded:: 3.6 + .. data:: HAS_ALPN Whether the OpenSSL library has built-in support for the *Application-Layer @@ -833,6 +884,12 @@ Constants .. versionadded:: 3.4 +.. class:: AlertDescription + + :class:`enum.IntEnum` collection of ALERT_DESCRIPTION_* constants. + + .. versionadded:: 3.6 + .. data:: Purpose.SERVER_AUTH Option for :func:`create_default_context` and @@ -851,6 +908,12 @@ Constants .. versionadded:: 3.4 +.. class:: SSLErrorNumber + + :class:`enum.IntEnum` collection of SSL_ERROR_* constants. + + .. versionadded:: 3.6 + SSL Sockets ----------- @@ -885,7 +948,7 @@ SSL Sockets :ref:`notes on non-blocking sockets `. Usually, :class:`SSLSocket` are not created directly, but using the - :func:`wrap_socket` function or the :meth:`SSLContext.wrap_socket` method. + the :meth:`SSLContext.wrap_socket` method. .. versionchanged:: 3.5 The :meth:`sendfile` method was added. @@ -895,6 +958,10 @@ SSL Sockets are received or sent. The socket timeout is now to maximum total duration of the shutdown. + .. deprecated:: 3.6 + It is deprecated to create a :class:`SSLSocket` instance directly, use + :meth:`SSLContext.wrap_socket` to wrap a socket. + SSL sockets also have the following additional methods and attributes: @@ -915,6 +982,9 @@ SSL sockets also have the following additional methods and attributes: The socket timeout is now to maximum total duration to read up to *len* bytes. + .. deprecated:: 3.6 + Use :meth:`~SSLSocket.recv` instead of :meth:`~SSLSocket.read`. + .. method:: SSLSocket.write(buf) Write *buf* to the SSL socket and return the number of bytes written. The @@ -930,6 +1000,9 @@ SSL sockets also have the following additional methods and attributes: The socket timeout is no more reset each time bytes are received or sent. The socket timeout is now to maximum total duration to write *buf*. + .. deprecated:: 3.6 + Use :meth:`~SSLSocket.send` instead of :meth:`~SSLSocket.write`. + .. note:: The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the @@ -1127,6 +1200,19 @@ SSL sockets also have the following additional methods and attributes: .. versionadded:: 3.2 +.. attribute:: SSLSocket.session + + The :class:`SSLSession` for this SSL connection. The session is available + for client and server side sockets after the TLS handshake has been + performed. For client sockets the session can be set before + :meth:`~SSLSocket.do_handshake` has been called to reuse a session. + + .. versionadded:: 3.6 + +.. attribute:: SSLSocket.session_reused + + .. versionadded:: 3.6 + SSL Contexts ------------ @@ -1149,9 +1235,16 @@ to speed up repeated connections from the same clients. :func:`create_default_context` lets the :mod:`ssl` module choose security settings for a given purpose. - .. versionchanged:: 3.5.3 + .. versionchanged:: 3.6 - :data:`PROTOCOL_TLS` is the default value. + The context is created with secure default values. The options + :data:`OP_NO_COMPRESSION`, :data:`OP_CIPHER_SERVER_PREFERENCE`, + :data:`OP_SINGLE_DH_USE`, :data:`OP_SINGLE_ECDH_USE`, + :data:`OP_NO_SSLv2` (except for :data:`PROTOCOL_SSLv2`), + and :data:`OP_NO_SSLv3` (except for :data:`PROTOCOL_SSLv3`) are + set by default. The initial cipher suite list contains only ``HIGH`` + ciphers, no ``NULL`` ciphers and no ``MD5`` ciphers (except for + :data:`PROTOCOL_SSLv2`). :class:`SSLContext` objects have the following methods and attributes: @@ -1259,6 +1352,62 @@ to speed up repeated connections from the same clients. .. versionadded:: 3.4 +.. method:: SSLContext.get_ciphers() + + Get a list of enabled ciphers. The list is in order of cipher priority. + See :meth:`SSLContext.set_ciphers`. + + Example:: + + >>> ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + >>> ctx.set_ciphers('ECDHE+AESGCM:!ECDSA') + >>> ctx.get_ciphers() # OpenSSL 1.0.x + [{'alg_bits': 256, + 'description': 'ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA ' + 'Enc=AESGCM(256) Mac=AEAD', + 'id': 50380848, + 'name': 'ECDHE-RSA-AES256-GCM-SHA384', + 'protocol': 'TLSv1/SSLv3', + 'strength_bits': 256}, + {'alg_bits': 128, + 'description': 'ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA ' + 'Enc=AESGCM(128) Mac=AEAD', + 'id': 50380847, + 'name': 'ECDHE-RSA-AES128-GCM-SHA256', + 'protocol': 'TLSv1/SSLv3', + 'strength_bits': 128}] + + On OpenSSL 1.1 and newer the cipher dict contains additional fields:: + >>> ctx.get_ciphers() # OpenSSL 1.1+ + [{'aead': True, + 'alg_bits': 256, + 'auth': 'auth-rsa', + 'description': 'ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA ' + 'Enc=AESGCM(256) Mac=AEAD', + 'digest': None, + 'id': 50380848, + 'kea': 'kx-ecdhe', + 'name': 'ECDHE-RSA-AES256-GCM-SHA384', + 'protocol': 'TLSv1.2', + 'strength_bits': 256, + 'symmetric': 'aes-256-gcm'}, + {'aead': True, + 'alg_bits': 128, + 'auth': 'auth-rsa', + 'description': 'ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA ' + 'Enc=AESGCM(128) Mac=AEAD', + 'digest': None, + 'id': 50380847, + 'kea': 'kx-ecdhe', + 'name': 'ECDHE-RSA-AES128-GCM-SHA256', + 'protocol': 'TLSv1.2', + 'strength_bits': 128, + 'symmetric': 'aes-128-gcm'}] + + Availability: OpenSSL 1.0.2+ + + .. versionadded:: 3.6 + .. method:: SSLContext.set_default_verify_paths() Load a set of default "certification authority" (CA) certificates from @@ -1397,7 +1546,7 @@ to speed up repeated connections from the same clients. .. method:: SSLContext.wrap_socket(sock, server_side=False, \ do_handshake_on_connect=True, suppress_ragged_eofs=True, \ - server_hostname=None) + server_hostname=None, session=None) Wrap an existing Python socket *sock* and return an :class:`SSLSocket` object. *sock* must be a :data:`~socket.SOCK_STREAM` socket; other socket @@ -1414,19 +1563,27 @@ to speed up repeated connections from the same clients. quite similarly to HTTP virtual hosts. Specifying *server_hostname* will raise a :exc:`ValueError` if *server_side* is true. + *session*, see :attr:`~SSLSocket.session`. + .. versionchanged:: 3.5 Always allow a server_hostname to be passed, even if OpenSSL does not have SNI. + .. versionchanged:: 3.6 + *session* argument was added. + .. method:: SSLContext.wrap_bio(incoming, outgoing, server_side=False, \ - server_hostname=None) + server_hostname=None, session=None) Create a new :class:`SSLObject` instance by wrapping the BIO objects *incoming* and *outgoing*. The SSL routines will read input data from the incoming BIO and write data to the outgoing BIO. - The *server_side* and *server_hostname* parameters have the same meaning as - in :meth:`SSLContext.wrap_socket`. + The *server_side*, *server_hostname* and *session* parameters have the + same meaning as in :meth:`SSLContext.wrap_socket`. + + .. versionchanged:: 3.6 + *session* argument was added. .. method:: SSLContext.session_stats() @@ -1478,6 +1635,12 @@ to speed up repeated connections from the same clients. to set options, not to clear them. Attempting to clear an option (by resetting the corresponding bits) will raise a ``ValueError``. + .. versionchanged:: 3.6 + :attr:`SSLContext.options` returns :class:`Options` flags: + + >>> ssl.create_default_context().options + + .. attribute:: SSLContext.protocol The protocol version chosen when constructing the context. This attribute @@ -1492,12 +1655,23 @@ to speed up repeated connections from the same clients. .. versionadded:: 3.4 + .. versionchanged:: 3.6 + :attr:`SSLContext.verify_flags` returns :class:`VerifyFlags` flags: + + >>> ssl.create_default_context().verify_flags + + .. attribute:: SSLContext.verify_mode Whether to try to verify other peers' certificates and how to behave if verification fails. This attribute must be one of :data:`CERT_NONE`, :data:`CERT_OPTIONAL` or :data:`CERT_REQUIRED`. + .. versionchanged:: 3.6 + :attr:`SSLContext.verify_mode` returns :class:`VerifyMode` enum: + + >>> ssl.create_default_context().verify_mode + .. index:: single: certificates @@ -1916,6 +2090,8 @@ provided. - :attr:`~SSLSocket.context` - :attr:`~SSLSocket.server_side` - :attr:`~SSLSocket.server_hostname` + - :attr:`~SSLSocket.session` + - :attr:`~SSLSocket.session_reused` - :meth:`~SSLSocket.read` - :meth:`~SSLSocket.write` - :meth:`~SSLSocket.getpeercert` @@ -1997,6 +2173,22 @@ purpose. It wraps an OpenSSL memory BIO (Basic IO) object: become true after all data currently in the buffer has been read. +SSL session +----------- + +.. versionadded:: 3.6 + +.. class:: SSLSession + + Session object used by :attr:`~SSLSocket.session`. + + .. attribute:: id + .. attribute:: time + .. attribute:: timeout + .. attribute:: ticket_lifetime_hint + .. attribute:: has_ticket + + .. _ssl-security: Security considerations @@ -2063,18 +2255,20 @@ Protocol versions SSL versions 2 and 3 are considered insecure and are therefore dangerous to use. If you want maximum compatibility between clients and servers, it is -recommended to use :const:`PROTOCOL_TLS` as the protocol version and then -disable SSLv2 and SSLv3 explicitly using the :data:`SSLContext.options` -attribute:: +recommended to use :const:`PROTOCOL_TLS_CLIENT` or +:const:`PROTOCOL_TLS_SERVER` as the protocol version. SSLv2 and SSLv3 are +disabled by default. + + >>> client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + >>> client_context.options |= ssl.OP_NO_TLSv1 + >>> client_context.options |= ssl.OP_NO_TLSv1_1 - context = ssl.SSLContext(ssl.PROTOCOL_TLS) - context.options |= ssl.OP_NO_SSLv2 - context.options |= ssl.OP_NO_SSLv3 - context.options |= ssl.OP_NO_TLSv1 - context.options |= ssl.OP_NO_TLSv1_1 The SSL context created above will only allow TLSv1.2 and later (if -supported by your system) connections. +supported by your system) connections to a server. :const:`PROTOCOL_TLS_CLIENT` +implies certificate validation and hostname checks by default. You have to +load certificates into the context. + Cipher selection '''''''''''''''' @@ -2085,8 +2279,9 @@ enabled when negotiating a SSL session is possible through the ssl module disables certain weak ciphers by default, but you may want to further restrict the cipher choice. Be sure to read OpenSSL's documentation about the `cipher list format `_. -If you want to check which ciphers are enabled by a given cipher list, use the -``openssl ciphers`` command on your system. +If you want to check which ciphers are enabled by a given cipher list, use +:meth:`SSLContext.get_ciphers` or the ``openssl ciphers`` command on your +system. Multi-processing ^^^^^^^^^^^^^^^^ diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst index 7685621..2aa778c 100644 --- a/Doc/library/statistics.rst +++ b/Doc/library/statistics.rst @@ -39,6 +39,7 @@ or sample. ======================= ============================================= :func:`mean` Arithmetic mean ("average") of data. +:func:`harmonic_mean` Harmonic mean of data. :func:`median` Median (middle value) of data. :func:`median_low` Low median of data. :func:`median_high` High median of data. @@ -68,8 +69,7 @@ However, for reading convenience, most of the examples show sorted sequences. .. function:: mean(data) - Return the sample arithmetic mean of *data*, a sequence or iterator of - real-valued numbers. + Return the sample arithmetic mean of *data* which can be a sequence or iterator. The arithmetic mean is the sum of the data divided by the number of data points. It is commonly called "the average", although it is only one of many @@ -111,10 +111,43 @@ However, for reading convenience, most of the examples show sorted sequences. ``mean(data)`` is equivalent to calculating the true population mean μ. +.. function:: harmonic_mean(data) + + Return the harmonic mean of *data*, a sequence or iterator of + real-valued numbers. + + The harmonic mean, sometimes called the subcontrary mean, is the + reciprocal of the arithmetic :func:`mean` of the reciprocals of the + data. For example, the harmonic mean of three values *a*, *b* and *c* + will be equivalent to ``3/(1/a + 1/b + 1/c)``. + + The harmonic mean is a type of average, a measure of the central + location of the data. It is often appropriate when averaging quantities + which are rates or ratios, for example speeds. For example: + + Suppose an investor purchases an equal value of shares in each of + three companies, with P/E (price/earning) ratios of 2.5, 3 and 10. + What is the average P/E ratio for the investor's portfolio? + + .. doctest:: + + >>> harmonic_mean([2.5, 3, 10]) # For an equal investment portfolio. + 3.6 + + Using the arithmetic mean would give an average of about 5.167, which + is too high. + + :exc:`StatisticsError` is raised if *data* is empty, or any element + is less than zero. + + .. versionadded:: 3.6 + + .. function:: median(data) Return the median (middle value) of numeric data, using the common "mean of middle two" method. If *data* is empty, :exc:`StatisticsError` is raised. + *data* can be a sequence or iterator. The median is a robust measure of central location, and is less affected by the presence of outliers in your data. When the number of data points is @@ -142,7 +175,7 @@ However, for reading convenience, most of the examples show sorted sequences. .. function:: median_low(data) Return the low median of numeric data. If *data* is empty, - :exc:`StatisticsError` is raised. + :exc:`StatisticsError` is raised. *data* can be a sequence or iterator. The low median is always a member of the data set. When the number of data points is odd, the middle value is returned. When it is even, the smaller of @@ -162,7 +195,7 @@ However, for reading convenience, most of the examples show sorted sequences. .. function:: median_high(data) Return the high median of data. If *data* is empty, :exc:`StatisticsError` - is raised. + is raised. *data* can be a sequence or iterator. The high median is always a member of the data set. When the number of data points is odd, the middle value is returned. When it is even, the larger of @@ -183,7 +216,7 @@ However, for reading convenience, most of the examples show sorted sequences. Return the median of grouped continuous data, calculated as the 50th percentile, using interpolation. If *data* is empty, :exc:`StatisticsError` - is raised. + is raised. *data* can be a sequence or iterator. .. doctest:: diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 3e279e6..122ed00 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -108,11 +108,11 @@ Notes: (1) This is a short-circuit operator, so it only evaluates the second - argument if the first one is false. + argument if the first one is :const:`False`. (2) This is a short-circuit operator, so it only evaluates the second - argument if the first one is true. + argument if the first one is :const:`True`. (3) ``not`` has a lower priority than non-Boolean operators, so ``not a == b`` is @@ -394,12 +394,10 @@ Bitwise Operations on Integer Types pair: bitwise; operations pair: shifting; operations pair: masking; operations - operator: | operator: ^ operator: & operator: << operator: >> - operator: ~ Bitwise operations only make sense for integers. Negative numbers are treated as their 2's complement value (this assumes that there are enough bits so that @@ -831,7 +829,7 @@ restrictions imposed by *s*. The ``in`` and ``not in`` operations have the same priorities as the comparison operations. The ``+`` (concatenation) and ``*`` (repetition) -operations have the same priority as the corresponding numeric operations. [3]_ +operations have the same priority as the corresponding numeric operations. .. index:: triple: operations on; sequence; types @@ -929,7 +927,7 @@ Notes: :ref:`faq-multidimensional-list`. (3) - If *i* or *j* is negative, the index is relative to the end of sequence *s*: + If *i* or *j* is negative, the index is relative to the end of the string: ``len(s) + i`` or ``len(s) + j`` is substituted. But note that ``-0`` is still ``0``. @@ -944,10 +942,8 @@ Notes: The slice of *s* from *i* to *j* with step *k* is defined as the sequence of items with index ``x = i + n*k`` such that ``0 <= n < (j-i)/k``. In other words, the indices are ``i``, ``i+k``, ``i+2*k``, ``i+3*k`` and so on, stopping when - *j* is reached (but never including *j*). When *k* is positive, - *i* and *j* are reduced to ``len(s)`` if they are greater. - When *k* is negative, *i* and *j* are reduced to ``len(s) - 1`` if - they are greater. If *i* or *j* are omitted or ``None``, they become + *j* is reached (but never including *j*). If *i* or *j* is greater than + ``len(s)``, use ``len(s)``. If *i* or *j* are omitted or ``None``, they become "end" values (which end depends on the sign of *k*). Note, *k* cannot be zero. If *k* is ``None``, it is treated like ``1``. @@ -1367,6 +1363,11 @@ objects that compare equal might have different :attr:`~range.start`, The :attr:`~range.start`, :attr:`~range.stop` and :attr:`~range.step` attributes. +.. seealso:: + + * The `linspace recipe `_ + shows how to implement a lazy version of range that suitable for floating + point applications. .. index:: single: string; text sequence type @@ -1457,8 +1458,8 @@ multiple fragments. For more information on the ``str`` class and its methods, see :ref:`textseq` and the :ref:`string-methods` section below. To output - formatted strings, see the :ref:`formatstrings` section. In addition, - see the :ref:`stringservices` section. + formatted strings, see the :ref:`f-strings` and :ref:`formatstrings` + sections. In addition, see the :ref:`stringservices` section. .. index:: @@ -1643,20 +1644,18 @@ expression support in the :mod:`re` module). Return true if all characters in the string are decimal characters and there is at least one character, false - otherwise. Decimal characters are those that can be used to form - numbers in base 10, e.g. U+0660, ARABIC-INDIC DIGIT - ZERO. Formally a decimal character is a character in the Unicode - General Category "Nd". + otherwise. Decimal characters are those from general category "Nd". This category + includes digit characters, and all characters + that can be used to form decimal-radix numbers, e.g. U+0660, + ARABIC-INDIC DIGIT ZERO. .. method:: str.isdigit() Return true if all characters in the string are digits and there is at least one character, false otherwise. Digits include decimal characters and digits that need - special handling, such as the compatibility superscript digits. - This covers digits which cannot be used to form numbers in base 10, - like the Kharosthi numbers. Formally, a digit is a character that has the - property value Numeric_Type=Digit or Numeric_Type=Decimal. + special handling, such as the compatibility superscript digits. Formally, a digit + is a character that has the property value Numeric_Type=Digit or Numeric_Type=Decimal. .. method:: str.isidentifier() @@ -1716,10 +1715,10 @@ expression support in the :mod:`re` module). .. method:: str.join(iterable) - Return a string which is the concatenation of the strings in *iterable*. - A :exc:`TypeError` will be raised if there are any non-string values in - *iterable*, including :class:`bytes` objects. The separator between - elements is the string providing this method. + Return a string which is the concatenation of the strings in the + :term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are + any non-string values in *iterable*, including :class:`bytes` objects. The + separator between elements is the string providing this method. .. method:: str.ljust(width[, fillchar]) @@ -2062,8 +2061,8 @@ expression support in the :mod:`re` module). .. index:: single: formatting, string (%) single: interpolation, string (%) - single: string; formatting - single: string; interpolation + single: string; formatting, printf + single: string; interpolation, printf single: printf-style formatting single: sprintf-style formatting single: % formatting @@ -2073,9 +2072,10 @@ expression support in the :mod:`re` module). The formatting operations described here exhibit a variety of quirks that lead to a number of common errors (such as failing to display tuples and - dictionaries correctly). Using the newer :meth:`str.format` interface - helps avoid these errors, and also provides a generally more powerful, - flexible and extensible approach to formatting text. + dictionaries correctly). Using the newer :ref:`formatted + string literals ` or the :meth:`str.format` interface + helps avoid these errors. These alternatives also provide more powerful, + flexible and extensible approaches to formatting text. String objects have one unique built-in operation: the ``%`` operator (modulo). This is also known as the string *formatting* or *interpolation* operator. @@ -2158,7 +2158,7 @@ The conversion types are: +------------+-----------------------------------------------------+-------+ | ``'o'`` | Signed octal value. | \(1) | +------------+-----------------------------------------------------+-------+ -| ``'u'`` | Obsolete type -- it is identical to ``'d'``. | \(6) | +| ``'u'`` | Obsolete type -- it is identical to ``'d'``. | \(7) | +------------+-----------------------------------------------------+-------+ | ``'x'`` | Signed hexadecimal (lowercase). | \(2) | +------------+-----------------------------------------------------+-------+ @@ -2199,12 +2199,15 @@ The conversion types are: Notes: (1) - The alternate form causes a leading octal specifier (``'0o'``) to be - inserted before the first digit. + The alternate form causes a leading zero (``'0'``) to be inserted between + left-hand padding and the formatting of the number if the leading character + of the result is not already a zero. (2) The alternate form causes a leading ``'0x'`` or ``'0X'`` (depending on whether - the ``'x'`` or ``'X'`` format was used) to be inserted before the first digit. + the ``'x'`` or ``'X'`` format was used) to be inserted between left-hand padding + and the formatting of the number if the leading character of the result is not + already a zero. (3) The alternate form causes the result to always contain a decimal point, even if @@ -2223,7 +2226,8 @@ Notes: (5) If precision is ``N``, the output is truncated to ``N`` characters. -(6) + +(7) See :pep:`237`. Since Python strings have an explicit length, ``%s`` conversions do not assume @@ -2535,11 +2539,11 @@ arbitrary binary data. bytearray.join(iterable) Return a bytes or bytearray object which is the concatenation of the - binary data sequences in *iterable*. A :exc:`TypeError` will be raised - if there are any values in *iterable* that are not :term:`bytes-like - objects `, including :class:`str` objects. The - separator between elements is the contents of the bytes or - bytearray object providing this method. + binary data sequences in the :term:`iterable` *iterable*. A + :exc:`TypeError` will be raised if there are any values in *iterable* + that are not :term:`bytes-like objects `, including + :class:`str` objects. The separator between elements is the contents + of the bytes or bytearray object providing this method. .. staticmethod:: bytes.maketrans(from, to) @@ -2632,8 +2636,8 @@ arbitrary binary data. The prefix(es) to search for may be any :term:`bytes-like object`. -.. method:: bytes.translate(table[, delete]) - bytearray.translate(table[, delete]) +.. method:: bytes.translate(table, delete=b'') + bytearray.translate(table, delete=b'') Return a copy of the bytes or bytearray object where all bytes occurring in the optional argument *delete* are removed, and the remaining bytes have @@ -2649,6 +2653,9 @@ arbitrary binary data. >>> b'read this short text'.translate(None, b'aeiou') b'rd ths shrt txt' + .. versionchanged:: 3.6 + *delete* is now supported as a keyword argument. + The following methods on bytes and bytearray objects have default behaviours that assume the use of ASCII compatible binary formats, but can still be used @@ -3296,12 +3303,15 @@ The conversion types are: Notes: (1) - The alternate form causes a leading octal specifier (``'0o'``) to be - inserted before the first digit. + The alternate form causes a leading zero (``'0'``) to be inserted between + left-hand padding and the formatting of the number if the leading character + of the result is not already a zero. (2) The alternate form causes a leading ``'0x'`` or ``'0X'`` (depending on whether - the ``'x'`` or ``'X'`` format was used) to be inserted before the first digit. + the ``'x'`` or ``'X'`` format was used) to be inserted between left-hand padding + and the formatting of the number if the leading character of the result is not + already a zero. (3) The alternate form causes the result to always contain a decimal point, even if @@ -3975,7 +3985,9 @@ The constructors for both classes work the same: Note, the *elem* argument to the :meth:`__contains__`, :meth:`remove`, and :meth:`discard` methods may be a set. To support searching for an equivalent - frozenset, a temporary one is created from *elem*. + frozenset, the *elem* set is temporarily mutated during the search and then + restored. During the search, the *elem* set should not be read or mutated + since it does not have a meaningful value. .. _typesmapping: diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 05418a9..a0977b6 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -188,7 +188,9 @@ Format String Syntax The :meth:`str.format` method and the :class:`Formatter` class share the same syntax for format strings (although in the case of :class:`Formatter`, -subclasses can define their own format string syntax). +subclasses can define their own format string syntax). The syntax is +related to that of :ref:`formatted string literals `, but +there are differences. Format strings contain "replacement fields" surrounded by curly braces ``{}``. Anything that is not contained in braces is considered literal text, which is @@ -283,7 +285,8 @@ Format Specification Mini-Language "Format specifications" are used within replacement fields contained within a format string to define how individual values are presented (see -:ref:`formatstrings`). They can also be passed directly to the built-in +:ref:`formatstrings` and :ref:`f-strings`). +They can also be passed directly to the built-in :func:`format` function. Each formattable type may define how the format specification is to be interpreted. @@ -297,18 +300,20 @@ non-empty format string typically modifies the result. The general form of a *standard format specifier* is: .. productionlist:: sf - format_spec: [[`fill`]`align`][`sign`][#][0][`width`][,][.`precision`][`type`] + format_spec: [[`fill`]`align`][`sign`][#][0][`width`][`grouping_option`][.`precision`][`type`] fill: align: "<" | ">" | "=" | "^" sign: "+" | "-" | " " width: `integer` + grouping_option: "_" | "," precision: `integer` type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%" If a valid *align* value is specified, it can be preceded by a *fill* character that can be any character and defaults to a space if omitted. It is not possible to use a literal curly brace ("``{``" or "``}``") as -the *fill* character when using the :meth:`str.format` +the *fill* character in a :ref:`formatted string literal +` or when using the :meth:`str.format` method. However, it is possible to insert a curly brace with a nested replacement field. This limitation doesn't affect the :func:`format` function. @@ -374,6 +379,16 @@ instead. .. versionchanged:: 3.1 Added the ``','`` option (see also :pep:`378`). +The ``'_'`` option signals the use of an underscore for a thousands +separator for floating point presentation types and for integer +presentation type ``'d'``. For integer presentation types ``'b'``, +``'o'``, ``'x'``, and ``'X'``, underscores will be inserted every 4 +digits. For other presentation types, specifying this option is an +error. + +.. versionchanged:: 3.6 + Added the ``'_'`` option (see also :pep:`515`). + *width* is a decimal integer defining the minimum field width. If not specified, then the field width will be determined by the content. diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst index ae2e38f..cc3017b 100644 --- a/Doc/library/struct.rst +++ b/Doc/library/struct.rst @@ -216,6 +216,8 @@ platform-dependent. +--------+--------------------------+--------------------+----------------+------------+ | ``N`` | :c:type:`size_t` | integer | | \(4) | +--------+--------------------------+--------------------+----------------+------------+ +| ``e`` | \(7) | float | 2 | \(5) | ++--------+--------------------------+--------------------+----------------+------------+ | ``f`` | :c:type:`float` | float | 4 | \(5) | +--------+--------------------------+--------------------+----------------+------------+ | ``d`` | :c:type:`double` | float | 8 | \(5) | @@ -230,6 +232,10 @@ platform-dependent. .. versionchanged:: 3.3 Added support for the ``'n'`` and ``'N'`` formats. +.. versionchanged:: 3.6 + Added support for the ``'e'`` format. + + Notes: (1) @@ -257,9 +263,10 @@ Notes: fits your application. (5) - For the ``'f'`` and ``'d'`` conversion codes, the packed representation uses - the IEEE 754 binary32 (for ``'f'``) or binary64 (for ``'d'``) format, - regardless of the floating-point format used by the platform. + For the ``'f'``, ``'d'`` and ``'e'`` conversion codes, the packed + representation uses the IEEE 754 binary32, binary64 or binary16 format (for + ``'f'``, ``'d'`` or ``'e'`` respectively), regardless of the floating-point + format used by the platform. (6) The ``'P'`` format character is only available for the native byte ordering @@ -268,6 +275,16 @@ Notes: on the host system. The struct module does not interpret this as native ordering, so the ``'P'`` format is not available. +(7) + The IEEE 754 binary16 "half precision" type was introduced in the 2008 + revision of the `IEEE 754 standard `_. It has a sign + bit, a 5-bit exponent and 11-bit precision (with 10 bits explicitly stored), + and can represent numbers between approximately ``6.1e-05`` and ``6.5e+04`` + at full precision. This type is not widely supported by C compilers: on a + typical machine, an unsigned short can be used for storage, but not for math + operations. See the Wikipedia page on the `half-precision floating-point + format `_ for more information. + A format character may be preceded by an integral repeat count. For example, the format string ``'4h'`` means exactly the same as ``'hhhh'``. @@ -430,3 +447,7 @@ The :mod:`struct` module also defines the following type: The calculated size of the struct (and hence of the bytes object produced by the :meth:`pack` method) corresponding to :attr:`format`. + +.. _half precision format: https://en.wikipedia.org/wiki/Half-precision_floating-point_format + +.. _ieee 754 standard: https://en.wikipedia.org/wiki/IEEE_floating_point#IEEE_754-2008 diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index c1b28f8..ad2abe8 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -38,7 +38,8 @@ compatibility with older versions, see the :ref:`call-function-trio` section. .. function:: run(args, *, stdin=None, input=None, stdout=None, stderr=None,\ - shell=False, timeout=None, check=False) + shell=False, timeout=None, check=False, \ + encoding=None, errors=None) Run the command described by *args*. Wait for command to complete, then return a :class:`CompletedProcess` instance. @@ -60,15 +61,20 @@ compatibility with older versions, see the :ref:`call-function-trio` section. The *input* argument is passed to :meth:`Popen.communicate` and thus to the subprocess's stdin. If used it must be a byte sequence, or a string if - ``universal_newlines=True``. When used, the internal :class:`Popen` object - is automatically created with ``stdin=PIPE``, and the *stdin* argument may - not be used as well. + *encoding* or *errors* is specified or *universal_newlines* is true. When + used, the internal :class:`Popen` object is automatically created with + ``stdin=PIPE``, and the *stdin* argument may not be used as well. If *check* is true, and the process exits with a non-zero exit code, a :exc:`CalledProcessError` exception will be raised. Attributes of that exception hold the arguments, the exit code, and stdout and stderr if they were captured. + If *encoding* or *errors* are specified, or *universal_newlines* is true, + file objects for stdin, stdout and stderr are opened in text mode using the + specified *encoding* and *errors* or the :class:`io.TextIOWrapper` default. + Otherwise, file objects are opened in binary mode. + Examples:: >>> subprocess.run(["ls", "-l"]) # doesn't capture output @@ -85,6 +91,10 @@ compatibility with older versions, see the :ref:`call-function-trio` section. .. versionadded:: 3.5 + .. versionchanged:: 3.6 + + Added *encoding* and *errors* parameters + .. class:: CompletedProcess The return value from :func:`run`, representing a process that has finished. @@ -104,8 +114,8 @@ compatibility with older versions, see the :ref:`call-function-trio` section. .. attribute:: stdout Captured stdout from the child process. A bytes sequence, or a string if - :func:`run` was called with ``universal_newlines=True``. ``None`` if stdout - was not captured. + :func:`run` was called with an encoding or errors. ``None`` if stdout was not + captured. If you ran the process with ``stderr=subprocess.STDOUT``, stdout and stderr will be combined in this attribute, and :attr:`stderr` will be @@ -114,8 +124,8 @@ compatibility with older versions, see the :ref:`call-function-trio` section. .. attribute:: stderr Captured stderr from the child process. A bytes sequence, or a string if - :func:`run` was called with ``universal_newlines=True``. ``None`` if stderr - was not captured. + :func:`run` was called with an encoding or errors. ``None`` if stderr was not + captured. .. method:: check_returncode() @@ -249,19 +259,22 @@ default values. The arguments that are most commonly needed are: .. index:: single: universal newlines; subprocess module - If *universal_newlines* is ``False`` the file objects *stdin*, *stdout* and - *stderr* will be opened as binary streams, and no line ending conversion is - done. + If *encoding* or *errors* are specified, or *universal_newlines* is true, + the file objects *stdin*, *stdout* and *stderr* will be opened in text + mode using the *encoding* and *errors* specified in the call or the + defaults for :class:`io.TextIOWrapper`. + + For *stdin*, line ending characters ``'\n'`` in the input will be converted + to the default line separator :data:`os.linesep`. For *stdout* and *stderr*, + all line endings in the output will be converted to ``'\n'``. For more + information see the documentation of the :class:`io.TextIOWrapper` class + when the *newline* argument to its constructor is ``None``. - If *universal_newlines* is ``True``, these file objects - will be opened as text streams in :term:`universal newlines` mode - using the encoding returned by :func:`locale.getpreferredencoding(False) - `. For *stdin*, line ending characters - ``'\n'`` in the input will be converted to the default line separator - :data:`os.linesep`. For *stdout* and *stderr*, all line endings in the - output will be converted to ``'\n'``. For more information see the - documentation of the :class:`io.TextIOWrapper` class when the *newline* - argument to its constructor is ``None``. + If text mode is not used, *stdin*, *stdout* and *stderr* will be opened as + binary streams. No encoding or line ending conversion is performed. + + .. versionadded:: 3.6 + Added *encoding* and *errors* parameters. .. note:: @@ -306,7 +319,8 @@ functions. stderr=None, preexec_fn=None, close_fds=True, shell=False, \ cwd=None, env=None, universal_newlines=False, \ startupinfo=None, creationflags=0, restore_signals=True, \ - start_new_session=False, pass_fds=()) + start_new_session=False, pass_fds=(), *, \ + encoding=None, errors=None) Execute a child program in a new process. On POSIX, the class uses :meth:`os.execvp`-like behavior to execute the child program. On Windows, @@ -482,10 +496,14 @@ functions. .. _side-by-side assembly: https://en.wikipedia.org/wiki/Side-by-Side_Assembly - If *universal_newlines* is ``True``, the file objects *stdin*, *stdout* - and *stderr* are opened as text streams in universal newlines mode, as - described above in :ref:`frequently-used-arguments`, otherwise they are - opened as binary streams. + If *encoding* or *errors* are specified, the file objects *stdin*, *stdout* + and *stderr* are opened in text mode with the specified encoding and + *errors*, as described above in :ref:`frequently-used-arguments`. If + *universal_newlines* is ``True``, they are opened in text mode with default + encoding. Otherwise, they are opened as binary streams. + + .. versionadded:: 3.6 + *encoding* and *errors* were added. If given, *startupinfo* will be a :class:`STARTUPINFO` object, which is passed to the underlying ``CreateProcess`` function. @@ -502,6 +520,10 @@ functions. .. versionchanged:: 3.2 Added context manager support. + .. versionchanged:: 3.6 + Popen destructor now emits a :exc:`ResourceWarning` warning if the child + process is still running. + Exceptions ^^^^^^^^^^ @@ -597,11 +619,12 @@ Instances of the :class:`Popen` class have the following methods: Interact with process: Send data to stdin. Read data from stdout and stderr, until end-of-file is reached. Wait for process to terminate. The optional *input* argument should be data to be sent to the child process, or - ``None``, if no data should be sent to the child. The type of *input* - must be bytes or, if *universal_newlines* was ``True``, a string. + ``None``, if no data should be sent to the child. If streams were opened in + text mode, *input* must be a string. Otherwise, it must be bytes. :meth:`communicate` returns a tuple ``(stdout_data, stderr_data)``. - The data will be bytes or, if *universal_newlines* was ``True``, strings. + The data will be strings if streams were opened in text mode; otherwise, + bytes. Note that if you want to send data to the process's stdin, you need to create the Popen object with ``stdin=PIPE``. Similarly, to get anything other than @@ -668,28 +691,30 @@ The following attributes are also available: .. attribute:: Popen.stdin If the *stdin* argument was :data:`PIPE`, this attribute is a writeable - stream object as returned by :func:`open`. If the *universal_newlines* - argument was ``True``, the stream is a text stream, otherwise it is a byte - stream. If the *stdin* argument was not :data:`PIPE`, this attribute is - ``None``. + stream object as returned by :func:`open`. If the *encoding* or *errors* + arguments were specified or the *universal_newlines* argument was ``True``, + the stream is a text stream, otherwise it is a byte stream. If the *stdin* + argument was not :data:`PIPE`, this attribute is ``None``. .. attribute:: Popen.stdout If the *stdout* argument was :data:`PIPE`, this attribute is a readable stream object as returned by :func:`open`. Reading from the stream provides - output from the child process. If the *universal_newlines* argument was - ``True``, the stream is a text stream, otherwise it is a byte stream. If the - *stdout* argument was not :data:`PIPE`, this attribute is ``None``. + output from the child process. If the *encoding* or *errors* arguments were + specified or the *universal_newlines* argument was ``True``, the stream is a + text stream, otherwise it is a byte stream. If the *stdout* argument was not + :data:`PIPE`, this attribute is ``None``. .. attribute:: Popen.stderr If the *stderr* argument was :data:`PIPE`, this attribute is a readable stream object as returned by :func:`open`. Reading from the stream provides - error output from the child process. If the *universal_newlines* argument was - ``True``, the stream is a text stream, otherwise it is a byte stream. If the - *stderr* argument was not :data:`PIPE`, this attribute is ``None``. + error output from the child process. If the *encoding* or *errors* arguments + were specified or the *universal_newlines* argument was ``True``, the stream + is a text stream, otherwise it is a byte stream. If the *stderr* argument was + not :data:`PIPE`, this attribute is ``None``. .. warning:: @@ -882,7 +907,9 @@ calls these functions. *timeout* was added. -.. function:: check_output(args, *, stdin=None, stderr=None, shell=False, universal_newlines=False, timeout=None) +.. function:: check_output(args, *, stdin=None, stderr=None, shell=False, \ + encoding=None, errors=None, \ + universal_newlines=False, timeout=None) Run command with arguments and return its output. @@ -1138,7 +1165,7 @@ handling consistency are valid for these functions. Return ``(status, output)`` of executing *cmd* in a shell. Execute the string *cmd* in a shell with :meth:`Popen.check_output` and - return a 2-tuple ``(status, output)``. Universal newlines mode is used; + return a 2-tuple ``(status, output)``. The locale encoding is used; see the notes on :ref:`frequently-used-arguments` for more details. A trailing newline is stripped from the output. diff --git a/Doc/library/sunau.rst b/Doc/library/sunau.rst index c8357e4..1ecc7a7 100644 --- a/Doc/library/sunau.rst +++ b/Doc/library/sunau.rst @@ -118,7 +118,7 @@ AU_read objects, as returned by :func:`.open` above, have the following methods: .. method:: AU_read.getnchannels() - Returns number of audio channels (1 for mono, 2 for stereo). + Returns number of audio channels (1 for mone, 2 for stereo). .. method:: AU_read.getsampwidth() diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index c2a1109..dd51ffd 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -269,6 +269,11 @@ always available. the process when called from the main thread, and the exception is not intercepted. + .. versionchanged:: 3.6 + If an error occurs in the cleanup after the Python interpreter + has caught :exc:`SystemExit` (such as an error flushing buffered data + in the standard streams), the exit status is changed to 120. + .. data:: flags @@ -423,25 +428,42 @@ always available. .. function:: getfilesystemencoding() - Return the name of the encoding used to convert Unicode filenames into - system file names. The result value depends on the operating system: + Return the name of the encoding used to convert between Unicode + filenames and bytes filenames. For best compatibility, str should be + used for filenames in all cases, although representing filenames as bytes + is also supported. Functions accepting or returning filenames should support + either str or bytes and internally convert to the system's preferred + representation. - * On Mac OS X, the encoding is ``'utf-8'``. + This encoding is always ASCII-compatible. - * On Unix, the encoding is the user's preference according to the result of - nl_langinfo(CODESET). + :func:`os.fsencode` and :func:`os.fsdecode` should be used to ensure that + the correct encoding and errors mode are used. + + * On Mac OS X, the encoding is ``'utf-8'``. - * On Windows NT+, file names are Unicode natively, so no conversion is - performed. :func:`getfilesystemencoding` still returns ``'mbcs'``, as - this is the encoding that applications should use when they explicitly - want to convert Unicode strings to byte strings that are equivalent when - used as file names. + * On Unix, the encoding is the locale encoding. - * On Windows 9x, the encoding is ``'mbcs'``. + * On Windows, the encoding may be ``'utf-8'`` or ``'mbcs'``, depending + on user configuration. .. versionchanged:: 3.2 :func:`getfilesystemencoding` result cannot be ``None`` anymore. + .. versionchanged:: 3.6 + Windows is no longer guaranteed to return ``'mbcs'``. See :pep:`529` + and :func:`_enablelegacywindowsfsencoding` for more information. + +.. function:: getfilesystemencodeerrors() + + Return the name of the error mode used to convert between Unicode filenames + and bytes filenames. The encoding name is returned from + :func:`getfilesystemencoding`. + + :func:`os.fsencode` and :func:`os.fsdecode` should be used to ensure that + the correct encoding and errors mode are used. + + .. versionadded:: 3.6 .. function:: getrefcount(object) @@ -530,26 +552,15 @@ always available. Return a named tuple describing the Windows version currently running. The named elements are *major*, *minor*, *build*, *platform*, *service_pack*, *service_pack_minor*, - *service_pack_major*, *suite_mask*, and *product_type*. - *service_pack* contains a string while all other values are + *service_pack_major*, *suite_mask*, *product_type* and + *platform_version*. *service_pack* contains a string, + *platform_version* a 3-tuple and all other values are integers. The components can also be accessed by name, so ``sys.getwindowsversion()[0]`` is equivalent to ``sys.getwindowsversion().major``. For compatibility with prior versions, only the first 5 elements are retrievable by indexing. - *platform* may be one of the following values: - - +-----------------------------------------+-------------------------+ - | Constant | Platform | - +=========================================+=========================+ - | :const:`0 (VER_PLATFORM_WIN32s)` | Win32s on Windows 3.1 | - +-----------------------------------------+-------------------------+ - | :const:`1 (VER_PLATFORM_WIN32_WINDOWS)` | Windows 95/98/ME | - +-----------------------------------------+-------------------------+ - | :const:`2 (VER_PLATFORM_WIN32_NT)` | Windows NT/2000/XP/x64 | - +-----------------------------------------+-------------------------+ - | :const:`3 (VER_PLATFORM_WIN32_CE)` | Windows CE | - +-----------------------------------------+-------------------------+ + *platform* will be :const:`2 (VER_PLATFORM_WIN32_NT)`. *product_type* may be one of the following values: @@ -565,17 +576,41 @@ always available. | | a domain controller. | +---------------------------------------+---------------------------------+ - This function wraps the Win32 :c:func:`GetVersionEx` function; see the Microsoft documentation on :c:func:`OSVERSIONINFOEX` for more information about these fields. + *platform_version* returns the accurate major version, minor version and + build number of the current operating system, rather than the version that + is being emulated for the process. It is intended for use in logging rather + than for feature detection. + Availability: Windows. .. versionchanged:: 3.2 Changed to a named tuple and added *service_pack_minor*, *service_pack_major*, *suite_mask*, and *product_type*. + .. versionchanged:: 3.6 + Added *platform_version* + + +.. function:: get_asyncgen_hooks() + + Returns an *asyncgen_hooks* object, which is similar to a + :class:`~collections.namedtuple` of the form `(firstiter, finalizer)`, + where *firstiter* and *finalizer* are expected to be either ``None`` or + functions which take an :term:`asynchronous generator iterator` as an + argument, and are used to schedule finalization of an asychronous + generator by an event loop. + + .. versionadded:: 3.6 + See :pep:`525` for more details. + + .. note:: + This function has been added on a provisional basis (see :pep:`411` + for details.) + .. function:: get_coroutine_wrapper() @@ -1081,17 +1116,23 @@ always available. implementation platform, rather than part of the language definition, and thus may not be available in all Python implementations. +.. function:: set_asyncgen_hooks(firstiter, finalizer) -.. function:: settscdump(on_flag) + Accepts two optional keyword arguments which are callables that accept an + :term:`asynchronous generator iterator` as an argument. The *firstiter* + callable will be called when an asynchronous generator is iterated for the + first time. The *finalizer* will be called when an asynchronous generator + is about to be garbage collected. - Activate dumping of VM measurements using the Pentium timestamp counter, if - *on_flag* is true. Deactivate these dumps if *on_flag* is off. The function is - available only if Python was compiled with ``--with-tsc``. To understand - the output of this dump, read :file:`Python/ceval.c` in the Python sources. + .. versionadded:: 3.6 + See :pep:`525` for more details, and for a reference example of a + *finalizer* method see the implementation of + ``asyncio.Loop.shutdown_asyncgens`` in + :source:`Lib/asyncio/base_events.py` - .. impl-detail:: - This function is intimately bound to CPython implementation details and - thus not likely to be implemented elsewhere. + .. note:: + This function has been added on a provisional basis (see :pep:`411` + for details.) .. function:: set_coroutine_wrapper(wrapper) @@ -1133,6 +1174,18 @@ always available. This function has been added on a provisional basis (see :pep:`411` for details.) Use it only for debugging purposes. +.. function:: _enablelegacywindowsfsencoding() + + Changes the default filesystem encoding and errors mode to 'mbcs' and + 'replace' respectively, for consistency with versions of Python prior to 3.6. + + This is equivalent to defining the :envvar:`PYTHONLEGACYWINDOWSFSENCODING` + environment variable before launching Python. + + Availability: Windows + + .. versionadded:: 3.6 + See :pep:`529` for more details. .. data:: stdin stdout @@ -1220,7 +1273,7 @@ always available. | | * ``None`` if this information is unknown | +------------------+---------------------------------------------------------+ | :const:`version` | Name and version of the thread library. It is a string, | - | | or ``None`` if this information is unknown. | + | | or ``None`` if these informations are unknown. | +------------------+---------------------------------------------------------+ .. versionadded:: 3.3 diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst index 4cbe239..08b74a9 100644 --- a/Doc/library/sysconfig.rst +++ b/Doc/library/sysconfig.rst @@ -164,7 +164,7 @@ Other functions .. function:: get_python_version() Return the ``MAJOR.MINOR`` Python version number as a string. Similar to - ``sys.version[:3]``. + ``'%d.%d' % sys.version_info[:2]``. .. function:: get_platform() @@ -255,6 +255,7 @@ You can use :mod:`sysconfig` as a script with Python's *-m* option: AIX_GENUINE_CPLUSPLUS = "0" AR = "ar" ARFLAGS = "rc" + ASDLGEN = "./Parser/asdl_c.py" ... This call will print in the standard output the information returned by diff --git a/Doc/library/tabnanny.rst b/Doc/library/tabnanny.rst index dfe688a..1edb0fb 100644 --- a/Doc/library/tabnanny.rst +++ b/Doc/library/tabnanny.rst @@ -48,14 +48,14 @@ described below. .. exception:: NannyNag - Raised by :func:`process_tokens` if detecting an ambiguous indent. Captured and + Raised by :func:`tokeneater` if detecting an ambiguous indent. Captured and handled in :func:`check`. -.. function:: process_tokens(tokens) +.. function:: tokeneater(type, token, start, end, line) - This function is used by :func:`check` to process tokens generated by the - :mod:`tokenize` module. + This function is used by :func:`check` as a callback parameter to the function + :func:`tokenize.tokenize`. .. XXX document errprint, format_witnesses, Whitespace, check_equal, indents, reset_globals diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst index b950e41..f9c5153 100644 --- a/Doc/library/telnetlib.rst +++ b/Doc/library/telnetlib.rst @@ -43,6 +43,17 @@ Character), EL (Erase Line), GA (Go Ahead), SB (Subnegotiation Begin). :exc:`EOFError` when the end of the connection is read, because they can return an empty string for other reasons. See the individual descriptions below. + A :class:`Telnet` object is a context manager and can be used in a + :keyword:`with` statement. When the :keyword:`with` block ends, the + :meth:`close` method is called:: + + >>> from telnetlib import Telnet + >>> with Telnet('localhost', 23) as tn: + ... tn.interact() + ... + + .. versionchanged:: 3.6 Context manager support added + .. seealso:: diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst index c59aca1..665261f 100644 --- a/Doc/library/tempfile.rst +++ b/Doc/library/tempfile.rst @@ -245,12 +245,12 @@ The module uses a global variable to store the name of the directory used for temporary files returned by :func:`gettempdir`. It can be set directly to override the selection process, but this is discouraged. All functions in this module take a *dir* argument which can be used -to specify the directory and this is the recommended approach. +to specify the directory and this is the recommend approach. .. data:: tempdir When set to a value other than ``None``, this variable defines the - default value for the *dir* argument to the functions defined in this + default value for the *dir* argument to all the functions defined in this module. If ``tempdir`` is unset or ``None`` at any call to any of the above diff --git a/Doc/library/test.rst b/Doc/library/test.rst index 2777128..fab3e1f 100644 --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -570,8 +570,7 @@ The :mod:`test.support` module defines the following functions: def load_tests(*args): return load_package_tests(os.path.dirname(__file__), *args) - -.. function:: detect_api_mismatch(ref_api, other_api, *, ignore=()) +.. function:: detect_api_mismatch(ref_api, other_api, *, ignore=()): Returns the set of attributes, functions or methods of *ref_api* not found on *other_api*, except for a defined list of items to be @@ -583,6 +582,48 @@ The :mod:`test.support` module defines the following functions: .. versionadded:: 3.5 +.. function:: check__all__(test_case, module, name_of_module=None, extra=(), blacklist=()) + + Assert that the ``__all__`` variable of *module* contains all public names. + + The module's public names (its API) are detected automatically + based on whether they match the public name convention and were defined in + *module*. + + The *name_of_module* argument can specify (as a string or tuple thereof) what + module(s) an API could be defined in in order to be detected as a public + API. One case for this is when *module* imports part of its public API from + other modules, possibly a C backend (like ``csv`` and its ``_csv``). + + The *extra* argument can be a set of names that wouldn't otherwise be automatically + detected as "public", like objects without a proper ``__module__`` + attribute. If provided, it will be added to the automatically detected ones. + + The *blacklist* argument can be a set of names that must not be treated as part of + the public API even though their names indicate otherwise. + + Example use:: + + import bar + import foo + import unittest + from test import support + + class MiscTestCase(unittest.TestCase): + def test__all__(self): + support.check__all__(self, foo) + + class OtherTestCase(unittest.TestCase): + def test__all__(self): + extra = {'BAR_CONST', 'FOO_CONST'} + blacklist = {'baz'} # Undocumented name. + # bar imports part of its API from _bar. + support.check__all__(self, bar, ('bar', '_bar'), + extra=extra, blacklist=blacklist) + + .. versionadded:: 3.6 + + The :mod:`test.support` module defines the following classes: .. class:: TransientResource(exc, **kwargs) diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index cda859f..cddbd52 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -256,7 +256,7 @@ since it is impossible to detect the termination of alien threads. Wait until the thread terminates. This blocks the calling thread until the thread whose :meth:`~Thread.join` method is called terminates -- either - normally or through an unhandled exception -- or until the optional + normally or through an unhandled exception --, or until the optional timeout occurs. When the *timeout* argument is present and not ``None``, it should be a @@ -371,9 +371,8 @@ All methods are executed atomically. lock, subsequent attempts to acquire it block, until it is released; any thread may release it. - Note that ``Lock`` is actually a factory function which returns an instance - of the most efficient version of the concrete Lock class that is supported - by the platform. + .. versionchanged:: 3.3 + Changed from a factory function to a class. .. method:: acquire(blocking=True, timeout=-1) diff --git a/Doc/library/time.rst b/Doc/library/time.rst index 92e7ce0..ae17f6f 100644 --- a/Doc/library/time.rst +++ b/Doc/library/time.rst @@ -17,23 +17,11 @@ semantics of these functions varies among platforms. An explanation of some terminology and conventions is in order. -.. _epoch: - .. index:: single: epoch -* The :dfn:`epoch` is the point where the time starts, and is platform - dependent. For Unix, the epoch is January 1, 1970, 00:00:00 (UTC). - To find out what the epoch is on a given platform, look at - ``time.gmtime(0)``. - -.. _leap seconds: https://en.wikipedia.org/wiki/Leap_second - -.. index:: seconds since the epoch - -* The term :dfn:`seconds since the epoch` refers to the total number - of elapsed seconds since the epoch, typically excluding - `leap seconds`_. Leap seconds are excluded from this total on all - POSIX-compliant platforms. +* The :dfn:`epoch` is the point where the time starts. On January 1st of that + year, at 0 hours, the "time since the epoch" is zero. For Unix, the epoch is + 1970. To find out what the epoch is, look at ``gmtime(0)``. .. index:: single: Year 2038 @@ -95,6 +83,10 @@ An explanation of some terminology and conventions is in order. and :attr:`tm_zone` attributes when platform supports corresponding ``struct tm`` members. + .. versionchanged:: 3.6 + The :class:`struct_time` attributes :attr:`tm_gmtoff` and :attr:`tm_zone` + are now available on all platforms. + * Use the following functions to convert between time representations: +-------------------------+-------------------------+-------------------------+ @@ -475,7 +467,7 @@ The module defines the following functions and data items: (2) The range really is ``0`` to ``61``; value ``60`` is valid in - timestamps representing `leap seconds`_ and value ``61`` is supported + timestamps representing leap seconds and value ``61`` is supported for historical reasons. (3) @@ -578,34 +570,14 @@ The module defines the following functions and data items: :class:`struct_time`, or having elements of the wrong type, a :exc:`TypeError` is raised. - .. versionchanged:: 3.3 - :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms - with C library supporting the corresponding fields in ``struct tm``. - .. function:: time() - Return the time in seconds since the epoch_ as a floating point - number. The specific date of the epoch and the handling of - `leap seconds`_ is platform dependent. - On Windows and most Unix systems, the epoch is January 1, 1970, - 00:00:00 (UTC) and leap seconds are not counted towards the time - in seconds since the epoch. This is commonly referred to as - `Unix time `_. - To find out what the epoch is on a given platform, look at - ``gmtime(0)``. - + Return the time in seconds since the epoch as a floating point number. Note that even though the time is always returned as a floating point number, not all systems provide time with a better precision than 1 second. While this function normally returns non-decreasing values, it can return a - lower value than a previous call if the system clock has been set back - between the two calls. - - The number returned by :func:`.time` may be converted into a more common - time format (i.e. year, month, day, hour, etc...) in UTC by passing it to - :func:`gmtime` function or in local time by passing it to the - :func:`localtime` function. In both cases a - :class:`struct_time` object is returned, from which the components - of the calendar date may be accessed as attributes. + lower value than a previous call if the system clock has been set back between + the two calls. .. data:: timezone @@ -665,11 +637,11 @@ The module defines the following functions and data items: it is possible to refer to February 29. :samp:`M{m}.{n}.{d}` - The *d*'th day (0 <= *d* <= 6) or week *n* of month *m* of the year (1 + The *d*'th day (0 <= *d* <= 6) of week *n* of month *m* of the year (1 <= *n* <= 5, 1 <= *m* <= 12, where week 5 means "the last *d* day in month *m*" which may occur in either the fourth or the fifth week). Week 1 is the first week in which the *d*'th day occurs. Day - zero is Sunday. + zero is a Sunday. ``time`` has the same format as ``offset`` except that no leading sign ('-' or '+') is allowed. The default, if time is not given, is 02:00:00. diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst index 57a4834..3b77276 100644 --- a/Doc/library/timeit.rst +++ b/Doc/library/timeit.rst @@ -100,8 +100,8 @@ The module defines three convenience functions and a public class: can be controlled by passing a namespace to *globals*. To measure the execution time of the first statement, use the :meth:`.timeit` - method. The :meth:`.repeat` method is a convenience to call :meth:`.timeit` - multiple times and return a list of results. + method. The :meth:`.repeat` and :meth:`.autorange` methods are convenience + methods to call :meth:`.timeit` multiple times. The execution time of *setup* is excluded from the overall timed execution run. @@ -134,6 +134,23 @@ The module defines three convenience functions and a public class: timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit() + .. method:: Timer.autorange(callback=None) + + Automatically determine how many times to call :meth:`.timeit`. + + This is a convenience function that calls :meth:`.timeit` repeatedly + so that the total time >= 0.2 second, returning the eventual + (number of loops, time taken for that number of loops). It calls + :meth:`.timeit` with *number* set to successive powers of ten (10, + 100, 1000, ...) up to a maximum of one billion, until the time taken + is at least 0.2 second, or the maximum is reached. + + If *callback* is given and is not ``None``, it will be called after + each trial with two arguments: ``callback(number, time_taken)``. + + .. versionadded:: 3.6 + + .. method:: Timer.repeat(repeat=3, number=1000000) Call :meth:`.timeit` a few times. diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst index 41f20dd..11ed755 100644 --- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -10,6 +10,10 @@ .. index:: single: Tix +.. deprecated:: 3.6 + This Tk extension is unmaintained and should not be used in new code. Use + :mod:`tkinter.ttk` instead. + -------------- The :mod:`tkinter.tix` (Tk Interface Extension) module provides an additional diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst index fc052f2..066ee96 100644 --- a/Doc/library/traceback.rst +++ b/Doc/library/traceback.rst @@ -45,9 +45,9 @@ The module defines the following functions: * if *tb* is not ``None``, it prints a header ``Traceback (most recent call last):`` * it prints the exception *etype* and *value* after the stack trace - * if *type(value)* is :exc:`SyntaxError` and *value* has the appropriate - format, it prints the line where the syntax error occurred with a caret - indicating the approximate position of the error. + * if *etype* is :exc:`SyntaxError` and *value* has the appropriate format, it + prints the line where the syntax error occurred with a caret indicating the + approximate position of the error. The optional *limit* argument has the same meaning as for :func:`print_tb`. If *chain* is true (the default), then chained exceptions (the @@ -55,9 +55,6 @@ The module defines the following functions: printed as well, like the interpreter itself does when printing an unhandled exception. - .. versionchanged:: 3.5 - The *etype* argument is ignored and inferred from the type of *value*. - .. function:: print_exc(limit=None, file=None, chain=True) @@ -134,9 +131,6 @@ The module defines the following functions: containing internal newlines. When these lines are concatenated and printed, exactly the same text is printed as does :func:`print_exception`. - .. versionchanged:: 3.5 - The *etype* argument is ignored and inferred from the type of *value*. - .. function:: format_exc(limit=None, chain=True) @@ -297,6 +291,20 @@ capture data for later printing in a lightweight fashion. of tuples. Each tuple should be a 4-tuple with filename, lineno, name, line as the elements. + .. method:: format() + + Returns a list of strings ready for printing. Each string in the + resulting list corresponds to a single frame from the stack. + Each string ends in a newline; the strings may contain internal + newlines as well, for those items with source text lines. + + For long sequences of the same frame and line, the first few + repetitions are shown, followed by a summary line stating the exact + number of further repetitions. + + .. versionchanged:: 3.6 + Long sequences of repeated frames are now abbreviated. + :class:`FrameSummary` Objects ----------------------------- @@ -364,7 +372,6 @@ exception and traceback: print("*** print_tb:") traceback.print_tb(exc_traceback, limit=1, file=sys.stdout) print("*** print_exception:") - # exc_type below is ignored on 3.5 and later traceback.print_exception(exc_type, exc_value, exc_traceback, limit=2, file=sys.stdout) print("*** print_exc:") @@ -374,7 +381,6 @@ exception and traceback: print(formatted_lines[0]) print(formatted_lines[-1]) print("*** format_exception:") - # exc_type below is ignored on 3.5 and later print(repr(traceback.format_exception(exc_type, exc_value, exc_traceback))) print("*** extract_tb:") diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst index 2c8ad0e..f56f27b 100644 --- a/Doc/library/tracemalloc.rst +++ b/Doc/library/tracemalloc.rst @@ -66,7 +66,7 @@ Example of output of the Python test suite:: :5: size=49.7 KiB, count=148, average=344 B /usr/lib/python3.4/sysconfig.py:411: size=48.0 KiB, count=1, average=48.0 KiB -We can see that Python loaded ``4855 KiB`` data (bytecode and constants) from +We can see that Python loaded ``4.8 MiB`` data (bytecode and constants) from modules and that the :mod:`collections` module allocated ``244 KiB`` to build :class:`~collections.namedtuple` types. @@ -106,8 +106,8 @@ Example of output before/after running some tests of the Python test suite:: /usr/lib/python3.4/urllib/parse.py:476: size=71.8 KiB (+71.8 KiB), count=969 (+969), average=76 B /usr/lib/python3.4/contextlib.py:38: size=67.2 KiB (+67.2 KiB), count=126 (+126), average=546 B -We can see that Python has loaded ``8173 KiB`` of module data (bytecode and -constants), and that this is ``4428 KiB`` more than had been loaded before the +We can see that Python has loaded ``8.2 MiB`` of module data (bytecode and +constants), and that this is ``4.4 MiB`` more than had been loaded before the tests, when the previous snapshot was taken. Similarly, the :mod:`linecache` module has cached ``940 KiB`` of Python source code to format tracebacks, all of it since the previous snapshot. @@ -176,7 +176,7 @@ Example of output of the Python test suite (traceback limited to 25 frames):: "__main__", fname, loader, pkg_name) We can see that the most memory was allocated in the :mod:`importlib` module to -load data (bytecode and constants) from modules: ``870.1 KiB``. The traceback is +load data (bytecode and constants) from modules: ``870 KiB``. The traceback is where the :mod:`importlib` loaded data most recently: on the ``import pdb`` line of the :mod:`doctest` module. The traceback may change if a new module is loaded. @@ -192,12 +192,12 @@ ignoring ```` and ```` files:: import os import tracemalloc - def display_top(snapshot, key_type='lineno', limit=10): + def display_top(snapshot, group_by='lineno', limit=10): snapshot = snapshot.filter_traces(( tracemalloc.Filter(False, ""), tracemalloc.Filter(False, ""), )) - top_stats = snapshot.statistics(key_type) + top_stats = snapshot.statistics(group_by) print("Top %s lines" % limit) for index, stat in enumerate(top_stats[:limit], 1): @@ -359,10 +359,32 @@ Functions See also the :func:`get_object_traceback` function. +DomainFilter +^^^^^^^^^^^^ + +.. class:: DomainFilter(inclusive: bool, domain: int) + + Filter traces of memory blocks by their address space (domain). + + .. versionadded:: 3.6 + + .. attribute:: inclusive + + If *inclusive* is ``True`` (include), match memory blocks allocated + in the address space :attr:`domain`. + + If *inclusive* is ``False`` (exclude), match memory blocks not allocated + in the address space :attr:`domain`. + + .. attribute:: domain + + Address space of a memory block (``int``). Read-only property. + + Filter ^^^^^^ -.. class:: Filter(inclusive: bool, filename_pattern: str, lineno: int=None, all_frames: bool=False) +.. class:: Filter(inclusive: bool, filename_pattern: str, lineno: int=None, all_frames: bool=False, domain: int=None) Filter on traces of memory blocks. @@ -382,9 +404,17 @@ Filter .. versionchanged:: 3.5 The ``'.pyo'`` file extension is no longer replaced with ``'.py'``. + .. versionchanged:: 3.6 + Added the :attr:`domain` attribute. + + + .. attribute:: domain + + Address space of a memory block (``int`` or ``None``). + .. attribute:: inclusive - If *inclusive* is ``True`` (include), only trace memory blocks allocated + If *inclusive* is ``True`` (include), only match memory blocks allocated in a file with a name matching :attr:`filename_pattern` at line number :attr:`lineno`. @@ -399,7 +429,7 @@ Filter .. attribute:: filename_pattern - Filename pattern of the filter (``str``). + Filename pattern of the filter (``str``). Read-only property. .. attribute:: all_frames @@ -438,12 +468,12 @@ Snapshot The :func:`take_snapshot` function creates a snapshot instance. - .. method:: compare_to(old_snapshot: Snapshot, key_type: str, cumulative: bool=False) + .. method:: compare_to(old_snapshot: Snapshot, group_by: str, cumulative: bool=False) Compute the differences with an old snapshot. Get statistics as a sorted - list of :class:`StatisticDiff` instances grouped by *key_type*. + list of :class:`StatisticDiff` instances grouped by *group_by*. - See the :meth:`Snapshot.statistics` method for *key_type* and *cumulative* + See the :meth:`Snapshot.statistics` method for *group_by* and *cumulative* parameters. The result is sorted from the biggest to the smallest by: absolute value @@ -462,14 +492,17 @@ Snapshot .. method:: filter_traces(filters) Create a new :class:`Snapshot` instance with a filtered :attr:`traces` - sequence, *filters* is a list of :class:`Filter` instances. If *filters* - is an empty list, return a new :class:`Snapshot` instance with a copy of - the traces. + sequence, *filters* is a list of :class:`DomainFilter` and + :class:`Filter` instances. If *filters* is an empty list, return a new + :class:`Snapshot` instance with a copy of the traces. All inclusive filters are applied at once, a trace is ignored if no inclusive filters match it. A trace is ignored if at least one exclusive filter matches it. + .. versionchanged:: 3.6 + :class:`DomainFilter` instances are now also accepted in *filters*. + .. classmethod:: load(filename) @@ -478,13 +511,13 @@ Snapshot See also :meth:`dump`. - .. method:: statistics(key_type: str, cumulative: bool=False) + .. method:: statistics(group_by: str, cumulative: bool=False) Get statistics as a sorted list of :class:`Statistic` instances grouped - by *key_type*: + by *group_by*: ===================== ======================== - key_type description + group_by description ===================== ======================== ``'filename'`` filename ``'lineno'`` filename and line number @@ -493,7 +526,7 @@ Snapshot If *cumulative* is ``True``, cumulate size and count of memory blocks of all frames of the traceback of a trace, not only the most recent frame. - The cumulative mode can only be used with *key_type* equals to + The cumulative mode can only be used with *group_by* equals to ``'filename'`` and ``'lineno'``. The result is sorted from the biggest to the smallest by: diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index 2b5d3e5..1986972 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -1797,7 +1797,7 @@ Input methods :param prompt: string Pop up a dialog window for input of a string. Parameter title is - the title of the dialog window, prompt is a text mostly describing + the title of the dialog window, propmt is a text mostly describing what information to input. Return the string input. If the dialog is canceled, return ``None``. :: @@ -2368,7 +2368,7 @@ The demo scripts are: | wikipedia | a pattern from the wikipedia | :func:`clone`, | | | article on turtle graphics | :func:`undo` | +----------------+------------------------------+-----------------------+ -| yinyang | another elementary example | :func:`circle` | +| yingyang | another elementary example | :func:`circle` | +----------------+------------------------------+-----------------------+ Have fun! diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 118bc4c..0c5619c 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -55,6 +55,12 @@ Dynamic Type Creation .. versionadded:: 3.3 + .. versionchanged:: 3.6 + + The default value for the ``namespace`` element of the returned + tuple has changed. Now an insertion-order-preserving mapping is + used when the metaclass does not have a ``__prepare__`` method, + .. seealso:: :ref:`metaclasses` @@ -98,6 +104,14 @@ Standard names are defined for the following types: .. versionadded:: 3.5 +.. data:: AsyncGeneratorType + + The type of :term:`asynchronous generator`-iterator objects, created by + asynchronous generator functions. + + .. versionadded:: 3.6 + + .. data:: CodeType .. index:: builtin: compile diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index adaad29..2bac6f8 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -10,8 +10,8 @@ -------------- -This module supports type hints as specified by :pep:`484`. The most -fundamental support consists of the types :data:`Any`, :data:`Union`, +This module supports type hints as specified by :pep:`484` and :pep:`526`. +The most fundamental support consists of the types :data:`Any`, :data:`Union`, :data:`Tuple`, :data:`Callable`, :class:`TypeVar`, and :class:`Generic`. For full specification please see :pep:`484`. For a simplified introduction to type hints see :pep:`483`. @@ -299,7 +299,7 @@ comparable for equality. The :data:`Any` type --------------------- +--------------------- A special kind of type is :data:`Any`. A static type checker will treat every type as being compatible with :data:`Any` and :data:`Any` as being @@ -523,7 +523,13 @@ The module defines the following classes, functions and decorators: An alias to :class:`collections.abc.Sized` -.. class:: AbstractSet(Sized, Iterable[T_co], Container[T_co]) +.. class:: Collection(Sized, Iterable[T_co], Container[T_co]) + + A generic version of :class:`collections.abc.Collection` + + .. versionadded:: 3.6 + +.. class:: AbstractSet(Sized, Collection[T_co]) A generic version of :class:`collections.abc.Set`. @@ -531,7 +537,7 @@ The module defines the following classes, functions and decorators: A generic version of :class:`collections.abc.MutableSet`. -.. class:: Mapping(Sized, Iterable[KT], Container[KT], Generic[VT_co]) +.. class:: Mapping(Sized, Collection[KT], Generic[VT_co]) A generic version of :class:`collections.abc.Mapping`. @@ -539,7 +545,7 @@ The module defines the following classes, functions and decorators: A generic version of :class:`collections.abc.MutableMapping`. -.. class:: Sequence(Sized, Iterable[T_co], Container[T_co]) +.. class:: Sequence(Reversible[T_co], Collection[T_co]) A generic version of :class:`collections.abc.Sequence`. @@ -557,12 +563,6 @@ The module defines the following classes, functions and decorators: As a shorthand for this type, :class:`bytes` can be used to annotate arguments of any of the types mentioned above. -.. class:: Deque(deque, MutableSequence[T]) - - A generic version of :class:`collections.deque`. - - .. versionadded:: 3.5.4 - .. class:: List(list, MutableSequence[T]) Generic version of :class:`list`. @@ -627,7 +627,13 @@ The module defines the following classes, functions and decorators: .. class:: AsyncIterator(AsyncIterable[T_co]) - A generic version of :class:`collections.abc.AsyncIterator`. + A generic version of :class:`collections.abc.AsyncIterator`. + +.. class:: ContextManager(Generic[T_co]) + + A generic version of :class:`contextlib.AbstractContextManager`. + + .. versionadded:: 3.6 .. class:: Dict(dict, MutableMapping[KT, VT]) @@ -672,39 +678,6 @@ The module defines the following classes, functions and decorators: yield start start += 1 -.. class:: AsyncGenerator(AsyncIterator[T_co], Generic[T_co, T_contra]) - - An async generator can be annotated by the generic type - ``AsyncGenerator[YieldType, SendType]``. For example:: - - async def echo_round() -> AsyncGenerator[int, float]: - sent = yield 0 - while sent >= 0.0: - rounded = await round(sent) - sent = yield rounded - - Unlike normal generators, async generators cannot return a value, so there - is no ``ReturnType`` type parameter. As with :class:`Generator`, the - ``SendType`` behaves contravariantly. - - If your generator will only yield values, set the ``SendType`` to - ``None``:: - - async def infinite_stream(start: int) -> AsyncGenerator[int, None]: - while True: - yield start - start = await increment(start) - - Alternatively, annotate your generator as having a return type of - either ``AsyncIterable[YieldType]`` or ``AsyncIterator[YieldType]``:: - - async def infinite_stream(start: int) -> AsyncIterator[int]: - while True: - yield start - start = await increment(start) - - .. versionadded:: 3.5.4 - .. class:: Text ``Text`` is an alias for ``str``. It is provided to supply a forward @@ -737,23 +710,32 @@ The module defines the following classes, functions and decorators: ``Pattern[str]``, ``Pattern[bytes]``, ``Match[str]``, or ``Match[bytes]``. -.. function:: NamedTuple(typename, fields) +.. class:: NamedTuple Typed version of namedtuple. Usage:: - Employee = typing.NamedTuple('Employee', [('name', str), ('id', int)]) + class Employee(NamedTuple): + name: str + id: int This is equivalent to:: Employee = collections.namedtuple('Employee', ['name', 'id']) - The resulting class has one extra attribute: _field_types, + The resulting class has one extra attribute: ``_field_types``, giving a dict mapping field names to types. (The field names - are in the _fields attribute, which is part of the namedtuple + are in the ``_fields`` attribute, which is part of the namedtuple API.) + Backward-compatible usage:: + + Employee = NamedTuple('Employee', [('name', str), ('id', int)]) + + .. versionchanged:: 3.6 + Added support for :pep:`526` variable annotation syntax. + .. function:: NewType(typ) A helper function to indicate a distinct types to a typechecker, @@ -861,7 +843,7 @@ The module defines the following classes, functions and decorators: Union[int, str] == Union[str, int] - * When a class and its subclass are present, the latter is skipped, e.g.:: + * When a class and its subclass are present, the former is skipped, e.g.:: Union[int, object] == object @@ -923,8 +905,8 @@ The module defines the following classes, functions and decorators: and should not be set on instances of that class. Usage:: class Starship: - stats = {} # type: ClassVar[Dict[str, int]] # class variable - damage = 10 # type: int # instance variable + stats: ClassVar[Dict[str, int]] = {} # class variable + damage: int = 10 # instance variable :data:`ClassVar` accepts only types and cannot be further subscribed. @@ -963,10 +945,5 @@ The module defines the following classes, functions and decorators: if TYPE_CHECKING: import expensive_mod - def fun(arg: 'expensive_mod.SomeType') -> None: - local_var: expensive_mod.AnotherType = other_fun() - - Note that the first type annotation must be enclosed in quotes, making it a - "forward reference", to hide the ``expensive_mod`` reference from the - interpreter runtime. Type annotations for local variables are not - evaluated, so the second annotation does not need to be enclosed in quotes. + def fun(): + local_var: expensive_mod.some_type = other_fun() diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst index 20830e2..2444080 100644 --- a/Doc/library/undoc.rst +++ b/Doc/library/undoc.rst @@ -20,7 +20,7 @@ These modules are used to implement the :mod:`os.path` module, and are not documented beyond this mention. There's little need to document these. :mod:`ntpath` - --- Implementation of :mod:`os.path` on Win32, Win64, and WinCE platforms. + --- Implementation of :mod:`os.path` on Win32 and Win64 platforms. :mod:`posixpath` --- Implementation of :mod:`os.path` on POSIX. diff --git a/Doc/library/unicodedata.rst b/Doc/library/unicodedata.rst index 51b0b66..6431809 100644 --- a/Doc/library/unicodedata.rst +++ b/Doc/library/unicodedata.rst @@ -17,8 +17,8 @@ This module provides access to the Unicode Character Database (UCD) which defines character properties for all Unicode characters. The data contained in -this database is compiled from the `UCD version 8.0.0 -`_. +this database is compiled from the `UCD version 9.0.0 +`_. The module uses the same names and symbols as defined by Unicode Standard Annex #44, `"Unicode Character Database" @@ -158,7 +158,7 @@ Examples: 9 >>> unicodedata.decimal('a') Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? ValueError: not a decimal >>> unicodedata.category('A') # 'L'etter, 'u'ppercase 'Lu' @@ -168,6 +168,6 @@ Examples: .. rubric:: Footnotes -.. [#] http://www.unicode.org/Public/8.0.0/ucd/NameAliases.txt +.. [#] http://www.unicode.org/Public/9.0.0/ucd/NameAliases.txt -.. [#] http://www.unicode.org/Public/8.0.0/ucd/NamedSequences.txt +.. [#] http://www.unicode.org/Public/9.0.0/ucd/NamedSequences.txt diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 1169f0b..3cc22fd 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -262,6 +262,34 @@ the *new_callable* argument to :func:`patch`. used to set attributes on the mock after it is created. See the :meth:`configure_mock` method for details. + .. method:: assert_called(*args, **kwargs) + + Assert that the mock was called at least once. + + >>> mock = Mock() + >>> mock.method() + + >>> mock.method.assert_called() + + .. versionadded:: 3.6 + + .. method:: assert_called_once(*args, **kwargs) + + Assert that the mock was called exactly once. + + >>> mock = Mock() + >>> mock.method() + + >>> mock.method.assert_called_once() + >>> mock.method() + + >>> mock.method.assert_called_once() + Traceback (most recent call last): + ... + AssertionError: Expected 'method' to have been called once. Called 2 times. + + .. versionadded:: 3.6 + .. method:: assert_called_with(*args, **kwargs) @@ -275,14 +303,14 @@ the *new_callable* argument to :func:`patch`. .. method:: assert_called_once_with(*args, **kwargs) - Assert that the mock was called exactly once and that that call was - with the specified arguments. + Assert that the mock was called exactly once and with the specified + arguments. >>> mock = Mock(return_value=None) >>> mock('foo', bar='baz') >>> mock.assert_called_once_with('foo', bar='baz') - >>> mock('other', bar='values') - >>> mock.assert_called_once_with('other', bar='values') + >>> mock('foo', bar='baz') + >>> mock.assert_called_once_with('foo', bar='baz') Traceback (most recent call last): ... AssertionError: Expected 'mock' to be called once. Called 2 times. @@ -294,8 +322,7 @@ the *new_callable* argument to :func:`patch`. The assert passes if the mock has *ever* been called, unlike :meth:`assert_called_with` and :meth:`assert_called_once_with` that - only pass if the call is the most recent one, and in the case of - :meth:`assert_called_once_with` it must also be the only call. + only pass if the call is the most recent one. >>> mock = Mock(return_value=None) >>> mock(1, 2, arg='thing') @@ -340,7 +367,7 @@ the *new_callable* argument to :func:`patch`. .. versionadded:: 3.5 - .. method:: reset_mock() + .. method:: reset_mock(*, return_value=False, side_effect=False) The reset_mock method resets all the call attributes on a mock object: @@ -352,12 +379,20 @@ the *new_callable* argument to :func:`patch`. >>> mock.called False + .. versionchanged:: 3.6 + Added two keyword only argument to the reset_mock function. + This can be useful where you want to make a series of assertions that reuse the same object. Note that :meth:`reset_mock` *doesn't* clear the return value, :attr:`side_effect` or any child attributes you have - set using normal assignment. Child mocks and the return value mock + set using normal assignment by default. In case you want to reset + *return_value* or :attr:`side_effect`, then pass the corresponding + parameter as ``True``. Child mocks and the return value mock (if any) are reset as well. + .. note:: *return_value*, and :attr:`side_effect` are keyword only + argument. + .. method:: mock_add_spec(spec, spec_set=False) @@ -1796,9 +1831,6 @@ sentinel the same attribute will always return the same object. The objects returned have a sensible repr so that test failure messages are readable. - The ``sentinel`` attributes don't preserve their identity when they are - :mod:`copied ` or :mod:`pickled `. - Sometimes when testing you need to test that a specific object is passed as an argument to another method, or returned. It can be common to create named sentinel objects to test this. :data:`sentinel` provides a convenient way of diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 2790762..c13a731 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -1170,9 +1170,6 @@ Test cases :meth:`.assertRegex`. .. versionadded:: 3.2 :meth:`.assertNotRegex`. - .. versionadded:: 3.5 - The name ``assertNotRegexpMatches`` is a deprecated alias - for :meth:`.assertNotRegex`. .. method:: assertCountEqual(first, second, msg=None) @@ -1394,9 +1391,9 @@ Test cases Add a function to be called after :meth:`tearDown` to cleanup resources used during the test. Functions will be called in reverse order to the - order they are added (LIFO). They are called with any arguments and - keyword arguments passed into :meth:`addCleanup` when they are - added. + order they are added (:abbr:`LIFO (last-in, first-out)`). They + are called with any arguments and keyword arguments passed into + :meth:`addCleanup` when they are added. If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called, then any cleanup functions added will still be called. @@ -1438,9 +1435,9 @@ For historical reasons, some of the :class:`TestCase` methods had one or more aliases that are now deprecated. The following table lists the correct names along with their deprecated aliases: - ============================== ====================== ======================= + ============================== ====================== ====================== Method Name Deprecated alias Deprecated alias - ============================== ====================== ======================= + ============================== ====================== ====================== :meth:`.assertEqual` failUnlessEqual assertEquals :meth:`.assertNotEqual` failIfEqual assertNotEquals :meth:`.assertTrue` failUnless assert\_ @@ -1449,9 +1446,8 @@ along with their deprecated aliases: :meth:`.assertAlmostEqual` failUnlessAlmostEqual assertAlmostEquals :meth:`.assertNotAlmostEqual` failIfAlmostEqual assertNotAlmostEquals :meth:`.assertRegex` assertRegexpMatches - :meth:`.assertNotRegex` assertNotRegexpMatches :meth:`.assertRaisesRegex` assertRaisesRegexp - ============================== ====================== ======================= + ============================== ====================== ====================== .. deprecated:: 3.1 the fail* aliases listed in the second column. @@ -1459,9 +1455,8 @@ along with their deprecated aliases: the assert* aliases listed in the third column. .. deprecated:: 3.2 ``assertRegexpMatches`` and ``assertRaisesRegexp`` have been renamed to - :meth:`.assertRegex` and :meth:`.assertRaisesRegex`. - .. deprecated:: 3.5 - the ``assertNotRegexpMatches`` name in favor of :meth:`.assertNotRegex`. + :meth:`.assertRegex` and :meth:`.assertRaisesRegex` + .. _testsuite-objects: @@ -1470,7 +1465,7 @@ Grouping tests .. class:: TestSuite(tests=()) - This class represents an aggregation of individual test cases and test suites. + This class represents an aggregation of individual tests cases and test suites. The class presents the interface needed by the test runner to allow it to be run as any other test case. Running a :class:`TestSuite` instance is the same as iterating over the suite, running each test individually. @@ -1578,7 +1573,7 @@ Loading and running tests .. method:: loadTestsFromTestCase(testCaseClass) - Return a suite of all test cases contained in the :class:`TestCase`\ -derived + Return a suite of all tests cases contained in the :class:`TestCase`\ -derived :class:`testCaseClass`. A test case instance is created for each method named by @@ -1590,7 +1585,7 @@ Loading and running tests .. method:: loadTestsFromModule(module, pattern=None) - Return a suite of all test cases contained in the given module. This + Return a suite of all tests cases contained in the given module. This method searches *module* for classes derived from :class:`TestCase` and creates an instance of the class for each test method defined for the class. @@ -1620,7 +1615,7 @@ Loading and running tests .. method:: loadTestsFromName(name, module=None) - Return a suite of all test cases given a string specifier. + Return a suite of all tests cases given a string specifier. The specifier *name* is a "dotted name" that may resolve either to a module, a test case class, a test method within a test case class, a @@ -1642,11 +1637,11 @@ Loading and running tests The method optionally resolves *name* relative to the given *module*. - .. versionchanged:: 3.5 - If an :exc:`ImportError` or :exc:`AttributeError` occurs while traversing - *name* then a synthetic test that raises that error when run will be - returned. These errors are included in the errors accumulated by - self.errors. + .. versionchanged:: 3.5 + If an :exc:`ImportError` or :exc:`AttributeError` occurs while traversing + *name* then a synthetic test that raises that error when run will be + returned. These errors are included in the errors accumulated by + self.errors. .. method:: loadTestsFromNames(names, module=None) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 6f722a8..676321b 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -114,11 +114,9 @@ or on combining URL components into a URL string. | | | if present | | +------------------+-------+--------------------------+----------------------+ - See section :ref:`urlparse-result-object` for more information on the result - object. - - Unmatched square brackets in the :attr:`netloc` attribute will raise a - :exc:`ValueError`. + Reading the :attr:`port` attribute will raise a :exc:`ValueError` if + an invalid port is specified in the URL. See section + :ref:`urlparse-result-object` for more information on the result object. .. versionchanged:: 3.2 Added IPv6 URL parsing capabilities. @@ -128,6 +126,10 @@ or on combining URL components into a URL string. false), in accordance with :rfc:`3986`. Previously, a whitelist of schemes that support fragments existed. + .. versionchanged:: 3.6 + Out-of-range port numbers now raise :exc:`ValueError`, instead of + returning :const:`None`. + .. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace') @@ -230,11 +232,13 @@ or on combining URL components into a URL string. | | | if present | | +------------------+-------+-------------------------+----------------------+ - See section :ref:`urlparse-result-object` for more information on the result - object. + Reading the :attr:`port` attribute will raise a :exc:`ValueError` if + an invalid port is specified in the URL. See section + :ref:`urlparse-result-object` for more information on the result object. - Unmatched square brackets in the :attr:`netloc` attribute will raise a - :exc:`ValueError`. + .. versionchanged:: 3.6 + Out-of-range port numbers now raise :exc:`ValueError`, instead of + returning :const:`None`. .. function:: urlunsplit(parts) diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 63530e1..473effc 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -30,18 +30,9 @@ The :mod:`urllib.request` module defines the following functions: Open the URL *url*, which can be either a string or a :class:`Request` object. - *data* must be a bytes object specifying additional data to be sent to the - server, or ``None`` if no such data is needed. *data* may also be an - iterable object and in that case Content-Length value must be specified in - the headers. Currently HTTP requests are the only ones that use *data*; the - HTTP request will be a POST instead of a GET when the *data* parameter is - provided. - - *data* should be a buffer in the standard - :mimetype:`application/x-www-form-urlencoded` format. The - :func:`urllib.parse.urlencode` function takes a mapping or sequence of - 2-tuples and returns an ASCII text string in this format. It should - be encoded to bytes before being used as the *data* parameter. + *data* must be an object specifying additional data to be sent to the + server, or ``None`` if no such data is needed. See :class:`Request` + for details. urllib.request module uses HTTP/1.1 and includes ``Connection:close`` header in its HTTP requests. @@ -120,6 +111,12 @@ The :mod:`urllib.request` module defines the following functions: .. versionchanged:: 3.4.3 *context* was added. + .. deprecated:: 3.6 + + *cafile*, *capath* and *cadefault* are deprecated in favor of *context*. + Please use :meth:`ssl.SSLContext.load_cert_chain` instead, or let + :func:`ssl.create_default_context` select the system's trusted CA + certificates for you. .. function:: install_opener(opener) @@ -173,15 +170,15 @@ The :mod:`urllib.request` module defines the following functions: If both lowercase and uppercase environment variables exist (and disagree), lowercase is preferred. - .. note:: + .. note:: - If the environment variable ``REQUEST_METHOD`` is set, which usually - indicates your script is running in a CGI environment, the environment - variable ``HTTP_PROXY`` (uppercase ``_PROXY``) will be ignored. This is - because that variable can be injected by a client using the "Proxy:" HTTP - header. If you need to use an HTTP proxy in a CGI environment, either use - ``ProxyHandler`` explicitly, or make sure the variable name is in - lowercase (or at least the ``_proxy`` suffix). + If the environment variable ``REQUEST_METHOD`` is set, which usually + indicates your script is running in a CGI environment, the environment + variable ``HTTP_PROXY`` (uppercase ``_PROXY``) will be ignored. This is + because that variable can be injected by a client using the "Proxy:" HTTP + header. If you need to use an HTTP proxy in a CGI environment, either use + ``ProxyHandler`` explicitly, or make sure the variable name is in + lowercase (or at least the ``_proxy`` suffix). The following classes are provided: @@ -192,14 +189,21 @@ The following classes are provided: *url* should be a string containing a valid URL. - *data* must be a bytes object specifying additional data to send to the - server, or ``None`` if no such data is needed. Currently HTTP requests are - the only ones that use *data*; the HTTP request will be a POST instead of a - GET when the *data* parameter is provided. *data* should be a buffer in the - standard :mimetype:`application/x-www-form-urlencoded` format. - The :func:`urllib.parse.urlencode` function takes a mapping or sequence of - 2-tuples and returns an ASCII string in this format. It should be - encoded to bytes before being used as the *data* parameter. + *data* must be an object specifying additional data to send to the + server, or ``None`` if no such data is needed. Currently HTTP + requests are the only ones that use *data*. The supported object + types include bytes, file-like objects, and iterables. If no + ``Content-Length`` nor ``Transfer-Encoding`` header field + has been provided, :class:`HTTPHandler` will set these headers according + to the type of *data*. ``Content-Length`` will be used to send + bytes objects, while ``Transfer-Encoding: chunked`` as specified in + :rfc:`7230`, Section 3.3.1 will be used to send files and other iterables. + + For an HTTP POST request method, *data* should be a buffer in the + standard :mimetype:`application/x-www-form-urlencoded` format. The + :func:`urllib.parse.urlencode` function takes a mapping or sequence + of 2-tuples and returns an ASCII string in this format. It should + be encoded to bytes before being used as the *data* parameter. *headers* should be a dictionary, and will be treated as if :meth:`add_header` was called with each key and value as arguments. @@ -211,8 +215,10 @@ The following classes are provided: :mod:`urllib`'s default user agent string is ``"Python-urllib/2.6"`` (on Python 2.6). - An example of using ``Content-Type`` header with *data* argument would be - sending a dictionary like ``{"Content-Type": "application/x-www-form-urlencoded"}``. + An appropriate ``Content-Type`` header should be included if the *data* + argument is present. If this header has not been provided and *data* + is not None, ``Content-Type: application/x-www-form-urlencoded`` will + be added as a default. The final two arguments are only of interest for correct handling of third-party HTTP cookies: @@ -235,15 +241,28 @@ The following classes are provided: *method* should be a string that indicates the HTTP request method that will be used (e.g. ``'HEAD'``). If provided, its value is stored in the :attr:`~Request.method` attribute and is used by :meth:`get_method()`. - Subclasses may indicate a default method by setting the + The default is ``'GET'`` if *data* is ``None`` or ``'POST'`` otherwise. + Subclasses may indicate a different default method by setting the :attr:`~Request.method` attribute in the class itself. + .. note:: + The request will not work as expected if the data object is unable + to deliver its content more than once (e.g. a file or an iterable + that can produce the content only once) and the request is retried + for HTTP redirects or authentication. The *data* is sent to the + HTTP server right away after the headers. There is no support for + a 100-continue expectation in the library. + .. versionchanged:: 3.3 :attr:`Request.method` argument is added to the Request class. .. versionchanged:: 3.4 Default :attr:`Request.method` may be indicated at the class level. + .. versionchanged:: 3.6 + Do not raise an error if the ``Content-Length`` has not been + provided and *data* is neither ``None`` nor a bytes object. + Fall back to use chunked transfer encoding instead. .. class:: OpenerDirector() @@ -1388,48 +1407,48 @@ some point in the future. :class:`URLopener` objects will raise an :exc:`OSError` exception if the server returns an error code. - .. method:: open(fullurl, data=None) + .. method:: open(fullurl, data=None) - Open *fullurl* using the appropriate protocol. This method sets up cache and - proxy information, then calls the appropriate open method with its input - arguments. If the scheme is not recognized, :meth:`open_unknown` is called. - The *data* argument has the same meaning as the *data* argument of - :func:`urlopen`. + Open *fullurl* using the appropriate protocol. This method sets up cache and + proxy information, then calls the appropriate open method with its input + arguments. If the scheme is not recognized, :meth:`open_unknown` is called. + The *data* argument has the same meaning as the *data* argument of + :func:`urlopen`. - .. method:: open_unknown(fullurl, data=None) + .. method:: open_unknown(fullurl, data=None) - Overridable interface to open unknown URL types. + Overridable interface to open unknown URL types. - .. method:: retrieve(url, filename=None, reporthook=None, data=None) + .. method:: retrieve(url, filename=None, reporthook=None, data=None) - Retrieves the contents of *url* and places it in *filename*. The return value - is a tuple consisting of a local filename and either an - :class:`email.message.Message` object containing the response headers (for remote - URLs) or ``None`` (for local URLs). The caller must then open and read the - contents of *filename*. If *filename* is not given and the URL refers to a - local file, the input filename is returned. If the URL is non-local and - *filename* is not given, the filename is the output of :func:`tempfile.mktemp` - with a suffix that matches the suffix of the last path component of the input - URL. If *reporthook* is given, it must be a function accepting three numeric - parameters: A chunk number, the maximum size chunks are read in and the total size of the download - (-1 if unknown). It will be called once at the start and after each chunk of data is read from the - network. *reporthook* is ignored for local URLs. + Retrieves the contents of *url* and places it in *filename*. The return value + is a tuple consisting of a local filename and either an + :class:`email.message.Message` object containing the response headers (for remote + URLs) or ``None`` (for local URLs). The caller must then open and read the + contents of *filename*. If *filename* is not given and the URL refers to a + local file, the input filename is returned. If the URL is non-local and + *filename* is not given, the filename is the output of :func:`tempfile.mktemp` + with a suffix that matches the suffix of the last path component of the input + URL. If *reporthook* is given, it must be a function accepting three numeric + parameters: A chunk number, the maximum size chunks are read in and the total size of the download + (-1 if unknown). It will be called once at the start and after each chunk of data is read from the + network. *reporthook* is ignored for local URLs. - If the *url* uses the :file:`http:` scheme identifier, the optional *data* - argument may be given to specify a ``POST`` request (normally the request type - is ``GET``). The *data* argument must in standard - :mimetype:`application/x-www-form-urlencoded` format; see the - :func:`urllib.parse.urlencode` function. + If the *url* uses the :file:`http:` scheme identifier, the optional *data* + argument may be given to specify a ``POST`` request (normally the request type + is ``GET``). The *data* argument must in standard + :mimetype:`application/x-www-form-urlencoded` format; see the + :func:`urllib.parse.urlencode` function. - .. attribute:: version + .. attribute:: version - Variable that specifies the user agent of the opener object. To get - :mod:`urllib` to tell servers that it is a particular user agent, set this in a - subclass as a class variable or in the constructor before calling the base - constructor. + Variable that specifies the user agent of the opener object. To get + :mod:`urllib` to tell servers that it is a particular user agent, set this in a + subclass as a class variable or in the constructor before calling the base + constructor. .. class:: FancyURLopener(...) diff --git a/Doc/library/urllib.robotparser.rst b/Doc/library/urllib.robotparser.rst index ba701c3..7d31932 100644 --- a/Doc/library/urllib.robotparser.rst +++ b/Doc/library/urllib.robotparser.rst @@ -57,15 +57,41 @@ structure of :file:`robots.txt` files, see http://www.robotstxt.org/orig.html. Sets the time the ``robots.txt`` file was last fetched to the current time. + .. method:: crawl_delay(useragent) -The following example demonstrates basic use of the RobotFileParser class. + Returns the value of the ``Crawl-delay`` parameter from ``robots.txt`` + for the *useragent* in question. If there is no such parameter or it + doesn't apply to the *useragent* specified or the ``robots.txt`` entry + for this parameter has invalid syntax, return ``None``. + + .. versionadded:: 3.6 + + .. method:: request_rate(useragent) + + Returns the contents of the ``Request-rate`` parameter from + ``robots.txt`` in the form of a :func:`~collections.namedtuple` + ``(requests, seconds)``. If there is no such parameter or it doesn't + apply to the *useragent* specified or the ``robots.txt`` entry for this + parameter has invalid syntax, return ``None``. + + .. versionadded:: 3.6 + + +The following example demonstrates basic use of the :class:`RobotFileParser` +class:: >>> import urllib.robotparser >>> rp = urllib.robotparser.RobotFileParser() >>> rp.set_url("http://www.musi-cal.com/robots.txt") >>> rp.read() + >>> rrate = rp.request_rate("*") + >>> rrate.requests + 3 + >>> rrate.seconds + 20 + >>> rp.crawl_delay("*") + 6 >>> rp.can_fetch("*", "http://www.musi-cal.com/cgi-bin/search?city=San+Francisco") False >>> rp.can_fetch("*", "http://www.musi-cal.com/") True - diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst index edbf832..53cbd6c 100644 --- a/Doc/library/uuid.rst +++ b/Doc/library/uuid.rst @@ -45,13 +45,6 @@ random UUID. variant and version number set according to RFC 4122, overriding bits in the given *hex*, *bytes*, *bytes_le*, *fields*, or *int*. - Comparison of UUID objects are made by way of comparing their - :attr:`UUID.int` attributes. Comparison with a non-UUID object - raises a :exc:`TypeError`. - - ``str(uuid)`` returns a string in the form - ``12345678-1234-5678-1234-567812345678`` where the 32 hexadecimal digits - represent the UUID. :class:`UUID` instances have these read-only attributes: @@ -111,7 +104,7 @@ random UUID. .. attribute:: UUID.variant The UUID variant, which determines the internal layout of the UUID. This will be - one of the constants :const:`RESERVED_NCS`, :const:`RFC_4122`, + one of the integer constants :const:`RESERVED_NCS`, :const:`RFC_4122`, :const:`RESERVED_MICROSOFT`, or :const:`RESERVED_FUTURE`. diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst index 0327737..17c80c8 100644 --- a/Doc/library/venv.rst +++ b/Doc/library/venv.rst @@ -37,44 +37,50 @@ Creating virtual environments .. _venv-def: -.. note:: A virtual environment (also called a ``venv``) is a Python - environment such that the Python interpreter, libraries and scripts - installed into it are isolated from those installed in other virtual - environments, and (by default) any libraries installed in a "system" Python, - i.e. one which is installed as part of your operating system. +.. note:: A virtual environment is a Python environment such that the Python + interpreter, libraries and scripts installed into it are isolated from those + installed in other virtual environments, and (by default) any libraries + installed in a "system" Python, i.e., one which is installed as part of your + operating system. - A venv is a directory tree which contains Python executable files and - other files which indicate that it is a venv. + A virtual environment is a directory tree which contains Python executable + files and other files which indicate that it is a virtual environment. Common installation tools such as ``Setuptools`` and ``pip`` work as - expected with venvs - i.e. when a venv is active, they install Python - packages into the venv without needing to be told to do so explicitly. - - When a venv is active (i.e. the venv's Python interpreter is running), the - attributes :attr:`sys.prefix` and :attr:`sys.exec_prefix` point to the base - directory of the venv, whereas :attr:`sys.base_prefix` and - :attr:`sys.base_exec_prefix` point to the non-venv Python installation - which was used to create the venv. If a venv is not active, then - :attr:`sys.prefix` is the same as :attr:`sys.base_prefix` and - :attr:`sys.exec_prefix` is the same as :attr:`sys.base_exec_prefix` (they - all point to a non-venv Python installation). - - When a venv is active, any options that change the installation path will be - ignored from all distutils configuration files to prevent projects being - inadvertently installed outside of the virtual environment. - - When working in a command shell, users can make a venv active by running an - ``activate`` script in the venv's executables directory (the precise filename - is shell-dependent), which prepends the venv's directory for executables to - the ``PATH`` environment variable for the running shell. There should be no - need in other circumstances to activate a venv -- scripts installed into - venvs have a shebang line which points to the venv's Python interpreter. This - means that the script will run with that interpreter regardless of the value - of ``PATH``. On Windows, shebang line processing is supported if you have the - Python Launcher for Windows installed (this was added to Python in 3.3 - see - :pep:`397` for more details). Thus, double-clicking an installed script in - a Windows Explorer window should run the script with the correct interpreter - without there needing to be any reference to its venv in ``PATH``. + expected with virtual environments. In other words, when a virtual + environment is active, they install Python packages into the virtual + environment without needing to be told to do so explicitly. + + When a virtual environment is active (i.e., the virtual environment's Python + interpreter is running), the attributes :attr:`sys.prefix` and + :attr:`sys.exec_prefix` point to the base directory of the virtual + environment, whereas :attr:`sys.base_prefix` and + :attr:`sys.base_exec_prefix` point to the non-virtual environment Python + installation which was used to create the virtual environment. If a virtual + environment is not active, then :attr:`sys.prefix` is the same as + :attr:`sys.base_prefix` and :attr:`sys.exec_prefix` is the same as + :attr:`sys.base_exec_prefix` (they all point to a non-virtual environment + Python installation). + + When a virtual environment is active, any options that change the + installation path will be ignored from all distutils configuration files to + prevent projects being inadvertently installed outside of the virtual + environment. + + When working in a command shell, users can make a virtual environment active + by running an ``activate`` script in the virtual environment's executables + directory (the precise filename is shell-dependent), which prepends the + virtual environment's directory for executables to the ``PATH`` environment + variable for the running shell. There should be no need in other + circumstances to activate a virtual environment—scripts installed into + virtual environments have a "shebang" line which points to the virtual + environment's Python interpreter. This means that the script will run with + that interpreter regardless of the value of ``PATH``. On Windows, "shebang" + line processing is supported if you have the Python Launcher for Windows + installed (this was added to Python in 3.3 - see :pep:`397` for more + details). Thus, double-clicking an installed script in a Windows Explorer + window should run the script with the correct interpreter without there + needing to be any reference to its virtual environment in ``PATH``. .. _venv-api: @@ -89,7 +95,8 @@ mechanisms for third-party virtual environment creators to customize environment creation according to their needs, the :class:`EnvBuilder` class. .. class:: EnvBuilder(system_site_packages=False, clear=False, \ - symlinks=False, upgrade=False, with_pip=False) + symlinks=False, upgrade=False, with_pip=False, \ + prompt=None) The :class:`EnvBuilder` class accepts the following keyword arguments on instantiation: @@ -113,9 +120,16 @@ creation according to their needs, the :class:`EnvBuilder` class. installed in the virtual environment. This uses :mod:`ensurepip` with the ``--default-pip`` option. + * ``prompt`` -- a String to be used after virtual environment is activated + (defaults to ``None`` which means directory name of the environment would + be used). + .. versionchanged:: 3.4 Added the ``with_pip`` parameter + .. versionadded:: 3.6 + Added the ``prompt`` parameter + Creators of third-party virtual environment tools will be free to use the provided ``EnvBuilder`` class as a base class. @@ -225,7 +239,7 @@ An example of extending ``EnvBuilder`` -------------------------------------- The following script shows how to extend :class:`EnvBuilder` by implementing a -subclass which installs setuptools and pip into a created venv:: +subclass which installs setuptools and pip into a created virtual environment:: import os import os.path @@ -239,12 +253,12 @@ subclass which installs setuptools and pip into a created venv:: class ExtendedEnvBuilder(venv.EnvBuilder): """ This builder installs setuptools and pip so that you can pip or - easy_install other packages into the created environment. + easy_install other packages into the created virtual environment. :param nodist: If True, setuptools and pip are not installed into the - created environment. + created virtual environment. :param nopip: If True, pip is not installed into the created - environment. + virtual environment. :param progress: If setuptools or pip are installed, the progress of the installation can be monitored by passing a progress callable. If specified, it is called with two @@ -270,10 +284,10 @@ subclass which installs setuptools and pip into a created venv:: def post_setup(self, context): """ Set up any packages which need to be pre-installed into the - environment being created. + virtual environment being created. - :param context: The information for the environment creation request - being processed. + :param context: The information for the virtual environment + creation request being processed. """ os.environ['VIRTUAL_ENV'] = context.env_dir if not self.nodist: @@ -307,7 +321,7 @@ subclass which installs setuptools and pip into a created venv:: fn = os.path.split(path)[-1] binpath = context.bin_path distpath = os.path.join(binpath, fn) - # Download script into the env's binaries folder + # Download script into the virtual environment's binaries folder urlretrieve(url, distpath) progress = self.progress if self.verbose: @@ -319,7 +333,7 @@ subclass which installs setuptools and pip into a created venv:: else: sys.stderr.write('Installing %s ...%s' % (name, term)) sys.stderr.flush() - # Install in the env + # Install in the virtual environment args = [context.env_exe, fn] p = Popen(args, stdout=PIPE, stderr=PIPE, cwd=binpath) t1 = Thread(target=self.reader, args=(p.stdout, 'stdout')) @@ -338,10 +352,10 @@ subclass which installs setuptools and pip into a created venv:: def install_setuptools(self, context): """ - Install setuptools in the environment. + Install setuptools in the virtual environment. - :param context: The information for the environment creation request - being processed. + :param context: The information for the virtual environment + creation request being processed. """ url = 'https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py' self.install_script(context, 'setuptools', url) @@ -354,10 +368,10 @@ subclass which installs setuptools and pip into a created venv:: def install_pip(self, context): """ - Install pip in the environment. + Install pip in the virtual environment. - :param context: The information for the environment creation request - being processed. + :param context: The information for the virtual environment + creation request being processed. """ url = 'https://raw.github.com/pypa/pip/master/contrib/get-pip.py' self.install_script(context, 'pip', url) @@ -380,7 +394,8 @@ subclass which installs setuptools and pip into a created venv:: 'more target ' 'directories.') parser.add_argument('dirs', metavar='ENV_DIR', nargs='+', - help='A directory to create the environment in.') + help='A directory in which to create the + 'virtual environment.') parser.add_argument('--no-setuptools', default=False, action='store_true', dest='nodist', help="Don't install setuptools or pip in the " @@ -404,14 +419,17 @@ subclass which installs setuptools and pip into a created venv:: 'the platform.') parser.add_argument('--clear', default=False, action='store_true', dest='clear', help='Delete the contents of the ' - 'environment directory if it ' - 'already exists, before ' + 'virtual environment ' + 'directory if it already ' + 'exists, before virtual ' 'environment creation.') parser.add_argument('--upgrade', default=False, action='store_true', - dest='upgrade', help='Upgrade the environment ' - 'directory to use this version ' - 'of Python, assuming Python ' - 'has been upgraded in-place.') + dest='upgrade', help='Upgrade the virtual ' + 'environment directory to ' + 'use this version of ' + 'Python, assuming Python ' + 'has been upgraded ' + 'in-place.') parser.add_argument('--verbose', default=False, action='store_true', dest='verbose', help='Display the output ' 'from the scripts which ' diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index cec55f1..f67f4bc 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -301,7 +301,7 @@ Available Functions ------------------- -.. function:: warn(message, category=None, stacklevel=1) +.. function:: warn(message, category=None, stacklevel=1, source=None) Issue a warning, or maybe ignore it or raise an exception. The *category* argument, if given, must be a warning category class (see above); it defaults to @@ -319,8 +319,14 @@ Available Functions source of :func:`deprecation` itself (since the latter would defeat the purpose of the warning message). + *source*, if supplied, is the destroyed object which emitted a + :exc:`ResourceWarning`. -.. function:: warn_explicit(message, category, filename, lineno, module=None, registry=None, module_globals=None) + .. versionchanged:: 3.6 + Added *source* parameter. + + +.. function:: warn_explicit(message, category, filename, lineno, module=None, registry=None, module_globals=None, source=None) This is a low-level interface to the functionality of :func:`warn`, passing in explicitly the message, category, filename and line number, and optionally the @@ -336,6 +342,12 @@ Available Functions source for modules found in zipfiles or other non-filesystem import sources). + *source*, if supplied, is the destroyed object which emitted a + :exc:`ResourceWarning`. + + .. versionchanged:: 3.6 + Add the *source* parameter. + .. function:: showwarning(message, category, filename, lineno, file=None, line=None) diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst index b02a006..e289b97 100644 --- a/Doc/library/weakref.rst +++ b/Doc/library/weakref.rst @@ -166,8 +166,8 @@ Extension types can easily be made to support weak references; see performed by the program during iteration may cause items in the dictionary to vanish "by magic" (as a side effect of garbage collection). -:class:`WeakKeyDictionary` objects have an additional method that -exposes the internal references directly. The references are not guaranteed to +:class:`WeakKeyDictionary` objects have the following additional methods. These +expose the internal references directly. The references are not guaranteed to be "live" at the time they are used, so the result of calling the references needs to be checked before being used. This can be used to avoid creating references that will cause the garbage collector to keep the keys around longer @@ -192,9 +192,9 @@ than needed. by the program during iteration may cause items in the dictionary to vanish "by magic" (as a side effect of garbage collection). -:class:`WeakValueDictionary` objects have an additional method that has the -same issues as the :meth:`keyrefs` method of :class:`WeakKeyDictionary` -objects. +:class:`WeakValueDictionary` objects have the following additional methods. +These method have the same issues as the and :meth:`keyrefs` method of +:class:`WeakKeyDictionary` objects. .. method:: WeakValueDictionary.valuerefs() diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst index 767ea31..14f7896 100644 --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -635,7 +635,7 @@ For more information, see `Registry Value Types .. data:: REG_DWORD_LITTLE_ENDIAN - A 32-bit number in little-endian format. + A 32-bit number in little-endian format. Equivalent to :const:`REG_DWORD`. .. data:: REG_DWORD_BIG_ENDIAN @@ -659,6 +659,18 @@ For more information, see `Registry Value Types No defined value type. +.. data:: REG_QWORD + + A 64-bit number. + + .. versionadded:: 3.6 + +.. data:: REG_QWORD_LITTLE_ENDIAN + + A 64-bit number in little-endian format. Equivalent to :const:`REG_QWORD`. + + .. versionadded:: 3.6 + .. data:: REG_RESOURCE_LIST A device-driver resource list. diff --git a/Doc/library/winsound.rst b/Doc/library/winsound.rst index d2c4210..372f792 100644 --- a/Doc/library/winsound.rst +++ b/Doc/library/winsound.rst @@ -25,7 +25,8 @@ provided by Windows platforms. It includes functions and several constants. .. function:: PlaySound(sound, flags) Call the underlying :c:func:`PlaySound` function from the Platform API. The - *sound* parameter may be a filename, audio data as a string, or ``None``. Its + *sound* parameter may be a filename, a system sound alias, audio data as a + :term:`bytes-like object`, or ``None``. Its interpretation depends on the value of *flags*, which can be a bitwise ORed combination of the constants described below. If the *sound* parameter is ``None``, any currently playing waveform sound is stopped. If the system @@ -39,7 +40,8 @@ provided by Windows platforms. It includes functions and several constants. sound to play; possible values are ``-1``, ``MB_ICONASTERISK``, ``MB_ICONEXCLAMATION``, ``MB_ICONHAND``, ``MB_ICONQUESTION``, and ``MB_OK``, all described below. The value ``-1`` produces a "simple beep"; this is the final - fallback if a sound cannot be played otherwise. + fallback if a sound cannot be played otherwise. If the system indicates an + error, :exc:`RuntimeError` is raised. .. data:: SND_FILENAME @@ -92,7 +94,7 @@ provided by Windows platforms. It includes functions and several constants. .. data:: SND_MEMORY The *sound* parameter to :func:`PlaySound` is a memory image of a WAV file, as a - string. + :term:`bytes-like object`. .. note:: diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index aad27a8..a1d4469 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -133,9 +133,9 @@ parameter expect a WSGI-compliant dictionary to be supplied; please see for key, value in environ.items()] return ret - httpd = make_server('', 8000, simple_app) - print("Serving on port 8000...") - httpd.serve_forever() + with make_server('', 8000, simple_app) as httpd: + print("Serving on port 8000...") + httpd.serve_forever() In addition to the environment functions above, the :mod:`wsgiref.util` module @@ -285,14 +285,14 @@ request. (E.g., using the :func:`shift_path_info` function from from wsgiref.simple_server import make_server, demo_app - httpd = make_server('', 8000, demo_app) - print("Serving HTTP on port 8000...") + with make_server('', 8000, demo_app) as httpd: + print("Serving HTTP on port 8000...") - # Respond to requests until process is killed - httpd.serve_forever() + # Respond to requests until process is killed + httpd.serve_forever() - # Alternative: serve one request, then exit - httpd.handle_request() + # Alternative: serve one request, then exit + httpd.handle_request() .. function:: demo_app(environ, start_response) @@ -432,9 +432,9 @@ Paste" library. # This is the application wrapped in a validator validator_app = validator(simple_app) - httpd = make_server('', 8000, validator_app) - print("Listening on port 8000....") - httpd.serve_forever() + with make_server('', 8000, validator_app) as httpd: + print("Listening on port 8000....") + httpd.serve_forever() :mod:`wsgiref.handlers` -- server/gateway base classes @@ -774,8 +774,8 @@ This is a working "Hello World" WSGI application:: # The returned object is going to be printed return [b"Hello World"] - httpd = make_server('', 8000, hello_world_app) - print("Serving on port 8000...") + with make_server('', 8000, hello_world_app) as httpd: + print("Serving on port 8000...") - # Serve until process is killed - httpd.serve_forever() + # Serve until process is killed + httpd.serve_forever() diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst index 40470e8..2e9e814 100644 --- a/Doc/library/xml.dom.minidom.rst +++ b/Doc/library/xml.dom.minidom.rst @@ -248,7 +248,7 @@ utility to most DOM users. .. rubric:: Footnotes -.. [1] The encoding name included in the XML output should conform to +.. [#] The encoding name included in the XML output should conform to the appropriate standards. For example, "UTF-8" is valid, but "UTF8" is not valid in an XML document's declaration, even though Python accepts it as an encoding name. diff --git a/Doc/library/xml.dom.pulldom.rst b/Doc/library/xml.dom.pulldom.rst index 5c0f469..b502554 100644 --- a/Doc/library/xml.dom.pulldom.rst +++ b/Doc/library/xml.dom.pulldom.rst @@ -108,7 +108,7 @@ DOMEventStream Objects :class:`xml.dom.minidom.Element` if event equals :data:`START_ELEMENT` or :data:`END_ELEMENT` or :class:`xml.dom.minidom.Text` if event equals :data:`CHARACTERS`. - The current node does not contain information about its children, unless + The current node does not contain informations about its children, unless :func:`expandNode` is called. .. method:: expandNode(node) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst index 7d814ad..b54eace 100644 --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -1192,7 +1192,7 @@ Exceptions .. rubric:: Footnotes -.. [1] The encoding string included in XML output should conform to the +.. [#] The encoding string included in XML output should conform to the appropriate standards. For example, "UTF-8" is valid, but "UTF8" is not. See https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl and https://www.iana.org/assignments/character-sets/character-sets.xhtml. diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst index dad7a02..390828e 100644 --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -88,9 +88,13 @@ between conformable Python objects and XML on the wire. +======================+=======================================================+ | ``boolean`` | :class:`bool` | +----------------------+-------------------------------------------------------+ - | ``int`` or ``i4`` | :class:`int` in range from -2147483648 to 2147483647. | + | ``int``, ``i1``, | :class:`int` in range from -2147483648 to 2147483647. | + | ``i2``, ``i4``, | Values get the ```` tag. | + | ``i8`` or | | + | ``biginteger`` | | +----------------------+-------------------------------------------------------+ - | ``double`` | :class:`float` | + | ``double`` or | :class:`float`. Values get the ```` tag. | + | ``float`` | | +----------------------+-------------------------------------------------------+ | ``string`` | :class:`str` | +----------------------+-------------------------------------------------------+ @@ -114,6 +118,8 @@ between conformable Python objects and XML on the wire. | ``nil`` | The ``None`` constant. Passing is allowed only if | | | *allow_none* is true. | +----------------------+-------------------------------------------------------+ + | ``bigdecimal`` | :class:`decimal.Decimal`. Returned type only. | + +----------------------+-------------------------------------------------------+ This is the full set of data types supported by XML-RPC. Method calls may also raise a special :exc:`Fault` instance, used to signal XML-RPC server errors, or @@ -137,6 +143,13 @@ between conformable Python objects and XML on the wire. .. versionchanged:: 3.5 Added the *context* argument. + .. versionchanged:: 3.6 + Added support of type tags with prefixes (e.g. ``ex:nil``). + Added support of unmarsalling additional types used by Apache XML-RPC + implementation for numerics: ``i1``, ``i2``, ``i8``, ``biginteger``, + ``float`` and ``bigdecimal``. + See http://ws.apache.org/xmlrpc/types.html for a description. + .. seealso:: diff --git a/Doc/library/xmlrpc.server.rst b/Doc/library/xmlrpc.server.rst index 1c77e84..0511ddf 100644 --- a/Doc/library/xmlrpc.server.rst +++ b/Doc/library/xmlrpc.server.rst @@ -148,29 +148,29 @@ Server code:: rpc_paths = ('/RPC2',) # Create server - server = SimpleXMLRPCServer(("localhost", 8000), - requestHandler=RequestHandler) - server.register_introspection_functions() + with SimpleXMLRPCServer(("localhost", 8000), + requestHandler=RequestHandler) as server: + server.register_introspection_functions() - # Register pow() function; this will use the value of - # pow.__name__ as the name, which is just 'pow'. - server.register_function(pow) + # Register pow() function; this will use the value of + # pow.__name__ as the name, which is just 'pow'. + server.register_function(pow) - # Register a function under a different name - def adder_function(x,y): - return x + y - server.register_function(adder_function, 'add') + # Register a function under a different name + def adder_function(x,y): + return x + y + server.register_function(adder_function, 'add') - # Register an instance; all the methods of the instance are - # published as XML-RPC methods (in this case, just 'mul'). - class MyFuncs: - def mul(self, x, y): - return x * y + # Register an instance; all the methods of the instance are + # published as XML-RPC methods (in this case, just 'mul'). + class MyFuncs: + def mul(self, x, y): + return x * y - server.register_instance(MyFuncs()) + server.register_instance(MyFuncs()) - # Run the server's main loop - server.serve_forever() + # Run the server's main loop + server.serve_forever() The following client code will call the methods made available by the preceding server:: @@ -207,18 +207,17 @@ a server allowing dotted names and registering a multicall function. def getCurrentTime(): return datetime.datetime.now() - server = SimpleXMLRPCServer(("localhost", 8000)) - server.register_function(pow) - server.register_function(lambda x,y: x+y, 'add') - server.register_instance(ExampleService(), allow_dotted_names=True) - server.register_multicall_functions() - print('Serving XML-RPC on localhost port 8000') - try: - server.serve_forever() - except KeyboardInterrupt: - print("\nKeyboard interrupt received, exiting.") - server.server_close() - sys.exit(0) + with SimpleXMLRPCServer(("localhost", 8000)) as server: + server.register_function(pow) + server.register_function(lambda x,y: x+y, 'add') + server.register_instance(ExampleService(), allow_dotted_names=True) + server.register_multicall_functions() + print('Serving XML-RPC on localhost port 8000') + try: + server.serve_forever() + except KeyboardInterrupt: + print("\nKeyboard interrupt received, exiting.") + sys.exit(0) This ExampleService demo can be invoked from the command line:: diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst index 629b7ed..9056489 100644 --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@ -147,12 +147,12 @@ ZipFile Objects *compression* is the ZIP compression method to use when writing the archive, and should be :const:`ZIP_STORED`, :const:`ZIP_DEFLATED`, :const:`ZIP_BZIP2` or :const:`ZIP_LZMA`; unrecognized - values will cause :exc:`RuntimeError` to be raised. If :const:`ZIP_DEFLATED`, + values will cause :exc:`NotImplementedError` to be raised. If :const:`ZIP_DEFLATED`, :const:`ZIP_BZIP2` or :const:`ZIP_LZMA` is specified but the corresponding module (:mod:`zlib`, :mod:`bz2` or :mod:`lzma`) is not available, :exc:`RuntimeError` - is also raised. The default is :const:`ZIP_STORED`. If *allowZip64* is + is raised. The default is :const:`ZIP_STORED`. If *allowZip64* is ``True`` (the default) zipfile will create ZIP files that use the ZIP64 - extensions when the zipfile is larger than 4 GiB. If it is false :mod:`zipfile` + extensions when the zipfile is larger than 2 GiB. If it is false :mod:`zipfile` will raise an exception when the ZIP file would require ZIP64 extensions. If the file is created with mode ``'w'``, ``'x'`` or ``'a'`` and then @@ -179,6 +179,10 @@ ZipFile Objects Added support for writing to unseekable streams. Added support for the ``'x'`` mode. + .. versionchanged:: 3.6 + Previously, a plain :exc:`RuntimeError` was raised for unrecognized + compression values. + .. method:: ZipFile.close() @@ -205,18 +209,12 @@ ZipFile Objects Return a list of archive members by name. -.. index:: - single: universal newlines; zipfile.ZipFile.open method - -.. method:: ZipFile.open(name, mode='r', pwd=None) +.. method:: ZipFile.open(name, mode='r', pwd=None, *, force_zip64=False) - Extract a member from the archive as a file-like object (ZipExtFile). *name* - is the name of the file in the archive, or a :class:`ZipInfo` object. The - *mode* parameter, if included, must be one of the following: ``'r'`` (the - default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable - :term:`universal newlines` support in the read-only object. *pwd* is the - password used for encrypted files. Calling :meth:`.open` on a closed - ZipFile will raise a :exc:`RuntimeError`. + Access a member of the archive as a binary file-like object. *name* + can be either the name of a file within the archive or a :class:`ZipInfo` + object. The *mode* parameter, if included, must be ``'r'`` (the default) + or ``'w'``. *pwd* is the password used to decrypt encrypted ZIP files. :meth:`~ZipFile.open` is also a context manager and therefore supports the :keyword:`with` statement:: @@ -225,17 +223,23 @@ ZipFile Objects with myzip.open('eggs.txt') as myfile: print(myfile.read()) - .. note:: + With *mode* ``'r'`` the file-like object + (``ZipExtFile``) is read-only and provides the following methods: + :meth:`~io.BufferedIOBase.read`, :meth:`~io.IOBase.readline`, + :meth:`~io.IOBase.readlines`, :meth:`__iter__`, + :meth:`~iterator.__next__`. These objects can operate independently of + the ZipFile. - The file-like object is read-only and provides the following methods: - :meth:`~io.BufferedIOBase.read`, :meth:`~io.IOBase.readline`, - :meth:`~io.IOBase.readlines`, :meth:`__iter__`, - :meth:`~iterator.__next__`. + With ``mode='w'``, a writable file handle is returned, which supports the + :meth:`~io.BufferedIOBase.write` method. While a writable file handle is open, + attempting to read or write other files in the ZIP file will raise a + :exc:`ValueError`. - .. note:: - - Objects returned by :meth:`.open` can operate independently of the - ZipFile. + When writing a file, if the file size is not known in advance but may exceed + 2 GiB, pass ``force_zip64=True`` to ensure that the header format is + capable of supporting large files. If the file size is known in advance, + construct a :class:`ZipInfo` object with :attr:`~ZipInfo.file_size` set, and + use that as the *name* parameter. .. note:: @@ -243,10 +247,19 @@ ZipFile Objects or a :class:`ZipInfo` object. You will appreciate this when trying to read a ZIP file that contains members with duplicate names. - .. deprecated-removed:: 3.4 3.6 - The ``'U'`` or ``'rU'`` mode. Use :class:`io.TextIOWrapper` for reading + .. versionchanged:: 3.6 + Removed support of ``mode='U'``. Use :class:`io.TextIOWrapper` for reading compressed text files in :term:`universal newlines` mode. + .. versionchanged:: 3.6 + :meth:`open` can now be used to write files into the archive with the + ``mode='w'`` option. + + .. versionchanged:: 3.6 + Calling :meth:`.open` on a closed ZipFile will raise a :exc:`ValueError`. + Previously, a :exc:`RuntimeError` was raised. + + .. method:: ZipFile.extract(member, path=None, pwd=None) Extract a member from the archive to the current working directory; *member* @@ -267,6 +280,10 @@ ZipFile Objects characters (``:``, ``<``, ``>``, ``|``, ``"``, ``?``, and ``*``) replaced by underscore (``_``). + .. versionchanged:: 3.6 + Calling :meth:`extract` on a closed ZipFile will raise a + :exc:`ValueError`. Previously, a :exc:`RuntimeError` was raised. + .. method:: ZipFile.extractall(path=None, members=None, pwd=None) @@ -283,6 +300,10 @@ ZipFile Objects dots ``".."``. This module attempts to prevent that. See :meth:`extract` note. + .. versionchanged:: 3.6 + Calling :meth:`extractall` on a closed ZipFile will raise a + :exc:`ValueError`. Previously, a :exc:`RuntimeError` was raised. + .. method:: ZipFile.printdir() @@ -300,18 +321,24 @@ ZipFile Objects file in the archive, or a :class:`ZipInfo` object. The archive must be open for read or append. *pwd* is the password used for encrypted files and, if specified, it will override the default password set with :meth:`setpassword`. Calling - :meth:`read` on a closed ZipFile will raise a :exc:`RuntimeError`. Calling :meth:`read` on a ZipFile that uses a compression method other than :const:`ZIP_STORED`, :const:`ZIP_DEFLATED`, :const:`ZIP_BZIP2` or :const:`ZIP_LZMA` will raise a :exc:`NotImplementedError`. An error will also be raised if the corresponding compression module is not available. + .. versionchanged:: 3.6 + Calling :meth:`read` on a closed ZipFile will raise a :exc:`ValueError`. + Previously, a :exc:`RuntimeError` was raised. + .. method:: ZipFile.testzip() Read all the files in the archive and check their CRC's and file headers. - Return the name of the first bad file, or else return ``None``. Calling - :meth:`testzip` on a closed ZipFile will raise a :exc:`RuntimeError`. + Return the name of the first bad file, or else return ``None``. + + .. versionchanged:: 3.6 + Calling :meth:`testfile` on a closed ZipFile will raise a + :exc:`ValueError`. Previously, a :exc:`RuntimeError` was raised. .. method:: ZipFile.write(filename, arcname=None, compress_type=None) @@ -321,10 +348,7 @@ ZipFile Objects letter and with leading path separators removed). If given, *compress_type* overrides the value given for the *compression* parameter to the constructor for the new entry. - The archive must be open with mode ``'w'``, ``'x'`` or ``'a'`` -- calling - :meth:`write` on a ZipFile created with mode ``'r'`` will raise a - :exc:`RuntimeError`. Calling :meth:`write` on a closed ZipFile will raise a - :exc:`RuntimeError`. + The archive must be open with mode ``'w'``, ``'x'`` or ``'a'``. .. note:: @@ -343,16 +367,19 @@ ZipFile Objects If ``arcname`` (or ``filename``, if ``arcname`` is not given) contains a null byte, the name of the file in the archive will be truncated at the null byte. + .. versionchanged:: 3.6 + Calling :meth:`write` on a ZipFile created with mode ``'r'`` or + a closed ZipFile will raise a :exc:`ValueError`. Previously, + a :exc:`RuntimeError` was raised. + + .. method:: ZipFile.writestr(zinfo_or_arcname, data[, compress_type]) Write the string *data* to the archive; *zinfo_or_arcname* is either the file name it will be given in the archive, or a :class:`ZipInfo` instance. If it's an instance, at least the filename, date, and time must be given. If it's a name, the date and time is set to the current date and time. - The archive must be opened with mode ``'w'``, ``'x'`` or ``'a'`` -- calling - :meth:`writestr` on a ZipFile created with mode ``'r'`` will raise a - :exc:`RuntimeError`. Calling :meth:`writestr` on a closed ZipFile will - raise a :exc:`RuntimeError`. + The archive must be opened with mode ``'w'``, ``'x'`` or ``'a'``. If given, *compress_type* overrides the value given for the *compression* parameter to the constructor for the new entry, or in the *zinfo_or_arcname* @@ -368,6 +395,12 @@ ZipFile Objects .. versionchanged:: 3.2 The *compress_type* argument. + .. versionchanged:: 3.6 + Calling :meth:`writestr` on a ZipFile created with mode ``'r'`` or + a closed ZipFile will raise a :exc:`ValueError`. Previously, + a :exc:`RuntimeError` was raised. + + The following data attributes are also available: @@ -418,12 +451,12 @@ The :class:`PyZipFile` constructor takes the same parameters as the added to the archive, compiling if necessary. If *pathname* is a file, the filename must end with :file:`.py`, and - just the (corresponding :file:`\*.pyc`) file is added at the top level + just the (corresponding :file:`\*.py[co]`) file is added at the top level (no path information). If *pathname* is a file that does not end with :file:`.py`, a :exc:`RuntimeError` will be raised. If it is a directory, and the directory is not a package directory, then all the files - :file:`\*.pyc` are added at the top level. If the directory is a - package directory, then all :file:`\*.pyc` are added under the package + :file:`\*.py[co]` are added at the top level. If the directory is a + package directory, then all :file:`\*.py[co]` are added under the package name as a file path, and if any subdirectories are package directories, all of these are added recursively. @@ -465,7 +498,31 @@ Instances of the :class:`ZipInfo` class are returned by the :meth:`.getinfo` and :meth:`.infolist` methods of :class:`ZipFile` objects. Each object stores information about a single member of the ZIP archive. -Instances have the following attributes: +There is one classmethod to make a :class:`ZipInfo` instance for a filesystem +file: + +.. classmethod:: ZipInfo.from_file(filename, arcname=None) + + Construct a :class:`ZipInfo` instance for a file on the filesystem, in + preparation for adding it to a zip file. + + *filename* should be the path to a file or directory on the filesystem. + + If *arcname* is specified, it is used as the name within the archive. + If *arcname* is not specified, the name will be the same as *filename*, but + with any drive letter and leading path separators removed. + + .. versionadded:: 3.6 + +Instances have the following methods and attributes: + +.. method:: ZipInfo.is_dir() + + Return ``True`` if this archive member is a directory. + + This uses the entry's name: directories should always end with ``/``. + + .. versionadded:: 3.6 .. attribute:: ZipInfo.filename diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index eaae2bb..46b8c24 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -9,7 +9,7 @@ -------------- This module adds the ability to import Python modules (:file:`\*.py`, -:file:`\*.pyc`) and packages from ZIP-format archives. It is usually not +:file:`\*.py[co]`) and packages from ZIP-format archives. It is usually not needed to use the :mod:`zipimport` module explicitly; it is automatically used by the built-in :keyword:`import` mechanism for :data:`sys.path` items that are paths to ZIP archives. diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst index 1de7bae..3d742ab 100644 --- a/Doc/library/zlib.rst +++ b/Doc/library/zlib.rst @@ -47,14 +47,19 @@ The available exception and functions in this module are: platforms, use ``adler32(data) & 0xffffffff``. -.. function:: compress(data[, level]) +.. function:: compress(data, level=-1) Compresses the bytes in *data*, returning a bytes object containing compressed data. - *level* is an integer from ``0`` to ``9`` controlling the level of compression; + *level* is an integer from ``0`` to ``9`` or ``-1`` controlling the level of compression; ``1`` is fastest and produces the least compression, ``9`` is slowest and - produces the most. ``0`` is no compression. The default value is ``6``. + produces the most. ``0`` is no compression. The default value is ``-1`` + (Z_DEFAULT_COMPRESSION). Z_DEFAULT_COMPRESSION represents a default + compromise between speed and compression (currently equivalent to level 6). Raises the :exc:`error` exception if any error occurs. + .. versionchanged:: 3.6 + *level* can now be used as a keyword parameter. + .. function:: compressobj(level=-1, method=DEFLATED, wbits=15, memLevel=8, strategy=Z_DEFAULT_STRATEGY[, zdict]) @@ -124,7 +129,7 @@ The available exception and functions in this module are: platforms, use ``crc32(data) & 0xffffffff``. -.. function:: decompress(data[, wbits[, bufsize]]) +.. function:: decompress(data, wbits=MAX_WBITS, bufsize=DEF_BUF_SIZE) Decompresses the bytes in *data*, returning a bytes object containing the uncompressed data. The *wbits* parameter depends on @@ -159,14 +164,16 @@ The available exception and functions in this module are: When decompressing a stream, the window size must not be smaller than the size originally used to compress the stream; using a too-small value may result in an :exc:`error` exception. The default *wbits* value - is 15, which corresponds to the largest window size and requires a zlib - header and trailer to be included. + corresponds to the largest window size and requires a zlib header and + trailer to be included. *bufsize* is the initial size of the buffer used to hold decompressed data. If more space is required, the buffer size will be increased as needed, so you don't have to get this value exactly right; tuning it will only save a few calls - to :c:func:`malloc`. The default size is 16384. + to :c:func:`malloc`. + .. versionchanged:: 3.6 + *wbits* and *bufsize* can be used as keyword arguments. .. function:: decompressobj(wbits=15[, zdict]) @@ -252,7 +259,7 @@ Decompression objects support the following methods and attributes: .. versionadded:: 3.3 -.. method:: Decompress.decompress(data[, max_length]) +.. method:: Decompress.decompress(data, max_length=0) Decompress *data*, returning a bytes object containing the uncompressed data corresponding to at least part of the data in *string*. This data should be @@ -264,9 +271,11 @@ Decompression objects support the following methods and attributes: no longer than *max_length*. This may mean that not all of the compressed input can be processed; and unconsumed data will be stored in the attribute :attr:`unconsumed_tail`. This bytestring must be passed to a subsequent call to - :meth:`decompress` if decompression is to continue. If *max_length* is not - supplied then the whole input is decompressed, and :attr:`unconsumed_tail` is - empty. + :meth:`decompress` if decompression is to continue. If *max_length* is zero + then the whole input is decompressed, and :attr:`unconsumed_tail` is empty. + + .. versionchanged:: 3.6 + *max_length* can be used as a keyword argument. .. method:: Decompress.flush([length]) diff --git a/Doc/license.rst b/Doc/license.rst index 49d29ce..8843116 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -87,7 +87,7 @@ PSF LICENSE AGREEMENT FOR PYTHON |release| analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2017 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. diff --git a/Doc/make.bat b/Doc/make.bat index 740f148..da1f876 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -40,7 +40,7 @@ if "%1" == "clean" ( goto end ) -%SPHINXBUILD% 2> nul +%SPHINXBUILD% >nul 2> nul if errorlevel 9009 ( echo. echo.The 'sphinx-build' command was not found. Make sure you have Sphinx @@ -86,7 +86,7 @@ goto end :build if NOT "%PAPER%" == "" ( - set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% + set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS% ) cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 88b94ea..4b425a4 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -471,10 +471,10 @@ A function definition defines a user-defined function object (see section decorators: `decorator`+ decorator: "@" `dotted_name` ["(" [`argument_list` [","]] ")"] NEWLINE dotted_name: `identifier` ("." `identifier`)* - parameter_list: (`defparameter` ",")* - : | "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`] - : | "**" `parameter` - : | `defparameter` [","] ) + parameter_list: `defparameter` ("," `defparameter`)* ["," [`parameter_list_starargs`]] + : | `parameter_list_starargs` + parameter_list_starargs: "*" [`parameter`] ("," `defparameter`)* ["," ["**" `parameter` [","]]] + : | "**" `parameter` [","] parameter: `identifier` [":" `expression`] defparameter: `parameter` ["=" `expression`] funcname: `identifier` @@ -546,11 +546,12 @@ Function call semantics are described in more detail in section :ref:`calls`. A function call always assigns values to all parameters mentioned in the parameter list, either from position arguments, from keyword arguments, or from default values. If the form "``*identifier``" is present, it is initialized to a tuple -receiving any excess positional parameters, defaulting to the empty tuple. If -the form "``**identifier``" is present, it is initialized to a new dictionary -receiving any excess keyword arguments, defaulting to a new empty dictionary. -Parameters after "``*``" or "``*identifier``" are keyword-only parameters and -may only be passed used keyword arguments. +receiving any excess positional parameters, defaulting to the empty tuple. +If the form "``**identifier``" is present, it is initialized to a new +ordered mapping receiving any excess keyword arguments, defaulting to a +new empty mapping of the same type. Parameters after "``*``" or +"``*identifier``" are keyword-only parameters and may only be passed +used keyword arguments. .. index:: pair: function; annotations @@ -632,6 +633,11 @@ list for the base classes and the saved local namespace for the attribute dictionary. The class name is bound to this class object in the original local namespace. +The order in which attributes are defined in the class body is preserved +in the new class's ``__dict__``. Note that this is reliable only right +after the class is created and only for classes that were defined using +the definition syntax. + Class creation can be customized heavily using :ref:`metaclasses `. Classes can also be decorated: just like when decorating functions, :: @@ -691,7 +697,7 @@ coroutine bodies. Functions defined with ``async def`` syntax are always coroutine functions, even if they do not contain ``await`` or ``async`` keywords. -It is a :exc:`SyntaxError` to use :keyword:`yield` expressions in +It is a :exc:`SyntaxError` to use ``yield from`` expressions in ``async def`` coroutines. An example of a coroutine function:: diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index d015da2..82e35e5 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -627,6 +627,25 @@ Callable types as well as :keyword:`async with` and :keyword:`async for` statements. See also the :ref:`coroutine-objects` section. + Asynchronous generator functions + .. index:: + single: asynchronous generator; function + single: asynchronous generator; asynchronous iterator + + A function or method which is defined using :keyword:`async def` and + which uses the :keyword:`yield` statement is called a + :dfn:`asynchronous generator function`. Such a function, when called, + returns an asynchronous iterator object which can be used in an + :keyword:`async for` statement to execute the body of the function. + + Calling the asynchronous iterator's :meth:`aiterator.__anext__` method + will return an :term:`awaitable` which when awaited + will execute until it provides a value using the :keyword:`yield` + expression. When the function executes an empty :keyword:`return` + statement or falls off the end, a :exc:`StopAsyncIteration` exception + is raised and the asynchronous iterator will have reached the end of + the set of values to be yielded. + Built-in functions .. index:: object: built-in function @@ -686,33 +705,36 @@ Modules Attribute assignment updates the module's namespace dictionary, e.g., ``m.x = 1`` is equivalent to ``m.__dict__["x"] = 1``. - .. index:: single: __dict__ (module attribute) - - Special read-only attribute: :attr:`~object.__dict__` is the module's namespace as a - dictionary object. - - .. impl-detail:: - - Because of the way CPython clears module dictionaries, the module - dictionary will be cleared when the module falls out of scope even if the - dictionary still has live references. To avoid this, copy the dictionary - or keep the module around while using its dictionary directly. - .. index:: single: __name__ (module attribute) single: __doc__ (module attribute) single: __file__ (module attribute) + single: __annotations__ (module attribute) pair: module; namespace Predefined (writable) attributes: :attr:`__name__` is the module's name; :attr:`__doc__` is the module's documentation string, or ``None`` if - unavailable; :attr:`__file__` is the pathname of the file from which the + unavailable; :attr:`__annotations__` (optional) is a dictionary containing + :term:`variable annotations ` collected during module + body execution; :attr:`__file__` is the pathname of the file from which the module was loaded, if it was loaded from a file. The :attr:`__file__` attribute may be missing for certain types of modules, such as C modules that are statically linked into the interpreter; for extension modules loaded dynamically from a shared library, it is the pathname of the shared library file. + .. index:: single: __dict__ (module attribute) + + Special read-only attribute: :attr:`~object.__dict__` is the module's + namespace as a dictionary object. + + .. impl-detail:: + + Because of the way CPython clears module dictionaries, the module + dictionary will be cleared when the module falls out of scope even if the + dictionary still has live references. To avoid this, copy the dictionary + or keep the module around while using its dictionary directly. + Custom classes Custom class types are typically created by class definitions (see section :ref:`class`). A class has a namespace implemented by a dictionary object. @@ -761,13 +783,17 @@ Custom classes single: __dict__ (class attribute) single: __bases__ (class attribute) single: __doc__ (class attribute) + single: __annotations__ (class attribute) Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is the module name in which the class was defined; :attr:`~object.__dict__` is the dictionary containing the class's namespace; :attr:`~class.__bases__` is a - tuple containing the base classes, in the order of their occurrence in the - base class list; :attr:`__doc__` is the class's documentation string, or - ``None`` if undefined. + tuple (possibly empty or a singleton) containing the base classes, in the + order of their occurrence in the base class list; :attr:`__doc__` is the + class's documentation string, or ``None`` if undefined; + :attr:`__annotations__` (optional) is a dictionary containing + :term:`variable annotations ` collected during + class body execution. Class instances .. index:: @@ -1063,6 +1089,12 @@ to ``type(x).__getitem__(x, i)``. Except where mentioned, attempts to execute a operation raise an exception when no appropriate method is defined (typically :exc:`AttributeError` or :exc:`TypeError`). +Setting a special method to ``None`` indicates that the corresponding +operation is not available. For example, if a class sets +:meth:`__iter__` to ``None``, the class is not iterable, so calling +:func:`iter` on its instances will raise a :exc:`TypeError` (without +falling back to :meth:`__getitem__`). [#]_ + When implementing a class that emulates any built-in type, it is important that the emulation only be implemented to the degree that it makes sense for the object being modelled. For example, some sequences may work well with retrieval @@ -1088,9 +1120,9 @@ Basic customization (usually an instance of *cls*). Typical implementations create a new instance of the class by invoking the - superclass's :meth:`__new__` method using ``super().__new__(cls[, ...])`` - with appropriate arguments and then modifying the newly-created instance - as necessary before returning it. + superclass's :meth:`__new__` method using ``super(currentclass, + cls).__new__(cls[, ...])`` with appropriate arguments and then modifying the + newly-created instance as necessary before returning it. If :meth:`__new__` returns an instance of *cls*, then the new instance's :meth:`__init__` method will be invoked like ``__init__(self[, ...])``, where @@ -1114,7 +1146,7 @@ Basic customization class constructor expression. If a base class has an :meth:`__init__` method, the derived class's :meth:`__init__` method, if any, must explicitly call it to ensure proper initialization of the base class part of the - instance; for example: ``super().__init__([args...])``. + instance; for example: ``BaseClass.__init__(self, [args...])``. Because :meth:`__new__` and :meth:`__init__` work together in constructing objects (:meth:`__new__` to create it, and :meth:`__init__` to customize it), @@ -1233,8 +1265,9 @@ Basic customization .. method:: object.__format__(self, format_spec) - Called by the :func:`format` built-in function (and by extension, the - :meth:`str.format` method of class :class:`str`) to produce a "formatted" + Called by the :func:`format` built-in function, + and by extension, evaluation of :ref:`formatted string literals + ` and the :meth:`str.format` method, to produce a "formatted" string representation of an object. The ``format_spec`` argument is a string that contains a description of the formatting options desired. The interpretation of the ``format_spec`` argument is up to the type @@ -1305,14 +1338,11 @@ Basic customization Called by built-in function :func:`hash` and for operations on members of hashed collections including :class:`set`, :class:`frozenset`, and - :class:`dict`. :meth:`__hash__` should return an integer. The only required - property is that objects which compare equal have the same hash value; it is - advised to mix together the hash values of the components of the object that - also play a part in comparison of objects by packing them into a tuple and - hashing the tuple. Example:: - - def __hash__(self): - return hash((self.name, self.nick, self.color)) + :class:`dict`. :meth:`__hash__` should return an integer. The only + required property is that objects which compare equal have the same hash + value; it is advised to somehow mix together (e.g. using exclusive or) the + hash values for the components of the object that also play a part in + comparison of objects. .. note:: @@ -1494,6 +1524,14 @@ class' :attr:`~object.__dict__`. Called to delete the attribute on an instance *instance* of the owner class. +.. method:: object.__set_name__(self, owner, name) + + Called at the time the owning class *owner* is created. The + descriptor has been assigned to *name*. + + .. versionadded:: 3.6 + + The attribute :attr:`__objclass__` is interpreted by the :mod:`inspect` module as specifying the class where this object was defined (setting this appropriately can assist in runtime introspection of dynamic class attributes). @@ -1538,8 +1576,8 @@ Class Binding ``A.__dict__['x'].__get__(None, A)``. Super Binding - If ``a`` is an instance of :class:`super`, then the binding ``super(B, obj).m()`` - searches ``obj.__class__.__mro__`` for the base class ``A`` + If ``a`` is an instance of :class:`super`, then the binding ``super(B, + obj).m()`` searches ``obj.__class__.__mro__`` for the base class ``A`` immediately preceding ``B`` and then invokes the descriptor with the call: ``A.__dict__['m'].__get__(obj, obj.__class__)``. @@ -1631,11 +1669,60 @@ Notes on using *__slots__* * *__class__* assignment works only if both classes have the same *__slots__*. -.. _metaclasses: +.. _class-customization: Customizing class creation -------------------------- +Whenever a class inherits from another class, *__init_subclass__* is +called on that class. This way, it is possible to write classes which +change the behavior of subclasses. This is closely related to class +decorators, but where class decorators only affect the specific class they're +applied to, ``__init_subclass__`` solely applies to future subclasses of the +class defining the method. + +.. classmethod:: object.__init_subclass__(cls) + + This method is called whenever the containing class is subclassed. + *cls* is then the new subclass. If defined as a normal instance method, + this method is implicitly converted to a class method. + + Keyword arguments which are given to a new class are passed to + the parent's class ``__init_subclass__``. For compatibility with + other classes using ``__init_subclass__``, one should take out the + needed keyword arguments and pass the others over to the base + class, as in:: + + class Philosopher: + def __init_subclass__(cls, default_name, **kwargs): + super().__init_subclass__(**kwargs) + cls.default_name = default_name + + class AustralianPhilosopher(Philosopher, default_name="Bruce"): + pass + + The default implementation ``object.__init_subclass__`` does + nothing, but raises an error if it is called with any arguments. + + .. note:: + + The metaclass hint ``metaclass`` is consumed by the rest of the type + machinery, and is never passed to ``__init_subclass__`` implementations. + The actual metaclass (rather than the explicit hint) can be accessed as + ``type(cls)``. + + .. versionadded:: 3.6 + + +.. _metaclasses: + +Metaclasses +^^^^^^^^^^^ + +.. index:: + single: metaclass + builtin: type + By default, classes are constructed using :func:`type`. The class body is executed in a new namespace and the class name is bound locally to the result of ``type(name, bases, namespace)``. @@ -1666,6 +1753,8 @@ When a class definition is executed, the following steps occur: Determining the appropriate metaclass ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. index:: + single: metaclass hint The appropriate metaclass for a class definition is determined as follows: @@ -1687,13 +1776,16 @@ that criterion, then the class definition will fail with ``TypeError``. Preparing the class namespace ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. index:: + single: __prepare__ (metaclass method) + Once the appropriate metaclass has been identified, then the class namespace is prepared. If the metaclass has a ``__prepare__`` attribute, it is called as ``namespace = metaclass.__prepare__(name, bases, **kwds)`` (where the additional keyword arguments, if any, come from the class definition). If the metaclass has no ``__prepare__`` attribute, then the class namespace -is initialised as an empty :func:`dict` instance. +is initialised as an empty ordered mapping. .. seealso:: @@ -1704,6 +1796,9 @@ is initialised as an empty :func:`dict` instance. Executing the class body ^^^^^^^^^^^^^^^^^^^^^^^^ +.. index:: + single: class; body + The class body is executed (approximately) as ``exec(body, globals(), namespace)``. The key difference from a normal call to :func:`exec` is that lexical scoping allows the class body (including @@ -1713,12 +1808,19 @@ class definition occurs inside a function. However, even when the class definition occurs inside the function, methods defined inside the class still cannot see names defined at the class scope. Class variables must be accessed through the first parameter of instance or -class methods, and cannot be accessed at all from static methods. +class methods, or through the implicit lexically scoped ``__class__`` reference +described in the next section. +.. _class-object-creation: Creating the class object ^^^^^^^^^^^^^^^^^^^^^^^^^ +.. index:: + single: __class__ (method cell) + single: __classcell__ (class namespace entry) + + Once the class namespace has been populated by executing the class body, the class object is created by calling ``metaclass(name, bases, namespace, **kwds)`` (the additional keywords @@ -1732,14 +1834,34 @@ created by the compiler if any methods in a class body refer to either lexical scoping, while the class or instance that was used to make the current call is identified based on the first argument passed to the method. +.. impl-detail:: + + In CPython 3.6 and later, the ``__class__`` cell is passed to the metaclass + as a ``__classcell__`` entry in the class namespace. If present, this must + be propagated up to the ``type.__new__`` call in order for the class to be + initialised correctly. + Failing to do so will result in a :exc:`DeprecationWarning` in Python 3.6, + and a :exc:`RuntimeWarning` in the future. + +When using the default metaclass :class:`type`, or any metaclass that ultimately +calls ``type.__new__``, the following additional customisation steps are +invoked after creating the class object: + +* first, ``type.__new__`` collects all of the descriptors in the class + namespace that define a :meth:`~object.__set_name__` method; +* second, all of these ``__set_name__`` methods are called with the class + being defined and the assigned name of that particular descriptor; and +* finally, the :meth:`~object.__init_subclass__` hook is called on the + immediate parent of the new class in its method resolution order. + After the class object is created, it is passed to the class decorators included in the class definition (if any) and the resulting object is bound in the local namespace as the defined class. When a new class is created by ``type.__new__``, the object provided as the -namespace parameter is copied to a standard Python dictionary and the original -object is discarded. The new copy becomes the :attr:`~object.__dict__` attribute -of the class object. +namespace parameter is copied to a new ordered mapping and the original +object is discarded. The new copy is wrapped in a read-only proxy, which +becomes the :attr:`~object.__dict__` attribute of the class object. .. seealso:: @@ -1887,14 +2009,6 @@ through the container; for mappings, :meth:`__iter__` should be the same as :meth:`__bool__` method and whose :meth:`__len__` method returns zero is considered to be false in a Boolean context. - .. impl-detail:: - - In CPython, the length is required to be at most :attr:`sys.maxsize`. - If the length is larger than :attr:`!sys.maxsize` some features (such as - :func:`len`) may raise :exc:`OverflowError`. To prevent raising - :exc:`!OverflowError` by truth value testing, an object must define a - :meth:`__bool__` method. - .. method:: object.__length_hint__(self) @@ -1905,7 +2019,6 @@ through the container; for mappings, :meth:`__iter__` should be the same as .. versionadded:: 3.4 - .. note:: Slicing is done exclusively with the following three methods. A call like :: @@ -2071,7 +2184,7 @@ left undefined. (``+``, ``-``, ``*``, ``@``, ``/``, ``//``, ``%``, :func:`divmod`, :func:`pow`, ``**``, ``<<``, ``>>``, ``&``, ``^``, ``|``) with reflected (swapped) operands. These functions are only called if the left operand does - not support the corresponding operation and the operands are of different + not support the corresponding operation [#]_ and the operands are of different types. [#]_ For instance, to evaluate the expression ``x - y``, where *y* is an instance of a class that has an :meth:`__rsub__` method, ``y.__rsub__(x)`` is called if ``x.__sub__(y)`` returns *NotImplemented*. @@ -2487,6 +2600,17 @@ An example of an asynchronous context manager class:: controlled conditions. It generally isn't a good idea though, since it can lead to some very strange behaviour if it is handled incorrectly. +.. [#] The :meth:`__hash__`, :meth:`__iter__`, :meth:`__reversed__`, and + :meth:`__contains__` methods have special handling for this; others + will still raise a :exc:`TypeError`, but may do so by relying on + the behavior that ``None`` is not callable. + +.. [#] "Does not support" here means that the class has no such method, or + the method returns ``NotImplemented``. Do not set the method to + ``None`` if you want to force fallback to the right operand's reflected + method—that will instead have the opposite effect of explicitly + *blocking* such fallback. + .. [#] For operands of the same type, it is assumed that if the non-reflected method (such as :meth:`__add__`) fails the operation is not supported, which is why the reflected method is not called. diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index f0dbbd1..5f1ea92 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -194,6 +194,12 @@ This means that the following code will print 42:: i = 42 f() +There are several cases where Python statements are illegal when used in +conjunction with nested scopes that contain free variables. + +If a variable is referenced in an enclosing scope, it is illegal to delete the +name. An error will be reported at compile time. + .. XXX from * also invalid with relative imports (at least currently) The :func:`eval` and :func:`exec` functions do not have access to the full diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 437a350..39c33bc 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -172,7 +172,7 @@ Common syntax elements for comprehensions are: .. productionlist:: comprehension: `expression` `comp_for` - comp_for: "for" `target_list` "in" `or_test` [`comp_iter`] + comp_for: [ASYNC] "for" `target_list` "in" `or_test` [`comp_iter`] comp_iter: `comp_for` | `comp_if` comp_if: "if" `expression_nocond` [`comp_iter`] @@ -186,6 +186,17 @@ each time the innermost block is reached. Note that the comprehension is executed in a separate scope, so names assigned to in the target list don't "leak" into the enclosing scope. +Since Python 3.6, in an :keyword:`async def` function, an :keyword:`async for` +clause may be used to iterate over a :term:`asynchronous iterator`. +A comprehension in an :keyword:`async def` function may consist of either a +:keyword:`for` or :keyword:`async for` clause following the leading +expression, may contan additonal :keyword:`for` or :keyword:`async for` +clauses, and may also use :keyword:`await` expressions. +If a comprehension contains either :keyword:`async for` clauses +or :keyword:`await` expressions it is called an +:dfn:`asynchronous comprehension`. An asynchronous comprehension may +suspend the execution of the coroutine function in which it appears. +See also :pep:`530`. .. _lists: @@ -315,6 +326,14 @@ range(10) for y in bar(x))``. The parentheses can be omitted on calls with only one argument. See section :ref:`calls` for details. +Since Python 3.6, if the generator appears in an :keyword:`async def` function, +then :keyword:`async for` clauses and :keyword:`await` expressions are permitted +as with an asynchronous comprehension. If a generator expression +contains either :keyword:`async for` clauses or :keyword:`await` expressions +it is called an :dfn:`asynchronous generator expression`. +An asynchronous generator expression yields a new asynchronous +generator object, which is an asynchronous iterator +(see :ref:`async-iterators`). .. _yieldexpr: @@ -330,9 +349,22 @@ Yield expressions yield_atom: "(" `yield_expression` ")" yield_expression: "yield" [`expression_list` | "from" `expression`] -The yield expression is only used when defining a :term:`generator` function and +The yield expression is used when defining a :term:`generator` function +or an :term:`asynchronous generator` function and thus can only be used in the body of a function definition. Using a yield -expression in a function's body causes that function to be a generator. +expression in a function's body causes that function to be a generator, +and using it in an :keyword:`async def` function's body causes that +coroutine function to be an asynchronous generator. For example:: + + def gen(): # defines a generator function + yield 123 + + async def agen(): # defines an asynchronous generator function (PEP 525) + yield 123 + +Generator functions are described below, while asynchronous generator +functions are described separately in section +:ref:`asynchronous-generator-functions`. When a generator function is called, it returns an iterator known as a generator. That generator then controls the execution of the generator function. @@ -496,6 +528,134 @@ generator functions:: For examples using ``yield from``, see :ref:`pep-380` in "What's New in Python." +.. _asynchronous-generator-functions: + +Asynchronous generator functions +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The presence of a yield expression in a function or method defined using +:keyword:`async def` further defines the function as a +:term:`asynchronous generator` function. + +When an asynchronous generator function is called, it returns an +asynchronous iterator known as an asynchronous generator object. +That object then controls the execution of the generator function. +An asynchronous generator object is typically used in an +:keyword:`async for` statement in a coroutine function analogously to +how a generator object would be used in a :keyword:`for` statement. + +Calling one of the asynchronous generator's methods returns an +:term:`awaitable` object, and the execution starts when this object +is awaited on. At that time, the execution proceeds to the first yield +expression, where it is suspended again, returning the value of +:token:`expression_list` to the awaiting coroutine. As with a generator, +suspension means that all local state is retained, including the +current bindings of local variables, the instruction pointer, the internal +evaluation stack, and the state of any exception handling. When the execution +is resumed by awaiting on the next object returned by the asynchronous +generator's methods, the function can proceed exactly as if the yield +expression were just another external call. The value of the yield expression +after resuming depends on the method which resumed the execution. If +:meth:`~agen.__anext__` is used then the result is :const:`None`. Otherwise, if +:meth:`~agen.asend` is used, then the result will be the value passed in to +that method. + +In an asynchronous generator function, yield expressions are allowed anywhere +in a :keyword:`try` construct. However, if an asynchronous generator is not +resumed before it is finalized (by reaching a zero reference count or by +being garbage collected), then a yield expression within a :keyword:`try` +construct could result in a failure to execute pending :keyword:`finally` +clauses. In this case, it is the responsibility of the event loop or +scheduler running the asynchronous generator to call the asynchronous +generator-iterator's :meth:`~agen.aclose` method and run the resulting +coroutine object, thus allowing any pending :keyword:`finally` clauses +to execute. + +To take care of finalization, an event loop should define +a *finalizer* function which takes an asynchronous generator-iterator +and presumably calls :meth:`~agen.aclose` and executes the coroutine. +This *finalizer* may be registered by calling :func:`sys.set_asyncgen_hooks`. +When first iterated over, an asynchronous generator-iterator will store the +registered *finalizer* to be called upon finalization. For a reference example +of a *finalizer* method see the implementation of +``asyncio.Loop.shutdown_asyncgens`` in :source:`Lib/asyncio/base_events.py`. + +The expression ``yield from `` is a syntax error when used in an +asynchronous generator function. + +.. index:: object: asynchronous-generator +.. _asynchronous-generator-methods: + +Asynchronous generator-iterator methods +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This subsection describes the methods of an asynchronous generator iterator, +which are used to control the execution of a generator function. + + +.. index:: exception: StopAsyncIteration + +.. coroutinemethod:: agen.__anext__() + + Returns an awaitable which when run starts to execute the asynchronous + generator or resumes it at the last executed yield expression. When an + asynchronous generator function is resumed with a :meth:`~agen.__anext__` + method, the current yield expression always evaluates to :const:`None` in + the returned awaitable, which when run will continue to the next yield + expression. The value of the :token:`expression_list` of the yield + expression is the value of the :exc:`StopIteration` exception raised by + the completing coroutine. If the asynchronous generator exits without + yielding another value, the awaitable instead raises an + :exc:`StopAsyncIteration` exception, signalling that the asynchronous + iteration has completed. + + This method is normally called implicitly by a :keyword:`async for` loop. + + +.. coroutinemethod:: agen.asend(value) + + Returns an awaitable which when run resumes the execution of the + asynchronous generator. As with the :meth:`~generator.send()` method for a + generator, this "sends" a value into the asynchronous generator function, + and the *value* argument becomes the result of the current yield expression. + The awaitable returned by the :meth:`asend` method will return the next + value yielded by the generator as the value of the raised + :exc:`StopIteration`, or raises :exc:`StopAsyncIteration` if the + asynchronous generator exits without yielding another value. When + :meth:`asend` is called to start the asynchronous + generator, it must be called with :const:`None` as the argument, + because there is no yield expression that could receive the value. + + +.. coroutinemethod:: agen.athrow(type[, value[, traceback]]) + + Returns an awaitable that raises an exception of type ``type`` at the point + where the asynchronous generator was paused, and returns the next value + yielded by the generator function as the value of the raised + :exc:`StopIteration` exception. If the asynchronous generator exits + without yielding another value, an :exc:`StopAsyncIteration` exception is + raised by the awaitable. + If the generator function does not catch the passed-in exception, or + raises a different exception, then when the awaitalbe is run that exception + propagates to the caller of the awaitable. + +.. index:: exception: GeneratorExit + + +.. coroutinemethod:: agen.aclose() + + Returns an awaitable that when run will throw a :exc:`GeneratorExit` into + the asynchronous generator function at the point where it was paused. + If the asynchronous generator function then exits gracefully, is already + closed, or raises :exc:`GeneratorExit` (by not catching the exception), + then the returned awaitable will raise a :exc:`StopIteration` exception. + Any further awaitables returned by subsequent calls to the asynchronous + generator will raise a :exc:`StopAsyncIteration` exception. If the + asynchronous generator yields a value, a :exc:`RuntimeError` is raised + by the awaitable. If the asynchronous generator raises any other exception, + it is propagated to the caller of the awaitable. If the asynchronous + generator has already exited due to an exception or normal exit, then + further calls to :meth:`aclose` will return an awaitable that does nothing. .. _primaries: @@ -667,7 +827,7 @@ series of :term:`arguments `: starred_and_keywords: ("*" `expression` | `keyword_item`) : ("," "*" `expression` | "," `keyword_item`)* keywords_arguments: (`keyword_item` | "**" `expression`) - : ("," `keyword_item` | "," "**" `expression`)* + : ("," `keyword_item` | "**" `expression`)* keyword_item: `identifier` "=" `expression` An optional trailing comma may be present after the positional and keyword arguments @@ -745,7 +905,7 @@ keyword arguments (and any ``**expression`` arguments -- see below). So:: 2 1 >>> f(a=1, *(2,)) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: f() got multiple values for keyword argument 'a' >>> f(1, *(2,)) 1 2 @@ -1195,7 +1355,7 @@ built-in types. true). * Mappings (instances of :class:`dict`) compare equal if and only if they have - equal `(key, value)` pairs. Equality comparison of the keys and values + equal `(key, value)` pairs. Equality comparison of the keys and elements enforces reflexivity. Order comparisons (``<``, ``>``, ``<=``, and ``>=``) raise :exc:`TypeError`. @@ -1255,10 +1415,6 @@ some consistency rules, if possible: sequences, but not to sets or mappings). See also the :func:`~functools.total_ordering` decorator. -* The :func:`hash` result should be consistent with equality. - Objects that are equal should either have the same hash value, - or be marked as unhashable. - Python does not enforce these consistency rules. In fact, the not-a-number values are an example for not following these rules. @@ -1271,29 +1427,28 @@ Membership test operations -------------------------- The operators :keyword:`in` and :keyword:`not in` test for membership. ``x in -s`` evaluates to ``True`` if *x* is a member of *s*, and ``False`` otherwise. -``x not in s`` returns the negation of ``x in s``. All built-in sequences and -set types support this as well as dictionary, for which :keyword:`in` tests -whether the dictionary has a given key. For container types such as list, tuple, -set, frozenset, dict, or collections.deque, the expression ``x in y`` is equivalent +s`` evaluates to true if *x* is a member of *s*, and false otherwise. ``x not +in s`` returns the negation of ``x in s``. All built-in sequences and set types +support this as well as dictionary, for which :keyword:`in` tests whether the +dictionary has a given key. For container types such as list, tuple, set, +frozenset, dict, or collections.deque, the expression ``x in y`` is equivalent to ``any(x is e or x == e for e in y)``. -For the string and bytes types, ``x in y`` is ``True`` if and only if *x* is a +For the string and bytes types, ``x in y`` is true if and only if *x* is a substring of *y*. An equivalent test is ``y.find(x) != -1``. Empty strings are always considered to be a substring of any other string, so ``"" in "abc"`` will return ``True``. For user-defined classes which define the :meth:`__contains__` method, ``x in -y`` returns ``True`` if ``y.__contains__(x)`` returns a true value, and -``False`` otherwise. +y`` is true if and only if ``y.__contains__(x)`` is true. For user-defined classes which do not define :meth:`__contains__` but do define -:meth:`__iter__`, ``x in y`` is ``True`` if some value ``z`` with ``x == z`` is +:meth:`__iter__`, ``x in y`` is true if some value ``z`` with ``x == z`` is produced while iterating over ``y``. If an exception is raised during the iteration, it is as if :keyword:`in` raised that exception. Lastly, the old-style iteration protocol is tried: if a class defines -:meth:`__getitem__`, ``x in y`` is ``True`` if and only if there is a non-negative +:meth:`__getitem__`, ``x in y`` is true if and only if there is a non-negative integer index *i* such that ``x == y[i]``, and all lower integer indices do not raise :exc:`IndexError` exception. (If any other exception is raised, it is as if :keyword:`in` raised that exception). diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index a981b87..5e2c1c8 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -36,7 +36,7 @@ implement import semantics. When a module is first imported, Python searches for the module and if found, it creates a module object [#fnmo]_, initializing it. If the named module -cannot be found, an :exc:`ImportError` is raised. Python implements various +cannot be found, an :exc:`ModuleNotFoundError` is raised. Python implements various strategies to search for the named module when the import machinery is invoked. These strategies can be modified and extended by using various hooks described in the sections below. @@ -167,7 +167,7 @@ arguments to the :keyword:`import` statement, or from the parameters to the This name will be used in various phases of the import search, and it may be the dotted path to a submodule, e.g. ``foo.bar.baz``. In this case, Python first tries to import ``foo``, then ``foo.bar``, and finally ``foo.bar.baz``. -If any of the intermediate imports fail, an :exc:`ImportError` is raised. +If any of the intermediate imports fail, an :exc:`ModuleNotFoundError` is raised. The module cache @@ -186,7 +186,7 @@ object. During import, the module name is looked up in :data:`sys.modules` and if present, the associated value is the module satisfying the import, and the process completes. However, if the value is ``None``, then an -:exc:`ImportError` is raised. If the module name is missing, Python will +:exc:`ModuleNotFoundError` is raised. If the module name is missing, Python will continue searching for the module. :data:`sys.modules` is writable. Deleting a key may not destroy the @@ -194,7 +194,7 @@ associated module (as other modules may hold references to it), but it will invalidate the cache entry for the named module, causing Python to search anew for the named module upon its next import. The key can also be assigned to ``None``, forcing the next import -of the module to result in an :exc:`ImportError`. +of the module to result in an :exc:`ModuleNotFoundError`. Beware though, as if you keep a reference to the module object, invalidate its cache entry in :data:`sys.modules`, and then re-import the @@ -288,8 +288,8 @@ the named module or not. If the meta path finder knows how to handle the named module, it returns a spec object. If it cannot handle the named module, it returns ``None``. If :data:`sys.meta_path` processing reaches the end of its list without returning -a spec, then an :exc:`ImportError` is raised. Any other exceptions raised -are simply propagated up, aborting the import process. +a spec, then a :exc:`ModuleNotFoundError` is raised. Any other exceptions +raised are simply propagated up, aborting the import process. The :meth:`~importlib.abc.MetaPathFinder.find_spec()` method of meta path finders is called with two or three arguments. The first is the fully @@ -298,9 +298,9 @@ The second argument is the path entries to use for the module search. For top-level modules, the second argument is ``None``, but for submodules or subpackages, the second argument is the value of the parent package's ``__path__`` attribute. If the appropriate ``__path__`` attribute cannot -be accessed, an :exc:`ImportError` is raised. The third argument is an -existing module object that will be the target of loading later. The -import system passes in a target module only during reload. +be accessed, an :exc:`ModuleNotFoundError` is raised. The third argument +is an existing module object that will be the target of loading later. +The import system passes in a target module only during reload. The meta path may be traversed multiple times for a single import request. For example, assuming none of the modules involved has already been cached, @@ -431,7 +431,7 @@ on the module object. If the method returns ``None``, the import machinery will create the new module itself. .. versionadded:: 3.4 - The :meth:`~importlib.abc.Loader.create_module` method of loaders. + The create_module() method of loaders. .. versionchanged:: 3.4 The :meth:`~importlib.abc.Loader.load_module` method was replaced by @@ -554,19 +554,30 @@ the module. details. This attribute is used instead of ``__name__`` to calculate explicit - relative imports for main modules, as defined in :pep:`366`. + relative imports for main modules, as defined in :pep:`366`. It is + expected to have the same value as ``__spec__.parent``. + + .. versionchanged:: 3.6 + The value of ``__package__`` is expected to be the same as + ``__spec__.parent``. .. attribute:: __spec__ The ``__spec__`` attribute must be set to the module spec that was - used when importing the module. This is used primarily for - introspection and during reloading. Setting ``__spec__`` + used when importing the module. Setting ``__spec__`` appropriately applies equally to :ref:`modules initialized during interpreter startup `. The one exception is ``__main__``, where ``__spec__`` is :ref:`set to None in some cases `. + When ``__package__`` is not defined, ``__spec__.parent`` is used as + a fallback. + .. versionadded:: 3.4 + .. versionchanged:: 3.6 + ``__spec__.parent`` is used as a fallback when ``__package__`` is + not defined. + .. attribute:: __path__ If the module is a package (either regular or namespace), the module @@ -876,7 +887,7 @@ import statements within that module. To selectively prevent import of some modules from a hook early on the meta path (rather than disabling the standard import system entirely), -it is sufficient to raise :exc:`ImportError` directly from +it is sufficient to raise :exc:`ModuleNoFoundError` directly from :meth:`~importlib.abc.MetaPathFinder.find_spec` instead of returning ``None``. The latter indicates that the meta path search should continue, while raising an exception terminates it immediately. diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 37f25f1..da7017a 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -405,7 +405,8 @@ String literals are described by the following lexical definitions: .. productionlist:: stringliteral: [`stringprefix`](`shortstring` | `longstring`) - stringprefix: "r" | "u" | "R" | "U" + stringprefix: "r" | "u" | "R" | "U" | "f" | "F" + : | "fr" | "Fr" | "fR" | "FR" | "rf" | "rF" | "Rf" | "RF" shortstring: "'" `shortstringitem`* "'" | '"' `shortstringitem`* '"' longstring: "'''" `longstringitem`* "'''" | '"""' `longstringitem`* '"""' shortstringitem: `shortstringchar` | `stringescapeseq` @@ -464,6 +465,11 @@ is not supported. to simplify the maintenance of dual Python 2.x and 3.x codebases. See :pep:`414` for more information. +A string literal with ``'f'`` or ``'F'`` in its prefix is a +:dfn:`formatted string literal`; see :ref:`f-strings`. The ``'f'`` may be +combined with ``'r'``, but not with ``'b'`` or ``'u'``, therefore raw +formatted strings are possible, but formatted bytes literals are not. + In triple-quoted literals, unescaped newlines and quotes are allowed (and are retained), except that three unescaped quotes in a row terminate the literal. (A "quote" is the character used to open the literal, i.e. either ``'`` or ``"``.) @@ -554,6 +560,10 @@ is more easily recognized as broken.) It is also important to note that the escape sequences only recognized in string literals fall into the category of unrecognized escapes for bytes literals. + .. versionchanged:: 3.6 + Unrecognized escape sequences produce a DeprecationWarning. In + some future version of Python they will be a SyntaxError. + Even in a raw literal, quotes can be escaped with a backslash, but the backslash remains in the result; for example, ``r"\""`` is a valid string literal consisting of two characters: a backslash and a double quote; ``r"\"`` @@ -583,7 +593,111 @@ comments to parts of strings, for example:: Note that this feature is defined at the syntactical level, but implemented at compile time. The '+' operator must be used to concatenate string expressions at run time. Also note that literal concatenation can use different quoting -styles for each component (even mixing raw strings and triple quoted strings). +styles for each component (even mixing raw strings and triple quoted strings), +and formatted string literals may be concatenated with plain string literals. + + +.. index:: + single: formatted string literal + single: interpolated string literal + single: string; formatted literal + single: string; interpolated literal + single: f-string +.. _f-strings: + +Formatted string literals +------------------------- + +.. versionadded:: 3.6 + +A :dfn:`formatted string literal` or :dfn:`f-string` is a string literal +that is prefixed with ``'f'`` or ``'F'``. These strings may contain +replacement fields, which are expressions delimited by curly braces ``{}``. +While other string literals always have a constant value, formatted strings +are really expressions evaluated at run time. + +Escape sequences are decoded like in ordinary string literals (except when +a literal is also marked as a raw string). After decoding, the grammar +for the contents of the string is: + +.. productionlist:: + f_string: (`literal_char` | "{{" | "}}" | `replacement_field`)* + replacement_field: "{" `f_expression` ["!" `conversion`] [":" `format_spec`] "}" + f_expression: (`conditional_expression` | "*" `or_expr`) + : ("," `conditional_expression` | "," "*" `or_expr`)* [","] + : | `yield_expression` + conversion: "s" | "r" | "a" + format_spec: (`literal_char` | NULL | `replacement_field`)* + literal_char: + +The parts of the string outside curly braces are treated literally, +except that any doubled curly braces ``'{{'`` or ``'}}'`` are replaced +with the corresponding single curly brace. A single opening curly +bracket ``'{'`` marks a replacement field, which starts with a +Python expression. After the expression, there may be a conversion field, +introduced by an exclamation point ``'!'``. A format specifier may also +be appended, introduced by a colon ``':'``. A replacement field ends +with a closing curly bracket ``'}'``. + +Expressions in formatted string literals are treated like regular +Python expressions surrounded by parentheses, with a few exceptions. +An empty expression is not allowed, and a :keyword:`lambda` expression +must be surrounded by explicit parentheses. Replacement expressions +can contain line breaks (e.g. in triple-quoted strings), but they +cannot contain comments. Each expression is evaluated in the context +where the formatted string literal appears, in order from left to right. + +If a conversion is specified, the result of evaluating the expression +is converted before formatting. Conversion ``'!s'`` calls :func:`str` on +the result, ``'!r'`` calls :func:`repr`, and ``'!a'`` calls :func:`ascii`. + +The result is then formatted using the :func:`format` protocol. The +format specifier is passed to the :meth:`__format__` method of the +expression or conversion result. An empty string is passed when the +format specifier is omitted. The formatted result is then included in +the final value of the whole string. + +Top-level format specifiers may include nested replacement fields. +These nested fields may include their own conversion fields and +format specifiers, but may not include more deeply-nested replacement fields. + +Formatted string literals may be concatenated, but replacement fields +cannot be split across literals. + +Some examples of formatted string literals:: + + >>> name = "Fred" + >>> f"He said his name is {name!r}." + "He said his name is 'Fred'." + >>> f"He said his name is {repr(name)}." # repr() is equivalent to !r + "He said his name is 'Fred'." + >>> width = 10 + >>> precision = 4 + >>> value = decimal.Decimal("12.34567") + >>> f"result: {value:{width}.{precision}}" # nested fields + 'result: 12.35' + +A consequence of sharing the same syntax as regular string literals is +that characters in the replacement fields must not conflict with the +quoting used in the outer formatted string literal:: + + f"abc {a["x"]} def" # error: outer string literal ended prematurely + f"abc {a['x']} def" # workaround: use different quoting + +Backslashes are not allowed in format expressions and will raise +an error:: + + f"newline: {ord('\n')}" # raises SyntaxError + +To include a value in which a backslash escape is required, create +a temporary variable. + + >>> newline = ord('\n') + >>> f"newline: {newline}" + 'newline: 10' + +See also :pep:`498` for the proposal that added formatted string literals, +and :meth:`str.format`, which uses a related format string mechanism. .. _numbers: @@ -612,20 +726,24 @@ Integer literals Integer literals are described by the following lexical definitions: .. productionlist:: - integer: `decimalinteger` | `octinteger` | `hexinteger` | `bininteger` - decimalinteger: `nonzerodigit` `digit`* | "0"+ + integer: `decinteger` | `bininteger` | `octinteger` | `hexinteger` + decinteger: `nonzerodigit` (["_"] `digit`)* | "0"+ (["_"] "0")* + bininteger: "0" ("b" | "B") (["_"] `bindigit`)+ + octinteger: "0" ("o" | "O") (["_"] `octdigit`)+ + hexinteger: "0" ("x" | "X") (["_"] `hexdigit`)+ nonzerodigit: "1"..."9" digit: "0"..."9" - octinteger: "0" ("o" | "O") `octdigit`+ - hexinteger: "0" ("x" | "X") `hexdigit`+ - bininteger: "0" ("b" | "B") `bindigit`+ + bindigit: "0" | "1" octdigit: "0"..."7" hexdigit: `digit` | "a"..."f" | "A"..."F" - bindigit: "0" | "1" There is no limit for the length of integer literals apart from what can be stored in available memory. +Underscores are ignored for determining the numeric value of the literal. They +can be used to group digits for enhanced readability. One underscore can occur +between digits, and after base specifiers like ``0x``. + Note that leading zeros in a non-zero decimal number are not allowed. This is for disambiguation with C-style octal literals, which Python used before version 3.0. @@ -634,6 +752,10 @@ Some examples of integer literals:: 7 2147483647 0o177 0b100110111 3 79228162514264337593543950336 0o377 0xdeadbeef + 100_000_000_000 0b_1110_0101 + +.. versionchanged:: 3.6 + Underscores are now allowed for grouping purposes in literals. .. _floating: @@ -645,23 +767,28 @@ Floating point literals are described by the following lexical definitions: .. productionlist:: floatnumber: `pointfloat` | `exponentfloat` - pointfloat: [`intpart`] `fraction` | `intpart` "." - exponentfloat: (`intpart` | `pointfloat`) `exponent` - intpart: `digit`+ - fraction: "." `digit`+ - exponent: ("e" | "E") ["+" | "-"] `digit`+ + pointfloat: [`digitpart`] `fraction` | `digitpart` "." + exponentfloat: (`digitpart` | `pointfloat`) `exponent` + digitpart: `digit` (["_"] `digit`)* + fraction: "." `digitpart` + exponent: ("e" | "E") ["+" | "-"] `digitpart` Note that the integer and exponent parts are always interpreted using radix 10. For example, ``077e010`` is legal, and denotes the same number as ``77e10``. The -allowed range of floating point literals is implementation-dependent. Some -examples of floating point literals:: +allowed range of floating point literals is implementation-dependent. As in +integer literals, underscores are supported for digit grouping. - 3.14 10. .001 1e100 3.14e-10 0e0 +Some examples of floating point literals:: + + 3.14 10. .001 1e100 3.14e-10 0e0 3.14_15_93 Note that numeric literals do not include a sign; a phrase like ``-1`` is actually an expression composed of the unary operator ``-`` and the literal ``1``. +.. versionchanged:: 3.6 + Underscores are now allowed for grouping purposes in literals. + .. _imaginary: @@ -671,7 +798,7 @@ Imaginary literals Imaginary literals are described by the following lexical definitions: .. productionlist:: - imagnumber: (`floatnumber` | `intpart`) ("j" | "J") + imagnumber: (`floatnumber` | `digitpart`) ("j" | "J") An imaginary literal yields a complex number with a real part of 0.0. Complex numbers are represented as a pair of floating point numbers and have the same @@ -679,7 +806,7 @@ restrictions on their range. To create a complex number with a nonzero real part, add a floating point number to it, e.g., ``(3+4j)``. Some examples of imaginary literals:: - 3.14j 10.j 10j .001j 1e100j 3.14e-10j + 3.14j 10.j 10j .001j 1e100j 3.14e-10j 3.14_15_93j .. _operators: diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 35c8239..e152b16 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -16,6 +16,7 @@ simple statements is: : | `assert_stmt` : | `assignment_stmt` : | `augmented_assignment_stmt` + : | `annotated_assignment_stmt` : | `pass_stmt` : | `del_stmt` : | `return_stmt` @@ -84,7 +85,7 @@ attributes or items of mutable objects: assignment_stmt: (`target_list` "=")+ (`starred_expression` | `yield_expression`) target_list: `target` ("," `target`)* [","] target: `identifier` - : | "(" `target_list` ")" + : | "(" [`target_list`] ")" : | "[" [`target_list`] "]" : | `attributeref` : | `subscription` @@ -312,6 +313,50 @@ For targets which are attribute references, the same :ref:`caveat about class and instance attributes ` applies as for regular assignments. +.. _annassign: + +Annotated assignment statements +------------------------------- + +.. index:: + pair: annotated; assignment + single: statement; assignment, annotated + +Annotation assignment is the combination, in a single statement, +of a variable or attribute annotation and an optional assignment statement: + +.. productionlist:: + annotated_assignment_stmt: `augtarget` ":" `expression` ["=" `expression`] + +The difference from normal :ref:`assignment` is that only single target and +only single right hand side value is allowed. + +For simple names as assignment targets, if in class or module scope, +the annotations are evaluated and stored in a special class or module +attribute :attr:`__annotations__` +that is a dictionary mapping from variable names (mangled if private) to +evaluated annotations. This attribute is writable and is automatically +created at the start of class or module body execution, if annotations +are found statically. + +For expressions as assignment targets, the annotations are evaluated if +in class or module scope, but not stored. + +If a name is annotated in a function scope, then this name is local for +that scope. Annotations are never evaluated and stored in function scopes. + +If the right hand side is present, an annotated +assignment performs the actual assignment before evaluating annotations +(where applicable). If the right hand side is not present for an expression +target, then the interpreter evaluates the target except for the last +:meth:`__setitem__` or :meth:`__setattr__` call. + +.. seealso:: + + :pep:`526` - Variable and attribute annotation syntax + :pep:`484` - Type hints + + .. _assert: The :keyword:`assert` statement @@ -447,6 +492,10 @@ generator is done and will cause :exc:`StopIteration` to be raised. The returned value (if any) is used as an argument to construct :exc:`StopIteration` and becomes the :attr:`StopIteration.value` attribute. +In an asynchronous generator function, an empty :keyword:`return` statement +indicates that the asynchronous generator is done and will cause +:exc:`StopAsyncIteration` to be raised. A non-empty :keyword:`return` +statement is a syntax error in an asynchronous generator function. .. _yield: @@ -859,11 +908,12 @@ block textually preceding that :keyword:`global` statement. Names listed in a :keyword:`global` statement must not be defined as formal parameters or in a :keyword:`for` loop control target, :keyword:`class` -definition, function definition, or :keyword:`import` statement. +definition, function definition, :keyword:`import` statement, or variable +annotation. .. impl-detail:: - The current implementation does not enforce the two restrictions, but + The current implementation does not enforce some of these restriction, but programs should not abuse this freedom, as future implementations may enforce them or silently change the meaning of the program. @@ -872,7 +922,7 @@ definition, function definition, or :keyword:`import` statement. builtin: eval builtin: compile -**Programmer's note:** :keyword:`global` is a directive to the parser. It +**Programmer's note:** the :keyword:`global` is a directive to the parser. It applies only to code parsed at the same time as the :keyword:`global` statement. In particular, a :keyword:`global` statement contained in a string or code object supplied to the built-in :func:`exec` function does not affect the code diff --git a/Doc/tools/extensions/patchlevel.py b/Doc/tools/extensions/patchlevel.py index 919ba4a..bca2eb8 100644 --- a/Doc/tools/extensions/patchlevel.py +++ b/Doc/tools/extensions/patchlevel.py @@ -10,8 +10,6 @@ :license: Python license. """ -from __future__ import print_function - import os import re import sys @@ -63,8 +61,8 @@ def get_version_info(): return get_header_version_info('.') except (IOError, OSError): version, release = get_sys_version_info() - print('Can\'t get version info from Include/patchlevel.h, ' \ - 'using version of this interpreter (%s).' % release, file=sys.stderr) + print >>sys.stderr, 'Can\'t get version info from Include/patchlevel.h, ' \ + 'using version of this interpreter (%s).' % release return version, release if __name__ == '__main__': diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py index f25c4bc..273191b 100644 --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -15,7 +15,6 @@ from os import path from time import asctime from pprint import pformat from docutils.io import StringOutput -from docutils.parsers.rst import Directive from docutils.utils import new_document from docutils import nodes, utils @@ -23,6 +22,7 @@ from docutils import nodes, utils from sphinx import addnodes from sphinx.builders import Builder from sphinx.util.nodes import split_explicit_title +from sphinx.util.compat import Directive from sphinx.writers.html import HTMLTranslator from sphinx.writers.text import TextWriter from sphinx.writers.latex import LaTeXTranslator @@ -34,7 +34,7 @@ import suspicious ISSUE_URI = 'https://bugs.python.org/issue%s' -SOURCE_URI = 'https://github.com/python/cpython/tree/3.5/%s' +SOURCE_URI = 'https://hg.python.org/cpython/file/3.6/%s' # monkey-patch reST parser to disable alphabetic and roman enumerated lists from docutils.parsers.rst.states import Body @@ -79,7 +79,7 @@ LaTeXTranslator.depart_literal_block = new_depart_literal_block def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]): issue = utils.unescape(text) - text = 'bpo-' + issue + text = 'issue ' + issue refnode = nodes.reference(text, text, refuri=ISSUE_URI % issue) return [refnode], [] @@ -225,7 +225,7 @@ class DeprecatedRemoved(Directive): # Support for including Misc/NEWS -issue_re = re.compile('(?:[Ii]ssue #|bpo-)([0-9]+)') +issue_re = re.compile('([Ii])ssue #([0-9]+)') whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$") @@ -253,7 +253,7 @@ class MiscNews(Directive): text = 'The NEWS file is not available.' node = nodes.strong(text, text) return [node] - content = issue_re.sub(r'`bpo-\1 `__', + content = issue_re.sub(r'`\1ssue #\2 `__', content) content = whatsnew_re.sub(r'\1', content) # remove first 3 lines as they are the main heading diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py index de78041..2c1816e 100755 --- a/Doc/tools/rstlint.py +++ b/Doc/tools/rstlint.py @@ -9,8 +9,6 @@ # TODO: - wrong versions in versionadded/changed # - wrong markup after versionchanged directive -from __future__ import with_statement - import os import re import sys diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv index 8883f53..96483c4 100644 --- a/Doc/tools/susp-ignored.csv +++ b/Doc/tools/susp-ignored.csv @@ -25,6 +25,30 @@ howto/curses,,:blue,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white. howto/curses,,:magenta,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white. The" howto/curses,,:cyan,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white. The" howto/curses,,:white,"2:green, 3:yellow, 4:blue, 5:magenta, 6:cyan, and 7:white. The" +howto/instrumentation,,::,python$target:::function-entry +howto/instrumentation,,:function,python$target:::function-entry +howto/instrumentation,,::,python$target:::function-return +howto/instrumentation,,:function,python$target:::function-return +howto/instrumentation,,:call,156641360502280 function-entry:call_stack.py:start:23 +howto/instrumentation,,:start,156641360502280 function-entry:call_stack.py:start:23 +howto/instrumentation,,:function,156641360518804 function-entry: call_stack.py:function_1:1 +howto/instrumentation,,:function,156641360532797 function-entry: call_stack.py:function_3:9 +howto/instrumentation,,:function,156641360546807 function-return: call_stack.py:function_3:10 +howto/instrumentation,,:function,156641360563367 function-return: call_stack.py:function_1:2 +howto/instrumentation,,:function,156641360578365 function-entry: call_stack.py:function_2:5 +howto/instrumentation,,:function,156641360591757 function-entry: call_stack.py:function_1:1 +howto/instrumentation,,:function,156641360605556 function-entry: call_stack.py:function_3:9 +howto/instrumentation,,:function,156641360617482 function-return: call_stack.py:function_3:10 +howto/instrumentation,,:function,156641360629814 function-return: call_stack.py:function_1:2 +howto/instrumentation,,:function,156641360642285 function-return: call_stack.py:function_2:6 +howto/instrumentation,,:function,156641360656770 function-entry: call_stack.py:function_3:9 +howto/instrumentation,,:function,156641360669707 function-return: call_stack.py:function_3:10 +howto/instrumentation,,:function,156641360687853 function-entry: call_stack.py:function_4:13 +howto/instrumentation,,:function,156641360700719 function-return: call_stack.py:function_4:14 +howto/instrumentation,,:function,156641360719640 function-entry: call_stack.py:function_5:18 +howto/instrumentation,,:function,156641360732567 function-return: call_stack.py:function_5:21 +howto/instrumentation,,:call,156641360747370 function-return:call_stack.py:start:28 +howto/instrumentation,,:start,156641360747370 function-return:call_stack.py:start:28 howto/ipaddress,,:DB8,>>> ipaddress.ip_address('2001:DB8::1') howto/ipaddress,,::,>>> ipaddress.ip_address('2001:DB8::1') howto/ipaddress,,:db8,IPv6Address('2001:db8::1') @@ -82,7 +106,7 @@ howto/pyporting,,::,Programming Language :: Python :: 2 howto/pyporting,,::,Programming Language :: Python :: 3 howto/regex,,::, howto/regex,,:foo,(?:foo) -howto/urllib2,,:password,"""joe:password@example.com""" +howto/urllib2,,:password,"for example ""joe:password@example.com""" library/audioop,,:ipos,"# factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)]," library/bisect,32,:hi,all(val >= x for val in a[i:hi]) library/bisect,42,:hi,all(val > x for val in a[i:hi]) @@ -106,6 +130,10 @@ library/exceptions,,:err,err.object[err.start:err.end] library/functions,,:step,a[start:stop:step] library/functions,,:stop,"a[start:stop, i]" library/functions,,:stop,a[start:stop:step] +library/hashlib-blake2,,:vatrogasac,>>> cookie = b'user:vatrogasac' +library/hashlib-blake2,,:vatrogasac,"user:vatrogasac,349cf904533767ed2d755279a8df84d0" +library/hashlib-blake2,,:policajac,">>> compare_digest(b'user:policajac', sig)" +library/hashlib-blake2,,:LEAF,"h00 = blake2b(buf[0:LEAF_SIZE], fanout=FANOUT, depth=DEPTH," library/http.client,,:port,host:port library/http.cookies,,`,!#$%&'*+-.^_`|~: library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS" @@ -161,6 +189,7 @@ library/pprint,,::,"'Programming Language :: Python :: 2.7'," library/profile,,:lineno,filename:lineno(function) library/pyexpat,,:elem1, library/pyexpat,,:py,"xmlns:py = ""http://www.python.org/ns/"">" +library/random,,:len,new_diff = mean(combined[:len(drug)]) - mean(combined[len(drug):]) library/smtplib,,:port,method must support that as well as a regular host:port library/socket,,::,'5aef:2b::8' library/socket,,:can,"return (can_id, can_dlc, data[:can_dlc])" @@ -205,7 +234,8 @@ library/uuid,,:uuid,urn:uuid:12345678-1234-5678-1234-567812345678 library/venv,,:param,":param nodist: If True, setuptools and pip are not installed into the" library/venv,,:param,":param progress: If setuptools or pip are installed, the progress of the" library/venv,,:param,":param nopip: If True, pip is not installed into the created" -library/venv,,:param,:param context: The information for the environment creation request +library/venv,,:param,:param context: The information for the virtual environment +library/xmlrpc.client,,:nil,ex:nil library/xmlrpc.client,,:pass,http://user:pass@host:port/path library/xmlrpc.client,,:pass,user:pass library/xmlrpc.client,,:port,http://user:pass@host:port/path @@ -239,7 +269,7 @@ using/cmdline,,:line,file:line: category: message using/cmdline,,:message,action:message:category:module:line using/cmdline,,:module,action:message:category:module:line using/unix,,:Packaging,https://en.opensuse.org/Portal:Packaging -whatsnew/2.0,418,:len, +whatsnew/2.0,,:len, whatsnew/2.3,,::, whatsnew/2.3,,:config, whatsnew/2.3,,:Critical, @@ -272,29 +302,28 @@ whatsnew/3.2,,:feed,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe: whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') as tf:" whatsnew/3.2,,:location,zope9-location = ${zope9:location} whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf -whatsnew/changelog,,:gz,": TarFile opened with external fileobj and " -whatsnew/changelog,,::,::1 -library/re,,`,!#$%&'*+-.^_`|~: -library/re,,`,\!\#\$\%\&\'\*\+\-\.\^_\`\|\~\: -library/tarfile,149,:xz,'x:xz' -library/xml.etree.elementtree,290,:sometag,prefix:sometag -library/xml.etree.elementtree,301,:fictional,"Lancelot -library/xml.etree.elementtree,301,:character,Archie Leach -library/xml.etree.elementtree,301,:character,Sir Robin -library/xml.etree.elementtree,301,:character,Gunther -library/xml.etree.elementtree,301,:character,Commander Clement +library/tarfile,,:xz,'x:xz' +library/xml.etree.elementtree,,:sometag,prefix:sometag +library/xml.etree.elementtree,,:fictional,"Lancelot +library/xml.etree.elementtree,,:character,Archie Leach +library/xml.etree.elementtree,,:character,Sir Robin +library/xml.etree.elementtree,,:character,Gunther +library/xml.etree.elementtree,,:character,Commander Clement library/xml.etree.elementtree,,:actor,"for actor in root.findall('real_person:actor', ns):" library/xml.etree.elementtree,,:name,"name = actor.find('real_person:name', ns)" library/xml.etree.elementtree,,:character,"for char in actor.findall('role:character', ns):" -library/zipapp,31,:main,"$ python -m zipapp myapp -m ""myapp:main""" -library/zipapp,,:fn,"pkg.mod:fn" -library/zipapp,,:callable,"pkg.module:callable" +library/zipapp,,:main,"$ python -m zipapp myapp -m ""myapp:main""" +library/zipapp,,:fn,"argument should have the form ""pkg.mod:fn"", where ""pkg.mod"" is a" +library/zipapp,,:callable,"""pkg.module:callable"" and the archive will be run by importing" library/stdtypes,,::,>>> m[::2].tolist() library/sys,,`,# ``wrapper`` creates a ``wrap(coro)`` coroutine: -tutorial/venv,77,:c7b9645a6f35,"Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25)" whatsnew/3.5,,:root,'WARNING:root:warning\n' whatsnew/3.5,,:warning,'WARNING:root:warning\n' whatsnew/3.5,,::,>>> addr6 = ipaddress.IPv6Address('::1') whatsnew/3.5,,:root,ERROR:root:exception whatsnew/3.5,,:exception,ERROR:root:exception +whatsnew/changelog,,:version,import sys; I = version[:version.index(' ')] +whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't" +whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as" +whatsnew/changelog,,`,"for readability (was ""`"")." diff --git a/Doc/tools/templates/customsourcelink.html b/Doc/tools/templates/customsourcelink.html index 71d0bba..243d810 100644 --- a/Doc/tools/templates/customsourcelink.html +++ b/Doc/tools/templates/customsourcelink.html @@ -3,11 +3,8 @@

{{ _('This Page') }}

{%- endif %} diff --git a/Doc/tools/templates/download.html b/Doc/tools/templates/download.html index d49ebdd..de84ae3 100644 --- a/Doc/tools/templates/download.html +++ b/Doc/tools/templates/download.html @@ -18,23 +18,23 @@ in the table are the size of the download files in megabytes.

- - + + - - + + - - + + - - + + - +
FormatPacked as .zipPacked as .tar.bz2
PDF (US-Letter paper size)Download (ca. 13 MB)Download (ca. 13 MB)Download (ca. 8 MB)Download (ca. 8 MB)
PDF (A4 paper size)Download (ca. 13 MB)Download (ca. 13 MB)Download (ca. 8 MB)Download (ca. 8 MB)
HTMLDownload (ca. 9 MB)Download (ca. 6 MB)Download (ca. 6 MB)Download (ca. 4 MB)
Plain TextDownload (ca. 3 MB)Download (ca. 2 MB)Download (ca. 2 MB)Download (ca. 1.5 MB)
EPUBDownload (ca. 5.5 MB)Download (ca. 4.5 MB)
@@ -42,7 +42,7 @@ in the table are the size of the download files in megabytes.

These archives contain all the content in the documentation.

HTML Help (.chm) files are made available in the "Windows" section -on the Python +on the Python download page.

diff --git a/Doc/tools/templates/indexcontent.html b/Doc/tools/templates/indexcontent.html index d795c0a..1076c1f 100644 --- a/Doc/tools/templates/indexcontent.html +++ b/Doc/tools/templates/indexcontent.html @@ -1,12 +1,5 @@ -{% extends "layout.html" %} -{%- block htmltitle -%} -{{ shorttitle }} -{%- endblock -%} -{% block body %} -

{{ docstitle|e }}

-

- {% trans %}Welcome! This is the documentation for Python {{ release }}.{% endtrans %} -

+{% extends "defindex.html" %} +{% block tables %}

{% trans %}Parts of the documentation:{% endtrans %}

- - - + + + @@ -403,9 +403,9 @@ - - - + + + diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py index 0fd1348..b9b5ac2 100644 --- a/Lib/test/test_dis.py +++ b/Lib/test/test_dis.py @@ -40,41 +40,41 @@ class _C: dis_c_instance_method = """\ %3d 0 LOAD_FAST 1 (x) - 3 LOAD_CONST 1 (1) - 6 COMPARE_OP 2 (==) - 9 LOAD_FAST 0 (self) - 12 STORE_ATTR 0 (x) - 15 LOAD_CONST 0 (None) - 18 RETURN_VALUE + 2 LOAD_CONST 1 (1) + 4 COMPARE_OP 2 (==) + 6 LOAD_FAST 0 (self) + 8 STORE_ATTR 0 (x) + 10 LOAD_CONST 0 (None) + 12 RETURN_VALUE """ % (_C.__init__.__code__.co_firstlineno + 1,) dis_c_instance_method_bytes = """\ 0 LOAD_FAST 1 (1) - 3 LOAD_CONST 1 (1) - 6 COMPARE_OP 2 (==) - 9 LOAD_FAST 0 (0) - 12 STORE_ATTR 0 (0) - 15 LOAD_CONST 0 (0) - 18 RETURN_VALUE + 2 LOAD_CONST 1 (1) + 4 COMPARE_OP 2 (==) + 6 LOAD_FAST 0 (0) + 8 STORE_ATTR 0 (0) + 10 LOAD_CONST 0 (0) + 12 RETURN_VALUE """ dis_c_class_method = """\ %3d 0 LOAD_FAST 1 (x) - 3 LOAD_CONST 1 (1) - 6 COMPARE_OP 2 (==) - 9 LOAD_FAST 0 (cls) - 12 STORE_ATTR 0 (x) - 15 LOAD_CONST 0 (None) - 18 RETURN_VALUE + 2 LOAD_CONST 1 (1) + 4 COMPARE_OP 2 (==) + 6 LOAD_FAST 0 (cls) + 8 STORE_ATTR 0 (x) + 10 LOAD_CONST 0 (None) + 12 RETURN_VALUE """ % (_C.cm.__code__.co_firstlineno + 2,) dis_c_static_method = """\ %3d 0 LOAD_FAST 0 (x) - 3 LOAD_CONST 1 (1) - 6 COMPARE_OP 2 (==) - 9 STORE_FAST 0 (x) - 12 LOAD_CONST 0 (None) - 15 RETURN_VALUE + 2 LOAD_CONST 1 (1) + 4 COMPARE_OP 2 (==) + 6 STORE_FAST 0 (x) + 8 LOAD_CONST 0 (None) + 10 RETURN_VALUE """ % (_C.sm.__code__.co_firstlineno + 2,) # Class disassembling info has an extra newline at end. @@ -95,23 +95,23 @@ def _f(a): dis_f = """\ %3d 0 LOAD_GLOBAL 0 (print) - 3 LOAD_FAST 0 (a) - 6 CALL_FUNCTION 1 (1 positional, 0 keyword pair) - 9 POP_TOP + 2 LOAD_FAST 0 (a) + 4 CALL_FUNCTION 1 + 6 POP_TOP -%3d 10 LOAD_CONST 1 (1) - 13 RETURN_VALUE +%3d 8 LOAD_CONST 1 (1) + 10 RETURN_VALUE """ % (_f.__code__.co_firstlineno + 1, _f.__code__.co_firstlineno + 2) dis_f_co_code = """\ 0 LOAD_GLOBAL 0 (0) - 3 LOAD_FAST 0 (0) - 6 CALL_FUNCTION 1 (1 positional, 0 keyword pair) - 9 POP_TOP - 10 LOAD_CONST 1 (1) - 13 RETURN_VALUE + 2 LOAD_FAST 0 (0) + 4 CALL_FUNCTION 1 + 6 POP_TOP + 8 LOAD_CONST 1 (1) + 10 RETURN_VALUE """ @@ -121,20 +121,20 @@ def bug708901(): pass dis_bug708901 = """\ -%3d 0 SETUP_LOOP 23 (to 26) - 3 LOAD_GLOBAL 0 (range) - 6 LOAD_CONST 1 (1) - -%3d 9 LOAD_CONST 2 (10) - 12 CALL_FUNCTION 2 (2 positional, 0 keyword pair) - 15 GET_ITER - >> 16 FOR_ITER 6 (to 25) - 19 STORE_FAST 0 (res) - -%3d 22 JUMP_ABSOLUTE 16 - >> 25 POP_BLOCK - >> 26 LOAD_CONST 0 (None) - 29 RETURN_VALUE +%3d 0 SETUP_LOOP 18 (to 20) + 2 LOAD_GLOBAL 0 (range) + 4 LOAD_CONST 1 (1) + +%3d 6 LOAD_CONST 2 (10) + 8 CALL_FUNCTION 2 + 10 GET_ITER + >> 12 FOR_ITER 4 (to 18) + 14 STORE_FAST 0 (res) + +%3d 16 JUMP_ABSOLUTE 12 + >> 18 POP_BLOCK + >> 20 LOAD_CONST 0 (None) + 22 RETURN_VALUE """ % (bug708901.__code__.co_firstlineno + 1, bug708901.__code__.co_firstlineno + 2, bug708901.__code__.co_firstlineno + 3) @@ -147,22 +147,22 @@ def bug1333982(x=[]): dis_bug1333982 = """\ %3d 0 LOAD_CONST 1 (0) - 3 POP_JUMP_IF_TRUE 35 - 6 LOAD_GLOBAL 0 (AssertionError) - 9 LOAD_CONST 2 ( at 0x..., file "%s", line %d>) - 12 LOAD_CONST 3 ('bug1333982..') - 15 MAKE_FUNCTION 0 - 18 LOAD_FAST 0 (x) - 21 GET_ITER - 22 CALL_FUNCTION 1 (1 positional, 0 keyword pair) - -%3d 25 LOAD_CONST 4 (1) - 28 BINARY_ADD - 29 CALL_FUNCTION 1 (1 positional, 0 keyword pair) - 32 RAISE_VARARGS 1 - -%3d >> 35 LOAD_CONST 0 (None) - 38 RETURN_VALUE + 2 POP_JUMP_IF_TRUE 26 + 4 LOAD_GLOBAL 0 (AssertionError) + 6 LOAD_CONST 2 ( at 0x..., file "%s", line %d>) + 8 LOAD_CONST 3 ('bug1333982..') + 10 MAKE_FUNCTION 0 + 12 LOAD_FAST 0 (x) + 14 GET_ITER + 16 CALL_FUNCTION 1 + +%3d 18 LOAD_CONST 4 (1) + 20 BINARY_ADD + 22 CALL_FUNCTION 1 + 24 RAISE_VARARGS 1 + +%3d >> 26 LOAD_CONST 0 (None) + 28 RETURN_VALUE """ % (bug1333982.__code__.co_firstlineno + 1, __file__, bug1333982.__code__.co_firstlineno + 1, @@ -171,19 +171,19 @@ dis_bug1333982 = """\ _BIG_LINENO_FORMAT = """\ %3d 0 LOAD_GLOBAL 0 (spam) - 3 POP_TOP + 2 POP_TOP 4 LOAD_CONST 0 (None) - 7 RETURN_VALUE + 6 RETURN_VALUE """ dis_module_expected_results = """\ Disassembly of f: 4 0 LOAD_CONST 0 (None) - 3 RETURN_VALUE + 2 RETURN_VALUE Disassembly of g: 5 0 LOAD_CONST 0 (None) - 3 RETURN_VALUE + 2 RETURN_VALUE """ @@ -191,20 +191,52 @@ expr_str = "x + 1" dis_expr_str = """\ 1 0 LOAD_NAME 0 (x) - 3 LOAD_CONST 0 (1) - 6 BINARY_ADD - 7 RETURN_VALUE + 2 LOAD_CONST 0 (1) + 4 BINARY_ADD + 6 RETURN_VALUE """ simple_stmt_str = "x = x + 1" dis_simple_stmt_str = """\ 1 0 LOAD_NAME 0 (x) - 3 LOAD_CONST 0 (1) - 6 BINARY_ADD - 7 STORE_NAME 0 (x) - 10 LOAD_CONST 1 (None) - 13 RETURN_VALUE + 2 LOAD_CONST 0 (1) + 4 BINARY_ADD + 6 STORE_NAME 0 (x) + 8 LOAD_CONST 1 (None) + 10 RETURN_VALUE +""" + +annot_stmt_str = """\ + +x: int = 1 +y: fun(1) +lst[fun(0)]: int = 1 +""" +# leading newline is for a reason (tests lineno) + +dis_annot_stmt_str = """\ + 2 0 SETUP_ANNOTATIONS + 2 LOAD_CONST 0 (1) + 4 STORE_NAME 0 (x) + 6 LOAD_NAME 1 (int) + 8 STORE_ANNOTATION 0 (x) + + 3 10 LOAD_NAME 2 (fun) + 12 LOAD_CONST 0 (1) + 14 CALL_FUNCTION 1 + 16 STORE_ANNOTATION 3 (y) + + 4 18 LOAD_CONST 0 (1) + 20 LOAD_NAME 4 (lst) + 22 LOAD_NAME 2 (fun) + 24 LOAD_CONST 1 (0) + 26 CALL_FUNCTION 1 + 28 STORE_SUBSCR + 30 LOAD_NAME 1 (int) + 32 POP_TOP + 34 LOAD_CONST 2 (None) + 36 RETURN_VALUE """ compound_stmt_str = """\ @@ -215,60 +247,81 @@ while 1: dis_compound_stmt_str = """\ 1 0 LOAD_CONST 0 (0) - 3 STORE_NAME 0 (x) - - 2 6 SETUP_LOOP 14 (to 23) - - 3 >> 9 LOAD_NAME 0 (x) - 12 LOAD_CONST 1 (1) - 15 INPLACE_ADD - 16 STORE_NAME 0 (x) - 19 JUMP_ABSOLUTE 9 - 22 POP_BLOCK - >> 23 LOAD_CONST 2 (None) - 26 RETURN_VALUE + 2 STORE_NAME 0 (x) + + 2 4 SETUP_LOOP 12 (to 18) + + 3 >> 6 LOAD_NAME 0 (x) + 8 LOAD_CONST 1 (1) + 10 INPLACE_ADD + 12 STORE_NAME 0 (x) + 14 JUMP_ABSOLUTE 6 + 16 POP_BLOCK + >> 18 LOAD_CONST 2 (None) + 20 RETURN_VALUE """ dis_traceback = """\ -%3d 0 SETUP_EXCEPT 12 (to 15) +%3d 0 SETUP_EXCEPT 12 (to 14) -%3d 3 LOAD_CONST 1 (1) - 6 LOAD_CONST 2 (0) - --> 9 BINARY_TRUE_DIVIDE - 10 POP_TOP - 11 POP_BLOCK - 12 JUMP_FORWARD 46 (to 61) +%3d 2 LOAD_CONST 1 (1) + 4 LOAD_CONST 2 (0) + --> 6 BINARY_TRUE_DIVIDE + 8 POP_TOP + 10 POP_BLOCK + 12 JUMP_FORWARD 40 (to 54) -%3d >> 15 DUP_TOP +%3d >> 14 DUP_TOP 16 LOAD_GLOBAL 0 (Exception) - 19 COMPARE_OP 10 (exception match) - 22 POP_JUMP_IF_FALSE 60 - 25 POP_TOP - 26 STORE_FAST 0 (e) - 29 POP_TOP - 30 SETUP_FINALLY 14 (to 47) - -%3d 33 LOAD_FAST 0 (e) - 36 LOAD_ATTR 1 (__traceback__) - 39 STORE_FAST 1 (tb) - 42 POP_BLOCK - 43 POP_EXCEPT - 44 LOAD_CONST 0 (None) - >> 47 LOAD_CONST 0 (None) - 50 STORE_FAST 0 (e) - 53 DELETE_FAST 0 (e) - 56 END_FINALLY - 57 JUMP_FORWARD 1 (to 61) - >> 60 END_FINALLY - -%3d >> 61 LOAD_FAST 1 (tb) - 64 RETURN_VALUE + 18 COMPARE_OP 10 (exception match) + 20 POP_JUMP_IF_FALSE 52 + 22 POP_TOP + 24 STORE_FAST 0 (e) + 26 POP_TOP + 28 SETUP_FINALLY 12 (to 42) + +%3d 30 LOAD_FAST 0 (e) + 32 LOAD_ATTR 1 (__traceback__) + 34 STORE_FAST 1 (tb) + 36 POP_BLOCK + 38 POP_EXCEPT + 40 LOAD_CONST 0 (None) + >> 42 LOAD_CONST 0 (None) + 44 STORE_FAST 0 (e) + 46 DELETE_FAST 0 (e) + 48 END_FINALLY + 50 JUMP_FORWARD 2 (to 54) + >> 52 END_FINALLY + +%3d >> 54 LOAD_FAST 1 (tb) + 56 RETURN_VALUE """ % (TRACEBACK_CODE.co_firstlineno + 1, TRACEBACK_CODE.co_firstlineno + 2, TRACEBACK_CODE.co_firstlineno + 3, TRACEBACK_CODE.co_firstlineno + 4, TRACEBACK_CODE.co_firstlineno + 5) +def _fstring(a, b, c, d): + return f'{a} {b:4} {c!r} {d!r:4}' + +dis_fstring = """\ +%3d 0 LOAD_FAST 0 (a) + 2 FORMAT_VALUE 0 + 4 LOAD_CONST 1 (' ') + 6 LOAD_FAST 1 (b) + 8 LOAD_CONST 2 ('4') + 10 FORMAT_VALUE 4 (with format) + 12 LOAD_CONST 1 (' ') + 14 LOAD_FAST 2 (c) + 16 FORMAT_VALUE 2 (repr) + 18 LOAD_CONST 1 (' ') + 20 LOAD_FAST 3 (d) + 22 LOAD_CONST 2 ('4') + 24 FORMAT_VALUE 6 (repr, with format) + 26 BUILD_STRING 7 + 28 RETURN_VALUE +""" % (_fstring.__code__.co_firstlineno + 1,) + def _g(x): yield x @@ -345,6 +398,7 @@ class DisTests(unittest.TestCase): def test_disassemble_str(self): self.do_disassembly_test(expr_str, dis_expr_str) self.do_disassembly_test(simple_stmt_str, dis_simple_stmt_str) + self.do_disassembly_test(annot_stmt_str, dis_annot_stmt_str) self.do_disassembly_test(compound_stmt_str, dis_compound_stmt_str) def test_disassemble_bytes(self): @@ -371,6 +425,9 @@ class DisTests(unittest.TestCase): gen_disas = self.get_disassembly(_g(1)) # Disassemble generator itself self.assertEqual(gen_disas, gen_func_disas) + def test_disassemble_fstring(self): + self.do_disassembly_test(_fstring, dis_fstring) + def test_dis_none(self): try: del sys.last_traceback @@ -541,7 +598,7 @@ Argument count: 0 Kw-only arguments: 0 Number of locals: 2 Stack size: 17 -Flags: OPTIMIZED, NEWLOCALS, GENERATOR, NOFREE, COROUTINE +Flags: OPTIMIZED, NEWLOCALS, NOFREE, COROUTINE Constants: 0: None 1: 1""" @@ -649,171 +706,169 @@ expected_jumpy_line = 1 Instruction = dis.Instruction expected_opinfo_outer = [ - Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=3, argrepr='3', offset=0, starts_line=2, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=3, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='b', argrepr='b', offset=9, starts_line=None, is_jump_target=False), - Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=12, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=15, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer..f', argrepr="'outer..f'", offset=18, starts_line=None, is_jump_target=False), - Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=21, starts_line=None, is_jump_target=False), - Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=24, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=27, starts_line=7, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=30, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=33, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval='', argrepr="''", offset=36, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval=1, argrepr='1', offset=39, starts_line=None, is_jump_target=False), - Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=42, starts_line=None, is_jump_target=False), - Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=45, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval='Hello world!', argrepr="'Hello world!'", offset=48, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=7, argval=7, argrepr='7 positional, 0 keyword pair', offset=51, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=54, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=55, starts_line=8, is_jump_target=False), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=58, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval=(3, 4), argrepr='(3, 4)', offset=0, starts_line=2, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='a', argrepr='a', offset=2, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='b', argrepr='b', offset=4, starts_line=None, is_jump_target=False), + Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=6, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=8, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer..f', argrepr="'outer..f'", offset=10, starts_line=None, is_jump_target=False), + Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='', offset=12, starts_line=None, is_jump_target=False), + Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=14, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=16, starts_line=7, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=18, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=20, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval='', argrepr="''", offset=22, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval=1, argrepr='1', offset=24, starts_line=None, is_jump_target=False), + Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=26, starts_line=None, is_jump_target=False), + Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=28, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval='Hello world!', argrepr="'Hello world!'", offset=30, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=7, argval=7, argrepr='', offset=32, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=34, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=36, starts_line=8, is_jump_target=False), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=38, starts_line=None, is_jump_target=False), ] expected_opinfo_f = [ - Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=5, argrepr='5', offset=0, starts_line=3, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=6, argrepr='6', offset=3, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=2, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=3, argval='b', argrepr='b', offset=9, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='c', argrepr='c', offset=12, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='d', argrepr='d', offset=15, starts_line=None, is_jump_target=False), - Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=18, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=21, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer..f..inner', argrepr="'outer..f..inner'", offset=24, starts_line=None, is_jump_target=False), - Instruction(opname='MAKE_CLOSURE', opcode=134, arg=2, argval=2, argrepr='', offset=27, starts_line=None, is_jump_target=False), - Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=30, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=33, starts_line=5, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='a', argrepr='a', offset=36, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='b', argrepr='b', offset=39, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='c', argrepr='c', offset=42, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='d', argrepr='d', offset=45, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=4, argval=4, argrepr='4 positional, 0 keyword pair', offset=48, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=51, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=52, starts_line=6, is_jump_target=False), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=55, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=(5, 6), argrepr='(5, 6)', offset=0, starts_line=3, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=2, argval='a', argrepr='a', offset=2, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=3, argval='b', argrepr='b', offset=4, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=0, argval='c', argrepr='c', offset=6, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CLOSURE', opcode=135, arg=1, argval='d', argrepr='d', offset=8, starts_line=None, is_jump_target=False), + Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=10, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=12, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='outer..f..inner', argrepr="'outer..f..inner'", offset=14, starts_line=None, is_jump_target=False), + Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='', offset=16, starts_line=None, is_jump_target=False), + Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=18, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=20, starts_line=5, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='a', argrepr='a', offset=22, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='b', argrepr='b', offset=24, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='c', argrepr='c', offset=26, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='d', argrepr='d', offset=28, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=4, argval=4, argrepr='', offset=30, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=32, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=34, starts_line=6, is_jump_target=False), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False), ] expected_opinfo_inner = [ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=0, starts_line=4, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=3, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=6, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='c', argrepr='c', offset=9, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='d', argrepr='d', offset=12, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=15, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=18, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=6, argval=6, argrepr='6 positional, 0 keyword pair', offset=21, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=24, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=25, starts_line=None, is_jump_target=False), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=28, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=0, argval='a', argrepr='a', offset=2, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=1, argval='b', argrepr='b', offset=4, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=2, argval='c', argrepr='c', offset=6, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_DEREF', opcode=136, arg=3, argval='d', argrepr='d', offset=8, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=10, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=12, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=6, argval=6, argrepr='', offset=14, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=16, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=18, starts_line=None, is_jump_target=False), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=20, starts_line=None, is_jump_target=False), ] expected_opinfo_jumpy = [ - Instruction(opname='SETUP_LOOP', opcode=120, arg=68, argval=71, argrepr='to 71', offset=0, starts_line=3, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=3, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=6, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=9, starts_line=None, is_jump_target=False), - Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=12, starts_line=None, is_jump_target=False), - Instruction(opname='FOR_ITER', opcode=93, arg=44, argval=60, argrepr='to 60', offset=13, starts_line=None, is_jump_target=True), - Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=16, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=19, starts_line=4, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=22, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=25, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=28, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=29, starts_line=5, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=32, starts_line=None, is_jump_target=False), - Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=35, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=44, argval=44, argrepr='', offset=38, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=13, argval=13, argrepr='', offset=41, starts_line=6, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=44, starts_line=7, is_jump_target=True), - Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=47, starts_line=None, is_jump_target=False), - Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=50, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=13, argval=13, argrepr='', offset=53, starts_line=None, is_jump_target=False), - Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=56, starts_line=8, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=13, argval=13, argrepr='', offset=57, starts_line=None, is_jump_target=False), - Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=60, starts_line=None, is_jump_target=True), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=61, starts_line=10, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=64, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=67, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=70, starts_line=None, is_jump_target=False), - Instruction(opname='SETUP_LOOP', opcode=120, arg=68, argval=142, argrepr='to 142', offset=71, starts_line=11, is_jump_target=True), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=74, starts_line=None, is_jump_target=True), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=131, argval=131, argrepr='', offset=77, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=80, starts_line=12, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=83, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=86, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=89, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=90, starts_line=13, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=93, starts_line=None, is_jump_target=False), - Instruction(opname='INPLACE_SUBTRACT', opcode=56, arg=None, argval=None, argrepr='', offset=96, starts_line=None, is_jump_target=False), - Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=97, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=100, starts_line=14, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=103, starts_line=None, is_jump_target=False), - Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=106, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=115, argval=115, argrepr='', offset=109, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=74, argval=74, argrepr='', offset=112, starts_line=15, is_jump_target=False), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=115, starts_line=16, is_jump_target=True), - Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=118, starts_line=None, is_jump_target=False), - Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=121, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=74, argval=74, argrepr='', offset=124, starts_line=None, is_jump_target=False), - Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=127, starts_line=17, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=74, argval=74, argrepr='', offset=128, starts_line=None, is_jump_target=False), - Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=131, starts_line=None, is_jump_target=True), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=132, starts_line=19, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=135, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=138, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=141, starts_line=None, is_jump_target=False), - Instruction(opname='SETUP_FINALLY', opcode=122, arg=73, argval=218, argrepr='to 218', offset=142, starts_line=20, is_jump_target=True), - Instruction(opname='SETUP_EXCEPT', opcode=121, arg=12, argval=160, argrepr='to 160', offset=145, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=148, starts_line=21, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=151, starts_line=None, is_jump_target=False), - Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=154, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=155, starts_line=None, is_jump_target=False), - Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=156, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=28, argval=188, argrepr='to 188', offset=157, starts_line=None, is_jump_target=False), - Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=160, starts_line=22, is_jump_target=True), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=161, starts_line=None, is_jump_target=False), - Instruction(opname='COMPARE_OP', opcode=107, arg=10, argval='exception match', argrepr='exception match', offset=164, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=187, argval=187, argrepr='', offset=167, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=171, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=173, starts_line=23, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=176, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=179, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False), - Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=183, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=27, argval=214, argrepr='to 214', offset=184, starts_line=None, is_jump_target=False), - Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=187, starts_line=None, is_jump_target=True), - Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=188, starts_line=25, is_jump_target=True), - Instruction(opname='SETUP_WITH', opcode=143, arg=17, argval=211, argrepr='to 211', offset=191, starts_line=None, is_jump_target=False), - Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=194, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=197, starts_line=26, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=200, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=203, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=206, starts_line=None, is_jump_target=False), - Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=207, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=208, starts_line=None, is_jump_target=False), - Instruction(opname='WITH_CLEANUP_START', opcode=81, arg=None, argval=None, argrepr='', offset=211, starts_line=None, is_jump_target=True), - Instruction(opname='WITH_CLEANUP_FINISH', opcode=82, arg=None, argval=None, argrepr='', offset=212, starts_line=None, is_jump_target=False), - Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=213, starts_line=None, is_jump_target=False), - Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=214, starts_line=None, is_jump_target=True), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=215, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=218, starts_line=28, is_jump_target=True), - Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=221, starts_line=None, is_jump_target=False), - Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=224, starts_line=None, is_jump_target=False), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=227, starts_line=None, is_jump_target=False), - Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=228, starts_line=None, is_jump_target=False), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=229, starts_line=None, is_jump_target=False), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=232, starts_line=None, is_jump_target=False), + Instruction(opname='SETUP_LOOP', opcode=120, arg=52, argval=54, argrepr='to 54', offset=0, starts_line=3, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=2, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=4, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=6, starts_line=None, is_jump_target=False), + Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=8, starts_line=None, is_jump_target=False), + Instruction(opname='FOR_ITER', opcode=93, arg=32, argval=44, argrepr='to 44', offset=10, starts_line=None, is_jump_target=True), + Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=12, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=14, starts_line=4, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=16, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=18, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=20, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=22, starts_line=5, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=24, starts_line=None, is_jump_target=False), + Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=26, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=32, argval=32, argrepr='', offset=28, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=10, argval=10, argrepr='', offset=30, starts_line=6, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=32, starts_line=7, is_jump_target=True), + Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=34, starts_line=None, is_jump_target=False), + Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=36, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=10, argval=10, argrepr='', offset=38, starts_line=None, is_jump_target=False), + Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=40, starts_line=8, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=10, argval=10, argrepr='', offset=42, starts_line=None, is_jump_target=False), + Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=44, starts_line=None, is_jump_target=True), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=46, starts_line=10, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=48, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=50, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=52, starts_line=None, is_jump_target=False), + Instruction(opname='SETUP_LOOP', opcode=120, arg=52, argval=108, argrepr='to 108', offset=54, starts_line=11, is_jump_target=True), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=56, starts_line=None, is_jump_target=True), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=98, argval=98, argrepr='', offset=58, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=60, starts_line=12, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=62, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=64, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=66, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=68, starts_line=13, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=70, starts_line=None, is_jump_target=False), + Instruction(opname='INPLACE_SUBTRACT', opcode=56, arg=None, argval=None, argrepr='', offset=72, starts_line=None, is_jump_target=False), + Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=74, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=76, starts_line=14, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=78, starts_line=None, is_jump_target=False), + Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=80, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=86, argval=86, argrepr='', offset=82, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=56, argval=56, argrepr='', offset=84, starts_line=15, is_jump_target=False), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=86, starts_line=16, is_jump_target=True), + Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=88, starts_line=None, is_jump_target=False), + Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=90, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=56, argval=56, argrepr='', offset=92, starts_line=None, is_jump_target=False), + Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=94, starts_line=17, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=56, argval=56, argrepr='', offset=96, starts_line=None, is_jump_target=False), + Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=98, starts_line=None, is_jump_target=True), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=100, starts_line=19, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=102, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=104, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=106, starts_line=None, is_jump_target=False), + Instruction(opname='SETUP_FINALLY', opcode=122, arg=70, argval=180, argrepr='to 180', offset=108, starts_line=20, is_jump_target=True), + Instruction(opname='SETUP_EXCEPT', opcode=121, arg=12, argval=124, argrepr='to 124', offset=110, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=112, starts_line=21, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=114, starts_line=None, is_jump_target=False), + Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=116, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=118, starts_line=None, is_jump_target=False), + Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=120, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=28, argval=152, argrepr='to 152', offset=122, starts_line=None, is_jump_target=False), + Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=124, starts_line=22, is_jump_target=True), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=126, starts_line=None, is_jump_target=False), + Instruction(opname='COMPARE_OP', opcode=107, arg=10, argval='exception match', argrepr='exception match', offset=128, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=150, argval=150, argrepr='', offset=130, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=132, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=134, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=136, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=138, starts_line=23, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=140, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=142, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=144, starts_line=None, is_jump_target=False), + Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=146, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=26, argval=176, argrepr='to 176', offset=148, starts_line=None, is_jump_target=False), + Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=150, starts_line=None, is_jump_target=True), + Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=152, starts_line=25, is_jump_target=True), + Instruction(opname='SETUP_WITH', opcode=143, arg=14, argval=170, argrepr='to 170', offset=154, starts_line=None, is_jump_target=False), + Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=156, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=158, starts_line=26, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=160, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=162, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=164, starts_line=None, is_jump_target=False), + Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=168, starts_line=None, is_jump_target=False), + Instruction(opname='WITH_CLEANUP_START', opcode=81, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=True), + Instruction(opname='WITH_CLEANUP_FINISH', opcode=82, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False), + Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=174, starts_line=None, is_jump_target=False), + Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=176, starts_line=None, is_jump_target=True), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=178, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=180, starts_line=28, is_jump_target=True), + Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=182, starts_line=None, is_jump_target=False), + Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=184, starts_line=None, is_jump_target=False), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False), + Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=190, starts_line=None, is_jump_target=False), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=192, starts_line=None, is_jump_target=False), ] # One last piece of inspect fodder to check the default line number handling def simple(): pass expected_opinfo_simple = [ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=0, starts_line=simple.__code__.co_firstlineno, is_jump_target=False), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=3, starts_line=None, is_jump_target=False) + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=2, starts_line=None, is_jump_target=False) ] diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 33163b9..2258c6b 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -291,7 +291,7 @@ constructor: ... ... Non-example text. ... - ... >>> print('another\example') + ... >>> print('another\\example') ... another ... example ... ''' @@ -1876,7 +1876,6 @@ if not hasattr(sys, 'gettrace') or not sys.gettrace(): To demonstrate this, we'll create a fake standard input that captures our debugger input: - >>> import tempfile >>> real_stdin = sys.stdin >>> sys.stdin = _FakeInput([ ... 'print(x)', # print data defined by the example @@ -1917,7 +1916,7 @@ if not hasattr(sys, 'gettrace') or not sys.gettrace(): ... finally: ... sys.stdin = real_stdin --Return-- - > (3)calls_set_trace()->None + > (3)calls_set_trace()->None -> import pdb; pdb.set_trace() (Pdb) print(y) 2 @@ -2798,7 +2797,6 @@ text files). ... _ = f.write(" 'abc def'\n") ... _ = f.write("\n") ... _ = f.write(' \"\"\"\n') - ... import shutil ... rc1, out1, err1 = script_helper.assert_python_failure( ... '-m', 'doctest', fn, fn2) ... rc2, out2, err2 = script_helper.assert_python_ok( @@ -2942,12 +2940,11 @@ Invalid doctest option: def test_main(): # Check the doctest cases in doctest itself: ret = support.run_doctest(doctest, verbosity=True) + # Check the doctest cases defined here: from test import test_doctest support.run_doctest(test_doctest, verbosity=True) -import sys, re, io - def test_coverage(coverdir): trace = support.import_module('trace') tracer = trace.Trace(ignoredirs=[sys.base_prefix, sys.base_exec_prefix,], diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py new file mode 100644 index 0000000..47a5010 --- /dev/null +++ b/Lib/test/test_dtrace.py @@ -0,0 +1,178 @@ +import dis +import os.path +import re +import subprocess +import sys +import types +import unittest + +from test.support import findfile, run_unittest + + +def abspath(filename): + return os.path.abspath(findfile(filename, subdir="dtracedata")) + + +def normalize_trace_output(output): + """Normalize DTrace output for comparison. + + DTrace keeps a per-CPU buffer, and when showing the fired probes, buffers + are concatenated. So if the operating system moves our thread around, the + straight result can be "non-causal". So we add timestamps to the probe + firing, sort by that field, then strip it from the output""" + + # When compiling with '--with-pydebug', strip '[# refs]' debug output. + output = re.sub(r"\[[0-9]+ refs\]", "", output) + try: + result = [ + row.split("\t") + for row in output.splitlines() + if row and not row.startswith('#') + ] + result.sort(key=lambda row: int(row[0])) + result = [row[1] for row in result] + return "\n".join(result) + except (IndexError, ValueError): + raise AssertionError( + "tracer produced unparseable output:\n{}".format(output) + ) + + +class TraceBackend: + EXTENSION = None + COMMAND = None + COMMAND_ARGS = [] + + def run_case(self, name, optimize_python=None): + actual_output = normalize_trace_output(self.trace_python( + script_file=abspath(name + self.EXTENSION), + python_file=abspath(name + ".py"), + optimize_python=optimize_python)) + + with open(abspath(name + self.EXTENSION + ".expected")) as f: + expected_output = f.read().rstrip() + + return (expected_output, actual_output) + + def generate_trace_command(self, script_file, subcommand=None): + command = self.COMMAND + [script_file] + if subcommand: + command += ["-c", subcommand] + return command + + def trace(self, script_file, subcommand=None): + command = self.generate_trace_command(script_file, subcommand) + stdout, _ = subprocess.Popen(command, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True).communicate() + return stdout + + def trace_python(self, script_file, python_file, optimize_python=None): + python_flags = [] + if optimize_python: + python_flags.extend(["-O"] * optimize_python) + subcommand = " ".join([sys.executable] + python_flags + [python_file]) + return self.trace(script_file, subcommand) + + def assert_usable(self): + try: + output = self.trace(abspath("assert_usable" + self.EXTENSION)) + output = output.strip() + except (FileNotFoundError, PermissionError) as fnfe: + output = str(fnfe) + if output != "probe: success": + raise unittest.SkipTest( + "{}(1) failed: {}".format(self.COMMAND[0], output) + ) + + +class DTraceBackend(TraceBackend): + EXTENSION = ".d" + COMMAND = ["dtrace", "-q", "-s"] + + +class SystemTapBackend(TraceBackend): + EXTENSION = ".stp" + COMMAND = ["stap", "-g"] + + +class TraceTests(unittest.TestCase): + # unittest.TestCase options + maxDiff = None + + # TraceTests options + backend = None + optimize_python = 0 + + @classmethod + def setUpClass(self): + self.backend.assert_usable() + + def run_case(self, name): + actual_output, expected_output = self.backend.run_case( + name, optimize_python=self.optimize_python) + self.assertEqual(actual_output, expected_output) + + def test_function_entry_return(self): + self.run_case("call_stack") + + def test_verify_call_opcodes(self): + """Ensure our call stack test hits all function call opcodes""" + + opcodes = set(["CALL_FUNCTION", "CALL_FUNCTION_EX", "CALL_FUNCTION_KW"]) + + with open(abspath("call_stack.py")) as f: + code_string = f.read() + + def get_function_instructions(funcname): + # Recompile with appropriate optimization setting + code = compile(source=code_string, + filename="", + mode="exec", + optimize=self.optimize_python) + + for c in code.co_consts: + if isinstance(c, types.CodeType) and c.co_name == funcname: + return dis.get_instructions(c) + return [] + + for instruction in get_function_instructions('start'): + opcodes.discard(instruction.opname) + + self.assertEqual(set(), opcodes) + + def test_gc(self): + self.run_case("gc") + + def test_line(self): + self.run_case("line") + + +class DTraceNormalTests(TraceTests): + backend = DTraceBackend() + optimize_python = 0 + + +class DTraceOptimizedTests(TraceTests): + backend = DTraceBackend() + optimize_python = 2 + + +class SystemTapNormalTests(TraceTests): + backend = SystemTapBackend() + optimize_python = 0 + + +class SystemTapOptimizedTests(TraceTests): + backend = SystemTapBackend() + optimize_python = 2 + + +def test_main(): + run_unittest(DTraceNormalTests, DTraceOptimizedTests, SystemTapNormalTests, + SystemTapOptimizedTests) + + +if __name__ == '__main__': + test_main() diff --git a/Lib/test/test_dynamic.py b/Lib/test/test_dynamic.py index 5080ec9..3ae090f 100644 --- a/Lib/test/test_dynamic.py +++ b/Lib/test/test_dynamic.py @@ -1,7 +1,6 @@ # Test the most dynamic corner cases of Python's runtime semantics. import builtins -import contextlib import unittest from test.support import swap_item, swap_attr diff --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py index d4a03ee..888751e 100644 --- a/Lib/test/test_email/__init__.py +++ b/Lib/test/test_email/__init__.py @@ -1,5 +1,4 @@ import os -import sys import unittest import collections import email diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index b1e7dff..26ece69 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -581,7 +581,7 @@ class TestParser(TestParserMixin, TestEmailBase): def test_get_comment_quoted_parens(self): self._test_get_x(parser.get_comment, - '(foo\) \(\)bar)', '(foo\) \(\)bar)', ' ', [], '', ['foo) ()bar']) + r'(foo\) \(\)bar)', r'(foo\) \(\)bar)', ' ', [], '', ['foo) ()bar']) def test_get_comment_non_printable(self): self._test_get_x(parser.get_comment, @@ -625,7 +625,7 @@ class TestParser(TestParserMixin, TestEmailBase): def test_get_comment_qs_in_nested_comment(self): comment = self._test_get_x(parser.get_comment, - '(foo (b\)))', '(foo (b\)))', ' ', [], '', ['foo (b\))']) + r'(foo (b\)))', r'(foo (b\)))', ' ', [], '', [r'foo (b\))']) self.assertEqual(comment[2].content, 'b)') # get_cfws @@ -2711,17 +2711,5 @@ class TestFolding(TestEmailBase): self._test(parser.get_unstructured('xxx ' + 'y'*77), 'xxx \n ' + 'y'*77 + '\n') - def test_long_filename_attachment(self): - folded = self.policy.fold('Content-Disposition', 'attachment; filename="TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TES.txt"') - self.assertEqual( - 'Content-Disposition: attachment;\n filename="TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TES.txt"\n', - folded - ) - folded = self.policy.fold('Content-Disposition', 'attachment; filename="TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_T.txt"') - self.assertEqual( - 'Content-Disposition: attachment;\n filename="TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_T.txt"\n', - folded - ) - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_email/test_asian_codecs.py b/Lib/test/test_email/test_asian_codecs.py index f9cd7d9..1e0caee 100644 --- a/Lib/test/test_email/test_asian_codecs.py +++ b/Lib/test/test_email/test_asian_codecs.py @@ -3,7 +3,6 @@ # email package unit tests for (optional) Asian codecs import unittest -from test.support import run_unittest from test.test_email import TestEmailBase from email.charset import Charset diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 9b86a2a..daa1285 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -11,7 +11,6 @@ import textwrap from io import StringIO, BytesIO from itertools import chain from random import choice -from socket import getfqdn try: from threading import Thread except ImportError: @@ -32,6 +31,7 @@ from email.mime.image import MIMEImage from email.mime.base import MIMEBase from email.mime.message import MIMEMessage from email.mime.multipart import MIMEMultipart +from email.mime.nonmultipart import MIMENonMultipart from email import utils from email import errors from email import encoders @@ -2078,7 +2078,13 @@ YXNkZg== --===============0012394164==--""") self.assertEqual(m.get_payload(0).get_payload(), 'YXNkZg==') + def test_mimebase_default_policy(self): + m = MIMEBase('multipart', 'mixed') + self.assertIs(m.policy, email.policy.compat32) + def test_mimebase_custom_policy(self): + m = MIMEBase('multipart', 'mixed', policy=email.policy.default) + self.assertIs(m.policy, email.policy.default) # Test some badly formatted messages class TestNonConformant(TestEmailBase): @@ -2680,6 +2686,19 @@ message 2 msg = MIMEMultipart() self.assertTrue(msg.is_multipart()) + def test_multipart_default_policy(self): + msg = MIMEMultipart() + msg['To'] = 'a@b.com' + msg['To'] = 'c@d.com' + self.assertEqual(msg.get_all('to'), ['a@b.com', 'c@d.com']) + + def test_multipart_custom_policy(self): + msg = MIMEMultipart(policy=email.policy.default) + msg['To'] = 'a@b.com' + with self.assertRaises(ValueError) as cm: + msg['To'] = 'c@d.com' + self.assertEqual(str(cm.exception), + 'There may be at most 1 To headers in a message') # A general test of parser->model->generator idempotency. IOW, read a message # in, parse it into a message object tree, then without touching the tree, @@ -3033,7 +3052,7 @@ class TestMiscellaneous(TestEmailBase): def test_escape_backslashes(self): self.assertEqual( - utils.formataddr(('Arthur \Backslash\ Foobar', 'person@dom.ain')), + utils.formataddr((r'Arthur \Backslash\ Foobar', 'person@dom.ain')), r'"Arthur \\Backslash\\ Foobar" ') a = r'Arthur \Backslash\ Foobar' b = 'person@dom.ain' @@ -3295,17 +3314,6 @@ multipart/report email.utils.make_msgid(domain='testdomain-string')[-19:], '@testdomain-string>') - def test_make_msgid_idstring(self): - self.assertEqual( - email.utils.make_msgid(idstring='test-idstring', - domain='testdomain-string')[-33:], - '.test-idstring@testdomain-string>') - - def test_make_msgid_default_domain(self): - self.assertTrue( - email.utils.make_msgid().endswith( - '@' + getfqdn() + '>')) - def test_Generator_linend(self): # Issue 14645. with openfile('msg_26.txt', newline='\n') as f: @@ -3340,6 +3348,27 @@ multipart/report g.flatten(msg, linesep='\r\n') self.assertEqual(s.getvalue(), msgtxt) + def test_mime_classes_policy_argument(self): + with openfile('audiotest.au', 'rb') as fp: + audiodata = fp.read() + with openfile('PyBanner048.gif', 'rb') as fp: + bindata = fp.read() + classes = [ + (MIMEApplication, ('',)), + (MIMEAudio, (audiodata,)), + (MIMEImage, (bindata,)), + (MIMEMessage, (Message(),)), + (MIMENonMultipart, ('multipart', 'mixed')), + (MIMEText, ('',)), + ] + for cls, constructor in classes: + with self.subTest(cls=cls.__name__, policy='compat32'): + m = cls(*constructor) + self.assertIs(m.policy, email.policy.compat32) + with self.subTest(cls=cls.__name__, policy='default'): + m = cls(*constructor, policy=email.policy.default) + self.assertIs(m.policy, email.policy.default) + # Test the iterator/generators class TestIterators(TestEmailBase): @@ -3448,7 +3477,6 @@ Do you like this message? class TestFeedParsers(TestEmailBase): def parse(self, chunks): - from email.feedparser import FeedParser feedparser = FeedParser() for chunk in chunks: feedparser.feed(chunk) diff --git a/Lib/test/test_email/test_generator.py b/Lib/test/test_email/test_generator.py index 226c5f9..7c8877f 100644 --- a/Lib/test/test_email/test_generator.py +++ b/Lib/test/test_email/test_generator.py @@ -143,7 +143,7 @@ class TestGeneratorBase: def test_set_mangle_from_via_policy(self): source = textwrap.dedent("""\ Subject: test that - from is mangeld in the body! + from is mangled in the body! From time to time I write a rhyme. """) @@ -162,13 +162,6 @@ class TestGeneratorBase: g.flatten(msg) self.assertEqual(s.getvalue(), self.typ(expected)) - def test_compat32_max_line_length_does_not_fold_when_none(self): - msg = self.msgmaker(self.typ(self.refold_long_expected[0])) - s = self.ioclass() - g = self.genclass(s, policy=policy.compat32.clone(max_line_length=None)) - g.flatten(msg) - self.assertEqual(s.getvalue(), self.typ(self.refold_long_expected[0])) - class TestGenerator(TestGeneratorBase, TestEmailBase): diff --git a/Lib/test/test_email/test_headerregistry.py b/Lib/test/test_email/test_headerregistry.py index 55ecdea..af836dc 100644 --- a/Lib/test/test_email/test_headerregistry.py +++ b/Lib/test/test_email/test_headerregistry.py @@ -1,7 +1,6 @@ import datetime import textwrap import unittest -import types from email import errors from email import policy from email.message import Message diff --git a/Lib/test/test_email/test_message.py b/Lib/test/test_email/test_message.py index 4345162..f3a57df 100644 --- a/Lib/test/test_email/test_message.py +++ b/Lib/test/test_email/test_message.py @@ -764,6 +764,26 @@ class TestEmailMessage(TestEmailMessageBase, TestEmailBase): m.set_content(content_manager=cm) self.assertEqual(m['MIME-Version'], '1.0') + def test_as_string_uses_max_header_length_by_default(self): + m = self._str_msg('Subject: long line' + ' ab'*50 + '\n\n') + self.assertEqual(len(m.as_string().strip().splitlines()), 3) + + def test_as_string_allows_maxheaderlen(self): + m = self._str_msg('Subject: long line' + ' ab'*50 + '\n\n') + self.assertEqual(len(m.as_string(maxheaderlen=0).strip().splitlines()), + 1) + self.assertEqual(len(m.as_string(maxheaderlen=34).strip().splitlines()), + 6) + + def test_str_defaults_to_policy_max_line_length(self): + m = self._str_msg('Subject: long line' + ' ab'*50 + '\n\n') + self.assertEqual(len(str(m).strip().splitlines()), 3) + + def test_str_defaults_to_utf8(self): + m = EmailMessage() + m['Subject'] = 'unicöde' + self.assertEqual(str(m), 'Subject: unicöde\n\n') + class TestMIMEPart(TestEmailMessageBase, TestEmailBase): # Doing the full test run here may seem a bit redundant, since the two diff --git a/Lib/test/test_email/test_parser.py b/Lib/test/test_email/test_parser.py index 8ddc176..06c8640 100644 --- a/Lib/test/test_email/test_parser.py +++ b/Lib/test/test_email/test_parser.py @@ -1,7 +1,7 @@ import io import email import unittest -from email.message import Message +from email.message import Message, EmailMessage from email.policy import default from test.test_email import TestEmailBase @@ -39,38 +39,71 @@ class TestParserBase: # The unicode line splitter splits on unicode linebreaks, which are # more numerous than allowed by the email RFCs; make sure we are only # splitting on those two. - msg = self.parser( - "Next-Line: not\x85broken\r\n" - "Null: not\x00broken\r\n" - "Vertical-Tab: not\vbroken\r\n" - "Form-Feed: not\fbroken\r\n" - "File-Separator: not\x1Cbroken\r\n" - "Group-Separator: not\x1Dbroken\r\n" - "Record-Separator: not\x1Ebroken\r\n" - "Line-Separator: not\u2028broken\r\n" - "Paragraph-Separator: not\u2029broken\r\n" - "\r\n", - policy=default, - ) - self.assertEqual(msg.items(), [ - ("Next-Line", "not\x85broken"), - ("Null", "not\x00broken"), - ("Vertical-Tab", "not\vbroken"), - ("Form-Feed", "not\fbroken"), - ("File-Separator", "not\x1Cbroken"), - ("Group-Separator", "not\x1Dbroken"), - ("Record-Separator", "not\x1Ebroken"), - ("Line-Separator", "not\u2028broken"), - ("Paragraph-Separator", "not\u2029broken"), - ]) - self.assertEqual(msg.get_payload(), "") + for parser in self.parsers: + with self.subTest(parser=parser.__name__): + msg = parser( + "Next-Line: not\x85broken\r\n" + "Null: not\x00broken\r\n" + "Vertical-Tab: not\vbroken\r\n" + "Form-Feed: not\fbroken\r\n" + "File-Separator: not\x1Cbroken\r\n" + "Group-Separator: not\x1Dbroken\r\n" + "Record-Separator: not\x1Ebroken\r\n" + "Line-Separator: not\u2028broken\r\n" + "Paragraph-Separator: not\u2029broken\r\n" + "\r\n", + policy=default, + ) + self.assertEqual(msg.items(), [ + ("Next-Line", "not\x85broken"), + ("Null", "not\x00broken"), + ("Vertical-Tab", "not\vbroken"), + ("Form-Feed", "not\fbroken"), + ("File-Separator", "not\x1Cbroken"), + ("Group-Separator", "not\x1Dbroken"), + ("Record-Separator", "not\x1Ebroken"), + ("Line-Separator", "not\u2028broken"), + ("Paragraph-Separator", "not\u2029broken"), + ]) + self.assertEqual(msg.get_payload(), "") + + class MyMessage(EmailMessage): + pass + + def test_custom_message_factory_on_policy(self): + for parser in self.parsers: + with self.subTest(parser=parser.__name__): + MyPolicy = default.clone(message_factory=self.MyMessage) + msg = parser("To: foo\n\ntest", policy=MyPolicy) + self.assertIsInstance(msg, self.MyMessage) + + def test_factory_arg_overrides_policy(self): + for parser in self.parsers: + with self.subTest(parser=parser.__name__): + MyPolicy = default.clone(message_factory=self.MyMessage) + msg = parser("To: foo\n\ntest", Message, policy=MyPolicy) + self.assertNotIsInstance(msg, self.MyMessage) + self.assertIsInstance(msg, Message) + +# Play some games to get nice output in subTest. This code could be clearer +# if staticmethod supported __name__. + +def message_from_file(s, *args, **kw): + f = io.StringIO(s) + return email.message_from_file(f, *args, **kw) class TestParser(TestParserBase, TestEmailBase): - parser = staticmethod(email.message_from_string) + parsers = (email.message_from_string, message_from_file) + +def message_from_bytes(s, *args, **kw): + return email.message_from_bytes(s.encode(), *args, **kw) + +def message_from_binary_file(s, *args, **kw): + f = io.BytesIO(s.encode()) + return email.message_from_binary_file(f, *args, **kw) class TestBytesParser(TestParserBase, TestEmailBase): - def parser(self, s, *args, **kw): - return email.message_from_bytes(s.encode(), *args, **kw) + parsers = (message_from_bytes, message_from_binary_file) if __name__ == '__main__': diff --git a/Lib/test/test_email/test_policy.py b/Lib/test/test_email/test_policy.py index 70ac4db..8fecb8a 100644 --- a/Lib/test/test_email/test_policy.py +++ b/Lib/test/test_email/test_policy.py @@ -5,6 +5,7 @@ import unittest import email.policy import email.parser import email.generator +import email.message from email import headerregistry def make_defaults(base_defaults, differences): @@ -23,6 +24,7 @@ class PolicyAPITests(unittest.TestCase): 'cte_type': '8bit', 'raise_on_defect': False, 'mangle_from_': True, + 'message_factory': None, } # These default values are the ones set on email.policy.default. # If any of these defaults change, the docs must be updated. @@ -34,6 +36,7 @@ class PolicyAPITests(unittest.TestCase): 'refold_source': 'long', 'content_manager': email.policy.EmailPolicy.content_manager, 'mangle_from_': False, + 'message_factory': email.message.EmailMessage, }) # For each policy under test, we give here what we expect the defaults to @@ -62,20 +65,22 @@ class PolicyAPITests(unittest.TestCase): def test_defaults(self): for policy, expected in self.policies.items(): for attr, value in expected.items(): - self.assertEqual(getattr(policy, attr), value, - ("change {} docs/docstrings if defaults have " - "changed").format(policy)) + with self.subTest(policy=policy, attr=attr): + self.assertEqual(getattr(policy, attr), value, + ("change {} docs/docstrings if defaults have " + "changed").format(policy)) def test_all_attributes_covered(self): for policy, expected in self.policies.items(): for attr in dir(policy): - if (attr.startswith('_') or - isinstance(getattr(email.policy.EmailPolicy, attr), - types.FunctionType)): - continue - else: - self.assertIn(attr, expected, - "{} is not fully tested".format(attr)) + with self.subTest(policy=policy, attr=attr): + if (attr.startswith('_') or + isinstance(getattr(email.policy.EmailPolicy, attr), + types.FunctionType)): + continue + else: + self.assertIn(attr, expected, + "{} is not fully tested".format(attr)) def test_abc(self): with self.assertRaises(TypeError) as cm: @@ -237,6 +242,9 @@ class PolicyAPITests(unittest.TestCase): # wins), but that the order still works (right overrides left). +class TestException(Exception): + pass + class TestPolicyPropagation(unittest.TestCase): # The abstract methods are used by the parser but not by the wrapper @@ -244,40 +252,40 @@ class TestPolicyPropagation(unittest.TestCase): # policy was actually propagated all the way to feedparser. class MyPolicy(email.policy.Policy): def badmethod(self, *args, **kw): - raise Exception("test") + raise TestException("test") fold = fold_binary = header_fetch_parser = badmethod header_source_parse = header_store_parse = badmethod def test_message_from_string(self): - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): email.message_from_string("Subject: test\n\n", policy=self.MyPolicy) def test_message_from_bytes(self): - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): email.message_from_bytes(b"Subject: test\n\n", policy=self.MyPolicy) def test_message_from_file(self): f = io.StringIO('Subject: test\n\n') - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): email.message_from_file(f, policy=self.MyPolicy) def test_message_from_binary_file(self): f = io.BytesIO(b'Subject: test\n\n') - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): email.message_from_binary_file(f, policy=self.MyPolicy) # These are redundant, but we need them for black-box completeness. def test_parser(self): p = email.parser.Parser(policy=self.MyPolicy) - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): p.parsestr('Subject: test\n\n') def test_bytes_parser(self): p = email.parser.BytesParser(policy=self.MyPolicy) - with self.assertRaisesRegex(Exception, "^test$"): + with self.assertRaisesRegex(TestException, "^test$"): p.parsebytes(b'Subject: test\n\n') # Now that we've established that all the parse methods get the diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py index a78ca14..9b04c18 100644 --- a/Lib/test/test_ensurepip.py +++ b/Lib/test/test_ensurepip.py @@ -9,19 +9,6 @@ import sys import ensurepip import ensurepip._uninstall -# pip currently requires ssl support, so we ensure we handle -# it being missing (http://bugs.python.org/issue19744) -ensurepip_no_ssl = test.support.import_fresh_module("ensurepip", - blocked=["ssl"]) -try: - import ssl -except ImportError: - def requires_usable_pip(f): - deco = unittest.skip(ensurepip._MISSING_SSL_MESSAGE) - return deco(f) -else: - def requires_usable_pip(f): - return f class TestEnsurePipVersion(unittest.TestCase): @@ -47,7 +34,6 @@ class EnsurepipMixin: class TestBootstrap(EnsurepipMixin, unittest.TestCase): - @requires_usable_pip def test_basic_bootstrapping(self): ensurepip.bootstrap() @@ -62,7 +48,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): additional_paths = self.run_pip.call_args[0][1] self.assertEqual(len(additional_paths), 2) - @requires_usable_pip def test_bootstrapping_with_root(self): ensurepip.bootstrap(root="/foo/bar/") @@ -75,7 +60,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_user(self): ensurepip.bootstrap(user=True) @@ -87,7 +71,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_upgrade(self): ensurepip.bootstrap(upgrade=True) @@ -99,7 +82,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_verbosity_1(self): ensurepip.bootstrap(verbosity=1) @@ -111,7 +93,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_verbosity_2(self): ensurepip.bootstrap(verbosity=2) @@ -123,7 +104,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_verbosity_3(self): ensurepip.bootstrap(verbosity=3) @@ -135,17 +115,14 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): unittest.mock.ANY, ) - @requires_usable_pip def test_bootstrapping_with_regular_install(self): ensurepip.bootstrap() self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "install") - @requires_usable_pip def test_bootstrapping_with_alt_install(self): ensurepip.bootstrap(altinstall=True) self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "altinstall") - @requires_usable_pip def test_bootstrapping_with_default_pip(self): ensurepip.bootstrap(default_pip=True) self.assertNotIn("ENSUREPIP_OPTIONS", self.os_environ) @@ -155,7 +132,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): ensurepip.bootstrap(altinstall=True, default_pip=True) self.assertFalse(self.run_pip.called) - @requires_usable_pip def test_pip_environment_variables_removed(self): # ensurepip deliberately ignores all pip environment variables # See http://bugs.python.org/issue19734 for details @@ -163,7 +139,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase): ensurepip.bootstrap() self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) - @requires_usable_pip def test_pip_config_file_disabled(self): # ensurepip deliberately ignores the pip config file # See http://bugs.python.org/issue20053 for details @@ -205,7 +180,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): self.assertFalse(self.run_pip.called) - @requires_usable_pip def test_uninstall(self): with fake_pip(): ensurepip._uninstall_helper() @@ -217,7 +191,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ] ) - @requires_usable_pip def test_uninstall_with_verbosity_1(self): with fake_pip(): ensurepip._uninstall_helper(verbosity=1) @@ -229,7 +202,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ] ) - @requires_usable_pip def test_uninstall_with_verbosity_2(self): with fake_pip(): ensurepip._uninstall_helper(verbosity=2) @@ -241,7 +213,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ] ) - @requires_usable_pip def test_uninstall_with_verbosity_3(self): with fake_pip(): ensurepip._uninstall_helper(verbosity=3) @@ -253,7 +224,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ] ) - @requires_usable_pip def test_pip_environment_variables_removed(self): # ensurepip deliberately ignores all pip environment variables # See http://bugs.python.org/issue19734 for details @@ -262,7 +232,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): ensurepip._uninstall_helper() self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) - @requires_usable_pip def test_pip_config_file_disabled(self): # ensurepip deliberately ignores the pip config file # See http://bugs.python.org/issue20053 for details @@ -271,44 +240,12 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase): self.assertEqual(self.os_environ["PIP_CONFIG_FILE"], os.devnull) -class TestMissingSSL(EnsurepipMixin, unittest.TestCase): - - def setUp(self): - sys.modules["ensurepip"] = ensurepip_no_ssl - @self.addCleanup - def restore_module(): - sys.modules["ensurepip"] = ensurepip - super().setUp() - - def test_bootstrap_requires_ssl(self): - self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder" - with self.assertRaisesRegex(RuntimeError, "requires SSL/TLS"): - ensurepip_no_ssl.bootstrap() - self.assertFalse(self.run_pip.called) - self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ) - - def test_uninstall_requires_ssl(self): - self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder" - with self.assertRaisesRegex(RuntimeError, "requires SSL/TLS"): - with fake_pip(): - ensurepip_no_ssl._uninstall_helper() - self.assertFalse(self.run_pip.called) - self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ) - - def test_main_exits_early_with_warning(self): - with test.support.captured_stderr() as stderr: - ensurepip_no_ssl._main(["--version"]) - warning = stderr.getvalue().strip() - self.assertTrue(warning.endswith("requires SSL/TLS"), warning) - self.assertFalse(self.run_pip.called) - # Basic testing of the main functions and their argument parsing EXPECTED_VERSION_OUTPUT = "pip " + ensurepip._PIP_VERSION class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase): - @requires_usable_pip def test_bootstrap_version(self): with test.support.captured_stdout() as stdout: with self.assertRaises(SystemExit): @@ -317,7 +254,6 @@ class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase): self.assertEqual(result, EXPECTED_VERSION_OUTPUT) self.assertFalse(self.run_pip.called) - @requires_usable_pip def test_basic_bootstrapping(self): ensurepip._main([]) @@ -342,7 +278,6 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase): self.assertEqual(result, EXPECTED_VERSION_OUTPUT) self.assertFalse(self.run_pip.called) - @requires_usable_pip def test_basic_uninstall(self): with fake_pip(): ensurepip._uninstall._main([]) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 630b155..e97ef94 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -3,9 +3,10 @@ import inspect import pydoc import unittest from collections import OrderedDict -from enum import Enum, IntEnum, EnumMeta, unique +from enum import Enum, IntEnum, EnumMeta, Flag, IntFlag, unique, auto from io import StringIO from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL +from test import support # for pickle tests try: @@ -32,6 +33,14 @@ try: except Exception as exc: FloatStooges = exc +try: + class FlagStooges(Flag): + LARRY = 1 + CURLY = 2 + MOE = 3 +except Exception as exc: + FlagStooges = exc + # for pickle test and subclass tests try: class StrEnum(str, Enum): @@ -60,9 +69,9 @@ except Exception as exc: # for doctests try: class Fruit(Enum): - tomato = 1 - banana = 2 - cherry = 3 + TOMATO = 1 + BANANA = 2 + CHERRY = 3 except Exception: pass @@ -104,6 +113,7 @@ class TestHelpers(unittest.TestCase): '__', '___', '____', '_____',): self.assertFalse(enum._is_dunder(s)) +# tests class TestEnum(unittest.TestCase): @@ -283,6 +293,28 @@ class TestEnum(unittest.TestCase): class Wrong(Enum): _any_name_ = 9 + def test_bool(self): + # plain Enum members are always True + class Logic(Enum): + true = True + false = False + self.assertTrue(Logic.true) + self.assertTrue(Logic.false) + # unless overridden + class RealLogic(Enum): + true = True + false = False + def __bool__(self): + return bool(self._value_) + self.assertTrue(RealLogic.true) + self.assertFalse(RealLogic.false) + # mixed Enums depend on mixed-in type + class IntLogic(int, Enum): + true = 1 + false = 0 + self.assertTrue(IntLogic.true) + self.assertFalse(IntLogic.false) + def test_contains(self): Season = self.Season self.assertIn(Season.AUTUMN, Season) @@ -1547,6 +1579,701 @@ class TestEnum(unittest.TestCase): self.assertEqual(LabelledList.unprocessed, 1) self.assertEqual(LabelledList(1), LabelledList.unprocessed) + def test_auto_number(self): + class Color(Enum): + red = auto() + blue = auto() + green = auto() + + self.assertEqual(list(Color), [Color.red, Color.blue, Color.green]) + self.assertEqual(Color.red.value, 1) + self.assertEqual(Color.blue.value, 2) + self.assertEqual(Color.green.value, 3) + + def test_auto_name(self): + class Color(Enum): + def _generate_next_value_(name, start, count, last): + return name + red = auto() + blue = auto() + green = auto() + + self.assertEqual(list(Color), [Color.red, Color.blue, Color.green]) + self.assertEqual(Color.red.value, 'red') + self.assertEqual(Color.blue.value, 'blue') + self.assertEqual(Color.green.value, 'green') + + def test_auto_name_inherit(self): + class AutoNameEnum(Enum): + def _generate_next_value_(name, start, count, last): + return name + class Color(AutoNameEnum): + red = auto() + blue = auto() + green = auto() + + self.assertEqual(list(Color), [Color.red, Color.blue, Color.green]) + self.assertEqual(Color.red.value, 'red') + self.assertEqual(Color.blue.value, 'blue') + self.assertEqual(Color.green.value, 'green') + + def test_auto_garbage(self): + class Color(Enum): + red = 'red' + blue = auto() + self.assertEqual(Color.blue.value, 1) + + def test_auto_garbage_corrected(self): + class Color(Enum): + red = 'red' + blue = 2 + green = auto() + + self.assertEqual(list(Color), [Color.red, Color.blue, Color.green]) + self.assertEqual(Color.red.value, 'red') + self.assertEqual(Color.blue.value, 2) + self.assertEqual(Color.green.value, 3) + + def test_duplicate_auto(self): + class Dupes(Enum): + first = primero = auto() + second = auto() + third = auto() + self.assertEqual([Dupes.first, Dupes.second, Dupes.third], list(Dupes)) + + +class TestOrder(unittest.TestCase): + + def test_same_members(self): + class Color(Enum): + _order_ = 'red green blue' + red = 1 + green = 2 + blue = 3 + + def test_same_members_with_aliases(self): + class Color(Enum): + _order_ = 'red green blue' + red = 1 + green = 2 + blue = 3 + verde = green + + def test_same_members_wrong_order(self): + with self.assertRaisesRegex(TypeError, 'member order does not match _order_'): + class Color(Enum): + _order_ = 'red green blue' + red = 1 + blue = 3 + green = 2 + + def test_order_has_extra_members(self): + with self.assertRaisesRegex(TypeError, 'member order does not match _order_'): + class Color(Enum): + _order_ = 'red green blue purple' + red = 1 + green = 2 + blue = 3 + + def test_order_has_extra_members_with_aliases(self): + with self.assertRaisesRegex(TypeError, 'member order does not match _order_'): + class Color(Enum): + _order_ = 'red green blue purple' + red = 1 + green = 2 + blue = 3 + verde = green + + def test_enum_has_extra_members(self): + with self.assertRaisesRegex(TypeError, 'member order does not match _order_'): + class Color(Enum): + _order_ = 'red green blue' + red = 1 + green = 2 + blue = 3 + purple = 4 + + def test_enum_has_extra_members_with_aliases(self): + with self.assertRaisesRegex(TypeError, 'member order does not match _order_'): + class Color(Enum): + _order_ = 'red green blue' + red = 1 + green = 2 + blue = 3 + purple = 4 + verde = green + + +class TestFlag(unittest.TestCase): + """Tests of the Flags.""" + + class Perm(Flag): + R, W, X = 4, 2, 1 + + class Open(Flag): + RO = 0 + WO = 1 + RW = 2 + AC = 3 + CE = 1<<19 + + def test_str(self): + Perm = self.Perm + self.assertEqual(str(Perm.R), 'Perm.R') + self.assertEqual(str(Perm.W), 'Perm.W') + self.assertEqual(str(Perm.X), 'Perm.X') + self.assertEqual(str(Perm.R | Perm.W), 'Perm.R|W') + self.assertEqual(str(Perm.R | Perm.W | Perm.X), 'Perm.R|W|X') + self.assertEqual(str(Perm(0)), 'Perm.0') + self.assertEqual(str(~Perm.R), 'Perm.W|X') + self.assertEqual(str(~Perm.W), 'Perm.R|X') + self.assertEqual(str(~Perm.X), 'Perm.R|W') + self.assertEqual(str(~(Perm.R | Perm.W)), 'Perm.X') + self.assertEqual(str(~(Perm.R | Perm.W | Perm.X)), 'Perm.0') + self.assertEqual(str(Perm(~0)), 'Perm.R|W|X') + + Open = self.Open + self.assertEqual(str(Open.RO), 'Open.RO') + self.assertEqual(str(Open.WO), 'Open.WO') + self.assertEqual(str(Open.AC), 'Open.AC') + self.assertEqual(str(Open.RO | Open.CE), 'Open.CE') + self.assertEqual(str(Open.WO | Open.CE), 'Open.CE|WO') + self.assertEqual(str(~Open.RO), 'Open.CE|AC|RW|WO') + self.assertEqual(str(~Open.WO), 'Open.CE|RW') + self.assertEqual(str(~Open.AC), 'Open.CE') + self.assertEqual(str(~(Open.RO | Open.CE)), 'Open.AC') + self.assertEqual(str(~(Open.WO | Open.CE)), 'Open.RW') + + def test_repr(self): + Perm = self.Perm + self.assertEqual(repr(Perm.R), '') + self.assertEqual(repr(Perm.W), '') + self.assertEqual(repr(Perm.X), '') + self.assertEqual(repr(Perm.R | Perm.W), '') + self.assertEqual(repr(Perm.R | Perm.W | Perm.X), '') + self.assertEqual(repr(Perm(0)), '') + self.assertEqual(repr(~Perm.R), '') + self.assertEqual(repr(~Perm.W), '') + self.assertEqual(repr(~Perm.X), '') + self.assertEqual(repr(~(Perm.R | Perm.W)), '') + self.assertEqual(repr(~(Perm.R | Perm.W | Perm.X)), '') + self.assertEqual(repr(Perm(~0)), '') + + Open = self.Open + self.assertEqual(repr(Open.RO), '') + self.assertEqual(repr(Open.WO), '') + self.assertEqual(repr(Open.AC), '') + self.assertEqual(repr(Open.RO | Open.CE), '') + self.assertEqual(repr(Open.WO | Open.CE), '') + self.assertEqual(repr(~Open.RO), '') + self.assertEqual(repr(~Open.WO), '') + self.assertEqual(repr(~Open.AC), '') + self.assertEqual(repr(~(Open.RO | Open.CE)), '') + self.assertEqual(repr(~(Open.WO | Open.CE)), '') + + def test_or(self): + Perm = self.Perm + for i in Perm: + for j in Perm: + self.assertEqual((i | j), Perm(i.value | j.value)) + self.assertEqual((i | j).value, i.value | j.value) + self.assertIs(type(i | j), Perm) + for i in Perm: + self.assertIs(i | i, i) + Open = self.Open + self.assertIs(Open.RO | Open.CE, Open.CE) + + def test_and(self): + Perm = self.Perm + RW = Perm.R | Perm.W + RX = Perm.R | Perm.X + WX = Perm.W | Perm.X + RWX = Perm.R | Perm.W | Perm.X + values = list(Perm) + [RW, RX, WX, RWX, Perm(0)] + for i in values: + for j in values: + self.assertEqual((i & j).value, i.value & j.value) + self.assertIs(type(i & j), Perm) + for i in Perm: + self.assertIs(i & i, i) + self.assertIs(i & RWX, i) + self.assertIs(RWX & i, i) + Open = self.Open + self.assertIs(Open.RO & Open.CE, Open.RO) + + def test_xor(self): + Perm = self.Perm + for i in Perm: + for j in Perm: + self.assertEqual((i ^ j).value, i.value ^ j.value) + self.assertIs(type(i ^ j), Perm) + for i in Perm: + self.assertIs(i ^ Perm(0), i) + self.assertIs(Perm(0) ^ i, i) + Open = self.Open + self.assertIs(Open.RO ^ Open.CE, Open.CE) + self.assertIs(Open.CE ^ Open.CE, Open.RO) + + def test_invert(self): + Perm = self.Perm + RW = Perm.R | Perm.W + RX = Perm.R | Perm.X + WX = Perm.W | Perm.X + RWX = Perm.R | Perm.W | Perm.X + values = list(Perm) + [RW, RX, WX, RWX, Perm(0)] + for i in values: + self.assertIs(type(~i), Perm) + self.assertEqual(~~i, i) + for i in Perm: + self.assertIs(~~i, i) + Open = self.Open + self.assertIs(Open.WO & ~Open.WO, Open.RO) + self.assertIs((Open.WO|Open.CE) & ~Open.WO, Open.CE) + + def test_bool(self): + Perm = self.Perm + for f in Perm: + self.assertTrue(f) + Open = self.Open + for f in Open: + self.assertEqual(bool(f.value), bool(f)) + + def test_programatic_function_string(self): + Perm = Flag('Perm', 'R W X') + lst = list(Perm) + self.assertEqual(len(lst), len(Perm)) + self.assertEqual(len(Perm), 3, Perm) + self.assertEqual(lst, [Perm.R, Perm.W, Perm.X]) + for i, n in enumerate('R W X'.split()): + v = 1<') + + +class TestIntFlag(unittest.TestCase): + """Tests of the IntFlags.""" + + class Perm(IntFlag): + X = 1 << 0 + W = 1 << 1 + R = 1 << 2 + + class Open(IntFlag): + RO = 0 + WO = 1 + RW = 2 + AC = 3 + CE = 1<<19 + + def test_type(self): + Perm = self.Perm + Open = self.Open + for f in Perm: + self.assertTrue(isinstance(f, Perm)) + self.assertEqual(f, f.value) + self.assertTrue(isinstance(Perm.W | Perm.X, Perm)) + self.assertEqual(Perm.W | Perm.X, 3) + for f in Open: + self.assertTrue(isinstance(f, Open)) + self.assertEqual(f, f.value) + self.assertTrue(isinstance(Open.WO | Open.RW, Open)) + self.assertEqual(Open.WO | Open.RW, 3) + + + def test_str(self): + Perm = self.Perm + self.assertEqual(str(Perm.R), 'Perm.R') + self.assertEqual(str(Perm.W), 'Perm.W') + self.assertEqual(str(Perm.X), 'Perm.X') + self.assertEqual(str(Perm.R | Perm.W), 'Perm.R|W') + self.assertEqual(str(Perm.R | Perm.W | Perm.X), 'Perm.R|W|X') + self.assertEqual(str(Perm.R | 8), 'Perm.8|R') + self.assertEqual(str(Perm(0)), 'Perm.0') + self.assertEqual(str(Perm(8)), 'Perm.8') + self.assertEqual(str(~Perm.R), 'Perm.W|X') + self.assertEqual(str(~Perm.W), 'Perm.R|X') + self.assertEqual(str(~Perm.X), 'Perm.R|W') + self.assertEqual(str(~(Perm.R | Perm.W)), 'Perm.X') + self.assertEqual(str(~(Perm.R | Perm.W | Perm.X)), 'Perm.-8') + self.assertEqual(str(~(Perm.R | 8)), 'Perm.W|X') + self.assertEqual(str(Perm(~0)), 'Perm.R|W|X') + self.assertEqual(str(Perm(~8)), 'Perm.R|W|X') + + Open = self.Open + self.assertEqual(str(Open.RO), 'Open.RO') + self.assertEqual(str(Open.WO), 'Open.WO') + self.assertEqual(str(Open.AC), 'Open.AC') + self.assertEqual(str(Open.RO | Open.CE), 'Open.CE') + self.assertEqual(str(Open.WO | Open.CE), 'Open.CE|WO') + self.assertEqual(str(Open(4)), 'Open.4') + self.assertEqual(str(~Open.RO), 'Open.CE|AC|RW|WO') + self.assertEqual(str(~Open.WO), 'Open.CE|RW') + self.assertEqual(str(~Open.AC), 'Open.CE') + self.assertEqual(str(~(Open.RO | Open.CE)), 'Open.AC|RW|WO') + self.assertEqual(str(~(Open.WO | Open.CE)), 'Open.RW') + self.assertEqual(str(Open(~4)), 'Open.CE|AC|RW|WO') + + def test_repr(self): + Perm = self.Perm + self.assertEqual(repr(Perm.R), '') + self.assertEqual(repr(Perm.W), '') + self.assertEqual(repr(Perm.X), '') + self.assertEqual(repr(Perm.R | Perm.W), '') + self.assertEqual(repr(Perm.R | Perm.W | Perm.X), '') + self.assertEqual(repr(Perm.R | 8), '') + self.assertEqual(repr(Perm(0)), '') + self.assertEqual(repr(Perm(8)), '') + self.assertEqual(repr(~Perm.R), '') + self.assertEqual(repr(~Perm.W), '') + self.assertEqual(repr(~Perm.X), '') + self.assertEqual(repr(~(Perm.R | Perm.W)), '') + self.assertEqual(repr(~(Perm.R | Perm.W | Perm.X)), '') + self.assertEqual(repr(~(Perm.R | 8)), '') + self.assertEqual(repr(Perm(~0)), '') + self.assertEqual(repr(Perm(~8)), '') + + Open = self.Open + self.assertEqual(repr(Open.RO), '') + self.assertEqual(repr(Open.WO), '') + self.assertEqual(repr(Open.AC), '') + self.assertEqual(repr(Open.RO | Open.CE), '') + self.assertEqual(repr(Open.WO | Open.CE), '') + self.assertEqual(repr(Open(4)), '') + self.assertEqual(repr(~Open.RO), '') + self.assertEqual(repr(~Open.WO), '') + self.assertEqual(repr(~Open.AC), '') + self.assertEqual(repr(~(Open.RO | Open.CE)), '') + self.assertEqual(repr(~(Open.WO | Open.CE)), '') + self.assertEqual(repr(Open(~4)), '') + + def test_or(self): + Perm = self.Perm + for i in Perm: + for j in Perm: + self.assertEqual(i | j, i.value | j.value) + self.assertEqual((i | j).value, i.value | j.value) + self.assertIs(type(i | j), Perm) + for j in range(8): + self.assertEqual(i | j, i.value | j) + self.assertEqual((i | j).value, i.value | j) + self.assertIs(type(i | j), Perm) + self.assertEqual(j | i, j | i.value) + self.assertEqual((j | i).value, j | i.value) + self.assertIs(type(j | i), Perm) + for i in Perm: + self.assertIs(i | i, i) + self.assertIs(i | 0, i) + self.assertIs(0 | i, i) + Open = self.Open + self.assertIs(Open.RO | Open.CE, Open.CE) + + def test_and(self): + Perm = self.Perm + RW = Perm.R | Perm.W + RX = Perm.R | Perm.X + WX = Perm.W | Perm.X + RWX = Perm.R | Perm.W | Perm.X + values = list(Perm) + [RW, RX, WX, RWX, Perm(0)] + for i in values: + for j in values: + self.assertEqual(i & j, i.value & j.value, 'i is %r, j is %r' % (i, j)) + self.assertEqual((i & j).value, i.value & j.value, 'i is %r, j is %r' % (i, j)) + self.assertIs(type(i & j), Perm, 'i is %r, j is %r' % (i, j)) + for j in range(8): + self.assertEqual(i & j, i.value & j) + self.assertEqual((i & j).value, i.value & j) + self.assertIs(type(i & j), Perm) + self.assertEqual(j & i, j & i.value) + self.assertEqual((j & i).value, j & i.value) + self.assertIs(type(j & i), Perm) + for i in Perm: + self.assertIs(i & i, i) + self.assertIs(i & 7, i) + self.assertIs(7 & i, i) + Open = self.Open + self.assertIs(Open.RO & Open.CE, Open.RO) + + def test_xor(self): + Perm = self.Perm + for i in Perm: + for j in Perm: + self.assertEqual(i ^ j, i.value ^ j.value) + self.assertEqual((i ^ j).value, i.value ^ j.value) + self.assertIs(type(i ^ j), Perm) + for j in range(8): + self.assertEqual(i ^ j, i.value ^ j) + self.assertEqual((i ^ j).value, i.value ^ j) + self.assertIs(type(i ^ j), Perm) + self.assertEqual(j ^ i, j ^ i.value) + self.assertEqual((j ^ i).value, j ^ i.value) + self.assertIs(type(j ^ i), Perm) + for i in Perm: + self.assertIs(i ^ 0, i) + self.assertIs(0 ^ i, i) + Open = self.Open + self.assertIs(Open.RO ^ Open.CE, Open.CE) + self.assertIs(Open.CE ^ Open.CE, Open.RO) + + def test_invert(self): + Perm = self.Perm + RW = Perm.R | Perm.W + RX = Perm.R | Perm.X + WX = Perm.W | Perm.X + RWX = Perm.R | Perm.W | Perm.X + values = list(Perm) + [RW, RX, WX, RWX, Perm(0)] + for i in values: + self.assertEqual(~i, ~i.value) + self.assertEqual((~i).value, ~i.value) + self.assertIs(type(~i), Perm) + self.assertEqual(~~i, i) + for i in Perm: + self.assertIs(~~i, i) + Open = self.Open + self.assertIs(Open.WO & ~Open.WO, Open.RO) + self.assertIs((Open.WO|Open.CE) & ~Open.WO, Open.CE) + + def test_programatic_function_string(self): + Perm = IntFlag('Perm', 'R W X') + lst = list(Perm) + self.assertEqual(len(lst), len(Perm)) + self.assertEqual(len(Perm), 3, Perm) + self.assertEqual(lst, [Perm.R, Perm.W, Perm.X]) + for i, n in enumerate('R W X'.split()): + v = 1<>> f(1, 2, **{'a': -1, 'b': 5}, **{'a': 4, 'c': 6}) Traceback (most recent call last): ... - TypeError: function got multiple values for keyword argument 'a' + TypeError: f() got multiple values for keyword argument 'a' >>> f(1, 2, **{'a': -1, 'b': 5}, a=4, c=6) Traceback (most recent call last): ... - TypeError: function got multiple values for keyword argument 'a' + TypeError: f() got multiple values for keyword argument 'a' >>> f(1, 2, a=3, **{'a': 4}, **{'a': 5}) Traceback (most recent call last): ... - TypeError: function got multiple values for keyword argument 'a' + TypeError: f() got multiple values for keyword argument 'a' >>> f(1, 2, 3, *[4, 5], **{'a':6, 'b':7}) (1, 2, 3, 4, 5) {'a': 6, 'b': 7} >>> f(1, 2, 3, x=4, y=5, *(6, 7), **{'a':8, 'b': 9}) @@ -238,6 +238,11 @@ What about willful misconduct? ... TypeError: h() argument after * must be an iterable, not function + >>> h(*[1], *h) + Traceback (most recent call last): + ... + TypeError: h() argument after * must be an iterable, not function + >>> dir(*h) Traceback (most recent call last): ... diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index 1562eec..bdd8d1a 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -7,7 +7,7 @@ import signal import subprocess import sys from test import support -from test.support import script_helper +from test.support import script_helper, is_android, requires_android_level import tempfile import unittest from textwrap import dedent @@ -23,6 +23,7 @@ except ImportError: _testcapi = None TIMEOUT = 0.5 +MS_WINDOWS = (os.name == 'nt') def expected_traceback(lineno1, lineno2, header, min_count=1): regex = header @@ -41,6 +42,10 @@ def temporary_filename(): finally: support.unlink(filename) +def requires_raise(test): + return (test if not is_android else + requires_android_level(24, 'raise() is buggy')(test)) + class FaultHandlerTests(unittest.TestCase): def get_output(self, code, filename=None, fd=None): """ @@ -58,8 +63,9 @@ class FaultHandlerTests(unittest.TestCase): pass_fds.append(fd) with support.SuppressCrashReport(): process = script_helper.spawn_python('-c', code, pass_fds=pass_fds) - stdout, stderr = process.communicate() - exitcode = process.wait() + with process: + stdout, stderr = process.communicate() + exitcode = process.wait() output = support.strip_python_stderr(stdout) output = output.decode('ascii', 'backslashreplace') if filename: @@ -73,14 +79,11 @@ class FaultHandlerTests(unittest.TestCase): with open(fd, "rb", closefd=False) as fp: output = fp.read() output = output.decode('ascii', 'backslashreplace') - output = re.sub('Current thread 0x[0-9a-f]+', - 'Current thread XXX', - output) return output.splitlines(), exitcode - def check_fatal_error(self, code, line_number, name_regex, - filename=None, all_threads=True, other_regex=None, - fd=None): + def check_error(self, code, line_number, fatal_error, *, + filename=None, all_threads=True, other_regex=None, + fd=None, know_current_thread=True): """ Check that the fault handler for fatal errors is enabled and check the traceback from the child process output. @@ -88,19 +91,22 @@ class FaultHandlerTests(unittest.TestCase): Raise an error if the output doesn't match the expected format. """ if all_threads: - header = 'Current thread XXX (most recent call first)' + if know_current_thread: + header = 'Current thread 0x[0-9a-f]+' + else: + header = 'Thread 0x[0-9a-f]+' else: - header = 'Stack (most recent call first)' - regex = """ - ^Fatal Python error: {name} + header = 'Stack' + regex = r""" + ^{fatal_error} - {header}: + {header} \(most recent call first\): File "", line {lineno} in """ regex = dedent(regex.format( lineno=line_number, - name=name_regex, - header=re.escape(header))).strip() + fatal_error=fatal_error, + header=header)).strip() if other_regex: regex += '|' + other_regex output, exitcode = self.get_output(code, filename=filename, fd=fd) @@ -108,26 +114,57 @@ class FaultHandlerTests(unittest.TestCase): self.assertRegex(output, regex) self.assertNotEqual(exitcode, 0) + def check_fatal_error(self, code, line_number, name_regex, **kw): + fatal_error = 'Fatal Python error: %s' % name_regex + self.check_error(code, line_number, fatal_error, **kw) + + def check_windows_exception(self, code, line_number, name_regex, **kw): + fatal_error = 'Windows fatal exception: %s' % name_regex + self.check_error(code, line_number, fatal_error, **kw) + @unittest.skipIf(sys.platform.startswith('aix'), "the first page of memory is a mapped read-only on AIX") def test_read_null(self): + if not MS_WINDOWS: + self.check_fatal_error(""" + import faulthandler + faulthandler.enable() + faulthandler._read_null() + """, + 3, + # Issue #12700: Read NULL raises SIGILL on Mac OS X Lion + '(?:Segmentation fault' + '|Bus error' + '|Illegal instruction)') + else: + self.check_windows_exception(""" + import faulthandler + faulthandler.enable() + faulthandler._read_null() + """, + 3, + 'access violation') + + @requires_raise + def test_sigsegv(self): self.check_fatal_error(""" import faulthandler faulthandler.enable() - faulthandler._read_null() + faulthandler._sigsegv() """, 3, - # Issue #12700: Read NULL raises SIGILL on Mac OS X Lion - '(?:Segmentation fault|Bus error|Illegal instruction)') + 'Segmentation fault') - def test_sigsegv(self): + @unittest.skipIf(not HAVE_THREADS, 'need threads') + def test_fatal_error_c_thread(self): self.check_fatal_error(""" import faulthandler faulthandler.enable() - faulthandler._sigsegv() + faulthandler._fatal_error_c_thread() """, 3, - 'Segmentation fault') + 'in new thread', + know_current_thread=False) def test_sigabrt(self): self.check_fatal_error(""" @@ -151,6 +188,7 @@ class FaultHandlerTests(unittest.TestCase): @unittest.skipIf(_testcapi is None, 'need _testcapi') @unittest.skipUnless(hasattr(signal, 'SIGBUS'), 'need signal.SIGBUS') + @requires_raise def test_sigbus(self): self.check_fatal_error(""" import _testcapi @@ -165,6 +203,7 @@ class FaultHandlerTests(unittest.TestCase): @unittest.skipIf(_testcapi is None, 'need _testcapi') @unittest.skipUnless(hasattr(signal, 'SIGILL'), 'need signal.SIGILL') + @requires_raise def test_sigill(self): self.check_fatal_error(""" import _testcapi @@ -208,6 +247,7 @@ class FaultHandlerTests(unittest.TestCase): '(?:Segmentation fault|Bus error)', other_regex='unable to raise a stack overflow') + @requires_raise def test_gil_released(self): self.check_fatal_error(""" import faulthandler @@ -217,6 +257,7 @@ class FaultHandlerTests(unittest.TestCase): 3, 'Segmentation fault') + @requires_raise def test_enable_file(self): with temporary_filename() as filename: self.check_fatal_error(""" @@ -231,6 +272,7 @@ class FaultHandlerTests(unittest.TestCase): @unittest.skipIf(sys.platform == "win32", "subprocess doesn't support pass_fds on Windows") + @requires_raise def test_enable_fd(self): with tempfile.TemporaryFile('wb+') as fp: fd = fp.fileno() @@ -244,6 +286,7 @@ class FaultHandlerTests(unittest.TestCase): 'Segmentation fault', fd=fd) + @requires_raise def test_enable_single_thread(self): self.check_fatal_error(""" import faulthandler @@ -254,6 +297,7 @@ class FaultHandlerTests(unittest.TestCase): 'Segmentation fault', all_threads=False) + @requires_raise def test_disable(self): code = """ import faulthandler @@ -458,14 +502,14 @@ class FaultHandlerTests(unittest.TestCase): lineno = 8 else: lineno = 10 - regex = """ + regex = r""" ^Thread 0x[0-9a-f]+ \(most recent call first\): (?: File ".*threading.py", line [0-9]+ in [_a-z]+ ){{1,3}} File "", line 23 in run File ".*threading.py", line [0-9]+ in _bootstrap_inner File ".*threading.py", line [0-9]+ in _bootstrap - Current thread XXX \(most recent call first\): + Current thread 0x[0-9a-f]+ \(most recent call first\): File "", line {lineno} in dump File "", line 28 in $ """ @@ -637,9 +681,9 @@ class FaultHandlerTests(unittest.TestCase): trace = '\n'.join(trace) if not unregister: if all_threads: - regex = 'Current thread XXX \(most recent call first\):\n' + regex = r'Current thread 0x[0-9a-f]+ \(most recent call first\):\n' else: - regex = 'Stack \(most recent call first\):\n' + regex = r'Stack \(most recent call first\):\n' regex = expected_traceback(14, 32, regex) self.assertRegex(trace, regex) else: @@ -696,6 +740,22 @@ class FaultHandlerTests(unittest.TestCase): with self.check_stderr_none(): faulthandler.register(signal.SIGUSR1) + @unittest.skipUnless(MS_WINDOWS, 'specific to Windows') + def test_raise_exception(self): + for exc, name in ( + ('EXCEPTION_ACCESS_VIOLATION', 'access violation'), + ('EXCEPTION_INT_DIVIDE_BY_ZERO', 'int divide by zero'), + ('EXCEPTION_STACK_OVERFLOW', 'stack overflow'), + ): + self.check_windows_exception(f""" + import faulthandler + faulthandler.enable() + faulthandler._raise_exception(faulthandler._{exc}) + """, + 3, + name) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py index 4e392b7..65be30f 100644 --- a/Lib/test/test_file.py +++ b/Lib/test/test_file.py @@ -7,7 +7,7 @@ from weakref import proxy import io import _pyio as pyio -from test.support import TESTFN, run_unittest +from test.support import TESTFN from collections import UserList class AutoFileTests: @@ -139,7 +139,7 @@ class OtherFileTests: def testModeStrings(self): # check invalid mode strings - for mode in ("", "aU", "wU+"): + for mode in ("", "aU", "wU+", "U+", "+U", "rU+"): try: f = self.open(TESTFN, mode) except ValueError: diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index 784bc92..565633f 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -22,8 +22,9 @@ except ImportError: from io import BytesIO, StringIO from fileinput import FileInput, hook_encoded -from test.support import verbose, TESTFN, run_unittest, check_warnings +from test.support import verbose, TESTFN, check_warnings from test.support import unlink as safe_unlink +from test import support from unittest import mock @@ -92,7 +93,11 @@ class BufferSizesTests(unittest.TestCase): t2 = writeTmp(2, ["Line %s of file 2\n" % (i+1) for i in range(10)]) t3 = writeTmp(3, ["Line %s of file 3\n" % (i+1) for i in range(5)]) t4 = writeTmp(4, ["Line %s of file 4\n" % (i+1) for i in range(1)]) - self.buffer_size_test(t1, t2, t3, t4, bs, round) + if bs: + with self.assertWarns(DeprecationWarning): + self.buffer_size_test(t1, t2, t3, t4, bs, round) + else: + self.buffer_size_test(t1, t2, t3, t4, bs, round) finally: remove_tempfiles(t1, t2, t3, t4) @@ -940,7 +945,8 @@ class Test_hook_encoded(unittest.TestCase): def test(self): encoding = object() - result = fileinput.hook_encoded(encoding) + errors = object() + result = fileinput.hook_encoded(encoding, errors=errors) fake_open = InvocationRecorder() original_open = builtins.open @@ -958,8 +964,26 @@ class Test_hook_encoded(unittest.TestCase): self.assertIs(args[0], filename) self.assertIs(args[1], mode) self.assertIs(kwargs.pop('encoding'), encoding) + self.assertIs(kwargs.pop('errors'), errors) self.assertFalse(kwargs) + def test_errors(self): + with open(TESTFN, 'wb') as f: + f.write(b'\x80abc') + self.addCleanup(safe_unlink, TESTFN) + + def check(errors, expected_lines): + with FileInput(files=TESTFN, mode='r', + openhook=hook_encoded('utf-8', errors=errors)) as fi: + lines = list(fi) + self.assertEqual(lines, expected_lines) + + check('ignore', ['abc']) + with self.assertRaises(UnicodeDecodeError): + check('strict', ['abc']) + check('replace', ['\ufffdabc']) + check('backslashreplace', ['\\x80abc']) + def test_modes(self): with open(TESTFN, 'wb') as f: # UTF-7 is a convenient, seldom used encoding @@ -981,5 +1005,11 @@ class Test_hook_encoded(unittest.TestCase): check('rb', ['A\n', 'B\r\n', 'C\r', 'D\u20ac']) +class MiscTest(unittest.TestCase): + + def test_all(self): + support.check__all__(self, fileinput) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 1bc1847..12f2f11 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -9,8 +9,7 @@ from array import array from weakref import proxy from functools import wraps -from test.support import (TESTFN, check_warnings, run_unittest, - make_bad_fd, cpython_only, swap_attr) +from test.support import TESTFN, check_warnings, run_unittest, make_bad_fd, cpython_only from collections import UserList import _io # C implementation of io @@ -176,12 +175,6 @@ class AutoFileTests: finally: os.close(fd) - def testRecursiveRepr(self): - # Issue #25455 - with swap_attr(self.f, 'name', self.f): - with self.assertRaises(RuntimeError): - repr(self.f) # Should not crash - def testErrors(self): f = self.f self.assertFalse(f.isatty()) diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 28b6954..ac8473d 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -1,6 +1,4 @@ - import fractions -import math import operator import os import random @@ -10,6 +8,8 @@ import time import unittest from test import support +from test.test_grammar import (VALID_UNDERSCORE_LITERALS, + INVALID_UNDERSCORE_LITERALS) from math import isinf, isnan, copysign, ldexp INF = float("inf") @@ -61,6 +61,27 @@ class GeneralFloatCases(unittest.TestCase): float(b'.' + b'1'*1000) float('.' + '1'*1000) + def test_underscores(self): + for lit in VALID_UNDERSCORE_LITERALS: + if not any(ch in lit for ch in 'jJxXoObB'): + self.assertEqual(float(lit), eval(lit)) + self.assertEqual(float(lit), float(lit.replace('_', ''))) + for lit in INVALID_UNDERSCORE_LITERALS: + if lit in ('0_7', '09_99'): # octals are not recognized here + continue + if not any(ch in lit for ch in 'jJxXoObB'): + self.assertRaises(ValueError, float, lit) + # Additional test cases; nan and inf are never valid as literals, + # only in the float() constructor, but we don't allow underscores + # in or around them. + self.assertRaises(ValueError, float, '_NaN') + self.assertRaises(ValueError, float, 'Na_N') + self.assertRaises(ValueError, float, 'IN_F') + self.assertRaises(ValueError, float, '-_INF') + self.assertRaises(ValueError, float, '-INF_') + # Check that we handle bytes values correctly. + self.assertRaises(ValueError, float, b'0_.\xff9') + def test_non_numeric_input_types(self): # Test possible non-numeric types for the argument x, including # subclasses of the explicitly documented accepted types. @@ -98,27 +119,15 @@ class GeneralFloatCases(unittest.TestCase): self.assertEqual(float(memoryview(b'12.34')[1:4]), 2.3) def test_error_message(self): - def check(s): - with self.assertRaises(ValueError, msg='float(%r)' % (s,)) as cm: + testlist = ('\xbd', '123\xbd', ' 123 456 ') + for s in testlist: + try: float(s) - self.assertEqual(str(cm.exception), - 'could not convert string to float: %r' % (s,)) - - check('\xbd') - check('123\xbd') - check(' 123 456 ') - check(b' 123 456 ') - - # non-ascii digits (error came from non-digit '!') - check('\u0663\u0661\u0664!') - # embedded NUL - check('123\x00') - check('123\x00 245') - check('123\x00245') - # byte string with embedded NUL - check(b'123\x00') - # non-UTF-8 byte string - check(b'123\xa0') + except ValueError as e: + self.assertIn(s.strip(), e.args[0]) + else: + self.fail("Expected int(%r) to raise a ValueError", s) + @support.run_with_locale('LC_NUMERIC', 'fr_FR', 'de_DE') def test_float_with_comma(self): @@ -174,11 +183,12 @@ class GeneralFloatCases(unittest.TestCase): def __float__(self): return float(str(self)) + 1 - self.assertAlmostEqual(float(Foo1()), 42.) - self.assertAlmostEqual(float(Foo2()), 42.) - self.assertAlmostEqual(float(Foo3(21)), 42.) + self.assertEqual(float(Foo1()), 42.) + self.assertEqual(float(Foo2()), 42.) + with self.assertWarns(DeprecationWarning): + self.assertEqual(float(Foo3(21)), 42.) self.assertRaises(TypeError, float, Foo4(42)) - self.assertAlmostEqual(float(FooStr('8')), 9.) + self.assertEqual(float(FooStr('8')), 9.) class Foo5: def __float__(self): @@ -189,10 +199,14 @@ class GeneralFloatCases(unittest.TestCase): class F: def __float__(self): return OtherFloatSubclass(42.) - self.assertAlmostEqual(float(F()), 42.) - self.assertIs(type(float(F())), OtherFloatSubclass) - self.assertAlmostEqual(FloatSubclass(F()), 42.) - self.assertIs(type(FloatSubclass(F())), FloatSubclass) + with self.assertWarns(DeprecationWarning): + self.assertEqual(float(F()), 42.) + with self.assertWarns(DeprecationWarning): + self.assertIs(type(float(F())), float) + with self.assertWarns(DeprecationWarning): + self.assertEqual(FloatSubclass(F()), 42.) + with self.assertWarns(DeprecationWarning): + self.assertIs(type(FloatSubclass(F())), FloatSubclass) def test_is_integer(self): self.assertFalse((1.1).is_integer()) diff --git a/Lib/test/test_fnmatch.py b/Lib/test/test_fnmatch.py index e37e4f5..fb74246 100644 --- a/Lib/test/test_fnmatch.py +++ b/Lib/test/test_fnmatch.py @@ -1,19 +1,18 @@ """Test cases for the fnmatch module.""" import unittest -import os from fnmatch import fnmatch, fnmatchcase, translate, filter class FnmatchTestCase(unittest.TestCase): - def check_match(self, filename, pattern, should_match=True, fn=fnmatch): + def check_match(self, filename, pattern, should_match=1, fn=fnmatch): if should_match: self.assertTrue(fn(filename, pattern), "expected %r to match pattern %r" % (filename, pattern)) else: - self.assertFalse(fn(filename, pattern), + self.assertTrue(not fn(filename, pattern), "expected %r not to match pattern %r" % (filename, pattern)) @@ -27,15 +26,15 @@ class FnmatchTestCase(unittest.TestCase): check('abc', '*') check('abc', 'ab[cd]') check('abc', 'ab[!de]') - check('abc', 'ab[de]', False) - check('a', '??', False) - check('a', 'b', False) + check('abc', 'ab[de]', 0) + check('a', '??', 0) + check('a', 'b', 0) # these test that '\' is handled correctly in character sets; # see SF bug #409651 check('\\', r'[\]') check('a', r'[!\]') - check('\\', r'[!\]', False) + check('\\', r'[!\]', 0) # test that filenames with newlines in them are handled correctly. # http://bugs.python.org/issue6665 @@ -52,76 +51,31 @@ class FnmatchTestCase(unittest.TestCase): def test_fnmatchcase(self): check = self.check_match - check('abc', 'abc', True, fnmatchcase) - check('AbC', 'abc', False, fnmatchcase) - check('abc', 'AbC', False, fnmatchcase) - check('AbC', 'AbC', True, fnmatchcase) - - check('usr/bin', 'usr/bin', True, fnmatchcase) - check('usr\\bin', 'usr/bin', False, fnmatchcase) - check('usr/bin', 'usr\\bin', False, fnmatchcase) - check('usr\\bin', 'usr\\bin', True, fnmatchcase) + check('AbC', 'abc', 0, fnmatchcase) + check('abc', 'AbC', 0, fnmatchcase) def test_bytes(self): self.check_match(b'test', b'te*') self.check_match(b'test\xff', b'te*\xff') self.check_match(b'foo\nbar', b'foo*') - def test_case(self): - ignorecase = os.path.normcase('ABC') == os.path.normcase('abc') - check = self.check_match - check('abc', 'abc') - check('AbC', 'abc', ignorecase) - check('abc', 'AbC', ignorecase) - check('AbC', 'AbC') - - def test_sep(self): - normsep = os.path.normcase('\\') == os.path.normcase('/') - check = self.check_match - check('usr/bin', 'usr/bin') - check('usr\\bin', 'usr/bin', normsep) - check('usr/bin', 'usr\\bin', normsep) - check('usr\\bin', 'usr\\bin') - - class TranslateTestCase(unittest.TestCase): def test_translate(self): - self.assertEqual(translate('*'), '.*\Z(?ms)') - self.assertEqual(translate('?'), '.\Z(?ms)') - self.assertEqual(translate('a?b*'), 'a.b.*\Z(?ms)') - self.assertEqual(translate('[abc]'), '[abc]\Z(?ms)') - self.assertEqual(translate('[]]'), '[]]\Z(?ms)') - self.assertEqual(translate('[!x]'), '[^x]\Z(?ms)') - self.assertEqual(translate('[^x]'), '[\\^x]\Z(?ms)') - self.assertEqual(translate('[x'), '\\[x\Z(?ms)') + self.assertEqual(translate('*'), r'(?s:.*)\Z') + self.assertEqual(translate('?'), r'(?s:.)\Z') + self.assertEqual(translate('a?b*'), r'(?s:a.b.*)\Z') + self.assertEqual(translate('[abc]'), r'(?s:[abc])\Z') + self.assertEqual(translate('[]]'), r'(?s:[]])\Z') + self.assertEqual(translate('[!x]'), r'(?s:[^x])\Z') + self.assertEqual(translate('[^x]'), r'(?s:[\^x])\Z') + self.assertEqual(translate('[x'), r'(?s:\[x)\Z') class FilterTestCase(unittest.TestCase): def test_filter(self): - self.assertEqual(filter(['Python', 'Ruby', 'Perl', 'Tcl'], 'P*'), - ['Python', 'Perl']) - self.assertEqual(filter([b'Python', b'Ruby', b'Perl', b'Tcl'], b'P*'), - [b'Python', b'Perl']) - - def test_mix_bytes_str(self): - self.assertRaises(TypeError, filter, ['test'], b'*') - self.assertRaises(TypeError, filter, [b'test'], '*') - - def test_case(self): - ignorecase = os.path.normcase('P') == os.path.normcase('p') - self.assertEqual(filter(['Test.py', 'Test.rb', 'Test.PL'], '*.p*'), - ['Test.py', 'Test.PL'] if ignorecase else ['Test.py']) - self.assertEqual(filter(['Test.py', 'Test.rb', 'Test.PL'], '*.P*'), - ['Test.py', 'Test.PL'] if ignorecase else ['Test.PL']) - - def test_sep(self): - normsep = os.path.normcase('\\') == os.path.normcase('/') - self.assertEqual(filter(['usr/bin', 'usr', 'usr\\lib'], 'usr/*'), - ['usr/bin', 'usr\\lib'] if normsep else ['usr/bin']) - self.assertEqual(filter(['usr/bin', 'usr', 'usr\\lib'], 'usr\\*'), - ['usr/bin', 'usr\\lib'] if normsep else ['usr\\lib']) + self.assertEqual(filter(['a', 'b'], 'a'), ['a']) if __name__ == "__main__": diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 565bb79..8afd5b8 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -114,7 +114,6 @@ class FormatTest(unittest.TestCase): testcommon("%o", 100000000000, "1351035564000") testcommon("%d", 10, "10") testcommon("%d", 100000000000, "100000000000") - big = 123456789012345678901234567890 testcommon("%d", big, "123456789012345678901234567890") testcommon("%d", -big, "-123456789012345678901234567890") @@ -134,7 +133,6 @@ class FormatTest(unittest.TestCase): testcommon("%.31d", big, "0123456789012345678901234567890") testcommon("%32.31d", big, " 0123456789012345678901234567890") testcommon("%d", float(big), "123456________________________", 6) - big = 0x1234567890abcdef12345 # 21 hex digits testcommon("%x", big, "1234567890abcdef12345") testcommon("%x", -big, "-1234567890abcdef12345") @@ -158,26 +156,19 @@ class FormatTest(unittest.TestCase): testcommon("%#X", big, "0X1234567890ABCDEF12345") testcommon("%#x", big, "0x1234567890abcdef12345") testcommon("%#x", -big, "-0x1234567890abcdef12345") - testcommon("%#27x", big, " 0x1234567890abcdef12345") - testcommon("%#-27x", big, "0x1234567890abcdef12345 ") - testcommon("%#027x", big, "0x00001234567890abcdef12345") - testcommon("%#.23x", big, "0x001234567890abcdef12345") testcommon("%#.23x", -big, "-0x001234567890abcdef12345") - testcommon("%#27.23x", big, " 0x001234567890abcdef12345") - testcommon("%#-27.23x", big, "0x001234567890abcdef12345 ") - testcommon("%#027.23x", big, "0x00001234567890abcdef12345") testcommon("%#+.23x", big, "+0x001234567890abcdef12345") testcommon("%# .23x", big, " 0x001234567890abcdef12345") testcommon("%#+.23X", big, "+0X001234567890ABCDEF12345") + testcommon("%#-+.23X", big, "+0X001234567890ABCDEF12345") + testcommon("%#-+26.23X", big, "+0X001234567890ABCDEF12345") + testcommon("%#-+27.23X", big, "+0X001234567890ABCDEF12345 ") + testcommon("%#+27.23X", big, " +0X001234567890ABCDEF12345") # next one gets two leading zeroes from precision, and another from the # 0 flag and the width testcommon("%#+027.23X", big, "+0X0001234567890ABCDEF12345") - testcommon("%# 027.23X", big, " 0X0001234567890ABCDEF12345") # same, except no 0 flag testcommon("%#+27.23X", big, " +0X001234567890ABCDEF12345") - testcommon("%#-+27.23x", big, "+0x001234567890abcdef12345 ") - testcommon("%#- 27.23x", big, " 0x001234567890abcdef12345 ") - big = 0o12345670123456701234567012345670 # 32 octal digits testcommon("%o", big, "12345670123456701234567012345670") testcommon("%o", -big, "-12345670123456701234567012345670") @@ -200,46 +191,51 @@ class FormatTest(unittest.TestCase): testcommon("%o", big, "12345670123456701234567012345670") testcommon("%#o", big, "0o12345670123456701234567012345670") testcommon("%#o", -big, "-0o12345670123456701234567012345670") - testcommon("%#38o", big, " 0o12345670123456701234567012345670") - testcommon("%#-38o", big, "0o12345670123456701234567012345670 ") - testcommon("%#038o", big, "0o000012345670123456701234567012345670") - testcommon("%#.34o", big, "0o0012345670123456701234567012345670") testcommon("%#.34o", -big, "-0o0012345670123456701234567012345670") - testcommon("%#38.34o", big, " 0o0012345670123456701234567012345670") - testcommon("%#-38.34o", big, "0o0012345670123456701234567012345670 ") - testcommon("%#038.34o", big, "0o000012345670123456701234567012345670") testcommon("%#+.34o", big, "+0o0012345670123456701234567012345670") testcommon("%# .34o", big, " 0o0012345670123456701234567012345670") - testcommon("%#+38.34o", big, " +0o0012345670123456701234567012345670") - testcommon("%#-+38.34o", big, "+0o0012345670123456701234567012345670 ") - testcommon("%#- 38.34o", big, " 0o0012345670123456701234567012345670 ") - testcommon("%#+038.34o", big, "+0o00012345670123456701234567012345670") - testcommon("%# 038.34o", big, " 0o00012345670123456701234567012345670") + testcommon("%#+.34o", big, "+0o0012345670123456701234567012345670") + testcommon("%#-+.34o", big, "+0o0012345670123456701234567012345670") + testcommon("%#-+37.34o", big, "+0o0012345670123456701234567012345670") + testcommon("%#+37.34o", big, "+0o0012345670123456701234567012345670") # next one gets one leading zero from precision testcommon("%.33o", big, "012345670123456701234567012345670") - # base marker added in spite of leading zero (different to Python 2) + # base marker shouldn't change that, since "0" is redundant testcommon("%#.33o", big, "0o012345670123456701234567012345670") - # reduce precision, and base marker is always added + # but reduce precision, and base marker should add a zero testcommon("%#.32o", big, "0o12345670123456701234567012345670") - # one leading zero from precision, plus two from "0" flag & width - testcommon("%035.33o", big, "00012345670123456701234567012345670") - # base marker shouldn't change the size - testcommon("%0#35.33o", big, "0o012345670123456701234567012345670") - + # one leading zero from precision, and another from "0" flag & width + testcommon("%034.33o", big, "0012345670123456701234567012345670") + # base marker shouldn't change that + testcommon("%0#34.33o", big, "0o012345670123456701234567012345670") # Some small ints, in both Python int and flavors). testcommon("%d", 42, "42") testcommon("%d", -42, "-42") + testcommon("%d", 42, "42") + testcommon("%d", -42, "-42") testcommon("%d", 42.0, "42") testcommon("%#x", 1, "0x1") + testcommon("%#x", 1, "0x1") testcommon("%#X", 1, "0X1") + testcommon("%#X", 1, "0X1") + testcommon("%#o", 1, "0o1") testcommon("%#o", 1, "0o1") testcommon("%#o", 0, "0o0") + testcommon("%#o", 0, "0o0") + testcommon("%o", 0, "0") testcommon("%o", 0, "0") testcommon("%d", 0, "0") + testcommon("%d", 0, "0") testcommon("%#x", 0, "0x0") + testcommon("%#x", 0, "0x0") + testcommon("%#X", 0, "0X0") testcommon("%#X", 0, "0X0") testcommon("%x", 0x42, "42") testcommon("%x", -0x42, "-42") + testcommon("%x", 0x42, "42") + testcommon("%x", -0x42, "-42") + testcommon("%o", 0o42, "42") + testcommon("%o", -0o42, "-42") testcommon("%o", 0o42, "42") testcommon("%o", -0o42, "-42") # alternate float formatting @@ -278,7 +274,7 @@ class FormatTest(unittest.TestCase): test_exc('%d', '1', TypeError, "%d format: a number is required, not str") test_exc('%x', '1', TypeError, "%x format: an integer is required, not str") test_exc('%x', 3.14, TypeError, "%x format: an integer is required, not float") - test_exc('%g', '1', TypeError, "a float is required") + test_exc('%g', '1', TypeError, "must be real number, not str") test_exc('no format', '1', TypeError, "not all arguments converted during string formatting") test_exc('%c', -1, OverflowError, "%c arg not in range(0x110000)") @@ -304,6 +300,8 @@ class FormatTest(unittest.TestCase): testcommon(b"%c", 7, b"\x07") testcommon(b"%c", b"Z", b"Z") testcommon(b"%c", bytearray(b"Z"), b"Z") + testcommon(b"%5c", 65, b" A") + testcommon(b"%-5c", 65, b"A ") # %b will insert a series of bytes, either from a type that supports # the Py_buffer protocol, or something that has a __bytes__ method class FakeBytes(object): @@ -388,13 +386,6 @@ class FormatTest(unittest.TestCase): else: raise TestFailed('"%*d"%(maxsize, -127) should fail') - def test_nul(self): - # test the null character - testcommon("a\0b", (), 'a\0b') - testcommon("a%cb", (0,), 'a\0b') - testformat("a%sb", ('c\0d',), 'ac\0db') - testcommon(b"a%sb", (b'c\0d',), b'ac\0db') - def test_non_ascii(self): testformat("\u20ac=%f", (1.0,), "\u20ac=1.000000") diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py index 9df4a54..7905c36 100644 --- a/Lib/test/test_fractions.py +++ b/Lib/test/test_fractions.py @@ -150,6 +150,7 @@ class FractionTest(unittest.TestCase): self.assertRaises(TypeError, F, "3/2", 3) self.assertRaises(TypeError, F, 3, 0j) self.assertRaises(TypeError, F, 3, 1j) + self.assertRaises(TypeError, F, 1, 2, 3) @requires_IEEE_754 def testInitFromFloat(self): @@ -263,13 +264,13 @@ class FractionTest(unittest.TestCase): nan = inf - inf # bug 16469: error types should be consistent with float -> int self.assertRaisesMessage( - OverflowError, "Cannot convert inf to Fraction.", + OverflowError, "cannot convert Infinity to integer ratio", F.from_float, inf) self.assertRaisesMessage( - OverflowError, "Cannot convert -inf to Fraction.", + OverflowError, "cannot convert Infinity to integer ratio", F.from_float, -inf) self.assertRaisesMessage( - ValueError, "Cannot convert nan to Fraction.", + ValueError, "cannot convert NaN to integer ratio", F.from_float, nan) def testFromDecimal(self): @@ -284,16 +285,16 @@ class FractionTest(unittest.TestCase): # bug 16469: error types should be consistent with decimal -> int self.assertRaisesMessage( - OverflowError, "Cannot convert Infinity to Fraction.", + OverflowError, "cannot convert Infinity to integer ratio", F.from_decimal, Decimal("inf")) self.assertRaisesMessage( - OverflowError, "Cannot convert -Infinity to Fraction.", + OverflowError, "cannot convert Infinity to integer ratio", F.from_decimal, Decimal("-inf")) self.assertRaisesMessage( - ValueError, "Cannot convert NaN to Fraction.", + ValueError, "cannot convert NaN to integer ratio", F.from_decimal, Decimal("nan")) self.assertRaisesMessage( - ValueError, "Cannot convert sNaN to Fraction.", + ValueError, "cannot convert NaN to integer ratio", F.from_decimal, Decimal("snan")) def testLimitDenominator(self): diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py new file mode 100644 index 0000000..8205083 --- /dev/null +++ b/Lib/test/test_fstring.py @@ -0,0 +1,760 @@ +import ast +import types +import decimal +import unittest + +a_global = 'global variable' + +# You could argue that I'm too strict in looking for specific error +# values with assertRaisesRegex, but without it it's way too easy to +# make a syntax error in the test strings. Especially with all of the +# triple quotes, raw strings, backslashes, etc. I think it's a +# worthwhile tradeoff. When I switched to this method, I found many +# examples where I wasn't testing what I thought I was. + +class TestCase(unittest.TestCase): + def assertAllRaise(self, exception_type, regex, error_strings): + for str in error_strings: + with self.subTest(str=str): + with self.assertRaisesRegex(exception_type, regex): + eval(str) + + def test__format__lookup(self): + # Make sure __format__ is looked up on the type, not the instance. + class X: + def __format__(self, spec): + return 'class' + + x = X() + + # Add a bound __format__ method to the 'y' instance, but not + # the 'x' instance. + y = X() + y.__format__ = types.MethodType(lambda self, spec: 'instance', y) + + self.assertEqual(f'{y}', format(y)) + self.assertEqual(f'{y}', 'class') + self.assertEqual(format(x), format(y)) + + # __format__ is not called this way, but still make sure it + # returns what we expect (so we can make sure we're bypassing + # it). + self.assertEqual(x.__format__(''), 'class') + self.assertEqual(y.__format__(''), 'instance') + + # This is how __format__ is actually called. + self.assertEqual(type(x).__format__(x, ''), 'class') + self.assertEqual(type(y).__format__(y, ''), 'class') + + def test_ast(self): + # Inspired by http://bugs.python.org/issue24975 + class X: + def __init__(self): + self.called = False + def __call__(self): + self.called = True + return 4 + x = X() + expr = """ +a = 10 +f'{a * x()}'""" + t = ast.parse(expr) + c = compile(t, '', 'exec') + + # Make sure x was not called. + self.assertFalse(x.called) + + # Actually run the code. + exec(c) + + # Make sure x was called. + self.assertTrue(x.called) + + def test_literal_eval(self): + # With no expressions, an f-string is okay. + self.assertEqual(ast.literal_eval("f'x'"), 'x') + self.assertEqual(ast.literal_eval("f'x' 'y'"), 'xy') + + # But this should raise an error. + with self.assertRaisesRegex(ValueError, 'malformed node or string'): + ast.literal_eval("f'x{3}'") + + # As should this, which uses a different ast node + with self.assertRaisesRegex(ValueError, 'malformed node or string'): + ast.literal_eval("f'{3}'") + + def test_ast_compile_time_concat(self): + x = [''] + + expr = """x[0] = 'foo' f'{3}'""" + t = ast.parse(expr) + c = compile(t, '', 'exec') + exec(c) + self.assertEqual(x[0], 'foo3') + + def test_compile_time_concat_errors(self): + self.assertAllRaise(SyntaxError, + 'cannot mix bytes and nonbytes literals', + [r"""f'' b''""", + r"""b'' f''""", + ]) + + def test_literal(self): + self.assertEqual(f'', '') + self.assertEqual(f'a', 'a') + self.assertEqual(f' ', ' ') + + def test_unterminated_string(self): + self.assertAllRaise(SyntaxError, 'f-string: unterminated string', + [r"""f'{"x'""", + r"""f'{"x}'""", + r"""f'{("x'""", + r"""f'{("x}'""", + ]) + + def test_mismatched_parens(self): + self.assertAllRaise(SyntaxError, 'f-string: mismatched', + ["f'{((}'", + ]) + + def test_double_braces(self): + self.assertEqual(f'{{', '{') + self.assertEqual(f'a{{', 'a{') + self.assertEqual(f'{{b', '{b') + self.assertEqual(f'a{{b', 'a{b') + self.assertEqual(f'}}', '}') + self.assertEqual(f'a}}', 'a}') + self.assertEqual(f'}}b', '}b') + self.assertEqual(f'a}}b', 'a}b') + self.assertEqual(f'{{}}', '{}') + self.assertEqual(f'a{{}}', 'a{}') + self.assertEqual(f'{{b}}', '{b}') + self.assertEqual(f'{{}}c', '{}c') + self.assertEqual(f'a{{b}}', 'a{b}') + self.assertEqual(f'a{{}}c', 'a{}c') + self.assertEqual(f'{{b}}c', '{b}c') + self.assertEqual(f'a{{b}}c', 'a{b}c') + + self.assertEqual(f'{{{10}', '{10') + self.assertEqual(f'}}{10}', '}10') + self.assertEqual(f'}}{{{10}', '}{10') + self.assertEqual(f'}}a{{{10}', '}a{10') + + self.assertEqual(f'{10}{{', '10{') + self.assertEqual(f'{10}}}', '10}') + self.assertEqual(f'{10}}}{{', '10}{') + self.assertEqual(f'{10}}}a{{' '}', '10}a{}') + + # Inside of strings, don't interpret doubled brackets. + self.assertEqual(f'{"{{}}"}', '{{}}') + + self.assertAllRaise(TypeError, 'unhashable type', + ["f'{ {{}} }'", # dict in a set + ]) + + def test_compile_time_concat(self): + x = 'def' + self.assertEqual('abc' f'## {x}ghi', 'abc## defghi') + self.assertEqual('abc' f'{x}' 'ghi', 'abcdefghi') + self.assertEqual('abc' f'{x}' 'gh' f'i{x:4}', 'abcdefghidef ') + self.assertEqual('{x}' f'{x}', '{x}def') + self.assertEqual('{x' f'{x}', '{xdef') + self.assertEqual('{x}' f'{x}', '{x}def') + self.assertEqual('{{x}}' f'{x}', '{{x}}def') + self.assertEqual('{{x' f'{x}', '{{xdef') + self.assertEqual('x}}' f'{x}', 'x}}def') + self.assertEqual(f'{x}' 'x}}', 'defx}}') + self.assertEqual(f'{x}' '', 'def') + self.assertEqual('' f'{x}' '', 'def') + self.assertEqual('' f'{x}', 'def') + self.assertEqual(f'{x}' '2', 'def2') + self.assertEqual('1' f'{x}' '2', '1def2') + self.assertEqual('1' f'{x}', '1def') + self.assertEqual(f'{x}' f'-{x}', 'def-def') + self.assertEqual('' f'', '') + self.assertEqual('' f'' '', '') + self.assertEqual('' f'' '' f'', '') + self.assertEqual(f'', '') + self.assertEqual(f'' '', '') + self.assertEqual(f'' '' f'', '') + self.assertEqual(f'' '' f'' '', '') + + self.assertAllRaise(SyntaxError, "f-string: expecting '}'", + ["f'{3' f'}'", # can't concat to get a valid f-string + ]) + + def test_comments(self): + # These aren't comments, since they're in strings. + d = {'#': 'hash'} + self.assertEqual(f'{"#"}', '#') + self.assertEqual(f'{d["#"]}', 'hash') + + self.assertAllRaise(SyntaxError, "f-string expression part cannot include '#'", + ["f'{1#}'", # error because the expression becomes "(1#)" + "f'{3(#)}'", + "f'{#}'", + "f'{)#}'", # When wrapped in parens, this becomes + # '()#)'. Make sure that doesn't compile. + ]) + + def test_many_expressions(self): + # Create a string with many expressions in it. Note that + # because we have a space in here as a literal, we're actually + # going to use twice as many ast nodes: one for each literal + # plus one for each expression. + def build_fstr(n, extra=''): + return "f'" + ('{x} ' * n) + extra + "'" + + x = 'X' + width = 1 + + # Test around 256. + for i in range(250, 260): + self.assertEqual(eval(build_fstr(i)), (x+' ')*i) + + # Test concatenating 2 largs fstrings. + self.assertEqual(eval(build_fstr(255)*256), (x+' ')*(255*256)) + + s = build_fstr(253, '{x:{width}} ') + self.assertEqual(eval(s), (x+' ')*254) + + # Test lots of expressions and constants, concatenated. + s = "f'{1}' 'x' 'y'" * 1024 + self.assertEqual(eval(s), '1xy' * 1024) + + def test_format_specifier_expressions(self): + width = 10 + precision = 4 + value = decimal.Decimal('12.34567') + self.assertEqual(f'result: {value:{width}.{precision}}', 'result: 12.35') + self.assertEqual(f'result: {value:{width!r}.{precision}}', 'result: 12.35') + self.assertEqual(f'result: {value:{width:0}.{precision:1}}', 'result: 12.35') + self.assertEqual(f'result: {value:{1}{0:0}.{precision:1}}', 'result: 12.35') + self.assertEqual(f'result: {value:{ 1}{ 0:0}.{ precision:1}}', 'result: 12.35') + self.assertEqual(f'{10:#{1}0x}', ' 0xa') + self.assertEqual(f'{10:{"#"}1{0}{"x"}}', ' 0xa') + self.assertEqual(f'{-10:-{"#"}1{0}x}', ' -0xa') + self.assertEqual(f'{-10:{"-"}#{1}0{"x"}}', ' -0xa') + self.assertEqual(f'{10:#{3 != {4:5} and width}x}', ' 0xa') + + self.assertAllRaise(SyntaxError, "f-string: expecting '}'", + ["""f'{"s"!r{":10"}}'""", + + # This looks like a nested format spec. + ]) + + self.assertAllRaise(SyntaxError, "invalid syntax", + [# Invalid syntax inside a nested spec. + "f'{4:{/5}}'", + ]) + + self.assertAllRaise(SyntaxError, "f-string: expressions nested too deeply", + [# Can't nest format specifiers. + "f'result: {value:{width:{0}}.{precision:1}}'", + ]) + + self.assertAllRaise(SyntaxError, 'f-string: invalid conversion character', + [# No expansion inside conversion or for + # the : or ! itself. + """f'{"s"!{"r"}}'""", + ]) + + def test_side_effect_order(self): + class X: + def __init__(self): + self.i = 0 + def __format__(self, spec): + self.i += 1 + return str(self.i) + + x = X() + self.assertEqual(f'{x} {x}', '1 2') + + def test_missing_expression(self): + self.assertAllRaise(SyntaxError, 'f-string: empty expression not allowed', + ["f'{}'", + "f'{ }'" + "f' {} '", + "f'{!r}'", + "f'{ !r}'", + "f'{10:{ }}'", + "f' { } '", + + # Catch the empty expression before the + # invalid conversion. + "f'{!x}'", + "f'{ !xr}'", + "f'{!x:}'", + "f'{!x:a}'", + "f'{ !xr:}'", + "f'{ !xr:a}'", + + "f'{!}'", + "f'{:}'", + + # We find the empty expression before the + # missing closing brace. + "f'{!'", + "f'{!s:'", + "f'{:'", + "f'{:x'", + ]) + + def test_parens_in_expressions(self): + self.assertEqual(f'{3,}', '(3,)') + + # Add these because when an expression is evaluated, parens + # are added around it. But we shouldn't go from an invalid + # expression to a valid one. The added parens are just + # supposed to allow whitespace (including newlines). + self.assertAllRaise(SyntaxError, 'invalid syntax', + ["f'{,}'", + "f'{,}'", # this is (,), which is an error + ]) + + self.assertAllRaise(SyntaxError, "f-string: expecting '}'", + ["f'{3)+(4}'", + ]) + + self.assertAllRaise(SyntaxError, 'EOL while scanning string literal', + ["f'{\n}'", + ]) + + def test_backslashes_in_string_part(self): + self.assertEqual(f'\t', '\t') + self.assertEqual(r'\t', '\\t') + self.assertEqual(rf'\t', '\\t') + self.assertEqual(f'{2}\t', '2\t') + self.assertEqual(f'{2}\t{3}', '2\t3') + self.assertEqual(f'\t{3}', '\t3') + + self.assertEqual(f'\u0394', '\u0394') + self.assertEqual(r'\u0394', '\\u0394') + self.assertEqual(rf'\u0394', '\\u0394') + self.assertEqual(f'{2}\u0394', '2\u0394') + self.assertEqual(f'{2}\u0394{3}', '2\u03943') + self.assertEqual(f'\u0394{3}', '\u03943') + + self.assertEqual(f'\U00000394', '\u0394') + self.assertEqual(r'\U00000394', '\\U00000394') + self.assertEqual(rf'\U00000394', '\\U00000394') + self.assertEqual(f'{2}\U00000394', '2\u0394') + self.assertEqual(f'{2}\U00000394{3}', '2\u03943') + self.assertEqual(f'\U00000394{3}', '\u03943') + + self.assertEqual(f'\N{GREEK CAPITAL LETTER DELTA}', '\u0394') + self.assertEqual(f'{2}\N{GREEK CAPITAL LETTER DELTA}', '2\u0394') + self.assertEqual(f'{2}\N{GREEK CAPITAL LETTER DELTA}{3}', '2\u03943') + self.assertEqual(f'\N{GREEK CAPITAL LETTER DELTA}{3}', '\u03943') + self.assertEqual(f'2\N{GREEK CAPITAL LETTER DELTA}', '2\u0394') + self.assertEqual(f'2\N{GREEK CAPITAL LETTER DELTA}3', '2\u03943') + self.assertEqual(f'\N{GREEK CAPITAL LETTER DELTA}3', '\u03943') + + self.assertEqual(f'\x20', ' ') + self.assertEqual(r'\x20', '\\x20') + self.assertEqual(rf'\x20', '\\x20') + self.assertEqual(f'{2}\x20', '2 ') + self.assertEqual(f'{2}\x20{3}', '2 3') + self.assertEqual(f'\x20{3}', ' 3') + + self.assertEqual(f'2\x20', '2 ') + self.assertEqual(f'2\x203', '2 3') + self.assertEqual(f'\x203', ' 3') + + def test_misformed_unicode_character_name(self): + # These test are needed because unicode names are parsed + # differently inside f-strings. + self.assertAllRaise(SyntaxError, r"\(unicode error\) 'unicodeescape' codec can't decode bytes in position .*: malformed \\N character escape", + [r"f'\N'", + r"f'\N{'", + r"f'\N{GREEK CAPITAL LETTER DELTA'", + + # Here are the non-f-string versions, + # which should give the same errors. + r"'\N'", + r"'\N{'", + r"'\N{GREEK CAPITAL LETTER DELTA'", + ]) + + def test_no_backslashes_in_expression_part(self): + self.assertAllRaise(SyntaxError, 'f-string expression part cannot include a backslash', + [r"f'{\'a\'}'", + r"f'{\t3}'", + r"f'{\}'", + r"rf'{\'a\'}'", + r"rf'{\t3}'", + r"rf'{\}'", + r"""rf'{"\N{LEFT CURLY BRACKET}"}'""", + r"f'{\n}'", + ]) + + def test_no_escapes_for_braces(self): + """ + Only literal curly braces begin an expression. + """ + # \x7b is '{'. + self.assertEqual(f'\x7b1+1}}', '{1+1}') + self.assertEqual(f'\x7b1+1', '{1+1') + self.assertEqual(f'\u007b1+1', '{1+1') + self.assertEqual(f'\N{LEFT CURLY BRACKET}1+1\N{RIGHT CURLY BRACKET}', '{1+1}') + + def test_newlines_in_expressions(self): + self.assertEqual(f'{0}', '0') + self.assertEqual(rf'''{3+ +4}''', '7') + + def test_lambda(self): + x = 5 + self.assertEqual(f'{(lambda y:x*y)("8")!r}', "'88888'") + self.assertEqual(f'{(lambda y:x*y)("8")!r:10}', "'88888' ") + self.assertEqual(f'{(lambda y:x*y)("8"):10}', "88888 ") + + # lambda doesn't work without parens, because the colon + # makes the parser think it's a format_spec + self.assertAllRaise(SyntaxError, 'unexpected EOF while parsing', + ["f'{lambda x:x}'", + ]) + + def test_yield(self): + # Not terribly useful, but make sure the yield turns + # a function into a generator + def fn(y): + f'y:{yield y*2}' + + g = fn(4) + self.assertEqual(next(g), 8) + + def test_yield_send(self): + def fn(x): + yield f'x:{yield (lambda i: x * i)}' + + g = fn(10) + the_lambda = next(g) + self.assertEqual(the_lambda(4), 40) + self.assertEqual(g.send('string'), 'x:string') + + def test_expressions_with_triple_quoted_strings(self): + self.assertEqual(f"{'''x'''}", 'x') + self.assertEqual(f"{'''eric's'''}", "eric's") + + # Test concatenation within an expression + self.assertEqual(f'{"x" """eric"s""" "y"}', 'xeric"sy') + self.assertEqual(f'{"x" """eric"s"""}', 'xeric"s') + self.assertEqual(f'{"""eric"s""" "y"}', 'eric"sy') + self.assertEqual(f'{"""x""" """eric"s""" "y"}', 'xeric"sy') + self.assertEqual(f'{"""x""" """eric"s""" """y"""}', 'xeric"sy') + self.assertEqual(f'{r"""x""" """eric"s""" """y"""}', 'xeric"sy') + + def test_multiple_vars(self): + x = 98 + y = 'abc' + self.assertEqual(f'{x}{y}', '98abc') + + self.assertEqual(f'X{x}{y}', 'X98abc') + self.assertEqual(f'{x}X{y}', '98Xabc') + self.assertEqual(f'{x}{y}X', '98abcX') + + self.assertEqual(f'X{x}Y{y}', 'X98Yabc') + self.assertEqual(f'X{x}{y}Y', 'X98abcY') + self.assertEqual(f'{x}X{y}Y', '98XabcY') + + self.assertEqual(f'X{x}Y{y}Z', 'X98YabcZ') + + def test_closure(self): + def outer(x): + def inner(): + return f'x:{x}' + return inner + + self.assertEqual(outer('987')(), 'x:987') + self.assertEqual(outer(7)(), 'x:7') + + def test_arguments(self): + y = 2 + def f(x, width): + return f'x={x*y:{width}}' + + self.assertEqual(f('foo', 10), 'x=foofoo ') + x = 'bar' + self.assertEqual(f(10, 10), 'x= 20') + + def test_locals(self): + value = 123 + self.assertEqual(f'v:{value}', 'v:123') + + def test_missing_variable(self): + with self.assertRaises(NameError): + f'v:{value}' + + def test_missing_format_spec(self): + class O: + def __format__(self, spec): + if not spec: + return '*' + return spec + + self.assertEqual(f'{O():x}', 'x') + self.assertEqual(f'{O()}', '*') + self.assertEqual(f'{O():}', '*') + + self.assertEqual(f'{3:}', '3') + self.assertEqual(f'{3!s:}', '3') + + def test_global(self): + self.assertEqual(f'g:{a_global}', 'g:global variable') + self.assertEqual(f'g:{a_global!r}', "g:'global variable'") + + a_local = 'local variable' + self.assertEqual(f'g:{a_global} l:{a_local}', + 'g:global variable l:local variable') + self.assertEqual(f'g:{a_global!r}', + "g:'global variable'") + self.assertEqual(f'g:{a_global} l:{a_local!r}', + "g:global variable l:'local variable'") + + self.assertIn("module 'unittest' from", f'{unittest}') + + def test_shadowed_global(self): + a_global = 'really a local' + self.assertEqual(f'g:{a_global}', 'g:really a local') + self.assertEqual(f'g:{a_global!r}', "g:'really a local'") + + a_local = 'local variable' + self.assertEqual(f'g:{a_global} l:{a_local}', + 'g:really a local l:local variable') + self.assertEqual(f'g:{a_global!r}', + "g:'really a local'") + self.assertEqual(f'g:{a_global} l:{a_local!r}', + "g:really a local l:'local variable'") + + def test_call(self): + def foo(x): + return 'x=' + str(x) + + self.assertEqual(f'{foo(10)}', 'x=10') + + def test_nested_fstrings(self): + y = 5 + self.assertEqual(f'{f"{0}"*3}', '000') + self.assertEqual(f'{f"{y}"*3}', '555') + + def test_invalid_string_prefixes(self): + self.assertAllRaise(SyntaxError, 'unexpected EOF while parsing', + ["fu''", + "uf''", + "Fu''", + "fU''", + "Uf''", + "uF''", + "ufr''", + "urf''", + "fur''", + "fru''", + "rfu''", + "ruf''", + "FUR''", + "Fur''", + "fb''", + "fB''", + "Fb''", + "FB''", + "bf''", + "bF''", + "Bf''", + "BF''", + ]) + + def test_leading_trailing_spaces(self): + self.assertEqual(f'{ 3}', '3') + self.assertEqual(f'{ 3}', '3') + self.assertEqual(f'{3 }', '3') + self.assertEqual(f'{3 }', '3') + + self.assertEqual(f'expr={ {x: y for x, y in [(1, 2), ]}}', + 'expr={1: 2}') + self.assertEqual(f'expr={ {x: y for x, y in [(1, 2), ]} }', + 'expr={1: 2}') + + def test_not_equal(self): + # There's a special test for this because there's a special + # case in the f-string parser to look for != as not ending an + # expression. Normally it would, while looking for !s or !r. + + self.assertEqual(f'{3!=4}', 'True') + self.assertEqual(f'{3!=4:}', 'True') + self.assertEqual(f'{3!=4!s}', 'True') + self.assertEqual(f'{3!=4!s:.3}', 'Tru') + + def test_conversions(self): + self.assertEqual(f'{3.14:10.10}', ' 3.14') + self.assertEqual(f'{3.14!s:10.10}', '3.14 ') + self.assertEqual(f'{3.14!r:10.10}', '3.14 ') + self.assertEqual(f'{3.14!a:10.10}', '3.14 ') + + self.assertEqual(f'{"a"}', 'a') + self.assertEqual(f'{"a"!r}', "'a'") + self.assertEqual(f'{"a"!a}', "'a'") + + # Not a conversion. + self.assertEqual(f'{"a!r"}', "a!r") + + # Not a conversion, but show that ! is allowed in a format spec. + self.assertEqual(f'{3.14:!<10.10}', '3.14!!!!!!') + + self.assertAllRaise(SyntaxError, 'f-string: invalid conversion character', + ["f'{3!g}'", + "f'{3!A}'", + "f'{3!3}'", + "f'{3!G}'", + "f'{3!!}'", + "f'{3!:}'", + "f'{3! s}'", # no space before conversion char + ]) + + self.assertAllRaise(SyntaxError, "f-string: expecting '}'", + ["f'{x!s{y}}'", + "f'{3!ss}'", + "f'{3!ss:}'", + "f'{3!ss:s}'", + ]) + + def test_assignment(self): + self.assertAllRaise(SyntaxError, 'invalid syntax', + ["f'' = 3", + "f'{0}' = x", + "f'{x}' = x", + ]) + + def test_del(self): + self.assertAllRaise(SyntaxError, 'invalid syntax', + ["del f''", + "del '' f''", + ]) + + def test_mismatched_braces(self): + self.assertAllRaise(SyntaxError, "f-string: single '}' is not allowed", + ["f'{{}'", + "f'{{}}}'", + "f'}'", + "f'x}'", + "f'x}x'", + r"f'\u007b}'", + + # Can't have { or } in a format spec. + "f'{3:}>10}'", + "f'{3:}}>10}'", + ]) + + self.assertAllRaise(SyntaxError, "f-string: expecting '}'", + ["f'{3:{{>10}'", + "f'{3'", + "f'{3!'", + "f'{3:'", + "f'{3!s'", + "f'{3!s:'", + "f'{3!s:3'", + "f'x{'", + "f'x{x'", + "f'{x'", + "f'{3:s'", + "f'{{{'", + "f'{{}}{'", + "f'{'", + ]) + + # But these are just normal strings. + self.assertEqual(f'{"{"}', '{') + self.assertEqual(f'{"}"}', '}') + self.assertEqual(f'{3:{"}"}>10}', '}}}}}}}}}3') + self.assertEqual(f'{2:{"{"}>10}', '{{{{{{{{{2') + + def test_if_conditional(self): + # There's special logic in compile.c to test if the + # conditional for an if (and while) are constants. Exercise + # that code. + + def test_fstring(x, expected): + flag = 0 + if f'{x}': + flag = 1 + else: + flag = 2 + self.assertEqual(flag, expected) + + def test_concat_empty(x, expected): + flag = 0 + if '' f'{x}': + flag = 1 + else: + flag = 2 + self.assertEqual(flag, expected) + + def test_concat_non_empty(x, expected): + flag = 0 + if ' ' f'{x}': + flag = 1 + else: + flag = 2 + self.assertEqual(flag, expected) + + test_fstring('', 2) + test_fstring(' ', 1) + + test_concat_empty('', 2) + test_concat_empty(' ', 1) + + test_concat_non_empty('', 1) + test_concat_non_empty(' ', 1) + + def test_empty_format_specifier(self): + x = 'test' + self.assertEqual(f'{x}', 'test') + self.assertEqual(f'{x:}', 'test') + self.assertEqual(f'{x!s:}', 'test') + self.assertEqual(f'{x!r:}', "'test'") + + def test_str_format_differences(self): + d = {'a': 'string', + 0: 'integer', + } + a = 0 + self.assertEqual(f'{d[0]}', 'integer') + self.assertEqual(f'{d["a"]}', 'string') + self.assertEqual(f'{d[a]}', 'integer') + self.assertEqual('{d[a]}'.format(d=d), 'string') + self.assertEqual('{d[0]}'.format(d=d), 'integer') + + def test_invalid_expressions(self): + self.assertAllRaise(SyntaxError, 'invalid syntax', + [r"f'{a[4)}'", + r"f'{a(4]}'", + ]) + + def test_errors(self): + # see issue 26287 + self.assertAllRaise(TypeError, 'unsupported', + [r"f'{(lambda: 0):x}'", + r"f'{(0,):x}'", + ]) + self.assertAllRaise(ValueError, 'Unknown format code', + [r"f'{1000:j}'", + r"f'{1000:j}'", + ]) + + def test_loop(self): + for i in range(1000): + self.assertEqual(f'i:{i}', 'i:' + str(i)) + + def test_dict(self): + d = {'"': 'dquote', + "'": 'squote', + 'foo': 'bar', + } + self.assertEqual(f'''{d["'"]}''', 'squote') + self.assertEqual(f"""{d['"']}""", 'dquote') + + self.assertEqual(f'{d["foo"]}', 'bar') + self.assertEqual(f"{d['foo']}", 'bar') + +if __name__ == '__main__': + unittest.main() diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index 583d3b1..12fabc5 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -311,10 +311,12 @@ if ssl is not None: _ssl_closing = False def secure_connection(self): - socket = ssl.wrap_socket(self.socket, suppress_ragged_eofs=False, - certfile=CERTFILE, server_side=True, - do_handshake_on_connect=False, - ssl_version=ssl.PROTOCOL_SSLv23) + context = ssl.SSLContext() + context.load_cert_chain(CERTFILE) + socket = context.wrap_socket(self.socket, + suppress_ragged_eofs=False, + server_side=True, + do_handshake_on_connect=False) self.del_channel() self.set_socket(socket) self._ssl_accepting = True @@ -482,9 +484,6 @@ class TestFTPClass(TestCase): self.assertEqual(self.client.sanitize('PASS 12345'), repr('PASS *****')) def test_exceptions(self): - self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r\n0') - self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\n0') - self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r0') self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 400') self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 499') self.assertRaises(ftplib.error_perm, self.client.sendcmd, 'echo 500') @@ -493,8 +492,7 @@ class TestFTPClass(TestCase): def test_all_errors(self): exceptions = (ftplib.error_reply, ftplib.error_temp, ftplib.error_perm, - ftplib.error_proto, ftplib.Error, OSError, - EOFError) + ftplib.error_proto, ftplib.Error, OSError, EOFError) for x in exceptions: try: raise x('exception not included in all_errors set') @@ -1053,10 +1051,19 @@ class TestTimeouts(TestCase): ftp.close() +class MiscTestCase(TestCase): + def test__all__(self): + blacklist = {'MSG_OOB', 'FTP_PORT', 'MAXLINE', 'CRLF', 'B_CRLF', + 'Error', 'parse150', 'parse227', 'parse229', 'parse257', + 'print_line', 'ftpcp', 'test'} + support.check__all__(self, ftplib, blacklist=blacklist) + + def test_main(): tests = [TestFTPClass, TestTimeouts, TestIPv6Environment, - TestTLS_FTPClassMixin, TestTLS_FTPClass] + TestTLS_FTPClassMixin, TestTLS_FTPClass, + MiscTestCase] thread_info = support.threading_setup() try: diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py index 04ffab9..75427df 100644 --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1,5 +1,4 @@ import abc -import builtins import collections import copy from itertools import permutations @@ -7,9 +6,9 @@ import pickle from random import choice import sys from test import support -import time import unittest from weakref import proxy +import contextlib try: import threading except ImportError: @@ -22,6 +21,14 @@ c_functools = support.import_fresh_module('functools', fresh=['_functools']) decimal = support.import_fresh_module('decimal', fresh=['_decimal']) +@contextlib.contextmanager +def replaced_module(name, replacement): + original_module = sys.modules[name] + sys.modules[name] = replacement + try: + yield + finally: + sys.modules[name] = original_module def capture(*args, **kw): """capture all positional and keyword arguments""" @@ -80,15 +87,6 @@ class TestPartial: p(b=7) self.assertEqual(d, {'a':3}) - def test_kwargs_copy(self): - # Issue #29532: Altering a kwarg dictionary passed to a constructor - # should not affect a partial object after creation - d = {'a': 3} - p = self.partial(capture, **d) - self.assertEqual(p(), ((), {'a': 3})) - d['a'] = 5 - self.assertEqual(p(), ((), {'a': 3})) - def test_arg_combinations(self): # exercise special code paths for zero args in either partial # object or the caller @@ -178,58 +176,35 @@ class TestPartial: p2.new_attr = 'spam' self.assertEqual(p2.new_attr, 'spam') - -@unittest.skipUnless(c_functools, 'requires the C _functools module') -class TestPartialC(TestPartial, unittest.TestCase): - if c_functools: - partial = c_functools.partial - - def test_attributes_unwritable(self): - # attributes should not be writable - p = self.partial(capture, 1, 2, a=10, b=20) - self.assertRaises(AttributeError, setattr, p, 'func', map) - self.assertRaises(AttributeError, setattr, p, 'args', (1, 2)) - self.assertRaises(AttributeError, setattr, p, 'keywords', dict(a=1, b=2)) - - p = self.partial(hex) - try: - del p.__dict__ - except TypeError: - pass - else: - self.fail('partial object allowed __dict__ to be deleted') - def test_repr(self): args = (object(), object()) args_repr = ', '.join(repr(a) for a in args) kwargs = {'a': object(), 'b': object()} kwargs_reprs = ['a={a!r}, b={b!r}'.format_map(kwargs), 'b={b!r}, a={a!r}'.format_map(kwargs)] - if self.partial is c_functools.partial: + if self.partial in (c_functools.partial, py_functools.partial): name = 'functools.partial' else: name = self.partial.__name__ f = self.partial(capture) - self.assertEqual('{}({!r})'.format(name, capture), - repr(f)) + self.assertEqual(f'{name}({capture!r})', repr(f)) f = self.partial(capture, *args) - self.assertEqual('{}({!r}, {})'.format(name, capture, args_repr), - repr(f)) + self.assertEqual(f'{name}({capture!r}, {args_repr})', repr(f)) f = self.partial(capture, **kwargs) self.assertIn(repr(f), - ['{}({!r}, {})'.format(name, capture, kwargs_repr) + [f'{name}({capture!r}, {kwargs_repr})' for kwargs_repr in kwargs_reprs]) f = self.partial(capture, *args, **kwargs) self.assertIn(repr(f), - ['{}({!r}, {}, {})'.format(name, capture, args_repr, kwargs_repr) + [f'{name}({capture!r}, {args_repr}, {kwargs_repr})' for kwargs_repr in kwargs_reprs]) def test_recursive_repr(self): - if self.partial is c_functools.partial: + if self.partial in (c_functools.partial, py_functools.partial): name = 'functools.partial' else: name = self.partial.__name__ @@ -237,30 +212,31 @@ class TestPartialC(TestPartial, unittest.TestCase): f = self.partial(capture) f.__setstate__((f, (), {}, {})) try: - self.assertEqual(repr(f), '%s(%s(...))' % (name, name)) + self.assertEqual(repr(f), '%s(...)' % (name,)) finally: f.__setstate__((capture, (), {}, {})) f = self.partial(capture) f.__setstate__((capture, (f,), {}, {})) try: - self.assertEqual(repr(f), '%s(%r, %s(...))' % (name, capture, name)) + self.assertEqual(repr(f), '%s(%r, ...)' % (name, capture,)) finally: f.__setstate__((capture, (), {}, {})) f = self.partial(capture) f.__setstate__((capture, (), {'a': f}, {})) try: - self.assertEqual(repr(f), '%s(%r, a=%s(...))' % (name, capture, name)) + self.assertEqual(repr(f), '%s(%r, a=...)' % (name, capture,)) finally: f.__setstate__((capture, (), {}, {})) def test_pickle(self): - f = self.partial(signature, ['asdf'], bar=[True]) - f.attr = [] - for proto in range(pickle.HIGHEST_PROTOCOL + 1): - f_copy = pickle.loads(pickle.dumps(f, proto)) - self.assertEqual(signature(f_copy), signature(f)) + with self.AllowPickle(): + f = self.partial(signature, ['asdf'], bar=[True]) + f.attr = [] + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + f_copy = pickle.loads(pickle.dumps(f, proto)) + self.assertEqual(signature(f_copy), signature(f)) def test_copy(self): f = self.partial(signature, ['asdf'], bar=[True]) @@ -285,11 +261,13 @@ class TestPartialC(TestPartial, unittest.TestCase): def test_setstate(self): f = self.partial(signature) f.__setstate__((capture, (1,), dict(a=10), dict(attr=[]))) + self.assertEqual(signature(f), (capture, (1,), dict(a=10), dict(attr=[]))) self.assertEqual(f(2, b=20), ((1, 2), {'a': 10, 'b': 20})) f.__setstate__((capture, (1,), dict(a=10), None)) + self.assertEqual(signature(f), (capture, (1,), dict(a=10), {})) self.assertEqual(f(2, b=20), ((1, 2), {'a': 10, 'b': 20})) @@ -336,38 +314,39 @@ class TestPartialC(TestPartial, unittest.TestCase): self.assertIs(type(r[0]), tuple) def test_recursive_pickle(self): - f = self.partial(capture) - f.__setstate__((f, (), {}, {})) - try: - for proto in range(pickle.HIGHEST_PROTOCOL + 1): - with self.assertRaises(RecursionError): - pickle.dumps(f, proto) - finally: - f.__setstate__((capture, (), {}, {})) - - f = self.partial(capture) - f.__setstate__((capture, (f,), {}, {})) - try: - for proto in range(pickle.HIGHEST_PROTOCOL + 1): - f_copy = pickle.loads(pickle.dumps(f, proto)) - try: - self.assertIs(f_copy.args[0], f_copy) - finally: - f_copy.__setstate__((capture, (), {}, {})) - finally: - f.__setstate__((capture, (), {}, {})) - - f = self.partial(capture) - f.__setstate__((capture, (), {'a': f}, {})) - try: - for proto in range(pickle.HIGHEST_PROTOCOL + 1): - f_copy = pickle.loads(pickle.dumps(f, proto)) - try: - self.assertIs(f_copy.keywords['a'], f_copy) - finally: - f_copy.__setstate__((capture, (), {}, {})) - finally: - f.__setstate__((capture, (), {}, {})) + with self.AllowPickle(): + f = self.partial(capture) + f.__setstate__((f, (), {}, {})) + try: + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.assertRaises(RecursionError): + pickle.dumps(f, proto) + finally: + f.__setstate__((capture, (), {}, {})) + + f = self.partial(capture) + f.__setstate__((capture, (f,), {}, {})) + try: + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + f_copy = pickle.loads(pickle.dumps(f, proto)) + try: + self.assertIs(f_copy.args[0], f_copy) + finally: + f_copy.__setstate__((capture, (), {}, {})) + finally: + f.__setstate__((capture, (), {}, {})) + + f = self.partial(capture) + f.__setstate__((capture, (), {'a': f}, {})) + try: + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + f_copy = pickle.loads(pickle.dumps(f, proto)) + try: + self.assertIs(f_copy.keywords['a'], f_copy) + finally: + f_copy.__setstate__((capture, (), {}, {})) + finally: + f.__setstate__((capture, (), {}, {})) # Issue 6083: Reference counting bug def test_setstate_refcount(self): @@ -386,50 +365,60 @@ class TestPartialC(TestPartial, unittest.TestCase): f = self.partial(object) self.assertRaises(TypeError, f.__setstate__, BadSequence()) +@unittest.skipUnless(c_functools, 'requires the C _functools module') +class TestPartialC(TestPartial, unittest.TestCase): + if c_functools: + partial = c_functools.partial - def test_manually_adding_non_string_keyword(self): - p = self.partial(capture) - # Adding a non-string/unicode keyword to partial kwargs - p.keywords[1234] = 'value' - r = repr(p) - self.assertIn('1234', r) - self.assertIn("'value'", r) - with self.assertRaises(TypeError): - p() - - def test_keystr_replaces_value(self): - p = self.partial(capture) - - class MutatesYourDict(object): - def __str__(self): - p.keywords[self] = ['sth2'] - return 'astr' + class AllowPickle: + def __enter__(self): + return self + def __exit__(self, type, value, tb): + return False - # Raplacing the value during key formatting should keep the original - # value alive (at least long enough). - p.keywords[MutatesYourDict()] = ['sth'] - r = repr(p) - self.assertIn('astr', r) - self.assertIn("['sth']", r) + def test_attributes_unwritable(self): + # attributes should not be writable + p = self.partial(capture, 1, 2, a=10, b=20) + self.assertRaises(AttributeError, setattr, p, 'func', map) + self.assertRaises(AttributeError, setattr, p, 'args', (1, 2)) + self.assertRaises(AttributeError, setattr, p, 'keywords', dict(a=1, b=2)) + p = self.partial(hex) + try: + del p.__dict__ + except TypeError: + pass + else: + self.fail('partial object allowed __dict__ to be deleted') class TestPartialPy(TestPartial, unittest.TestCase): - partial = staticmethod(py_functools.partial) + partial = py_functools.partial + class AllowPickle: + def __init__(self): + self._cm = replaced_module("functools", py_functools) + def __enter__(self): + return self._cm.__enter__() + def __exit__(self, type, value, tb): + return self._cm.__exit__(type, value, tb) if c_functools: - class PartialSubclass(c_functools.partial): + class CPartialSubclass(c_functools.partial): pass +class PyPartialSubclass(py_functools.partial): + pass @unittest.skipUnless(c_functools, 'requires the C _functools module') class TestPartialCSubclass(TestPartialC): if c_functools: - partial = PartialSubclass + partial = CPartialSubclass # partial subclasses are not optimized for nested calls test_nested_optimization = None +class TestPartialPySubclass(TestPartialPy): + partial = PyPartialSubclass class TestPartialMethod(unittest.TestCase): @@ -720,9 +709,10 @@ class TestWraps(TestUpdateWrapper): self.assertEqual(wrapper.attr, 'This is a different test') self.assertEqual(wrapper.dict_attr, f.dict_attr) - +@unittest.skipUnless(c_functools, 'requires the C _functools module') class TestReduce(unittest.TestCase): - func = functools.reduce + if c_functools: + func = c_functools.reduce def test_reduce(self): class Squares: @@ -1199,18 +1189,6 @@ class TestLRU: self.assertEqual(misses, 4) self.assertEqual(currsize, 2) - def test_lru_reentrancy_with_len(self): - # Test to make sure the LRU cache code isn't thrown-off by - # caching the built-in len() function. Since len() can be - # cached, we shouldn't use it inside the lru code itself. - old_len = builtins.len - try: - builtins.len = self.module.lru_cache(4)(len) - for i in [0, 0, 1, 2, 3, 3, 4, 5, 6, 1, 7, 2, 1]: - self.assertEqual(len('abcdefghijklmn'[:i]), i) - finally: - builtins.len = old_len - def test_lru_type_error(self): # Regression test for issue #28653. # lru_cache was leaking when one of the arguments @@ -1400,20 +1378,6 @@ class TestLRU: pause.reset() self.assertEqual(f.cache_info(), (0, (i+1)*n, m*n, i+1)) - @unittest.skipUnless(threading, 'This test requires threading.') - def test_lru_cache_threaded3(self): - @self.module.lru_cache(maxsize=2) - def f(x): - time.sleep(.01) - return 3 * x - def test(i, x): - with self.subTest(thread=i): - self.assertEqual(f(x), 3 * x, i) - threads = [threading.Thread(target=test, args=(i, v)) - for i, v in enumerate([1, 2, 2, 3, 2])] - with support.start_threads(threads): - pass - def test_need_for_rlock(self): # This will deadlock on an LRU cache that uses a regular lock @@ -1630,13 +1594,15 @@ class TestSingleDispatch(unittest.TestCase): bases = [c.Sequence, c.MutableMapping, c.Mapping, c.Set] for haystack in permutations(bases): m = mro(dict, haystack) - self.assertEqual(m, [dict, c.MutableMapping, c.Mapping, c.Sized, - c.Iterable, c.Container, object]) + self.assertEqual(m, [dict, c.MutableMapping, c.Mapping, + c.Collection, c.Sized, c.Iterable, + c.Container, object]) bases = [c.Container, c.Mapping, c.MutableMapping, c.OrderedDict] for haystack in permutations(bases): m = mro(c.ChainMap, haystack) self.assertEqual(m, [c.ChainMap, c.MutableMapping, c.Mapping, - c.Sized, c.Iterable, c.Container, object]) + c.Collection, c.Sized, c.Iterable, + c.Container, object]) # If there's a generic function with implementations registered for # both Sized and Container, passing a defaultdict to it results in an @@ -1657,9 +1623,9 @@ class TestSingleDispatch(unittest.TestCase): bases = [c.MutableSequence, c.MutableMapping] for haystack in permutations(bases): m = mro(D, bases) - self.assertEqual(m, [D, c.MutableSequence, c.Sequence, - c.defaultdict, dict, c.MutableMapping, - c.Mapping, c.Sized, c.Iterable, c.Container, + self.assertEqual(m, [D, c.MutableSequence, c.Sequence, c.Reversible, + c.defaultdict, dict, c.MutableMapping, c.Mapping, + c.Collection, c.Sized, c.Iterable, c.Container, object]) # Container and Callable are registered on different base classes and @@ -1672,7 +1638,8 @@ class TestSingleDispatch(unittest.TestCase): for haystack in permutations(bases): m = mro(C, haystack) self.assertEqual(m, [C, c.Callable, c.defaultdict, dict, c.Mapping, - c.Sized, c.Iterable, c.Container, object]) + c.Collection, c.Sized, c.Iterable, + c.Container, object]) def test_register_abc(self): c = collections diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index 7b072ad..213b2ba 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -2,10 +2,9 @@ import unittest from test import support -import os import re -rx = re.compile('\((\S+).py, line (\d+)') +rx = re.compile(r'\((\S+).py, line (\d+)') def get_error_location(msg): mo = rx.search(str(msg)) @@ -13,12 +12,6 @@ def get_error_location(msg): class FutureTest(unittest.TestCase): - def check_syntax_error(self, err, basename, lineno, offset=0): - self.assertIn('%s.py, line %d' % (basename, lineno), str(err)) - self.assertEqual(os.path.basename(err.filename), basename + '.py') - self.assertEqual(err.lineno, lineno) - self.assertEqual(err.offset, offset) - def test_future1(self): with support.CleanImport('future_test1'): from test import future_test1 @@ -34,44 +27,68 @@ class FutureTest(unittest.TestCase): from test import test_future3 def test_badfuture3(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future3 - self.check_syntax_error(cm.exception, "badsyntax_future3", 3) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future3", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture4(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future4 - self.check_syntax_error(cm.exception, "badsyntax_future4", 3) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future4", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture5(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future5 - self.check_syntax_error(cm.exception, "badsyntax_future5", 4) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future5", '4')) + else: + self.fail("expected exception didn't occur") def test_badfuture6(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future6 - self.check_syntax_error(cm.exception, "badsyntax_future6", 3) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future6", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture7(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future7 - self.check_syntax_error(cm.exception, "badsyntax_future7", 3, 53) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future7", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture8(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future8 - self.check_syntax_error(cm.exception, "badsyntax_future8", 3) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future8", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture9(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future9 - self.check_syntax_error(cm.exception, "badsyntax_future9", 3, 0) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future9", '3')) + else: + self.fail("expected exception didn't occur") def test_badfuture10(self): - with self.assertRaises(SyntaxError) as cm: + try: from test import badsyntax_future10 - self.check_syntax_error(cm.exception, "badsyntax_future10", 3, 0) + except SyntaxError as msg: + self.assertEqual(get_error_location(msg), ("badsyntax_future10", '3')) + else: + self.fail("expected exception didn't occur") def test_parserhack(self): # test that the parser.c::future_hack function works as expected diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py index a4d684b..e727499 100644 --- a/Lib/test/test_gc.py +++ b/Lib/test/test_gc.py @@ -684,7 +684,6 @@ class GCTests(unittest.TestCase): # Create a reference cycle through the __main__ module and check # it gets collected at interpreter shutdown. code = """if 1: - import weakref class C: def __del__(self): print('__del__ called') @@ -699,7 +698,6 @@ class GCTests(unittest.TestCase): # Same as above, but with a non-__main__ module. with temp_dir() as script_dir: module = """if 1: - import weakref class C: def __del__(self): print('__del__ called') diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 3db10b6..60f1d92 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -5,7 +5,6 @@ import os import re -import pprint import subprocess import sys import sysconfig @@ -111,6 +110,7 @@ HAS_PYUP_PYDOWN = gdb_has_frame_select() BREAKPOINT_FN='builtin_id' +@unittest.skipIf(support.PGO, "not useful for PGO") class DebuggerTests(unittest.TestCase): """Test that the debugger can debug Python.""" @@ -177,6 +177,7 @@ class DebuggerTests(unittest.TestCase): args = ['--eval-command=%s' % cmd for cmd in commands] args += ["--args", sys.executable] + args.extend(subprocess._args_from_interpreter_flags()) if not import_site: # -S suppresses the default 'import site' @@ -240,7 +241,7 @@ class DebuggerTests(unittest.TestCase): # gdb can insert additional '\n' and space characters in various places # in its output, depending on the width of the terminal it's connected # to (using its "wrap_here" function) - m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*', + m = re.match(r'.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*', gdb_output, re.DOTALL) if not m: self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output)) @@ -292,7 +293,8 @@ class PrettyPrintTests(DebuggerTests): 'Verify the pretty-printing of dictionaries' self.assertGdbRepr({}) self.assertGdbRepr({'foo': 'bar'}, "{'foo': 'bar'}") - self.assertGdbRepr({'foo': 'bar', 'douglas': 42}, "{'douglas': 42, 'foo': 'bar'}") + # Python preserves insertion order since 3.6 + self.assertGdbRepr({'foo': 'bar', 'douglas': 42}, "{'foo': 'bar', 'douglas': 42}") def test_lists(self): 'Verify the pretty-printing of lists' @@ -355,9 +357,12 @@ class PrettyPrintTests(DebuggerTests): 'Verify the pretty-printing of sets' if (gdb_major_version, gdb_minor_version) < (7, 3): self.skipTest("pretty-printing of sets needs gdb 7.3 or later") - self.assertGdbRepr(set(), 'set()') - self.assertGdbRepr(set(['a', 'b']), "{'a', 'b'}") - self.assertGdbRepr(set([4, 5, 6]), "{4, 5, 6}") + self.assertGdbRepr(set(), "set()") + self.assertGdbRepr(set(['a']), "{'a'}") + # PYTHONHASHSEED is need to get the exact frozenset item order + if not sys.flags.ignore_environment: + self.assertGdbRepr(set(['a', 'b']), "{'a', 'b'}") + self.assertGdbRepr(set([4, 5, 6]), "{4, 5, 6}") # Ensure that we handle sets containing the "dummy" key value, # which happens on deletion: @@ -370,9 +375,12 @@ id(s)''') 'Verify the pretty-printing of frozensets' if (gdb_major_version, gdb_minor_version) < (7, 3): self.skipTest("pretty-printing of frozensets needs gdb 7.3 or later") - self.assertGdbRepr(frozenset(), 'frozenset()') - self.assertGdbRepr(frozenset(['a', 'b']), "frozenset({'a', 'b'})") - self.assertGdbRepr(frozenset([4, 5, 6]), "frozenset({4, 5, 6})") + self.assertGdbRepr(frozenset(), "frozenset()") + self.assertGdbRepr(frozenset(['a']), "frozenset({'a'})") + # PYTHONHASHSEED is need to get the exact frozenset item order + if not sys.flags.ignore_environment: + self.assertGdbRepr(frozenset(['a', 'b']), "frozenset({'a', 'b'})") + self.assertGdbRepr(frozenset([4, 5, 6]), "frozenset({4, 5, 6})") def test_exceptions(self): # Test a RuntimeError @@ -501,6 +509,10 @@ id(foo)''') def test_builtins_help(self): 'Ensure that the new-style class _Helper in site.py can be handled' + + if sys.flags.no_site: + self.skipTest("need site module, but -S option was used") + # (this was the issue causing tracebacks in # http://bugs.python.org/issue8032#msg100537 ) gdb_repr, gdb_output = self.get_gdb_repr('id(__builtins__.help)', import_site=True) @@ -536,7 +548,7 @@ class Foo: foo = Foo() foo.an_attr = foo id(foo)''') - self.assertTrue(re.match('\) at remote 0x-?[0-9a-f]+>', + self.assertTrue(re.match(r'\) at remote 0x-?[0-9a-f]+>', gdb_repr), 'Unexpected gdb representation: %r\n%s' % \ (gdb_repr, gdb_output)) @@ -549,7 +561,7 @@ class Foo(object): foo = Foo() foo.an_attr = foo id(foo)''') - self.assertTrue(re.match('\) at remote 0x-?[0-9a-f]+>', + self.assertTrue(re.match(r'\) at remote 0x-?[0-9a-f]+>', gdb_repr), 'Unexpected gdb representation: %r\n%s' % \ (gdb_repr, gdb_output)) @@ -563,7 +575,7 @@ b = Foo() a.an_attr = b b.an_attr = a id(a)''') - self.assertTrue(re.match('\) at remote 0x-?[0-9a-f]+>\) at remote 0x-?[0-9a-f]+>', + self.assertTrue(re.match(r'\) at remote 0x-?[0-9a-f]+>\) at remote 0x-?[0-9a-f]+>', gdb_repr), 'Unexpected gdb representation: %r\n%s' % \ (gdb_repr, gdb_output)) @@ -598,7 +610,7 @@ id(a)''') def test_builtin_method(self): gdb_repr, gdb_output = self.get_gdb_repr('import sys; id(sys.stdout.readlines)') - self.assertTrue(re.match('', + self.assertTrue(re.match(r'', gdb_repr), 'Unexpected gdb representation: %r\n%s' % \ (gdb_repr, gdb_output)) @@ -613,7 +625,7 @@ id(foo.__code__)''', breakpoint='builtin_id', cmds_after_breakpoint=['print (PyFrameObject*)(((PyCodeObject*)v)->co_zombieframe)'] ) - self.assertTrue(re.match('.*\s+\$1 =\s+Frame 0x-?[0-9a-f]+, for file , line 3, in foo \(\)\s+.*', + self.assertTrue(re.match(r'.*\s+\$1 =\s+Frame 0x-?[0-9a-f]+, for file , line 3, in foo \(\)\s+.*', gdb_output, re.DOTALL), 'Unexpected gdb representation: %r\n%s' % (gdb_output, gdb_output)) @@ -667,7 +679,7 @@ class StackNavigationTests(DebuggerTests): def test_pyup_command(self): 'Verify that the "py-up" command works' bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-up']) + cmds_after_breakpoint=['py-up', 'py-up']) self.assertMultilineMatches(bt, r'''^.* #[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\) @@ -686,7 +698,7 @@ $''') def test_up_at_top(self): 'Verify handling of "py-up" at the top of the stack' bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-up'] * 4) + cmds_after_breakpoint=['py-up'] * 5) self.assertEndsWith(bt, 'Unable to find an older python frame\n') @@ -696,7 +708,7 @@ $''') def test_up_then_down(self): 'Verify "py-up" followed by "py-down"' bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-up', 'py-down']) + cmds_after_breakpoint=['py-up', 'py-up', 'py-down']) self.assertMultilineMatches(bt, r'''^.* #[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\) @@ -715,6 +727,7 @@ class PyBtTests(DebuggerTests): self.assertMultilineMatches(bt, r'''^.* Traceback \(most recent call first\): + File ".*gdb_sample.py", line 10, in baz id\(42\) File ".*gdb_sample.py", line 7, in bar @@ -841,7 +854,7 @@ class PyPrintTests(DebuggerTests): def test_basic_command(self): 'Verify that the "py-print" command works' bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-print args']) + cmds_after_breakpoint=['py-up', 'py-print args']) self.assertMultilineMatches(bt, r".*\nlocal 'args' = \(1, 2, 3\)\n.*") @@ -850,7 +863,7 @@ class PyPrintTests(DebuggerTests): @unittest.skipUnless(HAS_PYUP_PYDOWN, "test requires py-up/py-down commands") def test_print_after_up(self): bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-up', 'py-print c', 'py-print b', 'py-print a']) + cmds_after_breakpoint=['py-up', 'py-up', 'py-print c', 'py-print b', 'py-print a']) self.assertMultilineMatches(bt, r".*\nlocal 'c' = 3\nlocal 'b' = 2\nlocal 'a' = 1\n.*") @@ -858,7 +871,7 @@ class PyPrintTests(DebuggerTests): "Python was compiled with optimizations") def test_printing_global(self): bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-print __name__']) + cmds_after_breakpoint=['py-up', 'py-print __name__']) self.assertMultilineMatches(bt, r".*\nglobal '__name__' = '__main__'\n.*") @@ -866,7 +879,7 @@ class PyPrintTests(DebuggerTests): "Python was compiled with optimizations") def test_printing_builtin(self): bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-print len']) + cmds_after_breakpoint=['py-up', 'py-print len']) self.assertMultilineMatches(bt, r".*\nbuiltin 'len' = \n.*") @@ -875,7 +888,7 @@ class PyLocalsTests(DebuggerTests): "Python was compiled with optimizations") def test_basic_command(self): bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-locals']) + cmds_after_breakpoint=['py-up', 'py-locals']) self.assertMultilineMatches(bt, r".*\nargs = \(1, 2, 3\)\n.*") @@ -884,7 +897,7 @@ class PyLocalsTests(DebuggerTests): "Python was compiled with optimizations") def test_locals_after_up(self): bt = self.get_stack_trace(script=self.get_sample_script(), - cmds_after_breakpoint=['py-up', 'py-locals']) + cmds_after_breakpoint=['py-up', 'py-up', 'py-locals']) self.assertMultilineMatches(bt, r".*\na = 1\nb = 2\nc = 3\n.*") diff --git a/Lib/test/test_pep479.py b/Lib/test/test_generator_stop.py similarity index 100% rename from Lib/test/test_pep479.py rename to Lib/test/test_generator_stop.py diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index cd6a43d..f81c82f 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -245,11 +245,11 @@ class ExceptionTest(unittest.TestCase): yield with self.assertRaises(StopIteration), \ - self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"): + self.assertWarnsRegex(DeprecationWarning, "StopIteration"): next(gen()) - with self.assertRaisesRegex(PendingDeprecationWarning, + with self.assertRaisesRegex(DeprecationWarning, "generator .* raised StopIteration"), \ warnings.catch_warnings(): @@ -268,7 +268,7 @@ class ExceptionTest(unittest.TestCase): g = f() self.assertEqual(next(g), 1) - with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"): + with self.assertWarnsRegex(DeprecationWarning, "StopIteration"): with self.assertRaises(StopIteration): next(g) diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py index b77d1d7..ae5dd6a 100644 --- a/Lib/test/test_genericpath.py +++ b/Lib/test/test_genericpath.py @@ -10,11 +10,9 @@ import warnings from test import support -def safe_rmdir(dirname): - try: - os.rmdir(dirname) - except OSError: - pass +def create_file(filename, data=b'foo'): + with open(filename, 'xb', 0) as fp: + fp.write(data) class GenericTest: @@ -97,52 +95,47 @@ class GenericTest: self.assertNotEqual(s1[n:n+1], s2[n:n+1]) def test_getsize(self): - f = open(support.TESTFN, "wb") - try: - f.write(b"foo") - f.close() - self.assertEqual(self.pathmodule.getsize(support.TESTFN), 3) - finally: - if not f.closed: - f.close() - support.unlink(support.TESTFN) + filename = support.TESTFN + self.addCleanup(support.unlink, filename) - def test_time(self): - f = open(support.TESTFN, "wb") - try: - f.write(b"foo") - f.close() - f = open(support.TESTFN, "ab") + create_file(filename, b'Hello') + self.assertEqual(self.pathmodule.getsize(filename), 5) + os.remove(filename) + + create_file(filename, b'Hello World!') + self.assertEqual(self.pathmodule.getsize(filename), 12) + + def test_filetime(self): + filename = support.TESTFN + self.addCleanup(support.unlink, filename) + + create_file(filename, b'foo') + + with open(filename, "ab", 0) as f: f.write(b"bar") - f.close() - f = open(support.TESTFN, "rb") - d = f.read() - f.close() - self.assertEqual(d, b"foobar") - - self.assertLessEqual( - self.pathmodule.getctime(support.TESTFN), - self.pathmodule.getmtime(support.TESTFN) - ) - finally: - if not f.closed: - f.close() - support.unlink(support.TESTFN) + + with open(filename, "rb", 0) as f: + data = f.read() + self.assertEqual(data, b"foobar") + + self.assertLessEqual( + self.pathmodule.getctime(filename), + self.pathmodule.getmtime(filename) + ) def test_exists(self): - self.assertIs(self.pathmodule.exists(support.TESTFN), False) - f = open(support.TESTFN, "wb") - try: + filename = support.TESTFN + self.addCleanup(support.unlink, filename) + + self.assertIs(self.pathmodule.exists(filename), False) + + with open(filename, "xb") as f: f.write(b"foo") - f.close() - self.assertIs(self.pathmodule.exists(support.TESTFN), True) - if not self.pathmodule == genericpath: - self.assertIs(self.pathmodule.lexists(support.TESTFN), - True) - finally: - if not f.close(): - f.close() - support.unlink(support.TESTFN) + + self.assertIs(self.pathmodule.exists(filename), True) + + if not self.pathmodule == genericpath: + self.assertIs(self.pathmodule.lexists(filename), True) @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()") def test_exists_fd(self): @@ -154,53 +147,66 @@ class GenericTest: os.close(w) self.assertFalse(self.pathmodule.exists(r)) - def test_isdir(self): - self.assertIs(self.pathmodule.isdir(support.TESTFN), False) - f = open(support.TESTFN, "wb") - try: - f.write(b"foo") - f.close() - self.assertIs(self.pathmodule.isdir(support.TESTFN), False) - os.remove(support.TESTFN) - os.mkdir(support.TESTFN) - self.assertIs(self.pathmodule.isdir(support.TESTFN), True) - os.rmdir(support.TESTFN) - finally: - if not f.close(): - f.close() - support.unlink(support.TESTFN) - safe_rmdir(support.TESTFN) - - def test_isfile(self): - self.assertIs(self.pathmodule.isfile(support.TESTFN), False) - f = open(support.TESTFN, "wb") - try: - f.write(b"foo") - f.close() - self.assertIs(self.pathmodule.isfile(support.TESTFN), True) - os.remove(support.TESTFN) - os.mkdir(support.TESTFN) - self.assertIs(self.pathmodule.isfile(support.TESTFN), False) - os.rmdir(support.TESTFN) - finally: - if not f.close(): - f.close() - support.unlink(support.TESTFN) - safe_rmdir(support.TESTFN) + def test_isdir_file(self): + filename = support.TESTFN + self.addCleanup(support.unlink, filename) + self.assertIs(self.pathmodule.isdir(filename), False) + + create_file(filename) + self.assertIs(self.pathmodule.isdir(filename), False) + + def test_isdir_dir(self): + filename = support.TESTFN + self.addCleanup(support.rmdir, filename) + self.assertIs(self.pathmodule.isdir(filename), False) - @staticmethod - def _create_file(filename): - with open(filename, 'wb') as f: - f.write(b'foo') + os.mkdir(filename) + self.assertIs(self.pathmodule.isdir(filename), True) + + def test_isfile_file(self): + filename = support.TESTFN + self.addCleanup(support.unlink, filename) + self.assertIs(self.pathmodule.isfile(filename), False) + + create_file(filename) + self.assertIs(self.pathmodule.isfile(filename), True) + + def test_isfile_dir(self): + filename = support.TESTFN + self.addCleanup(support.rmdir, filename) + self.assertIs(self.pathmodule.isfile(filename), False) + + os.mkdir(filename) + self.assertIs(self.pathmodule.isfile(filename), False) def test_samefile(self): - try: - test_fn = support.TESTFN + "1" - self._create_file(test_fn) - self.assertTrue(self.pathmodule.samefile(test_fn, test_fn)) - self.assertRaises(TypeError, self.pathmodule.samefile) - finally: - os.remove(test_fn) + file1 = support.TESTFN + file2 = support.TESTFN + "2" + self.addCleanup(support.unlink, file1) + self.addCleanup(support.unlink, file2) + + create_file(file1) + self.assertTrue(self.pathmodule.samefile(file1, file1)) + + create_file(file2) + self.assertFalse(self.pathmodule.samefile(file1, file2)) + + self.assertRaises(TypeError, self.pathmodule.samefile) + + def _test_samefile_on_link_func(self, func): + test_fn1 = support.TESTFN + test_fn2 = support.TESTFN + "2" + self.addCleanup(support.unlink, test_fn1) + self.addCleanup(support.unlink, test_fn2) + + create_file(test_fn1) + + func(test_fn1, test_fn2) + self.assertTrue(self.pathmodule.samefile(test_fn1, test_fn2)) + os.remove(test_fn2) + + create_file(test_fn2) + self.assertFalse(self.pathmodule.samefile(test_fn1, test_fn2)) @support.skip_unless_symlink def test_samefile_on_symlink(self): @@ -209,31 +215,37 @@ class GenericTest: def test_samefile_on_link(self): self._test_samefile_on_link_func(os.link) - def _test_samefile_on_link_func(self, func): - try: - test_fn1 = support.TESTFN + "1" - test_fn2 = support.TESTFN + "2" - self._create_file(test_fn1) + def test_samestat(self): + test_fn1 = support.TESTFN + test_fn2 = support.TESTFN + "2" + self.addCleanup(support.unlink, test_fn1) + self.addCleanup(support.unlink, test_fn2) - func(test_fn1, test_fn2) - self.assertTrue(self.pathmodule.samefile(test_fn1, test_fn2)) - os.remove(test_fn2) + create_file(test_fn1) + stat1 = os.stat(test_fn1) + self.assertTrue(self.pathmodule.samestat(stat1, os.stat(test_fn1))) - self._create_file(test_fn2) - self.assertFalse(self.pathmodule.samefile(test_fn1, test_fn2)) - finally: - os.remove(test_fn1) - os.remove(test_fn2) + create_file(test_fn2) + stat2 = os.stat(test_fn2) + self.assertFalse(self.pathmodule.samestat(stat1, stat2)) - def test_samestat(self): - try: - test_fn = support.TESTFN + "1" - self._create_file(test_fn) - test_fns = [test_fn]*2 - stats = map(os.stat, test_fns) - self.assertTrue(self.pathmodule.samestat(*stats)) - finally: - os.remove(test_fn) + self.assertRaises(TypeError, self.pathmodule.samestat) + + def _test_samestat_on_link_func(self, func): + test_fn1 = support.TESTFN + "1" + test_fn2 = support.TESTFN + "2" + self.addCleanup(support.unlink, test_fn1) + self.addCleanup(support.unlink, test_fn2) + + create_file(test_fn1) + func(test_fn1, test_fn2) + self.assertTrue(self.pathmodule.samestat(os.stat(test_fn1), + os.stat(test_fn2))) + os.remove(test_fn2) + + create_file(test_fn2) + self.assertFalse(self.pathmodule.samestat(os.stat(test_fn1), + os.stat(test_fn2))) @support.skip_unless_symlink def test_samestat_on_symlink(self): @@ -242,31 +254,17 @@ class GenericTest: def test_samestat_on_link(self): self._test_samestat_on_link_func(os.link) - def _test_samestat_on_link_func(self, func): - try: - test_fn1 = support.TESTFN + "1" - test_fn2 = support.TESTFN + "2" - self._create_file(test_fn1) - test_fns = (test_fn1, test_fn2) - func(*test_fns) - stats = map(os.stat, test_fns) - self.assertTrue(self.pathmodule.samestat(*stats)) - os.remove(test_fn2) - - self._create_file(test_fn2) - stats = map(os.stat, test_fns) - self.assertFalse(self.pathmodule.samestat(*stats)) - - self.assertRaises(TypeError, self.pathmodule.samestat) - finally: - os.remove(test_fn1) - os.remove(test_fn2) - def test_sameopenfile(self): - fname = support.TESTFN + "1" - with open(fname, "wb") as a, open(fname, "wb") as b: - self.assertTrue(self.pathmodule.sameopenfile( - a.fileno(), b.fileno())) + filename = support.TESTFN + self.addCleanup(support.unlink, filename) + create_file(filename) + + with open(filename, "rb", 0) as fp1: + fd1 = fp1.fileno() + with open(filename, "rb", 0) as fp2: + fd2 = fp2.fileno() + self.assertTrue(self.pathmodule.sameopenfile(fd1, fd2)) + class TestGenericTest(GenericTest, unittest.TestCase): # Issue 16852: GenericTest can't inherit from unittest.TestCase @@ -390,10 +388,13 @@ class CommonTest(GenericTest): warnings.simplefilter("ignore", DeprecationWarning) self.assertIn(b"foo", self.pathmodule.abspath(b"foo")) + # avoid UnicodeDecodeError on Windows + undecodable_path = b'' if sys.platform == 'win32' else b'f\xf2\xf2' + # Abspath returns bytes when the arg is bytes with warnings.catch_warnings(): warnings.simplefilter("ignore", DeprecationWarning) - for path in (b'', b'foo', b'f\xf2\xf2', b'/foo', b'C:\\'): + for path in (b'', b'foo', undecodable_path, b'/foo', b'C:\\'): self.assertIsInstance(self.pathmodule.abspath(path), bytes) def test_realpath(self): @@ -452,16 +453,15 @@ class CommonTest(GenericTest): with self.assertRaisesRegex(TypeError, errmsg): self.pathmodule.join('str', b'bytes') # regression, see #15377 - errmsg = r'join\(\) argument must be str or bytes, not %r' - with self.assertRaisesRegex(TypeError, errmsg % 'int'): + with self.assertRaisesRegex(TypeError, 'int'): self.pathmodule.join(42, 'str') - with self.assertRaisesRegex(TypeError, errmsg % 'int'): + with self.assertRaisesRegex(TypeError, 'int'): self.pathmodule.join('str', 42) - with self.assertRaisesRegex(TypeError, errmsg % 'int'): + with self.assertRaisesRegex(TypeError, 'int'): self.pathmodule.join(42) - with self.assertRaisesRegex(TypeError, errmsg % 'list'): + with self.assertRaisesRegex(TypeError, 'list'): self.pathmodule.join([]) - with self.assertRaisesRegex(TypeError, errmsg % 'bytearray'): + with self.assertRaisesRegex(TypeError, 'bytearray'): self.pathmodule.join(bytearray(b'foo'), bytearray(b'bar')) def test_relpath_errors(self): @@ -473,14 +473,59 @@ class CommonTest(GenericTest): self.pathmodule.relpath(b'bytes', 'str') with self.assertRaisesRegex(TypeError, errmsg): self.pathmodule.relpath('str', b'bytes') - errmsg = r'relpath\(\) argument must be str or bytes, not %r' - with self.assertRaisesRegex(TypeError, errmsg % 'int'): + with self.assertRaisesRegex(TypeError, 'int'): self.pathmodule.relpath(42, 'str') - with self.assertRaisesRegex(TypeError, errmsg % 'int'): + with self.assertRaisesRegex(TypeError, 'int'): self.pathmodule.relpath('str', 42) - with self.assertRaisesRegex(TypeError, errmsg % 'bytearray'): + with self.assertRaisesRegex(TypeError, 'bytearray'): self.pathmodule.relpath(bytearray(b'foo'), bytearray(b'bar')) +class PathLikeTests(unittest.TestCase): + + class PathLike: + def __init__(self, path=''): + self.path = path + def __fspath__(self): + if isinstance(self.path, BaseException): + raise self.path + else: + return self.path + + def setUp(self): + self.file_name = support.TESTFN.lower() + self.file_path = self.PathLike(support.TESTFN) + self.addCleanup(support.unlink, self.file_name) + create_file(self.file_name, b"test_genericpath.PathLikeTests") + + def assertPathEqual(self, func): + self.assertEqual(func(self.file_path), func(self.file_name)) + + def test_path_exists(self): + self.assertPathEqual(os.path.exists) + + def test_path_isfile(self): + self.assertPathEqual(os.path.isfile) + + def test_path_isdir(self): + self.assertPathEqual(os.path.isdir) + + def test_path_commonprefix(self): + self.assertEqual(os.path.commonprefix([self.file_path, self.file_name]), + self.file_name) + + def test_path_getsize(self): + self.assertPathEqual(os.path.getsize) + + def test_path_getmtime(self): + self.assertPathEqual(os.path.getatime) + + def test_path_getctime(self): + self.assertPathEqual(os.path.getctime) + + def test_path_samefile(self): + self.assertTrue(os.path.samefile(self.file_path, self.file_name)) + + if __name__=="__main__": unittest.main() diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py index 984aac7..8a194aa 100644 --- a/Lib/test/test_getargs2.py +++ b/Lib/test/test_getargs2.py @@ -5,10 +5,6 @@ from test import support # Skip this test if the _testcapi module isn't available. support.import_module('_testcapi') from _testcapi import getargs_keywords, getargs_keyword_only -try: - from _testcapi import getargs_L, getargs_K -except ImportError: - getargs_L = None # PY_LONG_LONG not available # > How about the following counterproposal. This also changes some of # > the other format codes to be a little more regular. @@ -309,7 +305,6 @@ class Signed_TestCase(unittest.TestCase): self.assertRaises(OverflowError, getargs_n, VERY_LARGE) -@unittest.skipIf(getargs_L is None, 'PY_LONG_LONG is not available') class LongLong_TestCase(unittest.TestCase): def test_L(self): from _testcapi import getargs_L @@ -365,7 +360,8 @@ class Float_TestCase(unittest.TestCase): self.assertEqual(getargs_f(FloatSubclass(7.5)), 7.5) self.assertEqual(getargs_f(FloatSubclass2(7.5)), 7.5) self.assertRaises(TypeError, getargs_f, BadFloat()) - self.assertEqual(getargs_f(BadFloat2()), 4.25) + with self.assertWarns(DeprecationWarning): + self.assertEqual(getargs_f(BadFloat2()), 4.25) self.assertEqual(getargs_f(BadFloat3(7.5)), 7.5) for x in (FLT_MIN, -FLT_MIN, FLT_MAX, -FLT_MAX, INF, -INF): @@ -390,7 +386,8 @@ class Float_TestCase(unittest.TestCase): self.assertEqual(getargs_d(FloatSubclass(7.5)), 7.5) self.assertEqual(getargs_d(FloatSubclass2(7.5)), 7.5) self.assertRaises(TypeError, getargs_d, BadFloat()) - self.assertEqual(getargs_d(BadFloat2()), 4.25) + with self.assertWarns(DeprecationWarning): + self.assertEqual(getargs_d(BadFloat2()), 4.25) self.assertEqual(getargs_d(BadFloat3(7.5)), 7.5) for x in (DBL_MIN, -DBL_MIN, DBL_MAX, -DBL_MAX, INF, -INF): @@ -474,7 +471,7 @@ class Tuple_TestCase(unittest.TestCase): ret = get_args(*TupleSubclass([1, 2])) self.assertEqual(ret, (1, 2)) - self.assertIsInstance(ret, tuple) + self.assertIs(type(ret), tuple) ret = get_args() self.assertIn(ret, ((), None)) @@ -512,7 +509,7 @@ class Keywords_TestCase(unittest.TestCase): ret = get_kwargs(**DictSubclass({'a': 1, 'b': 2})) self.assertEqual(ret, {'a': 1, 'b': 2}) - self.assertIsInstance(ret, dict) + self.assertIs(type(ret), dict) ret = get_kwargs() self.assertIn(ret, ({}, None)) @@ -628,20 +625,20 @@ class KeywordOnly_TestCase(unittest.TestCase): ) # required arg missing with self.assertRaisesRegex(TypeError, - "Required argument 'required' \(pos 1\) not found"): + r"Required argument 'required' \(pos 1\) not found"): getargs_keyword_only(optional=2) with self.assertRaisesRegex(TypeError, - "Required argument 'required' \(pos 1\) not found"): + r"Required argument 'required' \(pos 1\) not found"): getargs_keyword_only(keyword_only=3) def test_too_many_args(self): with self.assertRaisesRegex(TypeError, - "Function takes at most 2 positional arguments \(3 given\)"): + r"Function takes at most 2 positional arguments \(3 given\)"): getargs_keyword_only(1, 2, 3) with self.assertRaisesRegex(TypeError, - "function takes at most 3 arguments \(4 given\)"): + r"function takes at most 3 arguments \(4 given\)"): getargs_keyword_only(1, 2, 3, keyword_only=5) def test_invalid_keyword(self): @@ -656,6 +653,39 @@ class KeywordOnly_TestCase(unittest.TestCase): getargs_keyword_only(1, 2, **{'\uDC80': 10}) +class PositionalOnlyAndKeywords_TestCase(unittest.TestCase): + from _testcapi import getargs_positional_only_and_keywords as getargs + + def test_positional_args(self): + # using all possible positional args + self.assertEqual(self.getargs(1, 2, 3), (1, 2, 3)) + + def test_mixed_args(self): + # positional and keyword args + self.assertEqual(self.getargs(1, 2, keyword=3), (1, 2, 3)) + + def test_optional_args(self): + # missing optional args + self.assertEqual(self.getargs(1, 2), (1, 2, -1)) + self.assertEqual(self.getargs(1, keyword=3), (1, -1, 3)) + + def test_required_args(self): + self.assertEqual(self.getargs(1), (1, -1, -1)) + # required positional arg missing + with self.assertRaisesRegex(TypeError, + r"Function takes at least 1 positional arguments \(0 given\)"): + self.getargs() + + with self.assertRaisesRegex(TypeError, + r"Function takes at least 1 positional arguments \(0 given\)"): + self.getargs(keyword=3) + + def test_empty_keyword(self): + with self.assertRaisesRegex(TypeError, + "'' is an invalid keyword argument for this function"): + self.getargs(1, 2, **{'': 666}) + + class Bytes_TestCase(unittest.TestCase): def test_c(self): from _testcapi import getargs_c @@ -822,10 +852,10 @@ class String_TestCase(unittest.TestCase): self.assertEqual(getargs_es_hash('abc\xe9', 'latin1', buf), b'abc\xe9') self.assertEqual(buf, bytearray(b'abc\xe9\x00')) buf = bytearray(b'x'*4) - self.assertRaises(TypeError, getargs_es_hash, 'abc\xe9', 'latin1', buf) + self.assertRaises(ValueError, getargs_es_hash, 'abc\xe9', 'latin1', buf) self.assertEqual(buf, bytearray(b'x'*4)) buf = bytearray() - self.assertRaises(TypeError, getargs_es_hash, 'abc\xe9', 'latin1', buf) + self.assertRaises(ValueError, getargs_es_hash, 'abc\xe9', 'latin1', buf) def test_et_hash(self): from _testcapi import getargs_et_hash @@ -848,10 +878,10 @@ class String_TestCase(unittest.TestCase): self.assertEqual(getargs_et_hash('abc\xe9', 'latin1', buf), b'abc\xe9') self.assertEqual(buf, bytearray(b'abc\xe9\x00')) buf = bytearray(b'x'*4) - self.assertRaises(TypeError, getargs_et_hash, 'abc\xe9', 'latin1', buf) + self.assertRaises(ValueError, getargs_et_hash, 'abc\xe9', 'latin1', buf) self.assertEqual(buf, bytearray(b'x'*4)) buf = bytearray() - self.assertRaises(TypeError, getargs_et_hash, 'abc\xe9', 'latin1', buf) + self.assertRaises(ValueError, getargs_et_hash, 'abc\xe9', 'latin1', buf) def test_u(self): from _testcapi import getargs_u diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py index df3dc2b..a852443 100644 --- a/Lib/test/test_gettext.py +++ b/Lib/test/test_gettext.py @@ -1,8 +1,6 @@ import os import base64 -import shutil import gettext -import locale import unittest from test import support @@ -454,122 +452,6 @@ class PluralFormsTestCase(GettextBaseTest): self.assertRaises(TypeError, f, object()) -class LGettextTestCase(GettextBaseTest): - def setUp(self): - GettextBaseTest.setUp(self) - self.mofile = MOFILE - - def test_lgettext(self): - lgettext = gettext.lgettext - ldgettext = gettext.ldgettext - self.assertEqual(lgettext('mullusk'), b'bacon') - self.assertEqual(lgettext('spam'), b'spam') - self.assertEqual(ldgettext('gettext', 'mullusk'), b'bacon') - self.assertEqual(ldgettext('gettext', 'spam'), b'spam') - - def test_lgettext_2(self): - with open(self.mofile, 'rb') as fp: - t = gettext.GNUTranslations(fp) - lgettext = t.lgettext - self.assertEqual(lgettext('mullusk'), b'bacon') - self.assertEqual(lgettext('spam'), b'spam') - - def test_lgettext_bind_textdomain_codeset(self): - lgettext = gettext.lgettext - ldgettext = gettext.ldgettext - saved_codeset = gettext.bind_textdomain_codeset('gettext') - try: - gettext.bind_textdomain_codeset('gettext', 'utf-16') - self.assertEqual(lgettext('mullusk'), 'bacon'.encode('utf-16')) - self.assertEqual(lgettext('spam'), 'spam'.encode('utf-16')) - self.assertEqual(ldgettext('gettext', 'mullusk'), 'bacon'.encode('utf-16')) - self.assertEqual(ldgettext('gettext', 'spam'), 'spam'.encode('utf-16')) - finally: - del gettext._localecodesets['gettext'] - gettext.bind_textdomain_codeset('gettext', saved_codeset) - - def test_lgettext_output_encoding(self): - with open(self.mofile, 'rb') as fp: - t = gettext.GNUTranslations(fp) - lgettext = t.lgettext - t.set_output_charset('utf-16') - self.assertEqual(lgettext('mullusk'), 'bacon'.encode('utf-16')) - self.assertEqual(lgettext('spam'), 'spam'.encode('utf-16')) - - def test_lngettext(self): - lngettext = gettext.lngettext - ldngettext = gettext.ldngettext - x = lngettext('There is %s file', 'There are %s files', 1) - self.assertEqual(x, b'Hay %s fichero') - x = lngettext('There is %s file', 'There are %s files', 2) - self.assertEqual(x, b'Hay %s ficheros') - x = lngettext('There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, b'There is %s directory') - x = lngettext('There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, b'There are %s directories') - x = ldngettext('gettext', 'There is %s file', 'There are %s files', 1) - self.assertEqual(x, b'Hay %s fichero') - x = ldngettext('gettext', 'There is %s file', 'There are %s files', 2) - self.assertEqual(x, b'Hay %s ficheros') - x = ldngettext('gettext', 'There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, b'There is %s directory') - x = ldngettext('gettext', 'There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, b'There are %s directories') - - def test_lngettext_2(self): - with open(self.mofile, 'rb') as fp: - t = gettext.GNUTranslations(fp) - lngettext = t.lngettext - x = lngettext('There is %s file', 'There are %s files', 1) - self.assertEqual(x, b'Hay %s fichero') - x = lngettext('There is %s file', 'There are %s files', 2) - self.assertEqual(x, b'Hay %s ficheros') - x = lngettext('There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, b'There is %s directory') - x = lngettext('There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, b'There are %s directories') - - def test_lngettext_bind_textdomain_codeset(self): - lngettext = gettext.lngettext - ldngettext = gettext.ldngettext - saved_codeset = gettext.bind_textdomain_codeset('gettext') - try: - gettext.bind_textdomain_codeset('gettext', 'utf-16') - x = lngettext('There is %s file', 'There are %s files', 1) - self.assertEqual(x, 'Hay %s fichero'.encode('utf-16')) - x = lngettext('There is %s file', 'There are %s files', 2) - self.assertEqual(x, 'Hay %s ficheros'.encode('utf-16')) - x = lngettext('There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, 'There is %s directory'.encode('utf-16')) - x = lngettext('There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, 'There are %s directories'.encode('utf-16')) - x = ldngettext('gettext', 'There is %s file', 'There are %s files', 1) - self.assertEqual(x, 'Hay %s fichero'.encode('utf-16')) - x = ldngettext('gettext', 'There is %s file', 'There are %s files', 2) - self.assertEqual(x, 'Hay %s ficheros'.encode('utf-16')) - x = ldngettext('gettext', 'There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, 'There is %s directory'.encode('utf-16')) - x = ldngettext('gettext', 'There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, 'There are %s directories'.encode('utf-16')) - finally: - del gettext._localecodesets['gettext'] - gettext.bind_textdomain_codeset('gettext', saved_codeset) - - def test_lngettext_output_encoding(self): - with open(self.mofile, 'rb') as fp: - t = gettext.GNUTranslations(fp) - lngettext = t.lngettext - t.set_output_charset('utf-16') - x = lngettext('There is %s file', 'There are %s files', 1) - self.assertEqual(x, 'Hay %s fichero'.encode('utf-16')) - x = lngettext('There is %s file', 'There are %s files', 2) - self.assertEqual(x, 'Hay %s ficheros'.encode('utf-16')) - x = lngettext('There is %s directory', 'There are %s directories', 1) - self.assertEqual(x, 'There is %s directory'.encode('utf-16')) - x = lngettext('There is %s directory', 'There are %s directories', 2) - self.assertEqual(x, 'There are %s directories'.encode('utf-16')) - - class GNUTranslationParsingTest(GettextBaseTest): def test_plural_form_error_issue17898(self): with open(MOFILE, 'wb') as fp: @@ -587,10 +469,13 @@ class UnicodeTranslationsTest(GettextBaseTest): self._ = self.t.gettext def test_unicode_msgid(self): - self.assertIsInstance(self._(''), str) + unless = self.assertTrue + unless(isinstance(self._(''), str)) + unless(isinstance(self._(''), str)) def test_unicode_msgstr(self): - self.assertEqual(self._('ab\xde'), '\xa4yz') + eq = self.assertEqual + eq(self._('ab\xde'), '\xa4yz') class WeirdMetadataTest(GettextBaseTest): @@ -641,6 +526,12 @@ class GettextCacheTestCase(GettextBaseTest): self.assertEqual(t.__class__, DummyGNUTranslations) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'c2py', 'ENOENT'} + support.check__all__(self, gettext, blacklist=blacklist) + + def test_main(): support.run_unittest(__name__) @@ -653,7 +544,7 @@ if __name__ == '__main__': # The original version was automatically generated from the sources with # pygettext. Later it was manually modified to add plural forms support. -b''' +''' # Dummy translation for the Python test_gettext.py module. # Copyright (C) 2001 Python Software Foundation # Barry Warsaw , 2000. @@ -713,7 +604,7 @@ msgstr[1] "Hay %s ficheros" # Here's the second example po file example, used to generate the UMO_DATA # containing utf-8 encoded Unicode strings -b''' +''' # Dummy translation for the Python test_gettext.py module. # Copyright (C) 2001 Python Software Foundation # Barry Warsaw , 2000. @@ -736,7 +627,7 @@ msgstr "\xc2\xa4yz" # Here's the third example po file, used to generate MMO_DATA -b''' +''' msgid "" msgstr "" "Project-Id-Version: No Project 0.0\n" @@ -755,7 +646,7 @@ msgstr "" # messages.po, used for bug 17898 # -b''' +''' # test file for http://bugs.python.org/issue17898 msgid "" msgstr "" diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py index 154e3b6..65e26bf 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -8,6 +8,95 @@ import sys # testing import * from sys import * +# different import patterns to check that __annotations__ does not interfere +# with import machinery +import test.ann_module as ann_module +import typing +from collections import ChainMap +from test import ann_module2 +import test + +# These are shared with test_tokenize and other test modules. +# +# Note: since several test cases filter out floats by looking for "e" and ".", +# don't add hexadecimal literals that contain "e" or "E". +VALID_UNDERSCORE_LITERALS = [ + '0_0_0', + '4_2', + '1_0000_0000', + '0b1001_0100', + '0xffff_ffff', + '0o5_7_7', + '1_00_00.5', + '1_00_00.5e5', + '1_00_00e5_1', + '1e1_0', + '.1_4', + '.1_4e1', + '0b_0', + '0x_f', + '0o_5', + '1_00_00j', + '1_00_00.5j', + '1_00_00e5_1j', + '.1_4j', + '(1_2.5+3_3j)', + '(.5_6j)', +] +INVALID_UNDERSCORE_LITERALS = [ + # Trailing underscores: + '0_', + '42_', + '1.4j_', + '0x_', + '0b1_', + '0xf_', + '0o5_', + '0 if 1_Else 1', + # Underscores in the base selector: + '0_b0', + '0_xf', + '0_o5', + # Old-style octal, still disallowed: + '0_7', + '09_99', + # Multiple consecutive underscores: + '4_______2', + '0.1__4', + '0.1__4j', + '0b1001__0100', + '0xffff__ffff', + '0x___', + '0o5__77', + '1e1__0', + '1e1__0j', + # Underscore right before a dot: + '1_.4', + '1_.4j', + # Underscore right after a dot: + '1._4', + '1._4j', + '._5', + '._5j', + # Underscore right after a sign: + '1.0e+_1', + '1.0e+_1j', + # Underscore right before j: + '1.4_j', + '1.4e5_j', + # Underscore right before e: + '1_e1', + '1.4_e1', + '1.4_e1j', + # Underscore right after e: + '1e_1', + '1.4e_1', + '1.4e_1j', + # Complex cases with parens: + '(1+1.5_j_)', + '(1+1.5_j)', +] + class TokenTests(unittest.TestCase): @@ -87,6 +176,14 @@ class TokenTests(unittest.TestCase): self.assertEqual(1 if 0else 0, 0) self.assertRaises(SyntaxError, eval, "0 if 1Else 0") + def test_underscore_literals(self): + for lit in VALID_UNDERSCORE_LITERALS: + self.assertEqual(eval(lit), eval(lit.replace('_', ''))) + for lit in INVALID_UNDERSCORE_LITERALS: + self.assertRaises(SyntaxError, eval, lit) + # Sanity check: no literal begins with an underscore + self.assertRaises(NameError, eval, "_0") + def test_string_literals(self): x = ''; y = ""; self.assertTrue(len(x) == 0 and x == y) x = '\''; y = "'"; self.assertTrue(len(x) == 1 and x == y and ord(x) == 39) @@ -139,6 +236,19 @@ the \'lazy\' dog.\n\ compile(s, "", "exec") self.assertIn("unexpected EOF", str(cm.exception)) +var_annot_global: int # a global annotated is necessary for test_var_annot + +# custom namespace for testing __annotations__ + +class CNS: + def __init__(self): + self._dct = {} + def __setitem__(self, item, value): + self._dct[item.lower()] = value + def __getitem__(self, item): + return self._dct[item] + + class GrammarTests(unittest.TestCase): # single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE @@ -154,6 +264,160 @@ class GrammarTests(unittest.TestCase): # testlist ENDMARKER x = eval('1, 0 or 1') + def test_var_annot_basics(self): + # all these should be allowed + var1: int = 5 + var2: [int, str] + my_lst = [42] + def one(): + return 1 + int.new_attr: int + [list][0]: type + my_lst[one()-1]: int = 5 + self.assertEqual(my_lst, [5]) + + def test_var_annot_syntax_errors(self): + # parser pass + check_syntax_error(self, "def f: int") + check_syntax_error(self, "x: int: str") + check_syntax_error(self, "def f():\n" + " nonlocal x: int\n") + # AST pass + check_syntax_error(self, "[x, 0]: int\n") + check_syntax_error(self, "f(): int\n") + check_syntax_error(self, "(x,): int") + check_syntax_error(self, "def f():\n" + " (x, y): int = (1, 2)\n") + # symtable pass + check_syntax_error(self, "def f():\n" + " x: int\n" + " global x\n") + check_syntax_error(self, "def f():\n" + " global x\n" + " x: int\n") + + def test_var_annot_basic_semantics(self): + # execution order + with self.assertRaises(ZeroDivisionError): + no_name[does_not_exist]: no_name_again = 1/0 + with self.assertRaises(NameError): + no_name[does_not_exist]: 1/0 = 0 + global var_annot_global + + # function semantics + def f(): + st: str = "Hello" + a.b: int = (1, 2) + return st + self.assertEqual(f.__annotations__, {}) + def f_OK(): + x: 1/0 + f_OK() + def fbad(): + x: int + print(x) + with self.assertRaises(UnboundLocalError): + fbad() + def f2bad(): + (no_such_global): int + print(no_such_global) + try: + f2bad() + except Exception as e: + self.assertIs(type(e), NameError) + + # class semantics + class C: + __foo: int + s: str = "attr" + z = 2 + def __init__(self, x): + self.x: int = x + self.assertEqual(C.__annotations__, {'_C__foo': int, 's': str}) + with self.assertRaises(NameError): + class CBad: + no_such_name_defined.attr: int = 0 + with self.assertRaises(NameError): + class Cbad2(C): + x: int + x.y: list = [] + + def test_var_annot_metaclass_semantics(self): + class CMeta(type): + @classmethod + def __prepare__(metacls, name, bases, **kwds): + return {'__annotations__': CNS()} + class CC(metaclass=CMeta): + XX: 'ANNOT' + self.assertEqual(CC.__annotations__['xx'], 'ANNOT') + + def test_var_annot_module_semantics(self): + with self.assertRaises(AttributeError): + print(test.__annotations__) + self.assertEqual(ann_module.__annotations__, + {1: 2, 'x': int, 'y': str, 'f': typing.Tuple[int, int]}) + self.assertEqual(ann_module.M.__annotations__, + {'123': 123, 'o': type}) + self.assertEqual(ann_module2.__annotations__, {}) + + def test_var_annot_in_module(self): + # check that functions fail the same way when executed + # outside of module where they were defined + from test.ann_module3 import f_bad_ann, g_bad_ann, D_bad_ann + with self.assertRaises(NameError): + f_bad_ann() + with self.assertRaises(NameError): + g_bad_ann() + with self.assertRaises(NameError): + D_bad_ann(5) + + def test_var_annot_simple_exec(self): + gns = {}; lns= {} + exec("'docstring'\n" + "__annotations__[1] = 2\n" + "x: int = 5\n", gns, lns) + self.assertEqual(lns["__annotations__"], {1: 2, 'x': int}) + with self.assertRaises(KeyError): + gns['__annotations__'] + + def test_var_annot_custom_maps(self): + # tests with custom locals() and __annotations__ + ns = {'__annotations__': CNS()} + exec('X: int; Z: str = "Z"; (w): complex = 1j', ns) + self.assertEqual(ns['__annotations__']['x'], int) + self.assertEqual(ns['__annotations__']['z'], str) + with self.assertRaises(KeyError): + ns['__annotations__']['w'] + nonloc_ns = {} + class CNS2: + def __init__(self): + self._dct = {} + def __setitem__(self, item, value): + nonlocal nonloc_ns + self._dct[item] = value + nonloc_ns[item] = value + def __getitem__(self, item): + return self._dct[item] + exec('x: int = 1', {}, CNS2()) + self.assertEqual(nonloc_ns['__annotations__']['x'], int) + + def test_var_annot_refleak(self): + # complex case: custom locals plus custom __annotations__ + # this was causing refleak + cns = CNS() + nonloc_ns = {'__annotations__': cns} + class CNS2: + def __init__(self): + self._dct = {'__annotations__': cns} + def __setitem__(self, item, value): + nonlocal nonloc_ns + self._dct[item] = value + nonloc_ns[item] = value + def __getitem__(self, item): + return self._dct[item] + exec('X: str', {}, CNS2()) + self.assertEqual(nonloc_ns['__annotations__']['x'], str) + def test_funcdef(self): ### [decorators] 'def' NAME parameters ['->' test] ':' suite ### decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE @@ -295,6 +559,10 @@ class GrammarTests(unittest.TestCase): pos2key2dict(1,2,k2=100,tokwarg1=100,tokwarg2=200) pos2key2dict(1,2,tokwarg1=100,tokwarg2=200, k2=100) + self.assertRaises(SyntaxError, eval, "def f(*): pass") + self.assertRaises(SyntaxError, eval, "def f(*,): pass") + self.assertRaises(SyntaxError, eval, "def f(*, **kwds): pass") + # keyword arguments after *arglist def f(*args, **kwargs): return args, kwargs @@ -341,7 +609,7 @@ class GrammarTests(unittest.TestCase): def f(x) -> list: pass self.assertEqual(f.__annotations__, {'return': list}) - # test MAKE_CLOSURE with a variety of oparg's + # test closures with a variety of opargs closure = 1 def f(): return closure def f(x=1): return closure @@ -352,6 +620,23 @@ class GrammarTests(unittest.TestCase): check_syntax_error(self, "f(*g(1=2))") check_syntax_error(self, "f(**g(1=2))") + # Check trailing commas are permitted in funcdef argument list + def f(a,): pass + def f(*args,): pass + def f(**kwds,): pass + def f(a, *args,): pass + def f(a, **kwds,): pass + def f(*args, b,): pass + def f(*, b,): pass + def f(*args, **kwds,): pass + def f(a, *args, b,): pass + def f(a, *, b,): pass + def f(a, *args, **kwds,): pass + def f(*args, b, **kwds,): pass + def f(*, b, **kwds,): pass + def f(a, *args, b, **kwds,): pass + def f(a, *, b, **kwds,): pass + def test_lambdef(self): ### lambdef: 'lambda' [varargslist] ':' test l1 = lambda : 0 @@ -370,6 +655,23 @@ class GrammarTests(unittest.TestCase): self.assertEqual(l6(1,2), 1+2+20) self.assertEqual(l6(1,2,k=10), 1+2+10) + # check that trailing commas are permitted + l10 = lambda a,: 0 + l11 = lambda *args,: 0 + l12 = lambda **kwds,: 0 + l13 = lambda a, *args,: 0 + l14 = lambda a, **kwds,: 0 + l15 = lambda *args, b,: 0 + l16 = lambda *, b,: 0 + l17 = lambda *args, **kwds,: 0 + l18 = lambda a, *args, b,: 0 + l19 = lambda a, *, b,: 0 + l20 = lambda a, *args, **kwds,: 0 + l21 = lambda *args, b, **kwds,: 0 + l22 = lambda *, b, **kwds,: 0 + l23 = lambda a, *args, b, **kwds,: 0 + l24 = lambda a, *, b, **kwds,: 0 + ### stmt: simple_stmt | compound_stmt # Tested below @@ -1040,18 +1342,6 @@ class GrammarTests(unittest.TestCase): self.assertEqual(m.other, 42) def test_async_await(self): - async = 1 - await = 2 - self.assertEqual(async, 1) - - def async(): - nonlocal await - await = 10 - async() - self.assertEqual(await, 10) - - self.assertFalse(bool(async.__code__.co_flags & inspect.CO_COROUTINE)) - async def test(): def sum(): pass diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index c218ea3..69095a3 100644 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -50,8 +50,6 @@ class GroupDatabaseTestCase(unittest.TestCase): self.assertRaises(TypeError, grp.getgrgid) self.assertRaises(TypeError, grp.getgrnam) self.assertRaises(TypeError, grp.getgrall, 42) - # embedded null character - self.assertRaises(ValueError, grp.getgrnam, 'a\x00b') # try to get some errors bynames = {} @@ -94,5 +92,15 @@ class GroupDatabaseTestCase(unittest.TestCase): self.assertRaises(KeyError, grp.getgrgid, fakegid) + def test_noninteger_gid(self): + entries = grp.getgrall() + if not entries: + self.skipTest('no groups') + # Choose an existent gid. + gid = entries[0][2] + self.assertWarns(DeprecationWarning, grp.getgrgid, float(gid)) + self.assertWarns(DeprecationWarning, grp.getgrgid, str(gid)) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py index 3c51673..b457bd3 100644 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -5,6 +5,7 @@ import unittest from test import support from test.support import bigmemtest, _4G import os +import pathlib import io import struct import array @@ -67,6 +68,18 @@ class TestGzip(BaseTest): # Test multiple close() calls. f.close() + def test_write_read_with_pathlike_file(self): + filename = pathlib.Path(self.filename) + with gzip.GzipFile(filename, 'w') as f: + f.write(data1 * 50) + self.assertIsInstance(f.name, str) + with gzip.GzipFile(filename, 'a') as f: + f.write(data1) + with gzip.GzipFile(filename) as f: + d = f.read() + self.assertEqual(d, data1 * 51) + self.assertIsInstance(f.name, str) + # The following test_write_xy methods test that write accepts # the corresponding bytes-like object type as input # and that the data written equals bytes(xy) in all cases. @@ -434,12 +447,12 @@ class TestGzip(BaseTest): def test_decompress_limited(self): """Decompressed data buffering should be limited""" - bomb = gzip.compress(bytes(int(2e6)), compresslevel=9) + bomb = gzip.compress(b'\0' * int(2e6), compresslevel=9) self.assertLess(len(bomb), io.DEFAULT_BUFFER_SIZE) bomb = io.BytesIO(bomb) decomp = gzip.GzipFile(fileobj=bomb) - self.assertEqual(bytes(1), decomp.read(1)) + self.assertEqual(decomp.read(1), b'\0') max_decomp = 1 + io.DEFAULT_BUFFER_SIZE self.assertLessEqual(decomp._buffer.raw.tell(), max_decomp, "Excessive amount of data was decompressed") @@ -521,6 +534,15 @@ class TestOpen(BaseTest): file_data = gzip.decompress(f.read()) self.assertEqual(file_data, uncompressed) + def test_pathlike_file(self): + filename = pathlib.Path(self.filename) + with gzip.open(filename, "wb") as f: + f.write(data1 * 50) + with gzip.open(filename, "ab") as f: + f.write(data1) + with gzip.open(filename) as f: + self.assertEqual(f.read(), data1 * 51) + def test_implicit_binary_modes(self): # Test implicit binary modes (no "b" or "t" in mode string). uncompressed = data1 * 50 diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index c9b113e..f748b46 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -7,6 +7,7 @@ # import array +from binascii import unhexlify import hashlib import itertools import os @@ -19,6 +20,7 @@ import unittest import warnings from test import support from test.support import _4G, bigmemtest, import_fresh_module +from http.client import HTTPException # Were we compiled --with-pydebug or with #define Py_DEBUG? COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') @@ -26,6 +28,21 @@ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') c_hashlib = import_fresh_module('hashlib', fresh=['_hashlib']) py_hashlib = import_fresh_module('hashlib', blocked=['_hashlib']) +try: + import _blake2 +except ImportError: + _blake2 = None + +requires_blake2 = unittest.skipUnless(_blake2, 'requires _blake2') + +try: + import _sha3 +except ImportError: + _sha3 = None + +requires_sha3 = unittest.skipUnless(_sha3, 'requires _sha3') + + def hexstr(s): assert isinstance(s, bytes), repr(s) h = "0123456789abcdef" @@ -35,10 +52,33 @@ def hexstr(s): return r +URL = "http://www.pythontest.net/hashlib/{}.txt" + +def read_vectors(hash_name): + url = URL.format(hash_name) + try: + testdata = support.open_urlresource(url) + except (OSError, HTTPException): + raise unittest.SkipTest("Could not retrieve {}".format(url)) + with testdata: + for line in testdata: + line = line.strip() + if line.startswith('#') or not line: + continue + parts = line.split(',') + parts[0] = bytes.fromhex(parts[0]) + yield parts + + class HashLibTestCase(unittest.TestCase): supported_hash_names = ( 'md5', 'MD5', 'sha1', 'SHA1', 'sha224', 'SHA224', 'sha256', 'SHA256', - 'sha384', 'SHA384', 'sha512', 'SHA512') + 'sha384', 'SHA384', 'sha512', 'SHA512', + 'blake2b', 'blake2s', + 'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512', + 'shake_128', 'shake_256') + + shakes = {'shake_128', 'shake_256'} # Issue #14693: fallback modules are always compiled under POSIX _warn_on_extension_import = os.name == 'posix' or COMPILED_WITH_PYDEBUG @@ -56,6 +96,11 @@ class HashLibTestCase(unittest.TestCase): algorithms = set() for algorithm in self.supported_hash_names: algorithms.add(algorithm.lower()) + + _blake2 = self._conditional_import_module('_blake2') + if _blake2: + algorithms.update({'blake2b', 'blake2s'}) + self.constructors_to_test = {} for algorithm in algorithms: self.constructors_to_test[algorithm] = set() @@ -64,10 +109,10 @@ class HashLibTestCase(unittest.TestCase): # of hashlib.new given the algorithm name. for algorithm, constructors in self.constructors_to_test.items(): constructors.add(getattr(hashlib, algorithm)) - def _test_algorithm_via_hashlib_new(data=None, _alg=algorithm): + def _test_algorithm_via_hashlib_new(data=None, _alg=algorithm, **kwargs): if data is None: - return hashlib.new(_alg) - return hashlib.new(_alg, data) + return hashlib.new(_alg, **kwargs) + return hashlib.new(_alg, data, **kwargs) constructors.add(_test_algorithm_via_hashlib_new) _hashlib = self._conditional_import_module('_hashlib') @@ -99,6 +144,18 @@ class HashLibTestCase(unittest.TestCase): if _sha512: add_builtin_constructor('sha384') add_builtin_constructor('sha512') + if _blake2: + add_builtin_constructor('blake2s') + add_builtin_constructor('blake2b') + + _sha3 = self._conditional_import_module('_sha3') + if _sha3: + add_builtin_constructor('sha3_224') + add_builtin_constructor('sha3_256') + add_builtin_constructor('sha3_384') + add_builtin_constructor('sha3_512') + add_builtin_constructor('shake_128') + add_builtin_constructor('shake_256') super(HashLibTestCase, self).__init__(*args, **kwargs) @@ -111,7 +168,10 @@ class HashLibTestCase(unittest.TestCase): a = array.array("b", range(10)) for cons in self.hash_constructors: c = cons(a) - c.hexdigest() + if c.name in self.shakes: + c.hexdigest(16) + else: + c.hexdigest() def test_algorithms_guaranteed(self): self.assertEqual(hashlib.algorithms_guaranteed, @@ -155,14 +215,21 @@ class HashLibTestCase(unittest.TestCase): def test_hexdigest(self): for cons in self.hash_constructors: h = cons() - self.assertIsInstance(h.digest(), bytes) - self.assertEqual(hexstr(h.digest()), h.hexdigest()) + if h.name in self.shakes: + self.assertIsInstance(h.digest(16), bytes) + self.assertEqual(hexstr(h.digest(16)), h.hexdigest(16)) + else: + self.assertIsInstance(h.digest(), bytes) + self.assertEqual(hexstr(h.digest()), h.hexdigest()) def test_name_attribute(self): for cons in self.hash_constructors: h = cons() self.assertIsInstance(h.name, str) - self.assertIn(h.name, self.supported_hash_names) + if h.name in self.supported_hash_names: + self.assertIn(h.name, self.supported_hash_names) + else: + self.assertNotIn(h.name, self.supported_hash_names) self.assertEqual(h.name, hashlib.new(h.name).name) def test_large_update(self): @@ -177,40 +244,46 @@ class HashLibTestCase(unittest.TestCase): m1.update(bees) m1.update(cees) m1.update(dees) + if m1.name in self.shakes: + args = (16,) + else: + args = () m2 = cons() m2.update(aas + bees + cees + dees) - self.assertEqual(m1.digest(), m2.digest()) + self.assertEqual(m1.digest(*args), m2.digest(*args)) m3 = cons(aas + bees + cees + dees) - self.assertEqual(m1.digest(), m3.digest()) + self.assertEqual(m1.digest(*args), m3.digest(*args)) # verify copy() doesn't touch original m4 = cons(aas + bees + cees) - m4_digest = m4.digest() + m4_digest = m4.digest(*args) m4_copy = m4.copy() m4_copy.update(dees) - self.assertEqual(m1.digest(), m4_copy.digest()) - self.assertEqual(m4.digest(), m4_digest) + self.assertEqual(m1.digest(*args), m4_copy.digest(*args)) + self.assertEqual(m4.digest(*args), m4_digest) - def check(self, name, data, hexdigest): + def check(self, name, data, hexdigest, shake=False, **kwargs): + length = len(hexdigest)//2 hexdigest = hexdigest.lower() constructors = self.constructors_to_test[name] # 2 is for hashlib.name(...) and hashlib.new(name, ...) self.assertGreaterEqual(len(constructors), 2) for hash_object_constructor in constructors: - m = hash_object_constructor(data) - computed = m.hexdigest() + m = hash_object_constructor(data, **kwargs) + computed = m.hexdigest() if not shake else m.hexdigest(length) self.assertEqual( computed, hexdigest, "Hash algorithm %s constructed using %s returned hexdigest" " %r for %d byte input data that should have hashed to %r." % (name, hash_object_constructor, computed, len(data), hexdigest)) - computed = m.digest() + computed = m.digest() if not shake else m.digest(length) digest = bytes.fromhex(hexdigest) self.assertEqual(computed, digest) - self.assertEqual(len(digest), m.digest_size) + if not shake: + self.assertEqual(len(digest), m.digest_size) def check_no_unicode(self, algorithm_name): # Unicode objects are not allowed as input. @@ -226,13 +299,35 @@ class HashLibTestCase(unittest.TestCase): self.check_no_unicode('sha384') self.check_no_unicode('sha512') - def check_blocksize_name(self, name, block_size=0, digest_size=0): + @requires_blake2 + def test_no_unicode_blake2(self): + self.check_no_unicode('blake2b') + self.check_no_unicode('blake2s') + + @requires_sha3 + def test_no_unicode_sha3(self): + self.check_no_unicode('sha3_224') + self.check_no_unicode('sha3_256') + self.check_no_unicode('sha3_384') + self.check_no_unicode('sha3_512') + self.check_no_unicode('shake_128') + self.check_no_unicode('shake_256') + + def check_blocksize_name(self, name, block_size=0, digest_size=0, + digest_length=None): constructors = self.constructors_to_test[name] for hash_object_constructor in constructors: m = hash_object_constructor() self.assertEqual(m.block_size, block_size) self.assertEqual(m.digest_size, digest_size) - self.assertEqual(len(m.digest()), digest_size) + if digest_length: + self.assertEqual(len(m.digest(digest_length)), + digest_length) + self.assertEqual(len(m.hexdigest(digest_length)), + 2*digest_length) + else: + self.assertEqual(len(m.digest()), digest_size) + self.assertEqual(len(m.hexdigest()), 2*digest_size) self.assertEqual(m.name, name) # split for sha3_512 / _sha3.sha3 object self.assertIn(name.split("_")[0], repr(m)) @@ -245,6 +340,38 @@ class HashLibTestCase(unittest.TestCase): self.check_blocksize_name('sha384', 128, 48) self.check_blocksize_name('sha512', 128, 64) + @requires_sha3 + def test_blocksize_name_sha3(self): + self.check_blocksize_name('sha3_224', 144, 28) + self.check_blocksize_name('sha3_256', 136, 32) + self.check_blocksize_name('sha3_384', 104, 48) + self.check_blocksize_name('sha3_512', 72, 64) + self.check_blocksize_name('shake_128', 168, 0, 32) + self.check_blocksize_name('shake_256', 136, 0, 64) + + def check_sha3(self, name, capacity, rate, suffix): + constructors = self.constructors_to_test[name] + for hash_object_constructor in constructors: + m = hash_object_constructor() + self.assertEqual(capacity + rate, 1600) + self.assertEqual(m._capacity_bits, capacity) + self.assertEqual(m._rate_bits, rate) + self.assertEqual(m._suffix, suffix) + + @requires_sha3 + def test_extra_sha3(self): + self.check_sha3('sha3_224', 448, 1152, b'\x06') + self.check_sha3('sha3_256', 512, 1088, b'\x06') + self.check_sha3('sha3_384', 768, 832, b'\x06') + self.check_sha3('sha3_512', 1024, 576, b'\x06') + self.check_sha3('shake_128', 256, 1344, b'\x1f') + self.check_sha3('shake_256', 512, 1088, b'\x1f') + + @requires_blake2 + def test_blocksize_name_blake2(self): + self.check_blocksize_name('blake2b', 128, 64) + self.check_blocksize_name('blake2s', 64, 32) + def test_case_md5_0(self): self.check('md5', b'', 'd41d8cd98f00b204e9800998ecf8427e') @@ -373,6 +500,221 @@ class HashLibTestCase(unittest.TestCase): "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"+ "de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b") + def check_blake2(self, constructor, salt_size, person_size, key_size, + digest_size, max_offset): + self.assertEqual(constructor.SALT_SIZE, salt_size) + for i in range(salt_size + 1): + constructor(salt=b'a' * i) + salt = b'a' * (salt_size + 1) + self.assertRaises(ValueError, constructor, salt=salt) + + self.assertEqual(constructor.PERSON_SIZE, person_size) + for i in range(person_size+1): + constructor(person=b'a' * i) + person = b'a' * (person_size + 1) + self.assertRaises(ValueError, constructor, person=person) + + self.assertEqual(constructor.MAX_DIGEST_SIZE, digest_size) + for i in range(1, digest_size + 1): + constructor(digest_size=i) + self.assertRaises(ValueError, constructor, digest_size=-1) + self.assertRaises(ValueError, constructor, digest_size=0) + self.assertRaises(ValueError, constructor, digest_size=digest_size+1) + + self.assertEqual(constructor.MAX_KEY_SIZE, key_size) + for i in range(key_size+1): + constructor(key=b'a' * i) + key = b'a' * (key_size + 1) + self.assertRaises(ValueError, constructor, key=key) + self.assertEqual(constructor().hexdigest(), + constructor(key=b'').hexdigest()) + + for i in range(0, 256): + constructor(fanout=i) + self.assertRaises(ValueError, constructor, fanout=-1) + self.assertRaises(ValueError, constructor, fanout=256) + + for i in range(1, 256): + constructor(depth=i) + self.assertRaises(ValueError, constructor, depth=-1) + self.assertRaises(ValueError, constructor, depth=0) + self.assertRaises(ValueError, constructor, depth=256) + + for i in range(0, 256): + constructor(node_depth=i) + self.assertRaises(ValueError, constructor, node_depth=-1) + self.assertRaises(ValueError, constructor, node_depth=256) + + for i in range(0, digest_size + 1): + constructor(inner_size=i) + self.assertRaises(ValueError, constructor, inner_size=-1) + self.assertRaises(ValueError, constructor, inner_size=digest_size+1) + + constructor(leaf_size=0) + constructor(leaf_size=(1<<32)-1) + self.assertRaises(OverflowError, constructor, leaf_size=-1) + self.assertRaises(OverflowError, constructor, leaf_size=1<<32) + + constructor(node_offset=0) + constructor(node_offset=max_offset) + self.assertRaises(OverflowError, constructor, node_offset=-1) + self.assertRaises(OverflowError, constructor, node_offset=max_offset+1) + + constructor( + string=b'', + key=b'', + salt=b'', + person=b'', + digest_size=17, + fanout=1, + depth=1, + leaf_size=256, + node_offset=512, + node_depth=1, + inner_size=7, + last_node=True + ) + + def blake2_rfc7693(self, constructor, md_len, in_len): + def selftest_seq(length, seed): + mask = (1<<32)-1 + a = (0xDEAD4BAD * seed) & mask + b = 1 + out = bytearray(length) + for i in range(length): + t = (a + b) & mask + a, b = b, t + out[i] = (t >> 24) & 0xFF + return out + outer = constructor(digest_size=32) + for outlen in md_len: + for inlen in in_len: + indata = selftest_seq(inlen, inlen) + key = selftest_seq(outlen, outlen) + unkeyed = constructor(indata, digest_size=outlen) + outer.update(unkeyed.digest()) + keyed = constructor(indata, key=key, digest_size=outlen) + outer.update(keyed.digest()) + return outer.hexdigest() + + @requires_blake2 + def test_blake2b(self): + self.check_blake2(hashlib.blake2b, 16, 16, 64, 64, (1<<64)-1) + b2b_md_len = [20, 32, 48, 64] + b2b_in_len = [0, 3, 128, 129, 255, 1024] + self.assertEqual( + self.blake2_rfc7693(hashlib.blake2b, b2b_md_len, b2b_in_len), + "c23a7800d98123bd10f506c61e29da5603d763b8bbad2e737f5e765a7bccd475") + + @requires_blake2 + def test_case_blake2b_0(self): + self.check('blake2b', b"", + "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419"+ + "d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce") + + @requires_blake2 + def test_case_blake2b_1(self): + self.check('blake2b', b"abc", + "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1"+ + "7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923") + + @requires_blake2 + def test_blake2b_vectors(self): + for msg, key, md in read_vectors('blake2b'): + key = bytes.fromhex(key) + self.check('blake2b', msg, md, key=key) + + @requires_blake2 + def test_blake2s(self): + self.check_blake2(hashlib.blake2s, 8, 8, 32, 32, (1<<48)-1) + b2s_md_len = [16, 20, 28, 32] + b2s_in_len = [0, 3, 64, 65, 255, 1024] + self.assertEqual( + self.blake2_rfc7693(hashlib.blake2s, b2s_md_len, b2s_in_len), + "6a411f08ce25adcdfb02aba641451cec53c598b24f4fc787fbdc88797f4c1dfe") + + @requires_blake2 + def test_case_blake2s_0(self): + self.check('blake2s', b"", + "69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9") + + @requires_blake2 + def test_case_blake2s_1(self): + self.check('blake2s', b"abc", + "508c5e8c327c14e2e1a72ba34eeb452f37458b209ed63a294d999b4c86675982") + + @requires_blake2 + def test_blake2s_vectors(self): + for msg, key, md in read_vectors('blake2s'): + key = bytes.fromhex(key) + self.check('blake2s', msg, md, key=key) + + @requires_sha3 + def test_case_sha3_224_0(self): + self.check('sha3_224', b"", + "6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7") + + @requires_sha3 + def test_case_sha3_224_vector(self): + for msg, md in read_vectors('sha3_224'): + self.check('sha3_224', msg, md) + + @requires_sha3 + def test_case_sha3_256_0(self): + self.check('sha3_256', b"", + "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a") + + @requires_sha3 + def test_case_sha3_256_vector(self): + for msg, md in read_vectors('sha3_256'): + self.check('sha3_256', msg, md) + + @requires_sha3 + def test_case_sha3_384_0(self): + self.check('sha3_384', b"", + "0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2a"+ + "c3713831264adb47fb6bd1e058d5f004") + + @requires_sha3 + def test_case_sha3_384_vector(self): + for msg, md in read_vectors('sha3_384'): + self.check('sha3_384', msg, md) + + @requires_sha3 + def test_case_sha3_512_0(self): + self.check('sha3_512', b"", + "a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a6"+ + "15b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26") + + @requires_sha3 + def test_case_sha3_512_vector(self): + for msg, md in read_vectors('sha3_512'): + self.check('sha3_512', msg, md) + + @requires_sha3 + def test_case_shake_128_0(self): + self.check('shake_128', b"", + "7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26", + True) + self.check('shake_128', b"", "7f9c", True) + + @requires_sha3 + def test_case_shake128_vector(self): + for msg, md in read_vectors('shake_128'): + self.check('shake_128', msg, md, True) + + @requires_sha3 + def test_case_shake_256_0(self): + self.check('shake_256', b"", + "46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762f", + True) + self.check('shake_256', b"", "46b9", True) + + @requires_sha3 + def test_case_shake256_vector(self): + for msg, md in read_vectors('shake_256'): + self.check('shake_256', msg, md, True) + def test_gil(self): # Check things work fine with an input larger than the size required # for multithreaded operation (which is hardwired to 2048). @@ -447,6 +789,12 @@ class KDFTests(unittest.TestCase): (b'pass\0word', b'sa\0lt', 4096, 16), ] + scrypt_test_vectors = [ + (b'', b'', 16, 1, 1, unhexlify('77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906')), + (b'password', b'NaCl', 1024, 8, 16, unhexlify('fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640')), + (b'pleaseletmein', b'SodiumChloride', 16384, 8, 1, unhexlify('7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887')), + ] + pbkdf2_results = { "sha1": [ # official test vectors from RFC 6070 @@ -526,5 +874,45 @@ class KDFTests(unittest.TestCase): self._test_pbkdf2_hmac(c_hashlib.pbkdf2_hmac) + @unittest.skipUnless(hasattr(c_hashlib, 'scrypt'), + ' test requires OpenSSL > 1.1') + def test_scrypt(self): + for password, salt, n, r, p, expected in self.scrypt_test_vectors: + result = hashlib.scrypt(password, salt=salt, n=n, r=r, p=p) + self.assertEqual(result, expected) + + # this values should work + hashlib.scrypt(b'password', salt=b'salt', n=2, r=8, p=1) + # password and salt must be bytes-like + with self.assertRaises(TypeError): + hashlib.scrypt('password', salt=b'salt', n=2, r=8, p=1) + with self.assertRaises(TypeError): + hashlib.scrypt(b'password', salt='salt', n=2, r=8, p=1) + # require keyword args + with self.assertRaises(TypeError): + hashlib.scrypt(b'password') + with self.assertRaises(TypeError): + hashlib.scrypt(b'password', b'salt') + with self.assertRaises(TypeError): + hashlib.scrypt(b'password', 2, 8, 1, salt=b'salt') + for n in [-1, 0, 1, None]: + with self.assertRaises((ValueError, OverflowError, TypeError)): + hashlib.scrypt(b'password', salt=b'salt', n=n, r=8, p=1) + for r in [-1, 0, None]: + with self.assertRaises((ValueError, OverflowError, TypeError)): + hashlib.scrypt(b'password', salt=b'salt', n=2, r=r, p=1) + for p in [-1, 0, None]: + with self.assertRaises((ValueError, OverflowError, TypeError)): + hashlib.scrypt(b'password', salt=b'salt', n=2, r=8, p=p) + for maxmem in [-1, None]: + with self.assertRaises((ValueError, OverflowError, TypeError)): + hashlib.scrypt(b'password', salt=b'salt', n=2, r=8, p=1, + maxmem=maxmem) + for dklen in [-1, None]: + with self.assertRaises((ValueError, OverflowError, TypeError)): + hashlib.scrypt(b'password', salt=b'salt', n=2, r=8, p=1, + dklen=dklen) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index b7e8259..2f8c648 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -1,6 +1,5 @@ """Unittests for heapq.""" -import sys import random import unittest diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py index 98826b5..067e13f 100644 --- a/Lib/test/test_hmac.py +++ b/Lib/test/test_hmac.py @@ -3,7 +3,6 @@ import hmac import hashlib import unittest import warnings -from test import support def ignore_warning(func): diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py index 11420b2..326e342 100644 --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -3,7 +3,6 @@ import html.parser import pprint import unittest -from test import support class EventCollector(html.parser.HTMLParser): @@ -702,7 +701,7 @@ class AttributesTestCase(TestCaseBase): def test_attr_funky_names2(self): self._run_check( - "", + r"", [("starttag", "a", [("$", None)]), ("starttag", "b", [("$", "%")]), ("starttag", "c", [("\\", "/")])]) diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py index 49c01ae..6fee4df 100644 --- a/Lib/test/test_http_cookiejar.py +++ b/Lib/test/test_http_cookiejar.py @@ -1051,7 +1051,7 @@ class CookieTests(unittest.TestCase): url = "http://foo.bar.com/" interact_2965(c, url, "spam=eggs; Version=1; Port") h = interact_2965(c, url) - self.assertRegex(h, "\$Port([^=]|$)", + self.assertRegex(h, r"\$Port([^=]|$)", "port with no value not returned with no value") c = CookieJar(pol) @@ -1396,9 +1396,9 @@ class LWPCookieTests(unittest.TestCase): self.assertRegex(cookie, r'^\$Version="?1"?;') self.assertRegex(cookie, r'Part_Number="?Rocket_Launcher_0001"?;' - '\s*\$Path="\/acme"') + r'\s*\$Path="\/acme"') self.assertRegex(cookie, r'Customer="?WILE_E_COYOTE"?;' - '\s*\$Path="\/acme"') + r'\s*\$Path="\/acme"') # # 7. User Agent -> Server diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 61ed6bb..68f6946 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -344,6 +344,134 @@ class HeaderTests(TestCase): conn.putheader(name, value) +class TransferEncodingTest(TestCase): + expected_body = b"It's just a flesh wound" + + def test_endheaders_chunked(self): + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + conn.putrequest('POST', '/') + conn.endheaders(self._make_body(), encode_chunked=True) + + _, _, body = self._parse_request(conn.sock.data) + body = self._parse_chunked(body) + self.assertEqual(body, self.expected_body) + + def test_explicit_headers(self): + # explicit chunked + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + # this shouldn't actually be automatically chunk-encoded because the + # calling code has explicitly stated that it's taking care of it + conn.request( + 'POST', '/', self._make_body(), {'Transfer-Encoding': 'chunked'}) + + _, headers, body = self._parse_request(conn.sock.data) + self.assertNotIn('content-length', [k.lower() for k in headers.keys()]) + self.assertEqual(headers['Transfer-Encoding'], 'chunked') + self.assertEqual(body, self.expected_body) + + # explicit chunked, string body + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + conn.request( + 'POST', '/', self.expected_body.decode('latin-1'), + {'Transfer-Encoding': 'chunked'}) + + _, headers, body = self._parse_request(conn.sock.data) + self.assertNotIn('content-length', [k.lower() for k in headers.keys()]) + self.assertEqual(headers['Transfer-Encoding'], 'chunked') + self.assertEqual(body, self.expected_body) + + # User-specified TE, but request() does the chunk encoding + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + conn.request('POST', '/', + headers={'Transfer-Encoding': 'gzip, chunked'}, + encode_chunked=True, + body=self._make_body()) + _, headers, body = self._parse_request(conn.sock.data) + self.assertNotIn('content-length', [k.lower() for k in headers]) + self.assertEqual(headers['Transfer-Encoding'], 'gzip, chunked') + self.assertEqual(self._parse_chunked(body), self.expected_body) + + def test_request(self): + for empty_lines in (False, True,): + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + conn.request( + 'POST', '/', self._make_body(empty_lines=empty_lines)) + + _, headers, body = self._parse_request(conn.sock.data) + body = self._parse_chunked(body) + self.assertEqual(body, self.expected_body) + self.assertEqual(headers['Transfer-Encoding'], 'chunked') + + # Content-Length and Transfer-Encoding SHOULD not be sent in the + # same request + self.assertNotIn('content-length', [k.lower() for k in headers]) + + def test_empty_body(self): + # Zero-length iterable should be treated like any other iterable + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(b'') + conn.request('POST', '/', ()) + _, headers, body = self._parse_request(conn.sock.data) + self.assertEqual(headers['Transfer-Encoding'], 'chunked') + self.assertNotIn('content-length', [k.lower() for k in headers]) + self.assertEqual(body, b"0\r\n\r\n") + + def _make_body(self, empty_lines=False): + lines = self.expected_body.split(b' ') + for idx, line in enumerate(lines): + # for testing handling empty lines + if empty_lines and idx % 2: + yield b'' + if idx < len(lines) - 1: + yield line + b' ' + else: + yield line + + def _parse_request(self, data): + lines = data.split(b'\r\n') + request = lines[0] + headers = {} + n = 1 + while n < len(lines) and len(lines[n]) > 0: + key, val = lines[n].split(b':') + key = key.decode('latin-1').strip() + headers[key] = val.decode('latin-1').strip() + n += 1 + + return request, headers, b'\r\n'.join(lines[n + 1:]) + + def _parse_chunked(self, data): + body = [] + trailers = {} + n = 0 + lines = data.split(b'\r\n') + # parse body + while True: + size, chunk = lines[n:n+2] + size = int(size, 16) + + if size == 0: + n += 1 + break + + self.assertEqual(size, len(chunk)) + body.append(chunk) + + n += 2 + # we /should/ hit the end chunk, but check against the size of + # lines so we're not stuck in an infinite loop should we get + # malformed data + if n > len(lines): + break + + return b''.join(body) + + class BasicTest(TestCase): def test_status_lines(self): # Test HTTP status lines @@ -564,7 +692,9 @@ class BasicTest(TestCase): def test_send_file(self): expected = (b'GET /foo HTTP/1.1\r\nHost: example.com\r\n' - b'Accept-Encoding: identity\r\nContent-Length:') + b'Accept-Encoding: identity\r\n' + b'Transfer-Encoding: chunked\r\n' + b'\r\n') with open(__file__, 'rb') as body: conn = client.HTTPConnection('example.com') @@ -594,11 +724,11 @@ class BasicTest(TestCase): yield None yield 'data_two' - class UpdatingFile(): + class UpdatingFile(io.TextIOBase): mode = 'r' d = data() def read(self, blocksize=-1): - return self.d.__next__() + return next(self.d) expected = b'data' @@ -970,6 +1100,7 @@ class BasicTest(TestCase): thread = threading.Thread(target=run_server) thread.start() + self.addCleanup(thread.join, float(1)) conn = client.HTTPConnection(*serv.getsockname()) conn.request("CONNECT", "dummy:1234") response = conn.getresponse() @@ -983,7 +1114,7 @@ class BasicTest(TestCase): finally: response.close() conn.close() - thread.join() + thread.join() self.assertEqual(result, b"proxied data\n") class ExtendedReadTest(TestCase): @@ -1511,14 +1642,16 @@ class HTTPSTest(TestCase): with self.assertRaises(ssl.CertificateError): h.request('GET', '/') # Same with explicit check_hostname=True - h = client.HTTPSConnection('localhost', server.port, context=context, - check_hostname=True) + with support.check_warnings(('', DeprecationWarning)): + h = client.HTTPSConnection('localhost', server.port, + context=context, check_hostname=True) with self.assertRaises(ssl.CertificateError): h.request('GET', '/') # With check_hostname=False, the mismatching is ignored context.check_hostname = False - h = client.HTTPSConnection('localhost', server.port, context=context, - check_hostname=False) + with support.check_warnings(('', DeprecationWarning)): + h = client.HTTPSConnection('localhost', server.port, + context=context, check_hostname=False) h.request('GET', '/nonexistent') resp = h.getresponse() resp.close() @@ -1535,8 +1668,9 @@ class HTTPSTest(TestCase): h.close() # Passing check_hostname to HTTPSConnection should override the # context's setting. - h = client.HTTPSConnection('localhost', server.port, context=context, - check_hostname=True) + with support.check_warnings(('', DeprecationWarning)): + h = client.HTTPSConnection('localhost', server.port, + context=context, check_hostname=True) with self.assertRaises(ssl.CertificateError): h.request('GET', '/') @@ -1575,6 +1709,26 @@ class RequestBodyTest(TestCase): message = client.parse_headers(f) return message, f + def test_list_body(self): + # Note that no content-length is automatically calculated for + # an iterable. The request will fall back to send chunked + # transfer encoding. + cases = ( + ([b'foo', b'bar'], b'3\r\nfoo\r\n3\r\nbar\r\n0\r\n\r\n'), + ((b'foo', b'bar'), b'3\r\nfoo\r\n3\r\nbar\r\n0\r\n\r\n'), + ) + for body, expected in cases: + with self.subTest(body): + self.conn = client.HTTPConnection('example.com') + self.conn.sock = self.sock = FakeSocket('') + + self.conn.request('PUT', '/url', body) + msg, f = self.get_headers_and_fp() + self.assertNotIn('Content-Type', msg) + self.assertNotIn('Content-Length', msg) + self.assertEqual(msg.get('Transfer-Encoding'), 'chunked') + self.assertEqual(expected, f.read()) + def test_manual_content_length(self): # Set an incorrect content-length so that we can verify that # it will not be over-ridden by the library. @@ -1608,7 +1762,7 @@ class RequestBodyTest(TestCase): self.assertEqual("5", message.get("content-length")) self.assertEqual(b'body\xc1', f.read()) - def test_file_body(self): + def test_text_file_body(self): self.addCleanup(support.unlink, support.TESTFN) with open(support.TESTFN, "w") as f: f.write("body") @@ -1617,8 +1771,11 @@ class RequestBodyTest(TestCase): message, f = self.get_headers_and_fp() self.assertEqual("text/plain", message.get_content_type()) self.assertIsNone(message.get_charset()) - self.assertEqual("4", message.get("content-length")) - self.assertEqual(b'body', f.read()) + # No content-length will be determined for files; the body + # will be sent using chunked transfer encoding instead. + self.assertIsNone(message.get("content-length")) + self.assertEqual("chunked", message.get("transfer-encoding")) + self.assertEqual(b'4\r\nbody\r\n0\r\n\r\n', f.read()) def test_binary_file_body(self): self.addCleanup(support.unlink, support.TESTFN) @@ -1629,8 +1786,9 @@ class RequestBodyTest(TestCase): message, f = self.get_headers_and_fp() self.assertEqual("text/plain", message.get_content_type()) self.assertIsNone(message.get_charset()) - self.assertEqual("5", message.get("content-length")) - self.assertEqual(b'body\xc1', f.read()) + self.assertEqual("chunked", message.get("Transfer-Encoding")) + self.assertNotIn("Content-Length", message) + self.assertEqual(b'5\r\nbody\xc1\r\n0\r\n\r\n', f.read()) class HTTPResponseTest(TestCase): @@ -1741,13 +1899,5 @@ class TunnelTests(TestCase): self.assertIn('header: {}'.format(expected_header), lines) -@support.reap_threads -def test_main(verbose=None): - support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest, - PersistenceTest, - HTTPSTest, RequestBodyTest, SourceAddressTest, - HTTPResponseTest, ExtendedReadTest, - ExtendedReadTestChunked, TunnelTests) - if __name__ == '__main__': - test_main() + unittest.main(verbosity=2) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 72e6e08..4e93144 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -18,6 +18,7 @@ import urllib.parse import html import http.client import tempfile +import time from io import BytesIO import unittest @@ -189,7 +190,7 @@ class BaseHTTPServerTestCase(BaseTestCase): res = self.con.getresponse() self.assertEqual(res.status, HTTPStatus.NOT_IMPLEMENTED) - def test_head_keep_alive(self): + def test_header_keep_alive(self): self.con._http_vsn_str = 'HTTP/1.1' self.con.putrequest('GET', '/') self.con.putheader('Connection', 'keep-alive') @@ -369,6 +370,8 @@ class SimpleHTTPServerTestCase(BaseTestCase): return body @support.requires_mac_ver(10, 5) + @unittest.skipIf(sys.platform == 'win32', + 'undecodable name cannot be decoded on win32') @unittest.skipUnless(support.TESTFN_UNDECODABLE, 'need support.TESTFN_UNDECODABLE') def test_undecodable_filename(self): @@ -388,7 +391,7 @@ class SimpleHTTPServerTestCase(BaseTestCase): quotedname = urllib.parse.quote(filename, errors='surrogatepass') self.assertIn(('href="%s"' % quotedname) .encode(enc, 'surrogateescape'), body) - self.assertIn(('>%s<' % html.escape(filename)) + self.assertIn(('>%s<' % html.escape(filename, quote=False)) .encode(enc, 'surrogateescape'), body) response = self.request(self.base_url + '/' + quotedname) self.check_status_and_reason(response, HTTPStatus.OK, @@ -466,6 +469,27 @@ class SimpleHTTPServerTestCase(BaseTestCase): self.assertEqual(response.getheader("Location"), self.tempdir_name + "/?hi=1") + def test_html_escape_filename(self): + filename = '.txt' + fullpath = os.path.join(self.tempdir, filename) + + try: + open(fullpath, 'w').close() + except OSError: + raise unittest.SkipTest('Can not create file %s on current file ' + 'system' % filename) + + try: + response = self.request(self.base_url + '/') + body = self.check_status_and_reason(response, HTTPStatus.OK) + enc = response.headers.get_content_charset() + finally: + os.unlink(fullpath) # avoid affecting test_undecodable_filename + + self.assertIsNotNone(enc) + html_text = '>%s<' % html.escape(filename, quote=False) + self.assertIn(html_text.encode(enc), body) + cgi_file1 = """\ #!%s @@ -916,7 +940,7 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase): # Issue #6791: same for headers result = self.send_typical_request( b'GET / HTTP/1.1\r\nX-Foo: bar' + b'r' * 65537 + b'\r\n\r\n') - self.assertEqual(result[0], b'HTTP/1.1 400 Line too long\r\n') + self.assertEqual(result[0], b'HTTP/1.1 431 Line too long\r\n') self.assertFalse(self.handler.get_called) self.assertEqual(self.handler.requestline, 'GET / HTTP/1.1') @@ -927,6 +951,13 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase): self.assertFalse(self.handler.get_called) self.assertEqual(self.handler.requestline, 'GET / HTTP/1.1') + def test_html_escape_on_error(self): + result = self.send_typical_request( + b' / HTTP/1.1') + result = b''.join(result) + text = '' + self.assertIn(html.escape(text, quote=False).encode('ascii'), result) + def test_close_connection(self): # handle_one_request() should be repeatedly called until # it sets close_connection @@ -942,6 +973,19 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase): self.handler.handle() self.assertRaises(StopIteration, next, close_values) + def test_date_time_string(self): + now = time.time() + # this is the old code that formats the timestamp + year, month, day, hh, mm, ss, wd, y, z = time.gmtime(now) + expected = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % ( + self.handler.weekdayname[wd], + day, + self.handler.monthname[month], + year, hh, mm, ss + ) + self.assertEqual(self.handler.date_time_string(timestamp=now), expected) + + class SimpleHTTPRequestHandlerTestCase(unittest.TestCase): """ Test url parsing """ def setUp(self): diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py index 7df98ff..da05da5 100644 --- a/Lib/test/test_idle.py +++ b/Lib/test/test_idle.py @@ -1,19 +1,23 @@ import unittest -from test import support from test.support import import_module -# Skip test if _thread or _tkinter wasn't built, or idlelib is missing, -# or if tcl/tk version before 8.5, which is needed for ttk widgets. - +# Skip test if _thread or _tkinter wasn't built, if idlelib is missing, +# or if tcl/tk is not the 8.5+ needed for ttk widgets. import_module('threading') # imported by PyShell, imports _thread tk = import_module('tkinter') # imports _tkinter +if tk.TkVersion < 8.5: + raise unittest.SkipTest("IDLE requires tk 8.5 or later.") idlelib = import_module('idlelib') -idlelib.testing = True # Avoid locale-changed test error -# Without test_main present, test.libregrtest.runtest.runtest_inner -# calls (line 173) unittest.TestLoader().loadTestsFromModule(module) -# which calls load_tests() if it finds it. (Unittest.main does the same.) +# Before test imports, tell IDLE to avoid changing the environment. +idlelib.testing = True + +# unittest.main and test.libregrtest.runtest.runtest_inner +# call load_tests, when present, to discover tests to run. from idlelib.idle_test import load_tests if __name__ == '__main__': - unittest.main(verbosity=2, exit=False) + tk.NoDefaultRoot() + unittest.main(exit=False) + tk._support_default_root = 1 + tk._default_root = None diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 9990355..63ac810 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -10,12 +10,10 @@ import os.path import socketserver import time import calendar -import inspect from test.support import (reap_threads, verbose, transient_internet, run_with_tz, run_with_locale) import unittest -from unittest import mock from datetime import datetime, timezone, timedelta try: import ssl @@ -79,9 +77,9 @@ if ssl: def get_request(self): newsocket, fromaddr = self.socket.accept() - connstream = ssl.wrap_socket(newsocket, - server_side=True, - certfile=CERTFILE) + context = ssl.SSLContext() + context.load_cert_chain(CERTFILE) + connstream = context.wrap_socket(newsocket, server_side=True) return connstream, fromaddr IMAP4_SSL = imaplib.IMAP4_SSL @@ -176,334 +174,6 @@ class SimpleIMAPHandler(socketserver.StreamRequestHandler): self._send_tagged(tag, 'OK', 'LOGIN completed') -class NewIMAPTestsMixin(): - client = None - - def _setup(self, imap_handler, connect=True): - """ - Sets up imap_handler for tests. imap_handler should inherit from either: - - SimpleIMAPHandler - for testing IMAP commands, - - socketserver.StreamRequestHandler - if raw access to stream is needed. - Returns (client, server). - """ - class TestTCPServer(self.server_class): - def handle_error(self, request, client_address): - """ - End request and raise the error if one occurs. - """ - self.close_request(request) - self.server_close() - raise - - self.addCleanup(self._cleanup) - self.server = self.server_class((support.HOST, 0), imap_handler) - self.thread = threading.Thread( - name=self._testMethodName+'-server', - target=self.server.serve_forever, - # Short poll interval to make the test finish quickly. - # Time between requests is short enough that we won't wake - # up spuriously too many times. - kwargs={'poll_interval': 0.01}) - self.thread.daemon = True # In case this function raises. - self.thread.start() - - if connect: - self.client = self.imap_class(*self.server.server_address) - - return self.client, self.server - - def _cleanup(self): - """ - Cleans up the test server. This method should not be called manually, - it is added to the cleanup queue in the _setup method already. - """ - # if logout was called already we'd raise an exception trying to - # shutdown the client once again - if self.client is not None and self.client.state != 'LOGOUT': - self.client.shutdown() - # cleanup the server - self.server.shutdown() - self.server.server_close() - self.thread.join(3.0) - - def test_EOF_without_complete_welcome_message(self): - # http://bugs.python.org/issue5949 - class EOFHandler(socketserver.StreamRequestHandler): - def handle(self): - self.wfile.write(b'* OK') - _, server = self._setup(EOFHandler, connect=False) - self.assertRaises(imaplib.IMAP4.abort, self.imap_class, - *server.server_address) - - def test_line_termination(self): - class BadNewlineHandler(SimpleIMAPHandler): - def cmd_CAPABILITY(self, tag, args): - self._send(b'* CAPABILITY IMAP4rev1 AUTH\n') - self._send_tagged(tag, 'OK', 'CAPABILITY completed') - _, server = self._setup(BadNewlineHandler, connect=False) - self.assertRaises(imaplib.IMAP4.abort, self.imap_class, - *server.server_address) - - def test_enable_raises_error_if_not_AUTH(self): - class EnableHandler(SimpleIMAPHandler): - capabilities = 'AUTH ENABLE UTF8=ACCEPT' - client, _ = self._setup(EnableHandler) - self.assertFalse(client.utf8_enabled) - with self.assertRaisesRegex(imaplib.IMAP4.error, 'ENABLE.*NONAUTH'): - client.enable('foo') - self.assertFalse(client.utf8_enabled) - - def test_enable_raises_error_if_no_capability(self): - client, _ = self._setup(SimpleIMAPHandler) - with self.assertRaisesRegex(imaplib.IMAP4.error, - 'does not support ENABLE'): - client.enable('foo') - - def test_enable_UTF8_raises_error_if_not_supported(self): - client, _ = self._setup(SimpleIMAPHandler) - typ, data = client.login('user', 'pass') - self.assertEqual(typ, 'OK') - with self.assertRaisesRegex(imaplib.IMAP4.error, - 'does not support ENABLE'): - client.enable('UTF8=ACCEPT') - - def test_enable_UTF8_True_append(self): - class UTF8AppendServer(SimpleIMAPHandler): - capabilities = 'ENABLE UTF8=ACCEPT' - def cmd_ENABLE(self, tag, args): - self._send_tagged(tag, 'OK', 'ENABLE successful') - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.server.response = yield - self._send_tagged(tag, 'OK', 'FAKEAUTH successful') - def cmd_APPEND(self, tag, args): - self._send_textline('+') - self.server.response = yield - self._send_tagged(tag, 'OK', 'okay') - client, server = self._setup(UTF8AppendServer) - self.assertEqual(client._encoding, 'ascii') - code, _ = client.authenticate('MYAUTH', lambda x: b'fake') - self.assertEqual(code, 'OK') - self.assertEqual(server.response, b'ZmFrZQ==\r\n') # b64 encoded 'fake' - code, _ = client.enable('UTF8=ACCEPT') - self.assertEqual(code, 'OK') - self.assertEqual(client._encoding, 'utf-8') - msg_string = 'Subject: üñí©öðé' - typ, data = client.append(None, None, None, msg_string.encode('utf-8')) - self.assertEqual(typ, 'OK') - self.assertEqual(server.response, - ('UTF8 (%s)\r\n' % msg_string).encode('utf-8')) - - def test_search_disallows_charset_in_utf8_mode(self): - class UTF8Server(SimpleIMAPHandler): - capabilities = 'AUTH ENABLE UTF8=ACCEPT' - def cmd_ENABLE(self, tag, args): - self._send_tagged(tag, 'OK', 'ENABLE successful') - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.server.response = yield - self._send_tagged(tag, 'OK', 'FAKEAUTH successful') - client, _ = self._setup(UTF8Server) - typ, _ = client.authenticate('MYAUTH', lambda x: b'fake') - self.assertEqual(typ, 'OK') - typ, _ = client.enable('UTF8=ACCEPT') - self.assertEqual(typ, 'OK') - self.assertTrue(client.utf8_enabled) - with self.assertRaisesRegex(imaplib.IMAP4.error, 'charset.*UTF8'): - client.search('foo', 'bar') - - def test_bad_auth_name(self): - class MyServer(SimpleIMAPHandler): - def cmd_AUTHENTICATE(self, tag, args): - self._send_tagged(tag, 'NO', - 'unrecognized authentication type {}'.format(args[0])) - client, _ = self._setup(MyServer) - with self.assertRaisesRegex(imaplib.IMAP4.error, - 'unrecognized authentication type METHOD'): - client.authenticate('METHOD', lambda: 1) - - def test_invalid_authentication(self): - class MyServer(SimpleIMAPHandler): - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.response = yield - self._send_tagged(tag, 'NO', '[AUTHENTICATIONFAILED] invalid') - client, _ = self._setup(MyServer) - with self.assertRaisesRegex(imaplib.IMAP4.error, - r'\[AUTHENTICATIONFAILED\] invalid'): - client.authenticate('MYAUTH', lambda x: b'fake') - - def test_valid_authentication_bytes(self): - class MyServer(SimpleIMAPHandler): - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.server.response = yield - self._send_tagged(tag, 'OK', 'FAKEAUTH successful') - client, server = self._setup(MyServer) - code, _ = client.authenticate('MYAUTH', lambda x: b'fake') - self.assertEqual(code, 'OK') - self.assertEqual(server.response, b'ZmFrZQ==\r\n') # b64 encoded 'fake' - - def test_valid_authentication_plain_text(self): - class MyServer(SimpleIMAPHandler): - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.server.response = yield - self._send_tagged(tag, 'OK', 'FAKEAUTH successful') - client, server = self._setup(MyServer) - code, _ = client.authenticate('MYAUTH', lambda x: 'fake') - self.assertEqual(code, 'OK') - self.assertEqual(server.response, b'ZmFrZQ==\r\n') # b64 encoded 'fake' - - def test_login_cram_md5_bytes(self): - class AuthHandler(SimpleIMAPHandler): - capabilities = 'LOGINDISABLED AUTH=CRAM-MD5' - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+ PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2Uucm' - 'VzdG9uLm1jaS5uZXQ=') - r = yield - if (r == b'dGltIGYxY2E2YmU0NjRiOWVmYT' - b'FjY2E2ZmZkNmNmMmQ5ZjMy\r\n'): - self._send_tagged(tag, 'OK', 'CRAM-MD5 successful') - else: - self._send_tagged(tag, 'NO', 'No access') - client, _ = self._setup(AuthHandler) - self.assertTrue('AUTH=CRAM-MD5' in client.capabilities) - ret, _ = client.login_cram_md5("tim", b"tanstaaftanstaaf") - self.assertEqual(ret, "OK") - - def test_login_cram_md5_plain_text(self): - class AuthHandler(SimpleIMAPHandler): - capabilities = 'LOGINDISABLED AUTH=CRAM-MD5' - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+ PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2Uucm' - 'VzdG9uLm1jaS5uZXQ=') - r = yield - if (r == b'dGltIGYxY2E2YmU0NjRiOWVmYT' - b'FjY2E2ZmZkNmNmMmQ5ZjMy\r\n'): - self._send_tagged(tag, 'OK', 'CRAM-MD5 successful') - else: - self._send_tagged(tag, 'NO', 'No access') - client, _ = self._setup(AuthHandler) - self.assertTrue('AUTH=CRAM-MD5' in client.capabilities) - ret, _ = client.login_cram_md5("tim", "tanstaaftanstaaf") - self.assertEqual(ret, "OK") - - def test_aborted_authentication(self): - class MyServer(SimpleIMAPHandler): - def cmd_AUTHENTICATE(self, tag, args): - self._send_textline('+') - self.response = yield - if self.response == b'*\r\n': - self._send_tagged( - tag, - 'NO', - '[AUTHENTICATIONFAILED] aborted') - else: - self._send_tagged(tag, 'OK', 'MYAUTH successful') - client, _ = self._setup(MyServer) - with self.assertRaisesRegex(imaplib.IMAP4.error, - r'\[AUTHENTICATIONFAILED\] aborted'): - client.authenticate('MYAUTH', lambda x: None) - - @mock.patch('imaplib._MAXLINE', 10) - def test_linetoolong(self): - class TooLongHandler(SimpleIMAPHandler): - def handle(self): - # send response line longer than the limit set in the next line - self.wfile.write(b'* OK ' + 11 * b'x' + b'\r\n') - _, server = self._setup(TooLongHandler, connect=False) - with self.assertRaisesRegex(imaplib.IMAP4.error, - 'got more than 10 bytes'): - self.imap_class(*server.server_address) - - def test_simple_with_statement(self): - _, server = self._setup(SimpleIMAPHandler, connect=False) - with self.imap_class(*server.server_address): - pass - - def test_with_statement(self): - _, server = self._setup(SimpleIMAPHandler, connect=False) - with self.imap_class(*server.server_address) as imap: - imap.login('user', 'pass') - self.assertEqual(server.logged, 'user') - self.assertIsNone(server.logged) - - def test_with_statement_logout(self): - # It is legal to log out explicitly inside the with block - _, server = self._setup(SimpleIMAPHandler, connect=False) - with self.imap_class(*server.server_address) as imap: - imap.login('user', 'pass') - self.assertEqual(server.logged, 'user') - imap.logout() - self.assertIsNone(server.logged) - self.assertIsNone(server.logged) - - # command tests - - def test_login(self): - client, _ = self._setup(SimpleIMAPHandler) - typ, data = client.login('user', 'pass') - self.assertEqual(typ, 'OK') - self.assertEqual(data[0], b'LOGIN completed') - self.assertEqual(client.state, 'AUTH') - - def test_logout(self): - client, _ = self._setup(SimpleIMAPHandler) - typ, data = client.login('user', 'pass') - self.assertEqual(typ, 'OK') - self.assertEqual(data[0], b'LOGIN completed') - typ, data = client.logout() - self.assertEqual(typ, 'BYE') - self.assertEqual(data[0], b'IMAP4ref1 Server logging out') - self.assertEqual(client.state, 'LOGOUT') - - def test_lsub(self): - class LsubCmd(SimpleIMAPHandler): - def cmd_LSUB(self, tag, args): - self._send_textline('* LSUB () "." directoryA') - return self._send_tagged(tag, 'OK', 'LSUB completed') - client, _ = self._setup(LsubCmd) - client.login('user', 'pass') - typ, data = client.lsub() - self.assertEqual(typ, 'OK') - self.assertEqual(data[0], b'() "." directoryA') - - -class NewIMAPTests(NewIMAPTestsMixin, unittest.TestCase): - imap_class = imaplib.IMAP4 - server_class = socketserver.TCPServer - - -@unittest.skipUnless(ssl, "SSL not available") -class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase): - imap_class = IMAP4_SSL - server_class = SecureTCPServer - - def test_ssl_raises(self): - ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ssl_context.verify_mode = ssl.CERT_REQUIRED - ssl_context.check_hostname = True - ssl_context.load_verify_locations(CAFILE) - - with self.assertRaisesRegex(ssl.CertificateError, - "hostname '127.0.0.1' doesn't match 'localhost'"): - _, server = self._setup(SimpleIMAPHandler) - client = self.imap_class(*server.server_address, - ssl_context=ssl_context) - client.shutdown() - - def test_ssl_verified(self): - ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ssl_context.verify_mode = ssl.CERT_REQUIRED - ssl_context.check_hostname = True - ssl_context.load_verify_locations(CAFILE) - - _, server = self._setup(SimpleIMAPHandler) - client = self.imap_class("localhost", server.server_address[1], - ssl_context=ssl_context) - client.shutdown() - class ThreadedNetworkedTests(unittest.TestCase): server_class = socketserver.TCPServer imap_class = imaplib.IMAP4 @@ -573,6 +243,55 @@ class ThreadedNetworkedTests(unittest.TestCase): client.shutdown() @reap_threads + def test_bracket_flags(self): + + # This violates RFC 3501, which disallows ']' characters in tag names, + # but imaplib has allowed producing such tags forever, other programs + # also produce them (eg: OtherInbox's Organizer app as of 20140716), + # and Gmail, for example, accepts them and produces them. So we + # support them. See issue #21815. + + class BracketFlagHandler(SimpleIMAPHandler): + + def handle(self): + self.flags = ['Answered', 'Flagged', 'Deleted', 'Seen', 'Draft'] + super().handle() + + def cmd_AUTHENTICATE(self, tag, args): + self._send_textline('+') + self.server.response = yield + self._send_tagged(tag, 'OK', 'FAKEAUTH successful') + + def cmd_SELECT(self, tag, args): + flag_msg = ' \\'.join(self.flags) + self._send_line(('* FLAGS (%s)' % flag_msg).encode('ascii')) + self._send_line(b'* 2 EXISTS') + self._send_line(b'* 0 RECENT') + msg = ('* OK [PERMANENTFLAGS %s \\*)] Flags permitted.' + % flag_msg) + self._send_line(msg.encode('ascii')) + self._send_tagged(tag, 'OK', '[READ-WRITE] SELECT completed.') + + def cmd_STORE(self, tag, args): + new_flags = args[2].strip('(').strip(')').split() + self.flags.extend(new_flags) + flags_msg = '(FLAGS (%s))' % ' \\'.join(self.flags) + msg = '* %s FETCH %s' % (args[0], flags_msg) + self._send_line(msg.encode('ascii')) + self._send_tagged(tag, 'OK', 'STORE completed.') + + with self.reaped_pair(BracketFlagHandler) as (server, client): + code, data = client.authenticate('MYAUTH', lambda x: b'fake') + self.assertEqual(code, 'OK') + self.assertEqual(server.response, b'ZmFrZQ==\r\n') + client.select('test') + typ, [data] = client.store(b'1', "+FLAGS", "[test]") + self.assertIn(b'[test]', data) + client.select('test') + typ, [data] = client.response('PERMANENTFLAGS') + self.assertIn(b'[test]', data) + + @reap_threads def test_issue5949(self): class EOFHandler(socketserver.StreamRequestHandler): @@ -917,6 +636,19 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest): _server = self.imap_class(self.host, self.port) self.check_logincapa(_server) + def test_logincapa_with_client_certfile(self): + with transient_internet(self.host): + with support.check_warnings(('', DeprecationWarning)): + _server = self.imap_class(self.host, self.port, + certfile=CERTFILE) + self.check_logincapa(_server) + + def test_logincapa_with_client_ssl_context(self): + with transient_internet(self.host): + _server = self.imap_class( + self.host, self.port, ssl_context=self.create_ssl_context()) + self.check_logincapa(_server) + def test_logout(self): with transient_internet(self.host): _server = self.imap_class(self.host, self.port) diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py index b54daf8..476ba95 100644 --- a/Lib/test/test_imghdr.py +++ b/Lib/test/test_imghdr.py @@ -1,6 +1,7 @@ import imghdr import io import os +import pathlib import unittest import warnings from test.support import findfile, TESTFN, unlink @@ -49,6 +50,12 @@ class TestImghdr(unittest.TestCase): self.assertEqual(imghdr.what(None, data), expected) self.assertEqual(imghdr.what(None, bytearray(data)), expected) + def test_pathlike_filename(self): + for filename, expected in TEST_FILES: + with self.subTest(filename=filename): + filename = findfile(filename, subdir='imghdrdata') + self.assertEqual(imghdr.what(pathlib.Path(filename)), expected) + def test_register_test(self): def test_jumbo(h, file): if h.startswith(b'eggs'): diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index 433de34..4ece365 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -6,13 +6,12 @@ import importlib import importlib.util import os import os.path -import shutil import sys from test import support import unittest import warnings with warnings.catch_warnings(): - warnings.simplefilter('ignore', PendingDeprecationWarning) + warnings.simplefilter('ignore', DeprecationWarning) import imp @@ -315,10 +314,6 @@ class ImportTests(unittest.TestCase): loader.get_data(imp.__file__) # File should be closed loader.get_data(imp.__file__) # Will need to create a newly opened file - def test_load_source(self): - with self.assertRaisesRegex(ValueError, 'embedded null'): - imp.load_source(__name__, __file__ + "\0") - class ReloadTests(unittest.TestCase): diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index 6ef9bd5..760908e 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -22,9 +22,8 @@ from test.support import ( EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython, make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask, unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE, - temp_dir, DirsOnSysPath) + temp_dir) from test.support import script_helper -from test.test_importlib.util import uncache skip_if_dont_write_bytecode = unittest.skipIf( @@ -70,6 +69,18 @@ class ImportTests(unittest.TestCase): def tearDown(self): unload(TESTFN) + def test_import_raises_ModuleNotFoundError(self): + with self.assertRaises(ModuleNotFoundError): + import something_that_should_not_exist_anywhere + + def test_from_import_missing_module_raises_ModuleNotFoundError(self): + with self.assertRaises(ModuleNotFoundError): + from something_that_should_not_exist_anywhere import blah + + def test_from_import_missing_attr_raises_ImportError(self): + with self.assertRaises(ImportError): + from importlib import something_that_should_not_exist_anywhere + def test_case_sensitivity(self): # Brief digression to test that import is case-sensitive: if we got # this far, we know for sure that "random" exists. @@ -556,7 +567,7 @@ class PathsTests(unittest.TestCase): try: os.listdir(unc) except OSError as e: - if e.errno in (errno.EPERM, errno.EACCES, errno.ENOENT): + if e.errno in (errno.EPERM, errno.EACCES): # See issue #15338 self.skipTest("cannot access administrative share %r" % (unc,)) raise @@ -601,11 +612,11 @@ class RelativeImportTests(unittest.TestCase): # Check relative import fails with only __package__ wrong ns = dict(__package__='foo', __name__='test.notarealmodule') - self.assertRaises(ImportError, check_relative) + self.assertRaises(SystemError, check_relative) # Check relative import fails with __package__ and __name__ wrong ns = dict(__package__='foo', __name__='notarealpkg.notarealmodule') - self.assertRaises(ImportError, check_relative) + self.assertRaises(SystemError, check_relative) # Check relative import fails with package set to a non-string ns = dict(__package__=object()) @@ -620,20 +631,6 @@ class RelativeImportTests(unittest.TestCase): self.fail("explicit relative import triggered an " "implicit absolute import") - def test_import_from_non_package(self): - path = os.path.join(os.path.dirname(__file__), 'data', 'package2') - with uncache('submodule1', 'submodule2'), DirsOnSysPath(path): - with self.assertRaises(ImportError): - import submodule1 - self.assertNotIn('submodule1', sys.modules) - self.assertNotIn('submodule2', sys.modules) - - def test_import_from_unloaded_package(self): - with uncache('package2', 'package2.submodule1', 'package2.submodule2'), \ - DirsOnSysPath(os.path.join(os.path.dirname(__file__), 'data')): - import package2.submodule1 - package2.submodule1.submodule2 - class OverridingImportBuiltinTests(unittest.TestCase): def test_override_builtin(self): diff --git a/Lib/test/test_import/data/package2/submodule1.py b/Lib/test/test_import/data/package2/submodule1.py deleted file mode 100644 index 0698ed6..0000000 --- a/Lib/test/test_import/data/package2/submodule1.py +++ /dev/null @@ -1,3 +0,0 @@ -import sys -sys.modules.pop(__package__, None) -from . import submodule2 diff --git a/Lib/test/test_import/data/package2/submodule2.py b/Lib/test/test_import/data/package2/submodule2.py deleted file mode 100644 index e69de29..0000000 diff --git a/Lib/test/test_importlib/extension/test_case_sensitivity.py b/Lib/test/test_importlib/extension/test_case_sensitivity.py index c112ca7..0dd9c86 100644 --- a/Lib/test/test_importlib/extension/test_case_sensitivity.py +++ b/Lib/test/test_importlib/extension/test_case_sensitivity.py @@ -1,5 +1,4 @@ from importlib import _bootstrap_external -import sys from test import support import unittest @@ -9,8 +8,6 @@ importlib = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') -# XXX find_spec tests - @unittest.skipIf(util.EXTENSIONS.filename is None, '_testcapi not available') @util.case_insensitive_tests class ExtensionModuleCaseSensitivityTest(util.CASEOKTestBase): diff --git a/Lib/test/test_importlib/extension/test_finder.py b/Lib/test/test_importlib/extension/test_finder.py index 71bf67f..c9b4a37 100644 --- a/Lib/test/test_importlib/extension/test_finder.py +++ b/Lib/test/test_importlib/extension/test_finder.py @@ -6,7 +6,6 @@ machinery = util.import_importlib('importlib.machinery') import unittest import warnings -# XXX find_spec tests class FinderTests(abc.FinderTests): diff --git a/Lib/test/test_importlib/extension/test_path_hook.py b/Lib/test/test_importlib/extension/test_path_hook.py index 8f4b8bb..a4b5a64 100644 --- a/Lib/test/test_importlib/extension/test_path_hook.py +++ b/Lib/test/test_importlib/extension/test_path_hook.py @@ -2,8 +2,6 @@ from .. import util machinery = util.import_importlib('importlib.machinery') -import collections -import sys import unittest diff --git a/Lib/test/test_importlib/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py index 603c7d7..29ecff1 100644 --- a/Lib/test/test_importlib/frozen/test_loader.py +++ b/Lib/test/test_importlib/frozen/test_loader.py @@ -3,8 +3,6 @@ from .. import util machinery = util.import_importlib('importlib.machinery') - -import sys from test.support import captured_stdout import types import unittest diff --git a/Lib/test/test_importlib/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py index 9a70405..7f64548 100644 --- a/Lib/test/test_importlib/import_/test___package__.py +++ b/Lib/test/test_importlib/import_/test___package__.py @@ -5,6 +5,7 @@ of using the typical __path__/__name__ test). """ import unittest +import warnings from .. import util @@ -33,35 +34,54 @@ class Using__package__: """ - def test_using___package__(self): - # [__package__] + def import_module(self, globals_): with self.mock_modules('pkg.__init__', 'pkg.fake') as importer: with util.import_state(meta_path=[importer]): self.__import__('pkg.fake') module = self.__import__('', - globals={'__package__': 'pkg.fake'}, - fromlist=['attr'], level=2) + globals=globals_, + fromlist=['attr'], level=2) + return module + + def test_using___package__(self): + # [__package__] + module = self.import_module({'__package__': 'pkg.fake'}) self.assertEqual(module.__name__, 'pkg') - def test_using___name__(self, package_as_None=False): + def test_using___name__(self): # [__name__] - globals_ = {'__name__': 'pkg.fake', '__path__': []} - if package_as_None: - globals_['__package__'] = None - with self.mock_modules('pkg.__init__', 'pkg.fake') as importer: - with util.import_state(meta_path=[importer]): - self.__import__('pkg.fake') - module = self.__import__('', globals= globals_, - fromlist=['attr'], level=2) - self.assertEqual(module.__name__, 'pkg') + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + module = self.import_module({'__name__': 'pkg.fake', + '__path__': []}) + self.assertEqual(module.__name__, 'pkg') + + def test_warn_when_using___name__(self): + with self.assertWarns(ImportWarning): + self.import_module({'__name__': 'pkg.fake', '__path__': []}) def test_None_as___package__(self): # [None] - self.test_using___name__(package_as_None=True) + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + module = self.import_module({ + '__name__': 'pkg.fake', '__path__': [], '__package__': None }) + self.assertEqual(module.__name__, 'pkg') + + def test_spec_fallback(self): + # If __package__ isn't defined, fall back on __spec__.parent. + module = self.import_module({'__spec__': FakeSpec('pkg.fake')}) + self.assertEqual(module.__name__, 'pkg') + + def test_warn_when_package_and_spec_disagree(self): + # Raise an ImportWarning if __package__ != __spec__.parent. + with self.assertWarns(ImportWarning): + self.import_module({'__package__': 'pkg.fake', + '__spec__': FakeSpec('pkg.fakefake')}) def test_bad__package__(self): globals = {'__package__': ''} - with self.assertRaises(ImportError): + with self.assertRaises(SystemError): self.__import__('', globals, {}, ['relimport'], 1) def test_bunk__package__(self): @@ -70,6 +90,11 @@ class Using__package__: self.__import__('', globals, {}, ['relimport'], 1) +class FakeSpec: + def __init__(self, parent): + self.parent = parent + + class Using__package__PEP302(Using__package__): mock_modules = util.mock_modules diff --git a/Lib/test/test_importlib/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py index 7069d9e..a7bf274 100644 --- a/Lib/test/test_importlib/import_/test_api.py +++ b/Lib/test/test_importlib/import_/test_api.py @@ -43,6 +43,10 @@ class APITest: """Test API-specific details for __import__ (e.g. raising the right exception when passing in an int for the module name).""" + def test_raises_ModuleNotFoundError(self): + with self.assertRaises(ModuleNotFoundError): + util.import_importlib('some module that does not exist') + def test_name_requires_rparition(self): # Raise TypeError if a non-string is passed in for the module name. with self.assertRaises(TypeError): diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py index 8045465..1464003 100644 --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -73,16 +73,16 @@ class HandlingFromlist: self.assertTrue(hasattr(module, 'module')) self.assertEqual(module.module.__name__, 'pkg.module') - def test_module_from_package_triggers_ImportError(self): - # If a submodule causes an ImportError because it tries to import - # a module which doesn't exist, that should let the ImportError - # propagate. + def test_module_from_package_triggers_ModuleNotFoundError(self): + # If a submodule causes an ModuleNotFoundError because it tries + # to import a module which doesn't exist, that should let the + # ModuleNotFoundError propagate. def module_code(): import i_do_not_exist with util.mock_modules('pkg.__init__', 'pkg.mod', module_code={'pkg.mod': module_code}) as importer: with util.import_state(meta_path=[importer]): - with self.assertRaises(ImportError) as exc: + with self.assertRaises(ModuleNotFoundError) as exc: self.__import__('pkg', fromlist=['mod']) self.assertEqual('i_do_not_exist', exc.exception.name) diff --git a/Lib/test/test_importlib/import_/test_packages.py b/Lib/test/test_importlib/import_/test_packages.py index 3755b84..2439604 100644 --- a/Lib/test/test_importlib/import_/test_packages.py +++ b/Lib/test/test_importlib/import_/test_packages.py @@ -1,7 +1,6 @@ from .. import util import sys import unittest -import importlib from test import support diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py index b32a876..7aa26b0 100644 --- a/Lib/test/test_importlib/import_/test_path.py +++ b/Lib/test/test_importlib/import_/test_path.py @@ -16,11 +16,14 @@ class FinderTests: """Tests for PathFinder.""" + find = None + check_found = None + def test_failure(self): # Test None returned upon not finding a suitable loader. module = '' with util.import_state(): - self.assertIsNone(self.machinery.PathFinder.find_module(module)) + self.assertIsNone(self.find(module)) def test_sys_path(self): # Test that sys.path is used when 'path' is None. @@ -30,8 +33,8 @@ class FinderTests: importer = util.mock_spec(module) with util.import_state(path_importer_cache={path: importer}, path=[path]): - loader = self.machinery.PathFinder.find_module(module) - self.assertIs(loader, importer) + found = self.find(module) + self.check_found(found, importer) def test_path(self): # Test that 'path' is used when set. @@ -40,8 +43,8 @@ class FinderTests: path = '' importer = util.mock_spec(module) with util.import_state(path_importer_cache={path: importer}): - loader = self.machinery.PathFinder.find_module(module, [path]) - self.assertIs(loader, importer) + found = self.find(module, [path]) + self.check_found(found, importer) def test_empty_list(self): # An empty list should not count as asking for sys.path. @@ -50,7 +53,7 @@ class FinderTests: importer = util.mock_spec(module) with util.import_state(path_importer_cache={path: importer}, path=[path]): - self.assertIsNone(self.machinery.PathFinder.find_module('module', [])) + self.assertIsNone(self.find('module', [])) def test_path_hooks(self): # Test that sys.path_hooks is used. @@ -60,8 +63,8 @@ class FinderTests: importer = util.mock_spec(module) hook = util.mock_path_hook(path, importer=importer) with util.import_state(path_hooks=[hook]): - loader = self.machinery.PathFinder.find_module(module, [path]) - self.assertIs(loader, importer) + found = self.find(module, [path]) + self.check_found(found, importer) self.assertIn(path, sys.path_importer_cache) self.assertIs(sys.path_importer_cache[path], importer) @@ -73,7 +76,7 @@ class FinderTests: path=[path_entry]): with warnings.catch_warnings(record=True) as w: warnings.simplefilter('always') - self.assertIsNone(self.machinery.PathFinder.find_module('os')) + self.assertIsNone(self.find('os')) self.assertIsNone(sys.path_importer_cache[path_entry]) self.assertEqual(len(w), 1) self.assertTrue(issubclass(w[-1].category, ImportWarning)) @@ -85,8 +88,8 @@ class FinderTests: importer = util.mock_spec(module) hook = util.mock_path_hook(os.getcwd(), importer=importer) with util.import_state(path=[path], path_hooks=[hook]): - loader = self.machinery.PathFinder.find_module(module) - self.assertIs(loader, importer) + found = self.find(module) + self.check_found(found, importer) self.assertIn(os.getcwd(), sys.path_importer_cache) def test_None_on_sys_path(self): @@ -182,16 +185,33 @@ class FinderTests: self.assertIsNone(self.machinery.PathFinder.find_spec('whatever')) +class FindModuleTests(FinderTests): + def find(self, *args, **kwargs): + return self.machinery.PathFinder.find_module(*args, **kwargs) + def check_found(self, found, importer): + self.assertIs(found, importer) + + +(Frozen_FindModuleTests, + Source_FindModuleTests +) = util.test_both(FindModuleTests, importlib=importlib, machinery=machinery) -(Frozen_FinderTests, - Source_FinderTests - ) = util.test_both(FinderTests, importlib=importlib, machinery=machinery) +class FindSpecTests(FinderTests): + def find(self, *args, **kwargs): + return self.machinery.PathFinder.find_spec(*args, **kwargs) + def check_found(self, found, importer): + self.assertIs(found.loader, importer) + + +(Frozen_FindSpecTests, + Source_FindSpecTests + ) = util.test_both(FindSpecTests, importlib=importlib, machinery=machinery) class PathEntryFinderTests: - def test_finder_with_failing_find_module(self): + def test_finder_with_failing_find_spec(self): # PathEntryFinder with find_module() defined should work. # Issue #20763. class Finder: @@ -209,6 +229,24 @@ class PathEntryFinderTests: path_hooks=[Finder]): self.machinery.PathFinder.find_spec('importlib') + def test_finder_with_failing_find_module(self): + # PathEntryFinder with find_module() defined should work. + # Issue #20763. + class Finder: + path_location = 'test_finder_with_find_module' + def __init__(self, path): + if path != self.path_location: + raise ImportError + + @staticmethod + def find_module(fullname): + return None + + + with util.import_state(path=[Finder.path_location]+sys.path[:], + path_hooks=[Finder]): + self.machinery.PathFinder.find_module('importlib') + (Frozen_PEFTests, Source_PEFTests diff --git a/Lib/test/test_importlib/import_/test_relative_imports.py b/Lib/test/test_importlib/import_/test_relative_imports.py index 717fc5b..8a95a32 100644 --- a/Lib/test/test_importlib/import_/test_relative_imports.py +++ b/Lib/test/test_importlib/import_/test_relative_imports.py @@ -1,7 +1,8 @@ """Test relative imports (PEP 328).""" from .. import util -import sys import unittest +import warnings + class RelativeImports: @@ -65,9 +66,11 @@ class RelativeImports: uncache_names.append(name[:-len('.__init__')]) with util.mock_spec(*create) as importer: with util.import_state(meta_path=[importer]): - for global_ in globals_: - with util.uncache(*uncache_names): - callback(global_) + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + for global_ in globals_: + with util.uncache(*uncache_names): + callback(global_) def test_module_from_module(self): @@ -204,8 +207,10 @@ class RelativeImports: def test_relative_import_no_globals(self): # No globals for a relative import is an error. - with self.assertRaises(KeyError): - self.__import__('sys', level=1) + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + with self.assertRaises(KeyError): + self.__import__('sys', level=1) def test_relative_import_no_package(self): with self.assertRaises(ImportError): diff --git a/Lib/test/test_importlib/regrtest.py b/Lib/test/test_importlib/regrtest.py deleted file mode 100644 index a5be11f..0000000 --- a/Lib/test/test_importlib/regrtest.py +++ /dev/null @@ -1,17 +0,0 @@ -"""Run Python's standard test suite using importlib.__import__. - -Tests known to fail because of assumptions that importlib (properly) -invalidates are automatically skipped if the entire test suite is run. -Otherwise all command-line options valid for test.regrtest are also valid for -this script. - -""" -import importlib -import sys -from test import regrtest - -if __name__ == '__main__': - __builtins__.__import__ = importlib.__import__ - sys.path_importer_cache.clear() - - regrtest.main(quiet=True, verbose2=True) diff --git a/Lib/test/test_importlib/source/test_case_sensitivity.py b/Lib/test/test_importlib/source/test_case_sensitivity.py index 34b86cd..12ce0cb 100644 --- a/Lib/test/test_importlib/source/test_case_sensitivity.py +++ b/Lib/test/test_importlib/source/test_case_sensitivity.py @@ -5,7 +5,6 @@ importlib = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') import os -import sys from test import support as test_support import unittest diff --git a/Lib/test/test_importlib/source/test_file_loader.py b/Lib/test/test_importlib/source/test_file_loader.py index 6d5a886..a151149 100644 --- a/Lib/test/test_importlib/source/test_file_loader.py +++ b/Lib/test/test_importlib/source/test_file_loader.py @@ -217,7 +217,7 @@ class SimpleTest(abc.LoaderTests): # PEP 302 with warnings.catch_warnings(): warnings.simplefilter('ignore', DeprecationWarning) - mod = loader.load_module('_temp') # XXX + mod = loader.load_module('_temp') # Sanity checks. self.assertEqual(mod.__cached__, compiled) self.assertEqual(mod.x, 5) @@ -245,12 +245,7 @@ class SimpleTest(abc.LoaderTests): class BadBytecodeTest: def import_(self, file, module_name): - loader = self.loader(module_name, file) - with warnings.catch_warnings(): - warnings.simplefilter('ignore', DeprecationWarning) - # XXX Change to use exec_module(). - module = loader.load_module(module_name) - self.assertIn(module_name, sys.modules) + raise NotImplementedError def manipulate_bytecode(self, name, mapping, manipulator, *, del_source=False): @@ -603,109 +598,5 @@ class SourcelessLoaderBadBytecodeTestPEP302(SourcelessLoaderBadBytecodeTest, util=importlib_util) -########################################################################### -# Issue #29537: Test backwards compatibility with legacy 3.5.0/1/2 bytecode -########################################################################### - -class LegacyBytecodeTest: - - def _test_legacy_magic(self, test, *, del_source=False): - # Replace the default magic number with one copied from a pyc file - # generated by Python 3.5.2 - with util.create_modules('_temp') as mapping: - bc_path = self.manipulate_bytecode('_temp', mapping, - lambda bc: b'\x16\r\r\n' + bc[4:]) - test('_temp', mapping, bc_path) - -LegacyBytecodeTestPEP451 = BadBytecodeTestPEP451 -LegacyBytecodeTestPEP302 = BadBytecodeTestPEP302 - -# SourceLoader via both PEP 451 and 302 hooks - -class SourceLoaderLegacyBytecodeTest(LegacyBytecodeTest): - - @classmethod - def setUpClass(cls): - cls.loader = cls.machinery.SourceFileLoader - - @util.writes_bytecode_files - def test_legacy_magic(self): - # The magic number from 3.5.0/1/2 should be accepted as is - def test(name, mapping, bytecode_path): - self.import_(mapping[name], name) - with open(bytecode_path, 'rb') as bytecode_file: - self.assertEqual(bytecode_file.read(4), - self.util._BACKCOMPAT_MAGIC_NUMBER) - - self._test_legacy_magic(test) - - -class SourceLoaderLegacyBytecodeTestPEP451( - SourceLoaderLegacyBytecodeTest, LegacyBytecodeTestPEP451): - pass - - -(Frozen_SourceLegacyBytecodePEP451, - Source_SourceLegacyBytecodePEP451 - ) = util.test_both(SourceLoaderLegacyBytecodeTestPEP451, importlib=importlib, - machinery=machinery, abc=importlib_abc, - util=importlib_util) - - -class SourceLoaderLegacyBytecodeTestPEP302( - SourceLoaderLegacyBytecodeTest, LegacyBytecodeTestPEP302): - pass - - -(Frozen_SourceLegacyBytecodePEP302, - Source_SourceLegacyBytecodePEP302 - ) = util.test_both(SourceLoaderLegacyBytecodeTestPEP302, importlib=importlib, - machinery=machinery, abc=importlib_abc, - util=importlib_util) - -# SourcelessLoader via both PEP 451 and 302 hooks - -class SourcelessLoaderLegacyBytecodeTest(LegacyBytecodeTest): - - @classmethod - def setUpClass(cls): - cls.loader = cls.machinery.SourcelessFileLoader - - - @util.writes_bytecode_files - def test_legacy_magic(self): - # The magic number from 3.5.0/1/2 should be accepted as is - def test(name, mapping, bytecode_path): - self.import_(bytecode_path, name) - with open(bytecode_path, 'rb') as bytecode_file: - self.assertEqual(bytecode_file.read(4), - self.util._BACKCOMPAT_MAGIC_NUMBER) - - self._test_legacy_magic(test) - -class SourcelessLoaderLegacyBytecodeTestPEP451( - SourcelessLoaderLegacyBytecodeTest, LegacyBytecodeTestPEP451): - pass - -(Frozen_SourcelessLegacyBytecodePEP451, - Source_SourcelessLegacyBytecodePEP451 - ) = util.test_both(SourcelessLoaderLegacyBytecodeTestPEP451, importlib=importlib, - machinery=machinery, abc=importlib_abc, - util=importlib_util) - - -class SourcelessLoaderLegacyBytecodeTestPEP302(SourcelessLoaderLegacyBytecodeTest, - LegacyBytecodeTestPEP302): - pass - - -(Frozen_SourcelessLegacyBytecodePEP302, - Source_SourcelessLegacyBytecodePEP302 - ) = util.test_both(SourcelessLoaderLegacyBytecodeTestPEP302, importlib=importlib, - machinery=machinery, abc=importlib_abc, - util=importlib_util) - -# End of Issue #29537 legacy bytecode compatibility tests - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_importlib/source/test_path_hook.py b/Lib/test/test_importlib/source/test_path_hook.py index e6a2415..795d436 100644 --- a/Lib/test/test_importlib/source/test_path_hook.py +++ b/Lib/test/test_importlib/source/test_path_hook.py @@ -16,10 +16,19 @@ class PathHookTest: def test_success(self): with util.create_modules('dummy') as mapping: self.assertTrue(hasattr(self.path_hook()(mapping['.root']), - 'find_module')) + 'find_spec')) + + def test_success_legacy(self): + with util.create_modules('dummy') as mapping: + self.assertTrue(hasattr(self.path_hook()(mapping['.root']), + 'find_module')) def test_empty_string(self): # The empty string represents the cwd. + self.assertTrue(hasattr(self.path_hook()(''), 'find_spec')) + + def test_empty_string_legacy(self): + # The empty string represents the cwd. self.assertTrue(hasattr(self.path_hook()(''), 'find_module')) diff --git a/Lib/test/test_importlib/source/test_source_encoding.py b/Lib/test/test_importlib/source/test_source_encoding.py index 1e0771b..980855f 100644 --- a/Lib/test/test_importlib/source/test_source_encoding.py +++ b/Lib/test/test_importlib/source/test_source_encoding.py @@ -5,7 +5,6 @@ machinery = util.import_importlib('importlib.machinery') import codecs import importlib.util import re -import sys import types # Because sys.path gets essentially blanked, need to have unicodedata already # imported for the parser to use. diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py index d4bf915..c862480 100644 --- a/Lib/test/test_importlib/test_abc.py +++ b/Lib/test/test_importlib/test_abc.py @@ -207,6 +207,10 @@ class LoaderDefaultsTests(ABCTestHarness): SPLIT = make_abc_subclasses(Loader) + def test_create_module(self): + spec = 'a spec' + self.assertIsNone(self.ins.create_module(spec)) + def test_load_module(self): with self.assertRaises(ImportError): self.ins.load_module('something') @@ -519,6 +523,12 @@ class InspectLoaderLoadModuleTests: support.unload(self.module_name) self.addCleanup(support.unload, self.module_name) + def load(self, loader): + spec = self.util.spec_from_loader(self.module_name, loader) + with warnings.catch_warnings(): + warnings.simplefilter('ignore', DeprecationWarning) + return self.init._bootstrap._load_unlocked(spec) + def mock_get_code(self): return mock.patch.object(self.InspectLoaderSubclass, 'get_code') @@ -528,9 +538,7 @@ class InspectLoaderLoadModuleTests: mocked_get_code.side_effect = ImportError with self.assertRaises(ImportError): loader = self.InspectLoaderSubclass() - with warnings.catch_warnings(): - warnings.simplefilter('ignore', DeprecationWarning) - loader.load_module(self.module_name) + self.load(loader) def test_get_code_None(self): # If get_code() returns None, raise ImportError. @@ -538,7 +546,7 @@ class InspectLoaderLoadModuleTests: mocked_get_code.return_value = None with self.assertRaises(ImportError): loader = self.InspectLoaderSubclass() - loader.load_module(self.module_name) + self.load(loader) def test_module_returned(self): # The loaded module should be returned. @@ -546,14 +554,16 @@ class InspectLoaderLoadModuleTests: with self.mock_get_code() as mocked_get_code: mocked_get_code.return_value = code loader = self.InspectLoaderSubclass() - module = loader.load_module(self.module_name) + module = self.load(loader) self.assertEqual(module, sys.modules[self.module_name]) (Frozen_ILLoadModuleTests, Source_ILLoadModuleTests ) = test_util.test_both(InspectLoaderLoadModuleTests, - InspectLoaderSubclass=SPLIT_IL) + InspectLoaderSubclass=SPLIT_IL, + init=init, + util=util) ##### ExecutionLoader concrete methods ######################################### diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py index 6bc3c56..b0a94aa 100644 --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -99,9 +99,7 @@ class ImportModuleTests: class FindLoaderTests: - class FakeMetaFinder: - @staticmethod - def find_module(name, path=None): return name, path + FakeMetaFinder = None def test_sys_modules(self): # If a module with __loader__ is in sys.modules, then return it. @@ -171,9 +169,30 @@ class FindLoaderTests: self.assertIsNone(self.init.find_loader('nevergoingtofindthismodule')) -(Frozen_FindLoaderTests, - Source_FindLoaderTests - ) = test_util.test_both(FindLoaderTests, init=init) +class FindLoaderPEP451Tests(FindLoaderTests): + + class FakeMetaFinder: + @staticmethod + def find_spec(name, path=None, target=None): + return machinery['Source'].ModuleSpec(name, (name, path)) + + +(Frozen_FindLoaderPEP451Tests, + Source_FindLoaderPEP451Tests + ) = test_util.test_both(FindLoaderPEP451Tests, init=init) + + +class FindLoaderPEP302Tests(FindLoaderTests): + + class FakeMetaFinder: + @staticmethod + def find_module(name, path=None): + return name, path + + +(Frozen_FindLoaderPEP302Tests, + Source_FindLoaderPEP302Tests + ) = test_util.test_both(FindLoaderPEP302Tests, init=init) class ReloadTests: diff --git a/Lib/test/test_importlib/test_lazy.py b/Lib/test/test_importlib/test_lazy.py index cc383c2..ffd8dc6 100644 --- a/Lib/test/test_importlib/test_lazy.py +++ b/Lib/test/test_importlib/test_lazy.py @@ -66,6 +66,8 @@ class LazyLoaderTests(unittest.TestCase): spec = util.spec_from_loader(TestingImporter.module_name, util.LazyLoader(loader)) module = spec.loader.create_module(spec) + if module is None: + module = types.ModuleType(TestingImporter.module_name) module.__spec__ = spec module.__loader__ = spec.loader spec.loader.exec_module(module) diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py index df0af12..b2aadff 100644 --- a/Lib/test/test_importlib/test_locks.py +++ b/Lib/test/test_importlib/test_locks.py @@ -3,7 +3,6 @@ from . import util as test_util init = test_util.import_importlib('importlib') import sys -import time import unittest import weakref diff --git a/Lib/test/test_importlib/test_namespace_pkgs.py b/Lib/test/test_importlib/test_namespace_pkgs.py index 6639612..e37d8a1 100644 --- a/Lib/test/test_importlib/test_namespace_pkgs.py +++ b/Lib/test/test_importlib/test_namespace_pkgs.py @@ -1,13 +1,10 @@ import contextlib -import importlib.abc -import importlib.machinery +import importlib import os import sys -import types import unittest from test.test_importlib import util -from test.support import run_unittest # needed tests: # @@ -71,6 +68,7 @@ class NamespacePackageTest(unittest.TestCase): # TODO: will we ever want to pass exc_info to __exit__? self.ctx.__exit__(None, None, None) + class SingleNamespacePackage(NamespacePackageTest): paths = ['portion1'] @@ -87,7 +85,7 @@ class SingleNamespacePackage(NamespacePackageTest): self.assertEqual(repr(foo), "") -class DynamicPatheNamespacePackage(NamespacePackageTest): +class DynamicPathNamespacePackage(NamespacePackageTest): paths = ['portion1'] def test_dynamic_path(self): @@ -289,5 +287,35 @@ class ModuleAndNamespacePackageInSameDir(NamespacePackageTest): self.assertEqual(a_test.attr, 'in module') +class ReloadTests(NamespacePackageTest): + paths = ['portion1'] + + def test_simple_package(self): + import foo.one + foo = importlib.reload(foo) + self.assertEqual(foo.one.attr, 'portion1 foo one') + + def test_cant_import_other(self): + import foo + with self.assertRaises(ImportError): + import foo.two + foo = importlib.reload(foo) + with self.assertRaises(ImportError): + import foo.two + + def test_dynamic_path(self): + import foo.one + with self.assertRaises(ImportError): + import foo.two + + # Now modify sys.path and reload. + sys.path.append(os.path.join(self.root, 'portion2')) + foo = importlib.reload(foo) + + # And make sure foo.two is now importable + import foo.two + self.assertEqual(foo.two.attr, 'portion2 foo two') + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_importlib/test_spec.py b/Lib/test/test_importlib/test_spec.py index 8b333e8..5a16a03 100644 --- a/Lib/test/test_importlib/test_spec.py +++ b/Lib/test/test_importlib/test_spec.py @@ -5,6 +5,7 @@ machinery = test_util.import_importlib('importlib.machinery') util = test_util.import_importlib('importlib.util') import os.path +import pathlib from test.support import CleanImport import unittest import sys @@ -659,6 +660,11 @@ class FactoryTests: self.assertEqual(spec.cached, self.cached) self.assertTrue(spec.has_location) + def test_spec_from_file_location_path_like_arg(self): + spec = self.util.spec_from_file_location(self.name, + pathlib.PurePath(self.path)) + self.assertEqual(spec.origin, self.path) + def test_spec_from_file_location_default_without_location(self): spec = self.util.spec_from_file_location(self.name) diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py index 230cd29..d615375 100644 --- a/Lib/test/test_importlib/test_util.py +++ b/Lib/test/test_importlib/test_util.py @@ -4,8 +4,8 @@ init = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') importlib_util = util.import_importlib('importlib.util') -import importlib.util import os +import pathlib import string import sys from test import support @@ -47,14 +47,8 @@ class ModuleFromSpecTests: def exec_module(self, module): pass spec = self.machinery.ModuleSpec('test', Loader()) - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter('always') + with self.assertRaises(ImportError): module = self.util.module_from_spec(spec) - self.assertEqual(1, len(w)) - self.assertTrue(issubclass(w[0].category, DeprecationWarning)) - self.assertIn('create_module', str(w[0].message)) - self.assertIsInstance(module, types.ModuleType) - self.assertEqual(module.__name__, spec.name) def test_create_module_returns_None(self): class Loader(self.abc.Loader): @@ -678,6 +672,15 @@ class PEP3147Tests: '\\foo\\bar\\baz\\__pycache__\\qux.{}.pyc'.format(self.tag)) @unittest.skipUnless(sys.implementation.cache_tag is not None, + 'requires sys.implementation.cache_tag not be None') + def test_source_from_cache_path_like_arg(self): + path = pathlib.PurePath('foo', 'bar', 'baz', 'qux.py') + expect = os.path.join('foo', 'bar', 'baz', '__pycache__', + 'qux.{}.pyc'.format(self.tag)) + self.assertEqual(self.util.cache_from_source(path, optimization=''), + expect) + + @unittest.skipUnless(sys.implementation.cache_tag is not None, 'requires sys.implementation.cache_tag to not be ' 'None') def test_source_from_cache(self): @@ -739,54 +742,20 @@ class PEP3147Tests: with self.assertRaises(ValueError): self.util.source_from_cache(path) + @unittest.skipUnless(sys.implementation.cache_tag is not None, + 'requires sys.implementation.cache_tag to not be ' + 'None') + def test_source_from_cache_path_like_arg(self): + path = pathlib.PurePath('foo', 'bar', 'baz', '__pycache__', + 'qux.{}.pyc'.format(self.tag)) + expect = os.path.join('foo', 'bar', 'baz', 'qux.py') + self.assertEqual(self.util.source_from_cache(path), expect) + (Frozen_PEP3147Tests, Source_PEP3147Tests ) = util.test_both(PEP3147Tests, util=importlib_util) -class MagicNumberTests(unittest.TestCase): - """ - Test release compatibility issues relating to importlib - """ - @unittest.skipUnless( - sys.version_info.releaselevel in ('final', 'release'), - 'only applies to candidate or final python release levels' - ) - def test_magic_number(self): - """ - Each python minor release should generally have a MAGIC_NUMBER - that does not change once the release reaches candidate status. - - Once a release reaches candidate status, the value of the constant - EXPECTED_MAGIC_NUMBER in this test should be changed. - This test will then check that the actual MAGIC_NUMBER matches - the expected value for the release. - - In exceptional cases, it may be required to change the MAGIC_NUMBER - for a maintenance release. In this case the change should be - discussed in python-dev. If a change is required, community - stakeholders such as OS package maintainers must be notified - in advance. Such exceptional releases will then require an - adjustment to this test case. - """ - EXPECTED_MAGIC_NUMBER = 3351 - actual = int.from_bytes(importlib.util.MAGIC_NUMBER[:2], 'little') - - msg = ( - "To avoid breaking backwards compatibility with cached bytecode " - "files that can't be automatically regenerated by the current " - "user, candidate and final releases require the current " - "importlib.util.MAGIC_NUMBER to match the expected " - "magic number in this test. Set the expected " - "magic number in this test to the current MAGIC_NUMBER to " - "continue with the release.\n\n" - "Changing the MAGIC_NUMBER for a maintenance release " - "requires discussion in python-dev and notification of " - "community stakeholders." - ) - self.assertEqual(EXPECTED_MAGIC_NUMBER, actual, msg) - - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_importlib/test_windows.py b/Lib/test/test_importlib/test_windows.py index c893bcf..005b685 100644 --- a/Lib/test/test_importlib/test_windows.py +++ b/Lib/test/test_importlib/test_windows.py @@ -40,7 +40,7 @@ def setup_module(machinery, name, path=None): else: root = machinery.WindowsRegistryFinder.REGISTRY_KEY key = root.format(fullname=name, - sys_version=sys.version[:3]) + sys_version='%d.%d' % sys.version_info[:2]) try: with temp_module(name, "a = 1") as location: subkey = CreateKey(HKEY_CURRENT_USER, key) diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 95c5ead..97634e5 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -30,6 +30,7 @@ from test.support import MISSING_C_DOCSTRINGS, cpython_only from test.support.script_helper import assert_python_ok, assert_python_failure from test import inspect_fodder as mod from test import inspect_fodder2 as mod2 +from test import support from test.test_import import _ready_to_import @@ -38,7 +39,7 @@ from test.test_import import _ready_to_import # ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode, # isbuiltin, isroutine, isgenerator, isgeneratorfunction, getmembers, # getdoc, getfile, getmodule, getsourcefile, getcomments, getsource, -# getclasstree, getargspec, getargvalues, formatargspec, formatargvalues, +# getclasstree, getargvalues, formatargspec, formatargvalues, # currentframe, stack, trace, isdatadescriptor # NOTE: There are some additional tests relating to interaction with @@ -64,7 +65,8 @@ class IsTestBase(unittest.TestCase): inspect.isframe, inspect.isfunction, inspect.ismethod, inspect.ismodule, inspect.istraceback, inspect.isgenerator, inspect.isgeneratorfunction, - inspect.iscoroutine, inspect.iscoroutinefunction]) + inspect.iscoroutine, inspect.iscoroutinefunction, + inspect.isasyncgen, inspect.isasyncgenfunction]) def istest(self, predicate, exp): obj = eval(exp) @@ -72,6 +74,7 @@ class IsTestBase(unittest.TestCase): for other in self.predicates - set([predicate]): if (predicate == inspect.isgeneratorfunction or \ + predicate == inspect.isasyncgenfunction or \ predicate == inspect.iscoroutinefunction) and \ other == inspect.isfunction: continue @@ -81,6 +84,10 @@ def generator_function_example(self): for i in range(2): yield i +async def async_generator_function_example(self): + async for i in range(2): + yield i + async def coroutine_function_example(self): return 'spam' @@ -121,6 +128,10 @@ class TestPredicates(IsTestBase): self.istest(inspect.isdatadescriptor, 'collections.defaultdict.default_factory') self.istest(inspect.isgenerator, '(x for x in range(2))') self.istest(inspect.isgeneratorfunction, 'generator_function_example') + self.istest(inspect.isasyncgen, + 'async_generator_function_example(1)') + self.istest(inspect.isasyncgenfunction, + 'async_generator_function_example') with warnings.catch_warnings(): warnings.simplefilter("ignore") @@ -376,11 +387,6 @@ class TestRetrievingSourceCode(GetSourceBase): def test_getcomments(self): self.assertEqual(inspect.getcomments(mod), '# line 1\n') self.assertEqual(inspect.getcomments(mod.StupidGit), '# line 20\n') - # If the object source file is not available, return None. - co = compile('x=1', '_non_existing_filename.py', 'exec') - self.assertIsNone(inspect.getcomments(co)) - # If the object has been defined in C, return None. - self.assertIsNone(inspect.getcomments(list)) def test_getmodule(self): # Check actual module @@ -396,11 +402,6 @@ class TestRetrievingSourceCode(GetSourceBase): # Check filename override self.assertEqual(inspect.getmodule(None, modfile), mod) - def test_getframeinfo_get_first_line(self): - frame_info = inspect.getframeinfo(self.fodderModule.fr, 50) - self.assertEqual(frame_info.code_context[0], "# line 1\n") - self.assertEqual(frame_info.code_context[1], "'A module docstring.'\n") - def test_getsource(self): self.assertSourceEqual(git.abuse, 29, 39) self.assertSourceEqual(mod.StupidGit, 21, 51) @@ -410,7 +411,7 @@ class TestRetrievingSourceCode(GetSourceBase): self.assertEqual(normcase(inspect.getsourcefile(mod.spam)), modfile) self.assertEqual(normcase(inspect.getsourcefile(git.abuse)), modfile) fn = "_non_existing_filename_used_for_sourcefile_test.py" - co = compile("None", fn, "exec") + co = compile("x=1", fn, "exec") self.assertEqual(inspect.getsourcefile(co), None) linecache.cache[co.co_filename] = (1, None, "None", co.co_filename) try: @@ -1954,41 +1955,6 @@ class TestSignatureObject(unittest.TestCase): ('kwargs', ..., int, "var_keyword")), ...)) - def test_signature_without_self(self): - def test_args_only(*args): # NOQA - pass - - def test_args_kwargs_only(*args, **kwargs): # NOQA - pass - - class A: - @classmethod - def test_classmethod(*args): # NOQA - pass - - @staticmethod - def test_staticmethod(*args): # NOQA - pass - - f1 = functools.partialmethod((test_classmethod), 1) - f2 = functools.partialmethod((test_args_only), 1) - f3 = functools.partialmethod((test_staticmethod), 1) - f4 = functools.partialmethod((test_args_kwargs_only),1) - - self.assertEqual(self.signature(test_args_only), - ((('args', ..., ..., 'var_positional'),), ...)) - self.assertEqual(self.signature(test_args_kwargs_only), - ((('args', ..., ..., 'var_positional'), - ('kwargs', ..., ..., 'var_keyword')), ...)) - self.assertEqual(self.signature(A.f1), - ((('args', ..., ..., 'var_positional'),), ...)) - self.assertEqual(self.signature(A.f2), - ((('args', ..., ..., 'var_positional'),), ...)) - self.assertEqual(self.signature(A.f3), - ((('args', ..., ..., 'var_positional'),), ...)) - self.assertEqual(self.signature(A.f4), - ((('args', ..., ..., 'var_positional'), - ('kwargs', ..., ..., 'var_keyword')), ...)) @cpython_only @unittest.skipIf(MISSING_C_DOCSTRINGS, "Signature information for builtins requires docstrings") @@ -2947,6 +2913,10 @@ class TestParameterObject(unittest.TestCase): 'is not a valid parameter name'): inspect.Parameter('$', kind=inspect.Parameter.VAR_KEYWORD) + with self.assertRaisesRegex(ValueError, + 'is not a valid parameter name'): + inspect.Parameter('.a', kind=inspect.Parameter.VAR_KEYWORD) + with self.assertRaisesRegex(ValueError, 'cannot have default values'): inspect.Parameter('a', default=42, kind=inspect.Parameter.VAR_KEYWORD) @@ -3030,6 +3000,17 @@ class TestParameterObject(unittest.TestCase): with self.assertRaisesRegex(TypeError, 'name must be a str'): inspect.Parameter(None, kind=inspect.Parameter.POSITIONAL_ONLY) + @cpython_only + def test_signature_parameter_implicit(self): + with self.assertRaisesRegex(ValueError, + 'implicit arguments must be passed in as'): + inspect.Parameter('.0', kind=inspect.Parameter.POSITIONAL_ONLY) + + param = inspect.Parameter( + '.0', kind=inspect.Parameter.POSITIONAL_OR_KEYWORD) + self.assertEqual(param.kind, inspect.Parameter.POSITIONAL_ONLY) + self.assertEqual(param.name, 'implicit0') + def test_signature_parameter_immutability(self): p = inspect.Parameter('spam', kind=inspect.Parameter.KEYWORD_ONLY) @@ -3278,6 +3259,17 @@ class TestSignatureBind(unittest.TestCase): ba = sig.bind(args=1) self.assertEqual(ba.arguments, {'kwargs': {'args': 1}}) + @cpython_only + def test_signature_bind_implicit_arg(self): + # Issue #19611: getcallargs should work with set comprehensions + def make_set(): + return {z * z for z in range(5)} + setcomp_code = make_set.__code__.co_consts[1] + setcomp_func = types.FunctionType(setcomp_code, {}) + + iterator = iter(range(5)) + self.assertEqual(self.call(setcomp_func, iterator), {0, 1, 4, 9, 16}) + class TestBoundArguments(unittest.TestCase): def test_signature_bound_arguments_unhashable(self): @@ -3588,14 +3580,14 @@ class TestMain(unittest.TestCase): def test_details(self): module = importlib.import_module('unittest') - rc, out, err = assert_python_ok('-m', 'inspect', + args = support.optim_args_from_interpreter_flags() + rc, out, err = assert_python_ok(*args, '-m', 'inspect', 'unittest', '--details') output = out.decode() # Just a quick sanity check on the output self.assertIn(module.__name__, output) self.assertIn(module.__file__, output) - if not sys.flags.optimize: - self.assertIn(module.__cached__, output) + self.assertIn(module.__cached__, output) self.assertEqual(err, b'') diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py index b66c5d6..14bbd61 100644 --- a/Lib/test/test_int.py +++ b/Lib/test/test_int.py @@ -2,6 +2,8 @@ import sys import unittest from test import support +from test.test_grammar import (VALID_UNDERSCORE_LITERALS, + INVALID_UNDERSCORE_LITERALS) L = [ ('0', 0), @@ -212,6 +214,25 @@ class IntTestCases(unittest.TestCase): self.assertEqual(int('2br45qc', 35), 4294967297) self.assertEqual(int('1z141z5', 36), 4294967297) + def test_underscores(self): + for lit in VALID_UNDERSCORE_LITERALS: + if any(ch in lit for ch in '.eEjJ'): + continue + self.assertEqual(int(lit, 0), eval(lit)) + self.assertEqual(int(lit, 0), int(lit.replace('_', ''), 0)) + for lit in INVALID_UNDERSCORE_LITERALS: + if any(ch in lit for ch in '.eEjJ'): + continue + self.assertRaises(ValueError, int, lit, 0) + # Additional test cases with bases != 0, only for the constructor: + self.assertEqual(int("1_00", 3), 9) + self.assertEqual(int("0_100"), 100) # not valid as a literal! + self.assertEqual(int(b"1_00"), 100) # byte underscore + self.assertRaises(ValueError, int, "_100") + self.assertRaises(ValueError, int, "+_100") + self.assertRaises(ValueError, int, "1__00") + self.assertRaises(ValueError, int, "100_") + @support.cpython_only def test_small_ints(self): # Bug #3236: Return small longs from PyLong_FromString @@ -430,21 +451,24 @@ class IntTestCases(unittest.TestCase): with self.assertWarns(DeprecationWarning): n = int(bad_int) self.assertEqual(n, 1) + self.assertIs(type(n), int) bad_int = BadInt2() with self.assertWarns(DeprecationWarning): n = int(bad_int) self.assertEqual(n, 1) + self.assertIs(type(n), int) bad_int = TruncReturnsBadInt() with self.assertWarns(DeprecationWarning): n = int(bad_int) self.assertEqual(n, 1) + self.assertIs(type(n), int) good_int = TruncReturnsIntSubclass() n = int(good_int) self.assertEqual(n, 1) - self.assertIs(type(n), bool) + self.assertIs(type(n), int) n = IntSubclass(good_int) self.assertEqual(n, 1) self.assertIs(type(n), IntSubclass) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 8b4892b..aaa64ea 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -350,7 +350,10 @@ class IOTest(unittest.TestCase): def large_file_ops(self, f): assert f.readable() assert f.writable() - self.assertEqual(f.seek(self.LARGE), self.LARGE) + try: + self.assertEqual(f.seek(self.LARGE), self.LARGE) + except (OverflowError, ValueError): + self.skipTest("no largefile support") self.assertEqual(f.tell(), self.LARGE) self.assertEqual(f.write(b"xxx"), 3) self.assertEqual(f.tell(), self.LARGE + 3) @@ -496,7 +499,11 @@ class IOTest(unittest.TestCase): def test_open_handles_NUL_chars(self): fn_with_NUL = 'foo\0bar' self.assertRaises(ValueError, self.open, fn_with_NUL, 'w') - self.assertRaises(ValueError, self.open, bytes(fn_with_NUL, 'ascii'), 'w') + + bytes_fn = bytes(fn_with_NUL, 'ascii') + with warnings.catch_warnings(): + warnings.simplefilter("ignore", DeprecationWarning) + self.assertRaises(ValueError, self.open, bytes_fn, 'w') def test_raw_file_io(self): with self.open(support.TESTFN, "wb", buffering=0) as f: @@ -536,22 +543,6 @@ class IOTest(unittest.TestCase): with self.open(support.TESTFN, "r") as f: self.assertRaises(TypeError, f.readline, 5.3) - def test_readline_nonsizeable(self): - # Issue #30061 - # Crash when readline() returns an object without __len__ - class R(self.IOBase): - def readline(self): - return None - self.assertRaises((TypeError, StopIteration), next, R()) - - def test_next_nonsizeable(self): - # Issue #30061 - # Crash when __next__() returns an object without __len__ - class R(self.IOBase): - def __next__(self): - return None - self.assertRaises(TypeError, R().readlines, 1) - def test_raw_bytes_io(self): f = self.BytesIO() self.write_ops(f) @@ -872,6 +863,32 @@ class IOTest(unittest.TestCase): self.assertEqual(getattr(stream, method)(buffer), 5) self.assertEqual(bytes(buffer), b"12345") + def test_fspath_support(self): + class PathLike: + def __init__(self, path): + self.path = path + + def __fspath__(self): + return self.path + + def check_path_succeeds(path): + with self.open(path, "w") as f: + f.write("egg\n") + + with self.open(path, "r") as f: + self.assertEqual(f.read(), "egg\n") + + check_path_succeeds(PathLike(support.TESTFN)) + check_path_succeeds(PathLike(support.TESTFN.encode('utf-8'))) + + bad_path = PathLike(TypeError) + with self.assertRaises(TypeError): + self.open(bad_path, 'w') + + # ensure that refcounting is correct with some error conditions + with self.assertRaisesRegex(ValueError, 'read/write/append mode'): + self.open(PathLike(support.TESTFN), 'rwxa') + class CIOTest(IOTest): @@ -997,16 +1014,6 @@ class CommonBufferedTests: raw.name = b"dummy" self.assertEqual(repr(b), "<%s name=b'dummy'>" % clsname) - def test_recursive_repr(self): - # Issue #25455 - raw = self.MockRawIO() - b = self.tp(raw) - with support.swap_attr(raw, 'name', b): - try: - repr(b) # Should not crash - except RuntimeError: - pass - def test_flush_error_on_close(self): # Test that buffered file is closed despite failed flush # and that flush() is called before file closed. @@ -1808,7 +1815,7 @@ class BufferedRWPairTest(unittest.TestCase): with self.subTest(method): pair = self.tp(self.BytesIO(b"abcdef"), self.MockRawIO()) - data = byteslike(5) + data = byteslike(b'\0' * 5) self.assertEqual(getattr(pair, method)(data), 5) self.assertEqual(bytes(data), b"abcde") @@ -2417,16 +2424,6 @@ class TextIOWrapperTest(unittest.TestCase): t.buffer.detach() repr(t) # Should not raise an exception - def test_recursive_repr(self): - # Issue #25455 - raw = self.BytesIO() - t = self.TextIOWrapper(raw) - with support.swap_attr(raw, 'name', t): - try: - repr(t) # Should not crash - except RuntimeError: - pass - def test_line_buffering(self): r = self.BytesIO() b = self.BufferedWriter(r, 1000) @@ -3282,8 +3279,7 @@ class CTextIOWrapperTest(TextIOWrapperTest): class PyTextIOWrapperTest(TextIOWrapperTest): io = pyio - #shutdown_error = "LookupError: unknown encoding: ascii" - shutdown_error = "TypeError: 'NoneType' object is not iterable" + shutdown_error = "LookupError: unknown encoding: ascii" class IncrementalNewlineDecoderTest(unittest.TestCase): @@ -3482,7 +3478,6 @@ class MiscIOTest(unittest.TestCase): self.assertRaises(ValueError, f.readinto1, bytearray(1024)) self.assertRaises(ValueError, f.readline) self.assertRaises(ValueError, f.readlines) - self.assertRaises(ValueError, f.readlines, 1) self.assertRaises(ValueError, f.seek, 0) self.assertRaises(ValueError, f.tell) self.assertRaises(ValueError, f.truncate) @@ -3688,7 +3683,6 @@ class CMiscIOTest(MiscIOTest): import sys import time import threading - from test.support import SuppressCrashReport file = sys.{stream_name} @@ -3697,10 +3691,6 @@ class CMiscIOTest(MiscIOTest): file.write('.') file.flush() - crash = SuppressCrashReport() - crash.__enter__() - # don't call __exit__(): the crash occurs at Python shutdown - thread = threading.Thread(target=run) thread.daemon = True thread.start() diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index e3dec87..0e39516 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -119,7 +119,7 @@ class CommonTestMixin_v4(CommonTestMixin): def test_bad_packed_length(self): def assertBadLength(length): - addr = bytes(length) + addr = b'\0' * length msg = "%r (len %d != 4) is not permitted as an IPv4 address" with self.assertAddressError(re.escape(msg % (addr, length))): self.factory(addr) @@ -139,11 +139,11 @@ class CommonTestMixin_v6(CommonTestMixin): self.assertInstancesEqual(3232235521, "::c0a8:1") def test_packed(self): - addr = bytes(12) + bytes.fromhex("00000000") + addr = b'\0'*12 + bytes.fromhex("00000000") self.assertInstancesEqual(addr, "::") - addr = bytes(12) + bytes.fromhex("c0a80001") + addr = b'\0'*12 + bytes.fromhex("c0a80001") self.assertInstancesEqual(addr, "::c0a8:1") - addr = bytes.fromhex("c0a80001") + bytes(12) + addr = bytes.fromhex("c0a80001") + b'\0'*12 self.assertInstancesEqual(addr, "c0a8:1::") def test_negative_ints_rejected(self): @@ -158,7 +158,7 @@ class CommonTestMixin_v6(CommonTestMixin): def test_bad_packed_length(self): def assertBadLength(length): - addr = bytes(length) + addr = b'\0' * length msg = "%r (len %d != 16) is not permitted as an IPv6 address" with self.assertAddressError(re.escape(msg % (addr, length))): self.factory(addr) @@ -1176,6 +1176,7 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(str(self.ipv6_network[5]), '2001:658:22a:cafe::5') + self.assertRaises(IndexError, self.ipv6_network.__getitem__, 1 << 64) def testGetitem(self): # http://code.google.com/p/ipaddr-py/issues/detail?id=15 @@ -1404,35 +1405,14 @@ class IpaddrUnitTest(unittest.TestCase): ipaddress.ip_address('::2')) def testInterfaceComparison(self): - self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') == - ipaddress.ip_interface('1.1.1.1/24')) - self.assertTrue(ipaddress.ip_interface('1.1.1.1/16') < - ipaddress.ip_interface('1.1.1.1/24')) - self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') < - ipaddress.ip_interface('1.1.1.2/24')) - self.assertTrue(ipaddress.ip_interface('1.1.1.2/16') < - ipaddress.ip_interface('1.1.1.1/24')) - self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') > - ipaddress.ip_interface('1.1.1.1/16')) - self.assertTrue(ipaddress.ip_interface('1.1.1.2/24') > - ipaddress.ip_interface('1.1.1.1/24')) - self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') > - ipaddress.ip_interface('1.1.1.2/16')) - - self.assertTrue(ipaddress.ip_interface('::1/64') == - ipaddress.ip_interface('::1/64')) - self.assertTrue(ipaddress.ip_interface('::1/64') < - ipaddress.ip_interface('::1/80')) - self.assertTrue(ipaddress.ip_interface('::1/64') < - ipaddress.ip_interface('::2/64')) - self.assertTrue(ipaddress.ip_interface('::2/48') < - ipaddress.ip_interface('::1/64')) - self.assertTrue(ipaddress.ip_interface('::1/80') > - ipaddress.ip_interface('::1/64')) - self.assertTrue(ipaddress.ip_interface('::2/64') > - ipaddress.ip_interface('::1/64')) - self.assertTrue(ipaddress.ip_interface('::1/64') > - ipaddress.ip_interface('::2/48')) + self.assertTrue(ipaddress.ip_interface('1.1.1.1') <= + ipaddress.ip_interface('1.1.1.1')) + self.assertTrue(ipaddress.ip_interface('1.1.1.1') <= + ipaddress.ip_interface('1.1.1.2')) + self.assertTrue(ipaddress.ip_interface('::1') <= + ipaddress.ip_interface('::1')) + self.assertTrue(ipaddress.ip_interface('::1') <= + ipaddress.ip_interface('::2')) def testNetworkComparison(self): # ip1 and ip2 have the same network address diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py index a91670b..542b284 100644 --- a/Lib/test/test_iter.py +++ b/Lib/test/test_iter.py @@ -54,6 +54,14 @@ class UnlimitedSequenceClass: def __getitem__(self, i): return i +class DefaultIterClass: + pass + +class NoIterClass: + def __getitem__(self, i): + return i + __iter__ = None + # Main test suite class TestCase(unittest.TestCase): @@ -995,6 +1003,10 @@ class TestCase(unittest.TestCase): def test_free_after_iterating(self): check_free_after_iterating(self, iter, SequenceClass, (0,)) + def test_error_iter(self): + for typ in (DefaultIterClass, NoIterClass): + self.assertRaises(TypeError, iter, typ()) + def test_main(): run_unittest(TestCase) diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py index 152f5fc..41c9752 100644 --- a/Lib/test/test_iterlen.py +++ b/Lib/test/test_iterlen.py @@ -42,7 +42,6 @@ enumerate(iter('abc')). """ import unittest -from test import support from itertools import repeat from collections import deque from operator import length_hint diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py index b8399fc..ea1f57c 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -4,7 +4,6 @@ from itertools import * import weakref from decimal import Decimal from fractions import Fraction -import sys import operator import random import copy @@ -644,24 +643,58 @@ class TestBasicOps(unittest.TestCase): for proto in range(pickle.HIGHEST_PROTOCOL + 1): self.pickletest(proto, cycle('abc')) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + # test with partial consumed input iterable + it = iter('abcde') + c = cycle(it) + _ = [next(c) for i in range(2)] # consume 2 of 5 inputs + p = pickle.dumps(c, proto) + d = pickle.loads(p) # rebuild the cycle object + self.assertEqual(take(20, d), list('cdeabcdeabcdeabcdeab')) + + # test with completely consumed input iterable + it = iter('abcde') + c = cycle(it) + _ = [next(c) for i in range(7)] # consume 7 of 5 inputs + p = pickle.dumps(c, proto) + d = pickle.loads(p) # rebuild the cycle object + self.assertEqual(take(20, d), list('cdeabcdeabcdeabcdeab')) + def test_cycle_setstate(self): + # Verify both modes for restoring state + + # Mode 0 is efficient. It uses an incompletely consumed input + # iterator to build a cycle object and then passes in state with + # a list of previously consumed values. There is no data + # overlap between the two. + c = cycle('defg') + c.__setstate__((list('abc'), 0)) + self.assertEqual(take(20, c), list('defgabcdefgabcdefgab')) + + # Mode 1 is inefficient. It starts with a cycle object built + # from an iterator over the remaining elements in a partial + # cycle and then passes in state with all of the previously + # seen values (this overlaps values included in the iterator). + c = cycle('defg') + c.__setstate__((list('abcdefg'), 1)) + self.assertEqual(take(20, c), list('defgabcdefgabcdefgab')) + + # The first argument to setstate needs to be a tuple + with self.assertRaises(TypeError): + cycle('defg').__setstate__([list('abcdefg'), 0]) + + # The first argument in the setstate tuple must be a list + with self.assertRaises(TypeError): + c = cycle('defg') + c.__setstate__((tuple('defg'), 0)) + take(20, c) + + # The second argument in the setstate tuple must be an int + with self.assertRaises(TypeError): + cycle('defg').__setstate__((list('abcdefg'), 'x')) + self.assertRaises(TypeError, cycle('').__setstate__, ()) - self.assertRaises(TypeError, cycle('').__setstate__, []) - self.assertRaises(TypeError, cycle('').__setstate__, 0) self.assertRaises(TypeError, cycle('').__setstate__, ([],)) - self.assertRaises(TypeError, cycle('').__setstate__, ((), 0)) - it = cycle('abc') - it.__setstate__((['de', 'fg'], 0)) - self.assertEqual(list(islice(it, 15)), - ['a', 'b', 'c', 'de', 'fg', - 'a', 'b', 'c', 'de', 'fg', - 'a', 'b', 'c', 'de', 'fg']) - it = cycle('abc') - it.__setstate__((['de', 'fg'], 1)) - self.assertEqual(list(islice(it, 15)), - ['a', 'b', 'c', 'de', 'fg', - 'de', 'fg', 'de', 'fg', 'de', - 'fg', 'de', 'fg', 'de', 'fg']) def test_groupby(self): # Check whether it accepts arguments correctly @@ -1943,14 +1976,6 @@ class RegressionTests(unittest.TestCase): self.assertRaises(AssertionError, list, cycle(gen1())) self.assertEqual(hist, [0,1]) - def test_long_chain_of_empty_iterables(self): - # Make sure itertools.chain doesn't run into recursion limits when - # dealing with long chains of empty iterables. Even with a high - # number this would probably only fail in Py_DEBUG mode. - it = chain.from_iterable(() for unused in range(10000000)) - with self.assertRaises(StopIteration): - next(it) - class SubclassWithKwargsTest(unittest.TestCase): def test_keywords_in_subclass(self): # count is not subclassable... diff --git a/Lib/test/test_json/__init__.py b/Lib/test/test_json/__init__.py index 0807e6f..bac370d 100644 --- a/Lib/test/test_json/__init__.py +++ b/Lib/test/test_json/__init__.py @@ -1,5 +1,4 @@ import os -import sys import json import doctest import unittest diff --git a/Lib/test/test_json/test_decode.py b/Lib/test/test_json/test_decode.py index fdafeb6..7e568be 100644 --- a/Lib/test/test_json/test_decode.py +++ b/Lib/test/test_json/test_decode.py @@ -72,10 +72,8 @@ class TestDecode: def test_invalid_input_type(self): msg = 'the JSON object must be str' - for value in [1, 3.14, b'bytes', b'\xff\x00', [], {}, None]: + for value in [1, 3.14, [], {}, None]: self.assertRaisesRegex(TypeError, msg, self.loads, value) - with self.assertRaisesRegex(TypeError, msg): - self.json.load(BytesIO(b'[1,2,3]')) def test_string_with_utf8_bom(self): # see #18958 diff --git a/Lib/test/test_json/test_fail.py b/Lib/test/test_json/test_fail.py index 95ff5b8..7910521 100644 --- a/Lib/test/test_json/test_fail.py +++ b/Lib/test/test_json/test_fail.py @@ -1,5 +1,4 @@ from test.test_json import PyTest, CTest -import re # 2007-10-05 JSONDOCS = [ diff --git a/Lib/test/test_json/test_speedups.py b/Lib/test/test_json/test_speedups.py index 56f1882..109a246 100644 --- a/Lib/test/test_json/test_speedups.py +++ b/Lib/test/test_json/test_speedups.py @@ -1,11 +1,6 @@ from test.test_json import CTest -class BadBool: - def __bool__(self): - 1/0 - - class TestSpeedups(CTest): def test_scanstring(self): self.assertEqual(self.json.decoder.scanstring.__module__, "_json") @@ -22,29 +17,8 @@ class TestDecode(CTest): def test_make_scanner(self): self.assertRaises(AttributeError, self.json.scanner.c_make_scanner, 1) - def test_bad_bool_args(self): - def test(value): - self.json.decoder.JSONDecoder(strict=BadBool()).decode(value) - self.assertRaises(ZeroDivisionError, test, '""') - self.assertRaises(ZeroDivisionError, test, '{}') - - -class TestEncode(CTest): def test_make_encoder(self): self.assertRaises(TypeError, self.json.encoder.c_make_encoder, (True, False), b"\xCD\x7D\x3D\x4E\x12\x4C\xF9\x79\xD7\x52\xBA\x82\xF2\x27\x4A\x7D\xA0\xCA\x75", None) - - def test_bad_bool_args(self): - def test(name): - self.json.encoder.JSONEncoder(**{name: BadBool()}).encode({'a': 1}) - self.assertRaises(ZeroDivisionError, test, 'skipkeys') - self.assertRaises(ZeroDivisionError, test, 'ensure_ascii') - self.assertRaises(ZeroDivisionError, test, 'check_circular') - self.assertRaises(ZeroDivisionError, test, 'allow_nan') - self.assertRaises(ZeroDivisionError, test, 'sort_keys') - - def test_unsortable_keys(self): - with self.assertRaises(TypeError): - self.json.encoder.JSONEncoder(sort_keys=True).encode({'a': 1, 1: 'a'}) diff --git a/Lib/test/test_json/test_unicode.py b/Lib/test/test_json/test_unicode.py index c7cc8a7..2e8bba2 100644 --- a/Lib/test/test_json/test_unicode.py +++ b/Lib/test/test_json/test_unicode.py @@ -1,3 +1,4 @@ +import codecs from collections import OrderedDict from test.test_json import PyTest, CTest @@ -52,9 +53,31 @@ class TestUnicode: self.assertRaises(TypeError, self.dumps, [b"hi"]) def test_bytes_decode(self): - self.assertRaises(TypeError, self.loads, b'"hi"') - self.assertRaises(TypeError, self.loads, b'["hi"]') - + for encoding, bom in [ + ('utf-8', codecs.BOM_UTF8), + ('utf-16be', codecs.BOM_UTF16_BE), + ('utf-16le', codecs.BOM_UTF16_LE), + ('utf-32be', codecs.BOM_UTF32_BE), + ('utf-32le', codecs.BOM_UTF32_LE), + ]: + data = ["a\xb5\u20ac\U0001d120"] + encoded = self.dumps(data).encode(encoding) + self.assertEqual(self.loads(bom + encoded), data) + self.assertEqual(self.loads(encoded), data) + self.assertRaises(UnicodeDecodeError, self.loads, b'["\x80"]') + # RFC-7159 and ECMA-404 extend JSON to allow documents that + # consist of only a string, which can present a special case + # not covered by the encoding detection patterns specified in + # RFC-4627 for utf-16-le (XX 00 XX 00). + self.assertEqual(self.loads('"\u2600"'.encode('utf-16-le')), + '\u2600') + # Encoding detection for small (<4) bytes objects + # is implemented as a special case. RFC-7159 and ECMA-404 + # allow single codepoint JSON documents which are only two + # bytes in utf-16 encodings w/o BOM. + self.assertEqual(self.loads(b'5\x00'), 5) + self.assertEqual(self.loads(b'\x007'), 7) + self.assertEqual(self.loads(b'57'), 57) def test_object_pairs_hook_with_unicode(self): s = '{"xkd":1, "kcw":2, "art":3, "hxm":4, "qrt":5, "pad":6, "hoy":7}' diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py index f822024..9f49886 100644 --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -5,7 +5,6 @@ import errno import os import select import socket -import sys import time import unittest diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py index 47e2edd..375d9c4 100644 --- a/Lib/test/test_linecache.py +++ b/Lib/test/test_linecache.py @@ -3,6 +3,8 @@ import linecache import unittest import os.path +import tempfile +import tokenize from test import support @@ -10,8 +12,6 @@ FILENAME = linecache.__file__ NONEXISTENT_FILENAME = FILENAME + '.missing' INVALID_NAME = '!@$)(!@#_1' EMPTY = '' -TESTS = 'inspect_fodder inspect_fodder2 mapping_tests' -TESTS = TESTS.split() TEST_PATH = os.path.dirname(__file__) MODULES = "linecache abc".split() MODULE_PATH = os.path.dirname(FILENAME) @@ -37,6 +37,65 @@ def f(): return 3''' # No ending newline +class TempFile: + + def setUp(self): + super().setUp() + with tempfile.NamedTemporaryFile(delete=False) as fp: + self.file_name = fp.name + fp.write(self.file_byte_string) + self.addCleanup(support.unlink, self.file_name) + + +class GetLineTestsGoodData(TempFile): + # file_list = ['list\n', 'of\n', 'good\n', 'strings\n'] + + def setUp(self): + self.file_byte_string = ''.join(self.file_list).encode('utf-8') + super().setUp() + + def test_getline(self): + with tokenize.open(self.file_name) as fp: + for index, line in enumerate(fp): + if not line.endswith('\n'): + line += '\n' + + cached_line = linecache.getline(self.file_name, index + 1) + self.assertEqual(line, cached_line) + + def test_getlines(self): + lines = linecache.getlines(self.file_name) + self.assertEqual(lines, self.file_list) + + +class GetLineTestsBadData(TempFile): + # file_byte_string = b'Bad data goes here' + + def test_getline(self): + self.assertRaises((SyntaxError, UnicodeDecodeError), + linecache.getline, self.file_name, 1) + + def test_getlines(self): + self.assertRaises((SyntaxError, UnicodeDecodeError), + linecache.getlines, self.file_name) + + +class EmptyFile(GetLineTestsGoodData, unittest.TestCase): + file_list = [] + + +class SingleEmptyLine(GetLineTestsGoodData, unittest.TestCase): + file_list = ['\n'] + + +class GoodUnicode(GetLineTestsGoodData, unittest.TestCase): + file_list = ['á\n', 'b\n', 'abcdef\n', 'ááááá\n'] + + +class BadUnicode(GetLineTestsBadData, unittest.TestCase): + file_byte_string = b'\x80abc' + + class LineCacheTests(unittest.TestCase): def test_getline(self): @@ -53,13 +112,6 @@ class LineCacheTests(unittest.TestCase): self.assertEqual(getline(EMPTY, 1), EMPTY) self.assertEqual(getline(INVALID_NAME, 1), EMPTY) - # Check whether lines correspond to those from file iteration - for entry in TESTS: - filename = os.path.join(TEST_PATH, entry) + '.py' - with open(filename) as file: - for index, line in enumerate(file): - self.assertEqual(line, getline(filename, index + 1)) - # Check module loading for entry in MODULES: filename = os.path.join(MODULE_PATH, entry) + '.py' @@ -80,12 +132,13 @@ class LineCacheTests(unittest.TestCase): def test_clearcache(self): cached = [] - for entry in TESTS: - filename = os.path.join(TEST_PATH, entry) + '.py' + for entry in MODULES: + filename = os.path.join(MODULE_PATH, entry) + '.py' cached.append(filename) linecache.getline(filename, 1) # Are all files cached? + self.assertNotEqual(cached, []) cached_empty = [fn for fn in cached if fn not in linecache.cache] self.assertEqual(cached_empty, []) diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index 8f82ab5..aee62dc 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -1,5 +1,5 @@ import sys -from test import support, list_tests +from test import list_tests import pickle import unittest diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 8d40a94..fae2c3d 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -339,14 +339,9 @@ class TestCollation(unittest.TestCase): self.assertLess(locale.strcoll('a', 'b'), 0) self.assertEqual(locale.strcoll('a', 'a'), 0) self.assertGreater(locale.strcoll('b', 'a'), 0) - # embedded null character - self.assertRaises(ValueError, locale.strcoll, 'a\0', 'a') - self.assertRaises(ValueError, locale.strcoll, 'a', 'a\0') def test_strxfrm(self): self.assertLess(locale.strxfrm('a'), locale.strxfrm('b')) - # embedded null character - self.assertRaises(ValueError, locale.strxfrm, 'a\0') class TestEnUSCollation(BaseLocalizedTest, TestCollation): diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 382714f..08cdd7f 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -26,6 +26,7 @@ import logging.config import codecs import configparser import datetime +import pathlib import pickle import io import gc @@ -308,13 +309,9 @@ class BuiltinLevelsTest(BaseTest): self.assertEqual(logging.getLevelName('INFO'), logging.INFO) self.assertEqual(logging.getLevelName(logging.INFO), 'INFO') - def test_regression_29220(self): - """See issue #29220 for more information.""" - logging.addLevelName(logging.INFO, '') - self.addCleanup(logging.addLevelName, logging.INFO, 'INFO') - self.assertEqual(logging.getLevelName(logging.INFO), '') - self.assertEqual(logging.getLevelName(logging.NOTSET), 'NOTSET') - self.assertEqual(logging.getLevelName('NOTSET'), logging.NOTSET) + def test_issue27935(self): + fatal = logging.getLevelName('FATAL') + self.assertEqual(fatal, logging.FATAL) class BasicFilterTest(BaseTest): @@ -583,6 +580,29 @@ class HandlerTest(BaseTest): self.assertFalse(h.shouldFlush(r)) h.close() + def test_path_objects(self): + """ + Test that Path objects are accepted as filename arguments to handlers. + + See Issue #27493. + """ + fd, fn = tempfile.mkstemp() + os.close(fd) + os.unlink(fn) + pfn = pathlib.Path(fn) + cases = ( + (logging.FileHandler, (pfn, 'w')), + (logging.handlers.RotatingFileHandler, (pfn, 'a')), + (logging.handlers.TimedRotatingFileHandler, (pfn, 'h')), + ) + if sys.platform in ('linux', 'darwin'): + cases += ((logging.handlers.WatchedFileHandler, (pfn, 'w')),) + for cls, args in cases: + h = cls(*args) + self.assertTrue(os.path.exists(fn)) + h.close() + os.unlink(fn) + @unittest.skipIf(os.name == 'nt', 'WatchedFileHandler not appropriate for Windows.') @unittest.skipUnless(threading, 'Threading required for this test.') def test_race(self): @@ -966,7 +986,7 @@ class MemoryHandlerTest(BaseTest): def setUp(self): BaseTest.setUp(self) self.mem_hdlr = logging.handlers.MemoryHandler(10, logging.WARNING, - self.root_hdlr) + self.root_hdlr) self.mem_logger = logging.getLogger('mem') self.mem_logger.propagate = 0 self.mem_logger.addHandler(self.mem_hdlr) @@ -1003,6 +1023,36 @@ class MemoryHandlerTest(BaseTest): self.mem_logger.debug(self.next_message()) self.assert_log_lines(lines) + def test_flush_on_close(self): + """ + Test that the flush-on-close configuration works as expected. + """ + self.mem_logger.debug(self.next_message()) + self.assert_log_lines([]) + self.mem_logger.info(self.next_message()) + self.assert_log_lines([]) + self.mem_logger.removeHandler(self.mem_hdlr) + # Default behaviour is to flush on close. Check that it happens. + self.mem_hdlr.close() + lines = [ + ('DEBUG', '1'), + ('INFO', '2'), + ] + self.assert_log_lines(lines) + # Now configure for flushing not to be done on close. + self.mem_hdlr = logging.handlers.MemoryHandler(10, logging.WARNING, + self.root_hdlr, + False) + self.mem_logger.addHandler(self.mem_hdlr) + self.mem_logger.debug(self.next_message()) + self.assert_log_lines(lines) # no change + self.mem_logger.info(self.next_message()) + self.assert_log_lines(lines) # no change + self.mem_logger.removeHandler(self.mem_hdlr) + self.mem_hdlr.close() + # assert that no new lines have been added + self.assert_log_lines(lines) # no change + class ExceptionFormatter(logging.Formatter): """A special exception formatter.""" @@ -1571,7 +1621,7 @@ class SysLogHandlerTest(BaseTest): server.ready.wait() hcls = logging.handlers.SysLogHandler if isinstance(server.server_address, tuple): - self.sl_hdlr = hcls((server.server_address[0], server.port)) + self.sl_hdlr = hcls(('localhost', server.port)) else: self.sl_hdlr = hcls(server.server_address) self.log_output = '' @@ -1627,24 +1677,6 @@ class UnixSysLogHandlerTest(SysLogHandlerTest): SysLogHandlerTest.tearDown(self) os.remove(self.address) -@unittest.skipUnless(support.IPV6_ENABLED, - 'IPv6 support required for this test.') -@unittest.skipUnless(threading, 'Threading required for this test.') -class IPv6SysLogHandlerTest(SysLogHandlerTest): - - """Test for SysLogHandler with IPv6 host.""" - - server_class = TestUDPServer - address = ('::1', 0) - - def setUp(self): - self.server_class.address_family = socket.AF_INET6 - super(IPv6SysLogHandlerTest, self).setUp() - - def tearDown(self): - self.server_class.address_family = socket.AF_INET - super(IPv6SysLogHandlerTest, self).tearDown() - @unittest.skipUnless(threading, 'Threading required for this test.') class HTTPHandlerTest(BaseTest): """Test for HTTPHandler.""" @@ -3085,7 +3117,6 @@ if hasattr(logging.handlers, 'QueueListener'): handler.close() @patch.object(logging.handlers.QueueListener, 'handle') - @support.reap_threads def test_handle_called_with_queue_queue(self, mock_handle): for i in range(self.repeat): log_queue = queue.Queue() @@ -3095,13 +3126,10 @@ if hasattr(logging.handlers, 'QueueListener'): @support.requires_multiprocessing_queue @patch.object(logging.handlers.QueueListener, 'handle') - @support.reap_threads def test_handle_called_with_mp_queue(self, mock_handle): for i in range(self.repeat): log_queue = multiprocessing.Queue() self.setup_and_log(log_queue, '%s_%s' % (self.id(), i)) - log_queue.close() - log_queue.join_thread() self.assertEqual(mock_handle.call_count, 5 * self.repeat, 'correct number of handled log messages') @@ -3114,7 +3142,6 @@ if hasattr(logging.handlers, 'QueueListener'): return [] @support.requires_multiprocessing_queue - @support.reap_threads def test_no_messages_in_queue_after_stop(self): """ Five messages are logged then the QueueListener is stopped. This @@ -3127,9 +3154,6 @@ if hasattr(logging.handlers, 'QueueListener'): self.setup_and_log(queue, '%s_%s' %(self.id(), i)) # time.sleep(1) items = list(self.get_all_from_queue(queue)) - queue.close() - queue.join_thread() - expected = [[], [logging.handlers.QueueListener._sentinel]] self.assertIn(items, expected, 'Found unexpected messages in queue: %s' % ( @@ -4275,6 +4299,17 @@ class NTEventLogHandlerTest(BaseTest): msg = 'Record not found in event log, went back %d records' % GO_BACK self.assertTrue(found, msg=msg) + +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'logThreads', 'logMultiprocessing', + 'logProcesses', 'currentframe', + 'PercentStyle', 'StrFormatStyle', 'StringTemplateStyle', + 'Filterer', 'PlaceHolder', 'Manager', 'RootLogger', + 'root', 'threading'} + support.check__all__(self, logging, blacklist=blacklist) + + # Set the locale to the platform-dependent default. I have no idea # why the test does this, but in any case we save the current locale # first and restore it at the end. @@ -4289,9 +4324,10 @@ def test_main(): QueueHandlerTest, ShutdownTest, ModuleLevelMiscTest, BasicConfigTest, LoggerAdapterTest, LoggerTest, SMTPHandlerTest, FileHandlerTest, RotatingFileHandlerTest, LastResortTest, LogRecordTest, - ExceptionTest, SysLogHandlerTest, IPv6SysLogHandlerTest, HTTPHandlerTest, + ExceptionTest, SysLogHandlerTest, HTTPHandlerTest, NTEventLogHandlerTest, TimedRotatingFileHandlerTest, UnixSocketHandlerTest, UnixDatagramHandlerTest, UnixSysLogHandlerTest, + MiscTestCase ] if hasattr(logging.handlers, 'QueueListener'): tests.append(QueueListenerTest) diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py index 4b2d81c..fd15f04 100644 --- a/Lib/test/test_long.py +++ b/Lib/test/test_long.py @@ -621,6 +621,8 @@ class LongTest(unittest.TestCase): def test__format__(self): self.assertEqual(format(123456789, 'd'), '123456789') self.assertEqual(format(123456789, 'd'), '123456789') + self.assertEqual(format(123456789, ','), '123,456,789') + self.assertEqual(format(123456789, '_'), '123_456_789') # sign and aligning are interdependent self.assertEqual(format(1, "-"), '1') @@ -649,8 +651,25 @@ class LongTest(unittest.TestCase): self.assertEqual(format(int('be', 16), "X"), "BE") self.assertEqual(format(-int('be', 16), "x"), "-be") self.assertEqual(format(-int('be', 16), "X"), "-BE") + self.assertRaises(ValueError, format, 1234567890, ',x') + self.assertEqual(format(1234567890, '_x'), '4996_02d2') + self.assertEqual(format(1234567890, '_X'), '4996_02D2') # octal + self.assertEqual(format(3, "o"), "3") + self.assertEqual(format(-3, "o"), "-3") + self.assertEqual(format(1234, "o"), "2322") + self.assertEqual(format(-1234, "o"), "-2322") + self.assertEqual(format(1234, "-o"), "2322") + self.assertEqual(format(-1234, "-o"), "-2322") + self.assertEqual(format(1234, " o"), " 2322") + self.assertEqual(format(-1234, " o"), "-2322") + self.assertEqual(format(1234, "+o"), "+2322") + self.assertEqual(format(-1234, "+o"), "-2322") + self.assertRaises(ValueError, format, 1234567890, ',o') + self.assertEqual(format(1234567890, '_o'), '111_4540_1322') + + # binary self.assertEqual(format(3, "b"), "11") self.assertEqual(format(-3, "b"), "-11") self.assertEqual(format(1234, "b"), "10011010010") @@ -661,12 +680,21 @@ class LongTest(unittest.TestCase): self.assertEqual(format(-1234, " b"), "-10011010010") self.assertEqual(format(1234, "+b"), "+10011010010") self.assertEqual(format(-1234, "+b"), "-10011010010") + self.assertRaises(ValueError, format, 1234567890, ',b') + self.assertEqual(format(12345, '_b'), '11_0000_0011_1001') # make sure these are errors self.assertRaises(ValueError, format, 3, "1.3") # precision disallowed + self.assertRaises(ValueError, format, 3, "_c") # underscore, + self.assertRaises(ValueError, format, 3, ",c") # comma, and self.assertRaises(ValueError, format, 3, "+c") # sign not allowed # with 'c' + self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, '_,') + self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, ',_') + self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, '_,d') + self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, ',_d') + # ensure that only int and float type specifiers work for format_spec in ([chr(x) for x in range(ord('a'), ord('z')+1)] + [chr(x) for x in range(ord('A'), ord('Z')+1)]): @@ -689,6 +717,20 @@ class LongTest(unittest.TestCase): self.assertRaises(OverflowError, int, float('-inf')) self.assertRaises(ValueError, int, float('nan')) + def test_mod_division(self): + with self.assertRaises(ZeroDivisionError): + _ = 1 % 0 + + self.assertEqual(13 % 10, 3) + self.assertEqual(-13 % 10, 7) + self.assertEqual(13 % -10, -7) + self.assertEqual(-13 % -10, -3) + + self.assertEqual(12 % 4, 0) + self.assertEqual(-12 % 4, 0) + self.assertEqual(12 % -4, 0) + self.assertEqual(-12 % -4, 0) + def test_true_division(self): huge = 1 << 40000 mhuge = -huge @@ -723,6 +765,25 @@ class LongTest(unittest.TestCase): for zero in ["huge / 0", "mhuge / 0"]: self.assertRaises(ZeroDivisionError, eval, zero, namespace) + def test_floordiv(self): + with self.assertRaises(ZeroDivisionError): + _ = 1 // 0 + + self.assertEqual(2 // 3, 0) + self.assertEqual(2 // -3, -1) + self.assertEqual(-2 // 3, -1) + self.assertEqual(-2 // -3, 0) + + self.assertEqual(-11 // -3, 3) + self.assertEqual(-11 // 3, -4) + self.assertEqual(11 // -3, -4) + self.assertEqual(11 // 3, 3) + + self.assertEqual(-12 // -3, 4) + self.assertEqual(-12 // 3, -4) + self.assertEqual(12 // -3, -4) + self.assertEqual(12 // 3, 4) + def check_truediv(self, a, b, skip_small=True): """Verify that the result of a/b is correctly rounded, by comparing it with a pure Python implementation of correctly @@ -845,6 +906,21 @@ class LongTest(unittest.TestCase): self.check_truediv(-x, y) self.check_truediv(-x, -y) + def test_lshift_of_zero(self): + self.assertEqual(0 << 0, 0) + self.assertEqual(0 << 10, 0) + with self.assertRaises(ValueError): + 0 << -1 + + @support.cpython_only + def test_huge_lshift_of_zero(self): + # Shouldn't try to allocate memory for a huge shift. See issue #27870. + # Other implementations may have a different boundary for overflow, + # or not raise at all. + self.assertEqual(0 << sys.maxsize, 0) + with self.assertRaises(OverflowError): + 0 << (sys.maxsize + 1) + def test_small_ints(self): for i in range(-5, 257): self.assertIs(i, i + 0) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py index b69da06..d7a8576 100644 --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -1,6 +1,7 @@ import _compression from io import BytesIO, UnsupportedOperation, DEFAULT_BUFFER_SIZE import os +import pathlib import pickle import random import unittest @@ -526,6 +527,16 @@ class FileTestCase(unittest.TestCase): with LZMAFile(BytesIO(), "a") as f: pass + def test_init_with_PathLike_filename(self): + filename = pathlib.Path(TESTFN) + with TempFile(filename, COMPRESSED_XZ): + with LZMAFile(filename) as f: + self.assertEqual(f.read(), INPUT) + with LZMAFile(filename, "a") as f: + f.write(INPUT) + with LZMAFile(filename) as f: + self.assertEqual(f.read(), INPUT * 2) + def test_init_with_filename(self): with TempFile(TESTFN, COMPRESSED_XZ): with LZMAFile(TESTFN) as f: @@ -973,11 +984,11 @@ class FileTestCase(unittest.TestCase): def test_decompress_limited(self): """Decompressed data buffering should be limited""" - bomb = lzma.compress(bytes(int(2e6)), preset=6) + bomb = lzma.compress(b'\0' * int(2e6), preset=6) self.assertLess(len(bomb), _compression.BUFFER_SIZE) decomp = LZMAFile(BytesIO(bomb)) - self.assertEqual(bytes(1), decomp.read(1)) + self.assertEqual(decomp.read(1), b'\0') max_decomp = 1 + DEFAULT_BUFFER_SIZE self.assertLessEqual(decomp._buffer.raw.tell(), max_decomp, "Excessive amount of data was decompressed") @@ -1218,6 +1229,17 @@ class OpenTestCase(unittest.TestCase): with lzma.open(TESTFN, "rb") as f: self.assertEqual(f.read(), INPUT * 2) + def test_with_pathlike_filename(self): + filename = pathlib.Path(TESTFN) + with TempFile(filename): + with lzma.open(filename, "wb") as f: + f.write(INPUT) + with open(filename, "rb") as f: + file_data = lzma.decompress(f.read()) + self.assertEqual(file_data, INPUT) + with lzma.open(filename, "rb") as f: + self.assertEqual(f.read(), INPUT) + def test_bad_params(self): # Test invalid parameter combinations. with self.assertRaises(ValueError): diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py index 80bec7a..0698ff5 100644 --- a/Lib/test/test_macpath.py +++ b/Lib/test/test_macpath.py @@ -1,5 +1,5 @@ import macpath -from test import support, test_genericpath +from test import test_genericpath import unittest diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 0991f74..aeabdbb 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -7,17 +7,12 @@ import email import email.message import re import io -import shutil import tempfile from test import support import unittest import textwrap import mailbox import glob -try: - import fcntl -except ImportError: - pass class TestBase: @@ -2273,12 +2268,18 @@ Gregory K. Johnson """) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {"linesep", "fcntl"} + support.check__all__(self, mailbox, blacklist=blacklist) + + def test_main(): tests = (TestMailboxSuperclass, TestMaildir, TestMbox, TestMMDF, TestMH, TestBabyl, TestMessage, TestMaildirMessage, TestMboxMessage, TestMHMessage, TestBabylMessage, TestMMDFMessage, TestMessageConversion, TestProxyFile, TestPartialFile, - MaildirTestCase, TestFakeMailBox) + MaildirTestCase, TestFakeMailBox, MiscTestCase) support.run_unittest(*tests) support.reap_children() diff --git a/Lib/test/test_mailcap.py b/Lib/test/test_mailcap.py index a85c691..c08423c 100644 --- a/Lib/test/test_mailcap.py +++ b/Lib/test/test_mailcap.py @@ -1,6 +1,5 @@ import mailcap import os -import shutil import copy import test.support import unittest @@ -123,7 +122,7 @@ class HelperFunctionTest(unittest.TestCase): (["echo foo", "audio/*", "foo.txt"], "echo foo"), (["echo %s", "audio/*", "foo.txt"], "echo foo.txt"), (["echo %t", "audio/*", "foo.txt"], "echo audio/*"), - (["echo \%t", "audio/*", "foo.txt"], "echo %t"), + (["echo \\%t", "audio/*", "foo.txt"], "echo %t"), (["echo foo", "audio/*", "foo.txt", plist], "echo foo"), (["echo %{total}", "audio/*", "foo.txt", plist], "echo 3") ] diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index c7def9a..b378ffe 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -135,6 +135,13 @@ class ContainerTestCase(unittest.TestCase, HelperMixin): for constructor in (set, frozenset): self.helper(constructor(self.d.keys())) + @support.cpython_only + def test_empty_frozenset_singleton(self): + # marshal.loads() must reuse the empty frozenset singleton + obj = frozenset() + obj2 = marshal.loads(marshal.dumps(obj)) + self.assertIs(obj2, obj) + class BufferTestCase(unittest.TestCase, HelperMixin): diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index a379a6a..eaa41bc 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -7,14 +7,15 @@ import unittest import math import os import platform -import sys import struct +import sys import sysconfig eps = 1E-05 NAN = float('nan') INF = float('inf') NINF = float('-inf') +FLOAT_MAX = sys.float_info.max # detect evidence of double-rounding: fsum is not always correctly # rounded on machines that suffer from double rounding. @@ -30,6 +31,7 @@ test_dir = os.path.dirname(file) or os.curdir math_testcases = os.path.join(test_dir, 'math_testcases.txt') test_file = os.path.join(test_dir, 'cmath_testcases.txt') + def to_ulps(x): """Convert a non-NaN float x to an integer, in such a way that adjacent floats are converted to adjacent integers. Then @@ -37,25 +39,39 @@ def to_ulps(x): floats. The results from this function will only make sense on platforms - where C doubles are represented in IEEE 754 binary64 format. + where native doubles are represented in IEEE 754 binary64 format. + Note: 0.0 and -0.0 are converted to 0 and -1, respectively. """ n = struct.unpack(' eps: - # Use %r instead of %f so the error message - # displays full precision. Otherwise discrepancies - # in the last few bits will lead to very confusing - # error messages - self.fail('%s returned %r, expected %r' % - (name, value, expected)) + def ftest(self, name, got, expected, ulp_tol=5, abs_tol=0.0): + """Compare arguments expected and got, as floats, if either + is a float, using a tolerance expressed in multiples of + ulp(expected) or absolutely, whichever is greater. + + As a convenience, when neither argument is a float, and for + non-finite floats, exact equality is demanded. Also, nan==nan + in this function. + """ + failure = result_check(expected, got, ulp_tol, abs_tol) + if failure is not None: + self.fail("{}: {}".format(name, failure)) def testConstants(self): - self.ftest('pi', math.pi, 3.1415926) - self.ftest('e', math.e, 2.7182818) + # Ref: Abramowitz & Stegun (Dover, 1965) + self.ftest('pi', math.pi, 3.141592653589793238462643) + self.ftest('e', math.e, 2.718281828459045235360287) + self.assertEqual(math.tau, 2*math.pi) def testAcos(self): self.assertRaises(TypeError, math.acos) @@ -205,6 +272,8 @@ class MathTests(unittest.TestCase): self.ftest('acos(1)', math.acos(1), 0) self.assertRaises(ValueError, math.acos, INF) self.assertRaises(ValueError, math.acos, NINF) + self.assertRaises(ValueError, math.acos, 1 + eps) + self.assertRaises(ValueError, math.acos, -1 - eps) self.assertTrue(math.isnan(math.acos(NAN))) def testAcosh(self): @@ -224,6 +293,8 @@ class MathTests(unittest.TestCase): self.ftest('asin(1)', math.asin(1), math.pi/2) self.assertRaises(ValueError, math.asin, INF) self.assertRaises(ValueError, math.asin, NINF) + self.assertRaises(ValueError, math.asin, 1 + eps) + self.assertRaises(ValueError, math.asin, -1 - eps) self.assertTrue(math.isnan(math.asin(NAN))) def testAsinh(self): @@ -378,9 +449,9 @@ class MathTests(unittest.TestCase): def testCos(self): self.assertRaises(TypeError, math.cos) - self.ftest('cos(-pi/2)', math.cos(-math.pi/2), 0) + self.ftest('cos(-pi/2)', math.cos(-math.pi/2), 0, abs_tol=ulp(1)) self.ftest('cos(0)', math.cos(0), 1) - self.ftest('cos(pi/2)', math.cos(math.pi/2), 0) + self.ftest('cos(pi/2)', math.cos(math.pi/2), 0, abs_tol=ulp(1)) self.ftest('cos(pi)', math.cos(math.pi), -1) try: self.assertTrue(math.isnan(math.cos(INF))) @@ -403,6 +474,7 @@ class MathTests(unittest.TestCase): self.ftest('degrees(pi)', math.degrees(math.pi), 180.0) self.ftest('degrees(pi/2)', math.degrees(math.pi/2), 90.0) self.ftest('degrees(-pi/4)', math.degrees(-math.pi/4), -45.0) + self.ftest('degrees(0)', math.degrees(0), 0) def testExp(self): self.assertRaises(TypeError, math.exp) @@ -412,6 +484,7 @@ class MathTests(unittest.TestCase): self.assertEqual(math.exp(INF), INF) self.assertEqual(math.exp(NINF), 0.) self.assertTrue(math.isnan(math.exp(NAN))) + self.assertRaises(OverflowError, math.exp, 1000000) def testFabs(self): self.assertRaises(TypeError, math.fabs) @@ -654,6 +727,7 @@ class MathTests(unittest.TestCase): self.assertEqual(math.hypot(INF, NAN), INF) self.assertEqual(math.hypot(NAN, NINF), INF) self.assertEqual(math.hypot(NINF, NAN), INF) + self.assertRaises(OverflowError, math.hypot, FLOAT_MAX, FLOAT_MAX) self.assertTrue(math.isnan(math.hypot(1.0, NAN))) self.assertTrue(math.isnan(math.hypot(NAN, -2.0))) @@ -707,8 +781,10 @@ class MathTests(unittest.TestCase): def testLog1p(self): self.assertRaises(TypeError, math.log1p) - n= 2**90 - self.assertAlmostEqual(math.log1p(n), math.log1p(float(n))) + for n in [2, 2**90, 2**300]: + self.assertAlmostEqual(math.log1p(n), math.log1p(float(n))) + self.assertRaises(ValueError, math.log1p, -1) + self.assertEqual(math.log1p(INF), INF) @requires_IEEE_754 def testLog2(self): @@ -922,6 +998,7 @@ class MathTests(unittest.TestCase): self.ftest('radians(180)', math.radians(180), math.pi) self.ftest('radians(90)', math.radians(90), math.pi/2) self.ftest('radians(-45)', math.radians(-45), -math.pi/4) + self.ftest('radians(0)', math.radians(0), 0) def testSin(self): self.assertRaises(TypeError, math.sin) @@ -951,6 +1028,7 @@ class MathTests(unittest.TestCase): self.ftest('sqrt(1)', math.sqrt(1), 1) self.ftest('sqrt(4)', math.sqrt(4), 2) self.assertEqual(math.sqrt(INF), INF) + self.assertRaises(ValueError, math.sqrt, -1) self.assertRaises(ValueError, math.sqrt, NINF) self.assertTrue(math.isnan(math.sqrt(NAN))) @@ -970,7 +1048,8 @@ class MathTests(unittest.TestCase): def testTanh(self): self.assertRaises(TypeError, math.tanh) self.ftest('tanh(0)', math.tanh(0), 0) - self.ftest('tanh(1)+tanh(-1)', math.tanh(1)+math.tanh(-1), 0) + self.ftest('tanh(1)+tanh(-1)', math.tanh(1)+math.tanh(-1), 0, + abs_tol=ulp(1)) self.ftest('tanh(inf)', math.tanh(INF), 1) self.ftest('tanh(-inf)', math.tanh(NINF), -1) self.assertTrue(math.isnan(math.tanh(NAN))) @@ -1020,7 +1099,8 @@ class MathTests(unittest.TestCase): def testIsnan(self): self.assertTrue(math.isnan(float("nan"))) - self.assertTrue(math.isnan(float("inf")* 0.)) + self.assertTrue(math.isnan(float("-nan"))) + self.assertTrue(math.isnan(float("inf") * 0.)) self.assertFalse(math.isnan(float("inf"))) self.assertFalse(math.isnan(0.)) self.assertFalse(math.isnan(1.)) @@ -1084,30 +1164,64 @@ class MathTests(unittest.TestCase): @requires_IEEE_754 def test_testfile(self): + # Some tests need to be skipped on ancient OS X versions. + # See issue #27953. + SKIP_ON_TIGER = {'tan0064'} + + osx_version = None + if sys.platform == 'darwin': + version_txt = platform.mac_ver()[0] + try: + osx_version = tuple(map(int, version_txt.split('.'))) + except ValueError: + pass + + fail_fmt = "{}: {}({!r}): {}" + + failures = [] for id, fn, ar, ai, er, ei, flags in parse_testfile(test_file): - # Skip if either the input or result is complex, or if - # flags is nonempty - if ai != 0. or ei != 0. or flags: + # Skip if either the input or result is complex + if ai != 0.0 or ei != 0.0: continue if fn in ['rect', 'polar']: # no real versions of rect, polar continue + # Skip certain tests on OS X 10.4. + if osx_version is not None and osx_version < (10, 5): + if id in SKIP_ON_TIGER: + continue + func = getattr(math, fn) + + if 'invalid' in flags or 'divide-by-zero' in flags: + er = 'ValueError' + elif 'overflow' in flags: + er = 'OverflowError' + try: result = func(ar) - except ValueError as exc: - message = (("Unexpected ValueError: %s\n " + - "in test %s:%s(%r)\n") % (exc.args[0], id, fn, ar)) - self.fail(message) + except ValueError: + result = 'ValueError' except OverflowError: - message = ("Unexpected OverflowError in " + - "test %s:%s(%r)\n" % (id, fn, ar)) - self.fail(message) - self.ftest("%s:%s(%r)" % (id, fn, ar), result, er) + result = 'OverflowError' + + # Default tolerances + ulp_tol, abs_tol = 5, 0.0 + + failure = result_check(er, result, ulp_tol, abs_tol) + if failure is None: + continue + + msg = fail_fmt.format(id, fn, ar, failure) + failures.append(msg) + + if failures: + self.fail('Failures in test_testfile:\n ' + + '\n '.join(failures)) @requires_IEEE_754 def test_mtestfile(self): - fail_fmt = "{}:{}({!r}): expected {!r}, got {!r}" + fail_fmt = "{}: {}({!r}): {}" failures = [] for id, fn, arg, expected, flags in parse_mtestfile(math_testcases): @@ -1125,41 +1239,48 @@ class MathTests(unittest.TestCase): except OverflowError: got = 'OverflowError' - accuracy_failure = None - if isinstance(got, float) and isinstance(expected, float): - if math.isnan(expected) and math.isnan(got): - continue - if not math.isnan(expected) and not math.isnan(got): - if fn == 'lgamma': - # we use a weaker accuracy test for lgamma; - # lgamma only achieves an absolute error of - # a few multiples of the machine accuracy, in - # general. - accuracy_failure = acc_check(expected, got, - rel_err = 5e-15, - abs_err = 5e-15) - elif fn == 'erfc': - # erfc has less-than-ideal accuracy for large - # arguments (x ~ 25 or so), mainly due to the - # error involved in computing exp(-x*x). - # - # XXX Would be better to weaken this test only - # for large x, instead of for all x. - accuracy_failure = ulps_check(expected, got, 2000) - - else: - accuracy_failure = ulps_check(expected, got, 20) - if accuracy_failure is None: - continue - - if isinstance(got, str) and isinstance(expected, str): - if got == expected: - continue + # Default tolerances + ulp_tol, abs_tol = 5, 0.0 + + # Exceptions to the defaults + if fn == 'gamma': + # Experimental results on one platform gave + # an accuracy of <= 10 ulps across the entire float + # domain. We weaken that to require 20 ulp accuracy. + ulp_tol = 20 + + elif fn == 'lgamma': + # we use a weaker accuracy test for lgamma; + # lgamma only achieves an absolute error of + # a few multiples of the machine accuracy, in + # general. + abs_tol = 1e-15 + + elif fn == 'erfc' and arg >= 0.0: + # erfc has less-than-ideal accuracy for large + # arguments (x ~ 25 or so), mainly due to the + # error involved in computing exp(-x*x). + # + # Observed between CPython and mpmath at 25 dp: + # x < 0 : err <= 2 ulp + # 0 <= x < 1 : err <= 10 ulp + # 1 <= x < 10 : err <= 100 ulp + # 10 <= x < 20 : err <= 300 ulp + # 20 <= x : < 600 ulp + # + if arg < 1.0: + ulp_tol = 10 + elif arg < 10.0: + ulp_tol = 100 + else: + ulp_tol = 1000 + + failure = result_check(expected, got, ulp_tol, abs_tol) + if failure is None: + continue - fail_msg = fail_fmt.format(id, fn, arg, expected, got) - if accuracy_failure is not None: - fail_msg += ' ({})'.format(accuracy_failure) - failures.append(fail_msg) + msg = fail_fmt.format(id, fn, arg, failure) + failures.append(msg) if failures: self.fail('Failures in test_mtestfile:\n ' + @@ -1272,7 +1393,8 @@ class IsCloseTests(unittest.TestCase): decimal_examples = [(Decimal('1.00000001'), Decimal('1.0')), (Decimal('1.00000001e-20'), Decimal('1.0e-20')), - (Decimal('1.00000001e-100'), Decimal('1.0e-100'))] + (Decimal('1.00000001e-100'), Decimal('1.0e-100')), + (Decimal('1.00000001e20'), Decimal('1.0e20'))] self.assertAllClose(decimal_examples, rel_tol=1e-8) self.assertAllNotClose(decimal_examples, rel_tol=1e-9) @@ -1280,8 +1402,10 @@ class IsCloseTests(unittest.TestCase): # test with Fraction values from fractions import Fraction - # could use some more examples here! - fraction_examples = [(Fraction(1, 100000000) + 1, Fraction(1))] + fraction_examples = [ + (Fraction(1, 100000000) + 1, Fraction(1)), + (Fraction(100000001), Fraction(100000000)), + (Fraction(10**8 + 1, 10**28), Fraction(1, 10**20))] self.assertAllClose(fraction_examples, rel_tol=1e-8) self.assertAllNotClose(fraction_examples, rel_tol=1e-9) diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py index 6856593..4e2c908 100644 --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -101,5 +101,11 @@ class Win32MimeTypesTestCase(unittest.TestCase): eq(self.db.guess_type("image.jpg"), ("image/jpeg", None)) eq(self.db.guess_type("image.png"), ("image/png", None)) + +class MiscTestCase(unittest.TestCase): + def test__all__(self): + support.check__all__(self, mimetypes) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index f3f70cc..56d85e7 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -713,6 +713,13 @@ class MmapTests(unittest.TestCase): gc_collect() self.assertIs(wr(), None) + def test_write_returning_the_number_of_bytes_written(self): + mm = mmap.mmap(-1, 16) + self.assertEqual(mm.write(b""), 0) + self.assertEqual(mm.write(b"x"), 1) + self.assertEqual(mm.write(b"yz"), 2) + self.assertEqual(mm.write(b"python"), 6) + @unittest.skipIf(os.name == 'nt', 'cannot resize anonymous mmaps on Windows') def test_resize_past_pos(self): m = mmap.mmap(-1, 8192) diff --git a/Lib/test/test_msilib.py b/Lib/test/test_msilib.py index 8ef334f..f656f72 100644 --- a/Lib/test/test_msilib.py +++ b/Lib/test/test_msilib.py @@ -1,6 +1,5 @@ """ Test suite for the code in msilib """ import unittest -import os from test.support import import_module msilib = import_module('msilib') diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py index 8d7a213..01a1cd3 100644 --- a/Lib/test/test_multibytecodec.py +++ b/Lib/test/test_multibytecodec.py @@ -5,7 +5,7 @@ from test import support from test.support import TESTFN -import unittest, io, codecs, sys, os +import unittest, io, codecs, sys import _multibytecodec ALL_CJKENCODINGS = [ diff --git a/Lib/test/test_multiprocessing_fork.py b/Lib/test/test_multiprocessing_fork.py index 2bf4e75..9f22500 100644 --- a/Lib/test/test_multiprocessing_fork.py +++ b/Lib/test/test_multiprocessing_fork.py @@ -1,6 +1,12 @@ import unittest import test._test_multiprocessing +from test import support + +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") + + test._test_multiprocessing.install_tests_in_module_dict(globals(), 'fork') if __name__ == '__main__': diff --git a/Lib/test/test_multiprocessing_forkserver.py b/Lib/test/test_multiprocessing_forkserver.py index 193a04a..407bb3f 100644 --- a/Lib/test/test_multiprocessing_forkserver.py +++ b/Lib/test/test_multiprocessing_forkserver.py @@ -1,6 +1,11 @@ import unittest import test._test_multiprocessing +from test import support + +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") + test._test_multiprocessing.install_tests_in_module_dict(globals(), 'forkserver') if __name__ == '__main__': diff --git a/Lib/test/test_multiprocessing_main_handling.py b/Lib/test/test_multiprocessing_main_handling.py index 52273ea..32593da 100644 --- a/Lib/test/test_multiprocessing_main_handling.py +++ b/Lib/test/test_multiprocessing_main_handling.py @@ -6,7 +6,6 @@ support.import_module('_multiprocessing') import importlib import importlib.machinery -import zipimport import unittest import sys import os @@ -15,7 +14,10 @@ import py_compile from test.support.script_helper import ( make_pkg, make_script, make_zip_pkg, make_zip_script, - assert_python_ok, assert_python_failure, spawn_python, kill_python) + assert_python_ok) + +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") # Look up which start methods are available to test import multiprocessing diff --git a/Lib/test/test_multiprocessing_spawn.py b/Lib/test/test_multiprocessing_spawn.py index 334ae9e..6558952 100644 --- a/Lib/test/test_multiprocessing_spawn.py +++ b/Lib/test/test_multiprocessing_spawn.py @@ -1,6 +1,11 @@ import unittest import test._test_multiprocessing +from test import support + +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") + test._test_multiprocessing.install_tests_in_module_dict(globals(), 'spawn') if __name__ == '__main__': diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py index 387a4e7..21074c6 100644 --- a/Lib/test/test_nis.py +++ b/Lib/test/test_nis.py @@ -1,6 +1,5 @@ from test import support import unittest -import sys # Skip test if nis module does not exist. nis = support.import_module('nis') diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index 22fb45a..feaba3c 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -132,8 +132,6 @@ class NetworkedNNTPTestsMixin: self.assertLessEqual(art_num, last) self._check_art_dict(art_dict) - @unittest.skipIf(True, 'temporarily skipped until a permanent solution' - ' is found for issue #28971') def test_over(self): resp, count, first, last, name = self.server.group(self.GROUP_NAME) start = last - 10 @@ -286,12 +284,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase): def setUpClass(cls): support.requires("network") with support.transient_internet(cls.NNTP_HOST): - try: - cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT, - usenetrc=False) - except EOFError: - raise unittest.SkipTest("%s got EOF error on connecting " - "to %r" % (cls, cls.NNTP_HOST)) + cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT, usenetrc=False) @classmethod def tearDownClass(cls): @@ -1549,8 +1542,10 @@ class LocalServerTests(unittest.TestCase): elif cmd == b'STARTTLS\r\n': reader.close() client.sendall(b'382 Begin TLS negotiation now\r\n') - client = ssl.wrap_socket( - client, server_side=True, certfile=certfile) + context = ssl.SSLContext() + context.load_cert_chain(certfile) + client = context.wrap_socket( + client, server_side=True) cleanup.enter_context(client) reader = cleanup.enter_context(client.makefile('rb')) elif cmd == b'QUIT\r\n': diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py index 40d5894..5b590e1 100644 --- a/Lib/test/test_normalization.py +++ b/Lib/test/test_normalization.py @@ -3,7 +3,6 @@ import unittest from http.client import HTTPException import sys -import os from unicodedata import normalize, unidata_version TESTDATAFILE = "NormalizationTest.txt" @@ -37,23 +36,15 @@ def unistr(data): class NormalizationTest(unittest.TestCase): def test_main(self): + part = None + part1_data = {} # Hit the exception early try: testdata = open_urlresource(TESTDATAURL, encoding="utf-8", check=check_version) - except PermissionError: - self.skipTest("Permission error when downloading %s " - "into the test data directory" % TESTDATAURL) except (OSError, HTTPException): - self.fail("Could not retrieve %s" % TESTDATAURL) - - with testdata: - self.run_normalization_tests(testdata) - - def run_normalization_tests(self, testdata): - part = None - part1_data = {} - + self.skipTest("Could not retrieve " + TESTDATAURL) + self.addCleanup(testdata.close) for line in testdata: if '#' in line: line = line.split('#')[0] diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 580f203..90edb6d 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -452,5 +452,88 @@ class NtCommonTest(test_genericpath.CommonTest, unittest.TestCase): attributes = ['relpath', 'splitunc'] +class PathLikeTests(unittest.TestCase): + + path = ntpath + + class PathLike: + def __init__(self, path=''): + self.path = path + def __fspath__(self): + if isinstance(self.path, BaseException): + raise self.path + else: + return self.path + + def setUp(self): + self.file_name = support.TESTFN.lower() + self.file_path = self.PathLike(support.TESTFN) + self.addCleanup(support.unlink, self.file_name) + with open(self.file_name, 'xb', 0) as file: + file.write(b"test_ntpath.PathLikeTests") + + def assertPathEqual(self, func): + self.assertEqual(func(self.file_path), func(self.file_name)) + + def test_path_normcase(self): + self.assertPathEqual(self.path.normcase) + + def test_path_isabs(self): + self.assertPathEqual(self.path.isabs) + + def test_path_join(self): + self.assertEqual(self.path.join('a', self.PathLike('b'), 'c'), + self.path.join('a', 'b', 'c')) + + def test_path_split(self): + self.assertPathEqual(self.path.split) + + def test_path_splitext(self): + self.assertPathEqual(self.path.splitext) + + def test_path_splitdrive(self): + self.assertPathEqual(self.path.splitdrive) + + def test_path_basename(self): + self.assertPathEqual(self.path.basename) + + def test_path_dirname(self): + self.assertPathEqual(self.path.dirname) + + def test_path_islink(self): + self.assertPathEqual(self.path.islink) + + def test_path_lexists(self): + self.assertPathEqual(self.path.lexists) + + def test_path_ismount(self): + self.assertPathEqual(self.path.ismount) + + def test_path_expanduser(self): + self.assertPathEqual(self.path.expanduser) + + def test_path_expandvars(self): + self.assertPathEqual(self.path.expandvars) + + def test_path_normpath(self): + self.assertPathEqual(self.path.normpath) + + def test_path_abspath(self): + self.assertPathEqual(self.path.abspath) + + def test_path_realpath(self): + self.assertPathEqual(self.path.realpath) + + def test_path_relpath(self): + self.assertPathEqual(self.path.relpath) + + def test_path_commonpath(self): + common_path = self.path.commonpath([self.file_path, self.file_name]) + self.assertEqual(common_path, self.file_name) + + def test_path_isdir(self): + self.assertPathEqual(self.path.isdir) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_opcodes.py b/Lib/test/test_opcodes.py index 6ef93d9..6806c61 100644 --- a/Lib/test/test_opcodes.py +++ b/Lib/test/test_opcodes.py @@ -1,6 +1,7 @@ # Python test set -- part 2, opcodes import unittest +from test import ann_module class OpcodeTest(unittest.TestCase): @@ -20,6 +21,32 @@ class OpcodeTest(unittest.TestCase): if n != 90: self.fail('try inside for') + def test_setup_annotations_line(self): + # check that SETUP_ANNOTATIONS does not create spurious line numbers + try: + with open(ann_module.__file__) as f: + txt = f.read() + co = compile(txt, ann_module.__file__, 'exec') + self.assertEqual(co.co_firstlineno, 6) + except OSError: + pass + + def test_no_annotations_if_not_needed(self): + class C: pass + with self.assertRaises(AttributeError): + C.__annotations__ + + def test_use_existing_annotations(self): + ns = {'__annotations__': {1: 2}} + exec('x: int', ns) + self.assertEqual(ns['__annotations__'], {'x': int, 1: 2}) + + def test_do_not_recreate_annotations(self): + class C: + del __annotations__ + with self.assertRaises(NameError): + x: int + def test_raise_class_exceptions(self): class AClass(Exception): pass diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py index b5ba976..6254091 100644 --- a/Lib/test/test_operator.py +++ b/Lib/test/test_operator.py @@ -120,63 +120,63 @@ class OperatorTestCase: operator = self.module self.assertRaises(TypeError, operator.add) self.assertRaises(TypeError, operator.add, None, None) - self.assertTrue(operator.add(3, 4) == 7) + self.assertEqual(operator.add(3, 4), 7) def test_bitwise_and(self): operator = self.module self.assertRaises(TypeError, operator.and_) self.assertRaises(TypeError, operator.and_, None, None) - self.assertTrue(operator.and_(0xf, 0xa) == 0xa) + self.assertEqual(operator.and_(0xf, 0xa), 0xa) def test_concat(self): operator = self.module self.assertRaises(TypeError, operator.concat) self.assertRaises(TypeError, operator.concat, None, None) - self.assertTrue(operator.concat('py', 'thon') == 'python') - self.assertTrue(operator.concat([1, 2], [3, 4]) == [1, 2, 3, 4]) - self.assertTrue(operator.concat(Seq1([5, 6]), Seq1([7])) == [5, 6, 7]) - self.assertTrue(operator.concat(Seq2([5, 6]), Seq2([7])) == [5, 6, 7]) + self.assertEqual(operator.concat('py', 'thon'), 'python') + self.assertEqual(operator.concat([1, 2], [3, 4]), [1, 2, 3, 4]) + self.assertEqual(operator.concat(Seq1([5, 6]), Seq1([7])), [5, 6, 7]) + self.assertEqual(operator.concat(Seq2([5, 6]), Seq2([7])), [5, 6, 7]) self.assertRaises(TypeError, operator.concat, 13, 29) def test_countOf(self): operator = self.module self.assertRaises(TypeError, operator.countOf) self.assertRaises(TypeError, operator.countOf, None, None) - self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 3) == 1) - self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 5) == 0) + self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 3), 1) + self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 5), 0) def test_delitem(self): operator = self.module a = [4, 3, 2, 1] self.assertRaises(TypeError, operator.delitem, a) self.assertRaises(TypeError, operator.delitem, a, None) - self.assertTrue(operator.delitem(a, 1) is None) - self.assertTrue(a == [4, 2, 1]) + self.assertIsNone(operator.delitem(a, 1)) + self.assertEqual(a, [4, 2, 1]) def test_floordiv(self): operator = self.module self.assertRaises(TypeError, operator.floordiv, 5) self.assertRaises(TypeError, operator.floordiv, None, None) - self.assertTrue(operator.floordiv(5, 2) == 2) + self.assertEqual(operator.floordiv(5, 2), 2) def test_truediv(self): operator = self.module self.assertRaises(TypeError, operator.truediv, 5) self.assertRaises(TypeError, operator.truediv, None, None) - self.assertTrue(operator.truediv(5, 2) == 2.5) + self.assertEqual(operator.truediv(5, 2), 2.5) def test_getitem(self): operator = self.module a = range(10) self.assertRaises(TypeError, operator.getitem) self.assertRaises(TypeError, operator.getitem, a, None) - self.assertTrue(operator.getitem(a, 2) == 2) + self.assertEqual(operator.getitem(a, 2), 2) def test_indexOf(self): operator = self.module self.assertRaises(TypeError, operator.indexOf) self.assertRaises(TypeError, operator.indexOf, None, None) - self.assertTrue(operator.indexOf([4, 3, 2, 1], 3) == 1) + self.assertEqual(operator.indexOf([4, 3, 2, 1], 3), 1) self.assertRaises(ValueError, operator.indexOf, [4, 3, 2, 1], 0) def test_invert(self): @@ -189,21 +189,21 @@ class OperatorTestCase: operator = self.module self.assertRaises(TypeError, operator.lshift) self.assertRaises(TypeError, operator.lshift, None, 42) - self.assertTrue(operator.lshift(5, 1) == 10) - self.assertTrue(operator.lshift(5, 0) == 5) + self.assertEqual(operator.lshift(5, 1), 10) + self.assertEqual(operator.lshift(5, 0), 5) self.assertRaises(ValueError, operator.lshift, 2, -1) def test_mod(self): operator = self.module self.assertRaises(TypeError, operator.mod) self.assertRaises(TypeError, operator.mod, None, 42) - self.assertTrue(operator.mod(5, 2) == 1) + self.assertEqual(operator.mod(5, 2), 1) def test_mul(self): operator = self.module self.assertRaises(TypeError, operator.mul) self.assertRaises(TypeError, operator.mul, None, None) - self.assertTrue(operator.mul(5, 2) == 10) + self.assertEqual(operator.mul(5, 2), 10) def test_matmul(self): operator = self.module @@ -227,7 +227,7 @@ class OperatorTestCase: operator = self.module self.assertRaises(TypeError, operator.or_) self.assertRaises(TypeError, operator.or_, None, None) - self.assertTrue(operator.or_(0xa, 0x5) == 0xf) + self.assertEqual(operator.or_(0xa, 0x5), 0xf) def test_pos(self): operator = self.module @@ -250,8 +250,8 @@ class OperatorTestCase: operator = self.module self.assertRaises(TypeError, operator.rshift) self.assertRaises(TypeError, operator.rshift, None, 42) - self.assertTrue(operator.rshift(5, 1) == 2) - self.assertTrue(operator.rshift(5, 0) == 5) + self.assertEqual(operator.rshift(5, 1), 2) + self.assertEqual(operator.rshift(5, 0), 5) self.assertRaises(ValueError, operator.rshift, 2, -1) def test_contains(self): @@ -266,15 +266,15 @@ class OperatorTestCase: a = list(range(3)) self.assertRaises(TypeError, operator.setitem, a) self.assertRaises(TypeError, operator.setitem, a, None, None) - self.assertTrue(operator.setitem(a, 0, 2) is None) - self.assertTrue(a == [2, 1, 2]) + self.assertIsNone(operator.setitem(a, 0, 2)) + self.assertEqual(a, [2, 1, 2]) self.assertRaises(IndexError, operator.setitem, a, 4, 2) def test_sub(self): operator = self.module self.assertRaises(TypeError, operator.sub) self.assertRaises(TypeError, operator.sub, None, None) - self.assertTrue(operator.sub(5, 2) == 3) + self.assertEqual(operator.sub(5, 2), 3) def test_truth(self): operator = self.module @@ -292,7 +292,7 @@ class OperatorTestCase: operator = self.module self.assertRaises(TypeError, operator.xor) self.assertRaises(TypeError, operator.xor, None, None) - self.assertTrue(operator.xor(0xb, 0xc) == 0x7) + self.assertEqual(operator.xor(0xb, 0xc), 0x7) def test_is(self): operator = self.module diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py index 7621c24..91a0319 100644 --- a/Lib/test/test_optparse.py +++ b/Lib/test/test_optparse.py @@ -16,6 +16,7 @@ from io import StringIO from test import support +import optparse from optparse import make_option, Option, \ TitledHelpFormatter, OptionParser, OptionGroup, \ SUPPRESS_USAGE, OptionError, OptionConflictError, \ @@ -1650,6 +1651,12 @@ class TestParseNumber(BaseTest): "option -l: invalid integer value: '0x12x'") +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'check_builtin', 'AmbiguousOptionError', 'NO_DEFAULT'} + support.check__all__(self, optparse, blacklist=blacklist) + + def test_main(): support.run_unittest(__name__) diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py index 901d4b2..a35ed12 100644 --- a/Lib/test/test_ordered_dict.py +++ b/Lib/test/test_ordered_dict.py @@ -1,3 +1,4 @@ +import builtins import contextlib import copy import gc @@ -97,6 +98,19 @@ class OrderedDictTests: self.assertRaises(TypeError, OrderedDict().update, (), ()) self.assertRaises(TypeError, OrderedDict.update) + def test_init_calls(self): + calls = [] + class Spam: + def keys(self): + calls.append('keys') + return () + def items(self): + calls.append('items') + return () + + self.OrderedDict(Spam()) + self.assertEqual(calls, ['keys']) + def test_fromkeys(self): OrderedDict = self.OrderedDict od = OrderedDict.fromkeys('abc') @@ -298,9 +312,11 @@ class OrderedDictTests: # do not save instance dictionary if not needed pairs = [('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)] od = OrderedDict(pairs) + self.assertIsInstance(od.__dict__, dict) self.assertIsNone(od.__reduce__()[2]) od.x = 10 - self.assertIsNotNone(od.__reduce__()[2]) + self.assertEqual(od.__dict__['x'], 10) + self.assertEqual(od.__reduce__()[2], {'x': 10}) def test_pickle_recursive(self): OrderedDict = self.OrderedDict @@ -403,6 +419,14 @@ class OrderedDictTests: od = OrderedDict(**d) self.assertGreater(sys.getsizeof(od), sys.getsizeof(d)) + def test_views(self): + OrderedDict = self.OrderedDict + # See http://bugs.python.org/issue24286 + s = 'the quick brown fox jumped over a lazy dog yesterday before dawn'.split() + od = OrderedDict.fromkeys(s) + self.assertEqual(od.keys(), dict(od).keys()) + self.assertEqual(od.items(), dict(od).items()) + def test_override_update(self): OrderedDict = self.OrderedDict # Verify that subclasses can override update() without breaking __init__() @@ -611,6 +635,25 @@ class PurePythonOrderedDictTests(OrderedDictTests, unittest.TestCase): OrderedDict = py_coll.OrderedDict +class CPythonBuiltinDictTests(unittest.TestCase): + """Builtin dict preserves insertion order. + + Reuse some of tests in OrderedDict selectively. + """ + + module = builtins + OrderedDict = dict + +for method in ( + "test_init test_update test_abc test_clear test_delitem " + + "test_setitem test_detect_deletion_during_iteration " + + "test_popitem test_reinsert test_override_update " + + "test_highly_nested test_highly_nested_subclass " + + "test_delitem_hash_collision ").split(): + setattr(CPythonBuiltinDictTests, method, getattr(OrderedDictTests, method)) +del method + + @unittest.skipUnless(c_coll, 'requires the C version of the collections module') class CPythonOrderedDictTests(OrderedDictTests, unittest.TestCase): @@ -625,18 +668,20 @@ class CPythonOrderedDictTests(OrderedDictTests, unittest.TestCase): size = support.calcobjsize check = self.check_sizeof - basicsize = size('n2P' + '3PnPn2P') + calcsize('2nPn') - entrysize = calcsize('n2P') + calcsize('P') + basicsize = size('nQ2P' + '3PnPn2P') + calcsize('2nP2n') + + entrysize = calcsize('n2P') + p = calcsize('P') nodesize = calcsize('Pn2P') od = OrderedDict() - check(od, basicsize + 8*entrysize) + check(od, basicsize + 8*p + 8 + 5*entrysize) # 8byte indicies + 8*2//3 * entry table od.x = 1 - check(od, basicsize + 8*entrysize) + check(od, basicsize + 8*p + 8 + 5*entrysize) od.update([(i, i) for i in range(3)]) - check(od, basicsize + 8*entrysize + 3*nodesize) + check(od, basicsize + 8*p + 8 + 5*entrysize + 3*nodesize) od.update([(i, i) for i in range(3, 10)]) - check(od, basicsize + 16*entrysize + 10*nodesize) + check(od, basicsize + 16*p + 16 + 10*entrysize + 10*nodesize) check(od.keys(), size('P')) check(od.items(), size('P')) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index bb5d2e3..e9fdb07 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -15,7 +15,6 @@ import locale import mmap import os import pickle -import platform import re import shutil import signal @@ -57,7 +56,7 @@ except ImportError: try: import pwd all_users = [u.pw_uid for u in pwd.getpwall()] -except ImportError: +except (ImportError, AttributeError): all_users = [] try: from _testcapi import INT_MAX, PY_SSIZE_T_MAX @@ -65,6 +64,8 @@ except ImportError: INT_MAX = PY_SSIZE_T_MAX = sys.maxsize from test.support.script_helper import assert_python_ok +from test.support import unix_shell + root_in_posix = False if hasattr(os, 'geteuid'): @@ -82,6 +83,32 @@ else: # Issue #14110: Some tests fail on FreeBSD if the user is in the wheel group. HAVE_WHEEL_GROUP = sys.platform.startswith('freebsd') and os.getgid() == 0 + +@contextlib.contextmanager +def ignore_deprecation_warnings(msg_regex, quiet=False): + with support.check_warnings((msg_regex, DeprecationWarning), quiet=quiet): + yield + + +def requires_os_func(name): + return unittest.skipUnless(hasattr(os, name), 'requires os.%s' % name) + + +class _PathLike(os.PathLike): + + def __init__(self, path=""): + self.path = path + + def __str__(self): + return str(self.path) + + def __fspath__(self): + if isinstance(self.path, BaseException): + raise self.path + else: + return self.path + + def create_file(filename, content=b'content'): with open(filename, "xb", 0) as fp: fp.write(content) @@ -145,9 +172,8 @@ class FileTests(unittest.TestCase): "needs INT_MAX < PY_SSIZE_T_MAX") @support.bigmemtest(size=INT_MAX + 10, memuse=1, dry_run=False) def test_large_read(self, size): - with open(support.TESTFN, "wb") as fp: - fp.write(b'test') self.addCleanup(support.unlink, support.TESTFN) + create_file(support.TESTFN, b'test') # Issue #21932: Make sure that os.read() does not raise an # OverflowError for size larger than INT_MAX @@ -204,11 +230,12 @@ class FileTests(unittest.TestCase): def test_replace(self): TESTFN2 = support.TESTFN + ".2" - with open(support.TESTFN, 'w') as f: - f.write("1") - with open(TESTFN2, 'w') as f: - f.write("2") - self.addCleanup(os.unlink, TESTFN2) + self.addCleanup(support.unlink, support.TESTFN) + self.addCleanup(support.unlink, TESTFN2) + + create_file(support.TESTFN, b"1") + create_file(TESTFN2, b"2") + os.replace(support.TESTFN, TESTFN2) self.assertRaises(FileNotFoundError, os.stat, support.TESTFN) with open(TESTFN2, 'r') as f: @@ -309,9 +336,7 @@ class StatAttributeTests(unittest.TestCase): fname = self.fname.encode(sys.getfilesystemencoding()) except UnicodeEncodeError: self.skipTest("cannot encode %a for the filesystem" % self.fname) - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - self.check_stat_attributes(fname) + self.check_stat_attributes(fname) def test_stat_result_pickle(self): result = os.stat(self.fname) @@ -448,9 +473,7 @@ class StatAttributeTests(unittest.TestCase): # force CreateFile to fail with ERROR_ACCESS_DENIED. DETACHED_PROCESS = 8 subprocess.check_call( - # bpo-30584: Use security identifier *S-1-5-32-545 instead - # of localized "Users" to not depend on the locale. - ['icacls.exe', fname, '/deny', '*S-1-5-32-545:(S)'], + ['icacls.exe', fname, '/deny', 'Users:(S)'], creationflags=DETACHED_PROCESS ) result = os.stat(fname) @@ -464,19 +487,14 @@ class UtimeTests(unittest.TestCase): self.addCleanup(support.rmtree, self.dirname) os.mkdir(self.dirname) - with open(self.fname, 'wb') as fp: - fp.write(b"ABC") + create_file(self.fname) def restore_float_times(state): - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - + with ignore_deprecation_warnings('stat_float_times'): os.stat_float_times(state) # ensure that st_atime and st_mtime are float - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - + with ignore_deprecation_warnings('stat_float_times'): old_float_times = os.stat_float_times(-1) self.addCleanup(restore_float_times, old_float_times) @@ -568,7 +586,7 @@ class UtimeTests(unittest.TestCase): "fd support for utime required for this test.") def test_utime_fd(self): def set_time(filename, ns): - with open(filename, 'wb') as fp: + with open(filename, 'wb', 0) as fp: # use a file descriptor to test futimens(timespec) # or futimes(timeval) os.utime(fp.fileno(), ns=ns) @@ -680,18 +698,20 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol): return os.environ # Bug 1110478 - @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh') + @unittest.skipUnless(unix_shell and os.path.exists(unix_shell), + 'requires a shell') def test_update2(self): os.environ.clear() os.environ.update(HELLO="World") - with os.popen("/bin/sh -c 'echo $HELLO'") as popen: + with os.popen("%s -c 'echo $HELLO'" % unix_shell) as popen: value = popen.read().strip() self.assertEqual(value, "World") - @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh') + @unittest.skipUnless(unix_shell and os.path.exists(unix_shell), + 'requires a shell') def test_os_popen_iter(self): - with os.popen( - "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen: + with os.popen("%s -c 'echo \"line1\nline2\nline3\"'" + % unix_shell) as popen: it = iter(popen) self.assertEqual(next(it), "line1\n") self.assertEqual(next(it), "line2\n") @@ -809,30 +829,6 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol): self.assertIs(cm.exception.args[0], missing) self.assertTrue(cm.exception.__suppress_context__) - def _test_environ_iteration(self, collection): - iterator = iter(collection) - new_key = "__new_key__" - - next(iterator) # start iteration over os.environ.items - - # add a new key in os.environ mapping - os.environ[new_key] = "test_environ_iteration" - - try: - next(iterator) # force iteration over modified mapping - self.assertEqual(os.environ[new_key], "test_environ_iteration") - finally: - del os.environ[new_key] - - def test_iter_error_when_changing_os_environ(self): - self._test_environ_iteration(os.environ) - - def test_iter_error_when_changing_os_environ_items(self): - self._test_environ_iteration(os.environ.items()) - - def test_iter_error_when_changing_os_environ_values(self): - self._test_environ_iteration(os.environ.values()) - class WalkTests(unittest.TestCase): """Tests for os.walk().""" @@ -846,6 +842,7 @@ class WalkTests(unittest.TestCase): def setUp(self): join = os.path.join + self.addCleanup(support.rmtree, support.TESTFN) # Build: # TESTFN/ @@ -868,11 +865,11 @@ class WalkTests(unittest.TestCase): self.sub1_path = join(self.walk_path, "SUB1") self.sub11_path = join(self.sub1_path, "SUB11") sub2_path = join(self.walk_path, "SUB2") - self.sub21_path = join(sub2_path, "SUB21") + sub21_path = join(sub2_path, "SUB21") tmp1_path = join(self.walk_path, "tmp1") tmp2_path = join(self.sub1_path, "tmp2") tmp3_path = join(sub2_path, "tmp3") - tmp5_path = join(self.sub21_path, "tmp3") + tmp5_path = join(sub21_path, "tmp3") self.link_path = join(sub2_path, "link") t2_path = join(support.TESTFN, "TEST2") tmp4_path = join(support.TESTFN, "TEST2", "tmp4") @@ -883,7 +880,7 @@ class WalkTests(unittest.TestCase): # Create stuff. os.makedirs(self.sub11_path) os.makedirs(sub2_path) - os.makedirs(self.sub21_path) + os.makedirs(sub21_path) os.makedirs(t2_path) for path in tmp1_path, tmp2_path, tmp3_path, tmp4_path, tmp5_path: @@ -901,16 +898,15 @@ class WalkTests(unittest.TestCase): else: self.sub2_tree = (sub2_path, [], ["tmp3"]) - os.chmod(self.sub21_path, 0) + os.chmod(sub21_path, 0) try: - os.listdir(self.sub21_path) + os.listdir(sub21_path) except PermissionError: - pass + self.addCleanup(os.chmod, sub21_path, stat.S_IRWXU) else: - os.chmod(self.sub21_path, stat.S_IRWXU) + os.chmod(sub21_path, stat.S_IRWXU) os.unlink(tmp5_path) - os.rmdir(self.sub21_path) - self.sub21_path = None + os.rmdir(sub21_path) del self.sub2_tree[1][:1] def test_walk_topdown(self): @@ -930,10 +926,12 @@ class WalkTests(unittest.TestCase): self.assertEqual(all[2 + flipped], (self.sub11_path, [], [])) self.assertEqual(all[3 - 2 * flipped], self.sub2_tree) - def test_walk_prune(self): + def test_walk_prune(self, walk_path=None): + if walk_path is None: + walk_path = self.walk_path # Prune the search. all = [] - for root, dirs, files in self.walk(self.walk_path): + for root, dirs, files in self.walk(walk_path): all.append((root, dirs, files)) # Don't descend into SUB1. if 'SUB1' in dirs: @@ -942,17 +940,20 @@ class WalkTests(unittest.TestCase): self.assertEqual(len(all), 2) self.assertEqual(all[0], - (self.walk_path, ["SUB2"], ["tmp1"])) + (str(walk_path), ["SUB2"], ["tmp1"])) all[1][-1].sort() all[1][1].sort() self.assertEqual(all[1], self.sub2_tree) + def test_file_like_path(self): + self.test_walk_prune(_PathLike(self.walk_path)) + def test_walk_bottom_up(self): # Walk bottom-up. all = list(self.walk(self.walk_path, topdown=False)) - self.assertEqual(len(all), 4) + self.assertEqual(len(all), 4, all) # We can't know which order SUB1 and SUB2 will appear in. # Not flipped: SUB11, SUB1, SUB2, TESTFN # flipped: SUB2, SUB11, SUB1, TESTFN @@ -983,24 +984,6 @@ class WalkTests(unittest.TestCase): else: self.fail("Didn't follow symlink with followlinks=True") - def tearDown(self): - # Tear everything down. This is a decent use for bottom-up on - # Windows, which doesn't have a recursive delete command. The - # (not so) subtlety is that rmdir will fail unless the dir's - # kids are removed first, so bottom up is essential. - if self.sub21_path: - os.chmod(self.sub21_path, stat.S_IRWXU) - for root, dirs, files in os.walk(support.TESTFN, topdown=False): - for name in files: - os.remove(os.path.join(root, name)) - for name in dirs: - dirname = os.path.join(root, name) - if not os.path.islink(dirname): - os.rmdir(dirname) - else: - os.remove(dirname) - os.rmdir(support.TESTFN) - def test_walk_bad_dir(self): # Walk top-down. errors = [] @@ -1088,29 +1071,11 @@ class FwalkTests(WalkTests): self.addCleanup(os.close, newfd) self.assertEqual(newfd, minfd) - def tearDown(self): - # cleanup - if self.sub21_path: - os.chmod(self.sub21_path, stat.S_IRWXU) - for root, dirs, files, rootfd in os.fwalk(support.TESTFN, topdown=False): - for name in files: - os.unlink(name, dir_fd=rootfd) - for name in dirs: - st = os.stat(name, dir_fd=rootfd, follow_symlinks=False) - if stat.S_ISDIR(st.st_mode): - os.rmdir(name, dir_fd=rootfd) - else: - os.unlink(name, dir_fd=rootfd) - os.rmdir(support.TESTFN) - class BytesWalkTests(WalkTests): """Tests for os.walk() with bytes.""" def setUp(self): super().setUp() self.stack = contextlib.ExitStack() - if os.name == 'nt': - self.stack.enter_context(warnings.catch_warnings()) - warnings.simplefilter("ignore", DeprecationWarning) def tearDown(self): self.stack.close() @@ -1287,8 +1252,7 @@ class RemoveDirsTests(unittest.TestCase): os.mkdir(dira) dirb = os.path.join(dira, 'dirb') os.mkdir(dirb) - with open(os.path.join(dira, 'file.txt'), 'w') as f: - f.write('text') + create_file(os.path.join(dira, 'file.txt')) os.removedirs(dirb) self.assertFalse(os.path.exists(dirb)) self.assertTrue(os.path.exists(dira)) @@ -1299,8 +1263,7 @@ class RemoveDirsTests(unittest.TestCase): os.mkdir(dira) dirb = os.path.join(dira, 'dirb') os.mkdir(dirb) - with open(os.path.join(dirb, 'file.txt'), 'w') as f: - f.write('text') + create_file(os.path.join(dirb, 'file.txt')) with self.assertRaises(OSError): os.removedirs(dirb) self.assertTrue(os.path.exists(dirb)) @@ -1310,7 +1273,7 @@ class RemoveDirsTests(unittest.TestCase): class DevNullTests(unittest.TestCase): def test_devnull(self): - with open(os.devnull, 'wb') as f: + with open(os.devnull, 'wb', 0) as f: f.write(b'hello') f.close() with open(os.devnull, 'rb') as f: @@ -1327,6 +1290,7 @@ class URandomTests(unittest.TestCase): def test_urandom_value(self): data1 = os.urandom(16) + self.assertIsInstance(data1, bytes) data2 = os.urandom(16) self.assertNotEqual(data1, data2) @@ -1347,6 +1311,49 @@ class URandomTests(unittest.TestCase): self.assertNotEqual(data1, data2) +@unittest.skipUnless(hasattr(os, 'getrandom'), 'need os.getrandom()') +class GetRandomTests(unittest.TestCase): + @classmethod + def setUpClass(cls): + try: + os.getrandom(1) + except OSError as exc: + if exc.errno == errno.ENOSYS: + # Python compiled on a more recent Linux version + # than the current Linux kernel + raise unittest.SkipTest("getrandom() syscall fails with ENOSYS") + else: + raise + + def test_getrandom_type(self): + data = os.getrandom(16) + self.assertIsInstance(data, bytes) + self.assertEqual(len(data), 16) + + def test_getrandom0(self): + empty = os.getrandom(0) + self.assertEqual(empty, b'') + + def test_getrandom_random(self): + self.assertTrue(hasattr(os, 'GRND_RANDOM')) + + # Don't test os.getrandom(1, os.GRND_RANDOM) to not consume the rare + # resource /dev/random + + def test_getrandom_nonblock(self): + # The call must not fail. Check also that the flag exists + try: + os.getrandom(1, os.GRND_NONBLOCK) + except BlockingIOError: + # System urandom is not initialized yet + pass + + def test_getrandom_value(self): + data1 = os.getrandom(16) + data2 = os.getrandom(16) + self.assertNotEqual(data1, data2) + + # os.urandom() doesn't use a file descriptor when it is implemented with the # getentropy() function, the getrandom() function or the getrandom() syscall OS_URANDOM_DONT_USE_FD = ( @@ -1397,9 +1404,9 @@ class URandomFDTests(unittest.TestCase): def test_urandom_fd_reopened(self): # Issue #21207: urandom() should detect its fd to /dev/urandom # changed to something else, and reopen it. - with open(support.TESTFN, 'wb') as f: - f.write(b"x" * 256) - self.addCleanup(os.unlink, support.TESTFN) + self.addCleanup(support.unlink, support.TESTFN) + create_file(support.TESTFN, b"x" * 256) + code = """if 1: import os import sys @@ -1416,7 +1423,12 @@ class URandomFDTests(unittest.TestCase): break os.closerange(3, 256) with open({TESTFN!r}, 'rb') as f: - os.dup2(f.fileno(), fd) + new_fd = f.fileno() + # Issue #26935: posix allows new_fd and fd to be equal but + # some libc implementations have dup2 return an error in this + # case. + if new_fd != fd: + os.dup2(new_fd, fd) sys.stdout.buffer.write(os.urandom(4)) sys.stdout.buffer.write(os.urandom(4)) """.format(TESTFN=support.TESTFN) @@ -1461,6 +1473,7 @@ def _execvpe_mockup(defpath=None): os.execve = orig_execve os.defpath = orig_defpath + class ExecTests(unittest.TestCase): @unittest.skipIf(USING_LINUXTHREADS, "avoid triggering a linuxthreads bug: see issue #4970") @@ -1468,8 +1481,16 @@ class ExecTests(unittest.TestCase): self.assertRaises(OSError, os.execvpe, 'no such app-', ['no such app-'], None) + def test_execv_with_bad_arglist(self): + self.assertRaises(ValueError, os.execv, 'notepad', ()) + self.assertRaises(ValueError, os.execv, 'notepad', []) + self.assertRaises(ValueError, os.execv, 'notepad', ('',)) + self.assertRaises(ValueError, os.execv, 'notepad', ['']) + def test_execvpe_with_bad_arglist(self): self.assertRaises(ValueError, os.execvpe, 'notepad', [], None) + self.assertRaises(ValueError, os.execvpe, 'notepad', [], {}) + self.assertRaises(ValueError, os.execvpe, 'notepad', [''], {}) @unittest.skipUnless(hasattr(os, '_execvpe'), "No internal os._execvpe function to test.") @@ -1525,30 +1546,21 @@ class ExecTests(unittest.TestCase): if os.name != "nt": self._test_internal_execvpe(bytes) - def test_execve_invalid_env(self): - args = [sys.executable, '-c', 'pass'] - - # null character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT\0VEGETABLE"] = "cabbage" - with self.assertRaises(ValueError): - os.execve(args[0], args, newenv) - - # null character in the enviroment variable value - newenv = os.environ.copy() - newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" - with self.assertRaises(ValueError): - os.execve(args[0], args, newenv) - - # equal character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT=ORANGE"] = "lemon" - with self.assertRaises(ValueError): - os.execve(args[0], args, newenv) - @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests") class Win32ErrorTests(unittest.TestCase): + def setUp(self): + try: + os.stat(support.TESTFN) + except FileNotFoundError: + exists = False + except OSError as exc: + exists = True + self.fail("file %s must not exist; os.stat failed with %s" + % (support.TESTFN, exc)) + else: + self.fail("file %s must not exist" % support.TESTFN) + def test_rename(self): self.assertRaises(OSError, os.rename, support.TESTFN, support.TESTFN+".bak") @@ -1559,12 +1571,10 @@ class Win32ErrorTests(unittest.TestCase): self.assertRaises(OSError, os.chdir, support.TESTFN) def test_mkdir(self): - f = open(support.TESTFN, "w") - try: + self.addCleanup(support.unlink, support.TESTFN) + + with open(support.TESTFN, "x") as f: self.assertRaises(OSError, os.mkdir, support.TESTFN) - finally: - f.close() - os.unlink(support.TESTFN) def test_utime(self): self.assertRaises(OSError, os.utime, support.TESTFN, None) @@ -1572,6 +1582,7 @@ class Win32ErrorTests(unittest.TestCase): def test_chmod(self): self.assertRaises(OSError, os.chmod, support.TESTFN, 0) + class TestInvalidFD(unittest.TestCase): singles = ["fchdir", "dup", "fdopen", "fdatasync", "fstat", "fstatvfs", "fsync", "tcgetpgrp", "ttyname"] @@ -1683,12 +1694,9 @@ class LinkTests(unittest.TestCase): os.unlink(file) def _test_link(self, file1, file2): - with open(file1, "w") as f1: - f1.write("test") + create_file(file1) - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - os.link(file1, file2) + os.link(file1, file2) with open(file1, "r") as f1, open(file2, "r") as f2: self.assertTrue(os.path.sameopenfile(f1.fileno(), f2.fileno())) @@ -1979,6 +1987,7 @@ class Win32ListdirTests(unittest.TestCase): self.assertEqual( sorted(os.listdir(support.TESTFN)), self.created_paths) + # bytes self.assertEqual( sorted(os.listdir(os.fsencode(support.TESTFN))), @@ -1992,6 +2001,7 @@ class Win32ListdirTests(unittest.TestCase): self.assertEqual( sorted(os.listdir(path)), self.created_paths) + # bytes path = b'\\\\?\\' + os.fsencode(os.path.abspath(support.TESTFN)) self.assertEqual( @@ -2071,51 +2081,43 @@ class Win32SymlinkTests(unittest.TestCase): self.assertNotEqual(os.lstat(link), os.stat(link)) bytes_link = os.fsencode(link) - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - self.assertEqual(os.stat(bytes_link), os.stat(target)) - self.assertNotEqual(os.lstat(bytes_link), os.stat(bytes_link)) + self.assertEqual(os.stat(bytes_link), os.stat(target)) + self.assertNotEqual(os.lstat(bytes_link), os.stat(bytes_link)) def test_12084(self): level1 = os.path.abspath(support.TESTFN) level2 = os.path.join(level1, "level2") level3 = os.path.join(level2, "level3") - try: - os.mkdir(level1) - os.mkdir(level2) - os.mkdir(level3) + self.addCleanup(support.rmtree, level1) - file1 = os.path.abspath(os.path.join(level1, "file1")) + os.mkdir(level1) + os.mkdir(level2) + os.mkdir(level3) - with open(file1, "w") as f: - f.write("file1") + file1 = os.path.abspath(os.path.join(level1, "file1")) + create_file(file1) - orig_dir = os.getcwd() - try: - os.chdir(level2) - link = os.path.join(level2, "link") - os.symlink(os.path.relpath(file1), "link") - self.assertIn("link", os.listdir(os.getcwd())) - - # Check os.stat calls from the same dir as the link - self.assertEqual(os.stat(file1), os.stat("link")) - - # Check os.stat calls from a dir below the link - os.chdir(level1) - self.assertEqual(os.stat(file1), - os.stat(os.path.relpath(link))) - - # Check os.stat calls from a dir above the link - os.chdir(level3) - self.assertEqual(os.stat(file1), - os.stat(os.path.relpath(link))) - finally: - os.chdir(orig_dir) - except OSError as err: - self.fail(err) + orig_dir = os.getcwd() + try: + os.chdir(level2) + link = os.path.join(level2, "link") + os.symlink(os.path.relpath(file1), "link") + self.assertIn("link", os.listdir(os.getcwd())) + + # Check os.stat calls from the same dir as the link + self.assertEqual(os.stat(file1), os.stat("link")) + + # Check os.stat calls from a dir below the link + os.chdir(level1) + self.assertEqual(os.stat(file1), + os.stat(os.path.relpath(link))) + + # Check os.stat calls from a dir above the link + os.chdir(level3) + self.assertEqual(os.stat(file1), + os.stat(os.path.relpath(link))) finally: - os.remove(file1) - shutil.rmtree(level1) + os.chdir(orig_dir) @unittest.skipUnless(sys.platform == "win32", "Win32 specific tests") @@ -2153,7 +2155,7 @@ class Win32JunctionTests(unittest.TestCase): class NonLocalSymlinkTests(unittest.TestCase): def setUp(self): - """ + r""" Create this structure: base @@ -2224,66 +2226,136 @@ class PidTests(unittest.TestCase): def test_waitpid(self): args = [sys.executable, '-c', 'pass'] - pid = os.spawnv(os.P_NOWAIT, args[0], args) + # Add an implicit test for PyUnicode_FSConverter(). + pid = os.spawnv(os.P_NOWAIT, _PathLike(args[0]), args) status = os.waitpid(pid, 0) self.assertEqual(status, (pid, 0)) class SpawnTests(unittest.TestCase): - def _test_invalid_env(self, spawn): - args = [sys.executable, '-c', 'pass'] + def create_args(self, *, with_env=False, use_bytes=False): + self.exitcode = 17 - # null character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT\0VEGETABLE"] = "cabbage" - try: - exitcode = spawn(os.P_WAIT, args[0], args, newenv) - except ValueError: - pass - else: - self.assertEqual(exitcode, 127) - - # null character in the enviroment variable value - newenv = os.environ.copy() - newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" - try: - exitcode = spawn(os.P_WAIT, args[0], args, newenv) - except ValueError: - pass - else: - self.assertEqual(exitcode, 127) - - # equal character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT=ORANGE"] = "lemon" - try: - exitcode = spawn(os.P_WAIT, args[0], args, newenv) - except ValueError: - pass - else: - self.assertEqual(exitcode, 127) - - # equal character in the enviroment variable value filename = support.TESTFN self.addCleanup(support.unlink, filename) - with open(filename, "w") as fp: - fp.write('import sys, os\n' - 'if os.getenv("FRUIT") != "orange=lemon":\n' - ' raise AssertionError') - args = [sys.executable, filename] - newenv = os.environ.copy() - newenv["FRUIT"] = "orange=lemon" - exitcode = spawn(os.P_WAIT, args[0], args, newenv) - self.assertEqual(exitcode, 0) - @unittest.skipUnless(hasattr(os, 'spawnve'), "test needs os.spawnve") - def test_spawnve_invalid_env(self): - self._test_invalid_env(os.spawnve) + if not with_env: + code = 'import sys; sys.exit(%s)' % self.exitcode + else: + self.env = dict(os.environ) + # create an unique key + self.key = str(uuid.uuid4()) + self.env[self.key] = self.key + # read the variable from os.environ to check that it exists + code = ('import sys, os; magic = os.environ[%r]; sys.exit(%s)' + % (self.key, self.exitcode)) - @unittest.skipUnless(hasattr(os, 'spawnvpe'), "test needs os.spawnvpe") - def test_spawnvpe_invalid_env(self): - self._test_invalid_env(os.spawnvpe) + with open(filename, "w") as fp: + fp.write(code) + args = [sys.executable, filename] + if use_bytes: + args = [os.fsencode(a) for a in args] + self.env = {os.fsencode(k): os.fsencode(v) + for k, v in self.env.items()} + + return args + + @requires_os_func('spawnl') + def test_spawnl(self): + args = self.create_args() + exitcode = os.spawnl(os.P_WAIT, args[0], *args) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnle') + def test_spawnle(self): + args = self.create_args(with_env=True) + exitcode = os.spawnle(os.P_WAIT, args[0], *args, self.env) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnlp') + def test_spawnlp(self): + args = self.create_args() + exitcode = os.spawnlp(os.P_WAIT, args[0], *args) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnlpe') + def test_spawnlpe(self): + args = self.create_args(with_env=True) + exitcode = os.spawnlpe(os.P_WAIT, args[0], *args, self.env) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnv') + def test_spawnv(self): + args = self.create_args() + exitcode = os.spawnv(os.P_WAIT, args[0], args) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnve') + def test_spawnve(self): + args = self.create_args(with_env=True) + exitcode = os.spawnve(os.P_WAIT, args[0], args, self.env) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnvp') + def test_spawnvp(self): + args = self.create_args() + exitcode = os.spawnvp(os.P_WAIT, args[0], args) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnvpe') + def test_spawnvpe(self): + args = self.create_args(with_env=True) + exitcode = os.spawnvpe(os.P_WAIT, args[0], args, self.env) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnv') + def test_nowait(self): + args = self.create_args() + pid = os.spawnv(os.P_NOWAIT, args[0], args) + result = os.waitpid(pid, 0) + self.assertEqual(result[0], pid) + status = result[1] + if hasattr(os, 'WIFEXITED'): + self.assertTrue(os.WIFEXITED(status)) + self.assertEqual(os.WEXITSTATUS(status), self.exitcode) + else: + self.assertEqual(status, self.exitcode << 8) + + @requires_os_func('spawnve') + def test_spawnve_bytes(self): + # Test bytes handling in parse_arglist and parse_envlist (#28114) + args = self.create_args(with_env=True, use_bytes=True) + exitcode = os.spawnve(os.P_WAIT, args[0], args, self.env) + self.assertEqual(exitcode, self.exitcode) + + @requires_os_func('spawnl') + def test_spawnl_noargs(self): + args = self.create_args() + self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, args[0]) + self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, args[0], '') + + @requires_os_func('spawnle') + def test_spawnle_noargs(self): + args = self.create_args() + self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, args[0], {}) + self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, args[0], '', {}) + + @requires_os_func('spawnv') + def test_spawnv_noargs(self): + args = self.create_args() + self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], ()) + self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], []) + self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], ('',)) + self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], ['']) + + @requires_os_func('spawnve') + def test_spawnve_noargs(self): + args = self.create_args() + self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], (), {}) + self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], [], {}) + self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], ('',), {}) + self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], [''], {}) # The introduction of this TestCase caused at least two different errors on # *nix buildbots. Temporarily skip this to let the buildbots move along. @@ -2307,8 +2379,8 @@ class ProgramPriorityTests(unittest.TestCase): try: new_prio = os.getpriority(os.PRIO_PROCESS, os.getpid()) if base >= 19 and new_prio <= 19: - raise unittest.SkipTest( - "unable to reliably test setpriority at current nice level of %s" % base) + raise unittest.SkipTest("unable to reliably test setpriority " + "at current nice level of %s" % base) else: self.assertEqual(new_prio, base + 1) finally: @@ -2418,8 +2490,7 @@ class TestSendfile(unittest.TestCase): @classmethod def setUpClass(cls): cls.key = support.threading_setup() - with open(support.TESTFN, "wb") as f: - f.write(cls.DATA) + create_file(support.TESTFN, cls.DATA) @classmethod def tearDownClass(cls): @@ -2443,7 +2514,6 @@ class TestSendfile(unittest.TestCase): self.client.close() if self.server.running: self.server.stop() - self.server = None def sendfile_wrapper(self, sock, file, offset, nbytes, headers=[], trailers=[]): """A higher level wrapper representing how an application is @@ -2570,10 +2640,11 @@ class TestSendfile(unittest.TestCase): def test_trailers(self): TESTFN2 = support.TESTFN + "2" file_data = b"abcdef" - with open(TESTFN2, 'wb') as f: - f.write(file_data) - with open(TESTFN2, 'rb')as f: - self.addCleanup(os.remove, TESTFN2) + + self.addCleanup(support.unlink, TESTFN2) + create_file(TESTFN2, file_data) + + with open(TESTFN2, 'rb') as f: os.sendfile(self.sockno, f.fileno(), 0, len(file_data), trailers=[b"1234"]) self.client.close() @@ -2596,35 +2667,37 @@ class TestSendfile(unittest.TestCase): def supports_extended_attributes(): if not hasattr(os, "setxattr"): return False + try: - with open(support.TESTFN, "wb") as fp: + with open(support.TESTFN, "xb", 0) as fp: try: os.setxattr(fp.fileno(), b"user.test", b"") except OSError: return False finally: support.unlink(support.TESTFN) - # Kernels < 2.6.39 don't respect setxattr flags. - kernel_version = platform.release() - m = re.match("2.6.(\d{1,2})", kernel_version) - return m is None or int(m.group(1)) >= 39 + + return True @unittest.skipUnless(supports_extended_attributes(), "no non-broken extended attribute support") +# Kernels < 2.6.39 don't respect setxattr flags. +@support.requires_linux_version(2, 6, 39) class ExtendedAttributeTests(unittest.TestCase): - def tearDown(self): - support.unlink(support.TESTFN) - def _check_xattrs_str(self, s, getxattr, setxattr, removexattr, listxattr, **kwargs): fn = support.TESTFN - open(fn, "wb").close() + self.addCleanup(support.unlink, fn) + create_file(fn) + with self.assertRaises(OSError) as cm: getxattr(fn, s("user.test"), **kwargs) self.assertEqual(cm.exception.errno, errno.ENODATA) + init_xattr = listxattr(fn) self.assertIsInstance(init_xattr, list) + setxattr(fn, s("user.test"), b"", **kwargs) xattr = set(init_xattr) xattr.add("user.test") @@ -2632,19 +2705,24 @@ class ExtendedAttributeTests(unittest.TestCase): self.assertEqual(getxattr(fn, b"user.test", **kwargs), b"") setxattr(fn, s("user.test"), b"hello", os.XATTR_REPLACE, **kwargs) self.assertEqual(getxattr(fn, b"user.test", **kwargs), b"hello") + with self.assertRaises(OSError) as cm: setxattr(fn, s("user.test"), b"bye", os.XATTR_CREATE, **kwargs) self.assertEqual(cm.exception.errno, errno.EEXIST) + with self.assertRaises(OSError) as cm: setxattr(fn, s("user.test2"), b"bye", os.XATTR_REPLACE, **kwargs) self.assertEqual(cm.exception.errno, errno.ENODATA) + setxattr(fn, s("user.test2"), b"foo", os.XATTR_CREATE, **kwargs) xattr.add("user.test2") self.assertEqual(set(listxattr(fn)), xattr) removexattr(fn, s("user.test"), **kwargs) + with self.assertRaises(OSError) as cm: getxattr(fn, s("user.test"), **kwargs) self.assertEqual(cm.exception.errno, errno.ENODATA) + xattr.remove("user.test") self.assertEqual(set(listxattr(fn)), xattr) self.assertEqual(getxattr(fn, s("user.test2"), **kwargs), b"foo") @@ -2657,11 +2735,11 @@ class ExtendedAttributeTests(unittest.TestCase): self.assertEqual(set(listxattr(fn)), set(init_xattr) | set(many)) def _check_xattrs(self, *args, **kwargs): - def make_bytes(s): - return bytes(s, "ascii") self._check_xattrs_str(str, *args, **kwargs) support.unlink(support.TESTFN) - self._check_xattrs_str(make_bytes, *args, **kwargs) + + self._check_xattrs_str(os.fsencode, *args, **kwargs) + support.unlink(support.TESTFN) def test_simple(self): self._check_xattrs(os.getxattr, os.setxattr, os.removexattr, @@ -2676,10 +2754,10 @@ class ExtendedAttributeTests(unittest.TestCase): with open(path, "rb") as fp: return os.getxattr(fp.fileno(), *args) def setxattr(path, *args): - with open(path, "wb") as fp: + with open(path, "wb", 0) as fp: os.setxattr(fp.fileno(), *args) def removexattr(path, *args): - with open(path, "wb") as fp: + with open(path, "wb", 0) as fp: os.removexattr(fp.fileno(), *args) def listxattr(path, *args): with open(path, "rb") as fp: @@ -2687,43 +2765,6 @@ class ExtendedAttributeTests(unittest.TestCase): self._check_xattrs(getxattr, setxattr, removexattr, listxattr) -@unittest.skipUnless(sys.platform == "win32", "Win32 specific tests") -class Win32DeprecatedBytesAPI(unittest.TestCase): - def test_deprecated(self): - import nt - filename = os.fsencode(support.TESTFN) - with warnings.catch_warnings(): - warnings.simplefilter("error", DeprecationWarning) - for func, *args in ( - (nt._getfullpathname, filename), - (nt._isdir, filename), - (os.access, filename, os.R_OK), - (os.chdir, filename), - (os.chmod, filename, 0o777), - (os.getcwdb,), - (os.link, filename, filename), - (os.listdir, filename), - (os.lstat, filename), - (os.mkdir, filename), - (os.open, filename, os.O_RDONLY), - (os.rename, filename, filename), - (os.rmdir, filename), - (os.startfile, filename), - (os.stat, filename), - (os.unlink, filename), - (os.utime, filename), - ): - self.assertRaises(DeprecationWarning, func, *args) - - @support.skip_unless_symlink - def test_symlink(self): - filename = os.fsencode(support.TESTFN) - with warnings.catch_warnings(): - warnings.simplefilter("error", DeprecationWarning) - self.assertRaises(DeprecationWarning, - os.symlink, filename, filename) - - @unittest.skipUnless(hasattr(os, 'get_terminal_size'), "requires os.get_terminal_size") class TermsizeTests(unittest.TestCase): def test_does_not_crash(self): @@ -2786,6 +2827,7 @@ class OSErrorTests(unittest.TestCase): else: encoded = os.fsencode(support.TESTFN) self.bytes_filenames.append(encoded) + self.bytes_filenames.append(bytearray(encoded)) self.bytes_filenames.append(memoryview(encoded)) self.filenames = self.bytes_filenames + self.unicode_filenames @@ -2806,16 +2848,7 @@ class OSErrorTests(unittest.TestCase): (self.bytes_filenames, os.replace, b"dst"), (self.unicode_filenames, os.rename, "dst"), (self.unicode_filenames, os.replace, "dst"), - # Issue #16414: Don't test undecodable names with listdir() - # because of a Windows bug. - # - # With the ANSI code page 932, os.listdir(b'\xe7') return an - # empty list (instead of failing), whereas os.listdir(b'\xff') - # raises a FileNotFoundError. It looks like a Windows bug: - # b'\xe7' directory does not exist, FindFirstFileA(b'\xe7') - # fails with ERROR_FILE_NOT_FOUND (2), instead of - # ERROR_PATH_NOT_FOUND (3). - (self.unicode_filenames, os.listdir,), + (self.unicode_filenames, os.listdir, ), )) else: funcs.extend(( @@ -2856,12 +2889,19 @@ class OSErrorTests(unittest.TestCase): else: funcs.append((self.filenames, os.readlink,)) + for filenames, func, *func_args in funcs: for name in filenames: try: - func(name, *func_args) + if isinstance(name, (str, bytes)): + func(name, *func_args) + else: + with self.assertWarnsRegex(DeprecationWarning, 'should be'): + func(name, *func_args) except OSError as err: - self.assertIs(err.filename, name) + self.assertIs(err.filename, name, str(func)) + except UnicodeDecodeError: + pass else: self.fail("No exception thrown by {}".format(func)) @@ -2959,6 +2999,63 @@ class FDInheritanceTests(unittest.TestCase): self.assertEqual(os.get_inheritable(slave_fd), False) +class PathTConverterTests(unittest.TestCase): + # tuples of (function name, allows fd arguments, additional arguments to + # function, cleanup function) + functions = [ + ('stat', True, (), None), + ('lstat', False, (), None), + ('access', False, (os.F_OK,), None), + ('chflags', False, (0,), None), + ('lchflags', False, (0,), None), + ('open', False, (0,), getattr(os, 'close', None)), + ] + + def test_path_t_converter(self): + str_filename = support.TESTFN + if os.name == 'nt': + bytes_fspath = bytes_filename = None + else: + bytes_filename = support.TESTFN.encode('ascii') + bytes_fspath = _PathLike(bytes_filename) + fd = os.open(_PathLike(str_filename), os.O_WRONLY|os.O_CREAT) + self.addCleanup(support.unlink, support.TESTFN) + self.addCleanup(os.close, fd) + + int_fspath = _PathLike(fd) + str_fspath = _PathLike(str_filename) + + for name, allow_fd, extra_args, cleanup_fn in self.functions: + with self.subTest(name=name): + try: + fn = getattr(os, name) + except AttributeError: + continue + + for path in (str_filename, bytes_filename, str_fspath, + bytes_fspath): + if path is None: + continue + with self.subTest(name=name, path=path): + result = fn(path, *extra_args) + if cleanup_fn is not None: + cleanup_fn(result) + + with self.assertRaisesRegex( + TypeError, 'should be string, bytes'): + fn(int_fspath, *extra_args) + + if allow_fd: + result = fn(fd, *extra_args) # should not fail + if cleanup_fn is not None: + cleanup_fn(result) + else: + with self.assertRaisesRegex( + TypeError, + 'os.PathLike'): + fn(fd, *extra_args) + + @unittest.skipUnless(hasattr(os, 'get_blocking'), 'needs os.get_blocking() and os.set_blocking()') class BlockingTests(unittest.TestCase): @@ -2982,15 +3079,18 @@ class ExportsTests(unittest.TestCase): class TestScandir(unittest.TestCase): + check_no_resource_warning = support.check_no_resource_warning + def setUp(self): self.path = os.path.realpath(support.TESTFN) + self.bytes_path = os.fsencode(self.path) self.addCleanup(support.rmtree, self.path) os.mkdir(self.path) def create_file(self, name="file.txt"): - filename = os.path.join(self.path, name) - with open(filename, "wb") as fp: - fp.write(b'python') + path = self.bytes_path if isinstance(name, bytes) else self.path + filename = os.path.join(path, name) + create_file(filename, b'python') return filename def get_entries(self, names): @@ -3013,6 +3113,7 @@ class TestScandir(unittest.TestCase): self.assertEqual(stat1, stat2) def check_entry(self, entry, name, is_dir, is_file, is_symlink): + self.assertIsInstance(entry, os.DirEntry) self.assertEqual(entry.name, name) self.assertEqual(entry.path, os.path.join(self.path, name)) self.assertEqual(entry.inode(), @@ -3078,15 +3179,16 @@ class TestScandir(unittest.TestCase): self.check_entry(entry, 'symlink_file.txt', False, True, True) def get_entry(self, name): - entries = list(os.scandir(self.path)) + path = self.bytes_path if isinstance(name, bytes) else self.path + entries = list(os.scandir(path)) self.assertEqual(len(entries), 1) entry = entries[0] self.assertEqual(entry.name, name) return entry - def create_file_entry(self): - filename = self.create_file() + def create_file_entry(self, name='file.txt'): + filename = self.create_file(name=name) return self.get_entry(os.path.basename(filename)) def test_current_directory(self): @@ -3107,6 +3209,18 @@ class TestScandir(unittest.TestCase): entry = self.create_file_entry() self.assertEqual(repr(entry), "") + def test_fspath_protocol(self): + entry = self.create_file_entry() + self.assertEqual(os.fspath(entry), os.path.join(self.path, 'file.txt')) + + def test_fspath_protocol_bytes(self): + bytes_filename = os.fsencode('bytesfile.txt') + bytes_entry = self.create_file_entry(name=bytes_filename) + fspath = os.fspath(bytes_entry) + self.assertIsInstance(fspath, bytes) + self.assertEqual(fspath, + os.path.join(os.fsencode(self.path),bytes_filename)) + def test_removed_dir(self): path = os.path.join(self.path, 'dir') @@ -3170,11 +3284,6 @@ class TestScandir(unittest.TestCase): entry.stat(follow_symlinks=False) def test_bytes(self): - if os.name == "nt": - # On Windows, os.scandir(bytes) must raise an exception - self.assertRaises(TypeError, os.scandir, b'.') - return - self.create_file("file.txt") path_bytes = os.fsencode(self.path) @@ -3186,28 +3295,6 @@ class TestScandir(unittest.TestCase): self.assertEqual(entry.path, os.fsencode(os.path.join(self.path, 'file.txt'))) - def test_bytes_like(self): - if os.name == "nt": - # On Windows, os.scandir(bytes) must raise an exception - for cls in bytearray, memoryview: - self.assertRaises(TypeError, os.scandir, cls(b'.')) - return - - # Deprecated in 3.6. - self.create_file("file.txt") - - for cls in bytearray, memoryview: - path_bytes = cls(os.fsencode(self.path)) - entries = list(os.scandir(path_bytes)) - self.assertEqual(len(entries), 1, entries) - entry = entries[0] - - self.assertEqual(entry.name, b'file.txt') - self.assertEqual(entry.path, - os.fsencode(os.path.join(self.path, 'file.txt'))) - self.assertIs(type(entry.name), bytes) - self.assertIs(type(entry.path), bytes) - def test_empty_path(self): self.assertRaises(FileNotFoundError, os.scandir, '') @@ -3226,6 +3313,112 @@ class TestScandir(unittest.TestCase): for obj in [1234, 1.234, {}, []]: self.assertRaises(TypeError, os.scandir, obj) + def test_close(self): + self.create_file("file.txt") + self.create_file("file2.txt") + iterator = os.scandir(self.path) + next(iterator) + iterator.close() + # multiple closes + iterator.close() + with self.check_no_resource_warning(): + del iterator + + def test_context_manager(self): + self.create_file("file.txt") + self.create_file("file2.txt") + with os.scandir(self.path) as iterator: + next(iterator) + with self.check_no_resource_warning(): + del iterator + + def test_context_manager_close(self): + self.create_file("file.txt") + self.create_file("file2.txt") + with os.scandir(self.path) as iterator: + next(iterator) + iterator.close() + + def test_context_manager_exception(self): + self.create_file("file.txt") + self.create_file("file2.txt") + with self.assertRaises(ZeroDivisionError): + with os.scandir(self.path) as iterator: + next(iterator) + 1/0 + with self.check_no_resource_warning(): + del iterator + + def test_resource_warning(self): + self.create_file("file.txt") + self.create_file("file2.txt") + iterator = os.scandir(self.path) + next(iterator) + with self.assertWarns(ResourceWarning): + del iterator + support.gc_collect() + # exhausted iterator + iterator = os.scandir(self.path) + list(iterator) + with self.check_no_resource_warning(): + del iterator + + +class TestPEP519(unittest.TestCase): + + # Abstracted so it can be overridden to test pure Python implementation + # if a C version is provided. + fspath = staticmethod(os.fspath) + + def test_return_bytes(self): + for b in b'hello', b'goodbye', b'some/path/and/file': + self.assertEqual(b, self.fspath(b)) + + def test_return_string(self): + for s in 'hello', 'goodbye', 'some/path/and/file': + self.assertEqual(s, self.fspath(s)) + + def test_fsencode_fsdecode(self): + for p in "path/like/object", b"path/like/object": + pathlike = _PathLike(p) + + self.assertEqual(p, self.fspath(pathlike)) + self.assertEqual(b"path/like/object", os.fsencode(pathlike)) + self.assertEqual("path/like/object", os.fsdecode(pathlike)) + + def test_pathlike(self): + self.assertEqual('#feelthegil', self.fspath(_PathLike('#feelthegil'))) + self.assertTrue(issubclass(_PathLike, os.PathLike)) + self.assertTrue(isinstance(_PathLike(), os.PathLike)) + + def test_garbage_in_exception_out(self): + vapor = type('blah', (), {}) + for o in int, type, os, vapor(): + self.assertRaises(TypeError, self.fspath, o) + + def test_argument_required(self): + self.assertRaises(TypeError, self.fspath) + + def test_bad_pathlike(self): + # __fspath__ returns a value other than str or bytes. + self.assertRaises(TypeError, self.fspath, _PathLike(42)) + # __fspath__ attribute that is not callable. + c = type('foo', (), {}) + c.__fspath__ = 1 + self.assertRaises(TypeError, self.fspath, c()) + # __fspath__ raises an exception. + self.assertRaises(ZeroDivisionError, self.fspath, + _PathLike(ZeroDivisionError())) + +# Only test if the C version is provided, otherwise TestPEP519 already tested +# the pure Python implementation. +if hasattr(os, "_fspath"): + class TestPEP519PurePython(TestPEP519): + + """Explicitly test the pure Python implementation of os.fspath().""" + + fspath = staticmethod(os._fspath) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index 42ce6b0..d6e6f71 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -1,8 +1,5 @@ -import copy import parser -import pickle import unittest -import sys import operator import struct from test import support @@ -141,6 +138,45 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase): self.check_suite("a = b") self.check_suite("a = b = c = d = e") + def test_var_annot(self): + self.check_suite("x: int = 5") + self.check_suite("y: List[T] = []; z: [list] = fun()") + self.check_suite("x: tuple = (1, 2)") + self.check_suite("d[f()]: int = 42") + self.check_suite("f(d[x]): str = 'abc'") + self.check_suite("x.y.z.w: complex = 42j") + self.check_suite("x: int") + self.check_suite("def f():\n" + " x: str\n" + " y: int = 5\n") + self.check_suite("class C:\n" + " x: str\n" + " y: int = 5\n") + self.check_suite("class C:\n" + " def __init__(self, x: int) -> None:\n" + " self.x: int = x\n") + # double check for nonsense + with self.assertRaises(SyntaxError): + exec("2+2: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("[]: int = 5", {}, {}) + with self.assertRaises(SyntaxError): + exec("x, *y, z: int = range(5)", {}, {}) + with self.assertRaises(SyntaxError): + exec("t: tuple = 1, 2", {}, {}) + with self.assertRaises(SyntaxError): + exec("u = v: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("False: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("x.False: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("x.y,: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("[0]: int", {}, {}) + with self.assertRaises(SyntaxError): + exec("f(): int", {}, {}) + def test_simple_augmented_assignments(self): self.check_suite("a += b") self.check_suite("a -= b") @@ -388,52 +424,6 @@ class IllegalSyntaxTestCase(unittest.TestCase): # not even remotely valid: self.check_bad_tree((1, 2, 3), "") - def test_illegal_terminal(self): - tree = \ - (257, - (269, - (270, - (271, - (277, - (1,))), - (4, ''))), - (4, ''), - (0, '')) - self.check_bad_tree(tree, "too small items in terminal node") - tree = \ - (257, - (269, - (270, - (271, - (277, - (1, b'pass'))), - (4, ''))), - (4, ''), - (0, '')) - self.check_bad_tree(tree, "non-string second item in terminal node") - tree = \ - (257, - (269, - (270, - (271, - (277, - (1, 'pass', '0', 0))), - (4, ''))), - (4, ''), - (0, '')) - self.check_bad_tree(tree, "non-integer third item in terminal node") - tree = \ - (257, - (269, - (270, - (271, - (277, - (1, 'pass', 0, 0))), - (4, ''))), - (4, ''), - (0, '')) - self.check_bad_tree(tree, "too many items in terminal node") - def test_illegal_yield_1(self): # Illegal yield statement: def f(): return 1; yield 1 tree = \ @@ -638,24 +628,6 @@ class IllegalSyntaxTestCase(unittest.TestCase): (4, ''), (0, '')) self.check_bad_tree(tree, "from import fred") - def test_illegal_encoding(self): - # Illegal encoding declaration - tree = \ - (338, - (257, (0, ''))) - self.check_bad_tree(tree, "missed encoding") - tree = \ - (338, - (257, (0, '')), - b'iso-8859-1') - self.check_bad_tree(tree, "non-string encoding") - tree = \ - (338, - (257, (0, '')), - '\udcff') - with self.assertRaises(UnicodeEncodeError): - parser.sequence2st(tree) - class CompileTestCase(unittest.TestCase): @@ -699,12 +671,18 @@ class CompileTestCase(unittest.TestCase): self.assertEqual(code.co_filename, '') code = st.compile() self.assertEqual(code.co_filename, '') - for filename in ('file.py', b'file.py', - bytearray(b'file.py'), memoryview(b'file.py')): + for filename in 'file.py', b'file.py': code = parser.compilest(st, filename) self.assertEqual(code.co_filename, 'file.py') code = st.compile(filename) self.assertEqual(code.co_filename, 'file.py') + for filename in bytearray(b'file.py'), memoryview(b'file.py'): + with self.assertWarns(DeprecationWarning): + code = parser.compilest(st, filename) + self.assertEqual(code.co_filename, 'file.py') + with self.assertWarns(DeprecationWarning): + code = st.compile(filename) + self.assertEqual(code.co_filename, 'file.py') self.assertRaises(TypeError, parser.compilest, st, list(b'file.py')) self.assertRaises(TypeError, st.compile, list(b'file.py')) @@ -794,21 +772,6 @@ class STObjectTestCase(unittest.TestCase): self.assertRaises(TypeError, operator.lt, st1, 1815) self.assertRaises(TypeError, operator.gt, b'waterloo', st2) - def test_copy_pickle(self): - sts = [ - parser.expr('2 + 3'), - parser.suite('x = 2; y = x + 3'), - parser.expr('list(x**3 for x in range(20))') - ] - for st in sts: - st_copy = copy.copy(st) - self.assertEqual(st_copy.totuple(), st.totuple()) - st_copy = copy.deepcopy(st) - self.assertEqual(st_copy.totuple(), st.totuple()) - for proto in range(pickle.HIGHEST_PROTOCOL+1): - st_copy = pickle.loads(pickle.dumps(st, proto)) - self.assertEqual(st_copy.totuple(), st.totuple()) - check_sizeof = support.check_sizeof @support.cpython_only diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 5e0708a..f98c1fe 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -8,7 +8,6 @@ import socket import stat import tempfile import unittest -from unittest import mock from test import support TESTFN = support.TESTFN @@ -191,13 +190,18 @@ class _BasePurePathTest(object): P = self.cls p = P('a') self.assertIsInstance(p, P) + class PathLike: + def __fspath__(self): + return "a/b/c" P('a', 'b', 'c') P('/a', 'b', 'c') P('a/b/c') P('/a/b/c') + P(PathLike()) self.assertEqual(P(P('a')), P('a')) self.assertEqual(P(P('a'), 'b'), P('a/b')) self.assertEqual(P(P('a'), P('b')), P('a/b')) + self.assertEqual(P(P('a'), P('b'), P('c')), P(PathLike())) def _check_str_subclass(self, *args): # Issue #21127: it should be possible to construct a PurePath object @@ -385,6 +389,12 @@ class _BasePurePathTest(object): parts = p.parts self.assertEqual(parts, (sep, 'a', 'b')) + def test_fspath_common(self): + P = self.cls + p = P('a/b') + self._check_str(p.__fspath__(), ('a/b',)) + self._check_str(os.fspath(p), ('a/b',)) + def test_equivalences(self): for k, tuples in self.equivalences.items(): canon = k.replace('/', self.sep) @@ -1475,21 +1485,30 @@ class _BasePathTest(object): self.assertEqual(set(p.glob("dirA/../file*")), { P(BASE, "dirA/../fileA") }) self.assertEqual(set(p.glob("../xyzzy")), set()) - def _check_resolve_relative(self, p, expected): - q = p.resolve() - self.assertEqual(q, expected) - def _check_resolve_absolute(self, p, expected): - q = p.resolve() + def _check_resolve(self, p, expected, strict=True): + q = p.resolve(strict) self.assertEqual(q, expected) + # this can be used to check both relative and absolute resolutions + _check_resolve_relative = _check_resolve_absolute = _check_resolve + @with_symlinks def test_resolve_common(self): P = self.cls p = P(BASE, 'foo') with self.assertRaises(OSError) as cm: - p.resolve() + p.resolve(strict=True) self.assertEqual(cm.exception.errno, errno.ENOENT) + # Non-strict + self.assertEqual(str(p.resolve(strict=False)), + os.path.join(BASE, 'foo')) + p = P(BASE, 'foo', 'in', 'spam') + self.assertEqual(str(p.resolve(strict=False)), + os.path.join(BASE, 'foo')) + p = P(BASE, '..', 'foo', 'in', 'spam') + self.assertEqual(str(p.resolve(strict=False)), + os.path.abspath(os.path.join('foo'))) # These are all relative symlinks p = P(BASE, 'dirB', 'fileB') self._check_resolve_relative(p, p) @@ -1499,6 +1518,18 @@ class _BasePathTest(object): self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB')) p = P(BASE, 'dirB', 'linkD', 'fileB') self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB')) + # Non-strict + p = P(BASE, 'dirA', 'linkC', 'fileB', 'foo', 'in', 'spam') + self._check_resolve_relative(p, P(BASE, 'dirB', 'fileB', 'foo'), False) + p = P(BASE, 'dirA', 'linkC', '..', 'foo', 'in', 'spam') + if os.name == 'nt': + # In Windows, if linkY points to dirB, 'dirA\linkY\..' + # resolves to 'dirA' without resolving linkY first. + self._check_resolve_relative(p, P(BASE, 'dirA', 'foo'), False) + else: + # In Posix, if linkY points to dirB, 'dirA/linkY/..' + # resolves to 'dirB/..' first before resolving to parent of dirB. + self._check_resolve_relative(p, P(BASE, 'foo'), False) # Now create absolute symlinks d = tempfile.mkdtemp(suffix='-dirD') self.addCleanup(support.rmtree, d) @@ -1506,6 +1537,18 @@ class _BasePathTest(object): os.symlink(join('dirB'), os.path.join(d, 'linkY')) p = P(BASE, 'dirA', 'linkX', 'linkY', 'fileB') self._check_resolve_absolute(p, P(BASE, 'dirB', 'fileB')) + # Non-strict + p = P(BASE, 'dirA', 'linkX', 'linkY', 'foo', 'in', 'spam') + self._check_resolve_relative(p, P(BASE, 'dirB', 'foo'), False) + p = P(BASE, 'dirA', 'linkX', 'linkY', '..', 'foo', 'in', 'spam') + if os.name == 'nt': + # In Windows, if linkY points to dirB, 'dirA\linkY\..' + # resolves to 'dirA' without resolving linkY first. + self._check_resolve_relative(p, P(d, 'foo'), False) + else: + # In Posix, if linkY points to dirB, 'dirA/linkY/..' + # resolves to 'dirB/..' first before resolving to parent of dirB. + self._check_resolve_relative(p, P(BASE, 'foo'), False) @with_symlinks def test_resolve_dot(self): @@ -1515,7 +1558,11 @@ class _BasePathTest(object): self.dirlink(os.path.join('0', '0'), join('1')) self.dirlink(os.path.join('1', '1'), join('2')) q = p / '2' - self.assertEqual(q.resolve(), p) + self.assertEqual(q.resolve(strict=True), p) + r = q / '3' / '4' + self.assertRaises(FileNotFoundError, r.resolve, strict=True) + # Non-strict + self.assertEqual(r.resolve(strict=False), p / '3') def test_with(self): p = self.cls(BASE) @@ -1728,22 +1775,6 @@ class _BasePathTest(object): self.assertTrue(p.exists()) self.assertEqual(p.stat().st_ctime, st_ctime_first) - def test_mkdir_exist_ok_root(self): - # Issue #25803: A drive root could raise PermissionError on Windows - self.cls('/').resolve().mkdir(exist_ok=True) - self.cls('/').resolve().mkdir(parents=True, exist_ok=True) - - @only_nt # XXX: not sure how to test this on POSIX - def test_mkdir_with_unknown_drive(self): - for d in 'ZYXWVUTSRQPONMLKJIHGFEDCBA': - p = self.cls(d + ':\\') - if not p.is_dir(): - break - else: - self.skipTest("cannot find a drive that doesn't exist") - with self.assertRaises(OSError): - (p / 'child' / 'path').mkdir(parents=True) - def test_mkdir_with_child_file(self): p = self.cls(BASE, 'dirB', 'fileB') self.assertTrue(p.exists()) @@ -1768,35 +1799,6 @@ class _BasePathTest(object): p.mkdir(exist_ok=True) self.assertEqual(cm.exception.errno, errno.EEXIST) - def test_mkdir_concurrent_parent_creation(self): - for pattern_num in range(32): - p = self.cls(BASE, 'dirCPC%d' % pattern_num) - self.assertFalse(p.exists()) - - def my_mkdir(path, mode=0o777): - path = str(path) - # Emulate another process that would create the directory - # just before we try to create it ourselves. We do it - # in all possible pattern combinations, assuming that this - # function is called at most 5 times (dirCPC/dir1/dir2, - # dirCPC/dir1, dirCPC, dirCPC/dir1, dirCPC/dir1/dir2). - if pattern.pop(): - os.mkdir(path, mode) # from another process - concurrently_created.add(path) - os.mkdir(path, mode) # our real call - - pattern = [bool(pattern_num & (1 << n)) for n in range(5)] - concurrently_created = set() - p12 = p / 'dir1' / 'dir2' - try: - with mock.patch("pathlib._normal_accessor.mkdir", my_mkdir): - p12.mkdir(parents=True, exist_ok=False) - except FileExistsError: - self.assertIn(str(p12), concurrently_created) - else: - self.assertNotIn(str(p12), concurrently_created) - self.assertTrue(p.exists()) - @with_symlinks def test_symlink_to(self): P = self.cls(BASE) @@ -2007,10 +2009,10 @@ class PathTest(_BasePathTest, unittest.TestCase): class PosixPathTest(_BasePathTest, unittest.TestCase): cls = pathlib.PosixPath - def _check_symlink_loop(self, *args): + def _check_symlink_loop(self, *args, strict=True): path = self.cls(*args) with self.assertRaises(RuntimeError): - print(path.resolve()) + print(path.resolve(strict)) def test_open_mode(self): old_mask = os.umask(0) @@ -2043,7 +2045,6 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): @with_symlinks def test_resolve_loop(self): - # Loop detection for broken symlinks under POSIX # Loops with relative symlinks os.symlink('linkX/inside', join('linkX')) self._check_symlink_loop(BASE, 'linkX') @@ -2051,6 +2052,8 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self._check_symlink_loop(BASE, 'linkY') os.symlink('linkZ/../linkZ', join('linkZ')) self._check_symlink_loop(BASE, 'linkZ') + # Non-strict + self._check_symlink_loop(BASE, 'linkZ', 'foo', strict=False) # Loops with absolute symlinks os.symlink(join('linkU/inside'), join('linkU')) self._check_symlink_loop(BASE, 'linkU') @@ -2058,6 +2061,8 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self._check_symlink_loop(BASE, 'linkV') os.symlink(join('linkW/../linkW'), join('linkW')) self._check_symlink_loop(BASE, 'linkW') + # Non-strict + self._check_symlink_loop(BASE, 'linkW', 'foo', strict=False) def test_glob(self): P = self.cls diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 66a7b55..0ea2af5 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -1,6 +1,7 @@ # A test suite for pdb; not very comprehensive at the moment. import doctest +import os import pdb import sys import types @@ -34,7 +35,7 @@ def test_pdb_displayhook(): """This tests the custom displayhook for pdb. >>> def test_function(foo, bar): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... pass >>> with PdbTestInput([ @@ -74,7 +75,7 @@ def test_pdb_basic_commands(): ... return foo.upper() >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... ret = test_function_2('baz') ... print(ret) @@ -173,7 +174,7 @@ def test_pdb_breakpoint_commands(): """Test basic commands related to breakpoints. >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... print(1) ... print(2) ... print(3) @@ -305,7 +306,7 @@ def test_list_commands(): ... return foo >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... ret = test_function_2('baz') >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE @@ -328,7 +329,7 @@ def test_list_commands(): -> ret = test_function_2('baz') (Pdb) list 1 def test_function(): - 2 import pdb; pdb.Pdb(nosigint=True).set_trace() + 2 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() 3 -> ret = test_function_2('baz') [EOF] (Pdb) step @@ -391,7 +392,7 @@ def test_post_mortem(): ... print('Exception!') >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... test_function_2() ... print('Not reached.') @@ -424,7 +425,7 @@ def test_post_mortem(): -> 1/0 (Pdb) list 1 def test_function(): - 2 import pdb; pdb.Pdb(nosigint=True).set_trace() + 2 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() 3 -> test_function_2() 4 print('Not reached.') [EOF] @@ -448,7 +449,7 @@ def test_pdb_skip_modules(): >>> def skip_module(): ... import string - ... import pdb; pdb.Pdb(skip=['stri*'], nosigint=True).set_trace() + ... import pdb; pdb.Pdb(skip=['stri*'], nosigint=True, readrc=False).set_trace() ... string.capwords('FOO') >>> with PdbTestInput([ @@ -477,7 +478,7 @@ def test_pdb_skip_modules_with_callback(): >>> def skip_module(): ... def callback(): ... return None - ... import pdb; pdb.Pdb(skip=['module_to_skip*'], nosigint=True).set_trace() + ... import pdb; pdb.Pdb(skip=['module_to_skip*'], nosigint=True, readrc=False).set_trace() ... mod.foo_pony(callback) >>> with PdbTestInput([ @@ -518,7 +519,7 @@ def test_pdb_continue_in_bottomframe(): """Test that "continue" and "next" work properly in bottom frame (issue #5294). >>> def test_function(): - ... import pdb, sys; inst = pdb.Pdb(nosigint=True) + ... import pdb, sys; inst = pdb.Pdb(nosigint=True, readrc=False) ... inst.set_trace() ... inst.botframe = sys._getframe() # hackery to get the right botframe ... print(1) @@ -558,8 +559,7 @@ def test_pdb_continue_in_bottomframe(): def pdb_invoke(method, arg): """Run pdb.method(arg).""" - import pdb - getattr(pdb.Pdb(nosigint=True), method)(arg) + getattr(pdb.Pdb(nosigint=True, readrc=False), method)(arg) def test_pdb_run_with_incorrect_argument(): @@ -608,7 +608,7 @@ def test_next_until_return_at_return_event(): ... x = 2 >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... test_function_2() ... test_function_2() ... test_function_2() @@ -674,7 +674,7 @@ def test_pdb_next_command_for_generator(): ... yield 2 >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... it = test_gen() ... try: ... if next(it) != 0: @@ -734,7 +734,7 @@ def test_pdb_return_command_for_generator(): ... yield 2 >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... it = test_gen() ... try: ... if next(it) != 0: @@ -789,7 +789,7 @@ def test_pdb_until_command_for_generator(): ... yield 2 >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... for i in test_gen(): ... print(i) ... print("finished") @@ -831,7 +831,7 @@ def test_pdb_next_command_in_generator_for_loop(): ... return 1 >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... for i in test_gen(): ... print('value', i) ... x = 123 @@ -876,7 +876,7 @@ def test_pdb_next_command_subiterator(): ... return x >>> def test_function(): - ... import pdb; pdb.Pdb(nosigint=True).set_trace() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... for i in test_gen(): ... print('value', i) ... x = 123 @@ -1049,7 +1049,7 @@ class PdbTestCase(unittest.TestCase): import pdb def start_pdb(): - pdb.Pdb().set_trace() + pdb.Pdb(readrc=False).set_trace() x = 1 y = 1 @@ -1078,6 +1078,38 @@ class PdbTestCase(unittest.TestCase): .format(expected, stdout)) + def test_readrc_kwarg(self): + script = textwrap.dedent(""" + import pdb; pdb.Pdb(readrc=False).set_trace() + + print('hello') + """) + + save_home = os.environ.pop('HOME', None) + try: + with support.temp_cwd(): + with open('.pdbrc', 'w') as f: + f.write("invalid\n") + + with open('main.py', 'w') as f: + f.write(script) + + cmd = [sys.executable, 'main.py'] + proc = subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + with proc: + stdout, stderr = proc.communicate(b'q\n') + self.assertNotIn("NameError: name 'invalid' is not defined", + stdout.decode()) + + finally: + if save_home is not None: + os.environ['HOME'] = save_home + def tearDown(self): support.unlink(support.TESTFN) diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py index 41e5091..b033640 100644 --- a/Lib/test/test_peepholer.py +++ b/Lib/test/test_peepholer.py @@ -1,9 +1,8 @@ import dis import re import sys -from io import StringIO +import textwrap import unittest -from math import copysign from test.bytecode_helper import BytecodeTestCase @@ -30,22 +29,25 @@ class TestTranforms(BytecodeTestCase): def test_global_as_constant(self): # LOAD_GLOBAL None/True/False --> LOAD_CONST None/True/False - def f(x): - None - None + def f(): + x = None + x = None return x - def g(x): - True + def g(): + x = True return x - def h(x): - False + def h(): + x = False return x + for func, elem in ((f, None), (g, True), (h, False)): self.assertNotInBytecode(func, 'LOAD_GLOBAL') self.assertInBytecode(func, 'LOAD_CONST', elem) + def f(): 'Adding a docstring made this test fail in Py2.5.0' return None + self.assertNotInBytecode(f, 'LOAD_GLOBAL') self.assertInBytecode(f, 'LOAD_CONST', None) diff --git a/Lib/test/test_pep247.py b/Lib/test/test_pep247.py deleted file mode 100644 index c17ceed..0000000 --- a/Lib/test/test_pep247.py +++ /dev/null @@ -1,66 +0,0 @@ -""" -Test suite to check compliance with PEP 247, the standard API -for hashing algorithms -""" - -import hmac -import unittest -from hashlib import md5, sha1, sha224, sha256, sha384, sha512 - -class Pep247Test(unittest.TestCase): - - def check_module(self, module, key=None): - self.assertTrue(hasattr(module, 'digest_size')) - self.assertTrue(module.digest_size is None or module.digest_size > 0) - self.check_object(module.new, module.digest_size, key) - - def check_object(self, cls, digest_size, key, digestmod=None): - if key is not None: - if digestmod is None: - digestmod = md5 - obj1 = cls(key, digestmod=digestmod) - obj2 = cls(key, b'string', digestmod=digestmod) - h1 = cls(key, b'string', digestmod=digestmod).digest() - obj3 = cls(key, digestmod=digestmod) - obj3.update(b'string') - h2 = obj3.digest() - else: - obj1 = cls() - obj2 = cls(b'string') - h1 = cls(b'string').digest() - obj3 = cls() - obj3.update(b'string') - h2 = obj3.digest() - self.assertEqual(h1, h2) - self.assertTrue(hasattr(obj1, 'digest_size')) - - if digest_size is not None: - self.assertEqual(obj1.digest_size, digest_size) - - self.assertEqual(obj1.digest_size, len(h1)) - obj1.update(b'string') - obj_copy = obj1.copy() - self.assertEqual(obj1.digest(), obj_copy.digest()) - self.assertEqual(obj1.hexdigest(), obj_copy.hexdigest()) - - digest, hexdigest = obj1.digest(), obj1.hexdigest() - hd2 = "" - for byte in digest: - hd2 += '%02x' % byte - self.assertEqual(hd2, hexdigest) - - def test_md5(self): - self.check_object(md5, None, None) - - def test_sha(self): - self.check_object(sha1, None, None) - self.check_object(sha224, None, None) - self.check_object(sha256, None, None) - self.check_object(sha384, None, None) - self.check_object(sha512, None, None) - - def test_hmac(self): - self.check_module(hmac, key=b'abc') - -if __name__ == '__main__': - unittest.main() diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py index d467d52..e6c5d08 100644 --- a/Lib/test/test_pickle.py +++ b/Lib/test/test_pickle.py @@ -34,8 +34,6 @@ class PyUnpicklerTests(AbstractUnpickleTests): unpickler = pickle._Unpickler bad_stack_errors = (IndexError,) - bad_mark_errors = (IndexError, pickle.UnpicklingError, - TypeError, AttributeError, EOFError) truncated_errors = (pickle.UnpicklingError, EOFError, AttributeError, ValueError, struct.error, IndexError, ImportError) @@ -70,8 +68,6 @@ class InMemoryPickleTests(AbstractPickleTests, AbstractUnpickleTests, pickler = pickle._Pickler unpickler = pickle._Unpickler bad_stack_errors = (pickle.UnpicklingError, IndexError) - bad_mark_errors = (pickle.UnpicklingError, IndexError, - TypeError, AttributeError, EOFError) truncated_errors = (pickle.UnpicklingError, EOFError, AttributeError, ValueError, struct.error, IndexError, ImportError) @@ -143,9 +139,7 @@ if has_c_implementation: class CUnpicklerTests(PyUnpicklerTests): unpickler = _pickle.Unpickler bad_stack_errors = (pickle.UnpicklingError,) - bad_mark_errors = (EOFError,) - truncated_errors = (pickle.UnpicklingError, EOFError, - AttributeError, ValueError) + truncated_errors = (pickle.UnpicklingError,) class CPicklerTests(PyPicklerTests): pickler = _pickle.Pickler @@ -341,6 +335,9 @@ class CompatPickleTests(unittest.TestCase): if (module2, name2) == ('exceptions', 'OSError'): attr = getattribute(module3, name3) self.assertTrue(issubclass(attr, OSError)) + elif (module2, name2) == ('exceptions', 'ImportError'): + attr = getattribute(module3, name3) + self.assertTrue(issubclass(attr, ImportError)) else: module, name = mapping(module2, name2) if module3[:1] != '_': @@ -407,6 +404,11 @@ class CompatPickleTests(unittest.TestCase): if exc is not OSError and issubclass(exc, OSError): self.assertEqual(reverse_mapping('builtins', name), ('exceptions', 'OSError')) + elif exc is not ImportError and issubclass(exc, ImportError): + self.assertEqual(reverse_mapping('builtins', name), + ('exceptions', 'ImportError')) + self.assertEqual(mapping('exceptions', name), + ('exceptions', name)) else: self.assertEqual(reverse_mapping('builtins', name), ('exceptions', name)) diff --git a/Lib/test/test_pickletools.py b/Lib/test/test_pickletools.py index bbe6875..86bebfa 100644 --- a/Lib/test/test_pickletools.py +++ b/Lib/test/test_pickletools.py @@ -1,9 +1,9 @@ -import struct import pickle import pickletools from test import support from test.pickletester import AbstractPickleTests from test.pickletester import AbstractPickleModuleTests +import unittest class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests): @@ -59,8 +59,40 @@ class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests): self.assertNotIn(pickle.BINPUT, pickled2) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'bytes_types', + 'UP_TO_NEWLINE', 'TAKEN_FROM_ARGUMENT1', + 'TAKEN_FROM_ARGUMENT4', 'TAKEN_FROM_ARGUMENT4U', + 'TAKEN_FROM_ARGUMENT8U', 'ArgumentDescriptor', + 'read_uint1', 'read_uint2', 'read_int4', 'read_uint4', + 'read_uint8', 'read_stringnl', 'read_stringnl_noescape', + 'read_stringnl_noescape_pair', 'read_string1', + 'read_string4', 'read_bytes1', 'read_bytes4', + 'read_bytes8', 'read_unicodestringnl', + 'read_unicodestring1', 'read_unicodestring4', + 'read_unicodestring8', 'read_decimalnl_short', + 'read_decimalnl_long', 'read_floatnl', 'read_float8', + 'read_long1', 'read_long4', + 'uint1', 'uint2', 'int4', 'uint4', 'uint8', 'stringnl', + 'stringnl_noescape', 'stringnl_noescape_pair', 'string1', + 'string4', 'bytes1', 'bytes4', 'bytes8', + 'unicodestringnl', 'unicodestring1', 'unicodestring4', + 'unicodestring8', 'decimalnl_short', 'decimalnl_long', + 'floatnl', 'float8', 'long1', 'long4', + 'StackObject', + 'pyint', 'pylong', 'pyinteger_or_bool', 'pybool', 'pyfloat', + 'pybytes_or_str', 'pystring', 'pybytes', 'pyunicode', + 'pynone', 'pytuple', 'pylist', 'pydict', 'pyset', + 'pyfrozenset', 'anyobject', 'markobject', 'stackslice', + 'OpcodeInfo', 'opcodes', 'code2op', + } + support.check__all__(self, pickletools, blacklist=blacklist) + + def test_main(): support.run_unittest(OptimizedPickleTests) + support.run_unittest(MiscTestCase) support.run_doctest(pickletools) diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py index 6a7b45f..ad01d08 100644 --- a/Lib/test/test_pipes.py +++ b/Lib/test/test_pipes.py @@ -2,6 +2,7 @@ import pipes import os import string import unittest +import shutil from test.support import TESTFN, run_unittest, unlink, reap_children if os.name != 'posix': @@ -18,6 +19,8 @@ class SimplePipeTests(unittest.TestCase): unlink(f) def testSimplePipe1(self): + if shutil.which('tr') is None: + self.skipTest('tr is not available') t = pipes.Template() t.append(s_command, pipes.STDIN_STDOUT) f = t.open(TESTFN, 'w') @@ -27,6 +30,8 @@ class SimplePipeTests(unittest.TestCase): self.assertEqual(f.read(), 'HELLO WORLD #1') def testSimplePipe2(self): + if shutil.which('tr') is None: + self.skipTest('tr is not available') with open(TESTFN, 'w') as f: f.write('hello world #2') t = pipes.Template() @@ -36,6 +41,8 @@ class SimplePipeTests(unittest.TestCase): self.assertEqual(f.read(), 'HELLO WORLD #2') def testSimplePipe3(self): + if shutil.which('tr') is None: + self.skipTest('tr is not available') with open(TESTFN, 'w') as f: f.write('hello world #2') t = pipes.Template() diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py index a820587..fc04dcf 100644 --- a/Lib/test/test_pkgutil.py +++ b/Lib/test/test_pkgutil.py @@ -81,8 +81,9 @@ class PkgutilTests(unittest.TestCase): self.assertEqual(res2, RESOURCE_DATA) names = [] - for loader, name, ispkg in pkgutil.iter_modules([zip_file]): - names.append(name) + for moduleinfo in pkgutil.iter_modules([zip_file]): + self.assertIsInstance(moduleinfo, pkgutil.ModuleInfo) + names.append(moduleinfo.name) self.assertEqual(names, ['test_getdata_zipfile']) del sys.path[0] @@ -413,6 +414,7 @@ class ImportlibMigrationTests(unittest.TestCase): self.assertIsNotNone(pkgutil.get_loader("test.support")) self.assertEqual(len(w.warnings), 0) + @unittest.skipIf(__name__ == '__main__', 'not compatible with __main__') def test_get_loader_handles_missing_loader_attribute(self): global __loader__ this_loader = __loader__ diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index e16b9fa..5f875ef 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -33,6 +33,7 @@ class PlatformTest(unittest.TestCase): 'import platform; print(platform.architecture())'] p = subprocess.Popen(cmd, stdout=subprocess.PIPE) return p.communicate() + real = os.path.realpath(sys.executable) link = os.path.abspath(support.TESTFN) os.symlink(real, link) @@ -66,12 +67,12 @@ class PlatformTest(unittest.TestCase): def setUp(self): self.save_version = sys.version - self.save_git = sys._git + self.save_mercurial = sys._mercurial self.save_platform = sys.platform def tearDown(self): sys.version = self.save_version - sys._git = self.save_git + sys._mercurial = self.save_mercurial sys.platform = self.save_platform def test_sys_version(self): @@ -101,7 +102,7 @@ class PlatformTest(unittest.TestCase): ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')), ): # branch and revision are not "parsed", but fetched - # from sys._git. Ignore them + # from sys._mercurial. Ignore them (name, version, branch, revision, buildno, builddate, compiler) \ = platform._sys_version(input) self.assertEqual( @@ -148,10 +149,10 @@ class PlatformTest(unittest.TestCase): sys_versions.items(): sys.version = version_tag if subversion is None: - if hasattr(sys, "_git"): - del sys._git + if hasattr(sys, "_mercurial"): + del sys._mercurial else: - sys._git = subversion + sys._mercurial = subversion if sys_platform is not None: sys.platform = sys_platform self.assertEqual(platform.python_implementation(), info[0]) @@ -262,7 +263,7 @@ class PlatformTest(unittest.TestCase): with warnings.catch_warnings(): warnings.filterwarnings( 'ignore', - 'dist\(\) and linux_distribution\(\) ' + r'dist\(\) and linux_distribution\(\) ' 'functions are deprecated .*', PendingDeprecationWarning, ) @@ -338,7 +339,7 @@ class PlatformTest(unittest.TestCase): with warnings.catch_warnings(): warnings.filterwarnings( 'ignore', - 'dist\(\) and linux_distribution\(\) ' + r'dist\(\) and linux_distribution\(\) ' 'functions are deprecated .*', PendingDeprecationWarning, ) diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py index 692cac4..c77a6bf 100644 --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -7,7 +7,6 @@ import datetime import codecs import binascii import collections -import struct from test import support from io import BytesIO @@ -534,8 +533,14 @@ class TestPlistlibDeprecated(unittest.TestCase): self.assertEqual(cur, in_data) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {"PlistFormat", "PLISTHEADER"} + support.check__all__(self, plistlib, blacklist=blacklist) + + def test_main(): - support.run_unittest(TestPlistlib, TestPlistlibDeprecated) + support.run_unittest(TestPlistlib, TestPlistlibDeprecated, MiscTestCase) if __name__ == '__main__': diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py index bceeb93..e5b16dc 100644 --- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -8,7 +8,6 @@ import asyncore import asynchat import socket import os -import time import errno from unittest import TestCase, skipUnless @@ -153,10 +152,12 @@ class DummyPOP3Handler(asynchat.async_chat): def cmd_stls(self, arg): if self.tls_active is False: self.push('+OK Begin TLS negotiation') - tls_sock = ssl.wrap_socket(self.socket, certfile=CERTFILE, - server_side=True, - do_handshake_on_connect=False, - suppress_ragged_eofs=False) + context = ssl.SSLContext() + context.load_cert_chain(CERTFILE) + tls_sock = context.wrap_socket(self.socket, + server_side=True, + do_handshake_on_connect=False, + suppress_ragged_eofs=False) self.del_channel() self.set_socket(tls_sock) self.tls_active = True diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index b229cd3..63c74cd 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -11,7 +11,6 @@ import time import os import platform import pwd -import shutil import stat import tempfile import unittest @@ -398,7 +397,7 @@ class PosixTester(unittest.TestCase): self.assertTrue(posix.stat(fp.fileno())) self.assertRaisesRegex(TypeError, - 'should be string, bytes or integer, not', + 'should be string, bytes, os.PathLike or integer, not', posix.stat, float(fp.fileno())) finally: fp.close() @@ -408,16 +407,18 @@ class PosixTester(unittest.TestCase): def test_stat(self): self.assertTrue(posix.stat(support.TESTFN)) self.assertTrue(posix.stat(os.fsencode(support.TESTFN))) - self.assertTrue(posix.stat(bytearray(os.fsencode(support.TESTFN)))) + self.assertWarnsRegex(DeprecationWarning, + 'should be string, bytes, os.PathLike or integer, not', + posix.stat, bytearray(os.fsencode(support.TESTFN))) self.assertRaisesRegex(TypeError, - 'can\'t specify None for path argument', + 'should be string, bytes, os.PathLike or integer, not', posix.stat, None) self.assertRaisesRegex(TypeError, - 'should be string, bytes or integer, not', + 'should be string, bytes, os.PathLike or integer, not', posix.stat, list(support.TESTFN)) self.assertRaisesRegex(TypeError, - 'should be string, bytes or integer, not', + 'should be string, bytes, os.PathLike or integer, not', posix.stat, list(os.fsencode(support.TESTFN))) @unittest.skipUnless(hasattr(posix, 'mkfifo'), "don't have mkfifo()") @@ -577,25 +578,17 @@ class PosixTester(unittest.TestCase): self.assertRaises(OSError, posix.chdir, support.TESTFN) def test_listdir(self): - self.assertIn(support.TESTFN, posix.listdir(os.curdir)) + self.assertTrue(support.TESTFN in posix.listdir(os.curdir)) def test_listdir_default(self): # When listdir is called without argument, # it's the same as listdir(os.curdir). - self.assertIn(support.TESTFN, posix.listdir()) + self.assertTrue(support.TESTFN in posix.listdir()) def test_listdir_bytes(self): # When listdir is called with a bytes object, # the returned strings are of type bytes. - self.assertIn(os.fsencode(support.TESTFN), posix.listdir(b'.')) - - def test_listdir_bytes_like(self): - # Deprecated in 3.6. - for cls in bytearray, memoryview: - names = posix.listdir(cls(b'.')) - self.assertIn(os.fsencode(support.TESTFN), names) - for name in names: - self.assertIs(type(name), bytes) + self.assertTrue(os.fsencode(support.TESTFN) in posix.listdir(b'.')) @unittest.skipUnless(posix.listdir in os.supports_fd, "test needs fd support for posix.listdir()") @@ -755,21 +748,6 @@ class PosixTester(unittest.TestCase): self.assertEqual(type(k), item_type) self.assertEqual(type(v), item_type) - @unittest.skipUnless(hasattr(os, "putenv"), "requires os.putenv()") - def test_putenv(self): - with self.assertRaises(ValueError): - os.putenv('FRUIT\0VEGETABLE', 'cabbage') - with self.assertRaises(ValueError): - os.putenv(b'FRUIT\0VEGETABLE', b'cabbage') - with self.assertRaises(ValueError): - os.putenv('FRUIT', 'orange\0VEGETABLE=cabbage') - with self.assertRaises(ValueError): - os.putenv(b'FRUIT', b'orange\0VEGETABLE=cabbage') - with self.assertRaises(ValueError): - os.putenv('FRUIT=ORANGE', 'lemon') - with self.assertRaises(ValueError): - os.putenv(b'FRUIT=ORANGE', b'lemon') - @unittest.skipUnless(hasattr(posix, 'getcwd'), 'test needs posix.getcwd()') def test_getcwd_long_pathnames(self): dirname = 'getcwd-test-directory-0123456789abcdef-01234567890abcdef' @@ -821,7 +799,11 @@ class PosixTester(unittest.TestCase): groups = idg.read().strip() ret = idg.close() - if ret is not None or not groups: + try: + idg_groups = set(int(g) for g in groups.split()) + except ValueError: + idg_groups = set() + if ret is not None or not idg_groups: raise unittest.SkipTest("need working 'id -G'") # Issues 16698: OS X ABIs prior to 10.6 have limits on getgroups() @@ -832,12 +814,11 @@ class PosixTester(unittest.TestCase): raise unittest.SkipTest("getgroups(2) is broken prior to 10.6") # 'id -G' and 'os.getgroups()' should return the same - # groups, ignoring order and duplicates. - # #10822 - it is implementation defined whether posix.getgroups() - # includes the effective gid so we include it anyway, since id -G does - self.assertEqual( - set([int(x) for x in groups.split()]), - set(posix.getgroups() + [posix.getegid()])) + # groups, ignoring order, duplicates, and the effective gid. + # #10822/#26944 - It is implementation defined whether + # posix.getgroups() includes the effective gid. + symdiff = idg_groups.symmetric_difference(posix.getgroups()) + self.assertTrue(not symdiff or symdiff == {posix.getegid()}) # tests for the posix *at functions follow @@ -886,9 +867,9 @@ class PosixTester(unittest.TestCase): self.assertEqual(s1, s2) s2 = posix.stat(support.TESTFN, dir_fd=None) self.assertEqual(s1, s2) - self.assertRaisesRegex(TypeError, 'should be integer, not', + self.assertRaisesRegex(TypeError, 'should be integer or None, not', posix.stat, support.TESTFN, dir_fd=posix.getcwd()) - self.assertRaisesRegex(TypeError, 'should be integer, not', + self.assertRaisesRegex(TypeError, 'should be integer or None, not', posix.stat, support.TESTFN, dir_fd=float(f)) self.assertRaises(OverflowError, posix.stat, support.TESTFN, dir_fd=10**20) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 0783c36..8a1e33b 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -596,5 +596,85 @@ class PosixCommonTest(test_genericpath.CommonTest, unittest.TestCase): attributes = ['relpath', 'samefile', 'sameopenfile', 'samestat'] +class PathLikeTests(unittest.TestCase): + + path = posixpath + + class PathLike: + def __init__(self, path=''): + self.path = path + def __fspath__(self): + if isinstance(self.path, BaseException): + raise self.path + else: + return self.path + + def setUp(self): + self.file_name = support.TESTFN.lower() + self.file_path = self.PathLike(support.TESTFN) + self.addCleanup(support.unlink, self.file_name) + with open(self.file_name, 'xb', 0) as file: + file.write(b"test_posixpath.PathLikeTests") + + def assertPathEqual(self, func): + self.assertEqual(func(self.file_path), func(self.file_name)) + + def test_path_normcase(self): + self.assertPathEqual(self.path.normcase) + + def test_path_isabs(self): + self.assertPathEqual(self.path.isabs) + + def test_path_join(self): + self.assertEqual(self.path.join('a', self.PathLike('b'), 'c'), + self.path.join('a', 'b', 'c')) + + def test_path_split(self): + self.assertPathEqual(self.path.split) + + def test_path_splitext(self): + self.assertPathEqual(self.path.splitext) + + def test_path_splitdrive(self): + self.assertPathEqual(self.path.splitdrive) + + def test_path_basename(self): + self.assertPathEqual(self.path.basename) + + def test_path_dirname(self): + self.assertPathEqual(self.path.dirname) + + def test_path_islink(self): + self.assertPathEqual(self.path.islink) + + def test_path_lexists(self): + self.assertPathEqual(self.path.lexists) + + def test_path_ismount(self): + self.assertPathEqual(self.path.ismount) + + def test_path_expanduser(self): + self.assertPathEqual(self.path.expanduser) + + def test_path_expandvars(self): + self.assertPathEqual(self.path.expandvars) + + def test_path_normpath(self): + self.assertPathEqual(self.path.normpath) + + def test_path_abspath(self): + self.assertPathEqual(self.path.abspath) + + def test_path_realpath(self): + self.assertPathEqual(self.path.realpath) + + def test_path_relpath(self): + self.assertPathEqual(self.path.relpath) + + def test_path_commonpath(self): + common_path = self.path.commonpath([self.file_path, self.file_name]) + self.assertEqual(common_path, self.file_name) + + if __name__=="__main__": unittest.main() diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index ba608fb..ce99fe6 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -1,4 +1,4 @@ -import test.support, unittest +import unittest class PowTest(unittest.TestCase): @@ -59,6 +59,9 @@ class PowTest(unittest.TestCase): def test_powint(self): self.powtest(int) + def test_powlong(self): + self.powtest(int) + def test_powfloat(self): self.powtest(float) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index ef5e99e..15f88e4 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -277,7 +277,6 @@ class SmallPtyTests(unittest.TestCase): socketpair = self._socketpair() masters = [s.fileno() for s in socketpair] - os.close(masters[1]) socketpair[1].close() os.close(write_to_stdin_fd) diff --git a/Lib/test/test_pulldom.py b/Lib/test/test_pulldom.py index 1932c6b..3d89e3a 100644 --- a/Lib/test/test_pulldom.py +++ b/Lib/test/test_pulldom.py @@ -1,6 +1,5 @@ import io import unittest -import sys import xml.sax from xml.sax.xmlreader import AttributesImpl diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py index 6ffbbbd..2cff1c5 100644 --- a/Lib/test/test_pyclbr.py +++ b/Lib/test/test_pyclbr.py @@ -156,9 +156,9 @@ class PyclbrTest(TestCase): # These were once about the 10 longest modules cm('random', ignore=('Random',)) # from _random import Random as CoreGenerator cm('cgi', ignore=('log',)) # set with = in module - cm('pickle') + cm('pickle', ignore=('partial',)) cm('aifc', ignore=('openfp', '_aifc_params')) # set with = in module - cm('sre_parse', ignore=('dump', 'groups')) # from sre_constants import *; property + cm('sre_parse', ignore=('dump', 'groups', 'pos')) # from sre_constants import *; property cm('pdb') cm('pydoc') diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index 1f7ab7f..ed438d5 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -84,6 +84,8 @@ CLASSES | Data and other attributes defined here: |\x20\x20 | NO_MEANING = 'eggs' + |\x20\x20 + | __annotations__ = {'NO_MEANING': } \x20\x20\x20\x20 class C(builtins.object) | Methods defined here: @@ -196,6 +198,8 @@ Data descriptors defined here:
Data and other attributes defined here:
NO_MEANING = 'eggs'
+
__annotations__ = {'NO_MEANING': <class 'str'>}
+
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html index b7bcd74..413c0a7 100644 --- a/Doc/tools/templates/indexsidebar.html +++ b/Doc/tools/templates/indexsidebar.html @@ -3,7 +3,7 @@

{% trans %}Docs for other versions{% endtrans %}

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html index 640d8b3..5c180e7 100644 --- a/Doc/tools/templates/layout.html +++ b/Doc/tools/templates/layout.html @@ -38,7 +38,6 @@ {% endblock %} {% block extrahead %} - {% if builder != "htmlhelp" %} {% if not embedded %}{% endif %} {% if versionswitcher is defined and not embedded %}{% endif %} diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index 073444c..75c79d2 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -374,11 +374,11 @@ Surely Python raises an exception when a function that requires an argument is called without any --- even if the argument isn't actually used... Actually, you may have guessed the answer: the special thing about methods is -that the instance object is passed as the first argument of the function. In our +that the object is passed as the first argument of the function. In our example, the call ``x.f()`` is exactly equivalent to ``MyClass.f(x)``. In general, calling a method with a list of *n* arguments is equivalent to calling the corresponding function with an argument list that is created by inserting -the method's instance object before the first argument. +the method's object before the first argument. If you still don't understand how methods work, a look at the implementation can perhaps clarify matters. When an instance attribute is referenced that isn't a @@ -784,7 +784,7 @@ using the :func:`next` built-in function; this example shows how it all works:: 'c' >>> next(it) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? next(it) StopIteration @@ -906,3 +906,4 @@ Examples:: namespace; the name :attr:`~object.__dict__` is an attribute but not a global name. Obviously, using this violates the abstraction of namespace implementation, and should be restricted to things like post-mortem debuggers. + diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index 6af7282..d434618 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -78,6 +78,9 @@ slice notation makes this especially convenient:: >>> words ['defenestrate', 'cat', 'window', 'defenestrate'] +With ``for w in words:``, the example would attempt to create an infinite list, +inserting ``defenestrate`` over and over again. + .. _tut-range: @@ -154,7 +157,7 @@ Later we will see more functions that return iterables and take iterables as arg :keyword:`break` and :keyword:`continue` Statements, and :keyword:`else` Clauses on Loops ========================================================================================= -The :keyword:`break` statement, like in C, breaks out of the innermost enclosing +The :keyword:`break` statement, like in C, breaks out of the smallest enclosing :keyword:`for` or :keyword:`while` loop. Loop statements may have an ``else`` clause; it is executed when the loop @@ -472,7 +475,7 @@ Here's an example that fails due to this restriction:: ... >>> function(0, a=0) Traceback (most recent call last): - File "", line 1, in + File "", line 1, in ? TypeError: function() got multiple values for keyword argument 'a' When a final formal parameter of the form ``**name`` is present, it receives a diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index 1a73ac9..953a68b 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -22,11 +22,11 @@ objects: Add an item to the end of the list. Equivalent to ``a[len(a):] = [x]``. -.. method:: list.extend(iterable) +.. method:: list.extend(L) :noindex: - Extend the list by appending all the items from the iterable. Equivalent to - ``a[len(a):] = iterable``. + Extend the list by appending all the items in the given list. Equivalent to + ``a[len(a):] = L``. .. method:: list.insert(i, x) @@ -68,7 +68,7 @@ objects: The optional arguments *start* and *end* are interpreted as in the slice notation and are used to limit the search to a particular subsequence of - the list. The returned index is computed relative to the beginning of the full + *x*. The returned index is computed relative to the beginning of the full sequence rather than the *start* argument. @@ -261,7 +261,7 @@ it must be parenthesized. :: [(0, 0), (1, 1), (2, 4), (3, 9), (4, 16), (5, 25)] >>> # the tuple must be parenthesized, otherwise an error is raised >>> [x, x**2 for x in range(6)] - File "", line 1, in + File "", line 1, in ? [x, x**2 for x in range(6)] ^ SyntaxError: invalid syntax diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index 759588f..aba61da 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -174,7 +174,7 @@ example:: for arg in sys.argv[1:]: try: f = open(arg, 'r') - except IOError: + except OSError: print('cannot open', arg) else: print(arg, 'has', len(f.readlines()), 'lines') diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst index 32cb578..beeaac3 100644 --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -25,7 +25,8 @@ first way is to do all the string handling yourself; using string slicing and concatenation operations you can create any layout you can imagine. The string type has some methods that perform useful operations for padding strings to a given column width; these will be discussed shortly. The second -way is to use the :meth:`str.format` method. +way is to use :ref:`formatted string literals `, or the +:meth:`str.format` method. The :mod:`string` module contains a :class:`~string.Template` class which offers yet another way to substitute values into strings. @@ -261,35 +262,6 @@ to file data is fine for text files, but will corrupt binary data like that in :file:`JPEG` or :file:`EXE` files. Be very careful to use binary mode when reading and writing such files. -It is good practice to use the :keyword:`with` keyword when dealing -with file objects. The advantage is that the file is properly closed -after its suite finishes, even if an exception is raised at some -point. Using :keyword:`with` is also much shorter than writing -equivalent :keyword:`try`\ -\ :keyword:`finally` blocks:: - - >>> with open('workfile') as f: - ... read_data = f.read() - >>> f.closed - True - -If you're not using the :keyword:`with` keyword, then you should call -``f.close()`` to close the file and immediately free up any system -resources used by it. If you don't explicitly close a file, Python's -garbage collector will eventually destroy the object and close the -open file for you, but the file may stay open for a while. Another -risk is that different Python implementations will do this clean-up at -different times. - -After a file object is closed, either by a :keyword:`with` statement -or by calling ``f.close()``, attempts to use the file object will -automatically fail. :: - - >>> f.close() - >>> f.read() - Traceback (most recent call last): - File "", line 1, in - ValueError: I/O operation on closed file - .. _tut-filemethods: @@ -382,6 +354,27 @@ to the very file end with ``seek(0, 2)``) and the only valid *offset* values are those returned from the ``f.tell()``, or zero. Any other *offset* value produces undefined behaviour. + +When you're done with a file, call ``f.close()`` to close it and free up any +system resources taken up by the open file. After calling ``f.close()``, +attempts to use the file object will automatically fail. :: + + >>> f.close() + >>> f.read() + Traceback (most recent call last): + File "", line 1, in ? + ValueError: I/O operation on closed file + +It is good practice to use the :keyword:`with` keyword when dealing with file +objects. This has the advantage that the file is properly closed after its +suite finishes, even if an exception is raised on the way. It is also much +shorter than writing equivalent :keyword:`try`\ -\ :keyword:`finally` blocks:: + + >>> with open('workfile', 'r') as f: + ... read_data = f.read() + >>> f.closed + True + File objects have some additional methods, such as :meth:`~file.isatty` and :meth:`~file.truncate` which are less frequently used; consult the Library Reference for a complete guide to file objects. @@ -419,7 +412,6 @@ sent over a network connection to some distant machine. If you have an object ``x``, you can view its JSON string representation with a simple line of code:: - >>> import json >>> json.dumps([1, 'simple', 'list']) '[1, "simple", "list"]' diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst index e8d8e2b..faf57a3 100644 --- a/Doc/tutorial/interpreter.rst +++ b/Doc/tutorial/interpreter.rst @@ -10,13 +10,13 @@ Using the Python Interpreter Invoking the Interpreter ======================== -The Python interpreter is usually installed as :file:`/usr/local/bin/python3.5` +The Python interpreter is usually installed as :file:`/usr/local/bin/python3.6` on those machines where it is available; putting :file:`/usr/local/bin` in your Unix shell's search path makes it possible to start it by typing the command: .. code-block:: text - python3.5 + python3.6 to the shell. [#]_ Since the choice of the directory where the interpreter lives is an installation option, other places are possible; check with your local @@ -24,11 +24,11 @@ Python guru or system administrator. (E.g., :file:`/usr/local/python` is a popular alternative location.) On Windows machines, the Python installation is usually placed in -:file:`C:\\Python35`, though you can change this when you're running the +:file:`C:\\Python36`, though you can change this when you're running the installer. To add this directory to your path, you can type the following command into the command prompt in a DOS box:: - set path=%path%;C:\python35 + set path=%path%;C:\python36 Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on Windows) at the primary prompt causes the interpreter to exit with a zero exit @@ -98,8 +98,8 @@ before printing the first prompt: .. code-block:: shell-session - $ python3.5 - Python 3.5 (default, Sep 16 2015, 09:25:04) + $ python3.6 + Python 3.6 (default, Sep 16 2015, 09:25:04) [GCC 4.8.2] on linux Type "help", "copyright", "credits" or "license" for more information. >>> diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index 85ba896..7e8ee3e 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -100,8 +100,10 @@ give you an error:: There is full support for floating point; operators with mixed type operands convert the integer operand to floating point:: - >>> 4 * 3.75 - 1 - 14.0 + >>> 3 * 3.75 / 1.5 + 7.5 + >>> 7.0 / 2 + 3.5 In interactive mode, the last printed expression is assigned to the variable ``_``. This means that when you are using Python as a desk calculator, it is @@ -350,11 +352,14 @@ The built-in function :func:`len` returns the length of a string:: Strings support a large number of methods for basic transformations and searching. + :ref:`f-strings` + String literals that have embedded expressions. + :ref:`formatstrings` Information about string formatting with :meth:`str.format`. :ref:`old-string-formatting` - The old formatting operations invoked when strings are + The old formatting operations invoked when strings and Unicode strings are the left operand of the ``%`` operator are described in more detail here. diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst index 1e3d5c0..35db305 100644 --- a/Doc/tutorial/modules.rst +++ b/Doc/tutorial/modules.rst @@ -501,7 +501,7 @@ when the ``from...import`` statement is executed. (This also works when ``__all__`` is defined.) Although certain modules are designed to export only names that follow certain -patterns when you use ``import *``, it is still considered bad practice in +patterns when you use ``import *``, it is still considered bad practise in production code. Remember, there is nothing wrong with using ``from Package import diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst index 52ffdbe..1dd06c2 100644 --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -15,7 +15,7 @@ operating system:: >>> import os >>> os.getcwd() # Return the current working directory - 'C:\\Python35' + 'C:\\Python36' >>> os.chdir('/server/accesslogs') # Change current working directory >>> os.system('mkdir today') # Run the command mkdir in the system shell 0 diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst index f733ffc..bf02c71 100644 --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -278,7 +278,7 @@ applications include caching objects that are expensive to create:: Traceback (most recent call last): File "", line 1, in d['primary'] # entry was automatically removed - File "C:/python35/lib/weakref.py", line 46, in __getitem__ + File "C:/python36/lib/weakref.py", line 46, in __getitem__ o = self.data[key]() KeyError: 'primary' diff --git a/Doc/tutorial/venv.rst b/Doc/tutorial/venv.rst index 3b2ee2e..e2dd57d 100644 --- a/Doc/tutorial/venv.rst +++ b/Doc/tutorial/venv.rst @@ -20,15 +20,14 @@ the requirements of every application. If application A needs version the requirements are in conflict and installing either version 1.0 or 2.0 will leave one application unable to run. -The solution for this problem is to create a :term:`virtual -environment` (often shortened to "virtualenv"), a self-contained -directory tree that contains a Python installation for a particular -version of Python, plus a number of additional packages. +The solution for this problem is to create a :term:`virtual environment`, a +self-contained directory tree that contains a Python installation for a +particular version of Python, plus a number of additional packages. Different applications can then use different virtual environments. To resolve the earlier example of conflicting requirements, application A can have its own virtual environment with version 1.0 -installed while application B has another virtualenv with version 2.0. +installed while application B has another virtual environment with version 2.0. If application B requires a library be upgraded to version 3.0, this will not affect application A's environment. @@ -36,29 +35,26 @@ not affect application A's environment. Creating Virtual Environments ============================= -The script used to create and manage virtual environments is called -:program:`pyvenv`. :program:`pyvenv` will usually install the most -recent version of Python that you have available; the script is also -installed with a version number, so if you have multiple versions of -Python on your system you can select a specific Python version by -running ``pyvenv-3.4`` or whichever version you want. +The module used to create and manage virtual environments is called +:mod:`venv`. :mod:`venv` will usually install the most recent version of +Python that you have available. If you have multiple versions of Python on your +system, you can select a specific Python version by running ``python3`` or +whichever version you want. -To create a virtualenv, decide upon a directory -where you want to place it and run :program:`pyvenv` with the -directory path:: +To create a virtual environment, decide upon a directory where you want to +place it, and run the :mod:`venv` module as a script with the directory path:: - pyvenv tutorial-env + python3 -m venv tutorial-env This will create the ``tutorial-env`` directory if it doesn't exist, and also create directories inside it containing a copy of the Python interpreter, the standard library, and various supporting files. -Once you've created a virtual environment, you need to -activate it. +Once you've created a virtual environment, you may activate it. On Windows, run:: - tutorial-env/Scripts/activate + tutorial-env\Scripts\activate.bat On Unix or MacOS, run:: @@ -69,33 +65,36 @@ On Unix or MacOS, run:: ``activate.csh`` and ``activate.fish`` scripts you should use instead.) -Activating the virtualenv will change your shell's prompt to show what -virtualenv you're using, and modify the environment so that running -``python`` will get you that particular version and installation of -Python. For example:: +Activating the virtual environment will change your shell's prompt to show what +virtual environment you're using, and modify the environment so that running +``python`` will get you that particular version and installation of Python. +For example: - -> source ~/envs/tutorial-env/bin/activate - (tutorial-env) -> python - Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25) +.. code-block:: bash + + $ source ~/envs/tutorial-env/bin/activate + (tutorial-env) $ python + Python 3.5.1 (default, May 6 2016, 10:59:36) ... >>> import sys >>> sys.path - ['', '/usr/local/lib/python34.zip', ..., - '~/envs/tutorial-env/lib/python3.4/site-packages'] + ['', '/usr/local/lib/python35.zip', ..., + '~/envs/tutorial-env/lib/python3.5/site-packages'] >>> Managing Packages with pip ========================== -Once you've activated a virtual environment, you can install, upgrade, -and remove packages using a program called :program:`pip`. By default -``pip`` will install packages from the Python Package Index, -. You can browse the Python Package Index -by going to it in your web browser, or you can use ``pip``'s -limited search feature:: +You can install, upgrade, and remove packages using a program called +:program:`pip`. By default ``pip`` will install packages from the Python +Package Index, . You can browse the Python +Package Index by going to it in your web browser, or you can use ``pip``'s +limited search feature: + +.. code-block:: bash - (tutorial-env) -> pip search astronomy + (tutorial-env) $ pip search astronomy skyfield - Elegant astronomy for Python gary - Galactic astronomy and gravitational dynamics. novas - The United States Naval Observatory NOVAS astronomy library @@ -107,9 +106,11 @@ limited search feature:: "freeze", etc. (Consult the :ref:`installing-index` guide for complete documentation for ``pip``.) -You can install the latest version of a package by specifying a package's name:: +You can install the latest version of a package by specifying a package's name: + +.. code-block:: bash - -> pip install novas + (tutorial-env) $ pip install novas Collecting novas Downloading novas-3.1.1.3.tar.gz (136kB) Installing collected packages: novas @@ -117,9 +118,11 @@ You can install the latest version of a package by specifying a package's name:: Successfully installed novas-3.1.1.3 You can also install a specific version of a package by giving the -package name followed by ``==`` and the version number:: +package name followed by ``==`` and the version number: - -> pip install requests==2.6.0 +.. code-block:: bash + + (tutorial-env) $ pip install requests==2.6.0 Collecting requests==2.6.0 Using cached requests-2.6.0-py2.py3-none-any.whl Installing collected packages: requests @@ -128,9 +131,11 @@ package name followed by ``==`` and the version number:: If you re-run this command, ``pip`` will notice that the requested version is already installed and do nothing. You can supply a different version number to get that version, or you can run ``pip -install --upgrade`` to upgrade the package to the latest version:: +install --upgrade`` to upgrade the package to the latest version: + +.. code-block:: bash - -> pip install --upgrade requests + (tutorial-env) $ pip install --upgrade requests Collecting requests Installing collected packages: requests Found existing installation: requests 2.6.0 @@ -141,9 +146,11 @@ install --upgrade`` to upgrade the package to the latest version:: ``pip uninstall`` followed by one or more package names will remove the packages from the virtual environment. -``pip show`` will display information about a particular package:: +``pip show`` will display information about a particular package: - (tutorial-env) -> pip show requests +.. code-block:: bash + + (tutorial-env) $ pip show requests --- Metadata-Version: 2.0 Name: requests @@ -157,9 +164,11 @@ packages from the virtual environment. Requires: ``pip list`` will display all of the packages installed in the virtual -environment:: +environment: + +.. code-block:: bash - (tutorial-env) -> pip list + (tutorial-env) $ pip list novas (3.1.1.3) numpy (1.9.2) pip (7.0.3) @@ -168,19 +177,23 @@ environment:: ``pip freeze`` will produce a similar list of the installed packages, but the output uses the format that ``pip install`` expects. -A common convention is to put this list in a ``requirements.txt`` file:: +A common convention is to put this list in a ``requirements.txt`` file: - (tutorial-env) -> pip freeze > requirements.txt - (tutorial-env) -> cat requirements.txt +.. code-block:: bash + + (tutorial-env) $ pip freeze > requirements.txt + (tutorial-env) $ cat requirements.txt novas==3.1.1.3 numpy==1.9.2 requests==2.7.0 The ``requirements.txt`` can then be committed to version control and shipped as part of an application. Users can then install all the -necessary packages with ``install -r``:: +necessary packages with ``install -r``: + +.. code-block:: bash - -> pip install -r requirements.txt + (tutorial-env) $ pip install -r requirements.txt Collecting novas==3.1.1.3 (from -r requirements.txt (line 1)) ... Collecting numpy==1.9.2 (from -r requirements.txt (line 2)) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 906d31f..c0e64d6 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -180,8 +180,15 @@ Generic options Print the Python version number and exit. Example output could be:: - Python 3.0 + Python 3.6.0b2+ + When given twice, print more information about the build, like:: + + Python 3.6.0b2+ (3.6:84a3c5003510+, Oct 26 2016, 02:33:55) + [GCC 6.2.0 20161005] + + .. versionadded:: 3.6 + The ``-VV`` option. .. _using-on-misc-options: @@ -396,6 +403,8 @@ Miscellaneous options stored in a traceback of a trace. Use ``-X tracemalloc=NFRAME`` to start tracing with a traceback limit of *NFRAME* frames. See the :func:`tracemalloc.start` for more information. + * ``-X showalloccount`` to enable the output of the total count of allocated + objects for each type (only works when built with ``COUNT_ALLOCS`` defined); It also allows passing arbitrary values and retrieving them through the :data:`sys._xoptions` dictionary. @@ -409,6 +418,9 @@ Miscellaneous options .. versionadded:: 3.4 The ``-X showrefcount`` and ``-X tracemalloc`` options. + .. versionadded:: 3.6 + The ``-X showalloccount`` option. + Options you shouldn't use ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -518,8 +530,8 @@ conflict. .. envvar:: PYTHONDONTWRITEBYTECODE - If this is set to a non-empty string, Python won't try to write ``.pyc`` - files on the import of source modules. This is equivalent to + If this is set to a non-empty string, Python won't try to write ``.pyc`` or + ``.pyo`` files on the import of source modules. This is equivalent to specifying the :option:`-B` option. @@ -555,6 +567,10 @@ conflict. .. versionchanged:: 3.4 The ``encodingname`` part is now optional. + .. versionchanged:: 3.6 + On Windows, the encoding specified by this variable is ignored for interactive + console buffers unless :envvar:`PYTHONLEGACYWINDOWSIOENCODING` is also specified. + Files and pipes redirected through the standard streams are not affected. .. envvar:: PYTHONNOUSERSITE @@ -620,6 +636,81 @@ conflict. .. versionadded:: 3.4 +.. envvar:: PYTHONMALLOC + + Set the Python memory allocators and/or install debug hooks. + + Set the family of memory allocators used by Python: + + * ``malloc``: use the :c:func:`malloc` function of the C library + for all domains (:c:data:`PYMEM_DOMAIN_RAW`, :c:data:`PYMEM_DOMAIN_MEM`, + :c:data:`PYMEM_DOMAIN_OBJ`). + * ``pymalloc``: use the :ref:`pymalloc allocator ` for + :c:data:`PYMEM_DOMAIN_MEM` and :c:data:`PYMEM_DOMAIN_OBJ` domains and use + the :c:func:`malloc` function for the :c:data:`PYMEM_DOMAIN_RAW` domain. + + Install debug hooks: + + * ``debug``: install debug hooks on top of the default memory allocator + * ``malloc_debug``: same as ``malloc`` but also install debug hooks + * ``pymalloc_debug``: same as ``pymalloc`` but also install debug hooks + + When Python is compiled in release mode, the default is ``pymalloc``. When + compiled in debug mode, the default is ``pymalloc_debug`` and the debug hooks + are used automatically. + + If Python is configured without ``pymalloc`` support, ``pymalloc`` and + ``pymalloc_debug`` are not available, the default is ``malloc`` in release + mode and ``malloc_debug`` in debug mode. + + See the :c:func:`PyMem_SetupDebugHooks` function for debug hooks on Python + memory allocators. + + .. versionadded:: 3.6 + + +.. envvar:: PYTHONMALLOCSTATS + + If set to a non-empty string, Python will print statistics of the + :ref:`pymalloc memory allocator ` every time a new pymalloc object + arena is created, and on shutdown. + + This variable is ignored if the :envvar:`PYTHONMALLOC` environment variable + is used to force the :c:func:`malloc` allocator of the C library, or if + Python is configured without ``pymalloc`` support. + + .. versionchanged:: 3.6 + This variable can now also be used on Python compiled in release mode. + It now has no effect if set to an empty string. + + +.. envvar:: PYTHONLEGACYWINDOWSFSENCODING + + If set to a non-empty string, the default filesystem encoding and errors mode + will revert to their pre-3.6 values of 'mbcs' and 'replace', respectively. + Otherwise, the new defaults 'utf-8' and 'surrogatepass' are used. + + This may also be enabled at runtime with + :func:`sys._enablelegacywindowsfsencoding()`. + + Availability: Windows + + .. versionadded:: 3.6 + See :pep:`529` for more details. + +.. envvar:: PYTHONLEGACYWINDOWSIOENCODING + + If set to a non-empty string, does not use the new console reader and + writer. This means that Unicode characters will be encoded according to + the active console code page, rather than using utf-8. + + This variable is ignored if the standard streams are redirected (to files + or pipes) rather than referring to console buffers. + + Availability: Windows + + .. versionadded:: 3.6 + Debug-mode variables ~~~~~~~~~~~~~~~~~~~~ @@ -635,9 +726,3 @@ if Python was configured with the ``--with-pydebug`` build option. If set, Python will dump objects and reference counts still alive after shutting down the interpreter. - - -.. envvar:: PYTHONMALLOCSTATS - - If set, Python will print memory allocation statistics every time a new - object arena is created, and on shutdown. diff --git a/Doc/using/index.rst b/Doc/using/index.rst index a643e04..a5df713 100644 --- a/Doc/using/index.rst +++ b/Doc/using/index.rst @@ -6,7 +6,7 @@ This part of the documentation is devoted to general information on the setup -of the Python environment on different platforms, the invocation of the +of the Python environment on different platform, the invocation of the interpreter and things that make working with Python easier. @@ -17,4 +17,3 @@ interpreter and things that make working with Python easier. unix.rst windows.rst mac.rst - scripts.rst diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 05c91bb..8f1ac3f 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -25,7 +25,7 @@ there. What you get after installing is a number of things: -* A :file:`MacPython 3.5` folder in your :file:`Applications` folder. In here +* A :file:`MacPython 3.6` folder in your :file:`Applications` folder. In here you find IDLE, the development environment that is a standard part of official Python distributions; PythonLauncher, which handles double-clicking Python scripts from the Finder; and the "Build Applet" tool, which allows you to @@ -93,7 +93,7 @@ aware of: programs that talk to the Aqua window manager (in other words, anything that has a GUI) need to be run in a special way. Use :program:`pythonw` instead of :program:`python` to start such scripts. -With Python 3.5, you can use either :program:`python` or :program:`pythonw`. +With Python 3.6, you can use either :program:`python` or :program:`pythonw`. Configuration @@ -159,7 +159,7 @@ https://riverbankcomputing.com/software/pyqt/intro. Distributing Python Applications on the Mac =========================================== -The "Build Applet" tool that is placed in the MacPython 3.5 folder is fine for +The "Build Applet" tool that is placed in the MacPython 3.6 folder is fine for packaging small Python scripts on your own machine to run as a standard Mac application. This tool, however, is not robust enough to distribute Python applications to other users. diff --git a/Doc/using/scripts.rst b/Doc/using/scripts.rst deleted file mode 100644 index 2c87416..0000000 --- a/Doc/using/scripts.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. _tools-and-scripts: - -Additional Tools and Scripts -============================ - -.. _scripts-pyvenv: - -pyvenv - Creating virtual environments --------------------------------------- - -.. include:: venv-create.inc - diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index 7ad3008..53f431b 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -1,31 +1,39 @@ Creation of :ref:`virtual environments ` is done by executing the -``pyvenv`` script:: +command ``venv``:: - pyvenv /path/to/new/virtual/environment + python3 -m venv /path/to/new/virtual/environment Running this command creates the target directory (creating any parent directories that don't exist already) and places a ``pyvenv.cfg`` file in it -with a ``home`` key pointing to the Python installation the command was run -from. It also creates a ``bin`` (or ``Scripts`` on Windows) subdirectory +with a ``home`` key pointing to the Python installation from which the command +was run. It also creates a ``bin`` (or ``Scripts`` on Windows) subdirectory containing a copy of the ``python`` binary (or binaries, in the case of Windows). It also creates an (initially empty) ``lib/pythonX.Y/site-packages`` subdirectory (on Windows, this is ``Lib\site-packages``). +.. deprecated:: 3.6 + ``pyvenv`` was the recommended tool for creating virtual environments for + Python 3.3 and 3.4, and is `deprecated in Python 3.6 + `_. + +.. versionchanged:: 3.5 + The use of ``venv`` is now recommended for creating virtual environments. + .. seealso:: `Python Packaging User Guide: Creating and using virtual environments - `__ + `__ .. highlight:: none -On Windows, you may have to invoke the ``pyvenv`` script as follows, if you -don't have the relevant PATH and PATHEXT settings:: +On Windows, invoke the ``venv`` command as follows:: - c:\Temp>c:\Python35\python c:\Python35\Tools\Scripts\pyvenv.py myenv + c:\>c:\Python35\python -m venv c:\path\to\myenv -or equivalently:: +Alternatively, if you configured the ``PATH`` and ``PATHEXT`` variables for +your :ref:`Python installation `:: - c:\Temp>c:\Python35\python -m venv myenv + c:\>python -m venv myenv c:\path\to\myenv The command, if run with ``-h``, will show the available options:: @@ -36,25 +44,26 @@ The command, if run with ``-h``, will show the available options:: Creates virtual Python environments in one or more target directories. positional arguments: - ENV_DIR A directory to create the environment in. + ENV_DIR A directory to create the environment in. optional arguments: - -h, --help show this help message and exit - --system-site-packages Give the virtual environment access to the system - site-packages dir. - --symlinks Try to use symlinks rather than copies, when symlinks - are not the default for the platform. - --copies Try to use copies rather than symlinks, even when - symlinks are the default for the platform. - --clear Delete the contents of the environment directory if it - already exists, before environment creation. - --upgrade Upgrade the environment directory to use this version - of Python, assuming Python has been upgraded in-place. - --without-pip Skips installing or upgrading pip in the virtual - environment (pip is bootstrapped by default) - -Depending on how the ``venv`` functionality has been invoked, the usage message -may vary slightly, e.g. referencing ``pyvenv`` rather than ``venv``. + -h, --help show this help message and exit + --system-site-packages + Give the virtual environment access to the system + site-packages dir. + --symlinks Try to use symlinks rather than copies, when symlinks + are not the default for the platform. + --copies Try to use copies rather than symlinks, even when + symlinks are the default for the platform. + --clear Delete the contents of the environment directory if it + already exists, before environment creation. + --upgrade Upgrade the environment directory to use this version + of Python, assuming Python has been upgraded in-place. + --without-pip Skips installing or upgrading pip in the virtual + environment (pip is bootstrapped by default) + + Once an environment has been created, you may wish to activate it, e.g. by + sourcing an activate script in its bin directory. .. versionchanged:: 3.4 Installs pip by default, added the ``--without-pip`` and ``--copies`` @@ -73,12 +82,13 @@ run with the ``--system-site-packages`` option, ``false`` otherwise. Unless the ``--without-pip`` option is given, :mod:`ensurepip` will be invoked to bootstrap ``pip`` into the virtual environment. -Multiple paths can be given to ``pyvenv``, in which case an identical -virtualenv will be created, according to the given options, at each -provided path. +Multiple paths can be given to ``venv``, in which case an identical virtual +environment will be created, according to the given options, at each provided +path. -Once a venv has been created, it can be "activated" using a script in the -venv's binary directory. The invocation of the script is platform-specific: +Once a virtual environment has been created, it can be "activated" using a +script in the virtual environment's binary directory. The invocation of the +script is platform-specific: +-------------+-----------------+-----------------------------------------+ | Platform | Shell | Command to activate virtual environment | @@ -95,16 +105,17 @@ venv's binary directory. The invocation of the script is platform-specific: +-------------+-----------------+-----------------------------------------+ You don't specifically *need* to activate an environment; activation just -prepends the venv's binary directory to your path, so that "python" invokes the -venv's Python interpreter and you can run installed scripts without having to -use their full path. However, all scripts installed in a venv should be -runnable without activating it, and run with the venv's Python automatically. - -You can deactivate a venv by typing "deactivate" in your shell. The exact -mechanism is platform-specific: for example, the Bash activation script defines -a "deactivate" function, whereas on Windows there are separate scripts called -``deactivate.bat`` and ``Deactivate.ps1`` which are installed when the venv is -created. +prepends the virtual environment's binary directory to your path, so that +"python" invokes the virtual environment's Python interpreter and you can run +installed scripts without having to use their full path. However, all scripts +installed in a virtual environment should be runnable without activating it, +and run with the virtual environment's Python automatically. + +You can deactivate a virtual environment by typing "deactivate" in your shell. +The exact mechanism is platform-specific: for example, the Bash activation +script defines a "deactivate" function, whereas on Windows there are separate +scripts called ``deactivate.bat`` and ``Deactivate.ps1`` which are installed +when the virtual environment is created. .. versionadded:: 3.4 ``fish`` and ``csh`` activation scripts. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 1db8607..3e4b70e 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -29,15 +29,15 @@ Supported Versions As specified in :pep:`11`, a Python release only supports a Windows platform while Microsoft considers the platform under extended support. This means that -Python 3.5 supports Windows Vista and newer. If you require Windows XP support -then please install Python 3.4. +Python |version| supports Windows Vista and newer. If you require Windows XP +support then please install Python 3.4. Installation Steps ------------------ -Four Python 3.5 installers are available for download - two each for the 32-bit -and 64-bit versions of the interpreter. The *web installer* is a small initial -download, and it will automatically download the required components as +Four Python |version| installers are available for download - two each for the +32-bit and 64-bit versions of the interpreter. The *web installer* is a small +initial download, and it will automatically download the required components as necessary. The *offline installer* includes the components necessary for a default installation and only requires an internet connection for optional features. See :ref:`install-layout-option` for other ways to avoid downloading @@ -74,6 +74,31 @@ installation". In this case: * If selected, the install directory will be added to the system :envvar:`PATH` * Shortcuts are available for all users +.. _max-path: + +Removing the MAX_PATH Limitation +-------------------------------- + +Windows historically has limited path lengths to 260 characters. This meant that +paths longer than this would not resolve and errors would result. + +In the latest versions of Windows, this limitation can be expanded to +approximately 32,000 characters. Your administrator will need to activate the +"Enable Win32 long paths" group policy, or set the registry value +``HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem@LongPathsEnabled`` +to ``1``. + +This allows the :func:`open` function, the :mod:`os` module and most other +path functionality to accept and return paths longer than 260 characters when +using strings. (Use of bytes as paths is deprecated on Windows, and this feature +is not available when using bytes.) + +After changing the above option, no further configuration is required. + +.. versionchanged:: 3.6 + + Support for long paths was enabled in Python. + .. _install-quiet-option: Installing Without UI @@ -168,13 +193,13 @@ of available options is shown below. For example, to silently install a default, system-wide Python installation, you could use the following command (from an elevated command prompt):: - python-3.5.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 + python-3.6.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 To allow users to easily install a personal copy of Python without the test suite, you could provide a shortcut with the following command. This will display a simplified initial page and disallow customization:: - python-3.5.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0 + python-3.6.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0 SimpleInstall=1 SimpleInstallDescription="Just for me, no test suite." (Note that omitting the launcher also omits file associations, and is only @@ -209,13 +234,13 @@ where a large number of installations are going to be performed it is very useful to have a locally cached copy. Execute the following command from Command Prompt to download all possible -required files. Remember to substitute ``python-3.5.0.exe`` for the actual +required files. Remember to substitute ``python-3.6.0.exe`` for the actual name of your installer, and to create layouts in their own directories to avoid collisions between files with the same name. :: - python-3.5.0.exe /layout [optional target directory] + python-3.6.0.exe /layout [optional target directory] You may also specify the ``/quiet`` option to hide the progress display. @@ -320,7 +345,7 @@ User level and the System level, or temporarily in a command prompt. To temporarily set environment variables, open Command Prompt and use the :command:`set` command:: - C:\>set PATH=C:\Program Files\Python 3.5;%PATH% + C:\>set PATH=C:\Program Files\Python 3.6;%PATH% C:\>set PYTHONPATH=%PYTHONPATH%;C:\My_python_lib C:\>python @@ -376,10 +401,10 @@ Finding the Python executable Besides using the automatically created start menu entry for the Python interpreter, you might want to start Python in the command prompt. The -installer for Python 3.5 and later has an option to set that up for you. +installer has an option to set that up for you. -On the first page of the installer, an option labelled "Add Python 3.5 to -PATH" can be selected to have the installer add the install location into the +On the first page of the installer, an option labelled "Add Python to PATH" +may be selected to have the installer add the install location into the :envvar:`PATH`. The location of the :file:`Scripts\\` folder is also added. This allows you to type :command:`python` to run the interpreter, and :command:`pip` for the package installer. Thus, you can also execute your @@ -393,7 +418,7 @@ of your Python installation, delimited by a semicolon from other entries. An example variable could look like this (assuming the first two entries already existed):: - C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.5 + C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.6 .. _launcher: @@ -418,6 +443,8 @@ Getting started From the command-line ^^^^^^^^^^^^^^^^^^^^^ +.. versionchanged:: 3.6 + System-wide installations of Python 3.3 and later will put the launcher on your :envvar:`PATH`. The launcher is compatible with all available versions of Python, so it does not matter which version is installed. To check that the @@ -427,25 +454,26 @@ launcher is available, execute the following command in Command Prompt: py -You should find that the latest version of Python 2.x you have installed is +You should find that the latest version of Python you have installed is started - it can be exited as normal, and any additional command-line arguments specified will be sent directly to Python. -If you have multiple versions of Python 2.x installed (e.g., 2.6 and 2.7) you -will have noticed that Python 2.7 was started - to launch Python 2.6, try the -command: +If you have multiple versions of Python installed (e.g., 2.7 and |version|) you +will have noticed that Python |version| was started - to launch Python 2.7, try +the command: :: - py -2.6 + py -2.7 -If you have a Python 3.x installed, try the command: +If you want the latest version of Python 2.x you have installed, try the +command: :: - py -3 + py -2 -You should find the latest version of Python 3.x starts. +You should find the latest version of Python 2.x starts. If you see the following error, you do not have the launcher installed: @@ -500,6 +528,11 @@ version qualifier. Assuming you have Python 2.6 installed, try changing the first line to ``#! python2.6`` and you should find the 2.6 version information printed. +Note that unlike interactive use, a bare "python" will use the latest +version of Python 2.x that you have installed. This is for backward +compatibility and for compatibility with Unix, where the command ``python`` +typically refers to Python 2. + From file associations ^^^^^^^^^^^^^^^^^^^^^^ @@ -517,9 +550,9 @@ Shebang Lines If the first line of a script file starts with ``#!``, it is known as a "shebang" line. Linux and other Unix like operating systems have native -support for such lines and they are commonly used on such systems to indicate -how a script should be executed. This launcher allows the same facilities to -be used with Python scripts on Windows and the examples above demonstrate their +support for such lines and are commonly used on such systems to indicate how +a script should be executed. This launcher allows the same facilities to be +using with Python scripts on Windows and the examples above demonstrate their use. To allow shebang lines in Python scripts to be portable between Unix and @@ -676,7 +709,7 @@ target Python. -.. finding_modules: +.. _finding_modules: Finding modules =============== @@ -687,7 +720,24 @@ installation directory. So, if you had installed Python to :file:`C:\\Python\\Lib\\` and third-party modules should be stored in :file:`C:\\Python\\Lib\\site-packages\\`. -This is how :data:`sys.path` is populated on Windows: +To completely override :data:`sys.path`, create a ``._pth`` file with the same +name as the DLL (``python36._pth``) or the executable (``python._pth``) and +specify one line for each path to add to :data:`sys.path`. The file based on the +DLL name overrides the one based on the executable, which allows paths to be +restricted for any program loading the runtime if desired. + +When the file exists, all registry and environment variables are ignored, +isolated mode is enabled, and :mod:`site` is not imported unless one line in the +file specifies ``import site``. Blank paths and lines starting with ``#`` are +ignored. Each path may be absolute or relative to the location of the file. +Import statements other than to ``site`` are not permitted, and arbitrary code +cannot be specified. + +Note that ``.pth`` files (without leading underscore) will be processed normally +by the :mod:`site` module. + +When no ``._pth`` file is found, this is how :data:`sys.path` is populated on +Windows: * An empty entry is added at the start, which corresponds to the current directory. @@ -706,10 +756,11 @@ This is how :data:`sys.path` is populated on Windows: * If the environment variable :envvar:`PYTHONHOME` is set, it is assumed as "Python Home". Otherwise, the path of the main Python executable is used to - locate a "landmark file" (``Lib\os.py``) to deduce the "Python Home". If a - Python home is found, the relevant sub-directories added to :data:`sys.path` - (``Lib``, ``plat-win``, etc) are based on that folder. Otherwise, the core - Python path is constructed from the PythonPath stored in the registry. + locate a "landmark file" (either ``Lib\os.py`` or ``pythonXY.zip``) to deduce + the "Python Home". If a Python home is found, the relevant sub-directories + added to :data:`sys.path` (``Lib``, ``plat-win``, etc) are based on that + folder. Otherwise, the core Python path is constructed from the PythonPath + stored in the registry. * If the Python Home cannot be located, no :envvar:`PYTHONPATH` is specified in the environment, and no registry entries can be found, a default path with @@ -722,10 +773,6 @@ directory one level above the executable, the following variations apply: path is used instead of the path to the main executable when deducing the home location. -* If ``applocal`` is set to true, the ``home`` property or the main executable - is always used as the home path, and all environment variables or registry - values affecting the path are ignored. The landmark file is not checked. - The end result of all this is: * When running :file:`python.exe`, or any other .exe in the main Python @@ -744,13 +791,12 @@ The end result of all this is: For those who want to bundle Python into their application or distribution, the following advice will prevent conflicts with other installations: -* Include a ``pyvenv.cfg`` file alongside your executable containing - ``applocal = true``. This will ensure that your own directory will be used to - resolve paths even if you have included the standard library in a ZIP file. - It will also ignore user site-packages and other paths listed in the - registry. +* Include a ``._pth`` file alongside your executable containing the + directories to include. This will ignore paths listed in the registry and + environment variables, and also ignore :mod:`site` unless ``import site`` is + listed. -* If you are loading :file:`python3.dll` or :file:`python35.dll` in your own +* If you are loading :file:`python3.dll` or :file:`python36.dll` in your own executable, explicitly call :c:func:`Py_SetPath` or (at least) :c:func:`Py_SetProgramName` before :c:func:`Py_Initialize`. @@ -760,7 +806,8 @@ following advice will prevent conflicts with other installations: * If you cannot use the previous suggestions (for example, you are a distribution that allows people to run :file:`python.exe` directly), ensure that the landmark file (:file:`Lib\\os.py`) exists in your install directory. - (Note that it will not be detected inside a ZIP file.) + (Note that it will not be detected inside a ZIP file, but a correctly named + ZIP file will be detected instead.) These will ensure that the files in a system-wide installation will not take precedence over the copy of the standard library bundled with your application. @@ -768,6 +815,22 @@ Otherwise, your users may experience problems using your application. Note that the first suggestion is the best, as the other may still be susceptible to non-standard paths in the registry and user site-packages. +.. versionchanged:: + 3.6 + + * Adds ``._pth`` file support and removes ``applocal`` option from + ``pyvenv.cfg``. + * Adds ``pythonXX.zip`` as a potential landmark when directly adjacent + to the executable. + +.. deprecated:: + 3.6 + + Modules specified in the registry under ``Modules`` (not ``PythonPath``) + may be imported by :class:`importlib.machinery.WindowsRegistryFinder`. + This finder is enabled on Windows in 3.6.0 and earlier, but may need to + be explicitly added to :attr:`sys.meta_path` in the future. + Additional modules ================== @@ -867,7 +930,7 @@ directly accessed by end-users. When extracted, the embedded distribution is (almost) fully isolated from the user's system, including environment variables, system registry settings, and installed packages. The standard library is included as pre-compiled and -optimized ``.pyc`` files in a ZIP, and ``python3.dll``, ``python35.dll``, +optimized ``.pyc`` files in a ZIP, and ``python3.dll``, ``python36.dll``, ``python.exe`` and ``pythonw.exe`` are all provided. Tcl/tk (including all dependants, such as Idle), pip and the Python documentation are not included. diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 5cbf501..010a007 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -145,8 +145,8 @@ strings. Unicode uses 16-bit numbers to represent characters instead of the 8-bit number used by ASCII, meaning that 65,536 distinct characters can be supported. -The final interface for Unicode support was arrived at through countless -often-stormy discussions on the python-dev mailing list, and mostly implemented by +The final interface for Unicode support was arrived at through countless often- +stormy discussions on the python-dev mailing list, and mostly implemented by Marc-André Lemburg, based on a Unicode string type implementation by Fredrik Lundh. A detailed explanation of the interface was written up as :pep:`100`, "Python Unicode Integration". This article will simply cover the most @@ -885,8 +885,8 @@ interfaces for processing XML have become common: SAX2 (version 2 of the Simple API for XML) provides an event-driven interface with some similarities to :mod:`xmllib`, and the DOM (Document Object Model) provides a tree-based interface, transforming an XML document into a tree of nodes that can be -traversed and modified. Python 2.0 includes a SAX2 interface and a stripped-down -DOM interface as part of the :mod:`xml` package. Here we will give a brief +traversed and modified. Python 2.0 includes a SAX2 interface and a stripped- +down DOM interface as part of the :mod:`xml` package. Here we will give a brief overview of these new interfaces; consult the Python documentation or the source code for complete details. The Python XML SIG is also working on improved documentation. diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst index ad4c6d5..380edec 100644 --- a/Doc/whatsnew/2.1.rst +++ b/Doc/whatsnew/2.1.rst @@ -159,8 +159,8 @@ precede any statement that will result in bytecodes being produced. PEP 207: Rich Comparisons ========================= -In earlier versions, Python's support for implementing comparisons on user-defined -classes and extension types was quite simple. Classes could implement a +In earlier versions, Python's support for implementing comparisons on user- +defined classes and extension types was quite simple. Classes could implement a :meth:`__cmp__` method that was given two instances of a class, and could only return 0 if they were equal or +1 or -1 if they weren't; the method couldn't raise an exception or return anything other than a Boolean value. Users of @@ -367,7 +367,7 @@ dictionary:: This version works for simple things such as integers, but it has a side effect; the ``_cache`` dictionary holds a reference to the return values, so they'll -never be deallocated until the Python process exits and cleans up This isn't +never be deallocated until the Python process exits and cleans up. This isn't very noticeable for integers, but if :func:`f` returns an object, or a data structure that takes up a lot of memory, this can be a problem. @@ -465,11 +465,11 @@ Windows being the primary examples; on these systems, it's impossible to distinguish the filenames ``FILE.PY`` and ``file.py``, even though they do store the file's name in its original case (they're case-preserving, too). -In Python 2.1, the :keyword:`import` statement will work to simulate case-sensitivity -on case-insensitive platforms. Python will now search for the first +In Python 2.1, the :keyword:`import` statement will work to simulate case- +sensitivity on case-insensitive platforms. Python will now search for the first case-sensitive match by default, raising an :exc:`ImportError` if no such file -is found, so ``import file`` will not import a module named ``FILE.PY``. -Case-insensitive matching can be requested by setting the :envvar:`PYTHONCASEOK` +is found, so ``import file`` will not import a module named ``FILE.PY``. Case- +insensitive matching can be requested by setting the :envvar:`PYTHONCASEOK` environment variable before starting the Python interpreter. .. ====================================================================== @@ -481,8 +481,8 @@ PEP 217: Interactive Display Hook When using the Python interpreter interactively, the output of commands is displayed using the built-in :func:`repr` function. In Python 2.1, the variable :func:`sys.displayhook` can be set to a callable object which will be called -instead of :func:`repr`. For example, you can set it to a special -pretty-printing function:: +instead of :func:`repr`. For example, you can set it to a special pretty- +printing function:: >>> # Create a recursive data structure ... L = [1,2,3] diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst index a0bb81a..5f28c29 100644 --- a/Doc/whatsnew/2.2.rst +++ b/Doc/whatsnew/2.2.rst @@ -962,8 +962,8 @@ New and Improved Modules * The new :mod:`hmac` module implements the HMAC algorithm described by :rfc:`2104`. (Contributed by Gerhard Häring.) -* Several functions that originally returned lengthy tuples now return - pseudo-sequences that still behave like tuples but also have mnemonic attributes such +* Several functions that originally returned lengthy tuples now return pseudo- + sequences that still behave like tuples but also have mnemonic attributes such as memberst_mtime or :attr:`tm_year`. The enhanced functions include :func:`stat`, :func:`fstat`, :func:`statvfs`, and :func:`fstatvfs` in the :mod:`os` module, and :func:`localtime`, :func:`gmtime`, and :func:`strptime` in @@ -1141,8 +1141,8 @@ Some of the more notable changes are: The most significant change is the ability to build Python as a framework, enabled by supplying the :option:`!--enable-framework` option to the configure - script when compiling Python. According to Jack Jansen, "This installs a - self-contained Python installation plus the OS X framework "glue" into + script when compiling Python. According to Jack Jansen, "This installs a self- + contained Python installation plus the OS X framework "glue" into :file:`/Library/Frameworks/Python.framework` (or another location of choice). For now there is little immediate added benefit to this (actually, there is the disadvantage that you have to change your PATH to be able to find Python), but diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst index cebfb21..93930b8 100644 --- a/Doc/whatsnew/2.3.rst +++ b/Doc/whatsnew/2.3.rst @@ -86,8 +86,8 @@ The union and intersection of sets can be computed with the :meth:`union` and It's also possible to take the symmetric difference of two sets. This is the set of all elements in the union that aren't in the intersection. Another way of putting it is that the symmetric difference contains all elements that are in -exactly one set. Again, there's an alternative notation (``^``), and an -in-place version with the ungainly name :meth:`symmetric_difference_update`. :: +exactly one set. Again, there's an alternative notation (``^``), and an in- +place version with the ungainly name :meth:`symmetric_difference_update`. :: >>> S1 = sets.Set([1,2,3,4]) >>> S2 = sets.Set([3,4,5,6]) @@ -288,8 +288,8 @@ use characters outside of the usual alphanumerics. PEP 273: Importing Modules from ZIP Archives ============================================ -The new :mod:`zipimport` module adds support for importing modules from a -ZIP-format archive. You don't need to import the module explicitly; it will be +The new :mod:`zipimport` module adds support for importing modules from a ZIP- +format archive. You don't need to import the module explicitly; it will be automatically imported if a ZIP archive's filename is added to ``sys.path``. For example: @@ -375,8 +375,8 @@ PEP 278: Universal Newline Support ================================== The three major operating systems used today are Microsoft Windows, Apple's -Macintosh OS, and the various Unix derivatives. A minor irritation of -cross-platform work is that these three platforms all use different characters to +Macintosh OS, and the various Unix derivatives. A minor irritation of cross- +platform work is that these three platforms all use different characters to mark the ends of lines in text files. Unix uses the linefeed (ASCII character 10), MacOS uses the carriage return (ASCII character 13), and Windows uses a two-character sequence of a carriage return plus a newline. diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst index 7c125ff..8db90cc 100644 --- a/Doc/whatsnew/2.4.rst +++ b/Doc/whatsnew/2.4.rst @@ -517,8 +517,8 @@ Sometimes you can see this inaccuracy when the number is printed:: >>> 1.1 1.1000000000000001 -The inaccuracy isn't always visible when you print the number because the -FP-to-decimal-string conversion is provided by the C library, and most C libraries try +The inaccuracy isn't always visible when you print the number because the FP-to- +decimal-string conversion is provided by the C library, and most C libraries try to produce sensible output. Even if it's not displayed, however, the inaccuracy is still there and subsequent operations can magnify the error. @@ -595,8 +595,8 @@ exponent:: ... decimal.InvalidOperation: x ** (non-integer) -You can combine :class:`Decimal` instances with integers, but not with -floating-point numbers:: +You can combine :class:`Decimal` instances with integers, but not with floating- +point numbers:: >>> a + 4 Decimal("39.72") @@ -684,8 +684,8 @@ includes a quick-start tutorial and a reference. Raymond Hettinger, Aahz, and Tim Peters. http://www.lahey.com/float.htm - The article uses Fortran code to illustrate many of the problems that - floating-point inaccuracy can cause. + The article uses Fortran code to illustrate many of the problems that floating- + point inaccuracy can cause. http://speleotrove.com/decimal/ A description of a decimal-based representation. This representation is being @@ -741,8 +741,8 @@ functions in Python's implementation required that the numeric locale remain set to the ``'C'`` locale. Often this was because the code was using the C library's :c:func:`atof` function. -Not setting the numeric locale caused trouble for extensions that used third-party -C libraries, however, because they wouldn't have the correct locale set. +Not setting the numeric locale caused trouble for extensions that used third- +party C libraries, however, because they wouldn't have the correct locale set. The motivating example was GTK+, whose user interface widgets weren't displaying numbers in the current locale. @@ -918,8 +918,8 @@ Here are all of the changes that Python 2.4 makes to the core Python language. (Contributed by Raymond Hettinger.) -* Encountering a failure while importing a module no longer leaves a partially-initialized - module object in ``sys.modules``. The incomplete module object left +* Encountering a failure while importing a module no longer leaves a partially- + initialized module object in ``sys.modules``. The incomplete module object left behind would fool further imports of the same module into succeeding, leading to confusing errors. (Fixed by Tim Peters.) @@ -1028,8 +1028,8 @@ complete list of changes, or look through the CVS logs for all the details. previous ones left off. (Implemented by Walter Dörwald.) * There is a new :mod:`collections` module for various specialized collection - datatypes. Currently it contains just one type, :class:`deque`, a double-ended - queue that supports efficiently adding and removing elements from either + datatypes. Currently it contains just one type, :class:`deque`, a double- + ended queue that supports efficiently adding and removing elements from either end:: >>> from collections import deque @@ -1485,8 +1485,8 @@ Some of the changes to Python's build process and to the C API are: intended as an aid to people developing the Python core. Providing :option:`!--enable-profiling` to the :program:`configure` script will let you profile the interpreter with :program:`gprof`, and providing the - :option:`!--with-tsc` switch enables profiling using the Pentium's - Time-Stamp-Counter register. Note that the :option:`!--with-tsc` switch is slightly + :option:`!--with-tsc` switch enables profiling using the Pentium's Time-Stamp- + Counter register. Note that the :option:`!--with-tsc` switch is slightly misnamed, because the profiling feature also works on the PowerPC platform, though that processor architecture doesn't call that register "the TSC register". (Contributed by Jeremy Hylton.) @@ -1540,8 +1540,8 @@ code: * The :mod:`tarfile` module now generates GNU-format tar files by default. -* Encountering a failure while importing a module no longer leaves a - partially-initialized module object in ``sys.modules``. +* Encountering a failure while importing a module no longer leaves a partially- + initialized module object in ``sys.modules``. * :const:`None` is now a constant; code that binds a new value to the name ``None`` is now a syntax error. diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index 4d48291..db8f9df 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -157,8 +157,8 @@ Here's a small but realistic example:: server_log = functools.partial(log, subsystem='server') server_log('Unable to open socket') -Here's another example, from a program that uses PyGTK. Here a context-sensitive -pop-up menu is being constructed dynamically. The callback provided +Here's another example, from a program that uses PyGTK. Here a context- +sensitive pop-up menu is being constructed dynamically. The callback provided for the menu option is a partially applied version of the :meth:`open_item` method, where the first argument has been provided. :: @@ -171,8 +171,8 @@ method, where the first argument has been provided. :: popup_menu.append( ("Open", open_func, 1) ) Another function in the :mod:`functools` module is the -``update_wrapper(wrapper, wrapped)`` function that helps you write -well-behaved decorators. :func:`update_wrapper` copies the name, module, and +``update_wrapper(wrapper, wrapped)`` function that helps you write well- +behaved decorators. :func:`update_wrapper` copies the name, module, and docstring attribute to a wrapper function so that tracebacks inside the wrapped function are easier to understand. For example, you might write:: @@ -297,8 +297,8 @@ can't protect against having your submodule's name being used for a new module added in a future version of Python. In Python 2.5, you can switch :keyword:`import`'s behaviour to absolute imports -using a ``from __future__ import absolute_import`` directive. This absolute-import -behaviour will become the default in a future version (probably Python +using a ``from __future__ import absolute_import`` directive. This absolute- +import behaviour will become the default in a future version (probably Python 2.7). Once absolute imports are the default, ``import string`` will always find the standard library's version. It's suggested that users should begin using absolute imports as much as possible, so it's preferable to begin writing @@ -602,8 +602,8 @@ be used with the ':keyword:`with`' statement. File objects are one example:: ... more processing code ... After this statement has executed, the file object in *f* will have been -automatically closed, even if the :keyword:`for` loop raised an exception -part-way through the block. +automatically closed, even if the :keyword:`for` loop raised an exception part- +way through the block. .. note:: @@ -1558,8 +1558,8 @@ complete list of changes, or look through the SVN logs for all the details. You can also pack and unpack data to and from buffer objects directly using the ``pack_into(buffer, offset, v1, v2, ...)`` and ``unpack_from(buffer, - offset)`` methods. This lets you store data directly into an array or a - memory-mapped file. + offset)`` methods. This lets you store data directly into an array or a memory- + mapped file. (:class:`Struct` objects were implemented by Bob Ippolito at the NeedForSpeed sprint. Support for buffer objects was added by Martin Blais, also at the @@ -2281,8 +2281,8 @@ Acknowledgements The author would like to thank the following people for offering suggestions, corrections and assistance with various drafts of this article: Georg Brandl, -Nick Coghlan, Phillip J. Eby, Lars Gustäbel, Raymond Hettinger, Ralf W. -Grosse-Kunstleve, Kent Johnson, Iain Lowe, Martin von Löwis, Fredrik Lundh, Andrew +Nick Coghlan, Phillip J. Eby, Lars Gustäbel, Raymond Hettinger, Ralf W. Grosse- +Kunstleve, Kent Johnson, Iain Lowe, Martin von Löwis, Fredrik Lundh, Andrew McNamara, Skip Montanaro, Gustavo Niemeyer, Paul Prescod, James Pryor, Mike Rovner, Scott Weikart, Barry Warsaw, Thomas Wouters. diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index cc2fa3d..4fc0c36 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -290,8 +290,8 @@ be used with the ':keyword:`with`' statement. File objects are one example:: ... more processing code ... After this statement has executed, the file object in *f* will have been -automatically closed, even if the :keyword:`for` loop raised an exception -part-way through the block. +automatically closed, even if the :keyword:`for` loop raised an exception part- +way through the block. .. note:: diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst index 9acc734..b900e77 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -1253,9 +1253,9 @@ definition:: @contextmanager def track_entry_and_exit(name): - logging.info('Entering: {}'.format(name)) + logging.info('Entering: %s', name) yield - logging.info('Exiting: {}'.format(name)) + logging.info('Exiting: %s', name) Formerly, this would have only been usable as a context manager:: diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 0c9f2bb..93b297c 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -108,7 +108,7 @@ packages. Their concept and implementation are inspired by the popular with the interpreter core. This PEP adds the :mod:`venv` module for programmatic access, and the -:ref:`pyvenv ` script for command-line access and +``pyvenv`` script for command-line access and administration. The Python interpreter checks for a ``pyvenv.cfg``, file whose existence signals the base of a virtual environment's directory tree. diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 1e5c9d1..72398f9 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -197,7 +197,7 @@ will also be installed. On other platforms, the system wide unversioned ``pip`` command typically refers to the separately installed Python 2 version. -The :ref:`pyvenv ` command line utility and the :mod:`venv` +The ``pyvenv`` command line utility and the :mod:`venv` module make use of the :mod:`ensurepip` module to make ``pip`` readily available in virtual environments. When using the command line utility, ``pip`` is installed by default, while when using the :mod:`venv` module @@ -824,7 +824,7 @@ currently in the new module, which is being added as part of email's new :term:`provisional API`. These classes provide a number of new methods that make extracting content from and inserting content into email messages much easier. For details, see the :mod:`~email.contentmanager` documentation and -the :ref:`email-contentmanager-api-examples`. These API additions complete the +the :ref:`email-examples`. These API additions complete the bulk of the work that was planned as part of the email6 project. The currently provisional API is scheduled to become final in Python 3.5 (possibly with a few minor additions in the area of error handling). (Contributed by R. David @@ -1989,11 +1989,11 @@ Other Improvements Stinner using his :pep:`445`-based ``pyfailmalloc`` tool (:issue:`18408`, :issue:`18520`). -* The :ref:`pyvenv ` command now accepts a ``--copies`` option +* The ``pyvenv`` command now accepts a ``--copies`` option to use copies rather than symlinks even on systems where symlinks are the default. (Contributed by Vinay Sajip in :issue:`18807`.) -* The :ref:`pyvenv ` command also accepts a ``--without-pip`` +* The ``pyvenv`` command also accepts a ``--without-pip`` option to suppress the otherwise-automatic bootstrapping of pip into the virtual environment. (Contributed by Nick Coghlan in :issue:`19552` as part of the :pep:`453` implementation.) @@ -2459,7 +2459,7 @@ Changes in the Python API stream in :mod:`~io.TextIOWrapper` to use its *newline* argument (:issue:`15204`). -* If you use :ref:`pyvenv ` in a script and desire that pip +* If you use ``pyvenv`` in a script and desire that pip *not* be installed, you must add ``--without-pip`` to your command invocation. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 39b6ee5..edb74f0 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -46,7 +46,8 @@ This article explains the new features in Python 3.5, compared to 3.4. Python 3.5 was released on September 13, 2015.  See the -:ref:`changelog ` for a full list of changes. +`changelog `_ for a full +list of changes. .. seealso:: @@ -2175,8 +2176,7 @@ New ``calloc`` functions were added: * :c:func:`PyMem_RawCalloc`, * :c:func:`PyMem_Calloc`, -* :c:func:`PyObject_Calloc`, -* :c:func:`_PyObject_GC_Calloc`. +* :c:func:`PyObject_Calloc`. (Contributed by Victor Stinner in :issue:`21233`.) @@ -2327,12 +2327,11 @@ The :func:`inspect.getargspec` function is deprecated and scheduled to be removed in Python 3.6. (See :issue:`20438` for details.) The :mod:`inspect` :func:`~inspect.getfullargspec`, -:func:`~inspect.getcallargs`, and :func:`~inspect.formatargspec` functions are -deprecated in favor of the :func:`inspect.signature` API. (Contributed by Yury -Selivanov in :issue:`20438`.) - -:func:`~inspect.getargvalues` and :func:`~inspect.formatargvalues` functions -were inadvertently marked as deprecated with the release of Python 3.5.0. +:func:`~inspect.getargvalues`, :func:`~inspect.getcallargs`, +:func:`~inspect.getargvalues`, :func:`~inspect.formatargspec`, and +:func:`~inspect.formatargvalues` functions are deprecated in favor of +the :func:`inspect.signature` API. +(Contributed by Yury Selivanov in :issue:`20438`.) Use of :const:`re.LOCALE` flag with str patterns or :const:`re.ASCII` is now deprecated. (Contributed by Serhiy Storchaka in :issue:`22407`.) diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst new file mode 100644 index 0000000..c0d8ac4 --- /dev/null +++ b/Doc/whatsnew/3.6.rst @@ -0,0 +1,2305 @@ +**************************** + What's New In Python 3.6 +**************************** + +:Release: |release| +:Date: |today| +:Editors: Elvis Pranskevichus , Yury Selivanov + +.. Rules for maintenance: + + * Anyone can add text to this document. Do not spend very much time + on the wording of your changes, because your text will probably + get rewritten to some degree. + + * The maintainer will go through Misc/NEWS periodically and add + changes; it's therefore more important to add your changes to + Misc/NEWS than to this file. + + * This is not a complete list of every single change; completeness + is the purpose of Misc/NEWS. Some changes I consider too small + or esoteric to include. If such a change is added to the text, + I'll just remove it. (This is another reason you shouldn't spend + too much time on writing your addition.) + + * If you want to draw your new text to the attention of the + maintainer, add 'XXX' to the beginning of the paragraph or + section. + + * It's OK to just add a fragmentary note about a change. For + example: "XXX Describe the transmogrify() function added to the + socket module." The maintainer will research the change and + write the necessary text. + + * You can comment out your additions if you like, but it's not + necessary (especially when a final release is some months away). + + * Credit the author of a patch or bugfix. Just the name is + sufficient; the e-mail address isn't necessary. + + * It's helpful to add the bug/patch number as a comment: + + XXX Describe the transmogrify() function added to the socket + module. + (Contributed by P.Y. Developer in :issue:`12345`.) + + This saves the maintainer the effort of going through the Mercurial log + when researching a change. + +This article explains the new features in Python 3.6, compared to 3.5. +Python 3.6 was released on December 23, 2016.  See the +`changelog `_ for a full +list of changes. + +.. seealso:: + + :pep:`494` - Python 3.6 Release Schedule + + +Summary -- Release highlights +============================= + +New syntax features: + +* :ref:`PEP 498 `, formatted string literals. + +* :ref:`PEP 515 `, underscores in numeric literals. + +* :ref:`PEP 526 `, syntax for variable annotations. + +* :ref:`PEP 525 `, asynchronous generators. + +* :ref:`PEP 530 `: asynchronous comprehensions. + + +New library modules: + +* :mod:`secrets`: :ref:`PEP 506 -- Adding A Secrets Module To The Standard Library `. + + +CPython implementation improvements: + +* The :ref:`dict ` type has been reimplemented to use + a :ref:`more compact representation ` + similar to the `PyPy dict implementation`_. This resulted in dictionaries + using 20% to 25% less memory when compared to Python 3.5. + +* Customization of class creation has been simplified with the + :ref:`new protocol `. + +* The class attribute definition order is + :ref:`now preserved `. + +* The order of elements in ``**kwargs`` now + :ref:`corresponds to the order ` in which keyword + arguments were passed to the function. + +* DTrace and SystemTap :ref:`probing support ` has + been added. + +* The new :ref:`PYTHONMALLOC ` environment variable + can now be used to debug the interpreter memory allocation and access + errors. + + +Significant improvements in the standard library: + +* The :mod:`asyncio` module has received new features, significant + usability and performance improvements, and a fair amount of bug fixes. + Starting with Python 3.6 the ``asyncio`` module is no longer provisional + and its API is considered stable. + +* A new :ref:`file system path protocol ` has been + implemented to support :term:`path-like objects `. + All standard library functions operating on paths have been updated to + work with the new protocol. + +* The :mod:`datetime` module has gained support for + :ref:`Local Time Disambiguation `. + +* The :mod:`typing` module received a number of + :ref:`improvements ` and is no longer provisional. + +* The :mod:`tracemalloc` module has been significantly reworked + and is now used to provide better output for :exc:`ResourceWarning` + as well as provide better diagnostics for memory allocation errors. + See the :ref:`PYTHONMALLOC section ` for more + information. + + +Security improvements: + +* The new :mod:`secrets` module has been added to simplify the generation of + cryptographically strong pseudo-random numbers suitable for + managing secrets such as account authentication, tokens, and similar. + +* On Linux, :func:`os.urandom` now blocks until the system urandom entropy + pool is initialized to increase the security. See the :pep:`524` for the + rationale. + +* The :mod:`hashlib` and :mod:`ssl` modules now support OpenSSL 1.1.0. + +* The default settings and feature set of the :mod:`ssl` module have been + improved. + +* The :mod:`hashlib` module received support for the BLAKE2, SHA-3 and SHAKE + hash algorithms and the :func:`~hashlib.scrypt` key derivation function. + + +Windows improvements: + +* :ref:`PEP 528 ` and :ref:`PEP 529 `, + Windows filesystem and console encoding changed to UTF-8. + +* The ``py.exe`` launcher, when used interactively, no longer prefers + Python 2 over Python 3 when the user doesn't specify a version (via + command line arguments or a config file). Handling of shebang lines + remains unchanged - "python" refers to Python 2 in that case. + +* ``python.exe`` and ``pythonw.exe`` have been marked as long-path aware, + which means that the 260 character path limit may no longer apply. + See :ref:`removing the MAX_PATH limitation ` for details. + +* A ``._pth`` file can be added to force isolated mode and fully specify + all search paths to avoid registry and environment lookup. See + :ref:`the documentation ` for more information. + +* A ``python36.zip`` file now works as a landmark to infer + :envvar:`PYTHONHOME`. See :ref:`the documentation ` for + more information. + + +.. _PyPy dict implementation: https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html + + +New Features +============ + +.. _whatsnew36-pep498: + +PEP 498: Formatted string literals +---------------------------------- + +:pep:`498` introduces a new kind of string literals: *f-strings*, or +:ref:`formatted string literals `. + +Formatted string literals are prefixed with ``'f'`` and are similar to +the format strings accepted by :meth:`str.format`. They contain replacement +fields surrounded by curly braces. The replacement fields are expressions, +which are evaluated at run time, and then formatted using the +:func:`format` protocol:: + + >>> name = "Fred" + >>> f"He said his name is {name}." + 'He said his name is Fred.' + >>> width = 10 + >>> precision = 4 + >>> value = decimal.Decimal("12.34567") + >>> f"result: {value:{width}.{precision}}" # nested fields + 'result: 12.35' + +.. seealso:: + + :pep:`498` -- Literal String Interpolation. + PEP written and implemented by Eric V. Smith. + + :ref:`Feature documentation `. + + +.. _whatsnew36-pep526: + +PEP 526: Syntax for variable annotations +---------------------------------------- + +:pep:`484` introduced the standard for type annotations of function +parameters, a.k.a. type hints. This PEP adds syntax to Python for annotating +the types of variables including class variables and instance variables:: + + primes: List[int] = [] + + captain: str # Note: no initial value! + + class Starship: + stats: Dict[str, int] = {} + +Just as for function annotations, the Python interpreter does not attach any +particular meaning to variable annotations and only stores them in the +``__annotations__`` attribute of a class or module. + +In contrast to variable declarations in statically typed languages, +the goal of annotation syntax is to provide an easy way to specify structured +type metadata for third party tools and libraries via the abstract syntax tree +and the ``__annotations__`` attribute. + +.. seealso:: + + :pep:`526` -- Syntax for variable annotations. + PEP written by Ryan Gonzalez, Philip House, Ivan Levkivskyi, Lisa Roach, + and Guido van Rossum. Implemented by Ivan Levkivskyi. + + Tools that use or will use the new syntax: + `mypy `_, + `pytype `_, PyCharm, etc. + + +.. _whatsnew36-pep515: + +PEP 515: Underscores in Numeric Literals +---------------------------------------- + +:pep:`515` adds the ability to use underscores in numeric literals for +improved readability. For example:: + + >>> 1_000_000_000_000_000 + 1000000000000000 + >>> 0x_FF_FF_FF_FF + 4294967295 + +Single underscores are allowed between digits and after any base +specifier. Leading, trailing, or multiple underscores in a row are not +allowed. + +The :ref:`string formatting ` language also now has support +for the ``'_'`` option to signal the use of an underscore for a thousands +separator for floating point presentation types and for integer +presentation type ``'d'``. For integer presentation types ``'b'``, +``'o'``, ``'x'``, and ``'X'``, underscores will be inserted every 4 +digits:: + + >>> '{:_}'.format(1000000) + '1_000_000' + >>> '{:_x}'.format(0xFFFFFFFF) + 'ffff_ffff' + +.. seealso:: + + :pep:`515` -- Underscores in Numeric Literals + PEP written by Georg Brandl and Serhiy Storchaka. + + +.. _whatsnew36-pep525: + +PEP 525: Asynchronous Generators +-------------------------------- + +:pep:`492` introduced support for native coroutines and ``async`` / ``await`` +syntax to Python 3.5. A notable limitation of the Python 3.5 implementation +is that it was not possible to use ``await`` and ``yield`` in the same +function body. In Python 3.6 this restriction has been lifted, making it +possible to define *asynchronous generators*:: + + async def ticker(delay, to): + """Yield numbers from 0 to *to* every *delay* seconds.""" + for i in range(to): + yield i + await asyncio.sleep(delay) + +The new syntax allows for faster and more concise code. + +.. seealso:: + + :pep:`525` -- Asynchronous Generators + PEP written and implemented by Yury Selivanov. + + +.. _whatsnew36-pep530: + +PEP 530: Asynchronous Comprehensions +------------------------------------ + +:pep:`530` adds support for using ``async for`` in list, set, dict +comprehensions and generator expressions:: + + result = [i async for i in aiter() if i % 2] + +Additionally, ``await`` expressions are supported in all kinds +of comprehensions:: + + result = [await fun() for fun in funcs if await condition()] + +.. seealso:: + + :pep:`530` -- Asynchronous Comprehensions + PEP written and implemented by Yury Selivanov. + + +.. _whatsnew36-pep487: + +PEP 487: Simpler customization of class creation +------------------------------------------------ + +It is now possible to customize subclass creation without using a metaclass. +The new ``__init_subclass__`` classmethod will be called on the base class +whenever a new subclass is created:: + + class PluginBase: + subclasses = [] + + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + cls.subclasses.append(cls) + + class Plugin1(PluginBase): + pass + + class Plugin2(PluginBase): + pass + +In order to allow zero-argument :func:`super` calls to work correctly from +:meth:`~object.__init_subclass__` implementations, custom metaclasses must +ensure that the new ``__classcell__`` namespace entry is propagated to +``type.__new__`` (as described in :ref:`class-object-creation`). + +.. seealso:: + + :pep:`487` -- Simpler customization of class creation + PEP written and implemented by Martin Teichmann. + + :ref:`Feature documentation ` + + +.. _whatsnew36-pep487-descriptors: + +PEP 487: Descriptor Protocol Enhancements +----------------------------------------- + +:pep:`487` extends the descriptor protocol has to include the new optional +:meth:`~object.__set_name__` method. Whenever a new class is defined, the new +method will be called on all descriptors included in the definition, providing +them with a reference to the class being defined and the name given to the +descriptor within the class namespace. In other words, instances of +descriptors can now know the attribute name of the descriptor in the +owner class:: + + class IntField: + def __get__(self, instance, owner): + return instance.__dict__[self.name] + + def __set__(self, instance, value): + if not isinstance(value, int): + raise ValueError(f'expecting integer in {self.name}') + instance.__dict__[self.name] = value + + # this is the new initializer: + def __set_name__(self, owner, name): + self.name = name + + class Model: + int_field = IntField() + + +.. seealso:: + + :pep:`487` -- Simpler customization of class creation + PEP written and implemented by Martin Teichmann. + + :ref:`Feature documentation ` + + +.. _whatsnew36-pep519: + +PEP 519: Adding a file system path protocol +------------------------------------------- + +File system paths have historically been represented as :class:`str` +or :class:`bytes` objects. This has led to people who write code which +operate on file system paths to assume that such objects are only one +of those two types (an :class:`int` representing a file descriptor +does not count as that is not a file path). Unfortunately that +assumption prevents alternative object representations of file system +paths like :mod:`pathlib` from working with pre-existing code, +including Python's standard library. + +To fix this situation, a new interface represented by +:class:`os.PathLike` has been defined. By implementing the +:meth:`~os.PathLike.__fspath__` method, an object signals that it +represents a path. An object can then provide a low-level +representation of a file system path as a :class:`str` or +:class:`bytes` object. This means an object is considered +:term:`path-like ` if it implements +:class:`os.PathLike` or is a :class:`str` or :class:`bytes` object +which represents a file system path. Code can use :func:`os.fspath`, +:func:`os.fsdecode`, or :func:`os.fsencode` to explicitly get a +:class:`str` and/or :class:`bytes` representation of a path-like +object. + +The built-in :func:`open` function has been updated to accept +:class:`os.PathLike` objects, as have all relevant functions in the +:mod:`os` and :mod:`os.path` modules, and most other functions and +classes in the standard library. The :class:`os.DirEntry` class +and relevant classes in :mod:`pathlib` have also been updated to +implement :class:`os.PathLike`. + +The hope is that updating the fundamental functions for operating +on file system paths will lead to third-party code to implicitly +support all :term:`path-like objects ` without any +code changes, or at least very minimal ones (e.g. calling +:func:`os.fspath` at the beginning of code before operating on a +path-like object). + +Here are some examples of how the new interface allows for +:class:`pathlib.Path` to be used more easily and transparently with +pre-existing code:: + + >>> import pathlib + >>> with open(pathlib.Path("README")) as f: + ... contents = f.read() + ... + >>> import os.path + >>> os.path.splitext(pathlib.Path("some_file.txt")) + ('some_file', '.txt') + >>> os.path.join("/a/b", pathlib.Path("c")) + '/a/b/c' + >>> import os + >>> os.fspath(pathlib.Path("some_file.txt")) + 'some_file.txt' + +(Implemented by Brett Cannon, Ethan Furman, Dusty Phillips, and Jelle Zijlstra.) + +.. seealso:: + + :pep:`519` -- Adding a file system path protocol + PEP written by Brett Cannon and Koos Zevenhoven. + + +.. _whatsnew36-pep495: + +PEP 495: Local Time Disambiguation +---------------------------------- + +In most world locations, there have been and will be times when local clocks +are moved back. In those times, intervals are introduced in which local +clocks show the same time twice in the same day. In these situations, the +information displayed on a local clock (or stored in a Python datetime +instance) is insufficient to identify a particular moment in time. + +:pep:`495` adds the new *fold* attribute to instances of +:class:`datetime.datetime` and :class:`datetime.time` classes to differentiate +between two moments in time for which local times are the same:: + + >>> u0 = datetime(2016, 11, 6, 4, tzinfo=timezone.utc) + >>> for i in range(4): + ... u = u0 + i*HOUR + ... t = u.astimezone(Eastern) + ... print(u.time(), 'UTC =', t.time(), t.tzname(), t.fold) + ... + 04:00:00 UTC = 00:00:00 EDT 0 + 05:00:00 UTC = 01:00:00 EDT 0 + 06:00:00 UTC = 01:00:00 EST 1 + 07:00:00 UTC = 02:00:00 EST 0 + +The values of the :attr:`fold ` attribute have the +value ``0`` for all instances except those that represent the second +(chronologically) moment in time in an ambiguous case. + +.. seealso:: + + :pep:`495` -- Local Time Disambiguation + PEP written by Alexander Belopolsky and Tim Peters, implementation + by Alexander Belopolsky. + + +.. _whatsnew36-pep529: + +PEP 529: Change Windows filesystem encoding to UTF-8 +---------------------------------------------------- + +Representing filesystem paths is best performed with str (Unicode) rather than +bytes. However, there are some situations where using bytes is sufficient and +correct. + +Prior to Python 3.6, data loss could result when using bytes paths on Windows. +With this change, using bytes to represent paths is now supported on Windows, +provided those bytes are encoded with the encoding returned by +:func:`sys.getfilesystemencoding()`, which now defaults to ``'utf-8'``. + +Applications that do not use str to represent paths should use +:func:`os.fsencode()` and :func:`os.fsdecode()` to ensure their bytes are +correctly encoded. To revert to the previous behaviour, set +:envvar:`PYTHONLEGACYWINDOWSFSENCODING` or call +:func:`sys._enablelegacywindowsfsencoding`. + +See :pep:`529` for more information and discussion of code modifications that +may be required. + + +.. _whatsnew36-pep528: + +PEP 528: Change Windows console encoding to UTF-8 +------------------------------------------------- + +The default console on Windows will now accept all Unicode characters and +provide correctly read str objects to Python code. ``sys.stdin``, +``sys.stdout`` and ``sys.stderr`` now default to utf-8 encoding. + +This change only applies when using an interactive console, and not when +redirecting files or pipes. To revert to the previous behaviour for interactive +console use, set :envvar:`PYTHONLEGACYWINDOWSIOENCODING`. + +.. seealso:: + + :pep:`528` -- Change Windows console encoding to UTF-8 + PEP written and implemented by Steve Dower. + + +.. _whatsnew36-pep520: + +PEP 520: Preserving Class Attribute Definition Order +---------------------------------------------------- + +Attributes in a class definition body have a natural ordering: the same +order in which the names appear in the source. This order is now +preserved in the new class's :attr:`~object.__dict__` attribute. + +Also, the effective default class *execution* namespace (returned from +:ref:`type.__prepare__() `) is now an insertion-order-preserving +mapping. + +.. seealso:: + + :pep:`520` -- Preserving Class Attribute Definition Order + PEP written and implemented by Eric Snow. + + +.. _whatsnew36-pep468: + +PEP 468: Preserving Keyword Argument Order +------------------------------------------ + +``**kwargs`` in a function signature is now guaranteed to be an +insertion-order-preserving mapping. + +.. seealso:: + + :pep:`468` -- Preserving Keyword Argument Order + PEP written and implemented by Eric Snow. + + +.. _whatsnew36-compactdict: + +New :ref:`dict ` implementation +--------------------------------------------- + +The :ref:`dict ` type now uses a "compact" representation +`pioneered by PyPy `_. +The memory usage of the new :func:`dict` is between 20% and 25% smaller +compared to Python 3.5. + +The order-preserving aspect of this new implementation is considered an +implementation detail and should not be relied upon (this may change in +the future, but it is desired to have this new dict implementation in +the language for a few releases before changing the language spec to mandate +order-preserving semantics for all current and future Python +implementations; this also helps preserve backwards-compatibility +with older versions of the language where random iteration order is +still in effect, e.g. Python 3.5). + +(Contributed by INADA Naoki in :issue:`27350`. Idea +`originally suggested by Raymond Hettinger +`_.) + + +.. _whatsnew36-pep523: + +PEP 523: Adding a frame evaluation API to CPython +------------------------------------------------- + +While Python provides extensive support to customize how code +executes, one place it has not done so is in the evaluation of frame +objects. If you wanted some way to intercept frame evaluation in +Python there really wasn't any way without directly manipulating +function pointers for defined functions. + +:pep:`523` changes this by providing an API to make frame +evaluation pluggable at the C level. This will allow for tools such +as debuggers and JITs to intercept frame evaluation before the +execution of Python code begins. This enables the use of alternative +evaluation implementations for Python code, tracking frame +evaluation, etc. + +This API is not part of the limited C API and is marked as private to +signal that usage of this API is expected to be limited and only +applicable to very select, low-level use-cases. Semantics of the +API will change with Python as necessary. + +.. seealso:: + + :pep:`523` -- Adding a frame evaluation API to CPython + PEP written by Brett Cannon and Dino Viehland. + + +.. _whatsnew36-pythonmalloc: + +PYTHONMALLOC environment variable +--------------------------------- + +The new :envvar:`PYTHONMALLOC` environment variable allows setting the Python +memory allocators and installing debug hooks. + +It is now possible to install debug hooks on Python memory allocators on Python +compiled in release mode using ``PYTHONMALLOC=debug``. Effects of debug hooks: + +* Newly allocated memory is filled with the byte ``0xCB`` +* Freed memory is filled with the byte ``0xDB`` +* Detect violations of the Python memory allocator API. For example, + :c:func:`PyObject_Free` called on a memory block allocated by + :c:func:`PyMem_Malloc`. +* Detect writes before the start of a buffer (buffer underflows) +* Detect writes after the end of a buffer (buffer overflows) +* Check that the :term:`GIL ` is held when allocator + functions of :c:data:`PYMEM_DOMAIN_OBJ` (ex: :c:func:`PyObject_Malloc`) and + :c:data:`PYMEM_DOMAIN_MEM` (ex: :c:func:`PyMem_Malloc`) domains are called. + +Checking if the GIL is held is also a new feature of Python 3.6. + +See the :c:func:`PyMem_SetupDebugHooks` function for debug hooks on Python +memory allocators. + +It is now also possible to force the usage of the :c:func:`malloc` allocator of +the C library for all Python memory allocations using ``PYTHONMALLOC=malloc``. +This is helpful when using external memory debuggers like Valgrind on +a Python compiled in release mode. + +On error, the debug hooks on Python memory allocators now use the +:mod:`tracemalloc` module to get the traceback where a memory block was +allocated. + +Example of fatal error on buffer overflow using +``python3.6 -X tracemalloc=5`` (store 5 frames in traces):: + + Debug memory block at address p=0x7fbcd41666f8: API 'o' + 4 bytes originally requested + The 7 pad bytes at p-7 are FORBIDDENBYTE, as expected. + The 8 pad bytes at tail=0x7fbcd41666fc are not all FORBIDDENBYTE (0xfb): + at tail+0: 0x02 *** OUCH + at tail+1: 0xfb + at tail+2: 0xfb + at tail+3: 0xfb + at tail+4: 0xfb + at tail+5: 0xfb + at tail+6: 0xfb + at tail+7: 0xfb + The block was made by call #1233329 to debug malloc/realloc. + Data at p: 1a 2b 30 00 + + Memory block allocated at (most recent call first): + File "test/test_bytes.py", line 323 + File "unittest/case.py", line 600 + File "unittest/case.py", line 648 + File "unittest/suite.py", line 122 + File "unittest/suite.py", line 84 + + Fatal Python error: bad trailing pad byte + + Current thread 0x00007fbcdbd32700 (most recent call first): + File "test/test_bytes.py", line 323 in test_hex + File "unittest/case.py", line 600 in run + File "unittest/case.py", line 648 in __call__ + File "unittest/suite.py", line 122 in run + File "unittest/suite.py", line 84 in __call__ + File "unittest/suite.py", line 122 in run + File "unittest/suite.py", line 84 in __call__ + ... + +(Contributed by Victor Stinner in :issue:`26516` and :issue:`26564`.) + + +.. _whatsnew36-tracing: + +DTrace and SystemTap probing support +------------------------------------ + +Python can now be built ``--with-dtrace`` which enables static markers +for the following events in the interpreter: + +* function call/return + +* garbage collection started/finished + +* line of code executed. + +This can be used to instrument running interpreters in production, +without the need to recompile specific debug builds or providing +application-specific profiling/debugging code. + +More details in :ref:`instrumentation`. + +The current implementation is tested on Linux and macOS. Additional +markers may be added in the future. + +(Contributed by Łukasz Langa in :issue:`21590`, based on patches by +Jesús Cea Avión, David Malcolm, and Nikhil Benesch.) + + +Other Language Changes +====================== + +Some smaller changes made to the core Python language are: + +* A ``global`` or ``nonlocal`` statement must now textually appear + before the first use of the affected name in the same scope. + Previously this was a ``SyntaxWarning``. + +* It is now possible to set a :ref:`special method ` to + ``None`` to indicate that the corresponding operation is not available. + For example, if a class sets :meth:`__iter__` to ``None``, the class + is not iterable. + (Contributed by Andrew Barnert and Ivan Levkivskyi in :issue:`25958`.) + +* Long sequences of repeated traceback lines are now abbreviated as + ``"[Previous line repeated {count} more times]"`` (see + :ref:`whatsnew36-traceback` for an example). + (Contributed by Emanuel Barry in :issue:`26823`.) + +* Import now raises the new exception :exc:`ModuleNotFoundError` + (subclass of :exc:`ImportError`) when it cannot find a module. Code + that currently checks for ImportError (in try-except) will still work. + (Contributed by Eric Snow in :issue:`15767`.) + +* Class methods relying on zero-argument ``super()`` will now work correctly + when called from metaclass methods during class creation. + (Contributed by Martin Teichmann in :issue:`23722`.) + + +New Modules +=========== + +.. _whatsnew36-pep506: + +secrets +------- + +The main purpose of the new :mod:`secrets` module is to provide an obvious way +to reliably generate cryptographically strong pseudo-random values suitable +for managing secrets, such as account authentication, tokens, and similar. + +.. warning:: + + Note that the pseudo-random generators in the :mod:`random` module + should *NOT* be used for security purposes. Use :mod:`secrets` + on Python 3.6+ and :func:`os.urandom()` on Python 3.5 and earlier. + +.. seealso:: + + :pep:`506` -- Adding A Secrets Module To The Standard Library + PEP written and implemented by Steven D'Aprano. + + +Improved Modules +================ + +array +----- + +Exhausted iterators of :class:`array.array` will now stay exhausted even +if the iterated array is extended. This is consistent with the behavior +of other mutable sequences. + +Contributed by Serhiy Storchaka in :issue:`26492`. + +ast +--- + +The new :class:`ast.Constant` AST node has been added. It can be used +by external AST optimizers for the purposes of constant folding. + +Contributed by Victor Stinner in :issue:`26146`. + + +asyncio +------- + +Starting with Python 3.6 the ``asyncio`` module is no longer provisional and its +API is considered stable. + +Notable changes in the :mod:`asyncio` module since Python 3.5.0 +(all backported to 3.5.x due to the provisional status): + +* The :func:`~asyncio.get_event_loop` function has been changed to + always return the currently running loop when called from couroutines + and callbacks. + (Contributed by Yury Selivanov in :issue:`28613`.) + +* The :func:`~asyncio.ensure_future` function and all functions that + use it, such as :meth:`loop.run_until_complete() `, + now accept all kinds of :term:`awaitable objects `. + (Contributed by Yury Selivanov.) + +* New :func:`~asyncio.run_coroutine_threadsafe` function to submit + coroutines to event loops from other threads. + (Contributed by Vincent Michel.) + +* New :meth:`Transport.is_closing() ` + method to check if the transport is closing or closed. + (Contributed by Yury Selivanov.) + +* The :meth:`loop.create_server() ` + method can now accept a list of hosts. + (Contributed by Yann Sionneau.) + +* New :meth:`loop.create_future() ` + method to create Future objects. This allows alternative event + loop implementations, such as + `uvloop `_, to provide a faster + :class:`asyncio.Future` implementation. + (Contributed by Yury Selivanov in :issue:`27041`.) + +* New :meth:`loop.get_exception_handler() ` + method to get the current exception handler. + (Contributed by Yury Selivanov in :issue:`27040`.) + +* New :meth:`StreamReader.readuntil() ` + method to read data from the stream until a separator bytes + sequence appears. + (Contributed by Mark Korenberg.) + +* The performance of :meth:`StreamReader.readexactly() ` + has been improved. + (Contributed by Mark Korenberg in :issue:`28370`.) + +* The :meth:`loop.getaddrinfo() ` + method is optimized to avoid calling the system ``getaddrinfo`` + function if the address is already resolved. + (Contributed by A. Jesse Jiryu Davis.) + +* The :meth:`loop.stop() ` + method has been changed to stop the loop immediately after + the current iteration. Any new callbacks scheduled as a result + of the last iteration will be discarded. + (Contributed by Guido van Rossum in :issue:`25593`.) + +* :meth:`Future.set_exception ` + will now raise :exc:`TypeError` when passed an instance of + the :exc:`StopIteration` exception. + (Contributed by Chris Angelico in :issue:`26221`.) + +* New :meth:`loop.connect_accepted_socket() ` + method to be used by servers that accept connections outside of asyncio, + but that use asyncio to handle them. + (Contributed by Jim Fulton in :issue:`27392`.) + +* ``TCP_NODELAY`` flag is now set for all TCP transports by default. + (Contributed by Yury Selivanov in :issue:`27456`.) + +* New :meth:`loop.shutdown_asyncgens() ` + to properly close pending asynchronous generators before closing the + loop. + (Contributed by Yury Selivanov in :issue:`28003`.) + +* :class:`Future ` and :class:`Task ` + classes now have an optimized C implementation which makes asyncio + code up to 30% faster. + (Contributed by Yury Selivanov and INADA Naoki in :issue:`26081` + and :issue:`28544`.) + + +binascii +-------- + +The :func:`~binascii.b2a_base64` function now accepts an optional *newline* +keyword argument to control whether the newline character is appended to the +return value. +(Contributed by Victor Stinner in :issue:`25357`.) + + +cmath +----- + +The new :const:`cmath.tau` (τ) constant has been added. +(Contributed by Lisa Roach in :issue:`12345`, see :pep:`628` for details.) + +New constants: :const:`cmath.inf` and :const:`cmath.nan` to +match :const:`math.inf` and :const:`math.nan`, and also :const:`cmath.infj` +and :const:`cmath.nanj` to match the format used by complex repr. +(Contributed by Mark Dickinson in :issue:`23229`.) + + +collections +----------- + +The new :class:`~collections.abc.Collection` abstract base class has been +added to represent sized iterable container classes. +(Contributed by Ivan Levkivskyi, docs by Neil Girdhar in :issue:`27598`.) + +The new :class:`~collections.abc.Reversible` abstract base class represents +iterable classes that also provide the :meth:`__reversed__` method. +(Contributed by Ivan Levkivskyi in :issue:`25987`.) + +The new :class:`~collections.abc.AsyncGenerator` abstract base class represents +asynchronous generators. +(Contributed by Yury Selivanov in :issue:`28720`.) + +The :func:`~collections.namedtuple` function now accepts an optional +keyword argument *module*, which, when specified, is used for +the ``__module__`` attribute of the returned named tuple class. +(Contributed by Raymond Hettinger in :issue:`17941`.) + +The *verbose* and *rename* arguments for +:func:`~collections.namedtuple` are now keyword-only. +(Contributed by Raymond Hettinger in :issue:`25628`.) + +Recursive :class:`collections.deque` instances can now be pickled. +(Contributed by Serhiy Storchaka in :issue:`26482`.) + + +concurrent.futures +------------------ + +The :class:`ThreadPoolExecutor ` +class constructor now accepts an optional *thread_name_prefix* argument +to make it possible to customize the names of the threads created by the +pool. +(Contributed by Gregory P. Smith in :issue:`27664`.) + + +contextlib +---------- + +The :class:`contextlib.AbstractContextManager` class has been added to +provide an abstract base class for context managers. It provides a +sensible default implementation for `__enter__()` which returns +``self`` and leaves `__exit__()` an abstract method. A matching +class has been added to the :mod:`typing` module as +:class:`typing.ContextManager`. +(Contributed by Brett Cannon in :issue:`25609`.) + + +datetime +-------- + +The :class:`~datetime.datetime` and :class:`~datetime.time` classes have +the new :attr:`~time.fold` attribute used to disambiguate local time +when necessary. Many functions in the :mod:`datetime` have been +updated to support local time disambiguation. +See :ref:`Local Time Disambiguation ` section for more +information. +(Contributed by Alexander Belopolsky in :issue:`24773`.) + +The :meth:`datetime.strftime() ` and +:meth:`date.strftime() ` methods now support +ISO 8601 date directives ``%G``, ``%u`` and ``%V``. +(Contributed by Ashley Anderson in :issue:`12006`.) + +The :func:`datetime.isoformat() ` function +now accepts an optional *timespec* argument that specifies the number +of additional components of the time value to include. +(Contributed by Alessandro Cucci and Alexander Belopolsky in :issue:`19475`.) + +The :meth:`datetime.combine() ` now +accepts an optional *tzinfo* argument. +(Contributed by Alexander Belopolsky in :issue:`27661`.) + + +decimal +------- + +New :meth:`Decimal.as_integer_ratio() ` +method that returns a pair ``(n, d)`` of integers that represent the given +:class:`~decimal.Decimal` instance as a fraction, in lowest terms and +with a positive denominator:: + + >>> Decimal('-3.14').as_integer_ratio() + (-157, 50) + +(Contributed by Stefan Krah amd Mark Dickinson in :issue:`25928`.) + + + +distutils +--------- + +The ``default_format`` attribute has been removed from +:class:`distutils.command.sdist.sdist` and the ``formats`` +attribute defaults to ``['gztar']``. Although not anticipated, +any code relying on the presence of ``default_format`` may +need to be adapted. See :issue:`27819` for more details. + + +email +----- + +The new email API, enabled via the *policy* keyword to various constructors, is +no longer provisional. The :mod:`email` documentation has been reorganized and +rewritten to focus on the new API, while retaining the old documentation for +the legacy API. (Contributed by R. David Murray in :issue:`24277`.) + +The :mod:`email.mime` classes now all accept an optional *policy* keyword. +(Contributed by Berker Peksag in :issue:`27331`.) + +The :class:`~email.generator.DecodedGenerator` now supports the *policy* +keyword. + +There is a new :mod:`~email.policy` attribute, +:attr:`~email.policy.Policy.message_factory`, that controls what class is used +by default when the parser creates new message objects. For the +:attr:`email.policy.compat32` policy this is :class:`~email.message.Message`, +for the new policies it is :class:`~email.message.EmailMessage`. +(Contributed by R. David Murray in :issue:`20476`.) + + +encodings +--------- + +On Windows, added the ``'oem'`` encoding to use ``CP_OEMCP``, and the ``'ansi'`` +alias for the existing ``'mbcs'`` encoding, which uses the ``CP_ACP`` code page. +(Contributed by Steve Dower in :issue:`27959`.) + + +enum +---- + +Two new enumeration base classes have been added to the :mod:`enum` module: +:class:`~enum.Flag` and :class:`~enum.IntFlags`. Both are used to define +constants that can be combined using the bitwise operators. +(Contributed by Ethan Furman in :issue:`23591`.) + +Many standard library modules have been updated to use the +:class:`~enum.IntFlags` class for their constants. + +The new :class:`enum.auto` value can be used to assign values to enum +members automatically:: + + >>> from enum import Enum, auto + >>> class Color(Enum): + ... red = auto() + ... blue = auto() + ... green = auto() + ... + >>> list(Color) + [, , ] + + +faulthandler +------------ + +On Windows, the :mod:`faulthandler` module now installs a handler for Windows +exceptions: see :func:`faulthandler.enable`. (Contributed by Victor Stinner in +:issue:`23848`.) + + +fileinput +--------- + +:func:`~fileinput.hook_encoded` now supports the *errors* argument. +(Contributed by Joseph Hackman in :issue:`25788`.) + + +hashlib +------- + +:mod:`hashlib` supports OpenSSL 1.1.0. The minimum recommend version is 1.0.2. +(Contributed by Christian Heimes in :issue:`26470`.) + +BLAKE2 hash functions were added to the module. :func:`~hashlib.blake2b` +and :func:`~hashlib.blake2s` are always available and support the full +feature set of BLAKE2. +(Contributed by Christian Heimes in :issue:`26798` based on code by +Dmitry Chestnykh and Samuel Neves. Documentation written by Dmitry Chestnykh.) + +The SHA-3 hash functions :func:`~hashlib.sha3_224`, :func:`~hashlib.sha3_256`, +:func:`~hashlib.sha3_384`, :func:`~hashlib.sha3_512`, and SHAKE hash functions +:func:`~hashlib.shake_128` and :func:`~hashlib.shake_256` were added. +(Contributed by Christian Heimes in :issue:`16113`. Keccak Code Package +by Guido Bertoni, Joan Daemen, Michaël Peeters, Gilles Van Assche, and +Ronny Van Keer.) + +The password-based key derivation function :func:`~hashlib.scrypt` is now +available with OpenSSL 1.1.0 and newer. +(Contributed by Christian Heimes in :issue:`27928`.) + +http.client +----------- + +:meth:`HTTPConnection.request() ` and +:meth:`~http.client.HTTPConnection.endheaders` both now support +chunked encoding request bodies. +(Contributed by Demian Brecht and Rolf Krahl in :issue:`12319`.) + + +idlelib and IDLE +---------------- + +The idlelib package is being modernized and refactored to make IDLE look and +work better and to make the code easier to understand, test, and improve. Part +of making IDLE look better, especially on Linux and Mac, is using ttk widgets, +mostly in the dialogs. As a result, IDLE no longer runs with tcl/tk 8.4. It +now requires tcl/tk 8.5 or 8.6. We recommend running the latest release of +either. + +'Modernizing' includes renaming and consolidation of idlelib modules. The +renaming of files with partial uppercase names is similar to the renaming of, +for instance, Tkinter and TkFont to tkinter and tkinter.font in 3.0. As a +result, imports of idlelib files that worked in 3.5 will usually not work in +3.6. At least a module name change will be needed (see idlelib/README.txt), +sometimes more. (Name changes contributed by Al Swiegart and Terry Reedy in +:issue:`24225`. Most idlelib patches since have been and will be part of the +process.) + +In compensation, the eventual result with be that some idlelib classes will be +easier to use, with better APIs and docstrings explaining them. Additional +useful information will be added to idlelib when available. + + +importlib +--------- + +Import now raises the new exception :exc:`ModuleNotFoundError` +(subclass of :exc:`ImportError`) when it cannot find a module. Code +that current checks for ``ImportError`` (in try-except) will still work. +(Contributed by Eric Snow in :issue:`15767`.) + +:class:`importlib.util.LazyLoader` now calls +:meth:`~importlib.abc.Loader.create_module` on the wrapped loader, removing the +restriction that :class:`importlib.machinery.BuiltinImporter` and +:class:`importlib.machinery.ExtensionFileLoader` couldn't be used with +:class:`importlib.util.LazyLoader`. + +:func:`importlib.util.cache_from_source`, +:func:`importlib.util.source_from_cache`, and +:func:`importlib.util.spec_from_file_location` now accept a +:term:`path-like object`. + + +inspect +------- + +The :func:`inspect.signature() ` function now reports the +implicit ``.0`` parameters generated by the compiler for comprehension and +generator expression scopes as if they were positional-only parameters called +``implicit0``. (Contributed by Jelle Zijlstra in :issue:`19611`.) + +To reduce code churn when upgrading from Python 2.7 and the legacy +:func:`inspect.getargspec` API, the previously documented deprecation of +:func:`inspect.getfullargspec` has been reversed. While this function is +convenient for single/source Python 2/3 code bases, the richer +:func:`inspect.signature` interface remains the recommended approach for new +code. (Contributed by Nick Coghlan in :issue:`27172`) + + +json +---- + +:func:`json.load` and :func:`json.loads` now support binary input. Encoded +JSON should be represented using either UTF-8, UTF-16, or UTF-32. +(Contributed by Serhiy Storchaka in :issue:`17909`.) + + +logging +------- + +The new :meth:`WatchedFileHandler.reopenIfNeeded() ` +method has been added to add the ability to check if the log file needs to +be reopened. +(Contributed by Marian Horban in :issue:`24884`.) + + +math +---- + +The tau (τ) constant has been added to the :mod:`math` and :mod:`cmath` +modules. +(Contributed by Lisa Roach in :issue:`12345`, see :pep:`628` for details.) + + +multiprocessing +--------------- + +:ref:`Proxy Objects ` returned by +:func:`multiprocessing.Manager` can now be nested. +(Contributed by Davin Potts in :issue:`6766`.) + + +os +-- + +See the summary of :ref:`PEP 519 ` for details on how the +:mod:`os` and :mod:`os.path` modules now support +:term:`path-like objects `. + +:func:`~os.scandir` now supports :class:`bytes` paths on Windows. + +A new :meth:`~os.scandir.close` method allows explicitly closing a +:func:`~os.scandir` iterator. The :func:`~os.scandir` iterator now +supports the :term:`context manager` protocol. If a :func:`scandir` +iterator is neither exhausted nor explicitly closed a :exc:`ResourceWarning` +will be emitted in its destructor. +(Contributed by Serhiy Storchaka in :issue:`25994`.) + +On Linux, :func:`os.urandom` now blocks until the system urandom entropy pool +is initialized to increase the security. See the :pep:`524` for the rationale. + +The Linux ``getrandom()`` syscall (get random bytes) is now exposed as the new +:func:`os.getrandom` function. +(Contributed by Victor Stinner, part of the :pep:`524`) + + +pathlib +------- + +:mod:`pathlib` now supports :term:`path-like objects `. +(Contributed by Brett Cannon in :issue:`27186`.) + +See the summary of :ref:`PEP 519 ` for details. + + +pdb +--- + +The :class:`~pdb.Pdb` class constructor has a new optional *readrc* argument +to control whether ``.pdbrc`` files should be read. + + +pickle +------ + +Objects that need ``__new__`` called with keyword arguments can now be pickled +using :ref:`pickle protocols ` older than protocol version 4. +Protocol version 4 already supports this case. (Contributed by Serhiy +Storchaka in :issue:`24164`.) + + +pickletools +----------- + +:func:`pickletools.dis()` now outputs the implicit memo index for the +``MEMOIZE`` opcode. +(Contributed by Serhiy Storchaka in :issue:`25382`.) + + +pydoc +----- + +The :mod:`pydoc` module has learned to respect the ``MANPAGER`` +environment variable. +(Contributed by Matthias Klose in :issue:`8637`.) + +:func:`help` and :mod:`pydoc` can now list named tuple fields in the +order they were defined rather than alphabetically. +(Contributed by Raymond Hettinger in :issue:`24879`.) + + +random +------- + +The new :func:`~random.choices` function returns a list of elements of +specified size from the given population with optional weights. +(Contributed by Raymond Hettinger in :issue:`18844`.) + + +re +-- + +Added support of modifier spans in regular expressions. Examples: +``'(?i:p)ython'`` matches ``'python'`` and ``'Python'``, but not ``'PYTHON'``; +``'(?i)g(?-i:v)r'`` matches ``'GvR'`` and ``'gvr'``, but not ``'GVR'``. +(Contributed by Serhiy Storchaka in :issue:`433028`.) + +Match object groups can be accessed by ``__getitem__``, which is +equivalent to ``group()``. So ``mo['name']`` is now equivalent to +``mo.group('name')``. (Contributed by Eric Smith in :issue:`24454`.) + +:class:`~re.Match` objects now support +:meth:`index-like objects ` as group +indices. +(Contributed by Jeroen Demeyer and Xiang Zhang in :issue:`27177`.) + + +readline +-------- + +Added :func:`~readline.set_auto_history` to enable or disable +automatic addition of input to the history list. (Contributed by +Tyler Crompton in :issue:`26870`.) + + +rlcompleter +----------- + +Private and special attribute names now are omitted unless the prefix starts +with underscores. A space or a colon is added after some completed keywords. +(Contributed by Serhiy Storchaka in :issue:`25011` and :issue:`25209`.) + + +shlex +----- + +The :class:`~shlex.shlex` has much +:ref:`improved shell compatibility ` +through the new *punctuation_chars* argument to control which characters +are treated as punctuation. +(Contributed by Vinay Sajip in :issue:`1521950`.) + + +site +---- + +When specifying paths to add to :attr:`sys.path` in a `.pth` file, +you may now specify file paths on top of directories (e.g. zip files). +(Contributed by Wolfgang Langner in :issue:`26587`). + + +sqlite3 +------- + +:attr:`sqlite3.Cursor.lastrowid` now supports the ``REPLACE`` statement. +(Contributed by Alex LordThorsen in :issue:`16864`.) + + +socket +------ + +The :func:`~socket.socket.ioctl` function now supports the +:data:`~socket.SIO_LOOPBACK_FAST_PATH` control code. +(Contributed by Daniel Stokes in :issue:`26536`.) + +The :meth:`~socket.socket.getsockopt` constants ``SO_DOMAIN``, +``SO_PROTOCOL``, ``SO_PEERSEC``, and ``SO_PASSSEC`` are now supported. +(Contributed by Christian Heimes in :issue:`26907`.) + +The :meth:`~socket.socket.setsockopt` now supports the +``setsockopt(level, optname, None, optlen: int)`` form. +(Contributed by Christian Heimes in :issue:`27744`.) + +The socket module now supports the address family +:data:`~socket.AF_ALG` to interface with Linux Kernel crypto API. ``ALG_*``, +``SOL_ALG`` and :meth:`~socket.socket.sendmsg_afalg` were added. +(Contributed by Christian Heimes in :issue:`27744` with support from +Victor Stinner.) + + +socketserver +------------ + +Servers based on the :mod:`socketserver` module, including those +defined in :mod:`http.server`, :mod:`xmlrpc.server` and +:mod:`wsgiref.simple_server`, now support the :term:`context manager` +protocol. +(Contributed by Aviv Palivoda in :issue:`26404`.) + +The :attr:`~socketserver.StreamRequestHandler.wfile` attribute of +:class:`~socketserver.StreamRequestHandler` classes now implements +the :class:`io.BufferedIOBase` writable interface. In particular, +calling :meth:`~io.BufferedIOBase.write` is now guaranteed to send the +data in full. (Contributed by Martin Panter in :issue:`26721`.) + + +ssl +--- + +:mod:`ssl` supports OpenSSL 1.1.0. The minimum recommend version is 1.0.2. +(Contributed by Christian Heimes in :issue:`26470`.) + +3DES has been removed from the default cipher suites and ChaCha20 Poly1305 +cipher suites have been added. +(Contributed by Christian Heimes in :issue:`27850` and :issue:`27766`.) + +:class:`~ssl.SSLContext` has better default configuration for options +and ciphers. +(Contributed by Christian Heimes in :issue:`28043`.) + +SSL session can be copied from one client-side connection to another +with the new :class:`~ssl.SSLSession` class. TLS session resumption can +speed up the initial handshake, reduce latency and improve performance +(Contributed by Christian Heimes in :issue:`19500` based on a draft by +Alex Warhawk.) + +The new :meth:`~ssl.SSLContext.get_ciphers` method can be used to +get a list of enabled ciphers in order of cipher priority. + +All constants and flags have been converted to :class:`~enum.IntEnum` and +:class:`~enum.IntFlags`. +(Contributed by Christian Heimes in :issue:`28025`.) + +Server and client-side specific TLS protocols for :class:`~ssl.SSLContext` +were added. +(Contributed by Christian Heimes in :issue:`28085`.) + + +statistics +---------- + +A new :func:`~statistics.harmonic_mean` function has been added. +(Contributed by Steven D'Aprano in :issue:`27181`.) + + +struct +------ + +:mod:`struct` now supports IEEE 754 half-precision floats via the ``'e'`` +format specifier. +(Contributed by Eli Stevens, Mark Dickinson in :issue:`11734`.) + + +subprocess +---------- + +:class:`subprocess.Popen` destructor now emits a :exc:`ResourceWarning` warning +if the child process is still running. Use the context manager protocol (``with +proc: ...``) or explicitly call the :meth:`~subprocess.Popen.wait` method to +read the exit status of the child process. (Contributed by Victor Stinner in +:issue:`26741`.) + +The :class:`subprocess.Popen` constructor and all functions that pass arguments +through to it now accept *encoding* and *errors* arguments. Specifying either +of these will enable text mode for the *stdin*, *stdout* and *stderr* streams. +(Contributed by Steve Dower in :issue:`6135`.) + + +sys +--- + +The new :func:`~sys.getfilesystemencodeerrors` function returns the name of +the error mode used to convert between Unicode filenames and bytes filenames. +(Contributed by Steve Dower in :issue:`27781`.) + +On Windows the return value of the :func:`~sys.getwindowsversion` function +now includes the *platform_version* field which contains the accurate major +version, minor version and build number of the current operating system, +rather than the version that is being emulated for the process +(Contributed by Steve Dower in :issue:`27932`.) + + +telnetlib +--------- + +:class:`~telnetlib.Telnet` is now a context manager (contributed by +Stéphane Wirtel in :issue:`25485`). + + +time +---- + +The :class:`~time.struct_time` attributes :attr:`tm_gmtoff` and +:attr:`tm_zone` are now available on all platforms. + + +timeit +------ + +The new :meth:`Timer.autorange() ` convenience +method has been added to call :meth:`Timer.timeit() ` +repeatedly so that the total run time is greater or equal to 200 milliseconds. +(Contributed by Steven D'Aprano in :issue:`6422`.) + +:mod:`timeit` now warns when there is substantial (4x) variance +between best and worst times. +(Contributed by Serhiy Storchaka in :issue:`23552`.) + + +tkinter +------- + +Added methods :meth:`~tkinter.Variable.trace_add`, +:meth:`~tkinter.Variable.trace_remove` and :meth:`~tkinter.Variable.trace_info` +in the :class:`tkinter.Variable` class. They replace old methods +:meth:`~tkinter.Variable.trace_variable`, :meth:`~tkinter.Variable.trace`, +:meth:`~tkinter.Variable.trace_vdelete` and +:meth:`~tkinter.Variable.trace_vinfo` that use obsolete Tcl commands and might +not work in future versions of Tcl. +(Contributed by Serhiy Storchaka in :issue:`22115`). + + +.. _whatsnew36-traceback: + +traceback +--------- + +Both the traceback module and the interpreter's builtin exception display now +abbreviate long sequences of repeated lines in tracebacks as shown in the +following example:: + + >>> def f(): f() + ... + >>> f() + Traceback (most recent call last): + File "", line 1, in + File "", line 1, in f + File "", line 1, in f + File "", line 1, in f + [Previous line repeated 995 more times] + RecursionError: maximum recursion depth exceeded + +(Contributed by Emanuel Barry in :issue:`26823`.) + + +tracemalloc +----------- + +The :mod:`tracemalloc` module now supports tracing memory allocations in +multiple different address spaces. + +The new :class:`~tracemalloc.DomainFilter` filter class has been added +to filter block traces by their address space (domain). + +(Contributed by Victor Stinner in :issue:`26588`.) + + +.. _whatsnew36-typing: + +typing +------ + +Starting with Python 3.6 the :mod:`typing` module is no longer provisional +and its API is considered stable. + +Since the :mod:`typing` module was :term:`provisional ` +in Python 3.5, all changes introduced in Python 3.6 have also been +backported to Python 3.5.x. + +The :mod:`typing` module has a much improved support for generic type +aliases. For example ``Dict[str, Tuple[S, T]]`` is now a valid +type annotation. +(Contributed by Guido van Rossum in `Github #195 +`_.) + +The :class:`typing.ContextManager` class has been added for +representing :class:`contextlib.AbstractContextManager`. +(Contributed by Brett Cannon in :issue:`25609`.) + +The :class:`typing.Collection` class has been added for +representing :class:`collections.abc.Collection`. +(Contributed by Ivan Levkivskyi in :issue:`27598`.) + +The :const:`typing.ClassVar` type construct has been added to +mark class variables. As introduced in :pep:`526`, a variable annotation +wrapped in ClassVar indicates that a given attribute is intended to be used as +a class variable and should not be set on instances of that class. +(Contributed by Ivan Levkivskyi in `Github #280 +`_.) + +A new :const:`~typing.TYPE_CHECKING` constant that is assumed to be +``True`` by the static type chekers, but is ``False`` at runtime. +(Contributed by Guido van Rossum in `Github #230 +`_.) + +A new :func:`~typing.NewType` helper function has been added to create +lightweight distinct types for annotations:: + + from typing import NewType + + UserId = NewType('UserId', int) + some_id = UserId(524313) + +The static type checker will treat the new type as if it were a subclass +of the original type. (Contributed by Ivan Levkivskyi in `Github #189 +`_.) + + +unicodedata +----------- + +The :mod:`unicodedata` module now uses data from `Unicode 9.0.0 +`_. +(Contributed by Benjamin Peterson.) + + +unittest.mock +------------- + +The :class:`~unittest.mock.Mock` class has the following improvements: + +* Two new methods, :meth:`Mock.assert_called() + ` and :meth:`Mock.assert_called_once() + ` to check if the mock object + was called. + (Contributed by Amit Saha in :issue:`26323`.) + +* The :meth:`Mock.reset_mock() ` method + now has two optional keyword only arguments: *return_value* and + *side_effect*. + (Contributed by Kushal Das in :issue:`21271`.) + + +urllib.request +-------------- + +If a HTTP request has a file or iterable body (other than a +bytes object) but no ``Content-Length`` header, rather than +throwing an error, :class:`~urllib.request.AbstractHTTPHandler` now +falls back to use chunked transfer encoding. +(Contributed by Demian Brecht and Rolf Krahl in :issue:`12319`.) + + +urllib.robotparser +------------------ + +:class:`~urllib.robotparser.RobotFileParser` now supports the ``Crawl-delay`` and +``Request-rate`` extensions. +(Contributed by Nikolay Bogoychev in :issue:`16099`.) + + +venv +---- + +:mod:`venv` accepts a new parameter ``--prompt``. This parameter provides an +alternative prefix for the virtual environment. (Proposed by Łukasz Balcerzak +and ported to 3.6 by Stéphane Wirtel in :issue:`22829`.) + + +warnings +-------- + +A new optional *source* parameter has been added to the +:func:`warnings.warn_explicit` function: the destroyed object which emitted a +:exc:`ResourceWarning`. A *source* attribute has also been added to +:class:`warnings.WarningMessage` (contributed by Victor Stinner in +:issue:`26568` and :issue:`26567`). + +When a :exc:`ResourceWarning` warning is logged, the :mod:`tracemalloc` module is now +used to try to retrieve the traceback where the destroyed object was allocated. + +Example with the script ``example.py``:: + + import warnings + + def func(): + return open(__file__) + + f = func() + f = None + +Output of the command ``python3.6 -Wd -X tracemalloc=5 example.py``:: + + example.py:7: ResourceWarning: unclosed file <_io.TextIOWrapper name='example.py' mode='r' encoding='UTF-8'> + f = None + Object allocated at (most recent call first): + File "example.py", lineno 4 + return open(__file__) + File "example.py", lineno 6 + f = func() + +The "Object allocated at" traceback is new and is only displayed if +:mod:`tracemalloc` is tracing Python memory allocations and if the +:mod:`warnings` module was already imported. + + +winreg +------ + +Added the 64-bit integer type :data:`REG_QWORD `. +(Contributed by Clement Rouault in :issue:`23026`.) + + +winsound +-------- + +Allowed keyword arguments to be passed to :func:`Beep `, +:func:`MessageBeep `, and :func:`PlaySound +` (:issue:`27982`). + + +xmlrpc.client +------------- + +The :mod:`xmlrpc.client` module now supports unmarshalling +additional data types used by the Apache XML-RPC implementation +for numerics and ``None``. +(Contributed by Serhiy Storchaka in :issue:`26885`.) + + +zipfile +------- + +A new :meth:`ZipInfo.from_file() ` class method +allows making a :class:`~zipfile.ZipInfo` instance from a filesystem file. +A new :meth:`ZipInfo.is_dir() ` method can be used +to check if the :class:`~zipfile.ZipInfo` instance represents a directory. +(Contributed by Thomas Kluyver in :issue:`26039`.) + +The :meth:`ZipFile.open() ` method can now be used to +write data into a ZIP file, as well as for extracting data. +(Contributed by Thomas Kluyver in :issue:`26039`.) + + +zlib +---- + +The :func:`~zlib.compress` and :func:`~zlib.decompress` functions now accept +keyword arguments. +(Contributed by Aviv Palivoda in :issue:`26243` and +Xiang Zhang in :issue:`16764` respectively.) + + +Optimizations +============= + +* The Python interpreter now uses a 16-bit wordcode instead of bytecode which + made a number of opcode optimizations possible. + (Contributed by Demur Rumed with input and reviews from + Serhiy Storchaka and Victor Stinner in :issue:`26647` and :issue:`28050`.) + +* The :class:`asyncio.Future` class now has an optimized C implementation. + (Contributed by Yury Selivanov and INADA Naoki in :issue:`26081`.) + +* The :class:`asyncio.Task` class now has an optimized + C implementation. (Contributed by Yury Selivanov in :issue:`28544`.) + +* Various implementation improvements in the :mod:`typing` module + (such as caching of generic types) allow up to 30 times performance + improvements and reduced memory footprint. + +* The ASCII decoder is now up to 60 times as fast for error handlers + ``surrogateescape``, ``ignore`` and ``replace`` (Contributed + by Victor Stinner in :issue:`24870`). + +* The ASCII and the Latin1 encoders are now up to 3 times as fast for the + error handler ``surrogateescape`` + (Contributed by Victor Stinner in :issue:`25227`). + +* The UTF-8 encoder is now up to 75 times as fast for error handlers + ``ignore``, ``replace``, ``surrogateescape``, ``surrogatepass`` (Contributed + by Victor Stinner in :issue:`25267`). + +* The UTF-8 decoder is now up to 15 times as fast for error handlers + ``ignore``, ``replace`` and ``surrogateescape`` (Contributed + by Victor Stinner in :issue:`25301`). + +* ``bytes % args`` is now up to 2 times faster. (Contributed by Victor Stinner + in :issue:`25349`). + +* ``bytearray % args`` is now between 2.5 and 5 times faster. (Contributed by + Victor Stinner in :issue:`25399`). + +* Optimize :meth:`bytes.fromhex` and :meth:`bytearray.fromhex`: they are now + between 2x and 3.5x faster. (Contributed by Victor Stinner in :issue:`25401`). + +* Optimize ``bytes.replace(b'', b'.')`` and ``bytearray.replace(b'', b'.')``: + up to 80% faster. (Contributed by Josh Snider in :issue:`26574`). + +* Allocator functions of the :c:func:`PyMem_Malloc` domain + (:c:data:`PYMEM_DOMAIN_MEM`) now use the :ref:`pymalloc memory allocator + ` instead of :c:func:`malloc` function of the C library. The + pymalloc allocator is optimized for objects smaller or equal to 512 bytes + with a short lifetime, and use :c:func:`malloc` for larger memory blocks. + (Contributed by Victor Stinner in :issue:`26249`). + +* :func:`pickle.load` and :func:`pickle.loads` are now up to 10% faster when + deserializing many small objects (Contributed by Victor Stinner in + :issue:`27056`). + +* Passing :term:`keyword arguments ` to a function has an + overhead in comparison with passing :term:`positional arguments + `. Now in extension functions implemented with using + Argument Clinic this overhead is significantly decreased. + (Contributed by Serhiy Storchaka in :issue:`27574`). + +* Optimized :func:`~glob.glob` and :func:`~glob.iglob` functions in the + :mod:`glob` module; they are now about 3--6 times faster. + (Contributed by Serhiy Storchaka in :issue:`25596`). + +* Optimized globbing in :mod:`pathlib` by using :func:`os.scandir`; + it is now about 1.5--4 times faster. + (Contributed by Serhiy Storchaka in :issue:`26032`). + +* :class:`xml.etree.ElementTree` parsing, iteration and deepcopy performance + has been significantly improved. + (Contributed by Serhiy Storchaka in :issue:`25638`, :issue:`25873`, + and :issue:`25869`.) + +* Creation of :class:`fractions.Fraction` instances from floats and + decimals is now 2 to 3 times faster. + (Contributed by Serhiy Storchaka in :issue:`25971`.) + + +Build and C API Changes +======================= + +* Python now requires some C99 support in the toolchain to build. + Most notably, Python now uses standard integer types and macros in + place of custom macros like ``PY_LONG_LONG``. + For more information, see :pep:`7` and :issue:`17884`. + +* Cross-compiling CPython with the Android NDK and the Android API level set to + 21 (Android 5.0 Lollilop) or greater runs successfully. While Android is not + yet a supported platform, the Python test suite runs on the Android emulator + with only about 16 tests failures. See the Android meta-issue :issue:`26865`. + +* The ``--enable-optimizations`` configure flag has been added. Turning it on + will activate expensive optimizations like PGO. + (Original patch by Alecsandru Patrascu of Intel in :issue:`26539`.) + +* The :term:`GIL ` must now be held when allocator + functions of :c:data:`PYMEM_DOMAIN_OBJ` (ex: :c:func:`PyObject_Malloc`) and + :c:data:`PYMEM_DOMAIN_MEM` (ex: :c:func:`PyMem_Malloc`) domains are called. + +* New :c:func:`Py_FinalizeEx` API which indicates if flushing buffered data + failed. + (Contributed by Martin Panter in :issue:`5319`.) + +* :c:func:`PyArg_ParseTupleAndKeywords` now supports :ref:`positional-only + parameters `. Positional-only parameters are + defined by empty names. + (Contributed by Serhiy Storchaka in :issue:`26282`). + +* ``PyTraceback_Print`` method now abbreviates long sequences of repeated lines + as ``"[Previous line repeated {count} more times]"``. + (Contributed by Emanuel Barry in :issue:`26823`.) + +* The new :c:func:`PyErr_SetImportErrorSubclass` function allows for + specifying a subclass of :exc:`ImportError` to raise. + (Contributed by Eric Snow in :issue:`15767`.) + +* The new :c:func:`PyErr_ResourceWarning` function can be used to generate + a :exc:`ResourceWarning` providing the source of the resource allocation. + (Contributed by Victor Stinner in :issue:`26567`.) + +* The new :c:func:`PyOS_FSPath` function returns the file system + representation of a :term:`path-like object`. + (Contributed by Brett Cannon in :issue:`27186`.) + +* The :c:func:`PyUnicode_FSConverter` and :c:func:`PyUnicode_FSDecoder` + functions will now accept :term:`path-like objects `. + + +Other Improvements +================== + +* When :option:`--version` (short form: :option:`-V`) is supplied twice, + Python prints :data:`sys.version` for detailed information. + + .. code-block:: shell-session + + $ ./python -VV + Python 3.6.0b4+ (3.6:223967b49e49+, Nov 21 2016, 20:55:04) + [GCC 4.2.1 Compatible Apple LLVM 8.0.0 (clang-800.0.42.1)] + + +Deprecated +========== + +New Keywords +------------ + +``async`` and ``await`` are not recommended to be used as variable, class, +function or module names. Introduced by :pep:`492` in Python 3.5, they will +become proper keywords in Python 3.7. Starting in Python 3.6, the use of +``async`` or ``await`` as names will generate a :exc:`DeprecationWarning`. + + +Deprecated Python behavior +-------------------------- + +Raising the :exc:`StopIteration` exception inside a generator will now +generate a :exc:`DeprecationWarning`, and will trigger a :exc:`RuntimeError` +in Python 3.7. See :ref:`whatsnew-pep-479` for details. + +The :meth:`__aiter__` method is now expected to return an asynchronous +iterator directly instead of returning an awaitable as previously. +Doing the former will trigger a :exc:`DeprecationWarning`. Backward +compatibility will be removed in Python 3.7. +(Contributed by Yury Selivanov in :issue:`27243`.) + +A backslash-character pair that is not a valid escape sequence now generates +a :exc:`DeprecationWarning`. Although this will eventually become a +:exc:`SyntaxError`, that will not be for several Python releases. +(Contributed by Emanuel Barry in :issue:`27364`.) + +When performing a relative import, falling back on ``__name__`` and +``__path__`` from the calling module when ``__spec__`` or +``__package__`` are not defined now raises an :exc:`ImportWarning`. +(Contributed by Rose Ames in :issue:`25791`.) + + +Deprecated Python modules, functions and methods +------------------------------------------------ + +asynchat +~~~~~~~~ + +The :mod:`asynchat` has been deprecated in favor of :mod:`asyncio`. +(Contributed by Mariatta in :issue:`25002`.) + + +asyncore +~~~~~~~~ + +The :mod:`asyncore` has been deprecated in favor of :mod:`asyncio`. +(Contributed by Mariatta in :issue:`25002`.) + + +dbm +~~~ + +Unlike other :mod:`dbm` implementations, the :mod:`dbm.dumb` module +creates databases with the ``'rw'`` mode and allows modifying the database +opened with the ``'r'`` mode. This behavior is now deprecated and will +be removed in 3.8. +(Contributed by Serhiy Storchaka in :issue:`21708`.) + + +distutils +~~~~~~~~~ + +The undocumented ``extra_path`` argument to the +:class:`~distutils.Distribution` constructor is now considered deprecated +and will raise a warning if set. Support for this parameter will be +removed in a future Python release. See :issue:`27919` for details. + + +grp +~~~ + +The support of non-integer arguments in :func:`~grp.getgrgid` has been +deprecated. +(Contributed by Serhiy Storchaka in :issue:`26129`.) + + +importlib +~~~~~~~~~ + +The :meth:`importlib.machinery.SourceFileLoader.load_module` and +:meth:`importlib.machinery.SourcelessFileLoader.load_module` methods +are now deprecated. They were the only remaining implementations of +:meth:`importlib.abc.Loader.load_module` in :mod:`importlib` that had not +been deprecated in previous versions of Python in favour of +:meth:`importlib.abc.Loader.exec_module`. + +The :class:`importlib.machinery.WindowsRegistryFinder` class is now +deprecated. As of 3.6.0, it is still added to :attr:`sys.meta_path` by +default (on Windows), but this may change in future releases. + +os +~~ + +Undocumented support of general :term:`bytes-like objects ` +as paths in :mod:`os` functions, :func:`compile` and similar functions is +now deprecated. +(Contributed by Serhiy Storchaka in :issue:`25791` and :issue:`26754`.) + +re +~~ + +Support for inline flags ``(?letters)`` in the middle of the regular +expression has been deprecated and will be removed in a future Python +version. Flags at the start of a regular expression are still allowed. +(Contributed by Serhiy Storchaka in :issue:`22493`.) + +ssl +~~~ + +OpenSSL 0.9.8, 1.0.0 and 1.0.1 are deprecated and no longer supported. +In the future the :mod:`ssl` module will require at least OpenSSL 1.0.2 or +1.1.0. + +SSL-related arguments like ``certfile``, ``keyfile`` and ``check_hostname`` +in :mod:`ftplib`, :mod:`http.client`, :mod:`imaplib`, :mod:`poplib`, +and :mod:`smtplib` have been deprecated in favor of ``context``. +(Contributed by Christian Heimes in :issue:`28022`.) + +A couple of protocols and functions of the :mod:`ssl` module are now +deprecated. Some features will no longer be available in future versions +of OpenSSL. Other features are deprecated in favor of a different API. +(Contributed by Christian Heimes in :issue:`28022` and :issue:`26470`.) + +tkinter +~~~~~~~ + +The :mod:`tkinter.tix` module is now deprecated. :mod:`tkinter` users +should use :mod:`tkinter.ttk` instead. + +venv +~~~~ + +The ``pyvenv`` script has been deprecated in favour of ``python3 -m venv``. +This prevents confusion as to what Python interpreter ``pyvenv`` is +connected to and thus what Python interpreter will be used by the virtual +environment. (Contributed by Brett Cannon in :issue:`25154`.) + + +Deprecated functions and types of the C API +------------------------------------------- + +Undocumented functions :c:func:`PyUnicode_AsEncodedObject`, +:c:func:`PyUnicode_AsDecodedObject`, :c:func:`PyUnicode_AsEncodedUnicode` +and :c:func:`PyUnicode_AsDecodedUnicode` are deprecated now. +Use the :ref:`generic codec based API ` instead. + + +Deprecated Build Options +------------------------ + +The ``--with-system-ffi`` configure flag is now on by default on non-macOS +UNIX platforms. It may be disabled by using ``--without-system-ffi``, but +using the flag is deprecated and will not be accepted in Python 3.7. +macOS is unaffected by this change. Note that many OS distributors already +use the ``--with-system-ffi`` flag when building their system Python. + + +Removed +======= + +API and Feature Removals +------------------------ + +* Unknown escapes consisting of ``'\'`` and an ASCII letter in + regular expressions will now cause an error. In replacement templates for + :func:`re.sub` they are still allowed, but deprecated. + The :const:`re.LOCALE` flag can now only be used with binary patterns. + +* ``inspect.getmoduleinfo()`` was removed (was deprecated since CPython 3.3). + :func:`inspect.getmodulename` should be used for obtaining the module + name for a given path. + (Contributed by Yury Selivanov in :issue:`13248`.) + +* ``traceback.Ignore`` class and ``traceback.usage``, ``traceback.modname``, + ``traceback.fullmodname``, ``traceback.find_lines_from_code``, + ``traceback.find_lines``, ``traceback.find_strings``, + ``traceback.find_executable_lines`` methods were removed from the + :mod:`traceback` module. They were undocumented methods deprecated since + Python 3.2 and equivalent functionality is available from private methods. + +* The ``tk_menuBar()`` and ``tk_bindForTraversal()`` dummy methods in + :mod:`tkinter` widget classes were removed (corresponding Tk commands + were obsolete since Tk 4.0). + +* The :meth:`~zipfile.ZipFile.open` method of the :class:`zipfile.ZipFile` + class no longer supports the ``'U'`` mode (was deprecated since Python 3.4). + Use :class:`io.TextIOWrapper` for reading compressed text files in + :term:`universal newlines` mode. + +* The undocumented ``IN``, ``CDROM``, ``DLFCN``, ``TYPES``, ``CDIO``, and + ``STROPTS`` modules have been removed. They had been available in the + platform specific ``Lib/plat-*/`` directories, but were chronically out of + date, inconsistently available across platforms, and unmaintained. The + script that created these modules is still available in the source + distribution at :source:`Tools/scripts/h2py.py`. + +* The deprecated ``asynchat.fifo`` class has been removed. + + +Porting to Python 3.6 +===================== + +This section lists previously described changes and other bugfixes +that may require changes to your code. + +Changes in 'python' Command Behavior +------------------------------------ + +* The output of a special Python build with defined ``COUNT_ALLOCS``, + ``SHOW_ALLOC_COUNT`` or ``SHOW_TRACK_COUNT`` macros is now off by + default. It can be re-enabled using the ``-X showalloccount`` option. + It now outputs to ``stderr`` instead of ``stdout``. + (Contributed by Serhiy Storchaka in :issue:`23034`.) + + +Changes in the Python API +------------------------- + +* :func:`open() ` will no longer allow combining the ``'U'`` mode flag + with ``'+'``. + (Contributed by Jeff Balogh and John O'Connor in :issue:`2091`.) + +* :mod:`sqlite3` no longer implicitly commits an open transaction before DDL + statements. + +* On Linux, :func:`os.urandom` now blocks until the system urandom entropy pool + is initialized to increase the security. + +* When :meth:`importlib.abc.Loader.exec_module` is defined, + :meth:`importlib.abc.Loader.create_module` must also be defined. + +* :c:func:`PyErr_SetImportError` now sets :exc:`TypeError` when its **msg** + argument is not set. Previously only ``NULL`` was returned. + +* The format of the ``co_lnotab`` attribute of code objects changed to support + a negative line number delta. By default, Python does not emit bytecode with + a negative line number delta. Functions using ``frame.f_lineno``, + ``PyFrame_GetLineNumber()`` or ``PyCode_Addr2Line()`` are not affected. + Functions directly decoding ``co_lnotab`` should be updated to use a signed + 8-bit integer type for the line number delta, but this is only required to + support applications using a negative line number delta. See + ``Objects/lnotab_notes.txt`` for the ``co_lnotab`` format and how to decode + it, and see the :pep:`511` for the rationale. + +* The functions in the :mod:`compileall` module now return booleans instead + of ``1`` or ``0`` to represent success or failure, respectively. Thanks to + booleans being a subclass of integers, this should only be an issue if you + were doing identity checks for ``1`` or ``0``. See :issue:`25768`. + +* Reading the :attr:`~urllib.parse.SplitResult.port` attribute of + :func:`urllib.parse.urlsplit` and :func:`~urllib.parse.urlparse` results + now raises :exc:`ValueError` for out-of-range values, rather than + returning :const:`None`. See :issue:`20059`. + +* The :mod:`imp` module now raises a :exc:`DeprecationWarning` instead of + :exc:`PendingDeprecationWarning`. + +* The following modules have had missing APIs added to their :attr:`__all__` + attributes to match the documented APIs: + :mod:`calendar`, :mod:`cgi`, :mod:`csv`, + :mod:`~xml.etree.ElementTree`, :mod:`enum`, + :mod:`fileinput`, :mod:`ftplib`, :mod:`logging`, :mod:`mailbox`, + :mod:`mimetypes`, :mod:`optparse`, :mod:`plistlib`, :mod:`smtpd`, + :mod:`subprocess`, :mod:`tarfile`, :mod:`threading` and + :mod:`wave`. This means they will export new symbols when ``import *`` + is used. + (Contributed by Joel Taddei and Jacek Kołodziej in :issue:`23883`.) + +* When performing a relative import, if ``__package__`` does not compare equal + to ``__spec__.parent`` then :exc:`ImportWarning` is raised. + (Contributed by Brett Cannon in :issue:`25791`.) + +* When a relative import is performed and no parent package is known, then + :exc:`ImportError` will be raised. Previously, :exc:`SystemError` could be + raised. (Contributed by Brett Cannon in :issue:`18018`.) + +* Servers based on the :mod:`socketserver` module, including those + defined in :mod:`http.server`, :mod:`xmlrpc.server` and + :mod:`wsgiref.simple_server`, now only catch exceptions derived + from :exc:`Exception`. Therefore if a request handler raises + an exception like :exc:`SystemExit` or :exc:`KeyboardInterrupt`, + :meth:`~socketserver.BaseServer.handle_error` is no longer called, and + the exception will stop a single-threaded server. (Contributed by + Martin Panter in :issue:`23430`.) + +* :func:`spwd.getspnam` now raises a :exc:`PermissionError` instead of + :exc:`KeyError` if the user doesn't have privileges. + +* The :meth:`socket.socket.close` method now raises an exception if + an error (e.g. ``EBADF``) was reported by the underlying system call. + (Contributed by Martin Panter in :issue:`26685`.) + +* The *decode_data* argument for the :class:`smtpd.SMTPChannel` and + :class:`smtpd.SMTPServer` constructors is now ``False`` by default. + This means that the argument passed to + :meth:`~smtpd.SMTPServer.process_message` is now a bytes object by + default, and ``process_message()`` will be passed keyword arguments. + Code that has already been updated in accordance with the deprecation + warning generated by 3.5 will not be affected. + +* All optional arguments of the :func:`~json.dump`, :func:`~json.dumps`, + :func:`~json.load` and :func:`~json.loads` functions and + :class:`~json.JSONEncoder` and :class:`~json.JSONDecoder` class + constructors in the :mod:`json` module are now :ref:`keyword-only + `. + (Contributed by Serhiy Storchaka in :issue:`18726`.) + +* Subclasses of :class:`type` which don't override ``type.__new__`` may no + longer use the one-argument form to get the type of an object. + +* As part of :pep:`487`, the handling of keyword arguments passed to + :class:`type` (other than the metaclass hint, ``metaclass``) is now + consistently delegated to :meth:`object.__init_subclass__`. This means that + :meth:`type.__new__` and :meth:`type.__init__` both now accept arbitrary + keyword arguments, but :meth:`object.__init_subclass__` (which is called from + :meth:`type.__new__`) will reject them by default. Custom metaclasses + accepting additional keyword arguments will need to adjust their calls to + :meth:`type.__new__` (whether direct or via :class:`super`) accordingly. + +* In :class:`distutils.command.sdist.sdist`, the ``default_format`` + attribute has been removed and is no longer honored. Instead, the + gzipped tarfile format is the default on all platforms and no + platform-specific selection is made. + In environments where distributions are + built on Windows and zip distributions are required, configure + the project with a ``setup.cfg`` file containing the following:: + + [sdist] + formats=zip + + This behavior has also been backported to earlier Python versions + by Setuptools 26.0.0. + +* In the :mod:`urllib.request` module and the + :meth:`http.client.HTTPConnection.request` method, if no Content-Length + header field has been specified and the request body is a file object, + it is now sent with HTTP 1.1 chunked encoding. If a file object has to + be sent to a HTTP 1.0 server, the Content-Length value now has to be + specified by the caller. + (Contributed by Demian Brecht and Rolf Krahl with tweaks from + Martin Panter in :issue:`12319`.) + +* The :class:`~csv.DictReader` now returns rows of type + :class:`~collections.OrderedDict`. + (Contributed by Steve Holden in :issue:`27842`.) + +* The :const:`crypt.METHOD_CRYPT` will no longer be added to ``crypt.methods`` + if unsupported by the platform. + (Contributed by Victor Stinner in :issue:`25287`.) + +* The *verbose* and *rename* arguments for + :func:`~collections.namedtuple` are now keyword-only. + (Contributed by Raymond Hettinger in :issue:`25628`.) + +* On Linux, :func:`ctypes.util.find_library` now looks in + ``LD_LIBRARY_PATH`` for shared libraries. + (Contributed by Vinay Sajip in :issue:`9998`.) + +* The :class:`imaplib.IMAP4` class now handles flags containing the + ``']'`` character in messages sent from the server to improve + real-world compatibility. + (Contributed by Lita Cho in :issue:`21815`.) + +* The :func:`mmap.write() ` function now returns the number + of bytes written like other write methods. + (Contributed by Jakub Stasiak in :issue:`26335`.) + +* The :func:`pkgutil.iter_modules` and :func:`pkgutil.walk_packages` + functions now return :class:`~pkgutil.ModuleInfo` named tuples. + (Contributed by Ramchandra Apte in :issue:`17211`.) + +* :func:`re.sub` now raises an error for invalid numerical group + references in replacement templates even if the pattern is not + found in the string. The error message for invalid group references + now includes the group index and the position of the reference. + (Contributed by SilentGhost, Serhiy Storchaka in :issue:`25953`.) + +* :class:`zipfile.ZipFile` will now raise :exc:`NotImplementedError` for + unrecognized compression values. Previously a plain :exc:`RuntimeError` + was raised. Additionally, calling :class:`~zipfile.ZipFile` methods + on a closed ZipFile or calling the :meth:`~zipfile.ZipFile.write` method + on a ZipFile created with mode ``'r'`` will raise a :exc:`ValueError`. + Previously, a :exc:`RuntimeError` was raised in those scenarios. + +* when custom metaclasses are combined with zero-argument :func:`super` or + direct references from methods to the implicit ``__class__`` closure + variable, the implicit ``__classcell__`` namespace entry must now be passed + up to ``type.__new__`` for initialisation. Failing to do so will result in + a :exc:`DeprecationWarning` in 3.6 and a :exc:`RuntimeWarning` in the future. + +Changes in the C API +-------------------- + +* The :c:func:`PyMem_Malloc` allocator family now uses the :ref:`pymalloc allocator + ` rather than the system :c:func:`malloc`. Applications calling + :c:func:`PyMem_Malloc` without holding the GIL can now crash. Set the + :envvar:`PYTHONMALLOC` environment variable to ``debug`` to validate the + usage of memory allocators in your application. See :issue:`26249`. + +* :c:func:`Py_Exit` (and the main interpreter) now override the exit status + with 120 if flushing buffered data failed. See :issue:`5319`. + + +CPython bytecode changes +------------------------ + +There have been several major changes to the :term:`bytecode` in Python 3.6. + +* The Python interpreter now uses a 16-bit wordcode instead of bytecode. + (Contributed by Demur Rumed with input and reviews from + Serhiy Storchaka and Victor Stinner in :issue:`26647` and :issue:`28050`.) + +* The new :opcode:`FORMAT_VALUE` and :opcode:`BUILD_STRING` opcodes as part + of the :ref:`formatted string literal ` implementation. + (Contributed by Eric Smith in :issue:`25483` and + Serhiy Storchaka in :issue:`27078`.) + +* The new :opcode:`BUILD_CONST_KEY_MAP` opcode to optimize the creation + of dictionaries with constant keys. + (Contributed by Serhiy Storchaka in :issue:`27140`.) + +* The function call opcodes have been heavily reworked for better performance + and simpler implementation. + The :opcode:`MAKE_FUNCTION`, :opcode:`CALL_FUNCTION`, + :opcode:`CALL_FUNCTION_KW` and :opcode:`BUILD_MAP_UNPACK_WITH_CALL` opcodes + have been modified, the new :opcode:`CALL_FUNCTION_EX` and + :opcode:`BUILD_TUPLE_UNPACK_WITH_CALL` have been added, and + ``CALL_FUNCTION_VAR``, ``CALL_FUNCTION_VAR_KW`` and ``MAKE_CLOSURE`` opcodes + have been removed. + (Contributed by Demur Rumed in :issue:`27095`, and Serhiy Storchaka in + :issue:`27213`, :issue:`28257`.) + +* The new :opcode:`SETUP_ANNOTATIONS` and :opcode:`STORE_ANNOTATION` opcodes + have been added to support the new :term:`variable annotation` syntax. + (Contributed by Ivan Levkivskyi in :issue:`27985`.) diff --git a/Doc/whatsnew/changelog.rst b/Doc/whatsnew/changelog.rst index b435614..67a12f3 100644 --- a/Doc/whatsnew/changelog.rst +++ b/Doc/whatsnew/changelog.rst @@ -4,4 +4,4 @@ Changelog +++++++++ -.. miscnews:: ../build/NEWS +.. miscnews:: ../../Misc/NEWS diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst index edb5502..7c92524 100644 --- a/Doc/whatsnew/index.rst +++ b/Doc/whatsnew/index.rst @@ -11,6 +11,7 @@ anyone wishing to stay up-to-date after a new release. .. toctree:: :maxdepth: 2 + 3.6.rst 3.5.rst 3.4.rst 3.3.rst diff --git a/Grammar/Grammar b/Grammar/Grammar index 4307523..b139e9f 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -27,25 +27,31 @@ async_funcdef: ASYNC funcdef funcdef: 'def' NAME parameters ['->' test] ':' suite parameters: '(' [typedargslist] ')' -typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [',' - ['*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef]] - | '*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef) +typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [',' [ + '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]] + | '**' tfpdef [',']]] + | '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]] + | '**' tfpdef [',']) tfpdef: NAME [':' test] -varargslist: (vfpdef ['=' test] (',' vfpdef ['=' test])* [',' - ['*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef]] - | '*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef) +varargslist: (vfpdef ['=' test] (',' vfpdef ['=' test])* [',' [ + '*' [vfpdef] (',' vfpdef ['=' test])* [',' ['**' vfpdef [',']]] + | '**' vfpdef [',']]] + | '*' [vfpdef] (',' vfpdef ['=' test])* [',' ['**' vfpdef [',']]] + | '**' vfpdef [','] +) vfpdef: NAME stmt: simple_stmt | compound_stmt simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt) -expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | +expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | ('=' (yield_expr|testlist_star_expr))*) +annassign: ':' test ['=' test] testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [','] augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=') -# For normal assignments, additional restrictions enforced by the interpreter +# For normal and annotated assignments, additional restrictions enforced by the interpreter del_stmt: 'del' exprlist pass_stmt: 'pass' flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt @@ -140,7 +146,7 @@ argument: ( test [comp_for] | '*' test ) comp_iter: comp_for | comp_if -comp_for: 'for' exprlist 'in' or_test [comp_iter] +comp_for: [ASYNC] 'for' exprlist 'in' or_test [comp_iter] comp_if: 'if' test_nocond [comp_iter] # not used in grammar, but may appear in "node" passed from Parser to Compiler diff --git a/Include/Python-ast.h b/Include/Python-ast.h index 2d3eacb..70494b7 100644 --- a/Include/Python-ast.h +++ b/Include/Python-ast.h @@ -65,11 +65,12 @@ struct _mod { enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3, Return_kind=4, Delete_kind=5, Assign_kind=6, - AugAssign_kind=7, For_kind=8, AsyncFor_kind=9, While_kind=10, - If_kind=11, With_kind=12, AsyncWith_kind=13, Raise_kind=14, - Try_kind=15, Assert_kind=16, Import_kind=17, - ImportFrom_kind=18, Global_kind=19, Nonlocal_kind=20, - Expr_kind=21, Pass_kind=22, Break_kind=23, Continue_kind=24}; + AugAssign_kind=7, AnnAssign_kind=8, For_kind=9, + AsyncFor_kind=10, While_kind=11, If_kind=12, With_kind=13, + AsyncWith_kind=14, Raise_kind=15, Try_kind=16, + Assert_kind=17, Import_kind=18, ImportFrom_kind=19, + Global_kind=20, Nonlocal_kind=21, Expr_kind=22, Pass_kind=23, + Break_kind=24, Continue_kind=25}; struct _stmt { enum _stmt_kind kind; union { @@ -118,6 +119,13 @@ struct _stmt { struct { expr_ty target; + expr_ty annotation; + expr_ty value; + int simple; + } AnnAssign; + + struct { + expr_ty target; expr_ty iter; asdl_seq *body; asdl_seq *orelse; @@ -201,9 +209,10 @@ enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4, SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11, Await_kind=12, Yield_kind=13, YieldFrom_kind=14, Compare_kind=15, Call_kind=16, Num_kind=17, Str_kind=18, - Bytes_kind=19, NameConstant_kind=20, Ellipsis_kind=21, - Attribute_kind=22, Subscript_kind=23, Starred_kind=24, - Name_kind=25, List_kind=26, Tuple_kind=27}; + FormattedValue_kind=19, JoinedStr_kind=20, Bytes_kind=21, + NameConstant_kind=22, Ellipsis_kind=23, Constant_kind=24, + Attribute_kind=25, Subscript_kind=26, Starred_kind=27, + Name_kind=28, List_kind=29, Tuple_kind=30}; struct _expr { enum _expr_kind kind; union { @@ -297,6 +306,16 @@ struct _expr { } Str; struct { + expr_ty value; + int conversion; + expr_ty format_spec; + } FormattedValue; + + struct { + asdl_seq *values; + } JoinedStr; + + struct { bytes s; } Bytes; @@ -305,6 +324,10 @@ struct _expr { } NameConstant; struct { + constant value; + } Constant; + + struct { expr_ty value; identifier attr; expr_context_ty ctx; @@ -366,6 +389,7 @@ struct _comprehension { expr_ty target; expr_ty iter; asdl_seq *ifs; + int is_async; }; enum _excepthandler_kind {ExceptHandler_kind=1}; @@ -446,6 +470,9 @@ stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int #define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5) stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int col_offset, PyArena *arena); +#define AnnAssign(a0, a1, a2, a3, a4, a5, a6) _Py_AnnAssign(a0, a1, a2, a3, a4, a5, a6) +stmt_ty _Py_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int + simple, int lineno, int col_offset, PyArena *arena); #define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6) stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int lineno, int col_offset, PyArena *arena); @@ -543,6 +570,12 @@ expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, int expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena); #define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3) expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena); +#define FormattedValue(a0, a1, a2, a3, a4, a5) _Py_FormattedValue(a0, a1, a2, a3, a4, a5) +expr_ty _Py_FormattedValue(expr_ty value, int conversion, expr_ty format_spec, + int lineno, int col_offset, PyArena *arena); +#define JoinedStr(a0, a1, a2, a3) _Py_JoinedStr(a0, a1, a2, a3) +expr_ty _Py_JoinedStr(asdl_seq * values, int lineno, int col_offset, PyArena + *arena); #define Bytes(a0, a1, a2, a3) _Py_Bytes(a0, a1, a2, a3) expr_ty _Py_Bytes(bytes s, int lineno, int col_offset, PyArena *arena); #define NameConstant(a0, a1, a2, a3) _Py_NameConstant(a0, a1, a2, a3) @@ -550,6 +583,9 @@ expr_ty _Py_NameConstant(singleton value, int lineno, int col_offset, PyArena *arena); #define Ellipsis(a0, a1, a2) _Py_Ellipsis(a0, a1, a2) expr_ty _Py_Ellipsis(int lineno, int col_offset, PyArena *arena); +#define Constant(a0, a1, a2, a3) _Py_Constant(a0, a1, a2, a3) +expr_ty _Py_Constant(constant value, int lineno, int col_offset, PyArena + *arena); #define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5) expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int lineno, int col_offset, PyArena *arena); @@ -574,9 +610,9 @@ slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena); slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena); #define Index(a0, a1) _Py_Index(a0, a1) slice_ty _Py_Index(expr_ty value, PyArena *arena); -#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3) +#define comprehension(a0, a1, a2, a3, a4) _Py_comprehension(a0, a1, a2, a3, a4) comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq * - ifs, PyArena *arena); + ifs, int is_async, PyArena *arena); #define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5) excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq * body, int lineno, int col_offset, PyArena diff --git a/Include/Python.h b/Include/Python.h index 858dbd1..4c7c9a4 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -116,6 +116,7 @@ #include "pylifecycle.h" #include "ceval.h" #include "sysmodule.h" +#include "osmodule.h" #include "intrcheck.h" #include "import.h" diff --git a/Include/abstract.h b/Include/abstract.h index 7dbbb74..03f8dbb 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -7,7 +7,9 @@ extern "C" { #ifdef PY_SSIZE_T_CLEAN #define PyObject_CallFunction _PyObject_CallFunction_SizeT #define PyObject_CallMethod _PyObject_CallMethod_SizeT +#ifndef Py_LIMITED_API #define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT +#endif /* !Py_LIMITED_API */ #endif /* Abstract Object Interface (many thanks to Jim Fulton) */ @@ -264,19 +266,97 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ */ PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, - PyObject *args, PyObject *kw); + PyObject *args, PyObject *kwargs); /* Call a callable Python object, callable_object, with arguments and keywords arguments. The 'args' argument can not be - NULL, but the 'kw' argument can be NULL. + NULL. */ #ifndef Py_LIMITED_API + PyAPI_FUNC(PyObject*) _PyStack_AsTuple( + PyObject **stack, + Py_ssize_t nargs); + + /* Convert keyword arguments from the (stack, kwnames) format to a Python + dictionary. + + kwnames must only contains str strings, no subclass, and all keys must + be unique. kwnames is not checked, usually these checks are done before or later + calling _PyStack_AsDict(). For example, _PyArg_ParseStack() raises an + error if a key is not a string. */ + PyAPI_FUNC(PyObject *) _PyStack_AsDict( + PyObject **values, + PyObject *kwnames); + + /* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames). + + Return a new stack which should be released by PyMem_Free(), or return + args unchanged if kwargs is NULL or an empty dictionary. + + The stack uses borrowed references. + + The type of keyword keys is not checked, these checks should be done + later (ex: _PyArg_ParseStack). */ + PyAPI_FUNC(PyObject **) _PyStack_UnpackDict( + PyObject **args, + Py_ssize_t nargs, + PyObject *kwargs, + PyObject **kwnames, + PyObject *func); + + /* Call the callable object func with the "fast call" calling convention: + args is a C array for positional arguments (nargs is the number of + positional arguments), kwargs is a dictionary for keyword arguments. + + If nargs is equal to zero, args can be NULL. kwargs can be NULL. + nargs must be greater or equal to zero. + + Return the result on success. Raise an exception on return NULL on + error. */ + PyAPI_FUNC(PyObject *) _PyObject_FastCallDict(PyObject *func, + PyObject **args, Py_ssize_t nargs, + PyObject *kwargs); + + /* Call the callable object func with the "fast call" calling convention: + args is a C array for positional arguments followed by values of + keyword arguments. Keys of keyword arguments are stored as a tuple + of strings in kwnames. nargs is the number of positional parameters at + the beginning of stack. The size of kwnames gives the number of keyword + values in the stack after positional arguments. + + kwnames must only contains str strings, no subclass, and all keys must + be unique. + + If nargs is equal to zero and there is no keyword argument (kwnames is + NULL or its size is zero), args can be NULL. + + Return the result on success. Raise an exception and return NULL on + error. */ + PyAPI_FUNC(PyObject *) _PyObject_FastCallKeywords + (PyObject *func, + PyObject **args, + Py_ssize_t nargs, + PyObject *kwnames); + +#define _PyObject_FastCall(func, args, nargs) \ + _PyObject_FastCallDict((func), (args), (nargs), NULL) + +#define _PyObject_CallNoArg(func) \ + _PyObject_FastCall((func), NULL, 0) + +#define _PyObject_CallArg1(func, arg) \ + _PyObject_FastCall((func), &(arg), 1) + + PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(PyObject *func, + PyObject *obj, PyObject *args, + PyObject *kwargs); + PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where); -#endif +#endif /* Py_LIMITED_API */ PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, PyObject *args); @@ -315,6 +395,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ Python expression: o.method(args). */ +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o, _Py_Identifier *method, const char *format, ...); @@ -323,6 +404,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ Like PyObject_CallMethod, but expect a _Py_Identifier* as the method name. */ +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, @@ -331,10 +413,12 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ const char *name, const char *format, ...); +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, const char *format, ...); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, ...); @@ -350,9 +434,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, PyObject *method, ...); +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o, struct _Py_Identifier *method, ...); +#endif /* !Py_LIMITED_API */ /* Call the method named m of object o with a variable number of @@ -1270,13 +1356,13 @@ PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self); PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]); -#endif /* For internal use by buffer API functions */ PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index, const Py_ssize_t *shape); PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index, const Py_ssize_t *shape); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus diff --git a/Include/asdl.h b/Include/asdl.h index 495153c..35e9fa1 100644 --- a/Include/asdl.h +++ b/Include/asdl.h @@ -6,6 +6,7 @@ typedef PyObject * string; typedef PyObject * bytes; typedef PyObject * object; typedef PyObject * singleton; +typedef PyObject * constant; /* It would be nice if the code generated by asdl_c.py was completely independent of Python, but it is a goal the requires too much work diff --git a/Include/bytes_methods.h b/Include/bytes_methods.h index 11d5f42..7fa7540 100644 --- a/Include/bytes_methods.h +++ b/Include/bytes_methods.h @@ -17,9 +17,18 @@ extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len); /* These store their len sized answer in the given preallocated *result arg. */ extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len); extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len); -extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len); +extern void _Py_bytes_title(char *result, const char *s, Py_ssize_t len); +extern void _Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len); +extern void _Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len); + +extern PyObject *_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args); +extern int _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg); +extern PyObject *_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args); /* The maketrans() static method. */ extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to); @@ -37,7 +46,19 @@ extern const char _Py_upper__doc__[]; extern const char _Py_title__doc__[]; extern const char _Py_capitalize__doc__[]; extern const char _Py_swapcase__doc__[]; +extern const char _Py_count__doc__[]; +extern const char _Py_find__doc__[]; +extern const char _Py_index__doc__[]; +extern const char _Py_rfind__doc__[]; +extern const char _Py_rindex__doc__[]; +extern const char _Py_startswith__doc__[]; +extern const char _Py_endswith__doc__[]; extern const char _Py_maketrans__doc__[]; +extern const char _Py_expandtabs__doc__[]; +extern const char _Py_ljust__doc__[]; +extern const char _Py_rjust__doc__[]; +extern const char _Py_center__doc__[]; +extern const char _Py_zfill__doc__[]; /* this is needed because some docs are shared from the .o, not static */ #define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str) diff --git a/Include/bytesobject.h b/Include/bytesobject.h index 6c1e0c3..98e29b6 100644 --- a/Include/bytesobject.h +++ b/Include/bytesobject.h @@ -62,11 +62,23 @@ PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *); PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *); #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t); -PyAPI_FUNC(PyObject *) _PyBytes_Format(PyObject *, PyObject *); +PyAPI_FUNC(PyObject*) _PyBytes_FormatEx( + const char *format, + Py_ssize_t format_len, + PyObject *args, + int use_bytearray); +PyAPI_FUNC(PyObject*) _PyBytes_FromHex( + PyObject *string, + int use_bytearray); #endif PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t, const char *, Py_ssize_t, const char *); +/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */ +PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t, + const char *, Py_ssize_t, + const char *, + const char **); /* Macro, trading safety for speed */ #ifndef Py_LIMITED_API @@ -123,6 +135,87 @@ PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGrouping(char *buffer, #define F_ALT (1<<3) #define F_ZERO (1<<4) +#ifndef Py_LIMITED_API +/* The _PyBytesWriter structure is big: it contains an embedded "stack buffer". + A _PyBytesWriter variable must be declared at the end of variables in a + function to optimize the memory allocation on the stack. */ +typedef struct { + /* bytes, bytearray or NULL (when the small buffer is used) */ + PyObject *buffer; + + /* Number of allocated size. */ + Py_ssize_t allocated; + + /* Minimum number of allocated bytes, + incremented by _PyBytesWriter_Prepare() */ + Py_ssize_t min_size; + + /* If non-zero, use a bytearray instead of a bytes object for buffer. */ + int use_bytearray; + + /* If non-zero, overallocate the buffer (default: 0). + This flag must be zero if use_bytearray is non-zero. */ + int overallocate; + + /* Stack buffer */ + int use_small_buffer; + char small_buffer[512]; +} _PyBytesWriter; + +/* Initialize a bytes writer + + By default, the overallocation is disabled. Set the overallocate attribute + to control the allocation of the buffer. */ +PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer); + +/* Get the buffer content and reset the writer. + Return a bytes object, or a bytearray object if use_bytearray is non-zero. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer, + void *str); + +/* Deallocate memory of a writer (clear its internal buffer). */ +PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer); + +/* Allocate the buffer to write size bytes. + Return the pointer to the beginning of buffer data. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer, + Py_ssize_t size); + +/* Ensure that the buffer is large enough to write *size* bytes. + Add size to the writer minimum size (min_size attribute). + + str is the current pointer inside the buffer. + Return the updated current pointer inside the buffer. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer, + void *str, + Py_ssize_t size); + +/* Resize the buffer to make it larger. + The new buffer may be larger than size bytes because of overallocation. + Return the updated current pointer inside the buffer. + Raise an exception and return NULL on error. + + Note: size must be greater than the number of allocated bytes in the writer. + + This function doesn't use the writer minimum size (min_size attribute). + + See also _PyBytesWriter_Prepare(). + */ +PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer, + void *str, + Py_ssize_t size); + +/* Write bytes. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer, + void *str, + const void *bytes, + Py_ssize_t size); +#endif /* Py_LIMITED_API */ + #ifdef __cplusplus } #endif diff --git a/Include/ceval.h b/Include/ceval.h index 3f84b06..89c6062 100644 --- a/Include/ceval.h +++ b/Include/ceval.h @@ -8,7 +8,7 @@ extern "C" { /* Interface to random parts in ceval.c */ PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( - PyObject *, PyObject *, PyObject *); + PyObject *func, PyObject *args, PyObject *kwargs); /* Inline this */ #define PyEval_CallObject(func,arg) \ @@ -25,6 +25,10 @@ PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *); PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void); +PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *); +PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void); +PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *); +PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void); #endif struct _frame; /* Avoid including frameobject.h */ @@ -119,6 +123,9 @@ PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(struct _frame *f, int exc); +#endif /* Interface for threads. @@ -172,7 +179,9 @@ PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); PyAPI_FUNC(void) PyEval_InitThreads(void); +#ifndef Py_LIMITED_API PyAPI_FUNC(void) _PyEval_FiniThreads(void); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(void) PyEval_AcquireLock(void); PyAPI_FUNC(void) PyEval_ReleaseLock(void); PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); @@ -184,6 +193,10 @@ PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds); PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void); #endif +#ifndef Py_LIMITED_API +PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc); +#endif + #define Py_BEGIN_ALLOW_THREADS { \ PyThreadState *_save; \ _save = PyEval_SaveThread(); @@ -203,10 +216,17 @@ PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void); #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *); PyAPI_FUNC(void) _PyEval_SignalAsyncExc(void); #endif +/* Masks and values used by FORMAT_VALUE opcode. */ +#define FVC_MASK 0x3 +#define FVC_NONE 0x0 +#define FVC_STR 0x1 +#define FVC_REPR 0x2 +#define FVC_ASCII 0x3 +#define FVS_MASK 0x4 +#define FVS_HAVE_SPEC 0x4 #ifdef __cplusplus } diff --git a/Include/code.h b/Include/code.h index 8ecf38a..c5fce3c 100644 --- a/Include/code.h +++ b/Include/code.h @@ -7,6 +7,16 @@ extern "C" { #endif +typedef uint16_t _Py_CODEUNIT; + +#ifdef WORDS_BIGENDIAN +# define _Py_OPCODE(word) ((word) >> 8) +# define _Py_OPARG(word) ((word) & 255) +#else +# define _Py_OPCODE(word) ((word) & 255) +# define _Py_OPARG(word) ((word) >> 8) +#endif + /* Bytecode object */ typedef struct { PyObject_HEAD @@ -15,26 +25,29 @@ typedef struct { int co_nlocals; /* #local variables */ int co_stacksize; /* #entries needed for evaluation stack */ int co_flags; /* CO_..., see below */ + int co_firstlineno; /* first source line number */ PyObject *co_code; /* instruction opcodes */ PyObject *co_consts; /* list (constants used) */ PyObject *co_names; /* list of strings (names used) */ PyObject *co_varnames; /* tuple of strings (local variable names) */ PyObject *co_freevars; /* tuple of strings (free variable names) */ PyObject *co_cellvars; /* tuple of strings (cell variable names) */ - /* The rest aren't used in either hash or comparisons, except for - co_name (used in both) and co_firstlineno (used only in - comparisons). This is done to preserve the name and line number + /* The rest aren't used in either hash or comparisons, except for co_name, + used in both. This is done to preserve the name and line number for tracebacks and debuggers; otherwise, constant de-duplication would collapse identical functions/lambdas defined on different lines. */ unsigned char *co_cell2arg; /* Maps cell vars which are arguments. */ PyObject *co_filename; /* unicode (where it was loaded from) */ PyObject *co_name; /* unicode (name, for reference) */ - int co_firstlineno; /* first source line number */ PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) See Objects/lnotab_notes.txt for details. */ void *co_zombieframe; /* for optimization only (see frameobject.c) */ PyObject *co_weakreflist; /* to support weakrefs to code objects */ + /* Scratch space for extra data relating to the code object. + Type is a void* to keep the format private in codeobject.c to force + people to go through the proper APIs. */ + void *co_extra; } PyCodeObject; /* Masks for co_flags above */ @@ -55,6 +68,7 @@ typedef struct { ``async def`` keywords) */ #define CO_COROUTINE 0x0080 #define CO_ITERABLE_COROUTINE 0x0100 +#define CO_ASYNC_GENERATOR 0x0200 /* These are no longer used. */ #if 0 @@ -126,7 +140,15 @@ PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj); #endif PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, - PyObject *names, PyObject *lineno_obj); + PyObject *names, PyObject *lnotab); + + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index, + void **extra); +PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index, + void *extra); +#endif #ifdef __cplusplus } diff --git a/Include/datetime.h b/Include/datetime.h index 06cbc4a..3bf35cb 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -81,6 +81,7 @@ typedef struct typedef struct { _PyDateTime_TIMEHEAD + unsigned char fold; PyObject *tzinfo; } PyDateTime_Time; /* hastzinfo true */ @@ -108,6 +109,7 @@ typedef struct typedef struct { _PyDateTime_DATETIMEHEAD + unsigned char fold; PyObject *tzinfo; } PyDateTime_DateTime; /* hastzinfo true */ @@ -125,6 +127,7 @@ typedef struct ((((PyDateTime_DateTime*)o)->data[7] << 16) | \ (((PyDateTime_DateTime*)o)->data[8] << 8) | \ ((PyDateTime_DateTime*)o)->data[9]) +#define PyDateTime_DATE_GET_FOLD(o) (((PyDateTime_DateTime*)o)->fold) /* Apply for time instances. */ #define PyDateTime_TIME_GET_HOUR(o) (((PyDateTime_Time*)o)->data[0]) @@ -134,6 +137,7 @@ typedef struct ((((PyDateTime_Time*)o)->data[3] << 16) | \ (((PyDateTime_Time*)o)->data[4] << 8) | \ ((PyDateTime_Time*)o)->data[5]) +#define PyDateTime_TIME_GET_FOLD(o) (((PyDateTime_Time*)o)->fold) /* Apply for time delta instances */ #define PyDateTime_DELTA_GET_DAYS(o) (((PyDateTime_Delta*)o)->days) @@ -162,6 +166,11 @@ typedef struct { PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*); PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*); + /* PEP 495 constructors */ + PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int, + PyObject*, int, PyTypeObject*); + PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, PyTypeObject*); + } PyDateTime_CAPI; #define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" @@ -217,10 +226,18 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL; PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \ min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType) +#define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold) \ + PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, \ + min, sec, usec, Py_None, fold, PyDateTimeAPI->DateTimeType) + #define PyTime_FromTime(hour, minute, second, usecond) \ PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \ Py_None, PyDateTimeAPI->TimeType) +#define PyTime_FromTimeAndFold(hour, minute, second, usecond, fold) \ + PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, usecond, \ + Py_None, fold, PyDateTimeAPI->TimeType) + #define PyDelta_FromDSU(days, seconds, useconds) \ PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ PyDateTimeAPI->DeltaType) diff --git a/Include/descrobject.h b/Include/descrobject.h index e2ba97f..8f3e84c 100644 --- a/Include/descrobject.h +++ b/Include/descrobject.h @@ -78,7 +78,9 @@ PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; PyAPI_DATA(PyTypeObject) PyMethodDescr_Type; PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; PyAPI_DATA(PyTypeObject) PyDictProxy_Type; +#ifndef Py_LIMITED_API PyAPI_DATA(PyTypeObject) _PyMethodWrapper_Type; +#endif /* Py_LIMITED_API */ PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); diff --git a/Include/dictobject.h b/Include/dictobject.h index 17e12c0..30f114e 100644 --- a/Include/dictobject.h +++ b/Include/dictobject.h @@ -22,8 +22,21 @@ typedef struct _dictkeysobject PyDictKeysObject; */ typedef struct { PyObject_HEAD + + /* Number of items in the dictionary */ Py_ssize_t ma_used; + + /* Dictionary version: globally unique, value change each time + the dictionary is modified */ + uint64_t ma_version_tag; + PyDictKeysObject *ma_keys; + + /* If ma_values is NULL, the table is "combined": keys and values + are stored in ma_keys. + + If ma_values is not NULL, the table is splitted: + keys are stored in ma_keys and values are stored in ma_values */ PyObject **ma_values; } PyDictObject; @@ -60,9 +73,9 @@ PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key, Py_hash_t hash); #endif PyAPI_FUNC(PyObject *) PyDict_GetItemWithError(PyObject *mp, PyObject *key); +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp, struct _Py_Identifier *key); -#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyDict_SetDefault( PyObject *mp, PyObject *key, PyObject *defaultobj); #endif @@ -75,8 +88,6 @@ PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key); #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key, Py_hash_t hash); -PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key, - int (*predicate)(PyObject *value)); #endif PyAPI_FUNC(void) PyDict_Clear(PyObject *mp); PyAPI_FUNC(int) PyDict_Next( @@ -101,8 +112,7 @@ PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp); PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp); Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys); Py_ssize_t _PyDict_SizeOf(PyDictObject *); -PyObject *_PyDict_Pop(PyDictObject *, PyObject *, PyObject *); -PyObject *_PyDict_Pop_KnownHash(PyDictObject *, PyObject *, Py_hash_t, PyObject *); +PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *); PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *); #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL) @@ -122,6 +132,12 @@ PyAPI_FUNC(int) PyDict_Merge(PyObject *mp, int override); #ifndef Py_LIMITED_API +/* Like PyDict_Merge, but override can be 0, 1 or 2. If override is 0, + the first occurrence of a key wins, if override is 1, the last occurrence + of a key wins, if override is 2, a KeyError with conflicting key as + argument is raised. +*/ +PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override); PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other); #endif @@ -135,9 +151,13 @@ PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d, int override); PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key); +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item); +#ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key); #ifndef Py_LIMITED_API diff --git a/Include/fileobject.h b/Include/fileobject.h index 03155d3..03984ba 100644 --- a/Include/fileobject.h +++ b/Include/fileobject.h @@ -23,6 +23,7 @@ PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); If non-NULL, this is different than the default encoding for strings */ PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; +PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors; PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding; /* Internal API diff --git a/Include/fileutils.h b/Include/fileutils.h index b4a683c..4016431 100644 --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -5,8 +5,6 @@ extern "C" { #endif -PyAPI_FUNC(PyObject *) _Py_device_encoding(int); - PyAPI_FUNC(wchar_t *) Py_DecodeLocale( const char *arg, size_t *size); @@ -17,6 +15,8 @@ PyAPI_FUNC(char*) Py_EncodeLocale( #ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _Py_device_encoding(int); + #ifdef MS_WINDOWS struct _Py_stat_struct { unsigned long st_dev; @@ -46,13 +46,11 @@ PyAPI_FUNC(int) _Py_fstat( PyAPI_FUNC(int) _Py_fstat_noraise( int fd, struct _Py_stat_struct *status); -#endif /* Py_LIMITED_API */ PyAPI_FUNC(int) _Py_stat( PyObject *path, struct stat *status); -#ifndef Py_LIMITED_API PyAPI_FUNC(int) _Py_open( const char *pathname, int flags); @@ -60,7 +58,6 @@ PyAPI_FUNC(int) _Py_open( PyAPI_FUNC(int) _Py_open_noraise( const char *pathname, int flags); -#endif PyAPI_FUNC(FILE *) _Py_wfopen( const wchar_t *path, @@ -107,7 +104,6 @@ PyAPI_FUNC(wchar_t*) _Py_wgetcwd( wchar_t *buf, size_t size); -#ifndef Py_LIMITED_API PyAPI_FUNC(int) _Py_get_inheritable(int fd); PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable, @@ -121,18 +117,6 @@ PyAPI_FUNC(int) _Py_get_blocking(int fd); PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking); #endif /* !MS_WINDOWS */ -#if defined _MSC_VER && _MSC_VER >= 1400 && _MSC_VER < 1900 -/* A routine to check if a file descriptor is valid on Windows. Returns 0 - * and sets errno to EBADF if it isn't. This is to avoid Assertions - * from various functions in the Windows CRT beginning with - * Visual Studio 2005 - */ -int _PyVerify_fd(int fd); - -#else -#define _PyVerify_fd(A) (1) /* dummy */ -#endif - #endif /* Py_LIMITED_API */ #ifdef __cplusplus diff --git a/Include/floatobject.h b/Include/floatobject.h index e240fdb..f1044d6 100644 --- a/Include/floatobject.h +++ b/Include/floatobject.h @@ -74,9 +74,9 @@ PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); * happens in such cases is partly accidental (alas). */ -/* The pack routines write 4 or 8 bytes, starting at p. le is a bool +/* The pack routines write 2, 4 or 8 bytes, starting at p. le is a bool * argument, true if you want the string in little-endian format (exponent - * last, at p+3 or p+7), false if you want big-endian format (exponent + * last, at p+1, p+3 or p+7), false if you want big-endian format (exponent * first, at p). * Return value: 0 if all is OK, -1 if error (and an exception is * set, most likely OverflowError). @@ -84,6 +84,7 @@ PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); * 1): What this does is undefined if x is a NaN or infinity. * 2): -0.0 and +0.0 produce the same string. */ +PyAPI_FUNC(int) _PyFloat_Pack2(double x, unsigned char *p, int le); PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le); PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le); @@ -96,14 +97,15 @@ PyAPI_FUNC(int) _PyFloat_Repr(double x, char *p, size_t len); PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum); PyAPI_FUNC(void) _PyFloat_DigitsInit(void); -/* The unpack routines read 4 or 8 bytes, starting at p. le is a bool +/* The unpack routines read 2, 4 or 8 bytes, starting at p. le is a bool * argument, true if the string is in little-endian format (exponent - * last, at p+3 or p+7), false if big-endian (exponent first, at p). + * last, at p+1, p+3 or p+7), false if big-endian (exponent first, at p). * Return value: The unpacked double. On error, this is -1.0 and * PyErr_Occurred() is true (and an exception is set, most likely * OverflowError). Note that on a non-IEEE platform this will refuse * to unpack a string that represents a NaN or infinity. */ +PyAPI_FUNC(double) _PyFloat_Unpack2(const unsigned char *p, int le); PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le); PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le); diff --git a/Include/funcobject.h b/Include/funcobject.h index cc1426c..77bb8c3 100644 --- a/Include/funcobject.h +++ b/Include/funcobject.h @@ -58,6 +58,20 @@ PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *); PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *); PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict( + PyObject *func, + PyObject **args, + Py_ssize_t nargs, + PyObject *kwargs); + +PyAPI_FUNC(PyObject *) _PyFunction_FastCallKeywords( + PyObject *func, + PyObject **stack, + Py_ssize_t nargs, + PyObject *kwnames); +#endif + /* Macros for direct access to these values. Type checks are *not* done, so use with care. */ #define PyFunction_GET_CODE(func) \ diff --git a/Include/genobject.h b/Include/genobject.h index 61e708a..8c1825f 100644 --- a/Include/genobject.h +++ b/Include/genobject.h @@ -43,7 +43,7 @@ PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(struct _frame *, PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *); PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *); PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **); -PyObject *_PyGen_Send(PyGenObject *, PyObject *); +PyAPI_FUNC(PyObject *) _PyGen_Send(PyGenObject *, PyObject *); PyObject *_PyGen_yf(PyGenObject *); PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self); @@ -62,6 +62,37 @@ PyObject *_PyAIterWrapper_New(PyObject *aiter); PyObject *_PyCoro_GetAwaitableIter(PyObject *o); PyAPI_FUNC(PyObject *) PyCoro_New(struct _frame *, PyObject *name, PyObject *qualname); + +/* Asynchronous Generators */ + +typedef struct { + _PyGenObject_HEAD(ag) + PyObject *ag_finalizer; + + /* Flag is set to 1 when hooks set up by sys.set_asyncgen_hooks + were called on the generator, to avoid calling them more + than once. */ + int ag_hooks_inited; + + /* Flag is set to 1 when aclose() is called for the first time, or + when a StopAsyncIteration exception is raised. */ + int ag_closed; +} PyAsyncGenObject; + +PyAPI_DATA(PyTypeObject) PyAsyncGen_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenWrappedValue_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenAThrow_Type; + +PyAPI_FUNC(PyObject *) PyAsyncGen_New(struct _frame *, + PyObject *name, PyObject *qualname); + +#define PyAsyncGen_CheckExact(op) (Py_TYPE(op) == &PyAsyncGen_Type) + +PyObject *_PyAsyncGenValueWrapperNew(PyObject *); + +int PyAsyncGen_ClearFreeLists(void); + #endif #undef _PyGenObject_HEAD diff --git a/Include/graminit.h b/Include/graminit.h index d030bc3..e9b4a93 100644 --- a/Include/graminit.h +++ b/Include/graminit.h @@ -17,71 +17,72 @@ #define simple_stmt 270 #define small_stmt 271 #define expr_stmt 272 -#define testlist_star_expr 273 -#define augassign 274 -#define del_stmt 275 -#define pass_stmt 276 -#define flow_stmt 277 -#define break_stmt 278 -#define continue_stmt 279 -#define return_stmt 280 -#define yield_stmt 281 -#define raise_stmt 282 -#define import_stmt 283 -#define import_name 284 -#define import_from 285 -#define import_as_name 286 -#define dotted_as_name 287 -#define import_as_names 288 -#define dotted_as_names 289 -#define dotted_name 290 -#define global_stmt 291 -#define nonlocal_stmt 292 -#define assert_stmt 293 -#define compound_stmt 294 -#define async_stmt 295 -#define if_stmt 296 -#define while_stmt 297 -#define for_stmt 298 -#define try_stmt 299 -#define with_stmt 300 -#define with_item 301 -#define except_clause 302 -#define suite 303 -#define test 304 -#define test_nocond 305 -#define lambdef 306 -#define lambdef_nocond 307 -#define or_test 308 -#define and_test 309 -#define not_test 310 -#define comparison 311 -#define comp_op 312 -#define star_expr 313 -#define expr 314 -#define xor_expr 315 -#define and_expr 316 -#define shift_expr 317 -#define arith_expr 318 -#define term 319 -#define factor 320 -#define power 321 -#define atom_expr 322 -#define atom 323 -#define testlist_comp 324 -#define trailer 325 -#define subscriptlist 326 -#define subscript 327 -#define sliceop 328 -#define exprlist 329 -#define testlist 330 -#define dictorsetmaker 331 -#define classdef 332 -#define arglist 333 -#define argument 334 -#define comp_iter 335 -#define comp_for 336 -#define comp_if 337 -#define encoding_decl 338 -#define yield_expr 339 -#define yield_arg 340 +#define annassign 273 +#define testlist_star_expr 274 +#define augassign 275 +#define del_stmt 276 +#define pass_stmt 277 +#define flow_stmt 278 +#define break_stmt 279 +#define continue_stmt 280 +#define return_stmt 281 +#define yield_stmt 282 +#define raise_stmt 283 +#define import_stmt 284 +#define import_name 285 +#define import_from 286 +#define import_as_name 287 +#define dotted_as_name 288 +#define import_as_names 289 +#define dotted_as_names 290 +#define dotted_name 291 +#define global_stmt 292 +#define nonlocal_stmt 293 +#define assert_stmt 294 +#define compound_stmt 295 +#define async_stmt 296 +#define if_stmt 297 +#define while_stmt 298 +#define for_stmt 299 +#define try_stmt 300 +#define with_stmt 301 +#define with_item 302 +#define except_clause 303 +#define suite 304 +#define test 305 +#define test_nocond 306 +#define lambdef 307 +#define lambdef_nocond 308 +#define or_test 309 +#define and_test 310 +#define not_test 311 +#define comparison 312 +#define comp_op 313 +#define star_expr 314 +#define expr 315 +#define xor_expr 316 +#define and_expr 317 +#define shift_expr 318 +#define arith_expr 319 +#define term 320 +#define factor 321 +#define power 322 +#define atom_expr 323 +#define atom 324 +#define testlist_comp 325 +#define trailer 326 +#define subscriptlist 327 +#define subscript 328 +#define sliceop 329 +#define exprlist 330 +#define testlist 331 +#define dictorsetmaker 332 +#define classdef 333 +#define arglist 334 +#define argument 335 +#define comp_iter 336 +#define comp_for 337 +#define comp_if 338 +#define encoding_decl 339 +#define yield_expr 340 +#define yield_arg 341 diff --git a/Include/grammar.h b/Include/grammar.h index 85120b9..f775f96 100644 --- a/Include/grammar.h +++ b/Include/grammar.h @@ -69,6 +69,7 @@ typedef struct { /* FUNCTIONS */ grammar *newgrammar(int start); +void freegrammar(grammar *g); dfa *adddfa(grammar *g, int type, const char *name); int addstate(dfa *d); void addarc(dfa *d, int from, int to, int lbl); diff --git a/Include/import.h b/Include/import.h index afdfac2..46c0d8e 100644 --- a/Include/import.h +++ b/Include/import.h @@ -7,7 +7,9 @@ extern "C" { #endif +#ifndef Py_LIMITED_API PyAPI_FUNC(void) _PyImportZip_Init(void); +#endif /* !Py_LIMITED_API */ PyMODINIT_FUNC PyInit_imp(void); PyAPI_FUNC(long) PyImport_GetMagicNumber(void); diff --git a/Include/intrcheck.h b/Include/intrcheck.h index f53fee1..8fb96cf 100644 --- a/Include/intrcheck.h +++ b/Include/intrcheck.h @@ -8,12 +8,15 @@ extern "C" { PyAPI_FUNC(int) PyOS_InterruptOccurred(void); PyAPI_FUNC(void) PyOS_InitInterrupts(void); PyAPI_FUNC(void) PyOS_AfterFork(void); + +#ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyOS_IsMainThread(void); #ifdef MS_WINDOWS /* windows.h is not included by Python.h so use void* instead of HANDLE */ PyAPI_FUNC(void*) _PyOS_SigintEvent(void); #endif +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/longintrepr.h b/Include/longintrepr.h index bbba4d8..a3b74b4 100644 --- a/Include/longintrepr.h +++ b/Include/longintrepr.h @@ -42,14 +42,10 @@ extern "C" { */ #if PYLONG_BITS_IN_DIGIT == 30 -#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T && \ - defined HAVE_INT64_T && defined HAVE_INT32_T) -#error "30-bit long digits requested, but the necessary types are not available on this platform" -#endif -typedef PY_UINT32_T digit; -typedef PY_INT32_T sdigit; /* signed variant of digit */ -typedef PY_UINT64_T twodigits; -typedef PY_INT64_T stwodigits; /* signed variant of twodigits */ +typedef uint32_t digit; +typedef int32_t sdigit; /* signed variant of digit */ +typedef uint64_t twodigits; +typedef int64_t stwodigits; /* signed variant of twodigits */ #define PyLong_SHIFT 30 #define _PyLong_DECIMAL_SHIFT 9 /* max(e such that 10**e fits in a digit) */ #define _PyLong_DECIMAL_BASE ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */ diff --git a/Include/longobject.h b/Include/longobject.h index 2a2eecf..efd409c 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -65,7 +65,8 @@ PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); # error "void* different in size from int, long and long long" #endif /* SIZEOF_VOID_P */ -/* Used by Python/mystrtoul.c. */ +/* Used by Python/mystrtoul.c, _PyBytes_FromHex(), + _PyBytes_DecodeEscapeRecode(), etc. */ #ifndef Py_LIMITED_API PyAPI_DATA(unsigned char) _PyLong_DigitValue[256]; #endif @@ -84,14 +85,12 @@ PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); -#ifdef HAVE_LONG_LONG -PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG); -PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); -#endif /* HAVE_LONG_LONG */ +PyAPI_FUNC(PyObject *) PyLong_FromLongLong(long long); +PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned long long); +PyAPI_FUNC(long long) PyLong_AsLongLong(PyObject *); +PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLong(PyObject *); +PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *); +PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *); PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int); #ifndef Py_LIMITED_API @@ -182,6 +181,13 @@ PyAPI_FUNC(int) _PyLong_FormatWriter( int base, int alternate); +PyAPI_FUNC(char*) _PyLong_FormatBytesWriter( + _PyBytesWriter *writer, + char *str, + PyObject *obj, + int base, + int alternate); + /* Format the object based on the format_spec, as defined in PEP 3101 (Advanced String Formatting). */ PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter( @@ -198,8 +204,10 @@ PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter( PyAPI_FUNC(unsigned long) PyOS_strtoul(const char *, char **, int); PyAPI_FUNC(long) PyOS_strtol(const char *, char **, int); +#ifndef Py_LIMITED_API /* For use by the gcd function in mathmodule.c */ PyAPI_FUNC(PyObject *) _PyLong_GCD(PyObject *, PyObject *); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/methodobject.h b/Include/methodobject.h index e2ad804..79fad82 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -16,6 +16,8 @@ PyAPI_DATA(PyTypeObject) PyCFunction_Type; #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type) typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); +typedef PyObject *(*_PyCFunctionFast) (PyObject *self, PyObject **args, + Py_ssize_t nargs, PyObject *kwnames); typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, PyObject *); typedef PyObject *(*PyNoArgsFunction)(PyObject *); @@ -37,6 +39,18 @@ PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *); #endif PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func, + PyObject **args, + Py_ssize_t nargs, + PyObject *kwargs); + +PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func, + PyObject **stack, + Py_ssize_t nargs, + PyObject *kwnames); +#endif + struct PyMethodDef { const char *ml_name; /* The name of the built-in function/method */ PyCFunction ml_meth; /* The C function that implements it */ @@ -72,6 +86,8 @@ PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, #define METH_COEXIST 0x0040 #ifndef Py_LIMITED_API +#define METH_FASTCALL 0x0080 + typedef struct { PyObject_HEAD PyMethodDef *m_ml; /* Description of the C function to call */ diff --git a/Include/modsupport.h b/Include/modsupport.h index 6d4b6dc..833e33d 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -15,12 +15,16 @@ extern "C" { #define PyArg_Parse _PyArg_Parse_SizeT #define PyArg_ParseTuple _PyArg_ParseTuple_SizeT #define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT +#ifndef Py_LIMITED_API #define PyArg_VaParse _PyArg_VaParse_SizeT #define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT +#endif /* !Py_LIMITED_API */ #define Py_BuildValue _Py_BuildValue_SizeT #define Py_VaBuildValue _Py_VaBuildValue_SizeT #else +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list); +#endif /* !Py_LIMITED_API */ #endif /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ @@ -29,21 +33,47 @@ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...); PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, const char *, char **, ...); -PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); -PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, va_list); -#endif PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); - +#endif #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw); PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args); + +PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); +PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, + const char *, char **, va_list); #endif PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); +#ifndef Py_LIMITED_API +typedef struct _PyArg_Parser { + const char *format; + const char * const *keywords; + const char *fname; + const char *custom_msg; + int pos; /* number of positional-only arguments */ + int min; /* minimal number of arguments */ + int max; /* maximal number of positional arguments */ + PyObject *kwtuple; /* tuple of keyword parameter names */ + struct _PyArg_Parser *next; +} _PyArg_Parser; +#ifdef PY_SSIZE_T_CLEAN +#define _PyArg_ParseTupleAndKeywordsFast _PyArg_ParseTupleAndKeywordsFast_SizeT +#define _PyArg_ParseStack _PyArg_ParseStack_SizeT +#define _PyArg_VaParseTupleAndKeywordsFast _PyArg_VaParseTupleAndKeywordsFast_SizeT +#endif +PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, ...); +PyAPI_FUNC(int) _PyArg_ParseStack(PyObject **args, Py_ssize_t nargs, PyObject *kwnames, + struct _PyArg_Parser *, ...); +PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, va_list); +void _PyArg_Fini(void); +#endif + PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); diff --git a/Include/namespaceobject.h b/Include/namespaceobject.h index a412f05..0c8d95c 100644 --- a/Include/namespaceobject.h +++ b/Include/namespaceobject.h @@ -7,9 +7,11 @@ extern "C" { #endif +#ifndef Py_LIMITED_API PyAPI_DATA(PyTypeObject) _PyNamespace_Type; PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/object.h b/Include/object.h index 50d9747..338ec1b 100644 --- a/Include/object.h +++ b/Include/object.h @@ -118,6 +118,7 @@ typedef struct { #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size) +#ifndef Py_LIMITED_API /********************* String Literals ****************************************/ /* This structure helps managing static strings. The basic usage goes like this: Instead of doing @@ -144,10 +145,12 @@ typedef struct _Py_Identifier { PyObject *object; } _Py_Identifier; -#define _Py_static_string_init(value) { 0, value, 0 } +#define _Py_static_string_init(value) { .next = NULL, .string = value, .object = NULL } #define _Py_static_string(varname, value) static _Py_Identifier varname = _Py_static_string_init(value) #define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname) +#endif /* !Py_LIMITED_API */ + /* Type objects contain a string containing the type name (to help somewhat in debugging), the allocation parameters (see PyObject_New() and @@ -512,8 +515,8 @@ PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, con #endif /* Generic operations on objects */ -struct _Py_Identifier; #ifndef Py_LIMITED_API +struct _Py_Identifier; PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int); PyAPI_FUNC(void) _Py_BreakPoint(void); PyAPI_FUNC(void) _PyObject_Dump(PyObject *); @@ -530,11 +533,11 @@ PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); +#ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *); PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *); PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *); PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *); -#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); #endif PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); @@ -557,6 +560,7 @@ PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *); PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *); #endif +#ifndef Py_LIMITED_API /* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes dict as the last parameter. */ PyAPI_FUNC(PyObject *) @@ -564,6 +568,7 @@ _PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *); PyAPI_FUNC(int) _PyObject_GenericSetAttrWithDict(PyObject *, PyObject *, PyObject *, PyObject *); +#endif /* !Py_LIMITED_API */ /* Helper to look up a builtin object */ #ifndef Py_LIMITED_API @@ -708,7 +713,6 @@ you can count such references to the type object.) PyAPI_DATA(Py_ssize_t) _Py_RefTotal; PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname, int lineno, PyObject *op); -PyAPI_FUNC(PyObject *) _PyDict_Dummy(void); PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); #define _Py_INC_REFTOTAL _Py_RefTotal++ #define _Py_DEC_REFTOTAL _Py_RefTotal-- @@ -785,7 +789,7 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *); --(_py_decref_tmp)->ob_refcnt != 0) \ _Py_CHECK_REFCNT(_py_decref_tmp) \ else \ - _Py_Dealloc(_py_decref_tmp); \ + _Py_Dealloc(_py_decref_tmp); \ } while (0) /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear @@ -889,8 +893,10 @@ they can have object code that is not dependent on Python compilation flags. PyAPI_FUNC(void) Py_IncRef(PyObject *); PyAPI_FUNC(void) Py_DecRef(PyObject *); +#ifndef Py_LIMITED_API PyAPI_DATA(PyTypeObject) _PyNone_Type; PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type; +#endif /* !Py_LIMITED_API */ /* _Py_NoneStruct is an object of undefined type which can be used in contexts @@ -923,10 +929,12 @@ PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ #define Py_GT 4 #define Py_GE 5 +#ifndef Py_LIMITED_API /* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. * Defined in object.c. */ PyAPI_DATA(int) _Py_SwappedOp[]; +#endif /* !Py_LIMITED_API */ /* @@ -1023,12 +1031,14 @@ chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces, with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL. */ +#ifndef Py_LIMITED_API /* This is the old private API, invoked by the macros before 3.2.4. Kept for binary compatibility of extensions using the stable ABI. */ PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*); PyAPI_FUNC(void) _PyTrash_destroy_chain(void); PyAPI_DATA(int) _PyTrash_delete_nesting; PyAPI_DATA(PyObject *) _PyTrash_delete_later; +#endif /* !Py_LIMITED_API */ /* The new thread-safe private API, invoked by the macros below. */ PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*); diff --git a/Include/objimpl.h b/Include/objimpl.h index 65b6d91..c0ed9b7 100644 --- a/Include/objimpl.h +++ b/Include/objimpl.h @@ -99,8 +99,10 @@ PyAPI_FUNC(void *) PyObject_Calloc(size_t nelem, size_t elsize); PyAPI_FUNC(void *) PyObject_Realloc(void *ptr, size_t new_size); PyAPI_FUNC(void) PyObject_Free(void *ptr); +#ifndef Py_LIMITED_API /* This function returns the number of allocated memory blocks, regardless of size */ PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void); +#endif /* !Py_LIMITED_API */ /* Macros */ #ifdef WITH_PYMALLOC @@ -224,11 +226,12 @@ PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator); * ========================== */ -/* C equivalent of gc.collect(). */ +/* C equivalent of gc.collect() which ignores the state of gc.enabled. */ PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void); #ifndef Py_LIMITED_API PyAPI_FUNC(Py_ssize_t) _PyGC_CollectNoFail(void); +PyAPI_FUNC(Py_ssize_t) _PyGC_CollectIfEnabled(void); #endif /* Test if a type has a GC head */ @@ -322,8 +325,10 @@ extern PyGC_Head *_PyGC_generation0; (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj))) #endif /* Py_LIMITED_API */ +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size); PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *); PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t); PyAPI_FUNC(void) PyObject_GC_Track(void *); diff --git a/Include/opcode.h b/Include/opcode.h index 3f917fb..be360e1 100644 --- a/Include/opcode.h +++ b/Include/opcode.h @@ -60,6 +60,7 @@ extern "C" { #define WITH_CLEANUP_FINISH 82 #define RETURN_VALUE 83 #define IMPORT_STAR 84 +#define SETUP_ANNOTATIONS 85 #define YIELD_VALUE 86 #define POP_BLOCK 87 #define END_FINALLY 88 @@ -98,18 +99,17 @@ extern "C" { #define LOAD_FAST 124 #define STORE_FAST 125 #define DELETE_FAST 126 +#define STORE_ANNOTATION 127 #define RAISE_VARARGS 130 #define CALL_FUNCTION 131 #define MAKE_FUNCTION 132 #define BUILD_SLICE 133 -#define MAKE_CLOSURE 134 #define LOAD_CLOSURE 135 #define LOAD_DEREF 136 #define STORE_DEREF 137 #define DELETE_DEREF 138 -#define CALL_FUNCTION_VAR 140 #define CALL_FUNCTION_KW 141 -#define CALL_FUNCTION_VAR_KW 142 +#define CALL_FUNCTION_EX 142 #define SETUP_WITH 143 #define EXTENDED_ARG 144 #define LIST_APPEND 145 @@ -122,6 +122,10 @@ extern "C" { #define BUILD_TUPLE_UNPACK 152 #define BUILD_SET_UNPACK 153 #define SETUP_ASYNC_WITH 154 +#define FORMAT_VALUE 155 +#define BUILD_CONST_KEY_MAP 156 +#define BUILD_STRING 157 +#define BUILD_TUPLE_UNPACK_WITH_CALL 158 /* EXCEPT_HANDLER is a special, implicit block type which is created when entering an except handler. It is not an opcode but we define it here diff --git a/Include/osmodule.h b/Include/osmodule.h new file mode 100644 index 0000000..7146757 --- /dev/null +++ b/Include/osmodule.h @@ -0,0 +1,15 @@ + +/* os module interface */ + +#ifndef Py_OSMODULE_H +#define Py_OSMODULE_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(PyObject *) PyOS_FSPath(PyObject *path); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OSMODULE_H */ diff --git a/Include/patchlevel.h b/Include/patchlevel.h index e8bb027..92a63bd 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -17,13 +17,13 @@ /* Version parsed out into numeric values */ /*--start constants--*/ #define PY_MAJOR_VERSION 3 -#define PY_MINOR_VERSION 5 -#define PY_MICRO_VERSION 4 +#define PY_MINOR_VERSION 6 +#define PY_MICRO_VERSION 0 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.5.4" +#define PY_VERSION "3.6.0" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Include/pgenheaders.h b/Include/pgenheaders.h index 2049ae3..4843de6 100644 --- a/Include/pgenheaders.h +++ b/Include/pgenheaders.h @@ -23,6 +23,7 @@ PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) #define delbitset _Py_delbitset #define dumptree _Py_dumptree #define findlabel _Py_findlabel +#define freegrammar _Py_freegrammar #define mergebitset _Py_mergebitset #define meta_grammar _Py_meta_grammar #define newbitset _Py_newbitset diff --git a/Include/py_curses.h b/Include/py_curses.h index f2c08f6..3c21697 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -103,8 +103,8 @@ static void **PyCurses_API; #endif /* general error messages */ -static char *catchall_ERR = "curses function returned ERR"; -static char *catchall_NULL = "curses function returned NULL"; +static const char catchall_ERR[] = "curses function returned ERR"; +static const char catchall_NULL[] = "curses function returned NULL"; /* Function Prototype Macros - They are ugly but very, very useful. ;-) diff --git a/Include/pyatomic.h b/Include/pyatomic.h index 89028ef..893d30d 100644 --- a/Include/pyatomic.h +++ b/Include/pyatomic.h @@ -61,7 +61,7 @@ typedef enum _Py_memory_order { } _Py_memory_order; typedef struct _Py_atomic_address { - Py_uintptr_t _value; + uintptr_t _value; } _Py_atomic_address; typedef struct _Py_atomic_int { @@ -98,7 +98,7 @@ typedef enum _Py_memory_order { } _Py_memory_order; typedef struct _Py_atomic_address { - Py_uintptr_t _value; + uintptr_t _value; } _Py_atomic_address; typedef struct _Py_atomic_int { diff --git a/Include/pydebug.h b/Include/pydebug.h index 19bec2b..6e23a89 100644 --- a/Include/pydebug.h +++ b/Include/pydebug.h @@ -24,6 +24,10 @@ PyAPI_DATA(int) Py_UnbufferedStdioFlag; PyAPI_DATA(int) Py_HashRandomizationFlag; PyAPI_DATA(int) Py_IsolatedFlag; +#ifdef MS_WINDOWS +PyAPI_DATA(int) Py_LegacyWindowsStdioFlag; +#endif + /* this is a wrapper around getenv() that pays attention to Py_IgnoreEnvironmentFlag. It should be used for getting variables like PYTHONPATH and PYTHONHOME from the environment */ diff --git a/Include/pydtrace.d b/Include/pydtrace.d new file mode 100644 index 0000000..8836055 --- /dev/null +++ b/Include/pydtrace.d @@ -0,0 +1,19 @@ +/* Python DTrace provider */ + +provider python { + probe function__entry(const char *, const char *, int); + probe function__return(const char *, const char *, int); + probe instance__new__start(const char *, const char *); + probe instance__new__done(const char *, const char *); + probe instance__delete__start(const char *, const char *); + probe instance__delete__done(const char *, const char *); + probe line(const char *, const char *, int); + probe gc__start(int); + probe gc__done(long); +}; + +#pragma D attributes Evolving/Evolving/Common provider python provider +#pragma D attributes Evolving/Evolving/Common provider python module +#pragma D attributes Evolving/Evolving/Common provider python function +#pragma D attributes Evolving/Evolving/Common provider python name +#pragma D attributes Evolving/Evolving/Common provider python args diff --git a/Include/pydtrace.h b/Include/pydtrace.h new file mode 100644 index 0000000..c43a253 --- /dev/null +++ b/Include/pydtrace.h @@ -0,0 +1,53 @@ +/* Static DTrace probes interface */ + +#ifndef Py_DTRACE_H +#define Py_DTRACE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef WITH_DTRACE + +#include "pydtrace_probes.h" + +/* pydtrace_probes.h, on systems with DTrace, is auto-generated to include + `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe + defined in pydtrace_provider.d. + + Calling these functions must be guarded by a `PyDTrace_{PROBE}_ENABLED()` + check to minimize performance impact when probing is off. For example: + + if (PyDTrace_FUNCTION_ENTRY_ENABLED()) + PyDTrace_FUNCTION_ENTRY(f); +*/ + +#else + +/* Without DTrace, compile to nothing. */ + +static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_GC_START(int arg0) {} +static inline void PyDTrace_GC_DONE(int arg0) {} +static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {} +static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {} +static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {} +static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {} + +static inline int PyDTrace_LINE_ENABLED(void) { return 0; } +static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; } +static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; } +static inline int PyDTrace_GC_START_ENABLED(void) { return 0; } +static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; } + +#endif /* !WITH_DTRACE */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_DTRACE_H */ diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 35aedb7..f9f74c0 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -160,6 +160,7 @@ PyAPI_DATA(PyObject *) PyExc_EOFError; PyAPI_DATA(PyObject *) PyExc_FloatingPointError; PyAPI_DATA(PyObject *) PyExc_OSError; PyAPI_DATA(PyObject *) PyExc_ImportError; +PyAPI_DATA(PyObject *) PyExc_ModuleNotFoundError; PyAPI_DATA(PyObject *) PyExc_IndexError; PyAPI_DATA(PyObject *) PyExc_KeyError; PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt; @@ -254,6 +255,17 @@ PyAPI_FUNC(PyObject *) PyErr_FormatV( va_list vargs); #endif +#ifndef Py_LIMITED_API +/* Like PyErr_Format(), but saves current exception as __context__ and + __cause__. + */ +PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause( + PyObject *exception, + const char *format, /* ASCII-encoded string */ + ... + ); +#endif + #ifdef MS_WINDOWS PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( int ierr, @@ -283,6 +295,9 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); PyAPI_FUNC(PyObject *) PyErr_SetExcWithArgsKwargs(PyObject *, PyObject *, PyObject *); + +PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *, + PyObject *, PyObject *); PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *, PyObject *); diff --git a/Include/pygetopt.h b/Include/pygetopt.h index 425c7dd..962720c 100644 --- a/Include/pygetopt.h +++ b/Include/pygetopt.h @@ -11,9 +11,9 @@ PyAPI_DATA(int) _PyOS_optind; PyAPI_DATA(wchar_t *) _PyOS_optarg; PyAPI_FUNC(void) _PyOS_ResetGetOpt(void); -#endif PyAPI_FUNC(int) _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/pyhash.h b/Include/pyhash.h index a7ca937..a814af6 100644 --- a/Include/pyhash.h +++ b/Include/pyhash.h @@ -36,14 +36,14 @@ PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t); * memory layout on 64 bit systems * cccccccc cccccccc cccccccc uc -- unsigned char[24] * pppppppp ssssssss ........ fnv -- two Py_hash_t - * k0k0k0k0 k1k1k1k1 ........ siphash -- two PY_UINT64_T + * k0k0k0k0 k1k1k1k1 ........ siphash -- two uint64_t * ........ ........ ssssssss djbx33a -- 16 bytes padding + one Py_hash_t * ........ ........ eeeeeeee pyexpat XML hash salt * * memory layout on 32 bit systems * cccccccc cccccccc cccccccc uc * ppppssss ........ ........ fnv -- two Py_hash_t - * k0k0k0k0 k1k1k1k1 ........ siphash -- two PY_UINT64_T (*) + * k0k0k0k0 k1k1k1k1 ........ siphash -- two uint64_t (*) * ........ ........ ssss.... djbx33a -- 16 bytes padding + one Py_hash_t * ........ ........ eeee.... pyexpat XML hash salt * @@ -59,13 +59,11 @@ typedef union { Py_hash_t prefix; Py_hash_t suffix; } fnv; -#ifdef PY_UINT64_T /* two uint64 for SipHash24 */ struct { - PY_UINT64_T k0; - PY_UINT64_T k1; + uint64_t k0; + uint64_t k1; } siphash; -#endif /* a different (!) Py_hash_t for small string optimization */ struct { unsigned char padding[16]; @@ -121,8 +119,7 @@ PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void); * configure script. * * - FNV is available on all platforms and architectures. - * - SIPHASH24 only works on plaforms that provide PY_UINT64_T and doesn't - * require aligned memory for integers. + * - SIPHASH24 only works on plaforms that don't require aligned memory for integers. * - With EXTERNAL embedders can provide an alternative implementation with:: * * PyHash_FuncDef PyHash_Func = {...}; @@ -134,8 +131,7 @@ PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void); #define Py_HASH_FNV 2 #ifndef Py_HASH_ALGORITHM -# if (defined(PY_UINT64_T) && defined(PY_UINT32_T) \ - && !defined(HAVE_ALIGNED_REQUIRED)) +# ifndef HAVE_ALIGNED_REQUIRED # define Py_HASH_ALGORITHM Py_HASH_SIPHASH24 # else # define Py_HASH_ALGORITHM Py_HASH_FNV diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 1c5f7a6..5a67666 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -27,6 +27,7 @@ PyAPI_FUNC(void) Py_InitializeEx(int); PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int); #endif PyAPI_FUNC(void) Py_Finalize(void); +PyAPI_FUNC(int) Py_FinalizeEx(void); PyAPI_FUNC(int) Py_IsInitialized(void); PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); @@ -69,8 +70,8 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); #ifndef Py_LIMITED_API -PyAPI_FUNC(const char *) _Py_gitidentifier(void); -PyAPI_FUNC(const char *) _Py_gitversion(void); +PyAPI_FUNC(const char *) _Py_hgidentifier(void); +PyAPI_FUNC(const char *) _Py_hgversion(void); #endif /* Internal -- various one-time initializations */ @@ -106,6 +107,7 @@ PyAPI_FUNC(void) _PyGC_Fini(void); PyAPI_FUNC(void) PySlice_Fini(void); PyAPI_FUNC(void) _PyType_Fini(void); PyAPI_FUNC(void) _PyRandom_Fini(void); +PyAPI_FUNC(void) PyAsyncGen_Fini(void); PyAPI_DATA(PyThreadState *) _Py_Finalizing; #endif @@ -115,8 +117,11 @@ typedef void (*PyOS_sighandler_t)(int); PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int); PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t); +#ifndef Py_LIMITED_API /* Random */ -PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size); +PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size); +PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/pymacro.h b/Include/pymacro.h index 3f6f5dc..2a839ab 100644 --- a/Include/pymacro.h +++ b/Include/pymacro.h @@ -18,6 +18,9 @@ by "__LINE__". */ #define Py_STRINGIFY(x) _Py_XSTRINGIFY(x) +/* Get the size of a structure member in bytes */ +#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) + /* Argument must be a char or an int in [-128, 127] or [0, 255]. */ #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) @@ -36,6 +39,10 @@ #define Py_BUILD_ASSERT_EXPR(cond) \ (sizeof(char [1 - 2*!(cond)]) - 1) +#define Py_BUILD_ASSERT(cond) do { \ + (void)Py_BUILD_ASSERT_EXPR(cond); \ + } while(0) + /* Get the number of elements in a visible array This does not work on pointers, or arrays declared as [], or function @@ -75,12 +82,12 @@ #define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \ (size_t)((a) - 1)) & ~(size_t)((a) - 1)) /* Round pointer "p" down to the closest "a"-aligned address <= "p". */ -#define _Py_ALIGN_DOWN(p, a) ((void *)((Py_uintptr_t)(p) & ~(Py_uintptr_t)((a) - 1))) +#define _Py_ALIGN_DOWN(p, a) ((void *)((uintptr_t)(p) & ~(uintptr_t)((a) - 1))) /* Round pointer "p" up to the closest "a"-aligned address >= "p". */ -#define _Py_ALIGN_UP(p, a) ((void *)(((Py_uintptr_t)(p) + \ - (Py_uintptr_t)((a) - 1)) & ~(Py_uintptr_t)((a) - 1))) +#define _Py_ALIGN_UP(p, a) ((void *)(((uintptr_t)(p) + \ + (uintptr_t)((a) - 1)) & ~(uintptr_t)((a) - 1))) /* Check if pointer "p" is aligned to "a"-bytes boundary. */ -#define _Py_IS_ALIGNED(p, a) (!((Py_uintptr_t)(p) & (Py_uintptr_t)((a) - 1))) +#define _Py_IS_ALIGNED(p, a) (!((uintptr_t)(p) & (uintptr_t)((a) - 1))) #ifdef __GNUC__ #define Py_UNUSED(name) _unused_ ## name __attribute__((unused)) diff --git a/Include/pymath.h b/Include/pymath.h index 1c8d718..7216a09 100644 --- a/Include/pymath.h +++ b/Include/pymath.h @@ -55,6 +55,12 @@ extern double pow(double, double); #define Py_MATH_E 2.7182818284590452354 #endif +/* Tau (2pi) to 40 digits, taken from tauday.com/tau-digits. */ +#ifndef Py_MATH_TAU +#define Py_MATH_TAU 6.2831853071795864769252867665590057683943L +#endif + + /* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU register and into a 64-bit memory location, rounding from extended precision to double precision in the process. On other platforms it does @@ -169,7 +175,7 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short); #pragma float_control (pop) #define Py_NAN __icc_nan() #else /* ICC_NAN_RELAXED as default for Intel Compiler */ - static union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f}; + static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f}; #define Py_NAN (__nan_store.__icc_nan) #endif /* ICC_NAN_STRICT */ #endif /* __INTEL_COMPILER */ diff --git a/Include/pymem.h b/Include/pymem.h index 043db64..ce63bf8 100644 --- a/Include/pymem.h +++ b/Include/pymem.h @@ -16,8 +16,51 @@ PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size); PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize); PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size); PyAPI_FUNC(void) PyMem_RawFree(void *ptr); + +/* Configure the Python memory allocators. Pass NULL to use default + allocators. */ +PyAPI_FUNC(int) _PyMem_SetupAllocators(const char *opt); + +#ifdef WITH_PYMALLOC +PyAPI_FUNC(int) _PyMem_PymallocEnabled(void); #endif +/* Identifier of an address space (domain) in tracemalloc */ +typedef unsigned int _PyTraceMalloc_domain_t; + +/* Track an allocated memory block in the tracemalloc module. + Return 0 on success, return -1 on error (failed to allocate memory to store + the trace). + + Return -2 if tracemalloc is disabled. + + If memory block is already tracked, update the existing trace. */ +PyAPI_FUNC(int) _PyTraceMalloc_Track( + _PyTraceMalloc_domain_t domain, + uintptr_t ptr, + size_t size); + +/* Untrack an allocated memory block in the tracemalloc module. + Do nothing if the block was not tracked. + + Return -2 if tracemalloc is disabled, otherwise return 0. */ +PyAPI_FUNC(int) _PyTraceMalloc_Untrack( + _PyTraceMalloc_domain_t domain, + uintptr_t ptr); + +/* Get the traceback where a memory block was allocated. + + Return a tuple of (filename: str, lineno: int) tuples. + + Return None if the tracemalloc module is disabled or if the memory block + is not tracked by tracemalloc. + + Raise an exception and return NULL on error. */ +PyAPI_FUNC(PyObject*) _PyTraceMalloc_GetTraceback( + _PyTraceMalloc_domain_t domain, + uintptr_t ptr); +#endif /* !Py_LIMITED_API */ + /* BEWARE: diff --git a/Include/pyport.h b/Include/pyport.h index e7e5178..28bf4b2 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -3,15 +3,7 @@ #include "pyconfig.h" /* include for defines */ -/* Some versions of HP-UX & Solaris need inttypes.h for int32_t, - INT32_MAX, etc. */ -#ifdef HAVE_INTTYPES_H #include -#endif - -#ifdef HAVE_STDINT_H -#include -#endif /************************************************************************** Symbols and macros to supply platform-independent interfaces to basic @@ -31,14 +23,6 @@ Py_DEBUG Meaning: Extra checks compiled in for debug mode. Used in: Py_SAFE_DOWNCAST -HAVE_UINTPTR_T -Meaning: The C9X type uintptr_t is supported by the compiler -Used in: Py_uintptr_t - -HAVE_LONG_LONG -Meaning: The compiler supports the C type "long long" -Used in: PY_LONG_LONG - **************************************************************************/ /* typedefs for some C9X-defined synonyms for integral types. @@ -53,91 +37,31 @@ Used in: PY_LONG_LONG * integral synonyms. Only define the ones we actually need. */ -#ifdef HAVE_LONG_LONG +// long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. +#ifndef HAVE_LONG_LONG +#define HAVE_LONG_LONG +#endif #ifndef PY_LONG_LONG #define PY_LONG_LONG long long -#if defined(LLONG_MAX) /* If LLONG_MAX is defined in limits.h, use that. */ #define PY_LLONG_MIN LLONG_MIN #define PY_LLONG_MAX LLONG_MAX #define PY_ULLONG_MAX ULLONG_MAX -#elif defined(__LONG_LONG_MAX__) -/* Otherwise, if GCC has a builtin define, use that. (Definition of - * PY_LLONG_MIN assumes two's complement with no trap representation.) */ -#define PY_LLONG_MAX __LONG_LONG_MAX__ -#define PY_LLONG_MIN (-PY_LLONG_MAX - 1) -#define PY_ULLONG_MAX (PY_LLONG_MAX * Py_ULL(2) + 1) -#elif defined(SIZEOF_LONG_LONG) -/* Otherwise compute from SIZEOF_LONG_LONG, assuming two's complement, no - padding bits, and no trap representation. Note: PY_ULLONG_MAX was - previously #defined as (~0ULL) here; but that'll give the wrong value in a - preprocessor expression on systems where long long != intmax_t. */ -#define PY_LLONG_MAX \ - (1 + 2 * ((Py_LL(1) << (CHAR_BIT * SIZEOF_LONG_LONG - 2)) - 1)) -#define PY_LLONG_MIN (-PY_LLONG_MAX - 1) -#define PY_ULLONG_MAX (PY_LLONG_MAX * Py_ULL(2) + 1) -#endif /* LLONG_MAX */ -#endif -#endif /* HAVE_LONG_LONG */ - -/* a build with 30-bit digits for Python integers needs an exact-width - * 32-bit unsigned integer type to store those digits. (We could just use - * type 'unsigned long', but that would be wasteful on a system where longs - * are 64-bits.) On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines - * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t. - * However, it doesn't set HAVE_UINT32_T, so we do that here. - */ -#ifdef uint32_t -#define HAVE_UINT32_T 1 #endif -#ifdef HAVE_UINT32_T -#ifndef PY_UINT32_T #define PY_UINT32_T uint32_t -#endif -#endif - -/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the - * integer implementation, when 30-bit digits are enabled. - */ -#ifdef uint64_t -#define HAVE_UINT64_T 1 -#endif - -#ifdef HAVE_UINT64_T -#ifndef PY_UINT64_T #define PY_UINT64_T uint64_t -#endif -#endif /* Signed variants of the above */ -#ifdef int32_t -#define HAVE_INT32_T 1 -#endif - -#ifdef HAVE_INT32_T -#ifndef PY_INT32_T #define PY_INT32_T int32_t -#endif -#endif - -#ifdef int64_t -#define HAVE_INT64_T 1 -#endif - -#ifdef HAVE_INT64_T -#ifndef PY_INT64_T #define PY_INT64_T int64_t -#endif -#endif /* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all the necessary integer types are available, and we're on a 64-bit platform (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */ #ifndef PYLONG_BITS_IN_DIGIT -#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \ - defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8) +#if SIZEOF_VOID_P >= 8 #define PYLONG_BITS_IN_DIGIT 30 #else #define PYLONG_BITS_IN_DIGIT 15 @@ -149,26 +73,9 @@ Used in: PY_LONG_LONG * without loss of information. Similarly for intptr_t, wrt a signed * integral type. */ -#ifdef HAVE_UINTPTR_T typedef uintptr_t Py_uintptr_t; typedef intptr_t Py_intptr_t; -#elif SIZEOF_VOID_P <= SIZEOF_INT -typedef unsigned int Py_uintptr_t; -typedef int Py_intptr_t; - -#elif SIZEOF_VOID_P <= SIZEOF_LONG -typedef unsigned long Py_uintptr_t; -typedef long Py_intptr_t; - -#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG) -typedef unsigned PY_LONG_LONG Py_uintptr_t; -typedef PY_LONG_LONG Py_intptr_t; - -#else -# error "Python needs a typedef for Py_uintptr_t in pyport.h." -#endif /* HAVE_UINTPTR_T */ - /* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) == * sizeof(size_t). C99 doesn't define such a thing directly (size_t is an * unsigned integral type). See PEP 353 for details. @@ -195,16 +102,8 @@ typedef Py_ssize_t Py_ssize_clean_t; typedef int Py_ssize_clean_t; #endif -/* Largest possible value of size_t. - SIZE_MAX is part of C99, so it might be defined on some - platforms. If it is not defined, (size_t)-1 is a portable - definition for C89, due to the way signed->unsigned - conversion is defined. */ -#ifdef SIZE_MAX +/* Largest possible value of size_t. */ #define PY_SIZE_MAX SIZE_MAX -#else -#define PY_SIZE_MAX ((size_t)-1) -#endif /* Largest positive value of type Py_ssize_t. */ #define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1)) @@ -247,22 +146,6 @@ typedef int Py_ssize_clean_t; # endif #endif -/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for - * the long long type instead of the size_t type. It's only available - * when HAVE_LONG_LONG is defined. The "high level" Python format - * functions listed above will interpret "lld" or "llu" correctly on - * all platforms. - */ -#ifdef HAVE_LONG_LONG -# ifndef PY_FORMAT_LONG_LONG -# ifdef MS_WINDOWS -# define PY_FORMAT_LONG_LONG "I64" -# else -# error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" -# endif -# endif -#endif - /* Py_LOCAL can be used instead of static to get the fastest possible calling * convention for functions that are local to a given module. * @@ -298,26 +181,9 @@ typedef int Py_ssize_clean_t; #define Py_LOCAL_INLINE(type) static type #endif -/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks - * are often very short. While most platforms have highly optimized code for - * large transfers, the setup costs for memcpy are often quite high. MEMCPY - * solves this by doing short copies "in line". - */ - -#if defined(_MSC_VER) -#define Py_MEMCPY(target, source, length) do { \ - size_t i_, n_ = (length); \ - char *t_ = (void*) (target); \ - const char *s_ = (void*) (source); \ - if (n_ >= 16) \ - memcpy(t_, s_, n_); \ - else \ - for (i_ = 0; i_ < n_; i_++) \ - t_[i_] = s_[i_]; \ - } while (0) -#else +/* Py_MEMCPY is kept for backwards compatibility, + * see https://bugs.python.org/issue28126 */ #define Py_MEMCPY memcpy -#endif #include @@ -570,18 +436,18 @@ extern "C" { #define HAVE_PY_SET_53BIT_PRECISION 1 #define _Py_SET_53BIT_PRECISION_HEADER \ unsigned int old_fpcr, new_fpcr -#define _Py_SET_53BIT_PRECISION_START \ - do { \ - __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr)); \ - /* Set double precision / round to nearest. */ \ - new_fpcr = (old_fpcr & ~0xf0) | 0x80; \ - if (new_fpcr != old_fpcr) \ - __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr)); \ +#define _Py_SET_53BIT_PRECISION_START \ + do { \ + __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr)); \ + /* Set double precision / round to nearest. */ \ + new_fpcr = (old_fpcr & ~0xf0) | 0x80; \ + if (new_fpcr != old_fpcr) \ + __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr)); \ } while (0) -#define _Py_SET_53BIT_PRECISION_END \ - do { \ - if (new_fpcr != old_fpcr) \ - __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr)); \ +#define _Py_SET_53BIT_PRECISION_END \ + do { \ + if (new_fpcr != old_fpcr) \ + __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr)); \ } while (0) #endif @@ -850,10 +716,6 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); #pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) #endif -/* - * Older Microsoft compilers don't support the C99 long long literal suffixes, - * so these will be defined in PC/pyconfig.h for those compilers. - */ #ifndef Py_LL #define Py_LL(x) x##LL #endif @@ -862,15 +724,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); #define Py_ULL(x) Py_LL(x##U) #endif -#ifdef VA_LIST_IS_ARRAY -#define Py_VA_COPY(x, y) Py_MEMCPY((x), (y), sizeof(va_list)) -#else -#ifdef __va_copy -#define Py_VA_COPY __va_copy -#else -#define Py_VA_COPY(x, y) (x) = (y) -#endif -#endif +#define Py_VA_COPY va_copy /* * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is @@ -906,4 +760,8 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler; #endif /* _MSC_VER >= 1900 */ #endif /* Py_BUILD_CORE */ +#ifdef __ANDROID__ +#include +#endif + #endif /* Py_PYPORT_H */ diff --git a/Include/pystate.h b/Include/pystate.h index 0499a74..afc3c0c 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -8,14 +8,21 @@ extern "C" { #endif +/* This limitation is for performance and simplicity. If needed it can be +removed (with effort). */ +#define MAX_CO_EXTRA_USERS 255 + /* State shared between threads */ struct _ts; /* Forward */ struct _is; /* Forward */ +struct _frame; /* Forward declaration for PyFrameObject. */ #ifdef Py_LIMITED_API typedef struct _is PyInterpreterState; #else +typedef PyObject* (*_PyFrameEvalFunction)(struct _frame *, int); + typedef struct _is { struct _is *next; @@ -36,19 +43,17 @@ typedef struct _is { #ifdef HAVE_DLOPEN int dlopenflags; #endif -#ifdef WITH_TSC - int tscdump; -#endif PyObject *builtins_copy; + PyObject *import_func; + /* Initialized to PyEval_EvalFrameDefault(). */ + _PyFrameEvalFunction eval_frame; } PyInterpreterState; #endif /* State unique per thread */ -struct _frame; /* Avoid including frameobject.h */ - #ifndef Py_LIMITED_API /* Py_tracefunc return -1 when raising an exception, or 0 for success. */ typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *); @@ -137,6 +142,12 @@ typedef struct _ts { PyObject *coroutine_wrapper; int in_coroutine_wrapper; + Py_ssize_t co_extra_user_count; + freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS]; + + PyObject *async_gen_firstiter; + PyObject *async_gen_finalizer; + /* XXX signal handlers should also be here */ } PyThreadState; @@ -146,7 +157,9 @@ typedef struct _ts { PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void); PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *); PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *); +#ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*); +#endif /* !Py_LIMITED_API */ #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 /* New in 3.3 */ PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*); @@ -158,14 +171,20 @@ PyAPI_FUNC(void) _PyState_ClearModules(void); #endif PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); +#ifndef Py_LIMITED_API PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); +#ifndef Py_LIMITED_API PyAPI_FUNC(void) _PyThreadState_DeleteExcept(PyThreadState *tstate); +#endif /* !Py_LIMITED_API */ #ifdef WITH_THREAD PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); +#ifndef Py_LIMITED_API PyAPI_FUNC(void) _PyGILState_Reinit(void); +#endif /* !Py_LIMITED_API */ #endif /* Return the current thread state. The global interpreter lock must be held. @@ -173,9 +192,11 @@ PyAPI_FUNC(void) _PyGILState_Reinit(void); * the caller needn't check for NULL). */ PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); +#ifndef Py_LIMITED_API /* Similar to PyThreadState_Get(), but don't issue a fatal error * if it is NULL. */ PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void); +#endif /* !Py_LIMITED_API */ PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *); PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void); @@ -241,11 +262,23 @@ PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE); */ PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void); -/* Helper/diagnostic function - return 1 if the current thread - * currently holds the GIL, 0 otherwise - */ #ifndef Py_LIMITED_API +/* Issue #26558: Flag to disable PyGILState_Check(). + If set to non-zero, PyGILState_Check() always return 1. */ +PyAPI_DATA(int) _PyGILState_check_enabled; + +/* Helper/diagnostic function - return 1 if the current thread + currently holds the GIL, 0 otherwise. + + The function returns 1 if _PyGILState_check_enabled is non-zero. */ PyAPI_FUNC(int) PyGILState_Check(void); + +/* Unsafe function to get the single PyInterpreterState used by this process' + GILState implementation. + + Return NULL before _PyGILState_Init() is called and after _PyGILState_Fini() + is called. */ +PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void); #endif #endif /* #ifdef WITH_THREAD */ diff --git a/Include/pystrhex.h b/Include/pystrhex.h index 1dc1255..66a30e2 100644 --- a/Include/pystrhex.h +++ b/Include/pystrhex.h @@ -5,10 +5,12 @@ extern "C" { #endif +#ifndef Py_LIMITED_API /* Returns a str() containing the hex representation of argbuf. */ PyAPI_FUNC(PyObject*) _Py_strhex(const char* argbuf, const Py_ssize_t arglen); /* Returns a bytes() containing the ASCII hex representation of argbuf. */ PyAPI_FUNC(PyObject*) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/pystrtod.h b/Include/pystrtod.h index 23fd1c6..c1e84de 100644 --- a/Include/pystrtod.h +++ b/Include/pystrtod.h @@ -19,6 +19,10 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val, int *type); #ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _Py_string_to_number_with_underscores( + const char *str, Py_ssize_t len, const char *what, PyObject *obj, void *arg, + PyObject *(*innerfunc)(const char *, Py_ssize_t, void *)); + PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr); #endif diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 9c2e813..cfa0a9f 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -66,8 +66,8 @@ PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile( const char *filename, /* decoded from the filesystem encoding */ const char* enc, int start, - char *ps1, - char *ps2, + const char *ps1, + const char *ps2, PyCompilerFlags *flags, int *errcode, PyArena *arena); @@ -76,8 +76,8 @@ PyAPI_FUNC(struct _mod *) PyParser_ASTFromFileObject( PyObject *filename, const char* enc, int start, - char *ps1, - char *ps2, + const char *ps1, + const char *ps2, PyCompilerFlags *flags, int *errcode, PyArena *arena); diff --git a/Include/pythread.h b/Include/pythread.h index 6e9f303..dd681be 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -37,19 +37,14 @@ PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); module exposes a higher-level API, with timeouts expressed in seconds and floating-point numbers allowed. */ -#if defined(HAVE_LONG_LONG) -#define PY_TIMEOUT_T PY_LONG_LONG +#define PY_TIMEOUT_T long long #define PY_TIMEOUT_MAX PY_LLONG_MAX -#else -#define PY_TIMEOUT_T long -#define PY_TIMEOUT_MAX LONG_MAX -#endif /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */ #if defined (NT_THREADS) -#if (Py_LL(0xFFFFFFFF) * 1000 < PY_TIMEOUT_MAX) +#if 0xFFFFFFFFLL * 1000 < PY_TIMEOUT_MAX #undef PY_TIMEOUT_MAX -#define PY_TIMEOUT_MAX (Py_LL(0xFFFFFFFF) * 1000) +#define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000) #endif #endif diff --git a/Include/pytime.h b/Include/pytime.h index 494322c..87ac7fc 100644 --- a/Include/pytime.h +++ b/Include/pytime.h @@ -13,16 +13,12 @@ functions and constants extern "C" { #endif -#ifdef PY_INT64_T /* _PyTime_t: Python timestamp with subsecond precision. It can be used to store a duration, and so indirectly a date (related to another date, like UNIX epoch). */ -typedef PY_INT64_T _PyTime_t; +typedef int64_t _PyTime_t; #define _PyTime_MIN PY_LLONG_MIN #define _PyTime_MAX PY_LLONG_MAX -#else -# error "_PyTime_t need signed 64-bit integer type" -#endif typedef enum { /* Round towards minus infinity (-inf). @@ -30,7 +26,10 @@ typedef enum { _PyTime_ROUND_FLOOR=0, /* Round towards infinity (+inf). For example, used for timeout to wait "at least" N seconds. */ - _PyTime_ROUND_CEILING + _PyTime_ROUND_CEILING=1, + /* Round to nearest with ties going to nearest even integer. + For example, used to round from a Python float. */ + _PyTime_ROUND_HALF_EVEN } _PyTime_round_t; /* Convert a time_t to a PyLong. */ @@ -75,7 +74,7 @@ PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds); ((_PyTime_t)(seconds) * (1000 * 1000 * 1000)) /* Create a timestamp from a number of nanoseconds. */ -PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(PY_LONG_LONG ns); +PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(long long ns); /* Convert a number of seconds (Python float or int) to a timetamp. Raise an exception and return -1 on error, return 0 on success. */ @@ -185,6 +184,14 @@ PyAPI_FUNC(int) _PyTime_GetMonotonicClockWithInfo( Return 0 on success, raise an exception and return -1 on error. */ PyAPI_FUNC(int) _PyTime_Init(void); +/* Converts a timestamp to the Gregorian time, using the local time zone. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm); + +/* Converts a timestamp to the Gregorian time, assuming UTC. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm); + #ifdef __cplusplus } #endif diff --git a/Include/setobject.h b/Include/setobject.h index f17bc1b..87ec1c8 100644 --- a/Include/setobject.h +++ b/Include/setobject.h @@ -10,12 +10,13 @@ extern "C" { /* There are three kinds of entries in the table: -1. Unused: key == NULL -2. Active: key != NULL and key != dummy -3. Dummy: key == dummy +1. Unused: key == NULL and hash == 0 +2. Dummy: key == dummy and hash == -1 +3. Active: key != NULL and key != dummy and hash != -1 -The hash field of Unused slots have no meaning. -The hash field of Dummny slots are set to -1 +The hash field of Unused slots is always zero. + +The hash field of Dummy slots are set to -1 meaning that dummy entries can be detected by either entry->key==dummy or by entry->hash==-1. */ diff --git a/Include/sliceobject.h b/Include/sliceobject.h index 579ac07..26370e0 100644 --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,23 +41,8 @@ PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length, PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); - -#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 -#ifdef Py_LIMITED_API -#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ - PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? \ - ((*(slicelen) = 0), -1) : \ - ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ - 0)) -#endif -PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); -PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t step); -#endif + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t *step, Py_ssize_t *slicelength); #ifdef __cplusplus } diff --git a/Include/structmember.h b/Include/structmember.h index 948f690..5da8a46 100644 --- a/Include/structmember.h +++ b/Include/structmember.h @@ -49,10 +49,8 @@ typedef struct PyMemberDef { #define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError when the value is NULL, instead of converting to None. */ -#ifdef HAVE_LONG_LONG #define T_LONGLONG 17 #define T_ULONGLONG 18 -#endif /* HAVE_LONG_LONG */ #define T_PYSSIZET 19 /* Py_ssize_t */ #define T_NONE 20 /* Value is always None */ diff --git a/Include/symtable.h b/Include/symtable.h index 1409cd9..86ae3c2 100644 --- a/Include/symtable.h +++ b/Include/symtable.h @@ -48,6 +48,7 @@ typedef struct _symtable_entry { unsigned ste_child_free : 1; /* true if a child block has free vars, including free refs to globals */ unsigned ste_generator : 1; /* true if namespace is a generator */ + unsigned ste_coroutine : 1; /* true if namespace is a coroutine */ unsigned ste_varargs : 1; /* true if block has varargs */ unsigned ste_varkeywords : 1; /* true if block has varkeywords */ unsigned ste_returns_value : 1; /* true if namespace uses return with @@ -91,6 +92,7 @@ PyAPI_FUNC(void) PySymtable_Free(struct symtable *); #define DEF_FREE 2<<4 /* name used but not defined in nested block */ #define DEF_FREE_CLASS 2<<5 /* free variable from class's method */ #define DEF_IMPORT 2<<6 /* assignment occurred via import */ +#define DEF_ANNOT 2<<7 /* this name is annotated */ #define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) diff --git a/Include/sysmodule.h b/Include/sysmodule.h index cde10ac..c5547ff 100644 --- a/Include/sysmodule.h +++ b/Include/sysmodule.h @@ -8,11 +8,11 @@ extern "C" { #endif PyAPI_FUNC(PyObject *) PySys_GetObject(const char *); +PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *); #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key); -#endif -PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *); PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *); +#endif PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **); PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int); diff --git a/Include/traceback.h b/Include/traceback.h index c3ecbe2..b587410 100644 --- a/Include/traceback.h +++ b/Include/traceback.h @@ -31,6 +31,7 @@ PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int); PyAPI_DATA(PyTypeObject) PyTraceBack_Type; #define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type) +#ifndef Py_LIMITED_API /* Write the Python traceback into the file 'fd'. For example: Traceback (most recent call first): @@ -53,19 +54,64 @@ PyAPI_FUNC(void) _Py_DumpTraceback( PyThreadState *tstate); /* Write the traceback of all threads into the file 'fd'. current_thread can be - NULL. Return NULL on success, or an error message on error. + NULL. + + Return NULL on success, or an error message on error. This function is written for debug purpose only. It calls _Py_DumpTraceback() for each thread, and so has the same limitations. It only write the traceback of the first 100 threads: write "..." if there are more threads. + If current_tstate is NULL, the function tries to get the Python thread state + of the current thread. It is not an error if the function is unable to get + the current Python thread state. + + If interp is NULL, the function tries to get the interpreter state from + the current Python thread state, or from + _PyGILState_GetInterpreterStateUnsafe() in last resort. + + It is better to pass NULL to interp and current_tstate, the function tries + different options to retrieve these informations. + This function is signal safe. */ PyAPI_FUNC(const char*) _Py_DumpTracebackThreads( - int fd, PyInterpreterState *interp, - PyThreadState *current_thread); + int fd, + PyInterpreterState *interp, + PyThreadState *current_tstate); +#endif /* !Py_LIMITED_API */ + +#ifndef Py_LIMITED_API + +/* Write a Unicode object into the file descriptor fd. Encode the string to + ASCII using the backslashreplace error handler. + + Do nothing if text is not a Unicode object. The function accepts Unicode + string which is not ready (PyUnicode_WCHAR_KIND). + + This function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpASCII(int fd, PyObject *text); + +/* Format an integer as decimal into the file descriptor fd. + + This function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpDecimal( + int fd, + unsigned long value); + +/* Format an integer as hexadecimal into the file descriptor fd with at least + width digits. + + The maximum width is sizeof(unsigned long)*2 digits. + + This function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpHexadecimal( + int fd, + unsigned long value, + Py_ssize_t width); +#endif /* !Py_LIMITED_API */ #ifdef __cplusplus } diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index f0ececc..8103a63 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -103,10 +103,6 @@ typedef wchar_t Py_UNICODE; # endif #endif -#if defined(MS_WINDOWS) -# define HAVE_MBCS -#endif - #ifdef HAVE_WCHAR_H /* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */ # ifdef _HAVE_BSDI @@ -117,21 +113,9 @@ typedef wchar_t Py_UNICODE; /* Py_UCS4 and Py_UCS2 are typedefs for the respective unicode representations. */ -#if SIZEOF_INT == 4 -typedef unsigned int Py_UCS4; -#elif SIZEOF_LONG == 4 -typedef unsigned long Py_UCS4; -#else -#error "Could not find a proper typedef for Py_UCS4" -#endif - -#if SIZEOF_SHORT == 2 -typedef unsigned short Py_UCS2; -#else -#error "Could not find a proper typedef for Py_UCS2" -#endif - -typedef unsigned char Py_UCS1; +typedef uint32_t Py_UCS4; +typedef uint16_t Py_UCS2; +typedef uint8_t Py_UCS1; /* --- Internal Unicode Operations ---------------------------------------- */ @@ -172,7 +156,7 @@ typedef unsigned char Py_UCS1; Py_UNICODE_ISNUMERIC(ch)) #define Py_UNICODE_COPY(target, source, length) \ - Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE)) + memcpy((target), (source), (length)*sizeof(Py_UNICODE)) #define Py_UNICODE_FILL(target, value, length) \ do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\ @@ -764,27 +748,23 @@ PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4( exception set. */ PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode); -#ifndef Py_LIMITED_API /* Return a read-only pointer to the Unicode object's internal Py_UNICODE buffer. If the wchar_t/Py_UNICODE representation is not yet available, this function will calculate it. */ +#ifndef Py_LIMITED_API PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( PyObject *unicode /* Unicode object */ ); - -/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string - contains null characters. */ -PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode( - PyObject *unicode /* Unicode object */ - ); +#endif /* Return a read-only pointer to the Unicode object's internal Py_UNICODE buffer and save the length at size. If the wchar_t/Py_UNICODE representation is not yet available, this function will calculate it. */ +#ifndef Py_LIMITED_API PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize( PyObject *unicode, /* Unicode object */ Py_ssize_t *size /* location where to save the length */ @@ -904,7 +884,7 @@ typedef struct { /* minimum character (default: 127, ASCII) */ Py_UCS4 min_char; - /* If non-zero, overallocate the buffer by 25% (default: 0). */ + /* If non-zero, overallocate the buffer (default: 0). */ unsigned char overallocate; /* If readonly is 1, buffer is a shared string (cannot be modified) @@ -938,6 +918,23 @@ PyAPI_FUNC(int) _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer, Py_ssize_t length, Py_UCS4 maxchar); +/* Prepare the buffer to have at least the kind KIND. + For example, kind=PyUnicode_2BYTE_KIND ensures that the writer will + support characters in range U+000-U+FFFF. + + Return 0 on success, raise an exception and return -1 on error. */ +#define _PyUnicodeWriter_PrepareKind(WRITER, KIND) \ + (assert((KIND) != PyUnicode_WCHAR_KIND), \ + (KIND) <= (WRITER)->kind \ + ? 0 \ + : _PyUnicodeWriter_PrepareKindInternal((WRITER), (KIND))) + +/* Don't call this function directly, use the _PyUnicodeWriter_PrepareKind() + macro instead. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer, + enum PyUnicode_Kind kind); + /* Append a Unicode character. Return 0 on success, raise an exception and return -1 on error. */ PyAPI_FUNC(int) @@ -1058,12 +1055,6 @@ PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString( ); #ifndef Py_LIMITED_API -/* Similar to PyUnicode_AsWideCharString(unicode, NULL), but check if - the string contains null characters. */ -PyAPI_FUNC(wchar_t*) _PyUnicode_AsWideCharString( - PyObject *unicode /* Unicode object */ - ); - PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind); #endif @@ -1180,22 +1171,30 @@ PyAPI_FUNC(PyObject*) PyUnicode_Decode( ); /* Decode a Unicode object unicode and return the result as Python - object. */ + object. + + This API is DEPRECATED. The only supported standard encoding is rot13. + Use PyCodec_Decode() to decode with rot13 and non-standard codecs + that decode from str. */ PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject( PyObject *unicode, /* Unicode object */ const char *encoding, /* encoding */ const char *errors /* error handling */ - ); + ) Py_DEPRECATED(3.6); /* Decode a Unicode object unicode and return the result as Unicode - object. */ + object. + + This API is DEPRECATED. The only supported standard encoding is rot13. + Use PyCodec_Decode() to decode with rot13 and non-standard codecs + that decode from str to str. */ PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode( PyObject *unicode, /* Unicode object */ const char *encoding, /* encoding */ const char *errors /* error handling */ - ); + ) Py_DEPRECATED(3.6); /* Encodes a Py_UNICODE buffer of the given size and returns a Python string object. */ @@ -1210,13 +1209,18 @@ PyAPI_FUNC(PyObject*) PyUnicode_Encode( #endif /* Encodes a Unicode object and returns the result as Python - object. */ + object. + + This API is DEPRECATED. It is superceeded by PyUnicode_AsEncodedString() + since all standard encodings (except rot13) encode str to bytes. + Use PyCodec_Encode() for encoding with rot13 and non-standard codecs + that encode form str to non-bytes. */ PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( PyObject *unicode, /* Unicode object */ const char *encoding, /* encoding */ const char *errors /* error handling */ - ); + ) Py_DEPRECATED(3.6); /* Encodes a Unicode object and returns the result as Python string object. */ @@ -1228,13 +1232,17 @@ PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString( ); /* Encodes a Unicode object and returns the result as Unicode - object. */ + object. + + This API is DEPRECATED. The only supported standard encodings is rot13. + Use PyCodec_Encode() to encode with rot13 and non-standard codecs + that encode from str to str. */ PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode( PyObject *unicode, /* Unicode object */ const char *encoding, /* encoding */ const char *errors /* error handling */ - ); + ) Py_DEPRECATED(3.6); /* Build an encoding map. */ @@ -1478,6 +1486,17 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape( const char *errors /* error handling */ ); +/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape + chars. */ +PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscape( + const char *string, /* Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + const char **first_invalid_escape /* on return, points to first + invalid escaped char in + string. */ +); + PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString( PyObject *unicode /* Unicode object */ ); @@ -1580,41 +1599,50 @@ PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII( This codec uses mappings to encode and decode characters. - Decoding mappings must map byte ordinals (integers in the range from 0 to - 255) to Unicode strings, integers (which are then interpreted as Unicode - ordinals) or None. Unmapped data bytes (ones which cause a LookupError) - as well as mapped to None, 0xFFFE or '\ufffe' are treated as "undefined - mapping" and cause an error. + Decoding mappings must map single string characters to single + Unicode characters, integers (which are then interpreted as Unicode + ordinals) or None (meaning "undefined mapping" and causing an + error). + + Encoding mappings must map single Unicode characters to single + string characters, integers (which are then interpreted as Latin-1 + ordinals) or None (meaning "undefined mapping" and causing an + error). - Encoding mappings must map Unicode ordinal integers to bytes objects, - integers in the range from 0 to 255 or None. Unmapped character - ordinals (ones which cause a LookupError) as well as mapped to - None are treated as "undefined mapping" and cause an error. + If a character lookup fails with a LookupError, the character is + copied as-is meaning that its ordinal value will be interpreted as + Unicode or Latin-1 ordinal resp. Because of this mappings only need + to contain those mappings which map characters to different code + points. */ PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap( const char *string, /* Encoded string */ Py_ssize_t length, /* size of string */ - PyObject *mapping, /* decoding mapping */ + PyObject *mapping, /* character mapping + (char ordinal -> unicode ordinal) */ const char *errors /* error handling */ ); PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString( PyObject *unicode, /* Unicode object */ - PyObject *mapping /* encoding mapping */ + PyObject *mapping /* character mapping + (unicode ordinal -> char ordinal) */ ); #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap( const Py_UNICODE *data, /* Unicode char buffer */ Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - PyObject *mapping, /* encoding mapping */ + PyObject *mapping, /* character mapping + (unicode ordinal -> char ordinal) */ const char *errors /* error handling */ ); PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap( PyObject *unicode, /* Unicode object */ - PyObject *mapping, /* encoding mapping */ + PyObject *mapping, /* character mapping + (unicode ordinal -> char ordinal) */ const char *errors /* error handling */ ); #endif @@ -1623,8 +1651,8 @@ PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap( character mapping table to it and return the resulting Unicode object. - The mapping table must map Unicode ordinal integers to Unicode strings, - Unicode ordinal integers or None (causing deletion of the character). + The mapping table must map Unicode ordinal integers to Unicode + ordinal integers or None (causing deletion of the character). Mapping tables may be dictionaries or sequences. Unmapped character ordinals (ones which cause a LookupError) are left untouched and @@ -1641,13 +1669,13 @@ PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap( ); #endif -#ifdef HAVE_MBCS +#ifdef MS_WINDOWS /* --- MBCS codecs for Windows -------------------------------------------- */ PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS( const char *string, /* MBCS encoded string */ - Py_ssize_t length, /* size of string */ + Py_ssize_t length, /* size of string */ const char *errors /* error handling */ ); @@ -1684,7 +1712,7 @@ PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage( const char *errors /* error handling */ ); -#endif /* HAVE_MBCS */ +#endif /* MS_WINDOWS */ /* --- Decimal Encoder ---------------------------------------------------- */ @@ -1916,8 +1944,8 @@ PyAPI_FUNC(PyObject*) PyUnicode_RSplit( /* Translate a string by applying a character mapping table to it and return the resulting Unicode object. - The mapping table must map Unicode ordinal integers to Unicode strings, - Unicode ordinal integers or None (causing deletion of the character). + The mapping table must map Unicode ordinal integers to Unicode + ordinal integers or None (causing deletion of the character). Mapping tables may be dictionaries or sequences. Unmapped character ordinals (ones which cause a LookupError) are left untouched and @@ -1939,6 +1967,14 @@ PyAPI_FUNC(PyObject*) PyUnicode_Join( PyObject *seq /* Sequence object */ ); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray( + PyObject *separator, + PyObject **items, + Py_ssize_t seqlen + ); +#endif /* Py_LIMITED_API */ + /* Return 1 if substr matches str[start:end] at the given tail end, 0 otherwise. */ @@ -2001,17 +2037,8 @@ PyAPI_FUNC(int) PyUnicode_Compare( ); #ifndef Py_LIMITED_API -/* Compare a string with an identifier and return -1, 0, 1 for less than, - equal, and greater than, respectively. - Raise an exception and return -1 on error. */ - -PyAPI_FUNC(int) _PyUnicode_CompareWithId( - PyObject *left, /* Left string */ - _Py_Identifier *right /* Right identifier */ - ); - /* Test whether a unicode is equal to ASCII identifier. Return 1 if true, - 0 otherwise. Return 0 if any argument contains non-ASCII characters. + 0 otherwise. The right argument must be ASCII identifier. Any error occurs inside will be cleared before return. */ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId( @@ -2033,7 +2060,7 @@ PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString( #ifndef Py_LIMITED_API /* Test whether a unicode is equal to ASCII string. Return 1 if true, - 0 otherwise. Return 0 if any argument contains non-ASCII characters. + 0 otherwise. The right argument must be ASCII-encoded string. Any error occurs inside will be cleared before return. */ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString( @@ -2048,6 +2075,10 @@ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString( - Py_True or Py_False for successful comparisons - Py_NotImplemented in case the type combination is unknown + Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in + case the conversion of the arguments to Unicode fails with a + UnicodeDecodeError. + Possible values for op: Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE @@ -2273,17 +2304,19 @@ PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy( PyAPI_FUNC(int) _PyUnicode_CheckConsistency( PyObject *op, int check_content); -#elif !defined(NDEBUG) -/* For asserts that call _PyUnicode_CheckConsistency(), which would - * otherwise be a problem when building with asserts but without Py_DEBUG. */ -#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op) #endif +#ifndef Py_LIMITED_API /* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/ PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*); /* Clear all static strings. */ PyAPI_FUNC(void) _PyUnicode_ClearStaticStrings(void); +/* Fast equality check when the inputs are known to be exact unicode types + and where the hash values are equal (i.e. a very probable match) */ +PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *); +#endif /* !Py_LIMITED_API */ + #ifdef __cplusplus } #endif diff --git a/Include/warnings.h b/Include/warnings.h index effb9fa..c1c6992 100644 --- a/Include/warnings.h +++ b/Include/warnings.h @@ -17,6 +17,13 @@ PyAPI_FUNC(int) PyErr_WarnFormat( Py_ssize_t stack_level, const char *format, /* ASCII-encoded string */ ...); + +/* Emit a ResourceWarning warning */ +PyAPI_FUNC(int) PyErr_ResourceWarning( + PyObject *source, + Py_ssize_t stack_level, + const char *format, /* ASCII-encoded string */ + ...); #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyErr_WarnExplicitObject( PyObject *category, diff --git a/LICENSE b/LICENSE index 529349e..84a3337 100644 --- a/LICENSE +++ b/LICENSE @@ -13,11 +13,12 @@ software. In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations, which became -Zope Corporation. In 2001, the Python Software Foundation (PSF, see -https://www.python.org/psf/) was formed, a non-profit organization -created specifically to own Python-related Intellectual Property. -Zope Corporation was a sponsoring member of the PSF. +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python @@ -73,7 +74,7 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation; All Rights +2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py index 8bebd69..b172f3f 100644 --- a/Lib/_collections_abc.py +++ b/Lib/_collections_abc.py @@ -9,9 +9,10 @@ Unit tests are in test_collections. from abc import ABCMeta, abstractmethod import sys -__all__ = ["Awaitable", "Coroutine", "AsyncIterable", "AsyncIterator", - "Hashable", "Iterable", "Iterator", "Generator", - "Sized", "Container", "Callable", +__all__ = ["Awaitable", "Coroutine", + "AsyncIterable", "AsyncIterator", "AsyncGenerator", + "Hashable", "Iterable", "Iterator", "Generator", "Reversible", + "Sized", "Container", "Callable", "Collection", "Set", "MutableSet", "Mapping", "MutableMapping", "MappingView", "KeysView", "ItemsView", "ValuesView", @@ -59,10 +60,27 @@ _coro = _coro() coroutine = type(_coro) _coro.close() # Prevent ResourceWarning del _coro +## asynchronous generator ## +async def _ag(): yield +_ag = _ag() +async_generator = type(_ag) +del _ag ### ONE-TRICK PONIES ### +def _check_methods(C, *methods): + mro = C.__mro__ + for method in methods: + for B in mro: + if method in B.__dict__: + if B.__dict__[method] is None: + return NotImplemented + break + else: + return NotImplemented + return True + class Hashable(metaclass=ABCMeta): __slots__ = () @@ -74,11 +92,7 @@ class Hashable(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Hashable: - for B in C.__mro__: - if "__hash__" in B.__dict__: - if B.__dict__["__hash__"]: - return True - break + return _check_methods(C, "__hash__") return NotImplemented @@ -93,11 +107,7 @@ class Awaitable(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Awaitable: - for B in C.__mro__: - if "__await__" in B.__dict__: - if B.__dict__["__await__"]: - return True - break + return _check_methods(C, "__await__") return NotImplemented @@ -138,14 +148,7 @@ class Coroutine(Awaitable): @classmethod def __subclasshook__(cls, C): if cls is Coroutine: - mro = C.__mro__ - for method in ('__await__', 'send', 'throw', 'close'): - for base in mro: - if method in base.__dict__: - break - else: - return NotImplemented - return True + return _check_methods(C, '__await__', 'send', 'throw', 'close') return NotImplemented @@ -163,8 +166,7 @@ class AsyncIterable(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is AsyncIterable: - if any("__aiter__" in B.__dict__ for B in C.__mro__): - return True + return _check_methods(C, "__aiter__") return NotImplemented @@ -183,12 +185,61 @@ class AsyncIterator(AsyncIterable): @classmethod def __subclasshook__(cls, C): if cls is AsyncIterator: - if (any("__anext__" in B.__dict__ for B in C.__mro__) and - any("__aiter__" in B.__dict__ for B in C.__mro__)): - return True + return _check_methods(C, "__anext__", "__aiter__") return NotImplemented +class AsyncGenerator(AsyncIterator): + + __slots__ = () + + async def __anext__(self): + """Return the next item from the asynchronous generator. + When exhausted, raise StopAsyncIteration. + """ + return await self.asend(None) + + @abstractmethod + async def asend(self, value): + """Send a value into the asynchronous generator. + Return next yielded value or raise StopAsyncIteration. + """ + raise StopAsyncIteration + + @abstractmethod + async def athrow(self, typ, val=None, tb=None): + """Raise an exception in the asynchronous generator. + Return next yielded value or raise StopAsyncIteration. + """ + if val is None: + if tb is None: + raise typ + val = typ() + if tb is not None: + val = val.with_traceback(tb) + raise val + + async def aclose(self): + """Raise GeneratorExit inside coroutine. + """ + try: + await self.athrow(GeneratorExit) + except (GeneratorExit, StopAsyncIteration): + pass + else: + raise RuntimeError("asynchronous generator ignored GeneratorExit") + + @classmethod + def __subclasshook__(cls, C): + if cls is AsyncGenerator: + return _check_methods(C, '__aiter__', '__anext__', + 'asend', 'athrow', 'aclose') + return NotImplemented + + +AsyncGenerator.register(async_generator) + + class Iterable(metaclass=ABCMeta): __slots__ = () @@ -201,8 +252,7 @@ class Iterable(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Iterable: - if any("__iter__" in B.__dict__ for B in C.__mro__): - return True + return _check_methods(C, "__iter__") return NotImplemented @@ -221,9 +271,7 @@ class Iterator(Iterable): @classmethod def __subclasshook__(cls, C): if cls is Iterator: - if (any("__next__" in B.__dict__ for B in C.__mro__) and - any("__iter__" in B.__dict__ for B in C.__mro__)): - return True + return _check_methods(C, '__iter__', '__next__') return NotImplemented Iterator.register(bytes_iterator) @@ -242,6 +290,22 @@ Iterator.register(tuple_iterator) Iterator.register(zip_iterator) +class Reversible(Iterable): + + __slots__ = () + + @abstractmethod + def __reversed__(self): + while False: + yield None + + @classmethod + def __subclasshook__(cls, C): + if cls is Reversible: + return _check_methods(C, "__reversed__", "__iter__") + return NotImplemented + + class Generator(Iterator): __slots__ = () @@ -285,17 +349,10 @@ class Generator(Iterator): @classmethod def __subclasshook__(cls, C): if cls is Generator: - mro = C.__mro__ - for method in ('__iter__', '__next__', 'send', 'throw', 'close'): - for base in mro: - if method in base.__dict__: - break - else: - return NotImplemented - return True + return _check_methods(C, '__iter__', '__next__', + 'send', 'throw', 'close') return NotImplemented - Generator.register(generator) @@ -310,8 +367,7 @@ class Sized(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Sized: - if any("__len__" in B.__dict__ for B in C.__mro__): - return True + return _check_methods(C, "__len__") return NotImplemented @@ -326,10 +382,18 @@ class Container(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Container: - if any("__contains__" in B.__dict__ for B in C.__mro__): - return True + return _check_methods(C, "__contains__") return NotImplemented +class Collection(Sized, Iterable, Container): + + __slots__ = () + + @classmethod + def __subclasshook__(cls, C): + if cls is Collection: + return _check_methods(C, "__len__", "__iter__", "__contains__") + return NotImplemented class Callable(metaclass=ABCMeta): @@ -342,15 +406,14 @@ class Callable(metaclass=ABCMeta): @classmethod def __subclasshook__(cls, C): if cls is Callable: - if any("__call__" in B.__dict__ for B in C.__mro__): - return True + return _check_methods(C, "__call__") return NotImplemented ### SETS ### -class Set(Sized, Iterable, Container): +class Set(Collection): """A set is a finite, iterable container. @@ -575,7 +638,7 @@ MutableSet.register(set) ### MAPPINGS ### -class Mapping(Sized, Iterable, Container): +class Mapping(Collection): __slots__ = () @@ -623,6 +686,8 @@ class Mapping(Sized, Iterable, Container): return NotImplemented return dict(self.items()) == dict(other.items()) + __reversed__ = None + Mapping.register(mappingproxy) @@ -672,7 +737,7 @@ class ItemsView(MappingView, Set): except KeyError: return False else: - return v == value + return v is value or v == value def __iter__(self): for key in self._mapping: @@ -687,7 +752,8 @@ class ValuesView(MappingView): def __contains__(self, value): for key in self._mapping: - if value == self._mapping[key]: + v = self._mapping[key] + if v is value or v == value: return True return False @@ -796,7 +862,7 @@ MutableMapping.register(dict) ### SEQUENCES ### -class Sequence(Sized, Iterable, Container): +class Sequence(Reversible, Collection): """All the operations on a read-only sequence. @@ -822,7 +888,7 @@ class Sequence(Sized, Iterable, Container): def __contains__(self, value): for v in self: - if v == value: + if v is value or v == value: return True return False diff --git a/Lib/_compat_pickle.py b/Lib/_compat_pickle.py index c0e0443..f68496a 100644 --- a/Lib/_compat_pickle.py +++ b/Lib/_compat_pickle.py @@ -242,3 +242,10 @@ PYTHON3_OSERROR_EXCEPTIONS = ( for excname in PYTHON3_OSERROR_EXCEPTIONS: REVERSE_NAME_MAPPING[('builtins', excname)] = ('exceptions', 'OSError') + +PYTHON3_IMPORTERROR_EXCEPTIONS = ( + 'ModuleNotFoundError', +) + +for excname in PYTHON3_IMPORTERROR_EXCEPTIONS: + REVERSE_NAME_MAPPING[('builtins', excname)] = ('exceptions', 'ImportError') diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py index 03d36c9..eadf06f 100644 --- a/Lib/_osx_support.py +++ b/Lib/_osx_support.py @@ -210,7 +210,7 @@ def _remove_universal_flags(_config_vars): # Do not alter a config var explicitly overridden by env var if cv in _config_vars and cv not in os.environ: flags = _config_vars[cv] - flags = re.sub(r'-arch\s+\w+\s', ' ', flags, flags=re.ASCII) + flags = re.sub(r'-arch\s+\w+\s', ' ', flags, re.ASCII) flags = re.sub('-isysroot [^ \t]*', ' ', flags) _save_modified_value(_config_vars, cv, flags) @@ -232,7 +232,7 @@ def _remove_unsupported_archs(_config_vars): if 'CC' in os.environ: return _config_vars - if re.search('-arch\s+ppc', _config_vars['CFLAGS']) is not None: + if re.search(r'-arch\s+ppc', _config_vars['CFLAGS']) is not None: # NOTE: Cannot use subprocess here because of bootstrap # issues when building Python itself status = os.system( @@ -251,7 +251,7 @@ def _remove_unsupported_archs(_config_vars): for cv in _UNIVERSAL_CONFIG_VARS: if cv in _config_vars and cv not in os.environ: flags = _config_vars[cv] - flags = re.sub('-arch\s+ppc\w*\s', ' ', flags) + flags = re.sub(r'-arch\s+ppc\w*\s', ' ', flags) _save_modified_value(_config_vars, cv, flags) return _config_vars @@ -267,7 +267,7 @@ def _override_all_archs(_config_vars): for cv in _UNIVERSAL_CONFIG_VARS: if cv in _config_vars and '-arch' in _config_vars[cv]: flags = _config_vars[cv] - flags = re.sub('-arch\s+\w+\s', ' ', flags) + flags = re.sub(r'-arch\s+\w+\s', ' ', flags) flags = flags + ' ' + arch _save_modified_value(_config_vars, cv, flags) @@ -465,7 +465,7 @@ def get_platform_osx(_config_vars, osname, release, machine): machine = 'fat' - archs = re.findall('-arch\s+(\S+)', cflags) + archs = re.findall(r'-arch\s+(\S+)', cflags) archs = tuple(sorted(set(archs))) if len(archs) == 1: diff --git a/Lib/_pydecimal.py b/Lib/_pydecimal.py index a5ea340..0b40928 100644 --- a/Lib/_pydecimal.py +++ b/Lib/_pydecimal.py @@ -148,7 +148,7 @@ __xname__ = __name__ # sys.modules lookup (--without-threads) __name__ = 'decimal' # For pickling __version__ = '1.70' # Highest version of the spec this complies with # See http://speleotrove.com/decimal/ -__libmpdec_version__ = "2.4.1" # compatible libmpdec version +__libmpdec_version__ = "2.4.2" # compatible libmpdec version import math as _math import numbers as _numbers @@ -589,7 +589,7 @@ class Decimal(object): # From a string # REs insist on real strings, so we can too. if isinstance(value, str): - m = _parser(value.strip()) + m = _parser(value.strip().replace("_", "")) if m is None: if context is None: context = getcontext() @@ -1010,6 +1010,56 @@ class Decimal(object): """ return DecimalTuple(self._sign, tuple(map(int, self._int)), self._exp) + def as_integer_ratio(self): + """Express a finite Decimal instance in the form n / d. + + Returns a pair (n, d) of integers. When called on an infinity + or NaN, raises OverflowError or ValueError respectively. + + >>> Decimal('3.14').as_integer_ratio() + (157, 50) + >>> Decimal('-123e5').as_integer_ratio() + (-12300000, 1) + >>> Decimal('0.00').as_integer_ratio() + (0, 1) + + """ + if self._is_special: + if self.is_nan(): + raise ValueError("cannot convert NaN to integer ratio") + else: + raise OverflowError("cannot convert Infinity to integer ratio") + + if not self: + return 0, 1 + + # Find n, d in lowest terms such that abs(self) == n / d; + # we'll deal with the sign later. + n = int(self._int) + if self._exp >= 0: + # self is an integer. + n, d = n * 10**self._exp, 1 + else: + # Find d2, d5 such that abs(self) = n / (2**d2 * 5**d5). + d5 = -self._exp + while d5 > 0 and n % 5 == 0: + n //= 5 + d5 -= 1 + + # (n & -n).bit_length() - 1 counts trailing zeros in binary + # representation of n (provided n is nonzero). + d2 = -self._exp + shift2 = min((n & -n).bit_length() - 1, d2) + if shift2: + n >>= shift2 + d2 -= shift2 + + d = 5**d5 << d2 + + if self._sign: + n = -n + return n, d + def __repr__(self): """Represents the number as an instance of Decimal.""" # Invariant: eval(repr(d)) == d @@ -4075,7 +4125,7 @@ class Context(object): This will make it round up for that operation. """ rounding = self.rounding - self.rounding= type + self.rounding = type return rounding def create_decimal(self, num='0'): @@ -4084,10 +4134,10 @@ class Context(object): This method implements the to-number operation of the IBM Decimal specification.""" - if isinstance(num, str) and num != num.strip(): + if isinstance(num, str) and (num != num.strip() or '_' in num): return self._raise_error(ConversionSyntax, - "no trailing or leading whitespace is " - "permitted.") + "trailing or leading whitespace and " + "underscores are not permitted.") d = Decimal(num, context=self) if d._isnan() and len(d._int) > self.prec - self.clamp: diff --git a/Lib/_pyio.py b/Lib/_pyio.py index f2fe447..d0947f0 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -6,7 +6,6 @@ import os import abc import codecs import errno -import array import stat import sys # Import _thread instead of threading to reduce startup cost @@ -161,6 +160,8 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, opened in a text mode, and for bytes a BytesIO can be used like a file opened in a binary mode. """ + if not isinstance(file, int): + file = os.fspath(file) if not isinstance(file, (str, bytes, int)): raise TypeError("invalid file: %r" % file) if not isinstance(mode, str): @@ -182,8 +183,8 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, text = "t" in modes binary = "b" in modes if "U" in modes: - if creating or writing or appending: - raise ValueError("can't use U and writing mode at once") + if creating or writing or appending or updating: + raise ValueError("mode U cannot be combined with 'x', 'w', 'a', or '+'") import warnings warnings.warn("'U' mode is deprecated", DeprecationWarning, 2) @@ -276,7 +277,7 @@ class OpenWrapper: try: UnsupportedOperation = io.UnsupportedOperation except AttributeError: - class UnsupportedOperation(OSError, ValueError): + class UnsupportedOperation(ValueError, OSError): pass @@ -1516,7 +1517,7 @@ class FileIO(RawIOBase): if self._fd >= 0 and self._closefd and not self.closed: import warnings warnings.warn('unclosed file %r' % (self,), ResourceWarning, - stacklevel=2) + stacklevel=2, source=self) self.close() def __getstate__(self): diff --git a/Lib/_strptime.py b/Lib/_strptime.py index f84227b..fe94361 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -199,12 +199,15 @@ class TimeRE(dict): 'f': r"(?P[0-9]{1,6})", 'H': r"(?P2[0-3]|[0-1]\d|\d)", 'I': r"(?P1[0-2]|0[1-9]|[1-9])", + 'G': r"(?P\d\d\d\d)", 'j': r"(?P36[0-6]|3[0-5]\d|[1-2]\d\d|0[1-9]\d|00[1-9]|[1-9]\d|0[1-9]|[1-9])", 'm': r"(?P1[0-2]|0[1-9]|[1-9])", 'M': r"(?P[0-5]\d|\d)", 'S': r"(?P6[0-1]|[0-5]\d|\d)", 'U': r"(?P5[0-3]|[0-4]\d|\d)", 'w': r"(?P[0-6])", + 'u': r"(?P[1-7])", + 'V': r"(?P5[0-3]|0[1-9]|[1-4]\d|\d)", # W is set below by using 'U' 'y': r"(?P\d\d)", #XXX: Does 'Y' need to worry about having less or more than @@ -299,6 +302,22 @@ def _calc_julian_from_U_or_W(year, week_of_year, day_of_week, week_starts_Mon): return 1 + days_to_week + day_of_week +def _calc_julian_from_V(iso_year, iso_week, iso_weekday): + """Calculate the Julian day based on the ISO 8601 year, week, and weekday. + ISO weeks start on Mondays, with week 01 being the week containing 4 Jan. + ISO week days range from 1 (Monday) to 7 (Sunday). + """ + correction = datetime_date(iso_year, 1, 4).isoweekday() + 3 + ordinal = (iso_week * 7) + iso_weekday - correction + # ordinal may be negative or 0 now, which means the date is in the previous + # calendar year + if ordinal < 1: + ordinal += datetime_date(iso_year, 1, 1).toordinal() + iso_year -= 1 + ordinal -= datetime_date(iso_year, 1, 1).toordinal() + return iso_year, ordinal + + def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): """Return a 2-tuple consisting of a time struct and an int containing the number of microseconds based on the input string and the @@ -345,15 +364,15 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): raise ValueError("unconverted data remains: %s" % data_string[found.end():]) - year = None + iso_year = year = None month = day = 1 hour = minute = second = fraction = 0 tz = -1 tzoffset = None # Default to -1 to signify that values not known; not critical to have, # though - week_of_year = -1 - week_of_year_start = -1 + iso_week = week_of_year = None + week_of_year_start = None # weekday and julian defaulted to None so as to signal need to calculate # values weekday = julian = None @@ -375,6 +394,8 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): year += 1900 elif group_key == 'Y': year = int(found_dict['Y']) + elif group_key == 'G': + iso_year = int(found_dict['G']) elif group_key == 'm': month = int(found_dict['m']) elif group_key == 'B': @@ -420,6 +441,9 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): weekday = 6 else: weekday -= 1 + elif group_key == 'u': + weekday = int(found_dict['u']) + weekday -= 1 elif group_key == 'j': julian = int(found_dict['j']) elif group_key in ('U', 'W'): @@ -430,6 +454,8 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): else: # W starts week on Monday. week_of_year_start = 0 + elif group_key == 'V': + iso_week = int(found_dict['V']) elif group_key == 'z': z = found_dict['z'] tzoffset = int(z[1:3]) * 60 + int(z[3:5]) @@ -450,32 +476,61 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): else: tz = value break + # Deal with the cases where ambiguities arize + # don't assume default values for ISO week/year + if year is None and iso_year is not None: + if iso_week is None or weekday is None: + raise ValueError("ISO year directive '%G' must be used with " + "the ISO week directive '%V' and a weekday " + "directive ('%A', '%a', '%w', or '%u').") + if julian is not None: + raise ValueError("Day of the year directive '%j' is not " + "compatible with ISO year directive '%G'. " + "Use '%Y' instead.") + elif week_of_year is None and iso_week is not None: + if weekday is None: + raise ValueError("ISO week directive '%V' must be used with " + "the ISO year directive '%G' and a weekday " + "directive ('%A', '%a', '%w', or '%u').") + else: + raise ValueError("ISO week directive '%V' is incompatible with " + "the year directive '%Y'. Use the ISO year '%G' " + "instead.") + leap_year_fix = False if year is None and month == 2 and day == 29: year = 1904 # 1904 is first leap year of 20th century leap_year_fix = True elif year is None: year = 1900 + + # If we know the week of the year and what day of that week, we can figure # out the Julian day of the year. - if julian is None and week_of_year != -1 and weekday is not None: - week_starts_Mon = True if week_of_year_start == 0 else False - julian = _calc_julian_from_U_or_W(year, week_of_year, weekday, - week_starts_Mon) - if julian <= 0: + if julian is None and weekday is not None: + if week_of_year is not None: + week_starts_Mon = True if week_of_year_start == 0 else False + julian = _calc_julian_from_U_or_W(year, week_of_year, weekday, + week_starts_Mon) + elif iso_year is not None and iso_week is not None: + year, julian = _calc_julian_from_V(iso_year, iso_week, weekday + 1) + if julian is not None and julian <= 0: year -= 1 yday = 366 if calendar.isleap(year) else 365 julian += yday - # Cannot pre-calculate datetime_date() since can change in Julian - # calculation and thus could have different value for the day of the week - # calculation. + if julian is None: + # Cannot pre-calculate datetime_date() since can change in Julian + # calculation and thus could have different value for the day of + # the week calculation. # Need to add 1 to result since first day of the year is 1, not 0. julian = datetime_date(year, month, day).toordinal() - \ datetime_date(year, 1, 1).toordinal() + 1 - else: # Assume that if they bothered to include Julian day it will - # be accurate. - datetime_result = datetime_date.fromordinal((julian - 1) + datetime_date(year, 1, 1).toordinal()) + else: # Assume that if they bothered to include Julian day (or if it was + # calculated above with year/week/weekday) it will be accurate. + datetime_result = datetime_date.fromordinal( + (julian - 1) + + datetime_date(year, 1, 1).toordinal()) year = datetime_result.year month = datetime_result.month day = datetime_result.day diff --git a/Lib/aifc.py b/Lib/aifc.py index d5764a3..692d0bf 100644 --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -257,6 +257,15 @@ from collections import namedtuple _aifc_params = namedtuple('_aifc_params', 'nchannels sampwidth framerate nframes comptype compname') +_aifc_params.nchannels.__doc__ = 'Number of audio channels (1 for mono, 2 for stereo)' +_aifc_params.sampwidth.__doc__ = 'Sample width in bytes' +_aifc_params.framerate.__doc__ = 'Sampling frequency' +_aifc_params.nframes.__doc__ = 'Number of audio frames' +_aifc_params.comptype.__doc__ = 'Compression type ("NONE" for AIFF files)' +_aifc_params.compname.__doc__ = ("""\ +A human-readable version of the compression type +('not compressed' for AIFF files)""") + class Aifc_read: # Variables used in this class: @@ -294,8 +303,6 @@ class Aifc_read: # _ssnd_chunk -- instantiation of a chunk class for the SSND chunk # _framesize -- size of one frame in the file - _file = None # Set here since __del__ checks it - def initfp(self, file): self._version = 0 self._convert = None @@ -337,15 +344,9 @@ class Aifc_read: def __init__(self, f): if isinstance(f, str): - file_object = builtins.open(f, 'rb') - try: - self.initfp(file_object) - except: - file_object.close() - raise - else: - # assume it is an open file object already - self.initfp(f) + f = builtins.open(f, 'rb') + # else, assume it is an open file object already + self.initfp(f) def __enter__(self): return self @@ -540,23 +541,18 @@ class Aifc_write: # _datalength -- the size of the audio samples written to the header # _datawritten -- the size of the audio samples actually written - _file = None # Set here since __del__ checks it - def __init__(self, f): if isinstance(f, str): - file_object = builtins.open(f, 'wb') - try: - self.initfp(file_object) - except: - file_object.close() - raise - - # treat .aiff file extensions as non-compressed audio - if f.endswith('.aiff'): - self._aifc = 0 + filename = f + f = builtins.open(f, 'wb') + else: + # else, assume it is an open file object already + filename = '???' + self.initfp(f) + if filename[-5:] == '.aiff': + self._aifc = 0 else: - # assume it is an open file object already - self.initfp(f) + self._aifc = 1 def initfp(self, file): self._file = file diff --git a/Lib/argparse.py b/Lib/argparse.py index 0d881b8..209b4e9 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -118,10 +118,16 @@ class _AttributeHolder(object): def __repr__(self): type_name = type(self).__name__ arg_strings = [] + star_args = {} for arg in self._get_args(): arg_strings.append(repr(arg)) for name, value in self._get_kwargs(): - arg_strings.append('%s=%r' % (name, value)) + if name.isidentifier(): + arg_strings.append('%s=%r' % (name, value)) + else: + star_args[name] = value + if star_args: + arg_strings.append('**%s' % repr(star_args)) return '%s(%s)' % (type_name, ', '.join(arg_strings)) def _get_kwargs(self): @@ -176,7 +182,7 @@ class HelpFormatter(object): self._root_section = self._Section(self, None) self._current_section = self._root_section - self._whitespace_matcher = _re.compile(r'\s+', _re.ASCII) + self._whitespace_matcher = _re.compile(r'\s+') self._long_break_matcher = _re.compile(r'\n\n\n+') # =============================== @@ -204,8 +210,6 @@ class HelpFormatter(object): if self.parent is not None: self.formatter._indent() join = self.formatter._join_parts - for func, args in self.items: - func(*args) item_help = join([func(*args) for func, args in self.items]) if self.parent is not None: self.formatter._dedent() diff --git a/Lib/ast.py b/Lib/ast.py index 0170472..156a1f2 100644 --- a/Lib/ast.py +++ b/Lib/ast.py @@ -35,6 +35,8 @@ def parse(source, filename='', mode='exec'): return compile(source, filename, mode, PyCF_ONLY_AST) +_NUM_TYPES = (int, float, complex) + def literal_eval(node_or_string): """ Safely evaluate an expression node or a string containing a Python @@ -47,7 +49,9 @@ def literal_eval(node_or_string): if isinstance(node_or_string, Expression): node_or_string = node_or_string.body def _convert(node): - if isinstance(node, (Str, Bytes)): + if isinstance(node, Constant): + return node.value + elif isinstance(node, (Str, Bytes)): return node.s elif isinstance(node, Num): return node.n @@ -62,24 +66,21 @@ def literal_eval(node_or_string): in zip(node.keys, node.values)) elif isinstance(node, NameConstant): return node.value - elif isinstance(node, UnaryOp) and \ - isinstance(node.op, (UAdd, USub)) and \ - isinstance(node.operand, (Num, UnaryOp, BinOp)): + elif isinstance(node, UnaryOp) and isinstance(node.op, (UAdd, USub)): operand = _convert(node.operand) - if isinstance(node.op, UAdd): - return + operand - else: - return - operand - elif isinstance(node, BinOp) and \ - isinstance(node.op, (Add, Sub)) and \ - isinstance(node.right, (Num, UnaryOp, BinOp)) and \ - isinstance(node.left, (Num, UnaryOp, BinOp)): + if isinstance(operand, _NUM_TYPES): + if isinstance(node.op, UAdd): + return + operand + else: + return - operand + elif isinstance(node, BinOp) and isinstance(node.op, (Add, Sub)): left = _convert(node.left) right = _convert(node.right) - if isinstance(node.op, Add): - return left + right - else: - return left - right + if isinstance(left, _NUM_TYPES) and isinstance(right, _NUM_TYPES): + if isinstance(node.op, Add): + return left + right + else: + return left - right raise ValueError('malformed node or string: ' + repr(node)) return _convert(node_or_string) @@ -196,12 +197,19 @@ def get_docstring(node, clean=True): """ if not isinstance(node, (AsyncFunctionDef, FunctionDef, ClassDef, Module)): raise TypeError("%r can't have docstrings" % node.__class__.__name__) - if node.body and isinstance(node.body[0], Expr) and \ - isinstance(node.body[0].value, Str): - if clean: - import inspect - return inspect.cleandoc(node.body[0].value.s) - return node.body[0].value.s + if not(node.body and isinstance(node.body[0], Expr)): + return + node = node.body[0].value + if isinstance(node, Str): + text = node.s + elif isinstance(node, Constant) and isinstance(node.value, str): + text = node.value + else: + return + if clean: + import inspect + text = inspect.cleandoc(text) + return text def walk(node): diff --git a/Lib/asynchat.py b/Lib/asynchat.py index f728d1b..fc1146a 100644 --- a/Lib/asynchat.py +++ b/Lib/asynchat.py @@ -285,35 +285,6 @@ class simple_producer: return result -class fifo: - def __init__(self, list=None): - import warnings - warnings.warn('fifo class will be removed in Python 3.6', - DeprecationWarning, stacklevel=2) - if not list: - self.list = deque() - else: - self.list = deque(list) - - def __len__(self): - return len(self.list) - - def is_empty(self): - return not self.list - - def first(self): - return self.list[0] - - def push(self, data): - self.list.append(data) - - def pop(self): - if self.list: - return (1, self.list.popleft()) - else: - return (0, None) - - # Given 'haystack', see if any prefix of 'needle' is at its end. This # assumes an exact match has already been checked. Return the number of # characters matched. diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 26a6f1e..0df58c5 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -57,7 +57,7 @@ _FATAL_ERROR_IGNORE = (BrokenPipeError, def _format_handle(handle): cb = handle._callback - if inspect.ismethod(cb) and isinstance(cb.__self__, tasks.Task): + if isinstance(getattr(cb, '__self__', None), tasks.Task): # format the task return repr(cb.__self__) else: @@ -459,8 +459,7 @@ class BaseEventLoop(events.AbstractEventLoop): # local task. future.exception() raise - finally: - future.remove_done_callback(_run_until_complete_cb) + future.remove_done_callback(_run_until_complete_cb) if not future.done(): raise RuntimeError('Event loop stopped before Future completed.') @@ -506,7 +505,8 @@ class BaseEventLoop(events.AbstractEventLoop): if compat.PY34: def __del__(self): if not self.is_closed(): - warnings.warn("unclosed event loop %r" % self, ResourceWarning) + warnings.warn("unclosed event loop %r" % self, ResourceWarning, + source=self) if not self.is_running(): self.close() diff --git a/Lib/asyncio/base_futures.py b/Lib/asyncio/base_futures.py new file mode 100644 index 0000000..01259a0 --- /dev/null +++ b/Lib/asyncio/base_futures.py @@ -0,0 +1,71 @@ +__all__ = [] + +import concurrent.futures._base +import reprlib + +from . import events + +Error = concurrent.futures._base.Error +CancelledError = concurrent.futures.CancelledError +TimeoutError = concurrent.futures.TimeoutError + + +class InvalidStateError(Error): + """The operation is not allowed in this state.""" + + +# States for Future. +_PENDING = 'PENDING' +_CANCELLED = 'CANCELLED' +_FINISHED = 'FINISHED' + + +def isfuture(obj): + """Check for a Future. + + This returns True when obj is a Future instance or is advertising + itself as duck-type compatible by setting _asyncio_future_blocking. + See comment in Future for more details. + """ + return (hasattr(obj.__class__, '_asyncio_future_blocking') and + obj._asyncio_future_blocking is not None) + + +def _format_callbacks(cb): + """helper function for Future.__repr__""" + size = len(cb) + if not size: + cb = '' + + def format_cb(callback): + return events._format_callback_source(callback, ()) + + if size == 1: + cb = format_cb(cb[0]) + elif size == 2: + cb = '{}, {}'.format(format_cb(cb[0]), format_cb(cb[1])) + elif size > 2: + cb = '{}, <{} more>, {}'.format(format_cb(cb[0]), + size - 2, + format_cb(cb[-1])) + return 'cb=[%s]' % cb + + +def _future_repr_info(future): + # (Future) -> str + """helper function for Future.__repr__""" + info = [future._state.lower()] + if future._state == _FINISHED: + if future._exception is not None: + info.append('exception={!r}'.format(future._exception)) + else: + # use reprlib to limit the length of the output, especially + # for very long strings + result = reprlib.repr(future._result) + info.append('result={}'.format(result)) + if future._callbacks: + info.append(_format_callbacks(future._callbacks)) + if future._source_traceback: + frame = future._source_traceback[-1] + info.append('created at %s:%s' % (frame[0], frame[1])) + return info diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py index 23742a1..a00d9d5 100644 --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -127,7 +127,8 @@ class BaseSubprocessTransport(transports.SubprocessTransport): if compat.PY34: def __del__(self): if not self._closed: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self.close() def get_pid(self): diff --git a/Lib/asyncio/base_tasks.py b/Lib/asyncio/base_tasks.py new file mode 100644 index 0000000..5f34434 --- /dev/null +++ b/Lib/asyncio/base_tasks.py @@ -0,0 +1,76 @@ +import linecache +import traceback + +from . import base_futures +from . import coroutines + + +def _task_repr_info(task): + info = base_futures._future_repr_info(task) + + if task._must_cancel: + # replace status + info[0] = 'cancelling' + + coro = coroutines._format_coroutine(task._coro) + info.insert(1, 'coro=<%s>' % coro) + + if task._fut_waiter is not None: + info.insert(2, 'wait_for=%r' % task._fut_waiter) + return info + + +def _task_get_stack(task, limit): + frames = [] + try: + # 'async def' coroutines + f = task._coro.cr_frame + except AttributeError: + f = task._coro.gi_frame + if f is not None: + while f is not None: + if limit is not None: + if limit <= 0: + break + limit -= 1 + frames.append(f) + f = f.f_back + frames.reverse() + elif task._exception is not None: + tb = task._exception.__traceback__ + while tb is not None: + if limit is not None: + if limit <= 0: + break + limit -= 1 + frames.append(tb.tb_frame) + tb = tb.tb_next + return frames + + +def _task_print_stack(task, limit, file): + extracted_list = [] + checked = set() + for f in task.get_stack(limit=limit): + lineno = f.f_lineno + co = f.f_code + filename = co.co_filename + name = co.co_name + if filename not in checked: + checked.add(filename) + linecache.checkcache(filename) + line = linecache.getline(filename, lineno, f.f_globals) + extracted_list.append((filename, lineno, name, line)) + exc = task._exception + if not extracted_list: + print('No stack for %r' % task, file=file) + elif exc is not None: + print('Traceback for %r (most recent call last):' % task, + file=file) + else: + print('Stack for %r (most recent call last):' % task, + file=file) + traceback.print_list(extracted_list, file=file) + if exc is not None: + for line in traceback.format_exception_only(exc.__class__, exc): + print(line, file=file, end='') diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py index 488e423..08e9441 100644 --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -11,7 +11,7 @@ import types from . import compat from . import events -from . import futures +from . import base_futures from .log import logger @@ -197,7 +197,7 @@ def coroutine(func): """ if _inspect_iscoroutinefunction(func): # In Python 3.5 that's all we need to do for coroutines - # defined with "async def". + # defiend with "async def". # Wrapping in CoroWrapper will happen via # 'sys.set_coroutine_wrapper' function. return func @@ -208,7 +208,7 @@ def coroutine(func): @functools.wraps(func) def coro(*args, **kw): res = func(*args, **kw) - if (futures.isfuture(res) or inspect.isgenerator(res) or + if (base_futures.isfuture(res) or inspect.isgenerator(res) or isinstance(res, CoroWrapper)): res = yield from res elif _AwaitableABC is not None: diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py index e85634e..28a45fc 100644 --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -11,7 +11,6 @@ __all__ = ['AbstractEventLoopPolicy', import functools import inspect -import os import reprlib import socket import subprocess @@ -612,9 +611,6 @@ _lock = threading.Lock() # A TLS for the running event loop, used by _get_running_loop. class _RunningLoop(threading.local): _loop = None - _pid = None - - _running_loop = _RunningLoop() @@ -624,9 +620,7 @@ def _get_running_loop(): This is a low-level function intended to be used by event loops. This function is thread-specific. """ - running_loop = _running_loop._loop - if running_loop is not None and _running_loop._pid == os.getpid(): - return running_loop + return _running_loop._loop def _set_running_loop(loop): @@ -635,7 +629,6 @@ def _set_running_loop(loop): This is a low-level function intended to be used by event loops. This function is thread-specific. """ - _running_loop._pid = os.getpid() _running_loop._loop = loop diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index 60b0d31..d11d289 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -1,33 +1,30 @@ """A Future class similar to the one in PEP 3148.""" -__all__ = ['CancelledError', 'TimeoutError', - 'InvalidStateError', - 'Future', 'wrap_future', 'isfuture', - ] +__all__ = ['CancelledError', 'TimeoutError', 'InvalidStateError', + 'Future', 'wrap_future', 'isfuture'] -import concurrent.futures._base +import concurrent.futures import logging -import reprlib import sys import traceback +from . import base_futures from . import compat from . import events -# States for Future. -_PENDING = 'PENDING' -_CANCELLED = 'CANCELLED' -_FINISHED = 'FINISHED' -Error = concurrent.futures._base.Error -CancelledError = concurrent.futures.CancelledError -TimeoutError = concurrent.futures.TimeoutError +CancelledError = base_futures.CancelledError +InvalidStateError = base_futures.InvalidStateError +TimeoutError = base_futures.TimeoutError +isfuture = base_futures.isfuture -STACK_DEBUG = logging.DEBUG - 1 # heavy-duty debugging + +_PENDING = base_futures._PENDING +_CANCELLED = base_futures._CANCELLED +_FINISHED = base_futures._FINISHED -class InvalidStateError(Error): - """The operation is not allowed in this state.""" +STACK_DEBUG = logging.DEBUG - 1 # heavy-duty debugging class _TracebackLogger: @@ -110,17 +107,6 @@ class _TracebackLogger: self.loop.call_exception_handler({'message': msg}) -def isfuture(obj): - """Check for a Future. - - This returns True when obj is a Future instance or is advertising - itself as duck-type compatible by setting _asyncio_future_blocking. - See comment in Future for more details. - """ - return (hasattr(obj.__class__, '_asyncio_future_blocking') and - obj._asyncio_future_blocking is not None) - - class Future: """This class is *almost* compatible with concurrent.futures.Future. @@ -173,45 +159,10 @@ class Future: if self._loop.get_debug(): self._source_traceback = traceback.extract_stack(sys._getframe(1)) - def __format_callbacks(self): - cb = self._callbacks - size = len(cb) - if not size: - cb = '' - - def format_cb(callback): - return events._format_callback_source(callback, ()) - - if size == 1: - cb = format_cb(cb[0]) - elif size == 2: - cb = '{}, {}'.format(format_cb(cb[0]), format_cb(cb[1])) - elif size > 2: - cb = '{}, <{} more>, {}'.format(format_cb(cb[0]), - size-2, - format_cb(cb[-1])) - return 'cb=[%s]' % cb - - def _repr_info(self): - info = [self._state.lower()] - if self._state == _FINISHED: - if self._exception is not None: - info.append('exception={!r}'.format(self._exception)) - else: - # use reprlib to limit the length of the output, especially - # for very long strings - result = reprlib.repr(self._result) - info.append('result={}'.format(result)) - if self._callbacks: - info.append(self.__format_callbacks()) - if self._source_traceback: - frame = self._source_traceback[-1] - info.append('created at %s:%s' % (frame[0], frame[1])) - return info + _repr_info = base_futures._future_repr_info def __repr__(self): - info = self._repr_info() - return '<%s %s>' % (self.__class__.__name__, ' '.join(info)) + return '<%s %s>' % (self.__class__.__name__, ' '.join(self._repr_info())) # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks @@ -240,7 +191,6 @@ class Future: change the future's state to cancelled, schedule the callbacks and return True. """ - self._log_traceback = False if self._state != _PENDING: return False self._state = _CANCELLED @@ -386,6 +336,10 @@ class Future: __await__ = __iter__ # make compatible with 'await' expression +# Needed for testing purposes. +_PyFuture = Future + + def _set_result_unless_cancelled(fut, result): """Helper setting the result only if the future was not cancelled.""" if fut.cancelled(): @@ -478,3 +432,12 @@ def wrap_future(future, *, loop=None): new_future = loop.create_future() _chain_future(future, new_future) return new_future + + +try: + import _asyncio +except ImportError: + pass +else: + # _CFuture is needed for tests. + Future = _CFuture = _asyncio.Future diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py index 9266183..deefc93 100644 --- a/Lib/asyncio/locks.py +++ b/Lib/asyncio/locks.py @@ -176,10 +176,6 @@ class Lock(_ContextManagerMixin): yield from fut self._locked = True return True - except futures.CancelledError: - if not self._locked: - self._wake_up_first() - raise finally: self._waiters.remove(fut) @@ -196,17 +192,14 @@ class Lock(_ContextManagerMixin): """ if self._locked: self._locked = False - self._wake_up_first() + # Wake up the first waiter who isn't cancelled. + for fut in self._waiters: + if not fut.done(): + fut.set_result(True) + break else: raise RuntimeError('Lock is not acquired.') - def _wake_up_first(self): - """Wake up the first waiter who isn't cancelled.""" - for fut in self._waiters: - if not fut.done(): - fut.set_result(True) - break - class Event: """Asynchronous equivalent to threading.Event. diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 13a885c..ff12877 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -92,7 +92,8 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, if compat.PY34: def __del__(self): if self._sock is not None: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self.close() def _fatal_error(self, exc, message='Fatal error on pipe transport'): @@ -231,9 +232,8 @@ class _ProactorBaseWritePipeTransport(_ProactorBasePipeTransport, def write(self, data): if not isinstance(data, (bytes, bytearray, memoryview)): - msg = ("data argument must be a bytes-like object, not '%s'" % - type(data).__name__) - raise TypeError(msg) + raise TypeError('data argument must be byte-ish (%r)', + type(data)) if self._eof_written: raise RuntimeError('write_eof() already called') diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 12d357b..9dbe550 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -627,7 +627,8 @@ class _SelectorTransport(transports._FlowControlMixin, if compat.PY34: def __del__(self): if self._sock is not None: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self._sock.close() def _fatal_error(self, exc, message='Fatal error on transport'): diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 61d478e..7ad28d6 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -331,7 +331,8 @@ class _SSLProtocolTransport(transports._FlowControlMixin, if compat.PY34: def __del__(self): if not self._closed: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self.close() def pause_reading(self): @@ -542,19 +543,14 @@ class SSLProtocol(protocols.Protocol): def _get_extra_info(self, name, default=None): if name in self._extra: return self._extra[name] - elif self._transport is not None: - return self._transport.get_extra_info(name, default) else: - return default + return self._transport.get_extra_info(name, default) def _start_shutdown(self): if self._in_shutdown: return - if self._in_handshake: - self._abort() - else: - self._in_shutdown = True - self._write_appdata(b'') + self._in_shutdown = True + self._write_appdata(b'') def _write_appdata(self, data): self._write_backlog.append((data, 0)) @@ -685,14 +681,12 @@ class SSLProtocol(protocols.Protocol): self._transport._force_close(exc) def _finalize(self): - self._sslpipe = None - if self._transport is not None: self._transport.close() def _abort(self): - try: - if self._transport is not None: + if self._transport is not None: + try: self._transport.abort() - finally: - self._finalize() + finally: + self._finalize() diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py index 4c85466..b2f5304 100644 --- a/Lib/asyncio/subprocess.py +++ b/Lib/asyncio/subprocess.py @@ -24,8 +24,6 @@ class SubprocessStreamProtocol(streams.FlowControlMixin, self._limit = limit self.stdin = self.stdout = self.stderr = None self._transport = None - self._process_exited = False - self._pipe_fds = [] def __repr__(self): info = [self.__class__.__name__] @@ -45,14 +43,12 @@ class SubprocessStreamProtocol(streams.FlowControlMixin, self.stdout = streams.StreamReader(limit=self._limit, loop=self._loop) self.stdout.set_transport(stdout_transport) - self._pipe_fds.append(1) stderr_transport = transport.get_pipe_transport(2) if stderr_transport is not None: self.stderr = streams.StreamReader(limit=self._limit, loop=self._loop) self.stderr.set_transport(stderr_transport) - self._pipe_fds.append(2) stdin_transport = transport.get_pipe_transport(0) if stdin_transport is not None: @@ -90,18 +86,9 @@ class SubprocessStreamProtocol(streams.FlowControlMixin, else: reader.set_exception(exc) - if fd in self._pipe_fds: - self._pipe_fds.remove(fd) - self._maybe_close_transport() - def process_exited(self): - self._process_exited = True - self._maybe_close_transport() - - def _maybe_close_transport(self): - if len(self._pipe_fds) == 0 and self._process_exited: - self._transport.close() - self._transport = None + self._transport.close() + self._transport = None class Process: diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 6c43e68..5a43ef2 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -9,11 +9,10 @@ __all__ = ['Task', import concurrent.futures import functools import inspect -import linecache -import traceback import warnings import weakref +from . import base_tasks from . import compat from . import coroutines from . import events @@ -93,18 +92,7 @@ class Task(futures.Future): futures.Future.__del__(self) def _repr_info(self): - info = super()._repr_info() - - if self._must_cancel: - # replace status - info[0] = 'cancelling' - - coro = coroutines._format_coroutine(self._coro) - info.insert(1, 'coro=<%s>' % coro) - - if self._fut_waiter is not None: - info.insert(2, 'wait_for=%r' % self._fut_waiter) - return info + return base_tasks._task_repr_info(self) def get_stack(self, *, limit=None): """Return the list of stack frames for this task's coroutine. @@ -127,31 +115,7 @@ class Task(futures.Future): For reasons beyond our control, only one stack frame is returned for a suspended coroutine. """ - frames = [] - try: - # 'async def' coroutines - f = self._coro.cr_frame - except AttributeError: - f = self._coro.gi_frame - if f is not None: - while f is not None: - if limit is not None: - if limit <= 0: - break - limit -= 1 - frames.append(f) - f = f.f_back - frames.reverse() - elif self._exception is not None: - tb = self._exception.__traceback__ - while tb is not None: - if limit is not None: - if limit <= 0: - break - limit -= 1 - frames.append(tb.tb_frame) - tb = tb.tb_next - return frames + return base_tasks._task_get_stack(self, limit) def print_stack(self, *, limit=None, file=None): """Print the stack or traceback for this task's coroutine. @@ -162,31 +126,7 @@ class Task(futures.Future): to which the output is written; by default output is written to sys.stderr. """ - extracted_list = [] - checked = set() - for f in self.get_stack(limit=limit): - lineno = f.f_lineno - co = f.f_code - filename = co.co_filename - name = co.co_name - if filename not in checked: - checked.add(filename) - linecache.checkcache(filename) - line = linecache.getline(filename, lineno, f.f_globals) - extracted_list.append((filename, lineno, name, line)) - exc = self._exception - if not extracted_list: - print('No stack for %r' % self, file=file) - elif exc is not None: - print('Traceback for %r (most recent call last):' % self, - file=file) - else: - print('Stack for %r (most recent call last):' % self, - file=file) - traceback.print_list(extracted_list, file=file) - if exc is not None: - for line in traceback.format_exception_only(exc.__class__, exc): - print(line, file=file, end='') + return base_tasks._task_print_stack(self, limit, file) def cancel(self): """Request that this task cancel itself. @@ -208,7 +148,6 @@ class Task(futures.Future): terminates with a CancelledError exception (even if cancel() was not called). """ - self._log_traceback = False if self.done(): return False if self._fut_waiter is not None: @@ -241,12 +180,7 @@ class Task(futures.Future): else: result = coro.throw(exc) except StopIteration as exc: - if self._must_cancel: - # Task is cancelled right before coro stops. - self._must_cancel = False - self.set_exception(futures.CancelledError()) - else: - self.set_result(exc.value) + self.set_result(exc.value) except futures.CancelledError: super().cancel() # I.e., Future.cancel(self). except Exception as exc: @@ -322,6 +256,18 @@ class Task(futures.Future): self = None # Needed to break cycles when an exception occurs. +_PyTask = Task + + +try: + import _asyncio +except ImportError: + pass +else: + # _CTask is needed for tests. + Task = _CTask = _asyncio.Task + + # wait() and as_completed() similar to those in PEP 3148. FIRST_COMPLETED = concurrent.futures.FIRST_COMPLETED @@ -541,8 +487,7 @@ def async_(coro_or_future, *, loop=None): """ warnings.warn("asyncio.async() function is deprecated, use ensure_future()", - DeprecationWarning, - stacklevel=2) + DeprecationWarning) return ensure_future(coro_or_future, loop=loop) @@ -571,8 +516,7 @@ def ensure_future(coro_or_future, *, loop=None): elif compat.PY35 and inspect.isawaitable(coro_or_future): return ensure_future(_wrap_awaitable(coro_or_future), loop=loop) else: - raise TypeError('An asyncio.Future, a coroutine or an awaitable is ' - 'required') + raise TypeError('A Future, a coroutine or an awaitable is required') @coroutine diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py index a1686c5..99e3839 100644 --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -33,7 +33,6 @@ from . import selectors from . import tasks from .coroutines import coroutine from .log import logger -from test import support if sys.platform == 'win32': # pragma: no cover @@ -120,10 +119,10 @@ class SSLWSGIServerMixin: 'test', 'test_asyncio') keyfile = os.path.join(here, 'ssl_key.pem') certfile = os.path.join(here, 'ssl_cert.pem') - ssock = ssl.wrap_socket(request, - keyfile=keyfile, - certfile=certfile, - server_side=True) + context = ssl.SSLContext() + context.load_cert_chain(certfile, keyfile) + + ssock = context.wrap_socket(request, server_side=True) try: self.RequestHandlerClass(ssock, client_address, self) ssock.close() @@ -450,16 +449,12 @@ class TestCase(unittest.TestCase): self.set_event_loop(loop) return loop - def unpatch_get_running_loop(self): - events._get_running_loop = self._get_running_loop - def setUp(self): self._get_running_loop = events._get_running_loop events._get_running_loop = lambda: None - self._thread_cleanup = support.threading_setup() def tearDown(self): - self.unpatch_get_running_loop() + events._get_running_loop = self._get_running_loop events.set_event_loop(None) @@ -467,10 +462,6 @@ class TestCase(unittest.TestCase): # in an except block of a generator self.assertEqual(sys.exc_info(), (None, None, None)) - self.doCleanups() - support.threading_cleanup(*self._thread_cleanup) - support.reap_children() - if not compat.PY34: # Python 3.3 compatibility def subTest(self, *args, **kwargs): diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 7790534..2806ea8 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -419,7 +419,8 @@ class _UnixReadPipeTransport(transports.ReadTransport): if compat.PY34: def __del__(self): if self._pipe is not None: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self._pipe.close() def _fatal_error(self, exc, message='Fatal error on pipe transport'): @@ -619,7 +620,8 @@ class _UnixWritePipeTransport(transports._FlowControlMixin, if compat.PY34: def __del__(self): if self._pipe is not None: - warnings.warn("unclosed transport %r" % self, ResourceWarning) + warnings.warn("unclosed transport %r" % self, ResourceWarning, + source=self) self._pipe.close() def abort(self): diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 668fe14..b777dd0 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -171,8 +171,13 @@ class _WaitCancelFuture(_BaseWaitHandleFuture): def cancel(self): raise RuntimeError("_WaitCancelFuture must not be cancelled") - def _schedule_callbacks(self): - super(_WaitCancelFuture, self)._schedule_callbacks() + def set_result(self, result): + super().set_result(result) + if self._done_callback is not None: + self._done_callback(self) + + def set_exception(self, exception): + super().set_exception(exception) if self._done_callback is not None: self._done_callback(self) diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py index 870cd13..7c63fb9 100644 --- a/Lib/asyncio/windows_utils.py +++ b/Lib/asyncio/windows_utils.py @@ -159,7 +159,8 @@ class PipeHandle: def __del__(self): if self._handle is not None: - warnings.warn("unclosed %r" % self, ResourceWarning) + warnings.warn("unclosed %r" % self, ResourceWarning, + source=self) self.close() def __enter__(self): diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 3b51f0f..705e406 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -333,7 +333,7 @@ class dispatcher: self.connecting = True err = self.socket.connect_ex(address) if err in (EINPROGRESS, EALREADY, EWOULDBLOCK) \ - or err == EINVAL and os.name in ('nt', 'ce'): + or err == EINVAL and os.name == 'nt': self.addr = address return if err in (0, EISCONN): @@ -595,7 +595,8 @@ if os.name == 'posix': def __del__(self): if self.fd >= 0: - warnings.warn("unclosed file %r" % self, ResourceWarning) + warnings.warn("unclosed file %r" % self, ResourceWarning, + source=self) self.close() def recv(self, *args): diff --git a/Lib/base64.py b/Lib/base64.py index 0dc64cf..58f6ad6 100755 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -55,8 +55,7 @@ def b64encode(s, altchars=None): alternative alphabet for the '+' and '/' characters. This allows an application to e.g. generate url or filesystem safe Base64 strings. """ - # Strip off the trailing newline - encoded = binascii.b2a_base64(s)[:-1] + encoded = binascii.b2a_base64(s, newline=False) if altchars is not None: assert len(altchars) == 2, repr(altchars) return encoded.translate(bytes.maketrans(b'+/', altchars)) @@ -156,7 +155,7 @@ def b32encode(s): leftover = len(s) % 5 # Pad the last quantum with zero bits if necessary if leftover: - s = s + bytes(5 - leftover) # Don't use += ! + s = s + b'\0' * (5 - leftover) # Don't use += ! encoded = bytearray() from_bytes = int.from_bytes b32tab2 = _b32tab2 @@ -542,8 +541,7 @@ def encodebytes(s): def encodestring(s): """Legacy alias of encodebytes().""" import warnings - warnings.warn("encodestring() is a deprecated alias since 3.1, " - "use encodebytes()", + warnings.warn("encodestring() is a deprecated alias, use encodebytes()", DeprecationWarning, 2) return encodebytes(s) @@ -556,8 +554,7 @@ def decodebytes(s): def decodestring(s): """Legacy alias of decodebytes().""" import warnings - warnings.warn("decodestring() is a deprecated alias since Python 3.1, " - "use decodebytes()", + warnings.warn("decodestring() is a deprecated alias, use decodebytes()", DeprecationWarning, 2) return decodebytes(s) diff --git a/Lib/bz2.py b/Lib/bz2.py index bc78c54..6f56328 100644 --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -11,6 +11,7 @@ __author__ = "Nadeem Vawda " from builtins import open as _builtin_open import io +import os import warnings import _compression @@ -42,9 +43,9 @@ class BZ2File(_compression.BaseStream): def __init__(self, filename, mode="r", buffering=None, compresslevel=9): """Open a bzip2-compressed file. - If filename is a str or bytes object, it gives the name - of the file to be opened. Otherwise, it should be a file object, - which will be used to read or write the compressed data. + If filename is a str, bytes, or PathLike object, it gives the + name of the file to be opened. Otherwise, it should be a file + object, which will be used to read or write the compressed data. mode can be 'r' for reading (default), 'w' for (over)writing, 'x' for creating exclusively, or 'a' for appending. These can @@ -91,7 +92,7 @@ class BZ2File(_compression.BaseStream): else: raise ValueError("Invalid mode: %r" % (mode,)) - if isinstance(filename, (str, bytes)): + if isinstance(filename, (str, bytes, os.PathLike)): self._fp = _builtin_open(filename, mode) self._closefp = True self._mode = mode_code @@ -99,7 +100,7 @@ class BZ2File(_compression.BaseStream): self._fp = filename self._mode = mode_code else: - raise TypeError("filename must be a str or bytes object, or a file") + raise TypeError("filename must be a str, bytes, file or PathLike object") if self._mode == _MODE_READ: raw = _compression.DecompressReader(self._fp, @@ -289,8 +290,9 @@ def open(filename, mode="rb", compresslevel=9, encoding=None, errors=None, newline=None): """Open a bzip2-compressed file in binary or text mode. - The filename argument can be an actual filename (a str or bytes - object), or an existing file object to read from or write to. + The filename argument can be an actual filename (a str, bytes, or + PathLike object), or an existing file object to read from or write + to. The mode argument can be "r", "rb", "w", "wb", "x", "xb", "a" or "ab" for binary mode, or "rt", "wt", "xt" or "at" for text mode. diff --git a/Lib/calendar.py b/Lib/calendar.py index 76cf8de..07594f3 100644 --- a/Lib/calendar.py +++ b/Lib/calendar.py @@ -13,7 +13,9 @@ from itertools import repeat __all__ = ["IllegalMonthError", "IllegalWeekdayError", "setfirstweekday", "firstweekday", "isleap", "leapdays", "weekday", "monthrange", "monthcalendar", "prmonth", "month", "prcal", "calendar", - "timegm", "month_name", "month_abbr", "day_name", "day_abbr"] + "timegm", "month_name", "month_abbr", "day_name", "day_abbr", + "Calendar", "TextCalendar", "HTMLCalendar", "LocaleTextCalendar", + "LocaleHTMLCalendar", "weekheader"] # Exception raised for bad input (with string parameter for details) error = ValueError @@ -604,51 +606,63 @@ def timegm(tuple): def main(args): - import optparse - parser = optparse.OptionParser(usage="usage: %prog [options] [year [month]]") - parser.add_option( + import argparse + parser = argparse.ArgumentParser() + textgroup = parser.add_argument_group('text only arguments') + htmlgroup = parser.add_argument_group('html only arguments') + textgroup.add_argument( "-w", "--width", - dest="width", type="int", default=2, - help="width of date column (default 2, text only)" + type=int, default=2, + help="width of date column (default 2)" ) - parser.add_option( + textgroup.add_argument( "-l", "--lines", - dest="lines", type="int", default=1, - help="number of lines for each week (default 1, text only)" + type=int, default=1, + help="number of lines for each week (default 1)" ) - parser.add_option( + textgroup.add_argument( "-s", "--spacing", - dest="spacing", type="int", default=6, - help="spacing between months (default 6, text only)" + type=int, default=6, + help="spacing between months (default 6)" ) - parser.add_option( + textgroup.add_argument( "-m", "--months", - dest="months", type="int", default=3, - help="months per row (default 3, text only)" + type=int, default=3, + help="months per row (default 3)" ) - parser.add_option( + htmlgroup.add_argument( "-c", "--css", - dest="css", default="calendar.css", - help="CSS to use for page (html only)" + default="calendar.css", + help="CSS to use for page" ) - parser.add_option( + parser.add_argument( "-L", "--locale", - dest="locale", default=None, + default=None, help="locale to be used from month and weekday names" ) - parser.add_option( + parser.add_argument( "-e", "--encoding", - dest="encoding", default=None, - help="Encoding to use for output." + default=None, + help="encoding to use for output" ) - parser.add_option( + parser.add_argument( "-t", "--type", - dest="type", default="text", + default="text", choices=("text", "html"), help="output type (text or html)" ) + parser.add_argument( + "year", + nargs='?', type=int, + help="year number (1-9999)" + ) + parser.add_argument( + "month", + nargs='?', type=int, + help="month number (1-12, text only)" + ) - (options, args) = parser.parse_args(args) + options = parser.parse_args(args[1:]) if options.locale and not options.encoding: parser.error("if --locale is specified --encoding is required") @@ -666,10 +680,10 @@ def main(args): encoding = sys.getdefaultencoding() optdict = dict(encoding=encoding, css=options.css) write = sys.stdout.buffer.write - if len(args) == 1: + if options.year is None: write(cal.formatyearpage(datetime.date.today().year, **optdict)) - elif len(args) == 2: - write(cal.formatyearpage(int(args[1]), **optdict)) + elif options.month is None: + write(cal.formatyearpage(options.year, **optdict)) else: parser.error("incorrect number of arguments") sys.exit(1) @@ -679,18 +693,15 @@ def main(args): else: cal = TextCalendar() optdict = dict(w=options.width, l=options.lines) - if len(args) != 3: + if options.month is None: optdict["c"] = options.spacing optdict["m"] = options.months - if len(args) == 1: + if options.year is None: result = cal.formatyear(datetime.date.today().year, **optdict) - elif len(args) == 2: - result = cal.formatyear(int(args[1]), **optdict) - elif len(args) == 3: - result = cal.formatmonth(int(args[1]), int(args[2]), **optdict) + elif options.month is None: + result = cal.formatyear(options.year, **optdict) else: - parser.error("incorrect number of arguments") - sys.exit(1) + result = cal.formatmonth(options.year, options.month, **optdict) write = sys.stdout.write if options.encoding: result = result.encode(options.encoding) diff --git a/Lib/cgi.py b/Lib/cgi.py index 189c6d5..233a496 100755 --- a/Lib/cgi.py +++ b/Lib/cgi.py @@ -45,7 +45,7 @@ import tempfile __all__ = ["MiniFieldStorage", "FieldStorage", "parse", "parse_qs", "parse_qsl", "parse_multipart", - "parse_header", "print_exception", "print_environ", + "parse_header", "test", "print_exception", "print_environ", "print_form", "print_directory", "print_arguments", "print_environ_usage", "escape"] diff --git a/Lib/code.py b/Lib/code.py index 53244e3..23295f4 100644 --- a/Lib/code.py +++ b/Lib/code.py @@ -186,7 +186,7 @@ class InteractiveConsole(InteractiveInterpreter): """Reset the input buffer.""" self.buffer = [] - def interact(self, banner=None): + def interact(self, banner=None, exitmsg=None): """Closely emulate the interactive Python console. The optional banner argument specifies the banner to print @@ -196,6 +196,11 @@ class InteractiveConsole(InteractiveInterpreter): to confuse this with the real interpreter -- since it's so close!). + The optional exitmsg argument specifies the exit message + printed when exiting. Pass the empty string to suppress + printing an exit message. If exitmsg is not given or None, + a default message is printed. + """ try: sys.ps1 @@ -230,6 +235,10 @@ class InteractiveConsole(InteractiveInterpreter): self.write("\nKeyboardInterrupt\n") self.resetbuffer() more = 0 + if exitmsg is None: + self.write('now exiting %s...\n' % self.__class__.__name__) + elif exitmsg != '': + self.write('%s\n' % exitmsg) def push(self, line): """Push a line to the interpreter. @@ -267,7 +276,7 @@ class InteractiveConsole(InteractiveInterpreter): -def interact(banner=None, readfunc=None, local=None): +def interact(banner=None, readfunc=None, local=None, exitmsg=None): """Closely emulate the interactive Python interpreter. This is a backwards compatible interface to the InteractiveConsole @@ -279,6 +288,7 @@ def interact(banner=None, readfunc=None, local=None): banner -- passed to InteractiveConsole.interact() readfunc -- if not None, replaces InteractiveConsole.raw_input() local -- passed to InteractiveInterpreter.__init__() + exitmsg -- passed to InteractiveConsole.interact() """ console = InteractiveConsole(local) @@ -289,7 +299,7 @@ def interact(banner=None, readfunc=None, local=None): import readline except ImportError: pass - console.interact(banner) + console.interact(banner, exitmsg) if __name__ == "__main__": diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index bea811d..bcc4291 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -189,7 +189,6 @@ class OrderedDict(dict): link = self.__map[key] link_prev = link.prev link_next = link.next - soft_link = link_next.prev link_prev.next = link_next link_next.prev = link_prev root = self.__root @@ -197,14 +196,12 @@ class OrderedDict(dict): last = root.prev link.prev = last link.next = root - root.prev = soft_link - last.next = link + last.next = root.prev = link else: first = root.next link.prev = root link.next = first - first.prev = soft_link - root.next = link + root.next = first.prev = link def __sizeof__(self): sizeof = _sys.getsizeof @@ -356,7 +353,7 @@ _field_template = '''\ {name} = _property(_itemgetter({index:d}), doc='Alias for field number {index:d}') ''' -def namedtuple(typename, field_names, verbose=False, rename=False): +def namedtuple(typename, field_names, *, verbose=False, rename=False, module=None): """Returns a new subclass of tuple with named fields. >>> Point = namedtuple('Point', ['x', 'y']) @@ -396,7 +393,7 @@ def namedtuple(typename, field_names, verbose=False, rename=False): field_names[index] = '_%d' % index seen.add(name) for name in [typename] + field_names: - if type(name) != str: + if type(name) is not str: raise TypeError('Type names and field names must be strings') if not name.isidentifier(): raise ValueError('Type names and field names must be valid ' @@ -437,11 +434,15 @@ def namedtuple(typename, field_names, verbose=False, rename=False): # For pickling to work, the __module__ variable needs to be set to the frame # where the named tuple is created. Bypass this step in environments where # sys._getframe is not defined (Jython for example) or sys._getframe is not - # defined for arguments greater than 0 (IronPython). - try: - result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - pass + # defined for arguments greater than 0 (IronPython), or where the user has + # specified a particular module. + if module is None: + try: + module = _sys._getframe(1).f_globals.get('__name__', '__main__') + except (AttributeError, ValueError): + pass + if module is not None: + result.__module__ = module return result @@ -845,7 +846,7 @@ class Counter(dict): ######################################################################## -### ChainMap (helper for configparser and string.Template) +### ChainMap ######################################################################## class ChainMap(MutableMapping): @@ -972,7 +973,7 @@ class UserDict(MutableMapping): dict = kwargs.pop('dict') import warnings warnings.warn("Passing 'dict' as keyword argument is deprecated", - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) else: dict = None self.data = {} diff --git a/Lib/collections/__main__.py b/Lib/collections/__main__.py deleted file mode 100644 index 763e38e..0000000 --- a/Lib/collections/__main__.py +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -### Simple tests -################################################################################ - -# verify that instances can be pickled -from collections import namedtuple -from pickle import loads, dumps -Point = namedtuple('Point', 'x, y', True) -p = Point(x=10, y=20) -assert p == loads(dumps(p)) - -# test and demonstrate ability to override methods -class Point(namedtuple('Point', 'x y')): - __slots__ = () - @property - def hypot(self): - return (self.x ** 2 + self.y ** 2) ** 0.5 - def __str__(self): - return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) - -for p in Point(3, 4), Point(14, 5/7.): - print (p) - -class Point(namedtuple('Point', 'x y')): - 'Point class with optimized _make() and _replace() without error-checking' - __slots__ = () - _make = classmethod(tuple.__new__) - def _replace(self, _map=map, **kwds): - return self._make(_map(kwds.get, ('x', 'y'), self)) - -print(Point(11, 22)._replace(x=100)) - -Point3D = namedtuple('Point3D', Point._fields + ('z',)) -print(Point3D.__doc__) - -import doctest, collections -TestResults = namedtuple('TestResults', 'failed attempted') -print(TestResults(*doctest.testmod(collections))) diff --git a/Lib/compileall.py b/Lib/compileall.py index 2d4c523..1c9ceb6 100644 --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -25,6 +25,8 @@ from functools import partial __all__ = ["compile_dir","compile_file","compile_path"] def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0): + if quiet < 2 and isinstance(dir, os.PathLike): + dir = os.fspath(dir) if not quiet: print('Listing {!r}...'.format(dir)) try: @@ -71,7 +73,7 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, files = _walk_dir(dir, quiet=quiet, maxlevels=maxlevels, ddir=ddir) - success = 1 + success = True if workers is not None and workers != 1 and ProcessPoolExecutor is not None: workers = workers or None with ProcessPoolExecutor(max_workers=workers) as executor: @@ -81,12 +83,12 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, legacy=legacy, optimize=optimize), files) - success = min(results, default=1) + success = min(results, default=True) else: for file in files: if not compile_file(file, ddir, force, rx, quiet, legacy, optimize): - success = 0 + success = False return success def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, @@ -104,7 +106,9 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, legacy: if True, produce legacy pyc paths instead of PEP 3147 paths optimize: optimization level or -1 for level of the interpreter """ - success = 1 + success = True + if quiet < 2 and isinstance(fullname, os.PathLike): + fullname = os.fspath(fullname) name = os.path.basename(fullname) if ddir is not None: dfile = os.path.join(ddir, name) @@ -144,7 +148,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, ok = py_compile.compile(fullname, cfile, dfile, True, optimize=optimize) except py_compile.PyCompileError as err: - success = 0 + success = False if quiet >= 2: return success elif quiet: @@ -157,7 +161,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, msg = msg.decode(sys.stdout.encoding) print(msg) except (SyntaxError, UnicodeError, OSError) as e: - success = 0 + success = False if quiet >= 2: return success elif quiet: @@ -167,7 +171,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, print(e.__class__.__name__ + ':', e) else: if ok == 0: - success = 0 + success = False return success def compile_path(skip_curdir=1, maxlevels=0, force=False, quiet=0, @@ -183,7 +187,7 @@ def compile_path(skip_curdir=1, maxlevels=0, force=False, quiet=0, legacy: as for compile_dir() (default False) optimize: as for compile_dir() (default -1) """ - success = 1 + success = True for dir in sys.path: if (not dir or dir == os.curdir) and skip_curdir: if quiet < 2: diff --git a/Lib/concurrent/futures/thread.py b/Lib/concurrent/futures/thread.py index 9c3aec9..03d276b 100644 --- a/Lib/concurrent/futures/thread.py +++ b/Lib/concurrent/futures/thread.py @@ -81,12 +81,13 @@ def _worker(executor_reference, work_queue): _base.LOGGER.critical('Exception in worker', exc_info=True) class ThreadPoolExecutor(_base.Executor): - def __init__(self, max_workers=None): + def __init__(self, max_workers=None, thread_name_prefix=''): """Initializes a new ThreadPoolExecutor instance. Args: max_workers: The maximum number of threads that can be used to execute the given calls. + thread_name_prefix: An optional name prefix to give our threads. """ if max_workers is None: # Use this number because ThreadPoolExecutor is often @@ -100,6 +101,7 @@ class ThreadPoolExecutor(_base.Executor): self._threads = set() self._shutdown = False self._shutdown_lock = threading.Lock() + self._thread_name_prefix = thread_name_prefix def submit(self, fn, *args, **kwargs): with self._shutdown_lock: @@ -121,8 +123,11 @@ class ThreadPoolExecutor(_base.Executor): q.put(None) # TODO(bquinlan): Should avoid creating new threads if there are more # idle threads than items in the work queue. - if len(self._threads) < self._max_workers: - t = threading.Thread(target=_worker, + num_threads = len(self._threads) + if num_threads < self._max_workers: + thread_name = '%s_%d' % (self._thread_name_prefix or self, + num_threads) + t = threading.Thread(name=thread_name, target=_worker, args=(weakref.ref(self, weakref_cb), self._work_queue)) t.daemon = True diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 5371a9f..7d94a57 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -1,11 +1,34 @@ """Utilities for with-statement contexts. See PEP 343.""" - +import abc import sys from collections import deque from functools import wraps -__all__ = ["contextmanager", "closing", "ContextDecorator", "ExitStack", - "redirect_stdout", "redirect_stderr", "suppress"] +__all__ = ["contextmanager", "closing", "AbstractContextManager", + "ContextDecorator", "ExitStack", "redirect_stdout", + "redirect_stderr", "suppress"] + + +class AbstractContextManager(abc.ABC): + + """An abstract base class for context managers.""" + + def __enter__(self): + """Return `self` upon entering the runtime context.""" + return self + + @abc.abstractmethod + def __exit__(self, exc_type, exc_value, traceback): + """Raise any exception triggered within the runtime context.""" + return None + + @classmethod + def __subclasshook__(cls, C): + if cls is AbstractContextManager: + if (any("__enter__" in B.__dict__ for B in C.__mro__) and + any("__exit__" in B.__dict__ for B in C.__mro__)): + return True + return NotImplemented class ContextDecorator(object): @@ -31,7 +54,7 @@ class ContextDecorator(object): return inner -class _GeneratorContextManager(ContextDecorator): +class _GeneratorContextManager(ContextDecorator, AbstractContextManager): """Helper for @contextmanager decorator.""" def __init__(self, func, args, kwds): @@ -65,7 +88,7 @@ class _GeneratorContextManager(ContextDecorator): try: next(self.gen) except StopIteration: - return False + return else: raise RuntimeError("generator didn't stop") else: @@ -75,19 +98,20 @@ class _GeneratorContextManager(ContextDecorator): value = type() try: self.gen.throw(type, value, traceback) + raise RuntimeError("generator didn't stop after throw()") except StopIteration as exc: # Suppress StopIteration *unless* it's the same exception that # was passed to throw(). This prevents a StopIteration # raised inside the "with" statement from being suppressed. return exc is not value except RuntimeError as exc: - # Don't re-raise the passed in exception. (issue27122) + # Don't re-raise the passed in exception. (issue27112) if exc is value: return False # Likewise, avoid suppressing if a StopIteration exception # was passed to throw() and later wrapped into a RuntimeError # (see PEP 479). - if type is StopIteration and exc.__cause__ is value: + if exc.__cause__ is value: return False raise except: @@ -98,10 +122,8 @@ class _GeneratorContextManager(ContextDecorator): # fixes the impedance mismatch between the throw() protocol # and the __exit__() protocol. # - if sys.exc_info()[1] is value: - return False - raise - raise RuntimeError("generator didn't stop after throw()") + if sys.exc_info()[1] is not value: + raise def contextmanager(func): @@ -138,7 +160,7 @@ def contextmanager(func): return helper -class closing(object): +class closing(AbstractContextManager): """Context to automatically close something at the end of a block. Code like this: @@ -163,7 +185,7 @@ class closing(object): self.thing.close() -class _RedirectStream: +class _RedirectStream(AbstractContextManager): _stream = None @@ -203,7 +225,7 @@ class redirect_stderr(_RedirectStream): _stream = "stderr" -class suppress: +class suppress(AbstractContextManager): """Context manager to suppress specified exceptions After the exception is suppressed, execution proceeds with the next @@ -234,7 +256,7 @@ class suppress: # Inspired by discussions on http://bugs.python.org/issue13585 -class ExitStack(object): +class ExitStack(AbstractContextManager): """Context manager for dynamic management of a stack of exit callbacks For example: @@ -313,9 +335,6 @@ class ExitStack(object): """Immediately unwind the context stack""" self.__exit__(None, None, None) - def __enter__(self): - return self - def __exit__(self, *exc_details): received_exc = exc_details[0] is not None diff --git a/Lib/copy.py b/Lib/copy.py index 972b94a..f86040a 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -51,7 +51,6 @@ __getstate__() and __setstate__(). See the documentation for module import types import weakref from copyreg import dispatch_table -import builtins class Error(Exception): pass @@ -102,37 +101,33 @@ def copy(x): else: raise Error("un(shallow)copyable object of type %s" % cls) - return _reconstruct(x, rv, 0) + if isinstance(rv, str): + return x + return _reconstruct(x, None, *rv) _copy_dispatch = d = {} def _copy_immutable(x): return x -for t in (type(None), int, float, bool, str, tuple, - bytes, frozenset, type, range, - types.BuiltinFunctionType, type(Ellipsis), +for t in (type(None), int, float, bool, complex, str, tuple, + bytes, frozenset, type, range, slice, + types.BuiltinFunctionType, type(Ellipsis), type(NotImplemented), types.FunctionType, weakref.ref): d[t] = _copy_immutable t = getattr(types, "CodeType", None) if t is not None: d[t] = _copy_immutable -for name in ("complex", "unicode"): - t = getattr(builtins, name, None) - if t is not None: - d[t] = _copy_immutable - -def _copy_with_constructor(x): - return type(x)(x) -for t in (list, dict, set): - d[t] = _copy_with_constructor - -def _copy_with_copy_method(x): - return x.copy() + +d[list] = list.copy +d[dict] = dict.copy +d[set] = set.copy +d[bytearray] = bytearray.copy + if PyStringMap is not None: - d[PyStringMap] = _copy_with_copy_method + d[PyStringMap] = PyStringMap.copy -del d +del d, t def deepcopy(x, memo=None, _nil=[]): """Deep copy operation on arbitrary Python objects. @@ -179,7 +174,10 @@ def deepcopy(x, memo=None, _nil=[]): else: raise Error( "un(deep)copyable object of type %s" % cls) - y = _reconstruct(x, rv, 1, memo) + if isinstance(rv, str): + y = x + else: + y = _reconstruct(x, memo, *rv) # If is its own copy, don't memoize. if y is not x: @@ -193,13 +191,11 @@ def _deepcopy_atomic(x, memo): return x d[type(None)] = _deepcopy_atomic d[type(Ellipsis)] = _deepcopy_atomic +d[type(NotImplemented)] = _deepcopy_atomic d[int] = _deepcopy_atomic d[float] = _deepcopy_atomic d[bool] = _deepcopy_atomic -try: - d[complex] = _deepcopy_atomic -except NameError: - pass +d[complex] = _deepcopy_atomic d[bytes] = _deepcopy_atomic d[str] = _deepcopy_atomic try: @@ -211,15 +207,16 @@ d[types.BuiltinFunctionType] = _deepcopy_atomic d[types.FunctionType] = _deepcopy_atomic d[weakref.ref] = _deepcopy_atomic -def _deepcopy_list(x, memo): +def _deepcopy_list(x, memo, deepcopy=deepcopy): y = [] memo[id(x)] = y + append = y.append for a in x: - y.append(deepcopy(a, memo)) + append(deepcopy(a, memo)) return y d[list] = _deepcopy_list -def _deepcopy_tuple(x, memo): +def _deepcopy_tuple(x, memo, deepcopy=deepcopy): y = [deepcopy(a, memo) for a in x] # We're not going to put the tuple in the memo, but it's still important we # check for it, in case the tuple contains recursive mutable structures. @@ -236,7 +233,7 @@ def _deepcopy_tuple(x, memo): return y d[tuple] = _deepcopy_tuple -def _deepcopy_dict(x, memo): +def _deepcopy_dict(x, memo, deepcopy=deepcopy): y = {} memo[id(x)] = y for key, value in x.items(): @@ -248,7 +245,9 @@ if PyStringMap is not None: def _deepcopy_method(x, memo): # Copy instance methods return type(x)(x.__func__, deepcopy(x.__self__, memo)) -_deepcopy_dispatch[types.MethodType] = _deepcopy_method +d[types.MethodType] = _deepcopy_method + +del d def _keep_alive(x, memo): """Keeps a reference to the object x in the memo. @@ -266,31 +265,15 @@ def _keep_alive(x, memo): # aha, this is the first one :-) memo[id(memo)]=[x] -def _reconstruct(x, info, deep, memo=None): - if isinstance(info, str): - return x - assert isinstance(info, tuple) - if memo is None: - memo = {} - n = len(info) - assert n in (2, 3, 4, 5) - callable, args = info[:2] - if n > 2: - state = info[2] - else: - state = None - if n > 3: - listiter = info[3] - else: - listiter = None - if n > 4: - dictiter = info[4] - else: - dictiter = None +def _reconstruct(x, memo, func, args, + state=None, listiter=None, dictiter=None, + deepcopy=deepcopy): + deep = memo is not None + if deep and args: + args = (deepcopy(arg, memo) for arg in args) + y = func(*args) if deep: - args = deepcopy(args, memo) - y = callable(*args) - memo[id(x)] = y + memo[id(x)] = y if state is not None: if deep: @@ -309,22 +292,22 @@ def _reconstruct(x, info, deep, memo=None): setattr(y, key, value) if listiter is not None: - for item in listiter: - if deep: + if deep: + for item in listiter: item = deepcopy(item, memo) - y.append(item) + y.append(item) + else: + for item in listiter: + y.append(item) if dictiter is not None: - for key, value in dictiter: - if deep: + if deep: + for key, value in dictiter: key = deepcopy(key, memo) value = deepcopy(value, memo) - y[key] = value + y[key] = value + else: + for key, value in dictiter: + y[key] = value return y -del d - -del types - -# Helper for instance creation without calling __init__ -class _EmptyClass: - pass +del types, weakref, PyStringMap diff --git a/Lib/crypt.py b/Lib/crypt.py index 49ab96e..fbc5f4c 100644 --- a/Lib/crypt.py +++ b/Lib/crypt.py @@ -54,9 +54,8 @@ METHOD_SHA256 = _Method('SHA256', '5', 16, 63) METHOD_SHA512 = _Method('SHA512', '6', 16, 106) methods = [] -for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5): +for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5, METHOD_CRYPT): _result = crypt('', _method) if _result and len(_result) == _method.total_size: methods.append(_method) -methods.append(METHOD_CRYPT) del _result, _method diff --git a/Lib/csv.py b/Lib/csv.py index ca40e5e..0349e0b 100644 --- a/Lib/csv.py +++ b/Lib/csv.py @@ -11,13 +11,15 @@ from _csv import Error, __version__, writer, reader, register_dialect, \ __doc__ from _csv import Dialect as _Dialect +from collections import OrderedDict from io import StringIO -__all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", - "Error", "Dialect", "__doc__", "excel", "excel_tab", - "field_size_limit", "reader", "writer", - "register_dialect", "get_dialect", "list_dialects", "Sniffer", - "unregister_dialect", "__version__", "DictReader", "DictWriter" ] +__all__ = ["QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", + "Error", "Dialect", "__doc__", "excel", "excel_tab", + "field_size_limit", "reader", "writer", + "register_dialect", "get_dialect", "list_dialects", "Sniffer", + "unregister_dialect", "__version__", "DictReader", "DictWriter", + "unix_dialect"] class Dialect: """Describe a CSV dialect. @@ -115,7 +117,7 @@ class DictReader: # values while row == []: row = next(self.reader) - d = dict(zip(self.fieldnames, row)) + d = OrderedDict(zip(self.fieldnames, row)) lf = len(self.fieldnames) lr = len(row) if lf < lr: @@ -143,7 +145,7 @@ class DictWriter: def _dict_to_list(self, rowdict): if self.extrasaction == "raise": - wrong_fields = [k for k in rowdict if k not in self.fieldnames] + wrong_fields = rowdict.keys() - self.fieldnames if wrong_fields: raise ValueError("dict contains fields not in fieldnames: " + ", ".join([repr(x) for x in wrong_fields])) @@ -213,10 +215,10 @@ class Sniffer: """ matches = [] - for restr in ('(?P[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?P=delim)', # ,".*?", - '(?:^|\n)(?P["\']).*?(?P=quote)(?P[^\w\n"\'])(?P ?)', # ".*?", - '(?P>[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?:$|\n)', # ,".*?" - '(?:^|\n)(?P["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) + for restr in (r'(?P[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?P=delim)', # ,".*?", + r'(?:^|\n)(?P["\']).*?(?P=quote)(?P[^\w\n"\'])(?P ?)', # ".*?", + r'(?P>[^\w\n"\'])(?P ?)(?P["\']).*?(?P=quote)(?:$|\n)', # ,".*?" + r'(?:^|\n)(?P["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) regexp = re.compile(restr, re.DOTALL | re.MULTILINE) matches = regexp.findall(data) if matches: diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index 1469b8b..1c9d3a5 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -16,7 +16,7 @@ from struct import calcsize as _calcsize if __version__ != _ctypes_version: raise Exception("Version number mismatch", __version__, _ctypes_version) -if _os.name in ("nt", "ce"): +if _os.name == "nt": from _ctypes import FormatError DEFAULT_MODE = RTLD_LOCAL @@ -103,12 +103,9 @@ def CFUNCTYPE(restype, *argtypes, **kw): _c_functype_cache[(restype, argtypes, flags)] = CFunctionType return CFunctionType -if _os.name in ("nt", "ce"): +if _os.name == "nt": from _ctypes import LoadLibrary as _dlopen from _ctypes import FUNCFLAG_STDCALL as _FUNCFLAG_STDCALL - if _os.name == "ce": - # 'ce' doesn't have the stdcall calling convention - _FUNCFLAG_STDCALL = _FUNCFLAG_CDECL _win_functype_cache = {} def WINFUNCTYPE(restype, *argtypes, **kw): @@ -262,7 +259,7 @@ class c_wchar(_SimpleCData): def _reset_cache(): _pointer_type_cache.clear() _c_functype_cache.clear() - if _os.name in ("nt", "ce"): + if _os.name == "nt": _win_functype_cache.clear() # _SimpleCData.c_wchar_p_from_param POINTER(c_wchar).from_param = c_wchar_p.from_param @@ -327,10 +324,6 @@ class CDLL(object): """ _func_flags_ = _FUNCFLAG_CDECL _func_restype_ = c_int - # default values for repr - _name = '' - _handle = 0 - _FuncPtr = None def __init__(self, name, mode=DEFAULT_MODE, handle=None, use_errno=False, @@ -378,7 +371,7 @@ class PyDLL(CDLL): """ _func_flags_ = _FUNCFLAG_CDECL | _FUNCFLAG_PYTHONAPI -if _os.name in ("nt", "ce"): +if _os.name == "nt": class WinDLL(CDLL): """This class represents a dll exporting functions using the @@ -431,7 +424,7 @@ class LibraryLoader(object): cdll = LibraryLoader(CDLL) pydll = LibraryLoader(PyDLL) -if _os.name in ("nt", "ce"): +if _os.name == "nt": pythonapi = PyDLL("python dll", None, _sys.dllhandle) elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) @@ -439,7 +432,7 @@ else: pythonapi = PyDLL(None) -if _os.name in ("nt", "ce"): +if _os.name == "nt": windll = LibraryLoader(WinDLL) oledll = LibraryLoader(OleDLL) @@ -507,7 +500,7 @@ else: return _wstring_at(ptr, size) -if _os.name in ("nt", "ce"): # COM stuff +if _os.name == "nt": # COM stuff def DllGetClassObject(rclsid, riid, ppv): try: ccom = __import__("comtypes.server.inprocserver", globals(), locals(), ['*']) diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py index b39d82c..c71d71d 100644 --- a/Lib/ctypes/test/test_bitfields.py +++ b/Lib/ctypes/test/test_bitfields.py @@ -3,7 +3,6 @@ from ctypes.test import need_symbol import unittest import os -import ctypes import _ctypes_test class BITS(Structure): @@ -197,7 +196,7 @@ class BitFieldTest(unittest.TestCase): class X(Structure): _fields_ = [("a", c_byte, 4), ("b", c_int, 4)] - if os.name in ("nt", "ce"): + if os.name == "nt": self.assertEqual(sizeof(X), sizeof(c_int)*2) else: self.assertEqual(sizeof(X), sizeof(c_int)) @@ -225,7 +224,7 @@ class BitFieldTest(unittest.TestCase): # MSVC does NOT combine c_short and c_int into one field, GCC # does (unless GCC is run with '-mms-bitfields' which # produces code compatible with MSVC). - if os.name in ("nt", "ce"): + if os.name == "nt": self.assertEqual(sizeof(X), sizeof(c_int) * 4) else: self.assertEqual(sizeof(X), sizeof(c_int) * 2) diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py index f622093..8eac58f 100644 --- a/Lib/ctypes/test/test_callbacks.py +++ b/Lib/ctypes/test/test_callbacks.py @@ -244,7 +244,6 @@ class SampleCallbacksTestCase(unittest.TestCase): def test_callback_large_struct(self): class Check: pass - # This should mirror the structure in Modules/_ctypes/_ctypes_test.c class X(Structure): _fields_ = [ ('first', c_ulong), @@ -256,11 +255,6 @@ class SampleCallbacksTestCase(unittest.TestCase): check.first = s.first check.second = s.second check.third = s.third - # See issue #29565. - # The structure should be passed by value, so - # any changes to it should not be reflected in - # the value passed - s.first = s.second = s.third = 0x0badf00d check = Check() s = X() @@ -281,11 +275,6 @@ class SampleCallbacksTestCase(unittest.TestCase): self.assertEqual(check.first, 0xdeadbeef) self.assertEqual(check.second, 0xcafebabe) self.assertEqual(check.third, 0x0bad1dea) - # See issue #29565. - # Ensure that the original struct is unchanged. - self.assertEqual(s.first, check.first) - self.assertEqual(s.second, check.second) - self.assertEqual(s.third, check.third) ################################################################ diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py index 94b0b89..b99fdcb 100644 --- a/Lib/ctypes/test/test_find.py +++ b/Lib/ctypes/test/test_find.py @@ -69,5 +69,48 @@ class Test_OpenGL_libs(unittest.TestCase): self.assertFalse(os.path.lexists(test.support.TESTFN)) self.assertIsNone(result) + +@unittest.skipUnless(sys.platform.startswith('linux'), + 'Test only valid for Linux') +class LibPathFindTest(unittest.TestCase): + def test_find_on_libpath(self): + import subprocess + import tempfile + + try: + p = subprocess.Popen(['gcc', '--version'], stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + out, _ = p.communicate() + except OSError: + raise unittest.SkipTest('gcc, needed for test, not available') + with tempfile.TemporaryDirectory() as d: + # create an empty temporary file + srcname = os.path.join(d, 'dummy.c') + libname = 'py_ctypes_test_dummy' + dstname = os.path.join(d, 'lib%s.so' % libname) + with open(srcname, 'w') as f: + pass + self.assertTrue(os.path.exists(srcname)) + # compile the file to a shared library + cmd = ['gcc', '-o', dstname, '--shared', + '-Wl,-soname,lib%s.so' % libname, srcname] + out = subprocess.check_output(cmd) + self.assertTrue(os.path.exists(dstname)) + # now check that the .so can't be found (since not in + # LD_LIBRARY_PATH) + self.assertIsNone(find_library(libname)) + # now add the location to LD_LIBRARY_PATH + with test.support.EnvironmentVarGuard() as env: + KEY = 'LD_LIBRARY_PATH' + if KEY not in env: + v = d + else: + v = '%s:%s' % (env[KEY], d) + env.set(KEY, v) + # now check that the .so can be found (since in + # LD_LIBRARY_PATH) + self.assertEqual(find_library(libname), 'lib%s.so' % libname) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py index ff25c8f..f34734b 100644 --- a/Lib/ctypes/test/test_funcptr.py +++ b/Lib/ctypes/test/test_funcptr.py @@ -1,4 +1,4 @@ -import os, unittest +import unittest from ctypes import * try: @@ -39,7 +39,7 @@ class CFuncPtrTestCase(unittest.TestCase): # possible, as in C, to call cdecl functions with more parameters. #self.assertRaises(TypeError, c, 1, 2, 3) self.assertEqual(c(1, 2, 3, 4, 5, 6), 3) - if not WINFUNCTYPE is CFUNCTYPE and os.name != "ce": + if not WINFUNCTYPE is CFUNCTYPE: self.assertRaises(TypeError, s, 1, 2, 3) def test_structures(self): diff --git a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py index 3de457f..45571f3 100644 --- a/Lib/ctypes/test/test_loading.py +++ b/Lib/ctypes/test/test_loading.py @@ -11,8 +11,6 @@ def setUpModule(): global libc_name if os.name == "nt": libc_name = find_library("c") - elif os.name == "ce": - libc_name = "coredll" elif sys.platform == "cygwin": libc_name = "cygwin1.dll" else: @@ -49,8 +47,8 @@ class LoaderTest(unittest.TestCase): cdll.LoadLibrary(lib) CDLL(lib) - @unittest.skipUnless(os.name in ("nt", "ce"), - 'test specific to Windows (NT/CE)') + @unittest.skipUnless(os.name == "nt", + 'test specific to Windows') def test_load_library(self): # CRT is no longer directly loadable. See issue23606 for the # discussion about alternative approaches. @@ -64,16 +62,9 @@ class LoaderTest(unittest.TestCase): windll["kernel32"].GetModuleHandleW windll.LoadLibrary("kernel32").GetModuleHandleW WinDLL("kernel32").GetModuleHandleW - # embedded null character - self.assertRaises(ValueError, windll.LoadLibrary, "kernel32\0") - elif os.name == "ce": - windll.coredll.GetModuleHandleW - windll["coredll"].GetModuleHandleW - windll.LoadLibrary("coredll").GetModuleHandleW - WinDLL("coredll").GetModuleHandleW - - @unittest.skipUnless(os.name in ("nt", "ce"), - 'test specific to Windows (NT/CE)') + + @unittest.skipUnless(os.name == "nt", + 'test specific to Windows') def test_load_ordinal_functions(self): import _ctypes_test dll = WinDLL(_ctypes_test.__file__) diff --git a/Lib/ctypes/test/test_objects.py b/Lib/ctypes/test/test_objects.py index ef7b20b..19e3dc1 100644 --- a/Lib/ctypes/test/test_objects.py +++ b/Lib/ctypes/test/test_objects.py @@ -54,7 +54,7 @@ of 'x' ('_b_base_' is either None, or the root object owning the memory block): ''' -import unittest, doctest, sys +import unittest, doctest import ctypes.test.test_objects diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py index e56bccf..363f586 100644 --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -1,4 +1,4 @@ -import unittest, sys +import unittest from ctypes.test import need_symbol class SimpleTypesTestCase(unittest.TestCase): @@ -49,7 +49,7 @@ class SimpleTypesTestCase(unittest.TestCase): # XXX Replace by c_char_p tests def test_cstrings(self): - from ctypes import c_char_p, byref + from ctypes import c_char_p # c_char_p.from_param on a Python String packs the string # into a cparam object @@ -68,7 +68,7 @@ class SimpleTypesTestCase(unittest.TestCase): @need_symbol('c_wchar_p') def test_cw_strings(self): - from ctypes import byref, c_wchar_p + from ctypes import c_wchar_p c_wchar_p.from_param("123") @@ -98,7 +98,7 @@ class SimpleTypesTestCase(unittest.TestCase): def test_byref_pointer(self): # The from_param class method of POINTER(typ) classes accepts what is # returned by byref(obj), it type(obj) == typ - from ctypes import c_short, c_uint, c_int, c_long, pointer, POINTER, byref + from ctypes import c_short, c_uint, c_int, c_long, POINTER, byref LPINT = POINTER(c_int) LPINT.from_param(byref(c_int(42))) diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py index 32f802c..d68397e 100644 --- a/Lib/ctypes/test/test_pep3118.py +++ b/Lib/ctypes/test/test_pep3118.py @@ -1,6 +1,6 @@ import unittest from ctypes import * -import re, struct, sys +import re, sys if sys.byteorder == "little": THIS_ENDIAN = "<" diff --git a/Lib/ctypes/test/test_returnfuncptrs.py b/Lib/ctypes/test/test_returnfuncptrs.py index 93eba6b..1974f40 100644 --- a/Lib/ctypes/test/test_returnfuncptrs.py +++ b/Lib/ctypes/test/test_returnfuncptrs.py @@ -1,6 +1,5 @@ import unittest from ctypes import * -import os import _ctypes_test diff --git a/Lib/ctypes/test/test_sizes.py b/Lib/ctypes/test/test_sizes.py index f9b5e97..4ceacbc 100644 --- a/Lib/ctypes/test/test_sizes.py +++ b/Lib/ctypes/test/test_sizes.py @@ -2,7 +2,6 @@ from ctypes import * -import sys import unittest diff --git a/Lib/ctypes/test/test_slicing.py b/Lib/ctypes/test/test_slicing.py index a3932f1..240dc0c 100644 --- a/Lib/ctypes/test/test_slicing.py +++ b/Lib/ctypes/test/test_slicing.py @@ -134,7 +134,7 @@ class SlicesTestCase(unittest.TestCase): dll.my_wcsdup.restype = POINTER(c_wchar) dll.my_wcsdup.argtypes = POINTER(c_wchar), dll.my_free.restype = None - res = dll.my_wcsdup(s[:-1]) + res = dll.my_wcsdup(s) self.assertEqual(res[:len(s)], s) self.assertEqual(res[:len(s):], s) self.assertEqual(res[len(s)-1:-1:-1], s[::-1]) @@ -153,7 +153,7 @@ class SlicesTestCase(unittest.TestCase): dll.my_wcsdup.restype = POINTER(c_long) else: self.skipTest('Pointers to c_wchar are not supported') - res = dll.my_wcsdup(s[:-1]) + res = dll.my_wcsdup(s) tmpl = list(range(ord("a"), ord("z")+1)) self.assertEqual(res[:len(s)-1], tmpl) self.assertEqual(res[:len(s)-1:], tmpl) diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py index 2e9fc7c..8f6fe5f 100644 --- a/Lib/ctypes/test/test_structures.py +++ b/Lib/ctypes/test/test_structures.py @@ -2,8 +2,7 @@ import unittest from ctypes import * from ctypes.test import need_symbol from struct import calcsize -import _ctypes_test -import test.support +import _testcapi class SubclassesTest(unittest.TestCase): def test_subclass(self): @@ -202,10 +201,7 @@ class StructureTestCase(unittest.TestCase): "_pack_": -1} self.assertRaises(ValueError, type(Structure), "X", (Structure,), d) - @test.support.cpython_only - def test_packed_c_limits(self): # Issue 15989 - import _testcapi d = {"_fields_": [("a", c_byte)], "_pack_": _testcapi.INT_MAX + 1} self.assertRaises(ValueError, type(Structure), "X", (Structure,), d) @@ -330,11 +326,8 @@ class StructureTestCase(unittest.TestCase): cls, msg = self.get_except(Person, b"Someone", (b"a", b"b", b"c")) self.assertEqual(cls, RuntimeError) - if issubclass(Exception, object): - self.assertEqual(msg, - "(Phone) : too many initializers") - else: - self.assertEqual(msg, "(Phone) TypeError: too many initializers") + self.assertEqual(msg, + "(Phone) : too many initializers") def test_huge_field_name(self): # issue12881: segfault with large structure field names @@ -398,28 +391,6 @@ class StructureTestCase(unittest.TestCase): (1, 0, 0, 0, 0, 0)) self.assertRaises(TypeError, lambda: Z(1, 2, 3, 4, 5, 6, 7)) - def test_pass_by_value(self): - # This should mirror the structure in Modules/_ctypes/_ctypes_test.c - class X(Structure): - _fields_ = [ - ('first', c_ulong), - ('second', c_ulong), - ('third', c_ulong), - ] - - s = X() - s.first = 0xdeadbeef - s.second = 0xcafebabe - s.third = 0x0bad1dea - dll = CDLL(_ctypes_test.__file__) - func = dll._testfunc_large_struct_update_value - func.argtypes = (X,) - func.restype = None - func(s) - self.assertEqual(s.first, 0xdeadbeef) - self.assertEqual(s.second, 0xcafebabe) - self.assertEqual(s.third, 0x0bad1dea) - class PointerMemberTestCase(unittest.TestCase): def test(self): diff --git a/Lib/ctypes/test/test_values.py b/Lib/ctypes/test/test_values.py index 5a3a47f..e71b480 100644 --- a/Lib/ctypes/test/test_values.py +++ b/Lib/ctypes/test/test_values.py @@ -79,9 +79,9 @@ class PythonValuesTestCase(unittest.TestCase): continue items.append((entry.name.decode("ascii"), entry.size)) - expected = [("__hello__", 161), - ("__phello__", -161), - ("__phello__.spam", 161), + expected = [("__hello__", 139), + ("__phello__", -139), + ("__phello__.spam", 139), ] self.assertEqual(items, expected, "PyImport_FrozenModules example " "in Doc/library/ctypes.rst may be out of date") diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 7684eab..339ae8a 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -67,16 +67,6 @@ if os.name == "nt": return fname return None -if os.name == "ce": - # search path according to MSDN: - # - absolute path specified by filename - # - The .exe launch directory - # - the Windows directory - # - ROM dll files (where are they?) - # - OEM specified search path: HKLM\Loader\SystemPath - def find_library(name): - return name - if os.name == "posix" and sys.platform == "darwin": from ctypes.macholib.dyld import dyld_find as _dyld_find def find_library(name): @@ -271,8 +261,8 @@ elif os.name == "posix": abi_type = mach_map.get(machine, 'libc6') # XXX assuming GLIBC's ldconfig (with option -p) - regex = os.fsencode( - '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)) + regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' + regex = os.fsencode(regex % (re.escape(name), abi_type)) try: with subprocess.Popen(['/sbin/ldconfig', '-p'], stdin=subprocess.DEVNULL, @@ -285,8 +275,32 @@ elif os.name == "posix": except OSError: pass + def _findLib_ld(name): + # See issue #9998 for why this is needed + expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) + cmd = ['ld', '-t'] + libpath = os.environ.get('LD_LIBRARY_PATH') + if libpath: + for d in libpath.split(':'): + cmd.extend(['-L', d]) + cmd.extend(['-o', os.devnull, '-l%s' % name]) + result = None + try: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + universal_newlines=True) + out, _ = p.communicate() + res = re.search(expr, os.fsdecode(out)) + if res: + result = res.group(0) + except Exception as e: + pass # result will be None + return result + def find_library(name): - return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) + # See issue #9998 + return _findSoname_ldconfig(name) or \ + _get_soname(_findLib_gcc(name) or _findLib_ld(name)) ################################################################ # test code diff --git a/Lib/curses/ascii.py b/Lib/curses/ascii.py index 5b243be..6a466e0 100644 --- a/Lib/curses/ascii.py +++ b/Lib/curses/ascii.py @@ -53,19 +53,19 @@ def _ctoi(c): def isalnum(c): return isalpha(c) or isdigit(c) def isalpha(c): return isupper(c) or islower(c) -def isascii(c): return 0 <= _ctoi(c) <= 127 # ? +def isascii(c): return _ctoi(c) <= 127 # ? def isblank(c): return _ctoi(c) in (9, 32) -def iscntrl(c): return 0 <= _ctoi(c) <= 31 or _ctoi(c) == 127 -def isdigit(c): return 48 <= _ctoi(c) <= 57 -def isgraph(c): return 33 <= _ctoi(c) <= 126 -def islower(c): return 97 <= _ctoi(c) <= 122 -def isprint(c): return 32 <= _ctoi(c) <= 126 +def iscntrl(c): return _ctoi(c) <= 31 or _ctoi(c) == 127 +def isdigit(c): return _ctoi(c) >= 48 and _ctoi(c) <= 57 +def isgraph(c): return _ctoi(c) >= 33 and _ctoi(c) <= 126 +def islower(c): return _ctoi(c) >= 97 and _ctoi(c) <= 122 +def isprint(c): return _ctoi(c) >= 32 and _ctoi(c) <= 126 def ispunct(c): return isgraph(c) and not isalnum(c) def isspace(c): return _ctoi(c) in (9, 10, 11, 12, 13, 32) -def isupper(c): return 65 <= _ctoi(c) <= 90 +def isupper(c): return _ctoi(c) >= 65 and _ctoi(c) <= 90 def isxdigit(c): return isdigit(c) or \ - (65 <= _ctoi(c) <= 70) or (97 <= _ctoi(c) <= 102) -def isctrl(c): return 0 <= _ctoi(c) < 32 + (_ctoi(c) >= 65 and _ctoi(c) <= 70) or (_ctoi(c) >= 97 and _ctoi(c) <= 102) +def isctrl(c): return _ctoi(c) < 32 def ismeta(c): return _ctoi(c) > 127 def ascii(c): diff --git a/Lib/curses/textpad.py b/Lib/curses/textpad.py index 2079953..2b4b4cb 100644 --- a/Lib/curses/textpad.py +++ b/Lib/curses/textpad.py @@ -43,20 +43,16 @@ class Textbox: def __init__(self, win, insert_mode=False): self.win = win self.insert_mode = insert_mode - self._update_max_yx() + (self.maxy, self.maxx) = win.getmaxyx() + self.maxy = self.maxy - 1 + self.maxx = self.maxx - 1 self.stripspaces = 1 self.lastcmd = None win.keypad(1) - def _update_max_yx(self): - maxy, maxx = self.win.getmaxyx() - self.maxy = maxy - 1 - self.maxx = maxx - 1 - def _end_of_line(self, y): """Go to the location of the first blank on the given line, returning the index of the last non-blank character.""" - self._update_max_yx() last = self.maxx while True: if curses.ascii.ascii(self.win.inch(y, last)) != curses.ascii.SP: @@ -68,10 +64,8 @@ class Textbox: return last def _insert_printable_char(self, ch): - self._update_max_yx() (y, x) = self.win.getyx() - backyx = None - while y < self.maxy or x < self.maxx: + if y < self.maxy or x < self.maxx: if self.insert_mode: oldch = self.win.inch() # The try-catch ignores the error we trigger from some curses @@ -81,20 +75,14 @@ class Textbox: self.win.addch(ch) except curses.error: pass - if not self.insert_mode or not curses.ascii.isprint(oldch): - break - ch = oldch - (y, x) = self.win.getyx() - # Remember where to put the cursor back since we are in insert_mode - if backyx is None: - backyx = y, x - - if backyx is not None: - self.win.move(*backyx) + if self.insert_mode: + (backy, backx) = self.win.getyx() + if curses.ascii.isprint(oldch): + self._insert_printable_char(oldch) + self.win.move(backy, backx) def do_command(self, ch): "Process a single editing command." - self._update_max_yx() (y, x) = self.win.getyx() self.lastcmd = ch if curses.ascii.isprint(ch): @@ -160,7 +148,6 @@ class Textbox: def gather(self): "Collect and return the contents of the window." result = "" - self._update_max_yx() for y in range(self.maxy+1): self.win.move(y, 0) stop = self._end_of_line(y) diff --git a/Lib/datetime.py b/Lib/datetime.py index a2178c7..7540109 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -152,12 +152,26 @@ def _build_struct_time(y, m, d, hh, mm, ss, dstflag): dnum = _days_before_month(y, m) + d return _time.struct_time((y, m, d, hh, mm, ss, wday, dnum, dstflag)) -def _format_time(hh, mm, ss, us): - # Skip trailing microseconds when us==0. - result = "%02d:%02d:%02d" % (hh, mm, ss) - if us: - result += ".%06d" % us - return result +def _format_time(hh, mm, ss, us, timespec='auto'): + specs = { + 'hours': '{:02d}', + 'minutes': '{:02d}:{:02d}', + 'seconds': '{:02d}:{:02d}:{:02d}', + 'milliseconds': '{:02d}:{:02d}:{:02d}.{:03d}', + 'microseconds': '{:02d}:{:02d}:{:02d}.{:06d}' + } + + if timespec == 'auto': + # Skip trailing microseconds when us==0. + timespec = 'microseconds' if us else 'seconds' + elif timespec == 'milliseconds': + us //= 1000 + try: + fmt = specs[timespec] + except KeyError: + raise ValueError('Unknown timespec value') + else: + return fmt.format(hh, mm, ss, us) # Correctly substitute for %z and %Z escapes in strftime formats. def _wrap_strftime(object, format, timetuple): @@ -236,11 +250,11 @@ def _check_utc_offset(name, offset): if not isinstance(offset, timedelta): raise TypeError("tzinfo.%s() must return None " "or timedelta, not '%s'" % (name, type(offset))) - if offset % timedelta(minutes=1) or offset.microseconds: + if offset.microseconds: raise ValueError("tzinfo.%s() must return a whole number " - "of minutes, got %s" % (name, offset)) + "of seconds, got %s" % (name, offset)) if not -timedelta(1) < offset < timedelta(1): - raise ValueError("%s()=%s, must be must be strictly between " + raise ValueError("%s()=%s, must be strictly between " "-timedelta(hours=24) and timedelta(hours=24)" % (name, offset)) @@ -274,7 +288,7 @@ def _check_date_fields(year, month, day): raise ValueError('day must be in 1..%d' % dim, day) return year, month, day -def _check_time_fields(hour, minute, second, microsecond): +def _check_time_fields(hour, minute, second, microsecond, fold): hour = _check_int_field(hour) minute = _check_int_field(minute) second = _check_int_field(second) @@ -287,7 +301,9 @@ def _check_time_fields(hour, minute, second, microsecond): raise ValueError('second must be in 0..59', second) if not 0 <= microsecond <= 999999: raise ValueError('microsecond must be in 0..999999', microsecond) - return hour, minute, second, microsecond + if fold not in (0, 1): + raise ValueError('fold must be either 0 or 1', fold) + return hour, minute, second, microsecond, fold def _check_tzinfo_arg(tz): if tz is not None and not isinstance(tz, tzinfo): @@ -316,6 +332,7 @@ def _divide_and_round(a, b): return q + class timedelta: """Represent the difference between two datetime objects. @@ -932,6 +949,7 @@ date.min = date(1, 1, 1) date.max = date(9999, 12, 31) date.resolution = timedelta(days=1) + class tzinfo: """Abstract base class for time zone info classes. @@ -1023,11 +1041,11 @@ class time: dst() Properties (readonly): - hour, minute, second, microsecond, tzinfo + hour, minute, second, microsecond, tzinfo, fold """ - __slots__ = '_hour', '_minute', '_second', '_microsecond', '_tzinfo', '_hashcode' + __slots__ = '_hour', '_minute', '_second', '_microsecond', '_tzinfo', '_hashcode', '_fold' - def __new__(cls, hour=0, minute=0, second=0, microsecond=0, tzinfo=None): + def __new__(cls, hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0): """Constructor. Arguments: @@ -1035,15 +1053,16 @@ class time: hour, minute (required) second, microsecond (default to zero) tzinfo (default to None) + fold (keyword only, default to True) """ - if isinstance(hour, bytes) and len(hour) == 6 and hour[0] < 24: + if isinstance(hour, bytes) and len(hour) == 6 and hour[0]&0x7F < 24: # Pickle support self = object.__new__(cls) self.__setstate(hour, minute or None) self._hashcode = -1 return self - hour, minute, second, microsecond = _check_time_fields( - hour, minute, second, microsecond) + hour, minute, second, microsecond, fold = _check_time_fields( + hour, minute, second, microsecond, fold) _check_tzinfo_arg(tzinfo) self = object.__new__(cls) self._hour = hour @@ -1052,6 +1071,7 @@ class time: self._microsecond = microsecond self._tzinfo = tzinfo self._hashcode = -1 + self._fold = fold return self # Read-only field accessors @@ -1080,6 +1100,10 @@ class time: """timezone info object""" return self._tzinfo + @property + def fold(self): + return self._fold + # Standard conversions, __hash__ (and helpers) # Comparisons of time objects with other. @@ -1145,9 +1169,13 @@ class time: def __hash__(self): """Hash.""" if self._hashcode == -1: - tzoff = self.utcoffset() + if self.fold: + t = self.replace(fold=0) + else: + t = self + tzoff = t.utcoffset() if not tzoff: # zero or None - self._hashcode = hash(self._getstate()[0]) + self._hashcode = hash(t._getstate()[0]) else: h, m = divmod(timedelta(hours=self.hour, minutes=self.minute) - tzoff, timedelta(hours=1)) @@ -1171,10 +1199,11 @@ class time: else: sign = "+" hh, mm = divmod(off, timedelta(hours=1)) - assert not mm % timedelta(minutes=1), "whole minute" - mm //= timedelta(minutes=1) + mm, ss = divmod(mm, timedelta(minutes=1)) assert 0 <= hh < 24 off = "%s%02d%s%02d" % (sign, hh, sep, mm) + if ss: + off += ':%02d' % ss.seconds return off def __repr__(self): @@ -1191,16 +1220,22 @@ class time: if self._tzinfo is not None: assert s[-1:] == ")" s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")" + if self._fold: + assert s[-1:] == ")" + s = s[:-1] + ", fold=1)" return s - def isoformat(self): + def isoformat(self, timespec='auto'): """Return the time formatted according to ISO. - This is 'HH:MM:SS.mmmmmm+zz:zz', or 'HH:MM:SS+zz:zz' if - self.microsecond == 0. + The full format is 'HH:MM:SS.mmmmmm+zz:zz'. By default, the fractional + part is omitted if self.microsecond == 0. + + The optional argument timespec specifies the number of additional + terms of the time to include. """ s = _format_time(self._hour, self._minute, self._second, - self._microsecond) + self._microsecond, timespec) tz = self._tzstr() if tz: s += tz @@ -1266,7 +1301,7 @@ class time: return offset def replace(self, hour=None, minute=None, second=None, microsecond=None, - tzinfo=True): + tzinfo=True, *, fold=None): """Return a new time with new values for the specified fields.""" if hour is None: hour = self.hour @@ -1278,14 +1313,19 @@ class time: microsecond = self.microsecond if tzinfo is True: tzinfo = self.tzinfo - return time(hour, minute, second, microsecond, tzinfo) + if fold is None: + fold = self._fold + return time(hour, minute, second, microsecond, tzinfo, fold=fold) # Pickle support. - def _getstate(self): + def _getstate(self, protocol=3): us2, us3 = divmod(self._microsecond, 256) us1, us2 = divmod(us2, 256) - basestate = bytes([self._hour, self._minute, self._second, + h = self._hour + if self._fold and protocol > 3: + h += 128 + basestate = bytes([h, self._minute, self._second, us1, us2, us3]) if self._tzinfo is None: return (basestate,) @@ -1295,12 +1335,21 @@ class time: def __setstate(self, string, tzinfo): if tzinfo is not None and not isinstance(tzinfo, _tzinfo_class): raise TypeError("bad tzinfo state arg") - self._hour, self._minute, self._second, us1, us2, us3 = string + h, self._minute, self._second, us1, us2, us3 = string + if h > 127: + self._fold = 1 + self._hour = h - 128 + else: + self._fold = 0 + self._hour = h self._microsecond = (((us1 << 8) | us2) << 8) | us3 self._tzinfo = tzinfo + def __reduce_ex__(self, protocol): + return (time, self._getstate(protocol)) + def __reduce__(self): - return (time, self._getstate()) + return self.__reduce_ex__(2) _time_class = time # so functions w/ args named "time" can get at the class @@ -1317,16 +1366,16 @@ class datetime(date): __slots__ = date.__slots__ + time.__slots__ def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0, - microsecond=0, tzinfo=None): - if isinstance(year, bytes) and len(year) == 10 and 1 <= year[2] <= 12: + microsecond=0, tzinfo=None, *, fold=0): + if isinstance(year, bytes) and len(year) == 10 and 1 <= year[2]&0x7F <= 12: # Pickle support self = object.__new__(cls) self.__setstate(year, month) self._hashcode = -1 return self year, month, day = _check_date_fields(year, month, day) - hour, minute, second, microsecond = _check_time_fields( - hour, minute, second, microsecond) + hour, minute, second, microsecond, fold = _check_time_fields( + hour, minute, second, microsecond, fold) _check_tzinfo_arg(tzinfo) self = object.__new__(cls) self._year = year @@ -1338,6 +1387,7 @@ class datetime(date): self._microsecond = microsecond self._tzinfo = tzinfo self._hashcode = -1 + self._fold = fold return self # Read-only field accessors @@ -1366,6 +1416,10 @@ class datetime(date): """timezone info object""" return self._tzinfo + @property + def fold(self): + return self._fold + @classmethod def _fromtimestamp(cls, t, utc, tz): """Construct a datetime from a POSIX timestamp (like time.time()). @@ -1384,7 +1438,23 @@ class datetime(date): converter = _time.gmtime if utc else _time.localtime y, m, d, hh, mm, ss, weekday, jday, dst = converter(t) ss = min(ss, 59) # clamp out leap seconds if the platform has them - return cls(y, m, d, hh, mm, ss, us, tz) + result = cls(y, m, d, hh, mm, ss, us, tz) + if tz is None: + # As of version 2015f max fold in IANA database is + # 23 hours at 1969-09-30 13:00:00 in Kwajalein. + # Let's probe 24 hours in the past to detect a transition: + max_fold_seconds = 24 * 3600 + y, m, d, hh, mm, ss = converter(t - max_fold_seconds)[:6] + probe1 = cls(y, m, d, hh, mm, ss, us, tz) + trans = result - probe1 - timedelta(0, max_fold_seconds) + if trans.days < 0: + y, m, d, hh, mm, ss = converter(t + trans // timedelta(0, 1))[:6] + probe2 = cls(y, m, d, hh, mm, ss, us, tz) + if probe2 == result: + result._fold = 1 + else: + result = tz.fromutc(result) + return result @classmethod def fromtimestamp(cls, t, tz=None): @@ -1394,10 +1464,7 @@ class datetime(date): """ _check_tzinfo_arg(tz) - result = cls._fromtimestamp(t, tz is not None, tz) - if tz is not None: - result = tz.fromutc(result) - return result + return cls._fromtimestamp(t, tz is not None, tz) @classmethod def utcfromtimestamp(cls, t): @@ -1417,15 +1484,17 @@ class datetime(date): return cls.utcfromtimestamp(t) @classmethod - def combine(cls, date, time): + def combine(cls, date, time, tzinfo=True): "Construct a datetime from a given date and a given time." if not isinstance(date, _date_class): raise TypeError("date argument must be a date instance") if not isinstance(time, _time_class): raise TypeError("time argument must be a time instance") + if tzinfo is True: + tzinfo = time.tzinfo return cls(date.year, date.month, date.day, time.hour, time.minute, time.second, time.microsecond, - time.tzinfo) + tzinfo, fold=time.fold) def timetuple(self): "Return local time tuple compatible with time.localtime()." @@ -1440,12 +1509,46 @@ class datetime(date): self.hour, self.minute, self.second, dst) + def _mktime(self): + """Return integer POSIX timestamp.""" + epoch = datetime(1970, 1, 1) + max_fold_seconds = 24 * 3600 + t = (self - epoch) // timedelta(0, 1) + def local(u): + y, m, d, hh, mm, ss = _time.localtime(u)[:6] + return (datetime(y, m, d, hh, mm, ss) - epoch) // timedelta(0, 1) + + # Our goal is to solve t = local(u) for u. + a = local(t) - t + u1 = t - a + t1 = local(u1) + if t1 == t: + # We found one solution, but it may not be the one we need. + # Look for an earlier solution (if `fold` is 0), or a + # later one (if `fold` is 1). + u2 = u1 + (-max_fold_seconds, max_fold_seconds)[self.fold] + b = local(u2) - u2 + if a == b: + return u1 + else: + b = t1 - u1 + assert a != b + u2 = t - b + t2 = local(u2) + if t2 == t: + return u2 + if t1 == t: + return u1 + # We have found both offsets a and b, but neither t - a nor t - b is + # a solution. This means t is in the gap. + return (max, min)[self.fold](u1, u2) + + def timestamp(self): "Return POSIX timestamp as float" if self._tzinfo is None: - return _time.mktime((self.year, self.month, self.day, - self.hour, self.minute, self.second, - -1, -1, -1)) + self.microsecond / 1e6 + s = self._mktime() + return s + self.microsecond / 1e6 else: return (self - _EPOCH).total_seconds() @@ -1464,15 +1567,16 @@ class datetime(date): def time(self): "Return the time part, with tzinfo None." - return time(self.hour, self.minute, self.second, self.microsecond) + return time(self.hour, self.minute, self.second, self.microsecond, fold=self.fold) def timetz(self): "Return the time part, with same tzinfo." return time(self.hour, self.minute, self.second, self.microsecond, - self._tzinfo) + self._tzinfo, fold=self.fold) def replace(self, year=None, month=None, day=None, hour=None, - minute=None, second=None, microsecond=None, tzinfo=True): + minute=None, second=None, microsecond=None, tzinfo=True, + *, fold=None): """Return a new datetime with new values for the specified fields.""" if year is None: year = self.year @@ -1490,46 +1594,45 @@ class datetime(date): microsecond = self.microsecond if tzinfo is True: tzinfo = self.tzinfo - return datetime(year, month, day, hour, minute, second, microsecond, - tzinfo) + if fold is None: + fold = self.fold + return datetime(year, month, day, hour, minute, second, + microsecond, tzinfo, fold=fold) + + def _local_timezone(self): + if self.tzinfo is None: + ts = self._mktime() + else: + ts = (self - _EPOCH) // timedelta(seconds=1) + localtm = _time.localtime(ts) + local = datetime(*localtm[:6]) + try: + # Extract TZ data if available + gmtoff = localtm.tm_gmtoff + zone = localtm.tm_zone + except AttributeError: + delta = local - datetime(*_time.gmtime(ts)[:6]) + zone = _time.strftime('%Z', localtm) + tz = timezone(delta, zone) + else: + tz = timezone(timedelta(seconds=gmtoff), zone) + return tz def astimezone(self, tz=None): if tz is None: - if self.tzinfo is None: - raise ValueError("astimezone() requires an aware datetime") - ts = (self - _EPOCH) // timedelta(seconds=1) - localtm = _time.localtime(ts) - local = datetime(*localtm[:6]) - try: - # Extract TZ data if available - gmtoff = localtm.tm_gmtoff - zone = localtm.tm_zone - except AttributeError: - # Compute UTC offset and compare with the value implied - # by tm_isdst. If the values match, use the zone name - # implied by tm_isdst. - delta = local - datetime(*_time.gmtime(ts)[:6]) - dst = _time.daylight and localtm.tm_isdst > 0 - gmtoff = -(_time.altzone if dst else _time.timezone) - if delta == timedelta(seconds=gmtoff): - tz = timezone(delta, _time.tzname[dst]) - else: - tz = timezone(delta) - else: - tz = timezone(timedelta(seconds=gmtoff), zone) - + tz = self._local_timezone() elif not isinstance(tz, tzinfo): raise TypeError("tz argument must be an instance of tzinfo") mytz = self.tzinfo if mytz is None: - raise ValueError("astimezone() requires an aware datetime") + mytz = self._local_timezone() if tz is mytz: return self # Convert self to UTC, and attach the new time zone object. - myoffset = self.utcoffset() + myoffset = mytz.utcoffset(self) if myoffset is None: raise ValueError("astimezone() requires an aware datetime") utc = (self - myoffset).replace(tzinfo=tz) @@ -1549,21 +1652,25 @@ class datetime(date): self._hour, self._minute, self._second, self._year) - def isoformat(self, sep='T'): + def isoformat(self, sep='T', timespec='auto'): """Return the time formatted according to ISO. - This is 'YYYY-MM-DD HH:MM:SS.mmmmmm', or 'YYYY-MM-DD HH:MM:SS' if - self.microsecond == 0. + The full format looks like 'YYYY-MM-DD HH:MM:SS.mmmmmm'. + By default, the fractional part is omitted if self.microsecond == 0. If self.tzinfo is not None, the UTC offset is also attached, giving - 'YYYY-MM-DD HH:MM:SS.mmmmmm+HH:MM' or 'YYYY-MM-DD HH:MM:SS+HH:MM'. + giving a full format of 'YYYY-MM-DD HH:MM:SS.mmmmmm+HH:MM'. Optional argument sep specifies the separator between date and time, default 'T'. + + The optional argument timespec specifies the number of additional + terms of the time to include. """ s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day, sep) + _format_time(self._hour, self._minute, self._second, - self._microsecond)) + self._microsecond, timespec)) + off = self.utcoffset() if off is not None: if off.days < 0: @@ -1572,9 +1679,11 @@ class datetime(date): else: sign = "+" hh, mm = divmod(off, timedelta(hours=1)) - assert not mm % timedelta(minutes=1), "whole minute" - mm //= timedelta(minutes=1) + mm, ss = divmod(mm, timedelta(minutes=1)) s += "%s%02d:%02d" % (sign, hh, mm) + if ss: + assert not ss.microseconds + s += ":%02d" % ss.seconds return s def __repr__(self): @@ -1591,6 +1700,9 @@ class datetime(date): if self._tzinfo is not None: assert s[-1:] == ")" s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")" + if self._fold: + assert s[-1:] == ")" + s = s[:-1] + ", fold=1)" return s def __str__(self): @@ -1693,6 +1805,12 @@ class datetime(date): else: myoff = self.utcoffset() otoff = other.utcoffset() + # Assume that allow_mixed means that we are called from __eq__ + if allow_mixed: + if myoff != self.replace(fold=not self.fold).utcoffset(): + return 2 + if otoff != other.replace(fold=not other.fold).utcoffset(): + return 2 base_compare = myoff == otoff if base_compare: @@ -1760,9 +1878,13 @@ class datetime(date): def __hash__(self): if self._hashcode == -1: - tzoff = self.utcoffset() + if self.fold: + t = self.replace(fold=0) + else: + t = self + tzoff = t.utcoffset() if tzoff is None: - self._hashcode = hash(self._getstate()[0]) + self._hashcode = hash(t._getstate()[0]) else: days = _ymd2ord(self.year, self.month, self.day) seconds = self.hour * 3600 + self.minute * 60 + self.second @@ -1771,11 +1893,14 @@ class datetime(date): # Pickle support. - def _getstate(self): + def _getstate(self, protocol=3): yhi, ylo = divmod(self._year, 256) us2, us3 = divmod(self._microsecond, 256) us1, us2 = divmod(us2, 256) - basestate = bytes([yhi, ylo, self._month, self._day, + m = self._month + if self._fold and protocol > 3: + m += 128 + basestate = bytes([yhi, ylo, m, self._day, self._hour, self._minute, self._second, us1, us2, us3]) if self._tzinfo is None: @@ -1786,14 +1911,23 @@ class datetime(date): def __setstate(self, string, tzinfo): if tzinfo is not None and not isinstance(tzinfo, _tzinfo_class): raise TypeError("bad tzinfo state arg") - (yhi, ylo, self._month, self._day, self._hour, + (yhi, ylo, m, self._day, self._hour, self._minute, self._second, us1, us2, us3) = string + if m > 127: + self._fold = 1 + self._month = m - 128 + else: + self._fold = 0 + self._month = m self._year = yhi * 256 + ylo self._microsecond = (((us1 << 8) | us2) << 8) | us3 self._tzinfo = tzinfo + def __reduce_ex__(self, protocol): + return (self.__class__, self._getstate(protocol)) + def __reduce__(self): - return (self.__class__, self._getstate()) + return self.__reduce_ex__(2) datetime.min = datetime(1, 1, 1) @@ -1913,6 +2047,8 @@ class timezone(tzinfo): @staticmethod def _name_from_offset(delta): + if not delta: + return 'UTC' if delta < timedelta(0): sign = '-' delta = -delta diff --git a/Lib/dbm/dumb.py b/Lib/dbm/dumb.py index e6d6505..e7c6440 100644 --- a/Lib/dbm/dumb.py +++ b/Lib/dbm/dumb.py @@ -81,6 +81,11 @@ class _Database(collections.MutableMapping): try: f = _io.open(self._datfile, 'r', encoding="Latin-1") except OSError: + if flag not in ('c', 'n'): + import warnings + warnings.warn("The database file is missing, the " + "semantics of the 'c' flag will be used.", + DeprecationWarning, stacklevel=4) with _io.open(self._datfile, 'w', encoding="Latin-1") as f: self._chmod(self._datfile) else: @@ -92,9 +97,8 @@ class _Database(collections.MutableMapping): try: f = _io.open(self._dirfile, 'r', encoding="Latin-1") except OSError: - self._modified = not self._readonly + pass else: - self._modified = False with f: for line in f: line = line.rstrip() @@ -109,7 +113,7 @@ class _Database(collections.MutableMapping): # CAUTION: It's vital that _commit() succeed, and _commit() can # be called from __del__(). Therefore we must never reference a # global in this routine. - if self._index is None or not self._modified: + if self._index is None: return # nothing to do try: @@ -180,6 +184,10 @@ class _Database(collections.MutableMapping): f.write("%r, %r\n" % (key.decode("Latin-1"), pos_and_siz_pair)) def __setitem__(self, key, val): + if self._readonly: + import warnings + warnings.warn('The database is opened for reading only', + DeprecationWarning, stacklevel=2) if isinstance(key, str): key = key.encode('utf-8') elif not isinstance(key, (bytes, bytearray)): @@ -189,7 +197,6 @@ class _Database(collections.MutableMapping): elif not isinstance(val, (bytes, bytearray)): raise TypeError("values must be bytes or strings") self._verify_open() - self._modified = True if key not in self._index: self._addkey(key, self._addval(val)) else: @@ -215,10 +222,13 @@ class _Database(collections.MutableMapping): # (so that _commit() never gets called). def __delitem__(self, key): + if self._readonly: + import warnings + warnings.warn('The database is opened for reading only', + DeprecationWarning, stacklevel=2) if isinstance(key, str): key = key.encode('utf-8') self._verify_open() - self._modified = True # The blocks used by the associated value are lost. del self._index[key] # XXX It's unclear why we do a _commit() here (the code always @@ -304,4 +314,8 @@ def open(file, flag='c', mode=0o666): else: # Turn off any bits that are set in the umask mode = mode & (~um) + if flag not in ('r', 'w', 'c', 'n'): + import warnings + warnings.warn("Flag must be one of 'r', 'w', 'c', or 'n'", + DeprecationWarning, stacklevel=2) return _Database(file, mode, flag=flag) diff --git a/Lib/difflib.py b/Lib/difflib.py index 076bbac..2095a5e 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1415,7 +1415,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, import re # regular expression for finding intraline change indices - change_re = re.compile('(\++|\-+|\^+)') + change_re = re.compile(r'(\++|\-+|\^+)') # create the difference iterator to generate the differences diff_lines_iterator = ndiff(fromlines,tolines,linejunk,charjunk) diff --git a/Lib/dis.py b/Lib/dis.py index f7e3c7f..0794b7f 100644 --- a/Lib/dis.py +++ b/Lib/dis.py @@ -16,6 +16,8 @@ del _opcodes_all _have_code = (types.MethodType, types.FunctionType, types.CodeType, classmethod, staticmethod, type) +FORMAT_VALUE = opmap['FORMAT_VALUE'] + def _try_compile(source, name): """Attempts to compile the given source, first as an expression and then as a statement if the first approach fails. @@ -87,6 +89,7 @@ COMPILER_FLAG_NAMES = { 64: "NOFREE", 128: "COROUTINE", 256: "ITERABLE_COROUTINE", + 512: "ASYNC_GENERATOR", } def pretty_flags(flags): @@ -163,6 +166,15 @@ def show_code(co, *, file=None): _Instruction = collections.namedtuple("_Instruction", "opname opcode arg argval argrepr offset starts_line is_jump_target") +_Instruction.opname.__doc__ = "Human readable name for operation" +_Instruction.opcode.__doc__ = "Numeric code for operation" +_Instruction.arg.__doc__ = "Numeric argument to operation (if any), otherwise None" +_Instruction.argval.__doc__ = "Resolved arg value (if known), otherwise same as arg" +_Instruction.argrepr.__doc__ = "Human readable description of operation argument" +_Instruction.offset.__doc__ = "Start index of operation within bytecode sequence" +_Instruction.starts_line.__doc__ = "Line started by this opcode (if any), otherwise None" +_Instruction.is_jump_target.__doc__ = "True if other code jumps to here, otherwise False" + class Instruction(_Instruction): """Details for a bytecode operation @@ -276,7 +288,6 @@ def _get_instructions_bytes(code, varnames=None, names=None, constants=None, """ labels = findlabels(code) starts_line = None - free = None for offset, op, arg in _unpack_opargs(code): if linestarts is not None: starts_line = linestarts.get(offset, None) @@ -296,7 +307,7 @@ def _get_instructions_bytes(code, varnames=None, names=None, constants=None, elif op in hasname: argval, argrepr = _get_name_info(arg, names) elif op in hasjrel: - argval = offset + 3 + arg + argval = offset + 2 + arg argrepr = "to " + repr(argval) elif op in haslocal: argval, argrepr = _get_name_info(arg, varnames) @@ -305,8 +316,13 @@ def _get_instructions_bytes(code, varnames=None, names=None, constants=None, argrepr = argval elif op in hasfree: argval, argrepr = _get_name_info(arg, cells) - elif op in hasnargs: - argrepr = "%d positional, %d keyword pair" % (arg%256, arg//256) + elif op == FORMAT_VALUE: + argval = ((None, str, repr, ascii)[arg & 0x3], bool(arg & 0x4)) + argrepr = ('', 'str', 'repr', 'ascii')[arg & 0x3] + if argval[1]: + if argrepr: + argrepr += ', ' + argrepr += 'with format' yield Instruction(opname[op], op, arg, argval, argrepr, offset, starts_line, is_jump_target) @@ -343,23 +359,15 @@ def _disassemble_str(source, *, file=None): disco = disassemble # XXX For backwards compatibility def _unpack_opargs(code): - # enumerate() is not an option, since we sometimes process - # multiple elements on a single pass through the loop extended_arg = 0 - n = len(code) - i = 0 - while i < n: + for i in range(0, len(code), 2): op = code[i] - offset = i - i = i+1 - arg = None if op >= HAVE_ARGUMENT: - arg = code[i] + code[i+1]*256 + extended_arg - extended_arg = 0 - i = i+2 - if op == EXTENDED_ARG: - extended_arg = arg*65536 - yield (offset, op, arg) + arg = code[i+1] | extended_arg + extended_arg = (arg << 8) if op == EXTENDED_ARG else 0 + else: + arg = None + yield (i, op, arg) def findlabels(code): """Detect all offsets in a byte code which are jump targets. @@ -370,14 +378,14 @@ def findlabels(code): labels = [] for offset, op, arg in _unpack_opargs(code): if arg is not None: - label = -1 if op in hasjrel: - label = offset + 3 + arg + label = offset + 2 + arg elif op in hasjabs: label = arg - if label >= 0: - if label not in labels: - labels.append(label) + else: + continue + if label not in labels: + labels.append(label) return labels def findlinestarts(code): @@ -386,8 +394,8 @@ def findlinestarts(code): Generate pairs (offset, lineno) as described in Python/compile.c. """ - byte_increments = list(code.co_lnotab[0::2]) - line_increments = list(code.co_lnotab[1::2]) + byte_increments = code.co_lnotab[0::2] + line_increments = code.co_lnotab[1::2] lastlineno = None lineno = code.co_firstlineno @@ -398,6 +406,9 @@ def findlinestarts(code): yield (addr, lineno) lastlineno = lineno addr += byte_incr + if line_incr >= 0x80: + # line_increments is an array of 8-bit signed integers + line_incr -= 0x100 lineno += line_incr if lineno != lastlineno: yield (addr, lineno) diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index bed1384..78ae575 100644 --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -171,7 +171,7 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0): path = os.path.normpath(os.path.join(dirpath, name)) if os.path.isfile(path): zip.write(path, path) - log.info("adding '%s'" % path) + log.info("adding '%s'", path) zip.close() return zip_filename diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py index c89d5ef..939f795 100644 --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -221,7 +221,7 @@ class Command: self._ensure_stringlike(option, "string", default) def ensure_string_list(self, option): - """Ensure that 'option' is a list of strings. If 'option' is + r"""Ensure that 'option' is a list of strings. If 'option' is currently a string, we split it either on /,\s*/ or /\s+/, so "foo bar baz", "foo,bar,baz", and "foo, bar baz" all become ["foo", "bar", "baz"]. @@ -329,8 +329,7 @@ class Command: # -- External world manipulation ----------------------------------- def warn(self, msg): - log.warn("warning: %s: %s\n" % - (self.get_command_name(), msg)) + log.warn("warning: %s: %s\n", self.get_command_name(), msg) def execute(self, func, args, msg=None, level=1): util.execute(func, args, msg, dry_run=self.dry_run) diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py index f1bfb24..e9274d9 100644 --- a/Lib/distutils/command/bdist_dumb.py +++ b/Lib/distutils/command/bdist_dumb.py @@ -85,7 +85,7 @@ class bdist_dumb(Command): install.skip_build = self.skip_build install.warn_dir = 0 - log.info("installing to %s" % self.bdist_dir) + log.info("installing to %s", self.bdist_dir) self.run_command('install') # And make an archive relative to the root of the diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index b3cfe9c..a4bd5a5 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -199,7 +199,7 @@ class bdist_msi(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this" - target_version = sys.version[0:3] + target_version = '%d.%d' % sys.version_info[:2] plat_specifier = ".%s-%s" % (self.plat_name, target_version) build = self.get_finalized_command('build') build.build_lib = os.path.join(build.build_base, @@ -623,7 +623,7 @@ class bdist_msi(Command): cost = PyDialog(db, "DiskCostDlg", x, y, w, h, modal, title, "OK", "OK", "OK", bitmap=False) cost.text("Title", 15, 6, 200, 15, 0x30003, - "{\DlgFontBold8}Disk Space Requirements") + r"{\DlgFontBold8}Disk Space Requirements") cost.text("Description", 20, 20, 280, 20, 0x30003, "The disk space required for the installation of the selected features.") cost.text("Text", 20, 53, 330, 60, 3, @@ -670,7 +670,7 @@ class bdist_msi(Command): progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title, "Cancel", "Cancel", "Cancel", bitmap=False) progress.text("Title", 20, 15, 200, 15, 0x30003, - "{\DlgFontBold8}[Progress1] [ProductName]") + r"{\DlgFontBold8}[Progress1] [ProductName]") progress.text("Text", 35, 65, 300, 30, 3, "Please wait while the Installer [Progress2] [ProductName]. " "This may take several minutes.") diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 0c0e2c1..d3e1d3a 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -141,7 +141,7 @@ class bdist_wininst(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this" - target_version = sys.version[0:3] + target_version = '%d.%d' % sys.version_info[:2] plat_specifier = ".%s-%s" % (self.plat_name, target_version) build = self.get_finalized_command('build') build.build_lib = os.path.join(build.build_base, diff --git a/Lib/distutils/command/build.py b/Lib/distutils/command/build.py index 337dd0b..c6f52e6 100644 --- a/Lib/distutils/command/build.py +++ b/Lib/distutils/command/build.py @@ -81,7 +81,7 @@ class build(Command): "--plat-name only supported on Windows (try " "using './configure --help' on your platform)") - plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3]) + plat_specifier = ".%s-%d.%d" % (self.plat_name, *sys.version_info[:2]) # Make it so Python 2.x and Python 2.x with --with-pydebug don't # share the same build directories. Doing so confuses the build @@ -114,7 +114,7 @@ class build(Command): 'temp' + plat_specifier) if self.build_scripts is None: self.build_scripts = os.path.join(self.build_base, - 'scripts-' + sys.version[0:3]) + 'scripts-%d.%d' % sys.version_info[:2]) if self.executable is None: self.executable = os.path.normpath(sys.executable) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 7c278ef..74de782 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -364,9 +364,9 @@ class build_ext(Command): ext_name, build_info = ext - log.warn(("old-style (ext_name, build_info) tuple found in " - "ext_modules for extension '%s'" - "-- please convert to Extension instance" % ext_name)) + log.warn("old-style (ext_name, build_info) tuple found in " + "ext_modules for extension '%s'" + "-- please convert to Extension instance", ext_name) if not (isinstance(ext_name, str) and extension_name_re.match(ext_name)): diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py index 90a8380..ccc70e6 100644 --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py @@ -51,7 +51,7 @@ class build_scripts(Command): def copy_scripts(self): - """Copy each script listed in 'self.scripts'; if it's marked as a + r"""Copy each script listed in 'self.scripts'; if it's marked as a Python script in the Unix way (first line matches 'first_line_re', ie. starts with "\#!" and contains "python"), then adjust the first line to refer to the current Python interpreter as we copy. diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py index 847e858..4ae153d 100644 --- a/Lib/distutils/command/config.py +++ b/Lib/distutils/command/config.py @@ -9,7 +9,7 @@ configure-like tasks: "try to compile this C code", or "figure out where this header file lives". """ -import sys, os, re +import os, re from distutils.core import Command from distutils.errors import DistutilsExecError @@ -337,7 +337,7 @@ def dump_file(filename, head=None): If head is not None, will be dumped before the file content. """ if head is None: - log.info('%s' % filename) + log.info('%s', filename) else: log.info(head) file = open(filename) diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 67db007..0258d3d 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -175,6 +175,7 @@ class install(Command): self.compile = None self.optimize = None + # Deprecated # These two are for putting non-packagized distributions into their # own directory and creating a .pth file if it makes sense. # 'extra_path' comes from the setup file; 'install_path_file' can @@ -290,8 +291,8 @@ class install(Command): 'dist_version': self.distribution.get_version(), 'dist_fullname': self.distribution.get_fullname(), 'py_version': py_version, - 'py_version_short': py_version[0:3], - 'py_version_nodot': py_version[0] + py_version[2], + 'py_version_short': '%d.%d' % sys.version_info[:2], + 'py_version_nodot': '%d%d' % sys.version_info[:2], 'sys_prefix': prefix, 'prefix': prefix, 'sys_exec_prefix': exec_prefix, @@ -344,6 +345,7 @@ class install(Command): 'scripts', 'data', 'headers', 'userbase', 'usersite') + # Deprecated # Well, we're not actually fully completely finalized yet: we still # have to deal with 'extra_path', which is the hack for allowing # non-packagized module distributions (hello, Numerical Python!) to @@ -385,7 +387,7 @@ class install(Command): else: opt_name = opt_name.translate(longopt_xlate) val = getattr(self, opt_name) - log.debug(" %s: %s" % (opt_name, val)) + log.debug(" %s: %s", opt_name, val) def finalize_unix(self): """Finalizes options for posix platforms.""" @@ -490,6 +492,10 @@ class install(Command): self.extra_path = self.distribution.extra_path if self.extra_path is not None: + log.warn( + "Distribution option extra_path is deprecated. " + "See issue27919 for details." + ) if isinstance(self.extra_path, str): self.extra_path = self.extra_path.split(',') diff --git a/Lib/distutils/command/install_egg_info.py b/Lib/distutils/command/install_egg_info.py index c2a7d64..0ddc736 100644 --- a/Lib/distutils/command/install_egg_info.py +++ b/Lib/distutils/command/install_egg_info.py @@ -21,10 +21,10 @@ class install_egg_info(Command): def finalize_options(self): self.set_undefined_options('install_lib',('install_dir','install_dir')) - basename = "%s-%s-py%s.egg-info" % ( + basename = "%s-%s-py%d.%d.egg-info" % ( to_filename(safe_name(self.distribution.get_name())), to_filename(safe_version(self.distribution.get_version())), - sys.version[:3] + *sys.version_info[:2] ) self.target = os.path.join(self.install_dir, basename) self.outputs = [self.target] diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py index 86343c8..0fac94e 100644 --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -5,7 +5,7 @@ Implements the Distutils 'register' command (register with the repository). # created 2002/10/21, Richard Jones -import os, string, getpass +import getpass import io import urllib.parse, urllib.request from warnings import warn @@ -94,7 +94,7 @@ class register(PyPIRCCommand): ''' # send the info to the server and report the result (code, result) = self.post_to_server(self.build_post_data('verify')) - log.info('Server response (%s): %s' % (code, result)) + log.info('Server response (%s): %s', code, result) def send_metadata(self): ''' Send the metadata to the package index server. @@ -205,7 +205,7 @@ Your selection [default 1]: ''', log.INFO) data['email'] = input(' EMail: ') code, result = self.post_to_server(data) if code != 200: - log.info('Server response (%s): %s' % (code, result)) + log.info('Server response (%s): %s', code, result) else: log.info('You will receive an email shortly.') log.info(('Follow the instructions in it to ' @@ -216,7 +216,7 @@ Your selection [default 1]: ''', log.INFO) while not data['email']: data['email'] = input('Your email address: ') code, result = self.post_to_server(data) - log.info('Server response (%s): %s' % (code, result)) + log.info('Server response (%s): %s', code, result) def build_post_data(self, action): # figure the data to send - the metadata plus some additional diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index 7ea3d5f..4fd1d47 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -3,7 +3,6 @@ Implements the Distutils 'sdist' command (create a source distribution).""" import os -import string import sys from types import * from glob import glob @@ -92,9 +91,6 @@ class sdist(Command): negative_opt = {'no-defaults': 'use-defaults', 'no-prune': 'prune' } - default_format = {'posix': 'gztar', - 'nt': 'zip' } - sub_commands = [('check', checking_metadata)] def initialize_options(self): @@ -111,7 +107,7 @@ class sdist(Command): self.manifest_only = 0 self.force_manifest = 0 - self.formats = None + self.formats = ['gztar'] self.keep_temp = 0 self.dist_dir = None @@ -127,13 +123,6 @@ class sdist(Command): self.template = "MANIFEST.in" self.ensure_string_list('formats') - if self.formats is None: - try: - self.formats = [self.default_format[os.name]] - except KeyError: - raise DistutilsPlatformError( - "don't know how to create source distributions " - "on platform %s" % os.name) bad_format = archive_util.check_archive_formats(self.formats) if bad_format: @@ -423,7 +412,7 @@ class sdist(Command): log.info(msg) for file in files: if not os.path.isfile(file): - log.warn("'%s' not a regular file -- skipping" % file) + log.warn("'%s' not a regular file -- skipping", file) else: dest = os.path.join(base_dir, file) self.copy_file(file, dest, link=link) diff --git a/Lib/distutils/command/wininst-14.0-amd64.exe b/Lib/distutils/command/wininst-14.0-amd64.exe index 253c2e2..2229954 100644 Binary files a/Lib/distutils/command/wininst-14.0-amd64.exe and b/Lib/distutils/command/wininst-14.0-amd64.exe differ diff --git a/Lib/distutils/command/wininst-14.0.exe b/Lib/distutils/command/wininst-14.0.exe index 46f5f35..0dac110 100644 Binary files a/Lib/distutils/command/wininst-14.0.exe and b/Lib/distutils/command/wininst-14.0.exe differ diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py index f05b34b..d603d4a 100644 --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -204,16 +204,15 @@ def run_setup (script_name, script_args=None, stop_after="run"): global _setup_stop_after, _setup_distribution _setup_stop_after = stop_after - save_argv = sys.argv + save_argv = sys.argv.copy() g = {'__file__': script_name} - l = {} try: try: sys.argv[0] = script_name if script_args is not None: sys.argv[1:] = script_args with open(script_name, 'rb') as f: - exec(f.read(), g, l) + exec(f.read(), g) finally: sys.argv = save_argv _setup_stop_after = None diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py index c879646..1c36990 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -368,7 +368,7 @@ def check_config_h(): return (CONFIG_H_UNCERTAIN, "couldn't read '%s': %s" % (fn, exc.strerror)) -RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)') +RE_VERSION = re.compile(br'(\d+\.\d+(\.\d+)*)') def _find_exe_version(cmd): """Find the version of an executable by running `cmd` in the shell. diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index ffb33ff..62a2451 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -1018,8 +1018,7 @@ class DistributionMetadata: "maintainer", "maintainer_email", "url", "license", "description", "long_description", "keywords", "platforms", "fullname", "contact", - "contact_email", "license", "classifiers", - "download_url", + "contact_email", "classifiers", "download_url", # PEP 314 "provides", "requires", "obsoletes", ) diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py index 7efbb74..c507da3 100644 --- a/Lib/distutils/extension.py +++ b/Lib/distutils/extension.py @@ -4,7 +4,6 @@ Provides the Extension class, used to describe C/C++ extension modules in setup scripts.""" import os -import sys import warnings # This class is really only used by the "build_ext" command, so it might diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index 6522e69..c92d5fd 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -302,21 +302,26 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0): else: return pattern + # ditch start and end characters + start, _, end = glob_to_re('_').partition('_') + if pattern: pattern_re = glob_to_re(pattern) + assert pattern_re.startswith(start) and pattern_re.endswith(end) else: pattern_re = '' if prefix is not None: - # ditch end of pattern character - empty_pattern = glob_to_re('') - prefix_re = glob_to_re(prefix)[:-len(empty_pattern)] + prefix_re = glob_to_re(prefix) + assert prefix_re.startswith(start) and prefix_re.endswith(end) + prefix_re = prefix_re[len(start): len(prefix_re) - len(end)] sep = os.sep if os.sep == '\\': sep = r'\\' - pattern_re = "^" + sep.join((prefix_re, ".*" + pattern_re)) + pattern_re = pattern_re[len(start): len(pattern_re) - len(end)] + pattern_re = r'%s\A%s%s.*%s%s' % (start, prefix_re, sep, pattern_re, end) else: # no prefix -- respect anchor flag if anchor: - pattern_re = "^" + pattern_re + pattern_re = r'%s\A%s' % (start, pattern_re[len(start):]) return re.compile(pattern_re) diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py index 0b1fd19..2119127 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -716,7 +716,7 @@ class MSVCCompiler(CCompiler) : r"""VC\d{2}\.CRT("|').*?(/>|)""", re.DOTALL) manifest_buf = re.sub(pattern, "", manifest_buf) - pattern = "\s*" + pattern = r"\s*" manifest_buf = re.sub(pattern, "", manifest_buf) # Now see if any other assemblies are referenced - if not, we # don't want a manifest embedded. diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index bd19ebf..8bf1a70 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -70,7 +70,7 @@ def get_python_version(): leaving off the patchlevel. Sample return values could be '1.5' or '2.2'. """ - return sys.version[:3] + return '%d.%d' % sys.version_info[:2] def get_python_inc(plat_specific=0, prefix=None): @@ -93,11 +93,14 @@ def get_python_inc(plat_specific=0, prefix=None): # the build directory may not be the source directory, we # must use "srcdir" from the makefile to find the "Include" # directory. + base = _sys_home or project_base if plat_specific: - return _sys_home or project_base + return base + if _sys_home: + incdir = os.path.join(_sys_home, get_config_var('AST_H_DIR')) else: incdir = os.path.join(get_config_var('srcdir'), 'Include') - return os.path.normpath(incdir) + return os.path.normpath(incdir) python_dir = 'python' + get_python_version() + build_flags return os.path.join(prefix, "include", python_dir) elif os.name == "nt": @@ -239,6 +242,8 @@ def get_makefile_filename(): return os.path.join(_sys_home or project_base, "Makefile") lib_dir = get_python_lib(plat_specific=0, standard_lib=1) config_file = 'config-{}{}'.format(get_python_version(), build_flags) + if hasattr(sys.implementation, '_multiarch'): + config_file += '-%s' % sys.implementation._multiarch return os.path.join(lib_dir, config_file, 'Makefile') @@ -273,7 +278,7 @@ def parse_config_h(fp, g=None): # Regexes needed for parsing Makefile (and similar syntaxes, # like old-style Setup files). -_variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)") +_variable_rx = re.compile(r"([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)") _findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)") _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}") @@ -412,38 +417,18 @@ _config_vars = None def _init_posix(): """Initialize the module as appropriate for POSIX systems.""" - g = {} - # load the installed Makefile: - try: - filename = get_makefile_filename() - parse_makefile(filename, g) - except OSError as msg: - my_msg = "invalid Python installation: unable to open %s" % filename - if hasattr(msg, "strerror"): - my_msg = my_msg + " (%s)" % msg.strerror - - raise DistutilsPlatformError(my_msg) - - # load the installed pyconfig.h: - try: - filename = get_config_h_filename() - with open(filename) as file: - parse_config_h(file, g) - except OSError as msg: - my_msg = "invalid Python installation: unable to open %s" % filename - if hasattr(msg, "strerror"): - my_msg = my_msg + " (%s)" % msg.strerror - - raise DistutilsPlatformError(my_msg) - - # On AIX, there are wrong paths to the linker scripts in the Makefile - # -- these paths are relative to the Python source, but when installed - # the scripts are in another directory. - if python_build: - g['LDSHARED'] = g['BLDSHARED'] - + # _sysconfigdata is generated at build time, see the sysconfig module + name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', + '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( + abi=sys.abiflags, + platform=sys.platform, + multiarch=getattr(sys.implementation, '_multiarch', ''), + )) + _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) + build_time_vars = _temp.build_time_vars global _config_vars - _config_vars = g + _config_vars = {} + _config_vars.update(build_time_vars) def _init_nt(): diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py index c5962dd..d7c9feb 100644 --- a/Lib/distutils/tests/test_bdist_rpm.py +++ b/Lib/distutils/tests/test_bdist_rpm.py @@ -9,8 +9,6 @@ from distutils.core import Distribution from distutils.command.bdist_rpm import bdist_rpm from distutils.tests import support from distutils.spawn import find_executable -from distutils import spawn -from distutils.errors import DistutilsExecError SETUP_PY = """\ from distutils.core import setup @@ -96,7 +94,7 @@ class BuildRpmTestCase(support.TempdirManager, @unittest.skipIf(find_executable('rpmbuild') is None, 'the rpmbuild command is not found') def test_no_optimize_flag(self): - # let's create a package that breaks bdist_rpm + # let's create a package that brakes bdist_rpm tmp_dir = self.mkdtemp() os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation pkg_dir = os.path.join(tmp_dir, 'foo') diff --git a/Lib/distutils/tests/test_build.py b/Lib/distutils/tests/test_build.py index 3391f36..b020a5b 100644 --- a/Lib/distutils/tests/test_build.py +++ b/Lib/distutils/tests/test_build.py @@ -27,7 +27,7 @@ class BuildTestCase(support.TempdirManager, # build_platlib is 'build/lib.platform-x.x[-pydebug]' # examples: # build/lib.macosx-10.3-i386-2.7 - plat_spec = '.%s-%s' % (cmd.plat_name, sys.version[0:3]) + plat_spec = '.%s-%d.%d' % (cmd.plat_name, *sys.version_info[:2]) if hasattr(sys, 'gettotalrefcount'): self.assertTrue(cmd.build_platlib.endswith('-pydebug')) plat_spec += '-pydebug' @@ -42,7 +42,8 @@ class BuildTestCase(support.TempdirManager, self.assertEqual(cmd.build_temp, wanted) # build_scripts is build/scripts-x.x - wanted = os.path.join(cmd.build_base, 'scripts-' + sys.version[0:3]) + wanted = os.path.join(cmd.build_base, + 'scripts-%d.%d' % sys.version_info[:2]) self.assertEqual(cmd.build_scripts, wanted) # executable is os.path.normpath(sys.executable) diff --git a/Lib/distutils/tests/test_build_clib.py b/Lib/distutils/tests/test_build_clib.py index acc99e7..85d0990 100644 --- a/Lib/distutils/tests/test_build_clib.py +++ b/Lib/distutils/tests/test_build_clib.py @@ -3,7 +3,7 @@ import unittest import os import sys -from test.support import run_unittest +from test.support import run_unittest, missing_compiler_executable from distutils.command.build_clib import build_clib from distutils.errors import DistutilsSetupError @@ -116,19 +116,11 @@ class BuildCLibTestCase(support.TempdirManager, cmd.build_temp = build_temp cmd.build_clib = build_temp - # before we run the command, we want to make sure - # all commands are present on the system - # by creating a compiler and checking its executables - from distutils.ccompiler import new_compiler - from distutils.sysconfig import customize_compiler - - compiler = new_compiler() - customize_compiler(compiler) - for ccmd in compiler.executables.values(): - if ccmd is None: - continue - if find_executable(ccmd[0]) is None: - self.skipTest('The %r command is not found' % ccmd[0]) + # Before we run the command, we want to make sure + # all commands are present on the system. + ccmd = missing_compiler_executable() + if ccmd is not None: + self.skipTest('The %r command is not found' % ccmd) # this should work cmd.run() diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index ce13227..be7f5f3 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -37,17 +37,13 @@ class BuildExtTestCase(TempdirManager, from distutils.command import build_ext build_ext.USER_BASE = site.USER_BASE - # bpo-30132: On Windows, a .pdb file may be created in the current - # working directory. Create a temporary working directory to cleanup - # everything at the end of the test. - self.temp_cwd = support.temp_cwd() - self.temp_cwd.__enter__() - self.addCleanup(self.temp_cwd.__exit__, None, None, None) - def build_ext(self, *args, **kwargs): return build_ext(*args, **kwargs) def test_build_ext(self): + cmd = support.missing_compiler_executable() + if cmd is not None: + self.skipTest('The %r command is not found' % cmd) global ALREADY_TESTED copy_xxmodule_c(self.tmp_dir) xx_c = os.path.join(self.tmp_dir, 'xxmodule.c') @@ -173,7 +169,6 @@ class BuildExtTestCase(TempdirManager, cmd = self.build_ext(dist) cmd.finalize_options() - from distutils import sysconfig py_include = sysconfig.get_python_inc() self.assertIn(py_include, cmd.include_dirs) @@ -303,6 +298,9 @@ class BuildExtTestCase(TempdirManager, self.assertEqual(cmd.compiler, 'unix') def test_get_outputs(self): + cmd = support.missing_compiler_executable() + if cmd is not None: + self.skipTest('The %r command is not found' % cmd) tmp_dir = self.mkdtemp() c_file = os.path.join(tmp_dir, 'foo.c') self.write_file(c_file, 'void PyInit_foo(void) {}\n') diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py index 18283dc..0712e92 100644 --- a/Lib/distutils/tests/test_build_py.py +++ b/Lib/distutils/tests/test_build_py.py @@ -168,7 +168,8 @@ class BuildPyTestCase(support.TempdirManager, finally: sys.dont_write_bytecode = old_dont_write_bytecode - self.assertIn('byte-compiling is disabled', self.logs[0][1]) + self.assertIn('byte-compiling is disabled', + self.logs[0][1] % self.logs[0][2]) def test_suite(): diff --git a/Lib/distutils/tests/test_clean.py b/Lib/distutils/tests/test_clean.py index b64f300..c605afd 100644 --- a/Lib/distutils/tests/test_clean.py +++ b/Lib/distutils/tests/test_clean.py @@ -1,8 +1,6 @@ """Tests for distutils.command.clean.""" -import sys import os import unittest -import getpass from distutils.command.clean import clean from distutils.tests import support diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index a384497..77ef788 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -1,8 +1,6 @@ """Tests for distutils.pypirc.pypirc.""" -import sys import os import unittest -import tempfile from distutils.core import PyPIRCCommand from distutils.core import Distribution diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py index 0c8dbd8..6e566e7 100644 --- a/Lib/distutils/tests/test_config_cmd.py +++ b/Lib/distutils/tests/test_config_cmd.py @@ -2,7 +2,7 @@ import unittest import os import sys -from test.support import run_unittest +from test.support import run_unittest, missing_compiler_executable from distutils.command.config import dump_file, config from distutils.tests import support @@ -39,6 +39,9 @@ class ConfigTestCase(support.LoggingSilencer, @unittest.skipIf(sys.platform == 'win32', "can't test on Windows") def test_search_cpp(self): + cmd = missing_compiler_executable(['preprocessor']) + if cmd is not None: + self.skipTest('The %r command is not found' % cmd) pkg_dir, dist = self.create_dist() cmd = config(dist) diff --git a/Lib/distutils/tests/test_core.py b/Lib/distutils/tests/test_core.py index 654227c..27ce732 100644 --- a/Lib/distutils/tests/test_core.py +++ b/Lib/distutils/tests/test_core.py @@ -29,6 +29,21 @@ from distutils.core import setup setup() """ +setup_does_nothing = """\ +from distutils.core import setup +setup() +""" + + +setup_defines_subclass = """\ +from distutils.core import setup +from distutils.command.install import install as _install + +class install(_install): + sub_commands = _install.sub_commands + ['cmd'] + +setup(cmdclass={'install': install}) +""" class CoreTestCase(support.EnvironGuard, unittest.TestCase): @@ -67,6 +82,21 @@ class CoreTestCase(support.EnvironGuard, unittest.TestCase): distutils.core.run_setup( self.write_setup(setup_using___file__)) + def test_run_setup_preserves_sys_argv(self): + # Make sure run_setup does not clobber sys.argv + argv_copy = sys.argv.copy() + distutils.core.run_setup( + self.write_setup(setup_does_nothing)) + self.assertEqual(sys.argv, argv_copy) + + def test_run_setup_defines_subclass(self): + # Make sure the script can use __file__; if that's missing, the test + # setup.py script will raise NameError. + dist = distutils.core.run_setup( + self.write_setup(setup_defines_subclass)) + install = dist.get_command_obj('install') + self.assertIn('cmd', install.sub_commands) + def test_run_setup_uses_current_dir(self): # This tests that the setup script is run with the current directory # as its own current directory; this was temporarily broken by a diff --git a/Lib/distutils/tests/test_cygwinccompiler.py b/Lib/distutils/tests/test_cygwinccompiler.py index 8569216..9dc869d 100644 --- a/Lib/distutils/tests/test_cygwinccompiler.py +++ b/Lib/distutils/tests/test_cygwinccompiler.py @@ -3,11 +3,10 @@ import unittest import sys import os from io import BytesIO -import subprocess from test.support import run_unittest from distutils import cygwinccompiler -from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h, +from distutils.cygwinccompiler import (check_config_h, CONFIG_H_OK, CONFIG_H_NOTOK, CONFIG_H_UNCERTAIN, get_versions, get_msvcr) diff --git a/Lib/distutils/tests/test_dep_util.py b/Lib/distutils/tests/test_dep_util.py index 3e1c366..c6fae39 100644 --- a/Lib/distutils/tests/test_dep_util.py +++ b/Lib/distutils/tests/test_dep_util.py @@ -1,7 +1,6 @@ """Tests for distutils.dep_util.""" import unittest import os -import time from distutils.dep_util import newer, newer_pairwise, newer_group from distutils.errors import DistutilsFileError diff --git a/Lib/distutils/tests/test_file_util.py b/Lib/distutils/tests/test_file_util.py index a6d04f0..03040af 100644 --- a/Lib/distutils/tests/test_file_util.py +++ b/Lib/distutils/tests/test_file_util.py @@ -1,7 +1,6 @@ """Tests for distutils.file_util.""" import unittest import os -import shutil import errno from unittest.mock import patch diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py index 391af3c..c71342d 100644 --- a/Lib/distutils/tests/test_filelist.py +++ b/Lib/distutils/tests/test_filelist.py @@ -51,14 +51,14 @@ class FileListTestCase(support.LoggingSilencer, for glob, regex in ( # simple cases - ('foo*', r'foo[^%(sep)s]*\Z(?ms)'), - ('foo?', r'foo[^%(sep)s]\Z(?ms)'), - ('foo??', r'foo[^%(sep)s][^%(sep)s]\Z(?ms)'), + ('foo*', r'(?s:foo[^%(sep)s]*)\Z'), + ('foo?', r'(?s:foo[^%(sep)s])\Z'), + ('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])\Z'), # special cases - (r'foo\\*', r'foo\\\\[^%(sep)s]*\Z(?ms)'), - (r'foo\\\*', r'foo\\\\\\[^%(sep)s]*\Z(?ms)'), - ('foo????', r'foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s]\Z(?ms)'), - (r'foo\\??', r'foo\\\\[^%(sep)s][^%(sep)s]\Z(?ms)')): + (r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)\Z'), + (r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)\Z'), + ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'), + (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z')): regex = regex % {'sep': sep} self.assertEqual(glob_to_re(glob), regex) diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py index 9313330..287ab19 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -17,6 +17,7 @@ from distutils.errors import DistutilsOptionError from distutils.extension import Extension from distutils.tests import support +from test import support as test_support def _make_ext_name(modname): @@ -196,6 +197,9 @@ class InstallTestCase(support.TempdirManager, self.assertEqual(found, expected) def test_record_extensions(self): + cmd = test_support.missing_compiler_executable() + if cmd is not None: + self.skipTest('The %r command is not found' % cmd) install_dir = self.mkdtemp() project_dir, dist = self.create_dist(ext_modules=[ Extension('xx', ['xxmodule.c'])]) diff --git a/Lib/distutils/tests/test_install_data.py b/Lib/distutils/tests/test_install_data.py index 4d8c00a..32ab296 100644 --- a/Lib/distutils/tests/test_install_data.py +++ b/Lib/distutils/tests/test_install_data.py @@ -1,8 +1,6 @@ """Tests for distutils.command.install_data.""" -import sys import os import unittest -import getpass from distutils.command.install_data import install_data from distutils.tests import support diff --git a/Lib/distutils/tests/test_install_headers.py b/Lib/distutils/tests/test_install_headers.py index d953157..2217b32 100644 --- a/Lib/distutils/tests/test_install_headers.py +++ b/Lib/distutils/tests/test_install_headers.py @@ -1,8 +1,6 @@ """Tests for distutils.command.install_headers.""" -import sys import os import unittest -import getpass from distutils.command.install_headers import install_headers from distutils.tests import support diff --git a/Lib/distutils/tests/test_install_lib.py b/Lib/distutils/tests/test_install_lib.py index 5378aa8..fda6315 100644 --- a/Lib/distutils/tests/test_install_lib.py +++ b/Lib/distutils/tests/test_install_lib.py @@ -104,7 +104,8 @@ class InstallLibTestCase(support.TempdirManager, finally: sys.dont_write_bytecode = old_dont_write_bytecode - self.assertIn('byte-compiling is disabled', self.logs[0][1]) + self.assertIn('byte-compiling is disabled', + self.logs[0][1] % self.logs[0][2]) def test_suite(): diff --git a/Lib/distutils/tests/test_spawn.py b/Lib/distutils/tests/test_spawn.py index 6c7eb20..5edc24a 100644 --- a/Lib/distutils/tests/test_spawn.py +++ b/Lib/distutils/tests/test_spawn.py @@ -1,11 +1,11 @@ """Tests for distutils.spawn.""" import unittest +import sys import os -import time -from test.support import captured_stdout, run_unittest +from test.support import run_unittest, unix_shell from distutils.spawn import _nt_quote_args -from distutils.spawn import spawn, find_executable +from distutils.spawn import spawn from distutils.errors import DistutilsExecError from distutils.tests import support @@ -30,9 +30,9 @@ class SpawnTestCase(support.TempdirManager, # creating something executable # through the shell that returns 1 - if os.name == 'posix': + if sys.platform != 'win32': exe = os.path.join(tmpdir, 'foo.sh') - self.write_file(exe, '#!/bin/sh\nexit 1') + self.write_file(exe, '#!%s\nexit 1' % unix_shell) else: exe = os.path.join(tmpdir, 'foo.bat') self.write_file(exe, 'exit 1') @@ -41,9 +41,9 @@ class SpawnTestCase(support.TempdirManager, self.assertRaises(DistutilsExecError, spawn, [exe]) # now something that works - if os.name == 'posix': + if sys.platform != 'win32': exe = os.path.join(tmpdir, 'foo.sh') - self.write_file(exe, '#!/bin/sh\nexit 0') + self.write_file(exe, '#!%s\nexit 0' % unix_shell) else: exe = os.path.join(tmpdir, 'foo.bat') self.write_file(exe, 'exit 0') diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py index fc4d1de..fe4a299 100644 --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -39,15 +39,6 @@ class SysconfigTestCase(support.EnvironGuard, unittest.TestCase): self.assertNotEqual(sysconfig.get_python_lib(), sysconfig.get_python_lib(prefix=TESTFN)) - def test_get_python_inc(self): - inc_dir = sysconfig.get_python_inc() - # This is not much of a test. We make sure Python.h exists - # in the directory returned by get_python_inc() but we don't know - # it is the correct file. - self.assertTrue(os.path.isdir(inc_dir), inc_dir) - python_h = os.path.join(inc_dir, "Python.h") - self.assertTrue(os.path.isfile(python_h), python_h) - def test_get_config_vars(self): cvars = sysconfig.get_config_vars() self.assertIsInstance(cvars, dict) diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py index e171ee9..efba27e 100644 --- a/Lib/distutils/tests/test_unixccompiler.py +++ b/Lib/distutils/tests/test_unixccompiler.py @@ -1,5 +1,4 @@ """Tests for distutils.unixccompiler.""" -import os import sys import unittest from test.support import EnvironmentVarGuard, run_unittest diff --git a/Lib/distutils/text_file.py b/Lib/distutils/text_file.py index 478336f..93abad3 100644 --- a/Lib/distutils/text_file.py +++ b/Lib/distutils/text_file.py @@ -4,7 +4,7 @@ provides the TextFile class, which gives an interface to text files that (optionally) takes care of stripping comments, ignoring blank lines, and joining lines with backslashes.""" -import sys, os, io +import sys, io class TextFile: diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index e423325..fdcf6fa 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -7,8 +7,8 @@ one of the other *util.py modules. import os import re import importlib.util -import sys import string +import sys from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer from distutils.spawn import spawn @@ -350,6 +350,11 @@ def byte_compile (py_files, generated in indirect mode; unless you know what you're doing, leave it set to None. """ + + # Late import to fix a bootstrap issue: _posixsubprocess is built by + # setup.py, but setup.py uses distutils. + import subprocess + # nothing is done if sys.dont_write_bytecode is True if sys.dont_write_bytecode: raise DistutilsByteCompileError('byte-compiling is disabled.') @@ -412,11 +417,9 @@ byte_compile(files, optimize=%r, force=%r, script.close() - cmd = [sys.executable, script_name] - if optimize == 1: - cmd.insert(1, "-O") - elif optimize == 2: - cmd.insert(1, "-OO") + cmd = [sys.executable] + cmd.extend(subprocess._optim_args_from_interpreter_flags()) + cmd.append(script_name) spawn(cmd, dry_run=dry_run) execute(os.remove, (script_name,), "removing %s" % script_name, dry_run=dry_run) diff --git a/Lib/distutils/versionpredicate.py b/Lib/distutils/versionpredicate.py index b0dd9f4..062c98f 100644 --- a/Lib/distutils/versionpredicate.py +++ b/Lib/distutils/versionpredicate.py @@ -154,7 +154,7 @@ def split_provision(value): global _provision_rx if _provision_rx is None: _provision_rx = re.compile( - "([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$", + r"([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$", re.ASCII) value = value.strip() m = _provision_rx.match(value) diff --git a/Lib/doctest.py b/Lib/doctest.py index 38fdd80..0b78544 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -381,12 +381,15 @@ class _OutputRedirectingPdb(pdb.Pdb): sys.stdout = save_stdout # [XX] Normalize with respect to os.path.pardir? -def _module_relative_path(module, path): +def _module_relative_path(module, test_path): if not inspect.ismodule(module): raise TypeError('Expected a module: %r' % module) - if path.startswith('/'): + if test_path.startswith('/'): raise ValueError('Module-relative files may not have absolute paths') + # Normalize the path. On Windows, replace "/" with "\". + test_path = os.path.join(*(test_path.split('/'))) + # Find the base directory for the path. if hasattr(module, '__file__'): # A normal module/package @@ -398,13 +401,19 @@ def _module_relative_path(module, path): else: basedir = os.curdir else: + if hasattr(module, '__path__'): + for directory in module.__path__: + fullpath = os.path.join(directory, test_path) + if os.path.exists(fullpath): + return fullpath + # A module w/o __file__ (this includes builtins) raise ValueError("Can't resolve paths relative to the module " "%r (it has no __file__)" % module.__name__) - # Combine the base directory and the path. - return os.path.join(basedir, *(path.split('/'))) + # Combine the base directory and the test path. + return os.path.join(basedir, test_path) ###################################################################### ## 2. Example & DocTest @@ -756,7 +765,7 @@ class DocTestParser: # This regular expression finds the indentation of every non-blank # line in a string. - _INDENT_RE = re.compile('^([ ]*)(?=\S)', re.MULTILINE) + _INDENT_RE = re.compile(r'^([ ]*)(?=\S)', re.MULTILINE) def _min_indent(self, s): "Return the minimum indentation of any non-blank line in `s`" @@ -1097,7 +1106,7 @@ class DocTestFinder: if lineno is not None: if source_lines is None: return lineno+1 - pat = re.compile('(^|.*:)\s*\w*("|\')') + pat = re.compile(r'(^|.*:)\s*\w*("|\')') for lineno in range(lineno, len(source_lines)): if pat.match(source_lines[lineno]): return lineno @@ -1599,11 +1608,11 @@ class OutputChecker: # blank line, unless the DONT_ACCEPT_BLANKLINE flag is used. if not (optionflags & DONT_ACCEPT_BLANKLINE): # Replace in want with a blank line. - want = re.sub('(?m)^%s\s*?$' % re.escape(BLANKLINE_MARKER), + want = re.sub(r'(?m)^%s\s*?$' % re.escape(BLANKLINE_MARKER), '', want) # If a line in got contains only spaces, then remove the # spaces. - got = re.sub('(?m)^\s*?$', '', got) + got = re.sub(r'(?m)^\s*?$', '', got) if got == want: return True diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index 37a9fbc..57d01fb 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -341,7 +341,9 @@ class TokenList(list): # avoid infinite recursion. ws = part.pop_leading_fws() if ws is not None: - folded.stickyspace = str(ws) + # Peel off the leading whitespace and make it sticky, to + # avoid infinite recursion. + folded.stickyspace = str(part.pop(0)) if folded.append_if_fits(part): continue if part.has_fws: @@ -650,8 +652,8 @@ class Comment(WhiteSpaceTokenList): if value.token_type == 'comment': return str(value) return str(value).replace('\\', '\\\\').replace( - '(', '\(').replace( - ')', '\)') + '(', r'\(').replace( + ')', r'\)') @property def content(self): @@ -1354,15 +1356,15 @@ RouteComponentMarker = ValueTerminal('@', 'route-component-marker') _wsp_splitter = re.compile(r'([{}]+)'.format(''.join(WSP))).split _non_atom_end_matcher = re.compile(r"[^{}]+".format( - ''.join(ATOM_ENDS).replace('\\','\\\\').replace(']','\]'))).match + ''.join(ATOM_ENDS).replace('\\','\\\\').replace(']',r'\]'))).match _non_printable_finder = re.compile(r"[\x00-\x20\x7F]").findall _non_token_end_matcher = re.compile(r"[^{}]+".format( - ''.join(TOKEN_ENDS).replace('\\','\\\\').replace(']','\]'))).match + ''.join(TOKEN_ENDS).replace('\\','\\\\').replace(']',r'\]'))).match _non_attribute_end_matcher = re.compile(r"[^{}]+".format( - ''.join(ATTRIBUTE_ENDS).replace('\\','\\\\').replace(']','\]'))).match + ''.join(ATTRIBUTE_ENDS).replace('\\','\\\\').replace(']',r'\]'))).match _non_extended_attribute_end_matcher = re.compile(r"[^{}]+".format( ''.join(EXTENDED_ATTRIBUTE_ENDS).replace( - '\\','\\\\').replace(']','\]'))).match + '\\','\\\\').replace(']',r'\]'))).match def _validate_xtext(xtext): """If input token contains ASCII non-printables, register a defect.""" @@ -1515,7 +1517,7 @@ def get_unstructured(value): return unstructured def get_qp_ctext(value): - """ctext = + r"""ctext = This is not the RFC ctext, since we are handling nested comments in comment and unquoting quoted-pairs here. We allow anything except the '()' @@ -1876,7 +1878,7 @@ def get_obs_local_part(value): return obs_local_part, value def get_dtext(value): - """ dtext = / obs-dtext + r""" dtext = / obs-dtext obs-dtext = obs-NO-WS-CTL / quoted-pair We allow anything except the excluded characters, but if we find any diff --git a/Lib/email/_policybase.py b/Lib/email/_policybase.py index 7326d3a..df46496 100644 --- a/Lib/email/_policybase.py +++ b/Lib/email/_policybase.py @@ -154,6 +154,9 @@ class Policy(_PolicyBase, metaclass=abc.ABCMeta): them. This is used when the message is being serialized by a generator. Default: True. + message_factory -- the class to use to create new message objects. + If the value is None, the default is Message. + """ raise_on_defect = False @@ -161,6 +164,7 @@ class Policy(_PolicyBase, metaclass=abc.ABCMeta): cte_type = '8bit' max_line_length = 78 mangle_from_ = False + message_factory = None def handle_defect(self, obj, defect): """Based on policy, either raise defect or call register_defect. @@ -357,12 +361,8 @@ class Compat32(Policy): # Assume it is a Header-like object. h = value if h is not None: - # The Header class interprets a value of None for maxlinelen as the - # default value of 78, as recommended by RFC 2822. - maxlinelen = 0 - if self.max_line_length is not None: - maxlinelen = self.max_line_length - parts.append(h.encode(linesep=self.linesep, maxlinelen=maxlinelen)) + parts.append(h.encode(linesep=self.linesep, + maxlinelen=self.max_line_length)) parts.append(self.linesep) return ''.join(parts) diff --git a/Lib/email/architecture.rst b/Lib/email/architecture.rst index fcd10bd..78572ae 100644 --- a/Lib/email/architecture.rst +++ b/Lib/email/architecture.rst @@ -66,7 +66,7 @@ data payloads. Message Lifecycle ----------------- -The general lifecycle of a message is: +The general lifecyle of a message is: Creation A `Message` object can be created by a Parser, or it can be diff --git a/Lib/email/contentmanager.py b/Lib/email/contentmanager.py index b98ce27..b904ded 100644 --- a/Lib/email/contentmanager.py +++ b/Lib/email/contentmanager.py @@ -142,7 +142,7 @@ def _encode_base64(data, max_line_length): def _encode_text(string, charset, cte, policy): lines = string.encode(charset).splitlines() linesep = policy.linesep.encode('ascii') - def embeded_body(lines): return linesep.join(lines) + linesep + def embedded_body(lines): return linesep.join(lines) + linesep def normal_body(lines): return b'\n'.join(lines) + b'\n' if cte==None: # Use heuristics to decide on the "best" encoding. @@ -153,7 +153,7 @@ def _encode_text(string, charset, cte, policy): if (policy.cte_type == '8bit' and max(len(x) for x in lines) <= policy.max_line_length): return '8bit', normal_body(lines).decode('ascii', 'surrogateescape') - sniff = embeded_body(lines[:10]) + sniff = embedded_body(lines[:10]) sniff_qp = quoprimime.body_encode(sniff.decode('latin-1'), policy.max_line_length) sniff_base64 = binascii.b2a_base64(sniff) @@ -172,7 +172,7 @@ def _encode_text(string, charset, cte, policy): data = quoprimime.body_encode(normal_body(lines).decode('latin-1'), policy.max_line_length) elif cte == 'base64': - data = _encode_base64(embeded_body(lines), policy.max_line_length) + data = _encode_base64(embedded_body(lines), policy.max_line_length) else: raise ValueError("Unknown content transfer encoding {}".format(cte)) return cte, data diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py index 0b312e5..7c07ca8 100644 --- a/Lib/email/feedparser.py +++ b/Lib/email/feedparser.py @@ -24,15 +24,14 @@ __all__ = ['FeedParser', 'BytesFeedParser'] import re from email import errors -from email import message from email._policybase import compat32 from collections import deque from io import StringIO -NLCRE = re.compile('\r\n|\r|\n') -NLCRE_bol = re.compile('(\r\n|\r|\n)') -NLCRE_eol = re.compile('(\r\n|\r|\n)\Z') -NLCRE_crack = re.compile('(\r\n|\r|\n)') +NLCRE = re.compile(r'\r\n|\r|\n') +NLCRE_bol = re.compile(r'(\r\n|\r|\n)') +NLCRE_eol = re.compile(r'(\r\n|\r|\n)\Z') +NLCRE_crack = re.compile(r'(\r\n|\r|\n)') # RFC 2822 $3.6.8 Optional fields. ftext is %d33-57 / %d59-126, Any character # except controls, SP, and ":". headerRE = re.compile(r'^(From |[\041-\071\073-\176]*:|[\t ])') @@ -148,13 +147,11 @@ class FeedParser: self.policy = policy self._old_style_factory = False if _factory is None: - # What this should be: - #self._factory = policy.default_message_factory - # but, because we are post 3.4 feature freeze, fix with temp hack: - if self.policy is compat32: - self._factory = message.Message + if policy.message_factory is None: + from email.message import Message + self._factory = Message else: - self._factory = message.EmailMessage + self._factory = policy.message_factory else: self._factory = _factory try: diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 256278d..ae670c2 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -448,7 +448,8 @@ class DecodedGenerator(Generator): Like the Generator base class, except that non-text parts are substituted with a format string representing the part. """ - def __init__(self, outfp, mangle_from_=None, maxheaderlen=78, fmt=None): + def __init__(self, outfp, mangle_from_=None, maxheaderlen=None, fmt=None, *, + policy=None): """Like Generator.__init__() except that an additional optional argument is allowed. @@ -470,7 +471,8 @@ class DecodedGenerator(Generator): [Non-text (%(type)s) part of message omitted, filename %(filename)s] """ - Generator.__init__(self, outfp, mangle_from_, maxheaderlen) + Generator.__init__(self, outfp, mangle_from_, maxheaderlen, + policy=policy) if fmt is None: self._fmt = _FMT else: diff --git a/Lib/email/header.py b/Lib/email/header.py index 6820ea1..c7b2dd9 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -49,7 +49,7 @@ fcre = re.compile(r'[\041-\176]+:$') # Find a header embedded in a putative header value. Used to check for # header injection attack. -_embeded_header = re.compile(r'\n[^ \t]+:') +_embedded_header = re.compile(r'\n[^ \t]+:') @@ -385,7 +385,7 @@ class Header: if self._chunks: formatter.add_transition() value = formatter._str(linesep) - if _embeded_header.search(value): + if _embedded_header.search(value): raise HeaderParseError("header value appears to contain " "an embedded header: {!r}".format(value)) return value diff --git a/Lib/email/message.py b/Lib/email/message.py index 4b04283..b6512f2 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -4,18 +4,17 @@ """Basic message object for the email package object model.""" -__all__ = ['Message'] +__all__ = ['Message', 'EmailMessage'] import re import uu import quopri -import warnings from io import BytesIO, StringIO # Intrapackage imports from email import utils from email import errors -from email._policybase import compat32 +from email._policybase import Policy, compat32 from email import charset as _charset from email._encoded_words import decode_b Charset = _charset.Charset @@ -951,6 +950,26 @@ class MIMEPart(Message): policy = default Message.__init__(self, policy) + + def as_string(self, unixfrom=False, maxheaderlen=None, policy=None): + """Return the entire formatted message as a string. + + Optional 'unixfrom', when true, means include the Unix From_ envelope + header. maxheaderlen is retained for backward compatibility with the + base Message class, but defaults to None, meaning that the policy value + for max_line_length controls the header maximum length. 'policy' is + passed to the Generator instance used to serialize the mesasge; if it + is not specified the policy associated with the message instance is + used. + """ + policy = self.policy if policy is None else policy + if maxheaderlen is None: + maxheaderlen = policy.max_line_length + return super().as_string(maxheaderlen=maxheaderlen, policy=policy) + + def __str__(self): + return self.as_string(policy=self.policy.clone(utf8=True)) + def is_attachment(self): c_d = self.get('content-disposition') return False if c_d is None else c_d.content_disposition == 'attachment' diff --git a/Lib/email/mime/application.py b/Lib/email/mime/application.py index f5c5905..6877e55 100644 --- a/Lib/email/mime/application.py +++ b/Lib/email/mime/application.py @@ -14,7 +14,7 @@ class MIMEApplication(MIMENonMultipart): """Class for generating application/* MIME documents.""" def __init__(self, _data, _subtype='octet-stream', - _encoder=encoders.encode_base64, **_params): + _encoder=encoders.encode_base64, *, policy=None, **_params): """Create an application/* type MIME document. _data is a string containing the raw application data. @@ -31,6 +31,7 @@ class MIMEApplication(MIMENonMultipart): """ if _subtype is None: raise TypeError('Invalid application MIME subtype') - MIMENonMultipart.__init__(self, 'application', _subtype, **_params) + MIMENonMultipart.__init__(self, 'application', _subtype, policy=policy, + **_params) self.set_payload(_data) _encoder(self) diff --git a/Lib/email/mime/audio.py b/Lib/email/mime/audio.py index fbc1189..4bcd7b2 100644 --- a/Lib/email/mime/audio.py +++ b/Lib/email/mime/audio.py @@ -43,7 +43,7 @@ class MIMEAudio(MIMENonMultipart): """Class for generating audio/* MIME documents.""" def __init__(self, _audiodata, _subtype=None, - _encoder=encoders.encode_base64, **_params): + _encoder=encoders.encode_base64, *, policy=None, **_params): """Create an audio/* type MIME document. _audiodata is a string containing the raw audio data. If this data @@ -68,6 +68,7 @@ class MIMEAudio(MIMENonMultipart): _subtype = _whatsnd(_audiodata) if _subtype is None: raise TypeError('Could not find audio MIME subtype') - MIMENonMultipart.__init__(self, 'audio', _subtype, **_params) + MIMENonMultipart.__init__(self, 'audio', _subtype, policy=policy, + **_params) self.set_payload(_audiodata) _encoder(self) diff --git a/Lib/email/mime/base.py b/Lib/email/mime/base.py index ac91925..1a3f9b5 100644 --- a/Lib/email/mime/base.py +++ b/Lib/email/mime/base.py @@ -6,6 +6,8 @@ __all__ = ['MIMEBase'] +import email.policy + from email import message @@ -13,14 +15,16 @@ from email import message class MIMEBase(message.Message): """Base class for MIME specializations.""" - def __init__(self, _maintype, _subtype, **_params): + def __init__(self, _maintype, _subtype, *, policy=None, **_params): """This constructor adds a Content-Type: and a MIME-Version: header. The Content-Type: header is taken from the _maintype and _subtype arguments. Additional parameters for this header are taken from the keyword arguments. """ - message.Message.__init__(self) + if policy is None: + policy = email.policy.compat32 + message.Message.__init__(self, policy=policy) ctype = '%s/%s' % (_maintype, _subtype) self.add_header('Content-Type', ctype, **_params) self['MIME-Version'] = '1.0' diff --git a/Lib/email/mime/image.py b/Lib/email/mime/image.py index 5563823..9272464 100644 --- a/Lib/email/mime/image.py +++ b/Lib/email/mime/image.py @@ -17,7 +17,7 @@ class MIMEImage(MIMENonMultipart): """Class for generating image/* type MIME documents.""" def __init__(self, _imagedata, _subtype=None, - _encoder=encoders.encode_base64, **_params): + _encoder=encoders.encode_base64, *, policy=None, **_params): """Create an image/* type MIME document. _imagedata is a string containing the raw image data. If this data @@ -41,6 +41,7 @@ class MIMEImage(MIMENonMultipart): _subtype = imghdr.what(None, _imagedata) if _subtype is None: raise TypeError('Could not guess image MIME subtype') - MIMENonMultipart.__init__(self, 'image', _subtype, **_params) + MIMENonMultipart.__init__(self, 'image', _subtype, policy=policy, + **_params) self.set_payload(_imagedata) _encoder(self) diff --git a/Lib/email/mime/message.py b/Lib/email/mime/message.py index 275dbfd..07e4f2d 100644 --- a/Lib/email/mime/message.py +++ b/Lib/email/mime/message.py @@ -14,7 +14,7 @@ from email.mime.nonmultipart import MIMENonMultipart class MIMEMessage(MIMENonMultipart): """Class representing message/* MIME documents.""" - def __init__(self, _msg, _subtype='rfc822'): + def __init__(self, _msg, _subtype='rfc822', *, policy=None): """Create a message/* type MIME document. _msg is a message object and must be an instance of Message, or a @@ -24,7 +24,7 @@ class MIMEMessage(MIMENonMultipart): default is "rfc822" (this is defined by the MIME standard, even though the term "rfc822" is technically outdated by RFC 2822). """ - MIMENonMultipart.__init__(self, 'message', _subtype) + MIMENonMultipart.__init__(self, 'message', _subtype, policy=policy) if not isinstance(_msg, message.Message): raise TypeError('Argument is not an instance of Message') # It's convenient to use this base class method. We need to do it diff --git a/Lib/email/mime/multipart.py b/Lib/email/mime/multipart.py index 9661865..2d3f288 100644 --- a/Lib/email/mime/multipart.py +++ b/Lib/email/mime/multipart.py @@ -14,6 +14,7 @@ class MIMEMultipart(MIMEBase): """Base class for MIME multipart/* type messages.""" def __init__(self, _subtype='mixed', boundary=None, _subparts=None, + *, policy=None, **_params): """Creates a multipart/* type message. @@ -33,7 +34,7 @@ class MIMEMultipart(MIMEBase): Additional parameters for the Content-Type header are taken from the keyword arguments (or passed into the _params argument). """ - MIMEBase.__init__(self, 'multipart', _subtype, **_params) + MIMEBase.__init__(self, 'multipart', _subtype, policy=policy, **_params) # Initialise _payload to an empty list as the Message superclass's # implementation of is_multipart assumes that _payload is a list for diff --git a/Lib/email/mime/text.py b/Lib/email/mime/text.py index da03086..35b4423 100644 --- a/Lib/email/mime/text.py +++ b/Lib/email/mime/text.py @@ -14,7 +14,7 @@ from email.mime.nonmultipart import MIMENonMultipart class MIMEText(MIMENonMultipart): """Class for generating text/* type MIME documents.""" - def __init__(self, _text, _subtype='plain', _charset=None): + def __init__(self, _text, _subtype='plain', _charset=None, *, policy=None): """Create a text/* type MIME document. _text is the string for this message object. @@ -36,7 +36,7 @@ class MIMEText(MIMENonMultipart): except UnicodeEncodeError: _charset = 'utf-8' - MIMENonMultipart.__init__(self, 'text', _subtype, + MIMENonMultipart.__init__(self, 'text', _subtype, policy=policy, **{'charset': str(_charset)}) self.set_payload(_text, _charset) diff --git a/Lib/email/policy.py b/Lib/email/policy.py index 35d0e69..5131311 100644 --- a/Lib/email/policy.py +++ b/Lib/email/policy.py @@ -7,6 +7,7 @@ from email._policybase import Policy, Compat32, compat32, _extend_docstrings from email.utils import _has_surrogates from email.headerregistry import HeaderRegistry as HeaderRegistry from email.contentmanager import raw_data_manager +from email.message import EmailMessage __all__ = [ 'Compat32', @@ -82,6 +83,7 @@ class EmailPolicy(Policy): """ + message_factory = EmailMessage utf8 = False refold_source = 'long' header_factory = HeaderRegistry() diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 8dd7130..aa2fb7c 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -29,6 +29,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com). """#" import codecs +import sys from . import aliases _cache = {} @@ -54,6 +55,7 @@ def normalize_encoding(encoding): """ if isinstance(encoding, bytes): encoding = str(encoding, "ascii") + chars = [] punct = False for c in encoding: @@ -97,6 +99,8 @@ def search_function(encoding): mod = __import__('encodings.' + modname, fromlist=_import_tail, level=0) except ImportError: + # ImportError may occur because 'encodings.(modname)' does not exist, + # or because it imports a name that does not exist (see mbcs and oem) pass else: break @@ -150,3 +154,16 @@ def search_function(encoding): # Register the search_function in the Python codec registry codecs.register(search_function) + +if sys.platform == 'win32': + def _alias_mbcs(encoding): + try: + import _bootlocale + if encoding == _bootlocale.getpreferredencoding(False): + import encodings.mbcs + return encodings.mbcs.getregentry() + except ImportError: + # Imports may fail while we are shutting down + pass + + codecs.register(_alias_mbcs) diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py index 67c828d..2e63c2f 100644 --- a/Lib/encodings/aliases.py +++ b/Lib/encodings/aliases.py @@ -458,6 +458,7 @@ aliases = { 'macturkish' : 'mac_turkish', # mbcs codec + 'ansi' : 'mbcs', 'dbcs' : 'mbcs', # ptcp154 codec diff --git a/Lib/encodings/oem.py b/Lib/encodings/oem.py new file mode 100644 index 0000000..2c3426b --- /dev/null +++ b/Lib/encodings/oem.py @@ -0,0 +1,41 @@ +""" Python 'oem' Codec for Windows + +""" +# Import them explicitly to cause an ImportError +# on non-Windows systems +from codecs import oem_encode, oem_decode +# for IncrementalDecoder, IncrementalEncoder, ... +import codecs + +### Codec APIs + +encode = oem_encode + +def decode(input, errors='strict'): + return oem_decode(input, errors, True) + +class IncrementalEncoder(codecs.IncrementalEncoder): + def encode(self, input, final=False): + return oem_encode(input, self.errors)[0] + +class IncrementalDecoder(codecs.BufferedIncrementalDecoder): + _buffer_decode = oem_decode + +class StreamWriter(codecs.StreamWriter): + encode = oem_encode + +class StreamReader(codecs.StreamReader): + decode = oem_decode + +### encodings module API + +def getregentry(): + return codecs.CodecInfo( + name='oem', + encode=encode, + decode=decode, + incrementalencoder=IncrementalEncoder, + incrementaldecoder=IncrementalDecoder, + streamreader=StreamReader, + streamwriter=StreamWriter, + ) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 25c5567..9f5d151 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,19 +12,6 @@ _SETUPTOOLS_VERSION = "28.8.0" _PIP_VERSION = "9.0.1" -# pip currently requires ssl support, so we try to provide a nicer -# error message when that is missing (http://bugs.python.org/issue19744) -_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION)) -try: - import ssl -except ImportError: - ssl = None - def _require_ssl_for_pip(): - raise RuntimeError(_MISSING_SSL_MESSAGE) -else: - def _require_ssl_for_pip(): - pass - _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), ("pip", _PIP_VERSION), @@ -71,7 +58,6 @@ def bootstrap(*, root=None, upgrade=False, user=False, if altinstall and default_pip: raise ValueError("Cannot use altinstall and default_pip together") - _require_ssl_for_pip() _disable_pip_configuration_settings() # By default, installing pip and setuptools installs all of the @@ -133,7 +119,6 @@ def _uninstall_helper(*, verbosity=0): print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr) return - _require_ssl_for_pip() _disable_pip_configuration_settings() # Construct the arguments to be passed to the pip command @@ -145,11 +130,6 @@ def _uninstall_helper(*, verbosity=0): def _main(argv=None): - if ssl is None: - print("Ignoring ensurepip failure: {}".format(_MISSING_SSL_MESSAGE), - file=sys.stderr) - return - import argparse parser = argparse.ArgumentParser(prog="python -m ensurepip") parser.add_argument( diff --git a/Lib/enum.py b/Lib/enum.py index b8787d1..3f5ecbb 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -1,8 +1,20 @@ import sys -from collections import OrderedDict from types import MappingProxyType, DynamicClassAttribute +from functools import reduce +from operator import or_ as _or_, and_ as _and_, xor, neg -__all__ = ['Enum', 'IntEnum', 'unique'] +# try _collections first to reduce startup cost +try: + from _collections import OrderedDict +except ImportError: + from collections import OrderedDict + + +__all__ = [ + 'EnumMeta', + 'Enum', 'IntEnum', 'Flag', 'IntFlag', + 'auto', 'unique', + ] def _is_descriptor(obj): @@ -28,7 +40,6 @@ def _is_sunder(name): name[-2:-1] != '_' and len(name) > 2) - def _make_class_unpicklable(cls): """Make the given class un-picklable.""" def _break_on_call_reduce(self, proto): @@ -36,6 +47,13 @@ def _make_class_unpicklable(cls): cls.__reduce_ex__ = _break_on_call_reduce cls.__module__ = '' +_auto_null = object() +class auto: + """ + Instances are replaced with an appropriate value in Enum class suites. + """ + value = _auto_null + class _EnumDict(dict): """Track enum member order and ensure member names are not reused. @@ -47,6 +65,7 @@ class _EnumDict(dict): def __init__(self): super().__init__() self._member_names = [] + self._last_values = [] def __setitem__(self, key, value): """Changes anything not dundered or not a descriptor. @@ -58,21 +77,32 @@ class _EnumDict(dict): """ if _is_sunder(key): - raise ValueError('_names_ are reserved for future Enum use') + if key not in ( + '_order_', '_create_pseudo_member_', + '_generate_next_value_', '_missing_', + ): + raise ValueError('_names_ are reserved for future Enum use') + if key == '_generate_next_value_': + setattr(self, '_generate_next_value', value) elif _is_dunder(key): - pass + if key == '__order__': + key = '_order_' elif key in self._member_names: # descriptor overwriting an enum? raise TypeError('Attempted to reuse key: %r' % key) elif not _is_descriptor(value): if key in self: # enum overwriting a descriptor? - raise TypeError('Key already defined as: %r' % self[key]) + raise TypeError('%r already defined as: %r' % (key, self[key])) + if isinstance(value, auto): + if value.value == _auto_null: + value.value = self._generate_next_value(key, 1, len(self._member_names), self._last_values[:]) + value = value.value self._member_names.append(key) + self._last_values.append(value) super().__setitem__(key, value) - # Dummy value for Enum as EnumMeta explicitly checks for it, but of course # until EnumMeta finishes running the first time the Enum class doesn't exist. # This is also why there are checks in EnumMeta like `if Enum is not None` @@ -83,7 +113,13 @@ class EnumMeta(type): """Metaclass for Enum""" @classmethod def __prepare__(metacls, cls, bases): - return _EnumDict() + # create the namespace dict + enum_dict = _EnumDict() + # inherit previous flags and _generate_next_value_ function + member_type, first_enum = metacls._get_mixins_(bases) + if first_enum is not None: + enum_dict['_generate_next_value_'] = getattr(first_enum, '_generate_next_value_', None) + return enum_dict def __new__(metacls, cls, bases, classdict): # an Enum class is final once enumeration items have been defined; it @@ -96,12 +132,15 @@ class EnumMeta(type): # save enum items into separate mapping so they don't get baked into # the new class - members = {k: classdict[k] for k in classdict._member_names} + enum_members = {k: classdict[k] for k in classdict._member_names} for name in classdict._member_names: del classdict[name] + # adjust the sunders + _order_ = classdict.pop('_order_', None) + # check for illegal enum names (any others?) - invalid_names = set(members) & {'mro', } + invalid_names = set(enum_members) & {'mro', } if invalid_names: raise ValueError('Invalid enum member name: {0}'.format( ','.join(invalid_names))) @@ -145,7 +184,7 @@ class EnumMeta(type): # a custom __new__ is doing something funky with the values -- such as # auto-numbering ;) for member_name in classdict._member_names: - value = members[member_name] + value = enum_members[member_name] if not isinstance(value, tuple): args = (value, ) else: @@ -159,7 +198,10 @@ class EnumMeta(type): else: enum_member = __new__(enum_class, *args) if not hasattr(enum_member, '_value_'): - enum_member._value_ = member_type(*args) + if member_type is object: + enum_member._value_ = value + else: + enum_member._value_ = member_type(*args) value = enum_member._value_ enum_member._name_ = member_name enum_member.__objclass__ = enum_class @@ -204,6 +246,14 @@ class EnumMeta(type): if save_new: enum_class.__new_member__ = __new__ enum_class.__new__ = Enum.__new__ + + # py3 support for definition order (helps keep py2/py3 code in sync) + if _order_ is not None: + if isinstance(_order_, str): + _order_ = _order_.replace(',', ' ').split() + if _order_ != enum_class._member_names_: + raise TypeError('member order does not match _order_') + return enum_class def __bool__(self): @@ -217,7 +267,7 @@ class EnumMeta(type): This method is used both when an enum class is given a value to match to an enumeration member (i.e. Color(3)) and for the functional API - (i.e. Color = Enum('Color', names='red green blue')). + (i.e. Color = Enum('Color', names='RED GREEN BLUE')). When used for the functional API: @@ -325,13 +375,19 @@ class EnumMeta(type): """ metacls = cls.__class__ bases = (cls, ) if type is None else (type, cls) + _, first_enum = cls._get_mixins_(bases) classdict = metacls.__prepare__(class_name, bases) # special processing needed for names? if isinstance(names, str): names = names.replace(',', ' ').split() if isinstance(names, (tuple, list)) and isinstance(names[0], str): - names = [(e, i) for (i, e) in enumerate(names, start)] + original_names, names = names, [] + last_values = [] + for count, name in enumerate(original_names): + value = first_enum._generate_next_value_(name, start, count, last_values[:]) + last_values.append(value) + names.append((name, value)) # Here, names is either an iterable of (name, value) or a mapping. for item in names: @@ -461,7 +517,7 @@ class Enum(metaclass=EnumMeta): # without calling this method; this method is called by the metaclass' # __call__ (i.e. Color(3) ), and by pickle if type(value) is cls: - # For lookups like Color(Color.red) + # For lookups like Color(Color.RED) return value # by-value search for a matching enum member # see if it's in the reverse mapping (for hashable values) @@ -473,6 +529,20 @@ class Enum(metaclass=EnumMeta): for member in cls._member_map_.values(): if member._value_ == value: return member + # still not found -- try _missing_ hook + return cls._missing_(value) + + def _generate_next_value_(name, start, count, last_values): + for last_value in reversed(last_values): + try: + return last_value + 1 + except TypeError: + pass + else: + return start + + @classmethod + def _missing_(cls, value): raise ValueError("%r is not a valid %s" % (value, cls.__name__)) def __repr__(self): @@ -544,8 +614,21 @@ class Enum(metaclass=EnumMeta): source = vars(source) else: source = module_globals - members = {name: value for name, value in source.items() - if filter(name)} + # We use an OrderedDict of sorted source keys so that the + # _value2member_map is populated in the same order every time + # for a consistent reverse mapping of number to name when there + # are multiple names for the same number rather than varying + # between runs due to hash randomization of the module dictionary. + members = [ + (name, source[name]) + for name in source.keys() + if filter(name)] + try: + # sort by value + members.sort(key=lambda t: (t[1], t[0])) + except TypeError: + # unless some values aren't comparable, in which case sort by name + members.sort(key=lambda t: t[0]) cls = cls(name, members, module=module) cls.__reduce_ex__ = _reduce_ex_by_name module_globals.update(cls.__members__) @@ -560,6 +643,180 @@ class IntEnum(int, Enum): def _reduce_ex_by_name(self, proto): return self.name +class Flag(Enum): + """Support for flags""" + + def _generate_next_value_(name, start, count, last_values): + """ + Generate the next value when not given. + + name: the name of the member + start: the initital start value or None + count: the number of existing members + last_value: the last value assigned or None + """ + if not count: + return start if start is not None else 1 + for last_value in reversed(last_values): + try: + high_bit = _high_bit(last_value) + break + except Exception: + raise TypeError('Invalid Flag value: %r' % last_value) from None + return 2 ** (high_bit+1) + + @classmethod + def _missing_(cls, value): + original_value = value + if value < 0: + value = ~value + possible_member = cls._create_pseudo_member_(value) + if original_value < 0: + possible_member = ~possible_member + return possible_member + + @classmethod + def _create_pseudo_member_(cls, value): + """ + Create a composite member iff value contains only members. + """ + pseudo_member = cls._value2member_map_.get(value, None) + if pseudo_member is None: + # verify all bits are accounted for + _, extra_flags = _decompose(cls, value) + if extra_flags: + raise ValueError("%r is not a valid %s" % (value, cls.__name__)) + # construct a singleton enum pseudo-member + pseudo_member = object.__new__(cls) + pseudo_member._name_ = None + pseudo_member._value_ = value + cls._value2member_map_[value] = pseudo_member + return pseudo_member + + def __contains__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return other._value_ & self._value_ == other._value_ + + def __repr__(self): + cls = self.__class__ + if self._name_ is not None: + return '<%s.%s: %r>' % (cls.__name__, self._name_, self._value_) + members, uncovered = _decompose(cls, self._value_) + return '<%s.%s: %r>' % ( + cls.__name__, + '|'.join([str(m._name_ or m._value_) for m in members]), + self._value_, + ) + + def __str__(self): + cls = self.__class__ + if self._name_ is not None: + return '%s.%s' % (cls.__name__, self._name_) + members, uncovered = _decompose(cls, self._value_) + if len(members) == 1 and members[0]._name_ is None: + return '%s.%r' % (cls.__name__, members[0]._value_) + else: + return '%s.%s' % ( + cls.__name__, + '|'.join([str(m._name_ or m._value_) for m in members]), + ) + + def __bool__(self): + return bool(self._value_) + + def __or__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return self.__class__(self._value_ | other._value_) + + def __and__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return self.__class__(self._value_ & other._value_) + + def __xor__(self, other): + if not isinstance(other, self.__class__): + return NotImplemented + return self.__class__(self._value_ ^ other._value_) + + def __invert__(self): + members, uncovered = _decompose(self.__class__, self._value_) + inverted_members = [ + m for m in self.__class__ + if m not in members and not m._value_ & self._value_ + ] + inverted = reduce(_or_, inverted_members, self.__class__(0)) + return self.__class__(inverted) + + +class IntFlag(int, Flag): + """Support for integer-based Flags""" + + @classmethod + def _missing_(cls, value): + if not isinstance(value, int): + raise ValueError("%r is not a valid %s" % (value, cls.__name__)) + new_member = cls._create_pseudo_member_(value) + return new_member + + @classmethod + def _create_pseudo_member_(cls, value): + pseudo_member = cls._value2member_map_.get(value, None) + if pseudo_member is None: + need_to_create = [value] + # get unaccounted for bits + _, extra_flags = _decompose(cls, value) + # timer = 10 + while extra_flags: + # timer -= 1 + bit = _high_bit(extra_flags) + flag_value = 2 ** bit + if (flag_value not in cls._value2member_map_ and + flag_value not in need_to_create + ): + need_to_create.append(flag_value) + if extra_flags == -flag_value: + extra_flags = 0 + else: + extra_flags ^= flag_value + for value in reversed(need_to_create): + # construct singleton pseudo-members + pseudo_member = int.__new__(cls, value) + pseudo_member._name_ = None + pseudo_member._value_ = value + cls._value2member_map_[value] = pseudo_member + return pseudo_member + + def __or__(self, other): + if not isinstance(other, (self.__class__, int)): + return NotImplemented + result = self.__class__(self._value_ | self.__class__(other)._value_) + return result + + def __and__(self, other): + if not isinstance(other, (self.__class__, int)): + return NotImplemented + return self.__class__(self._value_ & self.__class__(other)._value_) + + def __xor__(self, other): + if not isinstance(other, (self.__class__, int)): + return NotImplemented + return self.__class__(self._value_ ^ self.__class__(other)._value_) + + __ror__ = __or__ + __rand__ = __and__ + __rxor__ = __xor__ + + def __invert__(self): + result = self.__class__(~self._value_) + return result + + +def _high_bit(value): + """returns index of highest bit, or -1 if value is zero or negative""" + return value.bit_length() - 1 + def unique(enumeration): """Class decorator for enumerations ensuring unique member values.""" duplicates = [] @@ -572,3 +829,40 @@ def unique(enumeration): raise ValueError('duplicate values found in %r: %s' % (enumeration, alias_details)) return enumeration + +def _decompose(flag, value): + """Extract all members from the value.""" + # _decompose is only called if the value is not named + not_covered = value + negative = value < 0 + if negative: + # only check for named flags + flags_to_check = [ + (m, v) + for v, m in flag._value2member_map_.items() + if m.name is not None + ] + else: + # check for named flags and powers-of-two flags + flags_to_check = [ + (m, v) + for v, m in flag._value2member_map_.items() + if m.name is not None or _power_of_two(v) + ] + members = [] + for member, member_value in flags_to_check: + if member_value and member_value & value == member_value: + members.append(member) + not_covered &= ~member_value + if not members and value in flag._value2member_map_: + members.append(flag._value2member_map_[value]) + members.sort(key=lambda m: m._value_, reverse=True) + if len(members) > 1 and members[0].value == value: + # we have the breakdown, don't need the value member itself + members.pop(0) + return members, not_covered + +def _power_of_two(value): + if value < 1: + return False + return value == 2 ** _high_bit(value) diff --git a/Lib/fileinput.py b/Lib/fileinput.py index d2b5206..721fe9c 100644 --- a/Lib/fileinput.py +++ b/Lib/fileinput.py @@ -75,13 +75,11 @@ XXX Possible additions: import sys, os __all__ = ["input", "close", "nextfile", "filename", "lineno", "filelineno", - "isfirstline", "isstdin", "FileInput"] + "fileno", "isfirstline", "isstdin", "FileInput", "hook_compressed", + "hook_encoded"] _state = None -# No longer used -DEFAULT_BUFSIZE = 8*1024 - def input(files=None, inplace=False, backup="", bufsize=0, mode="r", openhook=None): """Return an instance of the FileInput class, which can be iterated. @@ -201,6 +199,10 @@ class FileInput: self._files = files self._inplace = inplace self._backup = backup + if bufsize: + import warnings + warnings.warn('bufsize is deprecated and ignored', + DeprecationWarning, stacklevel=2) self._savestdout = None self._output = None self._filename = None @@ -398,9 +400,9 @@ def hook_compressed(filename, mode): return open(filename, mode) -def hook_encoded(encoding): +def hook_encoded(encoding, errors=None): def openhook(filename, mode): - return open(filename, mode, encoding=encoding) + return open(filename, mode, encoding=encoding, errors=errors) return openhook diff --git a/Lib/fnmatch.py b/Lib/fnmatch.py index 6330b0c..fd3b514 100644 --- a/Lib/fnmatch.py +++ b/Lib/fnmatch.py @@ -106,4 +106,4 @@ def translate(pat): res = '%s[%s]' % (res, stuff) else: res = res + re.escape(c) - return res + '\Z(?ms)' + return r'(?s:%s)\Z' % res diff --git a/Lib/fractions.py b/Lib/fractions.py index 9aabab3..8330202 100644 --- a/Lib/fractions.py +++ b/Lib/fractions.py @@ -81,7 +81,7 @@ class Fraction(numbers.Rational): __slots__ = ('_numerator', '_denominator') # We're immutable, so use __new__ not __init__ - def __new__(cls, numerator=0, denominator=None, _normalize=True): + def __new__(cls, numerator=0, denominator=None, *, _normalize=True): """Constructs a Rational. Takes a string like '3/2' or '1.5', another Rational instance, a @@ -125,17 +125,9 @@ class Fraction(numbers.Rational): self._denominator = numerator.denominator return self - elif isinstance(numerator, float): - # Exact conversion from float - value = Fraction.from_float(numerator) - self._numerator = value._numerator - self._denominator = value._denominator - return self - - elif isinstance(numerator, Decimal): - value = Fraction.from_decimal(numerator) - self._numerator = value._numerator - self._denominator = value._denominator + elif isinstance(numerator, (float, Decimal)): + # Exact conversion + self._numerator, self._denominator = numerator.as_integer_ratio() return self elif isinstance(numerator, str): @@ -210,10 +202,6 @@ class Fraction(numbers.Rational): elif not isinstance(f, float): raise TypeError("%s.from_float() only takes floats, not %r (%s)" % (cls.__name__, f, type(f).__name__)) - if math.isnan(f): - raise ValueError("Cannot convert %r to %s." % (f, cls.__name__)) - if math.isinf(f): - raise OverflowError("Cannot convert %r to %s." % (f, cls.__name__)) return cls(*f.as_integer_ratio()) @classmethod @@ -226,19 +214,7 @@ class Fraction(numbers.Rational): raise TypeError( "%s.from_decimal() only takes Decimals, not %r (%s)" % (cls.__name__, dec, type(dec).__name__)) - if dec.is_infinite(): - raise OverflowError( - "Cannot convert %s to %s." % (dec, cls.__name__)) - if dec.is_nan(): - raise ValueError("Cannot convert %s to %s." % (dec, cls.__name__)) - sign, digits, exp = dec.as_tuple() - digits = int(''.join(map(str, digits))) - if sign: - digits = -digits - if exp >= 0: - return cls(digits * 10 ** exp) - else: - return cls(digits, 10 ** -exp) + return cls(*dec.as_integer_ratio()) def limit_denominator(self, max_denominator=1000000): """Closest Fraction to self with denominator at most max_denominator. diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 2416fc6..8f36f53 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -36,13 +36,12 @@ python ftplib.py -d localhost -l -p -l # Modified by Giampaolo Rodola' to add TLS support. # -import os import sys import socket -import warnings from socket import _GLOBAL_DEFAULT_TIMEOUT -__all__ = ["FTP"] +__all__ = ["FTP", "error_reply", "error_temp", "error_perm", "error_proto", + "all_errors"] # Magic number from MSG_OOB = 0x1 # Process data out of band @@ -187,8 +186,6 @@ class FTP: # Internal: send one line to the server, appending CRLF def putline(self, line): - if '\r' in line or '\n' in line: - raise ValueError('an illegal newline character should not be contained') line = line + CRLF if self.debugging > 1: print('*put*', self.sanitize(line)) @@ -731,6 +728,10 @@ else: if context is not None and certfile is not None: raise ValueError("context and certfile arguments are mutually " "exclusive") + if keyfile is not None or certfile is not None: + import warnings + warnings.warn("keyfile and certfile are deprecated, use a" + "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile if context is None: @@ -824,7 +825,7 @@ def parse150(resp): if _150_re is None: import re _150_re = re.compile( - "150 .* \((\d+) bytes\)", re.IGNORECASE | re.ASCII) + r"150 .* \((\d+) bytes\)", re.IGNORECASE | re.ASCII) m = _150_re.match(resp) if not m: return None diff --git a/Lib/functools.py b/Lib/functools.py index 60cf3c4..9845df2 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -21,6 +21,7 @@ from abc import get_cache_token from collections import namedtuple from types import MappingProxyType from weakref import WeakKeyDictionary +from reprlib import recursive_repr try: from _thread import RLock except ImportError: @@ -237,26 +238,83 @@ except ImportError: ################################################################################ # Purely functional, no descriptor behaviour -def partial(func, *args, **keywords): +class partial: """New function with partial application of the given arguments and keywords. """ - if hasattr(func, 'func'): - args = func.args + args - tmpkw = func.keywords.copy() - tmpkw.update(keywords) - keywords = tmpkw - del tmpkw - func = func.func - - def newfunc(*fargs, **fkeywords): - newkeywords = keywords.copy() - newkeywords.update(fkeywords) - return func(*(args + fargs), **newkeywords) - newfunc.func = func - newfunc.args = args - newfunc.keywords = keywords - return newfunc + + __slots__ = "func", "args", "keywords", "__dict__", "__weakref__" + + def __new__(*args, **keywords): + if not args: + raise TypeError("descriptor '__new__' of partial needs an argument") + if len(args) < 2: + raise TypeError("type 'partial' takes at least one argument") + cls, func, *args = args + if not callable(func): + raise TypeError("the first argument must be callable") + args = tuple(args) + + if hasattr(func, "func"): + args = func.args + args + tmpkw = func.keywords.copy() + tmpkw.update(keywords) + keywords = tmpkw + del tmpkw + func = func.func + + self = super(partial, cls).__new__(cls) + + self.func = func + self.args = args + self.keywords = keywords + return self + + def __call__(*args, **keywords): + if not args: + raise TypeError("descriptor '__call__' of partial needs an argument") + self, *args = args + newkeywords = self.keywords.copy() + newkeywords.update(keywords) + return self.func(*self.args, *args, **newkeywords) + + @recursive_repr() + def __repr__(self): + qualname = type(self).__qualname__ + args = [repr(self.func)] + args.extend(repr(x) for x in self.args) + args.extend(f"{k}={v!r}" for (k, v) in self.keywords.items()) + if type(self).__module__ == "functools": + return f"functools.{qualname}({', '.join(args)})" + return f"{qualname}({', '.join(args)})" + + def __reduce__(self): + return type(self), (self.func,), (self.func, self.args, + self.keywords or None, self.__dict__ or None) + + def __setstate__(self, state): + if not isinstance(state, tuple): + raise TypeError("argument to __setstate__ must be a tuple") + if len(state) != 4: + raise TypeError(f"expected 4 items in state, got {len(state)}") + func, args, kwds, namespace = state + if (not callable(func) or not isinstance(args, tuple) or + (kwds is not None and not isinstance(kwds, dict)) or + (namespace is not None and not isinstance(namespace, dict))): + raise TypeError("invalid partial state") + + args = tuple(args) # just in case it's a subclass + if kwds is None: + kwds = {} + elif type(kwds) is not dict: # XXX does it need to be *exactly* dict? + kwds = dict(kwds) + if namespace is None: + namespace = {} + + self.__dict__ = namespace + self.func = func + self.args = args + self.keywords = kwds try: from _functools import partial @@ -516,16 +574,14 @@ def _lru_cache_wrapper(user_function, maxsize, typed, _CacheInfo): last = root[PREV] link = [last, root, key, result] last[NEXT] = root[PREV] = cache[key] = link - # Use the __len__() method instead of the len() function - # which could potentially be wrapped in an lru_cache itself. - full = (cache.__len__() >= maxsize) + full = (len(cache) >= maxsize) misses += 1 return result def cache_info(): """Report cache statistics""" with lock: - return _CacheInfo(hits, misses, maxsize, cache.__len__()) + return _CacheInfo(hits, misses, maxsize, len(cache)) def cache_clear(): """Clear the cache and cache statistics""" diff --git a/Lib/genericpath.py b/Lib/genericpath.py index 6714061..303b3b3 100644 --- a/Lib/genericpath.py +++ b/Lib/genericpath.py @@ -69,6 +69,12 @@ def getctime(filename): def commonprefix(m): "Given a list of pathnames, returns the longest common leading component" if not m: return '' + # Some people pass in a list of pathname parts to operate in an OS-agnostic + # fashion; don't try to translate in that case as that's an abuse of the + # API and they are already doing what they need to be OS-agnostic and so + # they most likely won't be using an os.PathLike object in the sublists. + if not isinstance(m[0], (list, tuple)): + m = tuple(map(os.fspath, m)) s1 = min(m) s2 = max(m) for i, c in enumerate(s1): diff --git a/Lib/getpass.py b/Lib/getpass.py index 36e17e4..be51121 100644 --- a/Lib/getpass.py +++ b/Lib/getpass.py @@ -7,6 +7,7 @@ GetPassWarning - This UserWarning is issued when getpass() cannot prevent echoing of the password contents while reading. On Windows, the msvcrt module will be used. +On the Mac EasyDialogs.AskPassword is used, if available. """ diff --git a/Lib/gettext.py b/Lib/gettext.py index 6b215af..57d2c74 100644 --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -270,9 +270,7 @@ class NullTranslations: def lgettext(self, message): if self._fallback: return self._fallback.lgettext(message) - if self._output_charset: - return message.encode(self._output_charset) - return message.encode(locale.getpreferredencoding()) + return message def ngettext(self, msgid1, msgid2, n): if self._fallback: @@ -286,12 +284,9 @@ class NullTranslations: if self._fallback: return self._fallback.lngettext(msgid1, msgid2, n) if n == 1: - tmsg = msgid1 + return msgid1 else: - tmsg = msgid2 - if self._output_charset: - return tmsg.encode(self._output_charset) - return tmsg.encode(locale.getpreferredencoding()) + return msgid2 def info(self): return self._info @@ -373,7 +368,7 @@ class GNUTranslations(NullTranslations): if mlen == 0: # Catalog description lastk = None - for b_item in tmsg.split(b'\n'): + for b_item in tmsg.split('\n'.encode("ascii")): item = b_item.decode().strip() if not item: continue @@ -421,7 +416,7 @@ class GNUTranslations(NullTranslations): if tmsg is missing: if self._fallback: return self._fallback.lgettext(message) - tmsg = message + return message if self._output_charset: return tmsg.encode(self._output_charset) return tmsg.encode(locale.getpreferredencoding()) @@ -429,16 +424,16 @@ class GNUTranslations(NullTranslations): def lngettext(self, msgid1, msgid2, n): try: tmsg = self._catalog[(msgid1, self.plural(n))] + if self._output_charset: + return tmsg.encode(self._output_charset) + return tmsg.encode(locale.getpreferredencoding()) except KeyError: if self._fallback: return self._fallback.lngettext(msgid1, msgid2, n) if n == 1: - tmsg = msgid1 + return msgid1 else: - tmsg = msgid2 - if self._output_charset: - return tmsg.encode(self._output_charset) - return tmsg.encode(locale.getpreferredencoding()) + return msgid2 def gettext(self, message): missing = object() @@ -578,11 +573,11 @@ def dgettext(domain, message): return t.gettext(message) def ldgettext(domain, message): - codeset = _localecodesets.get(domain) try: - t = translation(domain, _localedirs.get(domain, None), codeset=codeset) + t = translation(domain, _localedirs.get(domain, None), + codeset=_localecodesets.get(domain)) except OSError: - return message.encode(codeset or locale.getpreferredencoding()) + return message return t.lgettext(message) def dngettext(domain, msgid1, msgid2, n): @@ -597,15 +592,14 @@ def dngettext(domain, msgid1, msgid2, n): return t.ngettext(msgid1, msgid2, n) def ldngettext(domain, msgid1, msgid2, n): - codeset = _localecodesets.get(domain) try: - t = translation(domain, _localedirs.get(domain, None), codeset=codeset) + t = translation(domain, _localedirs.get(domain, None), + codeset=_localecodesets.get(domain)) except OSError: if n == 1: - tmsg = msgid1 + return msgid1 else: - tmsg = msgid2 - return tmsg.encode(codeset or locale.getpreferredencoding()) + return msgid2 return t.lngettext(msgid1, msgid2, n) def gettext(message): diff --git a/Lib/glob.py b/Lib/glob.py index 16330d8..002cd92 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -30,15 +30,16 @@ def iglob(pathname, *, recursive=False): If recursive is true, the pattern '**' will match any files and zero or more directories and subdirectories. """ - it = _iglob(pathname, recursive) + it = _iglob(pathname, recursive, False) if recursive and _isrecursive(pathname): s = next(it) # skip empty string assert not s return it -def _iglob(pathname, recursive): +def _iglob(pathname, recursive, dironly): dirname, basename = os.path.split(pathname) if not has_magic(pathname): + assert not dironly if basename: if os.path.lexists(pathname): yield pathname @@ -49,47 +50,39 @@ def _iglob(pathname, recursive): return if not dirname: if recursive and _isrecursive(basename): - yield from glob2(dirname, basename) + yield from _glob2(dirname, basename, dironly) else: - yield from glob1(dirname, basename) + yield from _glob1(dirname, basename, dironly) return # `os.path.split()` returns the argument itself as a dirname if it is a # drive or UNC path. Prevent an infinite recursion if a drive or UNC path # contains magic characters (i.e. r'\\?\C:'). if dirname != pathname and has_magic(dirname): - dirs = _iglob(dirname, recursive) + dirs = _iglob(dirname, recursive, True) else: dirs = [dirname] if has_magic(basename): if recursive and _isrecursive(basename): - glob_in_dir = glob2 + glob_in_dir = _glob2 else: - glob_in_dir = glob1 + glob_in_dir = _glob1 else: - glob_in_dir = glob0 + glob_in_dir = _glob0 for dirname in dirs: - for name in glob_in_dir(dirname, basename): + for name in glob_in_dir(dirname, basename, dironly): yield os.path.join(dirname, name) # These 2 helper functions non-recursively glob inside a literal directory. -# They return a list of basenames. `glob1` accepts a pattern while `glob0` +# They return a list of basenames. _glob1 accepts a pattern while _glob0 # takes a literal basename (so it only has to check for its existence). -def glob1(dirname, pattern): - if not dirname: - if isinstance(pattern, bytes): - dirname = bytes(os.curdir, 'ASCII') - else: - dirname = os.curdir - try: - names = os.listdir(dirname) - except OSError: - return [] +def _glob1(dirname, pattern, dironly): + names = list(_iterdir(dirname, dironly)) if not _ishidden(pattern): - names = [x for x in names if not _ishidden(x)] + names = (x for x in names if not _ishidden(x)) return fnmatch.filter(names, pattern) -def glob0(dirname, basename): +def _glob0(dirname, basename, dironly): if not basename: # `os.path.split()` returns an empty basename for paths ending with a # directory separator. 'q*x/' should match only directories. @@ -100,30 +93,49 @@ def glob0(dirname, basename): return [basename] return [] +# Following functions are not public but can be used by third-party code. + +def glob0(dirname, pattern): + return _glob0(dirname, pattern, False) + +def glob1(dirname, pattern): + return _glob1(dirname, pattern, False) + # This helper function recursively yields relative pathnames inside a literal # directory. -def glob2(dirname, pattern): +def _glob2(dirname, pattern, dironly): assert _isrecursive(pattern) yield pattern[:0] - yield from _rlistdir(dirname) + yield from _rlistdir(dirname, dironly) -# Recursively yields relative pathnames inside a literal directory. -def _rlistdir(dirname): +# If dironly is false, yields all file names inside a directory. +# If dironly is true, yields only directory names. +def _iterdir(dirname, dironly): if not dirname: if isinstance(dirname, bytes): dirname = bytes(os.curdir, 'ASCII') else: dirname = os.curdir try: - names = os.listdir(dirname) - except os.error: + with os.scandir(dirname) as it: + for entry in it: + try: + if not dironly or entry.is_dir(): + yield entry.name + except OSError: + pass + except OSError: return + +# Recursively yields relative pathnames inside a literal directory. +def _rlistdir(dirname, dironly): + names = list(_iterdir(dirname, dironly)) for x in names: if not _ishidden(x): yield x path = os.path.join(dirname, x) if dirname else x - for y in _rlistdir(path): + for y in _rlistdir(path, dironly): yield os.path.join(x, y) diff --git a/Lib/gzip.py b/Lib/gzip.py index da4479e..76ab497 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -49,7 +49,7 @@ def open(filename, mode="rb", compresslevel=9, raise ValueError("Argument 'newline' not supported in binary mode") gz_mode = mode.replace("t", "") - if isinstance(filename, (str, bytes)): + if isinstance(filename, (str, bytes, os.PathLike)): binary_file = GzipFile(filename, gz_mode, compresslevel) elif hasattr(filename, "read") or hasattr(filename, "write"): binary_file = GzipFile(None, gz_mode, compresslevel, filename) @@ -165,6 +165,8 @@ class GzipFile(_compression.BaseStream): filename = getattr(fileobj, 'name', '') if not isinstance(filename, (str, bytes)): filename = '' + else: + filename = os.fspath(filename) if mode is None: mode = getattr(fileobj, 'mode', 'rb') @@ -357,10 +359,10 @@ class GzipFile(_compression.BaseStream): if offset < self.offset: raise OSError('Negative seek in write mode') count = offset - self.offset - chunk = bytes(1024) + chunk = b'\0' * 1024 for i in range(count // 1024): self.write(chunk) - self.write(bytes(count % 1024)) + self.write(b'\0' * (count % 1024)) elif self.mode == READ: self._check_not_closed() return self._buffer.seek(offset, whence) diff --git a/Lib/hashlib.py b/Lib/hashlib.py index 316cece..053a7ad 100644 --- a/Lib/hashlib.py +++ b/Lib/hashlib.py @@ -4,14 +4,15 @@ __doc__ = """hashlib module - A common interface to many hash functions. -new(name, data=b'') - returns a new hash object implementing the - given hash function; initializing the hash - using the given binary data. +new(name, data=b'', **kwargs) - returns a new hash object implementing the + given hash function; initializing the hash + using the given binary data. Named constructor functions are also available, these are faster than using new(name): -md5(), sha1(), sha224(), sha256(), sha384(), and sha512() +md5(), sha1(), sha224(), sha256(), sha384(), sha512(), blake2b(), blake2s(), +sha3_224, sha3_256, sha3_384, sha3_512, shake_128, and shake_256. More algorithms may be available on your platform but the above are guaranteed to exist. See the algorithms_guaranteed and algorithms_available attributes @@ -54,7 +55,11 @@ More condensed: # This tuple and __get_builtin_constructor() must be modified if a new # always available algorithm is added. -__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512') +__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512', + 'blake2b', 'blake2s', + 'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512', + 'shake_128', 'shake_256') + algorithms_guaranteed = set(__always_supported) algorithms_available = set(__always_supported) @@ -85,6 +90,19 @@ def __get_builtin_constructor(name): import _sha512 cache['SHA384'] = cache['sha384'] = _sha512.sha384 cache['SHA512'] = cache['sha512'] = _sha512.sha512 + elif name in ('blake2b', 'blake2s'): + import _blake2 + cache['blake2b'] = _blake2.blake2b + cache['blake2s'] = _blake2.blake2s + elif name in {'sha3_224', 'sha3_256', 'sha3_384', 'sha3_512', + 'shake_128', 'shake_256'}: + import _sha3 + cache['sha3_224'] = _sha3.sha3_224 + cache['sha3_256'] = _sha3.sha3_256 + cache['sha3_384'] = _sha3.sha3_384 + cache['sha3_512'] = _sha3.sha3_512 + cache['shake_128'] = _sha3.shake_128 + cache['shake_256'] = _sha3.shake_256 except ImportError: pass # no extension module, this hash is unsupported. @@ -96,6 +114,9 @@ def __get_builtin_constructor(name): def __get_openssl_constructor(name): + if name in {'blake2b', 'blake2s'}: + # Prefer our blake2 implementation. + return __get_builtin_constructor(name) try: f = getattr(_hashlib, 'openssl_' + name) # Allow the C module to raise ValueError. The function will be @@ -107,17 +128,23 @@ def __get_openssl_constructor(name): return __get_builtin_constructor(name) -def __py_new(name, data=b''): - """new(name, data=b'') - Return a new hashing object using the named algorithm; - optionally initialized with data (which must be bytes). +def __py_new(name, data=b'', **kwargs): + """new(name, data=b'', **kwargs) - Return a new hashing object using the + named algorithm; optionally initialized with data (which must be bytes). """ - return __get_builtin_constructor(name)(data) + return __get_builtin_constructor(name)(data, **kwargs) -def __hash_new(name, data=b''): +def __hash_new(name, data=b'', **kwargs): """new(name, data=b'') - Return a new hashing object using the named algorithm; optionally initialized with data (which must be bytes). """ + if name in {'blake2b', 'blake2s'}: + # Prefer our blake2 implementation. + # OpenSSL 1.1.0 comes with a limited implementation of blake2b/s. + # It does neither support keyed blake2 nor advanced features like + # salt, personal, tree hashing or SSE. + return __get_builtin_constructor(name)(data, **kwargs) try: return _hashlib.new(name, data) except ValueError: @@ -202,6 +229,12 @@ except ImportError: return dkey[:dklen] +try: + # OpenSSL's scrypt requires OpenSSL 1.1+ + from _hashlib import scrypt +except ImportError: + pass + for __func_name in __always_supported: # try them all, some may not work due to the OpenSSL @@ -212,6 +245,7 @@ for __func_name in __always_supported: import logging logging.exception('code for hash %s was not found.', __func_name) + # Cleanup locals() del __always_supported, __func_name, __get_hash del __py_new, __hash_new, __get_openssl_constructor diff --git a/Lib/hmac.py b/Lib/hmac.py index 77785a2..121029a 100644 --- a/Lib/hmac.py +++ b/Lib/hmac.py @@ -77,7 +77,7 @@ class HMAC: if len(key) > blocksize: key = self.digest_cons(key).digest() - key = key + bytes(blocksize - len(key)) + key = key.ljust(blocksize, b'\0') self.outer.update(key.translate(trans_5C)) self.inner.update(key.translate(trans_36)) if msg is not None: diff --git a/Lib/html/parser.py b/Lib/html/parser.py index b781c63..ef869bc 100644 --- a/Lib/html/parser.py +++ b/Lib/html/parser.py @@ -34,7 +34,7 @@ commentclose = re.compile(r'--\s*>') # explode, so don't do it. # see http://www.w3.org/TR/html5/tokenization.html#tag-open-state # and http://www.w3.org/TR/html5/tokenization.html#tag-name-state -tagfind_tolerant = re.compile('([a-zA-Z][^\t\n\r\f />\x00]*)(?:\s|/(?!>))*') +tagfind_tolerant = re.compile(r'([a-zA-Z][^\t\n\r\f />\x00]*)(?:\s|/(?!>))*') attrfind_tolerant = re.compile( r'((?<=[\'"\s/])[^\s/>][^\s/=>]*)(\s*=+\s*' r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?(?:\s|/(?!>))*') @@ -56,7 +56,7 @@ locatestarttagend_tolerant = re.compile(r""" endendtag = re.compile('>') # the HTML 5 spec, section 8.1.2.2, doesn't allow spaces between # ') +endtagfind = re.compile(r'') diff --git a/Lib/http/client.py b/Lib/http/client.py index 352c101..a8e59b9 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -1,4 +1,4 @@ -"""HTTP/1.1 client library +r"""HTTP/1.1 client library @@ -420,6 +420,7 @@ class HTTPResponse(io.BufferedIOBase): self.fp.flush() def readable(self): + """Always returns True""" return True # End of "raw stream" methods @@ -467,6 +468,10 @@ class HTTPResponse(io.BufferedIOBase): return s def readinto(self, b): + """Read up to len(b) bytes into bytearray b and return the number + of bytes read. + """ + if self.fp is None: return 0 @@ -706,6 +711,17 @@ class HTTPResponse(io.BufferedIOBase): return self.fp.fileno() def getheader(self, name, default=None): + '''Returns the value of the header matching *name*. + + If there are multiple matching headers, the values are + combined into a single string separated by commas and spaces. + + If no matching header is found, returns *default* or None if + the *default* is not specified. + + If the headers are unknown, raises http.client.ResponseNotReady. + + ''' if self.headers is None: raise ResponseNotReady() headers = self.headers.get_all(name) or default @@ -728,12 +744,45 @@ class HTTPResponse(io.BufferedIOBase): # For compatibility with old-style urllib responses. def info(self): + '''Returns an instance of the class mimetools.Message containing + meta-information associated with the URL. + + When the method is HTTP, these headers are those returned by + the server at the head of the retrieved HTML page (including + Content-Length and Content-Type). + + When the method is FTP, a Content-Length header will be + present if (as is now usual) the server passed back a file + length in response to the FTP retrieval request. A + Content-Type header will be present if the MIME type can be + guessed. + + When the method is local-file, returned headers will include + a Date representing the file's last-modified time, a + Content-Length giving file size, and a Content-Type + containing a guess at the file's type. See also the + description of the mimetools module. + + ''' return self.headers def geturl(self): + '''Return the real URL of the page. + + In some cases, the HTTP server redirects a client to another + URL. The urlopen() function handles this transparently, but in + some cases the caller needs to know which URL the client was + redirected to. The geturl() method can be used to get at this + redirected URL. + + ''' return self.url def getcode(self): + '''Return the HTTP status code that was sent with the response, + or None if the URL is not an HTTP URL. + + ''' return self.status class HTTPConnection: @@ -746,6 +795,44 @@ class HTTPConnection: auto_open = 1 debuglevel = 0 + @staticmethod + def _is_textIO(stream): + """Test whether a file-like object is a text or a binary stream. + """ + return isinstance(stream, io.TextIOBase) + + @staticmethod + def _get_content_length(body, method): + """Get the content-length based on the body. + + If the body is None, we set Content-Length: 0 for methods that expect + a body (RFC 7230, Section 3.3.2). We also set the Content-Length for + any method if the body is a str or bytes-like object and not a file. + """ + if body is None: + # do an explicit check for not None here to distinguish + # between unset and set but empty + if method.upper() in _METHODS_EXPECTING_BODY: + return 0 + else: + return None + + if hasattr(body, 'read'): + # file-like object. + return None + + try: + # does it implement the buffer protocol (bytes, bytearray, array)? + mv = memoryview(body) + return mv.nbytes + except TypeError: + pass + + if isinstance(body, str): + return len(body) + + return None + def __init__(self, host, port=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, source_address=None): self.timeout = timeout @@ -884,18 +971,9 @@ class HTTPConnection: if hasattr(data, "read") : if self.debuglevel > 0: print("sendIng a read()able") - encode = False - try: - mode = data.mode - except AttributeError: - # io.BytesIO and other file-like objects don't have a `mode` - # attribute. - pass - else: - if "b" not in mode: - encode = True - if self.debuglevel > 0: - print("encoding file using iso-8859-1") + encode = self._is_textIO(data) + if encode and self.debuglevel > 0: + print("encoding file using iso-8859-1") while 1: datablock = data.read(blocksize) if not datablock: @@ -921,7 +999,22 @@ class HTTPConnection: """ self._buffer.append(s) - def _send_output(self, message_body=None): + def _read_readable(self, readable): + blocksize = 8192 + if self.debuglevel > 0: + print("sendIng a read()able") + encode = self._is_textIO(readable) + if encode and self.debuglevel > 0: + print("encoding file using iso-8859-1") + while True: + datablock = readable.read(blocksize) + if not datablock: + break + if encode: + datablock = datablock.encode("iso-8859-1") + yield datablock + + def _send_output(self, message_body=None, encode_chunked=False): """Send the currently buffered request and clear the buffer. Appends an extra \\r\\n to the buffer. @@ -930,10 +1023,50 @@ class HTTPConnection: self._buffer.extend((b"", b"")) msg = b"\r\n".join(self._buffer) del self._buffer[:] - self.send(msg) + if message_body is not None: - self.send(message_body) + + # create a consistent interface to message_body + if hasattr(message_body, 'read'): + # Let file-like take precedence over byte-like. This + # is needed to allow the current position of mmap'ed + # files to be taken into account. + chunks = self._read_readable(message_body) + else: + try: + # this is solely to check to see if message_body + # implements the buffer API. it /would/ be easier + # to capture if PyObject_CheckBuffer was exposed + # to Python. + memoryview(message_body) + except TypeError: + try: + chunks = iter(message_body) + except TypeError: + raise TypeError("message_body should be a bytes-like " + "object or an iterable, got %r" + % type(message_body)) + else: + # the object implements the buffer interface and + # can be passed directly into socket methods + chunks = (message_body,) + + for chunk in chunks: + if not chunk: + if self.debuglevel > 0: + print('Zero length chunk ignored') + continue + + if encode_chunked and self._http_vsn == 11: + # chunked encoding + chunk = f'{len(chunk):X}\r\n'.encode('ascii') + chunk \ + + b'\r\n' + self.send(chunk) + + if encode_chunked and self._http_vsn == 11: + # end chunked transfer + self.send(b'0\r\n\r\n') def putrequest(self, method, url, skip_host=False, skip_accept_encoding=False): @@ -1087,52 +1220,27 @@ class HTTPConnection: header = header + b': ' + value self._output(header) - def endheaders(self, message_body=None): + def endheaders(self, message_body=None, *, encode_chunked=False): """Indicate that the last header line has been sent to the server. This method sends the request to the server. The optional message_body argument can be used to pass a message body associated with the - request. The message body will be sent in the same packet as the - message headers if it is a string, otherwise it is sent as a separate - packet. + request. """ if self.__state == _CS_REQ_STARTED: self.__state = _CS_REQ_SENT else: raise CannotSendHeader() - self._send_output(message_body) + self._send_output(message_body, encode_chunked=encode_chunked) - def request(self, method, url, body=None, headers={}): + def request(self, method, url, body=None, headers={}, *, + encode_chunked=False): """Send a complete request to the server.""" - self._send_request(method, url, body, headers) - - def _set_content_length(self, body, method): - # Set the content-length based on the body. If the body is "empty", we - # set Content-Length: 0 for methods that expect a body (RFC 7230, - # Section 3.3.2). If the body is set for other methods, we set the - # header provided we can figure out what the length is. - thelen = None - method_expects_body = method.upper() in _METHODS_EXPECTING_BODY - if body is None and method_expects_body: - thelen = '0' - elif body is not None: - try: - thelen = str(len(body)) - except TypeError: - # If this is a file-like object, try to - # fstat its file descriptor - try: - thelen = str(os.fstat(body.fileno()).st_size) - except (AttributeError, OSError): - # Don't send a length if this failed - if self.debuglevel > 0: print("Cannot stat!!") - - if thelen is not None: - self.putheader('Content-Length', thelen) + self._send_request(method, url, body, headers, encode_chunked) - def _send_request(self, method, url, body, headers): + def _send_request(self, method, url, body, headers, encode_chunked): # Honor explicitly requested Host: and Accept-Encoding: headers. - header_names = dict.fromkeys([k.lower() for k in headers]) + header_names = frozenset(k.lower() for k in headers) skips = {} if 'host' in header_names: skips['skip_host'] = 1 @@ -1141,15 +1249,40 @@ class HTTPConnection: self.putrequest(method, url, **skips) + # chunked encoding will happen if HTTP/1.1 is used and either + # the caller passes encode_chunked=True or the following + # conditions hold: + # 1. content-length has not been explicitly set + # 2. the body is a file or iterable, but not a str or bytes-like + # 3. Transfer-Encoding has NOT been explicitly set by the caller + if 'content-length' not in header_names: - self._set_content_length(body, method) + # only chunk body if not explicitly set for backwards + # compatibility, assuming the client code is already handling the + # chunking + if 'transfer-encoding' not in header_names: + # if content-length cannot be automatically determined, fall + # back to chunked encoding + encode_chunked = False + content_length = self._get_content_length(body, method) + if content_length is None: + if body is not None: + if self.debuglevel > 0: + print('Unable to determine size of %r' % body) + encode_chunked = True + self.putheader('Transfer-Encoding', 'chunked') + else: + self.putheader('Content-Length', str(content_length)) + else: + encode_chunked = False + for hdr, value in headers.items(): self.putheader(hdr, value) if isinstance(body, str): # RFC 2616 Section 3.7.1 says that text default has a # default charset of iso-8859-1. body = _encode(body, 'body') - self.endheaders(body) + self.endheaders(body, encode_chunked=encode_chunked) def getresponse(self): """Get the response from the server. @@ -1232,6 +1365,12 @@ else: check_hostname=None): super(HTTPSConnection, self).__init__(host, port, timeout, source_address) + if (key_file is not None or cert_file is not None or + check_hostname is not None): + import warnings + warnings.warn("key_file, cert_file and check_hostname are " + "deprecated, use a custom context instead.", + DeprecationWarning, 2) self.key_file = key_file self.cert_file = cert_file if context is None: diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index 6d4572a..adf956d 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -200,7 +200,7 @@ def _str2time(day, mon, yr, hr, min, sec, tz): STRICT_DATE_RE = re.compile( r"^[SMTWF][a-z][a-z], (\d\d) ([JFMASOND][a-z][a-z]) " - "(\d\d\d\d) (\d\d):(\d\d):(\d\d) GMT$", re.ASCII) + r"(\d\d\d\d) (\d\d):(\d\d):(\d\d) GMT$", re.ASCII) WEEKDAY_RE = re.compile( r"^(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[a-z]*,?\s*", re.I | re.ASCII) LOOSE_HTTP_DATE_RE = re.compile( @@ -277,7 +277,7 @@ def http2time(text): return _str2time(day, mon, yr, hr, min, sec, tz) ISO_DATE_RE = re.compile( - """^ + r"""^ (\d{4}) # year [-\/]? (\d\d?) # numerical month @@ -411,7 +411,7 @@ def split_header_words(header_values): pairs = [] else: # skip junk - non_junk, nr_junk_chars = re.subn("^[=\s;]*", "", text) + non_junk, nr_junk_chars = re.subn(r"^[=\s;]*", "", text) assert nr_junk_chars > 0, ( "split_header_words bug: '%s', '%s', %s" % (orig_text, text, pairs)) diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index a73fe38..be3b080 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -456,9 +456,8 @@ class Morsel(dict): # _LegalKeyChars = r"\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=" -_LegalValueChars = _LegalKeyChars + '\[\]' +_LegalValueChars = _LegalKeyChars + r'\[\]' _CookiePattern = re.compile(r""" - (?x) # This is a verbose pattern \s* # Optional whitespace at start of cookie (?P # Start of group 'key' [""" + _LegalKeyChars + r"""]+? # Any word of at least one letter @@ -475,7 +474,7 @@ _CookiePattern = re.compile(r""" )? # End of optional value group \s* # Any number of spaces. (\s+|;|$) # Ending either at space, semicolon, or EOS. - """, re.ASCII) # May be removed if safe. + """, re.ASCII | re.VERBOSE) # re.ASCII may be removed if safe. # At long last, here is the cookie class. Using this class is almost just like diff --git a/Lib/http/server.py b/Lib/http/server.py index 00620d1..e12e45b 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -87,6 +87,7 @@ __all__ = [ "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler", ] +import email.utils import html import http.client import io @@ -126,9 +127,6 @@ DEFAULT_ERROR_MESSAGE = """\ DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8" -def _quote_html(html): - return html.replace("&", "&").replace("<", "<").replace(">", ">") - class HTTPServer(socketserver.TCPServer): allow_reuse_address = 1 # Seems to make sense in testing environment @@ -136,7 +134,7 @@ class HTTPServer(socketserver.TCPServer): def server_bind(self): """Override server_bind to store the server name.""" socketserver.TCPServer.server_bind(self) - host, port = self.socket.getsockname()[:2] + host, port = self.server_address[:2] self.server_name = socket.getfqdn(host) self.server_port = port @@ -282,12 +280,9 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): words = requestline.split() if len(words) == 3: command, path, version = words - if version[:5] != 'HTTP/': - self.send_error( - HTTPStatus.BAD_REQUEST, - "Bad request version (%r)" % version) - return False try: + if version[:5] != 'HTTP/': + raise ValueError base_version_number = version.split('/', 1)[1] version_number = base_version_number.split(".") # RFC 2145 section 3.1 says there can be only one "." and @@ -309,7 +304,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): if version_number >= (2, 0): self.send_error( HTTPStatus.HTTP_VERSION_NOT_SUPPORTED, - "Invalid HTTP Version (%s)" % base_version_number) + "Invalid HTTP version (%s)" % base_version_number) return False elif len(words) == 2: command, path = words @@ -332,10 +327,11 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): try: self.headers = http.client.parse_headers(self.rfile, _class=self.MessageClass) - except http.client.LineTooLong: + except http.client.LineTooLong as err: self.send_error( - HTTPStatus.BAD_REQUEST, - "Line too long") + HTTPStatus.REQUEST_HEADER_FIELDS_TOO_LARGE, + "Line too long", + str(err)) return False except http.client.HTTPException as err: self.send_error( @@ -465,8 +461,8 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): # (see bug #1100201) content = (self.error_message_format % { 'code': code, - 'message': _quote_html(message), - 'explain': _quote_html(explain) + 'message': html.escape(message, quote=False), + 'explain': html.escape(explain, quote=False) }) body = content.encode('UTF-8', 'replace') self.send_header("Content-Type", self.error_content_type) @@ -491,12 +487,12 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): def send_response_only(self, code, message=None): """Send the response header only.""" - if message is None: - if code in self.responses: - message = self.responses[code][0] - else: - message = '' if self.request_version != 'HTTP/0.9': + if message is None: + if code in self.responses: + message = self.responses[code][0] + else: + message = '' if not hasattr(self, '_headers_buffer'): self._headers_buffer = [] self._headers_buffer.append(("%s %d %s\r\n" % @@ -583,12 +579,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): """Return the current date and time formatted for a message header.""" if timestamp is None: timestamp = time.time() - year, month, day, hh, mm, ss, wd, y, z = time.gmtime(timestamp) - s = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % ( - self.weekdayname[wd], - day, self.monthname[month], year, - hh, mm, ss) - return s + return email.utils.formatdate(timestamp, usegmt=True) def log_date_time_string(self): """Return the current time formatted for logging.""" @@ -726,7 +717,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): errors='surrogatepass') except UnicodeDecodeError: displaypath = urllib.parse.unquote(path) - displaypath = html.escape(displaypath) + displaypath = html.escape(displaypath, quote=False) enc = sys.getfilesystemencoding() title = 'Directory listing for %s' % displaypath r.append('%s' % (urllib.parse.quote(linkname, errors='surrogatepass'), - html.escape(displayname))) + html.escape(displayname, quote=False))) r.append('\n
\n\n\n') encoded = '\n'.join(r).encode(enc, 'surrogateescape') f = io.BytesIO() @@ -1191,16 +1182,15 @@ def test(HandlerClass=BaseHTTPRequestHandler, server_address = (bind, port) HandlerClass.protocol_version = protocol - httpd = ServerClass(server_address, HandlerClass) - - sa = httpd.socket.getsockname() - print("Serving HTTP on", sa[0], "port", sa[1], "...") - try: - httpd.serve_forever() - except KeyboardInterrupt: - print("\nKeyboard interrupt received, exiting.") - httpd.server_close() - sys.exit(0) + with ServerClass(server_address, HandlerClass) as httpd: + sa = httpd.socket.getsockname() + serve_message = "Serving HTTP on {host} port {port} (http://{host}:{port}/) ..." + print(serve_message.format(host=sa[0], port=sa[1])) + try: + httpd.serve_forever() + except KeyboardInterrupt: + print("\nKeyboard interrupt received, exiting.") + sys.exit(0) if __name__ == '__main__': parser = argparse.ArgumentParser() diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 72905c1..a3fc501 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,45 +1,101 @@ -What's New in IDLE 3.5.3? -========================= -*Release date: 2017-01-01?* +What's New in IDLE 3.6.0? +=========================== +*Release date: 2016-12-16?* - Issue #15308: Add 'interrupt execution' (^C) to Shell menu. Patch by Roger Serwy, updated by Bayard Randel. - Issue #27922: Stop IDLE tests from 'flashing' gui widgets on the screen. +- Issue #27891: Consistently group and sort imports within idlelib modules. + +- Issue #17642: add larger font sizes for classroom projection. + - Add version to title of IDLE help window. - Issue #25564: In section on IDLE -- console differences, mention that using exec means that __builtins__ is defined for each statement. +- Issue #27821: Fix 3.6.0a3 regression that prevented custom key sets + from being selected when no custom theme was defined. + - Issue #27714: text_textview and test_autocomplete now pass when re-run in the same process. This occurs when test_idle fails when run with the -w option but without -jn. Fix warning from test_config. +- Issue #27621: Put query response validation error messages in the query + box itself instead of in a separate massagebox. Redo tests to match. + Add Mac OSX refinements. Original patch by Mark Roseman. + +- Issue #27620: Escape key now closes Query box as cancelled. + +- Issue #27609: IDLE: tab after initial whitespace should tab, not + autocomplete. This fixes problem with writing docstrings at least + twice indented. + +- Issue #27609: Explicitly return None when there are also non-None + returns. In a few cases, reverse a condition and eliminate a return. + - Issue #25507: IDLE no longer runs buggy code because of its tkinter imports. Users must include the same imports required to run directly in Python. +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. + +- Issue #27452: add line counter and crc to IDLE configHandler test dump. + +- Issue #27477: IDLE search dialogs now use ttk widgets. + +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. + +- Issue #27452: make command line "idle-test> python test_help.py" work. + __file__ is relative when python is started in the file's directory. + - Issue #27452: add line counter and crc to IDLE configHandler test dump. +- Issue #27380: IDLE: add query.py with base Query dialog and ttk widgets. + Module had subclasses SectionName, ModuleName, and HelpSource, which are + used to get information from users by configdialog and file =>Load Module. + Each subclass has itw own validity checks. Using ModuleName allows users + to edit bad module names instead of starting over. + Add tests and delete the two files combined into the new one. + +- Issue #27372: Test_idle no longer changes the locale. + - Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names. - Issue #27245: IDLE: Cleanly delete custom themes and key bindings. Previously, when IDLE was started from a console or by import, a cascade of warnings was emitted. Patch by Serhiy Storchaka. +- Issue #24137: Run IDLE, test_idle, and htest with tkinter default root disabled. + Fix code and tests that fail with this restriction. + Fix htests to not create a second and redundant root and mainloop. -What's New in IDLE 3.5.2? -========================= -*Release date: 2016-06-26* +- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import. - Issue #5124: Paste with text selected now replaces the selection on X11. This matches how paste works on Windows, Mac, most modern Linux apps, and ttk widgets. Original patch by Serhiy Storchaka. +- Issue #24750: Switch all scrollbars in IDLE to ttk versions. + Where needed, minimal tests are added to cover changes. + +- Issue #24759: IDLE requires tk 8.5 and availability ttk widgets. + Delete now unneeded tk version tests and code for older versions. + Add test for IDLE syntax colorizer. + +- Issue #27239: idlelib.macosx.isXyzTk functions initialize as needed. + +- Issue #27262: move Aqua unbinding code, which enable context menus, to maxosx. + - Issue #24759: Make clear in idlelib.idle_test.__init__ that the directory is a private implementation of test.test_idle and tool for maintainers. -- Issue #27196: Stop 'ThemeChangef' warnings when running IDLE tests. +- Issue #27196: Stop 'ThemeChanged' warnings when running IDLE tests. These persisted after other warnings were suppressed in #20567. Apply Serhiy Storchaka's update_idletasks solution to four test files. Record this additional advice in idle_test/README.txt @@ -47,9 +103,26 @@ What's New in IDLE 3.5.2? - Issue #20567: Revise idle_test/README.txt with advice about avoiding tk warning messages from tests. Apply advice to several IDLE tests. +- Issue # 24225: Update idlelib/README.txt with new file names + and event handlers. + +- Issue #27156: Remove obsolete code not used by IDLE. Replacements: + 1. help.txt, replaced by help.html, is out-of-date and should not be used. + Its dedicated viewer has be replaced by the html viewer in help.py. + 2. 'import idlever; I = idlever.IDLE_VERSION' is the same as + 'import sys; I = version[:version.index(' ')]' + 3. After 'ob = stackviewer.VariablesTreeItem(*args)', + 'ob.keys()' == 'list(ob.object.keys). + 4. In macosc, runningAsOSXAPP == isAquaTk; idCarbonAquaTk == isCarbonTk + - Issue #27117: Make colorizer htest and turtledemo work with dark themes. Move code for configuring text widget colors to a new function. +- Issue #24225: Rename many idlelib/*.py and idle_test/test_*.py files. + Edit files to replace old names with new names when the old name + referred to the module rather than the class it contained. + See the issue and IDLE section in What's New in 3.6 for more. + - Issue #26673: When tk reports font size as 0, change to size 10. Such fonts on Linux prevented the configuration dialog from opening. @@ -62,8 +135,8 @@ What's New in IDLE 3.5.2? - Issue #18410: Add test for IDLE's search dialog. Original patch by Westley Martínez. -- Issue #21703: Add test for undo delegator. - Original patch by Saimadhav Heblikar . +- Issue #21703: Add test for undo delegator. Patch mostly by + Saimadhav Heblikar . - Issue #27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks. @@ -82,11 +155,6 @@ What's New in IDLE 3.5.2? MARK in README.txt and open this and NEWS.txt with 'ascii'. Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'. - -What's New in IDLE 3.5.1? -========================= -*Release date: 2015-12-06* - - Issue 15348: Stop the debugger engine (normally in a user process) before closing the debugger window (running in the IDLE process). This prevents the RuntimeErrors that were being caught and ignored. diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt index ff44504..51e8ef5 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -29,61 +29,61 @@ idle.pyw Implementation -------------- -AutoComplete.py # Complete attribute names or filenames. -AutoCompleteWindow.py # Display completions. -AutoExpand.py # Expand word with previous word in file. -Bindings.py # Define most of IDLE menu. -CallTipWindow.py # Display calltip. -CallTips.py # Create calltip text. -ClassBrowser.py # Create module browser window. -CodeContext.py # Show compound statement headers otherwise not visible. -ColorDelegator.py # Colorize text (nim). -Debugger.py # Debug code run from editor; show window. -Delegator.py # Define base class for delegators (nim). -EditorWindow.py # Define most of editor and utility functions. -FileList.py # Open files and manage list of open windows (nim). -FormatParagraph.py# Re-wrap multiline strings and comments. -GrepDialog.py # Find all occurrences of pattern in multiple files. -HyperParser.py # Parse code around a given index. -IOBinding.py # Open, read, and write files -IdleHistory.py # Get previous or next user input in shell (nim) -MultiCall.py # Wrap tk widget to allow multiple calls per event (nim). -MultiStatusBar.py # Define status bar for windows (nim). -ObjectBrowser.py # Define class used in StackViewer (nim). -OutputWindow.py # Create window for grep output. -ParenMatch.py # Match fenceposts: (), [], and {}. -PathBrowser.py # Create path browser window. -Percolator.py # Manage delegator stack (nim). -PyParse.py # Give information on code indentation -PyShell.py # Start IDLE, manage shell, complete editor window -RemoteDebugger.py # Debug code run in remote process. -RemoteObjectBrowser.py # Communicate objects between processes with rpc (nim). -ReplaceDialog.py # Search and replace pattern in text. -RstripExtension.py# Strip trailing whitespace -ScriptBinding.py # Check and run user code. -ScrolledList.py # Define ScrolledList widget for IDLE (nim). -SearchDialog.py # Search for pattern in text. -SearchDialogBase.py # Define base for search, replace, and grep dialogs. -SearchEngine.py # Define engine for all 3 search dialogs. -StackViewer.py # View stack after exception. -TreeWidget.py # Define tree widger, used in browsers (nim). -UndoDelegator.py # Manage undo stack. -WidgetRedirector.py # Intercept widget subcommands (for percolator) (nim). -WindowList.py # Manage window list and define listed top level. -ZoomHeight.py # Zoom window to full height of screen. -aboutDialog.py # Display About IDLE dialog. -configDialog.py # Display user configuration dialogs. -configHandler.py # Load, fetch, and save configuration (nim). -configHelpSourceEdit.py # Specify help source. -configSectionNameDialog.py # Spefify user config section name -dynOptionMenuWidget.py # define mutable OptionMenu widget (nim). +autocomplete.py # Complete attribute names or filenames. +autocomplete_w.py # Display completions. +autoexpand.py # Expand word with previous word in file. +browser.py # Create module browser window. +calltip_w.py # Display calltip. +calltips.py # Create calltip text. +codecontext.py # Show compound statement headers otherwise not visible. +colorizer.py # Colorize text (nim) +config.py # Load, fetch, and save configuration (nim). +configdialog.py # Display user configuration dialogs. +config_help.py # Specify help source in configdialog. +config_key.py # Change keybindings. +dynoption.py # Define mutable OptionMenu widget (nim). +debugobj.py # Define class used in stackviewer. +debugobj_r.py # Communicate objects between processes with rpc (nim). +debugger.py # Debug code run from shell or editor; show window. +debugger_r.py # Debug code run in remote process. +delegator.py # Define base class for delegators (nim). +editor.py # Define most of editor and utility functions. +filelist.py # Open files and manage list of open windows (nim). +grep.py # Find all occurrences of pattern in multiple files. help.py # Display IDLE's html doc. -keybindingDialog.py # Change keybindings. -macosxSupport.py # Help IDLE run on Macs (nim). +help_about.py # Display About IDLE dialog. +history.py # Get previous or next user input in shell (nim) +hyperparser.py # Parse code around a given index. +iomenu.py # Open, read, and write files +macosx.py # Help IDLE run on Macs (nim). +mainmenu.py # Define most of IDLE menu. +multicall.py # Wrap tk widget to allow multiple calls per event (nim). +outwin.py # Create window for grep output. +paragraph.py # Re-wrap multiline strings and comments. +parenmatch.py # Match fenceposts: (), [], and {}. +pathbrowser.py # Create path browser window. +percolator.py # Manage delegator stack (nim). +pyparse.py # Give information on code indentation +pyshell.py # Start IDLE, manage shell, complete editor window +query.py # Query user for information +redirector.py # Intercept widget subcommands (for percolator) (nim). +replace.py # Search and replace pattern in text. rpc.py # Commuicate between idle and user processes (nim). +rstrip.py # Strip trailing whitespace. run.py # Manage user code execution subprocess. +runscript.py # Check and run user code. +scrolledlist.py # Define scrolledlist widget for IDLE (nim). +search.py # Search for pattern in text. +searchbase.py # Define base for search, replace, and grep dialogs. +searchengine.py # Define engine for all 3 search dialogs. +stackviewer.py # View stack after exception. +statusbar.py # Define status bar for windows (nim). tabbedpages.py # Define tabbed pages widget (nim). -textView.py # Define read-only text widget (nim). +textview.py # Define read-only text widget (nim). +tree.py # Define tree widger, used in browsers (nim). +undo.py # Manage undo stack. +windows.py # Manage window list and define listed top level. +zoomheight.py # Zoom window to full height of screen. Configuration ------------- @@ -104,127 +104,148 @@ help.html # copy of idle.html in docs, displayed by IDLE Help Subdirectories -------------- -Icons # small image files -idle_test # files for human test and automated unit tests +Icons # small image files +idle_test # files for human test and automated unit tests Unused and Deprecated files and objects (nim) --------------------------------------------- -EditorWindow.py: Helpdialog and helpDialog -ToolTip.py: unused. -help.txt -idlever.py +tooltip.py # unused + IDLE MENUS -Top level items and most submenu items are defined in Bindings. +Top level items and most submenu items are defined in mainmenu. Extenstions add submenu items when active. The names given are found, quoted, in one of these modules, paired with a '<>'. Each pseudoevent is bound to an event handler. Some event handlers call another function that does the actual work. The annotations below are intended to at least give the module where the actual work is done. +'eEW' = editor.EditorWindow -File # IOBindig except as noted - New File - Open... # IOBinding.open - Open Module +File + New File # eEW.new_callback + Open... # iomenu.open + Open Module # eEw.open_module Recent Files - Class Browser # Class Browser - Path Browser # Path Browser + Class Browser # eEW.open_class_browser, browser.ClassBrowser + Path Browser # eEW.open_path_browser, pathbrowser --- - Save # IDBinding.save - Save As... # IOBinding.save_as - Save Copy As... # IOBindling.save_a_copy + Save # iomenu.save + Save As... # iomenu.save_as + Save Copy As... # iomenu.save_a_copy --- - Print Window # IOBinding.print_window + Print Window # iomenu.print_window --- - Close - Exit + Close # eEW.close_event + Exit # flist.close_all_callback (bound in eEW) Edit - Undo # undoDelegator - Redo # undoDelegator - --- - Cut - Copy - Paste - Select All - --- # Next 5 items use SearchEngine; dialogs use SearchDialogBase - Find # Search Dialog - Find Again - Find Selection - Find in Files... # GrepDialog - Replace... # ReplaceDialog - Go to Line - Show Completions # AutoComplete extension and AutoCompleteWidow (&HP) - Expand Word # AutoExpand extension - Show call tip # Calltips extension and CalltipWindow (& Hyperparser) - Show surrounding parens # ParenMatch (& Hyperparser) - -Shell # PyShell - View Last Restart # PyShell.PyShell.view_restart_mark - Restart Shell # PyShell.PyShell.restart_shell + Undo # undodelegator + Redo # undodelegator + --- # eEW.right_menu_event + Cut # eEW.cut + Copy # eEW.copy + Paste # eEW.past + Select All # eEW.select_all (+ see eEW.remove_selection) + --- # Next 5 items use searchengine; dialogs use searchbase + Find # eEW.find_event, search.SearchDialog.find + Find Again # eEW.find_again_event, sSD.find_again + Find Selection # eEW.find_selection_event, sSD.find_selection + Find in Files... # eEW.find_in_files_event, grep + Replace... # eEW.replace_event, replace.ReplaceDialog.replace + Go to Line # eEW.goto_line_event + Show Completions # autocomplete extension and autocompleteWidow (&HP) + Expand Word # autoexpand extension + Show call tip # Calltips extension and CalltipWindow (& Hyperparser) + Show surrounding parens # parenmatch (& Hyperparser) + +Shell # pyshell + View Last Restart # pyshell.PyShell.view_restart_mark + Restart Shell # pyshell.PyShell.restart_shell Interrupt Execution # pyshell.PyShell.cancel_callback Debug (Shell only) Go to File/Line - Debugger # Debugger, RemoteDebugger, PyShell.toggle_debuger - Stack Viewer # StackViewer, PyShell.open_stack_viewer - Auto-open Stack Viewer # StackViewer + debugger # debugger, debugger_r, PyShell.toggle_debuger + Stack Viewer # stackviewer, PyShell.open_stack_viewer + Auto-open Stack Viewer # stackviewer Format (Editor only) - Indent Region - Dedent Region - Comment Out Region - Uncomment Region - Tabify Region - Untabify Region - Toggle Tabs - New Indent Width - Format Paragraph # FormatParagraph extension + Indent Region # eEW.indent_region_event + Dedent Region # eEW.dedent_region_event + Comment Out Reg. # eEW.comment_region_event + Uncomment Region # eEW.uncomment_region_event + Tabify Region # eEW.tabify_region_event + Untabify Region # eEW.untabify_region_event + Toggle Tabs # eEW.toggle_tabs_event + New Indent Width # eEW.change_indentwidth_event + Format Paragraph # paragraph extension --- - Strip tailing whitespace # RstripExtension extension + Strip tailing whitespace # rstrip extension Run (Editor only) - Python Shell # PyShell + Python Shell # pyshell --- - Check Module # ScriptBinding - Run Module # ScriptBinding + Check Module # runscript + Run Module # runscript Options - Configure IDLE # configDialog + Configure IDLE # eEW.config_dialog, configdialog (tabs in the dialog) - Font tab # onfig-main.def - Highlight tab # configSectionNameDialog, config-highlight.def - Keys tab # keybindingDialog, configSectionNameDialog, onfig-keus.def - General tab # configHelpSourceEdit, config-main.def - Configure Extensions # configDialog - Xyz tab # xyz.py, config-extensions.def + Font tab # config-main.def + Highlight tab # query, config-highlight.def + Keys tab # query, config_key, config_keys.def + General tab # config_help, config-main.def + Extensions tab # config-extensions.def, corresponding .py --- - Code Context (editor only) # CodeContext extension + Code Context (ed)# codecontext extension Window - Zoomheight # ZoomHeight extension + Zoomheight # zoomheight extension --- - # WindowList + # windows Help - About IDLE # aboutDialog + About IDLE # eEW.about_dialog, help_about.AboutDialog --- - IDLE Help # help - Python Doc - Turtle Demo + IDLE Help # eEW.help_dialog, helpshow_idlehelp + Python Doc # eEW.python_docs + Turtle Demo # eEW.open_turtle_demo --- (right click) -Defined in EditorWindow, PyShell, Output - Cut - Copy - Paste - --- - Go to file/line (shell and output only) - Set Breakpoint (editor only) - Clear Breakpoint (editor only) - Defined in Debugger - Go to source line - Show stack frame + Defined in editor, PyShelpyshellut + Cut + Copy + Paste + --- + Go to file/line (shell and output only) + Set Breakpoint (editor only) + Clear Breakpoint (editor only) + Defined in debugger + Go to source line + Show stack frame + + +Center Insert # eEW.center_insert_event + + +CODE STYLE -- Generally PEP 8. + +import +------ +Put import at the top, unless there is a good reason otherwise. +PEP 8 says to group stdlib, 3rd-party dependencies, and package imports. +For idlelib, the groups are general stdlib, tkinter, and idlelib. +Sort modules within each group, except that tkinter.ttk follows tkinter. +Sort 'from idlelib import mod1' and 'from idlelib.mod2 import object' +together by module, ignoring within module objects. +Put 'import __main__' after other idlelib imports. + +Imports only needed for testing are put not at the top but in an +htest function def or "if __name__ == '__main__'" clause. + +Within module imports like "from idlelib.mod import class" may cause +circular imports to deadlock. Even without this, circular imports may +require at least one of the imports to be delayed until a function call. diff --git a/Lib/idlelib/__init__.py b/Lib/idlelib/__init__.py index 208ced1..791ddea 100644 --- a/Lib/idlelib/__init__.py +++ b/Lib/idlelib/__init__.py @@ -1,6 +1,7 @@ """The idlelib package implements the Idle application. Idle includes an interactive shell and editor. +Starting with Python 3.6, IDLE requires tcl/tk 8.5 or later. Use the files named idle.* to start Idle. The other files are private implementations. Their details are subject to diff --git a/Lib/idlelib/__main__.py b/Lib/idlelib/__main__.py index 2edf5f7..6349ec7 100644 --- a/Lib/idlelib/__main__.py +++ b/Lib/idlelib/__main__.py @@ -3,6 +3,6 @@ IDLE main entry point Run IDLE as python -m idlelib """ -import idlelib.PyShell -idlelib.PyShell.main() +import idlelib.pyshell +idlelib.pyshell.main() # This file does not work for 2.7; See issue 24212. diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/autocomplete.py similarity index 85% rename from Lib/idlelib/AutoComplete.py rename to Lib/idlelib/autocomplete.py index ff085d5..1e44fa5 100644 --- a/Lib/idlelib/AutoComplete.py +++ b/Lib/idlelib/autocomplete.py @@ -1,29 +1,30 @@ -"""AutoComplete.py - An IDLE extension for automatically completing names. +"""autocomplete.py - An IDLE extension for automatically completing names. This extension can complete either attribute names or file names. It can pop a window with all available names, for the user to select from. """ import os -import sys import string +import sys -from idlelib.configHandler import idleConf - -# This string includes all chars that may be in an identifier -ID_CHARS = string.ascii_letters + string.digits + "_" - -# These constants represent the two different types of completions +# These constants represent the two different types of completions. +# They must be defined here so autocomple_w can import them. COMPLETE_ATTRIBUTES, COMPLETE_FILES = range(1, 2+1) -from idlelib import AutoCompleteWindow -from idlelib.HyperParser import HyperParser - +from idlelib import autocomplete_w +from idlelib.config import idleConf +from idlelib.hyperparser import HyperParser import __main__ +# This string includes all chars that may be in an identifier. +# TODO Update this here and elsewhere. +ID_CHARS = string.ascii_letters + string.digits + "_" + SEPS = os.sep if os.altsep: # e.g. '/' on Windows... SEPS += os.altsep + class AutoComplete: menudefs = [ @@ -37,19 +38,17 @@ class AutoComplete: def __init__(self, editwin=None): self.editwin = editwin - if editwin is None: # subprocess and test - return - self.text = editwin.text - self.autocompletewindow = None - - # id of delayed call, and the index of the text insert when the delayed - # call was issued. If _delayed_completion_id is None, there is no - # delayed call. - self._delayed_completion_id = None - self._delayed_completion_index = None + if editwin is not None: # not in subprocess or test + self.text = editwin.text + self.autocompletewindow = None + # id of delayed call, and the index of the text insert when + # the delayed call was issued. If _delayed_completion_id is + # None, there is no delayed call. + self._delayed_completion_id = None + self._delayed_completion_index = None def _make_autocomplete_window(self): - return AutoCompleteWindow.AutoCompleteWindow(self.text) + return autocomplete_w.AutoCompleteWindow(self.text) def _remove_autocomplete_window(self, event=None): if self.autocompletewindow: @@ -80,16 +79,17 @@ class AutoComplete: open a completion list after that (if there is more than one completion) """ - if hasattr(event, "mc_state") and event.mc_state: - # A modifier was pressed along with the tab, continue as usual. - return + if hasattr(event, "mc_state") and event.mc_state or\ + not self.text.get("insert linestart", "insert").strip(): + # A modifier was pressed along with the tab or + # there is only previous whitespace on this line, so tab. + return None if self.autocompletewindow and self.autocompletewindow.is_active(): self.autocompletewindow.complete() return "break" else: opened = self.open_completions(False, True, True) - if opened: - return "break" + return "break" if opened else None def _open_completions_later(self, *args): self._delayed_completion_index = self.text.index("insert") @@ -101,9 +101,8 @@ class AutoComplete: def _delayed_open_completions(self, *args): self._delayed_completion_id = None - if self.text.index("insert") != self._delayed_completion_index: - return - self.open_completions(*args) + if self.text.index("insert") == self._delayed_completion_index: + self.open_completions(*args) def open_completions(self, evalfuncs, complete, userWantsWin, mode=None): """Find the completions and create the AutoCompleteWindow. @@ -148,17 +147,17 @@ class AutoComplete: comp_what = hp.get_expression() if not comp_what or \ (not evalfuncs and comp_what.find('(') != -1): - return + return None else: comp_what = "" else: - return + return None if complete and not comp_what and not comp_start: - return + return None comp_lists = self.fetch_completions(comp_what, mode) if not comp_lists[0]: - return + return None self.autocompletewindow = self._make_autocomplete_window() return not self.autocompletewindow.show_window( comp_lists, "insert-%dc" % len(comp_start), diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/autocomplete_w.py similarity index 95% rename from Lib/idlelib/AutoCompleteWindow.py rename to Lib/idlelib/autocomplete_w.py index 2ee6878..3374c6e 100644 --- a/Lib/idlelib/AutoCompleteWindow.py +++ b/Lib/idlelib/autocomplete_w.py @@ -1,9 +1,11 @@ """ -An auto-completion window for IDLE, used by the AutoComplete extension +An auto-completion window for IDLE, used by the autocomplete extension """ from tkinter import * -from idlelib.MultiCall import MC_SHIFT -from idlelib.AutoComplete import COMPLETE_FILES, COMPLETE_ATTRIBUTES +from tkinter.ttk import Scrollbar + +from idlelib.autocomplete import COMPLETE_FILES, COMPLETE_ATTRIBUTES +from idlelib.multicall import MC_SHIFT HIDE_VIRTUAL_EVENT_NAME = "<>" HIDE_SEQUENCES = ("", "") @@ -34,8 +36,8 @@ class AutoCompleteWindow: self.completions = None # A list with more completions, or None self.morecompletions = None - # The completion mode. Either AutoComplete.COMPLETE_ATTRIBUTES or - # AutoComplete.COMPLETE_FILES + # The completion mode. Either autocomplete.COMPLETE_ATTRIBUTES or + # autocomplete.COMPLETE_FILES self.mode = None # The current completion start, on the text box (a string) self.start = None @@ -215,6 +217,7 @@ class AutoCompleteWindow: self.winconfigid = acw.bind(WINCONFIG_SEQUENCE, self.winconfig_event) self.doubleclickid = listbox.bind(DOUBLECLICK_SEQUENCE, self.doubleclick_event) + return None def winconfig_event(self, event): if not self.is_active(): @@ -238,16 +241,14 @@ class AutoCompleteWindow: acw.wm_geometry("+%d+%d" % (new_x, new_y)) def hide_event(self, event): - if not self.is_active(): - return - self.hide_window() + if self.is_active(): + self.hide_window() def listselect_event(self, event): - if not self.is_active(): - return - self.userwantswindow = True - cursel = int(self.listbox.curselection()[0]) - self._change_start(self.completions[cursel]) + if self.is_active(): + self.userwantswindow = True + cursel = int(self.listbox.curselection()[0]) + self._change_start(self.completions[cursel]) def doubleclick_event(self, event): # Put the selected completion in the text, and close the list @@ -257,7 +258,7 @@ class AutoCompleteWindow: def keypress_event(self, event): if not self.is_active(): - return + return None keysym = event.keysym if hasattr(event, "mc_state"): state = event.mc_state @@ -282,7 +283,7 @@ class AutoCompleteWindow: # keysym == "BackSpace" if len(self.start) == 0: self.hide_window() - return + return None self._change_start(self.start[:-1]) self.lasttypedstart = self.start self.listbox.select_clear(0, int(self.listbox.curselection()[0])) @@ -292,7 +293,7 @@ class AutoCompleteWindow: elif keysym == "Return": self.hide_window() - return + return None elif (self.mode == COMPLETE_ATTRIBUTES and keysym in ("period", "space", "parenleft", "parenright", "bracketleft", @@ -308,7 +309,7 @@ class AutoCompleteWindow: and (self.mode == COMPLETE_ATTRIBUTES or self.start): self._change_start(self.completions[cursel]) self.hide_window() - return + return None elif keysym in ("Home", "End", "Prior", "Next", "Up", "Down") and \ not state: @@ -349,12 +350,12 @@ class AutoCompleteWindow: # first tab; let AutoComplete handle the completion self.userwantswindow = True self.lastkey_was_tab = True - return + return None elif any(s in keysym for s in ("Shift", "Control", "Alt", "Meta", "Command", "Option")): # A modifier key, so ignore - return + return None elif event.char and event.char >= ' ': # Regular character with a non-length-1 keycode @@ -368,7 +369,7 @@ class AutoCompleteWindow: else: # Unknown event, close the window and let it through. self.hide_window() - return + return None def keyrelease_event(self, event): if not self.is_active(): diff --git a/Lib/idlelib/AutoExpand.py b/Lib/idlelib/autoexpand.py similarity index 96% rename from Lib/idlelib/AutoExpand.py rename to Lib/idlelib/autoexpand.py index 7059054..6b46bee 100644 --- a/Lib/idlelib/AutoExpand.py +++ b/Lib/idlelib/autoexpand.py @@ -12,8 +12,8 @@ its state. This is an extension file and there is only one instance of AutoExpand. ''' -import string import re +import string ###$ event <> ###$ win @@ -31,6 +31,7 @@ class AutoExpand: def __init__(self, editwin): self.text = editwin.text + self.bell = self.text.bell self.state = None def expand_word_event(self, event): @@ -46,14 +47,14 @@ class AutoExpand: words = self.getwords() index = 0 if not words: - self.text.bell() + self.bell() return "break" word = self.getprevword() self.text.delete("insert - %d chars" % len(word), "insert") newword = words[index] index = (index + 1) % len(words) if index == 0: - self.text.bell() # Warn we cycled around + self.bell() # Warn we cycled around self.text.insert("insert", newword) curinsert = self.text.index("insert") curline = self.text.get("insert linestart", "insert lineend") diff --git a/Lib/idlelib/ClassBrowser.py b/Lib/idlelib/browser.py similarity index 94% rename from Lib/idlelib/ClassBrowser.py rename to Lib/idlelib/browser.py index d09c52f..ea05638 100644 --- a/Lib/idlelib/ClassBrowser.py +++ b/Lib/idlelib/browser.py @@ -11,16 +11,16 @@ XXX TO DO: """ import os -import sys import pyclbr +import sys -from idlelib import PyShell -from idlelib.WindowList import ListedToplevel -from idlelib.TreeWidget import TreeNode, TreeItem, ScrolledCanvas -from idlelib.configHandler import idleConf +from idlelib.config import idleConf +from idlelib import pyshell +from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas +from idlelib.windows import ListedToplevel file_open = None # Method...Item and Class...Item use this. -# Normally PyShell.flist.open, but there is no PyShell.flist for htest. +# Normally pyshell.flist.open, but there is no pyshell.flist for htest. class ClassBrowser: @@ -32,7 +32,7 @@ class ClassBrowser: """ global file_open if not _htest: - file_open = PyShell.flist.open + file_open = pyshell.flist.open self.name = name self.file = os.path.join(path[0], self.name + ".py") self._htest = _htest @@ -95,7 +95,7 @@ class ModuleBrowserTreeItem(TreeItem): return if not os.path.exists(self.file): return - PyShell.flist.open(self.file) + pyshell.flist.open(self.file) def IsExpandable(self): return os.path.normcase(self.file[-3:]) == ".py" @@ -226,7 +226,7 @@ def _class_browser(parent): #Wrapper for htest file = sys.argv[0] dir, file = os.path.split(file) name = os.path.splitext(file)[0] - flist = PyShell.PyShellFileList(parent) + flist = pyshell.PyShellFileList(parent) global file_open file_open = flist.open ClassBrowser(flist, name, [dir], _htest=True) diff --git a/Lib/idlelib/CallTipWindow.py b/Lib/idlelib/calltip_w.py similarity index 96% rename from Lib/idlelib/CallTipWindow.py rename to Lib/idlelib/calltip_w.py index 9eec175..c7361d1 100644 --- a/Lib/idlelib/CallTipWindow.py +++ b/Lib/idlelib/calltip_w.py @@ -1,7 +1,7 @@ """A CallTip window class for Tkinter/IDLE. -After ToolTip.py, which uses ideas gleaned from PySol -Used by the CallTips IDLE extension. +After tooltip.py, which uses ideas gleaned from PySol +Used by the calltips IDLE extension. """ from tkinter import Toplevel, Label, LEFT, SOLID, TclError @@ -138,8 +138,8 @@ def _calltip_window(parent): # htest # top = Toplevel(parent) top.title("Test calltips") - top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, - parent.winfo_rooty() + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("200x100+%d+%d" % (x + 250, y + 175)) text = Text(top) text.pack(side=LEFT, fill=BOTH, expand=1) text.insert("insert", "string.split") diff --git a/Lib/idlelib/CallTips.py b/Lib/idlelib/calltips.py similarity index 96% rename from Lib/idlelib/CallTips.py rename to Lib/idlelib/calltips.py index 81bd5f1..4c5aea2 100644 --- a/Lib/idlelib/CallTips.py +++ b/Lib/idlelib/calltips.py @@ -1,19 +1,19 @@ -"""CallTips.py - An IDLE Extension to Jog Your Memory +"""calltips.py - An IDLE Extension to Jog Your Memory Call Tips are floating windows which display function, class, and method parameter and docstring information when you type an opening parenthesis, and which disappear when you type a closing parenthesis. """ -import __main__ import inspect import re import sys import textwrap import types -from idlelib import CallTipWindow -from idlelib.HyperParser import HyperParser +from idlelib import calltip_w +from idlelib.hyperparser import HyperParser +import __main__ class CallTips: @@ -37,7 +37,7 @@ class CallTips: def _make_tk_calltip_window(self): # See __init__ for usage - return CallTipWindow.CallTip(self.text) + return calltip_w.CallTip(self.text) def _remove_calltip_window(self, event=None): if self.active_calltip: @@ -120,7 +120,7 @@ def get_entity(expression): _MAX_COLS = 85 _MAX_LINES = 5 # enough for bytes _INDENT = ' '*4 # for wrapped signatures -_first_param = re.compile('(?<=\()\w*\,?\s*') +_first_param = re.compile(r'(?<=\()\w*\,?\s*') _default_callable_argspec = "See source or doc" diff --git a/Lib/idlelib/CodeContext.py b/Lib/idlelib/codecontext.py similarity index 97% rename from Lib/idlelib/CodeContext.py rename to Lib/idlelib/codecontext.py index 7d25ada..f25e1b3 100644 --- a/Lib/idlelib/CodeContext.py +++ b/Lib/idlelib/codecontext.py @@ -1,19 +1,21 @@ -"""CodeContext - Extension to display the block context above the edit window +"""codecontext - Extension to display the block context above the edit window Once code has scrolled off the top of a window, it can be difficult to determine which block you are in. This extension implements a pane at the top of each IDLE edit window which provides block structure hints. These hints are the lines which contain the block opening keywords, e.g. 'if', for the enclosing block. The number of hint lines is determined by the numlines -variable in the CodeContext section of config-extensions.def. Lines which do +variable in the codecontext section of config-extensions.def. Lines which do not open blocks are not shown in the context hints pane. """ -import tkinter -from tkinter.constants import TOP, LEFT, X, W, SUNKEN import re from sys import maxsize as INFINITY -from idlelib.configHandler import idleConf + +import tkinter +from tkinter.constants import TOP, LEFT, X, W, SUNKEN + +from idlelib.config import idleConf BLOCKOPENERS = {"class", "def", "elif", "else", "except", "finally", "for", "if", "try", "while", "with"} diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/colorizer.py similarity index 95% rename from Lib/idlelib/ColorDelegator.py rename to Lib/idlelib/colorizer.py index 02eac47..7310bb2 100644 --- a/Lib/idlelib/ColorDelegator.py +++ b/Lib/idlelib/colorizer.py @@ -1,10 +1,10 @@ -import time -import re -import keyword import builtins -from tkinter import TkVersion -from idlelib.Delegator import Delegator -from idlelib.configHandler import idleConf +import keyword +import re +import time + +from idlelib.config import idleConf +from idlelib.delegator import Delegator DEBUG = False @@ -49,11 +49,8 @@ def color_config(text): # Called from htest, Editor, and Turtle Demo. insertbackground=cursor_color, selectforeground=select_colors['foreground'], selectbackground=select_colors['background'], - ) - if TkVersion >= 8.5: - text.config( - inactiveselectbackground=select_colors['background']) - + inactiveselectbackground=select_colors['background'], # new in 8.5 + ) class ColorDelegator(Delegator): @@ -259,12 +256,12 @@ class ColorDelegator(Delegator): def _color_delegator(parent): # htest # from tkinter import Toplevel, Text - from idlelib.Percolator import Percolator + from idlelib.percolator import Percolator top = Toplevel(parent) top.title("Test ColorDelegator") - top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, - parent.winfo_rooty() + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("200x100+%d+%d" % (x + 250, y + 175)) source = "if somename: x = 'abc' # comment\nprint\n" text = Text(top, background="white") text.pack(expand=1, fill="both") @@ -277,5 +274,9 @@ def _color_delegator(parent): # htest # p.insertfilter(d) if __name__ == "__main__": + import unittest + unittest.main('idlelib.idle_test.test_colorizer', + verbosity=2, exit=False) + from idlelib.idle_test.htest import run run(_color_delegator) diff --git a/Lib/idlelib/config-keys.def b/Lib/idlelib/config-keys.def index 3bfcb69..64788f9 100644 --- a/Lib/idlelib/config-keys.def +++ b/Lib/idlelib/config-keys.def @@ -109,6 +109,57 @@ change-indentwidth= del-word-left= del-word-right= +[IDLE Modern Unix] +copy = +cut = +paste = +beginning-of-line = +center-insert = +close-all-windows = +close-window = +do-nothing = +end-of-file = +history-next = +history-previous = +interrupt-execution = +view-restart = +restart-shell = +open-class-browser = +open-module = +open-new-window = +open-window-from-file = +plain-newline-and-indent = +print-window = +python-context-help = +python-docs = +redo = +remove-selection = +save-copy-of-window-as-file = +save-window-as-file = +save-window = +select-all = +toggle-auto-coloring = +undo = +find = +find-again = +find-in-files = +find-selection = +replace = +goto-line = +smart-backspace = +newline-and-indent = +smart-indent = +indent-region = +dedent-region = +comment-region = +uncomment-region = +tabify-region = +untabify-region = +toggle-tabs = +change-indentwidth = +del-word-left = +del-word-right = + [IDLE Classic Mac] copy= cut= diff --git a/Lib/idlelib/config-main.def b/Lib/idlelib/config-main.def index 8ebbc1b..16f4b09 100644 --- a/Lib/idlelib/config-main.def +++ b/Lib/idlelib/config-main.def @@ -4,44 +4,50 @@ # When IDLE starts, it will look in # the following two sets of files, in order: # -# default configuration -# --------------------- -# config-main.def the default general config file -# config-extensions.def the default extension config file -# config-highlight.def the default highlighting config file -# config-keys.def the default keybinding config file +# default configuration files in idlelib +# -------------------------------------- +# config-main.def default general config file +# config-extensions.def default extension config file +# config-highlight.def default highlighting config file +# config-keys.def default keybinding config file # -# user configuration -# ------------------- -# ~/.idlerc/config-main.cfg the user general config file -# ~/.idlerc/config-extensions.cfg the user extension config file -# ~/.idlerc/config-highlight.cfg the user highlighting config file -# ~/.idlerc/config-keys.cfg the user keybinding config file +# user configuration files in ~/.idlerc +# ------------------------------------- +# config-main.cfg user general config file +# config-extensions.cfg user extension config file +# config-highlight.cfg user highlighting config file +# config-keys.cfg user keybinding config file # -# On Windows2000 and Windows XP the .idlerc directory is at -# Documents and Settings\\.idlerc -# -# On Windows98 it is at c:\.idlerc +# On Windows, the default location of the home directory ('~' above) +# depends on the version. For Windows 10, it is C:\Users\. # # Any options the user saves through the config dialog will be saved to -# the relevant user config file. Reverting any general setting to the -# default causes that entry to be wiped from the user file and re-read -# from the default file. User highlighting themes or keybinding sets are -# retained unless specifically deleted within the config dialog. Choosing -# one of the default themes or keysets just applies the relevant settings -# from the default file. +# the relevant user config file. Reverting any general or extension +# setting to the default causes that entry to be wiped from the user +# file and re-read from the default file. This rule applies to each +# item, except that the three editor font items are saved as a group. +# +# User highlighting themes and keybinding sets must have (section) names +# distinct from the default names. All items are added and saved as a +# group. They are retained unless specifically deleted within the config +# dialog. Choosing one of the default themes or keysets just applies the +# relevant settings from the default file. +# +# Additional help sources are listed in the [HelpFiles] section below +# and should be viewable by a web browser (or the Windows Help viewer in +# the case of .chm files). These sources will be listed on the Help +# menu. The pattern, and two examples, are # -# Additional help sources are listed in the [HelpFiles] section and must be -# viewable by a web browser (or the Windows Help viewer in the case of .chm -# files). These sources will be listed on the Help menu. The pattern is # -# You can't use a semi-colon in a menu item or path. The path will be platform -# specific because of path separators, drive specs etc. +# 1 = IDLE;C:/Programs/Python36/Lib/idlelib/help.html +# 2 = Pillow;https://pillow.readthedocs.io/en/latest/ # -# It is best to use the Configuration GUI to set up additional help sources! -# Example: -#1 = My Extra Help Source;/usr/share/doc/foo/index.html -#2 = Another Help Source;/path/to/another.pdf +# You can't use a semi-colon in a menu item or path. The path will be +# platform specific because of path separators, drive specs etc. +# +# The default files should not be edited except to add new sections to +# config-extensions.def for added extensions . The user files should be +# modified through the Settings dialog. [General] editor-on-startup= 0 @@ -54,6 +60,8 @@ delete-exitfunc= 1 width= 80 height= 40 font= TkFixedFont +# For TkFixedFont, the actual size and boldness are obtained from tk +# and override 10 and 0. See idlelib.config.IdleConf.GetFont font-size= 10 font-bold= 0 encoding= none @@ -70,7 +78,9 @@ name2= [Keys] default= 1 -name= IDLE Classic Windows +name= +name2= +# name2 set in user config-main.cfg for keys added after 2016 July 1 [History] cyclic=1 diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/config.py similarity index 85% rename from Lib/idlelib/configHandler.py rename to Lib/idlelib/config.py index 8954488..358bee4 100644 --- a/Lib/idlelib/configHandler.py +++ b/Lib/idlelib/config.py @@ -1,13 +1,20 @@ -"""Provides access to stored IDLE configuration information. - -Refer to the comments at the beginning of config-main.def for a description of -the available configuration files and the design implemented to update user -configuration information. In particular, user configuration choices which -duplicate the defaults will be removed from the user's configuration files, -and if a file becomes empty, it will be deleted. - -The contents of the user files may be altered using the Options/Configure IDLE -menu to access the configuration GUI (configDialog.py), or manually. +"""idlelib.config -- Manage IDLE configuration information. + +The comments at the beginning of config-main.def describe the +configuration files and the design implemented to update user +configuration information. In particular, user configuration choices +which duplicate the defaults will be removed from the user's +configuration files, and if a user file becomes empty, it will be +deleted. + +The configuration database maps options to values. Comceptually, the +database keys are tuples (config-type, section, item). As implemented, +there are separate dicts for default and user values. Each has +config-type keys 'main', 'extensions', 'highlight', and 'keys'. The +value for each key is a ConfigParser instance that maps section and item +to values. For 'main' and 'extenstons', user values override +default values. For 'highlight' and 'keys', user sections augment the +default sections (and must, therefore, have distinct names). Throughout this module there is an emphasis on returning useable defaults when a problem occurs in returning a requested configuration value back to @@ -18,11 +25,10 @@ configuration problem notification and resolution. """ # TODOs added Oct 2014, tjr +from configparser import ConfigParser import os import sys -from configparser import ConfigParser -from tkinter import TkVersion from tkinter.font import Font, nametofont class InvalidConfigType(Exception): pass @@ -230,15 +236,12 @@ class IdleConf: return self.userCfg[configType].Get(section, option, type=type, raw=raw) except ValueError: - warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n' + warning = ('\n Warning: config.py - IdleConf.GetOption -\n' ' invalid %r value for configuration option %r\n' ' from section %r: %r' % (type, option, section, self.userCfg[configType].Get(section, option, raw=raw))) - try: - print(warning, file=sys.stderr) - except OSError: - pass + _warn(warning, configType, section, option) try: if self.defaultCfg[configType].has_option(section,option): return self.defaultCfg[configType].Get( @@ -247,15 +250,12 @@ class IdleConf: pass #returning default, print warning if warn_on_default: - warning = ('\n Warning: configHandler.py - IdleConf.GetOption -\n' + warning = ('\n Warning: config.py - IdleConf.GetOption -\n' ' problem retrieving configuration option %r\n' ' from section %r.\n' ' returning default value: %r' % (option, section, default)) - try: - print(warning, file=sys.stderr) - except OSError: - pass + _warn(warning, configType, section, option) return default def SetOption(self, configType, section, option, value): @@ -358,52 +358,73 @@ class IdleConf: for element in theme: if not cfgParser.has_option(themeName, element): # Print warning that will return a default color - warning = ('\n Warning: configHandler.IdleConf.GetThemeDict' + warning = ('\n Warning: config.IdleConf.GetThemeDict' ' -\n problem retrieving theme element %r' '\n from theme %r.\n' ' returning default color: %r' % (element, themeName, theme[element])) - try: - print(warning, file=sys.stderr) - except OSError: - pass + _warn(warning, 'highlight', themeName, element) theme[element] = cfgParser.Get( themeName, element, default=theme[element]) return theme def CurrentTheme(self): - """Return the name of the currently active text color theme. + "Return the name of the currently active text color theme." + return self.current_colors_and_keys('Theme') + + def CurrentKeys(self): + """Return the name of the currently active key set.""" + return self.current_colors_and_keys('Keys') + + def current_colors_and_keys(self, section): + """Return the currently active name for Theme or Keys section. + + idlelib.config-main.def ('default') includes these sections - idlelib.config-main.def includes this section [Theme] default= 1 name= IDLE Classic name2= - # name2 set in user config-main.cfg for themes added after 2015 Oct 1 - Item name2 is needed because setting name to a new builtin - causes older IDLEs to display multiple error messages or quit. + [Keys] + default= 1 + name= + name2= + + Item 'name2', is used for built-in ('default') themes and keys + added after 2015 Oct 1 and 2016 July 1. This kludge is needed + because setting 'name' to a builtin not defined in older IDLEs + to display multiple error messages or quit. See https://bugs.python.org/issue25313. - When default = True, name2 takes precedence over name, - while older IDLEs will just use name. + When default = True, 'name2' takes precedence over 'name', + while older IDLEs will just use name. When default = False, + 'name2' may still be set, but it is ignored. """ - default = self.GetOption('main', 'Theme', 'default', + cfgname = 'highlight' if section == 'Theme' else 'keys' + default = self.GetOption('main', section, 'default', type='bool', default=True) + name = '' if default: - theme = self.GetOption('main', 'Theme', 'name2', default='') - if default and not theme or not default: - theme = self.GetOption('main', 'Theme', 'name', default='') - source = self.defaultCfg if default else self.userCfg - if source['highlight'].has_section(theme): - return theme + name = self.GetOption('main', section, 'name2', default='') + if not name: + name = self.GetOption('main', section, 'name', default='') + if name: + source = self.defaultCfg if default else self.userCfg + if source[cfgname].has_section(name): + return name + return "IDLE Classic" if section == 'Theme' else self.default_keys() + + @staticmethod + def default_keys(): + if sys.platform[:3] == 'win': + return 'IDLE Classic Windows' + elif sys.platform == 'darwin': + return 'IDLE Classic OSX' else: - return "IDLE Classic" + return 'IDLE Modern Unix' - def CurrentKeys(self): - "Return the name of the currently active key set." - return self.GetOption('main', 'Keys', 'name', default='') - - def GetExtensions(self, active_only=True, editor_only=False, shell_only=False): + def GetExtensions(self, active_only=True, + editor_only=False, shell_only=False): """Return extensions in default and user config-extensions files. If active_only True, only return active (enabled) extensions @@ -423,7 +444,7 @@ class IdleConf: if self.GetOption('extensions', extn, 'enable', default=True, type='bool'): #the extension is enabled - if editor_only or shell_only: # TODO if both, contradictory + if editor_only or shell_only: # TODO both True contradict if editor_only: option = "enable_editor" else: @@ -528,7 +549,8 @@ class IdleConf: eventStr - virtual event, including brackets, as in '<>'. """ eventName = eventStr[2:-2] #trim off the angle brackets - binding = self.GetOption('keys', keySetName, eventName, default='').split() + binding = self.GetOption('keys', keySetName, eventName, default='', + warn_on_default=False).split() return binding def GetCurrentKeySet(self): @@ -639,20 +661,28 @@ class IdleConf: '<>': [''] } if keySetName: - for event in keyBindings: - binding = self.GetKeyBinding(keySetName, event) - if binding: - keyBindings[event] = binding - else: #we are going to return a default, print warning - warning=('\n Warning: configHandler.py - IdleConf.GetCoreKeys' - ' -\n problem retrieving key binding for event %r' - '\n from key set %r.\n' - ' returning default value: %r' % - (event, keySetName, keyBindings[event])) - try: - print(warning, file=sys.stderr) - except OSError: - pass + if not (self.userCfg['keys'].has_section(keySetName) or + self.defaultCfg['keys'].has_section(keySetName)): + warning = ( + '\n Warning: config.py - IdleConf.GetCoreKeys -\n' + ' key set %r is not defined, using default bindings.' % + (keySetName,) + ) + _warn(warning, 'keys', keySetName) + else: + for event in keyBindings: + binding = self.GetKeyBinding(keySetName, event) + if binding: + keyBindings[event] = binding + else: #we are going to return a default, print warning + warning = ( + '\n Warning: config.py - IdleConf.GetCoreKeys -\n' + ' problem retrieving key binding for event %r\n' + ' from key set %r.\n' + ' returning default value: %r' % + (event, keySetName, keyBindings[event]) + ) + _warn(warning, 'keys', keySetName, event) return keyBindings def GetExtraHelpSourceList(self, configSet): @@ -713,16 +743,13 @@ class IdleConf: bold = self.GetOption(configType, section, 'font-bold', default=0, type='bool') if (family == 'TkFixedFont'): - if TkVersion < 8.5: - family = 'Courier' - else: - f = Font(name='TkFixedFont', exists=True, root=root) - actualFont = Font.actual(f) - family = actualFont['family'] - size = actualFont['size'] - if size <= 0: - size = 10 # if font in pixels, ignore actual size - bold = actualFont['weight']=='bold' + f = Font(name='TkFixedFont', exists=True, root=root) + actualFont = Font.actual(f) + family = actualFont['family'] + size = actualFont['size'] + if size <= 0: + size = 10 # if font in pixels, ignore actual size + bold = actualFont['weight'] == 'bold' return (family, size, 'bold' if bold else 'normal') def LoadCfgFiles(self): @@ -739,6 +766,18 @@ class IdleConf: idleConf = IdleConf() + +_warned = set() +def _warn(msg, *key): + key = (msg,) + key + if key not in _warned: + try: + print(msg, file=sys.stderr) + except OSError: + pass + _warned.add(key) + + # TODO Revise test output, write expanded unittest # if __name__ == '__main__': diff --git a/Lib/idlelib/configHelpSourceEdit.py b/Lib/idlelib/configHelpSourceEdit.py deleted file mode 100644 index cde8118..0000000 --- a/Lib/idlelib/configHelpSourceEdit.py +++ /dev/null @@ -1,170 +0,0 @@ -"Dialog to specify or edit the parameters for a user configured help source." - -import os -import sys - -from tkinter import * -import tkinter.messagebox as tkMessageBox -import tkinter.filedialog as tkFileDialog - -class GetHelpSourceDialog(Toplevel): - def __init__(self, parent, title, menuItem='', filePath='', _htest=False): - """Get menu entry and url/ local file location for Additional Help - - User selects a name for the Help resource and provides a web url - or a local file as its source. The user can enter a url or browse - for the file. - - _htest - bool, change box location when running htest - """ - Toplevel.__init__(self, parent) - self.configure(borderwidth=5) - self.resizable(height=FALSE, width=FALSE) - self.title(title) - self.transient(parent) - self.grab_set() - self.protocol("WM_DELETE_WINDOW", self.cancel) - self.parent = parent - self.result = None - self.create_widgets() - self.menu.set(menuItem) - self.path.set(filePath) - self.withdraw() #hide while setting geometry - #needs to be done here so that the winfo_reqwidth is valid - self.update_idletasks() - #centre dialog over parent. below parent if running htest. - self.geometry( - "+%d+%d" % ( - parent.winfo_rootx() + - (parent.winfo_width()/2 - self.winfo_reqwidth()/2), - parent.winfo_rooty() + - ((parent.winfo_height()/2 - self.winfo_reqheight()/2) - if not _htest else 150))) - self.deiconify() #geometry set, unhide - self.bind('', self.ok) - self.wait_window() - - def create_widgets(self): - self.menu = StringVar(self) - self.path = StringVar(self) - self.fontSize = StringVar(self) - self.frameMain = Frame(self, borderwidth=2, relief=GROOVE) - self.frameMain.pack(side=TOP, expand=TRUE, fill=BOTH) - labelMenu = Label(self.frameMain, anchor=W, justify=LEFT, - text='Menu Item:') - self.entryMenu = Entry(self.frameMain, textvariable=self.menu, - width=30) - self.entryMenu.focus_set() - labelPath = Label(self.frameMain, anchor=W, justify=LEFT, - text='Help File Path: Enter URL or browse for file') - self.entryPath = Entry(self.frameMain, textvariable=self.path, - width=40) - self.entryMenu.focus_set() - labelMenu.pack(anchor=W, padx=5, pady=3) - self.entryMenu.pack(anchor=W, padx=5, pady=3) - labelPath.pack(anchor=W, padx=5, pady=3) - self.entryPath.pack(anchor=W, padx=5, pady=3) - browseButton = Button(self.frameMain, text='Browse', width=8, - command=self.browse_file) - browseButton.pack(pady=3) - frameButtons = Frame(self) - frameButtons.pack(side=BOTTOM, fill=X) - self.buttonOk = Button(frameButtons, text='OK', - width=8, default=ACTIVE, command=self.ok) - self.buttonOk.grid(row=0, column=0, padx=5,pady=5) - self.buttonCancel = Button(frameButtons, text='Cancel', - width=8, command=self.cancel) - self.buttonCancel.grid(row=0, column=1, padx=5, pady=5) - - def browse_file(self): - filetypes = [ - ("HTML Files", "*.htm *.html", "TEXT"), - ("PDF Files", "*.pdf", "TEXT"), - ("Windows Help Files", "*.chm"), - ("Text Files", "*.txt", "TEXT"), - ("All Files", "*")] - path = self.path.get() - if path: - dir, base = os.path.split(path) - else: - base = None - if sys.platform[:3] == 'win': - dir = os.path.join(os.path.dirname(sys.executable), 'Doc') - if not os.path.isdir(dir): - dir = os.getcwd() - else: - dir = os.getcwd() - opendialog = tkFileDialog.Open(parent=self, filetypes=filetypes) - file = opendialog.show(initialdir=dir, initialfile=base) - if file: - self.path.set(file) - - def menu_ok(self): - "Simple validity check for a sensible menu item name" - menu_ok = True - menu = self.menu.get() - menu.strip() - if not menu: - tkMessageBox.showerror(title='Menu Item Error', - message='No menu item specified', - parent=self) - self.entryMenu.focus_set() - menu_ok = False - elif len(menu) > 30: - tkMessageBox.showerror(title='Menu Item Error', - message='Menu item too long:' - '\nLimit 30 characters.', - parent=self) - self.entryMenu.focus_set() - menu_ok = False - return menu_ok - - def path_ok(self): - "Simple validity check for menu file path" - path_ok = True - path = self.path.get() - path.strip() - if not path: #no path specified - tkMessageBox.showerror(title='File Path Error', - message='No help file path specified.', - parent=self) - self.entryPath.focus_set() - path_ok = False - elif path.startswith(('www.', 'http')): - pass - else: - if path[:5] == 'file:': - path = path[5:] - if not os.path.exists(path): - tkMessageBox.showerror(title='File Path Error', - message='Help file path does not exist.', - parent=self) - self.entryPath.focus_set() - path_ok = False - return path_ok - - def ok(self, event=None): - if self.menu_ok() and self.path_ok(): - self.result = (self.menu.get().strip(), - self.path.get().strip()) - if sys.platform == 'darwin': - path = self.result[1] - if path.startswith(('www', 'file:', 'http:', 'https:')): - pass - else: - # Mac Safari insists on using the URI form for local files - self.result = list(self.result) - self.result[1] = "file://" + path - self.destroy() - - def cancel(self, event=None): - self.result = None - self.destroy() - -if __name__ == '__main__': - import unittest - unittest.main('idlelib.idle_test.test_config_help', - verbosity=2, exit=False) - - from idlelib.idle_test.htest import run - run(GetHelpSourceDialog) diff --git a/Lib/idlelib/configSectionNameDialog.py b/Lib/idlelib/configSectionNameDialog.py deleted file mode 100644 index 5137836..0000000 --- a/Lib/idlelib/configSectionNameDialog.py +++ /dev/null @@ -1,98 +0,0 @@ -""" -Dialog that allows user to specify a new config file section name. -Used to get new highlight theme and keybinding set names. -The 'return value' for the dialog, used two placed in configDialog.py, -is the .result attribute set in the Ok and Cancel methods. -""" -from tkinter import * -import tkinter.messagebox as tkMessageBox - -class GetCfgSectionNameDialog(Toplevel): - def __init__(self, parent, title, message, used_names, _htest=False): - """ - message - string, informational message to display - used_names - string collection, names already in use for validity check - _htest - bool, change box location when running htest - """ - Toplevel.__init__(self, parent) - self.configure(borderwidth=5) - self.resizable(height=FALSE, width=FALSE) - self.title(title) - self.transient(parent) - self.grab_set() - self.protocol("WM_DELETE_WINDOW", self.Cancel) - self.parent = parent - self.message = message - self.used_names = used_names - self.create_widgets() - self.withdraw() #hide while setting geometry - self.update_idletasks() - #needs to be done here so that the winfo_reqwidth is valid - self.messageInfo.config(width=self.frameMain.winfo_reqwidth()) - self.geometry( - "+%d+%d" % ( - parent.winfo_rootx() + - (parent.winfo_width()/2 - self.winfo_reqwidth()/2), - parent.winfo_rooty() + - ((parent.winfo_height()/2 - self.winfo_reqheight()/2) - if not _htest else 100) - ) ) #centre dialog over parent (or below htest box) - self.deiconify() #geometry set, unhide - self.wait_window() - - def create_widgets(self): - self.name = StringVar(self.parent) - self.fontSize = StringVar(self.parent) - self.frameMain = Frame(self, borderwidth=2, relief=SUNKEN) - self.frameMain.pack(side=TOP, expand=TRUE, fill=BOTH) - self.messageInfo = Message(self.frameMain, anchor=W, justify=LEFT, - padx=5, pady=5, text=self.message) #,aspect=200) - entryName = Entry(self.frameMain, textvariable=self.name, width=30) - entryName.focus_set() - self.messageInfo.pack(padx=5, pady=5) #, expand=TRUE, fill=BOTH) - entryName.pack(padx=5, pady=5) - - frameButtons = Frame(self, pady=2) - frameButtons.pack(side=BOTTOM) - self.buttonOk = Button(frameButtons, text='Ok', - width=8, command=self.Ok) - self.buttonOk.pack(side=LEFT, padx=5) - self.buttonCancel = Button(frameButtons, text='Cancel', - width=8, command=self.Cancel) - self.buttonCancel.pack(side=RIGHT, padx=5) - - def name_ok(self): - ''' After stripping entered name, check that it is a sensible - ConfigParser file section name. Return it if it is, '' if not. - ''' - name = self.name.get().strip() - if not name: #no name specified - tkMessageBox.showerror(title='Name Error', - message='No name specified.', parent=self) - elif len(name)>30: #name too long - tkMessageBox.showerror(title='Name Error', - message='Name too long. It should be no more than '+ - '30 characters.', parent=self) - name = '' - elif name in self.used_names: - tkMessageBox.showerror(title='Name Error', - message='This name is already in use.', parent=self) - name = '' - return name - - def Ok(self, event=None): - name = self.name_ok() - if name: - self.result = name - self.destroy() - - def Cancel(self, event=None): - self.result = '' - self.destroy() - -if __name__ == '__main__': - import unittest - unittest.main('idlelib.idle_test.test_config_name', verbosity=2, exit=False) - - from idlelib.idle_test.htest import run - run(GetCfgSectionNameDialog) diff --git a/Lib/idlelib/keybindingDialog.py b/Lib/idlelib/config_key.py similarity index 96% rename from Lib/idlelib/keybindingDialog.py rename to Lib/idlelib/config_key.py index e6438bf..2602293 100644 --- a/Lib/idlelib/keybindingDialog.py +++ b/Lib/idlelib/config_key.py @@ -2,31 +2,35 @@ Dialog for building Tkinter accelerator key bindings """ from tkinter import * +from tkinter.ttk import Scrollbar import tkinter.messagebox as tkMessageBox import string import sys class GetKeysDialog(Toplevel): - def __init__(self,parent,title,action,currentKeySequences,_htest=False): + def __init__(self, parent, title, action, currentKeySequences, + _htest=False, _utest=False): """ action - string, the name of the virtual event these keys will be mapped to currentKeys - list, a list of all key sequence lists currently mapped to virtual events, for overlap checking + _utest - bool, do not wait when running unittest _htest - bool, change box location when running htest """ Toplevel.__init__(self, parent) + self.withdraw() #hide while setting geometry self.configure(borderwidth=5) - self.resizable(height=FALSE,width=FALSE) + self.resizable(height=FALSE, width=FALSE) self.title(title) self.transient(parent) self.grab_set() self.protocol("WM_DELETE_WINDOW", self.Cancel) self.parent = parent self.action=action - self.currentKeySequences=currentKeySequences - self.result='' - self.keyString=StringVar(self) + self.currentKeySequences = currentKeySequences + self.result = '' + self.keyString = StringVar(self) self.keyString.set('') self.SetModifiersForPlatform() # set self.modifiers, self.modifier_label self.modifier_vars = [] @@ -37,7 +41,6 @@ class GetKeysDialog(Toplevel): self.advanced = False self.CreateWidgets() self.LoadFinalKeyList() - self.withdraw() #hide while setting geometry self.update_idletasks() self.geometry( "+%d+%d" % ( @@ -47,8 +50,9 @@ class GetKeysDialog(Toplevel): ((parent.winfo_height()/2 - self.winfo_reqheight()/2) if not _htest else 150) ) ) #centre dialog over parent (or below htest box) - self.deiconify() #geometry set, unhide - self.wait_window() + if not _utest: + self.deiconify() #geometry set, unhide + self.wait_window() def CreateWidgets(self): frameMain = Frame(self,borderwidth=2,relief=SUNKEN) @@ -261,6 +265,7 @@ class GetKeysDialog(Toplevel): keysOK = True return keysOK + if __name__ == '__main__': from idlelib.idle_test.htest import run run(GetKeysDialog) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configdialog.py similarity index 92% rename from Lib/idlelib/configDialog.py rename to Lib/idlelib/configdialog.py index 5f5bd36..8184582 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configdialog.py @@ -10,18 +10,18 @@ Refer to comments in EditorWindow autoindent code for details. """ from tkinter import * -import tkinter.messagebox as tkMessageBox +from tkinter.ttk import Scrollbar import tkinter.colorchooser as tkColorChooser import tkinter.font as tkFont +import tkinter.messagebox as tkMessageBox -from idlelib.configHandler import idleConf -from idlelib.dynOptionMenuWidget import DynOptionMenu -from idlelib.keybindingDialog import GetKeysDialog -from idlelib.configSectionNameDialog import GetCfgSectionNameDialog -from idlelib.configHelpSourceEdit import GetHelpSourceDialog +from idlelib.config import idleConf +from idlelib.config_key import GetKeysDialog +from idlelib.dynoption import DynOptionMenu +from idlelib import macosx +from idlelib.query import SectionName, HelpSource from idlelib.tabbedpages import TabbedPageSet -from idlelib.textView import view_text -from idlelib import macosxSupport +from idlelib.textview import view_text class ConfigDialog(Toplevel): @@ -91,7 +91,7 @@ class ConfigDialog(Toplevel): self.create_action_buttons().pack(side=BOTTOM) def create_action_buttons(self): - if macosxSupport.isAquaTk(): + if macosx.isAquaTk(): # Changing the default padding on OSX results in unreadable # text in the buttons paddingArgs = {} @@ -341,6 +341,7 @@ class ConfigDialog(Toplevel): buttonSaveCustomKeys = Button( frames[1], text='Save as New Custom Key Set', command=self.SaveAsNewKeySet) + self.new_custom_keys = Label(frames[0], bd=2) ##widget packing #body @@ -361,6 +362,7 @@ class ConfigDialog(Toplevel): self.radioKeysCustom.grid(row=1, column=0, sticky=W+NS) self.optMenuKeysBuiltin.grid(row=0, column=1, sticky=NSEW) self.optMenuKeysCustom.grid(row=1, column=1, sticky=NSEW) + self.new_custom_keys.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5) self.buttonDeleteCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) buttonSaveCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) frames[0].pack(side=TOP, fill=BOTH, expand=True) @@ -390,28 +392,28 @@ class ConfigDialog(Toplevel): text=' Additional Help Sources ') #frameRun labelRunChoiceTitle = Label(frameRun, text='At Startup') - radioStartupEdit = Radiobutton( + self.radioStartupEdit = Radiobutton( frameRun, variable=self.startupEdit, value=1, - command=self.SetKeysType, text="Open Edit Window") - radioStartupShell = Radiobutton( + text="Open Edit Window") + self.radioStartupShell = Radiobutton( frameRun, variable=self.startupEdit, value=0, - command=self.SetKeysType, text='Open Shell Window') + text='Open Shell Window') #frameSave labelRunSaveTitle = Label(frameSave, text='At Start of Run (F5) ') - radioSaveAsk = Radiobutton( + self.radioSaveAsk = Radiobutton( frameSave, variable=self.autoSave, value=0, - command=self.SetKeysType, text="Prompt to Save") - radioSaveAuto = Radiobutton( + text="Prompt to Save") + self.radioSaveAuto = Radiobutton( frameSave, variable=self.autoSave, value=1, - command=self.SetKeysType, text='No Prompt') + text='No Prompt') #frameWinSize labelWinSizeTitle = Label( frameWinSize, text='Initial Window Size (in characters)') labelWinWidthTitle = Label(frameWinSize, text='Width') - entryWinWidth = Entry( + self.entryWinWidth = Entry( frameWinSize, textvariable=self.winWidth, width=3) labelWinHeightTitle = Label(frameWinSize, text='Height') - entryWinHeight = Entry( + self.entryWinHeight = Entry( frameWinSize, textvariable=self.winHeight, width=3) #frameHelp frameHelpList = Frame(frameHelp) @@ -441,17 +443,17 @@ class ConfigDialog(Toplevel): frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) #frameRun labelRunChoiceTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) - radioStartupShell.pack(side=RIGHT, anchor=W, padx=5, pady=5) - radioStartupEdit.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.radioStartupShell.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.radioStartupEdit.pack(side=RIGHT, anchor=W, padx=5, pady=5) #frameSave labelRunSaveTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) - radioSaveAuto.pack(side=RIGHT, anchor=W, padx=5, pady=5) - radioSaveAsk.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.radioSaveAuto.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.radioSaveAsk.pack(side=RIGHT, anchor=W, padx=5, pady=5) #frameWinSize labelWinSizeTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) - entryWinHeight.pack(side=RIGHT, anchor=E, padx=10, pady=5) + self.entryWinHeight.pack(side=RIGHT, anchor=E, padx=10, pady=5) labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5) - entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) + self.entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) labelWinWidthTitle.pack(side=RIGHT, anchor=E, pady=5) #frameHelp frameHelpListButtons.pack(side=RIGHT, padx=5, pady=5, fill=Y) @@ -464,24 +466,24 @@ class ConfigDialog(Toplevel): return frame def AttachVarCallbacks(self): - self.fontSize.trace_variable('w', self.VarChanged_font) - self.fontName.trace_variable('w', self.VarChanged_font) - self.fontBold.trace_variable('w', self.VarChanged_font) - self.spaceNum.trace_variable('w', self.VarChanged_spaceNum) - self.colour.trace_variable('w', self.VarChanged_colour) - self.builtinTheme.trace_variable('w', self.VarChanged_builtinTheme) - self.customTheme.trace_variable('w', self.VarChanged_customTheme) - self.themeIsBuiltin.trace_variable('w', self.VarChanged_themeIsBuiltin) - self.highlightTarget.trace_variable('w', self.VarChanged_highlightTarget) - self.keyBinding.trace_variable('w', self.VarChanged_keyBinding) - self.builtinKeys.trace_variable('w', self.VarChanged_builtinKeys) - self.customKeys.trace_variable('w', self.VarChanged_customKeys) - self.keysAreBuiltin.trace_variable('w', self.VarChanged_keysAreBuiltin) - self.winWidth.trace_variable('w', self.VarChanged_winWidth) - self.winHeight.trace_variable('w', self.VarChanged_winHeight) - self.startupEdit.trace_variable('w', self.VarChanged_startupEdit) - self.autoSave.trace_variable('w', self.VarChanged_autoSave) - self.encoding.trace_variable('w', self.VarChanged_encoding) + self.fontSize.trace_add('write', self.VarChanged_font) + self.fontName.trace_add('write', self.VarChanged_font) + self.fontBold.trace_add('write', self.VarChanged_font) + self.spaceNum.trace_add('write', self.VarChanged_spaceNum) + self.colour.trace_add('write', self.VarChanged_colour) + self.builtinTheme.trace_add('write', self.VarChanged_builtinTheme) + self.customTheme.trace_add('write', self.VarChanged_customTheme) + self.themeIsBuiltin.trace_add('write', self.VarChanged_themeIsBuiltin) + self.highlightTarget.trace_add('write', self.VarChanged_highlightTarget) + self.keyBinding.trace_add('write', self.VarChanged_keyBinding) + self.builtinKeys.trace_add('write', self.VarChanged_builtinKeys) + self.customKeys.trace_add('write', self.VarChanged_customKeys) + self.keysAreBuiltin.trace_add('write', self.VarChanged_keysAreBuiltin) + self.winWidth.trace_add('write', self.VarChanged_winWidth) + self.winHeight.trace_add('write', self.VarChanged_winHeight) + self.startupEdit.trace_add('write', self.VarChanged_startupEdit) + self.autoSave.trace_add('write', self.VarChanged_autoSave) + self.encoding.trace_add('write', self.VarChanged_encoding) def remove_var_callbacks(self): "Remove callbacks to prevent memory leaks." @@ -492,7 +494,7 @@ class ConfigDialog(Toplevel): self.keyBinding, self.builtinKeys, self.customKeys, self.keysAreBuiltin, self.winWidth, self.winHeight, self.startupEdit, self.autoSave, self.encoding,): - var.trace_vdelete('w', var.trace_vinfo()[0][1]) + var.trace_remove('write', var.trace_info()[0][1]) def VarChanged_font(self, *params): '''When one font attribute changes, save them all, as they are @@ -514,10 +516,11 @@ class ConfigDialog(Toplevel): self.OnNewColourSet() def VarChanged_builtinTheme(self, *params): + oldthemes = ('IDLE Classic', 'IDLE New') value = self.builtinTheme.get() - if value == 'IDLE Dark': - if idleConf.GetOption('main', 'Theme', 'name') != 'IDLE New': - self.AddChangedItem('main', 'Theme', 'name', 'IDLE Classic') + if value not in oldthemes: + if idleConf.GetOption('main', 'Theme', 'name') not in oldthemes: + self.AddChangedItem('main', 'Theme', 'name', oldthemes[0]) self.AddChangedItem('main', 'Theme', 'name2', value) self.new_custom_theme.config(text='New theme, see Help', fg='#500000') @@ -557,8 +560,23 @@ class ConfigDialog(Toplevel): self.AddChangedItem('extensions', extKeybindSection, event, value) def VarChanged_builtinKeys(self, *params): + oldkeys = ( + 'IDLE Classic Windows', + 'IDLE Classic Unix', + 'IDLE Classic Mac', + 'IDLE Classic OSX', + ) value = self.builtinKeys.get() - self.AddChangedItem('main', 'Keys', 'name', value) + if value not in oldkeys: + if idleConf.GetOption('main', 'Keys', 'name') not in oldkeys: + self.AddChangedItem('main', 'Keys', 'name', oldkeys[0]) + self.AddChangedItem('main', 'Keys', 'name2', value) + self.new_custom_keys.config(text='New key set, see Help', + fg='#500000') + else: + self.AddChangedItem('main', 'Keys', 'name', value) + self.AddChangedItem('main', 'Keys', 'name2', '') + self.new_custom_keys.config(text='', fg='black') self.LoadKeysList(value) def VarChanged_customKeys(self, *params): @@ -683,7 +701,7 @@ class ConfigDialog(Toplevel): def GetNewKeysName(self, message): usedNames = (idleConf.GetSectionList('user', 'keys') + idleConf.GetSectionList('default', 'keys')) - newKeySet = GetCfgSectionNameDialog( + newKeySet = SectionName( self, 'New Custom Key Set', message, usedNames).result return newKeySet @@ -767,8 +785,10 @@ class ConfigDialog(Toplevel): else: self.optMenuKeysCustom.SetMenu(itemList, itemList[0]) #revert to default key set - self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys', 'default')) - self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')) + self.keysAreBuiltin.set(idleConf.defaultCfg['main'] + .Get('Keys', 'default')) + self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name') + or idleConf.default_keys()) #user can't back out of these changes, they must be applied now self.SaveAllChangedConfigs() self.ActivateConfigChanges() @@ -836,7 +856,7 @@ class ConfigDialog(Toplevel): def GetNewThemeName(self, message): usedNames = (idleConf.GetSectionList('user', 'highlight') + idleConf.GetSectionList('default', 'highlight')) - newTheme = GetCfgSectionNameDialog( + newTheme = SectionName( self, 'New Custom Theme', message, usedNames).result return newTheme @@ -939,7 +959,8 @@ class ConfigDialog(Toplevel): self.buttonHelpListRemove.config(state=DISABLED) def HelpListItemAdd(self): - helpSource = GetHelpSourceDialog(self, 'New Help Source').result + helpSource = HelpSource(self, 'New Help Source', + ).result if helpSource: self.userHelpList.append((helpSource[0], helpSource[1])) self.listHelp.insert(END, helpSource[0]) @@ -949,16 +970,17 @@ class ConfigDialog(Toplevel): def HelpListItemEdit(self): itemIndex = self.listHelp.index(ANCHOR) helpSource = self.userHelpList[itemIndex] - newHelpSource = GetHelpSourceDialog( - self, 'Edit Help Source', menuItem=helpSource[0], - filePath=helpSource[1]).result - if (not newHelpSource) or (newHelpSource == helpSource): - return #no changes - self.userHelpList[itemIndex] = newHelpSource - self.listHelp.delete(itemIndex) - self.listHelp.insert(itemIndex, newHelpSource[0]) - self.UpdateUserHelpChangedItems() - self.SetHelpListButtonStates() + newHelpSource = HelpSource( + self, 'Edit Help Source', + menuitem=helpSource[0], + filepath=helpSource[1], + ).result + if newHelpSource and newHelpSource != helpSource: + self.userHelpList[itemIndex] = newHelpSource + self.listHelp.delete(itemIndex) + self.listHelp.insert(itemIndex, newHelpSource[0]) + self.UpdateUserHelpChangedItems() + self.SetHelpListButtonStates() def HelpListItemRemove(self): itemIndex = self.listHelp.index(ANCHOR) @@ -996,7 +1018,8 @@ class ConfigDialog(Toplevel): pass ##font size dropdown self.optMenuFontSize.SetMenu(('7', '8', '9', '10', '11', '12', '13', - '14', '16', '18', '20', '22'), fontSize ) + '14', '16', '18', '20', '22', + '25', '29', '34', '40'), fontSize ) ##fontWeight self.fontBold.set(fontBold) ##font sample @@ -1065,7 +1088,7 @@ class ConfigDialog(Toplevel): self.optMenuKeysCustom.SetMenu(itemList, currentOption) itemList = idleConf.GetSectionList('default', 'keys') itemList.sort() - self.optMenuKeysBuiltin.SetMenu(itemList, itemList[0]) + self.optMenuKeysBuiltin.SetMenu(itemList, idleConf.default_keys()) self.SetKeysType() ##load keyset element list keySetName = idleConf.CurrentKeys() @@ -1367,12 +1390,18 @@ machine. Some do not take affect until IDLE is restarted. [Cancel] only cancels changes made since the last save. ''' help_pages = { - 'Highlighting':''' + 'Highlighting': ''' Highlighting: The IDLE Dark color theme is new in October 2015. It can only be used with older IDLE releases if it is saved as a custom theme, with a different name. -''' +''', + 'Keys': ''' +Keys: +The IDLE Modern Unix key set is new in June 2016. It can only +be used with older IDLE releases if it is saved as a custom +key set, with a different name. +''', } diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/debugger.py similarity index 97% rename from Lib/idlelib/Debugger.py rename to Lib/idlelib/debugger.py index d5e217d..114d0d1 100644 --- a/Lib/idlelib/Debugger.py +++ b/Lib/idlelib/debugger.py @@ -1,9 +1,12 @@ -import os import bdb +import os + from tkinter import * -from idlelib.WindowList import ListedToplevel -from idlelib.ScrolledList import ScrolledList -from idlelib import macosxSupport +from tkinter.ttk import Scrollbar + +from idlelib import macosx +from idlelib.scrolledlist import ScrolledList +from idlelib.windows import ListedToplevel class Idb(bdb.Bdb): @@ -34,8 +37,10 @@ class Idb(bdb.Bdb): return True else: prev_frame = frame.f_back - if prev_frame.f_code.co_filename.count('Debugger.py'): - # (that test will catch both Debugger.py and RemoteDebugger.py) + prev_name = prev_frame.f_code.co_filename + if 'idlelib' in prev_name and 'debugger' in prev_name: + # catch both idlelib/debugger.py and idlelib/debugger_r.py + # on both posix and windows return False return self.in_rpc_code(prev_frame) @@ -370,7 +375,7 @@ class Debugger: class StackViewer(ScrolledList): def __init__(self, master, flist, gui): - if macosxSupport.isAquaTk(): + if macosx.isAquaTk(): # At least on with the stock AquaTk version on OSX 10.4 you'll # get a shaking GUI that eventually kills IDLE if the width # argument is specified. @@ -502,7 +507,7 @@ class NamespaceViewer: # # There is also an obscure bug in sorted(dict) where the # interpreter gets into a loop requesting non-existing dict[0], - # dict[1], dict[2], etc from the RemoteDebugger.DictProxy. + # dict[1], dict[2], etc from the debugger_r.DictProxy. ### keys_list = dict.keys() names = sorted(keys_list) diff --git a/Lib/idlelib/RemoteDebugger.py b/Lib/idlelib/debugger_r.py similarity index 98% rename from Lib/idlelib/RemoteDebugger.py rename to Lib/idlelib/debugger_r.py index be2262f..bc97127 100644 --- a/Lib/idlelib/RemoteDebugger.py +++ b/Lib/idlelib/debugger_r.py @@ -21,7 +21,7 @@ barrier, in particular frame and traceback objects. """ import types -from idlelib import Debugger +from idlelib import debugger debugging = 0 @@ -187,7 +187,7 @@ def start_debugger(rpchandler, gui_adap_oid): """ gui_proxy = GUIProxy(rpchandler, gui_adap_oid) - idb = Debugger.Idb(gui_proxy) + idb = debugger.Idb(gui_proxy) idb_adap = IdbAdapter(idb) rpchandler.register(idb_adap_oid, idb_adap) return idb_adap_oid @@ -362,7 +362,7 @@ def start_remote_debugger(rpcclt, pyshell): idb_adap_oid = rpcclt.remotecall("exec", "start_the_debugger",\ (gui_adap_oid,), {}) idb_proxy = IdbProxy(rpcclt, pyshell, idb_adap_oid) - gui = Debugger.Debugger(pyshell, idb_proxy) + gui = debugger.Debugger(pyshell, idb_proxy) gui_adap = GUIAdapter(rpcclt, gui) rpcclt.register(gui_adap_oid, gui_adap) return gui @@ -373,7 +373,7 @@ def close_remote_debugger(rpcclt): Request that the RPCServer shut down the subprocess debugger and link. Unregister the GUIAdapter, which will cause a GC on the Idle process debugger and RPC link objects. (The second reference to the debugger GUI - is deleted in PyShell.close_remote_debugger().) + is deleted in pyshell.close_remote_debugger().) """ close_subprocess_debugger(rpcclt) diff --git a/Lib/idlelib/ObjectBrowser.py b/Lib/idlelib/debugobj.py similarity index 88% rename from Lib/idlelib/ObjectBrowser.py rename to Lib/idlelib/debugobj.py index 7b57aa4..b70b13c 100644 --- a/Lib/idlelib/ObjectBrowser.py +++ b/Lib/idlelib/debugobj.py @@ -8,13 +8,10 @@ # XXX TO DO: # - for classes/modules, add "open source" to object browser - -import re - -from idlelib.TreeWidget import TreeItem, TreeNode, ScrolledCanvas - from reprlib import Repr +from idlelib.tree import TreeItem, TreeNode, ScrolledCanvas + myrepr = Repr() myrepr.maxstring = 100 myrepr.maxother = 100 @@ -122,21 +119,20 @@ def make_objecttreeitem(labeltext, object, setfunction=None): return c(labeltext, object, setfunction) -def _object_browser(parent): +def _object_browser(parent): # htest # import sys - from tkinter import Tk - root = Tk() - root.title("Test ObjectBrowser") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - root.configure(bd=0, bg="yellow") - root.focus_set() - sc = ScrolledCanvas(root, bg="white", highlightthickness=0, takefocus=1) + from tkinter import Toplevel + top = Toplevel(parent) + top.title("Test debug object browser") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x + 100, y + 175)) + top.configure(bd=0, bg="yellow") + top.focus_set() + sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1) sc.frame.pack(expand=1, fill="both") item = make_objecttreeitem("sys", sys) node = TreeNode(sc.canvas, None, item) node.update() - root.mainloop() if __name__ == '__main__': from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/RemoteObjectBrowser.py b/Lib/idlelib/debugobj_r.py similarity index 100% rename from Lib/idlelib/RemoteObjectBrowser.py rename to Lib/idlelib/debugobj_r.py diff --git a/Lib/idlelib/Delegator.py b/Lib/idlelib/delegator.py similarity index 100% rename from Lib/idlelib/Delegator.py rename to Lib/idlelib/delegator.py diff --git a/Lib/idlelib/dynOptionMenuWidget.py b/Lib/idlelib/dynoption.py similarity index 90% rename from Lib/idlelib/dynOptionMenuWidget.py rename to Lib/idlelib/dynoption.py index 515b4ba..9c6ffa4 100644 --- a/Lib/idlelib/dynOptionMenuWidget.py +++ b/Lib/idlelib/dynoption.py @@ -3,6 +3,7 @@ OptionMenu widget modified to allow dynamic menu reconfiguration and setting of highlightthickness """ import copy + from tkinter import OptionMenu, _setit, StringVar, Button class DynOptionMenu(OptionMenu): @@ -34,12 +35,12 @@ class DynOptionMenu(OptionMenu): self.variable.set(value) def _dyn_option_menu(parent): # htest # - from tkinter import Toplevel + from tkinter import Toplevel # + StringVar, Button - top = Toplevel() + top = Toplevel(parent) top.title("Tets dynamic option menu") - top.geometry("200x100+%d+%d" % (parent.winfo_rootx() + 200, - parent.winfo_rooty() + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("200x100+%d+%d" % (x + 250, y + 175)) top.focus_set() var = StringVar(top) diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/editor.py similarity index 89% rename from Lib/idlelib/EditorWindow.py rename to Lib/idlelib/editor.py index 8613536..ae475cb 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/editor.py @@ -6,22 +6,28 @@ import platform import re import string import sys +import tokenize +import traceback +import webbrowser + from tkinter import * +from tkinter.ttk import Scrollbar import tkinter.simpledialog as tkSimpleDialog import tkinter.messagebox as tkMessageBox -import traceback -import webbrowser -from idlelib.MultiCall import MultiCallCreator -from idlelib import WindowList -from idlelib import SearchDialog -from idlelib import GrepDialog -from idlelib import ReplaceDialog -from idlelib import PyParse -from idlelib.configHandler import idleConf -from idlelib import aboutDialog, textView, configDialog -from idlelib import macosxSupport +from idlelib.config import idleConf +from idlelib import configdialog +from idlelib import grep from idlelib import help +from idlelib import help_about +from idlelib import macosx +from idlelib.multicall import MultiCallCreator +from idlelib import pyparse +from idlelib import query +from idlelib import replace +from idlelib import search +from idlelib import textview +from idlelib import windows # The default tab setting for a Text widget, in average-width characters. TK_TABWIDTH_DEFAULT = 8 @@ -40,62 +46,14 @@ def _sphinx_version(): return release -class HelpDialog(object): - - def __init__(self): - self.parent = None # parent of help window - self.dlg = None # the help window iteself - - def display(self, parent, near=None): - """ Display the help dialog. - - parent - parent widget for the help window - - near - a Toplevel widget (e.g. EditorWindow or PyShell) - to use as a reference for placing the help window - """ - import warnings as w - w.warn("EditorWindow.HelpDialog is no longer used by Idle.\n" - "It will be removed in 3.6 or later.\n" - "It has been replaced by private help.HelpWindow\n", - DeprecationWarning, stacklevel=2) - if self.dlg is None: - self.show_dialog(parent) - if near: - self.nearwindow(near) - - def show_dialog(self, parent): - self.parent = parent - fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt') - self.dlg = dlg = textView.view_file(parent,'Help',fn, modal=False) - dlg.bind('', self.destroy, '+') - - def nearwindow(self, near): - # Place the help dialog near the window specified by parent. - # Note - this may not reposition the window in Metacity - # if "/apps/metacity/general/disable_workarounds" is enabled - dlg = self.dlg - geom = (near.winfo_rootx() + 10, near.winfo_rooty() + 10) - dlg.withdraw() - dlg.geometry("=+%d+%d" % geom) - dlg.deiconify() - dlg.lift() - - def destroy(self, ev=None): - self.dlg = None - self.parent = None - -helpDialog = HelpDialog() # singleton instance, no longer used - - class EditorWindow(object): - from idlelib.Percolator import Percolator - from idlelib.ColorDelegator import ColorDelegator, color_config - from idlelib.UndoDelegator import UndoDelegator - from idlelib.IOBinding import IOBinding, encoding - from idlelib import Bindings + from idlelib.percolator import Percolator + from idlelib.colorizer import ColorDelegator, color_config + from idlelib.undo import UndoDelegator + from idlelib.iomenu import IOBinding, encoding + from idlelib import mainmenu from tkinter import Toplevel - from idlelib.MultiStatusBar import MultiStatusBar + from idlelib.statusbar import MultiStatusBar filesystemencoding = sys.getfilesystemencoding() # for file names help_url = None @@ -137,11 +95,11 @@ class EditorWindow(object): except AttributeError: sys.ps1 = '>>> ' self.menubar = Menu(root) - self.top = top = WindowList.ListedToplevel(root, menu=self.menubar) + self.top = top = windows.ListedToplevel(root, menu=self.menubar) if flist: self.tkinter_vars = flist.vars #self.top.instance_dict makes flist.inversedict available to - #configDialog.py so it can access all EditorWindow instances + #configdialog.py so it can access all EditorWindow instances self.top.instance_dict = flist.inversedict else: self.tkinter_vars = {} # keys: Tkinter event names @@ -159,13 +117,10 @@ class EditorWindow(object): 'wrap': 'none', 'highlightthickness': 0, 'width': self.width, - 'height': idleConf.GetOption('main', 'EditorWindow', - 'height', type='int')} - if TkVersion >= 8.5: - # Starting with tk 8.5 we have to set the new tabstyle option - # to 'wordprocessor' to achieve the same display of tabs as in - # older tk versions. - text_options['tabstyle'] = 'wordprocessor' + 'tabstyle': 'wordprocessor', # new in 8.5 + 'height': idleConf.GetOption( + 'main', 'EditorWindow', 'height', type='int'), + } self.text = text = MultiCallCreator(Text)(text_frame, **text_options) self.top.focused_widget = self.text @@ -174,7 +129,7 @@ class EditorWindow(object): self.top.protocol("WM_DELETE_WINDOW", self.close) self.top.bind("<>", self.close_event) - if macosxSupport.isAquaTk(): + if macosx.isAquaTk(): # Command-W on editorwindows doesn't work without this. text.bind('<>', self.close_event) # Some OS X systems have only one mouse button, so use @@ -310,7 +265,7 @@ class EditorWindow(object): menu.add_separator() end = end + 1 self.wmenu_end = end - WindowList.register_callback(self.postwindowsmenu) + windows.register_callback(self.postwindowsmenu) # Some abstractions so IDLE extensions are cross-IDE self.askyesno = tkMessageBox.askyesno @@ -419,7 +374,7 @@ class EditorWindow(object): underline, label = prepstr(label) menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) - if macosxSupport.isCarbonTk(): + if macosx.isCarbonTk(): # Insert the application menu menudict['application'] = menu = Menu(mbar, name='apple', tearoff=0) @@ -440,7 +395,7 @@ class EditorWindow(object): end = -1 if end > self.wmenu_end: menu.delete(self.wmenu_end+1, end) - WindowList.add_windows_to_menu(menu) + windows.add_windows_to_menu(menu) rmenu = None @@ -508,17 +463,17 @@ class EditorWindow(object): def about_dialog(self, event=None): "Handle Help 'About IDLE' event." - # Synchronize with macosxSupport.overrideRootMenu.about_dialog. - aboutDialog.AboutDialog(self.top,'About IDLE') + # Synchronize with macosx.overrideRootMenu.about_dialog. + help_about.AboutDialog(self.top,'About IDLE') def config_dialog(self, event=None): "Handle Options 'Configure IDLE' event." - # Synchronize with macosxSupport.overrideRootMenu.config_dialog. - configDialog.ConfigDialog(self.top,'Settings') + # Synchronize with macosx.overrideRootMenu.config_dialog. + configdialog.ConfigDialog(self.top,'Settings') def help_dialog(self, event=None): "Handle Help 'IDLE Help' event." - # Synchronize with macosxSupport.overrideRootMenu.help_dialog. + # Synchronize with macosx.overrideRootMenu.help_dialog. if self.root: parent = self.root else: @@ -591,23 +546,23 @@ class EditorWindow(object): return "break" def find_event(self, event): - SearchDialog.find(self.text) + search.find(self.text) return "break" def find_again_event(self, event): - SearchDialog.find_again(self.text) + search.find_again(self.text) return "break" def find_selection_event(self, event): - SearchDialog.find_selection(self.text) + search.find_selection(self.text) return "break" def find_in_files_event(self, event): - GrepDialog.grep(self.text, self.io, self.flist) + grep.grep(self.text, self.io, self.flist) return "break" def replace_event(self, event): - ReplaceDialog.replace(self.text) + replace.replace(self.text) return "break" def goto_line_event(self, event): @@ -623,46 +578,27 @@ class EditorWindow(object): text.see("insert") def open_module(self, event=None): - # XXX Shouldn't this be in IOBinding? + """Get module name from user and open it. + + Return module path or None for calls by open_class_browser + when latter is not invoked in named editor window. + """ + # XXX This, open_class_browser, and open_path_browser + # would fit better in iomenu.IOBinding. try: - name = self.text.get("sel.first", "sel.last") + name = self.text.get("sel.first", "sel.last").strip() except TclError: - name = "" - else: - name = name.strip() - name = tkSimpleDialog.askstring("Module", - "Enter the name of a Python module\n" - "to search on sys.path and open:", - parent=self.text, initialvalue=name) - if name: - name = name.strip() - if not name: - return - # XXX Ought to insert current file's directory in front of path - try: - spec = importlib.util.find_spec(name) - except (ValueError, ImportError) as msg: - tkMessageBox.showerror("Import error", str(msg), parent=self.text) - return - if spec is None: - tkMessageBox.showerror("Import error", "module not found", - parent=self.text) - return - if not isinstance(spec.loader, importlib.abc.SourceLoader): - tkMessageBox.showerror("Import error", "not a source-based module", - parent=self.text) - return - try: - file_path = spec.loader.get_filename(name) - except AttributeError: - tkMessageBox.showerror("Import error", - "loader does not support get_filename", - parent=self.text) - return - if self.flist: - self.flist.open(file_path) - else: - self.io.loadfile(file_path) + name = '' + file_path = query.ModuleName( + self.text, "Open Module", + "Enter the name of a Python module\n" + "to search on sys.path and open:", + name).result + if file_path is not None: + if self.flist: + self.flist.open(file_path) + else: + self.io.loadfile(file_path) return file_path def open_class_browser(self, event=None): @@ -674,12 +610,12 @@ class EditorWindow(object): return head, tail = os.path.split(filename) base, ext = os.path.splitext(tail) - from idlelib import ClassBrowser - ClassBrowser.ClassBrowser(self.flist, base, [head]) + from idlelib import browser + browser.ClassBrowser(self.flist, base, [head]) def open_path_browser(self, event=None): - from idlelib import PathBrowser - PathBrowser.PathBrowser(self.flist) + from idlelib import pathbrowser + pathbrowser.PathBrowser(self.flist) def open_turtle_demo(self, event = None): import subprocess @@ -740,7 +676,7 @@ class EditorWindow(object): def ResetColorizer(self): "Update the color theme" - # Called from self.filename_change_hook and from configDialog.py + # Called from self.filename_change_hook and from configdialog.py self._rmcolorizer() self._addcolorizer() EditorWindow.color_config(self.text) @@ -760,14 +696,14 @@ class EditorWindow(object): def ResetFont(self): "Update the text widgets' font if it is changed" - # Called from configDialog.py + # Called from configdialog.py self.text['font'] = idleConf.GetFont(self.root, 'main','EditorWindow') def RemoveKeybindings(self): "Remove the keybindings before they are changed." - # Called from configDialog.py - self.Bindings.default_keydefs = keydefs = idleConf.GetCurrentKeySet() + # Called from configdialog.py + self.mainmenu.default_keydefs = keydefs = idleConf.GetCurrentKeySet() for event, keylist in keydefs.items(): self.text.event_delete(event, *keylist) for extensionName in self.get_standard_extension_names(): @@ -778,8 +714,8 @@ class EditorWindow(object): def ApplyKeybindings(self): "Update the keybindings after they are changed" - # Called from configDialog.py - self.Bindings.default_keydefs = keydefs = idleConf.GetCurrentKeySet() + # Called from configdialog.py + self.mainmenu.default_keydefs = keydefs = idleConf.GetCurrentKeySet() self.apply_bindings() for extensionName in self.get_standard_extension_names(): xkeydefs = idleConf.GetExtensionBindings(extensionName) @@ -787,7 +723,7 @@ class EditorWindow(object): self.apply_bindings(xkeydefs) #update menu accelerators menuEventDict = {} - for menu in self.Bindings.menudefs: + for menu in self.mainmenu.menudefs: menuEventDict[menu[0]] = {} for item in menu[1]: if item: @@ -814,7 +750,7 @@ class EditorWindow(object): def set_notabs_indentwidth(self): "Update the indentwidth if changed and not using tabs in this window" - # Called from configDialog.py + # Called from configdialog.py if not self.usetabs: self.indentwidth = idleConf.GetOption('main', 'Indent','num-spaces', type='int') @@ -994,7 +930,7 @@ class EditorWindow(object): def _close(self): if self.io.filename: self.update_recent_files_list(new_file=self.io.filename) - WindowList.unregister_callback(self.postwindowsmenu) + windows.unregister_callback(self.postwindowsmenu) self.unload_extensions() self.io.close() self.io = None @@ -1032,12 +968,25 @@ class EditorWindow(object): def get_standard_extension_names(self): return idleConf.GetExtensions(editor_only=True) + extfiles = { # map config-extension section names to new file names + 'AutoComplete': 'autocomplete', + 'AutoExpand': 'autoexpand', + 'CallTips': 'calltips', + 'CodeContext': 'codecontext', + 'FormatParagraph': 'paragraph', + 'ParenMatch': 'parenmatch', + 'RstripExtension': 'rstrip', + 'ScriptBinding': 'runscript', + 'ZoomHeight': 'zoomheight', + } + def load_extension(self, name): + fname = self.extfiles.get(name, name) try: try: - mod = importlib.import_module('.' + name, package=__package__) + mod = importlib.import_module('.' + fname, package=__package__) except (ImportError, TypeError): - mod = importlib.import_module(name) + mod = importlib.import_module(fname) except ImportError: print("\nFailed to import extension: ", name) raise @@ -1061,7 +1010,7 @@ class EditorWindow(object): def apply_bindings(self, keydefs=None): if keydefs is None: - keydefs = self.Bindings.default_keydefs + keydefs = self.mainmenu.default_keydefs text = self.text text.keydefs = keydefs for event, keylist in keydefs.items(): @@ -1074,9 +1023,9 @@ class EditorWindow(object): Menus that are absent or None in self.menudict are ignored. """ if menudefs is None: - menudefs = self.Bindings.menudefs + menudefs = self.mainmenu.menudefs if keydefs is None: - keydefs = self.Bindings.default_keydefs + keydefs = self.mainmenu.default_keydefs menudict = self.menudict text = self.text for mname, entrylist in menudefs: @@ -1303,7 +1252,7 @@ class EditorWindow(object): # adjust indentation for continuations and block # open/close first need to find the last stmt lno = index2line(text.index('insert')) - y = PyParse.Parser(self.indentwidth, self.tabwidth) + y = pyparse.Parser(self.indentwidth, self.tabwidth) if not self.context_use_ps1: for context in self.num_context_lines: startat = max(lno - context, 1) @@ -1327,22 +1276,22 @@ class EditorWindow(object): y.set_lo(0) c = y.get_continuation_type() - if c != PyParse.C_NONE: + if c != pyparse.C_NONE: # The current stmt hasn't ended yet. - if c == PyParse.C_STRING_FIRST_LINE: + if c == pyparse.C_STRING_FIRST_LINE: # after the first line of a string; do not indent at all pass - elif c == PyParse.C_STRING_NEXT_LINES: + elif c == pyparse.C_STRING_NEXT_LINES: # inside a string which started before this line; # just mimic the current indent text.insert("insert", indent) - elif c == PyParse.C_BRACKET: + elif c == pyparse.C_BRACKET: # line up with the first (if any) element of the # last open bracket structure; else indent one # level beyond the indent of the line with the # last open bracket self.reindent_to(y.compute_bracket_indent()) - elif c == PyParse.C_BACKSLASH: + elif c == pyparse.C_BACKSLASH: # if more than one line in this stmt already, just # mimic the current indent; else if initial line # has a start on an assignment stmt, indent to @@ -1570,9 +1519,6 @@ def classifyws(s, tabwidth): break return raw, effective -import tokenize -_tokenize = tokenize -del tokenize class IndentSearcher(object): @@ -1597,8 +1543,8 @@ class IndentSearcher(object): return self.text.get(mark, mark + " lineend+1c") def tokeneater(self, type, token, start, end, line, - INDENT=_tokenize.INDENT, - NAME=_tokenize.NAME, + INDENT=tokenize.INDENT, + NAME=tokenize.NAME, OPENERS=('class', 'def', 'for', 'if', 'try', 'while')): if self.finished: pass @@ -1609,19 +1555,19 @@ class IndentSearcher(object): self.finished = 1 def run(self): - save_tabsize = _tokenize.tabsize - _tokenize.tabsize = self.tabwidth + save_tabsize = tokenize.tabsize + tokenize.tabsize = self.tabwidth try: try: - tokens = _tokenize.generate_tokens(self.readline) + tokens = tokenize.generate_tokens(self.readline) for token in tokens: self.tokeneater(*token) - except (_tokenize.TokenError, SyntaxError): + except (tokenize.TokenError, SyntaxError): # since we cut off the tokenizer early, we can trigger # spurious errors pass finally: - _tokenize.tabsize = save_tabsize + tokenize.tabsize = save_tabsize return self.blkopenline, self.indentedline ### end autoindent code ### @@ -1645,7 +1591,7 @@ def get_accelerator(keydefs, eventname): keylist = keydefs.get(eventname) # issue10940: temporary workaround to prevent hang with OS X Cocoa Tk 8.5 # if not keylist: - if (not keylist) or (macosxSupport.isCocoaTk() and eventname in { + if (not keylist) or (macosx.isCocoaTk() and eventname in { "<>", "<>", "<>"}): @@ -1680,7 +1626,7 @@ def _editor_window(parent): # htest # filename = sys.argv[1] else: filename = None - macosxSupport.setupApp(root, None) + macosx.setupApp(root, None) edit = EditorWindow(root=root, filename=filename) edit.text.bind("<>", edit.close_event) # Does not stop error, neither does following diff --git a/Lib/idlelib/FileList.py b/Lib/idlelib/filelist.py similarity index 97% rename from Lib/idlelib/FileList.py rename to Lib/idlelib/filelist.py index a9989a8..f46ad7c 100644 --- a/Lib/idlelib/FileList.py +++ b/Lib/idlelib/filelist.py @@ -1,4 +1,5 @@ import os + from tkinter import * import tkinter.messagebox as tkMessageBox @@ -6,7 +7,7 @@ import tkinter.messagebox as tkMessageBox class FileList: # N.B. this import overridden in PyShellFileList. - from idlelib.EditorWindow import EditorWindow + from idlelib.editor import EditorWindow def __init__(self, root): self.root = root @@ -111,7 +112,7 @@ class FileList: def _test(): - from idlelib.EditorWindow import fixwordbreaks + from idlelib.editor import fixwordbreaks import sys root = Tk() fixwordbreaks(root) diff --git a/Lib/idlelib/GrepDialog.py b/Lib/idlelib/grep.py similarity index 82% rename from Lib/idlelib/GrepDialog.py rename to Lib/idlelib/grep.py index 721b231..64ba28d 100644 --- a/Lib/idlelib/GrepDialog.py +++ b/Lib/idlelib/grep.py @@ -1,17 +1,19 @@ -import os import fnmatch -import re # for htest +import os import sys -from tkinter import StringVar, BooleanVar, Checkbutton # for GrepDialog -from tkinter import Tk, Text, Button, SEL, END # for htest -from idlelib import SearchEngine -from idlelib.SearchDialogBase import SearchDialogBase -# Importing OutputWindow fails due to import loop + +from tkinter import StringVar, BooleanVar +from tkinter.ttk import Checkbutton + +from idlelib.searchbase import SearchDialogBase +from idlelib import searchengine + +# Importing OutputWindow here fails due to import loop # EditorWindow -> GrepDialop -> OutputWindow -> EditorWindow def grep(text, io=None, flist=None): root = text._root() - engine = SearchEngine.get(root) + engine = searchengine.get(root) if not hasattr(engine, "_grepdialog"): engine._grepdialog = GrepDialog(root, engine, flist) dialog = engine._grepdialog @@ -47,13 +49,10 @@ class GrepDialog(SearchDialogBase): self.globent = self.make_entry("In files:", self.globvar)[0] def create_other_buttons(self): - f = self.make_frame()[0] - - btn = Checkbutton(f, anchor="w", - variable=self.recvar, + btn = Checkbutton( + self.make_frame()[0], variable=self.recvar, text="Recurse down subdirectories") btn.pack(side="top", fill="both") - btn.select() def create_command_buttons(self): SearchDialogBase.create_command_buttons(self) @@ -67,7 +66,7 @@ class GrepDialog(SearchDialogBase): if not path: self.top.bell() return - from idlelib.OutputWindow import OutputWindow # leave here! + from idlelib.outwin import OutputWindow # leave here! save = sys.stdout try: sys.stdout = OutputWindow(self.flist) @@ -131,14 +130,16 @@ class GrepDialog(SearchDialogBase): def _grep_dialog(parent): # htest # - from idlelib.PyShell import PyShellFileList - root = Tk() - root.title("Test GrepDialog") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - - flist = PyShellFileList(root) - text = Text(root, height=5) + from tkinter import Toplevel, Text, SEL, END + from tkinter.ttk import Button + from idlelib.pyshell import PyShellFileList + top = Toplevel(parent) + top.title("Test GrepDialog") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + + flist = PyShellFileList(top) + text = Text(top, height=5) text.pack() def show_grep_dialog(): @@ -146,9 +147,8 @@ def _grep_dialog(parent): # htest # grep(text, flist=flist) text.tag_remove(SEL, "1.0", END) - button = Button(root, text="Show GrepDialog", command=show_grep_dialog) + button = Button(top, text="Show GrepDialog", command=show_grep_dialog) button.pack() - root.mainloop() if __name__ == "__main__": import unittest diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index f10cd34..ffc03c4 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -90,7 +90,7 @@

25.5. IDLE¶

-

Source code: Lib/idlelib/

+

Source code: Lib/idlelib/

IDLE is Python’s Integrated Development and Learning Environment.

IDLE has the following features:

diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py index a7008e9..77e01a3 100644 --- a/Lib/idlelib/help.py +++ b/Lib/idlelib/help.py @@ -4,7 +4,7 @@ Contents are subject to revision at any time, without notice. Help => About IDLE: diplay About Idle dialog - + Help => IDLE Help: Display help.html with proper formatting. @@ -25,15 +25,14 @@ copy_strip - Copy idle.html to help.html, rstripping each line. show_idlehelp - Create HelpWindow. Called in EditorWindow.help_dialog. """ from html.parser import HTMLParser -from os.path import abspath, dirname, isdir, isfile, join +from os.path import abspath, dirname, isfile, join from platform import python_version -from tkinter import Tk, Toplevel, Frame, Text, Scrollbar, Menu, Menubutton + +from tkinter import Toplevel, Frame, Text, Menu +from tkinter.ttk import Menubutton, Scrollbar from tkinter import font as tkfont -from idlelib.configHandler import idleConf -use_ttk = False # until available to import -if use_ttk: - from tkinter.ttk import Menubutton +from idlelib.config import idleConf ## About IDLE ## @@ -197,15 +196,18 @@ class HelpFrame(Frame): "Display html text, scrollbar, and toc." def __init__(self, parent, filename): Frame.__init__(self, parent) - text = HelpText(self, filename) + # keep references to widgets for test access. + self.text = text = HelpText(self, filename) self['background'] = text['background'] - scroll = Scrollbar(self, command=text.yview) + self.toc = toc = self.toc_menu(text) + self.scroll = scroll = Scrollbar(self, command=text.yview) text['yscrollcommand'] = scroll.set + self.rowconfigure(0, weight=1) self.columnconfigure(1, weight=1) # text - self.toc_menu(text).grid(column=0, row=0, sticky='nw') - text.grid(column=1, row=0, sticky='nsew') - scroll.grid(column=2, row=0, sticky='ns') + toc.grid(row=0, column=0, sticky='nw') + text.grid(row=0, column=1, sticky='nsew') + scroll.grid(row=0, column=2, sticky='ns') def toc_menu(self, text): "Create table of contents as drop-down menu." diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt deleted file mode 100644 index 89fbe0b..0000000 --- a/Lib/idlelib/help.txt +++ /dev/null @@ -1,372 +0,0 @@ -This file, idlelib/help.txt is out-of-date and no longer used by Idle. -It is deprecated and will be removed in the future, possibly in 3.6 ----------------------------------------------------------------------- - -[See the end of this file for ** TIPS ** on using IDLE !!] - -IDLE is the Python IDE built with the tkinter GUI toolkit. - -IDLE has the following features: --coded in 100% pure Python, using the tkinter GUI toolkit --cross-platform: works on Windows, Unix, and OS X --multi-window text editor with multiple undo, Python colorizing, smart indent, -call tips, and many other features --Python shell window (a.k.a interactive interpreter) --debugger (not complete, but you can set breakpoints, view and step) - -Menus: - -IDLE has two window types the Shell window and the Editor window. It is -possible to have multiple editor windows simultaneously. IDLE's -menus dynamically change based on which window is currently selected. Each menu -documented below indicates which window type it is associated with. - -File Menu (Shell and Editor): - - New File -- Create a new file editing window - Open... -- Open an existing file - Open Module... -- Open an existing module (searches sys.path) - Recent Files... -- Open a list of recent files - Class Browser -- Show classes and methods in current file - Path Browser -- Show sys.path directories, modules, classes, - and methods - --- - Save -- Save current window to the associated file (unsaved - windows have a * before and after the window title) - - Save As... -- Save current window to new file, which becomes - the associated file - Save Copy As... -- Save current window to different file - without changing the associated file - --- - Print Window -- Print the current window - --- - Close -- Close current window (asks to save if unsaved) - Exit -- Close all windows, quit (asks to save if unsaved) - -Edit Menu (Shell and Editor): - - Undo -- Undo last change to current window - (a maximum of 1000 changes may be undone) - Redo -- Redo last undone change to current window - --- - Cut -- Copy a selection into system-wide clipboard, - then delete the selection - Copy -- Copy selection into system-wide clipboard - Paste -- Insert system-wide clipboard into window - Select All -- Select the entire contents of the edit buffer - --- - Find... -- Open a search dialog box with many options - Find Again -- Repeat last search - Find Selection -- Search for the string in the selection - Find in Files... -- Open a search dialog box for searching files - Replace... -- Open a search-and-replace dialog box - Go to Line -- Ask for a line number and show that line - Expand Word -- Expand the word you have typed to match another - word in the same buffer; repeat to get a - different expansion - Show Calltip -- After an unclosed parenthesis for a function, open - a small window with function parameter hints - Show Parens -- Highlight the surrounding parenthesis - Show Completions -- Open a scroll window allowing selection keywords - and attributes. (see '*TIPS*', below) - -Format Menu (Editor window only): - - Indent Region -- Shift selected lines right by the indent width - (default 4 spaces) - Dedent Region -- Shift selected lines left by the indent width - (default 4 spaces) - Comment Out Region -- Insert ## in front of selected lines - Uncomment Region -- Remove leading # or ## from selected lines - Tabify Region -- Turns *leading* stretches of spaces into tabs. - (Note: We recommend using 4 space blocks to indent Python code.) - Untabify Region -- Turn *all* tabs into the corrent number of spaces - Toggle tabs -- Open a dialog to switch between indenting with - spaces and tabs. - New Indent Width... -- Open a dialog to change indent width. The - accepted default by the Python community is 4 - spaces. - Format Paragraph -- Reformat the current blank-line-separated - paragraph. All lines in the paragraph will be - formatted to less than 80 columns. - --- - Strip trailing whitespace -- Removed any space characters after the end - of the last non-space character - -Run Menu (Editor window only): - - Python Shell -- Open or wake up the Python shell window - --- - Check Module -- Check the syntax of the module currently open in the - Editor window. If the module has not been saved IDLE - will prompt the user to save the code. - Run Module -- Restart the shell to clean the environment, then - execute the currently open module. If the module has - not been saved IDLE will prompt the user to save the - code. - -Shell Menu (Shell window only): - - View Last Restart -- Scroll the shell window to the last Shell restart - Restart Shell -- Restart the shell to clean the environment - -Debug Menu (Shell window only): - - Go to File/Line -- Look around the insert point for a filename - and line number, open the file, and show the line. - Useful to view the source lines referenced in an - exception traceback. Available in the context - menu of the Shell window. - Debugger (toggle) -- This feature is not complete and considered - experimental. Run commands in the shell under the - debugger. - Stack Viewer -- Show the stack traceback of the last exception - Auto-open Stack Viewer (toggle) -- Toggle automatically opening the - stack viewer on unhandled - exception - -Options Menu (Shell and Editor): - - Configure IDLE -- Open a configuration dialog. Fonts, indentation, - keybindings, and color themes may be altered. - Startup Preferences may be set, and additional Help - sources can be specified. On OS X, open the - configuration dialog by selecting Preferences - in the application menu. - - --- - Code Context (toggle) -- Open a pane at the top of the edit window - which shows the block context of the section - of code which is scrolling off the top or the - window. This is not present in the Shell - window only the Editor window. - -Window Menu (Shell and Editor): - - Zoom Height -- Toggles the window between normal size (40x80 initial - setting) and maximum height. The initial size is in the Configure - IDLE dialog under the general tab. - --- - The rest of this menu lists the names of all open windows; - select one to bring it to the foreground (deiconifying it if - necessary). - -Help Menu: - - About IDLE -- Version, copyright, license, credits - --- - IDLE Help -- Display this file which is a help file for IDLE - detailing the menu options, basic editing and navigation, - and other tips. - Python Docs -- Access local Python documentation, if - installed. Or will start a web browser and open - docs.python.org showing the latest Python documentation. - --- - Additional help sources may be added here with the Configure IDLE - dialog under the General tab. - -Editor context menu (Right-click / Control-click on OS X in Edit window): - - Cut -- Copy a selection into system-wide clipboard, - then delete the selection - Copy -- Copy selection into system-wide clipboard - Paste -- Insert system-wide clipboard into window - Set Breakpoint -- Sets a breakpoint. Breakpoints are only enabled - when the debugger is open. - Clear Breakpoint -- Clears the breakpoint on that line - -Shell context menu (Right-click / Control-click on OS X in Shell window): - - Cut -- Copy a selection into system-wide clipboard, - then delete the selection - Copy -- Copy selection into system-wide clipboard - Paste -- Insert system-wide clipboard into window - --- - Go to file/line -- Same as in Debug menu - - -** TIPS ** -========== - -Additional Help Sources: - - Windows users can Google on zopeshelf.chm to access Zope help files in - the Windows help format. The Additional Help Sources feature of the - configuration GUI supports .chm, along with any other filetypes - supported by your browser. Supply a Menu Item title, and enter the - location in the Help File Path slot of the New Help Source dialog. Use - http:// and/or www. to identify external URLs, or download the file and - browse for its path on your machine using the Browse button. - - All users can access the extensive sources of help, including - tutorials, available at docs.python.org. Selected URLs can be added - or removed from the Help menu at any time using Configure IDLE. - -Basic editing and navigation: - - Backspace deletes char to the left; DEL deletes char to the right. - Control-backspace deletes word left, Control-DEL deletes word right. - Arrow keys and Page Up/Down move around. - Control-left/right Arrow moves by words in a strange but useful way. - Home/End go to begin/end of line. - Control-Home/End go to begin/end of file. - Some useful Emacs bindings are inherited from Tcl/Tk: - Control-a beginning of line - Control-e end of line - Control-k kill line (but doesn't put it in clipboard) - Control-l center window around the insertion point - Standard keybindings (like Control-c to copy and Control-v to - paste) may work. Keybindings are selected in the Configure IDLE - dialog. - -Automatic indentation: - - After a block-opening statement, the next line is indented by 4 spaces - (in the Python Shell window by one tab). After certain keywords - (break, return etc.) the next line is dedented. In leading - indentation, Backspace deletes up to 4 spaces if they are there. Tab - inserts spaces (in the Python Shell window one tab), number depends on - Indent Width. Currently tabs are restricted to four spaces due - to Tcl/Tk limitations. - - See also the indent/dedent region commands in the edit menu. - -Completions: - - Completions are supplied for functions, classes, and attributes of - classes, both built-in and user-defined. Completions are also provided - for filenames. - - The AutoCompleteWindow (ACW) will open after a predefined delay - (default is two seconds) after a '.' or (in a string) an os.sep is - typed. If after one of those characters (plus zero or more other - characters) a tab is typed the ACW will open immediately if a possible - continuation is found. - - If there is only one possible completion for the characters entered, a - tab will supply that completion without opening the ACW. - - 'Show Completions' will force open a completions window, by default the - Control-space keys will open a completions window. In an empty - string, this will contain the files in the current directory. On a - blank line, it will contain the built-in and user-defined functions and - classes in the current name spaces, plus any modules imported. If some - characters have been entered, the ACW will attempt to be more specific. - - If string of characters is typed, the ACW selection will jump to the - entry most closely matching those characters. Entering a tab will cause - the longest non-ambiguous match to be entered in the Edit window or - Shell. Two tabs in a row will supply the current ACW selection, as - will return or a double click. Cursor keys, Page Up/Down, mouse - selection, and the scroll wheel all operate on the ACW. - - "Hidden" attributes can be accessed by typing the beginning of hidden - name after a '.', e.g. '_'. This allows access to modules with - '__all__' set, or to class-private attributes. - - Completions and the 'Expand Word' facility can save a lot of typing! - - Completions are currently limited to those in the namespaces. Names in - an Editor window which are not via __main__ or sys.modules will not be - found. Run the module once with your imports to correct this - situation. Note that IDLE itself places quite a few modules in - sys.modules, so much can be found by default, e.g. the re module. - - If you don't like the ACW popping up unbidden, simply make the delay - longer or disable the extension. Or another option is the delay could - be set to zero. Another alternative to preventing ACW popups is to - disable the call tips extension. - -Python Shell window: - - Control-c interrupts executing command. - Control-d sends end-of-file; closes window if typed at >>> prompt. - Alt-/ expand word is also useful to reduce typing. - - Command history: - - Alt-p retrieves previous command matching what you have typed. On OS X - use Control-p. - Alt-n retrieves next. On OS X use Control-n. - Return while cursor is on a previous command retrieves that command. - - Syntax colors: - - The coloring is applied in a background "thread", so you may - occasionally see uncolorized text. To change the color - scheme, use the Configure IDLE / Highlighting dialog. - - Python default syntax colors: - - Keywords orange - Builtins royal purple - Strings green - Comments red - Definitions blue - - Shell default colors: - - Console output brown - stdout blue - stderr red - stdin black - -Other preferences: - - The font preferences, highlighting, keys, and general preferences can - be changed via the Configure IDLE menu option. Be sure to note that - keys can be user defined, IDLE ships with four built in key sets. In - addition a user can create a custom key set in the Configure IDLE - dialog under the keys tab. - -Command line usage: - - Enter idle -h at the command prompt to get a usage message. - - idle.py [-c command] [-d] [-e] [-s] [-t title] [arg] ... - - -c command run this command - -d enable debugger - -e edit mode; arguments are files to be edited - -s run $IDLESTARTUP or $PYTHONSTARTUP first - -t title set title of shell window - - If there are arguments: - 1. If -e is used, arguments are files opened for editing and sys.argv - reflects the arguments passed to IDLE itself. - 2. Otherwise, if -c is used, all arguments are placed in - sys.argv[1:...], with sys.argv[0] set to -c. - 3. Otherwise, if neither -e nor -c is used, the first argument is a - script which is executed with the remaining arguments in - sys.argv[1:...] and sys.argv[0] set to the script name. If the - script name is -, no script is executed but an interactive Python - session is started; the arguments are still available in sys.argv. - -Running without a subprocess: (DEPRECATED in Python 3.4 see Issue 16123) - - If IDLE is started with the -n command line switch it will run in a - single process and will not create the subprocess which runs the RPC - Python execution server. This can be useful if Python cannot create - the subprocess or the RPC socket interface on your platform. However, - in this mode user code is not isolated from IDLE itself. Also, the - environment is not restarted when Run/Run Module (F5) is selected. If - your code has been modified, you must reload() the affected modules and - re-import any specific items (e.g. from foo import baz) if the changes - are to take effect. For these reasons, it is preferable to run IDLE - with the default subprocess if at all possible. - -Extensions: - - IDLE contains an extension facility. See the beginning of - config-extensions.def in the idlelib directory for further information. - The default extensions are currently: - - FormatParagraph - AutoExpand - ZoomHeight - ScriptBinding - CallTips - ParenMatch - AutoComplete - CodeContext diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/help_about.py similarity index 96% rename from Lib/idlelib/aboutDialog.py rename to Lib/idlelib/help_about.py index a8f75d2..071bd3e 100644 --- a/Lib/idlelib/aboutDialog.py +++ b/Lib/idlelib/help_about.py @@ -1,11 +1,13 @@ """About Dialog for IDLE """ - import os from sys import version + from tkinter import * -from idlelib import textView + +from idlelib import textview + class AboutDialog(Toplevel): """Modal about dialog for idle @@ -135,17 +137,18 @@ class AboutDialog(Toplevel): def display_printer_text(self, title, printer): printer._Printer__setup() text = '\n'.join(printer._Printer__lines) - textView.view_text(self, title, text) + textview.view_text(self, title, text) def display_file_text(self, title, filename, encoding=None): fn = os.path.join(os.path.abspath(os.path.dirname(__file__)), filename) - textView.view_file(self, title, fn, encoding) + textview.view_file(self, title, fn, encoding) def Ok(self, event=None): self.destroy() + if __name__ == '__main__': import unittest - unittest.main('idlelib.idle_test.test_helpabout', verbosity=2, exit=False) + unittest.main('idlelib.idle_test.test_help_about', verbosity=2, exit=False) from idlelib.idle_test.htest import run run(AboutDialog) diff --git a/Lib/idlelib/IdleHistory.py b/Lib/idlelib/history.py similarity index 95% rename from Lib/idlelib/IdleHistory.py rename to Lib/idlelib/history.py index 078af29..56f53a0 100644 --- a/Lib/idlelib/IdleHistory.py +++ b/Lib/idlelib/history.py @@ -1,11 +1,12 @@ "Implement Idle Shell history mechanism with History class" -from idlelib.configHandler import idleConf +from idlelib.config import idleConf + class History: ''' Implement Idle Shell history mechanism. - store - Store source statement (called from PyShell.resetoutput). + store - Store source statement (called from pyshell.resetoutput). fetch - Fetch stored statement matching prefix already entered. history_next - Bound to <> event (default Alt-N). history_prev - Bound to <> event (default Alt-P). @@ -99,6 +100,7 @@ class History: self.pointer = None self.prefix = None + if __name__ == "__main__": from unittest import main - main('idlelib.idle_test.test_idlehistory', verbosity=2, exit=False) + main('idlelib.idle_test.test_history', verbosity=2, exit=False) diff --git a/Lib/idlelib/HyperParser.py b/Lib/idlelib/hyperparser.py similarity index 99% rename from Lib/idlelib/HyperParser.py rename to Lib/idlelib/hyperparser.py index 77cb057..450a709 100644 --- a/Lib/idlelib/HyperParser.py +++ b/Lib/idlelib/hyperparser.py @@ -4,11 +4,10 @@ HyperParser uses PyParser. PyParser mostly gives information on the proper indentation of code. HyperParser gives additional information on the structure of code. """ - -import string from keyword import iskeyword -from idlelib import PyParse +import string +from idlelib import pyparse # all ASCII chars that may be in an identifier _ASCII_ID_CHARS = frozenset(string.ascii_letters + string.digits + "_") @@ -30,7 +29,7 @@ class HyperParser: self.editwin = editwin self.text = text = editwin.text - parser = PyParse.Parser(editwin.indentwidth, editwin.tabwidth) + parser = pyparse.Parser(editwin.indentwidth, editwin.tabwidth) def index2line(index): return int(float(index)) diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py index 141534d..485d5a7 100644 --- a/Lib/idlelib/idle.py +++ b/Lib/idlelib/idle.py @@ -1,6 +1,7 @@ import os.path import sys + # Enable running IDLE with idlelib in a non-standard location. # This was once used to run development versions of IDLE. # Because PEP 434 declared idle.py a public interface, @@ -9,5 +10,5 @@ idlelib_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if idlelib_dir not in sys.path: sys.path.insert(0, idlelib_dir) -from idlelib.PyShell import main # This is subject to change +from idlelib.pyshell import main # This is subject to change main() diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw index 142cb32..e73c049 100644 --- a/Lib/idlelib/idle.pyw +++ b/Lib/idlelib/idle.pyw @@ -1,10 +1,10 @@ try: - import idlelib.PyShell + import idlelib.pyshell except ImportError: - # IDLE is not installed, but maybe PyShell is on sys.path: - from . import PyShell + # IDLE is not installed, but maybe pyshell is on sys.path: + from . import pyshell import os - idledir = os.path.dirname(os.path.abspath(PyShell.__file__)) + idledir = os.path.dirname(os.path.abspath(pyshell.__file__)) if idledir != os.getcwd(): # We're not in the IDLE directory, help the subprocess find run.py pypath = os.environ.get('PYTHONPATH', '') @@ -12,6 +12,6 @@ except ImportError: os.environ['PYTHONPATH'] = pypath + ':' + idledir else: os.environ['PYTHONPATH'] = idledir - PyShell.main() + pyshell.main() else: - idlelib.PyShell.main() + idlelib.pyshell.main() diff --git a/Lib/idlelib/idle_test/__init__.py b/Lib/idlelib/idle_test/__init__.py index 845c92d..ad067b4 100644 --- a/Lib/idlelib/idle_test/__init__.py +++ b/Lib/idlelib/idle_test/__init__.py @@ -1,6 +1,8 @@ '''idlelib.idle_test is a private implementation of test.test_idle, which tests the IDLE application as part of the stdlib test suite. Run IDLE tests alone with "python -m test.test_idle". +Starting with Python 3.6, IDLE requires tcl/tk 8.5 or later. + This package and its contained modules are subject to change and any direct use is at your own risk. ''' diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py index 58e62cb..6f676ae 100644 --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -59,19 +59,20 @@ msg: master window hints about testing the widget. Modules and classes not being tested at the moment: -PyShell.PyShellEditorWindow -Debugger.Debugger -AutoCompleteWindow.AutoCompleteWindow -OutputWindow.OutputWindow (indirectly being tested with grep test) +pyshell.PyShellEditorWindow +debugger.Debugger +autocomplete_w.AutoCompleteWindow +outwin.OutputWindow (indirectly being tested with grep test) ''' from importlib import import_module -from idlelib.macosxSupport import _initializeTkVariantTests import tkinter as tk +from tkinter.ttk import Scrollbar +tk.NoDefaultRoot() AboutDialog_spec = { - 'file': 'aboutDialog', - 'kwds': {'title': 'aboutDialog test', + 'file': 'help_about', + 'kwds': {'title': 'help_about test', '_htest': True, }, 'msg': "Test every button. Ensure Python, TK and IDLE versions " @@ -79,14 +80,14 @@ AboutDialog_spec = { } _calltip_window_spec = { - 'file': 'CallTipWindow', + 'file': 'calltip_w', 'kwds': {}, 'msg': "Typing '(' should display a calltip.\n" "Typing ') should hide the calltip.\n" } _class_browser_spec = { - 'file': 'ClassBrowser', + 'file': 'browser', 'kwds': {}, 'msg': "Inspect names of module, class(with superclass if " "applicable), methods and functions.\nToggle nested items.\n" @@ -95,7 +96,7 @@ _class_browser_spec = { } _color_delegator_spec = { - 'file': 'ColorDelegator', + 'file': 'colorizer', 'kwds': {}, 'msg': "The text is sample Python code.\n" "Ensure components like comments, keywords, builtins,\n" @@ -104,7 +105,7 @@ _color_delegator_spec = { } ConfigDialog_spec = { - 'file': 'configDialog', + 'file': 'configdialog', 'kwds': {'title': 'ConfigDialogTest', '_htest': True,}, 'msg': "IDLE preferences dialog.\n" @@ -121,7 +122,7 @@ ConfigDialog_spec = { # TODO Improve message _dyn_option_menu_spec = { - 'file': 'dynOptionMenuWidget', + 'file': 'dynoption', 'kwds': {}, 'msg': "Select one of the many options in the 'old option set'.\n" "Click the button to change the option set.\n" @@ -130,39 +131,15 @@ _dyn_option_menu_spec = { # TODO edit wrapper _editor_window_spec = { - 'file': 'EditorWindow', + 'file': 'editor', 'kwds': {}, 'msg': "Test editor functions of interest.\n" "Best to close editor first." } -GetCfgSectionNameDialog_spec = { - 'file': 'configSectionNameDialog', - 'kwds': {'title':'Get Name', - 'message':'Enter something', - 'used_names': {'abc'}, - '_htest': True}, - 'msg': "After the text entered with [Ok] is stripped, , " - "'abc', or more that 30 chars are errors.\n" - "Close 'Get Name' with a valid entry (printed to Shell), " - "[Cancel], or [X]", - } - -GetHelpSourceDialog_spec = { - 'file': 'configHelpSourceEdit', - 'kwds': {'title': 'Get helpsource', - '_htest': True}, - 'msg': "Enter menu item name and help file path\n " - " and more than 30 chars are invalid menu item names.\n" - ", file does not exist are invalid path items.\n" - "Test for incomplete web address for help file path.\n" - "A valid entry will be printed to shell with [0k].\n" - "[Cancel] will print None to shell", - } - # Update once issue21519 is resolved. GetKeysDialog_spec = { - 'file': 'keybindingDialog', + 'file': 'config_key', 'kwds': {'title': 'Test keybindings', 'action': 'find-again', 'currentKeySequences': [''] , @@ -177,7 +154,7 @@ GetKeysDialog_spec = { } _grep_dialog_spec = { - 'file': 'GrepDialog', + 'file': 'grep', 'kwds': {}, 'msg': "Click the 'Show GrepDialog' button.\n" "Test the various 'Find-in-files' functions.\n" @@ -186,8 +163,24 @@ _grep_dialog_spec = { "should open that file \nin a new EditorWindow." } +HelpSource_spec = { + 'file': 'query', + 'kwds': {'title': 'Help name and source', + 'menuitem': 'test', + 'filepath': __file__, + 'used_names': {'abc'}, + '_htest': True}, + 'msg': "Enter menu item name and help file path\n" + "'', > than 30 chars, and 'abc' are invalid menu item names.\n" + "'' and file does not exist are invalid path items.\n" + "Any url ('www...', 'http...') is accepted.\n" + "Test Browse with and without path, as cannot unittest.\n" + "[Ok] or prints valid entry to shell\n" + "[Cancel] or prints None to shell" + } + _io_binding_spec = { - 'file': 'IOBinding', + 'file': 'iomenu', 'kwds': {}, 'msg': "Test the following bindings.\n" " to open file from dialog.\n" @@ -200,7 +193,7 @@ _io_binding_spec = { } _multi_call_spec = { - 'file': 'MultiCall', + 'file': 'multicall', 'kwds': {}, 'msg': "The following actions should trigger a print to console or IDLE" " Shell.\nEntering and leaving the text area, key entry, " @@ -210,14 +203,14 @@ _multi_call_spec = { } _multistatus_bar_spec = { - 'file': 'MultiStatusBar', + 'file': 'statusbar', 'kwds': {}, 'msg': "Ensure presence of multi-status bar below text area.\n" "Click 'Update Status' to change the multi-status text" } _object_browser_spec = { - 'file': 'ObjectBrowser', + 'file': 'debugobj', 'kwds': {}, 'msg': "Double click on items upto the lowest level.\n" "Attributes of the objects and related information " @@ -225,7 +218,7 @@ _object_browser_spec = { } _path_browser_spec = { - 'file': 'PathBrowser', + 'file': 'pathbrowser', 'kwds': {}, 'msg': "Test for correct display of all paths in sys.path.\n" "Toggle nested items upto the lowest level.\n" @@ -234,7 +227,7 @@ _path_browser_spec = { } _percolator_spec = { - 'file': 'Percolator', + 'file': 'percolator', 'kwds': {}, 'msg': "There are two tracers which can be toggled using a checkbox.\n" "Toggling a tracer 'on' by checking it should print tracer" @@ -244,8 +237,20 @@ _percolator_spec = { "Test for actions like text entry, and removal." } +Query_spec = { + 'file': 'query', + 'kwds': {'title': 'Query', + 'message': 'Enter something', + 'text0': 'Go', + '_htest': True}, + 'msg': "Enter with or [Ok]. Print valid entry to Shell\n" + "Blank line, after stripping, is ignored\n" + "Close dialog with valid entry, , [Cancel], [X]" + } + + _replace_dialog_spec = { - 'file': 'ReplaceDialog', + 'file': 'replace', 'kwds': {}, 'msg': "Click the 'Replace' button.\n" "Test various replace options in the 'Replace dialog'.\n" @@ -253,15 +258,22 @@ _replace_dialog_spec = { } _search_dialog_spec = { - 'file': 'SearchDialog', + 'file': 'search', 'kwds': {}, 'msg': "Click the 'Search' button.\n" "Test various search options in the 'Search dialog'.\n" "Click [Close] or [X] to close the 'Search Dialog'." } +_searchbase_spec = { + 'file': 'searchbase', + 'kwds': {}, + 'msg': "Check the appearance of the base search dialog\n" + "Its only action is to close." + } + _scrolled_list_spec = { - 'file': 'ScrolledList', + 'file': 'scrolledlist', 'kwds': {}, 'msg': "You should see a scrollable list of items\n" "Selecting (clicking) or double clicking an item " @@ -277,7 +289,7 @@ show_idlehelp_spec = { } _stack_viewer_spec = { - 'file': 'StackViewer', + 'file': 'stackviewer', 'kwds': {}, 'msg': "A stacktrace for a NameError exception.\n" "Expand 'idlelib ...' and ''.\n" @@ -295,8 +307,8 @@ _tabbed_pages_spec = { } TextViewer_spec = { - 'file': 'textView', - 'kwds': {'title': 'Test textView', + 'file': 'textview', + 'kwds': {'title': 'Test textview', 'text':'The quick brown fox jumps over the lazy dog.\n'*35, '_htest': True}, 'msg': "Test for read-only property of text.\n" @@ -304,21 +316,21 @@ TextViewer_spec = { } _tooltip_spec = { - 'file': 'ToolTip', + 'file': 'tooltip', 'kwds': {}, 'msg': "Place mouse cursor over both the buttons\n" "A tooltip should appear with some text." } _tree_widget_spec = { - 'file': 'TreeWidget', + 'file': 'tree', 'kwds': {}, 'msg': "The canvas is scrollable.\n" "Click on folders upto to the lowest level." } _undo_delegator_spec = { - 'file': 'UndoDelegator', + 'file': 'undo', 'kwds': {}, 'msg': "Click [Undo] to undo any action.\n" "Click [Redo] to redo any action.\n" @@ -327,7 +339,7 @@ _undo_delegator_spec = { } _widget_redirector_spec = { - 'file': 'WidgetRedirector', + 'file': 'redirector', 'kwds': {}, 'msg': "Every text insert should be printed to the console." "or the IDLE shell." @@ -337,14 +349,13 @@ def run(*tests): root = tk.Tk() root.title('IDLE htest') root.resizable(0, 0) - _initializeTkVariantTests(root) # a scrollable Label like constant width text widget. frameLabel = tk.Frame(root, padx=10) frameLabel.pack() text = tk.Text(frameLabel, wrap='word') text.configure(bg=root.cget('bg'), relief='flat', height=4, width=70) - scrollbar = tk.Scrollbar(frameLabel, command=text.yview) + scrollbar = Scrollbar(frameLabel, command=text.yview) text.config(yscrollcommand=scrollbar.set) scrollbar.pack(side='right', fill='y', expand=False) text.pack(side='left', fill='both', expand=True) @@ -365,11 +376,11 @@ def run(*tests): test = getattr(mod, test_name) test_list.append((test_spec, test)) - test_name = tk.StringVar('') + test_name = tk.StringVar(root) callable_object = None test_kwds = None - def next(): + def next_test(): nonlocal test_name, callable_object, test_kwds if len(test_list) == 1: @@ -384,20 +395,26 @@ def run(*tests): text.insert("1.0",test_spec['msg']) text.configure(state='disabled') # preserve read-only property - def run_test(): + def run_test(_=None): widget = callable_object(**test_kwds) try: print(widget.result) except AttributeError: pass - button = tk.Button(root, textvariable=test_name, command=run_test) + def close(_=None): + root.destroy() + + button = tk.Button(root, textvariable=test_name, + default='active', command=run_test) + next_button = tk.Button(root, text="Next", command=next_test) button.pack() - next_button = tk.Button(root, text="Next", command=next) next_button.pack() + next_button.focus_set() + root.bind('', run_test) + root.bind('', close) - next() - + next_test() root.mainloop() if __name__ == '__main__': diff --git a/Lib/idlelib/idle_test/mock_idle.py b/Lib/idlelib/idle_test/mock_idle.py index 1672a34..c7b49ef 100644 --- a/Lib/idlelib/idle_test/mock_idle.py +++ b/Lib/idlelib/idle_test/mock_idle.py @@ -33,7 +33,7 @@ class Func: class Editor: - '''Minimally imitate EditorWindow.EditorWindow class. + '''Minimally imitate editor.EditorWindow class. ''' def __init__(self, flist=None, filename=None, key=None, root=None): self.text = Text() @@ -46,7 +46,7 @@ class Editor: class UndoDelegator: - '''Minimally imitate UndoDelegator,UndoDelegator class. + '''Minimally imitate undo.UndoDelegator class. ''' # A real undo block is only needed for user interaction. def undo_block_start(*args): diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py index 5fc899d..f3f2dea 100644 --- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -1,9 +1,13 @@ +''' Test autocomplete and autocomple_w + +Coverage of autocomple: 56% +''' import unittest from test.support import requires from tkinter import Tk, Text -import idlelib.AutoComplete as ac -import idlelib.AutoCompleteWindow as acw +import idlelib.autocomplete as ac +import idlelib.autocomplete_w as acw from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_tk import Event @@ -91,6 +95,11 @@ class AutoCompleteTest(unittest.TestCase): self.assertIsNone(autocomplete.autocomplete_event(ev)) del ev.mc_state + # Test that tab after whitespace is ignored. + self.text.insert('1.0', ' """Docstring.\n ') + self.assertIsNone(autocomplete.autocomplete_event(ev)) + self.text.delete('1.0', 'end') + # If autocomplete window is open, complete() method is called self.text.insert('1.0', 're.') # This must call autocomplete._make_autocomplete_window() diff --git a/Lib/idlelib/idle_test/test_autoexpand.py b/Lib/idlelib/idle_test/test_autoexpand.py index d2a3156..ae8186c 100644 --- a/Lib/idlelib/idle_test/test_autoexpand.py +++ b/Lib/idlelib/idle_test/test_autoexpand.py @@ -1,9 +1,9 @@ -"""Unit tests for idlelib.AutoExpand""" +"""Unit tests for idlelib.autoexpand""" import unittest from test.support import requires from tkinter import Text, Tk #from idlelib.idle_test.mock_tk import Text -from idlelib.AutoExpand import AutoExpand +from idlelib.autoexpand import AutoExpand class Dummy_Editwin: @@ -22,6 +22,7 @@ class AutoExpandTest(unittest.TestCase): else: cls.text = Text() cls.auto_expand = AutoExpand(Dummy_Editwin(cls.text)) + cls.auto_expand.bell = lambda: None @classmethod def tearDownClass(cls): @@ -137,5 +138,6 @@ class AutoExpandTest(unittest.TestCase): new_state = self.auto_expand.state self.assertNotEqual(initial_state, new_state) + if __name__ == '__main__': unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py index b2a733c..0b11602 100644 --- a/Lib/idlelib/idle_test/test_calltips.py +++ b/Lib/idlelib/idle_test/test_calltips.py @@ -1,5 +1,5 @@ import unittest -import idlelib.CallTips as ct +import idlelib.calltips as ct import textwrap import types diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py new file mode 100644 index 0000000..238bc3e --- /dev/null +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -0,0 +1,56 @@ +'''Test idlelib/colorizer.py + +Perform minimal sanity checks that module imports and some things run. + +Coverage 22%. +''' +from idlelib import colorizer # always test import +from test.support import requires +from tkinter import Tk, Text +import unittest + + +class FunctionTest(unittest.TestCase): + + def test_any(self): + self.assertTrue(colorizer.any('test', ('a', 'b'))) + + def test_make_pat(self): + self.assertTrue(colorizer.make_pat()) + + +class ColorConfigTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.text = Text(cls.root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.destroy() + del cls.root + + def test_colorizer(self): + colorizer.color_config(self.text) + +class ColorDelegatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_colorizer(self): + colorizer.ColorDelegator() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py new file mode 100644 index 0000000..a3fa1a3 --- /dev/null +++ b/Lib/idlelib/idle_test/test_config.py @@ -0,0 +1,160 @@ +'''Test idlelib.config. + +Much is tested by opening config dialog live or in test_configdialog. +Coverage: 27% +''' +from sys import modules +from test.support import captured_stderr +from tkinter import Tk +import unittest +from idlelib import config + +# Tests should not depend on fortuitous user configurations. +# They must not affect actual user .cfg files. +# Replace user parsers with empty parsers that cannot be saved. + +idleConf = config.idleConf +usercfg = idleConf.userCfg +testcfg = {} +usermain = testcfg['main'] = config.IdleUserConfParser('') # filename +userhigh = testcfg['highlight'] = config.IdleUserConfParser('') +userkeys = testcfg['keys'] = config.IdleUserConfParser('') + +def setUpModule(): + idleConf.userCfg = testcfg + +def tearDownModule(): + idleConf.userCfg = usercfg + + +class CurrentColorKeysTest(unittest.TestCase): + """ Test colorkeys function with user config [Theme] and [Keys] patterns. + + colorkeys = config.IdleConf.current_colors_and_keys + Test all patterns written by IDLE and some errors + Item 'default' should really be 'builtin' (versus 'custom). + """ + colorkeys = idleConf.current_colors_and_keys + default_theme = 'IDLE Classic' + default_keys = idleConf.default_keys() + + def test_old_builtin_theme(self): + # On initial installation, user main is blank. + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # For old default, name2 must be blank. + usermain.read_string(''' + [Theme] + default = True + ''') + # IDLE omits 'name' for default old builtin theme. + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # IDLE adds 'name' for non-default old builtin theme. + usermain['Theme']['name'] = 'IDLE New' + self.assertEqual(self.colorkeys('Theme'), 'IDLE New') + # Erroneous non-default old builtin reverts to default. + usermain['Theme']['name'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + usermain.remove_section('Theme') + + def test_new_builtin_theme(self): + # IDLE writes name2 for new builtins. + usermain.read_string(''' + [Theme] + default = True + name2 = IDLE Dark + ''') + self.assertEqual(self.colorkeys('Theme'), 'IDLE Dark') + # Leftover 'name', not removed, is ignored. + usermain['Theme']['name'] = 'IDLE New' + self.assertEqual(self.colorkeys('Theme'), 'IDLE Dark') + # Erroneous non-default new builtin reverts to default. + usermain['Theme']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + usermain.remove_section('Theme') + + def test_user_override_theme(self): + # Erroneous custom name (no definition) reverts to default. + usermain.read_string(''' + [Theme] + default = False + name = Custom Dark + ''') + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # Custom name is valid with matching Section name. + userhigh.read_string('[Custom Dark]\na=b') + self.assertEqual(self.colorkeys('Theme'), 'Custom Dark') + # Name2 is ignored. + usermain['Theme']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), 'Custom Dark') + usermain.remove_section('Theme') + userhigh.remove_section('Custom Dark') + + def test_old_builtin_keys(self): + # On initial installation, user main is blank. + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + # For old default, name2 must be blank, name is always used. + usermain.read_string(''' + [Keys] + default = True + name = IDLE Classic Unix + ''') + self.assertEqual(self.colorkeys('Keys'), 'IDLE Classic Unix') + # Erroneous non-default old builtin reverts to default. + usermain['Keys']['name'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + usermain.remove_section('Keys') + + def test_new_builtin_keys(self): + # IDLE writes name2 for new builtins. + usermain.read_string(''' + [Keys] + default = True + name2 = IDLE Modern Unix + ''') + self.assertEqual(self.colorkeys('Keys'), 'IDLE Modern Unix') + # Leftover 'name', not removed, is ignored. + usermain['Keys']['name'] = 'IDLE Classic Unix' + self.assertEqual(self.colorkeys('Keys'), 'IDLE Modern Unix') + # Erroneous non-default new builtin reverts to default. + usermain['Keys']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + usermain.remove_section('Keys') + + def test_user_override_keys(self): + # Erroneous custom name (no definition) reverts to default. + usermain.read_string(''' + [Keys] + default = False + name = Custom Keys + ''') + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + # Custom name is valid with matching Section name. + userkeys.read_string('[Custom Keys]\na=b') + self.assertEqual(self.colorkeys('Keys'), 'Custom Keys') + # Name2 is ignored. + usermain['Keys']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), 'Custom Keys') + usermain.remove_section('Keys') + userkeys.remove_section('Custom Keys') + + +class WarningTest(unittest.TestCase): + + def test_warn(self): + Equal = self.assertEqual + config._warned = set() + with captured_stderr() as stderr: + config._warn('warning', 'key') + Equal(config._warned, {('warning','key')}) + Equal(stderr.getvalue(), 'warning'+'\n') + with captured_stderr() as stderr: + config._warn('warning', 'key') + Equal(stderr.getvalue(), '') + with captured_stderr() as stderr: + config._warn('warn2', 'yek') + Equal(config._warned, {('warning','key'), ('warn2','yek')}) + Equal(stderr.getvalue(), 'warn2'+'\n') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_config_help.py b/Lib/idlelib/idle_test/test_config_help.py deleted file mode 100644 index 664f8ed..0000000 --- a/Lib/idlelib/idle_test/test_config_help.py +++ /dev/null @@ -1,106 +0,0 @@ -"""Unittests for idlelib.configHelpSourceEdit""" -import unittest -from idlelib.idle_test.mock_tk import Var, Mbox, Entry -from idlelib import configHelpSourceEdit as help_dialog_module - -help_dialog = help_dialog_module.GetHelpSourceDialog - - -class Dummy_help_dialog: - # Mock for testing the following methods of help_dialog - menu_ok = help_dialog.menu_ok - path_ok = help_dialog.path_ok - ok = help_dialog.ok - cancel = help_dialog.cancel - # Attributes, constant or variable, needed for tests - menu = Var() - entryMenu = Entry() - path = Var() - entryPath = Entry() - result = None - destroyed = False - - def destroy(self): - self.destroyed = True - - -# menu_ok and path_ok call Mbox.showerror if menu and path are not ok. -orig_mbox = help_dialog_module.tkMessageBox -showerror = Mbox.showerror - - -class ConfigHelpTest(unittest.TestCase): - dialog = Dummy_help_dialog() - - @classmethod - def setUpClass(cls): - help_dialog_module.tkMessageBox = Mbox - - @classmethod - def tearDownClass(cls): - help_dialog_module.tkMessageBox = orig_mbox - - def test_blank_menu(self): - self.dialog.menu.set('') - self.assertFalse(self.dialog.menu_ok()) - self.assertEqual(showerror.title, 'Menu Item Error') - self.assertIn('No', showerror.message) - - def test_long_menu(self): - self.dialog.menu.set('hello' * 10) - self.assertFalse(self.dialog.menu_ok()) - self.assertEqual(showerror.title, 'Menu Item Error') - self.assertIn('long', showerror.message) - - def test_good_menu(self): - self.dialog.menu.set('help') - showerror.title = 'No Error' # should not be called - self.assertTrue(self.dialog.menu_ok()) - self.assertEqual(showerror.title, 'No Error') - - def test_blank_path(self): - self.dialog.path.set('') - self.assertFalse(self.dialog.path_ok()) - self.assertEqual(showerror.title, 'File Path Error') - self.assertIn('No', showerror.message) - - def test_invalid_file_path(self): - self.dialog.path.set('foobar' * 100) - self.assertFalse(self.dialog.path_ok()) - self.assertEqual(showerror.title, 'File Path Error') - self.assertIn('not exist', showerror.message) - - def test_invalid_url_path(self): - self.dialog.path.set('ww.foobar.com') - self.assertFalse(self.dialog.path_ok()) - self.assertEqual(showerror.title, 'File Path Error') - self.assertIn('not exist', showerror.message) - - self.dialog.path.set('htt.foobar.com') - self.assertFalse(self.dialog.path_ok()) - self.assertEqual(showerror.title, 'File Path Error') - self.assertIn('not exist', showerror.message) - - def test_good_path(self): - self.dialog.path.set('https://docs.python.org') - showerror.title = 'No Error' # should not be called - self.assertTrue(self.dialog.path_ok()) - self.assertEqual(showerror.title, 'No Error') - - def test_ok(self): - self.dialog.destroyed = False - self.dialog.menu.set('help') - self.dialog.path.set('https://docs.python.org') - self.dialog.ok() - self.assertEqual(self.dialog.result, ('help', - 'https://docs.python.org')) - self.assertTrue(self.dialog.destroyed) - - def test_cancel(self): - self.dialog.destroyed = False - self.dialog.cancel() - self.assertEqual(self.dialog.result, None) - self.assertTrue(self.dialog.destroyed) - -if __name__ == '__main__': - unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py new file mode 100644 index 0000000..ee3f2c8 --- /dev/null +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -0,0 +1,33 @@ +''' Test idlelib.config_key. + +Coverage: 56% from creating and closing dialog. +''' +from idlelib import config_key +from test.support import requires +requires('gui') +import unittest +from tkinter import Tk, Text + + +class GetKeysTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update() # Stop "can't run event command" warning. + cls.root.destroy() + del cls.root + + + def test_init(self): + dia = config_key.GetKeysDialog( + self.root, 'test', '<>', [''], _utest=True) + dia.Cancel() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_config_name.py b/Lib/idlelib/idle_test/test_config_name.py deleted file mode 100644 index 40e72b9..0000000 --- a/Lib/idlelib/idle_test/test_config_name.py +++ /dev/null @@ -1,75 +0,0 @@ -"""Unit tests for idlelib.configSectionNameDialog""" -import unittest -from idlelib.idle_test.mock_tk import Var, Mbox -from idlelib import configSectionNameDialog as name_dialog_module - -name_dialog = name_dialog_module.GetCfgSectionNameDialog - -class Dummy_name_dialog: - # Mock for testing the following methods of name_dialog - name_ok = name_dialog.name_ok - Ok = name_dialog.Ok - Cancel = name_dialog.Cancel - # Attributes, constant or variable, needed for tests - used_names = ['used'] - name = Var() - result = None - destroyed = False - def destroy(self): - self.destroyed = True - -# name_ok calls Mbox.showerror if name is not ok -orig_mbox = name_dialog_module.tkMessageBox -showerror = Mbox.showerror - -class ConfigNameTest(unittest.TestCase): - dialog = Dummy_name_dialog() - - @classmethod - def setUpClass(cls): - name_dialog_module.tkMessageBox = Mbox - - @classmethod - def tearDownClass(cls): - name_dialog_module.tkMessageBox = orig_mbox - - def test_blank_name(self): - self.dialog.name.set(' ') - self.assertEqual(self.dialog.name_ok(), '') - self.assertEqual(showerror.title, 'Name Error') - self.assertIn('No', showerror.message) - - def test_used_name(self): - self.dialog.name.set('used') - self.assertEqual(self.dialog.name_ok(), '') - self.assertEqual(showerror.title, 'Name Error') - self.assertIn('use', showerror.message) - - def test_long_name(self): - self.dialog.name.set('good'*8) - self.assertEqual(self.dialog.name_ok(), '') - self.assertEqual(showerror.title, 'Name Error') - self.assertIn('too long', showerror.message) - - def test_good_name(self): - self.dialog.name.set(' good ') - showerror.title = 'No Error' # should not be called - self.assertEqual(self.dialog.name_ok(), 'good') - self.assertEqual(showerror.title, 'No Error') - - def test_ok(self): - self.dialog.destroyed = False - self.dialog.name.set('good') - self.dialog.Ok() - self.assertEqual(self.dialog.result, 'good') - self.assertTrue(self.dialog.destroyed) - - def test_cancel(self): - self.dialog.destroyed = False - self.dialog.Cancel() - self.assertEqual(self.dialog.result, '') - self.assertTrue(self.dialog.destroyed) - - -if __name__ == '__main__': - unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py index 5c09790..3f94493 100644 --- a/Lib/idlelib/idle_test/test_configdialog.py +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -1,32 +1,127 @@ -'''Test idlelib.configDialog. +"""Test idlelib.configdialog. -Coverage: 46% just by creating dialog. -The other half is code for working with user customizations. -''' -from idlelib.configDialog import ConfigDialog # always test import +Half the class creates dialog, half works with user customizations. +Coverage: 46% just by creating dialog, 56% with current tests. +""" +from idlelib.configdialog import ConfigDialog, idleConf # test import from test.support import requires requires('gui') from tkinter import Tk import unittest -from idlelib import macosxSupport as macosx +import idlelib.config as config -class ConfigDialogTest(unittest.TestCase): +# Tests should not depend on fortuitous user configurations. +# They must not affect actual user .cfg files. +# Use solution from test_config: empty parsers with no filename. +usercfg = idleConf.userCfg +testcfg = { + 'main': config.IdleUserConfParser(''), + 'highlight': config.IdleUserConfParser(''), + 'keys': config.IdleUserConfParser(''), + 'extensions': config.IdleUserConfParser(''), +} - @classmethod - def setUpClass(cls): - cls.root = Tk() - cls.root.withdraw() - macosx._initializeTkVariantTests(cls.root) +# ConfigDialog.changedItems is a 3-level hierarchical dictionary of +# pending changes that mirrors the multilevel user config dict. +# For testing, record args in a list for comparison with expected. +changes = [] +class TestDialog(ConfigDialog): + def AddChangedItem(self, *args): + changes.append(args) - @classmethod - def tearDownClass(cls): - cls.root.update_idletasks() - cls.root.destroy() - del cls.root +def setUpModule(): + global root, configure + idleConf.userCfg = testcfg + root = Tk() + root.withdraw() + configure = TestDialog(root, 'Test', _utest=True) - def test_dialog(self): - d = ConfigDialog(self.root, 'Test', _utest=True) - d.remove_var_callbacks() + +def tearDownModule(): + global root, configure + idleConf.userCfg = testcfg + configure.remove_var_callbacks() + del configure + root.update_idletasks() + root.destroy() + del root + + +class FontTabTest(unittest.TestCase): + + + def setUp(self): + changes.clear() + + def test_font(self): + # Set values guaranteed not to be defaults. + dfont = idleConf.GetFont(root, 'main', 'EditorWindow') + dsize = str(dfont[1]) + dbold = dfont[2] == 'bold' + configure.fontName.set('Test Font') + expected = [ + ('main', 'EditorWindow', 'font', 'Test Font'), + ('main', 'EditorWindow', 'font-size', dsize), + ('main', 'EditorWindow', 'font-bold', dbold)] + self.assertEqual(changes, expected) + changes.clear() + configure.fontSize.set(20) + expected = [ + ('main', 'EditorWindow', 'font', 'Test Font'), + ('main', 'EditorWindow', 'font-size', '20'), + ('main', 'EditorWindow', 'font-bold', dbold)] + self.assertEqual(changes, expected) + changes.clear() + configure.fontBold.set(not dbold) + expected = [ + ('main', 'EditorWindow', 'font', 'Test Font'), + ('main', 'EditorWindow', 'font-size', '20'), + ('main', 'EditorWindow', 'font-bold', not dbold)] + self.assertEqual(changes, expected) + + #def test_sample(self): pass # TODO + + def test_tabspace(self): + configure.spaceNum.set(6) + self.assertEqual(changes, [('main', 'Indent', 'num-spaces', 6)]) + + +class HighlightTest(unittest.TestCase): + + def setUp(self): + changes.clear() + + #def test_colorchoose(self): pass # TODO + + +class KeysTest(unittest.TestCase): + + def setUp(self): + changes.clear() + + +class GeneralTest(unittest.TestCase): + + def setUp(self): + changes.clear() + + def test_startup(self): + configure.radioStartupEdit.invoke() + self.assertEqual(changes, + [('main', 'General', 'editor-on-startup', 1)]) + + def test_autosave(self): + configure.radioSaveAuto.invoke() + self.assertEqual(changes, [('main', 'General', 'autosave', 1)]) + + def test_editor_size(self): + configure.entryWinHeight.insert(0, '1') + self.assertEqual(changes, [('main', 'EditorWindow', 'height', '140')]) + changes.clear() + configure.entryWinWidth.insert(0, '1') + self.assertEqual(changes, [('main', 'EditorWindow', 'width', '180')]) + + #def test_help_sources(self): pass # TODO if __name__ == '__main__': diff --git a/Lib/idlelib/idle_test/test_debugger.py b/Lib/idlelib/idle_test/test_debugger.py new file mode 100644 index 0000000..bcba9a4 --- /dev/null +++ b/Lib/idlelib/idle_test/test_debugger.py @@ -0,0 +1,29 @@ +''' Test idlelib.debugger. + +Coverage: 19% +''' +from idlelib import debugger +from test.support import requires +requires('gui') +import unittest +from tkinter import Tk + + +class NameSpaceTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_init(self): + debugger.NamespaceViewer(self.root, 'Test') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_delegator.py b/Lib/idlelib/idle_test/test_delegator.py index 1f0baa9..85624fb 100644 --- a/Lib/idlelib/idle_test/test_delegator.py +++ b/Lib/idlelib/idle_test/test_delegator.py @@ -1,5 +1,5 @@ import unittest -from idlelib.Delegator import Delegator +from idlelib.delegator import Delegator class DelegatorTest(unittest.TestCase): diff --git a/Lib/idlelib/idle_test/test_editmenu.py b/Lib/idlelib/idle_test/test_editmenu.py index a258e29..17eb25c 100644 --- a/Lib/idlelib/idle_test/test_editmenu.py +++ b/Lib/idlelib/idle_test/test_editmenu.py @@ -5,8 +5,9 @@ Edit modules have their own test files files from test.support import requires requires('gui') import tkinter as tk +from tkinter import ttk import unittest -from idlelib import PyShell +from idlelib import pyshell class PasteTest(unittest.TestCase): '''Test pasting into widgets that allow pasting. @@ -16,17 +17,18 @@ class PasteTest(unittest.TestCase): @classmethod def setUpClass(cls): cls.root = root = tk.Tk() - root.withdraw() - PyShell.fix_x11_paste(root) + cls.root.withdraw() + pyshell.fix_x11_paste(root) cls.text = tk.Text(root) cls.entry = tk.Entry(root) + cls.tentry = ttk.Entry(root) cls.spin = tk.Spinbox(root) root.clipboard_clear() root.clipboard_append('two') @classmethod def tearDownClass(cls): - del cls.text, cls.entry, cls.spin + del cls.text, cls.entry, cls.tentry cls.root.clipboard_clear() cls.root.update_idletasks() cls.root.destroy() @@ -44,16 +46,16 @@ class PasteTest(unittest.TestCase): def test_paste_entry(self): "Test pasting into an entry with and without a selection." - # On 3.6, generated <> fails without empty select range - # for 'no selection'. Live widget works fine. - entry = self.entry - for end, ans in (0, 'onetwo'), ('end', 'two'): - with self.subTest(entry=entry, end=end, ans=ans): - entry.delete(0, 'end') - entry.insert(0, 'one') - entry.select_range(0, end) # see note - entry.event_generate('<>') - self.assertEqual(entry.get(), ans) + # Generated <> fails for tk entry without empty select + # range for 'no selection'. Live widget works fine. + for entry in self.entry, self.tentry: + for end, ans in (0, 'onetwo'), ('end', 'two'): + with self.subTest(entry=entry, end=end, ans=ans): + entry.delete(0, 'end') + entry.insert(0, 'one') + entry.select_range(0, end) + entry.event_generate('<>') + self.assertEqual(entry.get(), ans) def test_paste_spin(self): "Test pasting into a spinbox with and without a selection." diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py index a31d26d..e9d29d4 100644 --- a/Lib/idlelib/idle_test/test_editor.py +++ b/Lib/idlelib/idle_test/test_editor.py @@ -1,6 +1,6 @@ import unittest from tkinter import Tk, Text -from idlelib.EditorWindow import EditorWindow +from idlelib.editor import EditorWindow from test.support import requires class Editor_func_test(unittest.TestCase): diff --git a/Lib/idlelib/idle_test/test_grep.py b/Lib/idlelib/idle_test/test_grep.py index 0d8ff0d..6b54c13 100644 --- a/Lib/idlelib/idle_test/test_grep.py +++ b/Lib/idlelib/idle_test/test_grep.py @@ -1,5 +1,5 @@ """ !Changing this line will break Test_findfile.test_found! -Non-gui unit tests for idlelib.GrepDialog methods. +Non-gui unit tests for grep.GrepDialog methods. dummy_command calls grep_it calls findfiles. An exception raised in one method will fail callers. Otherwise, tests are mostly independent. @@ -8,7 +8,7 @@ Otherwise, tests are mostly independent. import unittest from test.support import captured_stdout from idlelib.idle_test.mock_tk import Var -from idlelib.GrepDialog import GrepDialog +from idlelib.grep import GrepDialog import re class Dummy_searchengine: @@ -72,7 +72,7 @@ class Grep_itTest(unittest.TestCase): self.assertTrue(lines[4].startswith('(Hint:')) class Default_commandTest(unittest.TestCase): - # To write this, mode OutputWindow import to top of GrepDialog + # To write this, move outwin import to top of GrepDialog # so it can be replaced by captured_stdout in class setup/teardown. pass diff --git a/Lib/idlelib/idle_test/test_help.py b/Lib/idlelib/idle_test/test_help.py new file mode 100644 index 0000000..2c68e23 --- /dev/null +++ b/Lib/idlelib/idle_test/test_help.py @@ -0,0 +1,34 @@ +'''Test idlelib.help. + +Coverage: 87% +''' +from idlelib import help +from test.support import requires +requires('gui') +from os.path import abspath, dirname, join +from tkinter import Tk +import unittest + +class HelpFrameTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + "By itself, this tests that file parsed without exception." + cls.root = root = Tk() + root.withdraw() + helpfile = join(dirname(dirname(abspath(__file__))), 'help.html') + cls.frame = help.HelpFrame(root, helpfile) + + @classmethod + def tearDownClass(cls): + del cls.frame + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_line1(self): + text = self.frame.text + self.assertEqual(text.get('1.0', '1.end'), ' IDLE ') + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py index d0a0127..843efb9 100644 --- a/Lib/idlelib/idle_test/test_help_about.py +++ b/Lib/idlelib/idle_test/test_help_about.py @@ -2,10 +2,10 @@ Coverage: ''' -from idlelib import aboutDialog as help_about -from idlelib import textView as textview +from idlelib import help_about +from idlelib import textview from idlelib.idle_test.mock_idle import Func -from idlelib.idle_test.mock_tk import Mbox +from idlelib.idle_test.mock_tk import Mbox_func import unittest About = help_about.AboutDialog @@ -19,33 +19,33 @@ class Dummy_about_dialog(): class DisplayFileTest(unittest.TestCase): - "Test that .txt files are found and properly decoded." dialog = Dummy_about_dialog() @classmethod def setUpClass(cls): - cls.orig_mbox = textview.tkMessageBox + cls.orig_error = textview.showerror cls.orig_view = textview.view_text - cls.mbox = Mbox() + cls.error = Mbox_func() cls.view = Func() - textview.tkMessageBox = cls.mbox + textview.showerror = cls.error textview.view_text = cls.view cls.About = Dummy_about_dialog() @classmethod def tearDownClass(cls): - textview.tkMessageBox = cls.orig_mbox + textview.showerror = cls.orig_error textview.view_text = cls.orig_view def test_file_isplay(self): for handler in (self.dialog.idle_credits, self.dialog.idle_readme, self.dialog.idle_news): - self.mbox.showerror.message = '' + self.error.message = '' self.view.called = False - handler() - self.assertEqual(self.mbox.showerror.message, '') - self.assertEqual(self.view.called, True) + with self.subTest(handler=handler): + handler() + self.assertEqual(self.error.message, '') + self.assertEqual(self.view.called, True) if __name__ == '__main__': diff --git a/Lib/idlelib/idle_test/test_idlehistory.py b/Lib/idlelib/idle_test/test_history.py similarity index 98% rename from Lib/idlelib/idle_test/test_idlehistory.py rename to Lib/idlelib/idle_test/test_history.py index 6e7c6c3..b278010 100644 --- a/Lib/idlelib/idle_test/test_idlehistory.py +++ b/Lib/idlelib/idle_test/test_history.py @@ -4,8 +4,8 @@ from test.support import requires import tkinter as tk from tkinter import Text as tkText from idlelib.idle_test.mock_tk import Text as mkText -from idlelib.IdleHistory import History -from idlelib.configHandler import idleConf +from idlelib.history import History +from idlelib.config import idleConf line1 = 'a = 7' line2 = 'b = a' diff --git a/Lib/idlelib/idle_test/test_hyperparser.py b/Lib/idlelib/idle_test/test_hyperparser.py index 9ce3f2c..73c8281 100644 --- a/Lib/idlelib/idle_test/test_hyperparser.py +++ b/Lib/idlelib/idle_test/test_hyperparser.py @@ -1,9 +1,9 @@ -"""Unittest for idlelib.HyperParser""" +"""Unittest for idlelib.hyperparser.py.""" import unittest from test.support import requires from tkinter import Tk, Text -from idlelib.EditorWindow import EditorWindow -from idlelib.HyperParser import HyperParser +from idlelib.editor import EditorWindow +from idlelib.hyperparser import HyperParser class DummyEditwin: def __init__(self, text): diff --git a/Lib/idlelib/idle_test/test_io.py b/Lib/idlelib/idle_test/test_iomenu.py similarity index 98% rename from Lib/idlelib/idle_test/test_io.py rename to Lib/idlelib/idle_test/test_iomenu.py index e0e3b98..65bf593 100644 --- a/Lib/idlelib/idle_test/test_io.py +++ b/Lib/idlelib/idle_test/test_iomenu.py @@ -1,6 +1,7 @@ import unittest import io -from idlelib.PyShell import PseudoInputFile, PseudoOutputFile + +from idlelib.run import PseudoInputFile, PseudoOutputFile class S(str): @@ -230,4 +231,4 @@ class PseudeInputFilesTest(unittest.TestCase): if __name__ == '__main__': - unittest.main() + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py new file mode 100644 index 0000000..fae75d8 --- /dev/null +++ b/Lib/idlelib/idle_test/test_macosx.py @@ -0,0 +1,103 @@ +'''Test idlelib.macosx.py. + +Coverage: 71% on Windows. +''' +from idlelib import macosx +from test.support import requires +import sys +import tkinter as tk +import unittest +import unittest.mock as mock +from idlelib.filelist import FileList + +mactypes = {'carbon', 'cocoa', 'xquartz'} +nontypes = {'other'} +alltypes = mactypes | nontypes + + +class InitTktypeTest(unittest.TestCase): + "Test _init_tk_type." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + cls.orig_platform = macosx.platform + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + macosx.platform = cls.orig_platform + + def test_init_sets_tktype(self): + "Test that _init_tk_type sets _tk_type according to platform." + for platform, types in ('darwin', alltypes), ('other', nontypes): + with self.subTest(platform=platform): + macosx.platform = platform + macosx._tk_type == None + macosx._init_tk_type() + self.assertIn(macosx._tk_type, types) + + +class IsTypeTkTest(unittest.TestCase): + "Test each of the four isTypeTk predecates." + isfuncs = ((macosx.isAquaTk, ('carbon', 'cocoa')), + (macosx.isCarbonTk, ('carbon')), + (macosx.isCocoaTk, ('cocoa')), + (macosx.isXQuartz, ('xquartz')), + ) + + @mock.patch('idlelib.macosx._init_tk_type') + def test_is_calls_init(self, mockinit): + "Test that each isTypeTk calls _init_tk_type when _tk_type is None." + macosx._tk_type = None + for func, whentrue in self.isfuncs: + with self.subTest(func=func): + func() + self.assertTrue(mockinit.called) + mockinit.reset_mock() + + def test_isfuncs(self): + "Test that each isTypeTk return correct bool." + for func, whentrue in self.isfuncs: + for tktype in alltypes: + with self.subTest(func=func, whentrue=whentrue, tktype=tktype): + macosx._tk_type = tktype + (self.assertTrue if tktype in whentrue else self.assertFalse)\ + (func()) + + +class SetupTest(unittest.TestCase): + "Test setupApp." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + @mock.patch('idlelib.macosx.overrideRootMenu') #27312 + def test_setupapp(self, overrideRootMenu): + "Call setupApp with each possible graphics type." + root = self.root + flist = FileList(root) + for tktype in alltypes: + with self.subTest(tktype=tktype): + macosx._tk_type = tktype + macosx.setupApp(root, flist) + if tktype in ('carbon', 'cocoa'): + self.assertTrue(overrideRootMenu.called) + overrideRootMenu.reset_mock() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_formatparagraph.py b/Lib/idlelib/idle_test/test_paragraph.py similarity index 98% rename from Lib/idlelib/idle_test/test_formatparagraph.py rename to Lib/idlelib/idle_test/test_paragraph.py index b6eb2f3..ba350c9 100644 --- a/Lib/idlelib/idle_test/test_formatparagraph.py +++ b/Lib/idlelib/idle_test/test_paragraph.py @@ -1,7 +1,7 @@ -# Test the functions and main class method of FormatParagraph.py +# Test the functions and main class method of paragraph.py import unittest -from idlelib import FormatParagraph as fp -from idlelib.EditorWindow import EditorWindow +from idlelib import paragraph as fp +from idlelib.editor import EditorWindow from tkinter import Tk, Text from test.support import requires @@ -38,7 +38,7 @@ class Is_Get_Test(unittest.TestCase): class FindTest(unittest.TestCase): - """Test the find_paragraph function in FormatParagraph. + """Test the find_paragraph function in paragraph module. Using the runcase() function, find_paragraph() is called with 'mark' set at multiple indexes before and inside the test paragraph. diff --git a/Lib/idlelib/idle_test/test_parenmatch.py b/Lib/idlelib/idle_test/test_parenmatch.py index 95cc22c..051f7ea 100644 --- a/Lib/idlelib/idle_test/test_parenmatch.py +++ b/Lib/idlelib/idle_test/test_parenmatch.py @@ -1,4 +1,4 @@ -'''Test idlelib.ParenMatch. +'''Test idlelib.parenmatch. This must currently be a gui test because ParenMatch methods use several text methods not defined on idlelib.idle_test.mock_tk.Text. @@ -9,7 +9,7 @@ requires('gui') import unittest from unittest.mock import Mock from tkinter import Tk, Text -from idlelib.ParenMatch import ParenMatch +from idlelib.parenmatch import ParenMatch class DummyEditwin: def __init__(self, text): @@ -38,12 +38,17 @@ class ParenMatchTest(unittest.TestCase): def tearDown(self): self.text.delete('1.0', 'end') + def get_parenmatch(self): + pm = ParenMatch(self.editwin) + pm.bell = lambda: None + return pm + def test_paren_expression(self): """ Test ParenMatch with 'expression' style. """ text = self.text - pm = ParenMatch(self.editwin) + pm = self.get_parenmatch() pm.set_style('expression') text.insert('insert', 'def foobar(a, b') @@ -66,7 +71,7 @@ class ParenMatchTest(unittest.TestCase): Test ParenMatch with 'default' style. """ text = self.text - pm = ParenMatch(self.editwin) + pm = self.get_parenmatch() pm.set_style('default') text.insert('insert', 'def foobar(a, b') @@ -86,7 +91,7 @@ class ParenMatchTest(unittest.TestCase): These cases force conditional expression and alternate paths. """ text = self.text - pm = ParenMatch(self.editwin) + pm = self.get_parenmatch() text.insert('insert', '# this is a commen)') self.assertIsNone(pm.paren_closed_event('event')) @@ -99,7 +104,7 @@ class ParenMatchTest(unittest.TestCase): self.assertIsNone(pm.paren_closed_event('event')) def test_handle_restore_timer(self): - pm = ParenMatch(self.editwin) + pm = self.get_parenmatch() pm.restore_event = Mock() pm.handle_restore_timer(0) self.assertTrue(pm.restore_event.called) diff --git a/Lib/idlelib/idle_test/test_pathbrowser.py b/Lib/idlelib/idle_test/test_pathbrowser.py index afb886f..813cbcc 100644 --- a/Lib/idlelib/idle_test/test_pathbrowser.py +++ b/Lib/idlelib/idle_test/test_pathbrowser.py @@ -2,13 +2,13 @@ import unittest import os import sys import idlelib -from idlelib import PathBrowser +from idlelib import pathbrowser class PathBrowserTest(unittest.TestCase): def test_DirBrowserTreeItem(self): # Issue16226 - make sure that getting a sublist works - d = PathBrowser.DirBrowserTreeItem('') + d = pathbrowser.DirBrowserTreeItem('') d.GetSubList() self.assertEqual('', d.GetText()) @@ -17,11 +17,11 @@ class PathBrowserTest(unittest.TestCase): self.assertEqual(d.ispackagedir(dir + '/Icons'), False) def test_PathBrowserTreeItem(self): - p = PathBrowser.PathBrowserTreeItem() + p = pathbrowser.PathBrowserTreeItem() self.assertEqual(p.GetText(), 'sys.path') sub = p.GetSubList() self.assertEqual(len(sub), len(sys.path)) - self.assertEqual(type(sub[0]), PathBrowser.DirBrowserTreeItem) + self.assertEqual(type(sub[0]), pathbrowser.DirBrowserTreeItem) if __name__ == '__main__': unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_percolator.py b/Lib/idlelib/idle_test/test_percolator.py index 4c0a7ad..573b9a1 100644 --- a/Lib/idlelib/idle_test/test_percolator.py +++ b/Lib/idlelib/idle_test/test_percolator.py @@ -1,10 +1,10 @@ -'''Test Percolator''' +'''Test percolator.py.''' from test.support import requires requires('gui') import unittest from tkinter import Text, Tk, END -from idlelib.Percolator import Percolator, Delegator +from idlelib.percolator import Percolator, Delegator class MyFilter(Delegator): diff --git a/Lib/idlelib/idle_test/test_query.py b/Lib/idlelib/idle_test/test_query.py new file mode 100644 index 0000000..66af8eb --- /dev/null +++ b/Lib/idlelib/idle_test/test_query.py @@ -0,0 +1,353 @@ +"""Test idlelib.query. + +Non-gui tests for Query, SectionName, ModuleName, and HelpSource use +dummy versions that extract the non-gui methods and add other needed +attributes. GUI tests create an instance of each class and simulate +entries and button clicks. Subclass tests only target the new code in +the subclass definition. + +The appearance of the widgets is checked by the Query and +HelpSource htests. These are run by running query.py. + +Coverage: 94% (100% for Query and SectionName). +6 of 8 missing are ModuleName exceptions I don't know how to trigger. +""" +from test.support import requires +import sys +from tkinter import Tk +import unittest +from unittest import mock +from idlelib.idle_test.mock_tk import Var +from idlelib import query + + +# NON-GUI TESTS + +class QueryTest(unittest.TestCase): + "Test Query base class." + + class Dummy_Query: + # Test the following Query methods. + entry_ok = query.Query.entry_ok + ok = query.Query.ok + cancel = query.Query.cancel + # Add attributes and initialization needed for tests. + entry = Var() + entry_error = {} + def __init__(self, dummy_entry): + self.entry.set(dummy_entry) + self.entry_error['text'] = '' + self.result = None + self.destroyed = False + def showerror(self, message): + self.entry_error['text'] = message + def destroy(self): + self.destroyed = True + + def test_entry_ok_blank(self): + dialog = self.Dummy_Query(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertEqual((dialog.result, dialog.destroyed), (None, False)) + self.assertIn('blank line', dialog.entry_error['text']) + + def test_entry_ok_good(self): + dialog = self.Dummy_Query(' good ') + Equal = self.assertEqual + Equal(dialog.entry_ok(), 'good') + Equal((dialog.result, dialog.destroyed), (None, False)) + Equal(dialog.entry_error['text'], '') + + def test_ok_blank(self): + dialog = self.Dummy_Query('') + dialog.entry.focus_set = mock.Mock() + self.assertEqual(dialog.ok(), None) + self.assertTrue(dialog.entry.focus_set.called) + del dialog.entry.focus_set + self.assertEqual((dialog.result, dialog.destroyed), (None, False)) + + def test_ok_good(self): + dialog = self.Dummy_Query('good') + self.assertEqual(dialog.ok(), None) + self.assertEqual((dialog.result, dialog.destroyed), ('good', True)) + + def test_cancel(self): + dialog = self.Dummy_Query('does not matter') + self.assertEqual(dialog.cancel(), None) + self.assertEqual((dialog.result, dialog.destroyed), (None, True)) + + +class SectionNameTest(unittest.TestCase): + "Test SectionName subclass of Query." + + class Dummy_SectionName: + entry_ok = query.SectionName.entry_ok # Function being tested. + used_names = ['used'] + entry = Var() + entry_error = {} + def __init__(self, dummy_entry): + self.entry.set(dummy_entry) + self.entry_error['text'] = '' + def showerror(self, message): + self.entry_error['text'] = message + + def test_blank_section_name(self): + dialog = self.Dummy_SectionName(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('no name', dialog.entry_error['text']) + + def test_used_section_name(self): + dialog = self.Dummy_SectionName('used') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('use', dialog.entry_error['text']) + + def test_long_section_name(self): + dialog = self.Dummy_SectionName('good'*8) + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('longer than 30', dialog.entry_error['text']) + + def test_good_section_name(self): + dialog = self.Dummy_SectionName(' good ') + self.assertEqual(dialog.entry_ok(), 'good') + self.assertEqual(dialog.entry_error['text'], '') + + +class ModuleNameTest(unittest.TestCase): + "Test ModuleName subclass of Query." + + class Dummy_ModuleName: + entry_ok = query.ModuleName.entry_ok # Function being tested. + text0 = '' + entry = Var() + entry_error = {} + def __init__(self, dummy_entry): + self.entry.set(dummy_entry) + self.entry_error['text'] = '' + def showerror(self, message): + self.entry_error['text'] = message + + def test_blank_module_name(self): + dialog = self.Dummy_ModuleName(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('no name', dialog.entry_error['text']) + + def test_bogus_module_name(self): + dialog = self.Dummy_ModuleName('__name_xyz123_should_not_exist__') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('not found', dialog.entry_error['text']) + + def test_c_source_name(self): + dialog = self.Dummy_ModuleName('itertools') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('source-based', dialog.entry_error['text']) + + def test_good_module_name(self): + dialog = self.Dummy_ModuleName('idlelib') + self.assertTrue(dialog.entry_ok().endswith('__init__.py')) + self.assertEqual(dialog.entry_error['text'], '') + + +# 3 HelpSource test classes each test one function. + +orig_platform = query.platform + +class HelpsourceBrowsefileTest(unittest.TestCase): + "Test browse_file method of ModuleName subclass of Query." + + class Dummy_HelpSource: + browse_file = query.HelpSource.browse_file + pathvar = Var() + + def test_file_replaces_path(self): + dialog = self.Dummy_HelpSource() + # Path is widget entry, either '' or something. + # Func return is file dialog return, either '' or something. + # Func return should override widget entry. + # We need all 4 combination to test all (most) code paths. + for path, func, result in ( + ('', lambda a,b,c:'', ''), + ('', lambda a,b,c: __file__, __file__), + ('htest', lambda a,b,c:'', 'htest'), + ('htest', lambda a,b,c: __file__, __file__)): + with self.subTest(): + dialog.pathvar.set(path) + dialog.askfilename = func + dialog.browse_file() + self.assertEqual(dialog.pathvar.get(), result) + + +class HelpsourcePathokTest(unittest.TestCase): + "Test path_ok method of HelpSource subclass of Query." + + class Dummy_HelpSource: + path_ok = query.HelpSource.path_ok + path = Var() + path_error = {} + def __init__(self, dummy_path): + self.path.set(dummy_path) + self.path_error['text'] = '' + def showerror(self, message, widget=None): + self.path_error['text'] = message + + @classmethod + def tearDownClass(cls): + query.platform = orig_platform + + def test_path_ok_blank(self): + dialog = self.Dummy_HelpSource(' ') + self.assertEqual(dialog.path_ok(), None) + self.assertIn('no help file', dialog.path_error['text']) + + def test_path_ok_bad(self): + dialog = self.Dummy_HelpSource(__file__ + 'bad-bad-bad') + self.assertEqual(dialog.path_ok(), None) + self.assertIn('not exist', dialog.path_error['text']) + + def test_path_ok_web(self): + dialog = self.Dummy_HelpSource('') + Equal = self.assertEqual + for url in 'www.py.org', 'http://py.org': + with self.subTest(): + dialog.path.set(url) + self.assertEqual(dialog.path_ok(), url) + self.assertEqual(dialog.path_error['text'], '') + + def test_path_ok_file(self): + dialog = self.Dummy_HelpSource('') + for platform, prefix in ('darwin', 'file://'), ('other', ''): + with self.subTest(): + query.platform = platform + dialog.path.set(__file__) + self.assertEqual(dialog.path_ok(), prefix + __file__) + self.assertEqual(dialog.path_error['text'], '') + + +class HelpsourceEntryokTest(unittest.TestCase): + "Test entry_ok method of HelpSource subclass of Query." + + class Dummy_HelpSource: + entry_ok = query.HelpSource.entry_ok + entry_error = {} + path_error = {} + def item_ok(self): + return self.name + def path_ok(self): + return self.path + + def test_entry_ok_helpsource(self): + dialog = self.Dummy_HelpSource() + for name, path, result in ((None, None, None), + (None, 'doc.txt', None), + ('doc', None, None), + ('doc', 'doc.txt', ('doc', 'doc.txt'))): + with self.subTest(): + dialog.name, dialog.path = name, path + self.assertEqual(dialog.entry_ok(), result) + + +# GUI TESTS + +class QueryGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = root = Tk() + cls.root.withdraw() + cls.dialog = query.Query(root, 'TEST', 'test', _utest=True) + cls.dialog.destroy = mock.Mock() + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.destroy() + del cls.root + + def setUp(self): + self.dialog.entry.delete(0, 'end') + self.dialog.result = None + self.dialog.destroy.reset_mock() + + def test_click_ok(self): + dialog = self.dialog + dialog.entry.insert(0, 'abc') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, 'abc') + self.assertTrue(dialog.destroy.called) + + def test_click_blank(self): + dialog = self.dialog + dialog.button_ok.invoke() + self.assertEqual(dialog.result, None) + self.assertFalse(dialog.destroy.called) + + def test_click_cancel(self): + dialog = self.dialog + dialog.entry.insert(0, 'abc') + dialog.button_cancel.invoke() + self.assertEqual(dialog.result, None) + self.assertTrue(dialog.destroy.called) + + +class SectionnameGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_section_name(self): + root = Tk() + root.withdraw() + dialog = query.SectionName(root, 'T', 't', {'abc'}, _utest=True) + Equal = self.assertEqual + self.assertEqual(dialog.used_names, {'abc'}) + dialog.entry.insert(0, 'okay') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, 'okay') + del dialog + root.destroy() + del root + + +class ModulenameGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_module_name(self): + root = Tk() + root.withdraw() + dialog = query.ModuleName(root, 'T', 't', 'idlelib', _utest=True) + self.assertEqual(dialog.text0, 'idlelib') + self.assertEqual(dialog.entry.get(), 'idlelib') + dialog.button_ok.invoke() + self.assertTrue(dialog.result.endswith('__init__.py')) + del dialog + root.destroy() + del root + + +class HelpsourceGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_help_source(self): + root = Tk() + root.withdraw() + dialog = query.HelpSource(root, 'T', menuitem='__test__', + filepath=__file__, _utest=True) + Equal = self.assertEqual + Equal(dialog.entry.get(), '__test__') + Equal(dialog.path.get(), __file__) + dialog.button_ok.invoke() + prefix = "file://" if sys.platform == 'darwin' else '' + Equal(dialog.result, ('__test__', prefix + __file__)) + del dialog + root.destroy() + del root + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_widgetredir.py b/Lib/idlelib/idle_test/test_redirector.py similarity index 97% rename from Lib/idlelib/idle_test/test_widgetredir.py rename to Lib/idlelib/idle_test/test_redirector.py index baa975d..b0385fa 100644 --- a/Lib/idlelib/idle_test/test_widgetredir.py +++ b/Lib/idlelib/idle_test/test_redirector.py @@ -1,4 +1,4 @@ -'''Test idlelib.WidgetRedirector. +'''Test idlelib.redirector. 100% coverage ''' @@ -6,7 +6,7 @@ from test.support import requires import unittest from idlelib.idle_test.mock_idle import Func from tkinter import Tk, Text, TclError -from idlelib.WidgetRedirector import WidgetRedirector +from idlelib.redirector import WidgetRedirector class InitCloseTest(unittest.TestCase): @@ -120,6 +120,5 @@ class WidgetRedirectorTest(unittest.TestCase): self.assertEqual(self.root.call(self.text._w, 'insert', 'boo'), '') - if __name__ == '__main__': unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_replacedialog.py b/Lib/idlelib/idle_test/test_replace.py similarity index 96% rename from Lib/idlelib/idle_test/test_replacedialog.py rename to Lib/idlelib/idle_test/test_replace.py index ff44820..9913ed2 100644 --- a/Lib/idlelib/idle_test/test_replacedialog.py +++ b/Lib/idlelib/idle_test/test_replace.py @@ -1,4 +1,4 @@ -"""Unittest for idlelib.ReplaceDialog""" +"""Unittest for idlelib.replace.py""" from test.support import requires requires('gui') @@ -6,8 +6,8 @@ import unittest from unittest.mock import Mock from tkinter import Tk, Text from idlelib.idle_test.mock_tk import Mbox -import idlelib.SearchEngine as se -import idlelib.ReplaceDialog as rd +import idlelib.searchengine as se +from idlelib.replace import ReplaceDialog orig_mbox = se.tkMessageBox showerror = Mbox.showerror @@ -21,7 +21,8 @@ class ReplaceDialogTest(unittest.TestCase): cls.root.withdraw() se.tkMessageBox = Mbox cls.engine = se.SearchEngine(cls.root) - cls.dialog = rd.ReplaceDialog(cls.root, cls.engine) + cls.dialog = ReplaceDialog(cls.root, cls.engine) + cls.dialog.bell = lambda: None cls.dialog.ok = Mock() cls.text = Text(cls.root) cls.text.undo_block_start = Mock() @@ -70,7 +71,6 @@ class ReplaceDialogTest(unittest.TestCase): # text found and replaced pv.set('a') rv.set('asdf') - self.dialog.open(self.text) replace() equal(text.get('1.8', '1.12'), 'asdf') @@ -91,7 +91,7 @@ class ReplaceDialogTest(unittest.TestCase): text.mark_set('insert', 'end') text.insert('insert', '\nline42:') before_text = text.get('1.0', 'end') - pv.set('[a-z][\d]+') + pv.set(r'[a-z][\d]+') replace() after_text = text.get('1.0', 'end') equal(before_text, after_text) @@ -192,7 +192,7 @@ class ReplaceDialogTest(unittest.TestCase): self.engine.revar.set(True) before_text = text.get('1.0', 'end') - pv.set('[a-z][\d]+') + pv.set(r'[a-z][\d]+') rv.set('hello') replace() after_text = text.get('1.0', 'end') @@ -207,7 +207,7 @@ class ReplaceDialogTest(unittest.TestCase): self.assertIn('error', showerror.title) self.assertIn('Empty', showerror.message) - pv.set('[\d') + pv.set(r'[\d') replace() self.assertIn('error', showerror.title) self.assertIn('Pattern', showerror.message) diff --git a/Lib/idlelib/idle_test/test_rstrip.py b/Lib/idlelib/idle_test/test_rstrip.py index 1c90b93..130e6be 100644 --- a/Lib/idlelib/idle_test/test_rstrip.py +++ b/Lib/idlelib/idle_test/test_rstrip.py @@ -1,5 +1,5 @@ import unittest -import idlelib.RstripExtension as rs +import idlelib.rstrip as rs from idlelib.idle_test.mock_idle import Editor class rstripTest(unittest.TestCase): @@ -21,7 +21,7 @@ class rstripTest(unittest.TestCase): def test_rstrip_multiple(self): editor = Editor() # Uncomment following to verify that test passes with real widgets. -## from idlelib.EditorWindow import EditorWindow as Editor +## from idlelib.editor import EditorWindow as Editor ## from tkinter import Tk ## editor = Editor(root=Tk()) text = editor.text diff --git a/Lib/idlelib/idle_test/test_scrolledlist.py b/Lib/idlelib/idle_test/test_scrolledlist.py new file mode 100644 index 0000000..56aabfe --- /dev/null +++ b/Lib/idlelib/idle_test/test_scrolledlist.py @@ -0,0 +1,29 @@ +''' Test idlelib.scrolledlist. + +Coverage: 39% +''' +from idlelib import scrolledlist +from test.support import requires +requires('gui') +import unittest +from tkinter import Tk + + +class ScrolledListTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + + def test_init(self): + scrolledlist.ScrolledList(self.root) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_searchdialog.py b/Lib/idlelib/idle_test/test_search.py similarity index 92% rename from Lib/idlelib/idle_test/test_searchdialog.py rename to Lib/idlelib/idle_test/test_search.py index 190c866..80fa93a 100644 --- a/Lib/idlelib/idle_test/test_searchdialog.py +++ b/Lib/idlelib/idle_test/test_search.py @@ -1,4 +1,4 @@ -"""Test SearchDialog class in SearchDialogue.py""" +"""Test SearchDialog class in idlelib.search.py""" # Does not currently test the event handler wrappers. # A usage test should simulate clicks and check hilighting. @@ -11,8 +11,8 @@ requires('gui') import unittest import tkinter as tk from tkinter import BooleanVar -import idlelib.SearchEngine as se -import idlelib.SearchDialog as sd +import idlelib.searchengine as se +import idlelib.search as sd class SearchDialogTest(unittest.TestCase): @@ -29,6 +29,7 @@ class SearchDialogTest(unittest.TestCase): def setUp(self): self.engine = se.SearchEngine(self.root) self.dialog = sd.SearchDialog(self.root, self.engine) + self.dialog.bell = lambda: None self.text = tk.Text(self.root) self.text.insert('1.0', 'Hello World!') @@ -38,6 +39,7 @@ class SearchDialogTest(unittest.TestCase): self.engine.setpat('') self.assertFalse(self.dialog.find_again(text)) + self.dialog.bell = lambda: None self.engine.setpat('Hello') self.assertTrue(self.dialog.find_again(text)) diff --git a/Lib/idlelib/idle_test/test_searchdialogbase.py b/Lib/idlelib/idle_test/test_searchbase.py similarity index 88% rename from Lib/idlelib/idle_test/test_searchdialogbase.py rename to Lib/idlelib/idle_test/test_searchbase.py index 8036b91..d769fa2 100644 --- a/Lib/idlelib/idle_test/test_searchdialogbase.py +++ b/Lib/idlelib/idle_test/test_searchbase.py @@ -1,14 +1,13 @@ -'''Unittests for idlelib/SearchDialogBase.py +'''tests idlelib.searchbase. Coverage: 99%. The only thing not covered is inconsequential -- testing skipping of suite when self.needwrapbutton is false. - ''' import unittest from test.support import requires from tkinter import Tk, Toplevel, Frame ##, BooleanVar, StringVar -from idlelib import SearchEngine as se -from idlelib import SearchDialogBase as sdb +from idlelib import searchengine as se +from idlelib import searchbase as sdb from idlelib.idle_test.mock_idle import Func ## from idlelib.idle_test.mock_tk import Var @@ -74,7 +73,7 @@ class SearchDialogBaseTest(unittest.TestCase): def test_make_entry(self): equal = self.assertEqual self.dialog.row = 0 - self.dialog.top = Toplevel(self.root) + self.dialog.top = self.root entry, label = self.dialog.make_entry("Test:", 'hello') equal(label['text'], 'Test:') @@ -87,6 +86,7 @@ class SearchDialogBaseTest(unittest.TestCase): equal(self.dialog.row, 1) def test_create_entries(self): + self.dialog.top = self.root self.dialog.row = 0 self.engine.setpat('hello') self.dialog.create_entries() @@ -94,7 +94,7 @@ class SearchDialogBaseTest(unittest.TestCase): def test_make_frame(self): self.dialog.row = 0 - self.dialog.top = Toplevel(self.root) + self.dialog.top = self.root frame, label = self.dialog.make_frame() self.assertEqual(label, '') self.assertIsInstance(frame, Frame) @@ -104,7 +104,7 @@ class SearchDialogBaseTest(unittest.TestCase): self.assertIsInstance(frame, Frame) def btn_test_setup(self, meth): - self.dialog.top = Toplevel(self.root) + self.dialog.top = self.root self.dialog.row = 0 return meth() @@ -119,11 +119,6 @@ class SearchDialogBaseTest(unittest.TestCase): var, label = spec self.assertEqual(button['text'], label) self.assertEqual(var.get(), state) - if state == 1: - button.deselect() - else: - button.select() - self.assertEqual(var.get(), 1 - state) def test_create_other_buttons(self): for state in (False, True): @@ -139,18 +134,15 @@ class SearchDialogBaseTest(unittest.TestCase): # hit other button, then this one # indexes depend on button order self.assertEqual(var.get(), state) - buttons[val].select() - self.assertEqual(var.get(), 1 - state) - buttons[1-val].select() - self.assertEqual(var.get(), state) def test_make_button(self): - self.dialog.top = Toplevel(self.root) + self.dialog.top = self.root self.dialog.buttonframe = Frame(self.dialog.top) btn = self.dialog.make_button('Test', self.dialog.close) self.assertEqual(btn['text'], 'Test') def test_create_command_buttons(self): + self.dialog.top = self.root self.dialog.create_command_buttons() # Look for close button command in buttonframe closebuttoncommand = '' @@ -160,6 +152,5 @@ class SearchDialogBaseTest(unittest.TestCase): self.assertIn('close', closebuttoncommand) - if __name__ == '__main__': unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_searchengine.py b/Lib/idlelib/idle_test/test_searchengine.py index edbd558..b3aa8eb 100644 --- a/Lib/idlelib/idle_test/test_searchengine.py +++ b/Lib/idlelib/idle_test/test_searchengine.py @@ -1,4 +1,4 @@ -'''Test functions and SearchEngine class in SearchEngine.py.''' +'''Test functions and SearchEngine class in idlelib.searchengine.py.''' # With mock replacements, the module does not use any gui widgets. # The use of tk.Text is avoided (for now, until mock Text is improved) @@ -10,7 +10,7 @@ import unittest # from test.support import requires from tkinter import BooleanVar, StringVar, TclError # ,Tk, Text import tkinter.messagebox as tkMessageBox -from idlelib import SearchEngine as se +from idlelib import searchengine as se from idlelib.idle_test.mock_tk import Var, Mbox from idlelib.idle_test.mock_tk import Text as mockText @@ -139,10 +139,10 @@ class SearchEngineTest(unittest.TestCase): def test_setcookedpat(self): engine = self.engine - engine.setcookedpat('\s') - self.assertEqual(engine.getpat(), '\s') + engine.setcookedpat(r'\s') + self.assertEqual(engine.getpat(), r'\s') engine.revar.set(1) - engine.setcookedpat('\s') + engine.setcookedpat(r'\s') self.assertEqual(engine.getpat(), r'\\s') def test_getcookedpat(self): @@ -156,10 +156,10 @@ class SearchEngineTest(unittest.TestCase): Equal(engine.getcookedpat(), r'\bhello\b') engine.wordvar.set(False) - engine.setpat('\s') + engine.setpat(r'\s') Equal(engine.getcookedpat(), r'\\s') engine.revar.set(True) - Equal(engine.getcookedpat(), '\s') + Equal(engine.getcookedpat(), r'\s') def test_getprog(self): engine = self.engine @@ -282,7 +282,7 @@ class ForwardBackwardTest(unittest.TestCase): cls.pat = re.compile('target') cls.res = (2, (10, 16)) # line, slice indexes of 'target' cls.failpat = re.compile('xyz') # not in text - cls.emptypat = re.compile('\w*') # empty match possible + cls.emptypat = re.compile(r'\w*') # empty match possible def make_search(self, func): def search(pat, line, col, wrap, ok=0): diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py index 7e823df..a5ba7bb 100644 --- a/Lib/idlelib/idle_test/test_text.py +++ b/Lib/idlelib/idle_test/test_text.py @@ -1,17 +1,19 @@ -# Test mock_tk.Text class against tkinter.Text class by running same tests with both. +''' Test mock_tk.Text class against tkinter.Text class + +Run same tests with both by creating a mixin class. +''' import unittest from test.support import requires - from _tkinter import TclError class TextTest(object): + "Define items common to both sets of tests." - hw = 'hello\nworld' # usual initial insert after initialization + hw = 'hello\nworld' # Several tests insert this after after initialization. hwn = hw+'\n' # \n present at initialization, before insert - Text = None - def setUp(self): - self.text = self.Text() + # setUpClass defines cls.Text and maybe cls.root. + # setUp defines self.text from Text and maybe root. def test_init(self): self.assertEqual(self.text.get('1.0'), '\n') @@ -196,6 +198,10 @@ class MockTextTest(TextTest, unittest.TestCase): from idlelib.idle_test.mock_tk import Text cls.Text = Text + def setUp(self): + self.text = self.Text() + + def test_decode(self): # test endflags (-1, 0) not tested by test_index (which uses +1) decode = self.text._decode @@ -222,6 +228,9 @@ class TkTextTest(TextTest, unittest.TestCase): cls.root.destroy() del cls.root + def setUp(self): + self.text = self.Text(self.root) + if __name__ == '__main__': unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_textview.py b/Lib/idlelib/idle_test/test_textview.py index 5d2e600..f018f5e 100644 --- a/Lib/idlelib/idle_test/test_textview.py +++ b/Lib/idlelib/idle_test/test_textview.py @@ -1,21 +1,21 @@ -'''Test idlelib.textView. +'''Test idlelib.textview. Since all methods and functions create (or destroy) a TextViewer, which is a widget containing multiple widgets, all tests must be gui tests. Using mock Text would not change this. Other mocks are used to retrieve information about calls. -The coverage is essentially 100%. +Coverage: 94%. ''' +from idlelib import textview as tv from test.support import requires requires('gui') import unittest import os from tkinter import Tk -from idlelib import textView as tv from idlelib.idle_test.mock_idle import Func -from idlelib.idle_test.mock_tk import Mbox +from idlelib.idle_test.mock_tk import Mbox_func def setUpModule(): global root @@ -64,17 +64,17 @@ class TextViewTest(unittest.TestCase): view.destroy() -class textviewTest(unittest.TestCase): +class ViewFunctionTest(unittest.TestCase): @classmethod def setUpClass(cls): - cls.orig_mbox = tv.tkMessageBox - tv.tkMessageBox = Mbox + cls.orig_error = tv.showerror + tv.showerror = Mbox_func() @classmethod def tearDownClass(cls): - tv.tkMessageBox = cls.orig_mbox - del cls.orig_mbox + tv.showerror = cls.orig_error + del cls.orig_error def test_view_text(self): # If modal True, get tk error 'can't invoke "event" command'. @@ -90,7 +90,7 @@ class textviewTest(unittest.TestCase): self.assertIn('Test', view.textView.get('1.0', '1.end')) view.Ok() - # Mock messagebox will be used and view_file will not return anything + # Mock showerror will be used; view_file will return None. testfile = os.path.join(test_dir, '../notthere.py') view = tv.view_file(root, 'Title', testfile, modal=False) self.assertIsNone(view) diff --git a/Lib/idlelib/idle_test/test_tree.py b/Lib/idlelib/idle_test/test_tree.py new file mode 100644 index 0000000..09ba964 --- /dev/null +++ b/Lib/idlelib/idle_test/test_tree.py @@ -0,0 +1,36 @@ +''' Test idlelib.tree. + +Coverage: 56% +''' +from idlelib import tree +from test.support import requires +requires('gui') +import os +import unittest +from tkinter import Tk + + +class TreeTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_init(self): + # Start with code slightly adapted from htest. + sc = tree.ScrolledCanvas( + self.root, bg="white", highlightthickness=0, takefocus=1) + sc.frame.pack(expand=1, fill="both", side='left') + item = tree.FileTreeItem(tree.ICONDIR) + node = tree.TreeNode(sc.canvas, None, item) + node.expand() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_undodelegator.py b/Lib/idlelib/idle_test/test_undo.py similarity index 95% rename from Lib/idlelib/idle_test/test_undodelegator.py rename to Lib/idlelib/idle_test/test_undo.py index 2b83c99..e872927 100644 --- a/Lib/idlelib/idle_test/test_undodelegator.py +++ b/Lib/idlelib/idle_test/test_undo.py @@ -1,4 +1,4 @@ -"""Unittest for UndoDelegator in idlelib.UndoDelegator. +"""Unittest for UndoDelegator in idlelib.undo.py. Coverage about 80% (retest). """ @@ -8,8 +8,8 @@ requires('gui') import unittest from unittest.mock import Mock from tkinter import Text, Tk -from idlelib.UndoDelegator import UndoDelegator -from idlelib.Percolator import Percolator +from idlelib.undo import UndoDelegator +from idlelib.percolator import Percolator class UndoDelegatorTest(unittest.TestCase): @@ -29,8 +29,8 @@ class UndoDelegatorTest(unittest.TestCase): def setUp(self): self.delegator = UndoDelegator() + self.delegator.bell = Mock() self.percolator.insertfilter(self.delegator) - self.delegator.bell = Mock(wraps=self.delegator.bell) def tearDown(self): self.percolator.removefilter(self.delegator) diff --git a/Lib/idlelib/idle_test/test_warning.py b/Lib/idlelib/idle_test/test_warning.py index 18627dd..f3269f1 100644 --- a/Lib/idlelib/idle_test/test_warning.py +++ b/Lib/idlelib/idle_test/test_warning.py @@ -1,4 +1,4 @@ -'''Test warnings replacement in PyShell.py and run.py. +'''Test warnings replacement in pyshell.py and run.py. This file could be expanded to include traceback overrides (in same two modules). If so, change name. @@ -17,9 +17,9 @@ showwarning = warnings.showwarning running_in_idle = 'idle' in showwarning.__name__ from idlelib import run -from idlelib import PyShell as shell +from idlelib import pyshell as shell -# The following was generated from PyShell.idle_formatwarning +# The following was generated from pyshell.idle_formatwarning # and checked as matching expectation. idlemsg = ''' Warning (from warnings module): diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py deleted file mode 100644 index 3e9f69a..0000000 --- a/Lib/idlelib/idlever.py +++ /dev/null @@ -1,12 +0,0 @@ -""" -The separate Idle version was eliminated years ago; -idlelib.idlever is no longer used by Idle -and will be removed in 3.6 or later. Use - from sys import version - IDLE_VERSION = version[:version.index(' ')] -""" -# Kept for now only for possible existing extension use -import warnings as w -w.warn(__doc__, DeprecationWarning, stacklevel=2) -from sys import version -IDLE_VERSION = version[:version.index(' ')] diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/iomenu.py similarity index 98% rename from Lib/idlelib/IOBinding.py rename to Lib/idlelib/iomenu.py index efd0d5e..3414c7b 100644 --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/iomenu.py @@ -11,7 +11,7 @@ import tkinter.messagebox as tkMessageBox from tkinter.simpledialog import askstring import idlelib -from idlelib.configHandler import idleConf +from idlelib.config import idleConf if idlelib.testing: # Set True by test.test_idle to avoid setlocale. encoding = 'utf-8' @@ -110,6 +110,9 @@ def coding_spec(data): class IOBinding: +# One instance per editor Window so methods know which to save, close. +# Open returns focus to self.editwin if aborted. +# EditorWindow.open_module, others, belong here. def __init__(self, editwin): self.editwin = editwin @@ -532,8 +535,8 @@ def _io_binding(parent): # htest # root = Toplevel(parent) root.title("Test IOBinding") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + root.geometry("+%d+%d" % (x, y + 175)) class MyEditWin: def __init__(self, text): self.text = text diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosx.py similarity index 78% rename from Lib/idlelib/macosxSupport.py rename to Lib/idlelib/macosx.py index b96bae1..c225dd9 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosx.py @@ -1,30 +1,25 @@ """ A number of functions that enhance IDLE on Mac OSX. """ -import sys -import tkinter -from os import path +from sys import platform # Used in _init_tk_type, changed by test. import warnings -def runningAsOSXApp(): - warnings.warn("runningAsOSXApp() is deprecated, use isAquaTk()", - DeprecationWarning, stacklevel=2) - return isAquaTk() +import tkinter + -def isCarbonAquaTk(root): - warnings.warn("isCarbonAquaTk(root) is deprecated, use isCarbonTk()", - DeprecationWarning, stacklevel=2) - return isCarbonTk() +## Define functions that query the Mac graphics type. +## _tk_type and its initializer are private to this section. _tk_type = None -def _initializeTkVariantTests(root): +def _init_tk_type(): """ Initializes OS X Tk variant values for isAquaTk(), isCarbonTk(), isCocoaTk(), and isXQuartz(). """ global _tk_type - if sys.platform == 'darwin': + if platform == 'darwin': + root = tkinter.Tk() ws = root.tk.call('tk', 'windowingsystem') if 'x11' in ws: _tk_type = "xquartz" @@ -34,6 +29,7 @@ def _initializeTkVariantTests(root): _tk_type = "cocoa" else: _tk_type = "carbon" + root.destroy() else: _tk_type = "other" @@ -41,7 +37,8 @@ def isAquaTk(): """ Returns True if IDLE is using a native OS X Tk (Cocoa or Carbon). """ - assert _tk_type is not None + if not _tk_type: + _init_tk_type() return _tk_type == "cocoa" or _tk_type == "carbon" def isCarbonTk(): @@ -49,23 +46,27 @@ def isCarbonTk(): Returns True if IDLE is using a Carbon Aqua Tk (instead of the newer Cocoa Aqua Tk). """ - assert _tk_type is not None + if not _tk_type: + _init_tk_type() return _tk_type == "carbon" def isCocoaTk(): """ Returns True if IDLE is using a Cocoa Aqua Tk. """ - assert _tk_type is not None + if not _tk_type: + _init_tk_type() return _tk_type == "cocoa" def isXQuartz(): """ Returns True if IDLE is using an OS X X11 Tk. """ - assert _tk_type is not None + if not _tk_type: + _init_tk_type() return _tk_type == "xquartz" + def tkVersionWarning(root): """ Returns a string warning message if the Tk version in use appears to @@ -86,6 +87,9 @@ def tkVersionWarning(root): else: return False + +## Fix the menu and related functions. + def addOpenEventSupport(root, flist): """ This ensures that the application will respond to open AppleEvents, which @@ -124,23 +128,23 @@ def overrideRootMenu(root, flist): # Due to a (mis-)feature of TkAqua the user will also see an empty Help # menu. from tkinter import Menu - from idlelib import Bindings - from idlelib import WindowList + from idlelib import mainmenu + from idlelib import windows - closeItem = Bindings.menudefs[0][1][-2] + closeItem = mainmenu.menudefs[0][1][-2] # Remove the last 3 items of the file menu: a separator, close window and # quit. Close window will be reinserted just above the save item, where # it should be according to the HIG. Quit is in the application menu. - del Bindings.menudefs[0][1][-3:] - Bindings.menudefs[0][1].insert(6, closeItem) + del mainmenu.menudefs[0][1][-3:] + mainmenu.menudefs[0][1].insert(6, closeItem) # Remove the 'About' entry from the help menu, it is in the application # menu - del Bindings.menudefs[-1][1][0:2] + del mainmenu.menudefs[-1][1][0:2] # Remove the 'Configure Idle' entry from the options menu, it is in the # application menu as 'Preferences' - del Bindings.menudefs[-2][1][0] + del mainmenu.menudefs[-2][1][0] menubar = Menu(root) root.configure(menu=menubar) menudict = {} @@ -155,30 +159,30 @@ def overrideRootMenu(root, flist): if end > 0: menu.delete(0, end) - WindowList.add_windows_to_menu(menu) - WindowList.register_callback(postwindowsmenu) + windows.add_windows_to_menu(menu) + windows.register_callback(postwindowsmenu) def about_dialog(event=None): "Handle Help 'About IDLE' event." - # Synchronize with EditorWindow.EditorWindow.about_dialog. - from idlelib import aboutDialog - aboutDialog.AboutDialog(root, 'About IDLE') + # Synchronize with editor.EditorWindow.about_dialog. + from idlelib import help_about + help_about.AboutDialog(root, 'About IDLE') def config_dialog(event=None): "Handle Options 'Configure IDLE' event." - # Synchronize with EditorWindow.EditorWindow.config_dialog. - from idlelib import configDialog + # Synchronize with editor.EditorWindow.config_dialog. + from idlelib import configdialog # Ensure that the root object has an instance_dict attribute, # mirrors code in EditorWindow (although that sets the attribute # on an EditorWindow instance that is then passed as the first # argument to ConfigDialog) root.instance_dict = flist.inversedict - configDialog.ConfigDialog(root, 'Settings') + configdialog.ConfigDialog(root, 'Settings') def help_dialog(event=None): "Handle Help 'IDLE Help' event." - # Synchronize with EditorWindow.EditorWindow.help_dialog. + # Synchronize with editor.EditorWindow.help_dialog. from idlelib import help help.show_idlehelp(root) @@ -198,29 +202,33 @@ def overrideRootMenu(root, flist): menudict['application'] = menu = Menu(menubar, name='apple', tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) - Bindings.menudefs.insert(0, + mainmenu.menudefs.insert(0, ('application', [ ('About IDLE', '<>'), None, ])) - tkversion = root.tk.eval('info patchlevel') - if tuple(map(int, tkversion.split('.'))) < (8, 4, 14): - # for earlier AquaTk versions, supply a Preferences menu item - Bindings.menudefs[0][1].append( - ('_Preferences....', '<>'), - ) if isCocoaTk(): # replace default About dialog with About IDLE one root.createcommand('tkAboutDialog', about_dialog) # replace default "Help" item in Help menu root.createcommand('::tk::mac::ShowHelp', help_dialog) # remove redundant "IDLE Help" from menu - del Bindings.menudefs[-1][1][0] + del mainmenu.menudefs[-1][1][0] + +def fixb2context(root): + '''Removed bad AquaTk Button-2 (right) and Paste bindings. + + They prevent context menu access and seem to be gone in AquaTk8.6. + See issue #24801. + ''' + root.unbind_class('Text', '') + root.unbind_class('Text', '') + root.unbind_class('Text', '<>') def setupApp(root, flist): """ Perform initial OS X customizations if needed. - Called from PyShell.main() after initial calls to Tk() + Called from pyshell.main() after initial calls to Tk() There are currently three major versions of Tk in use on OS X: 1. Aqua Cocoa Tk (native default since OS X 10.6) @@ -233,8 +241,13 @@ def setupApp(root, flist): isAquaTk(), isCarbonTk(), isCocoaTk(), isXQuartz() functions which are initialized here as well. """ - _initializeTkVariantTests(root) if isAquaTk(): hideTkConsole(root) overrideRootMenu(root, flist) addOpenEventSupport(root, flist) + fixb2context(root) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_macosx', verbosity=2) diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/mainmenu.py similarity index 96% rename from Lib/idlelib/Bindings.py rename to Lib/idlelib/mainmenu.py index e19a279..65345cd 100644 --- a/Lib/idlelib/Bindings.py +++ b/Lib/idlelib/mainmenu.py @@ -10,9 +10,9 @@ windows. """ from importlib.util import find_spec -from idlelib.configHandler import idleConf +from idlelib.config import idleConf -# Warning: menudefs is altered in macosxSupport.overrideRootMenu() +# Warning: menudefs is altered in macosx.overrideRootMenu() # after it is determined that an OS X Aqua Tk is in use, # which cannot be done until after Tk() is first called. # Do not alter the 'file', 'options', or 'help' cascades here diff --git a/Lib/idlelib/MultiCall.py b/Lib/idlelib/multicall.py similarity index 98% rename from Lib/idlelib/MultiCall.py rename to Lib/idlelib/multicall.py index 8462854..b74fed4 100644 --- a/Lib/idlelib/MultiCall.py +++ b/Lib/idlelib/multicall.py @@ -28,9 +28,9 @@ The order by which events are called is defined by these rules: unless this conflicts with the first rule. Each function will be called at most once for each event. """ - -import sys import re +import sys + import tkinter # the event type constants, which define the meaning of mc_type @@ -414,12 +414,12 @@ def MultiCallCreator(widget): return MultiCall -def _multi_call(parent): - root = tkinter.Tk() - root.title("Test MultiCall") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - text = MultiCallCreator(tkinter.Text)(root) +def _multi_call(parent): # htest # + top = tkinter.Toplevel(parent) + top.title("Test MultiCall") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + text = MultiCallCreator(tkinter.Text)(top) text.pack() def bindseq(seq, n=[0]): def handler(event): @@ -439,7 +439,6 @@ def _multi_call(parent): bindseq("") bindseq("") bindseq("") - root.mainloop() if __name__ == "__main__": from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/outwin.py similarity index 96% rename from Lib/idlelib/OutputWindow.py rename to Lib/idlelib/outwin.py index e614f9b..f6d2915 100644 --- a/Lib/idlelib/OutputWindow.py +++ b/Lib/idlelib/outwin.py @@ -1,8 +1,11 @@ -from tkinter import * -from idlelib.EditorWindow import EditorWindow import re + +from tkinter import * import tkinter.messagebox as tkMessageBox -from idlelib import IOBinding + +from idlelib.editor import EditorWindow +from idlelib import iomenu + class OutputWindow(EditorWindow): @@ -36,7 +39,7 @@ class OutputWindow(EditorWindow): def write(self, s, tags=(), mark="insert"): if isinstance(s, (bytes, bytes)): - s = s.decode(IOBinding.encoding, "replace") + s = s.decode(iomenu.encoding, "replace") self.text.insert(mark, s, tags) self.text.see(mark) self.text.update() diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/paragraph.py similarity index 97% rename from Lib/idlelib/FormatParagraph.py rename to Lib/idlelib/paragraph.py index 7a9d185..f11bdae 100644 --- a/Lib/idlelib/FormatParagraph.py +++ b/Lib/idlelib/paragraph.py @@ -14,9 +14,10 @@ Known problems with comment reformatting: spaces, they will not be considered part of the same block. * Fancy comments, like this bulleted list, aren't handled :-) """ - import re -from idlelib.configHandler import idleConf + +from idlelib.config import idleConf + class FormatParagraph: @@ -129,7 +130,7 @@ def reformat_paragraph(data, limit): partial = indent1 while i < n and not is_all_white(lines[i]): # XXX Should take double space after period (etc.) into account - words = re.split("(\s+)", lines[i]) + words = re.split(r"(\s+)", lines[i]) for j in range(0, len(words), 2): word = words[j] if not word: @@ -189,7 +190,8 @@ def get_comment_header(line): if m is None: return "" return m.group(1) + if __name__ == "__main__": import unittest - unittest.main('idlelib.idle_test.test_formatparagraph', + unittest.main('idlelib.idle_test.test_paragraph', verbosity=2, exit=False) diff --git a/Lib/idlelib/ParenMatch.py b/Lib/idlelib/parenmatch.py similarity index 96% rename from Lib/idlelib/ParenMatch.py rename to Lib/idlelib/parenmatch.py index 47e10f3..ccec708 100644 --- a/Lib/idlelib/ParenMatch.py +++ b/Lib/idlelib/parenmatch.py @@ -4,9 +4,8 @@ When you hit a right paren, the cursor should move briefly to the left paren. Paren here is used generically; the matching applies to parentheses, square brackets, and curly braces. """ - -from idlelib.HyperParser import HyperParser -from idlelib.configHandler import idleConf +from idlelib.hyperparser import HyperParser +from idlelib.config import idleConf _openers = {')':'(',']':'[','}':'{'} CHECK_DELAY = 100 # milliseconds @@ -64,6 +63,7 @@ class ParenMatch: # and deactivate_restore (which calls event_delete). editwin.text.bind(self.RESTORE_VIRTUAL_EVENT_NAME, self.restore_event) + self.bell = self.text.bell if self.BELL else lambda: None self.counter = 0 self.is_restore_active = 0 self.set_style(self.STYLE) @@ -93,7 +93,7 @@ class ParenMatch: indices = (HyperParser(self.editwin, "insert") .get_surrounding_brackets()) if indices is None: - self.warn_mismatched() + self.bell() return self.activate_restore() self.create_tag(indices) @@ -109,7 +109,7 @@ class ParenMatch: return indices = hp.get_surrounding_brackets(_openers[closer], True) if indices is None: - self.warn_mismatched() + self.bell() return self.activate_restore() self.create_tag(indices) @@ -124,10 +124,6 @@ class ParenMatch: if timer_count == self.counter: self.restore_event() - def warn_mismatched(self): - if self.BELL: - self.text.bell() - # any one of the create_tag_XXX methods can be used depending on # the style diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/pathbrowser.py similarity index 95% rename from Lib/idlelib/PathBrowser.py rename to Lib/idlelib/pathbrowser.py index 9ab7632..6c19508 100644 --- a/Lib/idlelib/PathBrowser.py +++ b/Lib/idlelib/pathbrowser.py @@ -1,10 +1,10 @@ +import importlib.machinery import os import sys -import importlib.machinery -from idlelib.TreeWidget import TreeItem -from idlelib.ClassBrowser import ClassBrowser, ModuleBrowserTreeItem -from idlelib.PyShell import PyShellFileList +from idlelib.browser import ClassBrowser, ModuleBrowserTreeItem +from idlelib.pyshell import PyShellFileList +from idlelib.tree import TreeItem class PathBrowser(ClassBrowser): @@ -24,6 +24,7 @@ class PathBrowser(ClassBrowser): def rootnode(self): return PathBrowserTreeItem() + class PathBrowserTreeItem(TreeItem): def GetText(self): @@ -36,6 +37,7 @@ class PathBrowserTreeItem(TreeItem): sublist.append(item) return sublist + class DirBrowserTreeItem(TreeItem): def __init__(self, dir, packages=[]): @@ -95,6 +97,7 @@ class DirBrowserTreeItem(TreeItem): sorted.sort() return sorted + def _path_browser(parent): # htest # flist = PyShellFileList(parent) PathBrowser(flist, _htest=True) diff --git a/Lib/idlelib/Percolator.py b/Lib/idlelib/percolator.py similarity index 91% rename from Lib/idlelib/Percolator.py rename to Lib/idlelib/percolator.py index b8be2aa..d18daf0 100644 --- a/Lib/idlelib/Percolator.py +++ b/Lib/idlelib/percolator.py @@ -1,5 +1,5 @@ -from idlelib.WidgetRedirector import WidgetRedirector -from idlelib.Delegator import Delegator +from idlelib.delegator import Delegator +from idlelib.redirector import WidgetRedirector class Percolator: @@ -57,7 +57,6 @@ class Percolator: def _percolator(parent): # htest # import tkinter as tk - import re class Tracer(Delegator): def __init__(self, name): @@ -74,8 +73,8 @@ def _percolator(parent): # htest # box = tk.Toplevel(parent) box.title("Test Percolator") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - box.geometry("+%d+%d" % (x, y + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + box.geometry("+%d+%d" % (x, y + 175)) text = tk.Text(box) p = Percolator(text) pin = p.insertfilter @@ -89,10 +88,10 @@ def _percolator(parent): # htest # (pin if var2.get() else pout)(t2) text.pack() - var1 = tk.IntVar() + var1 = tk.IntVar(parent) cb1 = tk.Checkbutton(box, text="Tracer1", command=toggle1, variable=var1) cb1.pack() - var2 = tk.IntVar() + var2 = tk.IntVar(parent) cb2 = tk.Checkbutton(box, text="Tracer2", command=toggle2, variable=var2) cb2.pack() diff --git a/Lib/idlelib/PyParse.py b/Lib/idlelib/pyparse.py similarity index 100% rename from Lib/idlelib/PyParse.py rename to Lib/idlelib/pyparse.py index 9ccbb25..6739dfd 100644 --- a/Lib/idlelib/PyParse.py +++ b/Lib/idlelib/pyparse.py @@ -1,6 +1,6 @@ +from collections import Mapping import re import sys -from collections import Mapping # Reason last stmt is continued (or C_NONE if it's not). (C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE, diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/pyshell.py similarity index 91% rename from Lib/idlelib/PyShell.py rename to Lib/idlelib/pyshell.py index 5dec68e..e1eade1 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/pyshell.py @@ -1,8 +1,27 @@ #! /usr/bin/env python3 +try: + from tkinter import * +except ImportError: + print("** IDLE can't import Tkinter.\n" + "Your Python may not be configured for Tk. **", file=sys.__stderr__) + sys.exit(1) +import tkinter.messagebox as tkMessageBox +if TkVersion < 8.5: + root = Tk() # otherwise create root in main + root.withdraw() + tkMessageBox.showerror("Idle Cannot Start", + "Idle requires tcl/tk 8.5+, not $s." % TkVersion, + parent=root) + sys.exit(1) + +from code import InteractiveInterpreter import getopt +import io +import linecache import os import os.path +from platform import python_version, system import re import socket import subprocess @@ -10,30 +29,20 @@ import sys import threading import time import tokenize -import io - -import linecache -from code import InteractiveInterpreter -from platform import python_version, system - -try: - from tkinter import * -except ImportError: - print("** IDLE can't import Tkinter.\n" - "Your Python may not be configured for Tk. **", file=sys.__stderr__) - sys.exit(1) -import tkinter.messagebox as tkMessageBox +import warnings -from idlelib.EditorWindow import EditorWindow, fixwordbreaks -from idlelib.FileList import FileList -from idlelib.ColorDelegator import ColorDelegator -from idlelib.UndoDelegator import UndoDelegator -from idlelib.OutputWindow import OutputWindow -from idlelib.configHandler import idleConf +from idlelib import testing # bool value +from idlelib.colorizer import ColorDelegator +from idlelib.config import idleConf +from idlelib import debugger +from idlelib import debugger_r +from idlelib.editor import EditorWindow, fixwordbreaks +from idlelib.filelist import FileList +from idlelib import macosx +from idlelib.outwin import OutputWindow from idlelib import rpc -from idlelib import Debugger -from idlelib import RemoteDebugger -from idlelib import macosxSupport +from idlelib.run import idle_formatwarning, PseudoInputFile, PseudoOutputFile +from idlelib.undo import UndoDelegator HOST = '127.0.0.1' # python execution server on localhost loopback PORT = 0 # someday pass in host, port for remote debug capability @@ -43,20 +52,6 @@ PORT = 0 # someday pass in host, port for remote debug capability # temporarily redirect the stream to the shell window to display warnings when # checking user's code. warning_stream = sys.__stderr__ # None, at least on Windows, if no console. -import warnings - -def idle_formatwarning(message, category, filename, lineno, line=None): - """Format warnings the IDLE way.""" - - s = "\nWarning (from warnings module):\n" - s += ' File \"%s\", line %s\n' % (filename, lineno) - if line is None: - line = linecache.getline(filename, lineno) - line = line.strip() - if line: - s += " %s\n" % line - s += "%s: %s\n" % (category.__name__, message) - return s def idle_showwarning( message, category, filename, lineno, file=None, line=None): @@ -410,7 +405,7 @@ class ModifiedInterpreter(InteractiveInterpreter): # run from the IDLE source directory. del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc', default=False, type='bool') - if __name__ == 'idlelib.PyShell': + if __name__ == 'idlelib.pyshell': command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,) else: command = "__import__('run').main(%r)" % (del_exitf,) @@ -468,7 +463,7 @@ class ModifiedInterpreter(InteractiveInterpreter): if debug: try: # Only close subprocess debugger, don't unregister gui_adap! - RemoteDebugger.close_subprocess_debugger(self.rpcclt) + debugger_r.close_subprocess_debugger(self.rpcclt) except: pass # Kill subprocess, spawn a new one, accept connection. @@ -497,7 +492,7 @@ class ModifiedInterpreter(InteractiveInterpreter): # restart subprocess debugger if debug: # Restarted debugger connects to current instance of debug GUI - RemoteDebugger.restart_subprocess_debugger(self.rpcclt) + debugger_r.restart_subprocess_debugger(self.rpcclt) # reload remote debugger breakpoints for all PyShellEditWindows debug.load_breakpoints() self.compile.compiler.flags = self.original_compiler_flags @@ -578,7 +573,7 @@ class ModifiedInterpreter(InteractiveInterpreter): if self.tkconsole.getvar("<>"): self.remote_stack_viewer() elif how == "ERROR": - errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n" + errmsg = "pyshell.ModifiedInterpreter: Subprocess ERROR:\n" print(errmsg, what, file=sys.__stderr__) print(errmsg, what, file=console) # we received a response to the currently active seq number: @@ -613,13 +608,13 @@ class ModifiedInterpreter(InteractiveInterpreter): return def remote_stack_viewer(self): - from idlelib import RemoteObjectBrowser + from idlelib import debugobj_r oid = self.rpcclt.remotequeue("exec", "stackviewer", ("flist",), {}) if oid is None: self.tkconsole.root.bell() return - item = RemoteObjectBrowser.StubObjectTreeItem(self.rpcclt, oid) - from idlelib.TreeWidget import ScrolledCanvas, TreeNode + item = debugobj_r.StubObjectTreeItem(self.rpcclt, oid) + from idlelib.tree import ScrolledCanvas, TreeNode top = Toplevel(self.tkconsole.root) theme = idleConf.CurrentTheme() background = idleConf.GetHighlight(theme, 'normal')['background'] @@ -662,9 +657,9 @@ class ModifiedInterpreter(InteractiveInterpreter): # at the moment, InteractiveInterpreter expects str assert isinstance(source, str) #if isinstance(source, str): - # from idlelib import IOBinding + # from idlelib import iomenu # try: - # source = source.encode(IOBinding.encoding) + # source = source.encode(iomenu.encoding) # except UnicodeError: # self.tkconsole.resetoutput() # self.write("Unsupported characters in input\n") @@ -850,7 +845,7 @@ class PyShell(OutputWindow): # New classes - from idlelib.IdleHistory import History + from idlelib.history import History def __init__(self, flist=None): if use_subprocess: @@ -888,11 +883,11 @@ class PyShell(OutputWindow): self.save_stdout = sys.stdout self.save_stderr = sys.stderr self.save_stdin = sys.stdin - from idlelib import IOBinding - self.stdin = PseudoInputFile(self, "stdin", IOBinding.encoding) - self.stdout = PseudoOutputFile(self, "stdout", IOBinding.encoding) - self.stderr = PseudoOutputFile(self, "stderr", IOBinding.encoding) - self.console = PseudoOutputFile(self, "console", IOBinding.encoding) + from idlelib import iomenu + self.stdin = PseudoInputFile(self, "stdin", iomenu.encoding) + self.stdout = PseudoOutputFile(self, "stdout", iomenu.encoding) + self.stderr = PseudoOutputFile(self, "stderr", iomenu.encoding) + self.console = PseudoOutputFile(self, "console", iomenu.encoding) if not use_subprocess: sys.stdout = self.stdout sys.stderr = self.stderr @@ -900,7 +895,7 @@ class PyShell(OutputWindow): try: # page help() text to shell. import pydoc # import must be done here to capture i/o rebinding. - # XXX KBK 27Dec07 use a textView someday, but must work w/o subproc + # XXX KBK 27Dec07 use TextViewer someday, but must work w/o subproc pydoc.pager = pydoc.plainpager except: sys.stderr = sys.__stderr__ @@ -954,7 +949,7 @@ class PyShell(OutputWindow): self.interp.setdebugger(None) db.close() if self.interp.rpcclt: - RemoteDebugger.close_remote_debugger(self.interp.rpcclt) + debugger_r.close_remote_debugger(self.interp.rpcclt) self.resetoutput() self.console.write("[DEBUG OFF]\n") sys.ps1 = ">>> " @@ -963,10 +958,10 @@ class PyShell(OutputWindow): def open_debugger(self): if self.interp.rpcclt: - dbg_gui = RemoteDebugger.start_remote_debugger(self.interp.rpcclt, + dbg_gui = debugger_r.start_remote_debugger(self.interp.rpcclt, self) else: - dbg_gui = Debugger.Debugger(self) + dbg_gui = debugger.Debugger(self) self.interp.setdebugger(dbg_gui) dbg_gui.load_breakpoints() sys.ps1 = "[DEBUG ON]\n>>> " @@ -1241,7 +1236,7 @@ class PyShell(OutputWindow): "(sys.last_traceback is not defined)", parent=self.text) return - from idlelib.StackViewer import StackBrowser + from idlelib.stackviewer import StackBrowser StackBrowser(self.root, self.flist) def view_restart_mark(self, event=None): @@ -1309,92 +1304,6 @@ class PyShell(OutputWindow): return 'disabled' return super().rmenu_check_paste() -class PseudoFile(io.TextIOBase): - - def __init__(self, shell, tags, encoding=None): - self.shell = shell - self.tags = tags - self._encoding = encoding - - @property - def encoding(self): - return self._encoding - - @property - def name(self): - return '<%s>' % self.tags - - def isatty(self): - return True - - -class PseudoOutputFile(PseudoFile): - - def writable(self): - return True - - def write(self, s): - if self.closed: - raise ValueError("write to closed file") - if type(s) is not str: - if not isinstance(s, str): - raise TypeError('must be str, not ' + type(s).__name__) - # See issue #19481 - s = str.__str__(s) - return self.shell.write(s, self.tags) - - -class PseudoInputFile(PseudoFile): - - def __init__(self, shell, tags, encoding=None): - PseudoFile.__init__(self, shell, tags, encoding) - self._line_buffer = '' - - def readable(self): - return True - - def read(self, size=-1): - if self.closed: - raise ValueError("read from closed file") - if size is None: - size = -1 - elif not isinstance(size, int): - raise TypeError('must be int, not ' + type(size).__name__) - result = self._line_buffer - self._line_buffer = '' - if size < 0: - while True: - line = self.shell.readline() - if not line: break - result += line - else: - while len(result) < size: - line = self.shell.readline() - if not line: break - result += line - self._line_buffer = result[size:] - result = result[:size] - return result - - def readline(self, size=-1): - if self.closed: - raise ValueError("read from closed file") - if size is None: - size = -1 - elif not isinstance(size, int): - raise TypeError('must be int, not ' + type(size).__name__) - line = self._line_buffer or self.shell.readline() - if size < 0: - size = len(line) - eol = line.find('\n', 0, size) - if eol >= 0: - size = eol + 1 - self._line_buffer = line[size:] - return line[:size] - - def close(self): - self.shell.close() - def fix_x11_paste(root): "Make paste replace selection on x11. See issue #5124." @@ -1540,7 +1449,10 @@ def main(): enable_edit = enable_edit or edit_start enable_shell = enable_shell or not enable_edit - # start editor and/or shell windows: + # Setup root. Don't break user code run in IDLE process. + # Don't change environment when testing. + if use_subprocess and not testing: + NoDefaultRoot() root = Tk(className="Idle") root.withdraw() @@ -1549,25 +1461,19 @@ def main(): if system() == 'Windows': iconfile = os.path.join(icondir, 'idle.ico') root.wm_iconbitmap(default=iconfile) - elif TkVersion >= 8.5: + else: ext = '.png' if TkVersion >= 8.6 else '.gif' iconfiles = [os.path.join(icondir, 'idle_%d%s' % (size, ext)) for size in (16, 32, 48)] - icons = [PhotoImage(file=iconfile) for iconfile in iconfiles] + icons = [PhotoImage(master=root, file=iconfile) + for iconfile in iconfiles] root.wm_iconphoto(True, *icons) + # start editor and/or shell windows: fixwordbreaks(root) fix_x11_paste(root) flist = PyShellFileList(root) - macosxSupport.setupApp(root, flist) - - if macosxSupport.isAquaTk(): - # There are some screwed up <2> class bindings for text - # widgets defined in Tk which we need to do away with. - # See issue #24801. - root.unbind_class('Text', '') - root.unbind_class('Text', '') - root.unbind_class('Text', '<>') + macosx.setupApp(root, flist) if enable_edit: if not (cmd or script): @@ -1582,7 +1488,7 @@ def main(): shell = flist.open_shell() if not shell: return # couldn't open shell - if macosxSupport.isAquaTk() and flist.dict: + if macosx.isAquaTk() and flist.dict: # On OSX: when the user has double-clicked on a file that causes # IDLE to be launched the shell window will open just in front of # the file she wants to see. Lower the interpreter window when @@ -1616,7 +1522,7 @@ def main(): # check for problematic OS X Tk versions and print a warning # message in the IDLE shell window; this is less intrusive # than always opening a separate window. - tkversionwarning = macosxSupport.tkVersionWarning(root) + tkversionwarning = macosx.tkVersionWarning(root) if tkversionwarning: shell.interp.runcommand("print('%s')" % tkversionwarning) @@ -1626,7 +1532,7 @@ def main(): capture_warnings(False) if __name__ == "__main__": - sys.modules['PyShell'] = sys.modules['__main__'] + sys.modules['pyshell'] = sys.modules['__main__'] main() capture_warnings(False) # Make sure turned off; see issue 18081 diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py new file mode 100644 index 0000000..3b1f1e2 --- /dev/null +++ b/Lib/idlelib/query.py @@ -0,0 +1,308 @@ +""" +Dialogs that query users and verify the answer before accepting. +Use ttk widgets, limiting use to tcl/tk 8.5+, as in IDLE 3.6+. + +Query is the generic base class for a popup dialog. +The user must either enter a valid answer or close the dialog. +Entries are validated when is entered or [Ok] is clicked. +Entries are ignored when [Cancel] or [X] are clicked. +The 'return value' is .result set to either a valid answer or None. + +Subclass SectionName gets a name for a new config file section. +Configdialog uses it for new highlight theme and keybinding set names. +Subclass ModuleName gets a name for File => Open Module. +Subclass HelpSource gets menu item and path for additions to Help menu. +""" +# Query and Section name result from splitting GetCfgSectionNameDialog +# of configSectionNameDialog.py (temporarily config_sec.py) into +# generic and specific parts. 3.6 only, July 2016. +# ModuleName.entry_ok came from editor.EditorWindow.load_module. +# HelpSource was extracted from configHelpSourceEdit.py (temporarily +# config_help.py), with darwin code moved from ok to path_ok. + +import importlib +import os +from sys import executable, platform # Platform is set for one test. + +from tkinter import Toplevel, StringVar, W, E, N, S +from tkinter.ttk import Frame, Button, Entry, Label +from tkinter import filedialog +from tkinter.font import Font + +class Query(Toplevel): + """Base class for getting verified answer from a user. + + For this base class, accept any non-blank string. + """ + def __init__(self, parent, title, message, *, text0='', used_names={}, + _htest=False, _utest=False): + """Create popup, do not return until tk widget destroyed. + + Additional subclass init must be done before calling this + unless _utest=True is passed to suppress wait_window(). + + title - string, title of popup dialog + message - string, informational message to display + text0 - initial value for entry + used_names - names already in use + _htest - bool, change box location when running htest + _utest - bool, leave window hidden and not modal + """ + Toplevel.__init__(self, parent) + self.withdraw() # Hide while configuring, especially geometry. + self.parent = parent + self.title(title) + self.message = message + self.text0 = text0 + self.used_names = used_names + self.transient(parent) + self.grab_set() + windowingsystem = self.tk.call('tk', 'windowingsystem') + if windowingsystem == 'aqua': + try: + self.tk.call('::tk::unsupported::MacWindowStyle', 'style', + self._w, 'moveableModal', '') + except: + pass + self.bind("", self.cancel) + self.bind('', self.cancel) + self.protocol("WM_DELETE_WINDOW", self.cancel) + self.bind('', self.ok) + self.bind("", self.ok) + self.resizable(height=False, width=False) + self.create_widgets() + self.update_idletasks() # Needed here for winfo_reqwidth below. + self.geometry( # Center dialog over parent (or below htest box). + "+%d+%d" % ( + parent.winfo_rootx() + + (parent.winfo_width()/2 - self.winfo_reqwidth()/2), + parent.winfo_rooty() + + ((parent.winfo_height()/2 - self.winfo_reqheight()/2) + if not _htest else 150) + ) ) + if not _utest: + self.deiconify() # Unhide now that geometry set. + self.wait_window() + + def create_widgets(self): # Call from override, if any. + # Bind to self widgets needed for entry_ok or unittest. + self.frame = frame = Frame(self, padding=10) + frame.grid(column=0, row=0, sticky='news') + frame.grid_columnconfigure(0, weight=1) + + entrylabel = Label(frame, anchor='w', justify='left', + text=self.message) + self.entryvar = StringVar(self, self.text0) + self.entry = Entry(frame, width=30, textvariable=self.entryvar) + self.entry.focus_set() + self.error_font = Font(name='TkCaptionFont', + exists=True, root=self.parent) + self.entry_error = Label(frame, text=' ', foreground='red', + font=self.error_font) + self.button_ok = Button( + frame, text='OK', default='active', command=self.ok) + self.button_cancel = Button( + frame, text='Cancel', command=self.cancel) + + entrylabel.grid(column=0, row=0, columnspan=3, padx=5, sticky=W) + self.entry.grid(column=0, row=1, columnspan=3, padx=5, sticky=W+E, + pady=[10,0]) + self.entry_error.grid(column=0, row=2, columnspan=3, padx=5, + sticky=W+E) + self.button_ok.grid(column=1, row=99, padx=5) + self.button_cancel.grid(column=2, row=99, padx=5) + + def showerror(self, message, widget=None): + #self.bell(displayof=self) + (widget or self.entry_error)['text'] = 'ERROR: ' + message + + def entry_ok(self): # Example: usually replace. + "Return non-blank entry or None." + self.entry_error['text'] = '' + entry = self.entry.get().strip() + if not entry: + self.showerror('blank line.') + return None + return entry + + def ok(self, event=None): # Do not replace. + '''If entry is valid, bind it to 'result' and destroy tk widget. + + Otherwise leave dialog open for user to correct entry or cancel. + ''' + entry = self.entry_ok() + if entry is not None: + self.result = entry + self.destroy() + else: + # [Ok] moves focus. ( does not.) Move it back. + self.entry.focus_set() + + def cancel(self, event=None): # Do not replace. + "Set dialog result to None and destroy tk widget." + self.result = None + self.destroy() + + +class SectionName(Query): + "Get a name for a config file section name." + # Used in ConfigDialog.GetNewKeysName, .GetNewThemeName (837) + + def __init__(self, parent, title, message, used_names, + *, _htest=False, _utest=False): + super().__init__(parent, title, message, used_names=used_names, + _htest=_htest, _utest=_utest) + + def entry_ok(self): + "Return sensible ConfigParser section name or None." + self.entry_error['text'] = '' + name = self.entry.get().strip() + if not name: + self.showerror('no name specified.') + return None + elif len(name)>30: + self.showerror('name is longer than 30 characters.') + return None + elif name in self.used_names: + self.showerror('name is already in use.') + return None + return name + + +class ModuleName(Query): + "Get a module name for Open Module menu entry." + # Used in open_module (editor.EditorWindow until move to iobinding). + + def __init__(self, parent, title, message, text0, + *, _htest=False, _utest=False): + super().__init__(parent, title, message, text0=text0, + _htest=_htest, _utest=_utest) + + def entry_ok(self): + "Return entered module name as file path or None." + self.entry_error['text'] = '' + name = self.entry.get().strip() + if not name: + self.showerror('no name specified.') + return None + # XXX Ought to insert current file's directory in front of path. + try: + spec = importlib.util.find_spec(name) + except (ValueError, ImportError) as msg: + self.showerror(str(msg)) + return None + if spec is None: + self.showerror("module not found") + return None + if not isinstance(spec.loader, importlib.abc.SourceLoader): + self.showerror("not a source-based module") + return None + try: + file_path = spec.loader.get_filename(name) + except AttributeError: + self.showerror("loader does not support get_filename", + parent=self) + return None + return file_path + + +class HelpSource(Query): + "Get menu name and help source for Help menu." + # Used in ConfigDialog.HelpListItemAdd/Edit, (941/9) + + def __init__(self, parent, title, *, menuitem='', filepath='', + used_names={}, _htest=False, _utest=False): + """Get menu entry and url/local file for Additional Help. + + User enters a name for the Help resource and a web url or file + name. The user can browse for the file. + """ + self.filepath = filepath + message = 'Name for item on Help menu:' + super().__init__( + parent, title, message, text0=menuitem, + used_names=used_names, _htest=_htest, _utest=_utest) + + def create_widgets(self): + super().create_widgets() + frame = self.frame + pathlabel = Label(frame, anchor='w', justify='left', + text='Help File Path: Enter URL or browse for file') + self.pathvar = StringVar(self, self.filepath) + self.path = Entry(frame, textvariable=self.pathvar, width=40) + browse = Button(frame, text='Browse', width=8, + command=self.browse_file) + self.path_error = Label(frame, text=' ', foreground='red', + font=self.error_font) + + pathlabel.grid(column=0, row=10, columnspan=3, padx=5, pady=[10,0], + sticky=W) + self.path.grid(column=0, row=11, columnspan=2, padx=5, sticky=W+E, + pady=[10,0]) + browse.grid(column=2, row=11, padx=5, sticky=W+S) + self.path_error.grid(column=0, row=12, columnspan=3, padx=5, + sticky=W+E) + + def askfilename(self, filetypes, initdir, initfile): # htest # + # Extracted from browse_file so can mock for unittests. + # Cannot unittest as cannot simulate button clicks. + # Test by running htest, such as by running this file. + return filedialog.Open(parent=self, filetypes=filetypes)\ + .show(initialdir=initdir, initialfile=initfile) + + def browse_file(self): + filetypes = [ + ("HTML Files", "*.htm *.html", "TEXT"), + ("PDF Files", "*.pdf", "TEXT"), + ("Windows Help Files", "*.chm"), + ("Text Files", "*.txt", "TEXT"), + ("All Files", "*")] + path = self.pathvar.get() + if path: + dir, base = os.path.split(path) + else: + base = None + if platform[:3] == 'win': + dir = os.path.join(os.path.dirname(executable), 'Doc') + if not os.path.isdir(dir): + dir = os.getcwd() + else: + dir = os.getcwd() + file = self.askfilename(filetypes, dir, base) + if file: + self.pathvar.set(file) + + item_ok = SectionName.entry_ok # localize for test override + + def path_ok(self): + "Simple validity check for menu file path" + path = self.path.get().strip() + if not path: #no path specified + self.showerror('no help file path specified.', self.path_error) + return None + elif not path.startswith(('www.', 'http')): + if path[:5] == 'file:': + path = path[5:] + if not os.path.exists(path): + self.showerror('help file path does not exist.', + self.path_error) + return None + if platform == 'darwin': # for Mac Safari + path = "file://" + path + return path + + def entry_ok(self): + "Return apparently valid (name, path) or None" + self.entry_error['text'] = '' + self.path_error['text'] = '' + name = self.item_ok() + path = self.path_ok() + return None if name is None or path is None else (name, path) + + +if __name__ == '__main__': + import unittest + unittest.main('idlelib.idle_test.test_query', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(Query, HelpSource) diff --git a/Lib/idlelib/WidgetRedirector.py b/Lib/idlelib/redirector.py similarity index 94% rename from Lib/idlelib/WidgetRedirector.py rename to Lib/idlelib/redirector.py index b66be9e..ec681de 100644 --- a/Lib/idlelib/WidgetRedirector.py +++ b/Lib/idlelib/redirector.py @@ -104,7 +104,7 @@ class WidgetRedirector: Note that if a registered function is called, the operation is not passed through to Tk. Apply the function returned by self.register() - to *args to accomplish that. For an example, see ColorDelegator.py. + to *args to accomplish that. For an example, see colorizer.py. ''' m = self._operations.get(operation) @@ -151,14 +151,13 @@ class OriginalCommand: def _widget_redirector(parent): # htest # - from tkinter import Tk, Text - import re - - root = Tk() - root.title("Test WidgetRedirector") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - text = Text(root) + from tkinter import Toplevel, Text + + top = Toplevel(parent) + top.title("Test WidgetRedirector") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + text = Text(top) text.pack() text.focus_set() redir = WidgetRedirector(text) @@ -166,11 +165,11 @@ def _widget_redirector(parent): # htest # print("insert", args) original_insert(*args) original_insert = redir.register("insert", my_insert) - root.mainloop() if __name__ == "__main__": import unittest - unittest.main('idlelib.idle_test.test_widgetredir', + unittest.main('idlelib.idle_test.test_redirector', verbosity=2, exit=False) + from idlelib.idle_test.htest import run run(_widget_redirector) diff --git a/Lib/idlelib/ReplaceDialog.py b/Lib/idlelib/replace.py similarity index 93% rename from Lib/idlelib/ReplaceDialog.py rename to Lib/idlelib/replace.py index f2ea22e..abd9e59 100644 --- a/Lib/idlelib/ReplaceDialog.py +++ b/Lib/idlelib/replace.py @@ -3,18 +3,18 @@ Uses idlelib.SearchEngine for search capability. Defines various replace related functions like replace, replace all, replace+find. """ -from tkinter import * - -from idlelib import SearchEngine -from idlelib.SearchDialogBase import SearchDialogBase import re +from tkinter import StringVar, TclError + +from idlelib.searchbase import SearchDialogBase +from idlelib import searchengine def replace(text): """Returns a singleton ReplaceDialog instance.The single dialog saves user entries and preferences across instances.""" root = text._root() - engine = SearchEngine.get(root) + engine = searchengine.get(root) if not hasattr(engine, "_replacedialog"): engine._replacedialog = ReplaceDialog(root, engine) dialog = engine._replacedialog @@ -95,7 +95,7 @@ class ReplaceDialog(SearchDialogBase): text = self.text res = self.engine.search_text(text, prog) if not res: - text.bell() + self.bell() return text.tag_remove("sel", "1.0", "end") text.tag_remove("hit", "1.0", "end") @@ -142,7 +142,7 @@ class ReplaceDialog(SearchDialogBase): text = self.text res = self.engine.search_text(text, None, ok) if not res: - text.bell() + self.bell() return False line, m = res i, j = m.span() @@ -164,7 +164,7 @@ class ReplaceDialog(SearchDialogBase): pos = None if not pos: first = last = pos = text.index("insert") - line, col = SearchEngine.get_line_col(pos) + line, col = searchengine.get_line_col(pos) chars = text.get("%d.0" % line, "%d.0" % (line+1)) m = prog.match(chars, col) if not prog: @@ -204,11 +204,13 @@ class ReplaceDialog(SearchDialogBase): def _replace_dialog(parent): # htest # - """htest wrapper function""" + from tkinter import Toplevel, Text, END, SEL + from tkinter.ttk import Button + box = Toplevel(parent) box.title("Test ReplaceDialog") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - box.geometry("+%d+%d"%(x, y + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + box.geometry("+%d+%d" % (x, y + 175)) # mock undo delegator methods def undo_block_start(): @@ -234,7 +236,7 @@ def _replace_dialog(parent): # htest # if __name__ == '__main__': import unittest - unittest.main('idlelib.idle_test.test_replacedialog', + unittest.main('idlelib.idle_test.test_replace', verbosity=2, exit=False) from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 48105f2..8f57edb 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -26,23 +26,21 @@ See the Idle run.main() docstring for further information on how this was accomplished in Idle. """ - -import sys -import os +import builtins +import copyreg import io -import socket +import marshal +import os +import pickle +import queue import select +import socket import socketserver import struct -import pickle +import sys import threading -import queue import traceback -import copyreg import types -import marshal -import builtins - def unpickle_code(ms): co = marshal.loads(ms) @@ -60,10 +58,12 @@ def dumps(obj, protocol=None): p.dump(obj) return f.getvalue() + class CodePickler(pickle.Pickler): dispatch_table = {types.CodeType: pickle_code} dispatch_table.update(copyreg.dispatch_table) + BUFSIZE = 8*1024 LOCALHOST = '127.0.0.1' @@ -487,16 +487,19 @@ class RemoteObject(object): # Token mix-in class pass + def remoteref(obj): oid = id(obj) objecttable[oid] = obj return RemoteProxy(oid) + class RemoteProxy(object): def __init__(self, oid): self.oid = oid + class RPCHandler(socketserver.BaseRequestHandler, SocketIO): debugging = False @@ -514,6 +517,7 @@ class RPCHandler(socketserver.BaseRequestHandler, SocketIO): def get_remote_proxy(self, oid): return RPCProxy(self, oid) + class RPCClient(SocketIO): debugging = False @@ -539,6 +543,7 @@ class RPCClient(SocketIO): def get_remote_proxy(self, oid): return RPCProxy(self, oid) + class RPCProxy(object): __methods = None @@ -587,6 +592,7 @@ def _getattributes(obj, attributes): if not callable(attr): attributes[name] = 1 + class MethodProxy(object): def __init__(self, sockio, oid, name): diff --git a/Lib/idlelib/RstripExtension.py b/Lib/idlelib/rstrip.py similarity index 100% rename from Lib/idlelib/RstripExtension.py rename to Lib/idlelib/rstrip.py diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 28ce420..afa9744 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -1,33 +1,45 @@ -import sys +import io import linecache +import queue +import sys import time import traceback import _thread as thread import threading -import queue -import tkinter - -from idlelib import CallTips -from idlelib import AutoComplete +import warnings -from idlelib import RemoteDebugger -from idlelib import RemoteObjectBrowser -from idlelib import StackViewer -from idlelib import rpc -from idlelib import PyShell -from idlelib import IOBinding +import tkinter # Tcl, deletions, messagebox if startup fails +from idlelib import autocomplete # AutoComplete, fetch_encodings +from idlelib import calltips # CallTips +from idlelib import debugger_r # start_debugger +from idlelib import debugobj_r # remote_object_tree_item +from idlelib import iomenu # encoding +from idlelib import rpc # multiple objects +from idlelib import stackviewer # StackTreeItem import __main__ for mod in ('simpledialog', 'messagebox', 'font', 'dialog', 'filedialog', 'commondialog', - 'colorchooser'): + 'ttk'): delattr(tkinter, mod) del sys.modules['tkinter.' + mod] LOCALHOST = '127.0.0.1' -import warnings + +def idle_formatwarning(message, category, filename, lineno, line=None): + """Format warnings the IDLE way.""" + + s = "\nWarning (from warnings module):\n" + s += ' File \"%s\", line %s\n' % (filename, lineno) + if line is None: + line = linecache.getline(filename, lineno) + line = line.strip() + if line: + s += " %s\n" % line + s += "%s: %s\n" % (category.__name__, message) + return s def idle_showwarning_subproc( message, category, filename, lineno, file=None, line=None): @@ -38,7 +50,7 @@ def idle_showwarning_subproc( if file is None: file = sys.stderr try: - file.write(PyShell.idle_formatwarning( + file.write(idle_formatwarning( message, category, filename, lineno, line)) except IOError: pass # the file (probably stderr) is invalid - this warning gets lost. @@ -88,7 +100,7 @@ def main(del_exitfunc=False): MyHandler object. That reference is saved as attribute rpchandler of the Executive instance. The Executive methods have access to the reference and can pass it on to entities that they command - (e.g. RemoteDebugger.Debugger.start_debugger()). The latter, in turn, can + (e.g. debugger_r.Debugger.start_debugger()). The latter, in turn, can call MyHandler(SocketIO) register/unregister methods via the reference to register and unregister themselves. @@ -210,7 +222,7 @@ def print_exception(): tbe = traceback.extract_tb(tb) print('Traceback (most recent call last):', file=efile) exclude = ("run.py", "rpc.py", "threading.py", "queue.py", - "RemoteDebugger.py", "bdb.py") + "debugger_r.py", "bdb.py") cleanup_traceback(tbe, exclude) traceback.print_list(tbe, file=efile) lines = traceback.format_exception_only(typ, exc) @@ -267,6 +279,7 @@ def exit(): capture_warnings(False) sys.exit(0) + class MyRPCServer(rpc.RPCServer): def handle_error(self, request, client_address): @@ -297,6 +310,96 @@ class MyRPCServer(rpc.RPCServer): quitting = True thread.interrupt_main() + +# Pseudofiles for shell-remote communication (also used in pyshell) + +class PseudoFile(io.TextIOBase): + + def __init__(self, shell, tags, encoding=None): + self.shell = shell + self.tags = tags + self._encoding = encoding + + @property + def encoding(self): + return self._encoding + + @property + def name(self): + return '<%s>' % self.tags + + def isatty(self): + return True + + +class PseudoOutputFile(PseudoFile): + + def writable(self): + return True + + def write(self, s): + if self.closed: + raise ValueError("write to closed file") + if type(s) is not str: + if not isinstance(s, str): + raise TypeError('must be str, not ' + type(s).__name__) + # See issue #19481 + s = str.__str__(s) + return self.shell.write(s, self.tags) + + +class PseudoInputFile(PseudoFile): + + def __init__(self, shell, tags, encoding=None): + PseudoFile.__init__(self, shell, tags, encoding) + self._line_buffer = '' + + def readable(self): + return True + + def read(self, size=-1): + if self.closed: + raise ValueError("read from closed file") + if size is None: + size = -1 + elif not isinstance(size, int): + raise TypeError('must be int, not ' + type(size).__name__) + result = self._line_buffer + self._line_buffer = '' + if size < 0: + while True: + line = self.shell.readline() + if not line: break + result += line + else: + while len(result) < size: + line = self.shell.readline() + if not line: break + result += line + self._line_buffer = result[size:] + result = result[:size] + return result + + def readline(self, size=-1): + if self.closed: + raise ValueError("read from closed file") + if size is None: + size = -1 + elif not isinstance(size, int): + raise TypeError('must be int, not ' + type(size).__name__) + line = self._line_buffer or self.shell.readline() + if size < 0: + size = len(line) + eol = line.find('\n', 0, size) + if eol >= 0: + size = eol + 1 + self._line_buffer = line[size:] + return line[:size] + + def close(self): + self.shell.close() + + class MyHandler(rpc.RPCHandler): def handle(self): @@ -304,12 +407,12 @@ class MyHandler(rpc.RPCHandler): executive = Executive(self) self.register("exec", executive) self.console = self.get_remote_proxy("console") - sys.stdin = PyShell.PseudoInputFile(self.console, "stdin", - IOBinding.encoding) - sys.stdout = PyShell.PseudoOutputFile(self.console, "stdout", - IOBinding.encoding) - sys.stderr = PyShell.PseudoOutputFile(self.console, "stderr", - IOBinding.encoding) + sys.stdin = PseudoInputFile(self.console, "stdin", + iomenu.encoding) + sys.stdout = PseudoOutputFile(self.console, "stdout", + iomenu.encoding) + sys.stderr = PseudoOutputFile(self.console, "stderr", + iomenu.encoding) sys.displayhook = rpc.displayhook # page help() text to shell. @@ -345,8 +448,8 @@ class Executive(object): def __init__(self, rpchandler): self.rpchandler = rpchandler self.locals = __main__.__dict__ - self.calltip = CallTips.CallTips() - self.autocomplete = AutoComplete.AutoComplete() + self.calltip = calltips.CallTips() + self.autocomplete = autocomplete.AutoComplete() def runcode(self, code): global interruptable @@ -378,7 +481,7 @@ class Executive(object): thread.interrupt_main() def start_the_debugger(self, gui_adap_oid): - return RemoteDebugger.start_debugger(self.rpchandler, gui_adap_oid) + return debugger_r.start_debugger(self.rpchandler, gui_adap_oid) def stop_the_debugger(self, idb_adap_oid): "Unregister the Idb Adapter. Link objects and Idb then subject to GC" @@ -402,7 +505,7 @@ class Executive(object): tb = tb.tb_next sys.last_type = typ sys.last_value = val - item = StackViewer.StackTreeItem(flist, tb) - return RemoteObjectBrowser.remote_object_tree_item(item) + item = stackviewer.StackTreeItem(flist, tb) + return debugobj_r.remote_object_tree_item(item) capture_warnings(False) # Make sure turned off; see issue 18081 diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/runscript.py similarity index 95% rename from Lib/idlelib/ScriptBinding.py rename to Lib/idlelib/runscript.py index 5cb818d..79d86ad 100644 --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/runscript.py @@ -20,11 +20,12 @@ XXX GvR Redesign this interface (yet again) as follows: import os import tabnanny import tokenize + import tkinter.messagebox as tkMessageBox -from idlelib import PyShell -from idlelib.configHandler import idleConf -from idlelib import macosxSupport +from idlelib.config import idleConf +from idlelib import macosx +from idlelib import pyshell indent_message = """Error: Inconsistent indentation detected! @@ -46,12 +47,12 @@ class ScriptBinding: def __init__(self, editwin): self.editwin = editwin - # Provide instance variables referenced by Debugger + # Provide instance variables referenced by debugger # XXX This should be done differently self.flist = self.editwin.flist self.root = self.editwin.root - if macosxSupport.isCocoaTk(): + if macosx.isCocoaTk(): self.editwin.text_frame.bind('<>', self._run_module_event) def check_module_event(self, event): @@ -112,7 +113,7 @@ class ScriptBinding: shell.set_warning_stream(saved_stream) def run_module_event(self, event): - if macosxSupport.isCocoaTk(): + if macosx.isCocoaTk(): # Tk-Cocoa in MacOSX is broken until at least # Tk 8.5.9, and without this rather # crude workaround IDLE would hang when a user @@ -142,7 +143,7 @@ class ScriptBinding: if not self.tabnanny(filename): return 'break' interp = self.shell.interp - if PyShell.use_subprocess: + if pyshell.use_subprocess: interp.restart_subprocess(with_cwd=False, filename= self.editwin._filename_to_unicode(filename)) dirname = os.path.dirname(filename) @@ -161,7 +162,7 @@ class ScriptBinding: interp.prepend_syspath(filename) # XXX KBK 03Jul04 When run w/o subprocess, runtime warnings still # go to __stderr__. With subprocess, they go to the shell. - # Need to change streams in PyShell.ModifiedInterpreter. + # Need to change streams in pyshell.ModifiedInterpreter. interp.runcode(code) return 'break' diff --git a/Lib/idlelib/ScrolledList.py b/Lib/idlelib/scrolledlist.py similarity index 91% rename from Lib/idlelib/ScrolledList.py rename to Lib/idlelib/scrolledlist.py index 53576b5..cc08c26 100644 --- a/Lib/idlelib/ScrolledList.py +++ b/Lib/idlelib/scrolledlist.py @@ -1,5 +1,8 @@ from tkinter import * -from idlelib import macosxSupport +from tkinter.ttk import Scrollbar + +from idlelib import macosx + class ScrolledList: @@ -23,7 +26,7 @@ class ScrolledList: # Bind events to the list box listbox.bind("", self.click_event) listbox.bind("", self.double_click_event) - if macosxSupport.isAquaTk(): + if macosx.isAquaTk(): listbox.bind("", self.popup_event) listbox.bind("", self.popup_event) else: @@ -124,22 +127,20 @@ class ScrolledList: pass -def _scrolled_list(parent): - root = Tk() - root.title("Test ScrolledList") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) +def _scrolled_list(parent): # htest # + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x+200, y + 175)) class MyScrolledList(ScrolledList): def fill_menu(self): self.menu.add_command(label="right click") def on_select(self, index): print("select", self.get(index)) def on_double(self, index): print("double", self.get(index)) - scrolled_list = MyScrolledList(root) + scrolled_list = MyScrolledList(top) for i in range(30): scrolled_list.append("Item %02d" % i) - root.mainloop() - if __name__ == '__main__': + # At the moment, test_scrolledlist merely creates instance, like htest. from idlelib.idle_test.htest import run run(_scrolled_list) diff --git a/Lib/idlelib/SearchDialog.py b/Lib/idlelib/search.py similarity index 82% rename from Lib/idlelib/SearchDialog.py rename to Lib/idlelib/search.py index 765d53f..4b90659 100644 --- a/Lib/idlelib/SearchDialog.py +++ b/Lib/idlelib/search.py @@ -1,12 +1,12 @@ -from tkinter import * +from tkinter import TclError -from idlelib import SearchEngine -from idlelib.SearchDialogBase import SearchDialogBase +from idlelib import searchengine +from idlelib.searchbase import SearchDialogBase def _setup(text): "Create or find the singleton SearchDialog instance." root = text._root() - engine = SearchEngine.get(root) + engine = searchengine.get(root) if not hasattr(engine, "_searchdialog"): engine._searchdialog = SearchDialog(root, engine) return engine._searchdialog @@ -24,6 +24,7 @@ def find_selection(text): "Handle the editor edit menu item and corresponding event." return _setup(text).find_selection(text) + class SearchDialog(SearchDialogBase): def create_widgets(self): @@ -51,7 +52,7 @@ class SearchDialog(SearchDialogBase): selfirst = text.index("sel.first") sellast = text.index("sel.last") if selfirst == first and sellast == last: - text.bell() + self.bell() return False except TclError: pass @@ -61,7 +62,7 @@ class SearchDialog(SearchDialogBase): text.see("insert") return True else: - text.bell() + self.bell() return False def find_selection(self, text): @@ -72,26 +73,30 @@ class SearchDialog(SearchDialogBase): def _search_dialog(parent): # htest # - '''Display search test box.''' + "Display search test box." + from tkinter import Toplevel, Text + from tkinter.ttk import Button + box = Toplevel(parent) box.title("Test SearchDialog") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - box.geometry("+%d+%d"%(x, y + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + box.geometry("+%d+%d" % (x, y + 175)) text = Text(box, inactiveselectbackground='gray') text.pack() text.insert("insert","This is a sample string.\n"*5) def show_find(): - text.tag_add(SEL, "1.0", END) + text.tag_add('sel', '1.0', 'end') _setup(text).open(text) - text.tag_remove(SEL, "1.0", END) + text.tag_remove('sel', '1.0', 'end') button = Button(box, text="Search (selection ignored)", command=show_find) button.pack() if __name__ == '__main__': import unittest - unittest.main('idlelib.idle_test.test_searchdialog', + unittest.main('idlelib.idle_test.test_search', verbosity=2, exit=False) + from idlelib.idle_test.htest import run run(_search_dialog) diff --git a/Lib/idlelib/SearchDialogBase.py b/Lib/idlelib/searchbase.py similarity index 86% rename from Lib/idlelib/SearchDialogBase.py rename to Lib/idlelib/searchbase.py index 5fa84e2..5f81785 100644 --- a/Lib/idlelib/SearchDialogBase.py +++ b/Lib/idlelib/searchbase.py @@ -1,7 +1,8 @@ '''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' -from tkinter import (Toplevel, Frame, Entry, Label, Button, - Checkbutton, Radiobutton) +from tkinter import Toplevel, Frame +from tkinter.ttk import Entry, Label, Button, Checkbutton, Radiobutton + class SearchDialogBase: '''Create most of a 3 or 4 row, 3 column search dialog. @@ -79,6 +80,7 @@ class SearchDialogBase: top.wm_title(self.title) top.wm_iconname(self.icon) self.top = top + self.bell = top.bell self.row = 0 self.top.grid_columnconfigure(0, pad=2, weight=0) @@ -125,7 +127,7 @@ class SearchDialogBase: def create_option_buttons(self): '''Return (filled frame, options) for testing. - Options is a list of SearchEngine booleanvar, label pairs. + Options is a list of searchengine booleanvar, label pairs. A gridded frame from make_frame is filled with a Checkbutton for each pair, bound to the var, with the corresponding label. ''' @@ -137,10 +139,8 @@ class SearchDialogBase: if self.needwrapbutton: options.append((engine.wrapvar, "Wrap around")) for var, label in options: - btn = Checkbutton(frame, anchor="w", variable=var, text=label) + btn = Checkbutton(frame, variable=var, text=label) btn.pack(side="left", fill="both") - if var.get(): - btn.select() return frame, options def create_other_buttons(self): @@ -153,11 +153,8 @@ class SearchDialogBase: var = self.engine.backvar others = [(1, 'Up'), (0, 'Down')] for val, label in others: - btn = Radiobutton(frame, anchor="w", - variable=var, value=val, text=label) + btn = Radiobutton(frame, variable=var, value=val, text=label) btn.pack(side="left", fill="both") - if var.get() == val: - btn.select() return frame, others def make_button(self, label, command, isdef=0): @@ -178,7 +175,26 @@ class SearchDialogBase: b = self.make_button("close", self.close) b.lower() + +class _searchbase(SearchDialogBase): # htest # + "Create auto-opening dialog with no text connection." + + def __init__(self, parent): + import re + from idlelib import searchengine + + self.root = parent + self.engine = searchengine.get(parent) + self.create_widgets() + print(parent.geometry()) + width,height, x,y = list(map(int, re.split('[x+]', parent.geometry()))) + self.top.geometry("+%d+%d" % (x + 40, y + 175)) + + def default_command(self, dummy): pass + if __name__ == '__main__': import unittest - unittest.main( - 'idlelib.idle_test.test_searchdialogbase', verbosity=2) + unittest.main('idlelib.idle_test.test_searchbase', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_searchbase) diff --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/searchengine.py similarity index 99% rename from Lib/idlelib/SearchEngine.py rename to Lib/idlelib/searchengine.py index 37883bf..253f1b0 100644 --- a/Lib/idlelib/SearchEngine.py +++ b/Lib/idlelib/searchengine.py @@ -1,5 +1,6 @@ '''Define SearchEngine for search dialogs.''' import re + from tkinter import StringVar, BooleanVar, TclError import tkinter.messagebox as tkMessageBox @@ -14,6 +15,7 @@ def get(root): # This creates a cycle that persists until root is deleted. return root._searchengine + class SearchEngine: """Handles searching a text widget for Find, Replace, and Grep.""" @@ -57,7 +59,7 @@ class SearchEngine: def setcookedpat(self, pat): "Set pattern after escaping if re." - # called only in SearchDialog.py: 66 + # called only in search.py: 66 if self.isre(): pat = re.escape(pat) self.setpat(pat) @@ -186,6 +188,7 @@ class SearchEngine: col = len(chars) - 1 return None + def search_reverse(prog, chars, col): '''Search backwards and return an re match object or None. diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/stackviewer.py similarity index 87% rename from Lib/idlelib/StackViewer.py rename to Lib/idlelib/stackviewer.py index ccc755c..0698def 100644 --- a/Lib/idlelib/StackViewer.py +++ b/Lib/idlelib/stackviewer.py @@ -1,12 +1,12 @@ -import os -import sys import linecache +import os import re +import sys + import tkinter as tk -from idlelib.TreeWidget import TreeNode, TreeItem, ScrolledCanvas -from idlelib.ObjectBrowser import ObjectTreeItem, make_objecttreeitem -from idlelib.PyShell import PyShellFileList +from idlelib.debugobj import ObjectTreeItem, make_objecttreeitem +from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas def StackBrowser(root, flist=None, tb=None, top=None): if top is None: @@ -17,6 +17,7 @@ def StackBrowser(root, flist=None, tb=None, top=None): node = TreeNode(sc.canvas, None, item) node.expand() + class StackTreeItem(TreeItem): def __init__(self, flist=None, tb=None): @@ -55,6 +56,7 @@ class StackTreeItem(TreeItem): sublist.append(item) return sublist + class FrameTreeItem(TreeItem): def __init__(self, info, flist): @@ -96,6 +98,7 @@ class FrameTreeItem(TreeItem): if os.path.isfile(filename): self.flist.gotofileline(filename, lineno) + class VariablesTreeItem(ObjectTreeItem): def GetText(self): @@ -120,15 +123,14 @@ class VariablesTreeItem(ObjectTreeItem): sublist.append(item) return sublist - def keys(self): # unused, left for possible 3rd party use - return list(self.object.keys()) -def _stack_viewer(parent): - root = tk.Tk() - root.title("Test StackViewer") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - flist = PyShellFileList(root) +def _stack_viewer(parent): # htest # + from idlelib.pyshell import PyShellFileList + top = tk.Toplevel(parent) + top.title("Test StackViewer") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x + 50, y + 175)) + flist = PyShellFileList(top) try: # to obtain a traceback object intentional_name_error except NameError: @@ -139,7 +141,7 @@ def _stack_viewer(parent): sys.last_value = exc_value sys.last_traceback = exc_tb - StackBrowser(root, flist=flist, top=root, tb=exc_tb) + StackBrowser(top, flist=flist, top=top, tb=exc_tb) # restore sys to original state del sys.last_type diff --git a/Lib/idlelib/MultiStatusBar.py b/Lib/idlelib/statusbar.py similarity index 52% rename from Lib/idlelib/MultiStatusBar.py rename to Lib/idlelib/statusbar.py index e82ba9a..8618528 100644 --- a/Lib/idlelib/MultiStatusBar.py +++ b/Lib/idlelib/statusbar.py @@ -1,16 +1,15 @@ -from tkinter import * +from tkinter import Frame, Label + class MultiStatusBar(Frame): - def __init__(self, master=None, **kw): - if master is None: - master = Tk() + def __init__(self, master, **kw): Frame.__init__(self, master, **kw) self.labels = {} - def set_label(self, name, text='', side=LEFT, width=0): + def set_label(self, name, text='', side='left', width=0): if name not in self.labels: - label = Label(self, borderwidth=0, anchor=W) + label = Label(self, borderwidth=0, anchor='w') label.pack(side=side, pady=0, padx=4) self.labels[name] = label else: @@ -19,28 +18,28 @@ class MultiStatusBar(Frame): label.config(width=width) label.config(text=text) -def _multistatus_bar(parent): - root = Tk() - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d" %(x, y + 150)) - root.title("Test multistatus bar") - frame = Frame(root) - text = Text(frame) + +def _multistatus_bar(parent): # htest # + from tkinter import Toplevel, Frame, Text, Button + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" %(x, y + 175)) + top.title("Test multistatus bar") + frame = Frame(top) + text = Text(frame, height=5, width=40) text.pack() msb = MultiStatusBar(frame) msb.set_label("one", "hello") msb.set_label("two", "world") - msb.pack(side=BOTTOM, fill=X) + msb.pack(side='bottom', fill='x') def change(): msb.set_label("one", "foo") msb.set_label("two", "bar") - button = Button(root, text="Update status", command=change) - button.pack(side=BOTTOM) + button = Button(top, text="Update status", command=change) + button.pack(side='bottom') frame.pack() - frame.mainloop() - root.mainloop() if __name__ == '__main__': from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/tabbedpages.py b/Lib/idlelib/tabbedpages.py index 965f9f8..4186fa2 100644 --- a/Lib/idlelib/tabbedpages.py +++ b/Lib/idlelib/tabbedpages.py @@ -285,6 +285,7 @@ class TabSet(Frame): # placed hide it self.tab_set.lower() + class TabbedPageSet(Frame): """A Tkinter tabbed-pane widget. @@ -302,6 +303,7 @@ class TabbedPageSet(Frame): remove_page() methods. """ + class Page(object): """Abstract base class for TabbedPageSet's pages. @@ -467,31 +469,29 @@ class TabbedPageSet(Frame): self._tab_set.set_selected_tab(page_name) -def _tabbed_pages(parent): - # test dialog - root=Tk() - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 175)) - root.title("Test tabbed pages") - tabPage=TabbedPageSet(root, page_names=['Foobar','Baz'], n_rows=0, + +def _tabbed_pages(parent): # htest # + top=Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + top.title("Test tabbed pages") + tabPage=TabbedPageSet(top, page_names=['Foobar','Baz'], n_rows=0, expand_tabs=False, ) tabPage.pack(side=TOP, expand=TRUE, fill=BOTH) Label(tabPage.pages['Foobar'].frame, text='Foo', pady=20).pack() Label(tabPage.pages['Foobar'].frame, text='Bar', pady=20).pack() Label(tabPage.pages['Baz'].frame, text='Baz').pack() - entryPgName=Entry(root) - buttonAdd=Button(root, text='Add Page', + entryPgName=Entry(top) + buttonAdd=Button(top, text='Add Page', command=lambda:tabPage.add_page(entryPgName.get())) - buttonRemove=Button(root, text='Remove Page', + buttonRemove=Button(top, text='Remove Page', command=lambda:tabPage.remove_page(entryPgName.get())) - labelPgName=Label(root, text='name of page to add/remove:') + labelPgName=Label(top, text='name of page to add/remove:') buttonAdd.pack(padx=5, pady=5) buttonRemove.pack(padx=5, pady=5) labelPgName.pack(padx=5) entryPgName.pack(padx=5) - root.mainloop() - if __name__ == '__main__': from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/textView.py b/Lib/idlelib/textview.py similarity index 76% rename from Lib/idlelib/textView.py rename to Lib/idlelib/textview.py index 12ac319..adee326 100644 --- a/Lib/idlelib/textView.py +++ b/Lib/idlelib/textview.py @@ -1,14 +1,14 @@ """Simple text browser for IDLE """ - from tkinter import * -import tkinter.messagebox as tkMessageBox +from tkinter.ttk import Scrollbar +from tkinter.messagebox import showerror + class TextViewer(Toplevel): - """A simple text viewer dialog for IDLE + "A simple text viewer dialog for IDLE." - """ def __init__(self, parent, title, text, modal=True, _htest=False): """Show the given text in a scrollable window with a 'close' button @@ -20,11 +20,11 @@ class TextViewer(Toplevel): """ Toplevel.__init__(self, parent) self.configure(borderwidth=5) - # place dialog below parent if running htest + # Place dialog below parent if running htest. self.geometry("=%dx%d+%d+%d" % (750, 500, parent.winfo_rootx() + 10, parent.winfo_rooty() + (10 if not _htest else 100))) - #elguavas - config placeholders til config stuff completed + # TODO: get fg/bg from theme. self.bg = '#ffffff' self.fg = '#000000' @@ -33,9 +33,9 @@ class TextViewer(Toplevel): self.protocol("WM_DELETE_WINDOW", self.Ok) self.parent = parent self.textView.focus_set() - #key bindings for this dialog - self.bind('',self.Ok) #dismiss dialog - self.bind('',self.Ok) #dismiss dialog + # Bind keys for closing this dialog. + self.bind('',self.Ok) + self.bind('',self.Ok) self.textView.insert(0.0, text) self.textView.config(state=DISABLED) @@ -50,7 +50,7 @@ class TextViewer(Toplevel): self.buttonOk = Button(frameButtons, text='Close', command=self.Ok, takefocus=FALSE) self.scrollbarView = Scrollbar(frameText, orient=VERTICAL, - takefocus=FALSE, highlightthickness=0) + takefocus=FALSE) self.textView = Text(frameText, wrap=WORD, highlightthickness=0, fg=self.fg, bg=self.bg) self.scrollbarView.config(command=self.textView.yview) @@ -72,14 +72,14 @@ def view_file(parent, title, filename, encoding=None, modal=True): try: with open(filename, 'r', encoding=encoding) as file: contents = file.read() - except IOError: - tkMessageBox.showerror(title='File Load Error', - message='Unable to load file %r .' % filename, - parent=parent) + except OSError: + showerror(title='File Load Error', + message='Unable to load file %r .' % filename, + parent=parent) except UnicodeDecodeError as err: - tkMessageBox.showerror(title='Unicode Decode Error', - message=str(err), - parent=parent) + showerror(title='Unicode Decode Error', + message=str(err), + parent=parent) else: return view_text(parent, title, contents, modal) diff --git a/Lib/idlelib/ToolTip.py b/Lib/idlelib/tooltip.py similarity index 87% rename from Lib/idlelib/ToolTip.py rename to Lib/idlelib/tooltip.py index 964107e..843fb4a 100644 --- a/Lib/idlelib/ToolTip.py +++ b/Lib/idlelib/tooltip.py @@ -1,4 +1,4 @@ -# general purpose 'tooltip' routines - currently unused in idlefork +# general purpose 'tooltip' routines - currently unused in idlelib # (although the 'calltips' extension is partly based on this code) # may be useful for some purposes in (or almost in ;) the current project scope # Ideas gleaned from PySol @@ -76,21 +76,20 @@ class ListboxToolTip(ToolTipBase): for item in self.items: listbox.insert(END, item) -def _tooltip(parent): - root = Tk() - root.title("Test tooltip") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - label = Label(root, text="Place your mouse over buttons") +def _tooltip(parent): # htest # + top = Toplevel(parent) + top.title("Test tooltip") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 150)) + label = Label(top, text="Place your mouse over buttons") label.pack() - button1 = Button(root, text="Button 1") - button2 = Button(root, text="Button 2") + button1 = Button(top, text="Button 1") + button2 = Button(top, text="Button 2") button1.pack() button2.pack() ToolTip(button1, "This is tooltip text for button1.") ListboxToolTip(button2, ["This is","multiple line", "tooltip text","for button2"]) - root.mainloop() if __name__ == '__main__': from idlelib.idle_test.htest import run diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/tree.py similarity index 97% rename from Lib/idlelib/TreeWidget.py rename to Lib/idlelib/tree.py index a19578f..292ce36 100644 --- a/Lib/idlelib/TreeWidget.py +++ b/Lib/idlelib/tree.py @@ -15,10 +15,12 @@ # - optimize tree redraw after expand of subnode import os + from tkinter import * +from tkinter.ttk import Scrollbar -from idlelib import ZoomHeight -from idlelib.configHandler import idleConf +from idlelib.config import idleConf +from idlelib import zoomheight ICONDIR = "Icons" @@ -445,22 +447,21 @@ class ScrolledCanvas: self.canvas.yview_scroll(1, "unit") return "break" def zoom_height(self, event): - ZoomHeight.zoom_height(self.master) + zoomheight.zoom_height(self.master) return "break" -def _tree_widget(parent): - root = Tk() - root.title("Test TreeWidget") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - root.geometry("+%d+%d"%(x, y + 150)) - sc = ScrolledCanvas(root, bg="white", highlightthickness=0, takefocus=1) +def _tree_widget(parent): # htest # + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x+50, y+175)) + sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1) sc.frame.pack(expand=1, fill="both", side=LEFT) - item = FileTreeItem(os.getcwd()) + item = FileTreeItem(ICONDIR) node = TreeNode(sc.canvas, None, item) node.expand() - root.mainloop() if __name__ == '__main__': + # test_tree is currently a copy of this from idlelib.idle_test.htest import run run(_tree_widget) diff --git a/Lib/idlelib/UndoDelegator.py b/Lib/idlelib/undo.py similarity index 95% rename from Lib/idlelib/UndoDelegator.py rename to Lib/idlelib/undo.py index 1c2502d..4332f10 100644 --- a/Lib/idlelib/UndoDelegator.py +++ b/Lib/idlelib/undo.py @@ -1,7 +1,9 @@ import string -from tkinter import * -from idlelib.Delegator import Delegator +from idlelib.delegator import Delegator + +# tkintter import not needed because module does not create widgets, +# although many methods operate on text widget arguments. #$ event <> #$ win @@ -158,7 +160,6 @@ class UndoDelegator(Delegator): class Command: - # Base class for Undoable commands tags = None @@ -204,7 +205,6 @@ class Command: class InsertCommand(Command): - # Undoable insert command def __init__(self, index1, chars, tags=None): @@ -262,7 +262,6 @@ class InsertCommand(Command): class DeleteCommand(Command): - # Undoable delete command def __init__(self, index1, index2=None): @@ -297,8 +296,8 @@ class DeleteCommand(Command): text.see('insert') ##sys.__stderr__.write("undo: %s\n" % self) -class CommandSequence(Command): +class CommandSequence(Command): # Wrapper for a sequence of undoable cmds to be undone/redone # as a unit @@ -338,13 +337,12 @@ class CommandSequence(Command): def _undo_delegator(parent): # htest # - import re - import tkinter as tk - from idlelib.Percolator import Percolator - undowin = tk.Toplevel() + from tkinter import Toplevel, Text, Button + from idlelib.percolator import Percolator + undowin = Toplevel(parent) undowin.title("Test UndoDelegator") - width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) - undowin.geometry("+%d+%d"%(x, y + 150)) + x, y = map(int, parent.geometry().split('+')[1:]) + undowin.geometry("+%d+%d" % (x, y + 175)) text = Text(undowin, height=10) text.pack() @@ -362,7 +360,7 @@ def _undo_delegator(parent): # htest # if __name__ == "__main__": import unittest - unittest.main('idlelib.idle_test.test_undodelegator', verbosity=2, - exit=False) + unittest.main('idlelib.idle_test.test_undo', verbosity=2, exit=False) + from idlelib.idle_test.htest import run run(_undo_delegator) diff --git a/Lib/idlelib/WindowList.py b/Lib/idlelib/windows.py similarity index 99% rename from Lib/idlelib/WindowList.py rename to Lib/idlelib/windows.py index bc74348..a3f858a 100644 --- a/Lib/idlelib/WindowList.py +++ b/Lib/idlelib/windows.py @@ -1,5 +1,6 @@ from tkinter import * + class WindowList: def __init__(self): @@ -48,6 +49,7 @@ class WindowList: t, v, tb = sys.exc_info() print("warning: callback failed in WindowList", t, ":", v) + registry = WindowList() add_windows_to_menu = registry.add_windows_to_menu diff --git a/Lib/idlelib/ZoomHeight.py b/Lib/idlelib/zoomheight.py similarity index 94% rename from Lib/idlelib/ZoomHeight.py rename to Lib/idlelib/zoomheight.py index a5d679e..aa4a427 100644 --- a/Lib/idlelib/ZoomHeight.py +++ b/Lib/idlelib/zoomheight.py @@ -3,7 +3,8 @@ import re import sys -from idlelib import macosxSupport +from idlelib import macosx + class ZoomHeight: @@ -20,6 +21,7 @@ class ZoomHeight: top = self.editwin.top zoom_height(top) + def zoom_height(top): geom = top.wm_geometry() m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom) @@ -32,7 +34,7 @@ def zoom_height(top): newy = 0 newheight = newheight - 72 - elif macosxSupport.isAquaTk(): + elif macosx.isAquaTk(): # The '88' below is a magic number that avoids placing the bottom # of the window below the panel on my machine. I don't know how # to calculate the correct value for this with tkinter. diff --git a/Lib/imaplib.py b/Lib/imaplib.py index ef2c6f8..cad508a 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -111,7 +111,15 @@ InternalDate = re.compile(br'.*INTERNALDATE "' # Literal is no longer used; kept for backward compatibility. Literal = re.compile(br'.*{(?P\d+)}$', re.ASCII) MapCRLF = re.compile(br'\r\n|\r|\n') -Response_code = re.compile(br'\[(?P[A-Z-]+)( (?P[^\]]*))?\]') +# We no longer exclude the ']' character from the data portion of the response +# code, even though it violates the RFC. Popular IMAP servers such as Gmail +# allow flags with ']', and there are programs (including imaplib!) that can +# produce them. The problem with this is if the 'text' portion of the response +# includes a ']' we'll parse the response wrong (which is the point of the RFC +# restriction). However, that seems less likely to be a problem in practice +# than being unable to correctly parse flags that include ']' chars, which +# was reported as a real-world problem in issue #21815. +Response_code = re.compile(br'\[(?P[A-Z-]+)( (?P.*))?\]') Untagged_response = re.compile(br'\* (?P[A-Z-]+)( (?P.*))?') # Untagged_status is no longer used; kept for backward compatibility Untagged_status = re.compile( @@ -124,7 +132,7 @@ _Untagged_status = br'\* (?P\d+) (?P[A-Z-]+)( (?P.*))?' class IMAP4: - """IMAP4 client class. + r"""IMAP4 client class. Instantiate with: IMAP4([host[, port]]) @@ -310,12 +318,9 @@ class IMAP4: self.file.close() try: self.sock.shutdown(socket.SHUT_RDWR) - except OSError as exc: - # The server might already have closed the connection. - # On Windows, this may result in WSAEINVAL (error 10022): - # An invalid operation was attempted. - if (exc.errno != errno.ENOTCONN - and getattr(exc, 'winerror', 0) != 10022): + except OSError as e: + # The server might already have closed the connection + if e.errno != errno.ENOTCONN: raise finally: self.sock.close() @@ -414,7 +419,7 @@ class IMAP4: self.literal = _Authenticator(authobject).process typ, dat = self._simple_command('AUTHENTICATE', mech) if typ != 'OK': - raise self.error(dat[-1].decode('utf-8', 'replace')) + raise self.error(dat[-1]) self.state = 'AUTH' return typ, dat @@ -1262,7 +1267,10 @@ if HAVE_SSL: if ssl_context is not None and certfile is not None: raise ValueError("ssl_context and certfile arguments are mutually " "exclusive") - + if keyfile is not None or certfile is not None: + import warnings + warnings.warn("keyfile and certfile are deprecated, use a" + "custom ssl_context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile if ssl_context is None: @@ -1530,7 +1538,7 @@ if __name__ == '__main__': ('select', ('/tmp/yyz 2',)), ('search', (None, 'SUBJECT', 'test')), ('fetch', ('1', '(FLAGS INTERNALDATE RFC822)')), - ('store', ('1', 'FLAGS', '(\Deleted)')), + ('store', ('1', 'FLAGS', r'(\Deleted)')), ('namespace', ()), ('expunge', ()), ('recent', ()), diff --git a/Lib/imghdr.py b/Lib/imghdr.py index b267925..76e8abb 100644 --- a/Lib/imghdr.py +++ b/Lib/imghdr.py @@ -1,5 +1,7 @@ """Recognize image file formats based on their first few bytes.""" +from os import PathLike + __all__ = ["what"] #-------------------------# @@ -10,7 +12,7 @@ def what(file, h=None): f = None try: if h is None: - if isinstance(file, str): + if isinstance(file, (str, PathLike)): f = open(file, 'rb') h = f.read(32) else: diff --git a/Lib/imp.py b/Lib/imp.py index af0790f..781ff23 100644 --- a/Lib/imp.py +++ b/Lib/imp.py @@ -30,7 +30,7 @@ import warnings warnings.warn("the imp module is deprecated in favour of importlib; " "see the module's documentation for alternative uses", - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) # DEPRECATED SEARCH_ERROR = 0 @@ -203,9 +203,8 @@ def load_package(name, path): extensions = (machinery.SOURCE_SUFFIXES[:] + machinery.BYTECODE_SUFFIXES[:]) for extension in extensions: - init_path = os.path.join(path, '__init__' + extension) - if os.path.exists(init_path): - path = init_path + path = os.path.join(path, '__init__'+extension) + if os.path.exists(path): break else: raise ValueError('{!r} is not a package'.format(path)) diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py index 8b11d22..b6a9f82 100644 --- a/Lib/importlib/__init__.py +++ b/Lib/importlib/__init__.py @@ -136,7 +136,7 @@ def reload(module): """ if not module or not isinstance(module, types.ModuleType): - raise TypeError("reload() argument must be a module") + raise TypeError("reload() argument must be module") try: name = module.__spec__.name except AttributeError: diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 02fe05b..a531a03 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -36,23 +36,6 @@ def _new_module(name): return type(sys)(name) -class _ManageReload: - - """Manages the possible clean-up of sys.modules for load_module().""" - - def __init__(self, name): - self._name = name - - def __enter__(self): - self._is_reload = self._name in sys.modules - - def __exit__(self, *args): - if any(arg is not None for arg in args) and not self._is_reload: - try: - del sys.modules[self._name] - except KeyError: - pass - # Module-level locking ######################################################## # A dict mapping module names to weakrefs of _ModuleLock instances @@ -270,7 +253,7 @@ def _load_module_shim(self, fullname): # Module specifications ####################################################### def _module_repr(module): - # The implementation of ModuleType__repr__(). + # The implementation of ModuleType.__repr__(). loader = getattr(module, '__loader__', None) if hasattr(loader, 'module_repr'): # As soon as BuiltinImporter, FrozenImporter, and NamespaceLoader @@ -576,9 +559,8 @@ def module_from_spec(spec): # module creation should be used. module = spec.loader.create_module(spec) elif hasattr(spec.loader, 'exec_module'): - _warnings.warn('starting in Python 3.6, loaders defining exec_module() ' - 'must also define create_module()', - DeprecationWarning, stacklevel=2) + raise ImportError('loaders that define exec_module() ' + 'must also define create_module()') if module is None: module = _new_module(spec.name) _init_module_attrs(spec, module) @@ -603,7 +585,7 @@ def _module_repr_from_spec(spec): # Used by importlib.reload() and _load_module_shim(). def _exec(spec, module): - """Execute the spec in an existing module's namespace.""" + """Execute the spec's specified module in an existing module's namespace.""" name = spec.name _imp.acquire_lock() with _ModuleLockManager(name): @@ -877,14 +859,21 @@ def _find_spec_legacy(finder, name, path): def _find_spec(name, path, target=None): - """Find a module's loader.""" - if sys.meta_path is not None and not sys.meta_path: + """Find a module's spec.""" + meta_path = sys.meta_path + if meta_path is None: + # PyImport_Cleanup() is running or has been called. + raise ImportError("sys.meta_path is None, Python is likely " + "shutting down") + + if not meta_path: _warnings.warn('sys.meta_path is empty', ImportWarning) + # We check sys.modules here for the reload case. While a passed-in # target will usually indicate a reload there is no guarantee, whereas # sys.modules provides one. is_reload = name in sys.modules - for finder in sys.meta_path: + for finder in meta_path: with _ImportLockContext(): try: find_spec = finder.find_spec @@ -928,6 +917,10 @@ def _sanity_check(name, package, level): elif not package: raise ImportError('attempted relative import with no known parent ' 'package') + elif package not in sys.modules: + msg = ('Parent module {!r} not loaded, cannot perform relative ' + 'import') + raise SystemError(msg.format(package)) if not name and level == 0: raise ValueError('Empty module name') @@ -949,10 +942,10 @@ def _find_and_load_unlocked(name, import_): path = parent_module.__path__ except AttributeError: msg = (_ERR_MSG + '; {!r} is not a package').format(name, parent) - raise ImportError(msg, name=name) from None + raise ModuleNotFoundError(msg, name=name) from None spec = _find_spec(name, path) if spec is None: - raise ImportError(_ERR_MSG.format(name), name=name) + raise ModuleNotFoundError(_ERR_MSG.format(name), name=name) else: module = _load_unlocked(spec) if parent: @@ -988,10 +981,11 @@ def _gcd_import(name, package=None, level=0): _imp.release_lock() message = ('import of {} halted; ' 'None in sys.modules'.format(name)) - raise ImportError(message, name=name) + raise ModuleNotFoundError(message, name=name) _lock_unlock_module(name) return module + def _handle_fromlist(module, fromlist, import_): """Figure out what __import__ should return. @@ -1013,13 +1007,12 @@ def _handle_fromlist(module, fromlist, import_): from_name = '{}.{}'.format(module.__name__, x) try: _call_with_frames_removed(import_, from_name) - except ImportError as exc: + except ModuleNotFoundError as exc: # Backwards-compatibility dictates we ignore failed # imports triggered by fromlist for modules that don't # exist. - if str(exc).startswith(_ERR_MSG_PREFIX): - if exc.name == from_name: - continue + if exc.name == from_name: + continue raise return module @@ -1032,7 +1025,19 @@ def _calc___package__(globals): """ package = globals.get('__package__') - if package is None: + spec = globals.get('__spec__') + if package is not None: + if spec is not None and package != spec.parent: + _warnings.warn("__package__ != __spec__.parent " + f"({package!r} != {spec.parent!r})", + ImportWarning, stacklevel=3) + return package + elif spec is not None: + return spec.parent + else: + _warnings.warn("can't resolve package from __spec__ or __package__, " + "falling back on __name__ and __path__", + ImportWarning, stacklevel=3) package = globals['__name__'] if '__path__' not in globals: package = package.rpartition('.')[0] diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py index 506bb33..ab43446 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -137,10 +137,6 @@ _code_type = type(_write_atomic.__code__) # a .pyc file in text mode the magic number will be wrong; also, the # Apple MPW compiler swaps their values, botching string constants. # -# The magic numbers must be spaced apart at least 2 values, as the -# -U interpeter flag will cause MAGIC+1 being used. They have been -# odd numbers for some time now. -# # There were a variety of old schemes for setting the magic number. # The current working scheme is to increment the previous value by # 10. @@ -230,7 +226,20 @@ _code_type = type(_write_atomic.__code__) # Python 3.5b1 3330 (PEP 448: Additional Unpacking Generalizations) # Python 3.5b2 3340 (fix dictionary display evaluation order #11205) # Python 3.5b2 3350 (add GET_YIELD_FROM_ITER opcode #24400) -# Python 3.5.3 3351 (fix BUILD_MAP_UNPACK_WITH_CALL opcode #27286) +# Python 3.5.2 3351 (fix BUILD_MAP_UNPACK_WITH_CALL opcode #27286) +# Python 3.6a0 3360 (add FORMAT_VALUE opcode #25483 +# Python 3.6a0 3361 (lineno delta of code.co_lnotab becomes signed) +# Python 3.6a1 3370 (16 bit wordcode) +# Python 3.6a1 3371 (add BUILD_CONST_KEY_MAP opcode #27140) +# Python 3.6a1 3372 (MAKE_FUNCTION simplification, remove MAKE_CLOSURE +# #27095) +# Python 3.6b1 3373 (add BUILD_STRING opcode #27078) +# Python 3.6b1 3375 (add SETUP_ANNOTATIONS and STORE_ANNOTATION opcodes +# #27985) +# Python 3.6b1 3376 (simplify CALL_FUNCTIONs & BUILD_MAP_UNPACK_WITH_CALL) +# Python 3.6b1 3377 (set __class__ cell from type.__new__ #23722) +# Python 3.6b2 3378 (add BUILD_TUPLE_UNPACK_WITH_CALL #28257) +# Python 3.6rc1 3379 (more thorough __class__ validation #23722) # # MAGIC must change whenever the bytecode emitted by the compiler may no # longer be understood by older implementations of the eval loop (usually @@ -239,31 +248,9 @@ _code_type = type(_write_atomic.__code__) # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array # in PC/launcher.c must also be updated. -MAGIC_NUMBER = (3351).to_bytes(2, 'little') + b'\r\n' +MAGIC_NUMBER = (3379).to_bytes(2, 'little') + b'\r\n' _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c -# Issue #29537: handle issue27286 bytecode incompatibility -# -# The magic number bump in Python 3.5.3 for issue27286 turned out to create -# significant backwards compatibility problems for redistributors and -# other folks that rely on the bytecode format remaining stable within a -# given maintenance release series. See http://bugs.python.org/issue29514 -# for more discussion of the problems that the original change caused. -# -# The _BACKCOMPAT_MAGIC_NUMBER below and any other changes marked with -# "Issue #29537" comments allow Python 3.5.4+ to load bytecode files with both -# the original 3.5.0 magic number and those with the updated magic number used -# since 3.5.3. -# -# This is expected to be a one-off change used solely to restore legacy -# bytecode compatibility within the 3.5.x series, so it avoids any changes -# that would prompt a rebuild of C extension modules. -# -if _RAW_MAGIC_NUMBER != 168627479: - _msg = 'Magic number mismatch (the issue27286 workaround is for 3.5 only)' - raise SystemError(_msg) -_BACKCOMPAT_MAGIC_NUMBER = (3350).to_bytes(2, 'little') + b'\r\n' - _PYCACHE = '__pycache__' _OPT = 'opt-' @@ -298,6 +285,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): message = 'debug_override or optimization must be set to None' raise TypeError(message) optimization = '' if debug_override else 1 + path = _os.fspath(path) head, tail = _path_split(path) base, sep, rest = tail.rpartition('.') tag = sys.implementation.cache_tag @@ -328,6 +316,7 @@ def source_from_cache(path): """ if sys.implementation.cache_tag is None: raise NotImplementedError('sys.implementation.cache_tag is None') + path = _os.fspath(path) head, pycache_filename = _path_split(path) head, pycache = _path_split(head) if pycache != _PYCACHE: @@ -393,14 +382,6 @@ def _calc_mode(path): return mode -def _verbose_message(message, *args, verbosity=1): - """Print the message to stderr if -v/PYTHONVERBOSE is turned on.""" - if sys.flags.verbose >= verbosity: - if not message.startswith(('#', 'import ')): - message = '# ' + message - print(message.format(*args), file=sys.stderr) - - def _check_name(method): """Decorator to verify that the module being requested matches the one the loader can handle. @@ -468,19 +449,17 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None): magic = data[:4] raw_timestamp = data[4:8] raw_size = data[8:12] - if (magic != MAGIC_NUMBER - # Issue #29537: handle issue27286 bytecode incompatibility - and magic != _BACKCOMPAT_MAGIC_NUMBER): + if magic != MAGIC_NUMBER: message = 'bad magic number in {!r}: {!r}'.format(name, magic) - _verbose_message('{}', message) + _bootstrap._verbose_message('{}', message) raise ImportError(message, **exc_details) elif len(raw_timestamp) != 4: message = 'reached EOF while reading timestamp in {!r}'.format(name) - _verbose_message('{}', message) + _bootstrap._verbose_message('{}', message) raise EOFError(message) elif len(raw_size) != 4: message = 'reached EOF while reading size of source in {!r}'.format(name) - _verbose_message('{}', message) + _bootstrap._verbose_message('{}', message) raise EOFError(message) if source_stats is not None: try: @@ -490,7 +469,7 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None): else: if _r_long(raw_timestamp) != source_mtime: message = 'bytecode is stale for {!r}'.format(name) - _verbose_message('{}', message) + _bootstrap._verbose_message('{}', message) raise ImportError(message, **exc_details) try: source_size = source_stats['size'] & 0xFFFFFFFF @@ -507,7 +486,7 @@ def _compile_bytecode(data, name=None, bytecode_path=None, source_path=None): """Compile bytecode as returned by _validate_bytecode_header().""" code = marshal.loads(data) if isinstance(code, _code_type): - _verbose_message('code object from {!r}', bytecode_path) + _bootstrap._verbose_message('code object from {!r}', bytecode_path) if source_path is not None: _imp._fix_co_filename(code, source_path) return code @@ -565,6 +544,8 @@ def spec_from_file_location(name, location=None, *, loader=None, location = loader.get_filename(name) except ImportError: pass + else: + location = _os.fspath(location) # If the location is on the filesystem, but doesn't actually exist, # we could return None here, indicating that the location is not @@ -634,7 +615,7 @@ class WindowsRegistryFinder: else: registry_key = cls.REGISTRY_KEY key = registry_key.format(fullname=fullname, - sys_version=sys.version[:3]) + sys_version='%d.%d' % sys.version_info[:2]) try: with cls._open_registry(key) as hkey: filepath = _winreg.QueryValue(hkey, '') @@ -697,6 +678,7 @@ class _LoaderBasics: _bootstrap._call_with_frames_removed(exec, code, module.__dict__) def load_module(self, fullname): + """This module is deprecated.""" return _bootstrap._load_module_shim(self, fullname) @@ -790,21 +772,21 @@ class SourceLoader(_LoaderBasics): except (ImportError, EOFError): pass else: - _verbose_message('{} matches {}', bytecode_path, - source_path) + _bootstrap._verbose_message('{} matches {}', bytecode_path, + source_path) return _compile_bytecode(bytes_data, name=fullname, bytecode_path=bytecode_path, source_path=source_path) source_bytes = self.get_data(source_path) code_object = self.source_to_code(source_bytes, source_path) - _verbose_message('code object from {}', source_path) + _bootstrap._verbose_message('code object from {}', source_path) if (not sys.dont_write_bytecode and bytecode_path is not None and source_mtime is not None): data = _code_to_bytecode(code_object, source_mtime, len(source_bytes)) try: self._cache_bytecode(source_path, bytecode_path, data) - _verbose_message('wrote {!r}', bytecode_path) + _bootstrap._verbose_message('wrote {!r}', bytecode_path) except NotImplementedError: pass return code_object @@ -884,14 +866,16 @@ class SourceFileLoader(FileLoader, SourceLoader): except OSError as exc: # Could be a permission error, read-only filesystem: just forget # about writing the data. - _verbose_message('could not create {!r}: {!r}', parent, exc) + _bootstrap._verbose_message('could not create {!r}: {!r}', + parent, exc) return try: _write_atomic(path, data, _mode) - _verbose_message('created {!r}', path) + _bootstrap._verbose_message('created {!r}', path) except OSError as exc: # Same as above: just don't write the bytecode. - _verbose_message('could not create {!r}: {!r}', path, exc) + _bootstrap._verbose_message('could not create {!r}: {!r}', path, + exc) class SourcelessFileLoader(FileLoader, _LoaderBasics): @@ -936,14 +920,14 @@ class ExtensionFileLoader(FileLoader, _LoaderBasics): """Create an unitialized extension module""" module = _bootstrap._call_with_frames_removed( _imp.create_dynamic, spec) - _verbose_message('extension module {!r} loaded from {!r}', + _bootstrap._verbose_message('extension module {!r} loaded from {!r}', spec.name, self.path) return module def exec_module(self, module): """Initialize an extension module""" _bootstrap._call_with_frames_removed(_imp.exec_dynamic, module) - _verbose_message('extension module {!r} executed from {!r}', + _bootstrap._verbose_message('extension module {!r} executed from {!r}', self.name, self.path) def is_package(self, fullname): @@ -1009,6 +993,9 @@ class _NamespacePath: def __iter__(self): return iter(self._recalculate()) + def __setitem__(self, index, path): + self._path[index] = path + def __len__(self): return len(self._recalculate()) @@ -1058,7 +1045,8 @@ class _NamespaceLoader: """ # The import system never calls this method. - _verbose_message('namespace module loaded with path {!r}', self._path) + _bootstrap._verbose_message('namespace module loaded with path {!r}', + self._path) return _bootstrap._load_module_shim(self, fullname) @@ -1078,11 +1066,7 @@ class PathFinder: @classmethod def _path_hooks(cls, path): - """Search sequence of hooks for a finder for 'path'. - - If 'hooks' is false then use sys.path_hooks. - - """ + """Search sys.path_hooks for a finder for 'path'.""" if sys.path_hooks is not None and not sys.path_hooks: _warnings.warn('sys.path_hooks is empty', ImportWarning) for hook in sys.path_hooks: @@ -1164,8 +1148,10 @@ class PathFinder: @classmethod def find_spec(cls, fullname, path=None, target=None): - """find the module on sys.path or 'path' based on sys.path_hooks and - sys.path_importer_cache.""" + """Try to find a spec for 'fullname' on sys.path or 'path'. + + The search is based on sys.path_hooks and sys.path_importer_cache. + """ if path is None: path = sys.path spec = cls._get_spec(fullname, path, target) @@ -1245,8 +1231,10 @@ class FileFinder: submodule_search_locations=smsl) def find_spec(self, fullname, target=None): - """Try to find a spec for the specified module. Returns the - matching spec, or None if not found.""" + """Try to find a spec for the specified module. + + Returns the matching spec, or None if not found. + """ is_namespace = False tail_module = fullname.rpartition('.')[2] try: @@ -1278,12 +1266,13 @@ class FileFinder: # Check for a file w/ a proper suffix exists. for suffix, loader_class in self._loaders: full_path = _path_join(self.path, tail_module + suffix) - _verbose_message('trying {}'.format(full_path), verbosity=2) + _bootstrap._verbose_message('trying {}', full_path, verbosity=2) if cache_module + suffix in cache: if _path_isfile(full_path): - return self._get_spec(loader_class, fullname, full_path, None, target) + return self._get_spec(loader_class, fullname, full_path, + None, target) if is_namespace: - _verbose_message('possible namespace for {}'.format(base_path)) + _bootstrap._verbose_message('possible namespace for {}', base_path) spec = _bootstrap.ModuleSpec(fullname, None) spec.submodule_search_locations = [base_path] return spec @@ -1454,8 +1443,3 @@ def _install(_bootstrap_module): if _os.__name__ == 'nt': sys.meta_path.append(WindowsRegistryFinder) sys.meta_path.append(PathFinder) - - # XXX We expose a couple of classes in _bootstrap for the sake of - # a setuptools bug (https://bitbucket.org/pypa/setuptools/issue/378). - _bootstrap_module.FileFinder = FileFinder - _bootstrap_module.SourceFileLoader = SourceFileLoader diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py index a15cf00..6bdf0d4 100644 --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -4,7 +4,7 @@ from ._bootstrap import module_from_spec from ._bootstrap import _resolve_name from ._bootstrap import spec_from_loader from ._bootstrap import _find_spec -from ._bootstrap_external import MAGIC_NUMBER, _BACKCOMPAT_MAGIC_NUMBER +from ._bootstrap_external import MAGIC_NUMBER from ._bootstrap_external import cache_from_source from ._bootstrap_external import decode_source from ._bootstrap_external import source_from_cache @@ -22,8 +22,8 @@ def resolve_name(name, package): if not name.startswith('.'): return name elif not package: - raise ValueError('{!r} is not a relative name ' - '(no leading dot)'.format(name)) + raise ValueError(f'no package specified for {repr(name)} ' + '(required for relative module names)') level = 0 for character in name: if character != '.': @@ -204,11 +204,6 @@ def module_for_loader(fxn): return module_for_loader_wrapper -class _Module(types.ModuleType): - - """A subclass of the module type to allow __class__ manipulation.""" - - class _LazyModule(types.ModuleType): """A subclass of the module type which triggers loading upon attribute access.""" @@ -218,13 +213,14 @@ class _LazyModule(types.ModuleType): # All module metadata must be garnered from __spec__ in order to avoid # using mutated values. # Stop triggering this method. - self.__class__ = _Module + self.__class__ = types.ModuleType # Get the original name to make sure no object substitution occurred # in sys.modules. original_name = self.__spec__.name # Figure out exactly what attributes were mutated between the creation # of the module and now. - attrs_then = self.__spec__.loader_state + attrs_then = self.__spec__.loader_state['__dict__'] + original_type = self.__spec__.loader_state['__class__'] attrs_now = self.__dict__ attrs_updated = {} for key, value in attrs_now.items(): @@ -239,9 +235,9 @@ class _LazyModule(types.ModuleType): # object was put into sys.modules. if original_name in sys.modules: if id(self) != id(sys.modules[original_name]): - msg = ('module object for {!r} substituted in sys.modules ' - 'during a lazy load') - raise ValueError(msg.format(original_name)) + raise ValueError(f"module object for {original_name!r} " + "substituted in sys.modules during a lazy " + "load") # Update after loading since that's what would happen in an eager # loading situation. self.__dict__.update(attrs_updated) @@ -275,8 +271,7 @@ class LazyLoader(abc.Loader): self.loader = loader def create_module(self, spec): - """Create a module which can have its __class__ manipulated.""" - return _Module(spec.name) + return self.loader.create_module(spec) def exec_module(self, module): """Make the module load lazily.""" @@ -286,5 +281,8 @@ class LazyLoader(abc.Loader): # on an object would have triggered the load, # e.g. ``module.__spec__.loader = None`` would trigger a load from # trying to access module.__spec__. - module.__spec__.loader_state = module.__dict__.copy() + loader_state = {} + loader_state['__dict__'] = module.__dict__.copy() + loader_state['__class__'] = module.__class__ + module.__spec__.loader_state = loader_state module.__class__ = _LazyModule diff --git a/Lib/inspect.py b/Lib/inspect.py index 424c945..e08e9f5 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -16,7 +16,7 @@ Here are some of the useful functions provided by this module: getmodule() - determine the module that an object came from getclasstree() - arrange classes so as to represent their hierarchy - getargspec(), getargvalues(), getcallargs() - get info about function arguments + getargvalues(), getcallargs() - get info about function arguments getfullargspec() - same, with support for Python 3 features formatargspec(), formatargvalues() - format an argument spec getouterframes(), getinnerframes() - get info about frames @@ -179,12 +179,24 @@ def isgeneratorfunction(object): def iscoroutinefunction(object): """Return true if the object is a coroutine function. - Coroutine functions are defined with "async def" syntax, - or generators decorated with "types.coroutine". + Coroutine functions are defined with "async def" syntax. """ return bool((isfunction(object) or ismethod(object)) and object.__code__.co_flags & CO_COROUTINE) +def isasyncgenfunction(object): + """Return true if the object is an asynchronous generator function. + + Asynchronous generator functions are defined with "async def" + syntax and have "yield" expressions in their body. + """ + return bool((isfunction(object) or ismethod(object)) and + object.__code__.co_flags & CO_ASYNC_GENERATOR) + +def isasyncgen(object): + """Return true if the object is an asynchronous generator.""" + return isinstance(object, types.AsyncGeneratorType) + def isgenerator(object): """Return true if the object is a generator. @@ -241,24 +253,18 @@ def iscode(object): """Return true if the object is a code object. Code objects provide these attributes: - co_argcount number of arguments (not including *, ** args - or keyword only arguments) - co_code string of raw compiled bytecode - co_cellvars tuple of names of cell variables - co_consts tuple of constants used in the bytecode - co_filename name of file in which this code object was created - co_firstlineno number of first line in Python source code - co_flags bitmap: 1=optimized | 2=newlocals | 4=*arg | 8=**arg - | 16=nested | 32=generator | 64=nofree | 128=coroutine - | 256=iterable_coroutine - co_freevars tuple of names of free variables - co_kwonlyargcount number of keyword only arguments (not including ** arg) - co_lnotab encoded mapping of line numbers to bytecode indices - co_name name with which this code object was defined - co_names tuple of names of local variables - co_nlocals number of local variables - co_stacksize virtual machine stack space required - co_varnames tuple of names of arguments and local variables""" + co_argcount number of arguments (not including * or ** args) + co_code string of raw compiled bytecode + co_consts tuple of constants used in the bytecode + co_filename name of file in which this code object was created + co_firstlineno number of first line in Python source code + co_flags bitmap: 1=optimized | 2=newlocals | 4=*arg | 8=**arg + co_lnotab encoded mapping of line numbers to bytecode indices + co_name name with which this code object was defined + co_names tuple of names of local variables + co_nlocals number of local variables + co_stacksize virtual machine stack space required + co_varnames tuple of names of arguments and local variables""" return isinstance(object, types.CodeType) def isbuiltin(object): @@ -629,23 +635,6 @@ def getfile(object): raise TypeError('{!r} is not a module, class, method, ' 'function, traceback, frame, or code object'.format(object)) -ModuleInfo = namedtuple('ModuleInfo', 'name suffix mode module_type') - -def getmoduleinfo(path): - """Get the module name, suffix, mode, and module type for a given file.""" - warnings.warn('inspect.getmoduleinfo() is deprecated', DeprecationWarning, - 2) - with warnings.catch_warnings(): - warnings.simplefilter('ignore', PendingDeprecationWarning) - import imp - filename = os.path.basename(path) - suffixes = [(-len(suffix), suffix, mode, mtype) - for suffix, mode, mtype in imp.get_suffixes()] - suffixes.sort() # try longest suffixes first, in case they overlap - for neglen, suffix, mode, mtype in suffixes: - if filename[neglen:] == suffix: - return ModuleInfo(filename[:neglen], suffix, mode, mtype) - def getmodulename(path): """Return the module name for a given file, or None.""" fname = os.path.basename(path) @@ -1030,24 +1019,30 @@ def _getfullargs(co): ArgSpec = namedtuple('ArgSpec', 'args varargs keywords defaults') def getargspec(func): - """Get the names and default values of a function's arguments. + """Get the names and default values of a function's parameters. A tuple of four things is returned: (args, varargs, keywords, defaults). 'args' is a list of the argument names, including keyword-only argument names. - 'varargs' and 'keywords' are the names of the * and ** arguments or None. - 'defaults' is an n-tuple of the default values of the last n arguments. + 'varargs' and 'keywords' are the names of the * and ** parameters or None. + 'defaults' is an n-tuple of the default values of the last n parameters. + + This function is deprecated, as it does not support annotations or + keyword-only parameters and will raise ValueError if either is present + on the supplied callable. - Use the getfullargspec() API for Python 3 code, as annotations - and keyword arguments are supported. getargspec() will raise ValueError - if the func has either annotations or keyword arguments. + For a more structured introspection API, use inspect.signature() instead. + + Alternatively, use getfullargspec() for an API with a similar namedtuple + based interface, but full support for annotations and keyword-only + parameters. """ warnings.warn("inspect.getargspec() is deprecated, " - "use inspect.signature() instead", DeprecationWarning, - stacklevel=2) + "use inspect.signature() or inspect.getfullargspec()", + DeprecationWarning, stacklevel=2) args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, ann = \ getfullargspec(func) if kwonlyargs or ann: - raise ValueError("Function has keyword-only arguments or annotations" + raise ValueError("Function has keyword-only parameters or annotations" ", use getfullargspec() API which can support them") return ArgSpec(args, varargs, varkw, defaults) @@ -1055,20 +1050,20 @@ FullArgSpec = namedtuple('FullArgSpec', 'args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations') def getfullargspec(func): - """Get the names and default values of a callable object's arguments. + """Get the names and default values of a callable object's parameters. A tuple of seven things is returned: - (args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults annotations). - 'args' is a list of the argument names. - 'varargs' and 'varkw' are the names of the * and ** arguments or None. - 'defaults' is an n-tuple of the default values of the last n arguments. - 'kwonlyargs' is a list of keyword-only argument names. + (args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations). + 'args' is a list of the parameter names. + 'varargs' and 'varkw' are the names of the * and ** parameters or None. + 'defaults' is an n-tuple of the default values of the last n parameters. + 'kwonlyargs' is a list of keyword-only parameter names. 'kwonlydefaults' is a dictionary mapping names from kwonlyargs to defaults. - 'annotations' is a dictionary mapping argument names to annotations. - - The first four items in the tuple correspond to getargspec(). + 'annotations' is a dictionary mapping parameter names to annotations. - This function is deprecated, use inspect.signature() instead. + Notable differences from inspect.signature(): + - the "self" parameter is always reported, even for bound methods + - wrapper chains defined by __wrapped__ *not* unwrapped automatically """ try: @@ -1180,8 +1175,7 @@ def formatargspec(args, varargs=None, varkw=None, defaults=None, formatvalue=lambda value: '=' + repr(value), formatreturns=lambda text: ' -> ' + text, formatannotation=formatannotation): - """Format an argument spec from the values returned by getargspec - or getfullargspec. + """Format an argument spec from the values returned by getfullargspec. The first seven arguments are (args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, annotations). The other five arguments @@ -1422,6 +1416,7 @@ def getframeinfo(frame, context=1): except OSError: lines = index = None else: + start = max(start, 1) start = max(0, min(start, len(lines) - context)) lines = lines[start:start+context] index = lineno - 1 - start @@ -2220,16 +2215,11 @@ def _signature_from_callable(obj, *, sigcls=sigcls) sig = _signature_get_partial(wrapped_sig, partialmethod, (None,)) + first_wrapped_param = tuple(wrapped_sig.parameters.values())[0] - if first_wrapped_param.kind is Parameter.VAR_POSITIONAL: - # First argument of the wrapped callable is `*args`, as in - # `partialmethod(lambda *args)`. - return sig - else: - sig_params = tuple(sig.parameters.values()) - assert first_wrapped_param is not sig_params[0] - new_params = (first_wrapped_param,) + sig_params - return sig.replace(parameters=new_params) + new_params = (first_wrapped_param,) + tuple(sig.parameters.values()) + + return sig.replace(parameters=new_params) if isfunction(obj) or _signature_is_functionlike(obj): # If it's a pure Python function, or an object that is duck type @@ -2427,6 +2417,20 @@ class Parameter: if not isinstance(name, str): raise TypeError("name must be a str, not a {!r}".format(name)) + if name[0] == '.' and name[1:].isdigit(): + # These are implicit arguments generated by comprehensions. In + # order to provide a friendlier interface to users, we recast + # their name as "implicitN" and treat them as positional-only. + # See issue 19611. + if kind != _POSITIONAL_OR_KEYWORD: + raise ValueError( + 'implicit arguments must be passed in as {}'.format( + _POSITIONAL_OR_KEYWORD + ) + ) + self._kind = _POSITIONAL_ONLY + name = 'implicit{}'.format(name[1:]) + if not name.isidentifier(): raise ValueError('{!r} is not a valid parameter name'.format(name)) diff --git a/Lib/io.py b/Lib/io.py index e03db97..968ee50 100644 --- a/Lib/io.py +++ b/Lib/io.py @@ -90,3 +90,10 @@ for klass in (BytesIO, BufferedReader, BufferedWriter, BufferedRandom, for klass in (StringIO, TextIOWrapper): TextIOBase.register(klass) del klass + +try: + from _io import _WindowsConsoleIO +except ImportError: + pass +else: + RawIOBase.register(_WindowsConsoleIO) diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index 35ca38e..20f33cb 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -636,12 +636,12 @@ class _BaseNetwork(_IPAddressBase): broadcast = int(self.broadcast_address) if n >= 0: if network + n > broadcast: - raise IndexError + raise IndexError('address out of range') return self._address_class(network + n) else: n += 1 if broadcast + n < network: - raise IndexError + raise IndexError('address out of range') return self._address_class(broadcast + n) def __lt__(self, other): @@ -1410,8 +1410,7 @@ class IPv4Interface(IPv4Address): if address_less is NotImplemented: return NotImplemented try: - return (self.network < other.network or - self.network == other.network and address_less) + return self.network < other.network except AttributeError: # We *do* allow addresses and interfaces to be sorted. The # unassociated address is considered less than all interfaces. @@ -2101,8 +2100,7 @@ class IPv6Interface(IPv6Address): if address_less is NotImplemented: return NotImplemented try: - return (self.network < other.network or - self.network == other.network and address_less) + return self.network < other.network except AttributeError: # We *do* allow addresses and interfaces to be sorted. The # unassociated address is considered less than all interfaces. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index ca2c611..b8d5e6c 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -76,7 +76,7 @@ Specializing JSON object encoding:: >>> def encode_complex(obj): ... if isinstance(obj, complex): ... return [obj.real, obj.imag] - ... raise TypeError(repr(obj) + " is not JSON serializable") + ... raise TypeError(repr(o) + " is not JSON serializable") ... >>> json.dumps(2 + 1j, default=encode_complex) '[2.0, 1.0]' @@ -105,6 +105,7 @@ __author__ = 'Bob Ippolito ' from .decoder import JSONDecoder, JSONDecodeError from .encoder import JSONEncoder +import codecs _default_encoder = JSONEncoder( skipkeys=False, @@ -116,7 +117,7 @@ _default_encoder = JSONEncoder( default=None, ) -def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, +def dump(obj, fp, *, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, sort_keys=False, **kw): """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a @@ -179,7 +180,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, fp.write(chunk) -def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, +def dumps(obj, *, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, sort_keys=False, **kw): """Serialize ``obj`` to a JSON formatted ``str``. @@ -240,7 +241,37 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, _default_decoder = JSONDecoder(object_hook=None, object_pairs_hook=None) -def load(fp, cls=None, object_hook=None, parse_float=None, +def detect_encoding(b): + bstartswith = b.startswith + if bstartswith((codecs.BOM_UTF32_BE, codecs.BOM_UTF32_LE)): + return 'utf-32' + if bstartswith((codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE)): + return 'utf-16' + if bstartswith(codecs.BOM_UTF8): + return 'utf-8-sig' + + if len(b) >= 4: + if not b[0]: + # 00 00 -- -- - utf-32-be + # 00 XX -- -- - utf-16-be + return 'utf-16-be' if b[1] else 'utf-32-be' + if not b[1]: + # XX 00 00 00 - utf-32-le + # XX 00 00 XX - utf-16-le + # XX 00 XX -- - utf-16-le + return 'utf-16-le' if b[2] or b[3] else 'utf-32-le' + elif len(b) == 2: + if not b[0]: + # 00 XX - utf-16-be + return 'utf-16-be' + if not b[1]: + # XX 00 - utf-16-le + return 'utf-16-le' + # default + return 'utf-8' + + +def load(fp, *, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw): """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing a JSON document) to a Python object. @@ -268,10 +299,10 @@ def load(fp, cls=None, object_hook=None, parse_float=None, parse_constant=parse_constant, object_pairs_hook=object_pairs_hook, **kw) -def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, +def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **kw): - """Deserialize ``s`` (a ``str`` instance containing a JSON - document) to a Python object. + """Deserialize ``s`` (a ``str``, ``bytes`` or ``bytearray`` instance + containing a JSON document) to a Python object. ``object_hook`` is an optional function that will be called with the result of any object literal decode (a ``dict``). The return value of @@ -307,12 +338,16 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, The ``encoding`` argument is ignored and deprecated. """ - if not isinstance(s, str): - raise TypeError('the JSON object must be str, not {!r}'.format( - s.__class__.__name__)) - if s.startswith(u'\ufeff'): - raise JSONDecodeError("Unexpected UTF-8 BOM (decode using utf-8-sig)", - s, 0) + if isinstance(s, str): + if s.startswith('\ufeff'): + raise JSONDecodeError("Unexpected UTF-8 BOM (decode using utf-8-sig)", + s, 0) + else: + if not isinstance(s, (bytes, bytearray)): + raise TypeError('the JSON object must be str, bytes or bytearray, ' + 'not {!r}'.format(s.__class__.__name__)) + s = s.decode(detect_encoding(s), 'surrogatepass') + if (cls is None and object_hook is None and parse_int is None and parse_float is None and parse_constant is None and object_pairs_hook is None and not kw): diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index 0f03f20..2422c6a 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -280,7 +280,7 @@ class JSONDecoder(object): """ - def __init__(self, object_hook=None, parse_float=None, + def __init__(self, *, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, strict=True, object_pairs_hook=None): """``object_hook``, if specified, will be called with the result diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index d596489..41a497c 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -101,7 +101,7 @@ class JSONEncoder(object): """ item_separator = ', ' key_separator = ': ' - def __init__(self, skipkeys=False, ensure_ascii=True, + def __init__(self, *, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, sort_keys=False, indent=None, separators=None, default=None): """Constructor for JSONEncoder, with sensible defaults. @@ -176,7 +176,8 @@ class JSONEncoder(object): return JSONEncoder.default(self, o) """ - raise TypeError(repr(o) + " is not JSON serializable") + raise TypeError("Object of type '%s' is not JSON serializable" % + o.__class__.__name__) def encode(self, o): """Return a JSON string representation of a Python data structure. diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt index 60503dd..2abd5ee 100644 --- a/Lib/lib2to3/Grammar.txt +++ b/Lib/lib2to3/Grammar.txt @@ -54,12 +54,13 @@ stmt: simple_stmt | compound_stmt simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE small_stmt: (expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | exec_stmt | assert_stmt) -expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | +expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | ('=' (yield_expr|testlist_star_expr))*) +annassign: ':' test ['=' test] testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [','] augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=') -# For normal assignments, additional restrictions enforced by the interpreter +# For normal and annotated assignments, additional restrictions enforced by the interpreter print_stmt: 'print' ( [ test (',' test)* [','] ] | '>>' test [ (',' test)+ [','] ] ) del_stmt: 'del' exprlist @@ -160,7 +161,7 @@ argument: ( test [comp_for] | star_expr ) comp_iter: comp_for | comp_if -comp_for: 'for' exprlist 'in' testlist_safe [comp_iter] +comp_for: [ASYNC] 'for' exprlist 'in' testlist_safe [comp_iter] comp_if: 'if' old_test [comp_iter] testlist1: test (',' test)* diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py index 44502bf..babe6cb 100644 --- a/Lib/lib2to3/fixer_util.py +++ b/Lib/lib2to3/fixer_util.py @@ -1,8 +1,6 @@ """Utility functions, node construction macros, etc.""" # Author: Collin Winter -from itertools import islice - # Local imports from .pgen2 import token from .pytree import Leaf, Node diff --git a/Lib/lib2to3/fixes/fix_dict.py b/Lib/lib2to3/fixes/fix_dict.py index 963f952..d3655c9 100644 --- a/Lib/lib2to3/fixes/fix_dict.py +++ b/Lib/lib2to3/fixes/fix_dict.py @@ -30,9 +30,8 @@ as an argument to a function that introspects the argument). # Local imports from .. import pytree from .. import patcomp -from ..pgen2 import token from .. import fixer_base -from ..fixer_util import Name, Call, LParen, RParen, ArgList, Dot +from ..fixer_util import Name, Call, Dot from .. import fixer_util diff --git a/Lib/lib2to3/fixes/fix_exec.py b/Lib/lib2to3/fixes/fix_exec.py index 2c9b72d..ab921ee 100644 --- a/Lib/lib2to3/fixes/fix_exec.py +++ b/Lib/lib2to3/fixes/fix_exec.py @@ -10,7 +10,6 @@ exec code in ns1, ns2 -> exec(code, ns1, ns2) """ # Local imports -from .. import pytree from .. import fixer_base from ..fixer_util import Comma, Name, Call diff --git a/Lib/lib2to3/fixes/fix_filter.py b/Lib/lib2to3/fixes/fix_filter.py index 391889f..bb6718c 100644 --- a/Lib/lib2to3/fixes/fix_filter.py +++ b/Lib/lib2to3/fixes/fix_filter.py @@ -14,7 +14,6 @@ Python 2.6 figure it out. """ # Local imports -from ..pgen2 import token from .. import fixer_base from ..fixer_util import Name, Call, ListComp, in_special_context diff --git a/Lib/lib2to3/fixes/fix_has_key.py b/Lib/lib2to3/fixes/fix_has_key.py index 18c560f..439708c 100644 --- a/Lib/lib2to3/fixes/fix_has_key.py +++ b/Lib/lib2to3/fixes/fix_has_key.py @@ -31,7 +31,6 @@ CAVEATS: # Local imports from .. import pytree -from ..pgen2 import token from .. import fixer_base from ..fixer_util import Name, parenthesize diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py index 46c7aaf..8e34463 100644 --- a/Lib/lib2to3/fixes/fix_metaclass.py +++ b/Lib/lib2to3/fixes/fix_metaclass.py @@ -20,7 +20,7 @@ # Local imports from .. import fixer_base from ..pygram import token -from ..fixer_util import Name, syms, Node, Leaf +from ..fixer_util import syms, Node, Leaf def has_metaclass(parent): diff --git a/Lib/lib2to3/fixes/fix_nonzero.py b/Lib/lib2to3/fixes/fix_nonzero.py index ad91a29..c229596 100644 --- a/Lib/lib2to3/fixes/fix_nonzero.py +++ b/Lib/lib2to3/fixes/fix_nonzero.py @@ -3,7 +3,7 @@ # Local imports from .. import fixer_base -from ..fixer_util import Name, syms +from ..fixer_util import Name class FixNonzero(fixer_base.BaseFix): BM_compatible = True diff --git a/Lib/lib2to3/fixes/fix_print.py b/Lib/lib2to3/fixes/fix_print.py index a1fe2f5..8780322 100644 --- a/Lib/lib2to3/fixes/fix_print.py +++ b/Lib/lib2to3/fixes/fix_print.py @@ -18,7 +18,7 @@ from .. import patcomp from .. import pytree from ..pgen2 import token from .. import fixer_base -from ..fixer_util import Name, Call, Comma, String, is_tuple +from ..fixer_util import Name, Call, Comma, String parend_expr = patcomp.compile_pattern( diff --git a/Lib/lib2to3/fixes/fix_types.py b/Lib/lib2to3/fixes/fix_types.py index db34104..67bf51f 100644 --- a/Lib/lib2to3/fixes/fix_types.py +++ b/Lib/lib2to3/fixes/fix_types.py @@ -20,7 +20,6 @@ There should be another fixer that handles at least the following constants: """ # Local imports -from ..pgen2 import token from .. import fixer_base from ..fixer_util import Name @@ -42,7 +41,7 @@ _TYPE_MAPPING = { 'NotImplementedType' : 'type(NotImplemented)', 'SliceType' : 'slice', 'StringType': 'bytes', # XXX ? - 'StringTypes' : 'str', # XXX ? + 'StringTypes' : '(str,)', # XXX ? 'TupleType': 'tuple', 'TypeType' : 'type', 'UnicodeType': 'str', diff --git a/Lib/lib2to3/fixes/fix_urllib.py b/Lib/lib2to3/fixes/fix_urllib.py index 1481cd9..5a36049 100644 --- a/Lib/lib2to3/fixes/fix_urllib.py +++ b/Lib/lib2to3/fixes/fix_urllib.py @@ -6,7 +6,6 @@ # Local imports from lib2to3.fixes.fix_imports import alternates, FixImports -from lib2to3 import fixer_base from lib2to3.fixer_util import (Name, Comma, FromImport, Newline, find_indentation, Node, syms) diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 0728083..c5a1aa2 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -8,8 +8,6 @@ recursively descend down directories. Imported as a module, this provides infrastructure to write your own refactoring tool. """ -from __future__ import with_statement - __author__ = "Guido van Rossum " @@ -26,7 +24,6 @@ from itertools import chain from .pgen2 import driver, tokenize, token from .fixer_util import find_root from . import pytree, pygram -from . import btm_utils as bu from . import btm_matcher as bm diff --git a/Lib/lib2to3/tests/data/py3_test_grammar.py b/Lib/lib2to3/tests/data/py3_test_grammar.py index c0bf7f2..cf31a54 100644 --- a/Lib/lib2to3/tests/data/py3_test_grammar.py +++ b/Lib/lib2to3/tests/data/py3_test_grammar.py @@ -319,7 +319,7 @@ class GrammarTests(unittest.TestCase): def f(x) -> list: pass self.assertEquals(f.__annotations__, {'return': list}) - # test MAKE_CLOSURE with a variety of oparg's + # test closures with a variety of oparg's closure = 1 def f(): return closure def f(x=1): return closure diff --git a/Lib/lib2to3/tests/support.py b/Lib/lib2to3/tests/support.py index 0897177..ae7cfe8 100644 --- a/Lib/lib2to3/tests/support.py +++ b/Lib/lib2to3/tests/support.py @@ -3,10 +3,8 @@ # Python imports import unittest -import sys import os import os.path -import re from textwrap import dedent # Local imports diff --git a/Lib/lib2to3/tests/test_all_fixers.py b/Lib/lib2to3/tests/test_all_fixers.py index 15079fe..c0507cf 100644 --- a/Lib/lib2to3/tests/test_all_fixers.py +++ b/Lib/lib2to3/tests/test_all_fixers.py @@ -10,7 +10,6 @@ import unittest import test.support # Local imports -from lib2to3 import refactor from . import support diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index 640dcef..b3f2680 100644 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -2,12 +2,11 @@ # Python imports import os -import unittest from itertools import chain from operator import itemgetter # Local imports -from lib2to3 import pygram, pytree, refactor, fixer_util +from lib2to3 import pygram, fixer_util from lib2to3.tests import support @@ -3234,6 +3233,10 @@ class Test_types(FixerTestCase): a = """type(None)""" self.check(b, a) + b = "types.StringTypes" + a = "(str,)" + self.check(b, a) + class Test_idioms(FixerTestCase): fixer = "idioms" diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py index e4a0194..9a969e8 100644 --- a/Lib/lib2to3/tests/test_parser.py +++ b/Lib/lib2to3/tests/test_parser.py @@ -8,7 +8,7 @@ test_grammar.py files from both Python 2 and Python 3. # Testing imports from . import support -from .support import driver, test_dir +from .support import driver from test.support import verbose # Python imports @@ -134,6 +134,24 @@ class TestAsyncAwait(GrammarTest): """) self.validate("""async def foo(): + [i async for i in b] + """) + + self.validate("""async def foo(): + {i for i in b + async for i in a if await i + for b in i} + """) + + self.validate("""async def foo(): + [await i for i in b if await c] + """) + + self.validate("""async def foo(): + [ i for i in b if c] + """) + + self.validate("""async def foo(): def foo(): pass @@ -272,6 +290,36 @@ class TestFunctionAnnotations(GrammarTest): self.validate(s) +# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.test_var_annot +class TestVarAnnotations(GrammarTest): + def test_1(self): + self.validate("var1: int = 5") + + def test_2(self): + self.validate("var2: [int, str]") + + def test_3(self): + self.validate("def f():\n" + " st: str = 'Hello'\n" + " a.b: int = (1, 2)\n" + " return st\n") + + def test_4(self): + self.validate("def fbad():\n" + " x: int\n" + " print(x)\n") + + def test_5(self): + self.validate("class C:\n" + " x: int\n" + " s: str = 'attr'\n" + " z = 2\n" + " def __init__(self, x):\n" + " self.x: int = x\n") + + def test_6(self): + self.validate("lst: List[int] = []") + class TestExcept(GrammarTest): def test_new(self): s = """ diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py index 4d585a8..177126d 100644 --- a/Lib/lib2to3/tests/test_pytree.py +++ b/Lib/lib2to3/tests/test_pytree.py @@ -9,11 +9,6 @@ more helpful than printing of (the first line of) the docstring, especially when debugging a test. """ -from __future__ import with_statement - -import sys -import warnings - # Testing imports from . import support diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 8563001..e9bae5e 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -2,24 +2,18 @@ Unit tests for refactor.py. """ -from __future__ import with_statement - import sys import os import codecs -import operator import io import re import tempfile import shutil import unittest -import warnings from lib2to3 import refactor, pygram, fixer_base from lib2to3.pgen2 import token -from . import support - TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") FIXER_DIR = os.path.join(TEST_DATA_DIR, "fixers") diff --git a/Lib/lib2to3/tests/test_util.py b/Lib/lib2to3/tests/test_util.py index d2be82c..c6c6139 100644 --- a/Lib/lib2to3/tests/test_util.py +++ b/Lib/lib2to3/tests/test_util.py @@ -3,9 +3,6 @@ # Testing imports from . import support -# Python imports -import os.path - # Local imports from lib2to3.pytree import Node, Leaf from lib2to3 import fixer_util diff --git a/Lib/locale.py b/Lib/locale.py index 6d59cd8..4de0090 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -302,12 +302,16 @@ def str(val): def delocalize(string): "Parses a string as a normalized number according to the locale settings." + + conv = localeconv() + #First, get rid of the grouping - ts = localeconv()['thousands_sep'] + ts = conv['thousands_sep'] if ts: string = string.replace(ts, '') + #next, replace the decimal point with a dot - dd = localeconv()['decimal_point'] + dd = conv['decimal_point'] if dd: string = string.replace(dd, '.') return string diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 6455f39..2590d65 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -33,8 +33,9 @@ __all__ = ['BASIC_FORMAT', 'BufferingFormatter', 'CRITICAL', 'DEBUG', 'ERROR', 'StreamHandler', 'WARN', 'WARNING', 'addLevelName', 'basicConfig', 'captureWarnings', 'critical', 'debug', 'disable', 'error', 'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass', - 'info', 'log', 'makeLogRecord', 'setLoggerClass', 'warn', 'warning', - 'getLogRecordFactory', 'setLogRecordFactory', 'lastResort'] + 'info', 'log', 'makeLogRecord', 'setLoggerClass', 'shutdown', + 'warn', 'warning', 'getLogRecordFactory', 'setLogRecordFactory', + 'lastResort', 'raiseExceptions'] try: import threading @@ -107,6 +108,7 @@ _levelToName = { } _nameToLevel = { 'CRITICAL': CRITICAL, + 'FATAL': FATAL, 'ERROR': ERROR, 'WARN': WARNING, 'WARNING': WARNING, @@ -129,14 +131,9 @@ def getLevelName(level): Otherwise, the string "Level %s" % level is returned. """ - # See Issues #22386, #27937 and #29220 for why it's this way - result = _levelToName.get(level) - if result is not None: - return result - result = _nameToLevel.get(level) - if result is not None: - return result - return "Level %s" % level + # See Issues #22386 and #27937 for why it's this way + return (_levelToName.get(level) or _nameToLevel.get(level) or + "Level %s" % level) def addLevelName(level, levelName): """ @@ -940,6 +937,10 @@ class Handler(Filterer): finally: del t, v, tb + def __repr__(self): + level = getLevelName(self.level) + return '<%s (%s)>' % (self.__class__.__name__, level) + class StreamHandler(Handler): """ A handler class which writes logging records, appropriately formatted, @@ -991,6 +992,14 @@ class StreamHandler(Handler): except Exception: self.handleError(record) + def __repr__(self): + level = getLevelName(self.level) + name = getattr(self.stream, 'name', '') + if name: + name += ' ' + return '<%s %s(%s)>' % (self.__class__.__name__, name, level) + + class FileHandler(StreamHandler): """ A handler class which writes formatted logging records to disk files. @@ -999,6 +1008,8 @@ class FileHandler(StreamHandler): """ Open the specified file and use it as the stream for logging. """ + # Issue #27493: add support for Path objects to be passed in + filename = os.fspath(filename) #keep the absolute path, otherwise derived classes which use this #may come a cropper when the current directory changes self.baseFilename = os.path.abspath(filename) @@ -1053,6 +1064,11 @@ class FileHandler(StreamHandler): self.stream = self._open() StreamHandler.emit(self, record) + def __repr__(self): + level = getLevelName(self.level) + return '<%s %s (%s)>' % (self.__class__.__name__, self.baseFilename, level) + + class _StderrHandler(StreamHandler): """ This class is like a StreamHandler using sys.stderr, but always uses @@ -1545,6 +1561,11 @@ class Logger(Filterer): suffix = '.'.join((self.name, suffix)) return self.manager.getLogger(suffix) + def __repr__(self): + level = getLevelName(self.getEffectiveLevel()) + return '<%s %s (%s)>' % (self.__class__.__name__, self.name, level) + + class RootLogger(Logger): """ A root logger is not that different to any other logger, except that @@ -1671,6 +1692,11 @@ class LoggerAdapter(object): """ return self.logger.hasHandlers() + def __repr__(self): + logger = self.logger + level = getLevelName(logger.getEffectiveLevel()) + return '<%s %s (%s)>' % (self.__class__.__name__, logger.name, level) + root = RootLogger(WARNING) Logger.root = root Logger.manager = Manager(Logger.root) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index b9d6e37..7d77973 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -246,6 +246,9 @@ class TimedRotatingFileHandler(BaseRotatingHandler): self.extMatch = re.compile(self.extMatch, re.ASCII) self.interval = self.interval * interval # multiply by units requested + # The following line added because the filename passed in could be a + # path object (see Issue #27493), but self.baseFilename will be a string + filename = self.baseFilename if os.path.exists(filename): t = os.stat(filename)[ST_MTIME] else: @@ -440,11 +443,11 @@ class WatchedFileHandler(logging.FileHandler): sres = os.fstat(self.stream.fileno()) self.dev, self.ino = sres[ST_DEV], sres[ST_INO] - def emit(self, record): + def reopenIfNeeded(self): """ - Emit a record. + Reopen log file if needed. - First check if the underlying file has changed, and if it + Checks if the underlying file has changed, and if it has, close the old stream and reopen the file to get the current stream. """ @@ -467,6 +470,15 @@ class WatchedFileHandler(logging.FileHandler): # open a new file handle and get new stat info from that fd self.stream = self._open() self._statstream() + + def emit(self, record): + """ + Emit a record. + + If underlying file has changed, reopen the file before emitting the + record to it. + """ + self.reopenIfNeeded() logging.FileHandler.emit(self, record) @@ -803,38 +815,16 @@ class SysLogHandler(logging.Handler): if isinstance(address, str): self.unixsocket = True - # Syslog server may be unavailable during handler initialisation. - # C's openlog() function also ignores connection errors. - # Moreover, we ignore these errors while logging, so it not worse - # to ignore it also here. - try: - self._connect_unixsocket(address) - except OSError: - pass + self._connect_unixsocket(address) else: self.unixsocket = False if socktype is None: socktype = socket.SOCK_DGRAM - host, port = address - ress = socket.getaddrinfo(host, port, 0, socktype) - if not ress: - raise OSError("getaddrinfo returns an empty list") - for res in ress: - af, socktype, proto, _, sa = res - err = sock = None - try: - sock = socket.socket(af, socktype, proto) - if socktype == socket.SOCK_STREAM: - sock.connect(sa) - break - except OSError as exc: - err = exc - if sock is not None: - sock.close() - if err is not None: - raise err - self.socket = sock + self.socket = socket.socket(socket.AF_INET, socktype) + if socktype == socket.SOCK_STREAM: + self.socket.connect(address) self.socktype = socktype + self.formatter = None def _connect_unixsocket(self, address): use_socktype = self.socktype @@ -873,7 +863,7 @@ class SysLogHandler(logging.Handler): priority = self.priority_names[priority] return (facility << 3) | priority - def close(self): + def close (self): """ Closes the socket. """ @@ -1251,17 +1241,25 @@ class MemoryHandler(BufferingHandler): flushing them to a target handler. Flushing occurs whenever the buffer is full, or when an event of a certain severity or greater is seen. """ - def __init__(self, capacity, flushLevel=logging.ERROR, target=None): + def __init__(self, capacity, flushLevel=logging.ERROR, target=None, + flushOnClose=True): """ Initialize the handler with the buffer size, the level at which flushing should occur and an optional target. Note that without a target being set either here or via setTarget(), a MemoryHandler is no use to anyone! + + The ``flushOnClose`` argument is ``True`` for backward compatibility + reasons - the old behaviour is that when the handler is closed, the + buffer is flushed, even if the flush level hasn't been exceeded nor the + capacity exceeded. To prevent this, set ``flushOnClose`` to ``False``. """ BufferingHandler.__init__(self, capacity) self.flushLevel = flushLevel self.target = target + # See Issue #26559 for why this has been added + self.flushOnClose = flushOnClose def shouldFlush(self, record): """ @@ -1295,10 +1293,12 @@ class MemoryHandler(BufferingHandler): def close(self): """ - Flush, set the target to None and lose the buffer. + Flush, if appropriately configured, set the target to None and lose the + buffer. """ try: - self.flush() + if self.flushOnClose: + self.flush() finally: self.acquire() try: diff --git a/Lib/lzma.py b/Lib/lzma.py index 7dff1c3..0817b87 100644 --- a/Lib/lzma.py +++ b/Lib/lzma.py @@ -23,6 +23,7 @@ __all__ = [ import builtins import io +import os from _lzma import * from _lzma import _encode_filter_properties, _decode_filter_properties import _compression @@ -49,9 +50,10 @@ class LZMAFile(_compression.BaseStream): format=None, check=-1, preset=None, filters=None): """Open an LZMA-compressed file in binary mode. - filename can be either an actual file name (given as a str or - bytes object), in which case the named file is opened, or it can - be an existing file object to read from or write to. + filename can be either an actual file name (given as a str, + bytes, or PathLike object), in which case the named file is + opened, or it can be an existing file object to read from or + write to. mode can be "r" for reading (default), "w" for (over)writing, "x" for creating exclusively, or "a" for appending. These can @@ -112,7 +114,7 @@ class LZMAFile(_compression.BaseStream): else: raise ValueError("Invalid mode: {!r}".format(mode)) - if isinstance(filename, (str, bytes)): + if isinstance(filename, (str, bytes, os.PathLike)): if "b" not in mode: mode += "b" self._fp = builtins.open(filename, mode) @@ -122,7 +124,7 @@ class LZMAFile(_compression.BaseStream): self._fp = filename self._mode = mode_code else: - raise TypeError("filename must be a str or bytes object, or a file") + raise TypeError("filename must be a str, bytes, file or PathLike object") if self._mode == _MODE_READ: raw = _compression.DecompressReader(self._fp, LZMADecompressor, @@ -263,9 +265,9 @@ def open(filename, mode="rb", *, encoding=None, errors=None, newline=None): """Open an LZMA-compressed file in binary or text mode. - filename can be either an actual file name (given as a str or bytes - object), in which case the named file is opened, or it can be an - existing file object to read from or write to. + filename can be either an actual file name (given as a str, bytes, + or PathLike object), in which case the named file is opened, or it + can be an existing file object to read from or write to. The mode argument can be "r", "rb" (default), "w", "wb", "x", "xb", "a", or "ab" for binary mode, or "rt", "wt", "xt", or "at" for text diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 0270e25..0e23987 100644 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -23,9 +23,10 @@ try: except ImportError: fcntl = None -__all__ = [ 'Mailbox', 'Maildir', 'mbox', 'MH', 'Babyl', 'MMDF', - 'Message', 'MaildirMessage', 'mboxMessage', 'MHMessage', - 'BabylMessage', 'MMDFMessage'] +__all__ = ['Mailbox', 'Maildir', 'mbox', 'MH', 'Babyl', 'MMDF', + 'Message', 'MaildirMessage', 'mboxMessage', 'MHMessage', + 'BabylMessage', 'MMDFMessage', 'Error', 'NoSuchMailboxError', + 'NotEmptyError', 'ExternalClashError', 'FormatError'] linesep = os.linesep.encode('ascii') diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 0be76ad..9a88680 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -33,8 +33,10 @@ except ImportError: _winreg = None __all__ = [ - "guess_type","guess_extension","guess_all_extensions", - "add_type","read_mime_types","init" + "knownfiles", "inited", "MimeTypes", + "guess_type", "guess_all_extensions", "guess_extension", + "add_type", "init", "read_mime_types", + "suffix_map", "encodings_map", "types_map", "common_types" ] knownfiles = [ diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index 8103502..e220315 100644 --- a/Lib/modulefinder.py +++ b/Lib/modulefinder.py @@ -10,7 +10,7 @@ import types import struct import warnings with warnings.catch_warnings(): - warnings.simplefilter('ignore', PendingDeprecationWarning) + warnings.simplefilter('ignore', DeprecationWarning) import imp LOAD_CONST = dis.opmap['LOAD_CONST'] @@ -336,8 +336,7 @@ class ModuleFinder: fullname = name + "." + sub self._add_badmodule(fullname, caller) - def scan_opcodes_25(self, co, - unpack = struct.unpack): + def scan_opcodes(self, co): # Scan the code, and yield 'interesting' opcode combinations code = co.co_code names = co.co_names @@ -360,7 +359,7 @@ class ModuleFinder: def scan_code(self, co, m): code = co.co_code - scanner = self.scan_opcodes_25 + scanner = self.scan_opcodes for what, args in scanner(co): if what == "store": name, = args diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py index 6d0a28f..f0370c2 100644 --- a/Lib/msilib/__init__.py +++ b/Lib/msilib/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) 2005 Martin v. Löwis # Licensed to PSF under a Contributor Agreement. from _msi import * -import glob +import fnmatch import os import re import string @@ -289,7 +289,7 @@ class Directory: def make_short(self, file): oldfile = file file = file.replace('+', '_') - file = ''.join(c for c in file if not c in ' "/\[]:;=,') + file = ''.join(c for c in file if not c in r' "/\[]:;=,') parts = file.split(".") if len(parts) > 1: prefix = "".join(parts[:-1]).upper() @@ -379,7 +379,13 @@ class Directory: def glob(self, pattern, exclude = None): """Add a list of files to the current component as specified in the glob pattern. Individual files can be excluded in the exclude list.""" - files = glob.glob1(self.absolute, pattern) + try: + files = os.listdir(self.absolute) + except OSError: + return [] + if pattern[:1] != '.': + files = (f for f in files if f[0] != '.') + files = fnmatch.filter(files, pattern) for f in files: if exclude and f in exclude: continue self.add_file(f) diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index d0a1b86..d49e8f0 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -20,11 +20,11 @@ import itertools import _multiprocessing -from . import reduction from . import util from . import AuthenticationError, BufferTooShort -from .reduction import ForkingPickler +from .context import reduction +_ForkingPickler = reduction.ForkingPickler try: import _winapi @@ -203,7 +203,7 @@ class _ConnectionBase: """Send a (picklable) object""" self._check_closed() self._check_writable() - self._send_bytes(ForkingPickler.dumps(obj)) + self._send_bytes(_ForkingPickler.dumps(obj)) def recv_bytes(self, maxlength=None): """ @@ -248,7 +248,7 @@ class _ConnectionBase: self._check_closed() self._check_readable() buf = self._recv_bytes() - return ForkingPickler.loads(buf.getbuffer()) + return _ForkingPickler.loads(buf.getbuffer()) def poll(self, timeout=0.0): """Whether there is any input available to be read""" diff --git a/Lib/multiprocessing/context.py b/Lib/multiprocessing/context.py index 115d4bf..09455e2 100644 --- a/Lib/multiprocessing/context.py +++ b/Lib/multiprocessing/context.py @@ -3,6 +3,7 @@ import sys import threading from . import process +from . import reduction __all__ = [] # things are copied from here to __init__.py @@ -195,9 +196,19 @@ class BaseContext(object): def get_start_method(self, allow_none=False): return self._name - def set_start_method(self, method, force=False): + def set_start_method(self, method=None): raise ValueError('cannot set start method of concrete context') + @property + def reducer(self): + '''Controls how objects will be reduced to a form that can be + shared with other processes.''' + return globals().get('reduction') + + @reducer.setter + def reducer(self, reduction): + globals()['reduction'] = reduction + def _check_available(self): pass @@ -245,7 +256,6 @@ class DefaultContext(BaseContext): if sys.platform == 'win32': return ['spawn'] else: - from . import reduction if reduction.HAVE_SEND_HANDLE: return ['fork', 'spawn', 'forkserver'] else: @@ -292,7 +302,6 @@ if sys.platform != 'win32': _name = 'forkserver' Process = ForkServerProcess def _check_available(self): - from . import reduction if not reduction.HAVE_SEND_HANDLE: raise ValueError('forkserver start method not available') diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py index 1b4c7cb..f2c179e 100644 --- a/Lib/multiprocessing/forkserver.py +++ b/Lib/multiprocessing/forkserver.py @@ -9,7 +9,7 @@ import threading from . import connection from . import process -from . import reduction +from .context import reduction from . import semaphore_tracker from . import spawn from . import util @@ -149,15 +149,8 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None): util._close_stdin() - # ignoring SIGCHLD means no need to reap zombie processes; - # letting SIGINT through avoids KeyboardInterrupt tracebacks - handlers = { - signal.SIGCHLD: signal.SIG_IGN, - signal.SIGINT: signal.SIG_DFL, - } - old_handlers = {sig: signal.signal(sig, val) - for (sig, val) in handlers.items()} - + # ignoring SIGCHLD means no need to reap zombie processes + handler = signal.signal(signal.SIGCHLD, signal.SIG_IGN) with socket.socket(socket.AF_UNIX, fileno=listener_fd) as listener, \ selectors.DefaultSelector() as selector: _forkserver._forkserver_address = listener.getsockname() @@ -182,7 +175,7 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None): code = 1 if os.fork() == 0: try: - _serve_one(s, listener, alive_r, old_handlers) + _serve_one(s, listener, alive_r, handler) except Exception: sys.excepthook(*sys.exc_info()) sys.stderr.flush() @@ -193,12 +186,11 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None): if e.errno != errno.ECONNABORTED: raise -def _serve_one(s, listener, alive_r, handlers): - # close unnecessary stuff and reset signal handlers +def _serve_one(s, listener, alive_r, handler): + # close unnecessary stuff and reset SIGCHLD handler listener.close() os.close(alive_r) - for sig, val in handlers.items(): - signal.signal(sig, val) + signal.signal(signal.SIGCHLD, handler) # receive fds from parent process fds = reduction.recvfds(s, MAXFDS_TO_SEND + 1) diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py index 44d9638..4433215 100644 --- a/Lib/multiprocessing/heap.py +++ b/Lib/multiprocessing/heap.py @@ -14,8 +14,7 @@ import sys import tempfile import threading -from . import context -from . import reduction +from .context import reduction, assert_spawning from . import util __all__ = ['BufferWrapper'] @@ -48,7 +47,7 @@ if sys.platform == 'win32': self._state = (self.size, self.name) def __getstate__(self): - context.assert_spawning(self) + assert_spawning(self) return self._state def __setstate__(self, state): diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index b175470..b9ce84b 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -23,10 +23,9 @@ from time import time as _time from traceback import format_exc from . import connection -from . import context +from .context import reduction, get_spawning_popen from . import pool from . import process -from . import reduction from . import util from . import get_context @@ -142,7 +141,8 @@ class Server(object): self.id_to_obj = {'0': (None, ())} self.id_to_refcount = {} - self.mutex = threading.RLock() + self.id_to_local_proxy_obj = {} + self.mutex = threading.Lock() def serve_forever(self): ''' @@ -227,7 +227,14 @@ class Server(object): methodname = obj = None request = recv() ident, methodname, args, kwds = request - obj, exposed, gettypeid = id_to_obj[ident] + try: + obj, exposed, gettypeid = id_to_obj[ident] + except KeyError as ke: + try: + obj, exposed, gettypeid = \ + self.id_to_local_proxy_obj[ident] + except KeyError as second_ke: + raise ke if methodname not in exposed: raise AttributeError( @@ -308,7 +315,7 @@ class Server(object): ''' with self.mutex: result = [] - keys = list(self.id_to_obj.keys()) + keys = list(self.id_to_refcount.keys()) keys.sort() for ident in keys: if ident != '0': @@ -321,7 +328,8 @@ class Server(object): ''' Number of shared objects ''' - return len(self.id_to_obj) - 1 # don't count ident='0' + # Doesn't use (len(self.id_to_obj) - 1) as we shouldn't count ident='0' + return len(self.id_to_refcount) def shutdown(self, c): ''' @@ -363,13 +371,9 @@ class Server(object): self.id_to_obj[ident] = (obj, set(exposed), method_to_typeid) if ident not in self.id_to_refcount: self.id_to_refcount[ident] = 0 - # increment the reference count immediately, to avoid - # this object being garbage collected before a Proxy - # object for it can be created. The caller of create() - # is responsible for doing a decref once the Proxy object - # has been created. - self.incref(c, ident) - return ident, tuple(exposed) + + self.incref(c, ident) + return ident, tuple(exposed) def get_methods(self, c, token): ''' @@ -387,15 +391,45 @@ class Server(object): def incref(self, c, ident): with self.mutex: - self.id_to_refcount[ident] += 1 + try: + self.id_to_refcount[ident] += 1 + except KeyError as ke: + # If no external references exist but an internal (to the + # manager) still does and a new external reference is created + # from it, restore the manager's tracking of it from the + # previously stashed internal ref. + if ident in self.id_to_local_proxy_obj: + self.id_to_refcount[ident] = 1 + self.id_to_obj[ident] = \ + self.id_to_local_proxy_obj[ident] + obj, exposed, gettypeid = self.id_to_obj[ident] + util.debug('Server re-enabled tracking & INCREF %r', ident) + else: + raise ke def decref(self, c, ident): + if ident not in self.id_to_refcount and \ + ident in self.id_to_local_proxy_obj: + util.debug('Server DECREF skipping %r', ident) + return + with self.mutex: assert self.id_to_refcount[ident] >= 1 self.id_to_refcount[ident] -= 1 if self.id_to_refcount[ident] == 0: - del self.id_to_obj[ident], self.id_to_refcount[ident] - util.debug('disposing of obj with id %r', ident) + del self.id_to_refcount[ident] + + if ident not in self.id_to_refcount: + # Two-step process in case the object turns out to contain other + # proxy objects (e.g. a managed list of managed lists). + # Otherwise, deleting self.id_to_obj[ident] would trigger the + # deleting of the stored value (another managed object) which would + # in turn attempt to acquire the mutex that is already held here. + self.id_to_obj[ident] = (None, (), None) # thread-safe + util.debug('disposing of obj with id %r', ident) + with self.mutex: + del self.id_to_obj[ident] + # # Class to represent state of a manager @@ -658,7 +692,7 @@ class BaseProxy(object): _mutex = util.ForkAwareThreadLock() def __init__(self, token, serializer, manager=None, - authkey=None, exposed=None, incref=True): + authkey=None, exposed=None, incref=True, manager_owned=False): with BaseProxy._mutex: tls_idset = BaseProxy._address_to_local.get(token.address, None) if tls_idset is None: @@ -680,6 +714,12 @@ class BaseProxy(object): self._serializer = serializer self._Client = listener_client[serializer][1] + # Should be set to True only when a proxy object is being created + # on the manager server; primary use case: nested proxy objects. + # RebuildProxy detects when a proxy is being created on the manager + # and sets this value appropriately. + self._owned_by_manager = manager_owned + if authkey is not None: self._authkey = process.AuthenticationString(authkey) elif self._manager is not None: @@ -738,6 +778,10 @@ class BaseProxy(object): return self._callmethod('#GETVALUE') def _incref(self): + if self._owned_by_manager: + util.debug('owned_by_manager skipped INCREF of %r', self._token.id) + return + conn = self._Client(self._token.address, authkey=self._authkey) dispatch(conn, None, 'incref', (self._id,)) util.debug('INCREF %r', self._token.id) @@ -788,7 +832,7 @@ class BaseProxy(object): def __reduce__(self): kwds = {} - if context.get_spawning_popen() is not None: + if get_spawning_popen() is not None: kwds['authkey'] = self._authkey if getattr(self, '_isauto', False): @@ -822,19 +866,19 @@ class BaseProxy(object): def RebuildProxy(func, token, serializer, kwds): ''' Function used for unpickling proxy objects. - - If possible the shared object is returned, or otherwise a proxy for it. ''' server = getattr(process.current_process(), '_manager_server', None) - if server and server.address == token.address: - return server.id_to_obj[token.id][0] - else: - incref = ( - kwds.pop('incref', True) and - not getattr(process.current_process(), '_inheriting', False) - ) - return func(token, serializer, incref=incref, **kwds) + util.debug('Rebuild a proxy owned by manager, token=%r', token) + kwds['manager_owned'] = True + if token.id not in server.id_to_local_proxy_obj: + server.id_to_local_proxy_obj[token.id] = \ + server.id_to_obj[token.id] + incref = ( + kwds.pop('incref', True) and + not getattr(process.current_process(), '_inheriting', False) + ) + return func(token, serializer, incref=incref, **kwds) # # Functions to create proxies and proxy types diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index 789488f..ffdf426 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -118,7 +118,7 @@ def worker(inqueue, outqueue, initializer=None, initargs=(), maxtasks=None, try: result = (True, func(*args, **kwds)) except Exception as e: - if wrap_exception and func is not _helper_reraises_exception: + if wrap_exception: e = ExceptionWithTraceback(e, e.__traceback__) result = (False, e) try: @@ -128,15 +128,9 @@ def worker(inqueue, outqueue, initializer=None, initargs=(), maxtasks=None, util.debug("Possible encoding error while sending result: %s" % ( wrapped)) put((job, i, (False, wrapped))) - - task = job = result = func = args = kwds = None completed += 1 util.debug('worker exiting after %d tasks' % completed) -def _helper_reraises_exception(ex): - 'Pickle-able helper function for use by _guarded_task_generation.' - raise ex - # # Class representing a process pool # @@ -281,17 +275,6 @@ class Pool(object): return self._map_async(func, iterable, starmapstar, chunksize, callback, error_callback) - def _guarded_task_generation(self, result_job, func, iterable): - '''Provides a generator of tasks for imap and imap_unordered with - appropriate handling for iterables which throw exceptions during - iteration.''' - try: - i = -1 - for i, x in enumerate(iterable): - yield (result_job, i, func, (x,), {}) - except Exception as e: - yield (result_job, i+1, _helper_reraises_exception, (e,), {}) - def imap(self, func, iterable, chunksize=1): ''' Equivalent of `map()` -- can be MUCH slower than `Pool.map()`. @@ -300,23 +283,15 @@ class Pool(object): raise ValueError("Pool not running") if chunksize == 1: result = IMapIterator(self._cache) - self._taskqueue.put( - ( - self._guarded_task_generation(result._job, func, iterable), - result._set_length - )) + self._taskqueue.put((((result._job, i, func, (x,), {}) + for i, x in enumerate(iterable)), result._set_length)) return result else: assert chunksize > 1 task_batches = Pool._get_tasks(func, iterable, chunksize) result = IMapIterator(self._cache) - self._taskqueue.put( - ( - self._guarded_task_generation(result._job, - mapstar, - task_batches), - result._set_length - )) + self._taskqueue.put((((result._job, i, mapstar, (x,), {}) + for i, x in enumerate(task_batches)), result._set_length)) return (item for chunk in result for item in chunk) def imap_unordered(self, func, iterable, chunksize=1): @@ -327,23 +302,15 @@ class Pool(object): raise ValueError("Pool not running") if chunksize == 1: result = IMapUnorderedIterator(self._cache) - self._taskqueue.put( - ( - self._guarded_task_generation(result._job, func, iterable), - result._set_length - )) + self._taskqueue.put((((result._job, i, func, (x,), {}) + for i, x in enumerate(iterable)), result._set_length)) return result else: assert chunksize > 1 task_batches = Pool._get_tasks(func, iterable, chunksize) result = IMapUnorderedIterator(self._cache) - self._taskqueue.put( - ( - self._guarded_task_generation(result._job, - mapstar, - task_batches), - result._set_length - )) + self._taskqueue.put((((result._job, i, mapstar, (x,), {}) + for i, x in enumerate(task_batches)), result._set_length)) return (item for chunk in result for item in chunk) def apply_async(self, func, args=(), kwds={}, callback=None, @@ -354,7 +321,7 @@ class Pool(object): if self._state != RUN: raise ValueError("Pool not running") result = ApplyResult(self._cache, callback, error_callback) - self._taskqueue.put(([(result._job, 0, func, args, kwds)], None)) + self._taskqueue.put(([(result._job, None, func, args, kwds)], None)) return result def map_async(self, func, iterable, chunksize=None, callback=None, @@ -385,14 +352,8 @@ class Pool(object): task_batches = Pool._get_tasks(func, iterable, chunksize) result = MapResult(self._cache, chunksize, len(iterable), callback, error_callback=error_callback) - self._taskqueue.put( - ( - self._guarded_task_generation(result._job, - mapper, - task_batches), - None - ) - ) + self._taskqueue.put((((result._job, i, mapper, (x,), {}) + for i, x in enumerate(task_batches)), None)) return result @staticmethod @@ -414,32 +375,37 @@ class Pool(object): for taskseq, set_length in iter(taskqueue.get, None): task = None + i = -1 try: - # iterating taskseq cannot fail - for task in taskseq: + for i, task in enumerate(taskseq): if thread._state: util.debug('task handler found thread._state != RUN') break try: put(task) except Exception as e: - job, idx = task[:2] + job, ind = task[:2] try: - cache[job]._set(idx, (False, e)) + cache[job]._set(ind, (False, e)) except KeyError: pass else: if set_length: util.debug('doing set_length()') - idx = task[1] if task else -1 - set_length(idx + 1) + set_length(i+1) continue break - finally: - task = taskseq = job = None + except Exception as ex: + job, ind = task[:2] if task else (0, 0) + if job in cache: + cache[job]._set(ind + 1, (False, ex)) + if set_length: + util.debug('doing set_length()') + set_length(i+1) else: util.debug('task handler got sentinel') + try: # tell result handler to finish when cache is empty util.debug('task handler sending sentinel to result handler') @@ -479,7 +445,6 @@ class Pool(object): cache[job]._set(i, obj) except KeyError: pass - task = job = obj = None while cache and thread._state != TERMINATE: try: @@ -496,7 +461,6 @@ class Pool(object): cache[job]._set(i, obj) except KeyError: pass - task = job = obj = None if hasattr(outqueue, '_reader'): util.debug('ensuring that outqueue is not full') @@ -674,22 +638,26 @@ class MapResult(ApplyResult): self._number_left = length//chunksize + bool(length % chunksize) def _set(self, i, success_result): + self._number_left -= 1 success, result = success_result - if success: + if success and self._success: self._value[i*self._chunksize:(i+1)*self._chunksize] = result - self._number_left -= 1 if self._number_left == 0: if self._callback: self._callback(self._value) del self._cache[self._job] self._event.set() else: - self._success = False - self._value = result - if self._error_callback: - self._error_callback(self._value) - del self._cache[self._job] - self._event.set() + if not success and self._success: + # only store first exception + self._success = False + self._value = result + if self._number_left == 0: + # only consider the result ready once all jobs are done + if self._error_callback: + self._error_callback(self._value) + del self._cache[self._job] + self._event.set() # # Class whose instances are returned by `Pool.imap()` diff --git a/Lib/multiprocessing/popen_forkserver.py b/Lib/multiprocessing/popen_forkserver.py index e792194..222db2d 100644 --- a/Lib/multiprocessing/popen_forkserver.py +++ b/Lib/multiprocessing/popen_forkserver.py @@ -1,10 +1,9 @@ import io import os -from . import reduction +from .context import reduction, set_spawning_popen if not reduction.HAVE_SEND_HANDLE: raise ImportError('No support for sending fds between processes') -from . import context from . import forkserver from . import popen_fork from . import spawn @@ -42,12 +41,12 @@ class Popen(popen_fork.Popen): def _launch(self, process_obj): prep_data = spawn.get_preparation_data(process_obj._name) buf = io.BytesIO() - context.set_spawning_popen(self) + set_spawning_popen(self) try: reduction.dump(prep_data, buf) reduction.dump(process_obj, buf) finally: - context.set_spawning_popen(None) + set_spawning_popen(None) self.sentinel, w = forkserver.connect_to_new_process(self._fds) util.Finalize(self, os.close, (self.sentinel,)) diff --git a/Lib/multiprocessing/popen_spawn_posix.py b/Lib/multiprocessing/popen_spawn_posix.py index 6b0a8d6..98f8f0a 100644 --- a/Lib/multiprocessing/popen_spawn_posix.py +++ b/Lib/multiprocessing/popen_spawn_posix.py @@ -1,9 +1,8 @@ import io import os -from . import context +from .context import reduction, set_spawning_popen from . import popen_fork -from . import reduction from . import spawn from . import util @@ -42,12 +41,12 @@ class Popen(popen_fork.Popen): self._fds.append(tracker_fd) prep_data = spawn.get_preparation_data(process_obj._name) fp = io.BytesIO() - context.set_spawning_popen(self) + set_spawning_popen(self) try: reduction.dump(prep_data, fp) reduction.dump(process_obj, fp) finally: - context.set_spawning_popen(None) + set_spawning_popen(None) parent_r = child_w = child_r = parent_w = None try: diff --git a/Lib/multiprocessing/popen_spawn_win32.py b/Lib/multiprocessing/popen_spawn_win32.py index 3b53068..6fd588f 100644 --- a/Lib/multiprocessing/popen_spawn_win32.py +++ b/Lib/multiprocessing/popen_spawn_win32.py @@ -4,9 +4,8 @@ import signal import sys import _winapi -from . import context +from .context import reduction, get_spawning_popen, set_spawning_popen from . import spawn -from . import reduction from . import util __all__ = ['Popen'] @@ -60,15 +59,15 @@ class Popen(object): util.Finalize(self, _winapi.CloseHandle, (self.sentinel,)) # send information to child - context.set_spawning_popen(self) + set_spawning_popen(self) try: reduction.dump(prep_data, to_child) reduction.dump(process_obj, to_child) finally: - context.set_spawning_popen(None) + set_spawning_popen(None) def duplicate_for_child(self, handle): - assert self is context.get_spawning_popen() + assert self is get_spawning_popen() return reduction.duplicate(handle, self.sentinel) def wait(self, timeout=None): diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index f9c2270..bca8b7a 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -104,9 +104,6 @@ class BaseProcess(object): _cleanup() self._popen = self._Popen(self) self._sentinel = self._popen.sentinel - # Avoid a refcycle if the target function holds an indirect - # reference to the process object (see bpo-30775) - del self._target, self._args, self._kwargs _children.add(self) def terminate(self): diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py index e6fe5be..dda03dd 100644 --- a/Lib/multiprocessing/queues.py +++ b/Lib/multiprocessing/queues.py @@ -23,9 +23,9 @@ import _multiprocessing from . import connection from . import context +_ForkingPickler = context.reduction.ForkingPickler from .util import debug, info, Finalize, register_after_fork, is_exiting -from .reduction import ForkingPickler # # Queue type using a pipe, buffer and thread @@ -110,7 +110,7 @@ class Queue(object): finally: self._rlock.release() # unserialize the data after having released the lock - return ForkingPickler.loads(res) + return _ForkingPickler.loads(res) def qsize(self): # Raises NotImplementedError on Mac OSX because of broken sem_getvalue() @@ -169,7 +169,14 @@ class Queue(object): self._thread.start() debug('... done self._thread.start()') - if not self._joincancelled: + # On process exit we will wait for data to be flushed to pipe. + # + # However, if this process created the queue then all + # processes which use the queue will be descendants of this + # process. Therefore waiting for the queue to be flushed + # is pointless once all the child processes have been joined. + created_by_this_process = (self._opid == os.getpid()) + if not self._joincancelled and not created_by_this_process: self._jointhread = Finalize( self._thread, Queue._finalize_join, [weakref.ref(self._thread)], @@ -214,8 +221,8 @@ class Queue(object): else: wacquire = None - while 1: - try: + try: + while 1: nacquire() try: if not buffer: @@ -231,7 +238,7 @@ class Queue(object): return # serialize the data before acquiring the lock - obj = ForkingPickler.dumps(obj) + obj = _ForkingPickler.dumps(obj) if wacquire is None: send_bytes(obj) else: @@ -242,19 +249,21 @@ class Queue(object): wrelease() except IndexError: pass - except Exception as e: - if ignore_epipe and getattr(e, 'errno', 0) == errno.EPIPE: - return - # Since this runs in a daemon thread the resources it uses - # may be become unusable while the process is cleaning up. - # We ignore errors which happen after the process has - # started to cleanup. + except Exception as e: + if ignore_epipe and getattr(e, 'errno', 0) == errno.EPIPE: + return + # Since this runs in a daemon thread the resources it uses + # may be become unusable while the process is cleaning up. + # We ignore errors which happen after the process has + # started to cleanup. + try: if is_exiting(): info('error in queue thread: %s', e) - return else: import traceback traceback.print_exc() + except Exception: + pass _sentinel = object() @@ -328,17 +337,16 @@ class SimpleQueue(object): def __setstate__(self, state): (self._reader, self._writer, self._rlock, self._wlock) = state - self._poll = self._reader.poll def get(self): with self._rlock: res = self._reader.recv_bytes() # unserialize the data after having released the lock - return ForkingPickler.loads(res) + return _ForkingPickler.loads(res) def put(self, obj): # serialize the data before acquiring the lock - obj = ForkingPickler.dumps(obj) + obj = _ForkingPickler.dumps(obj) if self._wlock is None: # writes to a message oriented win32 pipe are atomic self._writer.send_bytes(obj) diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py index 8f209b4..c043c9a 100644 --- a/Lib/multiprocessing/reduction.py +++ b/Lib/multiprocessing/reduction.py @@ -7,6 +7,7 @@ # Licensed to PSF under a Contributor Agreement. # +from abc import ABCMeta, abstractmethod import copyreg import functools import io @@ -238,3 +239,36 @@ else: fd = df.detach() return socket.socket(family, type, proto, fileno=fd) register(socket.socket, _reduce_socket) + + +class AbstractReducer(metaclass=ABCMeta): + '''Abstract base class for use in implementing a Reduction class + suitable for use in replacing the standard reduction mechanism + used in multiprocessing.''' + ForkingPickler = ForkingPickler + register = register + dump = dump + send_handle = send_handle + recv_handle = recv_handle + + if sys.platform == 'win32': + steal_handle = steal_handle + duplicate = duplicate + DupHandle = DupHandle + else: + sendfds = sendfds + recvfds = recvfds + DupFd = DupFd + + _reduce_method = _reduce_method + _reduce_method_descriptor = _reduce_method_descriptor + _rebuild_partial = _rebuild_partial + _reduce_socket = _reduce_socket + _rebuild_socket = _rebuild_socket + + def __init__(self, *args): + register(type(_C().f), _reduce_method) + register(type(list.append), _reduce_method_descriptor) + register(type(int.__add__), _reduce_method_descriptor) + register(functools.partial, _reduce_partial) + register(socket.socket, _reduce_socket) diff --git a/Lib/multiprocessing/resource_sharer.py b/Lib/multiprocessing/resource_sharer.py index 5e46fc6..e44a728 100644 --- a/Lib/multiprocessing/resource_sharer.py +++ b/Lib/multiprocessing/resource_sharer.py @@ -15,7 +15,7 @@ import sys import threading from . import process -from . import reduction +from .context import reduction from . import util __all__ = ['stop'] diff --git a/Lib/multiprocessing/sharedctypes.py b/Lib/multiprocessing/sharedctypes.py index 4258f59..25cbcf2 100644 --- a/Lib/multiprocessing/sharedctypes.py +++ b/Lib/multiprocessing/sharedctypes.py @@ -13,8 +13,8 @@ import weakref from . import heap from . import get_context -from .context import assert_spawning -from .reduction import ForkingPickler +from .context import reduction, assert_spawning +_ForkingPickler = reduction.ForkingPickler __all__ = ['RawValue', 'RawArray', 'Value', 'Array', 'copy', 'synchronized'] @@ -134,7 +134,7 @@ def reduce_ctype(obj): def rebuild_ctype(type_, wrapper, length): if length is not None: type_ = type_ * length - ForkingPickler.register(type_, reduce_ctype) + _ForkingPickler.register(type_, reduce_ctype) buf = wrapper.create_memoryview() obj = type_.from_buffer(buf) obj._wrapper = wrapper diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py index 392c159..dfb9f65 100644 --- a/Lib/multiprocessing/spawn.py +++ b/Lib/multiprocessing/spawn.py @@ -9,13 +9,13 @@ # import os -import pickle import sys import runpy import types from . import get_start_method, set_start_method from . import process +from .context import reduction from . import util __all__ = ['_main', 'freeze_support', 'set_executable', 'get_executable', @@ -96,8 +96,7 @@ def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None): assert is_forking(sys.argv) if sys.platform == 'win32': import msvcrt - from .reduction import steal_handle - new_handle = steal_handle(parent_pid, pipe_handle) + new_handle = reduction.steal_handle(parent_pid, pipe_handle) fd = msvcrt.open_osfhandle(new_handle, os.O_RDONLY) else: from . import semaphore_tracker @@ -111,9 +110,9 @@ def _main(fd): with os.fdopen(fd, 'rb', closefd=True) as from_parent: process.current_process()._inheriting = True try: - preparation_data = pickle.load(from_parent) + preparation_data = reduction.pickle.load(from_parent) prepare(preparation_data) - self = pickle.load(from_parent) + self = reduction.pickle.load(from_parent) finally: del process.current_process()._inheriting return self._bootstrap() @@ -218,7 +217,7 @@ def prepare(data): process.ORIGINAL_DIR = data['orig_dir'] if 'start_method' in data: - set_start_method(data['start_method'], force=True) + set_start_method(data['start_method']) if 'init_main_from_name' in data: _fixup_main_from_name(data['init_main_from_name']) diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index b490caa..1a2c0db 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -241,28 +241,20 @@ def _run_finalizers(minpriority=None): return if minpriority is None: - f = lambda p : p[0] is not None + f = lambda p : p[0][0] is not None else: - f = lambda p : p[0] is not None and p[0] >= minpriority - - # Careful: _finalizer_registry may be mutated while this function - # is running (either by a GC run or by another thread). - - # list(_finalizer_registry) should be atomic, while - # list(_finalizer_registry.items()) is not. - keys = [key for key in list(_finalizer_registry) if f(key)] - keys.sort(reverse=True) - - for key in keys: - finalizer = _finalizer_registry.get(key) - # key may have been removed from the registry - if finalizer is not None: - sub_debug('calling %s', finalizer) - try: - finalizer() - except Exception: - import traceback - traceback.print_exc() + f = lambda p : p[0][0] is not None and p[0][0] >= minpriority + + items = [x for x in list(_finalizer_registry.items()) if f(x)] + items.sort(reverse=True) + + for key, finalizer in items: + sub_debug('calling %s', finalizer) + try: + finalizer() + except Exception: + import traceback + traceback.print_exc() if minpriority is None: _finalizer_registry.clear() @@ -394,7 +386,7 @@ def _close_stdin(): def spawnv_passfds(path, args, passfds): import _posixsubprocess - passfds = tuple(sorted(map(int, passfds))) + passfds = sorted(passfds) errpipe_read, errpipe_write = os.pipe() try: return _posixsubprocess.fork_exec( diff --git a/Lib/ntpath.py b/Lib/ntpath.py index af6a709..a8f4b37 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -28,8 +28,6 @@ sep = '\\' pathsep = ';' altsep = '/' defpath = '.;C:\\bin' -if 'ce' in sys.builtin_module_names: - defpath = '\\Windows' devnull = 'nul' def _get_bothseps(path): @@ -46,6 +44,7 @@ def normcase(s): """Normalize case of pathname. Makes all characters lowercase and all slashes into backslashes.""" + s = os.fspath(s) try: if isinstance(s, bytes): return s.replace(b'/', b'\\').lower() @@ -66,12 +65,14 @@ def normcase(s): def isabs(s): """Test whether a path is absolute""" + s = os.fspath(s) s = splitdrive(s)[1] return len(s) > 0 and s[0] in _get_bothseps(s) # Join two (or more) paths. def join(path, *paths): + path = os.fspath(path) if isinstance(path, bytes): sep = b'\\' seps = b'\\/' @@ -84,7 +85,7 @@ def join(path, *paths): if not paths: path[:0] + sep #23780: Ensure compatible data type even if p is null. result_drive, result_path = splitdrive(path) - for p in paths: + for p in map(os.fspath, paths): p_drive, p_path = splitdrive(p) if p_path and p_path[0] in seps: # Second path is absolute @@ -136,6 +137,7 @@ def splitdrive(p): Paths cannot contain both a drive letter and a UNC path. """ + p = os.fspath(p) if len(p) >= 2: if isinstance(p, bytes): sep = b'\\' @@ -199,7 +201,7 @@ def split(p): Return tuple (head, tail) where tail is everything after the final slash. Either part may be empty.""" - + p = os.fspath(p) seps = _get_bothseps(p) d, p = splitdrive(p) # set i to index beyond p's last slash @@ -218,6 +220,7 @@ def split(p): # It is always true that root + ext == p. def splitext(p): + p = os.fspath(p) if isinstance(p, bytes): return genericpath._splitext(p, b'\\', b'/', b'.') else: @@ -278,6 +281,7 @@ except ImportError: def ismount(path): """Test whether a path is a mount point (a drive root, the root of a share, or a mounted volume)""" + path = os.fspath(path) seps = _get_bothseps(path) path = abspath(path) root, rest = splitdrive(path) @@ -305,6 +309,7 @@ def expanduser(path): """Expand ~ and ~user constructs. If user or $HOME is unknown, do nothing.""" + path = os.fspath(path) if isinstance(path, bytes): tilde = b'~' else: @@ -354,6 +359,7 @@ def expandvars(path): """Expand shell variables of the forms $var, ${var} and %var%. Unknown variables are left unchanged.""" + path = os.fspath(path) if isinstance(path, bytes): if b'$' not in path and b'%' not in path: return path @@ -464,6 +470,7 @@ def expandvars(path): def normpath(path): """Normalize path, eliminating double slashes, etc.""" + path = os.fspath(path) if isinstance(path, bytes): sep = b'\\' altsep = b'/' @@ -518,6 +525,7 @@ try: except ImportError: # not running on Windows - mock up something sensible def abspath(path): """Return the absolute version of a path.""" + path = os.fspath(path) if not isabs(path): if isinstance(path, bytes): cwd = os.getcwdb() @@ -531,6 +539,7 @@ else: # use native Windows method on Windows """Return the absolute version of a path.""" if path: # Empty path must return current working directory. + path = os.fspath(path) try: path = _getfullpathname(path) except OSError: @@ -549,6 +558,7 @@ supports_unicode_filenames = (hasattr(sys, "getwindowsversion") and def relpath(path, start=None): """Return a relative version of a path""" + path = os.fspath(path) if isinstance(path, bytes): sep = b'\\' curdir = b'.' @@ -564,6 +574,7 @@ def relpath(path, start=None): if not path: raise ValueError("no path specified") + start = os.fspath(start) try: start_abs = abspath(normpath(start)) path_abs = abspath(normpath(path)) @@ -607,6 +618,7 @@ def commonpath(paths): if not paths: raise ValueError('commonpath() arg is an empty sequence') + paths = tuple(map(os.fspath, paths)) if isinstance(paths[0], bytes): sep = b'\\' altsep = b'/' diff --git a/Lib/opcode.py b/Lib/opcode.py index 4c826a7..b5916b6 100644 --- a/Lib/opcode.py +++ b/Lib/opcode.py @@ -31,12 +31,10 @@ hasjabs = [] haslocal = [] hascompare = [] hasfree = [] -hasnargs = [] +hasnargs = [] # unused opmap = {} -opname = [''] * 256 -for op in range(256): opname[op] = '<%r>' % (op,) -del op +opname = ['<%r>' % (op,) for op in range(256)] def def_op(name, op): opname[op] = name @@ -121,7 +119,7 @@ def_op('WITH_CLEANUP_FINISH', 82) def_op('RETURN_VALUE', 83) def_op('IMPORT_STAR', 84) - +def_op('SETUP_ANNOTATIONS', 85) def_op('YIELD_VALUE', 86) def_op('POP_BLOCK', 87) def_op('END_FINALLY', 88) @@ -171,13 +169,12 @@ def_op('STORE_FAST', 125) # Local variable number haslocal.append(125) def_op('DELETE_FAST', 126) # Local variable number haslocal.append(126) +name_op('STORE_ANNOTATION', 127) # Index in name list def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3) -def_op('CALL_FUNCTION', 131) # #args + (#kwargs << 8) -hasnargs.append(131) -def_op('MAKE_FUNCTION', 132) # Number of args with default values +def_op('CALL_FUNCTION', 131) # #args +def_op('MAKE_FUNCTION', 132) # Flags def_op('BUILD_SLICE', 133) # Number of items -def_op('MAKE_CLOSURE', 134) def_op('LOAD_CLOSURE', 135) hasfree.append(135) def_op('LOAD_DEREF', 136) @@ -187,12 +184,8 @@ hasfree.append(137) def_op('DELETE_DEREF', 138) hasfree.append(138) -def_op('CALL_FUNCTION_VAR', 140) # #args + (#kwargs << 8) -hasnargs.append(140) -def_op('CALL_FUNCTION_KW', 141) # #args + (#kwargs << 8) -hasnargs.append(141) -def_op('CALL_FUNCTION_VAR_KW', 142) # #args + (#kwargs << 8) -hasnargs.append(142) +def_op('CALL_FUNCTION_KW', 141) # #args + #kwargs +def_op('CALL_FUNCTION_EX', 142) # Flags jrel_op('SETUP_WITH', 143) @@ -203,8 +196,6 @@ def_op('MAP_ADD', 147) def_op('LOAD_CLASSDEREF', 148) hasfree.append(148) -jrel_op('SETUP_ASYNC_WITH', 154) - def_op('EXTENDED_ARG', 144) EXTENDED_ARG = 144 @@ -214,4 +205,11 @@ def_op('BUILD_MAP_UNPACK_WITH_CALL', 151) def_op('BUILD_TUPLE_UNPACK', 152) def_op('BUILD_SET_UNPACK', 153) +jrel_op('SETUP_ASYNC_WITH', 154) + +def_op('FORMAT_VALUE', 155) +def_op('BUILD_CONST_KEY_MAP', 156) +def_op('BUILD_STRING', 157) +def_op('BUILD_TUPLE_UNPACK_WITH_CALL', 158) + del def_op, name_op, jrel_op, jabs_op diff --git a/Lib/optparse.py b/Lib/optparse.py index 74b3b36..e8ac1e1 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -38,7 +38,8 @@ __all__ = ['Option', 'OptionError', 'OptionConflictError', 'OptionValueError', - 'BadOptionError'] + 'BadOptionError', + 'check_choice'] __copyright__ = """ Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved. diff --git a/Lib/os.py b/Lib/os.py index b1add54..fa06f39 100644 --- a/Lib/os.py +++ b/Lib/os.py @@ -1,12 +1,12 @@ r"""OS routines for NT or Posix depending on what system we're on. This exports: - - all functions from posix, nt or ce, e.g. unlink, stat, etc. + - all functions from posix or nt, e.g. unlink, stat, etc. - os.path is either posixpath or ntpath - - os.name is either 'posix', 'nt' or 'ce'. - - os.curdir is a string representing the current directory ('.' or ':') - - os.pardir is a string representing the parent directory ('..' or '::') - - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\') + - os.name is either 'posix' or 'nt' + - os.curdir is a string representing the current directory (always '.') + - os.pardir is a string representing the parent directory (always '..') + - os.sep is the (or a most common) pathname separator ('/' or '\\') - os.extsep is the extension separator (always '.') - os.altsep is the alternate pathname separator (None or '/') - os.pathsep is the component separator used in $PATH etc @@ -22,7 +22,7 @@ and opendir), and leave all pathname manipulation to os.path """ #' - +import abc import sys, errno import stat as st @@ -85,27 +85,6 @@ elif 'nt' in _names: except ImportError: pass -elif 'ce' in _names: - name = 'ce' - linesep = '\r\n' - from ce import * - try: - from ce import _exit - __all__.append('_exit') - except ImportError: - pass - # We can use the standard Windows path. - import ntpath as path - - import ce - __all__.extend(_get_exports_list(ce)) - del ce - - try: - from ce import _have_functions - except ImportError: - pass - else: raise ImportError('no os specific module found') @@ -353,9 +332,10 @@ def walk(top, topdown=True, onerror=None, followlinks=False): dirs.remove('CVS') # don't visit CVS directories """ - + top = fspath(top) dirs = [] nondirs = [] + walk_dirs = [] # We may not have read permission for top, in which case we can't # get a list of the files the directory contains. os.walk @@ -363,48 +343,55 @@ def walk(top, topdown=True, onerror=None, followlinks=False): # minor reason when (say) a thousand readable directories are still # left to visit. That logic is copied here. try: - if name == 'nt' and isinstance(top, bytes): - scandir_it = _dummy_scandir(top) - else: - # Note that scandir is global in this module due - # to earlier import-*. - scandir_it = scandir(top) - entries = list(scandir_it) + # Note that scandir is global in this module due + # to earlier import-*. + scandir_it = scandir(top) except OSError as error: if onerror is not None: onerror(error) return - for entry in entries: - try: - is_dir = entry.is_dir() - except OSError: - # If is_dir() raises an OSError, consider that the entry is not - # a directory, same behaviour than os.path.isdir(). - is_dir = False + with scandir_it: + while True: + try: + try: + entry = next(scandir_it) + except StopIteration: + break + except OSError as error: + if onerror is not None: + onerror(error) + return - if is_dir: - dirs.append(entry.name) - else: - nondirs.append(entry.name) + try: + is_dir = entry.is_dir() + except OSError: + # If is_dir() raises an OSError, consider that the entry is not + # a directory, same behaviour than os.path.isdir(). + is_dir = False - if not topdown and is_dir: - # Bottom-up: recurse into sub-directory, but exclude symlinks to - # directories if followlinks is False - if followlinks: - walk_into = True + if is_dir: + dirs.append(entry.name) else: - try: - is_symlink = entry.is_symlink() - except OSError: - # If is_symlink() raises an OSError, consider that the - # entry is not a symbolic link, same behaviour than - # os.path.islink(). - is_symlink = False - walk_into = not is_symlink + nondirs.append(entry.name) - if walk_into: - yield from walk(entry.path, topdown, onerror, followlinks) + if not topdown and is_dir: + # Bottom-up: recurse into sub-directory, but exclude symlinks to + # directories if followlinks is False + if followlinks: + walk_into = True + else: + try: + is_symlink = entry.is_symlink() + except OSError: + # If is_symlink() raises an OSError, consider that the + # entry is not a symbolic link, same behaviour than + # os.path.islink(). + is_symlink = False + walk_into = not is_symlink + + if walk_into: + walk_dirs.append(entry.path) # Yield before recursion if going top down if topdown: @@ -421,57 +408,12 @@ def walk(top, topdown=True, onerror=None, followlinks=False): if followlinks or not islink(new_path): yield from walk(new_path, topdown, onerror, followlinks) else: + # Recurse into sub-directories + for new_path in walk_dirs: + yield from walk(new_path, topdown, onerror, followlinks) # Yield after recursion if going bottom up yield top, dirs, nondirs -class _DummyDirEntry: - """Dummy implementation of DirEntry - - Only used internally by os.walk(bytes). Since os.walk() doesn't need the - follow_symlinks parameter: don't implement it, always follow symbolic - links. - """ - - def __init__(self, dir, name): - self.name = name - self.path = path.join(dir, name) - # Mimick FindFirstFile/FindNextFile: we should get file attributes - # while iterating on a directory - self._stat = None - self._lstat = None - try: - self.stat(follow_symlinks=False) - except OSError: - pass - - def stat(self, *, follow_symlinks=True): - if follow_symlinks: - if self._stat is None: - self._stat = stat(self.path) - return self._stat - else: - if self._lstat is None: - self._lstat = stat(self.path, follow_symlinks=False) - return self._lstat - - def is_dir(self): - if self._lstat is not None and not self.is_symlink(): - # use the cache lstat - stat = self.stat(follow_symlinks=False) - return st.S_ISDIR(stat.st_mode) - - stat = self.stat() - return st.S_ISDIR(stat.st_mode) - - def is_symlink(self): - stat = self.stat(follow_symlinks=False) - return st.S_ISLNK(stat.st_mode) - -def _dummy_scandir(dir): - # listdir-based implementation for bytes patches on Windows - for name in listdir(dir): - yield _DummyDirEntry(dir, name) - __all__.append("walk") if {open, stat} <= supports_dir_fd and {listdir, stat} <= supports_fd: @@ -509,6 +451,8 @@ if {open, stat} <= supports_dir_fd and {listdir, stat} <= supports_fd: if 'CVS' in dirs: dirs.remove('CVS') # don't visit CVS directories """ + if not isinstance(top, int) or not hasattr(top, '__index__'): + top = fspath(top) # Note: To guard against symlink races, we use the standard # lstat()/open()/fstat() trick. orig_st = stat(top, follow_symlinks=False, dir_fd=dir_fd) @@ -741,9 +685,7 @@ class _Environ(MutableMapping): raise KeyError(key) from None def __iter__(self): - # list() from dict object is an atomic operation - keys = list(self._data) - for key in keys: + for key in self._data: yield self.decodekey(key) def __len__(self): @@ -845,36 +787,31 @@ if supports_bytes_environ: def _fscodec(): encoding = sys.getfilesystemencoding() - if encoding == 'mbcs': - errors = 'strict' - else: - errors = 'surrogateescape' + errors = sys.getfilesystemencodeerrors() def fsencode(filename): + """Encode filename (an os.PathLike, bytes, or str) to the filesystem + encoding with 'surrogateescape' error handler, return bytes unchanged. + On Windows, use 'strict' error handler if the file system encoding is + 'mbcs' (which is the default encoding). """ - Encode filename to the filesystem encoding with 'surrogateescape' error - handler, return bytes unchanged. On Windows, use 'strict' error handler if - the file system encoding is 'mbcs' (which is the default encoding). - """ - if isinstance(filename, bytes): - return filename - elif isinstance(filename, str): + filename = fspath(filename) # Does type-checking of `filename`. + if isinstance(filename, str): return filename.encode(encoding, errors) else: - raise TypeError("expect bytes or str, not %s" % type(filename).__name__) + return filename def fsdecode(filename): + """Decode filename (an os.PathLike, bytes, or str) from the filesystem + encoding with 'surrogateescape' error handler, return str unchanged. On + Windows, use 'strict' error handler if the file system encoding is + 'mbcs' (which is the default encoding). """ - Decode filename from the filesystem encoding with 'surrogateescape' error - handler, return str unchanged. On Windows, use 'strict' error handler if - the file system encoding is 'mbcs' (which is the default encoding). - """ - if isinstance(filename, str): - return filename - elif isinstance(filename, bytes): + filename = fspath(filename) # Does type-checking of `filename`. + if isinstance(filename, bytes): return filename.decode(encoding, errors) else: - raise TypeError("expect bytes or str, not %s" % type(filename).__name__) + return filename return fsencode, fsdecode @@ -895,6 +832,10 @@ if _exists("fork") and not _exists("spawnv") and _exists("execv"): def _spawnvef(mode, file, args, env, func): # Internal helper; func is the exec*() function to use + if not isinstance(args, (tuple, list)): + raise TypeError('argv must be a tuple or a list') + if not args or not args[0]: + raise ValueError('argv first element cannot be empty') pid = fork() if not pid: # Child @@ -1072,3 +1013,55 @@ def fdopen(fd, *args, **kwargs): raise TypeError("invalid fd type (%s, expected integer)" % type(fd)) import io return io.open(fd, *args, **kwargs) + + +# For testing purposes, make sure the function is available when the C +# implementation exists. +def _fspath(path): + """Return the path representation of a path-like object. + + If str or bytes is passed in, it is returned unchanged. Otherwise the + os.PathLike interface is used to get the path representation. If the + path representation is not str or bytes, TypeError is raised. If the + provided path is not str, bytes, or os.PathLike, TypeError is raised. + """ + if isinstance(path, (str, bytes)): + return path + + # Work from the object's type to match method resolution of other magic + # methods. + path_type = type(path) + try: + path_repr = path_type.__fspath__(path) + except AttributeError: + if hasattr(path_type, '__fspath__'): + raise + else: + raise TypeError("expected str, bytes or os.PathLike object, " + "not " + path_type.__name__) + if isinstance(path_repr, (str, bytes)): + return path_repr + else: + raise TypeError("expected {}.__fspath__() to return str or bytes, " + "not {}".format(path_type.__name__, + type(path_repr).__name__)) + +# If there is no C implementation, make the pure Python version the +# implementation as transparently as possible. +if not _exists('fspath'): + fspath = _fspath + fspath.__name__ = "fspath" + + +class PathLike(abc.ABC): + + """Abstract base class for implementing the file system path protocol.""" + + @abc.abstractmethod + def __fspath__(self): + """Return the file system path representation of the object.""" + raise NotImplementedError + + @classmethod + def __subclasshook__(cls, subclass): + return hasattr(subclass, '__fspath__') diff --git a/Lib/pathlib.py b/Lib/pathlib.py index 29914b9..6965393 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -178,12 +178,26 @@ class _WindowsFlavour(_Flavour): def casefold_parts(self, parts): return [p.lower() for p in parts] - def resolve(self, path): + def resolve(self, path, strict=False): s = str(path) if not s: return os.getcwd() + previous_s = None if _getfinalpathname is not None: - return self._ext_to_normal(_getfinalpathname(s)) + if strict: + return self._ext_to_normal(_getfinalpathname(s)) + else: + while True: + try: + s = self._ext_to_normal(_getfinalpathname(s)) + except FileNotFoundError: + previous_s = s + s = os.path.abspath(os.path.join(s, os.pardir)) + else: + if previous_s is None: + return s + else: + return s + os.path.sep + os.path.basename(previous_s) # Means fallback on absolute return None @@ -285,7 +299,7 @@ class _PosixFlavour(_Flavour): def casefold_parts(self, parts): return parts - def resolve(self, path): + def resolve(self, path, strict=False): sep = self.sep accessor = path._accessor seen = {} @@ -315,7 +329,10 @@ class _PosixFlavour(_Flavour): target = accessor.readlink(newpath) except OSError as e: if e.errno != EINVAL: - raise + if strict: + raise + else: + return newpath # Not a symlink path = newpath else: @@ -385,6 +402,8 @@ class _NormalAccessor(_Accessor): listdir = _wrap_strfunc(os.listdir) + scandir = _wrap_strfunc(os.scandir) + chmod = _wrap_strfunc(os.chmod) if hasattr(os, "lchmod"): @@ -429,25 +448,6 @@ _normal_accessor = _NormalAccessor() # Globbing helpers # -@contextmanager -def _cached(func): - try: - func.__cached__ - yield func - except AttributeError: - cache = {} - def wrapper(*args): - try: - return cache[args] - except KeyError: - value = cache[args] = func(*args) - return value - wrapper.__cached__ = True - try: - yield wrapper - finally: - cache.clear() - def _make_selector(pattern_parts): pat = pattern_parts[0] child_parts = pattern_parts[1:] @@ -473,8 +473,10 @@ class _Selector: self.child_parts = child_parts if child_parts: self.successor = _make_selector(child_parts) + self.dironly = True else: self.successor = _TerminatingSelector() + self.dironly = False def select_from(self, parent_path): """Iterate over all child paths of `parent_path` matched by this @@ -482,13 +484,15 @@ class _Selector: path_cls = type(parent_path) is_dir = path_cls.is_dir exists = path_cls.exists - listdir = parent_path._accessor.listdir - return self._select_from(parent_path, is_dir, exists, listdir) + scandir = parent_path._accessor.scandir + if not is_dir(parent_path): + return iter([]) + return self._select_from(parent_path, is_dir, exists, scandir) class _TerminatingSelector: - def _select_from(self, parent_path, is_dir, exists, listdir): + def _select_from(self, parent_path, is_dir, exists, scandir): yield parent_path @@ -498,13 +502,11 @@ class _PreciseSelector(_Selector): self.name = name _Selector.__init__(self, child_parts) - def _select_from(self, parent_path, is_dir, exists, listdir): + def _select_from(self, parent_path, is_dir, exists, scandir): try: - if not is_dir(parent_path): - return path = parent_path._make_child_relpath(self.name) - if exists(path): - for p in self.successor._select_from(path, is_dir, exists, listdir): + if (is_dir if self.dironly else exists)(path): + for p in self.successor._select_from(path, is_dir, exists, scandir): yield p except PermissionError: return @@ -516,17 +518,18 @@ class _WildcardSelector(_Selector): self.pat = re.compile(fnmatch.translate(pat)) _Selector.__init__(self, child_parts) - def _select_from(self, parent_path, is_dir, exists, listdir): + def _select_from(self, parent_path, is_dir, exists, scandir): try: - if not is_dir(parent_path): - return cf = parent_path._flavour.casefold - for name in listdir(parent_path): - casefolded = cf(name) - if self.pat.match(casefolded): - path = parent_path._make_child_relpath(name) - for p in self.successor._select_from(path, is_dir, exists, listdir): - yield p + entries = list(scandir(parent_path)) + for entry in entries: + if not self.dironly or entry.is_dir(): + name = entry.name + casefolded = cf(name) + if self.pat.match(casefolded): + path = parent_path._make_child_relpath(name) + for p in self.successor._select_from(path, is_dir, exists, scandir): + yield p except PermissionError: return @@ -537,32 +540,30 @@ class _RecursiveWildcardSelector(_Selector): def __init__(self, pat, child_parts): _Selector.__init__(self, child_parts) - def _iterate_directories(self, parent_path, is_dir, listdir): + def _iterate_directories(self, parent_path, is_dir, scandir): yield parent_path try: - for name in listdir(parent_path): - path = parent_path._make_child_relpath(name) - if is_dir(path) and not path.is_symlink(): - for p in self._iterate_directories(path, is_dir, listdir): + entries = list(scandir(parent_path)) + for entry in entries: + if entry.is_dir() and not entry.is_symlink(): + path = parent_path._make_child_relpath(entry.name) + for p in self._iterate_directories(path, is_dir, scandir): yield p except PermissionError: return - def _select_from(self, parent_path, is_dir, exists, listdir): + def _select_from(self, parent_path, is_dir, exists, scandir): try: - if not is_dir(parent_path): - return - with _cached(listdir) as listdir: - yielded = set() - try: - successor_select = self.successor._select_from - for starting_point in self._iterate_directories(parent_path, is_dir, listdir): - for p in successor_select(starting_point, is_dir, exists, listdir): - if p not in yielded: - yield p - yielded.add(p) - finally: - yielded.clear() + yielded = set() + try: + successor_select = self.successor._select_from + for starting_point in self._iterate_directories(parent_path, is_dir, scandir): + for p in successor_select(starting_point, is_dir, exists, scandir): + if p not in yielded: + yield p + yielded.add(p) + finally: + yielded.clear() except PermissionError: return @@ -634,13 +635,16 @@ class PurePath(object): for a in args: if isinstance(a, PurePath): parts += a._parts - elif isinstance(a, str): - # Force-cast str subclasses to str (issue #21127) - parts.append(str(a)) else: - raise TypeError( - "argument should be a path or str object, not %r" - % type(a)) + a = os.fspath(a) + if isinstance(a, str): + # Force-cast str subclasses to str (issue #21127) + parts.append(str(a)) + else: + raise TypeError( + "argument should be a str object or an os.PathLike " + "object returning str, not %r" + % type(a)) return cls._flavour.parse_parts(parts) @classmethod @@ -693,6 +697,9 @@ class PurePath(object): self._parts) or '.' return self._str + def __fspath__(self): + return str(self) + def as_posix(self): """Return the string representation of the path with forward (/) slashes.""" @@ -943,6 +950,10 @@ class PurePath(object): return False return True +# Can't subclass os.PathLike from PurePath and keep the constructor +# optimizations in PurePath._parse_args(). +os.PathLike.register(PurePath) + class PurePosixPath(PurePath): _flavour = _posix_flavour @@ -1098,7 +1109,7 @@ class Path(PurePath): obj._init(template=self) return obj - def resolve(self): + def resolve(self, strict=False): """ Make the path absolute, resolving all symlinks on the way and also normalizing it (for example turning slashes into backslashes under @@ -1106,7 +1117,7 @@ class Path(PurePath): """ if self._closed: self._raise_closed() - s = self._flavour.resolve(self) + s = self._flavour.resolve(self, strict=strict) if s is None: # No symlink resolution => for consistency, raise an error if # the path doesn't exist or is forbidden @@ -1207,23 +1218,25 @@ class Path(PurePath): os.close(fd) def mkdir(self, mode=0o777, parents=False, exist_ok=False): - """ - Create a new directory at this given path. - """ if self._closed: self._raise_closed() - try: - self._accessor.mkdir(self, mode) - except FileNotFoundError: - if not parents or self.parent == self: - raise - self.parent.mkdir(parents=True, exist_ok=True) - self.mkdir(mode, parents=False, exist_ok=exist_ok) - except OSError: - # Cannot rely on checking for EEXIST, since the operating system - # could give priority to other errors like EACCES or EROFS - if not exist_ok or not self.is_dir(): - raise + if not parents: + try: + self._accessor.mkdir(self, mode) + except FileExistsError: + if not exist_ok or not self.is_dir(): + raise + else: + try: + self._accessor.mkdir(self, mode) + except FileExistsError: + if not exist_ok or not self.is_dir(): + raise + except OSError as e: + if e.errno != ENOENT: + raise + self.parent.mkdir(parents=True) + self._accessor.mkdir(self, mode) def chmod(self, mode): """ diff --git a/Lib/pdb.py b/Lib/pdb.py index 4797265..97618b0 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -52,7 +52,8 @@ If a file ".pdbrc" exists in your home directory or in the current directory, it is read in and executed as if it had been typed at the debugger prompt. This is particularly useful for aliases. If both files exist, the one in the home directory is read first and aliases -defined there can be overridden by the local file. +defined there can be overridden by the local file. This behavior can be +disabled by passing the "readrc=False" argument to the Pdb constructor. Aside from aliases, the debugger is not directly programmable; but it is implemented as a class from which you can derive your own debugger @@ -137,7 +138,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): _previous_sigint_handler = None def __init__(self, completekey='tab', stdin=None, stdout=None, skip=None, - nosigint=False): + nosigint=False, readrc=True): bdb.Bdb.__init__(self, skip=skip) cmd.Cmd.__init__(self, completekey, stdin, stdout) if stdout: @@ -160,18 +161,19 @@ class Pdb(bdb.Bdb, cmd.Cmd): # Read $HOME/.pdbrc and ./.pdbrc self.rcLines = [] - if 'HOME' in os.environ: - envHome = os.environ['HOME'] + if readrc: + if 'HOME' in os.environ: + envHome = os.environ['HOME'] + try: + with open(os.path.join(envHome, ".pdbrc")) as rcFile: + self.rcLines.extend(rcFile) + except OSError: + pass try: - with open(os.path.join(envHome, ".pdbrc")) as rcFile: + with open(".pdbrc") as rcFile: self.rcLines.extend(rcFile) except OSError: pass - try: - with open(".pdbrc") as rcFile: - self.rcLines.extend(rcFile) - except OSError: - pass self.commands = {} # associates a command list to breakpoint numbers self.commands_doprompt = {} # for each bp num, tells if the prompt diff --git a/Lib/pickle.py b/Lib/pickle.py index 040ecb2..c8370c9 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -27,6 +27,7 @@ from types import FunctionType from copyreg import dispatch_table from copyreg import _extension_registry, _inverted_registry, _extension_cache from itertools import islice +from functools import partial import sys from sys import maxsize from struct import pack, unpack @@ -548,7 +549,7 @@ class _Pickler: write = self.write func_name = getattr(func, "__name__", "") - if self.proto >= 4 and func_name == "__newobj_ex__": + if self.proto >= 2 and func_name == "__newobj_ex__": cls, args, kwargs = args if not hasattr(cls, "__new__"): raise PicklingError("args[0] from {} args has no __new__" @@ -556,10 +557,16 @@ class _Pickler: if obj is not None and cls is not obj.__class__: raise PicklingError("args[0] from {} args has the wrong class" .format(func_name)) - save(cls) - save(args) - save(kwargs) - write(NEWOBJ_EX) + if self.proto >= 4: + save(cls) + save(args) + save(kwargs) + write(NEWOBJ_EX) + else: + func = partial(cls.__new__, cls, *args, **kwargs) + save(func) + save(()) + write(REDUCE) elif self.proto >= 2 and func_name == "__newobj__": # A __reduce__ implementation can direct protocol 2 or newer to # use the more efficient NEWOBJ opcode, while still @@ -1028,7 +1035,7 @@ class _Unpickler: self._unframer = _Unframer(self._file_read, self._file_readline) self.read = self._unframer.read self.readline = self._unframer.readline - self.mark = object() # any new unique object + self.metastack = [] self.stack = [] self.append = self.stack.append self.proto = 0 @@ -1044,20 +1051,12 @@ class _Unpickler: except _Stop as stopinst: return stopinst.value - # Return largest index k such that self.stack[k] is self.mark. - # If the stack doesn't contain a mark, eventually raises IndexError. - # This could be sped by maintaining another stack, of indices at which - # the mark appears. For that matter, the latter stack would suffice, - # and we wouldn't need to push mark objects on self.stack at all. - # Doing so is probably a good thing, though, since if the pickle is - # corrupt (or hostile) we may get a clue from finding self.mark embedded - # in unpickled objects. - def marker(self): - stack = self.stack - mark = self.mark - k = len(stack)-1 - while stack[k] is not mark: k = k-1 - return k + # Return a list of items pushed in the stack after last MARK instruction. + def pop_mark(self): + items = self.stack + self.stack = self.metastack.pop() + self.append = self.stack.append + return items def persistent_load(self, pid): raise UnpicklingError("unsupported persistent id encountered") @@ -1238,8 +1237,8 @@ class _Unpickler: dispatch[SHORT_BINUNICODE[0]] = load_short_binunicode def load_tuple(self): - k = self.marker() - self.stack[k:] = [tuple(self.stack[k+1:])] + items = self.pop_mark() + self.append(tuple(items)) dispatch[TUPLE[0]] = load_tuple def load_empty_tuple(self): @@ -1271,21 +1270,20 @@ class _Unpickler: dispatch[EMPTY_SET[0]] = load_empty_set def load_frozenset(self): - k = self.marker() - self.stack[k:] = [frozenset(self.stack[k+1:])] + items = self.pop_mark() + self.append(frozenset(items)) dispatch[FROZENSET[0]] = load_frozenset def load_list(self): - k = self.marker() - self.stack[k:] = [self.stack[k+1:]] + items = self.pop_mark() + self.append(items) dispatch[LIST[0]] = load_list def load_dict(self): - k = self.marker() - items = self.stack[k+1:] + items = self.pop_mark() d = {items[i]: items[i+1] for i in range(0, len(items), 2)} - self.stack[k:] = [d] + self.append(d) dispatch[DICT[0]] = load_dict # INST and OBJ differ only in how they get a class object. It's not @@ -1293,9 +1291,7 @@ class _Unpickler: # previously diverged and grew different bugs. # klass is the class to instantiate, and k points to the topmost mark # object, following which are the arguments for klass.__init__. - def _instantiate(self, klass, k): - args = tuple(self.stack[k+1:]) - del self.stack[k:] + def _instantiate(self, klass, args): if (args or not isinstance(klass, type) or hasattr(klass, "__getinitargs__")): try: @@ -1311,14 +1307,14 @@ class _Unpickler: module = self.readline()[:-1].decode("ascii") name = self.readline()[:-1].decode("ascii") klass = self.find_class(module, name) - self._instantiate(klass, self.marker()) + self._instantiate(klass, self.pop_mark()) dispatch[INST[0]] = load_inst def load_obj(self): # Stack is ... markobject classobject arg1 arg2 ... - k = self.marker() - klass = self.stack.pop(k+1) - self._instantiate(klass, k) + args = self.pop_mark() + cls = args.pop(0) + self._instantiate(cls, args) dispatch[OBJ[0]] = load_obj def load_newobj(self): @@ -1403,12 +1399,14 @@ class _Unpickler: dispatch[REDUCE[0]] = load_reduce def load_pop(self): - del self.stack[-1] + if self.stack: + del self.stack[-1] + else: + self.pop_mark() dispatch[POP[0]] = load_pop def load_pop_mark(self): - k = self.marker() - del self.stack[k:] + self.pop_mark() dispatch[POP_MARK[0]] = load_pop_mark def load_dup(self): @@ -1464,17 +1462,14 @@ class _Unpickler: dispatch[APPEND[0]] = load_append def load_appends(self): - stack = self.stack - mark = self.marker() - list_obj = stack[mark - 1] - items = stack[mark + 1:] + items = self.pop_mark() + list_obj = self.stack[-1] if isinstance(list_obj, list): list_obj.extend(items) else: append = list_obj.append for item in items: append(item) - del stack[mark:] dispatch[APPENDS[0]] = load_appends def load_setitem(self): @@ -1486,27 +1481,21 @@ class _Unpickler: dispatch[SETITEM[0]] = load_setitem def load_setitems(self): - stack = self.stack - mark = self.marker() - dict = stack[mark - 1] - for i in range(mark + 1, len(stack), 2): - dict[stack[i]] = stack[i + 1] - - del stack[mark:] + items = self.pop_mark() + dict = self.stack[-1] + for i in range(0, len(items), 2): + dict[items[i]] = items[i + 1] dispatch[SETITEMS[0]] = load_setitems def load_additems(self): - stack = self.stack - mark = self.marker() - set_obj = stack[mark - 1] - items = stack[mark + 1:] + items = self.pop_mark() + set_obj = self.stack[-1] if isinstance(set_obj, set): set_obj.update(items) else: add = set_obj.add for item in items: add(item) - del stack[mark:] dispatch[ADDITEMS[0]] = load_additems def load_build(self): @@ -1534,7 +1523,9 @@ class _Unpickler: dispatch[BUILD[0]] = load_build def load_mark(self): - self.append(self.mark) + self.metastack.append(self.stack) + self.stack = [] + self.append = self.stack.append dispatch[MARK[0]] = load_mark def load_stop(self): diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 16ae7d5..5e129b5 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -707,7 +707,7 @@ def read_unicodestring8(f): >>> enc = s.encode('utf-8') >>> enc b'abcd\xea\xaf\x8d' - >>> n = bytes([len(enc)]) + bytes(7) # little-endian 8-byte length + >>> n = bytes([len(enc)]) + b'\0' * 7 # little-endian 8-byte length >>> t = read_unicodestring8(io.BytesIO(n + enc + b'junk')) >>> s == t True @@ -2440,6 +2440,7 @@ def dis(pickle, out=None, memo=None, indentlevel=4, annotate=0): if opcode.name in ("PUT", "BINPUT", "LONG_BINPUT", "MEMOIZE"): if opcode.name == "MEMOIZE": memo_idx = len(memo) + markmsg = "(as %d)" % memo_idx else: assert arg is not None memo_idx = arg diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index 9d1879a..e37ad45 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -1,5 +1,6 @@ """Utilities to support packages.""" +from collections import namedtuple from functools import singledispatch as simplegeneric import importlib import importlib.util @@ -14,9 +15,14 @@ __all__ = [ 'get_importer', 'iter_importers', 'get_loader', 'find_loader', 'walk_packages', 'iter_modules', 'get_data', 'ImpImporter', 'ImpLoader', 'read_code', 'extend_path', + 'ModuleInfo', ] +ModuleInfo = namedtuple('ModuleInfo', 'module_finder name ispkg') +ModuleInfo.__doc__ = 'A namedtuple with minimal info about a module.' + + def _get_spec(finder, name): """Return the finder-specific module spec.""" # Works with legacy finders. @@ -37,10 +43,7 @@ def read_code(stream): import marshal magic = stream.read(4) - if (magic != importlib.util.MAGIC_NUMBER - # Issue #29537: handle issue27286 bytecode incompatibility - # See Lib/importlib/_bootstrap_external.py - and magic != importlib.util._BACKCOMPAT_MAGIC_NUMBER): + if magic != importlib.util.MAGIC_NUMBER: return None stream.read(8) # Skip timestamp and size @@ -48,7 +51,7 @@ def read_code(stream): def walk_packages(path=None, prefix='', onerror=None): - """Yields (module_finder, name, ispkg) for all modules recursively + """Yields ModuleInfo for all modules recursively on path, or, if path is None, all accessible modules. 'path' should be either None or a list of paths to look for @@ -81,31 +84,31 @@ def walk_packages(path=None, prefix='', onerror=None): return True m[p] = True - for importer, name, ispkg in iter_modules(path, prefix): - yield importer, name, ispkg + for info in iter_modules(path, prefix): + yield info - if ispkg: + if info.ispkg: try: - __import__(name) + __import__(info.name) except ImportError: if onerror is not None: - onerror(name) + onerror(info.name) except Exception: if onerror is not None: - onerror(name) + onerror(info.name) else: raise else: - path = getattr(sys.modules[name], '__path__', None) or [] + path = getattr(sys.modules[info.name], '__path__', None) or [] # don't traverse path items we've seen before path = [p for p in path if not seen(p)] - yield from walk_packages(path, name+'.', onerror) + yield from walk_packages(path, info.name+'.', onerror) def iter_modules(path=None, prefix=''): - """Yields (module_finder, name, ispkg) for all submodules on path, + """Yields ModuleInfo for all submodules on path, or, if path is None, all top-level modules on sys.path. 'path' should be either None or a list of paths to look for @@ -114,7 +117,6 @@ def iter_modules(path=None, prefix=''): 'prefix' is a string to output on the front of every module name on output. """ - if path is None: importers = iter_importers() else: @@ -125,7 +127,7 @@ def iter_modules(path=None, prefix=''): for name, ispkg in iter_importer_modules(i, prefix): if name not in yielded: yielded[name] = 1 - yield i, name, ispkg + yield ModuleInfo(i, name, ispkg) @simplegeneric @@ -183,7 +185,7 @@ iter_importer_modules.register( def _import_imp(): global imp with warnings.catch_warnings(): - warnings.simplefilter('ignore', PendingDeprecationWarning) + warnings.simplefilter('ignore', DeprecationWarning) imp = importlib.import_module('imp') class ImpImporter: diff --git a/Lib/plat-aix4/IN.py b/Lib/plat-aix4/IN.py deleted file mode 100644 index 43f8f23..0000000 --- a/Lib/plat-aix4/IN.py +++ /dev/null @@ -1,165 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from net/nh.h - -# Included from sys/machine.h -LITTLE_ENDIAN = 1234 -BIG_ENDIAN = 4321 -PDP_ENDIAN = 3412 -BYTE_ORDER = BIG_ENDIAN -DEFAULT_GPR = 0xDEADBEEF -MSR_EE = 0x8000 -MSR_PR = 0x4000 -MSR_FP = 0x2000 -MSR_ME = 0x1000 -MSR_FE = 0x0800 -MSR_FE0 = 0x0800 -MSR_SE = 0x0400 -MSR_BE = 0x0200 -MSR_IE = 0x0100 -MSR_FE1 = 0x0100 -MSR_AL = 0x0080 -MSR_IP = 0x0040 -MSR_IR = 0x0020 -MSR_DR = 0x0010 -MSR_PM = 0x0004 -DEFAULT_MSR = (MSR_EE | MSR_ME | MSR_AL | MSR_IR | MSR_DR) -DEFAULT_USER_MSR = (DEFAULT_MSR | MSR_PR) -CR_LT = 0x80000000 -CR_GT = 0x40000000 -CR_EQ = 0x20000000 -CR_SO = 0x10000000 -CR_FX = 0x08000000 -CR_FEX = 0x04000000 -CR_VX = 0x02000000 -CR_OX = 0x01000000 -XER_SO = 0x80000000 -XER_OV = 0x40000000 -XER_CA = 0x20000000 -def XER_COMP_BYTE(xer): return ((xer >> 8) & 0x000000FF) - -def XER_LENGTH(xer): return (xer & 0x0000007F) - -DSISR_IO = 0x80000000 -DSISR_PFT = 0x40000000 -DSISR_LOCK = 0x20000000 -DSISR_FPIO = 0x10000000 -DSISR_PROT = 0x08000000 -DSISR_LOOP = 0x04000000 -DSISR_DRST = 0x04000000 -DSISR_ST = 0x02000000 -DSISR_SEGB = 0x01000000 -DSISR_DABR = 0x00400000 -DSISR_EAR = 0x00100000 -SRR_IS_PFT = 0x40000000 -SRR_IS_ISPEC = 0x20000000 -SRR_IS_IIO = 0x10000000 -SRR_IS_GUARD = 0x10000000 -SRR_IS_PROT = 0x08000000 -SRR_IS_LOOP = 0x04000000 -SRR_PR_FPEN = 0x00100000 -SRR_PR_INVAL = 0x00080000 -SRR_PR_PRIV = 0x00040000 -SRR_PR_TRAP = 0x00020000 -SRR_PR_IMPRE = 0x00010000 -def BUID_7F_SRVAL(raddr): return (0x87F00000 | (((uint)(raddr)) >> 28)) - -BT_256M = 0x1FFC -BT_128M = 0x0FFC -BT_64M = 0x07FC -BT_32M = 0x03FC -BT_16M = 0x01FC -BT_8M = 0x00FC -BT_4M = 0x007C -BT_2M = 0x003C -BT_1M = 0x001C -BT_512K = 0x000C -BT_256K = 0x0004 -BT_128K = 0x0000 -BT_NOACCESS = 0x0 -BT_RDONLY = 0x1 -BT_WRITE = 0x2 -BT_VS = 0x2 -BT_VP = 0x1 -def BAT_ESEG(dbatu): return (((uint)(dbatu) >> 28)) - -MIN_BAT_SIZE = 0x00020000 -MAX_BAT_SIZE = 0x10000000 -def ntohl(x): return (x) - -def ntohs(x): return (x) - -def htonl(x): return (x) - -def htons(x): return (x) - -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_TCP = 6 -IPPROTO_EGP = 8 -IPPROTO_PUP = 12 -IPPROTO_UDP = 17 -IPPROTO_IDP = 22 -IPPROTO_TP = 29 -IPPROTO_LOCAL = 63 -IPPROTO_EON = 80 -IPPROTO_BIP = 0x53 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -IPPORT_TIMESERVER = 37 -def IN_CLASSA(i): return (((int)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((int)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((int)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((int)(i) & 0xf0000000) == 0xe0000000) - -def IN_MULTICAST(i): return IN_CLASSD(i) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -INADDR_UNSPEC_GROUP = 0xe0000000 -INADDR_ALLHOSTS_GROUP = 0xe0000001 -INADDR_MAX_LOCAL_GROUP = 0xe00000ff -def IN_EXPERIMENTAL(i): return (((int)(i) & 0xe0000000) == 0xe0000000) - -def IN_BADCLASS(i): return (((int)(i) & 0xf0000000) == 0xf0000000) - -INADDR_ANY = 0x00000000 -INADDR_BROADCAST = 0xffffffff -INADDR_LOOPBACK = 0x7f000001 -INADDR_NONE = 0xffffffff -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 diff --git a/Lib/plat-aix4/regen b/Lib/plat-aix4/regen deleted file mode 100755 index 57a71c4..0000000 --- a/Lib/plat-aix4/regen +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -case `uname -sv` in -'AIX 4'*) ;; -*) echo Probably not on an AIX 4 system 1>&2 - exit 1;; -esac -set -v -h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-darwin/IN.py b/Lib/plat-darwin/IN.py deleted file mode 100644 index 6b6be33..0000000 --- a/Lib/plat-darwin/IN.py +++ /dev/null @@ -1,662 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from sys/appleapiopts.h - -# Included from sys/_types.h - -# Included from sys/cdefs.h -def __P(protos): return protos - -def __STRING(x): return #x - -def __P(protos): return () - -def __STRING(x): return "x" - -def __attribute__(x): return - -def __COPYRIGHT(s): return __IDSTRING(copyright,s) - -def __RCSID(s): return __IDSTRING(rcsid,s) - -def __SCCSID(s): return __IDSTRING(sccsid,s) - -def __PROJECT_VERSION(s): return __IDSTRING(project_version,s) - -__DARWIN_UNIX03 = 1 -__DARWIN_UNIX03 = 0 -__DARWIN_UNIX03 = 0 -__DARWIN_UNIX03 = 1 -__DARWIN_64_BIT_INO_T = 1 -__DARWIN_64_BIT_INO_T = 0 -__DARWIN_64_BIT_INO_T = 0 -__DARWIN_NON_CANCELABLE = 0 -__DARWIN_VERS_1050 = 1 -__DARWIN_VERS_1050 = 0 -__DARWIN_SUF_UNIX03 = "$UNIX2003" -__DARWIN_SUF_UNIX03_SET = 1 -__DARWIN_SUF_UNIX03_SET = 0 -__DARWIN_SUF_64_BIT_INO_T = "$INODE64" -__DARWIN_SUF_NON_CANCELABLE = "$NOCANCEL" -__DARWIN_SUF_1050 = "$1050" -__DARWIN_SUF_UNIX03_SET = 0 -__DARWIN_SUF_EXTSN = "$DARWIN_EXTSN" -__DARWIN_LONG_DOUBLE_IS_DOUBLE = 0 -def __DARWIN_LDBL_COMPAT(x): return - -def __DARWIN_LDBL_COMPAT2(x): return - -__DARWIN_LONG_DOUBLE_IS_DOUBLE = 1 -def __DARWIN_LDBL_COMPAT(x): return - -def __DARWIN_LDBL_COMPAT2(x): return - -__DARWIN_LONG_DOUBLE_IS_DOUBLE = 0 -_DARWIN_FEATURE_LONG_DOUBLE_IS_DOUBLE = 1 -_DARWIN_FEATURE_UNIX_CONFORMANCE = 3 -_DARWIN_FEATURE_64_BIT_INODE = 1 - -# Included from machine/_types.h -__PTHREAD_SIZE__ = 1168 -__PTHREAD_ATTR_SIZE__ = 56 -__PTHREAD_MUTEXATTR_SIZE__ = 8 -__PTHREAD_MUTEX_SIZE__ = 56 -__PTHREAD_CONDATTR_SIZE__ = 8 -__PTHREAD_COND_SIZE__ = 40 -__PTHREAD_ONCE_SIZE__ = 8 -__PTHREAD_RWLOCK_SIZE__ = 192 -__PTHREAD_RWLOCKATTR_SIZE__ = 16 -__PTHREAD_SIZE__ = 596 -__PTHREAD_ATTR_SIZE__ = 36 -__PTHREAD_MUTEXATTR_SIZE__ = 8 -__PTHREAD_MUTEX_SIZE__ = 40 -__PTHREAD_CONDATTR_SIZE__ = 4 -__PTHREAD_COND_SIZE__ = 24 -__PTHREAD_ONCE_SIZE__ = 4 -__PTHREAD_RWLOCK_SIZE__ = 124 -__PTHREAD_RWLOCKATTR_SIZE__ = 12 -__DARWIN_NULL = 0 - -# Included from stdint.h -__WORDSIZE = 64 -__WORDSIZE = 32 -INT8_MAX = 127 -INT16_MAX = 32767 -INT32_MAX = 2147483647 -INT8_MIN = -128 -INT16_MIN = -32768 -INT32_MIN = (-INT32_MAX-1) -UINT8_MAX = 255 -UINT16_MAX = 65535 -INT_LEAST8_MIN = INT8_MIN -INT_LEAST16_MIN = INT16_MIN -INT_LEAST32_MIN = INT32_MIN -INT_LEAST8_MAX = INT8_MAX -INT_LEAST16_MAX = INT16_MAX -INT_LEAST32_MAX = INT32_MAX -UINT_LEAST8_MAX = UINT8_MAX -UINT_LEAST16_MAX = UINT16_MAX -INT_FAST8_MIN = INT8_MIN -INT_FAST16_MIN = INT16_MIN -INT_FAST32_MIN = INT32_MIN -INT_FAST8_MAX = INT8_MAX -INT_FAST16_MAX = INT16_MAX -INT_FAST32_MAX = INT32_MAX -UINT_FAST8_MAX = UINT8_MAX -UINT_FAST16_MAX = UINT16_MAX -INTPTR_MIN = INT32_MIN -INTPTR_MAX = INT32_MAX -PTRDIFF_MIN = INT32_MIN -PTRDIFF_MAX = INT32_MAX -WCHAR_MAX = 0x7fffffff -WCHAR_MIN = 0 -WCHAR_MIN = (-WCHAR_MAX-1) -WINT_MIN = INT32_MIN -WINT_MAX = INT32_MAX -SIG_ATOMIC_MIN = INT32_MIN -SIG_ATOMIC_MAX = INT32_MAX -def INT8_C(v): return (v) - -def INT16_C(v): return (v) - -def INT32_C(v): return (v) - - -# Included from sys/socket.h - -# Included from machine/_param.h -SOCK_STREAM = 1 -SOCK_DGRAM = 2 -SOCK_RAW = 3 -SOCK_RDM = 4 -SOCK_SEQPACKET = 5 -SO_DEBUG = 0x0001 -SO_ACCEPTCONN = 0x0002 -SO_REUSEADDR = 0x0004 -SO_KEEPALIVE = 0x0008 -SO_DONTROUTE = 0x0010 -SO_BROADCAST = 0x0020 -SO_USELOOPBACK = 0x0040 -SO_LINGER = 0x0080 -SO_LINGER = 0x1080 -SO_OOBINLINE = 0x0100 -SO_REUSEPORT = 0x0200 -SO_TIMESTAMP = 0x0400 -SO_ACCEPTFILTER = 0x1000 -SO_DONTTRUNC = 0x2000 -SO_WANTMORE = 0x4000 -SO_WANTOOBFLAG = 0x8000 -SO_SNDBUF = 0x1001 -SO_RCVBUF = 0x1002 -SO_SNDLOWAT = 0x1003 -SO_RCVLOWAT = 0x1004 -SO_SNDTIMEO = 0x1005 -SO_RCVTIMEO = 0x1006 -SO_ERROR = 0x1007 -SO_TYPE = 0x1008 -SO_NREAD = 0x1020 -SO_NKE = 0x1021 -SO_NOSIGPIPE = 0x1022 -SO_NOADDRERR = 0x1023 -SO_NWRITE = 0x1024 -SO_REUSESHAREUID = 0x1025 -SO_NOTIFYCONFLICT = 0x1026 -SO_LINGER_SEC = 0x1080 -SO_RESTRICTIONS = 0x1081 -SO_RESTRICT_DENYIN = 0x00000001 -SO_RESTRICT_DENYOUT = 0x00000002 -SO_RESTRICT_DENYSET = (-2147483648) -SO_LABEL = 0x1010 -SO_PEERLABEL = 0x1011 -SOL_SOCKET = 0xffff -AF_UNSPEC = 0 -AF_UNIX = 1 -AF_LOCAL = AF_UNIX -AF_INET = 2 -AF_IMPLINK = 3 -AF_PUP = 4 -AF_CHAOS = 5 -AF_NS = 6 -AF_ISO = 7 -AF_OSI = AF_ISO -AF_ECMA = 8 -AF_DATAKIT = 9 -AF_CCITT = 10 -AF_SNA = 11 -AF_DECnet = 12 -AF_DLI = 13 -AF_LAT = 14 -AF_HYLINK = 15 -AF_APPLETALK = 16 -AF_ROUTE = 17 -AF_LINK = 18 -pseudo_AF_XTP = 19 -AF_COIP = 20 -AF_CNT = 21 -pseudo_AF_RTIP = 22 -AF_IPX = 23 -AF_SIP = 24 -pseudo_AF_PIP = 25 -AF_NDRV = 27 -AF_ISDN = 28 -AF_E164 = AF_ISDN -pseudo_AF_KEY = 29 -AF_INET6 = 30 -AF_NATM = 31 -AF_SYSTEM = 32 -AF_NETBIOS = 33 -AF_PPP = 34 -AF_ATM = 30 -pseudo_AF_HDRCMPLT = 35 -AF_RESERVED_36 = 36 -AF_NETGRAPH = 32 -AF_MAX = 37 -SOCK_MAXADDRLEN = 255 -_SS_MAXSIZE = 128 -PF_UNSPEC = AF_UNSPEC -PF_LOCAL = AF_LOCAL -PF_UNIX = PF_LOCAL -PF_INET = AF_INET -PF_IMPLINK = AF_IMPLINK -PF_PUP = AF_PUP -PF_CHAOS = AF_CHAOS -PF_NS = AF_NS -PF_ISO = AF_ISO -PF_OSI = AF_ISO -PF_ECMA = AF_ECMA -PF_DATAKIT = AF_DATAKIT -PF_CCITT = AF_CCITT -PF_SNA = AF_SNA -PF_DECnet = AF_DECnet -PF_DLI = AF_DLI -PF_LAT = AF_LAT -PF_HYLINK = AF_HYLINK -PF_APPLETALK = AF_APPLETALK -PF_ROUTE = AF_ROUTE -PF_LINK = AF_LINK -PF_XTP = pseudo_AF_XTP -PF_COIP = AF_COIP -PF_CNT = AF_CNT -PF_SIP = AF_SIP -PF_IPX = AF_IPX -PF_RTIP = pseudo_AF_RTIP -PF_PIP = pseudo_AF_PIP -PF_NDRV = AF_NDRV -PF_ISDN = AF_ISDN -PF_KEY = pseudo_AF_KEY -PF_INET6 = AF_INET6 -PF_NATM = AF_NATM -PF_SYSTEM = AF_SYSTEM -PF_NETBIOS = AF_NETBIOS -PF_PPP = AF_PPP -PF_RESERVED_36 = AF_RESERVED_36 -PF_ATM = AF_ATM -PF_NETGRAPH = AF_NETGRAPH -PF_MAX = AF_MAX -NET_MAXID = AF_MAX -NET_RT_DUMP = 1 -NET_RT_FLAGS = 2 -NET_RT_IFLIST = 3 -NET_RT_STAT = 4 -NET_RT_TRASH = 5 -NET_RT_IFLIST2 = 6 -NET_RT_DUMP2 = 7 -NET_RT_MAXID = 8 -SOMAXCONN = 128 -MSG_OOB = 0x1 -MSG_PEEK = 0x2 -MSG_DONTROUTE = 0x4 -MSG_EOR = 0x8 -MSG_TRUNC = 0x10 -MSG_CTRUNC = 0x20 -MSG_WAITALL = 0x40 -MSG_DONTWAIT = 0x80 -MSG_EOF = 0x100 -MSG_WAITSTREAM = 0x200 -MSG_FLUSH = 0x400 -MSG_HOLD = 0x800 -MSG_SEND = 0x1000 -MSG_HAVEMORE = 0x2000 -MSG_RCVMORE = 0x4000 -MSG_NEEDSA = 0x10000 -CMGROUP_MAX = 16 -SCM_RIGHTS = 0x01 -SCM_TIMESTAMP = 0x02 -SCM_CREDS = 0x03 -SHUT_RD = 0 -SHUT_WR = 1 -SHUT_RDWR = 2 - -# Included from machine/endian.h - -# Included from sys/_endian.h -def ntohl(x): return (x) - -def ntohs(x): return (x) - -def htonl(x): return (x) - -def htons(x): return (x) - -def NTOHL(x): return (x) - -def NTOHS(x): return (x) - -def HTONL(x): return (x) - -def HTONS(x): return (x) - - -# Included from libkern/_OSByteOrder.h -def __DARWIN_OSSwapConstInt16(x): return \ - -def __DARWIN_OSSwapConstInt32(x): return \ - -def __DARWIN_OSSwapConstInt64(x): return \ - - -# Included from libkern/i386/_OSByteOrder.h -def __DARWIN_OSSwapInt16(x): return \ - -def __DARWIN_OSSwapInt32(x): return \ - -def __DARWIN_OSSwapInt64(x): return \ - -def __DARWIN_OSSwapInt16(x): return _OSSwapInt16(x) - -def __DARWIN_OSSwapInt32(x): return _OSSwapInt32(x) - -def __DARWIN_OSSwapInt64(x): return _OSSwapInt64(x) - -def ntohs(x): return __DARWIN_OSSwapInt16(x) - -def htons(x): return __DARWIN_OSSwapInt16(x) - -def ntohl(x): return __DARWIN_OSSwapInt32(x) - -def htonl(x): return __DARWIN_OSSwapInt32(x) - -IPPROTO_IP = 0 -IPPROTO_HOPOPTS = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_TCP = 6 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_UDP = 17 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_PIM = 103 -IPPROTO_PGM = 113 -IPPROTO_DIVERT = 254 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -__DARWIN_IPPORT_RESERVED = 1024 -IPPORT_RESERVED = __DARWIN_IPPORT_RESERVED -IPPORT_USERRESERVED = 5000 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) - -IN_CLASSA_NET = (-16777216) -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) - -IN_CLASSB_NET = (-65536) -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) - -IN_CLASSC_NET = (-256) -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) - -IN_CLASSD_NET = (-268435456) -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -INADDR_NONE = (-1) -def IN_LINKLOCAL(i): return (((u_int32_t)(i) & IN_CLASSB_NET) == IN_LINKLOCALNETNUM) - -IN_LOOPBACKNET = 127 -INET_ADDRSTRLEN = 16 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_STRIPHDR = 23 -IP_RECVTTL = 24 -IP_FW_ADD = 40 -IP_FW_DEL = 41 -IP_FW_FLUSH = 42 -IP_FW_ZERO = 43 -IP_FW_GET = 44 -IP_FW_RESETLOG = 45 -IP_OLD_FW_ADD = 50 -IP_OLD_FW_DEL = 51 -IP_OLD_FW_FLUSH = 52 -IP_OLD_FW_ZERO = 53 -IP_OLD_FW_GET = 54 -IP_NAT__XXX = 55 -IP_OLD_FW_RESETLOG = 56 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_TRAFFIC_MGT_BACKGROUND = 65 -IP_FORCE_OUT_IFP = 69 -TRAFFIC_MGT_SO_BACKGROUND = 0x0001 -TRAFFIC_MGT_SO_BG_SUPPRESSED = 0x0002 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 - -# Included from netinet6/in6.h -__KAME_VERSION = "20010528/apple-darwin" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_PKTINFO = 19 -IPV6_HOPLIMIT = 20 -IPV6_NEXTHOP = 21 -IPV6_HOPOPTS = 22 -IPV6_DSTOPTS = 23 -IPV6_RTHDR = 24 -IPV6_PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_V6ONLY = 27 -IPV6_BINDV6ONLY = IPV6_V6ONLY -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_V6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_USETEMPADDR = 32 -IPV6CTL_TEMPPLTIME = 33 -IPV6CTL_TEMPVLTIME = 34 -IPV6CTL_AUTO_LINKLOCAL = 35 -IPV6CTL_RIP6STATS = 36 -IPV6CTL_MAXFRAGS = 41 -IPV6CTL_MAXID = 42 diff --git a/Lib/plat-darwin/regen b/Lib/plat-darwin/regen deleted file mode 100755 index a20cdc1..0000000 --- a/Lib/plat-darwin/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-freebsd4/IN.py b/Lib/plat-freebsd4/IN.py deleted file mode 100644 index bca2418..0000000 --- a/Lib/plat-freebsd4/IN.py +++ /dev/null @@ -1,355 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h -IPPROTO_IP = 0 -IPPROTO_HOPOPTS = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_TCP = 6 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_UDP = 17 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_PIM = 103 -IPPROTO_PGM = 113 -IPPROTO_DIVERT = 254 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -INADDR_NONE = 0xffffffff -IN_LOOPBACKNET = 127 -INET_ADDRSTRLEN = 16 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_FW_ADD = 50 -IP_FW_DEL = 51 -IP_FW_FLUSH = 52 -IP_FW_ZERO = 53 -IP_FW_GET = 54 -IP_FW_RESETLOG = 55 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 - -# Included from netinet6/in6.h - -# Included from sys/queue.h -def SLIST_HEAD_INITIALIZER(head): return \ - -def SLIST_ENTRY(type): return \ - -def STAILQ_HEAD_INITIALIZER(head): return \ - -def STAILQ_ENTRY(type): return \ - -def LIST_HEAD_INITIALIZER(head): return \ - -def LIST_ENTRY(type): return \ - -def TAILQ_HEAD_INITIALIZER(head): return \ - -def TAILQ_ENTRY(type): return \ - -def CIRCLEQ_ENTRY(type): return \ - -__KAME_VERSION = "20000701/FreeBSD-current" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -IPV6_ADDR_INT32_ONE = 1 -IPV6_ADDR_INT32_TWO = 2 -IPV6_ADDR_INT32_MNL = 0xff010000 -IPV6_ADDR_INT32_MLL = 0xff020000 -IPV6_ADDR_INT32_SMP = 0x0000ffff -IPV6_ADDR_INT16_ULL = 0xfe80 -IPV6_ADDR_INT16_USL = 0xfec0 -IPV6_ADDR_INT16_MLL = 0xff02 -IPV6_ADDR_INT32_ONE = 0x01000000 -IPV6_ADDR_INT32_TWO = 0x02000000 -IPV6_ADDR_INT32_MNL = 0x000001ff -IPV6_ADDR_INT32_MLL = 0x000002ff -IPV6_ADDR_INT32_SMP = 0xffff0000 -IPV6_ADDR_INT16_ULL = 0x80fe -IPV6_ADDR_INT16_USL = 0xc0fe -IPV6_ADDR_INT16_MLL = 0x02ff -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -IPV6_ADDR_SCOPE_GLOBAL = 0x0e -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_SCOPE_LINKLOCAL(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_PKTINFO = 19 -IPV6_HOPLIMIT = 20 -IPV6_NEXTHOP = 21 -IPV6_HOPOPTS = 22 -IPV6_DSTOPTS = 23 -IPV6_RTHDR = 24 -IPV6_PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_BINDV6ONLY = 27 -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_BINDV6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_MAXID = 28 diff --git a/Lib/plat-freebsd4/regen b/Lib/plat-freebsd4/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-freebsd4/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-freebsd5/IN.py b/Lib/plat-freebsd5/IN.py deleted file mode 100644 index bca2418..0000000 --- a/Lib/plat-freebsd5/IN.py +++ /dev/null @@ -1,355 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h -IPPROTO_IP = 0 -IPPROTO_HOPOPTS = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_TCP = 6 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_UDP = 17 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_PIM = 103 -IPPROTO_PGM = 113 -IPPROTO_DIVERT = 254 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -INADDR_NONE = 0xffffffff -IN_LOOPBACKNET = 127 -INET_ADDRSTRLEN = 16 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_FW_ADD = 50 -IP_FW_DEL = 51 -IP_FW_FLUSH = 52 -IP_FW_ZERO = 53 -IP_FW_GET = 54 -IP_FW_RESETLOG = 55 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 - -# Included from netinet6/in6.h - -# Included from sys/queue.h -def SLIST_HEAD_INITIALIZER(head): return \ - -def SLIST_ENTRY(type): return \ - -def STAILQ_HEAD_INITIALIZER(head): return \ - -def STAILQ_ENTRY(type): return \ - -def LIST_HEAD_INITIALIZER(head): return \ - -def LIST_ENTRY(type): return \ - -def TAILQ_HEAD_INITIALIZER(head): return \ - -def TAILQ_ENTRY(type): return \ - -def CIRCLEQ_ENTRY(type): return \ - -__KAME_VERSION = "20000701/FreeBSD-current" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -IPV6_ADDR_INT32_ONE = 1 -IPV6_ADDR_INT32_TWO = 2 -IPV6_ADDR_INT32_MNL = 0xff010000 -IPV6_ADDR_INT32_MLL = 0xff020000 -IPV6_ADDR_INT32_SMP = 0x0000ffff -IPV6_ADDR_INT16_ULL = 0xfe80 -IPV6_ADDR_INT16_USL = 0xfec0 -IPV6_ADDR_INT16_MLL = 0xff02 -IPV6_ADDR_INT32_ONE = 0x01000000 -IPV6_ADDR_INT32_TWO = 0x02000000 -IPV6_ADDR_INT32_MNL = 0x000001ff -IPV6_ADDR_INT32_MLL = 0x000002ff -IPV6_ADDR_INT32_SMP = 0xffff0000 -IPV6_ADDR_INT16_ULL = 0x80fe -IPV6_ADDR_INT16_USL = 0xc0fe -IPV6_ADDR_INT16_MLL = 0x02ff -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -IPV6_ADDR_SCOPE_GLOBAL = 0x0e -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_SCOPE_LINKLOCAL(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_PKTINFO = 19 -IPV6_HOPLIMIT = 20 -IPV6_NEXTHOP = 21 -IPV6_HOPOPTS = 22 -IPV6_DSTOPTS = 23 -IPV6_RTHDR = 24 -IPV6_PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_BINDV6ONLY = 27 -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_BINDV6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_MAXID = 28 diff --git a/Lib/plat-freebsd5/regen b/Lib/plat-freebsd5/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-freebsd5/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-freebsd6/IN.py b/Lib/plat-freebsd6/IN.py deleted file mode 100644 index 560bf84..0000000 --- a/Lib/plat-freebsd6/IN.py +++ /dev/null @@ -1,551 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from sys/cdefs.h -__GNUCLIKE_ASM = 3 -__GNUCLIKE_ASM = 2 -__GNUCLIKE___TYPEOF = 1 -__GNUCLIKE___OFFSETOF = 1 -__GNUCLIKE___SECTION = 1 -__GNUCLIKE_ATTRIBUTE_MODE_DI = 1 -__GNUCLIKE_CTOR_SECTION_HANDLING = 1 -__GNUCLIKE_BUILTIN_CONSTANT_P = 1 -__GNUCLIKE_BUILTIN_VARARGS = 1 -__GNUCLIKE_BUILTIN_STDARG = 1 -__GNUCLIKE_BUILTIN_VAALIST = 1 -__GNUC_VA_LIST_COMPATIBILITY = 1 -__GNUCLIKE_BUILTIN_NEXT_ARG = 1 -__GNUCLIKE_BUILTIN_MEMCPY = 1 -__CC_SUPPORTS_INLINE = 1 -__CC_SUPPORTS___INLINE = 1 -__CC_SUPPORTS___INLINE__ = 1 -__CC_SUPPORTS___FUNC__ = 1 -__CC_SUPPORTS_WARNING = 1 -__CC_SUPPORTS_VARADIC_XXX = 1 -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 -__CC_INT_IS_32BIT = 1 -def __P(protos): return protos - -def __STRING(x): return #x - -def __XSTRING(x): return __STRING(x) - -def __P(protos): return () - -def __STRING(x): return "x" - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __nonnull(x): return __attribute__((__nonnull__(x))) - -def __predict_true(exp): return __builtin_expect((exp), 1) - -def __predict_false(exp): return __builtin_expect((exp), 0) - -def __predict_true(exp): return (exp) - -def __predict_false(exp): return (exp) - -def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg))) - -def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) - -def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) - -def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) - -_POSIX_C_SOURCE = 199009 -_POSIX_C_SOURCE = 199209 -__XSI_VISIBLE = 600 -_POSIX_C_SOURCE = 200112 -__XSI_VISIBLE = 500 -_POSIX_C_SOURCE = 199506 -_POSIX_C_SOURCE = 198808 -__POSIX_VISIBLE = 200112 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 199506 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199309 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199209 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199009 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 198808 -__ISO_C_VISIBLE = 0 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 200112 -__XSI_VISIBLE = 600 -__BSD_VISIBLE = 1 -__ISO_C_VISIBLE = 1999 - -# Included from sys/_types.h - -# Included from machine/_types.h - -# Included from machine/endian.h -_QUAD_HIGHWORD = 1 -_QUAD_LOWWORD = 0 -_LITTLE_ENDIAN = 1234 -_BIG_ENDIAN = 4321 -_PDP_ENDIAN = 3412 -_BYTE_ORDER = _LITTLE_ENDIAN -LITTLE_ENDIAN = _LITTLE_ENDIAN -BIG_ENDIAN = _BIG_ENDIAN -PDP_ENDIAN = _PDP_ENDIAN -BYTE_ORDER = _BYTE_ORDER -def __word_swap_int_var(x): return \ - -def __word_swap_int_const(x): return \ - -def __word_swap_int(x): return __word_swap_int_var(x) - -def __byte_swap_int_var(x): return \ - -def __byte_swap_int_const(x): return \ - -def __byte_swap_int(x): return __byte_swap_int_var(x) - -def __byte_swap_long_var(x): return \ - -def __byte_swap_long_const(x): return \ - -def __byte_swap_long(x): return __byte_swap_long_var(x) - -def __byte_swap_word_var(x): return \ - -def __byte_swap_word_const(x): return \ - -def __byte_swap_word(x): return __byte_swap_word_var(x) - -def __htonl(x): return __bswap32(x) - -def __htons(x): return __bswap16(x) - -def __ntohl(x): return __bswap32(x) - -def __ntohs(x): return __bswap16(x) - -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_TCP = 6 -IPPROTO_UDP = 17 -def htonl(x): return __htonl(x) - -def htons(x): return __htons(x) - -def ntohl(x): return __ntohl(x) - -def ntohs(x): return __ntohs(x) - -IPPROTO_RAW = 255 -INET_ADDRSTRLEN = 16 -IPPROTO_HOPOPTS = 0 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_MOBILE = 55 -IPPROTO_TLSP = 56 -IPPROTO_SKIP = 57 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_SCTP = 132 -IPPROTO_PIM = 103 -IPPROTO_CARP = 112 -IPPROTO_PGM = 113 -IPPROTO_PFSYNC = 240 -IPPROTO_OLD_DIVERT = 254 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -IPPROTO_DIVERT = 258 -IPPROTO_SPACER = 32767 -IPPORT_RESERVED = 1024 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -IPPORT_MAX = 65535 -def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) - -INADDR_NONE = 0xffffffff -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_SENDSRCADDR = IP_RECVDSTADDR -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_ONESBCAST = 23 -IP_FW_TABLE_ADD = 40 -IP_FW_TABLE_DEL = 41 -IP_FW_TABLE_FLUSH = 42 -IP_FW_TABLE_GETSIZE = 43 -IP_FW_TABLE_LIST = 44 -IP_FW_ADD = 50 -IP_FW_DEL = 51 -IP_FW_FLUSH = 52 -IP_FW_ZERO = 53 -IP_FW_GET = 54 -IP_FW_RESETLOG = 55 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_RECVTTL = 65 -IP_MINTTL = 66 -IP_DONTFRAG = 67 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 -def in_nullhost(x): return ((x).s_addr == INADDR_ANY) - - -# Included from netinet6/in6.h -__KAME_VERSION = "FreeBSD" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -IPV6_ADDR_INT32_ONE = 1 -IPV6_ADDR_INT32_TWO = 2 -IPV6_ADDR_INT32_MNL = 0xff010000 -IPV6_ADDR_INT32_MLL = 0xff020000 -IPV6_ADDR_INT32_SMP = 0x0000ffff -IPV6_ADDR_INT16_ULL = 0xfe80 -IPV6_ADDR_INT16_USL = 0xfec0 -IPV6_ADDR_INT16_MLL = 0xff02 -IPV6_ADDR_INT32_ONE = 0x01000000 -IPV6_ADDR_INT32_TWO = 0x02000000 -IPV6_ADDR_INT32_MNL = 0x000001ff -IPV6_ADDR_INT32_MLL = 0x000002ff -IPV6_ADDR_INT32_SMP = 0xffff0000 -IPV6_ADDR_INT16_ULL = 0x80fe -IPV6_ADDR_INT16_USL = 0xc0fe -IPV6_ADDR_INT16_MLL = 0x02ff -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -IPV6_ADDR_SCOPE_GLOBAL = 0x0e -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_SCOPE_LINKLOCAL(a): return \ - -def IFA6_IS_DEPRECATED(a): return \ - -def IFA6_IS_INVALID(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_2292PKTINFO = 19 -IPV6_2292HOPLIMIT = 20 -IPV6_2292NEXTHOP = 21 -IPV6_2292HOPOPTS = 22 -IPV6_2292DSTOPTS = 23 -IPV6_2292RTHDR = 24 -IPV6_2292PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_V6ONLY = 27 -IPV6_BINDV6ONLY = IPV6_V6ONLY -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDRDSTOPTS = 35 -IPV6_RECVPKTINFO = 36 -IPV6_RECVHOPLIMIT = 37 -IPV6_RECVRTHDR = 38 -IPV6_RECVHOPOPTS = 39 -IPV6_RECVDSTOPTS = 40 -IPV6_RECVRTHDRDSTOPTS = 41 -IPV6_USE_MIN_MTU = 42 -IPV6_RECVPATHMTU = 43 -IPV6_PATHMTU = 44 -IPV6_REACHCONF = 45 -IPV6_PKTINFO = 46 -IPV6_HOPLIMIT = 47 -IPV6_NEXTHOP = 48 -IPV6_HOPOPTS = 49 -IPV6_DSTOPTS = 50 -IPV6_RTHDR = 51 -IPV6_PKTOPTIONS = 52 -IPV6_RECVTCLASS = 57 -IPV6_AUTOFLOWLABEL = 59 -IPV6_TCLASS = 61 -IPV6_DONTFRAG = 62 -IPV6_PREFER_TEMPADDR = 63 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_V6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_USETEMPADDR = 32 -IPV6CTL_TEMPPLTIME = 33 -IPV6CTL_TEMPVLTIME = 34 -IPV6CTL_AUTO_LINKLOCAL = 35 -IPV6CTL_RIP6STATS = 36 -IPV6CTL_PREFER_TEMPADDR = 37 -IPV6CTL_ADDRCTLPOLICY = 38 -IPV6CTL_USE_DEFAULTZONE = 39 -IPV6CTL_MAXFRAGS = 41 -IPV6CTL_IFQ = 42 -IPV6CTL_ISATAPRTR = 43 -IPV6CTL_MCAST_PMTU = 44 -IPV6CTL_STEALTH = 45 -IPV6CTL_MAXID = 46 diff --git a/Lib/plat-freebsd6/regen b/Lib/plat-freebsd6/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-freebsd6/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-freebsd7/IN.py b/Lib/plat-freebsd7/IN.py deleted file mode 100644 index 4e3b3a2..0000000 --- a/Lib/plat-freebsd7/IN.py +++ /dev/null @@ -1,571 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from sys/cdefs.h -__GNUCLIKE_ASM = 3 -__GNUCLIKE_ASM = 2 -__GNUCLIKE___TYPEOF = 1 -__GNUCLIKE___OFFSETOF = 1 -__GNUCLIKE___SECTION = 1 -__GNUCLIKE_ATTRIBUTE_MODE_DI = 1 -__GNUCLIKE_CTOR_SECTION_HANDLING = 1 -__GNUCLIKE_BUILTIN_CONSTANT_P = 1 -__GNUCLIKE_BUILTIN_VARARGS = 1 -__GNUCLIKE_BUILTIN_STDARG = 1 -__GNUCLIKE_BUILTIN_VAALIST = 1 -__GNUC_VA_LIST_COMPATIBILITY = 1 -__GNUCLIKE_BUILTIN_NEXT_ARG = 1 -__GNUCLIKE_BUILTIN_MEMCPY = 1 -__CC_SUPPORTS_INLINE = 1 -__CC_SUPPORTS___INLINE = 1 -__CC_SUPPORTS___INLINE__ = 1 -__CC_SUPPORTS___FUNC__ = 1 -__CC_SUPPORTS_WARNING = 1 -__CC_SUPPORTS_VARADIC_XXX = 1 -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 -__CC_INT_IS_32BIT = 1 -def __P(protos): return protos - -def __STRING(x): return #x - -def __XSTRING(x): return __STRING(x) - -def __P(protos): return () - -def __STRING(x): return "x" - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __nonnull(x): return __attribute__((__nonnull__(x))) - -def __predict_true(exp): return __builtin_expect((exp), 1) - -def __predict_false(exp): return __builtin_expect((exp), 0) - -def __predict_true(exp): return (exp) - -def __predict_false(exp): return (exp) - -def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg))) - -def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) - -def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) - -def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) - -_POSIX_C_SOURCE = 199009 -_POSIX_C_SOURCE = 199209 -__XSI_VISIBLE = 600 -_POSIX_C_SOURCE = 200112 -__XSI_VISIBLE = 500 -_POSIX_C_SOURCE = 199506 -_POSIX_C_SOURCE = 198808 -__POSIX_VISIBLE = 200112 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 199506 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199309 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199209 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199009 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 198808 -__ISO_C_VISIBLE = 0 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 200112 -__XSI_VISIBLE = 600 -__BSD_VISIBLE = 1 -__ISO_C_VISIBLE = 1999 - -# Included from sys/_types.h - -# Included from machine/_types.h - -# Included from machine/endian.h -_QUAD_HIGHWORD = 1 -_QUAD_LOWWORD = 0 -_LITTLE_ENDIAN = 1234 -_BIG_ENDIAN = 4321 -_PDP_ENDIAN = 3412 -_BYTE_ORDER = _LITTLE_ENDIAN -LITTLE_ENDIAN = _LITTLE_ENDIAN -BIG_ENDIAN = _BIG_ENDIAN -PDP_ENDIAN = _PDP_ENDIAN -BYTE_ORDER = _BYTE_ORDER -def __word_swap_int_var(x): return \ - -def __word_swap_int_const(x): return \ - -def __word_swap_int(x): return __word_swap_int_var(x) - -def __byte_swap_int_var(x): return \ - -def __byte_swap_int_const(x): return \ - -def __byte_swap_int(x): return __byte_swap_int_var(x) - -def __byte_swap_word_var(x): return \ - -def __byte_swap_word_const(x): return \ - -def __byte_swap_word(x): return __byte_swap_word_var(x) - -def __htonl(x): return __bswap32(x) - -def __htons(x): return __bswap16(x) - -def __ntohl(x): return __bswap32(x) - -def __ntohs(x): return __bswap16(x) - -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_TCP = 6 -IPPROTO_UDP = 17 -def htonl(x): return __htonl(x) - -def htons(x): return __htons(x) - -def ntohl(x): return __ntohl(x) - -def ntohs(x): return __ntohs(x) - -IPPROTO_RAW = 255 -INET_ADDRSTRLEN = 16 -IPPROTO_HOPOPTS = 0 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_MOBILE = 55 -IPPROTO_TLSP = 56 -IPPROTO_SKIP = 57 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_SCTP = 132 -IPPROTO_PIM = 103 -IPPROTO_CARP = 112 -IPPROTO_PGM = 113 -IPPROTO_PFSYNC = 240 -IPPROTO_OLD_DIVERT = 254 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -IPPROTO_DIVERT = 258 -IPPROTO_SPACER = 32767 -IPPORT_RESERVED = 1024 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -IPPORT_MAX = 65535 -def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) - -IN_CLASSA_NET = (-16777216) -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) - -IN_CLASSB_NET = (-65536) -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) - -IN_CLASSC_NET = (-256) -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) - -IN_CLASSD_NET = (-268435456) -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -def IN_LINKLOCAL(i): return (((u_int32_t)(i) & (-65536)) == (-1442971648)) - -def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & (-256)) == (-536870912)) - -INADDR_NONE = (-1) -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_SENDSRCADDR = IP_RECVDSTADDR -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_ONESBCAST = 23 -IP_FW_TABLE_ADD = 40 -IP_FW_TABLE_DEL = 41 -IP_FW_TABLE_FLUSH = 42 -IP_FW_TABLE_GETSIZE = 43 -IP_FW_TABLE_LIST = 44 -IP_FW_ADD = 50 -IP_FW_DEL = 51 -IP_FW_FLUSH = 52 -IP_FW_ZERO = 53 -IP_FW_GET = 54 -IP_FW_RESETLOG = 55 -IP_FW_NAT_CFG = 56 -IP_FW_NAT_DEL = 57 -IP_FW_NAT_GET_CONFIG = 58 -IP_FW_NAT_GET_LOG = 59 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_RECVTTL = 65 -IP_MINTTL = 66 -IP_DONTFRAG = 67 -IP_ADD_SOURCE_MEMBERSHIP = 70 -IP_DROP_SOURCE_MEMBERSHIP = 71 -IP_BLOCK_SOURCE = 72 -IP_UNBLOCK_SOURCE = 73 -IP_MSFILTER = 74 -MCAST_JOIN_GROUP = 80 -MCAST_LEAVE_GROUP = 81 -MCAST_JOIN_SOURCE_GROUP = 82 -MCAST_LEAVE_SOURCE_GROUP = 83 -MCAST_BLOCK_SOURCE = 84 -MCAST_UNBLOCK_SOURCE = 85 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MIN_MEMBERSHIPS = 31 -IP_MAX_MEMBERSHIPS = 4095 -IP_MAX_SOURCE_FILTER = 1024 -MCAST_INCLUDE = 1 -MCAST_EXCLUDE = 2 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 -def in_nullhost(x): return ((x).s_addr == INADDR_ANY) - - -# Included from netinet6/in6.h -__KAME_VERSION = "FreeBSD" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -IPV6_ADDR_INT32_ONE = 1 -IPV6_ADDR_INT32_TWO = 2 -IPV6_ADDR_INT32_MNL = (-16711680) -IPV6_ADDR_INT32_MLL = (-16646144) -IPV6_ADDR_INT32_SMP = 0x0000ffff -IPV6_ADDR_INT16_ULL = 0xfe80 -IPV6_ADDR_INT16_USL = 0xfec0 -IPV6_ADDR_INT16_MLL = 0xff02 -IPV6_ADDR_INT32_ONE = 0x01000000 -IPV6_ADDR_INT32_TWO = 0x02000000 -IPV6_ADDR_INT32_MNL = 0x000001ff -IPV6_ADDR_INT32_MLL = 0x000002ff -IPV6_ADDR_INT32_SMP = (-65536) -IPV6_ADDR_INT16_ULL = 0x80fe -IPV6_ADDR_INT16_USL = 0xc0fe -IPV6_ADDR_INT16_MLL = 0x02ff -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -IPV6_ADDR_SCOPE_GLOBAL = 0x0e -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_SCOPE_LINKLOCAL(a): return \ - -def IN6_IS_SCOPE_EMBED(a): return \ - -def IFA6_IS_DEPRECATED(a): return \ - -def IFA6_IS_INVALID(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_2292PKTINFO = 19 -IPV6_2292HOPLIMIT = 20 -IPV6_2292NEXTHOP = 21 -IPV6_2292HOPOPTS = 22 -IPV6_2292DSTOPTS = 23 -IPV6_2292RTHDR = 24 -IPV6_2292PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_V6ONLY = 27 -IPV6_BINDV6ONLY = IPV6_V6ONLY -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDRDSTOPTS = 35 -IPV6_RECVPKTINFO = 36 -IPV6_RECVHOPLIMIT = 37 -IPV6_RECVRTHDR = 38 -IPV6_RECVHOPOPTS = 39 -IPV6_RECVDSTOPTS = 40 -IPV6_RECVRTHDRDSTOPTS = 41 -IPV6_USE_MIN_MTU = 42 -IPV6_RECVPATHMTU = 43 -IPV6_PATHMTU = 44 -IPV6_REACHCONF = 45 -IPV6_PKTINFO = 46 -IPV6_HOPLIMIT = 47 -IPV6_NEXTHOP = 48 -IPV6_HOPOPTS = 49 -IPV6_DSTOPTS = 50 -IPV6_RTHDR = 51 -IPV6_PKTOPTIONS = 52 -IPV6_RECVTCLASS = 57 -IPV6_AUTOFLOWLABEL = 59 -IPV6_TCLASS = 61 -IPV6_DONTFRAG = 62 -IPV6_PREFER_TEMPADDR = 63 -IPV6_MSFILTER = 74 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_V6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_USETEMPADDR = 32 -IPV6CTL_TEMPPLTIME = 33 -IPV6CTL_TEMPVLTIME = 34 -IPV6CTL_AUTO_LINKLOCAL = 35 -IPV6CTL_RIP6STATS = 36 -IPV6CTL_PREFER_TEMPADDR = 37 -IPV6CTL_ADDRCTLPOLICY = 38 -IPV6CTL_USE_DEFAULTZONE = 39 -IPV6CTL_MAXFRAGS = 41 -IPV6CTL_IFQ = 42 -IPV6CTL_ISATAPRTR = 43 -IPV6CTL_MCAST_PMTU = 44 -IPV6CTL_STEALTH = 45 -IPV6CTL_MAXID = 46 diff --git a/Lib/plat-freebsd7/regen b/Lib/plat-freebsd7/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-freebsd7/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-freebsd8/IN.py b/Lib/plat-freebsd8/IN.py deleted file mode 100644 index 4e3b3a2..0000000 --- a/Lib/plat-freebsd8/IN.py +++ /dev/null @@ -1,571 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from sys/cdefs.h -__GNUCLIKE_ASM = 3 -__GNUCLIKE_ASM = 2 -__GNUCLIKE___TYPEOF = 1 -__GNUCLIKE___OFFSETOF = 1 -__GNUCLIKE___SECTION = 1 -__GNUCLIKE_ATTRIBUTE_MODE_DI = 1 -__GNUCLIKE_CTOR_SECTION_HANDLING = 1 -__GNUCLIKE_BUILTIN_CONSTANT_P = 1 -__GNUCLIKE_BUILTIN_VARARGS = 1 -__GNUCLIKE_BUILTIN_STDARG = 1 -__GNUCLIKE_BUILTIN_VAALIST = 1 -__GNUC_VA_LIST_COMPATIBILITY = 1 -__GNUCLIKE_BUILTIN_NEXT_ARG = 1 -__GNUCLIKE_BUILTIN_MEMCPY = 1 -__CC_SUPPORTS_INLINE = 1 -__CC_SUPPORTS___INLINE = 1 -__CC_SUPPORTS___INLINE__ = 1 -__CC_SUPPORTS___FUNC__ = 1 -__CC_SUPPORTS_WARNING = 1 -__CC_SUPPORTS_VARADIC_XXX = 1 -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 -__CC_INT_IS_32BIT = 1 -def __P(protos): return protos - -def __STRING(x): return #x - -def __XSTRING(x): return __STRING(x) - -def __P(protos): return () - -def __STRING(x): return "x" - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __aligned(x): return __attribute__((__aligned__(x))) - -def __section(x): return __attribute__((__section__(x))) - -def __nonnull(x): return __attribute__((__nonnull__(x))) - -def __predict_true(exp): return __builtin_expect((exp), 1) - -def __predict_false(exp): return __builtin_expect((exp), 0) - -def __predict_true(exp): return (exp) - -def __predict_false(exp): return (exp) - -def __format_arg(fmtarg): return __attribute__((__format_arg__ (fmtarg))) - -def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s) - -def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s) - -def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s) - -def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s) - -_POSIX_C_SOURCE = 199009 -_POSIX_C_SOURCE = 199209 -__XSI_VISIBLE = 600 -_POSIX_C_SOURCE = 200112 -__XSI_VISIBLE = 500 -_POSIX_C_SOURCE = 199506 -_POSIX_C_SOURCE = 198808 -__POSIX_VISIBLE = 200112 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 199506 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199309 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199209 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 199009 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 198808 -__ISO_C_VISIBLE = 0 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1990 -__POSIX_VISIBLE = 0 -__XSI_VISIBLE = 0 -__BSD_VISIBLE = 0 -__ISO_C_VISIBLE = 1999 -__POSIX_VISIBLE = 200112 -__XSI_VISIBLE = 600 -__BSD_VISIBLE = 1 -__ISO_C_VISIBLE = 1999 - -# Included from sys/_types.h - -# Included from machine/_types.h - -# Included from machine/endian.h -_QUAD_HIGHWORD = 1 -_QUAD_LOWWORD = 0 -_LITTLE_ENDIAN = 1234 -_BIG_ENDIAN = 4321 -_PDP_ENDIAN = 3412 -_BYTE_ORDER = _LITTLE_ENDIAN -LITTLE_ENDIAN = _LITTLE_ENDIAN -BIG_ENDIAN = _BIG_ENDIAN -PDP_ENDIAN = _PDP_ENDIAN -BYTE_ORDER = _BYTE_ORDER -def __word_swap_int_var(x): return \ - -def __word_swap_int_const(x): return \ - -def __word_swap_int(x): return __word_swap_int_var(x) - -def __byte_swap_int_var(x): return \ - -def __byte_swap_int_const(x): return \ - -def __byte_swap_int(x): return __byte_swap_int_var(x) - -def __byte_swap_word_var(x): return \ - -def __byte_swap_word_const(x): return \ - -def __byte_swap_word(x): return __byte_swap_word_var(x) - -def __htonl(x): return __bswap32(x) - -def __htons(x): return __bswap16(x) - -def __ntohl(x): return __bswap32(x) - -def __ntohs(x): return __bswap16(x) - -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_TCP = 6 -IPPROTO_UDP = 17 -def htonl(x): return __htonl(x) - -def htons(x): return __htons(x) - -def ntohl(x): return __ntohl(x) - -def ntohs(x): return __ntohs(x) - -IPPROTO_RAW = 255 -INET_ADDRSTRLEN = 16 -IPPROTO_HOPOPTS = 0 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPV4 = 4 -IPPROTO_IPIP = IPPROTO_IPV4 -IPPROTO_ST = 7 -IPPROTO_EGP = 8 -IPPROTO_PIGP = 9 -IPPROTO_RCCMON = 10 -IPPROTO_NVPII = 11 -IPPROTO_PUP = 12 -IPPROTO_ARGUS = 13 -IPPROTO_EMCON = 14 -IPPROTO_XNET = 15 -IPPROTO_CHAOS = 16 -IPPROTO_MUX = 18 -IPPROTO_MEAS = 19 -IPPROTO_HMP = 20 -IPPROTO_PRM = 21 -IPPROTO_IDP = 22 -IPPROTO_TRUNK1 = 23 -IPPROTO_TRUNK2 = 24 -IPPROTO_LEAF1 = 25 -IPPROTO_LEAF2 = 26 -IPPROTO_RDP = 27 -IPPROTO_IRTP = 28 -IPPROTO_TP = 29 -IPPROTO_BLT = 30 -IPPROTO_NSP = 31 -IPPROTO_INP = 32 -IPPROTO_SEP = 33 -IPPROTO_3PC = 34 -IPPROTO_IDPR = 35 -IPPROTO_XTP = 36 -IPPROTO_DDP = 37 -IPPROTO_CMTP = 38 -IPPROTO_TPXX = 39 -IPPROTO_IL = 40 -IPPROTO_IPV6 = 41 -IPPROTO_SDRP = 42 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_IDRP = 45 -IPPROTO_RSVP = 46 -IPPROTO_GRE = 47 -IPPROTO_MHRP = 48 -IPPROTO_BHA = 49 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_INLSP = 52 -IPPROTO_SWIPE = 53 -IPPROTO_NHRP = 54 -IPPROTO_MOBILE = 55 -IPPROTO_TLSP = 56 -IPPROTO_SKIP = 57 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_AHIP = 61 -IPPROTO_CFTP = 62 -IPPROTO_HELLO = 63 -IPPROTO_SATEXPAK = 64 -IPPROTO_KRYPTOLAN = 65 -IPPROTO_RVD = 66 -IPPROTO_IPPC = 67 -IPPROTO_ADFS = 68 -IPPROTO_SATMON = 69 -IPPROTO_VISA = 70 -IPPROTO_IPCV = 71 -IPPROTO_CPNX = 72 -IPPROTO_CPHB = 73 -IPPROTO_WSN = 74 -IPPROTO_PVP = 75 -IPPROTO_BRSATMON = 76 -IPPROTO_ND = 77 -IPPROTO_WBMON = 78 -IPPROTO_WBEXPAK = 79 -IPPROTO_EON = 80 -IPPROTO_VMTP = 81 -IPPROTO_SVMTP = 82 -IPPROTO_VINES = 83 -IPPROTO_TTP = 84 -IPPROTO_IGP = 85 -IPPROTO_DGP = 86 -IPPROTO_TCF = 87 -IPPROTO_IGRP = 88 -IPPROTO_OSPFIGP = 89 -IPPROTO_SRPC = 90 -IPPROTO_LARP = 91 -IPPROTO_MTP = 92 -IPPROTO_AX25 = 93 -IPPROTO_IPEIP = 94 -IPPROTO_MICP = 95 -IPPROTO_SCCSP = 96 -IPPROTO_ETHERIP = 97 -IPPROTO_ENCAP = 98 -IPPROTO_APES = 99 -IPPROTO_GMTP = 100 -IPPROTO_IPCOMP = 108 -IPPROTO_SCTP = 132 -IPPROTO_PIM = 103 -IPPROTO_CARP = 112 -IPPROTO_PGM = 113 -IPPROTO_PFSYNC = 240 -IPPROTO_OLD_DIVERT = 254 -IPPROTO_MAX = 256 -IPPROTO_DONE = 257 -IPPROTO_DIVERT = 258 -IPPROTO_SPACER = 32767 -IPPORT_RESERVED = 1024 -IPPORT_HIFIRSTAUTO = 49152 -IPPORT_HILASTAUTO = 65535 -IPPORT_RESERVEDSTART = 600 -IPPORT_MAX = 65535 -def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0) - -IN_CLASSA_NET = (-16777216) -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648)) - -IN_CLASSB_NET = (-65536) -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824)) - -IN_CLASSC_NET = (-256) -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912)) - -IN_CLASSD_NET = (-268435456) -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456)) - -def IN_LINKLOCAL(i): return (((u_int32_t)(i) & (-65536)) == (-1442971648)) - -def IN_LOCAL_GROUP(i): return (((u_int32_t)(i) & (-256)) == (-536870912)) - -INADDR_NONE = (-1) -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_SENDSRCADDR = IP_RECVDSTADDR -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_MULTICAST_VIF = 14 -IP_RSVP_ON = 15 -IP_RSVP_OFF = 16 -IP_RSVP_VIF_ON = 17 -IP_RSVP_VIF_OFF = 18 -IP_PORTRANGE = 19 -IP_RECVIF = 20 -IP_IPSEC_POLICY = 21 -IP_FAITH = 22 -IP_ONESBCAST = 23 -IP_FW_TABLE_ADD = 40 -IP_FW_TABLE_DEL = 41 -IP_FW_TABLE_FLUSH = 42 -IP_FW_TABLE_GETSIZE = 43 -IP_FW_TABLE_LIST = 44 -IP_FW_ADD = 50 -IP_FW_DEL = 51 -IP_FW_FLUSH = 52 -IP_FW_ZERO = 53 -IP_FW_GET = 54 -IP_FW_RESETLOG = 55 -IP_FW_NAT_CFG = 56 -IP_FW_NAT_DEL = 57 -IP_FW_NAT_GET_CONFIG = 58 -IP_FW_NAT_GET_LOG = 59 -IP_DUMMYNET_CONFIGURE = 60 -IP_DUMMYNET_DEL = 61 -IP_DUMMYNET_FLUSH = 62 -IP_DUMMYNET_GET = 64 -IP_RECVTTL = 65 -IP_MINTTL = 66 -IP_DONTFRAG = 67 -IP_ADD_SOURCE_MEMBERSHIP = 70 -IP_DROP_SOURCE_MEMBERSHIP = 71 -IP_BLOCK_SOURCE = 72 -IP_UNBLOCK_SOURCE = 73 -IP_MSFILTER = 74 -MCAST_JOIN_GROUP = 80 -MCAST_LEAVE_GROUP = 81 -MCAST_JOIN_SOURCE_GROUP = 82 -MCAST_LEAVE_SOURCE_GROUP = 83 -MCAST_BLOCK_SOURCE = 84 -MCAST_UNBLOCK_SOURCE = 85 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MIN_MEMBERSHIPS = 31 -IP_MAX_MEMBERSHIPS = 4095 -IP_MAX_SOURCE_FILTER = 1024 -MCAST_INCLUDE = 1 -MCAST_EXCLUDE = 2 -IP_PORTRANGE_DEFAULT = 0 -IP_PORTRANGE_HIGH = 1 -IP_PORTRANGE_LOW = 2 -IPPROTO_MAXID = (IPPROTO_AH + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_RTEXPIRE = 5 -IPCTL_RTMINEXPIRE = 6 -IPCTL_RTMAXCACHE = 7 -IPCTL_SOURCEROUTE = 8 -IPCTL_DIRECTEDBROADCAST = 9 -IPCTL_INTRQMAXLEN = 10 -IPCTL_INTRQDROPS = 11 -IPCTL_STATS = 12 -IPCTL_ACCEPTSOURCEROUTE = 13 -IPCTL_FASTFORWARDING = 14 -IPCTL_KEEPFAITH = 15 -IPCTL_GIF_TTL = 16 -IPCTL_MAXID = 17 -def in_nullhost(x): return ((x).s_addr == INADDR_ANY) - - -# Included from netinet6/in6.h -__KAME_VERSION = "FreeBSD" -IPV6PORT_RESERVED = 1024 -IPV6PORT_ANONMIN = 49152 -IPV6PORT_ANONMAX = 65535 -IPV6PORT_RESERVEDMIN = 600 -IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -INET6_ADDRSTRLEN = 46 -IPV6_ADDR_INT32_ONE = 1 -IPV6_ADDR_INT32_TWO = 2 -IPV6_ADDR_INT32_MNL = (-16711680) -IPV6_ADDR_INT32_MLL = (-16646144) -IPV6_ADDR_INT32_SMP = 0x0000ffff -IPV6_ADDR_INT16_ULL = 0xfe80 -IPV6_ADDR_INT16_USL = 0xfec0 -IPV6_ADDR_INT16_MLL = 0xff02 -IPV6_ADDR_INT32_ONE = 0x01000000 -IPV6_ADDR_INT32_TWO = 0x02000000 -IPV6_ADDR_INT32_MNL = 0x000001ff -IPV6_ADDR_INT32_MLL = 0x000002ff -IPV6_ADDR_INT32_SMP = (-65536) -IPV6_ADDR_INT16_ULL = 0x80fe -IPV6_ADDR_INT16_USL = 0xc0fe -IPV6_ADDR_INT16_MLL = 0x02ff -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -IPV6_ADDR_SCOPE_GLOBAL = 0x0e -__IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01 -__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -__IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -__IPV6_ADDR_SCOPE_GLOBAL = 0x0e -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - -def IN6_IS_SCOPE_LINKLOCAL(a): return \ - -def IN6_IS_SCOPE_EMBED(a): return \ - -def IFA6_IS_DEPRECATED(a): return \ - -def IFA6_IS_INVALID(a): return \ - -IPV6_OPTIONS = 1 -IPV6_RECVOPTS = 5 -IPV6_RECVRETOPTS = 6 -IPV6_RECVDSTADDR = 7 -IPV6_RETOPTS = 8 -IPV6_SOCKOPT_RESERVED1 = 3 -IPV6_UNICAST_HOPS = 4 -IPV6_MULTICAST_IF = 9 -IPV6_MULTICAST_HOPS = 10 -IPV6_MULTICAST_LOOP = 11 -IPV6_JOIN_GROUP = 12 -IPV6_LEAVE_GROUP = 13 -IPV6_PORTRANGE = 14 -ICMP6_FILTER = 18 -IPV6_2292PKTINFO = 19 -IPV6_2292HOPLIMIT = 20 -IPV6_2292NEXTHOP = 21 -IPV6_2292HOPOPTS = 22 -IPV6_2292DSTOPTS = 23 -IPV6_2292RTHDR = 24 -IPV6_2292PKTOPTIONS = 25 -IPV6_CHECKSUM = 26 -IPV6_V6ONLY = 27 -IPV6_BINDV6ONLY = IPV6_V6ONLY -IPV6_IPSEC_POLICY = 28 -IPV6_FAITH = 29 -IPV6_FW_ADD = 30 -IPV6_FW_DEL = 31 -IPV6_FW_FLUSH = 32 -IPV6_FW_ZERO = 33 -IPV6_FW_GET = 34 -IPV6_RTHDRDSTOPTS = 35 -IPV6_RECVPKTINFO = 36 -IPV6_RECVHOPLIMIT = 37 -IPV6_RECVRTHDR = 38 -IPV6_RECVHOPOPTS = 39 -IPV6_RECVDSTOPTS = 40 -IPV6_RECVRTHDRDSTOPTS = 41 -IPV6_USE_MIN_MTU = 42 -IPV6_RECVPATHMTU = 43 -IPV6_PATHMTU = 44 -IPV6_REACHCONF = 45 -IPV6_PKTINFO = 46 -IPV6_HOPLIMIT = 47 -IPV6_NEXTHOP = 48 -IPV6_HOPOPTS = 49 -IPV6_DSTOPTS = 50 -IPV6_RTHDR = 51 -IPV6_PKTOPTIONS = 52 -IPV6_RECVTCLASS = 57 -IPV6_AUTOFLOWLABEL = 59 -IPV6_TCLASS = 61 -IPV6_DONTFRAG = 62 -IPV6_PREFER_TEMPADDR = 63 -IPV6_MSFILTER = 74 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_DEFAULT_MULTICAST_HOPS = 1 -IPV6_DEFAULT_MULTICAST_LOOP = 1 -IPV6_PORTRANGE_DEFAULT = 0 -IPV6_PORTRANGE_HIGH = 1 -IPV6_PORTRANGE_LOW = 2 -IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -IPV6CTL_FORWARDING = 1 -IPV6CTL_SENDREDIRECTS = 2 -IPV6CTL_DEFHLIM = 3 -IPV6CTL_DEFMTU = 4 -IPV6CTL_FORWSRCRT = 5 -IPV6CTL_STATS = 6 -IPV6CTL_MRTSTATS = 7 -IPV6CTL_MRTPROTO = 8 -IPV6CTL_MAXFRAGPACKETS = 9 -IPV6CTL_SOURCECHECK = 10 -IPV6CTL_SOURCECHECK_LOGINT = 11 -IPV6CTL_ACCEPT_RTADV = 12 -IPV6CTL_KEEPFAITH = 13 -IPV6CTL_LOG_INTERVAL = 14 -IPV6CTL_HDRNESTLIMIT = 15 -IPV6CTL_DAD_COUNT = 16 -IPV6CTL_AUTO_FLOWLABEL = 17 -IPV6CTL_DEFMCASTHLIM = 18 -IPV6CTL_GIF_HLIM = 19 -IPV6CTL_KAME_VERSION = 20 -IPV6CTL_USE_DEPRECATED = 21 -IPV6CTL_RR_PRUNE = 22 -IPV6CTL_MAPPED_ADDR = 23 -IPV6CTL_V6ONLY = 24 -IPV6CTL_RTEXPIRE = 25 -IPV6CTL_RTMINEXPIRE = 26 -IPV6CTL_RTMAXCACHE = 27 -IPV6CTL_USETEMPADDR = 32 -IPV6CTL_TEMPPLTIME = 33 -IPV6CTL_TEMPVLTIME = 34 -IPV6CTL_AUTO_LINKLOCAL = 35 -IPV6CTL_RIP6STATS = 36 -IPV6CTL_PREFER_TEMPADDR = 37 -IPV6CTL_ADDRCTLPOLICY = 38 -IPV6CTL_USE_DEFAULTZONE = 39 -IPV6CTL_MAXFRAGS = 41 -IPV6CTL_IFQ = 42 -IPV6CTL_ISATAPRTR = 43 -IPV6CTL_MCAST_PMTU = 44 -IPV6CTL_STEALTH = 45 -IPV6CTL_MAXID = 46 diff --git a/Lib/plat-freebsd8/regen b/Lib/plat-freebsd8/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-freebsd8/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-generic/regen b/Lib/plat-generic/regen deleted file mode 100755 index c96167d..0000000 --- a/Lib/plat-generic/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" /usr/include/netinet/in.h diff --git a/Lib/plat-linux/CDROM.py b/Lib/plat-linux/CDROM.py deleted file mode 100644 index 4340936..0000000 --- a/Lib/plat-linux/CDROM.py +++ /dev/null @@ -1,207 +0,0 @@ -# Generated by h2py from /usr/include/linux/cdrom.h - -CDROMPAUSE = 0x5301 -CDROMRESUME = 0x5302 -CDROMPLAYMSF = 0x5303 -CDROMPLAYTRKIND = 0x5304 -CDROMREADTOCHDR = 0x5305 -CDROMREADTOCENTRY = 0x5306 -CDROMSTOP = 0x5307 -CDROMSTART = 0x5308 -CDROMEJECT = 0x5309 -CDROMVOLCTRL = 0x530a -CDROMSUBCHNL = 0x530b -CDROMREADMODE2 = 0x530c -CDROMREADMODE1 = 0x530d -CDROMREADAUDIO = 0x530e -CDROMEJECT_SW = 0x530f -CDROMMULTISESSION = 0x5310 -CDROM_GET_MCN = 0x5311 -CDROM_GET_UPC = CDROM_GET_MCN -CDROMRESET = 0x5312 -CDROMVOLREAD = 0x5313 -CDROMREADRAW = 0x5314 -CDROMREADCOOKED = 0x5315 -CDROMSEEK = 0x5316 -CDROMPLAYBLK = 0x5317 -CDROMREADALL = 0x5318 -CDROMGETSPINDOWN = 0x531d -CDROMSETSPINDOWN = 0x531e -CDROMCLOSETRAY = 0x5319 -CDROM_SET_OPTIONS = 0x5320 -CDROM_CLEAR_OPTIONS = 0x5321 -CDROM_SELECT_SPEED = 0x5322 -CDROM_SELECT_DISC = 0x5323 -CDROM_MEDIA_CHANGED = 0x5325 -CDROM_DRIVE_STATUS = 0x5326 -CDROM_DISC_STATUS = 0x5327 -CDROM_CHANGER_NSLOTS = 0x5328 -CDROM_LOCKDOOR = 0x5329 -CDROM_DEBUG = 0x5330 -CDROM_GET_CAPABILITY = 0x5331 -CDROMAUDIOBUFSIZ = 0x5382 -DVD_READ_STRUCT = 0x5390 -DVD_WRITE_STRUCT = 0x5391 -DVD_AUTH = 0x5392 -CDROM_SEND_PACKET = 0x5393 -CDROM_NEXT_WRITABLE = 0x5394 -CDROM_LAST_WRITTEN = 0x5395 -CDROM_PACKET_SIZE = 12 -CGC_DATA_UNKNOWN = 0 -CGC_DATA_WRITE = 1 -CGC_DATA_READ = 2 -CGC_DATA_NONE = 3 -CD_MINS = 74 -CD_SECS = 60 -CD_FRAMES = 75 -CD_SYNC_SIZE = 12 -CD_MSF_OFFSET = 150 -CD_CHUNK_SIZE = 24 -CD_NUM_OF_CHUNKS = 98 -CD_FRAMESIZE_SUB = 96 -CD_HEAD_SIZE = 4 -CD_SUBHEAD_SIZE = 8 -CD_EDC_SIZE = 4 -CD_ZERO_SIZE = 8 -CD_ECC_SIZE = 276 -CD_FRAMESIZE = 2048 -CD_FRAMESIZE_RAW = 2352 -CD_FRAMESIZE_RAWER = 2646 -CD_FRAMESIZE_RAW1 = (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) -CD_FRAMESIZE_RAW0 = (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) -CD_XA_HEAD = (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) -CD_XA_TAIL = (CD_EDC_SIZE+CD_ECC_SIZE) -CD_XA_SYNC_HEAD = (CD_SYNC_SIZE+CD_XA_HEAD) -CDROM_LBA = 0x01 -CDROM_MSF = 0x02 -CDROM_DATA_TRACK = 0x04 -CDROM_LEADOUT = 0xAA -CDROM_AUDIO_INVALID = 0x00 -CDROM_AUDIO_PLAY = 0x11 -CDROM_AUDIO_PAUSED = 0x12 -CDROM_AUDIO_COMPLETED = 0x13 -CDROM_AUDIO_ERROR = 0x14 -CDROM_AUDIO_NO_STATUS = 0x15 -CDC_CLOSE_TRAY = 0x1 -CDC_OPEN_TRAY = 0x2 -CDC_LOCK = 0x4 -CDC_SELECT_SPEED = 0x8 -CDC_SELECT_DISC = 0x10 -CDC_MULTI_SESSION = 0x20 -CDC_MCN = 0x40 -CDC_MEDIA_CHANGED = 0x80 -CDC_PLAY_AUDIO = 0x100 -CDC_RESET = 0x200 -CDC_IOCTLS = 0x400 -CDC_DRIVE_STATUS = 0x800 -CDC_GENERIC_PACKET = 0x1000 -CDC_CD_R = 0x2000 -CDC_CD_RW = 0x4000 -CDC_DVD = 0x8000 -CDC_DVD_R = 0x10000 -CDC_DVD_RAM = 0x20000 -CDS_NO_INFO = 0 -CDS_NO_DISC = 1 -CDS_TRAY_OPEN = 2 -CDS_DRIVE_NOT_READY = 3 -CDS_DISC_OK = 4 -CDS_AUDIO = 100 -CDS_DATA_1 = 101 -CDS_DATA_2 = 102 -CDS_XA_2_1 = 103 -CDS_XA_2_2 = 104 -CDS_MIXED = 105 -CDO_AUTO_CLOSE = 0x1 -CDO_AUTO_EJECT = 0x2 -CDO_USE_FFLAGS = 0x4 -CDO_LOCK = 0x8 -CDO_CHECK_TYPE = 0x10 -CD_PART_MAX = 64 -CD_PART_MASK = (CD_PART_MAX - 1) -GPCMD_BLANK = 0xa1 -GPCMD_CLOSE_TRACK = 0x5b -GPCMD_FLUSH_CACHE = 0x35 -GPCMD_FORMAT_UNIT = 0x04 -GPCMD_GET_CONFIGURATION = 0x46 -GPCMD_GET_EVENT_STATUS_NOTIFICATION = 0x4a -GPCMD_GET_PERFORMANCE = 0xac -GPCMD_INQUIRY = 0x12 -GPCMD_LOAD_UNLOAD = 0xa6 -GPCMD_MECHANISM_STATUS = 0xbd -GPCMD_MODE_SELECT_10 = 0x55 -GPCMD_MODE_SENSE_10 = 0x5a -GPCMD_PAUSE_RESUME = 0x4b -GPCMD_PLAY_AUDIO_10 = 0x45 -GPCMD_PLAY_AUDIO_MSF = 0x47 -GPCMD_PLAY_AUDIO_TI = 0x48 -GPCMD_PLAY_CD = 0xbc -GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL = 0x1e -GPCMD_READ_10 = 0x28 -GPCMD_READ_12 = 0xa8 -GPCMD_READ_CDVD_CAPACITY = 0x25 -GPCMD_READ_CD = 0xbe -GPCMD_READ_CD_MSF = 0xb9 -GPCMD_READ_DISC_INFO = 0x51 -GPCMD_READ_DVD_STRUCTURE = 0xad -GPCMD_READ_FORMAT_CAPACITIES = 0x23 -GPCMD_READ_HEADER = 0x44 -GPCMD_READ_TRACK_RZONE_INFO = 0x52 -GPCMD_READ_SUBCHANNEL = 0x42 -GPCMD_READ_TOC_PMA_ATIP = 0x43 -GPCMD_REPAIR_RZONE_TRACK = 0x58 -GPCMD_REPORT_KEY = 0xa4 -GPCMD_REQUEST_SENSE = 0x03 -GPCMD_RESERVE_RZONE_TRACK = 0x53 -GPCMD_SCAN = 0xba -GPCMD_SEEK = 0x2b -GPCMD_SEND_DVD_STRUCTURE = 0xad -GPCMD_SEND_EVENT = 0xa2 -GPCMD_SEND_KEY = 0xa3 -GPCMD_SEND_OPC = 0x54 -GPCMD_SET_READ_AHEAD = 0xa7 -GPCMD_SET_STREAMING = 0xb6 -GPCMD_START_STOP_UNIT = 0x1b -GPCMD_STOP_PLAY_SCAN = 0x4e -GPCMD_TEST_UNIT_READY = 0x00 -GPCMD_VERIFY_10 = 0x2f -GPCMD_WRITE_10 = 0x2a -GPCMD_WRITE_AND_VERIFY_10 = 0x2e -GPCMD_SET_SPEED = 0xbb -GPCMD_PLAYAUDIO_TI = 0x48 -GPCMD_GET_MEDIA_STATUS = 0xda -GPMODE_R_W_ERROR_PAGE = 0x01 -GPMODE_WRITE_PARMS_PAGE = 0x05 -GPMODE_AUDIO_CTL_PAGE = 0x0e -GPMODE_POWER_PAGE = 0x1a -GPMODE_FAULT_FAIL_PAGE = 0x1c -GPMODE_TO_PROTECT_PAGE = 0x1d -GPMODE_CAPABILITIES_PAGE = 0x2a -GPMODE_ALL_PAGES = 0x3f -GPMODE_CDROM_PAGE = 0x0d -DVD_STRUCT_PHYSICAL = 0x00 -DVD_STRUCT_COPYRIGHT = 0x01 -DVD_STRUCT_DISCKEY = 0x02 -DVD_STRUCT_BCA = 0x03 -DVD_STRUCT_MANUFACT = 0x04 -DVD_LAYERS = 4 -DVD_LU_SEND_AGID = 0 -DVD_HOST_SEND_CHALLENGE = 1 -DVD_LU_SEND_KEY1 = 2 -DVD_LU_SEND_CHALLENGE = 3 -DVD_HOST_SEND_KEY2 = 4 -DVD_AUTH_ESTABLISHED = 5 -DVD_AUTH_FAILURE = 6 -DVD_LU_SEND_TITLE_KEY = 7 -DVD_LU_SEND_ASF = 8 -DVD_INVALIDATE_AGID = 9 -DVD_LU_SEND_RPC_STATE = 10 -DVD_HOST_SEND_RPC_STATE = 11 -DVD_CPM_NO_COPYRIGHT = 0 -DVD_CPM_COPYRIGHTED = 1 -DVD_CP_SEC_NONE = 0 -DVD_CP_SEC_EXIST = 1 -DVD_CGMS_UNRESTRICTED = 0 -DVD_CGMS_SINGLE = 2 -DVD_CGMS_RESTRICTED = 3 - -CDROM_MAX_SLOTS = 256 diff --git a/Lib/plat-linux/DLFCN.py b/Lib/plat-linux/DLFCN.py deleted file mode 100644 index dd10ac4..0000000 --- a/Lib/plat-linux/DLFCN.py +++ /dev/null @@ -1,83 +0,0 @@ -# Generated by h2py from /usr/include/dlfcn.h -_DLFCN_H = 1 - -# Included from features.h -_FEATURES_H = 1 -__USE_ANSI = 1 -__FAVOR_BSD = 1 -_ISOC99_SOURCE = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 199506 -_XOPEN_SOURCE = 600 -_XOPEN_SOURCE_EXTENDED = 1 -_LARGEFILE64_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -__USE_ISOC99 = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 2 -_POSIX_C_SOURCE = 199506 -__USE_POSIX = 1 -__USE_POSIX2 = 1 -__USE_POSIX199309 = 1 -__USE_POSIX199506 = 1 -__USE_XOPEN = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_UNIX98 = 1 -_LARGEFILE_SOURCE = 1 -__USE_XOPEN2K = 1 -__USE_ISOC99 = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_FILE_OFFSET64 = 1 -__USE_MISC = 1 -__USE_BSD = 1 -__USE_SVID = 1 -__USE_GNU = 1 -__USE_REENTRANT = 1 -__STDC_IEC_559__ = 1 -__STDC_IEC_559_COMPLEX__ = 1 -__STDC_ISO_10646__ = 200009 -__GNU_LIBRARY__ = 6 -__GLIBC__ = 2 -__GLIBC_MINOR__ = 2 - -# Included from sys/cdefs.h -_SYS_CDEFS_H = 1 -def __PMT(args): return args - -def __P(args): return args - -def __PMT(args): return args - -def __STRING(x): return #x - -__flexarr = [] -__flexarr = [0] -__flexarr = [] -__flexarr = [1] -def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) - -def __attribute__(xyz): return - -def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) - -def __attribute_format_arg__(x): return - -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_EXTERN_INLINES = 1 - -# Included from gnu/stubs.h - -# Included from bits/dlfcn.h -RTLD_LAZY = 0x00001 -RTLD_NOW = 0x00002 -RTLD_BINDING_MASK = 0x3 -RTLD_NOLOAD = 0x00004 -RTLD_GLOBAL = 0x00100 -RTLD_LOCAL = 0 -RTLD_NODELETE = 0x01000 diff --git a/Lib/plat-linux/IN.py b/Lib/plat-linux/IN.py deleted file mode 100644 index d7d3002..0000000 --- a/Lib/plat-linux/IN.py +++ /dev/null @@ -1,615 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h -_NETINET_IN_H = 1 - -# Included from features.h -_FEATURES_H = 1 -__USE_ANSI = 1 -__FAVOR_BSD = 1 -_ISOC99_SOURCE = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 199506 -_XOPEN_SOURCE = 600 -_XOPEN_SOURCE_EXTENDED = 1 -_LARGEFILE64_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -__USE_ISOC99 = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 2 -_POSIX_C_SOURCE = 199506 -__USE_POSIX = 1 -__USE_POSIX2 = 1 -__USE_POSIX199309 = 1 -__USE_POSIX199506 = 1 -__USE_XOPEN = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_UNIX98 = 1 -_LARGEFILE_SOURCE = 1 -__USE_XOPEN2K = 1 -__USE_ISOC99 = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_FILE_OFFSET64 = 1 -__USE_MISC = 1 -__USE_BSD = 1 -__USE_SVID = 1 -__USE_GNU = 1 -__USE_REENTRANT = 1 -__STDC_IEC_559__ = 1 -__STDC_IEC_559_COMPLEX__ = 1 -__STDC_ISO_10646__ = 200009 -__GNU_LIBRARY__ = 6 -__GLIBC__ = 2 -__GLIBC_MINOR__ = 2 - -# Included from sys/cdefs.h -_SYS_CDEFS_H = 1 -def __PMT(args): return args - -def __P(args): return args - -def __PMT(args): return args - -def __STRING(x): return #x - -__flexarr = [] -__flexarr = [0] -__flexarr = [] -__flexarr = [1] -def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) - -def __attribute__(xyz): return - -def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) - -def __attribute_format_arg__(x): return - -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_EXTERN_INLINES = 1 - -# Included from gnu/stubs.h - -# Included from stdint.h -_STDINT_H = 1 - -# Included from bits/wchar.h -_BITS_WCHAR_H = 1 -__WCHAR_MIN = (-2147483647 - 1) -__WCHAR_MAX = (2147483647) - -# Included from bits/wordsize.h -__WORDSIZE = 32 -def __INT64_C(c): return c ## L - -def __UINT64_C(c): return c ## UL - -def __INT64_C(c): return c ## LL - -def __UINT64_C(c): return c ## ULL - -INT8_MIN = (-128) -INT16_MIN = (-32767-1) -INT32_MIN = (-2147483647-1) -INT64_MIN = (-__INT64_C(9223372036854775807)-1) -INT8_MAX = (127) -INT16_MAX = (32767) -INT32_MAX = (2147483647) -INT64_MAX = (__INT64_C(9223372036854775807)) -UINT8_MAX = (255) -UINT16_MAX = (65535) -UINT64_MAX = (__UINT64_C(18446744073709551615)) -INT_LEAST8_MIN = (-128) -INT_LEAST16_MIN = (-32767-1) -INT_LEAST32_MIN = (-2147483647-1) -INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1) -INT_LEAST8_MAX = (127) -INT_LEAST16_MAX = (32767) -INT_LEAST32_MAX = (2147483647) -INT_LEAST64_MAX = (__INT64_C(9223372036854775807)) -UINT_LEAST8_MAX = (255) -UINT_LEAST16_MAX = (65535) -UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615)) -INT_FAST8_MIN = (-128) -INT_FAST16_MIN = (-9223372036854775807-1) -INT_FAST32_MIN = (-9223372036854775807-1) -INT_FAST16_MIN = (-2147483647-1) -INT_FAST32_MIN = (-2147483647-1) -INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1) -INT_FAST8_MAX = (127) -INT_FAST16_MAX = (9223372036854775807) -INT_FAST32_MAX = (9223372036854775807) -INT_FAST16_MAX = (2147483647) -INT_FAST32_MAX = (2147483647) -INT_FAST64_MAX = (__INT64_C(9223372036854775807)) -UINT_FAST8_MAX = (255) -UINT_FAST64_MAX = (__UINT64_C(18446744073709551615)) -INTPTR_MIN = (-9223372036854775807-1) -INTPTR_MAX = (9223372036854775807) -INTPTR_MIN = (-2147483647-1) -INTPTR_MAX = (2147483647) -INTMAX_MIN = (-__INT64_C(9223372036854775807)-1) -INTMAX_MAX = (__INT64_C(9223372036854775807)) -UINTMAX_MAX = (__UINT64_C(18446744073709551615)) -PTRDIFF_MIN = (-9223372036854775807-1) -PTRDIFF_MAX = (9223372036854775807) -PTRDIFF_MIN = (-2147483647-1) -PTRDIFF_MAX = (2147483647) -SIG_ATOMIC_MIN = (-2147483647-1) -SIG_ATOMIC_MAX = (2147483647) -WCHAR_MIN = __WCHAR_MIN -WCHAR_MAX = __WCHAR_MAX -def INT8_C(c): return c - -def INT16_C(c): return c - -def INT32_C(c): return c - -def INT64_C(c): return c ## L - -def INT64_C(c): return c ## LL - -def UINT8_C(c): return c ## U - -def UINT16_C(c): return c ## U - -def UINT32_C(c): return c ## U - -def UINT64_C(c): return c ## UL - -def UINT64_C(c): return c ## ULL - -def INTMAX_C(c): return c ## L - -def UINTMAX_C(c): return c ## UL - -def INTMAX_C(c): return c ## LL - -def UINTMAX_C(c): return c ## ULL - - -# Included from bits/types.h -_BITS_TYPES_H = 1 -__FD_SETSIZE = 1024 - -# Included from bits/pthreadtypes.h -_BITS_PTHREADTYPES_H = 1 - -# Included from bits/sched.h -SCHED_OTHER = 0 -SCHED_FIFO = 1 -SCHED_RR = 2 -CSIGNAL = 0x000000ff -CLONE_VM = 0x00000100 -CLONE_FS = 0x00000200 -CLONE_FILES = 0x00000400 -CLONE_SIGHAND = 0x00000800 -CLONE_PID = 0x00001000 -CLONE_PTRACE = 0x00002000 -CLONE_VFORK = 0x00004000 -__defined_schedparam = 1 -def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0) - -IN_CLASSA_NET = (-16777216) -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET) -IN_CLASSA_MAX = 128 -def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648)) - -IN_CLASSB_NET = (-65536) -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET) -IN_CLASSB_MAX = 65536 -def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824)) - -IN_CLASSC_NET = (-256) -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET) -def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912)) - -def IN_MULTICAST(a): return IN_CLASSD(a) - -def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912)) - -def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456)) - -IN_LOOPBACKNET = 127 -INET_ADDRSTRLEN = 16 -INET6_ADDRSTRLEN = 46 - -# Included from bits/socket.h - -# Included from limits.h -_LIBC_LIMITS_H_ = 1 -MB_LEN_MAX = 16 -_LIMITS_H = 1 -CHAR_BIT = 8 -SCHAR_MIN = (-128) -SCHAR_MAX = 127 -UCHAR_MAX = 255 -CHAR_MIN = 0 -CHAR_MAX = UCHAR_MAX -CHAR_MIN = SCHAR_MIN -CHAR_MAX = SCHAR_MAX -SHRT_MIN = (-32768) -SHRT_MAX = 32767 -USHRT_MAX = 65535 -INT_MAX = 2147483647 -LONG_MAX = 9223372036854775807 -LONG_MAX = 2147483647 -LONG_MIN = (-LONG_MAX - 1) - -# Included from bits/posix1_lim.h -_BITS_POSIX1_LIM_H = 1 -_POSIX_AIO_LISTIO_MAX = 2 -_POSIX_AIO_MAX = 1 -_POSIX_ARG_MAX = 4096 -_POSIX_CHILD_MAX = 6 -_POSIX_DELAYTIMER_MAX = 32 -_POSIX_LINK_MAX = 8 -_POSIX_MAX_CANON = 255 -_POSIX_MAX_INPUT = 255 -_POSIX_MQ_OPEN_MAX = 8 -_POSIX_MQ_PRIO_MAX = 32 -_POSIX_NGROUPS_MAX = 0 -_POSIX_OPEN_MAX = 16 -_POSIX_FD_SETSIZE = _POSIX_OPEN_MAX -_POSIX_NAME_MAX = 14 -_POSIX_PATH_MAX = 256 -_POSIX_PIPE_BUF = 512 -_POSIX_RTSIG_MAX = 8 -_POSIX_SEM_NSEMS_MAX = 256 -_POSIX_SEM_VALUE_MAX = 32767 -_POSIX_SIGQUEUE_MAX = 32 -_POSIX_SSIZE_MAX = 32767 -_POSIX_STREAM_MAX = 8 -_POSIX_TZNAME_MAX = 6 -_POSIX_QLIMIT = 1 -_POSIX_HIWAT = _POSIX_PIPE_BUF -_POSIX_UIO_MAXIOV = 16 -_POSIX_TTY_NAME_MAX = 9 -_POSIX_TIMER_MAX = 32 -_POSIX_LOGIN_NAME_MAX = 9 -_POSIX_CLOCKRES_MIN = 20000000 - -# Included from bits/local_lim.h - -# Included from linux/limits.h -NR_OPEN = 1024 -NGROUPS_MAX = 32 -ARG_MAX = 131072 -CHILD_MAX = 999 -OPEN_MAX = 256 -LINK_MAX = 127 -MAX_CANON = 255 -MAX_INPUT = 255 -NAME_MAX = 255 -PATH_MAX = 4096 -PIPE_BUF = 4096 -RTSIG_MAX = 32 -_POSIX_THREAD_KEYS_MAX = 128 -PTHREAD_KEYS_MAX = 1024 -_POSIX_THREAD_DESTRUCTOR_ITERATIONS = 4 -PTHREAD_DESTRUCTOR_ITERATIONS = _POSIX_THREAD_DESTRUCTOR_ITERATIONS -_POSIX_THREAD_THREADS_MAX = 64 -PTHREAD_THREADS_MAX = 1024 -AIO_PRIO_DELTA_MAX = 20 -PTHREAD_STACK_MIN = 16384 -TIMER_MAX = 256 -SSIZE_MAX = LONG_MAX -NGROUPS_MAX = _POSIX_NGROUPS_MAX - -# Included from bits/posix2_lim.h -_BITS_POSIX2_LIM_H = 1 -_POSIX2_BC_BASE_MAX = 99 -_POSIX2_BC_DIM_MAX = 2048 -_POSIX2_BC_SCALE_MAX = 99 -_POSIX2_BC_STRING_MAX = 1000 -_POSIX2_COLL_WEIGHTS_MAX = 2 -_POSIX2_EXPR_NEST_MAX = 32 -_POSIX2_LINE_MAX = 2048 -_POSIX2_RE_DUP_MAX = 255 -_POSIX2_CHARCLASS_NAME_MAX = 14 -BC_BASE_MAX = _POSIX2_BC_BASE_MAX -BC_DIM_MAX = _POSIX2_BC_DIM_MAX -BC_SCALE_MAX = _POSIX2_BC_SCALE_MAX -BC_STRING_MAX = _POSIX2_BC_STRING_MAX -COLL_WEIGHTS_MAX = 255 -EXPR_NEST_MAX = _POSIX2_EXPR_NEST_MAX -LINE_MAX = _POSIX2_LINE_MAX -CHARCLASS_NAME_MAX = 2048 -RE_DUP_MAX = (0x7fff) - -# Included from bits/xopen_lim.h -_XOPEN_LIM_H = 1 - -# Included from bits/stdio_lim.h -L_tmpnam = 20 -TMP_MAX = 238328 -FILENAME_MAX = 4096 -L_ctermid = 9 -L_cuserid = 9 -FOPEN_MAX = 16 -IOV_MAX = 1024 -_XOPEN_IOV_MAX = _POSIX_UIO_MAXIOV -NL_ARGMAX = _POSIX_ARG_MAX -NL_LANGMAX = _POSIX2_LINE_MAX -NL_MSGMAX = INT_MAX -NL_NMAX = INT_MAX -NL_SETMAX = INT_MAX -NL_TEXTMAX = INT_MAX -NZERO = 20 -WORD_BIT = 16 -WORD_BIT = 32 -WORD_BIT = 64 -WORD_BIT = 16 -WORD_BIT = 32 -WORD_BIT = 64 -WORD_BIT = 32 -LONG_BIT = 32 -LONG_BIT = 64 -LONG_BIT = 32 -LONG_BIT = 64 -LONG_BIT = 64 -LONG_BIT = 32 -from TYPES import * -PF_UNSPEC = 0 -PF_LOCAL = 1 -PF_UNIX = PF_LOCAL -PF_FILE = PF_LOCAL -PF_INET = 2 -PF_AX25 = 3 -PF_IPX = 4 -PF_APPLETALK = 5 -PF_NETROM = 6 -PF_BRIDGE = 7 -PF_ATMPVC = 8 -PF_X25 = 9 -PF_INET6 = 10 -PF_ROSE = 11 -PF_DECnet = 12 -PF_NETBEUI = 13 -PF_SECURITY = 14 -PF_KEY = 15 -PF_NETLINK = 16 -PF_ROUTE = PF_NETLINK -PF_PACKET = 17 -PF_ASH = 18 -PF_ECONET = 19 -PF_ATMSVC = 20 -PF_SNA = 22 -PF_IRDA = 23 -PF_PPPOX = 24 -PF_WANPIPE = 25 -PF_BLUETOOTH = 31 -PF_MAX = 32 -AF_UNSPEC = PF_UNSPEC -AF_LOCAL = PF_LOCAL -AF_UNIX = PF_UNIX -AF_FILE = PF_FILE -AF_INET = PF_INET -AF_AX25 = PF_AX25 -AF_IPX = PF_IPX -AF_APPLETALK = PF_APPLETALK -AF_NETROM = PF_NETROM -AF_BRIDGE = PF_BRIDGE -AF_ATMPVC = PF_ATMPVC -AF_X25 = PF_X25 -AF_INET6 = PF_INET6 -AF_ROSE = PF_ROSE -AF_DECnet = PF_DECnet -AF_NETBEUI = PF_NETBEUI -AF_SECURITY = PF_SECURITY -AF_KEY = PF_KEY -AF_NETLINK = PF_NETLINK -AF_ROUTE = PF_ROUTE -AF_PACKET = PF_PACKET -AF_ASH = PF_ASH -AF_ECONET = PF_ECONET -AF_ATMSVC = PF_ATMSVC -AF_SNA = PF_SNA -AF_IRDA = PF_IRDA -AF_PPPOX = PF_PPPOX -AF_WANPIPE = PF_WANPIPE -AF_BLUETOOTH = PF_BLUETOOTH -AF_MAX = PF_MAX -SOL_RAW = 255 -SOL_DECNET = 261 -SOL_X25 = 262 -SOL_PACKET = 263 -SOL_ATM = 264 -SOL_AAL = 265 -SOL_IRDA = 266 -SOMAXCONN = 128 - -# Included from bits/sockaddr.h -_BITS_SOCKADDR_H = 1 -def __SOCKADDR_COMMON(sa_prefix): return \ - -_SS_SIZE = 128 -def CMSG_FIRSTHDR(mhdr): return \ - - -# Included from asm/socket.h - -# Included from asm/sockios.h -FIOSETOWN = 0x8901 -SIOCSPGRP = 0x8902 -FIOGETOWN = 0x8903 -SIOCGPGRP = 0x8904 -SIOCATMARK = 0x8905 -SIOCGSTAMP = 0x8906 -SOL_SOCKET = 1 -SO_DEBUG = 1 -SO_REUSEADDR = 2 -SO_TYPE = 3 -SO_ERROR = 4 -SO_DONTROUTE = 5 -SO_BROADCAST = 6 -SO_SNDBUF = 7 -SO_RCVBUF = 8 -SO_KEEPALIVE = 9 -SO_OOBINLINE = 10 -SO_NO_CHECK = 11 -SO_PRIORITY = 12 -SO_LINGER = 13 -SO_BSDCOMPAT = 14 -SO_PASSCRED = 16 -SO_PEERCRED = 17 -SO_RCVLOWAT = 18 -SO_SNDLOWAT = 19 -SO_RCVTIMEO = 20 -SO_SNDTIMEO = 21 -SO_SECURITY_AUTHENTICATION = 22 -SO_SECURITY_ENCRYPTION_TRANSPORT = 23 -SO_SECURITY_ENCRYPTION_NETWORK = 24 -SO_BINDTODEVICE = 25 -SO_ATTACH_FILTER = 26 -SO_DETACH_FILTER = 27 -SO_PEERNAME = 28 -SO_TIMESTAMP = 29 -SCM_TIMESTAMP = SO_TIMESTAMP -SO_ACCEPTCONN = 30 -SOCK_STREAM = 1 -SOCK_DGRAM = 2 -SOCK_RAW = 3 -SOCK_RDM = 4 -SOCK_SEQPACKET = 5 -SOCK_PACKET = 10 -SOCK_MAX = (SOCK_PACKET+1) - -# Included from bits/in.h -IP_TOS = 1 -IP_TTL = 2 -IP_HDRINCL = 3 -IP_OPTIONS = 4 -IP_ROUTER_ALERT = 5 -IP_RECVOPTS = 6 -IP_RETOPTS = 7 -IP_PKTINFO = 8 -IP_PKTOPTIONS = 9 -IP_PMTUDISC = 10 -IP_MTU_DISCOVER = 10 -IP_RECVERR = 11 -IP_RECVTTL = 12 -IP_RECVTOS = 13 -IP_MULTICAST_IF = 32 -IP_MULTICAST_TTL = 33 -IP_MULTICAST_LOOP = 34 -IP_ADD_MEMBERSHIP = 35 -IP_DROP_MEMBERSHIP = 36 -IP_RECVRETOPTS = IP_RETOPTS -IP_PMTUDISC_DONT = 0 -IP_PMTUDISC_WANT = 1 -IP_PMTUDISC_DO = 2 -SOL_IP = 0 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IPV6_ADDRFORM = 1 -IPV6_PKTINFO = 2 -IPV6_HOPOPTS = 3 -IPV6_DSTOPTS = 4 -IPV6_RTHDR = 5 -IPV6_PKTOPTIONS = 6 -IPV6_CHECKSUM = 7 -IPV6_HOPLIMIT = 8 -IPV6_NEXTHOP = 9 -IPV6_AUTHHDR = 10 -IPV6_UNICAST_HOPS = 16 -IPV6_MULTICAST_IF = 17 -IPV6_MULTICAST_HOPS = 18 -IPV6_MULTICAST_LOOP = 19 -IPV6_JOIN_GROUP = 20 -IPV6_LEAVE_GROUP = 21 -IPV6_ROUTER_ALERT = 22 -IPV6_MTU_DISCOVER = 23 -IPV6_MTU = 24 -IPV6_RECVERR = 25 -IPV6_RXHOPOPTS = IPV6_HOPOPTS -IPV6_RXDSTOPTS = IPV6_DSTOPTS -IPV6_ADD_MEMBERSHIP = IPV6_JOIN_GROUP -IPV6_DROP_MEMBERSHIP = IPV6_LEAVE_GROUP -IPV6_PMTUDISC_DONT = 0 -IPV6_PMTUDISC_WANT = 1 -IPV6_PMTUDISC_DO = 2 -SOL_IPV6 = 41 -SOL_ICMPV6 = 58 -IPV6_RTHDR_LOOSE = 0 -IPV6_RTHDR_STRICT = 1 -IPV6_RTHDR_TYPE_0 = 0 - -# Included from endian.h -_ENDIAN_H = 1 -__LITTLE_ENDIAN = 1234 -__BIG_ENDIAN = 4321 -__PDP_ENDIAN = 3412 - -# Included from bits/endian.h -__BYTE_ORDER = __LITTLE_ENDIAN -__FLOAT_WORD_ORDER = __BYTE_ORDER -LITTLE_ENDIAN = __LITTLE_ENDIAN -BIG_ENDIAN = __BIG_ENDIAN -PDP_ENDIAN = __PDP_ENDIAN -BYTE_ORDER = __BYTE_ORDER - -# Included from bits/byteswap.h -_BITS_BYTESWAP_H = 1 -def __bswap_constant_16(x): return \ - -def __bswap_16(x): return \ - -def __bswap_16(x): return __bswap_constant_16 (x) - -def __bswap_constant_32(x): return \ - -def __bswap_32(x): return \ - -def __bswap_32(x): return \ - -def __bswap_32(x): return __bswap_constant_32 (x) - -def __bswap_constant_64(x): return \ - -def __bswap_64(x): return \ - -def ntohl(x): return (x) - -def ntohs(x): return (x) - -def htonl(x): return (x) - -def htons(x): return (x) - -def ntohl(x): return __bswap_32 (x) - -def ntohs(x): return __bswap_16 (x) - -def htonl(x): return __bswap_32 (x) - -def htons(x): return __bswap_16 (x) - -def IN6_IS_ADDR_UNSPECIFIED(a): return \ - -def IN6_IS_ADDR_LOOPBACK(a): return \ - -def IN6_IS_ADDR_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_SITELOCAL(a): return \ - -def IN6_IS_ADDR_V4MAPPED(a): return \ - -def IN6_IS_ADDR_V4COMPAT(a): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return diff --git a/Lib/plat-linux/TYPES.py b/Lib/plat-linux/TYPES.py deleted file mode 100644 index e7a324b..0000000 --- a/Lib/plat-linux/TYPES.py +++ /dev/null @@ -1,170 +0,0 @@ -# Generated by h2py from /usr/include/sys/types.h -_SYS_TYPES_H = 1 - -# Included from features.h -_FEATURES_H = 1 -__USE_ANSI = 1 -__FAVOR_BSD = 1 -_ISOC99_SOURCE = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 199506 -_XOPEN_SOURCE = 600 -_XOPEN_SOURCE_EXTENDED = 1 -_LARGEFILE64_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -_BSD_SOURCE = 1 -_SVID_SOURCE = 1 -__USE_ISOC99 = 1 -_POSIX_SOURCE = 1 -_POSIX_C_SOURCE = 2 -_POSIX_C_SOURCE = 199506 -__USE_POSIX = 1 -__USE_POSIX2 = 1 -__USE_POSIX199309 = 1 -__USE_POSIX199506 = 1 -__USE_XOPEN = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_UNIX98 = 1 -_LARGEFILE_SOURCE = 1 -__USE_XOPEN2K = 1 -__USE_ISOC99 = 1 -__USE_XOPEN_EXTENDED = 1 -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_FILE_OFFSET64 = 1 -__USE_MISC = 1 -__USE_BSD = 1 -__USE_SVID = 1 -__USE_GNU = 1 -__USE_REENTRANT = 1 -__STDC_IEC_559__ = 1 -__STDC_IEC_559_COMPLEX__ = 1 -__STDC_ISO_10646__ = 200009 -__GNU_LIBRARY__ = 6 -__GLIBC__ = 2 -__GLIBC_MINOR__ = 2 - -# Included from sys/cdefs.h -_SYS_CDEFS_H = 1 -def __PMT(args): return args - -def __P(args): return args - -def __PMT(args): return args - -def __STRING(x): return #x - -__flexarr = [] -__flexarr = [0] -__flexarr = [] -__flexarr = [1] -def __ASMNAME(cname): return __ASMNAME2 (__USER_LABEL_PREFIX__, cname) - -def __attribute__(xyz): return - -def __attribute_format_arg__(x): return __attribute__ ((__format_arg__ (x))) - -def __attribute_format_arg__(x): return - -__USE_LARGEFILE = 1 -__USE_LARGEFILE64 = 1 -__USE_EXTERN_INLINES = 1 - -# Included from gnu/stubs.h - -# Included from bits/types.h -_BITS_TYPES_H = 1 -__FD_SETSIZE = 1024 - -# Included from bits/pthreadtypes.h -_BITS_PTHREADTYPES_H = 1 - -# Included from bits/sched.h -SCHED_OTHER = 0 -SCHED_FIFO = 1 -SCHED_RR = 2 -CSIGNAL = 0x000000ff -CLONE_VM = 0x00000100 -CLONE_FS = 0x00000200 -CLONE_FILES = 0x00000400 -CLONE_SIGHAND = 0x00000800 -CLONE_PID = 0x00001000 -CLONE_PTRACE = 0x00002000 -CLONE_VFORK = 0x00004000 -__defined_schedparam = 1 - -# Included from time.h -_TIME_H = 1 - -# Included from bits/time.h -_BITS_TIME_H = 1 -CLOCKS_PER_SEC = 1000000 -CLOCK_REALTIME = 0 -CLOCK_PROCESS_CPUTIME_ID = 2 -CLOCK_THREAD_CPUTIME_ID = 3 -TIMER_ABSTIME = 1 -_STRUCT_TIMEVAL = 1 -CLK_TCK = CLOCKS_PER_SEC -__clock_t_defined = 1 -__time_t_defined = 1 -__clockid_t_defined = 1 -__timer_t_defined = 1 -__timespec_defined = 1 -def __isleap(year): return \ - -__BIT_TYPES_DEFINED__ = 1 - -# Included from endian.h -_ENDIAN_H = 1 -__LITTLE_ENDIAN = 1234 -__BIG_ENDIAN = 4321 -__PDP_ENDIAN = 3412 - -# Included from bits/endian.h -__BYTE_ORDER = __LITTLE_ENDIAN -__FLOAT_WORD_ORDER = __BYTE_ORDER -LITTLE_ENDIAN = __LITTLE_ENDIAN -BIG_ENDIAN = __BIG_ENDIAN -PDP_ENDIAN = __PDP_ENDIAN -BYTE_ORDER = __BYTE_ORDER - -# Included from sys/select.h -_SYS_SELECT_H = 1 - -# Included from bits/select.h -def __FD_ZERO(fdsp): return \ - -def __FD_ZERO(set): return \ - - -# Included from bits/sigset.h -_SIGSET_H_types = 1 -_SIGSET_H_fns = 1 -def __sigmask(sig): return \ - -def __sigemptyset(set): return \ - -def __sigfillset(set): return \ - -def __sigisemptyset(set): return \ - -def __FDELT(d): return ((d) / __NFDBITS) - -FD_SETSIZE = __FD_SETSIZE -def FD_ZERO(fdsetp): return __FD_ZERO (fdsetp) - - -# Included from sys/sysmacros.h -_SYS_SYSMACROS_H = 1 -def major(dev): return ((int)(((dev) >> 8) & 0xff)) - -def minor(dev): return ((int)((dev) & 0xff)) - -def major(dev): return (((dev).__val[1] >> 8) & 0xff) - -def minor(dev): return ((dev).__val[1] & 0xff) - -def major(dev): return (((dev).__val[0] >> 8) & 0xff) - -def minor(dev): return ((dev).__val[0] & 0xff) diff --git a/Lib/plat-linux/regen b/Lib/plat-linux/regen deleted file mode 100755 index c76950e..0000000 --- a/Lib/plat-linux/regen +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -case `uname` in -Linux*) ;; -*) echo Probably not on a Linux system 1>&2 - exit 1;; -esac -set -v -h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h diff --git a/Lib/plat-netbsd1/IN.py b/Lib/plat-netbsd1/IN.py deleted file mode 100644 index 474c51e..0000000 --- a/Lib/plat-netbsd1/IN.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h -IPPROTO_IP = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPIP = 4 -IPPROTO_TCP = 6 -IPPROTO_EGP = 8 -IPPROTO_PUP = 12 -IPPROTO_UDP = 17 -IPPROTO_IDP = 22 -IPPROTO_TP = 29 -IPPROTO_EON = 80 -IPPROTO_ENCAP = 98 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -def __IPADDR(x): return ((u_int32_t)(x)) - -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_MAX = 128 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_MAX = 65536 -IN_CLASSC_NSHIFT = 8 -IN_CLASSD_NSHIFT = 28 -def IN_MULTICAST(i): return IN_CLASSD(i) - -IN_LOOPBACKNET = 127 -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_TTL = 10 -IP_MULTICAST_LOOP = 11 -IP_ADD_MEMBERSHIP = 12 -IP_DROP_MEMBERSHIP = 13 -IP_RECVIF = 20 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -IPPROTO_MAXID = (IPPROTO_IDP + 1) -IPCTL_FORWARDING = 1 -IPCTL_SENDREDIRECTS = 2 -IPCTL_DEFTTL = 3 -IPCTL_DEFMTU = 4 -IPCTL_FORWSRCRT = 5 -IPCTL_DIRECTEDBCAST = 6 -IPCTL_ALLOWSRCRT = 7 -IPCTL_MAXID = 8 -def in_nullhost(x): return ((x).s_addr == INADDR_ANY) diff --git a/Lib/plat-netbsd1/regen b/Lib/plat-netbsd1/regen deleted file mode 100755 index 8aa6898..0000000 --- a/Lib/plat-netbsd1/regen +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -v -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/Lib/plat-next3/regen b/Lib/plat-next3/regen deleted file mode 100755 index 7a03613..0000000 --- a/Lib/plat-next3/regen +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh -set -v -INCLUDE="/NextDeveloper/Headers;/NextDeveloper/Headers/ansi;/NextDeveloper/Headers/bsd" -export INCLUDE - -python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/bsd/netinet/in.h diff --git a/Lib/plat-sunos5/CDIO.py b/Lib/plat-sunos5/CDIO.py deleted file mode 100644 index d766b50..0000000 --- a/Lib/plat-sunos5/CDIO.py +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by h2py from /usr/include/sys/cdio.h -CDROM_LBA = 0x01 -CDROM_MSF = 0x02 -CDROM_DATA_TRACK = 0x04 -CDROM_LEADOUT = 0xAA -CDROM_AUDIO_INVALID = 0x00 -CDROM_AUDIO_PLAY = 0x11 -CDROM_AUDIO_PAUSED = 0x12 -CDROM_AUDIO_COMPLETED = 0x13 -CDROM_AUDIO_ERROR = 0x14 -CDROM_AUDIO_NO_STATUS = 0x15 -CDROM_DA_NO_SUBCODE = 0x00 -CDROM_DA_SUBQ = 0x01 -CDROM_DA_ALL_SUBCODE = 0x02 -CDROM_DA_SUBCODE_ONLY = 0x03 -CDROM_XA_DATA = 0x00 -CDROM_XA_SECTOR_DATA = 0x01 -CDROM_XA_DATA_W_ERROR = 0x02 -CDROM_BLK_512 = 512 -CDROM_BLK_1024 = 1024 -CDROM_BLK_2048 = 2048 -CDROM_BLK_2056 = 2056 -CDROM_BLK_2336 = 2336 -CDROM_BLK_2340 = 2340 -CDROM_BLK_2352 = 2352 -CDROM_BLK_2368 = 2368 -CDROM_BLK_2448 = 2448 -CDROM_BLK_2646 = 2646 -CDROM_BLK_2647 = 2647 -CDROM_BLK_SUBCODE = 96 -CDROM_NORMAL_SPEED = 0x00 -CDROM_DOUBLE_SPEED = 0x01 -CDROM_QUAD_SPEED = 0x03 -CDROM_TWELVE_SPEED = 0x0C -CDROM_MAXIMUM_SPEED = 0xff -CDIOC = (0x04 << 8) -CDROMPAUSE = (CDIOC|151) -CDROMRESUME = (CDIOC|152) -CDROMPLAYMSF = (CDIOC|153) -CDROMPLAYTRKIND = (CDIOC|154) -CDROMREADTOCHDR = (CDIOC|155) -CDROMREADTOCENTRY = (CDIOC|156) -CDROMSTOP = (CDIOC|157) -CDROMSTART = (CDIOC|158) -CDROMEJECT = (CDIOC|159) -CDROMVOLCTRL = (CDIOC|160) -CDROMSUBCHNL = (CDIOC|161) -CDROMREADMODE2 = (CDIOC|162) -CDROMREADMODE1 = (CDIOC|163) -CDROMREADOFFSET = (CDIOC|164) -CDROMGBLKMODE = (CDIOC|165) -CDROMSBLKMODE = (CDIOC|166) -CDROMCDDA = (CDIOC|167) -CDROMCDXA = (CDIOC|168) -CDROMSUBCODE = (CDIOC|169) -CDROMGDRVSPEED = (CDIOC|170) -CDROMSDRVSPEED = (CDIOC|171) -SCMD_READ_TOC = 0x43 -SCMD_PLAYAUDIO_MSF = 0x47 -SCMD_PLAYAUDIO_TI = 0x48 -SCMD_PAUSE_RESUME = 0x4B -SCMD_READ_SUBCHANNEL = 0x42 -SCMD_PLAYAUDIO10 = 0x45 -SCMD_PLAYTRACK_REL10 = 0x49 -SCMD_READ_HEADER = 0x44 -SCMD_PLAYAUDIO12 = 0xA5 -SCMD_PLAYTRACK_REL12 = 0xA9 -SCMD_CD_PLAYBACK_CONTROL = 0xC9 -SCMD_CD_PLAYBACK_STATUS = 0xC4 -SCMD_READ_CDDA = 0xD8 -SCMD_READ_CDXA = 0xDB -SCMD_READ_ALL_SUBCODES = 0xDF -CDROM_MODE2_SIZE = 2336 diff --git a/Lib/plat-sunos5/DLFCN.py b/Lib/plat-sunos5/DLFCN.py deleted file mode 100644 index f492350..0000000 --- a/Lib/plat-sunos5/DLFCN.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by h2py from /usr/include/dlfcn.h -from TYPES import * -RTLD_LAZY = 0x00001 -RTLD_NOW = 0x00002 -RTLD_NOLOAD = 0x00004 -RTLD_GLOBAL = 0x00100 -RTLD_LOCAL = 0x00000 -RTLD_PARENT = 0x00200 -RTLD_GROUP = 0x00400 -RTLD_WORLD = 0x00800 -RTLD_NODELETE = 0x01000 -RTLD_CONFGEN = 0x10000 -RTLD_REL_RELATIVE = 0x00001 -RTLD_REL_EXEC = 0x00002 -RTLD_REL_DEPENDS = 0x00004 -RTLD_REL_PRELOAD = 0x00008 -RTLD_REL_SELF = 0x00010 -RTLD_REL_WEAK = 0x00020 -RTLD_REL_ALL = 0x00fff -RTLD_MEMORY = 0x01000 -RTLD_STRIP = 0x02000 -RTLD_NOHEAP = 0x04000 -RTLD_CONFSET = 0x10000 -RTLD_DI_LMID = 1 -RTLD_DI_LINKMAP = 2 -RTLD_DI_CONFIGADDR = 3 -RTLD_DI_MAX = 3 diff --git a/Lib/plat-sunos5/IN.py b/Lib/plat-sunos5/IN.py deleted file mode 100644 index 9572ead..0000000 --- a/Lib/plat-sunos5/IN.py +++ /dev/null @@ -1,1421 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from sys/feature_tests.h - -# Included from sys/isa_defs.h -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 8 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 -_ALIGNMENT_REQUIRED = 1 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 4 -_DOUBLE_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 4 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 4 -_ALIGNMENT_REQUIRED = 0 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_ALIGNMENT_REQUIRED = 1 -_LONG_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 8 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 8 -_LONG_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 -_POSIX_C_SOURCE = 1 -_LARGEFILE64_SOURCE = 1 -_LARGEFILE_SOURCE = 1 -_FILE_OFFSET_BITS = 64 -_FILE_OFFSET_BITS = 32 -_POSIX_C_SOURCE = 199506 -_POSIX_PTHREAD_SEMANTICS = 1 -_XOPEN_VERSION = 500 -_XOPEN_VERSION = 4 -_XOPEN_VERSION = 3 -from TYPES import * - -# Included from sys/stream.h - -# Included from sys/vnode.h -from TYPES import * - -# Included from sys/t_lock.h - -# Included from sys/machlock.h -from TYPES import * -LOCK_HELD_VALUE = 0xff -def SPIN_LOCK(pl): return ((pl) > ipltospl(LOCK_LEVEL)) - -def LOCK_SAMPLE_INTERVAL(i): return (((i) & 0xff) == 0) - -CLOCK_LEVEL = 10 -LOCK_LEVEL = 10 -DISP_LEVEL = (LOCK_LEVEL + 1) -PTR24_LSB = 5 -PTR24_MSB = (PTR24_LSB + 24) -PTR24_ALIGN = 32 -PTR24_BASE = 0xe0000000 - -# Included from sys/param.h -from TYPES import * -_POSIX_VDISABLE = 0 -MAX_INPUT = 512 -MAX_CANON = 256 -UID_NOBODY = 60001 -GID_NOBODY = UID_NOBODY -UID_NOACCESS = 60002 -MAX_TASKID = 999999 -MAX_MAXPID = 999999 -DEFAULT_MAXPID = 999999 -DEFAULT_JUMPPID = 100000 -DEFAULT_MAXPID = 30000 -DEFAULT_JUMPPID = 0 -MAXUID = 2147483647 -MAXPROJID = MAXUID -MAXLINK = 32767 -NMOUNT = 40 -CANBSIZ = 256 -NOFILE = 20 -NGROUPS_UMIN = 0 -NGROUPS_UMAX = 32 -NGROUPS_MAX_DEFAULT = 16 -NZERO = 20 -NULL = 0 -NULL = 0 -CMASK = 0o22 -CDLIMIT = (1<<11) -NBPS = 0x20000 -NBPSCTR = 512 -UBSIZE = 512 -SCTRSHFT = 9 -SYSNAME = 9 -PREMOTE = 39 -MAXPATHLEN = 1024 -MAXSYMLINKS = 20 -MAXNAMELEN = 256 -NADDR = 13 -PIPE_BUF = 5120 -PIPE_MAX = 5120 -NBBY = 8 -MAXBSIZE = 8192 -DEV_BSIZE = 512 -DEV_BSHIFT = 9 -MAXFRAG = 8 -MAXOFF32_T = 0x7fffffff -MAXOFF_T = 0x7fffffffffffffff -MAXOFFSET_T = 0x7fffffffffffffff -MAXOFF_T = 0x7fffffff -MAXOFFSET_T = 0x7fffffff -def btodb(bytes): return \ - -def dbtob(db): return \ - -def lbtodb(bytes): return \ - -def ldbtob(db): return \ - -NCARGS32 = 0x100000 -NCARGS64 = 0x200000 -NCARGS = NCARGS64 -NCARGS = NCARGS32 -FSHIFT = 8 -FSCALE = (1<> MMU_PAGESHIFT) - -def mmu_btopr(x): return ((((x) + MMU_PAGEOFFSET) >> MMU_PAGESHIFT)) - -def mmu_ptod(x): return ((x) << (MMU_PAGESHIFT - DEV_BSHIFT)) - -def ptod(x): return ((x) << (PAGESHIFT - DEV_BSHIFT)) - -def ptob(x): return ((x) << PAGESHIFT) - -def btop(x): return (((x) >> PAGESHIFT)) - -def btopr(x): return ((((x) + PAGEOFFSET) >> PAGESHIFT)) - -def dtop(DD): return (((DD) + NDPP - 1) >> (PAGESHIFT - DEV_BSHIFT)) - -def dtopt(DD): return ((DD) >> (PAGESHIFT - DEV_BSHIFT)) - -_AIO_LISTIO_MAX = (4096) -_AIO_MAX = (-1) -_MQ_OPEN_MAX = (32) -_MQ_PRIO_MAX = (32) -_SEM_NSEMS_MAX = INT_MAX -_SEM_VALUE_MAX = INT_MAX - -# Included from sys/unistd.h -_CS_PATH = 65 -_CS_LFS_CFLAGS = 68 -_CS_LFS_LDFLAGS = 69 -_CS_LFS_LIBS = 70 -_CS_LFS_LINTFLAGS = 71 -_CS_LFS64_CFLAGS = 72 -_CS_LFS64_LDFLAGS = 73 -_CS_LFS64_LIBS = 74 -_CS_LFS64_LINTFLAGS = 75 -_CS_XBS5_ILP32_OFF32_CFLAGS = 700 -_CS_XBS5_ILP32_OFF32_LDFLAGS = 701 -_CS_XBS5_ILP32_OFF32_LIBS = 702 -_CS_XBS5_ILP32_OFF32_LINTFLAGS = 703 -_CS_XBS5_ILP32_OFFBIG_CFLAGS = 705 -_CS_XBS5_ILP32_OFFBIG_LDFLAGS = 706 -_CS_XBS5_ILP32_OFFBIG_LIBS = 707 -_CS_XBS5_ILP32_OFFBIG_LINTFLAGS = 708 -_CS_XBS5_LP64_OFF64_CFLAGS = 709 -_CS_XBS5_LP64_OFF64_LDFLAGS = 710 -_CS_XBS5_LP64_OFF64_LIBS = 711 -_CS_XBS5_LP64_OFF64_LINTFLAGS = 712 -_CS_XBS5_LPBIG_OFFBIG_CFLAGS = 713 -_CS_XBS5_LPBIG_OFFBIG_LDFLAGS = 714 -_CS_XBS5_LPBIG_OFFBIG_LIBS = 715 -_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS = 716 -_SC_ARG_MAX = 1 -_SC_CHILD_MAX = 2 -_SC_CLK_TCK = 3 -_SC_NGROUPS_MAX = 4 -_SC_OPEN_MAX = 5 -_SC_JOB_CONTROL = 6 -_SC_SAVED_IDS = 7 -_SC_VERSION = 8 -_SC_PASS_MAX = 9 -_SC_LOGNAME_MAX = 10 -_SC_PAGESIZE = 11 -_SC_XOPEN_VERSION = 12 -_SC_NPROCESSORS_CONF = 14 -_SC_NPROCESSORS_ONLN = 15 -_SC_STREAM_MAX = 16 -_SC_TZNAME_MAX = 17 -_SC_AIO_LISTIO_MAX = 18 -_SC_AIO_MAX = 19 -_SC_AIO_PRIO_DELTA_MAX = 20 -_SC_ASYNCHRONOUS_IO = 21 -_SC_DELAYTIMER_MAX = 22 -_SC_FSYNC = 23 -_SC_MAPPED_FILES = 24 -_SC_MEMLOCK = 25 -_SC_MEMLOCK_RANGE = 26 -_SC_MEMORY_PROTECTION = 27 -_SC_MESSAGE_PASSING = 28 -_SC_MQ_OPEN_MAX = 29 -_SC_MQ_PRIO_MAX = 30 -_SC_PRIORITIZED_IO = 31 -_SC_PRIORITY_SCHEDULING = 32 -_SC_REALTIME_SIGNALS = 33 -_SC_RTSIG_MAX = 34 -_SC_SEMAPHORES = 35 -_SC_SEM_NSEMS_MAX = 36 -_SC_SEM_VALUE_MAX = 37 -_SC_SHARED_MEMORY_OBJECTS = 38 -_SC_SIGQUEUE_MAX = 39 -_SC_SIGRT_MIN = 40 -_SC_SIGRT_MAX = 41 -_SC_SYNCHRONIZED_IO = 42 -_SC_TIMERS = 43 -_SC_TIMER_MAX = 44 -_SC_2_C_BIND = 45 -_SC_2_C_DEV = 46 -_SC_2_C_VERSION = 47 -_SC_2_FORT_DEV = 48 -_SC_2_FORT_RUN = 49 -_SC_2_LOCALEDEF = 50 -_SC_2_SW_DEV = 51 -_SC_2_UPE = 52 -_SC_2_VERSION = 53 -_SC_BC_BASE_MAX = 54 -_SC_BC_DIM_MAX = 55 -_SC_BC_SCALE_MAX = 56 -_SC_BC_STRING_MAX = 57 -_SC_COLL_WEIGHTS_MAX = 58 -_SC_EXPR_NEST_MAX = 59 -_SC_LINE_MAX = 60 -_SC_RE_DUP_MAX = 61 -_SC_XOPEN_CRYPT = 62 -_SC_XOPEN_ENH_I18N = 63 -_SC_XOPEN_SHM = 64 -_SC_2_CHAR_TERM = 66 -_SC_XOPEN_XCU_VERSION = 67 -_SC_ATEXIT_MAX = 76 -_SC_IOV_MAX = 77 -_SC_XOPEN_UNIX = 78 -_SC_PAGE_SIZE = _SC_PAGESIZE -_SC_T_IOV_MAX = 79 -_SC_PHYS_PAGES = 500 -_SC_AVPHYS_PAGES = 501 -_SC_COHER_BLKSZ = 503 -_SC_SPLIT_CACHE = 504 -_SC_ICACHE_SZ = 505 -_SC_DCACHE_SZ = 506 -_SC_ICACHE_LINESZ = 507 -_SC_DCACHE_LINESZ = 508 -_SC_ICACHE_BLKSZ = 509 -_SC_DCACHE_BLKSZ = 510 -_SC_DCACHE_TBLKSZ = 511 -_SC_ICACHE_ASSOC = 512 -_SC_DCACHE_ASSOC = 513 -_SC_MAXPID = 514 -_SC_STACK_PROT = 515 -_SC_THREAD_DESTRUCTOR_ITERATIONS = 568 -_SC_GETGR_R_SIZE_MAX = 569 -_SC_GETPW_R_SIZE_MAX = 570 -_SC_LOGIN_NAME_MAX = 571 -_SC_THREAD_KEYS_MAX = 572 -_SC_THREAD_STACK_MIN = 573 -_SC_THREAD_THREADS_MAX = 574 -_SC_TTY_NAME_MAX = 575 -_SC_THREADS = 576 -_SC_THREAD_ATTR_STACKADDR = 577 -_SC_THREAD_ATTR_STACKSIZE = 578 -_SC_THREAD_PRIORITY_SCHEDULING = 579 -_SC_THREAD_PRIO_INHERIT = 580 -_SC_THREAD_PRIO_PROTECT = 581 -_SC_THREAD_PROCESS_SHARED = 582 -_SC_THREAD_SAFE_FUNCTIONS = 583 -_SC_XOPEN_LEGACY = 717 -_SC_XOPEN_REALTIME = 718 -_SC_XOPEN_REALTIME_THREADS = 719 -_SC_XBS5_ILP32_OFF32 = 720 -_SC_XBS5_ILP32_OFFBIG = 721 -_SC_XBS5_LP64_OFF64 = 722 -_SC_XBS5_LPBIG_OFFBIG = 723 -_PC_LINK_MAX = 1 -_PC_MAX_CANON = 2 -_PC_MAX_INPUT = 3 -_PC_NAME_MAX = 4 -_PC_PATH_MAX = 5 -_PC_PIPE_BUF = 6 -_PC_NO_TRUNC = 7 -_PC_VDISABLE = 8 -_PC_CHOWN_RESTRICTED = 9 -_PC_ASYNC_IO = 10 -_PC_PRIO_IO = 11 -_PC_SYNC_IO = 12 -_PC_FILESIZEBITS = 67 -_PC_LAST = 67 -_POSIX_VERSION = 199506 -_POSIX2_VERSION = 199209 -_POSIX2_C_VERSION = 199209 -_XOPEN_XCU_VERSION = 4 -_XOPEN_REALTIME = 1 -_XOPEN_ENH_I18N = 1 -_XOPEN_SHM = 1 -_POSIX2_C_BIND = 1 -_POSIX2_CHAR_TERM = 1 -_POSIX2_LOCALEDEF = 1 -_POSIX2_C_DEV = 1 -_POSIX2_SW_DEV = 1 -_POSIX2_UPE = 1 - -# Included from sys/mutex.h -from TYPES import * -def MUTEX_HELD(x): return (mutex_owned(x)) - - -# Included from sys/rwlock.h -from TYPES import * -def RW_READ_HELD(x): return (rw_read_held((x))) - -def RW_WRITE_HELD(x): return (rw_write_held((x))) - -def RW_LOCK_HELD(x): return (rw_lock_held((x))) - -def RW_ISWRITER(x): return (rw_iswriter(x)) - - -# Included from sys/semaphore.h - -# Included from sys/thread.h -from TYPES import * - -# Included from sys/klwp.h -from TYPES import * - -# Included from sys/condvar.h -from TYPES import * - -# Included from sys/time.h - -# Included from sys/types32.h - -# Included from sys/int_types.h -TIME32_MAX = INT32_MAX -TIME32_MIN = INT32_MIN -def TIMEVAL_OVERFLOW(tv): return \ - -from TYPES import * -DST_NONE = 0 -DST_USA = 1 -DST_AUST = 2 -DST_WET = 3 -DST_MET = 4 -DST_EET = 5 -DST_CAN = 6 -DST_GB = 7 -DST_RUM = 8 -DST_TUR = 9 -DST_AUSTALT = 10 -ITIMER_REAL = 0 -ITIMER_VIRTUAL = 1 -ITIMER_PROF = 2 -ITIMER_REALPROF = 3 -def ITIMERVAL_OVERFLOW(itv): return \ - -SEC = 1 -MILLISEC = 1000 -MICROSEC = 1000000 -NANOSEC = 1000000000 - -# Included from sys/time_impl.h -def TIMESPEC_OVERFLOW(ts): return \ - -def ITIMERSPEC_OVERFLOW(it): return \ - -__CLOCK_REALTIME0 = 0 -CLOCK_VIRTUAL = 1 -CLOCK_PROF = 2 -__CLOCK_REALTIME3 = 3 -CLOCK_HIGHRES = 4 -CLOCK_MAX = 5 -CLOCK_REALTIME = __CLOCK_REALTIME3 -CLOCK_REALTIME = __CLOCK_REALTIME0 -TIMER_RELTIME = 0x0 -TIMER_ABSTIME = 0x1 -def TICK_TO_SEC(tick): return ((tick) / hz) - -def SEC_TO_TICK(sec): return ((sec) * hz) - -def TICK_TO_MSEC(tick): return \ - -def MSEC_TO_TICK(msec): return \ - -def MSEC_TO_TICK_ROUNDUP(msec): return \ - -def TICK_TO_USEC(tick): return ((tick) * usec_per_tick) - -def USEC_TO_TICK(usec): return ((usec) / usec_per_tick) - -def USEC_TO_TICK_ROUNDUP(usec): return \ - -def TICK_TO_NSEC(tick): return ((tick) * nsec_per_tick) - -def NSEC_TO_TICK(nsec): return ((nsec) / nsec_per_tick) - -def NSEC_TO_TICK_ROUNDUP(nsec): return \ - -def TIMEVAL_TO_TICK(tvp): return \ - -def TIMESTRUC_TO_TICK(tsp): return \ - - -# Included from time.h -from TYPES import * - -# Included from iso/time_iso.h -NULL = 0 -NULL = 0 -CLOCKS_PER_SEC = 1000000 - -# Included from sys/select.h -FD_SETSIZE = 65536 -FD_SETSIZE = 1024 -_NBBY = 8 -NBBY = _NBBY -def FD_ZERO(p): return bzero((p), sizeof (*(p))) - - -# Included from sys/signal.h - -# Included from sys/iso/signal_iso.h -SIGHUP = 1 -SIGINT = 2 -SIGQUIT = 3 -SIGILL = 4 -SIGTRAP = 5 -SIGIOT = 6 -SIGABRT = 6 -SIGEMT = 7 -SIGFPE = 8 -SIGKILL = 9 -SIGBUS = 10 -SIGSEGV = 11 -SIGSYS = 12 -SIGPIPE = 13 -SIGALRM = 14 -SIGTERM = 15 -SIGUSR1 = 16 -SIGUSR2 = 17 -SIGCLD = 18 -SIGCHLD = 18 -SIGPWR = 19 -SIGWINCH = 20 -SIGURG = 21 -SIGPOLL = 22 -SIGIO = SIGPOLL -SIGSTOP = 23 -SIGTSTP = 24 -SIGCONT = 25 -SIGTTIN = 26 -SIGTTOU = 27 -SIGVTALRM = 28 -SIGPROF = 29 -SIGXCPU = 30 -SIGXFSZ = 31 -SIGWAITING = 32 -SIGLWP = 33 -SIGFREEZE = 34 -SIGTHAW = 35 -SIGCANCEL = 36 -SIGLOST = 37 -_SIGRTMIN = 38 -_SIGRTMAX = 45 -SIG_BLOCK = 1 -SIG_UNBLOCK = 2 -SIG_SETMASK = 3 -SIGNO_MASK = 0xFF -SIGDEFER = 0x100 -SIGHOLD = 0x200 -SIGRELSE = 0x400 -SIGIGNORE = 0x800 -SIGPAUSE = 0x1000 - -# Included from sys/siginfo.h -from TYPES import * -SIGEV_NONE = 1 -SIGEV_SIGNAL = 2 -SIGEV_THREAD = 3 -SI_NOINFO = 32767 -SI_USER = 0 -SI_LWP = (-1) -SI_QUEUE = (-2) -SI_TIMER = (-3) -SI_ASYNCIO = (-4) -SI_MESGQ = (-5) - -# Included from sys/machsig.h -ILL_ILLOPC = 1 -ILL_ILLOPN = 2 -ILL_ILLADR = 3 -ILL_ILLTRP = 4 -ILL_PRVOPC = 5 -ILL_PRVREG = 6 -ILL_COPROC = 7 -ILL_BADSTK = 8 -NSIGILL = 8 -EMT_TAGOVF = 1 -EMT_CPCOVF = 2 -NSIGEMT = 2 -FPE_INTDIV = 1 -FPE_INTOVF = 2 -FPE_FLTDIV = 3 -FPE_FLTOVF = 4 -FPE_FLTUND = 5 -FPE_FLTRES = 6 -FPE_FLTINV = 7 -FPE_FLTSUB = 8 -NSIGFPE = 8 -SEGV_MAPERR = 1 -SEGV_ACCERR = 2 -NSIGSEGV = 2 -BUS_ADRALN = 1 -BUS_ADRERR = 2 -BUS_OBJERR = 3 -NSIGBUS = 3 -TRAP_BRKPT = 1 -TRAP_TRACE = 2 -TRAP_RWATCH = 3 -TRAP_WWATCH = 4 -TRAP_XWATCH = 5 -NSIGTRAP = 5 -CLD_EXITED = 1 -CLD_KILLED = 2 -CLD_DUMPED = 3 -CLD_TRAPPED = 4 -CLD_STOPPED = 5 -CLD_CONTINUED = 6 -NSIGCLD = 6 -POLL_IN = 1 -POLL_OUT = 2 -POLL_MSG = 3 -POLL_ERR = 4 -POLL_PRI = 5 -POLL_HUP = 6 -NSIGPOLL = 6 -PROF_SIG = 1 -NSIGPROF = 1 -SI_MAXSZ = 256 -SI_MAXSZ = 128 - -# Included from sys/time_std_impl.h -from TYPES import * -SI32_MAXSZ = 128 -def SI_CANQUEUE(c): return ((c) <= SI_QUEUE) - -SA_NOCLDSTOP = 0x00020000 -SA_ONSTACK = 0x00000001 -SA_RESETHAND = 0x00000002 -SA_RESTART = 0x00000004 -SA_SIGINFO = 0x00000008 -SA_NODEFER = 0x00000010 -SA_NOCLDWAIT = 0x00010000 -SA_WAITSIG = 0x00010000 -NSIG = 46 -MAXSIG = 45 -S_SIGNAL = 1 -S_SIGSET = 2 -S_SIGACTION = 3 -S_NONE = 4 -MINSIGSTKSZ = 2048 -SIGSTKSZ = 8192 -SS_ONSTACK = 0x00000001 -SS_DISABLE = 0x00000002 -SN_PROC = 1 -SN_CANCEL = 2 -SN_SEND = 3 - -# Included from sys/ucontext.h -from TYPES import * - -# Included from sys/regset.h -REG_CCR = (0) -REG_PSR = (0) -REG_PSR = (0) -REG_PC = (1) -REG_nPC = (2) -REG_Y = (3) -REG_G1 = (4) -REG_G2 = (5) -REG_G3 = (6) -REG_G4 = (7) -REG_G5 = (8) -REG_G6 = (9) -REG_G7 = (10) -REG_O0 = (11) -REG_O1 = (12) -REG_O2 = (13) -REG_O3 = (14) -REG_O4 = (15) -REG_O5 = (16) -REG_O6 = (17) -REG_O7 = (18) -REG_ASI = (19) -REG_FPRS = (20) -REG_PS = REG_PSR -REG_SP = REG_O6 -REG_R0 = REG_O0 -REG_R1 = REG_O1 -_NGREG = 21 -_NGREG = 19 -NGREG = _NGREG -_NGREG32 = 19 -_NGREG64 = 21 -SPARC_MAXREGWINDOW = 31 -MAXFPQ = 16 -XRS_ID = 0x78727300 - -# Included from v7/sys/privregs.h - -# Included from v7/sys/psr.h -PSR_CWP = 0x0000001F -PSR_ET = 0x00000020 -PSR_PS = 0x00000040 -PSR_S = 0x00000080 -PSR_PIL = 0x00000F00 -PSR_EF = 0x00001000 -PSR_EC = 0x00002000 -PSR_RSV = 0x000FC000 -PSR_ICC = 0x00F00000 -PSR_C = 0x00100000 -PSR_V = 0x00200000 -PSR_Z = 0x00400000 -PSR_N = 0x00800000 -PSR_VER = 0x0F000000 -PSR_IMPL = 0xF0000000 -PSL_ALLCC = PSR_ICC -PSL_USER = (PSR_S) -PSL_USERMASK = (PSR_ICC) -PSL_UBITS = (PSR_ICC|PSR_EF) -def USERMODE(ps): return (((ps) & PSR_PS) == 0) - - -# Included from sys/fsr.h -FSR_CEXC = 0x0000001f -FSR_AEXC = 0x000003e0 -FSR_FCC = 0x00000c00 -FSR_PR = 0x00001000 -FSR_QNE = 0x00002000 -FSR_FTT = 0x0001c000 -FSR_VER = 0x000e0000 -FSR_TEM = 0x0f800000 -FSR_RP = 0x30000000 -FSR_RD = 0xc0000000 -FSR_VER_SHIFT = 17 -FSR_FCC1 = 0x00000003 -FSR_FCC2 = 0x0000000C -FSR_FCC3 = 0x00000030 -FSR_CEXC_NX = 0x00000001 -FSR_CEXC_DZ = 0x00000002 -FSR_CEXC_UF = 0x00000004 -FSR_CEXC_OF = 0x00000008 -FSR_CEXC_NV = 0x00000010 -FSR_AEXC_NX = (0x1 << 5) -FSR_AEXC_DZ = (0x2 << 5) -FSR_AEXC_UF = (0x4 << 5) -FSR_AEXC_OF = (0x8 << 5) -FSR_AEXC_NV = (0x10 << 5) -FTT_NONE = 0 -FTT_IEEE = 1 -FTT_UNFIN = 2 -FTT_UNIMP = 3 -FTT_SEQ = 4 -FTT_ALIGN = 5 -FTT_DFAULT = 6 -FSR_FTT_SHIFT = 14 -FSR_FTT_IEEE = (FTT_IEEE << FSR_FTT_SHIFT) -FSR_FTT_UNFIN = (FTT_UNFIN << FSR_FTT_SHIFT) -FSR_FTT_UNIMP = (FTT_UNIMP << FSR_FTT_SHIFT) -FSR_FTT_SEQ = (FTT_SEQ << FSR_FTT_SHIFT) -FSR_FTT_ALIGN = (FTT_ALIGN << FSR_FTT_SHIFT) -FSR_FTT_DFAULT = (FTT_DFAULT << FSR_FTT_SHIFT) -FSR_TEM_NX = (0x1 << 23) -FSR_TEM_DZ = (0x2 << 23) -FSR_TEM_UF = (0x4 << 23) -FSR_TEM_OF = (0x8 << 23) -FSR_TEM_NV = (0x10 << 23) -RP_DBLEXT = 0 -RP_SINGLE = 1 -RP_DOUBLE = 2 -RP_RESERVED = 3 -RD_NEAR = 0 -RD_ZER0 = 1 -RD_POSINF = 2 -RD_NEGINF = 3 -FPRS_DL = 0x1 -FPRS_DU = 0x2 -FPRS_FEF = 0x4 -PIL_MAX = 0xf -def SAVE_GLOBALS(RP): return \ - -def RESTORE_GLOBALS(RP): return \ - -def SAVE_OUTS(RP): return \ - -def RESTORE_OUTS(RP): return \ - -def SAVE_WINDOW(SBP): return \ - -def RESTORE_WINDOW(SBP): return \ - -def STORE_FPREGS(FP): return \ - -def LOAD_FPREGS(FP): return \ - -_SPARC_MAXREGWINDOW = 31 -_XRS_ID = 0x78727300 -GETCONTEXT = 0 -SETCONTEXT = 1 -UC_SIGMASK = 0o01 -UC_STACK = 0o02 -UC_CPU = 0o04 -UC_MAU = 0o10 -UC_FPU = UC_MAU -UC_INTR = 0o20 -UC_ASR = 0o40 -UC_MCONTEXT = (UC_CPU|UC_FPU|UC_ASR) -UC_ALL = (UC_SIGMASK|UC_STACK|UC_MCONTEXT) -_SIGQUEUE_MAX = 32 -_SIGNOTIFY_MAX = 32 - -# Included from sys/pcb.h -INSTR_VALID = 0x02 -NORMAL_STEP = 0x04 -WATCH_STEP = 0x08 -CPC_OVERFLOW = 0x10 -ASYNC_HWERR = 0x20 -STEP_NONE = 0 -STEP_REQUESTED = 1 -STEP_ACTIVE = 2 -STEP_WASACTIVE = 3 - -# Included from sys/msacct.h -LMS_USER = 0 -LMS_SYSTEM = 1 -LMS_TRAP = 2 -LMS_TFAULT = 3 -LMS_DFAULT = 4 -LMS_KFAULT = 5 -LMS_USER_LOCK = 6 -LMS_SLEEP = 7 -LMS_WAIT_CPU = 8 -LMS_STOPPED = 9 -NMSTATES = 10 - -# Included from sys/lwp.h - -# Included from sys/synch.h -from TYPES import * -USYNC_THREAD = 0x00 -USYNC_PROCESS = 0x01 -LOCK_NORMAL = 0x00 -LOCK_ERRORCHECK = 0x02 -LOCK_RECURSIVE = 0x04 -USYNC_PROCESS_ROBUST = 0x08 -LOCK_PRIO_NONE = 0x00 -LOCK_PRIO_INHERIT = 0x10 -LOCK_PRIO_PROTECT = 0x20 -LOCK_STALL_NP = 0x00 -LOCK_ROBUST_NP = 0x40 -LOCK_OWNERDEAD = 0x1 -LOCK_NOTRECOVERABLE = 0x2 -LOCK_INITED = 0x4 -LOCK_UNMAPPED = 0x8 -LWP_DETACHED = 0x00000040 -LWP_SUSPENDED = 0x00000080 -__LWP_ASLWP = 0x00000100 -MAXSYSARGS = 8 -NORMALRETURN = 0 -JUSTRETURN = 1 -LWP_USER = 0x01 -LWP_SYS = 0x02 -TS_FREE = 0x00 -TS_SLEEP = 0x01 -TS_RUN = 0x02 -TS_ONPROC = 0x04 -TS_ZOMB = 0x08 -TS_STOPPED = 0x10 -T_INTR_THREAD = 0x0001 -T_WAKEABLE = 0x0002 -T_TOMASK = 0x0004 -T_TALLOCSTK = 0x0008 -T_WOULDBLOCK = 0x0020 -T_DONTBLOCK = 0x0040 -T_DONTPEND = 0x0080 -T_SYS_PROF = 0x0100 -T_WAITCVSEM = 0x0200 -T_WATCHPT = 0x0400 -T_PANIC = 0x0800 -TP_HOLDLWP = 0x0002 -TP_TWAIT = 0x0004 -TP_LWPEXIT = 0x0008 -TP_PRSTOP = 0x0010 -TP_CHKPT = 0x0020 -TP_EXITLWP = 0x0040 -TP_PRVSTOP = 0x0080 -TP_MSACCT = 0x0100 -TP_STOPPING = 0x0200 -TP_WATCHPT = 0x0400 -TP_PAUSE = 0x0800 -TP_CHANGEBIND = 0x1000 -TS_LOAD = 0x0001 -TS_DONT_SWAP = 0x0002 -TS_SWAPENQ = 0x0004 -TS_ON_SWAPQ = 0x0008 -TS_CSTART = 0x0100 -TS_UNPAUSE = 0x0200 -TS_XSTART = 0x0400 -TS_PSTART = 0x0800 -TS_RESUME = 0x1000 -TS_CREATE = 0x2000 -TS_ALLSTART = \ - (TS_CSTART|TS_UNPAUSE|TS_XSTART|TS_PSTART|TS_RESUME|TS_CREATE) -def CPR_VSTOPPED(t): return \ - -def THREAD_TRANSITION(tp): return thread_transition(tp); - -def THREAD_STOP(tp): return \ - -def THREAD_ZOMB(tp): return THREAD_SET_STATE(tp, TS_ZOMB, NULL) - -def SEMA_HELD(x): return (sema_held((x))) - -NO_LOCKS_HELD = 1 -NO_COMPETING_THREADS = 1 - -# Included from sys/cred.h - -# Included from sys/uio.h -from TYPES import * - -# Included from sys/resource.h -from TYPES import * -PRIO_PROCESS = 0 -PRIO_PGRP = 1 -PRIO_USER = 2 -RLIMIT_CPU = 0 -RLIMIT_FSIZE = 1 -RLIMIT_DATA = 2 -RLIMIT_STACK = 3 -RLIMIT_CORE = 4 -RLIMIT_NOFILE = 5 -RLIMIT_VMEM = 6 -RLIMIT_AS = RLIMIT_VMEM -RLIM_NLIMITS = 7 -RLIM_INFINITY = (-3) -RLIM_SAVED_MAX = (-2) -RLIM_SAVED_CUR = (-1) -RLIM_INFINITY = 0x7fffffff -RLIM_SAVED_MAX = 0x7ffffffe -RLIM_SAVED_CUR = 0x7ffffffd -RLIM32_INFINITY = 0x7fffffff -RLIM32_SAVED_MAX = 0x7ffffffe -RLIM32_SAVED_CUR = 0x7ffffffd - -# Included from sys/model.h - -# Included from sys/debug.h -def ASSERT64(x): return ASSERT(x) - -def ASSERT32(x): return ASSERT(x) - -DATAMODEL_MASK = 0x0FF00000 -DATAMODEL_ILP32 = 0x00100000 -DATAMODEL_LP64 = 0x00200000 -DATAMODEL_NONE = 0 -DATAMODEL_NATIVE = DATAMODEL_LP64 -DATAMODEL_NATIVE = DATAMODEL_ILP32 -def STRUCT_SIZE(handle): return \ - -def STRUCT_BUF(handle): return ((handle).ptr.m64) - -def SIZEOF_PTR(umodel): return \ - -def STRUCT_SIZE(handle): return (sizeof (*(handle).ptr)) - -def STRUCT_BUF(handle): return ((handle).ptr) - -def SIZEOF_PTR(umodel): return sizeof (caddr_t) - -def lwp_getdatamodel(t): return DATAMODEL_ILP32 - -RUSAGE_SELF = 0 -RUSAGE_CHILDREN = -1 - -# Included from vm/seg_enum.h - -# Included from sys/buf.h - -# Included from sys/kstat.h -from TYPES import * -KSTAT_STRLEN = 31 -def KSTAT_ENTER(k): return \ - -def KSTAT_EXIT(k): return \ - -KSTAT_TYPE_RAW = 0 -KSTAT_TYPE_NAMED = 1 -KSTAT_TYPE_INTR = 2 -KSTAT_TYPE_IO = 3 -KSTAT_TYPE_TIMER = 4 -KSTAT_NUM_TYPES = 5 -KSTAT_FLAG_VIRTUAL = 0x01 -KSTAT_FLAG_VAR_SIZE = 0x02 -KSTAT_FLAG_WRITABLE = 0x04 -KSTAT_FLAG_PERSISTENT = 0x08 -KSTAT_FLAG_DORMANT = 0x10 -KSTAT_FLAG_INVALID = 0x20 -KSTAT_READ = 0 -KSTAT_WRITE = 1 -KSTAT_DATA_CHAR = 0 -KSTAT_DATA_INT32 = 1 -KSTAT_DATA_UINT32 = 2 -KSTAT_DATA_INT64 = 3 -KSTAT_DATA_UINT64 = 4 -KSTAT_DATA_LONG = KSTAT_DATA_INT32 -KSTAT_DATA_ULONG = KSTAT_DATA_UINT32 -KSTAT_DATA_LONG = KSTAT_DATA_INT64 -KSTAT_DATA_ULONG = KSTAT_DATA_UINT64 -KSTAT_DATA_LONG = 7 -KSTAT_DATA_ULONG = 8 -KSTAT_DATA_LONGLONG = KSTAT_DATA_INT64 -KSTAT_DATA_ULONGLONG = KSTAT_DATA_UINT64 -KSTAT_DATA_FLOAT = 5 -KSTAT_DATA_DOUBLE = 6 -KSTAT_INTR_HARD = 0 -KSTAT_INTR_SOFT = 1 -KSTAT_INTR_WATCHDOG = 2 -KSTAT_INTR_SPURIOUS = 3 -KSTAT_INTR_MULTSVC = 4 -KSTAT_NUM_INTRS = 5 -B_BUSY = 0x0001 -B_DONE = 0x0002 -B_ERROR = 0x0004 -B_PAGEIO = 0x0010 -B_PHYS = 0x0020 -B_READ = 0x0040 -B_WRITE = 0x0100 -B_KERNBUF = 0x0008 -B_WANTED = 0x0080 -B_AGE = 0x000200 -B_ASYNC = 0x000400 -B_DELWRI = 0x000800 -B_STALE = 0x001000 -B_DONTNEED = 0x002000 -B_REMAPPED = 0x004000 -B_FREE = 0x008000 -B_INVAL = 0x010000 -B_FORCE = 0x020000 -B_HEAD = 0x040000 -B_NOCACHE = 0x080000 -B_TRUNC = 0x100000 -B_SHADOW = 0x200000 -B_RETRYWRI = 0x400000 -def notavail(bp): return \ - -def BWRITE(bp): return \ - -def BWRITE2(bp): return \ - -VROOT = 0x01 -VNOCACHE = 0x02 -VNOMAP = 0x04 -VDUP = 0x08 -VNOSWAP = 0x10 -VNOMOUNT = 0x20 -VISSWAP = 0x40 -VSWAPLIKE = 0x80 -VVFSLOCK = 0x100 -VVFSWAIT = 0x200 -VVMLOCK = 0x400 -VDIROPEN = 0x800 -VVMEXEC = 0x1000 -VPXFS = 0x2000 -AT_TYPE = 0x0001 -AT_MODE = 0x0002 -AT_UID = 0x0004 -AT_GID = 0x0008 -AT_FSID = 0x0010 -AT_NODEID = 0x0020 -AT_NLINK = 0x0040 -AT_SIZE = 0x0080 -AT_ATIME = 0x0100 -AT_MTIME = 0x0200 -AT_CTIME = 0x0400 -AT_RDEV = 0x0800 -AT_BLKSIZE = 0x1000 -AT_NBLOCKS = 0x2000 -AT_VCODE = 0x4000 -AT_ALL = (AT_TYPE|AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\ - AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|\ - AT_RDEV|AT_BLKSIZE|AT_NBLOCKS|AT_VCODE) -AT_STAT = (AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\ - AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV) -AT_TIMES = (AT_ATIME|AT_MTIME|AT_CTIME) -AT_NOSET = (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\ - AT_BLKSIZE|AT_NBLOCKS|AT_VCODE) -VSUID = 0o4000 -VSGID = 0o2000 -VSVTX = 0o1000 -VREAD = 0o0400 -VWRITE = 0o0200 -VEXEC = 0o0100 -MODEMASK = 0o7777 -PERMMASK = 0o0777 -def MANDMODE(mode): return (((mode) & (VSGID|(VEXEC>>3))) == VSGID) - -VSA_ACL = 0x0001 -VSA_ACLCNT = 0x0002 -VSA_DFACL = 0x0004 -VSA_DFACLCNT = 0x0008 -LOOKUP_DIR = 0x01 -DUMP_ALLOC = 0 -DUMP_FREE = 1 -DUMP_SCAN = 2 -ATTR_UTIME = 0x01 -ATTR_EXEC = 0x02 -ATTR_COMM = 0x04 -ATTR_HINT = 0x08 -ATTR_REAL = 0x10 - -# Included from sys/poll.h -POLLIN = 0x0001 -POLLPRI = 0x0002 -POLLOUT = 0x0004 -POLLRDNORM = 0x0040 -POLLWRNORM = POLLOUT -POLLRDBAND = 0x0080 -POLLWRBAND = 0x0100 -POLLNORM = POLLRDNORM -POLLERR = 0x0008 -POLLHUP = 0x0010 -POLLNVAL = 0x0020 -POLLREMOVE = 0x0800 -POLLRDDATA = 0x0200 -POLLNOERR = 0x0400 -POLLCLOSED = 0x8000 - -# Included from sys/strmdep.h -def str_aligned(X): return (((ulong_t)(X) & (sizeof (int) - 1)) == 0) - - -# Included from sys/strft.h -tdelta_t_sz = 12 -FTEV_MASK = 0x1FFF -FTEV_ISWR = 0x8000 -FTEV_CS = 0x4000 -FTEV_PS = 0x2000 -FTEV_QMASK = 0x1F00 -FTEV_ALLOCMASK = 0x1FF8 -FTEV_ALLOCB = 0x0000 -FTEV_ESBALLOC = 0x0001 -FTEV_DESBALLOC = 0x0002 -FTEV_ESBALLOCA = 0x0003 -FTEV_DESBALLOCA = 0x0004 -FTEV_ALLOCBIG = 0x0005 -FTEV_ALLOCBW = 0x0006 -FTEV_FREEB = 0x0008 -FTEV_DUPB = 0x0009 -FTEV_COPYB = 0x000A -FTEV_CALLER = 0x000F -FTEV_PUT = 0x0100 -FTEV_FSYNCQ = 0x0103 -FTEV_DSYNCQ = 0x0104 -FTEV_PUTQ = 0x0105 -FTEV_GETQ = 0x0106 -FTEV_RMVQ = 0x0107 -FTEV_INSQ = 0x0108 -FTEV_PUTBQ = 0x0109 -FTEV_FLUSHQ = 0x010A -FTEV_REPLYQ = 0x010B -FTEV_PUTNEXT = 0x010D -FTEV_RWNEXT = 0x010E -FTEV_QWINNER = 0x010F -FTEV_GEWRITE = 0x0101 -def FTFLW_HASH(h): return (((unsigned)(h))%ftflw_hash_sz) - -FTBLK_EVNTS = 0x9 -QENAB = 0x00000001 -QWANTR = 0x00000002 -QWANTW = 0x00000004 -QFULL = 0x00000008 -QREADR = 0x00000010 -QUSE = 0x00000020 -QNOENB = 0x00000040 -QBACK = 0x00000100 -QHLIST = 0x00000200 -QPAIR = 0x00000800 -QPERQ = 0x00001000 -QPERMOD = 0x00002000 -QMTSAFE = 0x00004000 -QMTOUTPERIM = 0x00008000 -QMT_TYPEMASK = (QPAIR|QPERQ|QPERMOD|QMTSAFE|QMTOUTPERIM) -QINSERVICE = 0x00010000 -QWCLOSE = 0x00020000 -QEND = 0x00040000 -QWANTWSYNC = 0x00080000 -QSYNCSTR = 0x00100000 -QISDRV = 0x00200000 -QHOT = 0x00400000 -QNEXTHOT = 0x00800000 -_QINSERTING = 0x04000000 -_QREMOVING = 0x08000000 -Q_SQQUEUED = 0x01 -Q_SQDRAINING = 0x02 -QB_FULL = 0x01 -QB_WANTW = 0x02 -QB_BACK = 0x04 -NBAND = 256 -STRUIOT_NONE = -1 -STRUIOT_DONTCARE = 0 -STRUIOT_STANDARD = 1 -STRUIOT_IP = 2 -DBLK_REFMIN = 0x01 -STRUIO_SPEC = 0x01 -STRUIO_DONE = 0x02 -STRUIO_IP = 0x04 -STRUIO_ZC = 0x08 -STRUIO_ICK = 0x10 -MSGMARK = 0x01 -MSGNOLOOP = 0x02 -MSGDELIM = 0x04 -MSGNOGET = 0x08 -MSGMARKNEXT = 0x10 -MSGNOTMARKNEXT = 0x20 -M_DATA = 0x00 -M_PROTO = 0x01 -M_BREAK = 0x08 -M_PASSFP = 0x09 -M_EVENT = 0x0a -M_SIG = 0x0b -M_DELAY = 0x0c -M_CTL = 0x0d -M_IOCTL = 0x0e -M_SETOPTS = 0x10 -M_RSE = 0x11 -M_IOCACK = 0x81 -M_IOCNAK = 0x82 -M_PCPROTO = 0x83 -M_PCSIG = 0x84 -M_READ = 0x85 -M_FLUSH = 0x86 -M_STOP = 0x87 -M_START = 0x88 -M_HANGUP = 0x89 -M_ERROR = 0x8a -M_COPYIN = 0x8b -M_COPYOUT = 0x8c -M_IOCDATA = 0x8d -M_PCRSE = 0x8e -M_STOPI = 0x8f -M_STARTI = 0x90 -M_PCEVENT = 0x91 -M_UNHANGUP = 0x92 -QNORM = 0x00 -QPCTL = 0x80 -IOC_MODELS = DATAMODEL_MASK -IOC_ILP32 = DATAMODEL_ILP32 -IOC_LP64 = DATAMODEL_LP64 -IOC_NATIVE = DATAMODEL_NATIVE -IOC_NONE = DATAMODEL_NONE -STRCANON = 0x01 -RECOPY = 0x02 -SO_ALL = 0x003f -SO_READOPT = 0x0001 -SO_WROFF = 0x0002 -SO_MINPSZ = 0x0004 -SO_MAXPSZ = 0x0008 -SO_HIWAT = 0x0010 -SO_LOWAT = 0x0020 -SO_MREADON = 0x0040 -SO_MREADOFF = 0x0080 -SO_NDELON = 0x0100 -SO_NDELOFF = 0x0200 -SO_ISTTY = 0x0400 -SO_ISNTTY = 0x0800 -SO_TOSTOP = 0x1000 -SO_TONSTOP = 0x2000 -SO_BAND = 0x4000 -SO_DELIM = 0x8000 -SO_NODELIM = 0x010000 -SO_STRHOLD = 0x020000 -SO_ERROPT = 0x040000 -SO_COPYOPT = 0x080000 -SO_MAXBLK = 0x100000 -DEF_IOV_MAX = 16 -INFOD_FIRSTBYTES = 0x02 -INFOD_BYTES = 0x04 -INFOD_COUNT = 0x08 -INFOD_COPYOUT = 0x10 -MODOPEN = 0x1 -CLONEOPEN = 0x2 -CONSOPEN = 0x4 -OPENFAIL = -1 -BPRI_LO = 1 -BPRI_MED = 2 -BPRI_HI = 3 -BPRI_FT = 4 -INFPSZ = -1 -FLUSHALL = 1 -FLUSHDATA = 0 -STRHIGH = 5120 -STRLOW = 1024 -MAXIOCBSZ = 1024 -PERIM_INNER = 1 -PERIM_OUTER = 2 -def datamsg(type): return \ - -def straln(a): return (caddr_t)((intptr_t)(a) & ~(sizeof (int)-1)) - - -# Included from sys/byteorder.h -def ntohl(x): return (x) - -def ntohs(x): return (x) - -def htonl(x): return (x) - -def htons(x): return (x) - -IPPROTO_IP = 0 -IPPROTO_HOPOPTS = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_ENCAP = 4 -IPPROTO_TCP = 6 -IPPROTO_EGP = 8 -IPPROTO_PUP = 12 -IPPROTO_UDP = 17 -IPPROTO_IDP = 22 -IPPROTO_IPV6 = 41 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_RSVP = 46 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_HELLO = 63 -IPPROTO_ND = 77 -IPPROTO_EON = 80 -IPPROTO_PIM = 103 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPORT_ECHO = 7 -IPPORT_DISCARD = 9 -IPPORT_SYSTAT = 11 -IPPORT_DAYTIME = 13 -IPPORT_NETSTAT = 15 -IPPORT_FTP = 21 -IPPORT_TELNET = 23 -IPPORT_SMTP = 25 -IPPORT_TIMESERVER = 37 -IPPORT_NAMESERVER = 42 -IPPORT_WHOIS = 43 -IPPORT_MTP = 57 -IPPORT_BOOTPS = 67 -IPPORT_BOOTPC = 68 -IPPORT_TFTP = 69 -IPPORT_RJE = 77 -IPPORT_FINGER = 79 -IPPORT_TTYLINK = 87 -IPPORT_SUPDUP = 95 -IPPORT_EXECSERVER = 512 -IPPORT_LOGINSERVER = 513 -IPPORT_CMDSERVER = 514 -IPPORT_EFSSERVER = 520 -IPPORT_BIFFUDP = 512 -IPPORT_WHOSERVER = 513 -IPPORT_ROUTESERVER = 520 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 5000 -IMPLINK_IP = 155 -IMPLINK_LOWEXPER = 156 -IMPLINK_HIGHEXPER = 158 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_MAX = 128 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_MAX = 65536 -IN_CLASSC_NSHIFT = 8 -IN_CLASSD_NSHIFT = 28 -def IN_MULTICAST(i): return IN_CLASSD(i) - -IN_LOOPBACKNET = 127 -def IN_SET_LOOPBACK_ADDR(a): return \ - -def IN6_IS_ADDR_UNSPECIFIED(addr): return \ - -def IN6_IS_ADDR_LOOPBACK(addr): return \ - -def IN6_IS_ADDR_LOOPBACK(addr): return \ - -def IN6_IS_ADDR_MULTICAST(addr): return \ - -def IN6_IS_ADDR_MULTICAST(addr): return \ - -def IN6_IS_ADDR_LINKLOCAL(addr): return \ - -def IN6_IS_ADDR_LINKLOCAL(addr): return \ - -def IN6_IS_ADDR_SITELOCAL(addr): return \ - -def IN6_IS_ADDR_SITELOCAL(addr): return \ - -def IN6_IS_ADDR_V4MAPPED(addr): return \ - -def IN6_IS_ADDR_V4MAPPED(addr): return \ - -def IN6_IS_ADDR_V4MAPPED_ANY(addr): return \ - -def IN6_IS_ADDR_V4MAPPED_ANY(addr): return \ - -def IN6_IS_ADDR_V4COMPAT(addr): return \ - -def IN6_IS_ADDR_V4COMPAT(addr): return \ - -def IN6_IS_ADDR_MC_RESERVED(addr): return \ - -def IN6_IS_ADDR_MC_RESERVED(addr): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(addr): return \ - -def IN6_IS_ADDR_MC_NODELOCAL(addr): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(addr): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(addr): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(addr): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(addr): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(addr): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(addr): return \ - -def IN6_IS_ADDR_MC_GLOBAL(addr): return \ - -def IN6_IS_ADDR_MC_GLOBAL(addr): return \ - -IP_OPTIONS = 1 -IP_HDRINCL = 2 -IP_TOS = 3 -IP_TTL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 0x10 -IP_MULTICAST_TTL = 0x11 -IP_MULTICAST_LOOP = 0x12 -IP_ADD_MEMBERSHIP = 0x13 -IP_DROP_MEMBERSHIP = 0x14 -IP_SEC_OPT = 0x22 -IPSEC_PREF_NEVER = 0x01 -IPSEC_PREF_REQUIRED = 0x02 -IPSEC_PREF_UNIQUE = 0x04 -IP_ADD_PROXY_ADDR = 0x40 -IP_BOUND_IF = 0x41 -IP_UNSPEC_SRC = 0x42 -IP_REUSEADDR = 0x104 -IP_DONTROUTE = 0x105 -IP_BROADCAST = 0x106 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IPV6_RTHDR_TYPE_0 = 0 -IPV6_UNICAST_HOPS = 0x5 -IPV6_MULTICAST_IF = 0x6 -IPV6_MULTICAST_HOPS = 0x7 -IPV6_MULTICAST_LOOP = 0x8 -IPV6_JOIN_GROUP = 0x9 -IPV6_LEAVE_GROUP = 0xa -IPV6_ADD_MEMBERSHIP = 0x9 -IPV6_DROP_MEMBERSHIP = 0xa -IPV6_PKTINFO = 0xb -IPV6_HOPLIMIT = 0xc -IPV6_NEXTHOP = 0xd -IPV6_HOPOPTS = 0xe -IPV6_DSTOPTS = 0xf -IPV6_RTHDR = 0x10 -IPV6_RTHDRDSTOPTS = 0x11 -IPV6_RECVPKTINFO = 0x12 -IPV6_RECVHOPLIMIT = 0x13 -IPV6_RECVHOPOPTS = 0x14 -IPV6_RECVDSTOPTS = 0x15 -IPV6_RECVRTHDR = 0x16 -IPV6_RECVRTHDRDSTOPTS = 0x17 -IPV6_CHECKSUM = 0x18 -IPV6_BOUND_IF = 0x41 -IPV6_UNSPEC_SRC = 0x42 -INET_ADDRSTRLEN = 16 -INET6_ADDRSTRLEN = 46 -IPV6_PAD1_OPT = 0 diff --git a/Lib/plat-sunos5/STROPTS.py b/Lib/plat-sunos5/STROPTS.py deleted file mode 100644 index 8f735c4..0000000 --- a/Lib/plat-sunos5/STROPTS.py +++ /dev/null @@ -1,1813 +0,0 @@ -# Generated by h2py from /usr/include/sys/stropts.h - -# Included from sys/feature_tests.h - -# Included from sys/isa_defs.h -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 8 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 -_ALIGNMENT_REQUIRED = 1 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 4 -_DOUBLE_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 4 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 4 -_ALIGNMENT_REQUIRED = 0 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_ALIGNMENT_REQUIRED = 1 -_LONG_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 8 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 8 -_LONG_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 -_POSIX_C_SOURCE = 1 -_LARGEFILE64_SOURCE = 1 -_LARGEFILE_SOURCE = 1 -_FILE_OFFSET_BITS = 64 -_FILE_OFFSET_BITS = 32 -_POSIX_C_SOURCE = 199506 -_POSIX_PTHREAD_SEMANTICS = 1 -_XOPEN_VERSION = 500 -_XOPEN_VERSION = 4 -_XOPEN_VERSION = 3 -from TYPES import * - -# Included from sys/conf.h - -# Included from sys/t_lock.h - -# Included from sys/machlock.h -from TYPES import * -LOCK_HELD_VALUE = 0xff -def SPIN_LOCK(pl): return ((pl) > ipltospl(LOCK_LEVEL)) - -def LOCK_SAMPLE_INTERVAL(i): return (((i) & 0xff) == 0) - -CLOCK_LEVEL = 10 -LOCK_LEVEL = 10 -DISP_LEVEL = (LOCK_LEVEL + 1) -PTR24_LSB = 5 -PTR24_MSB = (PTR24_LSB + 24) -PTR24_ALIGN = 32 -PTR24_BASE = 0xe0000000 - -# Included from sys/param.h -from TYPES import * -_POSIX_VDISABLE = 0 -MAX_INPUT = 512 -MAX_CANON = 256 -UID_NOBODY = 60001 -GID_NOBODY = UID_NOBODY -UID_NOACCESS = 60002 -MAX_TASKID = 999999 -MAX_MAXPID = 999999 -DEFAULT_MAXPID = 999999 -DEFAULT_JUMPPID = 100000 -DEFAULT_MAXPID = 30000 -DEFAULT_JUMPPID = 0 -MAXUID = 2147483647 -MAXPROJID = MAXUID -MAXLINK = 32767 -NMOUNT = 40 -CANBSIZ = 256 -NOFILE = 20 -NGROUPS_UMIN = 0 -NGROUPS_UMAX = 32 -NGROUPS_MAX_DEFAULT = 16 -NZERO = 20 -NULL = 0 -NULL = 0 -CMASK = 0o22 -CDLIMIT = (1<<11) -NBPS = 0x20000 -NBPSCTR = 512 -UBSIZE = 512 -SCTRSHFT = 9 -SYSNAME = 9 -PREMOTE = 39 -MAXPATHLEN = 1024 -MAXSYMLINKS = 20 -MAXNAMELEN = 256 -NADDR = 13 -PIPE_BUF = 5120 -PIPE_MAX = 5120 -NBBY = 8 -MAXBSIZE = 8192 -DEV_BSIZE = 512 -DEV_BSHIFT = 9 -MAXFRAG = 8 -MAXOFF32_T = 0x7fffffff -MAXOFF_T = 0x7fffffffffffffff -MAXOFFSET_T = 0x7fffffffffffffff -MAXOFF_T = 0x7fffffff -MAXOFFSET_T = 0x7fffffff -def btodb(bytes): return \ - -def dbtob(db): return \ - -def lbtodb(bytes): return \ - -def ldbtob(db): return \ - -NCARGS32 = 0x100000 -NCARGS64 = 0x200000 -NCARGS = NCARGS64 -NCARGS = NCARGS32 -FSHIFT = 8 -FSCALE = (1<> MMU_PAGESHIFT) - -def mmu_btopr(x): return ((((x) + MMU_PAGEOFFSET) >> MMU_PAGESHIFT)) - -def mmu_ptod(x): return ((x) << (MMU_PAGESHIFT - DEV_BSHIFT)) - -def ptod(x): return ((x) << (PAGESHIFT - DEV_BSHIFT)) - -def ptob(x): return ((x) << PAGESHIFT) - -def btop(x): return (((x) >> PAGESHIFT)) - -def btopr(x): return ((((x) + PAGEOFFSET) >> PAGESHIFT)) - -def dtop(DD): return (((DD) + NDPP - 1) >> (PAGESHIFT - DEV_BSHIFT)) - -def dtopt(DD): return ((DD) >> (PAGESHIFT - DEV_BSHIFT)) - -_AIO_LISTIO_MAX = (4096) -_AIO_MAX = (-1) -_MQ_OPEN_MAX = (32) -_MQ_PRIO_MAX = (32) -_SEM_NSEMS_MAX = INT_MAX -_SEM_VALUE_MAX = INT_MAX - -# Included from sys/unistd.h -_CS_PATH = 65 -_CS_LFS_CFLAGS = 68 -_CS_LFS_LDFLAGS = 69 -_CS_LFS_LIBS = 70 -_CS_LFS_LINTFLAGS = 71 -_CS_LFS64_CFLAGS = 72 -_CS_LFS64_LDFLAGS = 73 -_CS_LFS64_LIBS = 74 -_CS_LFS64_LINTFLAGS = 75 -_CS_XBS5_ILP32_OFF32_CFLAGS = 700 -_CS_XBS5_ILP32_OFF32_LDFLAGS = 701 -_CS_XBS5_ILP32_OFF32_LIBS = 702 -_CS_XBS5_ILP32_OFF32_LINTFLAGS = 703 -_CS_XBS5_ILP32_OFFBIG_CFLAGS = 705 -_CS_XBS5_ILP32_OFFBIG_LDFLAGS = 706 -_CS_XBS5_ILP32_OFFBIG_LIBS = 707 -_CS_XBS5_ILP32_OFFBIG_LINTFLAGS = 708 -_CS_XBS5_LP64_OFF64_CFLAGS = 709 -_CS_XBS5_LP64_OFF64_LDFLAGS = 710 -_CS_XBS5_LP64_OFF64_LIBS = 711 -_CS_XBS5_LP64_OFF64_LINTFLAGS = 712 -_CS_XBS5_LPBIG_OFFBIG_CFLAGS = 713 -_CS_XBS5_LPBIG_OFFBIG_LDFLAGS = 714 -_CS_XBS5_LPBIG_OFFBIG_LIBS = 715 -_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS = 716 -_SC_ARG_MAX = 1 -_SC_CHILD_MAX = 2 -_SC_CLK_TCK = 3 -_SC_NGROUPS_MAX = 4 -_SC_OPEN_MAX = 5 -_SC_JOB_CONTROL = 6 -_SC_SAVED_IDS = 7 -_SC_VERSION = 8 -_SC_PASS_MAX = 9 -_SC_LOGNAME_MAX = 10 -_SC_PAGESIZE = 11 -_SC_XOPEN_VERSION = 12 -_SC_NPROCESSORS_CONF = 14 -_SC_NPROCESSORS_ONLN = 15 -_SC_STREAM_MAX = 16 -_SC_TZNAME_MAX = 17 -_SC_AIO_LISTIO_MAX = 18 -_SC_AIO_MAX = 19 -_SC_AIO_PRIO_DELTA_MAX = 20 -_SC_ASYNCHRONOUS_IO = 21 -_SC_DELAYTIMER_MAX = 22 -_SC_FSYNC = 23 -_SC_MAPPED_FILES = 24 -_SC_MEMLOCK = 25 -_SC_MEMLOCK_RANGE = 26 -_SC_MEMORY_PROTECTION = 27 -_SC_MESSAGE_PASSING = 28 -_SC_MQ_OPEN_MAX = 29 -_SC_MQ_PRIO_MAX = 30 -_SC_PRIORITIZED_IO = 31 -_SC_PRIORITY_SCHEDULING = 32 -_SC_REALTIME_SIGNALS = 33 -_SC_RTSIG_MAX = 34 -_SC_SEMAPHORES = 35 -_SC_SEM_NSEMS_MAX = 36 -_SC_SEM_VALUE_MAX = 37 -_SC_SHARED_MEMORY_OBJECTS = 38 -_SC_SIGQUEUE_MAX = 39 -_SC_SIGRT_MIN = 40 -_SC_SIGRT_MAX = 41 -_SC_SYNCHRONIZED_IO = 42 -_SC_TIMERS = 43 -_SC_TIMER_MAX = 44 -_SC_2_C_BIND = 45 -_SC_2_C_DEV = 46 -_SC_2_C_VERSION = 47 -_SC_2_FORT_DEV = 48 -_SC_2_FORT_RUN = 49 -_SC_2_LOCALEDEF = 50 -_SC_2_SW_DEV = 51 -_SC_2_UPE = 52 -_SC_2_VERSION = 53 -_SC_BC_BASE_MAX = 54 -_SC_BC_DIM_MAX = 55 -_SC_BC_SCALE_MAX = 56 -_SC_BC_STRING_MAX = 57 -_SC_COLL_WEIGHTS_MAX = 58 -_SC_EXPR_NEST_MAX = 59 -_SC_LINE_MAX = 60 -_SC_RE_DUP_MAX = 61 -_SC_XOPEN_CRYPT = 62 -_SC_XOPEN_ENH_I18N = 63 -_SC_XOPEN_SHM = 64 -_SC_2_CHAR_TERM = 66 -_SC_XOPEN_XCU_VERSION = 67 -_SC_ATEXIT_MAX = 76 -_SC_IOV_MAX = 77 -_SC_XOPEN_UNIX = 78 -_SC_PAGE_SIZE = _SC_PAGESIZE -_SC_T_IOV_MAX = 79 -_SC_PHYS_PAGES = 500 -_SC_AVPHYS_PAGES = 501 -_SC_COHER_BLKSZ = 503 -_SC_SPLIT_CACHE = 504 -_SC_ICACHE_SZ = 505 -_SC_DCACHE_SZ = 506 -_SC_ICACHE_LINESZ = 507 -_SC_DCACHE_LINESZ = 508 -_SC_ICACHE_BLKSZ = 509 -_SC_DCACHE_BLKSZ = 510 -_SC_DCACHE_TBLKSZ = 511 -_SC_ICACHE_ASSOC = 512 -_SC_DCACHE_ASSOC = 513 -_SC_MAXPID = 514 -_SC_STACK_PROT = 515 -_SC_THREAD_DESTRUCTOR_ITERATIONS = 568 -_SC_GETGR_R_SIZE_MAX = 569 -_SC_GETPW_R_SIZE_MAX = 570 -_SC_LOGIN_NAME_MAX = 571 -_SC_THREAD_KEYS_MAX = 572 -_SC_THREAD_STACK_MIN = 573 -_SC_THREAD_THREADS_MAX = 574 -_SC_TTY_NAME_MAX = 575 -_SC_THREADS = 576 -_SC_THREAD_ATTR_STACKADDR = 577 -_SC_THREAD_ATTR_STACKSIZE = 578 -_SC_THREAD_PRIORITY_SCHEDULING = 579 -_SC_THREAD_PRIO_INHERIT = 580 -_SC_THREAD_PRIO_PROTECT = 581 -_SC_THREAD_PROCESS_SHARED = 582 -_SC_THREAD_SAFE_FUNCTIONS = 583 -_SC_XOPEN_LEGACY = 717 -_SC_XOPEN_REALTIME = 718 -_SC_XOPEN_REALTIME_THREADS = 719 -_SC_XBS5_ILP32_OFF32 = 720 -_SC_XBS5_ILP32_OFFBIG = 721 -_SC_XBS5_LP64_OFF64 = 722 -_SC_XBS5_LPBIG_OFFBIG = 723 -_PC_LINK_MAX = 1 -_PC_MAX_CANON = 2 -_PC_MAX_INPUT = 3 -_PC_NAME_MAX = 4 -_PC_PATH_MAX = 5 -_PC_PIPE_BUF = 6 -_PC_NO_TRUNC = 7 -_PC_VDISABLE = 8 -_PC_CHOWN_RESTRICTED = 9 -_PC_ASYNC_IO = 10 -_PC_PRIO_IO = 11 -_PC_SYNC_IO = 12 -_PC_FILESIZEBITS = 67 -_PC_LAST = 67 -_POSIX_VERSION = 199506 -_POSIX2_VERSION = 199209 -_POSIX2_C_VERSION = 199209 -_XOPEN_XCU_VERSION = 4 -_XOPEN_REALTIME = 1 -_XOPEN_ENH_I18N = 1 -_XOPEN_SHM = 1 -_POSIX2_C_BIND = 1 -_POSIX2_CHAR_TERM = 1 -_POSIX2_LOCALEDEF = 1 -_POSIX2_C_DEV = 1 -_POSIX2_SW_DEV = 1 -_POSIX2_UPE = 1 - -# Included from sys/mutex.h -from TYPES import * -def MUTEX_HELD(x): return (mutex_owned(x)) - - -# Included from sys/rwlock.h -from TYPES import * -def RW_READ_HELD(x): return (rw_read_held((x))) - -def RW_WRITE_HELD(x): return (rw_write_held((x))) - -def RW_LOCK_HELD(x): return (rw_lock_held((x))) - -def RW_ISWRITER(x): return (rw_iswriter(x)) - - -# Included from sys/semaphore.h - -# Included from sys/thread.h -from TYPES import * - -# Included from sys/klwp.h -from TYPES import * - -# Included from sys/condvar.h -from TYPES import * - -# Included from sys/time.h - -# Included from sys/types32.h - -# Included from sys/int_types.h -TIME32_MAX = INT32_MAX -TIME32_MIN = INT32_MIN -def TIMEVAL_OVERFLOW(tv): return \ - -from TYPES import * -DST_NONE = 0 -DST_USA = 1 -DST_AUST = 2 -DST_WET = 3 -DST_MET = 4 -DST_EET = 5 -DST_CAN = 6 -DST_GB = 7 -DST_RUM = 8 -DST_TUR = 9 -DST_AUSTALT = 10 -ITIMER_REAL = 0 -ITIMER_VIRTUAL = 1 -ITIMER_PROF = 2 -ITIMER_REALPROF = 3 -def ITIMERVAL_OVERFLOW(itv): return \ - -SEC = 1 -MILLISEC = 1000 -MICROSEC = 1000000 -NANOSEC = 1000000000 - -# Included from sys/time_impl.h -def TIMESPEC_OVERFLOW(ts): return \ - -def ITIMERSPEC_OVERFLOW(it): return \ - -__CLOCK_REALTIME0 = 0 -CLOCK_VIRTUAL = 1 -CLOCK_PROF = 2 -__CLOCK_REALTIME3 = 3 -CLOCK_HIGHRES = 4 -CLOCK_MAX = 5 -CLOCK_REALTIME = __CLOCK_REALTIME3 -CLOCK_REALTIME = __CLOCK_REALTIME0 -TIMER_RELTIME = 0x0 -TIMER_ABSTIME = 0x1 -def TICK_TO_SEC(tick): return ((tick) / hz) - -def SEC_TO_TICK(sec): return ((sec) * hz) - -def TICK_TO_MSEC(tick): return \ - -def MSEC_TO_TICK(msec): return \ - -def MSEC_TO_TICK_ROUNDUP(msec): return \ - -def TICK_TO_USEC(tick): return ((tick) * usec_per_tick) - -def USEC_TO_TICK(usec): return ((usec) / usec_per_tick) - -def USEC_TO_TICK_ROUNDUP(usec): return \ - -def TICK_TO_NSEC(tick): return ((tick) * nsec_per_tick) - -def NSEC_TO_TICK(nsec): return ((nsec) / nsec_per_tick) - -def NSEC_TO_TICK_ROUNDUP(nsec): return \ - -def TIMEVAL_TO_TICK(tvp): return \ - -def TIMESTRUC_TO_TICK(tsp): return \ - - -# Included from time.h -from TYPES import * - -# Included from iso/time_iso.h -NULL = 0 -NULL = 0 -CLOCKS_PER_SEC = 1000000 - -# Included from sys/select.h -FD_SETSIZE = 65536 -FD_SETSIZE = 1024 -_NBBY = 8 -NBBY = _NBBY -def FD_ZERO(p): return bzero((p), sizeof (*(p))) - - -# Included from sys/signal.h - -# Included from sys/iso/signal_iso.h -SIGHUP = 1 -SIGINT = 2 -SIGQUIT = 3 -SIGILL = 4 -SIGTRAP = 5 -SIGIOT = 6 -SIGABRT = 6 -SIGEMT = 7 -SIGFPE = 8 -SIGKILL = 9 -SIGBUS = 10 -SIGSEGV = 11 -SIGSYS = 12 -SIGPIPE = 13 -SIGALRM = 14 -SIGTERM = 15 -SIGUSR1 = 16 -SIGUSR2 = 17 -SIGCLD = 18 -SIGCHLD = 18 -SIGPWR = 19 -SIGWINCH = 20 -SIGURG = 21 -SIGPOLL = 22 -SIGIO = SIGPOLL -SIGSTOP = 23 -SIGTSTP = 24 -SIGCONT = 25 -SIGTTIN = 26 -SIGTTOU = 27 -SIGVTALRM = 28 -SIGPROF = 29 -SIGXCPU = 30 -SIGXFSZ = 31 -SIGWAITING = 32 -SIGLWP = 33 -SIGFREEZE = 34 -SIGTHAW = 35 -SIGCANCEL = 36 -SIGLOST = 37 -_SIGRTMIN = 38 -_SIGRTMAX = 45 -SIG_BLOCK = 1 -SIG_UNBLOCK = 2 -SIG_SETMASK = 3 -SIGNO_MASK = 0xFF -SIGDEFER = 0x100 -SIGHOLD = 0x200 -SIGRELSE = 0x400 -SIGIGNORE = 0x800 -SIGPAUSE = 0x1000 - -# Included from sys/siginfo.h -from TYPES import * -SIGEV_NONE = 1 -SIGEV_SIGNAL = 2 -SIGEV_THREAD = 3 -SI_NOINFO = 32767 -SI_USER = 0 -SI_LWP = (-1) -SI_QUEUE = (-2) -SI_TIMER = (-3) -SI_ASYNCIO = (-4) -SI_MESGQ = (-5) - -# Included from sys/machsig.h -ILL_ILLOPC = 1 -ILL_ILLOPN = 2 -ILL_ILLADR = 3 -ILL_ILLTRP = 4 -ILL_PRVOPC = 5 -ILL_PRVREG = 6 -ILL_COPROC = 7 -ILL_BADSTK = 8 -NSIGILL = 8 -EMT_TAGOVF = 1 -EMT_CPCOVF = 2 -NSIGEMT = 2 -FPE_INTDIV = 1 -FPE_INTOVF = 2 -FPE_FLTDIV = 3 -FPE_FLTOVF = 4 -FPE_FLTUND = 5 -FPE_FLTRES = 6 -FPE_FLTINV = 7 -FPE_FLTSUB = 8 -NSIGFPE = 8 -SEGV_MAPERR = 1 -SEGV_ACCERR = 2 -NSIGSEGV = 2 -BUS_ADRALN = 1 -BUS_ADRERR = 2 -BUS_OBJERR = 3 -NSIGBUS = 3 -TRAP_BRKPT = 1 -TRAP_TRACE = 2 -TRAP_RWATCH = 3 -TRAP_WWATCH = 4 -TRAP_XWATCH = 5 -NSIGTRAP = 5 -CLD_EXITED = 1 -CLD_KILLED = 2 -CLD_DUMPED = 3 -CLD_TRAPPED = 4 -CLD_STOPPED = 5 -CLD_CONTINUED = 6 -NSIGCLD = 6 -POLL_IN = 1 -POLL_OUT = 2 -POLL_MSG = 3 -POLL_ERR = 4 -POLL_PRI = 5 -POLL_HUP = 6 -NSIGPOLL = 6 -PROF_SIG = 1 -NSIGPROF = 1 -SI_MAXSZ = 256 -SI_MAXSZ = 128 - -# Included from sys/time_std_impl.h -from TYPES import * -SI32_MAXSZ = 128 -def SI_CANQUEUE(c): return ((c) <= SI_QUEUE) - -SA_NOCLDSTOP = 0x00020000 -SA_ONSTACK = 0x00000001 -SA_RESETHAND = 0x00000002 -SA_RESTART = 0x00000004 -SA_SIGINFO = 0x00000008 -SA_NODEFER = 0x00000010 -SA_NOCLDWAIT = 0x00010000 -SA_WAITSIG = 0x00010000 -NSIG = 46 -MAXSIG = 45 -S_SIGNAL = 1 -S_SIGSET = 2 -S_SIGACTION = 3 -S_NONE = 4 -MINSIGSTKSZ = 2048 -SIGSTKSZ = 8192 -SS_ONSTACK = 0x00000001 -SS_DISABLE = 0x00000002 -SN_PROC = 1 -SN_CANCEL = 2 -SN_SEND = 3 - -# Included from sys/ucontext.h -from TYPES import * - -# Included from sys/regset.h -REG_CCR = (0) -REG_PSR = (0) -REG_PSR = (0) -REG_PC = (1) -REG_nPC = (2) -REG_Y = (3) -REG_G1 = (4) -REG_G2 = (5) -REG_G3 = (6) -REG_G4 = (7) -REG_G5 = (8) -REG_G6 = (9) -REG_G7 = (10) -REG_O0 = (11) -REG_O1 = (12) -REG_O2 = (13) -REG_O3 = (14) -REG_O4 = (15) -REG_O5 = (16) -REG_O6 = (17) -REG_O7 = (18) -REG_ASI = (19) -REG_FPRS = (20) -REG_PS = REG_PSR -REG_SP = REG_O6 -REG_R0 = REG_O0 -REG_R1 = REG_O1 -_NGREG = 21 -_NGREG = 19 -NGREG = _NGREG -_NGREG32 = 19 -_NGREG64 = 21 -SPARC_MAXREGWINDOW = 31 -MAXFPQ = 16 -XRS_ID = 0x78727300 - -# Included from v7/sys/privregs.h - -# Included from v7/sys/psr.h -PSR_CWP = 0x0000001F -PSR_ET = 0x00000020 -PSR_PS = 0x00000040 -PSR_S = 0x00000080 -PSR_PIL = 0x00000F00 -PSR_EF = 0x00001000 -PSR_EC = 0x00002000 -PSR_RSV = 0x000FC000 -PSR_ICC = 0x00F00000 -PSR_C = 0x00100000 -PSR_V = 0x00200000 -PSR_Z = 0x00400000 -PSR_N = 0x00800000 -PSR_VER = 0x0F000000 -PSR_IMPL = 0xF0000000 -PSL_ALLCC = PSR_ICC -PSL_USER = (PSR_S) -PSL_USERMASK = (PSR_ICC) -PSL_UBITS = (PSR_ICC|PSR_EF) -def USERMODE(ps): return (((ps) & PSR_PS) == 0) - - -# Included from sys/fsr.h -FSR_CEXC = 0x0000001f -FSR_AEXC = 0x000003e0 -FSR_FCC = 0x00000c00 -FSR_PR = 0x00001000 -FSR_QNE = 0x00002000 -FSR_FTT = 0x0001c000 -FSR_VER = 0x000e0000 -FSR_TEM = 0x0f800000 -FSR_RP = 0x30000000 -FSR_RD = 0xc0000000 -FSR_VER_SHIFT = 17 -FSR_FCC1 = 0x00000003 -FSR_FCC2 = 0x0000000C -FSR_FCC3 = 0x00000030 -FSR_CEXC_NX = 0x00000001 -FSR_CEXC_DZ = 0x00000002 -FSR_CEXC_UF = 0x00000004 -FSR_CEXC_OF = 0x00000008 -FSR_CEXC_NV = 0x00000010 -FSR_AEXC_NX = (0x1 << 5) -FSR_AEXC_DZ = (0x2 << 5) -FSR_AEXC_UF = (0x4 << 5) -FSR_AEXC_OF = (0x8 << 5) -FSR_AEXC_NV = (0x10 << 5) -FTT_NONE = 0 -FTT_IEEE = 1 -FTT_UNFIN = 2 -FTT_UNIMP = 3 -FTT_SEQ = 4 -FTT_ALIGN = 5 -FTT_DFAULT = 6 -FSR_FTT_SHIFT = 14 -FSR_FTT_IEEE = (FTT_IEEE << FSR_FTT_SHIFT) -FSR_FTT_UNFIN = (FTT_UNFIN << FSR_FTT_SHIFT) -FSR_FTT_UNIMP = (FTT_UNIMP << FSR_FTT_SHIFT) -FSR_FTT_SEQ = (FTT_SEQ << FSR_FTT_SHIFT) -FSR_FTT_ALIGN = (FTT_ALIGN << FSR_FTT_SHIFT) -FSR_FTT_DFAULT = (FTT_DFAULT << FSR_FTT_SHIFT) -FSR_TEM_NX = (0x1 << 23) -FSR_TEM_DZ = (0x2 << 23) -FSR_TEM_UF = (0x4 << 23) -FSR_TEM_OF = (0x8 << 23) -FSR_TEM_NV = (0x10 << 23) -RP_DBLEXT = 0 -RP_SINGLE = 1 -RP_DOUBLE = 2 -RP_RESERVED = 3 -RD_NEAR = 0 -RD_ZER0 = 1 -RD_POSINF = 2 -RD_NEGINF = 3 -FPRS_DL = 0x1 -FPRS_DU = 0x2 -FPRS_FEF = 0x4 -PIL_MAX = 0xf -def SAVE_GLOBALS(RP): return \ - -def RESTORE_GLOBALS(RP): return \ - -def SAVE_OUTS(RP): return \ - -def RESTORE_OUTS(RP): return \ - -def SAVE_WINDOW(SBP): return \ - -def RESTORE_WINDOW(SBP): return \ - -def STORE_FPREGS(FP): return \ - -def LOAD_FPREGS(FP): return \ - -_SPARC_MAXREGWINDOW = 31 -_XRS_ID = 0x78727300 -GETCONTEXT = 0 -SETCONTEXT = 1 -UC_SIGMASK = 0o01 -UC_STACK = 0o02 -UC_CPU = 0o04 -UC_MAU = 0o10 -UC_FPU = UC_MAU -UC_INTR = 0o20 -UC_ASR = 0o40 -UC_MCONTEXT = (UC_CPU|UC_FPU|UC_ASR) -UC_ALL = (UC_SIGMASK|UC_STACK|UC_MCONTEXT) -_SIGQUEUE_MAX = 32 -_SIGNOTIFY_MAX = 32 - -# Included from sys/pcb.h -INSTR_VALID = 0x02 -NORMAL_STEP = 0x04 -WATCH_STEP = 0x08 -CPC_OVERFLOW = 0x10 -ASYNC_HWERR = 0x20 -STEP_NONE = 0 -STEP_REQUESTED = 1 -STEP_ACTIVE = 2 -STEP_WASACTIVE = 3 - -# Included from sys/msacct.h -LMS_USER = 0 -LMS_SYSTEM = 1 -LMS_TRAP = 2 -LMS_TFAULT = 3 -LMS_DFAULT = 4 -LMS_KFAULT = 5 -LMS_USER_LOCK = 6 -LMS_SLEEP = 7 -LMS_WAIT_CPU = 8 -LMS_STOPPED = 9 -NMSTATES = 10 - -# Included from sys/lwp.h - -# Included from sys/synch.h -from TYPES import * -USYNC_THREAD = 0x00 -USYNC_PROCESS = 0x01 -LOCK_NORMAL = 0x00 -LOCK_ERRORCHECK = 0x02 -LOCK_RECURSIVE = 0x04 -USYNC_PROCESS_ROBUST = 0x08 -LOCK_PRIO_NONE = 0x00 -LOCK_PRIO_INHERIT = 0x10 -LOCK_PRIO_PROTECT = 0x20 -LOCK_STALL_NP = 0x00 -LOCK_ROBUST_NP = 0x40 -LOCK_OWNERDEAD = 0x1 -LOCK_NOTRECOVERABLE = 0x2 -LOCK_INITED = 0x4 -LOCK_UNMAPPED = 0x8 -LWP_DETACHED = 0x00000040 -LWP_SUSPENDED = 0x00000080 -__LWP_ASLWP = 0x00000100 -MAXSYSARGS = 8 -NORMALRETURN = 0 -JUSTRETURN = 1 -LWP_USER = 0x01 -LWP_SYS = 0x02 -TS_FREE = 0x00 -TS_SLEEP = 0x01 -TS_RUN = 0x02 -TS_ONPROC = 0x04 -TS_ZOMB = 0x08 -TS_STOPPED = 0x10 -T_INTR_THREAD = 0x0001 -T_WAKEABLE = 0x0002 -T_TOMASK = 0x0004 -T_TALLOCSTK = 0x0008 -T_WOULDBLOCK = 0x0020 -T_DONTBLOCK = 0x0040 -T_DONTPEND = 0x0080 -T_SYS_PROF = 0x0100 -T_WAITCVSEM = 0x0200 -T_WATCHPT = 0x0400 -T_PANIC = 0x0800 -TP_HOLDLWP = 0x0002 -TP_TWAIT = 0x0004 -TP_LWPEXIT = 0x0008 -TP_PRSTOP = 0x0010 -TP_CHKPT = 0x0020 -TP_EXITLWP = 0x0040 -TP_PRVSTOP = 0x0080 -TP_MSACCT = 0x0100 -TP_STOPPING = 0x0200 -TP_WATCHPT = 0x0400 -TP_PAUSE = 0x0800 -TP_CHANGEBIND = 0x1000 -TS_LOAD = 0x0001 -TS_DONT_SWAP = 0x0002 -TS_SWAPENQ = 0x0004 -TS_ON_SWAPQ = 0x0008 -TS_CSTART = 0x0100 -TS_UNPAUSE = 0x0200 -TS_XSTART = 0x0400 -TS_PSTART = 0x0800 -TS_RESUME = 0x1000 -TS_CREATE = 0x2000 -TS_ALLSTART = \ - (TS_CSTART|TS_UNPAUSE|TS_XSTART|TS_PSTART|TS_RESUME|TS_CREATE) -def CPR_VSTOPPED(t): return \ - -def THREAD_TRANSITION(tp): return thread_transition(tp); - -def THREAD_STOP(tp): return \ - -def THREAD_ZOMB(tp): return THREAD_SET_STATE(tp, TS_ZOMB, NULL) - -def SEMA_HELD(x): return (sema_held((x))) - -NO_LOCKS_HELD = 1 -NO_COMPETING_THREADS = 1 -FMNAMESZ = 8 - -# Included from sys/systm.h -from TYPES import * - -# Included from sys/proc.h - -# Included from sys/cred.h - -# Included from sys/user.h -from TYPES import * - -# Included from sys/resource.h -from TYPES import * -PRIO_PROCESS = 0 -PRIO_PGRP = 1 -PRIO_USER = 2 -RLIMIT_CPU = 0 -RLIMIT_FSIZE = 1 -RLIMIT_DATA = 2 -RLIMIT_STACK = 3 -RLIMIT_CORE = 4 -RLIMIT_NOFILE = 5 -RLIMIT_VMEM = 6 -RLIMIT_AS = RLIMIT_VMEM -RLIM_NLIMITS = 7 -RLIM_INFINITY = (-3) -RLIM_SAVED_MAX = (-2) -RLIM_SAVED_CUR = (-1) -RLIM_INFINITY = 0x7fffffff -RLIM_SAVED_MAX = 0x7ffffffe -RLIM_SAVED_CUR = 0x7ffffffd -RLIM32_INFINITY = 0x7fffffff -RLIM32_SAVED_MAX = 0x7ffffffe -RLIM32_SAVED_CUR = 0x7ffffffd - -# Included from sys/model.h - -# Included from sys/debug.h -def ASSERT64(x): return ASSERT(x) - -def ASSERT32(x): return ASSERT(x) - -DATAMODEL_MASK = 0x0FF00000 -DATAMODEL_ILP32 = 0x00100000 -DATAMODEL_LP64 = 0x00200000 -DATAMODEL_NONE = 0 -DATAMODEL_NATIVE = DATAMODEL_LP64 -DATAMODEL_NATIVE = DATAMODEL_ILP32 -def STRUCT_SIZE(handle): return \ - -def STRUCT_BUF(handle): return ((handle).ptr.m64) - -def SIZEOF_PTR(umodel): return \ - -def STRUCT_SIZE(handle): return (sizeof (*(handle).ptr)) - -def STRUCT_BUF(handle): return ((handle).ptr) - -def SIZEOF_PTR(umodel): return sizeof (caddr_t) - -def lwp_getdatamodel(t): return DATAMODEL_ILP32 - -RUSAGE_SELF = 0 -RUSAGE_CHILDREN = -1 - -# Included from sys/auxv.h -AT_NULL = 0 -AT_IGNORE = 1 -AT_EXECFD = 2 -AT_PHDR = 3 -AT_PHENT = 4 -AT_PHNUM = 5 -AT_PAGESZ = 6 -AT_BASE = 7 -AT_FLAGS = 8 -AT_ENTRY = 9 -AT_DCACHEBSIZE = 10 -AT_ICACHEBSIZE = 11 -AT_UCACHEBSIZE = 12 -AT_SUN_UID = 2000 -AT_SUN_RUID = 2001 -AT_SUN_GID = 2002 -AT_SUN_RGID = 2003 -AT_SUN_LDELF = 2004 -AT_SUN_LDSHDR = 2005 -AT_SUN_LDNAME = 2006 -AT_SUN_LPAGESZ = 2007 -AT_SUN_PLATFORM = 2008 -AT_SUN_HWCAP = 2009 -AT_SUN_IFLUSH = 2010 -AT_SUN_CPU = 2011 -AT_SUN_EMUL_ENTRY = 2012 -AT_SUN_EMUL_EXECFD = 2013 -AT_SUN_EXECNAME = 2014 -AT_SUN_MMU = 2015 - -# Included from sys/errno.h -EPERM = 1 -ENOENT = 2 -ESRCH = 3 -EINTR = 4 -EIO = 5 -ENXIO = 6 -E2BIG = 7 -ENOEXEC = 8 -EBADF = 9 -ECHILD = 10 -EAGAIN = 11 -ENOMEM = 12 -EACCES = 13 -EFAULT = 14 -ENOTBLK = 15 -EBUSY = 16 -EEXIST = 17 -EXDEV = 18 -ENODEV = 19 -ENOTDIR = 20 -EISDIR = 21 -EINVAL = 22 -ENFILE = 23 -EMFILE = 24 -ENOTTY = 25 -ETXTBSY = 26 -EFBIG = 27 -ENOSPC = 28 -ESPIPE = 29 -EROFS = 30 -EMLINK = 31 -EPIPE = 32 -EDOM = 33 -ERANGE = 34 -ENOMSG = 35 -EIDRM = 36 -ECHRNG = 37 -EL2NSYNC = 38 -EL3HLT = 39 -EL3RST = 40 -ELNRNG = 41 -EUNATCH = 42 -ENOCSI = 43 -EL2HLT = 44 -EDEADLK = 45 -ENOLCK = 46 -ECANCELED = 47 -ENOTSUP = 48 -EDQUOT = 49 -EBADE = 50 -EBADR = 51 -EXFULL = 52 -ENOANO = 53 -EBADRQC = 54 -EBADSLT = 55 -EDEADLOCK = 56 -EBFONT = 57 -EOWNERDEAD = 58 -ENOTRECOVERABLE = 59 -ENOSTR = 60 -ENODATA = 61 -ETIME = 62 -ENOSR = 63 -ENONET = 64 -ENOPKG = 65 -EREMOTE = 66 -ENOLINK = 67 -EADV = 68 -ESRMNT = 69 -ECOMM = 70 -EPROTO = 71 -ELOCKUNMAPPED = 72 -ENOTACTIVE = 73 -EMULTIHOP = 74 -EBADMSG = 77 -ENAMETOOLONG = 78 -EOVERFLOW = 79 -ENOTUNIQ = 80 -EBADFD = 81 -EREMCHG = 82 -ELIBACC = 83 -ELIBBAD = 84 -ELIBSCN = 85 -ELIBMAX = 86 -ELIBEXEC = 87 -EILSEQ = 88 -ENOSYS = 89 -ELOOP = 90 -ERESTART = 91 -ESTRPIPE = 92 -ENOTEMPTY = 93 -EUSERS = 94 -ENOTSOCK = 95 -EDESTADDRREQ = 96 -EMSGSIZE = 97 -EPROTOTYPE = 98 -ENOPROTOOPT = 99 -EPROTONOSUPPORT = 120 -ESOCKTNOSUPPORT = 121 -EOPNOTSUPP = 122 -EPFNOSUPPORT = 123 -EAFNOSUPPORT = 124 -EADDRINUSE = 125 -EADDRNOTAVAIL = 126 -ENETDOWN = 127 -ENETUNREACH = 128 -ENETRESET = 129 -ECONNABORTED = 130 -ECONNRESET = 131 -ENOBUFS = 132 -EISCONN = 133 -ENOTCONN = 134 -ESHUTDOWN = 143 -ETOOMANYREFS = 144 -ETIMEDOUT = 145 -ECONNREFUSED = 146 -EHOSTDOWN = 147 -EHOSTUNREACH = 148 -EWOULDBLOCK = EAGAIN -EALREADY = 149 -EINPROGRESS = 150 -ESTALE = 151 -PSARGSZ = 80 -PSCOMSIZ = 14 -MAXCOMLEN = 16 -__KERN_NAUXV_IMPL = 19 -__KERN_NAUXV_IMPL = 21 -__KERN_NAUXV_IMPL = 21 -PSARGSZ = 80 - -# Included from sys/watchpoint.h -from TYPES import * - -# Included from vm/seg_enum.h - -# Included from sys/copyops.h -from TYPES import * - -# Included from sys/buf.h - -# Included from sys/kstat.h -from TYPES import * -KSTAT_STRLEN = 31 -def KSTAT_ENTER(k): return \ - -def KSTAT_EXIT(k): return \ - -KSTAT_TYPE_RAW = 0 -KSTAT_TYPE_NAMED = 1 -KSTAT_TYPE_INTR = 2 -KSTAT_TYPE_IO = 3 -KSTAT_TYPE_TIMER = 4 -KSTAT_NUM_TYPES = 5 -KSTAT_FLAG_VIRTUAL = 0x01 -KSTAT_FLAG_VAR_SIZE = 0x02 -KSTAT_FLAG_WRITABLE = 0x04 -KSTAT_FLAG_PERSISTENT = 0x08 -KSTAT_FLAG_DORMANT = 0x10 -KSTAT_FLAG_INVALID = 0x20 -KSTAT_READ = 0 -KSTAT_WRITE = 1 -KSTAT_DATA_CHAR = 0 -KSTAT_DATA_INT32 = 1 -KSTAT_DATA_UINT32 = 2 -KSTAT_DATA_INT64 = 3 -KSTAT_DATA_UINT64 = 4 -KSTAT_DATA_LONG = KSTAT_DATA_INT32 -KSTAT_DATA_ULONG = KSTAT_DATA_UINT32 -KSTAT_DATA_LONG = KSTAT_DATA_INT64 -KSTAT_DATA_ULONG = KSTAT_DATA_UINT64 -KSTAT_DATA_LONG = 7 -KSTAT_DATA_ULONG = 8 -KSTAT_DATA_LONGLONG = KSTAT_DATA_INT64 -KSTAT_DATA_ULONGLONG = KSTAT_DATA_UINT64 -KSTAT_DATA_FLOAT = 5 -KSTAT_DATA_DOUBLE = 6 -KSTAT_INTR_HARD = 0 -KSTAT_INTR_SOFT = 1 -KSTAT_INTR_WATCHDOG = 2 -KSTAT_INTR_SPURIOUS = 3 -KSTAT_INTR_MULTSVC = 4 -KSTAT_NUM_INTRS = 5 -B_BUSY = 0x0001 -B_DONE = 0x0002 -B_ERROR = 0x0004 -B_PAGEIO = 0x0010 -B_PHYS = 0x0020 -B_READ = 0x0040 -B_WRITE = 0x0100 -B_KERNBUF = 0x0008 -B_WANTED = 0x0080 -B_AGE = 0x000200 -B_ASYNC = 0x000400 -B_DELWRI = 0x000800 -B_STALE = 0x001000 -B_DONTNEED = 0x002000 -B_REMAPPED = 0x004000 -B_FREE = 0x008000 -B_INVAL = 0x010000 -B_FORCE = 0x020000 -B_HEAD = 0x040000 -B_NOCACHE = 0x080000 -B_TRUNC = 0x100000 -B_SHADOW = 0x200000 -B_RETRYWRI = 0x400000 -def notavail(bp): return \ - -def BWRITE(bp): return \ - -def BWRITE2(bp): return \ - - -# Included from sys/aio_req.h - -# Included from sys/uio.h -from TYPES import * -WP_NOWATCH = 0x01 -WP_SETPROT = 0x02 - -# Included from sys/timer.h -from TYPES import * -_TIMER_MAX = 32 -ITLK_LOCKED = 0x01 -ITLK_WANTED = 0x02 -ITLK_REMOVE = 0x04 -IT_PERLWP = 0x01 -IT_SIGNAL = 0x02 - -# Included from sys/utrap.h -UT_INSTRUCTION_DISABLED = 1 -UT_INSTRUCTION_ERROR = 2 -UT_INSTRUCTION_PROTECTION = 3 -UT_ILLTRAP_INSTRUCTION = 4 -UT_ILLEGAL_INSTRUCTION = 5 -UT_PRIVILEGED_OPCODE = 6 -UT_FP_DISABLED = 7 -UT_FP_EXCEPTION_IEEE_754 = 8 -UT_FP_EXCEPTION_OTHER = 9 -UT_TAG_OVERFLOW = 10 -UT_DIVISION_BY_ZERO = 11 -UT_DATA_EXCEPTION = 12 -UT_DATA_ERROR = 13 -UT_DATA_PROTECTION = 14 -UT_MEM_ADDRESS_NOT_ALIGNED = 15 -UT_PRIVILEGED_ACTION = 16 -UT_ASYNC_DATA_ERROR = 17 -UT_TRAP_INSTRUCTION_16 = 18 -UT_TRAP_INSTRUCTION_17 = 19 -UT_TRAP_INSTRUCTION_18 = 20 -UT_TRAP_INSTRUCTION_19 = 21 -UT_TRAP_INSTRUCTION_20 = 22 -UT_TRAP_INSTRUCTION_21 = 23 -UT_TRAP_INSTRUCTION_22 = 24 -UT_TRAP_INSTRUCTION_23 = 25 -UT_TRAP_INSTRUCTION_24 = 26 -UT_TRAP_INSTRUCTION_25 = 27 -UT_TRAP_INSTRUCTION_26 = 28 -UT_TRAP_INSTRUCTION_27 = 29 -UT_TRAP_INSTRUCTION_28 = 30 -UT_TRAP_INSTRUCTION_29 = 31 -UT_TRAP_INSTRUCTION_30 = 32 -UT_TRAP_INSTRUCTION_31 = 33 -UTRAP_V8P_FP_DISABLED = UT_FP_DISABLED -UTRAP_V8P_MEM_ADDRESS_NOT_ALIGNED = UT_MEM_ADDRESS_NOT_ALIGNED -UT_PRECISE_MAXTRAPS = 33 - -# Included from sys/refstr.h - -# Included from sys/task.h -from TYPES import * -TASK_NORMAL = 0x0 -TASK_FINAL = 0x1 -TASK_FINALITY = 0x1 - -# Included from sys/id_space.h -from TYPES import * - -# Included from sys/vmem.h -from TYPES import * -VM_SLEEP = 0x00000000 -VM_NOSLEEP = 0x00000001 -VM_PANIC = 0x00000002 -VM_KMFLAGS = 0x000000ff -VM_BESTFIT = 0x00000100 -VMEM_ALLOC = 0x01 -VMEM_FREE = 0x02 -VMEM_SPAN = 0x10 -ISP_NORMAL = 0x0 -ISP_RESERVE = 0x1 - -# Included from sys/exacct_impl.h -from TYPES import * - -# Included from sys/kmem.h -from TYPES import * -KM_SLEEP = 0x0000 -KM_NOSLEEP = 0x0001 -KM_PANIC = 0x0002 -KM_VMFLAGS = 0x00ff -KM_FLAGS = 0xffff -KMC_NOTOUCH = 0x00010000 -KMC_NODEBUG = 0x00020000 -KMC_NOMAGAZINE = 0x00040000 -KMC_NOHASH = 0x00080000 -KMC_QCACHE = 0x00100000 -_ISA_IA32 = 0 -_ISA_IA64 = 1 -SSLEEP = 1 -SRUN = 2 -SZOMB = 3 -SSTOP = 4 -SIDL = 5 -SONPROC = 6 -CLDPEND = 0x0001 -CLDCONT = 0x0002 -SSYS = 0x00000001 -STRC = 0x00000002 -SLOAD = 0x00000008 -SLOCK = 0x00000010 -SPREXEC = 0x00000020 -SPROCTR = 0x00000040 -SPRFORK = 0x00000080 -SKILLED = 0x00000100 -SULOAD = 0x00000200 -SRUNLCL = 0x00000400 -SBPTADJ = 0x00000800 -SKILLCL = 0x00001000 -SOWEUPC = 0x00002000 -SEXECED = 0x00004000 -SPASYNC = 0x00008000 -SJCTL = 0x00010000 -SNOWAIT = 0x00020000 -SVFORK = 0x00040000 -SVFWAIT = 0x00080000 -EXITLWPS = 0x00100000 -HOLDFORK = 0x00200000 -SWAITSIG = 0x00400000 -HOLDFORK1 = 0x00800000 -COREDUMP = 0x01000000 -SMSACCT = 0x02000000 -ASLWP = 0x04000000 -SPRLOCK = 0x08000000 -NOCD = 0x10000000 -HOLDWATCH = 0x20000000 -SMSFORK = 0x40000000 -SDOCORE = 0x80000000 -FORREAL = 0 -JUSTLOOKING = 1 -SUSPEND_NORMAL = 0 -SUSPEND_PAUSE = 1 -NOCLASS = (-1) - -# Included from sys/dditypes.h -DDI_DEVICE_ATTR_V0 = 0x0001 -DDI_NEVERSWAP_ACC = 0x00 -DDI_STRUCTURE_LE_ACC = 0x01 -DDI_STRUCTURE_BE_ACC = 0x02 -DDI_STRICTORDER_ACC = 0x00 -DDI_UNORDERED_OK_ACC = 0x01 -DDI_MERGING_OK_ACC = 0x02 -DDI_LOADCACHING_OK_ACC = 0x03 -DDI_STORECACHING_OK_ACC = 0x04 -DDI_DATA_SZ01_ACC = 1 -DDI_DATA_SZ02_ACC = 2 -DDI_DATA_SZ04_ACC = 4 -DDI_DATA_SZ08_ACC = 8 -VERS_ACCHDL = 0x0001 -DEVID_NONE = 0 -DEVID_SCSI3_WWN = 1 -DEVID_SCSI_SERIAL = 2 -DEVID_FAB = 3 -DEVID_ENCAP = 4 -DEVID_MAXTYPE = 4 - -# Included from sys/varargs.h - -# Included from sys/va_list.h -VA_ALIGN = 8 -def _ARGSIZEOF(t): return ((sizeof (t) + VA_ALIGN - 1) & ~(VA_ALIGN - 1)) - -VA_ALIGN = 8 -def _ARGSIZEOF(t): return ((sizeof (t) + VA_ALIGN - 1) & ~(VA_ALIGN - 1)) - -NSYSCALL = 256 -SE_32RVAL1 = 0x0 -SE_32RVAL2 = 0x1 -SE_64RVAL = 0x2 -SE_RVAL_MASK = 0x3 -SE_LOADABLE = 0x08 -SE_LOADED = 0x10 -SE_NOUNLOAD = 0x20 -SE_ARGC = 0x40 - -# Included from sys/devops.h -from TYPES import * - -# Included from sys/poll.h -POLLIN = 0x0001 -POLLPRI = 0x0002 -POLLOUT = 0x0004 -POLLRDNORM = 0x0040 -POLLWRNORM = POLLOUT -POLLRDBAND = 0x0080 -POLLWRBAND = 0x0100 -POLLNORM = POLLRDNORM -POLLERR = 0x0008 -POLLHUP = 0x0010 -POLLNVAL = 0x0020 -POLLREMOVE = 0x0800 -POLLRDDATA = 0x0200 -POLLNOERR = 0x0400 -POLLCLOSED = 0x8000 - -# Included from vm/as.h - -# Included from vm/seg.h - -# Included from sys/vnode.h -from TYPES import * -VROOT = 0x01 -VNOCACHE = 0x02 -VNOMAP = 0x04 -VDUP = 0x08 -VNOSWAP = 0x10 -VNOMOUNT = 0x20 -VISSWAP = 0x40 -VSWAPLIKE = 0x80 -VVFSLOCK = 0x100 -VVFSWAIT = 0x200 -VVMLOCK = 0x400 -VDIROPEN = 0x800 -VVMEXEC = 0x1000 -VPXFS = 0x2000 -AT_TYPE = 0x0001 -AT_MODE = 0x0002 -AT_UID = 0x0004 -AT_GID = 0x0008 -AT_FSID = 0x0010 -AT_NODEID = 0x0020 -AT_NLINK = 0x0040 -AT_SIZE = 0x0080 -AT_ATIME = 0x0100 -AT_MTIME = 0x0200 -AT_CTIME = 0x0400 -AT_RDEV = 0x0800 -AT_BLKSIZE = 0x1000 -AT_NBLOCKS = 0x2000 -AT_VCODE = 0x4000 -AT_ALL = (AT_TYPE|AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\ - AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|\ - AT_RDEV|AT_BLKSIZE|AT_NBLOCKS|AT_VCODE) -AT_STAT = (AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\ - AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV) -AT_TIMES = (AT_ATIME|AT_MTIME|AT_CTIME) -AT_NOSET = (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\ - AT_BLKSIZE|AT_NBLOCKS|AT_VCODE) -VSUID = 0o4000 -VSGID = 0o2000 -VSVTX = 0o1000 -VREAD = 0o0400 -VWRITE = 0o0200 -VEXEC = 0o0100 -MODEMASK = 0o7777 -PERMMASK = 0o0777 -def MANDMODE(mode): return (((mode) & (VSGID|(VEXEC>>3))) == VSGID) - -VSA_ACL = 0x0001 -VSA_ACLCNT = 0x0002 -VSA_DFACL = 0x0004 -VSA_DFACLCNT = 0x0008 -LOOKUP_DIR = 0x01 -DUMP_ALLOC = 0 -DUMP_FREE = 1 -DUMP_SCAN = 2 -ATTR_UTIME = 0x01 -ATTR_EXEC = 0x02 -ATTR_COMM = 0x04 -ATTR_HINT = 0x08 -ATTR_REAL = 0x10 - -# Included from vm/faultcode.h -FC_HWERR = 0x1 -FC_ALIGN = 0x2 -FC_OBJERR = 0x3 -FC_PROT = 0x4 -FC_NOMAP = 0x5 -FC_NOSUPPORT = 0x6 -def FC_MAKE_ERR(e): return (((e) << 8) | FC_OBJERR) - -def FC_CODE(fc): return ((fc) & 0xff) - -def FC_ERRNO(fc): return ((unsigned)(fc) >> 8) - - -# Included from vm/hat.h -from TYPES import * - -# Included from vm/page.h -PAGE_HASHAVELEN = 4 -PAGE_HASHVPSHIFT = 6 -PG_EXCL = 0x0001 -PG_WAIT = 0x0002 -PG_PHYSCONTIG = 0x0004 -PG_MATCH_COLOR = 0x0008 -PG_NORELOC = 0x0010 -PG_FREE_LIST = 1 -PG_CACHE_LIST = 2 -PG_LIST_TAIL = 0 -PG_LIST_HEAD = 1 -def page_next_raw(PP): return page_nextn_raw((PP), 1) - -PAGE_IO_INUSE = 0x1 -PAGE_IO_WANTED = 0x2 -PGREL_NOTREL = 0x1 -PGREL_CLEAN = 0x2 -PGREL_MOD = 0x3 -P_FREE = 0x80 -P_NORELOC = 0x40 -def PP_SETAGED(pp): return ASSERT(PP_ISAGED(pp)) - -HAT_FLAGS_RESV = 0xFF000000 -HAT_LOAD = 0x00 -HAT_LOAD_LOCK = 0x01 -HAT_LOAD_ADV = 0x04 -HAT_LOAD_CONTIG = 0x10 -HAT_LOAD_NOCONSIST = 0x20 -HAT_LOAD_SHARE = 0x40 -HAT_LOAD_REMAP = 0x80 -HAT_RELOAD_SHARE = 0x100 -HAT_PLAT_ATTR_MASK = 0xF00000 -HAT_PROT_MASK = 0x0F -HAT_NOFAULT = 0x10 -HAT_NOSYNC = 0x20 -HAT_STRICTORDER = 0x0000 -HAT_UNORDERED_OK = 0x0100 -HAT_MERGING_OK = 0x0200 -HAT_LOADCACHING_OK = 0x0300 -HAT_STORECACHING_OK = 0x0400 -HAT_ORDER_MASK = 0x0700 -HAT_NEVERSWAP = 0x0000 -HAT_STRUCTURE_BE = 0x1000 -HAT_STRUCTURE_LE = 0x2000 -HAT_ENDIAN_MASK = 0x3000 -HAT_COW = 0x0001 -HAT_UNLOAD = 0x00 -HAT_UNLOAD_NOSYNC = 0x02 -HAT_UNLOAD_UNLOCK = 0x04 -HAT_UNLOAD_OTHER = 0x08 -HAT_UNLOAD_UNMAP = 0x10 -HAT_SYNC_DONTZERO = 0x00 -HAT_SYNC_ZERORM = 0x01 -HAT_SYNC_STOPON_REF = 0x02 -HAT_SYNC_STOPON_MOD = 0x04 -HAT_SYNC_STOPON_RM = (HAT_SYNC_STOPON_REF | HAT_SYNC_STOPON_MOD) -HAT_DUP_ALL = 1 -HAT_DUP_COW = 2 -HAT_MAP = 0x00 -HAT_ADV_PGUNLOAD = 0x00 -HAT_FORCE_PGUNLOAD = 0x01 -P_MOD = 0x1 -P_REF = 0x2 -P_RO = 0x4 -def hat_ismod(pp): return (hat_page_getattr(pp, P_MOD)) - -def hat_isref(pp): return (hat_page_getattr(pp, P_REF)) - -def hat_isro(pp): return (hat_page_getattr(pp, P_RO)) - -def hat_setmod(pp): return (hat_page_setattr(pp, P_MOD)) - -def hat_setref(pp): return (hat_page_setattr(pp, P_REF)) - -def hat_setrefmod(pp): return (hat_page_setattr(pp, P_REF|P_MOD)) - -def hat_clrmod(pp): return (hat_page_clrattr(pp, P_MOD)) - -def hat_clrref(pp): return (hat_page_clrattr(pp, P_REF)) - -def hat_clrrefmod(pp): return (hat_page_clrattr(pp, P_REF|P_MOD)) - -def hat_page_is_mapped(pp): return (hat_page_getshare(pp)) - -HAT_DONTALLOC = 0 -HAT_ALLOC = 1 -HRM_SHIFT = 4 -HRM_BYTES = (1 << HRM_SHIFT) -HRM_PAGES = ((HRM_BYTES * NBBY) / 2) -HRM_PGPERBYTE = (NBBY/2) -HRM_PGBYTEMASK = (HRM_PGPERBYTE-1) -HRM_HASHSIZE = 0x200 -HRM_HASHMASK = (HRM_HASHSIZE - 1) -HRM_BLIST_INCR = 0x200 -HRM_SWSMONID = 1 -SSL_NLEVELS = 4 -SSL_BFACTOR = 4 -SSL_LOG2BF = 2 -SEGP_ASYNC_FLUSH = 0x1 -SEGP_FORCE_WIRED = 0x2 -SEGP_SUCCESS = 0 -SEGP_FAIL = 1 -def seg_pages(seg): return \ - -IE_NOMEM = -1 -AS_PAGLCK = 0x80 -AS_CLAIMGAP = 0x40 -AS_UNMAPWAIT = 0x20 -def AS_TYPE_64BIT(as_): return \ - -AS_LREP_LINKEDLIST = 0 -AS_LREP_SKIPLIST = 1 -AS_MUTATION_THRESH = 225 -AH_DIR = 0x1 -AH_LO = 0x0 -AH_HI = 0x1 -AH_CONTAIN = 0x2 - -# Included from sys/ddidmareq.h -DMA_UNIT_8 = 1 -DMA_UNIT_16 = 2 -DMA_UNIT_32 = 4 -DMALIM_VER0 = ((0x86000000) + 0) -DDI_DMA_FORCE_PHYSICAL = 0x0100 -DMA_ATTR_V0 = 0 -DMA_ATTR_VERSION = DMA_ATTR_V0 -DDI_DMA_CALLBACK_RUNOUT = 0 -DDI_DMA_CALLBACK_DONE = 1 -DDI_DMA_WRITE = 0x0001 -DDI_DMA_READ = 0x0002 -DDI_DMA_RDWR = (DDI_DMA_READ | DDI_DMA_WRITE) -DDI_DMA_REDZONE = 0x0004 -DDI_DMA_PARTIAL = 0x0008 -DDI_DMA_CONSISTENT = 0x0010 -DDI_DMA_EXCLUSIVE = 0x0020 -DDI_DMA_STREAMING = 0x0040 -DDI_DMA_SBUS_64BIT = 0x2000 -DDI_DMA_MAPPED = 0 -DDI_DMA_MAPOK = 0 -DDI_DMA_PARTIAL_MAP = 1 -DDI_DMA_DONE = 2 -DDI_DMA_NORESOURCES = -1 -DDI_DMA_NOMAPPING = -2 -DDI_DMA_TOOBIG = -3 -DDI_DMA_TOOSMALL = -4 -DDI_DMA_LOCKED = -5 -DDI_DMA_BADLIMITS = -6 -DDI_DMA_STALE = -7 -DDI_DMA_BADATTR = -8 -DDI_DMA_INUSE = -9 -DDI_DMA_SYNC_FORDEV = 0x0 -DDI_DMA_SYNC_FORCPU = 0x1 -DDI_DMA_SYNC_FORKERNEL = 0x2 - -# Included from sys/ddimapreq.h - -# Included from sys/mman.h -PROT_READ = 0x1 -PROT_WRITE = 0x2 -PROT_EXEC = 0x4 -PROT_USER = 0x8 -PROT_ZFOD = (PROT_READ | PROT_WRITE | PROT_EXEC | PROT_USER) -PROT_ALL = (PROT_READ | PROT_WRITE | PROT_EXEC | PROT_USER) -PROT_NONE = 0x0 -MAP_SHARED = 1 -MAP_PRIVATE = 2 -MAP_TYPE = 0xf -MAP_FIXED = 0x10 -MAP_NORESERVE = 0x40 -MAP_ANON = 0x100 -MAP_ANONYMOUS = MAP_ANON -MAP_RENAME = 0x20 -PROC_TEXT = (PROT_EXEC | PROT_READ) -PROC_DATA = (PROT_READ | PROT_WRITE | PROT_EXEC) -SHARED = 0x10 -PRIVATE = 0x20 -VALID_ATTR = (PROT_READ|PROT_WRITE|PROT_EXEC|SHARED|PRIVATE) -PROT_EXCL = 0x20 -_MAP_LOW32 = 0x80 -_MAP_NEW = 0x80000000 -from TYPES import * -MADV_NORMAL = 0 -MADV_RANDOM = 1 -MADV_SEQUENTIAL = 2 -MADV_WILLNEED = 3 -MADV_DONTNEED = 4 -MADV_FREE = 5 -MS_OLDSYNC = 0x0 -MS_SYNC = 0x4 -MS_ASYNC = 0x1 -MS_INVALIDATE = 0x2 -MC_SYNC = 1 -MC_LOCK = 2 -MC_UNLOCK = 3 -MC_ADVISE = 4 -MC_LOCKAS = 5 -MC_UNLOCKAS = 6 -MCL_CURRENT = 0x1 -MCL_FUTURE = 0x2 -DDI_MAP_VERSION = 0x0001 -DDI_MF_USER_MAPPING = 0x1 -DDI_MF_KERNEL_MAPPING = 0x2 -DDI_MF_DEVICE_MAPPING = 0x4 -DDI_ME_GENERIC = (-1) -DDI_ME_UNIMPLEMENTED = (-2) -DDI_ME_NORESOURCES = (-3) -DDI_ME_UNSUPPORTED = (-4) -DDI_ME_REGSPEC_RANGE = (-5) -DDI_ME_RNUMBER_RANGE = (-6) -DDI_ME_INVAL = (-7) - -# Included from sys/ddipropdefs.h -def CELLS_1275_TO_BYTES(n): return ((n) * PROP_1275_CELL_SIZE) - -def BYTES_TO_1275_CELLS(n): return ((n) / PROP_1275_CELL_SIZE) - -PH_FROM_PROM = 0x01 -DDI_PROP_SUCCESS = 0 -DDI_PROP_NOT_FOUND = 1 -DDI_PROP_UNDEFINED = 2 -DDI_PROP_NO_MEMORY = 3 -DDI_PROP_INVAL_ARG = 4 -DDI_PROP_BUF_TOO_SMALL = 5 -DDI_PROP_CANNOT_DECODE = 6 -DDI_PROP_CANNOT_ENCODE = 7 -DDI_PROP_END_OF_DATA = 8 -DDI_PROP_FOUND_1275 = 255 -PROP_1275_INT_SIZE = 4 -DDI_PROP_DONTPASS = 0x0001 -DDI_PROP_CANSLEEP = 0x0002 -DDI_PROP_SYSTEM_DEF = 0x0004 -DDI_PROP_NOTPROM = 0x0008 -DDI_PROP_DONTSLEEP = 0x0010 -DDI_PROP_STACK_CREATE = 0x0020 -DDI_PROP_UNDEF_IT = 0x0040 -DDI_PROP_HW_DEF = 0x0080 -DDI_PROP_TYPE_INT = 0x0100 -DDI_PROP_TYPE_STRING = 0x0200 -DDI_PROP_TYPE_BYTE = 0x0400 -DDI_PROP_TYPE_COMPOSITE = 0x0800 -DDI_PROP_TYPE_ANY = (DDI_PROP_TYPE_INT | \ - DDI_PROP_TYPE_STRING | \ - DDI_PROP_TYPE_BYTE | \ - DDI_PROP_TYPE_COMPOSITE) -DDI_PROP_TYPE_MASK = (DDI_PROP_TYPE_INT | \ - DDI_PROP_TYPE_STRING | \ - DDI_PROP_TYPE_BYTE | \ - DDI_PROP_TYPE_COMPOSITE) -DDI_RELATIVE_ADDRESSING = "relative-addressing" -DDI_GENERIC_ADDRESSING = "generic-addressing" - -# Included from sys/ddidevmap.h -KMEM_PAGEABLE = 0x100 -KMEM_NON_PAGEABLE = 0x200 -UMEM_LOCKED = 0x400 -UMEM_TRASH = 0x800 -DEVMAP_OPS_REV = 1 -DEVMAP_DEFAULTS = 0x00 -DEVMAP_MAPPING_INVALID = 0x01 -DEVMAP_ALLOW_REMAP = 0x02 -DEVMAP_USE_PAGESIZE = 0x04 -DEVMAP_SETUP_FLAGS = \ - (DEVMAP_MAPPING_INVALID | DEVMAP_ALLOW_REMAP | DEVMAP_USE_PAGESIZE) -DEVMAP_SETUP_DONE = 0x100 -DEVMAP_LOCK_INITED = 0x200 -DEVMAP_FAULTING = 0x400 -DEVMAP_LOCKED = 0x800 -DEVMAP_FLAG_LARGE = 0x1000 -DDI_UMEM_SLEEP = 0x0 -DDI_UMEM_NOSLEEP = 0x01 -DDI_UMEM_PAGEABLE = 0x02 -DDI_UMEM_TRASH = 0x04 -DDI_UMEMLOCK_READ = 0x01 -DDI_UMEMLOCK_WRITE = 0x02 - -# Included from sys/nexusdefs.h - -# Included from sys/nexusintr.h -BUSO_REV = 4 -BUSO_REV_3 = 3 -BUSO_REV_4 = 4 -DEVO_REV = 3 -CB_REV = 1 -DDI_IDENTIFIED = (0) -DDI_NOT_IDENTIFIED = (-1) -DDI_PROBE_FAILURE = ENXIO -DDI_PROBE_DONTCARE = 0 -DDI_PROBE_PARTIAL = 1 -DDI_PROBE_SUCCESS = 2 -MAPDEV_REV = 1 -from TYPES import * -D_NEW = 0x00 -_D_OLD = 0x01 -D_TAPE = 0x08 -D_MTSAFE = 0x0020 -_D_QNEXTLESS = 0x0040 -_D_MTOCSHARED = 0x0080 -D_MTOCEXCL = 0x0800 -D_MTPUTSHARED = 0x1000 -D_MTPERQ = 0x2000 -D_MTQPAIR = 0x4000 -D_MTPERMOD = 0x6000 -D_MTOUTPERIM = 0x8000 -_D_MTCBSHARED = 0x10000 -D_MTINNER_MOD = (D_MTPUTSHARED|_D_MTOCSHARED|_D_MTCBSHARED) -D_MTOUTER_MOD = (D_MTOCEXCL) -D_MP = D_MTSAFE -D_64BIT = 0x200 -D_SYNCSTR = 0x400 -D_DEVMAP = 0x100 -D_HOTPLUG = 0x4 -SNDZERO = 0x001 -SNDPIPE = 0x002 -RNORM = 0x000 -RMSGD = 0x001 -RMSGN = 0x002 -RMODEMASK = 0x003 -RPROTDAT = 0x004 -RPROTDIS = 0x008 -RPROTNORM = 0x010 -RPROTMASK = 0x01c -RFLUSHMASK = 0x020 -RFLUSHPCPROT = 0x020 -RERRNORM = 0x001 -RERRNONPERSIST = 0x002 -RERRMASK = (RERRNORM|RERRNONPERSIST) -WERRNORM = 0x004 -WERRNONPERSIST = 0x008 -WERRMASK = (WERRNORM|WERRNONPERSIST) -FLUSHR = 0x01 -FLUSHW = 0x02 -FLUSHRW = 0x03 -FLUSHBAND = 0x04 -MAPINOK = 0x01 -NOMAPIN = 0x02 -REMAPOK = 0x04 -NOREMAP = 0x08 -S_INPUT = 0x0001 -S_HIPRI = 0x0002 -S_OUTPUT = 0x0004 -S_MSG = 0x0008 -S_ERROR = 0x0010 -S_HANGUP = 0x0020 -S_RDNORM = 0x0040 -S_WRNORM = S_OUTPUT -S_RDBAND = 0x0080 -S_WRBAND = 0x0100 -S_BANDURG = 0x0200 -RS_HIPRI = 0x01 -STRUIO_POSTPONE = 0x08 -STRUIO_MAPIN = 0x10 -MSG_HIPRI = 0x01 -MSG_ANY = 0x02 -MSG_BAND = 0x04 -MSG_XPG4 = 0x08 -MSG_IPEEK = 0x10 -MSG_DISCARDTAIL = 0x20 -MSG_HOLDSIG = 0x40 -MSG_IGNERROR = 0x80 -MSG_DELAYERROR = 0x100 -MSG_IGNFLOW = 0x200 -MSG_NOMARK = 0x400 -MORECTL = 1 -MOREDATA = 2 -MUXID_ALL = (-1) -ANYMARK = 0x01 -LASTMARK = 0x02 -_INFTIM = -1 -INFTIM = _INFTIM diff --git a/Lib/plat-sunos5/TYPES.py b/Lib/plat-sunos5/TYPES.py deleted file mode 100644 index da4e6b1..0000000 --- a/Lib/plat-sunos5/TYPES.py +++ /dev/null @@ -1,313 +0,0 @@ -# Generated by h2py from /usr/include/sys/types.h - -# Included from sys/isa_defs.h -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 8 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 -_ALIGNMENT_REQUIRED = 1 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 4 -_DOUBLE_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 4 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 4 -_ALIGNMENT_REQUIRED = 0 -_CHAR_ALIGNMENT = 1 -_SHORT_ALIGNMENT = 2 -_INT_ALIGNMENT = 4 -_LONG_LONG_ALIGNMENT = 8 -_DOUBLE_ALIGNMENT = 8 -_ALIGNMENT_REQUIRED = 1 -_LONG_ALIGNMENT = 4 -_LONG_DOUBLE_ALIGNMENT = 8 -_POINTER_ALIGNMENT = 4 -_MAX_ALIGNMENT = 8 -_LONG_ALIGNMENT = 8 -_LONG_DOUBLE_ALIGNMENT = 16 -_POINTER_ALIGNMENT = 8 -_MAX_ALIGNMENT = 16 - -# Included from sys/feature_tests.h -_POSIX_C_SOURCE = 1 -_LARGEFILE64_SOURCE = 1 -_LARGEFILE_SOURCE = 1 -_FILE_OFFSET_BITS = 64 -_FILE_OFFSET_BITS = 32 -_POSIX_C_SOURCE = 199506 -_POSIX_PTHREAD_SEMANTICS = 1 -_XOPEN_VERSION = 500 -_XOPEN_VERSION = 4 -_XOPEN_VERSION = 3 - -# Included from sys/machtypes.h - -# Included from sys/inttypes.h - -# Included from sys/int_types.h - -# Included from sys/int_limits.h -INT8_MAX = (127) -INT16_MAX = (32767) -INT32_MAX = (2147483647) -INTMAX_MAX = INT32_MAX -INT_LEAST8_MAX = INT8_MAX -INT_LEAST16_MAX = INT16_MAX -INT_LEAST32_MAX = INT32_MAX -INT8_MIN = (-128) -INT16_MIN = (-32767-1) -INT32_MIN = (-2147483647-1) -INTMAX_MIN = INT32_MIN -INT_LEAST8_MIN = INT8_MIN -INT_LEAST16_MIN = INT16_MIN -INT_LEAST32_MIN = INT32_MIN - -# Included from sys/int_const.h -def INT8_C(c): return (c) - -def INT16_C(c): return (c) - -def INT32_C(c): return (c) - -def INT64_C(c): return __CONCAT__(c,l) - -def INT64_C(c): return __CONCAT__(c,ll) - -def UINT8_C(c): return __CONCAT__(c,u) - -def UINT16_C(c): return __CONCAT__(c,u) - -def UINT32_C(c): return __CONCAT__(c,u) - -def UINT64_C(c): return __CONCAT__(c,ul) - -def UINT64_C(c): return __CONCAT__(c,ull) - -def INTMAX_C(c): return __CONCAT__(c,l) - -def UINTMAX_C(c): return __CONCAT__(c,ul) - -def INTMAX_C(c): return __CONCAT__(c,ll) - -def UINTMAX_C(c): return __CONCAT__(c,ull) - -def INTMAX_C(c): return (c) - -def UINTMAX_C(c): return (c) - - -# Included from sys/int_fmtio.h -PRId8 = "d" -PRId16 = "d" -PRId32 = "d" -PRId64 = "ld" -PRId64 = "lld" -PRIdLEAST8 = "d" -PRIdLEAST16 = "d" -PRIdLEAST32 = "d" -PRIdLEAST64 = "ld" -PRIdLEAST64 = "lld" -PRIi8 = "i" -PRIi16 = "i" -PRIi32 = "i" -PRIi64 = "li" -PRIi64 = "lli" -PRIiLEAST8 = "i" -PRIiLEAST16 = "i" -PRIiLEAST32 = "i" -PRIiLEAST64 = "li" -PRIiLEAST64 = "lli" -PRIo8 = "o" -PRIo16 = "o" -PRIo32 = "o" -PRIo64 = "lo" -PRIo64 = "llo" -PRIoLEAST8 = "o" -PRIoLEAST16 = "o" -PRIoLEAST32 = "o" -PRIoLEAST64 = "lo" -PRIoLEAST64 = "llo" -PRIx8 = "x" -PRIx16 = "x" -PRIx32 = "x" -PRIx64 = "lx" -PRIx64 = "llx" -PRIxLEAST8 = "x" -PRIxLEAST16 = "x" -PRIxLEAST32 = "x" -PRIxLEAST64 = "lx" -PRIxLEAST64 = "llx" -PRIX8 = "X" -PRIX16 = "X" -PRIX32 = "X" -PRIX64 = "lX" -PRIX64 = "llX" -PRIXLEAST8 = "X" -PRIXLEAST16 = "X" -PRIXLEAST32 = "X" -PRIXLEAST64 = "lX" -PRIXLEAST64 = "llX" -PRIu8 = "u" -PRIu16 = "u" -PRIu32 = "u" -PRIu64 = "lu" -PRIu64 = "llu" -PRIuLEAST8 = "u" -PRIuLEAST16 = "u" -PRIuLEAST32 = "u" -PRIuLEAST64 = "lu" -PRIuLEAST64 = "llu" -SCNd16 = "hd" -SCNd32 = "d" -SCNd64 = "ld" -SCNd64 = "lld" -SCNi16 = "hi" -SCNi32 = "i" -SCNi64 = "li" -SCNi64 = "lli" -SCNo16 = "ho" -SCNo32 = "o" -SCNo64 = "lo" -SCNo64 = "llo" -SCNu16 = "hu" -SCNu32 = "u" -SCNu64 = "lu" -SCNu64 = "llu" -SCNx16 = "hx" -SCNx32 = "x" -SCNx64 = "lx" -SCNx64 = "llx" -PRIdMAX = "ld" -PRIoMAX = "lo" -PRIxMAX = "lx" -PRIuMAX = "lu" -PRIdMAX = "lld" -PRIoMAX = "llo" -PRIxMAX = "llx" -PRIuMAX = "llu" -PRIdMAX = "d" -PRIoMAX = "o" -PRIxMAX = "x" -PRIuMAX = "u" -SCNiMAX = "li" -SCNdMAX = "ld" -SCNoMAX = "lo" -SCNxMAX = "lx" -SCNiMAX = "lli" -SCNdMAX = "lld" -SCNoMAX = "llo" -SCNxMAX = "llx" -SCNiMAX = "i" -SCNdMAX = "d" -SCNoMAX = "o" -SCNxMAX = "x" - -# Included from sys/types32.h -SHRT_MIN = (-32768) -SHRT_MAX = 32767 -USHRT_MAX = 65535 -INT_MIN = (-2147483647-1) -INT_MAX = 2147483647 -LONG_MIN = (-9223372036854775807-1) -LONG_MAX = 9223372036854775807 -LONG_MIN = (-2147483647-1) -LONG_MAX = 2147483647 -P_MYID = (-1) - -# Included from sys/select.h - -# Included from sys/time.h -TIME32_MAX = INT32_MAX -TIME32_MIN = INT32_MIN -def TIMEVAL_OVERFLOW(tv): return \ - -from TYPES import * -DST_NONE = 0 -DST_USA = 1 -DST_AUST = 2 -DST_WET = 3 -DST_MET = 4 -DST_EET = 5 -DST_CAN = 6 -DST_GB = 7 -DST_RUM = 8 -DST_TUR = 9 -DST_AUSTALT = 10 -ITIMER_REAL = 0 -ITIMER_VIRTUAL = 1 -ITIMER_PROF = 2 -ITIMER_REALPROF = 3 -def ITIMERVAL_OVERFLOW(itv): return \ - -SEC = 1 -MILLISEC = 1000 -MICROSEC = 1000000 -NANOSEC = 1000000000 - -# Included from sys/time_impl.h -def TIMESPEC_OVERFLOW(ts): return \ - -def ITIMERSPEC_OVERFLOW(it): return \ - -__CLOCK_REALTIME0 = 0 -CLOCK_VIRTUAL = 1 -CLOCK_PROF = 2 -__CLOCK_REALTIME3 = 3 -CLOCK_HIGHRES = 4 -CLOCK_MAX = 5 -CLOCK_REALTIME = __CLOCK_REALTIME3 -CLOCK_REALTIME = __CLOCK_REALTIME0 -TIMER_RELTIME = 0x0 -TIMER_ABSTIME = 0x1 - -# Included from sys/mutex.h -from TYPES import * -def MUTEX_HELD(x): return (mutex_owned(x)) - -def TICK_TO_SEC(tick): return ((tick) / hz) - -def SEC_TO_TICK(sec): return ((sec) * hz) - -def TICK_TO_MSEC(tick): return \ - -def MSEC_TO_TICK(msec): return \ - -def MSEC_TO_TICK_ROUNDUP(msec): return \ - -def TICK_TO_USEC(tick): return ((tick) * usec_per_tick) - -def USEC_TO_TICK(usec): return ((usec) / usec_per_tick) - -def USEC_TO_TICK_ROUNDUP(usec): return \ - -def TICK_TO_NSEC(tick): return ((tick) * nsec_per_tick) - -def NSEC_TO_TICK(nsec): return ((nsec) / nsec_per_tick) - -def NSEC_TO_TICK_ROUNDUP(nsec): return \ - -def TIMEVAL_TO_TICK(tvp): return \ - -def TIMESTRUC_TO_TICK(tsp): return \ - - -# Included from time.h -from TYPES import * - -# Included from iso/time_iso.h -NULL = 0 -NULL = 0 -CLOCKS_PER_SEC = 1000000 -FD_SETSIZE = 65536 -FD_SETSIZE = 1024 -_NBBY = 8 -NBBY = _NBBY -def FD_ZERO(p): return bzero((p), sizeof (*(p))) diff --git a/Lib/plat-sunos5/regen b/Lib/plat-sunos5/regen deleted file mode 100755 index 78cb7de..0000000 --- a/Lib/plat-sunos5/regen +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh -case `uname -sr` in -'SunOS 5.'*) ;; -*) echo Probably not on a Solaris 2 system 1>&2 - exit 1;; -esac -set -v -h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/sys/stropts.h /usr/include/dlfcn.h - diff --git a/Lib/plat-unixware7/IN.py b/Lib/plat-unixware7/IN.py deleted file mode 100644 index af023b4..0000000 --- a/Lib/plat-unixware7/IN.py +++ /dev/null @@ -1,836 +0,0 @@ -# Generated by h2py from /usr/include/netinet/in.h - -# Included from netinet/in_f.h -def IN_CLASSA(i): return (((int)(i) & 0x80000000) == 0) - -IN_CLASSA_NET = 0xff000000 -IN_CLASSA_NSHIFT = 24 -IN_CLASSA_HOST = 0x00ffffff -IN_CLASSA_MAX = 128 -def IN_CLASSB(i): return (((int)(i) & 0xc0000000) == 0x80000000) - -IN_CLASSB_NET = 0xffff0000 -IN_CLASSB_NSHIFT = 16 -IN_CLASSB_HOST = 0x0000ffff -IN_CLASSB_MAX = 65536 -def IN_CLASSC(i): return (((int)(i) & 0xe0000000) == 0xc0000000) - -IN_CLASSC_NET = 0xffffff00 -IN_CLASSC_NSHIFT = 8 -IN_CLASSC_HOST = 0x000000ff -def IN_CLASSD(i): return (((int)(i) & 0xf0000000) == 0xe0000000) - -IN_CLASSD_NET = 0xf0000000 -IN_CLASSD_NSHIFT = 28 -IN_CLASSD_HOST = 0x0fffffff -def IN_MULTICAST(i): return IN_CLASSD(i) - -def IN_EXPERIMENTAL(i): return (((int)(i) & 0xe0000000) == 0xe0000000) - -def IN_BADCLASS(i): return (((int)(i) & 0xf0000000) == 0xf0000000) - -INADDR_ANY = 0x00000000 -INADDR_LOOPBACK = 0x7f000001 -INADDR_BROADCAST = 0xffffffff -INADDR_NONE = 0xffffffff -IN_LOOPBACKNET = 127 -INADDR_UNSPEC_GROUP = 0xe0000000 -INADDR_ALLHOSTS_GROUP = 0xe0000001 -INADDR_ALLRTRS_GROUP = 0xe0000002 -INADDR_MAX_LOCAL_GROUP = 0xe00000ff - -# Included from netinet/in6.h - -# Included from sys/types.h -def quad_low(x): return x.val[0] - -ADT_EMASKSIZE = 8 -SHRT_MIN = -32768 -SHRT_MAX = 32767 -INT_MIN = (-2147483647-1) -INT_MAX = 2147483647 -LONG_MIN = (-2147483647-1) -LONG_MAX = 2147483647 -OFF32_MAX = LONG_MAX -ISTAT_ASSERTED = 0 -ISTAT_ASSUMED = 1 -ISTAT_NONE = 2 -OFF_MAX = OFF32_MAX -CLOCK_MAX = LONG_MAX -P_MYID = (-1) -P_MYHOSTID = (-1) - -# Included from sys/select.h -FD_SETSIZE = 4096 -NBBY = 8 -NULL = 0 - -# Included from sys/bitypes.h - -# Included from netinet/in6_f.h -def IN6_IS_ADDR_UNSPECIFIED(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0) - -def IN6_SET_ADDR_UNSPECIFIED(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0) - -def IN6_IS_ADDR_ANY(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0) - -def IN6_SET_ADDR_ANY(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0) - -def IN6_IS_ADDR_LOOPBACK(a): return IN6_ADDR_EQUAL_L(a, 0, 0, 0, 0x01000000) - -def IN6_SET_ADDR_LOOPBACK(a): return IN6_ADDR_COPY_L(a, 0, 0, 0, 0x01000000) - -IN6_MC_FLAG_PERMANENT = 0x0 -IN6_MC_FLAG_TRANSIENT = 0x1 -IN6_MC_SCOPE_NODELOCAL = 0x1 -IN6_MC_SCOPE_LINKLOCAL = 0x2 -IN6_MC_SCOPE_SITELOCAL = 0x5 -IN6_MC_SCOPE_ORGLOCAL = 0x8 -IN6_MC_SCOPE_GLOBAL = 0xE -def IN6_IS_ADDR_MC_NODELOCAL(a): return \ - -def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ - -def IN6_IS_ADDR_MC_SITELOCAL(a): return \ - -def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ - -def IN6_IS_ADDR_MC_GLOBAL(a): return \ - - -# Included from sys/convsa.h -__NETLIB_UW211_SVR4 = 1 -__NETLIB_UW211_XPG4 = 2 -__NETLIB_GEMINI_SVR4 = 3 -__NETLIB_GEMINI_XPG4 = 4 -__NETLIB_FP1_SVR4 = 5 -__NETLIB_FP1_XPG4 = 6 -__NETLIB_BASE_VERSION__ = __NETLIB_UW211_SVR4 -__NETLIB_VERSION__ = __NETLIB_FP1_SVR4 -__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 -__NETLIB_VERSION__ = __NETLIB_GEMINI_SVR4 -__NETLIB_VERSION__ = __NETLIB_GEMINI_XPG4 -__NETLIB_VERSION__ = __NETLIB_UW211_SVR4 -__NETLIB_VERSION__ = __NETLIB_UW211_XPG4 -__NETLIB_VERSION__ = __NETLIB_FP1_XPG4 - -# Included from sys/byteorder.h -LITTLE_ENDIAN = 1234 -BIG_ENDIAN = 4321 -PDP_ENDIAN = 3412 - -# Included from sys/byteorder_f.h -BYTE_ORDER = LITTLE_ENDIAN -def htonl(hl): return __htonl(hl) - -def ntohl(nl): return __ntohl(nl) - -def htons(hs): return __htons(hs) - -def ntohs(ns): return __ntohs(ns) - -def ntohl(x): return (x) - -def ntohs(x): return (x) - -def htonl(x): return (x) - -def htons(x): return (x) - -def __NETLIB_VERSION_IS_XPG4(version): return (((version) % 2) == 0) - -def __NETLIB_VERSION_HAS_SALEN(version): return ((version) >= __NETLIB_GEMINI_SVR4) - -def __NETLIB_VERSION_IS_IKS(version): return ((version) >= __NETLIB_FP1_SVR4) - -def SA_FAMILY_GET(sa): return \ - -INET6_ADDRSTRLEN = 46 -IPV6_UNICAST_HOPS = 3 -IPV6_ADDRFORM = 24 -IPV6_MULTICAST_HOPS = 25 -IPV6_MULTICAST_IF = 26 -IPV6_MULTICAST_LOOP = 27 -IPV6_ADD_MEMBERSHIP = 28 -IPV6_DROP_MEMBERSHIP = 29 - -# Included from sys/insrem.h -def LIST_INIT(head): return \ - -def LIST_INIT(head): return \ - -def remque(a): return REMQUE(a) - - -# Included from sys/socket.h - -# Included from sys/uio.h -SHUT_RD = 0 -SHUT_WR = 1 -SHUT_RDWR = 2 - -# Included from sys/netconfig.h - -# Included from sys/cdefs.h -def __P(protos): return protos - -def __STRING(x): return #x - -def __P(protos): return () - -def __STRING(x): return "x" - -NETCONFIG = "/etc/netconfig" -NETPATH = "NETPATH" -NC_TPI_CLTS = 1 -NC_TPI_COTS = 2 -NC_TPI_COTS_ORD = 3 -NC_TPI_RAW = 4 -NC_NOFLAG = 00 -NC_VISIBLE = 0o1 -NC_BROADCAST = 0o2 -NC_NOPROTOFMLY = "-" -NC_LOOPBACK = "loopback" -NC_INET = "inet" -NC_INET6 = "inet6" -NC_IMPLINK = "implink" -NC_PUP = "pup" -NC_CHAOS = "chaos" -NC_NS = "ns" -NC_NBS = "nbs" -NC_ECMA = "ecma" -NC_DATAKIT = "datakit" -NC_CCITT = "ccitt" -NC_SNA = "sna" -NC_DECNET = "decnet" -NC_DLI = "dli" -NC_LAT = "lat" -NC_HYLINK = "hylink" -NC_APPLETALK = "appletalk" -NC_NIT = "nit" -NC_IEEE802 = "ieee802" -NC_OSI = "osi" -NC_X25 = "x25" -NC_OSINET = "osinet" -NC_GOSIP = "gosip" -NC_NETWARE = "netware" -NC_NOPROTO = "-" -NC_TCP = "tcp" -NC_UDP = "udp" -NC_ICMP = "icmp" -NC_IPX = "ipx" -NC_SPX = "spx" -NC_TPI_CLTS = 1 -NC_TPI_COTS = 2 -NC_TPI_COTS_ORD = 3 -NC_TPI_RAW = 4 -SOCK_STREAM = 2 -SOCK_DGRAM = 1 -SOCK_RAW = 4 -SOCK_RDM = 5 -SOCK_SEQPACKET = 6 -SO_DEBUG = 0x0001 -SO_ACCEPTCONN = 0x0002 -SO_REUSEADDR = 0x0004 -SO_KEEPALIVE = 0x0008 -SO_DONTROUTE = 0x0010 -SO_BROADCAST = 0x0020 -SO_USELOOPBACK = 0x0040 -SO_LINGER = 0x0080 -SO_OOBINLINE = 0x0100 -SO_ORDREL = 0x0200 -SO_IMASOCKET = 0x0400 -SO_MGMT = 0x0800 -SO_REUSEPORT = 0x1000 -SO_LISTENING = 0x2000 -SO_RDWR = 0x4000 -SO_SEMA = 0x8000 -SO_DONTLINGER = (~SO_LINGER) -SO_SNDBUF = 0x1001 -SO_RCVBUF = 0x1002 -SO_SNDLOWAT = 0x1003 -SO_RCVLOWAT = 0x1004 -SO_SNDTIMEO = 0x1005 -SO_RCVTIMEO = 0x1006 -SO_ERROR = 0x1007 -SO_TYPE = 0x1008 -SO_PROTOTYPE = 0x1009 -SO_ALLRAW = 0x100a -SOL_SOCKET = 0xffff -AF_UNSPEC = 0 -AF_UNIX = 1 -AF_LOCAL = AF_UNIX -AF_INET = 2 -AF_IMPLINK = 3 -AF_PUP = 4 -AF_CHAOS = 5 -AF_NS = 6 -AF_NBS = 7 -AF_ECMA = 8 -AF_DATAKIT = 9 -AF_CCITT = 10 -AF_SNA = 11 -AF_DECnet = 12 -AF_DLI = 13 -AF_LAT = 14 -AF_HYLINK = 15 -AF_APPLETALK = 16 -AF_NIT = 17 -AF_802 = 18 -AF_OSI = 19 -AF_ISO = AF_OSI -AF_X25 = 20 -AF_OSINET = 21 -AF_GOSIP = 22 -AF_YNET = 23 -AF_ROUTE = 24 -AF_LINK = 25 -pseudo_AF_XTP = 26 -AF_INET6 = 27 -AF_MAX = 27 -AF_INET_BSWAP = 0x0200 -PF_UNSPEC = AF_UNSPEC -PF_UNIX = AF_UNIX -PF_LOCAL = AF_LOCAL -PF_INET = AF_INET -PF_IMPLINK = AF_IMPLINK -PF_PUP = AF_PUP -PF_CHAOS = AF_CHAOS -PF_NS = AF_NS -PF_NBS = AF_NBS -PF_ECMA = AF_ECMA -PF_DATAKIT = AF_DATAKIT -PF_CCITT = AF_CCITT -PF_SNA = AF_SNA -PF_DECnet = AF_DECnet -PF_DLI = AF_DLI -PF_LAT = AF_LAT -PF_HYLINK = AF_HYLINK -PF_APPLETALK = AF_APPLETALK -PF_NIT = AF_NIT -PF_802 = AF_802 -PF_OSI = AF_OSI -PF_ISO = PF_OSI -PF_X25 = AF_X25 -PF_OSINET = AF_OSINET -PF_GOSIP = AF_GOSIP -PF_YNET = AF_YNET -PF_ROUTE = AF_ROUTE -PF_LINK = AF_LINK -pseudo_PF_XTP = pseudo_AF_XTP -PF_INET6 = AF_INET6 -PF_MAX = AF_MAX -SOMAXCONN = 5 -SCM_RIGHTS = 1 -MSG_OOB = 0x1 -MSG_PEEK = 0x2 -MSG_DONTROUTE = 0x4 -MSG_CTRUNC = 0x8 -MSG_TRUNC = 0x10 -MSG_EOR = 0x30 -MSG_WAITALL = 0x20 -MSG_MAXIOVLEN = 16 -def OPTLEN(x): return ((((x) + sizeof(int) - 1) / sizeof(int)) * sizeof(int)) - -GIARG = 0x1 -CONTI = 0x2 -GITAB = 0x4 -SOCKETSYS = 88 -SOCKETSYS = 83 -SO_ACCEPT = 1 -SO_BIND = 2 -SO_CONNECT = 3 -SO_GETPEERNAME = 4 -SO_GETSOCKNAME = 5 -SO_GETSOCKOPT = 6 -SO_LISTEN = 7 -SO_RECV = 8 -SO_RECVFROM = 9 -SO_SEND = 10 -SO_SENDTO = 11 -SO_SETSOCKOPT = 12 -SO_SHUTDOWN = 13 -SO_SOCKET = 14 -SO_SOCKPOLL = 15 -SO_GETIPDOMAIN = 16 -SO_SETIPDOMAIN = 17 -SO_ADJTIME = 18 - -# Included from sys/stream.h - -# Included from sys/cred.h - -# Included from sys/ksynch.h - -# Included from sys/dl.h -SIGNBIT = 0x80000000 - -# Included from sys/ipl.h - -# Included from sys/disp_p.h - -# Included from sys/trap.h -DIVERR = 0 -SGLSTP = 1 -NMIFLT = 2 -BPTFLT = 3 -INTOFLT = 4 -BOUNDFLT = 5 -INVOPFLT = 6 -NOEXTFLT = 7 -DBLFLT = 8 -EXTOVRFLT = 9 -INVTSSFLT = 10 -SEGNPFLT = 11 -STKFLT = 12 -GPFLT = 13 -PGFLT = 14 -EXTERRFLT = 16 -ALIGNFLT = 17 -MCEFLT = 18 -USERFLT = 0x100 -TRP_PREEMPT = 0x200 -TRP_UNUSED = 0x201 -PF_ERR_MASK = 0x01 -PF_ERR_PAGE = 0 -PF_ERR_PROT = 1 -PF_ERR_WRITE = 2 -PF_ERR_USER = 4 -EVT_STRSCHED = 0x04 -EVT_GLOBCALLOUT = 0x08 -EVT_LCLCALLOUT = 0x10 -EVT_SOFTINTMASK = (EVT_STRSCHED|EVT_GLOBCALLOUT|EVT_LCLCALLOUT) -PL0 = 0 -PL1 = 1 -PL2 = 2 -PL3 = 3 -PL4 = 4 -PL5 = 5 -PL6 = 6 -PLHI = 8 -PL7 = PLHI -PLBASE = PL0 -PLTIMEOUT = PL1 -PLDISK = PL5 -PLSTR = PL6 -PLTTY = PLSTR -PLMIN = PL0 -PLMIN = PL1 -MAX_INTR_LEVELS = 10 -MAX_INTR_NESTING = 50 -STRSCHED = EVT_STRSCHED -GLOBALSOFTINT = EVT_GLOBCALLOUT -LOCALSOFTINT = EVT_LCLCALLOUT - -# Included from sys/ksynch_p.h -def GET_TIME(timep): return \ - -LK_THRESHOLD = 500000 - -# Included from sys/list.h - -# Included from sys/listasm.h -def remque_null(e): return \ - -def LS_ISEMPTY(listp): return \ - -LK_BASIC = 0x1 -LK_SLEEP = 0x2 -LK_NOSTATS = 0x4 -def CYCLES_SINCE(c): return CYCLES_BETWEEN((c), CYCLES()) - -LSB_NLKDS = 92 -EVT_RUNRUN = 0x01 -EVT_KPRUNRUN = 0x02 -SP_UNLOCKED = 0 -SP_LOCKED = 1 -KS_LOCKTEST = 0x01 -KS_MPSTATS = 0x02 -KS_DEINITED = 0x04 -KS_NVLTTRACE = 0x08 -RWS_READ = (ord('r')) -RWS_WRITE = (ord('w')) -RWS_UNLOCKED = (ord('u')) -RWS_BUSY = (ord('b')) -def SLEEP_LOCKOWNED(lkp): return \ - -def SLEEP_DISOWN(lkp): return \ - -KS_NOPRMPT = 0x00000001 -__KS_LOCKTEST = KS_LOCKTEST -__KS_LOCKTEST = 0 -__KS_MPSTATS = KS_MPSTATS -__KS_MPSTATS = 0 -__KS_NVLTTRACE = KS_NVLTTRACE -__KS_NVLTTRACE = 0 -KSFLAGS = (__KS_LOCKTEST|__KS_MPSTATS|__KS_NVLTTRACE) -KSVUNIPROC = 1 -KSVMPDEBUG = 2 -KSVMPNODEBUG = 3 -KSVFLAG = KSVUNIPROC -KSVFLAG = KSVMPDEBUG -KSVFLAG = KSVMPNODEBUG - -# Included from sys/ksinline.h -_A_SP_LOCKED = 1 -_A_SP_UNLOCKED = 0 -_A_INVPL = -1 -def _ATOMIC_INT_INCR(atomic_intp): return \ - -def _ATOMIC_INT_DECR(atomic_intp): return \ - -def ATOMIC_INT_READ(atomic_intp): return _ATOMIC_INT_READ(atomic_intp) - -def ATOMIC_INT_INCR(atomic_intp): return _ATOMIC_INT_INCR(atomic_intp) - -def ATOMIC_INT_DECR(atomic_intp): return _ATOMIC_INT_DECR(atomic_intp) - -def FSPIN_INIT(lp): return - -def FSPIN_LOCK(l): return DISABLE() - -def FSPIN_TRYLOCK(l): return (DISABLE(), B_TRUE) - -def FSPIN_UNLOCK(l): return ENABLE() - -def LOCK_DEINIT(lp): return - -def LOCK_DEALLOC(lp): return - -def LOCK_OWNED(lp): return (B_TRUE) - -def RW_DEINIT(lp): return - -def RW_DEALLOC(lp): return - -def RW_OWNED(lp): return (B_TRUE) - -def IS_LOCKED(lockp): return B_FALSE - -def LOCK_PLMIN(lockp): return \ - -def TRYLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) - -def LOCK_SH_PLMIN(lockp): return LOCK_PLMIN(lockp) - -def RW_RDLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) - -def RW_WRLOCK_PLMIN(lockp): return LOCK_PLMIN(lockp) - -def LOCK_DEINIT(l): return - -def LOCK_PLMIN(lockp): return LOCK((lockp), PLMIN) - -def TRYLOCK_PLMIN(lockp): return TRYLOCK((lockp), PLMIN) - -def LOCK_SH_PLMIN(lockp): return LOCK_SH((lockp), PLMIN) - -def RW_RDLOCK_PLMIN(lockp): return RW_RDLOCK((lockp), PLMIN) - -def RW_WRLOCK_PLMIN(lockp): return RW_WRLOCK((lockp), PLMIN) - -def FSPIN_IS_LOCKED(fsp): return B_FALSE - -def SPIN_IS_LOCKED(lockp): return B_FALSE - -def FSPIN_OWNED(l): return (B_TRUE) - -CR_MLDREAL = 0x00000001 -CR_RDUMP = 0x00000002 -def crhold(credp): return crholdn((credp), 1) - -def crfree(credp): return crfreen((credp), 1) - - -# Included from sys/strmdep.h -def str_aligned(X): return (((uint)(X) & (sizeof(int) - 1)) == 0) - - -# Included from sys/engine.h - -# Included from sys/clock.h - -# Included from sys/time.h -DST_NONE = 0 -DST_USA = 1 -DST_AUST = 2 -DST_WET = 3 -DST_MET = 4 -DST_EET = 5 -DST_CAN = 6 -DST_GB = 7 -DST_RUM = 8 -DST_TUR = 9 -DST_AUSTALT = 10 -ITIMER_REAL = 0 -ITIMER_VIRTUAL = 1 -ITIMER_PROF = 2 -FD_SETSIZE = 4096 -FD_NBBY = 8 - -# Included from time.h -NULL = 0 -CLOCKS_PER_SEC = 1000000 - -# Included from sys/clock_p.h -CGBITS = 4 -IDBITS = 28 -def toid_unpackcg(idval): return (((idval) >> IDBITS) & 0xf) - -def toid_unpackid(idval): return ((idval) & 0xfffffff) - -def toid_unpackcg(idval): return 0 - -def toid_unpackid(idval): return (idval) - -NCALLOUT_HASH = 1024 -CALLOUT_MAXVAL = 0x7fffffff -TO_PERIODIC = 0x80000000 -TO_IMMEDIATE = 0x80000000 -SEC = 1 -MILLISEC = 1000 -MICROSEC = 1000000 -NANOSEC = 1000000000 -SECHR = (60*60) -SECDAY = (24*SECHR) -SECYR = (365*SECDAY) -def TIME_OWNED_R(cgnum): return (B_TRUE) - -LOOPSECONDS = 1800 -LOOPMICROSECONDS = (LOOPSECONDS * MICROSEC) -def TICKS_SINCE(t): return TICKS_BETWEEN(t, TICKS()) - -MAXRQS = 2 -E_OFFLINE = 0x01 -E_BAD = 0x02 -E_SHUTDOWN = 0x04 -E_DRIVER = 0x08 -E_DEFAULTKEEP = 0x100 -E_DRIVERBOUND = 0x200 -E_EXCLUSIVE = 0x400 -E_CGLEADER = 0x800 -E_NOWAY = (E_OFFLINE|E_BAD|E_SHUTDOWN) -E_BOUND = 0x01 -E_GLOBAL = 0x00 -E_UNAVAIL = -1 -ENGINE_ONLINE = 1 -def PROCESSOR_UNMAP(e): return ((e) - engine) - -BOOTENG = 0 -QMOVED = 0x0001 -QWANTR = 0x0002 -QWANTW = 0x0004 -QFULL = 0x0008 -QREADR = 0x0010 -QUSE = 0x0020 -QNOENB = 0x0040 -QUP = 0x0080 -QBACK = 0x0100 -QINTER = 0x0200 -QPROCSON = 0x0400 -QTOENAB = 0x0800 -QFREEZE = 0x1000 -QBOUND = 0x2000 -QDEFCNT = 0x4000 -QENAB = 0x0001 -QSVCBUSY = 0x0002 -STRM_PUTCNT_TABLES = 31 -def STRM_MYENG_PUTCNT(sdp): return STRM_PUTCNT(l.eng_num, sdp) - -QB_FULL = 0x01 -QB_WANTW = 0x02 -QB_BACK = 0x04 -NBAND = 256 -DB_WASDUPED = 0x1 -DB_2PIECE = 0x2 -STRLEAKHASHSZ = 1021 -MSGMARK = 0x01 -MSGNOLOOP = 0x02 -MSGDELIM = 0x04 -MSGNOGET = 0x08 -MSGLOG = 0x10 -M_DATA = 0x00 -M_PROTO = 0x01 -M_BREAK = 0x08 -M_PASSFP = 0x09 -M_SIG = 0x0b -M_DELAY = 0x0c -M_CTL = 0x0d -M_IOCTL = 0x0e -M_SETOPTS = 0x10 -M_RSE = 0x11 -M_TRAIL = 0x12 -M_IOCACK = 0x81 -M_IOCNAK = 0x82 -M_PCPROTO = 0x83 -M_PCSIG = 0x84 -M_READ = 0x85 -M_FLUSH = 0x86 -M_STOP = 0x87 -M_START = 0x88 -M_HANGUP = 0x89 -M_ERROR = 0x8a -M_COPYIN = 0x8b -M_COPYOUT = 0x8c -M_IOCDATA = 0x8d -M_PCRSE = 0x8e -M_STOPI = 0x8f -M_STARTI = 0x90 -M_PCCTL = 0x91 -M_PCSETOPTS = 0x92 -QNORM = 0x00 -QPCTL = 0x80 -STRCANON = 0x01 -RECOPY = 0x02 -SO_ALL = 0x003f -SO_READOPT = 0x0001 -SO_WROFF = 0x0002 -SO_MINPSZ = 0x0004 -SO_MAXPSZ = 0x0008 -SO_HIWAT = 0x0010 -SO_LOWAT = 0x0020 -SO_MREADON = 0x0040 -SO_MREADOFF = 0x0080 -SO_NDELON = 0x0100 -SO_NDELOFF = 0x0200 -SO_ISTTY = 0x0400 -SO_ISNTTY = 0x0800 -SO_TOSTOP = 0x1000 -SO_TONSTOP = 0x2000 -SO_BAND = 0x4000 -SO_DELIM = 0x8000 -SO_NODELIM = 0x010000 -SO_STRHOLD = 0x020000 -SO_LOOP = 0x040000 -DRVOPEN = 0x0 -MODOPEN = 0x1 -CLONEOPEN = 0x2 -OPENFAIL = -1 -BPRI_LO = 1 -BPRI_MED = 2 -BPRI_HI = 3 -INFPSZ = -1 -FLUSHALL = 1 -FLUSHDATA = 0 -STRHIGH = 5120 -STRLOW = 1024 -MAXIOCBSZ = 1024 -def straln(a): return (caddr_t)((int)(a) & ~(sizeof(int)-1)) - -IPM_ID = 200 -ICMPM_ID = 201 -TCPM_ID = 202 -UDPM_ID = 203 -ARPM_ID = 204 -APPM_ID = 205 -RIPM_ID = 206 -PPPM_ID = 207 -AHDLCM_ID = 208 -MHDLCRIPM_ID = 209 -HDLCM_ID = 210 -PPCID_ID = 211 -IGMPM_ID = 212 -IPIPM_ID = 213 -IPPROTO_IP = 0 -IPPROTO_HOPOPTS = 0 -IPPROTO_ICMP = 1 -IPPROTO_IGMP = 2 -IPPROTO_GGP = 3 -IPPROTO_IPIP = 4 -IPPROTO_TCP = 6 -IPPROTO_EGP = 8 -IPPROTO_PUP = 12 -IPPROTO_UDP = 17 -IPPROTO_IDP = 22 -IPPROTO_TP = 29 -IPPROTO_IPV6 = 41 -IPPROTO_ROUTING = 43 -IPPROTO_FRAGMENT = 44 -IPPROTO_ESP = 50 -IPPROTO_AH = 51 -IPPROTO_ICMPV6 = 58 -IPPROTO_NONE = 59 -IPPROTO_DSTOPTS = 60 -IPPROTO_HELLO = 63 -IPPROTO_ND = 77 -IPPROTO_EON = 80 -IPPROTO_RAW = 255 -IPPROTO_MAX = 256 -IPPORT_ECHO = 7 -IPPORT_DISCARD = 9 -IPPORT_SYSTAT = 11 -IPPORT_DAYTIME = 13 -IPPORT_NETSTAT = 15 -IPPORT_FTP = 21 -IPPORT_TELNET = 23 -IPPORT_SMTP = 25 -IPPORT_TIMESERVER = 37 -IPPORT_NAMESERVER = 42 -IPPORT_WHOIS = 43 -IPPORT_MTP = 57 -IPPORT_TFTP = 69 -IPPORT_RJE = 77 -IPPORT_FINGER = 79 -IPPORT_TTYLINK = 87 -IPPORT_SUPDUP = 95 -IPPORT_EXECSERVER = 512 -IPPORT_LOGINSERVER = 513 -IPPORT_CMDSERVER = 514 -IPPORT_EFSSERVER = 520 -IPPORT_BIFFUDP = 512 -IPPORT_WHOSERVER = 513 -IPPORT_ROUTESERVER = 520 -IPPORT_RESERVED = 1024 -IPPORT_USERRESERVED = 65535 -IPPORT_RESERVED_LOW = 512 -IPPORT_RESERVED_HIGH = 1023 -IPPORT_USERRESERVED_LOW = 32768 -IPPORT_USERRESERVED_HIGH = 65535 -INET_ADDRSTRLEN = 16 -IP_OPTIONS = 1 -IP_TOS = 2 -IP_TTL = 3 -IP_HDRINCL = 4 -IP_RECVOPTS = 5 -IP_RECVRETOPTS = 6 -IP_RECVDSTADDR = 7 -IP_RETOPTS = 8 -IP_MULTICAST_IF = 9 -IP_MULTICAST_LOOP = 10 -IP_ADD_MEMBERSHIP = 11 -IP_DROP_MEMBERSHIP = 12 -IP_BROADCAST_IF = 14 -IP_RECVIFINDEX = 15 -IP_MULTICAST_TTL = 16 -MRT_INIT = 17 -MRT_DONE = 18 -MRT_ADD_VIF = 19 -MRT_DEL_VIF = 20 -MRT_ADD_MFC = 21 -MRT_DEL_MFC = 22 -MRT_VERSION = 23 -IP_DEFAULT_MULTICAST_TTL = 1 -IP_DEFAULT_MULTICAST_LOOP = 1 -IP_MAX_MEMBERSHIPS = 20 -INADDR_UNSPEC_GROUP = 0xe0000000 -INADDR_ALLHOSTS_GROUP = 0xe0000001 -INADDR_ALLRTRS_GROUP = 0xe0000002 -INADDR_MAX_LOCAL_GROUP = 0xe00000ff - -# Included from netinet/in_mp.h - -# Included from netinet/in_mp_ddi.h - -# Included from sys/inline.h -IP_HIER_BASE = (20) -def ASSERT_LOCK(x): return - -def ASSERT_WRLOCK(x): return - -def ASSERT_UNLOCK(x): return - -def CANPUT(q): return canput((q)) - -def CANPUTNEXT(q): return canputnext((q)) - -INET_DEBUG = 1 diff --git a/Lib/plat-unixware7/STROPTS.py b/Lib/plat-unixware7/STROPTS.py deleted file mode 100644 index ef50a9c..0000000 --- a/Lib/plat-unixware7/STROPTS.py +++ /dev/null @@ -1,328 +0,0 @@ -# Generated by h2py from /usr/include/sys/stropts.h - -# Included from sys/types.h -def quad_low(x): return x.val[0] - -ADT_EMASKSIZE = 8 -SHRT_MIN = -32768 -SHRT_MAX = 32767 -INT_MIN = (-2147483647-1) -INT_MAX = 2147483647 -LONG_MIN = (-2147483647-1) -LONG_MAX = 2147483647 -OFF32_MAX = LONG_MAX -ISTAT_ASSERTED = 0 -ISTAT_ASSUMED = 1 -ISTAT_NONE = 2 -OFF_MAX = OFF32_MAX -CLOCK_MAX = LONG_MAX -P_MYID = (-1) -P_MYHOSTID = (-1) - -# Included from sys/select.h -FD_SETSIZE = 4096 -NBBY = 8 -NULL = 0 - -# Included from sys/conf.h -D_NEW = 0x00 -D_OLD = 0x01 -D_DMA = 0x02 -D_BLKOFF = 0x400 -D_LFS = 0x8000 -D_STR = 0x0800 -D_MOD = 0x1000 -D_PSEUDO = 0x2000 -D_RANDOM = 0x4000 -D_HOT = 0x10000 -D_SEEKNEG = 0x04 -D_TAPE = 0x08 -D_NOBRKUP = 0x10 -D_INITPUB = 0x20 -D_NOSPECMACDATA = 0x40 -D_RDWEQ = 0x80 -SECMASK = (D_INITPUB|D_NOSPECMACDATA|D_RDWEQ) -DAF_REQDMA = 0x1 -DAF_PHYSREQ = 0x2 -DAF_PRE8 = 0x4 -DAF_STATIC = 0x8 -DAF_STR = 0x10 -D_MP = 0x100 -D_UPF = 0x200 -ROOTFS_NAMESZ = 7 -FMNAMESZ = 8 -MCD_VERSION = 1 -DI_BCBP = 0 -DI_MEDIA = 1 - -# Included from sys/secsys.h -ES_MACOPENLID = 1 -ES_MACSYSLID = 2 -ES_MACROOTLID = 3 -ES_PRVINFO = 4 -ES_PRVSETCNT = 5 -ES_PRVSETS = 6 -ES_MACADTLID = 7 -ES_PRVID = 8 -ES_TPGETMAJOR = 9 -SA_EXEC = 0o01 -SA_WRITE = 0o02 -SA_READ = 0o04 -SA_SUBSIZE = 0o10 - -# Included from sys/stropts_f.h -X_STR = (ord('S')<<8) -X_I_BASE = (X_STR|0o200) -X_I_NREAD = (X_STR|0o201) -X_I_PUSH = (X_STR|0o202) -X_I_POP = (X_STR|0o203) -X_I_LOOK = (X_STR|0o204) -X_I_FLUSH = (X_STR|0o205) -X_I_SRDOPT = (X_STR|0o206) -X_I_GRDOPT = (X_STR|0o207) -X_I_STR = (X_STR|0o210) -X_I_SETSIG = (X_STR|0o211) -X_I_GETSIG = (X_STR|0o212) -X_I_FIND = (X_STR|0o213) -X_I_LINK = (X_STR|0o214) -X_I_UNLINK = (X_STR|0o215) -X_I_PEEK = (X_STR|0o217) -X_I_FDINSERT = (X_STR|0o220) -X_I_SENDFD = (X_STR|0o221) -X_I_RECVFD = (X_STR|0o222) - -# Included from unistd.h - -# Included from sys/unistd.h -R_OK = 0o04 -W_OK = 0o02 -X_OK = 0o01 -F_OK = 000 -EFF_ONLY_OK = 0o10 -EX_OK = 0o20 -SEEK_SET = 0 -SEEK_CUR = 1 -SEEK_END = 2 -_SC_ARG_MAX = 1 -_SC_CHILD_MAX = 2 -_SC_CLK_TCK = 3 -_SC_NGROUPS_MAX = 4 -_SC_OPEN_MAX = 5 -_SC_JOB_CONTROL = 6 -_SC_SAVED_IDS = 7 -_SC_VERSION = 8 -_SC_PASS_MAX = 9 -_SC_LOGNAME_MAX = 10 -_SC_PAGESIZE = 11 -_SC_PAGE_SIZE = _SC_PAGESIZE -_SC_XOPEN_VERSION = 12 -_SC_NACLS_MAX = 13 -_SC_NPROCESSORS_CONF = 14 -_SC_NPROCESSORS_ONLN = 15 -_SC_NPROCESSES = 39 -_SC_TOTAL_MEMORY = 40 -_SC_USEABLE_MEMORY = 41 -_SC_GENERAL_MEMORY = 42 -_SC_DEDICATED_MEMORY = 43 -_SC_NCGS_CONF = 44 -_SC_NCGS_ONLN = 45 -_SC_MAX_CPUS_PER_CG = 46 -_SC_CG_SIMPLE_IMPL = 47 -_SC_CACHE_LINE = 48 -_SC_SYSTEM_ID = 49 -_SC_THREADS = 51 -_SC_THREAD_ATTR_STACKADDR = 52 -_SC_THREAD_ATTR_STACKSIZE = 53 -_SC_THREAD_DESTRUCTOR_ITERATIONS = 54 -_SC_THREAD_KEYS_MAX = 55 -_SC_THREAD_PRIORITY_SCHEDULING = 56 -_SC_THREAD_PRIO_INHERIT = 57 -_SC_THREAD_PRIO_PROTECT = 58 -_SC_THREAD_STACK_MIN = 59 -_SC_THREAD_PROCESS_SHARED = 60 -_SC_THREAD_SAFE_FUNCTIONS = 61 -_SC_THREAD_THREADS_MAX = 62 -_SC_KERNEL_VM = 63 -_SC_TZNAME_MAX = 320 -_SC_STREAM_MAX = 321 -_SC_XOPEN_CRYPT = 323 -_SC_XOPEN_ENH_I18N = 324 -_SC_XOPEN_SHM = 325 -_SC_XOPEN_XCU_VERSION = 327 -_SC_AES_OS_VERSION = 330 -_SC_ATEXIT_MAX = 331 -_SC_2_C_BIND = 350 -_SC_2_C_DEV = 351 -_SC_2_C_VERSION = 352 -_SC_2_CHAR_TERM = 353 -_SC_2_FORT_DEV = 354 -_SC_2_FORT_RUN = 355 -_SC_2_LOCALEDEF = 356 -_SC_2_SW_DEV = 357 -_SC_2_UPE = 358 -_SC_2_VERSION = 359 -_SC_BC_BASE_MAX = 370 -_SC_BC_DIM_MAX = 371 -_SC_BC_SCALE_MAX = 372 -_SC_BC_STRING_MAX = 373 -_SC_COLL_WEIGHTS_MAX = 380 -_SC_EXPR_NEST_MAX = 381 -_SC_LINE_MAX = 382 -_SC_RE_DUP_MAX = 383 -_SC_IOV_MAX = 390 -_SC_NPROC_CONF = 391 -_SC_NPROC_ONLN = 392 -_SC_XOPEN_UNIX = 400 -_SC_SEMAPHORES = 440 -_CS_PATH = 1 -__O_CS_HOSTNAME = 2 -_CS_RELEASE = 3 -_CS_VERSION = 4 -__O_CS_MACHINE = 5 -__O_CS_ARCHITECTURE = 6 -_CS_HW_SERIAL = 7 -__O_CS_HW_PROVIDER = 8 -_CS_SRPC_DOMAIN = 9 -_CS_INITTAB_NAME = 10 -__O_CS_SYSNAME = 11 -_CS_LFS_CFLAGS = 20 -_CS_LFS_LDFLAGS = 21 -_CS_LFS_LIBS = 22 -_CS_LFS_LINTFLAGS = 23 -_CS_LFS64_CFLAGS = 24 -_CS_LFS64_LDFLAGS = 25 -_CS_LFS64_LIBS = 26 -_CS_LFS64_LINTFLAGS = 27 -_CS_ARCHITECTURE = 100 -_CS_BUSTYPES = 101 -_CS_HOSTNAME = 102 -_CS_HW_PROVIDER = 103 -_CS_KERNEL_STAMP = 104 -_CS_MACHINE = 105 -_CS_OS_BASE = 106 -_CS_OS_PROVIDER = 107 -_CS_SYSNAME = 108 -_CS_USER_LIMIT = 109 -_PC_LINK_MAX = 1 -_PC_MAX_CANON = 2 -_PC_MAX_INPUT = 3 -_PC_NAME_MAX = 4 -_PC_PATH_MAX = 5 -_PC_PIPE_BUF = 6 -_PC_NO_TRUNC = 7 -_PC_VDISABLE = 8 -_PC_CHOWN_RESTRICTED = 9 -_PC_FILESIZEBITS = 10 -_POSIX_VERSION = 199009 -_XOPEN_VERSION = 4 -GF_PATH = "/etc/group" -PF_PATH = "/etc/passwd" -F_ULOCK = 0 -F_LOCK = 1 -F_TLOCK = 2 -F_TEST = 3 -_POSIX_JOB_CONTROL = 1 -_POSIX_SAVED_IDS = 1 -_POSIX_VDISABLE = 0 -NULL = 0 -STDIN_FILENO = 0 -STDOUT_FILENO = 1 -STDERR_FILENO = 2 -_XOPEN_UNIX = 1 -_XOPEN_ENH_I18N = 1 -_XOPEN_XPG4 = 1 -_POSIX2_C_VERSION = 199209 -_POSIX2_VERSION = 199209 -_XOPEN_XCU_VERSION = 4 -_POSIX_SEMAPHORES = 1 -_POSIX_THREADS = 1 -_POSIX_THREAD_ATTR_STACKADDR = 1 -_POSIX_THREAD_ATTR_STACKSIZE = 1 -_POSIX_THREAD_PRIORITY_SCHEDULING = 1 -_POSIX_THREAD_PROCESS_SHARED = 1 -_POSIX_THREAD_SAFE_FUNCTIONS = 1 -_POSIX2_C_BIND = 1 -_POSIX2_CHAR_TERM = 1 -_POSIX2_FORT_RUN = 1 -_POSIX2_LOCALEDEF = 1 -_POSIX2_UPE = 1 -_LFS_ASYNCHRONOUS_IO = 1 -_LFS_LARGEFILE = 1 -_LFS64_ASYNCHRONOUS_IO = 1 -_LFS64_LARGEFILE = 1 -_LFS64_STDIO = 1 -FMNAMESZ = 8 -SNDZERO = 0x001 -SNDPIPE = 0x002 -RNORM = 0x000 -RMSGD = 0x001 -RMSGN = 0x002 -RMODEMASK = 0x003 -RPROTDAT = 0x004 -RPROTDIS = 0x008 -RPROTNORM = 0x010 -RPROTMASK = 0x01c -FLUSHR = 0x01 -FLUSHW = 0x02 -FLUSHRW = 0x03 -FLUSHBAND = 0x04 -S_INPUT = 0x0001 -S_HIPRI = 0x0002 -S_OUTPUT = 0x0004 -S_MSG = 0x0008 -S_ERROR = 0x0010 -S_HANGUP = 0x0020 -S_RDNORM = 0x0040 -S_WRNORM = S_OUTPUT -S_RDBAND = 0x0080 -S_WRBAND = 0x0100 -S_BANDURG = 0x0200 -RS_HIPRI = 0x01 -MSG_HIPRI = 0x01 -MSG_ANY = 0x02 -MSG_BAND = 0x04 -MSG_DISCARD = 0x08 -MSG_PEEKIOCTL = 0x10 -MORECTL = 1 -MOREDATA = 2 -MUXID_ALL = (-1) -ANYMARK = 0x01 -LASTMARK = 0x02 -STR = (ord('S')<<8) -I_NREAD = (STR|0o1) -I_PUSH = (STR|0o2) -I_POP = (STR|0o3) -I_LOOK = (STR|0o4) -I_FLUSH = (STR|0o5) -I_SRDOPT = (STR|0o6) -I_GRDOPT = (STR|0o7) -I_STR = (STR|0o10) -I_SETSIG = (STR|0o11) -I_GETSIG = (STR|0o12) -I_FIND = (STR|0o13) -I_LINK = (STR|0o14) -I_UNLINK = (STR|0o15) -I_PEEK = (STR|0o17) -I_FDINSERT = (STR|0o20) -I_SENDFD = (STR|0o21) -I_RECVFD = (STR|0o22) -I_E_RECVFD = (STR|0o16) -I_RECVFD = (STR|0o16) -I_RECVFD = (STR|0o22) -I_SWROPT = (STR|0o23) -I_GWROPT = (STR|0o24) -I_LIST = (STR|0o25) -I_PLINK = (STR|0o26) -I_PUNLINK = (STR|0o27) -I_FLUSHBAND = (STR|0o34) -I_CKBAND = (STR|0o35) -I_GETBAND = (STR|0o36) -I_ATMARK = (STR|0o37) -I_SETCLTIME = (STR|0o40) -I_GETCLTIME = (STR|0o41) -I_CANPUT = (STR|0o42) -I_S_RECVFD = (STR|0o43) -I_STATS = (STR|0o44) -I_BIGPIPE = (STR|0o45) -I_GETTP = (STR|0o46) -INFTIM = -1 diff --git a/Lib/plat-unixware7/regen b/Lib/plat-unixware7/regen deleted file mode 100755 index 68998a7..0000000 --- a/Lib/plat-unixware7/regen +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh -case `uname -sr` in -UnixWare*) ;; -*) echo Probably not on a UnixWare system 1>&2 - exit 1;; -esac -set -v -h2py -i '(u_long)' /usr/include/netinet/in.h -h2py /usr/include/sys/stropts.h diff --git a/Lib/platform.py b/Lib/platform.py index d3ed5bf..e48ad0b 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -13,7 +13,6 @@ # Python bug tracker (http://bugs.python.org) and assign them to "lemburg". # # Still needed: -# * more support for WinCE # * support for MS-DOS (PythonDX ?) # * support for Amiga and other still unsupported platforms running Python # * support for additional Linux distributions @@ -252,13 +251,13 @@ def _dist_try_harder(distname, version, id): _release_filename = re.compile(r'(\w+)[-_](release|version)', re.ASCII) _lsb_release_version = re.compile(r'(.+)' - ' release ' - '([\d.]+)' - '[^(]*(?:\((.+)\))?', re.ASCII) + r' release ' + r'([\d.]+)' + r'[^(]*(?:\((.+)\))?', re.ASCII) _release_version = re.compile(r'([^0-9]+)' - '(?: release )?' - '([\d.]+)' - '[^(]*(?:\((.+)\))?', re.ASCII) + r'(?: release )?' + r'([\d.]+)' + r'[^(]*(?:\((.+)\))?', re.ASCII) # See also http://www.novell.com/coolsolutions/feature/11251.html # and http://linuxmafia.com/faq/Admin/release-files.html @@ -408,8 +407,8 @@ def _norm_version(version, build=''): return version _ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) ' - '.*' - '\[.* ([\d.]+)\])') + r'.*' + r'\[.* ([\d.]+)\])') # Examples of VER command output: # @@ -509,7 +508,7 @@ def win32_ver(release='', version='', csd='', ptype=''): from _winreg import OpenKeyEx, QueryValueEx, CloseKey, HKEY_LOCAL_MACHINE winver = getwindowsversion() - maj, min, build = winver._platform_version or winver[:3] + maj, min, build = winver.platform_version or winver[:3] version = '{0}.{1}.{2}'.format(maj, min, build) release = (_WIN32_CLIENT_RELEASES.get((maj, min)) or @@ -1095,22 +1094,22 @@ _sys_version_parser = re.compile( _ironpython_sys_version_parser = re.compile( r'IronPython\s*' - '([\d\.]+)' - '(?: \(([\d\.]+)\))?' - ' on (.NET [\d\.]+)', re.ASCII) + r'([\d\.]+)' + r'(?: \(([\d\.]+)\))?' + r' on (.NET [\d\.]+)', re.ASCII) # IronPython covering 2.6 and 2.7 _ironpython26_sys_version_parser = re.compile( r'([\d.]+)\s*' - '\(IronPython\s*' - '[\d.]+\s*' - '\(([\d.]+)\) on ([\w.]+ [\d.]+(?: \(\d+-bit\))?)\)' + r'\(IronPython\s*' + r'[\d.]+\s*' + r'\(([\d.]+)\) on ([\w.]+ [\d.]+(?: \(\d+-bit\))?)\)' ) _pypy_sys_version_parser = re.compile( r'([\w.+]+)\s*' - '\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*' - '\[PyPy [^\]]+\]?') + r'\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*' + r'\[PyPy [^\]]+\]?') _sys_version_cache = {} @@ -1199,9 +1198,7 @@ def _sys_version(sys_version=None): elif buildtime: builddate = builddate + ' ' + buildtime - if hasattr(sys, '_git'): - _, branch, revision = sys._git - elif hasattr(sys, '_mercurial'): + if hasattr(sys, '_mercurial'): _, branch, revision = sys._mercurial elif hasattr(sys, 'subversion'): # sys.subversion was added in Python 2.5 @@ -1347,7 +1344,7 @@ def platform(aliased=0, terse=0): # see issue #1322 for more information warnings.filterwarnings( 'ignore', - 'dist\(\) and linux_distribution\(\) ' + r'dist\(\) and linux_distribution\(\) ' 'functions are deprecated .*', PendingDeprecationWarning, ) diff --git a/Lib/plistlib.py b/Lib/plistlib.py index 2502b39..09be5fd 100644 --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -47,7 +47,7 @@ Parse Plist example: """ __all__ = [ "readPlist", "writePlist", "readPlistFromBytes", "writePlistToBytes", - "Plist", "Data", "Dict", "FMT_XML", "FMT_BINARY", + "Plist", "Data", "Dict", "InvalidFileException", "FMT_XML", "FMT_BINARY", "load", "dump", "loads", "dumps" ] diff --git a/Lib/poplib.py b/Lib/poplib.py index 516b6f0..cae6950 100644 --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -288,12 +288,9 @@ class POP3: if sock is not None: try: sock.shutdown(socket.SHUT_RDWR) - except OSError as exc: - # The server might already have closed the connection. - # On Windows, this may result in WSAEINVAL (error 10022): - # An invalid operation was attempted. - if (exc.errno != errno.ENOTCONN - and getattr(exc, 'winerror', 0) != 10022): + except OSError as e: + # The server might already have closed the connection + if e.errno != errno.ENOTCONN: raise finally: sock.close() @@ -434,6 +431,10 @@ if HAVE_SSL: if context is not None and certfile is not None: raise ValueError("context and certfile arguments are mutually " "exclusive") + if keyfile is not None or certfile is not None: + import warnings + warnings.warn("keyfile and certfile are deprecated, use a" + "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile if context is None: diff --git a/Lib/posixpath.py b/Lib/posixpath.py index d9f3f99..6dbdab2 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -49,6 +49,7 @@ def _get_sep(path): def normcase(s): """Normalize case of pathname. Has no effect under Posix""" + s = os.fspath(s) if not isinstance(s, (bytes, str)): raise TypeError("normcase() argument must be str or bytes, " "not '{}'".format(s.__class__.__name__)) @@ -60,6 +61,7 @@ def normcase(s): def isabs(s): """Test whether a path is absolute""" + s = os.fspath(s) sep = _get_sep(s) return s.startswith(sep) @@ -73,12 +75,13 @@ def join(a, *p): If any component is an absolute path, all previous path components will be discarded. An empty last part will result in a path that ends with a separator.""" + a = os.fspath(a) sep = _get_sep(a) path = a try: if not p: path[:0] + sep #23780: Ensure compatible data type even if p is null. - for b in p: + for b in map(os.fspath, p): if b.startswith(sep): path = b elif not path or path.endswith(sep): @@ -99,6 +102,7 @@ def join(a, *p): def split(p): """Split a pathname. Returns tuple "(head, tail)" where "tail" is everything after the final slash. Either part may be empty.""" + p = os.fspath(p) sep = _get_sep(p) i = p.rfind(sep) + 1 head, tail = p[:i], p[i:] @@ -113,6 +117,7 @@ def split(p): # It is always true that root + ext == p. def splitext(p): + p = os.fspath(p) if isinstance(p, bytes): sep = b'/' extsep = b'.' @@ -128,6 +133,7 @@ splitext.__doc__ = genericpath._splitext.__doc__ def splitdrive(p): """Split a pathname into drive and path. On Posix, drive is always empty.""" + p = os.fspath(p) return p[:0], p @@ -135,6 +141,7 @@ def splitdrive(p): def basename(p): """Returns the final component of a pathname""" + p = os.fspath(p) sep = _get_sep(p) i = p.rfind(sep) + 1 return p[i:] @@ -144,6 +151,7 @@ def basename(p): def dirname(p): """Returns the directory component of a pathname""" + p = os.fspath(p) sep = _get_sep(p) i = p.rfind(sep) + 1 head = p[:i] @@ -222,6 +230,7 @@ def ismount(path): def expanduser(path): """Expand ~ and ~user constructions. If user or $HOME is unknown, do nothing.""" + path = os.fspath(path) if isinstance(path, bytes): tilde = b'~' else: @@ -267,6 +276,7 @@ _varprogb = None def expandvars(path): """Expand shell variables of form $var and ${var}. Unknown variables are left unchanged.""" + path = os.fspath(path) global _varprog, _varprogb if isinstance(path, bytes): if b'$' not in path: @@ -318,6 +328,7 @@ def expandvars(path): def normpath(path): """Normalize path, eliminating double slashes, etc.""" + path = os.fspath(path) if isinstance(path, bytes): sep = b'/' empty = b'' @@ -355,6 +366,7 @@ def normpath(path): def abspath(path): """Return an absolute path.""" + path = os.fspath(path) if not isabs(path): if isinstance(path, bytes): cwd = os.getcwdb() @@ -370,6 +382,7 @@ def abspath(path): def realpath(filename): """Return the canonical path of the specified filename, eliminating any symbolic links encountered in the path.""" + filename = os.fspath(filename) path, ok = _joinrealpath(filename[:0], filename, {}) return abspath(path) @@ -434,6 +447,7 @@ def relpath(path, start=None): if not path: raise ValueError("no path specified") + path = os.fspath(path) if isinstance(path, bytes): curdir = b'.' sep = b'/' @@ -445,6 +459,8 @@ def relpath(path, start=None): if start is None: start = curdir + else: + start = os.fspath(start) try: start_list = [x for x in abspath(start).split(sep) if x] @@ -472,6 +488,7 @@ def commonpath(paths): if not paths: raise ValueError('commonpath() arg is an empty sequence') + paths = tuple(map(os.fspath, paths)) if isinstance(paths[0], bytes): sep = b'/' curdir = b'.' diff --git a/Lib/pstats.py b/Lib/pstats.py index 2c5bf98..d861413 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -48,14 +48,11 @@ class Stats: printed. The sort_stats() method now processes some additional options (i.e., in - addition to the old -1, 0, 1, or 2 that are respectively interpreted as - 'stdname', 'calls', 'time', and 'cumulative'). It takes an arbitrary number - of quoted strings to select the sort order. - - For example sort_stats('time', 'name') sorts on the major key of 'internal - function time', and on the minor key of 'the name of the function'. Look at - the two tables in sort_stats() and get_sort_arg_defs(self) for more - examples. + addition to the old -1, 0, 1, or 2). It takes an arbitrary number of + quoted strings to select the sort order. For example sort_stats('time', + 'name') sorts on the major key of 'internal function time', and on the + minor key of 'the name of the function'. Look at the two tables in + sort_stats() and get_sort_arg_defs(self) for more examples. All methods return self, so you can string together commands like: Stats('foo', 'goo').strip_dirs().sort_stats('calls').\ diff --git a/Lib/pyclbr.py b/Lib/pyclbr.py index 4d40b87..d7dba97 100644 --- a/Lib/pyclbr.py +++ b/Lib/pyclbr.py @@ -40,12 +40,10 @@ Instances of this class have the following instance variables: """ import io -import os import sys import importlib.util import tokenize from token import NAME, DEDENT, OP -from operator import itemgetter __all__ = ["readmodule", "readmodule_ex", "Class", "Function"] @@ -328,6 +326,7 @@ def _getname(g): def _main(): # Main program for testing. import os + from operator import itemgetter mod = sys.argv[1] if os.path.exists(mod): path = [os.path.dirname(mod)] diff --git a/Lib/pydoc.py b/Lib/pydoc.py old mode 100755 new mode 100644 index 729efba..39db391 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -209,6 +209,18 @@ def classify_class_attrs(object): results.append((name, kind, cls, value)) return results +def sort_attributes(attrs, object): + 'Sort the attrs list in-place by _fields and then alphabetically by name' + # This allows data descriptors to be ordered according + # to a _fields attribute if present. + fields = getattr(object, '_fields', []) + try: + field_order = {name : i-len(fields) for (i, name) in enumerate(fields)} + except TypeError: + field_order = {} + keyfunc = lambda attr: (field_order.get(attr[0], 0), attr[0]) + attrs.sort(key=keyfunc) + # ----------------------------------------------------- module manipulation def ispackage(path): @@ -289,12 +301,7 @@ def importfile(path): """Import a Python source file or compiled file given its path.""" magic = importlib.util.MAGIC_NUMBER with open(path, 'rb') as file: - first_bytes = file.read(len(magic)) - is_bytecode = first_bytes in (magic, - # Issue #29537: handle issue27286 - # bytecode incompatibility - # See Lib/importlib/_bootstrap_external.py - importlib.util._BACKCOMPAT_MAGIC_NUMBER) + is_bytecode = magic == file.read(len(magic)) filename = os.path.basename(path) name, ext = os.path.splitext(filename) if is_bytecode: @@ -343,7 +350,7 @@ def safeimport(path, forceload=0, cache={}): elif exc is SyntaxError: # A SyntaxError occurred before we could execute the module. raise ErrorDuringImport(value.filename, info) - elif exc is ImportError and value.name == path: + elif issubclass(exc, ImportError) and value.name == path: # No such module in the path. return None else: @@ -873,8 +880,7 @@ class HTMLDoc(Doc): object.__module__) tag += ':
\n' - # Sort attrs by name. - attrs.sort(key=lambda t: t[0]) + sort_attributes(attrs, object) # Pump out the attrs, segregated by kind. attrs = spill('Methods %s' % tag, attrs, @@ -1292,8 +1298,8 @@ location listed above. else: tag = "inherited from %s" % classname(thisclass, object.__module__) - # Sort attrs by name. - attrs.sort() + + sort_attributes(attrs, object) # Pump out the attrs, segregated by kind. attrs = spill("Methods %s:\n" % tag, attrs, @@ -1423,13 +1429,14 @@ def getpager(): return plainpager if not sys.stdin.isatty() or not sys.stdout.isatty(): return plainpager - if 'PAGER' in os.environ: + use_pager = os.environ.get('MANPAGER') or os.environ.get('PAGER') + if use_pager: if sys.platform == 'win32': # pipes completely broken in Windows - return lambda text: tempfilepager(plain(text), os.environ['PAGER']) + return lambda text: tempfilepager(plain(text), use_pager) elif os.environ.get('TERM') in ('dumb', 'emacs'): - return lambda text: pipepager(plain(text), os.environ['PAGER']) + return lambda text: pipepager(plain(text), use_pager) else: - return lambda text: pipepager(text, os.environ['PAGER']) + return lambda text: pipepager(text, use_pager) if os.environ.get('TERM') in ('dumb', 'emacs'): return plainpager if sys.platform == 'win32': @@ -1906,10 +1913,10 @@ has the same effect as typing a particular string at the help> prompt. def intro(self): self.output.write(''' -Welcome to Python %s's help utility! +Welcome to Python {0}'s help utility! If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/%s/tutorial/. +the tutorial on the Internet at http://docs.python.org/{0}/tutorial/. Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1919,7 +1926,7 @@ To get a list of available modules, keywords, symbols, or topics, type "modules", "keywords", "symbols", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose name or summary contain a given string such as "spam", type "modules spam". -''' % tuple([sys.version[:3]]*2)) +'''.format('%d.%d' % sys.version_info[:2])) def list(self, items, columns=4, width=80): items = list(sorted(items)) diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index 5728e73..ad3fa25 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,79 +1,13011 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Mon Aug 7 00:56:27 2017 -topics = {'assert': u'\nThe "assert" statement\n**********************\n\nAssert statements are a convenient way to insert debugging assertions\ninto a program:\n\n assert_stmt ::= "assert" expression ["," expression]\n\nThe simple form, "assert expression", is equivalent to\n\n if __debug__:\n if not expression: raise AssertionError\n\nThe extended form, "assert expression1, expression2", is equivalent to\n\n if __debug__:\n if not expression1: raise AssertionError(expression2)\n\nThese equivalences assume that "__debug__" and "AssertionError" refer\nto the built-in variables with those names. In the current\nimplementation, the built-in variable "__debug__" is "True" under\nnormal circumstances, "False" when optimization is requested (command\nline option -O). The current code generator emits no code for an\nassert statement when optimization is requested at compile time. Note\nthat it is unnecessary to include the source code for the expression\nthat failed in the error message; it will be displayed as part of the\nstack trace.\n\nAssignments to "__debug__" are illegal. The value for the built-in\nvariable is determined when the interpreter starts.\n', - 'assignment': u'\nAssignment statements\n*********************\n\nAssignment statements are used to (re)bind names to values and to\nmodify attributes or items of mutable objects:\n\n assignment_stmt ::= (target_list "=")+ (starred_expression | yield_expression)\n target_list ::= target ("," target)* [","]\n target ::= identifier\n | "(" target_list ")"\n | "[" [target_list] "]"\n | attributeref\n | subscription\n | slicing\n | "*" target\n\n(See section *Primaries* for the syntax definitions for\n*attributeref*, *subscription*, and *slicing*.)\n\nAn assignment statement evaluates the expression list (remember that\nthis can be a single expression or a comma-separated list, the latter\nyielding a tuple) and assigns the single resulting object to each of\nthe target lists, from left to right.\n\nAssignment is defined recursively depending on the form of the target\n(list). When a target is part of a mutable object (an attribute\nreference, subscription or slicing), the mutable object must\nultimately perform the assignment and decide about its validity, and\nmay raise an exception if the assignment is unacceptable. The rules\nobserved by various types and the exceptions raised are given with the\ndefinition of the object types (see section *The standard type\nhierarchy*).\n\nAssignment of an object to a target list, optionally enclosed in\nparentheses or square brackets, is recursively defined as follows.\n\n* If the target list is empty: The object must also be an empty\n iterable.\n\n* If the target list is a single target in parentheses: The object\n is assigned to that target.\n\n* If the target list is a comma-separated list of targets, or a\n single target in square brackets: The object must be an iterable\n with the same number of items as there are targets in the target\n list, and the items are assigned, from left to right, to the\n corresponding targets.\n\n * If the target list contains one target prefixed with an\n asterisk, called a "starred" target: The object must be an\n iterable with at least as many items as there are targets in the\n target list, minus one. The first items of the iterable are\n assigned, from left to right, to the targets before the starred\n target. The final items of the iterable are assigned to the\n targets after the starred target. A list of the remaining items\n in the iterable is then assigned to the starred target (the list\n can be empty).\n\n * Else: The object must be an iterable with the same number of\n items as there are targets in the target list, and the items are\n assigned, from left to right, to the corresponding targets.\n\nAssignment of an object to a single target is recursively defined as\nfollows.\n\n* If the target is an identifier (name):\n\n * If the name does not occur in a "global" or "nonlocal" statement\n in the current code block: the name is bound to the object in the\n current local namespace.\n\n * Otherwise: the name is bound to the object in the global\n namespace or the outer namespace determined by "nonlocal",\n respectively.\n\n The name is rebound if it was already bound. This may cause the\n reference count for the object previously bound to the name to reach\n zero, causing the object to be deallocated and its destructor (if it\n has one) to be called.\n\n* If the target is an attribute reference: The primary expression in\n the reference is evaluated. It should yield an object with\n assignable attributes; if this is not the case, "TypeError" is\n raised. That object is then asked to assign the assigned object to\n the given attribute; if it cannot perform the assignment, it raises\n an exception (usually but not necessarily "AttributeError").\n\n Note: If the object is a class instance and the attribute reference\n occurs on both sides of the assignment operator, the RHS expression,\n "a.x" can access either an instance attribute or (if no instance\n attribute exists) a class attribute. The LHS target "a.x" is always\n set as an instance attribute, creating it if necessary. Thus, the\n two occurrences of "a.x" do not necessarily refer to the same\n attribute: if the RHS expression refers to a class attribute, the\n LHS creates a new instance attribute as the target of the\n assignment:\n\n class Cls:\n x = 3 # class variable\n inst = Cls()\n inst.x = inst.x + 1 # writes inst.x as 4 leaving Cls.x as 3\n\n This description does not necessarily apply to descriptor\n attributes, such as properties created with "property()".\n\n* If the target is a subscription: The primary expression in the\n reference is evaluated. It should yield either a mutable sequence\n object (such as a list) or a mapping object (such as a dictionary).\n Next, the subscript expression is evaluated.\n\n If the primary is a mutable sequence object (such as a list), the\n subscript must yield an integer. If it is negative, the sequence\'s\n length is added to it. The resulting value must be a nonnegative\n integer less than the sequence\'s length, and the sequence is asked\n to assign the assigned object to its item with that index. If the\n index is out of range, "IndexError" is raised (assignment to a\n subscripted sequence cannot add new items to a list).\n\n If the primary is a mapping object (such as a dictionary), the\n subscript must have a type compatible with the mapping\'s key type,\n and the mapping is then asked to create a key/datum pair which maps\n the subscript to the assigned object. This can either replace an\n existing key/value pair with the same key value, or insert a new\n key/value pair (if no key with the same value existed).\n\n For user-defined objects, the "__setitem__()" method is called with\n appropriate arguments.\n\n* If the target is a slicing: The primary expression in the\n reference is evaluated. It should yield a mutable sequence object\n (such as a list). The assigned object should be a sequence object\n of the same type. Next, the lower and upper bound expressions are\n evaluated, insofar they are present; defaults are zero and the\n sequence\'s length. The bounds should evaluate to integers. If\n either bound is negative, the sequence\'s length is added to it. The\n resulting bounds are clipped to lie between zero and the sequence\'s\n length, inclusive. Finally, the sequence object is asked to replace\n the slice with the items of the assigned sequence. The length of\n the slice may be different from the length of the assigned sequence,\n thus changing the length of the target sequence, if the target\n sequence allows it.\n\n**CPython implementation detail:** In the current implementation, the\nsyntax for targets is taken to be the same as for expressions, and\ninvalid syntax is rejected during the code generation phase, causing\nless detailed error messages.\n\nAlthough the definition of assignment implies that overlaps between\nthe left-hand side and the right-hand side are \'simultaneous\' (for\nexample "a, b = b, a" swaps two variables), overlaps *within* the\ncollection of assigned-to variables occur left-to-right, sometimes\nresulting in confusion. For instance, the following program prints\n"[0, 2]":\n\n x = [0, 1]\n i = 0\n i, x[i] = 1, 2 # i is updated, then x[i] is updated\n print(x)\n\nSee also: **PEP 3132** - Extended Iterable Unpacking\n\n The specification for the "*target" feature.\n\n\nAugmented assignment statements\n===============================\n\nAugmented assignment is the combination, in a single statement, of a\nbinary operation and an assignment statement:\n\n augmented_assignment_stmt ::= augtarget augop (expression_list | yield_expression)\n augtarget ::= identifier | attributeref | subscription | slicing\n augop ::= "+=" | "-=" | "*=" | "@=" | "/=" | "//=" | "%=" | "**="\n | ">>=" | "<<=" | "&=" | "^=" | "|="\n\n(See section *Primaries* for the syntax definitions of the last three\nsymbols.)\n\nAn augmented assignment evaluates the target (which, unlike normal\nassignment statements, cannot be an unpacking) and the expression\nlist, performs the binary operation specific to the type of assignment\non the two operands, and assigns the result to the original target.\nThe target is only evaluated once.\n\nAn augmented assignment expression like "x += 1" can be rewritten as\n"x = x + 1" to achieve a similar, but not exactly equal effect. In the\naugmented version, "x" is only evaluated once. Also, when possible,\nthe actual operation is performed *in-place*, meaning that rather than\ncreating a new object and assigning that to the target, the old object\nis modified instead.\n\nUnlike normal assignments, augmented assignments evaluate the left-\nhand side *before* evaluating the right-hand side. For example, "a[i]\n+= f(x)" first looks-up "a[i]", then it evaluates "f(x)" and performs\nthe addition, and lastly, it writes the result back to "a[i]".\n\nWith the exception of assigning to tuples and multiple targets in a\nsingle statement, the assignment done by augmented assignment\nstatements is handled the same way as normal assignments. Similarly,\nwith the exception of the possible *in-place* behavior, the binary\noperation performed by augmented assignment is the same as the normal\nbinary operations.\n\nFor targets which are attribute references, the same *caveat about\nclass and instance attributes* applies as for regular assignments.\n', - 'atom-identifiers': u'\nIdentifiers (Names)\n*******************\n\nAn identifier occurring as an atom is a name. See section\n*Identifiers and keywords* for lexical definition and section *Naming\nand binding* for documentation of naming and binding.\n\nWhen the name is bound to an object, evaluation of the atom yields\nthat object. When a name is not bound, an attempt to evaluate it\nraises a "NameError" exception.\n\n**Private name mangling:** When an identifier that textually occurs in\na class definition begins with two or more underscore characters and\ndoes not end in two or more underscores, it is considered a *private\nname* of that class. Private names are transformed to a longer form\nbefore code is generated for them. The transformation inserts the\nclass name, with leading underscores removed and a single underscore\ninserted, in front of the name. For example, the identifier "__spam"\noccurring in a class named "Ham" will be transformed to "_Ham__spam".\nThis transformation is independent of the syntactical context in which\nthe identifier is used. If the transformed name is extremely long\n(longer than 255 characters), implementation defined truncation may\nhappen. If the class name consists only of underscores, no\ntransformation is done.\n', - 'atom-literals': u"\nLiterals\n********\n\nPython supports string and bytes literals and various numeric\nliterals:\n\n literal ::= stringliteral | bytesliteral\n | integer | floatnumber | imagnumber\n\nEvaluation of a literal yields an object of the given type (string,\nbytes, integer, floating point number, complex number) with the given\nvalue. The value may be approximated in the case of floating point\nand imaginary (complex) literals. See section *Literals* for details.\n\nAll literals correspond to immutable data types, and hence the\nobject's identity is less important than its value. Multiple\nevaluations of literals with the same value (either the same\noccurrence in the program text or a different occurrence) may obtain\nthe same object or a different object with the same value.\n", - 'attribute-access': u'\nCustomizing attribute access\n****************************\n\nThe following methods can be defined to customize the meaning of\nattribute access (use of, assignment to, or deletion of "x.name") for\nclass instances.\n\nobject.__getattr__(self, name)\n\n Called when an attribute lookup has not found the attribute in the\n usual places (i.e. it is not an instance attribute nor is it found\n in the class tree for "self"). "name" is the attribute name. This\n method should return the (computed) attribute value or raise an\n "AttributeError" exception.\n\n Note that if the attribute is found through the normal mechanism,\n "__getattr__()" is not called. (This is an intentional asymmetry\n between "__getattr__()" and "__setattr__()".) This is done both for\n efficiency reasons and because otherwise "__getattr__()" would have\n no way to access other attributes of the instance. Note that at\n least for instance variables, you can fake total control by not\n inserting any values in the instance attribute dictionary (but\n instead inserting them in another object). See the\n "__getattribute__()" method below for a way to actually get total\n control over attribute access.\n\nobject.__getattribute__(self, name)\n\n Called unconditionally to implement attribute accesses for\n instances of the class. If the class also defines "__getattr__()",\n the latter will not be called unless "__getattribute__()" either\n calls it explicitly or raises an "AttributeError". This method\n should return the (computed) attribute value or raise an\n "AttributeError" exception. In order to avoid infinite recursion in\n this method, its implementation should always call the base class\n method with the same name to access any attributes it needs, for\n example, "object.__getattribute__(self, name)".\n\n Note: This method may still be bypassed when looking up special\n methods as the result of implicit invocation via language syntax\n or built-in functions. See *Special method lookup*.\n\nobject.__setattr__(self, name, value)\n\n Called when an attribute assignment is attempted. This is called\n instead of the normal mechanism (i.e. store the value in the\n instance dictionary). *name* is the attribute name, *value* is the\n value to be assigned to it.\n\n If "__setattr__()" wants to assign to an instance attribute, it\n should call the base class method with the same name, for example,\n "object.__setattr__(self, name, value)".\n\nobject.__delattr__(self, name)\n\n Like "__setattr__()" but for attribute deletion instead of\n assignment. This should only be implemented if "del obj.name" is\n meaningful for the object.\n\nobject.__dir__(self)\n\n Called when "dir()" is called on the object. A sequence must be\n returned. "dir()" converts the returned sequence to a list and\n sorts it.\n\n\nImplementing Descriptors\n========================\n\nThe following methods only apply when an instance of the class\ncontaining the method (a so-called *descriptor* class) appears in an\n*owner* class (the descriptor must be in either the owner\'s class\ndictionary or in the class dictionary for one of its parents). In the\nexamples below, "the attribute" refers to the attribute whose name is\nthe key of the property in the owner class\' "__dict__".\n\nobject.__get__(self, instance, owner)\n\n Called to get the attribute of the owner class (class attribute\n access) or of an instance of that class (instance attribute\n access). *owner* is always the owner class, while *instance* is the\n instance that the attribute was accessed through, or "None" when\n the attribute is accessed through the *owner*. This method should\n return the (computed) attribute value or raise an "AttributeError"\n exception.\n\nobject.__set__(self, instance, value)\n\n Called to set the attribute on an instance *instance* of the owner\n class to a new value, *value*.\n\nobject.__delete__(self, instance)\n\n Called to delete the attribute on an instance *instance* of the\n owner class.\n\nThe attribute "__objclass__" is interpreted by the "inspect" module as\nspecifying the class where this object was defined (setting this\nappropriately can assist in runtime introspection of dynamic class\nattributes). For callables, it may indicate that an instance of the\ngiven type (or a subclass) is expected or required as the first\npositional argument (for example, CPython sets this attribute for\nunbound methods that are implemented in C).\n\n\nInvoking Descriptors\n====================\n\nIn general, a descriptor is an object attribute with "binding\nbehavior", one whose attribute access has been overridden by methods\nin the descriptor protocol: "__get__()", "__set__()", and\n"__delete__()". If any of those methods are defined for an object, it\nis said to be a descriptor.\n\nThe default behavior for attribute access is to get, set, or delete\nthe attribute from an object\'s dictionary. For instance, "a.x" has a\nlookup chain starting with "a.__dict__[\'x\']", then\n"type(a).__dict__[\'x\']", and continuing through the base classes of\n"type(a)" excluding metaclasses.\n\nHowever, if the looked-up value is an object defining one of the\ndescriptor methods, then Python may override the default behavior and\ninvoke the descriptor method instead. Where this occurs in the\nprecedence chain depends on which descriptor methods were defined and\nhow they were called.\n\nThe starting point for descriptor invocation is a binding, "a.x". How\nthe arguments are assembled depends on "a":\n\nDirect Call\n The simplest and least common call is when user code directly\n invokes a descriptor method: "x.__get__(a)".\n\nInstance Binding\n If binding to an object instance, "a.x" is transformed into the\n call: "type(a).__dict__[\'x\'].__get__(a, type(a))".\n\nClass Binding\n If binding to a class, "A.x" is transformed into the call:\n "A.__dict__[\'x\'].__get__(None, A)".\n\nSuper Binding\n If "a" is an instance of "super", then the binding "super(B,\n obj).m()" searches "obj.__class__.__mro__" for the base class "A"\n immediately preceding "B" and then invokes the descriptor with the\n call: "A.__dict__[\'m\'].__get__(obj, obj.__class__)".\n\nFor instance bindings, the precedence of descriptor invocation depends\non the which descriptor methods are defined. A descriptor can define\nany combination of "__get__()", "__set__()" and "__delete__()". If it\ndoes not define "__get__()", then accessing the attribute will return\nthe descriptor object itself unless there is a value in the object\'s\ninstance dictionary. If the descriptor defines "__set__()" and/or\n"__delete__()", it is a data descriptor; if it defines neither, it is\na non-data descriptor. Normally, data descriptors define both\n"__get__()" and "__set__()", while non-data descriptors have just the\n"__get__()" method. Data descriptors with "__set__()" and "__get__()"\ndefined always override a redefinition in an instance dictionary. In\ncontrast, non-data descriptors can be overridden by instances.\n\nPython methods (including "staticmethod()" and "classmethod()") are\nimplemented as non-data descriptors. Accordingly, instances can\nredefine and override methods. This allows individual instances to\nacquire behaviors that differ from other instances of the same class.\n\nThe "property()" function is implemented as a data descriptor.\nAccordingly, instances cannot override the behavior of a property.\n\n\n__slots__\n=========\n\nBy default, instances of classes have a dictionary for attribute\nstorage. This wastes space for objects having very few instance\nvariables. The space consumption can become acute when creating large\nnumbers of instances.\n\nThe default can be overridden by defining *__slots__* in a class\ndefinition. The *__slots__* declaration takes a sequence of instance\nvariables and reserves just enough space in each instance to hold a\nvalue for each variable. Space is saved because *__dict__* is not\ncreated for each instance.\n\nobject.__slots__\n\n This class variable can be assigned a string, iterable, or sequence\n of strings with variable names used by instances. *__slots__*\n reserves space for the declared variables and prevents the\n automatic creation of *__dict__* and *__weakref__* for each\n instance.\n\n\nNotes on using *__slots__*\n--------------------------\n\n* When inheriting from a class without *__slots__*, the *__dict__*\n attribute of that class will always be accessible, so a *__slots__*\n definition in the subclass is meaningless.\n\n* Without a *__dict__* variable, instances cannot be assigned new\n variables not listed in the *__slots__* definition. Attempts to\n assign to an unlisted variable name raises "AttributeError". If\n dynamic assignment of new variables is desired, then add\n "\'__dict__\'" to the sequence of strings in the *__slots__*\n declaration.\n\n* Without a *__weakref__* variable for each instance, classes\n defining *__slots__* do not support weak references to its\n instances. If weak reference support is needed, then add\n "\'__weakref__\'" to the sequence of strings in the *__slots__*\n declaration.\n\n* *__slots__* are implemented at the class level by creating\n descriptors (*Implementing Descriptors*) for each variable name. As\n a result, class attributes cannot be used to set default values for\n instance variables defined by *__slots__*; otherwise, the class\n attribute would overwrite the descriptor assignment.\n\n* The action of a *__slots__* declaration is limited to the class\n where it is defined. As a result, subclasses will have a *__dict__*\n unless they also define *__slots__* (which must only contain names\n of any *additional* slots).\n\n* If a class defines a slot also defined in a base class, the\n instance variable defined by the base class slot is inaccessible\n (except by retrieving its descriptor directly from the base class).\n This renders the meaning of the program undefined. In the future, a\n check may be added to prevent this.\n\n* Nonempty *__slots__* does not work for classes derived from\n "variable-length" built-in types such as "int", "bytes" and "tuple".\n\n* Any non-string iterable may be assigned to *__slots__*. Mappings\n may also be used; however, in the future, special meaning may be\n assigned to the values corresponding to each key.\n\n* *__class__* assignment works only if both classes have the same\n *__slots__*.\n', - 'attribute-references': u'\nAttribute references\n********************\n\nAn attribute reference is a primary followed by a period and a name:\n\n attributeref ::= primary "." identifier\n\nThe primary must evaluate to an object of a type that supports\nattribute references, which most objects do. This object is then\nasked to produce the attribute whose name is the identifier. This\nproduction can be customized by overriding the "__getattr__()" method.\nIf this attribute is not available, the exception "AttributeError" is\nraised. Otherwise, the type and value of the object produced is\ndetermined by the object. Multiple evaluations of the same attribute\nreference may yield different objects.\n', - 'augassign': u'\nAugmented assignment statements\n*******************************\n\nAugmented assignment is the combination, in a single statement, of a\nbinary operation and an assignment statement:\n\n augmented_assignment_stmt ::= augtarget augop (expression_list | yield_expression)\n augtarget ::= identifier | attributeref | subscription | slicing\n augop ::= "+=" | "-=" | "*=" | "@=" | "/=" | "//=" | "%=" | "**="\n | ">>=" | "<<=" | "&=" | "^=" | "|="\n\n(See section *Primaries* for the syntax definitions of the last three\nsymbols.)\n\nAn augmented assignment evaluates the target (which, unlike normal\nassignment statements, cannot be an unpacking) and the expression\nlist, performs the binary operation specific to the type of assignment\non the two operands, and assigns the result to the original target.\nThe target is only evaluated once.\n\nAn augmented assignment expression like "x += 1" can be rewritten as\n"x = x + 1" to achieve a similar, but not exactly equal effect. In the\naugmented version, "x" is only evaluated once. Also, when possible,\nthe actual operation is performed *in-place*, meaning that rather than\ncreating a new object and assigning that to the target, the old object\nis modified instead.\n\nUnlike normal assignments, augmented assignments evaluate the left-\nhand side *before* evaluating the right-hand side. For example, "a[i]\n+= f(x)" first looks-up "a[i]", then it evaluates "f(x)" and performs\nthe addition, and lastly, it writes the result back to "a[i]".\n\nWith the exception of assigning to tuples and multiple targets in a\nsingle statement, the assignment done by augmented assignment\nstatements is handled the same way as normal assignments. Similarly,\nwith the exception of the possible *in-place* behavior, the binary\noperation performed by augmented assignment is the same as the normal\nbinary operations.\n\nFor targets which are attribute references, the same *caveat about\nclass and instance attributes* applies as for regular assignments.\n', - 'binary': u'\nBinary arithmetic operations\n****************************\n\nThe binary arithmetic operations have the conventional priority\nlevels. Note that some of these operations also apply to certain non-\nnumeric types. Apart from the power operator, there are only two\nlevels, one for multiplicative operators and one for additive\noperators:\n\n m_expr ::= u_expr | m_expr "*" u_expr | m_expr "@" m_expr |\n m_expr "//" u_expr| m_expr "/" u_expr |\n m_expr "%" u_expr\n a_expr ::= m_expr | a_expr "+" m_expr | a_expr "-" m_expr\n\nThe "*" (multiplication) operator yields the product of its arguments.\nThe arguments must either both be numbers, or one argument must be an\ninteger and the other must be a sequence. In the former case, the\nnumbers are converted to a common type and then multiplied together.\nIn the latter case, sequence repetition is performed; a negative\nrepetition factor yields an empty sequence.\n\nThe "@" (at) operator is intended to be used for matrix\nmultiplication. No builtin Python types implement this operator.\n\nNew in version 3.5.\n\nThe "/" (division) and "//" (floor division) operators yield the\nquotient of their arguments. The numeric arguments are first\nconverted to a common type. Division of integers yields a float, while\nfloor division of integers results in an integer; the result is that\nof mathematical division with the \'floor\' function applied to the\nresult. Division by zero raises the "ZeroDivisionError" exception.\n\nThe "%" (modulo) operator yields the remainder from the division of\nthe first argument by the second. The numeric arguments are first\nconverted to a common type. A zero right argument raises the\n"ZeroDivisionError" exception. The arguments may be floating point\nnumbers, e.g., "3.14%0.7" equals "0.34" (since "3.14" equals "4*0.7 +\n0.34".) The modulo operator always yields a result with the same sign\nas its second operand (or zero); the absolute value of the result is\nstrictly smaller than the absolute value of the second operand [1].\n\nThe floor division and modulo operators are connected by the following\nidentity: "x == (x//y)*y + (x%y)". Floor division and modulo are also\nconnected with the built-in function "divmod()": "divmod(x, y) ==\n(x//y, x%y)". [2].\n\nIn addition to performing the modulo operation on numbers, the "%"\noperator is also overloaded by string objects to perform old-style\nstring formatting (also known as interpolation). The syntax for\nstring formatting is described in the Python Library Reference,\nsection *printf-style String Formatting*.\n\nThe floor division operator, the modulo operator, and the "divmod()"\nfunction are not defined for complex numbers. Instead, convert to a\nfloating point number using the "abs()" function if appropriate.\n\nThe "+" (addition) operator yields the sum of its arguments. The\narguments must either both be numbers or both be sequences of the same\ntype. In the former case, the numbers are converted to a common type\nand then added together. In the latter case, the sequences are\nconcatenated.\n\nThe "-" (subtraction) operator yields the difference of its arguments.\nThe numeric arguments are first converted to a common type.\n', - 'bitwise': u'\nBinary bitwise operations\n*************************\n\nEach of the three bitwise operations has a different priority level:\n\n and_expr ::= shift_expr | and_expr "&" shift_expr\n xor_expr ::= and_expr | xor_expr "^" and_expr\n or_expr ::= xor_expr | or_expr "|" xor_expr\n\nThe "&" operator yields the bitwise AND of its arguments, which must\nbe integers.\n\nThe "^" operator yields the bitwise XOR (exclusive OR) of its\narguments, which must be integers.\n\nThe "|" operator yields the bitwise (inclusive) OR of its arguments,\nwhich must be integers.\n', - 'bltin-code-objects': u'\nCode Objects\n************\n\nCode objects are used by the implementation to represent "pseudo-\ncompiled" executable Python code such as a function body. They differ\nfrom function objects because they don\'t contain a reference to their\nglobal execution environment. Code objects are returned by the built-\nin "compile()" function and can be extracted from function objects\nthrough their "__code__" attribute. See also the "code" module.\n\nA code object can be executed or evaluated by passing it (instead of a\nsource string) to the "exec()" or "eval()" built-in functions.\n\nSee *The standard type hierarchy* for more information.\n', - 'bltin-ellipsis-object': u'\nThe Ellipsis Object\n*******************\n\nThis object is commonly used by slicing (see *Slicings*). It supports\nno special operations. There is exactly one ellipsis object, named\n"Ellipsis" (a built-in name). "type(Ellipsis)()" produces the\n"Ellipsis" singleton.\n\nIt is written as "Ellipsis" or "...".\n', - 'bltin-null-object': u'\nThe Null Object\n***************\n\nThis object is returned by functions that don\'t explicitly return a\nvalue. It supports no special operations. There is exactly one null\nobject, named "None" (a built-in name). "type(None)()" produces the\nsame singleton.\n\nIt is written as "None".\n', - 'bltin-type-objects': u'\nType Objects\n************\n\nType objects represent the various object types. An object\'s type is\naccessed by the built-in function "type()". There are no special\noperations on types. The standard module "types" defines names for\nall standard built-in types.\n\nTypes are written like this: "".\n', - 'booleans': u'\nBoolean operations\n******************\n\n or_test ::= and_test | or_test "or" and_test\n and_test ::= not_test | and_test "and" not_test\n not_test ::= comparison | "not" not_test\n\nIn the context of Boolean operations, and also when expressions are\nused by control flow statements, the following values are interpreted\nas false: "False", "None", numeric zero of all types, and empty\nstrings and containers (including strings, tuples, lists,\ndictionaries, sets and frozensets). All other values are interpreted\nas true. User-defined objects can customize their truth value by\nproviding a "__bool__()" method.\n\nThe operator "not" yields "True" if its argument is false, "False"\notherwise.\n\nThe expression "x and y" first evaluates *x*; if *x* is false, its\nvalue is returned; otherwise, *y* is evaluated and the resulting value\nis returned.\n\nThe expression "x or y" first evaluates *x*; if *x* is true, its value\nis returned; otherwise, *y* is evaluated and the resulting value is\nreturned.\n\n(Note that neither "and" nor "or" restrict the value and type they\nreturn to "False" and "True", but rather return the last evaluated\nargument. This is sometimes useful, e.g., if "s" is a string that\nshould be replaced by a default value if it is empty, the expression\n"s or \'foo\'" yields the desired value. Because "not" has to create a\nnew value, it returns a boolean value regardless of the type of its\nargument (for example, "not \'foo\'" produces "False" rather than "\'\'".)\n', - 'break': u'\nThe "break" statement\n*********************\n\n break_stmt ::= "break"\n\n"break" may only occur syntactically nested in a "for" or "while"\nloop, but not nested in a function or class definition within that\nloop.\n\nIt terminates the nearest enclosing loop, skipping the optional "else"\nclause if the loop has one.\n\nIf a "for" loop is terminated by "break", the loop control target\nkeeps its current value.\n\nWhen "break" passes control out of a "try" statement with a "finally"\nclause, that "finally" clause is executed before really leaving the\nloop.\n', - 'callable-types': u'\nEmulating callable objects\n**************************\n\nobject.__call__(self[, args...])\n\n Called when the instance is "called" as a function; if this method\n is defined, "x(arg1, arg2, ...)" is a shorthand for\n "x.__call__(arg1, arg2, ...)".\n', - 'calls': u'\nCalls\n*****\n\nA call calls a callable object (e.g., a *function*) with a possibly\nempty series of *arguments*:\n\n call ::= primary "(" [argument_list [","] | comprehension] ")"\n argument_list ::= positional_arguments ["," starred_and_keywords]\n ["," keywords_arguments]\n | starred_and_keywords ["," keywords_arguments]\n | keywords_arguments\n positional_arguments ::= ["*"] expression ("," ["*"] expression)*\n starred_and_keywords ::= ("*" expression | keyword_item)\n ("," "*" expression | "," keyword_item)*\n keywords_arguments ::= (keyword_item | "**" expression)\n ("," keyword_item | "," "**" expression)*\n keyword_item ::= identifier "=" expression\n\nAn optional trailing comma may be present after the positional and\nkeyword arguments but does not affect the semantics.\n\nThe primary must evaluate to a callable object (user-defined\nfunctions, built-in functions, methods of built-in objects, class\nobjects, methods of class instances, and all objects having a\n"__call__()" method are callable). All argument expressions are\nevaluated before the call is attempted. Please refer to section\n*Function definitions* for the syntax of formal *parameter* lists.\n\nIf keyword arguments are present, they are first converted to\npositional arguments, as follows. First, a list of unfilled slots is\ncreated for the formal parameters. If there are N positional\narguments, they are placed in the first N slots. Next, for each\nkeyword argument, the identifier is used to determine the\ncorresponding slot (if the identifier is the same as the first formal\nparameter name, the first slot is used, and so on). If the slot is\nalready filled, a "TypeError" exception is raised. Otherwise, the\nvalue of the argument is placed in the slot, filling it (even if the\nexpression is "None", it fills the slot). When all arguments have\nbeen processed, the slots that are still unfilled are filled with the\ncorresponding default value from the function definition. (Default\nvalues are calculated, once, when the function is defined; thus, a\nmutable object such as a list or dictionary used as default value will\nbe shared by all calls that don\'t specify an argument value for the\ncorresponding slot; this should usually be avoided.) If there are any\nunfilled slots for which no default value is specified, a "TypeError"\nexception is raised. Otherwise, the list of filled slots is used as\nthe argument list for the call.\n\n**CPython implementation detail:** An implementation may provide\nbuilt-in functions whose positional parameters do not have names, even\nif they are \'named\' for the purpose of documentation, and which\ntherefore cannot be supplied by keyword. In CPython, this is the case\nfor functions implemented in C that use "PyArg_ParseTuple()" to parse\ntheir arguments.\n\nIf there are more positional arguments than there are formal parameter\nslots, a "TypeError" exception is raised, unless a formal parameter\nusing the syntax "*identifier" is present; in this case, that formal\nparameter receives a tuple containing the excess positional arguments\n(or an empty tuple if there were no excess positional arguments).\n\nIf any keyword argument does not correspond to a formal parameter\nname, a "TypeError" exception is raised, unless a formal parameter\nusing the syntax "**identifier" is present; in this case, that formal\nparameter receives a dictionary containing the excess keyword\narguments (using the keywords as keys and the argument values as\ncorresponding values), or a (new) empty dictionary if there were no\nexcess keyword arguments.\n\nIf the syntax "*expression" appears in the function call, "expression"\nmust evaluate to an *iterable*. Elements from these iterables are\ntreated as if they were additional positional arguments. For the call\n"f(x1, x2, *y, x3, x4)", if *y* evaluates to a sequence *y1*, ...,\n*yM*, this is equivalent to a call with M+4 positional arguments *x1*,\n*x2*, *y1*, ..., *yM*, *x3*, *x4*.\n\nA consequence of this is that although the "*expression" syntax may\nappear *after* explicit keyword arguments, it is processed *before*\nthe keyword arguments (and any "**expression" arguments -- see below).\nSo:\n\n >>> def f(a, b):\n ... print(a, b)\n ...\n >>> f(b=1, *(2,))\n 2 1\n >>> f(a=1, *(2,))\n Traceback (most recent call last):\n File "", line 1, in \n TypeError: f() got multiple values for keyword argument \'a\'\n >>> f(1, *(2,))\n 1 2\n\nIt is unusual for both keyword arguments and the "*expression" syntax\nto be used in the same call, so in practice this confusion does not\narise.\n\nIf the syntax "**expression" appears in the function call,\n"expression" must evaluate to a *mapping*, the contents of which are\ntreated as additional keyword arguments. If a keyword is already\npresent (as an explicit keyword argument, or from another unpacking),\na "TypeError" exception is raised.\n\nFormal parameters using the syntax "*identifier" or "**identifier"\ncannot be used as positional argument slots or as keyword argument\nnames.\n\nChanged in version 3.5: Function calls accept any number of "*" and\n"**" unpackings, positional arguments may follow iterable unpackings\n("*"), and keyword arguments may follow dictionary unpackings ("**").\nOriginally proposed by **PEP 448**.\n\nA call always returns some value, possibly "None", unless it raises an\nexception. How this value is computed depends on the type of the\ncallable object.\n\nIf it is---\n\na user-defined function:\n The code block for the function is executed, passing it the\n argument list. The first thing the code block will do is bind the\n formal parameters to the arguments; this is described in section\n *Function definitions*. When the code block executes a "return"\n statement, this specifies the return value of the function call.\n\na built-in function or method:\n The result is up to the interpreter; see *Built-in Functions* for\n the descriptions of built-in functions and methods.\n\na class object:\n A new instance of that class is returned.\n\na class instance method:\n The corresponding user-defined function is called, with an argument\n list that is one longer than the argument list of the call: the\n instance becomes the first argument.\n\na class instance:\n The class must define a "__call__()" method; the effect is then the\n same as if that method was called.\n', - 'class': u'\nClass definitions\n*****************\n\nA class definition defines a class object (see section *The standard\ntype hierarchy*):\n\n classdef ::= [decorators] "class" classname [inheritance] ":" suite\n inheritance ::= "(" [argument_list] ")"\n classname ::= identifier\n\nA class definition is an executable statement. The inheritance list\nusually gives a list of base classes (see *Customizing class creation*\nfor more advanced uses), so each item in the list should evaluate to a\nclass object which allows subclassing. Classes without an inheritance\nlist inherit, by default, from the base class "object"; hence,\n\n class Foo:\n pass\n\nis equivalent to\n\n class Foo(object):\n pass\n\nThe class\'s suite is then executed in a new execution frame (see\n*Naming and binding*), using a newly created local namespace and the\noriginal global namespace. (Usually, the suite contains mostly\nfunction definitions.) When the class\'s suite finishes execution, its\nexecution frame is discarded but its local namespace is saved. [4] A\nclass object is then created using the inheritance list for the base\nclasses and the saved local namespace for the attribute dictionary.\nThe class name is bound to this class object in the original local\nnamespace.\n\nClass creation can be customized heavily using *metaclasses*.\n\nClasses can also be decorated: just like when decorating functions,\n\n @f1(arg)\n @f2\n class Foo: pass\n\nis roughly equivalent to\n\n class Foo: pass\n Foo = f1(arg)(f2(Foo))\n\nThe evaluation rules for the decorator expressions are the same as for\nfunction decorators. The result is then bound to the class name.\n\n**Programmer\'s note:** Variables defined in the class definition are\nclass attributes; they are shared by instances. Instance attributes\ncan be set in a method with "self.name = value". Both class and\ninstance attributes are accessible through the notation ""self.name"",\nand an instance attribute hides a class attribute with the same name\nwhen accessed in this way. Class attributes can be used as defaults\nfor instance attributes, but using mutable values there can lead to\nunexpected results. *Descriptors* can be used to create instance\nvariables with different implementation details.\n\nSee also: **PEP 3115** - Metaclasses in Python 3 **PEP 3129** -\n Class Decorators\n', - 'comparisons': u'\nComparisons\n***********\n\nUnlike C, all comparison operations in Python have the same priority,\nwhich is lower than that of any arithmetic, shifting or bitwise\noperation. Also unlike C, expressions like "a < b < c" have the\ninterpretation that is conventional in mathematics:\n\n comparison ::= or_expr ( comp_operator or_expr )*\n comp_operator ::= "<" | ">" | "==" | ">=" | "<=" | "!="\n | "is" ["not"] | ["not"] "in"\n\nComparisons yield boolean values: "True" or "False".\n\nComparisons can be chained arbitrarily, e.g., "x < y <= z" is\nequivalent to "x < y and y <= z", except that "y" is evaluated only\nonce (but in both cases "z" is not evaluated at all when "x < y" is\nfound to be false).\n\nFormally, if *a*, *b*, *c*, ..., *y*, *z* are expressions and *op1*,\n*op2*, ..., *opN* are comparison operators, then "a op1 b op2 c ... y\nopN z" is equivalent to "a op1 b and b op2 c and ... y opN z", except\nthat each expression is evaluated at most once.\n\nNote that "a op1 b op2 c" doesn\'t imply any kind of comparison between\n*a* and *c*, so that, e.g., "x < y > z" is perfectly legal (though\nperhaps not pretty).\n\n\nValue comparisons\n=================\n\nThe operators "<", ">", "==", ">=", "<=", and "!=" compare the values\nof two objects. The objects do not need to have the same type.\n\nChapter *Objects, values and types* states that objects have a value\n(in addition to type and identity). The value of an object is a\nrather abstract notion in Python: For example, there is no canonical\naccess method for an object\'s value. Also, there is no requirement\nthat the value of an object should be constructed in a particular way,\ne.g. comprised of all its data attributes. Comparison operators\nimplement a particular notion of what the value of an object is. One\ncan think of them as defining the value of an object indirectly, by\nmeans of their comparison implementation.\n\nBecause all types are (direct or indirect) subtypes of "object", they\ninherit the default comparison behavior from "object". Types can\ncustomize their comparison behavior by implementing *rich comparison\nmethods* like "__lt__()", described in *Basic customization*.\n\nThe default behavior for equality comparison ("==" and "!=") is based\non the identity of the objects. Hence, equality comparison of\ninstances with the same identity results in equality, and equality\ncomparison of instances with different identities results in\ninequality. A motivation for this default behavior is the desire that\nall objects should be reflexive (i.e. "x is y" implies "x == y").\n\nA default order comparison ("<", ">", "<=", and ">=") is not provided;\nan attempt raises "TypeError". A motivation for this default behavior\nis the lack of a similar invariant as for equality.\n\nThe behavior of the default equality comparison, that instances with\ndifferent identities are always unequal, may be in contrast to what\ntypes will need that have a sensible definition of object value and\nvalue-based equality. Such types will need to customize their\ncomparison behavior, and in fact, a number of built-in types have done\nthat.\n\nThe following list describes the comparison behavior of the most\nimportant built-in types.\n\n* Numbers of built-in numeric types (*Numeric Types --- int, float,\n complex*) and of the standard library types "fractions.Fraction" and\n "decimal.Decimal" can be compared within and across their types,\n with the restriction that complex numbers do not support order\n comparison. Within the limits of the types involved, they compare\n mathematically (algorithmically) correct without loss of precision.\n\n The not-a-number values "float(\'NaN\')" and "Decimal(\'NaN\')" are\n special. They are identical to themselves ("x is x" is true) but\n are not equal to themselves ("x == x" is false). Additionally,\n comparing any number to a not-a-number value will return "False".\n For example, both "3 < float(\'NaN\')" and "float(\'NaN\') < 3" will\n return "False".\n\n* Binary sequences (instances of "bytes" or "bytearray") can be\n compared within and across their types. They compare\n lexicographically using the numeric values of their elements.\n\n* Strings (instances of "str") compare lexicographically using the\n numerical Unicode code points (the result of the built-in function\n "ord()") of their characters. [3]\n\n Strings and binary sequences cannot be directly compared.\n\n* Sequences (instances of "tuple", "list", or "range") can be\n compared only within each of their types, with the restriction that\n ranges do not support order comparison. Equality comparison across\n these types results in unequality, and ordering comparison across\n these types raises "TypeError".\n\n Sequences compare lexicographically using comparison of\n corresponding elements, whereby reflexivity of the elements is\n enforced.\n\n In enforcing reflexivity of elements, the comparison of collections\n assumes that for a collection element "x", "x == x" is always true.\n Based on that assumption, element identity is compared first, and\n element comparison is performed only for distinct elements. This\n approach yields the same result as a strict element comparison\n would, if the compared elements are reflexive. For non-reflexive\n elements, the result is different than for strict element\n comparison, and may be surprising: The non-reflexive not-a-number\n values for example result in the following comparison behavior when\n used in a list:\n\n >>> nan = float(\'NaN\')\n >>> nan is nan\n True\n >>> nan == nan\n False <-- the defined non-reflexive behavior of NaN\n >>> [nan] == [nan]\n True <-- list enforces reflexivity and tests identity first\n\n Lexicographical comparison between built-in collections works as\n follows:\n\n * For two collections to compare equal, they must be of the same\n type, have the same length, and each pair of corresponding\n elements must compare equal (for example, "[1,2] == (1,2)" is\n false because the type is not the same).\n\n * Collections that support order comparison are ordered the same\n as their first unequal elements (for example, "[1,2,x] <= [1,2,y]"\n has the same value as "x <= y"). If a corresponding element does\n not exist, the shorter collection is ordered first (for example,\n "[1,2] < [1,2,3]" is true).\n\n* Mappings (instances of "dict") compare equal if and only if they\n have equal *(key, value)* pairs. Equality comparison of the keys and\n values enforces reflexivity.\n\n Order comparisons ("<", ">", "<=", and ">=") raise "TypeError".\n\n* Sets (instances of "set" or "frozenset") can be compared within\n and across their types.\n\n They define order comparison operators to mean subset and superset\n tests. Those relations do not define total orderings (for example,\n the two sets "{1,2}" and "{2,3}" are not equal, nor subsets of one\n another, nor supersets of one another). Accordingly, sets are not\n appropriate arguments for functions which depend on total ordering\n (for example, "min()", "max()", and "sorted()" produce undefined\n results given a list of sets as inputs).\n\n Comparison of sets enforces reflexivity of its elements.\n\n* Most other built-in types have no comparison methods implemented,\n so they inherit the default comparison behavior.\n\nUser-defined classes that customize their comparison behavior should\nfollow some consistency rules, if possible:\n\n* Equality comparison should be reflexive. In other words, identical\n objects should compare equal:\n\n "x is y" implies "x == y"\n\n* Comparison should be symmetric. In other words, the following\n expressions should have the same result:\n\n "x == y" and "y == x"\n\n "x != y" and "y != x"\n\n "x < y" and "y > x"\n\n "x <= y" and "y >= x"\n\n* Comparison should be transitive. The following (non-exhaustive)\n examples illustrate that:\n\n "x > y and y > z" implies "x > z"\n\n "x < y and y <= z" implies "x < z"\n\n* Inverse comparison should result in the boolean negation. In other\n words, the following expressions should have the same result:\n\n "x == y" and "not x != y"\n\n "x < y" and "not x >= y" (for total ordering)\n\n "x > y" and "not x <= y" (for total ordering)\n\n The last two expressions apply to totally ordered collections (e.g.\n to sequences, but not to sets or mappings). See also the\n "total_ordering()" decorator.\n\n* The "hash()" result should be consistent with equality. Objects\n that are equal should either have the same hash value, or be marked\n as unhashable.\n\nPython does not enforce these consistency rules. In fact, the\nnot-a-number values are an example for not following these rules.\n\n\nMembership test operations\n==========================\n\nThe operators "in" and "not in" test for membership. "x in s"\nevaluates to "True" if *x* is a member of *s*, and "False" otherwise.\n"x not in s" returns the negation of "x in s". All built-in sequences\nand set types support this as well as dictionary, for which "in" tests\nwhether the dictionary has a given key. For container types such as\nlist, tuple, set, frozenset, dict, or collections.deque, the\nexpression "x in y" is equivalent to "any(x is e or x == e for e in\ny)".\n\nFor the string and bytes types, "x in y" is "True" if and only if *x*\nis a substring of *y*. An equivalent test is "y.find(x) != -1".\nEmpty strings are always considered to be a substring of any other\nstring, so """ in "abc"" will return "True".\n\nFor user-defined classes which define the "__contains__()" method, "x\nin y" returns "True" if "y.__contains__(x)" returns a true value, and\n"False" otherwise.\n\nFor user-defined classes which do not define "__contains__()" but do\ndefine "__iter__()", "x in y" is "True" if some value "z" with "x ==\nz" is produced while iterating over "y". If an exception is raised\nduring the iteration, it is as if "in" raised that exception.\n\nLastly, the old-style iteration protocol is tried: if a class defines\n"__getitem__()", "x in y" is "True" if and only if there is a non-\nnegative integer index *i* such that "x == y[i]", and all lower\ninteger indices do not raise "IndexError" exception. (If any other\nexception is raised, it is as if "in" raised that exception).\n\nThe operator "not in" is defined to have the inverse true value of\n"in".\n\n\nIdentity comparisons\n====================\n\nThe operators "is" and "is not" test for object identity: "x is y" is\ntrue if and only if *x* and *y* are the same object. Object identity\nis determined using the "id()" function. "x is not y" yields the\ninverse truth value. [4]\n', - 'compound': u'\nCompound statements\n*******************\n\nCompound statements contain (groups of) other statements; they affect\nor control the execution of those other statements in some way. In\ngeneral, compound statements span multiple lines, although in simple\nincarnations a whole compound statement may be contained in one line.\n\nThe "if", "while" and "for" statements implement traditional control\nflow constructs. "try" specifies exception handlers and/or cleanup\ncode for a group of statements, while the "with" statement allows the\nexecution of initialization and finalization code around a block of\ncode. Function and class definitions are also syntactically compound\nstatements.\n\nA compound statement consists of one or more \'clauses.\' A clause\nconsists of a header and a \'suite.\' The clause headers of a\nparticular compound statement are all at the same indentation level.\nEach clause header begins with a uniquely identifying keyword and ends\nwith a colon. A suite is a group of statements controlled by a\nclause. A suite can be one or more semicolon-separated simple\nstatements on the same line as the header, following the header\'s\ncolon, or it can be one or more indented statements on subsequent\nlines. Only the latter form of a suite can contain nested compound\nstatements; the following is illegal, mostly because it wouldn\'t be\nclear to which "if" clause a following "else" clause would belong:\n\n if test1: if test2: print(x)\n\nAlso note that the semicolon binds tighter than the colon in this\ncontext, so that in the following example, either all or none of the\n"print()" calls are executed:\n\n if x < y < z: print(x); print(y); print(z)\n\nSummarizing:\n\n compound_stmt ::= if_stmt\n | while_stmt\n | for_stmt\n | try_stmt\n | with_stmt\n | funcdef\n | classdef\n | async_with_stmt\n | async_for_stmt\n | async_funcdef\n suite ::= stmt_list NEWLINE | NEWLINE INDENT statement+ DEDENT\n statement ::= stmt_list NEWLINE | compound_stmt\n stmt_list ::= simple_stmt (";" simple_stmt)* [";"]\n\nNote that statements always end in a "NEWLINE" possibly followed by a\n"DEDENT". Also note that optional continuation clauses always begin\nwith a keyword that cannot start a statement, thus there are no\nambiguities (the \'dangling "else"\' problem is solved in Python by\nrequiring nested "if" statements to be indented).\n\nThe formatting of the grammar rules in the following sections places\neach clause on a separate line for clarity.\n\n\nThe "if" statement\n==================\n\nThe "if" statement is used for conditional execution:\n\n if_stmt ::= "if" expression ":" suite\n ( "elif" expression ":" suite )*\n ["else" ":" suite]\n\nIt selects exactly one of the suites by evaluating the expressions one\nby one until one is found to be true (see section *Boolean operations*\nfor the definition of true and false); then that suite is executed\n(and no other part of the "if" statement is executed or evaluated).\nIf all expressions are false, the suite of the "else" clause, if\npresent, is executed.\n\n\nThe "while" statement\n=====================\n\nThe "while" statement is used for repeated execution as long as an\nexpression is true:\n\n while_stmt ::= "while" expression ":" suite\n ["else" ":" suite]\n\nThis repeatedly tests the expression and, if it is true, executes the\nfirst suite; if the expression is false (which may be the first time\nit is tested) the suite of the "else" clause, if present, is executed\nand the loop terminates.\n\nA "break" statement executed in the first suite terminates the loop\nwithout executing the "else" clause\'s suite. A "continue" statement\nexecuted in the first suite skips the rest of the suite and goes back\nto testing the expression.\n\n\nThe "for" statement\n===================\n\nThe "for" statement is used to iterate over the elements of a sequence\n(such as a string, tuple or list) or other iterable object:\n\n for_stmt ::= "for" target_list "in" expression_list ":" suite\n ["else" ":" suite]\n\nThe expression list is evaluated once; it should yield an iterable\nobject. An iterator is created for the result of the\n"expression_list". The suite is then executed once for each item\nprovided by the iterator, in the order returned by the iterator. Each\nitem in turn is assigned to the target list using the standard rules\nfor assignments (see *Assignment statements*), and then the suite is\nexecuted. When the items are exhausted (which is immediately when the\nsequence is empty or an iterator raises a "StopIteration" exception),\nthe suite in the "else" clause, if present, is executed, and the loop\nterminates.\n\nA "break" statement executed in the first suite terminates the loop\nwithout executing the "else" clause\'s suite. A "continue" statement\nexecuted in the first suite skips the rest of the suite and continues\nwith the next item, or with the "else" clause if there is no next\nitem.\n\nThe for-loop makes assignments to the variables(s) in the target list.\nThis overwrites all previous assignments to those variables including\nthose made in the suite of the for-loop:\n\n for i in range(10):\n print(i)\n i = 5 # this will not affect the for-loop\n # because i will be overwritten with the next\n # index in the range\n\nNames in the target list are not deleted when the loop is finished,\nbut if the sequence is empty, they will not have been assigned to at\nall by the loop. Hint: the built-in function "range()" returns an\niterator of integers suitable to emulate the effect of Pascal\'s "for i\n:= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, 2]".\n\nNote: There is a subtlety when the sequence is being modified by the\n loop (this can only occur for mutable sequences, i.e. lists). An\n internal counter is used to keep track of which item is used next,\n and this is incremented on each iteration. When this counter has\n reached the length of the sequence the loop terminates. This means\n that if the suite deletes the current (or a previous) item from the\n sequence, the next item will be skipped (since it gets the index of\n the current item which has already been treated). Likewise, if the\n suite inserts an item in the sequence before the current item, the\n current item will be treated again the next time through the loop.\n This can lead to nasty bugs that can be avoided by making a\n temporary copy using a slice of the whole sequence, e.g.,\n\n for x in a[:]:\n if x < 0: a.remove(x)\n\n\nThe "try" statement\n===================\n\nThe "try" statement specifies exception handlers and/or cleanup code\nfor a group of statements:\n\n try_stmt ::= try1_stmt | try2_stmt\n try1_stmt ::= "try" ":" suite\n ("except" [expression ["as" identifier]] ":" suite)+\n ["else" ":" suite]\n ["finally" ":" suite]\n try2_stmt ::= "try" ":" suite\n "finally" ":" suite\n\nThe "except" clause(s) specify one or more exception handlers. When no\nexception occurs in the "try" clause, no exception handler is\nexecuted. When an exception occurs in the "try" suite, a search for an\nexception handler is started. This search inspects the except clauses\nin turn until one is found that matches the exception. An expression-\nless except clause, if present, must be last; it matches any\nexception. For an except clause with an expression, that expression\nis evaluated, and the clause matches the exception if the resulting\nobject is "compatible" with the exception. An object is compatible\nwith an exception if it is the class or a base class of the exception\nobject or a tuple containing an item compatible with the exception.\n\nIf no except clause matches the exception, the search for an exception\nhandler continues in the surrounding code and on the invocation stack.\n[1]\n\nIf the evaluation of an expression in the header of an except clause\nraises an exception, the original search for a handler is canceled and\na search starts for the new exception in the surrounding code and on\nthe call stack (it is treated as if the entire "try" statement raised\nthe exception).\n\nWhen a matching except clause is found, the exception is assigned to\nthe target specified after the "as" keyword in that except clause, if\npresent, and the except clause\'s suite is executed. All except\nclauses must have an executable block. When the end of this block is\nreached, execution continues normally after the entire try statement.\n(This means that if two nested handlers exist for the same exception,\nand the exception occurs in the try clause of the inner handler, the\nouter handler will not handle the exception.)\n\nWhen an exception has been assigned using "as target", it is cleared\nat the end of the except clause. This is as if\n\n except E as N:\n foo\n\nwas translated to\n\n except E as N:\n try:\n foo\n finally:\n del N\n\nThis means the exception must be assigned to a different name to be\nable to refer to it after the except clause. Exceptions are cleared\nbecause with the traceback attached to them, they form a reference\ncycle with the stack frame, keeping all locals in that frame alive\nuntil the next garbage collection occurs.\n\nBefore an except clause\'s suite is executed, details about the\nexception are stored in the "sys" module and can be accessed via\n"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting of the\nexception class, the exception instance and a traceback object (see\nsection *The standard type hierarchy*) identifying the point in the\nprogram where the exception occurred. "sys.exc_info()" values are\nrestored to their previous values (before the call) when returning\nfrom a function that handled an exception.\n\nThe optional "else" clause is executed if and when control flows off\nthe end of the "try" clause. [2] Exceptions in the "else" clause are\nnot handled by the preceding "except" clauses.\n\nIf "finally" is present, it specifies a \'cleanup\' handler. The "try"\nclause is executed, including any "except" and "else" clauses. If an\nexception occurs in any of the clauses and is not handled, the\nexception is temporarily saved. The "finally" clause is executed. If\nthere is a saved exception it is re-raised at the end of the "finally"\nclause. If the "finally" clause raises another exception, the saved\nexception is set as the context of the new exception. If the "finally"\nclause executes a "return" or "break" statement, the saved exception\nis discarded:\n\n >>> def f():\n ... try:\n ... 1/0\n ... finally:\n ... return 42\n ...\n >>> f()\n 42\n\nThe exception information is not available to the program during\nexecution of the "finally" clause.\n\nWhen a "return", "break" or "continue" statement is executed in the\n"try" suite of a "try"..."finally" statement, the "finally" clause is\nalso executed \'on the way out.\' A "continue" statement is illegal in\nthe "finally" clause. (The reason is a problem with the current\nimplementation --- this restriction may be lifted in the future).\n\nThe return value of a function is determined by the last "return"\nstatement executed. Since the "finally" clause always executes, a\n"return" statement executed in the "finally" clause will always be the\nlast one executed:\n\n >>> def foo():\n ... try:\n ... return \'try\'\n ... finally:\n ... return \'finally\'\n ...\n >>> foo()\n \'finally\'\n\nAdditional information on exceptions can be found in section\n*Exceptions*, and information on using the "raise" statement to\ngenerate exceptions may be found in section *The raise statement*.\n\n\nThe "with" statement\n====================\n\nThe "with" statement is used to wrap the execution of a block with\nmethods defined by a context manager (see section *With Statement\nContext Managers*). This allows common "try"..."except"..."finally"\nusage patterns to be encapsulated for convenient reuse.\n\n with_stmt ::= "with" with_item ("," with_item)* ":" suite\n with_item ::= expression ["as" target]\n\nThe execution of the "with" statement with one "item" proceeds as\nfollows:\n\n1. The context expression (the expression given in the "with_item")\n is evaluated to obtain a context manager.\n\n2. The context manager\'s "__exit__()" is loaded for later use.\n\n3. The context manager\'s "__enter__()" method is invoked.\n\n4. If a target was included in the "with" statement, the return\n value from "__enter__()" is assigned to it.\n\n Note: The "with" statement guarantees that if the "__enter__()"\n method returns without an error, then "__exit__()" will always be\n called. Thus, if an error occurs during the assignment to the\n target list, it will be treated the same as an error occurring\n within the suite would be. See step 6 below.\n\n5. The suite is executed.\n\n6. The context manager\'s "__exit__()" method is invoked. If an\n exception caused the suite to be exited, its type, value, and\n traceback are passed as arguments to "__exit__()". Otherwise, three\n "None" arguments are supplied.\n\n If the suite was exited due to an exception, and the return value\n from the "__exit__()" method was false, the exception is reraised.\n If the return value was true, the exception is suppressed, and\n execution continues with the statement following the "with"\n statement.\n\n If the suite was exited for any reason other than an exception, the\n return value from "__exit__()" is ignored, and execution proceeds\n at the normal location for the kind of exit that was taken.\n\nWith more than one item, the context managers are processed as if\nmultiple "with" statements were nested:\n\n with A() as a, B() as b:\n suite\n\nis equivalent to\n\n with A() as a:\n with B() as b:\n suite\n\nChanged in version 3.1: Support for multiple context expressions.\n\nSee also: **PEP 343** - The "with" statement\n\n The specification, background, and examples for the Python "with"\n statement.\n\n\nFunction definitions\n====================\n\nA function definition defines a user-defined function object (see\nsection *The standard type hierarchy*):\n\n funcdef ::= [decorators] "def" funcname "(" [parameter_list] ")" ["->" expression] ":" suite\n decorators ::= decorator+\n decorator ::= "@" dotted_name ["(" [argument_list [","]] ")"] NEWLINE\n dotted_name ::= identifier ("." identifier)*\n parameter_list ::= (defparameter ",")*\n | "*" [parameter] ("," defparameter)* ["," "**" parameter]\n | "**" parameter\n | defparameter [","] )\n parameter ::= identifier [":" expression]\n defparameter ::= parameter ["=" expression]\n funcname ::= identifier\n\nA function definition is an executable statement. Its execution binds\nthe function name in the current local namespace to a function object\n(a wrapper around the executable code for the function). This\nfunction object contains a reference to the current global namespace\nas the global namespace to be used when the function is called.\n\nThe function definition does not execute the function body; this gets\nexecuted only when the function is called. [3]\n\nA function definition may be wrapped by one or more *decorator*\nexpressions. Decorator expressions are evaluated when the function is\ndefined, in the scope that contains the function definition. The\nresult must be a callable, which is invoked with the function object\nas the only argument. The returned value is bound to the function name\ninstead of the function object. Multiple decorators are applied in\nnested fashion. For example, the following code\n\n @f1(arg)\n @f2\n def func(): pass\n\nis roughly equivalent to\n\n def func(): pass\n func = f1(arg)(f2(func))\n\nexcept that the original function is not temporarily bound to the name\n"func".\n\nWhen one or more *parameters* have the form *parameter* "="\n*expression*, the function is said to have "default parameter values."\nFor a parameter with a default value, the corresponding *argument* may\nbe omitted from a call, in which case the parameter\'s default value is\nsubstituted. If a parameter has a default value, all following\nparameters up until the ""*"" must also have a default value --- this\nis a syntactic restriction that is not expressed by the grammar.\n\n**Default parameter values are evaluated from left to right when the\nfunction definition is executed.** This means that the expression is\nevaluated once, when the function is defined, and that the same "pre-\ncomputed" value is used for each call. This is especially important\nto understand when a default parameter is a mutable object, such as a\nlist or a dictionary: if the function modifies the object (e.g. by\nappending an item to a list), the default value is in effect modified.\nThis is generally not what was intended. A way around this is to use\n"None" as the default, and explicitly test for it in the body of the\nfunction, e.g.:\n\n def whats_on_the_telly(penguin=None):\n if penguin is None:\n penguin = []\n penguin.append("property of the zoo")\n return penguin\n\nFunction call semantics are described in more detail in section\n*Calls*. A function call always assigns values to all parameters\nmentioned in the parameter list, either from position arguments, from\nkeyword arguments, or from default values. If the form\n""*identifier"" is present, it is initialized to a tuple receiving any\nexcess positional parameters, defaulting to the empty tuple. If the\nform ""**identifier"" is present, it is initialized to a new\ndictionary receiving any excess keyword arguments, defaulting to a new\nempty dictionary. Parameters after ""*"" or ""*identifier"" are\nkeyword-only parameters and may only be passed used keyword arguments.\n\nParameters may have annotations of the form "": expression"" following\nthe parameter name. Any parameter may have an annotation even those\nof the form "*identifier" or "**identifier". Functions may have\n"return" annotation of the form ""-> expression"" after the parameter\nlist. These annotations can be any valid Python expression and are\nevaluated when the function definition is executed. Annotations may\nbe evaluated in a different order than they appear in the source code.\nThe presence of annotations does not change the semantics of a\nfunction. The annotation values are available as values of a\ndictionary keyed by the parameters\' names in the "__annotations__"\nattribute of the function object.\n\nIt is also possible to create anonymous functions (functions not bound\nto a name), for immediate use in expressions. This uses lambda\nexpressions, described in section *Lambdas*. Note that the lambda\nexpression is merely a shorthand for a simplified function definition;\na function defined in a ""def"" statement can be passed around or\nassigned to another name just like a function defined by a lambda\nexpression. The ""def"" form is actually more powerful since it\nallows the execution of multiple statements and annotations.\n\n**Programmer\'s note:** Functions are first-class objects. A ""def""\nstatement executed inside a function definition defines a local\nfunction that can be returned or passed around. Free variables used\nin the nested function can access the local variables of the function\ncontaining the def. See section *Naming and binding* for details.\n\nSee also: **PEP 3107** - Function Annotations\n\n The original specification for function annotations.\n\n\nClass definitions\n=================\n\nA class definition defines a class object (see section *The standard\ntype hierarchy*):\n\n classdef ::= [decorators] "class" classname [inheritance] ":" suite\n inheritance ::= "(" [argument_list] ")"\n classname ::= identifier\n\nA class definition is an executable statement. The inheritance list\nusually gives a list of base classes (see *Customizing class creation*\nfor more advanced uses), so each item in the list should evaluate to a\nclass object which allows subclassing. Classes without an inheritance\nlist inherit, by default, from the base class "object"; hence,\n\n class Foo:\n pass\n\nis equivalent to\n\n class Foo(object):\n pass\n\nThe class\'s suite is then executed in a new execution frame (see\n*Naming and binding*), using a newly created local namespace and the\noriginal global namespace. (Usually, the suite contains mostly\nfunction definitions.) When the class\'s suite finishes execution, its\nexecution frame is discarded but its local namespace is saved. [4] A\nclass object is then created using the inheritance list for the base\nclasses and the saved local namespace for the attribute dictionary.\nThe class name is bound to this class object in the original local\nnamespace.\n\nClass creation can be customized heavily using *metaclasses*.\n\nClasses can also be decorated: just like when decorating functions,\n\n @f1(arg)\n @f2\n class Foo: pass\n\nis roughly equivalent to\n\n class Foo: pass\n Foo = f1(arg)(f2(Foo))\n\nThe evaluation rules for the decorator expressions are the same as for\nfunction decorators. The result is then bound to the class name.\n\n**Programmer\'s note:** Variables defined in the class definition are\nclass attributes; they are shared by instances. Instance attributes\ncan be set in a method with "self.name = value". Both class and\ninstance attributes are accessible through the notation ""self.name"",\nand an instance attribute hides a class attribute with the same name\nwhen accessed in this way. Class attributes can be used as defaults\nfor instance attributes, but using mutable values there can lead to\nunexpected results. *Descriptors* can be used to create instance\nvariables with different implementation details.\n\nSee also: **PEP 3115** - Metaclasses in Python 3 **PEP 3129** -\n Class Decorators\n\n\nCoroutines\n==========\n\nNew in version 3.5.\n\n\nCoroutine function definition\n-----------------------------\n\n async_funcdef ::= [decorators] "async" "def" funcname "(" [parameter_list] ")" ["->" expression] ":" suite\n\nExecution of Python coroutines can be suspended and resumed at many\npoints (see *coroutine*). In the body of a coroutine, any "await" and\n"async" identifiers become reserved keywords; "await" expressions,\n"async for" and "async with" can only be used in coroutine bodies.\n\nFunctions defined with "async def" syntax are always coroutine\nfunctions, even if they do not contain "await" or "async" keywords.\n\nIt is a "SyntaxError" to use "yield" expressions in "async def"\ncoroutines.\n\nAn example of a coroutine function:\n\n async def func(param1, param2):\n do_stuff()\n await some_coroutine()\n\n\nThe "async for" statement\n-------------------------\n\n async_for_stmt ::= "async" for_stmt\n\nAn *asynchronous iterable* is able to call asynchronous code in its\n*iter* implementation, and *asynchronous iterator* can call\nasynchronous code in its *next* method.\n\nThe "async for" statement allows convenient iteration over\nasynchronous iterators.\n\nThe following code:\n\n async for TARGET in ITER:\n BLOCK\n else:\n BLOCK2\n\nIs semantically equivalent to:\n\n iter = (ITER)\n iter = type(iter).__aiter__(iter)\n running = True\n while running:\n try:\n TARGET = await type(iter).__anext__(iter)\n except StopAsyncIteration:\n running = False\n else:\n BLOCK\n else:\n BLOCK2\n\nSee also "__aiter__()" and "__anext__()" for details.\n\nIt is a "SyntaxError" to use "async for" statement outside of an\n"async def" function.\n\n\nThe "async with" statement\n--------------------------\n\n async_with_stmt ::= "async" with_stmt\n\nAn *asynchronous context manager* is a *context manager* that is able\nto suspend execution in its *enter* and *exit* methods.\n\nThe following code:\n\n async with EXPR as VAR:\n BLOCK\n\nIs semantically equivalent to:\n\n mgr = (EXPR)\n aexit = type(mgr).__aexit__\n aenter = type(mgr).__aenter__(mgr)\n exc = True\n\n VAR = await aenter\n try:\n BLOCK\n except:\n if not await aexit(mgr, *sys.exc_info()):\n raise\n else:\n await aexit(mgr, None, None, None)\n\nSee also "__aenter__()" and "__aexit__()" for details.\n\nIt is a "SyntaxError" to use "async with" statement outside of an\n"async def" function.\n\nSee also: **PEP 492** - Coroutines with async and await syntax\n\n-[ Footnotes ]-\n\n[1] The exception is propagated to the invocation stack unless\n there is a "finally" clause which happens to raise another\n exception. That new exception causes the old one to be lost.\n\n[2] Currently, control "flows off the end" except in the case of\n an exception or the execution of a "return", "continue", or\n "break" statement.\n\n[3] A string literal appearing as the first statement in the\n function body is transformed into the function\'s "__doc__"\n attribute and therefore the function\'s *docstring*.\n\n[4] A string literal appearing as the first statement in the class\n body is transformed into the namespace\'s "__doc__" item and\n therefore the class\'s *docstring*.\n', - 'context-managers': u'\nWith Statement Context Managers\n*******************************\n\nA *context manager* is an object that defines the runtime context to\nbe established when executing a "with" statement. The context manager\nhandles the entry into, and the exit from, the desired runtime context\nfor the execution of the block of code. Context managers are normally\ninvoked using the "with" statement (described in section *The with\nstatement*), but can also be used by directly invoking their methods.\n\nTypical uses of context managers include saving and restoring various\nkinds of global state, locking and unlocking resources, closing opened\nfiles, etc.\n\nFor more information on context managers, see *Context Manager Types*.\n\nobject.__enter__(self)\n\n Enter the runtime context related to this object. The "with"\n statement will bind this method\'s return value to the target(s)\n specified in the "as" clause of the statement, if any.\n\nobject.__exit__(self, exc_type, exc_value, traceback)\n\n Exit the runtime context related to this object. The parameters\n describe the exception that caused the context to be exited. If the\n context was exited without an exception, all three arguments will\n be "None".\n\n If an exception is supplied, and the method wishes to suppress the\n exception (i.e., prevent it from being propagated), it should\n return a true value. Otherwise, the exception will be processed\n normally upon exit from this method.\n\n Note that "__exit__()" methods should not reraise the passed-in\n exception; this is the caller\'s responsibility.\n\nSee also: **PEP 343** - The "with" statement\n\n The specification, background, and examples for the Python "with"\n statement.\n', - 'continue': u'\nThe "continue" statement\n************************\n\n continue_stmt ::= "continue"\n\n"continue" may only occur syntactically nested in a "for" or "while"\nloop, but not nested in a function or class definition or "finally"\nclause within that loop. It continues with the next cycle of the\nnearest enclosing loop.\n\nWhen "continue" passes control out of a "try" statement with a\n"finally" clause, that "finally" clause is executed before really\nstarting the next loop cycle.\n', - 'conversions': u'\nArithmetic conversions\n**********************\n\nWhen a description of an arithmetic operator below uses the phrase\n"the numeric arguments are converted to a common type," this means\nthat the operator implementation for built-in types works as follows:\n\n* If either argument is a complex number, the other is converted to\n complex;\n\n* otherwise, if either argument is a floating point number, the\n other is converted to floating point;\n\n* otherwise, both must be integers and no conversion is necessary.\n\nSome additional rules apply for certain operators (e.g., a string as a\nleft argument to the \'%\' operator). Extensions must define their own\nconversion behavior.\n', - 'customization': u'\nBasic customization\n*******************\n\nobject.__new__(cls[, ...])\n\n Called to create a new instance of class *cls*. "__new__()" is a\n static method (special-cased so you need not declare it as such)\n that takes the class of which an instance was requested as its\n first argument. The remaining arguments are those passed to the\n object constructor expression (the call to the class). The return\n value of "__new__()" should be the new object instance (usually an\n instance of *cls*).\n\n Typical implementations create a new instance of the class by\n invoking the superclass\'s "__new__()" method using\n "super().__new__(cls[, ...])" with appropriate arguments and then\n modifying the newly-created instance as necessary before returning\n it.\n\n If "__new__()" returns an instance of *cls*, then the new\n instance\'s "__init__()" method will be invoked like\n "__init__(self[, ...])", where *self* is the new instance and the\n remaining arguments are the same as were passed to "__new__()".\n\n If "__new__()" does not return an instance of *cls*, then the new\n instance\'s "__init__()" method will not be invoked.\n\n "__new__()" is intended mainly to allow subclasses of immutable\n types (like int, str, or tuple) to customize instance creation. It\n is also commonly overridden in custom metaclasses in order to\n customize class creation.\n\nobject.__init__(self[, ...])\n\n Called after the instance has been created (by "__new__()"), but\n before it is returned to the caller. The arguments are those\n passed to the class constructor expression. If a base class has an\n "__init__()" method, the derived class\'s "__init__()" method, if\n any, must explicitly call it to ensure proper initialization of the\n base class part of the instance; for example:\n "super().__init__([args...])".\n\n Because "__new__()" and "__init__()" work together in constructing\n objects ("__new__()" to create it, and "__init__()" to customize\n it), no non-"None" value may be returned by "__init__()"; doing so\n will cause a "TypeError" to be raised at runtime.\n\nobject.__del__(self)\n\n Called when the instance is about to be destroyed. This is also\n called a destructor. If a base class has a "__del__()" method, the\n derived class\'s "__del__()" method, if any, must explicitly call it\n to ensure proper deletion of the base class part of the instance.\n Note that it is possible (though not recommended!) for the\n "__del__()" method to postpone destruction of the instance by\n creating a new reference to it. It may then be called at a later\n time when this new reference is deleted. It is not guaranteed that\n "__del__()" methods are called for objects that still exist when\n the interpreter exits.\n\n Note: "del x" doesn\'t directly call "x.__del__()" --- the former\n decrements the reference count for "x" by one, and the latter is\n only called when "x"\'s reference count reaches zero. Some common\n situations that may prevent the reference count of an object from\n going to zero include: circular references between objects (e.g.,\n a doubly-linked list or a tree data structure with parent and\n child pointers); a reference to the object on the stack frame of\n a function that caught an exception (the traceback stored in\n "sys.exc_info()[2]" keeps the stack frame alive); or a reference\n to the object on the stack frame that raised an unhandled\n exception in interactive mode (the traceback stored in\n "sys.last_traceback" keeps the stack frame alive). The first\n situation can only be remedied by explicitly breaking the cycles;\n the second can be resolved by freeing the reference to the\n traceback object when it is no longer useful, and the third can\n be resolved by storing "None" in "sys.last_traceback". Circular\n references which are garbage are detected and cleaned up when the\n cyclic garbage collector is enabled (it\'s on by default). Refer\n to the documentation for the "gc" module for more information\n about this topic.\n\n Warning: Due to the precarious circumstances under which\n "__del__()" methods are invoked, exceptions that occur during\n their execution are ignored, and a warning is printed to\n "sys.stderr" instead. Also, when "__del__()" is invoked in\n response to a module being deleted (e.g., when execution of the\n program is done), other globals referenced by the "__del__()"\n method may already have been deleted or in the process of being\n torn down (e.g. the import machinery shutting down). For this\n reason, "__del__()" methods should do the absolute minimum needed\n to maintain external invariants. Starting with version 1.5,\n Python guarantees that globals whose name begins with a single\n underscore are deleted from their module before other globals are\n deleted; if no other references to such globals exist, this may\n help in assuring that imported modules are still available at the\n time when the "__del__()" method is called.\n\nobject.__repr__(self)\n\n Called by the "repr()" built-in function to compute the "official"\n string representation of an object. If at all possible, this\n should look like a valid Python expression that could be used to\n recreate an object with the same value (given an appropriate\n environment). If this is not possible, a string of the form\n "<...some useful description...>" should be returned. The return\n value must be a string object. If a class defines "__repr__()" but\n not "__str__()", then "__repr__()" is also used when an "informal"\n string representation of instances of that class is required.\n\n This is typically used for debugging, so it is important that the\n representation is information-rich and unambiguous.\n\nobject.__str__(self)\n\n Called by "str(object)" and the built-in functions "format()" and\n "print()" to compute the "informal" or nicely printable string\n representation of an object. The return value must be a *string*\n object.\n\n This method differs from "object.__repr__()" in that there is no\n expectation that "__str__()" return a valid Python expression: a\n more convenient or concise representation can be used.\n\n The default implementation defined by the built-in type "object"\n calls "object.__repr__()".\n\nobject.__bytes__(self)\n\n Called by "bytes()" to compute a byte-string representation of an\n object. This should return a "bytes" object.\n\nobject.__format__(self, format_spec)\n\n Called by the "format()" built-in function (and by extension, the\n "str.format()" method of class "str") to produce a "formatted"\n string representation of an object. The "format_spec" argument is a\n string that contains a description of the formatting options\n desired. The interpretation of the "format_spec" argument is up to\n the type implementing "__format__()", however most classes will\n either delegate formatting to one of the built-in types, or use a\n similar formatting option syntax.\n\n See *Format Specification Mini-Language* for a description of the\n standard formatting syntax.\n\n The return value must be a string object.\n\n Changed in version 3.4: The __format__ method of "object" itself\n raises a "TypeError" if passed any non-empty string.\n\nobject.__lt__(self, other)\nobject.__le__(self, other)\nobject.__eq__(self, other)\nobject.__ne__(self, other)\nobject.__gt__(self, other)\nobject.__ge__(self, other)\n\n These are the so-called "rich comparison" methods. The\n correspondence between operator symbols and method names is as\n follows: "xy" calls\n "x.__gt__(y)", and "x>=y" calls "x.__ge__(y)".\n\n A rich comparison method may return the singleton "NotImplemented"\n if it does not implement the operation for a given pair of\n arguments. By convention, "False" and "True" are returned for a\n successful comparison. However, these methods can return any value,\n so if the comparison operator is used in a Boolean context (e.g.,\n in the condition of an "if" statement), Python will call "bool()"\n on the value to determine if the result is true or false.\n\n By default, "__ne__()" delegates to "__eq__()" and inverts the\n result unless it is "NotImplemented". There are no other implied\n relationships among the comparison operators, for example, the\n truth of "(x.__hash__".\n\n If a class that does not override "__eq__()" wishes to suppress\n hash support, it should include "__hash__ = None" in the class\n definition. A class which defines its own "__hash__()" that\n explicitly raises a "TypeError" would be incorrectly identified as\n hashable by an "isinstance(obj, collections.Hashable)" call.\n\n Note: By default, the "__hash__()" values of str, bytes and\n datetime objects are "salted" with an unpredictable random value.\n Although they remain constant within an individual Python\n process, they are not predictable between repeated invocations of\n Python.This is intended to provide protection against a denial-\n of-service caused by carefully-chosen inputs that exploit the\n worst case performance of a dict insertion, O(n^2) complexity.\n See http://www.ocert.org/advisories/ocert-2011-003.html for\n details.Changing hash values affects the iteration order of\n dicts, sets and other mappings. Python has never made guarantees\n about this ordering (and it typically varies between 32-bit and\n 64-bit builds).See also "PYTHONHASHSEED".\n\n Changed in version 3.3: Hash randomization is enabled by default.\n\nobject.__bool__(self)\n\n Called to implement truth value testing and the built-in operation\n "bool()"; should return "False" or "True". When this method is not\n defined, "__len__()" is called, if it is defined, and the object is\n considered true if its result is nonzero. If a class defines\n neither "__len__()" nor "__bool__()", all its instances are\n considered true.\n', - 'debugger': u'\n"pdb" --- The Python Debugger\n*****************************\n\n**Source code:** Lib/pdb.py\n\n======================================================================\n\nThe module "pdb" defines an interactive source code debugger for\nPython programs. It supports setting (conditional) breakpoints and\nsingle stepping at the source line level, inspection of stack frames,\nsource code listing, and evaluation of arbitrary Python code in the\ncontext of any stack frame. It also supports post-mortem debugging\nand can be called under program control.\n\nThe debugger is extensible -- it is actually defined as the class\n"Pdb". This is currently undocumented but easily understood by reading\nthe source. The extension interface uses the modules "bdb" and "cmd".\n\nThe debugger\'s prompt is "(Pdb)". Typical usage to run a program under\ncontrol of the debugger is:\n\n >>> import pdb\n >>> import mymodule\n >>> pdb.run(\'mymodule.test()\')\n > (0)?()\n (Pdb) continue\n > (1)?()\n (Pdb) continue\n NameError: \'spam\'\n > (1)?()\n (Pdb)\n\nChanged in version 3.3: Tab-completion via the "readline" module is\navailable for commands and command arguments, e.g. the current global\nand local names are offered as arguments of the "p" command.\n\n"pdb.py" can also be invoked as a script to debug other scripts. For\nexample:\n\n python3 -m pdb myscript.py\n\nWhen invoked as a script, pdb will automatically enter post-mortem\ndebugging if the program being debugged exits abnormally. After post-\nmortem debugging (or after normal exit of the program), pdb will\nrestart the program. Automatic restarting preserves pdb\'s state (such\nas breakpoints) and in most cases is more useful than quitting the\ndebugger upon program\'s exit.\n\nNew in version 3.2: "pdb.py" now accepts a "-c" option that executes\ncommands as if given in a ".pdbrc" file, see *Debugger Commands*.\n\nThe typical usage to break into the debugger from a running program is\nto insert\n\n import pdb; pdb.set_trace()\n\nat the location you want to break into the debugger. You can then\nstep through the code following this statement, and continue running\nwithout the debugger using the "continue" command.\n\nThe typical usage to inspect a crashed program is:\n\n >>> import pdb\n >>> import mymodule\n >>> mymodule.test()\n Traceback (most recent call last):\n File "", line 1, in \n File "./mymodule.py", line 4, in test\n test2()\n File "./mymodule.py", line 3, in test2\n print(spam)\n NameError: spam\n >>> pdb.pm()\n > ./mymodule.py(3)test2()\n -> print(spam)\n (Pdb)\n\nThe module defines the following functions; each enters the debugger\nin a slightly different way:\n\npdb.run(statement, globals=None, locals=None)\n\n Execute the *statement* (given as a string or a code object) under\n debugger control. The debugger prompt appears before any code is\n executed; you can set breakpoints and type "continue", or you can\n step through the statement using "step" or "next" (all these\n commands are explained below). The optional *globals* and *locals*\n arguments specify the environment in which the code is executed; by\n default the dictionary of the module "__main__" is used. (See the\n explanation of the built-in "exec()" or "eval()" functions.)\n\npdb.runeval(expression, globals=None, locals=None)\n\n Evaluate the *expression* (given as a string or a code object)\n under debugger control. When "runeval()" returns, it returns the\n value of the expression. Otherwise this function is similar to\n "run()".\n\npdb.runcall(function, *args, **kwds)\n\n Call the *function* (a function or method object, not a string)\n with the given arguments. When "runcall()" returns, it returns\n whatever the function call returned. The debugger prompt appears\n as soon as the function is entered.\n\npdb.set_trace()\n\n Enter the debugger at the calling stack frame. This is useful to\n hard-code a breakpoint at a given point in a program, even if the\n code is not otherwise being debugged (e.g. when an assertion\n fails).\n\npdb.post_mortem(traceback=None)\n\n Enter post-mortem debugging of the given *traceback* object. If no\n *traceback* is given, it uses the one of the exception that is\n currently being handled (an exception must be being handled if the\n default is to be used).\n\npdb.pm()\n\n Enter post-mortem debugging of the traceback found in\n "sys.last_traceback".\n\nThe "run*" functions and "set_trace()" are aliases for instantiating\nthe "Pdb" class and calling the method of the same name. If you want\nto access further features, you have to do this yourself:\n\nclass class pdb.Pdb(completekey=\'tab\', stdin=None, stdout=None, skip=None, nosigint=False)\n\n "Pdb" is the debugger class.\n\n The *completekey*, *stdin* and *stdout* arguments are passed to the\n underlying "cmd.Cmd" class; see the description there.\n\n The *skip* argument, if given, must be an iterable of glob-style\n module name patterns. The debugger will not step into frames that\n originate in a module that matches one of these patterns. [1]\n\n By default, Pdb sets a handler for the SIGINT signal (which is sent\n when the user presses "Ctrl-C" on the console) when you give a\n "continue" command. This allows you to break into the debugger\n again by pressing "Ctrl-C". If you want Pdb not to touch the\n SIGINT handler, set *nosigint* to true.\n\n Example call to enable tracing with *skip*:\n\n import pdb; pdb.Pdb(skip=[\'django.*\']).set_trace()\n\n New in version 3.1: The *skip* argument.\n\n New in version 3.2: The *nosigint* argument. Previously, a SIGINT\n handler was never set by Pdb.\n\n run(statement, globals=None, locals=None)\n runeval(expression, globals=None, locals=None)\n runcall(function, *args, **kwds)\n set_trace()\n\n See the documentation for the functions explained above.\n\n\nDebugger Commands\n=================\n\nThe commands recognized by the debugger are listed below. Most\ncommands can be abbreviated to one or two letters as indicated; e.g.\n"h(elp)" means that either "h" or "help" can be used to enter the help\ncommand (but not "he" or "hel", nor "H" or "Help" or "HELP").\nArguments to commands must be separated by whitespace (spaces or\ntabs). Optional arguments are enclosed in square brackets ("[]") in\nthe command syntax; the square brackets must not be typed.\nAlternatives in the command syntax are separated by a vertical bar\n("|").\n\nEntering a blank line repeats the last command entered. Exception: if\nthe last command was a "list" command, the next 11 lines are listed.\n\nCommands that the debugger doesn\'t recognize are assumed to be Python\nstatements and are executed in the context of the program being\ndebugged. Python statements can also be prefixed with an exclamation\npoint ("!"). This is a powerful way to inspect the program being\ndebugged; it is even possible to change a variable or call a function.\nWhen an exception occurs in such a statement, the exception name is\nprinted but the debugger\'s state is not changed.\n\nThe debugger supports *aliases*. Aliases can have parameters which\nallows one a certain level of adaptability to the context under\nexamination.\n\nMultiple commands may be entered on a single line, separated by ";;".\n(A single ";" is not used as it is the separator for multiple commands\nin a line that is passed to the Python parser.) No intelligence is\napplied to separating the commands; the input is split at the first\n";;" pair, even if it is in the middle of a quoted string.\n\nIf a file ".pdbrc" exists in the user\'s home directory or in the\ncurrent directory, it is read in and executed as if it had been typed\nat the debugger prompt. This is particularly useful for aliases. If\nboth files exist, the one in the home directory is read first and\naliases defined there can be overridden by the local file.\n\nChanged in version 3.2: ".pdbrc" can now contain commands that\ncontinue debugging, such as "continue" or "next". Previously, these\ncommands had no effect.\n\nh(elp) [command]\n\n Without argument, print the list of available commands. With a\n *command* as argument, print help about that command. "help pdb"\n displays the full documentation (the docstring of the "pdb"\n module). Since the *command* argument must be an identifier, "help\n exec" must be entered to get help on the "!" command.\n\nw(here)\n\n Print a stack trace, with the most recent frame at the bottom. An\n arrow indicates the current frame, which determines the context of\n most commands.\n\nd(own) [count]\n\n Move the current frame *count* (default one) levels down in the\n stack trace (to a newer frame).\n\nu(p) [count]\n\n Move the current frame *count* (default one) levels up in the stack\n trace (to an older frame).\n\nb(reak) [([filename:]lineno | function) [, condition]]\n\n With a *lineno* argument, set a break there in the current file.\n With a *function* argument, set a break at the first executable\n statement within that function. The line number may be prefixed\n with a filename and a colon, to specify a breakpoint in another\n file (probably one that hasn\'t been loaded yet). The file is\n searched on "sys.path". Note that each breakpoint is assigned a\n number to which all the other breakpoint commands refer.\n\n If a second argument is present, it is an expression which must\n evaluate to true before the breakpoint is honored.\n\n Without argument, list all breaks, including for each breakpoint,\n the number of times that breakpoint has been hit, the current\n ignore count, and the associated condition if any.\n\ntbreak [([filename:]lineno | function) [, condition]]\n\n Temporary breakpoint, which is removed automatically when it is\n first hit. The arguments are the same as for "break".\n\ncl(ear) [filename:lineno | bpnumber [bpnumber ...]]\n\n With a *filename:lineno* argument, clear all the breakpoints at\n this line. With a space separated list of breakpoint numbers, clear\n those breakpoints. Without argument, clear all breaks (but first\n ask confirmation).\n\ndisable [bpnumber [bpnumber ...]]\n\n Disable the breakpoints given as a space separated list of\n breakpoint numbers. Disabling a breakpoint means it cannot cause\n the program to stop execution, but unlike clearing a breakpoint, it\n remains in the list of breakpoints and can be (re-)enabled.\n\nenable [bpnumber [bpnumber ...]]\n\n Enable the breakpoints specified.\n\nignore bpnumber [count]\n\n Set the ignore count for the given breakpoint number. If count is\n omitted, the ignore count is set to 0. A breakpoint becomes active\n when the ignore count is zero. When non-zero, the count is\n decremented each time the breakpoint is reached and the breakpoint\n is not disabled and any associated condition evaluates to true.\n\ncondition bpnumber [condition]\n\n Set a new *condition* for the breakpoint, an expression which must\n evaluate to true before the breakpoint is honored. If *condition*\n is absent, any existing condition is removed; i.e., the breakpoint\n is made unconditional.\n\ncommands [bpnumber]\n\n Specify a list of commands for breakpoint number *bpnumber*. The\n commands themselves appear on the following lines. Type a line\n containing just "end" to terminate the commands. An example:\n\n (Pdb) commands 1\n (com) p some_variable\n (com) end\n (Pdb)\n\n To remove all commands from a breakpoint, type commands and follow\n it immediately with "end"; that is, give no commands.\n\n With no *bpnumber* argument, commands refers to the last breakpoint\n set.\n\n You can use breakpoint commands to start your program up again.\n Simply use the continue command, or step, or any other command that\n resumes execution.\n\n Specifying any command resuming execution (currently continue,\n step, next, return, jump, quit and their abbreviations) terminates\n the command list (as if that command was immediately followed by\n end). This is because any time you resume execution (even with a\n simple next or step), you may encounter another breakpoint\u2014which\n could have its own command list, leading to ambiguities about which\n list to execute.\n\n If you use the \'silent\' command in the command list, the usual\n message about stopping at a breakpoint is not printed. This may be\n desirable for breakpoints that are to print a specific message and\n then continue. If none of the other commands print anything, you\n see no sign that the breakpoint was reached.\n\ns(tep)\n\n Execute the current line, stop at the first possible occasion\n (either in a function that is called or on the next line in the\n current function).\n\nn(ext)\n\n Continue execution until the next line in the current function is\n reached or it returns. (The difference between "next" and "step"\n is that "step" stops inside a called function, while "next"\n executes called functions at (nearly) full speed, only stopping at\n the next line in the current function.)\n\nunt(il) [lineno]\n\n Without argument, continue execution until the line with a number\n greater than the current one is reached.\n\n With a line number, continue execution until a line with a number\n greater or equal to that is reached. In both cases, also stop when\n the current frame returns.\n\n Changed in version 3.2: Allow giving an explicit line number.\n\nr(eturn)\n\n Continue execution until the current function returns.\n\nc(ont(inue))\n\n Continue execution, only stop when a breakpoint is encountered.\n\nj(ump) lineno\n\n Set the next line that will be executed. Only available in the\n bottom-most frame. This lets you jump back and execute code again,\n or jump forward to skip code that you don\'t want to run.\n\n It should be noted that not all jumps are allowed -- for instance\n it is not possible to jump into the middle of a "for" loop or out\n of a "finally" clause.\n\nl(ist) [first[, last]]\n\n List source code for the current file. Without arguments, list 11\n lines around the current line or continue the previous listing.\n With "." as argument, list 11 lines around the current line. With\n one argument, list 11 lines around at that line. With two\n arguments, list the given range; if the second argument is less\n than the first, it is interpreted as a count.\n\n The current line in the current frame is indicated by "->". If an\n exception is being debugged, the line where the exception was\n originally raised or propagated is indicated by ">>", if it differs\n from the current line.\n\n New in version 3.2: The ">>" marker.\n\nll | longlist\n\n List all source code for the current function or frame.\n Interesting lines are marked as for "list".\n\n New in version 3.2.\n\na(rgs)\n\n Print the argument list of the current function.\n\np expression\n\n Evaluate the *expression* in the current context and print its\n value.\n\n Note: "print()" can also be used, but is not a debugger command\n --- this executes the Python "print()" function.\n\npp expression\n\n Like the "p" command, except the value of the expression is pretty-\n printed using the "pprint" module.\n\nwhatis expression\n\n Print the type of the *expression*.\n\nsource expression\n\n Try to get source code for the given object and display it.\n\n New in version 3.2.\n\ndisplay [expression]\n\n Display the value of the expression if it changed, each time\n execution stops in the current frame.\n\n Without expression, list all display expressions for the current\n frame.\n\n New in version 3.2.\n\nundisplay [expression]\n\n Do not display the expression any more in the current frame.\n Without expression, clear all display expressions for the current\n frame.\n\n New in version 3.2.\n\ninteract\n\n Start an interactive interpreter (using the "code" module) whose\n global namespace contains all the (global and local) names found in\n the current scope.\n\n New in version 3.2.\n\nalias [name [command]]\n\n Create an alias called *name* that executes *command*. The command\n must *not* be enclosed in quotes. Replaceable parameters can be\n indicated by "%1", "%2", and so on, while "%*" is replaced by all\n the parameters. If no command is given, the current alias for\n *name* is shown. If no arguments are given, all aliases are listed.\n\n Aliases may be nested and can contain anything that can be legally\n typed at the pdb prompt. Note that internal pdb commands *can* be\n overridden by aliases. Such a command is then hidden until the\n alias is removed. Aliasing is recursively applied to the first\n word of the command line; all other words in the line are left\n alone.\n\n As an example, here are two useful aliases (especially when placed\n in the ".pdbrc" file):\n\n # Print instance variables (usage "pi classInst")\n alias pi for k in %1.__dict__.keys(): print("%1.",k,"=",%1.__dict__[k])\n # Print instance variables in self\n alias ps pi self\n\nunalias name\n\n Delete the specified alias.\n\n! statement\n\n Execute the (one-line) *statement* in the context of the current\n stack frame. The exclamation point can be omitted unless the first\n word of the statement resembles a debugger command. To set a\n global variable, you can prefix the assignment command with a\n "global" statement on the same line, e.g.:\n\n (Pdb) global list_options; list_options = [\'-l\']\n (Pdb)\n\nrun [args ...]\nrestart [args ...]\n\n Restart the debugged Python program. If an argument is supplied,\n it is split with "shlex" and the result is used as the new\n "sys.argv". History, breakpoints, actions and debugger options are\n preserved. "restart" is an alias for "run".\n\nq(uit)\n\n Quit from the debugger. The program being executed is aborted.\n\n-[ Footnotes ]-\n\n[1] Whether a frame is considered to originate in a certain module\n is determined by the "__name__" in the frame globals.\n', - 'del': u'\nThe "del" statement\n*******************\n\n del_stmt ::= "del" target_list\n\nDeletion is recursively defined very similar to the way assignment is\ndefined. Rather than spelling it out in full details, here are some\nhints.\n\nDeletion of a target list recursively deletes each target, from left\nto right.\n\nDeletion of a name removes the binding of that name from the local or\nglobal namespace, depending on whether the name occurs in a "global"\nstatement in the same code block. If the name is unbound, a\n"NameError" exception will be raised.\n\nDeletion of attribute references, subscriptions and slicings is passed\nto the primary object involved; deletion of a slicing is in general\nequivalent to assignment of an empty slice of the right type (but even\nthis is determined by the sliced object).\n\nChanged in version 3.2: Previously it was illegal to delete a name\nfrom the local namespace if it occurs as a free variable in a nested\nblock.\n', - 'dict': u'\nDictionary displays\n*******************\n\nA dictionary display is a possibly empty series of key/datum pairs\nenclosed in curly braces:\n\n dict_display ::= "{" [key_datum_list | dict_comprehension] "}"\n key_datum_list ::= key_datum ("," key_datum)* [","]\n key_datum ::= expression ":" expression | "**" or_expr\n dict_comprehension ::= expression ":" expression comp_for\n\nA dictionary display yields a new dictionary object.\n\nIf a comma-separated sequence of key/datum pairs is given, they are\nevaluated from left to right to define the entries of the dictionary:\neach key object is used as a key into the dictionary to store the\ncorresponding datum. This means that you can specify the same key\nmultiple times in the key/datum list, and the final dictionary\'s value\nfor that key will be the last one given.\n\nA double asterisk "**" denotes *dictionary unpacking*. Its operand\nmust be a *mapping*. Each mapping item is added to the new\ndictionary. Later values replace values already set by earlier\nkey/datum pairs and earlier dictionary unpackings.\n\nNew in version 3.5: Unpacking into dictionary displays, originally\nproposed by **PEP 448**.\n\nA dict comprehension, in contrast to list and set comprehensions,\nneeds two expressions separated with a colon followed by the usual\n"for" and "if" clauses. When the comprehension is run, the resulting\nkey and value elements are inserted in the new dictionary in the order\nthey are produced.\n\nRestrictions on the types of the key values are listed earlier in\nsection *The standard type hierarchy*. (To summarize, the key type\nshould be *hashable*, which excludes all mutable objects.) Clashes\nbetween duplicate keys are not detected; the last datum (textually\nrightmost in the display) stored for a given key value prevails.\n', - 'dynamic-features': u'\nInteraction with dynamic features\n*********************************\n\nName resolution of free variables occurs at runtime, not at compile\ntime. This means that the following code will print 42:\n\n i = 10\n def f():\n print(i)\n i = 42\n f()\n\nThe "eval()" and "exec()" functions do not have access to the full\nenvironment for resolving names. Names may be resolved in the local\nand global namespaces of the caller. Free variables are not resolved\nin the nearest enclosing namespace, but in the global namespace. [1]\nThe "exec()" and "eval()" functions have optional arguments to\noverride the global and local namespace. If only one namespace is\nspecified, it is used for both.\n', - 'else': u'\nThe "if" statement\n******************\n\nThe "if" statement is used for conditional execution:\n\n if_stmt ::= "if" expression ":" suite\n ( "elif" expression ":" suite )*\n ["else" ":" suite]\n\nIt selects exactly one of the suites by evaluating the expressions one\nby one until one is found to be true (see section *Boolean operations*\nfor the definition of true and false); then that suite is executed\n(and no other part of the "if" statement is executed or evaluated).\nIf all expressions are false, the suite of the "else" clause, if\npresent, is executed.\n', - 'exceptions': u'\nExceptions\n**********\n\nExceptions are a means of breaking out of the normal flow of control\nof a code block in order to handle errors or other exceptional\nconditions. An exception is *raised* at the point where the error is\ndetected; it may be *handled* by the surrounding code block or by any\ncode block that directly or indirectly invoked the code block where\nthe error occurred.\n\nThe Python interpreter raises an exception when it detects a run-time\nerror (such as division by zero). A Python program can also\nexplicitly raise an exception with the "raise" statement. Exception\nhandlers are specified with the "try" ... "except" statement. The\n"finally" clause of such a statement can be used to specify cleanup\ncode which does not handle the exception, but is executed whether an\nexception occurred or not in the preceding code.\n\nPython uses the "termination" model of error handling: an exception\nhandler can find out what happened and continue execution at an outer\nlevel, but it cannot repair the cause of the error and retry the\nfailing operation (except by re-entering the offending piece of code\nfrom the top).\n\nWhen an exception is not handled at all, the interpreter terminates\nexecution of the program, or returns to its interactive main loop. In\neither case, it prints a stack backtrace, except when the exception is\n"SystemExit".\n\nExceptions are identified by class instances. The "except" clause is\nselected depending on the class of the instance: it must reference the\nclass of the instance or a base class thereof. The instance can be\nreceived by the handler and can carry additional information about the\nexceptional condition.\n\nNote: Exception messages are not part of the Python API. Their\n contents may change from one version of Python to the next without\n warning and should not be relied on by code which will run under\n multiple versions of the interpreter.\n\nSee also the description of the "try" statement in section *The try\nstatement* and "raise" statement in section *The raise statement*.\n\n-[ Footnotes ]-\n\n[1] This limitation occurs because the code that is executed by\n these operations is not available at the time the module is\n compiled.\n', - 'execmodel': u'\nExecution model\n***************\n\n\nStructure of a program\n======================\n\nA Python program is constructed from code blocks. A *block* is a piece\nof Python program text that is executed as a unit. The following are\nblocks: a module, a function body, and a class definition. Each\ncommand typed interactively is a block. A script file (a file given\nas standard input to the interpreter or specified as a command line\nargument to the interpreter) is a code block. A script command (a\ncommand specified on the interpreter command line with the \'**-c**\'\noption) is a code block. The string argument passed to the built-in\nfunctions "eval()" and "exec()" is a code block.\n\nA code block is executed in an *execution frame*. A frame contains\nsome administrative information (used for debugging) and determines\nwhere and how execution continues after the code block\'s execution has\ncompleted.\n\n\nNaming and binding\n==================\n\n\nBinding of names\n----------------\n\n*Names* refer to objects. Names are introduced by name binding\noperations.\n\nThe following constructs bind names: formal parameters to functions,\n"import" statements, class and function definitions (these bind the\nclass or function name in the defining block), and targets that are\nidentifiers if occurring in an assignment, "for" loop header, or after\n"as" in a "with" statement or "except" clause. The "import" statement\nof the form "from ... import *" binds all names defined in the\nimported module, except those beginning with an underscore. This form\nmay only be used at the module level.\n\nA target occurring in a "del" statement is also considered bound for\nthis purpose (though the actual semantics are to unbind the name).\n\nEach assignment or import statement occurs within a block defined by a\nclass or function definition or at the module level (the top-level\ncode block).\n\nIf a name is bound in a block, it is a local variable of that block,\nunless declared as "nonlocal" or "global". If a name is bound at the\nmodule level, it is a global variable. (The variables of the module\ncode block are local and global.) If a variable is used in a code\nblock but not defined there, it is a *free variable*.\n\nEach occurrence of a name in the program text refers to the *binding*\nof that name established by the following name resolution rules.\n\n\nResolution of names\n-------------------\n\nA *scope* defines the visibility of a name within a block. If a local\nvariable is defined in a block, its scope includes that block. If the\ndefinition occurs in a function block, the scope extends to any blocks\ncontained within the defining one, unless a contained block introduces\na different binding for the name.\n\nWhen a name is used in a code block, it is resolved using the nearest\nenclosing scope. The set of all such scopes visible to a code block\nis called the block\'s *environment*.\n\nWhen a name is not found at all, a "NameError" exception is raised. If\nthe current scope is a function scope, and the name refers to a local\nvariable that has not yet been bound to a value at the point where the\nname is used, an "UnboundLocalError" exception is raised.\n"UnboundLocalError" is a subclass of "NameError".\n\nIf a name binding operation occurs anywhere within a code block, all\nuses of the name within the block are treated as references to the\ncurrent block. This can lead to errors when a name is used within a\nblock before it is bound. This rule is subtle. Python lacks\ndeclarations and allows name binding operations to occur anywhere\nwithin a code block. The local variables of a code block can be\ndetermined by scanning the entire text of the block for name binding\noperations.\n\nIf the "global" statement occurs within a block, all uses of the name\nspecified in the statement refer to the binding of that name in the\ntop-level namespace. Names are resolved in the top-level namespace by\nsearching the global namespace, i.e. the namespace of the module\ncontaining the code block, and the builtins namespace, the namespace\nof the module "builtins". The global namespace is searched first. If\nthe name is not found there, the builtins namespace is searched. The\n"global" statement must precede all uses of the name.\n\nThe "global" statement has the same scope as a name binding operation\nin the same block. If the nearest enclosing scope for a free variable\ncontains a global statement, the free variable is treated as a global.\n\nThe "nonlocal" statement causes corresponding names to refer to\npreviously bound variables in the nearest enclosing function scope.\n"SyntaxError" is raised at compile time if the given name does not\nexist in any enclosing function scope.\n\nThe namespace for a module is automatically created the first time a\nmodule is imported. The main module for a script is always called\n"__main__".\n\nClass definition blocks and arguments to "exec()" and "eval()" are\nspecial in the context of name resolution. A class definition is an\nexecutable statement that may use and define names. These references\nfollow the normal rules for name resolution with an exception that\nunbound local variables are looked up in the global namespace. The\nnamespace of the class definition becomes the attribute dictionary of\nthe class. The scope of names defined in a class block is limited to\nthe class block; it does not extend to the code blocks of methods --\nthis includes comprehensions and generator expressions since they are\nimplemented using a function scope. This means that the following\nwill fail:\n\n class A:\n a = 42\n b = list(a + i for i in range(10))\n\n\nBuiltins and restricted execution\n---------------------------------\n\nThe builtins namespace associated with the execution of a code block\nis actually found by looking up the name "__builtins__" in its global\nnamespace; this should be a dictionary or a module (in the latter case\nthe module\'s dictionary is used). By default, when in the "__main__"\nmodule, "__builtins__" is the built-in module "builtins"; when in any\nother module, "__builtins__" is an alias for the dictionary of the\n"builtins" module itself. "__builtins__" can be set to a user-created\ndictionary to create a weak form of restricted execution.\n\n**CPython implementation detail:** Users should not touch\n"__builtins__"; it is strictly an implementation detail. Users\nwanting to override values in the builtins namespace should "import"\nthe "builtins" module and modify its attributes appropriately.\n\n\nInteraction with dynamic features\n---------------------------------\n\nName resolution of free variables occurs at runtime, not at compile\ntime. This means that the following code will print 42:\n\n i = 10\n def f():\n print(i)\n i = 42\n f()\n\nThe "eval()" and "exec()" functions do not have access to the full\nenvironment for resolving names. Names may be resolved in the local\nand global namespaces of the caller. Free variables are not resolved\nin the nearest enclosing namespace, but in the global namespace. [1]\nThe "exec()" and "eval()" functions have optional arguments to\noverride the global and local namespace. If only one namespace is\nspecified, it is used for both.\n\n\nExceptions\n==========\n\nExceptions are a means of breaking out of the normal flow of control\nof a code block in order to handle errors or other exceptional\nconditions. An exception is *raised* at the point where the error is\ndetected; it may be *handled* by the surrounding code block or by any\ncode block that directly or indirectly invoked the code block where\nthe error occurred.\n\nThe Python interpreter raises an exception when it detects a run-time\nerror (such as division by zero). A Python program can also\nexplicitly raise an exception with the "raise" statement. Exception\nhandlers are specified with the "try" ... "except" statement. The\n"finally" clause of such a statement can be used to specify cleanup\ncode which does not handle the exception, but is executed whether an\nexception occurred or not in the preceding code.\n\nPython uses the "termination" model of error handling: an exception\nhandler can find out what happened and continue execution at an outer\nlevel, but it cannot repair the cause of the error and retry the\nfailing operation (except by re-entering the offending piece of code\nfrom the top).\n\nWhen an exception is not handled at all, the interpreter terminates\nexecution of the program, or returns to its interactive main loop. In\neither case, it prints a stack backtrace, except when the exception is\n"SystemExit".\n\nExceptions are identified by class instances. The "except" clause is\nselected depending on the class of the instance: it must reference the\nclass of the instance or a base class thereof. The instance can be\nreceived by the handler and can carry additional information about the\nexceptional condition.\n\nNote: Exception messages are not part of the Python API. Their\n contents may change from one version of Python to the next without\n warning and should not be relied on by code which will run under\n multiple versions of the interpreter.\n\nSee also the description of the "try" statement in section *The try\nstatement* and "raise" statement in section *The raise statement*.\n\n-[ Footnotes ]-\n\n[1] This limitation occurs because the code that is executed by\n these operations is not available at the time the module is\n compiled.\n', - 'exprlists': u'\nExpression lists\n****************\n\n expression_list ::= expression ( "," expression )* [","]\n starred_list ::= starred_item ( "," starred_item )* [","]\n starred_expression ::= expression | ( starred_item "," )* [starred_item]\n starred_item ::= expression | "*" or_expr\n\nExcept when part of a list or set display, an expression list\ncontaining at least one comma yields a tuple. The length of the tuple\nis the number of expressions in the list. The expressions are\nevaluated from left to right.\n\nAn asterisk "*" denotes *iterable unpacking*. Its operand must be an\n*iterable*. The iterable is expanded into a sequence of items, which\nare included in the new tuple, list, or set, at the site of the\nunpacking.\n\nNew in version 3.5: Iterable unpacking in expression lists, originally\nproposed by **PEP 448**.\n\nThe trailing comma is required only to create a single tuple (a.k.a. a\n*singleton*); it is optional in all other cases. A single expression\nwithout a trailing comma doesn\'t create a tuple, but rather yields the\nvalue of that expression. (To create an empty tuple, use an empty pair\nof parentheses: "()".)\n', - 'floating': u'\nFloating point literals\n***********************\n\nFloating point literals are described by the following lexical\ndefinitions:\n\n floatnumber ::= pointfloat | exponentfloat\n pointfloat ::= [intpart] fraction | intpart "."\n exponentfloat ::= (intpart | pointfloat) exponent\n intpart ::= digit+\n fraction ::= "." digit+\n exponent ::= ("e" | "E") ["+" | "-"] digit+\n\nNote that the integer and exponent parts are always interpreted using\nradix 10. For example, "077e010" is legal, and denotes the same number\nas "77e10". The allowed range of floating point literals is\nimplementation-dependent. Some examples of floating point literals:\n\n 3.14 10. .001 1e100 3.14e-10 0e0\n\nNote that numeric literals do not include a sign; a phrase like "-1"\nis actually an expression composed of the unary operator "-" and the\nliteral "1".\n', - 'for': u'\nThe "for" statement\n*******************\n\nThe "for" statement is used to iterate over the elements of a sequence\n(such as a string, tuple or list) or other iterable object:\n\n for_stmt ::= "for" target_list "in" expression_list ":" suite\n ["else" ":" suite]\n\nThe expression list is evaluated once; it should yield an iterable\nobject. An iterator is created for the result of the\n"expression_list". The suite is then executed once for each item\nprovided by the iterator, in the order returned by the iterator. Each\nitem in turn is assigned to the target list using the standard rules\nfor assignments (see *Assignment statements*), and then the suite is\nexecuted. When the items are exhausted (which is immediately when the\nsequence is empty or an iterator raises a "StopIteration" exception),\nthe suite in the "else" clause, if present, is executed, and the loop\nterminates.\n\nA "break" statement executed in the first suite terminates the loop\nwithout executing the "else" clause\'s suite. A "continue" statement\nexecuted in the first suite skips the rest of the suite and continues\nwith the next item, or with the "else" clause if there is no next\nitem.\n\nThe for-loop makes assignments to the variables(s) in the target list.\nThis overwrites all previous assignments to those variables including\nthose made in the suite of the for-loop:\n\n for i in range(10):\n print(i)\n i = 5 # this will not affect the for-loop\n # because i will be overwritten with the next\n # index in the range\n\nNames in the target list are not deleted when the loop is finished,\nbut if the sequence is empty, they will not have been assigned to at\nall by the loop. Hint: the built-in function "range()" returns an\niterator of integers suitable to emulate the effect of Pascal\'s "for i\n:= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, 2]".\n\nNote: There is a subtlety when the sequence is being modified by the\n loop (this can only occur for mutable sequences, i.e. lists). An\n internal counter is used to keep track of which item is used next,\n and this is incremented on each iteration. When this counter has\n reached the length of the sequence the loop terminates. This means\n that if the suite deletes the current (or a previous) item from the\n sequence, the next item will be skipped (since it gets the index of\n the current item which has already been treated). Likewise, if the\n suite inserts an item in the sequence before the current item, the\n current item will be treated again the next time through the loop.\n This can lead to nasty bugs that can be avoided by making a\n temporary copy using a slice of the whole sequence, e.g.,\n\n for x in a[:]:\n if x < 0: a.remove(x)\n', - 'formatstrings': u'\nFormat String Syntax\n********************\n\nThe "str.format()" method and the "Formatter" class share the same\nsyntax for format strings (although in the case of "Formatter",\nsubclasses can define their own format string syntax).\n\nFormat strings contain "replacement fields" surrounded by curly braces\n"{}". Anything that is not contained in braces is considered literal\ntext, which is copied unchanged to the output. If you need to include\na brace character in the literal text, it can be escaped by doubling:\n"{{" and "}}".\n\nThe grammar for a replacement field is as follows:\n\n replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"\n field_name ::= arg_name ("." attribute_name | "[" element_index "]")*\n arg_name ::= [identifier | integer]\n attribute_name ::= identifier\n element_index ::= integer | index_string\n index_string ::= +\n conversion ::= "r" | "s" | "a"\n format_spec ::= \n\nIn less formal terms, the replacement field can start with a\n*field_name* that specifies the object whose value is to be formatted\nand inserted into the output instead of the replacement field. The\n*field_name* is optionally followed by a *conversion* field, which is\npreceded by an exclamation point "\'!\'", and a *format_spec*, which is\npreceded by a colon "\':\'". These specify a non-default format for the\nreplacement value.\n\nSee also the *Format Specification Mini-Language* section.\n\nThe *field_name* itself begins with an *arg_name* that is either a\nnumber or a keyword. If it\'s a number, it refers to a positional\nargument, and if it\'s a keyword, it refers to a named keyword\nargument. If the numerical arg_names in a format string are 0, 1, 2,\n... in sequence, they can all be omitted (not just some) and the\nnumbers 0, 1, 2, ... will be automatically inserted in that order.\nBecause *arg_name* is not quote-delimited, it is not possible to\nspecify arbitrary dictionary keys (e.g., the strings "\'10\'" or\n"\':-]\'") within a format string. The *arg_name* can be followed by any\nnumber of index or attribute expressions. An expression of the form\n"\'.name\'" selects the named attribute using "getattr()", while an\nexpression of the form "\'[index]\'" does an index lookup using\n"__getitem__()".\n\nChanged in version 3.1: The positional argument specifiers can be\nomitted, so "\'{} {}\'" is equivalent to "\'{0} {1}\'".\n\nSome simple format string examples:\n\n "First, thou shalt count to {0}" # References first positional argument\n "Bring me a {}" # Implicitly references the first positional argument\n "From {} to {}" # Same as "From {0} to {1}"\n "My quest is {name}" # References keyword argument \'name\'\n "Weight in tons {0.weight}" # \'weight\' attribute of first positional arg\n "Units destroyed: {players[0]}" # First element of keyword argument \'players\'.\n\nThe *conversion* field causes a type coercion before formatting.\nNormally, the job of formatting a value is done by the "__format__()"\nmethod of the value itself. However, in some cases it is desirable to\nforce a type to be formatted as a string, overriding its own\ndefinition of formatting. By converting the value to a string before\ncalling "__format__()", the normal formatting logic is bypassed.\n\nThree conversion flags are currently supported: "\'!s\'" which calls\n"str()" on the value, "\'!r\'" which calls "repr()" and "\'!a\'" which\ncalls "ascii()".\n\nSome examples:\n\n "Harold\'s a clever {0!s}" # Calls str() on the argument first\n "Bring out the holy {name!r}" # Calls repr() on the argument first\n "More {!a}" # Calls ascii() on the argument first\n\nThe *format_spec* field contains a specification of how the value\nshould be presented, including such details as field width, alignment,\npadding, decimal precision and so on. Each value type can define its\nown "formatting mini-language" or interpretation of the *format_spec*.\n\nMost built-in types support a common formatting mini-language, which\nis described in the next section.\n\nA *format_spec* field can also include nested replacement fields\nwithin it. These nested replacement fields may contain a field name,\nconversion flag and format specification, but deeper nesting is not\nallowed. The replacement fields within the format_spec are\nsubstituted before the *format_spec* string is interpreted. This\nallows the formatting of a value to be dynamically specified.\n\nSee the *Format examples* section for some examples.\n\n\nFormat Specification Mini-Language\n==================================\n\n"Format specifications" are used within replacement fields contained\nwithin a format string to define how individual values are presented\n(see *Format String Syntax*). They can also be passed directly to the\nbuilt-in "format()" function. Each formattable type may define how\nthe format specification is to be interpreted.\n\nMost built-in types implement the following options for format\nspecifications, although some of the formatting options are only\nsupported by the numeric types.\n\nA general convention is that an empty format string ("""") produces\nthe same result as if you had called "str()" on the value. A non-empty\nformat string typically modifies the result.\n\nThe general form of a *standard format specifier* is:\n\n format_spec ::= [[fill]align][sign][#][0][width][,][.precision][type]\n fill ::= \n align ::= "<" | ">" | "=" | "^"\n sign ::= "+" | "-" | " "\n width ::= integer\n precision ::= integer\n type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"\n\nIf a valid *align* value is specified, it can be preceded by a *fill*\ncharacter that can be any character and defaults to a space if\nomitted. It is not possible to use a literal curly brace (""{"" or\n""}"") as the *fill* character when using the "str.format()" method.\nHowever, it is possible to insert a curly brace with a nested\nreplacement field. This limitation doesn\'t affect the "format()"\nfunction.\n\nThe meaning of the various alignment options is as follows:\n\n +-----------+------------------------------------------------------------+\n | Option | Meaning |\n +===========+============================================================+\n | "\'<\'" | Forces the field to be left-aligned within the available |\n | | space (this is the default for most objects). |\n +-----------+------------------------------------------------------------+\n | "\'>\'" | Forces the field to be right-aligned within the available |\n | | space (this is the default for numbers). |\n +-----------+------------------------------------------------------------+\n | "\'=\'" | Forces the padding to be placed after the sign (if any) |\n | | but before the digits. This is used for printing fields |\n | | in the form \'+000000120\'. This alignment option is only |\n | | valid for numeric types. It becomes the default when \'0\' |\n | | immediately precedes the field width. |\n +-----------+------------------------------------------------------------+\n | "\'^\'" | Forces the field to be centered within the available |\n | | space. |\n +-----------+------------------------------------------------------------+\n\nNote that unless a minimum field width is defined, the field width\nwill always be the same size as the data to fill it, so that the\nalignment option has no meaning in this case.\n\nThe *sign* option is only valid for number types, and can be one of\nthe following:\n\n +-----------+------------------------------------------------------------+\n | Option | Meaning |\n +===========+============================================================+\n | "\'+\'" | indicates that a sign should be used for both positive as |\n | | well as negative numbers. |\n +-----------+------------------------------------------------------------+\n | "\'-\'" | indicates that a sign should be used only for negative |\n | | numbers (this is the default behavior). |\n +-----------+------------------------------------------------------------+\n | space | indicates that a leading space should be used on positive |\n | | numbers, and a minus sign on negative numbers. |\n +-----------+------------------------------------------------------------+\n\nThe "\'#\'" option causes the "alternate form" to be used for the\nconversion. The alternate form is defined differently for different\ntypes. This option is only valid for integer, float, complex and\nDecimal types. For integers, when binary, octal, or hexadecimal output\nis used, this option adds the prefix respective "\'0b\'", "\'0o\'", or\n"\'0x\'" to the output value. For floats, complex and Decimal the\nalternate form causes the result of the conversion to always contain a\ndecimal-point character, even if no digits follow it. Normally, a\ndecimal-point character appears in the result of these conversions\nonly if a digit follows it. In addition, for "\'g\'" and "\'G\'"\nconversions, trailing zeros are not removed from the result.\n\nThe "\',\'" option signals the use of a comma for a thousands separator.\nFor a locale aware separator, use the "\'n\'" integer presentation type\ninstead.\n\nChanged in version 3.1: Added the "\',\'" option (see also **PEP 378**).\n\n*width* is a decimal integer defining the minimum field width. If not\nspecified, then the field width will be determined by the content.\n\nWhen no explicit alignment is given, preceding the *width* field by a\nzero ("\'0\'") character enables sign-aware zero-padding for numeric\ntypes. This is equivalent to a *fill* character of "\'0\'" with an\n*alignment* type of "\'=\'".\n\nThe *precision* is a decimal number indicating how many digits should\nbe displayed after the decimal point for a floating point value\nformatted with "\'f\'" and "\'F\'", or before and after the decimal point\nfor a floating point value formatted with "\'g\'" or "\'G\'". For non-\nnumber types the field indicates the maximum field size - in other\nwords, how many characters will be used from the field content. The\n*precision* is not allowed for integer values.\n\nFinally, the *type* determines how the data should be presented.\n\nThe available string presentation types are:\n\n +-----------+------------------------------------------------------------+\n | Type | Meaning |\n +===========+============================================================+\n | "\'s\'" | String format. This is the default type for strings and |\n | | may be omitted. |\n +-----------+------------------------------------------------------------+\n | None | The same as "\'s\'". |\n +-----------+------------------------------------------------------------+\n\nThe available integer presentation types are:\n\n +-----------+------------------------------------------------------------+\n | Type | Meaning |\n +===========+============================================================+\n | "\'b\'" | Binary format. Outputs the number in base 2. |\n +-----------+------------------------------------------------------------+\n | "\'c\'" | Character. Converts the integer to the corresponding |\n | | unicode character before printing. |\n +-----------+------------------------------------------------------------+\n | "\'d\'" | Decimal Integer. Outputs the number in base 10. |\n +-----------+------------------------------------------------------------+\n | "\'o\'" | Octal format. Outputs the number in base 8. |\n +-----------+------------------------------------------------------------+\n | "\'x\'" | Hex format. Outputs the number in base 16, using lower- |\n | | case letters for the digits above 9. |\n +-----------+------------------------------------------------------------+\n | "\'X\'" | Hex format. Outputs the number in base 16, using upper- |\n | | case letters for the digits above 9. |\n +-----------+------------------------------------------------------------+\n | "\'n\'" | Number. This is the same as "\'d\'", except that it uses the |\n | | current locale setting to insert the appropriate number |\n | | separator characters. |\n +-----------+------------------------------------------------------------+\n | None | The same as "\'d\'". |\n +-----------+------------------------------------------------------------+\n\nIn addition to the above presentation types, integers can be formatted\nwith the floating point presentation types listed below (except "\'n\'"\nand "None"). When doing so, "float()" is used to convert the integer\nto a floating point number before formatting.\n\nThe available presentation types for floating point and decimal values\nare:\n\n +-----------+------------------------------------------------------------+\n | Type | Meaning |\n +===========+============================================================+\n | "\'e\'" | Exponent notation. Prints the number in scientific |\n | | notation using the letter \'e\' to indicate the exponent. |\n | | The default precision is "6". |\n +-----------+------------------------------------------------------------+\n | "\'E\'" | Exponent notation. Same as "\'e\'" except it uses an upper |\n | | case \'E\' as the separator character. |\n +-----------+------------------------------------------------------------+\n | "\'f\'" | Fixed point. Displays the number as a fixed-point number. |\n | | The default precision is "6". |\n +-----------+------------------------------------------------------------+\n | "\'F\'" | Fixed point. Same as "\'f\'", but converts "nan" to "NAN" |\n | | and "inf" to "INF". |\n +-----------+------------------------------------------------------------+\n | "\'g\'" | General format. For a given precision "p >= 1", this |\n | | rounds the number to "p" significant digits and then |\n | | formats the result in either fixed-point format or in |\n | | scientific notation, depending on its magnitude. The |\n | | precise rules are as follows: suppose that the result |\n | | formatted with presentation type "\'e\'" and precision "p-1" |\n | | would have exponent "exp". Then if "-4 <= exp < p", the |\n | | number is formatted with presentation type "\'f\'" and |\n | | precision "p-1-exp". Otherwise, the number is formatted |\n | | with presentation type "\'e\'" and precision "p-1". In both |\n | | cases insignificant trailing zeros are removed from the |\n | | significand, and the decimal point is also removed if |\n | | there are no remaining digits following it. Positive and |\n | | negative infinity, positive and negative zero, and nans, |\n | | are formatted as "inf", "-inf", "0", "-0" and "nan" |\n | | respectively, regardless of the precision. A precision of |\n | | "0" is treated as equivalent to a precision of "1". The |\n | | default precision is "6". |\n +-----------+------------------------------------------------------------+\n | "\'G\'" | General format. Same as "\'g\'" except switches to "\'E\'" if |\n | | the number gets too large. The representations of infinity |\n | | and NaN are uppercased, too. |\n +-----------+------------------------------------------------------------+\n | "\'n\'" | Number. This is the same as "\'g\'", except that it uses the |\n | | current locale setting to insert the appropriate number |\n | | separator characters. |\n +-----------+------------------------------------------------------------+\n | "\'%\'" | Percentage. Multiplies the number by 100 and displays in |\n | | fixed ("\'f\'") format, followed by a percent sign. |\n +-----------+------------------------------------------------------------+\n | None | Similar to "\'g\'", except that fixed-point notation, when |\n | | used, has at least one digit past the decimal point. The |\n | | default precision is as high as needed to represent the |\n | | particular value. The overall effect is to match the |\n | | output of "str()" as altered by the other format |\n | | modifiers. |\n +-----------+------------------------------------------------------------+\n\n\nFormat examples\n===============\n\nThis section contains examples of the "str.format()" syntax and\ncomparison with the old "%"-formatting.\n\nIn most of the cases the syntax is similar to the old "%"-formatting,\nwith the addition of the "{}" and with ":" used instead of "%". For\nexample, "\'%03.2f\'" can be translated to "\'{:03.2f}\'".\n\nThe new format syntax also supports new and different options, shown\nin the follow examples.\n\nAccessing arguments by position:\n\n >>> \'{0}, {1}, {2}\'.format(\'a\', \'b\', \'c\')\n \'a, b, c\'\n >>> \'{}, {}, {}\'.format(\'a\', \'b\', \'c\') # 3.1+ only\n \'a, b, c\'\n >>> \'{2}, {1}, {0}\'.format(\'a\', \'b\', \'c\')\n \'c, b, a\'\n >>> \'{2}, {1}, {0}\'.format(*\'abc\') # unpacking argument sequence\n \'c, b, a\'\n >>> \'{0}{1}{0}\'.format(\'abra\', \'cad\') # arguments\' indices can be repeated\n \'abracadabra\'\n\nAccessing arguments by name:\n\n >>> \'Coordinates: {latitude}, {longitude}\'.format(latitude=\'37.24N\', longitude=\'-115.81W\')\n \'Coordinates: 37.24N, -115.81W\'\n >>> coord = {\'latitude\': \'37.24N\', \'longitude\': \'-115.81W\'}\n >>> \'Coordinates: {latitude}, {longitude}\'.format(**coord)\n \'Coordinates: 37.24N, -115.81W\'\n\nAccessing arguments\' attributes:\n\n >>> c = 3-5j\n >>> (\'The complex number {0} is formed from the real part {0.real} \'\n ... \'and the imaginary part {0.imag}.\').format(c)\n \'The complex number (3-5j) is formed from the real part 3.0 and the imaginary part -5.0.\'\n >>> class Point:\n ... def __init__(self, x, y):\n ... self.x, self.y = x, y\n ... def __str__(self):\n ... return \'Point({self.x}, {self.y})\'.format(self=self)\n ...\n >>> str(Point(4, 2))\n \'Point(4, 2)\'\n\nAccessing arguments\' items:\n\n >>> coord = (3, 5)\n >>> \'X: {0[0]}; Y: {0[1]}\'.format(coord)\n \'X: 3; Y: 5\'\n\nReplacing "%s" and "%r":\n\n >>> "repr() shows quotes: {!r}; str() doesn\'t: {!s}".format(\'test1\', \'test2\')\n "repr() shows quotes: \'test1\'; str() doesn\'t: test2"\n\nAligning the text and specifying a width:\n\n >>> \'{:<30}\'.format(\'left aligned\')\n \'left aligned \'\n >>> \'{:>30}\'.format(\'right aligned\')\n \' right aligned\'\n >>> \'{:^30}\'.format(\'centered\')\n \' centered \'\n >>> \'{:*^30}\'.format(\'centered\') # use \'*\' as a fill char\n \'***********centered***********\'\n\nReplacing "%+f", "%-f", and "% f" and specifying a sign:\n\n >>> \'{:+f}; {:+f}\'.format(3.14, -3.14) # show it always\n \'+3.140000; -3.140000\'\n >>> \'{: f}; {: f}\'.format(3.14, -3.14) # show a space for positive numbers\n \' 3.140000; -3.140000\'\n >>> \'{:-f}; {:-f}\'.format(3.14, -3.14) # show only the minus -- same as \'{:f}; {:f}\'\n \'3.140000; -3.140000\'\n\nReplacing "%x" and "%o" and converting the value to different bases:\n\n >>> # format also supports binary numbers\n >>> "int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}".format(42)\n \'int: 42; hex: 2a; oct: 52; bin: 101010\'\n >>> # with 0x, 0o, or 0b as prefix:\n >>> "int: {0:d}; hex: {0:#x}; oct: {0:#o}; bin: {0:#b}".format(42)\n \'int: 42; hex: 0x2a; oct: 0o52; bin: 0b101010\'\n\nUsing the comma as a thousands separator:\n\n >>> \'{:,}\'.format(1234567890)\n \'1,234,567,890\'\n\nExpressing a percentage:\n\n >>> points = 19\n >>> total = 22\n >>> \'Correct answers: {:.2%}\'.format(points/total)\n \'Correct answers: 86.36%\'\n\nUsing type-specific formatting:\n\n >>> import datetime\n >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)\n >>> \'{:%Y-%m-%d %H:%M:%S}\'.format(d)\n \'2010-07-04 12:15:58\'\n\nNesting arguments and more complex examples:\n\n >>> for align, text in zip(\'<^>\', [\'left\', \'center\', \'right\']):\n ... \'{0:{fill}{align}16}\'.format(text, fill=align, align=align)\n ...\n \'left<<<<<<<<<<<<\'\n \'^^^^^center^^^^^\'\n \'>>>>>>>>>>>right\'\n >>>\n >>> octets = [192, 168, 0, 1]\n >>> \'{:02X}{:02X}{:02X}{:02X}\'.format(*octets)\n \'C0A80001\'\n >>> int(_, 16)\n 3232235521\n >>>\n >>> width = 5\n >>> for num in range(5,12): #doctest: +NORMALIZE_WHITESPACE\n ... for base in \'dXob\':\n ... print(\'{0:{width}{base}}\'.format(num, base=base, width=width), end=\' \')\n ... print()\n ...\n 5 5 5 101\n 6 6 6 110\n 7 7 7 111\n 8 8 10 1000\n 9 9 11 1001\n 10 A 12 1010\n 11 B 13 1011\n', - 'function': u'\nFunction definitions\n********************\n\nA function definition defines a user-defined function object (see\nsection *The standard type hierarchy*):\n\n funcdef ::= [decorators] "def" funcname "(" [parameter_list] ")" ["->" expression] ":" suite\n decorators ::= decorator+\n decorator ::= "@" dotted_name ["(" [argument_list [","]] ")"] NEWLINE\n dotted_name ::= identifier ("." identifier)*\n parameter_list ::= (defparameter ",")*\n | "*" [parameter] ("," defparameter)* ["," "**" parameter]\n | "**" parameter\n | defparameter [","] )\n parameter ::= identifier [":" expression]\n defparameter ::= parameter ["=" expression]\n funcname ::= identifier\n\nA function definition is an executable statement. Its execution binds\nthe function name in the current local namespace to a function object\n(a wrapper around the executable code for the function). This\nfunction object contains a reference to the current global namespace\nas the global namespace to be used when the function is called.\n\nThe function definition does not execute the function body; this gets\nexecuted only when the function is called. [3]\n\nA function definition may be wrapped by one or more *decorator*\nexpressions. Decorator expressions are evaluated when the function is\ndefined, in the scope that contains the function definition. The\nresult must be a callable, which is invoked with the function object\nas the only argument. The returned value is bound to the function name\ninstead of the function object. Multiple decorators are applied in\nnested fashion. For example, the following code\n\n @f1(arg)\n @f2\n def func(): pass\n\nis roughly equivalent to\n\n def func(): pass\n func = f1(arg)(f2(func))\n\nexcept that the original function is not temporarily bound to the name\n"func".\n\nWhen one or more *parameters* have the form *parameter* "="\n*expression*, the function is said to have "default parameter values."\nFor a parameter with a default value, the corresponding *argument* may\nbe omitted from a call, in which case the parameter\'s default value is\nsubstituted. If a parameter has a default value, all following\nparameters up until the ""*"" must also have a default value --- this\nis a syntactic restriction that is not expressed by the grammar.\n\n**Default parameter values are evaluated from left to right when the\nfunction definition is executed.** This means that the expression is\nevaluated once, when the function is defined, and that the same "pre-\ncomputed" value is used for each call. This is especially important\nto understand when a default parameter is a mutable object, such as a\nlist or a dictionary: if the function modifies the object (e.g. by\nappending an item to a list), the default value is in effect modified.\nThis is generally not what was intended. A way around this is to use\n"None" as the default, and explicitly test for it in the body of the\nfunction, e.g.:\n\n def whats_on_the_telly(penguin=None):\n if penguin is None:\n penguin = []\n penguin.append("property of the zoo")\n return penguin\n\nFunction call semantics are described in more detail in section\n*Calls*. A function call always assigns values to all parameters\nmentioned in the parameter list, either from position arguments, from\nkeyword arguments, or from default values. If the form\n""*identifier"" is present, it is initialized to a tuple receiving any\nexcess positional parameters, defaulting to the empty tuple. If the\nform ""**identifier"" is present, it is initialized to a new\ndictionary receiving any excess keyword arguments, defaulting to a new\nempty dictionary. Parameters after ""*"" or ""*identifier"" are\nkeyword-only parameters and may only be passed used keyword arguments.\n\nParameters may have annotations of the form "": expression"" following\nthe parameter name. Any parameter may have an annotation even those\nof the form "*identifier" or "**identifier". Functions may have\n"return" annotation of the form ""-> expression"" after the parameter\nlist. These annotations can be any valid Python expression and are\nevaluated when the function definition is executed. Annotations may\nbe evaluated in a different order than they appear in the source code.\nThe presence of annotations does not change the semantics of a\nfunction. The annotation values are available as values of a\ndictionary keyed by the parameters\' names in the "__annotations__"\nattribute of the function object.\n\nIt is also possible to create anonymous functions (functions not bound\nto a name), for immediate use in expressions. This uses lambda\nexpressions, described in section *Lambdas*. Note that the lambda\nexpression is merely a shorthand for a simplified function definition;\na function defined in a ""def"" statement can be passed around or\nassigned to another name just like a function defined by a lambda\nexpression. The ""def"" form is actually more powerful since it\nallows the execution of multiple statements and annotations.\n\n**Programmer\'s note:** Functions are first-class objects. A ""def""\nstatement executed inside a function definition defines a local\nfunction that can be returned or passed around. Free variables used\nin the nested function can access the local variables of the function\ncontaining the def. See section *Naming and binding* for details.\n\nSee also: **PEP 3107** - Function Annotations\n\n The original specification for function annotations.\n', - 'global': u'\nThe "global" statement\n**********************\n\n global_stmt ::= "global" identifier ("," identifier)*\n\nThe "global" statement is a declaration which holds for the entire\ncurrent code block. It means that the listed identifiers are to be\ninterpreted as globals. It would be impossible to assign to a global\nvariable without "global", although free variables may refer to\nglobals without being declared global.\n\nNames listed in a "global" statement must not be used in the same code\nblock textually preceding that "global" statement.\n\nNames listed in a "global" statement must not be defined as formal\nparameters or in a "for" loop control target, "class" definition,\nfunction definition, or "import" statement.\n\n**CPython implementation detail:** The current implementation does not\nenforce the two restrictions, but programs should not abuse this\nfreedom, as future implementations may enforce them or silently change\nthe meaning of the program.\n\n**Programmer\'s note:** "global" is a directive to the parser. It\napplies only to code parsed at the same time as the "global"\nstatement. In particular, a "global" statement contained in a string\nor code object supplied to the built-in "exec()" function does not\naffect the code block *containing* the function call, and code\ncontained in such a string is unaffected by "global" statements in the\ncode containing the function call. The same applies to the "eval()"\nand "compile()" functions.\n', - 'id-classes': u'\nReserved classes of identifiers\n*******************************\n\nCertain classes of identifiers (besides keywords) have special\nmeanings. These classes are identified by the patterns of leading and\ntrailing underscore characters:\n\n"_*"\n Not imported by "from module import *". The special identifier "_"\n is used in the interactive interpreter to store the result of the\n last evaluation; it is stored in the "builtins" module. When not\n in interactive mode, "_" has no special meaning and is not defined.\n See section *The import statement*.\n\n Note: The name "_" is often used in conjunction with\n internationalization; refer to the documentation for the\n "gettext" module for more information on this convention.\n\n"__*__"\n System-defined names. These names are defined by the interpreter\n and its implementation (including the standard library). Current\n system names are discussed in the *Special method names* section\n and elsewhere. More will likely be defined in future versions of\n Python. *Any* use of "__*__" names, in any context, that does not\n follow explicitly documented use, is subject to breakage without\n warning.\n\n"__*"\n Class-private names. Names in this category, when used within the\n context of a class definition, are re-written to use a mangled form\n to help avoid name clashes between "private" attributes of base and\n derived classes. See section *Identifiers (Names)*.\n', - 'identifiers': u'\nIdentifiers and keywords\n************************\n\nIdentifiers (also referred to as *names*) are described by the\nfollowing lexical definitions.\n\nThe syntax of identifiers in Python is based on the Unicode standard\nannex UAX-31, with elaboration and changes as defined below; see also\n**PEP 3131** for further details.\n\nWithin the ASCII range (U+0001..U+007F), the valid characters for\nidentifiers are the same as in Python 2.x: the uppercase and lowercase\nletters "A" through "Z", the underscore "_" and, except for the first\ncharacter, the digits "0" through "9".\n\nPython 3.0 introduces additional characters from outside the ASCII\nrange (see **PEP 3131**). For these characters, the classification\nuses the version of the Unicode Character Database as included in the\n"unicodedata" module.\n\nIdentifiers are unlimited in length. Case is significant.\n\n identifier ::= xid_start xid_continue*\n id_start ::= \n id_continue ::= \n xid_start ::= \n xid_continue ::= \n\nThe Unicode category codes mentioned above stand for:\n\n* *Lu* - uppercase letters\n\n* *Ll* - lowercase letters\n\n* *Lt* - titlecase letters\n\n* *Lm* - modifier letters\n\n* *Lo* - other letters\n\n* *Nl* - letter numbers\n\n* *Mn* - nonspacing marks\n\n* *Mc* - spacing combining marks\n\n* *Nd* - decimal numbers\n\n* *Pc* - connector punctuations\n\n* *Other_ID_Start* - explicit list of characters in PropList.txt to\n support backwards compatibility\n\n* *Other_ID_Continue* - likewise\n\nAll identifiers are converted into the normal form NFKC while parsing;\ncomparison of identifiers is based on NFKC.\n\nA non-normative HTML file listing all valid identifier characters for\nUnicode 4.1 can be found at https://www.dcl.hpi.uni-\npotsdam.de/home/loewis/table-3131.html.\n\n\nKeywords\n========\n\nThe following identifiers are used as reserved words, or *keywords* of\nthe language, and cannot be used as ordinary identifiers. They must\nbe spelled exactly as written here:\n\n False class finally is return\n None continue for lambda try\n True def from nonlocal while\n and del global not with\n as elif if or yield\n assert else import pass\n break except in raise\n\n\nReserved classes of identifiers\n===============================\n\nCertain classes of identifiers (besides keywords) have special\nmeanings. These classes are identified by the patterns of leading and\ntrailing underscore characters:\n\n"_*"\n Not imported by "from module import *". The special identifier "_"\n is used in the interactive interpreter to store the result of the\n last evaluation; it is stored in the "builtins" module. When not\n in interactive mode, "_" has no special meaning and is not defined.\n See section *The import statement*.\n\n Note: The name "_" is often used in conjunction with\n internationalization; refer to the documentation for the\n "gettext" module for more information on this convention.\n\n"__*__"\n System-defined names. These names are defined by the interpreter\n and its implementation (including the standard library). Current\n system names are discussed in the *Special method names* section\n and elsewhere. More will likely be defined in future versions of\n Python. *Any* use of "__*__" names, in any context, that does not\n follow explicitly documented use, is subject to breakage without\n warning.\n\n"__*"\n Class-private names. Names in this category, when used within the\n context of a class definition, are re-written to use a mangled form\n to help avoid name clashes between "private" attributes of base and\n derived classes. See section *Identifiers (Names)*.\n', - 'if': u'\nThe "if" statement\n******************\n\nThe "if" statement is used for conditional execution:\n\n if_stmt ::= "if" expression ":" suite\n ( "elif" expression ":" suite )*\n ["else" ":" suite]\n\nIt selects exactly one of the suites by evaluating the expressions one\nby one until one is found to be true (see section *Boolean operations*\nfor the definition of true and false); then that suite is executed\n(and no other part of the "if" statement is executed or evaluated).\nIf all expressions are false, the suite of the "else" clause, if\npresent, is executed.\n', - 'imaginary': u'\nImaginary literals\n******************\n\nImaginary literals are described by the following lexical definitions:\n\n imagnumber ::= (floatnumber | intpart) ("j" | "J")\n\nAn imaginary literal yields a complex number with a real part of 0.0.\nComplex numbers are represented as a pair of floating point numbers\nand have the same restrictions on their range. To create a complex\nnumber with a nonzero real part, add a floating point number to it,\ne.g., "(3+4j)". Some examples of imaginary literals:\n\n 3.14j 10.j 10j .001j 1e100j 3.14e-10j\n', - 'import': u'\nThe "import" statement\n**********************\n\n import_stmt ::= "import" module ["as" name] ( "," module ["as" name] )*\n | "from" relative_module "import" identifier ["as" name]\n ( "," identifier ["as" name] )*\n | "from" relative_module "import" "(" identifier ["as" name]\n ( "," identifier ["as" name] )* [","] ")"\n | "from" module "import" "*"\n module ::= (identifier ".")* identifier\n relative_module ::= "."* module | "."+\n name ::= identifier\n\nThe basic import statement (no "from" clause) is executed in two\nsteps:\n\n1. find a module, loading and initializing it if necessary\n\n2. define a name or names in the local namespace for the scope\n where the "import" statement occurs.\n\nWhen the statement contains multiple clauses (separated by commas) the\ntwo steps are carried out separately for each clause, just as though\nthe clauses had been separated out into individual import statements.\n\nThe details of the first step, finding and loading modules are\ndescribed in greater detail in the section on the *import system*,\nwhich also describes the various types of packages and modules that\ncan be imported, as well as all the hooks that can be used to\ncustomize the import system. Note that failures in this step may\nindicate either that the module could not be located, *or* that an\nerror occurred while initializing the module, which includes execution\nof the module\'s code.\n\nIf the requested module is retrieved successfully, it will be made\navailable in the local namespace in one of three ways:\n\n* If the module name is followed by "as", then the name following\n "as" is bound directly to the imported module.\n\n* If no other name is specified, and the module being imported is a\n top level module, the module\'s name is bound in the local namespace\n as a reference to the imported module\n\n* If the module being imported is *not* a top level module, then the\n name of the top level package that contains the module is bound in\n the local namespace as a reference to the top level package. The\n imported module must be accessed using its full qualified name\n rather than directly\n\nThe "from" form uses a slightly more complex process:\n\n1. find the module specified in the "from" clause, loading and\n initializing it if necessary;\n\n2. for each of the identifiers specified in the "import" clauses:\n\n 1. check if the imported module has an attribute by that name\n\n 2. if not, attempt to import a submodule with that name and then\n check the imported module again for that attribute\n\n 3. if the attribute is not found, "ImportError" is raised.\n\n 4. otherwise, a reference to that value is stored in the local\n namespace, using the name in the "as" clause if it is present,\n otherwise using the attribute name\n\nExamples:\n\n import foo # foo imported and bound locally\n import foo.bar.baz # foo.bar.baz imported, foo bound locally\n import foo.bar.baz as fbb # foo.bar.baz imported and bound as fbb\n from foo.bar import baz # foo.bar.baz imported and bound as baz\n from foo import attr # foo imported and foo.attr bound as attr\n\nIf the list of identifiers is replaced by a star ("\'*\'"), all public\nnames defined in the module are bound in the local namespace for the\nscope where the "import" statement occurs.\n\nThe *public names* defined by a module are determined by checking the\nmodule\'s namespace for a variable named "__all__"; if defined, it must\nbe a sequence of strings which are names defined or imported by that\nmodule. The names given in "__all__" are all considered public and\nare required to exist. If "__all__" is not defined, the set of public\nnames includes all names found in the module\'s namespace which do not\nbegin with an underscore character ("\'_\'"). "__all__" should contain\nthe entire public API. It is intended to avoid accidentally exporting\nitems that are not part of the API (such as library modules which were\nimported and used within the module).\n\nThe wild card form of import --- "from module import *" --- is only\nallowed at the module level. Attempting to use it in class or\nfunction definitions will raise a "SyntaxError".\n\nWhen specifying what module to import you do not have to specify the\nabsolute name of the module. When a module or package is contained\nwithin another package it is possible to make a relative import within\nthe same top package without having to mention the package name. By\nusing leading dots in the specified module or package after "from" you\ncan specify how high to traverse up the current package hierarchy\nwithout specifying exact names. One leading dot means the current\npackage where the module making the import exists. Two dots means up\none package level. Three dots is up two levels, etc. So if you execute\n"from . import mod" from a module in the "pkg" package then you will\nend up importing "pkg.mod". If you execute "from ..subpkg2 import mod"\nfrom within "pkg.subpkg1" you will import "pkg.subpkg2.mod". The\nspecification for relative imports is contained within **PEP 328**.\n\n"importlib.import_module()" is provided to support applications that\ndetermine dynamically the modules to be loaded.\n\n\nFuture statements\n=================\n\nA *future statement* is a directive to the compiler that a particular\nmodule should be compiled using syntax or semantics that will be\navailable in a specified future release of Python where the feature\nbecomes standard.\n\nThe future statement is intended to ease migration to future versions\nof Python that introduce incompatible changes to the language. It\nallows use of the new features on a per-module basis before the\nrelease in which the feature becomes standard.\n\n future_statement ::= "from" "__future__" "import" feature ["as" name]\n ("," feature ["as" name])*\n | "from" "__future__" "import" "(" feature ["as" name]\n ("," feature ["as" name])* [","] ")"\n feature ::= identifier\n name ::= identifier\n\nA future statement must appear near the top of the module. The only\nlines that can appear before a future statement are:\n\n* the module docstring (if any),\n\n* comments,\n\n* blank lines, and\n\n* other future statements.\n\nThe features recognized by Python 3.0 are "absolute_import",\n"division", "generators", "unicode_literals", "print_function",\n"nested_scopes" and "with_statement". They are all redundant because\nthey are always enabled, and only kept for backwards compatibility.\n\nA future statement is recognized and treated specially at compile\ntime: Changes to the semantics of core constructs are often\nimplemented by generating different code. It may even be the case\nthat a new feature introduces new incompatible syntax (such as a new\nreserved word), in which case the compiler may need to parse the\nmodule differently. Such decisions cannot be pushed off until\nruntime.\n\nFor any given release, the compiler knows which feature names have\nbeen defined, and raises a compile-time error if a future statement\ncontains a feature not known to it.\n\nThe direct runtime semantics are the same as for any import statement:\nthere is a standard module "__future__", described later, and it will\nbe imported in the usual way at the time the future statement is\nexecuted.\n\nThe interesting runtime semantics depend on the specific feature\nenabled by the future statement.\n\nNote that there is nothing special about the statement:\n\n import __future__ [as name]\n\nThat is not a future statement; it\'s an ordinary import statement with\nno special semantics or syntax restrictions.\n\nCode compiled by calls to the built-in functions "exec()" and\n"compile()" that occur in a module "M" containing a future statement\nwill, by default, use the new syntax or semantics associated with the\nfuture statement. This can be controlled by optional arguments to\n"compile()" --- see the documentation of that function for details.\n\nA future statement typed at an interactive interpreter prompt will\ntake effect for the rest of the interpreter session. If an\ninterpreter is started with the *-i* option, is passed a script name\nto execute, and the script includes a future statement, it will be in\neffect in the interactive session started after the script is\nexecuted.\n\nSee also: **PEP 236** - Back to the __future__\n\n The original proposal for the __future__ mechanism.\n', - 'in': u'\nMembership test operations\n**************************\n\nThe operators "in" and "not in" test for membership. "x in s"\nevaluates to "True" if *x* is a member of *s*, and "False" otherwise.\n"x not in s" returns the negation of "x in s". All built-in sequences\nand set types support this as well as dictionary, for which "in" tests\nwhether the dictionary has a given key. For container types such as\nlist, tuple, set, frozenset, dict, or collections.deque, the\nexpression "x in y" is equivalent to "any(x is e or x == e for e in\ny)".\n\nFor the string and bytes types, "x in y" is "True" if and only if *x*\nis a substring of *y*. An equivalent test is "y.find(x) != -1".\nEmpty strings are always considered to be a substring of any other\nstring, so """ in "abc"" will return "True".\n\nFor user-defined classes which define the "__contains__()" method, "x\nin y" returns "True" if "y.__contains__(x)" returns a true value, and\n"False" otherwise.\n\nFor user-defined classes which do not define "__contains__()" but do\ndefine "__iter__()", "x in y" is "True" if some value "z" with "x ==\nz" is produced while iterating over "y". If an exception is raised\nduring the iteration, it is as if "in" raised that exception.\n\nLastly, the old-style iteration protocol is tried: if a class defines\n"__getitem__()", "x in y" is "True" if and only if there is a non-\nnegative integer index *i* such that "x == y[i]", and all lower\ninteger indices do not raise "IndexError" exception. (If any other\nexception is raised, it is as if "in" raised that exception).\n\nThe operator "not in" is defined to have the inverse true value of\n"in".\n', - 'integers': u'\nInteger literals\n****************\n\nInteger literals are described by the following lexical definitions:\n\n integer ::= decimalinteger | octinteger | hexinteger | bininteger\n decimalinteger ::= nonzerodigit digit* | "0"+\n nonzerodigit ::= "1"..."9"\n digit ::= "0"..."9"\n octinteger ::= "0" ("o" | "O") octdigit+\n hexinteger ::= "0" ("x" | "X") hexdigit+\n bininteger ::= "0" ("b" | "B") bindigit+\n octdigit ::= "0"..."7"\n hexdigit ::= digit | "a"..."f" | "A"..."F"\n bindigit ::= "0" | "1"\n\nThere is no limit for the length of integer literals apart from what\ncan be stored in available memory.\n\nNote that leading zeros in a non-zero decimal number are not allowed.\nThis is for disambiguation with C-style octal literals, which Python\nused before version 3.0.\n\nSome examples of integer literals:\n\n 7 2147483647 0o177 0b100110111\n 3 79228162514264337593543950336 0o377 0xdeadbeef\n', - 'lambda': u'\nLambdas\n*******\n\n lambda_expr ::= "lambda" [parameter_list]: expression\n lambda_expr_nocond ::= "lambda" [parameter_list]: expression_nocond\n\nLambda expressions (sometimes called lambda forms) are used to create\nanonymous functions. The expression "lambda arguments: expression"\nyields a function object. The unnamed object behaves like a function\nobject defined with:\n\n def (arguments):\n return expression\n\nSee section *Function definitions* for the syntax of parameter lists.\nNote that functions created with lambda expressions cannot contain\nstatements or annotations.\n', - 'lists': u'\nList displays\n*************\n\nA list display is a possibly empty series of expressions enclosed in\nsquare brackets:\n\n list_display ::= "[" [starred_list | comprehension] "]"\n\nA list display yields a new list object, the contents being specified\nby either a list of expressions or a comprehension. When a comma-\nseparated list of expressions is supplied, its elements are evaluated\nfrom left to right and placed into the list object in that order.\nWhen a comprehension is supplied, the list is constructed from the\nelements resulting from the comprehension.\n', - 'naming': u'\nNaming and binding\n******************\n\n\nBinding of names\n================\n\n*Names* refer to objects. Names are introduced by name binding\noperations.\n\nThe following constructs bind names: formal parameters to functions,\n"import" statements, class and function definitions (these bind the\nclass or function name in the defining block), and targets that are\nidentifiers if occurring in an assignment, "for" loop header, or after\n"as" in a "with" statement or "except" clause. The "import" statement\nof the form "from ... import *" binds all names defined in the\nimported module, except those beginning with an underscore. This form\nmay only be used at the module level.\n\nA target occurring in a "del" statement is also considered bound for\nthis purpose (though the actual semantics are to unbind the name).\n\nEach assignment or import statement occurs within a block defined by a\nclass or function definition or at the module level (the top-level\ncode block).\n\nIf a name is bound in a block, it is a local variable of that block,\nunless declared as "nonlocal" or "global". If a name is bound at the\nmodule level, it is a global variable. (The variables of the module\ncode block are local and global.) If a variable is used in a code\nblock but not defined there, it is a *free variable*.\n\nEach occurrence of a name in the program text refers to the *binding*\nof that name established by the following name resolution rules.\n\n\nResolution of names\n===================\n\nA *scope* defines the visibility of a name within a block. If a local\nvariable is defined in a block, its scope includes that block. If the\ndefinition occurs in a function block, the scope extends to any blocks\ncontained within the defining one, unless a contained block introduces\na different binding for the name.\n\nWhen a name is used in a code block, it is resolved using the nearest\nenclosing scope. The set of all such scopes visible to a code block\nis called the block\'s *environment*.\n\nWhen a name is not found at all, a "NameError" exception is raised. If\nthe current scope is a function scope, and the name refers to a local\nvariable that has not yet been bound to a value at the point where the\nname is used, an "UnboundLocalError" exception is raised.\n"UnboundLocalError" is a subclass of "NameError".\n\nIf a name binding operation occurs anywhere within a code block, all\nuses of the name within the block are treated as references to the\ncurrent block. This can lead to errors when a name is used within a\nblock before it is bound. This rule is subtle. Python lacks\ndeclarations and allows name binding operations to occur anywhere\nwithin a code block. The local variables of a code block can be\ndetermined by scanning the entire text of the block for name binding\noperations.\n\nIf the "global" statement occurs within a block, all uses of the name\nspecified in the statement refer to the binding of that name in the\ntop-level namespace. Names are resolved in the top-level namespace by\nsearching the global namespace, i.e. the namespace of the module\ncontaining the code block, and the builtins namespace, the namespace\nof the module "builtins". The global namespace is searched first. If\nthe name is not found there, the builtins namespace is searched. The\n"global" statement must precede all uses of the name.\n\nThe "global" statement has the same scope as a name binding operation\nin the same block. If the nearest enclosing scope for a free variable\ncontains a global statement, the free variable is treated as a global.\n\nThe "nonlocal" statement causes corresponding names to refer to\npreviously bound variables in the nearest enclosing function scope.\n"SyntaxError" is raised at compile time if the given name does not\nexist in any enclosing function scope.\n\nThe namespace for a module is automatically created the first time a\nmodule is imported. The main module for a script is always called\n"__main__".\n\nClass definition blocks and arguments to "exec()" and "eval()" are\nspecial in the context of name resolution. A class definition is an\nexecutable statement that may use and define names. These references\nfollow the normal rules for name resolution with an exception that\nunbound local variables are looked up in the global namespace. The\nnamespace of the class definition becomes the attribute dictionary of\nthe class. The scope of names defined in a class block is limited to\nthe class block; it does not extend to the code blocks of methods --\nthis includes comprehensions and generator expressions since they are\nimplemented using a function scope. This means that the following\nwill fail:\n\n class A:\n a = 42\n b = list(a + i for i in range(10))\n\n\nBuiltins and restricted execution\n=================================\n\nThe builtins namespace associated with the execution of a code block\nis actually found by looking up the name "__builtins__" in its global\nnamespace; this should be a dictionary or a module (in the latter case\nthe module\'s dictionary is used). By default, when in the "__main__"\nmodule, "__builtins__" is the built-in module "builtins"; when in any\nother module, "__builtins__" is an alias for the dictionary of the\n"builtins" module itself. "__builtins__" can be set to a user-created\ndictionary to create a weak form of restricted execution.\n\n**CPython implementation detail:** Users should not touch\n"__builtins__"; it is strictly an implementation detail. Users\nwanting to override values in the builtins namespace should "import"\nthe "builtins" module and modify its attributes appropriately.\n\n\nInteraction with dynamic features\n=================================\n\nName resolution of free variables occurs at runtime, not at compile\ntime. This means that the following code will print 42:\n\n i = 10\n def f():\n print(i)\n i = 42\n f()\n\nThe "eval()" and "exec()" functions do not have access to the full\nenvironment for resolving names. Names may be resolved in the local\nand global namespaces of the caller. Free variables are not resolved\nin the nearest enclosing namespace, but in the global namespace. [1]\nThe "exec()" and "eval()" functions have optional arguments to\noverride the global and local namespace. If only one namespace is\nspecified, it is used for both.\n', - 'nonlocal': u'\nThe "nonlocal" statement\n************************\n\n nonlocal_stmt ::= "nonlocal" identifier ("," identifier)*\n\nThe "nonlocal" statement causes the listed identifiers to refer to\npreviously bound variables in the nearest enclosing scope excluding\nglobals. This is important because the default behavior for binding is\nto search the local namespace first. The statement allows\nencapsulated code to rebind variables outside of the local scope\nbesides the global (module) scope.\n\nNames listed in a "nonlocal" statement, unlike those listed in a\n"global" statement, must refer to pre-existing bindings in an\nenclosing scope (the scope in which a new binding should be created\ncannot be determined unambiguously).\n\nNames listed in a "nonlocal" statement must not collide with pre-\nexisting bindings in the local scope.\n\nSee also: **PEP 3104** - Access to Names in Outer Scopes\n\n The specification for the "nonlocal" statement.\n', - 'numbers': u'\nNumeric literals\n****************\n\nThere are three types of numeric literals: integers, floating point\nnumbers, and imaginary numbers. There are no complex literals\n(complex numbers can be formed by adding a real number and an\nimaginary number).\n\nNote that numeric literals do not include a sign; a phrase like "-1"\nis actually an expression composed of the unary operator \'"-"\' and the\nliteral "1".\n', - 'numeric-types': u'\nEmulating numeric types\n***********************\n\nThe following methods can be defined to emulate numeric objects.\nMethods corresponding to operations that are not supported by the\nparticular kind of number implemented (e.g., bitwise operations for\nnon-integral numbers) should be left undefined.\n\nobject.__add__(self, other)\nobject.__sub__(self, other)\nobject.__mul__(self, other)\nobject.__matmul__(self, other)\nobject.__truediv__(self, other)\nobject.__floordiv__(self, other)\nobject.__mod__(self, other)\nobject.__divmod__(self, other)\nobject.__pow__(self, other[, modulo])\nobject.__lshift__(self, other)\nobject.__rshift__(self, other)\nobject.__and__(self, other)\nobject.__xor__(self, other)\nobject.__or__(self, other)\n\n These methods are called to implement the binary arithmetic\n operations ("+", "-", "*", "@", "/", "//", "%", "divmod()",\n "pow()", "**", "<<", ">>", "&", "^", "|"). For instance, to\n evaluate the expression "x + y", where *x* is an instance of a\n class that has an "__add__()" method, "x.__add__(y)" is called.\n The "__divmod__()" method should be the equivalent to using\n "__floordiv__()" and "__mod__()"; it should not be related to\n "__truediv__()". Note that "__pow__()" should be defined to accept\n an optional third argument if the ternary version of the built-in\n "pow()" function is to be supported.\n\n If one of those methods does not support the operation with the\n supplied arguments, it should return "NotImplemented".\n\nobject.__radd__(self, other)\nobject.__rsub__(self, other)\nobject.__rmul__(self, other)\nobject.__rmatmul__(self, other)\nobject.__rtruediv__(self, other)\nobject.__rfloordiv__(self, other)\nobject.__rmod__(self, other)\nobject.__rdivmod__(self, other)\nobject.__rpow__(self, other)\nobject.__rlshift__(self, other)\nobject.__rrshift__(self, other)\nobject.__rand__(self, other)\nobject.__rxor__(self, other)\nobject.__ror__(self, other)\n\n These methods are called to implement the binary arithmetic\n operations ("+", "-", "*", "@", "/", "//", "%", "divmod()",\n "pow()", "**", "<<", ">>", "&", "^", "|") with reflected (swapped)\n operands. These functions are only called if the left operand does\n not support the corresponding operation and the operands are of\n different types. [2] For instance, to evaluate the expression "x -\n y", where *y* is an instance of a class that has an "__rsub__()"\n method, "y.__rsub__(x)" is called if "x.__sub__(y)" returns\n *NotImplemented*.\n\n Note that ternary "pow()" will not try calling "__rpow__()" (the\n coercion rules would become too complicated).\n\n Note: If the right operand\'s type is a subclass of the left\n operand\'s type and that subclass provides the reflected method\n for the operation, this method will be called before the left\n operand\'s non-reflected method. This behavior allows subclasses\n to override their ancestors\' operations.\n\nobject.__iadd__(self, other)\nobject.__isub__(self, other)\nobject.__imul__(self, other)\nobject.__imatmul__(self, other)\nobject.__itruediv__(self, other)\nobject.__ifloordiv__(self, other)\nobject.__imod__(self, other)\nobject.__ipow__(self, other[, modulo])\nobject.__ilshift__(self, other)\nobject.__irshift__(self, other)\nobject.__iand__(self, other)\nobject.__ixor__(self, other)\nobject.__ior__(self, other)\n\n These methods are called to implement the augmented arithmetic\n assignments ("+=", "-=", "*=", "@=", "/=", "//=", "%=", "**=",\n "<<=", ">>=", "&=", "^=", "|="). These methods should attempt to\n do the operation in-place (modifying *self*) and return the result\n (which could be, but does not have to be, *self*). If a specific\n method is not defined, the augmented assignment falls back to the\n normal methods. For instance, if *x* is an instance of a class\n with an "__iadd__()" method, "x += y" is equivalent to "x =\n x.__iadd__(y)" . Otherwise, "x.__add__(y)" and "y.__radd__(x)" are\n considered, as with the evaluation of "x + y". In certain\n situations, augmented assignment can result in unexpected errors\n (see *Why does a_tuple[i] += [\'item\'] raise an exception when the\n addition works?*), but this behavior is in fact part of the data\n model.\n\nobject.__neg__(self)\nobject.__pos__(self)\nobject.__abs__(self)\nobject.__invert__(self)\n\n Called to implement the unary arithmetic operations ("-", "+",\n "abs()" and "~").\n\nobject.__complex__(self)\nobject.__int__(self)\nobject.__float__(self)\nobject.__round__(self[, n])\n\n Called to implement the built-in functions "complex()", "int()",\n "float()" and "round()". Should return a value of the appropriate\n type.\n\nobject.__index__(self)\n\n Called to implement "operator.index()", and whenever Python needs\n to losslessly convert the numeric object to an integer object (such\n as in slicing, or in the built-in "bin()", "hex()" and "oct()"\n functions). Presence of this method indicates that the numeric\n object is an integer type. Must return an integer.\n\n Note: In order to have a coherent integer type class, when\n "__index__()" is defined "__int__()" should also be defined, and\n both should return the same value.\n', - 'objects': u'\nObjects, values and types\n*************************\n\n*Objects* are Python\'s abstraction for data. All data in a Python\nprogram is represented by objects or by relations between objects. (In\na sense, and in conformance to Von Neumann\'s model of a "stored\nprogram computer," code is also represented by objects.)\n\nEvery object has an identity, a type and a value. An object\'s\n*identity* never changes once it has been created; you may think of it\nas the object\'s address in memory. The \'"is"\' operator compares the\nidentity of two objects; the "id()" function returns an integer\nrepresenting its identity.\n\n**CPython implementation detail:** For CPython, "id(x)" is the memory\naddress where "x" is stored.\n\nAn object\'s type determines the operations that the object supports\n(e.g., "does it have a length?") and also defines the possible values\nfor objects of that type. The "type()" function returns an object\'s\ntype (which is an object itself). Like its identity, an object\'s\n*type* is also unchangeable. [1]\n\nThe *value* of some objects can change. Objects whose value can\nchange are said to be *mutable*; objects whose value is unchangeable\nonce they are created are called *immutable*. (The value of an\nimmutable container object that contains a reference to a mutable\nobject can change when the latter\'s value is changed; however the\ncontainer is still considered immutable, because the collection of\nobjects it contains cannot be changed. So, immutability is not\nstrictly the same as having an unchangeable value, it is more subtle.)\nAn object\'s mutability is determined by its type; for instance,\nnumbers, strings and tuples are immutable, while dictionaries and\nlists are mutable.\n\nObjects are never explicitly destroyed; however, when they become\nunreachable they may be garbage-collected. An implementation is\nallowed to postpone garbage collection or omit it altogether --- it is\na matter of implementation quality how garbage collection is\nimplemented, as long as no objects are collected that are still\nreachable.\n\n**CPython implementation detail:** CPython currently uses a reference-\ncounting scheme with (optional) delayed detection of cyclically linked\ngarbage, which collects most objects as soon as they become\nunreachable, but is not guaranteed to collect garbage containing\ncircular references. See the documentation of the "gc" module for\ninformation on controlling the collection of cyclic garbage. Other\nimplementations act differently and CPython may change. Do not depend\non immediate finalization of objects when they become unreachable (so\nyou should always close files explicitly).\n\nNote that the use of the implementation\'s tracing or debugging\nfacilities may keep objects alive that would normally be collectable.\nAlso note that catching an exception with a \'"try"..."except"\'\nstatement may keep objects alive.\n\nSome objects contain references to "external" resources such as open\nfiles or windows. It is understood that these resources are freed\nwhen the object is garbage-collected, but since garbage collection is\nnot guaranteed to happen, such objects also provide an explicit way to\nrelease the external resource, usually a "close()" method. Programs\nare strongly recommended to explicitly close such objects. The\n\'"try"..."finally"\' statement and the \'"with"\' statement provide\nconvenient ways to do this.\n\nSome objects contain references to other objects; these are called\n*containers*. Examples of containers are tuples, lists and\ndictionaries. The references are part of a container\'s value. In\nmost cases, when we talk about the value of a container, we imply the\nvalues, not the identities of the contained objects; however, when we\ntalk about the mutability of a container, only the identities of the\nimmediately contained objects are implied. So, if an immutable\ncontainer (like a tuple) contains a reference to a mutable object, its\nvalue changes if that mutable object is changed.\n\nTypes affect almost all aspects of object behavior. Even the\nimportance of object identity is affected in some sense: for immutable\ntypes, operations that compute new values may actually return a\nreference to any existing object with the same type and value, while\nfor mutable objects this is not allowed. E.g., after "a = 1; b = 1",\n"a" and "b" may or may not refer to the same object with the value\none, depending on the implementation, but after "c = []; d = []", "c"\nand "d" are guaranteed to refer to two different, unique, newly\ncreated empty lists. (Note that "c = d = []" assigns the same object\nto both "c" and "d".)\n', - 'operator-summary': u'\nOperator precedence\n*******************\n\nThe following table summarizes the operator precedence in Python, from\nlowest precedence (least binding) to highest precedence (most\nbinding). Operators in the same box have the same precedence. Unless\nthe syntax is explicitly given, operators are binary. Operators in\nthe same box group left to right (except for exponentiation, which\ngroups from right to left).\n\nNote that comparisons, membership tests, and identity tests, all have\nthe same precedence and have a left-to-right chaining feature as\ndescribed in the *Comparisons* section.\n\n+-------------------------------------------------+---------------------------------------+\n| Operator | Description |\n+=================================================+=======================================+\n| "lambda" | Lambda expression |\n+-------------------------------------------------+---------------------------------------+\n| "if" -- "else" | Conditional expression |\n+-------------------------------------------------+---------------------------------------+\n| "or" | Boolean OR |\n+-------------------------------------------------+---------------------------------------+\n| "and" | Boolean AND |\n+-------------------------------------------------+---------------------------------------+\n| "not" "x" | Boolean NOT |\n+-------------------------------------------------+---------------------------------------+\n| "in", "not in", "is", "is not", "<", "<=", ">", | Comparisons, including membership |\n| ">=", "!=", "==" | tests and identity tests |\n+-------------------------------------------------+---------------------------------------+\n| "|" | Bitwise OR |\n+-------------------------------------------------+---------------------------------------+\n| "^" | Bitwise XOR |\n+-------------------------------------------------+---------------------------------------+\n| "&" | Bitwise AND |\n+-------------------------------------------------+---------------------------------------+\n| "<<", ">>" | Shifts |\n+-------------------------------------------------+---------------------------------------+\n| "+", "-" | Addition and subtraction |\n+-------------------------------------------------+---------------------------------------+\n| "*", "@", "/", "//", "%" | Multiplication, matrix multiplication |\n| | division, remainder [5] |\n+-------------------------------------------------+---------------------------------------+\n| "+x", "-x", "~x" | Positive, negative, bitwise NOT |\n+-------------------------------------------------+---------------------------------------+\n| "**" | Exponentiation [6] |\n+-------------------------------------------------+---------------------------------------+\n| "await" "x" | Await expression |\n+-------------------------------------------------+---------------------------------------+\n| "x[index]", "x[index:index]", | Subscription, slicing, call, |\n| "x(arguments...)", "x.attribute" | attribute reference |\n+-------------------------------------------------+---------------------------------------+\n| "(expressions...)", "[expressions...]", "{key: | Binding or tuple display, list |\n| value...}", "{expressions...}" | display, dictionary display, set |\n| | display |\n+-------------------------------------------------+---------------------------------------+\n\n-[ Footnotes ]-\n\n[1] While "abs(x%y) < abs(y)" is true mathematically, for floats\n it may not be true numerically due to roundoff. For example, and\n assuming a platform on which a Python float is an IEEE 754 double-\n precision number, in order that "-1e-100 % 1e100" have the same\n sign as "1e100", the computed result is "-1e-100 + 1e100", which\n is numerically exactly equal to "1e100". The function\n "math.fmod()" returns a result whose sign matches the sign of the\n first argument instead, and so returns "-1e-100" in this case.\n Which approach is more appropriate depends on the application.\n\n[2] If x is very close to an exact integer multiple of y, it\'s\n possible for "x//y" to be one larger than "(x-x%y)//y" due to\n rounding. In such cases, Python returns the latter result, in\n order to preserve that "divmod(x,y)[0] * y + x % y" be very close\n to "x".\n\n[3] The Unicode standard distinguishes between *code points* (e.g.\n U+0041) and *abstract characters* (e.g. "LATIN CAPITAL LETTER A").\n While most abstract characters in Unicode are only represented\n using one code point, there is a number of abstract characters\n that can in addition be represented using a sequence of more than\n one code point. For example, the abstract character "LATIN\n CAPITAL LETTER C WITH CEDILLA" can be represented as a single\n *precomposed character* at code position U+00C7, or as a sequence\n of a *base character* at code position U+0043 (LATIN CAPITAL\n LETTER C), followed by a *combining character* at code position\n U+0327 (COMBINING CEDILLA).\n\n The comparison operators on strings compare at the level of\n Unicode code points. This may be counter-intuitive to humans. For\n example, ""\\u00C7" == "\\u0043\\u0327"" is "False", even though both\n strings represent the same abstract character "LATIN CAPITAL\n LETTER C WITH CEDILLA".\n\n To compare strings at the level of abstract characters (that is,\n in a way intuitive to humans), use "unicodedata.normalize()".\n\n[4] Due to automatic garbage-collection, free lists, and the\n dynamic nature of descriptors, you may notice seemingly unusual\n behaviour in certain uses of the "is" operator, like those\n involving comparisons between instance methods, or constants.\n Check their documentation for more info.\n\n[5] The "%" operator is also used for string formatting; the same\n precedence applies.\n\n[6] The power operator "**" binds less tightly than an arithmetic\n or bitwise unary operator on its right, that is, "2**-1" is "0.5".\n', - 'pass': u'\nThe "pass" statement\n********************\n\n pass_stmt ::= "pass"\n\n"pass" is a null operation --- when it is executed, nothing happens.\nIt is useful as a placeholder when a statement is required\nsyntactically, but no code needs to be executed, for example:\n\n def f(arg): pass # a function that does nothing (yet)\n\n class C: pass # a class with no methods (yet)\n', - 'power': u'\nThe power operator\n******************\n\nThe power operator binds more tightly than unary operators on its\nleft; it binds less tightly than unary operators on its right. The\nsyntax is:\n\n power ::= ( await_expr | primary ) ["**" u_expr]\n\nThus, in an unparenthesized sequence of power and unary operators, the\noperators are evaluated from right to left (this does not constrain\nthe evaluation order for the operands): "-1**2" results in "-1".\n\nThe power operator has the same semantics as the built-in "pow()"\nfunction, when called with two arguments: it yields its left argument\nraised to the power of its right argument. The numeric arguments are\nfirst converted to a common type, and the result is of that type.\n\nFor int operands, the result has the same type as the operands unless\nthe second argument is negative; in that case, all arguments are\nconverted to float and a float result is delivered. For example,\n"10**2" returns "100", but "10**-2" returns "0.01".\n\nRaising "0.0" to a negative power results in a "ZeroDivisionError".\nRaising a negative number to a fractional power results in a "complex"\nnumber. (In earlier versions it raised a "ValueError".)\n', - 'raise': u'\nThe "raise" statement\n*********************\n\n raise_stmt ::= "raise" [expression ["from" expression]]\n\nIf no expressions are present, "raise" re-raises the last exception\nthat was active in the current scope. If no exception is active in\nthe current scope, a "RuntimeError" exception is raised indicating\nthat this is an error.\n\nOtherwise, "raise" evaluates the first expression as the exception\nobject. It must be either a subclass or an instance of\n"BaseException". If it is a class, the exception instance will be\nobtained when needed by instantiating the class with no arguments.\n\nThe *type* of the exception is the exception instance\'s class, the\n*value* is the instance itself.\n\nA traceback object is normally created automatically when an exception\nis raised and attached to it as the "__traceback__" attribute, which\nis writable. You can create an exception and set your own traceback in\none step using the "with_traceback()" exception method (which returns\nthe same exception instance, with its traceback set to its argument),\nlike so:\n\n raise Exception("foo occurred").with_traceback(tracebackobj)\n\nThe "from" clause is used for exception chaining: if given, the second\n*expression* must be another exception class or instance, which will\nthen be attached to the raised exception as the "__cause__" attribute\n(which is writable). If the raised exception is not handled, both\nexceptions will be printed:\n\n >>> try:\n ... print(1 / 0)\n ... except Exception as exc:\n ... raise RuntimeError("Something bad happened") from exc\n ...\n Traceback (most recent call last):\n File "", line 2, in \n ZeroDivisionError: int division or modulo by zero\n\n The above exception was the direct cause of the following exception:\n\n Traceback (most recent call last):\n File "", line 4, in \n RuntimeError: Something bad happened\n\nA similar mechanism works implicitly if an exception is raised inside\nan exception handler or a "finally" clause: the previous exception is\nthen attached as the new exception\'s "__context__" attribute:\n\n >>> try:\n ... print(1 / 0)\n ... except:\n ... raise RuntimeError("Something bad happened")\n ...\n Traceback (most recent call last):\n File "", line 2, in \n ZeroDivisionError: int division or modulo by zero\n\n During handling of the above exception, another exception occurred:\n\n Traceback (most recent call last):\n File "", line 4, in \n RuntimeError: Something bad happened\n\nAdditional information on exceptions can be found in section\n*Exceptions*, and information about handling exceptions is in section\n*The try statement*.\n', - 'return': u'\nThe "return" statement\n**********************\n\n return_stmt ::= "return" [expression_list]\n\n"return" may only occur syntactically nested in a function definition,\nnot within a nested class definition.\n\nIf an expression list is present, it is evaluated, else "None" is\nsubstituted.\n\n"return" leaves the current function call with the expression list (or\n"None") as return value.\n\nWhen "return" passes control out of a "try" statement with a "finally"\nclause, that "finally" clause is executed before really leaving the\nfunction.\n\nIn a generator function, the "return" statement indicates that the\ngenerator is done and will cause "StopIteration" to be raised. The\nreturned value (if any) is used as an argument to construct\n"StopIteration" and becomes the "StopIteration.value" attribute.\n', - 'sequence-types': u'\nEmulating container types\n*************************\n\nThe following methods can be defined to implement container objects.\nContainers usually are sequences (such as lists or tuples) or mappings\n(like dictionaries), but can represent other containers as well. The\nfirst set of methods is used either to emulate a sequence or to\nemulate a mapping; the difference is that for a sequence, the\nallowable keys should be the integers *k* for which "0 <= k < N" where\n*N* is the length of the sequence, or slice objects, which define a\nrange of items. It is also recommended that mappings provide the\nmethods "keys()", "values()", "items()", "get()", "clear()",\n"setdefault()", "pop()", "popitem()", "copy()", and "update()"\nbehaving similar to those for Python\'s standard dictionary objects.\nThe "collections" module provides a "MutableMapping" abstract base\nclass to help create those methods from a base set of "__getitem__()",\n"__setitem__()", "__delitem__()", and "keys()". Mutable sequences\nshould provide methods "append()", "count()", "index()", "extend()",\n"insert()", "pop()", "remove()", "reverse()" and "sort()", like Python\nstandard list objects. Finally, sequence types should implement\naddition (meaning concatenation) and multiplication (meaning\nrepetition) by defining the methods "__add__()", "__radd__()",\n"__iadd__()", "__mul__()", "__rmul__()" and "__imul__()" described\nbelow; they should not define other numerical operators. It is\nrecommended that both mappings and sequences implement the\n"__contains__()" method to allow efficient use of the "in" operator;\nfor mappings, "in" should search the mapping\'s keys; for sequences, it\nshould search through the values. It is further recommended that both\nmappings and sequences implement the "__iter__()" method to allow\nefficient iteration through the container; for mappings, "__iter__()"\nshould be the same as "keys()"; for sequences, it should iterate\nthrough the values.\n\nobject.__len__(self)\n\n Called to implement the built-in function "len()". Should return\n the length of the object, an integer ">=" 0. Also, an object that\n doesn\'t define a "__bool__()" method and whose "__len__()" method\n returns zero is considered to be false in a Boolean context.\n\n **CPython implementation detail:** In CPython, the length is\n required to be at most "sys.maxsize". If the length is larger than\n "sys.maxsize" some features (such as "len()") may raise\n "OverflowError". To prevent raising "OverflowError" by truth value\n testing, an object must define a "__bool__()" method.\n\nobject.__length_hint__(self)\n\n Called to implement "operator.length_hint()". Should return an\n estimated length for the object (which may be greater or less than\n the actual length). The length must be an integer ">=" 0. This\n method is purely an optimization and is never required for\n correctness.\n\n New in version 3.4.\n\nNote: Slicing is done exclusively with the following three methods.\n A call like\n\n a[1:2] = b\n\n is translated to\n\n a[slice(1, 2, None)] = b\n\n and so forth. Missing slice items are always filled in with "None".\n\nobject.__getitem__(self, key)\n\n Called to implement evaluation of "self[key]". For sequence types,\n the accepted keys should be integers and slice objects. Note that\n the special interpretation of negative indexes (if the class wishes\n to emulate a sequence type) is up to the "__getitem__()" method. If\n *key* is of an inappropriate type, "TypeError" may be raised; if of\n a value outside the set of indexes for the sequence (after any\n special interpretation of negative values), "IndexError" should be\n raised. For mapping types, if *key* is missing (not in the\n container), "KeyError" should be raised.\n\n Note: "for" loops expect that an "IndexError" will be raised for\n illegal indexes to allow proper detection of the end of the\n sequence.\n\nobject.__missing__(self, key)\n\n Called by "dict"."__getitem__()" to implement "self[key]" for dict\n subclasses when key is not in the dictionary.\n\nobject.__setitem__(self, key, value)\n\n Called to implement assignment to "self[key]". Same note as for\n "__getitem__()". This should only be implemented for mappings if\n the objects support changes to the values for keys, or if new keys\n can be added, or for sequences if elements can be replaced. The\n same exceptions should be raised for improper *key* values as for\n the "__getitem__()" method.\n\nobject.__delitem__(self, key)\n\n Called to implement deletion of "self[key]". Same note as for\n "__getitem__()". This should only be implemented for mappings if\n the objects support removal of keys, or for sequences if elements\n can be removed from the sequence. The same exceptions should be\n raised for improper *key* values as for the "__getitem__()" method.\n\nobject.__iter__(self)\n\n This method is called when an iterator is required for a container.\n This method should return a new iterator object that can iterate\n over all the objects in the container. For mappings, it should\n iterate over the keys of the container.\n\n Iterator objects also need to implement this method; they are\n required to return themselves. For more information on iterator\n objects, see *Iterator Types*.\n\nobject.__reversed__(self)\n\n Called (if present) by the "reversed()" built-in to implement\n reverse iteration. It should return a new iterator object that\n iterates over all the objects in the container in reverse order.\n\n If the "__reversed__()" method is not provided, the "reversed()"\n built-in will fall back to using the sequence protocol ("__len__()"\n and "__getitem__()"). Objects that support the sequence protocol\n should only provide "__reversed__()" if they can provide an\n implementation that is more efficient than the one provided by\n "reversed()".\n\nThe membership test operators ("in" and "not in") are normally\nimplemented as an iteration through a sequence. However, container\nobjects can supply the following special method with a more efficient\nimplementation, which also does not require the object be a sequence.\n\nobject.__contains__(self, item)\n\n Called to implement membership test operators. Should return true\n if *item* is in *self*, false otherwise. For mapping objects, this\n should consider the keys of the mapping rather than the values or\n the key-item pairs.\n\n For objects that don\'t define "__contains__()", the membership test\n first tries iteration via "__iter__()", then the old sequence\n iteration protocol via "__getitem__()", see *this section in the\n language reference*.\n', - 'shifting': u'\nShifting operations\n*******************\n\nThe shifting operations have lower priority than the arithmetic\noperations:\n\n shift_expr ::= a_expr | shift_expr ( "<<" | ">>" ) a_expr\n\nThese operators accept integers as arguments. They shift the first\nargument to the left or right by the number of bits given by the\nsecond argument.\n\nA right shift by *n* bits is defined as floor division by "pow(2,n)".\nA left shift by *n* bits is defined as multiplication with "pow(2,n)".\n\nNote: In the current implementation, the right-hand operand is\n required to be at most "sys.maxsize". If the right-hand operand is\n larger than "sys.maxsize" an "OverflowError" exception is raised.\n', - 'slicings': u'\nSlicings\n********\n\nA slicing selects a range of items in a sequence object (e.g., a\nstring, tuple or list). Slicings may be used as expressions or as\ntargets in assignment or "del" statements. The syntax for a slicing:\n\n slicing ::= primary "[" slice_list "]"\n slice_list ::= slice_item ("," slice_item)* [","]\n slice_item ::= expression | proper_slice\n proper_slice ::= [lower_bound] ":" [upper_bound] [ ":" [stride] ]\n lower_bound ::= expression\n upper_bound ::= expression\n stride ::= expression\n\nThere is ambiguity in the formal syntax here: anything that looks like\nan expression list also looks like a slice list, so any subscription\ncan be interpreted as a slicing. Rather than further complicating the\nsyntax, this is disambiguated by defining that in this case the\ninterpretation as a subscription takes priority over the\ninterpretation as a slicing (this is the case if the slice list\ncontains no proper slice).\n\nThe semantics for a slicing are as follows. The primary is indexed\n(using the same "__getitem__()" method as normal subscription) with a\nkey that is constructed from the slice list, as follows. If the slice\nlist contains at least one comma, the key is a tuple containing the\nconversion of the slice items; otherwise, the conversion of the lone\nslice item is the key. The conversion of a slice item that is an\nexpression is that expression. The conversion of a proper slice is a\nslice object (see section *The standard type hierarchy*) whose\n"start", "stop" and "step" attributes are the values of the\nexpressions given as lower bound, upper bound and stride,\nrespectively, substituting "None" for missing expressions.\n', - 'specialattrs': u'\nSpecial Attributes\n******************\n\nThe implementation adds a few special read-only attributes to several\nobject types, where they are relevant. Some of these are not reported\nby the "dir()" built-in function.\n\nobject.__dict__\n\n A dictionary or other mapping object used to store an object\'s\n (writable) attributes.\n\ninstance.__class__\n\n The class to which a class instance belongs.\n\nclass.__bases__\n\n The tuple of base classes of a class object.\n\ndefinition.__name__\n\n The name of the class, function, method, descriptor, or generator\n instance.\n\ndefinition.__qualname__\n\n The *qualified name* of the class, function, method, descriptor, or\n generator instance.\n\n New in version 3.3.\n\nclass.__mro__\n\n This attribute is a tuple of classes that are considered when\n looking for base classes during method resolution.\n\nclass.mro()\n\n This method can be overridden by a metaclass to customize the\n method resolution order for its instances. It is called at class\n instantiation, and its result is stored in "__mro__".\n\nclass.__subclasses__()\n\n Each class keeps a list of weak references to its immediate\n subclasses. This method returns a list of all those references\n still alive. Example:\n\n >>> int.__subclasses__()\n []\n\n-[ Footnotes ]-\n\n[1] Additional information on these special methods may be found\n in the Python Reference Manual (*Basic customization*).\n\n[2] As a consequence, the list "[1, 2]" is considered equal to\n "[1.0, 2.0]", and similarly for tuples.\n\n[3] They must have since the parser can\'t tell the type of the\n operands.\n\n[4] Cased characters are those with general category property\n being one of "Lu" (Letter, uppercase), "Ll" (Letter, lowercase),\n or "Lt" (Letter, titlecase).\n\n[5] To format only a tuple you should therefore provide a\n singleton tuple whose only element is the tuple to be formatted.\n', - 'specialnames': u'\nSpecial method names\n********************\n\nA class can implement certain operations that are invoked by special\nsyntax (such as arithmetic operations or subscripting and slicing) by\ndefining methods with special names. This is Python\'s approach to\n*operator overloading*, allowing classes to define their own behavior\nwith respect to language operators. For instance, if a class defines\na method named "__getitem__()", and "x" is an instance of this class,\nthen "x[i]" is roughly equivalent to "type(x).__getitem__(x, i)".\nExcept where mentioned, attempts to execute an operation raise an\nexception when no appropriate method is defined (typically\n"AttributeError" or "TypeError").\n\nWhen implementing a class that emulates any built-in type, it is\nimportant that the emulation only be implemented to the degree that it\nmakes sense for the object being modelled. For example, some\nsequences may work well with retrieval of individual elements, but\nextracting a slice may not make sense. (One example of this is the\n"NodeList" interface in the W3C\'s Document Object Model.)\n\n\nBasic customization\n===================\n\nobject.__new__(cls[, ...])\n\n Called to create a new instance of class *cls*. "__new__()" is a\n static method (special-cased so you need not declare it as such)\n that takes the class of which an instance was requested as its\n first argument. The remaining arguments are those passed to the\n object constructor expression (the call to the class). The return\n value of "__new__()" should be the new object instance (usually an\n instance of *cls*).\n\n Typical implementations create a new instance of the class by\n invoking the superclass\'s "__new__()" method using\n "super().__new__(cls[, ...])" with appropriate arguments and then\n modifying the newly-created instance as necessary before returning\n it.\n\n If "__new__()" returns an instance of *cls*, then the new\n instance\'s "__init__()" method will be invoked like\n "__init__(self[, ...])", where *self* is the new instance and the\n remaining arguments are the same as were passed to "__new__()".\n\n If "__new__()" does not return an instance of *cls*, then the new\n instance\'s "__init__()" method will not be invoked.\n\n "__new__()" is intended mainly to allow subclasses of immutable\n types (like int, str, or tuple) to customize instance creation. It\n is also commonly overridden in custom metaclasses in order to\n customize class creation.\n\nobject.__init__(self[, ...])\n\n Called after the instance has been created (by "__new__()"), but\n before it is returned to the caller. The arguments are those\n passed to the class constructor expression. If a base class has an\n "__init__()" method, the derived class\'s "__init__()" method, if\n any, must explicitly call it to ensure proper initialization of the\n base class part of the instance; for example:\n "super().__init__([args...])".\n\n Because "__new__()" and "__init__()" work together in constructing\n objects ("__new__()" to create it, and "__init__()" to customize\n it), no non-"None" value may be returned by "__init__()"; doing so\n will cause a "TypeError" to be raised at runtime.\n\nobject.__del__(self)\n\n Called when the instance is about to be destroyed. This is also\n called a destructor. If a base class has a "__del__()" method, the\n derived class\'s "__del__()" method, if any, must explicitly call it\n to ensure proper deletion of the base class part of the instance.\n Note that it is possible (though not recommended!) for the\n "__del__()" method to postpone destruction of the instance by\n creating a new reference to it. It may then be called at a later\n time when this new reference is deleted. It is not guaranteed that\n "__del__()" methods are called for objects that still exist when\n the interpreter exits.\n\n Note: "del x" doesn\'t directly call "x.__del__()" --- the former\n decrements the reference count for "x" by one, and the latter is\n only called when "x"\'s reference count reaches zero. Some common\n situations that may prevent the reference count of an object from\n going to zero include: circular references between objects (e.g.,\n a doubly-linked list or a tree data structure with parent and\n child pointers); a reference to the object on the stack frame of\n a function that caught an exception (the traceback stored in\n "sys.exc_info()[2]" keeps the stack frame alive); or a reference\n to the object on the stack frame that raised an unhandled\n exception in interactive mode (the traceback stored in\n "sys.last_traceback" keeps the stack frame alive). The first\n situation can only be remedied by explicitly breaking the cycles;\n the second can be resolved by freeing the reference to the\n traceback object when it is no longer useful, and the third can\n be resolved by storing "None" in "sys.last_traceback". Circular\n references which are garbage are detected and cleaned up when the\n cyclic garbage collector is enabled (it\'s on by default). Refer\n to the documentation for the "gc" module for more information\n about this topic.\n\n Warning: Due to the precarious circumstances under which\n "__del__()" methods are invoked, exceptions that occur during\n their execution are ignored, and a warning is printed to\n "sys.stderr" instead. Also, when "__del__()" is invoked in\n response to a module being deleted (e.g., when execution of the\n program is done), other globals referenced by the "__del__()"\n method may already have been deleted or in the process of being\n torn down (e.g. the import machinery shutting down). For this\n reason, "__del__()" methods should do the absolute minimum needed\n to maintain external invariants. Starting with version 1.5,\n Python guarantees that globals whose name begins with a single\n underscore are deleted from their module before other globals are\n deleted; if no other references to such globals exist, this may\n help in assuring that imported modules are still available at the\n time when the "__del__()" method is called.\n\nobject.__repr__(self)\n\n Called by the "repr()" built-in function to compute the "official"\n string representation of an object. If at all possible, this\n should look like a valid Python expression that could be used to\n recreate an object with the same value (given an appropriate\n environment). If this is not possible, a string of the form\n "<...some useful description...>" should be returned. The return\n value must be a string object. If a class defines "__repr__()" but\n not "__str__()", then "__repr__()" is also used when an "informal"\n string representation of instances of that class is required.\n\n This is typically used for debugging, so it is important that the\n representation is information-rich and unambiguous.\n\nobject.__str__(self)\n\n Called by "str(object)" and the built-in functions "format()" and\n "print()" to compute the "informal" or nicely printable string\n representation of an object. The return value must be a *string*\n object.\n\n This method differs from "object.__repr__()" in that there is no\n expectation that "__str__()" return a valid Python expression: a\n more convenient or concise representation can be used.\n\n The default implementation defined by the built-in type "object"\n calls "object.__repr__()".\n\nobject.__bytes__(self)\n\n Called by "bytes()" to compute a byte-string representation of an\n object. This should return a "bytes" object.\n\nobject.__format__(self, format_spec)\n\n Called by the "format()" built-in function (and by extension, the\n "str.format()" method of class "str") to produce a "formatted"\n string representation of an object. The "format_spec" argument is a\n string that contains a description of the formatting options\n desired. The interpretation of the "format_spec" argument is up to\n the type implementing "__format__()", however most classes will\n either delegate formatting to one of the built-in types, or use a\n similar formatting option syntax.\n\n See *Format Specification Mini-Language* for a description of the\n standard formatting syntax.\n\n The return value must be a string object.\n\n Changed in version 3.4: The __format__ method of "object" itself\n raises a "TypeError" if passed any non-empty string.\n\nobject.__lt__(self, other)\nobject.__le__(self, other)\nobject.__eq__(self, other)\nobject.__ne__(self, other)\nobject.__gt__(self, other)\nobject.__ge__(self, other)\n\n These are the so-called "rich comparison" methods. The\n correspondence between operator symbols and method names is as\n follows: "xy" calls\n "x.__gt__(y)", and "x>=y" calls "x.__ge__(y)".\n\n A rich comparison method may return the singleton "NotImplemented"\n if it does not implement the operation for a given pair of\n arguments. By convention, "False" and "True" are returned for a\n successful comparison. However, these methods can return any value,\n so if the comparison operator is used in a Boolean context (e.g.,\n in the condition of an "if" statement), Python will call "bool()"\n on the value to determine if the result is true or false.\n\n By default, "__ne__()" delegates to "__eq__()" and inverts the\n result unless it is "NotImplemented". There are no other implied\n relationships among the comparison operators, for example, the\n truth of "(x.__hash__".\n\n If a class that does not override "__eq__()" wishes to suppress\n hash support, it should include "__hash__ = None" in the class\n definition. A class which defines its own "__hash__()" that\n explicitly raises a "TypeError" would be incorrectly identified as\n hashable by an "isinstance(obj, collections.Hashable)" call.\n\n Note: By default, the "__hash__()" values of str, bytes and\n datetime objects are "salted" with an unpredictable random value.\n Although they remain constant within an individual Python\n process, they are not predictable between repeated invocations of\n Python.This is intended to provide protection against a denial-\n of-service caused by carefully-chosen inputs that exploit the\n worst case performance of a dict insertion, O(n^2) complexity.\n See http://www.ocert.org/advisories/ocert-2011-003.html for\n details.Changing hash values affects the iteration order of\n dicts, sets and other mappings. Python has never made guarantees\n about this ordering (and it typically varies between 32-bit and\n 64-bit builds).See also "PYTHONHASHSEED".\n\n Changed in version 3.3: Hash randomization is enabled by default.\n\nobject.__bool__(self)\n\n Called to implement truth value testing and the built-in operation\n "bool()"; should return "False" or "True". When this method is not\n defined, "__len__()" is called, if it is defined, and the object is\n considered true if its result is nonzero. If a class defines\n neither "__len__()" nor "__bool__()", all its instances are\n considered true.\n\n\nCustomizing attribute access\n============================\n\nThe following methods can be defined to customize the meaning of\nattribute access (use of, assignment to, or deletion of "x.name") for\nclass instances.\n\nobject.__getattr__(self, name)\n\n Called when an attribute lookup has not found the attribute in the\n usual places (i.e. it is not an instance attribute nor is it found\n in the class tree for "self"). "name" is the attribute name. This\n method should return the (computed) attribute value or raise an\n "AttributeError" exception.\n\n Note that if the attribute is found through the normal mechanism,\n "__getattr__()" is not called. (This is an intentional asymmetry\n between "__getattr__()" and "__setattr__()".) This is done both for\n efficiency reasons and because otherwise "__getattr__()" would have\n no way to access other attributes of the instance. Note that at\n least for instance variables, you can fake total control by not\n inserting any values in the instance attribute dictionary (but\n instead inserting them in another object). See the\n "__getattribute__()" method below for a way to actually get total\n control over attribute access.\n\nobject.__getattribute__(self, name)\n\n Called unconditionally to implement attribute accesses for\n instances of the class. If the class also defines "__getattr__()",\n the latter will not be called unless "__getattribute__()" either\n calls it explicitly or raises an "AttributeError". This method\n should return the (computed) attribute value or raise an\n "AttributeError" exception. In order to avoid infinite recursion in\n this method, its implementation should always call the base class\n method with the same name to access any attributes it needs, for\n example, "object.__getattribute__(self, name)".\n\n Note: This method may still be bypassed when looking up special\n methods as the result of implicit invocation via language syntax\n or built-in functions. See *Special method lookup*.\n\nobject.__setattr__(self, name, value)\n\n Called when an attribute assignment is attempted. This is called\n instead of the normal mechanism (i.e. store the value in the\n instance dictionary). *name* is the attribute name, *value* is the\n value to be assigned to it.\n\n If "__setattr__()" wants to assign to an instance attribute, it\n should call the base class method with the same name, for example,\n "object.__setattr__(self, name, value)".\n\nobject.__delattr__(self, name)\n\n Like "__setattr__()" but for attribute deletion instead of\n assignment. This should only be implemented if "del obj.name" is\n meaningful for the object.\n\nobject.__dir__(self)\n\n Called when "dir()" is called on the object. A sequence must be\n returned. "dir()" converts the returned sequence to a list and\n sorts it.\n\n\nImplementing Descriptors\n------------------------\n\nThe following methods only apply when an instance of the class\ncontaining the method (a so-called *descriptor* class) appears in an\n*owner* class (the descriptor must be in either the owner\'s class\ndictionary or in the class dictionary for one of its parents). In the\nexamples below, "the attribute" refers to the attribute whose name is\nthe key of the property in the owner class\' "__dict__".\n\nobject.__get__(self, instance, owner)\n\n Called to get the attribute of the owner class (class attribute\n access) or of an instance of that class (instance attribute\n access). *owner* is always the owner class, while *instance* is the\n instance that the attribute was accessed through, or "None" when\n the attribute is accessed through the *owner*. This method should\n return the (computed) attribute value or raise an "AttributeError"\n exception.\n\nobject.__set__(self, instance, value)\n\n Called to set the attribute on an instance *instance* of the owner\n class to a new value, *value*.\n\nobject.__delete__(self, instance)\n\n Called to delete the attribute on an instance *instance* of the\n owner class.\n\nThe attribute "__objclass__" is interpreted by the "inspect" module as\nspecifying the class where this object was defined (setting this\nappropriately can assist in runtime introspection of dynamic class\nattributes). For callables, it may indicate that an instance of the\ngiven type (or a subclass) is expected or required as the first\npositional argument (for example, CPython sets this attribute for\nunbound methods that are implemented in C).\n\n\nInvoking Descriptors\n--------------------\n\nIn general, a descriptor is an object attribute with "binding\nbehavior", one whose attribute access has been overridden by methods\nin the descriptor protocol: "__get__()", "__set__()", and\n"__delete__()". If any of those methods are defined for an object, it\nis said to be a descriptor.\n\nThe default behavior for attribute access is to get, set, or delete\nthe attribute from an object\'s dictionary. For instance, "a.x" has a\nlookup chain starting with "a.__dict__[\'x\']", then\n"type(a).__dict__[\'x\']", and continuing through the base classes of\n"type(a)" excluding metaclasses.\n\nHowever, if the looked-up value is an object defining one of the\ndescriptor methods, then Python may override the default behavior and\ninvoke the descriptor method instead. Where this occurs in the\nprecedence chain depends on which descriptor methods were defined and\nhow they were called.\n\nThe starting point for descriptor invocation is a binding, "a.x". How\nthe arguments are assembled depends on "a":\n\nDirect Call\n The simplest and least common call is when user code directly\n invokes a descriptor method: "x.__get__(a)".\n\nInstance Binding\n If binding to an object instance, "a.x" is transformed into the\n call: "type(a).__dict__[\'x\'].__get__(a, type(a))".\n\nClass Binding\n If binding to a class, "A.x" is transformed into the call:\n "A.__dict__[\'x\'].__get__(None, A)".\n\nSuper Binding\n If "a" is an instance of "super", then the binding "super(B,\n obj).m()" searches "obj.__class__.__mro__" for the base class "A"\n immediately preceding "B" and then invokes the descriptor with the\n call: "A.__dict__[\'m\'].__get__(obj, obj.__class__)".\n\nFor instance bindings, the precedence of descriptor invocation depends\non the which descriptor methods are defined. A descriptor can define\nany combination of "__get__()", "__set__()" and "__delete__()". If it\ndoes not define "__get__()", then accessing the attribute will return\nthe descriptor object itself unless there is a value in the object\'s\ninstance dictionary. If the descriptor defines "__set__()" and/or\n"__delete__()", it is a data descriptor; if it defines neither, it is\na non-data descriptor. Normally, data descriptors define both\n"__get__()" and "__set__()", while non-data descriptors have just the\n"__get__()" method. Data descriptors with "__set__()" and "__get__()"\ndefined always override a redefinition in an instance dictionary. In\ncontrast, non-data descriptors can be overridden by instances.\n\nPython methods (including "staticmethod()" and "classmethod()") are\nimplemented as non-data descriptors. Accordingly, instances can\nredefine and override methods. This allows individual instances to\nacquire behaviors that differ from other instances of the same class.\n\nThe "property()" function is implemented as a data descriptor.\nAccordingly, instances cannot override the behavior of a property.\n\n\n__slots__\n---------\n\nBy default, instances of classes have a dictionary for attribute\nstorage. This wastes space for objects having very few instance\nvariables. The space consumption can become acute when creating large\nnumbers of instances.\n\nThe default can be overridden by defining *__slots__* in a class\ndefinition. The *__slots__* declaration takes a sequence of instance\nvariables and reserves just enough space in each instance to hold a\nvalue for each variable. Space is saved because *__dict__* is not\ncreated for each instance.\n\nobject.__slots__\n\n This class variable can be assigned a string, iterable, or sequence\n of strings with variable names used by instances. *__slots__*\n reserves space for the declared variables and prevents the\n automatic creation of *__dict__* and *__weakref__* for each\n instance.\n\n\nNotes on using *__slots__*\n~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n* When inheriting from a class without *__slots__*, the *__dict__*\n attribute of that class will always be accessible, so a *__slots__*\n definition in the subclass is meaningless.\n\n* Without a *__dict__* variable, instances cannot be assigned new\n variables not listed in the *__slots__* definition. Attempts to\n assign to an unlisted variable name raises "AttributeError". If\n dynamic assignment of new variables is desired, then add\n "\'__dict__\'" to the sequence of strings in the *__slots__*\n declaration.\n\n* Without a *__weakref__* variable for each instance, classes\n defining *__slots__* do not support weak references to its\n instances. If weak reference support is needed, then add\n "\'__weakref__\'" to the sequence of strings in the *__slots__*\n declaration.\n\n* *__slots__* are implemented at the class level by creating\n descriptors (*Implementing Descriptors*) for each variable name. As\n a result, class attributes cannot be used to set default values for\n instance variables defined by *__slots__*; otherwise, the class\n attribute would overwrite the descriptor assignment.\n\n* The action of a *__slots__* declaration is limited to the class\n where it is defined. As a result, subclasses will have a *__dict__*\n unless they also define *__slots__* (which must only contain names\n of any *additional* slots).\n\n* If a class defines a slot also defined in a base class, the\n instance variable defined by the base class slot is inaccessible\n (except by retrieving its descriptor directly from the base class).\n This renders the meaning of the program undefined. In the future, a\n check may be added to prevent this.\n\n* Nonempty *__slots__* does not work for classes derived from\n "variable-length" built-in types such as "int", "bytes" and "tuple".\n\n* Any non-string iterable may be assigned to *__slots__*. Mappings\n may also be used; however, in the future, special meaning may be\n assigned to the values corresponding to each key.\n\n* *__class__* assignment works only if both classes have the same\n *__slots__*.\n\n\nCustomizing class creation\n==========================\n\nBy default, classes are constructed using "type()". The class body is\nexecuted in a new namespace and the class name is bound locally to the\nresult of "type(name, bases, namespace)".\n\nThe class creation process can be customized by passing the\n"metaclass" keyword argument in the class definition line, or by\ninheriting from an existing class that included such an argument. In\nthe following example, both "MyClass" and "MySubclass" are instances\nof "Meta":\n\n class Meta(type):\n pass\n\n class MyClass(metaclass=Meta):\n pass\n\n class MySubclass(MyClass):\n pass\n\nAny other keyword arguments that are specified in the class definition\nare passed through to all metaclass operations described below.\n\nWhen a class definition is executed, the following steps occur:\n\n* the appropriate metaclass is determined\n\n* the class namespace is prepared\n\n* the class body is executed\n\n* the class object is created\n\n\nDetermining the appropriate metaclass\n-------------------------------------\n\nThe appropriate metaclass for a class definition is determined as\nfollows:\n\n* if no bases and no explicit metaclass are given, then "type()" is\n used\n\n* if an explicit metaclass is given and it is *not* an instance of\n "type()", then it is used directly as the metaclass\n\n* if an instance of "type()" is given as the explicit metaclass, or\n bases are defined, then the most derived metaclass is used\n\nThe most derived metaclass is selected from the explicitly specified\nmetaclass (if any) and the metaclasses (i.e. "type(cls)") of all\nspecified base classes. The most derived metaclass is one which is a\nsubtype of *all* of these candidate metaclasses. If none of the\ncandidate metaclasses meets that criterion, then the class definition\nwill fail with "TypeError".\n\n\nPreparing the class namespace\n-----------------------------\n\nOnce the appropriate metaclass has been identified, then the class\nnamespace is prepared. If the metaclass has a "__prepare__" attribute,\nit is called as "namespace = metaclass.__prepare__(name, bases,\n**kwds)" (where the additional keyword arguments, if any, come from\nthe class definition).\n\nIf the metaclass has no "__prepare__" attribute, then the class\nnamespace is initialised as an empty "dict()" instance.\n\nSee also: **PEP 3115** - Metaclasses in Python 3000\n\n Introduced the "__prepare__" namespace hook\n\n\nExecuting the class body\n------------------------\n\nThe class body is executed (approximately) as "exec(body, globals(),\nnamespace)". The key difference from a normal call to "exec()" is that\nlexical scoping allows the class body (including any methods) to\nreference names from the current and outer scopes when the class\ndefinition occurs inside a function.\n\nHowever, even when the class definition occurs inside the function,\nmethods defined inside the class still cannot see names defined at the\nclass scope. Class variables must be accessed through the first\nparameter of instance or class methods, and cannot be accessed at all\nfrom static methods.\n\n\nCreating the class object\n-------------------------\n\nOnce the class namespace has been populated by executing the class\nbody, the class object is created by calling "metaclass(name, bases,\nnamespace, **kwds)" (the additional keywords passed here are the same\nas those passed to "__prepare__").\n\nThis class object is the one that will be referenced by the zero-\nargument form of "super()". "__class__" is an implicit closure\nreference created by the compiler if any methods in a class body refer\nto either "__class__" or "super". This allows the zero argument form\nof "super()" to correctly identify the class being defined based on\nlexical scoping, while the class or instance that was used to make the\ncurrent call is identified based on the first argument passed to the\nmethod.\n\nAfter the class object is created, it is passed to the class\ndecorators included in the class definition (if any) and the resulting\nobject is bound in the local namespace as the defined class.\n\nWhen a new class is created by "type.__new__", the object provided as\nthe namespace parameter is copied to a standard Python dictionary and\nthe original object is discarded. The new copy becomes the "__dict__"\nattribute of the class object.\n\nSee also: **PEP 3135** - New super\n\n Describes the implicit "__class__" closure reference\n\n\nMetaclass example\n-----------------\n\nThe potential uses for metaclasses are boundless. Some ideas that have\nbeen explored include logging, interface checking, automatic\ndelegation, automatic property creation, proxies, frameworks, and\nautomatic resource locking/synchronization.\n\nHere is an example of a metaclass that uses an\n"collections.OrderedDict" to remember the order that class variables\nare defined:\n\n class OrderedClass(type):\n\n @classmethod\n def __prepare__(metacls, name, bases, **kwds):\n return collections.OrderedDict()\n\n def __new__(cls, name, bases, namespace, **kwds):\n result = type.__new__(cls, name, bases, dict(namespace))\n result.members = tuple(namespace)\n return result\n\n class A(metaclass=OrderedClass):\n def one(self): pass\n def two(self): pass\n def three(self): pass\n def four(self): pass\n\n >>> A.members\n (\'__module__\', \'one\', \'two\', \'three\', \'four\')\n\nWhen the class definition for *A* gets executed, the process begins\nwith calling the metaclass\'s "__prepare__()" method which returns an\nempty "collections.OrderedDict". That mapping records the methods and\nattributes of *A* as they are defined within the body of the class\nstatement. Once those definitions are executed, the ordered dictionary\nis fully populated and the metaclass\'s "__new__()" method gets\ninvoked. That method builds the new type and it saves the ordered\ndictionary keys in an attribute called "members".\n\n\nCustomizing instance and subclass checks\n========================================\n\nThe following methods are used to override the default behavior of the\n"isinstance()" and "issubclass()" built-in functions.\n\nIn particular, the metaclass "abc.ABCMeta" implements these methods in\norder to allow the addition of Abstract Base Classes (ABCs) as\n"virtual base classes" to any class or type (including built-in\ntypes), including other ABCs.\n\nclass.__instancecheck__(self, instance)\n\n Return true if *instance* should be considered a (direct or\n indirect) instance of *class*. If defined, called to implement\n "isinstance(instance, class)".\n\nclass.__subclasscheck__(self, subclass)\n\n Return true if *subclass* should be considered a (direct or\n indirect) subclass of *class*. If defined, called to implement\n "issubclass(subclass, class)".\n\nNote that these methods are looked up on the type (metaclass) of a\nclass. They cannot be defined as class methods in the actual class.\nThis is consistent with the lookup of special methods that are called\non instances, only in this case the instance is itself a class.\n\nSee also: **PEP 3119** - Introducing Abstract Base Classes\n\n Includes the specification for customizing "isinstance()" and\n "issubclass()" behavior through "__instancecheck__()" and\n "__subclasscheck__()", with motivation for this functionality in\n the context of adding Abstract Base Classes (see the "abc"\n module) to the language.\n\n\nEmulating callable objects\n==========================\n\nobject.__call__(self[, args...])\n\n Called when the instance is "called" as a function; if this method\n is defined, "x(arg1, arg2, ...)" is a shorthand for\n "x.__call__(arg1, arg2, ...)".\n\n\nEmulating container types\n=========================\n\nThe following methods can be defined to implement container objects.\nContainers usually are sequences (such as lists or tuples) or mappings\n(like dictionaries), but can represent other containers as well. The\nfirst set of methods is used either to emulate a sequence or to\nemulate a mapping; the difference is that for a sequence, the\nallowable keys should be the integers *k* for which "0 <= k < N" where\n*N* is the length of the sequence, or slice objects, which define a\nrange of items. It is also recommended that mappings provide the\nmethods "keys()", "values()", "items()", "get()", "clear()",\n"setdefault()", "pop()", "popitem()", "copy()", and "update()"\nbehaving similar to those for Python\'s standard dictionary objects.\nThe "collections" module provides a "MutableMapping" abstract base\nclass to help create those methods from a base set of "__getitem__()",\n"__setitem__()", "__delitem__()", and "keys()". Mutable sequences\nshould provide methods "append()", "count()", "index()", "extend()",\n"insert()", "pop()", "remove()", "reverse()" and "sort()", like Python\nstandard list objects. Finally, sequence types should implement\naddition (meaning concatenation) and multiplication (meaning\nrepetition) by defining the methods "__add__()", "__radd__()",\n"__iadd__()", "__mul__()", "__rmul__()" and "__imul__()" described\nbelow; they should not define other numerical operators. It is\nrecommended that both mappings and sequences implement the\n"__contains__()" method to allow efficient use of the "in" operator;\nfor mappings, "in" should search the mapping\'s keys; for sequences, it\nshould search through the values. It is further recommended that both\nmappings and sequences implement the "__iter__()" method to allow\nefficient iteration through the container; for mappings, "__iter__()"\nshould be the same as "keys()"; for sequences, it should iterate\nthrough the values.\n\nobject.__len__(self)\n\n Called to implement the built-in function "len()". Should return\n the length of the object, an integer ">=" 0. Also, an object that\n doesn\'t define a "__bool__()" method and whose "__len__()" method\n returns zero is considered to be false in a Boolean context.\n\n **CPython implementation detail:** In CPython, the length is\n required to be at most "sys.maxsize". If the length is larger than\n "sys.maxsize" some features (such as "len()") may raise\n "OverflowError". To prevent raising "OverflowError" by truth value\n testing, an object must define a "__bool__()" method.\n\nobject.__length_hint__(self)\n\n Called to implement "operator.length_hint()". Should return an\n estimated length for the object (which may be greater or less than\n the actual length). The length must be an integer ">=" 0. This\n method is purely an optimization and is never required for\n correctness.\n\n New in version 3.4.\n\nNote: Slicing is done exclusively with the following three methods.\n A call like\n\n a[1:2] = b\n\n is translated to\n\n a[slice(1, 2, None)] = b\n\n and so forth. Missing slice items are always filled in with "None".\n\nobject.__getitem__(self, key)\n\n Called to implement evaluation of "self[key]". For sequence types,\n the accepted keys should be integers and slice objects. Note that\n the special interpretation of negative indexes (if the class wishes\n to emulate a sequence type) is up to the "__getitem__()" method. If\n *key* is of an inappropriate type, "TypeError" may be raised; if of\n a value outside the set of indexes for the sequence (after any\n special interpretation of negative values), "IndexError" should be\n raised. For mapping types, if *key* is missing (not in the\n container), "KeyError" should be raised.\n\n Note: "for" loops expect that an "IndexError" will be raised for\n illegal indexes to allow proper detection of the end of the\n sequence.\n\nobject.__missing__(self, key)\n\n Called by "dict"."__getitem__()" to implement "self[key]" for dict\n subclasses when key is not in the dictionary.\n\nobject.__setitem__(self, key, value)\n\n Called to implement assignment to "self[key]". Same note as for\n "__getitem__()". This should only be implemented for mappings if\n the objects support changes to the values for keys, or if new keys\n can be added, or for sequences if elements can be replaced. The\n same exceptions should be raised for improper *key* values as for\n the "__getitem__()" method.\n\nobject.__delitem__(self, key)\n\n Called to implement deletion of "self[key]". Same note as for\n "__getitem__()". This should only be implemented for mappings if\n the objects support removal of keys, or for sequences if elements\n can be removed from the sequence. The same exceptions should be\n raised for improper *key* values as for the "__getitem__()" method.\n\nobject.__iter__(self)\n\n This method is called when an iterator is required for a container.\n This method should return a new iterator object that can iterate\n over all the objects in the container. For mappings, it should\n iterate over the keys of the container.\n\n Iterator objects also need to implement this method; they are\n required to return themselves. For more information on iterator\n objects, see *Iterator Types*.\n\nobject.__reversed__(self)\n\n Called (if present) by the "reversed()" built-in to implement\n reverse iteration. It should return a new iterator object that\n iterates over all the objects in the container in reverse order.\n\n If the "__reversed__()" method is not provided, the "reversed()"\n built-in will fall back to using the sequence protocol ("__len__()"\n and "__getitem__()"). Objects that support the sequence protocol\n should only provide "__reversed__()" if they can provide an\n implementation that is more efficient than the one provided by\n "reversed()".\n\nThe membership test operators ("in" and "not in") are normally\nimplemented as an iteration through a sequence. However, container\nobjects can supply the following special method with a more efficient\nimplementation, which also does not require the object be a sequence.\n\nobject.__contains__(self, item)\n\n Called to implement membership test operators. Should return true\n if *item* is in *self*, false otherwise. For mapping objects, this\n should consider the keys of the mapping rather than the values or\n the key-item pairs.\n\n For objects that don\'t define "__contains__()", the membership test\n first tries iteration via "__iter__()", then the old sequence\n iteration protocol via "__getitem__()", see *this section in the\n language reference*.\n\n\nEmulating numeric types\n=======================\n\nThe following methods can be defined to emulate numeric objects.\nMethods corresponding to operations that are not supported by the\nparticular kind of number implemented (e.g., bitwise operations for\nnon-integral numbers) should be left undefined.\n\nobject.__add__(self, other)\nobject.__sub__(self, other)\nobject.__mul__(self, other)\nobject.__matmul__(self, other)\nobject.__truediv__(self, other)\nobject.__floordiv__(self, other)\nobject.__mod__(self, other)\nobject.__divmod__(self, other)\nobject.__pow__(self, other[, modulo])\nobject.__lshift__(self, other)\nobject.__rshift__(self, other)\nobject.__and__(self, other)\nobject.__xor__(self, other)\nobject.__or__(self, other)\n\n These methods are called to implement the binary arithmetic\n operations ("+", "-", "*", "@", "/", "//", "%", "divmod()",\n "pow()", "**", "<<", ">>", "&", "^", "|"). For instance, to\n evaluate the expression "x + y", where *x* is an instance of a\n class that has an "__add__()" method, "x.__add__(y)" is called.\n The "__divmod__()" method should be the equivalent to using\n "__floordiv__()" and "__mod__()"; it should not be related to\n "__truediv__()". Note that "__pow__()" should be defined to accept\n an optional third argument if the ternary version of the built-in\n "pow()" function is to be supported.\n\n If one of those methods does not support the operation with the\n supplied arguments, it should return "NotImplemented".\n\nobject.__radd__(self, other)\nobject.__rsub__(self, other)\nobject.__rmul__(self, other)\nobject.__rmatmul__(self, other)\nobject.__rtruediv__(self, other)\nobject.__rfloordiv__(self, other)\nobject.__rmod__(self, other)\nobject.__rdivmod__(self, other)\nobject.__rpow__(self, other)\nobject.__rlshift__(self, other)\nobject.__rrshift__(self, other)\nobject.__rand__(self, other)\nobject.__rxor__(self, other)\nobject.__ror__(self, other)\n\n These methods are called to implement the binary arithmetic\n operations ("+", "-", "*", "@", "/", "//", "%", "divmod()",\n "pow()", "**", "<<", ">>", "&", "^", "|") with reflected (swapped)\n operands. These functions are only called if the left operand does\n not support the corresponding operation and the operands are of\n different types. [2] For instance, to evaluate the expression "x -\n y", where *y* is an instance of a class that has an "__rsub__()"\n method, "y.__rsub__(x)" is called if "x.__sub__(y)" returns\n *NotImplemented*.\n\n Note that ternary "pow()" will not try calling "__rpow__()" (the\n coercion rules would become too complicated).\n\n Note: If the right operand\'s type is a subclass of the left\n operand\'s type and that subclass provides the reflected method\n for the operation, this method will be called before the left\n operand\'s non-reflected method. This behavior allows subclasses\n to override their ancestors\' operations.\n\nobject.__iadd__(self, other)\nobject.__isub__(self, other)\nobject.__imul__(self, other)\nobject.__imatmul__(self, other)\nobject.__itruediv__(self, other)\nobject.__ifloordiv__(self, other)\nobject.__imod__(self, other)\nobject.__ipow__(self, other[, modulo])\nobject.__ilshift__(self, other)\nobject.__irshift__(self, other)\nobject.__iand__(self, other)\nobject.__ixor__(self, other)\nobject.__ior__(self, other)\n\n These methods are called to implement the augmented arithmetic\n assignments ("+=", "-=", "*=", "@=", "/=", "//=", "%=", "**=",\n "<<=", ">>=", "&=", "^=", "|="). These methods should attempt to\n do the operation in-place (modifying *self*) and return the result\n (which could be, but does not have to be, *self*). If a specific\n method is not defined, the augmented assignment falls back to the\n normal methods. For instance, if *x* is an instance of a class\n with an "__iadd__()" method, "x += y" is equivalent to "x =\n x.__iadd__(y)" . Otherwise, "x.__add__(y)" and "y.__radd__(x)" are\n considered, as with the evaluation of "x + y". In certain\n situations, augmented assignment can result in unexpected errors\n (see *Why does a_tuple[i] += [\'item\'] raise an exception when the\n addition works?*), but this behavior is in fact part of the data\n model.\n\nobject.__neg__(self)\nobject.__pos__(self)\nobject.__abs__(self)\nobject.__invert__(self)\n\n Called to implement the unary arithmetic operations ("-", "+",\n "abs()" and "~").\n\nobject.__complex__(self)\nobject.__int__(self)\nobject.__float__(self)\nobject.__round__(self[, n])\n\n Called to implement the built-in functions "complex()", "int()",\n "float()" and "round()". Should return a value of the appropriate\n type.\n\nobject.__index__(self)\n\n Called to implement "operator.index()", and whenever Python needs\n to losslessly convert the numeric object to an integer object (such\n as in slicing, or in the built-in "bin()", "hex()" and "oct()"\n functions). Presence of this method indicates that the numeric\n object is an integer type. Must return an integer.\n\n Note: In order to have a coherent integer type class, when\n "__index__()" is defined "__int__()" should also be defined, and\n both should return the same value.\n\n\nWith Statement Context Managers\n===============================\n\nA *context manager* is an object that defines the runtime context to\nbe established when executing a "with" statement. The context manager\nhandles the entry into, and the exit from, the desired runtime context\nfor the execution of the block of code. Context managers are normally\ninvoked using the "with" statement (described in section *The with\nstatement*), but can also be used by directly invoking their methods.\n\nTypical uses of context managers include saving and restoring various\nkinds of global state, locking and unlocking resources, closing opened\nfiles, etc.\n\nFor more information on context managers, see *Context Manager Types*.\n\nobject.__enter__(self)\n\n Enter the runtime context related to this object. The "with"\n statement will bind this method\'s return value to the target(s)\n specified in the "as" clause of the statement, if any.\n\nobject.__exit__(self, exc_type, exc_value, traceback)\n\n Exit the runtime context related to this object. The parameters\n describe the exception that caused the context to be exited. If the\n context was exited without an exception, all three arguments will\n be "None".\n\n If an exception is supplied, and the method wishes to suppress the\n exception (i.e., prevent it from being propagated), it should\n return a true value. Otherwise, the exception will be processed\n normally upon exit from this method.\n\n Note that "__exit__()" methods should not reraise the passed-in\n exception; this is the caller\'s responsibility.\n\nSee also: **PEP 343** - The "with" statement\n\n The specification, background, and examples for the Python "with"\n statement.\n\n\nSpecial method lookup\n=====================\n\nFor custom classes, implicit invocations of special methods are only\nguaranteed to work correctly if defined on an object\'s type, not in\nthe object\'s instance dictionary. That behaviour is the reason why\nthe following code raises an exception:\n\n >>> class C:\n ... pass\n ...\n >>> c = C()\n >>> c.__len__ = lambda: 5\n >>> len(c)\n Traceback (most recent call last):\n File "", line 1, in \n TypeError: object of type \'C\' has no len()\n\nThe rationale behind this behaviour lies with a number of special\nmethods such as "__hash__()" and "__repr__()" that are implemented by\nall objects, including type objects. If the implicit lookup of these\nmethods used the conventional lookup process, they would fail when\ninvoked on the type object itself:\n\n >>> 1 .__hash__() == hash(1)\n True\n >>> int.__hash__() == hash(int)\n Traceback (most recent call last):\n File "", line 1, in \n TypeError: descriptor \'__hash__\' of \'int\' object needs an argument\n\nIncorrectly attempting to invoke an unbound method of a class in this\nway is sometimes referred to as \'metaclass confusion\', and is avoided\nby bypassing the instance when looking up special methods:\n\n >>> type(1).__hash__(1) == hash(1)\n True\n >>> type(int).__hash__(int) == hash(int)\n True\n\nIn addition to bypassing any instance attributes in the interest of\ncorrectness, implicit special method lookup generally also bypasses\nthe "__getattribute__()" method even of the object\'s metaclass:\n\n >>> class Meta(type):\n ... def __getattribute__(*args):\n ... print("Metaclass getattribute invoked")\n ... return type.__getattribute__(*args)\n ...\n >>> class C(object, metaclass=Meta):\n ... def __len__(self):\n ... return 10\n ... def __getattribute__(*args):\n ... print("Class getattribute invoked")\n ... return object.__getattribute__(*args)\n ...\n >>> c = C()\n >>> c.__len__() # Explicit lookup via instance\n Class getattribute invoked\n 10\n >>> type(c).__len__(c) # Explicit lookup via type\n Metaclass getattribute invoked\n 10\n >>> len(c) # Implicit lookup\n 10\n\nBypassing the "__getattribute__()" machinery in this fashion provides\nsignificant scope for speed optimisations within the interpreter, at\nthe cost of some flexibility in the handling of special methods (the\nspecial method *must* be set on the class object itself in order to be\nconsistently invoked by the interpreter).\n', - 'string-methods': u'\nString Methods\n**************\n\nStrings implement all of the *common* sequence operations, along with\nthe additional methods described below.\n\nStrings also support two styles of string formatting, one providing a\nlarge degree of flexibility and customization (see "str.format()",\n*Format String Syntax* and *Custom String Formatting*) and the other\nbased on C "printf" style formatting that handles a narrower range of\ntypes and is slightly harder to use correctly, but is often faster for\nthe cases it can handle (*printf-style String Formatting*).\n\nThe *Text Processing Services* section of the standard library covers\na number of other modules that provide various text related utilities\n(including regular expression support in the "re" module).\n\nstr.capitalize()\n\n Return a copy of the string with its first character capitalized\n and the rest lowercased.\n\nstr.casefold()\n\n Return a casefolded copy of the string. Casefolded strings may be\n used for caseless matching.\n\n Casefolding is similar to lowercasing but more aggressive because\n it is intended to remove all case distinctions in a string. For\n example, the German lowercase letter "\'\xdf\'" is equivalent to ""ss"".\n Since it is already lowercase, "lower()" would do nothing to "\'\xdf\'";\n "casefold()" converts it to ""ss"".\n\n The casefolding algorithm is described in section 3.13 of the\n Unicode Standard.\n\n New in version 3.3.\n\nstr.center(width[, fillchar])\n\n Return centered in a string of length *width*. Padding is done\n using the specified *fillchar* (default is an ASCII space). The\n original string is returned if *width* is less than or equal to\n "len(s)".\n\nstr.count(sub[, start[, end]])\n\n Return the number of non-overlapping occurrences of substring *sub*\n in the range [*start*, *end*]. Optional arguments *start* and\n *end* are interpreted as in slice notation.\n\nstr.encode(encoding="utf-8", errors="strict")\n\n Return an encoded version of the string as a bytes object. Default\n encoding is "\'utf-8\'". *errors* may be given to set a different\n error handling scheme. The default for *errors* is "\'strict\'",\n meaning that encoding errors raise a "UnicodeError". Other possible\n values are "\'ignore\'", "\'replace\'", "\'xmlcharrefreplace\'",\n "\'backslashreplace\'" and any other name registered via\n "codecs.register_error()", see section *Error Handlers*. For a list\n of possible encodings, see section *Standard Encodings*.\n\n Changed in version 3.1: Support for keyword arguments added.\n\nstr.endswith(suffix[, start[, end]])\n\n Return "True" if the string ends with the specified *suffix*,\n otherwise return "False". *suffix* can also be a tuple of suffixes\n to look for. With optional *start*, test beginning at that\n position. With optional *end*, stop comparing at that position.\n\nstr.expandtabs(tabsize=8)\n\n Return a copy of the string where all tab characters are replaced\n by one or more spaces, depending on the current column and the\n given tab size. Tab positions occur every *tabsize* characters\n (default is 8, giving tab positions at columns 0, 8, 16 and so on).\n To expand the string, the current column is set to zero and the\n string is examined character by character. If the character is a\n tab ("\\t"), one or more space characters are inserted in the result\n until the current column is equal to the next tab position. (The\n tab character itself is not copied.) If the character is a newline\n ("\\n") or return ("\\r"), it is copied and the current column is\n reset to zero. Any other character is copied unchanged and the\n current column is incremented by one regardless of how the\n character is represented when printed.\n\n >>> \'01\\t012\\t0123\\t01234\'.expandtabs()\n \'01 012 0123 01234\'\n >>> \'01\\t012\\t0123\\t01234\'.expandtabs(4)\n \'01 012 0123 01234\'\n\nstr.find(sub[, start[, end]])\n\n Return the lowest index in the string where substring *sub* is\n found within the slice "s[start:end]". Optional arguments *start*\n and *end* are interpreted as in slice notation. Return "-1" if\n *sub* is not found.\n\n Note: The "find()" method should be used only if you need to know\n the position of *sub*. To check if *sub* is a substring or not,\n use the "in" operator:\n\n >>> \'Py\' in \'Python\'\n True\n\nstr.format(*args, **kwargs)\n\n Perform a string formatting operation. The string on which this\n method is called can contain literal text or replacement fields\n delimited by braces "{}". Each replacement field contains either\n the numeric index of a positional argument, or the name of a\n keyword argument. Returns a copy of the string where each\n replacement field is replaced with the string value of the\n corresponding argument.\n\n >>> "The sum of 1 + 2 is {0}".format(1+2)\n \'The sum of 1 + 2 is 3\'\n\n See *Format String Syntax* for a description of the various\n formatting options that can be specified in format strings.\n\nstr.format_map(mapping)\n\n Similar to "str.format(**mapping)", except that "mapping" is used\n directly and not copied to a "dict". This is useful if for example\n "mapping" is a dict subclass:\n\n >>> class Default(dict):\n ... def __missing__(self, key):\n ... return key\n ...\n >>> \'{name} was born in {country}\'.format_map(Default(name=\'Guido\'))\n \'Guido was born in country\'\n\n New in version 3.2.\n\nstr.index(sub[, start[, end]])\n\n Like "find()", but raise "ValueError" when the substring is not\n found.\n\nstr.isalnum()\n\n Return true if all characters in the string are alphanumeric and\n there is at least one character, false otherwise. A character "c"\n is alphanumeric if one of the following returns "True":\n "c.isalpha()", "c.isdecimal()", "c.isdigit()", or "c.isnumeric()".\n\nstr.isalpha()\n\n Return true if all characters in the string are alphabetic and\n there is at least one character, false otherwise. Alphabetic\n characters are those characters defined in the Unicode character\n database as "Letter", i.e., those with general category property\n being one of "Lm", "Lt", "Lu", "Ll", or "Lo". Note that this is\n different from the "Alphabetic" property defined in the Unicode\n Standard.\n\nstr.isdecimal()\n\n Return true if all characters in the string are decimal characters\n and there is at least one character, false otherwise. Decimal\n characters are those that can be used to form numbers in base 10,\n e.g. U+0660, ARABIC-INDIC DIGIT ZERO. Formally a decimal character\n is a character in the Unicode General Category "Nd".\n\nstr.isdigit()\n\n Return true if all characters in the string are digits and there is\n at least one character, false otherwise. Digits include decimal\n characters and digits that need special handling, such as the\n compatibility superscript digits. This covers digits which cannot\n be used to form numbers in base 10, like the Kharosthi numbers.\n Formally, a digit is a character that has the property value\n Numeric_Type=Digit or Numeric_Type=Decimal.\n\nstr.isidentifier()\n\n Return true if the string is a valid identifier according to the\n language definition, section *Identifiers and keywords*.\n\n Use "keyword.iskeyword()" to test for reserved identifiers such as\n "def" and "class".\n\nstr.islower()\n\n Return true if all cased characters [4] in the string are lowercase\n and there is at least one cased character, false otherwise.\n\nstr.isnumeric()\n\n Return true if all characters in the string are numeric characters,\n and there is at least one character, false otherwise. Numeric\n characters include digit characters, and all characters that have\n the Unicode numeric value property, e.g. U+2155, VULGAR FRACTION\n ONE FIFTH. Formally, numeric characters are those with the\n property value Numeric_Type=Digit, Numeric_Type=Decimal or\n Numeric_Type=Numeric.\n\nstr.isprintable()\n\n Return true if all characters in the string are printable or the\n string is empty, false otherwise. Nonprintable characters are\n those characters defined in the Unicode character database as\n "Other" or "Separator", excepting the ASCII space (0x20) which is\n considered printable. (Note that printable characters in this\n context are those which should not be escaped when "repr()" is\n invoked on a string. It has no bearing on the handling of strings\n written to "sys.stdout" or "sys.stderr".)\n\nstr.isspace()\n\n Return true if there are only whitespace characters in the string\n and there is at least one character, false otherwise. Whitespace\n characters are those characters defined in the Unicode character\n database as "Other" or "Separator" and those with bidirectional\n property being one of "WS", "B", or "S".\n\nstr.istitle()\n\n Return true if the string is a titlecased string and there is at\n least one character, for example uppercase characters may only\n follow uncased characters and lowercase characters only cased ones.\n Return false otherwise.\n\nstr.isupper()\n\n Return true if all cased characters [4] in the string are uppercase\n and there is at least one cased character, false otherwise.\n\nstr.join(iterable)\n\n Return a string which is the concatenation of the strings in\n *iterable*. A "TypeError" will be raised if there are any non-\n string values in *iterable*, including "bytes" objects. The\n separator between elements is the string providing this method.\n\nstr.ljust(width[, fillchar])\n\n Return the string left justified in a string of length *width*.\n Padding is done using the specified *fillchar* (default is an ASCII\n space). The original string is returned if *width* is less than or\n equal to "len(s)".\n\nstr.lower()\n\n Return a copy of the string with all the cased characters [4]\n converted to lowercase.\n\n The lowercasing algorithm used is described in section 3.13 of the\n Unicode Standard.\n\nstr.lstrip([chars])\n\n Return a copy of the string with leading characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or "None", the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a prefix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.lstrip()\n \'spacious \'\n >>> \'www.example.com\'.lstrip(\'cmowz.\')\n \'example.com\'\n\nstatic str.maketrans(x[, y[, z]])\n\n This static method returns a translation table usable for\n "str.translate()".\n\n If there is only one argument, it must be a dictionary mapping\n Unicode ordinals (integers) or characters (strings of length 1) to\n Unicode ordinals, strings (of arbitrary lengths) or "None".\n Character keys will then be converted to ordinals.\n\n If there are two arguments, they must be strings of equal length,\n and in the resulting dictionary, each character in x will be mapped\n to the character at the same position in y. If there is a third\n argument, it must be a string, whose characters will be mapped to\n "None" in the result.\n\nstr.partition(sep)\n\n Split the string at the first occurrence of *sep*, and return a\n 3-tuple containing the part before the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing the string itself, followed by\n two empty strings.\n\nstr.replace(old, new[, count])\n\n Return a copy of the string with all occurrences of substring *old*\n replaced by *new*. If the optional argument *count* is given, only\n the first *count* occurrences are replaced.\n\nstr.rfind(sub[, start[, end]])\n\n Return the highest index in the string where substring *sub* is\n found, such that *sub* is contained within "s[start:end]".\n Optional arguments *start* and *end* are interpreted as in slice\n notation. Return "-1" on failure.\n\nstr.rindex(sub[, start[, end]])\n\n Like "rfind()" but raises "ValueError" when the substring *sub* is\n not found.\n\nstr.rjust(width[, fillchar])\n\n Return the string right justified in a string of length *width*.\n Padding is done using the specified *fillchar* (default is an ASCII\n space). The original string is returned if *width* is less than or\n equal to "len(s)".\n\nstr.rpartition(sep)\n\n Split the string at the last occurrence of *sep*, and return a\n 3-tuple containing the part before the separator, the separator\n itself, and the part after the separator. If the separator is not\n found, return a 3-tuple containing two empty strings, followed by\n the string itself.\n\nstr.rsplit(sep=None, maxsplit=-1)\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit* splits\n are done, the *rightmost* ones. If *sep* is not specified or\n "None", any whitespace string is a separator. Except for splitting\n from the right, "rsplit()" behaves like "split()" which is\n described in detail below.\n\nstr.rstrip([chars])\n\n Return a copy of the string with trailing characters removed. The\n *chars* argument is a string specifying the set of characters to be\n removed. If omitted or "None", the *chars* argument defaults to\n removing whitespace. The *chars* argument is not a suffix; rather,\n all combinations of its values are stripped:\n\n >>> \' spacious \'.rstrip()\n \' spacious\'\n >>> \'mississippi\'.rstrip(\'ipz\')\n \'mississ\'\n\nstr.split(sep=None, maxsplit=-1)\n\n Return a list of the words in the string, using *sep* as the\n delimiter string. If *maxsplit* is given, at most *maxsplit*\n splits are done (thus, the list will have at most "maxsplit+1"\n elements). If *maxsplit* is not specified or "-1", then there is\n no limit on the number of splits (all possible splits are made).\n\n If *sep* is given, consecutive delimiters are not grouped together\n and are deemed to delimit empty strings (for example,\n "\'1,,2\'.split(\',\')" returns "[\'1\', \'\', \'2\']"). The *sep* argument\n may consist of multiple characters (for example,\n "\'1<>2<>3\'.split(\'<>\')" returns "[\'1\', \'2\', \'3\']"). Splitting an\n empty string with a specified separator returns "[\'\']".\n\n For example:\n\n >>> \'1,2,3\'.split(\',\')\n [\'1\', \'2\', \'3\']\n >>> \'1,2,3\'.split(\',\', maxsplit=1)\n [\'1\', \'2,3\']\n >>> \'1,2,,3,\'.split(\',\')\n [\'1\', \'2\', \'\', \'3\', \'\']\n\n If *sep* is not specified or is "None", a different splitting\n algorithm is applied: runs of consecutive whitespace are regarded\n as a single separator, and the result will contain no empty strings\n at the start or end if the string has leading or trailing\n whitespace. Consequently, splitting an empty string or a string\n consisting of just whitespace with a "None" separator returns "[]".\n\n For example:\n\n >>> \'1 2 3\'.split()\n [\'1\', \'2\', \'3\']\n >>> \'1 2 3\'.split(maxsplit=1)\n [\'1\', \'2 3\']\n >>> \' 1 2 3 \'.split()\n [\'1\', \'2\', \'3\']\n\nstr.splitlines([keepends])\n\n Return a list of the lines in the string, breaking at line\n boundaries. Line breaks are not included in the resulting list\n unless *keepends* is given and true.\n\n This method splits on the following line boundaries. In\n particular, the boundaries are a superset of *universal newlines*.\n\n +-------------------------+-------------------------------+\n | Representation | Description |\n +=========================+===============================+\n | "\\n" | Line Feed |\n +-------------------------+-------------------------------+\n | "\\r" | Carriage Return |\n +-------------------------+-------------------------------+\n | "\\r\\n" | Carriage Return + Line Feed |\n +-------------------------+-------------------------------+\n | "\\v" or "\\x0b" | Line Tabulation |\n +-------------------------+-------------------------------+\n | "\\f" or "\\x0c" | Form Feed |\n +-------------------------+-------------------------------+\n | "\\x1c" | File Separator |\n +-------------------------+-------------------------------+\n | "\\x1d" | Group Separator |\n +-------------------------+-------------------------------+\n | "\\x1e" | Record Separator |\n +-------------------------+-------------------------------+\n | "\\x85" | Next Line (C1 Control Code) |\n +-------------------------+-------------------------------+\n | "\\u2028" | Line Separator |\n +-------------------------+-------------------------------+\n | "\\u2029" | Paragraph Separator |\n +-------------------------+-------------------------------+\n\n Changed in version 3.2: "\\v" and "\\f" added to list of line\n boundaries.\n\n For example:\n\n >>> \'ab c\\n\\nde fg\\rkl\\r\\n\'.splitlines()\n [\'ab c\', \'\', \'de fg\', \'kl\']\n >>> \'ab c\\n\\nde fg\\rkl\\r\\n\'.splitlines(keepends=True)\n [\'ab c\\n\', \'\\n\', \'de fg\\r\', \'kl\\r\\n\']\n\n Unlike "split()" when a delimiter string *sep* is given, this\n method returns an empty list for the empty string, and a terminal\n line break does not result in an extra line:\n\n >>> "".splitlines()\n []\n >>> "One line\\n".splitlines()\n [\'One line\']\n\n For comparison, "split(\'\\n\')" gives:\n\n >>> \'\'.split(\'\\n\')\n [\'\']\n >>> \'Two lines\\n\'.split(\'\\n\')\n [\'Two lines\', \'\']\n\nstr.startswith(prefix[, start[, end]])\n\n Return "True" if string starts with the *prefix*, otherwise return\n "False". *prefix* can also be a tuple of prefixes to look for.\n With optional *start*, test string beginning at that position.\n With optional *end*, stop comparing string at that position.\n\nstr.strip([chars])\n\n Return a copy of the string with the leading and trailing\n characters removed. The *chars* argument is a string specifying the\n set of characters to be removed. If omitted or "None", the *chars*\n argument defaults to removing whitespace. The *chars* argument is\n not a prefix or suffix; rather, all combinations of its values are\n stripped:\n\n >>> \' spacious \'.strip()\n \'spacious\'\n >>> \'www.example.com\'.strip(\'cmowz.\')\n \'example\'\n\n The outermost leading and trailing *chars* argument values are\n stripped from the string. Characters are removed from the leading\n end until reaching a string character that is not contained in the\n set of characters in *chars*. A similar action takes place on the\n trailing end. For example:\n\n >>> comment_string = \'#....... Section 3.2.1 Issue #32 .......\'\n >>> comment_string.strip(\'.#! \')\n \'Section 3.2.1 Issue #32\'\n\nstr.swapcase()\n\n Return a copy of the string with uppercase characters converted to\n lowercase and vice versa. Note that it is not necessarily true that\n "s.swapcase().swapcase() == s".\n\nstr.title()\n\n Return a titlecased version of the string where words start with an\n uppercase character and the remaining characters are lowercase.\n\n For example:\n\n >>> \'Hello world\'.title()\n \'Hello World\'\n\n The algorithm uses a simple language-independent definition of a\n word as groups of consecutive letters. The definition works in\n many contexts but it means that apostrophes in contractions and\n possessives form word boundaries, which may not be the desired\n result:\n\n >>> "they\'re bill\'s friends from the UK".title()\n "They\'Re Bill\'S Friends From The Uk"\n\n A workaround for apostrophes can be constructed using regular\n expressions:\n\n >>> import re\n >>> def titlecase(s):\n ... return re.sub(r"[A-Za-z]+(\'[A-Za-z]+)?",\n ... lambda mo: mo.group(0)[0].upper() +\n ... mo.group(0)[1:].lower(),\n ... s)\n ...\n >>> titlecase("they\'re bill\'s friends.")\n "They\'re Bill\'s Friends."\n\nstr.translate(table)\n\n Return a copy of the string in which each character has been mapped\n through the given translation table. The table must be an object\n that implements indexing via "__getitem__()", typically a *mapping*\n or *sequence*. When indexed by a Unicode ordinal (an integer), the\n table object can do any of the following: return a Unicode ordinal\n or a string, to map the character to one or more other characters;\n return "None", to delete the character from the return string; or\n raise a "LookupError" exception, to map the character to itself.\n\n You can use "str.maketrans()" to create a translation map from\n character-to-character mappings in different formats.\n\n See also the "codecs" module for a more flexible approach to custom\n character mappings.\n\nstr.upper()\n\n Return a copy of the string with all the cased characters [4]\n converted to uppercase. Note that "str.upper().isupper()" might be\n "False" if "s" contains uncased characters or if the Unicode\n category of the resulting character(s) is not "Lu" (Letter,\n uppercase), but e.g. "Lt" (Letter, titlecase).\n\n The uppercasing algorithm used is described in section 3.13 of the\n Unicode Standard.\n\nstr.zfill(width)\n\n Return a copy of the string left filled with ASCII "\'0\'" digits to\n make a string of length *width*. A leading sign prefix\n ("\'+\'"/"\'-\'") is handled by inserting the padding *after* the sign\n character rather than before. The original string is returned if\n *width* is less than or equal to "len(s)".\n\n For example:\n\n >>> "42".zfill(5)\n \'00042\'\n >>> "-42".zfill(5)\n \'-0042\'\n', - 'strings': u'\nString and Bytes literals\n*************************\n\nString literals are described by the following lexical definitions:\n\n stringliteral ::= [stringprefix](shortstring | longstring)\n stringprefix ::= "r" | "u" | "R" | "U"\n shortstring ::= "\'" shortstringitem* "\'" | \'"\' shortstringitem* \'"\'\n longstring ::= "\'\'\'" longstringitem* "\'\'\'" | \'"""\' longstringitem* \'"""\'\n shortstringitem ::= shortstringchar | stringescapeseq\n longstringitem ::= longstringchar | stringescapeseq\n shortstringchar ::= \n longstringchar ::= \n stringescapeseq ::= "\\" \n\n bytesliteral ::= bytesprefix(shortbytes | longbytes)\n bytesprefix ::= "b" | "B" | "br" | "Br" | "bR" | "BR" | "rb" | "rB" | "Rb" | "RB"\n shortbytes ::= "\'" shortbytesitem* "\'" | \'"\' shortbytesitem* \'"\'\n longbytes ::= "\'\'\'" longbytesitem* "\'\'\'" | \'"""\' longbytesitem* \'"""\'\n shortbytesitem ::= shortbyteschar | bytesescapeseq\n longbytesitem ::= longbyteschar | bytesescapeseq\n shortbyteschar ::= \n longbyteschar ::= \n bytesescapeseq ::= "\\" \n\nOne syntactic restriction not indicated by these productions is that\nwhitespace is not allowed between the "stringprefix" or "bytesprefix"\nand the rest of the literal. The source character set is defined by\nthe encoding declaration; it is UTF-8 if no encoding declaration is\ngiven in the source file; see section *Encoding declarations*.\n\nIn plain English: Both types of literals can be enclosed in matching\nsingle quotes ("\'") or double quotes ("""). They can also be enclosed\nin matching groups of three single or double quotes (these are\ngenerally referred to as *triple-quoted strings*). The backslash\n("\\") character is used to escape characters that otherwise have a\nspecial meaning, such as newline, backslash itself, or the quote\ncharacter.\n\nBytes literals are always prefixed with "\'b\'" or "\'B\'"; they produce\nan instance of the "bytes" type instead of the "str" type. They may\nonly contain ASCII characters; bytes with a numeric value of 128 or\ngreater must be expressed with escapes.\n\nAs of Python 3.3 it is possible again to prefix string literals with a\n"u" prefix to simplify maintenance of dual 2.x and 3.x codebases.\n\nBoth string and bytes literals may optionally be prefixed with a\nletter "\'r\'" or "\'R\'"; such strings are called *raw strings* and treat\nbackslashes as literal characters. As a result, in string literals,\n"\'\\U\'" and "\'\\u\'" escapes in raw strings are not treated specially.\nGiven that Python 2.x\'s raw unicode literals behave differently than\nPython 3.x\'s the "\'ur\'" syntax is not supported.\n\nNew in version 3.3: The "\'rb\'" prefix of raw bytes literals has been\nadded as a synonym of "\'br\'".\n\nNew in version 3.3: Support for the unicode legacy literal\n("u\'value\'") was reintroduced to simplify the maintenance of dual\nPython 2.x and 3.x codebases. See **PEP 414** for more information.\n\nIn triple-quoted literals, unescaped newlines and quotes are allowed\n(and are retained), except that three unescaped quotes in a row\nterminate the literal. (A "quote" is the character used to open the\nliteral, i.e. either "\'" or """.)\n\nUnless an "\'r\'" or "\'R\'" prefix is present, escape sequences in string\nand bytes literals are interpreted according to rules similar to those\nused by Standard C. The recognized escape sequences are:\n\n+-------------------+-----------------------------------+---------+\n| Escape Sequence | Meaning | Notes |\n+===================+===================================+=========+\n| "\\newline" | Backslash and newline ignored | |\n+-------------------+-----------------------------------+---------+\n| "\\\\" | Backslash ("\\") | |\n+-------------------+-----------------------------------+---------+\n| "\\\'" | Single quote ("\'") | |\n+-------------------+-----------------------------------+---------+\n| "\\"" | Double quote (""") | |\n+-------------------+-----------------------------------+---------+\n| "\\a" | ASCII Bell (BEL) | |\n+-------------------+-----------------------------------+---------+\n| "\\b" | ASCII Backspace (BS) | |\n+-------------------+-----------------------------------+---------+\n| "\\f" | ASCII Formfeed (FF) | |\n+-------------------+-----------------------------------+---------+\n| "\\n" | ASCII Linefeed (LF) | |\n+-------------------+-----------------------------------+---------+\n| "\\r" | ASCII Carriage Return (CR) | |\n+-------------------+-----------------------------------+---------+\n| "\\t" | ASCII Horizontal Tab (TAB) | |\n+-------------------+-----------------------------------+---------+\n| "\\v" | ASCII Vertical Tab (VT) | |\n+-------------------+-----------------------------------+---------+\n| "\\ooo" | Character with octal value *ooo* | (1,3) |\n+-------------------+-----------------------------------+---------+\n| "\\xhh" | Character with hex value *hh* | (2,3) |\n+-------------------+-----------------------------------+---------+\n\nEscape sequences only recognized in string literals are:\n\n+-------------------+-----------------------------------+---------+\n| Escape Sequence | Meaning | Notes |\n+===================+===================================+=========+\n| "\\N{name}" | Character named *name* in the | (4) |\n| | Unicode database | |\n+-------------------+-----------------------------------+---------+\n| "\\uxxxx" | Character with 16-bit hex value | (5) |\n| | *xxxx* | |\n+-------------------+-----------------------------------+---------+\n| "\\Uxxxxxxxx" | Character with 32-bit hex value | (6) |\n| | *xxxxxxxx* | |\n+-------------------+-----------------------------------+---------+\n\nNotes:\n\n1. As in Standard C, up to three octal digits are accepted.\n\n2. Unlike in Standard C, exactly two hex digits are required.\n\n3. In a bytes literal, hexadecimal and octal escapes denote the\n byte with the given value. In a string literal, these escapes\n denote a Unicode character with the given value.\n\n4. Changed in version 3.3: Support for name aliases [1] has been\n added.\n\n5. Exactly four hex digits are required.\n\n6. Any Unicode character can be encoded this way. Exactly eight\n hex digits are required.\n\nUnlike Standard C, all unrecognized escape sequences are left in the\nstring unchanged, i.e., *the backslash is left in the result*. (This\nbehavior is useful when debugging: if an escape sequence is mistyped,\nthe resulting output is more easily recognized as broken.) It is also\nimportant to note that the escape sequences only recognized in string\nliterals fall into the category of unrecognized escapes for bytes\nliterals.\n\nEven in a raw literal, quotes can be escaped with a backslash, but the\nbackslash remains in the result; for example, "r"\\""" is a valid\nstring literal consisting of two characters: a backslash and a double\nquote; "r"\\"" is not a valid string literal (even a raw string cannot\nend in an odd number of backslashes). Specifically, *a raw literal\ncannot end in a single backslash* (since the backslash would escape\nthe following quote character). Note also that a single backslash\nfollowed by a newline is interpreted as those two characters as part\nof the literal, *not* as a line continuation.\n', - 'subscriptions': u'\nSubscriptions\n*************\n\nA subscription selects an item of a sequence (string, tuple or list)\nor mapping (dictionary) object:\n\n subscription ::= primary "[" expression_list "]"\n\nThe primary must evaluate to an object that supports subscription\n(lists or dictionaries for example). User-defined objects can support\nsubscription by defining a "__getitem__()" method.\n\nFor built-in objects, there are two types of objects that support\nsubscription:\n\nIf the primary is a mapping, the expression list must evaluate to an\nobject whose value is one of the keys of the mapping, and the\nsubscription selects the value in the mapping that corresponds to that\nkey. (The expression list is a tuple except if it has exactly one\nitem.)\n\nIf the primary is a sequence, the expression (list) must evaluate to\nan integer or a slice (as discussed in the following section).\n\nThe formal syntax makes no special provision for negative indices in\nsequences; however, built-in sequences all provide a "__getitem__()"\nmethod that interprets negative indices by adding the length of the\nsequence to the index (so that "x[-1]" selects the last item of "x").\nThe resulting value must be a nonnegative integer less than the number\nof items in the sequence, and the subscription selects the item whose\nindex is that value (counting from zero). Since the support for\nnegative indices and slicing occurs in the object\'s "__getitem__()"\nmethod, subclasses overriding this method will need to explicitly add\nthat support.\n\nA string\'s items are characters. A character is not a separate data\ntype but a string of exactly one character.\n', - 'truth': u'\nTruth Value Testing\n*******************\n\nAny object can be tested for truth value, for use in an "if" or\n"while" condition or as operand of the Boolean operations below. The\nfollowing values are considered false:\n\n* "None"\n\n* "False"\n\n* zero of any numeric type, for example, "0", "0.0", "0j".\n\n* any empty sequence, for example, "\'\'", "()", "[]".\n\n* any empty mapping, for example, "{}".\n\n* instances of user-defined classes, if the class defines a\n "__bool__()" or "__len__()" method, when that method returns the\n integer zero or "bool" value "False". [1]\n\nAll other values are considered true --- so objects of many types are\nalways true.\n\nOperations and built-in functions that have a Boolean result always\nreturn "0" or "False" for false and "1" or "True" for true, unless\notherwise stated. (Important exception: the Boolean operations "or"\nand "and" always return one of their operands.)\n', - 'try': u'\nThe "try" statement\n*******************\n\nThe "try" statement specifies exception handlers and/or cleanup code\nfor a group of statements:\n\n try_stmt ::= try1_stmt | try2_stmt\n try1_stmt ::= "try" ":" suite\n ("except" [expression ["as" identifier]] ":" suite)+\n ["else" ":" suite]\n ["finally" ":" suite]\n try2_stmt ::= "try" ":" suite\n "finally" ":" suite\n\nThe "except" clause(s) specify one or more exception handlers. When no\nexception occurs in the "try" clause, no exception handler is\nexecuted. When an exception occurs in the "try" suite, a search for an\nexception handler is started. This search inspects the except clauses\nin turn until one is found that matches the exception. An expression-\nless except clause, if present, must be last; it matches any\nexception. For an except clause with an expression, that expression\nis evaluated, and the clause matches the exception if the resulting\nobject is "compatible" with the exception. An object is compatible\nwith an exception if it is the class or a base class of the exception\nobject or a tuple containing an item compatible with the exception.\n\nIf no except clause matches the exception, the search for an exception\nhandler continues in the surrounding code and on the invocation stack.\n[1]\n\nIf the evaluation of an expression in the header of an except clause\nraises an exception, the original search for a handler is canceled and\na search starts for the new exception in the surrounding code and on\nthe call stack (it is treated as if the entire "try" statement raised\nthe exception).\n\nWhen a matching except clause is found, the exception is assigned to\nthe target specified after the "as" keyword in that except clause, if\npresent, and the except clause\'s suite is executed. All except\nclauses must have an executable block. When the end of this block is\nreached, execution continues normally after the entire try statement.\n(This means that if two nested handlers exist for the same exception,\nand the exception occurs in the try clause of the inner handler, the\nouter handler will not handle the exception.)\n\nWhen an exception has been assigned using "as target", it is cleared\nat the end of the except clause. This is as if\n\n except E as N:\n foo\n\nwas translated to\n\n except E as N:\n try:\n foo\n finally:\n del N\n\nThis means the exception must be assigned to a different name to be\nable to refer to it after the except clause. Exceptions are cleared\nbecause with the traceback attached to them, they form a reference\ncycle with the stack frame, keeping all locals in that frame alive\nuntil the next garbage collection occurs.\n\nBefore an except clause\'s suite is executed, details about the\nexception are stored in the "sys" module and can be accessed via\n"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting of the\nexception class, the exception instance and a traceback object (see\nsection *The standard type hierarchy*) identifying the point in the\nprogram where the exception occurred. "sys.exc_info()" values are\nrestored to their previous values (before the call) when returning\nfrom a function that handled an exception.\n\nThe optional "else" clause is executed if and when control flows off\nthe end of the "try" clause. [2] Exceptions in the "else" clause are\nnot handled by the preceding "except" clauses.\n\nIf "finally" is present, it specifies a \'cleanup\' handler. The "try"\nclause is executed, including any "except" and "else" clauses. If an\nexception occurs in any of the clauses and is not handled, the\nexception is temporarily saved. The "finally" clause is executed. If\nthere is a saved exception it is re-raised at the end of the "finally"\nclause. If the "finally" clause raises another exception, the saved\nexception is set as the context of the new exception. If the "finally"\nclause executes a "return" or "break" statement, the saved exception\nis discarded:\n\n >>> def f():\n ... try:\n ... 1/0\n ... finally:\n ... return 42\n ...\n >>> f()\n 42\n\nThe exception information is not available to the program during\nexecution of the "finally" clause.\n\nWhen a "return", "break" or "continue" statement is executed in the\n"try" suite of a "try"..."finally" statement, the "finally" clause is\nalso executed \'on the way out.\' A "continue" statement is illegal in\nthe "finally" clause. (The reason is a problem with the current\nimplementation --- this restriction may be lifted in the future).\n\nThe return value of a function is determined by the last "return"\nstatement executed. Since the "finally" clause always executes, a\n"return" statement executed in the "finally" clause will always be the\nlast one executed:\n\n >>> def foo():\n ... try:\n ... return \'try\'\n ... finally:\n ... return \'finally\'\n ...\n >>> foo()\n \'finally\'\n\nAdditional information on exceptions can be found in section\n*Exceptions*, and information on using the "raise" statement to\ngenerate exceptions may be found in section *The raise statement*.\n', - 'types': u'\nThe standard type hierarchy\n***************************\n\nBelow is a list of the types that are built into Python. Extension\nmodules (written in C, Java, or other languages, depending on the\nimplementation) can define additional types. Future versions of\nPython may add types to the type hierarchy (e.g., rational numbers,\nefficiently stored arrays of integers, etc.), although such additions\nwill often be provided via the standard library instead.\n\nSome of the type descriptions below contain a paragraph listing\n\'special attributes.\' These are attributes that provide access to the\nimplementation and are not intended for general use. Their definition\nmay change in the future.\n\nNone\n This type has a single value. There is a single object with this\n value. This object is accessed through the built-in name "None". It\n is used to signify the absence of a value in many situations, e.g.,\n it is returned from functions that don\'t explicitly return\n anything. Its truth value is false.\n\nNotImplemented\n This type has a single value. There is a single object with this\n value. This object is accessed through the built-in name\n "NotImplemented". Numeric methods and rich comparison methods\n should return this value if they do not implement the operation for\n the operands provided. (The interpreter will then try the\n reflected operation, or some other fallback, depending on the\n operator.) Its truth value is true.\n\n See *Implementing the arithmetic operations* for more details.\n\nEllipsis\n This type has a single value. There is a single object with this\n value. This object is accessed through the literal "..." or the\n built-in name "Ellipsis". Its truth value is true.\n\n"numbers.Number"\n These are created by numeric literals and returned as results by\n arithmetic operators and arithmetic built-in functions. Numeric\n objects are immutable; once created their value never changes.\n Python numbers are of course strongly related to mathematical\n numbers, but subject to the limitations of numerical representation\n in computers.\n\n Python distinguishes between integers, floating point numbers, and\n complex numbers:\n\n "numbers.Integral"\n These represent elements from the mathematical set of integers\n (positive and negative).\n\n There are two types of integers:\n\n Integers ("int")\n\n These represent numbers in an unlimited range, subject to\n available (virtual) memory only. For the purpose of shift\n and mask operations, a binary representation is assumed, and\n negative numbers are represented in a variant of 2\'s\n complement which gives the illusion of an infinite string of\n sign bits extending to the left.\n\n Booleans ("bool")\n These represent the truth values False and True. The two\n objects representing the values "False" and "True" are the\n only Boolean objects. The Boolean type is a subtype of the\n integer type, and Boolean values behave like the values 0 and\n 1, respectively, in almost all contexts, the exception being\n that when converted to a string, the strings ""False"" or\n ""True"" are returned, respectively.\n\n The rules for integer representation are intended to give the\n most meaningful interpretation of shift and mask operations\n involving negative integers.\n\n "numbers.Real" ("float")\n These represent machine-level double precision floating point\n numbers. You are at the mercy of the underlying machine\n architecture (and C or Java implementation) for the accepted\n range and handling of overflow. Python does not support single-\n precision floating point numbers; the savings in processor and\n memory usage that are usually the reason for using these are\n dwarfed by the overhead of using objects in Python, so there is\n no reason to complicate the language with two kinds of floating\n point numbers.\n\n "numbers.Complex" ("complex")\n These represent complex numbers as a pair of machine-level\n double precision floating point numbers. The same caveats apply\n as for floating point numbers. The real and imaginary parts of a\n complex number "z" can be retrieved through the read-only\n attributes "z.real" and "z.imag".\n\nSequences\n These represent finite ordered sets indexed by non-negative\n numbers. The built-in function "len()" returns the number of items\n of a sequence. When the length of a sequence is *n*, the index set\n contains the numbers 0, 1, ..., *n*-1. Item *i* of sequence *a* is\n selected by "a[i]".\n\n Sequences also support slicing: "a[i:j]" selects all items with\n index *k* such that *i* "<=" *k* "<" *j*. When used as an\n expression, a slice is a sequence of the same type. This implies\n that the index set is renumbered so that it starts at 0.\n\n Some sequences also support "extended slicing" with a third "step"\n parameter: "a[i:j:k]" selects all items of *a* with index *x* where\n "x = i + n*k", *n* ">=" "0" and *i* "<=" *x* "<" *j*.\n\n Sequences are distinguished according to their mutability:\n\n Immutable sequences\n An object of an immutable sequence type cannot change once it is\n created. (If the object contains references to other objects,\n these other objects may be mutable and may be changed; however,\n the collection of objects directly referenced by an immutable\n object cannot change.)\n\n The following types are immutable sequences:\n\n Strings\n A string is a sequence of values that represent Unicode code\n points. All the code points in the range "U+0000 - U+10FFFF"\n can be represented in a string. Python doesn\'t have a "char"\n type; instead, every code point in the string is represented\n as a string object with length "1". The built-in function\n "ord()" converts a code point from its string form to an\n integer in the range "0 - 10FFFF"; "chr()" converts an\n integer in the range "0 - 10FFFF" to the corresponding length\n "1" string object. "str.encode()" can be used to convert a\n "str" to "bytes" using the given text encoding, and\n "bytes.decode()" can be used to achieve the opposite.\n\n Tuples\n The items of a tuple are arbitrary Python objects. Tuples of\n two or more items are formed by comma-separated lists of\n expressions. A tuple of one item (a \'singleton\') can be\n formed by affixing a comma to an expression (an expression by\n itself does not create a tuple, since parentheses must be\n usable for grouping of expressions). An empty tuple can be\n formed by an empty pair of parentheses.\n\n Bytes\n A bytes object is an immutable array. The items are 8-bit\n bytes, represented by integers in the range 0 <= x < 256.\n Bytes literals (like "b\'abc\'") and the built-in function\n "bytes()" can be used to construct bytes objects. Also,\n bytes objects can be decoded to strings via the "decode()"\n method.\n\n Mutable sequences\n Mutable sequences can be changed after they are created. The\n subscription and slicing notations can be used as the target of\n assignment and "del" (delete) statements.\n\n There are currently two intrinsic mutable sequence types:\n\n Lists\n The items of a list are arbitrary Python objects. Lists are\n formed by placing a comma-separated list of expressions in\n square brackets. (Note that there are no special cases needed\n to form lists of length 0 or 1.)\n\n Byte Arrays\n A bytearray object is a mutable array. They are created by\n the built-in "bytearray()" constructor. Aside from being\n mutable (and hence unhashable), byte arrays otherwise provide\n the same interface and functionality as immutable bytes\n objects.\n\n The extension module "array" provides an additional example of a\n mutable sequence type, as does the "collections" module.\n\nSet types\n These represent unordered, finite sets of unique, immutable\n objects. As such, they cannot be indexed by any subscript. However,\n they can be iterated over, and the built-in function "len()"\n returns the number of items in a set. Common uses for sets are fast\n membership testing, removing duplicates from a sequence, and\n computing mathematical operations such as intersection, union,\n difference, and symmetric difference.\n\n For set elements, the same immutability rules apply as for\n dictionary keys. Note that numeric types obey the normal rules for\n numeric comparison: if two numbers compare equal (e.g., "1" and\n "1.0"), only one of them can be contained in a set.\n\n There are currently two intrinsic set types:\n\n Sets\n These represent a mutable set. They are created by the built-in\n "set()" constructor and can be modified afterwards by several\n methods, such as "add()".\n\n Frozen sets\n These represent an immutable set. They are created by the\n built-in "frozenset()" constructor. As a frozenset is immutable\n and *hashable*, it can be used again as an element of another\n set, or as a dictionary key.\n\nMappings\n These represent finite sets of objects indexed by arbitrary index\n sets. The subscript notation "a[k]" selects the item indexed by "k"\n from the mapping "a"; this can be used in expressions and as the\n target of assignments or "del" statements. The built-in function\n "len()" returns the number of items in a mapping.\n\n There is currently a single intrinsic mapping type:\n\n Dictionaries\n These represent finite sets of objects indexed by nearly\n arbitrary values. The only types of values not acceptable as\n keys are values containing lists or dictionaries or other\n mutable types that are compared by value rather than by object\n identity, the reason being that the efficient implementation of\n dictionaries requires a key\'s hash value to remain constant.\n Numeric types used for keys obey the normal rules for numeric\n comparison: if two numbers compare equal (e.g., "1" and "1.0")\n then they can be used interchangeably to index the same\n dictionary entry.\n\n Dictionaries are mutable; they can be created by the "{...}"\n notation (see section *Dictionary displays*).\n\n The extension modules "dbm.ndbm" and "dbm.gnu" provide\n additional examples of mapping types, as does the "collections"\n module.\n\nCallable types\n These are the types to which the function call operation (see\n section *Calls*) can be applied:\n\n User-defined functions\n A user-defined function object is created by a function\n definition (see section *Function definitions*). It should be\n called with an argument list containing the same number of items\n as the function\'s formal parameter list.\n\n Special attributes:\n\n +---------------------------+---------------------------------+-------------+\n | Attribute | Meaning | |\n +===========================+=================================+=============+\n | "__doc__" | The function\'s documentation | Writable |\n | | string, or "None" if | |\n | | unavailable; not inherited by | |\n | | subclasses | |\n +---------------------------+---------------------------------+-------------+\n | "__name__" | The function\'s name | Writable |\n +---------------------------+---------------------------------+-------------+\n | "__qualname__" | The function\'s *qualified name* | Writable |\n | | New in version 3.3. | |\n +---------------------------+---------------------------------+-------------+\n | "__module__" | The name of the module the | Writable |\n | | function was defined in, or | |\n | | "None" if unavailable. | |\n +---------------------------+---------------------------------+-------------+\n | "__defaults__" | A tuple containing default | Writable |\n | | argument values for those | |\n | | arguments that have defaults, | |\n | | or "None" if no arguments have | |\n | | a default value | |\n +---------------------------+---------------------------------+-------------+\n | "__code__" | The code object representing | Writable |\n | | the compiled function body. | |\n +---------------------------+---------------------------------+-------------+\n | "__globals__" | A reference to the dictionary | Read-only |\n | | that holds the function\'s | |\n | | global variables --- the global | |\n | | namespace of the module in | |\n | | which the function was defined. | |\n +---------------------------+---------------------------------+-------------+\n | "__dict__" | The namespace supporting | Writable |\n | | arbitrary function attributes. | |\n +---------------------------+---------------------------------+-------------+\n | "__closure__" | "None" or a tuple of cells that | Read-only |\n | | contain bindings for the | |\n | | function\'s free variables. | |\n +---------------------------+---------------------------------+-------------+\n | "__annotations__" | A dict containing annotations | Writable |\n | | of parameters. The keys of the | |\n | | dict are the parameter names, | |\n | | and "\'return\'" for the return | |\n | | annotation, if provided. | |\n +---------------------------+---------------------------------+-------------+\n | "__kwdefaults__" | A dict containing defaults for | Writable |\n | | keyword-only parameters. | |\n +---------------------------+---------------------------------+-------------+\n\n Most of the attributes labelled "Writable" check the type of the\n assigned value.\n\n Function objects also support getting and setting arbitrary\n attributes, which can be used, for example, to attach metadata\n to functions. Regular attribute dot-notation is used to get and\n set such attributes. *Note that the current implementation only\n supports function attributes on user-defined functions. Function\n attributes on built-in functions may be supported in the\n future.*\n\n Additional information about a function\'s definition can be\n retrieved from its code object; see the description of internal\n types below.\n\n Instance methods\n An instance method object combines a class, a class instance and\n any callable object (normally a user-defined function).\n\n Special read-only attributes: "__self__" is the class instance\n object, "__func__" is the function object; "__doc__" is the\n method\'s documentation (same as "__func__.__doc__"); "__name__"\n is the method name (same as "__func__.__name__"); "__module__"\n is the name of the module the method was defined in, or "None"\n if unavailable.\n\n Methods also support accessing (but not setting) the arbitrary\n function attributes on the underlying function object.\n\n User-defined method objects may be created when getting an\n attribute of a class (perhaps via an instance of that class), if\n that attribute is a user-defined function object or a class\n method object.\n\n When an instance method object is created by retrieving a user-\n defined function object from a class via one of its instances,\n its "__self__" attribute is the instance, and the method object\n is said to be bound. The new method\'s "__func__" attribute is\n the original function object.\n\n When a user-defined method object is created by retrieving\n another method object from a class or instance, the behaviour is\n the same as for a function object, except that the "__func__"\n attribute of the new instance is not the original method object\n but its "__func__" attribute.\n\n When an instance method object is created by retrieving a class\n method object from a class or instance, its "__self__" attribute\n is the class itself, and its "__func__" attribute is the\n function object underlying the class method.\n\n When an instance method object is called, the underlying\n function ("__func__") is called, inserting the class instance\n ("__self__") in front of the argument list. For instance, when\n "C" is a class which contains a definition for a function "f()",\n and "x" is an instance of "C", calling "x.f(1)" is equivalent to\n calling "C.f(x, 1)".\n\n When an instance method object is derived from a class method\n object, the "class instance" stored in "__self__" will actually\n be the class itself, so that calling either "x.f(1)" or "C.f(1)"\n is equivalent to calling "f(C,1)" where "f" is the underlying\n function.\n\n Note that the transformation from function object to instance\n method object happens each time the attribute is retrieved from\n the instance. In some cases, a fruitful optimization is to\n assign the attribute to a local variable and call that local\n variable. Also notice that this transformation only happens for\n user-defined functions; other callable objects (and all non-\n callable objects) are retrieved without transformation. It is\n also important to note that user-defined functions which are\n attributes of a class instance are not converted to bound\n methods; this *only* happens when the function is an attribute\n of the class.\n\n Generator functions\n A function or method which uses the "yield" statement (see\n section *The yield statement*) is called a *generator function*.\n Such a function, when called, always returns an iterator object\n which can be used to execute the body of the function: calling\n the iterator\'s "iterator.__next__()" method will cause the\n function to execute until it provides a value using the "yield"\n statement. When the function executes a "return" statement or\n falls off the end, a "StopIteration" exception is raised and the\n iterator will have reached the end of the set of values to be\n returned.\n\n Coroutine functions\n A function or method which is defined using "async def" is\n called a *coroutine function*. Such a function, when called,\n returns a *coroutine* object. It may contain "await"\n expressions, as well as "async with" and "async for" statements.\n See also the *Coroutine Objects* section.\n\n Built-in functions\n A built-in function object is a wrapper around a C function.\n Examples of built-in functions are "len()" and "math.sin()"\n ("math" is a standard built-in module). The number and type of\n the arguments are determined by the C function. Special read-\n only attributes: "__doc__" is the function\'s documentation\n string, or "None" if unavailable; "__name__" is the function\'s\n name; "__self__" is set to "None" (but see the next item);\n "__module__" is the name of the module the function was defined\n in or "None" if unavailable.\n\n Built-in methods\n This is really a different disguise of a built-in function, this\n time containing an object passed to the C function as an\n implicit extra argument. An example of a built-in method is\n "alist.append()", assuming *alist* is a list object. In this\n case, the special read-only attribute "__self__" is set to the\n object denoted by *alist*.\n\n Classes\n Classes are callable. These objects normally act as factories\n for new instances of themselves, but variations are possible for\n class types that override "__new__()". The arguments of the\n call are passed to "__new__()" and, in the typical case, to\n "__init__()" to initialize the new instance.\n\n Class Instances\n Instances of arbitrary classes can be made callable by defining\n a "__call__()" method in their class.\n\nModules\n Modules are a basic organizational unit of Python code, and are\n created by the *import system* as invoked either by the "import"\n statement (see "import"), or by calling functions such as\n "importlib.import_module()" and built-in "__import__()". A module\n object has a namespace implemented by a dictionary object (this is\n the dictionary referenced by the "__globals__" attribute of\n functions defined in the module). Attribute references are\n translated to lookups in this dictionary, e.g., "m.x" is equivalent\n to "m.__dict__["x"]". A module object does not contain the code\n object used to initialize the module (since it isn\'t needed once\n the initialization is done).\n\n Attribute assignment updates the module\'s namespace dictionary,\n e.g., "m.x = 1" is equivalent to "m.__dict__["x"] = 1".\n\n Special read-only attribute: "__dict__" is the module\'s namespace\n as a dictionary object.\n\n **CPython implementation detail:** Because of the way CPython\n clears module dictionaries, the module dictionary will be cleared\n when the module falls out of scope even if the dictionary still has\n live references. To avoid this, copy the dictionary or keep the\n module around while using its dictionary directly.\n\n Predefined (writable) attributes: "__name__" is the module\'s name;\n "__doc__" is the module\'s documentation string, or "None" if\n unavailable; "__file__" is the pathname of the file from which the\n module was loaded, if it was loaded from a file. The "__file__"\n attribute may be missing for certain types of modules, such as C\n modules that are statically linked into the interpreter; for\n extension modules loaded dynamically from a shared library, it is\n the pathname of the shared library file.\n\nCustom classes\n Custom class types are typically created by class definitions (see\n section *Class definitions*). A class has a namespace implemented\n by a dictionary object. Class attribute references are translated\n to lookups in this dictionary, e.g., "C.x" is translated to\n "C.__dict__["x"]" (although there are a number of hooks which allow\n for other means of locating attributes). When the attribute name is\n not found there, the attribute search continues in the base\n classes. This search of the base classes uses the C3 method\n resolution order which behaves correctly even in the presence of\n \'diamond\' inheritance structures where there are multiple\n inheritance paths leading back to a common ancestor. Additional\n details on the C3 MRO used by Python can be found in the\n documentation accompanying the 2.3 release at\n https://www.python.org/download/releases/2.3/mro/.\n\n When a class attribute reference (for class "C", say) would yield a\n class method object, it is transformed into an instance method\n object whose "__self__" attributes is "C". When it would yield a\n static method object, it is transformed into the object wrapped by\n the static method object. See section *Implementing Descriptors*\n for another way in which attributes retrieved from a class may\n differ from those actually contained in its "__dict__".\n\n Class attribute assignments update the class\'s dictionary, never\n the dictionary of a base class.\n\n A class object can be called (see above) to yield a class instance\n (see below).\n\n Special attributes: "__name__" is the class name; "__module__" is\n the module name in which the class was defined; "__dict__" is the\n dictionary containing the class\'s namespace; "__bases__" is a tuple\n containing the base classes, in the order of their occurrence in\n the base class list; "__doc__" is the class\'s documentation string,\n or "None" if undefined.\n\nClass instances\n A class instance is created by calling a class object (see above).\n A class instance has a namespace implemented as a dictionary which\n is the first place in which attribute references are searched.\n When an attribute is not found there, and the instance\'s class has\n an attribute by that name, the search continues with the class\n attributes. If a class attribute is found that is a user-defined\n function object, it is transformed into an instance method object\n whose "__self__" attribute is the instance. Static method and\n class method objects are also transformed; see above under\n "Classes". See section *Implementing Descriptors* for another way\n in which attributes of a class retrieved via its instances may\n differ from the objects actually stored in the class\'s "__dict__".\n If no class attribute is found, and the object\'s class has a\n "__getattr__()" method, that is called to satisfy the lookup.\n\n Attribute assignments and deletions update the instance\'s\n dictionary, never a class\'s dictionary. If the class has a\n "__setattr__()" or "__delattr__()" method, this is called instead\n of updating the instance dictionary directly.\n\n Class instances can pretend to be numbers, sequences, or mappings\n if they have methods with certain special names. See section\n *Special method names*.\n\n Special attributes: "__dict__" is the attribute dictionary;\n "__class__" is the instance\'s class.\n\nI/O objects (also known as file objects)\n A *file object* represents an open file. Various shortcuts are\n available to create file objects: the "open()" built-in function,\n and also "os.popen()", "os.fdopen()", and the "makefile()" method\n of socket objects (and perhaps by other functions or methods\n provided by extension modules).\n\n The objects "sys.stdin", "sys.stdout" and "sys.stderr" are\n initialized to file objects corresponding to the interpreter\'s\n standard input, output and error streams; they are all open in text\n mode and therefore follow the interface defined by the\n "io.TextIOBase" abstract class.\n\nInternal types\n A few types used internally by the interpreter are exposed to the\n user. Their definitions may change with future versions of the\n interpreter, but they are mentioned here for completeness.\n\n Code objects\n Code objects represent *byte-compiled* executable Python code,\n or *bytecode*. The difference between a code object and a\n function object is that the function object contains an explicit\n reference to the function\'s globals (the module in which it was\n defined), while a code object contains no context; also the\n default argument values are stored in the function object, not\n in the code object (because they represent values calculated at\n run-time). Unlike function objects, code objects are immutable\n and contain no references (directly or indirectly) to mutable\n objects.\n\n Special read-only attributes: "co_name" gives the function name;\n "co_argcount" is the number of positional arguments (including\n arguments with default values); "co_nlocals" is the number of\n local variables used by the function (including arguments);\n "co_varnames" is a tuple containing the names of the local\n variables (starting with the argument names); "co_cellvars" is a\n tuple containing the names of local variables that are\n referenced by nested functions; "co_freevars" is a tuple\n containing the names of free variables; "co_code" is a string\n representing the sequence of bytecode instructions; "co_consts"\n is a tuple containing the literals used by the bytecode;\n "co_names" is a tuple containing the names used by the bytecode;\n "co_filename" is the filename from which the code was compiled;\n "co_firstlineno" is the first line number of the function;\n "co_lnotab" is a string encoding the mapping from bytecode\n offsets to line numbers (for details see the source code of the\n interpreter); "co_stacksize" is the required stack size\n (including local variables); "co_flags" is an integer encoding a\n number of flags for the interpreter.\n\n The following flag bits are defined for "co_flags": bit "0x04"\n is set if the function uses the "*arguments" syntax to accept an\n arbitrary number of positional arguments; bit "0x08" is set if\n the function uses the "**keywords" syntax to accept arbitrary\n keyword arguments; bit "0x20" is set if the function is a\n generator.\n\n Future feature declarations ("from __future__ import division")\n also use bits in "co_flags" to indicate whether a code object\n was compiled with a particular feature enabled: bit "0x2000" is\n set if the function was compiled with future division enabled;\n bits "0x10" and "0x1000" were used in earlier versions of\n Python.\n\n Other bits in "co_flags" are reserved for internal use.\n\n If a code object represents a function, the first item in\n "co_consts" is the documentation string of the function, or\n "None" if undefined.\n\n Frame objects\n Frame objects represent execution frames. They may occur in\n traceback objects (see below).\n\n Special read-only attributes: "f_back" is to the previous stack\n frame (towards the caller), or "None" if this is the bottom\n stack frame; "f_code" is the code object being executed in this\n frame; "f_locals" is the dictionary used to look up local\n variables; "f_globals" is used for global variables;\n "f_builtins" is used for built-in (intrinsic) names; "f_lasti"\n gives the precise instruction (this is an index into the\n bytecode string of the code object).\n\n Special writable attributes: "f_trace", if not "None", is a\n function called at the start of each source code line (this is\n used by the debugger); "f_lineno" is the current line number of\n the frame --- writing to this from within a trace function jumps\n to the given line (only for the bottom-most frame). A debugger\n can implement a Jump command (aka Set Next Statement) by writing\n to f_lineno.\n\n Frame objects support one method:\n\n frame.clear()\n\n This method clears all references to local variables held by\n the frame. Also, if the frame belonged to a generator, the\n generator is finalized. This helps break reference cycles\n involving frame objects (for example when catching an\n exception and storing its traceback for later use).\n\n "RuntimeError" is raised if the frame is currently executing.\n\n New in version 3.4.\n\n Traceback objects\n Traceback objects represent a stack trace of an exception. A\n traceback object is created when an exception occurs. When the\n search for an exception handler unwinds the execution stack, at\n each unwound level a traceback object is inserted in front of\n the current traceback. When an exception handler is entered,\n the stack trace is made available to the program. (See section\n *The try statement*.) It is accessible as the third item of the\n tuple returned by "sys.exc_info()". When the program contains no\n suitable handler, the stack trace is written (nicely formatted)\n to the standard error stream; if the interpreter is interactive,\n it is also made available to the user as "sys.last_traceback".\n\n Special read-only attributes: "tb_next" is the next level in the\n stack trace (towards the frame where the exception occurred), or\n "None" if there is no next level; "tb_frame" points to the\n execution frame of the current level; "tb_lineno" gives the line\n number where the exception occurred; "tb_lasti" indicates the\n precise instruction. The line number and last instruction in\n the traceback may differ from the line number of its frame\n object if the exception occurred in a "try" statement with no\n matching except clause or with a finally clause.\n\n Slice objects\n Slice objects are used to represent slices for "__getitem__()"\n methods. They are also created by the built-in "slice()"\n function.\n\n Special read-only attributes: "start" is the lower bound; "stop"\n is the upper bound; "step" is the step value; each is "None" if\n omitted. These attributes can have any type.\n\n Slice objects support one method:\n\n slice.indices(self, length)\n\n This method takes a single integer argument *length* and\n computes information about the slice that the slice object\n would describe if applied to a sequence of *length* items.\n It returns a tuple of three integers; respectively these are\n the *start* and *stop* indices and the *step* or stride\n length of the slice. Missing or out-of-bounds indices are\n handled in a manner consistent with regular slices.\n\n Static method objects\n Static method objects provide a way of defeating the\n transformation of function objects to method objects described\n above. A static method object is a wrapper around any other\n object, usually a user-defined method object. When a static\n method object is retrieved from a class or a class instance, the\n object actually returned is the wrapped object, which is not\n subject to any further transformation. Static method objects are\n not themselves callable, although the objects they wrap usually\n are. Static method objects are created by the built-in\n "staticmethod()" constructor.\n\n Class method objects\n A class method object, like a static method object, is a wrapper\n around another object that alters the way in which that object\n is retrieved from classes and class instances. The behaviour of\n class method objects upon such retrieval is described above,\n under "User-defined methods". Class method objects are created\n by the built-in "classmethod()" constructor.\n', - 'typesfunctions': u'\nFunctions\n*********\n\nFunction objects are created by function definitions. The only\noperation on a function object is to call it: "func(argument-list)".\n\nThere are really two flavors of function objects: built-in functions\nand user-defined functions. Both support the same operation (to call\nthe function), but the implementation is different, hence the\ndifferent object types.\n\nSee *Function definitions* for more information.\n', - 'typesmapping': u'\nMapping Types --- "dict"\n************************\n\nA *mapping* object maps *hashable* values to arbitrary objects.\nMappings are mutable objects. There is currently only one standard\nmapping type, the *dictionary*. (For other containers see the built-\nin "list", "set", and "tuple" classes, and the "collections" module.)\n\nA dictionary\'s keys are *almost* arbitrary values. Values that are\nnot *hashable*, that is, values containing lists, dictionaries or\nother mutable types (that are compared by value rather than by object\nidentity) may not be used as keys. Numeric types used for keys obey\nthe normal rules for numeric comparison: if two numbers compare equal\n(such as "1" and "1.0") then they can be used interchangeably to index\nthe same dictionary entry. (Note however, that since computers store\nfloating-point numbers as approximations it is usually unwise to use\nthem as dictionary keys.)\n\nDictionaries can be created by placing a comma-separated list of "key:\nvalue" pairs within braces, for example: "{\'jack\': 4098, \'sjoerd\':\n4127}" or "{4098: \'jack\', 4127: \'sjoerd\'}", or by the "dict"\nconstructor.\n\nclass class dict(**kwarg)\nclass class dict(mapping, **kwarg)\nclass class dict(iterable, **kwarg)\n\n Return a new dictionary initialized from an optional positional\n argument and a possibly empty set of keyword arguments.\n\n If no positional argument is given, an empty dictionary is created.\n If a positional argument is given and it is a mapping object, a\n dictionary is created with the same key-value pairs as the mapping\n object. Otherwise, the positional argument must be an *iterable*\n object. Each item in the iterable must itself be an iterable with\n exactly two objects. The first object of each item becomes a key\n in the new dictionary, and the second object the corresponding\n value. If a key occurs more than once, the last value for that key\n becomes the corresponding value in the new dictionary.\n\n If keyword arguments are given, the keyword arguments and their\n values are added to the dictionary created from the positional\n argument. If a key being added is already present, the value from\n the keyword argument replaces the value from the positional\n argument.\n\n To illustrate, the following examples all return a dictionary equal\n to "{"one": 1, "two": 2, "three": 3}":\n\n >>> a = dict(one=1, two=2, three=3)\n >>> b = {\'one\': 1, \'two\': 2, \'three\': 3}\n >>> c = dict(zip([\'one\', \'two\', \'three\'], [1, 2, 3]))\n >>> d = dict([(\'two\', 2), (\'one\', 1), (\'three\', 3)])\n >>> e = dict({\'three\': 3, \'one\': 1, \'two\': 2})\n >>> a == b == c == d == e\n True\n\n Providing keyword arguments as in the first example only works for\n keys that are valid Python identifiers. Otherwise, any valid keys\n can be used.\n\n These are the operations that dictionaries support (and therefore,\n custom mapping types should support too):\n\n len(d)\n\n Return the number of items in the dictionary *d*.\n\n d[key]\n\n Return the item of *d* with key *key*. Raises a "KeyError" if\n *key* is not in the map.\n\n If a subclass of dict defines a method "__missing__()" and *key*\n is not present, the "d[key]" operation calls that method with\n the key *key* as argument. The "d[key]" operation then returns\n or raises whatever is returned or raised by the\n "__missing__(key)" call. No other operations or methods invoke\n "__missing__()". If "__missing__()" is not defined, "KeyError"\n is raised. "__missing__()" must be a method; it cannot be an\n instance variable:\n\n >>> class Counter(dict):\n ... def __missing__(self, key):\n ... return 0\n >>> c = Counter()\n >>> c[\'red\']\n 0\n >>> c[\'red\'] += 1\n >>> c[\'red\']\n 1\n\n The example above shows part of the implementation of\n "collections.Counter". A different "__missing__" method is used\n by "collections.defaultdict".\n\n d[key] = value\n\n Set "d[key]" to *value*.\n\n del d[key]\n\n Remove "d[key]" from *d*. Raises a "KeyError" if *key* is not\n in the map.\n\n key in d\n\n Return "True" if *d* has a key *key*, else "False".\n\n key not in d\n\n Equivalent to "not key in d".\n\n iter(d)\n\n Return an iterator over the keys of the dictionary. This is a\n shortcut for "iter(d.keys())".\n\n clear()\n\n Remove all items from the dictionary.\n\n copy()\n\n Return a shallow copy of the dictionary.\n\n classmethod fromkeys(seq[, value])\n\n Create a new dictionary with keys from *seq* and values set to\n *value*.\n\n "fromkeys()" is a class method that returns a new dictionary.\n *value* defaults to "None".\n\n get(key[, default])\n\n Return the value for *key* if *key* is in the dictionary, else\n *default*. If *default* is not given, it defaults to "None", so\n that this method never raises a "KeyError".\n\n items()\n\n Return a new view of the dictionary\'s items ("(key, value)"\n pairs). See the *documentation of view objects*.\n\n keys()\n\n Return a new view of the dictionary\'s keys. See the\n *documentation of view objects*.\n\n pop(key[, default])\n\n If *key* is in the dictionary, remove it and return its value,\n else return *default*. If *default* is not given and *key* is\n not in the dictionary, a "KeyError" is raised.\n\n popitem()\n\n Remove and return an arbitrary "(key, value)" pair from the\n dictionary.\n\n "popitem()" is useful to destructively iterate over a\n dictionary, as often used in set algorithms. If the dictionary\n is empty, calling "popitem()" raises a "KeyError".\n\n setdefault(key[, default])\n\n If *key* is in the dictionary, return its value. If not, insert\n *key* with a value of *default* and return *default*. *default*\n defaults to "None".\n\n update([other])\n\n Update the dictionary with the key/value pairs from *other*,\n overwriting existing keys. Return "None".\n\n "update()" accepts either another dictionary object or an\n iterable of key/value pairs (as tuples or other iterables of\n length two). If keyword arguments are specified, the dictionary\n is then updated with those key/value pairs: "d.update(red=1,\n blue=2)".\n\n values()\n\n Return a new view of the dictionary\'s values. See the\n *documentation of view objects*.\n\n Dictionaries compare equal if and only if they have the same "(key,\n value)" pairs. Order comparisons (\'<\', \'<=\', \'>=\', \'>\') raise\n "TypeError".\n\nSee also: "types.MappingProxyType" can be used to create a read-only\n view of a "dict".\n\n\nDictionary view objects\n=======================\n\nThe objects returned by "dict.keys()", "dict.values()" and\n"dict.items()" are *view objects*. They provide a dynamic view on the\ndictionary\'s entries, which means that when the dictionary changes,\nthe view reflects these changes.\n\nDictionary views can be iterated over to yield their respective data,\nand support membership tests:\n\nlen(dictview)\n\n Return the number of entries in the dictionary.\n\niter(dictview)\n\n Return an iterator over the keys, values or items (represented as\n tuples of "(key, value)") in the dictionary.\n\n Keys and values are iterated over in an arbitrary order which is\n non-random, varies across Python implementations, and depends on\n the dictionary\'s history of insertions and deletions. If keys,\n values and items views are iterated over with no intervening\n modifications to the dictionary, the order of items will directly\n correspond. This allows the creation of "(value, key)" pairs using\n "zip()": "pairs = zip(d.values(), d.keys())". Another way to\n create the same list is "pairs = [(v, k) for (k, v) in d.items()]".\n\n Iterating views while adding or deleting entries in the dictionary\n may raise a "RuntimeError" or fail to iterate over all entries.\n\nx in dictview\n\n Return "True" if *x* is in the underlying dictionary\'s keys, values\n or items (in the latter case, *x* should be a "(key, value)"\n tuple).\n\nKeys views are set-like since their entries are unique and hashable.\nIf all values are hashable, so that "(key, value)" pairs are unique\nand hashable, then the items view is also set-like. (Values views are\nnot treated as set-like since the entries are generally not unique.)\nFor set-like views, all of the operations defined for the abstract\nbase class "collections.abc.Set" are available (for example, "==",\n"<", or "^").\n\nAn example of dictionary view usage:\n\n >>> dishes = {\'eggs\': 2, \'sausage\': 1, \'bacon\': 1, \'spam\': 500}\n >>> keys = dishes.keys()\n >>> values = dishes.values()\n\n >>> # iteration\n >>> n = 0\n >>> for val in values:\n ... n += val\n >>> print(n)\n 504\n\n >>> # keys and values are iterated over in the same order\n >>> list(keys)\n [\'eggs\', \'bacon\', \'sausage\', \'spam\']\n >>> list(values)\n [2, 1, 1, 500]\n\n >>> # view objects are dynamic and reflect dict changes\n >>> del dishes[\'eggs\']\n >>> del dishes[\'sausage\']\n >>> list(keys)\n [\'spam\', \'bacon\']\n\n >>> # set operations\n >>> keys & {\'eggs\', \'bacon\', \'salad\'}\n {\'bacon\'}\n >>> keys ^ {\'sausage\', \'juice\'}\n {\'juice\', \'sausage\', \'bacon\', \'spam\'}\n', - 'typesmethods': u'\nMethods\n*******\n\nMethods are functions that are called using the attribute notation.\nThere are two flavors: built-in methods (such as "append()" on lists)\nand class instance methods. Built-in methods are described with the\ntypes that support them.\n\nIf you access a method (a function defined in a class namespace)\nthrough an instance, you get a special object: a *bound method* (also\ncalled *instance method*) object. When called, it will add the "self"\nargument to the argument list. Bound methods have two special read-\nonly attributes: "m.__self__" is the object on which the method\noperates, and "m.__func__" is the function implementing the method.\nCalling "m(arg-1, arg-2, ..., arg-n)" is completely equivalent to\ncalling "m.__func__(m.__self__, arg-1, arg-2, ..., arg-n)".\n\nLike function objects, bound method objects support getting arbitrary\nattributes. However, since method attributes are actually stored on\nthe underlying function object ("meth.__func__"), setting method\nattributes on bound methods is disallowed. Attempting to set an\nattribute on a method results in an "AttributeError" being raised. In\norder to set a method attribute, you need to explicitly set it on the\nunderlying function object:\n\n >>> class C:\n ... def method(self):\n ... pass\n ...\n >>> c = C()\n >>> c.method.whoami = \'my name is method\' # can\'t set on the method\n Traceback (most recent call last):\n File "", line 1, in \n AttributeError: \'method\' object has no attribute \'whoami\'\n >>> c.method.__func__.whoami = \'my name is method\'\n >>> c.method.whoami\n \'my name is method\'\n\nSee *The standard type hierarchy* for more information.\n', - 'typesmodules': u'\nModules\n*******\n\nThe only special operation on a module is attribute access: "m.name",\nwhere *m* is a module and *name* accesses a name defined in *m*\'s\nsymbol table. Module attributes can be assigned to. (Note that the\n"import" statement is not, strictly speaking, an operation on a module\nobject; "import foo" does not require a module object named *foo* to\nexist, rather it requires an (external) *definition* for a module\nnamed *foo* somewhere.)\n\nA special attribute of every module is "__dict__". This is the\ndictionary containing the module\'s symbol table. Modifying this\ndictionary will actually change the module\'s symbol table, but direct\nassignment to the "__dict__" attribute is not possible (you can write\n"m.__dict__[\'a\'] = 1", which defines "m.a" to be "1", but you can\'t\nwrite "m.__dict__ = {}"). Modifying "__dict__" directly is not\nrecommended.\n\nModules built into the interpreter are written like this: "". If loaded from a file, they are written as\n"".\n', - 'typesseq': u'\nSequence Types --- "list", "tuple", "range"\n*******************************************\n\nThere are three basic sequence types: lists, tuples, and range\nobjects. Additional sequence types tailored for processing of *binary\ndata* and *text strings* are described in dedicated sections.\n\n\nCommon Sequence Operations\n==========================\n\nThe operations in the following table are supported by most sequence\ntypes, both mutable and immutable. The "collections.abc.Sequence" ABC\nis provided to make it easier to correctly implement these operations\non custom sequence types.\n\nThis table lists the sequence operations sorted in ascending priority.\nIn the table, *s* and *t* are sequences of the same type, *n*, *i*,\n*j* and *k* are integers and *x* is an arbitrary object that meets any\ntype and value restrictions imposed by *s*.\n\nThe "in" and "not in" operations have the same priorities as the\ncomparison operations. The "+" (concatenation) and "*" (repetition)\noperations have the same priority as the corresponding numeric\noperations. [3]\n\n+----------------------------+----------------------------------+------------+\n| Operation | Result | Notes |\n+============================+==================================+============+\n| "x in s" | "True" if an item of *s* is | (1) |\n| | equal to *x*, else "False" | |\n+----------------------------+----------------------------------+------------+\n| "x not in s" | "False" if an item of *s* is | (1) |\n| | equal to *x*, else "True" | |\n+----------------------------+----------------------------------+------------+\n| "s + t" | the concatenation of *s* and *t* | (6)(7) |\n+----------------------------+----------------------------------+------------+\n| "s * n" or "n * s" | equivalent to adding *s* to | (2)(7) |\n| | itself *n* times | |\n+----------------------------+----------------------------------+------------+\n| "s[i]" | *i*th item of *s*, origin 0 | (3) |\n+----------------------------+----------------------------------+------------+\n| "s[i:j]" | slice of *s* from *i* to *j* | (3)(4) |\n+----------------------------+----------------------------------+------------+\n| "s[i:j:k]" | slice of *s* from *i* to *j* | (3)(5) |\n| | with step *k* | |\n+----------------------------+----------------------------------+------------+\n| "len(s)" | length of *s* | |\n+----------------------------+----------------------------------+------------+\n| "min(s)" | smallest item of *s* | |\n+----------------------------+----------------------------------+------------+\n| "max(s)" | largest item of *s* | |\n+----------------------------+----------------------------------+------------+\n| "s.index(x[, i[, j]])" | index of the first occurrence of | (8) |\n| | *x* in *s* (at or after index | |\n| | *i* and before index *j*) | |\n+----------------------------+----------------------------------+------------+\n| "s.count(x)" | total number of occurrences of | |\n| | *x* in *s* | |\n+----------------------------+----------------------------------+------------+\n\nSequences of the same type also support comparisons. In particular,\ntuples and lists are compared lexicographically by comparing\ncorresponding elements. This means that to compare equal, every\nelement must compare equal and the two sequences must be of the same\ntype and have the same length. (For full details see *Comparisons* in\nthe language reference.)\n\nNotes:\n\n1. While the "in" and "not in" operations are used only for simple\n containment testing in the general case, some specialised sequences\n (such as "str", "bytes" and "bytearray") also use them for\n subsequence testing:\n\n >>> "gg" in "eggs"\n True\n\n2. Values of *n* less than "0" are treated as "0" (which yields an\n empty sequence of the same type as *s*). Note that items in the\n sequence *s* are not copied; they are referenced multiple times.\n This often haunts new Python programmers; consider:\n\n >>> lists = [[]] * 3\n >>> lists\n [[], [], []]\n >>> lists[0].append(3)\n >>> lists\n [[3], [3], [3]]\n\n What has happened is that "[[]]" is a one-element list containing\n an empty list, so all three elements of "[[]] * 3" are references\n to this single empty list. Modifying any of the elements of\n "lists" modifies this single list. You can create a list of\n different lists this way:\n\n >>> lists = [[] for i in range(3)]\n >>> lists[0].append(3)\n >>> lists[1].append(5)\n >>> lists[2].append(7)\n >>> lists\n [[3], [5], [7]]\n\n Further explanation is available in the FAQ entry *How do I create\n a multidimensional list?*.\n\n3. If *i* or *j* is negative, the index is relative to the end of\n sequence *s*: "len(s) + i" or "len(s) + j" is substituted. But\n note that "-0" is still "0".\n\n4. The slice of *s* from *i* to *j* is defined as the sequence of\n items with index *k* such that "i <= k < j". If *i* or *j* is\n greater than "len(s)", use "len(s)". If *i* is omitted or "None",\n use "0". If *j* is omitted or "None", use "len(s)". If *i* is\n greater than or equal to *j*, the slice is empty.\n\n5. The slice of *s* from *i* to *j* with step *k* is defined as the\n sequence of items with index "x = i + n*k" such that "0 <= n <\n (j-i)/k". In other words, the indices are "i", "i+k", "i+2*k",\n "i+3*k" and so on, stopping when *j* is reached (but never\n including *j*). When *k* is positive, *i* and *j* are reduced to\n "len(s)" if they are greater. When *k* is negative, *i* and *j* are\n reduced to "len(s) - 1" if they are greater. If *i* or *j* are\n omitted or "None", they become "end" values (which end depends on\n the sign of *k*). Note, *k* cannot be zero. If *k* is "None", it\n is treated like "1".\n\n6. Concatenating immutable sequences always results in a new\n object. This means that building up a sequence by repeated\n concatenation will have a quadratic runtime cost in the total\n sequence length. To get a linear runtime cost, you must switch to\n one of the alternatives below:\n\n * if concatenating "str" objects, you can build a list and use\n "str.join()" at the end or else write to an "io.StringIO"\n instance and retrieve its value when complete\n\n * if concatenating "bytes" objects, you can similarly use\n "bytes.join()" or "io.BytesIO", or you can do in-place\n concatenation with a "bytearray" object. "bytearray" objects are\n mutable and have an efficient overallocation mechanism\n\n * if concatenating "tuple" objects, extend a "list" instead\n\n * for other types, investigate the relevant class documentation\n\n7. Some sequence types (such as "range") only support item\n sequences that follow specific patterns, and hence don\'t support\n sequence concatenation or repetition.\n\n8. "index" raises "ValueError" when *x* is not found in *s*. When\n supported, the additional arguments to the index method allow\n efficient searching of subsections of the sequence. Passing the\n extra arguments is roughly equivalent to using "s[i:j].index(x)",\n only without copying any data and with the returned index being\n relative to the start of the sequence rather than the start of the\n slice.\n\n\nImmutable Sequence Types\n========================\n\nThe only operation that immutable sequence types generally implement\nthat is not also implemented by mutable sequence types is support for\nthe "hash()" built-in.\n\nThis support allows immutable sequences, such as "tuple" instances, to\nbe used as "dict" keys and stored in "set" and "frozenset" instances.\n\nAttempting to hash an immutable sequence that contains unhashable\nvalues will result in "TypeError".\n\n\nMutable Sequence Types\n======================\n\nThe operations in the following table are defined on mutable sequence\ntypes. The "collections.abc.MutableSequence" ABC is provided to make\nit easier to correctly implement these operations on custom sequence\ntypes.\n\nIn the table *s* is an instance of a mutable sequence type, *t* is any\niterable object and *x* is an arbitrary object that meets any type and\nvalue restrictions imposed by *s* (for example, "bytearray" only\naccepts integers that meet the value restriction "0 <= x <= 255").\n\n+--------------------------------+----------------------------------+-----------------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| "s[i] = x" | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s[i:j] = t" | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "del s[i:j]" | same as "s[i:j] = []" | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s[i:j:k] = t" | the elements of "s[i:j:k]" are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "del s[i:j:k]" | removes the elements of | |\n| | "s[i:j:k]" from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.append(x)" | appends *x* to the end of the | |\n| | sequence (same as | |\n| | "s[len(s):len(s)] = [x]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.clear()" | removes all items from "s" (same | (5) |\n| | as "del s[:]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.copy()" | creates a shallow copy of "s" | (5) |\n| | (same as "s[:]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.extend(t)" or "s += t" | extends *s* with the contents of | |\n| | *t* (for the most part the same | |\n| | as "s[len(s):len(s)] = t") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s *= n" | updates *s* with its contents | (6) |\n| | repeated *n* times | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.insert(i, x)" | inserts *x* into *s* at the | |\n| | index given by *i* (same as | |\n| | "s[i:i] = [x]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.pop([i])" | retrieves the item at *i* and | (2) |\n| | also removes it from *s* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.remove(x)" | remove the first item from *s* | (3) |\n| | where "s[i] == x" | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.reverse()" | reverses the items of *s* in | (4) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same length as the slice it is replacing.\n\n2. The optional argument *i* defaults to "-1", so that by default\n the last item is removed and returned.\n\n3. "remove" raises "ValueError" when *x* is not found in *s*.\n\n4. The "reverse()" method modifies the sequence in place for\n economy of space when reversing a large sequence. To remind users\n that it operates by side effect, it does not return the reversed\n sequence.\n\n5. "clear()" and "copy()" are included for consistency with the\n interfaces of mutable containers that don\'t support slicing\n operations (such as "dict" and "set")\n\n New in version 3.3: "clear()" and "copy()" methods.\n\n6. The value *n* is an integer, or an object implementing\n "__index__()". Zero and negative values of *n* clear the sequence.\n Items in the sequence are not copied; they are referenced multiple\n times, as explained for "s * n" under *Common Sequence Operations*.\n\n\nLists\n=====\n\nLists are mutable sequences, typically used to store collections of\nhomogeneous items (where the precise degree of similarity will vary by\napplication).\n\nclass class list([iterable])\n\n Lists may be constructed in several ways:\n\n * Using a pair of square brackets to denote the empty list: "[]"\n\n * Using square brackets, separating items with commas: "[a]",\n "[a, b, c]"\n\n * Using a list comprehension: "[x for x in iterable]"\n\n * Using the type constructor: "list()" or "list(iterable)"\n\n The constructor builds a list whose items are the same and in the\n same order as *iterable*\'s items. *iterable* may be either a\n sequence, a container that supports iteration, or an iterator\n object. If *iterable* is already a list, a copy is made and\n returned, similar to "iterable[:]". For example, "list(\'abc\')"\n returns "[\'a\', \'b\', \'c\']" and "list( (1, 2, 3) )" returns "[1, 2,\n 3]". If no argument is given, the constructor creates a new empty\n list, "[]".\n\n Many other operations also produce lists, including the "sorted()"\n built-in.\n\n Lists implement all of the *common* and *mutable* sequence\n operations. Lists also provide the following additional method:\n\n sort(*, key=None, reverse=None)\n\n This method sorts the list in place, using only "<" comparisons\n between items. Exceptions are not suppressed - if any comparison\n operations fail, the entire sort operation will fail (and the\n list will likely be left in a partially modified state).\n\n "sort()" accepts two arguments that can only be passed by\n keyword (*keyword-only arguments*):\n\n *key* specifies a function of one argument that is used to\n extract a comparison key from each list element (for example,\n "key=str.lower"). The key corresponding to each item in the list\n is calculated once and then used for the entire sorting process.\n The default value of "None" means that list items are sorted\n directly without calculating a separate key value.\n\n The "functools.cmp_to_key()" utility is available to convert a\n 2.x style *cmp* function to a *key* function.\n\n *reverse* is a boolean value. If set to "True", then the list\n elements are sorted as if each comparison were reversed.\n\n This method modifies the sequence in place for economy of space\n when sorting a large sequence. To remind users that it operates\n by side effect, it does not return the sorted sequence (use\n "sorted()" to explicitly request a new sorted list instance).\n\n The "sort()" method is guaranteed to be stable. A sort is\n stable if it guarantees not to change the relative order of\n elements that compare equal --- this is helpful for sorting in\n multiple passes (for example, sort by department, then by salary\n grade).\n\n **CPython implementation detail:** While a list is being sorted,\n the effect of attempting to mutate, or even inspect, the list is\n undefined. The C implementation of Python makes the list appear\n empty for the duration, and raises "ValueError" if it can detect\n that the list has been mutated during a sort.\n\n\nTuples\n======\n\nTuples are immutable sequences, typically used to store collections of\nheterogeneous data (such as the 2-tuples produced by the "enumerate()"\nbuilt-in). Tuples are also used for cases where an immutable sequence\nof homogeneous data is needed (such as allowing storage in a "set" or\n"dict" instance).\n\nclass class tuple([iterable])\n\n Tuples may be constructed in a number of ways:\n\n * Using a pair of parentheses to denote the empty tuple: "()"\n\n * Using a trailing comma for a singleton tuple: "a," or "(a,)"\n\n * Separating items with commas: "a, b, c" or "(a, b, c)"\n\n * Using the "tuple()" built-in: "tuple()" or "tuple(iterable)"\n\n The constructor builds a tuple whose items are the same and in the\n same order as *iterable*\'s items. *iterable* may be either a\n sequence, a container that supports iteration, or an iterator\n object. If *iterable* is already a tuple, it is returned\n unchanged. For example, "tuple(\'abc\')" returns "(\'a\', \'b\', \'c\')"\n and "tuple( [1, 2, 3] )" returns "(1, 2, 3)". If no argument is\n given, the constructor creates a new empty tuple, "()".\n\n Note that it is actually the comma which makes a tuple, not the\n parentheses. The parentheses are optional, except in the empty\n tuple case, or when they are needed to avoid syntactic ambiguity.\n For example, "f(a, b, c)" is a function call with three arguments,\n while "f((a, b, c))" is a function call with a 3-tuple as the sole\n argument.\n\n Tuples implement all of the *common* sequence operations.\n\nFor heterogeneous collections of data where access by name is clearer\nthan access by index, "collections.namedtuple()" may be a more\nappropriate choice than a simple tuple object.\n\n\nRanges\n======\n\nThe "range" type represents an immutable sequence of numbers and is\ncommonly used for looping a specific number of times in "for" loops.\n\nclass class range(stop)\nclass class range(start, stop[, step])\n\n The arguments to the range constructor must be integers (either\n built-in "int" or any object that implements the "__index__"\n special method). If the *step* argument is omitted, it defaults to\n "1". If the *start* argument is omitted, it defaults to "0". If\n *step* is zero, "ValueError" is raised.\n\n For a positive *step*, the contents of a range "r" are determined\n by the formula "r[i] = start + step*i" where "i >= 0" and "r[i] <\n stop".\n\n For a negative *step*, the contents of the range are still\n determined by the formula "r[i] = start + step*i", but the\n constraints are "i >= 0" and "r[i] > stop".\n\n A range object will be empty if "r[0]" does not meet the value\n constraint. Ranges do support negative indices, but these are\n interpreted as indexing from the end of the sequence determined by\n the positive indices.\n\n Ranges containing absolute values larger than "sys.maxsize" are\n permitted but some features (such as "len()") may raise\n "OverflowError".\n\n Range examples:\n\n >>> list(range(10))\n [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n >>> list(range(1, 11))\n [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\n >>> list(range(0, 30, 5))\n [0, 5, 10, 15, 20, 25]\n >>> list(range(0, 10, 3))\n [0, 3, 6, 9]\n >>> list(range(0, -10, -1))\n [0, -1, -2, -3, -4, -5, -6, -7, -8, -9]\n >>> list(range(0))\n []\n >>> list(range(1, 0))\n []\n\n Ranges implement all of the *common* sequence operations except\n concatenation and repetition (due to the fact that range objects\n can only represent sequences that follow a strict pattern and\n repetition and concatenation will usually violate that pattern).\n\n start\n\n The value of the *start* parameter (or "0" if the parameter was\n not supplied)\n\n stop\n\n The value of the *stop* parameter\n\n step\n\n The value of the *step* parameter (or "1" if the parameter was\n not supplied)\n\nThe advantage of the "range" type over a regular "list" or "tuple" is\nthat a "range" object will always take the same (small) amount of\nmemory, no matter the size of the range it represents (as it only\nstores the "start", "stop" and "step" values, calculating individual\nitems and subranges as needed).\n\nRange objects implement the "collections.abc.Sequence" ABC, and\nprovide features such as containment tests, element index lookup,\nslicing and support for negative indices (see *Sequence Types ---\nlist, tuple, range*):\n\n>>> r = range(0, 20, 2)\n>>> r\nrange(0, 20, 2)\n>>> 11 in r\nFalse\n>>> 10 in r\nTrue\n>>> r.index(10)\n5\n>>> r[5]\n10\n>>> r[:5]\nrange(0, 10, 2)\n>>> r[-1]\n18\n\nTesting range objects for equality with "==" and "!=" compares them as\nsequences. That is, two range objects are considered equal if they\nrepresent the same sequence of values. (Note that two range objects\nthat compare equal might have different "start", "stop" and "step"\nattributes, for example "range(0) == range(2, 1, 3)" or "range(0, 3,\n2) == range(0, 4, 2)".)\n\nChanged in version 3.2: Implement the Sequence ABC. Support slicing\nand negative indices. Test "int" objects for membership in constant\ntime instead of iterating through all items.\n\nChanged in version 3.3: Define \'==\' and \'!=\' to compare range objects\nbased on the sequence of values they define (instead of comparing\nbased on object identity).\n\nNew in version 3.3: The "start", "stop" and "step" attributes.\n', - 'typesseq-mutable': u'\nMutable Sequence Types\n**********************\n\nThe operations in the following table are defined on mutable sequence\ntypes. The "collections.abc.MutableSequence" ABC is provided to make\nit easier to correctly implement these operations on custom sequence\ntypes.\n\nIn the table *s* is an instance of a mutable sequence type, *t* is any\niterable object and *x* is an arbitrary object that meets any type and\nvalue restrictions imposed by *s* (for example, "bytearray" only\naccepts integers that meet the value restriction "0 <= x <= 255").\n\n+--------------------------------+----------------------------------+-----------------------+\n| Operation | Result | Notes |\n+================================+==================================+=======================+\n| "s[i] = x" | item *i* of *s* is replaced by | |\n| | *x* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s[i:j] = t" | slice of *s* from *i* to *j* is | |\n| | replaced by the contents of the | |\n| | iterable *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "del s[i:j]" | same as "s[i:j] = []" | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s[i:j:k] = t" | the elements of "s[i:j:k]" are | (1) |\n| | replaced by those of *t* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "del s[i:j:k]" | removes the elements of | |\n| | "s[i:j:k]" from the list | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.append(x)" | appends *x* to the end of the | |\n| | sequence (same as | |\n| | "s[len(s):len(s)] = [x]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.clear()" | removes all items from "s" (same | (5) |\n| | as "del s[:]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.copy()" | creates a shallow copy of "s" | (5) |\n| | (same as "s[:]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.extend(t)" or "s += t" | extends *s* with the contents of | |\n| | *t* (for the most part the same | |\n| | as "s[len(s):len(s)] = t") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s *= n" | updates *s* with its contents | (6) |\n| | repeated *n* times | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.insert(i, x)" | inserts *x* into *s* at the | |\n| | index given by *i* (same as | |\n| | "s[i:i] = [x]") | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.pop([i])" | retrieves the item at *i* and | (2) |\n| | also removes it from *s* | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.remove(x)" | remove the first item from *s* | (3) |\n| | where "s[i] == x" | |\n+--------------------------------+----------------------------------+-----------------------+\n| "s.reverse()" | reverses the items of *s* in | (4) |\n| | place | |\n+--------------------------------+----------------------------------+-----------------------+\n\nNotes:\n\n1. *t* must have the same length as the slice it is replacing.\n\n2. The optional argument *i* defaults to "-1", so that by default\n the last item is removed and returned.\n\n3. "remove" raises "ValueError" when *x* is not found in *s*.\n\n4. The "reverse()" method modifies the sequence in place for\n economy of space when reversing a large sequence. To remind users\n that it operates by side effect, it does not return the reversed\n sequence.\n\n5. "clear()" and "copy()" are included for consistency with the\n interfaces of mutable containers that don\'t support slicing\n operations (such as "dict" and "set")\n\n New in version 3.3: "clear()" and "copy()" methods.\n\n6. The value *n* is an integer, or an object implementing\n "__index__()". Zero and negative values of *n* clear the sequence.\n Items in the sequence are not copied; they are referenced multiple\n times, as explained for "s * n" under *Common Sequence Operations*.\n', - 'unary': u'\nUnary arithmetic and bitwise operations\n***************************************\n\nAll unary arithmetic and bitwise operations have the same priority:\n\n u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n\nThe unary "-" (minus) operator yields the negation of its numeric\nargument.\n\nThe unary "+" (plus) operator yields its numeric argument unchanged.\n\nThe unary "~" (invert) operator yields the bitwise inversion of its\ninteger argument. The bitwise inversion of "x" is defined as\n"-(x+1)". It only applies to integral numbers.\n\nIn all three cases, if the argument does not have the proper type, a\n"TypeError" exception is raised.\n', - 'while': u'\nThe "while" statement\n*********************\n\nThe "while" statement is used for repeated execution as long as an\nexpression is true:\n\n while_stmt ::= "while" expression ":" suite\n ["else" ":" suite]\n\nThis repeatedly tests the expression and, if it is true, executes the\nfirst suite; if the expression is false (which may be the first time\nit is tested) the suite of the "else" clause, if present, is executed\nand the loop terminates.\n\nA "break" statement executed in the first suite terminates the loop\nwithout executing the "else" clause\'s suite. A "continue" statement\nexecuted in the first suite skips the rest of the suite and goes back\nto testing the expression.\n', - 'with': u'\nThe "with" statement\n********************\n\nThe "with" statement is used to wrap the execution of a block with\nmethods defined by a context manager (see section *With Statement\nContext Managers*). This allows common "try"..."except"..."finally"\nusage patterns to be encapsulated for convenient reuse.\n\n with_stmt ::= "with" with_item ("," with_item)* ":" suite\n with_item ::= expression ["as" target]\n\nThe execution of the "with" statement with one "item" proceeds as\nfollows:\n\n1. The context expression (the expression given in the "with_item")\n is evaluated to obtain a context manager.\n\n2. The context manager\'s "__exit__()" is loaded for later use.\n\n3. The context manager\'s "__enter__()" method is invoked.\n\n4. If a target was included in the "with" statement, the return\n value from "__enter__()" is assigned to it.\n\n Note: The "with" statement guarantees that if the "__enter__()"\n method returns without an error, then "__exit__()" will always be\n called. Thus, if an error occurs during the assignment to the\n target list, it will be treated the same as an error occurring\n within the suite would be. See step 6 below.\n\n5. The suite is executed.\n\n6. The context manager\'s "__exit__()" method is invoked. If an\n exception caused the suite to be exited, its type, value, and\n traceback are passed as arguments to "__exit__()". Otherwise, three\n "None" arguments are supplied.\n\n If the suite was exited due to an exception, and the return value\n from the "__exit__()" method was false, the exception is reraised.\n If the return value was true, the exception is suppressed, and\n execution continues with the statement following the "with"\n statement.\n\n If the suite was exited for any reason other than an exception, the\n return value from "__exit__()" is ignored, and execution proceeds\n at the normal location for the kind of exit that was taken.\n\nWith more than one item, the context managers are processed as if\nmultiple "with" statements were nested:\n\n with A() as a, B() as b:\n suite\n\nis equivalent to\n\n with A() as a:\n with B() as b:\n suite\n\nChanged in version 3.1: Support for multiple context expressions.\n\nSee also: **PEP 343** - The "with" statement\n\n The specification, background, and examples for the Python "with"\n statement.\n', - 'yield': u'\nThe "yield" statement\n*********************\n\n yield_stmt ::= yield_expression\n\nA "yield" statement is semantically equivalent to a *yield\nexpression*. The yield statement can be used to omit the parentheses\nthat would otherwise be required in the equivalent yield expression\nstatement. For example, the yield statements\n\n yield \n yield from \n\nare equivalent to the yield expression statements\n\n (yield )\n (yield from )\n\nYield expressions and statements are only used when defining a\n*generator* function, and are only used in the body of the generator\nfunction. Using yield in a function definition is sufficient to cause\nthat definition to create a generator function instead of a normal\nfunction.\n\nFor full details of "yield" semantics, refer to the *Yield\nexpressions* section.\n'} +# Autogenerated by Sphinx on Fri Dec 16 16:33:16 2016 +topics = {'assert': '\n' + 'The "assert" statement\n' + '**********************\n' + '\n' + 'Assert statements are a convenient way to insert debugging ' + 'assertions\n' + 'into a program:\n' + '\n' + ' assert_stmt ::= "assert" expression ["," expression]\n' + '\n' + 'The simple form, "assert expression", is equivalent to\n' + '\n' + ' if __debug__:\n' + ' if not expression: raise AssertionError\n' + '\n' + 'The extended form, "assert expression1, expression2", is ' + 'equivalent to\n' + '\n' + ' if __debug__:\n' + ' if not expression1: raise AssertionError(expression2)\n' + '\n' + 'These equivalences assume that "__debug__" and "AssertionError" ' + 'refer\n' + 'to the built-in variables with those names. In the current\n' + 'implementation, the built-in variable "__debug__" is "True" under\n' + 'normal circumstances, "False" when optimization is requested ' + '(command\n' + 'line option -O). The current code generator emits no code for an\n' + 'assert statement when optimization is requested at compile time. ' + 'Note\n' + 'that it is unnecessary to include the source code for the ' + 'expression\n' + 'that failed in the error message; it will be displayed as part of ' + 'the\n' + 'stack trace.\n' + '\n' + 'Assignments to "__debug__" are illegal. The value for the ' + 'built-in\n' + 'variable is determined when the interpreter starts.\n', + 'assignment': '\n' + 'Assignment statements\n' + '*********************\n' + '\n' + 'Assignment statements are used to (re)bind names to values and ' + 'to\n' + 'modify attributes or items of mutable objects:\n' + '\n' + ' assignment_stmt ::= (target_list "=")+ (starred_expression ' + '| yield_expression)\n' + ' target_list ::= target ("," target)* [","]\n' + ' target ::= identifier\n' + ' | "(" [target_list] ")"\n' + ' | "[" [target_list] "]"\n' + ' | attributeref\n' + ' | subscription\n' + ' | slicing\n' + ' | "*" target\n' + '\n' + '(See section Primaries for the syntax definitions for ' + '*attributeref*,\n' + '*subscription*, and *slicing*.)\n' + '\n' + 'An assignment statement evaluates the expression list ' + '(remember that\n' + 'this can be a single expression or a comma-separated list, the ' + 'latter\n' + 'yielding a tuple) and assigns the single resulting object to ' + 'each of\n' + 'the target lists, from left to right.\n' + '\n' + 'Assignment is defined recursively depending on the form of the ' + 'target\n' + '(list). When a target is part of a mutable object (an ' + 'attribute\n' + 'reference, subscription or slicing), the mutable object must\n' + 'ultimately perform the assignment and decide about its ' + 'validity, and\n' + 'may raise an exception if the assignment is unacceptable. The ' + 'rules\n' + 'observed by various types and the exceptions raised are given ' + 'with the\n' + 'definition of the object types (see section The standard type\n' + 'hierarchy).\n' + '\n' + 'Assignment of an object to a target list, optionally enclosed ' + 'in\n' + 'parentheses or square brackets, is recursively defined as ' + 'follows.\n' + '\n' + '* If the target list is empty: The object must also be an ' + 'empty\n' + ' iterable.\n' + '\n' + '* If the target list is a single target in parentheses: The ' + 'object\n' + ' is assigned to that target.\n' + '\n' + '* If the target list is a comma-separated list of targets, or ' + 'a\n' + ' single target in square brackets: The object must be an ' + 'iterable\n' + ' with the same number of items as there are targets in the ' + 'target\n' + ' list, and the items are assigned, from left to right, to ' + 'the\n' + ' corresponding targets.\n' + '\n' + ' * If the target list contains one target prefixed with an\n' + ' asterisk, called a "starred" target: The object must be ' + 'an\n' + ' iterable with at least as many items as there are targets ' + 'in the\n' + ' target list, minus one. The first items of the iterable ' + 'are\n' + ' assigned, from left to right, to the targets before the ' + 'starred\n' + ' target. The final items of the iterable are assigned to ' + 'the\n' + ' targets after the starred target. A list of the remaining ' + 'items\n' + ' in the iterable is then assigned to the starred target ' + '(the list\n' + ' can be empty).\n' + '\n' + ' * Else: The object must be an iterable with the same number ' + 'of\n' + ' items as there are targets in the target list, and the ' + 'items are\n' + ' assigned, from left to right, to the corresponding ' + 'targets.\n' + '\n' + 'Assignment of an object to a single target is recursively ' + 'defined as\n' + 'follows.\n' + '\n' + '* If the target is an identifier (name):\n' + '\n' + ' * If the name does not occur in a "global" or "nonlocal" ' + 'statement\n' + ' in the current code block: the name is bound to the object ' + 'in the\n' + ' current local namespace.\n' + '\n' + ' * Otherwise: the name is bound to the object in the global\n' + ' namespace or the outer namespace determined by ' + '"nonlocal",\n' + ' respectively.\n' + '\n' + ' The name is rebound if it was already bound. This may cause ' + 'the\n' + ' reference count for the object previously bound to the name ' + 'to reach\n' + ' zero, causing the object to be deallocated and its ' + 'destructor (if it\n' + ' has one) to be called.\n' + '\n' + '* If the target is an attribute reference: The primary ' + 'expression in\n' + ' the reference is evaluated. It should yield an object with\n' + ' assignable attributes; if this is not the case, "TypeError" ' + 'is\n' + ' raised. That object is then asked to assign the assigned ' + 'object to\n' + ' the given attribute; if it cannot perform the assignment, it ' + 'raises\n' + ' an exception (usually but not necessarily ' + '"AttributeError").\n' + '\n' + ' Note: If the object is a class instance and the attribute ' + 'reference\n' + ' occurs on both sides of the assignment operator, the RHS ' + 'expression,\n' + ' "a.x" can access either an instance attribute or (if no ' + 'instance\n' + ' attribute exists) a class attribute. The LHS target "a.x" ' + 'is always\n' + ' set as an instance attribute, creating it if necessary. ' + 'Thus, the\n' + ' two occurrences of "a.x" do not necessarily refer to the ' + 'same\n' + ' attribute: if the RHS expression refers to a class ' + 'attribute, the\n' + ' LHS creates a new instance attribute as the target of the\n' + ' assignment:\n' + '\n' + ' class Cls:\n' + ' x = 3 # class variable\n' + ' inst = Cls()\n' + ' inst.x = inst.x + 1 # writes inst.x as 4 leaving Cls.x ' + 'as 3\n' + '\n' + ' This description does not necessarily apply to descriptor\n' + ' attributes, such as properties created with "property()".\n' + '\n' + '* If the target is a subscription: The primary expression in ' + 'the\n' + ' reference is evaluated. It should yield either a mutable ' + 'sequence\n' + ' object (such as a list) or a mapping object (such as a ' + 'dictionary).\n' + ' Next, the subscript expression is evaluated.\n' + '\n' + ' If the primary is a mutable sequence object (such as a ' + 'list), the\n' + ' subscript must yield an integer. If it is negative, the ' + "sequence's\n" + ' length is added to it. The resulting value must be a ' + 'nonnegative\n' + " integer less than the sequence's length, and the sequence is " + 'asked\n' + ' to assign the assigned object to its item with that index. ' + 'If the\n' + ' index is out of range, "IndexError" is raised (assignment to ' + 'a\n' + ' subscripted sequence cannot add new items to a list).\n' + '\n' + ' If the primary is a mapping object (such as a dictionary), ' + 'the\n' + " subscript must have a type compatible with the mapping's key " + 'type,\n' + ' and the mapping is then asked to create a key/datum pair ' + 'which maps\n' + ' the subscript to the assigned object. This can either ' + 'replace an\n' + ' existing key/value pair with the same key value, or insert a ' + 'new\n' + ' key/value pair (if no key with the same value existed).\n' + '\n' + ' For user-defined objects, the "__setitem__()" method is ' + 'called with\n' + ' appropriate arguments.\n' + '\n' + '* If the target is a slicing: The primary expression in the\n' + ' reference is evaluated. It should yield a mutable sequence ' + 'object\n' + ' (such as a list). The assigned object should be a sequence ' + 'object\n' + ' of the same type. Next, the lower and upper bound ' + 'expressions are\n' + ' evaluated, insofar they are present; defaults are zero and ' + 'the\n' + " sequence's length. The bounds should evaluate to integers. " + 'If\n' + " either bound is negative, the sequence's length is added to " + 'it. The\n' + ' resulting bounds are clipped to lie between zero and the ' + "sequence's\n" + ' length, inclusive. Finally, the sequence object is asked to ' + 'replace\n' + ' the slice with the items of the assigned sequence. The ' + 'length of\n' + ' the slice may be different from the length of the assigned ' + 'sequence,\n' + ' thus changing the length of the target sequence, if the ' + 'target\n' + ' sequence allows it.\n' + '\n' + '**CPython implementation detail:** In the current ' + 'implementation, the\n' + 'syntax for targets is taken to be the same as for expressions, ' + 'and\n' + 'invalid syntax is rejected during the code generation phase, ' + 'causing\n' + 'less detailed error messages.\n' + '\n' + 'Although the definition of assignment implies that overlaps ' + 'between\n' + "the left-hand side and the right-hand side are 'simultaneous' " + '(for\n' + 'example "a, b = b, a" swaps two variables), overlaps *within* ' + 'the\n' + 'collection of assigned-to variables occur left-to-right, ' + 'sometimes\n' + 'resulting in confusion. For instance, the following program ' + 'prints\n' + '"[0, 2]":\n' + '\n' + ' x = [0, 1]\n' + ' i = 0\n' + ' i, x[i] = 1, 2 # i is updated, then x[i] is ' + 'updated\n' + ' print(x)\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3132** - Extended Iterable Unpacking\n' + ' The specification for the "*target" feature.\n' + '\n' + '\n' + 'Augmented assignment statements\n' + '===============================\n' + '\n' + 'Augmented assignment is the combination, in a single ' + 'statement, of a\n' + 'binary operation and an assignment statement:\n' + '\n' + ' augmented_assignment_stmt ::= augtarget augop ' + '(expression_list | yield_expression)\n' + ' augtarget ::= identifier | attributeref | ' + 'subscription | slicing\n' + ' augop ::= "+=" | "-=" | "*=" | "@=" | ' + '"/=" | "//=" | "%=" | "**="\n' + ' | ">>=" | "<<=" | "&=" | "^=" | "|="\n' + '\n' + '(See section Primaries for the syntax definitions of the last ' + 'three\n' + 'symbols.)\n' + '\n' + 'An augmented assignment evaluates the target (which, unlike ' + 'normal\n' + 'assignment statements, cannot be an unpacking) and the ' + 'expression\n' + 'list, performs the binary operation specific to the type of ' + 'assignment\n' + 'on the two operands, and assigns the result to the original ' + 'target.\n' + 'The target is only evaluated once.\n' + '\n' + 'An augmented assignment expression like "x += 1" can be ' + 'rewritten as\n' + '"x = x + 1" to achieve a similar, but not exactly equal ' + 'effect. In the\n' + 'augmented version, "x" is only evaluated once. Also, when ' + 'possible,\n' + 'the actual operation is performed *in-place*, meaning that ' + 'rather than\n' + 'creating a new object and assigning that to the target, the ' + 'old object\n' + 'is modified instead.\n' + '\n' + 'Unlike normal assignments, augmented assignments evaluate the ' + 'left-\n' + 'hand side *before* evaluating the right-hand side. For ' + 'example, "a[i]\n' + '+= f(x)" first looks-up "a[i]", then it evaluates "f(x)" and ' + 'performs\n' + 'the addition, and lastly, it writes the result back to ' + '"a[i]".\n' + '\n' + 'With the exception of assigning to tuples and multiple targets ' + 'in a\n' + 'single statement, the assignment done by augmented assignment\n' + 'statements is handled the same way as normal assignments. ' + 'Similarly,\n' + 'with the exception of the possible *in-place* behavior, the ' + 'binary\n' + 'operation performed by augmented assignment is the same as the ' + 'normal\n' + 'binary operations.\n' + '\n' + 'For targets which are attribute references, the same caveat ' + 'about\n' + 'class and instance attributes applies as for regular ' + 'assignments.\n' + '\n' + '\n' + 'Annotated assignment statements\n' + '===============================\n' + '\n' + 'Annotation assignment is the combination, in a single ' + 'statement, of a\n' + 'variable or attribute annotation and an optional assignment ' + 'statement:\n' + '\n' + ' annotated_assignment_stmt ::= augtarget ":" expression ["=" ' + 'expression]\n' + '\n' + 'The difference from normal Assignment statements is that only ' + 'single\n' + 'target and only single right hand side value is allowed.\n' + '\n' + 'For simple names as assignment targets, if in class or module ' + 'scope,\n' + 'the annotations are evaluated and stored in a special class or ' + 'module\n' + 'attribute "__annotations__" that is a dictionary mapping from ' + 'variable\n' + 'names (mangled if private) to evaluated annotations. This ' + 'attribute is\n' + 'writable and is automatically created at the start of class or ' + 'module\n' + 'body execution, if annotations are found statically.\n' + '\n' + 'For expressions as assignment targets, the annotations are ' + 'evaluated\n' + 'if in class or module scope, but not stored.\n' + '\n' + 'If a name is annotated in a function scope, then this name is ' + 'local\n' + 'for that scope. Annotations are never evaluated and stored in ' + 'function\n' + 'scopes.\n' + '\n' + 'If the right hand side is present, an annotated assignment ' + 'performs\n' + 'the actual assignment before evaluating annotations (where\n' + 'applicable). If the right hand side is not present for an ' + 'expression\n' + 'target, then the interpreter evaluates the target except for ' + 'the last\n' + '"__setitem__()" or "__setattr__()" call.\n' + '\n' + 'See also: **PEP 526** - Variable and attribute annotation ' + 'syntax\n' + ' **PEP 484** - Type hints\n', + 'atom-identifiers': '\n' + 'Identifiers (Names)\n' + '*******************\n' + '\n' + 'An identifier occurring as an atom is a name. See ' + 'section Identifiers\n' + 'and keywords for lexical definition and section Naming ' + 'and binding for\n' + 'documentation of naming and binding.\n' + '\n' + 'When the name is bound to an object, evaluation of the ' + 'atom yields\n' + 'that object. When a name is not bound, an attempt to ' + 'evaluate it\n' + 'raises a "NameError" exception.\n' + '\n' + '**Private name mangling:** When an identifier that ' + 'textually occurs in\n' + 'a class definition begins with two or more underscore ' + 'characters and\n' + 'does not end in two or more underscores, it is ' + 'considered a *private\n' + 'name* of that class. Private names are transformed to a ' + 'longer form\n' + 'before code is generated for them. The transformation ' + 'inserts the\n' + 'class name, with leading underscores removed and a ' + 'single underscore\n' + 'inserted, in front of the name. For example, the ' + 'identifier "__spam"\n' + 'occurring in a class named "Ham" will be transformed to ' + '"_Ham__spam".\n' + 'This transformation is independent of the syntactical ' + 'context in which\n' + 'the identifier is used. If the transformed name is ' + 'extremely long\n' + '(longer than 255 characters), implementation defined ' + 'truncation may\n' + 'happen. If the class name consists only of underscores, ' + 'no\n' + 'transformation is done.\n', + 'atom-literals': '\n' + 'Literals\n' + '********\n' + '\n' + 'Python supports string and bytes literals and various ' + 'numeric\n' + 'literals:\n' + '\n' + ' literal ::= stringliteral | bytesliteral\n' + ' | integer | floatnumber | imagnumber\n' + '\n' + 'Evaluation of a literal yields an object of the given type ' + '(string,\n' + 'bytes, integer, floating point number, complex number) with ' + 'the given\n' + 'value. The value may be approximated in the case of ' + 'floating point\n' + 'and imaginary (complex) literals. See section Literals for ' + 'details.\n' + '\n' + 'All literals correspond to immutable data types, and hence ' + 'the\n' + "object's identity is less important than its value. " + 'Multiple\n' + 'evaluations of literals with the same value (either the ' + 'same\n' + 'occurrence in the program text or a different occurrence) ' + 'may obtain\n' + 'the same object or a different object with the same ' + 'value.\n', + 'attribute-access': '\n' + 'Customizing attribute access\n' + '****************************\n' + '\n' + 'The following methods can be defined to customize the ' + 'meaning of\n' + 'attribute access (use of, assignment to, or deletion of ' + '"x.name") for\n' + 'class instances.\n' + '\n' + 'object.__getattr__(self, name)\n' + '\n' + ' Called when an attribute lookup has not found the ' + 'attribute in the\n' + ' usual places (i.e. it is not an instance attribute ' + 'nor is it found\n' + ' in the class tree for "self"). "name" is the ' + 'attribute name. This\n' + ' method should return the (computed) attribute value ' + 'or raise an\n' + ' "AttributeError" exception.\n' + '\n' + ' Note that if the attribute is found through the ' + 'normal mechanism,\n' + ' "__getattr__()" is not called. (This is an ' + 'intentional asymmetry\n' + ' between "__getattr__()" and "__setattr__()".) This is ' + 'done both for\n' + ' efficiency reasons and because otherwise ' + '"__getattr__()" would have\n' + ' no way to access other attributes of the instance. ' + 'Note that at\n' + ' least for instance variables, you can fake total ' + 'control by not\n' + ' inserting any values in the instance attribute ' + 'dictionary (but\n' + ' instead inserting them in another object). See the\n' + ' "__getattribute__()" method below for a way to ' + 'actually get total\n' + ' control over attribute access.\n' + '\n' + 'object.__getattribute__(self, name)\n' + '\n' + ' Called unconditionally to implement attribute ' + 'accesses for\n' + ' instances of the class. If the class also defines ' + '"__getattr__()",\n' + ' the latter will not be called unless ' + '"__getattribute__()" either\n' + ' calls it explicitly or raises an "AttributeError". ' + 'This method\n' + ' should return the (computed) attribute value or raise ' + 'an\n' + ' "AttributeError" exception. In order to avoid ' + 'infinite recursion in\n' + ' this method, its implementation should always call ' + 'the base class\n' + ' method with the same name to access any attributes it ' + 'needs, for\n' + ' example, "object.__getattribute__(self, name)".\n' + '\n' + ' Note: This method may still be bypassed when looking ' + 'up special\n' + ' methods as the result of implicit invocation via ' + 'language syntax\n' + ' or built-in functions. See Special method lookup.\n' + '\n' + 'object.__setattr__(self, name, value)\n' + '\n' + ' Called when an attribute assignment is attempted. ' + 'This is called\n' + ' instead of the normal mechanism (i.e. store the value ' + 'in the\n' + ' instance dictionary). *name* is the attribute name, ' + '*value* is the\n' + ' value to be assigned to it.\n' + '\n' + ' If "__setattr__()" wants to assign to an instance ' + 'attribute, it\n' + ' should call the base class method with the same name, ' + 'for example,\n' + ' "object.__setattr__(self, name, value)".\n' + '\n' + 'object.__delattr__(self, name)\n' + '\n' + ' Like "__setattr__()" but for attribute deletion ' + 'instead of\n' + ' assignment. This should only be implemented if "del ' + 'obj.name" is\n' + ' meaningful for the object.\n' + '\n' + 'object.__dir__(self)\n' + '\n' + ' Called when "dir()" is called on the object. A ' + 'sequence must be\n' + ' returned. "dir()" converts the returned sequence to a ' + 'list and\n' + ' sorts it.\n' + '\n' + '\n' + 'Implementing Descriptors\n' + '========================\n' + '\n' + 'The following methods only apply when an instance of the ' + 'class\n' + 'containing the method (a so-called *descriptor* class) ' + 'appears in an\n' + '*owner* class (the descriptor must be in either the ' + "owner's class\n" + 'dictionary or in the class dictionary for one of its ' + 'parents). In the\n' + 'examples below, "the attribute" refers to the attribute ' + 'whose name is\n' + "the key of the property in the owner class' " + '"__dict__".\n' + '\n' + 'object.__get__(self, instance, owner)\n' + '\n' + ' Called to get the attribute of the owner class (class ' + 'attribute\n' + ' access) or of an instance of that class (instance ' + 'attribute\n' + ' access). *owner* is always the owner class, while ' + '*instance* is the\n' + ' instance that the attribute was accessed through, or ' + '"None" when\n' + ' the attribute is accessed through the *owner*. This ' + 'method should\n' + ' return the (computed) attribute value or raise an ' + '"AttributeError"\n' + ' exception.\n' + '\n' + 'object.__set__(self, instance, value)\n' + '\n' + ' Called to set the attribute on an instance *instance* ' + 'of the owner\n' + ' class to a new value, *value*.\n' + '\n' + 'object.__delete__(self, instance)\n' + '\n' + ' Called to delete the attribute on an instance ' + '*instance* of the\n' + ' owner class.\n' + '\n' + 'object.__set_name__(self, owner, name)\n' + '\n' + ' Called at the time the owning class *owner* is ' + 'created. The\n' + ' descriptor has been assigned to *name*.\n' + '\n' + ' New in version 3.6.\n' + '\n' + 'The attribute "__objclass__" is interpreted by the ' + '"inspect" module as\n' + 'specifying the class where this object was defined ' + '(setting this\n' + 'appropriately can assist in runtime introspection of ' + 'dynamic class\n' + 'attributes). For callables, it may indicate that an ' + 'instance of the\n' + 'given type (or a subclass) is expected or required as ' + 'the first\n' + 'positional argument (for example, CPython sets this ' + 'attribute for\n' + 'unbound methods that are implemented in C).\n' + '\n' + '\n' + 'Invoking Descriptors\n' + '====================\n' + '\n' + 'In general, a descriptor is an object attribute with ' + '"binding\n' + 'behavior", one whose attribute access has been ' + 'overridden by methods\n' + 'in the descriptor protocol: "__get__()", "__set__()", ' + 'and\n' + '"__delete__()". If any of those methods are defined for ' + 'an object, it\n' + 'is said to be a descriptor.\n' + '\n' + 'The default behavior for attribute access is to get, ' + 'set, or delete\n' + "the attribute from an object's dictionary. For instance, " + '"a.x" has a\n' + 'lookup chain starting with "a.__dict__[\'x\']", then\n' + '"type(a).__dict__[\'x\']", and continuing through the ' + 'base classes of\n' + '"type(a)" excluding metaclasses.\n' + '\n' + 'However, if the looked-up value is an object defining ' + 'one of the\n' + 'descriptor methods, then Python may override the default ' + 'behavior and\n' + 'invoke the descriptor method instead. Where this occurs ' + 'in the\n' + 'precedence chain depends on which descriptor methods ' + 'were defined and\n' + 'how they were called.\n' + '\n' + 'The starting point for descriptor invocation is a ' + 'binding, "a.x". How\n' + 'the arguments are assembled depends on "a":\n' + '\n' + 'Direct Call\n' + ' The simplest and least common call is when user code ' + 'directly\n' + ' invokes a descriptor method: "x.__get__(a)".\n' + '\n' + 'Instance Binding\n' + ' If binding to an object instance, "a.x" is ' + 'transformed into the\n' + ' call: "type(a).__dict__[\'x\'].__get__(a, type(a))".\n' + '\n' + 'Class Binding\n' + ' If binding to a class, "A.x" is transformed into the ' + 'call:\n' + ' "A.__dict__[\'x\'].__get__(None, A)".\n' + '\n' + 'Super Binding\n' + ' If "a" is an instance of "super", then the binding ' + '"super(B,\n' + ' obj).m()" searches "obj.__class__.__mro__" for the ' + 'base class "A"\n' + ' immediately preceding "B" and then invokes the ' + 'descriptor with the\n' + ' call: "A.__dict__[\'m\'].__get__(obj, ' + 'obj.__class__)".\n' + '\n' + 'For instance bindings, the precedence of descriptor ' + 'invocation depends\n' + 'on the which descriptor methods are defined. A ' + 'descriptor can define\n' + 'any combination of "__get__()", "__set__()" and ' + '"__delete__()". If it\n' + 'does not define "__get__()", then accessing the ' + 'attribute will return\n' + 'the descriptor object itself unless there is a value in ' + "the object's\n" + 'instance dictionary. If the descriptor defines ' + '"__set__()" and/or\n' + '"__delete__()", it is a data descriptor; if it defines ' + 'neither, it is\n' + 'a non-data descriptor. Normally, data descriptors ' + 'define both\n' + '"__get__()" and "__set__()", while non-data descriptors ' + 'have just the\n' + '"__get__()" method. Data descriptors with "__set__()" ' + 'and "__get__()"\n' + 'defined always override a redefinition in an instance ' + 'dictionary. In\n' + 'contrast, non-data descriptors can be overridden by ' + 'instances.\n' + '\n' + 'Python methods (including "staticmethod()" and ' + '"classmethod()") are\n' + 'implemented as non-data descriptors. Accordingly, ' + 'instances can\n' + 'redefine and override methods. This allows individual ' + 'instances to\n' + 'acquire behaviors that differ from other instances of ' + 'the same class.\n' + '\n' + 'The "property()" function is implemented as a data ' + 'descriptor.\n' + 'Accordingly, instances cannot override the behavior of a ' + 'property.\n' + '\n' + '\n' + '__slots__\n' + '=========\n' + '\n' + 'By default, instances of classes have a dictionary for ' + 'attribute\n' + 'storage. This wastes space for objects having very few ' + 'instance\n' + 'variables. The space consumption can become acute when ' + 'creating large\n' + 'numbers of instances.\n' + '\n' + 'The default can be overridden by defining *__slots__* in ' + 'a class\n' + 'definition. The *__slots__* declaration takes a sequence ' + 'of instance\n' + 'variables and reserves just enough space in each ' + 'instance to hold a\n' + 'value for each variable. Space is saved because ' + '*__dict__* is not\n' + 'created for each instance.\n' + '\n' + 'object.__slots__\n' + '\n' + ' This class variable can be assigned a string, ' + 'iterable, or sequence\n' + ' of strings with variable names used by instances. ' + '*__slots__*\n' + ' reserves space for the declared variables and ' + 'prevents the\n' + ' automatic creation of *__dict__* and *__weakref__* ' + 'for each\n' + ' instance.\n' + '\n' + '\n' + 'Notes on using *__slots__*\n' + '--------------------------\n' + '\n' + '* When inheriting from a class without *__slots__*, the ' + '*__dict__*\n' + ' attribute of that class will always be accessible, so ' + 'a *__slots__*\n' + ' definition in the subclass is meaningless.\n' + '\n' + '* Without a *__dict__* variable, instances cannot be ' + 'assigned new\n' + ' variables not listed in the *__slots__* definition. ' + 'Attempts to\n' + ' assign to an unlisted variable name raises ' + '"AttributeError". If\n' + ' dynamic assignment of new variables is desired, then ' + 'add\n' + ' "\'__dict__\'" to the sequence of strings in the ' + '*__slots__*\n' + ' declaration.\n' + '\n' + '* Without a *__weakref__* variable for each instance, ' + 'classes\n' + ' defining *__slots__* do not support weak references to ' + 'its\n' + ' instances. If weak reference support is needed, then ' + 'add\n' + ' "\'__weakref__\'" to the sequence of strings in the ' + '*__slots__*\n' + ' declaration.\n' + '\n' + '* *__slots__* are implemented at the class level by ' + 'creating\n' + ' descriptors (Implementing Descriptors) for each ' + 'variable name. As a\n' + ' result, class attributes cannot be used to set default ' + 'values for\n' + ' instance variables defined by *__slots__*; otherwise, ' + 'the class\n' + ' attribute would overwrite the descriptor assignment.\n' + '\n' + '* The action of a *__slots__* declaration is limited to ' + 'the class\n' + ' where it is defined. As a result, subclasses will ' + 'have a *__dict__*\n' + ' unless they also define *__slots__* (which must only ' + 'contain names\n' + ' of any *additional* slots).\n' + '\n' + '* If a class defines a slot also defined in a base ' + 'class, the\n' + ' instance variable defined by the base class slot is ' + 'inaccessible\n' + ' (except by retrieving its descriptor directly from the ' + 'base class).\n' + ' This renders the meaning of the program undefined. In ' + 'the future, a\n' + ' check may be added to prevent this.\n' + '\n' + '* Nonempty *__slots__* does not work for classes derived ' + 'from\n' + ' "variable-length" built-in types such as "int", ' + '"bytes" and "tuple".\n' + '\n' + '* Any non-string iterable may be assigned to ' + '*__slots__*. Mappings\n' + ' may also be used; however, in the future, special ' + 'meaning may be\n' + ' assigned to the values corresponding to each key.\n' + '\n' + '* *__class__* assignment works only if both classes have ' + 'the same\n' + ' *__slots__*.\n', + 'attribute-references': '\n' + 'Attribute references\n' + '********************\n' + '\n' + 'An attribute reference is a primary followed by a ' + 'period and a name:\n' + '\n' + ' attributeref ::= primary "." identifier\n' + '\n' + 'The primary must evaluate to an object of a type ' + 'that supports\n' + 'attribute references, which most objects do. This ' + 'object is then\n' + 'asked to produce the attribute whose name is the ' + 'identifier. This\n' + 'production can be customized by overriding the ' + '"__getattr__()" method.\n' + 'If this attribute is not available, the exception ' + '"AttributeError" is\n' + 'raised. Otherwise, the type and value of the object ' + 'produced is\n' + 'determined by the object. Multiple evaluations of ' + 'the same attribute\n' + 'reference may yield different objects.\n', + 'augassign': '\n' + 'Augmented assignment statements\n' + '*******************************\n' + '\n' + 'Augmented assignment is the combination, in a single statement, ' + 'of a\n' + 'binary operation and an assignment statement:\n' + '\n' + ' augmented_assignment_stmt ::= augtarget augop ' + '(expression_list | yield_expression)\n' + ' augtarget ::= identifier | attributeref | ' + 'subscription | slicing\n' + ' augop ::= "+=" | "-=" | "*=" | "@=" | ' + '"/=" | "//=" | "%=" | "**="\n' + ' | ">>=" | "<<=" | "&=" | "^=" | "|="\n' + '\n' + '(See section Primaries for the syntax definitions of the last ' + 'three\n' + 'symbols.)\n' + '\n' + 'An augmented assignment evaluates the target (which, unlike ' + 'normal\n' + 'assignment statements, cannot be an unpacking) and the ' + 'expression\n' + 'list, performs the binary operation specific to the type of ' + 'assignment\n' + 'on the two operands, and assigns the result to the original ' + 'target.\n' + 'The target is only evaluated once.\n' + '\n' + 'An augmented assignment expression like "x += 1" can be ' + 'rewritten as\n' + '"x = x + 1" to achieve a similar, but not exactly equal effect. ' + 'In the\n' + 'augmented version, "x" is only evaluated once. Also, when ' + 'possible,\n' + 'the actual operation is performed *in-place*, meaning that ' + 'rather than\n' + 'creating a new object and assigning that to the target, the old ' + 'object\n' + 'is modified instead.\n' + '\n' + 'Unlike normal assignments, augmented assignments evaluate the ' + 'left-\n' + 'hand side *before* evaluating the right-hand side. For ' + 'example, "a[i]\n' + '+= f(x)" first looks-up "a[i]", then it evaluates "f(x)" and ' + 'performs\n' + 'the addition, and lastly, it writes the result back to "a[i]".\n' + '\n' + 'With the exception of assigning to tuples and multiple targets ' + 'in a\n' + 'single statement, the assignment done by augmented assignment\n' + 'statements is handled the same way as normal assignments. ' + 'Similarly,\n' + 'with the exception of the possible *in-place* behavior, the ' + 'binary\n' + 'operation performed by augmented assignment is the same as the ' + 'normal\n' + 'binary operations.\n' + '\n' + 'For targets which are attribute references, the same caveat ' + 'about\n' + 'class and instance attributes applies as for regular ' + 'assignments.\n', + 'binary': '\n' + 'Binary arithmetic operations\n' + '****************************\n' + '\n' + 'The binary arithmetic operations have the conventional priority\n' + 'levels. Note that some of these operations also apply to certain ' + 'non-\n' + 'numeric types. Apart from the power operator, there are only two\n' + 'levels, one for multiplicative operators and one for additive\n' + 'operators:\n' + '\n' + ' m_expr ::= u_expr | m_expr "*" u_expr | m_expr "@" m_expr |\n' + ' m_expr "//" u_expr| m_expr "/" u_expr |\n' + ' m_expr "%" u_expr\n' + ' a_expr ::= m_expr | a_expr "+" m_expr | a_expr "-" m_expr\n' + '\n' + 'The "*" (multiplication) operator yields the product of its ' + 'arguments.\n' + 'The arguments must either both be numbers, or one argument must be ' + 'an\n' + 'integer and the other must be a sequence. In the former case, the\n' + 'numbers are converted to a common type and then multiplied ' + 'together.\n' + 'In the latter case, sequence repetition is performed; a negative\n' + 'repetition factor yields an empty sequence.\n' + '\n' + 'The "@" (at) operator is intended to be used for matrix\n' + 'multiplication. No builtin Python types implement this operator.\n' + '\n' + 'New in version 3.5.\n' + '\n' + 'The "/" (division) and "//" (floor division) operators yield the\n' + 'quotient of their arguments. The numeric arguments are first\n' + 'converted to a common type. Division of integers yields a float, ' + 'while\n' + 'floor division of integers results in an integer; the result is ' + 'that\n' + "of mathematical division with the 'floor' function applied to the\n" + 'result. Division by zero raises the "ZeroDivisionError" ' + 'exception.\n' + '\n' + 'The "%" (modulo) operator yields the remainder from the division ' + 'of\n' + 'the first argument by the second. The numeric arguments are ' + 'first\n' + 'converted to a common type. A zero right argument raises the\n' + '"ZeroDivisionError" exception. The arguments may be floating ' + 'point\n' + 'numbers, e.g., "3.14%0.7" equals "0.34" (since "3.14" equals ' + '"4*0.7 +\n' + '0.34".) The modulo operator always yields a result with the same ' + 'sign\n' + 'as its second operand (or zero); the absolute value of the result ' + 'is\n' + 'strictly smaller than the absolute value of the second operand ' + '[1].\n' + '\n' + 'The floor division and modulo operators are connected by the ' + 'following\n' + 'identity: "x == (x//y)*y + (x%y)". Floor division and modulo are ' + 'also\n' + 'connected with the built-in function "divmod()": "divmod(x, y) ==\n' + '(x//y, x%y)". [2].\n' + '\n' + 'In addition to performing the modulo operation on numbers, the ' + '"%"\n' + 'operator is also overloaded by string objects to perform ' + 'old-style\n' + 'string formatting (also known as interpolation). The syntax for\n' + 'string formatting is described in the Python Library Reference,\n' + 'section printf-style String Formatting.\n' + '\n' + 'The floor division operator, the modulo operator, and the ' + '"divmod()"\n' + 'function are not defined for complex numbers. Instead, convert to ' + 'a\n' + 'floating point number using the "abs()" function if appropriate.\n' + '\n' + 'The "+" (addition) operator yields the sum of its arguments. The\n' + 'arguments must either both be numbers or both be sequences of the ' + 'same\n' + 'type. In the former case, the numbers are converted to a common ' + 'type\n' + 'and then added together. In the latter case, the sequences are\n' + 'concatenated.\n' + '\n' + 'The "-" (subtraction) operator yields the difference of its ' + 'arguments.\n' + 'The numeric arguments are first converted to a common type.\n', + 'bitwise': '\n' + 'Binary bitwise operations\n' + '*************************\n' + '\n' + 'Each of the three bitwise operations has a different priority ' + 'level:\n' + '\n' + ' and_expr ::= shift_expr | and_expr "&" shift_expr\n' + ' xor_expr ::= and_expr | xor_expr "^" and_expr\n' + ' or_expr ::= xor_expr | or_expr "|" xor_expr\n' + '\n' + 'The "&" operator yields the bitwise AND of its arguments, which ' + 'must\n' + 'be integers.\n' + '\n' + 'The "^" operator yields the bitwise XOR (exclusive OR) of its\n' + 'arguments, which must be integers.\n' + '\n' + 'The "|" operator yields the bitwise (inclusive) OR of its ' + 'arguments,\n' + 'which must be integers.\n', + 'bltin-code-objects': '\n' + 'Code Objects\n' + '************\n' + '\n' + 'Code objects are used by the implementation to ' + 'represent "pseudo-\n' + 'compiled" executable Python code such as a function ' + 'body. They differ\n' + "from function objects because they don't contain a " + 'reference to their\n' + 'global execution environment. Code objects are ' + 'returned by the built-\n' + 'in "compile()" function and can be extracted from ' + 'function objects\n' + 'through their "__code__" attribute. See also the ' + '"code" module.\n' + '\n' + 'A code object can be executed or evaluated by passing ' + 'it (instead of a\n' + 'source string) to the "exec()" or "eval()" built-in ' + 'functions.\n' + '\n' + 'See The standard type hierarchy for more ' + 'information.\n', + 'bltin-ellipsis-object': '\n' + 'The Ellipsis Object\n' + '*******************\n' + '\n' + 'This object is commonly used by slicing (see ' + 'Slicings). It supports\n' + 'no special operations. There is exactly one ' + 'ellipsis object, named\n' + '"Ellipsis" (a built-in name). "type(Ellipsis)()" ' + 'produces the\n' + '"Ellipsis" singleton.\n' + '\n' + 'It is written as "Ellipsis" or "...".\n', + 'bltin-null-object': '\n' + 'The Null Object\n' + '***************\n' + '\n' + "This object is returned by functions that don't " + 'explicitly return a\n' + 'value. It supports no special operations. There is ' + 'exactly one null\n' + 'object, named "None" (a built-in name). "type(None)()" ' + 'produces the\n' + 'same singleton.\n' + '\n' + 'It is written as "None".\n', + 'bltin-type-objects': '\n' + 'Type Objects\n' + '************\n' + '\n' + 'Type objects represent the various object types. An ' + "object's type is\n" + 'accessed by the built-in function "type()". There are ' + 'no special\n' + 'operations on types. The standard module "types" ' + 'defines names for\n' + 'all standard built-in types.\n' + '\n' + 'Types are written like this: "".\n', + 'booleans': '\n' + 'Boolean operations\n' + '******************\n' + '\n' + ' or_test ::= and_test | or_test "or" and_test\n' + ' and_test ::= not_test | and_test "and" not_test\n' + ' not_test ::= comparison | "not" not_test\n' + '\n' + 'In the context of Boolean operations, and also when expressions ' + 'are\n' + 'used by control flow statements, the following values are ' + 'interpreted\n' + 'as false: "False", "None", numeric zero of all types, and empty\n' + 'strings and containers (including strings, tuples, lists,\n' + 'dictionaries, sets and frozensets). All other values are ' + 'interpreted\n' + 'as true. User-defined objects can customize their truth value ' + 'by\n' + 'providing a "__bool__()" method.\n' + '\n' + 'The operator "not" yields "True" if its argument is false, ' + '"False"\n' + 'otherwise.\n' + '\n' + 'The expression "x and y" first evaluates *x*; if *x* is false, ' + 'its\n' + 'value is returned; otherwise, *y* is evaluated and the resulting ' + 'value\n' + 'is returned.\n' + '\n' + 'The expression "x or y" first evaluates *x*; if *x* is true, its ' + 'value\n' + 'is returned; otherwise, *y* is evaluated and the resulting value ' + 'is\n' + 'returned.\n' + '\n' + '(Note that neither "and" nor "or" restrict the value and type ' + 'they\n' + 'return to "False" and "True", but rather return the last ' + 'evaluated\n' + 'argument. This is sometimes useful, e.g., if "s" is a string ' + 'that\n' + 'should be replaced by a default value if it is empty, the ' + 'expression\n' + '"s or \'foo\'" yields the desired value. Because "not" has to ' + 'create a\n' + 'new value, it returns a boolean value regardless of the type of ' + 'its\n' + 'argument (for example, "not \'foo\'" produces "False" rather ' + 'than "\'\'".)\n', + 'break': '\n' + 'The "break" statement\n' + '*********************\n' + '\n' + ' break_stmt ::= "break"\n' + '\n' + '"break" may only occur syntactically nested in a "for" or "while"\n' + 'loop, but not nested in a function or class definition within that\n' + 'loop.\n' + '\n' + 'It terminates the nearest enclosing loop, skipping the optional ' + '"else"\n' + 'clause if the loop has one.\n' + '\n' + 'If a "for" loop is terminated by "break", the loop control target\n' + 'keeps its current value.\n' + '\n' + 'When "break" passes control out of a "try" statement with a ' + '"finally"\n' + 'clause, that "finally" clause is executed before really leaving ' + 'the\n' + 'loop.\n', + 'callable-types': '\n' + 'Emulating callable objects\n' + '**************************\n' + '\n' + 'object.__call__(self[, args...])\n' + '\n' + ' Called when the instance is "called" as a function; if ' + 'this method\n' + ' is defined, "x(arg1, arg2, ...)" is a shorthand for\n' + ' "x.__call__(arg1, arg2, ...)".\n', + 'calls': '\n' + 'Calls\n' + '*****\n' + '\n' + 'A call calls a callable object (e.g., a *function*) with a ' + 'possibly\n' + 'empty series of *arguments*:\n' + '\n' + ' call ::= primary "(" [argument_list [","] | ' + 'comprehension] ")"\n' + ' argument_list ::= positional_arguments ["," ' + 'starred_and_keywords]\n' + ' ["," keywords_arguments]\n' + ' | starred_and_keywords ["," ' + 'keywords_arguments]\n' + ' | keywords_arguments\n' + ' positional_arguments ::= ["*"] expression ("," ["*"] ' + 'expression)*\n' + ' starred_and_keywords ::= ("*" expression | keyword_item)\n' + ' ("," "*" expression | "," ' + 'keyword_item)*\n' + ' keywords_arguments ::= (keyword_item | "**" expression)\n' + ' ("," keyword_item | "**" expression)*\n' + ' keyword_item ::= identifier "=" expression\n' + '\n' + 'An optional trailing comma may be present after the positional and\n' + 'keyword arguments but does not affect the semantics.\n' + '\n' + 'The primary must evaluate to a callable object (user-defined\n' + 'functions, built-in functions, methods of built-in objects, class\n' + 'objects, methods of class instances, and all objects having a\n' + '"__call__()" method are callable). All argument expressions are\n' + 'evaluated before the call is attempted. Please refer to section\n' + 'Function definitions for the syntax of formal *parameter* lists.\n' + '\n' + 'If keyword arguments are present, they are first converted to\n' + 'positional arguments, as follows. First, a list of unfilled slots ' + 'is\n' + 'created for the formal parameters. If there are N positional\n' + 'arguments, they are placed in the first N slots. Next, for each\n' + 'keyword argument, the identifier is used to determine the\n' + 'corresponding slot (if the identifier is the same as the first ' + 'formal\n' + 'parameter name, the first slot is used, and so on). If the slot ' + 'is\n' + 'already filled, a "TypeError" exception is raised. Otherwise, the\n' + 'value of the argument is placed in the slot, filling it (even if ' + 'the\n' + 'expression is "None", it fills the slot). When all arguments have\n' + 'been processed, the slots that are still unfilled are filled with ' + 'the\n' + 'corresponding default value from the function definition. ' + '(Default\n' + 'values are calculated, once, when the function is defined; thus, a\n' + 'mutable object such as a list or dictionary used as default value ' + 'will\n' + "be shared by all calls that don't specify an argument value for " + 'the\n' + 'corresponding slot; this should usually be avoided.) If there are ' + 'any\n' + 'unfilled slots for which no default value is specified, a ' + '"TypeError"\n' + 'exception is raised. Otherwise, the list of filled slots is used ' + 'as\n' + 'the argument list for the call.\n' + '\n' + '**CPython implementation detail:** An implementation may provide\n' + 'built-in functions whose positional parameters do not have names, ' + 'even\n' + "if they are 'named' for the purpose of documentation, and which\n" + 'therefore cannot be supplied by keyword. In CPython, this is the ' + 'case\n' + 'for functions implemented in C that use "PyArg_ParseTuple()" to ' + 'parse\n' + 'their arguments.\n' + '\n' + 'If there are more positional arguments than there are formal ' + 'parameter\n' + 'slots, a "TypeError" exception is raised, unless a formal ' + 'parameter\n' + 'using the syntax "*identifier" is present; in this case, that ' + 'formal\n' + 'parameter receives a tuple containing the excess positional ' + 'arguments\n' + '(or an empty tuple if there were no excess positional arguments).\n' + '\n' + 'If any keyword argument does not correspond to a formal parameter\n' + 'name, a "TypeError" exception is raised, unless a formal parameter\n' + 'using the syntax "**identifier" is present; in this case, that ' + 'formal\n' + 'parameter receives a dictionary containing the excess keyword\n' + 'arguments (using the keywords as keys and the argument values as\n' + 'corresponding values), or a (new) empty dictionary if there were ' + 'no\n' + 'excess keyword arguments.\n' + '\n' + 'If the syntax "*expression" appears in the function call, ' + '"expression"\n' + 'must evaluate to an *iterable*. Elements from these iterables are\n' + 'treated as if they were additional positional arguments. For the ' + 'call\n' + '"f(x1, x2, *y, x3, x4)", if *y* evaluates to a sequence *y1*, ...,\n' + '*yM*, this is equivalent to a call with M+4 positional arguments ' + '*x1*,\n' + '*x2*, *y1*, ..., *yM*, *x3*, *x4*.\n' + '\n' + 'A consequence of this is that although the "*expression" syntax ' + 'may\n' + 'appear *after* explicit keyword arguments, it is processed ' + '*before*\n' + 'the keyword arguments (and any "**expression" arguments -- see ' + 'below).\n' + 'So:\n' + '\n' + ' >>> def f(a, b):\n' + ' ... print(a, b)\n' + ' ...\n' + ' >>> f(b=1, *(2,))\n' + ' 2 1\n' + ' >>> f(a=1, *(2,))\n' + ' Traceback (most recent call last):\n' + ' File "", line 1, in ?\n' + " TypeError: f() got multiple values for keyword argument 'a'\n" + ' >>> f(1, *(2,))\n' + ' 1 2\n' + '\n' + 'It is unusual for both keyword arguments and the "*expression" ' + 'syntax\n' + 'to be used in the same call, so in practice this confusion does ' + 'not\n' + 'arise.\n' + '\n' + 'If the syntax "**expression" appears in the function call,\n' + '"expression" must evaluate to a *mapping*, the contents of which ' + 'are\n' + 'treated as additional keyword arguments. If a keyword is already\n' + 'present (as an explicit keyword argument, or from another ' + 'unpacking),\n' + 'a "TypeError" exception is raised.\n' + '\n' + 'Formal parameters using the syntax "*identifier" or "**identifier"\n' + 'cannot be used as positional argument slots or as keyword argument\n' + 'names.\n' + '\n' + 'Changed in version 3.5: Function calls accept any number of "*" ' + 'and\n' + '"**" unpackings, positional arguments may follow iterable ' + 'unpackings\n' + '("*"), and keyword arguments may follow dictionary unpackings ' + '("**").\n' + 'Originally proposed by **PEP 448**.\n' + '\n' + 'A call always returns some value, possibly "None", unless it raises ' + 'an\n' + 'exception. How this value is computed depends on the type of the\n' + 'callable object.\n' + '\n' + 'If it is---\n' + '\n' + 'a user-defined function:\n' + ' The code block for the function is executed, passing it the\n' + ' argument list. The first thing the code block will do is bind ' + 'the\n' + ' formal parameters to the arguments; this is described in ' + 'section\n' + ' Function definitions. When the code block executes a "return"\n' + ' statement, this specifies the return value of the function ' + 'call.\n' + '\n' + 'a built-in function or method:\n' + ' The result is up to the interpreter; see Built-in Functions for ' + 'the\n' + ' descriptions of built-in functions and methods.\n' + '\n' + 'a class object:\n' + ' A new instance of that class is returned.\n' + '\n' + 'a class instance method:\n' + ' The corresponding user-defined function is called, with an ' + 'argument\n' + ' list that is one longer than the argument list of the call: the\n' + ' instance becomes the first argument.\n' + '\n' + 'a class instance:\n' + ' The class must define a "__call__()" method; the effect is then ' + 'the\n' + ' same as if that method was called.\n', + 'class': '\n' + 'Class definitions\n' + '*****************\n' + '\n' + 'A class definition defines a class object (see section The ' + 'standard\n' + 'type hierarchy):\n' + '\n' + ' classdef ::= [decorators] "class" classname [inheritance] ":" ' + 'suite\n' + ' inheritance ::= "(" [argument_list] ")"\n' + ' classname ::= identifier\n' + '\n' + 'A class definition is an executable statement. The inheritance ' + 'list\n' + 'usually gives a list of base classes (see Metaclasses for more\n' + 'advanced uses), so each item in the list should evaluate to a ' + 'class\n' + 'object which allows subclassing. Classes without an inheritance ' + 'list\n' + 'inherit, by default, from the base class "object"; hence,\n' + '\n' + ' class Foo:\n' + ' pass\n' + '\n' + 'is equivalent to\n' + '\n' + ' class Foo(object):\n' + ' pass\n' + '\n' + "The class's suite is then executed in a new execution frame (see\n" + 'Naming and binding), using a newly created local namespace and the\n' + 'original global namespace. (Usually, the suite contains mostly\n' + "function definitions.) When the class's suite finishes execution, " + 'its\n' + 'execution frame is discarded but its local namespace is saved. [4] ' + 'A\n' + 'class object is then created using the inheritance list for the ' + 'base\n' + 'classes and the saved local namespace for the attribute ' + 'dictionary.\n' + 'The class name is bound to this class object in the original local\n' + 'namespace.\n' + '\n' + 'The order in which attributes are defined in the class body is\n' + 'preserved in the new class\'s "__dict__". Note that this is ' + 'reliable\n' + 'only right after the class is created and only for classes that ' + 'were\n' + 'defined using the definition syntax.\n' + '\n' + 'Class creation can be customized heavily using metaclasses.\n' + '\n' + 'Classes can also be decorated: just like when decorating ' + 'functions,\n' + '\n' + ' @f1(arg)\n' + ' @f2\n' + ' class Foo: pass\n' + '\n' + 'is roughly equivalent to\n' + '\n' + ' class Foo: pass\n' + ' Foo = f1(arg)(f2(Foo))\n' + '\n' + 'The evaluation rules for the decorator expressions are the same as ' + 'for\n' + 'function decorators. The result is then bound to the class name.\n' + '\n' + "**Programmer's note:** Variables defined in the class definition " + 'are\n' + 'class attributes; they are shared by instances. Instance ' + 'attributes\n' + 'can be set in a method with "self.name = value". Both class and\n' + 'instance attributes are accessible through the notation ' + '""self.name"",\n' + 'and an instance attribute hides a class attribute with the same ' + 'name\n' + 'when accessed in this way. Class attributes can be used as ' + 'defaults\n' + 'for instance attributes, but using mutable values there can lead ' + 'to\n' + 'unexpected results. Descriptors can be used to create instance\n' + 'variables with different implementation details.\n' + '\n' + 'See also: **PEP 3115** - Metaclasses in Python 3 **PEP 3129** -\n' + ' Class Decorators\n', + 'comparisons': '\n' + 'Comparisons\n' + '***********\n' + '\n' + 'Unlike C, all comparison operations in Python have the same ' + 'priority,\n' + 'which is lower than that of any arithmetic, shifting or ' + 'bitwise\n' + 'operation. Also unlike C, expressions like "a < b < c" have ' + 'the\n' + 'interpretation that is conventional in mathematics:\n' + '\n' + ' comparison ::= or_expr ( comp_operator or_expr )*\n' + ' comp_operator ::= "<" | ">" | "==" | ">=" | "<=" | "!="\n' + ' | "is" ["not"] | ["not"] "in"\n' + '\n' + 'Comparisons yield boolean values: "True" or "False".\n' + '\n' + 'Comparisons can be chained arbitrarily, e.g., "x < y <= z" ' + 'is\n' + 'equivalent to "x < y and y <= z", except that "y" is ' + 'evaluated only\n' + 'once (but in both cases "z" is not evaluated at all when "x < ' + 'y" is\n' + 'found to be false).\n' + '\n' + 'Formally, if *a*, *b*, *c*, ..., *y*, *z* are expressions and ' + '*op1*,\n' + '*op2*, ..., *opN* are comparison operators, then "a op1 b op2 ' + 'c ... y\n' + 'opN z" is equivalent to "a op1 b and b op2 c and ... y opN ' + 'z", except\n' + 'that each expression is evaluated at most once.\n' + '\n' + 'Note that "a op1 b op2 c" doesn\'t imply any kind of ' + 'comparison between\n' + '*a* and *c*, so that, e.g., "x < y > z" is perfectly legal ' + '(though\n' + 'perhaps not pretty).\n' + '\n' + '\n' + 'Value comparisons\n' + '=================\n' + '\n' + 'The operators "<", ">", "==", ">=", "<=", and "!=" compare ' + 'the values\n' + 'of two objects. The objects do not need to have the same ' + 'type.\n' + '\n' + 'Chapter Objects, values and types states that objects have a ' + 'value (in\n' + 'addition to type and identity). The value of an object is a ' + 'rather\n' + 'abstract notion in Python: For example, there is no canonical ' + 'access\n' + "method for an object's value. Also, there is no requirement " + 'that the\n' + 'value of an object should be constructed in a particular way, ' + 'e.g.\n' + 'comprised of all its data attributes. Comparison operators ' + 'implement a\n' + 'particular notion of what the value of an object is. One can ' + 'think of\n' + 'them as defining the value of an object indirectly, by means ' + 'of their\n' + 'comparison implementation.\n' + '\n' + 'Because all types are (direct or indirect) subtypes of ' + '"object", they\n' + 'inherit the default comparison behavior from "object". Types ' + 'can\n' + 'customize their comparison behavior by implementing *rich ' + 'comparison\n' + 'methods* like "__lt__()", described in Basic customization.\n' + '\n' + 'The default behavior for equality comparison ("==" and "!=") ' + 'is based\n' + 'on the identity of the objects. Hence, equality comparison ' + 'of\n' + 'instances with the same identity results in equality, and ' + 'equality\n' + 'comparison of instances with different identities results in\n' + 'inequality. A motivation for this default behavior is the ' + 'desire that\n' + 'all objects should be reflexive (i.e. "x is y" implies "x == ' + 'y").\n' + '\n' + 'A default order comparison ("<", ">", "<=", and ">=") is not ' + 'provided;\n' + 'an attempt raises "TypeError". A motivation for this default ' + 'behavior\n' + 'is the lack of a similar invariant as for equality.\n' + '\n' + 'The behavior of the default equality comparison, that ' + 'instances with\n' + 'different identities are always unequal, may be in contrast ' + 'to what\n' + 'types will need that have a sensible definition of object ' + 'value and\n' + 'value-based equality. Such types will need to customize ' + 'their\n' + 'comparison behavior, and in fact, a number of built-in types ' + 'have done\n' + 'that.\n' + '\n' + 'The following list describes the comparison behavior of the ' + 'most\n' + 'important built-in types.\n' + '\n' + '* Numbers of built-in numeric types (Numeric Types --- int, ' + 'float,\n' + ' complex) and of the standard library types ' + '"fractions.Fraction" and\n' + ' "decimal.Decimal" can be compared within and across their ' + 'types,\n' + ' with the restriction that complex numbers do not support ' + 'order\n' + ' comparison. Within the limits of the types involved, they ' + 'compare\n' + ' mathematically (algorithmically) correct without loss of ' + 'precision.\n' + '\n' + ' The not-a-number values "float(\'NaN\')" and ' + '"Decimal(\'NaN\')" are\n' + ' special. They are identical to themselves ("x is x" is ' + 'true) but\n' + ' are not equal to themselves ("x == x" is false). ' + 'Additionally,\n' + ' comparing any number to a not-a-number value will return ' + '"False".\n' + ' For example, both "3 < float(\'NaN\')" and "float(\'NaN\') ' + '< 3" will\n' + ' return "False".\n' + '\n' + '* Binary sequences (instances of "bytes" or "bytearray") can ' + 'be\n' + ' compared within and across their types. They compare\n' + ' lexicographically using the numeric values of their ' + 'elements.\n' + '\n' + '* Strings (instances of "str") compare lexicographically ' + 'using the\n' + ' numerical Unicode code points (the result of the built-in ' + 'function\n' + ' "ord()") of their characters. [3]\n' + '\n' + ' Strings and binary sequences cannot be directly compared.\n' + '\n' + '* Sequences (instances of "tuple", "list", or "range") can ' + 'be\n' + ' compared only within each of their types, with the ' + 'restriction that\n' + ' ranges do not support order comparison. Equality ' + 'comparison across\n' + ' these types results in unequality, and ordering comparison ' + 'across\n' + ' these types raises "TypeError".\n' + '\n' + ' Sequences compare lexicographically using comparison of\n' + ' corresponding elements, whereby reflexivity of the elements ' + 'is\n' + ' enforced.\n' + '\n' + ' In enforcing reflexivity of elements, the comparison of ' + 'collections\n' + ' assumes that for a collection element "x", "x == x" is ' + 'always true.\n' + ' Based on that assumption, element identity is compared ' + 'first, and\n' + ' element comparison is performed only for distinct ' + 'elements. This\n' + ' approach yields the same result as a strict element ' + 'comparison\n' + ' would, if the compared elements are reflexive. For ' + 'non-reflexive\n' + ' elements, the result is different than for strict element\n' + ' comparison, and may be surprising: The non-reflexive ' + 'not-a-number\n' + ' values for example result in the following comparison ' + 'behavior when\n' + ' used in a list:\n' + '\n' + " >>> nan = float('NaN')\n" + ' >>> nan is nan\n' + ' True\n' + ' >>> nan == nan\n' + ' False <-- the defined non-reflexive ' + 'behavior of NaN\n' + ' >>> [nan] == [nan]\n' + ' True <-- list enforces reflexivity and ' + 'tests identity first\n' + '\n' + ' Lexicographical comparison between built-in collections ' + 'works as\n' + ' follows:\n' + '\n' + ' * For two collections to compare equal, they must be of the ' + 'same\n' + ' type, have the same length, and each pair of ' + 'corresponding\n' + ' elements must compare equal (for example, "[1,2] == ' + '(1,2)" is\n' + ' false because the type is not the same).\n' + '\n' + ' * Collections that support order comparison are ordered the ' + 'same\n' + ' as their first unequal elements (for example, "[1,2,x] <= ' + '[1,2,y]"\n' + ' has the same value as "x <= y"). If a corresponding ' + 'element does\n' + ' not exist, the shorter collection is ordered first (for ' + 'example,\n' + ' "[1,2] < [1,2,3]" is true).\n' + '\n' + '* Mappings (instances of "dict") compare equal if and only if ' + 'they\n' + ' have equal *(key, value)* pairs. Equality comparison of the ' + 'keys and\n' + ' elements enforces reflexivity.\n' + '\n' + ' Order comparisons ("<", ">", "<=", and ">=") raise ' + '"TypeError".\n' + '\n' + '* Sets (instances of "set" or "frozenset") can be compared ' + 'within\n' + ' and across their types.\n' + '\n' + ' They define order comparison operators to mean subset and ' + 'superset\n' + ' tests. Those relations do not define total orderings (for ' + 'example,\n' + ' the two sets "{1,2}" and "{2,3}" are not equal, nor subsets ' + 'of one\n' + ' another, nor supersets of one another). Accordingly, sets ' + 'are not\n' + ' appropriate arguments for functions which depend on total ' + 'ordering\n' + ' (for example, "min()", "max()", and "sorted()" produce ' + 'undefined\n' + ' results given a list of sets as inputs).\n' + '\n' + ' Comparison of sets enforces reflexivity of its elements.\n' + '\n' + '* Most other built-in types have no comparison methods ' + 'implemented,\n' + ' so they inherit the default comparison behavior.\n' + '\n' + 'User-defined classes that customize their comparison behavior ' + 'should\n' + 'follow some consistency rules, if possible:\n' + '\n' + '* Equality comparison should be reflexive. In other words, ' + 'identical\n' + ' objects should compare equal:\n' + '\n' + ' "x is y" implies "x == y"\n' + '\n' + '* Comparison should be symmetric. In other words, the ' + 'following\n' + ' expressions should have the same result:\n' + '\n' + ' "x == y" and "y == x"\n' + '\n' + ' "x != y" and "y != x"\n' + '\n' + ' "x < y" and "y > x"\n' + '\n' + ' "x <= y" and "y >= x"\n' + '\n' + '* Comparison should be transitive. The following ' + '(non-exhaustive)\n' + ' examples illustrate that:\n' + '\n' + ' "x > y and y > z" implies "x > z"\n' + '\n' + ' "x < y and y <= z" implies "x < z"\n' + '\n' + '* Inverse comparison should result in the boolean negation. ' + 'In other\n' + ' words, the following expressions should have the same ' + 'result:\n' + '\n' + ' "x == y" and "not x != y"\n' + '\n' + ' "x < y" and "not x >= y" (for total ordering)\n' + '\n' + ' "x > y" and "not x <= y" (for total ordering)\n' + '\n' + ' The last two expressions apply to totally ordered ' + 'collections (e.g.\n' + ' to sequences, but not to sets or mappings). See also the\n' + ' "total_ordering()" decorator.\n' + '\n' + 'Python does not enforce these consistency rules. In fact, ' + 'the\n' + 'not-a-number values are an example for not following these ' + 'rules.\n' + '\n' + '\n' + 'Membership test operations\n' + '==========================\n' + '\n' + 'The operators "in" and "not in" test for membership. "x in ' + 's"\n' + 'evaluates to true if *x* is a member of *s*, and false ' + 'otherwise. "x\n' + 'not in s" returns the negation of "x in s". All built-in ' + 'sequences\n' + 'and set types support this as well as dictionary, for which ' + '"in" tests\n' + 'whether the dictionary has a given key. For container types ' + 'such as\n' + 'list, tuple, set, frozenset, dict, or collections.deque, the\n' + 'expression "x in y" is equivalent to "any(x is e or x == e ' + 'for e in\n' + 'y)".\n' + '\n' + 'For the string and bytes types, "x in y" is true if and only ' + 'if *x* is\n' + 'a substring of *y*. An equivalent test is "y.find(x) != ' + '-1". Empty\n' + 'strings are always considered to be a substring of any other ' + 'string,\n' + 'so """ in "abc"" will return "True".\n' + '\n' + 'For user-defined classes which define the "__contains__()" ' + 'method, "x\n' + 'in y" is true if and only if "y.__contains__(x)" is true.\n' + '\n' + 'For user-defined classes which do not define "__contains__()" ' + 'but do\n' + 'define "__iter__()", "x in y" is true if some value "z" with ' + '"x == z"\n' + 'is produced while iterating over "y". If an exception is ' + 'raised\n' + 'during the iteration, it is as if "in" raised that ' + 'exception.\n' + '\n' + 'Lastly, the old-style iteration protocol is tried: if a class ' + 'defines\n' + '"__getitem__()", "x in y" is true if and only if there is a ' + 'non-\n' + 'negative integer index *i* such that "x == y[i]", and all ' + 'lower\n' + 'integer indices do not raise "IndexError" exception. (If any ' + 'other\n' + 'exception is raised, it is as if "in" raised that ' + 'exception).\n' + '\n' + 'The operator "not in" is defined to have the inverse true ' + 'value of\n' + '"in".\n' + '\n' + '\n' + 'Identity comparisons\n' + '====================\n' + '\n' + 'The operators "is" and "is not" test for object identity: "x ' + 'is y" is\n' + 'true if and only if *x* and *y* are the same object. Object ' + 'identity\n' + 'is determined using the "id()" function. "x is not y" yields ' + 'the\n' + 'inverse truth value. [4]\n', + 'compound': '\n' + 'Compound statements\n' + '*******************\n' + '\n' + 'Compound statements contain (groups of) other statements; they ' + 'affect\n' + 'or control the execution of those other statements in some way. ' + 'In\n' + 'general, compound statements span multiple lines, although in ' + 'simple\n' + 'incarnations a whole compound statement may be contained in one ' + 'line.\n' + '\n' + 'The "if", "while" and "for" statements implement traditional ' + 'control\n' + 'flow constructs. "try" specifies exception handlers and/or ' + 'cleanup\n' + 'code for a group of statements, while the "with" statement ' + 'allows the\n' + 'execution of initialization and finalization code around a block ' + 'of\n' + 'code. Function and class definitions are also syntactically ' + 'compound\n' + 'statements.\n' + '\n' + "A compound statement consists of one or more 'clauses.' A " + 'clause\n' + "consists of a header and a 'suite.' The clause headers of a\n" + 'particular compound statement are all at the same indentation ' + 'level.\n' + 'Each clause header begins with a uniquely identifying keyword ' + 'and ends\n' + 'with a colon. A suite is a group of statements controlled by a\n' + 'clause. A suite can be one or more semicolon-separated simple\n' + 'statements on the same line as the header, following the ' + "header's\n" + 'colon, or it can be one or more indented statements on ' + 'subsequent\n' + 'lines. Only the latter form of a suite can contain nested ' + 'compound\n' + "statements; the following is illegal, mostly because it wouldn't " + 'be\n' + 'clear to which "if" clause a following "else" clause would ' + 'belong:\n' + '\n' + ' if test1: if test2: print(x)\n' + '\n' + 'Also note that the semicolon binds tighter than the colon in ' + 'this\n' + 'context, so that in the following example, either all or none of ' + 'the\n' + '"print()" calls are executed:\n' + '\n' + ' if x < y < z: print(x); print(y); print(z)\n' + '\n' + 'Summarizing:\n' + '\n' + ' compound_stmt ::= if_stmt\n' + ' | while_stmt\n' + ' | for_stmt\n' + ' | try_stmt\n' + ' | with_stmt\n' + ' | funcdef\n' + ' | classdef\n' + ' | async_with_stmt\n' + ' | async_for_stmt\n' + ' | async_funcdef\n' + ' suite ::= stmt_list NEWLINE | NEWLINE INDENT ' + 'statement+ DEDENT\n' + ' statement ::= stmt_list NEWLINE | compound_stmt\n' + ' stmt_list ::= simple_stmt (";" simple_stmt)* [";"]\n' + '\n' + 'Note that statements always end in a "NEWLINE" possibly followed ' + 'by a\n' + '"DEDENT". Also note that optional continuation clauses always ' + 'begin\n' + 'with a keyword that cannot start a statement, thus there are no\n' + 'ambiguities (the \'dangling "else"\' problem is solved in Python ' + 'by\n' + 'requiring nested "if" statements to be indented).\n' + '\n' + 'The formatting of the grammar rules in the following sections ' + 'places\n' + 'each clause on a separate line for clarity.\n' + '\n' + '\n' + 'The "if" statement\n' + '==================\n' + '\n' + 'The "if" statement is used for conditional execution:\n' + '\n' + ' if_stmt ::= "if" expression ":" suite\n' + ' ( "elif" expression ":" suite )*\n' + ' ["else" ":" suite]\n' + '\n' + 'It selects exactly one of the suites by evaluating the ' + 'expressions one\n' + 'by one until one is found to be true (see section Boolean ' + 'operations\n' + 'for the definition of true and false); then that suite is ' + 'executed\n' + '(and no other part of the "if" statement is executed or ' + 'evaluated).\n' + 'If all expressions are false, the suite of the "else" clause, ' + 'if\n' + 'present, is executed.\n' + '\n' + '\n' + 'The "while" statement\n' + '=====================\n' + '\n' + 'The "while" statement is used for repeated execution as long as ' + 'an\n' + 'expression is true:\n' + '\n' + ' while_stmt ::= "while" expression ":" suite\n' + ' ["else" ":" suite]\n' + '\n' + 'This repeatedly tests the expression and, if it is true, ' + 'executes the\n' + 'first suite; if the expression is false (which may be the first ' + 'time\n' + 'it is tested) the suite of the "else" clause, if present, is ' + 'executed\n' + 'and the loop terminates.\n' + '\n' + 'A "break" statement executed in the first suite terminates the ' + 'loop\n' + 'without executing the "else" clause\'s suite. A "continue" ' + 'statement\n' + 'executed in the first suite skips the rest of the suite and goes ' + 'back\n' + 'to testing the expression.\n' + '\n' + '\n' + 'The "for" statement\n' + '===================\n' + '\n' + 'The "for" statement is used to iterate over the elements of a ' + 'sequence\n' + '(such as a string, tuple or list) or other iterable object:\n' + '\n' + ' for_stmt ::= "for" target_list "in" expression_list ":" ' + 'suite\n' + ' ["else" ":" suite]\n' + '\n' + 'The expression list is evaluated once; it should yield an ' + 'iterable\n' + 'object. An iterator is created for the result of the\n' + '"expression_list". The suite is then executed once for each ' + 'item\n' + 'provided by the iterator, in the order returned by the ' + 'iterator. Each\n' + 'item in turn is assigned to the target list using the standard ' + 'rules\n' + 'for assignments (see Assignment statements), and then the suite ' + 'is\n' + 'executed. When the items are exhausted (which is immediately ' + 'when the\n' + 'sequence is empty or an iterator raises a "StopIteration" ' + 'exception),\n' + 'the suite in the "else" clause, if present, is executed, and the ' + 'loop\n' + 'terminates.\n' + '\n' + 'A "break" statement executed in the first suite terminates the ' + 'loop\n' + 'without executing the "else" clause\'s suite. A "continue" ' + 'statement\n' + 'executed in the first suite skips the rest of the suite and ' + 'continues\n' + 'with the next item, or with the "else" clause if there is no ' + 'next\n' + 'item.\n' + '\n' + 'The for-loop makes assignments to the variables(s) in the target ' + 'list.\n' + 'This overwrites all previous assignments to those variables ' + 'including\n' + 'those made in the suite of the for-loop:\n' + '\n' + ' for i in range(10):\n' + ' print(i)\n' + ' i = 5 # this will not affect the for-loop\n' + ' # because i will be overwritten with ' + 'the next\n' + ' # index in the range\n' + '\n' + 'Names in the target list are not deleted when the loop is ' + 'finished,\n' + 'but if the sequence is empty, they will not have been assigned ' + 'to at\n' + 'all by the loop. Hint: the built-in function "range()" returns ' + 'an\n' + "iterator of integers suitable to emulate the effect of Pascal's " + '"for i\n' + ':= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, ' + '2]".\n' + '\n' + 'Note: There is a subtlety when the sequence is being modified by ' + 'the\n' + ' loop (this can only occur for mutable sequences, i.e. lists). ' + 'An\n' + ' internal counter is used to keep track of which item is used ' + 'next,\n' + ' and this is incremented on each iteration. When this counter ' + 'has\n' + ' reached the length of the sequence the loop terminates. This ' + 'means\n' + ' that if the suite deletes the current (or a previous) item ' + 'from the\n' + ' sequence, the next item will be skipped (since it gets the ' + 'index of\n' + ' the current item which has already been treated). Likewise, ' + 'if the\n' + ' suite inserts an item in the sequence before the current item, ' + 'the\n' + ' current item will be treated again the next time through the ' + 'loop.\n' + ' This can lead to nasty bugs that can be avoided by making a\n' + ' temporary copy using a slice of the whole sequence, e.g.,\n' + '\n' + ' for x in a[:]:\n' + ' if x < 0: a.remove(x)\n' + '\n' + '\n' + 'The "try" statement\n' + '===================\n' + '\n' + 'The "try" statement specifies exception handlers and/or cleanup ' + 'code\n' + 'for a group of statements:\n' + '\n' + ' try_stmt ::= try1_stmt | try2_stmt\n' + ' try1_stmt ::= "try" ":" suite\n' + ' ("except" [expression ["as" identifier]] ":" ' + 'suite)+\n' + ' ["else" ":" suite]\n' + ' ["finally" ":" suite]\n' + ' try2_stmt ::= "try" ":" suite\n' + ' "finally" ":" suite\n' + '\n' + 'The "except" clause(s) specify one or more exception handlers. ' + 'When no\n' + 'exception occurs in the "try" clause, no exception handler is\n' + 'executed. When an exception occurs in the "try" suite, a search ' + 'for an\n' + 'exception handler is started. This search inspects the except ' + 'clauses\n' + 'in turn until one is found that matches the exception. An ' + 'expression-\n' + 'less except clause, if present, must be last; it matches any\n' + 'exception. For an except clause with an expression, that ' + 'expression\n' + 'is evaluated, and the clause matches the exception if the ' + 'resulting\n' + 'object is "compatible" with the exception. An object is ' + 'compatible\n' + 'with an exception if it is the class or a base class of the ' + 'exception\n' + 'object or a tuple containing an item compatible with the ' + 'exception.\n' + '\n' + 'If no except clause matches the exception, the search for an ' + 'exception\n' + 'handler continues in the surrounding code and on the invocation ' + 'stack.\n' + '[1]\n' + '\n' + 'If the evaluation of an expression in the header of an except ' + 'clause\n' + 'raises an exception, the original search for a handler is ' + 'canceled and\n' + 'a search starts for the new exception in the surrounding code ' + 'and on\n' + 'the call stack (it is treated as if the entire "try" statement ' + 'raised\n' + 'the exception).\n' + '\n' + 'When a matching except clause is found, the exception is ' + 'assigned to\n' + 'the target specified after the "as" keyword in that except ' + 'clause, if\n' + "present, and the except clause's suite is executed. All except\n" + 'clauses must have an executable block. When the end of this ' + 'block is\n' + 'reached, execution continues normally after the entire try ' + 'statement.\n' + '(This means that if two nested handlers exist for the same ' + 'exception,\n' + 'and the exception occurs in the try clause of the inner handler, ' + 'the\n' + 'outer handler will not handle the exception.)\n' + '\n' + 'When an exception has been assigned using "as target", it is ' + 'cleared\n' + 'at the end of the except clause. This is as if\n' + '\n' + ' except E as N:\n' + ' foo\n' + '\n' + 'was translated to\n' + '\n' + ' except E as N:\n' + ' try:\n' + ' foo\n' + ' finally:\n' + ' del N\n' + '\n' + 'This means the exception must be assigned to a different name to ' + 'be\n' + 'able to refer to it after the except clause. Exceptions are ' + 'cleared\n' + 'because with the traceback attached to them, they form a ' + 'reference\n' + 'cycle with the stack frame, keeping all locals in that frame ' + 'alive\n' + 'until the next garbage collection occurs.\n' + '\n' + "Before an except clause's suite is executed, details about the\n" + 'exception are stored in the "sys" module and can be accessed ' + 'via\n' + '"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting ' + 'of the\n' + 'exception class, the exception instance and a traceback object ' + '(see\n' + 'section The standard type hierarchy) identifying the point in ' + 'the\n' + 'program where the exception occurred. "sys.exc_info()" values ' + 'are\n' + 'restored to their previous values (before the call) when ' + 'returning\n' + 'from a function that handled an exception.\n' + '\n' + 'The optional "else" clause is executed if and when control flows ' + 'off\n' + 'the end of the "try" clause. [2] Exceptions in the "else" clause ' + 'are\n' + 'not handled by the preceding "except" clauses.\n' + '\n' + 'If "finally" is present, it specifies a \'cleanup\' handler. ' + 'The "try"\n' + 'clause is executed, including any "except" and "else" clauses. ' + 'If an\n' + 'exception occurs in any of the clauses and is not handled, the\n' + 'exception is temporarily saved. The "finally" clause is ' + 'executed. If\n' + 'there is a saved exception it is re-raised at the end of the ' + '"finally"\n' + 'clause. If the "finally" clause raises another exception, the ' + 'saved\n' + 'exception is set as the context of the new exception. If the ' + '"finally"\n' + 'clause executes a "return" or "break" statement, the saved ' + 'exception\n' + 'is discarded:\n' + '\n' + ' >>> def f():\n' + ' ... try:\n' + ' ... 1/0\n' + ' ... finally:\n' + ' ... return 42\n' + ' ...\n' + ' >>> f()\n' + ' 42\n' + '\n' + 'The exception information is not available to the program ' + 'during\n' + 'execution of the "finally" clause.\n' + '\n' + 'When a "return", "break" or "continue" statement is executed in ' + 'the\n' + '"try" suite of a "try"..."finally" statement, the "finally" ' + 'clause is\n' + 'also executed \'on the way out.\' A "continue" statement is ' + 'illegal in\n' + 'the "finally" clause. (The reason is a problem with the current\n' + 'implementation --- this restriction may be lifted in the ' + 'future).\n' + '\n' + 'The return value of a function is determined by the last ' + '"return"\n' + 'statement executed. Since the "finally" clause always executes, ' + 'a\n' + '"return" statement executed in the "finally" clause will always ' + 'be the\n' + 'last one executed:\n' + '\n' + ' >>> def foo():\n' + ' ... try:\n' + " ... return 'try'\n" + ' ... finally:\n' + " ... return 'finally'\n" + ' ...\n' + ' >>> foo()\n' + " 'finally'\n" + '\n' + 'Additional information on exceptions can be found in section\n' + 'Exceptions, and information on using the "raise" statement to ' + 'generate\n' + 'exceptions may be found in section The raise statement.\n' + '\n' + '\n' + 'The "with" statement\n' + '====================\n' + '\n' + 'The "with" statement is used to wrap the execution of a block ' + 'with\n' + 'methods defined by a context manager (see section With ' + 'Statement\n' + 'Context Managers). This allows common ' + '"try"..."except"..."finally"\n' + 'usage patterns to be encapsulated for convenient reuse.\n' + '\n' + ' with_stmt ::= "with" with_item ("," with_item)* ":" suite\n' + ' with_item ::= expression ["as" target]\n' + '\n' + 'The execution of the "with" statement with one "item" proceeds ' + 'as\n' + 'follows:\n' + '\n' + '1. The context expression (the expression given in the ' + '"with_item")\n' + ' is evaluated to obtain a context manager.\n' + '\n' + '2. The context manager\'s "__exit__()" is loaded for later use.\n' + '\n' + '3. The context manager\'s "__enter__()" method is invoked.\n' + '\n' + '4. If a target was included in the "with" statement, the return\n' + ' value from "__enter__()" is assigned to it.\n' + '\n' + ' Note: The "with" statement guarantees that if the ' + '"__enter__()"\n' + ' method returns without an error, then "__exit__()" will ' + 'always be\n' + ' called. Thus, if an error occurs during the assignment to ' + 'the\n' + ' target list, it will be treated the same as an error ' + 'occurring\n' + ' within the suite would be. See step 6 below.\n' + '\n' + '5. The suite is executed.\n' + '\n' + '6. The context manager\'s "__exit__()" method is invoked. If ' + 'an\n' + ' exception caused the suite to be exited, its type, value, ' + 'and\n' + ' traceback are passed as arguments to "__exit__()". Otherwise, ' + 'three\n' + ' "None" arguments are supplied.\n' + '\n' + ' If the suite was exited due to an exception, and the return ' + 'value\n' + ' from the "__exit__()" method was false, the exception is ' + 'reraised.\n' + ' If the return value was true, the exception is suppressed, ' + 'and\n' + ' execution continues with the statement following the "with"\n' + ' statement.\n' + '\n' + ' If the suite was exited for any reason other than an ' + 'exception, the\n' + ' return value from "__exit__()" is ignored, and execution ' + 'proceeds\n' + ' at the normal location for the kind of exit that was taken.\n' + '\n' + 'With more than one item, the context managers are processed as ' + 'if\n' + 'multiple "with" statements were nested:\n' + '\n' + ' with A() as a, B() as b:\n' + ' suite\n' + '\n' + 'is equivalent to\n' + '\n' + ' with A() as a:\n' + ' with B() as b:\n' + ' suite\n' + '\n' + 'Changed in version 3.1: Support for multiple context ' + 'expressions.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 343** - The "with" statement\n' + ' The specification, background, and examples for the Python ' + '"with"\n' + ' statement.\n' + '\n' + '\n' + 'Function definitions\n' + '====================\n' + '\n' + 'A function definition defines a user-defined function object ' + '(see\n' + 'section The standard type hierarchy):\n' + '\n' + ' funcdef ::= [decorators] "def" funcname "(" ' + '[parameter_list] ")" ["->" expression] ":" suite\n' + ' decorators ::= decorator+\n' + ' decorator ::= "@" dotted_name ["(" ' + '[argument_list [","]] ")"] NEWLINE\n' + ' dotted_name ::= identifier ("." identifier)*\n' + ' parameter_list ::= defparameter ("," defparameter)* ' + '["," [parameter_list_starargs]]\n' + ' | parameter_list_starargs\n' + ' parameter_list_starargs ::= "*" [parameter] ("," ' + 'defparameter)* ["," ["**" parameter [","]]]\n' + ' | "**" parameter [","]\n' + ' parameter ::= identifier [":" expression]\n' + ' defparameter ::= parameter ["=" expression]\n' + ' funcname ::= identifier\n' + '\n' + 'A function definition is an executable statement. Its execution ' + 'binds\n' + 'the function name in the current local namespace to a function ' + 'object\n' + '(a wrapper around the executable code for the function). This\n' + 'function object contains a reference to the current global ' + 'namespace\n' + 'as the global namespace to be used when the function is called.\n' + '\n' + 'The function definition does not execute the function body; this ' + 'gets\n' + 'executed only when the function is called. [3]\n' + '\n' + 'A function definition may be wrapped by one or more *decorator*\n' + 'expressions. Decorator expressions are evaluated when the ' + 'function is\n' + 'defined, in the scope that contains the function definition. ' + 'The\n' + 'result must be a callable, which is invoked with the function ' + 'object\n' + 'as the only argument. The returned value is bound to the ' + 'function name\n' + 'instead of the function object. Multiple decorators are applied ' + 'in\n' + 'nested fashion. For example, the following code\n' + '\n' + ' @f1(arg)\n' + ' @f2\n' + ' def func(): pass\n' + '\n' + 'is roughly equivalent to\n' + '\n' + ' def func(): pass\n' + ' func = f1(arg)(f2(func))\n' + '\n' + 'except that the original function is not temporarily bound to ' + 'the name\n' + '"func".\n' + '\n' + 'When one or more *parameters* have the form *parameter* "="\n' + '*expression*, the function is said to have "default parameter ' + 'values."\n' + 'For a parameter with a default value, the corresponding ' + '*argument* may\n' + "be omitted from a call, in which case the parameter's default " + 'value is\n' + 'substituted. If a parameter has a default value, all following\n' + 'parameters up until the ""*"" must also have a default value --- ' + 'this\n' + 'is a syntactic restriction that is not expressed by the ' + 'grammar.\n' + '\n' + '**Default parameter values are evaluated from left to right when ' + 'the\n' + 'function definition is executed.** This means that the ' + 'expression is\n' + 'evaluated once, when the function is defined, and that the same ' + '"pre-\n' + 'computed" value is used for each call. This is especially ' + 'important\n' + 'to understand when a default parameter is a mutable object, such ' + 'as a\n' + 'list or a dictionary: if the function modifies the object (e.g. ' + 'by\n' + 'appending an item to a list), the default value is in effect ' + 'modified.\n' + 'This is generally not what was intended. A way around this is ' + 'to use\n' + '"None" as the default, and explicitly test for it in the body of ' + 'the\n' + 'function, e.g.:\n' + '\n' + ' def whats_on_the_telly(penguin=None):\n' + ' if penguin is None:\n' + ' penguin = []\n' + ' penguin.append("property of the zoo")\n' + ' return penguin\n' + '\n' + 'Function call semantics are described in more detail in section ' + 'Calls.\n' + 'A function call always assigns values to all parameters ' + 'mentioned in\n' + 'the parameter list, either from position arguments, from ' + 'keyword\n' + 'arguments, or from default values. If the form ""*identifier"" ' + 'is\n' + 'present, it is initialized to a tuple receiving any excess ' + 'positional\n' + 'parameters, defaulting to the empty tuple. If the form\n' + '""**identifier"" is present, it is initialized to a new ordered\n' + 'mapping receiving any excess keyword arguments, defaulting to a ' + 'new\n' + 'empty mapping of the same type. Parameters after ""*"" or\n' + '""*identifier"" are keyword-only parameters and may only be ' + 'passed\n' + 'used keyword arguments.\n' + '\n' + 'Parameters may have annotations of the form "": expression"" ' + 'following\n' + 'the parameter name. Any parameter may have an annotation even ' + 'those\n' + 'of the form "*identifier" or "**identifier". Functions may ' + 'have\n' + '"return" annotation of the form ""-> expression"" after the ' + 'parameter\n' + 'list. These annotations can be any valid Python expression and ' + 'are\n' + 'evaluated when the function definition is executed. Annotations ' + 'may\n' + 'be evaluated in a different order than they appear in the source ' + 'code.\n' + 'The presence of annotations does not change the semantics of a\n' + 'function. The annotation values are available as values of a\n' + "dictionary keyed by the parameters' names in the " + '"__annotations__"\n' + 'attribute of the function object.\n' + '\n' + 'It is also possible to create anonymous functions (functions not ' + 'bound\n' + 'to a name), for immediate use in expressions. This uses lambda\n' + 'expressions, described in section Lambdas. Note that the ' + 'lambda\n' + 'expression is merely a shorthand for a simplified function ' + 'definition;\n' + 'a function defined in a ""def"" statement can be passed around ' + 'or\n' + 'assigned to another name just like a function defined by a ' + 'lambda\n' + 'expression. The ""def"" form is actually more powerful since ' + 'it\n' + 'allows the execution of multiple statements and annotations.\n' + '\n' + "**Programmer's note:** Functions are first-class objects. A " + '""def""\n' + 'statement executed inside a function definition defines a local\n' + 'function that can be returned or passed around. Free variables ' + 'used\n' + 'in the nested function can access the local variables of the ' + 'function\n' + 'containing the def. See section Naming and binding for ' + 'details.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3107** - Function Annotations\n' + ' The original specification for function annotations.\n' + '\n' + '\n' + 'Class definitions\n' + '=================\n' + '\n' + 'A class definition defines a class object (see section The ' + 'standard\n' + 'type hierarchy):\n' + '\n' + ' classdef ::= [decorators] "class" classname [inheritance] ' + '":" suite\n' + ' inheritance ::= "(" [argument_list] ")"\n' + ' classname ::= identifier\n' + '\n' + 'A class definition is an executable statement. The inheritance ' + 'list\n' + 'usually gives a list of base classes (see Metaclasses for more\n' + 'advanced uses), so each item in the list should evaluate to a ' + 'class\n' + 'object which allows subclassing. Classes without an inheritance ' + 'list\n' + 'inherit, by default, from the base class "object"; hence,\n' + '\n' + ' class Foo:\n' + ' pass\n' + '\n' + 'is equivalent to\n' + '\n' + ' class Foo(object):\n' + ' pass\n' + '\n' + "The class's suite is then executed in a new execution frame " + '(see\n' + 'Naming and binding), using a newly created local namespace and ' + 'the\n' + 'original global namespace. (Usually, the suite contains mostly\n' + "function definitions.) When the class's suite finishes " + 'execution, its\n' + 'execution frame is discarded but its local namespace is saved. ' + '[4] A\n' + 'class object is then created using the inheritance list for the ' + 'base\n' + 'classes and the saved local namespace for the attribute ' + 'dictionary.\n' + 'The class name is bound to this class object in the original ' + 'local\n' + 'namespace.\n' + '\n' + 'The order in which attributes are defined in the class body is\n' + 'preserved in the new class\'s "__dict__". Note that this is ' + 'reliable\n' + 'only right after the class is created and only for classes that ' + 'were\n' + 'defined using the definition syntax.\n' + '\n' + 'Class creation can be customized heavily using metaclasses.\n' + '\n' + 'Classes can also be decorated: just like when decorating ' + 'functions,\n' + '\n' + ' @f1(arg)\n' + ' @f2\n' + ' class Foo: pass\n' + '\n' + 'is roughly equivalent to\n' + '\n' + ' class Foo: pass\n' + ' Foo = f1(arg)(f2(Foo))\n' + '\n' + 'The evaluation rules for the decorator expressions are the same ' + 'as for\n' + 'function decorators. The result is then bound to the class ' + 'name.\n' + '\n' + "**Programmer's note:** Variables defined in the class definition " + 'are\n' + 'class attributes; they are shared by instances. Instance ' + 'attributes\n' + 'can be set in a method with "self.name = value". Both class ' + 'and\n' + 'instance attributes are accessible through the notation ' + '""self.name"",\n' + 'and an instance attribute hides a class attribute with the same ' + 'name\n' + 'when accessed in this way. Class attributes can be used as ' + 'defaults\n' + 'for instance attributes, but using mutable values there can lead ' + 'to\n' + 'unexpected results. Descriptors can be used to create instance\n' + 'variables with different implementation details.\n' + '\n' + 'See also: **PEP 3115** - Metaclasses in Python 3 **PEP 3129** -\n' + ' Class Decorators\n' + '\n' + '\n' + 'Coroutines\n' + '==========\n' + '\n' + 'New in version 3.5.\n' + '\n' + '\n' + 'Coroutine function definition\n' + '-----------------------------\n' + '\n' + ' async_funcdef ::= [decorators] "async" "def" funcname "(" ' + '[parameter_list] ")" ["->" expression] ":" suite\n' + '\n' + 'Execution of Python coroutines can be suspended and resumed at ' + 'many\n' + 'points (see *coroutine*). In the body of a coroutine, any ' + '"await" and\n' + '"async" identifiers become reserved keywords; "await" ' + 'expressions,\n' + '"async for" and "async with" can only be used in coroutine ' + 'bodies.\n' + '\n' + 'Functions defined with "async def" syntax are always coroutine\n' + 'functions, even if they do not contain "await" or "async" ' + 'keywords.\n' + '\n' + 'It is a "SyntaxError" to use "yield from" expressions in "async ' + 'def"\n' + 'coroutines.\n' + '\n' + 'An example of a coroutine function:\n' + '\n' + ' async def func(param1, param2):\n' + ' do_stuff()\n' + ' await some_coroutine()\n' + '\n' + '\n' + 'The "async for" statement\n' + '-------------------------\n' + '\n' + ' async_for_stmt ::= "async" for_stmt\n' + '\n' + 'An *asynchronous iterable* is able to call asynchronous code in ' + 'its\n' + '*iter* implementation, and *asynchronous iterator* can call\n' + 'asynchronous code in its *next* method.\n' + '\n' + 'The "async for" statement allows convenient iteration over\n' + 'asynchronous iterators.\n' + '\n' + 'The following code:\n' + '\n' + ' async for TARGET in ITER:\n' + ' BLOCK\n' + ' else:\n' + ' BLOCK2\n' + '\n' + 'Is semantically equivalent to:\n' + '\n' + ' iter = (ITER)\n' + ' iter = type(iter).__aiter__(iter)\n' + ' running = True\n' + ' while running:\n' + ' try:\n' + ' TARGET = await type(iter).__anext__(iter)\n' + ' except StopAsyncIteration:\n' + ' running = False\n' + ' else:\n' + ' BLOCK\n' + ' else:\n' + ' BLOCK2\n' + '\n' + 'See also "__aiter__()" and "__anext__()" for details.\n' + '\n' + 'It is a "SyntaxError" to use "async for" statement outside of ' + 'an\n' + '"async def" function.\n' + '\n' + '\n' + 'The "async with" statement\n' + '--------------------------\n' + '\n' + ' async_with_stmt ::= "async" with_stmt\n' + '\n' + 'An *asynchronous context manager* is a *context manager* that is ' + 'able\n' + 'to suspend execution in its *enter* and *exit* methods.\n' + '\n' + 'The following code:\n' + '\n' + ' async with EXPR as VAR:\n' + ' BLOCK\n' + '\n' + 'Is semantically equivalent to:\n' + '\n' + ' mgr = (EXPR)\n' + ' aexit = type(mgr).__aexit__\n' + ' aenter = type(mgr).__aenter__(mgr)\n' + ' exc = True\n' + '\n' + ' VAR = await aenter\n' + ' try:\n' + ' BLOCK\n' + ' except:\n' + ' if not await aexit(mgr, *sys.exc_info()):\n' + ' raise\n' + ' else:\n' + ' await aexit(mgr, None, None, None)\n' + '\n' + 'See also "__aenter__()" and "__aexit__()" for details.\n' + '\n' + 'It is a "SyntaxError" to use "async with" statement outside of ' + 'an\n' + '"async def" function.\n' + '\n' + 'See also: **PEP 492** - Coroutines with async and await syntax\n' + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] The exception is propagated to the invocation stack unless\n' + ' there is a "finally" clause which happens to raise another\n' + ' exception. That new exception causes the old one to be ' + 'lost.\n' + '\n' + '[2] Currently, control "flows off the end" except in the case ' + 'of\n' + ' an exception or the execution of a "return", "continue", or\n' + ' "break" statement.\n' + '\n' + '[3] A string literal appearing as the first statement in the\n' + ' function body is transformed into the function\'s "__doc__"\n' + " attribute and therefore the function's *docstring*.\n" + '\n' + '[4] A string literal appearing as the first statement in the ' + 'class\n' + ' body is transformed into the namespace\'s "__doc__" item ' + 'and\n' + " therefore the class's *docstring*.\n", + 'context-managers': '\n' + 'With Statement Context Managers\n' + '*******************************\n' + '\n' + 'A *context manager* is an object that defines the ' + 'runtime context to\n' + 'be established when executing a "with" statement. The ' + 'context manager\n' + 'handles the entry into, and the exit from, the desired ' + 'runtime context\n' + 'for the execution of the block of code. Context ' + 'managers are normally\n' + 'invoked using the "with" statement (described in section ' + 'The with\n' + 'statement), but can also be used by directly invoking ' + 'their methods.\n' + '\n' + 'Typical uses of context managers include saving and ' + 'restoring various\n' + 'kinds of global state, locking and unlocking resources, ' + 'closing opened\n' + 'files, etc.\n' + '\n' + 'For more information on context managers, see Context ' + 'Manager Types.\n' + '\n' + 'object.__enter__(self)\n' + '\n' + ' Enter the runtime context related to this object. The ' + '"with"\n' + " statement will bind this method's return value to the " + 'target(s)\n' + ' specified in the "as" clause of the statement, if ' + 'any.\n' + '\n' + 'object.__exit__(self, exc_type, exc_value, traceback)\n' + '\n' + ' Exit the runtime context related to this object. The ' + 'parameters\n' + ' describe the exception that caused the context to be ' + 'exited. If the\n' + ' context was exited without an exception, all three ' + 'arguments will\n' + ' be "None".\n' + '\n' + ' If an exception is supplied, and the method wishes to ' + 'suppress the\n' + ' exception (i.e., prevent it from being propagated), ' + 'it should\n' + ' return a true value. Otherwise, the exception will be ' + 'processed\n' + ' normally upon exit from this method.\n' + '\n' + ' Note that "__exit__()" methods should not reraise the ' + 'passed-in\n' + " exception; this is the caller's responsibility.\n" + '\n' + 'See also:\n' + '\n' + ' **PEP 343** - The "with" statement\n' + ' The specification, background, and examples for the ' + 'Python "with"\n' + ' statement.\n', + 'continue': '\n' + 'The "continue" statement\n' + '************************\n' + '\n' + ' continue_stmt ::= "continue"\n' + '\n' + '"continue" may only occur syntactically nested in a "for" or ' + '"while"\n' + 'loop, but not nested in a function or class definition or ' + '"finally"\n' + 'clause within that loop. It continues with the next cycle of ' + 'the\n' + 'nearest enclosing loop.\n' + '\n' + 'When "continue" passes control out of a "try" statement with a\n' + '"finally" clause, that "finally" clause is executed before ' + 'really\n' + 'starting the next loop cycle.\n', + 'conversions': '\n' + 'Arithmetic conversions\n' + '**********************\n' + '\n' + 'When a description of an arithmetic operator below uses the ' + 'phrase\n' + '"the numeric arguments are converted to a common type," this ' + 'means\n' + 'that the operator implementation for built-in types works as ' + 'follows:\n' + '\n' + '* If either argument is a complex number, the other is ' + 'converted to\n' + ' complex;\n' + '\n' + '* otherwise, if either argument is a floating point number, ' + 'the\n' + ' other is converted to floating point;\n' + '\n' + '* otherwise, both must be integers and no conversion is ' + 'necessary.\n' + '\n' + 'Some additional rules apply for certain operators (e.g., a ' + 'string as a\n' + "left argument to the '%' operator). Extensions must define " + 'their own\n' + 'conversion behavior.\n', + 'customization': '\n' + 'Basic customization\n' + '*******************\n' + '\n' + 'object.__new__(cls[, ...])\n' + '\n' + ' Called to create a new instance of class *cls*. ' + '"__new__()" is a\n' + ' static method (special-cased so you need not declare it ' + 'as such)\n' + ' that takes the class of which an instance was requested ' + 'as its\n' + ' first argument. The remaining arguments are those ' + 'passed to the\n' + ' object constructor expression (the call to the class). ' + 'The return\n' + ' value of "__new__()" should be the new object instance ' + '(usually an\n' + ' instance of *cls*).\n' + '\n' + ' Typical implementations create a new instance of the ' + 'class by\n' + ' invoking the superclass\'s "__new__()" method using\n' + ' "super(currentclass, cls).__new__(cls[, ...])" with ' + 'appropriate\n' + ' arguments and then modifying the newly-created instance ' + 'as\n' + ' necessary before returning it.\n' + '\n' + ' If "__new__()" returns an instance of *cls*, then the ' + 'new\n' + ' instance\'s "__init__()" method will be invoked like\n' + ' "__init__(self[, ...])", where *self* is the new ' + 'instance and the\n' + ' remaining arguments are the same as were passed to ' + '"__new__()".\n' + '\n' + ' If "__new__()" does not return an instance of *cls*, ' + 'then the new\n' + ' instance\'s "__init__()" method will not be invoked.\n' + '\n' + ' "__new__()" is intended mainly to allow subclasses of ' + 'immutable\n' + ' types (like int, str, or tuple) to customize instance ' + 'creation. It\n' + ' is also commonly overridden in custom metaclasses in ' + 'order to\n' + ' customize class creation.\n' + '\n' + 'object.__init__(self[, ...])\n' + '\n' + ' Called after the instance has been created (by ' + '"__new__()"), but\n' + ' before it is returned to the caller. The arguments are ' + 'those\n' + ' passed to the class constructor expression. If a base ' + 'class has an\n' + ' "__init__()" method, the derived class\'s "__init__()" ' + 'method, if\n' + ' any, must explicitly call it to ensure proper ' + 'initialization of the\n' + ' base class part of the instance; for example:\n' + ' "BaseClass.__init__(self, [args...])".\n' + '\n' + ' Because "__new__()" and "__init__()" work together in ' + 'constructing\n' + ' objects ("__new__()" to create it, and "__init__()" to ' + 'customize\n' + ' it), no non-"None" value may be returned by ' + '"__init__()"; doing so\n' + ' will cause a "TypeError" to be raised at runtime.\n' + '\n' + 'object.__del__(self)\n' + '\n' + ' Called when the instance is about to be destroyed. This ' + 'is also\n' + ' called a destructor. If a base class has a "__del__()" ' + 'method, the\n' + ' derived class\'s "__del__()" method, if any, must ' + 'explicitly call it\n' + ' to ensure proper deletion of the base class part of the ' + 'instance.\n' + ' Note that it is possible (though not recommended!) for ' + 'the\n' + ' "__del__()" method to postpone destruction of the ' + 'instance by\n' + ' creating a new reference to it. It may then be called ' + 'at a later\n' + ' time when this new reference is deleted. It is not ' + 'guaranteed that\n' + ' "__del__()" methods are called for objects that still ' + 'exist when\n' + ' the interpreter exits.\n' + '\n' + ' Note: "del x" doesn\'t directly call "x.__del__()" --- ' + 'the former\n' + ' decrements the reference count for "x" by one, and the ' + 'latter is\n' + ' only called when "x"\'s reference count reaches zero. ' + 'Some common\n' + ' situations that may prevent the reference count of an ' + 'object from\n' + ' going to zero include: circular references between ' + 'objects (e.g.,\n' + ' a doubly-linked list or a tree data structure with ' + 'parent and\n' + ' child pointers); a reference to the object on the ' + 'stack frame of\n' + ' a function that caught an exception (the traceback ' + 'stored in\n' + ' "sys.exc_info()[2]" keeps the stack frame alive); or a ' + 'reference\n' + ' to the object on the stack frame that raised an ' + 'unhandled\n' + ' exception in interactive mode (the traceback stored ' + 'in\n' + ' "sys.last_traceback" keeps the stack frame alive). ' + 'The first\n' + ' situation can only be remedied by explicitly breaking ' + 'the cycles;\n' + ' the second can be resolved by freeing the reference to ' + 'the\n' + ' traceback object when it is no longer useful, and the ' + 'third can\n' + ' be resolved by storing "None" in "sys.last_traceback". ' + 'Circular\n' + ' references which are garbage are detected and cleaned ' + 'up when the\n' + " cyclic garbage collector is enabled (it's on by " + 'default). Refer\n' + ' to the documentation for the "gc" module for more ' + 'information\n' + ' about this topic.\n' + '\n' + ' Warning: Due to the precarious circumstances under ' + 'which\n' + ' "__del__()" methods are invoked, exceptions that occur ' + 'during\n' + ' their execution are ignored, and a warning is printed ' + 'to\n' + ' "sys.stderr" instead. Also, when "__del__()" is ' + 'invoked in\n' + ' response to a module being deleted (e.g., when ' + 'execution of the\n' + ' program is done), other globals referenced by the ' + '"__del__()"\n' + ' method may already have been deleted or in the process ' + 'of being\n' + ' torn down (e.g. the import machinery shutting down). ' + 'For this\n' + ' reason, "__del__()" methods should do the absolute ' + 'minimum needed\n' + ' to maintain external invariants. Starting with ' + 'version 1.5,\n' + ' Python guarantees that globals whose name begins with ' + 'a single\n' + ' underscore are deleted from their module before other ' + 'globals are\n' + ' deleted; if no other references to such globals exist, ' + 'this may\n' + ' help in assuring that imported modules are still ' + 'available at the\n' + ' time when the "__del__()" method is called.\n' + '\n' + 'object.__repr__(self)\n' + '\n' + ' Called by the "repr()" built-in function to compute the ' + '"official"\n' + ' string representation of an object. If at all possible, ' + 'this\n' + ' should look like a valid Python expression that could be ' + 'used to\n' + ' recreate an object with the same value (given an ' + 'appropriate\n' + ' environment). If this is not possible, a string of the ' + 'form\n' + ' "<...some useful description...>" should be returned. ' + 'The return\n' + ' value must be a string object. If a class defines ' + '"__repr__()" but\n' + ' not "__str__()", then "__repr__()" is also used when an ' + '"informal"\n' + ' string representation of instances of that class is ' + 'required.\n' + '\n' + ' This is typically used for debugging, so it is important ' + 'that the\n' + ' representation is information-rich and unambiguous.\n' + '\n' + 'object.__str__(self)\n' + '\n' + ' Called by "str(object)" and the built-in functions ' + '"format()" and\n' + ' "print()" to compute the "informal" or nicely printable ' + 'string\n' + ' representation of an object. The return value must be a ' + 'string\n' + ' object.\n' + '\n' + ' This method differs from "object.__repr__()" in that ' + 'there is no\n' + ' expectation that "__str__()" return a valid Python ' + 'expression: a\n' + ' more convenient or concise representation can be used.\n' + '\n' + ' The default implementation defined by the built-in type ' + '"object"\n' + ' calls "object.__repr__()".\n' + '\n' + 'object.__bytes__(self)\n' + '\n' + ' Called by "bytes()" to compute a byte-string ' + 'representation of an\n' + ' object. This should return a "bytes" object.\n' + '\n' + 'object.__format__(self, format_spec)\n' + '\n' + ' Called by the "format()" built-in function, and by ' + 'extension,\n' + ' evaluation of formatted string literals and the ' + '"str.format()"\n' + ' method, to produce a "formatted" string representation ' + 'of an\n' + ' object. The "format_spec" argument is a string that ' + 'contains a\n' + ' description of the formatting options desired. The ' + 'interpretation\n' + ' of the "format_spec" argument is up to the type ' + 'implementing\n' + ' "__format__()", however most classes will either ' + 'delegate\n' + ' formatting to one of the built-in types, or use a ' + 'similar\n' + ' formatting option syntax.\n' + '\n' + ' See Format Specification Mini-Language for a description ' + 'of the\n' + ' standard formatting syntax.\n' + '\n' + ' The return value must be a string object.\n' + '\n' + ' Changed in version 3.4: The __format__ method of ' + '"object" itself\n' + ' raises a "TypeError" if passed any non-empty string.\n' + '\n' + 'object.__lt__(self, other)\n' + 'object.__le__(self, other)\n' + 'object.__eq__(self, other)\n' + 'object.__ne__(self, other)\n' + 'object.__gt__(self, other)\n' + 'object.__ge__(self, other)\n' + '\n' + ' These are the so-called "rich comparison" methods. The\n' + ' correspondence between operator symbols and method names ' + 'is as\n' + ' follows: "xy" calls\n' + ' "x.__gt__(y)", and "x>=y" calls "x.__ge__(y)".\n' + '\n' + ' A rich comparison method may return the singleton ' + '"NotImplemented"\n' + ' if it does not implement the operation for a given pair ' + 'of\n' + ' arguments. By convention, "False" and "True" are ' + 'returned for a\n' + ' successful comparison. However, these methods can return ' + 'any value,\n' + ' so if the comparison operator is used in a Boolean ' + 'context (e.g.,\n' + ' in the condition of an "if" statement), Python will call ' + '"bool()"\n' + ' on the value to determine if the result is true or ' + 'false.\n' + '\n' + ' By default, "__ne__()" delegates to "__eq__()" and ' + 'inverts the\n' + ' result unless it is "NotImplemented". There are no ' + 'other implied\n' + ' relationships among the comparison operators, for ' + 'example, the\n' + ' truth of "(x.__hash__".\n' + '\n' + ' If a class that does not override "__eq__()" wishes to ' + 'suppress\n' + ' hash support, it should include "__hash__ = None" in the ' + 'class\n' + ' definition. A class which defines its own "__hash__()" ' + 'that\n' + ' explicitly raises a "TypeError" would be incorrectly ' + 'identified as\n' + ' hashable by an "isinstance(obj, collections.Hashable)" ' + 'call.\n' + '\n' + ' Note: By default, the "__hash__()" values of str, bytes ' + 'and\n' + ' datetime objects are "salted" with an unpredictable ' + 'random value.\n' + ' Although they remain constant within an individual ' + 'Python\n' + ' process, they are not predictable between repeated ' + 'invocations of\n' + ' Python.This is intended to provide protection against ' + 'a denial-\n' + ' of-service caused by carefully-chosen inputs that ' + 'exploit the\n' + ' worst case performance of a dict insertion, O(n^2) ' + 'complexity.\n' + ' See ' + 'http://www.ocert.org/advisories/ocert-2011-003.html for\n' + ' details.Changing hash values affects the iteration ' + 'order of\n' + ' dicts, sets and other mappings. Python has never made ' + 'guarantees\n' + ' about this ordering (and it typically varies between ' + '32-bit and\n' + ' 64-bit builds).See also "PYTHONHASHSEED".\n' + '\n' + ' Changed in version 3.3: Hash randomization is enabled by ' + 'default.\n' + '\n' + 'object.__bool__(self)\n' + '\n' + ' Called to implement truth value testing and the built-in ' + 'operation\n' + ' "bool()"; should return "False" or "True". When this ' + 'method is not\n' + ' defined, "__len__()" is called, if it is defined, and ' + 'the object is\n' + ' considered true if its result is nonzero. If a class ' + 'defines\n' + ' neither "__len__()" nor "__bool__()", all its instances ' + 'are\n' + ' considered true.\n', + 'debugger': '\n' + '"pdb" --- The Python Debugger\n' + '*****************************\n' + '\n' + '**Source code:** Lib/pdb.py\n' + '\n' + '======================================================================\n' + '\n' + 'The module "pdb" defines an interactive source code debugger ' + 'for\n' + 'Python programs. It supports setting (conditional) breakpoints ' + 'and\n' + 'single stepping at the source line level, inspection of stack ' + 'frames,\n' + 'source code listing, and evaluation of arbitrary Python code in ' + 'the\n' + 'context of any stack frame. It also supports post-mortem ' + 'debugging\n' + 'and can be called under program control.\n' + '\n' + 'The debugger is extensible -- it is actually defined as the ' + 'class\n' + '"Pdb". This is currently undocumented but easily understood by ' + 'reading\n' + 'the source. The extension interface uses the modules "bdb" and ' + '"cmd".\n' + '\n' + 'The debugger\'s prompt is "(Pdb)". Typical usage to run a ' + 'program under\n' + 'control of the debugger is:\n' + '\n' + ' >>> import pdb\n' + ' >>> import mymodule\n' + " >>> pdb.run('mymodule.test()')\n" + ' > (0)?()\n' + ' (Pdb) continue\n' + ' > (1)?()\n' + ' (Pdb) continue\n' + " NameError: 'spam'\n" + ' > (1)?()\n' + ' (Pdb)\n' + '\n' + 'Changed in version 3.3: Tab-completion via the "readline" module ' + 'is\n' + 'available for commands and command arguments, e.g. the current ' + 'global\n' + 'and local names are offered as arguments of the "p" command.\n' + '\n' + '"pdb.py" can also be invoked as a script to debug other ' + 'scripts. For\n' + 'example:\n' + '\n' + ' python3 -m pdb myscript.py\n' + '\n' + 'When invoked as a script, pdb will automatically enter ' + 'post-mortem\n' + 'debugging if the program being debugged exits abnormally. After ' + 'post-\n' + 'mortem debugging (or after normal exit of the program), pdb ' + 'will\n' + "restart the program. Automatic restarting preserves pdb's state " + '(such\n' + 'as breakpoints) and in most cases is more useful than quitting ' + 'the\n' + "debugger upon program's exit.\n" + '\n' + 'New in version 3.2: "pdb.py" now accepts a "-c" option that ' + 'executes\n' + 'commands as if given in a ".pdbrc" file, see Debugger Commands.\n' + '\n' + 'The typical usage to break into the debugger from a running ' + 'program is\n' + 'to insert\n' + '\n' + ' import pdb; pdb.set_trace()\n' + '\n' + 'at the location you want to break into the debugger. You can ' + 'then\n' + 'step through the code following this statement, and continue ' + 'running\n' + 'without the debugger using the "continue" command.\n' + '\n' + 'The typical usage to inspect a crashed program is:\n' + '\n' + ' >>> import pdb\n' + ' >>> import mymodule\n' + ' >>> mymodule.test()\n' + ' Traceback (most recent call last):\n' + ' File "", line 1, in ?\n' + ' File "./mymodule.py", line 4, in test\n' + ' test2()\n' + ' File "./mymodule.py", line 3, in test2\n' + ' print(spam)\n' + ' NameError: spam\n' + ' >>> pdb.pm()\n' + ' > ./mymodule.py(3)test2()\n' + ' -> print(spam)\n' + ' (Pdb)\n' + '\n' + 'The module defines the following functions; each enters the ' + 'debugger\n' + 'in a slightly different way:\n' + '\n' + 'pdb.run(statement, globals=None, locals=None)\n' + '\n' + ' Execute the *statement* (given as a string or a code object) ' + 'under\n' + ' debugger control. The debugger prompt appears before any ' + 'code is\n' + ' executed; you can set breakpoints and type "continue", or you ' + 'can\n' + ' step through the statement using "step" or "next" (all these\n' + ' commands are explained below). The optional *globals* and ' + '*locals*\n' + ' arguments specify the environment in which the code is ' + 'executed; by\n' + ' default the dictionary of the module "__main__" is used. ' + '(See the\n' + ' explanation of the built-in "exec()" or "eval()" functions.)\n' + '\n' + 'pdb.runeval(expression, globals=None, locals=None)\n' + '\n' + ' Evaluate the *expression* (given as a string or a code ' + 'object)\n' + ' under debugger control. When "runeval()" returns, it returns ' + 'the\n' + ' value of the expression. Otherwise this function is similar ' + 'to\n' + ' "run()".\n' + '\n' + 'pdb.runcall(function, *args, **kwds)\n' + '\n' + ' Call the *function* (a function or method object, not a ' + 'string)\n' + ' with the given arguments. When "runcall()" returns, it ' + 'returns\n' + ' whatever the function call returned. The debugger prompt ' + 'appears\n' + ' as soon as the function is entered.\n' + '\n' + 'pdb.set_trace()\n' + '\n' + ' Enter the debugger at the calling stack frame. This is ' + 'useful to\n' + ' hard-code a breakpoint at a given point in a program, even if ' + 'the\n' + ' code is not otherwise being debugged (e.g. when an assertion\n' + ' fails).\n' + '\n' + 'pdb.post_mortem(traceback=None)\n' + '\n' + ' Enter post-mortem debugging of the given *traceback* object. ' + 'If no\n' + ' *traceback* is given, it uses the one of the exception that ' + 'is\n' + ' currently being handled (an exception must be being handled ' + 'if the\n' + ' default is to be used).\n' + '\n' + 'pdb.pm()\n' + '\n' + ' Enter post-mortem debugging of the traceback found in\n' + ' "sys.last_traceback".\n' + '\n' + 'The "run*" functions and "set_trace()" are aliases for ' + 'instantiating\n' + 'the "Pdb" class and calling the method of the same name. If you ' + 'want\n' + 'to access further features, you have to do this yourself:\n' + '\n' + "class pdb.Pdb(completekey='tab', stdin=None, stdout=None, " + 'skip=None, nosigint=False, readrc=True)\n' + '\n' + ' "Pdb" is the debugger class.\n' + '\n' + ' The *completekey*, *stdin* and *stdout* arguments are passed ' + 'to the\n' + ' underlying "cmd.Cmd" class; see the description there.\n' + '\n' + ' The *skip* argument, if given, must be an iterable of ' + 'glob-style\n' + ' module name patterns. The debugger will not step into frames ' + 'that\n' + ' originate in a module that matches one of these patterns. ' + '[1]\n' + '\n' + ' By default, Pdb sets a handler for the SIGINT signal (which ' + 'is sent\n' + ' when the user presses "Ctrl-C" on the console) when you give ' + 'a\n' + ' "continue" command. This allows you to break into the ' + 'debugger\n' + ' again by pressing "Ctrl-C". If you want Pdb not to touch ' + 'the\n' + ' SIGINT handler, set *nosigint* to true.\n' + '\n' + ' The *readrc* argument defaults to true and controls whether ' + 'Pdb\n' + ' will load .pdbrc files from the filesystem.\n' + '\n' + ' Example call to enable tracing with *skip*:\n' + '\n' + " import pdb; pdb.Pdb(skip=['django.*']).set_trace()\n" + '\n' + ' New in version 3.1: The *skip* argument.\n' + '\n' + ' New in version 3.2: The *nosigint* argument. Previously, a ' + 'SIGINT\n' + ' handler was never set by Pdb.\n' + '\n' + ' Changed in version 3.6: The *readrc* argument.\n' + '\n' + ' run(statement, globals=None, locals=None)\n' + ' runeval(expression, globals=None, locals=None)\n' + ' runcall(function, *args, **kwds)\n' + ' set_trace()\n' + '\n' + ' See the documentation for the functions explained above.\n' + '\n' + '\n' + 'Debugger Commands\n' + '=================\n' + '\n' + 'The commands recognized by the debugger are listed below. Most\n' + 'commands can be abbreviated to one or two letters as indicated; ' + 'e.g.\n' + '"h(elp)" means that either "h" or "help" can be used to enter ' + 'the help\n' + 'command (but not "he" or "hel", nor "H" or "Help" or "HELP").\n' + 'Arguments to commands must be separated by whitespace (spaces ' + 'or\n' + 'tabs). Optional arguments are enclosed in square brackets ' + '("[]") in\n' + 'the command syntax; the square brackets must not be typed.\n' + 'Alternatives in the command syntax are separated by a vertical ' + 'bar\n' + '("|").\n' + '\n' + 'Entering a blank line repeats the last command entered. ' + 'Exception: if\n' + 'the last command was a "list" command, the next 11 lines are ' + 'listed.\n' + '\n' + "Commands that the debugger doesn't recognize are assumed to be " + 'Python\n' + 'statements and are executed in the context of the program being\n' + 'debugged. Python statements can also be prefixed with an ' + 'exclamation\n' + 'point ("!"). This is a powerful way to inspect the program ' + 'being\n' + 'debugged; it is even possible to change a variable or call a ' + 'function.\n' + 'When an exception occurs in such a statement, the exception name ' + 'is\n' + "printed but the debugger's state is not changed.\n" + '\n' + 'The debugger supports aliases. Aliases can have parameters ' + 'which\n' + 'allows one a certain level of adaptability to the context under\n' + 'examination.\n' + '\n' + 'Multiple commands may be entered on a single line, separated by ' + '";;".\n' + '(A single ";" is not used as it is the separator for multiple ' + 'commands\n' + 'in a line that is passed to the Python parser.) No intelligence ' + 'is\n' + 'applied to separating the commands; the input is split at the ' + 'first\n' + '";;" pair, even if it is in the middle of a quoted string.\n' + '\n' + 'If a file ".pdbrc" exists in the user\'s home directory or in ' + 'the\n' + 'current directory, it is read in and executed as if it had been ' + 'typed\n' + 'at the debugger prompt. This is particularly useful for ' + 'aliases. If\n' + 'both files exist, the one in the home directory is read first ' + 'and\n' + 'aliases defined there can be overridden by the local file.\n' + '\n' + 'Changed in version 3.2: ".pdbrc" can now contain commands that\n' + 'continue debugging, such as "continue" or "next". Previously, ' + 'these\n' + 'commands had no effect.\n' + '\n' + 'h(elp) [command]\n' + '\n' + ' Without argument, print the list of available commands. With ' + 'a\n' + ' *command* as argument, print help about that command. "help ' + 'pdb"\n' + ' displays the full documentation (the docstring of the "pdb"\n' + ' module). Since the *command* argument must be an identifier, ' + '"help\n' + ' exec" must be entered to get help on the "!" command.\n' + '\n' + 'w(here)\n' + '\n' + ' Print a stack trace, with the most recent frame at the ' + 'bottom. An\n' + ' arrow indicates the current frame, which determines the ' + 'context of\n' + ' most commands.\n' + '\n' + 'd(own) [count]\n' + '\n' + ' Move the current frame *count* (default one) levels down in ' + 'the\n' + ' stack trace (to a newer frame).\n' + '\n' + 'u(p) [count]\n' + '\n' + ' Move the current frame *count* (default one) levels up in the ' + 'stack\n' + ' trace (to an older frame).\n' + '\n' + 'b(reak) [([filename:]lineno | function) [, condition]]\n' + '\n' + ' With a *lineno* argument, set a break there in the current ' + 'file.\n' + ' With a *function* argument, set a break at the first ' + 'executable\n' + ' statement within that function. The line number may be ' + 'prefixed\n' + ' with a filename and a colon, to specify a breakpoint in ' + 'another\n' + " file (probably one that hasn't been loaded yet). The file " + 'is\n' + ' searched on "sys.path". Note that each breakpoint is ' + 'assigned a\n' + ' number to which all the other breakpoint commands refer.\n' + '\n' + ' If a second argument is present, it is an expression which ' + 'must\n' + ' evaluate to true before the breakpoint is honored.\n' + '\n' + ' Without argument, list all breaks, including for each ' + 'breakpoint,\n' + ' the number of times that breakpoint has been hit, the ' + 'current\n' + ' ignore count, and the associated condition if any.\n' + '\n' + 'tbreak [([filename:]lineno | function) [, condition]]\n' + '\n' + ' Temporary breakpoint, which is removed automatically when it ' + 'is\n' + ' first hit. The arguments are the same as for "break".\n' + '\n' + 'cl(ear) [filename:lineno | bpnumber [bpnumber ...]]\n' + '\n' + ' With a *filename:lineno* argument, clear all the breakpoints ' + 'at\n' + ' this line. With a space separated list of breakpoint numbers, ' + 'clear\n' + ' those breakpoints. Without argument, clear all breaks (but ' + 'first\n' + ' ask confirmation).\n' + '\n' + 'disable [bpnumber [bpnumber ...]]\n' + '\n' + ' Disable the breakpoints given as a space separated list of\n' + ' breakpoint numbers. Disabling a breakpoint means it cannot ' + 'cause\n' + ' the program to stop execution, but unlike clearing a ' + 'breakpoint, it\n' + ' remains in the list of breakpoints and can be (re-)enabled.\n' + '\n' + 'enable [bpnumber [bpnumber ...]]\n' + '\n' + ' Enable the breakpoints specified.\n' + '\n' + 'ignore bpnumber [count]\n' + '\n' + ' Set the ignore count for the given breakpoint number. If ' + 'count is\n' + ' omitted, the ignore count is set to 0. A breakpoint becomes ' + 'active\n' + ' when the ignore count is zero. When non-zero, the count is\n' + ' decremented each time the breakpoint is reached and the ' + 'breakpoint\n' + ' is not disabled and any associated condition evaluates to ' + 'true.\n' + '\n' + 'condition bpnumber [condition]\n' + '\n' + ' Set a new *condition* for the breakpoint, an expression which ' + 'must\n' + ' evaluate to true before the breakpoint is honored. If ' + '*condition*\n' + ' is absent, any existing condition is removed; i.e., the ' + 'breakpoint\n' + ' is made unconditional.\n' + '\n' + 'commands [bpnumber]\n' + '\n' + ' Specify a list of commands for breakpoint number *bpnumber*. ' + 'The\n' + ' commands themselves appear on the following lines. Type a ' + 'line\n' + ' containing just "end" to terminate the commands. An example:\n' + '\n' + ' (Pdb) commands 1\n' + ' (com) p some_variable\n' + ' (com) end\n' + ' (Pdb)\n' + '\n' + ' To remove all commands from a breakpoint, type commands and ' + 'follow\n' + ' it immediately with "end"; that is, give no commands.\n' + '\n' + ' With no *bpnumber* argument, commands refers to the last ' + 'breakpoint\n' + ' set.\n' + '\n' + ' You can use breakpoint commands to start your program up ' + 'again.\n' + ' Simply use the continue command, or step, or any other ' + 'command that\n' + ' resumes execution.\n' + '\n' + ' Specifying any command resuming execution (currently ' + 'continue,\n' + ' step, next, return, jump, quit and their abbreviations) ' + 'terminates\n' + ' the command list (as if that command was immediately followed ' + 'by\n' + ' end). This is because any time you resume execution (even ' + 'with a\n' + ' simple next or step), you may encounter another ' + 'breakpoint—which\n' + ' could have its own command list, leading to ambiguities about ' + 'which\n' + ' list to execute.\n' + '\n' + " If you use the 'silent' command in the command list, the " + 'usual\n' + ' message about stopping at a breakpoint is not printed. This ' + 'may be\n' + ' desirable for breakpoints that are to print a specific ' + 'message and\n' + ' then continue. If none of the other commands print anything, ' + 'you\n' + ' see no sign that the breakpoint was reached.\n' + '\n' + 's(tep)\n' + '\n' + ' Execute the current line, stop at the first possible ' + 'occasion\n' + ' (either in a function that is called or on the next line in ' + 'the\n' + ' current function).\n' + '\n' + 'n(ext)\n' + '\n' + ' Continue execution until the next line in the current ' + 'function is\n' + ' reached or it returns. (The difference between "next" and ' + '"step"\n' + ' is that "step" stops inside a called function, while "next"\n' + ' executes called functions at (nearly) full speed, only ' + 'stopping at\n' + ' the next line in the current function.)\n' + '\n' + 'unt(il) [lineno]\n' + '\n' + ' Without argument, continue execution until the line with a ' + 'number\n' + ' greater than the current one is reached.\n' + '\n' + ' With a line number, continue execution until a line with a ' + 'number\n' + ' greater or equal to that is reached. In both cases, also ' + 'stop when\n' + ' the current frame returns.\n' + '\n' + ' Changed in version 3.2: Allow giving an explicit line ' + 'number.\n' + '\n' + 'r(eturn)\n' + '\n' + ' Continue execution until the current function returns.\n' + '\n' + 'c(ont(inue))\n' + '\n' + ' Continue execution, only stop when a breakpoint is ' + 'encountered.\n' + '\n' + 'j(ump) lineno\n' + '\n' + ' Set the next line that will be executed. Only available in ' + 'the\n' + ' bottom-most frame. This lets you jump back and execute code ' + 'again,\n' + " or jump forward to skip code that you don't want to run.\n" + '\n' + ' It should be noted that not all jumps are allowed -- for ' + 'instance\n' + ' it is not possible to jump into the middle of a "for" loop or ' + 'out\n' + ' of a "finally" clause.\n' + '\n' + 'l(ist) [first[, last]]\n' + '\n' + ' List source code for the current file. Without arguments, ' + 'list 11\n' + ' lines around the current line or continue the previous ' + 'listing.\n' + ' With "." as argument, list 11 lines around the current line. ' + 'With\n' + ' one argument, list 11 lines around at that line. With two\n' + ' arguments, list the given range; if the second argument is ' + 'less\n' + ' than the first, it is interpreted as a count.\n' + '\n' + ' The current line in the current frame is indicated by "->". ' + 'If an\n' + ' exception is being debugged, the line where the exception ' + 'was\n' + ' originally raised or propagated is indicated by ">>", if it ' + 'differs\n' + ' from the current line.\n' + '\n' + ' New in version 3.2: The ">>" marker.\n' + '\n' + 'll | longlist\n' + '\n' + ' List all source code for the current function or frame.\n' + ' Interesting lines are marked as for "list".\n' + '\n' + ' New in version 3.2.\n' + '\n' + 'a(rgs)\n' + '\n' + ' Print the argument list of the current function.\n' + '\n' + 'p expression\n' + '\n' + ' Evaluate the *expression* in the current context and print ' + 'its\n' + ' value.\n' + '\n' + ' Note: "print()" can also be used, but is not a debugger ' + 'command\n' + ' --- this executes the Python "print()" function.\n' + '\n' + 'pp expression\n' + '\n' + ' Like the "p" command, except the value of the expression is ' + 'pretty-\n' + ' printed using the "pprint" module.\n' + '\n' + 'whatis expression\n' + '\n' + ' Print the type of the *expression*.\n' + '\n' + 'source expression\n' + '\n' + ' Try to get source code for the given object and display it.\n' + '\n' + ' New in version 3.2.\n' + '\n' + 'display [expression]\n' + '\n' + ' Display the value of the expression if it changed, each time\n' + ' execution stops in the current frame.\n' + '\n' + ' Without expression, list all display expressions for the ' + 'current\n' + ' frame.\n' + '\n' + ' New in version 3.2.\n' + '\n' + 'undisplay [expression]\n' + '\n' + ' Do not display the expression any more in the current frame.\n' + ' Without expression, clear all display expressions for the ' + 'current\n' + ' frame.\n' + '\n' + ' New in version 3.2.\n' + '\n' + 'interact\n' + '\n' + ' Start an interactive interpreter (using the "code" module) ' + 'whose\n' + ' global namespace contains all the (global and local) names ' + 'found in\n' + ' the current scope.\n' + '\n' + ' New in version 3.2.\n' + '\n' + 'alias [name [command]]\n' + '\n' + ' Create an alias called *name* that executes *command*. The ' + 'command\n' + ' must *not* be enclosed in quotes. Replaceable parameters can ' + 'be\n' + ' indicated by "%1", "%2", and so on, while "%*" is replaced by ' + 'all\n' + ' the parameters. If no command is given, the current alias ' + 'for\n' + ' *name* is shown. If no arguments are given, all aliases are ' + 'listed.\n' + '\n' + ' Aliases may be nested and can contain anything that can be ' + 'legally\n' + ' typed at the pdb prompt. Note that internal pdb commands ' + '*can* be\n' + ' overridden by aliases. Such a command is then hidden until ' + 'the\n' + ' alias is removed. Aliasing is recursively applied to the ' + 'first\n' + ' word of the command line; all other words in the line are ' + 'left\n' + ' alone.\n' + '\n' + ' As an example, here are two useful aliases (especially when ' + 'placed\n' + ' in the ".pdbrc" file):\n' + '\n' + ' # Print instance variables (usage "pi classInst")\n' + ' alias pi for k in %1.__dict__.keys(): ' + 'print("%1.",k,"=",%1.__dict__[k])\n' + ' # Print instance variables in self\n' + ' alias ps pi self\n' + '\n' + 'unalias name\n' + '\n' + ' Delete the specified alias.\n' + '\n' + '! statement\n' + '\n' + ' Execute the (one-line) *statement* in the context of the ' + 'current\n' + ' stack frame. The exclamation point can be omitted unless the ' + 'first\n' + ' word of the statement resembles a debugger command. To set ' + 'a\n' + ' global variable, you can prefix the assignment command with ' + 'a\n' + ' "global" statement on the same line, e.g.:\n' + '\n' + " (Pdb) global list_options; list_options = ['-l']\n" + ' (Pdb)\n' + '\n' + 'run [args ...]\n' + 'restart [args ...]\n' + '\n' + ' Restart the debugged Python program. If an argument is ' + 'supplied,\n' + ' it is split with "shlex" and the result is used as the new\n' + ' "sys.argv". History, breakpoints, actions and debugger ' + 'options are\n' + ' preserved. "restart" is an alias for "run".\n' + '\n' + 'q(uit)\n' + '\n' + ' Quit from the debugger. The program being executed is ' + 'aborted.\n' + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] Whether a frame is considered to originate in a certain ' + 'module\n' + ' is determined by the "__name__" in the frame globals.\n', + 'del': '\n' + 'The "del" statement\n' + '*******************\n' + '\n' + ' del_stmt ::= "del" target_list\n' + '\n' + 'Deletion is recursively defined very similar to the way assignment ' + 'is\n' + 'defined. Rather than spelling it out in full details, here are some\n' + 'hints.\n' + '\n' + 'Deletion of a target list recursively deletes each target, from left\n' + 'to right.\n' + '\n' + 'Deletion of a name removes the binding of that name from the local ' + 'or\n' + 'global namespace, depending on whether the name occurs in a "global"\n' + 'statement in the same code block. If the name is unbound, a\n' + '"NameError" exception will be raised.\n' + '\n' + 'Deletion of attribute references, subscriptions and slicings is ' + 'passed\n' + 'to the primary object involved; deletion of a slicing is in general\n' + 'equivalent to assignment of an empty slice of the right type (but ' + 'even\n' + 'this is determined by the sliced object).\n' + '\n' + 'Changed in version 3.2: Previously it was illegal to delete a name\n' + 'from the local namespace if it occurs as a free variable in a nested\n' + 'block.\n', + 'dict': '\n' + 'Dictionary displays\n' + '*******************\n' + '\n' + 'A dictionary display is a possibly empty series of key/datum pairs\n' + 'enclosed in curly braces:\n' + '\n' + ' dict_display ::= "{" [key_datum_list | dict_comprehension] ' + '"}"\n' + ' key_datum_list ::= key_datum ("," key_datum)* [","]\n' + ' key_datum ::= expression ":" expression | "**" or_expr\n' + ' dict_comprehension ::= expression ":" expression comp_for\n' + '\n' + 'A dictionary display yields a new dictionary object.\n' + '\n' + 'If a comma-separated sequence of key/datum pairs is given, they are\n' + 'evaluated from left to right to define the entries of the ' + 'dictionary:\n' + 'each key object is used as a key into the dictionary to store the\n' + 'corresponding datum. This means that you can specify the same key\n' + "multiple times in the key/datum list, and the final dictionary's " + 'value\n' + 'for that key will be the last one given.\n' + '\n' + 'A double asterisk "**" denotes *dictionary unpacking*. Its operand\n' + 'must be a *mapping*. Each mapping item is added to the new\n' + 'dictionary. Later values replace values already set by earlier\n' + 'key/datum pairs and earlier dictionary unpackings.\n' + '\n' + 'New in version 3.5: Unpacking into dictionary displays, originally\n' + 'proposed by **PEP 448**.\n' + '\n' + 'A dict comprehension, in contrast to list and set comprehensions,\n' + 'needs two expressions separated with a colon followed by the usual\n' + '"for" and "if" clauses. When the comprehension is run, the ' + 'resulting\n' + 'key and value elements are inserted in the new dictionary in the ' + 'order\n' + 'they are produced.\n' + '\n' + 'Restrictions on the types of the key values are listed earlier in\n' + 'section The standard type hierarchy. (To summarize, the key type\n' + 'should be *hashable*, which excludes all mutable objects.) Clashes\n' + 'between duplicate keys are not detected; the last datum (textually\n' + 'rightmost in the display) stored for a given key value prevails.\n', + 'dynamic-features': '\n' + 'Interaction with dynamic features\n' + '*********************************\n' + '\n' + 'Name resolution of free variables occurs at runtime, not ' + 'at compile\n' + 'time. This means that the following code will print 42:\n' + '\n' + ' i = 10\n' + ' def f():\n' + ' print(i)\n' + ' i = 42\n' + ' f()\n' + '\n' + 'There are several cases where Python statements are ' + 'illegal when used\n' + 'in conjunction with nested scopes that contain free ' + 'variables.\n' + '\n' + 'If a variable is referenced in an enclosing scope, it is ' + 'illegal to\n' + 'delete the name. An error will be reported at compile ' + 'time.\n' + '\n' + 'The "eval()" and "exec()" functions do not have access ' + 'to the full\n' + 'environment for resolving names. Names may be resolved ' + 'in the local\n' + 'and global namespaces of the caller. Free variables are ' + 'not resolved\n' + 'in the nearest enclosing namespace, but in the global ' + 'namespace. [1]\n' + 'The "exec()" and "eval()" functions have optional ' + 'arguments to\n' + 'override the global and local namespace. If only one ' + 'namespace is\n' + 'specified, it is used for both.\n', + 'else': '\n' + 'The "if" statement\n' + '******************\n' + '\n' + 'The "if" statement is used for conditional execution:\n' + '\n' + ' if_stmt ::= "if" expression ":" suite\n' + ' ( "elif" expression ":" suite )*\n' + ' ["else" ":" suite]\n' + '\n' + 'It selects exactly one of the suites by evaluating the expressions ' + 'one\n' + 'by one until one is found to be true (see section Boolean ' + 'operations\n' + 'for the definition of true and false); then that suite is executed\n' + '(and no other part of the "if" statement is executed or evaluated).\n' + 'If all expressions are false, the suite of the "else" clause, if\n' + 'present, is executed.\n', + 'exceptions': '\n' + 'Exceptions\n' + '**********\n' + '\n' + 'Exceptions are a means of breaking out of the normal flow of ' + 'control\n' + 'of a code block in order to handle errors or other ' + 'exceptional\n' + 'conditions. An exception is *raised* at the point where the ' + 'error is\n' + 'detected; it may be *handled* by the surrounding code block or ' + 'by any\n' + 'code block that directly or indirectly invoked the code block ' + 'where\n' + 'the error occurred.\n' + '\n' + 'The Python interpreter raises an exception when it detects a ' + 'run-time\n' + 'error (such as division by zero). A Python program can also\n' + 'explicitly raise an exception with the "raise" statement. ' + 'Exception\n' + 'handlers are specified with the "try" ... "except" statement. ' + 'The\n' + '"finally" clause of such a statement can be used to specify ' + 'cleanup\n' + 'code which does not handle the exception, but is executed ' + 'whether an\n' + 'exception occurred or not in the preceding code.\n' + '\n' + 'Python uses the "termination" model of error handling: an ' + 'exception\n' + 'handler can find out what happened and continue execution at ' + 'an outer\n' + 'level, but it cannot repair the cause of the error and retry ' + 'the\n' + 'failing operation (except by re-entering the offending piece ' + 'of code\n' + 'from the top).\n' + '\n' + 'When an exception is not handled at all, the interpreter ' + 'terminates\n' + 'execution of the program, or returns to its interactive main ' + 'loop. In\n' + 'either case, it prints a stack backtrace, except when the ' + 'exception is\n' + '"SystemExit".\n' + '\n' + 'Exceptions are identified by class instances. The "except" ' + 'clause is\n' + 'selected depending on the class of the instance: it must ' + 'reference the\n' + 'class of the instance or a base class thereof. The instance ' + 'can be\n' + 'received by the handler and can carry additional information ' + 'about the\n' + 'exceptional condition.\n' + '\n' + 'Note: Exception messages are not part of the Python API. ' + 'Their\n' + ' contents may change from one version of Python to the next ' + 'without\n' + ' warning and should not be relied on by code which will run ' + 'under\n' + ' multiple versions of the interpreter.\n' + '\n' + 'See also the description of the "try" statement in section The ' + 'try\n' + 'statement and "raise" statement in section The raise ' + 'statement.\n' + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] This limitation occurs because the code that is executed ' + 'by\n' + ' these operations is not available at the time the module ' + 'is\n' + ' compiled.\n', + 'execmodel': '\n' + 'Execution model\n' + '***************\n' + '\n' + '\n' + 'Structure of a program\n' + '======================\n' + '\n' + 'A Python program is constructed from code blocks. A *block* is ' + 'a piece\n' + 'of Python program text that is executed as a unit. The ' + 'following are\n' + 'blocks: a module, a function body, and a class definition. ' + 'Each\n' + 'command typed interactively is a block. A script file (a file ' + 'given\n' + 'as standard input to the interpreter or specified as a command ' + 'line\n' + 'argument to the interpreter) is a code block. A script command ' + '(a\n' + 'command specified on the interpreter command line with the ' + "'**-c**'\n" + 'option) is a code block. The string argument passed to the ' + 'built-in\n' + 'functions "eval()" and "exec()" is a code block.\n' + '\n' + 'A code block is executed in an *execution frame*. A frame ' + 'contains\n' + 'some administrative information (used for debugging) and ' + 'determines\n' + "where and how execution continues after the code block's " + 'execution has\n' + 'completed.\n' + '\n' + '\n' + 'Naming and binding\n' + '==================\n' + '\n' + '\n' + 'Binding of names\n' + '----------------\n' + '\n' + '*Names* refer to objects. Names are introduced by name ' + 'binding\n' + 'operations.\n' + '\n' + 'The following constructs bind names: formal parameters to ' + 'functions,\n' + '"import" statements, class and function definitions (these bind ' + 'the\n' + 'class or function name in the defining block), and targets that ' + 'are\n' + 'identifiers if occurring in an assignment, "for" loop header, ' + 'or after\n' + '"as" in a "with" statement or "except" clause. The "import" ' + 'statement\n' + 'of the form "from ... import *" binds all names defined in the\n' + 'imported module, except those beginning with an underscore. ' + 'This form\n' + 'may only be used at the module level.\n' + '\n' + 'A target occurring in a "del" statement is also considered ' + 'bound for\n' + 'this purpose (though the actual semantics are to unbind the ' + 'name).\n' + '\n' + 'Each assignment or import statement occurs within a block ' + 'defined by a\n' + 'class or function definition or at the module level (the ' + 'top-level\n' + 'code block).\n' + '\n' + 'If a name is bound in a block, it is a local variable of that ' + 'block,\n' + 'unless declared as "nonlocal" or "global". If a name is bound ' + 'at the\n' + 'module level, it is a global variable. (The variables of the ' + 'module\n' + 'code block are local and global.) If a variable is used in a ' + 'code\n' + 'block but not defined there, it is a *free variable*.\n' + '\n' + 'Each occurrence of a name in the program text refers to the ' + '*binding*\n' + 'of that name established by the following name resolution ' + 'rules.\n' + '\n' + '\n' + 'Resolution of names\n' + '-------------------\n' + '\n' + 'A *scope* defines the visibility of a name within a block. If ' + 'a local\n' + 'variable is defined in a block, its scope includes that block. ' + 'If the\n' + 'definition occurs in a function block, the scope extends to any ' + 'blocks\n' + 'contained within the defining one, unless a contained block ' + 'introduces\n' + 'a different binding for the name.\n' + '\n' + 'When a name is used in a code block, it is resolved using the ' + 'nearest\n' + 'enclosing scope. The set of all such scopes visible to a code ' + 'block\n' + "is called the block's *environment*.\n" + '\n' + 'When a name is not found at all, a "NameError" exception is ' + 'raised. If\n' + 'the current scope is a function scope, and the name refers to a ' + 'local\n' + 'variable that has not yet been bound to a value at the point ' + 'where the\n' + 'name is used, an "UnboundLocalError" exception is raised.\n' + '"UnboundLocalError" is a subclass of "NameError".\n' + '\n' + 'If a name binding operation occurs anywhere within a code ' + 'block, all\n' + 'uses of the name within the block are treated as references to ' + 'the\n' + 'current block. This can lead to errors when a name is used ' + 'within a\n' + 'block before it is bound. This rule is subtle. Python lacks\n' + 'declarations and allows name binding operations to occur ' + 'anywhere\n' + 'within a code block. The local variables of a code block can ' + 'be\n' + 'determined by scanning the entire text of the block for name ' + 'binding\n' + 'operations.\n' + '\n' + 'If the "global" statement occurs within a block, all uses of ' + 'the name\n' + 'specified in the statement refer to the binding of that name in ' + 'the\n' + 'top-level namespace. Names are resolved in the top-level ' + 'namespace by\n' + 'searching the global namespace, i.e. the namespace of the ' + 'module\n' + 'containing the code block, and the builtins namespace, the ' + 'namespace\n' + 'of the module "builtins". The global namespace is searched ' + 'first. If\n' + 'the name is not found there, the builtins namespace is ' + 'searched. The\n' + '"global" statement must precede all uses of the name.\n' + '\n' + 'The "global" statement has the same scope as a name binding ' + 'operation\n' + 'in the same block. If the nearest enclosing scope for a free ' + 'variable\n' + 'contains a global statement, the free variable is treated as a ' + 'global.\n' + '\n' + 'The "nonlocal" statement causes corresponding names to refer ' + 'to\n' + 'previously bound variables in the nearest enclosing function ' + 'scope.\n' + '"SyntaxError" is raised at compile time if the given name does ' + 'not\n' + 'exist in any enclosing function scope.\n' + '\n' + 'The namespace for a module is automatically created the first ' + 'time a\n' + 'module is imported. The main module for a script is always ' + 'called\n' + '"__main__".\n' + '\n' + 'Class definition blocks and arguments to "exec()" and "eval()" ' + 'are\n' + 'special in the context of name resolution. A class definition ' + 'is an\n' + 'executable statement that may use and define names. These ' + 'references\n' + 'follow the normal rules for name resolution with an exception ' + 'that\n' + 'unbound local variables are looked up in the global namespace. ' + 'The\n' + 'namespace of the class definition becomes the attribute ' + 'dictionary of\n' + 'the class. The scope of names defined in a class block is ' + 'limited to\n' + 'the class block; it does not extend to the code blocks of ' + 'methods --\n' + 'this includes comprehensions and generator expressions since ' + 'they are\n' + 'implemented using a function scope. This means that the ' + 'following\n' + 'will fail:\n' + '\n' + ' class A:\n' + ' a = 42\n' + ' b = list(a + i for i in range(10))\n' + '\n' + '\n' + 'Builtins and restricted execution\n' + '---------------------------------\n' + '\n' + 'The builtins namespace associated with the execution of a code ' + 'block\n' + 'is actually found by looking up the name "__builtins__" in its ' + 'global\n' + 'namespace; this should be a dictionary or a module (in the ' + 'latter case\n' + "the module's dictionary is used). By default, when in the " + '"__main__"\n' + 'module, "__builtins__" is the built-in module "builtins"; when ' + 'in any\n' + 'other module, "__builtins__" is an alias for the dictionary of ' + 'the\n' + '"builtins" module itself. "__builtins__" can be set to a ' + 'user-created\n' + 'dictionary to create a weak form of restricted execution.\n' + '\n' + '**CPython implementation detail:** Users should not touch\n' + '"__builtins__"; it is strictly an implementation detail. ' + 'Users\n' + 'wanting to override values in the builtins namespace should ' + '"import"\n' + 'the "builtins" module and modify its attributes appropriately.\n' + '\n' + '\n' + 'Interaction with dynamic features\n' + '---------------------------------\n' + '\n' + 'Name resolution of free variables occurs at runtime, not at ' + 'compile\n' + 'time. This means that the following code will print 42:\n' + '\n' + ' i = 10\n' + ' def f():\n' + ' print(i)\n' + ' i = 42\n' + ' f()\n' + '\n' + 'There are several cases where Python statements are illegal ' + 'when used\n' + 'in conjunction with nested scopes that contain free variables.\n' + '\n' + 'If a variable is referenced in an enclosing scope, it is ' + 'illegal to\n' + 'delete the name. An error will be reported at compile time.\n' + '\n' + 'The "eval()" and "exec()" functions do not have access to the ' + 'full\n' + 'environment for resolving names. Names may be resolved in the ' + 'local\n' + 'and global namespaces of the caller. Free variables are not ' + 'resolved\n' + 'in the nearest enclosing namespace, but in the global ' + 'namespace. [1]\n' + 'The "exec()" and "eval()" functions have optional arguments to\n' + 'override the global and local namespace. If only one namespace ' + 'is\n' + 'specified, it is used for both.\n' + '\n' + '\n' + 'Exceptions\n' + '==========\n' + '\n' + 'Exceptions are a means of breaking out of the normal flow of ' + 'control\n' + 'of a code block in order to handle errors or other exceptional\n' + 'conditions. An exception is *raised* at the point where the ' + 'error is\n' + 'detected; it may be *handled* by the surrounding code block or ' + 'by any\n' + 'code block that directly or indirectly invoked the code block ' + 'where\n' + 'the error occurred.\n' + '\n' + 'The Python interpreter raises an exception when it detects a ' + 'run-time\n' + 'error (such as division by zero). A Python program can also\n' + 'explicitly raise an exception with the "raise" statement. ' + 'Exception\n' + 'handlers are specified with the "try" ... "except" statement. ' + 'The\n' + '"finally" clause of such a statement can be used to specify ' + 'cleanup\n' + 'code which does not handle the exception, but is executed ' + 'whether an\n' + 'exception occurred or not in the preceding code.\n' + '\n' + 'Python uses the "termination" model of error handling: an ' + 'exception\n' + 'handler can find out what happened and continue execution at an ' + 'outer\n' + 'level, but it cannot repair the cause of the error and retry ' + 'the\n' + 'failing operation (except by re-entering the offending piece of ' + 'code\n' + 'from the top).\n' + '\n' + 'When an exception is not handled at all, the interpreter ' + 'terminates\n' + 'execution of the program, or returns to its interactive main ' + 'loop. In\n' + 'either case, it prints a stack backtrace, except when the ' + 'exception is\n' + '"SystemExit".\n' + '\n' + 'Exceptions are identified by class instances. The "except" ' + 'clause is\n' + 'selected depending on the class of the instance: it must ' + 'reference the\n' + 'class of the instance or a base class thereof. The instance ' + 'can be\n' + 'received by the handler and can carry additional information ' + 'about the\n' + 'exceptional condition.\n' + '\n' + 'Note: Exception messages are not part of the Python API. ' + 'Their\n' + ' contents may change from one version of Python to the next ' + 'without\n' + ' warning and should not be relied on by code which will run ' + 'under\n' + ' multiple versions of the interpreter.\n' + '\n' + 'See also the description of the "try" statement in section The ' + 'try\n' + 'statement and "raise" statement in section The raise ' + 'statement.\n' + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] This limitation occurs because the code that is executed ' + 'by\n' + ' these operations is not available at the time the module ' + 'is\n' + ' compiled.\n', + 'exprlists': '\n' + 'Expression lists\n' + '****************\n' + '\n' + ' expression_list ::= expression ( "," expression )* [","]\n' + ' starred_list ::= starred_item ( "," starred_item )* ' + '[","]\n' + ' starred_expression ::= expression | ( starred_item "," )* ' + '[starred_item]\n' + ' starred_item ::= expression | "*" or_expr\n' + '\n' + 'Except when part of a list or set display, an expression list\n' + 'containing at least one comma yields a tuple. The length of ' + 'the tuple\n' + 'is the number of expressions in the list. The expressions are\n' + 'evaluated from left to right.\n' + '\n' + 'An asterisk "*" denotes *iterable unpacking*. Its operand must ' + 'be an\n' + '*iterable*. The iterable is expanded into a sequence of items, ' + 'which\n' + 'are included in the new tuple, list, or set, at the site of ' + 'the\n' + 'unpacking.\n' + '\n' + 'New in version 3.5: Iterable unpacking in expression lists, ' + 'originally\n' + 'proposed by **PEP 448**.\n' + '\n' + 'The trailing comma is required only to create a single tuple ' + '(a.k.a. a\n' + '*singleton*); it is optional in all other cases. A single ' + 'expression\n' + "without a trailing comma doesn't create a tuple, but rather " + 'yields the\n' + 'value of that expression. (To create an empty tuple, use an ' + 'empty pair\n' + 'of parentheses: "()".)\n', + 'floating': '\n' + 'Floating point literals\n' + '***********************\n' + '\n' + 'Floating point literals are described by the following lexical\n' + 'definitions:\n' + '\n' + ' floatnumber ::= pointfloat | exponentfloat\n' + ' pointfloat ::= [digitpart] fraction | digitpart "."\n' + ' exponentfloat ::= (digitpart | pointfloat) exponent\n' + ' digitpart ::= digit (["_"] digit)*\n' + ' fraction ::= "." digitpart\n' + ' exponent ::= ("e" | "E") ["+" | "-"] digitpart\n' + '\n' + 'Note that the integer and exponent parts are always interpreted ' + 'using\n' + 'radix 10. For example, "077e010" is legal, and denotes the same ' + 'number\n' + 'as "77e10". The allowed range of floating point literals is\n' + 'implementation-dependent. As in integer literals, underscores ' + 'are\n' + 'supported for digit grouping.\n' + '\n' + 'Some examples of floating point literals:\n' + '\n' + ' 3.14 10. .001 1e100 3.14e-10 0e0 ' + '3.14_15_93\n' + '\n' + 'Note that numeric literals do not include a sign; a phrase like ' + '"-1"\n' + 'is actually an expression composed of the unary operator "-" and ' + 'the\n' + 'literal "1".\n' + '\n' + 'Changed in version 3.6: Underscores are now allowed for ' + 'grouping\n' + 'purposes in literals.\n', + 'for': '\n' + 'The "for" statement\n' + '*******************\n' + '\n' + 'The "for" statement is used to iterate over the elements of a ' + 'sequence\n' + '(such as a string, tuple or list) or other iterable object:\n' + '\n' + ' for_stmt ::= "for" target_list "in" expression_list ":" suite\n' + ' ["else" ":" suite]\n' + '\n' + 'The expression list is evaluated once; it should yield an iterable\n' + 'object. An iterator is created for the result of the\n' + '"expression_list". The suite is then executed once for each item\n' + 'provided by the iterator, in the order returned by the iterator. ' + 'Each\n' + 'item in turn is assigned to the target list using the standard rules\n' + 'for assignments (see Assignment statements), and then the suite is\n' + 'executed. When the items are exhausted (which is immediately when ' + 'the\n' + 'sequence is empty or an iterator raises a "StopIteration" ' + 'exception),\n' + 'the suite in the "else" clause, if present, is executed, and the ' + 'loop\n' + 'terminates.\n' + '\n' + 'A "break" statement executed in the first suite terminates the loop\n' + 'without executing the "else" clause\'s suite. A "continue" ' + 'statement\n' + 'executed in the first suite skips the rest of the suite and ' + 'continues\n' + 'with the next item, or with the "else" clause if there is no next\n' + 'item.\n' + '\n' + 'The for-loop makes assignments to the variables(s) in the target ' + 'list.\n' + 'This overwrites all previous assignments to those variables ' + 'including\n' + 'those made in the suite of the for-loop:\n' + '\n' + ' for i in range(10):\n' + ' print(i)\n' + ' i = 5 # this will not affect the for-loop\n' + ' # because i will be overwritten with the ' + 'next\n' + ' # index in the range\n' + '\n' + 'Names in the target list are not deleted when the loop is finished,\n' + 'but if the sequence is empty, they will not have been assigned to at\n' + 'all by the loop. Hint: the built-in function "range()" returns an\n' + 'iterator of integers suitable to emulate the effect of Pascal\'s "for ' + 'i\n' + ':= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, 2]".\n' + '\n' + 'Note: There is a subtlety when the sequence is being modified by the\n' + ' loop (this can only occur for mutable sequences, i.e. lists). An\n' + ' internal counter is used to keep track of which item is used next,\n' + ' and this is incremented on each iteration. When this counter has\n' + ' reached the length of the sequence the loop terminates. This ' + 'means\n' + ' that if the suite deletes the current (or a previous) item from ' + 'the\n' + ' sequence, the next item will be skipped (since it gets the index ' + 'of\n' + ' the current item which has already been treated). Likewise, if ' + 'the\n' + ' suite inserts an item in the sequence before the current item, the\n' + ' current item will be treated again the next time through the loop.\n' + ' This can lead to nasty bugs that can be avoided by making a\n' + ' temporary copy using a slice of the whole sequence, e.g.,\n' + '\n' + ' for x in a[:]:\n' + ' if x < 0: a.remove(x)\n', + 'formatstrings': '\n' + 'Format String Syntax\n' + '********************\n' + '\n' + 'The "str.format()" method and the "Formatter" class share ' + 'the same\n' + 'syntax for format strings (although in the case of ' + '"Formatter",\n' + 'subclasses can define their own format string syntax). The ' + 'syntax is\n' + 'related to that of formatted string literals, but there ' + 'are\n' + 'differences.\n' + '\n' + 'Format strings contain "replacement fields" surrounded by ' + 'curly braces\n' + '"{}". Anything that is not contained in braces is ' + 'considered literal\n' + 'text, which is copied unchanged to the output. If you need ' + 'to include\n' + 'a brace character in the literal text, it can be escaped by ' + 'doubling:\n' + '"{{" and "}}".\n' + '\n' + 'The grammar for a replacement field is as follows:\n' + '\n' + ' replacement_field ::= "{" [field_name] ["!" ' + 'conversion] [":" format_spec] "}"\n' + ' field_name ::= arg_name ("." attribute_name | ' + '"[" element_index "]")*\n' + ' arg_name ::= [identifier | integer]\n' + ' attribute_name ::= identifier\n' + ' element_index ::= integer | index_string\n' + ' index_string ::= +\n' + ' conversion ::= "r" | "s" | "a"\n' + ' format_spec ::= \n' + '\n' + 'In less formal terms, the replacement field can start with ' + 'a\n' + '*field_name* that specifies the object whose value is to be ' + 'formatted\n' + 'and inserted into the output instead of the replacement ' + 'field. The\n' + '*field_name* is optionally followed by a *conversion* ' + 'field, which is\n' + 'preceded by an exclamation point "\'!\'", and a ' + '*format_spec*, which is\n' + 'preceded by a colon "\':\'". These specify a non-default ' + 'format for the\n' + 'replacement value.\n' + '\n' + 'See also the Format Specification Mini-Language section.\n' + '\n' + 'The *field_name* itself begins with an *arg_name* that is ' + 'either a\n' + "number or a keyword. If it's a number, it refers to a " + 'positional\n' + "argument, and if it's a keyword, it refers to a named " + 'keyword\n' + 'argument. If the numerical arg_names in a format string ' + 'are 0, 1, 2,\n' + '... in sequence, they can all be omitted (not just some) ' + 'and the\n' + 'numbers 0, 1, 2, ... will be automatically inserted in that ' + 'order.\n' + 'Because *arg_name* is not quote-delimited, it is not ' + 'possible to\n' + 'specify arbitrary dictionary keys (e.g., the strings ' + '"\'10\'" or\n' + '"\':-]\'") within a format string. The *arg_name* can be ' + 'followed by any\n' + 'number of index or attribute expressions. An expression of ' + 'the form\n' + '"\'.name\'" selects the named attribute using "getattr()", ' + 'while an\n' + 'expression of the form "\'[index]\'" does an index lookup ' + 'using\n' + '"__getitem__()".\n' + '\n' + 'Changed in version 3.1: The positional argument specifiers ' + 'can be\n' + 'omitted, so "\'{} {}\'" is equivalent to "\'{0} {1}\'".\n' + '\n' + 'Some simple format string examples:\n' + '\n' + ' "First, thou shalt count to {0}" # References first ' + 'positional argument\n' + ' "Bring me a {}" # Implicitly ' + 'references the first positional argument\n' + ' "From {} to {}" # Same as "From {0} to ' + '{1}"\n' + ' "My quest is {name}" # References keyword ' + "argument 'name'\n" + ' "Weight in tons {0.weight}" # \'weight\' attribute ' + 'of first positional arg\n' + ' "Units destroyed: {players[0]}" # First element of ' + "keyword argument 'players'.\n" + '\n' + 'The *conversion* field causes a type coercion before ' + 'formatting.\n' + 'Normally, the job of formatting a value is done by the ' + '"__format__()"\n' + 'method of the value itself. However, in some cases it is ' + 'desirable to\n' + 'force a type to be formatted as a string, overriding its ' + 'own\n' + 'definition of formatting. By converting the value to a ' + 'string before\n' + 'calling "__format__()", the normal formatting logic is ' + 'bypassed.\n' + '\n' + 'Three conversion flags are currently supported: "\'!s\'" ' + 'which calls\n' + '"str()" on the value, "\'!r\'" which calls "repr()" and ' + '"\'!a\'" which\n' + 'calls "ascii()".\n' + '\n' + 'Some examples:\n' + '\n' + ' "Harold\'s a clever {0!s}" # Calls str() on the ' + 'argument first\n' + ' "Bring out the holy {name!r}" # Calls repr() on the ' + 'argument first\n' + ' "More {!a}" # Calls ascii() on the ' + 'argument first\n' + '\n' + 'The *format_spec* field contains a specification of how the ' + 'value\n' + 'should be presented, including such details as field width, ' + 'alignment,\n' + 'padding, decimal precision and so on. Each value type can ' + 'define its\n' + 'own "formatting mini-language" or interpretation of the ' + '*format_spec*.\n' + '\n' + 'Most built-in types support a common formatting ' + 'mini-language, which\n' + 'is described in the next section.\n' + '\n' + 'A *format_spec* field can also include nested replacement ' + 'fields\n' + 'within it. These nested replacement fields may contain a ' + 'field name,\n' + 'conversion flag and format specification, but deeper ' + 'nesting is not\n' + 'allowed. The replacement fields within the format_spec ' + 'are\n' + 'substituted before the *format_spec* string is interpreted. ' + 'This\n' + 'allows the formatting of a value to be dynamically ' + 'specified.\n' + '\n' + 'See the Format examples section for some examples.\n' + '\n' + '\n' + 'Format Specification Mini-Language\n' + '==================================\n' + '\n' + '"Format specifications" are used within replacement fields ' + 'contained\n' + 'within a format string to define how individual values are ' + 'presented\n' + '(see Format String Syntax and Formatted string literals). ' + 'They can\n' + 'also be passed directly to the built-in "format()" ' + 'function. Each\n' + 'formattable type may define how the format specification is ' + 'to be\n' + 'interpreted.\n' + '\n' + 'Most built-in types implement the following options for ' + 'format\n' + 'specifications, although some of the formatting options are ' + 'only\n' + 'supported by the numeric types.\n' + '\n' + 'A general convention is that an empty format string ("""") ' + 'produces\n' + 'the same result as if you had called "str()" on the value. ' + 'A non-empty\n' + 'format string typically modifies the result.\n' + '\n' + 'The general form of a *standard format specifier* is:\n' + '\n' + ' format_spec ::= ' + '[[fill]align][sign][#][0][width][grouping_option][.precision][type]\n' + ' fill ::= \n' + ' align ::= "<" | ">" | "=" | "^"\n' + ' sign ::= "+" | "-" | " "\n' + ' width ::= integer\n' + ' grouping_option ::= "_" | ","\n' + ' precision ::= integer\n' + ' type ::= "b" | "c" | "d" | "e" | "E" | "f" | ' + '"F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"\n' + '\n' + 'If a valid *align* value is specified, it can be preceded ' + 'by a *fill*\n' + 'character that can be any character and defaults to a space ' + 'if\n' + 'omitted. It is not possible to use a literal curly brace ' + '(""{"" or\n' + '""}"") as the *fill* character in a formatted string ' + 'literal or when\n' + 'using the "str.format()" method. However, it is possible ' + 'to insert a\n' + 'curly brace with a nested replacement field. This ' + "limitation doesn't\n" + 'affect the "format()" function.\n' + '\n' + 'The meaning of the various alignment options is as ' + 'follows:\n' + '\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | Option | ' + 'Meaning ' + '|\n' + ' ' + '+===========+============================================================+\n' + ' | "\'<\'" | Forces the field to be left-aligned ' + 'within the available |\n' + ' | | space (this is the default for most ' + 'objects). |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'>\'" | Forces the field to be right-aligned ' + 'within the available |\n' + ' | | space (this is the default for ' + 'numbers). |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'=\'" | Forces the padding to be placed after ' + 'the sign (if any) |\n' + ' | | but before the digits. This is used for ' + 'printing fields |\n' + " | | in the form '+000000120'. This alignment " + 'option is only |\n' + ' | | valid for numeric types. It becomes the ' + "default when '0' |\n" + ' | | immediately precedes the field ' + 'width. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'^\'" | Forces the field to be centered within ' + 'the available |\n' + ' | | ' + 'space. ' + '|\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + '\n' + 'Note that unless a minimum field width is defined, the ' + 'field width\n' + 'will always be the same size as the data to fill it, so ' + 'that the\n' + 'alignment option has no meaning in this case.\n' + '\n' + 'The *sign* option is only valid for number types, and can ' + 'be one of\n' + 'the following:\n' + '\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | Option | ' + 'Meaning ' + '|\n' + ' ' + '+===========+============================================================+\n' + ' | "\'+\'" | indicates that a sign should be used for ' + 'both positive as |\n' + ' | | well as negative ' + 'numbers. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'-\'" | indicates that a sign should be used ' + 'only for negative |\n' + ' | | numbers (this is the default ' + 'behavior). |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | space | indicates that a leading space should be ' + 'used on positive |\n' + ' | | numbers, and a minus sign on negative ' + 'numbers. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + '\n' + 'The "\'#\'" option causes the "alternate form" to be used ' + 'for the\n' + 'conversion. The alternate form is defined differently for ' + 'different\n' + 'types. This option is only valid for integer, float, ' + 'complex and\n' + 'Decimal types. For integers, when binary, octal, or ' + 'hexadecimal output\n' + 'is used, this option adds the prefix respective "\'0b\'", ' + '"\'0o\'", or\n' + '"\'0x\'" to the output value. For floats, complex and ' + 'Decimal the\n' + 'alternate form causes the result of the conversion to ' + 'always contain a\n' + 'decimal-point character, even if no digits follow it. ' + 'Normally, a\n' + 'decimal-point character appears in the result of these ' + 'conversions\n' + 'only if a digit follows it. In addition, for "\'g\'" and ' + '"\'G\'"\n' + 'conversions, trailing zeros are not removed from the ' + 'result.\n' + '\n' + 'The "\',\'" option signals the use of a comma for a ' + 'thousands separator.\n' + 'For a locale aware separator, use the "\'n\'" integer ' + 'presentation type\n' + 'instead.\n' + '\n' + 'Changed in version 3.1: Added the "\',\'" option (see also ' + '**PEP 378**).\n' + '\n' + 'The "\'_\'" option signals the use of an underscore for a ' + 'thousands\n' + 'separator for floating point presentation types and for ' + 'integer\n' + 'presentation type "\'d\'". For integer presentation types ' + '"\'b\'", "\'o\'",\n' + '"\'x\'", and "\'X\'", underscores will be inserted every 4 ' + 'digits. For\n' + 'other presentation types, specifying this option is an ' + 'error.\n' + '\n' + 'Changed in version 3.6: Added the "\'_\'" option (see also ' + '**PEP 515**).\n' + '\n' + '*width* is a decimal integer defining the minimum field ' + 'width. If not\n' + 'specified, then the field width will be determined by the ' + 'content.\n' + '\n' + 'When no explicit alignment is given, preceding the *width* ' + 'field by a\n' + 'zero ("\'0\'") character enables sign-aware zero-padding ' + 'for numeric\n' + 'types. This is equivalent to a *fill* character of "\'0\'" ' + 'with an\n' + '*alignment* type of "\'=\'".\n' + '\n' + 'The *precision* is a decimal number indicating how many ' + 'digits should\n' + 'be displayed after the decimal point for a floating point ' + 'value\n' + 'formatted with "\'f\'" and "\'F\'", or before and after the ' + 'decimal point\n' + 'for a floating point value formatted with "\'g\'" or ' + '"\'G\'". For non-\n' + 'number types the field indicates the maximum field size - ' + 'in other\n' + 'words, how many characters will be used from the field ' + 'content. The\n' + '*precision* is not allowed for integer values.\n' + '\n' + 'Finally, the *type* determines how the data should be ' + 'presented.\n' + '\n' + 'The available string presentation types are:\n' + '\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | Type | ' + 'Meaning ' + '|\n' + ' ' + '+===========+============================================================+\n' + ' | "\'s\'" | String format. This is the default type ' + 'for strings and |\n' + ' | | may be ' + 'omitted. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | None | The same as ' + '"\'s\'". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + '\n' + 'The available integer presentation types are:\n' + '\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | Type | ' + 'Meaning ' + '|\n' + ' ' + '+===========+============================================================+\n' + ' | "\'b\'" | Binary format. Outputs the number in ' + 'base 2. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'c\'" | Character. Converts the integer to the ' + 'corresponding |\n' + ' | | unicode character before ' + 'printing. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'d\'" | Decimal Integer. Outputs the number in ' + 'base 10. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'o\'" | Octal format. Outputs the number in base ' + '8. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'x\'" | Hex format. Outputs the number in base ' + '16, using lower- |\n' + ' | | case letters for the digits above ' + '9. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'X\'" | Hex format. Outputs the number in base ' + '16, using upper- |\n' + ' | | case letters for the digits above ' + '9. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'n\'" | Number. This is the same as "\'d\'", ' + 'except that it uses the |\n' + ' | | current locale setting to insert the ' + 'appropriate number |\n' + ' | | separator ' + 'characters. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | None | The same as ' + '"\'d\'". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + '\n' + 'In addition to the above presentation types, integers can ' + 'be formatted\n' + 'with the floating point presentation types listed below ' + '(except "\'n\'"\n' + 'and "None"). When doing so, "float()" is used to convert ' + 'the integer\n' + 'to a floating point number before formatting.\n' + '\n' + 'The available presentation types for floating point and ' + 'decimal values\n' + 'are:\n' + '\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | Type | ' + 'Meaning ' + '|\n' + ' ' + '+===========+============================================================+\n' + ' | "\'e\'" | Exponent notation. Prints the number in ' + 'scientific |\n' + " | | notation using the letter 'e' to indicate " + 'the exponent. |\n' + ' | | The default precision is ' + '"6". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'E\'" | Exponent notation. Same as "\'e\'" ' + 'except it uses an upper |\n' + " | | case 'E' as the separator " + 'character. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'f\'" | Fixed point. Displays the number as a ' + 'fixed-point number. |\n' + ' | | The default precision is ' + '"6". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'F\'" | Fixed point. Same as "\'f\'", but ' + 'converts "nan" to "NAN" |\n' + ' | | and "inf" to ' + '"INF". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'g\'" | General format. For a given precision ' + '"p >= 1", this |\n' + ' | | rounds the number to "p" significant ' + 'digits and then |\n' + ' | | formats the result in either fixed-point ' + 'format or in |\n' + ' | | scientific notation, depending on its ' + 'magnitude. The |\n' + ' | | precise rules are as follows: suppose that ' + 'the result |\n' + ' | | formatted with presentation type "\'e\'" ' + 'and precision "p-1" |\n' + ' | | would have exponent "exp". Then if "-4 <= ' + 'exp < p", the |\n' + ' | | number is formatted with presentation type ' + '"\'f\'" and |\n' + ' | | precision "p-1-exp". Otherwise, the ' + 'number is formatted |\n' + ' | | with presentation type "\'e\'" and ' + 'precision "p-1". In both |\n' + ' | | cases insignificant trailing zeros are ' + 'removed from the |\n' + ' | | significand, and the decimal point is also ' + 'removed if |\n' + ' | | there are no remaining digits following ' + 'it. Positive and |\n' + ' | | negative infinity, positive and negative ' + 'zero, and nans, |\n' + ' | | are formatted as "inf", "-inf", "0", "-0" ' + 'and "nan" |\n' + ' | | respectively, regardless of the ' + 'precision. A precision of |\n' + ' | | "0" is treated as equivalent to a ' + 'precision of "1". The |\n' + ' | | default precision is ' + '"6". |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'G\'" | General format. Same as "\'g\'" except ' + 'switches to "\'E\'" if |\n' + ' | | the number gets too large. The ' + 'representations of infinity |\n' + ' | | and NaN are uppercased, ' + 'too. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'n\'" | Number. This is the same as "\'g\'", ' + 'except that it uses the |\n' + ' | | current locale setting to insert the ' + 'appropriate number |\n' + ' | | separator ' + 'characters. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | "\'%\'" | Percentage. Multiplies the number by 100 ' + 'and displays in |\n' + ' | | fixed ("\'f\'") format, followed by a ' + 'percent sign. |\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + ' | None | Similar to "\'g\'", except that ' + 'fixed-point notation, when |\n' + ' | | used, has at least one digit past the ' + 'decimal point. The |\n' + ' | | default precision is as high as needed to ' + 'represent the |\n' + ' | | particular value. The overall effect is to ' + 'match the |\n' + ' | | output of "str()" as altered by the other ' + 'format |\n' + ' | | ' + 'modifiers. ' + '|\n' + ' ' + '+-----------+------------------------------------------------------------+\n' + '\n' + '\n' + 'Format examples\n' + '===============\n' + '\n' + 'This section contains examples of the "str.format()" syntax ' + 'and\n' + 'comparison with the old "%"-formatting.\n' + '\n' + 'In most of the cases the syntax is similar to the old ' + '"%"-formatting,\n' + 'with the addition of the "{}" and with ":" used instead of ' + '"%". For\n' + 'example, "\'%03.2f\'" can be translated to "\'{:03.2f}\'".\n' + '\n' + 'The new format syntax also supports new and different ' + 'options, shown\n' + 'in the follow examples.\n' + '\n' + 'Accessing arguments by position:\n' + '\n' + " >>> '{0}, {1}, {2}'.format('a', 'b', 'c')\n" + " 'a, b, c'\n" + " >>> '{}, {}, {}'.format('a', 'b', 'c') # 3.1+ only\n" + " 'a, b, c'\n" + " >>> '{2}, {1}, {0}'.format('a', 'b', 'c')\n" + " 'c, b, a'\n" + " >>> '{2}, {1}, {0}'.format(*'abc') # unpacking " + 'argument sequence\n' + " 'c, b, a'\n" + " >>> '{0}{1}{0}'.format('abra', 'cad') # arguments' " + 'indices can be repeated\n' + " 'abracadabra'\n" + '\n' + 'Accessing arguments by name:\n' + '\n' + " >>> 'Coordinates: {latitude}, " + "{longitude}'.format(latitude='37.24N', " + "longitude='-115.81W')\n" + " 'Coordinates: 37.24N, -115.81W'\n" + " >>> coord = {'latitude': '37.24N', 'longitude': " + "'-115.81W'}\n" + " >>> 'Coordinates: {latitude}, " + "{longitude}'.format(**coord)\n" + " 'Coordinates: 37.24N, -115.81W'\n" + '\n' + "Accessing arguments' attributes:\n" + '\n' + ' >>> c = 3-5j\n' + " >>> ('The complex number {0} is formed from the real " + "part {0.real} '\n" + " ... 'and the imaginary part {0.imag}.').format(c)\n" + " 'The complex number (3-5j) is formed from the real part " + "3.0 and the imaginary part -5.0.'\n" + ' >>> class Point:\n' + ' ... def __init__(self, x, y):\n' + ' ... self.x, self.y = x, y\n' + ' ... def __str__(self):\n' + " ... return 'Point({self.x}, " + "{self.y})'.format(self=self)\n" + ' ...\n' + ' >>> str(Point(4, 2))\n' + " 'Point(4, 2)'\n" + '\n' + "Accessing arguments' items:\n" + '\n' + ' >>> coord = (3, 5)\n' + " >>> 'X: {0[0]}; Y: {0[1]}'.format(coord)\n" + " 'X: 3; Y: 5'\n" + '\n' + 'Replacing "%s" and "%r":\n' + '\n' + ' >>> "repr() shows quotes: {!r}; str() doesn\'t: ' + '{!s}".format(\'test1\', \'test2\')\n' + ' "repr() shows quotes: \'test1\'; str() doesn\'t: test2"\n' + '\n' + 'Aligning the text and specifying a width:\n' + '\n' + " >>> '{:<30}'.format('left aligned')\n" + " 'left aligned '\n" + " >>> '{:>30}'.format('right aligned')\n" + " ' right aligned'\n" + " >>> '{:^30}'.format('centered')\n" + " ' centered '\n" + " >>> '{:*^30}'.format('centered') # use '*' as a fill " + 'char\n' + " '***********centered***********'\n" + '\n' + 'Replacing "%+f", "%-f", and "% f" and specifying a sign:\n' + '\n' + " >>> '{:+f}; {:+f}'.format(3.14, -3.14) # show it " + 'always\n' + " '+3.140000; -3.140000'\n" + " >>> '{: f}; {: f}'.format(3.14, -3.14) # show a space " + 'for positive numbers\n' + " ' 3.140000; -3.140000'\n" + " >>> '{:-f}; {:-f}'.format(3.14, -3.14) # show only the " + "minus -- same as '{:f}; {:f}'\n" + " '3.140000; -3.140000'\n" + '\n' + 'Replacing "%x" and "%o" and converting the value to ' + 'different bases:\n' + '\n' + ' >>> # format also supports binary numbers\n' + ' >>> "int: {0:d}; hex: {0:x}; oct: {0:o}; bin: ' + '{0:b}".format(42)\n' + " 'int: 42; hex: 2a; oct: 52; bin: 101010'\n" + ' >>> # with 0x, 0o, or 0b as prefix:\n' + ' >>> "int: {0:d}; hex: {0:#x}; oct: {0:#o}; bin: ' + '{0:#b}".format(42)\n' + " 'int: 42; hex: 0x2a; oct: 0o52; bin: 0b101010'\n" + '\n' + 'Using the comma as a thousands separator:\n' + '\n' + " >>> '{:,}'.format(1234567890)\n" + " '1,234,567,890'\n" + '\n' + 'Expressing a percentage:\n' + '\n' + ' >>> points = 19\n' + ' >>> total = 22\n' + " >>> 'Correct answers: {:.2%}'.format(points/total)\n" + " 'Correct answers: 86.36%'\n" + '\n' + 'Using type-specific formatting:\n' + '\n' + ' >>> import datetime\n' + ' >>> d = datetime.datetime(2010, 7, 4, 12, 15, 58)\n' + " >>> '{:%Y-%m-%d %H:%M:%S}'.format(d)\n" + " '2010-07-04 12:15:58'\n" + '\n' + 'Nesting arguments and more complex examples:\n' + '\n' + " >>> for align, text in zip('<^>', ['left', 'center', " + "'right']):\n" + " ... '{0:{fill}{align}16}'.format(text, fill=align, " + 'align=align)\n' + ' ...\n' + " 'left<<<<<<<<<<<<'\n" + " '^^^^^center^^^^^'\n" + " '>>>>>>>>>>>right'\n" + ' >>>\n' + ' >>> octets = [192, 168, 0, 1]\n' + " >>> '{:02X}{:02X}{:02X}{:02X}'.format(*octets)\n" + " 'C0A80001'\n" + ' >>> int(_, 16)\n' + ' 3232235521\n' + ' >>>\n' + ' >>> width = 5\n' + ' >>> for num in range(5,12): #doctest: ' + '+NORMALIZE_WHITESPACE\n' + " ... for base in 'dXob':\n" + " ... print('{0:{width}{base}}'.format(num, " + "base=base, width=width), end=' ')\n" + ' ... print()\n' + ' ...\n' + ' 5 5 5 101\n' + ' 6 6 6 110\n' + ' 7 7 7 111\n' + ' 8 8 10 1000\n' + ' 9 9 11 1001\n' + ' 10 A 12 1010\n' + ' 11 B 13 1011\n', + 'function': '\n' + 'Function definitions\n' + '********************\n' + '\n' + 'A function definition defines a user-defined function object ' + '(see\n' + 'section The standard type hierarchy):\n' + '\n' + ' funcdef ::= [decorators] "def" funcname "(" ' + '[parameter_list] ")" ["->" expression] ":" suite\n' + ' decorators ::= decorator+\n' + ' decorator ::= "@" dotted_name ["(" ' + '[argument_list [","]] ")"] NEWLINE\n' + ' dotted_name ::= identifier ("." identifier)*\n' + ' parameter_list ::= defparameter ("," defparameter)* ' + '["," [parameter_list_starargs]]\n' + ' | parameter_list_starargs\n' + ' parameter_list_starargs ::= "*" [parameter] ("," ' + 'defparameter)* ["," ["**" parameter [","]]]\n' + ' | "**" parameter [","]\n' + ' parameter ::= identifier [":" expression]\n' + ' defparameter ::= parameter ["=" expression]\n' + ' funcname ::= identifier\n' + '\n' + 'A function definition is an executable statement. Its execution ' + 'binds\n' + 'the function name in the current local namespace to a function ' + 'object\n' + '(a wrapper around the executable code for the function). This\n' + 'function object contains a reference to the current global ' + 'namespace\n' + 'as the global namespace to be used when the function is called.\n' + '\n' + 'The function definition does not execute the function body; this ' + 'gets\n' + 'executed only when the function is called. [3]\n' + '\n' + 'A function definition may be wrapped by one or more *decorator*\n' + 'expressions. Decorator expressions are evaluated when the ' + 'function is\n' + 'defined, in the scope that contains the function definition. ' + 'The\n' + 'result must be a callable, which is invoked with the function ' + 'object\n' + 'as the only argument. The returned value is bound to the ' + 'function name\n' + 'instead of the function object. Multiple decorators are applied ' + 'in\n' + 'nested fashion. For example, the following code\n' + '\n' + ' @f1(arg)\n' + ' @f2\n' + ' def func(): pass\n' + '\n' + 'is roughly equivalent to\n' + '\n' + ' def func(): pass\n' + ' func = f1(arg)(f2(func))\n' + '\n' + 'except that the original function is not temporarily bound to ' + 'the name\n' + '"func".\n' + '\n' + 'When one or more *parameters* have the form *parameter* "="\n' + '*expression*, the function is said to have "default parameter ' + 'values."\n' + 'For a parameter with a default value, the corresponding ' + '*argument* may\n' + "be omitted from a call, in which case the parameter's default " + 'value is\n' + 'substituted. If a parameter has a default value, all following\n' + 'parameters up until the ""*"" must also have a default value --- ' + 'this\n' + 'is a syntactic restriction that is not expressed by the ' + 'grammar.\n' + '\n' + '**Default parameter values are evaluated from left to right when ' + 'the\n' + 'function definition is executed.** This means that the ' + 'expression is\n' + 'evaluated once, when the function is defined, and that the same ' + '"pre-\n' + 'computed" value is used for each call. This is especially ' + 'important\n' + 'to understand when a default parameter is a mutable object, such ' + 'as a\n' + 'list or a dictionary: if the function modifies the object (e.g. ' + 'by\n' + 'appending an item to a list), the default value is in effect ' + 'modified.\n' + 'This is generally not what was intended. A way around this is ' + 'to use\n' + '"None" as the default, and explicitly test for it in the body of ' + 'the\n' + 'function, e.g.:\n' + '\n' + ' def whats_on_the_telly(penguin=None):\n' + ' if penguin is None:\n' + ' penguin = []\n' + ' penguin.append("property of the zoo")\n' + ' return penguin\n' + '\n' + 'Function call semantics are described in more detail in section ' + 'Calls.\n' + 'A function call always assigns values to all parameters ' + 'mentioned in\n' + 'the parameter list, either from position arguments, from ' + 'keyword\n' + 'arguments, or from default values. If the form ""*identifier"" ' + 'is\n' + 'present, it is initialized to a tuple receiving any excess ' + 'positional\n' + 'parameters, defaulting to the empty tuple. If the form\n' + '""**identifier"" is present, it is initialized to a new ordered\n' + 'mapping receiving any excess keyword arguments, defaulting to a ' + 'new\n' + 'empty mapping of the same type. Parameters after ""*"" or\n' + '""*identifier"" are keyword-only parameters and may only be ' + 'passed\n' + 'used keyword arguments.\n' + '\n' + 'Parameters may have annotations of the form "": expression"" ' + 'following\n' + 'the parameter name. Any parameter may have an annotation even ' + 'those\n' + 'of the form "*identifier" or "**identifier". Functions may ' + 'have\n' + '"return" annotation of the form ""-> expression"" after the ' + 'parameter\n' + 'list. These annotations can be any valid Python expression and ' + 'are\n' + 'evaluated when the function definition is executed. Annotations ' + 'may\n' + 'be evaluated in a different order than they appear in the source ' + 'code.\n' + 'The presence of annotations does not change the semantics of a\n' + 'function. The annotation values are available as values of a\n' + "dictionary keyed by the parameters' names in the " + '"__annotations__"\n' + 'attribute of the function object.\n' + '\n' + 'It is also possible to create anonymous functions (functions not ' + 'bound\n' + 'to a name), for immediate use in expressions. This uses lambda\n' + 'expressions, described in section Lambdas. Note that the ' + 'lambda\n' + 'expression is merely a shorthand for a simplified function ' + 'definition;\n' + 'a function defined in a ""def"" statement can be passed around ' + 'or\n' + 'assigned to another name just like a function defined by a ' + 'lambda\n' + 'expression. The ""def"" form is actually more powerful since ' + 'it\n' + 'allows the execution of multiple statements and annotations.\n' + '\n' + "**Programmer's note:** Functions are first-class objects. A " + '""def""\n' + 'statement executed inside a function definition defines a local\n' + 'function that can be returned or passed around. Free variables ' + 'used\n' + 'in the nested function can access the local variables of the ' + 'function\n' + 'containing the def. See section Naming and binding for ' + 'details.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3107** - Function Annotations\n' + ' The original specification for function annotations.\n', + 'global': '\n' + 'The "global" statement\n' + '**********************\n' + '\n' + ' global_stmt ::= "global" identifier ("," identifier)*\n' + '\n' + 'The "global" statement is a declaration which holds for the ' + 'entire\n' + 'current code block. It means that the listed identifiers are to ' + 'be\n' + 'interpreted as globals. It would be impossible to assign to a ' + 'global\n' + 'variable without "global", although free variables may refer to\n' + 'globals without being declared global.\n' + '\n' + 'Names listed in a "global" statement must not be used in the same ' + 'code\n' + 'block textually preceding that "global" statement.\n' + '\n' + 'Names listed in a "global" statement must not be defined as ' + 'formal\n' + 'parameters or in a "for" loop control target, "class" definition,\n' + 'function definition, "import" statement, or variable annotation.\n' + '\n' + '**CPython implementation detail:** The current implementation does ' + 'not\n' + 'enforce some of these restriction, but programs should not abuse ' + 'this\n' + 'freedom, as future implementations may enforce them or silently ' + 'change\n' + 'the meaning of the program.\n' + '\n' + '**Programmer\'s note:** the "global" is a directive to the ' + 'parser. It\n' + 'applies only to code parsed at the same time as the "global"\n' + 'statement. In particular, a "global" statement contained in a ' + 'string\n' + 'or code object supplied to the built-in "exec()" function does ' + 'not\n' + 'affect the code block *containing* the function call, and code\n' + 'contained in such a string is unaffected by "global" statements in ' + 'the\n' + 'code containing the function call. The same applies to the ' + '"eval()"\n' + 'and "compile()" functions.\n', + 'id-classes': '\n' + 'Reserved classes of identifiers\n' + '*******************************\n' + '\n' + 'Certain classes of identifiers (besides keywords) have ' + 'special\n' + 'meanings. These classes are identified by the patterns of ' + 'leading and\n' + 'trailing underscore characters:\n' + '\n' + '"_*"\n' + ' Not imported by "from module import *". The special ' + 'identifier "_"\n' + ' is used in the interactive interpreter to store the result ' + 'of the\n' + ' last evaluation; it is stored in the "builtins" module. ' + 'When not\n' + ' in interactive mode, "_" has no special meaning and is not ' + 'defined.\n' + ' See section The import statement.\n' + '\n' + ' Note: The name "_" is often used in conjunction with\n' + ' internationalization; refer to the documentation for the\n' + ' "gettext" module for more information on this ' + 'convention.\n' + '\n' + '"__*__"\n' + ' System-defined names. These names are defined by the ' + 'interpreter\n' + ' and its implementation (including the standard library). ' + 'Current\n' + ' system names are discussed in the Special method names ' + 'section and\n' + ' elsewhere. More will likely be defined in future versions ' + 'of\n' + ' Python. *Any* use of "__*__" names, in any context, that ' + 'does not\n' + ' follow explicitly documented use, is subject to breakage ' + 'without\n' + ' warning.\n' + '\n' + '"__*"\n' + ' Class-private names. Names in this category, when used ' + 'within the\n' + ' context of a class definition, are re-written to use a ' + 'mangled form\n' + ' to help avoid name clashes between "private" attributes of ' + 'base and\n' + ' derived classes. See section Identifiers (Names).\n', + 'identifiers': '\n' + 'Identifiers and keywords\n' + '************************\n' + '\n' + 'Identifiers (also referred to as *names*) are described by ' + 'the\n' + 'following lexical definitions.\n' + '\n' + 'The syntax of identifiers in Python is based on the Unicode ' + 'standard\n' + 'annex UAX-31, with elaboration and changes as defined below; ' + 'see also\n' + '**PEP 3131** for further details.\n' + '\n' + 'Within the ASCII range (U+0001..U+007F), the valid characters ' + 'for\n' + 'identifiers are the same as in Python 2.x: the uppercase and ' + 'lowercase\n' + 'letters "A" through "Z", the underscore "_" and, except for ' + 'the first\n' + 'character, the digits "0" through "9".\n' + '\n' + 'Python 3.0 introduces additional characters from outside the ' + 'ASCII\n' + 'range (see **PEP 3131**). For these characters, the ' + 'classification\n' + 'uses the version of the Unicode Character Database as ' + 'included in the\n' + '"unicodedata" module.\n' + '\n' + 'Identifiers are unlimited in length. Case is significant.\n' + '\n' + ' identifier ::= xid_start xid_continue*\n' + ' id_start ::= \n' + ' id_continue ::= \n' + ' xid_start ::= \n' + ' xid_continue ::= \n' + '\n' + 'The Unicode category codes mentioned above stand for:\n' + '\n' + '* *Lu* - uppercase letters\n' + '\n' + '* *Ll* - lowercase letters\n' + '\n' + '* *Lt* - titlecase letters\n' + '\n' + '* *Lm* - modifier letters\n' + '\n' + '* *Lo* - other letters\n' + '\n' + '* *Nl* - letter numbers\n' + '\n' + '* *Mn* - nonspacing marks\n' + '\n' + '* *Mc* - spacing combining marks\n' + '\n' + '* *Nd* - decimal numbers\n' + '\n' + '* *Pc* - connector punctuations\n' + '\n' + '* *Other_ID_Start* - explicit list of characters in ' + 'PropList.txt to\n' + ' support backwards compatibility\n' + '\n' + '* *Other_ID_Continue* - likewise\n' + '\n' + 'All identifiers are converted into the normal form NFKC while ' + 'parsing;\n' + 'comparison of identifiers is based on NFKC.\n' + '\n' + 'A non-normative HTML file listing all valid identifier ' + 'characters for\n' + 'Unicode 4.1 can be found at https://www.dcl.hpi.uni-\n' + 'potsdam.de/home/loewis/table-3131.html.\n' + '\n' + '\n' + 'Keywords\n' + '========\n' + '\n' + 'The following identifiers are used as reserved words, or ' + '*keywords* of\n' + 'the language, and cannot be used as ordinary identifiers. ' + 'They must\n' + 'be spelled exactly as written here:\n' + '\n' + ' False class finally is return\n' + ' None continue for lambda try\n' + ' True def from nonlocal while\n' + ' and del global not with\n' + ' as elif if or yield\n' + ' assert else import pass\n' + ' break except in raise\n' + '\n' + '\n' + 'Reserved classes of identifiers\n' + '===============================\n' + '\n' + 'Certain classes of identifiers (besides keywords) have ' + 'special\n' + 'meanings. These classes are identified by the patterns of ' + 'leading and\n' + 'trailing underscore characters:\n' + '\n' + '"_*"\n' + ' Not imported by "from module import *". The special ' + 'identifier "_"\n' + ' is used in the interactive interpreter to store the result ' + 'of the\n' + ' last evaluation; it is stored in the "builtins" module. ' + 'When not\n' + ' in interactive mode, "_" has no special meaning and is not ' + 'defined.\n' + ' See section The import statement.\n' + '\n' + ' Note: The name "_" is often used in conjunction with\n' + ' internationalization; refer to the documentation for ' + 'the\n' + ' "gettext" module for more information on this ' + 'convention.\n' + '\n' + '"__*__"\n' + ' System-defined names. These names are defined by the ' + 'interpreter\n' + ' and its implementation (including the standard library). ' + 'Current\n' + ' system names are discussed in the Special method names ' + 'section and\n' + ' elsewhere. More will likely be defined in future versions ' + 'of\n' + ' Python. *Any* use of "__*__" names, in any context, that ' + 'does not\n' + ' follow explicitly documented use, is subject to breakage ' + 'without\n' + ' warning.\n' + '\n' + '"__*"\n' + ' Class-private names. Names in this category, when used ' + 'within the\n' + ' context of a class definition, are re-written to use a ' + 'mangled form\n' + ' to help avoid name clashes between "private" attributes of ' + 'base and\n' + ' derived classes. See section Identifiers (Names).\n', + 'if': '\n' + 'The "if" statement\n' + '******************\n' + '\n' + 'The "if" statement is used for conditional execution:\n' + '\n' + ' if_stmt ::= "if" expression ":" suite\n' + ' ( "elif" expression ":" suite )*\n' + ' ["else" ":" suite]\n' + '\n' + 'It selects exactly one of the suites by evaluating the expressions ' + 'one\n' + 'by one until one is found to be true (see section Boolean operations\n' + 'for the definition of true and false); then that suite is executed\n' + '(and no other part of the "if" statement is executed or evaluated).\n' + 'If all expressions are false, the suite of the "else" clause, if\n' + 'present, is executed.\n', + 'imaginary': '\n' + 'Imaginary literals\n' + '******************\n' + '\n' + 'Imaginary literals are described by the following lexical ' + 'definitions:\n' + '\n' + ' imagnumber ::= (floatnumber | digitpart) ("j" | "J")\n' + '\n' + 'An imaginary literal yields a complex number with a real part ' + 'of 0.0.\n' + 'Complex numbers are represented as a pair of floating point ' + 'numbers\n' + 'and have the same restrictions on their range. To create a ' + 'complex\n' + 'number with a nonzero real part, add a floating point number to ' + 'it,\n' + 'e.g., "(3+4j)". Some examples of imaginary literals:\n' + '\n' + ' 3.14j 10.j 10j .001j 1e100j 3.14e-10j ' + '3.14_15_93j\n', + 'import': '\n' + 'The "import" statement\n' + '**********************\n' + '\n' + ' import_stmt ::= "import" module ["as" name] ( "," module ' + '["as" name] )*\n' + ' | "from" relative_module "import" identifier ' + '["as" name]\n' + ' ( "," identifier ["as" name] )*\n' + ' | "from" relative_module "import" "(" ' + 'identifier ["as" name]\n' + ' ( "," identifier ["as" name] )* [","] ")"\n' + ' | "from" module "import" "*"\n' + ' module ::= (identifier ".")* identifier\n' + ' relative_module ::= "."* module | "."+\n' + ' name ::= identifier\n' + '\n' + 'The basic import statement (no "from" clause) is executed in two\n' + 'steps:\n' + '\n' + '1. find a module, loading and initializing it if necessary\n' + '\n' + '2. define a name or names in the local namespace for the scope\n' + ' where the "import" statement occurs.\n' + '\n' + 'When the statement contains multiple clauses (separated by commas) ' + 'the\n' + 'two steps are carried out separately for each clause, just as ' + 'though\n' + 'the clauses had been separated out into individual import ' + 'statements.\n' + '\n' + 'The details of the first step, finding and loading modules are\n' + 'described in greater detail in the section on the import system, ' + 'which\n' + 'also describes the various types of packages and modules that can ' + 'be\n' + 'imported, as well as all the hooks that can be used to customize ' + 'the\n' + 'import system. Note that failures in this step may indicate ' + 'either\n' + 'that the module could not be located, *or* that an error occurred\n' + 'while initializing the module, which includes execution of the\n' + "module's code.\n" + '\n' + 'If the requested module is retrieved successfully, it will be ' + 'made\n' + 'available in the local namespace in one of three ways:\n' + '\n' + '* If the module name is followed by "as", then the name following\n' + ' "as" is bound directly to the imported module.\n' + '\n' + '* If no other name is specified, and the module being imported is ' + 'a\n' + " top level module, the module's name is bound in the local " + 'namespace\n' + ' as a reference to the imported module\n' + '\n' + '* If the module being imported is *not* a top level module, then ' + 'the\n' + ' name of the top level package that contains the module is bound ' + 'in\n' + ' the local namespace as a reference to the top level package. ' + 'The\n' + ' imported module must be accessed using its full qualified name\n' + ' rather than directly\n' + '\n' + 'The "from" form uses a slightly more complex process:\n' + '\n' + '1. find the module specified in the "from" clause, loading and\n' + ' initializing it if necessary;\n' + '\n' + '2. for each of the identifiers specified in the "import" clauses:\n' + '\n' + ' 1. check if the imported module has an attribute by that name\n' + '\n' + ' 2. if not, attempt to import a submodule with that name and ' + 'then\n' + ' check the imported module again for that attribute\n' + '\n' + ' 3. if the attribute is not found, "ImportError" is raised.\n' + '\n' + ' 4. otherwise, a reference to that value is stored in the local\n' + ' namespace, using the name in the "as" clause if it is ' + 'present,\n' + ' otherwise using the attribute name\n' + '\n' + 'Examples:\n' + '\n' + ' import foo # foo imported and bound locally\n' + ' import foo.bar.baz # foo.bar.baz imported, foo bound ' + 'locally\n' + ' import foo.bar.baz as fbb # foo.bar.baz imported and bound as ' + 'fbb\n' + ' from foo.bar import baz # foo.bar.baz imported and bound as ' + 'baz\n' + ' from foo import attr # foo imported and foo.attr bound as ' + 'attr\n' + '\n' + 'If the list of identifiers is replaced by a star ("\'*\'"), all ' + 'public\n' + 'names defined in the module are bound in the local namespace for ' + 'the\n' + 'scope where the "import" statement occurs.\n' + '\n' + 'The *public names* defined by a module are determined by checking ' + 'the\n' + 'module\'s namespace for a variable named "__all__"; if defined, it ' + 'must\n' + 'be a sequence of strings which are names defined or imported by ' + 'that\n' + 'module. The names given in "__all__" are all considered public ' + 'and\n' + 'are required to exist. If "__all__" is not defined, the set of ' + 'public\n' + "names includes all names found in the module's namespace which do " + 'not\n' + 'begin with an underscore character ("\'_\'"). "__all__" should ' + 'contain\n' + 'the entire public API. It is intended to avoid accidentally ' + 'exporting\n' + 'items that are not part of the API (such as library modules which ' + 'were\n' + 'imported and used within the module).\n' + '\n' + 'The wild card form of import --- "from module import *" --- is ' + 'only\n' + 'allowed at the module level. Attempting to use it in class or\n' + 'function definitions will raise a "SyntaxError".\n' + '\n' + 'When specifying what module to import you do not have to specify ' + 'the\n' + 'absolute name of the module. When a module or package is ' + 'contained\n' + 'within another package it is possible to make a relative import ' + 'within\n' + 'the same top package without having to mention the package name. ' + 'By\n' + 'using leading dots in the specified module or package after "from" ' + 'you\n' + 'can specify how high to traverse up the current package hierarchy\n' + 'without specifying exact names. One leading dot means the current\n' + 'package where the module making the import exists. Two dots means ' + 'up\n' + 'one package level. Three dots is up two levels, etc. So if you ' + 'execute\n' + '"from . import mod" from a module in the "pkg" package then you ' + 'will\n' + 'end up importing "pkg.mod". If you execute "from ..subpkg2 import ' + 'mod"\n' + 'from within "pkg.subpkg1" you will import "pkg.subpkg2.mod". The\n' + 'specification for relative imports is contained within **PEP ' + '328**.\n' + '\n' + '"importlib.import_module()" is provided to support applications ' + 'that\n' + 'determine dynamically the modules to be loaded.\n' + '\n' + '\n' + 'Future statements\n' + '=================\n' + '\n' + 'A *future statement* is a directive to the compiler that a ' + 'particular\n' + 'module should be compiled using syntax or semantics that will be\n' + 'available in a specified future release of Python where the ' + 'feature\n' + 'becomes standard.\n' + '\n' + 'The future statement is intended to ease migration to future ' + 'versions\n' + 'of Python that introduce incompatible changes to the language. ' + 'It\n' + 'allows use of the new features on a per-module basis before the\n' + 'release in which the feature becomes standard.\n' + '\n' + ' future_statement ::= "from" "__future__" "import" feature ["as" ' + 'name]\n' + ' ("," feature ["as" name])*\n' + ' | "from" "__future__" "import" "(" feature ' + '["as" name]\n' + ' ("," feature ["as" name])* [","] ")"\n' + ' feature ::= identifier\n' + ' name ::= identifier\n' + '\n' + 'A future statement must appear near the top of the module. The ' + 'only\n' + 'lines that can appear before a future statement are:\n' + '\n' + '* the module docstring (if any),\n' + '\n' + '* comments,\n' + '\n' + '* blank lines, and\n' + '\n' + '* other future statements.\n' + '\n' + 'The features recognized by Python 3.0 are "absolute_import",\n' + '"division", "generators", "unicode_literals", "print_function",\n' + '"nested_scopes" and "with_statement". They are all redundant ' + 'because\n' + 'they are always enabled, and only kept for backwards ' + 'compatibility.\n' + '\n' + 'A future statement is recognized and treated specially at compile\n' + 'time: Changes to the semantics of core constructs are often\n' + 'implemented by generating different code. It may even be the ' + 'case\n' + 'that a new feature introduces new incompatible syntax (such as a ' + 'new\n' + 'reserved word), in which case the compiler may need to parse the\n' + 'module differently. Such decisions cannot be pushed off until\n' + 'runtime.\n' + '\n' + 'For any given release, the compiler knows which feature names ' + 'have\n' + 'been defined, and raises a compile-time error if a future ' + 'statement\n' + 'contains a feature not known to it.\n' + '\n' + 'The direct runtime semantics are the same as for any import ' + 'statement:\n' + 'there is a standard module "__future__", described later, and it ' + 'will\n' + 'be imported in the usual way at the time the future statement is\n' + 'executed.\n' + '\n' + 'The interesting runtime semantics depend on the specific feature\n' + 'enabled by the future statement.\n' + '\n' + 'Note that there is nothing special about the statement:\n' + '\n' + ' import __future__ [as name]\n' + '\n' + "That is not a future statement; it's an ordinary import statement " + 'with\n' + 'no special semantics or syntax restrictions.\n' + '\n' + 'Code compiled by calls to the built-in functions "exec()" and\n' + '"compile()" that occur in a module "M" containing a future ' + 'statement\n' + 'will, by default, use the new syntax or semantics associated with ' + 'the\n' + 'future statement. This can be controlled by optional arguments ' + 'to\n' + '"compile()" --- see the documentation of that function for ' + 'details.\n' + '\n' + 'A future statement typed at an interactive interpreter prompt ' + 'will\n' + 'take effect for the rest of the interpreter session. If an\n' + 'interpreter is started with the "-i" option, is passed a script ' + 'name\n' + 'to execute, and the script includes a future statement, it will be ' + 'in\n' + 'effect in the interactive session started after the script is\n' + 'executed.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 236** - Back to the __future__\n' + ' The original proposal for the __future__ mechanism.\n', + 'in': '\n' + 'Membership test operations\n' + '**************************\n' + '\n' + 'The operators "in" and "not in" test for membership. "x in s"\n' + 'evaluates to true if *x* is a member of *s*, and false otherwise. "x\n' + 'not in s" returns the negation of "x in s". All built-in sequences\n' + 'and set types support this as well as dictionary, for which "in" ' + 'tests\n' + 'whether the dictionary has a given key. For container types such as\n' + 'list, tuple, set, frozenset, dict, or collections.deque, the\n' + 'expression "x in y" is equivalent to "any(x is e or x == e for e in\n' + 'y)".\n' + '\n' + 'For the string and bytes types, "x in y" is true if and only if *x* ' + 'is\n' + 'a substring of *y*. An equivalent test is "y.find(x) != -1". Empty\n' + 'strings are always considered to be a substring of any other string,\n' + 'so """ in "abc"" will return "True".\n' + '\n' + 'For user-defined classes which define the "__contains__()" method, "x\n' + 'in y" is true if and only if "y.__contains__(x)" is true.\n' + '\n' + 'For user-defined classes which do not define "__contains__()" but do\n' + 'define "__iter__()", "x in y" is true if some value "z" with "x == z"\n' + 'is produced while iterating over "y". If an exception is raised\n' + 'during the iteration, it is as if "in" raised that exception.\n' + '\n' + 'Lastly, the old-style iteration protocol is tried: if a class defines\n' + '"__getitem__()", "x in y" is true if and only if there is a non-\n' + 'negative integer index *i* such that "x == y[i]", and all lower\n' + 'integer indices do not raise "IndexError" exception. (If any other\n' + 'exception is raised, it is as if "in" raised that exception).\n' + '\n' + 'The operator "not in" is defined to have the inverse true value of\n' + '"in".\n', + 'integers': '\n' + 'Integer literals\n' + '****************\n' + '\n' + 'Integer literals are described by the following lexical ' + 'definitions:\n' + '\n' + ' integer ::= decinteger | bininteger | octinteger | ' + 'hexinteger\n' + ' decinteger ::= nonzerodigit (["_"] digit)* | "0"+ (["_"] ' + '"0")*\n' + ' bininteger ::= "0" ("b" | "B") (["_"] bindigit)+\n' + ' octinteger ::= "0" ("o" | "O") (["_"] octdigit)+\n' + ' hexinteger ::= "0" ("x" | "X") (["_"] hexdigit)+\n' + ' nonzerodigit ::= "1"..."9"\n' + ' digit ::= "0"..."9"\n' + ' bindigit ::= "0" | "1"\n' + ' octdigit ::= "0"..."7"\n' + ' hexdigit ::= digit | "a"..."f" | "A"..."F"\n' + '\n' + 'There is no limit for the length of integer literals apart from ' + 'what\n' + 'can be stored in available memory.\n' + '\n' + 'Underscores are ignored for determining the numeric value of ' + 'the\n' + 'literal. They can be used to group digits for enhanced ' + 'readability.\n' + 'One underscore can occur between digits, and after base ' + 'specifiers\n' + 'like "0x".\n' + '\n' + 'Note that leading zeros in a non-zero decimal number are not ' + 'allowed.\n' + 'This is for disambiguation with C-style octal literals, which ' + 'Python\n' + 'used before version 3.0.\n' + '\n' + 'Some examples of integer literals:\n' + '\n' + ' 7 2147483647 0o177 0b100110111\n' + ' 3 79228162514264337593543950336 0o377 0xdeadbeef\n' + ' 100_000_000_000 0b_1110_0101\n' + '\n' + 'Changed in version 3.6: Underscores are now allowed for ' + 'grouping\n' + 'purposes in literals.\n', + 'lambda': '\n' + 'Lambdas\n' + '*******\n' + '\n' + ' lambda_expr ::= "lambda" [parameter_list]: expression\n' + ' lambda_expr_nocond ::= "lambda" [parameter_list]: ' + 'expression_nocond\n' + '\n' + 'Lambda expressions (sometimes called lambda forms) are used to ' + 'create\n' + 'anonymous functions. The expression "lambda arguments: ' + 'expression"\n' + 'yields a function object. The unnamed object behaves like a ' + 'function\n' + 'object defined with:\n' + '\n' + ' def (arguments):\n' + ' return expression\n' + '\n' + 'See section Function definitions for the syntax of parameter ' + 'lists.\n' + 'Note that functions created with lambda expressions cannot ' + 'contain\n' + 'statements or annotations.\n', + 'lists': '\n' + 'List displays\n' + '*************\n' + '\n' + 'A list display is a possibly empty series of expressions enclosed ' + 'in\n' + 'square brackets:\n' + '\n' + ' list_display ::= "[" [starred_list | comprehension] "]"\n' + '\n' + 'A list display yields a new list object, the contents being ' + 'specified\n' + 'by either a list of expressions or a comprehension. When a comma-\n' + 'separated list of expressions is supplied, its elements are ' + 'evaluated\n' + 'from left to right and placed into the list object in that order.\n' + 'When a comprehension is supplied, the list is constructed from the\n' + 'elements resulting from the comprehension.\n', + 'naming': '\n' + 'Naming and binding\n' + '******************\n' + '\n' + '\n' + 'Binding of names\n' + '================\n' + '\n' + '*Names* refer to objects. Names are introduced by name binding\n' + 'operations.\n' + '\n' + 'The following constructs bind names: formal parameters to ' + 'functions,\n' + '"import" statements, class and function definitions (these bind ' + 'the\n' + 'class or function name in the defining block), and targets that ' + 'are\n' + 'identifiers if occurring in an assignment, "for" loop header, or ' + 'after\n' + '"as" in a "with" statement or "except" clause. The "import" ' + 'statement\n' + 'of the form "from ... import *" binds all names defined in the\n' + 'imported module, except those beginning with an underscore. This ' + 'form\n' + 'may only be used at the module level.\n' + '\n' + 'A target occurring in a "del" statement is also considered bound ' + 'for\n' + 'this purpose (though the actual semantics are to unbind the ' + 'name).\n' + '\n' + 'Each assignment or import statement occurs within a block defined ' + 'by a\n' + 'class or function definition or at the module level (the ' + 'top-level\n' + 'code block).\n' + '\n' + 'If a name is bound in a block, it is a local variable of that ' + 'block,\n' + 'unless declared as "nonlocal" or "global". If a name is bound at ' + 'the\n' + 'module level, it is a global variable. (The variables of the ' + 'module\n' + 'code block are local and global.) If a variable is used in a ' + 'code\n' + 'block but not defined there, it is a *free variable*.\n' + '\n' + 'Each occurrence of a name in the program text refers to the ' + '*binding*\n' + 'of that name established by the following name resolution rules.\n' + '\n' + '\n' + 'Resolution of names\n' + '===================\n' + '\n' + 'A *scope* defines the visibility of a name within a block. If a ' + 'local\n' + 'variable is defined in a block, its scope includes that block. If ' + 'the\n' + 'definition occurs in a function block, the scope extends to any ' + 'blocks\n' + 'contained within the defining one, unless a contained block ' + 'introduces\n' + 'a different binding for the name.\n' + '\n' + 'When a name is used in a code block, it is resolved using the ' + 'nearest\n' + 'enclosing scope. The set of all such scopes visible to a code ' + 'block\n' + "is called the block's *environment*.\n" + '\n' + 'When a name is not found at all, a "NameError" exception is ' + 'raised. If\n' + 'the current scope is a function scope, and the name refers to a ' + 'local\n' + 'variable that has not yet been bound to a value at the point where ' + 'the\n' + 'name is used, an "UnboundLocalError" exception is raised.\n' + '"UnboundLocalError" is a subclass of "NameError".\n' + '\n' + 'If a name binding operation occurs anywhere within a code block, ' + 'all\n' + 'uses of the name within the block are treated as references to ' + 'the\n' + 'current block. This can lead to errors when a name is used within ' + 'a\n' + 'block before it is bound. This rule is subtle. Python lacks\n' + 'declarations and allows name binding operations to occur anywhere\n' + 'within a code block. The local variables of a code block can be\n' + 'determined by scanning the entire text of the block for name ' + 'binding\n' + 'operations.\n' + '\n' + 'If the "global" statement occurs within a block, all uses of the ' + 'name\n' + 'specified in the statement refer to the binding of that name in ' + 'the\n' + 'top-level namespace. Names are resolved in the top-level ' + 'namespace by\n' + 'searching the global namespace, i.e. the namespace of the module\n' + 'containing the code block, and the builtins namespace, the ' + 'namespace\n' + 'of the module "builtins". The global namespace is searched ' + 'first. If\n' + 'the name is not found there, the builtins namespace is searched. ' + 'The\n' + '"global" statement must precede all uses of the name.\n' + '\n' + 'The "global" statement has the same scope as a name binding ' + 'operation\n' + 'in the same block. If the nearest enclosing scope for a free ' + 'variable\n' + 'contains a global statement, the free variable is treated as a ' + 'global.\n' + '\n' + 'The "nonlocal" statement causes corresponding names to refer to\n' + 'previously bound variables in the nearest enclosing function ' + 'scope.\n' + '"SyntaxError" is raised at compile time if the given name does ' + 'not\n' + 'exist in any enclosing function scope.\n' + '\n' + 'The namespace for a module is automatically created the first time ' + 'a\n' + 'module is imported. The main module for a script is always ' + 'called\n' + '"__main__".\n' + '\n' + 'Class definition blocks and arguments to "exec()" and "eval()" ' + 'are\n' + 'special in the context of name resolution. A class definition is ' + 'an\n' + 'executable statement that may use and define names. These ' + 'references\n' + 'follow the normal rules for name resolution with an exception ' + 'that\n' + 'unbound local variables are looked up in the global namespace. ' + 'The\n' + 'namespace of the class definition becomes the attribute dictionary ' + 'of\n' + 'the class. The scope of names defined in a class block is limited ' + 'to\n' + 'the class block; it does not extend to the code blocks of methods ' + '--\n' + 'this includes comprehensions and generator expressions since they ' + 'are\n' + 'implemented using a function scope. This means that the ' + 'following\n' + 'will fail:\n' + '\n' + ' class A:\n' + ' a = 42\n' + ' b = list(a + i for i in range(10))\n' + '\n' + '\n' + 'Builtins and restricted execution\n' + '=================================\n' + '\n' + 'The builtins namespace associated with the execution of a code ' + 'block\n' + 'is actually found by looking up the name "__builtins__" in its ' + 'global\n' + 'namespace; this should be a dictionary or a module (in the latter ' + 'case\n' + "the module's dictionary is used). By default, when in the " + '"__main__"\n' + 'module, "__builtins__" is the built-in module "builtins"; when in ' + 'any\n' + 'other module, "__builtins__" is an alias for the dictionary of ' + 'the\n' + '"builtins" module itself. "__builtins__" can be set to a ' + 'user-created\n' + 'dictionary to create a weak form of restricted execution.\n' + '\n' + '**CPython implementation detail:** Users should not touch\n' + '"__builtins__"; it is strictly an implementation detail. Users\n' + 'wanting to override values in the builtins namespace should ' + '"import"\n' + 'the "builtins" module and modify its attributes appropriately.\n' + '\n' + '\n' + 'Interaction with dynamic features\n' + '=================================\n' + '\n' + 'Name resolution of free variables occurs at runtime, not at ' + 'compile\n' + 'time. This means that the following code will print 42:\n' + '\n' + ' i = 10\n' + ' def f():\n' + ' print(i)\n' + ' i = 42\n' + ' f()\n' + '\n' + 'There are several cases where Python statements are illegal when ' + 'used\n' + 'in conjunction with nested scopes that contain free variables.\n' + '\n' + 'If a variable is referenced in an enclosing scope, it is illegal ' + 'to\n' + 'delete the name. An error will be reported at compile time.\n' + '\n' + 'The "eval()" and "exec()" functions do not have access to the ' + 'full\n' + 'environment for resolving names. Names may be resolved in the ' + 'local\n' + 'and global namespaces of the caller. Free variables are not ' + 'resolved\n' + 'in the nearest enclosing namespace, but in the global namespace. ' + '[1]\n' + 'The "exec()" and "eval()" functions have optional arguments to\n' + 'override the global and local namespace. If only one namespace ' + 'is\n' + 'specified, it is used for both.\n', + 'nonlocal': '\n' + 'The "nonlocal" statement\n' + '************************\n' + '\n' + ' nonlocal_stmt ::= "nonlocal" identifier ("," identifier)*\n' + '\n' + 'The "nonlocal" statement causes the listed identifiers to refer ' + 'to\n' + 'previously bound variables in the nearest enclosing scope ' + 'excluding\n' + 'globals. This is important because the default behavior for ' + 'binding is\n' + 'to search the local namespace first. The statement allows\n' + 'encapsulated code to rebind variables outside of the local ' + 'scope\n' + 'besides the global (module) scope.\n' + '\n' + 'Names listed in a "nonlocal" statement, unlike those listed in ' + 'a\n' + '"global" statement, must refer to pre-existing bindings in an\n' + 'enclosing scope (the scope in which a new binding should be ' + 'created\n' + 'cannot be determined unambiguously).\n' + '\n' + 'Names listed in a "nonlocal" statement must not collide with ' + 'pre-\n' + 'existing bindings in the local scope.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3104** - Access to Names in Outer Scopes\n' + ' The specification for the "nonlocal" statement.\n', + 'numbers': '\n' + 'Numeric literals\n' + '****************\n' + '\n' + 'There are three types of numeric literals: integers, floating ' + 'point\n' + 'numbers, and imaginary numbers. There are no complex literals\n' + '(complex numbers can be formed by adding a real number and an\n' + 'imaginary number).\n' + '\n' + 'Note that numeric literals do not include a sign; a phrase like ' + '"-1"\n' + 'is actually an expression composed of the unary operator \'"-"\' ' + 'and the\n' + 'literal "1".\n', + 'numeric-types': '\n' + 'Emulating numeric types\n' + '***********************\n' + '\n' + 'The following methods can be defined to emulate numeric ' + 'objects.\n' + 'Methods corresponding to operations that are not supported ' + 'by the\n' + 'particular kind of number implemented (e.g., bitwise ' + 'operations for\n' + 'non-integral numbers) should be left undefined.\n' + '\n' + 'object.__add__(self, other)\n' + 'object.__sub__(self, other)\n' + 'object.__mul__(self, other)\n' + 'object.__matmul__(self, other)\n' + 'object.__truediv__(self, other)\n' + 'object.__floordiv__(self, other)\n' + 'object.__mod__(self, other)\n' + 'object.__divmod__(self, other)\n' + 'object.__pow__(self, other[, modulo])\n' + 'object.__lshift__(self, other)\n' + 'object.__rshift__(self, other)\n' + 'object.__and__(self, other)\n' + 'object.__xor__(self, other)\n' + 'object.__or__(self, other)\n' + '\n' + ' These methods are called to implement the binary ' + 'arithmetic\n' + ' operations ("+", "-", "*", "@", "/", "//", "%", ' + '"divmod()",\n' + ' "pow()", "**", "<<", ">>", "&", "^", "|"). For ' + 'instance, to\n' + ' evaluate the expression "x + y", where *x* is an ' + 'instance of a\n' + ' class that has an "__add__()" method, "x.__add__(y)" is ' + 'called.\n' + ' The "__divmod__()" method should be the equivalent to ' + 'using\n' + ' "__floordiv__()" and "__mod__()"; it should not be ' + 'related to\n' + ' "__truediv__()". Note that "__pow__()" should be ' + 'defined to accept\n' + ' an optional third argument if the ternary version of the ' + 'built-in\n' + ' "pow()" function is to be supported.\n' + '\n' + ' If one of those methods does not support the operation ' + 'with the\n' + ' supplied arguments, it should return "NotImplemented".\n' + '\n' + 'object.__radd__(self, other)\n' + 'object.__rsub__(self, other)\n' + 'object.__rmul__(self, other)\n' + 'object.__rmatmul__(self, other)\n' + 'object.__rtruediv__(self, other)\n' + 'object.__rfloordiv__(self, other)\n' + 'object.__rmod__(self, other)\n' + 'object.__rdivmod__(self, other)\n' + 'object.__rpow__(self, other)\n' + 'object.__rlshift__(self, other)\n' + 'object.__rrshift__(self, other)\n' + 'object.__rand__(self, other)\n' + 'object.__rxor__(self, other)\n' + 'object.__ror__(self, other)\n' + '\n' + ' These methods are called to implement the binary ' + 'arithmetic\n' + ' operations ("+", "-", "*", "@", "/", "//", "%", ' + '"divmod()",\n' + ' "pow()", "**", "<<", ">>", "&", "^", "|") with reflected ' + '(swapped)\n' + ' operands. These functions are only called if the left ' + 'operand does\n' + ' not support the corresponding operation [3] and the ' + 'operands are of\n' + ' different types. [4] For instance, to evaluate the ' + 'expression "x -\n' + ' y", where *y* is an instance of a class that has an ' + '"__rsub__()"\n' + ' method, "y.__rsub__(x)" is called if "x.__sub__(y)" ' + 'returns\n' + ' *NotImplemented*.\n' + '\n' + ' Note that ternary "pow()" will not try calling ' + '"__rpow__()" (the\n' + ' coercion rules would become too complicated).\n' + '\n' + " Note: If the right operand's type is a subclass of the " + 'left\n' + " operand's type and that subclass provides the " + 'reflected method\n' + ' for the operation, this method will be called before ' + 'the left\n' + " operand's non-reflected method. This behavior allows " + 'subclasses\n' + " to override their ancestors' operations.\n" + '\n' + 'object.__iadd__(self, other)\n' + 'object.__isub__(self, other)\n' + 'object.__imul__(self, other)\n' + 'object.__imatmul__(self, other)\n' + 'object.__itruediv__(self, other)\n' + 'object.__ifloordiv__(self, other)\n' + 'object.__imod__(self, other)\n' + 'object.__ipow__(self, other[, modulo])\n' + 'object.__ilshift__(self, other)\n' + 'object.__irshift__(self, other)\n' + 'object.__iand__(self, other)\n' + 'object.__ixor__(self, other)\n' + 'object.__ior__(self, other)\n' + '\n' + ' These methods are called to implement the augmented ' + 'arithmetic\n' + ' assignments ("+=", "-=", "*=", "@=", "/=", "//=", "%=", ' + '"**=",\n' + ' "<<=", ">>=", "&=", "^=", "|="). These methods should ' + 'attempt to\n' + ' do the operation in-place (modifying *self*) and return ' + 'the result\n' + ' (which could be, but does not have to be, *self*). If a ' + 'specific\n' + ' method is not defined, the augmented assignment falls ' + 'back to the\n' + ' normal methods. For instance, if *x* is an instance of ' + 'a class\n' + ' with an "__iadd__()" method, "x += y" is equivalent to ' + '"x =\n' + ' x.__iadd__(y)" . Otherwise, "x.__add__(y)" and ' + '"y.__radd__(x)" are\n' + ' considered, as with the evaluation of "x + y". In ' + 'certain\n' + ' situations, augmented assignment can result in ' + 'unexpected errors\n' + " (see Why does a_tuple[i] += ['item'] raise an exception " + 'when the\n' + ' addition works?), but this behavior is in fact part of ' + 'the data\n' + ' model.\n' + '\n' + 'object.__neg__(self)\n' + 'object.__pos__(self)\n' + 'object.__abs__(self)\n' + 'object.__invert__(self)\n' + '\n' + ' Called to implement the unary arithmetic operations ' + '("-", "+",\n' + ' "abs()" and "~").\n' + '\n' + 'object.__complex__(self)\n' + 'object.__int__(self)\n' + 'object.__float__(self)\n' + 'object.__round__(self[, n])\n' + '\n' + ' Called to implement the built-in functions "complex()", ' + '"int()",\n' + ' "float()" and "round()". Should return a value of the ' + 'appropriate\n' + ' type.\n' + '\n' + 'object.__index__(self)\n' + '\n' + ' Called to implement "operator.index()", and whenever ' + 'Python needs\n' + ' to losslessly convert the numeric object to an integer ' + 'object (such\n' + ' as in slicing, or in the built-in "bin()", "hex()" and ' + '"oct()"\n' + ' functions). Presence of this method indicates that the ' + 'numeric\n' + ' object is an integer type. Must return an integer.\n' + '\n' + ' Note: In order to have a coherent integer type class, ' + 'when\n' + ' "__index__()" is defined "__int__()" should also be ' + 'defined, and\n' + ' both should return the same value.\n', + 'objects': '\n' + 'Objects, values and types\n' + '*************************\n' + '\n' + "*Objects* are Python's abstraction for data. All data in a " + 'Python\n' + 'program is represented by objects or by relations between ' + 'objects. (In\n' + 'a sense, and in conformance to Von Neumann\'s model of a "stored\n' + 'program computer," code is also represented by objects.)\n' + '\n' + "Every object has an identity, a type and a value. An object's\n" + '*identity* never changes once it has been created; you may think ' + 'of it\n' + 'as the object\'s address in memory. The \'"is"\' operator ' + 'compares the\n' + 'identity of two objects; the "id()" function returns an integer\n' + 'representing its identity.\n' + '\n' + '**CPython implementation detail:** For CPython, "id(x)" is the ' + 'memory\n' + 'address where "x" is stored.\n' + '\n' + "An object's type determines the operations that the object " + 'supports\n' + '(e.g., "does it have a length?") and also defines the possible ' + 'values\n' + 'for objects of that type. The "type()" function returns an ' + "object's\n" + 'type (which is an object itself). Like its identity, an ' + "object's\n" + '*type* is also unchangeable. [1]\n' + '\n' + 'The *value* of some objects can change. Objects whose value can\n' + 'change are said to be *mutable*; objects whose value is ' + 'unchangeable\n' + 'once they are created are called *immutable*. (The value of an\n' + 'immutable container object that contains a reference to a ' + 'mutable\n' + "object can change when the latter's value is changed; however " + 'the\n' + 'container is still considered immutable, because the collection ' + 'of\n' + 'objects it contains cannot be changed. So, immutability is not\n' + 'strictly the same as having an unchangeable value, it is more ' + 'subtle.)\n' + "An object's mutability is determined by its type; for instance,\n" + 'numbers, strings and tuples are immutable, while dictionaries ' + 'and\n' + 'lists are mutable.\n' + '\n' + 'Objects are never explicitly destroyed; however, when they ' + 'become\n' + 'unreachable they may be garbage-collected. An implementation is\n' + 'allowed to postpone garbage collection or omit it altogether --- ' + 'it is\n' + 'a matter of implementation quality how garbage collection is\n' + 'implemented, as long as no objects are collected that are still\n' + 'reachable.\n' + '\n' + '**CPython implementation detail:** CPython currently uses a ' + 'reference-\n' + 'counting scheme with (optional) delayed detection of cyclically ' + 'linked\n' + 'garbage, which collects most objects as soon as they become\n' + 'unreachable, but is not guaranteed to collect garbage containing\n' + 'circular references. See the documentation of the "gc" module ' + 'for\n' + 'information on controlling the collection of cyclic garbage. ' + 'Other\n' + 'implementations act differently and CPython may change. Do not ' + 'depend\n' + 'on immediate finalization of objects when they become unreachable ' + '(so\n' + 'you should always close files explicitly).\n' + '\n' + "Note that the use of the implementation's tracing or debugging\n" + 'facilities may keep objects alive that would normally be ' + 'collectable.\n' + 'Also note that catching an exception with a \'"try"..."except"\'\n' + 'statement may keep objects alive.\n' + '\n' + 'Some objects contain references to "external" resources such as ' + 'open\n' + 'files or windows. It is understood that these resources are ' + 'freed\n' + 'when the object is garbage-collected, but since garbage ' + 'collection is\n' + 'not guaranteed to happen, such objects also provide an explicit ' + 'way to\n' + 'release the external resource, usually a "close()" method. ' + 'Programs\n' + 'are strongly recommended to explicitly close such objects. The\n' + '\'"try"..."finally"\' statement and the \'"with"\' statement ' + 'provide\n' + 'convenient ways to do this.\n' + '\n' + 'Some objects contain references to other objects; these are ' + 'called\n' + '*containers*. Examples of containers are tuples, lists and\n' + "dictionaries. The references are part of a container's value. " + 'In\n' + 'most cases, when we talk about the value of a container, we imply ' + 'the\n' + 'values, not the identities of the contained objects; however, ' + 'when we\n' + 'talk about the mutability of a container, only the identities of ' + 'the\n' + 'immediately contained objects are implied. So, if an immutable\n' + 'container (like a tuple) contains a reference to a mutable ' + 'object, its\n' + 'value changes if that mutable object is changed.\n' + '\n' + 'Types affect almost all aspects of object behavior. Even the\n' + 'importance of object identity is affected in some sense: for ' + 'immutable\n' + 'types, operations that compute new values may actually return a\n' + 'reference to any existing object with the same type and value, ' + 'while\n' + 'for mutable objects this is not allowed. E.g., after "a = 1; b = ' + '1",\n' + '"a" and "b" may or may not refer to the same object with the ' + 'value\n' + 'one, depending on the implementation, but after "c = []; d = []", ' + '"c"\n' + 'and "d" are guaranteed to refer to two different, unique, newly\n' + 'created empty lists. (Note that "c = d = []" assigns the same ' + 'object\n' + 'to both "c" and "d".)\n', + 'operator-summary': '\n' + 'Operator precedence\n' + '*******************\n' + '\n' + 'The following table summarizes the operator precedence ' + 'in Python, from\n' + 'lowest precedence (least binding) to highest precedence ' + '(most\n' + 'binding). Operators in the same box have the same ' + 'precedence. Unless\n' + 'the syntax is explicitly given, operators are binary. ' + 'Operators in\n' + 'the same box group left to right (except for ' + 'exponentiation, which\n' + 'groups from right to left).\n' + '\n' + 'Note that comparisons, membership tests, and identity ' + 'tests, all have\n' + 'the same precedence and have a left-to-right chaining ' + 'feature as\n' + 'described in the Comparisons section.\n' + '\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| Operator | ' + 'Description |\n' + '+=================================================+=======================================+\n' + '| "lambda" | ' + 'Lambda expression |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "if" -- "else" | ' + 'Conditional expression |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "or" | ' + 'Boolean OR |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "and" | ' + 'Boolean AND |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "not" "x" | ' + 'Boolean NOT |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "in", "not in", "is", "is not", "<", "<=", ">", | ' + 'Comparisons, including membership |\n' + '| ">=", "!=", "==" | ' + 'tests and identity tests |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "|" | ' + 'Bitwise OR |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "^" | ' + 'Bitwise XOR |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "&" | ' + 'Bitwise AND |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "<<", ">>" | ' + 'Shifts |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "+", "-" | ' + 'Addition and subtraction |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "*", "@", "/", "//", "%" | ' + 'Multiplication, matrix multiplication |\n' + '| | ' + 'division, remainder [5] |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "+x", "-x", "~x" | ' + 'Positive, negative, bitwise NOT |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "**" | ' + 'Exponentiation [6] |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "await" "x" | ' + 'Await expression |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "x[index]", "x[index:index]", | ' + 'Subscription, slicing, call, |\n' + '| "x(arguments...)", "x.attribute" | ' + 'attribute reference |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '| "(expressions...)", "[expressions...]", "{key: | ' + 'Binding or tuple display, list |\n' + '| value...}", "{expressions...}" | ' + 'display, dictionary display, set |\n' + '| | ' + 'display |\n' + '+-------------------------------------------------+---------------------------------------+\n' + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] While "abs(x%y) < abs(y)" is true mathematically, ' + 'for floats\n' + ' it may not be true numerically due to roundoff. For ' + 'example, and\n' + ' assuming a platform on which a Python float is an ' + 'IEEE 754 double-\n' + ' precision number, in order that "-1e-100 % 1e100" ' + 'have the same\n' + ' sign as "1e100", the computed result is "-1e-100 + ' + '1e100", which\n' + ' is numerically exactly equal to "1e100". The ' + 'function\n' + ' "math.fmod()" returns a result whose sign matches ' + 'the sign of the\n' + ' first argument instead, and so returns "-1e-100" in ' + 'this case.\n' + ' Which approach is more appropriate depends on the ' + 'application.\n' + '\n' + '[2] If x is very close to an exact integer multiple of ' + "y, it's\n" + ' possible for "x//y" to be one larger than ' + '"(x-x%y)//y" due to\n' + ' rounding. In such cases, Python returns the latter ' + 'result, in\n' + ' order to preserve that "divmod(x,y)[0] * y + x % y" ' + 'be very close\n' + ' to "x".\n' + '\n' + '[3] The Unicode standard distinguishes between *code ' + 'points* (e.g.\n' + ' U+0041) and *abstract characters* (e.g. "LATIN ' + 'CAPITAL LETTER A").\n' + ' While most abstract characters in Unicode are only ' + 'represented\n' + ' using one code point, there is a number of abstract ' + 'characters\n' + ' that can in addition be represented using a sequence ' + 'of more than\n' + ' one code point. For example, the abstract character ' + '"LATIN\n' + ' CAPITAL LETTER C WITH CEDILLA" can be represented as ' + 'a single\n' + ' *precomposed character* at code position U+00C7, or ' + 'as a sequence\n' + ' of a *base character* at code position U+0043 (LATIN ' + 'CAPITAL\n' + ' LETTER C), followed by a *combining character* at ' + 'code position\n' + ' U+0327 (COMBINING CEDILLA).\n' + '\n' + ' The comparison operators on strings compare at the ' + 'level of\n' + ' Unicode code points. This may be counter-intuitive ' + 'to humans. For\n' + ' example, ""\\u00C7" == "\\u0043\\u0327"" is "False", ' + 'even though both\n' + ' strings represent the same abstract character "LATIN ' + 'CAPITAL\n' + ' LETTER C WITH CEDILLA".\n' + '\n' + ' To compare strings at the level of abstract ' + 'characters (that is,\n' + ' in a way intuitive to humans), use ' + '"unicodedata.normalize()".\n' + '\n' + '[4] Due to automatic garbage-collection, free lists, and ' + 'the\n' + ' dynamic nature of descriptors, you may notice ' + 'seemingly unusual\n' + ' behaviour in certain uses of the "is" operator, like ' + 'those\n' + ' involving comparisons between instance methods, or ' + 'constants.\n' + ' Check their documentation for more info.\n' + '\n' + '[5] The "%" operator is also used for string formatting; ' + 'the same\n' + ' precedence applies.\n' + '\n' + '[6] The power operator "**" binds less tightly than an ' + 'arithmetic\n' + ' or bitwise unary operator on its right, that is, ' + '"2**-1" is "0.5".\n', + 'pass': '\n' + 'The "pass" statement\n' + '********************\n' + '\n' + ' pass_stmt ::= "pass"\n' + '\n' + '"pass" is a null operation --- when it is executed, nothing ' + 'happens.\n' + 'It is useful as a placeholder when a statement is required\n' + 'syntactically, but no code needs to be executed, for example:\n' + '\n' + ' def f(arg): pass # a function that does nothing (yet)\n' + '\n' + ' class C: pass # a class with no methods (yet)\n', + 'power': '\n' + 'The power operator\n' + '******************\n' + '\n' + 'The power operator binds more tightly than unary operators on its\n' + 'left; it binds less tightly than unary operators on its right. ' + 'The\n' + 'syntax is:\n' + '\n' + ' power ::= ( await_expr | primary ) ["**" u_expr]\n' + '\n' + 'Thus, in an unparenthesized sequence of power and unary operators, ' + 'the\n' + 'operators are evaluated from right to left (this does not ' + 'constrain\n' + 'the evaluation order for the operands): "-1**2" results in "-1".\n' + '\n' + 'The power operator has the same semantics as the built-in "pow()"\n' + 'function, when called with two arguments: it yields its left ' + 'argument\n' + 'raised to the power of its right argument. The numeric arguments ' + 'are\n' + 'first converted to a common type, and the result is of that type.\n' + '\n' + 'For int operands, the result has the same type as the operands ' + 'unless\n' + 'the second argument is negative; in that case, all arguments are\n' + 'converted to float and a float result is delivered. For example,\n' + '"10**2" returns "100", but "10**-2" returns "0.01".\n' + '\n' + 'Raising "0.0" to a negative power results in a ' + '"ZeroDivisionError".\n' + 'Raising a negative number to a fractional power results in a ' + '"complex"\n' + 'number. (In earlier versions it raised a "ValueError".)\n', + 'raise': '\n' + 'The "raise" statement\n' + '*********************\n' + '\n' + ' raise_stmt ::= "raise" [expression ["from" expression]]\n' + '\n' + 'If no expressions are present, "raise" re-raises the last ' + 'exception\n' + 'that was active in the current scope. If no exception is active ' + 'in\n' + 'the current scope, a "RuntimeError" exception is raised indicating\n' + 'that this is an error.\n' + '\n' + 'Otherwise, "raise" evaluates the first expression as the exception\n' + 'object. It must be either a subclass or an instance of\n' + '"BaseException". If it is a class, the exception instance will be\n' + 'obtained when needed by instantiating the class with no arguments.\n' + '\n' + "The *type* of the exception is the exception instance's class, the\n" + '*value* is the instance itself.\n' + '\n' + 'A traceback object is normally created automatically when an ' + 'exception\n' + 'is raised and attached to it as the "__traceback__" attribute, ' + 'which\n' + 'is writable. You can create an exception and set your own traceback ' + 'in\n' + 'one step using the "with_traceback()" exception method (which ' + 'returns\n' + 'the same exception instance, with its traceback set to its ' + 'argument),\n' + 'like so:\n' + '\n' + ' raise Exception("foo occurred").with_traceback(tracebackobj)\n' + '\n' + 'The "from" clause is used for exception chaining: if given, the ' + 'second\n' + '*expression* must be another exception class or instance, which ' + 'will\n' + 'then be attached to the raised exception as the "__cause__" ' + 'attribute\n' + '(which is writable). If the raised exception is not handled, both\n' + 'exceptions will be printed:\n' + '\n' + ' >>> try:\n' + ' ... print(1 / 0)\n' + ' ... except Exception as exc:\n' + ' ... raise RuntimeError("Something bad happened") from exc\n' + ' ...\n' + ' Traceback (most recent call last):\n' + ' File "", line 2, in \n' + ' ZeroDivisionError: int division or modulo by zero\n' + '\n' + ' The above exception was the direct cause of the following ' + 'exception:\n' + '\n' + ' Traceback (most recent call last):\n' + ' File "", line 4, in \n' + ' RuntimeError: Something bad happened\n' + '\n' + 'A similar mechanism works implicitly if an exception is raised ' + 'inside\n' + 'an exception handler or a "finally" clause: the previous exception ' + 'is\n' + 'then attached as the new exception\'s "__context__" attribute:\n' + '\n' + ' >>> try:\n' + ' ... print(1 / 0)\n' + ' ... except:\n' + ' ... raise RuntimeError("Something bad happened")\n' + ' ...\n' + ' Traceback (most recent call last):\n' + ' File "", line 2, in \n' + ' ZeroDivisionError: int division or modulo by zero\n' + '\n' + ' During handling of the above exception, another exception ' + 'occurred:\n' + '\n' + ' Traceback (most recent call last):\n' + ' File "", line 4, in \n' + ' RuntimeError: Something bad happened\n' + '\n' + 'Additional information on exceptions can be found in section\n' + 'Exceptions, and information about handling exceptions is in ' + 'section\n' + 'The try statement.\n', + 'return': '\n' + 'The "return" statement\n' + '**********************\n' + '\n' + ' return_stmt ::= "return" [expression_list]\n' + '\n' + '"return" may only occur syntactically nested in a function ' + 'definition,\n' + 'not within a nested class definition.\n' + '\n' + 'If an expression list is present, it is evaluated, else "None" is\n' + 'substituted.\n' + '\n' + '"return" leaves the current function call with the expression list ' + '(or\n' + '"None") as return value.\n' + '\n' + 'When "return" passes control out of a "try" statement with a ' + '"finally"\n' + 'clause, that "finally" clause is executed before really leaving ' + 'the\n' + 'function.\n' + '\n' + 'In a generator function, the "return" statement indicates that ' + 'the\n' + 'generator is done and will cause "StopIteration" to be raised. ' + 'The\n' + 'returned value (if any) is used as an argument to construct\n' + '"StopIteration" and becomes the "StopIteration.value" attribute.\n' + '\n' + 'In an asynchronous generator function, an empty "return" ' + 'statement\n' + 'indicates that the asynchronous generator is done and will cause\n' + '"StopAsyncIteration" to be raised. A non-empty "return" statement ' + 'is\n' + 'a syntax error in an asynchronous generator function.\n', + 'sequence-types': '\n' + 'Emulating container types\n' + '*************************\n' + '\n' + 'The following methods can be defined to implement ' + 'container objects.\n' + 'Containers usually are sequences (such as lists or tuples) ' + 'or mappings\n' + '(like dictionaries), but can represent other containers as ' + 'well. The\n' + 'first set of methods is used either to emulate a sequence ' + 'or to\n' + 'emulate a mapping; the difference is that for a sequence, ' + 'the\n' + 'allowable keys should be the integers *k* for which "0 <= ' + 'k < N" where\n' + '*N* is the length of the sequence, or slice objects, which ' + 'define a\n' + 'range of items. It is also recommended that mappings ' + 'provide the\n' + 'methods "keys()", "values()", "items()", "get()", ' + '"clear()",\n' + '"setdefault()", "pop()", "popitem()", "copy()", and ' + '"update()"\n' + "behaving similar to those for Python's standard dictionary " + 'objects.\n' + 'The "collections" module provides a "MutableMapping" ' + 'abstract base\n' + 'class to help create those methods from a base set of ' + '"__getitem__()",\n' + '"__setitem__()", "__delitem__()", and "keys()". Mutable ' + 'sequences\n' + 'should provide methods "append()", "count()", "index()", ' + '"extend()",\n' + '"insert()", "pop()", "remove()", "reverse()" and "sort()", ' + 'like Python\n' + 'standard list objects. Finally, sequence types should ' + 'implement\n' + 'addition (meaning concatenation) and multiplication ' + '(meaning\n' + 'repetition) by defining the methods "__add__()", ' + '"__radd__()",\n' + '"__iadd__()", "__mul__()", "__rmul__()" and "__imul__()" ' + 'described\n' + 'below; they should not define other numerical operators. ' + 'It is\n' + 'recommended that both mappings and sequences implement ' + 'the\n' + '"__contains__()" method to allow efficient use of the "in" ' + 'operator;\n' + 'for mappings, "in" should search the mapping\'s keys; for ' + 'sequences, it\n' + 'should search through the values. It is further ' + 'recommended that both\n' + 'mappings and sequences implement the "__iter__()" method ' + 'to allow\n' + 'efficient iteration through the container; for mappings, ' + '"__iter__()"\n' + 'should be the same as "keys()"; for sequences, it should ' + 'iterate\n' + 'through the values.\n' + '\n' + 'object.__len__(self)\n' + '\n' + ' Called to implement the built-in function "len()". ' + 'Should return\n' + ' the length of the object, an integer ">=" 0. Also, an ' + 'object that\n' + ' doesn\'t define a "__bool__()" method and whose ' + '"__len__()" method\n' + ' returns zero is considered to be false in a Boolean ' + 'context.\n' + '\n' + 'object.__length_hint__(self)\n' + '\n' + ' Called to implement "operator.length_hint()". Should ' + 'return an\n' + ' estimated length for the object (which may be greater ' + 'or less than\n' + ' the actual length). The length must be an integer ">=" ' + '0. This\n' + ' method is purely an optimization and is never required ' + 'for\n' + ' correctness.\n' + '\n' + ' New in version 3.4.\n' + '\n' + 'Note: Slicing is done exclusively with the following three ' + 'methods.\n' + ' A call like\n' + '\n' + ' a[1:2] = b\n' + '\n' + ' is translated to\n' + '\n' + ' a[slice(1, 2, None)] = b\n' + '\n' + ' and so forth. Missing slice items are always filled in ' + 'with "None".\n' + '\n' + 'object.__getitem__(self, key)\n' + '\n' + ' Called to implement evaluation of "self[key]". For ' + 'sequence types,\n' + ' the accepted keys should be integers and slice ' + 'objects. Note that\n' + ' the special interpretation of negative indexes (if the ' + 'class wishes\n' + ' to emulate a sequence type) is up to the ' + '"__getitem__()" method. If\n' + ' *key* is of an inappropriate type, "TypeError" may be ' + 'raised; if of\n' + ' a value outside the set of indexes for the sequence ' + '(after any\n' + ' special interpretation of negative values), ' + '"IndexError" should be\n' + ' raised. For mapping types, if *key* is missing (not in ' + 'the\n' + ' container), "KeyError" should be raised.\n' + '\n' + ' Note: "for" loops expect that an "IndexError" will be ' + 'raised for\n' + ' illegal indexes to allow proper detection of the end ' + 'of the\n' + ' sequence.\n' + '\n' + 'object.__missing__(self, key)\n' + '\n' + ' Called by "dict"."__getitem__()" to implement ' + '"self[key]" for dict\n' + ' subclasses when key is not in the dictionary.\n' + '\n' + 'object.__setitem__(self, key, value)\n' + '\n' + ' Called to implement assignment to "self[key]". Same ' + 'note as for\n' + ' "__getitem__()". This should only be implemented for ' + 'mappings if\n' + ' the objects support changes to the values for keys, or ' + 'if new keys\n' + ' can be added, or for sequences if elements can be ' + 'replaced. The\n' + ' same exceptions should be raised for improper *key* ' + 'values as for\n' + ' the "__getitem__()" method.\n' + '\n' + 'object.__delitem__(self, key)\n' + '\n' + ' Called to implement deletion of "self[key]". Same note ' + 'as for\n' + ' "__getitem__()". This should only be implemented for ' + 'mappings if\n' + ' the objects support removal of keys, or for sequences ' + 'if elements\n' + ' can be removed from the sequence. The same exceptions ' + 'should be\n' + ' raised for improper *key* values as for the ' + '"__getitem__()" method.\n' + '\n' + 'object.__iter__(self)\n' + '\n' + ' This method is called when an iterator is required for ' + 'a container.\n' + ' This method should return a new iterator object that ' + 'can iterate\n' + ' over all the objects in the container. For mappings, ' + 'it should\n' + ' iterate over the keys of the container.\n' + '\n' + ' Iterator objects also need to implement this method; ' + 'they are\n' + ' required to return themselves. For more information on ' + 'iterator\n' + ' objects, see Iterator Types.\n' + '\n' + 'object.__reversed__(self)\n' + '\n' + ' Called (if present) by the "reversed()" built-in to ' + 'implement\n' + ' reverse iteration. It should return a new iterator ' + 'object that\n' + ' iterates over all the objects in the container in ' + 'reverse order.\n' + '\n' + ' If the "__reversed__()" method is not provided, the ' + '"reversed()"\n' + ' built-in will fall back to using the sequence protocol ' + '("__len__()"\n' + ' and "__getitem__()"). Objects that support the ' + 'sequence protocol\n' + ' should only provide "__reversed__()" if they can ' + 'provide an\n' + ' implementation that is more efficient than the one ' + 'provided by\n' + ' "reversed()".\n' + '\n' + 'The membership test operators ("in" and "not in") are ' + 'normally\n' + 'implemented as an iteration through a sequence. However, ' + 'container\n' + 'objects can supply the following special method with a ' + 'more efficient\n' + 'implementation, which also does not require the object be ' + 'a sequence.\n' + '\n' + 'object.__contains__(self, item)\n' + '\n' + ' Called to implement membership test operators. Should ' + 'return true\n' + ' if *item* is in *self*, false otherwise. For mapping ' + 'objects, this\n' + ' should consider the keys of the mapping rather than the ' + 'values or\n' + ' the key-item pairs.\n' + '\n' + ' For objects that don\'t define "__contains__()", the ' + 'membership test\n' + ' first tries iteration via "__iter__()", then the old ' + 'sequence\n' + ' iteration protocol via "__getitem__()", see this ' + 'section in the\n' + ' language reference.\n', + 'shifting': '\n' + 'Shifting operations\n' + '*******************\n' + '\n' + 'The shifting operations have lower priority than the arithmetic\n' + 'operations:\n' + '\n' + ' shift_expr ::= a_expr | shift_expr ( "<<" | ">>" ) a_expr\n' + '\n' + 'These operators accept integers as arguments. They shift the ' + 'first\n' + 'argument to the left or right by the number of bits given by ' + 'the\n' + 'second argument.\n' + '\n' + 'A right shift by *n* bits is defined as floor division by ' + '"pow(2,n)".\n' + 'A left shift by *n* bits is defined as multiplication with ' + '"pow(2,n)".\n' + '\n' + 'Note: In the current implementation, the right-hand operand is\n' + ' required to be at most "sys.maxsize". If the right-hand ' + 'operand is\n' + ' larger than "sys.maxsize" an "OverflowError" exception is ' + 'raised.\n', + 'slicings': '\n' + 'Slicings\n' + '********\n' + '\n' + 'A slicing selects a range of items in a sequence object (e.g., ' + 'a\n' + 'string, tuple or list). Slicings may be used as expressions or ' + 'as\n' + 'targets in assignment or "del" statements. The syntax for a ' + 'slicing:\n' + '\n' + ' slicing ::= primary "[" slice_list "]"\n' + ' slice_list ::= slice_item ("," slice_item)* [","]\n' + ' slice_item ::= expression | proper_slice\n' + ' proper_slice ::= [lower_bound] ":" [upper_bound] [ ":" ' + '[stride] ]\n' + ' lower_bound ::= expression\n' + ' upper_bound ::= expression\n' + ' stride ::= expression\n' + '\n' + 'There is ambiguity in the formal syntax here: anything that ' + 'looks like\n' + 'an expression list also looks like a slice list, so any ' + 'subscription\n' + 'can be interpreted as a slicing. Rather than further ' + 'complicating the\n' + 'syntax, this is disambiguated by defining that in this case the\n' + 'interpretation as a subscription takes priority over the\n' + 'interpretation as a slicing (this is the case if the slice list\n' + 'contains no proper slice).\n' + '\n' + 'The semantics for a slicing are as follows. The primary is ' + 'indexed\n' + '(using the same "__getitem__()" method as normal subscription) ' + 'with a\n' + 'key that is constructed from the slice list, as follows. If the ' + 'slice\n' + 'list contains at least one comma, the key is a tuple containing ' + 'the\n' + 'conversion of the slice items; otherwise, the conversion of the ' + 'lone\n' + 'slice item is the key. The conversion of a slice item that is ' + 'an\n' + 'expression is that expression. The conversion of a proper slice ' + 'is a\n' + 'slice object (see section The standard type hierarchy) whose ' + '"start",\n' + '"stop" and "step" attributes are the values of the expressions ' + 'given\n' + 'as lower bound, upper bound and stride, respectively, ' + 'substituting\n' + '"None" for missing expressions.\n', + 'specialattrs': '\n' + 'Special Attributes\n' + '******************\n' + '\n' + 'The implementation adds a few special read-only attributes ' + 'to several\n' + 'object types, where they are relevant. Some of these are ' + 'not reported\n' + 'by the "dir()" built-in function.\n' + '\n' + 'object.__dict__\n' + '\n' + ' A dictionary or other mapping object used to store an ' + "object's\n" + ' (writable) attributes.\n' + '\n' + 'instance.__class__\n' + '\n' + ' The class to which a class instance belongs.\n' + '\n' + 'class.__bases__\n' + '\n' + ' The tuple of base classes of a class object.\n' + '\n' + 'definition.__name__\n' + '\n' + ' The name of the class, function, method, descriptor, or ' + 'generator\n' + ' instance.\n' + '\n' + 'definition.__qualname__\n' + '\n' + ' The *qualified name* of the class, function, method, ' + 'descriptor, or\n' + ' generator instance.\n' + '\n' + ' New in version 3.3.\n' + '\n' + 'class.__mro__\n' + '\n' + ' This attribute is a tuple of classes that are considered ' + 'when\n' + ' looking for base classes during method resolution.\n' + '\n' + 'class.mro()\n' + '\n' + ' This method can be overridden by a metaclass to customize ' + 'the\n' + ' method resolution order for its instances. It is called ' + 'at class\n' + ' instantiation, and its result is stored in "__mro__".\n' + '\n' + 'class.__subclasses__()\n' + '\n' + ' Each class keeps a list of weak references to its ' + 'immediate\n' + ' subclasses. This method returns a list of all those ' + 'references\n' + ' still alive. Example:\n' + '\n' + ' >>> int.__subclasses__()\n' + " []\n" + '\n' + '-[ Footnotes ]-\n' + '\n' + '[1] Additional information on these special methods may be ' + 'found\n' + ' in the Python Reference Manual (Basic customization).\n' + '\n' + '[2] As a consequence, the list "[1, 2]" is considered equal ' + 'to\n' + ' "[1.0, 2.0]", and similarly for tuples.\n' + '\n' + "[3] They must have since the parser can't tell the type of " + 'the\n' + ' operands.\n' + '\n' + '[4] Cased characters are those with general category ' + 'property\n' + ' being one of "Lu" (Letter, uppercase), "Ll" (Letter, ' + 'lowercase),\n' + ' or "Lt" (Letter, titlecase).\n' + '\n' + '[5] To format only a tuple you should therefore provide a\n' + ' singleton tuple whose only element is the tuple to be ' + 'formatted.\n', + 'specialnames': '\n' + 'Special method names\n' + '********************\n' + '\n' + 'A class can implement certain operations that are invoked by ' + 'special\n' + 'syntax (such as arithmetic operations or subscripting and ' + 'slicing) by\n' + "defining methods with special names. This is Python's " + 'approach to\n' + '*operator overloading*, allowing classes to define their own ' + 'behavior\n' + 'with respect to language operators. For instance, if a ' + 'class defines\n' + 'a method named "__getitem__()", and "x" is an instance of ' + 'this class,\n' + 'then "x[i]" is roughly equivalent to "type(x).__getitem__(x, ' + 'i)".\n' + 'Except where mentioned, attempts to execute an operation ' + 'raise an\n' + 'exception when no appropriate method is defined (typically\n' + '"AttributeError" or "TypeError").\n' + '\n' + 'Setting a special method to "None" indicates that the ' + 'corresponding\n' + 'operation is not available. For example, if a class sets ' + '"__iter__()"\n' + 'to "None", the class is not iterable, so calling "iter()" on ' + 'its\n' + 'instances will raise a "TypeError" (without falling back to\n' + '"__getitem__()"). [2]\n' + '\n' + 'When implementing a class that emulates any built-in type, ' + 'it is\n' + 'important that the emulation only be implemented to the ' + 'degree that it\n' + 'makes sense for the object being modelled. For example, ' + 'some\n' + 'sequences may work well with retrieval of individual ' + 'elements, but\n' + 'extracting a slice may not make sense. (One example of this ' + 'is the\n' + '"NodeList" interface in the W3C\'s Document Object Model.)\n' + '\n' + '\n' + 'Basic customization\n' + '===================\n' + '\n' + 'object.__new__(cls[, ...])\n' + '\n' + ' Called to create a new instance of class *cls*. ' + '"__new__()" is a\n' + ' static method (special-cased so you need not declare it ' + 'as such)\n' + ' that takes the class of which an instance was requested ' + 'as its\n' + ' first argument. The remaining arguments are those passed ' + 'to the\n' + ' object constructor expression (the call to the class). ' + 'The return\n' + ' value of "__new__()" should be the new object instance ' + '(usually an\n' + ' instance of *cls*).\n' + '\n' + ' Typical implementations create a new instance of the ' + 'class by\n' + ' invoking the superclass\'s "__new__()" method using\n' + ' "super(currentclass, cls).__new__(cls[, ...])" with ' + 'appropriate\n' + ' arguments and then modifying the newly-created instance ' + 'as\n' + ' necessary before returning it.\n' + '\n' + ' If "__new__()" returns an instance of *cls*, then the ' + 'new\n' + ' instance\'s "__init__()" method will be invoked like\n' + ' "__init__(self[, ...])", where *self* is the new instance ' + 'and the\n' + ' remaining arguments are the same as were passed to ' + '"__new__()".\n' + '\n' + ' If "__new__()" does not return an instance of *cls*, then ' + 'the new\n' + ' instance\'s "__init__()" method will not be invoked.\n' + '\n' + ' "__new__()" is intended mainly to allow subclasses of ' + 'immutable\n' + ' types (like int, str, or tuple) to customize instance ' + 'creation. It\n' + ' is also commonly overridden in custom metaclasses in ' + 'order to\n' + ' customize class creation.\n' + '\n' + 'object.__init__(self[, ...])\n' + '\n' + ' Called after the instance has been created (by ' + '"__new__()"), but\n' + ' before it is returned to the caller. The arguments are ' + 'those\n' + ' passed to the class constructor expression. If a base ' + 'class has an\n' + ' "__init__()" method, the derived class\'s "__init__()" ' + 'method, if\n' + ' any, must explicitly call it to ensure proper ' + 'initialization of the\n' + ' base class part of the instance; for example:\n' + ' "BaseClass.__init__(self, [args...])".\n' + '\n' + ' Because "__new__()" and "__init__()" work together in ' + 'constructing\n' + ' objects ("__new__()" to create it, and "__init__()" to ' + 'customize\n' + ' it), no non-"None" value may be returned by "__init__()"; ' + 'doing so\n' + ' will cause a "TypeError" to be raised at runtime.\n' + '\n' + 'object.__del__(self)\n' + '\n' + ' Called when the instance is about to be destroyed. This ' + 'is also\n' + ' called a destructor. If a base class has a "__del__()" ' + 'method, the\n' + ' derived class\'s "__del__()" method, if any, must ' + 'explicitly call it\n' + ' to ensure proper deletion of the base class part of the ' + 'instance.\n' + ' Note that it is possible (though not recommended!) for ' + 'the\n' + ' "__del__()" method to postpone destruction of the ' + 'instance by\n' + ' creating a new reference to it. It may then be called at ' + 'a later\n' + ' time when this new reference is deleted. It is not ' + 'guaranteed that\n' + ' "__del__()" methods are called for objects that still ' + 'exist when\n' + ' the interpreter exits.\n' + '\n' + ' Note: "del x" doesn\'t directly call "x.__del__()" --- ' + 'the former\n' + ' decrements the reference count for "x" by one, and the ' + 'latter is\n' + ' only called when "x"\'s reference count reaches zero. ' + 'Some common\n' + ' situations that may prevent the reference count of an ' + 'object from\n' + ' going to zero include: circular references between ' + 'objects (e.g.,\n' + ' a doubly-linked list or a tree data structure with ' + 'parent and\n' + ' child pointers); a reference to the object on the stack ' + 'frame of\n' + ' a function that caught an exception (the traceback ' + 'stored in\n' + ' "sys.exc_info()[2]" keeps the stack frame alive); or a ' + 'reference\n' + ' to the object on the stack frame that raised an ' + 'unhandled\n' + ' exception in interactive mode (the traceback stored in\n' + ' "sys.last_traceback" keeps the stack frame alive). The ' + 'first\n' + ' situation can only be remedied by explicitly breaking ' + 'the cycles;\n' + ' the second can be resolved by freeing the reference to ' + 'the\n' + ' traceback object when it is no longer useful, and the ' + 'third can\n' + ' be resolved by storing "None" in "sys.last_traceback". ' + 'Circular\n' + ' references which are garbage are detected and cleaned ' + 'up when the\n' + " cyclic garbage collector is enabled (it's on by " + 'default). Refer\n' + ' to the documentation for the "gc" module for more ' + 'information\n' + ' about this topic.\n' + '\n' + ' Warning: Due to the precarious circumstances under which\n' + ' "__del__()" methods are invoked, exceptions that occur ' + 'during\n' + ' their execution are ignored, and a warning is printed ' + 'to\n' + ' "sys.stderr" instead. Also, when "__del__()" is invoked ' + 'in\n' + ' response to a module being deleted (e.g., when ' + 'execution of the\n' + ' program is done), other globals referenced by the ' + '"__del__()"\n' + ' method may already have been deleted or in the process ' + 'of being\n' + ' torn down (e.g. the import machinery shutting down). ' + 'For this\n' + ' reason, "__del__()" methods should do the absolute ' + 'minimum needed\n' + ' to maintain external invariants. Starting with version ' + '1.5,\n' + ' Python guarantees that globals whose name begins with a ' + 'single\n' + ' underscore are deleted from their module before other ' + 'globals are\n' + ' deleted; if no other references to such globals exist, ' + 'this may\n' + ' help in assuring that imported modules are still ' + 'available at the\n' + ' time when the "__del__()" method is called.\n' + '\n' + 'object.__repr__(self)\n' + '\n' + ' Called by the "repr()" built-in function to compute the ' + '"official"\n' + ' string representation of an object. If at all possible, ' + 'this\n' + ' should look like a valid Python expression that could be ' + 'used to\n' + ' recreate an object with the same value (given an ' + 'appropriate\n' + ' environment). If this is not possible, a string of the ' + 'form\n' + ' "<...some useful description...>" should be returned. The ' + 'return\n' + ' value must be a string object. If a class defines ' + '"__repr__()" but\n' + ' not "__str__()", then "__repr__()" is also used when an ' + '"informal"\n' + ' string representation of instances of that class is ' + 'required.\n' + '\n' + ' This is typically used for debugging, so it is important ' + 'that the\n' + ' representation is information-rich and unambiguous.\n' + '\n' + 'object.__str__(self)\n' + '\n' + ' Called by "str(object)" and the built-in functions ' + '"format()" and\n' + ' "print()" to compute the "informal" or nicely printable ' + 'string\n' + ' representation of an object. The return value must be a ' + 'string\n' + ' object.\n' + '\n' + ' This method differs from "object.__repr__()" in that ' + 'there is no\n' + ' expectation that "__str__()" return a valid Python ' + 'expression: a\n' + ' more convenient or concise representation can be used.\n' + '\n' + ' The default implementation defined by the built-in type ' + '"object"\n' + ' calls "object.__repr__()".\n' + '\n' + 'object.__bytes__(self)\n' + '\n' + ' Called by "bytes()" to compute a byte-string ' + 'representation of an\n' + ' object. This should return a "bytes" object.\n' + '\n' + 'object.__format__(self, format_spec)\n' + '\n' + ' Called by the "format()" built-in function, and by ' + 'extension,\n' + ' evaluation of formatted string literals and the ' + '"str.format()"\n' + ' method, to produce a "formatted" string representation of ' + 'an\n' + ' object. The "format_spec" argument is a string that ' + 'contains a\n' + ' description of the formatting options desired. The ' + 'interpretation\n' + ' of the "format_spec" argument is up to the type ' + 'implementing\n' + ' "__format__()", however most classes will either ' + 'delegate\n' + ' formatting to one of the built-in types, or use a ' + 'similar\n' + ' formatting option syntax.\n' + '\n' + ' See Format Specification Mini-Language for a description ' + 'of the\n' + ' standard formatting syntax.\n' + '\n' + ' The return value must be a string object.\n' + '\n' + ' Changed in version 3.4: The __format__ method of "object" ' + 'itself\n' + ' raises a "TypeError" if passed any non-empty string.\n' + '\n' + 'object.__lt__(self, other)\n' + 'object.__le__(self, other)\n' + 'object.__eq__(self, other)\n' + 'object.__ne__(self, other)\n' + 'object.__gt__(self, other)\n' + 'object.__ge__(self, other)\n' + '\n' + ' These are the so-called "rich comparison" methods. The\n' + ' correspondence between operator symbols and method names ' + 'is as\n' + ' follows: "xy" calls\n' + ' "x.__gt__(y)", and "x>=y" calls "x.__ge__(y)".\n' + '\n' + ' A rich comparison method may return the singleton ' + '"NotImplemented"\n' + ' if it does not implement the operation for a given pair ' + 'of\n' + ' arguments. By convention, "False" and "True" are returned ' + 'for a\n' + ' successful comparison. However, these methods can return ' + 'any value,\n' + ' so if the comparison operator is used in a Boolean ' + 'context (e.g.,\n' + ' in the condition of an "if" statement), Python will call ' + '"bool()"\n' + ' on the value to determine if the result is true or ' + 'false.\n' + '\n' + ' By default, "__ne__()" delegates to "__eq__()" and ' + 'inverts the\n' + ' result unless it is "NotImplemented". There are no other ' + 'implied\n' + ' relationships among the comparison operators, for ' + 'example, the\n' + ' truth of "(x.__hash__".\n' + '\n' + ' If a class that does not override "__eq__()" wishes to ' + 'suppress\n' + ' hash support, it should include "__hash__ = None" in the ' + 'class\n' + ' definition. A class which defines its own "__hash__()" ' + 'that\n' + ' explicitly raises a "TypeError" would be incorrectly ' + 'identified as\n' + ' hashable by an "isinstance(obj, collections.Hashable)" ' + 'call.\n' + '\n' + ' Note: By default, the "__hash__()" values of str, bytes ' + 'and\n' + ' datetime objects are "salted" with an unpredictable ' + 'random value.\n' + ' Although they remain constant within an individual ' + 'Python\n' + ' process, they are not predictable between repeated ' + 'invocations of\n' + ' Python.This is intended to provide protection against a ' + 'denial-\n' + ' of-service caused by carefully-chosen inputs that ' + 'exploit the\n' + ' worst case performance of a dict insertion, O(n^2) ' + 'complexity.\n' + ' See http://www.ocert.org/advisories/ocert-2011-003.html ' + 'for\n' + ' details.Changing hash values affects the iteration ' + 'order of\n' + ' dicts, sets and other mappings. Python has never made ' + 'guarantees\n' + ' about this ordering (and it typically varies between ' + '32-bit and\n' + ' 64-bit builds).See also "PYTHONHASHSEED".\n' + '\n' + ' Changed in version 3.3: Hash randomization is enabled by ' + 'default.\n' + '\n' + 'object.__bool__(self)\n' + '\n' + ' Called to implement truth value testing and the built-in ' + 'operation\n' + ' "bool()"; should return "False" or "True". When this ' + 'method is not\n' + ' defined, "__len__()" is called, if it is defined, and the ' + 'object is\n' + ' considered true if its result is nonzero. If a class ' + 'defines\n' + ' neither "__len__()" nor "__bool__()", all its instances ' + 'are\n' + ' considered true.\n' + '\n' + '\n' + 'Customizing attribute access\n' + '============================\n' + '\n' + 'The following methods can be defined to customize the ' + 'meaning of\n' + 'attribute access (use of, assignment to, or deletion of ' + '"x.name") for\n' + 'class instances.\n' + '\n' + 'object.__getattr__(self, name)\n' + '\n' + ' Called when an attribute lookup has not found the ' + 'attribute in the\n' + ' usual places (i.e. it is not an instance attribute nor is ' + 'it found\n' + ' in the class tree for "self"). "name" is the attribute ' + 'name. This\n' + ' method should return the (computed) attribute value or ' + 'raise an\n' + ' "AttributeError" exception.\n' + '\n' + ' Note that if the attribute is found through the normal ' + 'mechanism,\n' + ' "__getattr__()" is not called. (This is an intentional ' + 'asymmetry\n' + ' between "__getattr__()" and "__setattr__()".) This is ' + 'done both for\n' + ' efficiency reasons and because otherwise "__getattr__()" ' + 'would have\n' + ' no way to access other attributes of the instance. Note ' + 'that at\n' + ' least for instance variables, you can fake total control ' + 'by not\n' + ' inserting any values in the instance attribute dictionary ' + '(but\n' + ' instead inserting them in another object). See the\n' + ' "__getattribute__()" method below for a way to actually ' + 'get total\n' + ' control over attribute access.\n' + '\n' + 'object.__getattribute__(self, name)\n' + '\n' + ' Called unconditionally to implement attribute accesses ' + 'for\n' + ' instances of the class. If the class also defines ' + '"__getattr__()",\n' + ' the latter will not be called unless "__getattribute__()" ' + 'either\n' + ' calls it explicitly or raises an "AttributeError". This ' + 'method\n' + ' should return the (computed) attribute value or raise an\n' + ' "AttributeError" exception. In order to avoid infinite ' + 'recursion in\n' + ' this method, its implementation should always call the ' + 'base class\n' + ' method with the same name to access any attributes it ' + 'needs, for\n' + ' example, "object.__getattribute__(self, name)".\n' + '\n' + ' Note: This method may still be bypassed when looking up ' + 'special\n' + ' methods as the result of implicit invocation via ' + 'language syntax\n' + ' or built-in functions. See Special method lookup.\n' + '\n' + 'object.__setattr__(self, name, value)\n' + '\n' + ' Called when an attribute assignment is attempted. This ' + 'is called\n' + ' instead of the normal mechanism (i.e. store the value in ' + 'the\n' + ' instance dictionary). *name* is the attribute name, ' + '*value* is the\n' + ' value to be assigned to it.\n' + '\n' + ' If "__setattr__()" wants to assign to an instance ' + 'attribute, it\n' + ' should call the base class method with the same name, for ' + 'example,\n' + ' "object.__setattr__(self, name, value)".\n' + '\n' + 'object.__delattr__(self, name)\n' + '\n' + ' Like "__setattr__()" but for attribute deletion instead ' + 'of\n' + ' assignment. This should only be implemented if "del ' + 'obj.name" is\n' + ' meaningful for the object.\n' + '\n' + 'object.__dir__(self)\n' + '\n' + ' Called when "dir()" is called on the object. A sequence ' + 'must be\n' + ' returned. "dir()" converts the returned sequence to a ' + 'list and\n' + ' sorts it.\n' + '\n' + '\n' + 'Implementing Descriptors\n' + '------------------------\n' + '\n' + 'The following methods only apply when an instance of the ' + 'class\n' + 'containing the method (a so-called *descriptor* class) ' + 'appears in an\n' + "*owner* class (the descriptor must be in either the owner's " + 'class\n' + 'dictionary or in the class dictionary for one of its ' + 'parents). In the\n' + 'examples below, "the attribute" refers to the attribute ' + 'whose name is\n' + 'the key of the property in the owner class\' "__dict__".\n' + '\n' + 'object.__get__(self, instance, owner)\n' + '\n' + ' Called to get the attribute of the owner class (class ' + 'attribute\n' + ' access) or of an instance of that class (instance ' + 'attribute\n' + ' access). *owner* is always the owner class, while ' + '*instance* is the\n' + ' instance that the attribute was accessed through, or ' + '"None" when\n' + ' the attribute is accessed through the *owner*. This ' + 'method should\n' + ' return the (computed) attribute value or raise an ' + '"AttributeError"\n' + ' exception.\n' + '\n' + 'object.__set__(self, instance, value)\n' + '\n' + ' Called to set the attribute on an instance *instance* of ' + 'the owner\n' + ' class to a new value, *value*.\n' + '\n' + 'object.__delete__(self, instance)\n' + '\n' + ' Called to delete the attribute on an instance *instance* ' + 'of the\n' + ' owner class.\n' + '\n' + 'object.__set_name__(self, owner, name)\n' + '\n' + ' Called at the time the owning class *owner* is created. ' + 'The\n' + ' descriptor has been assigned to *name*.\n' + '\n' + ' New in version 3.6.\n' + '\n' + 'The attribute "__objclass__" is interpreted by the "inspect" ' + 'module as\n' + 'specifying the class where this object was defined (setting ' + 'this\n' + 'appropriately can assist in runtime introspection of dynamic ' + 'class\n' + 'attributes). For callables, it may indicate that an instance ' + 'of the\n' + 'given type (or a subclass) is expected or required as the ' + 'first\n' + 'positional argument (for example, CPython sets this ' + 'attribute for\n' + 'unbound methods that are implemented in C).\n' + '\n' + '\n' + 'Invoking Descriptors\n' + '--------------------\n' + '\n' + 'In general, a descriptor is an object attribute with ' + '"binding\n' + 'behavior", one whose attribute access has been overridden by ' + 'methods\n' + 'in the descriptor protocol: "__get__()", "__set__()", and\n' + '"__delete__()". If any of those methods are defined for an ' + 'object, it\n' + 'is said to be a descriptor.\n' + '\n' + 'The default behavior for attribute access is to get, set, or ' + 'delete\n' + "the attribute from an object's dictionary. For instance, " + '"a.x" has a\n' + 'lookup chain starting with "a.__dict__[\'x\']", then\n' + '"type(a).__dict__[\'x\']", and continuing through the base ' + 'classes of\n' + '"type(a)" excluding metaclasses.\n' + '\n' + 'However, if the looked-up value is an object defining one of ' + 'the\n' + 'descriptor methods, then Python may override the default ' + 'behavior and\n' + 'invoke the descriptor method instead. Where this occurs in ' + 'the\n' + 'precedence chain depends on which descriptor methods were ' + 'defined and\n' + 'how they were called.\n' + '\n' + 'The starting point for descriptor invocation is a binding, ' + '"a.x". How\n' + 'the arguments are assembled depends on "a":\n' + '\n' + 'Direct Call\n' + ' The simplest and least common call is when user code ' + 'directly\n' + ' invokes a descriptor method: "x.__get__(a)".\n' + '\n' + 'Instance Binding\n' + ' If binding to an object instance, "a.x" is transformed ' + 'into the\n' + ' call: "type(a).__dict__[\'x\'].__get__(a, type(a))".\n' + '\n' + 'Class Binding\n' + ' If binding to a class, "A.x" is transformed into the ' + 'call:\n' + ' "A.__dict__[\'x\'].__get__(None, A)".\n' + '\n' + 'Super Binding\n' + ' If "a" is an instance of "super", then the binding ' + '"super(B,\n' + ' obj).m()" searches "obj.__class__.__mro__" for the base ' + 'class "A"\n' + ' immediately preceding "B" and then invokes the descriptor ' + 'with the\n' + ' call: "A.__dict__[\'m\'].__get__(obj, obj.__class__)".\n' + '\n' + 'For instance bindings, the precedence of descriptor ' + 'invocation depends\n' + 'on the which descriptor methods are defined. A descriptor ' + 'can define\n' + 'any combination of "__get__()", "__set__()" and ' + '"__delete__()". If it\n' + 'does not define "__get__()", then accessing the attribute ' + 'will return\n' + 'the descriptor object itself unless there is a value in the ' + "object's\n" + 'instance dictionary. If the descriptor defines "__set__()" ' + 'and/or\n' + '"__delete__()", it is a data descriptor; if it defines ' + 'neither, it is\n' + 'a non-data descriptor. Normally, data descriptors define ' + 'both\n' + '"__get__()" and "__set__()", while non-data descriptors have ' + 'just the\n' + '"__get__()" method. Data descriptors with "__set__()" and ' + '"__get__()"\n' + 'defined always override a redefinition in an instance ' + 'dictionary. In\n' + 'contrast, non-data descriptors can be overridden by ' + 'instances.\n' + '\n' + 'Python methods (including "staticmethod()" and ' + '"classmethod()") are\n' + 'implemented as non-data descriptors. Accordingly, instances ' + 'can\n' + 'redefine and override methods. This allows individual ' + 'instances to\n' + 'acquire behaviors that differ from other instances of the ' + 'same class.\n' + '\n' + 'The "property()" function is implemented as a data ' + 'descriptor.\n' + 'Accordingly, instances cannot override the behavior of a ' + 'property.\n' + '\n' + '\n' + '__slots__\n' + '---------\n' + '\n' + 'By default, instances of classes have a dictionary for ' + 'attribute\n' + 'storage. This wastes space for objects having very few ' + 'instance\n' + 'variables. The space consumption can become acute when ' + 'creating large\n' + 'numbers of instances.\n' + '\n' + 'The default can be overridden by defining *__slots__* in a ' + 'class\n' + 'definition. The *__slots__* declaration takes a sequence of ' + 'instance\n' + 'variables and reserves just enough space in each instance to ' + 'hold a\n' + 'value for each variable. Space is saved because *__dict__* ' + 'is not\n' + 'created for each instance.\n' + '\n' + 'object.__slots__\n' + '\n' + ' This class variable can be assigned a string, iterable, ' + 'or sequence\n' + ' of strings with variable names used by instances. ' + '*__slots__*\n' + ' reserves space for the declared variables and prevents ' + 'the\n' + ' automatic creation of *__dict__* and *__weakref__* for ' + 'each\n' + ' instance.\n' + '\n' + '\n' + 'Notes on using *__slots__*\n' + '~~~~~~~~~~~~~~~~~~~~~~~~~~\n' + '\n' + '* When inheriting from a class without *__slots__*, the ' + '*__dict__*\n' + ' attribute of that class will always be accessible, so a ' + '*__slots__*\n' + ' definition in the subclass is meaningless.\n' + '\n' + '* Without a *__dict__* variable, instances cannot be ' + 'assigned new\n' + ' variables not listed in the *__slots__* definition. ' + 'Attempts to\n' + ' assign to an unlisted variable name raises ' + '"AttributeError". If\n' + ' dynamic assignment of new variables is desired, then add\n' + ' "\'__dict__\'" to the sequence of strings in the ' + '*__slots__*\n' + ' declaration.\n' + '\n' + '* Without a *__weakref__* variable for each instance, ' + 'classes\n' + ' defining *__slots__* do not support weak references to ' + 'its\n' + ' instances. If weak reference support is needed, then add\n' + ' "\'__weakref__\'" to the sequence of strings in the ' + '*__slots__*\n' + ' declaration.\n' + '\n' + '* *__slots__* are implemented at the class level by ' + 'creating\n' + ' descriptors (Implementing Descriptors) for each variable ' + 'name. As a\n' + ' result, class attributes cannot be used to set default ' + 'values for\n' + ' instance variables defined by *__slots__*; otherwise, the ' + 'class\n' + ' attribute would overwrite the descriptor assignment.\n' + '\n' + '* The action of a *__slots__* declaration is limited to the ' + 'class\n' + ' where it is defined. As a result, subclasses will have a ' + '*__dict__*\n' + ' unless they also define *__slots__* (which must only ' + 'contain names\n' + ' of any *additional* slots).\n' + '\n' + '* If a class defines a slot also defined in a base class, ' + 'the\n' + ' instance variable defined by the base class slot is ' + 'inaccessible\n' + ' (except by retrieving its descriptor directly from the ' + 'base class).\n' + ' This renders the meaning of the program undefined. In the ' + 'future, a\n' + ' check may be added to prevent this.\n' + '\n' + '* Nonempty *__slots__* does not work for classes derived ' + 'from\n' + ' "variable-length" built-in types such as "int", "bytes" ' + 'and "tuple".\n' + '\n' + '* Any non-string iterable may be assigned to *__slots__*. ' + 'Mappings\n' + ' may also be used; however, in the future, special meaning ' + 'may be\n' + ' assigned to the values corresponding to each key.\n' + '\n' + '* *__class__* assignment works only if both classes have the ' + 'same\n' + ' *__slots__*.\n' + '\n' + '\n' + 'Customizing class creation\n' + '==========================\n' + '\n' + 'Whenever a class inherits from another class, ' + '*__init_subclass__* is\n' + 'called on that class. This way, it is possible to write ' + 'classes which\n' + 'change the behavior of subclasses. This is closely related ' + 'to class\n' + 'decorators, but where class decorators only affect the ' + 'specific class\n' + 'they\'re applied to, "__init_subclass__" solely applies to ' + 'future\n' + 'subclasses of the class defining the method.\n' + '\n' + 'classmethod object.__init_subclass__(cls)\n' + '\n' + ' This method is called whenever the containing class is ' + 'subclassed.\n' + ' *cls* is then the new subclass. If defined as a normal ' + 'instance\n' + ' method, this method is implicitly converted to a class ' + 'method.\n' + '\n' + ' Keyword arguments which are given to a new class are ' + 'passed to the\n' + ' parent\'s class "__init_subclass__". For compatibility ' + 'with other\n' + ' classes using "__init_subclass__", one should take out ' + 'the needed\n' + ' keyword arguments and pass the others over to the base ' + 'class, as\n' + ' in:\n' + '\n' + ' class Philosopher:\n' + ' def __init_subclass__(cls, default_name, ' + '**kwargs):\n' + ' super().__init_subclass__(**kwargs)\n' + ' cls.default_name = default_name\n' + '\n' + ' class AustralianPhilosopher(Philosopher, ' + 'default_name="Bruce"):\n' + ' pass\n' + '\n' + ' The default implementation "object.__init_subclass__" ' + 'does nothing,\n' + ' but raises an error if it is called with any arguments.\n' + '\n' + ' Note: The metaclass hint "metaclass" is consumed by the ' + 'rest of\n' + ' the type machinery, and is never passed to ' + '"__init_subclass__"\n' + ' implementations. The actual metaclass (rather than the ' + 'explicit\n' + ' hint) can be accessed as "type(cls)".\n' + '\n' + ' New in version 3.6.\n' + '\n' + '\n' + 'Metaclasses\n' + '-----------\n' + '\n' + 'By default, classes are constructed using "type()". The ' + 'class body is\n' + 'executed in a new namespace and the class name is bound ' + 'locally to the\n' + 'result of "type(name, bases, namespace)".\n' + '\n' + 'The class creation process can be customized by passing the\n' + '"metaclass" keyword argument in the class definition line, ' + 'or by\n' + 'inheriting from an existing class that included such an ' + 'argument. In\n' + 'the following example, both "MyClass" and "MySubclass" are ' + 'instances\n' + 'of "Meta":\n' + '\n' + ' class Meta(type):\n' + ' pass\n' + '\n' + ' class MyClass(metaclass=Meta):\n' + ' pass\n' + '\n' + ' class MySubclass(MyClass):\n' + ' pass\n' + '\n' + 'Any other keyword arguments that are specified in the class ' + 'definition\n' + 'are passed through to all metaclass operations described ' + 'below.\n' + '\n' + 'When a class definition is executed, the following steps ' + 'occur:\n' + '\n' + '* the appropriate metaclass is determined\n' + '\n' + '* the class namespace is prepared\n' + '\n' + '* the class body is executed\n' + '\n' + '* the class object is created\n' + '\n' + '\n' + 'Determining the appropriate metaclass\n' + '-------------------------------------\n' + '\n' + 'The appropriate metaclass for a class definition is ' + 'determined as\n' + 'follows:\n' + '\n' + '* if no bases and no explicit metaclass are given, then ' + '"type()" is\n' + ' used\n' + '\n' + '* if an explicit metaclass is given and it is *not* an ' + 'instance of\n' + ' "type()", then it is used directly as the metaclass\n' + '\n' + '* if an instance of "type()" is given as the explicit ' + 'metaclass, or\n' + ' bases are defined, then the most derived metaclass is ' + 'used\n' + '\n' + 'The most derived metaclass is selected from the explicitly ' + 'specified\n' + 'metaclass (if any) and the metaclasses (i.e. "type(cls)") of ' + 'all\n' + 'specified base classes. The most derived metaclass is one ' + 'which is a\n' + 'subtype of *all* of these candidate metaclasses. If none of ' + 'the\n' + 'candidate metaclasses meets that criterion, then the class ' + 'definition\n' + 'will fail with "TypeError".\n' + '\n' + '\n' + 'Preparing the class namespace\n' + '-----------------------------\n' + '\n' + 'Once the appropriate metaclass has been identified, then the ' + 'class\n' + 'namespace is prepared. If the metaclass has a "__prepare__" ' + 'attribute,\n' + 'it is called as "namespace = metaclass.__prepare__(name, ' + 'bases,\n' + '**kwds)" (where the additional keyword arguments, if any, ' + 'come from\n' + 'the class definition).\n' + '\n' + 'If the metaclass has no "__prepare__" attribute, then the ' + 'class\n' + 'namespace is initialised as an empty ordered mapping.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3115** - Metaclasses in Python 3000\n' + ' Introduced the "__prepare__" namespace hook\n' + '\n' + '\n' + 'Executing the class body\n' + '------------------------\n' + '\n' + 'The class body is executed (approximately) as "exec(body, ' + 'globals(),\n' + 'namespace)". The key difference from a normal call to ' + '"exec()" is that\n' + 'lexical scoping allows the class body (including any ' + 'methods) to\n' + 'reference names from the current and outer scopes when the ' + 'class\n' + 'definition occurs inside a function.\n' + '\n' + 'However, even when the class definition occurs inside the ' + 'function,\n' + 'methods defined inside the class still cannot see names ' + 'defined at the\n' + 'class scope. Class variables must be accessed through the ' + 'first\n' + 'parameter of instance or class methods, or through the ' + 'implicit\n' + 'lexically scoped "__class__" reference described in the next ' + 'section.\n' + '\n' + '\n' + 'Creating the class object\n' + '-------------------------\n' + '\n' + 'Once the class namespace has been populated by executing the ' + 'class\n' + 'body, the class object is created by calling ' + '"metaclass(name, bases,\n' + 'namespace, **kwds)" (the additional keywords passed here are ' + 'the same\n' + 'as those passed to "__prepare__").\n' + '\n' + 'This class object is the one that will be referenced by the ' + 'zero-\n' + 'argument form of "super()". "__class__" is an implicit ' + 'closure\n' + 'reference created by the compiler if any methods in a class ' + 'body refer\n' + 'to either "__class__" or "super". This allows the zero ' + 'argument form\n' + 'of "super()" to correctly identify the class being defined ' + 'based on\n' + 'lexical scoping, while the class or instance that was used ' + 'to make the\n' + 'current call is identified based on the first argument ' + 'passed to the\n' + 'method.\n' + '\n' + '**CPython implementation detail:** In CPython 3.6 and later, ' + 'the\n' + '"__class__" cell is passed to the metaclass as a ' + '"__classcell__" entry\n' + 'in the class namespace. If present, this must be propagated ' + 'up to the\n' + '"type.__new__" call in order for the class to be ' + 'initialised\n' + 'correctly. Failing to do so will result in a ' + '"DeprecationWarning" in\n' + 'Python 3.6, and a "RuntimeWarning" in the future.\n' + '\n' + 'When using the default metaclass "type", or any metaclass ' + 'that\n' + 'ultimately calls "type.__new__", the following additional\n' + 'customisation steps are invoked after creating the class ' + 'object:\n' + '\n' + '* first, "type.__new__" collects all of the descriptors in ' + 'the class\n' + ' namespace that define a "__set_name__()" method;\n' + '\n' + '* second, all of these "__set_name__" methods are called ' + 'with the\n' + ' class being defined and the assigned name of that ' + 'particular\n' + ' descriptor; and\n' + '\n' + '* finally, the "__init_subclass__()" hook is called on the ' + 'immediate\n' + ' parent of the new class in its method resolution order.\n' + '\n' + 'After the class object is created, it is passed to the ' + 'class\n' + 'decorators included in the class definition (if any) and the ' + 'resulting\n' + 'object is bound in the local namespace as the defined ' + 'class.\n' + '\n' + 'When a new class is created by "type.__new__", the object ' + 'provided as\n' + 'the namespace parameter is copied to a new ordered mapping ' + 'and the\n' + 'original object is discarded. The new copy is wrapped in a ' + 'read-only\n' + 'proxy, which becomes the "__dict__" attribute of the class ' + 'object.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3135** - New super\n' + ' Describes the implicit "__class__" closure reference\n' + '\n' + '\n' + 'Metaclass example\n' + '-----------------\n' + '\n' + 'The potential uses for metaclasses are boundless. Some ideas ' + 'that have\n' + 'been explored include logging, interface checking, ' + 'automatic\n' + 'delegation, automatic property creation, proxies, ' + 'frameworks, and\n' + 'automatic resource locking/synchronization.\n' + '\n' + 'Here is an example of a metaclass that uses an\n' + '"collections.OrderedDict" to remember the order that class ' + 'variables\n' + 'are defined:\n' + '\n' + ' class OrderedClass(type):\n' + '\n' + ' @classmethod\n' + ' def __prepare__(metacls, name, bases, **kwds):\n' + ' return collections.OrderedDict()\n' + '\n' + ' def __new__(cls, name, bases, namespace, **kwds):\n' + ' result = type.__new__(cls, name, bases, ' + 'dict(namespace))\n' + ' result.members = tuple(namespace)\n' + ' return result\n' + '\n' + ' class A(metaclass=OrderedClass):\n' + ' def one(self): pass\n' + ' def two(self): pass\n' + ' def three(self): pass\n' + ' def four(self): pass\n' + '\n' + ' >>> A.members\n' + " ('__module__', 'one', 'two', 'three', 'four')\n" + '\n' + 'When the class definition for *A* gets executed, the process ' + 'begins\n' + 'with calling the metaclass\'s "__prepare__()" method which ' + 'returns an\n' + 'empty "collections.OrderedDict". That mapping records the ' + 'methods and\n' + 'attributes of *A* as they are defined within the body of the ' + 'class\n' + 'statement. Once those definitions are executed, the ordered ' + 'dictionary\n' + 'is fully populated and the metaclass\'s "__new__()" method ' + 'gets\n' + 'invoked. That method builds the new type and it saves the ' + 'ordered\n' + 'dictionary keys in an attribute called "members".\n' + '\n' + '\n' + 'Customizing instance and subclass checks\n' + '========================================\n' + '\n' + 'The following methods are used to override the default ' + 'behavior of the\n' + '"isinstance()" and "issubclass()" built-in functions.\n' + '\n' + 'In particular, the metaclass "abc.ABCMeta" implements these ' + 'methods in\n' + 'order to allow the addition of Abstract Base Classes (ABCs) ' + 'as\n' + '"virtual base classes" to any class or type (including ' + 'built-in\n' + 'types), including other ABCs.\n' + '\n' + 'class.__instancecheck__(self, instance)\n' + '\n' + ' Return true if *instance* should be considered a (direct ' + 'or\n' + ' indirect) instance of *class*. If defined, called to ' + 'implement\n' + ' "isinstance(instance, class)".\n' + '\n' + 'class.__subclasscheck__(self, subclass)\n' + '\n' + ' Return true if *subclass* should be considered a (direct ' + 'or\n' + ' indirect) subclass of *class*. If defined, called to ' + 'implement\n' + ' "issubclass(subclass, class)".\n' + '\n' + 'Note that these methods are looked up on the type ' + '(metaclass) of a\n' + 'class. They cannot be defined as class methods in the ' + 'actual class.\n' + 'This is consistent with the lookup of special methods that ' + 'are called\n' + 'on instances, only in this case the instance is itself a ' + 'class.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 3119** - Introducing Abstract Base Classes\n' + ' Includes the specification for customizing ' + '"isinstance()" and\n' + ' "issubclass()" behavior through "__instancecheck__()" ' + 'and\n' + ' "__subclasscheck__()", with motivation for this ' + 'functionality in\n' + ' the context of adding Abstract Base Classes (see the ' + '"abc"\n' + ' module) to the language.\n' + '\n' + '\n' + 'Emulating callable objects\n' + '==========================\n' + '\n' + 'object.__call__(self[, args...])\n' + '\n' + ' Called when the instance is "called" as a function; if ' + 'this method\n' + ' is defined, "x(arg1, arg2, ...)" is a shorthand for\n' + ' "x.__call__(arg1, arg2, ...)".\n' + '\n' + '\n' + 'Emulating container types\n' + '=========================\n' + '\n' + 'The following methods can be defined to implement container ' + 'objects.\n' + 'Containers usually are sequences (such as lists or tuples) ' + 'or mappings\n' + '(like dictionaries), but can represent other containers as ' + 'well. The\n' + 'first set of methods is used either to emulate a sequence or ' + 'to\n' + 'emulate a mapping; the difference is that for a sequence, ' + 'the\n' + 'allowable keys should be the integers *k* for which "0 <= k ' + '< N" where\n' + '*N* is the length of the sequence, or slice objects, which ' + 'define a\n' + 'range of items. It is also recommended that mappings ' + 'provide the\n' + 'methods "keys()", "values()", "items()", "get()", ' + '"clear()",\n' + '"setdefault()", "pop()", "popitem()", "copy()", and ' + '"update()"\n' + "behaving similar to those for Python's standard dictionary " + 'objects.\n' + 'The "collections" module provides a "MutableMapping" ' + 'abstract base\n' + 'class to help create those methods from a base set of ' + '"__getitem__()",\n' + '"__setitem__()", "__delitem__()", and "keys()". Mutable ' + 'sequences\n' + 'should provide methods "append()", "count()", "index()", ' + '"extend()",\n' + '"insert()", "pop()", "remove()", "reverse()" and "sort()", ' + 'like Python\n' + 'standard list objects. Finally, sequence types should ' + 'implement\n' + 'addition (meaning concatenation) and multiplication ' + '(meaning\n' + 'repetition) by defining the methods "__add__()", ' + '"__radd__()",\n' + '"__iadd__()", "__mul__()", "__rmul__()" and "__imul__()" ' + 'described\n' + 'below; they should not define other numerical operators. It ' + 'is\n' + 'recommended that both mappings and sequences implement the\n' + '"__contains__()" method to allow efficient use of the "in" ' + 'operator;\n' + 'for mappings, "in" should search the mapping\'s keys; for ' + 'sequences, it\n' + 'should search through the values. It is further recommended ' + 'that both\n' + 'mappings and sequences implement the "__iter__()" method to ' + 'allow\n' + 'efficient iteration through the container; for mappings, ' + '"__iter__()"\n' + 'should be the same as "keys()"; for sequences, it should ' + 'iterate\n' + 'through the values.\n' + '\n' + 'object.__len__(self)\n' + '\n' + ' Called to implement the built-in function "len()". ' + 'Should return\n' + ' the length of the object, an integer ">=" 0. Also, an ' + 'object that\n' + ' doesn\'t define a "__bool__()" method and whose ' + '"__len__()" method\n' + ' returns zero is considered to be false in a Boolean ' + 'context.\n' + '\n' + 'object.__length_hint__(self)\n' + '\n' + ' Called to implement "operator.length_hint()". Should ' + 'return an\n' + ' estimated length for the object (which may be greater or ' + 'less than\n' + ' the actual length). The length must be an integer ">=" 0. ' + 'This\n' + ' method is purely an optimization and is never required ' + 'for\n' + ' correctness.\n' + '\n' + ' New in version 3.4.\n' + '\n' + 'Note: Slicing is done exclusively with the following three ' + 'methods.\n' + ' A call like\n' + '\n' + ' a[1:2] = b\n' + '\n' + ' is translated to\n' + '\n' + ' a[slice(1, 2, None)] = b\n' + '\n' + ' and so forth. Missing slice items are always filled in ' + 'with "None".\n' + '\n' + 'object.__getitem__(self, key)\n' + '\n' + ' Called to implement evaluation of "self[key]". For ' + 'sequence types,\n' + ' the accepted keys should be integers and slice objects. ' + 'Note that\n' + ' the special interpretation of negative indexes (if the ' + 'class wishes\n' + ' to emulate a sequence type) is up to the "__getitem__()" ' + 'method. If\n' + ' *key* is of an inappropriate type, "TypeError" may be ' + 'raised; if of\n' + ' a value outside the set of indexes for the sequence ' + '(after any\n' + ' special interpretation of negative values), "IndexError" ' + 'should be\n' + ' raised. For mapping types, if *key* is missing (not in ' + 'the\n' + ' container), "KeyError" should be raised.\n' + '\n' + ' Note: "for" loops expect that an "IndexError" will be ' + 'raised for\n' + ' illegal indexes to allow proper detection of the end of ' + 'the\n' + ' sequence.\n' + '\n' + 'object.__missing__(self, key)\n' + '\n' + ' Called by "dict"."__getitem__()" to implement "self[key]" ' + 'for dict\n' + ' subclasses when key is not in the dictionary.\n' + '\n' + 'object.__setitem__(self, key, value)\n' + '\n' + ' Called to implement assignment to "self[key]". Same note ' + 'as for\n' + ' "__getitem__()". This should only be implemented for ' + 'mappings if\n' + ' the objects support changes to the values for keys, or if ' + 'new keys\n' + ' can be added, or for sequences if elements can be ' + 'replaced. The\n' + ' same exceptions should be raised for improper *key* ' + 'values as for\n' + ' the "__getitem__()" method.\n' + '\n' + 'object.__delitem__(self, key)\n' + '\n' + ' Called to implement deletion of "self[key]". Same note ' + 'as for\n' + ' "__getitem__()". This should only be implemented for ' + 'mappings if\n' + ' the objects support removal of keys, or for sequences if ' + 'elements\n' + ' can be removed from the sequence. The same exceptions ' + 'should be\n' + ' raised for improper *key* values as for the ' + '"__getitem__()" method.\n' + '\n' + 'object.__iter__(self)\n' + '\n' + ' This method is called when an iterator is required for a ' + 'container.\n' + ' This method should return a new iterator object that can ' + 'iterate\n' + ' over all the objects in the container. For mappings, it ' + 'should\n' + ' iterate over the keys of the container.\n' + '\n' + ' Iterator objects also need to implement this method; they ' + 'are\n' + ' required to return themselves. For more information on ' + 'iterator\n' + ' objects, see Iterator Types.\n' + '\n' + 'object.__reversed__(self)\n' + '\n' + ' Called (if present) by the "reversed()" built-in to ' + 'implement\n' + ' reverse iteration. It should return a new iterator ' + 'object that\n' + ' iterates over all the objects in the container in reverse ' + 'order.\n' + '\n' + ' If the "__reversed__()" method is not provided, the ' + '"reversed()"\n' + ' built-in will fall back to using the sequence protocol ' + '("__len__()"\n' + ' and "__getitem__()"). Objects that support the sequence ' + 'protocol\n' + ' should only provide "__reversed__()" if they can provide ' + 'an\n' + ' implementation that is more efficient than the one ' + 'provided by\n' + ' "reversed()".\n' + '\n' + 'The membership test operators ("in" and "not in") are ' + 'normally\n' + 'implemented as an iteration through a sequence. However, ' + 'container\n' + 'objects can supply the following special method with a more ' + 'efficient\n' + 'implementation, which also does not require the object be a ' + 'sequence.\n' + '\n' + 'object.__contains__(self, item)\n' + '\n' + ' Called to implement membership test operators. Should ' + 'return true\n' + ' if *item* is in *self*, false otherwise. For mapping ' + 'objects, this\n' + ' should consider the keys of the mapping rather than the ' + 'values or\n' + ' the key-item pairs.\n' + '\n' + ' For objects that don\'t define "__contains__()", the ' + 'membership test\n' + ' first tries iteration via "__iter__()", then the old ' + 'sequence\n' + ' iteration protocol via "__getitem__()", see this section ' + 'in the\n' + ' language reference.\n' + '\n' + '\n' + 'Emulating numeric types\n' + '=======================\n' + '\n' + 'The following methods can be defined to emulate numeric ' + 'objects.\n' + 'Methods corresponding to operations that are not supported ' + 'by the\n' + 'particular kind of number implemented (e.g., bitwise ' + 'operations for\n' + 'non-integral numbers) should be left undefined.\n' + '\n' + 'object.__add__(self, other)\n' + 'object.__sub__(self, other)\n' + 'object.__mul__(self, other)\n' + 'object.__matmul__(self, other)\n' + 'object.__truediv__(self, other)\n' + 'object.__floordiv__(self, other)\n' + 'object.__mod__(self, other)\n' + 'object.__divmod__(self, other)\n' + 'object.__pow__(self, other[, modulo])\n' + 'object.__lshift__(self, other)\n' + 'object.__rshift__(self, other)\n' + 'object.__and__(self, other)\n' + 'object.__xor__(self, other)\n' + 'object.__or__(self, other)\n' + '\n' + ' These methods are called to implement the binary ' + 'arithmetic\n' + ' operations ("+", "-", "*", "@", "/", "//", "%", ' + '"divmod()",\n' + ' "pow()", "**", "<<", ">>", "&", "^", "|"). For instance, ' + 'to\n' + ' evaluate the expression "x + y", where *x* is an instance ' + 'of a\n' + ' class that has an "__add__()" method, "x.__add__(y)" is ' + 'called.\n' + ' The "__divmod__()" method should be the equivalent to ' + 'using\n' + ' "__floordiv__()" and "__mod__()"; it should not be ' + 'related to\n' + ' "__truediv__()". Note that "__pow__()" should be defined ' + 'to accept\n' + ' an optional third argument if the ternary version of the ' + 'built-in\n' + ' "pow()" function is to be supported.\n' + '\n' + ' If one of those methods does not support the operation ' + 'with the\n' + ' supplied arguments, it should return "NotImplemented".\n' + '\n' + 'object.__radd__(self, other)\n' + 'object.__rsub__(self, other)\n' + 'object.__rmul__(self, other)\n' + 'object.__rmatmul__(self, other)\n' + 'object.__rtruediv__(self, other)\n' + 'object.__rfloordiv__(self, other)\n' + 'object.__rmod__(self, other)\n' + 'object.__rdivmod__(self, other)\n' + 'object.__rpow__(self, other)\n' + 'object.__rlshift__(self, other)\n' + 'object.__rrshift__(self, other)\n' + 'object.__rand__(self, other)\n' + 'object.__rxor__(self, other)\n' + 'object.__ror__(self, other)\n' + '\n' + ' These methods are called to implement the binary ' + 'arithmetic\n' + ' operations ("+", "-", "*", "@", "/", "//", "%", ' + '"divmod()",\n' + ' "pow()", "**", "<<", ">>", "&", "^", "|") with reflected ' + '(swapped)\n' + ' operands. These functions are only called if the left ' + 'operand does\n' + ' not support the corresponding operation [3] and the ' + 'operands are of\n' + ' different types. [4] For instance, to evaluate the ' + 'expression "x -\n' + ' y", where *y* is an instance of a class that has an ' + '"__rsub__()"\n' + ' method, "y.__rsub__(x)" is called if "x.__sub__(y)" ' + 'returns\n' + ' *NotImplemented*.\n' + '\n' + ' Note that ternary "pow()" will not try calling ' + '"__rpow__()" (the\n' + ' coercion rules would become too complicated).\n' + '\n' + " Note: If the right operand's type is a subclass of the " + 'left\n' + " operand's type and that subclass provides the reflected " + 'method\n' + ' for the operation, this method will be called before ' + 'the left\n' + " operand's non-reflected method. This behavior allows " + 'subclasses\n' + " to override their ancestors' operations.\n" + '\n' + 'object.__iadd__(self, other)\n' + 'object.__isub__(self, other)\n' + 'object.__imul__(self, other)\n' + 'object.__imatmul__(self, other)\n' + 'object.__itruediv__(self, other)\n' + 'object.__ifloordiv__(self, other)\n' + 'object.__imod__(self, other)\n' + 'object.__ipow__(self, other[, modulo])\n' + 'object.__ilshift__(self, other)\n' + 'object.__irshift__(self, other)\n' + 'object.__iand__(self, other)\n' + 'object.__ixor__(self, other)\n' + 'object.__ior__(self, other)\n' + '\n' + ' These methods are called to implement the augmented ' + 'arithmetic\n' + ' assignments ("+=", "-=", "*=", "@=", "/=", "//=", "%=", ' + '"**=",\n' + ' "<<=", ">>=", "&=", "^=", "|="). These methods should ' + 'attempt to\n' + ' do the operation in-place (modifying *self*) and return ' + 'the result\n' + ' (which could be, but does not have to be, *self*). If a ' + 'specific\n' + ' method is not defined, the augmented assignment falls ' + 'back to the\n' + ' normal methods. For instance, if *x* is an instance of a ' + 'class\n' + ' with an "__iadd__()" method, "x += y" is equivalent to "x ' + '=\n' + ' x.__iadd__(y)" . Otherwise, "x.__add__(y)" and ' + '"y.__radd__(x)" are\n' + ' considered, as with the evaluation of "x + y". In ' + 'certain\n' + ' situations, augmented assignment can result in unexpected ' + 'errors\n' + " (see Why does a_tuple[i] += ['item'] raise an exception " + 'when the\n' + ' addition works?), but this behavior is in fact part of ' + 'the data\n' + ' model.\n' + '\n' + 'object.__neg__(self)\n' + 'object.__pos__(self)\n' + 'object.__abs__(self)\n' + 'object.__invert__(self)\n' + '\n' + ' Called to implement the unary arithmetic operations ("-", ' + '"+",\n' + ' "abs()" and "~").\n' + '\n' + 'object.__complex__(self)\n' + 'object.__int__(self)\n' + 'object.__float__(self)\n' + 'object.__round__(self[, n])\n' + '\n' + ' Called to implement the built-in functions "complex()", ' + '"int()",\n' + ' "float()" and "round()". Should return a value of the ' + 'appropriate\n' + ' type.\n' + '\n' + 'object.__index__(self)\n' + '\n' + ' Called to implement "operator.index()", and whenever ' + 'Python needs\n' + ' to losslessly convert the numeric object to an integer ' + 'object (such\n' + ' as in slicing, or in the built-in "bin()", "hex()" and ' + '"oct()"\n' + ' functions). Presence of this method indicates that the ' + 'numeric\n' + ' object is an integer type. Must return an integer.\n' + '\n' + ' Note: In order to have a coherent integer type class, ' + 'when\n' + ' "__index__()" is defined "__int__()" should also be ' + 'defined, and\n' + ' both should return the same value.\n' + '\n' + '\n' + 'With Statement Context Managers\n' + '===============================\n' + '\n' + 'A *context manager* is an object that defines the runtime ' + 'context to\n' + 'be established when executing a "with" statement. The ' + 'context manager\n' + 'handles the entry into, and the exit from, the desired ' + 'runtime context\n' + 'for the execution of the block of code. Context managers ' + 'are normally\n' + 'invoked using the "with" statement (described in section The ' + 'with\n' + 'statement), but can also be used by directly invoking their ' + 'methods.\n' + '\n' + 'Typical uses of context managers include saving and ' + 'restoring various\n' + 'kinds of global state, locking and unlocking resources, ' + 'closing opened\n' + 'files, etc.\n' + '\n' + 'For more information on context managers, see Context ' + 'Manager Types.\n' + '\n' + 'object.__enter__(self)\n' + '\n' + ' Enter the runtime context related to this object. The ' + '"with"\n' + " statement will bind this method's return value to the " + 'target(s)\n' + ' specified in the "as" clause of the statement, if any.\n' + '\n' + 'object.__exit__(self, exc_type, exc_value, traceback)\n' + '\n' + ' Exit the runtime context related to this object. The ' + 'parameters\n' + ' describe the exception that caused the context to be ' + 'exited. If the\n' + ' context was exited without an exception, all three ' + 'arguments will\n' + ' be "None".\n' + '\n' + ' If an exception is supplied, and the method wishes to ' + 'suppress the\n' + ' exception (i.e., prevent it from being propagated), it ' + 'should\n' + ' return a true value. Otherwise, the exception will be ' + 'processed\n' + ' normally upon exit from this method.\n' + '\n' + ' Note that "__exit__()" methods should not reraise the ' + 'passed-in\n' + " exception; this is the caller's responsibility.\n" + '\n' + 'See also:\n' + '\n' + ' **PEP 343** - The "with" statement\n' + ' The specification, background, and examples for the ' + 'Python "with"\n' + ' statement.\n' + '\n' + '\n' + 'Special method lookup\n' + '=====================\n' + '\n' + 'For custom classes, implicit invocations of special methods ' + 'are only\n' + "guaranteed to work correctly if defined on an object's type, " + 'not in\n' + "the object's instance dictionary. That behaviour is the " + 'reason why\n' + 'the following code raises an exception:\n' + '\n' + ' >>> class C:\n' + ' ... pass\n' + ' ...\n' + ' >>> c = C()\n' + ' >>> c.__len__ = lambda: 5\n' + ' >>> len(c)\n' + ' Traceback (most recent call last):\n' + ' File "", line 1, in \n' + " TypeError: object of type 'C' has no len()\n" + '\n' + 'The rationale behind this behaviour lies with a number of ' + 'special\n' + 'methods such as "__hash__()" and "__repr__()" that are ' + 'implemented by\n' + 'all objects, including type objects. If the implicit lookup ' + 'of these\n' + 'methods used the conventional lookup process, they would ' + 'fail when\n' + 'invoked on the type object itself:\n' + '\n' + ' >>> 1 .__hash__() == hash(1)\n' + ' True\n' + ' >>> int.__hash__() == hash(int)\n' + ' Traceback (most recent call last):\n' + ' File "", line 1, in \n' + " TypeError: descriptor '__hash__' of 'int' object needs an " + 'argument\n' + '\n' + 'Incorrectly attempting to invoke an unbound method of a ' + 'class in this\n' + "way is sometimes referred to as 'metaclass confusion', and " + 'is avoided\n' + 'by bypassing the instance when looking up special methods:\n' + '\n' + ' >>> type(1).__hash__(1) == hash(1)\n' + ' True\n' + ' >>> type(int).__hash__(int) == hash(int)\n' + ' True\n' + '\n' + 'In addition to bypassing any instance attributes in the ' + 'interest of\n' + 'correctness, implicit special method lookup generally also ' + 'bypasses\n' + 'the "__getattribute__()" method even of the object\'s ' + 'metaclass:\n' + '\n' + ' >>> class Meta(type):\n' + ' ... def __getattribute__(*args):\n' + ' ... print("Metaclass getattribute invoked")\n' + ' ... return type.__getattribute__(*args)\n' + ' ...\n' + ' >>> class C(object, metaclass=Meta):\n' + ' ... def __len__(self):\n' + ' ... return 10\n' + ' ... def __getattribute__(*args):\n' + ' ... print("Class getattribute invoked")\n' + ' ... return object.__getattribute__(*args)\n' + ' ...\n' + ' >>> c = C()\n' + ' >>> c.__len__() # Explicit lookup via ' + 'instance\n' + ' Class getattribute invoked\n' + ' 10\n' + ' >>> type(c).__len__(c) # Explicit lookup via ' + 'type\n' + ' Metaclass getattribute invoked\n' + ' 10\n' + ' >>> len(c) # Implicit lookup\n' + ' 10\n' + '\n' + 'Bypassing the "__getattribute__()" machinery in this fashion ' + 'provides\n' + 'significant scope for speed optimisations within the ' + 'interpreter, at\n' + 'the cost of some flexibility in the handling of special ' + 'methods (the\n' + 'special method *must* be set on the class object itself in ' + 'order to be\n' + 'consistently invoked by the interpreter).\n', + 'string-methods': '\n' + 'String Methods\n' + '**************\n' + '\n' + 'Strings implement all of the common sequence operations, ' + 'along with\n' + 'the additional methods described below.\n' + '\n' + 'Strings also support two styles of string formatting, one ' + 'providing a\n' + 'large degree of flexibility and customization (see ' + '"str.format()",\n' + 'Format String Syntax and Custom String Formatting) and the ' + 'other based\n' + 'on C "printf" style formatting that handles a narrower ' + 'range of types\n' + 'and is slightly harder to use correctly, but is often ' + 'faster for the\n' + 'cases it can handle (printf-style String Formatting).\n' + '\n' + 'The Text Processing Services section of the standard ' + 'library covers a\n' + 'number of other modules that provide various text related ' + 'utilities\n' + '(including regular expression support in the "re" ' + 'module).\n' + '\n' + 'str.capitalize()\n' + '\n' + ' Return a copy of the string with its first character ' + 'capitalized\n' + ' and the rest lowercased.\n' + '\n' + 'str.casefold()\n' + '\n' + ' Return a casefolded copy of the string. Casefolded ' + 'strings may be\n' + ' used for caseless matching.\n' + '\n' + ' Casefolding is similar to lowercasing but more ' + 'aggressive because\n' + ' it is intended to remove all case distinctions in a ' + 'string. For\n' + ' example, the German lowercase letter "\'ß\'" is ' + 'equivalent to ""ss"".\n' + ' Since it is already lowercase, "lower()" would do ' + 'nothing to "\'ß\'";\n' + ' "casefold()" converts it to ""ss"".\n' + '\n' + ' The casefolding algorithm is described in section 3.13 ' + 'of the\n' + ' Unicode Standard.\n' + '\n' + ' New in version 3.3.\n' + '\n' + 'str.center(width[, fillchar])\n' + '\n' + ' Return centered in a string of length *width*. Padding ' + 'is done\n' + ' using the specified *fillchar* (default is an ASCII ' + 'space). The\n' + ' original string is returned if *width* is less than or ' + 'equal to\n' + ' "len(s)".\n' + '\n' + 'str.count(sub[, start[, end]])\n' + '\n' + ' Return the number of non-overlapping occurrences of ' + 'substring *sub*\n' + ' in the range [*start*, *end*]. Optional arguments ' + '*start* and\n' + ' *end* are interpreted as in slice notation.\n' + '\n' + 'str.encode(encoding="utf-8", errors="strict")\n' + '\n' + ' Return an encoded version of the string as a bytes ' + 'object. Default\n' + ' encoding is "\'utf-8\'". *errors* may be given to set a ' + 'different\n' + ' error handling scheme. The default for *errors* is ' + '"\'strict\'",\n' + ' meaning that encoding errors raise a "UnicodeError". ' + 'Other possible\n' + ' values are "\'ignore\'", "\'replace\'", ' + '"\'xmlcharrefreplace\'",\n' + ' "\'backslashreplace\'" and any other name registered ' + 'via\n' + ' "codecs.register_error()", see section Error Handlers. ' + 'For a list\n' + ' of possible encodings, see section Standard Encodings.\n' + '\n' + ' Changed in version 3.1: Support for keyword arguments ' + 'added.\n' + '\n' + 'str.endswith(suffix[, start[, end]])\n' + '\n' + ' Return "True" if the string ends with the specified ' + '*suffix*,\n' + ' otherwise return "False". *suffix* can also be a tuple ' + 'of suffixes\n' + ' to look for. With optional *start*, test beginning at ' + 'that\n' + ' position. With optional *end*, stop comparing at that ' + 'position.\n' + '\n' + 'str.expandtabs(tabsize=8)\n' + '\n' + ' Return a copy of the string where all tab characters ' + 'are replaced\n' + ' by one or more spaces, depending on the current column ' + 'and the\n' + ' given tab size. Tab positions occur every *tabsize* ' + 'characters\n' + ' (default is 8, giving tab positions at columns 0, 8, 16 ' + 'and so on).\n' + ' To expand the string, the current column is set to zero ' + 'and the\n' + ' string is examined character by character. If the ' + 'character is a\n' + ' tab ("\\t"), one or more space characters are inserted ' + 'in the result\n' + ' until the current column is equal to the next tab ' + 'position. (The\n' + ' tab character itself is not copied.) If the character ' + 'is a newline\n' + ' ("\\n") or return ("\\r"), it is copied and the current ' + 'column is\n' + ' reset to zero. Any other character is copied unchanged ' + 'and the\n' + ' current column is incremented by one regardless of how ' + 'the\n' + ' character is represented when printed.\n' + '\n' + " >>> '01\\t012\\t0123\\t01234'.expandtabs()\n" + " '01 012 0123 01234'\n" + " >>> '01\\t012\\t0123\\t01234'.expandtabs(4)\n" + " '01 012 0123 01234'\n" + '\n' + 'str.find(sub[, start[, end]])\n' + '\n' + ' Return the lowest index in the string where substring ' + '*sub* is\n' + ' found within the slice "s[start:end]". Optional ' + 'arguments *start*\n' + ' and *end* are interpreted as in slice notation. Return ' + '"-1" if\n' + ' *sub* is not found.\n' + '\n' + ' Note: The "find()" method should be used only if you ' + 'need to know\n' + ' the position of *sub*. To check if *sub* is a ' + 'substring or not,\n' + ' use the "in" operator:\n' + '\n' + " >>> 'Py' in 'Python'\n" + ' True\n' + '\n' + 'str.format(*args, **kwargs)\n' + '\n' + ' Perform a string formatting operation. The string on ' + 'which this\n' + ' method is called can contain literal text or ' + 'replacement fields\n' + ' delimited by braces "{}". Each replacement field ' + 'contains either\n' + ' the numeric index of a positional argument, or the name ' + 'of a\n' + ' keyword argument. Returns a copy of the string where ' + 'each\n' + ' replacement field is replaced with the string value of ' + 'the\n' + ' corresponding argument.\n' + '\n' + ' >>> "The sum of 1 + 2 is {0}".format(1+2)\n' + " 'The sum of 1 + 2 is 3'\n" + '\n' + ' See Format String Syntax for a description of the ' + 'various\n' + ' formatting options that can be specified in format ' + 'strings.\n' + '\n' + 'str.format_map(mapping)\n' + '\n' + ' Similar to "str.format(**mapping)", except that ' + '"mapping" is used\n' + ' directly and not copied to a "dict". This is useful if ' + 'for example\n' + ' "mapping" is a dict subclass:\n' + '\n' + ' >>> class Default(dict):\n' + ' ... def __missing__(self, key):\n' + ' ... return key\n' + ' ...\n' + " >>> '{name} was born in " + "{country}'.format_map(Default(name='Guido'))\n" + " 'Guido was born in country'\n" + '\n' + ' New in version 3.2.\n' + '\n' + 'str.index(sub[, start[, end]])\n' + '\n' + ' Like "find()", but raise "ValueError" when the ' + 'substring is not\n' + ' found.\n' + '\n' + 'str.isalnum()\n' + '\n' + ' Return true if all characters in the string are ' + 'alphanumeric and\n' + ' there is at least one character, false otherwise. A ' + 'character "c"\n' + ' is alphanumeric if one of the following returns ' + '"True":\n' + ' "c.isalpha()", "c.isdecimal()", "c.isdigit()", or ' + '"c.isnumeric()".\n' + '\n' + 'str.isalpha()\n' + '\n' + ' Return true if all characters in the string are ' + 'alphabetic and\n' + ' there is at least one character, false otherwise. ' + 'Alphabetic\n' + ' characters are those characters defined in the Unicode ' + 'character\n' + ' database as "Letter", i.e., those with general category ' + 'property\n' + ' being one of "Lm", "Lt", "Lu", "Ll", or "Lo". Note ' + 'that this is\n' + ' different from the "Alphabetic" property defined in the ' + 'Unicode\n' + ' Standard.\n' + '\n' + 'str.isdecimal()\n' + '\n' + ' Return true if all characters in the string are decimal ' + 'characters\n' + ' and there is at least one character, false otherwise. ' + 'Decimal\n' + ' characters are those from general category "Nd". This ' + 'category\n' + ' includes digit characters, and all characters that can ' + 'be used to\n' + ' form decimal-radix numbers, e.g. U+0660, ARABIC-INDIC ' + 'DIGIT ZERO.\n' + '\n' + 'str.isdigit()\n' + '\n' + ' Return true if all characters in the string are digits ' + 'and there is\n' + ' at least one character, false otherwise. Digits ' + 'include decimal\n' + ' characters and digits that need special handling, such ' + 'as the\n' + ' compatibility superscript digits. Formally, a digit is ' + 'a character\n' + ' that has the property value Numeric_Type=Digit or\n' + ' Numeric_Type=Decimal.\n' + '\n' + 'str.isidentifier()\n' + '\n' + ' Return true if the string is a valid identifier ' + 'according to the\n' + ' language definition, section Identifiers and keywords.\n' + '\n' + ' Use "keyword.iskeyword()" to test for reserved ' + 'identifiers such as\n' + ' "def" and "class".\n' + '\n' + 'str.islower()\n' + '\n' + ' Return true if all cased characters [4] in the string ' + 'are lowercase\n' + ' and there is at least one cased character, false ' + 'otherwise.\n' + '\n' + 'str.isnumeric()\n' + '\n' + ' Return true if all characters in the string are numeric ' + 'characters,\n' + ' and there is at least one character, false otherwise. ' + 'Numeric\n' + ' characters include digit characters, and all characters ' + 'that have\n' + ' the Unicode numeric value property, e.g. U+2155, VULGAR ' + 'FRACTION\n' + ' ONE FIFTH. Formally, numeric characters are those with ' + 'the\n' + ' property value Numeric_Type=Digit, Numeric_Type=Decimal ' + 'or\n' + ' Numeric_Type=Numeric.\n' + '\n' + 'str.isprintable()\n' + '\n' + ' Return true if all characters in the string are ' + 'printable or the\n' + ' string is empty, false otherwise. Nonprintable ' + 'characters are\n' + ' those characters defined in the Unicode character ' + 'database as\n' + ' "Other" or "Separator", excepting the ASCII space ' + '(0x20) which is\n' + ' considered printable. (Note that printable characters ' + 'in this\n' + ' context are those which should not be escaped when ' + '"repr()" is\n' + ' invoked on a string. It has no bearing on the handling ' + 'of strings\n' + ' written to "sys.stdout" or "sys.stderr".)\n' + '\n' + 'str.isspace()\n' + '\n' + ' Return true if there are only whitespace characters in ' + 'the string\n' + ' and there is at least one character, false otherwise. ' + 'Whitespace\n' + ' characters are those characters defined in the Unicode ' + 'character\n' + ' database as "Other" or "Separator" and those with ' + 'bidirectional\n' + ' property being one of "WS", "B", or "S".\n' + '\n' + 'str.istitle()\n' + '\n' + ' Return true if the string is a titlecased string and ' + 'there is at\n' + ' least one character, for example uppercase characters ' + 'may only\n' + ' follow uncased characters and lowercase characters only ' + 'cased ones.\n' + ' Return false otherwise.\n' + '\n' + 'str.isupper()\n' + '\n' + ' Return true if all cased characters [4] in the string ' + 'are uppercase\n' + ' and there is at least one cased character, false ' + 'otherwise.\n' + '\n' + 'str.join(iterable)\n' + '\n' + ' Return a string which is the concatenation of the ' + 'strings in the\n' + ' *iterable* *iterable*. A "TypeError" will be raised if ' + 'there are\n' + ' any non-string values in *iterable*, including "bytes" ' + 'objects.\n' + ' The separator between elements is the string providing ' + 'this method.\n' + '\n' + 'str.ljust(width[, fillchar])\n' + '\n' + ' Return the string left justified in a string of length ' + '*width*.\n' + ' Padding is done using the specified *fillchar* (default ' + 'is an ASCII\n' + ' space). The original string is returned if *width* is ' + 'less than or\n' + ' equal to "len(s)".\n' + '\n' + 'str.lower()\n' + '\n' + ' Return a copy of the string with all the cased ' + 'characters [4]\n' + ' converted to lowercase.\n' + '\n' + ' The lowercasing algorithm used is described in section ' + '3.13 of the\n' + ' Unicode Standard.\n' + '\n' + 'str.lstrip([chars])\n' + '\n' + ' Return a copy of the string with leading characters ' + 'removed. The\n' + ' *chars* argument is a string specifying the set of ' + 'characters to be\n' + ' removed. If omitted or "None", the *chars* argument ' + 'defaults to\n' + ' removing whitespace. The *chars* argument is not a ' + 'prefix; rather,\n' + ' all combinations of its values are stripped:\n' + '\n' + " >>> ' spacious '.lstrip()\n" + " 'spacious '\n" + " >>> 'www.example.com'.lstrip('cmowz.')\n" + " 'example.com'\n" + '\n' + 'static str.maketrans(x[, y[, z]])\n' + '\n' + ' This static method returns a translation table usable ' + 'for\n' + ' "str.translate()".\n' + '\n' + ' If there is only one argument, it must be a dictionary ' + 'mapping\n' + ' Unicode ordinals (integers) or characters (strings of ' + 'length 1) to\n' + ' Unicode ordinals, strings (of arbitrary lengths) or ' + '"None".\n' + ' Character keys will then be converted to ordinals.\n' + '\n' + ' If there are two arguments, they must be strings of ' + 'equal length,\n' + ' and in the resulting dictionary, each character in x ' + 'will be mapped\n' + ' to the character at the same position in y. If there ' + 'is a third\n' + ' argument, it must be a string, whose characters will be ' + 'mapped to\n' + ' "None" in the result.\n' + '\n' + 'str.partition(sep)\n' + '\n' + ' Split the string at the first occurrence of *sep*, and ' + 'return a\n' + ' 3-tuple containing the part before the separator, the ' + 'separator\n' + ' itself, and the part after the separator. If the ' + 'separator is not\n' + ' found, return a 3-tuple containing the string itself, ' + 'followed by\n' + ' two empty strings.\n' + '\n' + 'str.replace(old, new[, count])\n' + '\n' + ' Return a copy of the string with all occurrences of ' + 'substring *old*\n' + ' replaced by *new*. If the optional argument *count* is ' + 'given, only\n' + ' the first *count* occurrences are replaced.\n' + '\n' + 'str.rfind(sub[, start[, end]])\n' + '\n' + ' Return the highest index in the string where substring ' + '*sub* is\n' + ' found, such that *sub* is contained within ' + '"s[start:end]".\n' + ' Optional arguments *start* and *end* are interpreted as ' + 'in slice\n' + ' notation. Return "-1" on failure.\n' + '\n' + 'str.rindex(sub[, start[, end]])\n' + '\n' + ' Like "rfind()" but raises "ValueError" when the ' + 'substring *sub* is\n' + ' not found.\n' + '\n' + 'str.rjust(width[, fillchar])\n' + '\n' + ' Return the string right justified in a string of length ' + '*width*.\n' + ' Padding is done using the specified *fillchar* (default ' + 'is an ASCII\n' + ' space). The original string is returned if *width* is ' + 'less than or\n' + ' equal to "len(s)".\n' + '\n' + 'str.rpartition(sep)\n' + '\n' + ' Split the string at the last occurrence of *sep*, and ' + 'return a\n' + ' 3-tuple containing the part before the separator, the ' + 'separator\n' + ' itself, and the part after the separator. If the ' + 'separator is not\n' + ' found, return a 3-tuple containing two empty strings, ' + 'followed by\n' + ' the string itself.\n' + '\n' + 'str.rsplit(sep=None, maxsplit=-1)\n' + '\n' + ' Return a list of the words in the string, using *sep* ' + 'as the\n' + ' delimiter string. If *maxsplit* is given, at most ' + '*maxsplit* splits\n' + ' are done, the *rightmost* ones. If *sep* is not ' + 'specified or\n' + ' "None", any whitespace string is a separator. Except ' + 'for splitting\n' + ' from the right, "rsplit()" behaves like "split()" which ' + 'is\n' + ' described in detail below.\n' + '\n' + 'str.rstrip([chars])\n' + '\n' + ' Return a copy of the string with trailing characters ' + 'removed. The\n' + ' *chars* argument is a string specifying the set of ' + 'characters to be\n' + ' removed. If omitted or "None", the *chars* argument ' + 'defaults to\n' + ' removing whitespace. The *chars* argument is not a ' + 'suffix; rather,\n' + ' all combinations of its values are stripped:\n' + '\n' + " >>> ' spacious '.rstrip()\n" + " ' spacious'\n" + " >>> 'mississippi'.rstrip('ipz')\n" + " 'mississ'\n" + '\n' + 'str.split(sep=None, maxsplit=-1)\n' + '\n' + ' Return a list of the words in the string, using *sep* ' + 'as the\n' + ' delimiter string. If *maxsplit* is given, at most ' + '*maxsplit*\n' + ' splits are done (thus, the list will have at most ' + '"maxsplit+1"\n' + ' elements). If *maxsplit* is not specified or "-1", ' + 'then there is\n' + ' no limit on the number of splits (all possible splits ' + 'are made).\n' + '\n' + ' If *sep* is given, consecutive delimiters are not ' + 'grouped together\n' + ' and are deemed to delimit empty strings (for example,\n' + ' "\'1,,2\'.split(\',\')" returns "[\'1\', \'\', ' + '\'2\']"). The *sep* argument\n' + ' may consist of multiple characters (for example,\n' + ' "\'1<>2<>3\'.split(\'<>\')" returns "[\'1\', \'2\', ' + '\'3\']"). Splitting an\n' + ' empty string with a specified separator returns ' + '"[\'\']".\n' + '\n' + ' For example:\n' + '\n' + " >>> '1,2,3'.split(',')\n" + " ['1', '2', '3']\n" + " >>> '1,2,3'.split(',', maxsplit=1)\n" + " ['1', '2,3']\n" + " >>> '1,2,,3,'.split(',')\n" + " ['1', '2', '', '3', '']\n" + '\n' + ' If *sep* is not specified or is "None", a different ' + 'splitting\n' + ' algorithm is applied: runs of consecutive whitespace ' + 'are regarded\n' + ' as a single separator, and the result will contain no ' + 'empty strings\n' + ' at the start or end if the string has leading or ' + 'trailing\n' + ' whitespace. Consequently, splitting an empty string or ' + 'a string\n' + ' consisting of just whitespace with a "None" separator ' + 'returns "[]".\n' + '\n' + ' For example:\n' + '\n' + " >>> '1 2 3'.split()\n" + " ['1', '2', '3']\n" + " >>> '1 2 3'.split(maxsplit=1)\n" + " ['1', '2 3']\n" + " >>> ' 1 2 3 '.split()\n" + " ['1', '2', '3']\n" + '\n' + 'str.splitlines([keepends])\n' + '\n' + ' Return a list of the lines in the string, breaking at ' + 'line\n' + ' boundaries. Line breaks are not included in the ' + 'resulting list\n' + ' unless *keepends* is given and true.\n' + '\n' + ' This method splits on the following line boundaries. ' + 'In\n' + ' particular, the boundaries are a superset of *universal ' + 'newlines*.\n' + '\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | Representation | ' + 'Description |\n' + ' ' + '+=========================+===============================+\n' + ' | "\\n" | Line ' + 'Feed |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\r" | Carriage ' + 'Return |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\r\\n" | Carriage Return + Line ' + 'Feed |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\v" or "\\x0b" | Line ' + 'Tabulation |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\f" or "\\x0c" | Form ' + 'Feed |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\x1c" | File ' + 'Separator |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\x1d" | Group ' + 'Separator |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\x1e" | Record ' + 'Separator |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\x85" | Next Line (C1 Control ' + 'Code) |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\u2028" | Line ' + 'Separator |\n' + ' ' + '+-------------------------+-------------------------------+\n' + ' | "\\u2029" | Paragraph ' + 'Separator |\n' + ' ' + '+-------------------------+-------------------------------+\n' + '\n' + ' Changed in version 3.2: "\\v" and "\\f" added to list ' + 'of line\n' + ' boundaries.\n' + '\n' + ' For example:\n' + '\n' + " >>> 'ab c\\n\\nde fg\\rkl\\r\\n'.splitlines()\n" + " ['ab c', '', 'de fg', 'kl']\n" + " >>> 'ab c\\n\\nde " + "fg\\rkl\\r\\n'.splitlines(keepends=True)\n" + " ['ab c\\n', '\\n', 'de fg\\r', 'kl\\r\\n']\n" + '\n' + ' Unlike "split()" when a delimiter string *sep* is ' + 'given, this\n' + ' method returns an empty list for the empty string, and ' + 'a terminal\n' + ' line break does not result in an extra line:\n' + '\n' + ' >>> "".splitlines()\n' + ' []\n' + ' >>> "One line\\n".splitlines()\n' + " ['One line']\n" + '\n' + ' For comparison, "split(\'\\n\')" gives:\n' + '\n' + " >>> ''.split('\\n')\n" + " ['']\n" + " >>> 'Two lines\\n'.split('\\n')\n" + " ['Two lines', '']\n" + '\n' + 'str.startswith(prefix[, start[, end]])\n' + '\n' + ' Return "True" if string starts with the *prefix*, ' + 'otherwise return\n' + ' "False". *prefix* can also be a tuple of prefixes to ' + 'look for.\n' + ' With optional *start*, test string beginning at that ' + 'position.\n' + ' With optional *end*, stop comparing string at that ' + 'position.\n' + '\n' + 'str.strip([chars])\n' + '\n' + ' Return a copy of the string with the leading and ' + 'trailing\n' + ' characters removed. The *chars* argument is a string ' + 'specifying the\n' + ' set of characters to be removed. If omitted or "None", ' + 'the *chars*\n' + ' argument defaults to removing whitespace. The *chars* ' + 'argument is\n' + ' not a prefix or suffix; rather, all combinations of its ' + 'values are\n' + ' stripped:\n' + '\n' + " >>> ' spacious '.strip()\n" + " 'spacious'\n" + " >>> 'www.example.com'.strip('cmowz.')\n" + " 'example'\n" + '\n' + ' The outermost leading and trailing *chars* argument ' + 'values are\n' + ' stripped from the string. Characters are removed from ' + 'the leading\n' + ' end until reaching a string character that is not ' + 'contained in the\n' + ' set of characters in *chars*. A similar action takes ' + 'place on the\n' + ' trailing end. For example:\n' + '\n' + " >>> comment_string = '#....... Section 3.2.1 Issue " + "#32 .......'\n" + " >>> comment_string.strip('.#! ')\n" + " 'Section 3.2.1 Issue #32'\n" + '\n' + 'str.swapcase()\n' + '\n' + ' Return a copy of the string with uppercase characters ' + 'converted to\n' + ' lowercase and vice versa. Note that it is not ' + 'necessarily true that\n' + ' "s.swapcase().swapcase() == s".\n' + '\n' + 'str.title()\n' + '\n' + ' Return a titlecased version of the string where words ' + 'start with an\n' + ' uppercase character and the remaining characters are ' + 'lowercase.\n' + '\n' + ' For example:\n' + '\n' + " >>> 'Hello world'.title()\n" + " 'Hello World'\n" + '\n' + ' The algorithm uses a simple language-independent ' + 'definition of a\n' + ' word as groups of consecutive letters. The definition ' + 'works in\n' + ' many contexts but it means that apostrophes in ' + 'contractions and\n' + ' possessives form word boundaries, which may not be the ' + 'desired\n' + ' result:\n' + '\n' + ' >>> "they\'re bill\'s friends from the UK".title()\n' + ' "They\'Re Bill\'S Friends From The Uk"\n' + '\n' + ' A workaround for apostrophes can be constructed using ' + 'regular\n' + ' expressions:\n' + '\n' + ' >>> import re\n' + ' >>> def titlecase(s):\n' + ' ... return re.sub(r"[A-Za-z]+(\'[A-Za-z]+)?",\n' + ' ... lambda mo: ' + 'mo.group(0)[0].upper() +\n' + ' ... ' + 'mo.group(0)[1:].lower(),\n' + ' ... s)\n' + ' ...\n' + ' >>> titlecase("they\'re bill\'s friends.")\n' + ' "They\'re Bill\'s Friends."\n' + '\n' + 'str.translate(table)\n' + '\n' + ' Return a copy of the string in which each character has ' + 'been mapped\n' + ' through the given translation table. The table must be ' + 'an object\n' + ' that implements indexing via "__getitem__()", typically ' + 'a *mapping*\n' + ' or *sequence*. When indexed by a Unicode ordinal (an ' + 'integer), the\n' + ' table object can do any of the following: return a ' + 'Unicode ordinal\n' + ' or a string, to map the character to one or more other ' + 'characters;\n' + ' return "None", to delete the character from the return ' + 'string; or\n' + ' raise a "LookupError" exception, to map the character ' + 'to itself.\n' + '\n' + ' You can use "str.maketrans()" to create a translation ' + 'map from\n' + ' character-to-character mappings in different formats.\n' + '\n' + ' See also the "codecs" module for a more flexible ' + 'approach to custom\n' + ' character mappings.\n' + '\n' + 'str.upper()\n' + '\n' + ' Return a copy of the string with all the cased ' + 'characters [4]\n' + ' converted to uppercase. Note that ' + '"str.upper().isupper()" might be\n' + ' "False" if "s" contains uncased characters or if the ' + 'Unicode\n' + ' category of the resulting character(s) is not "Lu" ' + '(Letter,\n' + ' uppercase), but e.g. "Lt" (Letter, titlecase).\n' + '\n' + ' The uppercasing algorithm used is described in section ' + '3.13 of the\n' + ' Unicode Standard.\n' + '\n' + 'str.zfill(width)\n' + '\n' + ' Return a copy of the string left filled with ASCII ' + '"\'0\'" digits to\n' + ' make a string of length *width*. A leading sign prefix\n' + ' ("\'+\'"/"\'-\'") is handled by inserting the padding ' + '*after* the sign\n' + ' character rather than before. The original string is ' + 'returned if\n' + ' *width* is less than or equal to "len(s)".\n' + '\n' + ' For example:\n' + '\n' + ' >>> "42".zfill(5)\n' + " '00042'\n" + ' >>> "-42".zfill(5)\n' + " '-0042'\n", + 'strings': '\n' + 'String and Bytes literals\n' + '*************************\n' + '\n' + 'String literals are described by the following lexical ' + 'definitions:\n' + '\n' + ' stringliteral ::= [stringprefix](shortstring | longstring)\n' + ' stringprefix ::= "r" | "u" | "R" | "U" | "f" | "F"\n' + ' | "fr" | "Fr" | "fR" | "FR" | "rf" | "rF" | ' + '"Rf" | "RF"\n' + ' shortstring ::= "\'" shortstringitem* "\'" | \'"\' ' + 'shortstringitem* \'"\'\n' + ' longstring ::= "\'\'\'" longstringitem* "\'\'\'" | ' + '\'"""\' longstringitem* \'"""\'\n' + ' shortstringitem ::= shortstringchar | stringescapeseq\n' + ' longstringitem ::= longstringchar | stringescapeseq\n' + ' shortstringchar ::= \n' + ' longstringchar ::= \n' + ' stringescapeseq ::= "\\" \n' + '\n' + ' bytesliteral ::= bytesprefix(shortbytes | longbytes)\n' + ' bytesprefix ::= "b" | "B" | "br" | "Br" | "bR" | "BR" | ' + '"rb" | "rB" | "Rb" | "RB"\n' + ' shortbytes ::= "\'" shortbytesitem* "\'" | \'"\' ' + 'shortbytesitem* \'"\'\n' + ' longbytes ::= "\'\'\'" longbytesitem* "\'\'\'" | \'"""\' ' + 'longbytesitem* \'"""\'\n' + ' shortbytesitem ::= shortbyteschar | bytesescapeseq\n' + ' longbytesitem ::= longbyteschar | bytesescapeseq\n' + ' shortbyteschar ::= \n' + ' longbyteschar ::= \n' + ' bytesescapeseq ::= "\\" \n' + '\n' + 'One syntactic restriction not indicated by these productions is ' + 'that\n' + 'whitespace is not allowed between the "stringprefix" or ' + '"bytesprefix"\n' + 'and the rest of the literal. The source character set is defined ' + 'by\n' + 'the encoding declaration; it is UTF-8 if no encoding declaration ' + 'is\n' + 'given in the source file; see section Encoding declarations.\n' + '\n' + 'In plain English: Both types of literals can be enclosed in ' + 'matching\n' + 'single quotes ("\'") or double quotes ("""). They can also be ' + 'enclosed\n' + 'in matching groups of three single or double quotes (these are\n' + 'generally referred to as *triple-quoted strings*). The ' + 'backslash\n' + '("\\") character is used to escape characters that otherwise have ' + 'a\n' + 'special meaning, such as newline, backslash itself, or the quote\n' + 'character.\n' + '\n' + 'Bytes literals are always prefixed with "\'b\'" or "\'B\'"; they ' + 'produce\n' + 'an instance of the "bytes" type instead of the "str" type. They ' + 'may\n' + 'only contain ASCII characters; bytes with a numeric value of 128 ' + 'or\n' + 'greater must be expressed with escapes.\n' + '\n' + 'As of Python 3.3 it is possible again to prefix string literals ' + 'with a\n' + '"u" prefix to simplify maintenance of dual 2.x and 3.x ' + 'codebases.\n' + '\n' + 'Both string and bytes literals may optionally be prefixed with a\n' + 'letter "\'r\'" or "\'R\'"; such strings are called *raw strings* ' + 'and treat\n' + 'backslashes as literal characters. As a result, in string ' + 'literals,\n' + '"\'\\U\'" and "\'\\u\'" escapes in raw strings are not treated ' + 'specially.\n' + "Given that Python 2.x's raw unicode literals behave differently " + 'than\n' + 'Python 3.x\'s the "\'ur\'" syntax is not supported.\n' + '\n' + 'New in version 3.3: The "\'rb\'" prefix of raw bytes literals has ' + 'been\n' + 'added as a synonym of "\'br\'".\n' + '\n' + 'New in version 3.3: Support for the unicode legacy literal\n' + '("u\'value\'") was reintroduced to simplify the maintenance of ' + 'dual\n' + 'Python 2.x and 3.x codebases. See **PEP 414** for more ' + 'information.\n' + '\n' + 'A string literal with "\'f\'" or "\'F\'" in its prefix is a ' + '*formatted\n' + 'string literal*; see Formatted string literals. The "\'f\'" may ' + 'be\n' + 'combined with "\'r\'", but not with "\'b\'" or "\'u\'", therefore ' + 'raw\n' + 'formatted strings are possible, but formatted bytes literals are ' + 'not.\n' + '\n' + 'In triple-quoted literals, unescaped newlines and quotes are ' + 'allowed\n' + '(and are retained), except that three unescaped quotes in a row\n' + 'terminate the literal. (A "quote" is the character used to open ' + 'the\n' + 'literal, i.e. either "\'" or """.)\n' + '\n' + 'Unless an "\'r\'" or "\'R\'" prefix is present, escape sequences ' + 'in string\n' + 'and bytes literals are interpreted according to rules similar to ' + 'those\n' + 'used by Standard C. The recognized escape sequences are:\n' + '\n' + '+-------------------+-----------------------------------+---------+\n' + '| Escape Sequence | Meaning | Notes ' + '|\n' + '+===================+===================================+=========+\n' + '| "\\newline" | Backslash and newline ignored ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\\\" | Backslash ("\\") ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\\'" | Single quote ("\'") ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\"" | Double quote (""") ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\a" | ASCII Bell (BEL) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\b" | ASCII Backspace (BS) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\f" | ASCII Formfeed (FF) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\n" | ASCII Linefeed (LF) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\r" | ASCII Carriage Return (CR) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\t" | ASCII Horizontal Tab (TAB) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\v" | ASCII Vertical Tab (VT) ' + '| |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\ooo" | Character with octal value *ooo* | ' + '(1,3) |\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\xhh" | Character with hex value *hh* | ' + '(2,3) |\n' + '+-------------------+-----------------------------------+---------+\n' + '\n' + 'Escape sequences only recognized in string literals are:\n' + '\n' + '+-------------------+-----------------------------------+---------+\n' + '| Escape Sequence | Meaning | Notes ' + '|\n' + '+===================+===================================+=========+\n' + '| "\\N{name}" | Character named *name* in the | ' + '(4) |\n' + '| | Unicode database | ' + '|\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\uxxxx" | Character with 16-bit hex value | ' + '(5) |\n' + '| | *xxxx* | ' + '|\n' + '+-------------------+-----------------------------------+---------+\n' + '| "\\Uxxxxxxxx" | Character with 32-bit hex value | ' + '(6) |\n' + '| | *xxxxxxxx* | ' + '|\n' + '+-------------------+-----------------------------------+---------+\n' + '\n' + 'Notes:\n' + '\n' + '1. As in Standard C, up to three octal digits are accepted.\n' + '\n' + '2. Unlike in Standard C, exactly two hex digits are required.\n' + '\n' + '3. In a bytes literal, hexadecimal and octal escapes denote the\n' + ' byte with the given value. In a string literal, these escapes\n' + ' denote a Unicode character with the given value.\n' + '\n' + '4. Changed in version 3.3: Support for name aliases [1] has been\n' + ' added.\n' + '\n' + '5. Exactly four hex digits are required.\n' + '\n' + '6. Any Unicode character can be encoded this way. Exactly eight\n' + ' hex digits are required.\n' + '\n' + 'Unlike Standard C, all unrecognized escape sequences are left in ' + 'the\n' + 'string unchanged, i.e., *the backslash is left in the result*. ' + '(This\n' + 'behavior is useful when debugging: if an escape sequence is ' + 'mistyped,\n' + 'the resulting output is more easily recognized as broken.) It is ' + 'also\n' + 'important to note that the escape sequences only recognized in ' + 'string\n' + 'literals fall into the category of unrecognized escapes for ' + 'bytes\n' + 'literals.\n' + '\n' + ' Changed in version 3.6: Unrecognized escape sequences produce ' + 'a\n' + ' DeprecationWarning. In some future version of Python they ' + 'will be\n' + ' a SyntaxError.\n' + '\n' + 'Even in a raw literal, quotes can be escaped with a backslash, ' + 'but the\n' + 'backslash remains in the result; for example, "r"\\""" is a ' + 'valid\n' + 'string literal consisting of two characters: a backslash and a ' + 'double\n' + 'quote; "r"\\"" is not a valid string literal (even a raw string ' + 'cannot\n' + 'end in an odd number of backslashes). Specifically, *a raw ' + 'literal\n' + 'cannot end in a single backslash* (since the backslash would ' + 'escape\n' + 'the following quote character). Note also that a single ' + 'backslash\n' + 'followed by a newline is interpreted as those two characters as ' + 'part\n' + 'of the literal, *not* as a line continuation.\n', + 'subscriptions': '\n' + 'Subscriptions\n' + '*************\n' + '\n' + 'A subscription selects an item of a sequence (string, tuple ' + 'or list)\n' + 'or mapping (dictionary) object:\n' + '\n' + ' subscription ::= primary "[" expression_list "]"\n' + '\n' + 'The primary must evaluate to an object that supports ' + 'subscription\n' + '(lists or dictionaries for example). User-defined objects ' + 'can support\n' + 'subscription by defining a "__getitem__()" method.\n' + '\n' + 'For built-in objects, there are two types of objects that ' + 'support\n' + 'subscription:\n' + '\n' + 'If the primary is a mapping, the expression list must ' + 'evaluate to an\n' + 'object whose value is one of the keys of the mapping, and ' + 'the\n' + 'subscription selects the value in the mapping that ' + 'corresponds to that\n' + 'key. (The expression list is a tuple except if it has ' + 'exactly one\n' + 'item.)\n' + '\n' + 'If the primary is a sequence, the expression (list) must ' + 'evaluate to\n' + 'an integer or a slice (as discussed in the following ' + 'section).\n' + '\n' + 'The formal syntax makes no special provision for negative ' + 'indices in\n' + 'sequences; however, built-in sequences all provide a ' + '"__getitem__()"\n' + 'method that interprets negative indices by adding the ' + 'length of the\n' + 'sequence to the index (so that "x[-1]" selects the last ' + 'item of "x").\n' + 'The resulting value must be a nonnegative integer less than ' + 'the number\n' + 'of items in the sequence, and the subscription selects the ' + 'item whose\n' + 'index is that value (counting from zero). Since the support ' + 'for\n' + "negative indices and slicing occurs in the object's " + '"__getitem__()"\n' + 'method, subclasses overriding this method will need to ' + 'explicitly add\n' + 'that support.\n' + '\n' + "A string's items are characters. A character is not a " + 'separate data\n' + 'type but a string of exactly one character.\n', + 'truth': '\n' + 'Truth Value Testing\n' + '*******************\n' + '\n' + 'Any object can be tested for truth value, for use in an "if" or\n' + '"while" condition or as operand of the Boolean operations below. ' + 'The\n' + 'following values are considered false:\n' + '\n' + '* "None"\n' + '\n' + '* "False"\n' + '\n' + '* zero of any numeric type, for example, "0", "0.0", "0j".\n' + '\n' + '* any empty sequence, for example, "\'\'", "()", "[]".\n' + '\n' + '* any empty mapping, for example, "{}".\n' + '\n' + '* instances of user-defined classes, if the class defines a\n' + ' "__bool__()" or "__len__()" method, when that method returns the\n' + ' integer zero or "bool" value "False". [1]\n' + '\n' + 'All other values are considered true --- so objects of many types ' + 'are\n' + 'always true.\n' + '\n' + 'Operations and built-in functions that have a Boolean result ' + 'always\n' + 'return "0" or "False" for false and "1" or "True" for true, unless\n' + 'otherwise stated. (Important exception: the Boolean operations ' + '"or"\n' + 'and "and" always return one of their operands.)\n', + 'try': '\n' + 'The "try" statement\n' + '*******************\n' + '\n' + 'The "try" statement specifies exception handlers and/or cleanup code\n' + 'for a group of statements:\n' + '\n' + ' try_stmt ::= try1_stmt | try2_stmt\n' + ' try1_stmt ::= "try" ":" suite\n' + ' ("except" [expression ["as" identifier]] ":" ' + 'suite)+\n' + ' ["else" ":" suite]\n' + ' ["finally" ":" suite]\n' + ' try2_stmt ::= "try" ":" suite\n' + ' "finally" ":" suite\n' + '\n' + 'The "except" clause(s) specify one or more exception handlers. When ' + 'no\n' + 'exception occurs in the "try" clause, no exception handler is\n' + 'executed. When an exception occurs in the "try" suite, a search for ' + 'an\n' + 'exception handler is started. This search inspects the except ' + 'clauses\n' + 'in turn until one is found that matches the exception. An ' + 'expression-\n' + 'less except clause, if present, must be last; it matches any\n' + 'exception. For an except clause with an expression, that expression\n' + 'is evaluated, and the clause matches the exception if the resulting\n' + 'object is "compatible" with the exception. An object is compatible\n' + 'with an exception if it is the class or a base class of the ' + 'exception\n' + 'object or a tuple containing an item compatible with the exception.\n' + '\n' + 'If no except clause matches the exception, the search for an ' + 'exception\n' + 'handler continues in the surrounding code and on the invocation ' + 'stack.\n' + '[1]\n' + '\n' + 'If the evaluation of an expression in the header of an except clause\n' + 'raises an exception, the original search for a handler is canceled ' + 'and\n' + 'a search starts for the new exception in the surrounding code and on\n' + 'the call stack (it is treated as if the entire "try" statement ' + 'raised\n' + 'the exception).\n' + '\n' + 'When a matching except clause is found, the exception is assigned to\n' + 'the target specified after the "as" keyword in that except clause, ' + 'if\n' + "present, and the except clause's suite is executed. All except\n" + 'clauses must have an executable block. When the end of this block ' + 'is\n' + 'reached, execution continues normally after the entire try ' + 'statement.\n' + '(This means that if two nested handlers exist for the same ' + 'exception,\n' + 'and the exception occurs in the try clause of the inner handler, the\n' + 'outer handler will not handle the exception.)\n' + '\n' + 'When an exception has been assigned using "as target", it is cleared\n' + 'at the end of the except clause. This is as if\n' + '\n' + ' except E as N:\n' + ' foo\n' + '\n' + 'was translated to\n' + '\n' + ' except E as N:\n' + ' try:\n' + ' foo\n' + ' finally:\n' + ' del N\n' + '\n' + 'This means the exception must be assigned to a different name to be\n' + 'able to refer to it after the except clause. Exceptions are cleared\n' + 'because with the traceback attached to them, they form a reference\n' + 'cycle with the stack frame, keeping all locals in that frame alive\n' + 'until the next garbage collection occurs.\n' + '\n' + "Before an except clause's suite is executed, details about the\n" + 'exception are stored in the "sys" module and can be accessed via\n' + '"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting of ' + 'the\n' + 'exception class, the exception instance and a traceback object (see\n' + 'section The standard type hierarchy) identifying the point in the\n' + 'program where the exception occurred. "sys.exc_info()" values are\n' + 'restored to their previous values (before the call) when returning\n' + 'from a function that handled an exception.\n' + '\n' + 'The optional "else" clause is executed if and when control flows off\n' + 'the end of the "try" clause. [2] Exceptions in the "else" clause are\n' + 'not handled by the preceding "except" clauses.\n' + '\n' + 'If "finally" is present, it specifies a \'cleanup\' handler. The ' + '"try"\n' + 'clause is executed, including any "except" and "else" clauses. If ' + 'an\n' + 'exception occurs in any of the clauses and is not handled, the\n' + 'exception is temporarily saved. The "finally" clause is executed. ' + 'If\n' + 'there is a saved exception it is re-raised at the end of the ' + '"finally"\n' + 'clause. If the "finally" clause raises another exception, the saved\n' + 'exception is set as the context of the new exception. If the ' + '"finally"\n' + 'clause executes a "return" or "break" statement, the saved exception\n' + 'is discarded:\n' + '\n' + ' >>> def f():\n' + ' ... try:\n' + ' ... 1/0\n' + ' ... finally:\n' + ' ... return 42\n' + ' ...\n' + ' >>> f()\n' + ' 42\n' + '\n' + 'The exception information is not available to the program during\n' + 'execution of the "finally" clause.\n' + '\n' + 'When a "return", "break" or "continue" statement is executed in the\n' + '"try" suite of a "try"..."finally" statement, the "finally" clause ' + 'is\n' + 'also executed \'on the way out.\' A "continue" statement is illegal ' + 'in\n' + 'the "finally" clause. (The reason is a problem with the current\n' + 'implementation --- this restriction may be lifted in the future).\n' + '\n' + 'The return value of a function is determined by the last "return"\n' + 'statement executed. Since the "finally" clause always executes, a\n' + '"return" statement executed in the "finally" clause will always be ' + 'the\n' + 'last one executed:\n' + '\n' + ' >>> def foo():\n' + ' ... try:\n' + " ... return 'try'\n" + ' ... finally:\n' + " ... return 'finally'\n" + ' ...\n' + ' >>> foo()\n' + " 'finally'\n" + '\n' + 'Additional information on exceptions can be found in section\n' + 'Exceptions, and information on using the "raise" statement to ' + 'generate\n' + 'exceptions may be found in section The raise statement.\n', + 'types': '\n' + 'The standard type hierarchy\n' + '***************************\n' + '\n' + 'Below is a list of the types that are built into Python. ' + 'Extension\n' + 'modules (written in C, Java, or other languages, depending on the\n' + 'implementation) can define additional types. Future versions of\n' + 'Python may add types to the type hierarchy (e.g., rational ' + 'numbers,\n' + 'efficiently stored arrays of integers, etc.), although such ' + 'additions\n' + 'will often be provided via the standard library instead.\n' + '\n' + 'Some of the type descriptions below contain a paragraph listing\n' + "'special attributes.' These are attributes that provide access to " + 'the\n' + 'implementation and are not intended for general use. Their ' + 'definition\n' + 'may change in the future.\n' + '\n' + 'None\n' + ' This type has a single value. There is a single object with ' + 'this\n' + ' value. This object is accessed through the built-in name "None". ' + 'It\n' + ' is used to signify the absence of a value in many situations, ' + 'e.g.,\n' + " it is returned from functions that don't explicitly return\n" + ' anything. Its truth value is false.\n' + '\n' + 'NotImplemented\n' + ' This type has a single value. There is a single object with ' + 'this\n' + ' value. This object is accessed through the built-in name\n' + ' "NotImplemented". Numeric methods and rich comparison methods\n' + ' should return this value if they do not implement the operation ' + 'for\n' + ' the operands provided. (The interpreter will then try the\n' + ' reflected operation, or some other fallback, depending on the\n' + ' operator.) Its truth value is true.\n' + '\n' + ' See Implementing the arithmetic operations for more details.\n' + '\n' + 'Ellipsis\n' + ' This type has a single value. There is a single object with ' + 'this\n' + ' value. This object is accessed through the literal "..." or the\n' + ' built-in name "Ellipsis". Its truth value is true.\n' + '\n' + '"numbers.Number"\n' + ' These are created by numeric literals and returned as results ' + 'by\n' + ' arithmetic operators and arithmetic built-in functions. ' + 'Numeric\n' + ' objects are immutable; once created their value never changes.\n' + ' Python numbers are of course strongly related to mathematical\n' + ' numbers, but subject to the limitations of numerical ' + 'representation\n' + ' in computers.\n' + '\n' + ' Python distinguishes between integers, floating point numbers, ' + 'and\n' + ' complex numbers:\n' + '\n' + ' "numbers.Integral"\n' + ' These represent elements from the mathematical set of ' + 'integers\n' + ' (positive and negative).\n' + '\n' + ' There are two types of integers:\n' + '\n' + ' Integers ("int")\n' + '\n' + ' These represent numbers in an unlimited range, subject to\n' + ' available (virtual) memory only. For the purpose of ' + 'shift\n' + ' and mask operations, a binary representation is assumed, ' + 'and\n' + " negative numbers are represented in a variant of 2's\n" + ' complement which gives the illusion of an infinite string ' + 'of\n' + ' sign bits extending to the left.\n' + '\n' + ' Booleans ("bool")\n' + ' These represent the truth values False and True. The two\n' + ' objects representing the values "False" and "True" are ' + 'the\n' + ' only Boolean objects. The Boolean type is a subtype of ' + 'the\n' + ' integer type, and Boolean values behave like the values 0 ' + 'and\n' + ' 1, respectively, in almost all contexts, the exception ' + 'being\n' + ' that when converted to a string, the strings ""False"" or\n' + ' ""True"" are returned, respectively.\n' + '\n' + ' The rules for integer representation are intended to give ' + 'the\n' + ' most meaningful interpretation of shift and mask operations\n' + ' involving negative integers.\n' + '\n' + ' "numbers.Real" ("float")\n' + ' These represent machine-level double precision floating ' + 'point\n' + ' numbers. You are at the mercy of the underlying machine\n' + ' architecture (and C or Java implementation) for the accepted\n' + ' range and handling of overflow. Python does not support ' + 'single-\n' + ' precision floating point numbers; the savings in processor ' + 'and\n' + ' memory usage that are usually the reason for using these are\n' + ' dwarfed by the overhead of using objects in Python, so there ' + 'is\n' + ' no reason to complicate the language with two kinds of ' + 'floating\n' + ' point numbers.\n' + '\n' + ' "numbers.Complex" ("complex")\n' + ' These represent complex numbers as a pair of machine-level\n' + ' double precision floating point numbers. The same caveats ' + 'apply\n' + ' as for floating point numbers. The real and imaginary parts ' + 'of a\n' + ' complex number "z" can be retrieved through the read-only\n' + ' attributes "z.real" and "z.imag".\n' + '\n' + 'Sequences\n' + ' These represent finite ordered sets indexed by non-negative\n' + ' numbers. The built-in function "len()" returns the number of ' + 'items\n' + ' of a sequence. When the length of a sequence is *n*, the index ' + 'set\n' + ' contains the numbers 0, 1, ..., *n*-1. Item *i* of sequence *a* ' + 'is\n' + ' selected by "a[i]".\n' + '\n' + ' Sequences also support slicing: "a[i:j]" selects all items with\n' + ' index *k* such that *i* "<=" *k* "<" *j*. When used as an\n' + ' expression, a slice is a sequence of the same type. This ' + 'implies\n' + ' that the index set is renumbered so that it starts at 0.\n' + '\n' + ' Some sequences also support "extended slicing" with a third ' + '"step"\n' + ' parameter: "a[i:j:k]" selects all items of *a* with index *x* ' + 'where\n' + ' "x = i + n*k", *n* ">=" "0" and *i* "<=" *x* "<" *j*.\n' + '\n' + ' Sequences are distinguished according to their mutability:\n' + '\n' + ' Immutable sequences\n' + ' An object of an immutable sequence type cannot change once it ' + 'is\n' + ' created. (If the object contains references to other ' + 'objects,\n' + ' these other objects may be mutable and may be changed; ' + 'however,\n' + ' the collection of objects directly referenced by an ' + 'immutable\n' + ' object cannot change.)\n' + '\n' + ' The following types are immutable sequences:\n' + '\n' + ' Strings\n' + ' A string is a sequence of values that represent Unicode ' + 'code\n' + ' points. All the code points in the range "U+0000 - ' + 'U+10FFFF"\n' + " can be represented in a string. Python doesn't have a " + '"char"\n' + ' type; instead, every code point in the string is ' + 'represented\n' + ' as a string object with length "1". The built-in ' + 'function\n' + ' "ord()" converts a code point from its string form to an\n' + ' integer in the range "0 - 10FFFF"; "chr()" converts an\n' + ' integer in the range "0 - 10FFFF" to the corresponding ' + 'length\n' + ' "1" string object. "str.encode()" can be used to convert ' + 'a\n' + ' "str" to "bytes" using the given text encoding, and\n' + ' "bytes.decode()" can be used to achieve the opposite.\n' + '\n' + ' Tuples\n' + ' The items of a tuple are arbitrary Python objects. Tuples ' + 'of\n' + ' two or more items are formed by comma-separated lists of\n' + " expressions. A tuple of one item (a 'singleton') can be\n" + ' formed by affixing a comma to an expression (an expression ' + 'by\n' + ' itself does not create a tuple, since parentheses must be\n' + ' usable for grouping of expressions). An empty tuple can ' + 'be\n' + ' formed by an empty pair of parentheses.\n' + '\n' + ' Bytes\n' + ' A bytes object is an immutable array. The items are ' + '8-bit\n' + ' bytes, represented by integers in the range 0 <= x < 256.\n' + ' Bytes literals (like "b\'abc\'") and the built-in ' + 'function\n' + ' "bytes()" can be used to construct bytes objects. Also,\n' + ' bytes objects can be decoded to strings via the ' + '"decode()"\n' + ' method.\n' + '\n' + ' Mutable sequences\n' + ' Mutable sequences can be changed after they are created. ' + 'The\n' + ' subscription and slicing notations can be used as the target ' + 'of\n' + ' assignment and "del" (delete) statements.\n' + '\n' + ' There are currently two intrinsic mutable sequence types:\n' + '\n' + ' Lists\n' + ' The items of a list are arbitrary Python objects. Lists ' + 'are\n' + ' formed by placing a comma-separated list of expressions ' + 'in\n' + ' square brackets. (Note that there are no special cases ' + 'needed\n' + ' to form lists of length 0 or 1.)\n' + '\n' + ' Byte Arrays\n' + ' A bytearray object is a mutable array. They are created ' + 'by\n' + ' the built-in "bytearray()" constructor. Aside from being\n' + ' mutable (and hence unhashable), byte arrays otherwise ' + 'provide\n' + ' the same interface and functionality as immutable bytes\n' + ' objects.\n' + '\n' + ' The extension module "array" provides an additional example ' + 'of a\n' + ' mutable sequence type, as does the "collections" module.\n' + '\n' + 'Set types\n' + ' These represent unordered, finite sets of unique, immutable\n' + ' objects. As such, they cannot be indexed by any subscript. ' + 'However,\n' + ' they can be iterated over, and the built-in function "len()"\n' + ' returns the number of items in a set. Common uses for sets are ' + 'fast\n' + ' membership testing, removing duplicates from a sequence, and\n' + ' computing mathematical operations such as intersection, union,\n' + ' difference, and symmetric difference.\n' + '\n' + ' For set elements, the same immutability rules apply as for\n' + ' dictionary keys. Note that numeric types obey the normal rules ' + 'for\n' + ' numeric comparison: if two numbers compare equal (e.g., "1" and\n' + ' "1.0"), only one of them can be contained in a set.\n' + '\n' + ' There are currently two intrinsic set types:\n' + '\n' + ' Sets\n' + ' These represent a mutable set. They are created by the ' + 'built-in\n' + ' "set()" constructor and can be modified afterwards by ' + 'several\n' + ' methods, such as "add()".\n' + '\n' + ' Frozen sets\n' + ' These represent an immutable set. They are created by the\n' + ' built-in "frozenset()" constructor. As a frozenset is ' + 'immutable\n' + ' and *hashable*, it can be used again as an element of ' + 'another\n' + ' set, or as a dictionary key.\n' + '\n' + 'Mappings\n' + ' These represent finite sets of objects indexed by arbitrary ' + 'index\n' + ' sets. The subscript notation "a[k]" selects the item indexed by ' + '"k"\n' + ' from the mapping "a"; this can be used in expressions and as ' + 'the\n' + ' target of assignments or "del" statements. The built-in ' + 'function\n' + ' "len()" returns the number of items in a mapping.\n' + '\n' + ' There is currently a single intrinsic mapping type:\n' + '\n' + ' Dictionaries\n' + ' These represent finite sets of objects indexed by nearly\n' + ' arbitrary values. The only types of values not acceptable ' + 'as\n' + ' keys are values containing lists or dictionaries or other\n' + ' mutable types that are compared by value rather than by ' + 'object\n' + ' identity, the reason being that the efficient implementation ' + 'of\n' + " dictionaries requires a key's hash value to remain constant.\n" + ' Numeric types used for keys obey the normal rules for ' + 'numeric\n' + ' comparison: if two numbers compare equal (e.g., "1" and ' + '"1.0")\n' + ' then they can be used interchangeably to index the same\n' + ' dictionary entry.\n' + '\n' + ' Dictionaries are mutable; they can be created by the "{...}"\n' + ' notation (see section Dictionary displays).\n' + '\n' + ' The extension modules "dbm.ndbm" and "dbm.gnu" provide\n' + ' additional examples of mapping types, as does the ' + '"collections"\n' + ' module.\n' + '\n' + 'Callable types\n' + ' These are the types to which the function call operation (see\n' + ' section Calls) can be applied:\n' + '\n' + ' User-defined functions\n' + ' A user-defined function object is created by a function\n' + ' definition (see section Function definitions). It should be\n' + ' called with an argument list containing the same number of ' + 'items\n' + " as the function's formal parameter list.\n" + '\n' + ' Special attributes:\n' + '\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | Attribute | Meaning ' + '| |\n' + ' ' + '+===========================+=================================+=============+\n' + ' | "__doc__" | The function\'s ' + 'documentation | Writable |\n' + ' | | string, or "None" if ' + '| |\n' + ' | | unavailable; not inherited by ' + '| |\n' + ' | | subclasses ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__name__" | The function\'s ' + 'name | Writable |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__qualname__" | The function\'s *qualified ' + 'name* | Writable |\n' + ' | | New in version 3.3. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__module__" | The name of the module the ' + '| Writable |\n' + ' | | function was defined in, or ' + '| |\n' + ' | | "None" if unavailable. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__defaults__" | A tuple containing default ' + '| Writable |\n' + ' | | argument values for those ' + '| |\n' + ' | | arguments that have defaults, ' + '| |\n' + ' | | or "None" if no arguments have ' + '| |\n' + ' | | a default value ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__code__" | The code object representing ' + '| Writable |\n' + ' | | the compiled function body. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__globals__" | A reference to the dictionary ' + '| Read-only |\n' + " | | that holds the function's " + '| |\n' + ' | | global variables --- the global ' + '| |\n' + ' | | namespace of the module in ' + '| |\n' + ' | | which the function was defined. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__dict__" | The namespace supporting ' + '| Writable |\n' + ' | | arbitrary function attributes. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__closure__" | "None" or a tuple of cells that ' + '| Read-only |\n' + ' | | contain bindings for the ' + '| |\n' + " | | function's free variables. " + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__annotations__" | A dict containing annotations ' + '| Writable |\n' + ' | | of parameters. The keys of the ' + '| |\n' + ' | | dict are the parameter names, ' + '| |\n' + ' | | and "\'return\'" for the ' + 'return | |\n' + ' | | annotation, if provided. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + ' | "__kwdefaults__" | A dict containing defaults for ' + '| Writable |\n' + ' | | keyword-only parameters. ' + '| |\n' + ' ' + '+---------------------------+---------------------------------+-------------+\n' + '\n' + ' Most of the attributes labelled "Writable" check the type of ' + 'the\n' + ' assigned value.\n' + '\n' + ' Function objects also support getting and setting arbitrary\n' + ' attributes, which can be used, for example, to attach ' + 'metadata\n' + ' to functions. Regular attribute dot-notation is used to get ' + 'and\n' + ' set such attributes. *Note that the current implementation ' + 'only\n' + ' supports function attributes on user-defined functions. ' + 'Function\n' + ' attributes on built-in functions may be supported in the\n' + ' future.*\n' + '\n' + " Additional information about a function's definition can be\n" + ' retrieved from its code object; see the description of ' + 'internal\n' + ' types below.\n' + '\n' + ' Instance methods\n' + ' An instance method object combines a class, a class instance ' + 'and\n' + ' any callable object (normally a user-defined function).\n' + '\n' + ' Special read-only attributes: "__self__" is the class ' + 'instance\n' + ' object, "__func__" is the function object; "__doc__" is the\n' + ' method\'s documentation (same as "__func__.__doc__"); ' + '"__name__"\n' + ' is the method name (same as "__func__.__name__"); ' + '"__module__"\n' + ' is the name of the module the method was defined in, or ' + '"None"\n' + ' if unavailable.\n' + '\n' + ' Methods also support accessing (but not setting) the ' + 'arbitrary\n' + ' function attributes on the underlying function object.\n' + '\n' + ' User-defined method objects may be created when getting an\n' + ' attribute of a class (perhaps via an instance of that class), ' + 'if\n' + ' that attribute is a user-defined function object or a class\n' + ' method object.\n' + '\n' + ' When an instance method object is created by retrieving a ' + 'user-\n' + ' defined function object from a class via one of its ' + 'instances,\n' + ' its "__self__" attribute is the instance, and the method ' + 'object\n' + ' is said to be bound. The new method\'s "__func__" attribute ' + 'is\n' + ' the original function object.\n' + '\n' + ' When a user-defined method object is created by retrieving\n' + ' another method object from a class or instance, the behaviour ' + 'is\n' + ' the same as for a function object, except that the ' + '"__func__"\n' + ' attribute of the new instance is not the original method ' + 'object\n' + ' but its "__func__" attribute.\n' + '\n' + ' When an instance method object is created by retrieving a ' + 'class\n' + ' method object from a class or instance, its "__self__" ' + 'attribute\n' + ' is the class itself, and its "__func__" attribute is the\n' + ' function object underlying the class method.\n' + '\n' + ' When an instance method object is called, the underlying\n' + ' function ("__func__") is called, inserting the class ' + 'instance\n' + ' ("__self__") in front of the argument list. For instance, ' + 'when\n' + ' "C" is a class which contains a definition for a function ' + '"f()",\n' + ' and "x" is an instance of "C", calling "x.f(1)" is equivalent ' + 'to\n' + ' calling "C.f(x, 1)".\n' + '\n' + ' When an instance method object is derived from a class ' + 'method\n' + ' object, the "class instance" stored in "__self__" will ' + 'actually\n' + ' be the class itself, so that calling either "x.f(1)" or ' + '"C.f(1)"\n' + ' is equivalent to calling "f(C,1)" where "f" is the ' + 'underlying\n' + ' function.\n' + '\n' + ' Note that the transformation from function object to ' + 'instance\n' + ' method object happens each time the attribute is retrieved ' + 'from\n' + ' the instance. In some cases, a fruitful optimization is to\n' + ' assign the attribute to a local variable and call that local\n' + ' variable. Also notice that this transformation only happens ' + 'for\n' + ' user-defined functions; other callable objects (and all non-\n' + ' callable objects) are retrieved without transformation. It ' + 'is\n' + ' also important to note that user-defined functions which are\n' + ' attributes of a class instance are not converted to bound\n' + ' methods; this *only* happens when the function is an ' + 'attribute\n' + ' of the class.\n' + '\n' + ' Generator functions\n' + ' A function or method which uses the "yield" statement (see\n' + ' section The yield statement) is called a *generator ' + 'function*.\n' + ' Such a function, when called, always returns an iterator ' + 'object\n' + ' which can be used to execute the body of the function: ' + 'calling\n' + ' the iterator\'s "iterator.__next__()" method will cause the\n' + ' function to execute until it provides a value using the ' + '"yield"\n' + ' statement. When the function executes a "return" statement ' + 'or\n' + ' falls off the end, a "StopIteration" exception is raised and ' + 'the\n' + ' iterator will have reached the end of the set of values to ' + 'be\n' + ' returned.\n' + '\n' + ' Coroutine functions\n' + ' A function or method which is defined using "async def" is\n' + ' called a *coroutine function*. Such a function, when ' + 'called,\n' + ' returns a *coroutine* object. It may contain "await"\n' + ' expressions, as well as "async with" and "async for" ' + 'statements.\n' + ' See also the Coroutine Objects section.\n' + '\n' + ' Asynchronous generator functions\n' + ' A function or method which is defined using "async def" and\n' + ' which uses the "yield" statement is called a *asynchronous\n' + ' generator function*. Such a function, when called, returns ' + 'an\n' + ' asynchronous iterator object which can be used in an "async ' + 'for"\n' + ' statement to execute the body of the function.\n' + '\n' + ' Calling the asynchronous iterator\'s "aiterator.__anext__()"\n' + ' method will return an *awaitable* which when awaited will\n' + ' execute until it provides a value using the "yield" ' + 'expression.\n' + ' When the function executes an empty "return" statement or ' + 'falls\n' + ' off the end, a "StopAsyncIteration" exception is raised and ' + 'the\n' + ' asynchronous iterator will have reached the end of the set ' + 'of\n' + ' values to be yielded.\n' + '\n' + ' Built-in functions\n' + ' A built-in function object is a wrapper around a C function.\n' + ' Examples of built-in functions are "len()" and "math.sin()"\n' + ' ("math" is a standard built-in module). The number and type ' + 'of\n' + ' the arguments are determined by the C function. Special ' + 'read-\n' + ' only attributes: "__doc__" is the function\'s documentation\n' + ' string, or "None" if unavailable; "__name__" is the ' + "function's\n" + ' name; "__self__" is set to "None" (but see the next item);\n' + ' "__module__" is the name of the module the function was ' + 'defined\n' + ' in or "None" if unavailable.\n' + '\n' + ' Built-in methods\n' + ' This is really a different disguise of a built-in function, ' + 'this\n' + ' time containing an object passed to the C function as an\n' + ' implicit extra argument. An example of a built-in method is\n' + ' "alist.append()", assuming *alist* is a list object. In this\n' + ' case, the special read-only attribute "__self__" is set to ' + 'the\n' + ' object denoted by *alist*.\n' + '\n' + ' Classes\n' + ' Classes are callable. These objects normally act as ' + 'factories\n' + ' for new instances of themselves, but variations are possible ' + 'for\n' + ' class types that override "__new__()". The arguments of the\n' + ' call are passed to "__new__()" and, in the typical case, to\n' + ' "__init__()" to initialize the new instance.\n' + '\n' + ' Class Instances\n' + ' Instances of arbitrary classes can be made callable by ' + 'defining\n' + ' a "__call__()" method in their class.\n' + '\n' + 'Modules\n' + ' Modules are a basic organizational unit of Python code, and are\n' + ' created by the import system as invoked either by the "import"\n' + ' statement (see "import"), or by calling functions such as\n' + ' "importlib.import_module()" and built-in "__import__()". A ' + 'module\n' + ' object has a namespace implemented by a dictionary object (this ' + 'is\n' + ' the dictionary referenced by the "__globals__" attribute of\n' + ' functions defined in the module). Attribute references are\n' + ' translated to lookups in this dictionary, e.g., "m.x" is ' + 'equivalent\n' + ' to "m.__dict__["x"]". A module object does not contain the code\n' + " object used to initialize the module (since it isn't needed " + 'once\n' + ' the initialization is done).\n' + '\n' + " Attribute assignment updates the module's namespace dictionary,\n" + ' e.g., "m.x = 1" is equivalent to "m.__dict__["x"] = 1".\n' + '\n' + ' Predefined (writable) attributes: "__name__" is the module\'s ' + 'name;\n' + ' "__doc__" is the module\'s documentation string, or "None" if\n' + ' unavailable; "__annotations__" (optional) is a dictionary\n' + ' containing *variable annotations* collected during module body\n' + ' execution; "__file__" is the pathname of the file from which ' + 'the\n' + ' module was loaded, if it was loaded from a file. The "__file__"\n' + ' attribute may be missing for certain types of modules, such as ' + 'C\n' + ' modules that are statically linked into the interpreter; for\n' + ' extension modules loaded dynamically from a shared library, it ' + 'is\n' + ' the pathname of the shared library file.\n' + '\n' + ' Special read-only attribute: "__dict__" is the module\'s ' + 'namespace\n' + ' as a dictionary object.\n' + '\n' + ' **CPython implementation detail:** Because of the way CPython\n' + ' clears module dictionaries, the module dictionary will be ' + 'cleared\n' + ' when the module falls out of scope even if the dictionary still ' + 'has\n' + ' live references. To avoid this, copy the dictionary or keep ' + 'the\n' + ' module around while using its dictionary directly.\n' + '\n' + 'Custom classes\n' + ' Custom class types are typically created by class definitions ' + '(see\n' + ' section Class definitions). A class has a namespace implemented ' + 'by\n' + ' a dictionary object. Class attribute references are translated ' + 'to\n' + ' lookups in this dictionary, e.g., "C.x" is translated to\n' + ' "C.__dict__["x"]" (although there are a number of hooks which ' + 'allow\n' + ' for other means of locating attributes). When the attribute name ' + 'is\n' + ' not found there, the attribute search continues in the base\n' + ' classes. This search of the base classes uses the C3 method\n' + ' resolution order which behaves correctly even in the presence ' + 'of\n' + " 'diamond' inheritance structures where there are multiple\n" + ' inheritance paths leading back to a common ancestor. Additional\n' + ' details on the C3 MRO used by Python can be found in the\n' + ' documentation accompanying the 2.3 release at\n' + ' https://www.python.org/download/releases/2.3/mro/.\n' + '\n' + ' When a class attribute reference (for class "C", say) would ' + 'yield a\n' + ' class method object, it is transformed into an instance method\n' + ' object whose "__self__" attributes is "C". When it would yield ' + 'a\n' + ' static method object, it is transformed into the object wrapped ' + 'by\n' + ' the static method object. See section Implementing Descriptors ' + 'for\n' + ' another way in which attributes retrieved from a class may ' + 'differ\n' + ' from those actually contained in its "__dict__".\n' + '\n' + " Class attribute assignments update the class's dictionary, " + 'never\n' + ' the dictionary of a base class.\n' + '\n' + ' A class object can be called (see above) to yield a class ' + 'instance\n' + ' (see below).\n' + '\n' + ' Special attributes: "__name__" is the class name; "__module__" ' + 'is\n' + ' the module name in which the class was defined; "__dict__" is ' + 'the\n' + ' dictionary containing the class\'s namespace; "__bases__" is a ' + 'tuple\n' + ' (possibly empty or a singleton) containing the base classes, in ' + 'the\n' + ' order of their occurrence in the base class list; "__doc__" is ' + 'the\n' + ' class\'s documentation string, or "None" if undefined;\n' + ' "__annotations__" (optional) is a dictionary containing ' + '*variable\n' + ' annotations* collected during class body execution.\n' + '\n' + 'Class instances\n' + ' A class instance is created by calling a class object (see ' + 'above).\n' + ' A class instance has a namespace implemented as a dictionary ' + 'which\n' + ' is the first place in which attribute references are searched.\n' + " When an attribute is not found there, and the instance's class " + 'has\n' + ' an attribute by that name, the search continues with the class\n' + ' attributes. If a class attribute is found that is a ' + 'user-defined\n' + ' function object, it is transformed into an instance method ' + 'object\n' + ' whose "__self__" attribute is the instance. Static method and\n' + ' class method objects are also transformed; see above under\n' + ' "Classes". See section Implementing Descriptors for another way ' + 'in\n' + ' which attributes of a class retrieved via its instances may ' + 'differ\n' + ' from the objects actually stored in the class\'s "__dict__". If ' + 'no\n' + " class attribute is found, and the object's class has a\n" + ' "__getattr__()" method, that is called to satisfy the lookup.\n' + '\n' + " Attribute assignments and deletions update the instance's\n" + " dictionary, never a class's dictionary. If the class has a\n" + ' "__setattr__()" or "__delattr__()" method, this is called ' + 'instead\n' + ' of updating the instance dictionary directly.\n' + '\n' + ' Class instances can pretend to be numbers, sequences, or ' + 'mappings\n' + ' if they have methods with certain special names. See section\n' + ' Special method names.\n' + '\n' + ' Special attributes: "__dict__" is the attribute dictionary;\n' + ' "__class__" is the instance\'s class.\n' + '\n' + 'I/O objects (also known as file objects)\n' + ' A *file object* represents an open file. Various shortcuts are\n' + ' available to create file objects: the "open()" built-in ' + 'function,\n' + ' and also "os.popen()", "os.fdopen()", and the "makefile()" ' + 'method\n' + ' of socket objects (and perhaps by other functions or methods\n' + ' provided by extension modules).\n' + '\n' + ' The objects "sys.stdin", "sys.stdout" and "sys.stderr" are\n' + " initialized to file objects corresponding to the interpreter's\n" + ' standard input, output and error streams; they are all open in ' + 'text\n' + ' mode and therefore follow the interface defined by the\n' + ' "io.TextIOBase" abstract class.\n' + '\n' + 'Internal types\n' + ' A few types used internally by the interpreter are exposed to ' + 'the\n' + ' user. Their definitions may change with future versions of the\n' + ' interpreter, but they are mentioned here for completeness.\n' + '\n' + ' Code objects\n' + ' Code objects represent *byte-compiled* executable Python ' + 'code,\n' + ' or *bytecode*. The difference between a code object and a\n' + ' function object is that the function object contains an ' + 'explicit\n' + " reference to the function's globals (the module in which it " + 'was\n' + ' defined), while a code object contains no context; also the\n' + ' default argument values are stored in the function object, ' + 'not\n' + ' in the code object (because they represent values calculated ' + 'at\n' + ' run-time). Unlike function objects, code objects are ' + 'immutable\n' + ' and contain no references (directly or indirectly) to ' + 'mutable\n' + ' objects.\n' + '\n' + ' Special read-only attributes: "co_name" gives the function ' + 'name;\n' + ' "co_argcount" is the number of positional arguments ' + '(including\n' + ' arguments with default values); "co_nlocals" is the number ' + 'of\n' + ' local variables used by the function (including arguments);\n' + ' "co_varnames" is a tuple containing the names of the local\n' + ' variables (starting with the argument names); "co_cellvars" ' + 'is a\n' + ' tuple containing the names of local variables that are\n' + ' referenced by nested functions; "co_freevars" is a tuple\n' + ' containing the names of free variables; "co_code" is a ' + 'string\n' + ' representing the sequence of bytecode instructions; ' + '"co_consts"\n' + ' is a tuple containing the literals used by the bytecode;\n' + ' "co_names" is a tuple containing the names used by the ' + 'bytecode;\n' + ' "co_filename" is the filename from which the code was ' + 'compiled;\n' + ' "co_firstlineno" is the first line number of the function;\n' + ' "co_lnotab" is a string encoding the mapping from bytecode\n' + ' offsets to line numbers (for details see the source code of ' + 'the\n' + ' interpreter); "co_stacksize" is the required stack size\n' + ' (including local variables); "co_flags" is an integer ' + 'encoding a\n' + ' number of flags for the interpreter.\n' + '\n' + ' The following flag bits are defined for "co_flags": bit ' + '"0x04"\n' + ' is set if the function uses the "*arguments" syntax to accept ' + 'an\n' + ' arbitrary number of positional arguments; bit "0x08" is set ' + 'if\n' + ' the function uses the "**keywords" syntax to accept ' + 'arbitrary\n' + ' keyword arguments; bit "0x20" is set if the function is a\n' + ' generator.\n' + '\n' + ' Future feature declarations ("from __future__ import ' + 'division")\n' + ' also use bits in "co_flags" to indicate whether a code ' + 'object\n' + ' was compiled with a particular feature enabled: bit "0x2000" ' + 'is\n' + ' set if the function was compiled with future division ' + 'enabled;\n' + ' bits "0x10" and "0x1000" were used in earlier versions of\n' + ' Python.\n' + '\n' + ' Other bits in "co_flags" are reserved for internal use.\n' + '\n' + ' If a code object represents a function, the first item in\n' + ' "co_consts" is the documentation string of the function, or\n' + ' "None" if undefined.\n' + '\n' + ' Frame objects\n' + ' Frame objects represent execution frames. They may occur in\n' + ' traceback objects (see below).\n' + '\n' + ' Special read-only attributes: "f_back" is to the previous ' + 'stack\n' + ' frame (towards the caller), or "None" if this is the bottom\n' + ' stack frame; "f_code" is the code object being executed in ' + 'this\n' + ' frame; "f_locals" is the dictionary used to look up local\n' + ' variables; "f_globals" is used for global variables;\n' + ' "f_builtins" is used for built-in (intrinsic) names; ' + '"f_lasti"\n' + ' gives the precise instruction (this is an index into the\n' + ' bytecode string of the code object).\n' + '\n' + ' Special writable attributes: "f_trace", if not "None", is a\n' + ' function called at the start of each source code line (this ' + 'is\n' + ' used by the debugger); "f_lineno" is the current line number ' + 'of\n' + ' the frame --- writing to this from within a trace function ' + 'jumps\n' + ' to the given line (only for the bottom-most frame). A ' + 'debugger\n' + ' can implement a Jump command (aka Set Next Statement) by ' + 'writing\n' + ' to f_lineno.\n' + '\n' + ' Frame objects support one method:\n' + '\n' + ' frame.clear()\n' + '\n' + ' This method clears all references to local variables held ' + 'by\n' + ' the frame. Also, if the frame belonged to a generator, ' + 'the\n' + ' generator is finalized. This helps break reference ' + 'cycles\n' + ' involving frame objects (for example when catching an\n' + ' exception and storing its traceback for later use).\n' + '\n' + ' "RuntimeError" is raised if the frame is currently ' + 'executing.\n' + '\n' + ' New in version 3.4.\n' + '\n' + ' Traceback objects\n' + ' Traceback objects represent a stack trace of an exception. ' + 'A\n' + ' traceback object is created when an exception occurs. When ' + 'the\n' + ' search for an exception handler unwinds the execution stack, ' + 'at\n' + ' each unwound level a traceback object is inserted in front ' + 'of\n' + ' the current traceback. When an exception handler is ' + 'entered,\n' + ' the stack trace is made available to the program. (See ' + 'section\n' + ' The try statement.) It is accessible as the third item of ' + 'the\n' + ' tuple returned by "sys.exc_info()". When the program contains ' + 'no\n' + ' suitable handler, the stack trace is written (nicely ' + 'formatted)\n' + ' to the standard error stream; if the interpreter is ' + 'interactive,\n' + ' it is also made available to the user as ' + '"sys.last_traceback".\n' + '\n' + ' Special read-only attributes: "tb_next" is the next level in ' + 'the\n' + ' stack trace (towards the frame where the exception occurred), ' + 'or\n' + ' "None" if there is no next level; "tb_frame" points to the\n' + ' execution frame of the current level; "tb_lineno" gives the ' + 'line\n' + ' number where the exception occurred; "tb_lasti" indicates ' + 'the\n' + ' precise instruction. The line number and last instruction ' + 'in\n' + ' the traceback may differ from the line number of its frame\n' + ' object if the exception occurred in a "try" statement with ' + 'no\n' + ' matching except clause or with a finally clause.\n' + '\n' + ' Slice objects\n' + ' Slice objects are used to represent slices for ' + '"__getitem__()"\n' + ' methods. They are also created by the built-in "slice()"\n' + ' function.\n' + '\n' + ' Special read-only attributes: "start" is the lower bound; ' + '"stop"\n' + ' is the upper bound; "step" is the step value; each is "None" ' + 'if\n' + ' omitted. These attributes can have any type.\n' + '\n' + ' Slice objects support one method:\n' + '\n' + ' slice.indices(self, length)\n' + '\n' + ' This method takes a single integer argument *length* and\n' + ' computes information about the slice that the slice ' + 'object\n' + ' would describe if applied to a sequence of *length* ' + 'items.\n' + ' It returns a tuple of three integers; respectively these ' + 'are\n' + ' the *start* and *stop* indices and the *step* or stride\n' + ' length of the slice. Missing or out-of-bounds indices are\n' + ' handled in a manner consistent with regular slices.\n' + '\n' + ' Static method objects\n' + ' Static method objects provide a way of defeating the\n' + ' transformation of function objects to method objects ' + 'described\n' + ' above. A static method object is a wrapper around any other\n' + ' object, usually a user-defined method object. When a static\n' + ' method object is retrieved from a class or a class instance, ' + 'the\n' + ' object actually returned is the wrapped object, which is not\n' + ' subject to any further transformation. Static method objects ' + 'are\n' + ' not themselves callable, although the objects they wrap ' + 'usually\n' + ' are. Static method objects are created by the built-in\n' + ' "staticmethod()" constructor.\n' + '\n' + ' Class method objects\n' + ' A class method object, like a static method object, is a ' + 'wrapper\n' + ' around another object that alters the way in which that ' + 'object\n' + ' is retrieved from classes and class instances. The behaviour ' + 'of\n' + ' class method objects upon such retrieval is described above,\n' + ' under "User-defined methods". Class method objects are ' + 'created\n' + ' by the built-in "classmethod()" constructor.\n', + 'typesfunctions': '\n' + 'Functions\n' + '*********\n' + '\n' + 'Function objects are created by function definitions. The ' + 'only\n' + 'operation on a function object is to call it: ' + '"func(argument-list)".\n' + '\n' + 'There are really two flavors of function objects: built-in ' + 'functions\n' + 'and user-defined functions. Both support the same ' + 'operation (to call\n' + 'the function), but the implementation is different, hence ' + 'the\n' + 'different object types.\n' + '\n' + 'See Function definitions for more information.\n', + 'typesmapping': '\n' + 'Mapping Types --- "dict"\n' + '************************\n' + '\n' + 'A *mapping* object maps *hashable* values to arbitrary ' + 'objects.\n' + 'Mappings are mutable objects. There is currently only one ' + 'standard\n' + 'mapping type, the *dictionary*. (For other containers see ' + 'the built-\n' + 'in "list", "set", and "tuple" classes, and the "collections" ' + 'module.)\n' + '\n' + "A dictionary's keys are *almost* arbitrary values. Values " + 'that are\n' + 'not *hashable*, that is, values containing lists, ' + 'dictionaries or\n' + 'other mutable types (that are compared by value rather than ' + 'by object\n' + 'identity) may not be used as keys. Numeric types used for ' + 'keys obey\n' + 'the normal rules for numeric comparison: if two numbers ' + 'compare equal\n' + '(such as "1" and "1.0") then they can be used ' + 'interchangeably to index\n' + 'the same dictionary entry. (Note however, that since ' + 'computers store\n' + 'floating-point numbers as approximations it is usually ' + 'unwise to use\n' + 'them as dictionary keys.)\n' + '\n' + 'Dictionaries can be created by placing a comma-separated ' + 'list of "key:\n' + 'value" pairs within braces, for example: "{\'jack\': 4098, ' + "'sjoerd':\n" + '4127}" or "{4098: \'jack\', 4127: \'sjoerd\'}", or by the ' + '"dict"\n' + 'constructor.\n' + '\n' + 'class dict(**kwarg)\n' + 'class dict(mapping, **kwarg)\n' + 'class dict(iterable, **kwarg)\n' + '\n' + ' Return a new dictionary initialized from an optional ' + 'positional\n' + ' argument and a possibly empty set of keyword arguments.\n' + '\n' + ' If no positional argument is given, an empty dictionary ' + 'is created.\n' + ' If a positional argument is given and it is a mapping ' + 'object, a\n' + ' dictionary is created with the same key-value pairs as ' + 'the mapping\n' + ' object. Otherwise, the positional argument must be an ' + '*iterable*\n' + ' object. Each item in the iterable must itself be an ' + 'iterable with\n' + ' exactly two objects. The first object of each item ' + 'becomes a key\n' + ' in the new dictionary, and the second object the ' + 'corresponding\n' + ' value. If a key occurs more than once, the last value ' + 'for that key\n' + ' becomes the corresponding value in the new dictionary.\n' + '\n' + ' If keyword arguments are given, the keyword arguments and ' + 'their\n' + ' values are added to the dictionary created from the ' + 'positional\n' + ' argument. If a key being added is already present, the ' + 'value from\n' + ' the keyword argument replaces the value from the ' + 'positional\n' + ' argument.\n' + '\n' + ' To illustrate, the following examples all return a ' + 'dictionary equal\n' + ' to "{"one": 1, "two": 2, "three": 3}":\n' + '\n' + ' >>> a = dict(one=1, two=2, three=3)\n' + " >>> b = {'one': 1, 'two': 2, 'three': 3}\n" + " >>> c = dict(zip(['one', 'two', 'three'], [1, 2, 3]))\n" + " >>> d = dict([('two', 2), ('one', 1), ('three', 3)])\n" + " >>> e = dict({'three': 3, 'one': 1, 'two': 2})\n" + ' >>> a == b == c == d == e\n' + ' True\n' + '\n' + ' Providing keyword arguments as in the first example only ' + 'works for\n' + ' keys that are valid Python identifiers. Otherwise, any ' + 'valid keys\n' + ' can be used.\n' + '\n' + ' These are the operations that dictionaries support (and ' + 'therefore,\n' + ' custom mapping types should support too):\n' + '\n' + ' len(d)\n' + '\n' + ' Return the number of items in the dictionary *d*.\n' + '\n' + ' d[key]\n' + '\n' + ' Return the item of *d* with key *key*. Raises a ' + '"KeyError" if\n' + ' *key* is not in the map.\n' + '\n' + ' If a subclass of dict defines a method "__missing__()" ' + 'and *key*\n' + ' is not present, the "d[key]" operation calls that ' + 'method with\n' + ' the key *key* as argument. The "d[key]" operation ' + 'then returns\n' + ' or raises whatever is returned or raised by the\n' + ' "__missing__(key)" call. No other operations or ' + 'methods invoke\n' + ' "__missing__()". If "__missing__()" is not defined, ' + '"KeyError"\n' + ' is raised. "__missing__()" must be a method; it cannot ' + 'be an\n' + ' instance variable:\n' + '\n' + ' >>> class Counter(dict):\n' + ' ... def __missing__(self, key):\n' + ' ... return 0\n' + ' >>> c = Counter()\n' + " >>> c['red']\n" + ' 0\n' + " >>> c['red'] += 1\n" + " >>> c['red']\n" + ' 1\n' + '\n' + ' The example above shows part of the implementation of\n' + ' "collections.Counter". A different "__missing__" ' + 'method is used\n' + ' by "collections.defaultdict".\n' + '\n' + ' d[key] = value\n' + '\n' + ' Set "d[key]" to *value*.\n' + '\n' + ' del d[key]\n' + '\n' + ' Remove "d[key]" from *d*. Raises a "KeyError" if ' + '*key* is not\n' + ' in the map.\n' + '\n' + ' key in d\n' + '\n' + ' Return "True" if *d* has a key *key*, else "False".\n' + '\n' + ' key not in d\n' + '\n' + ' Equivalent to "not key in d".\n' + '\n' + ' iter(d)\n' + '\n' + ' Return an iterator over the keys of the dictionary. ' + 'This is a\n' + ' shortcut for "iter(d.keys())".\n' + '\n' + ' clear()\n' + '\n' + ' Remove all items from the dictionary.\n' + '\n' + ' copy()\n' + '\n' + ' Return a shallow copy of the dictionary.\n' + '\n' + ' classmethod fromkeys(seq[, value])\n' + '\n' + ' Create a new dictionary with keys from *seq* and ' + 'values set to\n' + ' *value*.\n' + '\n' + ' "fromkeys()" is a class method that returns a new ' + 'dictionary.\n' + ' *value* defaults to "None".\n' + '\n' + ' get(key[, default])\n' + '\n' + ' Return the value for *key* if *key* is in the ' + 'dictionary, else\n' + ' *default*. If *default* is not given, it defaults to ' + '"None", so\n' + ' that this method never raises a "KeyError".\n' + '\n' + ' items()\n' + '\n' + ' Return a new view of the dictionary\'s items ("(key, ' + 'value)"\n' + ' pairs). See the documentation of view objects.\n' + '\n' + ' keys()\n' + '\n' + " Return a new view of the dictionary's keys. See the\n" + ' documentation of view objects.\n' + '\n' + ' pop(key[, default])\n' + '\n' + ' If *key* is in the dictionary, remove it and return ' + 'its value,\n' + ' else return *default*. If *default* is not given and ' + '*key* is\n' + ' not in the dictionary, a "KeyError" is raised.\n' + '\n' + ' popitem()\n' + '\n' + ' Remove and return an arbitrary "(key, value)" pair ' + 'from the\n' + ' dictionary.\n' + '\n' + ' "popitem()" is useful to destructively iterate over a\n' + ' dictionary, as often used in set algorithms. If the ' + 'dictionary\n' + ' is empty, calling "popitem()" raises a "KeyError".\n' + '\n' + ' setdefault(key[, default])\n' + '\n' + ' If *key* is in the dictionary, return its value. If ' + 'not, insert\n' + ' *key* with a value of *default* and return *default*. ' + '*default*\n' + ' defaults to "None".\n' + '\n' + ' update([other])\n' + '\n' + ' Update the dictionary with the key/value pairs from ' + '*other*,\n' + ' overwriting existing keys. Return "None".\n' + '\n' + ' "update()" accepts either another dictionary object or ' + 'an\n' + ' iterable of key/value pairs (as tuples or other ' + 'iterables of\n' + ' length two). If keyword arguments are specified, the ' + 'dictionary\n' + ' is then updated with those key/value pairs: ' + '"d.update(red=1,\n' + ' blue=2)".\n' + '\n' + ' values()\n' + '\n' + " Return a new view of the dictionary's values. See " + 'the\n' + ' documentation of view objects.\n' + '\n' + ' Dictionaries compare equal if and only if they have the ' + 'same "(key,\n' + ' value)" pairs. Order comparisons (\'<\', \'<=\', \'>=\', ' + "'>') raise\n" + ' "TypeError".\n' + '\n' + 'See also: "types.MappingProxyType" can be used to create a ' + 'read-only\n' + ' view of a "dict".\n' + '\n' + '\n' + 'Dictionary view objects\n' + '=======================\n' + '\n' + 'The objects returned by "dict.keys()", "dict.values()" and\n' + '"dict.items()" are *view objects*. They provide a dynamic ' + 'view on the\n' + "dictionary's entries, which means that when the dictionary " + 'changes,\n' + 'the view reflects these changes.\n' + '\n' + 'Dictionary views can be iterated over to yield their ' + 'respective data,\n' + 'and support membership tests:\n' + '\n' + 'len(dictview)\n' + '\n' + ' Return the number of entries in the dictionary.\n' + '\n' + 'iter(dictview)\n' + '\n' + ' Return an iterator over the keys, values or items ' + '(represented as\n' + ' tuples of "(key, value)") in the dictionary.\n' + '\n' + ' Keys and values are iterated over in an arbitrary order ' + 'which is\n' + ' non-random, varies across Python implementations, and ' + 'depends on\n' + " the dictionary's history of insertions and deletions. If " + 'keys,\n' + ' values and items views are iterated over with no ' + 'intervening\n' + ' modifications to the dictionary, the order of items will ' + 'directly\n' + ' correspond. This allows the creation of "(value, key)" ' + 'pairs using\n' + ' "zip()": "pairs = zip(d.values(), d.keys())". Another ' + 'way to\n' + ' create the same list is "pairs = [(v, k) for (k, v) in ' + 'd.items()]".\n' + '\n' + ' Iterating views while adding or deleting entries in the ' + 'dictionary\n' + ' may raise a "RuntimeError" or fail to iterate over all ' + 'entries.\n' + '\n' + 'x in dictview\n' + '\n' + ' Return "True" if *x* is in the underlying dictionary\'s ' + 'keys, values\n' + ' or items (in the latter case, *x* should be a "(key, ' + 'value)"\n' + ' tuple).\n' + '\n' + 'Keys views are set-like since their entries are unique and ' + 'hashable.\n' + 'If all values are hashable, so that "(key, value)" pairs are ' + 'unique\n' + 'and hashable, then the items view is also set-like. (Values ' + 'views are\n' + 'not treated as set-like since the entries are generally not ' + 'unique.)\n' + 'For set-like views, all of the operations defined for the ' + 'abstract\n' + 'base class "collections.abc.Set" are available (for example, ' + '"==",\n' + '"<", or "^").\n' + '\n' + 'An example of dictionary view usage:\n' + '\n' + " >>> dishes = {'eggs': 2, 'sausage': 1, 'bacon': 1, " + "'spam': 500}\n" + ' >>> keys = dishes.keys()\n' + ' >>> values = dishes.values()\n' + '\n' + ' >>> # iteration\n' + ' >>> n = 0\n' + ' >>> for val in values:\n' + ' ... n += val\n' + ' >>> print(n)\n' + ' 504\n' + '\n' + ' >>> # keys and values are iterated over in the same ' + 'order\n' + ' >>> list(keys)\n' + " ['eggs', 'bacon', 'sausage', 'spam']\n" + ' >>> list(values)\n' + ' [2, 1, 1, 500]\n' + '\n' + ' >>> # view objects are dynamic and reflect dict changes\n' + " >>> del dishes['eggs']\n" + " >>> del dishes['sausage']\n" + ' >>> list(keys)\n' + " ['spam', 'bacon']\n" + '\n' + ' >>> # set operations\n' + " >>> keys & {'eggs', 'bacon', 'salad'}\n" + " {'bacon'}\n" + " >>> keys ^ {'sausage', 'juice'}\n" + " {'juice', 'sausage', 'bacon', 'spam'}\n", + 'typesmethods': '\n' + 'Methods\n' + '*******\n' + '\n' + 'Methods are functions that are called using the attribute ' + 'notation.\n' + 'There are two flavors: built-in methods (such as "append()" ' + 'on lists)\n' + 'and class instance methods. Built-in methods are described ' + 'with the\n' + 'types that support them.\n' + '\n' + 'If you access a method (a function defined in a class ' + 'namespace)\n' + 'through an instance, you get a special object: a *bound ' + 'method* (also\n' + 'called *instance method*) object. When called, it will add ' + 'the "self"\n' + 'argument to the argument list. Bound methods have two ' + 'special read-\n' + 'only attributes: "m.__self__" is the object on which the ' + 'method\n' + 'operates, and "m.__func__" is the function implementing the ' + 'method.\n' + 'Calling "m(arg-1, arg-2, ..., arg-n)" is completely ' + 'equivalent to\n' + 'calling "m.__func__(m.__self__, arg-1, arg-2, ..., arg-n)".\n' + '\n' + 'Like function objects, bound method objects support getting ' + 'arbitrary\n' + 'attributes. However, since method attributes are actually ' + 'stored on\n' + 'the underlying function object ("meth.__func__"), setting ' + 'method\n' + 'attributes on bound methods is disallowed. Attempting to ' + 'set an\n' + 'attribute on a method results in an "AttributeError" being ' + 'raised. In\n' + 'order to set a method attribute, you need to explicitly set ' + 'it on the\n' + 'underlying function object:\n' + '\n' + ' >>> class C:\n' + ' ... def method(self):\n' + ' ... pass\n' + ' ...\n' + ' >>> c = C()\n' + " >>> c.method.whoami = 'my name is method' # can't set on " + 'the method\n' + ' Traceback (most recent call last):\n' + ' File "", line 1, in \n' + " AttributeError: 'method' object has no attribute " + "'whoami'\n" + " >>> c.method.__func__.whoami = 'my name is method'\n" + ' >>> c.method.whoami\n' + " 'my name is method'\n" + '\n' + 'See The standard type hierarchy for more information.\n', + 'typesmodules': '\n' + 'Modules\n' + '*******\n' + '\n' + 'The only special operation on a module is attribute access: ' + '"m.name",\n' + 'where *m* is a module and *name* accesses a name defined in ' + "*m*'s\n" + 'symbol table. Module attributes can be assigned to. (Note ' + 'that the\n' + '"import" statement is not, strictly speaking, an operation ' + 'on a module\n' + 'object; "import foo" does not require a module object named ' + '*foo* to\n' + 'exist, rather it requires an (external) *definition* for a ' + 'module\n' + 'named *foo* somewhere.)\n' + '\n' + 'A special attribute of every module is "__dict__". This is ' + 'the\n' + "dictionary containing the module's symbol table. Modifying " + 'this\n' + "dictionary will actually change the module's symbol table, " + 'but direct\n' + 'assignment to the "__dict__" attribute is not possible (you ' + 'can write\n' + '"m.__dict__[\'a\'] = 1", which defines "m.a" to be "1", but ' + "you can't\n" + 'write "m.__dict__ = {}"). Modifying "__dict__" directly is ' + 'not\n' + 'recommended.\n' + '\n' + 'Modules built into the interpreter are written like this: ' + '"". If loaded from a file, they are ' + 'written as\n' + '"".\n', + 'typesseq': '\n' + 'Sequence Types --- "list", "tuple", "range"\n' + '*******************************************\n' + '\n' + 'There are three basic sequence types: lists, tuples, and range\n' + 'objects. Additional sequence types tailored for processing of ' + 'binary\n' + 'data and text strings are described in dedicated sections.\n' + '\n' + '\n' + 'Common Sequence Operations\n' + '==========================\n' + '\n' + 'The operations in the following table are supported by most ' + 'sequence\n' + 'types, both mutable and immutable. The ' + '"collections.abc.Sequence" ABC\n' + 'is provided to make it easier to correctly implement these ' + 'operations\n' + 'on custom sequence types.\n' + '\n' + 'This table lists the sequence operations sorted in ascending ' + 'priority.\n' + 'In the table, *s* and *t* are sequences of the same type, *n*, ' + '*i*,\n' + '*j* and *k* are integers and *x* is an arbitrary object that ' + 'meets any\n' + 'type and value restrictions imposed by *s*.\n' + '\n' + 'The "in" and "not in" operations have the same priorities as ' + 'the\n' + 'comparison operations. The "+" (concatenation) and "*" ' + '(repetition)\n' + 'operations have the same priority as the corresponding numeric\n' + 'operations.\n' + '\n' + '+----------------------------+----------------------------------+------------+\n' + '| Operation | Result ' + '| Notes |\n' + '+============================+==================================+============+\n' + '| "x in s" | "True" if an item of *s* is ' + '| (1) |\n' + '| | equal to *x*, else "False" ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "x not in s" | "False" if an item of *s* is ' + '| (1) |\n' + '| | equal to *x*, else "True" ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s + t" | the concatenation of *s* and *t* ' + '| (6)(7) |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s * n" or "n * s" | equivalent to adding *s* to ' + '| (2)(7) |\n' + '| | itself *n* times ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s[i]" | *i*th item of *s*, origin 0 ' + '| (3) |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s[i:j]" | slice of *s* from *i* to *j* ' + '| (3)(4) |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s[i:j:k]" | slice of *s* from *i* to *j* ' + '| (3)(5) |\n' + '| | with step *k* ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "len(s)" | length of *s* ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "min(s)" | smallest item of *s* ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "max(s)" | largest item of *s* ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s.index(x[, i[, j]])" | index of the first occurrence of ' + '| (8) |\n' + '| | *x* in *s* (at or after index ' + '| |\n' + '| | *i* and before index *j*) ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '| "s.count(x)" | total number of occurrences of ' + '| |\n' + '| | *x* in *s* ' + '| |\n' + '+----------------------------+----------------------------------+------------+\n' + '\n' + 'Sequences of the same type also support comparisons. In ' + 'particular,\n' + 'tuples and lists are compared lexicographically by comparing\n' + 'corresponding elements. This means that to compare equal, every\n' + 'element must compare equal and the two sequences must be of the ' + 'same\n' + 'type and have the same length. (For full details see ' + 'Comparisons in\n' + 'the language reference.)\n' + '\n' + 'Notes:\n' + '\n' + '1. While the "in" and "not in" operations are used only for ' + 'simple\n' + ' containment testing in the general case, some specialised ' + 'sequences\n' + ' (such as "str", "bytes" and "bytearray") also use them for\n' + ' subsequence testing:\n' + '\n' + ' >>> "gg" in "eggs"\n' + ' True\n' + '\n' + '2. Values of *n* less than "0" are treated as "0" (which yields ' + 'an\n' + ' empty sequence of the same type as *s*). Note that items in ' + 'the\n' + ' sequence *s* are not copied; they are referenced multiple ' + 'times.\n' + ' This often haunts new Python programmers; consider:\n' + '\n' + ' >>> lists = [[]] * 3\n' + ' >>> lists\n' + ' [[], [], []]\n' + ' >>> lists[0].append(3)\n' + ' >>> lists\n' + ' [[3], [3], [3]]\n' + '\n' + ' What has happened is that "[[]]" is a one-element list ' + 'containing\n' + ' an empty list, so all three elements of "[[]] * 3" are ' + 'references\n' + ' to this single empty list. Modifying any of the elements of\n' + ' "lists" modifies this single list. You can create a list of\n' + ' different lists this way:\n' + '\n' + ' >>> lists = [[] for i in range(3)]\n' + ' >>> lists[0].append(3)\n' + ' >>> lists[1].append(5)\n' + ' >>> lists[2].append(7)\n' + ' >>> lists\n' + ' [[3], [5], [7]]\n' + '\n' + ' Further explanation is available in the FAQ entry How do I ' + 'create a\n' + ' multidimensional list?.\n' + '\n' + '3. If *i* or *j* is negative, the index is relative to the end ' + 'of\n' + ' the string: "len(s) + i" or "len(s) + j" is substituted. But ' + 'note\n' + ' that "-0" is still "0".\n' + '\n' + '4. The slice of *s* from *i* to *j* is defined as the sequence ' + 'of\n' + ' items with index *k* such that "i <= k < j". If *i* or *j* ' + 'is\n' + ' greater than "len(s)", use "len(s)". If *i* is omitted or ' + '"None",\n' + ' use "0". If *j* is omitted or "None", use "len(s)". If *i* ' + 'is\n' + ' greater than or equal to *j*, the slice is empty.\n' + '\n' + '5. The slice of *s* from *i* to *j* with step *k* is defined as ' + 'the\n' + ' sequence of items with index "x = i + n*k" such that "0 <= n ' + '<\n' + ' (j-i)/k". In other words, the indices are "i", "i+k", ' + '"i+2*k",\n' + ' "i+3*k" and so on, stopping when *j* is reached (but never\n' + ' including *j*). If *i* or *j* is greater than "len(s)", use\n' + ' "len(s)". If *i* or *j* are omitted or "None", they become ' + '"end"\n' + ' values (which end depends on the sign of *k*). Note, *k* ' + 'cannot be\n' + ' zero. If *k* is "None", it is treated like "1".\n' + '\n' + '6. Concatenating immutable sequences always results in a new\n' + ' object. This means that building up a sequence by repeated\n' + ' concatenation will have a quadratic runtime cost in the ' + 'total\n' + ' sequence length. To get a linear runtime cost, you must ' + 'switch to\n' + ' one of the alternatives below:\n' + '\n' + ' * if concatenating "str" objects, you can build a list and ' + 'use\n' + ' "str.join()" at the end or else write to an "io.StringIO"\n' + ' instance and retrieve its value when complete\n' + '\n' + ' * if concatenating "bytes" objects, you can similarly use\n' + ' "bytes.join()" or "io.BytesIO", or you can do in-place\n' + ' concatenation with a "bytearray" object. "bytearray" ' + 'objects are\n' + ' mutable and have an efficient overallocation mechanism\n' + '\n' + ' * if concatenating "tuple" objects, extend a "list" instead\n' + '\n' + ' * for other types, investigate the relevant class ' + 'documentation\n' + '\n' + '7. Some sequence types (such as "range") only support item\n' + " sequences that follow specific patterns, and hence don't " + 'support\n' + ' sequence concatenation or repetition.\n' + '\n' + '8. "index" raises "ValueError" when *x* is not found in *s*. ' + 'When\n' + ' supported, the additional arguments to the index method ' + 'allow\n' + ' efficient searching of subsections of the sequence. Passing ' + 'the\n' + ' extra arguments is roughly equivalent to using ' + '"s[i:j].index(x)",\n' + ' only without copying any data and with the returned index ' + 'being\n' + ' relative to the start of the sequence rather than the start ' + 'of the\n' + ' slice.\n' + '\n' + '\n' + 'Immutable Sequence Types\n' + '========================\n' + '\n' + 'The only operation that immutable sequence types generally ' + 'implement\n' + 'that is not also implemented by mutable sequence types is ' + 'support for\n' + 'the "hash()" built-in.\n' + '\n' + 'This support allows immutable sequences, such as "tuple" ' + 'instances, to\n' + 'be used as "dict" keys and stored in "set" and "frozenset" ' + 'instances.\n' + '\n' + 'Attempting to hash an immutable sequence that contains ' + 'unhashable\n' + 'values will result in "TypeError".\n' + '\n' + '\n' + 'Mutable Sequence Types\n' + '======================\n' + '\n' + 'The operations in the following table are defined on mutable ' + 'sequence\n' + 'types. The "collections.abc.MutableSequence" ABC is provided to ' + 'make\n' + 'it easier to correctly implement these operations on custom ' + 'sequence\n' + 'types.\n' + '\n' + 'In the table *s* is an instance of a mutable sequence type, *t* ' + 'is any\n' + 'iterable object and *x* is an arbitrary object that meets any ' + 'type and\n' + 'value restrictions imposed by *s* (for example, "bytearray" ' + 'only\n' + 'accepts integers that meet the value restriction "0 <= x <= ' + '255").\n' + '\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| Operation | ' + 'Result | Notes |\n' + '+================================+==================================+=======================+\n' + '| "s[i] = x" | item *i* of *s* is replaced ' + 'by | |\n' + '| | ' + '*x* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s[i:j] = t" | slice of *s* from *i* to *j* ' + 'is | |\n' + '| | replaced by the contents of ' + 'the | |\n' + '| | iterable ' + '*t* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "del s[i:j]" | same as "s[i:j] = ' + '[]" | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s[i:j:k] = t" | the elements of "s[i:j:k]" ' + 'are | (1) |\n' + '| | replaced by those of ' + '*t* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "del s[i:j:k]" | removes the elements ' + 'of | |\n' + '| | "s[i:j:k]" from the ' + 'list | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.append(x)" | appends *x* to the end of ' + 'the | |\n' + '| | sequence (same ' + 'as | |\n' + '| | "s[len(s):len(s)] = ' + '[x]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.clear()" | removes all items from "s" ' + '(same | (5) |\n' + '| | as "del ' + 's[:]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.copy()" | creates a shallow copy of ' + '"s" | (5) |\n' + '| | (same as ' + '"s[:]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.extend(t)" or "s += t" | extends *s* with the contents ' + 'of | |\n' + '| | *t* (for the most part the ' + 'same | |\n' + '| | as "s[len(s):len(s)] = ' + 't") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s *= n" | updates *s* with its ' + 'contents | (6) |\n' + '| | repeated *n* ' + 'times | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.insert(i, x)" | inserts *x* into *s* at ' + 'the | |\n' + '| | index given by *i* (same ' + 'as | |\n' + '| | "s[i:i] = ' + '[x]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.pop([i])" | retrieves the item at *i* ' + 'and | (2) |\n' + '| | also removes it from ' + '*s* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.remove(x)" | remove the first item from ' + '*s* | (3) |\n' + '| | where "s[i] == ' + 'x" | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.reverse()" | reverses the items of *s* ' + 'in | (4) |\n' + '| | ' + 'place | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '\n' + 'Notes:\n' + '\n' + '1. *t* must have the same length as the slice it is replacing.\n' + '\n' + '2. The optional argument *i* defaults to "-1", so that by ' + 'default\n' + ' the last item is removed and returned.\n' + '\n' + '3. "remove" raises "ValueError" when *x* is not found in *s*.\n' + '\n' + '4. The "reverse()" method modifies the sequence in place for\n' + ' economy of space when reversing a large sequence. To remind ' + 'users\n' + ' that it operates by side effect, it does not return the ' + 'reversed\n' + ' sequence.\n' + '\n' + '5. "clear()" and "copy()" are included for consistency with the\n' + " interfaces of mutable containers that don't support slicing\n" + ' operations (such as "dict" and "set")\n' + '\n' + ' New in version 3.3: "clear()" and "copy()" methods.\n' + '\n' + '6. The value *n* is an integer, or an object implementing\n' + ' "__index__()". Zero and negative values of *n* clear the ' + 'sequence.\n' + ' Items in the sequence are not copied; they are referenced ' + 'multiple\n' + ' times, as explained for "s * n" under Common Sequence ' + 'Operations.\n' + '\n' + '\n' + 'Lists\n' + '=====\n' + '\n' + 'Lists are mutable sequences, typically used to store collections ' + 'of\n' + 'homogeneous items (where the precise degree of similarity will ' + 'vary by\n' + 'application).\n' + '\n' + 'class list([iterable])\n' + '\n' + ' Lists may be constructed in several ways:\n' + '\n' + ' * Using a pair of square brackets to denote the empty list: ' + '"[]"\n' + '\n' + ' * Using square brackets, separating items with commas: ' + '"[a]",\n' + ' "[a, b, c]"\n' + '\n' + ' * Using a list comprehension: "[x for x in iterable]"\n' + '\n' + ' * Using the type constructor: "list()" or "list(iterable)"\n' + '\n' + ' The constructor builds a list whose items are the same and in ' + 'the\n' + " same order as *iterable*'s items. *iterable* may be either " + 'a\n' + ' sequence, a container that supports iteration, or an ' + 'iterator\n' + ' object. If *iterable* is already a list, a copy is made and\n' + ' returned, similar to "iterable[:]". For example, ' + '"list(\'abc\')"\n' + ' returns "[\'a\', \'b\', \'c\']" and "list( (1, 2, 3) )" ' + 'returns "[1, 2,\n' + ' 3]". If no argument is given, the constructor creates a new ' + 'empty\n' + ' list, "[]".\n' + '\n' + ' Many other operations also produce lists, including the ' + '"sorted()"\n' + ' built-in.\n' + '\n' + ' Lists implement all of the common and mutable sequence ' + 'operations.\n' + ' Lists also provide the following additional method:\n' + '\n' + ' sort(*, key=None, reverse=None)\n' + '\n' + ' This method sorts the list in place, using only "<" ' + 'comparisons\n' + ' between items. Exceptions are not suppressed - if any ' + 'comparison\n' + ' operations fail, the entire sort operation will fail (and ' + 'the\n' + ' list will likely be left in a partially modified state).\n' + '\n' + ' "sort()" accepts two arguments that can only be passed by\n' + ' keyword (keyword-only arguments):\n' + '\n' + ' *key* specifies a function of one argument that is used ' + 'to\n' + ' extract a comparison key from each list element (for ' + 'example,\n' + ' "key=str.lower"). The key corresponding to each item in ' + 'the list\n' + ' is calculated once and then used for the entire sorting ' + 'process.\n' + ' The default value of "None" means that list items are ' + 'sorted\n' + ' directly without calculating a separate key value.\n' + '\n' + ' The "functools.cmp_to_key()" utility is available to ' + 'convert a\n' + ' 2.x style *cmp* function to a *key* function.\n' + '\n' + ' *reverse* is a boolean value. If set to "True", then the ' + 'list\n' + ' elements are sorted as if each comparison were reversed.\n' + '\n' + ' This method modifies the sequence in place for economy of ' + 'space\n' + ' when sorting a large sequence. To remind users that it ' + 'operates\n' + ' by side effect, it does not return the sorted sequence ' + '(use\n' + ' "sorted()" to explicitly request a new sorted list ' + 'instance).\n' + '\n' + ' The "sort()" method is guaranteed to be stable. A sort ' + 'is\n' + ' stable if it guarantees not to change the relative order ' + 'of\n' + ' elements that compare equal --- this is helpful for ' + 'sorting in\n' + ' multiple passes (for example, sort by department, then by ' + 'salary\n' + ' grade).\n' + '\n' + ' **CPython implementation detail:** While a list is being ' + 'sorted,\n' + ' the effect of attempting to mutate, or even inspect, the ' + 'list is\n' + ' undefined. The C implementation of Python makes the list ' + 'appear\n' + ' empty for the duration, and raises "ValueError" if it can ' + 'detect\n' + ' that the list has been mutated during a sort.\n' + '\n' + '\n' + 'Tuples\n' + '======\n' + '\n' + 'Tuples are immutable sequences, typically used to store ' + 'collections of\n' + 'heterogeneous data (such as the 2-tuples produced by the ' + '"enumerate()"\n' + 'built-in). Tuples are also used for cases where an immutable ' + 'sequence\n' + 'of homogeneous data is needed (such as allowing storage in a ' + '"set" or\n' + '"dict" instance).\n' + '\n' + 'class tuple([iterable])\n' + '\n' + ' Tuples may be constructed in a number of ways:\n' + '\n' + ' * Using a pair of parentheses to denote the empty tuple: ' + '"()"\n' + '\n' + ' * Using a trailing comma for a singleton tuple: "a," or ' + '"(a,)"\n' + '\n' + ' * Separating items with commas: "a, b, c" or "(a, b, c)"\n' + '\n' + ' * Using the "tuple()" built-in: "tuple()" or ' + '"tuple(iterable)"\n' + '\n' + ' The constructor builds a tuple whose items are the same and ' + 'in the\n' + " same order as *iterable*'s items. *iterable* may be either " + 'a\n' + ' sequence, a container that supports iteration, or an ' + 'iterator\n' + ' object. If *iterable* is already a tuple, it is returned\n' + ' unchanged. For example, "tuple(\'abc\')" returns "(\'a\', ' + '\'b\', \'c\')"\n' + ' and "tuple( [1, 2, 3] )" returns "(1, 2, 3)". If no argument ' + 'is\n' + ' given, the constructor creates a new empty tuple, "()".\n' + '\n' + ' Note that it is actually the comma which makes a tuple, not ' + 'the\n' + ' parentheses. The parentheses are optional, except in the ' + 'empty\n' + ' tuple case, or when they are needed to avoid syntactic ' + 'ambiguity.\n' + ' For example, "f(a, b, c)" is a function call with three ' + 'arguments,\n' + ' while "f((a, b, c))" is a function call with a 3-tuple as the ' + 'sole\n' + ' argument.\n' + '\n' + ' Tuples implement all of the common sequence operations.\n' + '\n' + 'For heterogeneous collections of data where access by name is ' + 'clearer\n' + 'than access by index, "collections.namedtuple()" may be a more\n' + 'appropriate choice than a simple tuple object.\n' + '\n' + '\n' + 'Ranges\n' + '======\n' + '\n' + 'The "range" type represents an immutable sequence of numbers and ' + 'is\n' + 'commonly used for looping a specific number of times in "for" ' + 'loops.\n' + '\n' + 'class range(stop)\n' + 'class range(start, stop[, step])\n' + '\n' + ' The arguments to the range constructor must be integers ' + '(either\n' + ' built-in "int" or any object that implements the "__index__"\n' + ' special method). If the *step* argument is omitted, it ' + 'defaults to\n' + ' "1". If the *start* argument is omitted, it defaults to "0". ' + 'If\n' + ' *step* is zero, "ValueError" is raised.\n' + '\n' + ' For a positive *step*, the contents of a range "r" are ' + 'determined\n' + ' by the formula "r[i] = start + step*i" where "i >= 0" and ' + '"r[i] <\n' + ' stop".\n' + '\n' + ' For a negative *step*, the contents of the range are still\n' + ' determined by the formula "r[i] = start + step*i", but the\n' + ' constraints are "i >= 0" and "r[i] > stop".\n' + '\n' + ' A range object will be empty if "r[0]" does not meet the ' + 'value\n' + ' constraint. Ranges do support negative indices, but these ' + 'are\n' + ' interpreted as indexing from the end of the sequence ' + 'determined by\n' + ' the positive indices.\n' + '\n' + ' Ranges containing absolute values larger than "sys.maxsize" ' + 'are\n' + ' permitted but some features (such as "len()") may raise\n' + ' "OverflowError".\n' + '\n' + ' Range examples:\n' + '\n' + ' >>> list(range(10))\n' + ' [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n' + ' >>> list(range(1, 11))\n' + ' [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\n' + ' >>> list(range(0, 30, 5))\n' + ' [0, 5, 10, 15, 20, 25]\n' + ' >>> list(range(0, 10, 3))\n' + ' [0, 3, 6, 9]\n' + ' >>> list(range(0, -10, -1))\n' + ' [0, -1, -2, -3, -4, -5, -6, -7, -8, -9]\n' + ' >>> list(range(0))\n' + ' []\n' + ' >>> list(range(1, 0))\n' + ' []\n' + '\n' + ' Ranges implement all of the common sequence operations ' + 'except\n' + ' concatenation and repetition (due to the fact that range ' + 'objects\n' + ' can only represent sequences that follow a strict pattern ' + 'and\n' + ' repetition and concatenation will usually violate that ' + 'pattern).\n' + '\n' + ' start\n' + '\n' + ' The value of the *start* parameter (or "0" if the ' + 'parameter was\n' + ' not supplied)\n' + '\n' + ' stop\n' + '\n' + ' The value of the *stop* parameter\n' + '\n' + ' step\n' + '\n' + ' The value of the *step* parameter (or "1" if the parameter ' + 'was\n' + ' not supplied)\n' + '\n' + 'The advantage of the "range" type over a regular "list" or ' + '"tuple" is\n' + 'that a "range" object will always take the same (small) amount ' + 'of\n' + 'memory, no matter the size of the range it represents (as it ' + 'only\n' + 'stores the "start", "stop" and "step" values, calculating ' + 'individual\n' + 'items and subranges as needed).\n' + '\n' + 'Range objects implement the "collections.abc.Sequence" ABC, and\n' + 'provide features such as containment tests, element index ' + 'lookup,\n' + 'slicing and support for negative indices (see Sequence Types --- ' + 'list,\n' + 'tuple, range):\n' + '\n' + '>>> r = range(0, 20, 2)\n' + '>>> r\n' + 'range(0, 20, 2)\n' + '>>> 11 in r\n' + 'False\n' + '>>> 10 in r\n' + 'True\n' + '>>> r.index(10)\n' + '5\n' + '>>> r[5]\n' + '10\n' + '>>> r[:5]\n' + 'range(0, 10, 2)\n' + '>>> r[-1]\n' + '18\n' + '\n' + 'Testing range objects for equality with "==" and "!=" compares ' + 'them as\n' + 'sequences. That is, two range objects are considered equal if ' + 'they\n' + 'represent the same sequence of values. (Note that two range ' + 'objects\n' + 'that compare equal might have different "start", "stop" and ' + '"step"\n' + 'attributes, for example "range(0) == range(2, 1, 3)" or ' + '"range(0, 3,\n' + '2) == range(0, 4, 2)".)\n' + '\n' + 'Changed in version 3.2: Implement the Sequence ABC. Support ' + 'slicing\n' + 'and negative indices. Test "int" objects for membership in ' + 'constant\n' + 'time instead of iterating through all items.\n' + '\n' + "Changed in version 3.3: Define '==' and '!=' to compare range " + 'objects\n' + 'based on the sequence of values they define (instead of ' + 'comparing\n' + 'based on object identity).\n' + '\n' + 'New in version 3.3: The "start", "stop" and "step" attributes.\n' + '\n' + 'See also:\n' + '\n' + ' * The linspace recipe shows how to implement a lazy version ' + 'of\n' + ' range that suitable for floating point applications.\n', + 'typesseq-mutable': '\n' + 'Mutable Sequence Types\n' + '**********************\n' + '\n' + 'The operations in the following table are defined on ' + 'mutable sequence\n' + 'types. The "collections.abc.MutableSequence" ABC is ' + 'provided to make\n' + 'it easier to correctly implement these operations on ' + 'custom sequence\n' + 'types.\n' + '\n' + 'In the table *s* is an instance of a mutable sequence ' + 'type, *t* is any\n' + 'iterable object and *x* is an arbitrary object that ' + 'meets any type and\n' + 'value restrictions imposed by *s* (for example, ' + '"bytearray" only\n' + 'accepts integers that meet the value restriction "0 <= x ' + '<= 255").\n' + '\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| Operation | ' + 'Result | Notes ' + '|\n' + '+================================+==================================+=======================+\n' + '| "s[i] = x" | item *i* of *s* is ' + 'replaced by | |\n' + '| | ' + '*x* | ' + '|\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s[i:j] = t" | slice of *s* from *i* ' + 'to *j* is | |\n' + '| | replaced by the ' + 'contents of the | |\n' + '| | iterable ' + '*t* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "del s[i:j]" | same as "s[i:j] = ' + '[]" | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s[i:j:k] = t" | the elements of ' + '"s[i:j:k]" are | (1) |\n' + '| | replaced by those of ' + '*t* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "del s[i:j:k]" | removes the elements ' + 'of | |\n' + '| | "s[i:j:k]" from the ' + 'list | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.append(x)" | appends *x* to the ' + 'end of the | |\n' + '| | sequence (same ' + 'as | |\n' + '| | "s[len(s):len(s)] = ' + '[x]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.clear()" | removes all items ' + 'from "s" (same | (5) |\n' + '| | as "del ' + 's[:]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.copy()" | creates a shallow ' + 'copy of "s" | (5) |\n' + '| | (same as ' + '"s[:]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.extend(t)" or "s += t" | extends *s* with the ' + 'contents of | |\n' + '| | *t* (for the most ' + 'part the same | |\n' + '| | as "s[len(s):len(s)] ' + '= t") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s *= n" | updates *s* with its ' + 'contents | (6) |\n' + '| | repeated *n* ' + 'times | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.insert(i, x)" | inserts *x* into *s* ' + 'at the | |\n' + '| | index given by *i* ' + '(same as | |\n' + '| | "s[i:i] = ' + '[x]") | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.pop([i])" | retrieves the item at ' + '*i* and | (2) |\n' + '| | also removes it from ' + '*s* | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.remove(x)" | remove the first item ' + 'from *s* | (3) |\n' + '| | where "s[i] == ' + 'x" | |\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '| "s.reverse()" | reverses the items of ' + '*s* in | (4) |\n' + '| | ' + 'place | ' + '|\n' + '+--------------------------------+----------------------------------+-----------------------+\n' + '\n' + 'Notes:\n' + '\n' + '1. *t* must have the same length as the slice it is ' + 'replacing.\n' + '\n' + '2. The optional argument *i* defaults to "-1", so that ' + 'by default\n' + ' the last item is removed and returned.\n' + '\n' + '3. "remove" raises "ValueError" when *x* is not found in ' + '*s*.\n' + '\n' + '4. The "reverse()" method modifies the sequence in place ' + 'for\n' + ' economy of space when reversing a large sequence. To ' + 'remind users\n' + ' that it operates by side effect, it does not return ' + 'the reversed\n' + ' sequence.\n' + '\n' + '5. "clear()" and "copy()" are included for consistency ' + 'with the\n' + " interfaces of mutable containers that don't support " + 'slicing\n' + ' operations (such as "dict" and "set")\n' + '\n' + ' New in version 3.3: "clear()" and "copy()" methods.\n' + '\n' + '6. The value *n* is an integer, or an object ' + 'implementing\n' + ' "__index__()". Zero and negative values of *n* clear ' + 'the sequence.\n' + ' Items in the sequence are not copied; they are ' + 'referenced multiple\n' + ' times, as explained for "s * n" under Common Sequence ' + 'Operations.\n', + 'unary': '\n' + 'Unary arithmetic and bitwise operations\n' + '***************************************\n' + '\n' + 'All unary arithmetic and bitwise operations have the same ' + 'priority:\n' + '\n' + ' u_expr ::= power | "-" u_expr | "+" u_expr | "~" u_expr\n' + '\n' + 'The unary "-" (minus) operator yields the negation of its numeric\n' + 'argument.\n' + '\n' + 'The unary "+" (plus) operator yields its numeric argument ' + 'unchanged.\n' + '\n' + 'The unary "~" (invert) operator yields the bitwise inversion of ' + 'its\n' + 'integer argument. The bitwise inversion of "x" is defined as\n' + '"-(x+1)". It only applies to integral numbers.\n' + '\n' + 'In all three cases, if the argument does not have the proper type, ' + 'a\n' + '"TypeError" exception is raised.\n', + 'while': '\n' + 'The "while" statement\n' + '*********************\n' + '\n' + 'The "while" statement is used for repeated execution as long as an\n' + 'expression is true:\n' + '\n' + ' while_stmt ::= "while" expression ":" suite\n' + ' ["else" ":" suite]\n' + '\n' + 'This repeatedly tests the expression and, if it is true, executes ' + 'the\n' + 'first suite; if the expression is false (which may be the first ' + 'time\n' + 'it is tested) the suite of the "else" clause, if present, is ' + 'executed\n' + 'and the loop terminates.\n' + '\n' + 'A "break" statement executed in the first suite terminates the ' + 'loop\n' + 'without executing the "else" clause\'s suite. A "continue" ' + 'statement\n' + 'executed in the first suite skips the rest of the suite and goes ' + 'back\n' + 'to testing the expression.\n', + 'with': '\n' + 'The "with" statement\n' + '********************\n' + '\n' + 'The "with" statement is used to wrap the execution of a block with\n' + 'methods defined by a context manager (see section With Statement\n' + 'Context Managers). This allows common "try"..."except"..."finally"\n' + 'usage patterns to be encapsulated for convenient reuse.\n' + '\n' + ' with_stmt ::= "with" with_item ("," with_item)* ":" suite\n' + ' with_item ::= expression ["as" target]\n' + '\n' + 'The execution of the "with" statement with one "item" proceeds as\n' + 'follows:\n' + '\n' + '1. The context expression (the expression given in the "with_item")\n' + ' is evaluated to obtain a context manager.\n' + '\n' + '2. The context manager\'s "__exit__()" is loaded for later use.\n' + '\n' + '3. The context manager\'s "__enter__()" method is invoked.\n' + '\n' + '4. If a target was included in the "with" statement, the return\n' + ' value from "__enter__()" is assigned to it.\n' + '\n' + ' Note: The "with" statement guarantees that if the "__enter__()"\n' + ' method returns without an error, then "__exit__()" will always ' + 'be\n' + ' called. Thus, if an error occurs during the assignment to the\n' + ' target list, it will be treated the same as an error occurring\n' + ' within the suite would be. See step 6 below.\n' + '\n' + '5. The suite is executed.\n' + '\n' + '6. The context manager\'s "__exit__()" method is invoked. If an\n' + ' exception caused the suite to be exited, its type, value, and\n' + ' traceback are passed as arguments to "__exit__()". Otherwise, ' + 'three\n' + ' "None" arguments are supplied.\n' + '\n' + ' If the suite was exited due to an exception, and the return ' + 'value\n' + ' from the "__exit__()" method was false, the exception is ' + 'reraised.\n' + ' If the return value was true, the exception is suppressed, and\n' + ' execution continues with the statement following the "with"\n' + ' statement.\n' + '\n' + ' If the suite was exited for any reason other than an exception, ' + 'the\n' + ' return value from "__exit__()" is ignored, and execution ' + 'proceeds\n' + ' at the normal location for the kind of exit that was taken.\n' + '\n' + 'With more than one item, the context managers are processed as if\n' + 'multiple "with" statements were nested:\n' + '\n' + ' with A() as a, B() as b:\n' + ' suite\n' + '\n' + 'is equivalent to\n' + '\n' + ' with A() as a:\n' + ' with B() as b:\n' + ' suite\n' + '\n' + 'Changed in version 3.1: Support for multiple context expressions.\n' + '\n' + 'See also:\n' + '\n' + ' **PEP 343** - The "with" statement\n' + ' The specification, background, and examples for the Python ' + '"with"\n' + ' statement.\n', + 'yield': '\n' + 'The "yield" statement\n' + '*********************\n' + '\n' + ' yield_stmt ::= yield_expression\n' + '\n' + 'A "yield" statement is semantically equivalent to a yield ' + 'expression.\n' + 'The yield statement can be used to omit the parentheses that would\n' + 'otherwise be required in the equivalent yield expression ' + 'statement.\n' + 'For example, the yield statements\n' + '\n' + ' yield \n' + ' yield from \n' + '\n' + 'are equivalent to the yield expression statements\n' + '\n' + ' (yield )\n' + ' (yield from )\n' + '\n' + 'Yield expressions and statements are only used when defining a\n' + '*generator* function, and are only used in the body of the ' + 'generator\n' + 'function. Using yield in a function definition is sufficient to ' + 'cause\n' + 'that definition to create a generator function instead of a normal\n' + 'function.\n' + '\n' + 'For full details of "yield" semantics, refer to the Yield ' + 'expressions\n' + 'section.\n'} diff --git a/Lib/random.py b/Lib/random.py index 4efbb0a..49b0f14 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -8,6 +8,7 @@ --------- pick random element pick random sample + pick weighted random sample generate random permutation distributions on the real line: @@ -43,12 +44,14 @@ from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin from os import urandom as _urandom from _collections_abc import Set as _Set, Sequence as _Sequence from hashlib import sha512 as _sha512 +import itertools as _itertools +import bisect as _bisect __all__ = ["Random","seed","random","uniform","randint","choice","sample", "randrange","shuffle","normalvariate","lognormvariate", "expovariate","vonmisesvariate","gammavariate","triangular", "gauss","betavariate","paretovariate","weibullvariate", - "getstate","setstate", "getrandbits", + "getstate","setstate", "getrandbits", "choices", "SystemRandom"] NV_MAGICCONST = 4 * _exp(-0.5)/_sqrt(2.0) @@ -105,15 +108,6 @@ class Random(_random.Random): """ - if a is None: - try: - # Seed with enough bytes to span the 19937 bit - # state space for the Mersenne Twister - a = int.from_bytes(_urandom(2500), 'big') - except NotImplementedError: - import time - a = int(time.time() * 256) # use fractional seconds - if version == 1 and isinstance(a, (str, bytes)): x = ord(a[0]) << 7 if a else 0 for c in a: @@ -121,12 +115,11 @@ class Random(_random.Random): x ^= len(a) a = -2 if x == -1 else x - if version == 2: - if isinstance(a, (str, bytes, bytearray)): - if isinstance(a, str): - a = a.encode() - a += _sha512(a).digest() - a = int.from_bytes(a, 'big') + if version == 2 and isinstance(a, (str, bytes, bytearray)): + if isinstance(a, str): + a = a.encode() + a += _sha512(a).digest() + a = int.from_bytes(a, 'big') super().seed(a) self.gauss_next = None @@ -321,7 +314,7 @@ class Random(_random.Random): randbelow = self._randbelow n = len(population) if not 0 <= k <= n: - raise ValueError("Sample larger than population") + raise ValueError("Sample larger than population or is negative") result = [None] * k setsize = 21 # size of a small set minus size of an empty list if k > 5: @@ -344,6 +337,28 @@ class Random(_random.Random): result[i] = population[j] return result + def choices(self, population, weights=None, *, cum_weights=None, k=1): + """Return a k sized list of population elements chosen with replacement. + + If the relative weights or cumulative weights are not specified, + the selections are made with equal probability. + + """ + random = self.random + if cum_weights is None: + if weights is None: + _int = int + total = len(population) + return [population[_int(random() * total)] for i in range(k)] + cum_weights = list(_itertools.accumulate(weights)) + elif weights is not None: + raise TypeError('Cannot specify both weights and cumulative weights') + if len(cum_weights) != len(population): + raise ValueError('The number of weights does not match the population') + bisect = _bisect.bisect + total = cum_weights[-1] + return [population[bisect(cum_weights, random() * total)] for i in range(k)] + ## -------------------- real-valued distributions ------------------- ## -------------------- uniform distribution ------------------- @@ -615,11 +630,11 @@ class Random(_random.Random): # This version due to Janne Sinkkonen, and matches all the std # texts (e.g., Knuth Vol 2 Ed 3 pg 134 "the beta distribution"). - y = self.gammavariate(alpha, 1.) + y = self.gammavariate(alpha, 1.0) if y == 0: return 0.0 else: - return y / (y + self.gammavariate(beta, 1.)) + return y / (y + self.gammavariate(beta, 1.0)) ## -------------------- Pareto -------------------- @@ -734,6 +749,7 @@ choice = _inst.choice randrange = _inst.randrange sample = _inst.sample shuffle = _inst.shuffle +choices = _inst.choices normalvariate = _inst.normalvariate lognormvariate = _inst.lognormvariate expovariate = _inst.expovariate diff --git a/Lib/re.py b/Lib/re.py index dde8901..d321cff 100644 --- a/Lib/re.py +++ b/Lib/re.py @@ -119,9 +119,10 @@ This module also defines an exception 'error'. """ -import sys +import enum import sre_compile import sre_parse +import functools try: import _locale except ImportError: @@ -138,18 +139,26 @@ __all__ = [ __version__ = "2.2.1" -# flags -A = ASCII = sre_compile.SRE_FLAG_ASCII # assume ascii "locale" -I = IGNORECASE = sre_compile.SRE_FLAG_IGNORECASE # ignore case -L = LOCALE = sre_compile.SRE_FLAG_LOCALE # assume current 8-bit locale -U = UNICODE = sre_compile.SRE_FLAG_UNICODE # assume unicode "locale" -M = MULTILINE = sre_compile.SRE_FLAG_MULTILINE # make anchors look for newline -S = DOTALL = sre_compile.SRE_FLAG_DOTALL # make dot match newline -X = VERBOSE = sre_compile.SRE_FLAG_VERBOSE # ignore whitespace and comments - -# sre extensions (experimental, don't rely on these) -T = TEMPLATE = sre_compile.SRE_FLAG_TEMPLATE # disable backtracking -DEBUG = sre_compile.SRE_FLAG_DEBUG # dump pattern after compilation +class RegexFlag(enum.IntFlag): + ASCII = sre_compile.SRE_FLAG_ASCII # assume ascii "locale" + IGNORECASE = sre_compile.SRE_FLAG_IGNORECASE # ignore case + LOCALE = sre_compile.SRE_FLAG_LOCALE # assume current 8-bit locale + UNICODE = sre_compile.SRE_FLAG_UNICODE # assume unicode "locale" + MULTILINE = sre_compile.SRE_FLAG_MULTILINE # make anchors look for newline + DOTALL = sre_compile.SRE_FLAG_DOTALL # make dot match newline + VERBOSE = sre_compile.SRE_FLAG_VERBOSE # ignore whitespace and comments + A = ASCII + I = IGNORECASE + L = LOCALE + U = UNICODE + M = MULTILINE + S = DOTALL + X = VERBOSE + # sre extensions (experimental, don't rely on these) + TEMPLATE = sre_compile.SRE_FLAG_TEMPLATE # disable backtracking + T = TEMPLATE + DEBUG = sre_compile.SRE_FLAG_DEBUG # dump pattern after compilation +globals().update(RegexFlag.__members__) # sre exception error = sre_compile.error @@ -226,7 +235,7 @@ def compile(pattern, flags=0): def purge(): "Clear the regular expression caches" _cache.clear() - _cache_repl.clear() + _compile_repl.cache_clear() def template(pattern, flags=0): "Compile a template pattern, returning a pattern object" @@ -270,7 +279,6 @@ def escape(pattern): # internals _cache = {} -_cache_repl = {} _pattern_type = type(sre_compile.compile("", 0)) @@ -303,17 +311,10 @@ def _compile(pattern, flags): _cache[type(pattern), pattern, flags] = p, loc return p +@functools.lru_cache(_MAXCACHE) def _compile_repl(repl, pattern): # internal: compile replacement pattern - try: - return _cache_repl[repl, pattern] - except KeyError: - pass - p = sre_parse.parse_template(repl, pattern) - if len(_cache_repl) >= _MAXCACHE: - _cache_repl.clear() - _cache_repl[repl, pattern] = p - return p + return sre_parse.parse_template(repl, pattern) def _expand(pattern, match, template): # internal: match.expand implementation hook @@ -353,7 +354,7 @@ class Scanner: for phrase, action in lexicon: gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (gid, 0, 0, sre_parse.parse(phrase, flags))), ])) s.closegroup(gid, p[-1]) p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py index 401a626..bca4a7b 100644 --- a/Lib/rlcompleter.py +++ b/Lib/rlcompleter.py @@ -113,6 +113,12 @@ class Completer: for word in keyword.kwlist: if word[:n] == text: seen.add(word) + if word in {'finally', 'try'}: + word = word + ':' + elif word not in {'False', 'None', 'True', + 'break', 'continue', 'pass', + 'else'}: + word = word + ' ' matches.append(word) for nspace in [self.namespace, builtins.__dict__]: for word, val in nspace.items(): @@ -152,14 +158,30 @@ class Completer: words.update(get_class_members(thisobject.__class__)) matches = [] n = len(attr) - for word in words: - if word[:n] == attr: - try: - val = getattr(thisobject, word) - except Exception: - continue # Exclude properties that are not set - word = self._callable_postfix(val, "%s.%s" % (expr, word)) - matches.append(word) + if attr == '': + noprefix = '_' + elif attr == '_': + noprefix = '__' + else: + noprefix = None + while True: + for word in words: + if (word[:n] == attr and + not (noprefix and word[:n+1] == noprefix)): + match = "%s.%s" % (expr, word) + try: + val = getattr(thisobject, word) + except Exception: + pass # Include even if attribute not set + else: + match = self._callable_postfix(val, match) + matches.append(match) + if matches or not noprefix: + break + if noprefix == '_': + noprefix = '__' + else: + noprefix = None matches.sort() return matches diff --git a/Lib/sched.py b/Lib/sched.py index b47648d..3d8c011 100644 --- a/Lib/sched.py +++ b/Lib/sched.py @@ -23,11 +23,6 @@ The action function may be an instance method so it has another way to reference private data (besides global variables). """ -# XXX The timefunc and delayfunc should have been defined as methods -# XXX so you can define new kinds of schedulers using subclassing -# XXX instead of having to define a module or class just to hold -# XXX the global state of your particular time and delay functions. - import time import heapq from collections import namedtuple @@ -40,12 +35,24 @@ from time import monotonic as _time __all__ = ["scheduler"] class Event(namedtuple('Event', 'time, priority, action, argument, kwargs')): + __slots__ = [] def __eq__(s, o): return (s.time, s.priority) == (o.time, o.priority) def __lt__(s, o): return (s.time, s.priority) < (o.time, o.priority) def __le__(s, o): return (s.time, s.priority) <= (o.time, o.priority) def __gt__(s, o): return (s.time, s.priority) > (o.time, o.priority) def __ge__(s, o): return (s.time, s.priority) >= (o.time, o.priority) +Event.time.__doc__ = ('''Numeric type compatible with the return value of the +timefunc function passed to the constructor.''') +Event.priority.__doc__ = ('''Events scheduled for the same time will be executed +in the order of their priority.''') +Event.action.__doc__ = ('''Executing the event means executing +action(*argument, **kwargs)''') +Event.argument.__doc__ = ('''argument is a sequence holding the positional +arguments for the action.''') +Event.kwargs.__doc__ = ('''kwargs is a dictionary holding the keyword +arguments for the action.''') + _sentinel = object() class scheduler: diff --git a/Lib/secrets.py b/Lib/secrets.py new file mode 100644 index 0000000..27fa450 --- /dev/null +++ b/Lib/secrets.py @@ -0,0 +1,71 @@ +"""Generate cryptographically strong pseudo-random numbers suitable for +managing secrets such as account authentication, tokens, and similar. + +See PEP 506 for more information. +https://www.python.org/dev/peps/pep-0506/ + +""" + +__all__ = ['choice', 'randbelow', 'randbits', 'SystemRandom', + 'token_bytes', 'token_hex', 'token_urlsafe', + 'compare_digest', + ] + + +import base64 +import binascii +import os + +from hmac import compare_digest +from random import SystemRandom + +_sysrand = SystemRandom() + +randbits = _sysrand.getrandbits +choice = _sysrand.choice + +def randbelow(exclusive_upper_bound): + """Return a random int in the range [0, n).""" + return _sysrand._randbelow(exclusive_upper_bound) + +DEFAULT_ENTROPY = 32 # number of bytes to return by default + +def token_bytes(nbytes=None): + """Return a random byte string containing *nbytes* bytes. + + If *nbytes* is ``None`` or not supplied, a reasonable + default is used. + + >>> token_bytes(16) #doctest:+SKIP + b'\\xebr\\x17D*t\\xae\\xd4\\xe3S\\xb6\\xe2\\xebP1\\x8b' + + """ + if nbytes is None: + nbytes = DEFAULT_ENTROPY + return os.urandom(nbytes) + +def token_hex(nbytes=None): + """Return a random text string, in hexadecimal. + + The string has *nbytes* random bytes, each byte converted to two + hex digits. If *nbytes* is ``None`` or not supplied, a reasonable + default is used. + + >>> token_hex(16) #doctest:+SKIP + 'f9bf78b9a18ce6d46a0cd2b0b86df9da' + + """ + return binascii.hexlify(token_bytes(nbytes)).decode('ascii') + +def token_urlsafe(nbytes=None): + """Return a random URL-safe text string, in Base64 encoding. + + The string has *nbytes* random bytes. If *nbytes* is ``None`` + or not supplied, a reasonable default is used. + + >>> token_urlsafe(16) #doctest:+SKIP + 'Drmhze6EPcv0fN_81Bj-nA' + + """ + tok = token_bytes(nbytes) + return base64.urlsafe_b64encode(tok).rstrip(b'=').decode('ascii') diff --git a/Lib/shlex.py b/Lib/shlex.py index ecd2efd..e87266f 100644 --- a/Lib/shlex.py +++ b/Lib/shlex.py @@ -5,6 +5,7 @@ # push_source() and pop_source() made explicit by ESR, January 2001. # Posix compliance, split(), string arguments, and # iterator interface by Gustavo Niemeyer, April 2003. +# changes to tokenize more like Posix shells by Vinay Sajip, July 2016. import os import re @@ -17,7 +18,8 @@ __all__ = ["shlex", "split", "quote"] class shlex: "A lexical analyzer class for simple shell-like syntaxes." - def __init__(self, instream=None, infile=None, posix=False): + def __init__(self, instream=None, infile=None, posix=False, + punctuation_chars=False): if isinstance(instream, str): instream = StringIO(instream) if instream is not None: @@ -49,6 +51,19 @@ class shlex: self.token = '' self.filestack = deque() self.source = None + if not punctuation_chars: + punctuation_chars = '' + elif punctuation_chars is True: + punctuation_chars = '();<>|&' + self.punctuation_chars = punctuation_chars + if punctuation_chars: + # _pushback_chars is a push back queue used by lookahead logic + self._pushback_chars = deque() + # these chars added because allowed in file names, args, wildcards + self.wordchars += '~-./*?=' + #remove any punctuation chars from wordchars + t = self.wordchars.maketrans(dict.fromkeys(punctuation_chars)) + self.wordchars = self.wordchars.translate(t) def push_token(self, tok): "Push a token onto the stack popped by the get_token method" @@ -115,12 +130,15 @@ class shlex: quoted = False escapedstate = ' ' while True: - nextchar = self.instream.read(1) + if self.punctuation_chars and self._pushback_chars: + nextchar = self._pushback_chars.pop() + else: + nextchar = self.instream.read(1) if nextchar == '\n': - self.lineno = self.lineno + 1 + self.lineno += 1 if self.debug >= 3: - print("shlex: in state", repr(self.state), \ - "I see character:", repr(nextchar)) + print("shlex: in state %r I see character: %r" % (self.state, + nextchar)) if self.state is None: self.token = '' # past end of file break @@ -137,13 +155,16 @@ class shlex: continue elif nextchar in self.commenters: self.instream.readline() - self.lineno = self.lineno + 1 + self.lineno += 1 elif self.posix and nextchar in self.escape: escapedstate = 'a' self.state = nextchar elif nextchar in self.wordchars: self.token = nextchar self.state = 'a' + elif nextchar in self.punctuation_chars: + self.token = nextchar + self.state = 'c' elif nextchar in self.quotes: if not self.posix: self.token = nextchar @@ -166,17 +187,17 @@ class shlex: raise ValueError("No closing quotation") if nextchar == self.state: if not self.posix: - self.token = self.token + nextchar + self.token += nextchar self.state = ' ' break else: self.state = 'a' - elif self.posix and nextchar in self.escape and \ - self.state in self.escapedquotes: + elif (self.posix and nextchar in self.escape and self.state + in self.escapedquotes): escapedstate = self.state self.state = nextchar else: - self.token = self.token + nextchar + self.token += nextchar elif self.state in self.escape: if not nextchar: # end of file if self.debug >= 2: @@ -185,12 +206,12 @@ class shlex: raise ValueError("No escaped character") # In posix shells, only the quote itself or the escape # character may be escaped within quotes. - if escapedstate in self.quotes and \ - nextchar != self.state and nextchar != escapedstate: - self.token = self.token + self.state - self.token = self.token + nextchar + if (escapedstate in self.quotes and + nextchar != self.state and nextchar != escapedstate): + self.token += self.state + self.token += nextchar self.state = escapedstate - elif self.state == 'a': + elif self.state in ('a', 'c'): if not nextchar: self.state = None # end of file break @@ -204,7 +225,7 @@ class shlex: continue elif nextchar in self.commenters: self.instream.readline() - self.lineno = self.lineno + 1 + self.lineno += 1 if self.posix: self.state = ' ' if self.token or (self.posix and quoted): @@ -216,11 +237,22 @@ class shlex: elif self.posix and nextchar in self.escape: escapedstate = 'a' self.state = nextchar - elif nextchar in self.wordchars or nextchar in self.quotes \ - or self.whitespace_split: - self.token = self.token + nextchar + elif self.state == 'c': + if nextchar in self.punctuation_chars: + self.token += nextchar + else: + if nextchar not in self.whitespace: + self._pushback_chars.append(nextchar) + self.state = ' ' + break + elif (nextchar in self.wordchars or nextchar in self.quotes + or self.whitespace_split): + self.token += nextchar else: - self.pushback.appendleft(nextchar) + if self.punctuation_chars: + self._pushback_chars.append(nextchar) + else: + self.pushback.appendleft(nextchar) if self.debug >= 2: print("shlex: I see punctuation in word state") self.state = ' ' diff --git a/Lib/shutil.py b/Lib/shutil.py index 16ca80b..90b7198 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -10,13 +10,7 @@ import stat import fnmatch import collections import errno - -try: - import zlib - del zlib - _ZLIB_SUPPORTED = True -except ImportError: - _ZLIB_SUPPORTED = False +import tarfile try: import bz2 @@ -608,22 +602,23 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, Returns the output filename. """ - if compress is None: - tar_compression = '' - elif _ZLIB_SUPPORTED and compress == 'gzip': - tar_compression = 'gz' - elif _BZ2_SUPPORTED and compress == 'bzip2': - tar_compression = 'bz2' - elif _LZMA_SUPPORTED and compress == 'xz': - tar_compression = 'xz' - else: + tar_compression = {'gzip': 'gz', None: ''} + compress_ext = {'gzip': '.gz'} + + if _BZ2_SUPPORTED: + tar_compression['bzip2'] = 'bz2' + compress_ext['bzip2'] = '.bz2' + + if _LZMA_SUPPORTED: + tar_compression['xz'] = 'xz' + compress_ext['xz'] = '.xz' + + # flags for compression program, each element of list will be an argument + if compress is not None and compress not in compress_ext: raise ValueError("bad value for 'compress', or compression format not " "supported : {0}".format(compress)) - import tarfile # late import for breaking circular dependency - - compress_ext = '.' + tar_compression if compress else '' - archive_name = base_name + '.tar' + compress_ext + archive_name = base_name + '.tar' + compress_ext.get(compress, '') archive_dir = os.path.dirname(archive_name) if archive_dir and not os.path.exists(archive_dir): @@ -649,7 +644,7 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, return tarinfo if not dry_run: - tar = tarfile.open(archive_name, 'w|%s' % tar_compression) + tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress]) try: tar.add(base_dir, filter=_set_uid_gid) finally: @@ -660,10 +655,13 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): """Create a zip file from all the files under 'base_dir'. - The output zip file will be named 'base_name' + ".zip". Returns the - name of the output zip file. + The output zip file will be named 'base_name' + ".zip". Uses either the + "zipfile" Python module (if available) or the InfoZIP "zip" utility + (if installed and found on the default search path). If neither tool is + available, raises ExecError. Returns the name of the output zip + file. """ - import zipfile # late import for breaking circular dependency + import zipfile zip_filename = base_name + ".zip" archive_dir = os.path.dirname(base_name) @@ -702,13 +700,10 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): return zip_filename _ARCHIVE_FORMATS = { + 'gztar': (_make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"), 'tar': (_make_tarball, [('compress', None)], "uncompressed tar file"), -} - -if _ZLIB_SUPPORTED: - _ARCHIVE_FORMATS['gztar'] = (_make_tarball, [('compress', 'gzip')], - "gzip'ed tar-file") - _ARCHIVE_FORMATS['zip'] = (_make_zipfile, [], "ZIP file") + 'zip': (_make_zipfile, [], "ZIP file") + } if _BZ2_SUPPORTED: _ARCHIVE_FORMATS['bztar'] = (_make_tarball, [('compress', 'bzip2')], @@ -757,8 +752,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0, """Create an archive file (eg. zip or tar). 'base_name' is the name of the file to create, minus any format-specific - extension; 'format' is the archive format: one of "zip", "tar", "gztar", - "bztar", or "xztar". Or any other registered format. + extension; 'format' is the archive format: one of "zip", "tar", "bztar" + or "gztar". 'root_dir' is a directory that will be the root directory of the archive; ie. we typically chdir into 'root_dir' before creating the @@ -871,7 +866,10 @@ def _ensure_directory(path): def _unpack_zipfile(filename, extract_dir): """Unpack zip `filename` to `extract_dir` """ - import zipfile # late import for breaking circular dependency + try: + import zipfile + except ImportError: + raise ReadError('zlib not supported, cannot unpack this archive.') if not zipfile.is_zipfile(filename): raise ReadError("%s is not a zip file" % filename) @@ -905,7 +903,6 @@ def _unpack_zipfile(filename, extract_dir): def _unpack_tarfile(filename, extract_dir): """Unpack tar/tar.gz/tar.bz2/tar.xz `filename` to `extract_dir` """ - import tarfile # late import for breaking circular dependency try: tarobj = tarfile.open(filename) except tarfile.TarError: @@ -917,13 +914,10 @@ def _unpack_tarfile(filename, extract_dir): tarobj.close() _UNPACK_FORMATS = { + 'gztar': (['.tar.gz', '.tgz'], _unpack_tarfile, [], "gzip'ed tar-file"), 'tar': (['.tar'], _unpack_tarfile, [], "uncompressed tar file"), - 'zip': (['.zip'], _unpack_zipfile, [], "ZIP file"), -} - -if _ZLIB_SUPPORTED: - _UNPACK_FORMATS['gztar'] = (['.tar.gz', '.tgz'], _unpack_tarfile, [], - "gzip'ed tar-file") + 'zip': (['.zip'], _unpack_zipfile, [], "ZIP file") + } if _BZ2_SUPPORTED: _UNPACK_FORMATS['bztar'] = (['.tar.bz2', '.tbz2'], _unpack_tarfile, [], @@ -948,10 +942,10 @@ def unpack_archive(filename, extract_dir=None, format=None): `extract_dir` is the name of the target directory, where the archive is unpacked. If not provided, the current working directory is used. - `format` is the archive format: one of "zip", "tar", "gztar", "bztar", - or "xztar". Or any other registered format. If not provided, - unpack_archive will use the filename extension and see if an unpacker - was registered for that extension. + `format` is the archive format: one of "zip", "tar", or "gztar". Or any + other registered format. If not provided, unpack_archive will use the + filename extension and see if an unpacker was registered for that + extension. In case none is found, a ValueError is raised. """ @@ -981,6 +975,9 @@ if hasattr(os, 'statvfs'): __all__.append('disk_usage') _ntuple_diskusage = collections.namedtuple('usage', 'total used free') + _ntuple_diskusage.total.__doc__ = 'Total space in bytes' + _ntuple_diskusage.used.__doc__ = 'Used space in bytes' + _ntuple_diskusage.free.__doc__ = 'Free space in bytes' def disk_usage(path): """Return disk usage statistics about the given path. diff --git a/Lib/site-packages/README.txt b/Lib/site-packages/README.txt new file mode 100644 index 0000000..273f625 --- /dev/null +++ b/Lib/site-packages/README.txt @@ -0,0 +1,2 @@ +This directory exists so that 3rd party packages can be installed +here. Read the source for site.py for more details. diff --git a/Lib/site.py b/Lib/site.py index 3f78ef5..0fc9200 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -60,7 +60,8 @@ omitted because it is not mentioned in either path configuration file. The readline module is also automatically configured to enable completion for systems that support it. This can be overridden in -sitecustomize, usercustomize or PYTHONSTARTUP. +sitecustomize, usercustomize or PYTHONSTARTUP. Starting Python in +isolated mode (-I) disables automatic readline configuration. After these operations, an attempt is made to import a module named sitecustomize, which can perform arbitrary additional @@ -131,13 +132,13 @@ def removeduppaths(): def _init_pathinfo(): - """Return a set containing all existing directory entries from sys.path""" + """Return a set containing all existing file system items from sys.path.""" d = set() - for dir in sys.path: + for item in sys.path: try: - if os.path.isdir(dir): - dir, dircase = makepath(dir) - d.add(dircase) + if os.path.exists(item): + _, itemcase = makepath(item) + d.add(itemcase) except TypeError: continue return d @@ -150,9 +151,9 @@ def addpackage(sitedir, name, known_paths): """ if known_paths is None: known_paths = _init_pathinfo() - reset = 1 + reset = True else: - reset = 0 + reset = False fullname = os.path.join(sitedir, name) try: f = open(fullname, "r") @@ -190,9 +191,9 @@ def addsitedir(sitedir, known_paths=None): 'sitedir'""" if known_paths is None: known_paths = _init_pathinfo() - reset = 1 + reset = True else: - reset = 0 + reset = False sitedir, sitedircase = makepath(sitedir) if not sitedircase in known_paths: sys.path.append(sitedir) # Add path component @@ -304,7 +305,7 @@ def getsitepackages(prefixes=None): if os.sep == '/': sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], + "python%d.%d" % sys.version_info[:2], "site-packages")) else: sitepackages.append(prefix) @@ -317,7 +318,7 @@ def getsitepackages(prefixes=None): if framework: sitepackages.append( os.path.join("/Library", framework, - sys.version[:3], "site-packages")) + '%d.%d' % sys.version_info[:2], "site-packages")) return sitepackages def addsitepackages(known_paths, prefixes=None): @@ -335,9 +336,7 @@ def setquit(): The repr of each object contains a hint at how it works. """ - if os.sep == ':': - eof = 'Cmd-Q' - elif os.sep == '\\': + if os.sep == '\\': eof = 'Ctrl-Z plus Return' else: eof = 'Ctrl-D (i.e. EOF)' @@ -423,23 +422,6 @@ def enablerlcompleter(): sys.__interactivehook__ = register_readline -def aliasmbcs(): - """On Windows, some default encodings are not provided by Python, - while they are always available as "mbcs" in each locale. Make - them usable by aliasing to "mbcs" in such a case.""" - if sys.platform == 'win32': - import _bootlocale, codecs - enc = _bootlocale.getpreferredencoding(False) - if enc.startswith('cp'): # "cp***" ? - try: - codecs.lookup(enc) - except LookupError: - import encodings - encodings._cache[enc] = encodings._unknown - encodings.aliases.aliases[enc] = 'mbcs' - -CONFIG_LINE = r'^(?P(\w|[-_])+)\s*=\s*(?P.*)\s*$' - def venv(known_paths): global PREFIXES, ENABLE_USER_SITE @@ -461,29 +443,20 @@ def venv(known_paths): ] if candidate_confs: - import re - config_line = re.compile(CONFIG_LINE) virtual_conf = candidate_confs[0] system_site = "true" # Issue 25185: Use UTF-8, as that's what the venv module uses when # writing the file. with open(virtual_conf, encoding='utf-8') as f: for line in f: - line = line.strip() - m = config_line.match(line) - if m: - d = m.groupdict() - key, value = d['key'].lower(), d['value'] + if '=' in line: + key, _, value = line.partition('=') + key = key.strip().lower() + value = value.strip() if key == 'include-system-site-packages': system_site = value.lower() elif key == 'home': sys._home = value - elif key == 'applocal' and value.lower() == 'true': - # App-local installs use the exe_dir as prefix, - # not one level higher, and do not use system - # site packages. - site_prefix = exe_dir - system_site = 'false' sys.prefix = sys.exec_prefix = site_prefix @@ -504,11 +477,15 @@ def venv(known_paths): def execsitecustomize(): """Run custom site specific code, if available.""" try: - import sitecustomize - except ImportError: - pass + try: + import sitecustomize + except ImportError as exc: + if exc.name == 'sitecustomize': + pass + else: + raise except Exception as err: - if os.environ.get("PYTHONVERBOSE"): + if sys.flags.verbose: sys.excepthook(*sys.exc_info()) else: sys.stderr.write( @@ -520,11 +497,15 @@ def execsitecustomize(): def execusercustomize(): """Run custom user specific code, if available.""" try: - import usercustomize - except ImportError: - pass + try: + import usercustomize + except ImportError as exc: + if exc.name == 'usercustomize': + pass + else: + raise except Exception as err: - if os.environ.get("PYTHONVERBOSE"): + if sys.flags.verbose: sys.excepthook(*sys.exc_info()) else: sys.stderr.write( @@ -551,13 +532,13 @@ def main(): setquit() setcopyright() sethelper() - enablerlcompleter() - aliasmbcs() + if not sys.flags.isolated: + enablerlcompleter() execsitecustomize() if ENABLE_USER_SITE: execusercustomize() -# Prevent edition of sys.path when python was started with -S and +# Prevent extending of sys.path when python was started with -S and # site is imported later. if not sys.flags.no_site: main() diff --git a/Lib/smtpd.py b/Lib/smtpd.py index 732066e..8103ca9 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -89,7 +89,10 @@ import collections from warnings import warn from email._header_value_parser import get_addr_spec, get_angle_addr -__all__ = ["SMTPServer","DebuggingServer","PureProxy","MailmanProxy"] +__all__ = [ + "SMTPChannel", "SMTPServer", "DebuggingServer", "PureProxy", + "MailmanProxy", +] program = sys.argv[0] __version__ = 'Python SMTP proxy version 0.3' @@ -128,24 +131,17 @@ class SMTPChannel(asynchat.async_chat): return self.command_size_limit def __init__(self, server, conn, addr, data_size_limit=DATA_SIZE_DEFAULT, - map=None, enable_SMTPUTF8=False, decode_data=None): + map=None, enable_SMTPUTF8=False, decode_data=False): asynchat.async_chat.__init__(self, conn, map=map) self.smtp_server = server self.conn = conn self.addr = addr self.data_size_limit = data_size_limit self.enable_SMTPUTF8 = enable_SMTPUTF8 - if enable_SMTPUTF8: - if decode_data: - raise ValueError("decode_data and enable_SMTPUTF8 cannot" - " be set to True at the same time") - decode_data = False - if decode_data is None: - warn("The decode_data default of True will change to False in 3.6;" - " specify an explicit value for this keyword", - DeprecationWarning, 2) - decode_data = True self._decode_data = decode_data + if enable_SMTPUTF8 and decode_data: + raise ValueError("decode_data and enable_SMTPUTF8 cannot" + " be set to True at the same time") if decode_data: self._emptystring = '' self._linesep = '\r\n' @@ -635,23 +631,15 @@ class SMTPServer(asyncore.dispatcher): def __init__(self, localaddr, remoteaddr, data_size_limit=DATA_SIZE_DEFAULT, map=None, - enable_SMTPUTF8=False, decode_data=None): + enable_SMTPUTF8=False, decode_data=False): self._localaddr = localaddr self._remoteaddr = remoteaddr self.data_size_limit = data_size_limit self.enable_SMTPUTF8 = enable_SMTPUTF8 - if enable_SMTPUTF8: - if decode_data: - raise ValueError("The decode_data and enable_SMTPUTF8" - " parameters cannot be set to True at the" - " same time.") - decode_data = False - if decode_data is None: - warn("The decode_data default of True will change to False in 3.6;" - " specify an explicit value for this keyword", - DeprecationWarning, 2) - decode_data = True self._decode_data = decode_data + if enable_SMTPUTF8 and decode_data: + raise ValueError("decode_data and enable_SMTPUTF8 cannot" + " be set to True at the same time") asyncore.dispatcher.__init__(self, map=map) try: gai_results = socket.getaddrinfo(*localaddr, @@ -698,9 +686,9 @@ class SMTPServer(asyncore.dispatcher): containing a `.' followed by other text has had the leading dot removed. - kwargs is a dictionary containing additional information. It is empty - unless decode_data=False or enable_SMTPUTF8=True was given as init - parameter, in which case ut will contain the following keys: + kwargs is a dictionary containing additional information. It is + empty if decode_data=True was given as init parameter, otherwise + it will contain the following keys: 'mail_options': list of parameters to the mail command. All elements are uppercase strings. Example: ['BODY=8BITMIME', 'SMTPUTF8']. diff --git a/Lib/smtplib.py b/Lib/smtplib.py index ab3197c..f7c2c77 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -250,7 +250,6 @@ class SMTP: if host: (code, msg) = self.connect(host, port) if code != 220: - self.close() raise SMTPConnectError(code, msg) if local_hostname is not None: self.local_hostname = local_hostname @@ -760,6 +759,10 @@ class SMTP: if context is not None and certfile is not None: raise ValueError("context and certfile arguments are mutually " "exclusive") + if keyfile is not None or certfile is not None: + import warnings + warnings.warn("keyfile and certfile are deprecated, use a" + "custom context instead", DeprecationWarning, 2) if context is None: context = ssl._create_stdlib_context(certfile=certfile, keyfile=keyfile) @@ -1012,6 +1015,10 @@ if _have_ssl: if context is not None and certfile is not None: raise ValueError("context and certfile arguments are mutually " "exclusive") + if keyfile is not None or certfile is not None: + import warnings + warnings.warn("keyfile and certfile are deprecated, use a" + "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile if context is None: diff --git a/Lib/sndhdr.py b/Lib/sndhdr.py index e5901ec..7ecafb4 100644 --- a/Lib/sndhdr.py +++ b/Lib/sndhdr.py @@ -37,6 +37,18 @@ from collections import namedtuple SndHeaders = namedtuple('SndHeaders', 'filetype framerate nchannels nframes sampwidth') +SndHeaders.filetype.__doc__ = ("""The value for type indicates the data type +and will be one of the strings 'aifc', 'aiff', 'au','hcom', +'sndr', 'sndt', 'voc', 'wav', '8svx', 'sb', 'ub', or 'ul'.""") +SndHeaders.framerate.__doc__ = ("""The sampling_rate will be either the actual +value or 0 if unknown or difficult to decode.""") +SndHeaders.nchannels.__doc__ = ("""The number of channels or 0 if it cannot be +determined or if the value is difficult to decode.""") +SndHeaders.nframes.__doc__ = ("""The value for frames will be either the number +of frames or -1.""") +SndHeaders.sampwidth.__doc__ = ("""Either the sample size in bits or +'A' for A-LAW or 'U' for u-LAW.""") + def what(filename): """Guess the type of a sound file.""" res = whathdr(filename) diff --git a/Lib/socket.py b/Lib/socket.py index a9cab32..740e717 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -50,7 +50,7 @@ import _socket from _socket import * import os, sys, io, selectors -from enum import IntEnum +from enum import IntEnum, IntFlag try: import errno @@ -80,6 +80,16 @@ IntEnum._convert( __name__, lambda C: C.isupper() and C.startswith('SOCK_')) +IntFlag._convert( + 'MsgFlag', + __name__, + lambda C: C.isupper() and C.startswith('MSG_')) + +IntFlag._convert( + 'AddressInfo', + __name__, + lambda C: C.isupper() and C.startswith('AI_')) + _LOCALHOST = '127.0.0.1' _LOCALHOST_V6 = '::1' diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 8808813..41a3766 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -127,16 +127,20 @@ import socket import selectors import os import errno +import sys try: import threading except ImportError: import dummy_threading as threading +from io import BufferedIOBase from time import monotonic as time -__all__ = ["BaseServer", "TCPServer", "UDPServer", "ForkingUDPServer", - "ForkingTCPServer", "ThreadingUDPServer", "ThreadingTCPServer", +__all__ = ["BaseServer", "TCPServer", "UDPServer", + "ThreadingUDPServer", "ThreadingTCPServer", "BaseRequestHandler", "StreamRequestHandler", - "DatagramRequestHandler", "ThreadingMixIn", "ForkingMixIn"] + "DatagramRequestHandler", "ThreadingMixIn"] +if hasattr(os, "fork"): + __all__.extend(["ForkingUDPServer","ForkingTCPServer", "ForkingMixIn"]) if hasattr(socket, "AF_UNIX"): __all__.extend(["UnixStreamServer","UnixDatagramServer", "ThreadingUnixStreamServer", @@ -311,9 +315,12 @@ class BaseServer: if self.verify_request(request, client_address): try: self.process_request(request, client_address) - except: + except Exception: self.handle_error(request, client_address) self.shutdown_request(request) + except: + self.shutdown_request(request) + raise else: self.shutdown_request(request) @@ -367,12 +374,18 @@ class BaseServer: The default is to print a traceback and continue. """ - print('-'*40) - print('Exception happened during processing of request from', end=' ') - print(client_address) + print('-'*40, file=sys.stderr) + print('Exception happened during processing of request from', + client_address, file=sys.stderr) import traceback - traceback.print_exc() # XXX But this goes to stderr! - print('-'*40) + traceback.print_exc() + print('-'*40, file=sys.stderr) + + def __enter__(self): + return self + + def __exit__(self, *args): + self.server_close() class TCPServer(BaseServer): @@ -527,85 +540,86 @@ class UDPServer(TCPServer): # No need to close anything. pass -class ForkingMixIn: - - """Mix-in class to handle each request in a new process.""" - - timeout = 300 - active_children = None - max_children = 40 - - def collect_children(self): - """Internal routine to wait for children that have exited.""" - if self.active_children is None: - return - - # If we're above the max number of children, wait and reap them until - # we go back below threshold. Note that we use waitpid(-1) below to be - # able to collect children in size() syscalls instead - # of size(): the downside is that this might reap children - # which we didn't spawn, which is why we only resort to this when we're - # above max_children. - while len(self.active_children) >= self.max_children: - try: - pid, _ = os.waitpid(-1, 0) - self.active_children.discard(pid) - except ChildProcessError: - # we don't have any children, we're done - self.active_children.clear() - except OSError: - break - - # Now reap all defunct children. - for pid in self.active_children.copy(): - try: - pid, _ = os.waitpid(pid, os.WNOHANG) - # if the child hasn't exited yet, pid will be 0 and ignored by - # discard() below - self.active_children.discard(pid) - except ChildProcessError: - # someone else reaped it - self.active_children.discard(pid) - except OSError: - pass - - def handle_timeout(self): - """Wait for zombies after self.timeout seconds of inactivity. +if hasattr(os, "fork"): + class ForkingMixIn: + """Mix-in class to handle each request in a new process.""" - May be extended, do not override. - """ - self.collect_children() + timeout = 300 + active_children = None + max_children = 40 - def service_actions(self): - """Collect the zombie child processes regularly in the ForkingMixIn. - - service_actions is called in the BaseServer's serve_forver loop. - """ - self.collect_children() - - def process_request(self, request, client_address): - """Fork a new subprocess to process the request.""" - pid = os.fork() - if pid: - # Parent process + def collect_children(self): + """Internal routine to wait for children that have exited.""" if self.active_children is None: - self.active_children = set() - self.active_children.add(pid) - self.close_request(request) - return - else: - # Child process. - # This must never return, hence os._exit()! - try: - self.finish_request(request, client_address) - self.shutdown_request(request) - os._exit(0) - except: + return + + # If we're above the max number of children, wait and reap them until + # we go back below threshold. Note that we use waitpid(-1) below to be + # able to collect children in size() syscalls instead + # of size(): the downside is that this might reap children + # which we didn't spawn, which is why we only resort to this when we're + # above max_children. + while len(self.active_children) >= self.max_children: + try: + pid, _ = os.waitpid(-1, 0) + self.active_children.discard(pid) + except ChildProcessError: + # we don't have any children, we're done + self.active_children.clear() + except OSError: + break + + # Now reap all defunct children. + for pid in self.active_children.copy(): try: + pid, _ = os.waitpid(pid, os.WNOHANG) + # if the child hasn't exited yet, pid will be 0 and ignored by + # discard() below + self.active_children.discard(pid) + except ChildProcessError: + # someone else reaped it + self.active_children.discard(pid) + except OSError: + pass + + def handle_timeout(self): + """Wait for zombies after self.timeout seconds of inactivity. + + May be extended, do not override. + """ + self.collect_children() + + def service_actions(self): + """Collect the zombie child processes regularly in the ForkingMixIn. + + service_actions is called in the BaseServer's serve_forver loop. + """ + self.collect_children() + + def process_request(self, request, client_address): + """Fork a new subprocess to process the request.""" + pid = os.fork() + if pid: + # Parent process + if self.active_children is None: + self.active_children = set() + self.active_children.add(pid) + self.close_request(request) + return + else: + # Child process. + # This must never return, hence os._exit()! + status = 1 + try: + self.finish_request(request, client_address) + status = 0 + except Exception: self.handle_error(request, client_address) - self.shutdown_request(request) finally: - os._exit(1) + try: + self.shutdown_request(request) + finally: + os._exit(status) class ThreadingMixIn: @@ -623,9 +637,9 @@ class ThreadingMixIn: """ try: self.finish_request(request, client_address) - self.shutdown_request(request) - except: + except Exception: self.handle_error(request, client_address) + finally: self.shutdown_request(request) def process_request(self, request, client_address): @@ -636,8 +650,9 @@ class ThreadingMixIn: t.start() -class ForkingUDPServer(ForkingMixIn, UDPServer): pass -class ForkingTCPServer(ForkingMixIn, TCPServer): pass +if hasattr(os, "fork"): + class ForkingUDPServer(ForkingMixIn, UDPServer): pass + class ForkingTCPServer(ForkingMixIn, TCPServer): pass class ThreadingUDPServer(ThreadingMixIn, UDPServer): pass class ThreadingTCPServer(ThreadingMixIn, TCPServer): pass @@ -729,7 +744,10 @@ class StreamRequestHandler(BaseRequestHandler): self.connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True) self.rfile = self.connection.makefile('rb', self.rbufsize) - self.wfile = self.connection.makefile('wb', self.wbufsize) + if self.wbufsize == 0: + self.wfile = _SocketWriter(self.connection) + else: + self.wfile = self.connection.makefile('wb', self.wbufsize) def finish(self): if not self.wfile.closed: @@ -742,6 +760,24 @@ class StreamRequestHandler(BaseRequestHandler): self.wfile.close() self.rfile.close() +class _SocketWriter(BufferedIOBase): + """Simple writable BufferedIOBase implementation for a socket + + Does not hold data in a buffer, avoiding any need to call flush().""" + + def __init__(self, sock): + self._sock = sock + + def writable(self): + return True + + def write(self, b): + self._sock.sendall(b) + with memoryview(b) as view: + return view.nbytes + + def fileno(self): + return self._sock.fileno() class DatagramRequestHandler(BaseRequestHandler): diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index 7fb8d7e..cb85814 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -188,7 +188,10 @@ class CursorTests(unittest.TestCase): def setUp(self): self.cx = sqlite.connect(":memory:") self.cu = self.cx.cursor() - self.cu.execute("create table test(id integer primary key, name text, income number)") + self.cu.execute( + "create table test(id integer primary key, name text, " + "income number, unique_test text unique)" + ) self.cu.execute("insert into test(name) values (?)", ("foo",)) def tearDown(self): @@ -462,6 +465,44 @@ class CursorTests(unittest.TestCase): with self.assertRaises(TypeError): cur = sqlite.Cursor(foo) + def CheckLastRowIDOnReplace(self): + """ + INSERT OR REPLACE and REPLACE INTO should produce the same behavior. + """ + sql = '{} INTO test(id, unique_test) VALUES (?, ?)' + for statement in ('INSERT OR REPLACE', 'REPLACE'): + with self.subTest(statement=statement): + self.cu.execute(sql.format(statement), (1, 'foo')) + self.assertEqual(self.cu.lastrowid, 1) + + def CheckLastRowIDOnIgnore(self): + self.cu.execute( + "insert or ignore into test(unique_test) values (?)", + ('test',)) + self.assertEqual(self.cu.lastrowid, 2) + self.cu.execute( + "insert or ignore into test(unique_test) values (?)", + ('test',)) + self.assertEqual(self.cu.lastrowid, 2) + + def CheckLastRowIDInsertOR(self): + results = [] + for statement in ('FAIL', 'ABORT', 'ROLLBACK'): + sql = 'INSERT OR {} INTO test(unique_test) VALUES (?)' + with self.subTest(statement='INSERT OR {}'.format(statement)): + self.cu.execute(sql.format(statement), (statement,)) + results.append((statement, self.cu.lastrowid)) + with self.assertRaises(sqlite.IntegrityError): + self.cu.execute(sql.format(statement), (statement,)) + results.append((statement, self.cu.lastrowid)) + expected = [ + ('FAIL', 2), ('FAIL', 2), + ('ABORT', 3), ('ABORT', 3), + ('ROLLBACK', 4), ('ROLLBACK', 4), + ] + self.assertEqual(results, expected) + + @unittest.skipUnless(threading, 'This test requires threading.') class ThreadTests(unittest.TestCase): def setUp(self): diff --git a/Lib/sqlite3/test/transactions.py b/Lib/sqlite3/test/transactions.py index a25360a..45f1b04 100644 --- a/Lib/sqlite3/test/transactions.py +++ b/Lib/sqlite3/test/transactions.py @@ -52,13 +52,13 @@ class TransactionTests(unittest.TestCase): except OSError: pass - def CheckDMLdoesAutoCommitBefore(self): + def CheckDMLDoesNotAutoCommitBefore(self): self.cur1.execute("create table test(i)") self.cur1.execute("insert into test(i) values (5)") self.cur1.execute("create table test2(j)") self.cur2.execute("select i from test") res = self.cur2.fetchall() - self.assertEqual(len(res), 1) + self.assertEqual(len(res), 0) def CheckInsertStartsTransaction(self): self.cur1.execute("create table test(i)") @@ -153,11 +153,6 @@ class SpecialCommandTests(unittest.TestCase): self.con = sqlite.connect(":memory:") self.cur = self.con.cursor() - def CheckVacuum(self): - self.cur.execute("create table test(i)") - self.cur.execute("insert into test(i) values (5)") - self.cur.execute("vacuum") - def CheckDropTable(self): self.cur.execute("create table test(i)") self.cur.execute("insert into test(i) values (5)") @@ -172,10 +167,35 @@ class SpecialCommandTests(unittest.TestCase): self.cur.close() self.con.close() +class TransactionalDDL(unittest.TestCase): + def setUp(self): + self.con = sqlite.connect(":memory:") + + def CheckDdlDoesNotAutostartTransaction(self): + # For backwards compatibility reasons, DDL statements should not + # implicitly start a transaction. + self.con.execute("create table test(i)") + self.con.rollback() + result = self.con.execute("select * from test").fetchall() + self.assertEqual(result, []) + + def CheckTransactionalDDL(self): + # You can achieve transactional DDL by issuing a BEGIN + # statement manually. + self.con.execute("begin") + self.con.execute("create table test(i)") + self.con.rollback() + with self.assertRaises(sqlite.OperationalError): + self.con.execute("select * from test") + + def tearDown(self): + self.con.close() + def suite(): default_suite = unittest.makeSuite(TransactionTests, "Check") special_command_suite = unittest.makeSuite(SpecialCommandTests, "Check") - return unittest.TestSuite((default_suite, special_command_suite)) + ddl_suite = unittest.makeSuite(TransactionalDDL, "Check") + return unittest.TestSuite((default_suite, special_command_suite, ddl_suite)) def test(): runner = unittest.TextTestRunner() diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py index 6bc8d71..0b5b3e7 100644 --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -382,7 +382,8 @@ class DateTimeTests(unittest.TestCase): @unittest.skipIf(sqlite.sqlite_version_info < (3, 1), 'the date functions are available on 3.1 or later') def CheckSqlTimestamp(self): - now = datetime.datetime.utcnow() + # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. + now = datetime.datetime.now() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py index 502b061..420d83d 100644 --- a/Lib/sre_compile.py +++ b/Lib/sre_compile.py @@ -71,7 +71,8 @@ def _compile(code, pattern, flags): ASSERT_CODES = _ASSERT_CODES if (flags & SRE_FLAG_IGNORECASE and not (flags & SRE_FLAG_LOCALE) and - flags & SRE_FLAG_UNICODE): + flags & SRE_FLAG_UNICODE and + not (flags & SRE_FLAG_ASCII)): fixes = _ignorecase_fixes else: fixes = None @@ -137,14 +138,15 @@ def _compile(code, pattern, flags): else: emit(MIN_UNTIL) elif op is SUBPATTERN: - if av[0]: + group, add_flags, del_flags, p = av + if group: emit(MARK) - emit((av[0]-1)*2) - # _compile_info(code, av[1], flags) - _compile(code, av[1], flags) - if av[0]: + emit((group-1)*2) + # _compile_info(code, p, (flags | add_flags) & ~del_flags) + _compile(code, p, (flags | add_flags) & ~del_flags) + if group: emit(MARK) - emit((av[0]-1)*2+1) + emit((group-1)*2+1) elif op in SUCCESS_CODES: emit(op) elif op in ASSERT_CODES: @@ -172,7 +174,7 @@ def _compile(code, pattern, flags): av = AT_MULTILINE.get(av, av) if flags & SRE_FLAG_LOCALE: av = AT_LOCALE.get(av, av) - elif flags & SRE_FLAG_UNICODE: + elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII): av = AT_UNICODE.get(av, av) emit(av) elif op is BRANCH: @@ -193,7 +195,7 @@ def _compile(code, pattern, flags): emit(op) if flags & SRE_FLAG_LOCALE: av = CH_LOCALE[av] - elif flags & SRE_FLAG_UNICODE: + elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII): av = CH_UNICODE[av] emit(av) elif op is GROUPREF: @@ -237,7 +239,7 @@ def _compile_charset(charset, flags, code, fixup=None, fixes=None): elif op is CATEGORY: if flags & SRE_FLAG_LOCALE: emit(CH_LOCALE[av]) - elif flags & SRE_FLAG_UNICODE: + elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII): emit(CH_UNICODE[av]) else: emit(av) @@ -409,42 +411,42 @@ def _generate_overlap_table(prefix): table[i] = idx + 1 return table -def _compile_info(code, pattern, flags): - # internal: compile an info block. in the current version, - # this contains min/max pattern width, and an optional literal - # prefix or a character map - lo, hi = pattern.getwidth() - if hi > MAXCODE: - hi = MAXCODE - if lo == 0: - code.extend([INFO, 4, 0, lo, hi]) - return - # look for a literal prefix +def _get_literal_prefix(pattern): + # look for literal prefix prefix = [] prefixappend = prefix.append - prefix_skip = 0 + prefix_skip = None + for op, av in pattern.data: + if op is LITERAL: + prefixappend(av) + elif op is SUBPATTERN: + group, add_flags, del_flags, p = av + if add_flags & SRE_FLAG_IGNORECASE: + break + prefix1, prefix_skip1, got_all = _get_literal_prefix(p) + if prefix_skip is None: + if group is not None: + prefix_skip = len(prefix) + elif prefix_skip1 is not None: + prefix_skip = len(prefix) + prefix_skip1 + prefix.extend(prefix1) + if not got_all: + break + else: + break + else: + return prefix, prefix_skip, True + return prefix, prefix_skip, False + +def _get_charset_prefix(pattern): charset = [] # not used charsetappend = charset.append - if not (flags & SRE_FLAG_IGNORECASE): - # look for literal prefix - for op, av in pattern.data: - if op is LITERAL: - if len(prefix) == prefix_skip: - prefix_skip = prefix_skip + 1 - prefixappend(av) - elif op is SUBPATTERN and len(av[1]) == 1: - op, av = av[1][0] - if op is LITERAL: - prefixappend(av) - else: - break - else: - break - # if no prefix, look for charset prefix - if not prefix and pattern.data: - op, av = pattern.data[0] - if op is SUBPATTERN and av[1]: - op, av = av[1][0] + if pattern.data: + op, av = pattern.data[0] + if op is SUBPATTERN: + group, add_flags, del_flags, p = av + if p and not (add_flags & SRE_FLAG_IGNORECASE): + op, av = p[0] if op is LITERAL: charsetappend((op, av)) elif op is BRANCH: @@ -460,21 +462,43 @@ def _compile_info(code, pattern, flags): break else: charset = c - elif op is BRANCH: - c = [] - cappend = c.append - for p in av[1]: - if not p: - break - op, av = p[0] - if op is LITERAL: - cappend((op, av)) - else: - break + elif op is BRANCH: + c = [] + cappend = c.append + for p in av[1]: + if not p: + break + op, av = p[0] + if op is LITERAL: + cappend((op, av)) else: - charset = c - elif op is IN: - charset = av + break + else: + charset = c + elif op is IN: + charset = av + return charset + +def _compile_info(code, pattern, flags): + # internal: compile an info block. in the current version, + # this contains min/max pattern width, and an optional literal + # prefix or a character map + lo, hi = pattern.getwidth() + if hi > MAXCODE: + hi = MAXCODE + if lo == 0: + code.extend([INFO, 4, 0, lo, hi]) + return + # look for a literal prefix + prefix = [] + prefix_skip = 0 + charset = [] # not used + if not (flags & SRE_FLAG_IGNORECASE): + # look for literal prefix + prefix, prefix_skip, got_all = _get_literal_prefix(pattern) + # if no prefix, look for charset prefix + if not prefix: + charset = _get_charset_prefix(pattern) ## if prefix: ## print("*** PREFIX", prefix, prefix_skip) ## if charset: @@ -487,7 +511,7 @@ def _compile_info(code, pattern, flags): mask = 0 if prefix: mask = SRE_INFO_PREFIX - if len(prefix) == prefix_skip == len(pattern.data): + if prefix_skip is None and got_all: mask = mask | SRE_INFO_LITERAL elif charset: mask = mask | SRE_INFO_CHARSET @@ -502,6 +526,8 @@ def _compile_info(code, pattern, flags): # add literal prefix if prefix: emit(len(prefix)) # length + if prefix_skip is None: + prefix_skip = len(prefix) emit(prefix_skip) # skip code.extend(prefix) # generate overlap table diff --git a/Lib/sre_constants.py b/Lib/sre_constants.py index a6e8a1f..fc684ae 100644 --- a/Lib/sre_constants.py +++ b/Lib/sre_constants.py @@ -21,17 +21,6 @@ from _sre import MAXREPEAT, MAXGROUPS # should this really be here? class error(Exception): - """Exception raised for invalid regular expressions. - - Attributes: - - msg: The unformatted error message - pattern: The regular expression pattern - pos: The index in the pattern where compilation failed (may be None) - lineno: The line corresponding to pos (may be None) - colno: The column corresponding to pos (may be None) - """ - def __init__(self, msg, pattern=None, pos=None): self.msg = msg self.pattern = pattern diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index df94784..6aa49c3 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -65,6 +65,12 @@ FLAGS = { "u": SRE_FLAG_UNICODE, } +GLOBAL_FLAGS = (SRE_FLAG_ASCII | SRE_FLAG_LOCALE | SRE_FLAG_UNICODE | + SRE_FLAG_DEBUG | SRE_FLAG_TEMPLATE) + +class Verbose(Exception): + pass + class Pattern: # master pattern object. keeps track of global attributes def __init__(self): @@ -184,7 +190,7 @@ class SubPattern: lo = lo + i hi = hi + j elif op is SUBPATTERN: - i, j = av[1].getwidth() + i, j = av[-1].getwidth() lo = lo + i hi = hi + j elif op in _REPEATCODES: @@ -273,6 +279,9 @@ class Tokenizer: break result += c return result + @property + def pos(self): + return self.index - len(self.next or '') def tell(self): return self.index - len(self.next or '') def seek(self, index): @@ -282,34 +291,7 @@ class Tokenizer: def error(self, msg, offset=0): return error(msg, self.string, self.tell() - offset) -# The following three functions are not used in this module anymore, but we keep -# them here (with DeprecationWarnings) for backwards compatibility. - -def isident(char): - import warnings - warnings.warn('sre_parse.isident() will be removed in 3.5', - DeprecationWarning, stacklevel=2) - return "a" <= char <= "z" or "A" <= char <= "Z" or char == "_" - -def isdigit(char): - import warnings - warnings.warn('sre_parse.isdigit() will be removed in 3.5', - DeprecationWarning, stacklevel=2) - return "0" <= char <= "9" - -def isname(name): - import warnings - warnings.warn('sre_parse.isname() will be removed in 3.5', - DeprecationWarning, stacklevel=2) - # check that group name is a valid string - if not isident(name[0]): - return False - for char in name[1:]: - if not isident(char) and not isdigit(char): - return False - return True - -def _class_escape(source, escape, nested): +def _class_escape(source, escape): # handle escape code inside character class code = ESCAPES.get(escape) if code: @@ -351,15 +333,13 @@ def _class_escape(source, escape, nested): raise ValueError if len(escape) == 2: if c in ASCIILETTERS: - import warnings - warnings.warn('bad escape %s' % escape, - DeprecationWarning, stacklevel=nested + 6) + raise source.error('bad escape %s' % escape, len(escape)) return LITERAL, ord(escape[1]) except ValueError: pass raise source.error("bad escape %s" % escape, len(escape)) -def _escape(source, escape, state, nested): +def _escape(source, escape, state): # handle escape code in expression code = CATEGORIES.get(escape) if code: @@ -415,18 +395,16 @@ def _escape(source, escape, state, nested): len(escape)) state.checklookbehindgroup(group, source) return GROUPREF, group - raise source.error("invalid group reference", len(escape)) + raise source.error("invalid group reference %d" % group, len(escape) - 1) if len(escape) == 2: if c in ASCIILETTERS: - import warnings - warnings.warn('bad escape %s' % escape, - DeprecationWarning, stacklevel=nested + 6) + raise source.error("bad escape %s" % escape, len(escape)) return LITERAL, ord(escape[1]) except ValueError: pass raise source.error("bad escape %s" % escape, len(escape)) -def _parse_sub(source, state, nested): +def _parse_sub(source, state, verbose, nested=True): # parse an alternation: a|b|c items = [] @@ -434,7 +412,7 @@ def _parse_sub(source, state, nested): sourcematch = source.match start = source.tell() while True: - itemsappend(_parse(source, state, nested + 1)) + itemsappend(_parse(source, state, verbose)) if not sourcematch("|"): break @@ -476,10 +454,10 @@ def _parse_sub(source, state, nested): subpattern.append((BRANCH, (None, items))) return subpattern -def _parse_sub_cond(source, state, condgroup, nested): - item_yes = _parse(source, state, nested + 1) +def _parse_sub_cond(source, state, condgroup, verbose): + item_yes = _parse(source, state, verbose) if source.match("|"): - item_no = _parse(source, state, nested + 1) + item_no = _parse(source, state, verbose) if source.next == "|": raise source.error("conditional backref with more than two branches") else: @@ -488,7 +466,7 @@ def _parse_sub_cond(source, state, condgroup, nested): subpattern.append((GROUPREF_EXISTS, (condgroup, item_yes, item_no))) return subpattern -def _parse(source, state, nested): +def _parse(source, state, verbose): # parse a simple pattern subpattern = SubPattern(state) @@ -498,7 +476,6 @@ def _parse(source, state, nested): sourcematch = source.match _len = len _ord = ord - verbose = state.flags & SRE_FLAG_VERBOSE while True: @@ -521,7 +498,7 @@ def _parse(source, state, nested): continue if this[0] == "\\": - code = _escape(source, this, state, nested + 1) + code = _escape(source, this, state) subpatternappend(code) elif this not in SPECIAL_CHARS: @@ -546,7 +523,7 @@ def _parse(source, state, nested): if this == "]" and set != start: break elif this[0] == "\\": - code1 = _class_escape(source, this, nested + 1) + code1 = _class_escape(source, this) else: code1 = LITERAL, _ord(this) if sourcematch("-"): @@ -562,7 +539,7 @@ def _parse(source, state, nested): setappend((LITERAL, _ord("-"))) break if that[0] == "\\": - code2 = _class_escape(source, that, nested + 1) + code2 = _class_escape(source, that) else: code2 = LITERAL, _ord(that) if code1[0] != LITERAL or code2[0] != LITERAL: @@ -652,6 +629,8 @@ def _parse(source, state, nested): group = True name = None condgroup = None + add_flags = 0 + del_flags = 0 if sourcematch("?"): # options char = sourceget() @@ -713,7 +692,7 @@ def _parse(source, state, nested): lookbehindgroups = state.lookbehindgroups if lookbehindgroups is None: state.lookbehindgroups = state.groups - p = _parse_sub(source, state, nested + 1) + p = _parse_sub(source, state, verbose) if dir < 0: if lookbehindgroups is None: state.lookbehindgroups = None @@ -746,22 +725,26 @@ def _parse(source, state, nested): raise source.error("bad group number", len(condname) + 1) if condgroup >= MAXGROUPS: - raise source.error("invalid group reference", - len(condname) + 1) + msg = "invalid group reference %d" % condgroup + raise source.error(msg, len(condname) + 1) state.checklookbehindgroup(condgroup, source) - elif char in FLAGS: + elif char in FLAGS or char == "-": # flags - while True: - state.flags |= FLAGS[char] - char = sourceget() - if char is None: - raise source.error("missing )") - if char == ")": - break - if char not in FLAGS: - raise source.error("unknown flag", len(char)) - verbose = state.flags & SRE_FLAG_VERBOSE - continue + pos = source.pos + flags = _parse_flags(source, state, char) + if flags is None: # global flags + if pos != 3: # "(?x" + import warnings + warnings.warn( + 'Flags not at the start of the expression %s%s' % ( + source.string[:20], # truncate long regexes + ' (truncated)' if len(source.string) > 20 else '', + ), + DeprecationWarning, stacklevel=7 + ) + continue + add_flags, del_flags = flags + group = None else: raise source.error("unknown extension ?" + char, len(char) + 1) @@ -773,15 +756,17 @@ def _parse(source, state, nested): except error as err: raise source.error(err.msg, len(name) + 1) from None if condgroup: - p = _parse_sub_cond(source, state, condgroup, nested + 1) + p = _parse_sub_cond(source, state, condgroup, verbose) else: - p = _parse_sub(source, state, nested + 1) + sub_verbose = ((verbose or (add_flags & SRE_FLAG_VERBOSE)) and + not (del_flags & SRE_FLAG_VERBOSE)) + p = _parse_sub(source, state, sub_verbose) if not source.match(")"): raise source.error("missing ), unterminated subpattern", source.tell() - start) if group is not None: state.closegroup(group, p) - subpatternappend((SUBPATTERN, (group, p))) + subpatternappend((SUBPATTERN, (group, add_flags, del_flags, p))) elif this == "^": subpatternappend((AT, AT_BEGINNING)) @@ -794,14 +779,58 @@ def _parse(source, state, nested): return subpattern +def _parse_flags(source, state, char): + sourceget = source.get + add_flags = 0 + del_flags = 0 + if char != "-": + while True: + add_flags |= FLAGS[char] + char = sourceget() + if char is None: + raise source.error("missing -, : or )") + if char in ")-:": + break + if char not in FLAGS: + msg = "unknown flag" if char.isalpha() else "missing -, : or )" + raise source.error(msg, len(char)) + if char == ")": + if ((add_flags & SRE_FLAG_VERBOSE) and + not (state.flags & SRE_FLAG_VERBOSE)): + raise Verbose + state.flags |= add_flags + return None + if add_flags & GLOBAL_FLAGS: + raise source.error("bad inline flags: cannot turn on global flag", 1) + if char == "-": + char = sourceget() + if char is None: + raise source.error("missing flag") + if char not in FLAGS: + msg = "unknown flag" if char.isalpha() else "missing flag" + raise source.error(msg, len(char)) + while True: + del_flags |= FLAGS[char] + char = sourceget() + if char is None: + raise source.error("missing :") + if char == ":": + break + if char not in FLAGS: + msg = "unknown flag" if char.isalpha() else "missing :" + raise source.error(msg, len(char)) + assert char == ":" + if del_flags & GLOBAL_FLAGS: + raise source.error("bad inline flags: cannot turn off global flag", 1) + if add_flags & del_flags: + raise source.error("bad inline flags: flag turned on and off", 1) + return add_flags, del_flags + def fix_flags(src, flags): # Check and fix flags according to the type of pattern (str or bytes) if isinstance(src, str): if flags & SRE_FLAG_LOCALE: - import warnings - warnings.warn("LOCALE flag with a str pattern is deprecated. " - "Will be an error in 3.6", - DeprecationWarning, stacklevel=6) + raise ValueError("cannot use LOCALE flag with a str pattern") if not flags & SRE_FLAG_ASCII: flags |= SRE_FLAG_UNICODE elif flags & SRE_FLAG_UNICODE: @@ -810,10 +839,7 @@ def fix_flags(src, flags): if flags & SRE_FLAG_UNICODE: raise ValueError("cannot use UNICODE flag with a bytes pattern") if flags & SRE_FLAG_LOCALE and flags & SRE_FLAG_ASCII: - import warnings - warnings.warn("ASCII and LOCALE flags are incompatible. " - "Will be an error in 3.6", - DeprecationWarning, stacklevel=6) + raise ValueError("ASCII and LOCALE flags are incompatible") return flags def parse(str, flags=0, pattern=None): @@ -826,18 +852,23 @@ def parse(str, flags=0, pattern=None): pattern.flags = flags pattern.str = str - p = _parse_sub(source, pattern, 0) + try: + p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, False) + except Verbose: + # the VERBOSE flag was switched on inside the pattern. to be + # on the safe side, we'll parse the whole thing again... + pattern = Pattern() + pattern.flags = flags | SRE_FLAG_VERBOSE + pattern.str = str + source.seek(0) + p = _parse_sub(source, pattern, True, False) + p.pattern.flags = fix_flags(str, p.pattern.flags) if source.next is not None: assert source.next == ")" raise source.error("unbalanced parenthesis") - if not (flags & SRE_FLAG_VERBOSE) and p.pattern.flags & SRE_FLAG_VERBOSE: - # the VERBOSE flag was switched on inside the pattern. to be - # on the safe side, we'll parse the whole thing again... - return parse(str, p.pattern.flags) - if flags & SRE_FLAG_DEBUG: p.dump() @@ -852,7 +883,9 @@ def parse_template(source, pattern): literals = [] literal = [] lappend = literal.append - def addgroup(index): + def addgroup(index, pos): + if index > pattern.groups: + raise s.error("invalid group reference %d" % index, pos) if literal: literals.append(''.join(literal)) del literal[:] @@ -885,9 +918,9 @@ def parse_template(source, pattern): raise s.error("bad character in group name %r" % name, len(name) + 1) from None if index >= MAXGROUPS: - raise s.error("invalid group reference", + raise s.error("invalid group reference %d" % index, len(name) + 1) - addgroup(index) + addgroup(index, len(name) + 1) elif c == "0": if s.next in OCTDIGITS: this += sget() @@ -908,7 +941,7 @@ def parse_template(source, pattern): 'range 0-0o377' % this, len(this)) lappend(chr(c)) if not isoctal: - addgroup(int(this[1:])) + addgroup(int(this[1:]), len(this) - 1) else: try: this = chr(ESCAPES[this][1]) @@ -937,5 +970,5 @@ def expand_template(template, match): for index, group in groups: literals[index] = g(group) or empty except IndexError: - raise error("invalid group reference") + raise error("invalid group reference %d" % index) return empty.join(literals) diff --git a/Lib/ssl.py b/Lib/ssl.py index e191390..8ad4a33 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -52,6 +52,8 @@ PROTOCOL_SSLv2 PROTOCOL_SSLv3 PROTOCOL_SSLv23 PROTOCOL_TLS +PROTOCOL_TLS_CLIENT +PROTOCOL_TLS_SERVER PROTOCOL_TLSv1 PROTOCOL_TLSv1_1 PROTOCOL_TLSv1_2 @@ -94,17 +96,16 @@ import re import sys import os from collections import namedtuple -from enum import Enum as _Enum, IntEnum as _IntEnum +from enum import Enum as _Enum, IntEnum as _IntEnum, IntFlag as _IntFlag import _ssl # if we can't import it, let the error propagate from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION -from _ssl import _SSLContext, MemoryBIO +from _ssl import _SSLContext, MemoryBIO, SSLSession from _ssl import ( SSLError, SSLZeroReturnError, SSLWantReadError, SSLWantWriteError, SSLSyscallError, SSLEOFError, ) -from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes try: @@ -113,32 +114,47 @@ except ImportError: # LibreSSL does not provide RAND_egd pass -def _import_symbols(prefix): - for n in dir(_ssl): - if n.startswith(prefix): - globals()[n] = getattr(_ssl, n) - -_import_symbols('OP_') -_import_symbols('ALERT_DESCRIPTION_') -_import_symbols('SSL_ERROR_') -_import_symbols('VERIFY_') from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN - from _ssl import _OPENSSL_API_VERSION + +_IntEnum._convert( + '_SSLMethod', __name__, + lambda name: name.startswith('PROTOCOL_') and name != 'PROTOCOL_SSLv23', + source=_ssl) + +_IntFlag._convert( + 'Options', __name__, + lambda name: name.startswith('OP_'), + source=_ssl) + +_IntEnum._convert( + 'AlertDescription', __name__, + lambda name: name.startswith('ALERT_DESCRIPTION_'), + source=_ssl) + +_IntEnum._convert( + 'SSLErrorNumber', __name__, + lambda name: name.startswith('SSL_ERROR_'), + source=_ssl) + +_IntFlag._convert( + 'VerifyFlags', __name__, + lambda name: name.startswith('VERIFY_'), + source=_ssl) + _IntEnum._convert( - '_SSLMethod', __name__, - lambda name: name.startswith('PROTOCOL_') and name != 'PROTOCOL_SSLv23', - source=_ssl) + 'VerifyMode', __name__, + lambda name: name.startswith('CERT_'), + source=_ssl) + PROTOCOL_SSLv23 = _SSLMethod.PROTOCOL_SSLv23 = _SSLMethod.PROTOCOL_TLS _PROTOCOL_NAMES = {value: name for name, value in _SSLMethod.__members__.items()} -try: - _SSLv2_IF_EXISTS = PROTOCOL_SSLv2 -except NameError: - _SSLv2_IF_EXISTS = None +_SSLv2_IF_EXISTS = getattr(_SSLMethod, 'PROTOCOL_SSLv2', None) + if sys.platform == "win32": from _ssl import enum_certificates, enum_crls @@ -377,18 +393,18 @@ class SSLContext(_SSLContext): def wrap_socket(self, sock, server_side=False, do_handshake_on_connect=True, suppress_ragged_eofs=True, - server_hostname=None): + server_hostname=None, session=None): return SSLSocket(sock=sock, server_side=server_side, do_handshake_on_connect=do_handshake_on_connect, suppress_ragged_eofs=suppress_ragged_eofs, server_hostname=server_hostname, - _context=self) + _context=self, _session=session) def wrap_bio(self, incoming, outgoing, server_side=False, - server_hostname=None): + server_hostname=None, session=None): sslobj = self._wrap_bio(incoming, outgoing, server_side=server_side, server_hostname=server_hostname) - return SSLObject(sslobj) + return SSLObject(sslobj, session=session) def set_npn_protocols(self, npn_protocols): protos = bytearray() @@ -434,6 +450,34 @@ class SSLContext(_SSLContext): self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() + @property + def options(self): + return Options(super().options) + + @options.setter + def options(self, value): + super(SSLContext, SSLContext).options.__set__(self, value) + + @property + def verify_flags(self): + return VerifyFlags(super().verify_flags) + + @verify_flags.setter + def verify_flags(self, value): + super(SSLContext, SSLContext).verify_flags.__set__(self, value) + + @property + def verify_mode(self): + value = super().verify_mode + try: + return VerifyMode(value) + except ValueError: + return value + + @verify_mode.setter + def verify_mode(self, value): + super(SSLContext, SSLContext).verify_mode.__set__(self, value) + def create_default_context(purpose=Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None): @@ -446,32 +490,16 @@ def create_default_context(purpose=Purpose.SERVER_AUTH, *, cafile=None, if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) + # SSLContext sets OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_COMPRESSION, + # OP_CIPHER_SERVER_PREFERENCE, OP_SINGLE_DH_USE and OP_SINGLE_ECDH_USE + # by default. context = SSLContext(PROTOCOL_TLS) - # SSLv2 considered harmful. - context.options |= OP_NO_SSLv2 - - # SSLv3 has problematic security and is only required for really old - # clients such as IE6 on Windows XP - context.options |= OP_NO_SSLv3 - - # disable compression to prevent CRIME attacks (OpenSSL 1.0+) - context.options |= getattr(_ssl, "OP_NO_COMPRESSION", 0) - if purpose == Purpose.SERVER_AUTH: # verify certs and host name in client mode context.verify_mode = CERT_REQUIRED context.check_hostname = True elif purpose == Purpose.CLIENT_AUTH: - # Prefer the server's ciphers by default so that we get stronger - # encryption - context.options |= getattr(_ssl, "OP_CIPHER_SERVER_PREFERENCE", 0) - - # Use single use keys in order to improve forward secrecy - context.options |= getattr(_ssl, "OP_SINGLE_DH_USE", 0) - context.options |= getattr(_ssl, "OP_SINGLE_ECDH_USE", 0) - - # disallow ciphers with known vulnerabilities context.set_ciphers(_RESTRICTED_SERVER_CIPHERS) if cafile or capath or cadata: @@ -497,12 +525,10 @@ def _create_unverified_context(protocol=PROTOCOL_TLS, *, cert_reqs=None, if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) + # SSLContext sets OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_COMPRESSION, + # OP_CIPHER_SERVER_PREFERENCE, OP_SINGLE_DH_USE and OP_SINGLE_ECDH_USE + # by default. context = SSLContext(protocol) - # SSLv2 considered harmful. - context.options |= OP_NO_SSLv2 - # SSLv3 has problematic security and is only required for really old - # clients such as IE6 on Windows XP - context.options |= OP_NO_SSLv3 if cert_reqs is not None: context.verify_mode = cert_reqs @@ -548,10 +574,12 @@ class SSLObject: * The ``do_handshake_on_connect`` and ``suppress_ragged_eofs`` machinery. """ - def __init__(self, sslobj, owner=None): + def __init__(self, sslobj, owner=None, session=None): self._sslobj = sslobj # Note: _sslobj takes a weak reference to owner self._sslobj.owner = owner or self + if session is not None: + self._sslobj.session = session @property def context(self): @@ -563,6 +591,20 @@ class SSLObject: self._sslobj.context = ctx @property + def session(self): + """The SSLSession for client socket.""" + return self._sslobj.session + + @session.setter + def session(self, session): + self._sslobj.session = session + + @property + def session_reused(self): + """Was the client session reused during handshake""" + return self._sslobj.session_reused + + @property def server_side(self): """Whether this is a server-side socket.""" return self._sslobj.server_side @@ -679,7 +721,7 @@ class SSLSocket(socket): family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None, suppress_ragged_eofs=True, npn_protocols=None, ciphers=None, server_hostname=None, - _context=None): + _context=None, _session=None): if _context: self._context = _context @@ -711,11 +753,16 @@ class SSLSocket(socket): # mixed in. if sock.getsockopt(SOL_SOCKET, SO_TYPE) != SOCK_STREAM: raise NotImplementedError("only stream sockets are supported") - if server_side and server_hostname: - raise ValueError("server_hostname can only be specified " - "in client mode") + if server_side: + if server_hostname: + raise ValueError("server_hostname can only be specified " + "in client mode") + if _session is not None: + raise ValueError("session can only be specified in " + "client mode") if self._context.check_hostname and not server_hostname: raise ValueError("check_hostname requires server_hostname") + self._session = _session self.server_side = server_side self.server_hostname = server_hostname self.do_handshake_on_connect = do_handshake_on_connect @@ -751,7 +798,8 @@ class SSLSocket(socket): try: sslobj = self._context._wrap_socket(self, server_side, server_hostname) - self._sslobj = SSLObject(sslobj, owner=self) + self._sslobj = SSLObject(sslobj, owner=self, + session=self._session) if do_handshake_on_connect: timeout = self.gettimeout() if timeout == 0.0: @@ -772,6 +820,24 @@ class SSLSocket(socket): self._context = ctx self._sslobj.context = ctx + @property + def session(self): + """The SSLSession for client socket.""" + if self._sslobj is not None: + return self._sslobj.session + + @session.setter + def session(self, session): + self._session = session + if self._sslobj is not None: + self._sslobj.session = session + + @property + def session_reused(self): + """Was the client session reused during handshake""" + if self._sslobj is not None: + return self._sslobj.session_reused + def dup(self): raise NotImplemented("Can't dup() %s instances" % self.__class__.__name__) @@ -898,7 +964,6 @@ class SSLSocket(socket): while (count < amount): v = self.send(data[count:]) count += v - return amount else: return socket.sendall(self, data, flags) @@ -1005,7 +1070,8 @@ class SSLSocket(socket): if self._connected: raise ValueError("attempt to connect already-connected SSLSocket!") sslobj = self.context._wrap_socket(self, False, self.server_hostname) - self._sslobj = SSLObject(sslobj, owner=self) + self._sslobj = SSLObject(sslobj, owner=self, + session=self._session) try: if connect_ex: rc = socket.connect_ex(self, addr) @@ -1068,7 +1134,6 @@ def wrap_socket(sock, keyfile=None, certfile=None, do_handshake_on_connect=True, suppress_ragged_eofs=True, ciphers=None): - return SSLSocket(sock=sock, keyfile=keyfile, certfile=certfile, server_side=server_side, cert_reqs=cert_reqs, ssl_version=ssl_version, ca_certs=ca_certs, diff --git a/Lib/statistics.py b/Lib/statistics.py index 4f5c1c1..30fe55c 100644 --- a/Lib/statistics.py +++ b/Lib/statistics.py @@ -1,20 +1,3 @@ -## Module statistics.py -## -## Copyright (c) 2013 Steven D'Aprano . -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. - - """ Basic statistics module. @@ -28,6 +11,7 @@ Calculating averages Function Description ================== ============================================= mean Arithmetic mean (average) of data. +harmonic_mean Harmonic mean of data. median Median (middle value) of data. median_low Low median of data. median_high High median of data. @@ -95,16 +79,18 @@ A single exception is defined: StatisticsError is a subclass of ValueError. __all__ = [ 'StatisticsError', 'pstdev', 'pvariance', 'stdev', 'variance', 'median', 'median_low', 'median_high', 'median_grouped', - 'mean', 'mode', + 'mean', 'mode', 'harmonic_mean', ] - import collections +import decimal import math +import numbers from fractions import Fraction from decimal import Decimal -from itertools import groupby +from itertools import groupby, chain +from bisect import bisect_left, bisect_right @@ -134,7 +120,8 @@ def _sum(data, start=0): Some sources of round-off error will be avoided: - >>> _sum([1e50, 1, -1e50] * 1000) # Built-in sum returns zero. + # Built-in sum returns zero. + >>> _sum([1e50, 1, -1e50] * 1000) (, Fraction(1000, 1), 3000) Fractions and Decimals are also supported: @@ -223,56 +210,26 @@ def _exact_ratio(x): # Optimise the common case of floats. We expect that the most often # used numeric type will be builtin floats, so try to make this as # fast as possible. - if type(x) is float: + if type(x) is float or type(x) is Decimal: return x.as_integer_ratio() try: # x may be an int, Fraction, or Integral ABC. return (x.numerator, x.denominator) except AttributeError: try: - # x may be a float subclass. + # x may be a float or Decimal subclass. return x.as_integer_ratio() except AttributeError: - try: - # x may be a Decimal. - return _decimal_to_ratio(x) - except AttributeError: - # Just give up? - pass + # Just give up? + pass except (OverflowError, ValueError): # float NAN or INF. - assert not math.isfinite(x) + assert not _isfinite(x) return (x, None) msg = "can't convert type '{}' to numerator/denominator" raise TypeError(msg.format(type(x).__name__)) -# FIXME This is faster than Fraction.from_decimal, but still too slow. -def _decimal_to_ratio(d): - """Convert Decimal d to exact integer ratio (numerator, denominator). - - >>> from decimal import Decimal - >>> _decimal_to_ratio(Decimal("2.6")) - (26, 10) - - """ - sign, digits, exp = d.as_tuple() - if exp in ('F', 'n', 'N'): # INF, NAN, sNAN - assert not d.is_finite() - return (d, None) - num = 0 - for digit in digits: - num = num*10 + digit - if exp < 0: - den = 10**-exp - else: - num *= 10**exp - den = 1 - if sign: - num = -num - return (num, den) - - def _convert(value, T): """Convert value to given numeric type T.""" if type(value) is T: @@ -305,6 +262,30 @@ def _counts(data): return table +def _find_lteq(a, x): + 'Locate the leftmost value exactly equal to x' + i = bisect_left(a, x) + if i != len(a) and a[i] == x: + return i + raise ValueError + + +def _find_rteq(a, l, x): + 'Locate the rightmost value exactly equal to x' + i = bisect_right(a, x, lo=l) + if i != (len(a)+1) and a[i-1] == x: + return i-1 + raise ValueError + + +def _fail_neg(values, errmsg='negative value'): + """Iterate over values, failing if any are less than zero.""" + for x in values: + if x < 0: + raise StatisticsError(errmsg) + yield x + + # === Measures of central tendency (averages) === def mean(data): @@ -333,6 +314,52 @@ def mean(data): return _convert(total/n, T) +def harmonic_mean(data): + """Return the harmonic mean of data. + + The harmonic mean, sometimes called the subcontrary mean, is the + reciprocal of the arithmetic mean of the reciprocals of the data, + and is often appropriate when averaging quantities which are rates + or ratios, for example speeds. Example: + + Suppose an investor purchases an equal value of shares in each of + three companies, with P/E (price/earning) ratios of 2.5, 3 and 10. + What is the average P/E ratio for the investor's portfolio? + + >>> harmonic_mean([2.5, 3, 10]) # For an equal investment portfolio. + 3.6 + + Using the arithmetic mean would give an average of about 5.167, which + is too high. + + If ``data`` is empty, or any element is less than zero, + ``harmonic_mean`` will raise ``StatisticsError``. + """ + # For a justification for using harmonic mean for P/E ratios, see + # http://fixthepitch.pellucid.com/comps-analysis-the-missing-harmony-of-summary-statistics/ + # http://papers.ssrn.com/sol3/papers.cfm?abstract_id=2621087 + if iter(data) is data: + data = list(data) + errmsg = 'harmonic mean does not support negative values' + n = len(data) + if n < 1: + raise StatisticsError('harmonic_mean requires at least one data point') + elif n == 1: + x = data[0] + if isinstance(x, (numbers.Real, Decimal)): + if x < 0: + raise StatisticsError(errmsg) + return x + else: + raise TypeError('unsupported type') + try: + T, total, count = _sum(1/x for x in _fail_neg(data, errmsg)) + except ZeroDivisionError: + return 0 + assert count == n + return _convert(n/total, T) + + # FIXME: investigate ways to calculate medians without sorting? Quickselect? def median(data): """Return the median (middle value) of numeric data. @@ -442,9 +469,15 @@ def median_grouped(data, interval=1): except TypeError: # Mixed type. For now we just coerce to float. L = float(x) - float(interval)/2 - cf = data.index(x) # Number of values below the median interval. - # FIXME The following line could be more efficient for big lists. - f = data.count(x) # Number of data points in the median interval. + + # Uses bisection search to search for x in data with log(n) time complexity + # Find the position of leftmost occurrence of x in data + l1 = _find_lteq(data, x) + # Find the position of rightmost occurrence of x in data[l1...len(data)] + # Assuming always l1 <= l2 + l2 = _find_rteq(data, l1, x) + cf = l1 + f = l2 - l1 + 1 return L + interval*(n/2 - cf)/f diff --git a/Lib/string.py b/Lib/string.py index 89287c4..c902007 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -28,7 +28,7 @@ ascii_letters = ascii_lowercase + ascii_uppercase digits = '0123456789' hexdigits = digits + 'abcdef' + 'ABCDEF' octdigits = '01234567' -punctuation = """!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +punctuation = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" printable = digits + ascii_letters + punctuation + whitespace # Functions which aren't available as string methods. @@ -116,10 +116,7 @@ class Template(metaclass=_TemplateMetaclass): # Check the most common path first. named = mo.group('named') or mo.group('braced') if named is not None: - val = mapping[named] - # We use this idiom instead of str() because the latter will - # fail if val is a Unicode containing non-ASCII characters. - return '%s' % (val,) + return str(mapping[named]) if mo.group('escaped') is not None: return self.delimiter if mo.group('invalid') is not None: @@ -146,9 +143,7 @@ class Template(metaclass=_TemplateMetaclass): named = mo.group('named') or mo.group('braced') if named is not None: try: - # We use this idiom instead of str() because the latter - # will fail if val is a Unicode containing non-ASCII - return '%s' % (mapping[named],) + return str(mapping[named]) except KeyError: return mo.group() if mo.group('escaped') is not None: diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 8e44998..0b880f6 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -71,7 +71,16 @@ class CalledProcessError(SubprocessError): self.stderr = stderr def __str__(self): - return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) + if self.returncode and self.returncode < 0: + try: + return "Command '%s' died with %r." % ( + self.cmd, signal.Signals(-self.returncode)) + except ValueError: + return "Command '%s' died with unknown signal %d." % ( + self.cmd, -self.returncode) + else: + return "Command '%s' returned non-zero exit status %d." % ( + self.cmd, self.returncode) @property def stdout(self): @@ -161,7 +170,8 @@ if _mswindows: __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP", "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE", "STD_ERROR_HANDLE", "SW_HIDE", - "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"]) + "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW", + "STARTUPINFO"]) class Handle(int): closed = False @@ -210,6 +220,16 @@ DEVNULL = -3 # but it's here so that it can be imported when Python is compiled without # threads. +def _optim_args_from_interpreter_flags(): + """Return a list of command-line arguments reproducing the current + optimization settings in sys.flags.""" + args = [] + value = sys.flags.optimize + if value > 0: + args.append('-' + 'O' * value) + return args + + def _args_from_interpreter_flags(): """Return a list of command-line arguments reproducing the current settings in sys.flags and sys.warnoptions.""" @@ -217,7 +237,6 @@ def _args_from_interpreter_flags(): 'debug': 'd', # 'inspect': 'i', # 'interactive': 'i', - 'optimize': 'O', 'dont_write_bytecode': 'B', 'no_user_site': 's', 'no_site': 'S', @@ -225,8 +244,9 @@ def _args_from_interpreter_flags(): 'verbose': 'v', 'bytes_warning': 'b', 'quiet': 'q', + # -O is handled in _optim_args_from_interpreter_flags() } - args = [] + args = _optim_args_from_interpreter_flags() for flag, opt in flag_opt_map.items(): v = getattr(sys.flags, flag) if v > 0: @@ -476,8 +496,8 @@ def getstatusoutput(cmd): """ Return (status, output) of executing cmd in a shell. Execute the string 'cmd' in a shell with 'check_output' and - return a 2-tuple (status, output). Universal newlines mode is used, - meaning that the result with be decoded to a string. + return a 2-tuple (status, output). The locale encoding is used + to decode the output and process newlines. A trailing newline is stripped from the output. The exit status for the command can be interpreted @@ -555,6 +575,9 @@ class Popen(object): pass_fds (POSIX only) + encoding and errors: Text mode encoding and error handling to use for + file objects stdin, stdout and stderr. + Attributes: stdin, stdout, stderr, pid, returncode """ @@ -566,7 +589,7 @@ class Popen(object): shell=False, cwd=None, env=None, universal_newlines=False, startupinfo=None, creationflags=0, restore_signals=True, start_new_session=False, - pass_fds=()): + pass_fds=(), *, encoding=None, errors=None): """Create new Popen instance.""" _cleanup() # Held while anything is calling waitpid before returncode has been @@ -619,6 +642,8 @@ class Popen(object): self.pid = None self.returncode = None self.universal_newlines = universal_newlines + self.encoding = encoding + self.errors = errors # Input and output objects. The general principle is like # this: @@ -651,22 +676,28 @@ class Popen(object): if errread != -1: errread = msvcrt.open_osfhandle(errread.Detach(), 0) - if p2cwrite != -1: - self.stdin = io.open(p2cwrite, 'wb', bufsize) - if universal_newlines: - self.stdin = io.TextIOWrapper(self.stdin, write_through=True, - line_buffering=(bufsize == 1)) - if c2pread != -1: - self.stdout = io.open(c2pread, 'rb', bufsize) - if universal_newlines: - self.stdout = io.TextIOWrapper(self.stdout) - if errread != -1: - self.stderr = io.open(errread, 'rb', bufsize) - if universal_newlines: - self.stderr = io.TextIOWrapper(self.stderr) + text_mode = encoding or errors or universal_newlines self._closed_child_pipe_fds = False + try: + if p2cwrite != -1: + self.stdin = io.open(p2cwrite, 'wb', bufsize) + if text_mode: + self.stdin = io.TextIOWrapper(self.stdin, write_through=True, + line_buffering=(bufsize == 1), + encoding=encoding, errors=errors) + if c2pread != -1: + self.stdout = io.open(c2pread, 'rb', bufsize) + if text_mode: + self.stdout = io.TextIOWrapper(self.stdout, + encoding=encoding, errors=errors) + if errread != -1: + self.stderr = io.open(errread, 'rb', bufsize) + if text_mode: + self.stderr = io.TextIOWrapper(self.stderr, + encoding=encoding, errors=errors) + self._execute_child(args, executable, preexec_fn, close_fds, pass_fds, cwd, env, startupinfo, creationflags, shell, @@ -700,9 +731,8 @@ class Popen(object): raise - - def _translate_newlines(self, data, encoding): - data = data.decode(encoding) + def _translate_newlines(self, data, encoding, errors): + data = data.decode(encoding, errors) return data.replace("\r\n", "\n").replace("\r", "\n") def __enter__(self): @@ -724,6 +754,11 @@ class Popen(object): if not self._child_created: # We didn't get to successfully create a child process. return + if self.returncode is None: + # Not reading subprocess exit status creates a zombi process which + # is only destroyed at the parent python process exit + warnings.warn("subprocess %s is still running" % self.pid, + ResourceWarning, source=self) # In case the child hasn't been waited on, check if it's done. self._internal_poll(_deadstate=_maxsize) if self.returncode is None and _active is not None: @@ -741,21 +776,19 @@ class Popen(object): self.stdin.write(input) except BrokenPipeError: pass # communicate() must ignore broken pipe errors. - except OSError as exc: - if exc.errno == errno.EINVAL: - # bpo-19612, bpo-30418: On Windows, stdin.write() fails - # with EINVAL if the child process exited or if the child - # process is still running but closed the pipe. + except OSError as e: + if e.errno == errno.EINVAL and self.poll() is not None: + # Issue #19612: On Windows, stdin.write() fails with EINVAL + # if the process already exited before the write pass else: raise - try: self.stdin.close() except BrokenPipeError: pass # communicate() must ignore broken pipe errors. - except OSError as exc: - if exc.errno == errno.EINVAL: + except OSError as e: + if e.errno == errno.EINVAL and self.poll() is not None: pass else: raise @@ -998,6 +1031,10 @@ class Popen(object): """Wait for child process to terminate. Returns returncode attribute.""" if endtime is not None: + warnings.warn( + "'endtime' argument is deprecated; use 'timeout'.", + DeprecationWarning, + stacklevel=2) timeout = self._remaining_time(endtime) if timeout is None: timeout_millis = _winapi.INFINITE @@ -1200,12 +1237,8 @@ class Popen(object): # and pass it to fork_exec() if env is not None: - env_list = [] - for k, v in env.items(): - k = os.fsencode(k) - if b'=' in k: - raise ValueError("illegal environment variable name") - env_list.append(k + b'=' + os.fsencode(v)) + env_list = [os.fsencode(k) + b'=' + os.fsencode(v) + for k, v in env.items()] else: env_list = None # Use execv instead of execve. executable = os.fsencode(executable) @@ -1220,8 +1253,7 @@ class Popen(object): fds_to_keep.add(errpipe_write) self.pid = _posixsubprocess.fork_exec( args, executable_list, - close_fds, tuple(sorted(map(int, fds_to_keep))), - cwd, env_list, + close_fds, sorted(fds_to_keep), cwd, env_list, p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite, errpipe_read, errpipe_write, @@ -1258,9 +1290,14 @@ class Popen(object): if errpipe_data: try: - os.waitpid(self.pid, 0) + pid, sts = os.waitpid(self.pid, 0) + if pid == self.pid: + self._handle_exitstatus(sts) + else: + self.returncode = sys.maxsize except ChildProcessError: pass + try: exception_name, hex_errno, err_msg = ( errpipe_data.split(b':', 2)) @@ -1292,8 +1329,7 @@ class Popen(object): def _handle_exitstatus(self, sts, _WIFSIGNALED=os.WIFSIGNALED, _WTERMSIG=os.WTERMSIG, _WIFEXITED=os.WIFEXITED, - _WEXITSTATUS=os.WEXITSTATUS, _WIFSTOPPED=os.WIFSTOPPED, - _WSTOPSIG=os.WSTOPSIG): + _WEXITSTATUS=os.WEXITSTATUS): """All callers to this function MUST hold self._waitpid_lock.""" # This method is called (indirectly) by __del__, so it cannot # refer to anything outside of its local scope. @@ -1301,8 +1337,6 @@ class Popen(object): self.returncode = -_WTERMSIG(sts) elif _WIFEXITED(sts): self.returncode = _WEXITSTATUS(sts) - elif _WIFSTOPPED(sts): - self.returncode = -_WSTOPSIG(sts) else: # Should never happen raise SubprocessError("Unknown child exit status!") @@ -1362,8 +1396,11 @@ class Popen(object): if self.returncode is not None: return self.returncode - # endtime is preferred to timeout. timeout is only used for - # printing. + if endtime is not None: + warnings.warn( + "'endtime' argument is deprecated; use 'timeout'.", + DeprecationWarning, + stacklevel=2) if endtime is not None or timeout is not None: if endtime is None: endtime = _time() + timeout @@ -1489,13 +1526,15 @@ class Popen(object): # Translate newlines, if requested. # This also turns bytes into strings. - if self.universal_newlines: + if self.encoding or self.errors or self.universal_newlines: if stdout is not None: stdout = self._translate_newlines(stdout, - self.stdout.encoding) + self.stdout.encoding, + self.stdout.errors) if stderr is not None: stderr = self._translate_newlines(stderr, - self.stderr.encoding) + self.stderr.encoding, + self.stderr.errors) return (stdout, stderr) @@ -1507,8 +1546,10 @@ class Popen(object): if self.stdin and self._input is None: self._input_offset = 0 self._input = input - if self.universal_newlines and input is not None: - self._input = self._input.encode(self.stdin.encoding) + if input is not None and ( + self.encoding or self.errors or self.universal_newlines): + self._input = self._input.encode(self.stdin.encoding, + self.stdin.errors) def send_signal(self, sig): diff --git a/Lib/symbol.py b/Lib/symbol.py index 7541497..d9f01e0 100755 --- a/Lib/symbol.py +++ b/Lib/symbol.py @@ -27,74 +27,75 @@ stmt = 269 simple_stmt = 270 small_stmt = 271 expr_stmt = 272 -testlist_star_expr = 273 -augassign = 274 -del_stmt = 275 -pass_stmt = 276 -flow_stmt = 277 -break_stmt = 278 -continue_stmt = 279 -return_stmt = 280 -yield_stmt = 281 -raise_stmt = 282 -import_stmt = 283 -import_name = 284 -import_from = 285 -import_as_name = 286 -dotted_as_name = 287 -import_as_names = 288 -dotted_as_names = 289 -dotted_name = 290 -global_stmt = 291 -nonlocal_stmt = 292 -assert_stmt = 293 -compound_stmt = 294 -async_stmt = 295 -if_stmt = 296 -while_stmt = 297 -for_stmt = 298 -try_stmt = 299 -with_stmt = 300 -with_item = 301 -except_clause = 302 -suite = 303 -test = 304 -test_nocond = 305 -lambdef = 306 -lambdef_nocond = 307 -or_test = 308 -and_test = 309 -not_test = 310 -comparison = 311 -comp_op = 312 -star_expr = 313 -expr = 314 -xor_expr = 315 -and_expr = 316 -shift_expr = 317 -arith_expr = 318 -term = 319 -factor = 320 -power = 321 -atom_expr = 322 -atom = 323 -testlist_comp = 324 -trailer = 325 -subscriptlist = 326 -subscript = 327 -sliceop = 328 -exprlist = 329 -testlist = 330 -dictorsetmaker = 331 -classdef = 332 -arglist = 333 -argument = 334 -comp_iter = 335 -comp_for = 336 -comp_if = 337 -encoding_decl = 338 -yield_expr = 339 -yield_arg = 340 +annassign = 273 +testlist_star_expr = 274 +augassign = 275 +del_stmt = 276 +pass_stmt = 277 +flow_stmt = 278 +break_stmt = 279 +continue_stmt = 280 +return_stmt = 281 +yield_stmt = 282 +raise_stmt = 283 +import_stmt = 284 +import_name = 285 +import_from = 286 +import_as_name = 287 +dotted_as_name = 288 +import_as_names = 289 +dotted_as_names = 290 +dotted_name = 291 +global_stmt = 292 +nonlocal_stmt = 293 +assert_stmt = 294 +compound_stmt = 295 +async_stmt = 296 +if_stmt = 297 +while_stmt = 298 +for_stmt = 299 +try_stmt = 300 +with_stmt = 301 +with_item = 302 +except_clause = 303 +suite = 304 +test = 305 +test_nocond = 306 +lambdef = 307 +lambdef_nocond = 308 +or_test = 309 +and_test = 310 +not_test = 311 +comparison = 312 +comp_op = 313 +star_expr = 314 +expr = 315 +xor_expr = 316 +and_expr = 317 +shift_expr = 318 +arith_expr = 319 +term = 320 +factor = 321 +power = 322 +atom_expr = 323 +atom = 324 +testlist_comp = 325 +trailer = 326 +subscriptlist = 327 +subscript = 328 +sliceop = 329 +exprlist = 330 +testlist = 331 +dictorsetmaker = 332 +classdef = 333 +arglist = 334 +argument = 335 +comp_iter = 336 +comp_for = 337 +comp_if = 338 +encoding_decl = 339 +yield_expr = 340 +yield_arg = 341 #--end constants-- sym_name = {} diff --git a/Lib/symtable.py b/Lib/symtable.py index 84fec4a..b0e5260 100644 --- a/Lib/symtable.py +++ b/Lib/symtable.py @@ -2,7 +2,7 @@ import _symtable from _symtable import (USE, DEF_GLOBAL, DEF_LOCAL, DEF_PARAM, - DEF_IMPORT, DEF_BOUND, SCOPE_OFF, SCOPE_MASK, FREE, + DEF_IMPORT, DEF_BOUND, DEF_ANNOT, SCOPE_OFF, SCOPE_MASK, FREE, LOCAL, GLOBAL_IMPLICIT, GLOBAL_EXPLICIT, CELL) import weakref @@ -190,6 +190,9 @@ class Symbol(object): def is_local(self): return bool(self.__flags & DEF_BOUND) + def is_annotated(self): + return bool(self.__flags & DEF_ANNOT) + def is_free(self): return bool(self.__scope == FREE) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 9c34be0..9314e71 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -86,8 +86,8 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', # FIXME don't rely on sys.version here, its format is an implementation detail # of CPython, use sys.version_info or sys.hexversion _PY_VERSION = sys.version.split()[0] -_PY_VERSION_SHORT = sys.version[:3] -_PY_VERSION_SHORT_NO_DOT = _PY_VERSION[0] + _PY_VERSION[2] +_PY_VERSION_SHORT = '%d.%d' % sys.version_info[:2] +_PY_VERSION_SHORT_NO_DOT = '%d%d' % sys.version_info[:2] _PREFIX = os.path.normpath(sys.prefix) _BASE_PREFIX = os.path.normpath(sys.base_prefix) _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) @@ -215,7 +215,7 @@ def _parse_makefile(filename, vars=None): # Regexes needed for parsing Makefile (and similar syntaxes, # like old-style Setup files). import re - _variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)") + _variable_rx = re.compile(r"([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)") _findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)") _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}") @@ -337,8 +337,20 @@ def get_makefile_filename(): config_dir_name = 'config-%s%s' % (_PY_VERSION_SHORT, sys.abiflags) else: config_dir_name = 'config' + if hasattr(sys.implementation, '_multiarch'): + config_dir_name += '-%s' % sys.implementation._multiarch return os.path.join(get_path('stdlib'), config_dir_name, 'Makefile') + +def _get_sysconfigdata_name(): + return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', + '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( + abi=sys.abiflags, + platform=sys.platform, + multiarch=getattr(sys.implementation, '_multiarch', ''), + )) + + def _generate_posix_vars(): """Generate the Python module containing build-time variables.""" import pprint @@ -379,14 +391,14 @@ def _generate_posix_vars(): # _sysconfigdata module manually and populate it with the build vars. # This is more than sufficient for ensuring the subsequent call to # get_platform() succeeds. - name = '_sysconfigdata' + name = _get_sysconfigdata_name() if 'darwin' in sys.platform: import types module = types.ModuleType(name) module.build_time_vars = vars sys.modules[name] = module - pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3]) + pybuilddir = 'build/lib.%s-%s' % (get_platform(), _PY_VERSION_SHORT) if hasattr(sys, "gettotalrefcount"): pybuilddir += '-pydebug' os.makedirs(pybuilddir, exist_ok=True) @@ -405,7 +417,9 @@ def _generate_posix_vars(): def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() - from _sysconfigdata import build_time_vars + name = _get_sysconfigdata_name() + _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) + build_time_vars = _temp.build_time_vars vars.update(build_time_vars) def _init_non_posix(vars): @@ -518,7 +532,7 @@ def get_config_vars(*args): _CONFIG_VARS['exec_prefix'] = _EXEC_PREFIX _CONFIG_VARS['py_version'] = _PY_VERSION _CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT - _CONFIG_VARS['py_version_nodot'] = _PY_VERSION[0] + _PY_VERSION[2] + _CONFIG_VARS['py_version_nodot'] = _PY_VERSION_SHORT_NO_DOT _CONFIG_VARS['installed_base'] = _BASE_PREFIX _CONFIG_VARS['base'] = _PREFIX _CONFIG_VARS['installed_platbase'] = _BASE_EXEC_PREFIX diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py index bfb670c..46e0f56 100755 --- a/Lib/tabnanny.py +++ b/Lib/tabnanny.py @@ -59,7 +59,7 @@ def main(): class NannyNag(Exception): """ - Raised by process_tokens() if detecting an ambiguous indent. + Raised by tokeneater() if detecting an ambiguous indent. Captured and handled in check(). """ def __init__(self, lineno, msg, line): diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 999a99b..b78b1b1 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -64,7 +64,10 @@ except NameError: pass # from tarfile import * -__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError"] +__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError", + "CompressionError", "StreamError", "ExtractError", "HeaderError", + "ENCODING", "USTAR_FORMAT", "GNU_FORMAT", "PAX_FORMAT", + "DEFAULT_FORMAT", "open"] #--------------------------------------------------------- # tar constants @@ -141,7 +144,7 @@ PAX_NUMBER_FIELDS = { #--------------------------------------------------------- # initialization #--------------------------------------------------------- -if os.name in ("nt", "ce"): +if os.name == "nt": ENCODING = "utf-8" else: ENCODING = sys.getfilesystemencoding() @@ -225,21 +228,21 @@ def calc_chksums(buf): signed_chksum = 256 + sum(struct.unpack_from("148b8x356b", buf)) return unsigned_chksum, signed_chksum -def copyfileobj(src, dst, length=None, exception=OSError): +def copyfileobj(src, dst, length=None, exception=OSError, bufsize=None): """Copy length bytes from fileobj src to fileobj dst. If length is None, copy the entire content. """ + bufsize = bufsize or 16 * 1024 if length == 0: return if length is None: - shutil.copyfileobj(src, dst) + shutil.copyfileobj(src, dst, bufsize) return - BUFSIZE = 16 * 1024 - blocks, remainder = divmod(length, BUFSIZE) + blocks, remainder = divmod(length, bufsize) for b in range(blocks): - buf = src.read(BUFSIZE) - if len(buf) < BUFSIZE: + buf = src.read(bufsize) + if len(buf) < bufsize: raise exception("unexpected end of data") dst.write(buf) @@ -1400,7 +1403,8 @@ class TarFile(object): def __init__(self, name=None, mode="r", fileobj=None, format=None, tarinfo=None, dereference=None, ignore_zeros=None, encoding=None, - errors="surrogateescape", pax_headers=None, debug=None, errorlevel=None): + errors="surrogateescape", pax_headers=None, debug=None, + errorlevel=None, copybufsize=None): """Open an (uncompressed) tar archive `name'. `mode' is either 'r' to read from an existing archive, 'a' to append data to an existing file or 'w' to create a new file overwriting an existing one. `mode' @@ -1456,6 +1460,7 @@ class TarFile(object): self.errorlevel = errorlevel # Init datastructures. + self.copybufsize = copybufsize self.closed = False self.members = [] # list of members as TarInfo objects self._loaded = False # flag if all members have been read @@ -1557,7 +1562,7 @@ class TarFile(object): saved_pos = fileobj.tell() try: return func(name, "r", fileobj, **kwargs) - except (ReadError, CompressionError) as e: + except (ReadError, CompressionError): if fileobj is not None: fileobj.seek(saved_pos) continue @@ -1962,10 +1967,10 @@ class TarFile(object): buf = tarinfo.tobuf(self.format, self.encoding, self.errors) self.fileobj.write(buf) self.offset += len(buf) - + bufsize=self.copybufsize # If there's data to follow, append it. if fileobj is not None: - copyfileobj(fileobj, self.fileobj, tarinfo.size) + copyfileobj(fileobj, self.fileobj, tarinfo.size, bufsize=bufsize) blocks, remainder = divmod(tarinfo.size, BLOCKSIZE) if remainder > 0: self.fileobj.write(NUL * (BLOCKSIZE - remainder)) @@ -2147,15 +2152,16 @@ class TarFile(object): """ source = self.fileobj source.seek(tarinfo.offset_data) + bufsize = self.copybufsize with bltn_open(targetpath, "wb") as target: if tarinfo.sparse is not None: for offset, size in tarinfo.sparse: target.seek(offset) - copyfileobj(source, target, size, ReadError) + copyfileobj(source, target, size, ReadError, bufsize) target.seek(tarinfo.size) target.truncate() else: - copyfileobj(source, target, tarinfo.size, ReadError) + copyfileobj(source, target, tarinfo.size, ReadError, bufsize) def makeunknown(self, tarinfo, targetpath): """Make a file from a TarInfo object with an unknown type @@ -2234,7 +2240,7 @@ class TarFile(object): os.lchown(targetpath, u, g) else: os.chown(targetpath, u, g) - except OSError as e: + except OSError: raise ExtractError("could not change owner") def chmod(self, tarinfo, targetpath): @@ -2243,7 +2249,7 @@ class TarFile(object): if hasattr(os, 'chmod'): try: os.chmod(targetpath, tarinfo.mode) - except OSError as e: + except OSError: raise ExtractError("could not change mode") def utime(self, tarinfo, targetpath): @@ -2253,7 +2259,7 @@ class TarFile(object): return try: os.utime(targetpath, (tarinfo.mtime, tarinfo.mtime)) - except OSError as e: + except OSError: raise ExtractError("could not change modification time") #-------------------------------------------------------------------------- @@ -2376,9 +2382,32 @@ class TarFile(object): """Provide an iterator object. """ if self._loaded: - return iter(self.members) - else: - return TarIter(self) + yield from self.members + return + + # Yield items using TarFile's next() method. + # When all members have been read, set TarFile as _loaded. + index = 0 + # Fix for SF #1100429: Under rare circumstances it can + # happen that getmembers() is called during iteration, + # which will have already exhausted the next() method. + if self.firstmember is not None: + tarinfo = self.next() + index += 1 + yield tarinfo + + while True: + if index < len(self.members): + tarinfo = self.members[index] + elif not self._loaded: + tarinfo = self.next() + if not tarinfo: + self._loaded = True + return + else: + return + index += 1 + yield tarinfo def _dbg(self, level, msg): """Write debugging output to sys.stderr. @@ -2399,45 +2428,6 @@ class TarFile(object): if not self._extfileobj: self.fileobj.close() self.closed = True -# class TarFile - -class TarIter: - """Iterator Class. - - for tarinfo in TarFile(...): - suite... - """ - - def __init__(self, tarfile): - """Construct a TarIter object. - """ - self.tarfile = tarfile - self.index = 0 - def __iter__(self): - """Return iterator object. - """ - return self - def __next__(self): - """Return the next item using TarFile's next() method. - When all members have been read, set TarFile as _loaded. - """ - # Fix for SF #1100429: Under rare circumstances it can - # happen that getmembers() is called during iteration, - # which will cause TarIter to stop prematurely. - - if self.index == 0 and self.tarfile.firstmember is not None: - tarinfo = self.tarfile.next() - elif self.index < len(self.tarfile.members): - tarinfo = self.tarfile.members[self.index] - elif not self.tarfile._loaded: - tarinfo = self.tarfile.next() - if not tarinfo: - self.tarfile._loaded = True - raise StopIteration - else: - raise StopIteration - self.index += 1 - return tarinfo #-------------------- # exported functions diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py index 72dabc7..b0863b1 100644 --- a/Lib/telnetlib.py +++ b/Lib/telnetlib.py @@ -637,6 +637,12 @@ class Telnet: raise EOFError return (-1, None, text) + def __enter__(self): + return self + + def __exit__(self, type, value, traceback): + self.close() + def test(): """Test program for telnetlib. @@ -660,11 +666,10 @@ def test(): port = int(portstr) except ValueError: port = socket.getservbyname(portstr, 'tcp') - tn = Telnet() - tn.set_debuglevel(debuglevel) - tn.open(host, port, timeout=0.5) - tn.interact() - tn.close() + with Telnet() as tn: + tn.set_debuglevel(debuglevel) + tn.open(host, port, timeout=0.5) + tn.interact() if __name__ == '__main__': test() diff --git a/Lib/tempfile.py b/Lib/tempfile.py index ad687b9..6146235 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -797,7 +797,6 @@ class TemporaryDirectory(object): _shutil.rmtree(name) _warnings.warn(warn_message, ResourceWarning) - def __repr__(self): return "<{} {!r}>".format(self.__class__.__name__, self.name) diff --git a/Lib/test/185test.db b/Lib/test/185test.db new file mode 100644 index 0000000..14cb5e2 Binary files /dev/null and b/Lib/test/185test.db differ diff --git a/Lib/test/__main__.py b/Lib/test/__main__.py index d5fbe15..19a6b2b 100644 --- a/Lib/test/__main__.py +++ b/Lib/test/__main__.py @@ -1,3 +1,2 @@ -from test import regrtest - -regrtest.main_in_temp_cwd() +from test.libregrtest import main +main() diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index b9cd86e..c00846c 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -18,7 +18,6 @@ import random import logging import struct import operator -import weakref import test.support import test.support.script_helper @@ -191,12 +190,6 @@ def get_value(self): # Testcases # -class DummyCallable: - def __call__(self, q, c): - assert isinstance(c, DummyCallable) - q.put(5) - - class _TestProcess(BaseTestCase): ALLOWED_TYPES = ('processes', 'threads') @@ -404,18 +397,6 @@ class _TestProcess(BaseTestCase): p.join() self.assertTrue(wait_for_handle(sentinel, timeout=1)) - def test_lose_target_ref(self): - c = DummyCallable() - wr = weakref.ref(c) - q = self.Queue() - p = self.Process(target=c, args=(q, c)) - del c - p.start() - p.join() - self.assertIs(wr(), None) - self.assertEqual(q.get(), 5) - - # # # @@ -770,20 +751,6 @@ class _TestQueue(BaseTestCase): # Windows (usually 15.6 ms) self.assertGreaterEqual(delta, 0.170) - def test_queue_feeder_donot_stop_onexc(self): - # bpo-30414: verify feeder handles exceptions correctly - if self.TYPE != 'processes': - self.skipTest('test not appropriate for {}'.format(self.TYPE)) - - class NotSerializable(object): - def __reduce__(self): - raise AttributeError - with test.support.captured_stderr(): - q = self.Queue() - q.put(NotSerializable()) - q.put(True) - self.assertTrue(q.get(timeout=0.1)) - # # # @@ -1199,19 +1166,10 @@ class Bunch(object): self._can_exit = namespace.Event() if not wait_before_exit: self._can_exit.set() - - threads = [] for i in range(n): p = namespace.Process(target=self.task) p.daemon = True p.start() - threads.append(p) - - def finalize(threads): - for p in threads: - p.join() - - self._finalizer = weakref.finalize(self, finalize, threads) def task(self): pid = os.getpid() @@ -1234,9 +1192,6 @@ class Bunch(object): def do_finish(self): self._can_exit.set() - def close(self): - self._finalizer() - class AppendTrue(object): def __init__(self, obj): @@ -1269,11 +1224,8 @@ class _TestBarrier(BaseTestCase): def run_threads(self, f, args): b = Bunch(self, f, args, self.N-1) - try: - f(*args) - b.wait_for_finished() - finally: - b.close() + f(*args) + b.wait_for_finished() @classmethod def multipass(cls, barrier, results, n): @@ -1676,13 +1628,33 @@ class _TestContainers(BaseTestCase): d = [a, b] e = self.list(d) self.assertEqual( - e[:], + [element[:] for element in e], [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [0, 1, 2, 3, 4, 0, 1, 2, 3, 4]] ) f = self.list([a]) a.append('hello') - self.assertEqual(f[:], [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'hello']]) + self.assertEqual(f[0][:], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'hello']) + + def test_list_proxy_in_list(self): + a = self.list([self.list(range(3)) for _i in range(3)]) + self.assertEqual([inner[:] for inner in a], [[0, 1, 2]] * 3) + + a[0][-1] = 55 + self.assertEqual(a[0][:], [0, 1, 55]) + for i in range(1, 3): + self.assertEqual(a[i][:], [0, 1, 2]) + + self.assertEqual(a[1].pop(), 2) + self.assertEqual(len(a[1]), 2) + for i in range(0, 3, 2): + self.assertEqual(len(a[i]), 3) + + del a + + b = self.list() + b.append(b) + del b def test_dict(self): d = self.dict() @@ -1694,6 +1666,52 @@ class _TestContainers(BaseTestCase): self.assertEqual(sorted(d.values()), [chr(i) for i in indices]) self.assertEqual(sorted(d.items()), [(i, chr(i)) for i in indices]) + def test_dict_proxy_nested(self): + pets = self.dict(ferrets=2, hamsters=4) + supplies = self.dict(water=10, feed=3) + d = self.dict(pets=pets, supplies=supplies) + + self.assertEqual(supplies['water'], 10) + self.assertEqual(d['supplies']['water'], 10) + + d['supplies']['blankets'] = 5 + self.assertEqual(supplies['blankets'], 5) + self.assertEqual(d['supplies']['blankets'], 5) + + d['supplies']['water'] = 7 + self.assertEqual(supplies['water'], 7) + self.assertEqual(d['supplies']['water'], 7) + + del pets + del supplies + self.assertEqual(d['pets']['ferrets'], 2) + d['supplies']['blankets'] = 11 + self.assertEqual(d['supplies']['blankets'], 11) + + pets = d['pets'] + supplies = d['supplies'] + supplies['water'] = 7 + self.assertEqual(supplies['water'], 7) + self.assertEqual(d['supplies']['water'], 7) + + d.clear() + self.assertEqual(len(d), 0) + self.assertEqual(supplies['water'], 7) + self.assertEqual(pets['hamsters'], 4) + + l = self.list([pets, supplies]) + l[0]['marmots'] = 1 + self.assertEqual(pets['marmots'], 1) + self.assertEqual(l[0]['marmots'], 1) + + del pets + del supplies + self.assertEqual(l[0]['marmots'], 1) + + outer = self.list([[88, 99], l]) + self.assertIsInstance(outer[0], list) # Not a ListProxy + self.assertEqual(outer[-1][-1]['feed'], 3) + def test_namespace(self): n = self.Namespace() n.name = 'Bob' @@ -1716,30 +1734,18 @@ def sqr(x, wait=0.0): def mul(x, y): return x*y -def identity(x): - return x - -class CountedObject(object): - n_instances = 0 - - def __new__(cls): - cls.n_instances += 1 - return object.__new__(cls) - - def __del__(self): - type(self).n_instances -= 1 +def raise_large_valuerror(wait): + time.sleep(wait) + raise ValueError("x" * 1024**2) class SayWhenError(ValueError): pass def exception_throwing_generator(total, when): - if when == -1: - raise SayWhenError("Somebody said when") for i in range(total): if i == when: raise SayWhenError("Somebody said when") yield i - class _TestPool(BaseTestCase): @classmethod @@ -1812,32 +1818,6 @@ class _TestPool(BaseTestCase): except multiprocessing.TimeoutError: self.fail("pool.map_async with chunksize stalled on null list") - def test_map_handle_iterable_exception(self): - if self.TYPE == 'manager': - self.skipTest('test not appropriate for {}'.format(self.TYPE)) - - # SayWhenError seen at the very first of the iterable - with self.assertRaises(SayWhenError): - self.pool.map(sqr, exception_throwing_generator(1, -1), 1) - # again, make sure it's reentrant - with self.assertRaises(SayWhenError): - self.pool.map(sqr, exception_throwing_generator(1, -1), 1) - - with self.assertRaises(SayWhenError): - self.pool.map(sqr, exception_throwing_generator(10, 3), 1) - - class SpecialIterable: - def __iter__(self): - return self - def __next__(self): - raise SayWhenError - def __len__(self): - return 1 - with self.assertRaises(SayWhenError): - self.pool.map(sqr, SpecialIterable(), 1) - with self.assertRaises(SayWhenError): - self.pool.map(sqr, SpecialIterable(), 1) - def test_async(self): res = self.pool.apply_async(sqr, (7, TIMEOUT1,)) get = TimingWrapper(res.get) @@ -1868,13 +1848,6 @@ class _TestPool(BaseTestCase): if self.TYPE == 'manager': self.skipTest('test not appropriate for {}'.format(self.TYPE)) - # SayWhenError seen at the very first of the iterable - it = self.pool.imap(sqr, exception_throwing_generator(1, -1), 1) - self.assertRaises(SayWhenError, it.__next__) - # again, make sure it's reentrant - it = self.pool.imap(sqr, exception_throwing_generator(1, -1), 1) - self.assertRaises(SayWhenError, it.__next__) - it = self.pool.imap(sqr, exception_throwing_generator(10, 3), 1) for i in range(3): self.assertEqual(next(it), i*i) @@ -1901,17 +1874,6 @@ class _TestPool(BaseTestCase): if self.TYPE == 'manager': self.skipTest('test not appropriate for {}'.format(self.TYPE)) - # SayWhenError seen at the very first of the iterable - it = self.pool.imap_unordered(sqr, - exception_throwing_generator(1, -1), - 1) - self.assertRaises(SayWhenError, it.__next__) - # again, make sure it's reentrant - it = self.pool.imap_unordered(sqr, - exception_throwing_generator(1, -1), - 1) - self.assertRaises(SayWhenError, it.__next__) - it = self.pool.imap_unordered(sqr, exception_throwing_generator(10, 3), 1) @@ -1993,7 +1955,7 @@ class _TestPool(BaseTestCase): except Exception as e: exc = e else: - self.fail('expected RuntimeError') + raise AssertionError('expected RuntimeError') self.assertIs(type(exc), RuntimeError) self.assertEqual(exc.args, (123,)) cause = exc.__cause__ @@ -2007,17 +1969,6 @@ class _TestPool(BaseTestCase): sys.excepthook(*sys.exc_info()) self.assertIn('raise RuntimeError(123) # some comment', f1.getvalue()) - # _helper_reraises_exception should not make the error - # a remote exception - with self.Pool(1) as p: - try: - p.map(sqr, exception_throwing_generator(1, -1), 1) - except Exception as e: - exc = e - else: - self.fail('expected SayWhenError') - self.assertIs(type(exc), SayWhenError) - self.assertIs(exc.__cause__, None) @classmethod def _test_wrapped_exception(cls): @@ -2029,19 +1980,25 @@ class _TestPool(BaseTestCase): with self.assertRaises(RuntimeError): p.apply(self._test_wrapped_exception) - def test_release_task_refs(self): - # Issue #29861: task arguments and results should not be kept - # alive after we are done with them. - objs = [CountedObject() for i in range(10)] - refs = [weakref.ref(o) for o in objs] - self.pool.map(identity, objs) + def test_map_no_failfast(self): + # Issue #23992: the fail-fast behaviour when an exception is raised + # during map() would make Pool.join() deadlock, because a worker + # process would fill the result queue (after the result handler thread + # terminated, hence not draining it anymore). + + t_start = time.time() + + with self.assertRaises(ValueError): + with self.Pool(2) as p: + try: + p.map(raise_large_valuerror, [0, 1]) + finally: + time.sleep(0.5) + p.close() + p.join() - del objs - time.sleep(DELTA) # let threaded cleanup code run - self.assertEqual(set(wr() for wr in refs), {None}) - # With a process pool, copies of the objects are returned, check - # they were released too. - self.assertEqual(CountedObject.n_instances, 0) + # check that we indeed waited for all jobs + self.assertGreater(time.time() - t_start, 0.9) def raising(): @@ -3018,14 +2975,6 @@ class _TestFinalize(BaseTestCase): ALLOWED_TYPES = ('processes',) - def setUp(self): - self.registry_backup = util._finalizer_registry.copy() - util._finalizer_registry.clear() - - def tearDown(self): - self.assertFalse(util._finalizer_registry) - util._finalizer_registry.update(self.registry_backup) - @classmethod def _test_finalize(cls, conn): class Foo(object): @@ -3075,61 +3024,6 @@ class _TestFinalize(BaseTestCase): result = [obj for obj in iter(conn.recv, 'STOP')] self.assertEqual(result, ['a', 'b', 'd10', 'd03', 'd02', 'd01', 'e']) - def test_thread_safety(self): - # bpo-24484: _run_finalizers() should be thread-safe - def cb(): - pass - - class Foo(object): - def __init__(self): - self.ref = self # create reference cycle - # insert finalizer at random key - util.Finalize(self, cb, exitpriority=random.randint(1, 100)) - - finish = False - exc = None - - def run_finalizers(): - nonlocal exc - while not finish: - time.sleep(random.random() * 1e-1) - try: - # A GC run will eventually happen during this, - # collecting stale Foo's and mutating the registry - util._run_finalizers() - except Exception as e: - exc = e - - def make_finalizers(): - nonlocal exc - d = {} - while not finish: - try: - # Old Foo's get gradually replaced and later - # collected by the GC (because of the cyclic ref) - d[random.getrandbits(5)] = {Foo() for i in range(10)} - except Exception as e: - exc = e - d.clear() - - old_interval = sys.getswitchinterval() - old_threshold = gc.get_threshold() - try: - sys.setswitchinterval(1e-6) - gc.set_threshold(5, 5, 5) - threads = [threading.Thread(target=run_finalizers), - threading.Thread(target=make_finalizers)] - with test.support.start_threads(threads): - time.sleep(4.0) # Wait a bit to trigger race condition - finish = True - if exc is not None: - raise exc - finally: - sys.setswitchinterval(old_interval) - gc.set_threshold(*old_threshold) - gc.collect() # Collect remaining Foo's - - # # Test that from ... import * works for each module # @@ -3924,19 +3818,6 @@ class TestStartMethod(unittest.TestCase): self.assertTrue(methods == ['fork', 'spawn'] or methods == ['fork', 'spawn', 'forkserver']) - def test_preload_resources(self): - if multiprocessing.get_start_method() != 'forkserver': - self.skipTest("test only relevant for 'forkserver' method") - name = os.path.join(os.path.dirname(__file__), 'mp_preload.py') - rc, out, err = test.support.script_helper.assert_python_ok(name) - out = out.decode() - err = err.decode() - if out.rstrip() != 'ok' or err != '': - print(out) - print(err) - self.fail("failed spawning forkserver or grandchild") - - # # Check that killing process does not leak named semaphores # @@ -3976,43 +3857,7 @@ class TestSemaphoreTracker(unittest.TestCase): p.stderr.close() expected = 'semaphore_tracker: There appear to be 2 leaked semaphores' self.assertRegex(err, expected) - self.assertRegex(err, 'semaphore_tracker: %r: \[Errno' % name1) - -class TestSimpleQueue(unittest.TestCase): - - @classmethod - def _test_empty(cls, queue, child_can_start, parent_can_continue): - child_can_start.wait() - # issue 30301, could fail under spawn and forkserver - try: - queue.put(queue.empty()) - queue.put(queue.empty()) - finally: - parent_can_continue.set() - - def test_empty(self): - queue = multiprocessing.SimpleQueue() - child_can_start = multiprocessing.Event() - parent_can_continue = multiprocessing.Event() - - proc = multiprocessing.Process( - target=self._test_empty, - args=(queue, child_can_start, parent_can_continue) - ) - proc.daemon = True - proc.start() - - self.assertTrue(queue.empty()) - - child_can_start.set() - parent_can_continue.wait() - - self.assertFalse(queue.empty()) - self.assertEqual(queue.get(), True) - self.assertEqual(queue.get(), False) - self.assertTrue(queue.empty()) - - proc.join() + self.assertRegex(err, r'semaphore_tracker: %r: \[Errno' % name1) # # Mixins diff --git a/Lib/test/ann_module.py b/Lib/test/ann_module.py new file mode 100644 index 0000000..9e6b87d --- /dev/null +++ b/Lib/test/ann_module.py @@ -0,0 +1,53 @@ + + +""" +The module for testing variable annotations. +Empty lines above are for good reason (testing for correct line numbers) +""" + +from typing import Optional + +__annotations__[1] = 2 + +class C: + + x = 5; y: Optional['C'] = None + +from typing import Tuple +x: int = 5; y: str = x; f: Tuple[int, int] + +class M(type): + + __annotations__['123'] = 123 + o: type = object + +(pars): bool = True + +class D(C): + j: str = 'hi'; k: str= 'bye' + +from types import new_class +h_class = new_class('H', (C,)) +j_class = new_class('J') + +class F(): + z: int = 5 + def __init__(self, x): + pass + +class Y(F): + def __init__(self): + super(F, self).__init__(123) + +class Meta(type): + def __new__(meta, name, bases, namespace): + return super().__new__(meta, name, bases, namespace) + +class S(metaclass = Meta): + x: str = 'something' + y: str = 'something else' + +def foo(x: int = 10): + def bar(y: List[str]): + x: str = 'yes' + bar() diff --git a/Lib/test/ann_module2.py b/Lib/test/ann_module2.py new file mode 100644 index 0000000..76cf5b3 --- /dev/null +++ b/Lib/test/ann_module2.py @@ -0,0 +1,36 @@ +""" +Some correct syntax for variable annotation here. +More examples are in test_grammar and test_parser. +""" + +from typing import no_type_check, ClassVar + +i: int = 1 +j: int +x: float = i/10 + +def f(): + class C: ... + return C() + +f().new_attr: object = object() + +class C: + def __init__(self, x: int) -> None: + self.x = x + +c = C(5) +c.new_attr: int = 10 + +__annotations__ = {} + + +@no_type_check +class NTC: + def meth(self, param: complex) -> None: + ... + +class CV: + var: ClassVar['CV'] + +CV.var = CV() diff --git a/Lib/test/ann_module3.py b/Lib/test/ann_module3.py new file mode 100644 index 0000000..eccd7be --- /dev/null +++ b/Lib/test/ann_module3.py @@ -0,0 +1,18 @@ +""" +Correct syntax for variable annotation that should fail at runtime +in a certain manner. More examples are in test_grammar and test_parser. +""" + +def f_bad_ann(): + __annotations__[1] = 2 + +class C_OK: + def __init__(self, x: int) -> None: + self.x: no_such_name = x # This one is OK as proposed by Guido + +class D_bad_ann: + def __init__(self, x: int) -> None: + sfel.y: int = 0 + +def g_bad_ann(): + no_such_name.attr: int = 0 diff --git a/Lib/test/audiotests.py b/Lib/test/audiotests.py index 0ae2242..d3e8e9e 100644 --- a/Lib/test/audiotests.py +++ b/Lib/test/audiotests.py @@ -1,9 +1,8 @@ from test.support import findfile, TESTFN, unlink -import unittest import array import io import pickle -import sys + class UnseekableIO(io.FileIO): def tell(self): diff --git a/Lib/test/autotest.py b/Lib/test/autotest.py index 41c2088..fa85cc1 100644 --- a/Lib/test/autotest.py +++ b/Lib/test/autotest.py @@ -1,6 +1,5 @@ # This should be equivalent to running regrtest.py from the cmdline. # It can be especially handy if you're in an interactive shell, e.g., # from test import autotest. - -from test import regrtest -regrtest.main() +from test.libregrtest import main +main() diff --git a/Lib/test/badsyntax_async1.py b/Lib/test/badsyntax_async1.py deleted file mode 100644 index fb85e29..0000000 --- a/Lib/test/badsyntax_async1.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(a=await something()): - pass diff --git a/Lib/test/badsyntax_async2.py b/Lib/test/badsyntax_async2.py deleted file mode 100644 index fb85e29..0000000 --- a/Lib/test/badsyntax_async2.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(a=await something()): - pass diff --git a/Lib/test/badsyntax_async3.py b/Lib/test/badsyntax_async3.py deleted file mode 100644 index dde1bc5..0000000 --- a/Lib/test/badsyntax_async3.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(): - [i async for i in els] diff --git a/Lib/test/badsyntax_async4.py b/Lib/test/badsyntax_async4.py deleted file mode 100644 index d033b28..0000000 --- a/Lib/test/badsyntax_async4.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(): - await diff --git a/Lib/test/badsyntax_async5.py b/Lib/test/badsyntax_async5.py deleted file mode 100644 index 9d19af6..0000000 --- a/Lib/test/badsyntax_async5.py +++ /dev/null @@ -1,2 +0,0 @@ -def foo(): - await something() diff --git a/Lib/test/badsyntax_async6.py b/Lib/test/badsyntax_async6.py deleted file mode 100644 index cb0a23d..0000000 --- a/Lib/test/badsyntax_async6.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(): - yield diff --git a/Lib/test/badsyntax_async7.py b/Lib/test/badsyntax_async7.py deleted file mode 100644 index 51e4bf9..0000000 --- a/Lib/test/badsyntax_async7.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(): - yield from [] diff --git a/Lib/test/badsyntax_async8.py b/Lib/test/badsyntax_async8.py deleted file mode 100644 index 3c636f9..0000000 --- a/Lib/test/badsyntax_async8.py +++ /dev/null @@ -1,2 +0,0 @@ -async def foo(): - await await fut diff --git a/Lib/test/bisect.py b/Lib/test/bisect.py deleted file mode 100755 index 0fd577d..0000000 --- a/Lib/test/bisect.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -""" -Command line tool to bisect failing CPython tests. - -Find the test_os test method which alters the environment: - - ./python -m test.bisect --fail-env-changed test_os - -Find a reference leak in "test_os", write the list of failing tests into the -"bisect" file: - - ./python -m test.bisect -o bisect -R 3:3 test_os - -Load an existing list of tests from a file using -i option: - - ./python -m test --list-cases -m FileTests test_os > tests - ./python -m test.bisect -i tests test_os -""" - -import argparse -import datetime -import os.path -import math -import random -import subprocess -import sys -import tempfile -import time - - -def write_tests(filename, tests): - with open(filename, "w") as fp: - for name in tests: - print(name, file=fp) - fp.flush() - - -def write_output(filename, tests): - if not filename: - return - print("Write %s tests into %s" % (len(tests), filename)) - write_tests(filename, tests) - return filename - - -def format_shell_args(args): - return ' '.join(args) - - -def list_cases(args): - cmd = [sys.executable, '-m', 'test', '--list-cases'] - cmd.extend(args.test_args) - proc = subprocess.run(cmd, - stdout=subprocess.PIPE, - universal_newlines=True) - exitcode = proc.returncode - if exitcode: - cmd = format_shell_args(cmd) - print("Failed to list tests: %s failed with exit code %s" - % (cmd, exitcode)) - sys.exit(exitcode) - tests = proc.stdout.splitlines() - return tests - - -def run_tests(args, tests, huntrleaks=None): - tmp = tempfile.mktemp() - try: - write_tests(tmp, tests) - - cmd = [sys.executable, '-m', 'test', '--matchfile', tmp] - cmd.extend(args.test_args) - print("+ %s" % format_shell_args(cmd)) - proc = subprocess.run(cmd) - return proc.returncode - finally: - if os.path.exists(tmp): - os.unlink(tmp) - - -def parse_args(): - parser = argparse.ArgumentParser() - parser.add_argument('-i', '--input', - help='Test names produced by --list-tests written ' - 'into a file. If not set, run --list-tests') - parser.add_argument('-o', '--output', - help='Result of the bisection') - parser.add_argument('-n', '--max-tests', type=int, default=1, - help='Maximum number of tests to stop the bisection ' - '(default: 1)') - parser.add_argument('-N', '--max-iter', type=int, default=100, - help='Maximum number of bisection iterations ' - '(default: 100)') - # FIXME: document that following arguments are test arguments - - args, test_args = parser.parse_known_args() - args.test_args = test_args - return args - - -def main(): - args = parse_args() - - if args.input: - with open(args.input) as fp: - tests = [line.strip() for line in fp] - else: - tests = list_cases(args) - - print("Start bisection with %s tests" % len(tests)) - print("Test arguments: %s" % format_shell_args(args.test_args)) - print("Bisection will stop when getting %s or less tests " - "(-n/--max-tests option), or after %s iterations " - "(-N/--max-iter option)" - % (args.max_tests, args.max_iter)) - output = write_output(args.output, tests) - print() - - start_time = time.monotonic() - iteration = 1 - try: - while len(tests) > args.max_tests and iteration <= args.max_iter: - ntest = len(tests) - ntest = max(ntest // 2, 1) - subtests = random.sample(tests, ntest) - - print("[+] Iteration %s: run %s tests/%s" - % (iteration, len(subtests), len(tests))) - print() - - exitcode = run_tests(args, subtests) - - print("ran %s tests/%s" % (ntest, len(tests))) - print("exit", exitcode) - if exitcode: - print("Tests failed: use this new subtest") - tests = subtests - output = write_output(args.output, tests) - else: - print("Tests succeeded: skip this subtest, try a new subbset") - print() - iteration += 1 - except KeyboardInterrupt: - print() - print("Bisection interrupted!") - print() - - print("Tests (%s):" % len(tests)) - for test in tests: - print("* %s" % test) - print() - - if output: - print("Output written into %s" % output) - - dt = math.ceil(time.monotonic() - start_time) - if len(tests) <= args.max_tests: - print("Bisection completed in %s iterations and %s" - % (iteration, datetime.timedelta(seconds=dt))) - sys.exit(1) - else: - print("Bisection failed after %s iterations and %s" - % (iteration, datetime.timedelta(seconds=dt))) - - -if __name__ == "__main__": - main() diff --git a/Lib/test/capath/0e4015b9.0 b/Lib/test/capath/0e4015b9.0 deleted file mode 100644 index b6d259b..0000000 --- a/Lib/test/capath/0e4015b9.0 +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIClTCCAf6gAwIBAgIJAKGU95wKR8pTMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV -BAYTAlhZMRcwFQYDVQQHDA5DYXN0bGUgQW50aHJheDEjMCEGA1UECgwaUHl0aG9u -IFNvZnR3YXJlIEZvdW5kYXRpb24xIzAhBgNVBAMMGnNlbGYtc2lnbmVkLnB5dGhv -bnRlc3QubmV0MB4XDTE0MTEwMjE4MDkyOVoXDTI0MTAzMDE4MDkyOVowcDELMAkG -A1UEBhMCWFkxFzAVBgNVBAcMDkNhc3RsZSBBbnRocmF4MSMwIQYDVQQKDBpQeXRo -b24gU29mdHdhcmUgRm91bmRhdGlvbjEjMCEGA1UEAwwac2VsZi1zaWduZWQucHl0 -aG9udGVzdC5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANDXQXW9tjyZ -Xt0Iv2tLL1+jinr4wGg36ioLDLFkMf+2Y1GL0v0BnKYG4N1OKlAU15LXGeGer8vm -Sv/yIvmdrELvhAbbo3w4a9TMYQA4XkIVLdvu3mvNOAet+8PMJxn26dbDhG809ALv -EHY57lQsBS3G59RZyBPVqAqmImWNJnVzAgMBAAGjNzA1MCUGA1UdEQQeMByCGnNl -bGYtc2lnbmVkLnB5dGhvbnRlc3QubmV0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN -AQEFBQADgYEAIuzAhgMouJpNdf3URCHIineyoSt6WK/9+eyUcjlKOrDoXNZaD72h -TXMeKYoWvJyVcSLKL8ckPtDobgP2OTt0UkyAaj0n+ZHaqq1lH2yVfGUA1ILJv515 -C8BqbvVZuqm3i7ygmw3bqE/lYMgOrYtXXnqOrz6nvsE6Yc9V9rFflOM= ------END CERTIFICATE----- diff --git a/Lib/test/capath/b1930218.0 b/Lib/test/capath/b1930218.0 new file mode 100644 index 0000000..373349c --- /dev/null +++ b/Lib/test/capath/b1930218.0 @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIJALCSZLHy2iHQMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV +BAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUgRm91bmRhdGlvbiBDQTEW +MBQGA1UEAwwNb3VyLWNhLXNlcnZlcjAeFw0xMzAxMDQxOTQ3MDdaFw0yMzAxMDIx +OTQ3MDdaME0xCzAJBgNVBAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUg +Rm91bmRhdGlvbiBDQTEWMBQGA1UEAwwNb3VyLWNhLXNlcnZlcjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAOfe6eMMnwC2of0rW5bSb8zgvoa5IF7sA3pV +q+qk6flJhdJm1e3HeupWji2P50LiYiipn9Ybjuu1tJyfFKvf5pSLdh0+bSRh7Qy/ +AIphDN9cyDZzFgDNR7ptpKR0iIMjChn8Cac8SkvT5x0t5OpMVCHzJtuJNxjUArtA +Ml+k/y0c99S77I7PXIKs5nwIbEiFYQd/JeBc4Lw0X+C5BEd1yEcLjbzWyGhfM4Ni +0iBENbGtgRqKzbw1sFyLR9YY6ZwYl8wBPCnM6B7k5MG43ufCERiHWpM02KYl9xRx +6+QhotIPLi7UYgA109bvXGBLTKkU4t0VWEY3Mya35y5d7ULkxU0CAwEAAaNQME4w +HQYDVR0OBBYEFLzdYtl22hvSVGvP4GabHh57VgwLMB8GA1UdIwQYMBaAFLzdYtl2 +2hvSVGvP4GabHh57VgwLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB +AH0K9cuN0129mY74Kw+668LZpidPLnsvDmTYHDVQTu78kLmNbajFxgawr/Mtvzu4 +QgfdGH1tlVRXhRhgRy/reBv56Bf9Wg2HFyisTGrmvCn09FVwKULeheqrbCMGZDB1 +Ao5TvF4BMzfMHs24pP3K5F9lO4MchvFVAqA6j9uRt0AUtOeN0u5zuuPlNC28lG9O +JAb3X4sOp45r3l519DKaULFEM5rQBeJ4gv/b2opj66nd0b+gYa3jnookXWIO50yR +f+/fNDY7L131hLIvxG2TlhpvMCjx2hKaZLRAMx293itTqOq+1rxOlvVE+zIYrtUf +9mmvtk57HVjsO6lTo15YyJ4= +-----END CERTIFICATE----- diff --git a/Lib/test/capath/ce7b8643.0 b/Lib/test/capath/ce7b8643.0 deleted file mode 100644 index b6d259b..0000000 --- a/Lib/test/capath/ce7b8643.0 +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIClTCCAf6gAwIBAgIJAKGU95wKR8pTMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV -BAYTAlhZMRcwFQYDVQQHDA5DYXN0bGUgQW50aHJheDEjMCEGA1UECgwaUHl0aG9u -IFNvZnR3YXJlIEZvdW5kYXRpb24xIzAhBgNVBAMMGnNlbGYtc2lnbmVkLnB5dGhv -bnRlc3QubmV0MB4XDTE0MTEwMjE4MDkyOVoXDTI0MTAzMDE4MDkyOVowcDELMAkG -A1UEBhMCWFkxFzAVBgNVBAcMDkNhc3RsZSBBbnRocmF4MSMwIQYDVQQKDBpQeXRo -b24gU29mdHdhcmUgRm91bmRhdGlvbjEjMCEGA1UEAwwac2VsZi1zaWduZWQucHl0 -aG9udGVzdC5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANDXQXW9tjyZ -Xt0Iv2tLL1+jinr4wGg36ioLDLFkMf+2Y1GL0v0BnKYG4N1OKlAU15LXGeGer8vm -Sv/yIvmdrELvhAbbo3w4a9TMYQA4XkIVLdvu3mvNOAet+8PMJxn26dbDhG809ALv -EHY57lQsBS3G59RZyBPVqAqmImWNJnVzAgMBAAGjNzA1MCUGA1UdEQQeMByCGnNl -bGYtc2lnbmVkLnB5dGhvbnRlc3QubmV0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN -AQEFBQADgYEAIuzAhgMouJpNdf3URCHIineyoSt6WK/9+eyUcjlKOrDoXNZaD72h -TXMeKYoWvJyVcSLKL8ckPtDobgP2OTt0UkyAaj0n+ZHaqq1lH2yVfGUA1ILJv515 -C8BqbvVZuqm3i7ygmw3bqE/lYMgOrYtXXnqOrz6nvsE6Yc9V9rFflOM= ------END CERTIFICATE----- diff --git a/Lib/test/capath/ceff1710.0 b/Lib/test/capath/ceff1710.0 new file mode 100644 index 0000000..373349c --- /dev/null +++ b/Lib/test/capath/ceff1710.0 @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDbTCCAlWgAwIBAgIJALCSZLHy2iHQMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV +BAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUgRm91bmRhdGlvbiBDQTEW +MBQGA1UEAwwNb3VyLWNhLXNlcnZlcjAeFw0xMzAxMDQxOTQ3MDdaFw0yMzAxMDIx +OTQ3MDdaME0xCzAJBgNVBAYTAlhZMSYwJAYDVQQKDB1QeXRob24gU29mdHdhcmUg +Rm91bmRhdGlvbiBDQTEWMBQGA1UEAwwNb3VyLWNhLXNlcnZlcjCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAOfe6eMMnwC2of0rW5bSb8zgvoa5IF7sA3pV +q+qk6flJhdJm1e3HeupWji2P50LiYiipn9Ybjuu1tJyfFKvf5pSLdh0+bSRh7Qy/ +AIphDN9cyDZzFgDNR7ptpKR0iIMjChn8Cac8SkvT5x0t5OpMVCHzJtuJNxjUArtA +Ml+k/y0c99S77I7PXIKs5nwIbEiFYQd/JeBc4Lw0X+C5BEd1yEcLjbzWyGhfM4Ni +0iBENbGtgRqKzbw1sFyLR9YY6ZwYl8wBPCnM6B7k5MG43ufCERiHWpM02KYl9xRx +6+QhotIPLi7UYgA109bvXGBLTKkU4t0VWEY3Mya35y5d7ULkxU0CAwEAAaNQME4w +HQYDVR0OBBYEFLzdYtl22hvSVGvP4GabHh57VgwLMB8GA1UdIwQYMBaAFLzdYtl2 +2hvSVGvP4GabHh57VgwLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB +AH0K9cuN0129mY74Kw+668LZpidPLnsvDmTYHDVQTu78kLmNbajFxgawr/Mtvzu4 +QgfdGH1tlVRXhRhgRy/reBv56Bf9Wg2HFyisTGrmvCn09FVwKULeheqrbCMGZDB1 +Ao5TvF4BMzfMHs24pP3K5F9lO4MchvFVAqA6j9uRt0AUtOeN0u5zuuPlNC28lG9O +JAb3X4sOp45r3l519DKaULFEM5rQBeJ4gv/b2opj66nd0b+gYa3jnookXWIO50yR +f+/fNDY7L131hLIvxG2TlhpvMCjx2hKaZLRAMx293itTqOq+1rxOlvVE+zIYrtUf +9mmvtk57HVjsO6lTo15YyJ4= +-----END CERTIFICATE----- diff --git a/Lib/test/cmath_testcases.txt b/Lib/test/cmath_testcases.txt index 9b08653..dd7e458 100644 --- a/Lib/test/cmath_testcases.txt +++ b/Lib/test/cmath_testcases.txt @@ -53,6 +53,12 @@ -- MPFR homepage at http://www.mpfr.org for more information about the -- MPFR project. +-- A minority of the test cases were generated with the help of +-- mpmath 0.19 at 100 bit accuracy (http://mpmath.org) to improve +-- coverage of real functions with real-valued arguments. These are +-- used in test.test_math.MathTests.test_testfile, as well as in +-- test_cmath. + -------------------------- -- acos: Inverse cosine -- @@ -848,6 +854,18 @@ atan0302 atan 9.9999999999999999e-161 -1.0 -> 0.78539816339744828 -184.553381029 atan0303 atan -1e-165 1.0 -> -0.78539816339744828 190.30984376228875 atan0304 atan -9.9998886718268301e-321 -1.0 -> -0.78539816339744828 -368.76019403576692 +-- Additional real values (mpmath) +atan0400 atan 1.7976931348623157e+308 0.0 -> 1.5707963267948966192 0.0 +atan0401 atan -1.7976931348623157e+308 0.0 -> -1.5707963267948966192 0.0 +atan0402 atan 1e-17 0.0 -> 1.0000000000000000715e-17 0.0 +atan0403 atan -1e-17 0.0 -> -1.0000000000000000715e-17 0.0 +atan0404 atan 0.0001 0.0 -> 0.000099999999666666673459 0.0 +atan0405 atan -0.0001 0.0 -> -0.000099999999666666673459 0.0 +atan0406 atan 0.999999999999999 0.0 -> 0.78539816339744781002 0.0 +atan0407 atan 1.000000000000001 0.0 -> 0.78539816339744886473 0.0 +atan0408 atan 14.101419947171719 0.0 -> 1.4999999999999999969 0.0 +atan0409 atan 1255.7655915007897 0.0 -> 1.5700000000000000622 0.0 + -- special values atan1000 atan -0.0 0.0 -> -0.0 0.0 atan1001 atan nan 0.0 -> nan 0.0 @@ -1514,6 +1532,11 @@ sqrt0131 sqrt -1.5477066694467245e-310 -0.0 -> 0.0 -1.2440685951533077e-155 sqrt0140 sqrt 1.6999999999999999e+308 -1.6999999999999999e+308 -> 1.4325088230154573e+154 -5.9336458271212207e+153 sqrt0141 sqrt -1.797e+308 -9.9999999999999999e+306 -> 3.7284476432057307e+152 -1.3410406899802901e+154 +-- Additional real values (mpmath) +sqrt0150 sqrt 1.7976931348623157e+308 0.0 -> 1.3407807929942596355e+154 0.0 +sqrt0151 sqrt 2.2250738585072014e-308 0.0 -> 1.4916681462400413487e-154 0.0 +sqrt0152 sqrt 5e-324 0.0 -> 2.2227587494850774834e-162 0.0 + -- special values sqrt1000 sqrt 0.0 0.0 -> 0.0 0.0 sqrt1001 sqrt -0.0 0.0 -> 0.0 0.0 @@ -1616,6 +1639,20 @@ exp0052 exp 710.0 1.5 -> 1.5802653829857376e+307 inf overflow exp0053 exp 710.0 1.6 -> -6.5231579995501372e+306 inf overflow exp0054 exp 710.0 2.8 -> -inf 7.4836177417448528e+307 overflow +-- Additional real values (mpmath) +exp0070 exp 1e-08 0.0 -> 1.00000001000000005 0.0 +exp0071 exp 0.0003 0.0 -> 1.0003000450045003375 0.0 +exp0072 exp 0.2 0.0 -> 1.2214027581601698475 0.0 +exp0073 exp 1.0 0.0 -> 2.7182818284590452354 0.0 +exp0074 exp -1e-08 0.0 -> 0.99999999000000005 0.0 +exp0075 exp -0.0003 0.0 -> 0.99970004499550033751 0.0 +exp0076 exp -1.0 0.0 -> 0.3678794411714423216 0.0 +exp0077 exp 2.220446049250313e-16 0.0 -> 1.000000000000000222 0.0 +exp0078 exp -1.1102230246251565e-16 0.0 -> 0.99999999999999988898 0.0 +exp0079 exp 2.302585092994046 0.0 -> 10.000000000000002171 0.0 +exp0080 exp -2.302585092994046 0.0 -> 0.099999999999999978292 0.0 +exp0081 exp 709.7827 0.0 -> 1.7976699566638014654e+308 0.0 + -- special values exp1000 exp 0.0 0.0 -> 1.0 0.0 exp1001 exp -0.0 0.0 -> 1.0 0.0 @@ -1708,6 +1745,23 @@ cosh0023 cosh 2.218885944363501 2.0015727395883687 -> -1.94294321081968 4.129026 cosh0030 cosh 710.5 2.3519999999999999 -> -1.2967465239355998e+308 1.3076707908857333e+308 cosh0031 cosh -710.5 0.69999999999999996 -> 1.4085466381392499e+308 -1.1864024666450239e+308 +-- Additional real values (mpmath) +cosh0050 cosh 1e-150 0.0 -> 1.0 0.0 +cosh0051 cosh 1e-18 0.0 -> 1.0 0.0 +cosh0052 cosh 1e-09 0.0 -> 1.0000000000000000005 0.0 +cosh0053 cosh 0.0003 0.0 -> 1.0000000450000003375 0.0 +cosh0054 cosh 0.2 0.0 -> 1.0200667556190758485 0.0 +cosh0055 cosh 1.0 0.0 -> 1.5430806348152437785 0.0 +cosh0056 cosh -1e-18 0.0 -> 1.0 -0.0 +cosh0057 cosh -0.0003 0.0 -> 1.0000000450000003375 -0.0 +cosh0058 cosh -1.0 0.0 -> 1.5430806348152437785 -0.0 +cosh0059 cosh 1.3169578969248168 0.0 -> 2.0000000000000001504 0.0 +cosh0060 cosh -1.3169578969248168 0.0 -> 2.0000000000000001504 -0.0 +cosh0061 cosh 17.328679513998633 0.0 -> 16777216.000000021938 0.0 +cosh0062 cosh 18.714973875118524 0.0 -> 67108864.000000043662 0.0 +cosh0063 cosh 709.7827 0.0 -> 8.9883497833190073272e+307 0.0 +cosh0064 cosh -709.7827 0.0 -> 8.9883497833190073272e+307 -0.0 + -- special values cosh1000 cosh 0.0 0.0 -> 1.0 0.0 cosh1001 cosh 0.0 inf -> nan 0.0 invalid ignore-imag-sign @@ -1800,6 +1854,24 @@ sinh0023 sinh 0.043713693678420068 0.22512549887532657 -> 0.042624198673416713 0 sinh0030 sinh 710.5 -2.3999999999999999 -> -1.3579970564885919e+308 -1.24394470907798e+308 sinh0031 sinh -710.5 0.80000000000000004 -> -1.2830671601735164e+308 1.3210954193997678e+308 +-- Additional real values (mpmath) +sinh0050 sinh 1e-100 0.0 -> 1.00000000000000002e-100 0.0 +sinh0051 sinh 5e-17 0.0 -> 4.9999999999999998955e-17 0.0 +sinh0052 sinh 1e-16 0.0 -> 9.999999999999999791e-17 0.0 +sinh0053 sinh 3.7e-08 0.0 -> 3.7000000000000008885e-8 0.0 +sinh0054 sinh 0.001 0.0 -> 0.0010000001666666750208 0.0 +sinh0055 sinh 0.2 0.0 -> 0.20133600254109399895 0.0 +sinh0056 sinh 1.0 0.0 -> 1.1752011936438014569 0.0 +sinh0057 sinh -3.7e-08 0.0 -> -3.7000000000000008885e-8 0.0 +sinh0058 sinh -0.001 0.0 -> -0.0010000001666666750208 0.0 +sinh0059 sinh -1.0 0.0 -> -1.1752011936438014569 0.0 +sinh0060 sinh 1.4436354751788103 0.0 -> 1.9999999999999999078 0.0 +sinh0061 sinh -1.4436354751788103 0.0 -> -1.9999999999999999078 0.0 +sinh0062 sinh 17.328679513998633 0.0 -> 16777215.999999992136 0.0 +sinh0063 sinh 18.714973875118524 0.0 -> 67108864.000000036211 0.0 +sinh0064 sinh 709.7827 0.0 -> 8.9883497833190073272e+307 0.0 +sinh0065 sinh -709.7827 0.0 -> -8.9883497833190073272e+307 0.0 + -- special values sinh1000 sinh 0.0 0.0 -> 0.0 0.0 sinh1001 sinh 0.0 inf -> 0.0 nan invalid ignore-real-sign @@ -1897,6 +1969,24 @@ tanh0031 tanh -711 7.4000000000000004 -> -1.0 0.0 tanh0032 tanh 1000 -2.3199999999999998 -> 1.0 0.0 tanh0033 tanh -1.0000000000000001e+300 -9.6699999999999999 -> -1.0 -0.0 +-- Additional real values (mpmath) +tanh0050 tanh 1e-100 0.0 -> 1.00000000000000002e-100 0.0 +tanh0051 tanh 5e-17 0.0 -> 4.9999999999999998955e-17 0.0 +tanh0052 tanh 1e-16 0.0 -> 9.999999999999999791e-17 0.0 +tanh0053 tanh 3.7e-08 0.0 -> 3.6999999999999983559e-8 0.0 +tanh0054 tanh 0.001 0.0 -> 0.00099999966666680002076 0.0 +tanh0055 tanh 0.2 0.0 -> 0.19737532022490401141 0.0 +tanh0056 tanh 1.0 0.0 -> 0.76159415595576488812 0.0 +tanh0057 tanh -3.7e-08 0.0 -> -3.6999999999999983559e-8 0.0 +tanh0058 tanh -0.001 0.0 -> -0.00099999966666680002076 0.0 +tanh0059 tanh -1.0 0.0 -> -0.76159415595576488812 0.0 +tanh0060 tanh 0.5493061443340549 0.0 -> 0.50000000000000003402 0.0 +tanh0061 tanh -0.5493061443340549 0.0 -> -0.50000000000000003402 0.0 +tanh0062 tanh 17.328679513998633 0.0 -> 0.99999999999999822364 0.0 +tanh0063 tanh 18.714973875118524 0.0 -> 0.99999999999999988898 0.0 +tanh0064 tanh 711 0.0 -> 1.0 0.0 +tanh0065 tanh 1.797e+308 0.0 -> 1.0 0.0 + --special values tanh1000 tanh 0.0 0.0 -> 0.0 0.0 tanh1001 tanh 0.0 inf -> nan nan invalid @@ -1985,6 +2075,22 @@ cos0021 cos 4.8048375263775256 0.0062248852898515658 -> 0.092318702015846243 0.0 cos0022 cos 7.9914515433858515 0.71659966615501436 -> -0.17375439906936566 -0.77217043527294582 cos0023 cos 0.45124351152540226 1.6992693993812158 -> 2.543477948972237 -1.1528193694875477 +-- Additional real values (mpmath) +cos0050 cos 1e-150 0.0 -> 1.0 -0.0 +cos0051 cos 1e-18 0.0 -> 1.0 -0.0 +cos0052 cos 1e-09 0.0 -> 0.9999999999999999995 -0.0 +cos0053 cos 0.0003 0.0 -> 0.9999999550000003375 -0.0 +cos0054 cos 0.2 0.0 -> 0.98006657784124162892 -0.0 +cos0055 cos 1.0 0.0 -> 0.5403023058681397174 -0.0 +cos0056 cos -1e-18 0.0 -> 1.0 0.0 +cos0057 cos -0.0003 0.0 -> 0.9999999550000003375 0.0 +cos0058 cos -1.0 0.0 -> 0.5403023058681397174 0.0 +cos0059 cos 1.0471975511965976 0.0 -> 0.50000000000000009945 -0.0 +cos0060 cos 2.5707963267948966 0.0 -> -0.84147098480789647357 -0.0 +cos0061 cos -2.5707963267948966 0.0 -> -0.84147098480789647357 0.0 +cos0062 cos 7.225663103256523 0.0 -> 0.58778525229247407559 -0.0 +cos0063 cos -8.79645943005142 0.0 -> -0.80901699437494722255 0.0 + -- special values cos1000 cos -0.0 0.0 -> 1.0 0.0 cos1001 cos -inf 0.0 -> nan 0.0 invalid ignore-imag-sign @@ -2073,6 +2179,22 @@ sin0021 sin 1.4342727387492671 0.81361889790284347 -> 1.3370960060947923 0.12336 sin0022 sin 1.1518087354403725 4.8597235966150558 -> 58.919141989603041 26.237003403758852 sin0023 sin 0.00087773078406649192 34.792379211312095 -> 565548145569.38245 644329685822700.62 +-- Additional real values (mpmath) +sin0050 sin 1e-100 0.0 -> 1.00000000000000002e-100 0.0 +sin0051 sin 3.7e-08 0.0 -> 3.6999999999999992001e-8 0.0 +sin0052 sin 0.001 0.0 -> 0.00099999983333334168748 0.0 +sin0053 sin 0.2 0.0 -> 0.19866933079506122634 0.0 +sin0054 sin 1.0 0.0 -> 0.84147098480789650665 0.0 +sin0055 sin -3.7e-08 0.0 -> -3.6999999999999992001e-8 0.0 +sin0056 sin -0.001 0.0 -> -0.00099999983333334168748 0.0 +sin0057 sin -1.0 0.0 -> -0.84147098480789650665 0.0 +sin0058 sin 0.5235987755982989 0.0 -> 0.50000000000000004642 0.0 +sin0059 sin -0.5235987755982989 0.0 -> -0.50000000000000004642 0.0 +sin0060 sin 2.6179938779914944 0.0 -> 0.49999999999999996018 -0.0 +sin0061 sin -2.6179938779914944 0.0 -> -0.49999999999999996018 -0.0 +sin0062 sin 7.225663103256523 0.0 -> 0.80901699437494673648 0.0 +sin0063 sin -8.79645943005142 0.0 -> -0.58778525229247340658 -0.0 + -- special values sin1000 sin -0.0 0.0 -> -0.0 0.0 sin1001 sin -inf 0.0 -> nan 0.0 invalid ignore-imag-sign @@ -2161,6 +2283,25 @@ tan0021 tan 1.7809617968443272 1.5052381702853379 -> -0.044066222118946903 1.093 tan0022 tan 1.1615313900880577 1.7956298728647107 -> 0.041793186826390362 1.0375339546034792 tan0023 tan 0.067014779477908945 5.8517361577457097 -> 2.2088639754800034e-06 0.9999836182420061 +-- Additional real values (mpmath) +tan0050 tan 1e-100 0.0 -> 1.00000000000000002e-100 0.0 +tan0051 tan 3.7e-08 0.0 -> 3.7000000000000017328e-8 0.0 +tan0052 tan 0.001 0.0 -> 0.0010000003333334666875 0.0 +tan0053 tan 0.2 0.0 -> 0.20271003550867249488 0.0 +tan0054 tan 1.0 0.0 -> 1.5574077246549022305 0.0 +tan0055 tan -3.7e-08 0.0 -> -3.7000000000000017328e-8 0.0 +tan0056 tan -0.001 0.0 -> -0.0010000003333334666875 0.0 +tan0057 tan -1.0 0.0 -> -1.5574077246549022305 0.0 +tan0058 tan 0.4636476090008061 0.0 -> 0.49999999999999997163 0.0 +tan0059 tan -0.4636476090008061 0.0 -> -0.49999999999999997163 0.0 +tan0060 tan 1.1071487177940904 0.0 -> 1.9999999999999995298 0.0 +tan0061 tan -1.1071487177940904 0.0 -> -1.9999999999999995298 0.0 +tan0062 tan 1.5 0.0 -> 14.101419947171719388 0.0 +tan0063 tan 1.57 0.0 -> 1255.7655915007896475 0.0 +tan0064 tan 1.5707963267948961 0.0 -> 1978937966095219.0538 0.0 +tan0065 tan 7.225663103256523 0.0 -> 1.3763819204711701522 0.0 +tan0066 tan -8.79645943005142 0.0 -> 0.7265425280053614098 0.0 + -- special values tan1000 tan -0.0 0.0 -> -0.0 0.0 tan1001 tan -inf 0.0 -> nan nan invalid diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 0860db8..d65186d 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -2,14 +2,22 @@ See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases """ +from test.support import is_resource_enabled + +import itertools +import bisect import copy import decimal import sys +import os import pickle import random +import struct import unittest +from array import array + from operator import lt, le, gt, ge, eq, ne, truediv, floordiv, mod from test import support @@ -284,7 +292,8 @@ class TestTimeZone(unittest.TestCase): with self.assertRaises(TypeError): self.EST.dst(5) def test_tzname(self): - self.assertEqual('UTC+00:00', timezone(ZERO).tzname(None)) + self.assertEqual('UTC', timezone.utc.tzname(None)) + self.assertEqual('UTC', timezone(ZERO).tzname(None)) self.assertEqual('UTC-05:00', timezone(-5 * HOUR).tzname(None)) self.assertEqual('UTC+09:30', timezone(9.5 * HOUR).tzname(None)) self.assertEqual('UTC-00:01', timezone(timedelta(minutes=-1)).tzname(None)) @@ -1320,6 +1329,7 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase): green = pickler.dumps(orig, proto) derived = unpickler.loads(green) self.assertEqual(orig, derived) + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) def test_compare(self): t1 = self.theclass(2, 3, 4) @@ -1558,13 +1568,32 @@ class TestDateTime(TestDate): self.assertEqual(dt, dt2) def test_isoformat(self): - t = self.theclass(2, 3, 2, 4, 5, 1, 123) - self.assertEqual(t.isoformat(), "0002-03-02T04:05:01.000123") - self.assertEqual(t.isoformat('T'), "0002-03-02T04:05:01.000123") - self.assertEqual(t.isoformat(' '), "0002-03-02 04:05:01.000123") - self.assertEqual(t.isoformat('\x00'), "0002-03-02\x0004:05:01.000123") + t = self.theclass(1, 2, 3, 4, 5, 1, 123) + self.assertEqual(t.isoformat(), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat('T'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(' '), "0001-02-03 04:05:01.000123") + self.assertEqual(t.isoformat('\x00'), "0001-02-03\x0004:05:01.000123") + self.assertEqual(t.isoformat(timespec='hours'), "0001-02-03T04") + self.assertEqual(t.isoformat(timespec='minutes'), "0001-02-03T04:05") + self.assertEqual(t.isoformat(timespec='seconds'), "0001-02-03T04:05:01") + self.assertEqual(t.isoformat(timespec='milliseconds'), "0001-02-03T04:05:01.000") + self.assertEqual(t.isoformat(timespec='microseconds'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(timespec='auto'), "0001-02-03T04:05:01.000123") + self.assertEqual(t.isoformat(sep=' ', timespec='minutes'), "0001-02-03 04:05") + self.assertRaises(ValueError, t.isoformat, timespec='foo') # str is ISO format with the separator forced to a blank. - self.assertEqual(str(t), "0002-03-02 04:05:01.000123") + self.assertEqual(str(t), "0001-02-03 04:05:01.000123") + + t = self.theclass(1, 2, 3, 4, 5, 1, 999500, tzinfo=timezone.utc) + self.assertEqual(t.isoformat(timespec='milliseconds'), "0001-02-03T04:05:01.999+00:00") + + t = self.theclass(1, 2, 3, 4, 5, 1, 999500) + self.assertEqual(t.isoformat(timespec='milliseconds'), "0001-02-03T04:05:01.999") + + t = self.theclass(1, 2, 3, 4, 5, 1) + self.assertEqual(t.isoformat(timespec='auto'), "0001-02-03T04:05:01") + self.assertEqual(t.isoformat(timespec='milliseconds'), "0001-02-03T04:05:01.000") + self.assertEqual(t.isoformat(timespec='microseconds'), "0001-02-03T04:05:01.000000") t = self.theclass(2, 3, 2) self.assertEqual(t.isoformat(), "0002-03-02T00:00:00") @@ -1572,6 +1601,10 @@ class TestDateTime(TestDate): self.assertEqual(t.isoformat(' '), "0002-03-02 00:00:00") # str is ISO format with the separator forced to a blank. self.assertEqual(str(t), "0002-03-02 00:00:00") + # ISO format with timezone + tz = FixedOffset(timedelta(seconds=16), 'XXX') + t = self.theclass(2, 3, 2, tzinfo=tz) + self.assertEqual(t.isoformat(), "0002-03-02T00:00:00+00:00:16") def test_format(self): dt = self.theclass(2007, 9, 10, 4, 5, 1, 123) @@ -1691,6 +1724,14 @@ class TestDateTime(TestDate): self.assertRaises(ValueError, self.theclass, 2000, 1, 31, 23, 59, 59, 1000000) + # bad fold + self.assertRaises(ValueError, self.theclass, + 2000, 1, 31, fold=-1) + self.assertRaises(ValueError, self.theclass, + 2000, 1, 31, fold=2) + # Positional fold: + self.assertRaises(TypeError, self.theclass, + 2000, 1, 31, 23, 59, 59, 0, None, 1) def test_hash_equality(self): d = self.theclass(2000, 12, 31, 23, 30, 17) @@ -1790,6 +1831,7 @@ class TestDateTime(TestDate): green = pickler.dumps(orig, proto) derived = unpickler.loads(green) self.assertEqual(orig, derived) + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) def test_more_pickling(self): a = self.theclass(2003, 2, 7, 16, 48, 37, 444116) @@ -1874,16 +1916,20 @@ class TestDateTime(TestDate): t = self.theclass(1970, 1, 1, 1, 2, 3, 4) self.assertEqual(t.timestamp(), 18000.0 + 3600 + 2*60 + 3 + 4*1e-6) - # Missing hour may produce platform-dependent result - t = self.theclass(2012, 3, 11, 2, 30) - self.assertIn(self.theclass.fromtimestamp(t.timestamp()), - [t - timedelta(hours=1), t + timedelta(hours=1)]) + # Missing hour + t0 = self.theclass(2012, 3, 11, 2, 30) + t1 = t0.replace(fold=1) + self.assertEqual(self.theclass.fromtimestamp(t1.timestamp()), + t0 - timedelta(hours=1)) + self.assertEqual(self.theclass.fromtimestamp(t0.timestamp()), + t1 + timedelta(hours=1)) # Ambiguous hour defaults to DST t = self.theclass(2012, 11, 4, 1, 30) self.assertEqual(self.theclass.fromtimestamp(t.timestamp()), t) # Timestamp may raise an overflow error on some platforms - for t in [self.theclass(1,1,1), self.theclass(9999,12,12)]: + # XXX: Do we care to support the first and last year? + for t in [self.theclass(2,1,1), self.theclass(9998,12,12)]: try: s = t.timestamp() except OverflowError: @@ -1902,6 +1948,7 @@ class TestDateTime(TestDate): self.assertEqual(t.timestamp(), 18000 + 3600 + 2*60 + 3 + 4*1e-6) + @support.run_with_tz('MSK-03') # Something east of Greenwich def test_microsecond_rounding(self): for fts in [self.theclass.fromtimestamp, self.theclass.utcfromtimestamp]: @@ -2076,11 +2123,22 @@ class TestDateTime(TestDate): self.assertRaises(TypeError, combine) # need an arg self.assertRaises(TypeError, combine, d) # need two args self.assertRaises(TypeError, combine, t, d) # args reversed - self.assertRaises(TypeError, combine, d, t, 1) # too many args + self.assertRaises(TypeError, combine, d, t, 1) # wrong tzinfo type + self.assertRaises(TypeError, combine, d, t, 1, 2) # too many args self.assertRaises(TypeError, combine, "date", "time") # wrong types self.assertRaises(TypeError, combine, d, "time") # wrong type self.assertRaises(TypeError, combine, "date", t) # wrong type + # tzinfo= argument + dt = combine(d, t, timezone.utc) + self.assertIs(dt.tzinfo, timezone.utc) + dt = combine(d, t, tzinfo=timezone.utc) + self.assertIs(dt.tzinfo, timezone.utc) + t = time() + dt = combine(dt, t) + self.assertEqual(dt.date(), d) + self.assertEqual(dt.time(), t) + def test_replace(self): cls = self.theclass args = [1, 2, 3, 4, 5, 6, 7] @@ -2107,6 +2165,7 @@ class TestDateTime(TestDate): self.assertRaises(ValueError, base.replace, year=2001) def test_astimezone(self): + return # The rest is no longer applicable # Pretty boring! The TZ test is more interesting here. astimezone() # simply can't be applied to a naive object. dt = self.theclass.now() @@ -2324,6 +2383,23 @@ class TestTime(HarmlessMixedComparison, unittest.TestCase): self.assertEqual(t.isoformat(), "00:00:00.100000") self.assertEqual(t.isoformat(), str(t)) + t = self.theclass(hour=12, minute=34, second=56, microsecond=123456) + self.assertEqual(t.isoformat(timespec='hours'), "12") + self.assertEqual(t.isoformat(timespec='minutes'), "12:34") + self.assertEqual(t.isoformat(timespec='seconds'), "12:34:56") + self.assertEqual(t.isoformat(timespec='milliseconds'), "12:34:56.123") + self.assertEqual(t.isoformat(timespec='microseconds'), "12:34:56.123456") + self.assertEqual(t.isoformat(timespec='auto'), "12:34:56.123456") + self.assertRaises(ValueError, t.isoformat, timespec='monkey') + + t = self.theclass(hour=12, minute=34, second=56, microsecond=999500) + self.assertEqual(t.isoformat(timespec='milliseconds'), "12:34:56.999") + + t = self.theclass(hour=12, minute=34, second=56, microsecond=0) + self.assertEqual(t.isoformat(timespec='milliseconds'), "12:34:56.000") + self.assertEqual(t.isoformat(timespec='microseconds'), "12:34:56.000000") + self.assertEqual(t.isoformat(timespec='auto'), "12:34:56") + def test_1653736(self): # verify it doesn't accept extra keyword arguments t = self.theclass(second=1) @@ -2395,6 +2471,7 @@ class TestTime(HarmlessMixedComparison, unittest.TestCase): green = pickler.dumps(orig, proto) derived = unpickler.loads(green) self.assertEqual(orig, derived) + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) def test_pickling_subclass_time(self): args = 20, 59, 16, 64**2 @@ -2582,9 +2659,9 @@ class TZInfoBase: self.assertRaises(ValueError, t.utcoffset) self.assertRaises(ValueError, t.dst) - # Not a whole number of minutes. + # Not a whole number of seconds. class C7(tzinfo): - def utcoffset(self, dt): return timedelta(seconds=61) + def utcoffset(self, dt): return timedelta(microseconds=61) def dst(self, dt): return timedelta(microseconds=-81) t = cls(1, 1, 1, tzinfo=C7()) self.assertRaises(ValueError, t.utcoffset) @@ -2755,6 +2832,7 @@ class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase): green = pickler.dumps(orig, proto) derived = unpickler.loads(green) self.assertEqual(orig, derived) + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) # Try one with a tzinfo. tinfo = PicklableFixedOffset(-300, 'cookie') @@ -2766,6 +2844,7 @@ class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase): self.assertIsInstance(derived.tzinfo, PicklableFixedOffset) self.assertEqual(derived.utcoffset(), timedelta(minutes=-300)) self.assertEqual(derived.tzname(), 'cookie') + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) def test_more_bool(self): # time is always True. @@ -2969,6 +3048,7 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase): green = pickler.dumps(orig, proto) derived = unpickler.loads(green) self.assertEqual(orig, derived) + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) # Try one with a tzinfo. tinfo = PicklableFixedOffset(-300, 'cookie') @@ -2981,6 +3061,7 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase): self.assertIsInstance(derived.tzinfo, PicklableFixedOffset) self.assertEqual(derived.utcoffset(), timedelta(minutes=-300)) self.assertEqual(derived.tzname(), 'cookie') + self.assertEqual(orig.__reduce__(), orig.__reduce_ex__(2)) def test_extreme_hashes(self): # If an attempt is made to hash these via subtracting the offset @@ -3927,12 +4008,12 @@ class Oddballs(unittest.TestCase): datetime(xx, xx, xx, xx, xx, xx, xx)) with self.assertRaisesRegex(TypeError, '^an integer is required ' - '\(got type str\)$'): + r'\(got type str\)$'): datetime(10, 10, '10') f10 = Number(10.9) with self.assertRaisesRegex(TypeError, '^__int__ returned non-int ' - '\(type float\)$'): + r'\(type float\)$'): datetime(10, 10, f10) class Float(float): @@ -3957,5 +4038,790 @@ class Oddballs(unittest.TestCase): with self.assertRaises(TypeError): datetime(10, 10, 10, 10, 10, 10, 10.) +############################################################################# +# Local Time Disambiguation + +# An experimental reimplementation of fromutc that respects the "fold" flag. + +class tzinfo2(tzinfo): + + def fromutc(self, dt): + "datetime in UTC -> datetime in local time." + + if not isinstance(dt, datetime): + raise TypeError("fromutc() requires a datetime argument") + if dt.tzinfo is not self: + raise ValueError("dt.tzinfo is not self") + # Returned value satisfies + # dt + ldt.utcoffset() = ldt + off0 = dt.replace(fold=0).utcoffset() + off1 = dt.replace(fold=1).utcoffset() + if off0 is None or off1 is None or dt.dst() is None: + raise ValueError + if off0 == off1: + ldt = dt + off0 + off1 = ldt.utcoffset() + if off0 == off1: + return ldt + # Now, we discovered both possible offsets, so + # we can just try four possible solutions: + for off in [off0, off1]: + ldt = dt + off + if ldt.utcoffset() == off: + return ldt + ldt = ldt.replace(fold=1) + if ldt.utcoffset() == off: + return ldt + + raise ValueError("No suitable local time found") + +# Reimplementing simplified US timezones to respect the "fold" flag: + +class USTimeZone2(tzinfo2): + + def __init__(self, hours, reprname, stdname, dstname): + self.stdoffset = timedelta(hours=hours) + self.reprname = reprname + self.stdname = stdname + self.dstname = dstname + + def __repr__(self): + return self.reprname + + def tzname(self, dt): + if self.dst(dt): + return self.dstname + else: + return self.stdname + + def utcoffset(self, dt): + return self.stdoffset + self.dst(dt) + + def dst(self, dt): + if dt is None or dt.tzinfo is None: + # An exception instead may be sensible here, in one or more of + # the cases. + return ZERO + assert dt.tzinfo is self + + # Find first Sunday in April. + start = first_sunday_on_or_after(DSTSTART.replace(year=dt.year)) + assert start.weekday() == 6 and start.month == 4 and start.day <= 7 + + # Find last Sunday in October. + end = first_sunday_on_or_after(DSTEND.replace(year=dt.year)) + assert end.weekday() == 6 and end.month == 10 and end.day >= 25 + + # Can't compare naive to aware objects, so strip the timezone from + # dt first. + dt = dt.replace(tzinfo=None) + if start + HOUR <= dt < end: + # DST is in effect. + return HOUR + elif end <= dt < end + HOUR: + # Fold (an ambiguous hour): use dt.fold to disambiguate. + return ZERO if dt.fold else HOUR + elif start <= dt < start + HOUR: + # Gap (a non-existent hour): reverse the fold rule. + return HOUR if dt.fold else ZERO + else: + # DST is off. + return ZERO + +Eastern2 = USTimeZone2(-5, "Eastern2", "EST", "EDT") +Central2 = USTimeZone2(-6, "Central2", "CST", "CDT") +Mountain2 = USTimeZone2(-7, "Mountain2", "MST", "MDT") +Pacific2 = USTimeZone2(-8, "Pacific2", "PST", "PDT") + +# Europe_Vilnius_1941 tzinfo implementation reproduces the following +# 1941 transition from Olson's tzdist: +# +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +# ZoneEurope/Vilnius 1:00 - CET 1940 Aug 3 +# 3:00 - MSK 1941 Jun 24 +# 1:00 C-Eur CE%sT 1944 Aug +# +# $ zdump -v Europe/Vilnius | grep 1941 +# Europe/Vilnius Mon Jun 23 20:59:59 1941 UTC = Mon Jun 23 23:59:59 1941 MSK isdst=0 gmtoff=10800 +# Europe/Vilnius Mon Jun 23 21:00:00 1941 UTC = Mon Jun 23 23:00:00 1941 CEST isdst=1 gmtoff=7200 + +class Europe_Vilnius_1941(tzinfo): + def _utc_fold(self): + return [datetime(1941, 6, 23, 21, tzinfo=self), # Mon Jun 23 21:00:00 1941 UTC + datetime(1941, 6, 23, 22, tzinfo=self)] # Mon Jun 23 22:00:00 1941 UTC + + def _loc_fold(self): + return [datetime(1941, 6, 23, 23, tzinfo=self), # Mon Jun 23 23:00:00 1941 MSK / CEST + datetime(1941, 6, 24, 0, tzinfo=self)] # Mon Jun 24 00:00:00 1941 CEST + + def utcoffset(self, dt): + fold_start, fold_stop = self._loc_fold() + if dt < fold_start: + return 3 * HOUR + if dt < fold_stop: + return (2 if dt.fold else 3) * HOUR + # if dt >= fold_stop + return 2 * HOUR + + def dst(self, dt): + fold_start, fold_stop = self._loc_fold() + if dt < fold_start: + return 0 * HOUR + if dt < fold_stop: + return (1 if dt.fold else 0) * HOUR + # if dt >= fold_stop + return 1 * HOUR + + def tzname(self, dt): + fold_start, fold_stop = self._loc_fold() + if dt < fold_start: + return 'MSK' + if dt < fold_stop: + return ('MSK', 'CEST')[dt.fold] + # if dt >= fold_stop + return 'CEST' + + def fromutc(self, dt): + assert dt.fold == 0 + assert dt.tzinfo is self + if dt.year != 1941: + raise NotImplementedError + fold_start, fold_stop = self._utc_fold() + if dt < fold_start: + return dt + 3 * HOUR + if dt < fold_stop: + return (dt + 2 * HOUR).replace(fold=1) + # if dt >= fold_stop + return dt + 2 * HOUR + + +class TestLocalTimeDisambiguation(unittest.TestCase): + + def test_vilnius_1941_fromutc(self): + Vilnius = Europe_Vilnius_1941() + + gdt = datetime(1941, 6, 23, 20, 59, 59, tzinfo=timezone.utc) + ldt = gdt.astimezone(Vilnius) + self.assertEqual(ldt.strftime("%c %Z%z"), + 'Mon Jun 23 23:59:59 1941 MSK+0300') + self.assertEqual(ldt.fold, 0) + self.assertFalse(ldt.dst()) + + gdt = datetime(1941, 6, 23, 21, tzinfo=timezone.utc) + ldt = gdt.astimezone(Vilnius) + self.assertEqual(ldt.strftime("%c %Z%z"), + 'Mon Jun 23 23:00:00 1941 CEST+0200') + self.assertEqual(ldt.fold, 1) + self.assertTrue(ldt.dst()) + + gdt = datetime(1941, 6, 23, 22, tzinfo=timezone.utc) + ldt = gdt.astimezone(Vilnius) + self.assertEqual(ldt.strftime("%c %Z%z"), + 'Tue Jun 24 00:00:00 1941 CEST+0200') + self.assertEqual(ldt.fold, 0) + self.assertTrue(ldt.dst()) + + def test_vilnius_1941_toutc(self): + Vilnius = Europe_Vilnius_1941() + + ldt = datetime(1941, 6, 23, 22, 59, 59, tzinfo=Vilnius) + gdt = ldt.astimezone(timezone.utc) + self.assertEqual(gdt.strftime("%c %Z"), + 'Mon Jun 23 19:59:59 1941 UTC') + + ldt = datetime(1941, 6, 23, 23, 59, 59, tzinfo=Vilnius) + gdt = ldt.astimezone(timezone.utc) + self.assertEqual(gdt.strftime("%c %Z"), + 'Mon Jun 23 20:59:59 1941 UTC') + + ldt = datetime(1941, 6, 23, 23, 59, 59, tzinfo=Vilnius, fold=1) + gdt = ldt.astimezone(timezone.utc) + self.assertEqual(gdt.strftime("%c %Z"), + 'Mon Jun 23 21:59:59 1941 UTC') + + ldt = datetime(1941, 6, 24, 0, tzinfo=Vilnius) + gdt = ldt.astimezone(timezone.utc) + self.assertEqual(gdt.strftime("%c %Z"), + 'Mon Jun 23 22:00:00 1941 UTC') + + + def test_constructors(self): + t = time(0, fold=1) + dt = datetime(1, 1, 1, fold=1) + self.assertEqual(t.fold, 1) + self.assertEqual(dt.fold, 1) + with self.assertRaises(TypeError): + time(0, 0, 0, 0, None, 0) + + def test_member(self): + dt = datetime(1, 1, 1, fold=1) + t = dt.time() + self.assertEqual(t.fold, 1) + t = dt.timetz() + self.assertEqual(t.fold, 1) + + def test_replace(self): + t = time(0) + dt = datetime(1, 1, 1) + self.assertEqual(t.replace(fold=1).fold, 1) + self.assertEqual(dt.replace(fold=1).fold, 1) + self.assertEqual(t.replace(fold=0).fold, 0) + self.assertEqual(dt.replace(fold=0).fold, 0) + # Check that replacement of other fields does not change "fold". + t = t.replace(fold=1, tzinfo=Eastern) + dt = dt.replace(fold=1, tzinfo=Eastern) + self.assertEqual(t.replace(tzinfo=None).fold, 1) + self.assertEqual(dt.replace(tzinfo=None).fold, 1) + # Check that fold is a keyword-only argument + with self.assertRaises(TypeError): + t.replace(1, 1, 1, None, 1) + with self.assertRaises(TypeError): + dt.replace(1, 1, 1, 1, 1, 1, 1, None, 1) + + def test_comparison(self): + t = time(0) + dt = datetime(1, 1, 1) + self.assertEqual(t, t.replace(fold=1)) + self.assertEqual(dt, dt.replace(fold=1)) + + def test_hash(self): + t = time(0) + dt = datetime(1, 1, 1) + self.assertEqual(hash(t), hash(t.replace(fold=1))) + self.assertEqual(hash(dt), hash(dt.replace(fold=1))) + + @support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0') + def test_fromtimestamp(self): + s = 1414906200 + dt0 = datetime.fromtimestamp(s) + dt1 = datetime.fromtimestamp(s + 3600) + self.assertEqual(dt0.fold, 0) + self.assertEqual(dt1.fold, 1) + + @support.run_with_tz('Australia/Lord_Howe') + def test_fromtimestamp_lord_howe(self): + tm = _time.localtime(1.4e9) + if _time.strftime('%Z%z', tm) != 'LHST+1030': + self.skipTest('Australia/Lord_Howe timezone is not supported on this platform') + # $ TZ=Australia/Lord_Howe date -r 1428158700 + # Sun Apr 5 01:45:00 LHDT 2015 + # $ TZ=Australia/Lord_Howe date -r 1428160500 + # Sun Apr 5 01:45:00 LHST 2015 + s = 1428158700 + t0 = datetime.fromtimestamp(s) + t1 = datetime.fromtimestamp(s + 1800) + self.assertEqual(t0, t1) + self.assertEqual(t0.fold, 0) + self.assertEqual(t1.fold, 1) + + + @support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0') + def test_timestamp(self): + dt0 = datetime(2014, 11, 2, 1, 30) + dt1 = dt0.replace(fold=1) + self.assertEqual(dt0.timestamp() + 3600, + dt1.timestamp()) + + @support.run_with_tz('Australia/Lord_Howe') + def test_timestamp_lord_howe(self): + tm = _time.localtime(1.4e9) + if _time.strftime('%Z%z', tm) != 'LHST+1030': + self.skipTest('Australia/Lord_Howe timezone is not supported on this platform') + t = datetime(2015, 4, 5, 1, 45) + s0 = t.replace(fold=0).timestamp() + s1 = t.replace(fold=1).timestamp() + self.assertEqual(s0 + 1800, s1) + + + @support.run_with_tz('EST+05EDT,M3.2.0,M11.1.0') + def test_astimezone(self): + dt0 = datetime(2014, 11, 2, 1, 30) + dt1 = dt0.replace(fold=1) + # Convert both naive instances to aware. + adt0 = dt0.astimezone() + adt1 = dt1.astimezone() + # Check that the first instance in DST zone and the second in STD + self.assertEqual(adt0.tzname(), 'EDT') + self.assertEqual(adt1.tzname(), 'EST') + self.assertEqual(adt0 + HOUR, adt1) + # Aware instances with fixed offset tzinfo's always have fold=0 + self.assertEqual(adt0.fold, 0) + self.assertEqual(adt1.fold, 0) + + + def test_pickle_fold(self): + t = time(fold=1) + dt = datetime(1, 1, 1, fold=1) + for pickler, unpickler, proto in pickle_choices: + for x in [t, dt]: + s = pickler.dumps(x, proto) + y = unpickler.loads(s) + self.assertEqual(x, y) + self.assertEqual((0 if proto < 4 else x.fold), y.fold) + + def test_repr(self): + t = time(fold=1) + dt = datetime(1, 1, 1, fold=1) + self.assertEqual(repr(t), 'datetime.time(0, 0, fold=1)') + self.assertEqual(repr(dt), + 'datetime.datetime(1, 1, 1, 0, 0, fold=1)') + + def test_dst(self): + # Let's first establish that things work in regular times. + dt_summer = datetime(2002, 10, 27, 1, tzinfo=Eastern2) - timedelta.resolution + dt_winter = datetime(2002, 10, 27, 2, tzinfo=Eastern2) + self.assertEqual(dt_summer.dst(), HOUR) + self.assertEqual(dt_winter.dst(), ZERO) + # The disambiguation flag is ignored + self.assertEqual(dt_summer.replace(fold=1).dst(), HOUR) + self.assertEqual(dt_winter.replace(fold=1).dst(), ZERO) + + # Pick local time in the fold. + for minute in [0, 30, 59]: + dt = datetime(2002, 10, 27, 1, minute, tzinfo=Eastern2) + # With fold=0 (the default) it is in DST. + self.assertEqual(dt.dst(), HOUR) + # With fold=1 it is in STD. + self.assertEqual(dt.replace(fold=1).dst(), ZERO) + + # Pick local time in the gap. + for minute in [0, 30, 59]: + dt = datetime(2002, 4, 7, 2, minute, tzinfo=Eastern2) + # With fold=0 (the default) it is in STD. + self.assertEqual(dt.dst(), ZERO) + # With fold=1 it is in DST. + self.assertEqual(dt.replace(fold=1).dst(), HOUR) + + + def test_utcoffset(self): + # Let's first establish that things work in regular times. + dt_summer = datetime(2002, 10, 27, 1, tzinfo=Eastern2) - timedelta.resolution + dt_winter = datetime(2002, 10, 27, 2, tzinfo=Eastern2) + self.assertEqual(dt_summer.utcoffset(), -4 * HOUR) + self.assertEqual(dt_winter.utcoffset(), -5 * HOUR) + # The disambiguation flag is ignored + self.assertEqual(dt_summer.replace(fold=1).utcoffset(), -4 * HOUR) + self.assertEqual(dt_winter.replace(fold=1).utcoffset(), -5 * HOUR) + + def test_fromutc(self): + # Let's first establish that things work in regular times. + u_summer = datetime(2002, 10, 27, 6, tzinfo=Eastern2) - timedelta.resolution + u_winter = datetime(2002, 10, 27, 7, tzinfo=Eastern2) + t_summer = Eastern2.fromutc(u_summer) + t_winter = Eastern2.fromutc(u_winter) + self.assertEqual(t_summer, u_summer - 4 * HOUR) + self.assertEqual(t_winter, u_winter - 5 * HOUR) + self.assertEqual(t_summer.fold, 0) + self.assertEqual(t_winter.fold, 0) + + # What happens in the fall-back fold? + u = datetime(2002, 10, 27, 5, 30, tzinfo=Eastern2) + t0 = Eastern2.fromutc(u) + u += HOUR + t1 = Eastern2.fromutc(u) + self.assertEqual(t0, t1) + self.assertEqual(t0.fold, 0) + self.assertEqual(t1.fold, 1) + # The tricky part is when u is in the local fold: + u = datetime(2002, 10, 27, 1, 30, tzinfo=Eastern2) + t = Eastern2.fromutc(u) + self.assertEqual((t.day, t.hour), (26, 21)) + # .. or gets into the local fold after a standard time adjustment + u = datetime(2002, 10, 27, 6, 30, tzinfo=Eastern2) + t = Eastern2.fromutc(u) + self.assertEqual((t.day, t.hour), (27, 1)) + + # What happens in the spring-forward gap? + u = datetime(2002, 4, 7, 2, 0, tzinfo=Eastern2) + t = Eastern2.fromutc(u) + self.assertEqual((t.day, t.hour), (6, 21)) + + def test_mixed_compare_regular(self): + t = datetime(2000, 1, 1, tzinfo=Eastern2) + self.assertEqual(t, t.astimezone(timezone.utc)) + t = datetime(2000, 6, 1, tzinfo=Eastern2) + self.assertEqual(t, t.astimezone(timezone.utc)) + + def test_mixed_compare_fold(self): + t_fold = datetime(2002, 10, 27, 1, 45, tzinfo=Eastern2) + t_fold_utc = t_fold.astimezone(timezone.utc) + self.assertNotEqual(t_fold, t_fold_utc) + + def test_mixed_compare_gap(self): + t_gap = datetime(2002, 4, 7, 2, 45, tzinfo=Eastern2) + t_gap_utc = t_gap.astimezone(timezone.utc) + self.assertNotEqual(t_gap, t_gap_utc) + + def test_hash_aware(self): + t = datetime(2000, 1, 1, tzinfo=Eastern2) + self.assertEqual(hash(t), hash(t.replace(fold=1))) + t_fold = datetime(2002, 10, 27, 1, 45, tzinfo=Eastern2) + t_gap = datetime(2002, 4, 7, 2, 45, tzinfo=Eastern2) + self.assertEqual(hash(t_fold), hash(t_fold.replace(fold=1))) + self.assertEqual(hash(t_gap), hash(t_gap.replace(fold=1))) + +SEC = timedelta(0, 1) + +def pairs(iterable): + a, b = itertools.tee(iterable) + next(b, None) + return zip(a, b) + +class ZoneInfo(tzinfo): + zoneroot = '/usr/share/zoneinfo' + def __init__(self, ut, ti): + """ + + :param ut: array + Array of transition point timestamps + :param ti: list + A list of (offset, isdst, abbr) tuples + :return: None + """ + self.ut = ut + self.ti = ti + self.lt = self.invert(ut, ti) + + @staticmethod + def invert(ut, ti): + lt = (array('q', ut), array('q', ut)) + if ut: + offset = ti[0][0] // SEC + lt[0][0] += offset + lt[1][0] += offset + for i in range(1, len(ut)): + lt[0][i] += ti[i-1][0] // SEC + lt[1][i] += ti[i][0] // SEC + return lt + + @classmethod + def fromfile(cls, fileobj): + if fileobj.read(4).decode() != "TZif": + raise ValueError("not a zoneinfo file") + fileobj.seek(32) + counts = array('i') + counts.fromfile(fileobj, 3) + if sys.byteorder != 'big': + counts.byteswap() + + ut = array('i') + ut.fromfile(fileobj, counts[0]) + if sys.byteorder != 'big': + ut.byteswap() + + type_indices = array('B') + type_indices.fromfile(fileobj, counts[0]) + + ttis = [] + for i in range(counts[1]): + ttis.append(struct.unpack(">lbb", fileobj.read(6))) + + abbrs = fileobj.read(counts[2]) + + # Convert ttis + for i, (gmtoff, isdst, abbrind) in enumerate(ttis): + abbr = abbrs[abbrind:abbrs.find(0, abbrind)].decode() + ttis[i] = (timedelta(0, gmtoff), isdst, abbr) + + ti = [None] * len(ut) + for i, idx in enumerate(type_indices): + ti[i] = ttis[idx] + + self = cls(ut, ti) + + return self + + @classmethod + def fromname(cls, name): + path = os.path.join(cls.zoneroot, name) + with open(path, 'rb') as f: + return cls.fromfile(f) + + EPOCHORDINAL = date(1970, 1, 1).toordinal() + + def fromutc(self, dt): + """datetime in UTC -> datetime in local time.""" + + if not isinstance(dt, datetime): + raise TypeError("fromutc() requires a datetime argument") + if dt.tzinfo is not self: + raise ValueError("dt.tzinfo is not self") + + timestamp = ((dt.toordinal() - self.EPOCHORDINAL) * 86400 + + dt.hour * 3600 + + dt.minute * 60 + + dt.second) + + if timestamp < self.ut[1]: + tti = self.ti[0] + fold = 0 + else: + idx = bisect.bisect_right(self.ut, timestamp) + assert self.ut[idx-1] <= timestamp + assert idx == len(self.ut) or timestamp < self.ut[idx] + tti_prev, tti = self.ti[idx-2:idx] + # Detect fold + shift = tti_prev[0] - tti[0] + fold = (shift > timedelta(0, timestamp - self.ut[idx-1])) + dt += tti[0] + if fold: + return dt.replace(fold=1) + else: + return dt + + def _find_ti(self, dt, i): + timestamp = ((dt.toordinal() - self.EPOCHORDINAL) * 86400 + + dt.hour * 3600 + + dt.minute * 60 + + dt.second) + lt = self.lt[dt.fold] + idx = bisect.bisect_right(lt, timestamp) + + return self.ti[max(0, idx - 1)][i] + + def utcoffset(self, dt): + return self._find_ti(dt, 0) + + def dst(self, dt): + isdst = self._find_ti(dt, 1) + # XXX: We cannot accurately determine the "save" value, + # so let's return 1h whenever DST is in effect. Since + # we don't use dst() in fromutc(), it is unlikely that + # it will be needed for anything more than bool(dst()). + return ZERO if isdst else HOUR + + def tzname(self, dt): + return self._find_ti(dt, 2) + + @classmethod + def zonenames(cls, zonedir=None): + if zonedir is None: + zonedir = cls.zoneroot + zone_tab = os.path.join(zonedir, 'zone.tab') + try: + f = open(zone_tab) + except OSError: + return + with f: + for line in f: + line = line.strip() + if line and not line.startswith('#'): + yield line.split()[2] + + @classmethod + def stats(cls, start_year=1): + count = gap_count = fold_count = zeros_count = 0 + min_gap = min_fold = timedelta.max + max_gap = max_fold = ZERO + min_gap_datetime = max_gap_datetime = datetime.min + min_gap_zone = max_gap_zone = None + min_fold_datetime = max_fold_datetime = datetime.min + min_fold_zone = max_fold_zone = None + stats_since = datetime(start_year, 1, 1) # Starting from 1970 eliminates a lot of noise + for zonename in cls.zonenames(): + count += 1 + tz = cls.fromname(zonename) + for dt, shift in tz.transitions(): + if dt < stats_since: + continue + if shift > ZERO: + gap_count += 1 + if (shift, dt) > (max_gap, max_gap_datetime): + max_gap = shift + max_gap_zone = zonename + max_gap_datetime = dt + if (shift, datetime.max - dt) < (min_gap, datetime.max - min_gap_datetime): + min_gap = shift + min_gap_zone = zonename + min_gap_datetime = dt + elif shift < ZERO: + fold_count += 1 + shift = -shift + if (shift, dt) > (max_fold, max_fold_datetime): + max_fold = shift + max_fold_zone = zonename + max_fold_datetime = dt + if (shift, datetime.max - dt) < (min_fold, datetime.max - min_fold_datetime): + min_fold = shift + min_fold_zone = zonename + min_fold_datetime = dt + else: + zeros_count += 1 + trans_counts = (gap_count, fold_count, zeros_count) + print("Number of zones: %5d" % count) + print("Number of transitions: %5d = %d (gaps) + %d (folds) + %d (zeros)" % + ((sum(trans_counts),) + trans_counts)) + print("Min gap: %16s at %s in %s" % (min_gap, min_gap_datetime, min_gap_zone)) + print("Max gap: %16s at %s in %s" % (max_gap, max_gap_datetime, max_gap_zone)) + print("Min fold: %16s at %s in %s" % (min_fold, min_fold_datetime, min_fold_zone)) + print("Max fold: %16s at %s in %s" % (max_fold, max_fold_datetime, max_fold_zone)) + + + def transitions(self): + for (_, prev_ti), (t, ti) in pairs(zip(self.ut, self.ti)): + shift = ti[0] - prev_ti[0] + yield datetime.utcfromtimestamp(t), shift + + def nondst_folds(self): + """Find all folds with the same value of isdst on both sides of the transition.""" + for (_, prev_ti), (t, ti) in pairs(zip(self.ut, self.ti)): + shift = ti[0] - prev_ti[0] + if shift < ZERO and ti[1] == prev_ti[1]: + yield datetime.utcfromtimestamp(t), -shift, prev_ti[2], ti[2] + + @classmethod + def print_all_nondst_folds(cls, same_abbr=False, start_year=1): + count = 0 + for zonename in cls.zonenames(): + tz = cls.fromname(zonename) + for dt, shift, prev_abbr, abbr in tz.nondst_folds(): + if dt.year < start_year or same_abbr and prev_abbr != abbr: + continue + count += 1 + print("%3d) %-30s %s %10s %5s -> %s" % + (count, zonename, dt, shift, prev_abbr, abbr)) + + def folds(self): + for t, shift in self.transitions(): + if shift < ZERO: + yield t, -shift + + def gaps(self): + for t, shift in self.transitions(): + if shift > ZERO: + yield t, shift + + def zeros(self): + for t, shift in self.transitions(): + if not shift: + yield t + + +class ZoneInfoTest(unittest.TestCase): + zonename = 'America/New_York' + + def setUp(self): + if sys.platform == "win32": + self.skipTest("Skipping zoneinfo tests on Windows") + try: + self.tz = ZoneInfo.fromname(self.zonename) + except FileNotFoundError as err: + self.skipTest("Skipping %s: %s" % (self.zonename, err)) + + def assertEquivDatetimes(self, a, b): + self.assertEqual((a.replace(tzinfo=None), a.fold, id(a.tzinfo)), + (b.replace(tzinfo=None), b.fold, id(b.tzinfo))) + + def test_folds(self): + tz = self.tz + for dt, shift in tz.folds(): + for x in [0 * shift, 0.5 * shift, shift - timedelta.resolution]: + udt = dt + x + ldt = tz.fromutc(udt.replace(tzinfo=tz)) + self.assertEqual(ldt.fold, 1) + adt = udt.replace(tzinfo=timezone.utc).astimezone(tz) + self.assertEquivDatetimes(adt, ldt) + utcoffset = ldt.utcoffset() + self.assertEqual(ldt.replace(tzinfo=None), udt + utcoffset) + # Round trip + self.assertEquivDatetimes(ldt.astimezone(timezone.utc), + udt.replace(tzinfo=timezone.utc)) + + + for x in [-timedelta.resolution, shift]: + udt = dt + x + udt = udt.replace(tzinfo=tz) + ldt = tz.fromutc(udt) + self.assertEqual(ldt.fold, 0) + + def test_gaps(self): + tz = self.tz + for dt, shift in tz.gaps(): + for x in [0 * shift, 0.5 * shift, shift - timedelta.resolution]: + udt = dt + x + udt = udt.replace(tzinfo=tz) + ldt = tz.fromutc(udt) + self.assertEqual(ldt.fold, 0) + adt = udt.replace(tzinfo=timezone.utc).astimezone(tz) + self.assertEquivDatetimes(adt, ldt) + utcoffset = ldt.utcoffset() + self.assertEqual(ldt.replace(tzinfo=None), udt.replace(tzinfo=None) + utcoffset) + # Create a local time inside the gap + ldt = tz.fromutc(dt.replace(tzinfo=tz)) - shift + x + self.assertLess(ldt.replace(fold=1).utcoffset(), + ldt.replace(fold=0).utcoffset(), + "At %s." % ldt) + + for x in [-timedelta.resolution, shift]: + udt = dt + x + ldt = tz.fromutc(udt.replace(tzinfo=tz)) + self.assertEqual(ldt.fold, 0) + + def test_system_transitions(self): + if ('Riyadh8' in self.zonename or + # From tzdata NEWS file: + # The files solar87, solar88, and solar89 are no longer distributed. + # They were a negative experiment - that is, a demonstration that + # tz data can represent solar time only with some difficulty and error. + # Their presence in the distribution caused confusion, as Riyadh + # civil time was generally not solar time in those years. + self.zonename.startswith('right/')): + self.skipTest("Skipping %s" % self.zonename) + tz = self.tz + TZ = os.environ.get('TZ') + os.environ['TZ'] = self.zonename + try: + _time.tzset() + for udt, shift in tz.transitions(): + if udt.year >= 2037: + # System support for times around the end of 32-bit time_t + # and later is flaky on many systems. + break + s0 = (udt - datetime(1970, 1, 1)) // SEC + ss = shift // SEC # shift seconds + for x in [-40 * 3600, -20*3600, -1, 0, + ss - 1, ss + 20 * 3600, ss + 40 * 3600]: + s = s0 + x + sdt = datetime.fromtimestamp(s) + tzdt = datetime.fromtimestamp(s, tz).replace(tzinfo=None) + self.assertEquivDatetimes(sdt, tzdt) + s1 = sdt.timestamp() + self.assertEqual(s, s1) + if ss > 0: # gap + # Create local time inside the gap + dt = datetime.fromtimestamp(s0) - shift / 2 + ts0 = dt.timestamp() + ts1 = dt.replace(fold=1).timestamp() + self.assertEqual(ts0, s0 + ss / 2) + self.assertEqual(ts1, s0 - ss / 2) + finally: + if TZ is None: + del os.environ['TZ'] + else: + os.environ['TZ'] = TZ + _time.tzset() + + +class ZoneInfoCompleteTest(unittest.TestSuite): + def __init__(self): + tests = [] + if is_resource_enabled('tzdata'): + for name in ZoneInfo.zonenames(): + Test = type('ZoneInfoTest[%s]' % name, (ZoneInfoTest,), {}) + Test.zonename = name + for method in dir(Test): + if method.startswith('test_'): + tests.append(Test(method)) + super().__init__(tests) + +# Iran had a sub-minute UTC offset before 1946. +class IranTest(ZoneInfoTest): + zonename = 'Asia/Tehran' + +def load_tests(loader, standard_tests, pattern): + standard_tests.addTest(ZoneInfoCompleteTest()) + return standard_tests + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/dtracedata/assert_usable.d b/Lib/test/dtracedata/assert_usable.d new file mode 100644 index 0000000..0b2d4da --- /dev/null +++ b/Lib/test/dtracedata/assert_usable.d @@ -0,0 +1,5 @@ +BEGIN +{ + printf("probe: success\n"); + exit(0); +} diff --git a/Lib/test/dtracedata/assert_usable.stp b/Lib/test/dtracedata/assert_usable.stp new file mode 100644 index 0000000..88e7e68 --- /dev/null +++ b/Lib/test/dtracedata/assert_usable.stp @@ -0,0 +1,5 @@ +probe begin +{ + println("probe: success") + exit () +} diff --git a/Lib/test/dtracedata/call_stack.d b/Lib/test/dtracedata/call_stack.d new file mode 100644 index 0000000..450e939 --- /dev/null +++ b/Lib/test/dtracedata/call_stack.d @@ -0,0 +1,31 @@ +self int indent; + +python$target:::function-entry +/copyinstr(arg1) == "start"/ +{ + self->trace = 1; +} + +python$target:::function-entry +/self->trace/ +{ + printf("%d\t%*s:", timestamp, 15, probename); + printf("%*s", self->indent, ""); + printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); + self->indent++; +} + +python$target:::function-return +/self->trace/ +{ + self->indent--; + printf("%d\t%*s:", timestamp, 15, probename); + printf("%*s", self->indent, ""); + printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); +} + +python$target:::function-return +/copyinstr(arg1) == "start"/ +{ + self->trace = 0; +} diff --git a/Lib/test/dtracedata/call_stack.d.expected b/Lib/test/dtracedata/call_stack.d.expected new file mode 100644 index 0000000..27849d1 --- /dev/null +++ b/Lib/test/dtracedata/call_stack.d.expected @@ -0,0 +1,18 @@ + function-entry:call_stack.py:start:23 + function-entry: call_stack.py:function_1:1 + function-entry: call_stack.py:function_3:9 +function-return: call_stack.py:function_3:10 +function-return: call_stack.py:function_1:2 + function-entry: call_stack.py:function_2:5 + function-entry: call_stack.py:function_1:1 + function-entry: call_stack.py:function_3:9 +function-return: call_stack.py:function_3:10 +function-return: call_stack.py:function_1:2 +function-return: call_stack.py:function_2:6 + function-entry: call_stack.py:function_3:9 +function-return: call_stack.py:function_3:10 + function-entry: call_stack.py:function_4:13 +function-return: call_stack.py:function_4:14 + function-entry: call_stack.py:function_5:18 +function-return: call_stack.py:function_5:21 +function-return:call_stack.py:start:28 diff --git a/Lib/test/dtracedata/call_stack.py b/Lib/test/dtracedata/call_stack.py new file mode 100644 index 0000000..ee9f3ae --- /dev/null +++ b/Lib/test/dtracedata/call_stack.py @@ -0,0 +1,30 @@ +def function_1(): + function_3(1, 2) + +# Check stacktrace +def function_2(): + function_1() + +# CALL_FUNCTION_VAR +def function_3(dummy, dummy2): + pass + +# CALL_FUNCTION_KW +def function_4(**dummy): + return 1 + return 2 # unreachable + +# CALL_FUNCTION_VAR_KW +def function_5(dummy, dummy2, **dummy3): + if False: + return 7 + return 8 + +def start(): + function_1() + function_2() + function_3(1, 2) + function_4(test=42) + function_5(*(1, 2), **{"test": 42}) + +start() diff --git a/Lib/test/dtracedata/call_stack.stp b/Lib/test/dtracedata/call_stack.stp new file mode 100644 index 0000000..54082c2 --- /dev/null +++ b/Lib/test/dtracedata/call_stack.stp @@ -0,0 +1,41 @@ +global tracing + +function basename:string(path:string) +{ + last_token = token = tokenize(path, "/"); + while (token != "") { + last_token = token; + token = tokenize("", "/"); + } + return last_token; +} + +probe process.mark("function__entry") +{ + funcname = user_string($arg2); + + if (funcname == "start") { + tracing = 1; + } +} + +probe process.mark("function__entry"), process.mark("function__return") +{ + filename = user_string($arg1); + funcname = user_string($arg2); + lineno = $arg3; + + if (tracing) { + printf("%d\t%s:%s:%s:%d\n", gettimeofday_us(), $$name, + basename(filename), funcname, lineno); + } +} + +probe process.mark("function__return") +{ + funcname = user_string($arg2); + + if (funcname == "start") { + tracing = 0; + } +} diff --git a/Lib/test/dtracedata/call_stack.stp.expected b/Lib/test/dtracedata/call_stack.stp.expected new file mode 100644 index 0000000..32cf396 --- /dev/null +++ b/Lib/test/dtracedata/call_stack.stp.expected @@ -0,0 +1,14 @@ +function__entry:call_stack.py:start:23 +function__entry:call_stack.py:function_1:1 +function__return:call_stack.py:function_1:2 +function__entry:call_stack.py:function_2:5 +function__entry:call_stack.py:function_1:1 +function__return:call_stack.py:function_1:2 +function__return:call_stack.py:function_2:6 +function__entry:call_stack.py:function_3:9 +function__return:call_stack.py:function_3:10 +function__entry:call_stack.py:function_4:13 +function__return:call_stack.py:function_4:14 +function__entry:call_stack.py:function_5:18 +function__return:call_stack.py:function_5:21 +function__return:call_stack.py:start:28 diff --git a/Lib/test/dtracedata/gc.d b/Lib/test/dtracedata/gc.d new file mode 100644 index 0000000..4d91487 --- /dev/null +++ b/Lib/test/dtracedata/gc.d @@ -0,0 +1,18 @@ +python$target:::function-entry +/copyinstr(arg1) == "start"/ +{ + self->trace = 1; +} + +python$target:::gc-start, +python$target:::gc-done +/self->trace/ +{ + printf("%d\t%s:%ld\n", timestamp, probename, arg0); +} + +python$target:::function-return +/copyinstr(arg1) == "start"/ +{ + self->trace = 0; +} diff --git a/Lib/test/dtracedata/gc.d.expected b/Lib/test/dtracedata/gc.d.expected new file mode 100644 index 0000000..8e5ac2a --- /dev/null +++ b/Lib/test/dtracedata/gc.d.expected @@ -0,0 +1,8 @@ +gc-start:0 +gc-done:0 +gc-start:1 +gc-done:0 +gc-start:2 +gc-done:0 +gc-start:2 +gc-done:1 diff --git a/Lib/test/dtracedata/gc.py b/Lib/test/dtracedata/gc.py new file mode 100644 index 0000000..144a783 --- /dev/null +++ b/Lib/test/dtracedata/gc.py @@ -0,0 +1,13 @@ +import gc + +def start(): + gc.collect(0) + gc.collect(1) + gc.collect(2) + l = [] + l.append(l) + del l + gc.collect(2) + +gc.collect() +start() diff --git a/Lib/test/dtracedata/gc.stp b/Lib/test/dtracedata/gc.stp new file mode 100644 index 0000000..162c6d3 --- /dev/null +++ b/Lib/test/dtracedata/gc.stp @@ -0,0 +1,26 @@ +global tracing + +probe process.mark("function__entry") +{ + funcname = user_string($arg2); + + if (funcname == "start") { + tracing = 1; + } +} + +probe process.mark("gc__start"), process.mark("gc__done") +{ + if (tracing) { + printf("%d\t%s:%ld\n", gettimeofday_us(), $$name, $arg1); + } +} + +probe process.mark("function__return") +{ + funcname = user_string($arg2); + + if (funcname == "start") { + tracing = 0; + } +} diff --git a/Lib/test/dtracedata/gc.stp.expected b/Lib/test/dtracedata/gc.stp.expected new file mode 100644 index 0000000..7e6e622 --- /dev/null +++ b/Lib/test/dtracedata/gc.stp.expected @@ -0,0 +1,8 @@ +gc__start:0 +gc__done:0 +gc__start:1 +gc__done:0 +gc__start:2 +gc__done:0 +gc__start:2 +gc__done:1 diff --git a/Lib/test/dtracedata/instance.py b/Lib/test/dtracedata/instance.py new file mode 100644 index 0000000..f142137 --- /dev/null +++ b/Lib/test/dtracedata/instance.py @@ -0,0 +1,24 @@ +import gc + +class old_style_class(): + pass +class new_style_class(object): + pass + +a = old_style_class() +del a +gc.collect() +b = new_style_class() +del b +gc.collect() + +a = old_style_class() +del old_style_class +gc.collect() +b = new_style_class() +del new_style_class +gc.collect() +del a +gc.collect() +del b +gc.collect() diff --git a/Lib/test/dtracedata/line.d b/Lib/test/dtracedata/line.d new file mode 100644 index 0000000..03f22db --- /dev/null +++ b/Lib/test/dtracedata/line.d @@ -0,0 +1,7 @@ +python$target:::line +/(copyinstr(arg1)=="test_line")/ +{ + printf("%d\t%s:%s:%s:%d\n", timestamp, + probename, basename(copyinstr(arg0)), + copyinstr(arg1), arg2); +} diff --git a/Lib/test/dtracedata/line.d.expected b/Lib/test/dtracedata/line.d.expected new file mode 100644 index 0000000..9b16ce7 --- /dev/null +++ b/Lib/test/dtracedata/line.d.expected @@ -0,0 +1,20 @@ +line:line.py:test_line:2 +line:line.py:test_line:3 +line:line.py:test_line:4 +line:line.py:test_line:5 +line:line.py:test_line:6 +line:line.py:test_line:7 +line:line.py:test_line:8 +line:line.py:test_line:9 +line:line.py:test_line:10 +line:line.py:test_line:11 +line:line.py:test_line:4 +line:line.py:test_line:5 +line:line.py:test_line:6 +line:line.py:test_line:7 +line:line.py:test_line:8 +line:line.py:test_line:10 +line:line.py:test_line:11 +line:line.py:test_line:4 +line:line.py:test_line:12 +line:line.py:test_line:13 diff --git a/Lib/test/dtracedata/line.py b/Lib/test/dtracedata/line.py new file mode 100644 index 0000000..0930ff3 --- /dev/null +++ b/Lib/test/dtracedata/line.py @@ -0,0 +1,17 @@ +def test_line(): + a = 1 + print('# Preamble', a) + for i in range(2): + a = i + b = i+2 + c = i+3 + if c < 4: + a = c + d = a + b +c + print('#', a, b, c, d) + a = 1 + print('# Epilogue', a) + + +if __name__ == '__main__': + test_line() diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py index ad68bd7..9fbe04d 100644 --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -369,55 +369,59 @@ class TimeEINTRTest(EINTRBaseTest): @unittest.skipUnless(hasattr(signal, "setitimer"), "requires setitimer()") -# bpo-30320: Need pthread_sigmask() to block the signal, otherwise the test -# is vulnerable to a race condition between the child and the parent processes. -@unittest.skipUnless(hasattr(signal, 'pthread_sigmask'), - 'need signal.pthread_sigmask()') class SignalEINTRTest(EINTRBaseTest): """ EINTR tests for the signal module. """ - def check_sigwait(self, wait_func): + @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), + 'need signal.sigtimedwait()') + def test_sigtimedwait(self): + t0 = time.monotonic() + signal.sigtimedwait([signal.SIGUSR1], self.sleep_time) + dt = time.monotonic() - t0 + self.assertGreaterEqual(dt, self.sleep_time) + + @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'), + 'need signal.sigwaitinfo()') + def test_sigwaitinfo(self): + # Issue #25277, #25868: give a few milliseconds to the parent process + # between os.write() and signal.sigwaitinfo() to works around a race + # condition + self.sleep_time = 0.100 + signum = signal.SIGUSR1 pid = os.getpid() old_handler = signal.signal(signum, lambda *args: None) self.addCleanup(signal.signal, signum, old_handler) + rpipe, wpipe = os.pipe() + code = '\n'.join(( 'import os, time', 'pid = %s' % os.getpid(), 'signum = %s' % int(signum), 'sleep_time = %r' % self.sleep_time, + 'rpipe = %r' % rpipe, + 'os.read(rpipe, 1)', + 'os.close(rpipe)', 'time.sleep(sleep_time)', 'os.kill(pid, signum)', )) - old_mask = signal.pthread_sigmask(signal.SIG_BLOCK, [signum]) - self.addCleanup(signal.pthread_sigmask, signal.SIG_UNBLOCK, [signum]) - t0 = time.monotonic() - proc = self.subprocess(code) + proc = self.subprocess(code, pass_fds=(rpipe,)) + os.close(rpipe) with kill_on_error(proc): - wait_func(signum) - dt = time.monotonic() - t0 - - self.assertEqual(proc.wait(), 0) + # sync child-parent + os.write(wpipe, b'x') + os.close(wpipe) - @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'), - 'need signal.sigwaitinfo()') - def test_sigwaitinfo(self): - def wait_func(signum): + # parent signal.sigwaitinfo([signum]) + dt = time.monotonic() - t0 + self.assertEqual(proc.wait(), 0) - self.check_sigwait(wait_func) - - @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), - 'need signal.sigwaitinfo()') - def test_sigtimedwait(self): - def wait_func(signum): - signal.sigtimedwait([signum], 120.0) - - self.check_sigwait(wait_func) + self.assertGreaterEqual(dt, self.sleep_time) @unittest.skipUnless(hasattr(signal, "setitimer"), "requires setitimer()") @@ -431,8 +435,6 @@ class SelectEINTRTest(EINTRBaseTest): self.stop_alarm() self.assertGreaterEqual(dt, self.sleep_time) - @unittest.skipIf(sys.platform == "darwin", - "poll may fail on macOS; see issue #28087") @unittest.skipUnless(hasattr(select, 'poll'), 'need select.poll') def test_poll(self): poller = select.poll() diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt index 0513765..7333b2a 100644 --- a/Lib/test/exception_hierarchy.txt +++ b/Lib/test/exception_hierarchy.txt @@ -14,6 +14,7 @@ BaseException +-- BufferError +-- EOFError +-- ImportError + +-- ModuleNotFoundError +-- LookupError | +-- IndexError | +-- KeyError diff --git a/Lib/test/libregrtest/__init__.py b/Lib/test/libregrtest/__init__.py new file mode 100644 index 0000000..7ba0e6e --- /dev/null +++ b/Lib/test/libregrtest/__init__.py @@ -0,0 +1,5 @@ +# We import importlib *ASAP* in order to test #15386 +import importlib + +from test.libregrtest.cmdline import _parse_args, RESOURCE_NAMES +from test.libregrtest.main import main diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py new file mode 100644 index 0000000..891b00c --- /dev/null +++ b/Lib/test/libregrtest/cmdline.py @@ -0,0 +1,347 @@ +import argparse +import os +import sys +from test import support + + +USAGE = """\ +python -m test [options] [test_name1 [test_name2 ...]] +python path/to/Lib/test/regrtest.py [options] [test_name1 [test_name2 ...]] +""" + +DESCRIPTION = """\ +Run Python regression tests. + +If no arguments or options are provided, finds all files matching +the pattern "test_*" in the Lib/test subdirectory and runs +them in alphabetical order (but see -M and -u, below, for exceptions). + +For more rigorous testing, it is useful to use the following +command line: + +python -E -Wd -m test [options] [test_name1 ...] +""" + +EPILOG = """\ +Additional option details: + +-r randomizes test execution order. You can use --randseed=int to provide an +int seed value for the randomizer; this is useful for reproducing troublesome +test orders. + +-s On the first invocation of regrtest using -s, the first test file found +or the first test file given on the command line is run, and the name of +the next test is recorded in a file named pynexttest. If run from the +Python build directory, pynexttest is located in the 'build' subdirectory, +otherwise it is located in tempfile.gettempdir(). On subsequent runs, +the test in pynexttest is run, and the next test is written to pynexttest. +When the last test has been run, pynexttest is deleted. In this way it +is possible to single step through the test files. This is useful when +doing memory analysis on the Python interpreter, which process tends to +consume too many resources to run the full regression test non-stop. + +-S is used to continue running tests after an aborted run. It will +maintain the order a standard run (ie, this assumes -r is not used). +This is useful after the tests have prematurely stopped for some external +reason and you want to start running from where you left off rather +than starting from the beginning. + +-f reads the names of tests from the file given as f's argument, one +or more test names per line. Whitespace is ignored. Blank lines and +lines beginning with '#' are ignored. This is especially useful for +whittling down failures involving interactions among tests. + +-L causes the leaks(1) command to be run just before exit if it exists. +leaks(1) is available on Mac OS X and presumably on some other +FreeBSD-derived systems. + +-R runs each test several times and examines sys.gettotalrefcount() to +see if the test appears to be leaking references. The argument should +be of the form stab:run:fname where 'stab' is the number of times the +test is run to let gettotalrefcount settle down, 'run' is the number +of times further it is run and 'fname' is the name of the file the +reports are written to. These parameters all have defaults (5, 4 and +"reflog.txt" respectively), and the minimal invocation is '-R :'. + +-M runs tests that require an exorbitant amount of memory. These tests +typically try to ascertain containers keep working when containing more than +2 billion objects, which only works on 64-bit systems. There are also some +tests that try to exhaust the address space of the process, which only makes +sense on 32-bit systems with at least 2Gb of memory. The passed-in memlimit, +which is a string in the form of '2.5Gb', determines howmuch memory the +tests will limit themselves to (but they may go slightly over.) The number +shouldn't be more memory than the machine has (including swap memory). You +should also keep in mind that swap memory is generally much, much slower +than RAM, and setting memlimit to all available RAM or higher will heavily +tax the machine. On the other hand, it is no use running these tests with a +limit of less than 2.5Gb, and many require more than 20Gb. Tests that expect +to use more than memlimit memory will be skipped. The big-memory tests +generally run very, very long. + +-u is used to specify which special resource intensive tests to run, +such as those requiring large file support or network connectivity. +The argument is a comma-separated list of words indicating the +resources to test. Currently only the following are defined: + + all - Enable all special resources. + + none - Disable all special resources (this is the default). + + audio - Tests that use the audio device. (There are known + cases of broken audio drivers that can crash Python or + even the Linux kernel.) + + curses - Tests that use curses and will modify the terminal's + state and output modes. + + largefile - It is okay to run some test that may create huge + files. These tests can take a long time and may + consume >2GB of disk space temporarily. + + network - It is okay to run tests that use external network + resource, e.g. testing SSL support for sockets. + + decimal - Test the decimal module against a large suite that + verifies compliance with standards. + + cpu - Used for certain CPU-heavy tests. + + subprocess Run all tests for the subprocess module. + + urlfetch - It is okay to download files required on testing. + + gui - Run tests that require a running GUI. + + tzdata - Run tests that require timezone data. + +To enable all resources except one, use '-uall,-'. For +example, to run all the tests except for the gui tests, give the +option '-uall,-gui'. +""" + + +RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', + 'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui', 'tzdata') + +class _ArgParser(argparse.ArgumentParser): + + def error(self, message): + super().error(message + "\nPass -h or --help for complete help.") + + +def _create_parser(): + # Set prog to prevent the uninformative "__main__.py" from displaying in + # error messages when using "python -m test ...". + parser = _ArgParser(prog='regrtest.py', + usage=USAGE, + description=DESCRIPTION, + epilog=EPILOG, + add_help=False, + formatter_class=argparse.RawDescriptionHelpFormatter) + + # Arguments with this clause added to its help are described further in + # the epilog's "Additional option details" section. + more_details = ' See the section at bottom for more details.' + + group = parser.add_argument_group('General options') + # We add help explicitly to control what argument group it renders under. + group.add_argument('-h', '--help', action='help', + help='show this help message and exit') + group.add_argument('--timeout', metavar='TIMEOUT', type=float, + help='dump the traceback and exit if a test takes ' + 'more than TIMEOUT seconds; disabled if TIMEOUT ' + 'is negative or equals to zero') + group.add_argument('--wait', action='store_true', + help='wait for user input, e.g., allow a debugger ' + 'to be attached') + group.add_argument('--slaveargs', metavar='ARGS') + group.add_argument('-S', '--start', metavar='START', + help='the name of the test at which to start.' + + more_details) + + group = parser.add_argument_group('Verbosity') + group.add_argument('-v', '--verbose', action='count', + help='run tests in verbose mode with output to stdout') + group.add_argument('-w', '--verbose2', action='store_true', + help='re-run failed tests in verbose mode') + group.add_argument('-W', '--verbose3', action='store_true', + help='display test output on failure') + group.add_argument('-q', '--quiet', action='store_true', + help='no output unless one or more tests fail') + group.add_argument('-o', '--slowest', action='store_true', dest='print_slow', + help='print the slowest 10 tests') + group.add_argument('--header', action='store_true', + help='print header with interpreter info') + + group = parser.add_argument_group('Selecting tests') + group.add_argument('-r', '--randomize', action='store_true', + help='randomize test execution order.' + more_details) + group.add_argument('--randseed', metavar='SEED', + dest='random_seed', type=int, + help='pass a random seed to reproduce a previous ' + 'random run') + group.add_argument('-f', '--fromfile', metavar='FILE', + help='read names of tests to run from a file.' + + more_details) + group.add_argument('-x', '--exclude', action='store_true', + help='arguments are tests to *exclude*') + group.add_argument('-s', '--single', action='store_true', + help='single step through a set of tests.' + + more_details) + group.add_argument('-m', '--match', metavar='PAT', + dest='match_tests', + help='match test cases and methods with glob pattern PAT') + group.add_argument('-G', '--failfast', action='store_true', + help='fail as soon as a test fails (only with -v or -W)') + group.add_argument('-u', '--use', metavar='RES1,RES2,...', + action='append', type=resources_list, + help='specify which special resource intensive tests ' + 'to run.' + more_details) + group.add_argument('-M', '--memlimit', metavar='LIMIT', + help='run very large memory-consuming tests.' + + more_details) + group.add_argument('--testdir', metavar='DIR', + type=relative_filename, + help='execute test files in the specified directory ' + '(instead of the Python stdlib test suite)') + + group = parser.add_argument_group('Special runs') + group.add_argument('-l', '--findleaks', action='store_true', + help='if GC is available detect tests that leak memory') + group.add_argument('-L', '--runleaks', action='store_true', + help='run the leaks(1) command just before exit.' + + more_details) + group.add_argument('-R', '--huntrleaks', metavar='RUNCOUNTS', + type=huntrleaks, + help='search for reference leaks (needs debug build, ' + 'very slow).' + more_details) + group.add_argument('-j', '--multiprocess', metavar='PROCESSES', + dest='use_mp', type=int, + help='run PROCESSES processes at once') + group.add_argument('-T', '--coverage', action='store_true', + dest='trace', + help='turn on code coverage tracing using the trace ' + 'module') + group.add_argument('-D', '--coverdir', metavar='DIR', + type=relative_filename, + help='directory where coverage files are put') + group.add_argument('-N', '--nocoverdir', + action='store_const', const=None, dest='coverdir', + help='put coverage files alongside modules') + group.add_argument('-t', '--threshold', metavar='THRESHOLD', + type=int, + help='call gc.set_threshold(THRESHOLD)') + group.add_argument('-n', '--nowindows', action='store_true', + help='suppress error message boxes on Windows') + group.add_argument('-F', '--forever', action='store_true', + help='run the specified tests in a loop, until an ' + 'error happens') + group.add_argument('--list-tests', action='store_true', + help="only write the name of tests that will be run, " + "don't execute them") + group.add_argument('-P', '--pgo', dest='pgo', action='store_true', + help='enable Profile Guided Optimization training') + + return parser + + +def relative_filename(string): + # CWD is replaced with a temporary dir before calling main(), so we + # join it with the saved CWD so it ends up where the user expects. + return os.path.join(support.SAVEDCWD, string) + + +def huntrleaks(string): + args = string.split(':') + if len(args) not in (2, 3): + raise argparse.ArgumentTypeError( + 'needs 2 or 3 colon-separated arguments') + nwarmup = int(args[0]) if args[0] else 5 + ntracked = int(args[1]) if args[1] else 4 + fname = args[2] if len(args) > 2 and args[2] else 'reflog.txt' + return nwarmup, ntracked, fname + + +def resources_list(string): + u = [x.lower() for x in string.split(',')] + for r in u: + if r == 'all' or r == 'none': + continue + if r[0] == '-': + r = r[1:] + if r not in RESOURCE_NAMES: + raise argparse.ArgumentTypeError('invalid resource: ' + r) + return u + + +def _parse_args(args, **kwargs): + # Defaults + ns = argparse.Namespace(testdir=None, verbose=0, quiet=False, + exclude=False, single=False, randomize=False, fromfile=None, + findleaks=False, use_resources=None, trace=False, coverdir='coverage', + runleaks=False, huntrleaks=False, verbose2=False, print_slow=False, + random_seed=None, use_mp=None, verbose3=False, forever=False, + header=False, failfast=False, match_tests=None, pgo=False) + for k, v in kwargs.items(): + if not hasattr(ns, k): + raise TypeError('%r is an invalid keyword argument ' + 'for this function' % k) + setattr(ns, k, v) + if ns.use_resources is None: + ns.use_resources = [] + + parser = _create_parser() + # Issue #14191: argparse doesn't support "intermixed" positional and + # optional arguments. Use parse_known_args() as workaround. + ns.args = parser.parse_known_args(args=args, namespace=ns)[1] + for arg in ns.args: + if arg.startswith('-'): + parser.error("unrecognized arguments: %s" % arg) + sys.exit(1) + + if ns.single and ns.fromfile: + parser.error("-s and -f don't go together!") + if ns.use_mp and ns.trace: + parser.error("-T and -j don't go together!") + if ns.use_mp and ns.findleaks: + parser.error("-l and -j don't go together!") + if ns.failfast and not (ns.verbose or ns.verbose3): + parser.error("-G/--failfast needs either -v or -W") + if ns.pgo and (ns.verbose or ns.verbose2 or ns.verbose3): + parser.error("--pgo/-v don't go together!") + + if ns.nowindows: + print("Warning: the --nowindows (-n) option is deprecated. " + "Use -vv to display assertions in stderr.", file=sys.stderr) + + if ns.quiet: + ns.verbose = 0 + if ns.timeout is not None: + if ns.timeout <= 0: + ns.timeout = None + if ns.use_mp is not None: + if ns.use_mp <= 0: + # Use all cores + extras for tests that like to sleep + ns.use_mp = 2 + (os.cpu_count() or 1) + if ns.use: + for a in ns.use: + for r in a: + if r == 'all': + ns.use_resources[:] = RESOURCE_NAMES + continue + if r == 'none': + del ns.use_resources[:] + continue + remove = False + if r[0] == '-': + remove = True + r = r[1:] + if remove: + if r in ns.use_resources: + ns.use_resources.remove(r) + elif r not in ns.use_resources: + ns.use_resources.append(r) + if ns.random_seed is not None: + ns.randomize = True + + return ns diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py new file mode 100644 index 0000000..f0effc9 --- /dev/null +++ b/Lib/test/libregrtest/main.py @@ -0,0 +1,532 @@ +import datetime +import faulthandler +import locale +import os +import platform +import random +import re +import sys +import sysconfig +import tempfile +import textwrap +import time +from test.libregrtest.cmdline import _parse_args +from test.libregrtest.runtest import ( + findtests, runtest, + STDTESTS, NOTTESTS, PASSED, FAILED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED, + INTERRUPTED, CHILD_ERROR, + PROGRESS_MIN_TIME, format_test_result) +from test.libregrtest.setup import setup_tests +from test import support +try: + import gc +except ImportError: + gc = None + + +# When tests are run from the Python build directory, it is best practice +# to keep the test files in a subfolder. This eases the cleanup of leftover +# files using the "make distclean" command. +if sysconfig.is_python_build(): + TEMPDIR = os.path.join(sysconfig.get_config_var('srcdir'), 'build') +else: + TEMPDIR = tempfile.gettempdir() +TEMPDIR = os.path.abspath(TEMPDIR) + + +def format_duration(seconds): + if seconds < 1.0: + return '%.0f ms' % (seconds * 1e3) + if seconds < 60.0: + return '%.0f sec' % seconds + + minutes, seconds = divmod(seconds, 60.0) + return '%.0f min %.0f sec' % (minutes, seconds) + + +class Regrtest: + """Execute a test suite. + + This also parses command-line options and modifies its behavior + accordingly. + + tests -- a list of strings containing test names (optional) + testdir -- the directory in which to look for tests (optional) + + Users other than the Python test suite will certainly want to + specify testdir; if it's omitted, the directory containing the + Python test suite is searched for. + + If the tests argument is omitted, the tests listed on the + command-line will be used. If that's empty, too, then all *.py + files beginning with test_ will be used. + + The other default arguments (verbose, quiet, exclude, + single, randomize, findleaks, use_resources, trace, coverdir, + print_slow, and random_seed) allow programmers calling main() + directly to set the values that would normally be set by flags + on the command line. + """ + def __init__(self): + # Namespace of command line options + self.ns = None + + # tests + self.tests = [] + self.selected = [] + + # test results + self.good = [] + self.bad = [] + self.skipped = [] + self.resource_denieds = [] + self.environment_changed = [] + self.interrupted = False + + # used by --slow + self.test_times = [] + + # used by --coverage, trace.Trace instance + self.tracer = None + + # used by --findleaks, store for gc.garbage + self.found_garbage = [] + + # used to display the progress bar "[ 3/100]" + self.start_time = time.monotonic() + self.test_count = '' + self.test_count_width = 1 + + # used by --single + self.next_single_test = None + self.next_single_filename = None + + def accumulate_result(self, test, result): + ok, test_time = result + if ok not in (CHILD_ERROR, INTERRUPTED): + self.test_times.append((test_time, test)) + if ok == PASSED: + self.good.append(test) + elif ok == FAILED: + self.bad.append(test) + elif ok == ENV_CHANGED: + self.environment_changed.append(test) + elif ok == SKIPPED: + self.skipped.append(test) + elif ok == RESOURCE_DENIED: + self.skipped.append(test) + self.resource_denieds.append(test) + + def display_progress(self, test_index, test): + if self.ns.quiet: + return + if self.bad and not self.ns.pgo: + fmt = "{time} [{test_index:{count_width}}{test_count}/{nbad}] {test_name}" + else: + fmt = "{time} [{test_index:{count_width}}{test_count}] {test_name}" + test_time = time.monotonic() - self.start_time + test_time = datetime.timedelta(seconds=int(test_time)) + line = fmt.format(count_width=self.test_count_width, + test_index=test_index, + test_count=self.test_count, + nbad=len(self.bad), + test_name=test, + time=test_time) + print(line, flush=True) + + def parse_args(self, kwargs): + ns = _parse_args(sys.argv[1:], **kwargs) + + if ns.timeout and not hasattr(faulthandler, 'dump_traceback_later'): + print("Warning: The timeout option requires " + "faulthandler.dump_traceback_later", file=sys.stderr) + ns.timeout = None + + if ns.threshold is not None and gc is None: + print('No GC available, ignore --threshold.', file=sys.stderr) + ns.threshold = None + + if ns.findleaks: + if gc is not None: + # Uncomment the line below to report garbage that is not + # freeable by reference counting alone. By default only + # garbage that is not collectable by the GC is reported. + pass + #gc.set_debug(gc.DEBUG_SAVEALL) + else: + print('No GC available, disabling --findleaks', + file=sys.stderr) + ns.findleaks = False + + # Strip .py extensions. + removepy(ns.args) + + return ns + + def find_tests(self, tests): + self.tests = tests + + if self.ns.single: + self.next_single_filename = os.path.join(TEMPDIR, 'pynexttest') + try: + with open(self.next_single_filename, 'r') as fp: + next_test = fp.read().strip() + self.tests = [next_test] + except OSError: + pass + + if self.ns.fromfile: + self.tests = [] + # regex to match 'test_builtin' in line: + # '0:00:00 [ 4/400] test_builtin -- test_dict took 1 sec' + regex = (r'^(?:[0-9]+:[0-9]+:[0-9]+ *)?' + r'(?:\[[0-9/ ]+\] *)?' + r'(test_[a-zA-Z0-9_]+)') + regex = re.compile(regex) + with open(os.path.join(support.SAVEDCWD, self.ns.fromfile)) as fp: + for line in fp: + line = line.strip() + if line.startswith('#'): + continue + match = regex.match(line) + if match is None: + continue + self.tests.append(match.group(1)) + + removepy(self.tests) + + stdtests = STDTESTS[:] + nottests = NOTTESTS.copy() + if self.ns.exclude: + for arg in self.ns.args: + if arg in stdtests: + stdtests.remove(arg) + nottests.add(arg) + self.ns.args = [] + + # if testdir is set, then we are not running the python tests suite, so + # don't add default tests to be executed or skipped (pass empty values) + if self.ns.testdir: + alltests = findtests(self.ns.testdir, list(), set()) + else: + alltests = findtests(self.ns.testdir, stdtests, nottests) + + if not self.ns.fromfile: + self.selected = self.tests or self.ns.args or alltests + else: + self.selected = self.tests + if self.ns.single: + self.selected = self.selected[:1] + try: + pos = alltests.index(self.selected[0]) + self.next_single_test = alltests[pos + 1] + except IndexError: + pass + + # Remove all the selected tests that precede start if it's set. + if self.ns.start: + try: + del self.selected[:self.selected.index(self.ns.start)] + except ValueError: + print("Couldn't find starting test (%s), using all tests" + % self.ns.start, file=sys.stderr) + + if self.ns.randomize: + if self.ns.random_seed is None: + self.ns.random_seed = random.randrange(10000000) + random.seed(self.ns.random_seed) + random.shuffle(self.selected) + + def list_tests(self): + for name in self.selected: + print(name) + + def rerun_failed_tests(self): + self.ns.verbose = True + self.ns.failfast = False + self.ns.verbose3 = False + self.ns.match_tests = None + + print("Re-running failed tests in verbose mode") + for test in self.bad[:]: + print("Re-running test %r in verbose mode" % test, flush=True) + try: + self.ns.verbose = True + ok = runtest(self.ns, test) + except KeyboardInterrupt: + self.interrupted = True + # print a newline separate from the ^C + print() + break + else: + if ok[0] in {PASSED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED}: + self.bad.remove(test) + else: + if self.bad: + print(count(len(self.bad), 'test'), "failed again:") + printlist(self.bad) + + def display_result(self): + if self.interrupted: + # print a newline after ^C + print() + print("Test suite interrupted by signal SIGINT.") + executed = set(self.good) | set(self.bad) | set(self.skipped) + omitted = set(self.selected) - executed + print(count(len(omitted), "test"), "omitted:") + printlist(omitted) + + # If running the test suite for PGO then no one cares about + # results. + if self.ns.pgo: + return + + if self.good and not self.ns.quiet: + if (not self.bad + and not self.skipped + and not self.interrupted + and len(self.good) > 1): + print("All", end=' ') + print(count(len(self.good), "test"), "OK.") + + if self.ns.print_slow: + self.test_times.sort(reverse=True) + print() + print("10 slowest tests:") + for time, test in self.test_times[:10]: + print("- %s: %s" % (test, format_duration(time))) + + if self.bad: + print() + print(count(len(self.bad), "test"), "failed:") + printlist(self.bad) + + if self.environment_changed: + print() + print("{} altered the execution environment:".format( + count(len(self.environment_changed), "test"))) + printlist(self.environment_changed) + + if self.skipped and not self.ns.quiet: + print() + print(count(len(self.skipped), "test"), "skipped:") + printlist(self.skipped) + + def run_tests_sequential(self): + if self.ns.trace: + import trace + self.tracer = trace.Trace(trace=False, count=True) + + save_modules = sys.modules.keys() + + print("Run tests sequentially") + + previous_test = None + for test_index, test in enumerate(self.tests, 1): + start_time = time.monotonic() + + text = test + if previous_test: + text = '%s -- %s' % (text, previous_test) + self.display_progress(test_index, text) + + if self.tracer: + # If we're tracing code coverage, then we don't exit with status + # if on a false return value from main. + cmd = ('result = runtest(self.ns, test); ' + 'self.accumulate_result(test, result)') + ns = dict(locals()) + self.tracer.runctx(cmd, globals=globals(), locals=ns) + result = ns['result'] + else: + try: + result = runtest(self.ns, test) + except KeyboardInterrupt: + self.interrupted = True + self.accumulate_result(test, (INTERRUPTED, None)) + break + else: + self.accumulate_result(test, result) + + previous_test = format_test_result(test, result[0]) + test_time = time.monotonic() - start_time + if test_time >= PROGRESS_MIN_TIME: + previous_test = "%s in %s" % (previous_test, format_duration(test_time)) + elif result[0] == PASSED: + # be quiet: say nothing if the test passed shortly + previous_test = None + + if self.ns.findleaks: + gc.collect() + if gc.garbage: + print("Warning: test created", len(gc.garbage), end=' ') + print("uncollectable object(s).") + # move the uncollectable objects somewhere so we don't see + # them again + self.found_garbage.extend(gc.garbage) + del gc.garbage[:] + + # Unload the newly imported modules (best effort finalization) + for module in sys.modules.keys(): + if module not in save_modules and module.startswith("test."): + support.unload(module) + + if previous_test: + print(previous_test) + + def _test_forever(self, tests): + while True: + for test in tests: + yield test + if self.bad: + return + + def run_tests(self): + # For a partial run, we do not need to clutter the output. + if (self.ns.verbose + or self.ns.header + or not (self.ns.pgo or self.ns.quiet or self.ns.single + or self.tests or self.ns.args)): + # Print basic platform information + print("==", platform.python_implementation(), *sys.version.split()) + print("== ", platform.platform(aliased=True), + "%s-endian" % sys.byteorder) + print("== ", "hash algorithm:", sys.hash_info.algorithm, + "64bit" if sys.maxsize > 2**32 else "32bit") + print("== cwd:", os.getcwd()) + print("== encodings: locale=%s, FS=%s" + % (locale.getpreferredencoding(False), + sys.getfilesystemencoding())) + print("Testing with flags:", sys.flags) + + if self.ns.randomize: + print("Using random seed", self.ns.random_seed) + + if self.ns.forever: + self.tests = self._test_forever(list(self.selected)) + self.test_count = '' + self.test_count_width = 3 + else: + self.tests = iter(self.selected) + self.test_count = '/{}'.format(len(self.selected)) + self.test_count_width = len(self.test_count) - 1 + + if self.ns.use_mp: + from test.libregrtest.runtest_mp import run_tests_multiprocess + run_tests_multiprocess(self) + else: + self.run_tests_sequential() + + def finalize(self): + if self.next_single_filename: + if self.next_single_test: + with open(self.next_single_filename, 'w') as fp: + fp.write(self.next_single_test + '\n') + else: + os.unlink(self.next_single_filename) + + if self.tracer: + r = self.tracer.results() + r.write_results(show_missing=True, summary=True, + coverdir=self.ns.coverdir) + + print() + duration = time.monotonic() - self.start_time + print("Total duration: %s" % format_duration(duration)) + + if self.bad: + result = "FAILURE" + elif self.interrupted: + result = "INTERRUPTED" + else: + result = "SUCCESS" + print("Tests result: %s" % result) + + if self.ns.runleaks: + os.system("leaks %d" % os.getpid()) + + def main(self, tests=None, **kwargs): + global TEMPDIR + + if sysconfig.is_python_build(): + try: + os.mkdir(TEMPDIR) + except FileExistsError: + pass + + # Define a writable temp dir that will be used as cwd while running + # the tests. The name of the dir includes the pid to allow parallel + # testing (see the -j option). + test_cwd = 'test_python_{}'.format(os.getpid()) + test_cwd = os.path.join(TEMPDIR, test_cwd) + + # Run the tests in a context manager that temporarily changes the CWD to a + # temporary and writable directory. If it's not possible to create or + # change the CWD, the original CWD will be used. The original CWD is + # available from support.SAVEDCWD. + with support.temp_cwd(test_cwd, quiet=True): + self._main(tests, kwargs) + + def _main(self, tests, kwargs): + self.ns = self.parse_args(kwargs) + + if self.ns.slaveargs is not None: + from test.libregrtest.runtest_mp import run_tests_slave + run_tests_slave(self.ns.slaveargs) + + if self.ns.wait: + input("Press any key to continue...") + + support.PGO = self.ns.pgo + + setup_tests(self.ns) + + self.find_tests(tests) + + if self.ns.list_tests: + self.list_tests() + sys.exit(0) + + self.run_tests() + self.display_result() + + if self.ns.verbose2 and self.bad: + self.rerun_failed_tests() + + self.finalize() + sys.exit(len(self.bad) > 0 or self.interrupted) + + +def removepy(names): + if not names: + return + for idx, name in enumerate(names): + basename, ext = os.path.splitext(name) + if ext == '.py': + names[idx] = basename + + +def count(n, word): + if n == 1: + return "%d %s" % (n, word) + else: + return "%d %ss" % (n, word) + + +def printlist(x, width=70, indent=4): + """Print the elements of iterable x to stdout. + + Optional arg width (default 70) is the maximum line length. + Optional arg indent (default 4) is the number of blanks with which to + begin each line. + """ + + blanks = ' ' * indent + # Print the sorted list: 'x' may be a '--random' list or a set() + print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, + initial_indent=blanks, subsequent_indent=blanks)) + + +def main(tests=None, **kwargs): + """Run the Python suite.""" + Regrtest().main(tests=tests, **kwargs) diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py new file mode 100644 index 0000000..3b3d245 --- /dev/null +++ b/Lib/test/libregrtest/refleak.py @@ -0,0 +1,269 @@ +import errno +import os +import re +import sys +import warnings +from inspect import isabstract +from test import support + + +try: + MAXFD = os.sysconf("SC_OPEN_MAX") +except Exception: + MAXFD = 256 + + +def fd_count(): + """Count the number of open file descriptors""" + if sys.platform.startswith(('linux', 'freebsd')): + try: + names = os.listdir("/proc/self/fd") + return len(names) + except FileNotFoundError: + pass + + count = 0 + for fd in range(MAXFD): + try: + # Prefer dup() over fstat(). fstat() can require input/output + # whereas dup() doesn't. + fd2 = os.dup(fd) + except OSError as e: + if e.errno != errno.EBADF: + raise + else: + os.close(fd2) + count += 1 + return count + + +def dash_R(the_module, test, indirect_test, huntrleaks): + """Run a test multiple times, looking for reference leaks. + + Returns: + False if the test didn't leak references; True if we detected refleaks. + """ + # This code is hackish and inelegant, but it seems to do the job. + import copyreg + import collections.abc + + if not hasattr(sys, 'gettotalrefcount'): + raise Exception("Tracking reference leaks requires a debug build " + "of Python") + + # Save current values for dash_R_cleanup() to restore. + fs = warnings.filters[:] + ps = copyreg.dispatch_table.copy() + pic = sys.path_importer_cache.copy() + try: + import zipimport + except ImportError: + zdc = None # Run unmodified on platforms without zipimport support + else: + zdc = zipimport._zip_directory_cache.copy() + abcs = {} + for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]: + if not isabstract(abc): + continue + for obj in abc.__subclasses__() + [abc]: + abcs[obj] = obj._abc_registry.copy() + + nwarmup, ntracked, fname = huntrleaks + fname = os.path.join(support.SAVEDCWD, fname) + repcount = nwarmup + ntracked + rc_deltas = [0] * repcount + alloc_deltas = [0] * repcount + fd_deltas = [0] * repcount + + print("beginning", repcount, "repetitions", file=sys.stderr) + print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr, + flush=True) + # initialize variables to make pyflakes quiet + rc_before = alloc_before = fd_before = 0 + for i in range(repcount): + indirect_test() + alloc_after, rc_after, fd_after = dash_R_cleanup(fs, ps, pic, zdc, + abcs) + print('.', end='', flush=True) + if i >= nwarmup: + rc_deltas[i] = rc_after - rc_before + alloc_deltas[i] = alloc_after - alloc_before + fd_deltas[i] = fd_after - fd_before + alloc_before = alloc_after + rc_before = rc_after + fd_before = fd_after + print(file=sys.stderr) + # These checkers return False on success, True on failure + def check_rc_deltas(deltas): + return any(deltas) + def check_alloc_deltas(deltas): + # At least 1/3rd of 0s + if 3 * deltas.count(0) < len(deltas): + return True + # Nothing else than 1s, 0s and -1s + if not set(deltas) <= {1,0,-1}: + return True + return False + failed = False + for deltas, item_name, checker in [ + (rc_deltas, 'references', check_rc_deltas), + (alloc_deltas, 'memory blocks', check_alloc_deltas), + (fd_deltas, 'file descriptors', check_rc_deltas)]: + if checker(deltas): + msg = '%s leaked %s %s, sum=%s' % ( + test, deltas[nwarmup:], item_name, sum(deltas)) + print(msg, file=sys.stderr, flush=True) + with open(fname, "a") as refrep: + print(msg, file=refrep) + refrep.flush() + failed = True + return failed + + +def dash_R_cleanup(fs, ps, pic, zdc, abcs): + import gc, copyreg + import collections.abc + from weakref import WeakSet + + # Restore some original values. + warnings.filters[:] = fs + copyreg.dispatch_table.clear() + copyreg.dispatch_table.update(ps) + sys.path_importer_cache.clear() + sys.path_importer_cache.update(pic) + try: + import zipimport + except ImportError: + pass # Run unmodified on platforms without zipimport support + else: + zipimport._zip_directory_cache.clear() + zipimport._zip_directory_cache.update(zdc) + + # clear type cache + sys._clear_type_cache() + + # Clear ABC registries, restoring previously saved ABC registries. + for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]: + if not isabstract(abc): + continue + for obj in abc.__subclasses__() + [abc]: + obj._abc_registry = abcs.get(obj, WeakSet()).copy() + obj._abc_cache.clear() + obj._abc_negative_cache.clear() + + clear_caches() + + # Collect cyclic trash and read memory statistics immediately after. + func1 = sys.getallocatedblocks + func2 = sys.gettotalrefcount + gc.collect() + return func1(), func2(), fd_count() + + +def clear_caches(): + import gc + + # Clear the warnings registry, so they can be displayed again + for mod in sys.modules.values(): + if hasattr(mod, '__warningregistry__'): + del mod.__warningregistry__ + + # Flush standard output, so that buffered data is sent to the OS and + # associated Python objects are reclaimed. + for stream in (sys.stdout, sys.stderr, sys.__stdout__, sys.__stderr__): + if stream is not None: + stream.flush() + + # Clear assorted module caches. + # Don't worry about resetting the cache if the module is not loaded + try: + distutils_dir_util = sys.modules['distutils.dir_util'] + except KeyError: + pass + else: + distutils_dir_util._path_created.clear() + re.purge() + + try: + _strptime = sys.modules['_strptime'] + except KeyError: + pass + else: + _strptime._regex_cache.clear() + + try: + urllib_parse = sys.modules['urllib.parse'] + except KeyError: + pass + else: + urllib_parse.clear_cache() + + try: + urllib_request = sys.modules['urllib.request'] + except KeyError: + pass + else: + urllib_request.urlcleanup() + + try: + linecache = sys.modules['linecache'] + except KeyError: + pass + else: + linecache.clearcache() + + try: + mimetypes = sys.modules['mimetypes'] + except KeyError: + pass + else: + mimetypes._default_mime_types() + + try: + filecmp = sys.modules['filecmp'] + except KeyError: + pass + else: + filecmp._cache.clear() + + try: + struct = sys.modules['struct'] + except KeyError: + pass + else: + struct._clearcache() + + try: + doctest = sys.modules['doctest'] + except KeyError: + pass + else: + doctest.master = None + + try: + ctypes = sys.modules['ctypes'] + except KeyError: + pass + else: + ctypes._reset_cache() + + try: + typing = sys.modules['typing'] + except KeyError: + pass + else: + for f in typing._cleanups: + f() + + gc.collect() + + +def warm_caches(): + # char cache + s = bytes(range(256)) + for i in range(256): + s[i:i+1] + # unicode cache + [chr(i) for i in range(256)] + # int cache + list(range(-5, 257)) diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py new file mode 100644 index 0000000..ba0df0a --- /dev/null +++ b/Lib/test/libregrtest/runtest.py @@ -0,0 +1,245 @@ +import faulthandler +import importlib +import io +import os +import sys +import time +import traceback +import unittest +from test import support +from test.libregrtest.refleak import dash_R, clear_caches +from test.libregrtest.save_env import saved_test_environment + + +# Test result constants. +PASSED = 1 +FAILED = 0 +ENV_CHANGED = -1 +SKIPPED = -2 +RESOURCE_DENIED = -3 +INTERRUPTED = -4 +CHILD_ERROR = -5 # error in a child process + +_FORMAT_TEST_RESULT = { + PASSED: '%s passed', + FAILED: '%s failed', + ENV_CHANGED: '%s failed (env changed)', + SKIPPED: '%s skipped', + RESOURCE_DENIED: '%s skipped (resource denied)', + INTERRUPTED: '%s interrupted', + CHILD_ERROR: '%s crashed', +} + +# Minimum duration of a test to display its duration or to mention that +# the test is running in background +PROGRESS_MIN_TIME = 30.0 # seconds + +# small set of tests to determine if we have a basically functioning interpreter +# (i.e. if any of these fail, then anything else is likely to follow) +STDTESTS = [ + 'test_grammar', + 'test_opcodes', + 'test_dict', + 'test_builtin', + 'test_exceptions', + 'test_types', + 'test_unittest', + 'test_doctest', + 'test_doctest2', + 'test_support' +] + +# set of tests that we don't want to be executed when using regrtest +NOTTESTS = set() + + +def format_test_result(test_name, result): + fmt = _FORMAT_TEST_RESULT.get(result, "%s") + return fmt % test_name + + +def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS): + """Return a list of all applicable test modules.""" + testdir = findtestdir(testdir) + names = os.listdir(testdir) + tests = [] + others = set(stdtests) | nottests + for name in names: + mod, ext = os.path.splitext(name) + if mod[:5] == "test_" and ext in (".py", "") and mod not in others: + tests.append(mod) + return stdtests + sorted(tests) + + +def runtest(ns, test): + """Run a single test. + + ns -- regrtest namespace of options + test -- the name of the test + + Returns the tuple (result, test_time), where result is one of the + constants: + + INTERRUPTED KeyboardInterrupt when run under -j + RESOURCE_DENIED test skipped because resource denied + SKIPPED test skipped for some other reason + ENV_CHANGED test failed because it changed the execution environment + FAILED test failed + PASSED test passed + """ + + output_on_failure = ns.verbose3 + + use_timeout = (ns.timeout is not None) + if use_timeout: + faulthandler.dump_traceback_later(ns.timeout, exit=True) + try: + support.match_tests = ns.match_tests + if ns.failfast: + support.failfast = True + if output_on_failure: + support.verbose = True + + # Reuse the same instance to all calls to runtest(). Some + # tests keep a reference to sys.stdout or sys.stderr + # (eg. test_argparse). + if runtest.stringio is None: + stream = io.StringIO() + runtest.stringio = stream + else: + stream = runtest.stringio + stream.seek(0) + stream.truncate() + + orig_stdout = sys.stdout + orig_stderr = sys.stderr + try: + sys.stdout = stream + sys.stderr = stream + result = runtest_inner(ns, test, display_failure=False) + if result[0] != PASSED: + output = stream.getvalue() + orig_stderr.write(output) + orig_stderr.flush() + finally: + sys.stdout = orig_stdout + sys.stderr = orig_stderr + else: + support.verbose = ns.verbose # Tell tests to be moderately quiet + result = runtest_inner(ns, test, display_failure=not ns.verbose) + return result + finally: + if use_timeout: + faulthandler.cancel_dump_traceback_later() + cleanup_test_droppings(test, ns.verbose) +runtest.stringio = None + + +def runtest_inner(ns, test, display_failure=True): + support.unload(test) + + test_time = 0.0 + refleak = False # True if the test leaked references. + try: + if test.startswith('test.') or ns.testdir: + abstest = test + else: + # Always import it from the test package + abstest = 'test.' + test + clear_caches() + with saved_test_environment(test, ns.verbose, ns.quiet, pgo=ns.pgo) as environment: + start_time = time.time() + the_module = importlib.import_module(abstest) + # If the test has a test_main, that will run the appropriate + # tests. If not, use normal unittest test loading. + test_runner = getattr(the_module, "test_main", None) + if test_runner is None: + def test_runner(): + loader = unittest.TestLoader() + tests = loader.loadTestsFromModule(the_module) + for error in loader.errors: + print(error, file=sys.stderr) + if loader.errors: + raise Exception("errors while loading tests") + support.run_unittest(tests) + test_runner() + if ns.huntrleaks: + refleak = dash_R(the_module, test, test_runner, ns.huntrleaks) + test_time = time.time() - start_time + except support.ResourceDenied as msg: + if not ns.quiet and not ns.pgo: + print(test, "skipped --", msg, flush=True) + return RESOURCE_DENIED, test_time + except unittest.SkipTest as msg: + if not ns.quiet and not ns.pgo: + print(test, "skipped --", msg, flush=True) + return SKIPPED, test_time + except KeyboardInterrupt: + raise + except support.TestFailed as msg: + if not ns.pgo: + if display_failure: + print("test", test, "failed --", msg, file=sys.stderr, + flush=True) + else: + print("test", test, "failed", file=sys.stderr, flush=True) + return FAILED, test_time + except: + msg = traceback.format_exc() + if not ns.pgo: + print("test", test, "crashed --", msg, file=sys.stderr, + flush=True) + return FAILED, test_time + else: + if refleak: + return FAILED, test_time + if environment.changed: + return ENV_CHANGED, test_time + return PASSED, test_time + + +def cleanup_test_droppings(testname, verbose): + import shutil + import stat + import gc + + # First kill any dangling references to open files etc. + # This can also issue some ResourceWarnings which would otherwise get + # triggered during the following test run, and possibly produce failures. + gc.collect() + + # Try to clean up junk commonly left behind. While tests shouldn't leave + # any files or directories behind, when a test fails that can be tedious + # for it to arrange. The consequences can be especially nasty on Windows, + # since if a test leaves a file open, it cannot be deleted by name (while + # there's nothing we can do about that here either, we can display the + # name of the offending test, which is a real help). + for name in (support.TESTFN, + "db_home", + ): + if not os.path.exists(name): + continue + + if os.path.isdir(name): + kind, nuker = "directory", shutil.rmtree + elif os.path.isfile(name): + kind, nuker = "file", os.unlink + else: + raise SystemError("os.path says %r exists but is neither " + "directory nor file" % name) + + if verbose: + print("%r left behind %s %r" % (testname, kind, name)) + try: + # if we have chmod, fix possible permissions problems + # that might prevent cleanup + if (hasattr(os, 'chmod')): + os.chmod(name, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) + nuker(name) + except Exception as msg: + print(("%r left behind %s %r and it couldn't be " + "removed: %s" % (testname, kind, name, msg)), file=sys.stderr) + + +def findtestdir(path=None): + return path or os.path.dirname(os.path.dirname(__file__)) or os.curdir diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py new file mode 100644 index 0000000..9604c16 --- /dev/null +++ b/Lib/test/libregrtest/runtest_mp.py @@ -0,0 +1,245 @@ +import faulthandler +import json +import os +import queue +import sys +import time +import traceback +import types +from test import support +try: + import threading +except ImportError: + print("Multiprocess option requires thread support") + sys.exit(2) + +from test.libregrtest.runtest import ( + runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, + format_test_result) +from test.libregrtest.setup import setup_tests + + +# Display the running tests if nothing happened last N seconds +PROGRESS_UPDATE = 30.0 # seconds + +# If interrupted, display the wait progress every N seconds +WAIT_PROGRESS = 2.0 # seconds + + +def run_test_in_subprocess(testname, ns): + """Run the given test in a subprocess with --slaveargs. + + ns is the option Namespace parsed from command-line arguments. regrtest + is invoked in a subprocess with the --slaveargs argument; when the + subprocess exits, its return code, stdout and stderr are returned as a + 3-tuple. + """ + from subprocess import Popen, PIPE + + ns_dict = vars(ns) + slaveargs = (ns_dict, testname) + slaveargs = json.dumps(slaveargs) + + cmd = [sys.executable, *support.args_from_interpreter_flags(), + '-X', 'faulthandler', + '-m', 'test.regrtest', + '--slaveargs', slaveargs] + if ns.pgo: + cmd += ['--pgo'] + + # Running the child from the same working directory as regrtest's original + # invocation ensures that TEMPDIR for the child is the same when + # sysconfig.is_python_build() is true. See issue 15300. + popen = Popen(cmd, + stdout=PIPE, stderr=PIPE, + universal_newlines=True, + close_fds=(os.name != 'nt'), + cwd=support.SAVEDCWD) + with popen: + stdout, stderr = popen.communicate() + retcode = popen.wait() + return retcode, stdout, stderr + + +def run_tests_slave(slaveargs): + ns_dict, testname = json.loads(slaveargs) + ns = types.SimpleNamespace(**ns_dict) + + setup_tests(ns) + + try: + result = runtest(ns, testname) + except KeyboardInterrupt: + result = INTERRUPTED, '' + except BaseException as e: + traceback.print_exc() + result = CHILD_ERROR, str(e) + + print() # Force a newline (just in case) + print(json.dumps(result), flush=True) + sys.exit(0) + + +# We do not use a generator so multiple threads can call next(). +class MultiprocessIterator: + + """A thread-safe iterator over tests for multiprocess mode.""" + + def __init__(self, tests): + self.interrupted = False + self.lock = threading.Lock() + self.tests = tests + + def __iter__(self): + return self + + def __next__(self): + with self.lock: + if self.interrupted: + raise StopIteration('tests interrupted') + return next(self.tests) + + +class MultiprocessThread(threading.Thread): + def __init__(self, pending, output, ns): + super().__init__() + self.pending = pending + self.output = output + self.ns = ns + self.current_test = None + self.start_time = None + + def _runtest(self): + try: + test = next(self.pending) + except StopIteration: + self.output.put((None, None, None, None)) + return True + + try: + self.start_time = time.monotonic() + self.current_test = test + + retcode, stdout, stderr = run_test_in_subprocess(test, self.ns) + finally: + self.current_test = None + + stdout, _, result = stdout.strip().rpartition("\n") + if retcode != 0: + result = (CHILD_ERROR, "Exit code %s" % retcode) + self.output.put((test, stdout.rstrip(), stderr.rstrip(), + result)) + return True + + if not result: + self.output.put((None, None, None, None)) + return True + + result = json.loads(result) + self.output.put((test, stdout.rstrip(), stderr.rstrip(), + result)) + return False + + def run(self): + try: + stop = False + while not stop: + stop = self._runtest() + except BaseException: + self.output.put((None, None, None, None)) + raise + + +def run_tests_multiprocess(regrtest): + output = queue.Queue() + pending = MultiprocessIterator(regrtest.tests) + test_timeout = regrtest.ns.timeout + use_timeout = (test_timeout is not None) + + workers = [MultiprocessThread(pending, output, regrtest.ns) + for i in range(regrtest.ns.use_mp)] + print("Run tests in parallel using %s child processes" + % len(workers)) + for worker in workers: + worker.start() + + def get_running(workers): + running = [] + for worker in workers: + current_test = worker.current_test + if not current_test: + continue + dt = time.monotonic() - worker.start_time + if dt >= PROGRESS_MIN_TIME: + running.append('%s (%.0f sec)' % (current_test, dt)) + return running + + finished = 0 + test_index = 1 + get_timeout = max(PROGRESS_UPDATE, PROGRESS_MIN_TIME) + try: + while finished < regrtest.ns.use_mp: + if use_timeout: + faulthandler.dump_traceback_later(test_timeout, exit=True) + + try: + item = output.get(timeout=get_timeout) + except queue.Empty: + running = get_running(workers) + if running and not regrtest.ns.pgo: + print('running: %s' % ', '.join(running)) + continue + + test, stdout, stderr, result = item + if test is None: + finished += 1 + continue + regrtest.accumulate_result(test, result) + + # Display progress + ok, test_time = result + text = format_test_result(test, ok) + if (ok not in (CHILD_ERROR, INTERRUPTED) + and test_time >= PROGRESS_MIN_TIME + and not regrtest.ns.pgo): + text += ' (%.0f sec)' % test_time + running = get_running(workers) + if running and not regrtest.ns.pgo: + text += ' -- running: %s' % ', '.join(running) + regrtest.display_progress(test_index, text) + + # Copy stdout and stderr from the child process + if stdout: + print(stdout, flush=True) + if stderr and not regrtest.ns.pgo: + print(stderr, file=sys.stderr, flush=True) + + if result[0] == INTERRUPTED: + raise KeyboardInterrupt + if result[0] == CHILD_ERROR: + msg = "Child error on {}: {}".format(test, result[1]) + raise Exception(msg) + test_index += 1 + except KeyboardInterrupt: + regrtest.interrupted = True + pending.interrupted = True + print() + finally: + if use_timeout: + faulthandler.cancel_dump_traceback_later() + + # If tests are interrupted, wait until tests complete + wait_start = time.monotonic() + while True: + running = [worker.current_test for worker in workers] + running = list(filter(bool, running)) + if not running: + break + + dt = time.monotonic() - wait_start + line = "Waiting for %s (%s tests)" % (', '.join(running), len(running)) + if dt >= WAIT_PROGRESS: + line = "%s since %.0f sec" % (line, dt) + print(line) + for worker in workers: + worker.join(WAIT_PROGRESS) diff --git a/Lib/test/libregrtest/save_env.py b/Lib/test/libregrtest/save_env.py new file mode 100644 index 0000000..96ad3af --- /dev/null +++ b/Lib/test/libregrtest/save_env.py @@ -0,0 +1,285 @@ +import builtins +import locale +import logging +import os +import shutil +import sys +import sysconfig +import warnings +from test import support +try: + import threading +except ImportError: + threading = None +try: + import _multiprocessing, multiprocessing.process +except ImportError: + multiprocessing = None + + +# Unit tests are supposed to leave the execution environment unchanged +# once they complete. But sometimes tests have bugs, especially when +# tests fail, and the changes to environment go on to mess up other +# tests. This can cause issues with buildbot stability, since tests +# are run in random order and so problems may appear to come and go. +# There are a few things we can save and restore to mitigate this, and +# the following context manager handles this task. + +class saved_test_environment: + """Save bits of the test environment and restore them at block exit. + + with saved_test_environment(testname, verbose, quiet): + #stuff + + Unless quiet is True, a warning is printed to stderr if any of + the saved items was changed by the test. The attribute 'changed' + is initially False, but is set to True if a change is detected. + + If verbose is more than 1, the before and after state of changed + items is also printed. + """ + + changed = False + + def __init__(self, testname, verbose=0, quiet=False, *, pgo=False): + self.testname = testname + self.verbose = verbose + self.quiet = quiet + self.pgo = pgo + + # To add things to save and restore, add a name XXX to the resources list + # and add corresponding get_XXX/restore_XXX functions. get_XXX should + # return the value to be saved and compared against a second call to the + # get function when test execution completes. restore_XXX should accept + # the saved value and restore the resource using it. It will be called if + # and only if a change in the value is detected. + # + # Note: XXX will have any '.' replaced with '_' characters when determining + # the corresponding method names. + + resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr', + 'os.environ', 'sys.path', 'sys.path_hooks', '__import__', + 'warnings.filters', 'asyncore.socket_map', + 'logging._handlers', 'logging._handlerList', 'sys.gettrace', + 'sys.warnoptions', + # multiprocessing.process._cleanup() may release ref + # to a thread, so check processes first. + 'multiprocessing.process._dangling', 'threading._dangling', + 'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES', + 'files', 'locale', 'warnings.showwarning', + 'shutil_archive_formats', 'shutil_unpack_formats', + ) + + def get_sys_argv(self): + return id(sys.argv), sys.argv, sys.argv[:] + def restore_sys_argv(self, saved_argv): + sys.argv = saved_argv[1] + sys.argv[:] = saved_argv[2] + + def get_cwd(self): + return os.getcwd() + def restore_cwd(self, saved_cwd): + os.chdir(saved_cwd) + + def get_sys_stdout(self): + return sys.stdout + def restore_sys_stdout(self, saved_stdout): + sys.stdout = saved_stdout + + def get_sys_stderr(self): + return sys.stderr + def restore_sys_stderr(self, saved_stderr): + sys.stderr = saved_stderr + + def get_sys_stdin(self): + return sys.stdin + def restore_sys_stdin(self, saved_stdin): + sys.stdin = saved_stdin + + def get_os_environ(self): + return id(os.environ), os.environ, dict(os.environ) + def restore_os_environ(self, saved_environ): + os.environ = saved_environ[1] + os.environ.clear() + os.environ.update(saved_environ[2]) + + def get_sys_path(self): + return id(sys.path), sys.path, sys.path[:] + def restore_sys_path(self, saved_path): + sys.path = saved_path[1] + sys.path[:] = saved_path[2] + + def get_sys_path_hooks(self): + return id(sys.path_hooks), sys.path_hooks, sys.path_hooks[:] + def restore_sys_path_hooks(self, saved_hooks): + sys.path_hooks = saved_hooks[1] + sys.path_hooks[:] = saved_hooks[2] + + def get_sys_gettrace(self): + return sys.gettrace() + def restore_sys_gettrace(self, trace_fxn): + sys.settrace(trace_fxn) + + def get___import__(self): + return builtins.__import__ + def restore___import__(self, import_): + builtins.__import__ = import_ + + def get_warnings_filters(self): + return id(warnings.filters), warnings.filters, warnings.filters[:] + def restore_warnings_filters(self, saved_filters): + warnings.filters = saved_filters[1] + warnings.filters[:] = saved_filters[2] + + def get_asyncore_socket_map(self): + asyncore = sys.modules.get('asyncore') + # XXX Making a copy keeps objects alive until __exit__ gets called. + return asyncore and asyncore.socket_map.copy() or {} + def restore_asyncore_socket_map(self, saved_map): + asyncore = sys.modules.get('asyncore') + if asyncore is not None: + asyncore.close_all(ignore_all=True) + asyncore.socket_map.update(saved_map) + + def get_shutil_archive_formats(self): + # we could call get_archives_formats() but that only returns the + # registry keys; we want to check the values too (the functions that + # are registered) + return shutil._ARCHIVE_FORMATS, shutil._ARCHIVE_FORMATS.copy() + def restore_shutil_archive_formats(self, saved): + shutil._ARCHIVE_FORMATS = saved[0] + shutil._ARCHIVE_FORMATS.clear() + shutil._ARCHIVE_FORMATS.update(saved[1]) + + def get_shutil_unpack_formats(self): + return shutil._UNPACK_FORMATS, shutil._UNPACK_FORMATS.copy() + def restore_shutil_unpack_formats(self, saved): + shutil._UNPACK_FORMATS = saved[0] + shutil._UNPACK_FORMATS.clear() + shutil._UNPACK_FORMATS.update(saved[1]) + + def get_logging__handlers(self): + # _handlers is a WeakValueDictionary + return id(logging._handlers), logging._handlers, logging._handlers.copy() + def restore_logging__handlers(self, saved_handlers): + # Can't easily revert the logging state + pass + + def get_logging__handlerList(self): + # _handlerList is a list of weakrefs to handlers + return id(logging._handlerList), logging._handlerList, logging._handlerList[:] + def restore_logging__handlerList(self, saved_handlerList): + # Can't easily revert the logging state + pass + + def get_sys_warnoptions(self): + return id(sys.warnoptions), sys.warnoptions, sys.warnoptions[:] + def restore_sys_warnoptions(self, saved_options): + sys.warnoptions = saved_options[1] + sys.warnoptions[:] = saved_options[2] + + # Controlling dangling references to Thread objects can make it easier + # to track reference leaks. + def get_threading__dangling(self): + if not threading: + return None + # This copies the weakrefs without making any strong reference + return threading._dangling.copy() + def restore_threading__dangling(self, saved): + if not threading: + return + threading._dangling.clear() + threading._dangling.update(saved) + + # Same for Process objects + def get_multiprocessing_process__dangling(self): + if not multiprocessing: + return None + # Unjoined process objects can survive after process exits + multiprocessing.process._cleanup() + # This copies the weakrefs without making any strong reference + return multiprocessing.process._dangling.copy() + def restore_multiprocessing_process__dangling(self, saved): + if not multiprocessing: + return + multiprocessing.process._dangling.clear() + multiprocessing.process._dangling.update(saved) + + def get_sysconfig__CONFIG_VARS(self): + # make sure the dict is initialized + sysconfig.get_config_var('prefix') + return (id(sysconfig._CONFIG_VARS), sysconfig._CONFIG_VARS, + dict(sysconfig._CONFIG_VARS)) + def restore_sysconfig__CONFIG_VARS(self, saved): + sysconfig._CONFIG_VARS = saved[1] + sysconfig._CONFIG_VARS.clear() + sysconfig._CONFIG_VARS.update(saved[2]) + + def get_sysconfig__INSTALL_SCHEMES(self): + return (id(sysconfig._INSTALL_SCHEMES), sysconfig._INSTALL_SCHEMES, + sysconfig._INSTALL_SCHEMES.copy()) + def restore_sysconfig__INSTALL_SCHEMES(self, saved): + sysconfig._INSTALL_SCHEMES = saved[1] + sysconfig._INSTALL_SCHEMES.clear() + sysconfig._INSTALL_SCHEMES.update(saved[2]) + + def get_files(self): + return sorted(fn + ('/' if os.path.isdir(fn) else '') + for fn in os.listdir()) + def restore_files(self, saved_value): + fn = support.TESTFN + if fn not in saved_value and (fn + '/') not in saved_value: + if os.path.isfile(fn): + support.unlink(fn) + elif os.path.isdir(fn): + support.rmtree(fn) + + _lc = [getattr(locale, lc) for lc in dir(locale) + if lc.startswith('LC_')] + def get_locale(self): + pairings = [] + for lc in self._lc: + try: + pairings.append((lc, locale.setlocale(lc, None))) + except (TypeError, ValueError): + continue + return pairings + def restore_locale(self, saved): + for lc, setting in saved: + locale.setlocale(lc, setting) + + def get_warnings_showwarning(self): + return warnings.showwarning + def restore_warnings_showwarning(self, fxn): + warnings.showwarning = fxn + + def resource_info(self): + for name in self.resources: + method_suffix = name.replace('.', '_') + get_name = 'get_' + method_suffix + restore_name = 'restore_' + method_suffix + yield name, getattr(self, get_name), getattr(self, restore_name) + + def __enter__(self): + self.saved_values = dict((name, get()) for name, get, restore + in self.resource_info()) + return self + + def __exit__(self, exc_type, exc_val, exc_tb): + saved_values = self.saved_values + del self.saved_values + support.gc_collect() # Some resources use weak references + for name, get, restore in self.resource_info(): + current = get() + original = saved_values.pop(name) + # Check for changes to the resource's value + if current != original: + self.changed = True + restore(original) + if not self.quiet and not self.pgo: + print(f"Warning -- {name} was modified by {self.testname}", + file=sys.stderr, flush=True) + if self.verbose > 1: + print(f" Before: {original}\n After: {current} ", + file=sys.stderr, flush=True) + return False diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py new file mode 100644 index 0000000..1d24531 --- /dev/null +++ b/Lib/test/libregrtest/setup.py @@ -0,0 +1,121 @@ +import atexit +import faulthandler +import os +import signal +import sys +import unittest +from test import support +try: + import gc +except ImportError: + gc = None + +from test.libregrtest.refleak import warm_caches + + +def setup_tests(ns): + # Display the Python traceback on fatal errors (e.g. segfault) + faulthandler.enable(all_threads=True) + + # Display the Python traceback on SIGALRM or SIGUSR1 signal + signals = [] + if hasattr(signal, 'SIGALRM'): + signals.append(signal.SIGALRM) + if hasattr(signal, 'SIGUSR1'): + signals.append(signal.SIGUSR1) + for signum in signals: + faulthandler.register(signum, chain=True) + + replace_stdout() + support.record_original_stdout(sys.stdout) + + if ns.testdir: + # Prepend test directory to sys.path, so runtest() will be able + # to locate tests + sys.path.insert(0, os.path.abspath(ns.testdir)) + + # Some times __path__ and __file__ are not absolute (e.g. while running from + # Lib/) and, if we change the CWD to run the tests in a temporary dir, some + # imports might fail. This affects only the modules imported before os.chdir(). + # These modules are searched first in sys.path[0] (so '' -- the CWD) and if + # they are found in the CWD their __file__ and __path__ will be relative (this + # happens before the chdir). All the modules imported after the chdir, are + # not found in the CWD, and since the other paths in sys.path[1:] are absolute + # (site.py absolutize them), the __file__ and __path__ will be absolute too. + # Therefore it is necessary to absolutize manually the __file__ and __path__ of + # the packages to prevent later imports to fail when the CWD is different. + for module in sys.modules.values(): + if hasattr(module, '__path__'): + for index, path in enumerate(module.__path__): + module.__path__[index] = os.path.abspath(path) + if hasattr(module, '__file__'): + module.__file__ = os.path.abspath(module.__file__) + + # MacOSX (a.k.a. Darwin) has a default stack size that is too small + # for deeply recursive regular expressions. We see this as crashes in + # the Python test suite when running test_re.py and test_sre.py. The + # fix is to set the stack limit to 2048. + # This approach may also be useful for other Unixy platforms that + # suffer from small default stack limits. + if sys.platform == 'darwin': + try: + import resource + except ImportError: + pass + else: + soft, hard = resource.getrlimit(resource.RLIMIT_STACK) + newsoft = min(hard, max(soft, 1024*2048)) + resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard)) + + if ns.huntrleaks: + unittest.BaseTestSuite._cleanup = False + + # Avoid false positives due to various caches + # filling slowly with random data: + warm_caches() + + if ns.memlimit is not None: + support.set_memlimit(ns.memlimit) + + if ns.threshold is not None: + gc.set_threshold(ns.threshold) + + try: + import msvcrt + except ImportError: + pass + else: + msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS| + msvcrt.SEM_NOALIGNMENTFAULTEXCEPT| + msvcrt.SEM_NOGPFAULTERRORBOX| + msvcrt.SEM_NOOPENFILEERRORBOX) + try: + msvcrt.CrtSetReportMode + except AttributeError: + # release build + pass + else: + for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]: + if ns.verbose and ns.verbose >= 2: + msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE) + msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR) + else: + msvcrt.CrtSetReportMode(m, 0) + + support.use_resources = ns.use_resources + + +def replace_stdout(): + """Set stdout encoder error handler to backslashreplace (as stderr error + handler) to avoid UnicodeEncodeError when printing a traceback""" + stdout = sys.stdout + sys.stdout = open(stdout.fileno(), 'w', + encoding=stdout.encoding, + errors="backslashreplace", + closefd=False, + newline='\n') + + def restore_stdout(): + sys.stdout.close() + sys.stdout = stdout + atexit.register(restore_stdout) diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py index f20fdc0..26e9368 100644 --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -266,9 +266,21 @@ class CommonTest(seq_tests.CommonTest): self.assertEqual(a, list("spameggs")) self.assertRaises(TypeError, a.extend, None) - self.assertRaises(TypeError, a.extend) + # overflow test. issue1621 + class CustomIter: + def __iter__(self): + return self + def __next__(self): + raise StopIteration + def __length_hint__(self): + return sys.maxsize + a = self.type2test([1,2,3,4]) + a.extend(CustomIter()) + self.assertEqual(a, [1,2,3,4]) + + def test_insert(self): a = self.type2test([0, 1, 2]) a.insert(0, -2) diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py index 6c03b5a..a6cb3b1 100644 --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -7,6 +7,7 @@ import time from _thread import start_new_thread, TIMEOUT_MAX import threading import unittest +import weakref from test import support @@ -198,6 +199,17 @@ class BaseLockTests(BaseTestCase): self.assertFalse(results[0]) self.assertTimeout(results[1], 0.5) + def test_weakref_exists(self): + lock = self.locktype() + ref = weakref.ref(lock) + self.assertIsNotNone(ref()) + + def test_weakref_deleted(self): + lock = self.locktype() + ref = weakref.ref(lock) + del lock + self.assertIsNone(ref()) + class LockTests(BaseLockTests): """ @@ -449,28 +461,21 @@ class ConditionTests(BaseTestCase): # construct. In particular, it is possible that this can no longer # be conveniently guaranteed should their implementation ever change. N = 5 - ready = [] results1 = [] results2 = [] phase_num = 0 def f(): cond.acquire() - ready.append(phase_num) result = cond.wait() cond.release() results1.append((result, phase_num)) cond.acquire() - ready.append(phase_num) result = cond.wait() cond.release() results2.append((result, phase_num)) b = Bunch(f, N) b.wait_for_started() - # first wait, to ensure all workers settle into cond.wait() before - # we continue. See issues #8799 and #30727. - while len(ready) < 5: - _wait() - ready.clear() + _wait() self.assertEqual(results1, []) # Notify 3 threads at first cond.acquire() @@ -482,9 +487,9 @@ class ConditionTests(BaseTestCase): _wait() self.assertEqual(results1, [(True, 1)] * 3) self.assertEqual(results2, []) - # make sure all awaken workers settle into cond.wait() - while len(ready) < 3: - _wait() + # first wait, to ensure all workers settle into cond.wait() before + # we continue. See issue #8799 + _wait() # Notify 5 threads: they might be in their first or second wait cond.acquire() cond.notify(5) @@ -495,9 +500,7 @@ class ConditionTests(BaseTestCase): _wait() self.assertEqual(results1, [(True, 1)] * 3 + [(True, 2)] * 2) self.assertEqual(results2, [(True, 2)] * 3) - # make sure all workers settle into cond.wait() - while len(ready) < 5: - _wait() + _wait() # make sure all workers settle into cond.wait() # Notify all threads: they are all in their second wait cond.acquire() cond.notify_all() diff --git a/Lib/test/make_ssl_certs.py b/Lib/test/make_ssl_certs.py index a1f298d..4d9f01b 100644 --- a/Lib/test/make_ssl_certs.py +++ b/Lib/test/make_ssl_certs.py @@ -3,7 +3,6 @@ and friends.""" import os import shutil -import sys import tempfile from subprocess import * diff --git a/Lib/test/mod_generics_cache.py b/Lib/test/mod_generics_cache.py deleted file mode 100644 index d9a60b4..0000000 --- a/Lib/test/mod_generics_cache.py +++ /dev/null @@ -1,14 +0,0 @@ -"""Module for testing the behavior of generics across different modules.""" - -from typing import TypeVar, Generic - -T = TypeVar('T') - - -class A(Generic[T]): - pass - - -class B(Generic[T]): - class A(Generic[T]): - pass diff --git a/Lib/test/mp_preload.py b/Lib/test/mp_preload.py deleted file mode 100644 index 5314e8f..0000000 --- a/Lib/test/mp_preload.py +++ /dev/null @@ -1,18 +0,0 @@ -import multiprocessing - -multiprocessing.Lock() - - -def f(): - print("ok") - - -if __name__ == "__main__": - ctx = multiprocessing.get_context("forkserver") - modname = "test.mp_preload" - # Make sure it's importable - __import__(modname) - ctx.set_forkserver_preload([modname]) - proc = ctx.Process(target=f) - proc.start() - proc.join() diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 7922b54..5c83361 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1000,7 +1000,7 @@ class AbstractUnpickleTests(unittest.TestCase): b'0', # POP b'1', # POP_MARK b'2', # DUP - # b'(2', # PyUnpickler doesn't raise + b'(2', b'R', # REDUCE b')R', b'a', # APPEND @@ -1009,7 +1009,7 @@ class AbstractUnpickleTests(unittest.TestCase): b'Nb', b'd', # DICT b'e', # APPENDS - # b'(e', # PyUnpickler raises AttributeError + b'(e', b'ibuiltins\nlist\n', # INST b'l', # LIST b'o', # OBJ @@ -1022,7 +1022,7 @@ class AbstractUnpickleTests(unittest.TestCase): b'NNs', b't', # TUPLE b'u', # SETITEMS - # b'(u', # PyUnpickler doesn't raise + b'(u', b'}(Nu', b'\x81', # NEWOBJ b')\x81', @@ -1033,7 +1033,7 @@ class AbstractUnpickleTests(unittest.TestCase): b'N\x87', b'NN\x87', b'\x90', # ADDITEMS - # b'(\x90', # PyUnpickler raises AttributeError + b'(\x90', b'\x91', # FROZENSET b'\x92', # NEWOBJ_EX b')}\x92', @@ -1046,7 +1046,7 @@ class AbstractUnpickleTests(unittest.TestCase): def test_bad_mark(self): badpickles = [ - # b'N(.', # STOP + b'N(.', # STOP b'N(2', # DUP b'cbuiltins\nlist\n)(R', # REDUCE b'cbuiltins\nlist\n()R', @@ -1081,7 +1081,7 @@ class AbstractUnpickleTests(unittest.TestCase): b'N(\x94', # MEMOIZE ] for p in badpickles: - self.check_unpickling_error(self.bad_mark_errors, p) + self.check_unpickling_error(self.bad_stack_errors, p) def test_truncated_data(self): self.check_unpickling_error(EOFError, b'') @@ -1855,16 +1855,14 @@ class AbstractPickleTests(unittest.TestCase): x.abc = 666 for proto in protocols: with self.subTest(proto=proto): - if 2 <= proto < 4: - self.assertRaises(ValueError, self.dumps, x, proto) - continue s = self.dumps(x, proto) if proto < 1: self.assertIn(b'\nL64206', s) # LONG elif proto < 2: self.assertIn(b'M\xce\xfa', s) # BININT2 + elif proto < 4: + self.assertIn(b'X\x04\x00\x00\x00FACE', s) # BINUNICODE else: - assert proto >= 4 self.assertIn(b'\x8c\x04FACE', s) # SHORT_BINUNICODE self.assertFalse(opcode_in_pickle(pickle.NEWOBJ, s)) self.assertEqual(opcode_in_pickle(pickle.NEWOBJ_EX, s), @@ -2583,11 +2581,6 @@ class AbstractPickleModuleTests(unittest.TestCase): self.assertRaises(pickle.PicklingError, BadPickler().dump, 0) self.assertRaises(pickle.UnpicklingError, BadUnpickler().load) - def test_bad_input(self): - # Test issue4298 - s = bytes([0x58, 0, 0, 0, 0x54]) - self.assertRaises(EOFError, pickle.loads, s) - class AbstractPersistentPicklerTests(unittest.TestCase): diff --git a/Lib/test/pydoc_mod.py b/Lib/test/pydoc_mod.py index cda1c9e..9c1fff5 100644 --- a/Lib/test/pydoc_mod.py +++ b/Lib/test/pydoc_mod.py @@ -12,7 +12,7 @@ class A: pass class B(object): - NO_MEANING = "eggs" + NO_MEANING: str = "eggs" pass class C(object): diff --git a/Lib/test/re_tests.py b/Lib/test/re_tests.py index 8c158f8..a379d33 100755 --- a/Lib/test/re_tests.py +++ b/Lib/test/re_tests.py @@ -106,8 +106,8 @@ tests = [ ('a.*b', 'acc\nccb', FAIL), ('a.{4,5}b', 'acc\nccb', FAIL), ('a.b', 'a\rb', SUCCEED, 'found', 'a\rb'), - ('a.b(?s)', 'a\nb', SUCCEED, 'found', 'a\nb'), - ('a.*(?s)b', 'acc\nccb', SUCCEED, 'found', 'acc\nccb'), + ('(?s)a.b', 'a\nb', SUCCEED, 'found', 'a\nb'), + ('(?s)a.*b', 'acc\nccb', SUCCEED, 'found', 'acc\nccb'), ('(?s)a.{4,5}b', 'acc\nccb', SUCCEED, 'found', 'acc\nccb'), ('(?s)a.b', 'a\nb', SUCCEED, 'found', 'a\nb'), @@ -158,7 +158,7 @@ tests = [ ('(abc', '-', SYNTAX_ERROR), ('a]', 'a]', SUCCEED, 'found', 'a]'), ('a[]]b', 'a]b', SUCCEED, 'found', 'a]b'), - ('a[\]]b', 'a]b', SUCCEED, 'found', 'a]b'), + ('a[\\]]b', 'a]b', SUCCEED, 'found', 'a]b'), ('a[^bc]d', 'aed', SUCCEED, 'found', 'aed'), ('a[^bc]d', 'abd', FAIL), ('a[^-b]c', 'adc', SUCCEED, 'found', 'adc'), @@ -551,7 +551,7 @@ tests = [ # lookbehind: split by : but not if it is escaped by -. ('(?2GB of disk space temporarily. - - network - It is okay to run tests that use external network - resource, e.g. testing SSL support for sockets. - - decimal - Test the decimal module against a large suite that - verifies compliance with standards. - - cpu - Used for certain CPU-heavy tests. - - subprocess Run all tests for the subprocess module. - - urlfetch - It is okay to download files required on testing. - - gui - Run tests that require a running GUI. - -To enable all resources except one, use '-uall,-'. For -example, to run all the tests except for the gui tests, give the -option '-uall,-gui'. - ---matchfile filters tests using a text file, one pattern per line. -Pattern examples: - -- test method: test_stat_attributes -- test class: FileTests -- test identifier: test_os.FileTests.test_stat_attributes -""" - # We import importlib *ASAP* in order to test #15386 import importlib -import argparse -import builtins -import datetime -import faulthandler -import io -import json -import locale -import logging import os -import platform -import random -import re -import shutil -import signal import sys -import sysconfig -import tempfile -import time -import traceback -import types -import unittest -import warnings -from inspect import isabstract - -try: - import threading -except ImportError: - threading = None -try: - import _multiprocessing, multiprocessing.process -except ImportError: - multiprocessing = None - - -# Some times __path__ and __file__ are not absolute (e.g. while running from -# Lib/) and, if we change the CWD to run the tests in a temporary dir, some -# imports might fail. This affects only the modules imported before os.chdir(). -# These modules are searched first in sys.path[0] (so '' -- the CWD) and if -# they are found in the CWD their __file__ and __path__ will be relative (this -# happens before the chdir). All the modules imported after the chdir, are -# not found in the CWD, and since the other paths in sys.path[1:] are absolute -# (site.py absolutize them), the __file__ and __path__ will be absolute too. -# Therefore it is necessary to absolutize manually the __file__ and __path__ of -# the packages to prevent later imports to fail when the CWD is different. -for module in sys.modules.values(): - if hasattr(module, '__path__'): - module.__path__ = [os.path.abspath(path) for path in module.__path__] - if hasattr(module, '__file__'): - module.__file__ = os.path.abspath(module.__file__) - - -# MacOSX (a.k.a. Darwin) has a default stack size that is too small -# for deeply recursive regular expressions. We see this as crashes in -# the Python test suite when running test_re.py and test_sre.py. The -# fix is to set the stack limit to 2048. -# This approach may also be useful for other Unixy platforms that -# suffer from small default stack limits. -if sys.platform == 'darwin': - try: - import resource - except ImportError: - pass - else: - soft, hard = resource.getrlimit(resource.RLIMIT_STACK) - newsoft = min(hard, max(soft, 1024*2048)) - resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard)) - -# Test result constants. -PASSED = 1 -FAILED = 0 -ENV_CHANGED = -1 -SKIPPED = -2 -RESOURCE_DENIED = -3 -INTERRUPTED = -4 -CHILD_ERROR = -5 # error in a child process - -from test import support - -ALL_RESOURCES = ('audio', 'curses', 'largefile', 'network', - 'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui') - -# Other resources excluded from --use=all: -# -# - extralagefile (ex: test_zipfile64): really too slow to be enabled -# "by default" -RESOURCE_NAMES = ALL_RESOURCES + ('extralargefile',) - -# When tests are run from the Python build directory, it is best practice -# to keep the test files in a subfolder. This eases the cleanup of leftover -# files using the "make distclean" command. -if sysconfig.is_python_build(): - TEMPDIR = os.path.join(sysconfig.get_config_var('srcdir'), 'build') -else: - TEMPDIR = tempfile.gettempdir() -TEMPDIR = os.path.abspath(TEMPDIR) - -class _ArgParser(argparse.ArgumentParser): - - def error(self, message): - super().error(message + "\nPass -h or --help for complete help.") - -def _create_parser(): - # Set prog to prevent the uninformative "__main__.py" from displaying in - # error messages when using "python -m test ...". - parser = _ArgParser(prog='regrtest.py', - usage=USAGE, - description=DESCRIPTION, - epilog=EPILOG, - add_help=False, - formatter_class=argparse.RawDescriptionHelpFormatter) - - # Arguments with this clause added to its help are described further in - # the epilog's "Additional option details" section. - more_details = ' See the section at bottom for more details.' - - group = parser.add_argument_group('General options') - # We add help explicitly to control what argument group it renders under. - group.add_argument('-h', '--help', action='help', - help='show this help message and exit') - group.add_argument('--timeout', metavar='TIMEOUT', type=float, - help='dump the traceback and exit if a test takes ' - 'more than TIMEOUT seconds; disabled if TIMEOUT ' - 'is negative or equals to zero') - group.add_argument('--wait', action='store_true', - help='wait for user input, e.g., allow a debugger ' - 'to be attached') - group.add_argument('--slaveargs', metavar='ARGS') - group.add_argument('-S', '--start', metavar='START', - help='the name of the test at which to start.' + - more_details) - - group = parser.add_argument_group('Verbosity') - group.add_argument('-v', '--verbose', action='count', - help='run tests in verbose mode with output to stdout') - group.add_argument('-w', '--verbose2', action='store_true', - help='re-run failed tests in verbose mode') - group.add_argument('-W', '--verbose3', action='store_true', - help='display test output on failure') - group.add_argument('-q', '--quiet', action='store_true', - help='no output unless one or more tests fail') - group.add_argument('-o', '--slowest', action='store_true', dest='print_slow', - help='print the slowest 10 tests') - group.add_argument('--header', action='store_true', - help='print header with interpreter info') - - group = parser.add_argument_group('Selecting tests') - group.add_argument('-r', '--randomize', action='store_true', - help='randomize test execution order.' + more_details) - group.add_argument('--randseed', metavar='SEED', - dest='random_seed', type=int, - help='pass a random seed to reproduce a previous ' - 'random run') - group.add_argument('-f', '--fromfile', metavar='FILE', - help='read names of tests to run from a file.' + - more_details) - group.add_argument('-x', '--exclude', action='store_true', - help='arguments are tests to *exclude*') - group.add_argument('-s', '--single', action='store_true', - help='single step through a set of tests.' + - more_details) - group.add_argument('-m', '--match', metavar='PAT', - dest='match_tests', action='append', - help='match test cases and methods with glob pattern PAT') - group.add_argument('--matchfile', metavar='FILENAME', - dest='match_filename', - help='similar to --match but get patterns from a ' - 'text file, one pattern per line') - group.add_argument('-G', '--failfast', action='store_true', - help='fail as soon as a test fails (only with -v or -W)') - group.add_argument('-u', '--use', metavar='RES1,RES2,...', - action='append', type=resources_list, - help='specify which special resource intensive tests ' - 'to run.' + more_details) - group.add_argument('-M', '--memlimit', metavar='LIMIT', - help='run very large memory-consuming tests.' + - more_details) - group.add_argument('--testdir', metavar='DIR', - type=relative_filename, - help='execute test files in the specified directory ' - '(instead of the Python stdlib test suite)') - - group = parser.add_argument_group('Special runs') - group.add_argument('-l', '--findleaks', action='store_true', - help='if GC is available detect tests that leak memory') - group.add_argument('-L', '--runleaks', action='store_true', - help='run the leaks(1) command just before exit.' + - more_details) - group.add_argument('-R', '--huntrleaks', metavar='RUNCOUNTS', - type=huntrleaks, - help='search for reference leaks (needs debug build, ' - 'very slow).' + more_details) - group.add_argument('-j', '--multiprocess', metavar='PROCESSES', - dest='use_mp', type=int, - help='run PROCESSES processes at once') - group.add_argument('-T', '--coverage', action='store_true', - dest='trace', - help='turn on code coverage tracing using the trace ' - 'module') - group.add_argument('-D', '--coverdir', metavar='DIR', - type=relative_filename, - help='directory where coverage files are put') - group.add_argument('-N', '--nocoverdir', - action='store_const', const=None, dest='coverdir', - help='put coverage files alongside modules') - group.add_argument('-t', '--threshold', metavar='THRESHOLD', - type=int, - help='call gc.set_threshold(THRESHOLD)') - group.add_argument('-n', '--nowindows', action='store_true', - help='suppress error message boxes on Windows') - group.add_argument('-F', '--forever', action='store_true', - help='run the specified tests in a loop, until an ' - 'error happens') - group.add_argument('--list-tests', action='store_true', - help="only write the name of tests that will be run, " - "don't execute them") - group.add_argument('--list-cases', action='store_true', - help='only write the name of test cases that will be run' - ' , don\'t execute them') - group.add_argument('-P', '--pgo', dest='pgo', action='store_true', - help='enable Profile Guided Optimization training') - group.add_argument('--fail-env-changed', action='store_true', - help='if a test file alters the environment, mark ' - 'the test as failed') - - return parser - -def relative_filename(string): - # CWD is replaced with a temporary dir before calling main(), so we - # join it with the saved CWD so it ends up where the user expects. - return os.path.join(support.SAVEDCWD, string) - -def huntrleaks(string): - args = string.split(':') - if len(args) not in (2, 3): - raise argparse.ArgumentTypeError( - 'needs 2 or 3 colon-separated arguments') - nwarmup = int(args[0]) if args[0] else 5 - ntracked = int(args[1]) if args[1] else 4 - fname = args[2] if len(args) > 2 and args[2] else 'reflog.txt' - return nwarmup, ntracked, fname - -def resources_list(string): - u = [x.lower() for x in string.split(',')] - for r in u: - if r == 'all' or r == 'none': - continue - if r[0] == '-': - r = r[1:] - if r not in RESOURCE_NAMES: - raise argparse.ArgumentTypeError('invalid resource: ' + r) - return u - -def _parse_args(args, **kwargs): - # Defaults - ns = argparse.Namespace(testdir=None, verbose=0, quiet=False, - exclude=False, single=False, randomize=False, fromfile=None, - findleaks=False, use_resources=None, trace=False, coverdir='coverage', - runleaks=False, huntrleaks=False, verbose2=False, print_slow=False, - random_seed=None, use_mp=None, verbose3=False, forever=False, - header=False, failfast=False, match_tests=None, match_filename=None, - pgo=False) - for k, v in kwargs.items(): - if not hasattr(ns, k): - raise TypeError('%r is an invalid keyword argument ' - 'for this function' % k) - setattr(ns, k, v) - if ns.use_resources is None: - ns.use_resources = [] - - parser = _create_parser() - # Issue #14191: argparse doesn't support "intermixed" positional and - # optional arguments. Use parse_known_args() as workaround. - ns.args = parser.parse_known_args(args=args, namespace=ns)[1] - for arg in ns.args: - if arg.startswith('-'): - parser.error("unrecognized arguments: %s" % arg) - sys.exit(1) - - if ns.single and ns.fromfile: - parser.error("-s and -f don't go together!") - if ns.use_mp is not None and ns.trace: - parser.error("-T and -j don't go together!") - if ns.use_mp is not None and ns.findleaks: - parser.error("-l and -j don't go together!") - if ns.use_mp is not None and ns.memlimit: - parser.error("-M and -j don't go together!") - if ns.failfast and not (ns.verbose or ns.verbose3): - parser.error("-G/--failfast needs either -v or -W") - - if ns.quiet: - ns.verbose = 0 - if ns.timeout is not None: - if hasattr(faulthandler, 'dump_traceback_later'): - if ns.timeout <= 0: - ns.timeout = None - else: - print("Warning: The timeout option requires " - "faulthandler.dump_traceback_later") - ns.timeout = None - if ns.use_mp is not None: - if ns.use_mp <= 0: - # Use all cores + extras for tests that like to sleep - ns.use_mp = 2 + (os.cpu_count() or 1) - if ns.use_mp == 1: - ns.use_mp = None - if ns.use: - for a in ns.use: - for r in a: - if r == 'all': - ns.use_resources[:] = ALL_RESOURCES - continue - if r == 'none': - del ns.use_resources[:] - continue - remove = False - if r[0] == '-': - remove = True - r = r[1:] - if remove: - if r in ns.use_resources: - ns.use_resources.remove(r) - elif r not in ns.use_resources: - ns.use_resources.append(r) - if ns.random_seed is not None: - ns.randomize = True - if ns.huntrleaks and ns.verbose3: - ns.verbose3 = False - print("WARNING: Disable --verbose3 because it's incompatible with " - "--huntrleaks: see http://bugs.python.org/issue27103", - file=sys.stderr) - if ns.match_filename: - if ns.match_tests is None: - ns.match_tests = [] - filename = os.path.join(support.SAVEDCWD, ns.match_filename) - with open(filename) as fp: - for line in fp: - ns.match_tests.append(line.strip()) - - return ns - - -def run_test_in_subprocess(testname, ns): - """Run the given test in a subprocess with --slaveargs. - - ns is the option Namespace parsed from command-line arguments. regrtest - is invoked in a subprocess with the --slaveargs argument; when the - subprocess exits, its return code, stdout and stderr are returned as a - 3-tuple. - """ - from subprocess import Popen, PIPE - base_cmd = ([sys.executable] + support.args_from_interpreter_flags() + - ['-X', 'faulthandler', '-m', 'test.regrtest']) - # required to spawn a new process with PGO flag on/off - if ns.pgo: - base_cmd = base_cmd + ['--pgo'] - - ns_dict = vars(ns) - slaveargs = (ns_dict, testname) - slaveargs = json.dumps(slaveargs) - - # Running the child from the same working directory as regrtest's original - # invocation ensures that TEMPDIR for the child is the same when - # sysconfig.is_python_build() is true. See issue 15300. - popen = Popen(base_cmd + ['--slaveargs', slaveargs], - stdout=PIPE, stderr=PIPE, - universal_newlines=True, - close_fds=(os.name != 'nt'), - cwd=support.SAVEDCWD) - stdout, stderr = popen.communicate() - retcode = popen.wait() - return retcode, stdout, stderr - - -def setup_tests(ns): - if ns.testdir: - # Prepend test directory to sys.path, so runtest() will be able - # to locate tests - sys.path.insert(0, os.path.abspath(ns.testdir)) - if ns.huntrleaks: - # Avoid false positives due to various caches - # filling slowly with random data: - warm_caches() - if ns.memlimit is not None: - support.set_memlimit(ns.memlimit) - if ns.threshold is not None: - import gc - gc.set_threshold(ns.threshold) - if ns.nowindows: - print('The --nowindows (-n) option is deprecated. ' - 'Use -vv to display assertions in stderr.') - try: - import msvcrt - except ImportError: - pass - else: - msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS| - msvcrt.SEM_NOALIGNMENTFAULTEXCEPT| - msvcrt.SEM_NOGPFAULTERRORBOX| - msvcrt.SEM_NOOPENFILEERRORBOX) - try: - msvcrt.CrtSetReportMode - except AttributeError: - # release build - pass - else: - for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]: - if ns.verbose and ns.verbose >= 2: - msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE) - msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR) - else: - msvcrt.CrtSetReportMode(m, 0) - - - -def main(tests=None, **kwargs): - """Execute a test suite. - - This also parses command-line options and modifies its behavior - accordingly. - - tests -- a list of strings containing test names (optional) - testdir -- the directory in which to look for tests (optional) - - Users other than the Python test suite will certainly want to - specify testdir; if it's omitted, the directory containing the - Python test suite is searched for. - - If the tests argument is omitted, the tests listed on the - command-line will be used. If that's empty, too, then all *.py - files beginning with test_ will be used. - - The other default arguments (verbose, quiet, exclude, - single, randomize, findleaks, use_resources, trace, coverdir, - print_slow, and random_seed) allow programmers calling main() - directly to set the values that would normally be set by flags - on the command line. - """ - start_time = time.monotonic() - - # Display the Python traceback on fatal errors (e.g. segfault) - faulthandler.enable(all_threads=True) - - # Display the Python traceback on SIGALRM or SIGUSR1 signal - signals = [] - if hasattr(signal, 'SIGALRM'): - signals.append(signal.SIGALRM) - if hasattr(signal, 'SIGUSR1'): - signals.append(signal.SIGUSR1) - for signum in signals: - faulthandler.register(signum, chain=True) - - replace_stdout() - - support.record_original_stdout(sys.stdout) - - ns = _parse_args(sys.argv[1:], **kwargs) - - if ns.slaveargs is not None: - ns_dict, testname = json.loads(ns.slaveargs) - ns = types.SimpleNamespace(**ns_dict) - - setup_tests(ns) - - if ns.huntrleaks: - unittest.BaseTestSuite._cleanup = False - - try: - result = runtest(ns, testname, ns.verbose, ns.quiet, - ns.huntrleaks, - output_on_failure=ns.verbose3, - timeout=ns.timeout, failfast=ns.failfast, - match_tests=ns.match_tests, pgo=ns.pgo, - use_resources=ns.use_resources) - except KeyboardInterrupt: - result = INTERRUPTED, '' - except BaseException as e: - traceback.print_exc() - result = CHILD_ERROR, str(e) - - sys.stdout.flush() - print() # Force a newline (just in case) - print(json.dumps(result)) - sys.exit(0) - - setup_tests(ns) - - if ns.wait: - input("Press any key to continue...") - - good = [] - bad = [] - skipped = [] - resource_denieds = [] - environment_changed = [] - interrupted = False - - if ns.findleaks: - try: - import gc - except ImportError: - print('No GC available, disabling findleaks.') - ns.findleaks = False - else: - # Uncomment the line below to report garbage that is not - # freeable by reference counting alone. By default only - # garbage that is not collectable by the GC is reported. - #gc.set_debug(gc.DEBUG_SAVEALL) - found_garbage = [] - - if ns.huntrleaks: - unittest.BaseTestSuite._cleanup = False - - if ns.single: - filename = os.path.join(TEMPDIR, 'pynexttest') - try: - with open(filename, 'r') as fp: - next_test = fp.read().strip() - tests = [next_test] - except OSError: - pass - - if ns.fromfile: - tests = [] - with open(os.path.join(support.SAVEDCWD, ns.fromfile)) as fp: - # regex to match 'test_builtin' in line: - # '0:00:00 [ 4/400] test_builtin -- test_dict took 1 sec' - regex = re.compile(r'\btest_[a-zA-Z0-9_]+\b') - for line in fp: - line = line.split('#', 1)[0] - line = line.strip() - match = regex.search(line) - if match is not None: - tests.append(match.group()) - - # Strip .py extensions. - removepy(ns.args) - removepy(tests) - - stdtests = STDTESTS[:] - nottests = NOTTESTS.copy() - if ns.exclude: - for arg in ns.args: - if arg in stdtests: - stdtests.remove(arg) - nottests.add(arg) - ns.args = [] - - # if testdir is set, then we are not running the python tests suite, so - # don't add default tests to be executed or skipped (pass empty values) - if ns.testdir: - alltests = findtests(ns.testdir, list(), set()) - else: - alltests = findtests(ns.testdir, stdtests, nottests) - - selected = tests or ns.args or alltests - if ns.single: - selected = selected[:1] - try: - next_single_test = alltests[alltests.index(selected[0])+1] - except IndexError: - next_single_test = None - # Remove all the selected tests that precede start if it's set. - if ns.start: - try: - del selected[:selected.index(ns.start)] - except ValueError: - print("Couldn't find starting test (%s), using all tests" % ns.start) - if ns.randomize: - if ns.random_seed is None: - ns.random_seed = random.randrange(10000000) - random.seed(ns.random_seed) - print("Using random seed", ns.random_seed) - random.shuffle(selected) - if ns.trace: - import trace, tempfile - tracer = trace.Trace(trace=False, count=True) - - test_times = [] - support.verbose = ns.verbose # Tell tests to be moderately quiet - support.use_resources = ns.use_resources - save_modules = sys.modules.keys() - - def accumulate_result(test, result): - ok, test_time = result - if ok not in (CHILD_ERROR, INTERRUPTED): - test_times.append((test_time, test)) - if ok == PASSED: - good.append(test) - elif ok in (FAILED, CHILD_ERROR): - bad.append(test) - elif ok == ENV_CHANGED: - environment_changed.append(test) - elif ok == SKIPPED: - skipped.append(test) - elif ok == RESOURCE_DENIED: - skipped.append(test) - resource_denieds.append(test) - elif ok != INTERRUPTED: - raise ValueError("invalid test result: %r" % ok) - - if ns.list_tests: - for name in selected: - print(name) - sys.exit(0) - - if ns.list_cases: - list_cases(ns, selected) - sys.exit(0) - - if ns.forever: - def test_forever(tests=list(selected)): - while True: - for test in tests: - yield test - if bad: - return - if ns.fail_env_changed and environment_changed: - return - tests = test_forever() - test_count = '' - test_count_width = 3 - else: - tests = iter(selected) - test_count = '/{}'.format(len(selected)) - test_count_width = len(test_count) - 1 - - # For a partial run, we do not need to clutter the output. - if (ns.verbose or ns.header or - not (ns.pgo or ns.quiet or ns.single or tests or ns.args)): - # Print basic platform information - print("==", platform.python_implementation(), *sys.version.split()) - print("== ", platform.platform(aliased=True), - "%s-endian" % sys.byteorder) - print("== ", "hash algorithm:", sys.hash_info.algorithm, - "64bit" if sys.maxsize > 2**32 else "32bit") - print("== ", os.getcwd()) - print("Testing with flags:", sys.flags) - - def display_progress(test_index, test): - if ns.quiet: - return - - # "[ 51/405/1] test_tcl passed" - line = "{0:{1}}{2}".format(test_index, test_count_width, test_count) - if bad and not ns.pgo: - line = "{0}/{1}".format(line, len(bad)) - line = "[{0}] {1}".format(line, test) - - # add the system load prefix: "load avg: 1.80 " - if hasattr(os, 'getloadavg'): - load_avg_1min = os.getloadavg()[0] - line = "load avg: {0:.2f} {1}".format(load_avg_1min, line) - - # add the timestamp prefix: "0:01:05 " - test_time = time.monotonic() - start_time - test_time = datetime.timedelta(seconds=int(test_time)) - line = "{0} {1}".format(test_time, line) - print(line, flush=True) - - if ns.use_mp: - try: - from threading import Thread - except ImportError: - print("Multiprocess option requires thread support") - sys.exit(2) - from queue import Queue - debug_output_pat = re.compile(r"\[\d+ refs, \d+ blocks\]$") - output = Queue() - pending = MultiprocessTests(tests) - def work(): - # A worker thread. - try: - while True: - try: - test = next(pending) - except StopIteration: - output.put((None, None, None, None)) - return - retcode, stdout, stderr = run_test_in_subprocess(test, ns) - # Strip last refcount output line if it exists, since it - # comes from the shutdown of the interpreter in the subcommand. - stderr = debug_output_pat.sub("", stderr) - stdout, _, result = stdout.strip().rpartition("\n") - if retcode != 0: - result = (CHILD_ERROR, "Exit code %s" % retcode) - output.put((test, stdout.rstrip(), stderr.rstrip(), result)) - continue - if not result: - output.put((None, None, None, None)) - return - result = json.loads(result) - output.put((test, stdout.rstrip(), stderr.rstrip(), result)) - except BaseException: - output.put((None, None, None, None)) - raise - workers = [Thread(target=work) for i in range(ns.use_mp)] - for worker in workers: - worker.start() - finished = 0 - test_index = 1 - try: - while finished < ns.use_mp: - test, stdout, stderr, result = output.get() - if test is None: - finished += 1 - continue - accumulate_result(test, result) - display_progress(test_index, test) - if stdout: - print(stdout) - if stderr and not ns.pgo: - print(stderr, file=sys.stderr) - sys.stdout.flush() - sys.stderr.flush() - if result[0] == INTERRUPTED: - raise KeyboardInterrupt - test_index += 1 - except KeyboardInterrupt: - interrupted = True - pending.interrupted = True - for worker in workers: - worker.join() - else: - for test_index, test in enumerate(tests, 1): - display_progress(test_index, test) - - def runtest_accumulate(): - result = runtest(ns, test, ns.verbose, ns.quiet, - ns.huntrleaks, - output_on_failure=ns.verbose3, - timeout=ns.timeout, failfast=ns.failfast, - match_tests=ns.match_tests, pgo=ns.pgo) - accumulate_result(test, result) - - if ns.trace: - # If we're tracing code coverage, then we don't exit with status - # if on a false return value from main. - tracer.runctx('runtest_accumulate()', - globals=globals(), locals=vars()) - else: - try: - runtest_accumulate() - except KeyboardInterrupt: - interrupted = True - break - if ns.findleaks: - gc.collect() - if gc.garbage: - print("Warning: test created", len(gc.garbage), end=' ') - print("uncollectable object(s).") - # move the uncollectable objects somewhere so we don't see - # them again - found_garbage.extend(gc.garbage) - del gc.garbage[:] - # Unload the newly imported modules (best effort finalization) - for module in sys.modules.keys(): - if module not in save_modules and module.startswith("test."): - support.unload(module) - - if interrupted and not ns.pgo: - # print a newline after ^C - print() - print("Test suite interrupted by signal SIGINT.") - omitted = set(selected) - set(good) - set(bad) - set(skipped) - print(count(len(omitted), "test"), "omitted:") - printlist(omitted) - if good and not ns.quiet and not ns.pgo: - if not bad and not skipped and not interrupted and len(good) > 1: - print("All", end=' ') - print(count(len(good), "test"), "OK.") - if ns.print_slow: - test_times.sort(reverse=True) - print("10 slowest tests:") - for test_time, test in test_times[:10]: - print("- %s: %.1fs" % (test, test_time)) - if bad and not ns.pgo: - print(count(len(bad), "test"), "failed:") - printlist(bad) - if environment_changed and not ns.pgo: - print("{} altered the execution environment:".format( - count(len(environment_changed), "test"))) - printlist(environment_changed) - if skipped and not ns.quiet and not ns.pgo: - print(count(len(skipped), "test"), "skipped:") - printlist(skipped) - - if ns.verbose2 and bad: - print("Re-running failed tests in verbose mode") - for test in bad[:]: - if not ns.pgo: - print("Re-running test %r in verbose mode" % test) - sys.stdout.flush() - try: - ns.verbose = True - ok = runtest(ns, test, True, ns.quiet, ns.huntrleaks, - timeout=ns.timeout, pgo=ns.pgo) - except KeyboardInterrupt: - # print a newline separate from the ^C - print() - break - else: - if ok[0] in {PASSED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED}: - bad.remove(test) - else: - if bad: - print(count(len(bad), 'test'), "failed again:") - printlist(bad) - - if ns.single: - if next_single_test: - with open(filename, 'w') as fp: - fp.write(next_single_test + '\n') - else: - os.unlink(filename) - - if ns.trace: - r = tracer.results() - r.write_results(show_missing=True, summary=True, coverdir=ns.coverdir) +from test.libregrtest import main - if ns.runleaks: - os.system("leaks %d" % os.getpid()) - if bad: - result = "FAILURE" - elif interrupted: - result = "INTERRUPTED" - elif ns.fail_env_changed and environment_changed: - result = "ENV CHANGED" - else: - result = "SUCCESS" - print("Tests result: %s" % result) +# Alias for backward compatibility (just in case) +main_in_temp_cwd = main - if bad: - sys.exit(2) - if interrupted: - sys.exit(130) - if ns.fail_env_changed and environment_changed: - sys.exit(3) - sys.exit(0) +def _main(): + global __file__ -# small set of tests to determine if we have a basically functioning interpreter -# (i.e. if any of these fail, then anything else is likely to follow) -STDTESTS = [ - 'test_grammar', - 'test_opcodes', - 'test_dict', - 'test_builtin', - 'test_exceptions', - 'test_types', - 'test_unittest', - 'test_doctest', - 'test_doctest2', - 'test_support' -] - -# set of tests that we don't want to be executed when using regrtest -NOTTESTS = set() - -def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS): - """Return a list of all applicable test modules.""" - testdir = findtestdir(testdir) - names = os.listdir(testdir) - tests = [] - others = set(stdtests) | nottests - for name in names: - mod, ext = os.path.splitext(name) - if mod[:5] == "test_" and ext in (".py", "") and mod not in others: - tests.append(mod) - return stdtests + sorted(tests) - -# We do not use a generator so multiple threads can call next(). -class MultiprocessTests(object): - - """A thread-safe iterator over tests for multiprocess mode.""" - - def __init__(self, tests): - self.interrupted = False - self.lock = threading.Lock() - self.tests = tests - - def __iter__(self): - return self - - def __next__(self): - with self.lock: - if self.interrupted: - raise StopIteration('tests interrupted') - return next(self.tests) - -def replace_stdout(): - """Set stdout encoder error handler to backslashreplace (as stderr error - handler) to avoid UnicodeEncodeError when printing a traceback""" - import atexit - - stdout = sys.stdout - sys.stdout = open(stdout.fileno(), 'w', - encoding=stdout.encoding, - errors="backslashreplace", - closefd=False, - newline='\n') - - def restore_stdout(): - sys.stdout.close() - sys.stdout = stdout - atexit.register(restore_stdout) - -def runtest(ns, test, verbose, quiet, - huntrleaks=False, use_resources=None, - output_on_failure=False, failfast=False, match_tests=None, - timeout=None, *, pgo=False): - """Run a single test. - - test -- the name of the test - verbose -- if true, print more messages - quiet -- if true, don't print 'skipped' messages (probably redundant) - huntrleaks -- run multiple times to test for leaks; requires a debug - build; a triple corresponding to -R's three arguments - use_resources -- list of extra resources to use - output_on_failure -- if true, display test output on failure - timeout -- dump the traceback and exit if a test takes more than - timeout seconds - failfast, match_tests -- See regrtest command-line flags for these. - pgo -- if true, do not print unnecessary info when running the test - for Profile Guided Optimization build - - Returns the tuple result, test_time, where result is one of the constants: - INTERRUPTED KeyboardInterrupt when run under -j - RESOURCE_DENIED test skipped because resource denied - SKIPPED test skipped for some other reason - ENV_CHANGED test failed because it changed the execution environment - FAILED test failed - PASSED test passed - """ - if use_resources is not None: - support.use_resources = use_resources - use_timeout = (timeout is not None) - if use_timeout: - faulthandler.dump_traceback_later(timeout, exit=True) - try: - support.match_tests = match_tests - if failfast: - support.failfast = True - if output_on_failure: - support.verbose = True - - # Reuse the same instance to all calls to runtest(). Some - # tests keep a reference to sys.stdout or sys.stderr - # (eg. test_argparse). - if runtest.stringio is None: - stream = io.StringIO() - runtest.stringio = stream - else: - stream = runtest.stringio - stream.seek(0) - stream.truncate() - - orig_stdout = sys.stdout - orig_stderr = sys.stderr - try: - sys.stdout = stream - sys.stderr = stream - result = runtest_inner(ns, test, verbose, quiet, huntrleaks, - display_failure=False, - pgo=pgo) - if result[0] != PASSED and not pgo: - output = stream.getvalue() - orig_stderr.write(output) - orig_stderr.flush() - finally: - sys.stdout = orig_stdout - sys.stderr = orig_stderr - else: - support.verbose = verbose # Tell tests to be moderately quiet - result = runtest_inner(ns, test, verbose, quiet, huntrleaks, - display_failure=not verbose, - pgo=pgo) - return result - finally: - if use_timeout: - faulthandler.cancel_dump_traceback_later() - cleanup_test_droppings(test, verbose) -runtest.stringio = None - -# Unit tests are supposed to leave the execution environment unchanged -# once they complete. But sometimes tests have bugs, especially when -# tests fail, and the changes to environment go on to mess up other -# tests. This can cause issues with buildbot stability, since tests -# are run in random order and so problems may appear to come and go. -# There are a few things we can save and restore to mitigate this, and -# the following context manager handles this task. - -class saved_test_environment: - """Save bits of the test environment and restore them at block exit. - - with saved_test_environment(testname, verbose, quiet): - #stuff - - Unless quiet is True, a warning is printed to stderr if any of - the saved items was changed by the test. The attribute 'changed' - is initially False, but is set to True if a change is detected. - - If verbose is more than 1, the before and after state of changed - items is also printed. - """ - - changed = False - - def __init__(self, testname, verbose=0, quiet=False, *, pgo=False): - self.testname = testname - self.verbose = verbose - self.quiet = quiet - self.pgo = pgo - - # To add things to save and restore, add a name XXX to the resources list - # and add corresponding get_XXX/restore_XXX functions. get_XXX should - # return the value to be saved and compared against a second call to the - # get function when test execution completes. restore_XXX should accept - # the saved value and restore the resource using it. It will be called if - # and only if a change in the value is detected. - # - # Note: XXX will have any '.' replaced with '_' characters when determining - # the corresponding method names. - - resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr', - 'os.environ', 'sys.path', 'sys.path_hooks', '__import__', - 'asyncore.socket_map', - 'logging._handlers', 'logging._handlerList', 'sys.gettrace', - 'sys.warnoptions', - # multiprocessing.process._cleanup() may release ref - # to a thread, so check processes first. - 'multiprocessing.process._dangling', 'threading._dangling', - 'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES', - 'files', 'locale', 'warnings.showwarning', - 'shutil_archive_formats', 'shutil_unpack_formats', - ) - - def get_sys_argv(self): - return id(sys.argv), sys.argv, sys.argv[:] - def restore_sys_argv(self, saved_argv): - sys.argv = saved_argv[1] - sys.argv[:] = saved_argv[2] - - def get_cwd(self): - return os.getcwd() - def restore_cwd(self, saved_cwd): - os.chdir(saved_cwd) - - def get_sys_stdout(self): - return sys.stdout - def restore_sys_stdout(self, saved_stdout): - sys.stdout = saved_stdout - - def get_sys_stderr(self): - return sys.stderr - def restore_sys_stderr(self, saved_stderr): - sys.stderr = saved_stderr - - def get_sys_stdin(self): - return sys.stdin - def restore_sys_stdin(self, saved_stdin): - sys.stdin = saved_stdin - - def get_os_environ(self): - return id(os.environ), os.environ, dict(os.environ) - def restore_os_environ(self, saved_environ): - os.environ = saved_environ[1] - os.environ.clear() - os.environ.update(saved_environ[2]) - - def get_sys_path(self): - return id(sys.path), sys.path, sys.path[:] - def restore_sys_path(self, saved_path): - sys.path = saved_path[1] - sys.path[:] = saved_path[2] - - def get_sys_path_hooks(self): - return id(sys.path_hooks), sys.path_hooks, sys.path_hooks[:] - def restore_sys_path_hooks(self, saved_hooks): - sys.path_hooks = saved_hooks[1] - sys.path_hooks[:] = saved_hooks[2] - - def get_sys_gettrace(self): - return sys.gettrace() - def restore_sys_gettrace(self, trace_fxn): - sys.settrace(trace_fxn) - - def get___import__(self): - return builtins.__import__ - def restore___import__(self, import_): - builtins.__import__ = import_ - - def get_asyncore_socket_map(self): - asyncore = sys.modules.get('asyncore') - # XXX Making a copy keeps objects alive until __exit__ gets called. - return asyncore and asyncore.socket_map.copy() or {} - def restore_asyncore_socket_map(self, saved_map): - asyncore = sys.modules.get('asyncore') - if asyncore is not None: - asyncore.close_all(ignore_all=True) - asyncore.socket_map.update(saved_map) - - def get_shutil_archive_formats(self): - # we could call get_archives_formats() but that only returns the - # registry keys; we want to check the values too (the functions that - # are registered) - return shutil._ARCHIVE_FORMATS, shutil._ARCHIVE_FORMATS.copy() - def restore_shutil_archive_formats(self, saved): - shutil._ARCHIVE_FORMATS = saved[0] - shutil._ARCHIVE_FORMATS.clear() - shutil._ARCHIVE_FORMATS.update(saved[1]) - - def get_shutil_unpack_formats(self): - return shutil._UNPACK_FORMATS, shutil._UNPACK_FORMATS.copy() - def restore_shutil_unpack_formats(self, saved): - shutil._UNPACK_FORMATS = saved[0] - shutil._UNPACK_FORMATS.clear() - shutil._UNPACK_FORMATS.update(saved[1]) - - def get_logging__handlers(self): - # _handlers is a WeakValueDictionary - return id(logging._handlers), logging._handlers, logging._handlers.copy() - def restore_logging__handlers(self, saved_handlers): - # Can't easily revert the logging state - pass - - def get_logging__handlerList(self): - # _handlerList is a list of weakrefs to handlers - return id(logging._handlerList), logging._handlerList, logging._handlerList[:] - def restore_logging__handlerList(self, saved_handlerList): - # Can't easily revert the logging state - pass - - def get_sys_warnoptions(self): - return id(sys.warnoptions), sys.warnoptions, sys.warnoptions[:] - def restore_sys_warnoptions(self, saved_options): - sys.warnoptions = saved_options[1] - sys.warnoptions[:] = saved_options[2] - - # Controlling dangling references to Thread objects can make it easier - # to track reference leaks. - def get_threading__dangling(self): - if not threading: - return None - # This copies the weakrefs without making any strong reference - return threading._dangling.copy() - def restore_threading__dangling(self, saved): - if not threading: - return - threading._dangling.clear() - threading._dangling.update(saved) - - # Same for Process objects - def get_multiprocessing_process__dangling(self): - if not multiprocessing: - return None - # Unjoined process objects can survive after process exits - multiprocessing.process._cleanup() - # This copies the weakrefs without making any strong reference - return multiprocessing.process._dangling.copy() - def restore_multiprocessing_process__dangling(self, saved): - if not multiprocessing: - return - multiprocessing.process._dangling.clear() - multiprocessing.process._dangling.update(saved) - - def get_sysconfig__CONFIG_VARS(self): - # make sure the dict is initialized - sysconfig.get_config_var('prefix') - return (id(sysconfig._CONFIG_VARS), sysconfig._CONFIG_VARS, - dict(sysconfig._CONFIG_VARS)) - def restore_sysconfig__CONFIG_VARS(self, saved): - sysconfig._CONFIG_VARS = saved[1] - sysconfig._CONFIG_VARS.clear() - sysconfig._CONFIG_VARS.update(saved[2]) - - def get_sysconfig__INSTALL_SCHEMES(self): - return (id(sysconfig._INSTALL_SCHEMES), sysconfig._INSTALL_SCHEMES, - sysconfig._INSTALL_SCHEMES.copy()) - def restore_sysconfig__INSTALL_SCHEMES(self, saved): - sysconfig._INSTALL_SCHEMES = saved[1] - sysconfig._INSTALL_SCHEMES.clear() - sysconfig._INSTALL_SCHEMES.update(saved[2]) - - def get_files(self): - return sorted(fn + ('/' if os.path.isdir(fn) else '') - for fn in os.listdir()) - def restore_files(self, saved_value): - fn = support.TESTFN - if fn not in saved_value and (fn + '/') not in saved_value: - if os.path.isfile(fn): - support.unlink(fn) - elif os.path.isdir(fn): - support.rmtree(fn) - - _lc = [getattr(locale, lc) for lc in dir(locale) - if lc.startswith('LC_')] - def get_locale(self): - pairings = [] - for lc in self._lc: - try: - pairings.append((lc, locale.setlocale(lc, None))) - except (TypeError, ValueError): - continue - return pairings - def restore_locale(self, saved): - for lc, setting in saved: - locale.setlocale(lc, setting) - - def get_warnings_showwarning(self): - return warnings.showwarning - def restore_warnings_showwarning(self, fxn): - warnings.showwarning = fxn - - def resource_info(self): - for name in self.resources: - method_suffix = name.replace('.', '_') - get_name = 'get_' + method_suffix - restore_name = 'restore_' + method_suffix - yield name, getattr(self, get_name), getattr(self, restore_name) - - def __enter__(self): - self.saved_values = dict((name, get()) for name, get, restore - in self.resource_info()) - return self - - def __exit__(self, exc_type, exc_val, exc_tb): - saved_values = self.saved_values - del self.saved_values - support.gc_collect() # Some resources use weak references - for name, get, restore in self.resource_info(): - current = get() - original = saved_values.pop(name) - # Check for changes to the resource's value - if current != original: - self.changed = True - restore(original) - if not self.quiet and not self.pgo: - print("Warning -- {} was modified by {}".format( - name, self.testname), - file=sys.stderr) - print(" Before: {}\n After: {} ".format( - original, current), - file=sys.stderr) - return False - - -def runtest_inner(ns, test, verbose, quiet, - huntrleaks=False, display_failure=True, pgo=False): - support.unload(test) - - test_time = 0.0 - refleak = False # True if the test leaked references. - try: - abstest = get_abs_module(ns, test) - clear_caches() - with saved_test_environment(test, verbose, quiet, pgo=pgo) as environment: - start_time = time.time() - the_module = importlib.import_module(abstest) - # If the test has a test_main, that will run the appropriate - # tests. If not, use normal unittest test loading. - test_runner = getattr(the_module, "test_main", None) - if test_runner is None: - def test_runner(): - loader = unittest.TestLoader() - tests = loader.loadTestsFromModule(the_module) - for error in loader.errors: - print(error, file=sys.stderr) - if loader.errors: - raise Exception("errors while loading tests") - support.run_unittest(tests) - test_runner() - if huntrleaks: - refleak = dash_R(the_module, test, test_runner, huntrleaks) - test_time = time.time() - start_time - except support.ResourceDenied as msg: - if not quiet and not pgo: - print(test, "skipped --", msg) - sys.stdout.flush() - return RESOURCE_DENIED, test_time - except unittest.SkipTest as msg: - if not quiet and not pgo: - print(test, "skipped --", msg) - sys.stdout.flush() - return SKIPPED, test_time - except KeyboardInterrupt: - raise - except support.TestFailed as msg: - if not pgo: - if display_failure: - print("test", test, "failed --", msg, file=sys.stderr) - else: - print("test", test, "failed", file=sys.stderr) - sys.stderr.flush() - return FAILED, test_time - except: - msg = traceback.format_exc() - if not pgo: - print("test", test, "crashed --", msg, file=sys.stderr) - sys.stderr.flush() - return FAILED, test_time - else: - if refleak: - return FAILED, test_time - if environment.changed: - return ENV_CHANGED, test_time - return PASSED, test_time - -def cleanup_test_droppings(testname, verbose): - import shutil - import stat - import gc - - # First kill any dangling references to open files etc. - # This can also issue some ResourceWarnings which would otherwise get - # triggered during the following test run, and possibly produce failures. - gc.collect() - - # Try to clean up junk commonly left behind. While tests shouldn't leave - # any files or directories behind, when a test fails that can be tedious - # for it to arrange. The consequences can be especially nasty on Windows, - # since if a test leaves a file open, it cannot be deleted by name (while - # there's nothing we can do about that here either, we can display the - # name of the offending test, which is a real help). - for name in (support.TESTFN, - "db_home", - ): - if not os.path.exists(name): - continue - - if os.path.isdir(name): - kind, nuker = "directory", shutil.rmtree - elif os.path.isfile(name): - kind, nuker = "file", os.unlink - else: - raise SystemError("os.path says %r exists but is neither " - "directory nor file" % name) - - if verbose: - print("%r left behind %s %r" % (testname, kind, name)) - try: - # if we have chmod, fix possible permissions problems - # that might prevent cleanup - if (hasattr(os, 'chmod')): - os.chmod(name, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) - nuker(name) - except Exception as msg: - print(("%r left behind %s %r and it couldn't be " - "removed: %s" % (testname, kind, name, msg)), file=sys.stderr) - -def dash_R(the_module, test, indirect_test, huntrleaks): - """Run a test multiple times, looking for reference leaks. - - Returns: - False if the test didn't leak references; True if we detected refleaks. - """ - # This code is hackish and inelegant, but it seems to do the job. - import copyreg - import collections.abc - - if not hasattr(sys, 'gettotalrefcount'): - raise Exception("Tracking reference leaks requires a debug build " - "of Python") - - # Save current values for dash_R_cleanup() to restore. - fs = warnings.filters[:] - ps = copyreg.dispatch_table.copy() - pic = sys.path_importer_cache.copy() - try: - import zipimport - except ImportError: - zdc = None # Run unmodified on platforms without zipimport support - else: - zdc = zipimport._zip_directory_cache.copy() - abcs = {} - for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]: - if not isabstract(abc): - continue - for obj in abc.__subclasses__() + [abc]: - abcs[obj] = obj._abc_registry.copy() - - nwarmup, ntracked, fname = huntrleaks - fname = os.path.join(support.SAVEDCWD, fname) - repcount = nwarmup + ntracked - rc_deltas = [0] * repcount - alloc_deltas = [0] * repcount - - print("beginning", repcount, "repetitions", file=sys.stderr) - print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr) - sys.stderr.flush() - for i in range(repcount): - indirect_test() - alloc_after, rc_after = dash_R_cleanup(fs, ps, pic, zdc, abcs) - sys.stderr.write('.') - sys.stderr.flush() - if i >= nwarmup: - rc_deltas[i] = rc_after - rc_before - alloc_deltas[i] = alloc_after - alloc_before - alloc_before, rc_before = alloc_after, rc_after - print(file=sys.stderr) - - # These checkers return False on success, True on failure - def check_rc_deltas(deltas): - # Checker for reference counters and memomry blocks. - # - # bpo-30776: Try to ignore false positives: - # - # [3, 0, 0] - # [0, 1, 0] - # [8, -8, 1] - # - # Expected leaks: - # - # [5, 5, 6] - # [10, 1, 1] - return all(delta >= 1 for delta in deltas) - - failed = False - for deltas, item_name, checker in [ - (rc_deltas, 'references', check_rc_deltas), - (alloc_deltas, 'memory blocks', check_rc_deltas) - ]: - # ignore warmup runs - deltas = deltas[nwarmup:] - if checker(deltas): - msg = '%s leaked %s %s, sum=%s' % ( - test, deltas, item_name, sum(deltas)) - print(msg, file=sys.stderr) - sys.stderr.flush() - with open(fname, "a") as refrep: - print(msg, file=refrep) - refrep.flush() - failed = True - return failed - -def dash_R_cleanup(fs, ps, pic, zdc, abcs): - import gc, copyreg - import collections.abc - from weakref import WeakSet - - # Restore some original values. - warnings.filters[:] = fs - copyreg.dispatch_table.clear() - copyreg.dispatch_table.update(ps) - sys.path_importer_cache.clear() - sys.path_importer_cache.update(pic) - try: - import zipimport - except ImportError: - pass # Run unmodified on platforms without zipimport support - else: - zipimport._zip_directory_cache.clear() - zipimport._zip_directory_cache.update(zdc) - - # clear type cache - sys._clear_type_cache() - - # Clear ABC registries, restoring previously saved ABC registries. - abs_classes = [getattr(collections.abc, a) for a in collections.abc.__all__] - abs_classes = filter(isabstract, abs_classes) - if 'typing' in sys.modules: - t = sys.modules['typing'] - # these classes require special treatment because they do not appear - # in direct subclasses on collections.abc classes - abs_classes = list(abs_classes) + [t.ChainMap, t.Counter, t.DefaultDict] - for abc in abs_classes: - for obj in abc.__subclasses__() + [abc]: - obj._abc_registry = abcs.get(obj, WeakSet()).copy() - obj._abc_cache.clear() - obj._abc_negative_cache.clear() - - clear_caches() - - # Collect cyclic trash and read memory statistics immediately after. - func1 = sys.getallocatedblocks - func2 = sys.gettotalrefcount - gc.collect() - return func1(), func2() - -def clear_caches(): - import gc - - # Clear the warnings registry, so they can be displayed again - for mod in sys.modules.values(): - if hasattr(mod, '__warningregistry__'): - del mod.__warningregistry__ - - # Flush standard output, so that buffered data is sent to the OS and - # associated Python objects are reclaimed. - for stream in (sys.stdout, sys.stderr, sys.__stdout__, sys.__stderr__): - if stream is not None: - stream.flush() - - # Clear assorted module caches. - # Don't worry about resetting the cache if the module is not loaded - try: - distutils_dir_util = sys.modules['distutils.dir_util'] - except KeyError: - pass - else: - distutils_dir_util._path_created.clear() - - re.purge() - - try: - _strptime = sys.modules['_strptime'] - except KeyError: - pass - else: - _strptime._regex_cache.clear() - - try: - urllib_parse = sys.modules['urllib.parse'] - except KeyError: - pass - else: - urllib_parse.clear_cache() - - try: - urllib_request = sys.modules['urllib.request'] - except KeyError: - pass - else: - urllib_request.urlcleanup() - - try: - linecache = sys.modules['linecache'] - except KeyError: - pass - else: - linecache.clearcache() - - try: - mimetypes = sys.modules['mimetypes'] - except KeyError: - pass - else: - mimetypes._default_mime_types() - - try: - filecmp = sys.modules['filecmp'] - except KeyError: - pass - else: - filecmp._cache.clear() - - try: - struct = sys.modules['struct'] - except KeyError: - pass - else: - struct._clearcache() - - try: - doctest = sys.modules['doctest'] - except KeyError: - pass - else: - doctest.master = None - - try: - ctypes = sys.modules['ctypes'] - except KeyError: - pass - else: - ctypes._reset_cache() - - try: - typing = sys.modules['typing'] - except KeyError: - pass - else: - for f in typing._cleanups: - f() - - gc.collect() - -def warm_caches(): - # char cache - s = bytes(range(256)) - for i in range(256): - s[i:i+1] - # unicode cache - x = [chr(i) for i in range(256)] - # int cache - x = list(range(-5, 257)) - -def findtestdir(path=None): - return path or os.path.dirname(__file__) or os.curdir - -def removepy(names): - if not names: - return - for idx, name in enumerate(names): - basename, ext = os.path.splitext(name) - if ext == '.py': - names[idx] = basename - -def count(n, word): - if n == 1: - return "%d %s" % (n, word) - else: - return "%d %ss" % (n, word) - -def printlist(x, width=70, indent=4, file=None): - """Print the elements of iterable x to stdout. - - Optional arg width (default 70) is the maximum line length. - Optional arg indent (default 4) is the number of blanks with which to - begin each line. - """ - - from textwrap import fill - blanks = ' ' * indent - # Print the sorted list: 'x' may be a '--random' list or a set() - print(fill(' '.join(str(elt) for elt in sorted(x)), width, - initial_indent=blanks, subsequent_indent=blanks), file=file) - - -def get_abs_module(ns, test): - if test.startswith('test.') or ns.testdir: - return test - else: - # Always import it from the test package - return 'test.' + test - - -def _list_cases(suite): - for test in suite: - if isinstance(test, unittest.loader._FailedTest): - continue - if isinstance(test, unittest.TestSuite): - _list_cases(test) - elif isinstance(test, unittest.TestCase): - if support._match_test(test): - print(test.id()) - - -def list_cases(ns, selected): - support.verbose = False - support.match_tests = ns.match_tests - - skipped = [] - for test in selected: - abstest = get_abs_module(ns, test) - try: - suite = unittest.defaultTestLoader.loadTestsFromName(abstest) - _list_cases(suite) - except unittest.SkipTest: - skipped.append(test) - - if skipped: - print(file=sys.stderr) - print(count(len(skipped), "test"), "skipped:", file=sys.stderr) - printlist(skipped, file=sys.stderr) - - -def main_in_temp_cwd(): - """Run main() in a temporary working directory.""" - if sysconfig.is_python_build(): - try: - os.mkdir(TEMPDIR) - except FileExistsError: - pass - - # Define a writable temp dir that will be used as cwd while running - # the tests. The name of the dir includes the pid to allow parallel - # testing (see the -j option). - test_cwd = 'test_python_{}'.format(os.getpid()) - test_cwd = os.path.join(TEMPDIR, test_cwd) - - # Run the tests in a context manager that temporarily changes the CWD to a - # temporary and writable directory. If it's not possible to create or - # change the CWD, the original CWD will be used. The original CWD is - # available from support.SAVEDCWD. - with support.temp_cwd(test_cwd, quiet=True): - main() - - -if __name__ == '__main__': # Remove regrtest.py's own directory from the module search path. Despite # the elimination of implicit relative imports, this is still needed to # ensure that submodules of the test package do not inappropriately appear # as top-level modules even when people (or buildbots!) invoke regrtest.py # directly instead of using the -m switch mydir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0]))) - i = len(sys.path) + i = len(sys.path) - 1 while i >= 0: - i -= 1 if os.path.abspath(os.path.normpath(sys.path[i])) == mydir: del sys.path[i] + else: + i -= 1 # findtestdir() gets the dirname out of __file__, so we have to make it # absolute before changing the working directory. @@ -1830,4 +43,8 @@ if __name__ == '__main__': # sanity check assert __file__ == os.path.abspath(sys.argv[0]) - main_in_temp_cwd() + main() + + +if __name__ == '__main__': + _main() diff --git a/Lib/test/seq_tests.py b/Lib/test/seq_tests.py index 72f4845..1e7a6f6 100644 --- a/Lib/test/seq_tests.py +++ b/Lib/test/seq_tests.py @@ -318,7 +318,6 @@ class CommonTest(unittest.TestCase): self.assertEqual(id(s), id(s*1)) def test_bigrepeat(self): - import sys if sys.maxsize <= 2147483647: x = self.type2test([0]) x *= 2**16 diff --git a/Lib/test/signalinterproctester.py b/Lib/test/signalinterproctester.py new file mode 100644 index 0000000..d3ae170 --- /dev/null +++ b/Lib/test/signalinterproctester.py @@ -0,0 +1,84 @@ +import os +import signal +import subprocess +import sys +import time +import unittest + + +class SIGUSR1Exception(Exception): + pass + + +class InterProcessSignalTests(unittest.TestCase): + def setUp(self): + self.got_signals = {'SIGHUP': 0, 'SIGUSR1': 0, 'SIGALRM': 0} + + def sighup_handler(self, signum, frame): + self.got_signals['SIGHUP'] += 1 + + def sigusr1_handler(self, signum, frame): + self.got_signals['SIGUSR1'] += 1 + raise SIGUSR1Exception + + def wait_signal(self, child, signame, exc_class=None): + try: + if child is not None: + # This wait should be interrupted by exc_class + # (if set) + child.wait() + + timeout = 10.0 + deadline = time.monotonic() + timeout + + while time.monotonic() < deadline: + if self.got_signals[signame]: + return + signal.pause() + except BaseException as exc: + if exc_class is not None and isinstance(exc, exc_class): + # got the expected exception + return + raise + + self.fail('signal %s not received after %s seconds' + % (signame, timeout)) + + def subprocess_send_signal(self, pid, signame): + code = 'import os, signal; os.kill(%s, signal.%s)' % (pid, signame) + args = [sys.executable, '-I', '-c', code] + return subprocess.Popen(args) + + def test_interprocess_signal(self): + # Install handlers. This function runs in a sub-process, so we + # don't worry about re-setting the default handlers. + signal.signal(signal.SIGHUP, self.sighup_handler) + signal.signal(signal.SIGUSR1, self.sigusr1_handler) + signal.signal(signal.SIGUSR2, signal.SIG_IGN) + signal.signal(signal.SIGALRM, signal.default_int_handler) + + # Let the sub-processes know who to send signals to. + pid = str(os.getpid()) + + with self.subprocess_send_signal(pid, "SIGHUP") as child: + self.wait_signal(child, 'SIGHUP') + self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 0, + 'SIGALRM': 0}) + + with self.subprocess_send_signal(pid, "SIGUSR1") as child: + self.wait_signal(child, 'SIGUSR1', SIGUSR1Exception) + self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, + 'SIGALRM': 0}) + + with self.subprocess_send_signal(pid, "SIGUSR2") as child: + # Nothing should happen: SIGUSR2 is ignored + child.wait() + + signal.alarm(1) + self.wait_signal(None, 'SIGALRM', KeyboardInterrupt) + self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 1, + 'SIGALRM': 0}) + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/sndhdrdata/README b/Lib/test/sndhdrdata/README index b2cb664..8a17c00 100644 --- a/Lib/test/sndhdrdata/README +++ b/Lib/test/sndhdrdata/README @@ -3,3 +3,10 @@ following commands: dd if=/dev/zero of=sndhdr.raw bs=20 count=1 sox -s -2 -c 2 -r 44100 sndhdr.raw sndhdr. + +Sound file samples used by Lib/test/test_sndhdr.py and generated using the +following commands: + + dd if=/dev/zero of=sndhdr.raw bs=20 count=1 + sox -s -2 -c 2 -r 44100 sndhdr.raw sndhdr. + diff --git a/Lib/test/sortperf.py b/Lib/test/sortperf.py index 90722f7..171e5ce 100644 --- a/Lib/test/sortperf.py +++ b/Lib/test/sortperf.py @@ -64,7 +64,7 @@ def doit(L): flush() def tabulate(r): - """Tabulate sort speed for lists of various sizes. + r"""Tabulate sort speed for lists of various sizes. The sizes are 2**i for i in r (the argument, a list). diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 85878eb..52c908e 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -26,6 +26,7 @@ import sys import sysconfig import tempfile import time +import types import unittest import urllib.error import warnings @@ -89,9 +90,9 @@ __all__ = [ "bigmemtest", "bigaddrspacetest", "cpython_only", "get_attribute", "requires_IEEE_754", "skip_unless_xattr", "requires_zlib", "anticipate_failure", "load_package_tests", "detect_api_mismatch", - "requires_multiprocessing_queue", + "check__all__", "requires_android_level", "requires_multiprocessing_queue", # sys - "is_jython", "check_impl_detail", + "is_jython", "is_android", "check_impl_detail", "unix_shell", # network "HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource", # processes @@ -104,7 +105,7 @@ __all__ = [ "check_warnings", "check_no_resource_warning", "EnvironmentVarGuard", "run_with_locale", "swap_item", "swap_attr", "Matcher", "set_memlimit", "SuppressCrashReport", "sortdict", - "run_with_tz", + "run_with_tz", "PGO", "missing_compiler_executable", ] class Error(Exception): @@ -359,9 +360,9 @@ if sys.platform.startswith("win"): mode = 0 if stat.S_ISDIR(mode): _waitfor(_rmtree_inner, fullname, waitall=True) - _force_run(fullname, os.rmdir, fullname) + _force_run(path, os.rmdir, fullname) else: - _force_run(fullname, os.unlink, fullname) + _force_run(path, os.unlink, fullname) _waitfor(_rmtree_inner, path, waitall=True) _waitfor(lambda p: _force_run(p, os.rmdir, p), path) else: @@ -765,6 +766,14 @@ requires_lzma = unittest.skipUnless(lzma, 'requires lzma') is_jython = sys.platform.startswith('java') +_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL') +is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0) + +if sys.platform != 'win32': + unix_shell = '/system/bin/sh' if is_android else '/bin/sh' +else: + unix_shell = None + # Filename used for testing if os.name == 'java': # Jython disallows @ in module names @@ -834,7 +843,7 @@ TESTFN_ENCODING = sys.getfilesystemencoding() # encoded by the filesystem encoding (in strict mode). It can be None if we # cannot generate such filename. TESTFN_UNENCODABLE = None -if os.name in ('nt', 'ce'): +if os.name == 'nt': # skip win32s (0) or Windows 9x/ME (1) if sys.getwindowsversion().platform >= 2: # Different kinds of characters from various languages to minimize the @@ -901,6 +910,10 @@ else: # Save the initial cwd SAVEDCWD = os.getcwd() +# Set by libregrtest/main.py so we can skip tests that are not +# useful for PGO +PGO = False + @contextlib.contextmanager def temp_dir(path=None, quiet=False): """Return a context manager that creates a temporary directory. @@ -1041,16 +1054,9 @@ def make_bad_fd(): file.close() unlink(TESTFN) -def check_syntax_error(testcase, statement, *, lineno=None, offset=None): - with testcase.assertRaises(SyntaxError) as cm: - compile(statement, '', 'exec') - err = cm.exception - testcase.assertIsNotNone(err.lineno) - if lineno is not None: - testcase.assertEqual(err.lineno, lineno) - testcase.assertIsNotNone(err.offset) - if offset is not None: - testcase.assertEqual(err.offset, offset) +def check_syntax_error(testcase, statement): + testcase.assertRaises(SyntaxError, compile, statement, + '', 'exec') def open_urlresource(url, *args, **kw): import urllib.request, urllib.parse @@ -1751,6 +1757,13 @@ def requires_resource(resource): else: return unittest.skip("resource {0!r} is not enabled".format(resource)) +def requires_android_level(level, reason): + if is_android and _ANDROID_API_LEVEL < level: + return unittest.skip('%s at Android API level %d' % + (reason, _ANDROID_API_LEVEL)) + else: + return _id + def cpython_only(test): """ Decorator for tests only applicable on CPython. @@ -1866,23 +1879,6 @@ def _run_suite(suite): raise TestFailed(err) -def _match_test(test): - global match_tests - - if match_tests is None: - return True - test_id = test.id() - - for match_test in match_tests: - if fnmatch.fnmatchcase(test_id, match_test): - return True - - for name in test_id.split("."): - if fnmatch.fnmatchcase(name, match_test): - return True - return False - - def run_unittest(*classes): """Run tests from unittest.TestCase-derived classes.""" valid_types = (unittest.TestSuite, unittest.TestCase) @@ -1897,7 +1893,14 @@ def run_unittest(*classes): suite.addTest(cls) else: suite.addTest(unittest.makeSuite(cls)) - _filter_suite(suite, _match_test) + def case_pred(test): + if match_tests is None: + return True + for name in test.id().split("."): + if fnmatch.fnmatchcase(name, match_tests): + return True + return False + _filter_suite(suite, case_pred) _run_suite(suite) #======================================================================= @@ -2083,15 +2086,12 @@ def swap_attr(obj, attr, new_val): restoring the old value at the end of the block. If `attr` doesn't exist on `obj`, it will be created and then deleted at the end of the block. - - The old value (or None if it doesn't exist) will be assigned to the - target of the "as" clause, if there is one. """ if hasattr(obj, attr): real_val = getattr(obj, attr) setattr(obj, attr, new_val) try: - yield real_val + yield finally: setattr(obj, attr, real_val) else: @@ -2099,8 +2099,7 @@ def swap_attr(obj, attr, new_val): try: yield finally: - if hasattr(obj, attr): - delattr(obj, attr) + delattr(obj, attr) @contextlib.contextmanager def swap_item(obj, item, new_val): @@ -2114,15 +2113,12 @@ def swap_item(obj, item, new_val): restoring the old value at the end of the block. If `item` doesn't exist on `obj`, it will be created and then deleted at the end of the block. - - The old value (or None if it doesn't exist) will be assigned to the - target of the "as" clause, if there is one. """ if item in obj: real_val = obj[item] obj[item] = new_val try: - yield real_val + yield finally: obj[item] = real_val else: @@ -2130,8 +2126,7 @@ def swap_item(obj, item, new_val): try: yield finally: - if item in obj: - del obj[item] + del obj[item] def strip_python_stderr(stderr): """Strip the stderr of a Python process from potential debug output @@ -2151,6 +2146,11 @@ def args_from_interpreter_flags(): settings in sys.flags and sys.warnoptions.""" return subprocess._args_from_interpreter_flags() +def optim_args_from_interpreter_flags(): + """Return a list of command-line arguments reproducing the current + optimization settings in sys.flags.""" + return subprocess._optim_args_from_interpreter_flags() + #============================================================ # Support for assertions about logging. #============================================================ @@ -2257,7 +2257,7 @@ def can_xattr(): os.setxattr(fp.fileno(), b"user.test", b"") # Kernels < 2.6.39 don't respect setxattr flags. kernel_version = platform.release() - m = re.match("2.6.(\d{1,2})", kernel_version) + m = re.match(r"2.6.(\d{1,2})", kernel_version) can = m is None or int(m.group(1)) >= 39 except OSError: can = False @@ -2302,6 +2302,65 @@ def detect_api_mismatch(ref_api, other_api, *, ignore=()): return missing_items +def check__all__(test_case, module, name_of_module=None, extra=(), + blacklist=()): + """Assert that the __all__ variable of 'module' contains all public names. + + The module's public names (its API) are detected automatically based on + whether they match the public name convention and were defined in + 'module'. + + The 'name_of_module' argument can specify (as a string or tuple thereof) + what module(s) an API could be defined in in order to be detected as a + public API. One case for this is when 'module' imports part of its public + API from other modules, possibly a C backend (like 'csv' and its '_csv'). + + The 'extra' argument can be a set of names that wouldn't otherwise be + automatically detected as "public", like objects without a proper + '__module__' attriubute. If provided, it will be added to the + automatically detected ones. + + The 'blacklist' argument can be a set of names that must not be treated + as part of the public API even though their names indicate otherwise. + + Usage: + import bar + import foo + import unittest + from test import support + + class MiscTestCase(unittest.TestCase): + def test__all__(self): + support.check__all__(self, foo) + + class OtherTestCase(unittest.TestCase): + def test__all__(self): + extra = {'BAR_CONST', 'FOO_CONST'} + blacklist = {'baz'} # Undocumented name. + # bar imports part of its API from _bar. + support.check__all__(self, bar, ('bar', '_bar'), + extra=extra, blacklist=blacklist) + + """ + + if name_of_module is None: + name_of_module = (module.__name__, ) + elif isinstance(name_of_module, str): + name_of_module = (name_of_module, ) + + expected = set(extra) + + for name in dir(module): + if name.startswith('_') or name in blacklist: + continue + obj = getattr(module, name) + if (getattr(obj, '__module__', None) in name_of_module or + (not hasattr(obj, '__module__') and + not isinstance(obj, types.ModuleType))): + expected.add(name) + test_case.assertCountEqual(module.__all__, expected) + + class SuppressCrashReport: """Try to prevent a crash report from popping up. @@ -2355,7 +2414,6 @@ class SuppressCrashReport: (0, self.old_value[1])) except (ValueError, OSError): pass - if sys.platform == 'darwin': # Check if the 'Crash Reporter' on OSX was configured # in 'Developer' mode and warn that it will get triggered @@ -2363,14 +2421,10 @@ class SuppressCrashReport: # # This assumes that this context manager is used in tests # that might trigger the next manager. - cmd = ['/usr/bin/defaults', 'read', - 'com.apple.CrashReporter', 'DialogType'] - proc = subprocess.Popen(cmd, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - with proc: - stdout = proc.communicate()[0] - if stdout.strip() == b'developer': + value = subprocess.Popen(['/usr/bin/defaults', 'read', + 'com.apple.CrashReporter', 'DialogType'], + stdout=subprocess.PIPE).communicate()[0] + if value.strip() == b'developer': print("this test triggers the Crash Reporter, " "that is intentional", end='', flush=True) @@ -2468,3 +2522,28 @@ def check_free_after_iterating(test, iter, cls, args=()): # The sequence should be deallocated just after the end of iterating gc_collect() test.assertTrue(done) + + +def missing_compiler_executable(cmd_names=[]): + """Check if the compiler components used to build the interpreter exist. + + Check for the existence of the compiler executables whose names are listed + in 'cmd_names' or all the compiler executables when 'cmd_names' is empty + and return the first missing executable or None when none is found + missing. + + """ + from distutils import ccompiler, sysconfig, spawn + compiler = ccompiler.new_compiler() + sysconfig.customize_compiler(compiler) + for name in compiler.executables: + if cmd_names and name not in cmd_names: + continue + cmd = getattr(compiler, name) + if cmd_names: + assert cmd is not None, \ + "the '%s' executable is not configured" % name + elif cmd is None: + continue + if spawn.find_executable(cmd[0]) is None: + return cmd[0] diff --git a/Lib/test/support/script_helper.py b/Lib/test/support/script_helper.py index ca5f9c2..80889b1 100644 --- a/Lib/test/support/script_helper.py +++ b/Lib/test/support/script_helper.py @@ -70,28 +70,17 @@ def run_python_until_end(*args, **env_vars): elif not env_vars and not env_required: # ignore Python environment variables cmd_line.append('-E') - - # But a special flag that can be set to override -- in this case, the - # caller is responsible to pass the full environment. - if env_vars.pop('__cleanenv', None): - env = {} - if sys.platform == 'win32': - # Windows requires at least the SYSTEMROOT environment variable to - # start Python. - env['SYSTEMROOT'] = os.environ['SYSTEMROOT'] - - # Other interesting environment variables, not copied currently: - # COMSPEC, HOME, PATH, TEMP, TMPDIR, TMP. - else: - # Need to preserve the original environment, for in-place testing of - # shared library builds. - env = os.environ.copy() - + # Need to preserve the original environment, for in-place testing of + # shared library builds. + env = os.environ.copy() # set TERM='' unless the TERM environment variable is passed explicitly # see issues #11390 and #18300 if 'TERM' not in env_vars: env['TERM'] = '' - + # But a special flag that can be set to override -- in this case, the + # caller is responsible to pass the full environment. + if env_vars.pop('__cleanenv', None): + env = {} env.update(env_vars) cmd_line.extend(args) proc = subprocess.Popen(cmd_line, stdin=subprocess.PIPE, diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index 2fc5e3e..ae9114e 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -38,6 +38,8 @@ class AllTest(unittest.TestCase): modname, e.__class__.__name__, e)) if "__builtins__" in names: del names["__builtins__"] + if '__annotations__' in names: + del names['__annotations__'] keys = set(names) all_list = sys.modules[modname].__all__ all_set = set(all_list) @@ -70,6 +72,17 @@ class AllTest(unittest.TestCase): # than an AttributeError somewhere deep in CGIHTTPServer. import _socket + # rlcompleter needs special consideration; it import readline which + # initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-( + import locale + locale_tuple = locale.getlocale(locale.LC_CTYPE) + try: + import rlcompleter + except ImportError: + pass + finally: + locale.setlocale(locale.LC_CTYPE, locale_tuple) + ignored = [] failed_imports = [] lib_dir = os.path.dirname(os.path.dirname(__file__)) diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py index 58f2f04..ab4e247 100644 --- a/Lib/test/test__locale.py +++ b/Lib/test/test__locale.py @@ -4,7 +4,6 @@ try: except ImportError: nl_langinfo = None -import codecs import locale import sys import unittest diff --git a/Lib/test/test__osx_support.py b/Lib/test/test__osx_support.py index ac6325a..bcba8ca 100644 --- a/Lib/test/test__osx_support.py +++ b/Lib/test/test__osx_support.py @@ -4,7 +4,6 @@ Test suite for _osx_support: shared OS X support functions. import os import platform -import shutil import stat import sys import unittest diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py index eaa24b6..1bd1f89 100644 --- a/Lib/test/test_aifc.py +++ b/Lib/test/test_aifc.py @@ -1,9 +1,7 @@ -from test.support import check_no_resource_warning, findfile, TESTFN, unlink +from test.support import findfile, TESTFN, unlink import unittest -from unittest import mock from test import audiotests from audioop import byteswap -import os import io import sys import struct @@ -151,21 +149,6 @@ class AifcMiscTest(audiotests.AudioTests, unittest.TestCase): #This file contains chunk types aifc doesn't recognize. self.f = aifc.open(findfile('Sine-1000Hz-300ms.aif')) - def test_close_opened_files_on_error(self): - non_aifc_file = findfile('pluck-pcm8.wav', subdir='audiodata') - with check_no_resource_warning(self): - with self.assertRaises(aifc.Error): - # Try opening a non-AIFC file, with the expectation that - # `aifc.open` will fail (without raising a ResourceWarning) - self.f = aifc.open(non_aifc_file, 'rb') - - # Aifc_write.initfp() won't raise in normal case. But some errors - # (e.g. MemoryError, KeyboardInterrupt, etc..) can happen. - with mock.patch.object(aifc.Aifc_write, 'initfp', - side_effect=RuntimeError): - with self.assertRaises(RuntimeError): - self.fout = aifc.open(TESTFN, 'wb') - def test_params_added(self): f = self.f = aifc.open(TESTFN, 'wb') f.aiff() diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 197d576..bc83161 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -1943,23 +1943,6 @@ class TestAddSubparsers(TestCase): ++foo foo help ''')) - def test_help_non_breaking_spaces(self): - parser = ErrorRaisingArgumentParser( - prog='PROG', description='main description') - parser.add_argument( - "--non-breaking", action='store_false', - help='help message containing non-breaking spaces shall not ' - 'wrap\N{NO-BREAK SPACE}at non-breaking spaces') - self.assertEqual(parser.format_help(), textwrap.dedent('''\ - usage: PROG [-h] [--non-breaking] - - main description - - optional arguments: - -h, --help show this help message and exit - --non-breaking help message containing non-breaking spaces shall not - wrap\N{NO-BREAK SPACE}at non-breaking spaces - ''')) def test_help_alternate_prefix_chars(self): parser = self._get_parser(prefix_chars='+:/') @@ -4529,6 +4512,21 @@ class TestStrings(TestCase): string = "Namespace(bar='spam', foo=42)" self.assertStringEqual(ns, string) + def test_namespace_starkwargs_notidentifier(self): + ns = argparse.Namespace(**{'"': 'quote'}) + string = """Namespace(**{'"': 'quote'})""" + self.assertStringEqual(ns, string) + + def test_namespace_kwargs_and_starkwargs_notidentifier(self): + ns = argparse.Namespace(a=1, **{'"': 'quote'}) + string = """Namespace(a=1, **{'"': 'quote'})""" + self.assertStringEqual(ns, string) + + def test_namespace_starkwargs_identifier(self): + ns = argparse.Namespace(**{'valid': True}) + string = "Namespace(valid=True)" + self.assertStringEqual(ns, string) + def test_parser(self): parser = argparse.ArgumentParser(prog='PROG') string = ( diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index cbc6b6d..1f8967c 100644 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -7,8 +7,6 @@ from test import support import weakref import pickle import operator -import io -import math import struct import sys import warnings @@ -328,8 +326,19 @@ class BaseTest: d = pickle.dumps((itorig, orig), proto) it, a = pickle.loads(d) a.fromlist(data2) - self.assertEqual(type(it), type(itorig)) - self.assertEqual(list(it), data2) + self.assertEqual(list(it), []) + + def test_exhausted_iterator(self): + a = array.array(self.typecode, self.example) + self.assertEqual(list(a), list(self.example)) + exhit = iter(a) + empit = iter(a) + for x in exhit: # exhaust the iterator + next(empit) # not exhausted + a.append(self.outside) + self.assertEqual(list(exhit), []) + self.assertEqual(list(empit), [self.outside]) + self.assertEqual(list(a), list(self.example) + [self.outside]) def test_insert(self): a = array.array(self.typecode, self.example) @@ -1080,6 +1089,12 @@ class BaseTest: a = array.array('B', b"") self.assertRaises(BufferError, getbuffer_with_null_view, a) + def test_free_after_iterating(self): + support.check_free_after_iterating(self, iter, array.array, + (self.typecode,)) + support.check_free_after_iterating(self, reversed, array.array, + (self.typecode,)) + class StringTest(BaseTest): def test_setitem(self): @@ -1225,26 +1240,7 @@ class NumberTest(BaseTest): b = array.array(self.typecode, a) self.assertEqual(a, b) -class IntegerNumberTest(NumberTest): - def test_type_error(self): - a = array.array(self.typecode) - a.append(42) - with self.assertRaises(TypeError): - a.append(42.0) - with self.assertRaises(TypeError): - a[0] = 42.0 - -class Intable: - def __init__(self, num): - self._num = num - def __int__(self): - return self._num - def __sub__(self, other): - return Intable(int(self) - int(other)) - def __add__(self, other): - return Intable(int(self) + int(other)) - -class SignedNumberTest(IntegerNumberTest): +class SignedNumberTest(NumberTest): example = [-1, 0, 1, 42, 0x7f] smallerexample = [-1, 0, 1, 42, 0x7e] biggerexample = [-1, 0, 1, 43, 0x7f] @@ -1255,9 +1251,8 @@ class SignedNumberTest(IntegerNumberTest): lower = -1 * int(pow(2, a.itemsize * 8 - 1)) upper = int(pow(2, a.itemsize * 8 - 1)) - 1 self.check_overflow(lower, upper) - self.check_overflow(Intable(lower), Intable(upper)) -class UnsignedNumberTest(IntegerNumberTest): +class UnsignedNumberTest(NumberTest): example = [0, 1, 17, 23, 42, 0xff] smallerexample = [0, 1, 17, 23, 42, 0xfe] biggerexample = [0, 1, 17, 23, 43, 0xff] @@ -1268,7 +1263,6 @@ class UnsignedNumberTest(IntegerNumberTest): lower = 0 upper = int(pow(2, a.itemsize * 8)) - 1 self.check_overflow(lower, upper) - self.check_overflow(Intable(lower), Intable(upper)) def test_bytes_extend(self): s = bytes(self.example) diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index d3e6d35..8c62408 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -1,7 +1,8 @@ +import ast +import dis import os import sys import unittest -import ast import weakref from test import support @@ -115,6 +116,8 @@ exec_tests = [ # PEP 448: Additional Unpacking Generalizations "{**{1:2}, 2:3}", "{*{1, 2}, 3}", + # Asynchronous comprehensions + "async def f():\n [i async for b in c]", ] # These are compiled through "single" @@ -238,7 +241,7 @@ class AST_Tests(unittest.TestCase): ast_tree = compile(i, "?", kind, ast.PyCF_ONLY_AST) self.assertEqual(to_tuple(ast_tree), o) self._assertTrueorder(ast_tree, (0, 0)) - with self.subTest(action="compiling", input=i): + with self.subTest(action="compiling", input=i, kind=kind): compile(ast_tree, "?", kind) def test_slice(self): @@ -547,6 +550,17 @@ class ASTHelpers_Test(unittest.TestCase): compile(mod, 'test', 'exec') self.assertIn("invalid integer value: None", str(cm.exception)) + def test_level_as_none(self): + body = [ast.ImportFrom(module='time', + names=[ast.alias(name='sleep')], + level=None, + lineno=0, col_offset=0)] + mod = ast.Module(body) + code = compile(mod, 'test', 'exec') + ns = {} + exec(code, ns) + self.assertIn('sleep', ns) + class ASTValidatorTests(unittest.TestCase): @@ -742,7 +756,7 @@ class ASTValidatorTests(unittest.TestCase): def test_importfrom(self): imp = ast.ImportFrom(None, [ast.alias("x", None)], -42) - self.stmt(imp, "level less than -1") + self.stmt(imp, "Negative ImportFrom level") self.stmt(ast.ImportFrom(None, [], 0), "empty names on ImportFrom") def test_global(self): @@ -797,21 +811,21 @@ class ASTValidatorTests(unittest.TestCase): def _check_comprehension(self, fac): self.expr(fac([]), "comprehension with no generators") g = ast.comprehension(ast.Name("x", ast.Load()), - ast.Name("x", ast.Load()), []) + ast.Name("x", ast.Load()), [], 0) self.expr(fac([g]), "must have Store context") g = ast.comprehension(ast.Name("x", ast.Store()), - ast.Name("x", ast.Store()), []) + ast.Name("x", ast.Store()), [], 0) self.expr(fac([g]), "must have Load context") x = ast.Name("x", ast.Store()) y = ast.Name("y", ast.Load()) - g = ast.comprehension(x, y, [None]) + g = ast.comprehension(x, y, [None], 0) self.expr(fac([g]), "None disallowed") - g = ast.comprehension(x, y, [ast.Name("x", ast.Store())]) + g = ast.comprehension(x, y, [ast.Name("x", ast.Store())], 0) self.expr(fac([g]), "must have Load context") def _simple_comp(self, fac): g = ast.comprehension(ast.Name("x", ast.Store()), - ast.Name("x", ast.Load()), []) + ast.Name("x", ast.Load()), [], 0) self.expr(fac(ast.Name("x", ast.Store()), [g]), "must have Load context") def wrap(gens): @@ -829,7 +843,7 @@ class ASTValidatorTests(unittest.TestCase): def test_dictcomp(self): g = ast.comprehension(ast.Name("y", ast.Store()), - ast.Name("p", ast.Load()), []) + ast.Name("p", ast.Load()), [], 0) c = ast.DictComp(ast.Name("x", ast.Store()), ast.Name("y", ast.Load()), [g]) self.expr(c, "must have Load context") @@ -933,6 +947,125 @@ class ASTValidatorTests(unittest.TestCase): compile(mod, fn, "exec") +class ConstantTests(unittest.TestCase): + """Tests on the ast.Constant node type.""" + + def compile_constant(self, value): + tree = ast.parse("x = 123") + + node = tree.body[0].value + new_node = ast.Constant(value=value) + ast.copy_location(new_node, node) + tree.body[0].value = new_node + + code = compile(tree, "", "exec") + + ns = {} + exec(code, ns) + return ns['x'] + + def test_validation(self): + with self.assertRaises(TypeError) as cm: + self.compile_constant([1, 2, 3]) + self.assertEqual(str(cm.exception), + "got an invalid type in Constant: list") + + def test_singletons(self): + for const in (None, False, True, Ellipsis, b'', frozenset()): + with self.subTest(const=const): + value = self.compile_constant(const) + self.assertIs(value, const) + + def test_values(self): + nested_tuple = (1,) + nested_frozenset = frozenset({1}) + for level in range(3): + nested_tuple = (nested_tuple, 2) + nested_frozenset = frozenset({nested_frozenset, 2}) + values = (123, 123.0, 123j, + "unicode", b'bytes', + tuple("tuple"), frozenset("frozenset"), + nested_tuple, nested_frozenset) + for value in values: + with self.subTest(value=value): + result = self.compile_constant(value) + self.assertEqual(result, value) + + def test_assign_to_constant(self): + tree = ast.parse("x = 1") + + target = tree.body[0].targets[0] + new_target = ast.Constant(value=1) + ast.copy_location(new_target, target) + tree.body[0].targets[0] = new_target + + with self.assertRaises(ValueError) as cm: + compile(tree, "string", "exec") + self.assertEqual(str(cm.exception), + "expression which can't be assigned " + "to in Store context") + + def test_get_docstring(self): + tree = ast.parse("'docstring'\nx = 1") + self.assertEqual(ast.get_docstring(tree), 'docstring') + + tree.body[0].value = ast.Constant(value='constant docstring') + self.assertEqual(ast.get_docstring(tree), 'constant docstring') + + def get_load_const(self, tree): + # Compile to bytecode, disassemble and get parameter of LOAD_CONST + # instructions + co = compile(tree, '', 'exec') + consts = [] + for instr in dis.get_instructions(co): + if instr.opname == 'LOAD_CONST': + consts.append(instr.argval) + return consts + + @support.cpython_only + def test_load_const(self): + consts = [None, + True, False, + 124, + 2.0, + 3j, + "unicode", + b'bytes', + (1, 2, 3)] + + code = '\n'.join(['x={!r}'.format(const) for const in consts]) + code += '\nx = ...' + consts.extend((Ellipsis, None)) + + tree = ast.parse(code) + self.assertEqual(self.get_load_const(tree), + consts) + + # Replace expression nodes with constants + for assign, const in zip(tree.body, consts): + assert isinstance(assign, ast.Assign), ast.dump(assign) + new_node = ast.Constant(value=const) + ast.copy_location(new_node, assign.value) + assign.value = new_node + + self.assertEqual(self.get_load_const(tree), + consts) + + def test_literal_eval(self): + tree = ast.parse("1 + 2") + binop = tree.body[0].value + + new_left = ast.Constant(value=10) + ast.copy_location(new_left, binop.left) + binop.left = new_left + + new_right = ast.Constant(value=20) + ast.copy_location(new_right, binop.right) + binop.right = new_right + + self.assertEqual(ast.literal_eval(binop), 30) + + def main(): if __name__ != '__main__': return @@ -940,8 +1073,9 @@ def main(): for statements, kind in ((exec_tests, "exec"), (single_tests, "single"), (eval_tests, "eval")): print(kind+"_results = [") - for s in statements: - print(repr(to_tuple(compile(s, "?", kind, 0x400)))+",") + for statement in statements: + tree = ast.parse(statement, "?", kind) + print("%r," % (to_tuple(tree),)) print("]") print("main()") raise SystemExit @@ -979,19 +1113,20 @@ exec_results = [ ('Module', [('For', (1, 0), ('Name', (1, 4), 'v', ('Store',)), ('Name', (1, 9), 'v', ('Load',)), [('Break', (1, 11))], [])]), ('Module', [('For', (1, 0), ('Name', (1, 4), 'v', ('Store',)), ('Name', (1, 9), 'v', ('Load',)), [('Continue', (1, 11))], [])]), ('Module', [('For', (1, 0), ('Tuple', (1, 4), [('Name', (1, 4), 'a', ('Store',)), ('Name', (1, 6), 'b', ('Store',))], ('Store',)), ('Name', (1, 11), 'c', ('Load',)), [('Pass', (1, 14))], [])]), -('Module', [('Expr', (1, 0), ('ListComp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'a', ('Store',)), ('Name', (1, 13), 'b', ('Store',))], ('Store',)), ('Name', (1, 18), 'c', ('Load',)), [])]))]), -('Module', [('Expr', (1, 0), ('GeneratorExp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'a', ('Store',)), ('Name', (1, 13), 'b', ('Store',))], ('Store',)), ('Name', (1, 18), 'c', ('Load',)), [])]))]), -('Module', [('Expr', (1, 0), ('GeneratorExp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 12), [('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 14), 'b', ('Store',))], ('Store',)), ('Name', (1, 20), 'c', ('Load',)), [])]))]), -('Module', [('Expr', (1, 0), ('GeneratorExp', (2, 4), ('Tuple', (3, 4), [('Name', (3, 4), 'Aa', ('Load',)), ('Name', (5, 7), 'Bb', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (8, 4), [('Name', (8, 4), 'Aa', ('Store',)), ('Name', (10, 4), 'Bb', ('Store',))], ('Store',)), ('Name', (10, 10), 'Cc', ('Load',)), [])]))]), -('Module', [('Expr', (1, 0), ('DictComp', (1, 0), ('Name', (1, 1), 'a', ('Load',)), ('Name', (1, 5), 'b', ('Load',)), [('comprehension', ('Name', (1, 11), 'w', ('Store',)), ('Name', (1, 16), 'x', ('Load',)), []), ('comprehension', ('Name', (1, 22), 'm', ('Store',)), ('Name', (1, 27), 'p', ('Load',)), [('Name', (1, 32), 'g', ('Load',))])]))]), -('Module', [('Expr', (1, 0), ('DictComp', (1, 0), ('Name', (1, 1), 'a', ('Load',)), ('Name', (1, 5), 'b', ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'v', ('Store',)), ('Name', (1, 13), 'w', ('Store',))], ('Store',)), ('Name', (1, 18), 'x', ('Load',)), [])]))]), -('Module', [('Expr', (1, 0), ('SetComp', (1, 0), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 12), 'x', ('Load',)), [('Name', (1, 17), 'g', ('Load',))])]))]), -('Module', [('Expr', (1, 0), ('SetComp', (1, 0), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Tuple', (1, 7), [('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 9), 'm', ('Store',))], ('Store',)), ('Name', (1, 14), 'x', ('Load',)), [])]))]), +('Module', [('Expr', (1, 0), ('ListComp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'a', ('Store',)), ('Name', (1, 13), 'b', ('Store',))], ('Store',)), ('Name', (1, 18), 'c', ('Load',)), [], 0)]))]), +('Module', [('Expr', (1, 0), ('GeneratorExp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'a', ('Store',)), ('Name', (1, 13), 'b', ('Store',))], ('Store',)), ('Name', (1, 18), 'c', ('Load',)), [], 0)]))]), +('Module', [('Expr', (1, 0), ('GeneratorExp', (1, 1), ('Tuple', (1, 2), [('Name', (1, 2), 'a', ('Load',)), ('Name', (1, 4), 'b', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (1, 12), [('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 14), 'b', ('Store',))], ('Store',)), ('Name', (1, 20), 'c', ('Load',)), [], 0)]))]), +('Module', [('Expr', (1, 0), ('GeneratorExp', (2, 4), ('Tuple', (3, 4), [('Name', (3, 4), 'Aa', ('Load',)), ('Name', (5, 7), 'Bb', ('Load',))], ('Load',)), [('comprehension', ('Tuple', (8, 4), [('Name', (8, 4), 'Aa', ('Store',)), ('Name', (10, 4), 'Bb', ('Store',))], ('Store',)), ('Name', (10, 10), 'Cc', ('Load',)), [], 0)]))]), +('Module', [('Expr', (1, 0), ('DictComp', (1, 0), ('Name', (1, 1), 'a', ('Load',)), ('Name', (1, 5), 'b', ('Load',)), [('comprehension', ('Name', (1, 11), 'w', ('Store',)), ('Name', (1, 16), 'x', ('Load',)), [], 0), ('comprehension', ('Name', (1, 22), 'm', ('Store',)), ('Name', (1, 27), 'p', ('Load',)), [('Name', (1, 32), 'g', ('Load',))], 0)]))]), +('Module', [('Expr', (1, 0), ('DictComp', (1, 0), ('Name', (1, 1), 'a', ('Load',)), ('Name', (1, 5), 'b', ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'v', ('Store',)), ('Name', (1, 13), 'w', ('Store',))], ('Store',)), ('Name', (1, 18), 'x', ('Load',)), [], 0)]))]), +('Module', [('Expr', (1, 0), ('SetComp', (1, 0), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 12), 'x', ('Load',)), [('Name', (1, 17), 'g', ('Load',))], 0)]))]), +('Module', [('Expr', (1, 0), ('SetComp', (1, 0), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Tuple', (1, 7), [('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 9), 'm', ('Store',))], ('Store',)), ('Name', (1, 14), 'x', ('Load',)), [], 0)]))]), ('Module', [('AsyncFunctionDef', (1, 6), 'f', ('arguments', [], None, [], [], None, []), [('Expr', (2, 1), ('Await', (2, 1), ('Call', (2, 7), ('Name', (2, 7), 'something', ('Load',)), [], [])))], [], None)]), ('Module', [('AsyncFunctionDef', (1, 6), 'f', ('arguments', [], None, [], [], None, []), [('AsyncFor', (2, 7), ('Name', (2, 11), 'e', ('Store',)), ('Name', (2, 16), 'i', ('Load',)), [('Expr', (2, 19), ('Num', (2, 19), 1))], [('Expr', (3, 7), ('Num', (3, 7), 2))])], [], None)]), ('Module', [('AsyncFunctionDef', (1, 6), 'f', ('arguments', [], None, [], [], None, []), [('AsyncWith', (2, 7), [('withitem', ('Name', (2, 12), 'a', ('Load',)), ('Name', (2, 17), 'b', ('Store',)))], [('Expr', (2, 20), ('Num', (2, 20), 1))])], [], None)]), ('Module', [('Expr', (1, 0), ('Dict', (1, 0), [None, ('Num', (1, 10), 2)], [('Dict', (1, 3), [('Num', (1, 4), 1)], [('Num', (1, 6), 2)]), ('Num', (1, 12), 3)]))]), ('Module', [('Expr', (1, 0), ('Set', (1, 0), [('Starred', (1, 1), ('Set', (1, 2), [('Num', (1, 3), 1), ('Num', (1, 6), 2)]), ('Load',)), ('Num', (1, 10), 3)]))]), +('Module', [('AsyncFunctionDef', (1, 6), 'f', ('arguments', [], None, [], [], None, []), [('Expr', (2, 1), ('ListComp', (2, 2), ('Name', (2, 2), 'i', ('Load',)), [('comprehension', ('Name', (2, 14), 'b', ('Store',)), ('Name', (2, 19), 'c', ('Load',)), [], 1)]))], [], None)]), ] single_results = [ ('Interactive', [('Expr', (1, 0), ('BinOp', (1, 0), ('Num', (1, 0), 1), ('Add',), ('Num', (1, 2), 2)))]), @@ -1006,8 +1141,8 @@ eval_results = [ ('Expression', ('Dict', (1, 0), [], [])), ('Expression', ('Set', (1, 0), [('NameConstant', (1, 1), None)])), ('Expression', ('Dict', (1, 0), [('Num', (2, 6), 1)], [('Num', (4, 10), 2)])), -('Expression', ('ListComp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))])])), -('Expression', ('GeneratorExp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))])])), +('Expression', ('ListComp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))], 0)])), +('Expression', ('GeneratorExp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))], 0)])), ('Expression', ('Compare', (1, 0), ('Num', (1, 0), 1), [('Lt',), ('Lt',)], [('Num', (1, 4), 2), ('Num', (1, 8), 3)])), ('Expression', ('Call', (1, 0), ('Name', (1, 0), 'f', ('Load',)), [('Num', (1, 2), 1), ('Num', (1, 4), 2), ('Starred', (1, 10), ('Name', (1, 11), 'd', ('Load',)), ('Load',))], [('keyword', 'c', ('Num', (1, 8), 3)), ('keyword', None, ('Name', (1, 15), 'e', ('Load',)))])), ('Expression', ('Num', (1, 0), 10)), diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py new file mode 100644 index 0000000..34ab8a0 --- /dev/null +++ b/Lib/test/test_asyncgen.py @@ -0,0 +1,1044 @@ +import inspect +import sys +import types +import unittest + +from unittest import mock + +from test.support import import_module +asyncio = import_module("asyncio") + + +class AwaitException(Exception): + pass + + +@types.coroutine +def awaitable(*, throw=False): + if throw: + yield ('throw',) + else: + yield ('result',) + + +def run_until_complete(coro): + exc = False + while True: + try: + if exc: + exc = False + fut = coro.throw(AwaitException) + else: + fut = coro.send(None) + except StopIteration as ex: + return ex.args[0] + + if fut == ('throw',): + exc = True + + +def to_list(gen): + async def iterate(): + res = [] + async for i in gen: + res.append(i) + return res + + return run_until_complete(iterate()) + + +class AsyncGenSyntaxTest(unittest.TestCase): + + def test_async_gen_syntax_01(self): + code = '''async def foo(): + await abc + yield from 123 + ''' + + with self.assertRaisesRegex(SyntaxError, 'yield from.*inside async'): + exec(code, {}, {}) + + def test_async_gen_syntax_02(self): + code = '''async def foo(): + yield from 123 + ''' + + with self.assertRaisesRegex(SyntaxError, 'yield from.*inside async'): + exec(code, {}, {}) + + def test_async_gen_syntax_03(self): + code = '''async def foo(): + await abc + yield + return 123 + ''' + + with self.assertRaisesRegex(SyntaxError, 'return.*value.*async gen'): + exec(code, {}, {}) + + def test_async_gen_syntax_04(self): + code = '''async def foo(): + yield + return 123 + ''' + + with self.assertRaisesRegex(SyntaxError, 'return.*value.*async gen'): + exec(code, {}, {}) + + def test_async_gen_syntax_05(self): + code = '''async def foo(): + if 0: + yield + return 12 + ''' + + with self.assertRaisesRegex(SyntaxError, 'return.*value.*async gen'): + exec(code, {}, {}) + + +class AsyncGenTest(unittest.TestCase): + + def compare_generators(self, sync_gen, async_gen): + def sync_iterate(g): + res = [] + while True: + try: + res.append(g.__next__()) + except StopIteration: + res.append('STOP') + break + except Exception as ex: + res.append(str(type(ex))) + return res + + def async_iterate(g): + res = [] + while True: + try: + g.__anext__().__next__() + except StopAsyncIteration: + res.append('STOP') + break + except StopIteration as ex: + if ex.args: + res.append(ex.args[0]) + else: + res.append('EMPTY StopIteration') + break + except Exception as ex: + res.append(str(type(ex))) + return res + + sync_gen_result = sync_iterate(sync_gen) + async_gen_result = async_iterate(async_gen) + self.assertEqual(sync_gen_result, async_gen_result) + return async_gen_result + + def test_async_gen_iteration_01(self): + async def gen(): + await awaitable() + a = yield 123 + self.assertIs(a, None) + await awaitable() + yield 456 + await awaitable() + yield 789 + + self.assertEqual(to_list(gen()), [123, 456, 789]) + + def test_async_gen_iteration_02(self): + async def gen(): + await awaitable() + yield 123 + await awaitable() + + g = gen() + ai = g.__aiter__() + self.assertEqual(ai.__anext__().__next__(), ('result',)) + + try: + ai.__anext__().__next__() + except StopIteration as ex: + self.assertEqual(ex.args[0], 123) + else: + self.fail('StopIteration was not raised') + + self.assertEqual(ai.__anext__().__next__(), ('result',)) + + try: + ai.__anext__().__next__() + except StopAsyncIteration as ex: + self.assertFalse(ex.args) + else: + self.fail('StopAsyncIteration was not raised') + + def test_async_gen_exception_03(self): + async def gen(): + await awaitable() + yield 123 + await awaitable(throw=True) + yield 456 + + with self.assertRaises(AwaitException): + to_list(gen()) + + def test_async_gen_exception_04(self): + async def gen(): + await awaitable() + yield 123 + 1 / 0 + + g = gen() + ai = g.__aiter__() + self.assertEqual(ai.__anext__().__next__(), ('result',)) + + try: + ai.__anext__().__next__() + except StopIteration as ex: + self.assertEqual(ex.args[0], 123) + else: + self.fail('StopIteration was not raised') + + with self.assertRaises(ZeroDivisionError): + ai.__anext__().__next__() + + def test_async_gen_exception_05(self): + async def gen(): + yield 123 + raise StopAsyncIteration + + with self.assertRaisesRegex(RuntimeError, + 'async generator.*StopAsyncIteration'): + to_list(gen()) + + def test_async_gen_exception_06(self): + async def gen(): + yield 123 + raise StopIteration + + with self.assertRaisesRegex(RuntimeError, + 'async generator.*StopIteration'): + to_list(gen()) + + def test_async_gen_exception_07(self): + def sync_gen(): + try: + yield 1 + 1 / 0 + finally: + yield 2 + yield 3 + + yield 100 + + async def async_gen(): + try: + yield 1 + 1 / 0 + finally: + yield 2 + yield 3 + + yield 100 + + self.compare_generators(sync_gen(), async_gen()) + + def test_async_gen_exception_08(self): + def sync_gen(): + try: + yield 1 + finally: + yield 2 + 1 / 0 + yield 3 + + yield 100 + + async def async_gen(): + try: + yield 1 + await awaitable() + finally: + await awaitable() + yield 2 + 1 / 0 + yield 3 + + yield 100 + + self.compare_generators(sync_gen(), async_gen()) + + def test_async_gen_exception_09(self): + def sync_gen(): + try: + yield 1 + 1 / 0 + finally: + yield 2 + yield 3 + + yield 100 + + async def async_gen(): + try: + await awaitable() + yield 1 + 1 / 0 + finally: + yield 2 + await awaitable() + yield 3 + + yield 100 + + self.compare_generators(sync_gen(), async_gen()) + + def test_async_gen_exception_10(self): + async def gen(): + yield 123 + with self.assertRaisesRegex(TypeError, + "non-None value .* async generator"): + gen().__anext__().send(100) + + def test_async_gen_api_01(self): + async def gen(): + yield 123 + + g = gen() + + self.assertEqual(g.__name__, 'gen') + g.__name__ = '123' + self.assertEqual(g.__name__, '123') + + self.assertIn('.gen', g.__qualname__) + g.__qualname__ = '123' + self.assertEqual(g.__qualname__, '123') + + self.assertIsNone(g.ag_await) + self.assertIsInstance(g.ag_frame, types.FrameType) + self.assertFalse(g.ag_running) + self.assertIsInstance(g.ag_code, types.CodeType) + + self.assertTrue(inspect.isawaitable(g.aclose())) + + +class AsyncGenAsyncioTest(unittest.TestCase): + + def setUp(self): + self.loop = asyncio.new_event_loop() + asyncio.set_event_loop(None) + + def tearDown(self): + self.loop.close() + self.loop = None + + async def to_list(self, gen): + res = [] + async for i in gen: + res.append(i) + return res + + def test_async_gen_asyncio_01(self): + async def gen(): + yield 1 + await asyncio.sleep(0.01, loop=self.loop) + yield 2 + await asyncio.sleep(0.01, loop=self.loop) + return + yield 3 + + res = self.loop.run_until_complete(self.to_list(gen())) + self.assertEqual(res, [1, 2]) + + def test_async_gen_asyncio_02(self): + async def gen(): + yield 1 + await asyncio.sleep(0.01, loop=self.loop) + yield 2 + 1 / 0 + yield 3 + + with self.assertRaises(ZeroDivisionError): + self.loop.run_until_complete(self.to_list(gen())) + + def test_async_gen_asyncio_03(self): + loop = self.loop + + class Gen: + async def __aiter__(self): + yield 1 + await asyncio.sleep(0.01, loop=loop) + yield 2 + + res = loop.run_until_complete(self.to_list(Gen())) + self.assertEqual(res, [1, 2]) + + def test_async_gen_asyncio_anext_04(self): + async def foo(): + yield 1 + await asyncio.sleep(0.01, loop=self.loop) + try: + yield 2 + yield 3 + except ZeroDivisionError: + yield 1000 + await asyncio.sleep(0.01, loop=self.loop) + yield 4 + + async def run1(): + it = foo().__aiter__() + + self.assertEqual(await it.__anext__(), 1) + self.assertEqual(await it.__anext__(), 2) + self.assertEqual(await it.__anext__(), 3) + self.assertEqual(await it.__anext__(), 4) + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + + async def run2(): + it = foo().__aiter__() + + self.assertEqual(await it.__anext__(), 1) + self.assertEqual(await it.__anext__(), 2) + try: + it.__anext__().throw(ZeroDivisionError) + except StopIteration as ex: + self.assertEqual(ex.args[0], 1000) + else: + self.fail('StopIteration was not raised') + self.assertEqual(await it.__anext__(), 4) + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + + self.loop.run_until_complete(run1()) + self.loop.run_until_complete(run2()) + + def test_async_gen_asyncio_anext_05(self): + async def foo(): + v = yield 1 + v = yield v + yield v * 100 + + async def run(): + it = foo().__aiter__() + + try: + it.__anext__().send(None) + except StopIteration as ex: + self.assertEqual(ex.args[0], 1) + else: + self.fail('StopIteration was not raised') + + try: + it.__anext__().send(10) + except StopIteration as ex: + self.assertEqual(ex.args[0], 10) + else: + self.fail('StopIteration was not raised') + + try: + it.__anext__().send(12) + except StopIteration as ex: + self.assertEqual(ex.args[0], 1200) + else: + self.fail('StopIteration was not raised') + + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_anext_06(self): + DONE = 0 + + # test synchronous generators + def foo(): + try: + yield + except: + pass + g = foo() + g.send(None) + with self.assertRaises(StopIteration): + g.send(None) + + # now with asynchronous generators + + async def gen(): + nonlocal DONE + try: + yield + except: + pass + DONE = 1 + + async def run(): + nonlocal DONE + g = gen() + await g.asend(None) + with self.assertRaises(StopAsyncIteration): + await g.asend(None) + DONE += 10 + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 11) + + def test_async_gen_asyncio_anext_tuple(self): + async def foo(): + try: + yield (1,) + except ZeroDivisionError: + yield (2,) + + async def run(): + it = foo().__aiter__() + + self.assertEqual(await it.__anext__(), (1,)) + with self.assertRaises(StopIteration) as cm: + it.__anext__().throw(ZeroDivisionError) + self.assertEqual(cm.exception.args[0], (2,)) + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_anext_stopiteration(self): + async def foo(): + try: + yield StopIteration(1) + except ZeroDivisionError: + yield StopIteration(3) + + async def run(): + it = foo().__aiter__() + + v = await it.__anext__() + self.assertIsInstance(v, StopIteration) + self.assertEqual(v.value, 1) + with self.assertRaises(StopIteration) as cm: + it.__anext__().throw(ZeroDivisionError) + v = cm.exception.args[0] + self.assertIsInstance(v, StopIteration) + self.assertEqual(v.value, 3) + with self.assertRaises(StopAsyncIteration): + await it.__anext__() + + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_aclose_06(self): + async def foo(): + try: + yield 1 + 1 / 0 + finally: + await asyncio.sleep(0.01, loop=self.loop) + yield 12 + + async def run(): + gen = foo() + it = gen.__aiter__() + await it.__anext__() + await gen.aclose() + + with self.assertRaisesRegex( + RuntimeError, + "async generator ignored GeneratorExit"): + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_aclose_07(self): + DONE = 0 + + async def foo(): + nonlocal DONE + try: + yield 1 + 1 / 0 + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE += 1 + DONE += 1000 + + async def run(): + gen = foo() + it = gen.__aiter__() + await it.__anext__() + await gen.aclose() + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_aclose_08(self): + DONE = 0 + + fut = asyncio.Future(loop=self.loop) + + async def foo(): + nonlocal DONE + try: + yield 1 + await fut + DONE += 1000 + yield 2 + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE += 1 + DONE += 1000 + + async def run(): + gen = foo() + it = gen.__aiter__() + self.assertEqual(await it.__anext__(), 1) + t = self.loop.create_task(it.__anext__()) + await asyncio.sleep(0.01, loop=self.loop) + await gen.aclose() + return t + + t = self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + # Silence ResourceWarnings + fut.cancel() + t.cancel() + self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop)) + + def test_async_gen_asyncio_gc_aclose_09(self): + DONE = 0 + + async def gen(): + nonlocal DONE + try: + while True: + yield 1 + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + await g.__anext__() + await g.__anext__() + del g + + await asyncio.sleep(0.1, loop=self.loop) + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_aclose_10(self): + DONE = 0 + + # test synchronous generators + def foo(): + try: + yield + except: + pass + g = foo() + g.send(None) + g.close() + + # now with asynchronous generators + + async def gen(): + nonlocal DONE + try: + yield + except: + pass + DONE = 1 + + async def run(): + nonlocal DONE + g = gen() + await g.asend(None) + await g.aclose() + DONE += 10 + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 11) + + def test_async_gen_asyncio_aclose_11(self): + DONE = 0 + + # test synchronous generators + def foo(): + try: + yield + except: + pass + yield + g = foo() + g.send(None) + with self.assertRaisesRegex(RuntimeError, 'ignored GeneratorExit'): + g.close() + + # now with asynchronous generators + + async def gen(): + nonlocal DONE + try: + yield + except: + pass + yield + DONE += 1 + + async def run(): + nonlocal DONE + g = gen() + await g.asend(None) + with self.assertRaisesRegex(RuntimeError, 'ignored GeneratorExit'): + await g.aclose() + DONE += 10 + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 10) + + def test_async_gen_asyncio_asend_01(self): + DONE = 0 + + # Sanity check: + def sgen(): + v = yield 1 + yield v * 2 + sg = sgen() + v = sg.send(None) + self.assertEqual(v, 1) + v = sg.send(100) + self.assertEqual(v, 200) + + async def gen(): + nonlocal DONE + try: + await asyncio.sleep(0.01, loop=self.loop) + v = yield 1 + await asyncio.sleep(0.01, loop=self.loop) + yield v * 2 + await asyncio.sleep(0.01, loop=self.loop) + return + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + + v = await g.asend(None) + self.assertEqual(v, 1) + + v = await g.asend(100) + self.assertEqual(v, 200) + + with self.assertRaises(StopAsyncIteration): + await g.asend(None) + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_asend_02(self): + DONE = 0 + + async def sleep_n_crash(delay): + await asyncio.sleep(delay, loop=self.loop) + 1 / 0 + + async def gen(): + nonlocal DONE + try: + await asyncio.sleep(0.01, loop=self.loop) + v = yield 1 + await sleep_n_crash(0.01) + DONE += 1000 + yield v * 2 + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + + v = await g.asend(None) + self.assertEqual(v, 1) + + await g.asend(100) + + with self.assertRaises(ZeroDivisionError): + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_asend_03(self): + DONE = 0 + + async def sleep_n_crash(delay): + fut = asyncio.ensure_future(asyncio.sleep(delay, loop=self.loop), + loop=self.loop) + self.loop.call_later(delay / 2, lambda: fut.cancel()) + return await fut + + async def gen(): + nonlocal DONE + try: + await asyncio.sleep(0.01, loop=self.loop) + v = yield 1 + await sleep_n_crash(0.01) + DONE += 1000 + yield v * 2 + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + + v = await g.asend(None) + self.assertEqual(v, 1) + + await g.asend(100) + + with self.assertRaises(asyncio.CancelledError): + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_athrow_01(self): + DONE = 0 + + class FooEr(Exception): + pass + + # Sanity check: + def sgen(): + try: + v = yield 1 + except FooEr: + v = 1000 + yield v * 2 + sg = sgen() + v = sg.send(None) + self.assertEqual(v, 1) + v = sg.throw(FooEr) + self.assertEqual(v, 2000) + with self.assertRaises(StopIteration): + sg.send(None) + + async def gen(): + nonlocal DONE + try: + await asyncio.sleep(0.01, loop=self.loop) + try: + v = yield 1 + except FooEr: + v = 1000 + await asyncio.sleep(0.01, loop=self.loop) + yield v * 2 + await asyncio.sleep(0.01, loop=self.loop) + # return + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + + v = await g.asend(None) + self.assertEqual(v, 1) + + v = await g.athrow(FooEr) + self.assertEqual(v, 2000) + + with self.assertRaises(StopAsyncIteration): + await g.asend(None) + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_athrow_02(self): + DONE = 0 + + class FooEr(Exception): + pass + + async def sleep_n_crash(delay): + fut = asyncio.ensure_future(asyncio.sleep(delay, loop=self.loop), + loop=self.loop) + self.loop.call_later(delay / 2, lambda: fut.cancel()) + return await fut + + async def gen(): + nonlocal DONE + try: + await asyncio.sleep(0.01, loop=self.loop) + try: + v = yield 1 + except FooEr: + await sleep_n_crash(0.01) + yield v * 2 + await asyncio.sleep(0.01, loop=self.loop) + # return + finally: + await asyncio.sleep(0.01, loop=self.loop) + await asyncio.sleep(0.01, loop=self.loop) + DONE = 1 + + async def run(): + g = gen() + + v = await g.asend(None) + self.assertEqual(v, 1) + + try: + await g.athrow(FooEr) + except asyncio.CancelledError: + self.assertEqual(DONE, 1) + raise + else: + self.fail('CancelledError was not raised') + + with self.assertRaises(asyncio.CancelledError): + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 1) + + def test_async_gen_asyncio_athrow_03(self): + DONE = 0 + + # test synchronous generators + def foo(): + try: + yield + except: + pass + g = foo() + g.send(None) + with self.assertRaises(StopIteration): + g.throw(ValueError) + + # now with asynchronous generators + + async def gen(): + nonlocal DONE + try: + yield + except: + pass + DONE = 1 + + async def run(): + nonlocal DONE + g = gen() + await g.asend(None) + with self.assertRaises(StopAsyncIteration): + await g.athrow(ValueError) + DONE += 10 + + self.loop.run_until_complete(run()) + self.assertEqual(DONE, 11) + + def test_async_gen_asyncio_athrow_tuple(self): + async def gen(): + try: + yield 1 + except ZeroDivisionError: + yield (2,) + + async def run(): + g = gen() + v = await g.asend(None) + self.assertEqual(v, 1) + v = await g.athrow(ZeroDivisionError) + self.assertEqual(v, (2,)) + with self.assertRaises(StopAsyncIteration): + await g.asend(None) + + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_athrow_stopiteration(self): + async def gen(): + try: + yield 1 + except ZeroDivisionError: + yield StopIteration(2) + + async def run(): + g = gen() + v = await g.asend(None) + self.assertEqual(v, 1) + v = await g.athrow(ZeroDivisionError) + self.assertIsInstance(v, StopIteration) + self.assertEqual(v.value, 2) + with self.assertRaises(StopAsyncIteration): + await g.asend(None) + + self.loop.run_until_complete(run()) + + def test_async_gen_asyncio_shutdown_01(self): + finalized = 0 + + async def waiter(timeout): + nonlocal finalized + try: + await asyncio.sleep(timeout, loop=self.loop) + yield 1 + finally: + await asyncio.sleep(0, loop=self.loop) + finalized += 1 + + async def wait(): + async for _ in waiter(1): + pass + + t1 = self.loop.create_task(wait()) + t2 = self.loop.create_task(wait()) + + self.loop.run_until_complete(asyncio.sleep(0.1, loop=self.loop)) + + self.loop.run_until_complete(self.loop.shutdown_asyncgens()) + self.assertEqual(finalized, 2) + + # Silence warnings + t1.cancel() + t2.cancel() + self.loop.run_until_complete(asyncio.sleep(0.1, loop=self.loop)) + + def test_async_gen_asyncio_shutdown_02(self): + logged = 0 + + def logger(loop, context): + nonlocal logged + self.assertIn('asyncgen', context) + expected = 'an error occurred during closing of asynchronous' + if expected in context['message']: + logged += 1 + + async def waiter(timeout): + try: + await asyncio.sleep(timeout, loop=self.loop) + yield 1 + finally: + 1 / 0 + + async def wait(): + async for _ in waiter(1): + pass + + t = self.loop.create_task(wait()) + self.loop.run_until_complete(asyncio.sleep(0.1, loop=self.loop)) + + self.loop.set_exception_handler(logger) + self.loop.run_until_complete(self.loop.shutdown_asyncgens()) + + self.assertEqual(logged, 1) + + # Silence warnings + t.cancel() + self.loop.run_until_complete(asyncio.sleep(0.1, loop=self.loop)) + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py index 3a33fc8..0eba76d 100644 --- a/Lib/test/test_asynchat.py +++ b/Lib/test/test_asynchat.py @@ -12,7 +12,6 @@ import socket import sys import time import unittest -import warnings import unittest.mock try: import threading @@ -297,37 +296,6 @@ class TestHelperFunctions(unittest.TestCase): self.assertEqual(asynchat.find_prefix_at_end("qwertydkjf", "\r\n"), 0) -class TestFifo(unittest.TestCase): - def test_basic(self): - with self.assertWarns(DeprecationWarning) as cm: - f = asynchat.fifo() - self.assertEqual(str(cm.warning), - "fifo class will be removed in Python 3.6") - f.push(7) - f.push(b'a') - self.assertEqual(len(f), 2) - self.assertEqual(f.first(), 7) - self.assertEqual(f.pop(), (1, 7)) - self.assertEqual(len(f), 1) - self.assertEqual(f.first(), b'a') - self.assertEqual(f.is_empty(), False) - self.assertEqual(f.pop(), (1, b'a')) - self.assertEqual(len(f), 0) - self.assertEqual(f.is_empty(), True) - self.assertEqual(f.pop(), (0, None)) - - def test_given_list(self): - with self.assertWarns(DeprecationWarning) as cm: - f = asynchat.fifo([b'x', 17, 3]) - self.assertEqual(str(cm.warning), - "fifo class will be removed in Python 3.6") - self.assertEqual(len(f), 3) - self.assertEqual(f.pop(), (1, b'x')) - self.assertEqual(f.pop(), (1, 17)) - self.assertEqual(f.pop(), (1, 3)) - self.assertEqual(f.pop(), (0, None)) - - class TestNotConnected(unittest.TestCase): def test_disallow_negative_terminator(self): # Issue #11259 diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 492a84a..28d92a9 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -1,7 +1,6 @@ """Tests for events.py.""" import collections.abc -import concurrent.futures import functools import gc import io @@ -58,15 +57,6 @@ def osx_tiger(): return version < (10, 5) -def _test_get_event_loop_new_process__sub_proc(): - async def doit(): - return 'hello' - - loop = asyncio.new_event_loop() - asyncio.set_event_loop(loop) - return loop.run_until_complete(doit()) - - ONLYCERT = data_file('ssl_cert.pem') ONLYKEY = data_file('ssl_key.pem') SIGNED_CERTFILE = data_file('keycert3.pem') @@ -2191,20 +2181,6 @@ else: asyncio.set_child_watcher(None) super().tearDown() - def test_get_event_loop_new_process(self): - async def main(): - pool = concurrent.futures.ProcessPoolExecutor() - result = await self.loop.run_in_executor( - pool, _test_get_event_loop_new_process__sub_proc) - pool.shutdown() - return result - - self.unpatch_get_running_loop() - - self.assertEqual( - self.loop.run_until_complete(main()), - 'hello') - if hasattr(selectors, 'KqueueSelector'): class KqueueEventLoopTests(UnixEventLoopTestsMixin, SubprocessTestsMixin, diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index 195a006..89afdca 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -9,6 +9,7 @@ from unittest import mock import asyncio from asyncio import test_utils +from asyncio import futures try: from test import support except ImportError: @@ -94,7 +95,10 @@ class DuckTests(test_utils.TestCase): assert g is f -class FutureTests(test_utils.TestCase): +class BaseFutureTests: + + def _new_future(self, loop=None): + raise NotImplementedError def setUp(self): super().setUp() @@ -110,22 +114,22 @@ class FutureTests(test_utils.TestCase): self.assertFalse(asyncio.isfuture(MyFuture)) self.assertTrue(asyncio.isfuture(MyFuture())) - self.assertFalse(asyncio.isfuture(1)) - self.assertFalse(asyncio.isfuture(asyncio.Future)) # As `isinstance(Mock(), Future)` returns `False` self.assertFalse(asyncio.isfuture(mock.Mock())) + f = self._new_future(loop=self.loop) + self.assertTrue(asyncio.isfuture(f)) + self.assertFalse(asyncio.isfuture(type(f))) + # As `isinstance(Mock(Future), Future)` returns `True` - self.assertTrue(asyncio.isfuture(mock.Mock(asyncio.Future))) + self.assertTrue(asyncio.isfuture(mock.Mock(type(f)))) - f = asyncio.Future(loop=self.loop) - self.assertTrue(asyncio.isfuture(f)) f.cancel() def test_initial_state(self): - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) self.assertFalse(f.cancelled()) self.assertFalse(f.done()) f.cancel() @@ -133,15 +137,15 @@ class FutureTests(test_utils.TestCase): def test_init_constructor_default_loop(self): asyncio.set_event_loop(self.loop) - f = asyncio.Future() + f = self._new_future() self.assertIs(f._loop, self.loop) def test_constructor_positional(self): # Make sure Future doesn't accept a positional argument - self.assertRaises(TypeError, asyncio.Future, 42) + self.assertRaises(TypeError, self._new_future, 42) def test_cancel(self): - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) self.assertTrue(f.cancel()) self.assertTrue(f.cancelled()) self.assertTrue(f.done()) @@ -152,7 +156,7 @@ class FutureTests(test_utils.TestCase): self.assertFalse(f.cancel()) def test_result(self): - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) self.assertRaises(asyncio.InvalidStateError, f.result) f.set_result(42) @@ -166,7 +170,7 @@ class FutureTests(test_utils.TestCase): def test_exception(self): exc = RuntimeError() - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) self.assertRaises(asyncio.InvalidStateError, f.exception) # StopIteration cannot be raised into a Future - CPython issue26221 @@ -183,12 +187,12 @@ class FutureTests(test_utils.TestCase): self.assertFalse(f.cancel()) def test_exception_class(self): - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) f.set_exception(RuntimeError) self.assertIsInstance(f.exception(), RuntimeError) def test_yield_from_twice(self): - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) def fixture(): yield 'A' @@ -207,7 +211,7 @@ class FutureTests(test_utils.TestCase): def test_future_repr(self): self.loop.set_debug(True) - f_pending_debug = asyncio.Future(loop=self.loop) + f_pending_debug = self._new_future(loop=self.loop) frame = f_pending_debug._source_traceback[-1] self.assertEqual(repr(f_pending_debug), '' @@ -215,21 +219,21 @@ class FutureTests(test_utils.TestCase): f_pending_debug.cancel() self.loop.set_debug(False) - f_pending = asyncio.Future(loop=self.loop) + f_pending = self._new_future(loop=self.loop) self.assertEqual(repr(f_pending), '') f_pending.cancel() - f_cancelled = asyncio.Future(loop=self.loop) + f_cancelled = self._new_future(loop=self.loop) f_cancelled.cancel() self.assertEqual(repr(f_cancelled), '') - f_result = asyncio.Future(loop=self.loop) + f_result = self._new_future(loop=self.loop) f_result.set_result(4) self.assertEqual(repr(f_result), '') self.assertEqual(f_result.result(), 4) exc = RuntimeError() - f_exception = asyncio.Future(loop=self.loop) + f_exception = self._new_future(loop=self.loop) f_exception.set_exception(exc) self.assertEqual(repr(f_exception), '') @@ -240,7 +244,7 @@ class FutureTests(test_utils.TestCase): text = '%s() at %s:%s' % (func.__qualname__, filename, lineno) return re.escape(text) - f_one_callbacks = asyncio.Future(loop=self.loop) + f_one_callbacks = self._new_future(loop=self.loop) f_one_callbacks.add_done_callback(_fakefunc) fake_repr = func_repr(_fakefunc) self.assertRegex(repr(f_one_callbacks), @@ -249,7 +253,7 @@ class FutureTests(test_utils.TestCase): self.assertEqual(repr(f_one_callbacks), '') - f_two_callbacks = asyncio.Future(loop=self.loop) + f_two_callbacks = self._new_future(loop=self.loop) f_two_callbacks.add_done_callback(first_cb) f_two_callbacks.add_done_callback(last_cb) first_repr = func_repr(first_cb) @@ -258,7 +262,7 @@ class FutureTests(test_utils.TestCase): r'' % (first_repr, last_repr)) - f_many_callbacks = asyncio.Future(loop=self.loop) + f_many_callbacks = self._new_future(loop=self.loop) f_many_callbacks.add_done_callback(first_cb) for i in range(8): f_many_callbacks.add_done_callback(_fakefunc) @@ -273,31 +277,31 @@ class FutureTests(test_utils.TestCase): def test_copy_state(self): from asyncio.futures import _copy_future_state - f = asyncio.Future(loop=self.loop) + f = self._new_future(loop=self.loop) f.set_result(10) - newf = asyncio.Future(loop=self.loop) + newf = self._new_future(loop=self.loop) _copy_future_state(f, newf) self.assertTrue(newf.done()) self.assertEqual(newf.result(), 10) - f_exception = asyncio.Future(loop=self.loop) + f_exception = self._new_future(loop=self.loop) f_exception.set_exception(RuntimeError()) - newf_exception = asyncio.Future(loop=self.loop) + newf_exception = self._new_future(loop=self.loop) _copy_future_state(f_exception, newf_exception) self.assertTrue(newf_exception.done()) self.assertRaises(RuntimeError, newf_exception.result) - f_cancelled = asyncio.Future(loop=self.loop) + f_cancelled = self._new_future(loop=self.loop) f_cancelled.cancel() - newf_cancelled = asyncio.Future(loop=self.loop) + newf_cancelled = self._new_future(loop=self.loop) _copy_future_state(f_cancelled, newf_cancelled) self.assertTrue(newf_cancelled.cancelled()) def test_iter(self): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) def coro(): yield from fut @@ -310,28 +314,20 @@ class FutureTests(test_utils.TestCase): @mock.patch('asyncio.base_events.logger') def test_tb_logger_abandoned(self, m_log): - fut = asyncio.Future(loop=self.loop) - del fut - self.assertFalse(m_log.error.called) - - @mock.patch('asyncio.base_events.logger') - def test_tb_logger_not_called_after_cancel(self, m_log): - fut = asyncio.Future(loop=self.loop) - fut.set_exception(Exception()) - fut.cancel() + fut = self._new_future(loop=self.loop) del fut self.assertFalse(m_log.error.called) @mock.patch('asyncio.base_events.logger') def test_tb_logger_result_unretrieved(self, m_log): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.set_result(42) del fut self.assertFalse(m_log.error.called) @mock.patch('asyncio.base_events.logger') def test_tb_logger_result_retrieved(self, m_log): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.set_result(42) fut.result() del fut @@ -339,7 +335,7 @@ class FutureTests(test_utils.TestCase): @mock.patch('asyncio.base_events.logger') def test_tb_logger_exception_unretrieved(self, m_log): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.set_exception(RuntimeError('boom')) del fut test_utils.run_briefly(self.loop) @@ -348,7 +344,7 @@ class FutureTests(test_utils.TestCase): @mock.patch('asyncio.base_events.logger') def test_tb_logger_exception_retrieved(self, m_log): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.set_exception(RuntimeError('boom')) fut.exception() del fut @@ -356,7 +352,7 @@ class FutureTests(test_utils.TestCase): @mock.patch('asyncio.base_events.logger') def test_tb_logger_exception_result_retrieved(self, m_log): - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.set_exception(RuntimeError('boom')) self.assertRaises(RuntimeError, fut.result) del fut @@ -370,12 +366,12 @@ class FutureTests(test_utils.TestCase): f1 = ex.submit(run, 'oi') f2 = asyncio.wrap_future(f1, loop=self.loop) res, ident = self.loop.run_until_complete(f2) - self.assertIsInstance(f2, asyncio.Future) + self.assertTrue(asyncio.isfuture(f2)) self.assertEqual(res, 'oi') self.assertNotEqual(ident, threading.get_ident()) def test_wrap_future_future(self): - f1 = asyncio.Future(loop=self.loop) + f1 = self._new_future(loop=self.loop) f2 = asyncio.wrap_future(f1) self.assertIs(f1, f2) @@ -410,10 +406,10 @@ class FutureTests(test_utils.TestCase): def test_future_source_traceback(self): self.loop.set_debug(True) - future = asyncio.Future(loop=self.loop) + future = self._new_future(loop=self.loop) lineno = sys._getframe().f_lineno - 1 self.assertIsInstance(future._source_traceback, list) - self.assertEqual(future._source_traceback[-1][:3], + self.assertEqual(future._source_traceback[-2][:3], (__file__, lineno, 'test_future_source_traceback')) @@ -429,57 +425,18 @@ class FutureTests(test_utils.TestCase): return exc exc = memory_error() - future = asyncio.Future(loop=self.loop) - if debug: - source_traceback = future._source_traceback + future = self._new_future(loop=self.loop) future.set_exception(exc) future = None test_utils.run_briefly(self.loop) support.gc_collect() if sys.version_info >= (3, 4): - if debug: - frame = source_traceback[-1] - regex = (r'^Future exception was never retrieved\n' - r'future: \n' - r'source_traceback: Object ' - r'created at \(most recent call last\):\n' - r' File' - r'.*\n' - r' File "{filename}", line {lineno}, ' - r'in check_future_exception_never_retrieved\n' - r' future = asyncio\.Future\(loop=self\.loop\)$' - ).format(filename=re.escape(frame[0]), - lineno=frame[1]) - else: - regex = (r'^Future exception was never retrieved\n' - r'future: ' - r'$' - ) + regex = r'^Future exception was never retrieved\n' exc_info = (type(exc), exc, exc.__traceback__) m_log.error.assert_called_once_with(mock.ANY, exc_info=exc_info) else: - if debug: - frame = source_traceback[-1] - regex = (r'^Future/Task exception was never retrieved\n' - r'Future/Task created at \(most recent call last\):\n' - r' File' - r'.*\n' - r' File "{filename}", line {lineno}, ' - r'in check_future_exception_never_retrieved\n' - r' future = asyncio\.Future\(loop=self\.loop\)\n' - r'Traceback \(most recent call last\):\n' - r'.*\n' - r'MemoryError$' - ).format(filename=re.escape(frame[0]), - lineno=frame[1]) - else: - regex = (r'^Future/Task exception was never retrieved\n' - r'Traceback \(most recent call last\):\n' - r'.*\n' - r'MemoryError$' - ) + regex = r'^Future/Task exception was never retrieved\n' m_log.error.assert_called_once_with(mock.ANY, exc_info=False) message = m_log.error.call_args[0][0] self.assertRegex(message, re.compile(regex, re.DOTALL)) @@ -491,14 +448,49 @@ class FutureTests(test_utils.TestCase): self.check_future_exception_never_retrieved(True) def test_set_result_unless_cancelled(self): - from asyncio import futures - fut = asyncio.Future(loop=self.loop) + fut = self._new_future(loop=self.loop) fut.cancel() futures._set_result_unless_cancelled(fut, 2) self.assertTrue(fut.cancelled()) + def test_future_stop_iteration_args(self): + fut = self._new_future(loop=self.loop) + fut.set_result((1, 2)) + fi = fut.__iter__() + result = None + try: + fi.send(None) + except StopIteration as ex: + result = ex.args[0] + else: + self.fail('StopIteration was expected') + self.assertEqual(result, (1, 2)) + + def test_future_iter_throw(self): + fut = self._new_future(loop=self.loop) + fi = iter(fut) + self.assertRaises(TypeError, fi.throw, + Exception, Exception("elephant"), 32) + self.assertRaises(TypeError, fi.throw, + Exception("elephant"), Exception("elephant")) + self.assertRaises(TypeError, fi.throw, list) + -class FutureDoneCallbackTests(test_utils.TestCase): +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +class CFutureTests(BaseFutureTests, test_utils.TestCase): + + def _new_future(self, *args, **kwargs): + return futures._CFuture(*args, **kwargs) + + +class PyFutureTests(BaseFutureTests, test_utils.TestCase): + + def _new_future(self, *args, **kwargs): + return futures._PyFuture(*args, **kwargs) + + +class BaseFutureDoneCallbackTests(): def setUp(self): super().setUp() @@ -514,7 +506,7 @@ class FutureDoneCallbackTests(test_utils.TestCase): return bag_appender def _new_future(self): - return asyncio.Future(loop=self.loop) + raise NotImplementedError def test_callbacks_invoked_on_set_result(self): bag = [] @@ -578,5 +570,21 @@ class FutureDoneCallbackTests(test_utils.TestCase): self.assertEqual(f.result(), 'foo') +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +class CFutureDoneCallbackTests(BaseFutureDoneCallbackTests, + test_utils.TestCase): + + def _new_future(self): + return futures._CFuture(loop=self.loop) + + +class PyFutureDoneCallbackTests(BaseFutureDoneCallbackTests, + test_utils.TestCase): + + def _new_future(self): + return futures._PyFuture(loop=self.loop) + + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py index c85e8b1..152948c 100644 --- a/Lib/test/test_asyncio/test_locks.py +++ b/Lib/test/test_asyncio/test_locks.py @@ -176,28 +176,6 @@ class LockTests(test_utils.TestCase): self.assertTrue(tb.cancelled()) self.assertTrue(tc.done()) - def test_finished_waiter_cancelled(self): - lock = asyncio.Lock(loop=self.loop) - - ta = asyncio.Task(lock.acquire(), loop=self.loop) - test_utils.run_briefly(self.loop) - self.assertTrue(lock.locked()) - - tb = asyncio.Task(lock.acquire(), loop=self.loop) - test_utils.run_briefly(self.loop) - self.assertEqual(len(lock._waiters), 1) - - # Create a second waiter, wake up the first, and cancel it. - # Without the fix, the second was not woken up. - tc = asyncio.Task(lock.acquire(), loop=self.loop) - lock.release() - tb.cancel() - test_utils.run_briefly(self.loop) - - self.assertTrue(lock.locked()) - self.assertTrue(ta.done()) - self.assertTrue(tb.cancelled()) - def test_release_not_acquired(self): lock = asyncio.Lock(loop=self.loop) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py index c50b3e4..6bf7862 100644 --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -24,14 +24,16 @@ MOCK_ANY = mock.ANY class TestBaseSelectorEventLoop(BaseSelectorEventLoop): + def close(self): + # Don't call the close() method of the parent class, because the + # selector is mocked + self._closed = True + def _make_self_pipe(self): self._ssock = mock.Mock() self._csock = mock.Mock() self._internal_fds += 1 - def _close_self_pipe(self): - pass - def list_to_buffer(l=()): return bytearray().join(l) diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index bcd236e..59ff0f6 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -42,7 +42,6 @@ class SslProtoHandshakeTests(test_utils.TestCase): sslpipe.do_handshake.side_effect = mock_handshake with mock.patch('asyncio.sslproto._SSLPipe', return_value=sslpipe): ssl_proto.connection_made(transport) - return transport def test_cancel_handshake(self): # Python issue #23197: cancelling a handshake must not raise an @@ -96,31 +95,5 @@ class SslProtoHandshakeTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertIsInstance(waiter.exception(), ConnectionAbortedError) - def test_close_during_handshake(self): - # bpo-29743 Closing transport during handshake process leaks socket - waiter = asyncio.Future(loop=self.loop) - ssl_proto = self.ssl_protocol(waiter) - - def do_handshake(callback): - return [] - - transport = self.connection_made(ssl_proto) - test_utils.run_briefly(self.loop) - - ssl_proto._app_transport.close() - self.assertTrue(transport.abort.called) - - def test_get_extra_info_on_closed_connection(self): - waiter = asyncio.Future(loop=self.loop) - ssl_proto = self.ssl_protocol(waiter) - self.assertIsNone(ssl_proto._get_extra_info('socket')) - default = object() - self.assertIs(ssl_proto._get_extra_info('socket', default), default) - self.connection_made(ssl_proto) - self.assertIsNotNone(ssl_proto._get_extra_info('socket')) - ssl_proto.connection_lost(None) - self.assertIsNone(ssl_proto._get_extra_info('socket')) - - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 2e14a8a..bba688b 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -459,30 +459,6 @@ class SubprocessMixin: self.loop.run_until_complete(create) self.assertEqual(warns, []) - def test_read_stdout_after_process_exit(self): - @asyncio.coroutine - def execute(): - code = '\n'.join(['import sys', - 'for _ in range(64):', - ' sys.stdout.write("x" * 4096)', - 'sys.stdout.flush()', - 'sys.exit(1)']) - - fut = asyncio.create_subprocess_exec( - sys.executable, '-c', code, - stdout=asyncio.subprocess.PIPE, - loop=self.loop) - - process = yield from fut - while True: - data = yield from process.stdout.read(65536) - if data: - yield from asyncio.sleep(0.3, loop=self.loop) - else: - break - - self.loop.run_until_complete(execute()) - if sys.platform != 'win32': # Unix diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index c419015..a18d49a 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1,5 +1,6 @@ """Tests for tasks.py.""" +import collections import contextlib import functools import io @@ -14,6 +15,8 @@ from unittest import mock import asyncio from asyncio import coroutines +from asyncio import futures +from asyncio import tasks from asyncio import test_utils try: from test import support @@ -72,15 +75,26 @@ class Dummy: pass -class TaskTests(test_utils.TestCase): +class BaseTaskTests: + + Task = None + Future = None + + def new_task(self, loop, coro): + return self.__class__.Task(coro, loop=loop) + + def new_future(self, loop): + return self.__class__.Future(loop=loop) def setUp(self): super().setUp() self.loop = self.new_test_loop() + self.loop.set_task_factory(self.new_task) + self.loop.create_future = lambda: self.new_future(self.loop) def test_other_loop_future(self): other_loop = asyncio.new_event_loop() - fut = asyncio.Future(loop=other_loop) + fut = self.new_future(other_loop) @asyncio.coroutine def run(fut): @@ -108,7 +122,7 @@ class TaskTests(test_utils.TestCase): @asyncio.coroutine def notmuch(): return 'ok' - t = asyncio.Task(notmuch(), loop=self.loop) + t = self.new_task(self.loop, notmuch()) self.loop.run_until_complete(t) self.assertTrue(t.done()) self.assertEqual(t.result(), 'ok') @@ -116,7 +130,7 @@ class TaskTests(test_utils.TestCase): loop = asyncio.new_event_loop() self.set_event_loop(loop) - t = asyncio.Task(notmuch(), loop=loop) + t = self.new_task(loop, notmuch()) self.assertIs(t._loop, loop) loop.run_until_complete(t) loop.close() @@ -139,7 +153,7 @@ class TaskTests(test_utils.TestCase): loop.close() def test_ensure_future_future(self): - f_orig = asyncio.Future(loop=self.loop) + f_orig = self.new_future(self.loop) f_orig.set_result('ko') f = asyncio.ensure_future(f_orig) @@ -163,7 +177,7 @@ class TaskTests(test_utils.TestCase): @asyncio.coroutine def notmuch(): return 'ok' - t_orig = asyncio.Task(notmuch(), loop=self.loop) + t_orig = self.new_task(self.loop, notmuch()) t = asyncio.ensure_future(t_orig) self.loop.run_until_complete(t) self.assertTrue(t.done()) @@ -204,7 +218,7 @@ class TaskTests(test_utils.TestCase): asyncio.ensure_future('ok') def test_async_warning(self): - f = asyncio.Future(loop=self.loop) + f = self.new_future(self.loop) with self.assertWarnsRegex(DeprecationWarning, 'function is deprecated, use ensure_'): self.assertIs(f, asyncio.async(f)) @@ -251,8 +265,8 @@ class TaskTests(test_utils.TestCase): # test coroutine function self.assertEqual(notmuch.__name__, 'notmuch') if PY35: - self.assertEqual(notmuch.__qualname__, - 'TaskTests.test_task_repr..notmuch') + self.assertRegex(notmuch.__qualname__, + r'\w+.test_task_repr..notmuch') self.assertEqual(notmuch.__module__, __name__) filename, lineno = test_utils.get_function_source(notmuch) @@ -261,7 +275,7 @@ class TaskTests(test_utils.TestCase): # test coroutine object gen = notmuch() if coroutines._DEBUG or PY35: - coro_qualname = 'TaskTests.test_task_repr..notmuch' + coro_qualname = 'BaseTaskTests.test_task_repr..notmuch' else: coro_qualname = 'notmuch' self.assertEqual(gen.__name__, 'notmuch') @@ -270,7 +284,7 @@ class TaskTests(test_utils.TestCase): coro_qualname) # test pending Task - t = asyncio.Task(gen, loop=self.loop) + t = self.new_task(self.loop, gen) t.add_done_callback(Dummy()) coro = format_coroutine(coro_qualname, 'running', src, @@ -292,7 +306,7 @@ class TaskTests(test_utils.TestCase): '' % coro) # test finished Task - t = asyncio.Task(notmuch(), loop=self.loop) + t = self.new_task(self.loop, notmuch()) self.loop.run_until_complete(t) coro = format_coroutine(coro_qualname, 'done', src, t._source_traceback) @@ -311,9 +325,9 @@ class TaskTests(test_utils.TestCase): # test coroutine function self.assertEqual(notmuch.__name__, 'notmuch') if PY35: - self.assertEqual(notmuch.__qualname__, - 'TaskTests.test_task_repr_coro_decorator' - '..notmuch') + self.assertRegex(notmuch.__qualname__, + r'\w+.test_task_repr_coro_decorator' + r'\.\.notmuch') self.assertEqual(notmuch.__module__, __name__) # test coroutine object @@ -323,7 +337,7 @@ class TaskTests(test_utils.TestCase): # function, as expected, and have a qualified name (__qualname__ # attribute). coro_name = 'notmuch' - coro_qualname = ('TaskTests.test_task_repr_coro_decorator' + coro_qualname = ('BaseTaskTests.test_task_repr_coro_decorator' '..notmuch') else: # On Python < 3.5, generators inherit the name of the code, not of @@ -351,7 +365,7 @@ class TaskTests(test_utils.TestCase): self.assertEqual(repr(gen), '' % coro) # test pending Task - t = asyncio.Task(gen, loop=self.loop) + t = self.new_task(self.loop, gen) t.add_done_callback(Dummy()) # format the coroutine object @@ -374,8 +388,8 @@ class TaskTests(test_utils.TestCase): def wait_for(fut): return (yield from fut) - fut = asyncio.Future(loop=self.loop) - task = asyncio.Task(wait_for(fut), loop=self.loop) + fut = self.new_future(self.loop) + task = self.new_task(self.loop, wait_for(fut)) test_utils.run_briefly(self.loop) self.assertRegex(repr(task), '' % re.escape(repr(fut))) @@ -401,10 +415,11 @@ class TaskTests(test_utils.TestCase): self.addCleanup(task._coro.close) coro_repr = repr(task._coro) - expected = ('.func(1)() running, ') - self.assertTrue(coro_repr.startswith(expected), - coro_repr) + expected = ( + r'\.func\(1\)\(\) running, ' + ) + self.assertRegex(coro_repr, expected) def test_task_basics(self): @asyncio.coroutine @@ -438,7 +453,7 @@ class TaskTests(test_utils.TestCase): yield from asyncio.sleep(10.0, loop=loop) return 12 - t = asyncio.Task(task(), loop=loop) + t = self.new_task(loop, task()) loop.call_soon(t.cancel) with self.assertRaises(asyncio.CancelledError): loop.run_until_complete(t) @@ -453,7 +468,7 @@ class TaskTests(test_utils.TestCase): yield return 12 - t = asyncio.Task(task(), loop=self.loop) + t = self.new_task(self.loop, task()) test_utils.run_briefly(self.loop) # start coro t.cancel() self.assertRaises( @@ -463,14 +478,14 @@ class TaskTests(test_utils.TestCase): self.assertFalse(t.cancel()) def test_cancel_inner_future(self): - f = asyncio.Future(loop=self.loop) + f = self.new_future(self.loop) @asyncio.coroutine def task(): yield from f return 12 - t = asyncio.Task(task(), loop=self.loop) + t = self.new_task(self.loop, task()) test_utils.run_briefly(self.loop) # start task f.cancel() with self.assertRaises(asyncio.CancelledError): @@ -479,14 +494,14 @@ class TaskTests(test_utils.TestCase): self.assertTrue(t.cancelled()) def test_cancel_both_task_and_inner_future(self): - f = asyncio.Future(loop=self.loop) + f = self.new_future(self.loop) @asyncio.coroutine def task(): yield from f return 12 - t = asyncio.Task(task(), loop=self.loop) + t = self.new_task(self.loop, task()) test_utils.run_briefly(self.loop) f.cancel() @@ -500,8 +515,8 @@ class TaskTests(test_utils.TestCase): self.assertTrue(t.cancelled()) def test_cancel_task_catching(self): - fut1 = asyncio.Future(loop=self.loop) - fut2 = asyncio.Future(loop=self.loop) + fut1 = self.new_future(self.loop) + fut2 = self.new_future(self.loop) @asyncio.coroutine def task(): @@ -511,7 +526,7 @@ class TaskTests(test_utils.TestCase): except asyncio.CancelledError: return 42 - t = asyncio.Task(task(), loop=self.loop) + t = self.new_task(self.loop, task()) test_utils.run_briefly(self.loop) self.assertIs(t._fut_waiter, fut1) # White-box test. fut1.set_result(None) @@ -524,9 +539,9 @@ class TaskTests(test_utils.TestCase): self.assertFalse(t.cancelled()) def test_cancel_task_ignoring(self): - fut1 = asyncio.Future(loop=self.loop) - fut2 = asyncio.Future(loop=self.loop) - fut3 = asyncio.Future(loop=self.loop) + fut1 = self.new_future(self.loop) + fut2 = self.new_future(self.loop) + fut3 = self.new_future(self.loop) @asyncio.coroutine def task(): @@ -538,7 +553,7 @@ class TaskTests(test_utils.TestCase): res = yield from fut3 return res - t = asyncio.Task(task(), loop=self.loop) + t = self.new_task(self.loop, task()) test_utils.run_briefly(self.loop) self.assertIs(t._fut_waiter, fut1) # White-box test. fut1.set_result(None) @@ -566,25 +581,7 @@ class TaskTests(test_utils.TestCase): yield from asyncio.sleep(100, loop=loop) return 12 - t = asyncio.Task(task(), loop=loop) - self.assertRaises( - asyncio.CancelledError, loop.run_until_complete, t) - self.assertTrue(t.done()) - self.assertFalse(t._must_cancel) # White-box test. - self.assertFalse(t.cancel()) - - def test_cancel_at_end(self): - """coroutine end right after task is cancelled""" - loop = asyncio.new_event_loop() - self.set_event_loop(loop) - - @asyncio.coroutine - def task(): - t.cancel() - self.assertTrue(t._must_cancel) # White-box test. - return 12 - - t = asyncio.Task(task(), loop=loop) + t = self.new_task(loop, task()) self.assertRaises( asyncio.CancelledError, loop.run_until_complete, t) self.assertTrue(t.done()) @@ -617,7 +614,7 @@ class TaskTests(test_utils.TestCase): if x == 2: loop.stop() - t = asyncio.Task(task(), loop=loop) + t = self.new_task(loop, task()) with self.assertRaises(RuntimeError) as cm: loop.run_until_complete(t) self.assertEqual(str(cm.exception), @@ -655,7 +652,7 @@ class TaskTests(test_utils.TestCase): foo_running = False return 'done' - fut = asyncio.Task(foo(), loop=loop) + fut = self.new_task(loop, foo()) with self.assertRaises(asyncio.TimeoutError): loop.run_until_complete(asyncio.wait_for(fut, 0.1, loop=loop)) @@ -695,7 +692,7 @@ class TaskTests(test_utils.TestCase): asyncio.set_event_loop(loop) try: - fut = asyncio.Task(foo(), loop=loop) + fut = self.new_task(loop, foo()) with self.assertRaises(asyncio.TimeoutError): loop.run_until_complete(asyncio.wait_for(fut, 0.01)) finally: @@ -714,7 +711,7 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - fut = asyncio.Future(loop=loop) + fut = self.new_future(loop) task = asyncio.wait_for(fut, timeout=0.2, loop=loop) loop.call_later(0.1, fut.set_result, "ok") res = loop.run_until_complete(task) @@ -731,8 +728,8 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(0.1, loop=loop), loop=loop) - b = asyncio.Task(asyncio.sleep(0.15, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(0.1, loop=loop)) + b = self.new_task(loop, asyncio.sleep(0.15, loop=loop)) @asyncio.coroutine def foo(): @@ -741,12 +738,12 @@ class TaskTests(test_utils.TestCase): self.assertEqual(pending, set()) return 42 - res = loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + res = loop.run_until_complete(self.new_task(loop, foo())) self.assertEqual(res, 42) self.assertAlmostEqual(0.15, loop.time()) # Doing it again should take no time and exercise a different path. - res = loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + res = loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.15, loop.time()) self.assertEqual(res, 42) @@ -761,8 +758,8 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(0.01, loop=loop), loop=loop) - b = asyncio.Task(asyncio.sleep(0.015, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(0.01, loop=loop)) + b = self.new_task(loop, asyncio.sleep(0.015, loop=loop)) @asyncio.coroutine def foo(): @@ -773,7 +770,7 @@ class TaskTests(test_utils.TestCase): asyncio.set_event_loop(loop) res = loop.run_until_complete( - asyncio.Task(foo(), loop=loop)) + self.new_task(loop, foo())) self.assertEqual(res, 42) @@ -783,9 +780,9 @@ class TaskTests(test_utils.TestCase): return s c = coro('test') - task = asyncio.Task( - asyncio.wait([c, c, coro('spam')], loop=self.loop), - loop=self.loop) + task =self.new_task( + self.loop, + asyncio.wait([c, c, coro('spam')], loop=self.loop)) done, pending = self.loop.run_until_complete(task) @@ -816,12 +813,12 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(10.0, loop=loop), loop=loop) - b = asyncio.Task(asyncio.sleep(0.1, loop=loop), loop=loop) - task = asyncio.Task( + a = self.new_task(loop, asyncio.sleep(10.0, loop=loop)) + b = self.new_task(loop, asyncio.sleep(0.1, loop=loop)) + task = self.new_task( + loop, asyncio.wait([b, a], return_when=asyncio.FIRST_COMPLETED, - loop=loop), - loop=loop) + loop=loop)) done, pending = loop.run_until_complete(task) self.assertEqual({b}, done) @@ -848,12 +845,12 @@ class TaskTests(test_utils.TestCase): yield yield - a = asyncio.Task(coro1(), loop=self.loop) - b = asyncio.Task(coro2(), loop=self.loop) - task = asyncio.Task( + a = self.new_task(self.loop, coro1()) + b = self.new_task(self.loop, coro2()) + task = self.new_task( + self.loop, asyncio.wait([b, a], return_when=asyncio.FIRST_COMPLETED, - loop=self.loop), - loop=self.loop) + loop=self.loop)) done, pending = self.loop.run_until_complete(task) self.assertEqual({a, b}, done) @@ -872,17 +869,17 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) # first_exception, task already has exception - a = asyncio.Task(asyncio.sleep(10.0, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(10.0, loop=loop)) @asyncio.coroutine def exc(): raise ZeroDivisionError('err') - b = asyncio.Task(exc(), loop=loop) - task = asyncio.Task( + b = self.new_task(loop, exc()) + task = self.new_task( + loop, asyncio.wait([b, a], return_when=asyncio.FIRST_EXCEPTION, - loop=loop), - loop=loop) + loop=loop)) done, pending = loop.run_until_complete(task) self.assertEqual({b}, done) @@ -905,14 +902,14 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) # first_exception, exception during waiting - a = asyncio.Task(asyncio.sleep(10.0, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(10.0, loop=loop)) @asyncio.coroutine def exc(): yield from asyncio.sleep(0.01, loop=loop) raise ZeroDivisionError('err') - b = asyncio.Task(exc(), loop=loop) + b = self.new_task(loop, exc()) task = asyncio.wait([b, a], return_when=asyncio.FIRST_EXCEPTION, loop=loop) @@ -936,14 +933,14 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(0.1, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(0.1, loop=loop)) @asyncio.coroutine def sleeper(): yield from asyncio.sleep(0.15, loop=loop) raise ZeroDivisionError('really') - b = asyncio.Task(sleeper(), loop=loop) + b = self.new_task(loop, sleeper()) @asyncio.coroutine def foo(): @@ -953,10 +950,10 @@ class TaskTests(test_utils.TestCase): errors = set(f for f in done if f.exception() is not None) self.assertEqual(len(errors), 1) - loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.15, loop.time()) - loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.15, loop.time()) def test_wait_with_timeout(self): @@ -972,8 +969,8 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(0.1, loop=loop), loop=loop) - b = asyncio.Task(asyncio.sleep(0.15, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(0.1, loop=loop)) + b = self.new_task(loop, asyncio.sleep(0.15, loop=loop)) @asyncio.coroutine def foo(): @@ -982,7 +979,7 @@ class TaskTests(test_utils.TestCase): self.assertEqual(done, set([a])) self.assertEqual(pending, set([b])) - loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.11, loop.time()) # move forward to close generator @@ -1002,8 +999,8 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - a = asyncio.Task(asyncio.sleep(0.1, loop=loop), loop=loop) - b = asyncio.Task(asyncio.sleep(0.15, loop=loop), loop=loop) + a = self.new_task(loop, asyncio.sleep(0.1, loop=loop)) + b = self.new_task(loop, asyncio.sleep(0.15, loop=loop)) done, pending = loop.run_until_complete( asyncio.wait([b, a], timeout=0.1, loop=loop)) @@ -1051,14 +1048,14 @@ class TaskTests(test_utils.TestCase): values.append((yield from f)) return values - res = loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + res = loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.15, loop.time()) self.assertTrue('a' in res[:2]) self.assertTrue('b' in res[:2]) self.assertEqual(res[2], 'c') # Doing it again should take no time and exercise a different path. - res = loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + res = loop.run_until_complete(self.new_task(loop, foo())) self.assertAlmostEqual(0.15, loop.time()) def test_as_completed_with_timeout(self): @@ -1087,7 +1084,7 @@ class TaskTests(test_utils.TestCase): values.append((2, exc)) return values - res = loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + res = loop.run_until_complete(self.new_task(loop, foo())) self.assertEqual(len(res), 2, res) self.assertEqual(res[0], (1, 'a')) self.assertEqual(res[1][0], 2) @@ -1115,7 +1112,7 @@ class TaskTests(test_utils.TestCase): v = yield from f self.assertEqual(v, 'a') - loop.run_until_complete(asyncio.Task(foo(), loop=loop)) + loop.run_until_complete(self.new_task(loop, foo())) def test_as_completed_reverse_wait(self): @@ -1175,7 +1172,7 @@ class TaskTests(test_utils.TestCase): result.append((yield from f)) return result - fut = asyncio.Task(runner(), loop=self.loop) + fut = self.new_task(self.loop, runner()) self.loop.run_until_complete(fut) result = fut.result() self.assertEqual(set(result), {'ham', 'spam'}) @@ -1198,7 +1195,7 @@ class TaskTests(test_utils.TestCase): res = yield from asyncio.sleep(dt/2, arg, loop=loop) return res - t = asyncio.Task(sleeper(0.1, 'yeah'), loop=loop) + t = self.new_task(loop, sleeper(0.1, 'yeah')) loop.run_until_complete(t) self.assertTrue(t.done()) self.assertEqual(t.result(), 'yeah') @@ -1213,8 +1210,7 @@ class TaskTests(test_utils.TestCase): loop = self.new_test_loop(gen) - t = asyncio.Task(asyncio.sleep(10.0, 'yeah', loop=loop), - loop=loop) + t = self.new_task(loop, asyncio.sleep(10.0, 'yeah', loop=loop)) handle = None orig_call_later = loop.call_later @@ -1250,7 +1246,7 @@ class TaskTests(test_utils.TestCase): @asyncio.coroutine def doit(): - sleeper = asyncio.Task(sleep(5000), loop=loop) + sleeper = self.new_task(loop, sleep(5000)) loop.call_later(0.1, sleeper.cancel) try: yield from sleeper @@ -1264,13 +1260,13 @@ class TaskTests(test_utils.TestCase): self.assertAlmostEqual(0.1, loop.time()) def test_task_cancel_waiter_future(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) @asyncio.coroutine def coro(): yield from fut - task = asyncio.Task(coro(), loop=self.loop) + task = self.new_task(self.loop, coro()) test_utils.run_briefly(self.loop) self.assertIs(task._fut_waiter, fut) @@ -1287,7 +1283,7 @@ class TaskTests(test_utils.TestCase): return 'ko' gen = notmuch() - task = asyncio.Task(gen, loop=self.loop) + task = self.new_task(self.loop, gen) task.set_result('ok') self.assertRaises(AssertionError, task._step) @@ -1323,7 +1319,7 @@ class TaskTests(test_utils.TestCase): nonlocal result result = yield from fut - t = asyncio.Task(wait_for_future(), loop=self.loop) + t = self.new_task(self.loop, wait_for_future()) test_utils.run_briefly(self.loop) self.assertTrue(fut.cb_added) @@ -1339,7 +1335,7 @@ class TaskTests(test_utils.TestCase): def notmutch(): raise BaseException() - task = asyncio.Task(notmutch(), loop=self.loop) + task = self.new_task(self.loop, notmutch()) self.assertRaises(BaseException, task._step) self.assertTrue(task.done()) @@ -1367,7 +1363,7 @@ class TaskTests(test_utils.TestCase): except asyncio.CancelledError: raise base_exc - task = asyncio.Task(notmutch(), loop=loop) + task = self.new_task(loop, notmutch()) test_utils.run_briefly(loop) task.cancel() @@ -1397,7 +1393,7 @@ class TaskTests(test_utils.TestCase): self.assertFalse(asyncio.iscoroutinefunction(mock.Mock())) def test_yield_vs_yield_from(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) @asyncio.coroutine def wait_for_future(): @@ -1441,7 +1437,7 @@ class TaskTests(test_utils.TestCase): self.assertEqual(res, 'test') def test_coroutine_non_gen_function_return_future(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) @asyncio.coroutine def func(): @@ -1451,49 +1447,53 @@ class TaskTests(test_utils.TestCase): def coro(): fut.set_result('test') - t1 = asyncio.Task(func(), loop=self.loop) - t2 = asyncio.Task(coro(), loop=self.loop) + t1 = self.new_task(self.loop, func()) + t2 = self.new_task(self.loop, coro()) res = self.loop.run_until_complete(t1) self.assertEqual(res, 'test') self.assertIsNone(t2.result()) def test_current_task(self): - self.assertIsNone(asyncio.Task.current_task(loop=self.loop)) + Task = self.__class__.Task + + self.assertIsNone(Task.current_task(loop=self.loop)) @asyncio.coroutine def coro(loop): - self.assertTrue(asyncio.Task.current_task(loop=loop) is task) + self.assertTrue(Task.current_task(loop=loop) is task) - task = asyncio.Task(coro(self.loop), loop=self.loop) + task = self.new_task(self.loop, coro(self.loop)) self.loop.run_until_complete(task) - self.assertIsNone(asyncio.Task.current_task(loop=self.loop)) + self.assertIsNone(Task.current_task(loop=self.loop)) def test_current_task_with_interleaving_tasks(self): - self.assertIsNone(asyncio.Task.current_task(loop=self.loop)) + Task = self.__class__.Task + + self.assertIsNone(Task.current_task(loop=self.loop)) - fut1 = asyncio.Future(loop=self.loop) - fut2 = asyncio.Future(loop=self.loop) + fut1 = self.new_future(self.loop) + fut2 = self.new_future(self.loop) @asyncio.coroutine def coro1(loop): - self.assertTrue(asyncio.Task.current_task(loop=loop) is task1) + self.assertTrue(Task.current_task(loop=loop) is task1) yield from fut1 - self.assertTrue(asyncio.Task.current_task(loop=loop) is task1) + self.assertTrue(Task.current_task(loop=loop) is task1) fut2.set_result(True) @asyncio.coroutine def coro2(loop): - self.assertTrue(asyncio.Task.current_task(loop=loop) is task2) + self.assertTrue(Task.current_task(loop=loop) is task2) fut1.set_result(True) yield from fut2 - self.assertTrue(asyncio.Task.current_task(loop=loop) is task2) + self.assertTrue(Task.current_task(loop=loop) is task2) - task1 = asyncio.Task(coro1(self.loop), loop=self.loop) - task2 = asyncio.Task(coro2(self.loop), loop=self.loop) + task1 = self.new_task(self.loop, coro1(self.loop)) + task2 = self.new_task(self.loop, coro2(self.loop)) self.loop.run_until_complete(asyncio.wait((task1, task2), loop=self.loop)) - self.assertIsNone(asyncio.Task.current_task(loop=self.loop)) + self.assertIsNone(Task.current_task(loop=self.loop)) # Some thorough tests for cancellation propagation through # coroutines, tasks and wait(). @@ -1501,7 +1501,7 @@ class TaskTests(test_utils.TestCase): def test_yield_future_passes_cancel(self): # Cancelling outer() cancels inner() cancels waiter. proof = 0 - waiter = asyncio.Future(loop=self.loop) + waiter = self.new_future(self.loop) @asyncio.coroutine def inner(): @@ -1535,7 +1535,7 @@ class TaskTests(test_utils.TestCase): # Cancelling outer() makes wait() return early, leaves inner() # running. proof = 0 - waiter = asyncio.Future(loop=self.loop) + waiter = self.new_future(self.loop) @asyncio.coroutine def inner(): @@ -1559,14 +1559,14 @@ class TaskTests(test_utils.TestCase): self.assertEqual(proof, 1) def test_shield_result(self): - inner = asyncio.Future(loop=self.loop) + inner = self.new_future(self.loop) outer = asyncio.shield(inner) inner.set_result(42) res = self.loop.run_until_complete(outer) self.assertEqual(res, 42) def test_shield_exception(self): - inner = asyncio.Future(loop=self.loop) + inner = self.new_future(self.loop) outer = asyncio.shield(inner) test_utils.run_briefly(self.loop) exc = RuntimeError('expected') @@ -1575,7 +1575,7 @@ class TaskTests(test_utils.TestCase): self.assertIs(outer.exception(), exc) def test_shield_cancel(self): - inner = asyncio.Future(loop=self.loop) + inner = self.new_future(self.loop) outer = asyncio.shield(inner) test_utils.run_briefly(self.loop) inner.cancel() @@ -1583,7 +1583,7 @@ class TaskTests(test_utils.TestCase): self.assertTrue(outer.cancelled()) def test_shield_shortcut(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) fut.set_result(42) res = self.loop.run_until_complete(asyncio.shield(fut)) self.assertEqual(res, 42) @@ -1591,7 +1591,7 @@ class TaskTests(test_utils.TestCase): def test_shield_effect(self): # Cancelling outer() does not affect inner(). proof = 0 - waiter = asyncio.Future(loop=self.loop) + waiter = self.new_future(self.loop) @asyncio.coroutine def inner(): @@ -1615,8 +1615,8 @@ class TaskTests(test_utils.TestCase): self.assertEqual(proof, 1) def test_shield_gather(self): - child1 = asyncio.Future(loop=self.loop) - child2 = asyncio.Future(loop=self.loop) + child1 = self.new_future(self.loop) + child2 = self.new_future(self.loop) parent = asyncio.gather(child1, child2, loop=self.loop) outer = asyncio.shield(parent, loop=self.loop) test_utils.run_briefly(self.loop) @@ -1629,8 +1629,8 @@ class TaskTests(test_utils.TestCase): self.assertEqual(parent.result(), [1, 2]) def test_gather_shield(self): - child1 = asyncio.Future(loop=self.loop) - child2 = asyncio.Future(loop=self.loop) + child1 = self.new_future(self.loop) + child2 = self.new_future(self.loop) inner1 = asyncio.shield(child1, loop=self.loop) inner2 = asyncio.shield(child2, loop=self.loop) parent = asyncio.gather(inner1, inner2, loop=self.loop) @@ -1646,7 +1646,7 @@ class TaskTests(test_utils.TestCase): test_utils.run_briefly(self.loop) def test_as_completed_invalid_args(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) # as_completed() expects a list of futures, not a future instance self.assertRaises(TypeError, self.loop.run_until_complete, @@ -1657,7 +1657,7 @@ class TaskTests(test_utils.TestCase): coro.close() def test_wait_invalid_args(self): - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) # wait() expects a list of futures, not a future instance self.assertRaises(TypeError, self.loop.run_until_complete, @@ -1684,7 +1684,7 @@ class TaskTests(test_utils.TestCase): yield from fut # A completed Future used to run the coroutine. - fut = asyncio.Future(loop=self.loop) + fut = self.new_future(self.loop) fut.set_result(None) # Call the coroutine. @@ -1718,15 +1718,15 @@ class TaskTests(test_utils.TestCase): @asyncio.coroutine def t2(): - f = asyncio.Future(loop=self.loop) - asyncio.Task(t3(f), loop=self.loop) + f = self.new_future(self.loop) + self.new_task(self.loop, t3(f)) return (yield from f) @asyncio.coroutine def t3(f): f.set_result((1, 2, 3)) - task = asyncio.Task(t1(), loop=self.loop) + task = self.new_task(self.loop, t1()) val = self.loop.run_until_complete(task) self.assertEqual(val, (1, 2, 3)) @@ -1789,9 +1789,11 @@ class TaskTests(test_utils.TestCase): @unittest.skipUnless(PY34, 'need python 3.4 or later') def test_log_destroyed_pending_task(self): + Task = self.__class__.Task + @asyncio.coroutine def kill_me(loop): - future = asyncio.Future(loop=loop) + future = self.new_future(loop) yield from future # at this point, the only reference to kill_me() task is # the Task._wakeup() method in future._callbacks @@ -1804,7 +1806,7 @@ class TaskTests(test_utils.TestCase): # schedule the task coro = kill_me(self.loop) task = asyncio.ensure_future(coro, loop=self.loop) - self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), {task}) + self.assertEqual(Task.all_tasks(loop=self.loop), {task}) # execute the task so it waits for future self.loop._run_once() @@ -1819,7 +1821,7 @@ class TaskTests(test_utils.TestCase): # no more reference to kill_me() task: the task is destroyed by the GC support.gc_collect() - self.assertEqual(asyncio.Task.all_tasks(loop=self.loop), set()) + self.assertEqual(Task.all_tasks(loop=self.loop), set()) mock_handler.assert_called_with(self.loop, { 'message': 'Task was destroyed but it is pending!', @@ -1828,25 +1830,6 @@ class TaskTests(test_utils.TestCase): }) mock_handler.reset_mock() - @mock.patch('asyncio.base_events.logger') - def test_tb_logger_not_called_after_cancel(self, m_log): - loop = asyncio.new_event_loop() - self.set_event_loop(loop) - - @asyncio.coroutine - def coro(): - raise TypeError - - @asyncio.coroutine - def runner(): - task = loop.create_task(coro()) - yield from asyncio.sleep(0.05, loop=loop) - task.cancel() - task = None - - loop.run_until_complete(runner()) - self.assertFalse(m_log.error.called) - @mock.patch('asyncio.coroutines.logger') def test_coroutine_never_yielded(self, m_log): with set_coroutine_debug(True): @@ -1903,10 +1886,10 @@ class TaskTests(test_utils.TestCase): def test_task_source_traceback(self): self.loop.set_debug(True) - task = asyncio.Task(coroutine_function(), loop=self.loop) + task = self.new_task(self.loop, coroutine_function()) lineno = sys._getframe().f_lineno - 1 self.assertIsInstance(task._source_traceback, list) - self.assertEqual(task._source_traceback[-1][:3], + self.assertEqual(task._source_traceback[-2][:3], (__file__, lineno, 'test_task_source_traceback')) @@ -1918,7 +1901,7 @@ class TaskTests(test_utils.TestCase): @asyncio.coroutine def blocking_coroutine(): - fut = asyncio.Future(loop=loop) + fut = self.new_future(loop) # Block: fut result is never set yield from fut @@ -1945,7 +1928,7 @@ class TaskTests(test_utils.TestCase): loop = asyncio.new_event_loop() self.addCleanup(loop.close) - fut = asyncio.Future(loop=loop) + fut = self.new_future(loop) # The indirection fut->child_coro is needed since otherwise the # gathering task is done at the same time as the child future def child_coro(): @@ -1969,6 +1952,172 @@ class TaskTests(test_utils.TestCase): self.assertFalse(gather_task.cancelled()) self.assertEqual(gather_task.result(), [42]) + def test_exception_traceback(self): + # See http://bugs.python.org/issue28843 + + @asyncio.coroutine + def foo(): + 1 / 0 + + @asyncio.coroutine + def main(): + task = self.new_task(self.loop, foo()) + yield # skip one loop iteration + self.assertIsNotNone(task.exception().__traceback__) + + self.loop.run_until_complete(main()) + + @mock.patch('asyncio.base_events.logger') + def test_error_in_call_soon(self, m_log): + def call_soon(callback, *args): + raise ValueError + self.loop.call_soon = call_soon + + @asyncio.coroutine + def coro(): + pass + + self.assertFalse(m_log.error.called) + + with self.assertRaises(ValueError): + self.new_task(self.loop, coro()) + + self.assertTrue(m_log.error.called) + message = m_log.error.call_args[0][0] + self.assertIn('Task was destroyed but it is pending', message) + + self.assertEqual(self.Task.all_tasks(self.loop), set()) + + +def add_subclass_tests(cls): + BaseTask = cls.Task + BaseFuture = cls.Future + + if BaseTask is None or BaseFuture is None: + return cls + + class CommonFuture: + def __init__(self, *args, **kwargs): + self.calls = collections.defaultdict(lambda: 0) + super().__init__(*args, **kwargs) + + def _schedule_callbacks(self): + self.calls['_schedule_callbacks'] += 1 + return super()._schedule_callbacks() + + def add_done_callback(self, *args): + self.calls['add_done_callback'] += 1 + return super().add_done_callback(*args) + + class Task(CommonFuture, BaseTask): + def _step(self, *args): + self.calls['_step'] += 1 + return super()._step(*args) + + def _wakeup(self, *args): + self.calls['_wakeup'] += 1 + return super()._wakeup(*args) + + class Future(CommonFuture, BaseFuture): + pass + + def test_subclasses_ctask_cfuture(self): + fut = self.Future(loop=self.loop) + + async def func(): + self.loop.call_soon(lambda: fut.set_result('spam')) + return await fut + + task = self.Task(func(), loop=self.loop) + + result = self.loop.run_until_complete(task) + + self.assertEqual(result, 'spam') + + self.assertEqual( + dict(task.calls), + {'_step': 2, '_wakeup': 1, 'add_done_callback': 1, + '_schedule_callbacks': 1}) + + self.assertEqual( + dict(fut.calls), + {'add_done_callback': 1, '_schedule_callbacks': 1}) + + # Add patched Task & Future back to the test case + cls.Task = Task + cls.Future = Future + + # Add an extra unit-test + cls.test_subclasses_ctask_cfuture = test_subclasses_ctask_cfuture + + # Disable the "test_task_source_traceback" test + # (the test is hardcoded for a particular call stack, which + # is slightly different for Task subclasses) + cls.test_task_source_traceback = None + + return cls + + +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +class CTask_CFuture_Tests(BaseTaskTests, test_utils.TestCase): + Task = getattr(tasks, '_CTask', None) + Future = getattr(futures, '_CFuture', None) + + +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +@add_subclass_tests +class CTask_CFuture_SubclassTests(BaseTaskTests, test_utils.TestCase): + Task = getattr(tasks, '_CTask', None) + Future = getattr(futures, '_CFuture', None) + + +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +class CTask_PyFuture_Tests(BaseTaskTests, test_utils.TestCase): + Task = getattr(tasks, '_CTask', None) + Future = futures._PyFuture + + +@unittest.skipUnless(hasattr(futures, '_CFuture'), + 'requires the C _asyncio module') +class PyTask_CFuture_Tests(BaseTaskTests, test_utils.TestCase): + Task = tasks._PyTask + Future = getattr(futures, '_CFuture', None) + + +class PyTask_PyFuture_Tests(BaseTaskTests, test_utils.TestCase): + Task = tasks._PyTask + Future = futures._PyFuture + + +@add_subclass_tests +class PyTask_PyFuture_SubclassTests(BaseTaskTests, test_utils.TestCase): + Task = tasks._PyTask + Future = futures._PyFuture + + +class GenericTaskTests(test_utils.TestCase): + + def test_future_subclass(self): + self.assertTrue(issubclass(asyncio.Task, asyncio.Future)) + + def test_asyncio_module_compiled(self): + # Because of circular imports it's easy to make _asyncio + # module non-importable. This is a simple test that will + # fail on systems where C modules were successfully compiled + # (hence the test for _functools), but _asyncio somehow didn't. + try: + import _functools + except ImportError: + pass + else: + try: + import _asyncio + except ImportError: + self.fail('_asyncio module is missing') + class GatherTestsBase: diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 18f1ea2..dbee593 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -11,6 +11,9 @@ import struct from test import support from io import BytesIO +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") + try: import threading except ImportError: @@ -656,9 +659,6 @@ class BaseTestAPI: if HAS_UNIX_SOCKETS and self.family == socket.AF_UNIX: self.skipTest("Not applicable to AF_UNIX sockets.") - if sys.platform == "darwin" and self.use_poll: - self.skipTest("poll may fail on macOS; see issue #28087") - class TestClient(BaseClient): def handle_expt(self): self.socket.recv(1024, socket.MSG_OOB) diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py index 1d0b018..172bd25 100644 --- a/Lib/test/test_atexit.py +++ b/Lib/test/test_atexit.py @@ -23,9 +23,6 @@ def raise1(): def raise2(): raise SystemError -def exit(): - raise SystemExit - class GeneralTest(unittest.TestCase): @@ -79,13 +76,6 @@ class GeneralTest(unittest.TestCase): self.assertRaises(ZeroDivisionError, atexit._run_exitfuncs) self.assertIn("ZeroDivisionError", self.stream.getvalue()) - def test_exit(self): - # be sure a SystemExit is handled properly - atexit.register(exit) - - self.assertRaises(SystemExit, atexit._run_exitfuncs) - self.assertEqual(self.stream.getvalue(), '') - def test_print_tracebacks(self): # Issue #18776: the tracebacks should be printed when errors occur. def f(): @@ -153,7 +143,6 @@ class GeneralTest(unittest.TestCase): self.assertEqual(l, [5]) -@support.cpython_only class SubinterpreterTest(unittest.TestCase): def test_callbacks_leak(self): diff --git a/Lib/test/test_augassign.py b/Lib/test/test_augassign.py index 5093e9d..5930d9e 100644 --- a/Lib/test/test_augassign.py +++ b/Lib/test/test_augassign.py @@ -83,6 +83,10 @@ class AugAssignTest(unittest.TestCase): def __iadd__(self, val): return aug_test3(self.val + val) + class aug_test4(aug_test3): + """Blocks inheritance, and fallback to __add__""" + __iadd__ = None + x = aug_test(1) y = x x += 10 @@ -106,6 +110,10 @@ class AugAssignTest(unittest.TestCase): self.assertTrue(y is not x) self.assertEqual(x.val, 13) + x = aug_test4(4) + with self.assertRaises(TypeError): + x += 10 + def testCustomMethods2(test_self): output = [] diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py index 4754739..4f86aaa 100644 --- a/Lib/test/test_base64.py +++ b/Lib/test/test_base64.py @@ -18,14 +18,6 @@ class LegacyBase64TestCase(unittest.TestCase): int_data = memoryview(b"1234").cast('I') self.assertRaises(TypeError, f, int_data) - def test_encodestring_warns(self): - with self.assertWarns(DeprecationWarning): - base64.encodestring(b"www.python.org") - - def test_decodestring_warns(self): - with self.assertWarns(DeprecationWarning): - base64.decodestring(b"d3d3LnB5dGhvbi5vcmc=\n") - def test_encodebytes(self): eq = self.assertEqual eq(base64.encodebytes(b"www.python.org"), b"d3d3LnB5dGhvbi5vcmc=\n") diff --git a/Lib/test/test_pep352.py b/Lib/test/test_baseexception.py similarity index 99% rename from Lib/test/test_pep352.py rename to Lib/test/test_baseexception.py index 7c98c46..27d514f 100644 --- a/Lib/test/test_pep352.py +++ b/Lib/test/test_baseexception.py @@ -1,6 +1,5 @@ import unittest import builtins -import warnings import os from platform import system as platform_system diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py index 40ac9bf..6133bbc 100644 --- a/Lib/test/test_bigmem.py +++ b/Lib/test/test_bigmem.py @@ -14,7 +14,6 @@ from test.support import bigmemtest, _1G, _2G, _4G import unittest import operator import sys -import functools # These tests all use one of the bigmemtest decorators to indicate how much # memory they use and how much memory they need to be even meaningful. The diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index 034245d..6b3e437 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -159,11 +159,25 @@ class BinASCIITest(unittest.TestCase): # Then calculate the hexbin4 binary-to-ASCII translation rle = binascii.rlecode_hqx(self.data) a = binascii.b2a_hqx(self.type2test(rle)) + b, _ = binascii.a2b_hqx(self.type2test(a)) res = binascii.rledecode_hqx(b) - self.assertEqual(res, self.rawdata) + def test_rle(self): + # test repetition with a repetition longer than the limit of 255 + data = (b'a' * 100 + b'b' + b'c' * 300) + + encoded = binascii.rlecode_hqx(data) + self.assertEqual(encoded, + (b'a\x90d' # 'a' * 100 + b'b' # 'b' + b'c\x90\xff' # 'c' * 255 + b'c\x90-')) # 'c' * 45 + + decoded = binascii.rledecode_hqx(encoded) + self.assertEqual(decoded, data) + def test_hex(self): # test hexlification s = b'{s\005\000\000\000worldi\002\000\000\000s\005\000\000\000helloi\001\000\000\0000' @@ -331,6 +345,16 @@ class BinASCIITest(unittest.TestCase): # non-ASCII string self.assertRaises(ValueError, a2b, "\x80") + def test_b2a_base64_newline(self): + # Issue #25357: test newline parameter + b = self.type2test(b'hello') + self.assertEqual(binascii.b2a_base64(b), + b'aGVsbG8=\n') + self.assertEqual(binascii.b2a_base64(b, newline=True), + b'aGVsbG8=\n') + self.assertEqual(binascii.b2a_base64(b, newline=False), + b'aGVsbG8=') + class ArrayBinASCIITest(BinASCIITest): def type2test(self, s): diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py index 9d4c85a..21f4463 100644 --- a/Lib/test/test_binhex.py +++ b/Lib/test/test_binhex.py @@ -4,7 +4,6 @@ Based on an original test by Roger E. Masse. """ import binhex -import os import unittest from test import support diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py index e9dbddc..3ed018e 100644 --- a/Lib/test/test_binop.py +++ b/Lib/test/test_binop.py @@ -2,7 +2,7 @@ import unittest from test import support -from operator import eq, ne, lt, gt, le, ge +from operator import eq, le, ne from abc import ABCMeta def gcd(a, b): @@ -388,6 +388,54 @@ class OperationOrderTests(unittest.TestCase): self.assertEqual(op_sequence(eq, B, V), ['B.__eq__', 'V.__eq__']) self.assertEqual(op_sequence(le, B, V), ['B.__le__', 'V.__ge__']) +class SupEq(object): + """Class that can test equality""" + def __eq__(self, other): + return True + +class S(SupEq): + """Subclass of SupEq that should fail""" + __eq__ = None + +class F(object): + """Independent class that should fall back""" + +class X(object): + """Independent class that should fail""" + __eq__ = None + +class SN(SupEq): + """Subclass of SupEq that can test equality, but not non-equality""" + __ne__ = None + +class XN: + """Independent class that can test equality, but not non-equality""" + def __eq__(self, other): + return True + __ne__ = None + +class FallbackBlockingTests(unittest.TestCase): + """Unit tests for None method blocking""" + + def test_fallback_rmethod_blocking(self): + e, f, s, x = SupEq(), F(), S(), X() + self.assertEqual(e, e) + self.assertEqual(e, f) + self.assertEqual(f, e) + # left operand is checked first + self.assertEqual(e, x) + self.assertRaises(TypeError, eq, x, e) + # S is a subclass, so it's always checked first + self.assertRaises(TypeError, eq, e, s) + self.assertRaises(TypeError, eq, s, e) + + def test_fallback_ne_blocking(self): + e, sn, xn = SupEq(), SN(), XN() + self.assertFalse(e != e) + self.assertRaises(TypeError, ne, e, sn) + self.assertRaises(TypeError, ne, sn, e) + self.assertFalse(e != xn) + self.assertRaises(TypeError, ne, xn, e) if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py index d30a3b9..9f8f0e1 100644 --- a/Lib/test/test_bool.py +++ b/Lib/test/test_bool.py @@ -96,6 +96,13 @@ class BoolTest(unittest.TestCase): self.assertEqual(False/1, 0) self.assertIsNot(False/1, False) + self.assertEqual(True%1, 0) + self.assertIsNot(True%1, False) + self.assertEqual(True%2, 1) + self.assertIsNot(True%2, True) + self.assertEqual(False%1, 0) + self.assertIsNot(False%1, False) + for b in False, True: for i in 0, 1, 2: self.assertEqual(b**i, int(b)**i) @@ -333,6 +340,17 @@ class BoolTest(unittest.TestCase): except (Exception) as e_len: self.assertEqual(str(e_bool), str(e_len)) + def test_blocked(self): + class A: + __bool__ = None + self.assertRaises(TypeError, bool, A()) + + class B: + def __len__(self): + return 10 + __bool__ = None + self.assertRaises(TypeError, bool, B()) + def test_real_and_imag(self): self.assertEqual(True.real, 1) self.assertEqual(True.imag, 0) diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py index 2eef9fc..b83f2f1 100644 --- a/Lib/test/test_buffer.py +++ b/Lib/test/test_buffer.py @@ -16,7 +16,6 @@ import unittest from test import support from itertools import permutations, product from random import randrange, sample, choice -from sysconfig import get_config_var import warnings import sys, array, io from decimal import Decimal diff --git a/Lib/test/test_bufio.py b/Lib/test/test_bufio.py index 9931c84..fea6da4 100644 --- a/Lib/test/test_bufio.py +++ b/Lib/test/test_bufio.py @@ -59,7 +59,7 @@ class BufferSizeTest: self.drive_one(b"1234567890\00\01\02\03\04\05\06") def test_nullpat(self): - self.drive_one(bytes(1000)) + self.drive_one(b'\0' * 1000) class CBufferSizeTest(BufferSizeTest, unittest.TestCase): diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 18e80c7..a792099 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -82,7 +82,7 @@ test_conv_no_sign = [ ('', ValueError), (' ', ValueError), (' \t\t ', ValueError), - (str(b'\u0663\u0661\u0664 ','raw-unicode-escape'), 314), + (str(br'\u0663\u0661\u0664 ','raw-unicode-escape'), 314), (chr(0x200), ValueError), ] @@ -104,7 +104,7 @@ test_conv_sign = [ ('', ValueError), (' ', ValueError), (' \t\t ', ValueError), - (str(b'\u0663\u0661\u0664 ','raw-unicode-escape'), 314), + (str(br'\u0663\u0661\u0664 ','raw-unicode-escape'), 314), (chr(0x200), ValueError), ] @@ -151,8 +151,6 @@ class BuiltinTest(unittest.TestCase): self.assertRaises(TypeError, __import__, 1, 2, 3, 4) self.assertRaises(ValueError, __import__, '') self.assertRaises(TypeError, __import__, 'sys', name='sys') - # embedded null character - self.assertRaises((ImportError, ValueError), __import__, 'string\x00') def test_abs(self): # int @@ -1004,10 +1002,6 @@ class BuiltinTest(unittest.TestCase): self.assertEqual(fp.read(300), 'XXX'*100) self.assertEqual(fp.read(1000), 'YYY'*100) - # embedded null bytes and characters - self.assertRaises(ValueError, open, 'a\x00b') - self.assertRaises(ValueError, open, b'a\x00b') - def test_open_default_encoding(self): old_environ = dict(os.environ) try: @@ -1714,21 +1708,11 @@ class TestType(unittest.TestCase): self.assertEqual(x.spam(), 'spam42') self.assertEqual(x.to_bytes(2, 'little'), b'\x2a\x00') - def test_type_new_keywords(self): - class B: - def ham(self): - return 'ham%d' % self - C = type.__new__(type, - name='C', - bases=(B, int), - dict={'spam': lambda self: 'spam%s' % self}) - self.assertEqual(C.__name__, 'C') - self.assertEqual(C.__qualname__, 'C') - self.assertEqual(C.__module__, __name__) - self.assertEqual(C.__bases__, (B, int)) - self.assertIs(C.__base__, int) - self.assertIn('spam', C.__dict__) - self.assertNotIn('ham', C.__dict__) + def test_type_nokwargs(self): + with self.assertRaises(TypeError): + type('a', (), {}, x=5) + with self.assertRaises(TypeError): + type('a', (), dict={}) def test_type_name(self): for name in 'A', '\xc4', '\U0001f40d', 'B.A', '42', '': diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 3288a5b..b396a76 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -216,7 +216,7 @@ class BaseBytesTest: self.assertEqual(b, self.type2test(sample[:-3], "utf-8")) def test_decode(self): - sample = "Hello world\n\u1234\u5678\u9abc\def0\def0" + sample = "Hello world\n\u1234\u5678\u9abc" for enc in ("utf-8", "utf-16"): b = self.type2test(sample, enc) self.assertEqual(b.decode(enc), sample) @@ -269,6 +269,7 @@ class BaseBytesTest: self.assertNotIn(200, b) self.assertRaises(ValueError, lambda: 300 in b) self.assertRaises(ValueError, lambda: -1 in b) + self.assertRaises(ValueError, lambda: sys.maxsize+1 in b) self.assertRaises(TypeError, lambda: None in b) self.assertRaises(TypeError, lambda: float(ord('a')) in b) self.assertRaises(TypeError, lambda: "a" in b) @@ -300,6 +301,20 @@ class BaseBytesTest: self.assertRaises(ValueError, self.type2test.fromhex, '\x00') self.assertRaises(ValueError, self.type2test.fromhex, '12 \x00 34') + for data, pos in ( + # invalid first hexadecimal character + ('12 x4 56', 3), + # invalid second hexadecimal character + ('12 3x 56', 4), + # two invalid hexadecimal characters + ('12 xy 56', 3), + # test non-ASCII string + ('12 3\xff 56', 4), + ): + with self.assertRaises(ValueError) as cm: + self.type2test.fromhex(data) + self.assertIn('at position %s' % pos, str(cm.exception)) + def test_hex(self): self.assertRaises(TypeError, self.type2test.hex) self.assertRaises(TypeError, self.type2test.hex, 1) @@ -674,6 +689,37 @@ class BaseBytesTest: test.support.check_free_after_iterating(self, iter, self.type2test) test.support.check_free_after_iterating(self, reversed, self.type2test) + def test_translate(self): + b = self.type2test(b'hello') + rosetta = bytearray(range(256)) + rosetta[ord('o')] = ord('e') + + self.assertRaises(TypeError, b.translate) + self.assertRaises(TypeError, b.translate, None, None) + self.assertRaises(ValueError, b.translate, bytes(range(255))) + + c = b.translate(rosetta, b'hello') + self.assertEqual(b, b'hello') + self.assertIsInstance(c, self.type2test) + + c = b.translate(rosetta) + d = b.translate(rosetta, b'') + self.assertEqual(c, d) + self.assertEqual(c, b'helle') + + c = b.translate(rosetta, b'l') + self.assertEqual(c, b'hee') + c = b.translate(None, b'e') + self.assertEqual(c, b'hllo') + + # test delete as a keyword argument + c = b.translate(rosetta, delete=b'') + self.assertEqual(c, b'helle') + c = b.translate(rosetta, delete=b'l') + self.assertEqual(c, b'hee') + c = b.translate(None, delete=b'e') + self.assertEqual(c, b'hllo') + class BytesTest(BaseBytesTest, unittest.TestCase): type2test = bytes @@ -722,31 +768,142 @@ class BytesTest(BaseBytesTest, unittest.TestCase): # Test PyBytes_FromFormat() def test_from_format(self): - test.support.import_module('ctypes') - from ctypes import pythonapi, py_object, c_int, c_char_p + ctypes = test.support.import_module('ctypes') + _testcapi = test.support.import_module('_testcapi') + from ctypes import pythonapi, py_object + from ctypes import ( + c_int, c_uint, + c_long, c_ulong, + c_size_t, c_ssize_t, + c_char_p) + PyBytes_FromFormat = pythonapi.PyBytes_FromFormat PyBytes_FromFormat.restype = py_object + # basic tests self.assertEqual(PyBytes_FromFormat(b'format'), b'format') - + self.assertEqual(PyBytes_FromFormat(b'Hello %s !', b'world'), + b'Hello world !') + + # test formatters + self.assertEqual(PyBytes_FromFormat(b'c=%c', c_int(0)), + b'c=\0') + self.assertEqual(PyBytes_FromFormat(b'c=%c', c_int(ord('@'))), + b'c=@') + self.assertEqual(PyBytes_FromFormat(b'c=%c', c_int(255)), + b'c=\xff') + self.assertEqual(PyBytes_FromFormat(b'd=%d ld=%ld zd=%zd', + c_int(1), c_long(2), + c_size_t(3)), + b'd=1 ld=2 zd=3') + self.assertEqual(PyBytes_FromFormat(b'd=%d ld=%ld zd=%zd', + c_int(-1), c_long(-2), + c_size_t(-3)), + b'd=-1 ld=-2 zd=-3') + self.assertEqual(PyBytes_FromFormat(b'u=%u lu=%lu zu=%zu', + c_uint(123), c_ulong(456), + c_size_t(789)), + b'u=123 lu=456 zu=789') + self.assertEqual(PyBytes_FromFormat(b'i=%i', c_int(123)), + b'i=123') + self.assertEqual(PyBytes_FromFormat(b'i=%i', c_int(-123)), + b'i=-123') + self.assertEqual(PyBytes_FromFormat(b'x=%x', c_int(0xabc)), + b'x=abc') + + sizeof_ptr = ctypes.sizeof(c_char_p) + + if os.name == 'nt': + # Windows (MSCRT) + ptr_format = '0x%0{}X'.format(2 * sizeof_ptr) + def ptr_formatter(ptr): + return (ptr_format % ptr) + else: + # UNIX (glibc) + def ptr_formatter(ptr): + return '%#x' % ptr + + ptr = 0xabcdef + self.assertEqual(PyBytes_FromFormat(b'ptr=%p', c_char_p(ptr)), + ('ptr=' + ptr_formatter(ptr)).encode('ascii')) + self.assertEqual(PyBytes_FromFormat(b's=%s', c_char_p(b'cstr')), + b's=cstr') + + # test minimum and maximum integer values + size_max = c_size_t(-1).value + for formatstr, ctypes_type, value, py_formatter in ( + (b'%d', c_int, _testcapi.INT_MIN, str), + (b'%d', c_int, _testcapi.INT_MAX, str), + (b'%ld', c_long, _testcapi.LONG_MIN, str), + (b'%ld', c_long, _testcapi.LONG_MAX, str), + (b'%lu', c_ulong, _testcapi.ULONG_MAX, str), + (b'%zd', c_ssize_t, _testcapi.PY_SSIZE_T_MIN, str), + (b'%zd', c_ssize_t, _testcapi.PY_SSIZE_T_MAX, str), + (b'%zu', c_size_t, size_max, str), + (b'%p', c_char_p, size_max, ptr_formatter), + ): + self.assertEqual(PyBytes_FromFormat(formatstr, ctypes_type(value)), + py_formatter(value).encode('ascii')), + + # width and precision (width is currently ignored) + self.assertEqual(PyBytes_FromFormat(b'%5s', b'a'), + b'a') + self.assertEqual(PyBytes_FromFormat(b'%.3s', b'abcdef'), + b'abc') + + # '%%' formatter + self.assertEqual(PyBytes_FromFormat(b'%%'), + b'%') + self.assertEqual(PyBytes_FromFormat(b'[%%]'), + b'[%]') + self.assertEqual(PyBytes_FromFormat(b'%%%c', c_int(ord('_'))), + b'%_') + self.assertEqual(PyBytes_FromFormat(b'%%s'), + b'%s') + + # Invalid formats and partial formatting self.assertEqual(PyBytes_FromFormat(b'%'), b'%') - self.assertEqual(PyBytes_FromFormat(b'%%'), b'%') - self.assertEqual(PyBytes_FromFormat(b'%%s'), b'%s') - self.assertEqual(PyBytes_FromFormat(b'[%%]'), b'[%]') - self.assertEqual(PyBytes_FromFormat(b'%%%c', c_int(ord('_'))), b'%_') + self.assertEqual(PyBytes_FromFormat(b'x=%i y=%', c_int(2), c_int(3)), + b'x=2 y=%') - self.assertEqual(PyBytes_FromFormat(b'c:%c', c_int(255)), - b'c:\xff') - self.assertEqual(PyBytes_FromFormat(b's:%s', c_char_p(b'cstr')), - b's:cstr') - - # Issue #19969 + # Issue #19969: %c must raise OverflowError for values + # not in the range [0; 255] self.assertRaises(OverflowError, PyBytes_FromFormat, b'%c', c_int(-1)) self.assertRaises(OverflowError, PyBytes_FromFormat, b'%c', c_int(256)) + def test_bytes_blocking(self): + class IterationBlocked(list): + __bytes__ = None + i = [0, 1, 2, 3] + self.assertEqual(bytes(i), b'\x00\x01\x02\x03') + self.assertRaises(TypeError, bytes, IterationBlocked(i)) + + # At least in CPython, because bytes.__new__ and the C API + # PyBytes_FromObject have different fallback rules, integer + # fallback is handled specially, so test separately. + class IntBlocked(int): + __bytes__ = None + self.assertEqual(bytes(3), b'\0\0\0') + self.assertRaises(TypeError, bytes, IntBlocked(3)) + + # While there is no separately-defined rule for handling bytes + # subclasses differently from other buffer-interface classes, + # an implementation may well special-case them (as CPython 2.x + # str did), so test them separately. + class BytesSubclassBlocked(bytes): + __bytes__ = None + self.assertEqual(bytes(b'ab'), b'ab') + self.assertRaises(TypeError, bytes, BytesSubclassBlocked(b'ab')) + + class BufferBlocked(bytearray): + __bytes__ = None + ba, bb = bytearray(b'ab'), BufferBlocked(b'ab') + self.assertEqual(bytes(ba), b'ab') + self.assertRaises(TypeError, bytes, bb) + class ByteArrayTest(BaseBytesTest, unittest.TestCase): type2test = bytearray @@ -1332,24 +1489,6 @@ class AssortedBytesTest(unittest.TestCase): self.assertRaises(SyntaxError, eval, 'b"%s"' % chr(c)) - def test_translate(self): - b = b'hello' - ba = bytearray(b) - rosetta = bytearray(range(0, 256)) - rosetta[ord('o')] = ord('e') - c = b.translate(rosetta, b'l') - self.assertEqual(b, b'hello') - self.assertEqual(c, b'hee') - c = ba.translate(rosetta, b'l') - self.assertEqual(ba, b'hello') - self.assertEqual(c, b'hee') - c = b.translate(None, b'e') - self.assertEqual(c, b'hllo') - c = ba.translate(None, b'e') - self.assertEqual(c, b'hllo') - self.assertRaises(TypeError, b.translate, None, None) - self.assertRaises(TypeError, ba.translate, None, None) - def test_split_bytearray(self): self.assertEqual(b'a b'.split(memoryview(b' ')), [b'a', b'b']) @@ -1513,7 +1652,32 @@ class SubclassTest: self.assertEqual(type(a), type(b)) self.assertEqual(type(a.y), type(b.y)) - test_fromhex = BaseBytesTest.test_fromhex + def test_fromhex(self): + b = self.type2test.fromhex('1a2B30') + self.assertEqual(b, b'\x1a\x2b\x30') + self.assertIs(type(b), self.type2test) + + class B1(self.basetype): + def __new__(cls, value): + me = self.basetype.__new__(cls, value) + me.foo = 'bar' + return me + + b = B1.fromhex('1a2B30') + self.assertEqual(b, b'\x1a\x2b\x30') + self.assertIs(type(b), B1) + self.assertEqual(b.foo, 'bar') + + class B2(self.basetype): + def __init__(me, *args, **kwargs): + if self.basetype is not bytes: + self.basetype.__init__(me, *args, **kwargs) + me.foo = 'bar' + + b = B2.fromhex('1a2B30') + self.assertEqual(b, b'\x1a\x2b\x30') + self.assertIs(type(b), B2) + self.assertEqual(b.foo, 'bar') class ByteArraySubclass(bytearray): diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 34f6478..eaa472a 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -6,6 +6,7 @@ from io import BytesIO, DEFAULT_BUFFER_SIZE import os import pickle import glob +import pathlib import random import shutil import subprocess @@ -553,13 +554,20 @@ class BZ2FileTest(BaseTest): with BZ2File(str_filename, "rb") as f: self.assertEqual(f.read(), self.DATA) + def testOpenPathLikeFilename(self): + filename = pathlib.Path(self.filename) + with BZ2File(filename, "wb") as f: + f.write(self.DATA) + with BZ2File(filename, "rb") as f: + self.assertEqual(f.read(), self.DATA) + def testDecompressLimited(self): """Decompressed data buffering should be limited""" - bomb = bz2.compress(bytes(int(2e6)), compresslevel=9) + bomb = bz2.compress(b'\0' * int(2e6), compresslevel=9) self.assertLess(len(bomb), _compression.BUFFER_SIZE) decomp = BZ2File(BytesIO(bomb)) - self.assertEqual(bytes(1), decomp.read(1)) + self.assertEqual(decomp.read(1), b'\0') max_decomp = 1 + DEFAULT_BUFFER_SIZE self.assertLessEqual(decomp._buffer.raw.tell(), max_decomp, "Excessive amount of data was decompressed") diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index accf251..2bc4fee 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -722,19 +722,19 @@ class CommandLineTestCase(unittest.TestCase): def assertFailure(self, *args): rc, stdout, stderr = assert_python_failure('-m', 'calendar', *args) - self.assertIn(b'Usage:', stderr) + self.assertIn(b'usage:', stderr) self.assertEqual(rc, 2) def test_help(self): stdout = self.run_ok('-h') - self.assertIn(b'Usage:', stdout) + self.assertIn(b'usage:', stdout) self.assertIn(b'calendar.py', stdout) self.assertIn(b'--help', stdout) def test_illegal_arguments(self): self.assertFailure('-z') - #self.assertFailure('spam') - #self.assertFailure('2004', 'spam') + self.assertFailure('spam') + self.assertFailure('2004', 'spam') self.assertFailure('-t', 'html', '2004', '1') def test_output_current_year(self): @@ -835,5 +835,14 @@ class CommandLineTestCase(unittest.TestCase): b'href="custom.css" />', stdout) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'mdays', 'January', 'February', 'EPOCH', + 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', + 'SATURDAY', 'SUNDAY', 'different_locale', 'c', + 'prweek', 'week', 'format', 'formatstring', 'main'} + support.check__all__(self, calendar, blacklist=blacklist) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index f404858..6c3625d 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -4,8 +4,10 @@ import os import pickle import random +import re import subprocess import sys +import sysconfig import textwrap import time import unittest @@ -96,7 +98,7 @@ class CAPITest(unittest.TestCase): def __len__(self): return 1 self.assertRaises(TypeError, _posixsubprocess.fork_exec, - 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17) + 1,Z(),3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17) # Issue #15736: overflow in _PySequence_BytesToCharpArray() class Z(object): def __len__(self): @@ -104,7 +106,7 @@ class CAPITest(unittest.TestCase): def __getitem__(self, i): return b'x' self.assertRaises(MemoryError, _posixsubprocess.fork_exec, - 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17) + 1,Z(),3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17) @unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.') def test_subprocess_fork_exec(self): @@ -114,7 +116,7 @@ class CAPITest(unittest.TestCase): # Issue #15738: crash in subprocess_fork_exec() self.assertRaises(TypeError, _posixsubprocess.fork_exec, - Z(),[b'1'],3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17) + Z(),[b'1'],3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17) @unittest.skipIf(MISSING_C_DOCSTRINGS, "Signature information for builtins requires docstrings") @@ -220,8 +222,8 @@ class CAPITest(unittest.TestCase): br'result with an error set\n' br'ValueError\n' br'\n' - br'During handling of the above exception, ' - br'another exception occurred:\n' + br'The above exception was the direct cause ' + br'of the following exception:\n' br'\n' br'SystemError: ' @@ -442,6 +444,7 @@ class EmbeddingTests(unittest.TestCase): self.maxDiff = None self.assertEqual(out.strip(), expected_output) + class SkipitemTest(unittest.TestCase): def test_skipitem(self): @@ -487,22 +490,23 @@ class SkipitemTest(unittest.TestCase): # test the format unit when not skipped format = c + "i" try: + # (note: the format string must be bytes!) _testcapi.parse_tuple_and_keywords(tuple_1, dict_b, - format, keywords) + format.encode("ascii"), keywords) when_not_skipped = False - except TypeError as e: + except SystemError as e: s = "argument 1 (impossible)" when_not_skipped = (str(e) == s) - except RuntimeError as e: + except TypeError: when_not_skipped = False # test the format unit when skipped optional_format = "|" + format try: _testcapi.parse_tuple_and_keywords(empty_tuple, dict_b, - optional_format, keywords) + optional_format.encode("ascii"), keywords) when_skipped = False - except RuntimeError as e: + except SystemError as e: s = "impossible: '{}'".format(format) when_skipped = (str(e) == s) @@ -513,35 +517,40 @@ class SkipitemTest(unittest.TestCase): self.assertIs(when_skipped, when_not_skipped, message) def test_parse_tuple_and_keywords(self): - # Test handling errors in the parse_tuple_and_keywords helper itself + # parse_tuple_and_keywords error handling tests self.assertRaises(TypeError, _testcapi.parse_tuple_and_keywords, (), {}, 42, []) self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, - (), {}, '', 42) + (), {}, b'', 42) self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, - (), {}, '', [''] * 42) + (), {}, b'', [''] * 42) self.assertRaises(ValueError, _testcapi.parse_tuple_and_keywords, - (), {}, '', [42]) - - def test_bad_use(self): - # Test handling invalid format and keywords in - # PyArg_ParseTupleAndKeywords() - self.assertRaises((TypeError, SystemError), _testcapi.parse_tuple_and_keywords, - (1,), {}, '||O', ['a']) - self.assertRaises((RuntimeError, SystemError), _testcapi.parse_tuple_and_keywords, - (1, 2), {}, '|O|O', ['a', 'b']) - self.assertRaises((TypeError, SystemError), _testcapi.parse_tuple_and_keywords, - (), {'a': 1}, '$$O', ['a']) - self.assertRaises((RuntimeError, SystemError), _testcapi.parse_tuple_and_keywords, - (), {'a': 1, 'b': 2}, '$O$O', ['a', 'b']) - self.assertRaises((TypeError, SystemError), _testcapi.parse_tuple_and_keywords, - (), {'a': 1}, '$|O', ['a']) - self.assertRaises((RuntimeError, SystemError), _testcapi.parse_tuple_and_keywords, - (), {'a': 1, 'b': 2}, '$O|O', ['a', 'b']) - self.assertRaises((RuntimeError, SystemError), _testcapi.parse_tuple_and_keywords, - (1,), {}, '|O', ['a', 'b']) - self.assertRaises((RuntimeError, SystemError), _testcapi.parse_tuple_and_keywords, - (1,), {}, '|OO', ['a']) + (), {}, b'', [42]) + + def test_positional_only(self): + parse = _testcapi.parse_tuple_and_keywords + + parse((1, 2, 3), {}, b'OOO', ['', '', 'a']) + parse((1, 2), {'a': 3}, b'OOO', ['', '', 'a']) + with self.assertRaisesRegex(TypeError, + r'Function takes at least 2 positional arguments \(1 given\)'): + parse((1,), {'a': 3}, b'OOO', ['', '', 'a']) + parse((1,), {}, b'O|OO', ['', '', 'a']) + with self.assertRaisesRegex(TypeError, + r'Function takes at least 1 positional arguments \(0 given\)'): + parse((), {}, b'O|OO', ['', '', 'a']) + parse((1, 2), {'a': 3}, b'OO$O', ['', '', 'a']) + with self.assertRaisesRegex(TypeError, + r'Function takes exactly 2 positional arguments \(1 given\)'): + parse((1,), {'a': 3}, b'OO$O', ['', '', 'a']) + parse((1,), {}, b'O|O$O', ['', '', 'a']) + with self.assertRaisesRegex(TypeError, + r'Function takes at least 1 positional arguments \(0 given\)'): + parse((), {}, b'O|O$O', ['', '', 'a']) + with self.assertRaisesRegex(SystemError, r'Empty parameter name after \$'): + parse((1,), {}, b'O|$OO', ['', '', 'a']) + with self.assertRaisesRegex(SystemError, 'Empty keyword'): + parse((1,), {}, b'O|OO', ['', 'a', '']) @unittest.skipUnless(threading, 'Threading required for this test.') @@ -568,6 +577,7 @@ class TestThreadState(unittest.TestCase): t.start() t.join() + class Test_testcapi(unittest.TestCase): def test__testcapi(self): for name in dir(_testcapi): @@ -576,5 +586,85 @@ class Test_testcapi(unittest.TestCase): test = getattr(_testcapi, name) test() + +class PyMemDebugTests(unittest.TestCase): + PYTHONMALLOC = 'debug' + # '0x04c06e0' or '04C06E0' + PTR_REGEX = r'(?:0x)?[0-9a-fA-F]+' + + def check(self, code): + with support.SuppressCrashReport(): + out = assert_python_failure('-c', code, + PYTHONMALLOC=self.PYTHONMALLOC) + stderr = out.err + return stderr.decode('ascii', 'replace') + + def test_buffer_overflow(self): + out = self.check('import _testcapi; _testcapi.pymem_buffer_overflow()') + regex = (r"Debug memory block at address p={ptr}: API 'm'\n" + r" 16 bytes originally requested\n" + r" The [0-9] pad bytes at p-[0-9] are FORBIDDENBYTE, as expected.\n" + r" The [0-9] pad bytes at tail={ptr} are not all FORBIDDENBYTE \(0x[0-9a-f]{{2}}\):\n" + r" at tail\+0: 0x78 \*\*\* OUCH\n" + r" at tail\+1: 0xfb\n" + r" at tail\+2: 0xfb\n" + r" .*\n" + r" The block was made by call #[0-9]+ to debug malloc/realloc.\n" + r" Data at p: cb cb cb .*\n" + r"\n" + r"Fatal Python error: bad trailing pad byte") + regex = regex.format(ptr=self.PTR_REGEX) + regex = re.compile(regex, flags=re.DOTALL) + self.assertRegex(out, regex) + + def test_api_misuse(self): + out = self.check('import _testcapi; _testcapi.pymem_api_misuse()') + regex = (r"Debug memory block at address p={ptr}: API 'm'\n" + r" 16 bytes originally requested\n" + r" The [0-9] pad bytes at p-[0-9] are FORBIDDENBYTE, as expected.\n" + r" The [0-9] pad bytes at tail={ptr} are FORBIDDENBYTE, as expected.\n" + r" The block was made by call #[0-9]+ to debug malloc/realloc.\n" + r" Data at p: cb cb cb .*\n" + r"\n" + r"Fatal Python error: bad ID: Allocated using API 'm', verified using API 'r'\n") + regex = regex.format(ptr=self.PTR_REGEX) + self.assertRegex(out, regex) + + @unittest.skipUnless(threading, 'Test requires a GIL (multithreading)') + def check_malloc_without_gil(self, code): + out = self.check(code) + expected = ('Fatal Python error: Python memory allocator called ' + 'without holding the GIL') + self.assertIn(expected, out) + + def test_pymem_malloc_without_gil(self): + # Debug hooks must raise an error if PyMem_Malloc() is called + # without holding the GIL + code = 'import _testcapi; _testcapi.pymem_malloc_without_gil()' + self.check_malloc_without_gil(code) + + def test_pyobject_malloc_without_gil(self): + # Debug hooks must raise an error if PyObject_Malloc() is called + # without holding the GIL + code = 'import _testcapi; _testcapi.pyobject_malloc_without_gil()' + self.check_malloc_without_gil(code) + + +class PyMemMallocDebugTests(PyMemDebugTests): + PYTHONMALLOC = 'malloc_debug' + + +@unittest.skipUnless(sysconfig.get_config_var('WITH_PYMALLOC') == 1, + 'need pymalloc') +class PyMemPymallocDebugTests(PyMemDebugTests): + PYTHONMALLOC = 'pymalloc_debug' + + +@unittest.skipUnless(Py_DEBUG, 'need Py_DEBUG') +class PyMemDefaultTests(PyMemDebugTests): + # test default allocator of Python compiled in debug mode + PYTHONMALLOC = '' + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py index ab9f6ab..6373221 100644 --- a/Lib/test/test_cgi.py +++ b/Lib/test/test_cgi.py @@ -7,6 +7,7 @@ import unittest import warnings from collections import namedtuple from io import StringIO, BytesIO +from test import support class HackedSysModule: # The regression test will have real values in sys.argv, which @@ -147,7 +148,7 @@ class CgiTests(unittest.TestCase): def test_escape(self): # cgi.escape() is deprecated. with warnings.catch_warnings(): - warnings.filterwarnings('ignore', 'cgi\.escape', + warnings.filterwarnings('ignore', r'cgi\.escape', DeprecationWarning) self.assertEqual("test & string", cgi.escape("test & string")) self.assertEqual("<test string>", cgi.escape("")) @@ -473,6 +474,11 @@ this is the content of the fake file cgi.parse_header('form-data; name="files"; filename="fo\\"o;bar"'), ("form-data", {"name": "files", "filename": 'fo"o;bar'})) + def test_all(self): + blacklist = {"logfile", "logfp", "initlog", "dolog", "nolog", + "closelog", "log", "maxlen", "valid_boundary"} + support.check__all__(self, cgi, blacklist=blacklist) + BOUNDARY = "---------------------------721837373350705526688164684" diff --git a/Lib/test/test_charmapcodec.py b/Lib/test/test_charmapcodec.py index 4064aef..0d4594d 100644 --- a/Lib/test/test_charmapcodec.py +++ b/Lib/test/test_charmapcodec.py @@ -9,7 +9,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com). """#" -import test.support, unittest +import unittest import codecs diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py index ecc01f2..4d554a3 100644 --- a/Lib/test/test_class.py +++ b/Lib/test/test_class.py @@ -568,32 +568,5 @@ class ClassTests(unittest.TestCase): a = A(hash(A.f)^(-1)) hash(a.f) - def testSetattrWrapperNameIntern(self): - # Issue #25794: __setattr__ should intern the attribute name - class A: - pass - - def add(self, other): - return 'summa' - - name = str(b'__add__', 'ascii') # shouldn't be optimized - self.assertIsNot(name, '__add__') # not interned - type.__setattr__(A, name, add) - self.assertEqual(A() + 1, 'summa') - - name2 = str(b'__add__', 'ascii') - self.assertIsNot(name2, '__add__') - self.assertIsNot(name2, name) - type.__delattr__(A, name2) - with self.assertRaises(TypeError): - A() + 1 - - def testSetattrNonStringName(self): - class A: - pass - - with self.assertRaises(TypeError): - type.__setattr__(A, b'x', None) - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py index 1f884e5..0451fb0 100644 --- a/Lib/test/test_cmath.py +++ b/Lib/test/test_cmath.py @@ -4,6 +4,8 @@ import test.test_math as test_math import unittest import cmath, math from cmath import phase, polar, rect, pi +import platform +import sys import sysconfig INF = float('inf') @@ -154,6 +156,23 @@ class CMathTests(unittest.TestCase): self.assertAlmostEqual(cmath.e, e_expected, places=9, msg="cmath.e is {}; should be {}".format(cmath.e, e_expected)) + def test_infinity_and_nan_constants(self): + self.assertEqual(cmath.inf.real, math.inf) + self.assertEqual(cmath.inf.imag, 0.0) + self.assertEqual(cmath.infj.real, 0.0) + self.assertEqual(cmath.infj.imag, math.inf) + + self.assertTrue(math.isnan(cmath.nan.real)) + self.assertEqual(cmath.nan.imag, 0.0) + self.assertEqual(cmath.nanj.real, 0.0) + self.assertTrue(math.isnan(cmath.nanj.imag)) + + # Check consistency with reprs. + self.assertEqual(repr(cmath.inf), "inf") + self.assertEqual(repr(cmath.infj), "infj") + self.assertEqual(repr(cmath.nan), "nan") + self.assertEqual(repr(cmath.nanj), "nanj") + def test_user_object(self): # Test automatic calling of __complex__ and __float__ by cmath # functions @@ -315,6 +334,18 @@ class CMathTests(unittest.TestCase): @requires_IEEE_754 def test_specific_values(self): + # Some tests need to be skipped on ancient OS X versions. + # See issue #27953. + SKIP_ON_TIGER = {'tan0064'} + + osx_version = None + if sys.platform == 'darwin': + version_txt = platform.mac_ver()[0] + try: + osx_version = tuple(map(int, version_txt.split('.'))) + except ValueError: + pass + def rect_complex(z): """Wrapped version of rect that accepts a complex number instead of two float arguments.""" @@ -328,6 +359,12 @@ class CMathTests(unittest.TestCase): for id, fn, ar, ai, er, ei, flags in parse_testfile(test_file): arg = complex(ar, ai) expected = complex(er, ei) + + # Skip certain tests on OS X 10.4. + if osx_version is not None and osx_version < (10, 5): + if id in SKIP_ON_TIGER: + continue + if fn == 'rect': function = rect_complex elif fn == 'polar': diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 3d2f769..b71bb9f 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -43,7 +43,7 @@ class CmdLineTest(unittest.TestCase): def test_version(self): version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii") - for switch in '-V', '--version': + for switch in '-V', '--version', '-VV': rc, out, err = assert_python_ok(switch) self.assertFalse(err.startswith(version)) self.assertTrue(out.startswith(version)) @@ -348,8 +348,9 @@ class CmdLineTest(unittest.TestCase): test.support.SuppressCrashReport().__enter__() sys.stdout.write('x') os.close(sys.stdout.fileno())""" - rc, out, err = assert_python_ok('-c', code) + rc, out, err = assert_python_failure('-c', code) self.assertEqual(b'', out) + self.assertEqual(120, rc) self.assertRegex(err.decode('ascii', 'ignore'), 'Exception ignored in.*\nOSError: .*') diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 919f361..38cb2e2 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -10,7 +10,6 @@ import os import os.path import py_compile import subprocess -import io import textwrap from test import support @@ -139,9 +138,8 @@ class CmdLineTest(unittest.TestCase): expected_argv0, expected_path0, expected_package, expected_loader, *cmd_line_switches): - if not __debug__: - cmd_line_switches += ('-' + 'O' * sys.flags.optimize,) - run_args = cmd_line_switches + (script_name,) + tuple(example_args) + run_args = [*support.optim_args_from_interpreter_flags(), + *cmd_line_switches, script_name, *example_args] rc, out, err = assert_python_ok(*run_args, __isolated=False) self._check_output(script_name, rc, out + err, expected_file, expected_argv0, expected_path0, @@ -430,7 +428,7 @@ class CmdLineTest(unittest.TestCase): ('builtins.x', br'Error while finding module specification.*' br'AttributeError'), ('builtins.x.y', br'Error while finding module specification.*' - br'ImportError.*No module named.*not a package'), + br'ModuleNotFoundError.*No module named.*not a package'), ('os.path', br'loader.*cannot handle'), ('importlib', br'No module named.*' br'is a package and cannot be directly executed'), @@ -541,38 +539,6 @@ class CmdLineTest(unittest.TestCase): text = stderr.decode('ascii') self.assertEqual(text, "some text") - def test_syntaxerror_unindented_caret_position(self): - script = "1 + 1 = 2\n" - with support.temp_dir() as script_dir: - script_name = _make_test_script(script_dir, 'script', script) - exitcode, stdout, stderr = assert_python_failure(script_name) - text = io.TextIOWrapper(io.BytesIO(stderr), 'ascii').read() - # Confirm that the caret is located under the first 1 character - self.assertIn("\n 1 + 1 = 2\n ^", text) - - def test_syntaxerror_indented_caret_position(self): - script = textwrap.dedent("""\ - if True: - 1 + 1 = 2 - """) - with support.temp_dir() as script_dir: - script_name = _make_test_script(script_dir, 'script', script) - exitcode, stdout, stderr = assert_python_failure(script_name) - text = io.TextIOWrapper(io.BytesIO(stderr), 'ascii').read() - # Confirm that the caret is located under the first 1 character - self.assertIn("\n 1 + 1 = 2\n ^", text) - - # Try the same with a form feed at the start of the indented line - script = ( - "if True:\n" - "\f 1 + 1 = 2\n" - ) - script_name = _make_test_script(script_dir, "script", script) - exitcode, stdout, stderr = assert_python_failure(script_name) - text = io.TextIOWrapper(io.BytesIO(stderr), "ascii").read() - self.assertNotIn("\f", text) - self.assertIn("\n 1 + 1 = 2\n ^", text) - def test_main(): support.run_unittest(CmdLineTest) diff --git a/Lib/test/test_code_module.py b/Lib/test/test_code_module.py index 3394b39..1a8f699 100644 --- a/Lib/test/test_code_module.py +++ b/Lib/test/test_code_module.py @@ -69,7 +69,7 @@ class TestInteractiveConsole(unittest.TestCase): # with banner self.infunc.side_effect = EOFError('Finished') self.console.interact(banner='Foo') - self.assertEqual(len(self.stderr.method_calls), 2) + self.assertEqual(len(self.stderr.method_calls), 3) banner_call = self.stderr.method_calls[0] self.assertEqual(banner_call, ['write', ('Foo\n',), {}]) @@ -77,8 +77,36 @@ class TestInteractiveConsole(unittest.TestCase): self.stderr.reset_mock() self.infunc.side_effect = EOFError('Finished') self.console.interact(banner='') + self.assertEqual(len(self.stderr.method_calls), 2) + + def test_exit_msg(self): + # default exit message + self.infunc.side_effect = EOFError('Finished') + self.console.interact(banner='') + self.assertEqual(len(self.stderr.method_calls), 2) + err_msg = self.stderr.method_calls[1] + expected = 'now exiting InteractiveConsole...\n' + self.assertEqual(err_msg, ['write', (expected,), {}]) + + # no exit message + self.stderr.reset_mock() + self.infunc.side_effect = EOFError('Finished') + self.console.interact(banner='', exitmsg='') self.assertEqual(len(self.stderr.method_calls), 1) + # custom exit message + self.stderr.reset_mock() + message = ( + 'bye! \N{GREEK SMALL LETTER ZETA}\N{CYRILLIC SMALL LETTER ZHE}' + ) + self.infunc.side_effect = EOFError('Finished') + self.console.interact(banner='', exitmsg=message) + self.assertEqual(len(self.stderr.method_calls), 2) + err_msg = self.stderr.method_calls[1] + expected = message + '\n' + self.assertEqual(err_msg, ['write', (expected,), {}]) + + def test_cause_tb(self): self.infunc.side_effect = ["raise ValueError('') from AttributeError", EOFError('Finished')] diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py index ee1e28a..6a3e993 100644 --- a/Lib/test/test_codeccallbacks.py +++ b/Lib/test/test_codeccallbacks.py @@ -4,7 +4,6 @@ import sys import test.support import unicodedata import unittest -import warnings class PosReturn: # this can be used for configurable callbacks @@ -281,12 +280,12 @@ class CodecCallbackTest(unittest.TestCase): ) self.assertEqual( - b"\\u3042\u3xxx".decode("unicode-escape", "test.handler1"), + b"\\u3042\\u3xxx".decode("unicode-escape", "test.handler1"), "\u3042[<92><117><51>]xxx" ) self.assertEqual( - b"\\u3042\u3xx".decode("unicode-escape", "test.handler1"), + b"\\u3042\\u3xx".decode("unicode-escape", "test.handler1"), "\u3042[<92><117><51>]xx" ) diff --git a/Lib/test/test_codecencodings_cn.py b/Lib/test/test_codecencodings_cn.py index 5101b5c..3bdf7d0 100644 --- a/Lib/test/test_codecencodings_cn.py +++ b/Lib/test/test_codecencodings_cn.py @@ -3,7 +3,6 @@ # Codec encoding tests for PRC encodings. # -from test import support from test import multibytecodec_support import unittest @@ -49,12 +48,6 @@ class Test_GB18030(multibytecodec_support.TestBase, unittest.TestCase): (b"abc\x84\x32\x80\x80def", "replace", 'abc\ufffd2\ufffd\ufffddef'), (b"abc\x81\x30\x81\x30def", "strict", 'abc\x80def'), (b"abc\x86\x30\x81\x30def", "replace", 'abc\ufffd0\ufffd0def'), - # issue29990 - (b"\xff\x30\x81\x30", "strict", None), - (b"\x81\x30\xff\x30", "strict", None), - (b"abc\x81\x39\xff\x39\xc1\xc4", "replace", "abc\ufffd\x39\ufffd\x39\u804a"), - (b"abc\xab\x36\xff\x30def", "replace", 'abc\ufffd\x36\ufffd\x30def'), - (b"abc\xbf\x38\xff\x32\xc1\xc4", "ignore", "abc\x38\x32\u804a"), ) has_iso10646 = True @@ -87,10 +80,6 @@ class Test_HZ(multibytecodec_support.TestBase, unittest.TestCase): (b'ab~{\x81\x81\x41\x44~}cd', 'replace', 'ab\uFFFD\uFFFD\u804Acd'), (b'ab~{\x41\x44~}cd', 'replace', 'ab\u804Acd'), (b"ab~{\x79\x79\x41\x44~}cd", "replace", "ab\ufffd\ufffd\u804acd"), - # issue 30003 - ('ab~cd', 'strict', b'ab~~cd'), # escape ~ - (b'~{Dc~~:C~}', 'strict', None), # ~~ only in ASCII mode - (b'~{Dc~\n:C~}', 'strict', None), # ~\n only in ASCII mode ) if __name__ == "__main__": diff --git a/Lib/test/test_codecencodings_hk.py b/Lib/test/test_codecencodings_hk.py index bb9be11..c5e2f99 100644 --- a/Lib/test/test_codecencodings_hk.py +++ b/Lib/test/test_codecencodings_hk.py @@ -3,7 +3,6 @@ # Codec encoding tests for HongKong encodings. # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecencodings_iso2022.py b/Lib/test/test_codecencodings_iso2022.py index 8a3ca70..00ea1c3 100644 --- a/Lib/test/test_codecencodings_iso2022.py +++ b/Lib/test/test_codecencodings_iso2022.py @@ -1,6 +1,5 @@ # Codec encoding tests for ISO 2022 encodings. -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecencodings_jp.py b/Lib/test/test_codecencodings_jp.py index 44b63a0..94378d1 100644 --- a/Lib/test/test_codecencodings_jp.py +++ b/Lib/test/test_codecencodings_jp.py @@ -3,7 +3,6 @@ # Codec encoding tests for Japanese encodings. # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecencodings_kr.py b/Lib/test/test_codecencodings_kr.py index b6a74fb..863d16b 100644 --- a/Lib/test/test_codecencodings_kr.py +++ b/Lib/test/test_codecencodings_kr.py @@ -3,7 +3,6 @@ # Codec encoding tests for ROK encodings. # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecencodings_tw.py b/Lib/test/test_codecencodings_tw.py index 9174296..bb1d133 100644 --- a/Lib/test/test_codecencodings_tw.py +++ b/Lib/test/test_codecencodings_tw.py @@ -3,7 +3,6 @@ # Codec encoding tests for ROC encodings. # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecmaps_cn.py b/Lib/test/test_codecmaps_cn.py index f1bd384..89e51c6 100644 --- a/Lib/test/test_codecmaps_cn.py +++ b/Lib/test/test_codecmaps_cn.py @@ -3,7 +3,6 @@ # Codec mapping tests for PRC encodings # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecmaps_hk.py b/Lib/test/test_codecmaps_hk.py index 4c0c415..7a48d24 100644 --- a/Lib/test/test_codecmaps_hk.py +++ b/Lib/test/test_codecmaps_hk.py @@ -3,7 +3,6 @@ # Codec mapping tests for HongKong encodings # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecmaps_jp.py b/Lib/test/test_codecmaps_jp.py index 5773823..fdfec80 100644 --- a/Lib/test/test_codecmaps_jp.py +++ b/Lib/test/test_codecmaps_jp.py @@ -3,7 +3,6 @@ # Codec mapping tests for Japanese encodings # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecmaps_kr.py b/Lib/test/test_codecmaps_kr.py index 6cb41c8..471cd74 100644 --- a/Lib/test/test_codecmaps_kr.py +++ b/Lib/test/test_codecmaps_kr.py @@ -3,7 +3,6 @@ # Codec mapping tests for ROK encodings # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecmaps_tw.py b/Lib/test/test_codecmaps_tw.py index 2ea44b5..145a97d 100644 --- a/Lib/test/test_codecmaps_tw.py +++ b/Lib/test/test_codecmaps_tw.py @@ -3,7 +3,6 @@ # Codec mapping tests for ROC encodings # -from test import support from test import multibytecodec_support import unittest diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 013ec64..1e63ed8 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -4,16 +4,10 @@ import io import locale import sys import unittest -import warnings import encodings from test import support -if sys.platform == 'win32': - VISTA_OR_LATER = (sys.getwindowsversion().major >= 6) -else: - VISTA_OR_LATER = False - try: import ctypes except ImportError: @@ -27,6 +21,7 @@ def coding_checker(self, coder): self.assertEqual(coder(input), (expect, len(input))) return check + class Queue(object): """ queue: write bytes at one end, read bytes from the other end @@ -47,6 +42,7 @@ class Queue(object): self._buffer = self._buffer[size:] return s + class MixInCheckStateHandling: def check_state_handling_decode(self, encoding, u, s): for i in range(len(s)+1): @@ -80,6 +76,7 @@ class MixInCheckStateHandling: part2 = d.encode(u[i:], True) self.assertEqual(s, part1+part2) + class ReadTest(MixInCheckStateHandling): def check_partial(self, input, partialresults): # get a StreamReader for the encoding and feed the bytestring version @@ -358,6 +355,12 @@ class ReadTest(MixInCheckStateHandling): self.assertEqual("[\uDC80]".encode(self.encoding, "replace"), "[?]".encode(self.encoding)) + # sequential surrogate characters + self.assertEqual("[\uD800\uDC80]".encode(self.encoding, "ignore"), + "[]".encode(self.encoding)) + self.assertEqual("[\uD800\uDC80]".encode(self.encoding, "replace"), + "[??]".encode(self.encoding)) + bom = "".encode(self.encoding) for before, after in [("\U00010fff", "A"), ("[", "]"), ("A", "\U00010fff")]: @@ -383,6 +386,7 @@ class ReadTest(MixInCheckStateHandling): self.assertEqual(test_sequence.decode(self.encoding, "backslashreplace"), before + backslashreplace + after) + class UTF32Test(ReadTest, unittest.TestCase): encoding = "utf-32" if sys.byteorder == 'little': @@ -478,6 +482,7 @@ class UTF32Test(ReadTest, unittest.TestCase): self.assertEqual('\U00010000' * 1024, codecs.utf_32_decode(encoded_be)[0]) + class UTF32LETest(ReadTest, unittest.TestCase): encoding = "utf-32-le" ill_formed_sequence = b"\x80\xdc\x00\x00" @@ -523,6 +528,7 @@ class UTF32LETest(ReadTest, unittest.TestCase): self.assertEqual('\U00010000' * 1024, codecs.utf_32_le_decode(encoded)[0]) + class UTF32BETest(ReadTest, unittest.TestCase): encoding = "utf-32-be" ill_formed_sequence = b"\x00\x00\xdc\x80" @@ -747,6 +753,7 @@ class UTF8Test(ReadTest, unittest.TestCase): encoding = "utf-8" ill_formed_sequence = b"\xed\xb2\x80" ill_formed_sequence_replace = "\ufffd" * 3 + BOM = b'' def test_partial(self): self.check_partial( @@ -775,27 +782,49 @@ class UTF8Test(ReadTest, unittest.TestCase): self.check_state_handling_decode(self.encoding, u, u.encode(self.encoding)) + def test_decode_error(self): + for data, error_handler, expected in ( + (b'[\x80\xff]', 'ignore', '[]'), + (b'[\x80\xff]', 'replace', '[\ufffd\ufffd]'), + (b'[\x80\xff]', 'surrogateescape', '[\udc80\udcff]'), + (b'[\x80\xff]', 'backslashreplace', '[\\x80\\xff]'), + ): + with self.subTest(data=data, error_handler=error_handler, + expected=expected): + self.assertEqual(data.decode(self.encoding, error_handler), + expected) + def test_lone_surrogates(self): super().test_lone_surrogates() # not sure if this is making sense for # UTF-16 and UTF-32 - self.assertEqual("[\uDC80]".encode('utf-8', "surrogateescape"), - b'[\x80]') + self.assertEqual("[\uDC80]".encode(self.encoding, "surrogateescape"), + self.BOM + b'[\x80]') + + with self.assertRaises(UnicodeEncodeError) as cm: + "[\uDC80\uD800\uDFFF]".encode(self.encoding, "surrogateescape") + exc = cm.exception + self.assertEqual(exc.object[exc.start:exc.end], '\uD800\uDFFF') def test_surrogatepass_handler(self): - self.assertEqual("abc\ud800def".encode("utf-8", "surrogatepass"), - b"abc\xed\xa0\x80def") - self.assertEqual(b"abc\xed\xa0\x80def".decode("utf-8", "surrogatepass"), + self.assertEqual("abc\ud800def".encode(self.encoding, "surrogatepass"), + self.BOM + b"abc\xed\xa0\x80def") + self.assertEqual("\U00010fff\uD800".encode(self.encoding, "surrogatepass"), + self.BOM + b"\xf0\x90\xbf\xbf\xed\xa0\x80") + self.assertEqual("[\uD800\uDC80]".encode(self.encoding, "surrogatepass"), + self.BOM + b'[\xed\xa0\x80\xed\xb2\x80]') + + self.assertEqual(b"abc\xed\xa0\x80def".decode(self.encoding, "surrogatepass"), "abc\ud800def") - self.assertEqual("\U00010fff\uD800".encode("utf-8", "surrogatepass"), - b"\xf0\x90\xbf\xbf\xed\xa0\x80") - self.assertEqual(b"\xf0\x90\xbf\xbf\xed\xa0\x80".decode("utf-8", "surrogatepass"), + self.assertEqual(b"\xf0\x90\xbf\xbf\xed\xa0\x80".decode(self.encoding, "surrogatepass"), "\U00010fff\uD800") + self.assertTrue(codecs.lookup_error("surrogatepass")) with self.assertRaises(UnicodeDecodeError): - b"abc\xed\xa0".decode("utf-8", "surrogatepass") + b"abc\xed\xa0".decode(self.encoding, "surrogatepass") with self.assertRaises(UnicodeDecodeError): - b"abc\xed\xa0z".decode("utf-8", "surrogatepass") + b"abc\xed\xa0z".decode(self.encoding, "surrogatepass") + @unittest.skipUnless(sys.platform == 'win32', 'cp65001 is a Windows-only codec') @@ -807,18 +836,13 @@ class CP65001Test(ReadTest, unittest.TestCase): ('abc', 'strict', b'abc'), ('\xe9\u20ac', 'strict', b'\xc3\xa9\xe2\x82\xac'), ('\U0010ffff', 'strict', b'\xf4\x8f\xbf\xbf'), + ('\udc80', 'strict', None), + ('\udc80', 'ignore', b''), + ('\udc80', 'replace', b'?'), + ('\udc80', 'backslashreplace', b'\\udc80'), + ('\udc80', 'namereplace', b'\\udc80'), + ('\udc80', 'surrogatepass', b'\xed\xb2\x80'), ] - if VISTA_OR_LATER: - tests.extend(( - ('\udc80', 'strict', None), - ('\udc80', 'ignore', b''), - ('\udc80', 'replace', b'?'), - ('\udc80', 'backslashreplace', b'\\udc80'), - ('\udc80', 'namereplace', b'\\udc80'), - ('\udc80', 'surrogatepass', b'\xed\xb2\x80'), - )) - else: - tests.append(('\udc80', 'strict', b'\xed\xb2\x80')) for text, errors, expected in tests: if expected is not None: try: @@ -845,17 +869,10 @@ class CP65001Test(ReadTest, unittest.TestCase): (b'[\xff]', 'ignore', '[]'), (b'[\xff]', 'replace', '[\ufffd]'), (b'[\xff]', 'surrogateescape', '[\udcff]'), + (b'[\xed\xb2\x80]', 'strict', None), + (b'[\xed\xb2\x80]', 'ignore', '[]'), + (b'[\xed\xb2\x80]', 'replace', '[\ufffd\ufffd\ufffd]'), ] - if VISTA_OR_LATER: - tests.extend(( - (b'[\xed\xb2\x80]', 'strict', None), - (b'[\xed\xb2\x80]', 'ignore', '[]'), - (b'[\xed\xb2\x80]', 'replace', '[\ufffd\ufffd\ufffd]'), - )) - else: - tests.extend(( - (b'[\xed\xb2\x80]', 'strict', '[\udc80]'), - )) for raw, errors, expected in tests: if expected is not None: try: @@ -870,7 +887,6 @@ class CP65001Test(ReadTest, unittest.TestCase): self.assertRaises(UnicodeDecodeError, raw.decode, 'cp65001', errors) - @unittest.skipUnless(VISTA_OR_LATER, 'require Windows Vista or later') def test_lone_surrogates(self): self.assertRaises(UnicodeEncodeError, "\ud800".encode, "cp65001") self.assertRaises(UnicodeDecodeError, b"\xed\xa0\x80".decode, "cp65001") @@ -887,7 +903,6 @@ class CP65001Test(ReadTest, unittest.TestCase): self.assertEqual("[\uDC80]".encode("cp65001", "replace"), b'[?]') - @unittest.skipUnless(VISTA_OR_LATER, 'require Windows Vista or later') def test_surrogatepass_handler(self): self.assertEqual("abc\ud800def".encode("cp65001", "surrogatepass"), b"abc\xed\xa0\x80def") @@ -1059,6 +1074,7 @@ class ReadBufferTest(unittest.TestCase): class UTF8SigTest(UTF8Test, unittest.TestCase): encoding = "utf-8-sig" + BOM = codecs.BOM_UTF8 def test_partial(self): self.check_partial( @@ -1159,7 +1175,7 @@ class EscapeDecodeTest(unittest.TestCase): check(b"[\\\n]", b"[]") check(br'[\"]', b'["]') check(br"[\']", b"[']") - check(br"[\\]", br"[\]") + check(br"[\\]", b"[\\]") check(br"[\a]", b"[\x07]") check(br"[\b]", b"[\x08]") check(br"[\t]", b"[\x09]") @@ -1168,7 +1184,6 @@ class EscapeDecodeTest(unittest.TestCase): check(br"[\f]", b"[\x0c]") check(br"[\r]", b"[\x0d]") check(br"[\7]", b"[\x07]") - check(br"[\8]", br"[\8]") check(br"[\78]", b"[\x078]") check(br"[\41]", b"[!]") check(br"[\418]", b"[!8]") @@ -1176,12 +1191,18 @@ class EscapeDecodeTest(unittest.TestCase): check(br"[\1010]", b"[A0]") check(br"[\501]", b"[A]") check(br"[\x41]", b"[A]") - check(br"[\X41]", br"[\X41]") check(br"[\x410]", b"[A0]") - for b in range(256): - if b not in b'\n"\'\\abtnvfr01234567x': - b = bytes([b]) - check(b'\\' + b, b'\\' + b) + for i in range(97, 123): + b = bytes([i]) + if b not in b'abfnrtvx': + with self.assertWarns(DeprecationWarning): + check(b"\\" + b, b"\\" + b) + with self.assertWarns(DeprecationWarning): + check(b"\\" + b.upper(), b"\\" + b.upper()) + with self.assertWarns(DeprecationWarning): + check(br"\8", b"\\8") + with self.assertWarns(DeprecationWarning): + check(br"\9", b"\\9") def test_errors(self): decode = codecs.escape_decode @@ -1194,6 +1215,7 @@ class EscapeDecodeTest(unittest.TestCase): self.assertEqual(decode(br"[\x0]\x0", "ignore"), (b"[]", 8)) self.assertEqual(decode(br"[\x0]\x0", "replace"), (b"[?]?", 8)) + class RecodingTest(unittest.TestCase): def test_recoding(self): f = io.BytesIO() @@ -1313,6 +1335,7 @@ for i in punycode_testcases: if len(i)!=2: print(repr(i)) + class PunycodeTest(unittest.TestCase): def test_encode(self): for uni, puny in punycode_testcases: @@ -1332,6 +1355,7 @@ class PunycodeTest(unittest.TestCase): puny = puny.decode("ascii").encode("ascii") self.assertEqual(uni, puny.decode("punycode")) + class UnicodeInternalTest(unittest.TestCase): @unittest.skipUnless(SIZEOF_WCHAR_T == 4, 'specific to 32-bit wchar_t') def test_bug1251300(self): @@ -1586,6 +1610,7 @@ class NameprepTest(unittest.TestCase): except Exception as e: raise support.TestFailed("Test 3.%d: %s" % (pos+1, str(e))) + class IDNACodecTest(unittest.TestCase): def test_builtin_decode(self): self.assertEqual(str(b"python.org", "idna"), "python.org") @@ -1672,6 +1697,7 @@ class IDNACodecTest(unittest.TestCase): self.assertRaises(Exception, b"python.org".decode, "idna", errors) + class CodecsModuleTest(unittest.TestCase): def test_decode(self): @@ -1780,6 +1806,7 @@ class CodecsModuleTest(unittest.TestCase): self.assertRaises(UnicodeError, codecs.decode, b'abc', 'undefined', errors) + class StreamReaderTest(unittest.TestCase): def setUp(self): @@ -1790,6 +1817,7 @@ class StreamReaderTest(unittest.TestCase): f = self.reader(self.stream) self.assertEqual(f.readlines(), ['\ud55c\n', '\uae00']) + class EncodedFileTest(unittest.TestCase): def test_basic(self): @@ -1909,6 +1937,8 @@ all_unicode_encodings = [ if hasattr(codecs, "mbcs_encode"): all_unicode_encodings.append("mbcs") +if hasattr(codecs, "oem_encode"): + all_unicode_encodings.append("oem") # The following encoding is not tested, because it's not supposed # to work: @@ -1920,6 +1950,7 @@ broken_unicode_with_stateful = [ "unicode_internal" ] + class BasicUnicodeTest(unittest.TestCase, MixInCheckStateHandling): def test_basics(self): s = "abc123" # all codecs should be able to encode these @@ -2082,6 +2113,7 @@ class BasicUnicodeTest(unittest.TestCase, MixInCheckStateHandling): self.check_state_handling_decode(encoding, u, u.encode(encoding)) self.check_state_handling_encode(encoding, u, u.encode(encoding)) + class CharmapTest(unittest.TestCase): def test_decode_with_string_map(self): self.assertEqual( @@ -2332,6 +2364,7 @@ class WithStmtTest(unittest.TestCase): info.streamwriter, 'strict') as srw: self.assertEqual(srw.read(), "\xfc") + class TypesTest(unittest.TestCase): def test_decode_unicode(self): # Most decoders don't accept unicode input @@ -2420,7 +2453,6 @@ class UnicodeEscapeTest(unittest.TestCase): check(br"[\f]", "[\x0c]") check(br"[\r]", "[\x0d]") check(br"[\7]", "[\x07]") - check(br"[\8]", r"[\8]") check(br"[\78]", "[\x078]") check(br"[\41]", "[!]") check(br"[\418]", "[!8]") @@ -2430,9 +2462,18 @@ class UnicodeEscapeTest(unittest.TestCase): check(br"[\x410]", "[A0]") check(br"\u20ac", "\u20ac") check(br"\U0001d120", "\U0001d120") - for b in range(256): - if b not in b'\n"\'\\abtnvfr01234567xuUN': - check(b'\\' + bytes([b]), '\\' + chr(b)) + for i in range(97, 123): + b = bytes([i]) + if b not in b'abfnrtuvx': + with self.assertWarns(DeprecationWarning): + check(b"\\" + b, "\\" + chr(i)) + if b.upper() not in b'UN': + with self.assertWarns(DeprecationWarning): + check(b"\\" + b.upper(), "\\" + chr(i-32)) + with self.assertWarns(DeprecationWarning): + check(br"\8", "\\8") + with self.assertWarns(DeprecationWarning): + check(br"\9", "\\9") def test_decode_errors(self): decode = codecs.unicode_escape_decode @@ -2642,6 +2683,7 @@ else: bytes_transform_encodings.append("bz2_codec") transform_aliases["bz2_codec"] = ["bz2"] + class TransformCodecTest(unittest.TestCase): def test_basics(self): @@ -2694,8 +2736,8 @@ class TransformCodecTest(unittest.TestCase): bad_input = "bad input type" for encoding in bytes_transform_encodings: with self.subTest(encoding=encoding): - fmt = ( "{!r} is not a text encoding; " - "use codecs.encode\(\) to handle arbitrary codecs") + fmt = (r"{!r} is not a text encoding; " + r"use codecs.encode\(\) to handle arbitrary codecs") msg = fmt.format(encoding) with self.assertRaisesRegex(LookupError, msg) as failure: bad_input.encode(encoding) @@ -2704,7 +2746,7 @@ class TransformCodecTest(unittest.TestCase): def test_text_to_binary_blacklists_text_transforms(self): # Check str.encode gives a good error message for str -> str codecs msg = (r"^'rot_13' is not a text encoding; " - "use codecs.encode\(\) to handle arbitrary codecs") + r"use codecs.encode\(\) to handle arbitrary codecs") with self.assertRaisesRegex(LookupError, msg): "just an example message".encode("rot_13") @@ -2716,7 +2758,7 @@ class TransformCodecTest(unittest.TestCase): with self.subTest(encoding=encoding): encoded_data = codecs.encode(data, encoding) fmt = (r"{!r} is not a text encoding; " - "use codecs.decode\(\) to handle arbitrary codecs") + r"use codecs.decode\(\) to handle arbitrary codecs") msg = fmt.format(encoding) with self.assertRaisesRegex(LookupError, msg): encoded_data.decode(encoding) @@ -2728,7 +2770,7 @@ class TransformCodecTest(unittest.TestCase): for bad_input in (b"immutable", bytearray(b"mutable")): with self.subTest(bad_input=bad_input): msg = (r"^'rot_13' is not a text encoding; " - "use codecs.decode\(\) to handle arbitrary codecs") + r"use codecs.decode\(\) to handle arbitrary codecs") with self.assertRaisesRegex(LookupError, msg) as failure: bad_input.decode("rot_13") self.assertIsNone(failure.exception.__cause__) @@ -2947,12 +2989,12 @@ class ExceptionChainingTest(unittest.TestCase): self.assertEqual(decoded, b"not str!") # Text model methods should complain fmt = (r"^{!r} encoder returned 'str' instead of 'bytes'; " - "use codecs.encode\(\) to encode to arbitrary types$") + r"use codecs.encode\(\) to encode to arbitrary types$") msg = fmt.format(self.codec_name) with self.assertRaisesRegex(TypeError, msg): "str_input".encode(self.codec_name) fmt = (r"^{!r} decoder returned 'bytes' instead of 'str'; " - "use codecs.decode\(\) to decode to arbitrary types$") + r"use codecs.decode\(\) to decode to arbitrary types$") msg = fmt.format(self.codec_name) with self.assertRaisesRegex(TypeError, msg): b"bytes input".decode(self.codec_name) @@ -3093,11 +3135,10 @@ class CodePageTest(unittest.TestCase): (b'\xff\xf4\x8f\xbf\xbf', 'ignore', '\U0010ffff'), (b'\xff\xf4\x8f\xbf\xbf', 'replace', '\ufffd\U0010ffff'), )) - if VISTA_OR_LATER: - self.check_encode(self.CP_UTF8, ( - ('[\U0010ffff\uDC80]', 'ignore', b'[\xf4\x8f\xbf\xbf]'), - ('[\U0010ffff\uDC80]', 'replace', b'[\xf4\x8f\xbf\xbf?]'), - )) + self.check_encode(self.CP_UTF8, ( + ('[\U0010ffff\uDC80]', 'ignore', b'[\xf4\x8f\xbf\xbf]'), + ('[\U0010ffff\uDC80]', 'replace', b'[\xf4\x8f\xbf\xbf?]'), + )) def test_incremental(self): decoded = codecs.code_page_decode(932, b'\x82', 'strict', False) @@ -3118,6 +3159,96 @@ class CodePageTest(unittest.TestCase): False) self.assertEqual(decoded, ('abc', 3)) + def test_mbcs_alias(self): + # Check that looking up our 'default' codepage will return + # mbcs when we don't have a more specific one available + import _bootlocale + def _get_fake_codepage(*a): + return 'cp123' + old_getpreferredencoding = _bootlocale.getpreferredencoding + _bootlocale.getpreferredencoding = _get_fake_codepage + try: + codec = codecs.lookup('cp123') + self.assertEqual(codec.name, 'mbcs') + finally: + _bootlocale.getpreferredencoding = old_getpreferredencoding + + +class ASCIITest(unittest.TestCase): + def test_encode(self): + self.assertEqual('abc123'.encode('ascii'), b'abc123') + + def test_encode_error(self): + for data, error_handler, expected in ( + ('[\x80\xff\u20ac]', 'ignore', b'[]'), + ('[\x80\xff\u20ac]', 'replace', b'[???]'), + ('[\x80\xff\u20ac]', 'xmlcharrefreplace', b'[€ÿ€]'), + ('[\x80\xff\u20ac\U000abcde]', 'backslashreplace', + b'[\\x80\\xff\\u20ac\\U000abcde]'), + ('[\udc80\udcff]', 'surrogateescape', b'[\x80\xff]'), + ): + with self.subTest(data=data, error_handler=error_handler, + expected=expected): + self.assertEqual(data.encode('ascii', error_handler), + expected) + + def test_encode_surrogateescape_error(self): + with self.assertRaises(UnicodeEncodeError): + # the first character can be decoded, but not the second + '\udc80\xff'.encode('ascii', 'surrogateescape') + + def test_decode(self): + self.assertEqual(b'abc'.decode('ascii'), 'abc') + + def test_decode_error(self): + for data, error_handler, expected in ( + (b'[\x80\xff]', 'ignore', '[]'), + (b'[\x80\xff]', 'replace', '[\ufffd\ufffd]'), + (b'[\x80\xff]', 'surrogateescape', '[\udc80\udcff]'), + (b'[\x80\xff]', 'backslashreplace', '[\\x80\\xff]'), + ): + with self.subTest(data=data, error_handler=error_handler, + expected=expected): + self.assertEqual(data.decode('ascii', error_handler), + expected) + + +class Latin1Test(unittest.TestCase): + def test_encode(self): + for data, expected in ( + ('abc', b'abc'), + ('\x80\xe9\xff', b'\x80\xe9\xff'), + ): + with self.subTest(data=data, expected=expected): + self.assertEqual(data.encode('latin1'), expected) + + def test_encode_errors(self): + for data, error_handler, expected in ( + ('[\u20ac\udc80]', 'ignore', b'[]'), + ('[\u20ac\udc80]', 'replace', b'[??]'), + ('[\u20ac\U000abcde]', 'backslashreplace', + b'[\\u20ac\\U000abcde]'), + ('[\u20ac\udc80]', 'xmlcharrefreplace', b'[€�]'), + ('[\udc80\udcff]', 'surrogateescape', b'[\x80\xff]'), + ): + with self.subTest(data=data, error_handler=error_handler, + expected=expected): + self.assertEqual(data.encode('latin1', error_handler), + expected) + + def test_encode_surrogateescape_error(self): + with self.assertRaises(UnicodeEncodeError): + # the first character can be decoded, but not the second + '\udc80\u20ac'.encode('latin1', 'surrogateescape') + + def test_decode(self): + for data, expected in ( + (b'abc', 'abc'), + (b'[\x80\xff]', '[\x80\xff]'), + ): + with self.subTest(data=data, expected=expected): + self.assertEqual(data.decode('latin1'), expected) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py index 509bf5d..98da26f 100644 --- a/Lib/test/test_codeop.py +++ b/Lib/test/test_codeop.py @@ -282,7 +282,6 @@ class CodeopTests(unittest.TestCase): ai("if (a == 1 and b = 2): pass") ai("del 1") - ai("del ()") ai("del (1,)") ai("del [1]") ai("del '1'") diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py index 5238382..87454cc 100644 --- a/Lib/test/test_collections.py +++ b/Lib/test/test_collections.py @@ -19,11 +19,12 @@ from collections import namedtuple, Counter, OrderedDict, _count_elements from collections import UserDict, UserString, UserList from collections import ChainMap from collections import deque -from collections.abc import Awaitable, Coroutine, AsyncIterator, AsyncIterable -from collections.abc import Hashable, Iterable, Iterator, Generator -from collections.abc import Sized, Container, Callable +from collections.abc import Awaitable, Coroutine +from collections.abc import AsyncIterator, AsyncIterable, AsyncGenerator +from collections.abc import Hashable, Iterable, Iterator, Generator, Reversible +from collections.abc import Sized, Container, Callable, Collection from collections.abc import Set, MutableSet -from collections.abc import Mapping, MutableMapping, KeysView, ItemsView +from collections.abc import Mapping, MutableMapping, KeysView, ItemsView, ValuesView from collections.abc import Sequence, MutableSequence from collections.abc import ByteString @@ -242,6 +243,10 @@ class TestNamedTuple(unittest.TestCase): ]: self.assertEqual(namedtuple('NT', spec, rename=True)._fields, renamed) + def test_module_parameter(self): + NT = namedtuple('NT', ['x', 'y'], module=collections) + self.assertEqual(NT.__module__, collections) + def test_instance(self): Point = namedtuple('Point', 'x y') p = Point(11, 22) @@ -412,6 +417,18 @@ class TestNamedTuple(unittest.TestCase): self.assertEqual(NTColor._fields, ('red', 'green', 'blue')) globals().pop('NTColor', None) # clean-up after this test + def test_keyword_only_arguments(self): + # See issue 25628 + with support.captured_stdout() as template: + NT = namedtuple('NT', ['x', 'y'], verbose=True) + self.assertIn('class NT', NT._source) + with self.assertRaises(TypeError): + NT = namedtuple('NT', ['x', 'y'], True) + + NT = namedtuple('NT', ['abc', 'def'], rename=True) + self.assertEqual(NT._fields, ('abc', '_1')) + with self.assertRaises(TypeError): + NT = namedtuple('NT', ['abc', 'def'], False, True) def test_namedtuple_subclass_issue_24931(self): class Point(namedtuple('_Point', ['x', 'y'])): @@ -487,6 +504,9 @@ class ABCTestCase(unittest.TestCase): self.assertTrue(other.right_side,'Right side not called for %s.%s' % (type(instance), name)) +def _test_gen(): + yield + class TestOneTrickPonyABCs(ABCTestCase): def test_Awaitable(self): @@ -674,7 +694,7 @@ class TestOneTrickPonyABCs(ABCTestCase): samples = [bytes(), str(), tuple(), list(), set(), frozenset(), dict(), dict().keys(), dict().items(), dict().values(), - (lambda: (yield))(), + _test_gen(), (x for x in []), ] for x in samples: @@ -688,6 +708,161 @@ class TestOneTrickPonyABCs(ABCTestCase): self.assertFalse(issubclass(str, I)) self.validate_abstract_methods(Iterable, '__iter__') self.validate_isinstance(Iterable, '__iter__') + # Check None blocking + class It: + def __iter__(self): return iter([]) + class ItBlocked(It): + __iter__ = None + self.assertTrue(issubclass(It, Iterable)) + self.assertTrue(isinstance(It(), Iterable)) + self.assertFalse(issubclass(ItBlocked, Iterable)) + self.assertFalse(isinstance(ItBlocked(), Iterable)) + + def test_Reversible(self): + # Check some non-reversibles + non_samples = [None, 42, 3.14, 1j, dict(), set(), frozenset()] + for x in non_samples: + self.assertNotIsInstance(x, Reversible) + self.assertFalse(issubclass(type(x), Reversible), repr(type(x))) + # Check some non-reversible iterables + non_reversibles = [dict().keys(), dict().items(), dict().values(), + Counter(), Counter().keys(), Counter().items(), + Counter().values(), _test_gen(), + (x for x in []), iter([]), reversed([])] + for x in non_reversibles: + self.assertNotIsInstance(x, Reversible) + self.assertFalse(issubclass(type(x), Reversible), repr(type(x))) + # Check some reversible iterables + samples = [bytes(), str(), tuple(), list(), OrderedDict(), + OrderedDict().keys(), OrderedDict().items(), + OrderedDict().values()] + for x in samples: + self.assertIsInstance(x, Reversible) + self.assertTrue(issubclass(type(x), Reversible), repr(type(x))) + # Check also Mapping, MutableMapping, and Sequence + self.assertTrue(issubclass(Sequence, Reversible), repr(Sequence)) + self.assertFalse(issubclass(Mapping, Reversible), repr(Mapping)) + self.assertFalse(issubclass(MutableMapping, Reversible), repr(MutableMapping)) + # Check direct subclassing + class R(Reversible): + def __iter__(self): + return iter(list()) + def __reversed__(self): + return iter(list()) + self.assertEqual(list(reversed(R())), []) + self.assertFalse(issubclass(float, R)) + self.validate_abstract_methods(Reversible, '__reversed__', '__iter__') + # Check reversible non-iterable (which is not Reversible) + class RevNoIter: + def __reversed__(self): return reversed([]) + class RevPlusIter(RevNoIter): + def __iter__(self): return iter([]) + self.assertFalse(issubclass(RevNoIter, Reversible)) + self.assertFalse(isinstance(RevNoIter(), Reversible)) + self.assertTrue(issubclass(RevPlusIter, Reversible)) + self.assertTrue(isinstance(RevPlusIter(), Reversible)) + # Check None blocking + class Rev: + def __iter__(self): return iter([]) + def __reversed__(self): return reversed([]) + class RevItBlocked(Rev): + __iter__ = None + class RevRevBlocked(Rev): + __reversed__ = None + self.assertTrue(issubclass(Rev, Reversible)) + self.assertTrue(isinstance(Rev(), Reversible)) + self.assertFalse(issubclass(RevItBlocked, Reversible)) + self.assertFalse(isinstance(RevItBlocked(), Reversible)) + self.assertFalse(issubclass(RevRevBlocked, Reversible)) + self.assertFalse(isinstance(RevRevBlocked(), Reversible)) + + def test_Collection(self): + # Check some non-collections + non_collections = [None, 42, 3.14, 1j, lambda x: 2*x] + for x in non_collections: + self.assertNotIsInstance(x, Collection) + self.assertFalse(issubclass(type(x), Collection), repr(type(x))) + # Check some non-collection iterables + non_col_iterables = [_test_gen(), iter(b''), iter(bytearray()), + (x for x in []), dict().values()] + for x in non_col_iterables: + self.assertNotIsInstance(x, Collection) + self.assertFalse(issubclass(type(x), Collection), repr(type(x))) + # Check some collections + samples = [set(), frozenset(), dict(), bytes(), str(), tuple(), + list(), dict().keys(), dict().items()] + for x in samples: + self.assertIsInstance(x, Collection) + self.assertTrue(issubclass(type(x), Collection), repr(type(x))) + # Check also Mapping, MutableMapping, etc. + self.assertTrue(issubclass(Sequence, Collection), repr(Sequence)) + self.assertTrue(issubclass(Mapping, Collection), repr(Mapping)) + self.assertTrue(issubclass(MutableMapping, Collection), + repr(MutableMapping)) + self.assertTrue(issubclass(Set, Collection), repr(Set)) + self.assertTrue(issubclass(MutableSet, Collection), repr(MutableSet)) + self.assertTrue(issubclass(Sequence, Collection), repr(MutableSet)) + # Check direct subclassing + class Col(Collection): + def __iter__(self): + return iter(list()) + def __len__(self): + return 0 + def __contains__(self, item): + return False + class DerCol(Col): pass + self.assertEqual(list(iter(Col())), []) + self.assertFalse(issubclass(list, Col)) + self.assertFalse(issubclass(set, Col)) + self.assertFalse(issubclass(float, Col)) + self.assertEqual(list(iter(DerCol())), []) + self.assertFalse(issubclass(list, DerCol)) + self.assertFalse(issubclass(set, DerCol)) + self.assertFalse(issubclass(float, DerCol)) + self.validate_abstract_methods(Collection, '__len__', '__iter__', + '__contains__') + # Check sized container non-iterable (which is not Collection) etc. + class ColNoIter: + def __len__(self): return 0 + def __contains__(self, item): return False + class ColNoSize: + def __iter__(self): return iter([]) + def __contains__(self, item): return False + class ColNoCont: + def __iter__(self): return iter([]) + def __len__(self): return 0 + self.assertFalse(issubclass(ColNoIter, Collection)) + self.assertFalse(isinstance(ColNoIter(), Collection)) + self.assertFalse(issubclass(ColNoSize, Collection)) + self.assertFalse(isinstance(ColNoSize(), Collection)) + self.assertFalse(issubclass(ColNoCont, Collection)) + self.assertFalse(isinstance(ColNoCont(), Collection)) + # Check None blocking + class SizeBlock: + def __iter__(self): return iter([]) + def __contains__(self): return False + __len__ = None + class IterBlock: + def __len__(self): return 0 + def __contains__(self): return True + __iter__ = None + self.assertFalse(issubclass(SizeBlock, Collection)) + self.assertFalse(isinstance(SizeBlock(), Collection)) + self.assertFalse(issubclass(IterBlock, Collection)) + self.assertFalse(isinstance(IterBlock(), Collection)) + # Check None blocking in subclass + class ColImpl: + def __iter__(self): + return iter(list()) + def __len__(self): + return 0 + def __contains__(self, item): + return False + class NonCol(ColImpl): + __contains__ = None + self.assertFalse(issubclass(NonCol, Collection)) + self.assertFalse(isinstance(NonCol(), Collection)) + def test_Iterator(self): non_samples = [None, 42, 3.14, 1j, b"", "", (), [], {}, set()] @@ -699,7 +874,7 @@ class TestOneTrickPonyABCs(ABCTestCase): iter(set()), iter(frozenset()), iter(dict().keys()), iter(dict().items()), iter(dict().values()), - (lambda: (yield))(), + _test_gen(), (x for x in []), ] for x in samples: @@ -785,9 +960,90 @@ class TestOneTrickPonyABCs(ABCTestCase): self.assertRaises(RuntimeError, IgnoreGeneratorExit().close) + def test_AsyncGenerator(self): + class NonAGen1: + def __aiter__(self): return self + def __anext__(self): return None + def aclose(self): pass + def athrow(self, typ, val=None, tb=None): pass + + class NonAGen2: + def __aiter__(self): return self + def __anext__(self): return None + def aclose(self): pass + def asend(self, value): return value + + class NonAGen3: + def aclose(self): pass + def asend(self, value): return value + def athrow(self, typ, val=None, tb=None): pass + + non_samples = [ + None, 42, 3.14, 1j, b"", "", (), [], {}, set(), + iter(()), iter([]), NonAGen1(), NonAGen2(), NonAGen3()] + for x in non_samples: + self.assertNotIsInstance(x, AsyncGenerator) + self.assertFalse(issubclass(type(x), AsyncGenerator), repr(type(x))) + + class Gen: + def __aiter__(self): return self + async def __anext__(self): return None + async def aclose(self): pass + async def asend(self, value): return value + async def athrow(self, typ, val=None, tb=None): pass + + class MinimalAGen(AsyncGenerator): + async def asend(self, value): + return value + async def athrow(self, typ, val=None, tb=None): + await super().athrow(typ, val, tb) + + async def gen(): + yield 1 + + samples = [gen(), Gen(), MinimalAGen()] + for x in samples: + self.assertIsInstance(x, AsyncIterator) + self.assertIsInstance(x, AsyncGenerator) + self.assertTrue(issubclass(type(x), AsyncGenerator), repr(type(x))) + self.validate_abstract_methods(AsyncGenerator, 'asend', 'athrow') + + def run_async(coro): + result = None + while True: + try: + coro.send(None) + except StopIteration as ex: + result = ex.args[0] if ex.args else None + break + return result + + # mixin tests + mgen = MinimalAGen() + self.assertIs(mgen, mgen.__aiter__()) + self.assertIs(run_async(mgen.asend(None)), run_async(mgen.__anext__())) + self.assertEqual(2, run_async(mgen.asend(2))) + self.assertIsNone(run_async(mgen.aclose())) + with self.assertRaises(ValueError): + run_async(mgen.athrow(ValueError)) + + class FailOnClose(AsyncGenerator): + async def asend(self, value): return value + async def athrow(self, *args): raise ValueError + + with self.assertRaises(ValueError): + run_async(FailOnClose().aclose()) + + class IgnoreGeneratorExit(AsyncGenerator): + async def asend(self, value): return value + async def athrow(self, *args): pass + + with self.assertRaises(RuntimeError): + run_async(IgnoreGeneratorExit().aclose()) + def test_Sized(self): non_samples = [None, 42, 3.14, 1j, - (lambda: (yield))(), + _test_gen(), (x for x in []), ] for x in non_samples: @@ -805,7 +1061,7 @@ class TestOneTrickPonyABCs(ABCTestCase): def test_Container(self): non_samples = [None, 42, 3.14, 1j, - (lambda: (yield))(), + _test_gen(), (x for x in []), ] for x in non_samples: @@ -824,7 +1080,7 @@ class TestOneTrickPonyABCs(ABCTestCase): def test_Callable(self): non_samples = [None, 42, 3.14, 1j, "", b"", (), [], {}, set(), - (lambda: (yield))(), + _test_gen(), (x for x in []), ] for x in non_samples: @@ -842,14 +1098,14 @@ class TestOneTrickPonyABCs(ABCTestCase): self.validate_isinstance(Callable, '__call__') def test_direct_subclassing(self): - for B in Hashable, Iterable, Iterator, Sized, Container, Callable: + for B in Hashable, Iterable, Iterator, Reversible, Sized, Container, Callable: class C(B): pass self.assertTrue(issubclass(C, B)) self.assertFalse(issubclass(int, C)) def test_registration(self): - for B in Hashable, Iterable, Iterator, Sized, Container, Callable: + for B in Hashable, Iterable, Iterator, Reversible, Sized, Container, Callable: class C: __hash__ = None # Make sure it isn't hashable by default self.assertFalse(issubclass(C, B), B.__name__) @@ -1049,6 +1305,26 @@ class TestCollectionABCs(ABCTestCase): self.assertFalse(ncs > cs) self.assertTrue(ncs >= cs) + def test_issue26915(self): + # Container membership test should check identity first + class CustomEqualObject: + def __eq__(self, other): + return False + class CustomSequence(list): + def __contains__(self, value): + return Sequence.__contains__(self, value) + + nan = float('nan') + obj = CustomEqualObject() + containers = [ + CustomSequence([nan, obj]), + ItemsView({1: nan, 2: obj}), + ValuesView({1: nan, 2: obj}) + ] + for container in containers: + for elem in container: + self.assertIn(elem, container) + def assertSameSet(self, s1, s2): # coerce both to a real set then check equality self.assertSetEqual(set(s1), set(s2)) @@ -1219,6 +1495,7 @@ class TestCollectionABCs(ABCTestCase): def __iter__(self): return iter(()) self.validate_comparison(MyMapping()) + self.assertRaises(TypeError, reversed, MyMapping()) def test_MutableMapping(self): for sample in [dict]: diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index 4ea66a4..409ec86 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -473,10 +473,13 @@ if 1: self.assertEqual(d, {1: 2, 3: 4}) def test_compile_filename(self): - for filename in ('file.py', b'file.py', - bytearray(b'file.py'), memoryview(b'file.py')): + for filename in 'file.py', b'file.py': code = compile('pass', filename, 'exec') self.assertEqual(code.co_filename, 'file.py') + for filename in bytearray(b'file.py'), memoryview(b'file.py'): + with self.assertWarns(DeprecationWarning): + code = compile('pass', filename, 'exec') + self.assertEqual(code.co_filename, 'file.py') self.assertRaises(TypeError, compile, 'pass', list(b'file.py'), 'exec') @support.cpython_only @@ -634,7 +637,6 @@ if 1: f1 = ns['f1'] f2 = ns['f2'] self.assertIsNot(f1.__code__, f2.__code__) - self.assertNotEqual(f1.__code__, f2.__code__) self.check_constant(f1, const1) self.check_constant(f2, const2) self.assertEqual(repr(f1()), repr(const1)) @@ -643,8 +645,6 @@ if 1: check_different_constants(0, 0.0) check_different_constants(+0.0, -0.0) check_different_constants((0,), (0.0,)) - check_different_constants('a', b'a') - check_different_constants(('a',), (b'a',)) # check_different_constants() cannot be used because repr(-0j) is # '(-0-0j)', but when '(-0-0j)' is evaluated to 0j: we loose the sign. @@ -664,6 +664,16 @@ if 1: self.assertTrue(f1(0)) self.assertTrue(f2(0.0)) + def test_path_like_objects(self): + # An implicit test for PyUnicode_FSDecoder(). + class PathLike: + def __init__(self, path): + self._path = path + def __fspath__(self): + return self._path + + compile("42", PathLike("test_compile_pathlike"), "single") + class TestStackSize(unittest.TestCase): # These tests check that the computed stack size for a code object diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py index 2ce8a61..2356efc 100644 --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -1,6 +1,7 @@ import sys import compileall import importlib.util +import test.test_importlib.util import os import pathlib import py_compile @@ -40,6 +41,11 @@ class CompileallTests(unittest.TestCase): def tearDown(self): shutil.rmtree(self.directory) + def add_bad_source_file(self): + self.bad_source_path = os.path.join(self.directory, '_test_bad.py') + with open(self.bad_source_path, 'w') as file: + file.write('x (\n') + def data(self): with open(self.bc_path, 'rb') as file: data = file.read(8) @@ -78,15 +84,47 @@ class CompileallTests(unittest.TestCase): os.unlink(fn) except: pass - compileall.compile_file(self.source_path, force=False, quiet=True) + self.assertTrue(compileall.compile_file(self.source_path, + force=False, quiet=True)) self.assertTrue(os.path.isfile(self.bc_path) and not os.path.isfile(self.bc_path2)) os.unlink(self.bc_path) - compileall.compile_dir(self.directory, force=False, quiet=True) + self.assertTrue(compileall.compile_dir(self.directory, force=False, + quiet=True)) self.assertTrue(os.path.isfile(self.bc_path) and os.path.isfile(self.bc_path2)) os.unlink(self.bc_path) os.unlink(self.bc_path2) + # Test against bad files + self.add_bad_source_file() + self.assertFalse(compileall.compile_file(self.bad_source_path, + force=False, quiet=2)) + self.assertFalse(compileall.compile_dir(self.directory, + force=False, quiet=2)) + + def test_compile_file_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + # we should also test the output + with support.captured_stdout() as stdout: + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path))) + self.assertRegex(stdout.getvalue(), r'Compiling ([^WindowsPath|PosixPath].*)') + self.assertTrue(os.path.isfile(self.bc_path)) + + def test_compile_file_pathlike_ddir(self): + self.assertFalse(os.path.isfile(self.bc_path)) + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path), + ddir=pathlib.Path('ddir_path'), + quiet=2)) + self.assertTrue(os.path.isfile(self.bc_path)) + + def test_compile_path(self): + with test.test_importlib.util.import_state(path=[self.directory]): + self.assertTrue(compileall.compile_path(quiet=2)) + + with test.test_importlib.util.import_state(path=[self.directory]): + self.add_bad_source_file() + self.assertFalse(compileall.compile_path(skip_curdir=False, + force=True, quiet=2)) def test_no_pycache_in_non_package(self): # Bug 8563 reported that __pycache__ directories got created by @@ -115,6 +153,14 @@ class CompileallTests(unittest.TestCase): optimization=opt) self.assertTrue(os.path.isfile(cached3)) + def test_compile_dir_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + with support.captured_stdout() as stdout: + compileall.compile_dir(pathlib.Path(self.directory)) + line = stdout.getvalue().splitlines()[0] + self.assertRegex(line, r'Listing ([^WindowsPath|PosixPath].*)') + self.assertTrue(os.path.isfile(self.bc_path)) + @mock.patch('compileall.ProcessPoolExecutor') def test_compile_pool_called(self, pool_mock): compileall.compile_dir(self.directory, quiet=True, workers=5) @@ -197,10 +243,9 @@ class CommandLineTests(unittest.TestCase): raise unittest.SkipTest('not all entries on sys.path are writable') def _get_run_args(self, args): - interp_args = ['-S'] - if sys.flags.optimize: - interp_args.append({1 : '-O', 2 : '-OO'}[sys.flags.optimize]) - return interp_args + ['-m', 'compileall'] + list(args) + return [*support.optim_args_from_interpreter_flags(), + '-S', '-m', 'compileall', + *args] def assertRunOK(self, *args, **env_vars): rc, out, err = script_helper.assert_python_ok( diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py index 8d551a4..c249ca7 100644 --- a/Lib/test/test_complex.py +++ b/Lib/test/test_complex.py @@ -1,5 +1,7 @@ import unittest from test import support +from test.test_grammar import (VALID_UNDERSCORE_LITERALS, + INVALID_UNDERSCORE_LITERALS) from random import random from math import atan2, isnan, copysign @@ -385,28 +387,17 @@ class ComplexTest(unittest.TestCase): self.assertAlmostEqual(complex(complex1(1j)), 2j) self.assertRaises(TypeError, complex, complex2(1j)) - @support.requires_IEEE_754 - def test_constructor_special_numbers(self): - class complex2(complex): - pass - for x in 0.0, -0.0, INF, -INF, NAN: - for y in 0.0, -0.0, INF, -INF, NAN: - with self.subTest(x=x, y=y): - z = complex(x, y) - self.assertFloatsAreIdentical(z.real, x) - self.assertFloatsAreIdentical(z.imag, y) - z = complex2(x, y) - self.assertIs(type(z), complex2) - self.assertFloatsAreIdentical(z.real, x) - self.assertFloatsAreIdentical(z.imag, y) - z = complex(complex2(x, y)) - self.assertIs(type(z), complex) - self.assertFloatsAreIdentical(z.real, x) - self.assertFloatsAreIdentical(z.imag, y) - z = complex2(complex(x, y)) - self.assertIs(type(z), complex2) - self.assertFloatsAreIdentical(z.real, x) - self.assertFloatsAreIdentical(z.imag, y) + def test_underscores(self): + # check underscores + for lit in VALID_UNDERSCORE_LITERALS: + if not any(ch in lit for ch in 'xXoObB'): + self.assertEqual(complex(lit), eval(lit)) + self.assertEqual(complex(lit), complex(lit.replace('_', ''))) + for lit in INVALID_UNDERSCORE_LITERALS: + if lit in ('0_7', '09_99'): # octals are not recognized here + continue + if not any(ch in lit for ch in 'xXoObB'): + self.assertRaises(ValueError, complex, lit) def test_hash(self): for x in range(-30, 30): diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 7513815..23e95b2 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -154,6 +154,30 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, unittest.Tes for t in threads: t.join() + def test_thread_names_assigned(self): + executor = futures.ThreadPoolExecutor( + max_workers=5, thread_name_prefix='SpecialPool') + executor.map(abs, range(-5, 5)) + threads = executor._threads + del executor + + for t in threads: + self.assertRegex(t.name, r'^SpecialPool_[0-4]$') + t.join() + + def test_thread_names_default(self): + executor = futures.ThreadPoolExecutor(max_workers=5) + executor.map(abs, range(-5, 5)) + threads = executor._threads + del executor + + for t in threads: + # We don't particularly care what the default name is, just that + # it has a default name implying that it is a ThreadPoolExecutor + # followed by what looks like a thread number. + self.assertRegex(t.name, r'^.*ThreadPoolExecutor.*_[0-4]$') + t.join() + class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, unittest.TestCase): def _prime_executor(self): diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py index 864a1d0..0d06080 100644 --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -2076,5 +2076,11 @@ class BlatantOverrideConvertersTestCase(unittest.TestCase): self.assertEqual(cfg['two'].getlen('one'), 5) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {"Error"} + support.check__all__(self, configparser, blacklist=blacklist) + + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_contains.py b/Lib/test/test_contains.py index 3c6bdef..036a1d0 100644 --- a/Lib/test/test_contains.py +++ b/Lib/test/test_contains.py @@ -84,6 +84,31 @@ class TestContains(unittest.TestCase): self.assertTrue(container == constructor(values)) self.assertTrue(container == container) + def test_block_fallback(self): + # blocking fallback with __contains__ = None + class ByContains(object): + def __contains__(self, other): + return False + c = ByContains() + class BlockContains(ByContains): + """Is not a container + + This class is a perfectly good iterable (as tested by + list(bc)), as well as inheriting from a perfectly good + container, but __contains__ = None prevents the usual + fallback to iteration in the container protocol. That + is, normally, 0 in bc would fall back to the equivalent + of any(x==0 for x in bc), but here it's blocked from + doing so. + """ + def __iter__(self): + while False: + yield None + __contains__ = None + bc = BlockContains() + self.assertFalse(0 in c) + self.assertFalse(0 in list(bc)) + self.assertRaises(TypeError, lambda: 0 in bc) if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py index ad1b6cd..c04c804 100644 --- a/Lib/test/test_contextlib.py +++ b/Lib/test/test_contextlib.py @@ -12,6 +12,39 @@ except ImportError: threading = None +class TestAbstractContextManager(unittest.TestCase): + + def test_enter(self): + class DefaultEnter(AbstractContextManager): + def __exit__(self, *args): + super().__exit__(*args) + + manager = DefaultEnter() + self.assertIs(manager.__enter__(), manager) + + def test_exit_is_abstract(self): + class MissingExit(AbstractContextManager): + pass + + with self.assertRaises(TypeError): + MissingExit() + + def test_structural_subclassing(self): + class ManagerFromScratch: + def __enter__(self): + return self + def __exit__(self, exc_type, exc_value, traceback): + return None + + self.assertTrue(issubclass(ManagerFromScratch, AbstractContextManager)) + + class DefaultEnter(AbstractContextManager): + def __exit__(self, *args): + super().__exit__(*args) + + self.assertTrue(issubclass(DefaultEnter, AbstractContextManager)) + + class ContextManagerTestCase(unittest.TestCase): def test_contextmanager_plain(self): @@ -89,7 +122,7 @@ class ContextManagerTestCase(unittest.TestCase): def woohoo(): yield try: - with self.assertWarnsRegex(PendingDeprecationWarning, + with self.assertWarnsRegex(DeprecationWarning, "StopIteration"): with woohoo(): raise stop_exc @@ -119,29 +152,6 @@ def woohoo(): else: self.fail('StopIteration was suppressed') - def test_contextmanager_do_not_unchain_non_stopiteration_exceptions(self): - @contextmanager - def test_issue29692(): - try: - yield - except Exception as exc: - raise RuntimeError('issue29692:Chained') from exc - try: - with test_issue29692(): - raise ZeroDivisionError - except Exception as ex: - self.assertIs(type(ex), RuntimeError) - self.assertEqual(ex.args[0], 'issue29692:Chained') - self.assertIsInstance(ex.__cause__, ZeroDivisionError) - - try: - with test_issue29692(): - raise StopIteration('issue29692:Unchained') - except Exception as ex: - self.assertIs(type(ex), StopIteration) - self.assertEqual(ex.args[0], 'issue29692:Unchained') - self.assertIsNone(ex.__cause__) - def _create_contextmanager_attribs(self): def attribs(**kw): def decorate(func): diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py index 0e1f670..45a6920 100644 --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -98,7 +98,7 @@ class TestCopy(unittest.TestCase): tests = [None, ..., NotImplemented, 42, 2**100, 3.14, True, False, 1j, "hello", "hello\u1234", f.__code__, - b"world", bytes(range(256)), range(10), + b"world", bytes(range(256)), range(10), slice(1, 10, 2), NewStyle, Classic, max, WithMetaclass] for x in tests: self.assertIs(copy.copy(x), x) diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 402fbe8..78439a2 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -69,55 +69,130 @@ def silence_coro_gc(): class AsyncBadSyntaxTest(unittest.TestCase): def test_badsyntax_1(self): - with self.assertRaisesRegex(SyntaxError, "'await' outside"): - import test.badsyntax_async1 + samples = [ + """def foo(): + await something() + """, - def test_badsyntax_2(self): - with self.assertRaisesRegex(SyntaxError, "'await' outside"): - import test.badsyntax_async2 + """await something()""", - def test_badsyntax_3(self): - with self.assertRaisesRegex(SyntaxError, 'invalid syntax'): - import test.badsyntax_async3 + """async def foo(): + yield from [] + """, + + """async def foo(): + await await fut + """, - def test_badsyntax_4(self): - with self.assertRaisesRegex(SyntaxError, 'invalid syntax'): - import test.badsyntax_async4 + """async def foo(a=await something()): + pass + """, - def test_badsyntax_5(self): - with self.assertRaisesRegex(SyntaxError, 'invalid syntax'): - import test.badsyntax_async5 + """async def foo(a:await something()): + pass + """, - def test_badsyntax_6(self): - with self.assertRaisesRegex( - SyntaxError, "'yield' inside async function"): + """async def foo(): + def bar(): + [i async for i in els] + """, - import test.badsyntax_async6 + """async def foo(): + def bar(): + [await i for i in els] + """, - def test_badsyntax_7(self): - with self.assertRaisesRegex( - SyntaxError, "'yield from' inside async function"): + """async def foo(): + def bar(): + [i for i in els + async for b in els] + """, - import test.badsyntax_async7 + """async def foo(): + def bar(): + [i for i in els + for c in b + async for b in els] + """, - def test_badsyntax_8(self): - with self.assertRaisesRegex(SyntaxError, 'invalid syntax'): - import test.badsyntax_async8 + """async def foo(): + def bar(): + [i for i in els + async for b in els + for c in b] + """, - def test_badsyntax_9(self): - ns = {} - for comp in {'(await a for a in b)', - '[await a for a in b]', - '{await a for a in b}', - '{await a: c for a in b}'}: + """async def foo(): + def bar(): + [i for i in els + for b in await els] + """, - with self.assertRaisesRegex(SyntaxError, 'await.*in comprehen'): - exec('async def f():\n\t{}'.format(comp), ns, ns) + """async def foo(): + def bar(): + [i for i in els + for b in els + if await b] + """, - def test_badsyntax_10(self): - # Tests for issue 24619 + """async def foo(): + def bar(): + [i for i in await els] + """, + + """async def foo(): + def bar(): + [i for i in els if await i] + """, + + """def bar(): + [i async for i in els] + """, + + """def bar(): + [await i for i in els] + """, + + """def bar(): + [i for i in els + async for b in els] + """, + + """def bar(): + [i for i in els + for c in b + async for b in els] + """, + + """def bar(): + [i for i in els + async for b in els + for c in b] + """, + + """def bar(): + [i for i in els + for b in await els] + """, + + """def bar(): + [i for i in els + for b in els + if await b] + """, + + """def bar(): + [i for i in await els] + """, + + """def bar(): + [i for i in els if await i] + """, + + """async def foo(): + await + """, - samples = [ """async def foo(): def bar(): pass await = 1 @@ -283,57 +358,110 @@ class AsyncBadSyntaxTest(unittest.TestCase): with self.subTest(code=code), self.assertRaises(SyntaxError): compile(code, "", "exec") - def test_goodsyntax_1(self): - # Tests for issue 24619 + def test_badsyntax_2(self): + samples = [ + """def foo(): + await = 1 + """, - def foo(await): - async def foo(): pass - async def foo(): + """class Bar: + def async(): pass + """, + + """class Bar: + async = 1 + """, + + """class async: pass - return await + 1 - self.assertEqual(foo(10), 11) + """, - def foo(await): - async def foo(): pass - async def foo(): pass - return await + 2 - self.assertEqual(foo(20), 22) + """class await: + pass + """, - def foo(await): + """import math as await""", - async def foo(): pass + """def async(): + pass""", - async def foo(): pass + """def foo(*, await=1): + pass""" - return await + 2 - self.assertEqual(foo(20), 22) + """async = 1""", - def foo(await): - """spam""" - async def foo(): \ - pass - # 123 - async def foo(): pass - # 456 - return await + 2 - self.assertEqual(foo(20), 22) - - def foo(await): - def foo(): pass - def foo(): pass - async def bar(): return await_ - await_ = await - try: - bar().send(None) - except StopIteration as ex: - return ex.args[0] - self.assertEqual(foo(42), 42) + """print(await=1)""" + ] - async def f(): - async def g(): pass - await z - await = 1 - self.assertTrue(inspect.iscoroutinefunction(f)) + for code in samples: + with self.subTest(code=code), self.assertWarnsRegex( + DeprecationWarning, + "'await' will become reserved keywords"): + compile(code, "", "exec") + + def test_badsyntax_3(self): + with self.assertRaises(DeprecationWarning): + with warnings.catch_warnings(): + warnings.simplefilter("error") + compile("async = 1", "", "exec") + + def test_goodsyntax_1(self): + # Tests for issue 24619 + + samples = [ + '''def foo(await): + async def foo(): pass + async def foo(): + pass + return await + 1 + ''', + + '''def foo(await): + async def foo(): pass + async def foo(): pass + return await + 1 + ''', + + '''def foo(await): + + async def foo(): pass + + async def foo(): pass + + return await + 1 + ''', + + '''def foo(await): + """spam""" + async def foo(): \ + pass + # 123 + async def foo(): pass + # 456 + return await + 1 + ''', + + '''def foo(await): + def foo(): pass + def foo(): pass + async def bar(): return await_ + await_ = await + try: + bar().send(None) + except StopIteration as ex: + return ex.args[0] + 1 + ''' + ] + + for code in samples: + with self.subTest(code=code): + loc = {} + + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + exec(code, loc, loc) + + self.assertEqual(loc['foo'](10), 11) class TokenizerRegrTest(unittest.TestCase): @@ -906,7 +1034,7 @@ class CoroutineTest(unittest.TestCase): return await Awaitable() with self.assertRaisesRegex( - TypeError, "__await__\(\) returned a coroutine"): + TypeError, r"__await__\(\) returned a coroutine"): run_async(foo()) @@ -975,21 +1103,6 @@ class CoroutineTest(unittest.TestCase): "coroutine is being awaited already"): waiter(coro).send(None) - def test_await_16(self): - # See https://bugs.python.org/issue29600 for details. - - async def f(): - return ValueError() - - async def g(): - try: - raise KeyError - except: - return await f() - - _, result = run_async(g()) - self.assertIsNone(result.__context__) - def test_with_1(self): class Manager: def __init__(self, name): @@ -1285,7 +1398,7 @@ class CoroutineTest(unittest.TestCase): buffer = [] async def test1(): - with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"): + with self.assertWarnsRegex(DeprecationWarning, "legacy"): async for i1, i2 in AsyncIter(): buffer.append(i1 + i2) @@ -1299,7 +1412,7 @@ class CoroutineTest(unittest.TestCase): buffer = [] async def test2(): nonlocal buffer - with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"): + with self.assertWarnsRegex(DeprecationWarning, "legacy"): async for i in AsyncIter(): buffer.append(i[0]) if i[0] == 20: @@ -1318,7 +1431,7 @@ class CoroutineTest(unittest.TestCase): buffer = [] async def test3(): nonlocal buffer - with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"): + with self.assertWarnsRegex(DeprecationWarning, "legacy"): async for i in AsyncIter(): if i[0] > 20: continue @@ -1363,7 +1476,7 @@ class CoroutineTest(unittest.TestCase): with self.assertRaisesRegex( TypeError, - "async for' received an invalid object.*__aiter.*\: I"): + r"async for' received an invalid object.*__aiter.*\: I"): run_async(foo()) @@ -1401,7 +1514,7 @@ class CoroutineTest(unittest.TestCase): return 123 async def foo(): - with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"): + with self.assertWarnsRegex(DeprecationWarning, "legacy"): async for i in I(): print('never going to happen') @@ -1510,7 +1623,7 @@ class CoroutineTest(unittest.TestCase): 1/0 async def foo(): nonlocal CNT - with self.assertWarnsRegex(PendingDeprecationWarning, "legacy"): + with self.assertWarnsRegex(DeprecationWarning, "legacy"): async for i in AI(): CNT += 1 CNT += 10 @@ -1537,7 +1650,7 @@ class CoroutineTest(unittest.TestCase): self.assertEqual(CNT, 0) def test_for_9(self): - # Test that PendingDeprecationWarning can safely be converted into + # Test that DeprecationWarning can safely be converted into # an exception (__aiter__ should not have a chance to raise # a ZeroDivisionError.) class AI: @@ -1547,13 +1660,13 @@ class CoroutineTest(unittest.TestCase): async for i in AI(): pass - with self.assertRaises(PendingDeprecationWarning): + with self.assertRaises(DeprecationWarning): with warnings.catch_warnings(): warnings.simplefilter("error") run_async(foo()) def test_for_10(self): - # Test that PendingDeprecationWarning can safely be converted into + # Test that DeprecationWarning can safely be converted into # an exception. class AI: async def __aiter__(self): @@ -1562,7 +1675,7 @@ class CoroutineTest(unittest.TestCase): async for i in AI(): pass - with self.assertRaises(PendingDeprecationWarning): + with self.assertRaises(DeprecationWarning): with warnings.catch_warnings(): warnings.simplefilter("error") run_async(foo()) @@ -1613,6 +1726,185 @@ class CoroutineTest(unittest.TestCase): foo().send(None) self.assertEqual(result, [42]) + def test_comp_1(self): + async def f(i): + return i + + async def run_list(): + return [await c for c in [f(1), f(41)]] + + async def run_set(): + return {await c for c in [f(1), f(41)]} + + async def run_dict1(): + return {await c: 'a' for c in [f(1), f(41)]} + + async def run_dict2(): + return {i: await c for i, c in enumerate([f(1), f(41)])} + + self.assertEqual(run_async(run_list()), ([], [1, 41])) + self.assertEqual(run_async(run_set()), ([], {1, 41})) + self.assertEqual(run_async(run_dict1()), ([], {1: 'a', 41: 'a'})) + self.assertEqual(run_async(run_dict2()), ([], {0: 1, 1: 41})) + + def test_comp_2(self): + async def f(i): + return i + + async def run_list(): + return [s for c in [f(''), f('abc'), f(''), f(['de', 'fg'])] + for s in await c] + + self.assertEqual( + run_async(run_list()), + ([], ['a', 'b', 'c', 'de', 'fg'])) + + async def run_set(): + return {d + for c in [f([f([10, 30]), + f([20])])] + for s in await c + for d in await s} + + self.assertEqual( + run_async(run_set()), + ([], {10, 20, 30})) + + async def run_set2(): + return {await s + for c in [f([f(10), f(20)])] + for s in await c} + + self.assertEqual( + run_async(run_set2()), + ([], {10, 20})) + + def test_comp_3(self): + async def f(it): + for i in it: + yield i + + async def run_list(): + return [i + 1 async for i in f([10, 20])] + self.assertEqual( + run_async(run_list()), + ([], [11, 21])) + + async def run_set(): + return {i + 1 async for i in f([10, 20])} + self.assertEqual( + run_async(run_set()), + ([], {11, 21})) + + async def run_dict(): + return {i + 1: i + 2 async for i in f([10, 20])} + self.assertEqual( + run_async(run_dict()), + ([], {11: 12, 21: 22})) + + async def run_gen(): + gen = (i + 1 async for i in f([10, 20])) + return [g + 100 async for g in gen] + self.assertEqual( + run_async(run_gen()), + ([], [111, 121])) + + def test_comp_4(self): + async def f(it): + for i in it: + yield i + + async def run_list(): + return [i + 1 async for i in f([10, 20]) if i > 10] + self.assertEqual( + run_async(run_list()), + ([], [21])) + + async def run_set(): + return {i + 1 async for i in f([10, 20]) if i > 10} + self.assertEqual( + run_async(run_set()), + ([], {21})) + + async def run_dict(): + return {i + 1: i + 2 async for i in f([10, 20]) if i > 10} + self.assertEqual( + run_async(run_dict()), + ([], {21: 22})) + + async def run_gen(): + gen = (i + 1 async for i in f([10, 20]) if i > 10) + return [g + 100 async for g in gen] + self.assertEqual( + run_async(run_gen()), + ([], [121])) + + def test_comp_5(self): + async def f(it): + for i in it: + yield i + + async def run_list(): + return [i + 1 for pair in ([10, 20], [30, 40]) if pair[0] > 10 + async for i in f(pair) if i > 30] + self.assertEqual( + run_async(run_list()), + ([], [41])) + + def test_comp_6(self): + async def f(it): + for i in it: + yield i + + async def run_list(): + return [i + 1 async for seq in f([(10, 20), (30,)]) + for i in seq] + + self.assertEqual( + run_async(run_list()), + ([], [11, 21, 31])) + + def test_comp_7(self): + async def f(): + yield 1 + yield 2 + raise Exception('aaa') + + async def run_list(): + return [i async for i in f()] + + with self.assertRaisesRegex(Exception, 'aaa'): + run_async(run_list()) + + def test_comp_8(self): + async def f(): + return [i for i in [1, 2, 3]] + + self.assertEqual( + run_async(f()), + ([], [1, 2, 3])) + + def test_comp_9(self): + async def gen(): + yield 1 + yield 2 + async def f(): + l = [i async for i in gen()] + return [i for i in l] + + self.assertEqual( + run_async(f()), + ([], [1, 2])) + + def test_comp_10(self): + async def f(): + xx = {i for i in [1, 2, 3]} + return {x: x for x in xx} + + self.assertEqual( + run_async(f()), + ([], {1: 1, 2: 2, 3: 3})) + def test_copy(self): async def func(): pass coro = func() @@ -1743,8 +2035,8 @@ class SysSetCoroWrapperTest(unittest.TestCase): try: with silence_coro_gc(), self.assertRaisesRegex( RuntimeError, - "coroutine wrapper.*\.wrapper at 0x.*attempted to " - "recursively wrap .* wrap .*"): + r"coroutine wrapper.*\.wrapper at 0x.*attempted to " + r"recursively wrap .* wrap .*"): foo() finally: @@ -1772,7 +2064,6 @@ class SysSetCoroWrapperTest(unittest.TestCase): sys.set_coroutine_wrapper(None) -@support.cpython_only class CAPITest(unittest.TestCase): def test_tp_await_1(self): diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py index f18983f..53f8917 100644 --- a/Lib/test/test_cprofile.py +++ b/Lib/test/test_cprofile.py @@ -6,7 +6,7 @@ from test.support import run_unittest, TESTFN, unlink # rip off all interesting stuff from test_profile import cProfile from test.test_profile import ProfileTest, regenerate_expected_output -from test.profilee import testfunc + class CProfileTest(ProfileTest): profilerclass = cProfile.Profile diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 77c315e..03ab184 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -2,9 +2,7 @@ # csv package unit tests import copy -import io import sys -import os import unittest from io import StringIO from tempfile import TemporaryFile @@ -12,6 +10,9 @@ import csv import gc import pickle from test import support +from itertools import permutations +from textwrap import dedent +from collections import OrderedDict class Test_Csv(unittest.TestCase): """ @@ -426,17 +427,16 @@ class TestDialectRegistry(unittest.TestCase): self.assertRaises(TypeError, csv.reader, [], quoting = -1) self.assertRaises(TypeError, csv.reader, [], quoting = 100) - # See issue #22995 - ## def test_copy(self): - ## for name in csv.list_dialects(): - ## dialect = csv.get_dialect(name) - ## self.assertRaises(TypeError, copy.copy, dialect) + def test_copy(self): + for name in csv.list_dialects(): + dialect = csv.get_dialect(name) + self.assertRaises(TypeError, copy.copy, dialect) - ## def test_pickle(self): - ## for name in csv.list_dialects(): - ## dialect = csv.get_dialect(name) - ## for proto in range(pickle.HIGHEST_PROTOCOL + 1): - ## self.assertRaises(TypeError, pickle.dumps, dialect, proto) + def test_pickle(self): + for name in csv.list_dialects(): + dialect = csv.get_dialect(name) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + self.assertRaises(TypeError, pickle.dumps, dialect, proto) class TestCsvBase(unittest.TestCase): def readerAssertEqual(self, input, expected_result): @@ -626,6 +626,24 @@ class TestDictFields(unittest.TestCase): self.assertNotIn("'f2'", exception) self.assertIn("1", exception) + def test_typo_in_extrasaction_raises_error(self): + fileobj = StringIO() + self.assertRaises(ValueError, csv.DictWriter, fileobj, ['f1', 'f2'], + extrasaction="raised") + + def test_write_field_not_in_field_names_raise(self): + fileobj = StringIO() + writer = csv.DictWriter(fileobj, ['f1', 'f2'], extrasaction="raise") + dictrow = {'f0': 0, 'f1': 1, 'f2': 2, 'f3': 3} + self.assertRaises(ValueError, csv.DictWriter.writerow, writer, dictrow) + + def test_write_field_not_in_field_names_ignore(self): + fileobj = StringIO() + writer = csv.DictWriter(fileobj, ['f1', 'f2'], extrasaction="ignore") + dictrow = {'f0': 0, 'f1': 1, 'f2': 2, 'f3': 3} + csv.DictWriter.writerow(writer, dictrow) + self.assertEqual(fileobj.getvalue(), "1,2\r\n") + def test_read_dict_fields(self): with TemporaryFile("w+") as fileobj: fileobj.write("1,2,abc\r\n") @@ -1080,7 +1098,6 @@ class TestUnicode(unittest.TestCase): "François Pinard"] def test_unicode_read(self): - import io with TemporaryFile("w+", newline='', encoding="utf-8") as fileobj: fileobj.write(",".join(self.names) + "\r\n") fileobj.seek(0) @@ -1089,7 +1106,6 @@ class TestUnicode(unittest.TestCase): def test_unicode_write(self): - import io with TemporaryFile("w+", newline='', encoding="utf-8") as fileobj: writer = csv.writer(fileobj) writer.writerow(self.names) @@ -1097,6 +1113,63 @@ class TestUnicode(unittest.TestCase): fileobj.seek(0) self.assertEqual(fileobj.read(), expected) +class KeyOrderingTest(unittest.TestCase): + + def test_ordering_for_the_dict_reader_and_writer(self): + resultset = set() + for keys in permutations("abcde"): + with TemporaryFile('w+', newline='', encoding="utf-8") as fileobject: + dw = csv.DictWriter(fileobject, keys) + dw.writeheader() + fileobject.seek(0) + dr = csv.DictReader(fileobject) + kt = tuple(dr.fieldnames) + self.assertEqual(keys, kt) + resultset.add(kt) + # Final sanity check: were all permutations unique? + self.assertEqual(len(resultset), 120, "Key ordering: some key permutations not collected (expected 120)") + + def test_ordered_dict_reader(self): + data = dedent('''\ + FirstName,LastName + Eric,Idle + Graham,Chapman,Over1,Over2 + + Under1 + John,Cleese + ''').splitlines() + + self.assertEqual(list(csv.DictReader(data)), + [OrderedDict([('FirstName', 'Eric'), ('LastName', 'Idle')]), + OrderedDict([('FirstName', 'Graham'), ('LastName', 'Chapman'), + (None, ['Over1', 'Over2'])]), + OrderedDict([('FirstName', 'Under1'), ('LastName', None)]), + OrderedDict([('FirstName', 'John'), ('LastName', 'Cleese')]), + ]) + + self.assertEqual(list(csv.DictReader(data, restkey='OtherInfo')), + [OrderedDict([('FirstName', 'Eric'), ('LastName', 'Idle')]), + OrderedDict([('FirstName', 'Graham'), ('LastName', 'Chapman'), + ('OtherInfo', ['Over1', 'Over2'])]), + OrderedDict([('FirstName', 'Under1'), ('LastName', None)]), + OrderedDict([('FirstName', 'John'), ('LastName', 'Cleese')]), + ]) + + del data[0] # Remove the header row + self.assertEqual(list(csv.DictReader(data, fieldnames=['fname', 'lname'])), + [OrderedDict([('fname', 'Eric'), ('lname', 'Idle')]), + OrderedDict([('fname', 'Graham'), ('lname', 'Chapman'), + (None, ['Over1', 'Over2'])]), + OrderedDict([('fname', 'Under1'), ('lname', None)]), + OrderedDict([('fname', 'John'), ('lname', 'Cleese')]), + ]) + + +class MiscTestCase(unittest.TestCase): + def test__all__(self): + extra = {'__doc__', '__version__'} + support.check__all__(self, csv, ('csv', '_csv'), extra=extra) + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py index 0d0b160..d020fd2 100644 --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -27,7 +27,6 @@ requires('curses') curses = import_module('curses') import_module('curses.panel') import_module('curses.ascii') -import_module('curses.textpad') def requires_curses_func(name): return unittest.skipUnless(hasattr(curses, name), @@ -81,7 +80,7 @@ class TestCurses(unittest.TestCase): win2 = curses.newwin(15,15, 5,5) for meth in [stdscr.addch, stdscr.addstr]: - for args in [('a',), ('a', curses.A_BOLD), + for args in [('a'), ('a', curses.A_BOLD), (4,4, 'a'), (5,5, 'a', curses.A_BOLD)]: with self.subTest(meth=meth.__qualname__, args=args): meth(*args) @@ -194,15 +193,6 @@ class TestCurses(unittest.TestCase): self.assertRaises(ValueError, stdscr.instr, -2) self.assertRaises(ValueError, stdscr.instr, 2, 3, -2) - def test_embedded_null_chars(self): - # reject embedded null bytes and characters - stdscr = self.stdscr - for arg in ['a', b'a']: - with self.subTest(arg=arg): - self.assertRaises(ValueError, stdscr.addstr, 'a\0') - self.assertRaises(ValueError, stdscr.addnstr, 'a\0', 1) - self.assertRaises(ValueError, stdscr.insstr, 'a\0') - self.assertRaises(ValueError, stdscr.insnstr, 'a\0', 1) def test_module_funcs(self): "Test module-level functions" @@ -253,7 +243,7 @@ class TestCurses(unittest.TestCase): # Functions only available on a few platforms def test_colors_funcs(self): if not curses.has_colors(): - self.skipTest('requires colors support') + self.skip('requires colors support') curses.start_color() curses.init_pair(2, 1,1) curses.color_content(1) @@ -276,7 +266,7 @@ class TestCurses(unittest.TestCase): def test_getmouse(self): (availmask, oldmask) = curses.mousemask(curses.BUTTON1_PRESSED) if availmask == 0: - self.skipTest('mouse stuff not available') + self.skip('mouse stuff not available') curses.mouseinterval(10) # just verify these don't cause errors curses.ungetmouse(0, 0, 0, 0, curses.BUTTON1_PRESSED) @@ -402,14 +392,6 @@ class TestCurses(unittest.TestCase): human_readable_signature = stdscr.addch.__doc__.split("\n")[0] self.assertIn("[y, x,]", human_readable_signature) - def test_issue13051(self): - stdscr = self.stdscr - box = curses.textpad.Textbox(stdscr, insert_mode=True) - lines, cols = stdscr.getmaxyx() - stdscr.resize(lines-2, cols-2) - # this may cause infinite recursion, leading to a RuntimeError - box._insert_printable_char('a') - class MiscTests(unittest.TestCase): @@ -454,25 +436,6 @@ class TestAscii(unittest.TestCase): check(curses.ascii.ispunct, c in string.punctuation) check(curses.ascii.isxdigit, c in string.hexdigits) - for i in (-2, -1, 256, sys.maxunicode, sys.maxunicode+1): - self.assertFalse(curses.ascii.isalnum(i)) - self.assertFalse(curses.ascii.isalpha(i)) - self.assertFalse(curses.ascii.isdigit(i)) - self.assertFalse(curses.ascii.islower(i)) - self.assertFalse(curses.ascii.isspace(i)) - self.assertFalse(curses.ascii.isupper(i)) - - self.assertFalse(curses.ascii.isascii(i)) - self.assertFalse(curses.ascii.isctrl(i)) - self.assertFalse(curses.ascii.iscntrl(i)) - self.assertFalse(curses.ascii.isblank(i)) - self.assertFalse(curses.ascii.isgraph(i)) - self.assertFalse(curses.ascii.isprint(i)) - self.assertFalse(curses.ascii.ispunct(i)) - self.assertFalse(curses.ascii.isxdigit(i)) - - self.assertFalse(curses.ascii.ismeta(-1)) - def test_ascii(self): ascii = curses.ascii.ascii self.assertEqual(ascii('\xc1'), 'A') diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index 2d4eb52..242e1bb 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -23,9 +23,16 @@ test_suffixes = ["_Pure", "_Fast"] test_classes = [] for module, suffix in zip(test_modules, test_suffixes): + test_classes = [] for name, cls in module.__dict__.items(): - if not (isinstance(cls, type) and issubclass(cls, unittest.TestCase)): + if not isinstance(cls, type): continue + if issubclass(cls, unittest.TestCase): + test_classes.append(cls) + elif issubclass(cls, unittest.TestSuite): + suit = cls() + test_classes.extend(type(test) for test in suit) + for cls in test_classes: cls.__name__ = name + suffix @classmethod def setUpClass(cls_, module=module): @@ -39,7 +46,6 @@ for module, suffix in zip(test_modules, test_suffixes): sys.modules.update(cls_._save_sys_modules) cls.setUpClass = setUpClass cls.tearDownClass = tearDownClass - test_classes.append(cls) def test_main(): run_unittest(*test_classes) diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index 623d992..f0a428d 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -1,6 +1,5 @@ """Test script for the dbm.open function based on testdumbdbm.py""" -import os import unittest import glob import test.support diff --git a/Lib/test/test_dbm_dumb.py b/Lib/test/test_dbm_dumb.py index 235ab11..2d77f07 100644 --- a/Lib/test/test_dbm_dumb.py +++ b/Lib/test/test_dbm_dumb.py @@ -5,8 +5,8 @@ import io import operator import os -import stat import unittest +import warnings import dbm.dumb as dumbdbm from test import support from functools import partial @@ -79,6 +79,12 @@ class DumbDBMTestCase(unittest.TestCase): self.init_db() f = dumbdbm.open(_fname, 'r') self.read_helper(f) + with self.assertWarnsRegex(DeprecationWarning, + 'The database is opened for reading only'): + f[b'g'] = b'x' + with self.assertWarnsRegex(DeprecationWarning, + 'The database is opened for reading only'): + del f[b'a'] f.close() def test_dumbdbm_keys(self): @@ -149,7 +155,7 @@ class DumbDBMTestCase(unittest.TestCase): self.assertEqual(self._dict[key], f[key]) def init_db(self): - f = dumbdbm.open(_fname, 'w') + f = dumbdbm.open(_fname, 'n') for k in self._dict: f[k] = self._dict[k] f.close() @@ -235,20 +241,23 @@ class DumbDBMTestCase(unittest.TestCase): pass self.assertEqual(stdout.getvalue(), '') - @unittest.skipUnless(hasattr(os, 'chmod'), 'test needs os.chmod()') - def test_readonly_files(self): - with support.temp_dir() as dir: - fname = os.path.join(dir, 'db') - with dumbdbm.open(fname, 'n') as f: - self.assertEqual(list(f.keys()), []) - for key in self._dict: - f[key] = self._dict[key] - os.chmod(fname + ".dir", stat.S_IRUSR) - os.chmod(fname + ".dat", stat.S_IRUSR) - os.chmod(dir, stat.S_IRUSR|stat.S_IXUSR) - with dumbdbm.open(fname, 'r') as f: - self.assertEqual(sorted(f.keys()), sorted(self._dict)) - f.close() # don't write + def test_warn_on_ignored_flags(self): + for value in ('r', 'w'): + _delete_files() + with self.assertWarnsRegex(DeprecationWarning, + "The database file is missing, the " + "semantics of the 'c' flag will " + "be used."): + f = dumbdbm.open(_fname, value) + f.close() + + def test_invalid_flag(self): + for flag in ('x', 'rf', None): + with self.assertWarnsRegex(DeprecationWarning, + "Flag must be one of " + "'r', 'w', 'c', or 'n'"): + f = dumbdbm.open(_fname, flag) + f.close() def tearDown(self): _delete_files() diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py index a7808f5..304b332 100644 --- a/Lib/test/test_dbm_gnu.py +++ b/Lib/test/test_dbm_gnu.py @@ -2,7 +2,7 @@ from test import support gdbm = support.import_module("dbm.gnu") #skip if not supported import unittest import os -from test.support import verbose, TESTFN, unlink +from test.support import TESTFN, unlink filename = TESTFN diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py index 2291561..49f4426 100644 --- a/Lib/test/test_dbm_ndbm.py +++ b/Lib/test/test_dbm_ndbm.py @@ -1,8 +1,6 @@ from test import support support.import_module("dbm.ndbm") #skip if not supported import unittest -import os -import random import dbm.ndbm from dbm.ndbm import error diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 1aa0bf8..617a37e 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -554,6 +554,10 @@ class ExplicitConstructionTest(unittest.TestCase): self.assertEqual(str(Decimal(' -7.89')), '-7.89') self.assertEqual(str(Decimal(" 3.45679 ")), '3.45679') + # underscores + self.assertEqual(str(Decimal('1_3.3e4_0')), '1.33E+41') + self.assertEqual(str(Decimal('1_0_0_0')), '1000') + # unicode whitespace for lead in ["", ' ', '\u00a0', '\u205f']: for trail in ["", ' ', '\u00a0', '\u205f']: @@ -578,6 +582,9 @@ class ExplicitConstructionTest(unittest.TestCase): # embedded NUL self.assertRaises(InvalidOperation, Decimal, "12\u00003") + # underscores don't prevent errors + self.assertRaises(InvalidOperation, Decimal, "1_2_\u00003") + @cpython_only def test_from_legacy_strings(self): import _testcapi @@ -772,6 +779,9 @@ class ExplicitConstructionTest(unittest.TestCase): self.assertRaises(InvalidOperation, nc.create_decimal, "xyz") self.assertRaises(ValueError, nc.create_decimal, (1, "xyz", -25)) self.assertRaises(TypeError, nc.create_decimal, "1234", "5678") + # no whitespace and underscore stripping is done with this method + self.assertRaises(InvalidOperation, nc.create_decimal, " 1234") + self.assertRaises(InvalidOperation, nc.create_decimal, "12_34") # too many NaN payload digits nc.prec = 3 @@ -2047,6 +2057,39 @@ class UsabilityTest(unittest.TestCase): d = Decimal( (1, (0, 2, 7, 1), 'F') ) self.assertEqual(d.as_tuple(), (1, (0,), 'F')) + def test_as_integer_ratio(self): + Decimal = self.decimal.Decimal + + # exceptional cases + self.assertRaises(OverflowError, + Decimal.as_integer_ratio, Decimal('inf')) + self.assertRaises(OverflowError, + Decimal.as_integer_ratio, Decimal('-inf')) + self.assertRaises(ValueError, + Decimal.as_integer_ratio, Decimal('-nan')) + self.assertRaises(ValueError, + Decimal.as_integer_ratio, Decimal('snan123')) + + for exp in range(-4, 2): + for coeff in range(1000): + for sign in '+', '-': + d = Decimal('%s%dE%d' % (sign, coeff, exp)) + pq = d.as_integer_ratio() + p, q = pq + + # check return type + self.assertIsInstance(pq, tuple) + self.assertIsInstance(p, int) + self.assertIsInstance(q, int) + + # check normalization: q should be positive; + # p should be relatively prime to q. + self.assertGreater(q, 0) + self.assertEqual(math.gcd(p, q), 1) + + # check that p/q actually gives the correct value + self.assertEqual(Decimal(p) / Decimal(q), d) + def test_subclassing(self): # Different behaviours when subclassing Decimal Decimal = self.decimal.Decimal diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index 18e1df0..ce517b5 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -289,7 +289,7 @@ class TestBasic(unittest.TestCase): else: self.assertEqual(d.index(element, start, stop), target) - def test_insert_bug_24913(self): + def test_index_bug_24913(self): d = deque('A' * 3) with self.assertRaises(ValueError): i = d.index("Hello world", 0, 4) @@ -622,20 +622,22 @@ class TestBasic(unittest.TestCase): self.assertEqual(list(d), list(e)) def test_pickle(self): - d = deque(range(200)) - for i in range(pickle.HIGHEST_PROTOCOL + 1): - s = pickle.dumps(d, i) - e = pickle.loads(s) - self.assertNotEqual(id(d), id(e)) - self.assertEqual(list(d), list(e)) - -## def test_pickle_recursive(self): -## d = deque('abc') -## d.append(d) -## for i in range(pickle.HIGHEST_PROTOCOL + 1): -## e = pickle.loads(pickle.dumps(d, i)) -## self.assertNotEqual(id(d), id(e)) -## self.assertEqual(id(e), id(e[-1])) + for d in deque(range(200)), deque(range(200), 100): + for i in range(pickle.HIGHEST_PROTOCOL + 1): + s = pickle.dumps(d, i) + e = pickle.loads(s) + self.assertNotEqual(id(e), id(d)) + self.assertEqual(list(e), list(d)) + self.assertEqual(e.maxlen, d.maxlen) + + def test_pickle_recursive(self): + for d in deque('abc'), deque('abc', 3): + d.append(d) + for i in range(pickle.HIGHEST_PROTOCOL + 1): + e = pickle.loads(pickle.dumps(d, i)) + self.assertNotEqual(id(e), id(d)) + self.assertEqual(id(e[-1]), id(e)) + self.assertEqual(e.maxlen, d.maxlen) def test_iterator_pickle(self): orig = deque(range(200)) @@ -696,6 +698,15 @@ class TestBasic(unittest.TestCase): self.assertNotEqual(id(d), id(e)) self.assertEqual(list(d), list(e)) + for i in range(5): + for maxlen in range(-1, 6): + s = [random.random() for j in range(i)] + d = deque(s) if maxlen == -1 else deque(s, maxlen) + e = d.copy() + self.assertEqual(d, e) + self.assertEqual(d.maxlen, e.maxlen) + self.assertTrue(all(x is y for x, y in zip(d, e))) + def test_copy_method(self): mut = [10] d = deque([mut]) @@ -845,24 +856,26 @@ class TestSubclass(unittest.TestCase): self.assertEqual(type(d), type(e)) self.assertEqual(list(d), list(e)) -## def test_pickle(self): -## d = Deque('abc') -## d.append(d) -## -## e = pickle.loads(pickle.dumps(d)) -## self.assertNotEqual(id(d), id(e)) -## self.assertEqual(type(d), type(e)) -## dd = d.pop() -## ee = e.pop() -## self.assertEqual(id(e), id(ee)) -## self.assertEqual(d, e) -## -## d.x = d -## e = pickle.loads(pickle.dumps(d)) -## self.assertEqual(id(e), id(e.x)) -## -## d = DequeWithBadIter('abc') -## self.assertRaises(TypeError, pickle.dumps, d) + def test_pickle_recursive(self): + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + for d in Deque('abc'), Deque('abc', 3): + d.append(d) + + e = pickle.loads(pickle.dumps(d, proto)) + self.assertNotEqual(id(e), id(d)) + self.assertEqual(type(e), type(d)) + self.assertEqual(e.maxlen, d.maxlen) + dd = d.pop() + ee = e.pop() + self.assertEqual(id(ee), id(e)) + self.assertEqual(e, d) + + d.x = d + e = pickle.loads(pickle.dumps(d, proto)) + self.assertEqual(id(e.x), id(e)) + + for d in DequeWithBadIter('abc'), DequeWithBadIter('abc', 2): + self.assertRaises(TypeError, pickle.dumps, d, proto) def test_weakref(self): d = deque('gallahad') diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index eda6fc1..1e08ed9 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -7,7 +7,6 @@ import pickle import sys import types import unittest -import warnings import weakref from copy import deepcopy @@ -1662,77 +1661,6 @@ order (MRO) for bases """ self.assertEqual(b.foo, 3) self.assertEqual(b.__class__, D) - @unittest.expectedFailure - def test_bad_new(self): - self.assertRaises(TypeError, object.__new__) - self.assertRaises(TypeError, object.__new__, '') - self.assertRaises(TypeError, list.__new__, object) - self.assertRaises(TypeError, object.__new__, list) - class C(object): - __new__ = list.__new__ - self.assertRaises(TypeError, C) - class C(list): - __new__ = object.__new__ - self.assertRaises(TypeError, C) - - def test_object_new(self): - class A(object): - pass - object.__new__(A) - self.assertRaises(TypeError, object.__new__, A, 5) - object.__init__(A()) - self.assertRaises(TypeError, object.__init__, A(), 5) - - class A(object): - def __init__(self, foo): - self.foo = foo - object.__new__(A) - object.__new__(A, 5) - object.__init__(A(3)) - self.assertRaises(TypeError, object.__init__, A(3), 5) - - class A(object): - def __new__(cls, foo): - return object.__new__(cls) - object.__new__(A) - self.assertRaises(TypeError, object.__new__, A, 5) - object.__init__(A(3)) - object.__init__(A(3), 5) - - class A(object): - def __new__(cls, foo): - return object.__new__(cls) - def __init__(self, foo): - self.foo = foo - object.__new__(A) - self.assertRaises(TypeError, object.__new__, A, 5) - object.__init__(A(3)) - self.assertRaises(TypeError, object.__init__, A(3), 5) - - @unittest.expectedFailure - def test_restored_object_new(self): - class A(object): - def __new__(cls, *args, **kwargs): - raise AssertionError - self.assertRaises(AssertionError, A) - class B(A): - __new__ = object.__new__ - def __init__(self, foo): - self.foo = foo - with warnings.catch_warnings(): - warnings.simplefilter('error', DeprecationWarning) - b = B(3) - self.assertEqual(b.foo, 3) - self.assertEqual(b.__class__, B) - del B.__new__ - self.assertRaises(AssertionError, B) - del A.__new__ - with warnings.catch_warnings(): - warnings.simplefilter('error', DeprecationWarning) - b = B(3) - self.assertEqual(b.foo, 3) - self.assertEqual(b.__class__, B) - def test_altmro(self): # Testing mro() and overriding it... class A(object): @@ -3594,24 +3522,6 @@ order (MRO) for bases """ self.assertIsInstance(d, D) self.assertEqual(d.foo, 1) - class C(object): - @staticmethod - def __new__(*args): - return args - self.assertEqual(C(1, 2), (C, 1, 2)) - class D(C): - pass - self.assertEqual(D(1, 2), (D, 1, 2)) - - class C(object): - @classmethod - def __new__(*args): - return args - self.assertEqual(C(1, 2), (C, C, 1, 2)) - class D(C): - pass - self.assertEqual(D(1, 2), (D, D, 1, 2)) - def test_imul_bug(self): # Testing for __imul__ problems... # SF bug 544647 @@ -4828,11 +4738,8 @@ class PicklingTests(unittest.TestCase): return (args, kwargs) obj = C3() for proto in protocols: - if proto >= 4: + if proto >= 2: self._check_reduce(proto, obj, args, kwargs) - elif proto >= 2: - with self.assertRaises(ValueError): - obj.__reduce_ex__(proto) class C4: def __getnewargs_ex__(self): @@ -5151,10 +5058,6 @@ class PicklingTests(unittest.TestCase): kwargs = getattr(cls, 'KWARGS', {}) obj = cls(*cls.ARGS, **kwargs) proto = pickle_copier.proto - if 2 <= proto < 4 and hasattr(cls, '__getnewargs_ex__'): - with self.assertRaises(ValueError): - pickle_copier.dumps(obj, proto) - continue objcopy = pickle_copier.copy(obj) self._assert_is_copy(obj, objcopy) # For test classes that supports this, make sure we didn't go @@ -5213,12 +5116,14 @@ class SharedKeyTests(unittest.TestCase): a, b = A(), B() self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b))) self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({})) - a.x, a.y, a.z, a.w = range(4) + # Initial hash table can contain at most 5 elements. + # Set 6 attributes to cause internal resizing. + a.x, a.y, a.z, a.w, a.v, a.u = range(6) self.assertNotEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b))) a2 = A() self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(a2))) self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({})) - b.u, b.v, b.w, b.t = range(4) + b.u, b.v, b.w, b.t, b.s, b.r = range(6) self.assertLess(sys.getsizeof(vars(b)), sys.getsizeof({})) diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index 506d1ab..b84d644 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -182,6 +182,7 @@ You can get the information from the list type: '__iadd__', '__imul__', '__init__', + '__init_subclass__', '__iter__', '__le__', '__len__', diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index 955618a..c133c81 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -5,9 +5,8 @@ import os import random import select -import sys import unittest -from test.support import TESTFN, run_unittest, cpython_only +from test.support import run_unittest, cpython_only if not hasattr(select, 'devpoll') : raise unittest.SkipTest('test works only on Solaris OS family') diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index f59490a..832bb9c 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -1,10 +1,13 @@ -import unittest -from test import support - -import collections, random, string +import collections import collections.abc -import gc, weakref +import gc import pickle +import random +import string +import sys +import unittest +import weakref +from test import support class DictTest(unittest.TestCase): @@ -836,21 +839,127 @@ class DictTest(unittest.TestCase): pass self._tracked(MyDict()) + def make_shared_key_dict(self, n): + class C: + pass + + dicts = [] + for i in range(n): + a = C() + a.x, a.y, a.z = 1, 2, 3 + dicts.append(a.__dict__) + + return dicts + + @support.cpython_only + def test_splittable_setdefault(self): + """split table must be combined when setdefault() + breaks insertion order""" + a, b = self.make_shared_key_dict(2) + + a['a'] = 1 + size_a = sys.getsizeof(a) + a['b'] = 2 + b.setdefault('b', 2) + size_b = sys.getsizeof(b) + b['a'] = 1 + + self.assertGreater(size_b, size_a) + self.assertEqual(list(a), ['x', 'y', 'z', 'a', 'b']) + self.assertEqual(list(b), ['x', 'y', 'z', 'b', 'a']) + + @support.cpython_only + def test_splittable_del(self): + """split table must be combined when del d[k]""" + a, b = self.make_shared_key_dict(2) + + orig_size = sys.getsizeof(a) + + del a['y'] # split table is combined + with self.assertRaises(KeyError): + del a['y'] + + self.assertGreater(sys.getsizeof(a), orig_size) + self.assertEqual(list(a), ['x', 'z']) + self.assertEqual(list(b), ['x', 'y', 'z']) + + # Two dicts have different insertion order. + a['y'] = 42 + self.assertEqual(list(a), ['x', 'z', 'y']) + self.assertEqual(list(b), ['x', 'y', 'z']) + + @support.cpython_only + def test_splittable_pop(self): + """split table must be combined when d.pop(k)""" + a, b = self.make_shared_key_dict(2) + + orig_size = sys.getsizeof(a) + + a.pop('y') # split table is combined + with self.assertRaises(KeyError): + a.pop('y') + + self.assertGreater(sys.getsizeof(a), orig_size) + self.assertEqual(list(a), ['x', 'z']) + self.assertEqual(list(b), ['x', 'y', 'z']) + + # Two dicts have different insertion order. + a['y'] = 42 + self.assertEqual(list(a), ['x', 'z', 'y']) + self.assertEqual(list(b), ['x', 'y', 'z']) + + @support.cpython_only + def test_splittable_pop_pending(self): + """pop a pending key in a splitted table should not crash""" + a, b = self.make_shared_key_dict(2) + + a['a'] = 4 + with self.assertRaises(KeyError): + b.pop('a') + + @support.cpython_only + def test_splittable_popitem(self): + """split table must be combined when d.popitem()""" + a, b = self.make_shared_key_dict(2) + + orig_size = sys.getsizeof(a) + + item = a.popitem() # split table is combined + self.assertEqual(item, ('z', 3)) + with self.assertRaises(KeyError): + del a['z'] + + self.assertGreater(sys.getsizeof(a), orig_size) + self.assertEqual(list(a), ['x', 'y']) + self.assertEqual(list(b), ['x', 'y', 'z']) + @support.cpython_only def test_splittable_setattr_after_pop(self): - """setattr must not convert combined table into split table""" + """setattr() must not convert combined table into split table.""" # Issue 28147 import _testcapi class C: pass a = C() + + a.a = 1 + self.assertTrue(_testcapi.dict_hassplittable(a.__dict__)) + + # dict.pop() convert it to combined table + a.__dict__.pop('a') + self.assertFalse(_testcapi.dict_hassplittable(a.__dict__)) + + # But C should not convert a.__dict__ to split table again. + a.a = 1 + self.assertFalse(_testcapi.dict_hassplittable(a.__dict__)) + + # Same for popitem() + a = C() a.a = 2 self.assertTrue(_testcapi.dict_hassplittable(a.__dict__)) - # dict.popitem() convert it to combined table a.__dict__.popitem() self.assertFalse(_testcapi.dict_hassplittable(a.__dict__)) - # But C should not convert a.__dict__ to split table again. a.a = 3 self.assertFalse(_testcapi.dict_hassplittable(a.__dict__)) @@ -976,90 +1085,35 @@ class DictTest(unittest.TestCase): support.check_free_after_iterating(self, lambda d: iter(d.values()), dict) support.check_free_after_iterating(self, lambda d: iter(d.items()), dict) - def test_equal_operator_modifying_operand(self): - # test fix for seg fault reported in issue 27945 part 3. - class X(): - def __del__(self): - dict_b.clear() - - def __eq__(self, other): - dict_a.clear() - return True - - def __hash__(self): - return 13 - - dict_a = {X(): 0} - dict_b = {X(): X()} - self.assertTrue(dict_a == dict_b) - def test_fromkeys_operator_modifying_dict_operand(self): - # test fix for seg fault reported in issue 27945 part 4a. - class X(int): - def __hash__(self): - return 13 - - def __eq__(self, other): - if len(d) > 1: - d.clear() - return False - - d = {} # this is required to exist so that d can be constructed! - d = {X(1): 1, X(2): 2} - try: - dict.fromkeys(d) # shouldn't crash - except RuntimeError: # implementation defined - pass +class CAPITest(unittest.TestCase): - def test_fromkeys_operator_modifying_set_operand(self): - # test fix for seg fault reported in issue 27945 part 4b. - class X(int): - def __hash__(self): - return 13 + # Test _PyDict_GetItem_KnownHash() + @support.cpython_only + def test_getitem_knownhash(self): + from _testcapi import dict_getitem_knownhash - def __eq__(self, other): - if len(d) > 1: - d.clear() - return False + d = {'x': 1, 'y': 2, 'z': 3} + self.assertEqual(dict_getitem_knownhash(d, 'x', hash('x')), 1) + self.assertEqual(dict_getitem_knownhash(d, 'y', hash('y')), 2) + self.assertEqual(dict_getitem_knownhash(d, 'z', hash('z')), 3) - d = {} # this is required to exist so that d can be constructed! - d = {X(1), X(2)} - try: - dict.fromkeys(d) # shouldn't crash - except RuntimeError: # implementation defined - pass + # not a dict + self.assertRaises(SystemError, dict_getitem_knownhash, [], 1, hash(1)) + # key does not exist + self.assertRaises(KeyError, dict_getitem_knownhash, {}, 1, hash(1)) - def test_dictitems_contains_use_after_free(self): - class X: + class Exc(Exception): pass + class BadEq: def __eq__(self, other): - d.clear() - return NotImplemented - - d = {0: set()} - (0, X()) in d.items() - - def test_init_use_after_free(self): - class X: + raise Exc def __hash__(self): - pair[:] = [] - return 13 + return 7 - pair = [X(), 123] - dict([pair]) - - def test_oob_indexing_dictiter_iternextitem(self): - class X(int): - def __del__(self): - d.clear() - - d = {i: X(i) for i in range(8)} - - def iter_and_mutate(): - for result in d.items(): - if result[0] == 2: - d[2] = None # free d[2] --> X(2).__del__ was called - - self.assertRaises(RuntimeError, iter_and_mutate) + k1, k2 = BadEq(), BadEq() + d = {k1: 1} + self.assertEqual(dict_getitem_knownhash(d, k1, hash(k1)), 1) + self.assertRaises(Exc, dict_getitem_knownhash, d, k2, hash(k2)) from test import mapping_tests @@ -1073,5 +1127,6 @@ class Dict(dict): class SubclassMappingTests(mapping_tests.BasicTestMappingProtocol): type2test = Dict + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_dict_version.py b/Lib/test/test_dict_version.py new file mode 100644 index 0000000..5671f9f --- /dev/null +++ b/Lib/test/test_dict_version.py @@ -0,0 +1,186 @@ +""" +Test implementation of the PEP 509: dictionary versionning. +""" +import unittest +from test import support + +# PEP 509 is implemented in CPython but other Python implementations +# don't require to implement it +_testcapi = support.import_module('_testcapi') + + +class DictVersionTests(unittest.TestCase): + type2test = dict + + def setUp(self): + self.seen_versions = set() + self.dict = None + + def check_version_unique(self, mydict): + version = _testcapi.dict_get_version(mydict) + self.assertNotIn(version, self.seen_versions) + self.seen_versions.add(version) + + def check_version_changed(self, mydict, method, *args, **kw): + result = method(*args, **kw) + self.check_version_unique(mydict) + return result + + def check_version_dont_change(self, mydict, method, *args, **kw): + version1 = _testcapi.dict_get_version(mydict) + self.seen_versions.add(version1) + + result = method(*args, **kw) + + version2 = _testcapi.dict_get_version(mydict) + self.assertEqual(version2, version1, "version changed") + + return result + + def new_dict(self, *args, **kw): + d = self.type2test(*args, **kw) + self.check_version_unique(d) + return d + + def test_constructor(self): + # new empty dictionaries must all have an unique version + empty1 = self.new_dict() + empty2 = self.new_dict() + empty3 = self.new_dict() + + # non-empty dictionaries must also have an unique version + nonempty1 = self.new_dict(x='x') + nonempty2 = self.new_dict(x='x', y='y') + + def test_copy(self): + d = self.new_dict(a=1, b=2) + + d2 = self.check_version_dont_change(d, d.copy) + + # dict.copy() must create a dictionary with a new unique version + self.check_version_unique(d2) + + def test_setitem(self): + d = self.new_dict() + + # creating new keys must change the version + self.check_version_changed(d, d.__setitem__, 'x', 'x') + self.check_version_changed(d, d.__setitem__, 'y', 'y') + + # changing values must change the version + self.check_version_changed(d, d.__setitem__, 'x', 1) + self.check_version_changed(d, d.__setitem__, 'y', 2) + + def test_setitem_same_value(self): + value = object() + d = self.new_dict() + + # setting a key must change the version + self.check_version_changed(d, d.__setitem__, 'key', value) + + # setting a key to the same value with dict.__setitem__ + # must change the version + self.check_version_changed(d, d.__setitem__, 'key', value) + + # setting a key to the same value with dict.update + # must change the version + self.check_version_changed(d, d.update, key=value) + + d2 = self.new_dict(key=value) + self.check_version_changed(d, d.update, d2) + + def test_setitem_equal(self): + class AlwaysEqual: + def __eq__(self, other): + return True + + value1 = AlwaysEqual() + value2 = AlwaysEqual() + self.assertTrue(value1 == value2) + self.assertFalse(value1 != value2) + + d = self.new_dict() + self.check_version_changed(d, d.__setitem__, 'key', value1) + + # setting a key to a value equal to the current value + # with dict.__setitem__() must change the version + self.check_version_changed(d, d.__setitem__, 'key', value2) + + # setting a key to a value equal to the current value + # with dict.update() must change the version + self.check_version_changed(d, d.update, key=value1) + + d2 = self.new_dict(key=value2) + self.check_version_changed(d, d.update, d2) + + def test_setdefault(self): + d = self.new_dict() + + # setting a key with dict.setdefault() must change the version + self.check_version_changed(d, d.setdefault, 'key', 'value1') + + # don't change the version if the key already exists + self.check_version_dont_change(d, d.setdefault, 'key', 'value2') + + def test_delitem(self): + d = self.new_dict(key='value') + + # deleting a key with dict.__delitem__() must change the version + self.check_version_changed(d, d.__delitem__, 'key') + + # don't change the version if the key doesn't exist + self.check_version_dont_change(d, self.assertRaises, KeyError, + d.__delitem__, 'key') + + def test_pop(self): + d = self.new_dict(key='value') + + # pop() must change the version if the key exists + self.check_version_changed(d, d.pop, 'key') + + # pop() must not change the version if the key does not exist + self.check_version_dont_change(d, self.assertRaises, KeyError, + d.pop, 'key') + + def test_popitem(self): + d = self.new_dict(key='value') + + # popitem() must change the version if the dict is not empty + self.check_version_changed(d, d.popitem) + + # popitem() must not change the version if the dict is empty + self.check_version_dont_change(d, self.assertRaises, KeyError, + d.popitem) + + def test_update(self): + d = self.new_dict(key='value') + + # update() calling with no argument must not change the version + self.check_version_dont_change(d, d.update) + + # update() must change the version + self.check_version_changed(d, d.update, key='new value') + + d2 = self.new_dict(key='value 3') + self.check_version_changed(d, d.update, d2) + + def test_clear(self): + d = self.new_dict(key='value') + + # clear() must change the version if the dict is not empty + self.check_version_changed(d, d.clear) + + # clear() must not change the version if the dict is empty + self.check_version_dont_change(d, d.clear) + + +class Dict(dict): + pass + + +class DictSubtypeVersionTests(DictVersionTests): + type2test = Dict + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_dictcomps.py b/Lib/test/test_dictcomps.py index 3c8b95c..0873071 100644 --- a/Lib/test/test_dictcomps.py +++ b/Lib/test/test_dictcomps.py @@ -1,7 +1,5 @@ import unittest -from test import support - # For scope testing. g = "Global variable" diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py index 0c99652..49a9e9c 100644 --- a/Lib/test/test_dictviews.py +++ b/Lib/test/test_dictviews.py @@ -1,3 +1,4 @@ +import collections import copy import pickle import unittest @@ -245,6 +246,27 @@ class DictSetTest(unittest.TestCase): self.assertRaises((TypeError, pickle.PicklingError), pickle.dumps, d.items(), proto) + def test_abc_registry(self): + d = dict(a=1) + + self.assertIsInstance(d.keys(), collections.KeysView) + self.assertIsInstance(d.keys(), collections.MappingView) + self.assertIsInstance(d.keys(), collections.Set) + self.assertIsInstance(d.keys(), collections.Sized) + self.assertIsInstance(d.keys(), collections.Iterable) + self.assertIsInstance(d.keys(), collections.Container) + + self.assertIsInstance(d.values(), collections.ValuesView) + self.assertIsInstance(d.values(), collections.MappingView) + self.assertIsInstance(d.values(), collections.Sized) + + self.assertIsInstance(d.items(), collections.ItemsView) + self.assertIsInstance(d.items(), collections.MappingView) + self.assertIsInstance(d.items(), collections.Set) + self.assertIsInstance(d.items(), collections.Sized) + self.assertIsInstance(d.items(), collections.Iterable) + self.assertIsInstance(d.items(), collections.Container) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index ab9debf..156b523 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -122,17 +122,17 @@ patch914575_nonascii_to1 = """ """ patch914575_from2 = """ -\t\tLine 1: preceeded by from:[tt] to:[ssss] - \t\tLine 2: preceeded by from:[sstt] to:[sssst] - \t \tLine 3: preceeded by from:[sstst] to:[ssssss] +\t\tLine 1: preceded by from:[tt] to:[ssss] + \t\tLine 2: preceded by from:[sstt] to:[sssst] + \t \tLine 3: preceded by from:[sstst] to:[ssssss] Line 4: \thas from:[sst] to:[sss] after : Line 5: has from:[t] to:[ss] at end\t """ patch914575_to2 = """ - Line 1: preceeded by from:[tt] to:[ssss] - \tLine 2: preceeded by from:[sstt] to:[sssst] - Line 3: preceeded by from:[sstst] to:[ssssss] + Line 1: preceded by from:[tt] to:[ssss] + \tLine 2: preceded by from:[sstt] to:[sssst] + Line 3: preceded by from:[sstst] to:[ssssss] Line 4: has from:[sst] to:[sss] after : Line 5: has from:[t] to:[ss] at end """ diff --git a/Lib/test/test_difflib_expect.html b/Lib/test/test_difflib_expect.html index ea7a24e..3e6a7b7 100644 --- a/Lib/test/test_difflib_expect.html +++ b/Lib/test/test_difflib_expect.html @@ -387,9 +387,9 @@
f1f1
t2    Line 1: preceeded by from:[tt] to:[ssss]t2    Line 1: preceeded by from:[tt] to:[ssss]
3      Line 2: preceeded by from:[sstt] to:[sssst]3      Line 2: preceeded by from:[sstt] to:[sssst]
4      Line 3: preceeded by from:[sstst] to:[ssssss]4      Line 3: preceeded by from:[sstst] to:[ssssss]
t2    Line 1: preceded by from:[tt] to:[ssss]t2    Line 1: preceded by from:[tt] to:[ssss]
3      Line 2: preceded by from:[sstt] to:[sssst]3      Line 2: preceded by from:[sstt] to:[sssst]
4      Line 3: preceded by from:[sstst] to:[ssssss]4      Line 3: preceded by from:[sstst] to:[ssssss]
5Line 4:   has from:[sst] to:[sss] after :5Line 4:   has from:[sst] to:[sss] after :
6Line 5: has from:[t] to:[ss] at end 6Line 5: has from:[t] to:[ss] at end
f1f1
t2                Line 1: preceeded by from:[tt] to:[ssss]t2    Line 1: preceeded by from:[tt] to:[ssss]
3                Line 2: preceeded by from:[sstt] to:[sssst]3        Line 2: preceeded by from:[sstt] to:[sssst]
4                Line 3: preceeded by from:[sstst] to:[ssssss]4      Line 3: preceeded by from:[sstst] to:[ssssss]
t2                Line 1: preceded by from:[tt] to:[ssss]t2    Line 1: preceded by from:[tt] to:[ssss]
3                Line 2: preceded by from:[sstt] to:[sssst]3        Line 2: preceded by from:[sstt] to:[sssst]
4                Line 3: preceded by from:[sstst] to:[ssssss]4      Line 3: preceded by from:[sstst] to:[ssssss]
5Line 4:         has from:[sst] to:[sss] after :5Line 4:   has from:[sst] to:[sss] after :
6Line 5: has from:[t] to:[ss] at end     6Line 5: has from:[t] to:[ss] at end

@@ -264,7 +268,7 @@ Use help() to get the interactive help utility. Use help(str) for help on the str class.'''.replace('\n', os.linesep) # output pattern for module with bad imports -badimport_pattern = "problem in %s - ImportError: No module named %r" +badimport_pattern = "problem in %s - ModuleNotFoundError: No module named %r" expected_dynamicattribute_pattern = """ Help on class DA in module %s: @@ -639,8 +643,9 @@ class PydocDocTest(unittest.TestCase): del expected['__doc__'] del expected['__class__'] # inspect resolves descriptors on type into methods, but vars doesn't, - # so we need to update __subclasshook__. + # so we need to update __subclasshook__ and __init_subclass__. expected['__subclasshook__'] = TestClass.__subclasshook__ + expected['__init_subclass__'] = TestClass.__init_subclass__ methods = pydoc.allmethods(TestClass) self.assertDictEqual(methods, expected) @@ -868,6 +873,22 @@ class TestDescriptions(unittest.TestCase): self.assertEqual(self._get_summary_line(t.wrap), "wrap(text) method of textwrap.TextWrapper instance") + def test_field_order_for_named_tuples(self): + Person = namedtuple('Person', ['nickname', 'firstname', 'agegroup']) + s = pydoc.render_doc(Person) + self.assertLess(s.index('nickname'), s.index('firstname')) + self.assertLess(s.index('firstname'), s.index('agegroup')) + + class NonIterableFields: + _fields = None + + class NonHashableFields: + _fields = [[]] + + # Make sure these doesn't fail + pydoc.render_doc(NonIterableFields) + pydoc.render_doc(NonHashableFields) + @requires_docstrings def test_bound_builtin_method(self): s = StringIO() diff --git a/Lib/test/test_quopri.py b/Lib/test/test_quopri.py index 7cac013..715544c 100644 --- a/Lib/test/test_quopri.py +++ b/Lib/test/test_quopri.py @@ -1,6 +1,6 @@ import unittest -import sys, os, io, subprocess +import sys, io, subprocess import quopri diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 83a663f..5b6a4f0 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -7,6 +7,7 @@ import warnings from functools import partial from math import log, exp, pi, fsum, sin from test import support +from fractions import Fraction class TestBasicOps: # Superclass with tests common to all generators. @@ -109,6 +110,7 @@ class TestBasicOps: self.assertEqual(self.gen.sample([], 0), []) # test edge case N==k==0 # Exception raised if size of sample exceeds that of population self.assertRaises(ValueError, self.gen.sample, population, N+1) + self.assertRaises(ValueError, self.gen.sample, [], -1) def test_sample_distribution(self): # For the entire allowable range of 0 <= k <= N, validate that @@ -141,6 +143,83 @@ class TestBasicOps: def test_sample_on_dicts(self): self.assertRaises(TypeError, self.gen.sample, dict.fromkeys('abcdef'), 2) + def test_choices(self): + choices = self.gen.choices + data = ['red', 'green', 'blue', 'yellow'] + str_data = 'abcd' + range_data = range(4) + set_data = set(range(4)) + + # basic functionality + for sample in [ + choices(data, k=5), + choices(data, range(4), k=5), + choices(k=5, population=data, weights=range(4)), + choices(k=5, population=data, cum_weights=range(4)), + ]: + self.assertEqual(len(sample), 5) + self.assertEqual(type(sample), list) + self.assertTrue(set(sample) <= set(data)) + + # test argument handling + with self.assertRaises(TypeError): # missing arguments + choices(2) + + self.assertEqual(choices(data, k=0), []) # k == 0 + self.assertEqual(choices(data, k=-1), []) # negative k behaves like ``[0] * -1`` + with self.assertRaises(TypeError): + choices(data, k=2.5) # k is a float + + self.assertTrue(set(choices(str_data, k=5)) <= set(str_data)) # population is a string sequence + self.assertTrue(set(choices(range_data, k=5)) <= set(range_data)) # population is a range + with self.assertRaises(TypeError): + choices(set_data, k=2) # population is not a sequence + + self.assertTrue(set(choices(data, None, k=5)) <= set(data)) # weights is None + self.assertTrue(set(choices(data, weights=None, k=5)) <= set(data)) + with self.assertRaises(ValueError): + choices(data, [1,2], k=5) # len(weights) != len(population) + with self.assertRaises(TypeError): + choices(data, 10, k=5) # non-iterable weights + with self.assertRaises(TypeError): + choices(data, [None]*4, k=5) # non-numeric weights + for weights in [ + [15, 10, 25, 30], # integer weights + [15.1, 10.2, 25.2, 30.3], # float weights + [Fraction(1, 3), Fraction(2, 6), Fraction(3, 6), Fraction(4, 6)], # fractional weights + [True, False, True, False] # booleans (include / exclude) + ]: + self.assertTrue(set(choices(data, weights, k=5)) <= set(data)) + + with self.assertRaises(ValueError): + choices(data, cum_weights=[1,2], k=5) # len(weights) != len(population) + with self.assertRaises(TypeError): + choices(data, cum_weights=10, k=5) # non-iterable cum_weights + with self.assertRaises(TypeError): + choices(data, cum_weights=[None]*4, k=5) # non-numeric cum_weights + with self.assertRaises(TypeError): + choices(data, range(4), cum_weights=range(4), k=5) # both weights and cum_weights + for weights in [ + [15, 10, 25, 30], # integer cum_weights + [15.1, 10.2, 25.2, 30.3], # float cum_weights + [Fraction(1, 3), Fraction(2, 6), Fraction(3, 6), Fraction(4, 6)], # fractional cum_weights + ]: + self.assertTrue(set(choices(data, cum_weights=weights, k=5)) <= set(data)) + + # Test weight focused on a single element of the population + self.assertEqual(choices('abcd', [1, 0, 0, 0]), ['a']) + self.assertEqual(choices('abcd', [0, 1, 0, 0]), ['b']) + self.assertEqual(choices('abcd', [0, 0, 1, 0]), ['c']) + self.assertEqual(choices('abcd', [0, 0, 0, 1]), ['d']) + + # Test consistency with random.choice() for empty population + with self.assertRaises(IndexError): + choices([], k=1) + with self.assertRaises(IndexError): + choices([], weights=[], k=1) + with self.assertRaises(IndexError): + choices([], cum_weights=[], k=5) + def test_gauss(self): # Ensure that the seed() method initializes all the hidden state. In # particular, through 2.2.1 it failed to reset a piece of state used @@ -348,7 +427,6 @@ class MersenneTwister_TestBasicOps(TestBasicOps, unittest.TestCase): self.assertRaises(ValueError, self.gen.setstate, (1, None, None)) def test_setstate_middle_arg(self): - start_state = self.gen.getstate() # Wrong type, s/b tuple self.assertRaises(TypeError, self.gen.setstate, (2, None, None)) # Wrong length, s/b 625 @@ -362,10 +440,6 @@ class MersenneTwister_TestBasicOps(TestBasicOps, unittest.TestCase): self.gen.setstate((2, (1,)*624+(625,), None)) with self.assertRaises((ValueError, OverflowError)): self.gen.setstate((2, (1,)*624+(-1,), None)) - # Failed calls to setstate() should not have changed the state. - bits100 = self.gen.getrandbits(100) - self.gen.setstate(start_state) - self.assertEqual(self.gen.getrandbits(100), bits100) # Little trick to make "tuple(x % (2**32) for x in internalstate)" # raise ValueError. I cannot think of a simple way to achieve this, so @@ -556,6 +630,39 @@ class MersenneTwister_TestBasicOps(TestBasicOps, unittest.TestCase): self.assertTrue(stop < x <= start) self.assertEqual((x+stop)%step, 0) + def test_choices_algorithms(self): + # The various ways of specifying weights should produce the same results + choices = self.gen.choices + n = 104729 + + self.gen.seed(8675309) + a = self.gen.choices(range(n), k=10000) + + self.gen.seed(8675309) + b = self.gen.choices(range(n), [1]*n, k=10000) + self.assertEqual(a, b) + + self.gen.seed(8675309) + c = self.gen.choices(range(n), cum_weights=range(1, n+1), k=10000) + self.assertEqual(a, c) + + # Amerian Roulette + population = ['Red', 'Black', 'Green'] + weights = [18, 18, 2] + cum_weights = [18, 36, 38] + expanded_population = ['Red'] * 18 + ['Black'] * 18 + ['Green'] * 2 + + self.gen.seed(9035768) + a = self.gen.choices(expanded_population, k=10000) + + self.gen.seed(9035768) + b = self.gen.choices(population, weights, k=10000) + self.assertEqual(a, b) + + self.gen.seed(9035768) + c = self.gen.choices(population, cum_weights=cum_weights, k=10000) + self.assertEqual(a, c) + def gamma(z, sqrt2pi=(2.0*pi)**0.5): # Reflection to right half of complex plane if z < 0.5: diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py index 90efa1a..9e11e51 100644 --- a/Lib/test/test_range.py +++ b/Lib/test/test_range.py @@ -1,9 +1,10 @@ # Python test set -- built-in functions -import test.support, unittest +import unittest import sys import pickle import itertools +import test.support # pure Python implementations (3 args only), for comparison def pyrange(start, stop, step): @@ -98,24 +99,20 @@ class RangeTest(unittest.TestCase): x = range(10**20+10, 10**20, 3) self.assertEqual(len(x), 0) self.assertEqual(len(list(x)), 0) - self.assertFalse(x) x = range(10**20, 10**20+10, -3) self.assertEqual(len(x), 0) self.assertEqual(len(list(x)), 0) - self.assertFalse(x) x = range(10**20+10, 10**20, -3) self.assertEqual(len(x), 4) self.assertEqual(len(list(x)), 4) - self.assertTrue(x) # Now test range() with longs - for x in [range(-2**100), - range(0, -2**100), - range(0, 2**100, -1)]: - self.assertEqual(list(x), []) - self.assertFalse(x) + self.assertEqual(list(range(-2**100)), []) + self.assertEqual(list(range(0, -2**100)), []) + self.assertEqual(list(range(0, 2**100, -1)), []) + self.assertEqual(list(range(0, 2**100, -1)), []) a = int(10 * sys.maxsize) b = int(100 * sys.maxsize) @@ -156,7 +153,6 @@ class RangeTest(unittest.TestCase): step = x[1] - x[0] length = 1 + ((x[-1] - x[0]) // step) return length - a = -sys.maxsize b = sys.maxsize expected_len = b - a @@ -164,7 +160,6 @@ class RangeTest(unittest.TestCase): self.assertIn(a, x) self.assertNotIn(b, x) self.assertRaises(OverflowError, len, x) - self.assertTrue(x) self.assertEqual(_range_len(x), expected_len) self.assertEqual(x[0], a) idx = sys.maxsize+1 @@ -182,7 +177,6 @@ class RangeTest(unittest.TestCase): self.assertIn(a, x) self.assertNotIn(b, x) self.assertRaises(OverflowError, len, x) - self.assertTrue(x) self.assertEqual(_range_len(x), expected_len) self.assertEqual(x[0], a) idx = sys.maxsize+1 @@ -201,7 +195,6 @@ class RangeTest(unittest.TestCase): self.assertIn(a, x) self.assertNotIn(b, x) self.assertRaises(OverflowError, len, x) - self.assertTrue(x) self.assertEqual(_range_len(x), expected_len) self.assertEqual(x[0], a) idx = sys.maxsize+1 @@ -220,7 +213,6 @@ class RangeTest(unittest.TestCase): self.assertIn(a, x) self.assertNotIn(b, x) self.assertRaises(OverflowError, len, x) - self.assertTrue(x) self.assertEqual(_range_len(x), expected_len) self.assertEqual(x[0], a) idx = sys.maxsize+1 @@ -507,29 +499,32 @@ class RangeTest(unittest.TestCase): import _testcapi rangeiter_type = type(iter(range(0))) - # rangeiter_new doesn't take keyword arguments - with self.assertRaises(TypeError): - rangeiter_type(a=1) - - # rangeiter_new takes exactly 3 arguments - self.assertRaises(TypeError, rangeiter_type) - self.assertRaises(TypeError, rangeiter_type, 1) - self.assertRaises(TypeError, rangeiter_type, 1, 1) - self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1) - - # start, stop and stop must fit in C long - for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]: - rangeiter_type(good_val, good_val, good_val) - for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]: - self.assertRaises(OverflowError, - rangeiter_type, bad_val, 1, 1) - self.assertRaises(OverflowError, - rangeiter_type, 1, bad_val, 1) - self.assertRaises(OverflowError, - rangeiter_type, 1, 1, bad_val) - - # step mustn't be zero - self.assertRaises(ValueError, rangeiter_type, 1, 1, 0) + self.assertWarns(DeprecationWarning, rangeiter_type, 1, 3, 1) + + with test.support.check_warnings(('', DeprecationWarning)): + # rangeiter_new doesn't take keyword arguments + with self.assertRaises(TypeError): + rangeiter_type(a=1) + + # rangeiter_new takes exactly 3 arguments + self.assertRaises(TypeError, rangeiter_type) + self.assertRaises(TypeError, rangeiter_type, 1) + self.assertRaises(TypeError, rangeiter_type, 1, 1) + self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1) + + # start, stop and stop must fit in C long + for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]: + rangeiter_type(good_val, good_val, good_val) + for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]: + self.assertRaises(OverflowError, + rangeiter_type, bad_val, 1, 1) + self.assertRaises(OverflowError, + rangeiter_type, 1, bad_val, 1) + self.assertRaises(OverflowError, + rangeiter_type, 1, 1, bad_val) + + # step mustn't be zero + self.assertRaises(ValueError, rangeiter_type, 1, 1, 0) def test_slice(self): def check(start, stop, step=None): diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 839bf27..4bdaa4b 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -3,13 +3,13 @@ from test.support import verbose, run_unittest, gc_collect, bigmemtest, _2G, \ import io import locale import re -from re import Scanner import sre_compile -import sre_constants -import sys import string +import sys import traceback import unittest +import warnings +from re import Scanner from weakref import proxy # Misc tests from Tim Peters' re.doc @@ -115,10 +115,10 @@ class ReTests(unittest.TestCase): self.assertEqual(re.sub('(.)', re.escape(s), 'x'), s) self.assertEqual(re.sub('(.)', lambda m: s, 'x'), s) - self.assertEqual(re.sub('(?Px)', '\g\g', 'xx'), 'xxxx') - self.assertEqual(re.sub('(?Px)', '\g\g<1>', 'xx'), 'xxxx') - self.assertEqual(re.sub('(?Px)', '\g\g', 'xx'), 'xxxx') - self.assertEqual(re.sub('(?Px)', '\g<1>\g<1>', 'xx'), 'xxxx') + self.assertEqual(re.sub('(?Px)', r'\g\g', 'xx'), 'xxxx') + self.assertEqual(re.sub('(?Px)', r'\g\g<1>', 'xx'), 'xxxx') + self.assertEqual(re.sub('(?Px)', r'\g\g', 'xx'), 'xxxx') + self.assertEqual(re.sub('(?Px)', r'\g<1>\g<1>', 'xx'), 'xxxx') self.assertEqual(re.sub('a', r'\t\n\v\r\f\a\b', 'a'), '\t\n\v\r\f\a\b') self.assertEqual(re.sub('a', '\t\n\v\r\f\a\b', 'a'), '\t\n\v\r\f\a\b') @@ -129,11 +129,11 @@ class ReTests(unittest.TestCase): with self.assertWarns(DeprecationWarning): self.assertEqual(re.sub('a', '\\' + c, 'a'), '\\' + c) - self.assertEqual(re.sub('^\s*', 'X', 'test'), 'Xtest') + self.assertEqual(re.sub(r'^\s*', 'X', 'test'), 'Xtest') def test_bug_449964(self): # fails for group followed by other escape - self.assertEqual(re.sub(r'(?Px)', '\g<1>\g<1>\\b', 'xx'), + self.assertEqual(re.sub(r'(?Px)', r'\g<1>\g<1>\b', 'xx'), 'xx\bxx\b') def test_bug_449000(self): @@ -186,18 +186,19 @@ class ReTests(unittest.TestCase): r'octal escape value \777 outside of ' r'range 0-0o377', 0) - self.checkTemplateError('x', r'\1', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\8', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\9', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\11', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\18', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\1a', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\90', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\99', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\118', 'x', 'invalid group reference') # r'\11' + '8' - self.checkTemplateError('x', r'\11a', 'x', 'invalid group reference') - self.checkTemplateError('x', r'\181', 'x', 'invalid group reference') # r'\18' + '1' - self.checkTemplateError('x', r'\800', 'x', 'invalid group reference') # r'\80' + '0' + self.checkTemplateError('x', r'\1', 'x', 'invalid group reference 1', 1) + self.checkTemplateError('x', r'\8', 'x', 'invalid group reference 8', 1) + self.checkTemplateError('x', r'\9', 'x', 'invalid group reference 9', 1) + self.checkTemplateError('x', r'\11', 'x', 'invalid group reference 11', 1) + self.checkTemplateError('x', r'\18', 'x', 'invalid group reference 18', 1) + self.checkTemplateError('x', r'\1a', 'x', 'invalid group reference 1', 1) + self.checkTemplateError('x', r'\90', 'x', 'invalid group reference 90', 1) + self.checkTemplateError('x', r'\99', 'x', 'invalid group reference 99', 1) + self.checkTemplateError('x', r'\118', 'x', 'invalid group reference 11', 1) + self.checkTemplateError('x', r'\11a', 'x', 'invalid group reference 11', 1) + self.checkTemplateError('x', r'\181', 'x', 'invalid group reference 18', 1) + self.checkTemplateError('x', r'\800', 'x', 'invalid group reference 80', 1) + self.checkTemplateError('x', r'\8', '', 'invalid group reference 8', 1) # in python2.3 (etc), these loop endlessly in sre_parser.py self.assertEqual(re.sub('(((((((((((x)))))))))))', r'\11', 'x'), 'x') @@ -221,26 +222,26 @@ class ReTests(unittest.TestCase): self.assertEqual(re.sub('x+', '-', 'abxd'), 'ab-d') def test_symbolic_groups(self): - re.compile('(?Px)(?P=a)(?(a)y)') - re.compile('(?Px)(?P=a1)(?(a1)y)') - re.compile('(?Px)\1(?(1)y)') - self.checkPatternError('(?P)(?P)', + re.compile(r'(?Px)(?P=a)(?(a)y)') + re.compile(r'(?Px)(?P=a1)(?(a1)y)') + re.compile(r'(?Px)\1(?(1)y)') + self.checkPatternError(r'(?P)(?P)', "redefinition of group name 'a' as group 2; " "was group 1") - self.checkPatternError('(?P(?P=a))', + self.checkPatternError(r'(?P(?P=a))', "cannot refer to an open group", 10) - self.checkPatternError('(?Pxy)', 'unknown extension ?Px') - self.checkPatternError('(?P)(?P=a', 'missing ), unterminated name', 11) - self.checkPatternError('(?P=', 'missing group name', 4) - self.checkPatternError('(?P=)', 'missing group name', 4) - self.checkPatternError('(?P=1)', "bad character in group name '1'", 4) - self.checkPatternError('(?P=a)', "unknown group name 'a'") - self.checkPatternError('(?P=a1)', "unknown group name 'a1'") - self.checkPatternError('(?P=a.)', "bad character in group name 'a.'", 4) - self.checkPatternError('(?P<)', 'missing >, unterminated name', 4) - self.checkPatternError('(?P, unterminated name', 4) - self.checkPatternError('(?P<', 'missing group name', 4) - self.checkPatternError('(?P<>)', 'missing group name', 4) + self.checkPatternError(r'(?Pxy)', 'unknown extension ?Px') + self.checkPatternError(r'(?P)(?P=a', 'missing ), unterminated name', 11) + self.checkPatternError(r'(?P=', 'missing group name', 4) + self.checkPatternError(r'(?P=)', 'missing group name', 4) + self.checkPatternError(r'(?P=1)', "bad character in group name '1'", 4) + self.checkPatternError(r'(?P=a)', "unknown group name 'a'") + self.checkPatternError(r'(?P=a1)', "unknown group name 'a1'") + self.checkPatternError(r'(?P=a.)', "bad character in group name 'a.'", 4) + self.checkPatternError(r'(?P<)', 'missing >, unterminated name', 4) + self.checkPatternError(r'(?P, unterminated name', 4) + self.checkPatternError(r'(?P<', 'missing group name', 4) + self.checkPatternError(r'(?P<>)', 'missing group name', 4) self.checkPatternError(r'(?P<1>)', "bad character in group name '1'", 4) self.checkPatternError(r'(?P)', "bad character in group name 'a.'", 4) self.checkPatternError(r'(?(', 'missing group name', 3) @@ -259,35 +260,35 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match(pat, 'xc8yz').span(), (0, 5)) def test_symbolic_refs(self): - self.checkTemplateError('(?Px)', '\gx)', r'\g, unterminated name', 3) - self.checkTemplateError('(?Px)', '\g<', 'xx', + self.checkTemplateError('(?Px)', r'\g<', 'xx', 'missing group name', 3) - self.checkTemplateError('(?Px)', '\g', 'xx', 'missing <', 2) - self.checkTemplateError('(?Px)', '\g', 'xx', + self.checkTemplateError('(?Px)', r'\g', 'xx', 'missing <', 2) + self.checkTemplateError('(?Px)', r'\g', 'xx', "bad character in group name 'a a'", 3) - self.checkTemplateError('(?Px)', '\g<>', 'xx', + self.checkTemplateError('(?Px)', r'\g<>', 'xx', 'missing group name', 3) - self.checkTemplateError('(?Px)', '\g<1a1>', 'xx', + self.checkTemplateError('(?Px)', r'\g<1a1>', 'xx', "bad character in group name '1a1'", 3) self.checkTemplateError('(?Px)', r'\g<2>', 'xx', - 'invalid group reference') + 'invalid group reference 2', 3) self.checkTemplateError('(?Px)', r'\2', 'xx', - 'invalid group reference') + 'invalid group reference 2', 1) with self.assertRaisesRegex(IndexError, "unknown group name 'ab'"): - re.sub('(?Px)', '\g', 'xx') + re.sub('(?Px)', r'\g', 'xx') self.assertEqual(re.sub('(?Px)|(?Py)', r'\g', 'xx'), '') self.assertEqual(re.sub('(?Px)|(?Py)', r'\2', 'xx'), '') - self.checkTemplateError('(?Px)', '\g<-1>', 'xx', + self.checkTemplateError('(?Px)', r'\g<-1>', 'xx', "bad character in group name '-1'", 3) # New valid/invalid identifiers in Python 3 self.assertEqual(re.sub('(?P<µ>x)', r'\g<µ>', 'xx'), 'xx') self.assertEqual(re.sub('(?P<𝔘𝔫𝔦𝔠𝔬𝔡𝔢>x)', r'\g<𝔘𝔫𝔦𝔠𝔬𝔡𝔢>', 'xx'), 'xx') - self.checkTemplateError('(?Px)', '\g<©>', 'xx', + self.checkTemplateError('(?Px)', r'\g<©>', 'xx', "bad character in group name '©'", 3) # Support > 100 groups. pat = '|'.join('x(?P%x)y' % (i, i) for i in range(1, 200 + 1)) - self.assertEqual(re.sub(pat, '\g<200>', 'xc8yzxc8y'), 'c8zc8') + self.assertEqual(re.sub(pat, r'\g<200>', 'xc8yzxc8y'), 'c8zc8') def test_re_subn(self): self.assertEqual(re.subn("(?i)b+", "x", "bbbb BBBB"), ('x x', 2)) @@ -419,19 +420,77 @@ class ReTests(unittest.TestCase): self.assertEqual(pat.match('bc').groups(), ('b', None, 'b', 'c')) self.assertEqual(pat.match('bc').groups(""), ('b', "", 'b', 'c')) - # A single group - m = re.match('(a)', 'a') - self.assertEqual(m.group(0), 'a') - self.assertEqual(m.group(0), 'a') - self.assertEqual(m.group(1), 'a') - self.assertEqual(m.group(1, 1), ('a', 'a')) - pat = re.compile('(?:(?Pa)|(?Pb))(?Pc)?') self.assertEqual(pat.match('a').group(1, 2, 3), ('a', None, None)) self.assertEqual(pat.match('b').group('a1', 'b2', 'c3'), (None, 'b', None)) self.assertEqual(pat.match('ac').group(1, 'b2', 3), ('a', None, 'c')) + def test_group(self): + class Index: + def __init__(self, value): + self.value = value + def __index__(self): + return self.value + # A single group + m = re.match('(a)(b)', 'ab') + self.assertEqual(m.group(), 'ab') + self.assertEqual(m.group(0), 'ab') + self.assertEqual(m.group(1), 'a') + self.assertEqual(m.group(Index(1)), 'a') + self.assertRaises(IndexError, m.group, -1) + self.assertRaises(IndexError, m.group, 3) + self.assertRaises(IndexError, m.group, 1<<1000) + self.assertRaises(IndexError, m.group, Index(1<<1000)) + self.assertRaises(IndexError, m.group, 'x') + # Multiple groups + self.assertEqual(m.group(2, 1), ('b', 'a')) + self.assertEqual(m.group(Index(2), Index(1)), ('b', 'a')) + + def test_match_getitem(self): + pat = re.compile('(?:(?Pa)|(?Pb))(?Pc)?') + + m = pat.match('a') + self.assertEqual(m['a1'], 'a') + self.assertEqual(m['b2'], None) + self.assertEqual(m['c3'], None) + self.assertEqual('a1={a1} b2={b2} c3={c3}'.format_map(m), 'a1=a b2=None c3=None') + self.assertEqual(m[0], 'a') + self.assertEqual(m[1], 'a') + self.assertEqual(m[2], None) + self.assertEqual(m[3], None) + with self.assertRaisesRegex(IndexError, 'no such group'): + m['X'] + with self.assertRaisesRegex(IndexError, 'no such group'): + m[-1] + with self.assertRaisesRegex(IndexError, 'no such group'): + m[4] + with self.assertRaisesRegex(IndexError, 'no such group'): + m[0, 1] + with self.assertRaisesRegex(IndexError, 'no such group'): + m[(0,)] + with self.assertRaisesRegex(IndexError, 'no such group'): + m[(0, 1)] + with self.assertRaisesRegex(KeyError, 'a2'): + 'a1={a2}'.format_map(m) + + m = pat.match('ac') + self.assertEqual(m['a1'], 'a') + self.assertEqual(m['b2'], None) + self.assertEqual(m['c3'], 'c') + self.assertEqual('a1={a1} b2={b2} c3={c3}'.format_map(m), 'a1=a b2=None c3=c') + self.assertEqual(m[0], 'ac') + self.assertEqual(m[1], 'a') + self.assertEqual(m[2], None) + self.assertEqual(m[3], 'c') + + # Cannot assign. + with self.assertRaises(TypeError): + m[0] = 1 + + # No len(). + self.assertRaises(TypeError, len, m) + def test_re_fullmatch(self): # Issue 16203: Proposal: add re.fullmatch() method. self.assertEqual(re.fullmatch(r"a", "a").span(), (0, 1)) @@ -463,19 +522,19 @@ class ReTests(unittest.TestCase): re.compile(r".*?").fullmatch("abcd", pos=1, endpos=3).span(), (1, 3)) def test_re_groupref_exists(self): - self.assertEqual(re.match('^(\()?([^()]+)(?(1)\))$', '(a)').groups(), + self.assertEqual(re.match(r'^(\()?([^()]+)(?(1)\))$', '(a)').groups(), ('(', 'a')) - self.assertEqual(re.match('^(\()?([^()]+)(?(1)\))$', 'a').groups(), + self.assertEqual(re.match(r'^(\()?([^()]+)(?(1)\))$', 'a').groups(), (None, 'a')) - self.assertIsNone(re.match('^(\()?([^()]+)(?(1)\))$', 'a)')) - self.assertIsNone(re.match('^(\()?([^()]+)(?(1)\))$', '(a')) + self.assertIsNone(re.match(r'^(\()?([^()]+)(?(1)\))$', 'a)')) + self.assertIsNone(re.match(r'^(\()?([^()]+)(?(1)\))$', '(a')) self.assertEqual(re.match('^(?:(a)|c)((?(1)b|d))$', 'ab').groups(), ('a', 'b')) - self.assertEqual(re.match('^(?:(a)|c)((?(1)b|d))$', 'cd').groups(), + self.assertEqual(re.match(r'^(?:(a)|c)((?(1)b|d))$', 'cd').groups(), (None, 'd')) - self.assertEqual(re.match('^(?:(a)|c)((?(1)|d))$', 'cd').groups(), + self.assertEqual(re.match(r'^(?:(a)|c)((?(1)|d))$', 'cd').groups(), (None, 'd')) - self.assertEqual(re.match('^(?:(a)|c)((?(1)|d))$', 'a').groups(), + self.assertEqual(re.match(r'^(?:(a)|c)((?(1)|d))$', 'a').groups(), ('a', '')) # Tests for bug #1177831: exercise groups other than the first group @@ -500,10 +559,11 @@ class ReTests(unittest.TestCase): 'two branches', 10) def test_re_groupref_overflow(self): - self.checkTemplateError('()', '\g<%s>' % sre_constants.MAXGROUPS, 'xx', - 'invalid group reference', 3) - self.checkPatternError(r'(?P)(?(%d))' % sre_constants.MAXGROUPS, - 'invalid group reference', 10) + from sre_constants import MAXGROUPS + self.checkTemplateError('()', r'\g<%s>' % MAXGROUPS, 'xx', + 'invalid group reference %d' % MAXGROUPS, 3) + self.checkPatternError(r'(?P)(?(%d))' % MAXGROUPS, + 'invalid group reference %d' % MAXGROUPS, 10) def test_re_groupref(self): self.assertEqual(re.match(r'^(\|)?([^()]+)\1$', '|a|').groups(), @@ -535,37 +595,37 @@ class ReTests(unittest.TestCase): " ") def test_repeat_minmax(self): - self.assertIsNone(re.match("^(\w){1}$", "abc")) - self.assertIsNone(re.match("^(\w){1}?$", "abc")) - self.assertIsNone(re.match("^(\w){1,2}$", "abc")) - self.assertIsNone(re.match("^(\w){1,2}?$", "abc")) - - self.assertEqual(re.match("^(\w){3}$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){1,3}$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){1,4}$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){3,4}?$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){3}?$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){1,3}?$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){1,4}?$", "abc").group(1), "c") - self.assertEqual(re.match("^(\w){3,4}?$", "abc").group(1), "c") - - self.assertIsNone(re.match("^x{1}$", "xxx")) - self.assertIsNone(re.match("^x{1}?$", "xxx")) - self.assertIsNone(re.match("^x{1,2}$", "xxx")) - self.assertIsNone(re.match("^x{1,2}?$", "xxx")) - - self.assertTrue(re.match("^x{3}$", "xxx")) - self.assertTrue(re.match("^x{1,3}$", "xxx")) - self.assertTrue(re.match("^x{3,3}$", "xxx")) - self.assertTrue(re.match("^x{1,4}$", "xxx")) - self.assertTrue(re.match("^x{3,4}?$", "xxx")) - self.assertTrue(re.match("^x{3}?$", "xxx")) - self.assertTrue(re.match("^x{1,3}?$", "xxx")) - self.assertTrue(re.match("^x{1,4}?$", "xxx")) - self.assertTrue(re.match("^x{3,4}?$", "xxx")) - - self.assertIsNone(re.match("^x{}$", "xxx")) - self.assertTrue(re.match("^x{}$", "x{}")) + self.assertIsNone(re.match(r"^(\w){1}$", "abc")) + self.assertIsNone(re.match(r"^(\w){1}?$", "abc")) + self.assertIsNone(re.match(r"^(\w){1,2}$", "abc")) + self.assertIsNone(re.match(r"^(\w){1,2}?$", "abc")) + + self.assertEqual(re.match(r"^(\w){3}$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){1,3}$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){1,4}$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){3,4}?$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){3}?$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){1,3}?$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){1,4}?$", "abc").group(1), "c") + self.assertEqual(re.match(r"^(\w){3,4}?$", "abc").group(1), "c") + + self.assertIsNone(re.match(r"^x{1}$", "xxx")) + self.assertIsNone(re.match(r"^x{1}?$", "xxx")) + self.assertIsNone(re.match(r"^x{1,2}$", "xxx")) + self.assertIsNone(re.match(r"^x{1,2}?$", "xxx")) + + self.assertTrue(re.match(r"^x{3}$", "xxx")) + self.assertTrue(re.match(r"^x{1,3}$", "xxx")) + self.assertTrue(re.match(r"^x{3,3}$", "xxx")) + self.assertTrue(re.match(r"^x{1,4}$", "xxx")) + self.assertTrue(re.match(r"^x{3,4}?$", "xxx")) + self.assertTrue(re.match(r"^x{3}?$", "xxx")) + self.assertTrue(re.match(r"^x{1,3}?$", "xxx")) + self.assertTrue(re.match(r"^x{1,4}?$", "xxx")) + self.assertTrue(re.match(r"^x{3,4}?$", "xxx")) + + self.assertIsNone(re.match(r"^x{}$", "xxx")) + self.assertTrue(re.match(r"^x{}$", "x{}")) self.checkPatternError(r'x{2,1}', 'min repeat greater than max repeat', 2) @@ -638,18 +698,10 @@ class ReTests(unittest.TestCase): re.purge() # for warnings for c in 'ceghijklmopqyzCEFGHIJKLMNOPQRTVXY': with self.subTest(c): - with self.assertWarns(DeprecationWarning) as warns: - self.assertEqual(re.fullmatch('\\%c' % c, c).group(), c) - self.assertIsNone(re.match('\\%c' % c, 'a')) - self.assertRegex(str(warns.warnings[0].message), 'bad escape') - self.assertEqual(warns.warnings[0].filename, __file__) + self.assertRaises(re.error, re.compile, '\\%c' % c) for c in 'ceghijklmopqyzABCEFGHIJKLMNOPQRTVXYZ': with self.subTest(c): - with self.assertWarns(DeprecationWarning) as warns: - self.assertEqual(re.fullmatch('[\\%c]' % c, c).group(), c) - self.assertIsNone(re.match('[\\%c]' % c, 'a')) - self.assertRegex(str(warns.warnings[0].message), 'bad escape') - self.assertEqual(warns.warnings[0].filename, __file__) + self.assertRaises(re.error, re.compile, '[\\%c]' % c) def test_string_boundaries(self): # See http://bugs.python.org/issue10713 @@ -696,10 +748,10 @@ class ReTests(unittest.TestCase): "a\n\nb") def test_lookahead(self): - self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") - self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") - self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") - self.assertEqual(re.match("(a(?=\s[abc]*))", "a bc").group(1), "a") + self.assertEqual(re.match(r"(a(?=\s[^a]))", "a b").group(1), "a") + self.assertEqual(re.match(r"(a(?=\s[^a]*))", "a b").group(1), "a") + self.assertEqual(re.match(r"(a(?=\s[abc]))", "a b").group(1), "a") + self.assertEqual(re.match(r"(a(?=\s[abc]*))", "a bc").group(1), "a") self.assertEqual(re.match(r"(a)(?=\s\1)", "a a").group(1), "a") self.assertEqual(re.match(r"(a)(?=\s\1*)", "a aa").group(1), "a") self.assertEqual(re.match(r"(a)(?=\s(abc|a))", "a a").group(1), "a") @@ -847,12 +899,12 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match(b"abc", b"ABC", re.I|re.L).group(0), b"ABC") def test_not_literal(self): - self.assertEqual(re.search("\s([^a])", " b").group(1), "b") - self.assertEqual(re.search("\s([^a]*)", " bb").group(1), "bb") + self.assertEqual(re.search(r"\s([^a])", " b").group(1), "b") + self.assertEqual(re.search(r"\s([^a]*)", " bb").group(1), "bb") def test_search_coverage(self): - self.assertEqual(re.search("\s(b)", " b").group(1), "b") - self.assertEqual(re.search("a\s", "a ").group(0), "a ") + self.assertEqual(re.search(r"\s(b)", " b").group(1), "b") + self.assertEqual(re.search(r"a\s", "a ").group(0), "a ") def assertMatch(self, pattern, text, match=None, span=None, matcher=re.match): @@ -957,7 +1009,7 @@ class ReTests(unittest.TestCase): self.checkPatternError(r"\567", r'octal escape value \567 outside of ' r'range 0-0o377', 0) - self.checkPatternError(r"\911", 'invalid group reference', 0) + self.checkPatternError(r"\911", 'invalid group reference 91', 1) self.checkPatternError(r"\x1", r'incomplete escape \x1', 0) self.checkPatternError(r"\x1z", r'incomplete escape \x1', 0) self.checkPatternError(r"\u123", r'incomplete escape \u123', 0) @@ -1002,10 +1054,8 @@ class ReTests(unittest.TestCase): self.assertTrue(re.match((r"\x%02x" % i).encode(), bytes([i]))) self.assertTrue(re.match((r"\x%02x0" % i).encode(), bytes([i])+b"0")) self.assertTrue(re.match((r"\x%02xz" % i).encode(), bytes([i])+b"z")) - with self.assertWarns(DeprecationWarning): - self.assertTrue(re.match(br"\u1234", b'u1234')) - with self.assertWarns(DeprecationWarning): - self.assertTrue(re.match(br"\U00012345", b'U00012345')) + self.assertRaises(re.error, re.compile, br"\u1234") + self.assertRaises(re.error, re.compile, br"\U00012345") self.assertTrue(re.match(br"\0", b"\000")) self.assertTrue(re.match(br"\08", b"\0008")) self.assertTrue(re.match(br"\01", b"\001")) @@ -1013,7 +1063,7 @@ class ReTests(unittest.TestCase): self.checkPatternError(br"\567", r'octal escape value \567 outside of ' r'range 0-0o377', 0) - self.checkPatternError(br"\911", 'invalid group reference', 0) + self.checkPatternError(br"\911", 'invalid group reference 91', 1) self.checkPatternError(br"\x1", r'incomplete escape \x1', 0) self.checkPatternError(br"\x1z", r'incomplete escape \x1', 0) @@ -1027,10 +1077,8 @@ class ReTests(unittest.TestCase): self.assertTrue(re.match((r"[\x%02x]" % i).encode(), bytes([i]))) self.assertTrue(re.match((r"[\x%02x0]" % i).encode(), bytes([i]))) self.assertTrue(re.match((r"[\x%02xz]" % i).encode(), bytes([i]))) - with self.assertWarns(DeprecationWarning): - self.assertTrue(re.match(br"[\u1234]", b'u')) - with self.assertWarns(DeprecationWarning): - self.assertTrue(re.match(br"[\U00012345]", b'U')) + self.assertRaises(re.error, re.compile, br"[\u1234]") + self.assertRaises(re.error, re.compile, br"[\U00012345]") self.checkPatternError(br"[\567]", r'octal escape value \567 outside of ' r'range 0-0o377', 1) @@ -1058,8 +1106,8 @@ class ReTests(unittest.TestCase): self.assertIsNone(re.match(r'(a)?a','a').lastindex) self.assertEqual(re.match(r'(a)(b)?b','ab').lastindex, 1) self.assertEqual(re.match(r'(?Pa)(?Pb)?b','ab').lastgroup, 'a') - self.assertEqual(re.match("(?Pa(b))", "ab").lastgroup, 'a') - self.assertEqual(re.match("((a))", "a").lastindex, 1) + self.assertEqual(re.match(r"(?Pa(b))", "ab").lastgroup, 'a') + self.assertEqual(re.match(r"((a))", "a").lastindex, 1) def test_bug_418626(self): # bugs 418626 at al. -- Testing Greg Chapman's addition of op code @@ -1231,7 +1279,7 @@ class ReTests(unittest.TestCase): '\uff10', # '\N{FULLWIDTH DIGIT ZERO}', category 'Nd' ] for x in decimal_digits: - self.assertEqual(re.match('^\d$', x).group(0), x) + self.assertEqual(re.match(r'^\d$', x).group(0), x) not_decimal_digits = [ '\u2165', # '\N{ROMAN NUMERAL SIX}', category 'Nl' @@ -1240,7 +1288,7 @@ class ReTests(unittest.TestCase): '\u32b4', # '\N{CIRCLED NUMBER THIRTY NINE}', category 'No' ] for x in not_decimal_digits: - self.assertIsNone(re.match('^\d$', x)) + self.assertIsNone(re.match(r'^\d$', x)) def test_empty_array(self): # SF buf 1647541 @@ -1282,6 +1330,22 @@ class ReTests(unittest.TestCase): self.assertTrue(re.match('(?ixu) ' + upper_char, lower_char)) self.assertTrue(re.match('(?ixu) ' + lower_char, upper_char)) + p = upper_char + '(?i)' + with self.assertWarns(DeprecationWarning) as warns: + self.assertTrue(re.match(p, lower_char)) + self.assertEqual( + str(warns.warnings[0].message), + 'Flags not at the start of the expression %s' % p + ) + + p = upper_char + '(?i)%s' % ('.?' * 100) + with self.assertWarns(DeprecationWarning) as warns: + self.assertTrue(re.match(p, lower_char)) + self.assertEqual( + str(warns.warnings[0].message), + 'Flags not at the start of the expression %s (truncated)' % p[:20] + ) + def test_dollar_matches_twice(self): "$ matches the end of string, and just before the terminating \n" pattern = re.compile('$') @@ -1312,29 +1376,29 @@ class ReTests(unittest.TestCase): for flags in (0, re.UNICODE): pat = re.compile('\xc0', flags | re.IGNORECASE) self.assertTrue(pat.match('\xe0')) - pat = re.compile('\w', flags) + pat = re.compile(r'\w', flags) self.assertTrue(pat.match('\xe0')) pat = re.compile('\xc0', re.ASCII | re.IGNORECASE) self.assertIsNone(pat.match('\xe0')) pat = re.compile('(?a)\xc0', re.IGNORECASE) self.assertIsNone(pat.match('\xe0')) - pat = re.compile('\w', re.ASCII) + pat = re.compile(r'\w', re.ASCII) self.assertIsNone(pat.match('\xe0')) - pat = re.compile('(?a)\w') + pat = re.compile(r'(?a)\w') self.assertIsNone(pat.match('\xe0')) # Bytes patterns for flags in (0, re.ASCII): pat = re.compile(b'\xc0', flags | re.IGNORECASE) self.assertIsNone(pat.match(b'\xe0')) - pat = re.compile(b'\w', flags) + pat = re.compile(br'\w', flags) self.assertIsNone(pat.match(b'\xe0')) # Incompatibilities - self.assertRaises(ValueError, re.compile, b'\w', re.UNICODE) - self.assertRaises(ValueError, re.compile, b'(?u)\w') - self.assertRaises(ValueError, re.compile, '\w', re.UNICODE | re.ASCII) - self.assertRaises(ValueError, re.compile, '(?u)\w', re.ASCII) - self.assertRaises(ValueError, re.compile, '(?a)\w', re.UNICODE) - self.assertRaises(ValueError, re.compile, '(?au)\w') + self.assertRaises(ValueError, re.compile, br'\w', re.UNICODE) + self.assertRaises(ValueError, re.compile, br'(?u)\w') + self.assertRaises(ValueError, re.compile, r'\w', re.UNICODE | re.ASCII) + self.assertRaises(ValueError, re.compile, r'(?u)\w', re.ASCII) + self.assertRaises(ValueError, re.compile, r'(?a)\w', re.UNICODE) + self.assertRaises(ValueError, re.compile, r'(?au)\w') def test_locale_flag(self): import locale @@ -1365,27 +1429,59 @@ class ReTests(unittest.TestCase): pat = re.compile(bpat, re.IGNORECASE) if bletter: self.assertIsNone(pat.match(bletter)) - pat = re.compile(b'\w', re.LOCALE) + pat = re.compile(br'\w', re.LOCALE) if bletter: self.assertTrue(pat.match(bletter)) - pat = re.compile(b'(?L)\w') + pat = re.compile(br'(?L)\w') if bletter: self.assertTrue(pat.match(bletter)) - pat = re.compile(b'\w') + pat = re.compile(br'\w') if bletter: self.assertIsNone(pat.match(bletter)) # Incompatibilities - self.assertWarns(DeprecationWarning, re.compile, '', re.LOCALE) - self.assertWarns(DeprecationWarning, re.compile, '(?L)') - self.assertWarns(DeprecationWarning, re.compile, b'', re.LOCALE | re.ASCII) - self.assertWarns(DeprecationWarning, re.compile, b'(?L)', re.ASCII) - self.assertWarns(DeprecationWarning, re.compile, b'(?a)', re.LOCALE) - self.assertWarns(DeprecationWarning, re.compile, b'(?aL)') + self.assertRaises(ValueError, re.compile, '', re.LOCALE) + self.assertRaises(ValueError, re.compile, '(?L)') + self.assertRaises(ValueError, re.compile, b'', re.LOCALE | re.ASCII) + self.assertRaises(ValueError, re.compile, b'(?L)', re.ASCII) + self.assertRaises(ValueError, re.compile, b'(?a)', re.LOCALE) + self.assertRaises(ValueError, re.compile, b'(?aL)') + + def test_scoped_flags(self): + self.assertTrue(re.match(r'(?i:a)b', 'Ab')) + self.assertIsNone(re.match(r'(?i:a)b', 'aB')) + self.assertIsNone(re.match(r'(?-i:a)b', 'Ab', re.IGNORECASE)) + self.assertTrue(re.match(r'(?-i:a)b', 'aB', re.IGNORECASE)) + self.assertIsNone(re.match(r'(?i:(?-i:a)b)', 'Ab')) + self.assertTrue(re.match(r'(?i:(?-i:a)b)', 'aB')) + + self.assertTrue(re.match(r'(?x: a) b', 'a b')) + self.assertIsNone(re.match(r'(?x: a) b', ' a b')) + self.assertTrue(re.match(r'(?-x: a) b', ' ab', re.VERBOSE)) + self.assertIsNone(re.match(r'(?-x: a) b', 'ab', re.VERBOSE)) + + self.checkPatternError(r'(?a:\w)', + 'bad inline flags: cannot turn on global flag', 3) + self.checkPatternError(r'(?a)(?-a:\w)', + 'bad inline flags: cannot turn off global flag', 8) + self.checkPatternError(r'(?i-i:a)', + 'bad inline flags: flag turned on and off', 5) + + self.checkPatternError(r'(?-', 'missing flag', 3) + self.checkPatternError(r'(?-+', 'missing flag', 3) + self.checkPatternError(r'(?-z', 'unknown flag', 3) + self.checkPatternError(r'(?-i', 'missing :', 4) + self.checkPatternError(r'(?-i)', 'missing :', 4) + self.checkPatternError(r'(?-i+', 'missing :', 4) + self.checkPatternError(r'(?-iz', 'unknown flag', 4) + self.checkPatternError(r'(?i:', 'missing ), unterminated subpattern', 0) + self.checkPatternError(r'(?i', 'missing -, : or )', 3) + self.checkPatternError(r'(?i+', 'missing -, : or )', 3) + self.checkPatternError(r'(?iz', 'unknown flag', 3) def test_bug_6509(self): # Replacement strings of both types must parse properly. # all strings - pat = re.compile('a(\w)') + pat = re.compile(r'a(\w)') self.assertEqual(pat.sub('b\\1', 'ac'), 'bc') pat = re.compile('a(.)') self.assertEqual(pat.sub('b\\1', 'a\u1234'), 'b\u1234') @@ -1393,7 +1489,7 @@ class ReTests(unittest.TestCase): self.assertEqual(pat.sub(lambda m: 'str', 'a5'), 'str') # all bytes - pat = re.compile(b'a(\w)') + pat = re.compile(br'a(\w)') self.assertEqual(pat.sub(b'b\\1', b'ac'), b'bc') pat = re.compile(b'a(.)') self.assertEqual(pat.sub(b'b\\1', b'a\xCD'), b'b\xCD') @@ -1431,13 +1527,6 @@ class ReTests(unittest.TestCase): # Test behaviour when not given a string or pattern as parameter self.assertRaises(TypeError, re.compile, 0) - def test_bug_13899(self): - # Issue #13899: re pattern r"[\A]" should work like "A" but matches - # nothing. Ditto B and Z. - with self.assertWarns(DeprecationWarning): - self.assertEqual(re.findall(r'[\A\B\b\C\Z]', 'AB\bCZ'), - ['A', 'B', '\b', 'C', 'Z']) - @bigmemtest(size=_2G, memuse=1) def test_large_search(self, size): # Issue #10182: indices were 32-bit-truncated. @@ -1522,7 +1611,7 @@ class ReTests(unittest.TestCase): for string in (b'[abracadabra]', B(b'[abracadabra]'), bytearray(b'[abracadabra]'), memoryview(b'[abracadabra]')): - m = re.search(rb'(.+)(.*?)\1', string) + m = re.search(br'(.+)(.*?)\1', string) self.assertEqual(repr(m), "<%s.%s object; " "span=(1, 12), match=b'abracadabra'>" % (type(m).__module__, type(m).__qualname__)) @@ -1551,9 +1640,9 @@ class ReTests(unittest.TestCase): with captured_stdout() as out: re.compile(pat, re.DEBUG) dump = '''\ -SUBPATTERN 1 +SUBPATTERN 1 0 0 LITERAL 46 -SUBPATTERN None +SUBPATTERN None 0 0 BRANCH IN LITERAL 99 @@ -1561,7 +1650,7 @@ SUBPATTERN None OR LITERAL 112 LITERAL 121 -SUBPATTERN None +SUBPATTERN None 0 0 GROUPREF_EXISTS 1 AT AT_END ELSE @@ -1677,21 +1766,63 @@ SUBPATTERN None self.checkPatternError(r'(?P', 'unexpected end of pattern', 3) self.checkPatternError(r'(?z)', 'unknown extension ?z', 1) self.checkPatternError(r'(?iz)', 'unknown flag', 3) - self.checkPatternError(r'(?i', 'missing )', 3) + self.checkPatternError(r'(?i', 'missing -, : or )', 3) self.checkPatternError(r'(?#abc', 'missing ), unterminated comment', 0) self.checkPatternError(r'(?<', 'unexpected end of pattern', 3) self.checkPatternError(r'(?<>)', 'unknown extension ?<>', 1) self.checkPatternError(r'(?', 'unexpected end of pattern', 2) - def test_bug_29444(self): - s = bytearray(b'abcdefgh') - m = re.search(b'[a-h]+', s) - m2 = re.search(b'[e-h]+', s) - self.assertEqual(m.group(), b'abcdefgh') - self.assertEqual(m2.group(), b'efgh') - s[:] = b'xyz' - self.assertEqual(m.group(), b'xyz') - self.assertEqual(m2.group(), b'') + def test_enum(self): + # Issue #28082: Check that str(flag) returns a human readable string + # instead of an integer + self.assertIn('ASCII', str(re.A)) + self.assertIn('DOTALL', str(re.S)) + + def test_pattern_compare(self): + pattern1 = re.compile('abc', re.IGNORECASE) + + # equal to itself + self.assertEqual(pattern1, pattern1) + self.assertFalse(pattern1 != pattern1) + + # equal + re.purge() + pattern2 = re.compile('abc', re.IGNORECASE) + self.assertEqual(hash(pattern2), hash(pattern1)) + self.assertEqual(pattern2, pattern1) + + # not equal: different pattern + re.purge() + pattern3 = re.compile('XYZ', re.IGNORECASE) + # Don't test hash(pattern3) != hash(pattern1) because there is no + # warranty that hash values are different + self.assertNotEqual(pattern3, pattern1) + + # not equal: different flag (flags=0) + re.purge() + pattern4 = re.compile('abc') + self.assertNotEqual(pattern4, pattern1) + + # only == and != comparison operators are supported + with self.assertRaises(TypeError): + pattern1 < pattern2 + + def test_pattern_compare_bytes(self): + pattern1 = re.compile(b'abc') + + # equal: test bytes patterns + re.purge() + pattern2 = re.compile(b'abc') + self.assertEqual(hash(pattern2), hash(pattern1)) + self.assertEqual(pattern2, pattern1) + + # not equal: pattern of a different types (str vs bytes), + # comparison must not raise a BytesWarning + re.purge() + pattern3 = re.compile('abc') + with warnings.catch_warnings(): + warnings.simplefilter('error', BytesWarning) + self.assertNotEqual(pattern3, pattern1) class PatternReprTests(unittest.TestCase): diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py index 931c855..06a9149 100644 --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -9,7 +9,7 @@ import subprocess import sys import tempfile import unittest -from test.support import import_module, unlink, temp_dir, TESTFN +from test.support import import_module, unlink, TESTFN from test.support.script_helper import assert_python_ok # Skip tests if there is no readline module @@ -121,6 +121,21 @@ class TestReadline(unittest.TestCase): TERM='xterm-256color') self.assertEqual(stdout, b'') + auto_history_script = """\ +import readline +readline.set_auto_history({}) +input() +print("History length:", readline.get_current_history_length()) +""" + + def test_auto_history_enabled(self): + output = run_pty(self.auto_history_script.format(True)) + self.assertIn(b"History length: 1\r\n", output) + + def test_auto_history_disabled(self): + output = run_pty(self.auto_history_script.format(False)) + self.assertIn(b"History length: 0\r\n", output) + def test_nonascii(self): try: readline.add_history("\xEB\xEF") @@ -195,57 +210,13 @@ print("history", ascii(readline.get_history_item(1))) self.assertIn(b"result " + expected + b"\r\n", output) self.assertIn(b"history " + expected + b"\r\n", output) - # We have 2 reasons to skip this test: - # - readline: history size was added in 6.0 - # See https://cnswww.cns.cwru.edu/php/chet/readline/CHANGES - # - editline: history size is broken on OS X 10.11.6. - # Newer versions were not tested yet. - @unittest.skipIf(readline._READLINE_VERSION < 0x600, - "this readline version does not support history-size") - @unittest.skipIf(is_editline, - "editline history size configuration is broken") - def test_history_size(self): - history_size = 10 - with temp_dir() as test_dir: - inputrc = os.path.join(test_dir, "inputrc") - with open(inputrc, "wb") as f: - f.write(b"set history-size %d\n" % history_size) - - history_file = os.path.join(test_dir, "history") - with open(history_file, "wb") as f: - # history_size * 2 items crashes readline - data = b"".join(b"item %d\n" % i - for i in range(history_size * 2)) - f.write(data) - - script = """ -import os -import readline - -history_file = os.environ["HISTORY_FILE"] -readline.read_history_file(history_file) -input() -readline.write_history_file(history_file) -""" - - env = dict(os.environ) - env["INPUTRC"] = inputrc - env["HISTORY_FILE"] = history_file - - run_pty(script, input=b"last input\r", env=env) - - with open(history_file, "rb") as f: - lines = f.readlines() - self.assertEqual(len(lines), history_size) - self.assertEqual(lines[-1].strip(), b"last input") - -def run_pty(script, input=b"dummy input\r", env=None): +def run_pty(script, input=b"dummy input\r"): pty = import_module('pty') output = bytearray() [master, slave] = pty.openpty() args = (sys.executable, '-c', script) - proc = subprocess.Popen(args, stdin=slave, stdout=slave, stderr=slave, env=env) + proc = subprocess.Popen(args, stdin=slave, stdout=slave, stderr=slave) os.close(slave) with ExitStack() as cleanup: cleanup.enter_context(proc) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 2618b0f..52909d8 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -4,7 +4,9 @@ Tests of regrtest.py. Note: test_regrtest cannot be run twice in parallel. """ +import contextlib import faulthandler +import io import os.path import platform import re @@ -14,7 +16,7 @@ import sysconfig import tempfile import textwrap import unittest -from test import regrtest +from test import libregrtest from test import support @@ -34,12 +36,13 @@ TEST_INTERRUPTED = textwrap.dedent(""" class ParseArgsTestCase(unittest.TestCase): - - """Test regrtest's argument parsing.""" + """ + Test regrtest's argument parsing, function _parse_args(). + """ def checkError(self, args, msg): with support.captured_stderr() as err, self.assertRaises(SystemExit): - regrtest._parse_args(args) + libregrtest._parse_args(args) self.assertIn(msg, err.getvalue()) def test_help(self): @@ -47,78 +50,78 @@ class ParseArgsTestCase(unittest.TestCase): with self.subTest(opt=opt): with support.captured_stdout() as out, \ self.assertRaises(SystemExit): - regrtest._parse_args([opt]) + libregrtest._parse_args([opt]) self.assertIn('Run Python regression tests.', out.getvalue()) @unittest.skipUnless(hasattr(faulthandler, 'dump_traceback_later'), "faulthandler.dump_traceback_later() required") def test_timeout(self): - ns = regrtest._parse_args(['--timeout', '4.2']) + ns = libregrtest._parse_args(['--timeout', '4.2']) self.assertEqual(ns.timeout, 4.2) self.checkError(['--timeout'], 'expected one argument') self.checkError(['--timeout', 'foo'], 'invalid float value') def test_wait(self): - ns = regrtest._parse_args(['--wait']) + ns = libregrtest._parse_args(['--wait']) self.assertTrue(ns.wait) def test_slaveargs(self): - ns = regrtest._parse_args(['--slaveargs', '[[], {}]']) + ns = libregrtest._parse_args(['--slaveargs', '[[], {}]']) self.assertEqual(ns.slaveargs, '[[], {}]') self.checkError(['--slaveargs'], 'expected one argument') def test_start(self): for opt in '-S', '--start': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, 'foo']) + ns = libregrtest._parse_args([opt, 'foo']) self.assertEqual(ns.start, 'foo') self.checkError([opt], 'expected one argument') def test_verbose(self): - ns = regrtest._parse_args(['-v']) + ns = libregrtest._parse_args(['-v']) self.assertEqual(ns.verbose, 1) - ns = regrtest._parse_args(['-vvv']) + ns = libregrtest._parse_args(['-vvv']) self.assertEqual(ns.verbose, 3) - ns = regrtest._parse_args(['--verbose']) + ns = libregrtest._parse_args(['--verbose']) self.assertEqual(ns.verbose, 1) - ns = regrtest._parse_args(['--verbose'] * 3) + ns = libregrtest._parse_args(['--verbose'] * 3) self.assertEqual(ns.verbose, 3) - ns = regrtest._parse_args([]) + ns = libregrtest._parse_args([]) self.assertEqual(ns.verbose, 0) def test_verbose2(self): for opt in '-w', '--verbose2': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.verbose2) def test_verbose3(self): for opt in '-W', '--verbose3': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.verbose3) def test_quiet(self): for opt in '-q', '--quiet': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.quiet) self.assertEqual(ns.verbose, 0) def test_slow(self): for opt in '-o', '--slowest': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.print_slow) def test_header(self): - ns = regrtest._parse_args(['--header']) + ns = libregrtest._parse_args(['--header']) self.assertTrue(ns.header) def test_randomize(self): for opt in '-r', '--randomize': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.randomize) def test_randseed(self): @@ -131,115 +134,82 @@ class ParseArgsTestCase(unittest.TestCase): def test_fromfile(self): for opt in '-f', '--fromfile': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, 'foo']) + ns = libregrtest._parse_args([opt, 'foo']) self.assertEqual(ns.fromfile, 'foo') self.checkError([opt], 'expected one argument') self.checkError([opt, 'foo', '-s'], "don't go together") - def test_randseed(self): - ns = regrtest._parse_args(['--randseed', '12345']) - self.assertEqual(ns.random_seed, 12345) - self.assertTrue(ns.randomize) - self.checkError(['--randseed'], 'expected one argument') - self.checkError(['--randseed', 'foo'], 'invalid int value') - def test_exclude(self): for opt in '-x', '--exclude': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.exclude) def test_single(self): for opt in '-s', '--single': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.single) self.checkError([opt, '-f', 'foo'], "don't go together") def test_match(self): for opt in '-m', '--match': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, 'pattern']) - self.assertEqual(ns.match_tests, ['pattern']) + ns = libregrtest._parse_args([opt, 'pattern']) + self.assertEqual(ns.match_tests, 'pattern') self.checkError([opt], 'expected one argument') - ns = regrtest._parse_args(['-m', 'pattern1', - '-m', 'pattern2']) - self.assertEqual(ns.match_tests, ['pattern1', 'pattern2']) - - self.addCleanup(support.unlink, support.TESTFN) - with open(support.TESTFN, "w") as fp: - print('matchfile1', file=fp) - print('matchfile2', file=fp) - - filename = os.path.abspath(support.TESTFN) - ns = regrtest._parse_args(['-m', 'match', - '--matchfile', filename]) - self.assertEqual(ns.match_tests, - ['match', 'matchfile1', 'matchfile2']) - def test_failfast(self): for opt in '-G', '--failfast': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, '-v']) + ns = libregrtest._parse_args([opt, '-v']) self.assertTrue(ns.failfast) - ns = regrtest._parse_args([opt, '-W']) + ns = libregrtest._parse_args([opt, '-W']) self.assertTrue(ns.failfast) self.checkError([opt], '-G/--failfast needs either -v or -W') def test_use(self): for opt in '-u', '--use': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, 'gui,network']) + ns = libregrtest._parse_args([opt, 'gui,network']) self.assertEqual(ns.use_resources, ['gui', 'network']) - - ns = regrtest._parse_args([opt, 'gui,none,network']) + ns = libregrtest._parse_args([opt, 'gui,none,network']) self.assertEqual(ns.use_resources, ['network']) - - expected = list(regrtest.ALL_RESOURCES) + expected = list(libregrtest.RESOURCE_NAMES) expected.remove('gui') - ns = regrtest._parse_args([opt, 'all,-gui']) + ns = libregrtest._parse_args([opt, 'all,-gui']) self.assertEqual(ns.use_resources, expected) self.checkError([opt], 'expected one argument') self.checkError([opt, 'foo'], 'invalid resource') - # all + a resource not part of "all" - ns = regrtest._parse_args([opt, 'all,extralargefile']) - self.assertEqual(ns.use_resources, - list(regrtest.ALL_RESOURCES) + ['extralargefile']) - - # test another resource which is not part of "all" - ns = regrtest._parse_args([opt, 'extralargefile']) - self.assertEqual(ns.use_resources, ['extralargefile']) - def test_memlimit(self): for opt in '-M', '--memlimit': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, '4G']) + ns = libregrtest._parse_args([opt, '4G']) self.assertEqual(ns.memlimit, '4G') self.checkError([opt], 'expected one argument') def test_testdir(self): - ns = regrtest._parse_args(['--testdir', 'foo']) + ns = libregrtest._parse_args(['--testdir', 'foo']) self.assertEqual(ns.testdir, os.path.join(support.SAVEDCWD, 'foo')) self.checkError(['--testdir'], 'expected one argument') def test_runleaks(self): for opt in '-L', '--runleaks': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.runleaks) def test_huntrleaks(self): for opt in '-R', '--huntrleaks': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, ':']) + ns = libregrtest._parse_args([opt, ':']) self.assertEqual(ns.huntrleaks, (5, 4, 'reflog.txt')) - ns = regrtest._parse_args([opt, '6:']) + ns = libregrtest._parse_args([opt, '6:']) self.assertEqual(ns.huntrleaks, (6, 4, 'reflog.txt')) - ns = regrtest._parse_args([opt, ':3']) + ns = libregrtest._parse_args([opt, ':3']) self.assertEqual(ns.huntrleaks, (5, 3, 'reflog.txt')) - ns = regrtest._parse_args([opt, '6:3:leaks.log']) + ns = libregrtest._parse_args([opt, '6:3:leaks.log']) self.assertEqual(ns.huntrleaks, (6, 3, 'leaks.log')) self.checkError([opt], 'expected one argument') self.checkError([opt, '6'], @@ -250,27 +220,23 @@ class ParseArgsTestCase(unittest.TestCase): def test_multiprocess(self): for opt in '-j', '--multiprocess': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, '2']) + ns = libregrtest._parse_args([opt, '2']) self.assertEqual(ns.use_mp, 2) self.checkError([opt], 'expected one argument') self.checkError([opt, 'foo'], 'invalid int value') self.checkError([opt, '2', '-T'], "don't go together") self.checkError([opt, '2', '-l'], "don't go together") - self.checkError([opt, '2', '-M', '4G'], "don't go together") - self.checkError([opt, '0', '-T'], "don't go together") - self.checkError([opt, '0', '-l'], "don't go together") - self.checkError([opt, '0', '-M', '4G'], "don't go together") def test_coverage(self): for opt in '-T', '--coverage': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.trace) def test_coverdir(self): for opt in '-D', '--coverdir': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, 'foo']) + ns = libregrtest._parse_args([opt, 'foo']) self.assertEqual(ns.coverdir, os.path.join(support.SAVEDCWD, 'foo')) self.checkError([opt], 'expected one argument') @@ -278,13 +244,13 @@ class ParseArgsTestCase(unittest.TestCase): def test_nocoverdir(self): for opt in '-N', '--nocoverdir': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertIsNone(ns.coverdir) def test_threshold(self): for opt in '-t', '--threshold': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt, '1000']) + ns = libregrtest._parse_args([opt, '1000']) self.assertEqual(ns.threshold, 1000) self.checkError([opt], 'expected one argument') self.checkError([opt, 'foo'], 'invalid int value') @@ -292,45 +258,49 @@ class ParseArgsTestCase(unittest.TestCase): def test_nowindows(self): for opt in '-n', '--nowindows': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + with contextlib.redirect_stderr(io.StringIO()) as stderr: + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.nowindows) + err = stderr.getvalue() + self.assertIn('the --nowindows (-n) option is deprecated', err) def test_forever(self): for opt in '-F', '--forever': with self.subTest(opt=opt): - ns = regrtest._parse_args([opt]) + ns = libregrtest._parse_args([opt]) self.assertTrue(ns.forever) + def test_unrecognized_argument(self): self.checkError(['--xxx'], 'usage:') def test_long_option__partial(self): - ns = regrtest._parse_args(['--qui']) + ns = libregrtest._parse_args(['--qui']) self.assertTrue(ns.quiet) self.assertEqual(ns.verbose, 0) def test_two_options(self): - ns = regrtest._parse_args(['--quiet', '--exclude']) + ns = libregrtest._parse_args(['--quiet', '--exclude']) self.assertTrue(ns.quiet) self.assertEqual(ns.verbose, 0) self.assertTrue(ns.exclude) def test_option_with_empty_string_value(self): - ns = regrtest._parse_args(['--start', '']) + ns = libregrtest._parse_args(['--start', '']) self.assertEqual(ns.start, '') def test_arg(self): - ns = regrtest._parse_args(['foo']) + ns = libregrtest._parse_args(['foo']) self.assertEqual(ns.args, ['foo']) def test_option_and_arg(self): - ns = regrtest._parse_args(['--quiet', 'foo']) + ns = libregrtest._parse_args(['--quiet', 'foo']) self.assertTrue(ns.quiet) self.assertEqual(ns.verbose, 0) self.assertEqual(ns.args, ['foo']) def test_arg_option_arg(self): - ns = regrtest._parse_args(['test_unaryop', '-v', 'test_binop']) + ns = libregrtest._parse_args(['test_unaryop', '-v', 'test_binop']) self.assertEqual(ns.verbose, 1) self.assertEqual(ns.args, ['test_unaryop', 'test_binop']) @@ -382,25 +352,25 @@ class BaseTestCase(unittest.TestCase): self.assertRegex(output, regex) def parse_executed_tests(self, output): - regex = (r'^[0-9]+:[0-9]+:[0-9]+ (?:load avg: [0-9]+\.[0-9]{2} )?\[ *[0-9]+(?:/ *[0-9]+)*\] (%s)' + regex = (r'^[0-9]+:[0-9]+:[0-9]+ \[ *[0-9]+(?:/ *[0-9]+)?\] (%s)' % self.TESTNAME_REGEX) parser = re.finditer(regex, output, re.MULTILINE) return list(match.group(1) for match in parser) def check_executed_tests(self, output, tests, skipped=(), failed=(), - env_changed=(), omitted=(), - randomize=False, interrupted=False, - fail_env_changed=False): + omitted=(), randomize=False, interrupted=False): if isinstance(tests, str): tests = [tests] if isinstance(skipped, str): skipped = [skipped] if isinstance(failed, str): failed = [failed] - if isinstance(env_changed, str): - env_changed = [env_changed] if isinstance(omitted, str): omitted = [omitted] + ntest = len(tests) + nskipped = len(skipped) + nfailed = len(failed) + nomitted = len(omitted) executed = self.parse_executed_tests(output) if randomize: @@ -426,17 +396,11 @@ class BaseTestCase(unittest.TestCase): regex = list_regex('%s test%s failed', failed) self.check_line(output, regex) - if env_changed: - regex = list_regex('%s test%s altered the execution environment', - env_changed) - self.check_line(output, regex) - if omitted: regex = list_regex('%s test%s omitted', omitted) self.check_line(output, regex) - good = (len(tests) - len(skipped) - len(failed) - - len(omitted) - len(env_changed)) + good = ntest - nskipped - nfailed - nomitted if good: regex = r'%s test%s OK\.$' % (good, plural(good)) if not skipped and not failed and good > 1: @@ -446,12 +410,10 @@ class BaseTestCase(unittest.TestCase): if interrupted: self.check_line(output, 'Test suite interrupted by signal SIGINT.') - if failed: + if nfailed: result = 'FAILURE' elif interrupted: result = 'INTERRUPTED' - elif fail_env_changed and env_changed: - result = 'ENV CHANGED' else: result = 'SUCCESS' self.check_line(output, 'Tests result: %s' % result) @@ -490,6 +452,7 @@ class BaseTestCase(unittest.TestCase): self.fail(msg) return proc + def run_python(self, args, **kw): args = [sys.executable, '-X', 'faulthandler', '-I', *args] proc = self.run_command(args, **kw) @@ -623,7 +586,7 @@ class ArgsTestCase(BaseTestCase): test_failing = self.create_test('failing', code=code) tests = [test_ok, test_failing] - output = self.run_tests(*tests, exitcode=2) + output = self.run_tests(*tests, exitcode=1) self.check_executed_tests(output, tests, failed=test_failing) def test_resources(self): @@ -711,18 +674,10 @@ class ArgsTestCase(BaseTestCase): output = self.run_tests('--fromfile', filename) self.check_executed_tests(output, tests) - # test format 'Lib/test/test_opcodes.py' - with open(filename, "w") as fp: - for name in tests: - print('Lib/test/%s.py' % name, file=fp) - - output = self.run_tests('--fromfile', filename) - self.check_executed_tests(output, tests) - def test_interrupted(self): code = TEST_INTERRUPTED test = self.create_test('sigint', code=code) - output = self.run_tests(test, exitcode=130) + output = self.run_tests(test, exitcode=1) self.check_executed_tests(output, test, omitted=test, interrupted=True) @@ -751,7 +706,7 @@ class ArgsTestCase(BaseTestCase): args = ("--slowest", "-j2", test) else: args = ("--slowest", test) - output = self.run_tests(*args, exitcode=130) + output = self.run_tests(*args, exitcode=1) self.check_executed_tests(output, test, omitted=test, interrupted=True) @@ -791,43 +746,52 @@ class ArgsTestCase(BaseTestCase): builtins.__dict__['RUN'] = 1 """) test = self.create_test('forever', code=code) - output = self.run_tests('--forever', test, exitcode=2) + output = self.run_tests('--forever', test, exitcode=1) self.check_executed_tests(output, [test]*3, failed=test) - def check_leak(self, code, what): + @unittest.skipUnless(Py_DEBUG, 'need a debug build') + def test_huntrleaks_fd_leak(self): + # test --huntrleaks for file descriptor leak + code = textwrap.dedent(""" + import os + import unittest + + # Issue #25306: Disable popups and logs to stderr on assertion + # failures in MSCRT + try: + import msvcrt + msvcrt.CrtSetReportMode + except (ImportError, AttributeError): + # no Windows, o release build + pass + else: + for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]: + msvcrt.CrtSetReportMode(m, 0) + + class FDLeakTest(unittest.TestCase): + def test_leak(self): + fd = os.open(__file__, os.O_RDONLY) + # bug: never cloes the file descriptor + """) test = self.create_test('huntrleaks', code=code) filename = 'reflog.txt' self.addCleanup(support.unlink, filename) output = self.run_tests('--huntrleaks', '3:3:', test, - exitcode=2, + exitcode=1, stderr=subprocess.STDOUT) self.check_executed_tests(output, [test], failed=test) line = 'beginning 6 repetitions\n123456\n......\n' self.check_line(output, re.escape(line)) - line2 = '%s leaked [1, 1, 1] %s, sum=3\n' % (test, what) + line2 = '%s leaked [1, 1, 1] file descriptors, sum=3\n' % test self.assertIn(line2, output) with open(filename) as fp: reflog = fp.read() self.assertIn(line2, reflog) - @unittest.skipUnless(Py_DEBUG, 'need a debug build') - def test_huntrleaks(self): - # test --huntrleaks - code = textwrap.dedent(""" - import unittest - - GLOBAL_LIST = [] - - class RefLeakTest(unittest.TestCase): - def test_leak(self): - GLOBAL_LIST.append(object()) - """) - self.check_leak(code, 'references') - def test_list_tests(self): # test --list-tests tests = [self.create_test() for i in range(5)] @@ -835,107 +799,6 @@ class ArgsTestCase(BaseTestCase): self.assertEqual(output.rstrip().splitlines(), tests) - def test_list_cases(self): - # test --list-cases - code = textwrap.dedent(""" - import unittest - - class Tests(unittest.TestCase): - def test_method1(self): - pass - def test_method2(self): - pass - """) - testname = self.create_test(code=code) - - # Test --list-cases - all_methods = ['%s.Tests.test_method1' % testname, - '%s.Tests.test_method2' % testname] - output = self.run_tests('--list-cases', testname) - self.assertEqual(output.splitlines(), all_methods) - - # Test --list-cases with --match - all_methods = ['%s.Tests.test_method1' % testname] - output = self.run_tests('--list-cases', - '-m', 'test_method1', - testname) - self.assertEqual(output.splitlines(), all_methods) - - def test_crashed(self): - # Any code which causes a crash - code = 'import faulthandler; faulthandler._sigsegv()' - crash_test = self.create_test(name="crash", code=code) - ok_test = self.create_test(name="ok") - - tests = [crash_test, ok_test] - output = self.run_tests("-j2", *tests, exitcode=2) - self.check_executed_tests(output, tests, failed=crash_test, - randomize=True) - - def parse_methods(self, output): - regex = re.compile("^(test[^ ]+).*ok$", flags=re.MULTILINE) - return [match.group(1) for match in regex.finditer(output)] - - def test_matchfile(self): - code = textwrap.dedent(""" - import unittest - - class Tests(unittest.TestCase): - def test_method1(self): - pass - def test_method2(self): - pass - def test_method3(self): - pass - def test_method4(self): - pass - """) - all_methods = ['test_method1', 'test_method2', - 'test_method3', 'test_method4'] - testname = self.create_test(code=code) - - # by default, all methods should be run - output = self.run_tests("-v", testname) - methods = self.parse_methods(output) - self.assertEqual(methods, all_methods) - - # only run a subset - filename = support.TESTFN - self.addCleanup(support.unlink, filename) - - subset = [ - # only match the method name - 'test_method1', - # match the full identifier - '%s.Tests.test_method3' % testname] - with open(filename, "w") as fp: - for name in subset: - print(name, file=fp) - - output = self.run_tests("-v", "--matchfile", filename, testname) - methods = self.parse_methods(output) - subset = ['test_method1', 'test_method3'] - self.assertEqual(methods, subset) - - def test_env_changed(self): - code = textwrap.dedent(""" - import unittest - - class Tests(unittest.TestCase): - def test_env_changed(self): - open("env_changed", "w").close() - """) - testname = self.create_test(code=code) - - # don't fail by default - output = self.run_tests(testname) - self.check_executed_tests(output, [testname], env_changed=testname) - - # fail with --fail-env-changed - output = self.run_tests("--fail-env-changed", testname, exitcode=3) - self.check_executed_tests(output, [testname], env_changed=testname, - fail_env_changed=True) - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index cc9c570..2ecae0f 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -158,20 +158,6 @@ class ResourceTest(unittest.TestCase): self.assertEqual(resource.prlimit(0, resource.RLIMIT_AS, limit), limit) - # Issue 20191: Reference counting bug - @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') - @support.requires_linux_version(2, 6, 36) - def test_prlimit_refcount(self): - class BadSeq: - def __len__(self): - return 2 - def __getitem__(self, key): - return limits[key] - 1 # new reference - - limits = resource.getrlimit(resource.RLIMIT_AS) - self.assertEqual(resource.prlimit(0, resource.RLIMIT_AS, BadSeq()), - limits) - def test_main(verbose=None): support.run_unittest(ResourceTest) diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py index 1582caa..58729a9 100644 --- a/Lib/test/test_richcmp.py +++ b/Lib/test/test_richcmp.py @@ -253,6 +253,31 @@ class MiscTest(unittest.TestCase): self.assertTrue(a != b) self.assertTrue(a < b) + def test_exception_message(self): + class Spam: + pass + + tests = [ + (lambda: 42 < None, r"'<' .* of 'int' and 'NoneType'"), + (lambda: None < 42, r"'<' .* of 'NoneType' and 'int'"), + (lambda: 42 > None, r"'>' .* of 'int' and 'NoneType'"), + (lambda: "foo" < None, r"'<' .* of 'str' and 'NoneType'"), + (lambda: "foo" >= 666, r"'>=' .* of 'str' and 'int'"), + (lambda: 42 <= None, r"'<=' .* of 'int' and 'NoneType'"), + (lambda: 42 >= None, r"'>=' .* of 'int' and 'NoneType'"), + (lambda: 42 < [], r"'<' .* of 'int' and 'list'"), + (lambda: () > [], r"'>' .* of 'tuple' and 'list'"), + (lambda: None >= None, r"'>=' .* of 'NoneType' and 'NoneType'"), + (lambda: Spam() < 42, r"'<' .* of 'Spam' and 'int'"), + (lambda: 42 < Spam(), r"'<' .* of 'int' and 'Spam'"), + (lambda: Spam() <= Spam(), r"'<=' .* of 'Spam' and 'Spam'"), + ] + for i, test in enumerate(tests): + with self.subTest(test=i): + with self.assertRaisesRegex(TypeError, test[1]): + test[0]() + + class DictTest(unittest.TestCase): def test_dicts(self): diff --git a/Lib/test/test_rlcompleter.py b/Lib/test/test_rlcompleter.py index 853e773..0dc1080 100644 --- a/Lib/test/test_rlcompleter.py +++ b/Lib/test/test_rlcompleter.py @@ -1,11 +1,12 @@ import unittest -import unittest.mock +from unittest.mock import patch import builtins import rlcompleter class CompleteMe: """ Trivial class used in testing rlcompleter.Completer. """ spam = 1 + _ham = 2 class TestRlcompleter(unittest.TestCase): @@ -52,18 +53,32 @@ class TestRlcompleter(unittest.TestCase): ['str.{}('.format(x) for x in dir(str) if x.startswith('s')]) self.assertEqual(self.stdcompleter.attr_matches('tuple.foospamegg'), []) + expected = sorted({'None.%s%s' % (x, '(' if x != '__doc__' else '') + for x in dir(None)}) + self.assertEqual(self.stdcompleter.attr_matches('None.'), expected) + self.assertEqual(self.stdcompleter.attr_matches('None._'), expected) + self.assertEqual(self.stdcompleter.attr_matches('None.__'), expected) # test with a customized namespace self.assertEqual(self.completer.attr_matches('CompleteMe.sp'), ['CompleteMe.spam']) self.assertEqual(self.completer.attr_matches('Completeme.egg'), []) + self.assertEqual(self.completer.attr_matches('CompleteMe.'), + ['CompleteMe.mro(', 'CompleteMe.spam']) + self.assertEqual(self.completer.attr_matches('CompleteMe._'), + ['CompleteMe._ham']) + matches = self.completer.attr_matches('CompleteMe.__') + for x in matches: + self.assertTrue(x.startswith('CompleteMe.__'), x) + self.assertIn('CompleteMe.__name__', matches) + self.assertIn('CompleteMe.__new__(', matches) - CompleteMe.me = CompleteMe - self.assertEqual(self.completer.attr_matches('CompleteMe.me.me.sp'), - ['CompleteMe.me.me.spam']) - self.assertEqual(self.completer.attr_matches('egg.s'), - ['egg.{}('.format(x) for x in dir(str) - if x.startswith('s')]) + with patch.object(CompleteMe, "me", CompleteMe, create=True): + self.assertEqual(self.completer.attr_matches('CompleteMe.me.me.sp'), + ['CompleteMe.me.me.spam']) + self.assertEqual(self.completer.attr_matches('egg.s'), + ['egg.{}('.format(x) for x in dir(str) + if x.startswith('s')]) def test_excessive_getattr(self): # Ensure getattr() is invoked no more than once per attribute @@ -78,14 +93,27 @@ class TestRlcompleter(unittest.TestCase): self.assertEqual(completer.complete('f.b', 0), 'f.bar') self.assertEqual(f.calls, 1) + def test_uncreated_attr(self): + # Attributes like properties and slots should be completed even when + # they haven't been created on an instance + class Foo: + __slots__ = ("bar",) + completer = rlcompleter.Completer(dict(f=Foo())) + self.assertEqual(completer.complete('f.', 0), 'f.bar') + @unittest.mock.patch('rlcompleter._readline_available', False) def test_complete(self): completer = rlcompleter.Completer() self.assertEqual(completer.complete('', 0), '\t') - self.assertEqual(completer.complete('a', 0), 'and') - self.assertEqual(completer.complete('a', 1), 'as') - self.assertEqual(completer.complete('as', 2), 'assert') - self.assertEqual(completer.complete('an', 0), 'and') + self.assertEqual(completer.complete('a', 0), 'and ') + self.assertEqual(completer.complete('a', 1), 'as ') + self.assertEqual(completer.complete('as', 2), 'assert ') + self.assertEqual(completer.complete('an', 0), 'and ') + self.assertEqual(completer.complete('pa', 0), 'pass') + self.assertEqual(completer.complete('Fa', 0), 'False') + self.assertEqual(completer.complete('el', 0), 'elif ') + self.assertEqual(completer.complete('el', 1), 'else') + self.assertEqual(completer.complete('tr', 0), 'try:') def test_duplicate_globals(self): namespace = { @@ -98,9 +126,10 @@ class TestRlcompleter(unittest.TestCase): completer = rlcompleter.Completer(namespace) self.assertEqual(completer.complete('False', 0), 'False') self.assertIsNone(completer.complete('False', 1)) # No duplicates - self.assertEqual(completer.complete('assert', 0), 'assert') + # Space or colon added due to being a reserved keyword + self.assertEqual(completer.complete('assert', 0), 'assert ') self.assertIsNone(completer.complete('assert', 1)) - self.assertEqual(completer.complete('try', 0), 'try') + self.assertEqual(completer.complete('try', 0), 'try:') self.assertIsNone(completer.complete('try', 1)) # No opening bracket "(" because we overrode the built-in class self.assertEqual(completer.complete('memoryview', 0), 'memoryview') diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py index d01266f..0f64ba8 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -1,8 +1,8 @@ import io +import os import unittest import urllib.robotparser -from urllib.error import URLError, HTTPError -from urllib.request import urlopen +from collections import namedtuple from test import support from http.server import BaseHTTPRequestHandler, HTTPServer try: @@ -11,246 +11,239 @@ except ImportError: threading = None -class RobotTestCase(unittest.TestCase): - def __init__(self, index=None, parser=None, url=None, good=None, agent=None): - # workaround to make unittest discovery work (see #17066) - if not isinstance(index, int): - return - unittest.TestCase.__init__(self) - if good: - self.str = "RobotTest(%d, good, %s)" % (index, url) - else: - self.str = "RobotTest(%d, bad, %s)" % (index, url) - self.parser = parser - self.url = url - self.good = good - self.agent = agent - - def runTest(self): - if isinstance(self.url, tuple): - agent, url = self.url - else: - url = self.url - agent = self.agent - if self.good: - self.assertTrue(self.parser.can_fetch(agent, url)) - else: - self.assertFalse(self.parser.can_fetch(agent, url)) - - def __str__(self): - return self.str - -tests = unittest.TestSuite() - -def RobotTest(index, robots_txt, good_urls, bad_urls, - agent="test_robotparser"): - - lines = io.StringIO(robots_txt).readlines() - parser = urllib.robotparser.RobotFileParser() - parser.parse(lines) - for url in good_urls: - tests.addTest(RobotTestCase(index, parser, url, 1, agent)) - for url in bad_urls: - tests.addTest(RobotTestCase(index, parser, url, 0, agent)) - -# Examples from http://www.robotstxt.org/wc/norobots.html (fetched 2002) - -# 1. -doc = """ +class BaseRobotTest: + robots_txt = '' + agent = 'test_robotparser' + good = [] + bad = [] + + def setUp(self): + lines = io.StringIO(self.robots_txt).readlines() + self.parser = urllib.robotparser.RobotFileParser() + self.parser.parse(lines) + + def get_agent_and_url(self, url): + if isinstance(url, tuple): + agent, url = url + return agent, url + return self.agent, url + + def test_good_urls(self): + for url in self.good: + agent, url = self.get_agent_and_url(url) + with self.subTest(url=url, agent=agent): + self.assertTrue(self.parser.can_fetch(agent, url)) + + def test_bad_urls(self): + for url in self.bad: + agent, url = self.get_agent_and_url(url) + with self.subTest(url=url, agent=agent): + self.assertFalse(self.parser.can_fetch(agent, url)) + + +class UserAgentWildcardTest(BaseRobotTest, unittest.TestCase): + robots_txt = """\ User-agent: * Disallow: /cyberworld/map/ # This is an infinite virtual URL space Disallow: /tmp/ # these will soon disappear Disallow: /foo.html -""" - -good = ['/','/test.html'] -bad = ['/cyberworld/map/index.html','/tmp/xxx','/foo.html'] + """ + good = ['/', '/test.html'] + bad = ['/cyberworld/map/index.html', '/tmp/xxx', '/foo.html'] -RobotTest(1, doc, good, bad) -# 2. -doc = """ +class CrawlDelayAndCustomAgentTest(BaseRobotTest, unittest.TestCase): + robots_txt = """\ # robots.txt for http://www.example.com/ User-agent: * +Crawl-delay: 1 +Request-rate: 3/15 Disallow: /cyberworld/map/ # This is an infinite virtual URL space # Cybermapper knows where to go. User-agent: cybermapper Disallow: + """ + good = ['/', '/test.html', ('cybermapper', '/cyberworld/map/index.html')] + bad = ['/cyberworld/map/index.html'] -""" - -good = ['/','/test.html',('cybermapper','/cyberworld/map/index.html')] -bad = ['/cyberworld/map/index.html'] - -RobotTest(2, doc, good, bad) -# 3. -doc = """ +class RejectAllRobotsTest(BaseRobotTest, unittest.TestCase): + robots_txt = """\ # go away User-agent: * Disallow: / -""" - -good = [] -bad = ['/cyberworld/map/index.html','/','/tmp/'] - -RobotTest(3, doc, good, bad) - -# Examples from http://www.robotstxt.org/wc/norobots-rfc.html (fetched 2002) - -# 4. -doc = """ + """ + good = [] + bad = ['/cyberworld/map/index.html', '/', '/tmp/'] + + +class BaseRequestRateTest(BaseRobotTest): + + def test_request_rate(self): + for url in self.good + self.bad: + agent, url = self.get_agent_and_url(url) + with self.subTest(url=url, agent=agent): + if self.crawl_delay: + self.assertEqual( + self.parser.crawl_delay(agent), self.crawl_delay + ) + if self.request_rate: + self.assertEqual( + self.parser.request_rate(agent).requests, + self.request_rate.requests + ) + self.assertEqual( + self.parser.request_rate(agent).seconds, + self.request_rate.seconds + ) + + +class CrawlDelayAndRequestRateTest(BaseRequestRateTest, unittest.TestCase): + robots_txt = """\ User-agent: figtree +Crawl-delay: 3 +Request-rate: 9/30 Disallow: /tmp Disallow: /a%3cd.html Disallow: /a%2fb.html Disallow: /%7ejoe/index.html -""" + """ + agent = 'figtree' + request_rate = namedtuple('req_rate', 'requests seconds')(9, 30) + crawl_delay = 3 + good = [('figtree', '/foo.html')] + bad = ['/tmp', '/tmp.html', '/tmp/a.html', '/a%3cd.html', '/a%3Cd.html', + '/a%2fb.html', '/~joe/index.html'] + -good = [] # XFAIL '/a/b.html' -bad = ['/tmp','/tmp.html','/tmp/a.html', - '/a%3cd.html','/a%3Cd.html','/a%2fb.html', - '/~joe/index.html' - ] +class DifferentAgentTest(CrawlDelayAndRequestRateTest): + agent = 'FigTree Robot libwww-perl/5.04' + # these are not actually tested, but we still need to parse it + # in order to accommodate the input parameters + request_rate = None + crawl_delay = None -RobotTest(4, doc, good, bad, 'figtree') -RobotTest(5, doc, good, bad, 'FigTree Robot libwww-perl/5.04') -# 6. -doc = """ +class InvalidRequestRateTest(BaseRobotTest, unittest.TestCase): + robots_txt = """\ User-agent: * Disallow: /tmp/ Disallow: /a%3Cd.html Disallow: /a/b.html Disallow: /%7ejoe/index.html -""" - -good = ['/tmp',] # XFAIL: '/a%2fb.html' -bad = ['/tmp/','/tmp/a.html', - '/a%3cd.html','/a%3Cd.html',"/a/b.html", - '/%7Ejoe/index.html'] - -RobotTest(6, doc, good, bad) - -# From bug report #523041 - -# 7. -doc = """ +Crawl-delay: 3 +Request-rate: 9/banana + """ + good = ['/tmp'] + bad = ['/tmp/', '/tmp/a.html', '/a%3cd.html', '/a%3Cd.html', '/a/b.html', + '/%7Ejoe/index.html'] + crawl_delay = 3 + + +class InvalidCrawlDelayTest(BaseRobotTest, unittest.TestCase): + # From bug report #523041 + robots_txt = """\ User-Agent: * Disallow: /. -""" - -good = ['/foo.html'] -bad = [] # Bug report says "/" should be denied, but that is not in the RFC +Crawl-delay: pears + """ + good = ['/foo.html'] + # bug report says "/" should be denied, but that is not in the RFC + bad = [] -RobotTest(7, doc, good, bad) -# From Google: http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=40364 - -# 8. -doc = """ +class AnotherInvalidRequestRateTest(BaseRobotTest, unittest.TestCase): + # also test that Allow and Diasallow works well with each other + robots_txt = """\ User-agent: Googlebot Allow: /folder1/myfile.html Disallow: /folder1/ -""" - -good = ['/folder1/myfile.html'] -bad = ['/folder1/anotherfile.html'] - -RobotTest(8, doc, good, bad, agent="Googlebot") - -# 9. This file is incorrect because "Googlebot" is a substring of -# "Googlebot-Mobile", so test 10 works just like test 9. -doc = """ +Request-rate: whale/banana + """ + agent = 'Googlebot' + good = ['/folder1/myfile.html'] + bad = ['/folder1/anotherfile.html'] + + +class UserAgentOrderingTest(BaseRobotTest, unittest.TestCase): + # the order of User-agent should be correct. note + # that this file is incorrect because "Googlebot" is a + # substring of "Googlebot-Mobile" + robots_txt = """\ User-agent: Googlebot Disallow: / User-agent: Googlebot-Mobile Allow: / -""" - -good = [] -bad = ['/something.jpg'] + """ + agent = 'Googlebot' + bad = ['/something.jpg'] -RobotTest(9, doc, good, bad, agent="Googlebot") -good = [] -bad = ['/something.jpg'] +class UserAgentGoogleMobileTest(UserAgentOrderingTest): + agent = 'Googlebot-Mobile' -RobotTest(10, doc, good, bad, agent="Googlebot-Mobile") - -# 11. Get the order correct. -doc = """ -User-agent: Googlebot-Mobile -Allow: / -User-agent: Googlebot -Disallow: / -""" - -good = [] -bad = ['/something.jpg'] - -RobotTest(11, doc, good, bad, agent="Googlebot") - -good = ['/something.jpg'] -bad = [] - -RobotTest(12, doc, good, bad, agent="Googlebot-Mobile") - - -# 13. Google also got the order wrong in #8. You need to specify the -# URLs from more specific to more general. -doc = """ +class GoogleURLOrderingTest(BaseRobotTest, unittest.TestCase): + # Google also got the order wrong. You need + # to specify the URLs from more specific to more general + robots_txt = """\ User-agent: Googlebot Allow: /folder1/myfile.html Disallow: /folder1/ -""" - -good = ['/folder1/myfile.html'] -bad = ['/folder1/anotherfile.html'] - -RobotTest(13, doc, good, bad, agent="googlebot") + """ + agent = 'googlebot' + good = ['/folder1/myfile.html'] + bad = ['/folder1/anotherfile.html'] -# 14. For issue #6325 (query string support) -doc = """ +class DisallowQueryStringTest(BaseRobotTest, unittest.TestCase): + # see issue #6325 for details + robots_txt = """\ User-agent: * Disallow: /some/path?name=value -""" + """ + good = ['/some/path'] + bad = ['/some/path?name=value'] -good = ['/some/path'] -bad = ['/some/path?name=value'] -RobotTest(14, doc, good, bad) - -# 15. For issue #4108 (obey first * entry) -doc = """ +class UseFirstUserAgentWildcardTest(BaseRobotTest, unittest.TestCase): + # obey first * entry (#4108) + robots_txt = """\ User-agent: * Disallow: /some/path User-agent: * Disallow: /another/path -""" - -good = ['/another/path'] -bad = ['/some/path'] + """ + good = ['/another/path'] + bad = ['/some/path'] -RobotTest(15, doc, good, bad) -# 16. Empty query (issue #17403). Normalizing the url first. -doc = """ +class EmptyQueryStringTest(BaseRobotTest, unittest.TestCase): + # normalize the URL first (#17403) + robots_txt = """\ User-agent: * Allow: /some/path? Disallow: /another/path? -""" + """ + good = ['/some/path?'] + bad = ['/another/path?'] -good = ['/some/path?'] -bad = ['/another/path?'] -RobotTest(16, doc, good, bad) +class DefaultEntryTest(BaseRequestRateTest, unittest.TestCase): + robots_txt = """\ +User-agent: * +Crawl-delay: 1 +Request-rate: 3/15 +Disallow: /cyberworld/map/ + """ + request_rate = namedtuple('req_rate', 'requests seconds')(3, 15) + crawl_delay = 1 + good = ['/', '/test.html'] + bad = ['/cyberworld/map/index.html'] class RobotHandler(BaseHTTPRequestHandler): @@ -283,9 +276,7 @@ class PasswordProtectedSiteTestCase(unittest.TestCase): self.t.join() self.server.server_close() - def runTest(self): - self.testPasswordProtectedSite() - + @support.reap_threads def testPasswordProtectedSite(self): addr = self.server.server_address url = 'http://' + support.HOST + ':' + str(addr[1]) @@ -295,26 +286,47 @@ class PasswordProtectedSiteTestCase(unittest.TestCase): parser.read() self.assertFalse(parser.can_fetch("*", robots_url)) - def __str__(self): - return '%s' % self.__class__.__name__ class NetworkTestCase(unittest.TestCase): - @unittest.skip('does not handle the gzip encoding delivered by pydotorg') - def testPythonOrg(self): + base_url = 'http://www.pythontest.net/' + robots_txt = '{}elsewhere/robots.txt'.format(base_url) + + @classmethod + def setUpClass(cls): support.requires('network') - with support.transient_internet('www.python.org'): - parser = urllib.robotparser.RobotFileParser( - "http://www.python.org/robots.txt") - parser.read() - self.assertTrue( - parser.can_fetch("*", "http://www.python.org/robots.txt")) - -def load_tests(loader, suite, pattern): - suite = unittest.makeSuite(NetworkTestCase) - suite.addTest(tests) - suite.addTest(PasswordProtectedSiteTestCase()) - return suite + with support.transient_internet(cls.base_url): + cls.parser = urllib.robotparser.RobotFileParser(cls.robots_txt) + cls.parser.read() + + def url(self, path): + return '{}{}{}'.format( + self.base_url, path, '/' if not os.path.splitext(path)[1] else '' + ) + + def test_basic(self): + self.assertFalse(self.parser.disallow_all) + self.assertFalse(self.parser.allow_all) + self.assertGreater(self.parser.mtime(), 0) + self.assertFalse(self.parser.crawl_delay('*')) + self.assertFalse(self.parser.request_rate('*')) + + def test_can_fetch(self): + self.assertTrue(self.parser.can_fetch('*', self.url('elsewhere'))) + self.assertFalse(self.parser.can_fetch('Nutch', self.base_url)) + self.assertFalse(self.parser.can_fetch('Nutch', self.url('brian'))) + self.assertFalse(self.parser.can_fetch('Nutch', self.url('webstats'))) + self.assertFalse(self.parser.can_fetch('*', self.url('webstats'))) + self.assertTrue(self.parser.can_fetch('*', self.base_url)) + + def test_read_404(self): + parser = urllib.robotparser.RobotFileParser(self.url('i-robot.txt')) + parser.read() + self.assertTrue(parser.allow_all) + self.assertFalse(parser.disallow_all) + self.assertEqual(parser.mtime(), 0) + self.assertIsNone(parser.crawl_delay('*')) + self.assertIsNone(parser.request_rate('*')) if __name__=='__main__': unittest.main() diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py index db55db7..02b4d62 100644 --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -577,13 +577,14 @@ from ..uncle.cousin import nephew self.addCleanup(self._del_pkg, pkg_dir) for depth in range(2, max_depth+1): self._add_relative_modules(pkg_dir, "", depth) - for finder, mod_name, ispkg in pkgutil.walk_packages([pkg_dir]): - self.assertIsInstance(finder, + for moduleinfo in pkgutil.walk_packages([pkg_dir]): + self.assertIsInstance(moduleinfo, pkgutil.ModuleInfo) + self.assertIsInstance(moduleinfo.module_finder, importlib.machinery.FileFinder) - if ispkg: - expected_packages.remove(mod_name) + if moduleinfo.ispkg: + expected_packages.remove(moduleinfo.name) else: - expected_modules.remove(mod_name) + expected_modules.remove(moduleinfo.name) self.assertEqual(len(expected_packages), 0, expected_packages) self.assertEqual(len(expected_modules), 0, expected_modules) diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py index 2eb6290..2411895 100644 --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -4,7 +4,6 @@ from xml.sax import make_parser, ContentHandler, \ SAXException, SAXReaderNotAvailable, SAXParseException import unittest -from unittest import mock try: make_parser() except SAXReaderNotAvailable: @@ -176,8 +175,12 @@ class ParseTest(unittest.TestCase): with self.assertRaises(SAXException): self.check_parse(BytesIO(xml_bytes(self.data, 'iso-8859-1', None))) make_xml_file(self.data, 'iso-8859-1', None) - with self.assertRaises(SAXException): - self.check_parse(TESTFN) + with support.check_warnings(('unclosed file', ResourceWarning)): + # XXX Failed parser leaks an opened file. + with self.assertRaises(SAXException): + self.check_parse(TESTFN) + # Collect leaked file. + gc.collect() with open(TESTFN, 'rb') as f: with self.assertRaises(SAXException): self.check_parse(f) @@ -191,21 +194,6 @@ class ParseTest(unittest.TestCase): input.setEncoding('iso-8859-1') self.check_parse(input) - def test_parse_close_source(self): - builtin_open = open - fileobj = None - - def mock_open(*args): - nonlocal fileobj - fileobj = builtin_open(*args) - return fileobj - - with mock.patch('xml.sax.saxutils.open', side_effect=mock_open): - make_xml_file(self.data, 'iso-8859-1', None) - with self.assertRaises(SAXException): - self.check_parse(TESTFN) - self.assertTrue(fileobj.closed) - def check_parseString(self, s): from xml.sax import parseString result = StringIO() diff --git a/Lib/test/test_sched.py b/Lib/test/test_sched.py index fe8e785..ebf8856 100644 --- a/Lib/test/test_sched.py +++ b/Lib/test/test_sched.py @@ -2,7 +2,6 @@ import queue import sched import time import unittest -from test import support try: import threading except ImportError: @@ -173,17 +172,23 @@ class TestCase(unittest.TestCase): self.assertEqual(scheduler.queue, [e1, e2, e3, e4, e5]) def test_args_kwargs(self): - flag = [] - + seq = [] def fun(*a, **b): - flag.append(None) - self.assertEqual(a, (1,2,3)) - self.assertEqual(b, {"foo":1}) + seq.append((a, b)) + now = time.time() scheduler = sched.scheduler(time.time, time.sleep) - z = scheduler.enterabs(0.01, 1, fun, argument=(1,2,3), kwargs={"foo":1}) + scheduler.enterabs(now, 1, fun) + scheduler.enterabs(now, 1, fun, argument=(1, 2)) + scheduler.enterabs(now, 1, fun, argument=('a', 'b')) + scheduler.enterabs(now, 1, fun, argument=(1, 2), kwargs={"foo": 3}) scheduler.run() - self.assertEqual(flag, [None]) + self.assertCountEqual(seq, [ + ((), {}), + ((1, 2), {}), + (('a', 'b'), {}), + ((1, 2), {'foo': 3}) + ]) def test_run_non_blocking(self): l = [] diff --git a/Lib/test/test_secrets.py b/Lib/test/test_secrets.py new file mode 100644 index 0000000..4c65cf0 --- /dev/null +++ b/Lib/test/test_secrets.py @@ -0,0 +1,123 @@ +"""Test the secrets module. + +As most of the functions in secrets are thin wrappers around functions +defined elsewhere, we don't need to test them exhaustively. +""" + + +import secrets +import unittest +import string + + +# === Unit tests === + +class Compare_Digest_Tests(unittest.TestCase): + """Test secrets.compare_digest function.""" + + def test_equal(self): + # Test compare_digest functionality with equal (byte/text) strings. + for s in ("a", "bcd", "xyz123"): + a = s*100 + b = s*100 + self.assertTrue(secrets.compare_digest(a, b)) + self.assertTrue(secrets.compare_digest(a.encode('utf-8'), b.encode('utf-8'))) + + def test_unequal(self): + # Test compare_digest functionality with unequal (byte/text) strings. + self.assertFalse(secrets.compare_digest("abc", "abcd")) + self.assertFalse(secrets.compare_digest(b"abc", b"abcd")) + for s in ("x", "mn", "a1b2c3"): + a = s*100 + "q" + b = s*100 + "k" + self.assertFalse(secrets.compare_digest(a, b)) + self.assertFalse(secrets.compare_digest(a.encode('utf-8'), b.encode('utf-8'))) + + def test_bad_types(self): + # Test that compare_digest raises with mixed types. + a = 'abcde' + b = a.encode('utf-8') + assert isinstance(a, str) + assert isinstance(b, bytes) + self.assertRaises(TypeError, secrets.compare_digest, a, b) + self.assertRaises(TypeError, secrets.compare_digest, b, a) + + def test_bool(self): + # Test that compare_digest returns a bool. + self.assertIsInstance(secrets.compare_digest("abc", "abc"), bool) + self.assertIsInstance(secrets.compare_digest("abc", "xyz"), bool) + + +class Random_Tests(unittest.TestCase): + """Test wrappers around SystemRandom methods.""" + + def test_randbits(self): + # Test randbits. + errmsg = "randbits(%d) returned %d" + for numbits in (3, 12, 30): + for i in range(6): + n = secrets.randbits(numbits) + self.assertTrue(0 <= n < 2**numbits, errmsg % (numbits, n)) + + def test_choice(self): + # Test choice. + items = [1, 2, 4, 8, 16, 32, 64] + for i in range(10): + self.assertTrue(secrets.choice(items) in items) + + def test_randbelow(self): + # Test randbelow. + for i in range(2, 10): + self.assertIn(secrets.randbelow(i), range(i)) + self.assertRaises(ValueError, secrets.randbelow, 0) + + +class Token_Tests(unittest.TestCase): + """Test token functions.""" + + def test_token_defaults(self): + # Test that token_* functions handle default size correctly. + for func in (secrets.token_bytes, secrets.token_hex, + secrets.token_urlsafe): + with self.subTest(func=func): + name = func.__name__ + try: + func() + except TypeError: + self.fail("%s cannot be called with no argument" % name) + try: + func(None) + except TypeError: + self.fail("%s cannot be called with None" % name) + size = secrets.DEFAULT_ENTROPY + self.assertEqual(len(secrets.token_bytes(None)), size) + self.assertEqual(len(secrets.token_hex(None)), 2*size) + + def test_token_bytes(self): + # Test token_bytes. + for n in (1, 8, 17, 100): + with self.subTest(n=n): + self.assertIsInstance(secrets.token_bytes(n), bytes) + self.assertEqual(len(secrets.token_bytes(n)), n) + + def test_token_hex(self): + # Test token_hex. + for n in (1, 12, 25, 90): + with self.subTest(n=n): + s = secrets.token_hex(n) + self.assertIsInstance(s, str) + self.assertEqual(len(s), 2*n) + self.assertTrue(all(c in string.hexdigits for c in s)) + + def test_token_urlsafe(self): + # Test token_urlsafe. + legal = string.ascii_letters + string.digits + '-_' + for n in (1, 11, 28, 76): + with self.subTest(n=n): + s = secrets.token_urlsafe(n) + self.assertIsInstance(s, str) + self.assertTrue(all(c in legal for c in s)) + + +if __name__ == '__main__': + unittest.main() diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 7594303..0202981 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -6,10 +6,11 @@ import operator import copy import pickle from random import randrange, shuffle -import sys import warnings import collections import collections.abc +import itertools +import string class PassThru(Exception): pass @@ -729,6 +730,25 @@ class TestFrozenSet(TestJointOps, unittest.TestCase): addhashvalue(hash(frozenset([e for e, m in elemmasks if m&i]))) self.assertEqual(len(hashvalues), 2**n) + def zf_range(n): + # https://en.wikipedia.org/wiki/Set-theoretic_definition_of_natural_numbers + nums = [frozenset()] + for i in range(n-1): + num = frozenset(nums) + nums.append(num) + return nums[:n] + + def powerset(s): + for i in range(len(s)+1): + yield from map(frozenset, itertools.combinations(s, i)) + + for n in range(18): + t = 2 ** n + mask = t - 1 + for nums in (range, zf_range): + u = len({h & mask for h in map(hash, powerset(nums(n)))}) + self.assertGreater(4*u, t) + class FrozenSetSubclass(frozenset): pass diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py index 55b533d..3936c97 100644 --- a/Lib/test/test_shlex.py +++ b/Lib/test/test_shlex.py @@ -173,16 +173,116 @@ class ShlexTest(unittest.TestCase): "%s: %s != %s" % (self.data[i][0], l, self.data[i][1:])) + def testSyntaxSplitAmpersandAndPipe(self): + """Test handling of syntax splitting of &, |""" + # Could take these forms: &&, &, |&, ;&, ;;& + # of course, the same applies to | and || + # these should all parse to the same output + for delimiter in ('&&', '&', '|&', ';&', ';;&', + '||', '|', '&|', ';|', ';;|'): + src = ['echo hi %s echo bye' % delimiter, + 'echo hi%secho bye' % delimiter] + ref = ['echo', 'hi', delimiter, 'echo', 'bye'] + for ss in src: + s = shlex.shlex(ss, punctuation_chars=True) + result = list(s) + self.assertEqual(ref, result, "While splitting '%s'" % ss) + + def testSyntaxSplitSemicolon(self): + """Test handling of syntax splitting of ;""" + # Could take these forms: ;, ;;, ;&, ;;& + # these should all parse to the same output + for delimiter in (';', ';;', ';&', ';;&'): + src = ['echo hi %s echo bye' % delimiter, + 'echo hi%s echo bye' % delimiter, + 'echo hi%secho bye' % delimiter] + ref = ['echo', 'hi', delimiter, 'echo', 'bye'] + for ss in src: + s = shlex.shlex(ss, punctuation_chars=True) + result = list(s) + self.assertEqual(ref, result, "While splitting '%s'" % ss) + + def testSyntaxSplitRedirect(self): + """Test handling of syntax splitting of >""" + # of course, the same applies to <, | + # these should all parse to the same output + for delimiter in ('<', '|'): + src = ['echo hi %s out' % delimiter, + 'echo hi%s out' % delimiter, + 'echo hi%sout' % delimiter] + ref = ['echo', 'hi', delimiter, 'out'] + for ss in src: + s = shlex.shlex(ss, punctuation_chars=True) + result = list(s) + self.assertEqual(ref, result, "While splitting '%s'" % ss) + + def testSyntaxSplitParen(self): + """Test handling of syntax splitting of ()""" + # these should all parse to the same output + src = ['( echo hi )', + '(echo hi)'] + ref = ['(', 'echo', 'hi', ')'] + for ss in src: + s = shlex.shlex(ss, punctuation_chars=True) + result = list(s) + self.assertEqual(ref, result, "While splitting '%s'" % ss) + + def testSyntaxSplitCustom(self): + """Test handling of syntax splitting with custom chars""" + ref = ['~/a', '&', '&', 'b-c', '--color=auto', '||', 'd', '*.py?'] + ss = "~/a && b-c --color=auto || d *.py?" + s = shlex.shlex(ss, punctuation_chars="|") + result = list(s) + self.assertEqual(ref, result, "While splitting '%s'" % ss) + + def testTokenTypes(self): + """Test that tokens are split with types as expected.""" + for source, expected in ( + ('a && b || c', + [('a', 'a'), ('&&', 'c'), ('b', 'a'), + ('||', 'c'), ('c', 'a')]), + ): + s = shlex.shlex(source, punctuation_chars=True) + observed = [] + while True: + t = s.get_token() + if t == s.eof: + break + if t[0] in s.punctuation_chars: + tt = 'c' + else: + tt = 'a' + observed.append((t, tt)) + self.assertEqual(observed, expected) + + def testPunctuationInWordChars(self): + """Test that any punctuation chars are removed from wordchars""" + s = shlex.shlex('a_b__c', punctuation_chars='_') + self.assertNotIn('_', s.wordchars) + self.assertEqual(list(s), ['a', '_', 'b', '__', 'c']) + + def testPunctuationWithWhitespaceSplit(self): + """Test that with whitespace_split, behaviour is as expected""" + s = shlex.shlex('a && b || c', punctuation_chars='&') + # whitespace_split is False, so splitting will be based on + # punctuation_chars + self.assertEqual(list(s), ['a', '&&', 'b', '|', '|', 'c']) + s = shlex.shlex('a && b || c', punctuation_chars='&') + s.whitespace_split = True + # whitespace_split is True, so splitting will be based on + # white space + self.assertEqual(list(s), ['a', '&&', 'b', '||', 'c']) + def testEmptyStringHandling(self): """Test that parsing of empty strings is correctly handled.""" # see Issue #21999 expected = ['', ')', 'abc'] - - s = shlex.shlex("'')abc", posix=True) - slist = list(s) - self.assertEqual(slist, expected) + for punct in (False, True): + s = shlex.shlex("'')abc", posix=True, punctuation_chars=punct) + slist = list(s) + self.assertEqual(slist, expected) expected = ["''", ')', 'abc'] - s = shlex.shlex("'')abc") + s = shlex.shlex("'')abc", punctuation_chars=True) self.assertEqual(list(s), expected) def testQuote(self): diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 709feeb..af5f00f 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -19,11 +19,22 @@ from shutil import (make_archive, unregister_unpack_format, get_unpack_formats, SameFileError) import tarfile -import zipfile import warnings from test import support -from test.support import TESTFN, check_warnings, captured_stdout +from test.support import TESTFN, check_warnings, captured_stdout, requires_zlib + +try: + import bz2 + BZ2_SUPPORTED = True +except ImportError: + BZ2_SUPPORTED = False + +try: + import lzma + LZMA_SUPPORTED = True +except ImportError: + LZMA_SUPPORTED = False TESTFN2 = TESTFN + "2" @@ -34,6 +45,12 @@ try: except ImportError: UID_GID_SUPPORT = False +try: + import zipfile + ZIP_SUPPORT = True +except ImportError: + ZIP_SUPPORT = shutil.which('zip') + def _fake_rename(*args, **kwargs): # Pretend the destination path is on a different filesystem. raise OSError(getattr(errno, 'EXDEV', 18), "Invalid cross-device link") @@ -115,9 +132,7 @@ class TestShutil(unittest.TestCase): write_file(os.path.join(victim, 'somefile'), 'foo') victim = os.fsencode(victim) self.assertIsInstance(victim, bytes) - win = (os.name == 'nt') - with self.assertWarns(DeprecationWarning) if win else ExitStack(): - shutil.rmtree(victim) + shutil.rmtree(victim) @support.skip_unless_symlink def test_rmtree_fails_on_symlink(self): @@ -947,7 +962,7 @@ class TestShutil(unittest.TestCase): self.assertEqual(getattr(file1_stat, 'st_flags'), getattr(file2_stat, 'st_flags')) - @support.requires_zlib + @requires_zlib def test_make_tarball(self): # creating something to tar root_dir, base_dir = self._create_files('') @@ -1003,7 +1018,7 @@ class TestShutil(unittest.TestCase): write_file((root_dir, 'outer'), 'xxx') return root_dir, base_dir - @support.requires_zlib + @requires_zlib @unittest.skipUnless(shutil.which('tar'), 'Need the tar command to run') def test_tarfile_vs_tar(self): @@ -1036,7 +1051,8 @@ class TestShutil(unittest.TestCase): self.assertEqual(tarball, base_name + '.tar') self.assertTrue(os.path.isfile(tarball)) - @support.requires_zlib + @requires_zlib + @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') def test_make_zipfile(self): # creating something to zip root_dir, base_dir = self._create_files() @@ -1073,7 +1089,8 @@ class TestShutil(unittest.TestCase): ['dist/', 'dist/sub/', 'dist/sub2/', 'dist/file1', 'dist/file2', 'dist/sub/file3']) - @support.requires_zlib + @requires_zlib + @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') @unittest.skipUnless(shutil.which('zip'), 'Need the zip command to run') def test_zipfile_vs_zip(self): @@ -1099,7 +1116,8 @@ class TestShutil(unittest.TestCase): names2 = zf.namelist() self.assertEqual(sorted(names), sorted(names2)) - @support.requires_zlib + @requires_zlib + @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') @unittest.skipUnless(shutil.which('unzip'), 'Need the unzip command to run') def test_unzip_zipfile(self): @@ -1126,7 +1144,7 @@ class TestShutil(unittest.TestCase): base_name = os.path.join(tmpdir, 'archive') self.assertRaises(ValueError, make_archive, base_name, 'xxx') - @support.requires_zlib + @requires_zlib def test_make_archive_owner_group(self): # testing make_archive with owner and group, with various combinations # this works even if there's not gid/uid support @@ -1154,7 +1172,7 @@ class TestShutil(unittest.TestCase): self.assertTrue(os.path.isfile(res)) - @support.requires_zlib + @requires_zlib @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") def test_tarfile_root_owner(self): root_dir, base_dir = self._create_files() @@ -1199,7 +1217,7 @@ class TestShutil(unittest.TestCase): self.assertEqual(make_archive('test', 'tar'), 'test.tar') self.assertTrue(os.path.isfile('test.tar')) - @support.requires_zlib + @requires_zlib def test_make_zipfile_in_curdir(self): # Issue #21280 root_dir = self.mkdtemp() @@ -1223,46 +1241,33 @@ class TestShutil(unittest.TestCase): formats = [name for name, params in get_archive_formats()] self.assertNotIn('xxx', formats) - def check_unpack_archive(self, format): + @requires_zlib + def test_unpack_archive(self): + formats = ['tar', 'gztar', 'zip'] + if BZ2_SUPPORTED: + formats.append('bztar') + if LZMA_SUPPORTED: + formats.append('xztar') + root_dir, base_dir = self._create_files() expected = rlistdir(root_dir) expected.remove('outer') - - base_name = os.path.join(self.mkdtemp(), 'archive') - filename = make_archive(base_name, format, root_dir, base_dir) - - # let's try to unpack it now - tmpdir2 = self.mkdtemp() - unpack_archive(filename, tmpdir2) - self.assertEqual(rlistdir(tmpdir2), expected) - - # and again, this time with the format specified - tmpdir3 = self.mkdtemp() - unpack_archive(filename, tmpdir3, format=format) - self.assertEqual(rlistdir(tmpdir3), expected) - + for format in formats: + base_name = os.path.join(self.mkdtemp(), 'archive') + filename = make_archive(base_name, format, root_dir, base_dir) + + # let's try to unpack it now + tmpdir2 = self.mkdtemp() + unpack_archive(filename, tmpdir2) + self.assertEqual(rlistdir(tmpdir2), expected) + + # and again, this time with the format specified + tmpdir3 = self.mkdtemp() + unpack_archive(filename, tmpdir3, format=format) + self.assertEqual(rlistdir(tmpdir3), expected) self.assertRaises(shutil.ReadError, unpack_archive, TESTFN) self.assertRaises(ValueError, unpack_archive, TESTFN, format='xxx') - def test_unpack_archive_tar(self): - self.check_unpack_archive('tar') - - @support.requires_zlib - def test_unpack_archive_gztar(self): - self.check_unpack_archive('gztar') - - @support.requires_bz2 - def test_unpack_archive_bztar(self): - self.check_unpack_archive('bztar') - - @support.requires_lzma - def test_unpack_archive_xztar(self): - self.check_unpack_archive('xztar') - - @support.requires_zlib - def test_unpack_archive_zip(self): - self.check_unpack_archive('zip') - def test_unpack_registry(self): formats = get_unpack_formats() @@ -1312,10 +1317,10 @@ class TestShutil(unittest.TestCase): shutil.chown(filename) with self.assertRaises(LookupError): - shutil.chown(filename, user='non-exising username') + shutil.chown(filename, user='non-existing username') with self.assertRaises(LookupError): - shutil.chown(filename, group='non-exising groupname') + shutil.chown(filename, group='non-existing groupname') with self.assertRaises(TypeError): shutil.chown(filename, b'spam') @@ -1864,7 +1869,8 @@ class TermsizeTests(unittest.TestCase): """ try: size = subprocess.check_output(['stty', 'size']).decode().split() - except (FileNotFoundError, subprocess.CalledProcessError): + except (FileNotFoundError, PermissionError, + subprocess.CalledProcessError): self.skipTest("stty invocation failed") expected = (int(size[1]), int(size[0])) # reversed order diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 5c7b31d..ab42ed7 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -22,29 +22,6 @@ except ImportError: _testcapi = None -class HandlerBCalled(Exception): - pass - - -def exit_subprocess(): - """Use os._exit(0) to exit the current subprocess. - - Otherwise, the test catches the SystemExit and continues executing - in parallel with the original test, so you wind up with an - exponential number of tests running concurrently. - """ - os._exit(0) - - -def ignoring_eintr(__func, *args, **kwargs): - try: - return __func(*args, **kwargs) - except OSError as e: - if e.errno != errno.EINTR: - raise - return None - - class GenericTests(unittest.TestCase): @unittest.skipIf(threading is None, "test needs threading module") @@ -63,145 +40,6 @@ class GenericTests(unittest.TestCase): @unittest.skipIf(sys.platform == "win32", "Not valid on Windows") -class InterProcessSignalTests(unittest.TestCase): - MAX_DURATION = 20 # Entire test should last at most 20 sec. - - def setUp(self): - self.using_gc = gc.isenabled() - gc.disable() - - def tearDown(self): - if self.using_gc: - gc.enable() - - def format_frame(self, frame, limit=None): - return ''.join(traceback.format_stack(frame, limit=limit)) - - def handlerA(self, signum, frame): - self.a_called = True - - def handlerB(self, signum, frame): - self.b_called = True - raise HandlerBCalled(signum, self.format_frame(frame)) - - def wait(self, child): - """Wait for child to finish, ignoring EINTR.""" - while True: - try: - child.wait() - return - except OSError as e: - if e.errno != errno.EINTR: - raise - - def run_test(self): - # Install handlers. This function runs in a sub-process, so we - # don't worry about re-setting the default handlers. - signal.signal(signal.SIGHUP, self.handlerA) - signal.signal(signal.SIGUSR1, self.handlerB) - signal.signal(signal.SIGUSR2, signal.SIG_IGN) - signal.signal(signal.SIGALRM, signal.default_int_handler) - - # Variables the signals will modify: - self.a_called = False - self.b_called = False - - # Let the sub-processes know who to send signals to. - pid = os.getpid() - - child = ignoring_eintr(subprocess.Popen, ['kill', '-HUP', str(pid)]) - if child: - self.wait(child) - if not self.a_called: - time.sleep(1) # Give the signal time to be delivered. - self.assertTrue(self.a_called) - self.assertFalse(self.b_called) - self.a_called = False - - # Make sure the signal isn't delivered while the previous - # Popen object is being destroyed, because __del__ swallows - # exceptions. - del child - try: - child = subprocess.Popen(['kill', '-USR1', str(pid)]) - # This wait should be interrupted by the signal's exception. - self.wait(child) - time.sleep(1) # Give the signal time to be delivered. - self.fail('HandlerBCalled exception not raised') - except HandlerBCalled: - self.assertTrue(self.b_called) - self.assertFalse(self.a_called) - - child = ignoring_eintr(subprocess.Popen, ['kill', '-USR2', str(pid)]) - if child: - self.wait(child) # Nothing should happen. - - try: - signal.alarm(1) - # The race condition in pause doesn't matter in this case, - # since alarm is going to raise a KeyboardException, which - # will skip the call. - signal.pause() - # But if another signal arrives before the alarm, pause - # may return early. - time.sleep(1) - except KeyboardInterrupt: - pass - except: - self.fail("Some other exception woke us from pause: %s" % - traceback.format_exc()) - else: - self.fail("pause returned of its own accord, and the signal" - " didn't arrive after another second.") - - # Issue 3864, unknown if this affects earlier versions of freebsd also - @unittest.skipIf(sys.platform=='freebsd6', - 'inter process signals not reliable (do not mix well with threading) ' - 'on freebsd6') - def test_main(self): - # This function spawns a child process to insulate the main - # test-running process from all the signals. It then - # communicates with that child process over a pipe and - # re-raises information about any exceptions the child - # raises. The real work happens in self.run_test(). - os_done_r, os_done_w = os.pipe() - with closing(os.fdopen(os_done_r, 'rb')) as done_r, \ - closing(os.fdopen(os_done_w, 'wb')) as done_w: - child = os.fork() - if child == 0: - # In the child process; run the test and report results - # through the pipe. - try: - done_r.close() - # Have to close done_w again here because - # exit_subprocess() will skip the enclosing with block. - with closing(done_w): - try: - self.run_test() - except: - pickle.dump(traceback.format_exc(), done_w) - else: - pickle.dump(None, done_w) - except: - print('Uh oh, raised from pickle.') - traceback.print_exc() - finally: - exit_subprocess() - - done_w.close() - # Block for up to MAX_DURATION seconds for the test to finish. - r, w, x = select.select([done_r], [], [], self.MAX_DURATION) - if done_r in r: - tb = pickle.load(done_r) - if tb: - self.fail(tb) - else: - os.kill(child, signal.SIGKILL) - self.fail('Test deadlocked after %d seconds.' % - self.MAX_DURATION) - - -@unittest.skipIf(sys.platform == "win32", "Not valid on Windows") class PosixTests(unittest.TestCase): def trivial_signal_handler(self, *args): pass @@ -224,6 +62,15 @@ class PosixTests(unittest.TestCase): signal.signal(signal.SIGHUP, hup) self.assertEqual(signal.getsignal(signal.SIGHUP), hup) + # Issue 3864, unknown if this affects earlier versions of freebsd also + @unittest.skipIf(sys.platform=='freebsd6', + 'inter process signals not reliable (do not mix well with threading) ' + 'on freebsd6') + def test_interprocess_signal(self): + dirname = os.path.dirname(__file__) + script = os.path.join(dirname, 'signalinterproctester.py') + assert_python_ok(script) + @unittest.skipUnless(sys.platform == "win32", "Windows specific") class WindowsSignalTests(unittest.TestCase): @@ -764,15 +611,6 @@ class ItimerTest(unittest.TestCase): # and the handler should have been called self.assertEqual(self.hndl_called, True) - def test_setitimer_tiny(self): - # bpo-30807: C setitimer() takes a microsecond-resolution interval. - # Check that float -> timeval conversion doesn't round - # the interval down to zero, which would disable the timer. - self.itimer = signal.ITIMER_REAL - signal.setitimer(self.itimer, 1e-6) - time.sleep(1) - self.assertEqual(self.hndl_called, True) - class PendingSignalsTests(unittest.TestCase): """ diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 755eb9c..d245fd5 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -14,6 +14,7 @@ import re import encodings import urllib.request import urllib.error +import shutil import subprocess import sysconfig from copy import copy @@ -26,27 +27,14 @@ if sys.flags.no_site: import site - -OLD_SYS_PATH = None - - -def setUpModule(): - global OLD_SYS_PATH - OLD_SYS_PATH = sys.path[:] - - if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE): - # need to add user site directory for tests - try: - os.makedirs(site.USER_SITE) - # modify sys.path: will be restored by tearDownModule() - site.addsitedir(site.USER_SITE) - except PermissionError as exc: - raise unittest.SkipTest('unable to create user site directory (%r): %s' - % (site.USER_SITE, exc)) - - -def tearDownModule(): - sys.path[:] = OLD_SYS_PATH +if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE): + # need to add user site directory for tests + try: + os.makedirs(site.USER_SITE) + site.addsitedir(site.USER_SITE) + except PermissionError as exc: + raise unittest.SkipTest('unable to create user site directory (%r): %s' + % (site.USER_SITE, exc)) class HelperFunctionsTests(unittest.TestCase): @@ -88,7 +76,7 @@ class HelperFunctionsTests(unittest.TestCase): def test_init_pathinfo(self): dir_set = site._init_pathinfo() for entry in [site.makepath(path)[1] for path in sys.path - if path and os.path.isdir(path)]: + if path and os.path.exists(path)]: self.assertIn(entry, dir_set, "%s from sys.path not found in set returned " "by _init_pathinfo(): %s" % (entry, dir_set)) @@ -151,10 +139,8 @@ class HelperFunctionsTests(unittest.TestCase): re.escape(os.path.join(pth_dir, pth_fn))) # XXX: ditto previous XXX comment. self.assertRegex(err_out.getvalue(), 'Traceback') - self.assertRegex(err_out.getvalue(), 'ImportError') + self.assertRegex(err_out.getvalue(), 'ModuleNotFoundError') - @unittest.skipIf(sys.platform == "win32", "Windows does not raise an " - "error for file paths containing null characters") def test_addpackage_import_bad_pth_file(self): # Issue 5258 pth_dir, pth_fn = self.make_pth("abc\x00def\n") @@ -256,13 +242,14 @@ class HelperFunctionsTests(unittest.TestCase): self.assertEqual(len(dirs), 2) wanted = os.path.join('/Library', sysconfig.get_config_var("PYTHONFRAMEWORK"), - sys.version[:3], + '%d.%d' % sys.version_info[:2], 'site-packages') self.assertEqual(dirs[1], wanted) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc self.assertEqual(len(dirs), 1) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + wanted = os.path.join('xoxo', 'lib', + 'python%d.%d' % sys.version_info[:2], 'site-packages') self.assertEqual(dirs[0], wanted) else: @@ -459,10 +446,9 @@ class StartupImportTests(unittest.TestCase): popen = subprocess.Popen([sys.executable, '-I', '-v', '-c', 'import sys; print(set(sys.modules))'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, + encoding='utf-8') stdout, stderr = popen.communicate() - stdout = stdout.decode('utf-8') - stderr = stderr.decode('utf-8') modules = eval(stdout) self.assertIn('site', modules) @@ -482,7 +468,100 @@ class StartupImportTests(unittest.TestCase): 'heapq', 'itertools', 'keyword', 'operator', 'reprlib', 'types', 'weakref' }.difference(sys.builtin_module_names) - self.assertFalse(modules.intersection(collection_mods), stderr) + # http://bugs.python.org/issue28095 + if sys.platform != 'darwin': + self.assertFalse(modules.intersection(collection_mods), stderr) + + def test_startup_interactivehook(self): + r = subprocess.Popen([sys.executable, '-c', + 'import sys; sys.exit(hasattr(sys, "__interactivehook__"))']).wait() + self.assertTrue(r, "'__interactivehook__' not added by site") + + def test_startup_interactivehook_isolated(self): + # issue28192 readline is not automatically enabled in isolated mode + r = subprocess.Popen([sys.executable, '-I', '-c', + 'import sys; sys.exit(hasattr(sys, "__interactivehook__"))']).wait() + self.assertFalse(r, "'__interactivehook__' added in isolated mode") + + def test_startup_interactivehook_isolated_explicit(self): + # issue28192 readline can be explicitly enabled in isolated mode + r = subprocess.Popen([sys.executable, '-I', '-c', + 'import site, sys; site.enablerlcompleter(); sys.exit(hasattr(sys, "__interactivehook__"))']).wait() + self.assertTrue(r, "'__interactivehook__' not added by enablerlcompleter()") + + @classmethod + def _create_underpth_exe(self, lines): + exe_file = os.path.join(os.getenv('TEMP'), os.path.split(sys.executable)[1]) + shutil.copy(sys.executable, exe_file) + + _pth_file = os.path.splitext(exe_file)[0] + '._pth' + try: + with open(_pth_file, 'w') as f: + for line in lines: + print(line, file=f) + return exe_file + except: + os.unlink(_pth_file) + os.unlink(exe_file) + raise + + @classmethod + def _cleanup_underpth_exe(self, exe_file): + _pth_file = os.path.splitext(exe_file)[0] + '._pth' + os.unlink(_pth_file) + os.unlink(exe_file) + + @unittest.skipUnless(sys.platform == 'win32', "only supported on Windows") + def test_underpth_nosite_file(self): + libpath = os.path.dirname(os.path.dirname(encodings.__file__)) + exe_prefix = os.path.dirname(sys.executable) + exe_file = self._create_underpth_exe([ + 'fake-path-name', + *[libpath for _ in range(200)], + '# comment', + 'import site' + ]) + + try: + env = os.environ.copy() + env['PYTHONPATH'] = 'from-env' + env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH')) + rc = subprocess.call([exe_file, '-c', + 'import sys; sys.exit(sys.flags.no_site and ' + 'len(sys.path) > 200 and ' + '%r in sys.path and %r in sys.path and %r not in sys.path)' % ( + os.path.join(sys.prefix, 'fake-path-name'), + libpath, + os.path.join(sys.prefix, 'from-env'), + )], env=env) + finally: + self._cleanup_underpth_exe(exe_file) + self.assertEqual(rc, 0) + + @unittest.skipUnless(sys.platform == 'win32', "only supported on Windows") + def test_underpth_file(self): + libpath = os.path.dirname(os.path.dirname(encodings.__file__)) + exe_prefix = os.path.dirname(sys.executable) + exe_file = self._create_underpth_exe([ + 'fake-path-name', + *[libpath for _ in range(200)], + '# comment', + 'import site' + ]) + try: + env = os.environ.copy() + env['PYTHONPATH'] = 'from-env' + env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH')) + rc = subprocess.call([exe_file, '-c', + 'import sys; sys.exit(not sys.flags.no_site and ' + '%r in sys.path and %r in sys.path and %r not in sys.path)' % ( + os.path.join(sys.prefix, 'fake-path-name'), + libpath, + os.path.join(sys.prefix, 'from-env'), + )], env=env) + finally: + self._cleanup_underpth_exe(exe_file) + self.assertEqual(rc, 0) if __name__ == "__main__": diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py index 88dbfdf..3eebe94 100644 --- a/Lib/test/test_smtpd.py +++ b/Lib/test/test_smtpd.py @@ -53,10 +53,6 @@ class SMTPDServerTest(unittest.TestCase): write_line(b'DATA') self.assertRaises(NotImplementedError, write_line, b'spam\r\n.\r\n') - def test_decode_data_default_warns(self): - with self.assertWarns(DeprecationWarning): - smtpd.SMTPServer((support.HOST, 0), ('b', 0)) - def test_decode_data_and_enable_SMTPUTF8_raises(self): self.assertRaises( ValueError, @@ -108,10 +104,9 @@ class DebuggingServerTest(unittest.TestCase): """)) def test_process_message_with_decode_data_false(self): - server = smtpd.DebuggingServer((support.HOST, 0), ('b', 0), - decode_data=False) + server = smtpd.DebuggingServer((support.HOST, 0), ('b', 0)) conn, addr = server.accept() - channel = smtpd.SMTPChannel(server, conn, addr, decode_data=False) + channel = smtpd.SMTPChannel(server, conn, addr) with support.captured_stdout() as s: self.send_data(channel, b'From: test\n\nh\xc3\xa9llo\xff\n') stdout = s.getvalue() @@ -175,13 +170,11 @@ class TestFamilyDetection(unittest.TestCase): @unittest.skipUnless(support.IPV6_ENABLED, "IPv6 not enabled") def test_socket_uses_IPv6(self): - server = smtpd.SMTPServer((support.HOSTv6, 0), (support.HOST, 0), - decode_data=False) + server = smtpd.SMTPServer((support.HOSTv6, 0), (support.HOST, 0)) self.assertEqual(server.socket.family, socket.AF_INET6) def test_socket_uses_IPv4(self): - server = smtpd.SMTPServer((support.HOST, 0), (support.HOSTv6, 0), - decode_data=False) + server = smtpd.SMTPServer((support.HOST, 0), (support.HOSTv6, 0)) self.assertEqual(server.socket.family, socket.AF_INET) @@ -204,18 +197,18 @@ class TestRcptOptionParsing(unittest.TestCase): channel.handle_read() def test_params_rejected(self): - server = DummyServer((support.HOST, 0), ('b', 0), decode_data=False) + server = DummyServer((support.HOST, 0), ('b', 0)) conn, addr = server.accept() - channel = smtpd.SMTPChannel(server, conn, addr, decode_data=False) + channel = smtpd.SMTPChannel(server, conn, addr) self.write_line(channel, b'EHLO example') self.write_line(channel, b'MAIL from: size=20') self.write_line(channel, b'RCPT to: foo=bar') self.assertEqual(channel.socket.last, self.error_response) def test_nothing_accepted(self): - server = DummyServer((support.HOST, 0), ('b', 0), decode_data=False) + server = DummyServer((support.HOST, 0), ('b', 0)) conn, addr = server.accept() - channel = smtpd.SMTPChannel(server, conn, addr, decode_data=False) + channel = smtpd.SMTPChannel(server, conn, addr) self.write_line(channel, b'EHLO example') self.write_line(channel, b'MAIL from: size=20') self.write_line(channel, b'RCPT to: ') @@ -257,9 +250,9 @@ class TestMailOptionParsing(unittest.TestCase): self.assertEqual(channel.socket.last, b'250 OK\r\n') def test_with_decode_data_false(self): - server = DummyServer((support.HOST, 0), ('b', 0), decode_data=False) + server = DummyServer((support.HOST, 0), ('b', 0)) conn, addr = server.accept() - channel = smtpd.SMTPChannel(server, conn, addr, decode_data=False) + channel = smtpd.SMTPChannel(server, conn, addr) self.write_line(channel, b'EHLO example') for line in [ b'MAIL from: size=20 SMTPUTF8', @@ -765,13 +758,6 @@ class SMTPDChannelTest(unittest.TestCase): with support.check_warnings(('', DeprecationWarning)): self.channel._SMTPChannel__addr = 'spam' - def test_decode_data_default_warning(self): - with self.assertWarns(DeprecationWarning): - server = DummyServer((support.HOST, 0), ('b', 0)) - conn, addr = self.server.accept() - with self.assertWarns(DeprecationWarning): - smtpd.SMTPChannel(server, conn, addr) - @unittest.skipUnless(support.IPV6_ENABLED, "IPv6 not enabled") class SMTPDChannelIPv6Test(SMTPDChannelTest): def setUp(self): @@ -845,12 +831,9 @@ class SMTPDChannelWithDecodeDataFalse(unittest.TestCase): smtpd.socket = asyncore.socket = mock_socket self.old_debugstream = smtpd.DEBUGSTREAM self.debug = smtpd.DEBUGSTREAM = io.StringIO() - self.server = DummyServer((support.HOST, 0), ('b', 0), - decode_data=False) + self.server = DummyServer((support.HOST, 0), ('b', 0)) conn, addr = self.server.accept() - # Set decode_data to False - self.channel = smtpd.SMTPChannel(self.server, conn, addr, - decode_data=False) + self.channel = smtpd.SMTPChannel(self.server, conn, addr) def tearDown(self): asyncore.close_all() @@ -1015,5 +998,16 @@ class SMTPDChannelTestWithEnableSMTPUTF8True(unittest.TestCase): self.write_line(b'test\r\n.') self.assertEqual(self.channel.socket.last[0:3], b'250') + +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = { + "program", "Devnull", "DEBUGSTREAM", "NEWLINE", "COMMASPACE", + "DATA_SIZE_DEFAULT", "usage", "Options", "parseargs", + + } + support.check__all__(self, smtpd, blacklist=blacklist) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 58c04d7..59564c9 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -13,7 +13,6 @@ import queue import sys import os import array -import platform import contextlib from weakref import proxy import signal @@ -66,10 +65,22 @@ def _have_socket_rds(): s.close() return True +def _have_socket_alg(): + """Check whether AF_ALG sockets are supported on this host.""" + try: + s = socket.socket(socket.AF_ALG, socket.SOCK_SEQPACKET, 0) + except (AttributeError, OSError): + return False + else: + s.close() + return True + HAVE_SOCKET_CAN = _have_socket_can() HAVE_SOCKET_RDS = _have_socket_rds() +HAVE_SOCKET_ALG = _have_socket_alg() + # Size in bytes of the int type SIZEOF_INT = array.array("i").itemsize @@ -876,7 +887,6 @@ class GeneralModuleTests(unittest.TestCase): self.assertEqual(swapped & mask, mask) self.assertRaises(OverflowError, func, 1<<34) - @support.cpython_only def testNtoHErrors(self): good_values = [ 1, 2, 3, 1, 2, 3 ] bad_values = [ -1, -2, -3, -1, -2, -3 ] @@ -1162,6 +1172,17 @@ class GeneralModuleTests(unittest.TestCase): sock.close() self.assertRaises(OSError, sock.send, b"spam") + def testCloseException(self): + sock = socket.socket() + socket.socket(fileno=sock.fileno()).close() + try: + sock.close() + except OSError as err: + # Winsock apparently raises ENOTSOCK + self.assertIn(err.errno, (errno.EBADF, errno.ENOTSOCK)) + else: + self.fail("close() should raise EBADF/ENOTSOCK") + def testNewAttributes(self): # testing .family, .type and .protocol @@ -1208,6 +1229,22 @@ class GeneralModuleTests(unittest.TestCase): self.assertRaises(ValueError, s.ioctl, -1, None) s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100)) + @unittest.skipUnless(os.name == "nt", "Windows specific") + @unittest.skipUnless(hasattr(socket, 'SIO_LOOPBACK_FAST_PATH'), + 'Loopback fast path support required for this test') + def test_sio_loopback_fast_path(self): + s = socket.socket() + self.addCleanup(s.close) + try: + s.ioctl(socket.SIO_LOOPBACK_FAST_PATH, True) + except OSError as exc: + WSAEOPNOTSUPP = 10045 + if exc.winerror == WSAEOPNOTSUPP: + self.skipTest("SIO_LOOPBACK_FAST_PATH is defined but " + "doesn't implemented in this Windows version") + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + def testGetaddrinfo(self): try: socket.getaddrinfo('localhost', 80) @@ -2844,7 +2881,7 @@ class SCMRightsTest(SendrecvmsgServerTimeoutBase): nbytes = self.sendmsgToServer([msg]) self.assertEqual(nbytes, len(msg)) - @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #24725") + @unittest.skipIf(sys.platform == "darwin", "see issue #24725") def testFDPassEmpty(self): # Try to pass an empty FD array. Can receive either no array # or an empty array. @@ -4516,6 +4553,19 @@ class TestExceptions(unittest.TestCase): self.assertTrue(issubclass(socket.gaierror, OSError)) self.assertTrue(issubclass(socket.timeout, OSError)) + def test_setblocking_invalidfd(self): + # Regression test for issue #28471 + + sock0 = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) + sock = socket.socket( + socket.AF_INET, socket.SOCK_STREAM, 0, sock0.fileno()) + sock0.close() + self.addCleanup(sock.detach) + + with self.assertRaises(OSError): + sock.setblocking(False) + + @unittest.skipUnless(sys.platform == 'linux', 'Linux specific test') class TestLinuxAbstractNamespace(unittest.TestCase): @@ -4590,10 +4640,6 @@ class TestUnixDomain(unittest.TestCase): else: raise - def testUnbound(self): - # Issue #30205 - self.assertIn(self.sock.getsockname(), (None, '')) - def testStrAddr(self): # Test binding to and retrieving a normal string pathname. path = os.path.abspath(support.TESTFN) @@ -4723,13 +4769,9 @@ def isTipcAvailable(): """ if not hasattr(socket, "AF_TIPC"): return False - try: - f = open("/proc/modules") - except (FileNotFoundError, IsADirectoryError, PermissionError): - # It's ok if the file does not exist, is a directory or if we - # have not the permission to read it. + if not os.path.isfile("/proc/modules"): return False - with f: + with open("/proc/modules") as f: for line in f: if line.startswith("tipc "): return True @@ -5331,6 +5373,183 @@ class SendfileUsingSendfileTest(SendfileUsingSendTest): return getattr(sock, "_sendfile_use_sendfile") +@unittest.skipUnless(HAVE_SOCKET_ALG, 'AF_ALG required') +class LinuxKernelCryptoAPI(unittest.TestCase): + # tests for AF_ALG + def create_alg(self, typ, name): + sock = socket.socket(socket.AF_ALG, socket.SOCK_SEQPACKET, 0) + try: + sock.bind((typ, name)) + except FileNotFoundError as e: + # type / algorithm is not available + sock.close() + raise unittest.SkipTest(str(e), typ, name) + else: + return sock + + def test_sha256(self): + expected = bytes.fromhex("ba7816bf8f01cfea414140de5dae2223b00361a396" + "177a9cb410ff61f20015ad") + with self.create_alg('hash', 'sha256') as algo: + op, _ = algo.accept() + with op: + op.sendall(b"abc") + self.assertEqual(op.recv(512), expected) + + op, _ = algo.accept() + with op: + op.send(b'a', socket.MSG_MORE) + op.send(b'b', socket.MSG_MORE) + op.send(b'c', socket.MSG_MORE) + op.send(b'') + self.assertEqual(op.recv(512), expected) + + def test_hmac_sha1(self): + expected = bytes.fromhex("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79") + with self.create_alg('hash', 'hmac(sha1)') as algo: + algo.setsockopt(socket.SOL_ALG, socket.ALG_SET_KEY, b"Jefe") + op, _ = algo.accept() + with op: + op.sendall(b"what do ya want for nothing?") + self.assertEqual(op.recv(512), expected) + + # Although it should work with 3.19 and newer the test blocks on + # Ubuntu 15.10 with Kernel 4.2.0-19. + @support.requires_linux_version(4, 3) + def test_aes_cbc(self): + key = bytes.fromhex('06a9214036b8a15b512e03d534120006') + iv = bytes.fromhex('3dafba429d9eb430b422da802c9fac41') + msg = b"Single block msg" + ciphertext = bytes.fromhex('e353779c1079aeb82708942dbe77181a') + msglen = len(msg) + with self.create_alg('skcipher', 'cbc(aes)') as algo: + algo.setsockopt(socket.SOL_ALG, socket.ALG_SET_KEY, key) + op, _ = algo.accept() + with op: + op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv, + flags=socket.MSG_MORE) + op.sendall(msg) + self.assertEqual(op.recv(msglen), ciphertext) + + op, _ = algo.accept() + with op: + op.sendmsg_afalg([ciphertext], + op=socket.ALG_OP_DECRYPT, iv=iv) + self.assertEqual(op.recv(msglen), msg) + + # long message + multiplier = 1024 + longmsg = [msg] * multiplier + op, _ = algo.accept() + with op: + op.sendmsg_afalg(longmsg, + op=socket.ALG_OP_ENCRYPT, iv=iv) + enc = op.recv(msglen * multiplier) + self.assertEqual(len(enc), msglen * multiplier) + self.assertTrue(enc[:msglen], ciphertext) + + op, _ = algo.accept() + with op: + op.sendmsg_afalg([enc], + op=socket.ALG_OP_DECRYPT, iv=iv) + dec = op.recv(msglen * multiplier) + self.assertEqual(len(dec), msglen * multiplier) + self.assertEqual(dec, msg * multiplier) + + @support.requires_linux_version(4, 3) # see test_aes_cbc + def test_aead_aes_gcm(self): + key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c') + iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2') + plain = bytes.fromhex('c3b3c41f113a31b73d9a5cd432103069') + assoc = bytes.fromhex('24825602bd12a984e0092d3e448eda5f') + expected_ct = bytes.fromhex('93fe7d9e9bfd10348a5606e5cafa7354') + expected_tag = bytes.fromhex('0032a1dc85f1c9786925a2e71d8272dd') + + taglen = len(expected_tag) + assoclen = len(assoc) + + with self.create_alg('aead', 'gcm(aes)') as algo: + algo.setsockopt(socket.SOL_ALG, socket.ALG_SET_KEY, key) + algo.setsockopt(socket.SOL_ALG, socket.ALG_SET_AEAD_AUTHSIZE, + None, taglen) + + # send assoc, plain and tag buffer in separate steps + op, _ = algo.accept() + with op: + op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv, + assoclen=assoclen, flags=socket.MSG_MORE) + op.sendall(assoc, socket.MSG_MORE) + op.sendall(plain, socket.MSG_MORE) + op.sendall(b'\x00' * taglen) + res = op.recv(assoclen + len(plain) + taglen) + self.assertEqual(expected_ct, res[assoclen:-taglen]) + self.assertEqual(expected_tag, res[-taglen:]) + + # now with msg + op, _ = algo.accept() + with op: + msg = assoc + plain + b'\x00' * taglen + op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv, + assoclen=assoclen) + res = op.recv(assoclen + len(plain) + taglen) + self.assertEqual(expected_ct, res[assoclen:-taglen]) + self.assertEqual(expected_tag, res[-taglen:]) + + # create anc data manually + pack_uint32 = struct.Struct('I').pack + op, _ = algo.accept() + with op: + msg = assoc + plain + b'\x00' * taglen + op.sendmsg( + [msg], + ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)], + [socket.SOL_ALG, socket.ALG_SET_IV, pack_uint32(len(iv)) + iv], + [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)], + ) + ) + res = op.recv(len(msg)) + self.assertEqual(expected_ct, res[assoclen:-taglen]) + self.assertEqual(expected_tag, res[-taglen:]) + + # decrypt and verify + op, _ = algo.accept() + with op: + msg = assoc + expected_ct + expected_tag + op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv, + assoclen=assoclen) + res = op.recv(len(msg)) + self.assertEqual(plain, res[assoclen:-taglen]) + + @support.requires_linux_version(4, 3) # see test_aes_cbc + def test_drbg_pr_sha256(self): + # deterministic random bit generator, prediction resistance, sha256 + with self.create_alg('rng', 'drbg_pr_sha256') as algo: + extra_seed = os.urandom(32) + algo.setsockopt(socket.SOL_ALG, socket.ALG_SET_KEY, extra_seed) + op, _ = algo.accept() + with op: + rn = op.recv(32) + self.assertEqual(len(rn), 32) + + def test_sendmsg_afalg_args(self): + sock = socket.socket(socket.AF_ALG, socket.SOCK_SEQPACKET, 0) + with sock: + with self.assertRaises(TypeError): + sock.sendmsg_afalg() + + with self.assertRaises(TypeError): + sock.sendmsg_afalg(op=None) + + with self.assertRaises(TypeError): + sock.sendmsg_afalg(1) + + with self.assertRaises(TypeError): + sock.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, assoclen=None) + + with self.assertRaises(TypeError): + sock.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, assoclen=-1) + + def test_main(): tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest, TestExceptions, BufferIOTest, BasicTCPTest2, BasicUDPTest, UDPTimeoutTest ] @@ -5357,6 +5576,7 @@ def test_main(): tests.extend([TIPCTest, TIPCThreadableTest]) tests.extend([BasicCANTest, CANTest]) tests.extend([BasicRDSTest, RDSTest]) + tests.append(LinuxKernelCryptoAPI) tests.extend([ CmsgMacroTests, SendmsgUDPTest, diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 0d0f86f..140a6ab 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -3,12 +3,11 @@ Test suite for socketserver. """ import contextlib +import io import os import select import signal import socket -import select -import errno import tempfile import unittest import socketserver @@ -46,7 +45,7 @@ def receive(sock, n, timeout=20): else: raise RuntimeError("timed out on %r" % (sock,)) -if HAVE_UNIX_SOCKETS: +if HAVE_UNIX_SOCKETS and HAVE_FORKING: class ForkingUnixStreamServer(socketserver.ForkingMixIn, socketserver.UnixStreamServer): pass @@ -58,6 +57,7 @@ if HAVE_UNIX_SOCKETS: @contextlib.contextmanager def simple_subprocess(testcase): + """Tests that a custom child process is not waited on (Issue 1540386)""" pid = os.fork() if pid == 0: # Don't raise an exception; it would be caught by the test harness. @@ -103,7 +103,6 @@ class SocketServerTest(unittest.TestCase): class MyServer(svrcls): def handle_error(self, request, client_address): self.close_request(request) - self.server_close() raise class MyHandler(hdlrbase): @@ -279,6 +278,182 @@ class SocketServerTest(unittest.TestCase): socketserver.TCPServer((HOST, -1), socketserver.StreamRequestHandler) + def test_context_manager(self): + with socketserver.TCPServer((HOST, 0), + socketserver.StreamRequestHandler) as server: + pass + self.assertEqual(-1, server.socket.fileno()) + + +class ErrorHandlerTest(unittest.TestCase): + """Test that the servers pass normal exceptions from the handler to + handle_error(), and that exiting exceptions like SystemExit and + KeyboardInterrupt are not passed.""" + + def tearDown(self): + test.support.unlink(test.support.TESTFN) + + def test_sync_handled(self): + BaseErrorTestServer(ValueError) + self.check_result(handled=True) + + def test_sync_not_handled(self): + with self.assertRaises(SystemExit): + BaseErrorTestServer(SystemExit) + self.check_result(handled=False) + + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_threading_handled(self): + ThreadingErrorTestServer(ValueError) + self.check_result(handled=True) + + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_threading_not_handled(self): + ThreadingErrorTestServer(SystemExit) + self.check_result(handled=False) + + @requires_forking + def test_forking_handled(self): + ForkingErrorTestServer(ValueError) + self.check_result(handled=True) + + @requires_forking + def test_forking_not_handled(self): + ForkingErrorTestServer(SystemExit) + self.check_result(handled=False) + + def check_result(self, handled): + with open(test.support.TESTFN) as log: + expected = 'Handler called\n' + 'Error handled\n' * handled + self.assertEqual(log.read(), expected) + + +class BaseErrorTestServer(socketserver.TCPServer): + def __init__(self, exception): + self.exception = exception + super().__init__((HOST, 0), BadHandler) + with socket.create_connection(self.server_address): + pass + try: + self.handle_request() + finally: + self.server_close() + self.wait_done() + + def handle_error(self, request, client_address): + with open(test.support.TESTFN, 'a') as log: + log.write('Error handled\n') + + def wait_done(self): + pass + + +class BadHandler(socketserver.BaseRequestHandler): + def handle(self): + with open(test.support.TESTFN, 'a') as log: + log.write('Handler called\n') + raise self.server.exception('Test error') + + +class ThreadingErrorTestServer(socketserver.ThreadingMixIn, + BaseErrorTestServer): + def __init__(self, *pos, **kw): + self.done = threading.Event() + super().__init__(*pos, **kw) + + def shutdown_request(self, *pos, **kw): + super().shutdown_request(*pos, **kw) + self.done.set() + + def wait_done(self): + self.done.wait() + + +if HAVE_FORKING: + class ForkingErrorTestServer(socketserver.ForkingMixIn, BaseErrorTestServer): + def wait_done(self): + [child] = self.active_children + os.waitpid(child, 0) + self.active_children.clear() + + +class SocketWriterTest(unittest.TestCase): + def test_basics(self): + class Handler(socketserver.StreamRequestHandler): + def handle(self): + self.server.wfile = self.wfile + self.server.wfile_fileno = self.wfile.fileno() + self.server.request_fileno = self.request.fileno() + + server = socketserver.TCPServer((HOST, 0), Handler) + self.addCleanup(server.server_close) + s = socket.socket( + server.address_family, socket.SOCK_STREAM, socket.IPPROTO_TCP) + with s: + s.connect(server.server_address) + server.handle_request() + self.assertIsInstance(server.wfile, io.BufferedIOBase) + self.assertEqual(server.wfile_fileno, server.request_fileno) + + @unittest.skipUnless(threading, 'Threading required for this test.') + def test_write(self): + # Test that wfile.write() sends data immediately, and that it does + # not truncate sends when interrupted by a Unix signal + pthread_kill = test.support.get_attribute(signal, 'pthread_kill') + + class Handler(socketserver.StreamRequestHandler): + def handle(self): + self.server.sent1 = self.wfile.write(b'write data\n') + # Should be sent immediately, without requiring flush() + self.server.received = self.rfile.readline() + big_chunk = b'\0' * test.support.SOCK_MAX_SIZE + self.server.sent2 = self.wfile.write(big_chunk) + + server = socketserver.TCPServer((HOST, 0), Handler) + self.addCleanup(server.server_close) + interrupted = threading.Event() + + def signal_handler(signum, frame): + interrupted.set() + + original = signal.signal(signal.SIGUSR1, signal_handler) + self.addCleanup(signal.signal, signal.SIGUSR1, original) + response1 = None + received2 = None + main_thread = threading.get_ident() + + def run_client(): + s = socket.socket(server.address_family, socket.SOCK_STREAM, + socket.IPPROTO_TCP) + with s, s.makefile('rb') as reader: + s.connect(server.server_address) + nonlocal response1 + response1 = reader.readline() + s.sendall(b'client response\n') + + reader.read(100) + # The main thread should now be blocking in a send() syscall. + # But in theory, it could get interrupted by other signals, + # and then retried. So keep sending the signal in a loop, in + # case an earlier signal happens to be delivered at an + # inconvenient moment. + while True: + pthread_kill(main_thread, signal.SIGUSR1) + if interrupted.wait(timeout=float(1)): + break + nonlocal received2 + received2 = len(reader.read()) + + background = threading.Thread(target=run_client) + background.start() + server.handle_request() + background.join() + self.assertEqual(server.sent1, len(response1)) + self.assertEqual(response1, b'write data\n') + self.assertEqual(server.received, b'client response\n') + self.assertEqual(server.sent2, test.support.SOCK_MAX_SIZE) + self.assertEqual(received2, test.support.SOCK_MAX_SIZE - 100) + class MiscTestCase(unittest.TestCase): diff --git a/Lib/test/test_sort.py b/Lib/test/test_sort.py index a5d0ebf..98ccab5 100644 --- a/Lib/test/test_sort.py +++ b/Lib/test/test_sort.py @@ -1,6 +1,5 @@ from test import support import random -import sys import unittest from functools import cmp_to_key diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py index bea7ab1..e893f3a 100644 --- a/Lib/test/test_spwd.py +++ b/Lib/test/test_spwd.py @@ -56,5 +56,20 @@ class TestSpwdRoot(unittest.TestCase): self.assertRaises(TypeError, spwd.getspnam, bytes_name) +@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, + 'non-root user required') +class TestSpwdNonRoot(unittest.TestCase): + + def test_getspnam_exception(self): + name = 'bin' + try: + with self.assertRaises(PermissionError) as cm: + spwd.getspnam(name) + except KeyError as exc: + self.skipTest("spwd entry %r doesn't exist: %s" % (name, exc)) + else: + self.assertEqual(str(cm.exception), '[Errno 13] Permission denied') + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index ffb7314..d203cdd 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -21,6 +21,13 @@ import functools ssl = support.import_module("ssl") +try: + import threading +except ImportError: + _have_threads = False +else: + _have_threads = True + PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) HOST = support.HOST IS_LIBRESSL = ssl.OPENSSL_VERSION.startswith('LibreSSL') @@ -56,12 +63,12 @@ CRLFILE = data_file("revocation.crl") # Two keys and certs signed by the same CA (for SNI tests) SIGNED_CERTFILE = data_file("keycert3.pem") SIGNED_CERTFILE2 = data_file("keycert4.pem") -SIGNING_CA = data_file("pycacert.pem") +# Same certificate as pycacert.pem, but without extra text in file +SIGNING_CA = data_file("capath", "ceff1710.0") # cert with all kinds of subject alt names ALLSANFILE = data_file("allsans.pem") REMOTE_HOST = "self-signed.pythontest.net" -REMOTE_ROOT_CERT = data_file("selfsigned_pythontestdotnet.pem") EMPTYCERT = data_file("nullcert.pem") BADCERT = data_file("badcert.pem") @@ -73,6 +80,12 @@ NULLBYTECERT = data_file("nullbytecert.pem") DHFILE = data_file("dh1024.pem") BYTES_DHFILE = os.fsencode(DHFILE) +# Not defined in all versions of OpenSSL +OP_NO_COMPRESSION = getattr(ssl, "OP_NO_COMPRESSION", 0) +OP_SINGLE_DH_USE = getattr(ssl, "OP_SINGLE_DH_USE", 0) +OP_SINGLE_ECDH_USE = getattr(ssl, "OP_SINGLE_ECDH_USE", 0) +OP_CIPHER_SERVER_PREFERENCE = getattr(ssl, "OP_CIPHER_SERVER_PREFERENCE", 0) + def handle_error(prefix): exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) @@ -130,6 +143,21 @@ def skip_if_broken_ubuntu_ssl(func): needs_sni = unittest.skipUnless(ssl.HAS_SNI, "SNI support needed for this test") +def test_wrap_socket(sock, ssl_version=ssl.PROTOCOL_TLS, *, + cert_reqs=ssl.CERT_NONE, ca_certs=None, + ciphers=None, certfile=None, keyfile=None, + **kwargs): + context = ssl.SSLContext(ssl_version) + if cert_reqs is not None: + context.verify_mode = cert_reqs + if ca_certs is not None: + context.load_verify_locations(ca_certs) + if certfile is not None or keyfile is not None: + context.load_cert_chain(certfile, keyfile) + if ciphers is not None: + context.set_ciphers(ciphers) + return context.wrap_socket(sock, **kwargs) + class BasicSocketTests(unittest.TestCase): def test_constants(self): @@ -350,17 +378,17 @@ class BasicSocketTests(unittest.TestCase): # Issue #7943: an SSL object doesn't create reference cycles with # itself. s = socket.socket(socket.AF_INET) - ss = ssl.wrap_socket(s) + ss = test_wrap_socket(s) wr = weakref.ref(ss) with support.check_warnings(("", ResourceWarning)): del ss - self.assertEqual(wr(), None) + self.assertEqual(wr(), None) def test_wrapped_unconnected(self): # Methods on an unconnected SSLSocket propagate the original # OSError raise by the underlying socket object. s = socket.socket(socket.AF_INET) - with ssl.wrap_socket(s) as ss: + with test_wrap_socket(s) as ss: self.assertRaises(OSError, ss.recv, 1) self.assertRaises(OSError, ss.recv_into, bytearray(b'x')) self.assertRaises(OSError, ss.recvfrom, 1) @@ -374,10 +402,10 @@ class BasicSocketTests(unittest.TestCase): for timeout in (None, 0.0, 5.0): s = socket.socket(socket.AF_INET) s.settimeout(timeout) - with ssl.wrap_socket(s) as ss: + with test_wrap_socket(s) as ss: self.assertEqual(timeout, ss.gettimeout()) - def test_errors(self): + def test_errors_sslwrap(self): sock = socket.socket() self.assertRaisesRegex(ValueError, "certfile must be specified", @@ -387,10 +415,10 @@ class BasicSocketTests(unittest.TestCase): ssl.wrap_socket, sock, server_side=True) self.assertRaisesRegex(ValueError, "certfile must be specified for server-side operations", - ssl.wrap_socket, sock, server_side=True, certfile="") + ssl.wrap_socket, sock, server_side=True, certfile="") with ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE) as s: self.assertRaisesRegex(ValueError, "can't connect in server-side mode", - s.connect, (HOST, 8080)) + s.connect, (HOST, 8080)) with self.assertRaises(OSError) as cm: with socket.socket() as sock: ssl.wrap_socket(sock, certfile=NONEXISTINGCERT) @@ -413,7 +441,7 @@ class BasicSocketTests(unittest.TestCase): sock = socket.socket() self.addCleanup(sock.close) with self.assertRaises(ssl.SSLError): - ssl.wrap_socket(sock, + test_wrap_socket(sock, certfile=certfile, ssl_version=ssl.PROTOCOL_TLSv1) @@ -600,7 +628,7 @@ class BasicSocketTests(unittest.TestCase): s.listen() c = socket.socket(socket.AF_INET) c.connect(s.getsockname()) - with ssl.wrap_socket(c, do_handshake_on_connect=False) as ss: + with test_wrap_socket(c, do_handshake_on_connect=False) as ss: with self.assertRaises(ValueError): ss.get_channel_binding("unknown-type") s.close() @@ -610,15 +638,15 @@ class BasicSocketTests(unittest.TestCase): def test_tls_unique_channel_binding(self): # unconnected should return None for known type s = socket.socket(socket.AF_INET) - with ssl.wrap_socket(s) as ss: + with test_wrap_socket(s) as ss: self.assertIsNone(ss.get_channel_binding("tls-unique")) # the same for server-side s = socket.socket(socket.AF_INET) - with ssl.wrap_socket(s, server_side=True, certfile=CERTFILE) as ss: + with test_wrap_socket(s, server_side=True, certfile=CERTFILE) as ss: self.assertIsNone(ss.get_channel_binding("tls-unique")) def test_dealloc_warn(self): - ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) + ss = test_wrap_socket(socket.socket(socket.AF_INET)) r = repr(ss) with self.assertWarns(ResourceWarning) as cm: ss = None @@ -737,7 +765,7 @@ class BasicSocketTests(unittest.TestCase): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.addCleanup(s.close) with self.assertRaises(NotImplementedError) as cx: - ssl.wrap_socket(s, cert_reqs=ssl.CERT_NONE) + test_wrap_socket(s, cert_reqs=ssl.CERT_NONE) self.assertEqual(str(cx.exception), "only stream sockets are supported") ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) with self.assertRaises(NotImplementedError) as cx: @@ -809,6 +837,22 @@ class BasicSocketTests(unittest.TestCase): self.cert_time_ok("Feb 9 00:00:00 2007 GMT", 1170979200.0) self.cert_time_fail(local_february_name() + " 9 00:00:00 2007 GMT") + def test_connect_ex_error(self): + server = socket.socket(socket.AF_INET) + self.addCleanup(server.close) + port = support.bind_port(server) # Reserve port but don't listen + s = test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED) + self.addCleanup(s.close) + rc = s.connect_ex((HOST, port)) + # Issue #19919: Windows machines or VMs hosted on Windows + # machines sometimes return EWOULDBLOCK. + errors = ( + errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT, + errno.EWOULDBLOCK, + ) + self.assertIn(rc, errors) + class ContextTests(unittest.TestCase): @@ -834,13 +878,22 @@ class ContextTests(unittest.TestCase): with self.assertRaisesRegex(ssl.SSLError, "No cipher can be selected"): ctx.set_ciphers("^$:,;?*'dorothyx") + @unittest.skipIf(ssl.OPENSSL_VERSION_INFO < (1, 0, 2, 0, 0), 'OpenSSL too old') + def test_get_ciphers(self): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) + ctx.set_ciphers('AESGCM') + names = set(d['name'] for d in ctx.get_ciphers()) + self.assertIn('AES256-GCM-SHA384', names) + self.assertIn('AES128-GCM-SHA256', names) + @skip_if_broken_ubuntu_ssl def test_options(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3) - if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0): - default |= ssl.OP_NO_COMPRESSION + # SSLContext also enables these by default + default |= (OP_NO_COMPRESSION | OP_CIPHER_SERVER_PREFERENCE | + OP_SINGLE_DH_USE | OP_SINGLE_ECDH_USE) self.assertEqual(default, ctx.options) ctx.options |= ssl.OP_NO_TLSv1 self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options) @@ -1205,16 +1258,29 @@ class ContextTests(unittest.TestCase): stats["x509"] += 1 self.assertEqual(ctx.cert_store_stats(), stats) + def _assert_context_options(self, ctx): + self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) + if OP_NO_COMPRESSION != 0: + self.assertEqual(ctx.options & OP_NO_COMPRESSION, + OP_NO_COMPRESSION) + if OP_SINGLE_DH_USE != 0: + self.assertEqual(ctx.options & OP_SINGLE_DH_USE, + OP_SINGLE_DH_USE) + if OP_SINGLE_ECDH_USE != 0: + self.assertEqual(ctx.options & OP_SINGLE_ECDH_USE, + OP_SINGLE_ECDH_USE) + if OP_CIPHER_SERVER_PREFERENCE != 0: + self.assertEqual(ctx.options & OP_CIPHER_SERVER_PREFERENCE, + OP_CIPHER_SERVER_PREFERENCE) + def test_create_default_context(self): ctx = ssl.create_default_context() + self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) self.assertTrue(ctx.check_hostname) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) - self.assertEqual( - ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), - getattr(ssl, "OP_NO_COMPRESSION", 0), - ) + self._assert_context_options(ctx) + with open(SIGNING_CA) as f: cadata = f.read() @@ -1222,40 +1288,24 @@ class ContextTests(unittest.TestCase): cadata=cadata) self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) - self.assertEqual( - ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), - getattr(ssl, "OP_NO_COMPRESSION", 0), - ) + self._assert_context_options(ctx) ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) - self.assertEqual( - ctx.options & getattr(ssl, "OP_NO_COMPRESSION", 0), - getattr(ssl, "OP_NO_COMPRESSION", 0), - ) - self.assertEqual( - ctx.options & getattr(ssl, "OP_SINGLE_DH_USE", 0), - getattr(ssl, "OP_SINGLE_DH_USE", 0), - ) - self.assertEqual( - ctx.options & getattr(ssl, "OP_SINGLE_ECDH_USE", 0), - getattr(ssl, "OP_SINGLE_ECDH_USE", 0), - ) + self._assert_context_options(ctx) def test__create_stdlib_context(self): ctx = ssl._create_stdlib_context() self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) self.assertFalse(ctx.check_hostname) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) + self._assert_context_options(ctx) ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1) self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1) self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) + self._assert_context_options(ctx) ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_REQUIRED, @@ -1263,12 +1313,12 @@ class ContextTests(unittest.TestCase): self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1) self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) self.assertTrue(ctx.check_hostname) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) + self._assert_context_options(ctx) ctx = ssl._create_stdlib_context(purpose=ssl.Purpose.CLIENT_AUTH) self.assertEqual(ctx.protocol, ssl.PROTOCOL_SSLv23) self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) - self.assertEqual(ctx.options & ssl.OP_NO_SSLv2, ssl.OP_NO_SSLv2) + self._assert_context_options(ctx) def test_check_hostname(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) @@ -1292,6 +1342,17 @@ class ContextTests(unittest.TestCase): ctx.check_hostname = False self.assertFalse(ctx.check_hostname) + def test_context_client_server(self): + # PROTOCOL_TLS_CLIENT has sane defaults + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + self.assertTrue(ctx.check_hostname) + self.assertEqual(ctx.verify_mode, ssl.CERT_REQUIRED) + + # PROTOCOL_TLS_SERVER has different but also sane defaults + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + self.assertFalse(ctx.check_hostname) + self.assertEqual(ctx.verify_mode, ssl.CERT_NONE) + class SSLErrorTests(unittest.TestCase): @@ -1397,140 +1458,105 @@ class MemoryBIOTests(unittest.TestCase): self.assertRaises(TypeError, bio.write, 1) -class NetworkedTests(unittest.TestCase): +@unittest.skipUnless(_have_threads, "Needs threading module") +class SimpleBackgroundTests(unittest.TestCase): - def test_connect(self): - with support.transient_internet(REMOTE_HOST): - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_NONE) - try: - s.connect((REMOTE_HOST, 443)) - self.assertEqual({}, s.getpeercert()) - finally: - s.close() + """Tests that connect to a simple server running in the background""" - # this should fail because we have no verification certs - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED) - self.assertRaisesRegex(ssl.SSLError, "certificate verify failed", - s.connect, (REMOTE_HOST, 443)) - s.close() + def setUp(self): + server = ThreadedEchoServer(SIGNED_CERTFILE) + self.server_addr = (HOST, server.port) + server.__enter__() + self.addCleanup(server.__exit__, None, None, None) - # this should succeed because we specify the root cert - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=REMOTE_ROOT_CERT) - try: - s.connect((REMOTE_HOST, 443)) - self.assertTrue(s.getpeercert()) - finally: - s.close() + def test_connect(self): + with test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_NONE) as s: + s.connect(self.server_addr) + self.assertEqual({}, s.getpeercert()) + self.assertFalse(s.server_side) + + # this should succeed because we specify the root cert + with test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SIGNING_CA) as s: + s.connect(self.server_addr) + self.assertTrue(s.getpeercert()) + self.assertFalse(s.server_side) + + def test_connect_fail(self): + # This should fail because we have no verification certs. Connection + # failure crashes ThreadedEchoServer, so run this in an independent + # test method. + s = test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED) + self.addCleanup(s.close) + self.assertRaisesRegex(ssl.SSLError, "certificate verify failed", + s.connect, self.server_addr) def test_connect_ex(self): # Issue #11326: check connect_ex() implementation - with support.transient_internet(REMOTE_HOST): - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=REMOTE_ROOT_CERT) - try: - self.assertEqual(0, s.connect_ex((REMOTE_HOST, 443))) - self.assertTrue(s.getpeercert()) - finally: - s.close() + s = test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SIGNING_CA) + self.addCleanup(s.close) + self.assertEqual(0, s.connect_ex(self.server_addr)) + self.assertTrue(s.getpeercert()) def test_non_blocking_connect_ex(self): # Issue #11326: non-blocking connect_ex() should allow handshake # to proceed after the socket gets ready. - with support.transient_internet(REMOTE_HOST): - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=REMOTE_ROOT_CERT, - do_handshake_on_connect=False) + s = test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=SIGNING_CA, + do_handshake_on_connect=False) + self.addCleanup(s.close) + s.setblocking(False) + rc = s.connect_ex(self.server_addr) + # EWOULDBLOCK under Windows, EINPROGRESS elsewhere + self.assertIn(rc, (0, errno.EINPROGRESS, errno.EWOULDBLOCK)) + # Wait for connect to finish + select.select([], [s], [], 5.0) + # Non-blocking handshake + while True: try: - s.setblocking(False) - rc = s.connect_ex((REMOTE_HOST, 443)) - # EWOULDBLOCK under Windows, EINPROGRESS elsewhere - self.assertIn(rc, (0, errno.EINPROGRESS, errno.EWOULDBLOCK)) - # Wait for connect to finish + s.do_handshake() + break + except ssl.SSLWantReadError: + select.select([s], [], [], 5.0) + except ssl.SSLWantWriteError: select.select([], [s], [], 5.0) - # Non-blocking handshake - while True: - try: - s.do_handshake() - break - except ssl.SSLWantReadError: - select.select([s], [], [], 5.0) - except ssl.SSLWantWriteError: - select.select([], [s], [], 5.0) - # SSL established - self.assertTrue(s.getpeercert()) - finally: - s.close() - - def test_timeout_connect_ex(self): - # Issue #12065: on a timeout, connect_ex() should return the original - # errno (mimicking the behaviour of non-SSL sockets). - with support.transient_internet(REMOTE_HOST): - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=REMOTE_ROOT_CERT, - do_handshake_on_connect=False) - try: - s.settimeout(0.0000001) - rc = s.connect_ex((REMOTE_HOST, 443)) - if rc == 0: - self.skipTest("REMOTE_HOST responded too quickly") - self.assertIn(rc, (errno.EAGAIN, errno.EWOULDBLOCK)) - finally: - s.close() - - def test_connect_ex_error(self): - with support.transient_internet(REMOTE_HOST): - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=REMOTE_ROOT_CERT) - try: - rc = s.connect_ex((REMOTE_HOST, 444)) - # Issue #19919: Windows machines or VMs hosted on Windows - # machines sometimes return EWOULDBLOCK. - errors = ( - errno.ECONNREFUSED, errno.EHOSTUNREACH, errno.ETIMEDOUT, - errno.EWOULDBLOCK, - ) - self.assertIn(rc, errors) - finally: - s.close() + # SSL established + self.assertTrue(s.getpeercert()) def test_connect_with_context(self): - with support.transient_internet(REMOTE_HOST): - # Same as test_connect, but with a separately created context - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - s.connect((REMOTE_HOST, 443)) - try: - self.assertEqual({}, s.getpeercert()) - finally: - s.close() - # Same with a server hostname - s = ctx.wrap_socket(socket.socket(socket.AF_INET), - server_hostname=REMOTE_HOST) - s.connect((REMOTE_HOST, 443)) - s.close() - # This should fail because we have no verification certs - ctx.verify_mode = ssl.CERT_REQUIRED - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - self.assertRaisesRegex(ssl.SSLError, "certificate verify failed", - s.connect, (REMOTE_HOST, 443)) - s.close() - # This should succeed because we specify the root cert - ctx.load_verify_locations(REMOTE_ROOT_CERT) - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - s.connect((REMOTE_HOST, 443)) - try: - cert = s.getpeercert() - self.assertTrue(cert) - finally: - s.close() + # Same as test_connect, but with a separately created context + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + self.assertEqual({}, s.getpeercert()) + # Same with a server hostname + with ctx.wrap_socket(socket.socket(socket.AF_INET), + server_hostname="dummy") as s: + s.connect(self.server_addr) + ctx.verify_mode = ssl.CERT_REQUIRED + # This should succeed because we specify the root cert + ctx.load_verify_locations(SIGNING_CA) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) + + def test_connect_with_context_fail(self): + # This should fail because we have no verification certs. Connection + # failure crashes ThreadedEchoServer, so run this in an independent + # test method. + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + s = ctx.wrap_socket(socket.socket(socket.AF_INET)) + self.addCleanup(s.close) + self.assertRaisesRegex(ssl.SSLError, "certificate verify failed", + s.connect, self.server_addr) def test_connect_capath(self): # Verify server certificates using the `capath` argument @@ -1538,198 +1564,130 @@ class NetworkedTests(unittest.TestCase): # OpenSSL 0.9.8n and 1.0.0, as a result the capath directory must # contain both versions of each certificate (same content, different # filename) for this test to be portable across OpenSSL releases. - with support.transient_internet(REMOTE_HOST): - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(capath=CAPATH) - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - s.connect((REMOTE_HOST, 443)) - try: - cert = s.getpeercert() - self.assertTrue(cert) - finally: - s.close() - # Same with a bytes `capath` argument - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(capath=BYTES_CAPATH) - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - s.connect((REMOTE_HOST, 443)) - try: - cert = s.getpeercert() - self.assertTrue(cert) - finally: - s.close() + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(capath=CAPATH) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) + # Same with a bytes `capath` argument + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(capath=BYTES_CAPATH) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) def test_connect_cadata(self): - with open(REMOTE_ROOT_CERT) as f: + with open(SIGNING_CA) as f: pem = f.read() der = ssl.PEM_cert_to_DER_cert(pem) - with support.transient_internet(REMOTE_HOST): - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(cadata=pem) - with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: - s.connect((REMOTE_HOST, 443)) - cert = s.getpeercert() - self.assertTrue(cert) + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(cadata=pem) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) - # same with DER - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(cadata=der) - with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: - s.connect((REMOTE_HOST, 443)) - cert = s.getpeercert() - self.assertTrue(cert) + # same with DER + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(cadata=der) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) @unittest.skipIf(os.name == "nt", "Can't use a socket as a file under Windows") def test_makefile_close(self): # Issue #5238: creating a file-like object with makefile() shouldn't # delay closing the underlying "real socket" (here tested with its # file descriptor, hence skipping the test under Windows). - with support.transient_internet(REMOTE_HOST): - ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) - ss.connect((REMOTE_HOST, 443)) - fd = ss.fileno() - f = ss.makefile() - f.close() - # The fd is still open + ss = test_wrap_socket(socket.socket(socket.AF_INET)) + ss.connect(self.server_addr) + fd = ss.fileno() + f = ss.makefile() + f.close() + # The fd is still open + os.read(fd, 0) + # Closing the SSL socket should close the fd too + ss.close() + gc.collect() + with self.assertRaises(OSError) as e: os.read(fd, 0) - # Closing the SSL socket should close the fd too - ss.close() - gc.collect() - with self.assertRaises(OSError) as e: - os.read(fd, 0) - self.assertEqual(e.exception.errno, errno.EBADF) + self.assertEqual(e.exception.errno, errno.EBADF) def test_non_blocking_handshake(self): - with support.transient_internet(REMOTE_HOST): - s = socket.socket(socket.AF_INET) - s.connect((REMOTE_HOST, 443)) - s.setblocking(False) - s = ssl.wrap_socket(s, - cert_reqs=ssl.CERT_NONE, - do_handshake_on_connect=False) - count = 0 - while True: - try: - count += 1 - s.do_handshake() - break - except ssl.SSLWantReadError: - select.select([s], [], []) - except ssl.SSLWantWriteError: - select.select([], [s], []) - s.close() - if support.verbose: - sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count) + s = socket.socket(socket.AF_INET) + s.connect(self.server_addr) + s.setblocking(False) + s = test_wrap_socket(s, + cert_reqs=ssl.CERT_NONE, + do_handshake_on_connect=False) + self.addCleanup(s.close) + count = 0 + while True: + try: + count += 1 + s.do_handshake() + break + except ssl.SSLWantReadError: + select.select([s], [], []) + except ssl.SSLWantWriteError: + select.select([], [s], []) + if support.verbose: + sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count) def test_get_server_certificate(self): - def _test_get_server_certificate(host, port, cert=None): - with support.transient_internet(host): - pem = ssl.get_server_certificate((host, port)) - if not pem: - self.fail("No server certificate on %s:%s!" % (host, port)) + _test_get_server_certificate(self, *self.server_addr, cert=SIGNING_CA) - try: - pem = ssl.get_server_certificate((host, port), - ca_certs=CERTFILE) - except ssl.SSLError as x: - #should fail - if support.verbose: - sys.stdout.write("%s\n" % x) - else: - self.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) - - pem = ssl.get_server_certificate((host, port), - ca_certs=cert) - if not pem: - self.fail("No server certificate on %s:%s!" % (host, port)) - if support.verbose: - sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) - - _test_get_server_certificate(REMOTE_HOST, 443, REMOTE_ROOT_CERT) - if support.IPV6_ENABLED: - _test_get_server_certificate('ipv6.google.com', 443) + def test_get_server_certificate_fail(self): + # Connection failure crashes ThreadedEchoServer, so run this in an + # independent test method + _test_get_server_certificate_fail(self, *self.server_addr) def test_ciphers(self): - remote = (REMOTE_HOST, 443) - with support.transient_internet(remote[0]): - with ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_NONE, ciphers="ALL") as s: - s.connect(remote) - with ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT") as s: - s.connect(remote) - # Error checking can happen at instantiation or when connecting - with self.assertRaisesRegex(ssl.SSLError, "No cipher can be selected"): - with socket.socket(socket.AF_INET) as sock: - s = ssl.wrap_socket(sock, - cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx") - s.connect(remote) - - def test_algorithms(self): - # Issue #8484: all algorithms should be available when verifying a - # certificate. - # SHA256 was added in OpenSSL 0.9.8 - if ssl.OPENSSL_VERSION_INFO < (0, 9, 8, 0, 15): - self.skipTest("SHA256 not available on %r" % ssl.OPENSSL_VERSION) - # sha256.tbs-internet.com needs SNI to use the correct certificate - if not ssl.HAS_SNI: - self.skipTest("SNI needed for this test") - # https://sha2.hboeck.de/ was used until 2011-01-08 (no route to host) - remote = ("sha256.tbs-internet.com", 443) - sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") - with support.transient_internet("sha256.tbs-internet.com"): - ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(sha256_cert) - s = ctx.wrap_socket(socket.socket(socket.AF_INET), - server_hostname="sha256.tbs-internet.com") - try: - s.connect(remote) - if support.verbose: - sys.stdout.write("\nCipher with %r is %r\n" % - (remote, s.cipher())) - sys.stdout.write("Certificate is:\n%s\n" % - pprint.pformat(s.getpeercert())) - finally: - s.close() + with test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_NONE, ciphers="ALL") as s: + s.connect(self.server_addr) + with test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT") as s: + s.connect(self.server_addr) + # Error checking can happen at instantiation or when connecting + with self.assertRaisesRegex(ssl.SSLError, "No cipher can be selected"): + with socket.socket(socket.AF_INET) as sock: + s = test_wrap_socket(sock, + cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx") + s.connect(self.server_addr) def test_get_ca_certs_capath(self): # capath certs are loaded on request - with support.transient_internet(REMOTE_HOST): - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(capath=CAPATH) - self.assertEqual(ctx.get_ca_certs(), []) - s = ctx.wrap_socket(socket.socket(socket.AF_INET)) - s.connect((REMOTE_HOST, 443)) - try: - cert = s.getpeercert() - self.assertTrue(cert) - finally: - s.close() - self.assertEqual(len(ctx.get_ca_certs()), 1) + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(capath=CAPATH) + self.assertEqual(ctx.get_ca_certs(), []) + with ctx.wrap_socket(socket.socket(socket.AF_INET)) as s: + s.connect(self.server_addr) + cert = s.getpeercert() + self.assertTrue(cert) + self.assertEqual(len(ctx.get_ca_certs()), 1) @needs_sni def test_context_setget(self): # Check that the context of a connected socket can be replaced. - with support.transient_internet(REMOTE_HOST): - ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1) - ctx2 = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - s = socket.socket(socket.AF_INET) - with ctx1.wrap_socket(s) as ss: - ss.connect((REMOTE_HOST, 443)) - self.assertIs(ss.context, ctx1) - self.assertIs(ss._sslobj.context, ctx1) - ss.context = ctx2 - self.assertIs(ss.context, ctx2) - self.assertIs(ss._sslobj.context, ctx2) - - -class NetworkedBIOTests(unittest.TestCase): + ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1) + ctx2 = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + s = socket.socket(socket.AF_INET) + with ctx1.wrap_socket(s) as ss: + ss.connect(self.server_addr) + self.assertIs(ss.context, ctx1) + self.assertIs(ss._sslobj.context, ctx1) + ss.context = ctx2 + self.assertIs(ss.context, ctx2) + self.assertIs(ss._sslobj.context, ctx2) def ssl_io_loop(self, sock, incoming, outgoing, func, *args, **kwargs): # A simple IO loop. Call func(*args) depending on the error we get @@ -1765,64 +1723,128 @@ class NetworkedBIOTests(unittest.TestCase): % (count, func.__name__)) return ret - def test_handshake(self): + def test_bio_handshake(self): + sock = socket.socket(socket.AF_INET) + self.addCleanup(sock.close) + sock.connect(self.server_addr) + incoming = ssl.MemoryBIO() + outgoing = ssl.MemoryBIO() + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.load_verify_locations(SIGNING_CA) + ctx.check_hostname = True + sslobj = ctx.wrap_bio(incoming, outgoing, False, 'localhost') + self.assertIs(sslobj._sslobj.owner, sslobj) + self.assertIsNone(sslobj.cipher()) + self.assertIsNotNone(sslobj.shared_ciphers()) + self.assertRaises(ValueError, sslobj.getpeercert) + if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES: + self.assertIsNone(sslobj.get_channel_binding('tls-unique')) + self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake) + self.assertTrue(sslobj.cipher()) + self.assertIsNotNone(sslobj.shared_ciphers()) + self.assertTrue(sslobj.getpeercert()) + if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES: + self.assertTrue(sslobj.get_channel_binding('tls-unique')) + try: + self.ssl_io_loop(sock, incoming, outgoing, sslobj.unwrap) + except ssl.SSLSyscallError: + # If the server shuts down the TCP connection without sending a + # secure shutdown message, this is reported as SSL_ERROR_SYSCALL + pass + self.assertRaises(ssl.SSLError, sslobj.write, b'foo') + + def test_bio_read_write_data(self): + sock = socket.socket(socket.AF_INET) + self.addCleanup(sock.close) + sock.connect(self.server_addr) + incoming = ssl.MemoryBIO() + outgoing = ssl.MemoryBIO() + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.verify_mode = ssl.CERT_NONE + sslobj = ctx.wrap_bio(incoming, outgoing, False) + self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake) + req = b'FOO\n' + self.ssl_io_loop(sock, incoming, outgoing, sslobj.write, req) + buf = self.ssl_io_loop(sock, incoming, outgoing, sslobj.read, 1024) + self.assertEqual(buf, b'foo\n') + self.ssl_io_loop(sock, incoming, outgoing, sslobj.unwrap) + + +class NetworkedTests(unittest.TestCase): + + def test_timeout_connect_ex(self): + # Issue #12065: on a timeout, connect_ex() should return the original + # errno (mimicking the behaviour of non-SSL sockets). with support.transient_internet(REMOTE_HOST): - sock = socket.socket(socket.AF_INET) - sock.connect((REMOTE_HOST, 443)) - incoming = ssl.MemoryBIO() - outgoing = ssl.MemoryBIO() - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + s = test_wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + do_handshake_on_connect=False) + self.addCleanup(s.close) + s.settimeout(0.0000001) + rc = s.connect_ex((REMOTE_HOST, 443)) + if rc == 0: + self.skipTest("REMOTE_HOST responded too quickly") + self.assertIn(rc, (errno.EAGAIN, errno.EWOULDBLOCK)) + + @unittest.skipUnless(support.IPV6_ENABLED, 'Needs IPv6') + def test_get_server_certificate_ipv6(self): + with support.transient_internet('ipv6.google.com'): + _test_get_server_certificate(self, 'ipv6.google.com', 443) + _test_get_server_certificate_fail(self, 'ipv6.google.com', 443) + + def test_algorithms(self): + # Issue #8484: all algorithms should be available when verifying a + # certificate. + # SHA256 was added in OpenSSL 0.9.8 + if ssl.OPENSSL_VERSION_INFO < (0, 9, 8, 0, 15): + self.skipTest("SHA256 not available on %r" % ssl.OPENSSL_VERSION) + # sha256.tbs-internet.com needs SNI to use the correct certificate + if not ssl.HAS_SNI: + self.skipTest("SNI needed for this test") + # https://sha2.hboeck.de/ was used until 2011-01-08 (no route to host) + remote = ("sha256.tbs-internet.com", 443) + sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") + with support.transient_internet("sha256.tbs-internet.com"): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) ctx.verify_mode = ssl.CERT_REQUIRED - ctx.load_verify_locations(REMOTE_ROOT_CERT) - ctx.check_hostname = True - sslobj = ctx.wrap_bio(incoming, outgoing, False, REMOTE_HOST) - self.assertIs(sslobj._sslobj.owner, sslobj) - self.assertIsNone(sslobj.cipher()) - self.assertIsNotNone(sslobj.shared_ciphers()) - self.assertRaises(ValueError, sslobj.getpeercert) - if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES: - self.assertIsNone(sslobj.get_channel_binding('tls-unique')) - self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake) - self.assertTrue(sslobj.cipher()) - self.assertIsNotNone(sslobj.shared_ciphers()) - self.assertTrue(sslobj.getpeercert()) - if 'tls-unique' in ssl.CHANNEL_BINDING_TYPES: - self.assertTrue(sslobj.get_channel_binding('tls-unique')) + ctx.load_verify_locations(sha256_cert) + s = ctx.wrap_socket(socket.socket(socket.AF_INET), + server_hostname="sha256.tbs-internet.com") try: - self.ssl_io_loop(sock, incoming, outgoing, sslobj.unwrap) - except ssl.SSLSyscallError: - # self-signed.pythontest.net probably shuts down the TCP - # connection without sending a secure shutdown message, and - # this is reported as SSL_ERROR_SYSCALL - pass - self.assertRaises(ssl.SSLError, sslobj.write, b'foo') - sock.close() + s.connect(remote) + if support.verbose: + sys.stdout.write("\nCipher with %r is %r\n" % + (remote, s.cipher())) + sys.stdout.write("Certificate is:\n%s\n" % + pprint.pformat(s.getpeercert())) + finally: + s.close() - def test_read_write_data(self): - with support.transient_internet(REMOTE_HOST): - sock = socket.socket(socket.AF_INET) - sock.connect((REMOTE_HOST, 443)) - incoming = ssl.MemoryBIO() - outgoing = ssl.MemoryBIO() - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - ctx.verify_mode = ssl.CERT_NONE - sslobj = ctx.wrap_bio(incoming, outgoing, False) - self.ssl_io_loop(sock, incoming, outgoing, sslobj.do_handshake) - req = b'GET / HTTP/1.0\r\n\r\n' - self.ssl_io_loop(sock, incoming, outgoing, sslobj.write, req) - buf = self.ssl_io_loop(sock, incoming, outgoing, sslobj.read, 1024) - self.assertEqual(buf[:5], b'HTTP/') - self.ssl_io_loop(sock, incoming, outgoing, sslobj.unwrap) - sock.close() +def _test_get_server_certificate(test, host, port, cert=None): + pem = ssl.get_server_certificate((host, port)) + if not pem: + test.fail("No server certificate on %s:%s!" % (host, port)) + + pem = ssl.get_server_certificate((host, port), ca_certs=cert) + if not pem: + test.fail("No server certificate on %s:%s!" % (host, port)) + if support.verbose: + sys.stdout.write("\nVerified certificate for %s:%s is\n%s\n" % (host, port ,pem)) + +def _test_get_server_certificate_fail(test, host, port): + try: + pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE) + except ssl.SSLError as x: + #should fail + if support.verbose: + sys.stdout.write("%s\n" % x) + else: + test.fail("Got server certificate %s for %s:%s!" % (pem, host, port)) -try: - import threading -except ImportError: - _have_threads = False -else: - _have_threads = True +if _have_threads: from test.ssl_servers import make_https_server class ThreadedEchoServer(threading.Thread): @@ -1910,6 +1932,15 @@ else: if not stripped: # eof, so quit this handler self.running = False + try: + self.sock = self.sslconn.unwrap() + except OSError: + # Many tests shut the TCP connection down + # without an SSL shutdown. This causes + # unwrap() to raise OSError with errno=0! + pass + else: + self.sslconn = None self.close() elif stripped == b'over': if support.verbose and self.server.connectionchatty: @@ -2034,10 +2065,10 @@ else: class EchoServer (asyncore.dispatcher): - class ConnectionHandler(asyncore.dispatcher_with_send): + class ConnectionHandler (asyncore.dispatcher_with_send): def __init__(self, conn, certfile): - self.socket = ssl.wrap_socket(conn, server_side=True, + self.socket = test_wrap_socket(conn, server_side=True, certfile=certfile, do_handshake_on_connect=False) asyncore.dispatcher_with_send.__init__(self, self.socket) @@ -2125,8 +2156,6 @@ else: self.join() if support.verbose: sys.stdout.write(" cleanup: successfully joined.\n") - # make sure that ConnectionHandler is removed from socket_map - asyncore.close_all(ignore_all=True) def start (self, flag=None): self.flag = flag @@ -2147,7 +2176,8 @@ else: self.server.close() def server_params_test(client_context, server_context, indata=b"FOO\n", - chatty=True, connectionchatty=False, sni_name=None): + chatty=True, connectionchatty=False, sni_name=None, + session=None): """ Launch a server, connect a client to it and try various reads and writes. @@ -2158,7 +2188,7 @@ else: connectionchatty=False) with server: with client_context.wrap_socket(socket.socket(), - server_hostname=sni_name) as s: + server_hostname=sni_name, session=session) as s: s.connect((HOST, server.port)) for arg in [indata, bytearray(indata), memoryview(indata)]: if connectionchatty: @@ -2186,6 +2216,8 @@ else: 'client_alpn_protocol': s.selected_alpn_protocol(), 'client_npn_protocol': s.selected_npn_protocol(), 'version': s.version(), + 'session_reused': s.session_reused, + 'session': s.session, }) s.close() stats['server_alpn_protocols'] = server.selected_alpn_protocols @@ -2261,12 +2293,53 @@ else: if support.verbose: sys.stdout.write("\n") for protocol in PROTOCOLS: + if protocol in {ssl.PROTOCOL_TLS_CLIENT, ssl.PROTOCOL_TLS_SERVER}: + continue with self.subTest(protocol=ssl._PROTOCOL_NAMES[protocol]): context = ssl.SSLContext(protocol) context.load_cert_chain(CERTFILE) server_params_test(context, context, chatty=True, connectionchatty=True) + client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + client_context.load_verify_locations(SIGNING_CA) + server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + # server_context.load_verify_locations(SIGNING_CA) + server_context.load_cert_chain(SIGNED_CERTFILE2) + + with self.subTest(client=ssl.PROTOCOL_TLS_CLIENT, server=ssl.PROTOCOL_TLS_SERVER): + server_params_test(client_context=client_context, + server_context=server_context, + chatty=True, connectionchatty=True, + sni_name='fakehostname') + + client_context.check_hostname = False + with self.subTest(client=ssl.PROTOCOL_TLS_SERVER, server=ssl.PROTOCOL_TLS_CLIENT): + with self.assertRaises(ssl.SSLError) as e: + server_params_test(client_context=server_context, + server_context=client_context, + chatty=True, connectionchatty=True, + sni_name='fakehostname') + self.assertIn('called a function you should not call', + str(e.exception)) + + with self.subTest(client=ssl.PROTOCOL_TLS_SERVER, server=ssl.PROTOCOL_TLS_SERVER): + with self.assertRaises(ssl.SSLError) as e: + server_params_test(client_context=server_context, + server_context=server_context, + chatty=True, connectionchatty=True) + self.assertIn('called a function you should not call', + str(e.exception)) + + with self.subTest(client=ssl.PROTOCOL_TLS_CLIENT, server=ssl.PROTOCOL_TLS_CLIENT): + with self.assertRaises(ssl.SSLError) as e: + server_params_test(client_context=server_context, + server_context=client_context, + chatty=True, connectionchatty=True) + self.assertIn('called a function you should not call', + str(e.exception)) + + def test_getpeercert(self): if support.verbose: sys.stdout.write("\n") @@ -2400,7 +2473,7 @@ else: connectionchatty=False) with server, \ socket.socket() as sock, \ - ssl.wrap_socket(sock, + test_wrap_socket(sock, certfile=certfile, ssl_version=ssl.PROTOCOL_TLSv1) as s: try: @@ -2447,7 +2520,7 @@ else: c.connect((HOST, port)) listener_gone.wait() try: - ssl_sock = ssl.wrap_socket(c) + ssl_sock = test_wrap_socket(c) except OSError: pass else: @@ -2637,7 +2710,7 @@ else: sys.stdout.write( " client: read %r from server, starting TLS...\n" % msg) - conn = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1) + conn = test_wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1) wrapped = True elif indata == b"ENDTLS" and msg.startswith(b"ok"): # ENDTLS ok, switch back to clear text @@ -2696,7 +2769,7 @@ else: indata = b"FOO\n" server = AsyncoreEchoServer(CERTFILE) with server: - s = ssl.wrap_socket(socket.socket()) + s = test_wrap_socket(socket.socket()) s.connect(('127.0.0.1', server.port)) if support.verbose: sys.stdout.write( @@ -2729,7 +2802,7 @@ else: chatty=True, connectionchatty=False) with server: - s = ssl.wrap_socket(socket.socket(), + s = test_wrap_socket(socket.socket(), server_side=False, certfile=CERTFILE, ca_certs=CERTFILE, @@ -2747,12 +2820,13 @@ else: count, addr = s.recvfrom_into(b) return b[:count] - # (name, method, whether to expect success, *args) + # (name, method, expect success?, *args, return value func) send_methods = [ - ('send', s.send, True, []), - ('sendto', s.sendto, False, ["some.address"]), - ('sendall', s.sendall, True, []), + ('send', s.send, True, [], len), + ('sendto', s.sendto, False, ["some.address"], len), + ('sendall', s.sendall, True, [], lambda x: None), ] + # (name, method, whether to expect success, *args) recv_methods = [ ('recv', s.recv, True, []), ('recvfrom', s.recvfrom, False, ["some.address"]), @@ -2761,10 +2835,13 @@ else: ] data_prefix = "PREFIX_" - for meth_name, send_meth, expect_success, args in send_methods: + for (meth_name, send_meth, expect_success, args, + ret_val_meth) in send_methods: indata = (data_prefix + meth_name).encode('ascii') try: - send_meth(indata, *args) + ret = send_meth(indata, *args) + msg = "sending with {}".format(meth_name) + self.assertEqual(ret, ret_val_meth(indata), msg=msg) outdata = s.read() if outdata != indata.lower(): self.fail( @@ -2849,7 +2926,7 @@ else: self.addCleanup(server.__exit__, None, None) s = socket.create_connection((HOST, server.port)) self.addCleanup(s.close) - s = ssl.wrap_socket(s, suppress_ragged_eofs=False) + s = test_wrap_socket(s, suppress_ragged_eofs=False) self.addCleanup(s.close) # recv/read(0) should return no data @@ -2871,7 +2948,7 @@ else: chatty=True, connectionchatty=False) with server: - s = ssl.wrap_socket(socket.socket(), + s = test_wrap_socket(socket.socket(), server_side=False, certfile=CERTFILE, ca_certs=CERTFILE, @@ -2925,12 +3002,12 @@ else: c.connect((host, port)) # Will attempt handshake and time out self.assertRaisesRegex(socket.timeout, "timed out", - ssl.wrap_socket, c) + test_wrap_socket, c) finally: c.close() try: c = socket.socket(socket.AF_INET) - c = ssl.wrap_socket(c) + c = test_wrap_socket(c) c.settimeout(0.2) # Will attempt handshake and time out self.assertRaisesRegex(socket.timeout, "timed out", @@ -2953,6 +3030,7 @@ else: host = "127.0.0.1" port = support.bind_port(server) server = context.wrap_socket(server, server_side=True) + self.assertTrue(server.server_side) evt = threading.Event() remote = None @@ -3055,7 +3133,7 @@ else: chatty=True, connectionchatty=False) with server: - s = ssl.wrap_socket(socket.socket(), + s = test_wrap_socket(socket.socket(), server_side=False, certfile=CERTFILE, ca_certs=CERTFILE, @@ -3080,7 +3158,7 @@ else: s.close() # now, again - s = ssl.wrap_socket(socket.socket(), + s = test_wrap_socket(socket.socket(), server_side=False, certfile=CERTFILE, ca_certs=CERTFILE, @@ -3390,6 +3468,111 @@ else: s.sendfile(file) self.assertEqual(s.recv(1024), TEST_DATA) + def test_session(self): + server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) + server_context.load_cert_chain(SIGNED_CERTFILE) + client_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) + client_context.verify_mode = ssl.CERT_REQUIRED + client_context.load_verify_locations(SIGNING_CA) + + # first connection without session + stats = server_params_test(client_context, server_context) + session = stats['session'] + self.assertTrue(session.id) + self.assertGreater(session.time, 0) + self.assertGreater(session.timeout, 0) + self.assertTrue(session.has_ticket) + if ssl.OPENSSL_VERSION_INFO > (1, 0, 1): + self.assertGreater(session.ticket_lifetime_hint, 0) + self.assertFalse(stats['session_reused']) + sess_stat = server_context.session_stats() + self.assertEqual(sess_stat['accept'], 1) + self.assertEqual(sess_stat['hits'], 0) + + # reuse session + stats = server_params_test(client_context, server_context, session=session) + sess_stat = server_context.session_stats() + self.assertEqual(sess_stat['accept'], 2) + self.assertEqual(sess_stat['hits'], 1) + self.assertTrue(stats['session_reused']) + session2 = stats['session'] + self.assertEqual(session2.id, session.id) + self.assertEqual(session2, session) + self.assertIsNot(session2, session) + self.assertGreaterEqual(session2.time, session.time) + self.assertGreaterEqual(session2.timeout, session.timeout) + + # another one without session + stats = server_params_test(client_context, server_context) + self.assertFalse(stats['session_reused']) + session3 = stats['session'] + self.assertNotEqual(session3.id, session.id) + self.assertNotEqual(session3, session) + sess_stat = server_context.session_stats() + self.assertEqual(sess_stat['accept'], 3) + self.assertEqual(sess_stat['hits'], 1) + + # reuse session again + stats = server_params_test(client_context, server_context, session=session) + self.assertTrue(stats['session_reused']) + session4 = stats['session'] + self.assertEqual(session4.id, session.id) + self.assertEqual(session4, session) + self.assertGreaterEqual(session4.time, session.time) + self.assertGreaterEqual(session4.timeout, session.timeout) + sess_stat = server_context.session_stats() + self.assertEqual(sess_stat['accept'], 4) + self.assertEqual(sess_stat['hits'], 2) + + def test_session_handling(self): + context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + context.verify_mode = ssl.CERT_REQUIRED + context.load_verify_locations(CERTFILE) + context.load_cert_chain(CERTFILE) + + context2 = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + context2.verify_mode = ssl.CERT_REQUIRED + context2.load_verify_locations(CERTFILE) + context2.load_cert_chain(CERTFILE) + + server = ThreadedEchoServer(context=context, chatty=False) + with server: + with context.wrap_socket(socket.socket()) as s: + # session is None before handshake + self.assertEqual(s.session, None) + self.assertEqual(s.session_reused, None) + s.connect((HOST, server.port)) + session = s.session + self.assertTrue(session) + with self.assertRaises(TypeError) as e: + s.session = object + self.assertEqual(str(e.exception), 'Value is not a SSLSession.') + + with context.wrap_socket(socket.socket()) as s: + s.connect((HOST, server.port)) + # cannot set session after handshake + with self.assertRaises(ValueError) as e: + s.session = session + self.assertEqual(str(e.exception), + 'Cannot set session after handshake.') + + with context.wrap_socket(socket.socket()) as s: + # can set session before handshake and before the + # connection was established + s.session = session + s.connect((HOST, server.port)) + self.assertEqual(s.session.id, session.id) + self.assertEqual(s.session, session) + self.assertEqual(s.session_reused, True) + + with context2.wrap_socket(socket.socket()) as s: + # cannot re-use session with a different SSLContext + with self.assertRaises(ValueError) as e: + s.session = session + s.connect((HOST, server.port)) + self.assertEqual(str(e.exception), + 'Session refers to a different SSLContext.') + def test_main(verbose=False): if support.verbose: @@ -3402,7 +3585,7 @@ def test_main(verbose=False): with warnings.catch_warnings(): warnings.filterwarnings( 'ignore', - 'dist\(\) and linux_distribution\(\) ' + r'dist\(\) and linux_distribution\(\) ' 'functions are deprecated .*', PendingDeprecationWarning, ) @@ -3424,18 +3607,20 @@ def test_main(verbose=False): pass for filename in [ - CERTFILE, REMOTE_ROOT_CERT, BYTES_CERTFILE, + CERTFILE, BYTES_CERTFILE, ONLYCERT, ONLYKEY, BYTES_ONLYCERT, BYTES_ONLYKEY, SIGNED_CERTFILE, SIGNED_CERTFILE2, SIGNING_CA, BADCERT, BADKEY, EMPTYCERT]: if not os.path.exists(filename): raise support.TestFailed("Can't read certificate file %r" % filename) - tests = [ContextTests, BasicSocketTests, SSLErrorTests, MemoryBIOTests] + tests = [ + ContextTests, BasicSocketTests, SSLErrorTests, MemoryBIOTests, + SimpleBackgroundTests, + ] if support.is_resource_enabled('network'): tests.append(NetworkedTests) - tests.append(NetworkedBIOTests) if _have_threads: thread_info = support.threading_setup() diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py index 0089ae8..4b3fd36 100644 --- a/Lib/test/test_statistics.py +++ b/Lib/test/test_statistics.py @@ -21,6 +21,10 @@ import statistics # === Helper functions and class === +def sign(x): + """Return -1.0 for negatives, including -0.0, otherwise +1.0.""" + return math.copysign(1, x) + def _nan_equal(a, b): """Return True if a and b are both the same kind of NAN. @@ -264,6 +268,13 @@ class NumericTestCase(unittest.TestCase): # === Test the helpers === # ======================== +class TestSign(unittest.TestCase): + """Test that the helper function sign() works correctly.""" + def testZeroes(self): + # Test that signed zeroes report their sign correctly. + self.assertEqual(sign(0.0), +1) + self.assertEqual(sign(-0.0), -1) + # --- Tests for approx_equal --- @@ -659,7 +670,7 @@ class DocTests(unittest.TestCase): @unittest.skipIf(sys.flags.optimize >= 2, "Docstrings are omitted with -OO and above") def test_doc_tests(self): - failed, tried = doctest.testmod(statistics) + failed, tried = doctest.testmod(statistics, optionflags=doctest.ELLIPSIS) self.assertGreater(tried, 0) self.assertEqual(failed, 0) @@ -702,9 +713,9 @@ class ExactRatioTest(unittest.TestCase): def test_decimal(self): D = Decimal _exact_ratio = statistics._exact_ratio - self.assertEqual(_exact_ratio(D("0.125")), (125, 1000)) - self.assertEqual(_exact_ratio(D("12.345")), (12345, 1000)) - self.assertEqual(_exact_ratio(D("-1.98")), (-198, 100)) + self.assertEqual(_exact_ratio(D("0.125")), (1, 8)) + self.assertEqual(_exact_ratio(D("12.345")), (2469, 200)) + self.assertEqual(_exact_ratio(D("-1.98")), (-99, 50)) def test_inf(self): INF = float("INF") @@ -743,18 +754,18 @@ class ExactRatioTest(unittest.TestCase): class DecimalToRatioTest(unittest.TestCase): - # Test _decimal_to_ratio private function. + # Test _exact_ratio private function. def test_infinity(self): # Test that INFs are handled correctly. inf = Decimal('INF') - self.assertEqual(statistics._decimal_to_ratio(inf), (inf, None)) - self.assertEqual(statistics._decimal_to_ratio(-inf), (-inf, None)) + self.assertEqual(statistics._exact_ratio(inf), (inf, None)) + self.assertEqual(statistics._exact_ratio(-inf), (-inf, None)) def test_nan(self): # Test that NANs are handled correctly. for nan in (Decimal('NAN'), Decimal('sNAN')): - num, den = statistics._decimal_to_ratio(nan) + num, den = statistics._exact_ratio(nan) # Because NANs always compare non-equal, we cannot use assertEqual. # Nor can we use an identity test, as we don't guarantee anything # about the object identity. @@ -767,30 +778,30 @@ class DecimalToRatioTest(unittest.TestCase): for d in numbers: # First test positive decimals. assert d > 0 - num, den = statistics._decimal_to_ratio(d) + num, den = statistics._exact_ratio(d) self.assertGreaterEqual(num, 0) self.assertGreater(den, 0) # Then test negative decimals. - num, den = statistics._decimal_to_ratio(-d) + num, den = statistics._exact_ratio(-d) self.assertLessEqual(num, 0) self.assertGreater(den, 0) def test_negative_exponent(self): # Test result when the exponent is negative. - t = statistics._decimal_to_ratio(Decimal("0.1234")) - self.assertEqual(t, (1234, 10000)) + t = statistics._exact_ratio(Decimal("0.1234")) + self.assertEqual(t, (617, 5000)) def test_positive_exponent(self): # Test results when the exponent is positive. - t = statistics._decimal_to_ratio(Decimal("1.234e7")) + t = statistics._exact_ratio(Decimal("1.234e7")) self.assertEqual(t, (12340000, 1)) def test_regression_20536(self): # Regression test for issue 20536. # See http://bugs.python.org/issue20536 - t = statistics._decimal_to_ratio(Decimal("1e2")) + t = statistics._exact_ratio(Decimal("1e2")) self.assertEqual(t, (100, 1)) - t = statistics._decimal_to_ratio(Decimal("1.47e5")) + t = statistics._exact_ratio(Decimal("1.47e5")) self.assertEqual(t, (147000, 1)) @@ -971,6 +982,34 @@ class ConvertTest(unittest.TestCase): self.assertTrue(_nan_equal(x, nan)) +class FailNegTest(unittest.TestCase): + """Test _fail_neg private function.""" + + def test_pass_through(self): + # Test that values are passed through unchanged. + values = [1, 2.0, Fraction(3), Decimal(4)] + new = list(statistics._fail_neg(values)) + self.assertEqual(values, new) + + def test_negatives_raise(self): + # Test that negatives raise an exception. + for x in [1, 2.0, Fraction(3), Decimal(4)]: + seq = [-x] + it = statistics._fail_neg(seq) + self.assertRaises(statistics.StatisticsError, next, it) + + def test_error_msg(self): + # Test that a given error message is used. + msg = "badness #%d" % random.randint(10000, 99999) + try: + next(statistics._fail_neg([-1], msg)) + except statistics.StatisticsError as e: + errmsg = e.args[0] + else: + self.fail("expected exception, but it didn't happen") + self.assertEqual(errmsg, msg) + + # === Tests for public functions === class UnivariateCommonMixin: @@ -1082,13 +1121,13 @@ class UnivariateTypeMixin: Not all tests to do with types need go in this class. Only those that rely on the function returning the same type as its input data. """ - def test_types_conserved(self): - # Test that functions keeps the same type as their data points. - # (Excludes mixed data types.) This only tests the type of the return - # result, not the value. + def prepare_types_for_conservation_test(self): + """Return the types which are expected to be conserved.""" class MyFloat(float): def __truediv__(self, other): return type(self)(super().__truediv__(other)) + def __rtruediv__(self, other): + return type(self)(super().__rtruediv__(other)) def __sub__(self, other): return type(self)(super().__sub__(other)) def __rsub__(self, other): @@ -1098,9 +1137,14 @@ class UnivariateTypeMixin: def __add__(self, other): return type(self)(super().__add__(other)) __radd__ = __add__ + return (float, Decimal, Fraction, MyFloat) + def test_types_conserved(self): + # Test that functions keeps the same type as their data points. + # (Excludes mixed data types.) This only tests the type of the return + # result, not the value. data = self.prepare_data() - for kind in (float, Decimal, Fraction, MyFloat): + for kind in self.prepare_types_for_conservation_test(): d = [kind(x) for x in data] result = self.func(d) self.assertIs(type(result), kind) @@ -1275,12 +1319,16 @@ class AverageMixin(UnivariateCommonMixin): for x in (23, 42.5, 1.3e15, Fraction(15, 19), Decimal('0.28')): self.assertEqual(self.func([x]), x) + def prepare_values_for_repeated_single_test(self): + return (3.5, 17, 2.5e15, Fraction(61, 67), Decimal('4.9712')) + def test_repeated_single_value(self): # The average of a single repeated value is the value itself. - for x in (3.5, 17, 2.5e15, Fraction(61, 67), Decimal('4.9712')): + for x in self.prepare_values_for_repeated_single_test(): for count in (2, 5, 10, 20): - data = [x]*count - self.assertEqual(self.func(data), x) + with self.subTest(x=x, count=count): + data = [x]*count + self.assertEqual(self.func(data), x) class TestMean(NumericTestCase, AverageMixin, UnivariateTypeMixin): @@ -1304,7 +1352,7 @@ class TestMean(NumericTestCase, AverageMixin, UnivariateTypeMixin): self.assertEqual(self.func(data), 22.015625) def test_decimals(self): - # Test mean with ints. + # Test mean with Decimals. D = Decimal data = [D("1.634"), D("2.517"), D("3.912"), D("4.072"), D("5.813")] random.shuffle(data) @@ -1379,6 +1427,94 @@ class TestMean(NumericTestCase, AverageMixin, UnivariateTypeMixin): self.assertEqual(statistics.mean([tiny]*n), tiny) +class TestHarmonicMean(NumericTestCase, AverageMixin, UnivariateTypeMixin): + def setUp(self): + self.func = statistics.harmonic_mean + + def prepare_data(self): + # Override mixin method. + values = super().prepare_data() + values.remove(0) + return values + + def prepare_values_for_repeated_single_test(self): + # Override mixin method. + return (3.5, 17, 2.5e15, Fraction(61, 67), Decimal('4.125')) + + def test_zero(self): + # Test that harmonic mean returns zero when given zero. + values = [1, 0, 2] + self.assertEqual(self.func(values), 0) + + def test_negative_error(self): + # Test that harmonic mean raises when given a negative value. + exc = statistics.StatisticsError + for values in ([-1], [1, -2, 3]): + with self.subTest(values=values): + self.assertRaises(exc, self.func, values) + + def test_ints(self): + # Test harmonic mean with ints. + data = [2, 4, 4, 8, 16, 16] + random.shuffle(data) + self.assertEqual(self.func(data), 6*4/5) + + def test_floats_exact(self): + # Test harmonic mean with some carefully chosen floats. + data = [1/8, 1/4, 1/4, 1/2, 1/2] + random.shuffle(data) + self.assertEqual(self.func(data), 1/4) + self.assertEqual(self.func([0.25, 0.5, 1.0, 1.0]), 0.5) + + def test_singleton_lists(self): + # Test that harmonic mean([x]) returns (approximately) x. + for x in range(1, 101): + self.assertEqual(self.func([x]), x) + + def test_decimals_exact(self): + # Test harmonic mean with some carefully chosen Decimals. + D = Decimal + self.assertEqual(self.func([D(15), D(30), D(60), D(60)]), D(30)) + data = [D("0.05"), D("0.10"), D("0.20"), D("0.20")] + random.shuffle(data) + self.assertEqual(self.func(data), D("0.10")) + data = [D("1.68"), D("0.32"), D("5.94"), D("2.75")] + random.shuffle(data) + self.assertEqual(self.func(data), D(66528)/70723) + + def test_fractions(self): + # Test harmonic mean with Fractions. + F = Fraction + data = [F(1, 2), F(2, 3), F(3, 4), F(4, 5), F(5, 6), F(6, 7), F(7, 8)] + random.shuffle(data) + self.assertEqual(self.func(data), F(7*420, 4029)) + + def test_inf(self): + # Test harmonic mean with infinity. + values = [2.0, float('inf'), 1.0] + self.assertEqual(self.func(values), 2.0) + + def test_nan(self): + # Test harmonic mean with NANs. + values = [2.0, float('nan'), 1.0] + self.assertTrue(math.isnan(self.func(values))) + + def test_multiply_data_points(self): + # Test multiplying every data point by a constant. + c = 111 + data = [3.4, 4.5, 4.9, 6.7, 6.8, 7.2, 8.0, 8.1, 9.4] + expected = self.func(data)*c + result = self.func([x*c for x in data]) + self.assertEqual(result, expected) + + def test_doubled_data(self): + # Harmonic mean of [a,b...z] should be same as for [a,a,b,b...z,z]. + data = [random.uniform(1, 5) for _ in range(1000)] + expected = self.func(data) + actual = self.func(data*2) + self.assertApproxEqual(actual, expected) + + class TestMedian(NumericTestCase, AverageMixin): # Common tests for median and all median.* functions. def setUp(self): @@ -1600,6 +1736,22 @@ class TestMedianGrouped(TestMedian): data = [220, 220, 240, 260, 260, 260, 260, 280, 280, 300, 320, 340] self.assertEqual(self.func(data, 20), 265.0) + def test_data_type_error(self): + # Test median_grouped with str, bytes data types for data and interval + data = ["", "", ""] + self.assertRaises(TypeError, self.func, data) + #--- + data = [b"", b"", b""] + self.assertRaises(TypeError, self.func, data) + #--- + data = [1, 2, 3] + interval = "" + self.assertRaises(TypeError, self.func, data, interval) + #--- + data = [1, 2, 3] + interval = b"" + self.assertRaises(TypeError, self.func, data, interval) + class TestMode(NumericTestCase, AverageMixin, UnivariateTypeMixin): # Test cases for the discrete version of mode. diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 772cd06..72b1910 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -23,9 +23,9 @@ def escapestr(text, ampm): """ new_text = re.escape(text) new_text = new_text.replace(re.escape(ampm), ampm) - new_text = new_text.replace('\%', '%') - new_text = new_text.replace('\:', ':') - new_text = new_text.replace('\?', '?') + new_text = new_text.replace(r'\%', '%') + new_text = new_text.replace(r'\:', ':') + new_text = new_text.replace(r'\?', '?') return new_text diff --git a/Lib/test/test_strlit.py b/Lib/test/test_string_literals.py similarity index 79% rename from Lib/test/test_strlit.py rename to Lib/test/test_string_literals.py index 87cffe8..aba4fc4 100644 --- a/Lib/test/test_strlit.py +++ b/Lib/test/test_string_literals.py @@ -31,6 +31,7 @@ import os import sys import shutil import tempfile +import warnings import unittest @@ -104,6 +105,29 @@ class TestLiterals(unittest.TestCase): self.assertRaises(SyntaxError, eval, r""" '\U000000' """) self.assertRaises(SyntaxError, eval, r""" '\U0000000' """) + def test_eval_str_invalid_escape(self): + for b in range(1, 128): + if b in b"""\n\r"'01234567NU\\abfnrtuvx""": + continue + with self.assertWarns(DeprecationWarning): + self.assertEqual(eval(r"'\%c'" % b), '\\' + chr(b)) + + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter('always', category=DeprecationWarning) + eval("'''\n\\z'''") + self.assertEqual(len(w), 1) + self.assertEqual(w[0].filename, '') + self.assertEqual(w[0].lineno, 2) + + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter('error', category=DeprecationWarning) + with self.assertRaises(SyntaxError) as cm: + eval("'''\n\\z'''") + exc = cm.exception + self.assertEqual(w, []) + self.assertEqual(exc.filename, '') + self.assertEqual(exc.lineno, 2) + def test_eval_str_raw(self): self.assertEqual(eval(""" r'x' """), 'x') self.assertEqual(eval(r""" r'\x01' """), '\\' + 'x01') @@ -121,15 +145,38 @@ class TestLiterals(unittest.TestCase): self.assertEqual(eval(""" b'\x01' """), byte(1)) self.assertEqual(eval(r""" b'\x81' """), byte(0x81)) self.assertRaises(SyntaxError, eval, """ b'\x81' """) - self.assertEqual(eval(r""" b'\u1881' """), b'\\' + b'u1881') + self.assertEqual(eval(r""" br'\u1881' """), b'\\' + b'u1881') self.assertRaises(SyntaxError, eval, """ b'\u1881' """) - self.assertEqual(eval(r""" b'\U0001d120' """), b'\\' + b'U0001d120') + self.assertEqual(eval(r""" br'\U0001d120' """), b'\\' + b'U0001d120') self.assertRaises(SyntaxError, eval, """ b'\U0001d120' """) def test_eval_bytes_incomplete(self): self.assertRaises(SyntaxError, eval, r""" b'\x' """) self.assertRaises(SyntaxError, eval, r""" b'\x0' """) + def test_eval_bytes_invalid_escape(self): + for b in range(1, 128): + if b in b"""\n\r"'01234567\\abfnrtvx""": + continue + with self.assertWarns(DeprecationWarning): + self.assertEqual(eval(r"b'\%c'" % b), b'\\' + bytes([b])) + + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter('always', category=DeprecationWarning) + eval("b'''\n\\z'''") + self.assertEqual(len(w), 1) + self.assertEqual(w[0].filename, '') + self.assertEqual(w[0].lineno, 2) + + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter('error', category=DeprecationWarning) + with self.assertRaises(SyntaxError) as cm: + eval("b'''\n\\z'''") + exc = cm.exception + self.assertEqual(w, []) + self.assertEqual(exc.filename, '') + self.assertEqual(exc.lineno, 2) + def test_eval_bytes_raw(self): self.assertEqual(eval(""" br'x' """), b'x') self.assertEqual(eval(""" rb'x' """), b'x') diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index 85126e6..2cf0926 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -5,7 +5,6 @@ import time import locale import re import os -import sys from test import support from datetime import date as datetime_date @@ -130,7 +129,7 @@ class TimeRETests(unittest.TestCase): def test_pattern_escaping(self): # Make sure any characters in the format string that might be taken as # regex syntax is escaped. - pattern_string = self.time_re.pattern("\d+") + pattern_string = self.time_re.pattern(r"\d+") self.assertIn(r"\\d\+", pattern_string, "%s does not have re characters escaped properly" % pattern_string) @@ -153,8 +152,8 @@ class TimeRETests(unittest.TestCase): "'%s' using '%s'; group 'a' = '%s', group 'b' = %s'" % (found.string, found.re.pattern, found.group('a'), found.group('b'))) - for directive in ('a','A','b','B','c','d','H','I','j','m','M','p','S', - 'U','w','W','x','X','y','Y','Z','%'): + for directive in ('a','A','b','B','c','d','G','H','I','j','m','M','p', + 'S','u','U','V','w','W','x','X','y','Y','Z','%'): compiled = self.time_re.compile("%" + directive) found = compiled.match(time.strftime("%" + directive)) self.assertTrue(found, "Matching failed on '%s' using '%s' regex" % @@ -171,9 +170,9 @@ class TimeRETests(unittest.TestCase): def test_matching_with_escapes(self): # Make sure a format that requires escaping of characters works - compiled_re = self.time_re.compile("\w+ %m") - found = compiled_re.match("\w+ 10") - self.assertTrue(found, "Escaping failed of format '\w+ 10'") + compiled_re = self.time_re.compile(r"\w+ %m") + found = compiled_re.match(r"\w+ 10") + self.assertTrue(found, r"Escaping failed of format '\w+ 10'") def test_locale_data_w_regex_metacharacters(self): # Check that if locale data contains regex metacharacters they are @@ -219,6 +218,26 @@ class StrptimeTests(unittest.TestCase): else: self.fail("'%s' did not raise ValueError" % bad_format) + # Ambiguous or incomplete cases using ISO year/week/weekday directives + # 1. ISO week (%V) is specified, but the year is specified with %Y + # instead of %G + with self.assertRaises(ValueError): + _strptime._strptime("1999 50", "%Y %V") + # 2. ISO year (%G) and ISO week (%V) are specified, but weekday is not + with self.assertRaises(ValueError): + _strptime._strptime("1999 51", "%G %V") + # 3. ISO year (%G) and weekday are specified, but ISO week (%V) is not + for w in ('A', 'a', 'w', 'u'): + with self.assertRaises(ValueError): + _strptime._strptime("1999 51","%G %{}".format(w)) + # 4. ISO year is specified alone (e.g. time.strptime('2015', '%G')) + with self.assertRaises(ValueError): + _strptime._strptime("2015", "%G") + # 5. Julian/ordinal day (%j) is specified with %G, but not %Y + with self.assertRaises(ValueError): + _strptime._strptime("1999 256", "%G %j") + + def test_strptime_exception_context(self): # check that this doesn't chain exceptions needlessly (see #17572) with self.assertRaises(ValueError) as e: @@ -290,7 +309,7 @@ class StrptimeTests(unittest.TestCase): def test_weekday(self): # Test weekday directives - for directive in ('A', 'a', 'w'): + for directive in ('A', 'a', 'w', 'u'): self.helper(directive,6) def test_julian(self): @@ -384,7 +403,7 @@ class StrptimeTests(unittest.TestCase): # unbalanced parentheses when the regex is compiled if they are not # escaped. # Test instigated by bug #796149 . - need_escaping = ".^$*+?{}\[]|)(" + need_escaping = r".^$*+?{}\[]|)(" self.assertTrue(_strptime._strptime_time(need_escaping, need_escaping)) def test_feb29_on_leap_year_without_year(self): @@ -453,20 +472,37 @@ class CalculationTests(unittest.TestCase): "Calculation of day of the week failed;" "%s != %s" % (result.tm_wday, self.time_tuple.tm_wday)) + if support.is_android: + # Issue #26929: strftime() on Android incorrectly formats %V or %G for + # the last or the first incomplete week in a year. + _ymd_excluded = ((1905, 1, 1), (1906, 12, 31), (2008, 12, 29), + (1917, 12, 31)) + _formats_excluded = ('%G %V',) + else: + _ymd_excluded = () + _formats_excluded = () + def test_week_of_year_and_day_of_week_calculation(self): # Should be able to infer date if given year, week of year (%U or %W) # and day of the week def test_helper(ymd_tuple, test_reason): - for directive in ('W', 'U'): - format_string = "%%Y %%%s %%w" % directive - dt_date = datetime_date(*ymd_tuple) - strp_input = dt_date.strftime(format_string) - strp_output = _strptime._strptime_time(strp_input, format_string) - self.assertTrue(strp_output[:3] == ymd_tuple, - "%s(%s) test failed w/ '%s': %s != %s (%s != %s)" % - (test_reason, directive, strp_input, - strp_output[:3], ymd_tuple, - strp_output[7], dt_date.timetuple()[7])) + for year_week_format in ('%Y %W', '%Y %U', '%G %V'): + if (year_week_format in self._formats_excluded and + ymd_tuple in self._ymd_excluded): + return + for weekday_format in ('%w', '%u', '%a', '%A'): + format_string = year_week_format + ' ' + weekday_format + with self.subTest(test_reason, + date=ymd_tuple, + format=format_string): + dt_date = datetime_date(*ymd_tuple) + strp_input = dt_date.strftime(format_string) + strp_output = _strptime._strptime_time(strp_input, + format_string) + msg = "%r: %s != %s" % (strp_input, + strp_output[7], + dt_date.timetuple()[7]) + self.assertEqual(strp_output[:3], ymd_tuple, msg) test_helper((1901, 1, 3), "week 0") test_helper((1901, 1, 8), "common case") test_helper((1901, 1, 13), "day on Sunday") @@ -498,33 +534,48 @@ class CalculationTests(unittest.TestCase): self.assertEqual(_strptime._strptime_time(value, format)[:-1], expected) check('2015 0 0', '%Y %U %w', 2014, 12, 28, 0, 0, 0, 6, 362) check('2015 0 0', '%Y %W %w', 2015, 1, 4, 0, 0, 0, 6, 4) + check('2015 1 1', '%G %V %u', 2014, 12, 29, 0, 0, 0, 0, 363) check('2015 0 1', '%Y %U %w', 2014, 12, 29, 0, 0, 0, 0, 363) check('2015 0 1', '%Y %W %w', 2014, 12, 29, 0, 0, 0, 0, 363) + check('2015 1 2', '%G %V %u', 2014, 12, 30, 0, 0, 0, 1, 364) check('2015 0 2', '%Y %U %w', 2014, 12, 30, 0, 0, 0, 1, 364) check('2015 0 2', '%Y %W %w', 2014, 12, 30, 0, 0, 0, 1, 364) + check('2015 1 3', '%G %V %u', 2014, 12, 31, 0, 0, 0, 2, 365) check('2015 0 3', '%Y %U %w', 2014, 12, 31, 0, 0, 0, 2, 365) check('2015 0 3', '%Y %W %w', 2014, 12, 31, 0, 0, 0, 2, 365) + check('2015 1 4', '%G %V %u', 2015, 1, 1, 0, 0, 0, 3, 1) check('2015 0 4', '%Y %U %w', 2015, 1, 1, 0, 0, 0, 3, 1) check('2015 0 4', '%Y %W %w', 2015, 1, 1, 0, 0, 0, 3, 1) + check('2015 1 5', '%G %V %u', 2015, 1, 2, 0, 0, 0, 4, 2) check('2015 0 5', '%Y %U %w', 2015, 1, 2, 0, 0, 0, 4, 2) check('2015 0 5', '%Y %W %w', 2015, 1, 2, 0, 0, 0, 4, 2) + check('2015 1 6', '%G %V %u', 2015, 1, 3, 0, 0, 0, 5, 3) check('2015 0 6', '%Y %U %w', 2015, 1, 3, 0, 0, 0, 5, 3) check('2015 0 6', '%Y %W %w', 2015, 1, 3, 0, 0, 0, 5, 3) + check('2015 1 7', '%G %V %u', 2015, 1, 4, 0, 0, 0, 6, 4) check('2009 0 0', '%Y %U %w', 2008, 12, 28, 0, 0, 0, 6, 363) check('2009 0 0', '%Y %W %w', 2009, 1, 4, 0, 0, 0, 6, 4) + check('2009 1 1', '%G %V %u', 2008, 12, 29, 0, 0, 0, 0, 364) check('2009 0 1', '%Y %U %w', 2008, 12, 29, 0, 0, 0, 0, 364) check('2009 0 1', '%Y %W %w', 2008, 12, 29, 0, 0, 0, 0, 364) + check('2009 1 2', '%G %V %u', 2008, 12, 30, 0, 0, 0, 1, 365) check('2009 0 2', '%Y %U %w', 2008, 12, 30, 0, 0, 0, 1, 365) check('2009 0 2', '%Y %W %w', 2008, 12, 30, 0, 0, 0, 1, 365) + check('2009 1 3', '%G %V %u', 2008, 12, 31, 0, 0, 0, 2, 366) check('2009 0 3', '%Y %U %w', 2008, 12, 31, 0, 0, 0, 2, 366) check('2009 0 3', '%Y %W %w', 2008, 12, 31, 0, 0, 0, 2, 366) + check('2009 1 4', '%G %V %u', 2009, 1, 1, 0, 0, 0, 3, 1) check('2009 0 4', '%Y %U %w', 2009, 1, 1, 0, 0, 0, 3, 1) check('2009 0 4', '%Y %W %w', 2009, 1, 1, 0, 0, 0, 3, 1) + check('2009 1 5', '%G %V %u', 2009, 1, 2, 0, 0, 0, 4, 2) check('2009 0 5', '%Y %U %w', 2009, 1, 2, 0, 0, 0, 4, 2) check('2009 0 5', '%Y %W %w', 2009, 1, 2, 0, 0, 0, 4, 2) + check('2009 1 6', '%G %V %u', 2009, 1, 3, 0, 0, 0, 5, 3) check('2009 0 6', '%Y %U %w', 2009, 1, 3, 0, 0, 0, 5, 3) check('2009 0 6', '%Y %W %w', 2009, 1, 3, 0, 0, 0, 5, 3) + check('2009 1 7', '%G %V %u', 2009, 1, 4, 0, 0, 0, 6, 4) + class CacheTests(unittest.TestCase): """Test that caching works properly.""" diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 9b8178f..4d9d601 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -1,5 +1,6 @@ from collections import abc import array +import math import operator import unittest import struct @@ -15,22 +16,10 @@ byteorders = '', '@', '=', '<', '>', '!' def iter_integer_formats(byteorders=byteorders): for code in integer_codes: for byteorder in byteorders: - if (byteorder in ('', '@') and code in ('q', 'Q') and - not HAVE_LONG_LONG): - continue if (byteorder not in ('', '@') and code in ('n', 'N')): continue yield code, byteorder -# Native 'q' packing isn't available on systems that don't have the C -# long long type. -try: - struct.pack('q', 5) -except struct.error: - HAVE_LONG_LONG = False -else: - HAVE_LONG_LONG = True - def string_reverse(s): return s[::-1] @@ -158,9 +147,7 @@ class StructTest(unittest.TestCase): self.assertEqual(size, expected_size[code]) # native integer sizes - native_pairs = 'bB', 'hH', 'iI', 'lL', 'nN' - if HAVE_LONG_LONG: - native_pairs += 'qQ', + native_pairs = 'bB', 'hH', 'iI', 'lL', 'nN', 'qQ' for format_pair in native_pairs: for byteorder in '', '@': signed_size = struct.calcsize(byteorder + format_pair[0]) @@ -173,9 +160,8 @@ class StructTest(unittest.TestCase): self.assertLessEqual(4, struct.calcsize('l')) self.assertLessEqual(struct.calcsize('h'), struct.calcsize('i')) self.assertLessEqual(struct.calcsize('i'), struct.calcsize('l')) - if HAVE_LONG_LONG: - self.assertLessEqual(8, struct.calcsize('q')) - self.assertLessEqual(struct.calcsize('l'), struct.calcsize('q')) + self.assertLessEqual(8, struct.calcsize('q')) + self.assertLessEqual(struct.calcsize('l'), struct.calcsize('q')) self.assertGreaterEqual(struct.calcsize('n'), struct.calcsize('i')) self.assertGreaterEqual(struct.calcsize('n'), struct.calcsize('P')) @@ -366,8 +352,6 @@ class StructTest(unittest.TestCase): # SF bug 705836. "f" had a severe rounding bug, where a carry # from the low-order discarded bits could propagate into the exponent # field, causing the result to be wrong by a factor of 2. - import math - for base in range(1, 33): # smaller <- largest representable float less than base. delta = 0.5 @@ -428,10 +412,6 @@ class StructTest(unittest.TestCase): for i in range(6, len(test_string) + 1): self.assertRaises(struct.error, struct.unpack_from, fmt, data, i) - # keyword arguments - self.assertEqual(s.unpack_from(buffer=test_string, offset=2), - (b'cd01',)) - def test_pack_into(self): test_string = b'Reykjavik rocks, eow!' writable_buf = array.array('b', b' '*100) @@ -663,6 +643,110 @@ class UnpackIteratorTest(unittest.TestCase): self.assertRaises(StopIteration, next, it) self.assertRaises(StopIteration, next, it) + def test_half_float(self): + # Little-endian examples from: + # http://en.wikipedia.org/wiki/Half_precision_floating-point_format + format_bits_float__cleanRoundtrip_list = [ + (b'\x00\x3c', 1.0), + (b'\x00\xc0', -2.0), + (b'\xff\x7b', 65504.0), # (max half precision) + (b'\x00\x04', 2**-14), # ~= 6.10352 * 10**-5 (min pos normal) + (b'\x01\x00', 2**-24), # ~= 5.96046 * 10**-8 (min pos subnormal) + (b'\x00\x00', 0.0), + (b'\x00\x80', -0.0), + (b'\x00\x7c', float('+inf')), + (b'\x00\xfc', float('-inf')), + (b'\x55\x35', 0.333251953125), # ~= 1/3 + ] + + for le_bits, f in format_bits_float__cleanRoundtrip_list: + be_bits = le_bits[::-1] + self.assertEqual(f, struct.unpack('e', be_bits)[0]) + self.assertEqual(be_bits, struct.pack('>e', f)) + if sys.byteorder == 'little': + self.assertEqual(f, struct.unpack('e', le_bits)[0]) + self.assertEqual(le_bits, struct.pack('e', f)) + else: + self.assertEqual(f, struct.unpack('e', be_bits)[0]) + self.assertEqual(be_bits, struct.pack('e', f)) + + # Check for NaN handling: + format_bits__nan_list = [ + ('e', bits[::-1])[0])) + + # Check that packing produces a bit pattern representing a quiet NaN: + # all exponent bits and the msb of the fraction should all be 1. + packed = struct.pack('e', b'\x00\x01', 2.0**-25 + 2.0**-35), # Rounds to minimum subnormal + ('>e', b'\x00\x00', 2.0**-25), # Underflows to zero (nearest even mode) + ('>e', b'\x00\x00', 2.0**-26), # Underflows to zero + ('>e', b'\x03\xff', 2.0**-14 - 2.0**-24), # Largest subnormal. + ('>e', b'\x03\xff', 2.0**-14 - 2.0**-25 - 2.0**-65), + ('>e', b'\x04\x00', 2.0**-14 - 2.0**-25), + ('>e', b'\x04\x00', 2.0**-14), # Smallest normal. + ('>e', b'\x3c\x01', 1.0+2.0**-11 + 2.0**-16), # rounds to 1.0+2**(-10) + ('>e', b'\x3c\x00', 1.0+2.0**-11), # rounds to 1.0 (nearest even mode) + ('>e', b'\x3c\x00', 1.0+2.0**-12), # rounds to 1.0 + ('>e', b'\x7b\xff', 65504), # largest normal + ('>e', b'\x7b\xff', 65519), # rounds to 65504 + ('>e', b'\x80\x01', -2.0**-25 - 2.0**-35), # Rounds to minimum subnormal + ('>e', b'\x80\x00', -2.0**-25), # Underflows to zero (nearest even mode) + ('>e', b'\x80\x00', -2.0**-26), # Underflows to zero + ('>e', b'\xbc\x01', -1.0-2.0**-11 - 2.0**-16), # rounds to 1.0+2**(-10) + ('>e', b'\xbc\x00', -1.0-2.0**-11), # rounds to 1.0 (nearest even mode) + ('>e', b'\xbc\x00', -1.0-2.0**-12), # rounds to 1.0 + ('>e', b'\xfb\xff', -65519), # rounds to 65504 + ] + + for formatcode, bits, f in format_bits_float__rounding_list: + self.assertEqual(bits, struct.pack(formatcode, f)) + + # This overflows, and so raises an error + format_bits_float__roundingError_list = [ + # Values that round to infinity. + ('>e', 65520.0), + ('>e', 65536.0), + ('>e', 1e300), + ('>e', -65520.0), + ('>e', -65536.0), + ('>e', -1e300), + ('e', b'\x67\xff', 0x1ffdffffff * 2**-26), # should be 2047, if double-rounded 64>32>16, becomes 2048 + ] + + for formatcode, bits, f in format_bits_float__doubleRoundingError_list: + self.assertEqual(bits, struct.pack(formatcode, f)) + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_subclassinit.py b/Lib/test/test_subclassinit.py new file mode 100644 index 0000000..3c331bb --- /dev/null +++ b/Lib/test/test_subclassinit.py @@ -0,0 +1,284 @@ +import sys +import types +import unittest + + +class Test(unittest.TestCase): + def test_init_subclass(self): + class A: + initialized = False + + def __init_subclass__(cls): + super().__init_subclass__() + cls.initialized = True + + class B(A): + pass + + self.assertFalse(A.initialized) + self.assertTrue(B.initialized) + + def test_init_subclass_dict(self): + class A(dict): + initialized = False + + def __init_subclass__(cls): + super().__init_subclass__() + cls.initialized = True + + class B(A): + pass + + self.assertFalse(A.initialized) + self.assertTrue(B.initialized) + + def test_init_subclass_kwargs(self): + class A: + def __init_subclass__(cls, **kwargs): + cls.kwargs = kwargs + + class B(A, x=3): + pass + + self.assertEqual(B.kwargs, dict(x=3)) + + def test_init_subclass_error(self): + class A: + def __init_subclass__(cls): + raise RuntimeError + + with self.assertRaises(RuntimeError): + class B(A): + pass + + def test_init_subclass_wrong(self): + class A: + def __init_subclass__(cls, whatever): + pass + + with self.assertRaises(TypeError): + class B(A): + pass + + def test_init_subclass_skipped(self): + class BaseWithInit: + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + cls.initialized = cls + + class BaseWithoutInit(BaseWithInit): + pass + + class A(BaseWithoutInit): + pass + + self.assertIs(A.initialized, A) + self.assertIs(BaseWithoutInit.initialized, BaseWithoutInit) + + def test_init_subclass_diamond(self): + class Base: + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + cls.calls = [] + + class Left(Base): + pass + + class Middle: + def __init_subclass__(cls, middle, **kwargs): + super().__init_subclass__(**kwargs) + cls.calls += [middle] + + class Right(Base): + def __init_subclass__(cls, right="right", **kwargs): + super().__init_subclass__(**kwargs) + cls.calls += [right] + + class A(Left, Middle, Right, middle="middle"): + pass + + self.assertEqual(A.calls, ["right", "middle"]) + self.assertEqual(Left.calls, []) + self.assertEqual(Right.calls, []) + + def test_set_name(self): + class Descriptor: + def __set_name__(self, owner, name): + self.owner = owner + self.name = name + + class A: + d = Descriptor() + + self.assertEqual(A.d.name, "d") + self.assertIs(A.d.owner, A) + + def test_set_name_metaclass(self): + class Meta(type): + def __new__(cls, name, bases, ns): + ret = super().__new__(cls, name, bases, ns) + self.assertEqual(ret.d.name, "d") + self.assertIs(ret.d.owner, ret) + return 0 + + class Descriptor: + def __set_name__(self, owner, name): + self.owner = owner + self.name = name + + class A(metaclass=Meta): + d = Descriptor() + self.assertEqual(A, 0) + + def test_set_name_error(self): + class Descriptor: + def __set_name__(self, owner, name): + 1/0 + + with self.assertRaises(RuntimeError) as cm: + class NotGoingToWork: + attr = Descriptor() + + exc = cm.exception + self.assertRegex(str(exc), r'\bNotGoingToWork\b') + self.assertRegex(str(exc), r'\battr\b') + self.assertRegex(str(exc), r'\bDescriptor\b') + self.assertIsInstance(exc.__cause__, ZeroDivisionError) + + def test_set_name_wrong(self): + class Descriptor: + def __set_name__(self): + pass + + with self.assertRaises(RuntimeError) as cm: + class NotGoingToWork: + attr = Descriptor() + + exc = cm.exception + self.assertRegex(str(exc), r'\bNotGoingToWork\b') + self.assertRegex(str(exc), r'\battr\b') + self.assertRegex(str(exc), r'\bDescriptor\b') + self.assertIsInstance(exc.__cause__, TypeError) + + def test_set_name_lookup(self): + resolved = [] + class NonDescriptor: + def __getattr__(self, name): + resolved.append(name) + + class A: + d = NonDescriptor() + + self.assertNotIn('__set_name__', resolved, + '__set_name__ is looked up in instance dict') + + def test_set_name_init_subclass(self): + class Descriptor: + def __set_name__(self, owner, name): + self.owner = owner + self.name = name + + class Meta(type): + def __new__(cls, name, bases, ns): + self = super().__new__(cls, name, bases, ns) + self.meta_owner = self.owner + self.meta_name = self.name + return self + + class A: + def __init_subclass__(cls): + cls.owner = cls.d.owner + cls.name = cls.d.name + + class B(A, metaclass=Meta): + d = Descriptor() + + self.assertIs(B.owner, B) + self.assertEqual(B.name, 'd') + self.assertIs(B.meta_owner, B) + self.assertEqual(B.name, 'd') + + def test_set_name_modifying_dict(self): + notified = [] + class Descriptor: + def __set_name__(self, owner, name): + setattr(owner, name + 'x', None) + notified.append(name) + + class A: + a = Descriptor() + b = Descriptor() + c = Descriptor() + d = Descriptor() + e = Descriptor() + + self.assertCountEqual(notified, ['a', 'b', 'c', 'd', 'e']) + + def test_errors(self): + class MyMeta(type): + pass + + with self.assertRaises(TypeError): + class MyClass(metaclass=MyMeta, otherarg=1): + pass + + with self.assertRaises(TypeError): + types.new_class("MyClass", (object,), + dict(metaclass=MyMeta, otherarg=1)) + types.prepare_class("MyClass", (object,), + dict(metaclass=MyMeta, otherarg=1)) + + class MyMeta(type): + def __init__(self, name, bases, namespace, otherarg): + super().__init__(name, bases, namespace) + + with self.assertRaises(TypeError): + class MyClass(metaclass=MyMeta, otherarg=1): + pass + + class MyMeta(type): + def __new__(cls, name, bases, namespace, otherarg): + return super().__new__(cls, name, bases, namespace) + + def __init__(self, name, bases, namespace, otherarg): + super().__init__(name, bases, namespace) + self.otherarg = otherarg + + class MyClass(metaclass=MyMeta, otherarg=1): + pass + + self.assertEqual(MyClass.otherarg, 1) + + def test_errors_changed_pep487(self): + # These tests failed before Python 3.6, PEP 487 + class MyMeta(type): + def __new__(cls, name, bases, namespace): + return super().__new__(cls, name=name, bases=bases, + dict=namespace) + + with self.assertRaises(TypeError): + class MyClass(metaclass=MyMeta): + pass + + class MyMeta(type): + def __new__(cls, name, bases, namespace, otherarg): + self = super().__new__(cls, name, bases, namespace) + self.otherarg = otherarg + return self + + class MyClass(metaclass=MyMeta, otherarg=1): + pass + + self.assertEqual(MyClass.otherarg, 1) + + def test_type(self): + t = type('NewClass', (object,), {}) + self.assertIsInstance(t, type) + self.assertEqual(t.__name__, 'NewClass') + + with self.assertRaises(TypeError): + type(name='NewClass', bases=(object,), dict={}) + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 45b7ce4..89de6d1 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1,38 +1,29 @@ import unittest from unittest import mock -from test.support import script_helper from test import support import subprocess import sys -import platform import signal import io -import locale import os import errno import tempfile import time -import re import selectors import sysconfig -import warnings import select import shutil import gc import textwrap try: - import ctypes -except ImportError: - ctypes = None -else: - import ctypes.util - -try: import threading except ImportError: threading = None +if support.PGO: + raise unittest.SkipTest("test is not helpful for PGO") + mswindows = (sys.platform == "win32") # @@ -302,7 +293,8 @@ class ProcessTestCase(BaseTestCase): # Verify first that the call succeeds without the executable arg. pre_args = [sys.executable, "-c"] self._assert_python(pre_args) - self.assertRaises(FileNotFoundError, self._assert_python, pre_args, + self.assertRaises((FileNotFoundError, PermissionError), + self._assert_python, pre_args, executable="doesnotexist") @unittest.skipIf(mswindows, "executable argument replaces shell") @@ -456,8 +448,8 @@ class ProcessTestCase(BaseTestCase): p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stdout.write("orange")'], stdout=subprocess.PIPE) - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.read(), b"orange") + with p: + self.assertEqual(p.stdout.read(), b"orange") def test_stdout_filedes(self): # stdout is set to open file descriptor @@ -487,8 +479,8 @@ class ProcessTestCase(BaseTestCase): p = subprocess.Popen([sys.executable, "-c", 'import sys; sys.stderr.write("strawberry")'], stderr=subprocess.PIPE) - self.addCleanup(p.stderr.close) - self.assertStderrEqual(p.stderr.read(), b"strawberry") + with p: + self.assertStderrEqual(p.stderr.read(), b"strawberry") def test_stderr_filedes(self): # stderr is set to open file descriptor @@ -543,8 +535,8 @@ class ProcessTestCase(BaseTestCase): 'sys.stderr.write("orange")'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - self.addCleanup(p.stdout.close) - self.assertStderrEqual(p.stdout.read(), b"appleorange") + with p: + self.assertStderrEqual(p.stdout.read(), b"appleorange") def test_stdout_stderr_file(self): # capture stdout and stderr to the same open file @@ -636,46 +628,6 @@ class ProcessTestCase(BaseTestCase): # environment b"['__CF_USER_TEXT_ENCODING']")) - def test_invalid_cmd(self): - # null character in the command name - cmd = sys.executable + '\0' - with self.assertRaises(ValueError): - subprocess.Popen([cmd, "-c", "pass"]) - - # null character in the command argument - with self.assertRaises(ValueError): - subprocess.Popen([sys.executable, "-c", "pass#\0"]) - - def test_invalid_env(self): - # null character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT\0VEGETABLE"] = "cabbage" - with self.assertRaises(ValueError): - subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - - # null character in the enviroment variable value - newenv = os.environ.copy() - newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" - with self.assertRaises(ValueError): - subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - - # equal character in the enviroment variable name - newenv = os.environ.copy() - newenv["FRUIT=ORANGE"] = "lemon" - with self.assertRaises(ValueError): - subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - - # equal character in the enviroment variable value - newenv = os.environ.copy() - newenv["FRUIT"] = "orange=lemon" - with subprocess.Popen([sys.executable, "-c", - 'import sys, os;' - 'sys.stdout.write(os.getenv("FRUIT"))'], - stdout=subprocess.PIPE, - env=newenv) as p: - stdout, stderr = p.communicate() - self.assertEqual(stdout, b"orange=lemon") - def test_communicate_stdin(self): p = subprocess.Popen([sys.executable, "-c", 'import sys;' @@ -842,18 +794,19 @@ class ProcessTestCase(BaseTestCase): stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=1) - p.stdin.write("line1\n") - p.stdin.flush() - self.assertEqual(p.stdout.readline(), "line1\n") - p.stdin.write("line3\n") - p.stdin.close() - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.readline(), - "line2\n") - self.assertEqual(p.stdout.read(6), - "line3\n") - self.assertEqual(p.stdout.read(), - "line4\nline5\nline6\nline7\nline8") + with p: + p.stdin.write("line1\n") + p.stdin.flush() + self.assertEqual(p.stdout.readline(), "line1\n") + p.stdin.write("line3\n") + p.stdin.close() + self.addCleanup(p.stdout.close) + self.assertEqual(p.stdout.readline(), + "line2\n") + self.assertEqual(p.stdout.read(6), + "line3\n") + self.assertEqual(p.stdout.read(), + "line4\nline5\nline6\nline7\nline8") def test_universal_newlines_communicate(self): # universal newlines through communicate() @@ -942,31 +895,42 @@ class ProcessTestCase(BaseTestCase): # # UTF-16 and UTF-32-BE are sufficient to check both with BOM and # without, and UTF-16 and UTF-32. - import _bootlocale for encoding in ['utf-16', 'utf-32-be']: - old_getpreferredencoding = _bootlocale.getpreferredencoding - # Indirectly via io.TextIOWrapper, Popen() defaults to - # locale.getpreferredencoding(False) and earlier in Python 3.2 to - # locale.getpreferredencoding(). - def getpreferredencoding(do_setlocale=True): - return encoding code = ("import sys; " r"sys.stdout.buffer.write('1\r\n2\r3\n4'.encode('%s'))" % encoding) args = [sys.executable, '-c', code] - try: - _bootlocale.getpreferredencoding = getpreferredencoding - # We set stdin to be non-None because, as of this writing, - # a different code path is used when the number of pipes is - # zero or one. - popen = subprocess.Popen(args, universal_newlines=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - stdout, stderr = popen.communicate(input='') - finally: - _bootlocale.getpreferredencoding = old_getpreferredencoding + # We set stdin to be non-None because, as of this writing, + # a different code path is used when the number of pipes is + # zero or one. + popen = subprocess.Popen(args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + encoding=encoding) + stdout, stderr = popen.communicate(input='') self.assertEqual(stdout, '1\n2\n3\n4') + def test_communicate_errors(self): + for errors, expected in [ + ('ignore', ''), + ('replace', '\ufffd\ufffd'), + ('surrogateescape', '\udc80\udc80'), + ('backslashreplace', '\\x80\\x80'), + ]: + code = ("import sys; " + r"sys.stdout.buffer.write(b'[\x80\x80]')") + args = [sys.executable, '-c', code] + # We set stdin to be non-None because, as of this writing, + # a different code path is used when the number of pipes is + # zero or one. + popen = subprocess.Popen(args, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + encoding='utf-8', + errors=errors) + stdout, stderr = popen.communicate(input='') + self.assertEqual(stdout, '[{}]'.format(expected)) + def test_no_leaking(self): # Make sure we leak no resources if not mswindows: @@ -1051,6 +1015,19 @@ class ProcessTestCase(BaseTestCase): # time to start. self.assertEqual(p.wait(timeout=3), 0) + def test_wait_endtime(self): + """Confirm that the deprecated endtime parameter warns.""" + p = subprocess.Popen([sys.executable, "-c", "pass"]) + try: + with self.assertWarns(DeprecationWarning) as warn_cm: + p.wait(endtime=time.time()+0.01) + except subprocess.TimeoutExpired: + pass # We're not testing endtime timeout behavior. + finally: + p.kill() + self.assertIn('test_subprocess.py', warn_cm.filename) + self.assertIn('endtime', str(warn_cm.warning)) + def test_invalid_bufsize(self): # an invalid type of the bufsize argument should raise # TypeError. @@ -1479,6 +1456,27 @@ class POSIXProcessTestCase(BaseTestCase): p.wait() self.assertEqual(-p.returncode, signal.SIGABRT) + def test_CalledProcessError_str_signal(self): + err = subprocess.CalledProcessError(-int(signal.SIGABRT), "fake cmd") + error_string = str(err) + # We're relying on the repr() of the signal.Signals intenum to provide + # the word signal, the signal name and the numeric value. + self.assertIn("signal", error_string.lower()) + # We're not being specific about the signal name as some signals have + # multiple names and which name is revealed can vary. + self.assertIn("SIG", error_string) + self.assertIn(str(signal.SIGABRT), error_string) + + def test_CalledProcessError_str_unknown_signal(self): + err = subprocess.CalledProcessError(-9876543, "fake cmd") + error_string = str(err) + self.assertIn("unknown signal 9876543.", error_string) + + def test_CalledProcessError_str_non_zero(self): + err = subprocess.CalledProcessError(2, "fake cmd") + error_string = str(err) + self.assertIn("non-zero exit status 2.", error_string) + def test_preexec(self): # DISCLAIMER: Setting environment variables is *not* a good use # of a preexec_fn. This is merely a test. @@ -1487,8 +1485,8 @@ class POSIXProcessTestCase(BaseTestCase): 'sys.stdout.write(os.getenv("FRUIT"))'], stdout=subprocess.PIPE, preexec_fn=lambda: os.putenv("FRUIT", "apple")) - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.read(), b"apple") + with p: + self.assertEqual(p.stdout.read(), b"apple") def test_preexec_exception(self): def raise_it(): @@ -1609,7 +1607,7 @@ class POSIXProcessTestCase(BaseTestCase): fd, fname = tempfile.mkstemp() # reopen in text mode with open(fd, "w", errors="surrogateescape") as fobj: - fobj.write("#!/bin/sh\n") + fobj.write("#!%s\n" % support.unix_shell) fobj.write("exec '%s' -c 'import sys; sys.exit(47)'\n" % sys.executable) os.chmod(fname, 0o700) @@ -1636,8 +1634,8 @@ class POSIXProcessTestCase(BaseTestCase): p = subprocess.Popen(["echo $FRUIT"], shell=1, stdout=subprocess.PIPE, env=newenv) - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.read().strip(b" \t\r\n\f"), b"apple") + with p: + self.assertEqual(p.stdout.read().strip(b" \t\r\n\f"), b"apple") def test_shell_string(self): # Run command through the shell (string) @@ -1646,15 +1644,15 @@ class POSIXProcessTestCase(BaseTestCase): p = subprocess.Popen("echo $FRUIT", shell=1, stdout=subprocess.PIPE, env=newenv) - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.read().strip(b" \t\r\n\f"), b"apple") + with p: + self.assertEqual(p.stdout.read().strip(b" \t\r\n\f"), b"apple") def test_call_string(self): # call() function with string argument on UNIX fd, fname = tempfile.mkstemp() # reopen in text mode with open(fd, "w", errors="surrogateescape") as fobj: - fobj.write("#!/bin/sh\n") + fobj.write("#!%s\n" % support.unix_shell) fobj.write("exec '%s' -c 'import sys; sys.exit(47)'\n" % sys.executable) os.chmod(fname, 0o700) @@ -1679,8 +1677,8 @@ class POSIXProcessTestCase(BaseTestCase): for sh in shells: p = subprocess.Popen("echo $0", executable=sh, shell=True, stdout=subprocess.PIPE) - self.addCleanup(p.stdout.close) - self.assertEqual(p.stdout.read().strip(), bytes(sh, 'ascii')) + with p: + self.assertEqual(p.stdout.read().strip(), bytes(sh, 'ascii')) def _kill_process(self, method, *args): # Do not inherit file handles from the parent. @@ -2338,7 +2336,9 @@ class POSIXProcessTestCase(BaseTestCase): self.addCleanup(p.stderr.close) ident = id(p) pid = p.pid - del p + with support.check_warnings(('', ResourceWarning)): + p = None + # check that p is in the active processes list self.assertIn(ident, [id(o) for o in subprocess._active]) @@ -2357,7 +2357,9 @@ class POSIXProcessTestCase(BaseTestCase): self.addCleanup(p.stderr.close) ident = id(p) pid = p.pid - del p + with support.check_warnings(('', ResourceWarning)): + p = None + os.kill(pid, signal.SIGKILL) # check that p is in the active processes list self.assertIn(ident, [id(o) for o in subprocess._active]) @@ -2413,7 +2415,7 @@ class POSIXProcessTestCase(BaseTestCase): with self.assertRaises(TypeError): _posixsubprocess.fork_exec( args, exe_list, - True, (), cwd, env_list, + True, [], cwd, env_list, -1, -1, -1, -1, 1, 2, 3, 4, True, True, func) @@ -2425,16 +2427,6 @@ class POSIXProcessTestCase(BaseTestCase): def test_fork_exec_sorted_fd_sanity_check(self): # Issue #23564: sanity check the fork_exec() fds_to_keep sanity check. import _posixsubprocess - class BadInt: - first = True - def __init__(self, value): - self.value = value - def __int__(self): - if self.first: - self.first = False - return self.value - raise ValueError - gc_enabled = gc.isenabled() try: gc.enable() @@ -2445,7 +2437,6 @@ class POSIXProcessTestCase(BaseTestCase): (18, 23, 42, 2**63), # Out of range. (5, 4), # Not sorted. (6, 7, 7, 8), # Duplicate. - (BadInt(1), BadInt(2)), ): with self.assertRaises( ValueError, @@ -2507,43 +2498,6 @@ class POSIXProcessTestCase(BaseTestCase): proc.communicate(timeout=999) mock_proc_stdin.close.assert_called_once_with() - @unittest.skipIf(not ctypes, 'ctypes module required') - @unittest.skipIf(not sys.executable, 'Test requires sys.executable') - def test_child_terminated_in_stopped_state(self): - """Test wait() behavior when waitpid returns WIFSTOPPED; issue29335.""" - PTRACE_TRACEME = 0 # From glibc and MacOS (PT_TRACE_ME). - libc_name = ctypes.util.find_library('c') - libc = ctypes.CDLL(libc_name) - if not hasattr(libc, 'ptrace'): - raise unittest.SkipTest('ptrace() required') - - code = textwrap.dedent(""" - import ctypes - import faulthandler - from test.support import SuppressCrashReport - - libc = ctypes.CDLL({libc_name!r}) - libc.ptrace({PTRACE_TRACEME}, 0, 0) - """.format(libc_name=libc_name, PTRACE_TRACEME=PTRACE_TRACEME)) - - child = subprocess.Popen([sys.executable, '-c', code]) - if child.wait() != 0: - raise unittest.SkipTest('ptrace() failed - unable to test') - - code += textwrap.dedent(""" - with SuppressCrashReport(): - # Crash the process - faulthandler._sigsegv() - """) - child = subprocess.Popen([sys.executable, '-c', code]) - try: - returncode = child.wait() - except: - child.kill() # Clean up the hung stopped process. - raise - self.assertNotEqual(0, returncode) - self.assertLess(returncode, 0) # signal death, likely SIGSEGV. - @unittest.skipUnless(mswindows, "Windows specific tests") class Win32ProcessTestCase(BaseTestCase): @@ -2597,8 +2551,8 @@ class Win32ProcessTestCase(BaseTestCase): p = subprocess.Popen(["set"], shell=1, stdout=subprocess.PIPE, env=newenv) - self.addCleanup(p.stdout.close) - self.assertIn(b"physalis", p.stdout.read()) + with p: + self.assertIn(b"physalis", p.stdout.read()) def test_shell_string(self): # Run command through the shell (string) @@ -2607,8 +2561,20 @@ class Win32ProcessTestCase(BaseTestCase): p = subprocess.Popen("set", shell=1, stdout=subprocess.PIPE, env=newenv) - self.addCleanup(p.stdout.close) - self.assertIn(b"physalis", p.stdout.read()) + with p: + self.assertIn(b"physalis", p.stdout.read()) + + def test_shell_encodings(self): + # Run command through the shell (string) + for enc in ['ansi', 'oem']: + newenv = os.environ.copy() + newenv["FRUIT"] = "physalis" + p = subprocess.Popen("set", shell=1, + stdout=subprocess.PIPE, + env=newenv, + encoding=enc) + with p: + self.assertIn("physalis", p.stdout.read(), enc) def test_call_string(self): # call() function with string argument on Windows @@ -2627,16 +2593,14 @@ class Win32ProcessTestCase(BaseTestCase): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - self.addCleanup(p.stdout.close) - self.addCleanup(p.stderr.close) - self.addCleanup(p.stdin.close) - # Wait for the interpreter to be completely initialized before - # sending any signal. - p.stdout.read(1) - getattr(p, method)(*args) - _, stderr = p.communicate() - self.assertStderrEqual(stderr, b'') - returncode = p.wait() + with p: + # Wait for the interpreter to be completely initialized before + # sending any signal. + p.stdout.read(1) + getattr(p, method)(*args) + _, stderr = p.communicate() + self.assertStderrEqual(stderr, b'') + returncode = p.wait() self.assertNotEqual(returncode, 0) def _kill_dead_process(self, method, *args): @@ -2649,19 +2613,17 @@ class Win32ProcessTestCase(BaseTestCase): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - self.addCleanup(p.stdout.close) - self.addCleanup(p.stderr.close) - self.addCleanup(p.stdin.close) - # Wait for the interpreter to be completely initialized before - # sending any signal. - p.stdout.read(1) - # The process should end after this - time.sleep(1) - # This shouldn't raise even though the child is now dead - getattr(p, method)(*args) - _, stderr = p.communicate() - self.assertStderrEqual(stderr, b'') - rc = p.wait() + with p: + # Wait for the interpreter to be completely initialized before + # sending any signal. + p.stdout.read(1) + # The process should end after this + time.sleep(1) + # This shouldn't raise even though the child is now dead + getattr(p, method)(*args) + _, stderr = p.communicate() + self.assertStderrEqual(stderr, b'') + rc = p.wait() self.assertEqual(rc, 42) def test_send_signal(self): @@ -2704,8 +2666,7 @@ class MiscTests(unittest.TestCase): def test__all__(self): """Ensure that __all__ is populated properly.""" - # STARTUPINFO added to __all__ in 3.6 - intentionally_excluded = {"list2cmdline", "STARTUPINFO", "Handle"} + intentionally_excluded = {"list2cmdline", "Handle"} exported = set(subprocess.__all__) possible_exports = set() import types @@ -2750,11 +2711,11 @@ class CommandsWithSpaces (BaseTestCase): def with_spaces(self, *args, **kwargs): kwargs['stdout'] = subprocess.PIPE p = subprocess.Popen(*args, **kwargs) - self.addCleanup(p.stdout.close) - self.assertEqual( - p.stdout.read ().decode("mbcs"), - "2 [%r, 'ab cd']" % self.fname - ) + with p: + self.assertEqual( + p.stdout.read ().decode("mbcs"), + "2 [%r, 'ab cd']" % self.fname + ) def test_shell_string_with_spaces(self): # call() function with string argument with spaces on Windows @@ -2806,7 +2767,7 @@ class ContextManagerTests(BaseTestCase): self.assertEqual(proc.returncode, 1) def test_invalid_args(self): - with self.assertRaises(FileNotFoundError) as c: + with self.assertRaises((FileNotFoundError, PermissionError)) as c: with subprocess.Popen(['nonexisting_i_hope'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc: @@ -2829,19 +2790,5 @@ class ContextManagerTests(BaseTestCase): self.assertTrue(proc.stdin.closed) -def test_main(): - unit_tests = (ProcessTestCase, - POSIXProcessTestCase, - Win32ProcessTestCase, - MiscTests, - ProcessTestCaseNoPoll, - CommandsWithSpaces, - ContextManagerTests, - RunFuncTestCase, - ) - - support.run_unittest(*unit_tests) - support.reap_children() - if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_sunau.py b/Lib/test/test_sunau.py index 0f4134e..bc1f46c 100644 --- a/Lib/test/test_sunau.py +++ b/Lib/test/test_sunau.py @@ -1,4 +1,3 @@ -from test.support import TESTFN import unittest from test import audiotests from audioop import byteswap diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py index b84863f..447dec9 100644 --- a/Lib/test/test_super.py +++ b/Lib/test/test_super.py @@ -1,7 +1,9 @@ -"""Unit tests for new super() implementation.""" +"""Unit tests for zero-argument super() & related machinery.""" import sys import unittest +import warnings +from test.support import check_warnings class A: @@ -143,6 +145,166 @@ class TestSuper(unittest.TestCase): return __class__ self.assertIs(X.f(), X) + def test___class___new(self): + # See issue #23722 + # Ensure zero-arg super() works as soon as type.__new__() is completed + test_class = None + + class Meta(type): + def __new__(cls, name, bases, namespace): + nonlocal test_class + self = super().__new__(cls, name, bases, namespace) + test_class = self.f() + return self + + class A(metaclass=Meta): + @staticmethod + def f(): + return __class__ + + self.assertIs(test_class, A) + + def test___class___delayed(self): + # See issue #23722 + test_namespace = None + + class Meta(type): + def __new__(cls, name, bases, namespace): + nonlocal test_namespace + test_namespace = namespace + return None + + # This case shouldn't trigger the __classcell__ deprecation warning + with check_warnings() as w: + warnings.simplefilter("always", DeprecationWarning) + class A(metaclass=Meta): + @staticmethod + def f(): + return __class__ + self.assertEqual(w.warnings, []) + + self.assertIs(A, None) + + B = type("B", (), test_namespace) + self.assertIs(B.f(), B) + + def test___class___mro(self): + # See issue #23722 + test_class = None + + class Meta(type): + def mro(self): + # self.f() doesn't work yet... + self.__dict__["f"]() + return super().mro() + + class A(metaclass=Meta): + def f(): + nonlocal test_class + test_class = __class__ + + self.assertIs(test_class, A) + + def test___classcell___expected_behaviour(self): + # See issue #23722 + class Meta(type): + def __new__(cls, name, bases, namespace): + nonlocal namespace_snapshot + namespace_snapshot = namespace.copy() + return super().__new__(cls, name, bases, namespace) + + # __classcell__ is injected into the class namespace by the compiler + # when at least one method needs it, and should be omitted otherwise + namespace_snapshot = None + class WithoutClassRef(metaclass=Meta): + pass + self.assertNotIn("__classcell__", namespace_snapshot) + + # With zero-arg super() or an explicit __class__ reference, + # __classcell__ is the exact cell reference to be populated by + # type.__new__ + namespace_snapshot = None + class WithClassRef(metaclass=Meta): + def f(self): + return __class__ + + class_cell = namespace_snapshot["__classcell__"] + method_closure = WithClassRef.f.__closure__ + self.assertEqual(len(method_closure), 1) + self.assertIs(class_cell, method_closure[0]) + # Ensure the cell reference *doesn't* get turned into an attribute + with self.assertRaises(AttributeError): + WithClassRef.__classcell__ + + def test___classcell___missing(self): + # See issue #23722 + # Some metaclasses may not pass the original namespace to type.__new__ + # We test that case here by forcibly deleting __classcell__ + class Meta(type): + def __new__(cls, name, bases, namespace): + namespace.pop('__classcell__', None) + return super().__new__(cls, name, bases, namespace) + + # The default case should continue to work without any warnings + with check_warnings() as w: + warnings.simplefilter("always", DeprecationWarning) + class WithoutClassRef(metaclass=Meta): + pass + self.assertEqual(w.warnings, []) + + # With zero-arg super() or an explicit __class__ reference, we expect + # __build_class__ to emit a DeprecationWarning complaining that + # __class__ was not set, and asking if __classcell__ was propagated + # to type.__new__. + # In Python 3.7, that warning will become a RuntimeError. + expected_warning = ( + '__class__ not set.*__classcell__ propagated', + DeprecationWarning + ) + with check_warnings(expected_warning): + warnings.simplefilter("always", DeprecationWarning) + class WithClassRef(metaclass=Meta): + def f(self): + return __class__ + # Check __class__ still gets set despite the warning + self.assertIs(WithClassRef().f(), WithClassRef) + + # Check the warning is turned into an error as expected + with warnings.catch_warnings(): + warnings.simplefilter("error", DeprecationWarning) + with self.assertRaises(DeprecationWarning): + class WithClassRef(metaclass=Meta): + def f(self): + return __class__ + + def test___classcell___overwrite(self): + # See issue #23722 + # Overwriting __classcell__ with nonsense is explicitly prohibited + class Meta(type): + def __new__(cls, name, bases, namespace, cell): + namespace['__classcell__'] = cell + return super().__new__(cls, name, bases, namespace) + + for bad_cell in (None, 0, "", object()): + with self.subTest(bad_cell=bad_cell): + with self.assertRaises(TypeError): + class A(metaclass=Meta, cell=bad_cell): + pass + + def test___classcell___wrong_cell(self): + # See issue #23722 + # Pointing the cell reference at the wrong class is also prohibited + class Meta(type): + def __new__(cls, name, bases, namespace): + cls = super().__new__(cls, name, bases, namespace) + B = type("B", (), namespace) + return cls + + with self.assertRaises(TypeError): + class A(metaclass=Meta): + def f(self): + return __class__ + def test_obscure_super_errors(self): def f(): super() diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 70137e1..553822b 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -240,10 +240,9 @@ class TestSupport(unittest.TestCase): self.assertEqual(cm.exception.errno, errno.EBADF) def test_check_syntax_error(self): - support.check_syntax_error(self, "def class", lineno=1, offset=9) - self.assertRaises(AssertionError, support.check_syntax_error, self, "1") - #with self.assertRaises(AssertionError): - #support.check_syntax_error(self, "x=1") + support.check_syntax_error(self, "def class") + with self.assertRaises(AssertionError): + support.check_syntax_error(self, "x=1") def test_CleanImport(self): import importlib @@ -283,34 +282,17 @@ class TestSupport(unittest.TestCase): def test_swap_attr(self): class Obj: - pass + x = 1 obj = Obj() - obj.x = 1 - with support.swap_attr(obj, "x", 5) as x: + with support.swap_attr(obj, "x", 5): self.assertEqual(obj.x, 5) - self.assertEqual(x, 1) self.assertEqual(obj.x, 1) - with support.swap_attr(obj, "y", 5) as y: - self.assertEqual(obj.y, 5) - self.assertIsNone(y) - self.assertFalse(hasattr(obj, 'y')) - with support.swap_attr(obj, "y", 5): - del obj.y - self.assertFalse(hasattr(obj, 'y')) def test_swap_item(self): - D = {"x":1} - with support.swap_item(D, "x", 5) as x: - self.assertEqual(D["x"], 5) - self.assertEqual(x, 1) - self.assertEqual(D["x"], 1) - with support.swap_item(D, "y", 5) as y: - self.assertEqual(D["y"], 5) - self.assertIsNone(y) - self.assertNotIn("y", D) - with support.swap_item(D, "y", 5): - del D["y"] - self.assertNotIn("y", D) + D = {"item":1} + with support.swap_item(D, "item", 5): + self.assertEqual(D["item"], 5) + self.assertEqual(D["item"], 1) class RefClass: attribute1 = None @@ -344,6 +326,28 @@ class TestSupport(unittest.TestCase): self.OtherClass, self.RefClass, ignore=ignore) self.assertEqual(set(), missing_items) + def test_check__all__(self): + extra = {'tempdir'} + blacklist = {'template'} + support.check__all__(self, + tempfile, + extra=extra, + blacklist=blacklist) + + extra = {'TextTestResult', 'installHandler'} + blacklist = {'load_tests', "TestProgram", "BaseTestSuite"} + + support.check__all__(self, + unittest, + ("unittest.result", "unittest.case", + "unittest.suite", "unittest.loader", + "unittest.main", "unittest.runner", + "unittest.signals"), + extra=extra, + blacklist=blacklist) + + self.assertRaises(AssertionError, support.check__all__, self, unittest) + # XXX -follows a list of untested API # make_legacy_pyc # is_resource_enabled diff --git a/Lib/test/test_symbol.py b/Lib/test/test_symbol.py new file mode 100644 index 0000000..c1306f5 --- /dev/null +++ b/Lib/test/test_symbol.py @@ -0,0 +1,54 @@ +import unittest +from test import support +import os +import sys +import subprocess + + +SYMBOL_FILE = support.findfile('symbol.py') +GRAMMAR_FILE = os.path.join(os.path.dirname(__file__), + '..', '..', 'Include', 'graminit.h') +TEST_PY_FILE = 'symbol_test.py' + + +class TestSymbolGeneration(unittest.TestCase): + + def _copy_file_without_generated_symbols(self, source_file, dest_file): + with open(source_file) as fp: + lines = fp.readlines() + with open(dest_file, 'w') as fp: + fp.writelines(lines[:lines.index("#--start constants--\n") + 1]) + fp.writelines(lines[lines.index("#--end constants--\n"):]) + + def _generate_symbols(self, grammar_file, target_symbol_py_file): + proc = subprocess.Popen([sys.executable, + SYMBOL_FILE, + grammar_file, + target_symbol_py_file], stderr=subprocess.PIPE) + stderr = proc.communicate()[1] + return proc.returncode, stderr + + def compare_files(self, file1, file2): + with open(file1) as fp: + lines1 = fp.readlines() + with open(file2) as fp: + lines2 = fp.readlines() + self.assertEqual(lines1, lines2) + + @unittest.skipIf(not os.path.exists(GRAMMAR_FILE), + 'test only works from source build directory') + def test_real_grammar_and_symbol_file(self): + output = support.TESTFN + self.addCleanup(support.unlink, output) + + self._copy_file_without_generated_symbols(SYMBOL_FILE, output) + + exitcode, stderr = self._generate_symbols(GRAMMAR_FILE, output) + self.assertEqual(b'', stderr) + self.assertEqual(0, exitcode) + + self.compare_files(SYMBOL_FILE, output) + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py index fbb1bdc..3047165 100644 --- a/Lib/test/test_symtable.py +++ b/Lib/test/test_symtable.py @@ -133,6 +133,17 @@ class SymtableTest(unittest.TestCase): self.assertTrue(self.Mine.lookup("a_method").is_assigned()) self.assertFalse(self.internal.lookup("x").is_assigned()) + def test_annotated(self): + st1 = symtable.symtable('def f():\n x: int\n', 'test', 'exec') + st2 = st1.get_children()[0] + self.assertTrue(st2.lookup('x').is_local()) + self.assertTrue(st2.lookup('x').is_annotated()) + self.assertFalse(st2.lookup('x').is_global()) + st3 = symtable.symtable('def f():\n x = 1\n', 'test', 'exec') + st4 = st3.get_children()[0] + self.assertTrue(st4.lookup('x').is_local()) + self.assertFalse(st4.lookup('x').is_annotated()) + def test_imported(self): self.assertTrue(self.top.lookup("sys").is_imported()) @@ -148,21 +159,21 @@ class SymtableTest(unittest.TestCase): def test_filename_correct(self): ### Bug tickler: SyntaxError file name correct whether error raised ### while parsing or building symbol table. - def checkfilename(brokencode, offset): + def checkfilename(brokencode): try: symtable.symtable(brokencode, "spam", "exec") except SyntaxError as e: self.assertEqual(e.filename, "spam") - self.assertEqual(e.lineno, 1) - self.assertEqual(e.offset, offset) else: self.fail("no SyntaxError for %r" % (brokencode,)) - checkfilename("def f(x): foo)(", 14) # parse-time - checkfilename("def f(x): global x", 10) # symtable-build-time + checkfilename("def f(x): foo)(") # parse-time + checkfilename("def f(x): global x") # symtable-build-time symtable.symtable("pass", b"spam", "exec") - with self.assertRaises(TypeError): + with self.assertWarns(DeprecationWarning), \ + self.assertRaises(TypeError): symtable.symtable("pass", bytearray(b"spam"), "exec") - symtable.symtable("pass", memoryview(b"spam"), "exec") + with self.assertWarns(DeprecationWarning): + symtable.symtable("pass", memoryview(b"spam"), "exec") with self.assertRaises(TypeError): symtable.symtable("pass", list(b"spam"), "exec") diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 301c142..80e36fd 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -35,14 +35,6 @@ SyntaxError: invalid syntax Traceback (most recent call last): SyntaxError: can't assign to keyword -It's a syntax error to assign to the empty tuple. Why isn't it an -error to assign to the empty list? It will always raise some error at -runtime. - ->>> () = 1 -Traceback (most recent call last): -SyntaxError: can't assign to () - >>> f() = 1 Traceback (most recent call last): SyntaxError: can't assign to function call @@ -374,7 +366,23 @@ build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514 ... SyntaxError: too many statically nested blocks -Misuse of the nonlocal statement can lead to a few unique syntax errors. +Misuse of the nonlocal and global statement can lead to a few unique syntax errors. + + >>> def f(): + ... x = 1 + ... global x + Traceback (most recent call last): + ... + SyntaxError: name 'x' is assigned to before global declaration + + >>> def f(): + ... x = 1 + ... def g(): + ... print(x) + ... nonlocal x + Traceback (most recent call last): + ... + SyntaxError: name 'x' is used prior to nonlocal declaration >>> def f(x): ... nonlocal x @@ -493,10 +501,6 @@ Traceback (most recent call last): ... SyntaxError: keyword argument repeated ->>> del () -Traceback (most recent call last): -SyntaxError: can't delete () - >>> {1, 2, 3} = 42 Traceback (most recent call last): SyntaxError: can't assign to literal @@ -540,7 +544,7 @@ from test import support class SyntaxTestCase(unittest.TestCase): def _check_error(self, code, errtext, - filename="", mode="exec", subclass=None, lineno=None, offset=None): + filename="", mode="exec", subclass=None): """Check that compiling code raises SyntaxError with errtext. errtest is a regular expression that must be present in the @@ -555,11 +559,6 @@ class SyntaxTestCase(unittest.TestCase): mo = re.search(errtext, str(err)) if mo is None: self.fail("SyntaxError did not contain '%r'" % (errtext,)) - self.assertEqual(err.filename, filename) - if lineno is not None: - self.assertEqual(err.lineno, lineno) - if offset is not None: - self.assertEqual(err.offset, offset) else: self.fail("compile() did not raise SyntaxError") @@ -570,7 +569,7 @@ class SyntaxTestCase(unittest.TestCase): self._check_error("del f()", "delete") def test_global_err_then_warn(self): - # Bug #763201: The SyntaxError raised for one global statement + # Bug tickler: The SyntaxError raised for one global statement # shouldn't be clobbered by a SyntaxWarning issued for a later one. source = """if 1: def error(a): @@ -580,7 +579,7 @@ class SyntaxTestCase(unittest.TestCase): global b # SyntaxWarning """ warnings.filterwarnings(action='ignore', category=SyntaxWarning) - self._check_error(source, "global", lineno=3, offset=16) + self._check_error(source, "global") warnings.filters.pop(0) def test_break_outside_loop(self): diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 4435d69..df9ebd4 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -10,6 +10,7 @@ import codecs import gc import sysconfig import platform +import locale # count the number of test runs, used to create unique # strings to intern in test_intern() @@ -627,6 +628,8 @@ class SysModuleTest(unittest.TestCase): @unittest.skipUnless(test.support.FS_NONASCII, 'requires OS support of non-ASCII encodings') + @unittest.skipUnless(sys.getfilesystemencoding() == locale.getpreferredencoding(False), + 'requires FS encoding to match locale') def test_ioencoding_nonascii(self): env = dict(os.environ) @@ -669,8 +672,6 @@ class SysModuleTest(unittest.TestCase): fs_encoding = sys.getfilesystemencoding() if sys.platform == 'darwin': expected = 'utf-8' - elif sys.platform == 'win32': - expected = 'mbcs' else: expected = None self.check_fsencoding(fs_encoding, expected) @@ -912,13 +913,13 @@ class SizeofTest(unittest.TestCase): return inner check(get_cell().__closure__[0], size('P')) # code - check(get_cell().__code__, size('5i9Pi3P')) - check(get_cell.__code__, size('5i9Pi3P')) + check(get_cell().__code__, size('6i13P')) + check(get_cell.__code__, size('6i13P')) def get_cell2(x): def inner(): return x return inner - check(get_cell2.__code__, size('5i9Pi3P') + 1) + check(get_cell2.__code__, size('6i13P') + 1) # complex check(complex(0,1), size('2d')) # method_descriptor (descriptor object) @@ -936,9 +937,9 @@ class SizeofTest(unittest.TestCase): # method-wrapper (descriptor object) check({}.__iter__, size('2P')) # dict - check({}, size('n2P') + calcsize('2nPn') + 8*calcsize('n2P')) + check({}, size('nQ2P') + calcsize('2nP2n') + 8 + (8*2//3)*calcsize('n2P')) longdict = {1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8} - check(longdict, size('n2P') + calcsize('2nPn') + 16*calcsize('n2P')) + check(longdict, size('nQ2P') + calcsize('2nP2n') + 16 + (16*2//3)*calcsize('n2P')) # dictionary-keyview check({}.keys(), size('P')) # dictionary-valueview @@ -1096,13 +1097,13 @@ class SizeofTest(unittest.TestCase): '10P' # PySequenceMethods '2P' # PyBufferProcs '4P') - # Separate block for PyDictKeysObject with 4 entries - s += calcsize("2nPn") + 4*calcsize("n2P") + # Separate block for PyDictKeysObject with 8 keys and 5 entries + s += calcsize("2nP2n") + 8 + 5*calcsize("n2P") # class class newstyleclass(object): pass check(newstyleclass, s) # dict with shared keys - check(newstyleclass().__dict__, size('n2P' + '2nPn')) + check(newstyleclass().__dict__, size('nQ2P' + '2nP2n')) # unicode # each tuple contains a string and its expected character size # don't put any static strings here, as they may contain @@ -1191,6 +1192,32 @@ class SizeofTest(unittest.TestCase): # sys.flags check(sys.flags, vsize('') + self.P * len(sys.flags)) + def test_asyncgen_hooks(self): + old = sys.get_asyncgen_hooks() + self.assertIsNone(old.firstiter) + self.assertIsNone(old.finalizer) + + firstiter = lambda *a: None + sys.set_asyncgen_hooks(firstiter=firstiter) + hooks = sys.get_asyncgen_hooks() + self.assertIs(hooks.firstiter, firstiter) + self.assertIs(hooks[0], firstiter) + self.assertIs(hooks.finalizer, None) + self.assertIs(hooks[1], None) + + finalizer = lambda *a: None + sys.set_asyncgen_hooks(finalizer=finalizer) + hooks = sys.get_asyncgen_hooks() + self.assertIs(hooks.firstiter, firstiter) + self.assertIs(hooks[0], firstiter) + self.assertIs(hooks.finalizer, finalizer) + self.assertIs(hooks[1], finalizer) + + sys.set_asyncgen_hooks(*old) + cur = sys.get_asyncgen_hooks() + self.assertIsNone(cur.firstiter) + self.assertIsNone(cur.finalizer) + def test_main(): test.support.run_unittest(SysModuleTest, SizeofTest) diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 509bc3e..25c5835 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -338,8 +338,8 @@ class TraceTestCase(unittest.TestCase): def test_14_onliner_if(self): def onliners(): - if True: False - else: True + if True: x=False + else: x=True return 0 self.run_and_compare( onliners, diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 3830679..091e905 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -5,8 +5,7 @@ import subprocess import shutil from copy import copy -from test.support import (run_unittest, - import_module, TESTFN, unlink, check_warnings, +from test.support import (run_unittest, TESTFN, unlink, check_warnings, captured_stdout, skip_unless_symlink, change_cwd) import sysconfig @@ -388,16 +387,16 @@ class TestSysConfig(unittest.TestCase): @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test') def test_triplet_in_ext_suffix(self): - ctypes = import_module('ctypes') - import platform, re + import ctypes, platform, re machine = platform.machine() suffix = sysconfig.get_config_var('EXT_SUFFIX') if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine): self.assertTrue('linux' in suffix, suffix) if re.match('(i[3-6]86|x86_64)$', machine): if ctypes.sizeof(ctypes.c_char_p()) == 4: - self.assertTrue(suffix.endswith('i386-linux-gnu.so') \ - or suffix.endswith('x86_64-linux-gnux32.so'), + self.assertTrue(suffix.endswith('i386-linux-gnu.so') or + suffix.endswith('i686-linux-android.so') or + suffix.endswith('x86_64-linux-gnux32.so'), suffix) else: # 8 byte pointer size self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 1efb841..619cbc0 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -2080,6 +2080,24 @@ class MiscTest(unittest.TestCase): with self.assertRaises(ValueError): tarfile.itn(0x10000000000, 6, tarfile.GNU_FORMAT) + def test__all__(self): + blacklist = {'version', 'grp', 'pwd', 'symlink_exception', + 'NUL', 'BLOCKSIZE', 'RECORDSIZE', 'GNU_MAGIC', + 'POSIX_MAGIC', 'LENGTH_NAME', 'LENGTH_LINK', + 'LENGTH_PREFIX', 'REGTYPE', 'AREGTYPE', 'LNKTYPE', + 'SYMTYPE', 'CHRTYPE', 'BLKTYPE', 'DIRTYPE', 'FIFOTYPE', + 'CONTTYPE', 'GNUTYPE_LONGNAME', 'GNUTYPE_LONGLINK', + 'GNUTYPE_SPARSE', 'XHDTYPE', 'XGLTYPE', 'SOLARIS_XHDTYPE', + 'SUPPORTED_TYPES', 'REGULAR_TYPES', 'GNU_TYPES', + 'PAX_FIELDS', 'PAX_NAME_FIELDS', 'PAX_NUMBER_FIELDS', + 'stn', 'nts', 'nti', 'itn', 'calc_chksums', 'copyfileobj', + 'filemode', + 'EmptyHeaderError', 'TruncatedHeaderError', + 'EOFHeaderError', 'InvalidHeaderError', + 'SubsequentHeaderError', 'ExFileObject', + 'main'} + support.check__all__(self, tarfile, blacklist=blacklist) + class CommandLineTest(unittest.TestCase): diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index 8e219f4..51d82e1 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -1,7 +1,6 @@ import socket import selectors import telnetlib -import time import contextlib from test import support @@ -42,6 +41,11 @@ class GeneralTests(unittest.TestCase): telnet = telnetlib.Telnet(HOST, self.port) telnet.sock.close() + def testContextManager(self): + with telnetlib.Telnet(HOST, self.port) as tn: + self.assertIsNotNone(tn.get_socket()) + self.assertIsNone(tn.get_socket()) + def testTimeoutDefault(self): self.assertTrue(socket.getdefaulttimeout() is None) socket.setdefaulttimeout(30) diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index d0cf04b..51df1ec 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -273,12 +273,13 @@ class TestGetDefaultTempdir(BaseTestCase): tempfile._get_default_tempdir() self.assertEqual(os.listdir(our_temp_directory), []) + open = io.open def bad_writer(*args, **kwargs): - fp = orig_open(*args, **kwargs) + fp = open(*args, **kwargs) fp.write = raise_OSError return fp - with support.swap_attr(io, "open", bad_writer) as orig_open: + with support.swap_attr(io, "open", bad_writer): # test again with failing write() with self.assertRaises(FileNotFoundError): tempfile._get_default_tempdir() diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 3909b75..ef3059b 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -20,7 +20,6 @@ def verbose_print(arg): with _print_mutex: print(arg) - class BasicThreadTest(unittest.TestCase): def setUp(self): @@ -32,9 +31,6 @@ class BasicThreadTest(unittest.TestCase): self.running = 0 self.next_ident = 0 - key = support.threading_setup() - self.addCleanup(support.threading_cleanup, *key) - class ThreadRunningTests(BasicThreadTest): diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index edae526..845e7d4 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -8,7 +8,6 @@ from test.support import (verbose, import_module, cpython_only, from test.support.script_helper import assert_python_ok, assert_python_failure import random -import re import sys _thread = import_module('_thread') threading = import_module('threading') @@ -19,6 +18,7 @@ import os import subprocess from test import lock_tests +from test import support # Between fork() and exec(), only async-safe functions are allowed (issues @@ -170,9 +170,6 @@ class ThreadTests(BaseTestCase): mutex.acquire() self.assertIn(tid, threading._active) self.assertIsInstance(threading._active[tid], threading._DummyThread) - #Issue 29376 - self.assertTrue(threading._active[tid].is_alive()) - self.assertRegex(repr(threading._active[tid]), '_DummyThread') del threading._active[tid] # PyThreadState_SetAsyncExc() is a CPython-only gimmick, not (currently) @@ -470,15 +467,13 @@ class ThreadTests(BaseTestCase): for i in range(20): t = threading.Thread(target=lambda: None) t.start() + self.addCleanup(t.join) pid = os.fork() if pid == 0: - os._exit(11 if t.is_alive() else 10) + os._exit(1 if t.is_alive() else 0) else: - t.join() - pid, status = os.waitpid(pid, 0) - self.assertTrue(os.WIFEXITED(status)) - self.assertEqual(10, os.WEXITSTATUS(status)) + self.assertEqual(0, status) def test_main_thread(self): main = threading.main_thread() @@ -1122,5 +1117,12 @@ class BoundedSemaphoreTests(lock_tests.BoundedSemaphoreTests): class BarrierTests(lock_tests.BarrierTests): barriertype = staticmethod(threading.Barrier) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + extra = {"ThreadError"} + blacklist = {'currentThread', 'activeCount'} + support.check__all__(self, threading, ('threading', '_thread'), + extra=extra, blacklist=blacklist) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 04962b2..f224212 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -1,6 +1,8 @@ from test import support +import decimal import enum import locale +import math import platform import sys import sysconfig @@ -21,17 +23,27 @@ SIZEOF_INT = sysconfig.get_config_var('SIZEOF_INT') or 4 TIME_MAXYEAR = (1 << 8 * SIZEOF_INT - 1) - 1 TIME_MINYEAR = -TIME_MAXYEAR - 1 +SEC_TO_US = 10 ** 6 US_TO_NS = 10 ** 3 MS_TO_NS = 10 ** 6 SEC_TO_NS = 10 ** 9 +NS_TO_SEC = 10 ** 9 class _PyTime(enum.IntEnum): # Round towards minus infinity (-inf) ROUND_FLOOR = 0 # Round towards infinity (+inf) ROUND_CEILING = 1 + # Round to nearest with ties going to nearest even integer + ROUND_HALF_EVEN = 2 -ALL_ROUNDING_METHODS = (_PyTime.ROUND_FLOOR, _PyTime.ROUND_CEILING) +# Rounding modes supported by PyTime +ROUNDING_MODES = ( + # (PyTime rounding method, decimal rounding method) + (_PyTime.ROUND_FLOOR, decimal.ROUND_FLOOR), + (_PyTime.ROUND_CEILING, decimal.ROUND_CEILING), + (_PyTime.ROUND_HALF_EVEN, decimal.ROUND_HALF_EVEN), +) class TimeTestCase(unittest.TestCase): @@ -114,10 +126,6 @@ class TimeTestCase(unittest.TestCase): except ValueError: self.fail('conversion specifier: %r failed.' % format) - self.assertRaises(TypeError, time.strftime, b'%S', tt) - # embedded null character - self.assertRaises(ValueError, time.strftime, '%S\0', tt) - def _bounds_checking(self, func): # Make sure that strftime() checks the bounds of the various parts # of the time tuple (0 is valid for *all* values). @@ -611,79 +619,6 @@ class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear, unittest.TestCase): class TestPytime(unittest.TestCase): - def setUp(self): - self.invalid_values = ( - -(2 ** 100), 2 ** 100, - -(2.0 ** 100.0), 2.0 ** 100.0, - ) - - @support.cpython_only - def test_time_t(self): - from _testcapi import pytime_object_to_time_t - for obj, time_t, rnd in ( - # Round towards minus infinity (-inf) - (0, 0, _PyTime.ROUND_FLOOR), - (-1, -1, _PyTime.ROUND_FLOOR), - (-1.0, -1, _PyTime.ROUND_FLOOR), - (-1.9, -2, _PyTime.ROUND_FLOOR), - (1.0, 1, _PyTime.ROUND_FLOOR), - (1.9, 1, _PyTime.ROUND_FLOOR), - # Round towards infinity (+inf) - (0, 0, _PyTime.ROUND_CEILING), - (-1, -1, _PyTime.ROUND_CEILING), - (-1.0, -1, _PyTime.ROUND_CEILING), - (-1.9, -1, _PyTime.ROUND_CEILING), - (1.0, 1, _PyTime.ROUND_CEILING), - (1.9, 2, _PyTime.ROUND_CEILING), - ): - self.assertEqual(pytime_object_to_time_t(obj, rnd), time_t) - - rnd = _PyTime.ROUND_FLOOR - for invalid in self.invalid_values: - self.assertRaises(OverflowError, - pytime_object_to_time_t, invalid, rnd) - - @support.cpython_only - def test_timespec(self): - from _testcapi import pytime_object_to_timespec - for obj, timespec, rnd in ( - # Round towards minus infinity (-inf) - (0, (0, 0), _PyTime.ROUND_FLOOR), - (-1, (-1, 0), _PyTime.ROUND_FLOOR), - (-1.0, (-1, 0), _PyTime.ROUND_FLOOR), - (1e-9, (0, 1), _PyTime.ROUND_FLOOR), - (1e-10, (0, 0), _PyTime.ROUND_FLOOR), - (-1e-9, (-1, 999999999), _PyTime.ROUND_FLOOR), - (-1e-10, (-1, 999999999), _PyTime.ROUND_FLOOR), - (-1.2, (-2, 800000000), _PyTime.ROUND_FLOOR), - (0.9999999999, (0, 999999999), _PyTime.ROUND_FLOOR), - (1.1234567890, (1, 123456789), _PyTime.ROUND_FLOOR), - (1.1234567899, (1, 123456789), _PyTime.ROUND_FLOOR), - (-1.1234567890, (-2, 876543211), _PyTime.ROUND_FLOOR), - (-1.1234567891, (-2, 876543210), _PyTime.ROUND_FLOOR), - # Round towards infinity (+inf) - (0, (0, 0), _PyTime.ROUND_CEILING), - (-1, (-1, 0), _PyTime.ROUND_CEILING), - (-1.0, (-1, 0), _PyTime.ROUND_CEILING), - (1e-9, (0, 1), _PyTime.ROUND_CEILING), - (1e-10, (0, 1), _PyTime.ROUND_CEILING), - (-1e-9, (-1, 999999999), _PyTime.ROUND_CEILING), - (-1e-10, (0, 0), _PyTime.ROUND_CEILING), - (-1.2, (-2, 800000000), _PyTime.ROUND_CEILING), - (0.9999999999, (1, 0), _PyTime.ROUND_CEILING), - (1.1234567890, (1, 123456790), _PyTime.ROUND_CEILING), - (1.1234567899, (1, 123456790), _PyTime.ROUND_CEILING), - (-1.1234567890, (-2, 876543211), _PyTime.ROUND_CEILING), - (-1.1234567891, (-2, 876543211), _PyTime.ROUND_CEILING), - ): - with self.subTest(obj=obj, round=rnd, timespec=timespec): - self.assertEqual(pytime_object_to_timespec(obj, rnd), timespec) - - rnd = _PyTime.ROUND_FLOOR - for invalid in self.invalid_values: - self.assertRaises(OverflowError, - pytime_object_to_timespec, invalid, rnd) - @unittest.skipUnless(time._STRUCT_TM_ITEMS == 11, "needs tm_zone support") def test_localtime_timezone(self): @@ -738,266 +673,291 @@ class TestPytime(unittest.TestCase): self.assertIs(lt.tm_zone, None) -@unittest.skipUnless(_testcapi is not None, - 'need the _testcapi module') -class TestPyTime_t(unittest.TestCase): +@unittest.skipIf(_testcapi is None, 'need the _testcapi module') +class CPyTimeTestCase: + """ + Base class to test the C _PyTime_t API. + """ + OVERFLOW_SECONDS = None + + def setUp(self): + from _testcapi import SIZEOF_TIME_T + bits = SIZEOF_TIME_T * 8 - 1 + self.time_t_min = -2 ** bits + self.time_t_max = 2 ** bits - 1 + + def time_t_filter(self, seconds): + return (self.time_t_min <= seconds <= self.time_t_max) + + def _rounding_values(self, use_float): + "Build timestamps used to test rounding." + + units = [1, US_TO_NS, MS_TO_NS, SEC_TO_NS] + if use_float: + # picoseconds are only tested to pytime_converter accepting floats + units.append(1e-3) + + values = ( + # small values + 1, 2, 5, 7, 123, 456, 1234, + # 10^k - 1 + 9, + 99, + 999, + 9999, + 99999, + 999999, + # test half even rounding near 0.5, 1.5, 2.5, 3.5, 4.5 + 499, 500, 501, + 1499, 1500, 1501, + 2500, + 3500, + 4500, + ) + + ns_timestamps = [0] + for unit in units: + for value in values: + ns = value * unit + ns_timestamps.extend((-ns, ns)) + for pow2 in (0, 5, 10, 15, 22, 23, 24, 30, 33): + ns = (2 ** pow2) * SEC_TO_NS + ns_timestamps.extend(( + -ns-1, -ns, -ns+1, + ns-1, ns, ns+1 + )) + for seconds in (_testcapi.INT_MIN, _testcapi.INT_MAX): + ns_timestamps.append(seconds * SEC_TO_NS) + if use_float: + # numbers with an exact representation in IEEE 754 (base 2) + for pow2 in (3, 7, 10, 15): + ns = 2.0 ** (-pow2) + ns_timestamps.extend((-ns, ns)) + + # seconds close to _PyTime_t type limit + ns = (2 ** 63 // SEC_TO_NS) * SEC_TO_NS + ns_timestamps.extend((-ns, ns)) + + return ns_timestamps + + def _check_rounding(self, pytime_converter, expected_func, + use_float, unit_to_sec, value_filter=None): + + def convert_values(ns_timestamps): + if use_float: + unit_to_ns = SEC_TO_NS / float(unit_to_sec) + values = [ns / unit_to_ns for ns in ns_timestamps] + else: + unit_to_ns = SEC_TO_NS // unit_to_sec + values = [ns // unit_to_ns for ns in ns_timestamps] + + if value_filter: + values = filter(value_filter, values) + + # remove duplicates and sort + return sorted(set(values)) + + # test rounding + ns_timestamps = self._rounding_values(use_float) + valid_values = convert_values(ns_timestamps) + for time_rnd, decimal_rnd in ROUNDING_MODES : + context = decimal.getcontext() + context.rounding = decimal_rnd + + for value in valid_values: + debug_info = {'value': value, 'rounding': decimal_rnd} + try: + result = pytime_converter(value, time_rnd) + expected = expected_func(value) + except Exception as exc: + self.fail("Error on timestamp conversion: %s" % debug_info) + self.assertEqual(result, + expected, + debug_info) + + # test overflow + ns = self.OVERFLOW_SECONDS * SEC_TO_NS + ns_timestamps = (-ns, ns) + overflow_values = convert_values(ns_timestamps) + for time_rnd, _ in ROUNDING_MODES : + for value in overflow_values: + debug_info = {'value': value, 'rounding': time_rnd} + with self.assertRaises(OverflowError, msg=debug_info): + pytime_converter(value, time_rnd) + + def check_int_rounding(self, pytime_converter, expected_func, + unit_to_sec=1, value_filter=None): + self._check_rounding(pytime_converter, expected_func, + False, unit_to_sec, value_filter) + + def check_float_rounding(self, pytime_converter, expected_func, + unit_to_sec=1, value_filter=None): + self._check_rounding(pytime_converter, expected_func, + True, unit_to_sec, value_filter) + + def decimal_round(self, x): + d = decimal.Decimal(x) + d = d.quantize(1) + return int(d) + + +class TestCPyTime(CPyTimeTestCase, unittest.TestCase): + """ + Test the C _PyTime_t API. + """ + # _PyTime_t is a 64-bit signed integer + OVERFLOW_SECONDS = math.ceil((2**63 + 1) / SEC_TO_NS) + def test_FromSeconds(self): from _testcapi import PyTime_FromSeconds - for seconds in (0, 3, -456, _testcapi.INT_MAX, _testcapi.INT_MIN): - with self.subTest(seconds=seconds): - self.assertEqual(PyTime_FromSeconds(seconds), - seconds * SEC_TO_NS) + + # PyTime_FromSeconds() expects a C int, reject values out of range + def c_int_filter(secs): + return (_testcapi.INT_MIN <= secs <= _testcapi.INT_MAX) + + self.check_int_rounding(lambda secs, rnd: PyTime_FromSeconds(secs), + lambda secs: secs * SEC_TO_NS, + value_filter=c_int_filter) def test_FromSecondsObject(self): from _testcapi import PyTime_FromSecondsObject - # Conversion giving the same result for all rounding methods - for rnd in ALL_ROUNDING_METHODS: - for obj, ts in ( - # integers - (0, 0), - (1, SEC_TO_NS), - (-3, -3 * SEC_TO_NS), - - # float: subseconds - (0.0, 0), - (1e-9, 1), - (1e-6, 10 ** 3), - (1e-3, 10 ** 6), - - # float: seconds - (2.0, 2 * SEC_TO_NS), - (123.0, 123 * SEC_TO_NS), - (-7.0, -7 * SEC_TO_NS), - - # nanosecond are kept for value <= 2^23 seconds - (2**22 - 1e-9, 4194303999999999), - (2**22, 4194304000000000), - (2**22 + 1e-9, 4194304000000001), - (2**23 - 1e-9, 8388607999999999), - (2**23, 8388608000000000), - - # start losing precision for value > 2^23 seconds - (2**23 + 1e-9, 8388608000000002), - - # nanoseconds are lost for value > 2^23 seconds - (2**24 - 1e-9, 16777215999999998), - (2**24, 16777216000000000), - (2**24 + 1e-9, 16777216000000000), - (2**25 - 1e-9, 33554432000000000), - (2**25 , 33554432000000000), - (2**25 + 1e-9, 33554432000000000), - - # close to 2^63 nanoseconds (_PyTime_t limit) - (9223372036, 9223372036 * SEC_TO_NS), - (9223372036.0, 9223372036 * SEC_TO_NS), - (-9223372036, -9223372036 * SEC_TO_NS), - (-9223372036.0, -9223372036 * SEC_TO_NS), - ): - with self.subTest(obj=obj, round=rnd, timestamp=ts): - self.assertEqual(PyTime_FromSecondsObject(obj, rnd), ts) - - with self.subTest(round=rnd): - with self.assertRaises(OverflowError): - PyTime_FromSecondsObject(9223372037, rnd) - PyTime_FromSecondsObject(9223372037.0, rnd) - PyTime_FromSecondsObject(-9223372037, rnd) - PyTime_FromSecondsObject(-9223372037.0, rnd) - - # Conversion giving different results depending on the rounding method - FLOOR = _PyTime.ROUND_FLOOR - CEILING = _PyTime.ROUND_CEILING - for obj, ts, rnd in ( - # close to zero - ( 1e-10, 0, FLOOR), - ( 1e-10, 1, CEILING), - (-1e-10, -1, FLOOR), - (-1e-10, 0, CEILING), - - # test rounding of the last nanosecond - ( 1.1234567899, 1123456789, FLOOR), - ( 1.1234567899, 1123456790, CEILING), - (-1.1234567899, -1123456790, FLOOR), - (-1.1234567899, -1123456789, CEILING), - - # close to 1 second - ( 0.9999999999, 999999999, FLOOR), - ( 0.9999999999, 1000000000, CEILING), - (-0.9999999999, -1000000000, FLOOR), - (-0.9999999999, -999999999, CEILING), - ): - with self.subTest(obj=obj, round=rnd, timestamp=ts): - self.assertEqual(PyTime_FromSecondsObject(obj, rnd), ts) + self.check_int_rounding( + PyTime_FromSecondsObject, + lambda secs: secs * SEC_TO_NS) + + self.check_float_rounding( + PyTime_FromSecondsObject, + lambda ns: self.decimal_round(ns * SEC_TO_NS)) def test_AsSecondsDouble(self): from _testcapi import PyTime_AsSecondsDouble - for nanoseconds, seconds in ( - # near 1 nanosecond - ( 0, 0.0), - ( 1, 1e-9), - (-1, -1e-9), - - # near 1 second - (SEC_TO_NS + 1, 1.0 + 1e-9), - (SEC_TO_NS, 1.0), - (SEC_TO_NS - 1, 1.0 - 1e-9), - - # a few seconds - (123 * SEC_TO_NS, 123.0), - (-567 * SEC_TO_NS, -567.0), - - # nanosecond are kept for value <= 2^23 seconds - (4194303999999999, 2**22 - 1e-9), - (4194304000000000, 2**22), - (4194304000000001, 2**22 + 1e-9), - - # start losing precision for value > 2^23 seconds - (8388608000000002, 2**23 + 1e-9), - - # nanoseconds are lost for value > 2^23 seconds - (16777215999999998, 2**24 - 1e-9), - (16777215999999999, 2**24 - 1e-9), - (16777216000000000, 2**24 ), - (16777216000000001, 2**24 ), - (16777216000000002, 2**24 + 2e-9), - - (33554432000000000, 2**25 ), - (33554432000000002, 2**25 ), - (33554432000000004, 2**25 + 4e-9), - - # close to 2^63 nanoseconds (_PyTime_t limit) - (9223372036 * SEC_TO_NS, 9223372036.0), - (-9223372036 * SEC_TO_NS, -9223372036.0), - ): - with self.subTest(nanoseconds=nanoseconds, seconds=seconds): - self.assertEqual(PyTime_AsSecondsDouble(nanoseconds), - seconds) - - def test_timeval(self): + def float_converter(ns): + if abs(ns) % SEC_TO_NS == 0: + return float(ns // SEC_TO_NS) + else: + return float(ns) / SEC_TO_NS + + self.check_int_rounding(lambda ns, rnd: PyTime_AsSecondsDouble(ns), + float_converter, + NS_TO_SEC) + + def create_decimal_converter(self, denominator): + denom = decimal.Decimal(denominator) + + def converter(value): + d = decimal.Decimal(value) / denom + return self.decimal_round(d) + + return converter + + def test_AsTimeval(self): from _testcapi import PyTime_AsTimeval - for rnd in ALL_ROUNDING_METHODS: - for ns, tv in ( - # microseconds - (0, (0, 0)), - (1000, (0, 1)), - (-1000, (-1, 999999)), - - # seconds - (2 * SEC_TO_NS, (2, 0)), - (-3 * SEC_TO_NS, (-3, 0)), - ): - with self.subTest(nanoseconds=ns, timeval=tv, round=rnd): - self.assertEqual(PyTime_AsTimeval(ns, rnd), tv) - - FLOOR = _PyTime.ROUND_FLOOR - CEILING = _PyTime.ROUND_CEILING - for ns, tv, rnd in ( - # nanoseconds - (1, (0, 0), FLOOR), - (1, (0, 1), CEILING), - (-1, (-1, 999999), FLOOR), - (-1, (0, 0), CEILING), - - # seconds + nanoseconds - (1234567001, (1, 234567), FLOOR), - (1234567001, (1, 234568), CEILING), - (-1234567001, (-2, 765432), FLOOR), - (-1234567001, (-2, 765433), CEILING), - ): - with self.subTest(nanoseconds=ns, timeval=tv, round=rnd): - self.assertEqual(PyTime_AsTimeval(ns, rnd), tv) + + us_converter = self.create_decimal_converter(US_TO_NS) + + def timeval_converter(ns): + us = us_converter(ns) + return divmod(us, SEC_TO_US) + + if sys.platform == 'win32': + from _testcapi import LONG_MIN, LONG_MAX + + # On Windows, timeval.tv_sec type is a C long + def seconds_filter(secs): + return LONG_MIN <= secs <= LONG_MAX + else: + seconds_filter = self.time_t_filter + + self.check_int_rounding(PyTime_AsTimeval, + timeval_converter, + NS_TO_SEC, + value_filter=seconds_filter) @unittest.skipUnless(hasattr(_testcapi, 'PyTime_AsTimespec'), 'need _testcapi.PyTime_AsTimespec') - def test_timespec(self): + def test_AsTimespec(self): from _testcapi import PyTime_AsTimespec - for ns, ts in ( - # nanoseconds - (0, (0, 0)), - (1, (0, 1)), - (-1, (-1, 999999999)), - - # seconds - (2 * SEC_TO_NS, (2, 0)), - (-3 * SEC_TO_NS, (-3, 0)), - - # seconds + nanoseconds - (1234567890, (1, 234567890)), - (-1234567890, (-2, 765432110)), - ): - with self.subTest(nanoseconds=ns, timespec=ts): - self.assertEqual(PyTime_AsTimespec(ns), ts) - - def test_milliseconds(self): + + def timespec_converter(ns): + return divmod(ns, SEC_TO_NS) + + self.check_int_rounding(lambda ns, rnd: PyTime_AsTimespec(ns), + timespec_converter, + NS_TO_SEC, + value_filter=self.time_t_filter) + + def test_AsMilliseconds(self): from _testcapi import PyTime_AsMilliseconds - for rnd in ALL_ROUNDING_METHODS: - for ns, tv in ( - # milliseconds - (1 * MS_TO_NS, 1), - (-2 * MS_TO_NS, -2), - - # seconds - (2 * SEC_TO_NS, 2000), - (-3 * SEC_TO_NS, -3000), - ): - with self.subTest(nanoseconds=ns, timeval=tv, round=rnd): - self.assertEqual(PyTime_AsMilliseconds(ns, rnd), tv) - - FLOOR = _PyTime.ROUND_FLOOR - CEILING = _PyTime.ROUND_CEILING - for ns, ms, rnd in ( - # nanoseconds - (1, 0, FLOOR), - (1, 1, CEILING), - (-1, -1, FLOOR), - (-1, 0, CEILING), - - # seconds + nanoseconds - (1234 * MS_TO_NS + 1, 1234, FLOOR), - (1234 * MS_TO_NS + 1, 1235, CEILING), - (-1234 * MS_TO_NS - 1, -1235, FLOOR), - (-1234 * MS_TO_NS - 1, -1234, CEILING), - ): - with self.subTest(nanoseconds=ns, milliseconds=ms, round=rnd): - self.assertEqual(PyTime_AsMilliseconds(ns, rnd), ms) - - def test_microseconds(self): + + self.check_int_rounding(PyTime_AsMilliseconds, + self.create_decimal_converter(MS_TO_NS), + NS_TO_SEC) + + def test_AsMicroseconds(self): from _testcapi import PyTime_AsMicroseconds - for rnd in ALL_ROUNDING_METHODS: - for ns, tv in ( - # microseconds - (1 * US_TO_NS, 1), - (-2 * US_TO_NS, -2), - - # milliseconds - (1 * MS_TO_NS, 1000), - (-2 * MS_TO_NS, -2000), - - # seconds - (2 * SEC_TO_NS, 2000000), - (-3 * SEC_TO_NS, -3000000), - ): - with self.subTest(nanoseconds=ns, timeval=tv, round=rnd): - self.assertEqual(PyTime_AsMicroseconds(ns, rnd), tv) - - FLOOR = _PyTime.ROUND_FLOOR - CEILING = _PyTime.ROUND_CEILING - for ns, ms, rnd in ( - # nanoseconds - (1, 0, FLOOR), - (1, 1, CEILING), - (-1, -1, FLOOR), - (-1, 0, CEILING), - - # seconds + nanoseconds - (1234 * US_TO_NS + 1, 1234, FLOOR), - (1234 * US_TO_NS + 1, 1235, CEILING), - (-1234 * US_TO_NS - 1, -1235, FLOOR), - (-1234 * US_TO_NS - 1, -1234, CEILING), - ): - with self.subTest(nanoseconds=ns, milliseconds=ms, round=rnd): - self.assertEqual(PyTime_AsMicroseconds(ns, rnd), ms) + + self.check_int_rounding(PyTime_AsMicroseconds, + self.create_decimal_converter(US_TO_NS), + NS_TO_SEC) + + +class TestOldPyTime(CPyTimeTestCase, unittest.TestCase): + """ + Test the old C _PyTime_t API: _PyTime_ObjectToXXX() functions. + """ + + # time_t is a 32-bit or 64-bit signed integer + OVERFLOW_SECONDS = 2 ** 64 + + def test_object_to_time_t(self): + from _testcapi import pytime_object_to_time_t + + self.check_int_rounding(pytime_object_to_time_t, + lambda secs: secs, + value_filter=self.time_t_filter) + + self.check_float_rounding(pytime_object_to_time_t, + self.decimal_round, + value_filter=self.time_t_filter) + + def create_converter(self, sec_to_unit): + def converter(secs): + floatpart, intpart = math.modf(secs) + intpart = int(intpart) + floatpart *= sec_to_unit + floatpart = self.decimal_round(floatpart) + if floatpart < 0: + floatpart += sec_to_unit + intpart -= 1 + elif floatpart >= sec_to_unit: + floatpart -= sec_to_unit + intpart += 1 + return (intpart, floatpart) + return converter + + def test_object_to_timeval(self): + from _testcapi import pytime_object_to_timeval + + self.check_int_rounding(pytime_object_to_timeval, + lambda secs: (secs, 0), + value_filter=self.time_t_filter) + + self.check_float_rounding(pytime_object_to_timeval, + self.create_converter(SEC_TO_US), + value_filter=self.time_t_filter) + + def test_object_to_timespec(self): + from _testcapi import pytime_object_to_timespec + + self.check_int_rounding(pytime_object_to_timespec, + lambda secs: (secs, 0), + value_filter=self.time_t_filter) + + self.check_float_rounding(pytime_object_to_timespec, + self.create_converter(SEC_TO_NS), + value_filter=self.time_t_filter) if __name__ == "__main__": diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py index 2db3c1b..1a95e29 100644 --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -354,6 +354,28 @@ class TestTimeit(unittest.TestCase): s = self.run_main(switches=['-n1', '1/0']) self.assert_exc_string(error_stringio.getvalue(), 'ZeroDivisionError') + def autorange(self, callback=None): + timer = FakeTimer(seconds_per_increment=0.001) + t = timeit.Timer(stmt=self.fake_stmt, setup=self.fake_setup, timer=timer) + return t.autorange(callback) + + def test_autorange(self): + num_loops, time_taken = self.autorange() + self.assertEqual(num_loops, 1000) + self.assertEqual(time_taken, 1.0) + + def test_autorange_with_callback(self): + def callback(a, b): + print("{} {:.3f}".format(a, b)) + with captured_stdout() as s: + num_loops, time_taken = self.autorange(callback) + self.assertEqual(num_loops, 1000) + self.assertEqual(time_taken, 1.0) + expected = ('10 0.010\n' + '100 0.100\n' + '1000 1.000\n') + self.assertEqual(s.getvalue(), expected) + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index 3b17ca6..5a81a5f 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -4,6 +4,8 @@ from tokenize import (tokenize, _tokenize, untokenize, NUMBER, NAME, OP, open as tokenize_open, Untokenizer) from io import BytesIO from unittest import TestCase, mock +from test.test_grammar import (VALID_UNDERSCORE_LITERALS, + INVALID_UNDERSCORE_LITERALS) import os import token @@ -24,8 +26,7 @@ class TokenizeTest(TestCase): if type == ENDMARKER: break type = tok_name[type] - result.append(" %(type)-10.10s %(token)-13.13r %(start)s %(end)s" % - locals()) + result.append(f" {type:10} {token!r:13} {start} {end}") self.assertEqual(result, [" ENCODING 'utf-8' (0, 0) (0, 0)"] + expected.rstrip().splitlines()) @@ -132,18 +133,18 @@ def k(x): self.check_tokenize("x = 0xfffffffffff", """\ NAME 'x' (1, 0) (1, 1) OP '=' (1, 2) (1, 3) - NUMBER '0xffffffffff (1, 4) (1, 17) + NUMBER '0xfffffffffff' (1, 4) (1, 17) """) self.check_tokenize("x = 123141242151251616110", """\ NAME 'x' (1, 0) (1, 1) OP '=' (1, 2) (1, 3) - NUMBER '123141242151 (1, 4) (1, 25) + NUMBER '123141242151251616110' (1, 4) (1, 25) """) self.check_tokenize("x = -15921590215012591", """\ NAME 'x' (1, 0) (1, 1) OP '=' (1, 2) (1, 3) OP '-' (1, 4) (1, 5) - NUMBER '159215902150 (1, 5) (1, 22) + NUMBER '15921590215012591' (1, 5) (1, 22) """) def test_float(self): @@ -186,6 +187,21 @@ def k(x): NUMBER '3.14e159' (1, 4) (1, 12) """) + def test_underscore_literals(self): + def number_token(s): + f = BytesIO(s.encode('utf-8')) + for toktype, token, start, end, line in tokenize(f.readline): + if toktype == NUMBER: + return token + return 'invalid token' + for lit in VALID_UNDERSCORE_LITERALS: + if '(' in lit: + # this won't work with compound complex inputs + continue + self.assertEqual(number_token(lit), lit) + for lit in INVALID_UNDERSCORE_LITERALS: + self.assertNotEqual(number_token(lit), lit) + def test_string(self): # String literals self.check_tokenize("x = ''; y = \"\"", """\ @@ -307,6 +323,50 @@ def k(x): OP '+' (1, 28) (1, 29) STRING 'RB"abc"' (1, 30) (1, 37) """) + # Check 0, 1, and 2 character string prefixes. + self.check_tokenize(r'"a\ +de\ +fg"', """\ + STRING '"a\\\\\\nde\\\\\\nfg"\' (1, 0) (3, 3) + """) + self.check_tokenize(r'u"a\ +de"', """\ + STRING 'u"a\\\\\\nde"\' (1, 0) (2, 3) + """) + self.check_tokenize(r'rb"a\ +d"', """\ + STRING 'rb"a\\\\\\nd"\' (1, 0) (2, 2) + """) + self.check_tokenize(r'"""a\ +b"""', """\ + STRING '\"\""a\\\\\\nb\"\""' (1, 0) (2, 4) + """) + self.check_tokenize(r'u"""a\ +b"""', """\ + STRING 'u\"\""a\\\\\\nb\"\""' (1, 0) (2, 4) + """) + self.check_tokenize(r'rb"""a\ +b\ +c"""', """\ + STRING 'rb"\""a\\\\\\nb\\\\\\nc"\""' (1, 0) (3, 4) + """) + self.check_tokenize('f"abc"', """\ + STRING 'f"abc"' (1, 0) (1, 6) + """) + self.check_tokenize('fR"a{b}c"', """\ + STRING 'fR"a{b}c"' (1, 0) (1, 9) + """) + self.check_tokenize('f"""abc"""', """\ + STRING 'f\"\"\"abc\"\"\"' (1, 0) (1, 10) + """) + self.check_tokenize(r'f"abc\ +def"', """\ + STRING 'f"abc\\\\\\ndef"' (1, 0) (2, 4) + """) + self.check_tokenize(r'Rf"abc\ +def"', """\ + STRING 'Rf"abc\\\\\\ndef"' (1, 0) (2, 4) + """) def test_function(self): self.check_tokenize("def d22(a, b, c=2, d=2, *k): pass", """\ @@ -505,7 +565,7 @@ def k(x): # Methods self.check_tokenize("@staticmethod\ndef foo(x,y): pass", """\ OP '@' (1, 0) (1, 1) - NAME 'staticmethod (1, 1) (1, 13) + NAME 'staticmethod' (1, 1) (1, 13) NEWLINE '\\n' (1, 13) (1, 14) NAME 'def' (2, 0) (2, 3) NAME 'foo' (2, 4) (2, 7) @@ -1488,10 +1548,10 @@ class TestRoundtrip(TestCase): # Tokenize is broken on test_pep3131.py because regular expressions are # broken on the obscure unicode identifiers in it. *sigh* - # With roundtrip extended to test the 5-tuple mode of untokenize, + # With roundtrip extended to test the 5-tuple mode of untokenize, # 7 more testfiles fail. Remove them also until the failure is diagnosed. - testfiles.remove(os.path.join(tempdir, "test_pep3131.py")) + testfiles.remove(os.path.join(tempdir, "test_unicode_identifiers.py")) for f in ('buffer', 'builtin', 'fileio', 'inspect', 'os', 'platform', 'sys'): testfiles.remove(os.path.join(tempdir, "test_%s.py") % f) diff --git a/Lib/test/test_tools/__init__.py b/Lib/test/test_tools/__init__.py index 04c8726..4d0fca3 100644 --- a/Lib/test/test_tools/__init__.py +++ b/Lib/test/test_tools/__init__.py @@ -3,7 +3,6 @@ import os import unittest import importlib from test import support -from fnmatch import fnmatch basepath = os.path.dirname( # os.path.dirname( # Lib diff --git a/Lib/test/test_tools/test_gprof2html.py b/Lib/test/test_tools/test_gprof2html.py index 0c294ec..9489ed9 100644 --- a/Lib/test/test_tools/test_gprof2html.py +++ b/Lib/test/test_tools/test_gprof2html.py @@ -2,12 +2,11 @@ import os import sys -import importlib import unittest from unittest import mock import tempfile -from test.test_tools import scriptsdir, skip_if_missing, import_tool +from test.test_tools import skip_if_missing, import_tool skip_if_missing() diff --git a/Lib/test/test_tools/test_md5sum.py b/Lib/test/test_tools/test_md5sum.py index 1305295..fb565b7 100644 --- a/Lib/test/test_tools/test_md5sum.py +++ b/Lib/test/test_tools/test_md5sum.py @@ -1,12 +1,11 @@ """Tests for the md5sum script in the Tools directory.""" import os -import sys import unittest from test import support from test.support.script_helper import assert_python_ok, assert_python_failure -from test.test_tools import scriptsdir, import_tool, skip_if_missing +from test.test_tools import scriptsdir, skip_if_missing skip_if_missing() diff --git a/Lib/test/test_tools/test_pdeps.py b/Lib/test/test_tools/test_pdeps.py index 091fa6a..27cbfe2 100644 --- a/Lib/test/test_tools/test_pdeps.py +++ b/Lib/test/test_tools/test_pdeps.py @@ -1,12 +1,10 @@ """Tests for the pdeps script in the Tools directory.""" import os -import sys import unittest import tempfile -from test import support -from test.test_tools import scriptsdir, skip_if_missing, import_tool +from test.test_tools import skip_if_missing, import_tool skip_if_missing() diff --git a/Lib/test/test_tools/test_reindent.py b/Lib/test/test_tools/test_reindent.py index 34df0c5..d7c20e1 100644 --- a/Lib/test/test_tools/test_reindent.py +++ b/Lib/test/test_tools/test_reindent.py @@ -7,7 +7,6 @@ Tools directory of a Python checkout or tarball, such as reindent.py. import os import unittest from test.support.script_helper import assert_python_ok -from test.support import findfile from test.test_tools import scriptsdir, skip_if_missing @@ -24,12 +23,6 @@ class ReindentTests(unittest.TestCase): self.assertEqual(out, b'') self.assertGreater(err, b'') - def test_reindent_file_with_bad_encoding(self): - bad_coding_path = findfile('bad_coding.py') - rc, out, err = assert_python_ok(self.script, '-r', bad_coding_path) - self.assertEqual(out, b'') - self.assertNotEqual(err, b'') - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py index 734bbc2..65dee1b 100644 --- a/Lib/test/test_tools/test_unparse.py +++ b/Lib/test/test_tools/test_unparse.py @@ -134,6 +134,11 @@ class ASTTestCase(unittest.TestCase): class UnparseTestCase(ASTTestCase): # Tests for specific bugs found in earlier versions of unparse + def test_fstrings(self): + # See issue 25180 + self.check_roundtrip(r"""f'{f"{0}"*3}'""") + self.check_roundtrip(r"""f'{f"{y}"*3}'""") + def test_del_statement(self): self.check_roundtrip("del x, y, z") @@ -279,8 +284,18 @@ class DirectoryTestCase(ASTTestCase): for filename in names: if test.support.verbose: print('Testing %s' % filename) - source = read_pyfile(filename) - self.check_roundtrip(source) + + # Some f-strings are not correctly round-tripped by + # Tools/parser/unparse.py. See issue 28002 for details. + # We need to skip files that contain such f-strings. + if os.path.basename(filename) in ('test_fstring.py', ): + if test.support.verbose: + print(f'Skipping {filename}: see issue 28002') + continue + + with self.subTest(filename=filename): + source = read_pyfile(filename) + self.check_roundtrip(source) if __name__ == '__main__': diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py index f66a3bc..1d87aea 100644 --- a/Lib/test/test_trace.py +++ b/Lib/test/test_trace.py @@ -1,11 +1,11 @@ import os -import io import sys from test.support import TESTFN, rmtree, unlink, captured_stdout +from test.support.script_helper import assert_python_ok, assert_python_failure import unittest import trace -from trace import CoverageResults, Trace +from trace import Trace from test.tracedmodules import testmod @@ -365,51 +365,27 @@ class Test_Ignore(unittest.TestCase): # Matched before. self.assertTrue(ignore.names(jn('bar', 'baz.py'), 'baz')) - -class TestDeprecatedMethods(unittest.TestCase): - - def test_deprecated_usage(self): - sio = io.StringIO() - with self.assertWarns(DeprecationWarning): - trace.usage(sio) - self.assertIn('Usage:', sio.getvalue()) - - def test_deprecated_Ignore(self): - with self.assertWarns(DeprecationWarning): - trace.Ignore() - - def test_deprecated_modname(self): - with self.assertWarns(DeprecationWarning): - self.assertEqual("spam", trace.modname("spam")) - - def test_deprecated_fullmodname(self): - with self.assertWarns(DeprecationWarning): - self.assertEqual("spam", trace.fullmodname("spam")) - - def test_deprecated_find_lines_from_code(self): - with self.assertWarns(DeprecationWarning): - def foo(): - pass - trace.find_lines_from_code(foo.__code__, ["eggs"]) - - def test_deprecated_find_lines(self): - with self.assertWarns(DeprecationWarning): - def foo(): - pass - trace.find_lines(foo.__code__, ["eggs"]) - - def test_deprecated_find_strings(self): - with open(TESTFN, 'w') as fd: - self.addCleanup(unlink, TESTFN) - with self.assertWarns(DeprecationWarning): - trace.find_strings(fd.name) - - def test_deprecated_find_executable_linenos(self): +class TestCommandLine(unittest.TestCase): + + def test_failures(self): + _errors = ( + (b'filename is missing: required with the main options', '-l', '-T'), + (b'cannot specify both --listfuncs and (--trace or --count)', '-lc'), + (b'argument -R/--no-report: not allowed with argument -r/--report', '-rR'), + (b'must specify one of --trace, --count, --report, --listfuncs, or --trackcalls', '-g'), + (b'-r/--report requires -f/--file', '-r'), + (b'--summary can only be used with --count or --report', '-sT'), + (b'unrecognized arguments: -y', '-y')) + for message, *args in _errors: + *_, stderr = assert_python_failure('-m', 'trace', *args) + self.assertIn(message, stderr) + + def test_listfuncs_flag_success(self): with open(TESTFN, 'w') as fd: self.addCleanup(unlink, TESTFN) - with self.assertWarns(DeprecationWarning): - trace.find_executable_linenos(fd.name) - + fd.write("a = 1\n") + status, stdout, stderr = assert_python_ok('-m', 'trace', '-l', TESTFN) + self.assertIn(b'functions called:', stdout) if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 49cedda..7276bc7 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -125,12 +125,12 @@ class TracebackCases(unittest.TestCase): def do_test(firstlines, message, charset, lineno): # Raise the message in a subprocess, and catch the output try: - output = open(TESTFN, "w", encoding=charset) - output.write("""{0}if 1: - import traceback; - raise RuntimeError('{1}') - """.format(firstlines, message)) - output.close() + with open(TESTFN, "w", encoding=charset) as output: + output.write("""{0}if 1: + import traceback; + raise RuntimeError('{1}') + """.format(firstlines, message)) + process = subprocess.Popen([sys.executable, TESTFN], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout, stderr = process.communicate() @@ -171,8 +171,8 @@ class TracebackCases(unittest.TestCase): text, charset, 5) do_test(" \t\f\n# coding: {0}\n".format(charset), text, charset, 5) - # Issue #18960: coding spec should has no effect - do_test("0\n# coding: GBK\n", "h\xe9 ho", 'utf-8', 5) + # Issue #18960: coding spec should have no effect + do_test("x=0\n# coding: GBK\n", "h\xe9 ho", 'utf-8', 5) @support.requires_type_collecting def test_print_traceback_at_exit(self): @@ -299,6 +299,137 @@ class TracebackFormatTests(unittest.TestCase): ' traceback.print_stack()', ]) + # issue 26823 - Shrink recursive tracebacks + def _check_recursive_traceback_display(self, render_exc): + # Always show full diffs when this test fails + # Note that rearranging things may require adjusting + # the relative line numbers in the expected tracebacks + self.maxDiff = None + + # Check hitting the recursion limit + def f(): + f() + + with captured_output("stderr") as stderr_f: + try: + f() + except RecursionError as exc: + render_exc() + else: + self.fail("no recursion occurred") + + lineno_f = f.__code__.co_firstlineno + result_f = ( + 'Traceback (most recent call last):\n' + f' File "{__file__}", line {lineno_f+5}, in _check_recursive_traceback_display\n' + ' f()\n' + f' File "{__file__}", line {lineno_f+1}, in f\n' + ' f()\n' + f' File "{__file__}", line {lineno_f+1}, in f\n' + ' f()\n' + f' File "{__file__}", line {lineno_f+1}, in f\n' + ' f()\n' + # XXX: The following line changes depending on whether the tests + # are run through the interactive interpreter or with -m + # It also varies depending on the platform (stack size) + # Fortunately, we don't care about exactness here, so we use regex + r' \[Previous line repeated (\d+) more times\]' '\n' + 'RecursionError: maximum recursion depth exceeded\n' + ) + + expected = result_f.splitlines() + actual = stderr_f.getvalue().splitlines() + + # Check the output text matches expectations + # 2nd last line contains the repetition count + self.assertEqual(actual[:-2], expected[:-2]) + self.assertRegex(actual[-2], expected[-2]) + self.assertEqual(actual[-1], expected[-1]) + + # Check the recursion count is roughly as expected + rec_limit = sys.getrecursionlimit() + self.assertIn(int(re.search(r"\d+", actual[-2]).group()), range(rec_limit-60, rec_limit)) + + # Check a known (limited) number of recursive invocations + def g(count=10): + if count: + return g(count-1) + raise ValueError + + with captured_output("stderr") as stderr_g: + try: + g() + except ValueError as exc: + render_exc() + else: + self.fail("no value error was raised") + + lineno_g = g.__code__.co_firstlineno + result_g = ( + f' File "{__file__}", line {lineno_g+2}, in g\n' + ' return g(count-1)\n' + f' File "{__file__}", line {lineno_g+2}, in g\n' + ' return g(count-1)\n' + f' File "{__file__}", line {lineno_g+2}, in g\n' + ' return g(count-1)\n' + ' [Previous line repeated 6 more times]\n' + f' File "{__file__}", line {lineno_g+3}, in g\n' + ' raise ValueError\n' + 'ValueError\n' + ) + tb_line = ( + 'Traceback (most recent call last):\n' + f' File "{__file__}", line {lineno_g+7}, in _check_recursive_traceback_display\n' + ' g()\n' + ) + expected = (tb_line + result_g).splitlines() + actual = stderr_g.getvalue().splitlines() + self.assertEqual(actual, expected) + + # Check 2 different repetitive sections + def h(count=10): + if count: + return h(count-1) + g() + + with captured_output("stderr") as stderr_h: + try: + h() + except ValueError as exc: + render_exc() + else: + self.fail("no value error was raised") + + lineno_h = h.__code__.co_firstlineno + result_h = ( + 'Traceback (most recent call last):\n' + f' File "{__file__}", line {lineno_h+7}, in _check_recursive_traceback_display\n' + ' h()\n' + f' File "{__file__}", line {lineno_h+2}, in h\n' + ' return h(count-1)\n' + f' File "{__file__}", line {lineno_h+2}, in h\n' + ' return h(count-1)\n' + f' File "{__file__}", line {lineno_h+2}, in h\n' + ' return h(count-1)\n' + ' [Previous line repeated 6 more times]\n' + f' File "{__file__}", line {lineno_h+3}, in h\n' + ' g()\n' + ) + expected = (result_h + result_g).splitlines() + actual = stderr_h.getvalue().splitlines() + self.assertEqual(actual, expected) + + def test_recursive_traceback_python(self): + self._check_recursive_traceback_display(traceback.print_exc) + + @cpython_only + def test_recursive_traceback_cpython_internal(self): + from _testcapi import exception_print + def render_exc(): + exc_type, exc_value, exc_tb = sys.exc_info() + exception_print(exc_value) + self._check_recursive_traceback_display(render_exc) + def test_format_stack(self): def fmt(): return traceback.format_stack() diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py index 2d1a9b3..790ab7e 100644 --- a/Lib/test/test_tracemalloc.py +++ b/Lib/test/test_tracemalloc.py @@ -11,9 +11,15 @@ try: import threading except ImportError: threading = None +try: + import _testcapi +except ImportError: + _testcapi = None + EMPTY_STRING_SIZE = sys.getsizeof(b'') + def get_frames(nframe, lineno_delta): frames = [] frame = sys._getframe(1) @@ -37,28 +43,31 @@ def allocate_bytes(size): def create_snapshots(): traceback_limit = 2 + # _tracemalloc._get_traces() returns a list of (domain, size, + # traceback_frames) tuples. traceback_frames is a tuple of (filename, + # line_number) tuples. raw_traces = [ - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), - (2, (('a.py', 5), ('b.py', 4))), + (1, 2, (('a.py', 5), ('b.py', 4))), - (66, (('b.py', 1),)), + (2, 66, (('b.py', 1),)), - (7, (('', 0),)), + (3, 7, (('', 0),)), ] snapshot = tracemalloc.Snapshot(raw_traces, traceback_limit) raw_traces2 = [ - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), - (2, (('a.py', 5), ('b.py', 4))), - (5000, (('a.py', 5), ('b.py', 4))), + (2, 2, (('a.py', 5), ('b.py', 4))), + (2, 5000, (('a.py', 5), ('b.py', 4))), - (400, (('c.py', 578),)), + (4, 400, (('c.py', 578),)), ] snapshot2 = tracemalloc.Snapshot(raw_traces2, traceback_limit) @@ -126,7 +135,7 @@ class TestTracemallocEnabled(unittest.TestCase): def find_trace(self, traces, traceback): for trace in traces: - if trace[1] == traceback._frames: + if trace[2] == traceback._frames: return trace self.fail("trace not found") @@ -140,7 +149,7 @@ class TestTracemallocEnabled(unittest.TestCase): trace = self.find_trace(traces, obj_traceback) self.assertIsInstance(trace, tuple) - size, traceback = trace + domain, size, traceback = trace self.assertEqual(size, obj_size) self.assertEqual(traceback, obj_traceback._frames) @@ -167,9 +176,8 @@ class TestTracemallocEnabled(unittest.TestCase): trace1 = self.find_trace(traces, obj1_traceback) trace2 = self.find_trace(traces, obj2_traceback) - size1, traceback1 = trace1 - size2, traceback2 = trace2 - self.assertEqual(traceback2, traceback1) + domain1, size1, traceback1 = trace1 + domain2, size2, traceback2 = trace2 self.assertIs(traceback2, traceback1) def test_get_traced_memory(self): @@ -292,7 +300,7 @@ class TestSnapshot(unittest.TestCase): maxDiff = 4000 def test_create_snapshot(self): - raw_traces = [(5, (('a.py', 2),))] + raw_traces = [(0, 5, (('a.py', 2),))] with contextlib.ExitStack() as stack: stack.enter_context(patch.object(tracemalloc, 'is_tracing', @@ -322,11 +330,11 @@ class TestSnapshot(unittest.TestCase): # exclude b.py snapshot3 = snapshot.filter_traces((filter1,)) self.assertEqual(snapshot3.traces._traces, [ - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (2, (('a.py', 5), ('b.py', 4))), - (7, (('', 0),)), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (1, 2, (('a.py', 5), ('b.py', 4))), + (3, 7, (('', 0),)), ]) # filter_traces() must not touch the original snapshot @@ -335,10 +343,10 @@ class TestSnapshot(unittest.TestCase): # only include two lines of a.py snapshot4 = snapshot3.filter_traces((filter2, filter3)) self.assertEqual(snapshot4.traces._traces, [ - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (10, (('a.py', 2), ('b.py', 4))), - (2, (('a.py', 5), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (1, 2, (('a.py', 5), ('b.py', 4))), ]) # No filter: just duplicate the snapshot @@ -349,6 +357,54 @@ class TestSnapshot(unittest.TestCase): self.assertRaises(TypeError, snapshot.filter_traces, filter1) + def test_filter_traces_domain(self): + snapshot, snapshot2 = create_snapshots() + filter1 = tracemalloc.Filter(False, "a.py", domain=1) + filter2 = tracemalloc.Filter(True, "a.py", domain=1) + + original_traces = list(snapshot.traces._traces) + + # exclude a.py of domain 1 + snapshot3 = snapshot.filter_traces((filter1,)) + self.assertEqual(snapshot3.traces._traces, [ + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (2, 66, (('b.py', 1),)), + (3, 7, (('', 0),)), + ]) + + # include domain 1 + snapshot3 = snapshot.filter_traces((filter1,)) + self.assertEqual(snapshot3.traces._traces, [ + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (2, 66, (('b.py', 1),)), + (3, 7, (('', 0),)), + ]) + + def test_filter_traces_domain_filter(self): + snapshot, snapshot2 = create_snapshots() + filter1 = tracemalloc.DomainFilter(False, domain=3) + filter2 = tracemalloc.DomainFilter(True, domain=3) + + # exclude domain 2 + snapshot3 = snapshot.filter_traces((filter1,)) + self.assertEqual(snapshot3.traces._traces, [ + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (0, 10, (('a.py', 2), ('b.py', 4))), + (1, 2, (('a.py', 5), ('b.py', 4))), + (2, 66, (('b.py', 1),)), + ]) + + # include domain 2 + snapshot3 = snapshot.filter_traces((filter2,)) + self.assertEqual(snapshot3.traces._traces, [ + (3, 7, (('', 0),)), + ]) + def test_snapshot_group_by_line(self): snapshot, snapshot2 = create_snapshots() tb_0 = traceback_lineno('', 0) @@ -809,7 +865,6 @@ class TestCommandLine(unittest.TestCase): b'number of frames', stderr) - @support.cpython_only def test_pymem_alloc0(self): # Issue #21639: Check that PyMem_Malloc(0) with tracemalloc enabled # does not crash. @@ -817,12 +872,121 @@ class TestCommandLine(unittest.TestCase): assert_python_ok('-X', 'tracemalloc', '-c', code) +@unittest.skipIf(_testcapi is None, 'need _testcapi') +class TestCAPI(unittest.TestCase): + maxDiff = 80 * 20 + + def setUp(self): + if tracemalloc.is_tracing(): + self.skipTest("tracemalloc must be stopped before the test") + + self.domain = 5 + self.size = 123 + self.obj = allocate_bytes(self.size)[0] + + # for the type "object", id(obj) is the address of its memory block. + # This type is not tracked by the garbage collector + self.ptr = id(self.obj) + + def tearDown(self): + tracemalloc.stop() + + def get_traceback(self): + frames = _testcapi.tracemalloc_get_traceback(self.domain, self.ptr) + if frames is not None: + return tracemalloc.Traceback(frames) + else: + return None + + def track(self, release_gil=False, nframe=1): + frames = get_frames(nframe, 2) + _testcapi.tracemalloc_track(self.domain, self.ptr, self.size, + release_gil) + return frames + + def untrack(self): + _testcapi.tracemalloc_untrack(self.domain, self.ptr) + + def get_traced_memory(self): + # Get the traced size in the domain + snapshot = tracemalloc.take_snapshot() + domain_filter = tracemalloc.DomainFilter(True, self.domain) + snapshot = snapshot.filter_traces([domain_filter]) + return sum(trace.size for trace in snapshot.traces) + + def check_track(self, release_gil): + nframe = 5 + tracemalloc.start(nframe) + + size = tracemalloc.get_traced_memory()[0] + + frames = self.track(release_gil, nframe) + self.assertEqual(self.get_traceback(), + tracemalloc.Traceback(frames)) + + self.assertEqual(self.get_traced_memory(), self.size) + + def test_track(self): + self.check_track(False) + + def test_track_without_gil(self): + # check that calling _PyTraceMalloc_Track() without holding the GIL + # works too + self.check_track(True) + + def test_track_already_tracked(self): + nframe = 5 + tracemalloc.start(nframe) + + # track a first time + self.track() + + # calling _PyTraceMalloc_Track() must remove the old trace and add + # a new trace with the new traceback + frames = self.track(nframe=nframe) + self.assertEqual(self.get_traceback(), + tracemalloc.Traceback(frames)) + + def test_untrack(self): + tracemalloc.start() + + self.track() + self.assertIsNotNone(self.get_traceback()) + self.assertEqual(self.get_traced_memory(), self.size) + + # untrack must remove the trace + self.untrack() + self.assertIsNone(self.get_traceback()) + self.assertEqual(self.get_traced_memory(), 0) + + # calling _PyTraceMalloc_Untrack() multiple times must not crash + self.untrack() + self.untrack() + + def test_stop_track(self): + tracemalloc.start() + tracemalloc.stop() + + with self.assertRaises(RuntimeError): + self.track() + self.assertIsNone(self.get_traceback()) + + def test_stop_untrack(self): + tracemalloc.start() + self.track() + + tracemalloc.stop() + with self.assertRaises(RuntimeError): + self.untrack() + + def test_main(): support.run_unittest( TestTracemallocEnabled, TestSnapshot, TestFilters, TestCommandLine, + TestCAPI, ) if __name__ == "__main__": diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py index 490e723..462665d 100644 --- a/Lib/test/test_ttk_guionly.py +++ b/Lib/test/test_ttk_guionly.py @@ -1,4 +1,3 @@ -import os import unittest from test import support diff --git a/Lib/test/test_ttk_textonly.py b/Lib/test/test_ttk_textonly.py index 566fc9d..7540a43 100644 --- a/Lib/test/test_ttk_textonly.py +++ b/Lib/test/test_ttk_textonly.py @@ -1,4 +1,3 @@ -import os from test import support # Skip this test if _tkinter does not exist. diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 5e74115..382ca03 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -48,6 +48,7 @@ class TypesTests(unittest.TestCase): def test_float_constructor(self): self.assertRaises(ValueError, float, '') self.assertRaises(ValueError, float, '5\0') + self.assertRaises(ValueError, float, '5_5\0') def test_zero_division(self): try: 5.0 / 0.0 @@ -1000,6 +1001,24 @@ class ClassCreationTests(unittest.TestCase): with self.assertRaises(TypeError): X = types.new_class("X", (int(), C)) + def test_one_argument_type(self): + expected_message = 'type.__new__() takes exactly 3 arguments (1 given)' + + # Only type itself can use the one-argument form (#27157) + self.assertIs(type(5), int) + + class M(type): + pass + with self.assertRaises(TypeError) as cm: + M(5) + self.assertEqual(str(cm.exception), expected_message) + + class N(type, metaclass=M): + pass + with self.assertRaises(TypeError) as cm: + N(5) + self.assertEqual(str(cm.exception), expected_message) + class SimpleNamespaceTests(unittest.TestCase): diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 6d0b265..d203ce3 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -6,13 +6,13 @@ import sys from unittest import TestCase, main, skipUnless, SkipTest from copy import copy, deepcopy -from typing import Any, NoReturn +from typing import Any from typing import TypeVar, AnyStr from typing import T, KT, VT # Not in __all__. from typing import Union, Optional from typing import Tuple, List, MutableMapping from typing import Callable -from typing import Generic, ClassVar, GenericMeta +from typing import Generic, ClassVar from typing import cast from typing import get_type_hints from typing import no_type_check, no_type_check_decorator @@ -23,7 +23,6 @@ from typing import IO, TextIO, BinaryIO from typing import Pattern, Match import abc import typing -import weakref try: import collections.abc as collections_abc except ImportError: @@ -102,6 +101,10 @@ class AnyTests(BaseTestCase): with self.assertRaises(TypeError): type(Any)() + def test_cannot_subscript(self): + with self.assertRaises(TypeError): + Any[int] + def test_any_works_with_alias(self): # These expressions must simply not fail. typing.Match[Any] @@ -109,40 +112,6 @@ class AnyTests(BaseTestCase): typing.IO[Any] -class NoReturnTests(BaseTestCase): - - def test_noreturn_instance_type_error(self): - with self.assertRaises(TypeError): - isinstance(42, NoReturn) - - def test_noreturn_subclass_type_error(self): - with self.assertRaises(TypeError): - issubclass(Employee, NoReturn) - with self.assertRaises(TypeError): - issubclass(NoReturn, Employee) - - def test_repr(self): - self.assertEqual(repr(NoReturn), 'typing.NoReturn') - - def test_not_generic(self): - with self.assertRaises(TypeError): - NoReturn[int] - - def test_cannot_subclass(self): - with self.assertRaises(TypeError): - class A(NoReturn): - pass - with self.assertRaises(TypeError): - class A(type(NoReturn)): - pass - - def test_cannot_instantiate(self): - with self.assertRaises(TypeError): - NoReturn() - with self.assertRaises(TypeError): - type(NoReturn)() - - class TypeVarTests(BaseTestCase): def test_basic_plain(self): @@ -220,10 +189,6 @@ class TypeVarTests(BaseTestCase): with self.assertRaises(TypeError): TypeVar('X', str, float, bound=Employee) - def test_no_bivariant(self): - with self.assertRaises(ValueError): - TypeVar('T', covariant=True, contravariant=True) - class UnionTests(BaseTestCase): @@ -288,11 +253,6 @@ class UnionTests(BaseTestCase): self.assertEqual(repr(u), 'typing.Union[%s.Employee, int]' % __name__) u = Union[int, Employee] self.assertEqual(repr(u), 'typing.Union[int, %s.Employee]' % __name__) - T = TypeVar('T') - u = Union[T, int][int] - self.assertEqual(repr(u), repr(int)) - u = Union[List[int], int] - self.assertEqual(repr(u), 'typing.Union[typing.List[int], int]') def test_cannot_subclass(self): with self.assertRaises(TypeError): @@ -321,15 +281,6 @@ class UnionTests(BaseTestCase): self.assertFalse(Union[str, typing.Iterable[int]] == typing.Iterable[int]) self.assertTrue(Union[str, typing.Iterable] == typing.Iterable) - def test_union_compare_other(self): - self.assertNotEqual(Union, object) - self.assertNotEqual(Union, Any) - self.assertNotEqual(ClassVar, Union) - self.assertNotEqual(Optional, Union) - self.assertNotEqual([None], Optional) - self.assertNotEqual(Optional, typing.Mapping) - self.assertNotEqual(Optional[typing.MutableMapping], Union) - def test_optional(self): o = Optional[int] u = Union[int, None] @@ -343,15 +294,6 @@ class UnionTests(BaseTestCase): with self.assertRaises(TypeError): isinstance(42, Union[int, str]) - def test_no_eval_union(self): - u = Union[int, str] - def f(x: u): ... - self.assertIs(get_type_hints(f)['x'], u) - - def test_function_repr_union(self): - def fun() -> int: ... - self.assertEqual(repr(Union[fun, int]), 'typing.Union[fun, int]') - def test_union_str_pattern(self): # Shouldn't crash; see http://bugs.python.org/issue25390 A = Union[str, Pattern] @@ -449,8 +391,6 @@ class CallableTests(BaseTestCase): Callable[[()], int] with self.assertRaises(TypeError): Callable[[int, 1], 2] - with self.assertRaises(TypeError): - Callable[int] def test_callable_instance_works(self): def f(): @@ -596,27 +536,15 @@ class GenericTests(BaseTestCase): Y[str] with self.assertRaises(TypeError): Y[str, str] - self.assertIsSubclass(SimpleMapping[str, int], SimpleMapping) def test_generic_errors(self): T = TypeVar('T') - S = TypeVar('S') with self.assertRaises(TypeError): Generic[T]() with self.assertRaises(TypeError): - Generic[T][T] - with self.assertRaises(TypeError): - Generic[T][S] - with self.assertRaises(TypeError): isinstance([], List[int]) with self.assertRaises(TypeError): issubclass(list, List[int]) - with self.assertRaises(TypeError): - class NewGeneric(Generic): ... - with self.assertRaises(TypeError): - class MyGeneric(Generic[T], Generic[S]): ... - with self.assertRaises(TypeError): - class MyGeneric(List[T], Generic[S]): ... def test_init(self): T = TypeVar('T') @@ -674,10 +602,8 @@ class GenericTests(BaseTestCase): self.assertEqual(repr(typing.Mapping[T, TS][TS, T]), 'typing.Mapping[~TS, ~T]') self.assertEqual(repr(List[Tuple[T, TS]][int, T]), 'typing.List[typing.Tuple[int, ~T]]') - self.assertEqual( - repr(List[Tuple[T, T]][List[int]]), - 'typing.List[typing.Tuple[typing.List[int], typing.List[int]]]' - ) + self.assertEqual(repr(List[Tuple[T, T]][List[int]]), + 'typing.List[typing.Tuple[typing.List[int], typing.List[int]]]') def test_new_repr_bare(self): T = TypeVar('T') @@ -704,41 +630,6 @@ class GenericTests(BaseTestCase): c.bar = 'abc' self.assertEqual(c.__dict__, {'bar': 'abc'}) - def test_subscripted_generics_as_proxies(self): - T = TypeVar('T') - class C(Generic[T]): - x = 'def' - self.assertEqual(C[int].x, 'def') - self.assertEqual(C[C[int]].x, 'def') - C[C[int]].x = 'changed' - self.assertEqual(C.x, 'changed') - self.assertEqual(C[str].x, 'changed') - C[List[str]].z = 'new' - self.assertEqual(C.z, 'new') - self.assertEqual(C[Tuple[int]].z, 'new') - - self.assertEqual(C().x, 'changed') - self.assertEqual(C[Tuple[str]]().z, 'new') - - class D(C[T]): - pass - self.assertEqual(D[int].x, 'changed') - self.assertEqual(D.z, 'new') - D.z = 'from derived z' - D[int].x = 'from derived x' - self.assertEqual(C.x, 'changed') - self.assertEqual(C[int].z, 'new') - self.assertEqual(D.x, 'from derived x') - self.assertEqual(D[str].z, 'from derived z') - - def test_abc_registry_kept(self): - T = TypeVar('T') - class C(Generic[T]): ... - C.register(int) - self.assertIsInstance(1, C) - C[int] - self.assertIsInstance(1, C) - def test_false_subclasses(self): class MyMapping(MutableMapping[str, str]): pass self.assertNotIsInstance({}, MyMapping) @@ -783,10 +674,8 @@ class GenericTests(BaseTestCase): raise NotImplementedError if tp.__args__: KT, VT = tp.__args__ - return all( - isinstance(k, KT) and isinstance(v, VT) - for k, v in obj.items() - ) + return all(isinstance(k, KT) and isinstance(v, VT) + for k, v in obj.items()) self.assertTrue(naive_dict_check({'x': 1}, typing.Dict[str, int])) self.assertFalse(naive_dict_check({1: 'x'}, typing.Dict[str, int])) with self.assertRaises(NotImplementedError): @@ -802,7 +691,7 @@ class GenericTests(BaseTestCase): self.assertFalse(naive_generic_check(Node[str](), Node[int])) self.assertFalse(naive_generic_check(Node[str](), List)) with self.assertRaises(NotImplementedError): - naive_generic_check([1, 2, 3], Node[int]) + naive_generic_check([1,2,3], Node[int]) def naive_list_base_check(obj, tp): # Check if list conforms to a List subclass @@ -829,59 +718,6 @@ class GenericTests(BaseTestCase): self.assertEqual(C.__orig_bases__, (List[T][U][V],)) self.assertEqual(D.__orig_bases__, (C, List[T][U][V])) - def test_subscript_meta(self): - T = TypeVar('T') - self.assertEqual(Type[GenericMeta], Type[GenericMeta]) - self.assertEqual(Union[T, int][GenericMeta], Union[GenericMeta, int]) - self.assertEqual(Callable[..., GenericMeta].__args__, (Ellipsis, GenericMeta)) - - def test_generic_hashes(self): - try: - from test import mod_generics_cache - except ImportError: # for Python 3.4 and previous versions - import mod_generics_cache - class A(Generic[T]): - ... - - class B(Generic[T]): - class A(Generic[T]): - ... - - self.assertEqual(A, A) - self.assertEqual(mod_generics_cache.A[str], mod_generics_cache.A[str]) - self.assertEqual(B.A, B.A) - self.assertEqual(mod_generics_cache.B.A[B.A[str]], - mod_generics_cache.B.A[B.A[str]]) - - self.assertNotEqual(A, B.A) - self.assertNotEqual(A, mod_generics_cache.A) - self.assertNotEqual(A, mod_generics_cache.B.A) - self.assertNotEqual(B.A, mod_generics_cache.A) - self.assertNotEqual(B.A, mod_generics_cache.B.A) - - self.assertNotEqual(A[str], B.A[str]) - self.assertNotEqual(A[List[Any]], B.A[List[Any]]) - self.assertNotEqual(A[str], mod_generics_cache.A[str]) - self.assertNotEqual(A[str], mod_generics_cache.B.A[str]) - self.assertNotEqual(B.A[int], mod_generics_cache.A[int]) - self.assertNotEqual(B.A[List[Any]], mod_generics_cache.B.A[List[Any]]) - - self.assertNotEqual(Tuple[A[str]], Tuple[B.A[str]]) - self.assertNotEqual(Tuple[A[List[Any]]], Tuple[B.A[List[Any]]]) - self.assertNotEqual(Union[str, A[str]], Union[str, mod_generics_cache.A[str]]) - self.assertNotEqual(Union[A[str], A[str]], - Union[A[str], mod_generics_cache.A[str]]) - self.assertNotEqual(typing.FrozenSet[A[str]], - typing.FrozenSet[mod_generics_cache.B.A[str]]) - - if sys.version_info[:2] > (3, 2): - self.assertTrue(repr(Tuple[A[str]]).endswith('.A[str]]')) - self.assertTrue(repr(Tuple[B.A[str]]).endswith('.B.A[str]]')) - self.assertTrue(repr(Tuple[mod_generics_cache.A[str]]) - .endswith('mod_generics_cache.A[str]]')) - self.assertTrue(repr(Tuple[mod_generics_cache.B.A[str]]) - .endswith('mod_generics_cache.B.A[str]]')) - def test_extended_generic_rules_eq(self): T = TypeVar('T') U = TypeVar('U') @@ -921,10 +757,7 @@ class GenericTests(BaseTestCase): def test_generic_forward_ref(self): def foobar(x: List[List['CC']]): ... class CC: ... - self.assertEqual( - get_type_hints(foobar, globals(), locals()), - {'x': List[List[CC]]} - ) + self.assertEqual(get_type_hints(foobar, globals(), locals()), {'x': List[List[CC]]}) T = TypeVar('T') AT = Tuple[T, ...] def barfoo(x: AT): ... @@ -979,8 +812,6 @@ class GenericTests(BaseTestCase): Tuple[Generic[T]] with self.assertRaises(TypeError): List[typing._Protocol] - with self.assertRaises(TypeError): - isinstance(1, Generic) def test_type_erasure_special(self): T = TypeVar('T') @@ -999,11 +830,6 @@ class GenericTests(BaseTestCase): class MyDef(typing.DefaultDict[str, T]): ... self.assertIs(MyDef[int]().__class__, MyDef) self.assertIs(MyDef[int]().__orig_class__, MyDef[int]) - # ChainMap was added in 3.3 - if sys.version_info >= (3, 3): - class MyChain(typing.ChainMap[str, T]): ... - self.assertIs(MyChain[int]().__class__, MyChain) - self.assertIs(MyChain[int]().__orig_class__, MyChain[int]) def test_all_repr_eq_any(self): objs = (getattr(typing, el) for el in typing.__all__) @@ -1070,14 +896,6 @@ class GenericTests(BaseTestCase): self.assertEqual(t, copy(t)) self.assertEqual(t, deepcopy(t)) - def test_weakref_all(self): - T = TypeVar('T') - things = [Any, Union[T, int], Callable[..., T], Tuple[Any, Any], - Optional[List[int]], typing.Mapping[int, str], - typing.re.Match[bytes], typing.Iterable['whatever']] - for t in things: - self.assertEqual(weakref.ref(t)(), t) - def test_parameterized_slots(self): T = TypeVar('T') class C(Generic[T]): @@ -1252,7 +1070,6 @@ class GenericTests(BaseTestCase): with self.assertRaises(Exception): D[T] - class ClassVarTests(BaseTestCase): def test_basics(self): @@ -1354,19 +1171,6 @@ class ForwardRefTests(BaseTestCase): with self.assertRaises(TypeError): isinstance(42, fr) - def test_forwardref_subclass_type_error(self): - fr = typing._ForwardRef('int') - with self.assertRaises(TypeError): - issubclass(int, fr) - - def test_forward_equality(self): - fr = typing._ForwardRef('int') - self.assertEqual(fr, typing._ForwardRef('int')) - self.assertNotEqual(List['int'], List[int]) - - def test_forward_repr(self): - self.assertEqual(repr(List['int']), "typing.List[_ForwardRef('int')]") - def test_union_forward(self): def foo(a: Union['T']): @@ -1449,15 +1253,6 @@ class ForwardRefTests(BaseTestCase): ith = get_type_hints(C().foo) self.assertEqual(ith, {}) - def test_no_type_check_no_bases(self): - class C: - def meth(self, x: int): ... - @no_type_check - class D(C): - c = C - # verify that @no_type_check never affects bases - self.assertEqual(get_type_hints(C.meth), {'x': int}) - def test_meta_no_type_check(self): @no_type_check_decorator @@ -1497,6 +1292,9 @@ class ForwardRefTests(BaseTestCase): class OverloadTests(BaseTestCase): + def test_overload_exists(self): + from typing import overload + def test_overload_fails(self): from typing import overload @@ -1552,12 +1350,6 @@ class AsyncIteratorWrapper(typing.AsyncIterator[T_a]): return data else: raise StopAsyncIteration - -class ACM: - async def __aenter__(self) -> int: - return 42 - async def __aexit__(self, etype, eval, tb): - return None """ if ASYNCIO: @@ -1565,75 +1357,32 @@ if ASYNCIO: exec(ASYNCIO_TESTS) except ImportError: ASYNCIO = False -else: - # fake names for the sake of static analysis - asyncio = None - AwaitableWrapper = AsyncIteratorWrapper = ACM = object PY36 = sys.version_info[:2] >= (3, 6) PY36_TESTS = """ from test import ann_module, ann_module2, ann_module3 -from typing import AsyncContextManager class A: y: float class B(A): x: ClassVar[Optional['B']] = None y: int - b: int class CSub(B): z: ClassVar['CSub'] = B() class G(Generic[T]): lst: ClassVar[List[T]] = [] -class NoneAndForward: - parent: 'NoneAndForward' - meaning: None - class CoolEmployee(NamedTuple): name: str cool: int - -class CoolEmployeeWithDefault(NamedTuple): - name: str - cool: int = 0 - -class XMeth(NamedTuple): - x: int - def double(self): - return 2 * self.x - -class XRepr(NamedTuple): - x: int - y: int = 1 - def __str__(self): - return f'{self.x} -> {self.y}' - def __add__(self, other): - return 0 - -async def g_with(am: AsyncContextManager[int]): - x: int - async with am as x: - return x - -try: - g_with(ACM()).send(None) -except StopIteration as e: - assert e.args[0] == 42 """ if PY36: exec(PY36_TESTS) -else: - # fake names for the sake of static analysis - ann_module = ann_module2 = ann_module3 = None - A = B = CSub = G = CoolEmployee = CoolEmployeeWithDefault = object - XMeth = XRepr = NoneAndForward = object gth = get_type_hints - class GetTypeHintTests(BaseTestCase): def test_get_type_hints_from_various_objects(self): # For invalid objects should fail with TypeError (not AttributeError etc). @@ -1646,8 +1395,7 @@ class GetTypeHintTests(BaseTestCase): @skipUnless(PY36, 'Python 3.6 required') def test_get_type_hints_modules(self): - ann_module_type_hints = {1: 2, 'f': Tuple[int, int], 'x': int, 'y': str} - self.assertEqual(gth(ann_module), ann_module_type_hints) + self.assertEqual(gth(ann_module), {1: 2, 'f': Tuple[int, int], 'x': int, 'y': str}) self.assertEqual(gth(ann_module2), {}) self.assertEqual(gth(ann_module3), {}) @@ -1664,8 +1412,6 @@ class GetTypeHintTests(BaseTestCase): {'y': Optional[ann_module.C]}) self.assertEqual(gth(ann_module.S), {'x': str, 'y': str}) self.assertEqual(gth(ann_module.foo), {'x': int}) - self.assertEqual(gth(NoneAndForward, globals()), - {'parent': NoneAndForward, 'meaning': type(None)}) @skipUnless(PY36, 'Python 3.6 required') def test_respect_no_type_check(self): @@ -1682,22 +1428,17 @@ class GetTypeHintTests(BaseTestCase): class Der(ABase): ... self.assertEqual(gth(ABase.meth), {'x': int}) - def test_get_type_hints_for_builtins(self): + def test_get_type_hints_for_builins(self): # Should not fail for built-in classes and functions. self.assertEqual(gth(int), {}) self.assertEqual(gth(type), {}) self.assertEqual(gth(dir), {}) self.assertEqual(gth(len), {}) - self.assertEqual(gth(object.__str__), {}) - self.assertEqual(gth(object().__str__), {}) - self.assertEqual(gth(str.join), {}) def test_previous_behavior(self): def testf(x, y): ... testf.__annotations__['x'] = 'int' self.assertEqual(gth(testf), {'x': int}) - def testg(x: None): ... - self.assertEqual(gth(testg), {'x': type(None)}) def test_get_type_hints_for_object_with_annotations(self): class A: ... @@ -1711,10 +1452,9 @@ class GetTypeHintTests(BaseTestCase): self.assertEqual(gth(ann_module2.CV, ann_module2.__dict__), {'var': typing.ClassVar[ann_module2.CV]}) self.assertEqual(gth(B, globals()), - {'y': int, 'x': ClassVar[Optional[B]], 'b': int}) + {'y': int, 'x': ClassVar[Optional[B]]}) self.assertEqual(gth(CSub, globals()), - {'z': ClassVar[CSub], 'y': int, 'b': int, - 'x': ClassVar[Optional[B]]}) + {'z': ClassVar[CSub], 'y': int, 'x': ClassVar[Optional[B]]}) self.assertEqual(gth(G), {'lst': ClassVar[List[T]]}) @@ -1832,14 +1572,6 @@ class CollectionsAbcTests(BaseTestCase): def test_list(self): self.assertIsSubclass(list, typing.List) - def test_deque(self): - self.assertIsSubclass(collections.deque, typing.Deque) - class MyDeque(typing.Deque[int]): ... - self.assertIsInstance(MyDeque(), collections.deque) - - def test_counter(self): - self.assertIsSubclass(collections.Counter, typing.Counter) - def test_set(self): self.assertIsSubclass(set, typing.Set) self.assertNotIsSubclass(frozenset, typing.Set) @@ -1891,10 +1623,13 @@ class CollectionsAbcTests(BaseTestCase): self.assertIsSubclass(MyDict, dict) self.assertNotIsSubclass(dict, MyDict) - def test_defaultdict_instantiation(self): - self.assertIs(type(typing.DefaultDict()), collections.defaultdict) - self.assertIs(type(typing.DefaultDict[KT, VT]()), collections.defaultdict) - self.assertIs(type(typing.DefaultDict[str, int]()), collections.defaultdict) + def test_no_defaultdict_instantiation(self): + with self.assertRaises(TypeError): + typing.DefaultDict() + with self.assertRaises(TypeError): + typing.DefaultDict[KT, VT]() + with self.assertRaises(TypeError): + typing.DefaultDict[str, int]() def test_defaultdict_subclass(self): @@ -1907,50 +1642,6 @@ class CollectionsAbcTests(BaseTestCase): self.assertIsSubclass(MyDefDict, collections.defaultdict) self.assertNotIsSubclass(collections.defaultdict, MyDefDict) - @skipUnless(sys.version_info >= (3, 3), 'ChainMap was added in 3.3') - def test_chainmap_instantiation(self): - self.assertIs(type(typing.ChainMap()), collections.ChainMap) - self.assertIs(type(typing.ChainMap[KT, VT]()), collections.ChainMap) - self.assertIs(type(typing.ChainMap[str, int]()), collections.ChainMap) - class CM(typing.ChainMap[KT, VT]): ... - self.assertIs(type(CM[int, str]()), CM) - - @skipUnless(sys.version_info >= (3, 3), 'ChainMap was added in 3.3') - def test_chainmap_subclass(self): - - class MyChainMap(typing.ChainMap[str, int]): - pass - - cm = MyChainMap() - self.assertIsInstance(cm, MyChainMap) - - self.assertIsSubclass(MyChainMap, collections.ChainMap) - self.assertNotIsSubclass(collections.ChainMap, MyChainMap) - - def test_deque_instantiation(self): - self.assertIs(type(typing.Deque()), collections.deque) - self.assertIs(type(typing.Deque[T]()), collections.deque) - self.assertIs(type(typing.Deque[int]()), collections.deque) - class D(typing.Deque[T]): ... - self.assertIs(type(D[int]()), D) - - def test_counter_instantiation(self): - self.assertIs(type(typing.Counter()), collections.Counter) - self.assertIs(type(typing.Counter[T]()), collections.Counter) - self.assertIs(type(typing.Counter[int]()), collections.Counter) - class C(typing.Counter[T]): ... - self.assertIs(type(C[int]()), C) - - def test_counter_subclass_instantiation(self): - - class MyCounter(typing.Counter[int]): - pass - - d = MyCounter() - self.assertIsInstance(d, MyCounter) - self.assertIsInstance(d, typing.Counter) - self.assertIsInstance(d, collections.Counter) - def test_no_set_instantiation(self): with self.assertRaises(TypeError): typing.Set() @@ -2005,23 +1696,6 @@ class CollectionsAbcTests(BaseTestCase): with self.assertRaises(TypeError): typing.Generator[int, int, int]() - @skipUnless(PY36, 'Python 3.6 required') - def test_async_generator(self): - ns = {} - exec("async def f():\n" - " yield 42\n", globals(), ns) - g = ns['f']() - self.assertIsSubclass(type(g), typing.AsyncGenerator) - - @skipUnless(PY36, 'Python 3.6 required') - def test_no_async_generator_instantiation(self): - with self.assertRaises(TypeError): - typing.AsyncGenerator() - with self.assertRaises(TypeError): - typing.AsyncGenerator[T, T]() - with self.assertRaises(TypeError): - typing.AsyncGenerator[int, int]() - def test_subclassing(self): class MMA(typing.MutableMapping): @@ -2091,31 +1765,6 @@ class CollectionsAbcTests(BaseTestCase): self.assertIsSubclass(G, collections.Iterable) self.assertNotIsSubclass(type(g), G) - @skipUnless(PY36, 'Python 3.6 required') - def test_subclassing_async_generator(self): - class G(typing.AsyncGenerator[int, int]): - def asend(self, value): - pass - def athrow(self, typ, val=None, tb=None): - pass - - ns = {} - exec('async def g(): yield 0', globals(), ns) - g = ns['g'] - self.assertIsSubclass(G, typing.AsyncGenerator) - self.assertIsSubclass(G, typing.AsyncIterable) - self.assertIsSubclass(G, collections.AsyncGenerator) - self.assertIsSubclass(G, collections.AsyncIterable) - self.assertNotIsSubclass(type(g), G) - - instance = G() - self.assertIsInstance(instance, typing.AsyncGenerator) - self.assertIsInstance(instance, typing.AsyncIterable) - self.assertIsInstance(instance, collections.AsyncGenerator) - self.assertIsInstance(instance, collections.AsyncIterable) - self.assertNotIsInstance(type(g), G) - self.assertNotIsInstance(g, G) - def test_subclassing_subclasshook(self): class Base(typing.Iterable): @@ -2173,6 +1822,8 @@ class CollectionsAbcTests(BaseTestCase): class OtherABCTests(BaseTestCase): + @skipUnless(hasattr(typing, 'ContextManager'), + 'requires typing.ContextManager') def test_contextmanager(self): @contextlib.contextmanager def manager(): @@ -2182,24 +1833,6 @@ class OtherABCTests(BaseTestCase): self.assertIsInstance(cm, typing.ContextManager) self.assertNotIsInstance(42, typing.ContextManager) - @skipUnless(ASYNCIO, 'Python 3.5 required') - def test_async_contextmanager(self): - class NotACM: - pass - self.assertIsInstance(ACM(), typing.AsyncContextManager) - self.assertNotIsInstance(NotACM(), typing.AsyncContextManager) - @contextlib.contextmanager - def manager(): - yield 42 - - cm = manager() - self.assertNotIsInstance(cm, typing.AsyncContextManager) - self.assertEqual(typing.AsyncContextManager[int].__args__, (int,)) - with self.assertRaises(TypeError): - isinstance(42, typing.AsyncContextManager[int]) - with self.assertRaises(TypeError): - typing.AsyncContextManager[int, str] - class TypeTests(BaseTestCase): @@ -2212,7 +1845,7 @@ class TypeTests(BaseTestCase): def new_user(user_class: Type[User]) -> User: return user_class() - new_user(BasicUser) + joe = new_user(BasicUser) def test_type_typevar(self): @@ -2225,7 +1858,7 @@ class TypeTests(BaseTestCase): def new_user(user_class: Type[U]) -> U: return user_class() - new_user(BasicUser) + joe = new_user(BasicUser) def test_type_optional(self): A = Optional[Type[BaseException]] @@ -2274,17 +1907,7 @@ class NamedTupleTests(BaseTestCase): self.assertEqual(jim.id, 1) self.assertEqual(Emp.__name__, 'Emp') self.assertEqual(Emp._fields, ('name', 'id')) - self.assertEqual(Emp.__annotations__, - collections.OrderedDict([('name', str), ('id', int)])) - self.assertIs(Emp._field_types, Emp.__annotations__) - - def test_namedtuple_pyversion(self): - if sys.version_info[:2] < (3, 6): - with self.assertRaises(TypeError): - NamedTuple('Name', one=int, other=str) - with self.assertRaises(TypeError): - class NotYet(NamedTuple): - whatever = 0 + self.assertEqual(Emp._field_types, dict(name=str, id=int)) @skipUnless(PY36, 'Python 3.6 required') def test_annotation_usage(self): @@ -2295,54 +1918,7 @@ class NamedTupleTests(BaseTestCase): self.assertEqual(tim.cool, 9000) self.assertEqual(CoolEmployee.__name__, 'CoolEmployee') self.assertEqual(CoolEmployee._fields, ('name', 'cool')) - self.assertEqual(CoolEmployee.__annotations__, - collections.OrderedDict(name=str, cool=int)) - self.assertIs(CoolEmployee._field_types, CoolEmployee.__annotations__) - - @skipUnless(PY36, 'Python 3.6 required') - def test_annotation_usage_with_default(self): - jelle = CoolEmployeeWithDefault('Jelle') - self.assertIsInstance(jelle, CoolEmployeeWithDefault) - self.assertIsInstance(jelle, tuple) - self.assertEqual(jelle.name, 'Jelle') - self.assertEqual(jelle.cool, 0) - cooler_employee = CoolEmployeeWithDefault('Sjoerd', 1) - self.assertEqual(cooler_employee.cool, 1) - - self.assertEqual(CoolEmployeeWithDefault.__name__, 'CoolEmployeeWithDefault') - self.assertEqual(CoolEmployeeWithDefault._fields, ('name', 'cool')) - self.assertEqual(CoolEmployeeWithDefault._field_types, dict(name=str, cool=int)) - self.assertEqual(CoolEmployeeWithDefault._field_defaults, dict(cool=0)) - - with self.assertRaises(TypeError): - exec(""" -class NonDefaultAfterDefault(NamedTuple): - x: int = 3 - y: int -""") - - @skipUnless(PY36, 'Python 3.6 required') - def test_annotation_usage_with_methods(self): - self.assertEqual(XMeth(1).double(), 2) - self.assertEqual(XMeth(42).x, XMeth(42)[0]) - self.assertEqual(str(XRepr(42)), '42 -> 1') - self.assertEqual(XRepr(1, 2) + XRepr(3), 0) - - with self.assertRaises(AttributeError): - exec(""" -class XMethBad(NamedTuple): - x: int - def _fields(self): - return 'no chance for this' -""") - - with self.assertRaises(AttributeError): - exec(""" -class XMethBad2(NamedTuple): - x: int - def _source(self): - return 'no chance for this as well' -""") + self.assertEqual(CoolEmployee._field_types, dict(name=str, cool=int)) @skipUnless(PY36, 'Python 3.6 required') def test_namedtuple_keyword_usage(self): @@ -2352,8 +1928,7 @@ class XMethBad2(NamedTuple): self.assertEqual(nick.name, 'Nick') self.assertEqual(LocalEmployee.__name__, 'LocalEmployee') self.assertEqual(LocalEmployee._fields, ('name', 'age')) - self.assertEqual(LocalEmployee.__annotations__, dict(name=str, age=int)) - self.assertIs(LocalEmployee._field_types, LocalEmployee.__annotations__) + self.assertEqual(LocalEmployee._field_types, dict(name=str, age=int)) with self.assertRaises(TypeError): NamedTuple('Name', [('x', int)], y=str) with self.assertRaises(TypeError): @@ -2419,14 +1994,8 @@ class RETests(BaseTestCase): self.assertIsInstance(mat, Match) # these should just work - Pattern[Union[str, bytes]] - Match[Union[bytes, str]] - - def test_alias_equality(self): - self.assertEqual(Pattern[str], Pattern[str]) - self.assertNotEqual(Pattern[str], Pattern[bytes]) - self.assertNotEqual(Pattern[str], Match[str]) - self.assertNotEqual(Pattern[str], str) + p = Pattern[Union[str, bytes]] + m = Match[Union[bytes, str]] def test_errors(self): with self.assertRaises(TypeError): @@ -2442,9 +2011,6 @@ class RETests(BaseTestCase): with self.assertRaises(TypeError): # We don't support isinstance(). isinstance(42, Pattern[str]) - with self.assertRaises(TypeError): - # We don't support issubclass(). - issubclass(Pattern[bytes], Pattern[str]) def test_repr(self): self.assertEqual(repr(Pattern), 'Pattern[~AnyStr]') @@ -2491,9 +2057,6 @@ class AllTests(BaseTestCase): self.assertNotIn('sys', a) # Check that Text is defined. self.assertIn('Text', a) - # Check previously missing classes. - self.assertIn('SupportsBytes', a) - self.assertIn('SupportsComplex', a) if __name__ == '__main__': diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 9dbded2..0737140 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -10,6 +10,7 @@ import codecs import itertools import operator import struct +import string import sys import unittest import warnings @@ -464,13 +465,6 @@ class UnicodeTest(string_tests.CommonTest, self.checkraises(TypeError, ' ', 'join', [1, 2, 3]) self.checkraises(TypeError, ' ', 'join', ['1', '2', 3]) - @unittest.skipIf(sys.maxsize > 2**32, - 'needs too much memory on a 64-bit platform') - def test_join_overflow(self): - size = int(sys.maxsize**0.5) + 1 - seq = ('A' * size,) * size - self.assertRaises(OverflowError, ''.join, seq) - def test_replace(self): string_tests.CommonTest.test_replace(self) @@ -993,6 +987,19 @@ class UnicodeTest(string_tests.CommonTest, def __format__(self, format_spec): return int.__format__(self * 2, format_spec) + class M: + def __init__(self, x): + self.x = x + def __repr__(self): + return 'M(' + self.x + ')' + __str__ = None + + class N: + def __init__(self, x): + self.x = x + def __repr__(self): + return 'N(' + self.x + ')' + __format__ = None self.assertEqual(''.format(), '') self.assertEqual('abc'.format(), 'abc') @@ -1207,6 +1214,16 @@ class UnicodeTest(string_tests.CommonTest, self.assertEqual("0x{:0{:d}X}".format(0x0,16), "0x0000000000000000") + # Blocking fallback + m = M('data') + self.assertEqual("{!r}".format(m), 'M(data)') + self.assertRaises(TypeError, "{!s}".format, m) + self.assertRaises(TypeError, "{}".format, m) + n = N('data') + self.assertEqual("{!r}".format(n), 'N(data)') + self.assertEqual("{!s}".format(n), 'N(data)') + self.assertRaises(TypeError, "{}".format, n) + def test_format_map(self): self.assertEqual(''.format_map({}), '') self.assertEqual('a'.format_map({}), 'a') @@ -1424,15 +1441,6 @@ class UnicodeTest(string_tests.CommonTest, with self.assertRaises(ValueError): result = format_string % 2.34 - def test_issue28598_strsubclass_rhs(self): - # A subclass of str with an __rmod__ method should be able to hook - # into the % operator - class SubclassedStr(str): - def __rmod__(self, other): - return 'Success, self.__rmod__({!r}) was called'.format(other) - self.assertEqual('lhs %% %r' % SubclassedStr('rhs'), - "Success, self.__rmod__('lhs %% %r') was called") - @support.cpython_only def test_formatting_huge_precision_c_limits(self): from _testcapi import INT_MAX @@ -1557,7 +1565,7 @@ class UnicodeTest(string_tests.CommonTest, ('+', b'+-'), ('+-', b'+--'), ('+?', b'+-?'), - ('\?', b'+AFw?'), + (r'\?', b'+AFw?'), ('+?', b'+-?'), (r'\\?', b'+AFwAXA?'), (r'\\\?', b'+AFwAXABc?'), @@ -2436,7 +2444,7 @@ class CAPITest(unittest.TestCase): # non-ascii format, ascii argument: ensure that PyUnicode_FromFormatV() # raises an error self.assertRaisesRegex(ValueError, - '^PyUnicode_FromFormatV\(\) expects an ASCII-encoded format ' + r'^PyUnicode_FromFormatV\(\) expects an ASCII-encoded format ' 'string, got a non-ASCII byte: 0xe9$', PyUnicode_FromFormat, b'unicode\xe9=%s', 'ascii') @@ -2631,7 +2639,7 @@ class CAPITest(unittest.TestCase): b'repr=%V', None, b'abc\xff') # not supported: copy the raw format string. these tests are just here - # to check for crashes and should not be considered as specifications + # to check for crashs and should not be considered as specifications check_format('%s', b'%1%s', b'abc') check_format('%1abc', @@ -2808,7 +2816,6 @@ class CAPITest(unittest.TestCase): # Check that the second call returns the same result self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1)) - class StringModuleTest(unittest.TestCase): def test_formatter_parser(self): def parse(format): diff --git a/Lib/test/test_pep277.py b/Lib/test/test_unicode_file_functions.py similarity index 100% rename from Lib/test/test_pep277.py rename to Lib/test/test_unicode_file_functions.py diff --git a/Lib/test/test_pep3131.py b/Lib/test/test_unicode_identifiers.py similarity index 100% rename from Lib/test/test_pep3131.py rename to Lib/test/test_unicode_identifiers.py diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index 6ecc913..4fc11ec 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -20,7 +20,7 @@ errors = 'surrogatepass' class UnicodeMethodsTest(unittest.TestCase): # update this, if the database changes - expectedchecksum = '5971760872b2f98bb9c701e6c0db3273d756b3ec' + expectedchecksum = 'c1fa98674a683aa8a8d8dee0c84494f8d36346e6' def test_method_checksum(self): h = hashlib.sha1() @@ -80,7 +80,7 @@ class UnicodeFunctionsTest(UnicodeDatabaseTest): # Update this if the database changes. Make sure to do a full rebuild # (e.g. 'make distclean && make') to get the correct checksum. - expectedchecksum = '5e74827cd07f9e546a30f34b7bcf6cc2eac38c8c' + expectedchecksum = 'f891b1e6430c712531b9bc935a38e22d78ba1bf3' def test_function_checksum(self): data = [] h = hashlib.sha1() @@ -222,6 +222,10 @@ class UnicodeFunctionsTest(UnicodeDatabaseTest): self.assertEqual(eaw('\u2010'), 'A') self.assertEqual(eaw('\U00020000'), 'W') + def test_east_asian_width_9_0_changes(self): + self.assertEqual(self.db.ucd_3_2_0.east_asian_width('\u231a'), 'N') + self.assertEqual(self.db.east_asian_width('\u231a'), 'W') + class UnicodeMiscTest(UnicodeDatabaseTest): def test_failed_import_during_compiling(self): diff --git a/Lib/test/test_unpack.py b/Lib/test/test_unpack.py index d1ccb38..3fcb18f 100644 --- a/Lib/test/test_unpack.py +++ b/Lib/test/test_unpack.py @@ -117,6 +117,27 @@ error) ... test.test_unpack.BozoError +Allow unpacking empty iterables + + >>> () = [] + >>> [] = () + >>> [] = [] + >>> () = () + +Unpacking non-iterables should raise TypeError + + >>> () = 42 + Traceback (most recent call last): + ... + TypeError: 'int' object is not iterable + +Unpacking to an empty iterable should raise ValueError + + >>> () = [42] + Traceback (most recent call last): + ... + ValueError: too many values to unpack (expected 0) + """ __test__ = {'doctests' : doctests} diff --git a/Lib/test/test_unpack_ex.py b/Lib/test/test_unpack_ex.py index 43cf638..6be8f55 100644 --- a/Lib/test/test_unpack_ex.py +++ b/Lib/test/test_unpack_ex.py @@ -251,7 +251,7 @@ Overridden parameters >>> f(x=5, **{'x': 3}, **{'x': 2}) Traceback (most recent call last): ... - TypeError: function got multiple values for keyword argument 'x' + TypeError: f() got multiple values for keyword argument 'x' >>> f(**{1: 3}, **{1: 5}) Traceback (most recent call last): @@ -357,7 +357,6 @@ Some size constraints (all fail.) __test__ = {'doctests' : doctests} def test_main(verbose=False): - import sys from test import support from test import test_unpack_ex support.run_doctest(test_unpack_ex, verbose) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 1a28c9a..43ea6b8 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -206,7 +206,6 @@ class urlopen_FileTests(unittest.TestCase): def test_relativelocalfile(self): self.assertRaises(ValueError,urllib.request.urlopen,'./' + self.pathname) - class ProxyTests(unittest.TestCase): def setUp(self): @@ -248,19 +247,17 @@ class ProxyTests(unittest.TestCase): def test_proxy_bypass_environment_host_match(self): bypass = urllib.request.proxy_bypass_environment self.env.set('NO_PROXY', - 'localhost, anotherdomain.com, newdomain.com:1234, .d.o.t') + 'localhost, anotherdomain.com, newdomain.com:1234') self.assertTrue(bypass('localhost')) self.assertTrue(bypass('LocalHost')) # MixedCase self.assertTrue(bypass('LOCALHOST')) # UPPERCASE self.assertTrue(bypass('newdomain.com:1234')) - self.assertTrue(bypass('foo.d.o.t')) # issue 29142 self.assertTrue(bypass('anotherdomain.com:8888')) self.assertTrue(bypass('www.newdomain.com:1234')) self.assertFalse(bypass('prelocalhost')) self.assertFalse(bypass('newdomain.com')) # no port self.assertFalse(bypass('newdomain.com:1235')) # wrong port - class ProxyTests_withOrderedEnv(unittest.TestCase): def setUp(self): @@ -296,7 +293,6 @@ class ProxyTests_withOrderedEnv(unittest.TestCase): proxies = urllib.request.getproxies_environment() self.assertEqual('http://somewhere:3128', proxies['http']) - class urlopen_HttpTests(unittest.TestCase, FakeHTTPMixin, FakeFTPMixin): """Test urlopen() opening a fake http connection.""" @@ -435,6 +431,7 @@ Connection: close finally: self.unfakeftp() + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") try: @@ -472,11 +469,11 @@ Connection: close @unittest.skipUnless(ssl, "ssl module required") def test_cafile_and_context(self): context = ssl.create_default_context() - with self.assertRaises(ValueError): - urllib.request.urlopen( - "https://localhost", cafile="/nonexistent/path", context=context - ) - + with support.check_warnings(('', DeprecationWarning)): + with self.assertRaises(ValueError): + urllib.request.urlopen( + "https://localhost", cafile="/nonexistent/path", context=context + ) class urlopen_DataTests(unittest.TestCase): """Test urlopen() opening a data URL.""" @@ -551,7 +548,6 @@ class urlopen_DataTests(unittest.TestCase): # missing padding character self.assertRaises(ValueError,urllib.request.urlopen,'data:;base64,Cg=') - class urlretrieve_FileTests(unittest.TestCase): """Test urllib.urlretrieve() on local files""" @@ -734,7 +730,7 @@ FF class QuotingTests(unittest.TestCase): - """Tests for urllib.quote() and urllib.quote_plus() + r"""Tests for urllib.quote() and urllib.quote_plus() According to RFC 2396 (Uniform Resource Identifiers), to escape a character you write it as '%' + <2 character US-ASCII hex value>. @@ -809,7 +805,7 @@ class QuotingTests(unittest.TestCase): # Make sure all characters that should be quoted are by default sans # space (separate test for that). should_quote = [chr(num) for num in range(32)] # For 0x00 - 0x1F - should_quote.append('<>#%"{}|\^[]`') + should_quote.append(r'<>#%"{}|\^[]`') should_quote.append(chr(127)) # For 0x7F should_quote = ''.join(should_quote) for char in should_quote: diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 3ed81ce..34329f8 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -7,6 +7,8 @@ import io import socket import array import sys +import tempfile +import subprocess import urllib.request # The proxy bypass method imported below has logic specific to the OSX @@ -335,7 +337,8 @@ class MockHTTPClass: else: self._tunnel_headers.clear() - def request(self, method, url, body=None, headers=None): + def request(self, method, url, body=None, headers=None, *, + encode_chunked=False): self.method = method self.selector = url if headers is not None: @@ -343,6 +346,7 @@ class MockHTTPClass: self.req_headers.sort() if body: self.data = body + self.encode_chunked = encode_chunked if self.raise_on_endheaders: raise OSError() @@ -826,6 +830,7 @@ class HandlerTests(unittest.TestCase): for url, ftp in [ ("file://ftp.example.com//foo.txt", False), ("file://ftp.example.com///foo.txt", False), +# XXXX bug: fails with OSError, should be URLError ("file://ftp.example.com/foo.txt", False), ("file://somehost//foo/something.txt", False), ("file://localhost//foo/something.txt", False), @@ -833,7 +838,8 @@ class HandlerTests(unittest.TestCase): req = Request(url) try: h.file_open(req) - except urllib.error.URLError: + # XXXX remove OSError when bug fixed + except (urllib.error.URLError, OSError): self.assertFalse(ftp) else: self.assertIs(o.req, req) @@ -906,41 +912,110 @@ class HandlerTests(unittest.TestCase): self.assertEqual(req.unredirected_hdrs["Host"], "baz") self.assertEqual(req.unredirected_hdrs["Spam"], "foo") - # Check iterable body support - def iterable_body(): - yield b"one" - yield b"two" - yield b"three" + def test_http_body_file(self): + # A regular file - chunked encoding is used unless Content Length is + # already set. - for headers in {}, {"Content-Length": 11}: - req = Request("http://example.com/", iterable_body(), headers) - if not headers: - # Having an iterable body without a Content-Length should - # raise an exception - self.assertRaises(ValueError, h.do_request_, req) - else: - newreq = h.do_request_(req) + h = urllib.request.AbstractHTTPHandler() + o = h.parent = MockOpener() - # A file object. - # Test only Content-Length attribute of request. + file_obj = tempfile.NamedTemporaryFile(mode='w+b', delete=False) + file_path = file_obj.name + file_obj.close() + self.addCleanup(os.unlink, file_path) + + with open(file_path, "rb") as f: + req = Request("http://example.com/", f, {}) + newreq = h.do_request_(req) + te = newreq.get_header('Transfer-encoding') + self.assertEqual(te, "chunked") + self.assertFalse(newreq.has_header('Content-length')) + with open(file_path, "rb") as f: + req = Request("http://example.com/", f, {"Content-Length": 30}) + newreq = h.do_request_(req) + self.assertEqual(int(newreq.get_header('Content-length')), 30) + self.assertFalse(newreq.has_header("Transfer-encoding")) + + def test_http_body_fileobj(self): + # A file object - chunked encoding is used + # unless Content Length is already set. + # (Note that there are some subtle differences to a regular + # file, that is why we are testing both cases.) + + h = urllib.request.AbstractHTTPHandler() + o = h.parent = MockOpener() file_obj = io.BytesIO() - file_obj.write(b"Something\nSomething\nSomething\n") + req = Request("http://example.com/", file_obj, {}) + newreq = h.do_request_(req) + self.assertEqual(newreq.get_header('Transfer-encoding'), 'chunked') + self.assertFalse(newreq.has_header('Content-length')) + + headers = {"Content-Length": 30} + req = Request("http://example.com/", file_obj, headers) + newreq = h.do_request_(req) + self.assertEqual(int(newreq.get_header('Content-length')), 30) + self.assertFalse(newreq.has_header("Transfer-encoding")) + + file_obj.close() + + def test_http_body_pipe(self): + # A file reading from a pipe. + # A pipe cannot be seek'ed. There is no way to determine the + # content length up front. Thus, do_request_() should fall + # back to Transfer-encoding chunked. + + h = urllib.request.AbstractHTTPHandler() + o = h.parent = MockOpener() + + cmd = [sys.executable, "-c", r"pass"] for headers in {}, {"Content-Length": 30}: - req = Request("http://example.com/", file_obj, headers) + with subprocess.Popen(cmd, stdout=subprocess.PIPE) as proc: + req = Request("http://example.com/", proc.stdout, headers) + newreq = h.do_request_(req) + if not headers: + self.assertEqual(newreq.get_header('Content-length'), None) + self.assertEqual(newreq.get_header('Transfer-encoding'), + 'chunked') + else: + self.assertEqual(int(newreq.get_header('Content-length')), + 30) + + def test_http_body_iterable(self): + # Generic iterable. There is no way to determine the content + # length up front. Fall back to Transfer-encoding chunked. + + h = urllib.request.AbstractHTTPHandler() + o = h.parent = MockOpener() + + def iterable_body(): + yield b"one" + + for headers in {}, {"Content-Length": 11}: + req = Request("http://example.com/", iterable_body(), headers) + newreq = h.do_request_(req) if not headers: - # Having an iterable body without a Content-Length should - # raise an exception - self.assertRaises(ValueError, h.do_request_, req) + self.assertEqual(newreq.get_header('Content-length'), None) + self.assertEqual(newreq.get_header('Transfer-encoding'), + 'chunked') else: - newreq = h.do_request_(req) - self.assertEqual(int(newreq.get_header('Content-length')), 30) + self.assertEqual(int(newreq.get_header('Content-length')), 11) - file_obj.close() + def test_http_body_empty_seq(self): + # Zero-length iterable body should be treated like any other iterable + h = urllib.request.AbstractHTTPHandler() + h.parent = MockOpener() + req = h.do_request_(Request("http://example.com/", ())) + self.assertEqual(req.get_header("Transfer-encoding"), "chunked") + self.assertFalse(req.has_header("Content-length")) + def test_http_body_array(self): # array.array Iterable - Content Length is calculated + h = urllib.request.AbstractHTTPHandler() + o = h.parent = MockOpener() + iterable_array = array.array("I",[1,2,3,4]) for headers in {}, {"Content-Length": 16}: @@ -1339,6 +1414,7 @@ class HandlerTests(unittest.TestCase): self.assertEqual(req.host, "proxy.example.com:3128") self.assertEqual(req.get_header("Proxy-authorization"), "FooBar") + # TODO: This should be only for OSX @unittest.skipUnless(sys.platform == 'darwin', "only relevant for OSX") def test_osx_proxy_bypass(self): bypass = { @@ -1614,6 +1690,7 @@ class HandlerTests(unittest.TestCase): self.assertTrue(conn.fakesock.closed, "Connection not closed") + class MiscTests(unittest.TestCase): def opener_has_handler(self, opener, handler_class): diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py index 68c523a..70c4c01 100644 --- a/Lib/test/test_urllib2_localnet.py +++ b/Lib/test/test_urllib2_localnet.py @@ -557,26 +557,28 @@ class TestUrlopen(unittest.TestCase): def test_https_with_cafile(self): handler = self.start_https_server(certfile=CERT_localhost) - # Good cert - data = self.urlopen("https://localhost:%s/bizarre" % handler.port, - cafile=CERT_localhost) - self.assertEqual(data, b"we care a bit") - # Bad cert - with self.assertRaises(urllib.error.URLError) as cm: - self.urlopen("https://localhost:%s/bizarre" % handler.port, - cafile=CERT_fakehostname) - # Good cert, but mismatching hostname - handler = self.start_https_server(certfile=CERT_fakehostname) - with self.assertRaises(ssl.CertificateError) as cm: - self.urlopen("https://localhost:%s/bizarre" % handler.port, - cafile=CERT_fakehostname) + with support.check_warnings(('', DeprecationWarning)): + # Good cert + data = self.urlopen("https://localhost:%s/bizarre" % handler.port, + cafile=CERT_localhost) + self.assertEqual(data, b"we care a bit") + # Bad cert + with self.assertRaises(urllib.error.URLError) as cm: + self.urlopen("https://localhost:%s/bizarre" % handler.port, + cafile=CERT_fakehostname) + # Good cert, but mismatching hostname + handler = self.start_https_server(certfile=CERT_fakehostname) + with self.assertRaises(ssl.CertificateError) as cm: + self.urlopen("https://localhost:%s/bizarre" % handler.port, + cafile=CERT_fakehostname) def test_https_with_cadefault(self): handler = self.start_https_server(certfile=CERT_localhost) # Self-signed cert should fail verification with system certificate store - with self.assertRaises(urllib.error.URLError) as cm: - self.urlopen("https://localhost:%s/bizarre" % handler.port, - cadefault=True) + with support.check_warnings(('', DeprecationWarning)): + with self.assertRaises(urllib.error.URLError) as cm: + self.urlopen("https://localhost:%s/bizarre" % handler.port, + cadefault=True) def test_https_sni(self): if ssl is None: diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index 13e2dd5..cad83fd 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -97,8 +97,8 @@ class OtherNetworkTests(unittest.TestCase): def test_ftp(self): urls = [ - 'ftp://www.pythontest.net/README', - ('ftp://www.pythontest.net/non-existent-file', + 'ftp://ftp.debian.org/debian/README', + ('ftp://ftp.debian.org/debian/non-existent-file', None, urllib.error.URLError), ] self._test_urls(urls, self._extra_handlers()) @@ -287,7 +287,7 @@ class TimeoutTest(unittest.TestCase): self.addCleanup(u.close) self.assertEqual(u.fp.raw._sock.gettimeout(), 120) - FTP_HOST = 'ftp://www.pythontest.net/' + FTP_HOST = 'ftp://ftp.debian.org/debian/' def test_ftp_basic(self): self.assertIsNone(socket.getdefaulttimeout()) diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py index b9b1eaa..949716c 100644 --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -4,7 +4,6 @@ from test import support import contextlib import socket import urllib.request -import sys import os import email.message import time @@ -12,7 +11,6 @@ import time support.requires('network') - class URLTimeoutTest(unittest.TestCase): # XXX this test doesn't seem to test anything useful. @@ -27,11 +25,11 @@ class URLTimeoutTest(unittest.TestCase): def testURLread(self): with support.transient_internet("www.example.com"): f = urllib.request.urlopen("http://www.example.com/") - f.read() + x = f.read() class urlopenNetworkTests(unittest.TestCase): - """Tests urllib.request.urlopen using the network. + """Tests urllib.reqest.urlopen using the network. These tests are not exhaustive. Assuming that testing using files does a good job overall of some of the basic interface features. There are no @@ -190,7 +188,6 @@ class urlretrieveNetworkTests(unittest.TestCase): def test_reporthook(self): records = [] - def recording_reporthook(blocks, block_size, total_size): records.append((blocks, block_size, total_size)) diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index e2cf1b7..99c5c03 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -6,8 +6,8 @@ RFC2396_BASE = "http://a/b/c/d;p?q" RFC3986_BASE = 'http://a/b/c/d;p?q' SIMPLE_BASE = 'http://a/b/c/d' -# Each parse_qsl testcase is a two-tuple that contains -# a string with the query and a list with the expected result. +# A list of test cases. Each test case is a two-tuple that contains +# a string with the query and a dictionary with the expected result. parse_qsl_test_cases = [ ("", []), @@ -42,9 +42,6 @@ parse_qsl_test_cases = [ (b"a=1;a=2", [(b'a', b'1'), (b'a', b'2')]), ] -# Each parse_qs testcase is a two-tuple that contains -# a string with the query and a dictionary with the expected result. - parse_qs_test_cases = [ ("", {}), ("&", {}), @@ -293,6 +290,7 @@ class UrlParseTestCase(unittest.TestCase): def test_RFC2396(self): # cases from RFC 2396 + self.checkJoin(RFC2396_BASE, 'g:h', 'g:h') self.checkJoin(RFC2396_BASE, 'g', 'http://a/b/c/g') self.checkJoin(RFC2396_BASE, './g', 'http://a/b/c/g') @@ -335,7 +333,9 @@ class UrlParseTestCase(unittest.TestCase): # self.checkJoin(RFC2396_BASE, '/./g', 'http://a/./g') # self.checkJoin(RFC2396_BASE, '/../g', 'http://a/../g') + def test_RFC3986(self): + # Test cases from RFC3986 self.checkJoin(RFC3986_BASE, '?y','http://a/b/c/d;p?y') self.checkJoin(RFC3986_BASE, ';x', 'http://a/b/c/;x') self.checkJoin(RFC3986_BASE, 'g:h','g:h') @@ -363,7 +363,7 @@ class UrlParseTestCase(unittest.TestCase): self.checkJoin(RFC3986_BASE, '../../g','http://a/g') self.checkJoin(RFC3986_BASE, '../../../g', 'http://a/g') - # Abnormal Examples + #Abnormal Examples # The 'abnormal scenarios' are incompatible with RFC2986 parsing # Tests are here for reference. @@ -607,29 +607,27 @@ class UrlParseTestCase(unittest.TestCase): self.assertEqual(p.port, 80) self.assertEqual(p.geturl(), url) - # Verify an illegal port is returned as None + # Verify an illegal port raises ValueError url = b"HTTP://WWW.PYTHON.ORG:65536/doc/#frag" p = urllib.parse.urlsplit(url) - self.assertEqual(p.port, None) + with self.assertRaisesRegex(ValueError, "out of range"): + p.port def test_attributes_bad_port(self): - """Check handling of non-integer ports.""" - p = urllib.parse.urlsplit("http://www.example.net:foo") - self.assertEqual(p.netloc, "www.example.net:foo") - self.assertRaises(ValueError, lambda: p.port) - - p = urllib.parse.urlparse("http://www.example.net:foo") - self.assertEqual(p.netloc, "www.example.net:foo") - self.assertRaises(ValueError, lambda: p.port) - - # Once again, repeat ourselves to test bytes - p = urllib.parse.urlsplit(b"http://www.example.net:foo") - self.assertEqual(p.netloc, b"www.example.net:foo") - self.assertRaises(ValueError, lambda: p.port) - - p = urllib.parse.urlparse(b"http://www.example.net:foo") - self.assertEqual(p.netloc, b"www.example.net:foo") - self.assertRaises(ValueError, lambda: p.port) + """Check handling of invalid ports.""" + for bytes in (False, True): + for parse in (urllib.parse.urlsplit, urllib.parse.urlparse): + for port in ("foo", "1.5", "-1", "0x10"): + with self.subTest(bytes=bytes, parse=parse, port=port): + netloc = "www.example.net:" + port + url = "http://" + netloc + if bytes: + netloc = netloc.encode("ascii") + url = url.encode("ascii") + p = parse(url) + self.assertEqual(p.netloc, netloc) + with self.assertRaises(ValueError): + p.port def test_attributes_without_netloc(self): # This example is straight from RFC 3261. It looks like it @@ -757,35 +755,28 @@ class UrlParseTestCase(unittest.TestCase): def test_parse_fragments(self): # Exercise the allow_fragments parameter of urlparse() and urlsplit() tests = ( - ("http:#frag", "path", "frag"), - ("//example.net#frag", "path", "frag"), - ("index.html#frag", "path", "frag"), - (";a=b#frag", "params", "frag"), - ("?a=b#frag", "query", "frag"), - ("#frag", "path", "frag"), - ("abc#@frag", "path", "@frag"), - ("//abc#@frag", "path", "@frag"), - ("//abc:80#@frag", "path", "@frag"), - ("//abc#@frag:80", "path", "@frag:80"), + ("http:#frag", "path"), + ("//example.net#frag", "path"), + ("index.html#frag", "path"), + (";a=b#frag", "params"), + ("?a=b#frag", "query"), + ("#frag", "path"), ) - for url, attr, expected_frag in tests: + for url, attr in tests: for func in (urllib.parse.urlparse, urllib.parse.urlsplit): if attr == "params" and func is urllib.parse.urlsplit: attr = "path" with self.subTest(url=url, function=func): result = func(url, allow_fragments=False) self.assertEqual(result.fragment, "") - self.assertTrue( - getattr(result, attr).endswith("#" + expected_frag)) + self.assertTrue(getattr(result, attr).endswith("#frag")) self.assertEqual(func(url, "", False).fragment, "") result = func(url, allow_fragments=True) - self.assertEqual(result.fragment, expected_frag) - self.assertFalse( - getattr(result, attr).endswith(expected_frag)) - self.assertEqual(func(url, "", True).fragment, - expected_frag) - self.assertEqual(func(url).fragment, expected_frag) + self.assertEqual(result.fragment, "frag") + self.assertFalse(getattr(result, attr).endswith("frag")) + self.assertEqual(func(url, "", True).fragment, "frag") + self.assertEqual(func(url).fragment, "frag") def test_mixed_types_rejected(self): # Several functions that process either strings or ASCII encoded bytes @@ -992,26 +983,6 @@ class Utility_Tests(unittest.TestCase): self.assertEqual(splithost('/foo/bar/baz.html'), (None, '/foo/bar/baz.html')) - # bpo-30500: # starts a fragment. - self.assertEqual(splithost('//127.0.0.1#@host.com'), - ('127.0.0.1', '/#@host.com')) - self.assertEqual(splithost('//127.0.0.1#@host.com:80'), - ('127.0.0.1', '/#@host.com:80')) - self.assertEqual(splithost('//127.0.0.1:80#@host.com'), - ('127.0.0.1:80', '/#@host.com')) - - # Empty host is returned as empty string. - self.assertEqual(splithost("///file"), - ('', '/file')) - - # Trailing semicolon, question mark and hash symbol are kept. - self.assertEqual(splithost("//example.net/file;"), - ('example.net', '/file;')) - self.assertEqual(splithost("//example.net/file?"), - ('example.net', '/file?')) - self.assertEqual(splithost("//example.net/file#"), - ('example.net', '/file#')) - def test_splituser(self): splituser = urllib.parse.splituser self.assertEqual(splituser('User:Pass@www.python.org:080'), diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py index 8357f8b..662c7f6 100644 --- a/Lib/test/test_userdict.py +++ b/Lib/test/test_userdict.py @@ -1,6 +1,6 @@ # Check every path through every method of UserDict -from test import support, mapping_tests +from test import mapping_tests import unittest import collections @@ -30,7 +30,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol): self.assertEqual(collections.UserDict(one=1, two=2), d2) # item sequence constructor self.assertEqual(collections.UserDict([('one',1), ('two',2)]), d2) - with self.assertWarnsRegex(PendingDeprecationWarning, "'dict'"): + with self.assertWarnsRegex(DeprecationWarning, "'dict'"): self.assertEqual(collections.UserDict(dict=[('one',1), ('two',2)]), d2) # both together self.assertEqual(collections.UserDict([('one',1), ('two',2)], two=3, three=5), d3) @@ -149,7 +149,7 @@ class UserDictTest(mapping_tests.TestHashMappingProtocol): [('dict', 42)]) self.assertEqual(list(collections.UserDict({}, dict=None).items()), [('dict', None)]) - with self.assertWarnsRegex(PendingDeprecationWarning, "'dict'"): + with self.assertWarnsRegex(DeprecationWarning, "'dict'"): self.assertEqual(list(collections.UserDict(dict={'a': 42}).items()), [('a', 42)]) self.assertRaises(TypeError, collections.UserDict, 42) diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py index f92e4d3..8de6c14 100644 --- a/Lib/test/test_userlist.py +++ b/Lib/test/test_userlist.py @@ -1,7 +1,7 @@ # Check every path through every method of UserList from collections import UserList -from test import support, list_tests +from test import list_tests import unittest class UserListTest(list_tests.CommonTest): diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py index 9bc8edd..7152822 100644 --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -1,9 +1,8 @@ # UserString is a wrapper around the native builtin string type. # UserString instances should behave similar to builtin string objects. -import string import unittest -from test import support, string_tests +from test import string_tests from collections import UserString diff --git a/Lib/test/test_pep3120.py b/Lib/test/test_utf8source.py similarity index 100% rename from Lib/test/test_pep3120.py rename to Lib/test/test_utf8source.py diff --git a/Lib/test/test_uu.py b/Lib/test/test_uu.py index 25fffbf..ad2f2c5 100644 --- a/Lib/test/test_uu.py +++ b/Lib/test/test_uu.py @@ -8,7 +8,6 @@ from test import support import sys, os import uu -from io import BytesIO import io plaintext = b"The smooth-scaled python crept over the sleeping dog\n" diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index 47248f9..e34d8e6 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -292,10 +292,6 @@ class TestUUID(unittest.TestCase): badtype(lambda: setattr(u, 'clock_seq_low', 0)) badtype(lambda: setattr(u, 'node', 0)) - # Comparison with a non-UUID object - badtype(lambda: u < object()) - badtype(lambda: u > object()) - def test_getnode(self): node1 = uuid.getnode() self.assertTrue(0 < node1 < (1 << 48), '%012x' % node1) diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index c1e6566..0ff978f 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -15,16 +15,9 @@ import sys import tempfile from test.support import (captured_stdout, captured_stderr, can_symlink, EnvironmentVarGuard, rmtree) -import textwrap import unittest import venv -# pip currently requires ssl support, so we ensure we handle -# it being missing (http://bugs.python.org/issue19744) -try: - import ssl -except ImportError: - ssl = None try: import threading @@ -39,15 +32,9 @@ except ImportError: skipInVenv = unittest.skipIf(sys.prefix != sys.base_prefix, 'Test not appropriate in a venv') -# os.path.exists('nul') is False: http://bugs.python.org/issue20541 -if os.devnull.lower() == 'nul': - failsOnWindows = unittest.expectedFailure -else: - def failsOnWindows(f): - return f - class BaseTest(unittest.TestCase): """Base class for venv tests.""" + maxDiff = 80 * 50 def setUp(self): self.env_dir = os.path.realpath(tempfile.mkdtemp()) @@ -57,7 +44,7 @@ class BaseTest(unittest.TestCase): self.include = 'Include' else: self.bindir = 'bin' - self.lib = ('lib', 'python%s' % sys.version[:3]) + self.lib = ('lib', 'python%d.%d' % sys.version_info[:2]) self.include = 'include' if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in os.environ: executable = os.environ['__PYVENV_LAUNCHER__'] @@ -121,6 +108,17 @@ class BasicTest(BaseTest): print(' %r' % os.listdir(bd)) self.assertTrue(os.path.exists(fn), 'File %r should exist.' % fn) + def test_prompt(self): + env_name = os.path.split(self.env_dir)[1] + + builder = venv.EnvBuilder() + context = builder.ensure_directories(self.env_dir) + self.assertEqual(context.prompt, '(%s) ' % env_name) + + builder = venv.EnvBuilder(prompt='My prompt') + context = builder.ensure_directories(self.env_dir) + self.assertEqual(context.prompt, '(My prompt) ') + @skipInVenv def test_prefixes(self): """ @@ -318,17 +316,26 @@ class EnsurePipTest(BaseTest): self.run_with_capture(venv.create, self.env_dir, with_pip=False) self.assert_pip_not_installed() - @failsOnWindows - def test_devnull_exists_and_is_empty(self): + def test_devnull(self): # Fix for issue #20053 uses os.devnull to force a config file to # appear empty. However http://bugs.python.org/issue20541 means # that doesn't currently work properly on Windows. Once that is # fixed, the "win_location" part of test_with_pip should be restored - self.assertTrue(os.path.exists(os.devnull)) with open(os.devnull, "rb") as f: self.assertEqual(f.read(), b"") - def do_test_with_pip(self, system_site_packages): + # Issue #20541: os.path.exists('nul') is False on Windows + if os.devnull.lower() == 'nul': + self.assertFalse(os.path.exists(os.devnull)) + else: + self.assertTrue(os.path.exists(os.devnull)) + + + @unittest.skipUnless(threading, 'some dependencies of pip import threading' + ' module unconditionally') + # Issue #26610: pip/pep425tags.py requires ctypes + @unittest.skipUnless(ctypes, 'pip requires ctypes') + def test_with_pip(self): rmtree(self.env_dir) with EnvironmentVarGuard() as envvars: # pip's cross-version compatibility may trigger deprecation @@ -362,7 +369,6 @@ class EnsurePipTest(BaseTest): # config in place to ensure we ignore it try: self.run_with_capture(venv.create, self.env_dir, - system_site_packages=system_site_packages, with_pip=True) except subprocess.CalledProcessError as exc: # The output this produces can be a little hard to read, @@ -412,21 +418,9 @@ class EnsurePipTest(BaseTest): out = out.decode("latin-1") # Force to text, prevent decoding errors self.assertIn("Successfully uninstalled pip", out) self.assertIn("Successfully uninstalled setuptools", out) - # Check pip is now gone from the virtual environment. This only - # applies in the system_site_packages=False case, because in the - # other case, pip may still be available in the system site-packages - if not system_site_packages: - self.assert_pip_not_installed() - - # Requesting pip fails without SSL (http://bugs.python.org/issue19744) - @unittest.skipIf(ssl is None, ensurepip._MISSING_SSL_MESSAGE) - @unittest.skipUnless(threading, 'some dependencies of pip import threading' - ' module unconditionally') - # Issue #26610: pip/pep425tags.py requires ctypes - @unittest.skipUnless(ctypes, 'pip requires ctypes') - def test_with_pip(self): - self.do_test_with_pip(False) - self.do_test_with_pip(True) + # Check pip is now gone from the virtual environment + self.assert_pip_not_installed() + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py index 84a6fb5..0cddf4a 100644 --- a/Lib/test/test_warnings/__init__.py +++ b/Lib/test/test_warnings/__init__.py @@ -2,7 +2,9 @@ from contextlib import contextmanager import linecache import os from io import StringIO +import re import sys +import textwrap import unittest from test import support from test.support.script_helper import assert_python_ok, assert_python_failure @@ -720,6 +722,17 @@ class _WarningsTests(BaseTest, unittest.TestCase): result = stream.getvalue() self.assertIn(text, result) + def test_showwarnmsg_missing(self): + # Test that _showwarnmsg() missing is okay. + text = 'del _showwarnmsg test' + with original_warnings.catch_warnings(module=self.module): + self.module.filterwarnings("always", category=UserWarning) + del self.module._showwarnmsg + with support.captured_output('stderr') as stream: + self.module.warn(text) + result = stream.getvalue() + self.assertIn(text, result) + def test_showwarning_not_callable(self): with original_warnings.catch_warnings(module=self.module): self.module.filterwarnings("always", category=UserWarning) @@ -821,12 +834,44 @@ class WarningsDisplayTests(BaseTest): file_object, expected_file_line) self.assertEqual(expect, file_object.getvalue()) + class CWarningsDisplayTests(WarningsDisplayTests, unittest.TestCase): module = c_warnings class PyWarningsDisplayTests(WarningsDisplayTests, unittest.TestCase): module = py_warnings + def test_tracemalloc(self): + self.addCleanup(support.unlink, support.TESTFN) + + with open(support.TESTFN, 'w') as fp: + fp.write(textwrap.dedent(""" + def func(): + f = open(__file__) + # Emit ResourceWarning + f = None + + func() + """)) + + res = assert_python_ok('-Wd', '-X', 'tracemalloc=2', support.TESTFN) + + stderr = res.err.decode('ascii', 'replace') + # normalize newlines + stderr = '\n'.join(stderr.splitlines()) + stderr = re.sub('<.*>', '<...>', stderr) + expected = textwrap.dedent(''' + {fname}:5: ResourceWarning: unclosed file <...> + f = None + Object allocated at (most recent call first): + File "{fname}", lineno 3 + f = open(__file__) + File "{fname}", lineno 7 + func() + ''') + expected = expected.format(fname=support.TESTFN).strip() + self.assertEqual(stderr, expected) + class CatchWarningTests(BaseTest): @@ -899,6 +944,51 @@ class CatchWarningTests(BaseTest): self.assertTrue(wmod.filters is not orig_filters) self.assertTrue(wmod.filters is orig_filters) + def test_record_override_showwarning_before(self): + # Issue #28835: If warnings.showwarning() was overriden, make sure + # that catch_warnings(record=True) overrides it again. + text = "This is a warning" + wmod = self.module + my_log = [] + + def my_logger(message, category, filename, lineno, file=None, line=None): + nonlocal my_log + my_log.append(message) + + # Override warnings.showwarning() before calling catch_warnings() + with support.swap_attr(wmod, 'showwarning', my_logger): + with wmod.catch_warnings(module=wmod, record=True) as log: + self.assertIsNot(wmod.showwarning, my_logger) + + wmod.simplefilter("always") + wmod.warn(text) + + self.assertIs(wmod.showwarning, my_logger) + + self.assertEqual(len(log), 1, log) + self.assertEqual(log[0].message.args[0], text) + self.assertEqual(my_log, []) + + def test_record_override_showwarning_inside(self): + # Issue #28835: It is possible to override warnings.showwarning() + # in the catch_warnings(record=True) context manager. + text = "This is a warning" + wmod = self.module + my_log = [] + + def my_logger(message, category, filename, lineno, file=None, line=None): + nonlocal my_log + my_log.append(message) + + with wmod.catch_warnings(module=wmod, record=True) as log: + wmod.simplefilter("always") + wmod.showwarning = my_logger + wmod.warn(text) + + self.assertEqual(len(my_log), 1, my_log) + self.assertEqual(my_log[0].args[0], text) + self.assertEqual(log, []) + def test_check_warnings(self): # Explicit tests for the test.support convenience wrapper wmod = self.module diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py index 3eff773..8666f72 100644 --- a/Lib/test/test_wave.py +++ b/Lib/test/test_wave.py @@ -1,6 +1,6 @@ -from test.support import TESTFN import unittest from test import audiotests +from test import support from audioop import byteswap import sys import wave @@ -103,5 +103,11 @@ class WavePCM32Test(WaveTest, unittest.TestCase): frames = byteswap(frames, 4) +class MiscTestCase(unittest.TestCase): + def test__all__(self): + blacklist = {'WAVE_FORMAT_PCM'} + support.check__all__(self, wave, blacklist=blacklist) + + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 1aa3540..a474a07 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -6,7 +6,6 @@ import weakref import operator import contextlib import copy -import time from test import support from test.support import script_helper @@ -73,29 +72,6 @@ class TestBase(unittest.TestCase): self.cbcalled += 1 -@contextlib.contextmanager -def collect_in_thread(period=0.0001): - """ - Ensure GC collections happen in a different thread, at a high frequency. - """ - threading = support.import_module('threading') - please_stop = False - - def collect(): - while not please_stop: - time.sleep(period) - gc.collect() - - with support.disable_gc(): - t = threading.Thread(target=collect) - t.start() - try: - yield - finally: - please_stop = True - t.join() - - class ReferencesTestCase(TestBase): def test_basic_ref(self): @@ -943,7 +919,7 @@ class SubclassableWeakrefTestCase(TestBase): self.assertFalse(hasattr(r, "__dict__")) def test_subclass_refs_with_cycle(self): - # Bug #3110 + """Confirm https://bugs.python.org/issue3100 is fixed.""" # An instance of a weakref subclass can have attributes. # If such a weakref holds the only strong reference to the object, # deleting the weakref will delete the object. In this case, @@ -1357,13 +1333,16 @@ class MappingTestCase(TestBase): o = Object(123456) with testcontext(): n = len(dict) - dict.popitem() + # Since underlaying dict is ordered, first item is popped + dict.pop(next(dict.keys())) self.assertEqual(len(dict), n - 1) dict[o] = o self.assertEqual(len(dict), n) + # last item in objects is removed from dict in context shutdown with testcontext(): self.assertEqual(len(dict), n - 1) - dict.pop(next(dict.keys())) + # Then, (o, o) is popped + dict.popitem() self.assertEqual(len(dict), n - 2) with testcontext(): self.assertEqual(len(dict), n - 3) @@ -1657,35 +1636,6 @@ class MappingTestCase(TestBase): dict = weakref.WeakKeyDictionary() self.assertRegex(repr(dict), '') - def test_threaded_weak_valued_setdefault(self): - d = weakref.WeakValueDictionary() - with collect_in_thread(): - for i in range(100000): - x = d.setdefault(10, RefCycle()) - self.assertIsNot(x, None) # we never put None in there! - del x - - def test_threaded_weak_valued_pop(self): - d = weakref.WeakValueDictionary() - with collect_in_thread(): - for i in range(100000): - d[10] = RefCycle() - x = d.pop(10, 10) - self.assertIsNot(x, None) # we never put None in there! - - def test_threaded_weak_valued_consistency(self): - # Issue #28427: old keys should not remove new values from - # WeakValueDictionary when collecting from another thread. - d = weakref.WeakValueDictionary() - with collect_in_thread(): - for i in range(200000): - o = RefCycle() - d[10] = o - # o is still alive, so the dict can't be empty - self.assertEqual(len(d), 1) - o = None # lose ref - - from test import mapping_tests class WeakValueDictionaryTestCase(mapping_tests.BasicTestMappingProtocol): diff --git a/Lib/test/test_weakset.py b/Lib/test/test_weakset.py index 9ce672b..691b95e 100644 --- a/Lib/test/test_weakset.py +++ b/Lib/test/test_weakset.py @@ -1,13 +1,6 @@ import unittest -from weakref import proxy, ref, WeakSet -import operator -import copy +from weakref import WeakSet import string -import os -from random import randrange, shuffle -import sys -import warnings -import collections from collections import UserString as ustr import gc import contextlib diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py new file mode 100644 index 0000000..b1a2f7a --- /dev/null +++ b/Lib/test/test_winconsoleio.py @@ -0,0 +1,147 @@ +'''Tests for WindowsConsoleIO +''' + +import io +import unittest +import sys + +if sys.platform != 'win32': + raise unittest.SkipTest("test only relevant on win32") + +from _testconsole import write_input + +ConIO = io._WindowsConsoleIO + +class WindowsConsoleIOTests(unittest.TestCase): + def test_abc(self): + self.assertTrue(issubclass(ConIO, io.RawIOBase)) + self.assertFalse(issubclass(ConIO, io.BufferedIOBase)) + self.assertFalse(issubclass(ConIO, io.TextIOBase)) + + def test_open_fd(self): + try: + f = ConIO(0) + except ValueError: + # cannot open console because it's not a real console + pass + else: + self.assertTrue(f.readable()) + self.assertFalse(f.writable()) + self.assertEqual(0, f.fileno()) + f.close() # multiple close should not crash + f.close() + + try: + f = ConIO(1, 'w') + except ValueError: + # cannot open console because it's not a real console + pass + else: + self.assertFalse(f.readable()) + self.assertTrue(f.writable()) + self.assertEqual(1, f.fileno()) + f.close() + f.close() + + try: + f = ConIO(2, 'w') + except ValueError: + # cannot open console because it's not a real console + pass + else: + self.assertFalse(f.readable()) + self.assertTrue(f.writable()) + self.assertEqual(2, f.fileno()) + f.close() + f.close() + + def test_open_name(self): + f = ConIO("CON") + self.assertTrue(f.readable()) + self.assertFalse(f.writable()) + self.assertIsNotNone(f.fileno()) + f.close() # multiple close should not crash + f.close() + + f = ConIO('CONIN$') + self.assertTrue(f.readable()) + self.assertFalse(f.writable()) + self.assertIsNotNone(f.fileno()) + f.close() + f.close() + + f = ConIO('CONOUT$', 'w') + self.assertFalse(f.readable()) + self.assertTrue(f.writable()) + self.assertIsNotNone(f.fileno()) + f.close() + f.close() + + def assertStdinRoundTrip(self, text): + stdin = open('CONIN$', 'r') + old_stdin = sys.stdin + try: + sys.stdin = stdin + write_input( + stdin.buffer.raw, + (text + '\r\n').encode('utf-16-le', 'surrogatepass') + ) + actual = input() + finally: + sys.stdin = old_stdin + self.assertEqual(actual, text) + + def test_input(self): + # ASCII + self.assertStdinRoundTrip('abc123') + # Non-ASCII + self.assertStdinRoundTrip('ϼўТλФЙ') + # Combining characters + self.assertStdinRoundTrip('A͏B ﬖ̳AA̝') + # Non-BMP + self.assertStdinRoundTrip('\U00100000\U0010ffff\U0010fffd') + + def test_partial_reads(self): + # Test that reading less than 1 full character works when stdin + # contains multibyte UTF-8 sequences + source = 'ϼўТλФЙ\r\n'.encode('utf-16-le') + expected = 'ϼўТλФЙ\r\n'.encode('utf-8') + for read_count in range(1, 16): + with open('CONIN$', 'rb', buffering=0) as stdin: + write_input(stdin, source) + + actual = b'' + while not actual.endswith(b'\n'): + b = stdin.read(read_count) + actual += b + + self.assertEqual(actual, expected, 'stdin.read({})'.format(read_count)) + + def test_partial_surrogate_reads(self): + # Test that reading less than 1 full character works when stdin + # contains surrogate pairs that cannot be decoded to UTF-8 without + # reading an extra character. + source = '\U00101FFF\U00101001\r\n'.encode('utf-16-le') + expected = '\U00101FFF\U00101001\r\n'.encode('utf-8') + for read_count in range(1, 16): + with open('CONIN$', 'rb', buffering=0) as stdin: + write_input(stdin, source) + + actual = b'' + while not actual.endswith(b'\n'): + b = stdin.read(read_count) + actual += b + + self.assertEqual(actual, expected, 'stdin.read({})'.format(read_count)) + + def test_ctrl_z(self): + with open('CONIN$', 'rb', buffering=0) as stdin: + source = '\xC4\x1A\r\n'.encode('utf-16-le') + expected = '\xC4'.encode('utf-8') + write_input(stdin, source) + a, b = stdin.read(1), stdin.readall() + self.assertEqual(expected[0:1], a) + self.assertEqual(expected[1:], b) + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_winreg.py b/Lib/test/test_winreg.py index 60207fb..d642b13 100644 --- a/Lib/test/test_winreg.py +++ b/Lib/test/test_winreg.py @@ -37,6 +37,7 @@ test_reflect_key_name = "SOFTWARE\\Classes\\" + test_key_base test_data = [ ("Int Value", 45, REG_DWORD), + ("Qword Value", 0x1122334455667788, REG_QWORD), ("String Val", "A string value", REG_SZ), ("StringExpand", "The path is %path%", REG_EXPAND_SZ), ("Multi-string", ["Lots", "of", "string", "values"], REG_MULTI_SZ), diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index caac3c3..179e069 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -51,6 +51,10 @@ class BeepTest(unittest.TestCase): for i in range(100, 2000, 100): safe_Beep(i, 75) + def test_keyword_args(self): + safe_Beep(duration=75, frequency=2000) + + class MessageBeepTest(unittest.TestCase): def tearDown(self): @@ -76,6 +80,9 @@ class MessageBeepTest(unittest.TestCase): def test_question(self): safe_MessageBeep(winsound.MB_ICONQUESTION) + def test_keyword_args(self): + safe_MessageBeep(type=winsound.MB_OK) + class PlaySoundTest(unittest.TestCase): @@ -88,9 +95,24 @@ class PlaySoundTest(unittest.TestCase): "none", winsound.SND_ASYNC | winsound.SND_MEMORY ) self.assertRaises(TypeError, winsound.PlaySound, b"bad", 0) + self.assertRaises(TypeError, winsound.PlaySound, "bad", + winsound.SND_MEMORY) self.assertRaises(TypeError, winsound.PlaySound, 1, 0) - # embedded null character - self.assertRaises(ValueError, winsound.PlaySound, 'bad\0', 0) + + def test_keyword_args(self): + safe_PlaySound(flags=winsound.SND_ALIAS, sound="SystemExit") + + def test_snd_memory(self): + with open(support.findfile('pluck-pcm8.wav', + subdir='audiodata'), 'rb') as f: + audio_data = f.read() + safe_PlaySound(audio_data, winsound.SND_MEMORY) + audio_data = bytearray(audio_data) + safe_PlaySound(audio_data, winsound.SND_MEMORY) + + def test_snd_filename(self): + fn = support.findfile('pluck-pcm8.wav', subdir='audiodata') + safe_PlaySound(fn, winsound.SND_FILENAME | winsound.SND_NODEFAULT) def test_aliases(self): aliases = [ diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py index e8d789b..c70f685 100644 --- a/Lib/test/test_with.py +++ b/Lib/test/test_with.py @@ -109,7 +109,7 @@ class FailureTestCase(unittest.TestCase): with foo: pass self.assertRaises(NameError, fooNotDeclared) - def testEnterAttributeError(self): + def testEnterAttributeError1(self): class LacksEnter(object): def __exit__(self, type, value, traceback): pass @@ -117,7 +117,16 @@ class FailureTestCase(unittest.TestCase): def fooLacksEnter(): foo = LacksEnter() with foo: pass - self.assertRaises(AttributeError, fooLacksEnter) + self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnter) + + def testEnterAttributeError2(self): + class LacksEnterAndExit(object): + pass + + def fooLacksEnterAndExit(): + foo = LacksEnterAndExit() + with foo: pass + self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnterAndExit) def testExitAttributeError(self): class LacksExit(object): @@ -127,7 +136,7 @@ class FailureTestCase(unittest.TestCase): def fooLacksExit(): foo = LacksExit() with foo: pass - self.assertRaises(AttributeError, fooLacksExit) + self.assertRaisesRegex(AttributeError, '__exit__', fooLacksExit) def assertRaisesSyntaxError(self, codestr): def shouldRaiseSyntaxError(s): @@ -140,11 +149,6 @@ class FailureTestCase(unittest.TestCase): 'with mock as (None):\n' ' pass') - def testAssignmentToEmptyTupleError(self): - self.assertRaisesSyntaxError( - 'with mock as ():\n' - ' pass') - def testAssignmentToTupleOnlyContainingNoneError(self): self.assertRaisesSyntaxError('with mock as None,:\n pass') self.assertRaisesSyntaxError( @@ -454,7 +458,7 @@ class ExceptionalTestCase(ContextmanagerAssertionMixin, unittest.TestCase): with cm(): raise StopIteration("from with") - with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"): + with self.assertWarnsRegex(DeprecationWarning, "StopIteration"): self.assertRaises(StopIteration, shouldThrow) def testRaisedStopIteration2(self): @@ -482,7 +486,7 @@ class ExceptionalTestCase(ContextmanagerAssertionMixin, unittest.TestCase): with cm(): raise next(iter([])) - with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"): + with self.assertWarnsRegex(DeprecationWarning, "StopIteration"): self.assertRaises(StopIteration, shouldThrow) def testRaisedGeneratorExit1(self): diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py index 61a750c..7708e20 100644 --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -258,7 +258,7 @@ class IntegrationTests(TestCase): def app(environ, start_response): start_response("200 OK", []) - return [bytes(support.SOCK_MAX_SIZE)] + return [b'\0' * support.SOCK_MAX_SIZE] class WsgiHandler(NoLogRequestHandler, WSGIRequestHandler): pass diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 5d0166a..c0144d1 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -91,8 +91,6 @@ ENTITY_XML = """\ class ModuleTest(unittest.TestCase): - # TODO: this should be removed once we get rid of the global module vars - def test_sanity(self): # Import sanity. @@ -100,6 +98,10 @@ class ModuleTest(unittest.TestCase): from xml.etree import ElementInclude from xml.etree import ElementPath + def test_all(self): + names = ("xml.etree.ElementTree", "_elementtree") + support.check__all__(self, ET, names, blacklist=("HTML_EMPTY",)) + def serialize(elem, to_string=True, encoding='unicode', **options): if encoding != 'unicode': @@ -182,10 +184,12 @@ class ElementTreeTest(unittest.TestCase): def check_element(element): self.assertTrue(ET.iselement(element), msg="not an element") - self.assertTrue(hasattr(element, "tag"), msg="no tag member") - self.assertTrue(hasattr(element, "attrib"), msg="no attrib member") - self.assertTrue(hasattr(element, "text"), msg="no text member") - self.assertTrue(hasattr(element, "tail"), msg="no tail member") + direlem = dir(element) + for attr in 'tag', 'attrib', 'text', 'tail': + self.assertTrue(hasattr(element, attr), + msg='no %s member' % attr) + self.assertIn(attr, direlem, + msg='no %s visible by dir' % attr) check_string(element.tag) check_mapping(element.attrib) @@ -1875,118 +1879,6 @@ class BadElementTest(ElementTestCase, unittest.TestCase): with self.assertRaises(RuntimeError): repr(e) # Should not crash - def test_element_get_text(self): - # Issue #27863 - class X(str): - def __del__(self): - try: - elem.text - except NameError: - pass - - b = ET.TreeBuilder() - b.start('tag', {}) - b.data('ABCD') - b.data(X('EFGH')) - b.data('IJKL') - b.end('tag') - - elem = b.close() - self.assertEqual(elem.text, 'ABCDEFGHIJKL') - - def test_element_get_tail(self): - # Issue #27863 - class X(str): - def __del__(self): - try: - elem[0].tail - except NameError: - pass - - b = ET.TreeBuilder() - b.start('root', {}) - b.start('tag', {}) - b.end('tag') - b.data('ABCD') - b.data(X('EFGH')) - b.data('IJKL') - b.end('root') - - elem = b.close() - self.assertEqual(elem[0].tail, 'ABCDEFGHIJKL') - - def test_element_iter(self): - # Issue #27863 - state = { - 'tag': 'tag', - '_children': [None], # non-Element - 'attrib': 'attr', - 'tail': 'tail', - 'text': 'text', - } - - e = ET.Element('tag') - try: - e.__setstate__(state) - except AttributeError: - e.__dict__ = state - - it = e.iter() - self.assertIs(next(it), e) - self.assertRaises(AttributeError, next, it) - - def test_subscr(self): - # Issue #27863 - class X: - def __index__(self): - del e[:] - return 1 - - e = ET.Element('elem') - e.append(ET.Element('child')) - e[:X()] # shouldn't crash - - e.append(ET.Element('child')) - e[0:10:X()] # shouldn't crash - - def test_ass_subscr(self): - # Issue #27863 - class X: - def __index__(self): - e[:] = [] - return 1 - - e = ET.Element('elem') - for _ in range(10): - e.insert(0, ET.Element('child')) - - e[0:10:X()] = [] # shouldn't crash - - def test_treebuilder_start(self): - # Issue #27863 - def element_factory(x, y): - return [] - b = ET.TreeBuilder(element_factory=element_factory) - - b.start('tag', {}) - b.data('ABCD') - self.assertRaises(AttributeError, b.start, 'tag2', {}) - del b - gc_collect() - - def test_treebuilder_end(self): - # Issue #27863 - def element_factory(x, y): - return [] - b = ET.TreeBuilder(element_factory=element_factory) - - b.start('tag', {}) - b.data('ABCD') - self.assertRaises(AttributeError, b.end, 'tag') - del b - gc_collect() - - class MutatingElementPath(str): def __new__(cls, elem, *args): self = str.__new__(cls, *args) diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py index bfced12..87f3f27 100644 --- a/Lib/test/test_xml_etree_c.py +++ b/Lib/test/test_xml_etree_c.py @@ -1,5 +1,5 @@ # xml.etree test for cElementTree -import sys, struct +import struct from test import support from test.support import import_fresh_module import types @@ -11,7 +11,6 @@ cET_alias = import_fresh_module('xml.etree.cElementTree', fresh=['_elementtree', 'xml.etree']) -@unittest.skipUnless(cET, 'requires _elementtree') class MiscTests(unittest.TestCase): # Issue #8651. @support.bigmemtest(size=support._2G + 100, memuse=1, dry_run=False) @@ -55,15 +54,6 @@ class MiscTests(unittest.TestCase): del element.attrib self.assertEqual(element.attrib, {'A': 'B', 'C': 'D'}) - def test_trashcan(self): - # If this test fails, it will most likely die via segfault. - e = root = cET.Element('root') - for i in range(200000): - e = cET.SubElement(e, 'x') - del e - del root - support.gc_collect() - @unittest.skipUnless(cET, 'requires _elementtree') class TestAliasWorking(unittest.TestCase): @@ -118,7 +108,7 @@ class SizeofTest(unittest.TestCase): struct.calcsize('8P')) def test_main(): - from test import test_xml_etree, test_xml_etree_c + from test import test_xml_etree # Run the tests specific to the C implementation support.run_unittest( diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index c2de057..df9c79e 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -1,5 +1,6 @@ import base64 import datetime +import decimal import sys import time import unittest @@ -9,7 +10,6 @@ import xmlrpc.server import http.client import http, http.server import socket -import os import re import io import contextlib @@ -238,6 +238,54 @@ class XMLRPCTestCase(unittest.TestCase): '') self.assertRaises(ResponseError, xmlrpclib.loads, data) + def check_loads(self, s, value, **kwargs): + dump = '%s' % s + result, m = xmlrpclib.loads(dump, **kwargs) + (newvalue,) = result + self.assertEqual(newvalue, value) + self.assertIs(type(newvalue), type(value)) + self.assertIsNone(m) + + def test_load_standard_types(self): + check = self.check_loads + check('string', 'string') + check('string', 'string') + check('𝔘𝔫𝔦𝔠𝔬𝔡𝔢 string', '𝔘𝔫𝔦𝔠𝔬𝔡𝔢 string') + check('2056183947', 2056183947) + check('-2056183947', -2056183947) + check('2056183947', 2056183947) + check('46093.78125', 46093.78125) + check('0', False) + check('AGJ5dGUgc3RyaW5n/w==', + xmlrpclib.Binary(b'\x00byte string\xff')) + check('AGJ5dGUgc3RyaW5n/w==', + b'\x00byte string\xff', use_builtin_types=True) + check('20050210T11:41:23', + xmlrpclib.DateTime('20050210T11:41:23')) + check('20050210T11:41:23', + datetime.datetime(2005, 2, 10, 11, 41, 23), + use_builtin_types=True) + check('' + '12' + '', [1, 2]) + check('' + 'b2' + 'a1' + '', {'a': 1, 'b': 2}) + + def test_load_extension_types(self): + check = self.check_loads + check('', None) + check('', None) + check('205', 205) + check('20561', 20561) + check('9876543210', 9876543210) + check('98765432100123456789', + 98765432100123456789) + check('93.78125', 93.78125) + check('9876543210.0123456789', + decimal.Decimal('9876543210.0123456789')) + def test_get_host_info(self): # see bug #3613, this raised a TypeError transp = xmlrpc.client.Transport() @@ -295,94 +343,6 @@ class XMLRPCTestCase(unittest.TestCase): self.assertEqual(p.method(), 5) self.assertEqual(p.method(), 5) - -class SimpleXMLRPCDispatcherTestCase(unittest.TestCase): - class DispatchExc(Exception): - """Raised inside the dispatched functions when checking for - chained exceptions""" - - def test_call_registered_func(self): - """Calls explicitly registered function""" - # Makes sure any exception raised inside the function has no other - # exception chained to it - - exp_params = 1, 2, 3 - - def dispatched_func(*params): - raise self.DispatchExc(params) - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - dispatcher.register_function(dispatched_func) - with self.assertRaises(self.DispatchExc) as exc_ctx: - dispatcher._dispatch('dispatched_func', exp_params) - self.assertEqual(exc_ctx.exception.args, (exp_params,)) - self.assertIsNone(exc_ctx.exception.__cause__) - self.assertIsNone(exc_ctx.exception.__context__) - - def test_call_instance_func(self): - """Calls a registered instance attribute as a function""" - # Makes sure any exception raised inside the function has no other - # exception chained to it - - exp_params = 1, 2, 3 - - class DispatchedClass: - def dispatched_func(self, *params): - raise SimpleXMLRPCDispatcherTestCase.DispatchExc(params) - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - dispatcher.register_instance(DispatchedClass()) - with self.assertRaises(self.DispatchExc) as exc_ctx: - dispatcher._dispatch('dispatched_func', exp_params) - self.assertEqual(exc_ctx.exception.args, (exp_params,)) - self.assertIsNone(exc_ctx.exception.__cause__) - self.assertIsNone(exc_ctx.exception.__context__) - - def test_call_dispatch_func(self): - """Calls the registered instance's `_dispatch` function""" - # Makes sure any exception raised inside the function has no other - # exception chained to it - - exp_method = 'method' - exp_params = 1, 2, 3 - - class TestInstance: - def _dispatch(self, method, params): - raise SimpleXMLRPCDispatcherTestCase.DispatchExc( - method, params) - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - dispatcher.register_instance(TestInstance()) - with self.assertRaises(self.DispatchExc) as exc_ctx: - dispatcher._dispatch(exp_method, exp_params) - self.assertEqual(exc_ctx.exception.args, (exp_method, exp_params)) - self.assertIsNone(exc_ctx.exception.__cause__) - self.assertIsNone(exc_ctx.exception.__context__) - - def test_registered_func_is_none(self): - """Calls explicitly registered function which is None""" - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - dispatcher.register_function(None, name='method') - with self.assertRaisesRegex(Exception, 'method'): - dispatcher._dispatch('method', ('param',)) - - def test_instance_has_no_func(self): - """Attempts to call nonexistent function on a registered instance""" - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - dispatcher.register_instance(object()) - with self.assertRaisesRegex(Exception, 'method'): - dispatcher._dispatch('method', ('param',)) - - def test_cannot_locate_func(self): - """Calls a function that the dispatcher cannot locate""" - - dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher() - with self.assertRaisesRegex(Exception, 'method'): - dispatcher._dispatch('method', ('param',)) - - class HelperTestCase(unittest.TestCase): def test_escape(self): self.assertEqual(xmlrpclib.escape("a&b"), "a&b") @@ -1235,7 +1195,6 @@ def captured_stdout(encoding='utf-8'): """A variation on support.captured_stdout() which gives a text stream having a `buffer` attribute. """ - import io orig_stdout = sys.stdout sys.stdout = io.TextIOWrapper(io.BytesIO(), encoding=encoding) try: @@ -1308,7 +1267,7 @@ class CGIHandlerTestCase(unittest.TestCase): content = handle[handle.find("= 0.2. + + Calls the timeit method with *number* set to successive powers of + ten (10, 100, 1000, ...) up to a maximum of one billion, until + the time taken is at least 0.2 second, or the maximum is reached. + Returns ``(number, time_taken)``. + + If *callback* is given and is not None, it will be called after + each trial with two arguments: ``callback(number, time_taken)``. + """ + for i in range(1, 10): + number = 10**i + time_taken = self.timeit(number) + if callback: + callback(number, time_taken) + if time_taken >= 0.2: + break + return (number, time_taken) + def timeit(stmt="pass", setup="pass", timer=default_timer, number=default_number, globals=None): """Convenience function to create Timer object and call timeit method.""" @@ -295,17 +315,16 @@ def main(args=None, *, _wrap_timer=None): t = Timer(stmt, setup, timer) if number == 0: # determine number so that 0.2 <= total time < 2.0 - for i in range(1, 10): - number = 10**i - try: - x = t.timeit(number) - except: - t.print_exc() - return 1 - if verbose: - print("%d loops -> %.*g secs" % (number, precision, x)) - if x >= 0.2: - break + callback = None + if verbose: + def callback(number, time_taken): + msg = "{num} loops -> {secs:.{prec}g} secs" + print(msg.format(num=number, secs=time_taken, prec=precision)) + try: + number, _ = t.autorange(callback) + except: + t.print_exc() + return 1 try: r = t.repeat(repeat, number) except: @@ -317,20 +336,26 @@ def main(args=None, *, _wrap_timer=None): print("%d loops," % number, end=' ') usec = best * 1e6 / number if time_unit is not None: - print("best of %d: %.*g %s per loop" % (repeat, precision, - usec/units[time_unit], time_unit)) + scale = units[time_unit] else: - if usec < 1000: - print("best of %d: %.*g usec per loop" % (repeat, precision, usec)) - else: - msec = usec / 1000 - if msec < 1000: - print("best of %d: %.*g msec per loop" % (repeat, - precision, msec)) - else: - sec = msec / 1000 - print("best of %d: %.*g sec per loop" % (repeat, - precision, sec)) + scales = [(scale, unit) for unit, scale in units.items()] + scales.sort(reverse=True) + for scale, time_unit in scales: + if usec >= scale: + break + print("best of %d: %.*g %s per loop" % (repeat, precision, + usec/scale, time_unit)) + best = min(r) + usec = best * 1e6 / number + worst = max(r) + if worst >= best * 4: + usec = worst * 1e6 / number + import warnings + warnings.warn_explicit( + "The test results are likely unreliable. The worst\n" + "time (%.*g %s) was more than four times slower than the best time." % + (precision, usec/scale, time_unit), + UserWarning, '', 0) return None if __name__ == "__main__": diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 5eeefbb..ee2415d 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -30,6 +30,7 @@ button.pack(side=BOTTOM) tk.mainloop() """ +import enum import sys import _tkinter # If this fails your Python may not be configured for Tk @@ -132,6 +133,50 @@ def _splitdict(tk, v, cut_minus=True, conv=None): dict[key] = value return dict + +class EventType(str, enum.Enum): + KeyPress = '2' + Key = KeyPress, + KeyRelease = '3' + ButtonPress = '4' + Button = ButtonPress, + ButtonRelease = '5' + Motion = '6' + Enter = '7' + Leave = '8' + FocusIn = '9' + FocusOut = '10' + Keymap = '11' # undocumented + Expose = '12' + GraphicsExpose = '13' # undocumented + NoExpose = '14' # undocumented + Visibility = '15' + Create = '16' + Destroy = '17' + Unmap = '18' + Map = '19' + MapRequest = '20' + Reparent = '21' + Configure = '22' + ConfigureRequest = '23' + Gravity = '24' + ResizeRequest = '25' + Circulate = '26' + CirculateRequest = '27' + Property = '28' + SelectionClear = '29' # undocumented + SelectionRequest = '30' # undocumented + Selection = '31' # undocumented + Colormap = '32' + ClientMessage = '33' # undocumented + Mapping = '34' # undocumented + VirtualEvent = '35', # undocumented + Activate = '36', + Deactivate = '37', + MouseWheel = '38', + def __str__(self): + return self.name + class Event: """Container for the properties of an event. @@ -174,7 +219,43 @@ class Event: widget - widget in which the event occurred delta - delta of wheel movement (MouseWheel) """ - pass + def __repr__(self): + attrs = {k: v for k, v in self.__dict__.items() if v != '??'} + if not self.char: + del attrs['char'] + elif self.char != '??': + attrs['char'] = repr(self.char) + if not getattr(self, 'send_event', True): + del attrs['send_event'] + if self.state == 0: + del attrs['state'] + elif isinstance(self.state, int): + state = self.state + mods = ('Shift', 'Lock', 'Control', + 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', + 'Button1', 'Button2', 'Button3', 'Button4', 'Button5') + s = [] + for i, n in enumerate(mods): + if state & (1 << i): + s.append(n) + state = state & ~((1<< len(mods)) - 1) + if state or not s: + s.append(hex(state)) + attrs['state'] = '|'.join(s) + if self.delta == 0: + del attrs['delta'] + # widget usually is known + # serial and time are not very interesting + # keysym_num duplicates keysym + # x_root and y_root mostly duplicate x and y + keys = ('send_event', + 'state', 'keysym', 'keycode', 'char', + 'num', 'delta', 'focus', + 'x', 'y', 'width', 'height') + return '<%s event%s>' % ( + self.type, + ''.join(' %s=%s' % (k, attrs[k]) for k in keys if k in attrs) + ) _support_default_root = 1 _default_root = None @@ -262,15 +343,8 @@ class Variable: def get(self): """Return value of variable.""" return self._tk.globalgetvar(self._name) - def trace_variable(self, mode, callback): - """Define a trace callback for the variable. - MODE is one of "r", "w", "u" for read, write, undefine. - CALLBACK must be a function which is called when - the variable is read, written or undefined. - - Return the name of the callback. - """ + def _register(self, callback): f = CallWrapper(callback, None, self._root).__call__ cbname = repr(id(f)) try: @@ -285,18 +359,80 @@ class Variable: if self._tclCommands is None: self._tclCommands = [] self._tclCommands.append(cbname) + return cbname + + def trace_add(self, mode, callback): + """Define a trace callback for the variable. + + Mode is one of "read", "write", "unset", or a list or tuple of + such strings. + Callback must be a function which is called when the variable is + read, written or unset. + + Return the name of the callback. + """ + cbname = self._register(callback) + self._tk.call('trace', 'add', 'variable', + self._name, mode, (cbname,)) + return cbname + + def trace_remove(self, mode, cbname): + """Delete the trace callback for a variable. + + Mode is one of "read", "write", "unset" or a list or tuple of + such strings. Must be same as were specified in trace_add(). + cbname is the name of the callback returned from trace_add(). + """ + self._tk.call('trace', 'remove', 'variable', + self._name, mode, cbname) + for m, ca in self.trace_info(): + if self._tk.splitlist(ca)[0] == cbname: + break + else: + self._tk.deletecommand(cbname) + try: + self._tclCommands.remove(cbname) + except ValueError: + pass + + def trace_info(self): + """Return all trace callback information.""" + splitlist = self._tk.splitlist + return [(splitlist(k), v) for k, v in map(splitlist, + splitlist(self._tk.call('trace', 'info', 'variable', self._name)))] + + def trace_variable(self, mode, callback): + """Define a trace callback for the variable. + + MODE is one of "r", "w", "u" for read, write, undefine. + CALLBACK must be a function which is called when + the variable is read, written or undefined. + + Return the name of the callback. + + This deprecated method wraps a deprecated Tcl method that will + likely be removed in the future. Use trace_add() instead. + """ + # TODO: Add deprecation warning + cbname = self._register(callback) self._tk.call("trace", "variable", self._name, mode, cbname) return cbname + trace = trace_variable + def trace_vdelete(self, mode, cbname): """Delete the trace callback for a variable. MODE is one of "r", "w", "u" for read, write, undefine. CBNAME is the name of the callback returned from trace_variable or trace. + + This deprecated method wraps a deprecated Tcl method that will + likely be removed in the future. Use trace_remove() instead. """ + # TODO: Add deprecation warning self._tk.call("trace", "vdelete", self._name, mode, cbname) cbname = self._tk.splitlist(cbname)[0] - for m, ca in self.trace_vinfo(): + for m, ca in self.trace_info(): if self._tk.splitlist(ca)[0] == cbname: break else: @@ -305,10 +441,17 @@ class Variable: self._tclCommands.remove(cbname) except ValueError: pass + def trace_vinfo(self): - """Return all trace callback information.""" + """Return all trace callback information. + + This deprecated method wraps a deprecated Tcl method that will + likely be removed in the future. Use trace_info() instead. + """ + # TODO: Add deprecation warning return [self._tk.splitlist(x) for x in self._tk.splitlist( self._tk.call("trace", "vinfo", self._name))] + def __eq__(self, other): """Comparison for equality (==). @@ -430,6 +573,9 @@ class Misc: Base class which defines methods common for interior widgets.""" + # used for generating child widget names + _last_child_ids = None + # XXX font command? _tclCommands = None def destroy(self): @@ -477,12 +623,6 @@ class Misc: disabledForeground, insertBackground, troughColor.""" self.tk.call(('tk_setPalette',) + _flatten(args) + _flatten(list(kw.items()))) - def tk_menuBar(self, *args): - """Do not use. Needed in Tk 3.6 and earlier.""" - # obsolete since Tk 4.0 - import warnings - warnings.warn('tk_menuBar() does nothing and will be removed in 3.6', - DeprecationWarning, stacklevel=2) def wait_variable(self, name='PY_VAR'): """Wait until the variable is modified. @@ -864,7 +1004,7 @@ class Misc: return self.tk.getint( self.tk.call('winfo', 'ismapped', self._w)) def winfo_manager(self): - """Return the window manager name for this widget.""" + """Return the window mananger name for this widget.""" return self.tk.call('winfo', 'manager', self._w) def winfo_name(self): """Return the name of this widget.""" @@ -974,18 +1114,16 @@ class Misc: def winfo_visualid(self): """Return the X identifier for the visual for this widget.""" return self.tk.call('winfo', 'visualid', self._w) - def winfo_visualsavailable(self, includeids=0): + def winfo_visualsavailable(self, includeids=False): """Return a list of all visuals available for the screen of this widget. Each item in the list consists of a visual name (see winfo_visual), a - depth and if INCLUDEIDS=1 is given also the X identifier.""" - data = self.tk.split( - self.tk.call('winfo', 'visualsavailable', self._w, - includeids and 'includeids' or None)) - if isinstance(data, str): - data = [self.tk.split(data)] - return [self.__winfo_parseitem(x) for x in data] + depth and if includeids is true is given also the X identifier.""" + data = self.tk.call('winfo', 'visualsavailable', self._w, + 'includeids' if includeids else None) + data = [self.tk.splitlist(x) for x in self.tk.splitlist(data)] + return [self.__winfo_parseitem(x) for x in data] def __winfo_parseitem(self, t): """Internal function.""" return t[:1] + tuple(map(self.__winfo_getint, t[1:])) @@ -1286,7 +1424,10 @@ class Misc: except TclError: pass e.keysym = K e.keysym_num = getint_event(N) - e.type = T + try: + e.type = EventType(T) + except ValueError: + e.type = T try: e.widget = self._nametowidget(W) except KeyError: @@ -1538,7 +1679,7 @@ class Misc: return self.tk.splitlist(self.tk.call('image', 'names')) def image_types(self): - """Return a list of all available image types (e.g. photo bitmap).""" + """Return a list of all available image types (e.g. phote bitmap).""" return self.tk.splitlist(self.tk.call('image', 'types')) @@ -1677,7 +1818,7 @@ class Wm: return self.tk.call('wm', 'focusmodel', self._w, model) focusmodel = wm_focusmodel def wm_forget(self, window): # new in Tk 8.5 - """The window will be unmapped from the screen and will no longer + """The window will be unmappend from the screen and will no longer be managed by wm. toplevel windows will be treated like frame windows once they are no longer managed by wm, however, the menu option configuration will be remembered and the menus will return @@ -1896,9 +2037,6 @@ class Tk(Misc, Wm): if tcl_version != _tkinter.TCL_VERSION: raise RuntimeError("tcl.h version (%s) doesn't match libtcl.a version (%s)" \ % (_tkinter.TCL_VERSION, tcl_version)) - if TkVersion < 4.0: - raise RuntimeError("Tk 4.0 or higher is required; found Tk %s" - % str(TkVersion)) # Create and register the tkerror and exit commands # We need to inline parts of _register here, _ register # would register differently-named commands. @@ -2121,7 +2259,15 @@ class BaseWidget(Misc): name = cnf['name'] del cnf['name'] if not name: - name = repr(id(self)) + name = self.__class__.__name__.lower() + if master._last_child_ids is None: + master._last_child_ids = {} + count = master._last_child_ids.get(name, 0) + 1 + master._last_child_ids[name] = count + if count == 1: + name = '!%s' % (name,) + else: + name = '!%s%d' % (name, count) self._name = name if master._w=='.': self._w = '.' + name @@ -2381,7 +2527,7 @@ class Canvas(Widget, XView, YView): """Return item which is closest to pixel at X, Y. If several match take the top-most. All items closer than HALO are considered overlapping (all are - closest). If START is specified the next below this tag is taken.""" + closests). If START is specified the next below this tag is taken.""" return self.find('closest', x, y, halo, start) def find_enclosed(self, x1, y1, x2, y2): """Return all items in rectangle defined @@ -2441,7 +2587,7 @@ class Canvas(Widget, XView, YView): """Print the contents of the canvas to a postscript file. Valid options: colormap, colormode, file, fontmap, height, pageanchor, pageheight, pagewidth, pagex, pagey, - rotate, width, x, y.""" + rotate, witdh, x, y.""" return self.tk.call((self._w, 'postscript') + self._options(cnf, kw)) def tag_raise(self, *args): @@ -2717,12 +2863,6 @@ class Menu(Widget): def tk_popup(self, x, y, entry=""): """Post the menu at position X,Y with entry ENTRY.""" self.tk.call('tk_popup', self._w, x, y, entry) - def tk_bindForTraversal(self): - # obsolete since Tk 4.0 - import warnings - warnings.warn('tk_bindForTraversal() does nothing and ' - 'will be removed in 3.6', - DeprecationWarning, stacklevel=2) def activate(self, index): """Activate entry at INDEX.""" self.tk.call(self._w, 'activate', index) @@ -3345,9 +3485,6 @@ class Image: if not name: Image._last_id += 1 name = "pyimage%r" % (Image._last_id,) # tk itself would use image - # The following is needed for systems where id(x) - # can return a negative number, such as Linux/m68k: - if name[0] == '-': name = '_' + name[1:] if kw and cnf: cnf = _cnfmerge((cnf, kw)) elif kw: cnf = kw options = () @@ -3385,7 +3522,7 @@ class Image: return self.tk.getint( self.tk.call('image', 'height', self.name)) def type(self): - """Return the type of the image, e.g. "photo" or "bitmap".""" + """Return the type of the imgage, e.g. "photo" or "bitmap".""" return self.tk.call('image', 'type', self.name) def width(self): """Return the width of the image.""" diff --git a/Lib/tkinter/commondialog.py b/Lib/tkinter/commondialog.py index d2688db..1e75cae 100644 --- a/Lib/tkinter/commondialog.py +++ b/Lib/tkinter/commondialog.py @@ -15,11 +15,6 @@ class Dialog: command = None def __init__(self, master=None, **options): - - # FIXME: should this be placed on the module level instead? - if TkVersion < 4.2: - raise TclError("this module requires Tk 4.2 or newer") - self.master = master self.options = options if not master and options.get('parent'): diff --git a/Lib/tkinter/dialog.py b/Lib/tkinter/dialog.py index be085ab..f61c5f7 100644 --- a/Lib/tkinter/dialog.py +++ b/Lib/tkinter/dialog.py @@ -3,10 +3,7 @@ from tkinter import * from tkinter import _cnfmerge -if TkVersion <= 3.6: - DIALOG_ICON = 'warning' -else: - DIALOG_ICON = 'questhead' +DIALOG_ICON = 'questhead' class Dialog(Widget): diff --git a/Lib/tkinter/test/runtktests.py b/Lib/tkinter/test/runtktests.py index dbe5e88..33dc54a 100644 --- a/Lib/tkinter/test/runtktests.py +++ b/Lib/tkinter/test/runtktests.py @@ -7,8 +7,6 @@ Extensions also should live in packages following the same rule as above. """ import os -import sys -import unittest import importlib import test.support diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py index 85ee2c7..9dc1e37 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/Lib/tkinter/test/test_tkinter/test_misc.py @@ -12,6 +12,14 @@ class MiscTest(AbstractTkTest, unittest.TestCase): f = tkinter.Frame(t, name='child') self.assertEqual(repr(f), '') + def test_generated_names(self): + t = tkinter.Toplevel(self.root) + f = tkinter.Frame(t) + f2 = tkinter.Frame(t) + b = tkinter.Button(f2) + for name in str(b).split('.'): + self.assertFalse(name.isidentifier(), msg=repr(name)) + def test_tk_setPalette(self): root = self.root root.tk_setPalette('black') diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/tkinter/test/test_tkinter/test_variables.py index d8ba9ce..2eb1e12 100644 --- a/Lib/tkinter/test/test_tkinter/test_variables.py +++ b/Lib/tkinter/test/test_tkinter/test_variables.py @@ -87,7 +87,8 @@ class TestVariable(TestBase): v.set("value") self.assertTrue(v.side_effect) - def test_trace(self): + def test_trace_old(self): + # Old interface v = Variable(self.root) vname = str(v) trace = [] @@ -136,6 +137,55 @@ class TestVariable(TestBase): gc.collect() self.assertEqual(trace, [('write', vname, '', 'u')]) + def test_trace(self): + v = Variable(self.root) + vname = str(v) + trace = [] + def read_tracer(*args): + trace.append(('read',) + args) + def write_tracer(*args): + trace.append(('write',) + args) + tr1 = v.trace_add('read', read_tracer) + tr2 = v.trace_add(['write', 'unset'], write_tracer) + self.assertEqual(sorted(v.trace_info()), [ + (('read',), tr1), + (('write', 'unset'), tr2)]) + self.assertEqual(trace, []) + + v.set('spam') + self.assertEqual(trace, [('write', vname, '', 'write')]) + + trace = [] + v.get() + self.assertEqual(trace, [('read', vname, '', 'read')]) + + trace = [] + info = sorted(v.trace_info()) + v.trace_remove('write', tr1) # Wrong mode + self.assertEqual(sorted(v.trace_info()), info) + with self.assertRaises(TclError): + v.trace_remove('read', 'spam') # Wrong command name + self.assertEqual(sorted(v.trace_info()), info) + v.get() + self.assertEqual(trace, [('read', vname, '', 'read')]) + + trace = [] + v.trace_remove('read', tr1) + self.assertEqual(v.trace_info(), [(('write', 'unset'), tr2)]) + v.get() + self.assertEqual(trace, []) + + trace = [] + del write_tracer + gc.collect() + v.set('eggs') + self.assertEqual(trace, [('write', vname, '', 'write')]) + + trace = [] + del v + gc.collect() + self.assertEqual(trace, [('write', vname, '', 'unset')]) + class TestStringVar(TestBase): diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/tkinter/test/test_ttk/test_functions.py index c68a650..a1b7cdf 100644 --- a/Lib/tkinter/test/test_ttk/test_functions.py +++ b/Lib/tkinter/test/test_ttk/test_functions.py @@ -1,6 +1,5 @@ # -*- encoding: utf-8 -*- import unittest -import tkinter from tkinter import ttk class MockTkApp: diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 8bd22d0..26766a8 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -1487,6 +1487,7 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): def test_selection(self): + self.assertRaises(TypeError, self.tv.selection, 'spam') # item 'none' doesn't exist self.assertRaises(tkinter.TclError, self.tv.selection_set, 'none') self.assertRaises(tkinter.TclError, self.tv.selection_add, 'none') @@ -1500,25 +1501,31 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): c3 = self.tv.insert(item1, 'end') self.assertEqual(self.tv.selection(), ()) - self.tv.selection_set((c1, item2)) + self.tv.selection_set(c1, item2) self.assertEqual(self.tv.selection(), (c1, item2)) self.tv.selection_set(c2) self.assertEqual(self.tv.selection(), (c2,)) - self.tv.selection_add((c1, item2)) + self.tv.selection_add(c1, item2) self.assertEqual(self.tv.selection(), (c1, c2, item2)) self.tv.selection_add(item1) self.assertEqual(self.tv.selection(), (item1, c1, c2, item2)) + self.tv.selection_add() + self.assertEqual(self.tv.selection(), (item1, c1, c2, item2)) - self.tv.selection_remove((item1, c3)) + self.tv.selection_remove(item1, c3) self.assertEqual(self.tv.selection(), (c1, c2, item2)) self.tv.selection_remove(c2) self.assertEqual(self.tv.selection(), (c1, item2)) + self.tv.selection_remove() + self.assertEqual(self.tv.selection(), (c1, item2)) - self.tv.selection_toggle((c1, c3)) + self.tv.selection_toggle(c1, c3) self.assertEqual(self.tv.selection(), (c3, item2)) self.tv.selection_toggle(item2) self.assertEqual(self.tv.selection(), (c3,)) + self.tv.selection_toggle() + self.assertEqual(self.tv.selection(), (c3,)) self.tv.insert('', 'end', id='with spaces') self.tv.selection_set('with spaces') @@ -1536,6 +1543,40 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): self.tv.selection_set(b'bytes\xe2\x82\xac') self.assertEqual(self.tv.selection(), ('bytes\xe2\x82\xac',)) + self.tv.selection_set() + self.assertEqual(self.tv.selection(), ()) + + # Old interface + self.tv.selection_set((c1, item2)) + self.assertEqual(self.tv.selection(), (c1, item2)) + self.tv.selection_add((c1, item1)) + self.assertEqual(self.tv.selection(), (item1, c1, item2)) + self.tv.selection_remove((item1, c3)) + self.assertEqual(self.tv.selection(), (c1, item2)) + self.tv.selection_toggle((c1, c3)) + self.assertEqual(self.tv.selection(), (c3, item2)) + + if sys.version_info >= (3, 7): + import warnings + warnings.warn( + 'Deprecated API of Treeview.selection() should be removed') + self.tv.selection_set() + self.assertEqual(self.tv.selection(), ()) + with self.assertWarns(DeprecationWarning): + self.tv.selection('set', (c1, item2)) + self.assertEqual(self.tv.selection(), (c1, item2)) + with self.assertWarns(DeprecationWarning): + self.tv.selection('add', (c1, item1)) + self.assertEqual(self.tv.selection(), (item1, c1, item2)) + with self.assertWarns(DeprecationWarning): + self.tv.selection('remove', (item1, c3)) + self.assertEqual(self.tv.selection(), (c1, item2)) + with self.assertWarns(DeprecationWarning): + self.tv.selection('toggle', (c1, c3)) + self.assertEqual(self.tv.selection(), (c3, item2)) + with self.assertWarns(DeprecationWarning): + selection = self.tv.selection(None) + self.assertEqual(selection, (c3, item2)) def test_set(self): self.tv['columns'] = ['A', 'B'] diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py index a1006bd..e7cb10a 100644 --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1,3 +1,7 @@ +# -*-mode: python; fill-column: 75; tab-width: 8 -*- +# +# $Id$ +# # Tix.py -- Tix widget wrappers. # # For Tix, see http://tix.sourceforge.net @@ -27,10 +31,6 @@ import tkinter from tkinter import * from tkinter import _cnfmerge -# WARNING - TkVersion is a limited precision floating point number -if TkVersion < 3.999: - raise ImportError("This version of Tix.py requires Tk 4.0 or higher") - import _tkinter # If this fails your Python may not be configured for Tk # Some more constants (for consistency with Tkinter) @@ -472,16 +472,17 @@ class DisplayStyle: """DisplayStyle - handle configuration options shared by (multiple) Display Items""" - def __init__(self, itemtype, cnf={}, **kw): - if 'refwindow' in kw: - master = kw['refwindow'] - elif 'refwindow' in cnf: - master = cnf['refwindow'] - else: - master = tkinter._default_root - if not master: - raise RuntimeError("Too early to create display style: " - "no root window") + def __init__(self, itemtype, cnf={}, *, master=None, **kw): + if not master: + if 'refwindow' in kw: + master = kw['refwindow'] + elif 'refwindow' in cnf: + master = cnf['refwindow'] + else: + master = tkinter._default_root + if not master: + raise RuntimeError("Too early to create display style: " + "no root window") self.tk = master.tk self.stylename = self.tk.call('tixDisplayStyle', itemtype, *self._options(cnf,kw) ) @@ -1116,7 +1117,7 @@ class ListNoteBook(TixWidget): def pages(self): # Can't call subwidgets_all directly because we don't want .nbframe - names = self.tk.split(self.tk.call(self._w, 'pages')) + names = self.tk.splitlist(self.tk.call(self._w, 'pages')) ret = [] for x in names: ret.append(self.subwidget(x)) @@ -1162,7 +1163,7 @@ class NoteBook(TixWidget): def pages(self): # Can't call subwidgets_all directly because we don't want .nbframe - names = self.tk.split(self.tk.call(self._w, 'pages')) + names = self.tk.splitlist(self.tk.call(self._w, 'pages')) ret = [] for x in names: ret.append(self.subwidget(x)) @@ -1585,8 +1586,7 @@ class CheckList(TixWidget): '''Returns a list of items whose status matches status. If status is not specified, the list of items in the "on" status will be returned. Mode can be on, off, default''' - c = self.tk.split(self.tk.call(self._w, 'getselection', mode)) - return self.tk.splitlist(c) + return self.tk.splitlist(self.tk.call(self._w, 'getselection', mode)) def getstatus(self, entrypath): '''Returns the current status of entryPath.''' @@ -1907,7 +1907,7 @@ class Grid(TixWidget, XView, YView): or a real number following by the word chars (e.g. 3.4chars) that sets the width of the column to the given number of characters.""" - return self.tk.split(self.tk.call(self._w, 'size', 'column', index, + return self.tk.splitlist(self.tk.call(self._w, 'size', 'column', index, *self._options({}, kw))) def size_row(self, index, **kw): @@ -1932,7 +1932,7 @@ class Grid(TixWidget, XView, YView): or a real number following by the word chars (e.g. 3.4chars) that sets the height of the row to the given number of characters.""" - return self.tk.split(self.tk.call( + return self.tk.splitlist(self.tk.call( self, 'size', 'row', index, *self._options({}, kw))) def unset(self, x, y): diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index f4a6d8c..c474e60 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -28,6 +28,8 @@ __all__ = ["Button", "Checkbutton", "Combobox", "Entry", "Frame", "Label", import tkinter from tkinter import _flatten, _join, _stringify, _splitdict +_sentinel = object() + # Verify if Tk is new enough to not need the Tile package _REQUIRE_TILE = True if tkinter.TkVersion < 8.5 else False @@ -381,7 +383,9 @@ class Style(object): a sequence identifying the value for that option.""" if query_opt is not None: kw[query_opt] = None - return _val_or_dict(self.tk, kw, self._name, "configure", style) + result = _val_or_dict(self.tk, kw, self._name, "configure", style) + if result or query_opt: + return result def map(self, style, query_opt=None, **kw): @@ -466,12 +470,14 @@ class Style(object): def element_names(self): """Returns the list of elements defined in the current theme.""" - return self.tk.splitlist(self.tk.call(self._name, "element", "names")) + return tuple(n.lstrip('-') for n in self.tk.splitlist( + self.tk.call(self._name, "element", "names"))) def element_options(self, elementname): """Return the list of elementname's options.""" - return self.tk.splitlist(self.tk.call(self._name, "element", "options", elementname)) + return tuple(o.lstrip('-') for o in self.tk.splitlist( + self.tk.call(self._name, "element", "options", elementname))) def theme_create(self, themename, parent=None, settings=None): @@ -1390,31 +1396,53 @@ class Treeview(Widget, tkinter.XView, tkinter.YView): self.tk.call(self._w, "see", item) - def selection(self, selop=None, items=None): - """If selop is not specified, returns selected items.""" - if isinstance(items, (str, bytes)): - items = (items,) + def selection(self, selop=_sentinel, items=None): + """Returns the tuple of selected items.""" + if selop is _sentinel: + selop = None + elif selop is None: + import warnings + warnings.warn( + "The selop=None argument of selection() is deprecated " + "and will be removed in Python 3.7", + DeprecationWarning, 3) + elif selop in ('set', 'add', 'remove', 'toggle'): + import warnings + warnings.warn( + "The selop argument of selection() is deprecated " + "and will be removed in Python 3.7, " + "use selection_%s() instead" % (selop,), + DeprecationWarning, 3) + else: + raise TypeError('Unsupported operation') return self.tk.splitlist(self.tk.call(self._w, "selection", selop, items)) - def selection_set(self, items): - """items becomes the new selection.""" - self.selection("set", items) + def _selection(self, selop, items): + if len(items) == 1 and isinstance(items[0], (tuple, list)): + items = items[0] + + self.tk.call(self._w, "selection", selop, items) + + + def selection_set(self, *items): + """The specified items becomes the new selection.""" + self._selection("set", items) - def selection_add(self, items): - """Add items to the selection.""" - self.selection("add", items) + def selection_add(self, *items): + """Add all of the specified items to the selection.""" + self._selection("add", items) - def selection_remove(self, items): - """Remove items from the selection.""" - self.selection("remove", items) + def selection_remove(self, *items): + """Remove all of the specified items from the selection.""" + self._selection("remove", items) - def selection_toggle(self, items): - """Toggle the selection state of each item in items.""" - self.selection("toggle", items) + def selection_toggle(self, *items): + """Toggle the selection state of each specified item.""" + self._selection("toggle", items) def set(self, item, column=None, value=None): diff --git a/Lib/tokenize.py b/Lib/tokenize.py index b1d0c83..825aa90 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -29,6 +29,7 @@ from codecs import lookup, BOM_UTF8 import collections from io import TextIOWrapper from itertools import chain +import itertools as _itertools import re import sys from token import * @@ -119,19 +120,41 @@ Comment = r'#[^\r\n]*' Ignore = Whitespace + any(r'\\\r?\n' + Whitespace) + maybe(Comment) Name = r'\w+' -Hexnumber = r'0[xX][0-9a-fA-F]+' -Binnumber = r'0[bB][01]+' -Octnumber = r'0[oO][0-7]+' -Decnumber = r'(?:0+|[1-9][0-9]*)' +Hexnumber = r'0[xX](?:_?[0-9a-fA-F])+' +Binnumber = r'0[bB](?:_?[01])+' +Octnumber = r'0[oO](?:_?[0-7])+' +Decnumber = r'(?:0(?:_?0)*|[1-9](?:_?[0-9])*)' Intnumber = group(Hexnumber, Binnumber, Octnumber, Decnumber) -Exponent = r'[eE][-+]?[0-9]+' -Pointfloat = group(r'[0-9]+\.[0-9]*', r'\.[0-9]+') + maybe(Exponent) -Expfloat = r'[0-9]+' + Exponent +Exponent = r'[eE][-+]?[0-9](?:_?[0-9])*' +Pointfloat = group(r'[0-9](?:_?[0-9])*\.(?:[0-9](?:_?[0-9])*)?', + r'\.[0-9](?:_?[0-9])*') + maybe(Exponent) +Expfloat = r'[0-9](?:_?[0-9])*' + Exponent Floatnumber = group(Pointfloat, Expfloat) -Imagnumber = group(r'[0-9]+[jJ]', Floatnumber + r'[jJ]') +Imagnumber = group(r'[0-9](?:_?[0-9])*[jJ]', Floatnumber + r'[jJ]') Number = group(Imagnumber, Floatnumber, Intnumber) -StringPrefix = r'(?:[bB][rR]?|[rR][bB]?|[uU])?' +# Return the empty string, plus all of the valid string prefixes. +def _all_string_prefixes(): + # The valid string prefixes. Only contain the lower case versions, + # and don't contain any permuations (include 'fr', but not + # 'rf'). The various permutations will be generated. + _valid_string_prefixes = ['b', 'r', 'u', 'f', 'br', 'fr'] + # if we add binary f-strings, add: ['fb', 'fbr'] + result = set(['']) + for prefix in _valid_string_prefixes: + for t in _itertools.permutations(prefix): + # create a list with upper and lower versions of each + # character + for u in _itertools.product(*[(c, c.upper()) for c in t]): + result.add(''.join(u)) + return result + +def _compile(expr): + return re.compile(expr, re.UNICODE) + +# Note that since _all_string_prefixes includes the empty string, +# StringPrefix can be the empty string (making it optional). +StringPrefix = group(*_all_string_prefixes()) # Tail end of ' string. Single = r"[^'\\]*(?:\\.[^'\\]*)*'" @@ -169,50 +192,25 @@ ContStr = group(StringPrefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*" + PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple) PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name) -def _compile(expr): - return re.compile(expr, re.UNICODE) - -endpats = {"'": Single, '"': Double, - "'''": Single3, '"""': Double3, - "r'''": Single3, 'r"""': Double3, - "b'''": Single3, 'b"""': Double3, - "R'''": Single3, 'R"""': Double3, - "B'''": Single3, 'B"""': Double3, - "br'''": Single3, 'br"""': Double3, - "bR'''": Single3, 'bR"""': Double3, - "Br'''": Single3, 'Br"""': Double3, - "BR'''": Single3, 'BR"""': Double3, - "rb'''": Single3, 'rb"""': Double3, - "Rb'''": Single3, 'Rb"""': Double3, - "rB'''": Single3, 'rB"""': Double3, - "RB'''": Single3, 'RB"""': Double3, - "u'''": Single3, 'u"""': Double3, - "U'''": Single3, 'U"""': Double3, - 'r': None, 'R': None, 'b': None, 'B': None, - 'u': None, 'U': None} - -triple_quoted = {} -for t in ("'''", '"""', - "r'''", 'r"""', "R'''", 'R"""', - "b'''", 'b"""', "B'''", 'B"""', - "br'''", 'br"""', "Br'''", 'Br"""', - "bR'''", 'bR"""', "BR'''", 'BR"""', - "rb'''", 'rb"""', "rB'''", 'rB"""', - "Rb'''", 'Rb"""', "RB'''", 'RB"""', - "u'''", 'u"""', "U'''", 'U"""', - ): - triple_quoted[t] = t -single_quoted = {} -for t in ("'", '"', - "r'", 'r"', "R'", 'R"', - "b'", 'b"', "B'", 'B"', - "br'", 'br"', "Br'", 'Br"', - "bR'", 'bR"', "BR'", 'BR"' , - "rb'", 'rb"', "rB'", 'rB"', - "Rb'", 'Rb"', "RB'", 'RB"' , - "u'", 'u"', "U'", 'U"', - ): - single_quoted[t] = t +# For a given string prefix plus quotes, endpats maps it to a regex +# to match the remainder of that string. _prefix can be empty, for +# a normal single or triple quoted string (with no prefix). +endpats = {} +for _prefix in _all_string_prefixes(): + endpats[_prefix + "'"] = Single + endpats[_prefix + '"'] = Double + endpats[_prefix + "'''"] = Single3 + endpats[_prefix + '"""'] = Double3 + +# A set of all of the single and triple quoted string prefixes, +# including the opening quotes. +single_quoted = set() +triple_quoted = set() +for t in _all_string_prefixes(): + for u in (t + '"', t + "'"): + single_quoted.add(u) + for u in (t + '"""', t + "'''"): + triple_quoted.add(u) tabsize = 8 @@ -626,6 +624,7 @@ def _tokenize(readline, encoding): yield stashed stashed = None yield TokenInfo(COMMENT, token, spos, epos, line) + elif token in triple_quoted: endprog = _compile(endpats[token]) endmatch = endprog.match(line, pos) @@ -638,19 +637,37 @@ def _tokenize(readline, encoding): contstr = line[start:] contline = line break - elif initial in single_quoted or \ - token[:2] in single_quoted or \ - token[:3] in single_quoted: + + # Check up to the first 3 chars of the token to see if + # they're in the single_quoted set. If so, they start + # a string. + # We're using the first 3, because we're looking for + # "rb'" (for example) at the start of the token. If + # we switch to longer prefixes, this needs to be + # adjusted. + # Note that initial == token[:1]. + # Also note that single quote checking must come after + # triple quote checking (above). + elif (initial in single_quoted or + token[:2] in single_quoted or + token[:3] in single_quoted): if token[-1] == '\n': # continued string strstart = (lnum, start) - endprog = _compile(endpats[initial] or - endpats[token[1]] or - endpats[token[2]]) + # Again, using the first 3 chars of the + # token. This is looking for the matching end + # regex for the correct type of quote + # character. So it's really looking for + # endpats["'"] or endpats['"'], by trying to + # skip string prefix characters, if any. + endprog = _compile(endpats.get(initial) or + endpats.get(token[1]) or + endpats.get(token[2])) contstr, needcont = line[start:], 1 contline = line break else: # ordinary string yield TokenInfo(STRING, token, spos, epos, line) + elif initial.isidentifier(): # ordinary name if token in ('async', 'await'): if async_def: diff --git a/Lib/trace.py b/Lib/trace.py index f108266..ae15461 100755 --- a/Lib/trace.py +++ b/Lib/trace.py @@ -48,6 +48,7 @@ Sample use, programmatically r.write_results(show_missing=True, coverdir="/tmp") """ __all__ = ['Trace', 'CoverageResults'] +import argparse import linecache import os import re @@ -58,7 +59,6 @@ import inspect import gc import dis import pickle -from warnings import warn as _warn from time import monotonic as _time try: @@ -77,51 +77,6 @@ else: sys.settrace(None) threading.settrace(None) -def _usage(outfile): - outfile.write("""Usage: %s [OPTIONS] [ARGS] - -Meta-options: ---help Display this help then exit. ---version Output version information then exit. - -Otherwise, exactly one of the following three options must be given: --t, --trace Print each line to sys.stdout before it is executed. --c, --count Count the number of times each line is executed - and write the counts to .cover for each - module executed, in the module's directory. - See also `--coverdir', `--file', `--no-report' below. --l, --listfuncs Keep track of which functions are executed at least - once and write the results to sys.stdout after the - program exits. --T, --trackcalls Keep track of caller/called pairs and write the - results to sys.stdout after the program exits. --r, --report Generate a report from a counts file; do not execute - any code. `--file' must specify the results file to - read, which must have been created in a previous run - with `--count --file=FILE'. - -Modifiers: --f, --file= File to accumulate counts over several runs. --R, --no-report Do not generate the coverage report files. - Useful if you want to accumulate over several runs. --C, --coverdir= Directory where the report files. The coverage - report for . is written to file - //.cover. --m, --missing Annotate executable lines that were not executed - with '>>>>>> '. --s, --summary Write a brief summary on stdout for each file. - (Can only be used with --count or --report.) --g, --timing Prefix each line with the time since the program started. - Only used while tracing. - -Filters, may be repeated multiple times: ---ignore-module= Ignore the given module(s) and its submodules - (if it is a package). Accepts comma separated - list of module names ---ignore-dir= Ignore files in the given directory (multiple - directories can be joined by os.pathsep). -""" % sys.argv[0]) - PRAGMA_NOCOVER = "#pragma NO COVER" # Simple rx to find lines with no code. @@ -265,7 +220,13 @@ class CoverageResults: def write_results(self, show_missing=True, summary=False, coverdir=None): """ - @param coverdir + Write the coverage results. + + :param show_missing: Show lines that had no hits. + :param summary: Include coverage summary per module. + :param coverdir: If None, the results of each module are placed in its + directory, otherwise it is included in the directory + specified. """ if self.calledfuncs: print() @@ -647,210 +608,135 @@ class Trace: calledfuncs=self._calledfuncs, callers=self._callers) -def _err_exit(msg): - sys.stderr.write("%s: %s\n" % (sys.argv[0], msg)) - sys.exit(1) - -def main(argv=None): - import getopt - - if argv is None: - argv = sys.argv +def main(): + + parser = argparse.ArgumentParser() + parser.add_argument('--version', action='version', version='trace 2.0') + + grp = parser.add_argument_group('Main options', + 'One of these (or --report) must be given') + + grp.add_argument('-c', '--count', action='store_true', + help='Count the number of times each line is executed and write ' + 'the counts to .cover for each module executed, in ' + 'the module\'s directory. See also --coverdir, --file, ' + '--no-report below.') + grp.add_argument('-t', '--trace', action='store_true', + help='Print each line to sys.stdout before it is executed') + grp.add_argument('-l', '--listfuncs', action='store_true', + help='Keep track of which functions are executed at least once ' + 'and write the results to sys.stdout after the program exits. ' + 'Cannot be specified alongside --trace or --count.') + grp.add_argument('-T', '--trackcalls', action='store_true', + help='Keep track of caller/called pairs and write the results to ' + 'sys.stdout after the program exits.') + + grp = parser.add_argument_group('Modifiers') + + _grp = grp.add_mutually_exclusive_group() + _grp.add_argument('-r', '--report', action='store_true', + help='Generate a report from a counts file; does not execute any ' + 'code. --file must specify the results file to read, which ' + 'must have been created in a previous run with --count ' + '--file=FILE') + _grp.add_argument('-R', '--no-report', action='store_true', + help='Do not generate the coverage report files. ' + 'Useful if you want to accumulate over several runs.') + + grp.add_argument('-f', '--file', + help='File to accumulate counts over several runs') + grp.add_argument('-C', '--coverdir', + help='Directory where the report files go. The coverage report ' + 'for . will be written to file ' + '//.cover') + grp.add_argument('-m', '--missing', action='store_true', + help='Annotate executable lines that were not executed with ' + '">>>>>> "') + grp.add_argument('-s', '--summary', action='store_true', + help='Write a brief summary for each file to sys.stdout. ' + 'Can only be used with --count or --report') + grp.add_argument('-g', '--timing', action='store_true', + help='Prefix each line with the time since the program started. ' + 'Only used while tracing') + + grp = parser.add_argument_group('Filters', + 'Can be specified multiple times') + grp.add_argument('--ignore-module', action='append', default=[], + help='Ignore the given module(s) and its submodules' + '(if it is a package). Accepts comma separated list of ' + 'module names.') + grp.add_argument('--ignore-dir', action='append', default=[], + help='Ignore files in the given directory ' + '(multiple directories can be joined by os.pathsep).') + + parser.add_argument('filename', nargs='?', + help='file to run as main program') + parser.add_argument('arguments', nargs=argparse.REMAINDER, + help='arguments to the program') + + opts = parser.parse_args() + + if opts.ignore_dir: + rel_path = 'lib', 'python{0.major}.{0.minor}'.format(sys.version_info) + _prefix = os.path.join(sys.base_prefix, *rel_path) + _exec_prefix = os.path.join(sys.base_exec_prefix, *rel_path) + + def parse_ignore_dir(s): + s = os.path.expanduser(os.path.expandvars(s)) + s = s.replace('$prefix', _prefix).replace('$exec_prefix', _exec_prefix) + return os.path.normpath(s) + + opts.ignore_module = [mod.strip() + for i in opts.ignore_module for mod in i.split(',')] + opts.ignore_dir = [parse_ignore_dir(s) + for i in opts.ignore_dir for s in i.split(os.pathsep)] + + if opts.report: + if not opts.file: + parser.error('-r/--report requires -f/--file') + results = CoverageResults(infile=opts.file, outfile=opts.file) + return results.write_results(opts.missing, opts.summary, opts.coverdir) + + if not any([opts.trace, opts.count, opts.listfuncs, opts.trackcalls]): + parser.error('must specify one of --trace, --count, --report, ' + '--listfuncs, or --trackcalls') + + if opts.listfuncs and (opts.count or opts.trace): + parser.error('cannot specify both --listfuncs and (--trace or --count)') + + if opts.summary and not opts.count: + parser.error('--summary can only be used with --count or --report') + + if opts.filename is None: + parser.error('filename is missing: required with the main options') + + sys.argv = opts.filename, *opts.arguments + sys.path[0] = os.path.dirname(opts.filename) + + t = Trace(opts.count, opts.trace, countfuncs=opts.listfuncs, + countcallers=opts.trackcalls, ignoremods=opts.ignore_module, + ignoredirs=opts.ignore_dir, infile=opts.file, + outfile=opts.file, timing=opts.timing) try: - opts, prog_argv = getopt.getopt(argv[1:], "tcrRf:d:msC:lTg", - ["help", "version", "trace", "count", - "report", "no-report", "summary", - "file=", "missing", - "ignore-module=", "ignore-dir=", - "coverdir=", "listfuncs", - "trackcalls", "timing"]) - - except getopt.error as msg: - sys.stderr.write("%s: %s\n" % (sys.argv[0], msg)) - sys.stderr.write("Try `%s --help' for more information\n" - % sys.argv[0]) - sys.exit(1) - - trace = 0 - count = 0 - report = 0 - no_report = 0 - counts_file = None - missing = 0 - ignore_modules = [] - ignore_dirs = [] - coverdir = None - summary = 0 - listfuncs = False - countcallers = False - timing = False - - for opt, val in opts: - if opt == "--help": - _usage(sys.stdout) - sys.exit(0) - - if opt == "--version": - sys.stdout.write("trace 2.0\n") - sys.exit(0) - - if opt == "-T" or opt == "--trackcalls": - countcallers = True - continue - - if opt == "-l" or opt == "--listfuncs": - listfuncs = True - continue - - if opt == "-g" or opt == "--timing": - timing = True - continue - - if opt == "-t" or opt == "--trace": - trace = 1 - continue - - if opt == "-c" or opt == "--count": - count = 1 - continue - - if opt == "-r" or opt == "--report": - report = 1 - continue - - if opt == "-R" or opt == "--no-report": - no_report = 1 - continue - - if opt == "-f" or opt == "--file": - counts_file = val - continue - - if opt == "-m" or opt == "--missing": - missing = 1 - continue - - if opt == "-C" or opt == "--coverdir": - coverdir = val - continue - - if opt == "-s" or opt == "--summary": - summary = 1 - continue - - if opt == "--ignore-module": - for mod in val.split(","): - ignore_modules.append(mod.strip()) - continue - - if opt == "--ignore-dir": - for s in val.split(os.pathsep): - s = os.path.expandvars(s) - # should I also call expanduser? (after all, could use $HOME) - - s = s.replace("$prefix", - os.path.join(sys.base_prefix, "lib", - "python" + sys.version[:3])) - s = s.replace("$exec_prefix", - os.path.join(sys.base_exec_prefix, "lib", - "python" + sys.version[:3])) - s = os.path.normpath(s) - ignore_dirs.append(s) - continue - - assert 0, "Should never get here" - - if listfuncs and (count or trace): - _err_exit("cannot specify both --listfuncs and (--trace or --count)") - - if not (count or trace or report or listfuncs or countcallers): - _err_exit("must specify one of --trace, --count, --report, " - "--listfuncs, or --trackcalls") - - if report and no_report: - _err_exit("cannot specify both --report and --no-report") - - if report and not counts_file: - _err_exit("--report requires a --file") - - if no_report and len(prog_argv) == 0: - _err_exit("missing name of file to run") - - # everything is ready - if report: - results = CoverageResults(infile=counts_file, outfile=counts_file) - results.write_results(missing, summary=summary, coverdir=coverdir) - else: - sys.argv = prog_argv - progname = prog_argv[0] - sys.path[0] = os.path.split(progname)[0] - - t = Trace(count, trace, countfuncs=listfuncs, - countcallers=countcallers, ignoremods=ignore_modules, - ignoredirs=ignore_dirs, infile=counts_file, - outfile=counts_file, timing=timing) - try: - with open(progname) as fp: - code = compile(fp.read(), progname, 'exec') - # try to emulate __main__ namespace as much as possible - globs = { - '__file__': progname, - '__name__': '__main__', - '__package__': None, - '__cached__': None, - } - t.runctx(code, globs, globs) - except OSError as err: - _err_exit("Cannot run file %r because: %s" % (sys.argv[0], err)) - except SystemExit: - pass - - results = t.results() - - if not no_report: - results.write_results(missing, summary=summary, coverdir=coverdir) - -# Deprecated API -def usage(outfile): - _warn("The trace.usage() function is deprecated", - DeprecationWarning, 2) - _usage(outfile) - -class Ignore(_Ignore): - def __init__(self, modules=None, dirs=None): - _warn("The class trace.Ignore is deprecated", - DeprecationWarning, 2) - _Ignore.__init__(self, modules, dirs) - -def modname(path): - _warn("The trace.modname() function is deprecated", - DeprecationWarning, 2) - return _modname(path) - -def fullmodname(path): - _warn("The trace.fullmodname() function is deprecated", - DeprecationWarning, 2) - return _fullmodname(path) - -def find_lines_from_code(code, strs): - _warn("The trace.find_lines_from_code() function is deprecated", - DeprecationWarning, 2) - return _find_lines_from_code(code, strs) - -def find_lines(code, strs): - _warn("The trace.find_lines() function is deprecated", - DeprecationWarning, 2) - return _find_lines(code, strs) + with open(opts.filename) as fp: + code = compile(fp.read(), opts.filename, 'exec') + # try to emulate __main__ namespace as much as possible + globs = { + '__file__': opts.filename, + '__name__': '__main__', + '__package__': None, + '__cached__': None, + } + t.runctx(code, globs, globs) + except OSError as err: + sys.exit("Cannot run file %r because: %s" % (sys.argv[0], err)) + except SystemExit: + pass -def find_strings(filename, encoding=None): - _warn("The trace.find_strings() function is deprecated", - DeprecationWarning, 2) - return _find_strings(filename, encoding=None) + results = t.results() -def find_executable_linenos(filename): - _warn("The trace.find_executable_linenos() function is deprecated", - DeprecationWarning, 2) - return _find_executable_linenos(filename) + if not opts.no_report: + results.write_results(opts.missing, opts.summary, opts.coverdir) if __name__=='__main__': main() diff --git a/Lib/traceback.py b/Lib/traceback.py index c5fd617..09bda71 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -385,9 +385,30 @@ class StackSummary(list): resulting list corresponds to a single frame from the stack. Each string ends in a newline; the strings may contain internal newlines as well, for those items with source text lines. + + For long sequences of the same frame and line, the first few + repetitions are shown, followed by a summary line stating the exact + number of further repetitions. """ result = [] + last_file = None + last_line = None + last_name = None + count = 0 for frame in self: + if (last_file is not None and last_file == frame.filename and + last_line is not None and last_line == frame.lineno and + last_name is not None and last_name == frame.name): + count += 1 + else: + if count > 3: + result.append(f' [Previous line repeated {count-3} more times]\n') + last_file = frame.filename + last_line = frame.lineno + last_name = frame.name + count = 0 + if count >= 3: + continue row = [] row.append(' File "{}", line {}, in {}\n'.format( frame.filename, frame.lineno, frame.name)) @@ -397,6 +418,8 @@ class StackSummary(list): for name, value in sorted(frame.locals.items()): row.append(' {name} = {value}\n'.format(name=name, value=value)) result.append(''.join(row)) + if count > 3: + result.append(f' [Previous line repeated {count-3} more times]\n') return result @@ -487,10 +510,9 @@ class TracebackException: self._load_lines() @classmethod - def from_exception(self, exc, *args, **kwargs): + def from_exception(cls, exc, *args, **kwargs): """Create a TracebackException from an exception.""" - return TracebackException( - type(exc), exc, exc.__traceback__, *args, **kwargs) + return cls(type(exc), exc, exc.__traceback__, *args, **kwargs) def _load_lines(self): """Private API. force all lines in the stack to be loaded.""" diff --git a/Lib/tracemalloc.py b/Lib/tracemalloc.py index 6288da8..75b3918 100644 --- a/Lib/tracemalloc.py +++ b/Lib/tracemalloc.py @@ -244,17 +244,21 @@ class Trace: __slots__ = ("_trace",) def __init__(self, trace): - # trace is a tuple: (size, traceback), see Traceback constructor - # for the format of the traceback tuple + # trace is a tuple: (domain: int, size: int, traceback: tuple). + # See Traceback constructor for the format of the traceback tuple. self._trace = trace @property - def size(self): + def domain(self): return self._trace[0] @property + def size(self): + return self._trace[1] + + @property def traceback(self): - return Traceback(self._trace[1]) + return Traceback(self._trace[2]) def __eq__(self, other): return (self._trace == other._trace) @@ -266,8 +270,8 @@ class Trace: return "%s: %s" % (self.traceback, _format_size(self.size, False)) def __repr__(self): - return ("" - % (_format_size(self.size, False), self.traceback)) + return ("" + % (self.domain, _format_size(self.size, False), self.traceback)) class _Traces(Sequence): @@ -302,19 +306,29 @@ def _normalize_filename(filename): return filename -class Filter: +class BaseFilter: + def __init__(self, inclusive): + self.inclusive = inclusive + + def _match(self, trace): + raise NotImplementedError + + +class Filter(BaseFilter): def __init__(self, inclusive, filename_pattern, - lineno=None, all_frames=False): + lineno=None, all_frames=False, domain=None): + super().__init__(inclusive) self.inclusive = inclusive self._filename_pattern = _normalize_filename(filename_pattern) self.lineno = lineno self.all_frames = all_frames + self.domain = domain @property def filename_pattern(self): return self._filename_pattern - def __match_frame(self, filename, lineno): + def _match_frame_impl(self, filename, lineno): filename = _normalize_filename(filename) if not fnmatch.fnmatch(filename, self._filename_pattern): return False @@ -324,11 +338,11 @@ class Filter: return (lineno == self.lineno) def _match_frame(self, filename, lineno): - return self.__match_frame(filename, lineno) ^ (not self.inclusive) + return self._match_frame_impl(filename, lineno) ^ (not self.inclusive) def _match_traceback(self, traceback): if self.all_frames: - if any(self.__match_frame(filename, lineno) + if any(self._match_frame_impl(filename, lineno) for filename, lineno in traceback): return self.inclusive else: @@ -337,6 +351,30 @@ class Filter: filename, lineno = traceback[0] return self._match_frame(filename, lineno) + def _match(self, trace): + domain, size, traceback = trace + res = self._match_traceback(traceback) + if self.domain is not None: + if self.inclusive: + return res and (domain == self.domain) + else: + return res or (domain != self.domain) + return res + + +class DomainFilter(BaseFilter): + def __init__(self, inclusive, domain): + super().__init__(inclusive) + self._domain = domain + + @property + def domain(self): + return self._domain + + def _match(self, trace): + domain, size, traceback = trace + return (domain == self.domain) ^ (not self.inclusive) + class Snapshot: """ @@ -365,13 +403,12 @@ class Snapshot: return pickle.load(fp) def _filter_trace(self, include_filters, exclude_filters, trace): - traceback = trace[1] if include_filters: - if not any(trace_filter._match_traceback(traceback) + if not any(trace_filter._match(trace) for trace_filter in include_filters): return False if exclude_filters: - if any(not trace_filter._match_traceback(traceback) + if any(not trace_filter._match(trace) for trace_filter in exclude_filters): return False return True @@ -379,8 +416,8 @@ class Snapshot: def filter_traces(self, filters): """ Create a new Snapshot instance with a filtered traces sequence, filters - is a list of Filter instances. If filters is an empty list, return a - new Snapshot instance with a copy of the traces. + is a list of Filter or DomainFilter instances. If filters is an empty + list, return a new Snapshot instance with a copy of the traces. """ if not isinstance(filters, Iterable): raise TypeError("filters must be a list of filters, not %s" @@ -412,7 +449,7 @@ class Snapshot: tracebacks = {} if not cumulative: for trace in self.traces._traces: - size, trace_traceback = trace + domain, size, trace_traceback = trace try: traceback = tracebacks[trace_traceback] except KeyError: @@ -433,7 +470,7 @@ class Snapshot: else: # cumulative statistics for trace in self.traces._traces: - size, trace_traceback = trace + domain, size, trace_traceback = trace for frame in trace_traceback: try: traceback = tracebacks[frame] diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index 711d0ab..0a58332 100644 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -89,13 +89,12 @@ import sys import os from tkinter import * -from idlelib.ColorDelegator import ColorDelegator, color_config -from idlelib.Percolator import Percolator -from idlelib.textView import view_text +from idlelib.colorizer import ColorDelegator, color_config +from idlelib.percolator import Percolator +from idlelib.textview import view_text from turtledemo import __doc__ as about_turtledemo import turtle -import time demo_dir = os.path.dirname(os.path.abspath(__file__)) darwin = sys.platform == 'darwin' diff --git a/Lib/turtledemo/bytedesign.py b/Lib/turtledemo/bytedesign.py index 64b1d7d..b3b095b 100755 --- a/Lib/turtledemo/bytedesign.py +++ b/Lib/turtledemo/bytedesign.py @@ -22,7 +22,6 @@ to 0, this animation runs in "line per line" mode as fast as possible. """ -import math from turtle import Turtle, mainloop from time import clock diff --git a/Lib/turtledemo/planet_and_moon.py b/Lib/turtledemo/planet_and_moon.py index 26abfdb..021ff99 100755 --- a/Lib/turtledemo/planet_and_moon.py +++ b/Lib/turtledemo/planet_and_moon.py @@ -18,7 +18,6 @@ mouse over the scrollbar of the canvas. """ from turtle import Shape, Turtle, mainloop, Vec2D as Vec -from time import sleep G = 8 diff --git a/Lib/types.py b/Lib/types.py index 48891cd..d8d8470 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -24,6 +24,11 @@ _c = _c() CoroutineType = type(_c) _c.close() # Prevent ResourceWarning +async def _ag(): + yield +_ag = _ag() +AsyncGeneratorType = type(_ag) + class _C: def _m(self): pass MethodType = type(_C()._m) diff --git a/Lib/typing.py b/Lib/typing.py index c487afc..34845b7 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -10,14 +10,6 @@ try: import collections.abc as collections_abc except ImportError: import collections as collections_abc # Fallback for PY3.2. -if sys.version_info[:2] >= (3, 6): - import _collections_abc # Needed for private function _check_methods # noqa -try: - from types import WrapperDescriptorType, MethodWrapperType, MethodDescriptorType -except ImportError: - WrapperDescriptorType = type(object.__init__) - MethodWrapperType = type(object().__str__) - MethodDescriptorType = type(str.join) # Please keep __all__ alphabetized within each category. @@ -35,11 +27,8 @@ __all__ = [ # ABCs (from collections.abc). 'AbstractSet', # collections.abc.Set. - 'GenericMeta', # subclass of abc.ABCMeta and a metaclass - # for 'Generic' and ABCs below. 'ByteString', 'Container', - 'ContextManager', 'Hashable', 'ItemsView', 'Iterable', @@ -60,21 +49,16 @@ __all__ = [ # AsyncIterable, # Coroutine, # Collection, - # AsyncGenerator, - # AsyncContextManager + # ContextManager # Structural checks, a.k.a. protocols. 'Reversible', 'SupportsAbs', - 'SupportsBytes', - 'SupportsComplex', 'SupportsFloat', 'SupportsInt', 'SupportsRound', # Concrete collection types. - 'Counter', - 'Deque', 'Dict', 'DefaultDict', 'List', @@ -109,8 +93,8 @@ def _qualname(x): def _trim_name(nm): - whitelist = ('_TypeAlias', '_ForwardRef', '_TypingBase', '_FinalTypingBase') - if nm.startswith('_') and nm not in whitelist: + if nm.startswith('_') and nm not in ('_TypeAlias', + '_ForwardRef', '_TypingBase', '_FinalTypingBase'): nm = nm[1:] return nm @@ -160,7 +144,7 @@ class TypingMeta(type): class _TypingBase(metaclass=TypingMeta, _root=True): """Internal indicator of special typing constructs.""" - __slots__ = ('__weakref__',) + __slots__ = () def __init__(self, *args, **kwds): pass @@ -367,17 +351,13 @@ def _type_check(arg, msg): return type(None) if isinstance(arg, str): arg = _ForwardRef(arg) - if ( - isinstance(arg, _TypingBase) and type(arg).__name__ == '_ClassVar' or - not isinstance(arg, (type, _TypingBase)) and not callable(arg) - ): + if (isinstance(arg, _TypingBase) and type(arg).__name__ == '_ClassVar' or + not isinstance(arg, (type, _TypingBase)) and not callable(arg)): raise TypeError(msg + " Got %.100r." % (arg,)) # Bare Union etc. are not valid as type arguments - if ( - type(arg).__name__ in ('_Union', '_Optional') and - not getattr(arg, '__origin__', None) or - isinstance(arg, TypingMeta) and _gorg(arg) in (Generic, _Protocol) - ): + if (type(arg).__name__ in ('_Union', '_Optional') + and not getattr(arg, '__origin__', None) + or isinstance(arg, TypingMeta) and _gorg(arg) in (Generic, _Protocol)): raise TypeError("Plain %s is not valid as type argument" % arg) return arg @@ -425,31 +405,6 @@ class _Any(_FinalTypingBase, _root=True): Any = _Any(_root=True) -class _NoReturn(_FinalTypingBase, _root=True): - """Special type indicating functions that never return. - Example:: - - from typing import NoReturn - - def stop() -> NoReturn: - raise Exception('no way') - - This type is invalid in other positions, e.g., ``List[NoReturn]`` - will fail in static type checkers. - """ - - __slots__ = () - - def __instancecheck__(self, obj): - raise TypeError("NoReturn cannot be used with isinstance().") - - def __subclasscheck__(self, cls): - raise TypeError("NoReturn cannot be used with issubclass().") - - -NoReturn = _NoReturn(_root=True) - - class TypeVar(_TypingBase, _root=True): """Type variable. @@ -496,7 +451,7 @@ class TypeVar(_TypingBase, _root=True): '__covariant__', '__contravariant__') def __init__(self, name, *constraints, bound=None, - covariant=False, contravariant=False): + covariant=False, contravariant=False): super().__init__(name, *constraints, bound=bound, covariant=covariant, contravariant=contravariant) self.__name__ = name @@ -558,7 +513,7 @@ def _replace_arg(arg, tvars, args): if tvars is None: tvars = [] - if hasattr(arg, '_subs_tree') and isinstance(arg, (GenericMeta, _TypingBase)): + if hasattr(arg, '_subs_tree'): return arg._subs_tree(tvars, args) if isinstance(arg, TypeVar): for i, tvar in enumerate(tvars): @@ -567,16 +522,6 @@ def _replace_arg(arg, tvars, args): return arg -# Special typing constructs Union, Optional, Generic, Callable and Tuple -# use three special attributes for internal bookkeeping of generic types: -# * __parameters__ is a tuple of unique free type parameters of a generic -# type, for example, Dict[T, T].__parameters__ == (T,); -# * __origin__ keeps a reference to a type that was subscripted, -# e.g., Union[T, int].__origin__ == Union; -# * __args__ is a tuple of all arguments used in subscripting, -# e.g., Dict[T, int].__args__ == (T, int). - - def _subs_tree(cls, tvars=None, args=None): """An internal helper function: calculate substitution tree for generic cls after replacing its type parameters with @@ -604,7 +549,7 @@ def _subs_tree(cls, tvars=None, args=None): # ... then continue replacing down the origin chain. for ocls in orig_chain: new_tree_args = [] - for arg in ocls.__args__: + for i, arg in enumerate(ocls.__args__): new_tree_args.append(_replace_arg(arg, ocls.__parameters__, tree_args)) tree_args = new_tree_args return tree_args @@ -672,7 +617,6 @@ def _tp_cache(func): cached = functools.lru_cache()(func) _cleanups.append(cached.cache_clear) - @functools.wraps(func) def inner(*args, **kwds): try: @@ -812,12 +756,9 @@ class _Union(_FinalTypingBase, _root=True): return (Union,) + tree_args def __eq__(self, other): - if isinstance(other, _Union): - return self.__tree_hash__ == other.__tree_hash__ - elif self is not Union: + if not isinstance(other, _Union): return self._subs_tree() == other - else: - return self is other + return self.__tree_hash__ == other.__tree_hash__ def __hash__(self): return self.__tree_hash__ @@ -882,10 +823,21 @@ def _next_in_mro(cls): # Look for the last occurrence of Generic or Generic[...]. for i, c in enumerate(cls.__mro__[:-1]): if isinstance(c, GenericMeta) and _gorg(c) is Generic: - next_in_mro = cls.__mro__[i + 1] + next_in_mro = cls.__mro__[i+1] return next_in_mro +def _valid_for_check(cls): + """An internal helper to prohibit isinstance([1], List[str]) etc.""" + if cls is Generic: + raise TypeError("Class %r cannot be used with class " + "or instance checks" % cls) + if (cls.__origin__ is not None and + sys._getframe(3).f_globals['__name__'] not in ['abc', 'functools']): + raise TypeError("Parameterized generics cannot be used with class " + "or instance checks") + + def _make_subclasshook(cls): """Construct a __subclasshook__ callable that incorporates the associated __extra__ class in subclass checks performed @@ -896,6 +848,7 @@ def _make_subclasshook(cls): # Registered classes need not be checked here because # cls and its extra share the same _abc_registry. def __extrahook__(subclass): + _valid_for_check(cls) res = cls.__extra__.__subclasshook__(subclass) if res is not NotImplemented: return res @@ -910,6 +863,7 @@ def _make_subclasshook(cls): else: # For non-ABC extras we'll just call issubclass(). def __extrahook__(subclass): + _valid_for_check(cls) if cls.__extra__ and issubclass(subclass, cls.__extra__): return True return NotImplemented @@ -928,26 +882,10 @@ def _no_slots_copy(dct): class GenericMeta(TypingMeta, abc.ABCMeta): - """Metaclass for generic types. - - This is a metaclass for typing.Generic and generic ABCs defined in - typing module. User defined subclasses of GenericMeta can override - __new__ and invoke super().__new__. Note that GenericMeta.__new__ - has strict rules on what is allowed in its bases argument: - * plain Generic is disallowed in bases; - * Generic[...] should appear in bases at most once; - * if Generic[...] is present, then it should list all type variables - that appear in other bases. - In addition, type of all generic bases is erased, e.g., C[int] is - stripped to plain C. - """ + """Metaclass for generic types.""" def __new__(cls, name, bases, namespace, tvars=None, args=None, origin=None, extra=None, orig_bases=None): - """Create a new generic class. GenericMeta.__new__ accepts - keyword arguments that are used for internal bookkeeping, therefore - an override should pass unused keyword arguments to super(). - """ if tvars is not None: # Called from __getitem__() below. assert origin is not None @@ -996,7 +934,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta): # remove bare Generic from bases if there are other generic bases if any(isinstance(b, GenericMeta) and b is not Generic for b in bases): bases = tuple(b for b in bases if b is not Generic) - namespace.update({'__origin__': origin, '__extra__': extra}) self = super().__new__(cls, name, bases, namespace, _root=True) self.__parameters__ = tvars @@ -1005,6 +942,8 @@ class GenericMeta(TypingMeta, abc.ABCMeta): self.__args__ = tuple(... if a is _TypingEllipsis else () if a is _TypingEmpty else a for a in args) if args else None + self.__origin__ = origin + self.__extra__ = extra # Speed hack (https://github.com/python/typing/issues/196). self.__next_in_mro__ = _next_in_mro(self) # Preserve base classes on subclassing (__bases__ are type erased now). @@ -1014,57 +953,18 @@ class GenericMeta(TypingMeta, abc.ABCMeta): # This allows unparameterized generic collections to be used # with issubclass() and isinstance() in the same way as their # collections.abc counterparts (e.g., isinstance([], Iterable)). - if ( - '__subclasshook__' not in namespace and extra or - # allow overriding - getattr(self.__subclasshook__, '__name__', '') == '__extrahook__' - ): + if ('__subclasshook__' not in namespace and extra # allow overriding + or hasattr(self.__subclasshook__, '__name__') and + self.__subclasshook__.__name__ == '__extrahook__'): self.__subclasshook__ = _make_subclasshook(self) if isinstance(extra, abc.ABCMeta): self._abc_registry = extra._abc_registry - self._abc_cache = extra._abc_cache - elif origin is not None: - self._abc_registry = origin._abc_registry - self._abc_cache = origin._abc_cache if origin and hasattr(origin, '__qualname__'): # Fix for Python 3.2. self.__qualname__ = origin.__qualname__ - self.__tree_hash__ = (hash(self._subs_tree()) if origin else - super(GenericMeta, self).__hash__()) + self.__tree_hash__ = hash(self._subs_tree()) if origin else hash((self.__name__,)) return self - # _abc_negative_cache and _abc_negative_cache_version - # realised as descriptors, since GenClass[t1, t2, ...] always - # share subclass info with GenClass. - # This is an important memory optimization. - @property - def _abc_negative_cache(self): - if isinstance(self.__extra__, abc.ABCMeta): - return self.__extra__._abc_negative_cache - return _gorg(self)._abc_generic_negative_cache - - @_abc_negative_cache.setter - def _abc_negative_cache(self, value): - if self.__origin__ is None: - if isinstance(self.__extra__, abc.ABCMeta): - self.__extra__._abc_negative_cache = value - else: - self._abc_generic_negative_cache = value - - @property - def _abc_negative_cache_version(self): - if isinstance(self.__extra__, abc.ABCMeta): - return self.__extra__._abc_negative_cache_version - return _gorg(self)._abc_generic_negative_cache_version - - @_abc_negative_cache_version.setter - def _abc_negative_cache_version(self, value): - if self.__origin__ is None: - if isinstance(self.__extra__, abc.ABCMeta): - self.__extra__._abc_negative_cache_version = value - else: - self._abc_generic_negative_cache_version = value - def _get_type_vars(self, tvars): if self.__origin__ and self.__parameters__: _get_type_vars(self.__parameters__, tvars) @@ -1152,10 +1052,8 @@ class GenericMeta(TypingMeta, abc.ABCMeta): _check_generic(self, params) tvars = _type_vars(params) args = params - - prepend = (self,) if self.__origin__ is None else () return self.__class__(self.__name__, - prepend + self.__bases__, + self.__bases__, _no_slots_copy(self.__dict__), tvars=tvars, args=args, @@ -1163,17 +1061,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta): extra=self.__extra__, orig_bases=self.__orig_bases__) - def __subclasscheck__(self, cls): - if self.__origin__ is not None: - if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools']: - raise TypeError("Parameterized generics cannot be used with class " - "or instance checks") - return False - if self is Generic: - raise TypeError("Class %r cannot be used with class " - "or instance checks" % self) - return super().__subclasscheck__(cls) - def __instancecheck__(self, instance): # Since we extend ABC.__subclasscheck__ and # ABC.__instancecheck__ inlines the cache checking done by the @@ -1188,16 +1075,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta): self.__parameters__, self.__args__, self.__origin__, self.__extra__, self.__orig_bases__) - def __setattr__(self, attr, value): - # We consider all the subscripted genrics as proxies for original class - if ( - attr.startswith('__') and attr.endswith('__') or - attr.startswith('_abc_') - ): - super(GenericMeta, self).__setattr__(attr, value) - else: - super(GenericMeta, _gorg(self)).__setattr__(attr, value) - # Prevent checks for Generic to crash when defining Generic. Generic = None @@ -1282,13 +1159,13 @@ class TupleMeta(GenericMeta): return super().__getitem__(parameters) def __instancecheck__(self, obj): - if self.__args__ is None: + if self.__args__ == None: return isinstance(obj, tuple) raise TypeError("Parameterized Tuple cannot be used " "with isinstance().") def __subclasscheck__(self, cls): - if self.__args__ is None: + if self.__args__ == None: return issubclass(cls, tuple) raise TypeError("Parameterized Tuple cannot be used " "with issubclass().") @@ -1342,7 +1219,7 @@ class CallableMeta(GenericMeta): with hashable arguments to improve speed. """ - if self.__origin__ is not None or not _geqv(self, Callable): + if self.__origin__ is not None or not _geqv(self, Callable): return super().__getitem__(parameters) if not isinstance(parameters, tuple) or len(parameters) != 2: raise TypeError("Callable must be used as " @@ -1370,7 +1247,7 @@ class CallableMeta(GenericMeta): return super().__getitem__(parameters) -class Callable(extra=collections_abc.Callable, metaclass=CallableMeta): +class Callable(extra=collections_abc.Callable, metaclass = CallableMeta): """Callable type; Callable[[int], str] is a function of (int) -> str. The subscription syntax must always be used with exactly two @@ -1478,11 +1355,6 @@ def _get_defaults(func): return res -_allowed_types = (types.FunctionType, types.BuiltinFunctionType, - types.MethodType, types.ModuleType, - WrapperDescriptorType, MethodWrapperType, MethodDescriptorType) - - def get_type_hints(obj, globalns=None, localns=None): """Return type hints for an object. @@ -1537,7 +1409,10 @@ def get_type_hints(obj, globalns=None, localns=None): hints = getattr(obj, '__annotations__', None) if hints is None: # Return empty annotations for something that _could_ have them. - if isinstance(obj, _allowed_types): + if (isinstance(obj, types.FunctionType) or + isinstance(obj, types.BuiltinFunctionType) or + isinstance(obj, types.MethodType) or + isinstance(obj, types.ModuleType)): return {} else: raise TypeError('{!r} is not a module, class, method, ' @@ -1577,7 +1452,7 @@ def no_type_check(arg): no_type_check(obj) try: arg.__no_type_check__ = True - except TypeError: # built-in classes + except TypeError: # built-in classes pass return arg @@ -1863,15 +1738,14 @@ else: class MutableMapping(Mapping[KT, VT], extra=collections_abc.MutableMapping): __slots__ = () - if hasattr(collections_abc, 'Reversible'): if hasattr(collections_abc, 'Collection'): class Sequence(Reversible[T_co], Collection[T_co], - extra=collections_abc.Sequence): + extra=collections_abc.Sequence): __slots__ = () else: class Sequence(Sized, Reversible[T_co], Container[T_co], - extra=collections_abc.Sequence): + extra=collections_abc.Sequence): __slots__ = () else: class Sequence(Sized, Iterable[T_co], Container[T_co], @@ -1898,16 +1772,6 @@ class List(list, MutableSequence[T], extra=list): return _generic_new(list, cls, *args, **kwds) -class Deque(collections.deque, MutableSequence[T], extra=collections.deque): - - __slots__ = () - - def __new__(cls, *args, **kwds): - if _geqv(cls, Deque): - return collections.deque(*args, **kwds) - return _generic_new(collections.deque, cls, *args, **kwds) - - class Set(set, MutableSet[T], extra=set): __slots__ = () @@ -1952,61 +1816,7 @@ class ValuesView(MappingView[VT_co], extra=collections_abc.ValuesView): if hasattr(contextlib, 'AbstractContextManager'): class ContextManager(Generic[T_co], extra=contextlib.AbstractContextManager): __slots__ = () -else: - class ContextManager(Generic[T_co]): - __slots__ = () - - def __enter__(self): - return self - - @abc.abstractmethod - def __exit__(self, exc_type, exc_value, traceback): - return None - - @classmethod - def __subclasshook__(cls, C): - if cls is ContextManager: - # In Python 3.6+, it is possible to set a method to None to - # explicitly indicate that the class does not implement an ABC - # (https://bugs.python.org/issue25958), but we do not support - # that pattern here because this fallback class is only used - # in Python 3.5 and earlier. - if (any("__enter__" in B.__dict__ for B in C.__mro__) and - any("__exit__" in B.__dict__ for B in C.__mro__)): - return True - return NotImplemented - - -if hasattr(contextlib, 'AbstractAsyncContextManager'): - class AsyncContextManager(Generic[T_co], - extra=contextlib.AbstractAsyncContextManager): - __slots__ = () - - __all__.append('AsyncContextManager') -elif sys.version_info[:2] >= (3, 5): - exec(""" -class AsyncContextManager(Generic[T_co]): - __slots__ = () - - async def __aenter__(self): - return self - - @abc.abstractmethod - async def __aexit__(self, exc_type, exc_value, traceback): - return None - - @classmethod - def __subclasshook__(cls, C): - if cls is AsyncContextManager: - if sys.version_info[:2] >= (3, 6): - return _collections_abc._check_methods(C, "__aenter__", "__aexit__") - if (any("__aenter__" in B.__dict__ for B in C.__mro__) and - any("__aexit__" in B.__dict__ for B in C.__mro__)): - return True - return NotImplemented - -__all__.append('AsyncContextManager') -""") + __all__.append('ContextManager') class Dict(dict, MutableMapping[KT, VT], extra=dict): @@ -2019,7 +1829,6 @@ class Dict(dict, MutableMapping[KT, VT], extra=dict): "use dict() instead") return _generic_new(dict, cls, *args, **kwds) - class DefaultDict(collections.defaultdict, MutableMapping[KT, VT], extra=collections.defaultdict): @@ -2027,35 +1836,10 @@ class DefaultDict(collections.defaultdict, MutableMapping[KT, VT], def __new__(cls, *args, **kwds): if _geqv(cls, DefaultDict): - return collections.defaultdict(*args, **kwds) + raise TypeError("Type DefaultDict cannot be instantiated; " + "use collections.defaultdict() instead") return _generic_new(collections.defaultdict, cls, *args, **kwds) - -class Counter(collections.Counter, Dict[T, int], extra=collections.Counter): - - __slots__ = () - - def __new__(cls, *args, **kwds): - if _geqv(cls, Counter): - return collections.Counter(*args, **kwds) - return _generic_new(collections.Counter, cls, *args, **kwds) - - -if hasattr(collections, 'ChainMap'): - # ChainMap only exists in 3.3+ - __all__.append('ChainMap') - - class ChainMap(collections.ChainMap, MutableMapping[KT, VT], - extra=collections.ChainMap): - - __slots__ = () - - def __new__(cls, *args, **kwds): - if _geqv(cls, ChainMap): - return collections.ChainMap(*args, **kwds) - return _generic_new(collections.ChainMap, cls, *args, **kwds) - - # Determine what base class to use for Generator. if hasattr(collections_abc, 'Generator'): # Sufficiently recent versions of 3.5 have a Generator ABC. @@ -2076,14 +1860,6 @@ class Generator(Iterator[T_co], Generic[T_co, T_contra, V_co], return _generic_new(_G_base, cls, *args, **kwds) -if hasattr(collections_abc, 'AsyncGenerator'): - class AsyncGenerator(AsyncIterator[T_co], Generic[T_co, T_contra], - extra=collections_abc.AsyncGenerator): - __slots__ = () - - __all__.append('AsyncGenerator') - - # Internal type variable used for Type[]. CT_co = TypeVar('CT_co', covariant=True, bound=type) @@ -2120,9 +1896,7 @@ def _make_nmtuple(name, types): msg = "NamedTuple('Name', [(f0, t0), (f1, t1), ...]); each t must be a type" types = [(n, _type_check(t, msg)) for n, t in types] nm_tpl = collections.namedtuple(name, [n for n, t in types]) - # Prior to PEP 526, only _field_types attribute was assigned. - # Now, both __annotations__ and _field_types are used to maintain compatibility. - nm_tpl.__annotations__ = nm_tpl._field_types = collections.OrderedDict(types) + nm_tpl._field_types = dict(types) try: nm_tpl.__module__ = sys._getframe(2).f_globals.get('__name__', '__main__') except (AttributeError, ValueError): @@ -2132,13 +1906,6 @@ def _make_nmtuple(name, types): _PY36 = sys.version_info[:2] >= (3, 6) -# attributes prohibited to set in NamedTuple class syntax -_prohibited = ('__new__', '__init__', '__slots__', '__getnewargs__', - '_fields', '_field_defaults', '_field_types', - '_make', '_replace', '_asdict', '_source') - -_special = ('__module__', '__name__', '__qualname__', '__annotations__') - class NamedTupleMeta(type): @@ -2149,29 +1916,7 @@ class NamedTupleMeta(type): raise TypeError("Class syntax for NamedTuple is only supported" " in Python 3.6+") types = ns.get('__annotations__', {}) - nm_tpl = _make_nmtuple(typename, types.items()) - defaults = [] - defaults_dict = {} - for field_name in types: - if field_name in ns: - default_value = ns[field_name] - defaults.append(default_value) - defaults_dict[field_name] = default_value - elif defaults: - raise TypeError("Non-default namedtuple field {field_name} cannot " - "follow default field(s) {default_names}" - .format(field_name=field_name, - default_names=', '.join(defaults_dict.keys()))) - nm_tpl.__new__.__defaults__ = tuple(defaults) - nm_tpl._field_defaults = defaults_dict - # update from user namespace without overriding special namedtuple attributes - for key in ns: - if key in _prohibited: - raise AttributeError("Cannot overwrite NamedTuple attribute " + key) - elif key not in _special and key not in nm_tpl._fields: - setattr(nm_tpl, key, ns[key]) - return nm_tpl - + return _make_nmtuple(typename, types.items()) class NamedTuple(metaclass=NamedTupleMeta): """Typed version of namedtuple. @@ -2186,10 +1931,8 @@ class NamedTuple(metaclass=NamedTupleMeta): Employee = collections.namedtuple('Employee', ['name', 'id']) - The resulting class has extra __annotations__ and _field_types - attributes, giving an ordered dict mapping field names to types. - __annotations__ should be preferred, while _field_types - is kept to maintain pre PEP 526 compatibility. (The field names + The resulting class has one extra attribute: _field_types, + giving a dict mapping field names to types. (The field names are in the _fields attribute, which is part of the namedtuple API.) Alternative equivalent keyword syntax is also accepted:: @@ -2396,7 +2139,6 @@ class io: TextIO = TextIO BinaryIO = BinaryIO - io.__name__ = __name__ + '.io' sys.modules[io.__name__] = io @@ -2414,6 +2156,5 @@ class re: Pattern = Pattern Match = Match - re.__name__ = __name__ + '.re' sys.modules[re.__name__] = re diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index f4dbc52..b523f73 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -153,32 +153,28 @@ class _AssertRaisesBaseContext(_BaseTestCaseContext): If args is not empty, call a callable passing positional and keyword arguments. """ - try: - if not _is_subtype(self.expected, self._base_type): - raise TypeError('%s() arg 1 must be %s' % - (name, self._base_type_str)) - if args and args[0] is None: - warnings.warn("callable is None", + if not _is_subtype(self.expected, self._base_type): + raise TypeError('%s() arg 1 must be %s' % + (name, self._base_type_str)) + if args and args[0] is None: + warnings.warn("callable is None", + DeprecationWarning, 3) + args = () + if not args: + self.msg = kwargs.pop('msg', None) + if kwargs: + warnings.warn('%r is an invalid keyword argument for ' + 'this function' % next(iter(kwargs)), DeprecationWarning, 3) - args = () - if not args: - self.msg = kwargs.pop('msg', None) - if kwargs: - warnings.warn('%r is an invalid keyword argument for ' - 'this function' % next(iter(kwargs)), - DeprecationWarning, 3) - return self - - callable_obj, *args = args - try: - self.obj_name = callable_obj.__name__ - except AttributeError: - self.obj_name = str(callable_obj) - with self: - callable_obj(*args, **kwargs) - finally: - # bpo-23890: manually break a reference cycle - self = None + return self + + callable_obj, *args = args + try: + self.obj_name = callable_obj.__name__ + except AttributeError: + self.obj_name = str(callable_obj) + with self: + callable_obj(*args, **kwargs) class _AssertRaisesContext(_AssertRaisesBaseContext): @@ -729,11 +725,7 @@ class TestCase(object): self.assertEqual(the_exception.error_code, 3) """ context = _AssertRaisesContext(expected_exception, self) - try: - return context.handle('assertRaises', args, kwargs) - finally: - # bpo-23890: manually break a reference cycle - context = None + return context.handle('assertRaises', args, kwargs) def assertWarns(self, expected_warning, *args, **kwargs): """Fail unless a warning of class warnClass is triggered diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py index e860deb..eb447d7 100644 --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -81,7 +81,7 @@ class TestLoader(object): self._loading_packages = set() def loadTestsFromTestCase(self, testCaseClass): - """Return a suite of all test cases contained in testCaseClass""" + """Return a suite of all tests cases contained in testCaseClass""" if issubclass(testCaseClass, suite.TestSuite): raise TypeError("Test cases should not be derived from " "TestSuite. Maybe you meant to derive from " @@ -95,7 +95,7 @@ class TestLoader(object): # XXX After Python 3.5, remove backward compatibility hacks for # use_load_tests deprecation via *args and **kws. See issue 16662. def loadTestsFromModule(self, module, *args, pattern=None, **kws): - """Return a suite of all test cases contained in the given module""" + """Return a suite of all tests cases contained in the given module""" # This method used to take an undocumented and unofficial # use_load_tests argument. For backward compatibility, we still # accept the argument (which can also be the first position) but we @@ -135,7 +135,7 @@ class TestLoader(object): return tests def loadTestsFromName(self, name, module=None): - """Return a suite of all test cases given a string specifier. + """Return a suite of all tests cases given a string specifier. The name may resolve either to a module, a test case class, a test method within a test case class, or a callable object which @@ -213,7 +213,7 @@ class TestLoader(object): raise TypeError("don't know how to make test from: %s" % obj) def loadTestsFromNames(self, names, module=None): - """Return a suite of all test cases found using the given sequence + """Return a suite of all tests cases found using the given sequence of string specifiers. See 'loadTestsFromName()'. """ suites = [self.loadTestsFromName(name, module) for name in names] diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 807604f..09fefe1 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -14,7 +14,6 @@ Examples: %(prog)s test_module - run tests from test_module %(prog)s module.TestClass - run tests from module.TestClass %(prog)s module.Class.test_method - run specified test method - %(prog)s path/to/test_file.py - run tests from test_file.py """ MODULE_EXAMPLES = """\ diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 067df81..f134919 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -60,18 +60,6 @@ def _is_exception(obj): ) -class _slotted(object): - __slots__ = ['a'] - - -# Do not use this tuple. It was never documented as a public API. -# It will be removed. It has no obvious signs of users on github. -DescriptorTypes = ( - type(_slotted.a), - property, -) - - def _get_signature_object(func, as_instance, eat_self): """ Given an arbitrary, possibly callable object, try to create a suitable @@ -177,7 +165,7 @@ def _set_signature(mock, original, instance=False): skipfirst = isinstance(original, type) result = _get_signature_object(original, instance, skipfirst) if result is None: - return mock + return func, sig = result def checksig(*args, **kwargs): sig.bind(*args, **kwargs) @@ -205,6 +193,12 @@ def _setup_func(funcopy, mock): def assert_called_with(*args, **kwargs): return mock.assert_called_with(*args, **kwargs) + def assert_called(*args, **kwargs): + return mock.assert_called(*args, **kwargs) + def assert_not_called(*args, **kwargs): + return mock.assert_not_called(*args, **kwargs) + def assert_called_once(*args, **kwargs): + return mock.assert_called_once(*args, **kwargs) def assert_called_once_with(*args, **kwargs): return mock.assert_called_once_with(*args, **kwargs) def assert_has_calls(*args, **kwargs): @@ -235,6 +229,9 @@ def _setup_func(funcopy, mock): funcopy.assert_has_calls = assert_has_calls funcopy.assert_any_call = assert_any_call funcopy.reset_mock = reset_mock + funcopy.assert_called = assert_called + funcopy.assert_not_called = assert_not_called + funcopy.assert_called_once = assert_called_once mock._mock_delegate = funcopy @@ -525,7 +522,7 @@ class NonCallableMock(Base): side_effect = property(__get_side_effect, __set_side_effect) - def reset_mock(self, visited=None): + def reset_mock(self, visited=None,*, return_value=False, side_effect=False): "Restore the mock object to its initial state." if visited is None: visited = [] @@ -540,6 +537,11 @@ class NonCallableMock(Base): self.call_args_list = _CallList() self.method_calls = _CallList() + if return_value: + self._mock_return_value = DEFAULT + if side_effect: + self._mock_side_effect = None + for child in self._mock_children.values(): if isinstance(child, _SpecState): continue @@ -774,6 +776,24 @@ class NonCallableMock(Base): (self._mock_name or 'mock', self.call_count)) raise AssertionError(msg) + def assert_called(_mock_self): + """assert that the mock was called at least once + """ + self = _mock_self + if self.call_count == 0: + msg = ("Expected '%s' to have been called." % + self._mock_name or 'mock') + raise AssertionError(msg) + + def assert_called_once(_mock_self): + """assert that the mock was called only once. + """ + self = _mock_self + if not self.call_count == 1: + msg = ("Expected '%s' to have been called once. Called %s times." % + (self._mock_name or 'mock', self.call_count)) + raise AssertionError(msg) + def assert_called_with(_mock_self, *args, **kwargs): """assert that the mock was called with the specified arguments. @@ -795,8 +815,8 @@ class NonCallableMock(Base): def assert_called_once_with(_mock_self, *args, **kwargs): - """assert that the mock was called exactly once and that that call was - with the specified arguments.""" + """assert that the mock was called exactly once and with the specified + arguments.""" self = _mock_self if not self.call_count == 1: msg = ("Expected '%s' to be called once. Called %s times." % @@ -822,7 +842,7 @@ class NonCallableMock(Base): if expected not in all_calls: raise AssertionError( 'Calls not found.\nExpected: %r\n' - 'Actual: %r' % (calls, self.mock_calls) + 'Actual: %r' % (_CallList(calls), self.mock_calls) ) from cause return @@ -1749,18 +1769,14 @@ def _get_eq(self): ret_val = self.__eq__._mock_return_value if ret_val is not DEFAULT: return ret_val - if self is other: - return True - return NotImplemented + return self is other return __eq__ def _get_ne(self): def __ne__(other): if self.__ne__._mock_return_value is not DEFAULT: return DEFAULT - if self is other: - return False - return NotImplemented + return self is not other return __ne__ def _get_iter(self): @@ -1945,8 +1961,9 @@ class _Call(tuple): If the _Call has no name then it will match any name. """ - def __new__(cls, value=(), name='', parent=None, two=False, + def __new__(cls, value=(), name=None, parent=None, two=False, from_kall=True): + name = '' args = () kwargs = {} _len = len(value) diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py index 2112262..2c5ea4a 100644 --- a/Lib/unittest/runner.py +++ b/Lib/unittest/runner.py @@ -167,7 +167,7 @@ class TextTestRunner(object): if self.warnings in ['default', 'always']: warnings.filterwarnings('module', category=DeprecationWarning, - message='Please use assert\w+ instead.') + message=r'Please use assert\w+ instead.') startTime = time.time() startTestRun = getattr(result, 'startTestRun', None) if startTestRun is not None: diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py index e6e2bc2..1b0e833 100644 --- a/Lib/unittest/test/test_assertions.py +++ b/Lib/unittest/test/test_assertions.py @@ -240,7 +240,7 @@ class TestLongMessage(unittest.TestCase): # Error messages are multiline so not testing on full message # assertTupleEqual and assertListEqual delegate to this method self.assertMessages('assertSequenceEqual', ([], [None]), - ["\+ \[None\]$", "^oops$", r"\+ \[None\]$", + [r"\+ \[None\]$", "^oops$", r"\+ \[None\]$", r"\+ \[None\] : oops$"]) def testAssertSetEqual(self): @@ -250,21 +250,21 @@ class TestLongMessage(unittest.TestCase): def testAssertIn(self): self.assertMessages('assertIn', (None, []), - ['^None not found in \[\]$', "^oops$", - '^None not found in \[\]$', - '^None not found in \[\] : oops$']) + [r'^None not found in \[\]$', "^oops$", + r'^None not found in \[\]$', + r'^None not found in \[\] : oops$']) def testAssertNotIn(self): self.assertMessages('assertNotIn', (None, [None]), - ['^None unexpectedly found in \[None\]$', "^oops$", - '^None unexpectedly found in \[None\]$', - '^None unexpectedly found in \[None\] : oops$']) + [r'^None unexpectedly found in \[None\]$', "^oops$", + r'^None unexpectedly found in \[None\]$', + r'^None unexpectedly found in \[None\] : oops$']) def testAssertDictEqual(self): self.assertMessages('assertDictEqual', ({}, {'key': 'value'}), [r"\+ \{'key': 'value'\}$", "^oops$", - "\+ \{'key': 'value'\}$", - "\+ \{'key': 'value'\} : oops$"]) + r"\+ \{'key': 'value'\}$", + r"\+ \{'key': 'value'\} : oops$"]) def testAssertDictContainsSubset(self): with warnings.catch_warnings(): diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py index b849591..8f752b8 100644 --- a/Lib/unittest/test/test_case.py +++ b/Lib/unittest/test/test_case.py @@ -1273,19 +1273,6 @@ test case with self.assertRaises(TypeError): self.assertRaises((ValueError, object)) - def testAssertRaisesRefcount(self): - # bpo-23890: assertRaises() must not keep objects alive longer - # than expected - def func() : - try: - raise ValueError - except ValueError: - raise ValueError - - refcount = sys.getrefcount(func) - self.assertRaises(ValueError, func) - self.assertEqual(refcount, sys.getrefcount(func)) - def testAssertRaisesRegex(self): class ExceptionMock(Exception): pass diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py index 48d8fe9..1996a8e 100644 --- a/Lib/unittest/test/test_discovery.py +++ b/Lib/unittest/test/test_discovery.py @@ -528,9 +528,6 @@ class TestDiscovery(unittest.TestCase): pickle.loads(pickle.dumps(test, proto)) def test_discover_with_module_that_raises_SkipTest_on_import(self): - if not unittest.BaseTestSuite._cleanup: - raise unittest.SkipTest("Suite cleanup is disabled") - loader = unittest.TestLoader() def _get_module_from_name(name): @@ -551,9 +548,6 @@ class TestDiscovery(unittest.TestCase): pickle.loads(pickle.dumps(suite, proto)) def test_discover_with_init_module_that_raises_SkipTest_on_import(self): - if not unittest.BaseTestSuite._cleanup: - raise unittest.SkipTest("Suite cleanup is disabled") - vfs = {abspath('/foo'): ['my_package'], abspath('/foo/my_package'): ['__init__.py', 'test_module.py']} self.setup_import_issue_package_tests(vfs) diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py index 31e2f0f..b2f9c88 100644 --- a/Lib/unittest/test/test_loader.py +++ b/Lib/unittest/test/test_loader.py @@ -35,7 +35,7 @@ class Test_TestLoader(unittest.TestCase): ### Tests for TestLoader.loadTestsFromTestCase ################################################################ - # "Return a suite of all test cases contained in the TestCase-derived + # "Return a suite of all tests cases contained in the TestCase-derived # class testCaseClass" def test_loadTestsFromTestCase(self): class Foo(unittest.TestCase): @@ -48,7 +48,7 @@ class Test_TestLoader(unittest.TestCase): loader = unittest.TestLoader() self.assertEqual(loader.loadTestsFromTestCase(Foo), tests) - # "Return a suite of all test cases contained in the TestCase-derived + # "Return a suite of all tests cases contained in the TestCase-derived # class testCaseClass" # # Make sure it does the right thing even if no tests were found @@ -61,7 +61,7 @@ class Test_TestLoader(unittest.TestCase): loader = unittest.TestLoader() self.assertEqual(loader.loadTestsFromTestCase(Foo), empty_suite) - # "Return a suite of all test cases contained in the TestCase-derived + # "Return a suite of all tests cases contained in the TestCase-derived # class testCaseClass" # # What happens if loadTestsFromTestCase() is given an object @@ -82,7 +82,7 @@ class Test_TestLoader(unittest.TestCase): else: self.fail('Should raise TypeError') - # "Return a suite of all test cases contained in the TestCase-derived + # "Return a suite of all tests cases contained in the TestCase-derived # class testCaseClass" # # Make sure loadTestsFromTestCase() picks up the default test method @@ -390,7 +390,7 @@ class Test_TestLoader(unittest.TestCase): suite = loader.loadTestsFromName('abc () //') error, test = self.check_deferred_error(loader, suite) expected = "Failed to import test module: abc () //" - expected_regex = "Failed to import test module: abc \(\) //" + expected_regex = r"Failed to import test module: abc \(\) //" self.assertIn( expected, error, 'missing error string in %r' % error) @@ -502,7 +502,7 @@ class Test_TestLoader(unittest.TestCase): suite = loader.loadTestsFromName('abc () //', unittest) error, test = self.check_deferred_error(loader, suite) expected = "module 'unittest' has no attribute 'abc () //'" - expected_regex = "module 'unittest' has no attribute 'abc \(\) //'" + expected_regex = r"module 'unittest' has no attribute 'abc \(\) //'" self.assertIn( expected, error, 'missing error string in %r' % error) @@ -809,7 +809,7 @@ class Test_TestLoader(unittest.TestCase): suite = loader.loadTestsFromNames(['abc () //']) error, test = self.check_deferred_error(loader, list(suite)[0]) expected = "Failed to import test module: abc () //" - expected_regex = "Failed to import test module: abc \(\) //" + expected_regex = r"Failed to import test module: abc \(\) //" self.assertIn( expected, error, 'missing error string in %r' % error) @@ -928,7 +928,7 @@ class Test_TestLoader(unittest.TestCase): suite = loader.loadTestsFromNames(['abc () //'], unittest) error, test = self.check_deferred_error(loader, list(suite)[0]) expected = "module 'unittest' has no attribute 'abc () //'" - expected_regex = "module 'unittest' has no attribute 'abc \(\) //'" + expected_regex = r"module 'unittest' has no attribute 'abc \(\) //'" self.assertIn( expected, error, 'missing error string in %r' % error) diff --git a/Lib/unittest/test/testmock/support.py b/Lib/unittest/test/testmock/support.py index f473879..205431a 100644 --- a/Lib/unittest/test/testmock/support.py +++ b/Lib/unittest/test/testmock/support.py @@ -1,5 +1,3 @@ -import sys - def is_instance(obj, klass): """Version of is_instance that doesn't access __class__""" return issubclass(type(obj), klass) diff --git a/Lib/unittest/test/testmock/testhelpers.py b/Lib/unittest/test/testmock/testhelpers.py index 7919482..3477634 100644 --- a/Lib/unittest/test/testmock/testhelpers.py +++ b/Lib/unittest/test/testmock/testhelpers.py @@ -1,5 +1,3 @@ -import time -import types import unittest from unittest.mock import ( @@ -308,11 +306,6 @@ class CallTest(unittest.TestCase): other_args = _Call(((1, 2), {'a': 3})) self.assertEqual(args, other_args) - def test_call_with_name(self): - self.assertEqual(_Call((), 'foo')[0], 'foo') - self.assertEqual(_Call((('bar', 'barz'),),)[0], '') - self.assertEqual(_Call((('bar', 'barz'), {'hello': 'world'}),)[0], '') - class SpecSignatureTest(unittest.TestCase): @@ -858,19 +851,6 @@ class SpecSignatureTest(unittest.TestCase): check_data_descriptor(foo.desc) - def test_autospec_on_bound_builtin_function(self): - meth = types.MethodType(time.ctime, time.time()) - self.assertIsInstance(meth(), str) - mocked = create_autospec(meth) - - # no signature, so no spec to check against - mocked() - mocked.assert_called_once_with() - mocked.reset_mock() - mocked(4, 5, 6) - mocked.assert_called_once_with(4, 5, 6) - - class TestCallList(unittest.TestCase): def test_args_list_contains_call_list(self): diff --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py index bb9b956..24569b5 100644 --- a/Lib/unittest/test/testmock/testmagicmethods.py +++ b/Lib/unittest/test/testmock/testmagicmethods.py @@ -1,5 +1,4 @@ import unittest -import inspect import sys from unittest.mock import Mock, MagicMock, _magics diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index a96ec68..b07a7cc 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -306,24 +306,13 @@ class MockTest(unittest.TestCase): def test_calls_equal_with_any(self): - # Check that equality and non-equality is consistent even when - # comparing with mock.ANY - mm = mock.MagicMock() - self.assertTrue(mm == mm) - self.assertFalse(mm != mm) - self.assertFalse(mm == mock.MagicMock()) - self.assertTrue(mm != mock.MagicMock()) - self.assertTrue(mm == mock.ANY) - self.assertFalse(mm != mock.ANY) - self.assertTrue(mock.ANY == mm) - self.assertFalse(mock.ANY != mm) - call1 = mock.call(mock.MagicMock()) call2 = mock.call(mock.ANY) + + # Check that equality and non-equality is consistent even when + # comparing with mock.ANY self.assertTrue(call1 == call2) self.assertFalse(call1 != call2) - self.assertTrue(call2 == call1) - self.assertFalse(call2 != call1) def test_assert_called_with(self): @@ -1250,6 +1239,27 @@ class MockTest(unittest.TestCase): with self.assertRaises(AssertionError): m.hello.assert_not_called() + def test_assert_called(self): + m = Mock() + with self.assertRaises(AssertionError): + m.hello.assert_called() + m.hello() + m.hello.assert_called() + + m.hello() + m.hello.assert_called() + + def test_assert_called_once(self): + m = Mock() + with self.assertRaises(AssertionError): + m.hello.assert_called_once() + m.hello() + m.hello.assert_called_once() + + m.hello() + with self.assertRaises(AssertionError): + m.hello.assert_called_once() + #Issue21256 printout of keyword args should be in deterministic order def test_sorted_call_signature(self): m = Mock() @@ -1267,6 +1277,24 @@ class MockTest(unittest.TestCase): self.assertEqual(m.method_calls[0], c) self.assertEqual(m.method_calls[1], i) + def test_reset_return_sideeffect(self): + m = Mock(return_value=10, side_effect=[2,3]) + m.reset_mock(return_value=True, side_effect=True) + self.assertIsInstance(m.return_value, Mock) + self.assertEqual(m.side_effect, None) + + def test_reset_return(self): + m = Mock(return_value=10, side_effect=[2,3]) + m.reset_mock(return_value=True) + self.assertIsInstance(m.return_value, Mock) + self.assertNotEqual(m.side_effect, None) + + def test_reset_sideeffect(self): + m = Mock(return_value=10, side_effect=[2,3]) + m.reset_mock(side_effect=True) + self.assertEqual(m.return_value, 10) + self.assertEqual(m.side_effect, None) + def test_mock_add_spec(self): class _One(object): one = 1 diff --git a/Lib/unittest/test/testmock/testpatch.py b/Lib/unittest/test/testmock/testpatch.py index dfce369..fe4ecef 100644 --- a/Lib/unittest/test/testmock/testpatch.py +++ b/Lib/unittest/test/testmock/testpatch.py @@ -10,9 +10,9 @@ from unittest.test.testmock import support from unittest.test.testmock.support import SomeClass, is_instance from unittest.mock import ( - NonCallableMock, CallableMixin, patch, sentinel, + NonCallableMock, CallableMixin, sentinel, MagicMock, Mock, NonCallableMagicMock, patch, _patch, - DEFAULT, call, _get_target, _patch + DEFAULT, call, _get_target ) @@ -969,8 +969,14 @@ class PatchTest(unittest.TestCase): def test_autospec_function(self): @patch('%s.function' % __name__, autospec=True) def test(mock): + function.assert_not_called() + self.assertRaises(AssertionError, function.assert_called) + self.assertRaises(AssertionError, function.assert_called_once) function(1) + self.assertRaises(AssertionError, function.assert_not_called) function.assert_called_with(1) + function.assert_called() + function.assert_called_once() function(2, 3) function.assert_called_with(2, 3) diff --git a/Lib/urllib/error.py b/Lib/urllib/error.py index 851515b..c5b675d 100644 --- a/Lib/urllib/error.py +++ b/Lib/urllib/error.py @@ -16,6 +16,10 @@ import urllib.response __all__ = ['URLError', 'HTTPError', 'ContentTooShortError'] +# do these error classes make sense? +# make sure all of the OSError stuff is overridden. we just want to be +# subtypes. + class URLError(OSError): # URLError is a sub-type of OSError, but it doesn't share any of # the implementation. need to override __init__ and __str__. diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 62e8ddf..958767a 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -38,37 +38,29 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag", "DefragResult", "ParseResult", "SplitResult", "DefragResultBytes", "ParseResultBytes", "SplitResultBytes"] -# A classification of schemes. -# The empty string classifies URLs with no scheme specified, -# being the default value returned by “urlsplit” and “urlparse”. - -uses_relative = ['', 'ftp', 'http', 'gopher', 'nntp', 'imap', +# A classification of schemes ('' means apply by default) +uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file', 'https', 'shttp', 'mms', - 'prospero', 'rtsp', 'rtspu', 'sftp', + 'prospero', 'rtsp', 'rtspu', '', 'sftp', 'svn', 'svn+ssh', 'ws', 'wss'] - -uses_netloc = ['', 'ftp', 'http', 'gopher', 'nntp', 'telnet', +uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', - 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', + 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', 'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh', 'ws', 'wss'] - -uses_params = ['', 'ftp', 'hdl', 'prospero', 'http', 'imap', +uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', 'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips', - 'mms', 'sftp', 'tel'] + 'mms', '', 'sftp', 'tel'] # These are not actually used anymore, but should stay for backwards # compatibility. (They are undocumented, but have a public-looking name.) - non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip', 'sips'] - -uses_query = ['', 'http', 'wais', 'imap', 'https', 'shttp', 'mms', - 'gopher', 'rtsp', 'rtspu', 'sip', 'sips'] - -uses_fragment = ['', 'ftp', 'hdl', 'http', 'gopher', 'news', +uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms', + 'gopher', 'rtsp', 'rtspu', 'sip', 'sips', ''] +uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news', 'nntp', 'wais', 'https', 'shttp', 'snews', - 'file', 'prospero'] + 'file', 'prospero', ''] # Characters valid in scheme names scheme_chars = ('abcdefghijklmnopqrstuvwxyz' @@ -165,9 +157,8 @@ class _NetlocResultMixinBase(object): port = self._hostinfo[1] if port is not None: port = int(port, 10) - # Return None on an illegal port if not ( 0 <= port <= 65535): - return None + raise ValueError("Port out of range 0-65535") return port @@ -234,8 +225,71 @@ class _NetlocResultMixinBytes(_NetlocResultMixinBase, _ResultMixinBytes): from collections import namedtuple _DefragResultBase = namedtuple('DefragResult', 'url fragment') -_SplitResultBase = namedtuple('SplitResult', 'scheme netloc path query fragment') -_ParseResultBase = namedtuple('ParseResult', 'scheme netloc path params query fragment') +_SplitResultBase = namedtuple( + 'SplitResult', 'scheme netloc path query fragment') +_ParseResultBase = namedtuple( + 'ParseResult', 'scheme netloc path params query fragment') + +_DefragResultBase.__doc__ = """ +DefragResult(url, fragment) + +A 2-tuple that contains the url without fragment identifier and the fragment +identifier as a separate argument. +""" + +_DefragResultBase.url.__doc__ = """The URL with no fragment identifier.""" + +_DefragResultBase.fragment.__doc__ = """ +Fragment identifier separated from URL, that allows indirect identification of a +secondary resource by reference to a primary resource and additional identifying +information. +""" + +_SplitResultBase.__doc__ = """ +SplitResult(scheme, netloc, path, query, fragment) + +A 5-tuple that contains the different components of a URL. Similar to +ParseResult, but does not split params. +""" + +_SplitResultBase.scheme.__doc__ = """Specifies URL scheme for the request.""" + +_SplitResultBase.netloc.__doc__ = """ +Network location where the request is made to. +""" + +_SplitResultBase.path.__doc__ = """ +The hierarchical path, such as the path to a file to download. +""" + +_SplitResultBase.query.__doc__ = """ +The query component, that contains non-hierarchical data, that along with data +in path component, identifies a resource in the scope of URI's scheme and +network location. +""" + +_SplitResultBase.fragment.__doc__ = """ +Fragment identifier, that allows indirect identification of a secondary resource +by reference to a primary resource and additional identifying information. +""" + +_ParseResultBase.__doc__ = """ +ParseResult(scheme, netloc, path, params, query, fragment) + +A 6-tuple that contains components of a parsed URL. +""" + +_ParseResultBase.scheme.__doc__ = _SplitResultBase.scheme.__doc__ +_ParseResultBase.netloc.__doc__ = _SplitResultBase.netloc.__doc__ +_ParseResultBase.path.__doc__ = _SplitResultBase.path.__doc__ +_ParseResultBase.params.__doc__ = """ +Parameters for last path element used to dereference the URI in order to provide +access to perform some operation on the resource. +""" + +_ParseResultBase.query.__doc__ = _SplitResultBase.query.__doc__ +_ParseResultBase.fragment.__doc__ = _SplitResultBase.fragment.__doc__ + # For backwards compatibility, alias _NetlocResultMixinStr # ResultBase is no longer part of the documented API, but it is @@ -558,7 +612,6 @@ def unquote(string, encoding='utf-8', errors='replace'): append(bits[i + 1]) return ''.join(res) - def parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace'): """Parse a query given as a string argument. @@ -580,8 +633,6 @@ def parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding and errors: specify how to decode percent-encoded sequences into Unicode characters, as accepted by the bytes.decode() method. - - Returns a dictionary. """ parsed_result = {} pairs = parse_qsl(qs, keep_blank_values, strict_parsing, @@ -593,29 +644,28 @@ def parse_qs(qs, keep_blank_values=False, strict_parsing=False, parsed_result[name] = [value] return parsed_result - def parse_qsl(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace'): """Parse a query given as a string argument. - Arguments: + Arguments: - qs: percent-encoded query string to be parsed + qs: percent-encoded query string to be parsed - keep_blank_values: flag indicating whether blank values in - percent-encoded queries should be treated as blank strings. - A true value indicates that blanks should be retained as blank - strings. The default false value indicates that blank values - are to be ignored and treated as if they were not included. + keep_blank_values: flag indicating whether blank values in + percent-encoded queries should be treated as blank strings. A + true value indicates that blanks should be retained as blank + strings. The default false value indicates that blank values + are to be ignored and treated as if they were not included. - strict_parsing: flag indicating what to do with parsing errors. If - false (the default), errors are silently ignored. If true, - errors raise a ValueError exception. + strict_parsing: flag indicating what to do with parsing errors. If + false (the default), errors are silently ignored. If true, + errors raise a ValueError exception. - encoding and errors: specify how to decode percent-encoded sequences - into Unicode characters, as accepted by the bytes.decode() method. + encoding and errors: specify how to decode percent-encoded sequences + into Unicode characters, as accepted by the bytes.decode() method. - Returns a list, as G-d intended. + Returns a list, as G-d intended. """ qs, _coerce_result = _coerce_args(qs) pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')] @@ -882,7 +932,7 @@ def splithost(url): """splithost('//host[:port]/path') --> 'host[:port]', '/path'.""" global _hostprog if _hostprog is None: - _hostprog = re.compile('//([^/#?]*)(.*)', re.DOTALL) + _hostprog = re.compile('//([^/?]*)(.*)', re.DOTALL) match = _hostprog.match(url) if match: diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index e98be0c..5f15b74 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -134,13 +134,73 @@ __all__ = [ ] # used in User-Agent header sent -__version__ = sys.version[:3] +__version__ = '%d.%d' % sys.version_info[:2] _opener = None def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, *, cafile=None, capath=None, cadefault=False, context=None): + '''Open the URL url, which can be either a string or a Request object. + + *data* must be an object specifying additional data to be sent to + the server, or None if no such data is needed. See Request for + details. + + urllib.request module uses HTTP/1.1 and includes a "Connection:close" + header in its HTTP requests. + + The optional *timeout* parameter specifies a timeout in seconds for + blocking operations like the connection attempt (if not specified, the + global default timeout setting will be used). This only works for HTTP, + HTTPS and FTP connections. + + If *context* is specified, it must be a ssl.SSLContext instance describing + the various SSL options. See HTTPSConnection for more details. + + The optional *cafile* and *capath* parameters specify a set of trusted CA + certificates for HTTPS requests. cafile should point to a single file + containing a bundle of CA certificates, whereas capath should point to a + directory of hashed certificate files. More information can be found in + ssl.SSLContext.load_verify_locations(). + + The *cadefault* parameter is ignored. + + This function always returns an object which can work as a context + manager and has methods such as + + * geturl() - return the URL of the resource retrieved, commonly used to + determine if a redirect was followed + + * info() - return the meta-information of the page, such as headers, in the + form of an email.message_from_string() instance (see Quick Reference to + HTTP Headers) + + * getcode() - return the HTTP status code of the response. Raises URLError + on errors. + + For HTTP and HTTPS URLs, this function returns a http.client.HTTPResponse + object slightly modified. In addition to the three new methods above, the + msg attribute contains the same information as the reason attribute --- + the reason phrase returned by the server --- instead of the response + headers as it is specified in the documentation for HTTPResponse. + + For FTP, file, and data URLs and requests explicitly handled by legacy + URLopener and FancyURLopener classes, this function returns a + urllib.response.addinfourl object. + + Note that None may be returned if no handler handles the request (though + the default installed global OpenerDirector uses UnknownHandler to ensure + this never happens). + + In addition, if proxy settings are detected (for example, when a *_proxy + environment variable like http_proxy is set), ProxyHandler is default + installed and makes sure the requests are handled through the proxy. + + ''' global _opener if cafile or capath or cadefault: + import warnings + warnings.warn("cafile, cpath and cadefault are deprecated, use a " + "custom context instead.", DeprecationWarning, 2) if context is not None: raise ValueError( "You can't pass both context and any of cafile, capath, and " @@ -1170,6 +1230,11 @@ class AbstractHTTPHandler(BaseHandler): def set_http_debuglevel(self, level): self._debuglevel = level + def _get_content_length(self, request): + return http.client.HTTPConnection._get_content_length( + request.data, + request.get_method()) + def do_request_(self, request): host = request.host if not host: @@ -1178,24 +1243,22 @@ class AbstractHTTPHandler(BaseHandler): if request.data is not None: # POST data = request.data if isinstance(data, str): - msg = "POST data should be bytes or an iterable of bytes. " \ - "It cannot be of type str." + msg = "POST data should be bytes, an iterable of bytes, " \ + "or a file object. It cannot be of type str." raise TypeError(msg) if not request.has_header('Content-type'): request.add_unredirected_header( 'Content-type', 'application/x-www-form-urlencoded') - if not request.has_header('Content-length'): - try: - mv = memoryview(data) - except TypeError: - if isinstance(data, collections.Iterable): - raise ValueError("Content-Length should be specified " - "for iterable data of type %r %r" % (type(data), - data)) + if (not request.has_header('Content-length') + and not request.has_header('Transfer-encoding')): + content_length = self._get_content_length(request) + if content_length is not None: + request.add_unredirected_header( + 'Content-length', str(content_length)) else: request.add_unredirected_header( - 'Content-length', '%d' % (len(mv) * mv.itemsize)) + 'Transfer-encoding', 'chunked') sel_host = host if request.has_proxy(): @@ -1251,7 +1314,8 @@ class AbstractHTTPHandler(BaseHandler): try: try: - h.request(req.get_method(), req.selector, req.data, headers) + h.request(req.get_method(), req.selector, req.data, headers, + encode_chunked=req.has_header('Transfer-encoding')) except OSError as err: # timeout error raise URLError(err) r = h.getresponse() @@ -1424,6 +1488,7 @@ class FileHandler(BaseHandler): origurl = 'file://' + filename return addinfourl(open(localfile, 'rb'), headers, origurl) except OSError as exp: + # users shouldn't expect OSErrors coming from urlopen() raise URLError(exp) raise URLError('file not on local host') @@ -1593,10 +1658,14 @@ else: of the 'file' scheme; not recommended for general use.""" return quote(pathname) - -ftpcache = {} +# This really consists of two pieces: +# (1) a class which handles opening of all sorts of URLs +# (plus assorted utilities etc.) +# (2) a set of functions for parsing URLs +# XXX Should these be separated out into different modules? +ftpcache = {} class URLopener: """Class to open URLs. This is a class rather than just a subroutine because we may need @@ -2445,7 +2514,6 @@ def proxy_bypass_environment(host, proxies=None): no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')] for name in no_proxy_list: if name: - name = name.lstrip('.') # ignore leading dots name = re.escape(name) pattern = r'(.+\.)?%s$' % name if (re.match(pattern, hostonly, re.I) diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py index 8b69fd9..9dab4c1 100644 --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -10,7 +10,9 @@ http://www.robotstxt.org/norobots-rfc.txt """ -import urllib.parse, urllib.request +import collections +import urllib.parse +import urllib.request __all__ = ["RobotFileParser"] @@ -120,10 +122,29 @@ class RobotFileParser: if state != 0: entry.rulelines.append(RuleLine(line[1], True)) state = 2 + elif line[0] == "crawl-delay": + if state != 0: + # before trying to convert to int we need to make + # sure that robots.txt has valid syntax otherwise + # it will crash + if line[1].strip().isdigit(): + entry.delay = int(line[1]) + state = 2 + elif line[0] == "request-rate": + if state != 0: + numbers = line[1].split('/') + # check if all values are sane + if (len(numbers) == 2 and numbers[0].strip().isdigit() + and numbers[1].strip().isdigit()): + req_rate = collections.namedtuple('req_rate', + 'requests seconds') + entry.req_rate = req_rate + entry.req_rate.requests = int(numbers[0]) + entry.req_rate.seconds = int(numbers[1]) + state = 2 if state == 2: self._add_entry(entry) - def can_fetch(self, useragent, url): """using the parsed robots.txt decide if useragent can fetch url""" if self.disallow_all: @@ -153,6 +174,22 @@ class RobotFileParser: # agent not found ==> access granted return True + def crawl_delay(self, useragent): + if not self.mtime(): + return None + for entry in self.entries: + if entry.applies_to(useragent): + return entry.delay + return self.default_entry.delay + + def request_rate(self, useragent): + if not self.mtime(): + return None + for entry in self.entries: + if entry.applies_to(useragent): + return entry.req_rate + return self.default_entry.req_rate + def __str__(self): return ''.join([str(entry) + "\n" for entry in self.entries]) @@ -180,6 +217,8 @@ class Entry: def __init__(self): self.useragents = [] self.rulelines = [] + self.delay = None + self.req_rate = None def __str__(self): ret = [] diff --git a/Lib/uuid.py b/Lib/uuid.py index e96e7e0..200c800 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -487,7 +487,6 @@ try: # Assume that the uuid_generate functions are broken from 10.5 onward, # the test can be adjusted when a later version is fixed. if sys.platform == 'darwin': - import os if int(os.uname().release.split('.')[0]) >= 9: _uuid_generate_time = None diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 6bb99cb..0a094e3 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -3,28 +3,6 @@ Virtual environment (venv) package for Python. Based on PEP 405. Copyright (C) 2011-2014 Vinay Sajip. Licensed to the PSF under a contributor agreement. - -usage: python -m venv [-h] [--system-site-packages] [--symlinks] [--clear] - [--upgrade] - ENV_DIR [ENV_DIR ...] - -Creates virtual Python environments in one or more target directories. - -positional arguments: - ENV_DIR A directory to create the environment in. - -optional arguments: - -h, --help show this help message and exit - --system-site-packages - Give the virtual environment access to the system - site-packages dir. - --symlinks Attempt to symlink rather than copy. - --clear Delete the contents of the environment directory if it - already exists, before environment creation. - --upgrade Upgrade the environment directory to use this version - of Python, assuming Python has been upgraded in-place. - --without-pip Skips installing or upgrading pip in the virtual - environment (pip is bootstrapped by default) """ import logging import os @@ -58,15 +36,17 @@ class EnvBuilder: :param upgrade: If True, upgrade an existing virtual environment. :param with_pip: If True, ensure pip is installed in the virtual environment + :param prompt: Alternative terminal prefix for the environment. """ def __init__(self, system_site_packages=False, clear=False, - symlinks=False, upgrade=False, with_pip=False): + symlinks=False, upgrade=False, with_pip=False, prompt=None): self.system_site_packages = system_site_packages self.clear = clear self.symlinks = symlinks self.upgrade = upgrade self.with_pip = with_pip + self.prompt = prompt def create(self, env_dir): """ @@ -77,10 +57,6 @@ class EnvBuilder: """ env_dir = os.path.abspath(env_dir) context = self.ensure_directories(env_dir) - # See issue 24875. We need system_site_packages to be False - # until after pip is installed. - true_system_site_packages = self.system_site_packages - self.system_site_packages = False self.create_configuration(context) self.setup_python(context) if self.with_pip: @@ -88,11 +64,6 @@ class EnvBuilder: if not self.upgrade: self.setup_scripts(context) self.post_setup(context) - if true_system_site_packages: - # We had set it to False before, now - # restore it and rewrite the configuration - self.system_site_packages = True - self.create_configuration(context) def clear_directory(self, path): for fn in os.listdir(path): @@ -121,7 +92,8 @@ class EnvBuilder: context = types.SimpleNamespace() context.env_dir = env_dir context.env_name = os.path.split(env_dir)[1] - context.prompt = '(%s) ' % context.env_name + prompt = self.prompt if self.prompt is not None else context.env_name + context.prompt = '(%s) ' % prompt create_if_needed(env_dir) env = os.environ if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in env: @@ -339,42 +311,29 @@ class EnvBuilder: dstfile = os.path.join(dstdir, f) with open(srcfile, 'rb') as f: data = f.read() - if not srcfile.endswith('.exe'): + if srcfile.endswith('.exe'): + mode = 'wb' + else: + mode = 'w' try: data = data.decode('utf-8') data = self.replace_variables(data, context) - data = data.encode('utf-8') - except UnicodeError as e: + except UnicodeDecodeError as e: data = None logger.warning('unable to copy script %r, ' 'may be binary: %s', srcfile, e) if data is not None: - with open(dstfile, 'wb') as f: + with open(dstfile, mode) as f: f.write(data) shutil.copymode(srcfile, dstfile) def create(env_dir, system_site_packages=False, clear=False, - symlinks=False, with_pip=False): - """ - Create a virtual environment in a directory. - - By default, makes the system (global) site-packages dir *un*available to - the created environment, and uses copying rather than symlinking for files - obtained from the source Python installation. - - :param env_dir: The target directory to create an environment in. - :param system_site_packages: If True, the system (global) site-packages - dir is available to the environment. - :param clear: If True, delete the contents of the environment directory if - it already exists, before environment creation. - :param symlinks: If True, attempt to symlink rather than copy files into - virtual environment. - :param with_pip: If True, ensure pip is installed in the virtual - environment - """ + symlinks=False, with_pip=False, prompt=None): + """Create a virtual environment in a directory.""" builder = EnvBuilder(system_site_packages=system_site_packages, - clear=clear, symlinks=symlinks, with_pip=with_pip) + clear=clear, symlinks=symlinks, with_pip=with_pip, + prompt=prompt) builder.create(env_dir) def main(args=None): @@ -434,6 +393,9 @@ def main(args=None): help='Skips installing or upgrading pip in the ' 'virtual environment (pip is bootstrapped ' 'by default)') + parser.add_argument('--prompt', + help='Provides an alternative prompt prefix for ' + 'this environment.') options = parser.parse_args(args) if options.upgrade and options.clear: raise ValueError('you cannot supply --upgrade and --clear together.') @@ -441,7 +403,8 @@ def main(args=None): clear=options.clear, symlinks=options.symlinks, upgrade=options.upgrade, - with_pip=options.with_pip) + with_pip=options.with_pip, + prompt=options.prompt) for d in options.dirs: builder.create(d) diff --git a/Lib/venv/scripts/nt/Activate.ps1 b/Lib/venv/scripts/nt/Activate.ps1 index 85646c8..b15decb 100644 --- a/Lib/venv/scripts/nt/Activate.ps1 +++ b/Lib/venv/scripts/nt/Activate.ps1 @@ -26,18 +26,16 @@ function global:deactivate ([switch]$NonDestructive) { } deactivate -nondestructive - + $env:VIRTUAL_ENV="__VENV_DIR__" -if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) { - # Set the prompt to include the env name - # Make sure _OLD_VIRTUAL_PROMPT is global - function global:_OLD_VIRTUAL_PROMPT {""} - copy-item function:prompt function:_OLD_VIRTUAL_PROMPT - function global:prompt { - Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__' - _OLD_VIRTUAL_PROMPT - } +# Set the prompt to include the env name +# Make sure _OLD_VIRTUAL_PROMPT is global +function global:_OLD_VIRTUAL_PROMPT {""} +copy-item function:prompt function:_OLD_VIRTUAL_PROMPT +function global:prompt { + Write-Host -NoNewline -ForegroundColor Green '__VENV_PROMPT__' + _OLD_VIRTUAL_PROMPT } # Clear PYTHONHOME diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/posix/activate similarity index 100% rename from Lib/venv/scripts/common/activate rename to Lib/venv/scripts/posix/activate diff --git a/Lib/warnings.py b/Lib/warnings.py index c6631fc..5badb0b 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -2,39 +2,120 @@ import sys + __all__ = ["warn", "warn_explicit", "showwarning", "formatwarning", "filterwarnings", "simplefilter", "resetwarnings", "catch_warnings"] - def showwarning(message, category, filename, lineno, file=None, line=None): """Hook to write a warning to a file; replace if you like.""" + msg = WarningMessage(message, category, filename, lineno, file, line) + _showwarnmsg_impl(msg) + +def formatwarning(message, category, filename, lineno, line=None): + """Function to format a warning the standard way.""" + msg = WarningMessage(message, category, filename, lineno, None, line) + return _formatwarnmsg_impl(msg) + +def _showwarnmsg_impl(msg): + file = msg.file if file is None: file = sys.stderr if file is None: - # sys.stderr is None when run with pythonw.exe - warnings get lost + # sys.stderr is None when run with pythonw.exe: + # warnings get lost return + text = _formatwarnmsg(msg) try: - file.write(formatwarning(message, category, filename, lineno, line)) + file.write(text) except OSError: - pass # the file (probably stderr) is invalid - this warning gets lost. + # the file (probably stderr) is invalid - this warning gets lost. + pass -def formatwarning(message, category, filename, lineno, line=None): - """Function to format a warning the standard way.""" - s = "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) - if line is None: +def _formatwarnmsg_impl(msg): + s = ("%s:%s: %s: %s\n" + % (msg.filename, msg.lineno, msg.category.__name__, + msg.message)) + + if msg.line is None: try: import linecache - line = linecache.getline(filename, lineno) + line = linecache.getline(msg.filename, msg.lineno) except Exception: # When a warning is logged during Python shutdown, linecache # and the import machinery don't work anymore line = None + linecache = None + else: + line = msg.line if line: line = line.strip() s += " %s\n" % line + + if msg.source is not None: + try: + import tracemalloc + tb = tracemalloc.get_object_traceback(msg.source) + except Exception: + # When a warning is logged during Python shutdown, tracemalloc + # and the import machinery don't work anymore + tb = None + + if tb is not None: + s += 'Object allocated at (most recent call first):\n' + for frame in tb: + s += (' File "%s", lineno %s\n' + % (frame.filename, frame.lineno)) + + try: + if linecache is not None: + line = linecache.getline(frame.filename, frame.lineno) + else: + line = None + except Exception: + line = None + if line: + line = line.strip() + s += ' %s\n' % line return s +# Keep a reference to check if the function was replaced +_showwarning_orig = showwarning + +def _showwarnmsg(msg): + """Hook to write a warning to a file; replace if you like.""" + try: + sw = showwarning + except NameError: + pass + else: + if sw is not _showwarning_orig: + # warnings.showwarning() was replaced + if not callable(sw): + raise TypeError("warnings.showwarning() must be set to a " + "function or method") + + sw(msg.message, msg.category, msg.filename, msg.lineno, + msg.file, msg.line) + return + _showwarnmsg_impl(msg) + +# Keep a reference to check if the function was replaced +_formatwarning_orig = formatwarning + +def _formatwarnmsg(msg): + """Function to format a warning the standard way.""" + try: + fw = formatwarning + except NameError: + pass + else: + if fw is not _formatwarning_orig: + # warnings.formatwarning() was replaced + return fw(msg.message, msg.category, + msg.filename, msg.lineno, line=msg.line) + return _formatwarnmsg_impl(msg) + def filterwarnings(action, message="", category=Warning, module="", lineno=0, append=False): """Insert an entry into the list of warnings filters (at the front). @@ -185,7 +266,7 @@ def _next_external_frame(frame): # Code typically replaced by _warnings -def warn(message, category=None, stacklevel=1): +def warn(message, category=None, stacklevel=1, source=None): """Issue a warning, or maybe ignore it or raise an exception.""" # Check if message is already a Warning object if isinstance(message, Warning): @@ -235,10 +316,11 @@ def warn(message, category=None, stacklevel=1): filename = module registry = globals.setdefault("__warningregistry__", {}) warn_explicit(message, category, filename, lineno, module, registry, - globals) + globals, source) def warn_explicit(message, category, filename, lineno, - module=None, registry=None, module_globals=None): + module=None, registry=None, module_globals=None, + source=None): lineno = int(lineno) if module is None: module = filename or "" @@ -303,22 +385,18 @@ def warn_explicit(message, category, filename, lineno, raise RuntimeError( "Unrecognized action (%r) in warnings.filters:\n %s" % (action, item)) - if not callable(showwarning): - raise TypeError("warnings.showwarning() must be set to a " - "function or method") # Print message and context - showwarning(message, category, filename, lineno) + msg = WarningMessage(message, category, filename, lineno, source) + _showwarnmsg(msg) class WarningMessage(object): - """Holds the result of a single showwarning() call.""" - _WARNING_DETAILS = ("message", "category", "filename", "lineno", "file", - "line") + "line", "source") def __init__(self, message, category, filename, lineno, file=None, - line=None): + line=None, source=None): local_values = locals() for attr in self._WARNING_DETAILS: setattr(self, attr, local_values[attr]) @@ -376,11 +454,13 @@ class catch_warnings(object): self._module.filters = self._filters[:] self._module._filters_mutated() self._showwarning = self._module.showwarning + self._showwarnmsg_impl = self._module._showwarnmsg_impl if self._record: log = [] - def showwarning(*args, **kwargs): - log.append(WarningMessage(*args, **kwargs)) - self._module.showwarning = showwarning + self._module._showwarnmsg_impl = log.append + # Reset showwarning() to the default implementation to make sure + # that _showwarnmsg() calls _showwarnmsg_impl() + self._module.showwarning = self._module._showwarning_orig return log else: return None @@ -391,6 +471,7 @@ class catch_warnings(object): self._module.filters = self._filters self._module._filters_mutated() self._module.showwarning = self._showwarning + self._module._showwarnmsg_impl = self._showwarnmsg_impl # filters contains a sequence of filter 5-tuples diff --git a/Lib/wave.py b/Lib/wave.py index 8a101e3..f71f7e5 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -73,7 +73,7 @@ is destroyed. import builtins -__all__ = ["open", "openfp", "Error"] +__all__ = ["open", "openfp", "Error", "Wave_read", "Wave_write"] class Error(Exception): pass diff --git a/Lib/weakref.py b/Lib/weakref.py index 787e33a..2968fb9 100644 --- a/Lib/weakref.py +++ b/Lib/weakref.py @@ -16,8 +16,7 @@ from _weakref import ( proxy, CallableProxyType, ProxyType, - ReferenceType, - _remove_dead_weakref) + ReferenceType) from _weakrefset import WeakSet, _IterationGuard @@ -106,15 +105,13 @@ class WeakValueDictionary(collections.MutableMapping): self, *args = args if len(args) > 1: raise TypeError('expected at most 1 arguments, got %d' % len(args)) - def remove(wr, selfref=ref(self), _atomic_removal=_remove_dead_weakref): + def remove(wr, selfref=ref(self)): self = selfref() if self is not None: if self._iterating: self._pending_removals.append(wr.key) else: - # Atomic removal is necessary since this function - # can be called asynchronously by the GC - _atomic_removal(d, wr.key) + del self.data[wr.key] self._remove = remove # A list of keys to be removed self._pending_removals = [] @@ -128,12 +125,9 @@ class WeakValueDictionary(collections.MutableMapping): # We shouldn't encounter any KeyError, because this method should # always be called *before* mutating the dict. while l: - key = l.pop() - _remove_dead_weakref(d, key) + del d[l.pop()] def __getitem__(self, key): - if self._pending_removals: - self._commit_removals() o = self.data[key]() if o is None: raise KeyError(key) @@ -146,13 +140,9 @@ class WeakValueDictionary(collections.MutableMapping): del self.data[key] def __len__(self): - if self._pending_removals: - self._commit_removals() - return len(self.data) + return len(self.data) - len(self._pending_removals) def __contains__(self, key): - if self._pending_removals: - self._commit_removals() try: o = self.data[key]() except KeyError: @@ -168,8 +158,6 @@ class WeakValueDictionary(collections.MutableMapping): self.data[key] = KeyedRef(value, self._remove, key) def copy(self): - if self._pending_removals: - self._commit_removals() new = WeakValueDictionary() for key, wr in self.data.items(): o = wr() @@ -181,8 +169,6 @@ class WeakValueDictionary(collections.MutableMapping): def __deepcopy__(self, memo): from copy import deepcopy - if self._pending_removals: - self._commit_removals() new = self.__class__() for key, wr in self.data.items(): o = wr() @@ -191,8 +177,6 @@ class WeakValueDictionary(collections.MutableMapping): return new def get(self, key, default=None): - if self._pending_removals: - self._commit_removals() try: wr = self.data[key] except KeyError: @@ -206,8 +190,6 @@ class WeakValueDictionary(collections.MutableMapping): return o def items(self): - if self._pending_removals: - self._commit_removals() with _IterationGuard(self): for k, wr in self.data.items(): v = wr() @@ -215,8 +197,6 @@ class WeakValueDictionary(collections.MutableMapping): yield k, v def keys(self): - if self._pending_removals: - self._commit_removals() with _IterationGuard(self): for k, wr in self.data.items(): if wr() is not None: @@ -234,14 +214,10 @@ class WeakValueDictionary(collections.MutableMapping): keep the values around longer than needed. """ - if self._pending_removals: - self._commit_removals() with _IterationGuard(self): yield from self.data.values() def values(self): - if self._pending_removals: - self._commit_removals() with _IterationGuard(self): for wr in self.data.values(): obj = wr() @@ -263,27 +239,24 @@ class WeakValueDictionary(collections.MutableMapping): try: o = self.data.pop(key)() except KeyError: - o = None - if o is None: if args: return args[0] - else: - raise KeyError(key) + raise + if o is None: + raise KeyError(key) else: return o def setdefault(self, key, default=None): try: - o = self.data[key]() + wr = self.data[key] except KeyError: - o = None - if o is None: if self._pending_removals: self._commit_removals() self.data[key] = KeyedRef(default, self._remove, key) return default else: - return o + return wr() def update(*args, **kwargs): if not args: @@ -314,8 +287,6 @@ class WeakValueDictionary(collections.MutableMapping): keep the values around longer than needed. """ - if self._pending_removals: - self._commit_removals() return list(self.data.values()) diff --git a/Lib/wsgiref/simple_server.py b/Lib/wsgiref/simple_server.py index 7fddbe8..f71563a 100644 --- a/Lib/wsgiref/simple_server.py +++ b/Lib/wsgiref/simple_server.py @@ -11,7 +11,6 @@ module. See also the BaseHTTPServer module docs for other API information. """ from http.server import BaseHTTPRequestHandler, HTTPServer -from io import BufferedWriter import sys import urllib.parse from wsgiref.handlers import SimpleHandler @@ -127,17 +126,11 @@ class WSGIRequestHandler(BaseHTTPRequestHandler): if not self.parse_request(): # An error code has been sent, just exit return - # Avoid passing the raw file object wfile, which can do partial - # writes (Issue 24291) - stdout = BufferedWriter(self.wfile) - try: - handler = ServerHandler( - self.rfile, stdout, self.get_stderr(), self.get_environ() - ) - handler.request_handler = self # backpointer for logging - handler.run(self.server.get_app()) - finally: - stdout.detach() + handler = ServerHandler( + self.rfile, self.wfile, self.get_stderr(), self.get_environ() + ) + handler.request_handler = self # backpointer for logging + handler.run(self.server.get_app()) @@ -163,10 +156,9 @@ def make_server( if __name__ == '__main__': - httpd = make_server('', 8000, demo_app) - sa = httpd.socket.getsockname() - print("Serving HTTP on", sa[0], "port", sa[1], "...") - import webbrowser - webbrowser.open('http://localhost:8000/xyz?abc') - httpd.handle_request() # serve one request, then exit - httpd.server_close() + with make_server('', 8000, demo_app) as httpd: + sa = httpd.socket.getsockname() + print("Serving HTTP on", sa[0], "port", sa[1], "...") + import webbrowser + webbrowser.open('http://localhost:8000/xyz?abc') + httpd.handle_request() # serve one request, then exit diff --git a/Lib/xml/dom/xmlbuilder.py b/Lib/xml/dom/xmlbuilder.py index 444f0b2..e9a1536 100644 --- a/Lib/xml/dom/xmlbuilder.py +++ b/Lib/xml/dom/xmlbuilder.py @@ -353,14 +353,14 @@ class _AsyncDeprecatedProperty: class DocumentLS: """Mixin to create documents that conform to the load/save spec.""" - async = _AsyncDeprecatedProperty() async_ = False + locals()['async'] = _AsyncDeprecatedProperty() # Avoid DeprecationWarning def _get_async(self): return False - def _set_async(self, async): - if async: + def _set_async(self, flag): + if flag: raise xml.dom.NotSupportedErr( "asynchronous document loading is not supported") diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py index 5de4232..ab6b79a 100644 --- a/Lib/xml/etree/ElementPath.py +++ b/Lib/xml/etree/ElementPath.py @@ -59,15 +59,15 @@ import re xpath_tokenizer_re = re.compile( - "(" - "'[^']*'|\"[^\"]*\"|" - "::|" - "//?|" - "\.\.|" - "\(\)|" - "[/.*:\[\]\(\)@=])|" - "((?:\{[^}]+\})?[^/\[\]\(\)@=\s]+)|" - "\s+" + r"(" + r"'[^']*'|\"[^\"]*\"|" + r"::|" + r"//?|" + r"\.\.|" + r"\(\)|" + r"[/.*:\[\]\(\)@=])|" + r"((?:\{[^}]+\})?[^/\[\]\(\)@=\s]+)|" + r"\s+" ) def xpath_tokenizer(pattern, namespaces=None): @@ -180,7 +180,7 @@ def prepare_predicate(next, token): if elem.get(key) == value: yield elem return select - if signature == "-" and not re.match("\-?\d+$", predicate[0]): + if signature == "-" and not re.match(r"\-?\d+$", predicate[0]): # [tag] tag = predicate[0] def select(context, result): @@ -188,7 +188,7 @@ def prepare_predicate(next, token): if elem.find(tag) is not None: yield elem return select - if signature == "-='" and not re.match("\-?\d+$", predicate[0]): + if signature == "-='" and not re.match(r"\-?\d+$", predicate[0]): # [tag='value'] tag = predicate[0] value = predicate[-1] diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 92821c5..7354056 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -85,7 +85,7 @@ __all__ = [ "TreeBuilder", "VERSION", "XML", "XMLID", - "XMLParser", + "XMLParser", "XMLPullParser", "register_namespace", ] @@ -95,6 +95,7 @@ import sys import re import warnings import io +import collections import contextlib from . import ElementPath @@ -1029,7 +1030,7 @@ def register_namespace(prefix, uri): ValueError is raised if prefix is reserved or is invalid. """ - if re.match("ns\d+$", prefix): + if re.match(r"ns\d+$", prefix): raise ValueError("Prefix format reserved for internal use") for k, v in list(_namespace_map.items()): if k == uri or v == prefix: @@ -1084,7 +1085,7 @@ def _escape_attrib(text): if "\"" in text: text = text.replace("\"", """) # The following business with carriage returns is to satisfy - # Section 2.11 of the XML specification, stating that + # Section 2.11 of the XML specification, stating that # CR or CR LN should be replaced with just LN # http://www.w3.org/TR/REC-xml/#sec-line-ends if "\r\n" in text: @@ -1211,16 +1212,37 @@ def iterparse(source, events=None, parser=None): Returns an iterator providing (event, elem) pairs. """ + # Use the internal, undocumented _parser argument for now; When the + # parser argument of iterparse is removed, this can be killed. + pullparser = XMLPullParser(events=events, _parser=parser) + def iterator(): + try: + while True: + yield from pullparser.read_events() + # load event buffer + data = source.read(16 * 1024) + if not data: + break + pullparser.feed(data) + root = pullparser._close_and_return_root() + yield from pullparser.read_events() + it.root = root + finally: + if close_source: + source.close() + + class IterParseIterator(collections.Iterator): + __next__ = iterator().__next__ + it = IterParseIterator() + it.root = None + del iterator, IterParseIterator + close_source = False if not hasattr(source, "read"): source = open(source, "rb") close_source = True - try: - return _IterParseIterator(source, events, parser, close_source) - except: - if close_source: - source.close() - raise + + return it class XMLPullParser: @@ -1230,9 +1252,7 @@ class XMLPullParser: # upon in user code. It will be removed in a future release. # See http://bugs.python.org/issue17741 for more details. - # _elementtree.c expects a list, not a deque - self._events_queue = [] - self._index = 0 + self._events_queue = collections.deque() self._parser = _parser or XMLParser(target=TreeBuilder()) # wire up the parser for event reporting if events is None: @@ -1270,64 +1290,14 @@ class XMLPullParser: retrieved from the iterator. """ events = self._events_queue - while True: - index = self._index - try: - event = events[self._index] - # Avoid retaining references to past events - events[self._index] = None - except IndexError: - break - index += 1 - # Compact the list in a O(1) amortized fashion - # As noted above, _elementree.c needs a list, not a deque - if index * 2 >= len(events): - events[:index] = [] - self._index = 0 - else: - self._index = index + while events: + event = events.popleft() if isinstance(event, Exception): raise event else: yield event -class _IterParseIterator: - - def __init__(self, source, events, parser, close_source=False): - # Use the internal, undocumented _parser argument for now; When the - # parser argument of iterparse is removed, this can be killed. - self._parser = XMLPullParser(events=events, _parser=parser) - self._file = source - self._close_file = close_source - self.root = self._root = None - - def __next__(self): - try: - while 1: - for event in self._parser.read_events(): - return event - if self._parser._parser is None: - break - # load event buffer - data = self._file.read(16 * 1024) - if data: - self._parser.feed(data) - else: - self._root = self._parser._close_and_return_root() - self.root = self._root - except: - if self._close_file: - self._file.close() - raise - if self._close_file: - self._file.close() - raise StopIteration - - def __iter__(self): - return self - - def XML(text, parser=None): """Parse XML document from string constant. diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py index 421358f..98b5ca9 100644 --- a/Lib/xml/sax/expatreader.py +++ b/Lib/xml/sax/expatreader.py @@ -105,16 +105,9 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator): source = saxutils.prepare_input_source(source) self._source = source - try: - self.reset() - self._cont_handler.setDocumentLocator(ExpatLocator(self)) - xmlreader.IncrementalParser.parse(self, source) - except: - # bpo-30264: Close the source on error to not leak resources: - # xml.sax.parse() doesn't give access to the underlying parser - # to the caller - self._close_source() - raise + self.reset() + self._cont_handler.setDocumentLocator(ExpatLocator(self)) + xmlreader.IncrementalParser.parse(self, source) def prepareParser(self, source): if source.getSystemId() is not None: @@ -220,17 +213,6 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator): # FIXME: when to invoke error()? self._err_handler.fatalError(exc) - def _close_source(self): - source = self._source - try: - file = source.getCharacterStream() - if file is not None: - file.close() - finally: - file = source.getByteStream() - if file is not None: - file.close() - def close(self): if (self._entity_stack or self._parser is None or isinstance(self._parser, _ClosedParser)): @@ -250,7 +232,14 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator): parser.ErrorColumnNumber = self._parser.ErrorColumnNumber parser.ErrorLineNumber = self._parser.ErrorLineNumber self._parser = parser - self._close_source() + try: + file = self._source.getCharacterStream() + if file is not None: + file.close() + finally: + file = self._source.getByteStream() + if file is not None: + file.close() def _reset_cont_handler(self): self._parser.ProcessingInstructionHandler = \ diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py index bbf9ee6..bd3278e 100644 --- a/Lib/xmlrpc/client.py +++ b/Lib/xmlrpc/client.py @@ -132,6 +132,7 @@ import base64 import sys import time from datetime import datetime +from decimal import Decimal import http.client import urllib.parse from xml.parsers import expat @@ -151,7 +152,7 @@ def escape(s): return s.replace(">", ">",) # used in User-Agent header sent -__version__ = sys.version[:3] +__version__ = '%d.%d' % sys.version_info[:2] # xmlrpc integer limits MAXINT = 2**31-1 @@ -667,6 +668,8 @@ class Unmarshaller: def start(self, tag, attrs): # prepare to handle this element + if ':' in tag: + tag = tag.split(':')[-1] if tag == "array" or tag == "struct": self._marks.append(len(self._stack)) self._data = [] @@ -682,9 +685,13 @@ class Unmarshaller: try: f = self.dispatch[tag] except KeyError: - pass # unknown tag ? - else: - return f(self, "".join(self._data)) + if ':' not in tag: + return # unknown tag ? + try: + f = self.dispatch[tag.split(':')[-1]] + except KeyError: + return # unknown tag ? + return f(self, "".join(self._data)) # # accelerator support @@ -694,9 +701,13 @@ class Unmarshaller: try: f = self.dispatch[tag] except KeyError: - pass # unknown tag ? - else: - return f(self, data) + if ':' not in tag: + return # unknown tag ? + try: + f = self.dispatch[tag.split(':')[-1]] + except KeyError: + return # unknown tag ? + return f(self, data) # # element decoders @@ -721,14 +732,23 @@ class Unmarshaller: def end_int(self, data): self.append(int(data)) self._value = 0 + dispatch["i1"] = end_int + dispatch["i2"] = end_int dispatch["i4"] = end_int dispatch["i8"] = end_int dispatch["int"] = end_int + dispatch["biginteger"] = end_int def end_double(self, data): self.append(float(data)) self._value = 0 dispatch["double"] = end_double + dispatch["float"] = end_double + + def end_bigdecimal(self, data): + self.append(Decimal(data)) + self._value = 0 + dispatch["bigdecimal"] = end_bigdecimal def end_string(self, data): if self._encoding: diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 276394d..849bfdd 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -386,36 +386,31 @@ class SimpleXMLRPCDispatcher: not be called. """ + func = None try: - # call the matching registered function + # check to see if a matching function has been registered func = self.funcs[method] except KeyError: - pass + if self.instance is not None: + # check for a _dispatch method + if hasattr(self.instance, '_dispatch'): + return self.instance._dispatch(method, params) + else: + # call instance method directly + try: + func = resolve_dotted_attribute( + self.instance, + method, + self.allow_dotted_names + ) + except AttributeError: + pass + + if func is not None: + return func(*params) else: - if func is not None: - return func(*params) raise Exception('method "%s" is not supported' % method) - if self.instance is not None: - if hasattr(self.instance, '_dispatch'): - # call the `_dispatch` method on the instance - return self.instance._dispatch(method, params) - - # call the instance's method directly - try: - func = resolve_dotted_attribute( - self.instance, - method, - self.allow_dotted_names - ) - except AttributeError: - pass - else: - if func is not None: - return func(*params) - - raise Exception('method "%s" is not supported' % method) - class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler): """Simple XML-RPC request handler class. @@ -976,16 +971,15 @@ if __name__ == '__main__': def getCurrentTime(): return datetime.datetime.now() - server = SimpleXMLRPCServer(("localhost", 8000)) - server.register_function(pow) - server.register_function(lambda x,y: x+y, 'add') - server.register_instance(ExampleService(), allow_dotted_names=True) - server.register_multicall_functions() - print('Serving XML-RPC on localhost port 8000') - print('It is advisable to run this example server within a secure, closed network.') - try: - server.serve_forever() - except KeyboardInterrupt: - print("\nKeyboard interrupt received, exiting.") - server.server_close() - sys.exit(0) + with SimpleXMLRPCServer(("localhost", 8000)) as server: + server.register_function(pow) + server.register_function(lambda x,y: x+y, 'add') + server.register_instance(ExampleService(), allow_dotted_names=True) + server.register_multicall_functions() + print('Serving XML-RPC on localhost port 8000') + print('It is advisable to run this example server within a secure, closed network.') + try: + server.serve_forever() + except KeyboardInterrupt: + print("\nKeyboard interrupt received, exiting.") + sys.exit(0) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 56a2479..e2ae042 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -371,7 +371,7 @@ class ZipInfo (object): result.append(' filemode=%r' % stat.filemode(hi)) if lo: result.append(' external_attr=%#x' % lo) - isdir = self.filename[-1:] == '/' + isdir = self.is_dir() if not isdir or self.file_size: result.append(' file_size=%r' % self.file_size) if ((not isdir or self.compress_size) and @@ -449,7 +449,7 @@ class ZipInfo (object): elif ln == 0: counts = () else: - raise RuntimeError("Corrupt extra field %s"%(ln,)) + raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln)) idx = 0 @@ -469,6 +469,42 @@ class ZipInfo (object): extra = extra[ln+4:] + @classmethod + def from_file(cls, filename, arcname=None): + """Construct an appropriate ZipInfo for a file on the filesystem. + + filename should be the path to a file or directory on the filesystem. + + arcname is the name which it will have within the archive (by default, + this will be the same as filename, but without a drive letter and with + leading path separators removed). + """ + st = os.stat(filename) + isdir = stat.S_ISDIR(st.st_mode) + mtime = time.localtime(st.st_mtime) + date_time = mtime[0:6] + # Create ZipInfo instance to store file information + if arcname is None: + arcname = filename + arcname = os.path.normpath(os.path.splitdrive(arcname)[1]) + while arcname[0] in (os.sep, os.altsep): + arcname = arcname[1:] + if isdir: + arcname += '/' + zinfo = cls(arcname, date_time) + zinfo.external_attr = (st.st_mode & 0xFFFF) << 16 # Unix attributes + if isdir: + zinfo.file_size = 0 + zinfo.external_attr |= 0x10 # MS-DOS directory flag + else: + zinfo.file_size = st.st_size + + return zinfo + + def is_dir(self): + """Return True if this archive member is a directory.""" + return self.filename[-1] == '/' + class _ZipDecrypter: """Class to handle decryption of files stored within a ZIP archive. @@ -618,7 +654,7 @@ def _check_compression(compression): raise RuntimeError( "Compression requires the (missing) lzma module") else: - raise RuntimeError("That compression method is not supported") + raise NotImplementedError("That compression method is not supported") def _get_compressor(compress_type): @@ -651,14 +687,19 @@ def _get_decompressor(compress_type): class _SharedFile: - def __init__(self, file, pos, close, lock): + def __init__(self, file, pos, close, lock, writing): self._file = file self._pos = pos self._close = close self._lock = lock + self._writing = writing def read(self, n=-1): with self._lock: + if self._writing(): + raise ValueError("Can't read from the ZIP file while there " + "is an open writing handle on it. " + "Close the writing handle before trying to read.") self._file.seek(self._pos) data = self._file.read(n) self._pos = self._file.tell() @@ -702,9 +743,6 @@ class ZipExtFile(io.BufferedIOBase): # Read from compressed files in 4k blocks. MIN_READ_SIZE = 4096 - # Search for universal newlines or line chunks. - PATTERN = re.compile(br'^(?P[^\r\n]+)|(?P\n|\r\n?)') - def __init__(self, fileobj, mode, zipinfo, decrypter=None, close_fileobj=False): self._fileobj = fileobj @@ -721,7 +759,6 @@ class ZipExtFile(io.BufferedIOBase): self._readbuffer = b'' self._offset = 0 - self._universal = 'U' in mode self.newlines = None # Adjust read size for encrypted files since the first 12 bytes @@ -758,7 +795,7 @@ class ZipExtFile(io.BufferedIOBase): If limit is specified, at most limit bytes will be read. """ - if not self._universal and limit < 0: + if limit < 0: # Shortcut common case - newline found in buffer. i = self._readbuffer.find(b'\n', self._offset) + 1 if i > 0: @@ -766,41 +803,7 @@ class ZipExtFile(io.BufferedIOBase): self._offset = i return line - if not self._universal: - return io.BufferedIOBase.readline(self, limit) - - line = b'' - while limit < 0 or len(line) < limit: - readahead = self.peek(2) - if readahead == b'': - return line - - # - # Search for universal newlines or line chunks. - # - # The pattern returns either a line chunk or a newline, but not - # both. Combined with peek(2), we are assured that the sequence - # '\r\n' is always retrieved completely and never split into - # separate newlines - '\r', '\n' due to coincidental readaheads. - # - match = self.PATTERN.search(readahead) - newline = match.group('newline') - if newline is not None: - if self.newlines is None: - self.newlines = [] - if newline not in self.newlines: - self.newlines.append(newline) - self._offset += len(newline) - return line + b'\n' - - chunk = match.group('chunk') - if limit >= 0: - chunk = chunk[: limit - len(line)] - - self._offset += len(chunk) - line += chunk - - return line + return io.BufferedIOBase.readline(self, limit) def peek(self, n=1): """Returns buffered bytes without advancing the position.""" @@ -958,6 +961,76 @@ class ZipExtFile(io.BufferedIOBase): super().close() +class _ZipWriteFile(io.BufferedIOBase): + def __init__(self, zf, zinfo, zip64): + self._zinfo = zinfo + self._zip64 = zip64 + self._zipfile = zf + self._compressor = _get_compressor(zinfo.compress_type) + self._file_size = 0 + self._compress_size = 0 + self._crc = 0 + + @property + def _fileobj(self): + return self._zipfile.fp + + def writable(self): + return True + + def write(self, data): + nbytes = len(data) + self._file_size += nbytes + self._crc = crc32(data, self._crc) + if self._compressor: + data = self._compressor.compress(data) + self._compress_size += len(data) + self._fileobj.write(data) + return nbytes + + def close(self): + super().close() + # Flush any data from the compressor, and update header info + if self._compressor: + buf = self._compressor.flush() + self._compress_size += len(buf) + self._fileobj.write(buf) + self._zinfo.compress_size = self._compress_size + else: + self._zinfo.compress_size = self._file_size + self._zinfo.CRC = self._crc + self._zinfo.file_size = self._file_size + + # Write updated header info + if self._zinfo.flag_bits & 0x08: + # Write CRC and file sizes after the file data + fmt = ' ZIP64_LIMIT: + raise RuntimeError('File size unexpectedly exceeded ZIP64 ' + 'limit') + if self._compress_size > ZIP64_LIMIT: + raise RuntimeError('Compressed size unexpectedly exceeded ' + 'ZIP64 limit') + # Seek backwards and write file header (which will now include + # correct CRC and file sizes) + + # Preserve current position in file + self._zipfile.start_dir = self._fileobj.tell() + self._fileobj.seek(self._zinfo.header_offset) + self._fileobj.write(self._zinfo.FileHeader(self._zip64)) + self._fileobj.seek(self._zipfile.start_dir) + + self._zipfile._writing = False + + # Successfully written: Add file to our caches + self._zipfile.filelist.append(self._zinfo) + self._zipfile.NameToInfo[self._zinfo.filename] = self._zinfo + class ZipFile: """ Class with methods to open, read, write, close, list zip files. @@ -982,7 +1055,7 @@ class ZipFile: """Open the ZIP file with mode read 'r', write 'w', exclusive create 'x', or append 'a'.""" if mode not in ('r', 'w', 'x', 'a'): - raise RuntimeError("ZipFile requires mode 'r', 'w', 'x', or 'a'") + raise ValueError("ZipFile requires mode 'r', 'w', 'x', or 'a'") _check_compression(compression) @@ -1020,6 +1093,7 @@ class ZipFile: self._fileRefCnt = 1 self._lock = threading.RLock() self._seekable = True + self._writing = False try: if mode == 'r': @@ -1029,10 +1103,10 @@ class ZipFile: # even if no files are added to the archive self._didModify = True try: - self.start_dir = self.fp.tell() + self.start_dir = self._start_disk = self.fp.tell() except (AttributeError, OSError): self.fp = _Tellable(self.fp) - self.start_dir = 0 + self.start_dir = self._start_disk = 0 self._seekable = False else: # Some file-like objects can provide tell() but not seek() @@ -1053,9 +1127,9 @@ class ZipFile: # set the modified flag so central directory gets written # even if no files are added to the archive self._didModify = True - self.start_dir = self.fp.tell() + self.start_dir = self._start_disk = self.fp.tell() else: - raise RuntimeError("Mode must be 'r', 'w', 'x', or 'a'") + raise ValueError("Mode must be 'r', 'w', 'x', or 'a'") except: fp = self.fp self.fp = None @@ -1097,17 +1171,18 @@ class ZipFile: offset_cd = endrec[_ECD_OFFSET] # offset of central directory self._comment = endrec[_ECD_COMMENT] # archive comment - # "concat" is zero, unless zip was concatenated to another file - concat = endrec[_ECD_LOCATION] - size_cd - offset_cd + # self._start_disk: Position of the start of ZIP archive + # It is zero, unless ZIP was concatenated to another file + self._start_disk = endrec[_ECD_LOCATION] - size_cd - offset_cd if endrec[_ECD_SIGNATURE] == stringEndArchive64: # If Zip64 extension structures are present, account for them - concat -= (sizeEndCentDir64 + sizeEndCentDir64Locator) + self._start_disk -= (sizeEndCentDir64 + sizeEndCentDir64Locator) if self.debug > 2: - inferred = concat + offset_cd - print("given, inferred, offset", offset_cd, inferred, concat) + inferred = self._start_disk + offset_cd + print("given, inferred, offset", offset_cd, inferred, self._start_disk) # self.start_dir: Position of start of central directory - self.start_dir = offset_cd + concat + self.start_dir = offset_cd + self._start_disk fp.seek(self.start_dir, 0) data = fp.read(size_cd) fp = io.BytesIO(data) @@ -1147,7 +1222,7 @@ class ZipFile: t>>11, (t>>5)&0x3F, (t&0x1F) * 2 ) x._decodeExtra() - x.header_offset = x.header_offset + concat + x.header_offset = x.header_offset + self._start_disk self.filelist.append(x) self.NameToInfo[x.filename] = x @@ -1203,7 +1278,7 @@ class ZipFile: def setpassword(self, pwd): """Set default password for encrypted files.""" if pwd and not isinstance(pwd, bytes): - raise TypeError("pwd: expected bytes, got %s" % type(pwd)) + raise TypeError("pwd: expected bytes, got %s" % type(pwd).__name__) if pwd: self.pwd = pwd else: @@ -1217,7 +1292,7 @@ class ZipFile: @comment.setter def comment(self, comment): if not isinstance(comment, bytes): - raise TypeError("comment: expected bytes, got %s" % type(comment)) + raise TypeError("comment: expected bytes, got %s" % type(comment).__name__) # check for valid comment length if len(comment) > ZIP_MAX_COMMENT: import warnings @@ -1232,30 +1307,55 @@ class ZipFile: with self.open(name, "r", pwd) as fp: return fp.read() - def open(self, name, mode="r", pwd=None): - """Return file-like object for 'name'.""" - if mode not in ("r", "U", "rU"): - raise RuntimeError('open() requires mode "r", "U", or "rU"') - if 'U' in mode: - import warnings - warnings.warn("'U' mode is deprecated", - DeprecationWarning, 2) + def open(self, name, mode="r", pwd=None, *, force_zip64=False): + """Return file-like object for 'name'. + + name is a string for the file name within the ZIP file, or a ZipInfo + object. + + mode should be 'r' to read a file already in the ZIP file, or 'w' to + write to a file newly added to the archive. + + pwd is the password to decrypt files (only used for reading). + + When writing, if the file size is not known in advance but may exceed + 2 GiB, pass force_zip64 to use the ZIP64 format, which can handle large + files. If the size is known in advance, it is best to pass a ZipInfo + instance for name, with zinfo.file_size set. + """ + if mode not in {"r", "w"}: + raise ValueError('open() requires mode "r" or "w"') if pwd and not isinstance(pwd, bytes): - raise TypeError("pwd: expected bytes, got %s" % type(pwd)) + raise TypeError("pwd: expected bytes, got %s" % type(pwd).__name__) + if pwd and (mode == "w"): + raise ValueError("pwd is only supported for reading files") if not self.fp: - raise RuntimeError( - "Attempt to read ZIP archive that was already closed") + raise ValueError( + "Attempt to use ZIP archive that was already closed") # Make sure we have an info object if isinstance(name, ZipInfo): # 'name' is already an info object zinfo = name + elif mode == 'w': + zinfo = ZipInfo(name) + zinfo.compress_type = self.compression else: # Get info object for name zinfo = self.getinfo(name) + if mode == 'w': + return self._open_to_write(zinfo, force_zip64=force_zip64) + + if self._writing: + raise ValueError("Can't read from the ZIP file while there " + "is an open writing handle on it. " + "Close the writing handle before trying to read.") + + # Open for reading: self._fileRefCnt += 1 - zef_file = _SharedFile(self.fp, zinfo.header_offset, self._fpclose, self._lock) + zef_file = _SharedFile(self.fp, zinfo.header_offset, + self._fpclose, self._lock, lambda: self._writing) try: # Skip the file header: fheader = zef_file.read(sizeFileHeader) @@ -1295,7 +1395,7 @@ class ZipFile: if not pwd: pwd = self.pwd if not pwd: - raise RuntimeError("File %s is encrypted, password " + raise RuntimeError("File %r is encrypted, password " "required for extraction" % name) zd = _ZipDecrypter(pwd) @@ -1313,13 +1413,56 @@ class ZipFile: # compare against the CRC otherwise check_byte = (zinfo.CRC >> 24) & 0xff if h[11] != check_byte: - raise RuntimeError("Bad password for file", name) + raise RuntimeError("Bad password for file %r" % name) return ZipExtFile(zef_file, mode, zinfo, zd, True) except: zef_file.close() raise + def _open_to_write(self, zinfo, force_zip64=False): + if force_zip64 and not self._allowZip64: + raise ValueError( + "force_zip64 is True, but allowZip64 was False when opening " + "the ZIP file." + ) + if self._writing: + raise ValueError("Can't write to the ZIP file while there is " + "another write handle open on it. " + "Close the first handle before opening another.") + + # Sizes and CRC are overwritten with correct data after processing the file + if not hasattr(zinfo, 'file_size'): + zinfo.file_size = 0 + zinfo.compress_size = 0 + zinfo.CRC = 0 + + zinfo.flag_bits = 0x00 + if zinfo.compress_type == ZIP_LZMA: + # Compressed data includes an end-of-stream (EOS) marker + zinfo.flag_bits |= 0x02 + if not self._seekable: + zinfo.flag_bits |= 0x08 + + if not zinfo.external_attr: + zinfo.external_attr = 0o600 << 16 # permissions: ?rw------- + + # Compressed size can be larger than uncompressed size + zip64 = self._allowZip64 and \ + (force_zip64 or zinfo.file_size * 1.05 > ZIP64_LIMIT) + + if self._seekable: + self.fp.seek(self.start_dir) + zinfo.header_offset = self.fp.tell() + + self._writecheck(zinfo) + self._didModify = True + + self.fp.write(zinfo.FileHeader(zip64)) + + self._writing = True + return _ZipWriteFile(self, zinfo, zip64) + def extract(self, member, path=None, pwd=None): """Extract a member from the archive to the current working directory, using its full name. Its file information is extracted as accurately @@ -1389,7 +1532,7 @@ class ZipFile: if upperdirs and not os.path.exists(upperdirs): os.makedirs(upperdirs) - if member.filename[-1] == '/': + if member.is_dir(): if not os.path.isdir(targetpath): os.mkdir(targetpath) return targetpath @@ -1406,9 +1549,9 @@ class ZipFile: import warnings warnings.warn('Duplicate name: %r' % zinfo.filename, stacklevel=3) if self.mode not in ('w', 'x', 'a'): - raise RuntimeError("write() requires mode 'w', 'x', or 'a'") + raise ValueError("write() requires mode 'w', 'x', or 'a'") if not self.fp: - raise RuntimeError( + raise ValueError( "Attempt to write ZIP archive that was already closed") _check_compression(zinfo.compress_type) if not self._allowZip64: @@ -1427,105 +1570,43 @@ class ZipFile: """Put the bytes from filename into the archive under the name arcname.""" if not self.fp: - raise RuntimeError( + raise ValueError( "Attempt to write to ZIP archive that was already closed") + if self._writing: + raise ValueError( + "Can't write to ZIP archive while an open writing handle exists" + ) - st = os.stat(filename) - isdir = stat.S_ISDIR(st.st_mode) - mtime = time.localtime(st.st_mtime) - date_time = mtime[0:6] - # Create ZipInfo instance to store file information - if arcname is None: - arcname = filename - arcname = os.path.normpath(os.path.splitdrive(arcname)[1]) - while arcname[0] in (os.sep, os.altsep): - arcname = arcname[1:] - if isdir: - arcname += '/' - zinfo = ZipInfo(arcname, date_time) - zinfo.external_attr = (st[0] & 0xFFFF) << 16 # Unix attributes - if isdir: - zinfo.compress_type = ZIP_STORED - elif compress_type is None: - zinfo.compress_type = self.compression + zinfo = ZipInfo.from_file(filename, arcname) + + if zinfo.is_dir(): + zinfo.compress_size = 0 + zinfo.CRC = 0 else: - zinfo.compress_type = compress_type + if compress_type is not None: + zinfo.compress_type = compress_type + else: + zinfo.compress_type = self.compression - zinfo.file_size = st.st_size - zinfo.flag_bits = 0x00 - with self._lock: - if self._seekable: - self.fp.seek(self.start_dir) - zinfo.header_offset = self.fp.tell() # Start of header bytes - if zinfo.compress_type == ZIP_LZMA: + if zinfo.is_dir(): + with self._lock: + if self._seekable: + self.fp.seek(self.start_dir) + zinfo.header_offset = self.fp.tell() # Start of header bytes + if zinfo.compress_type == ZIP_LZMA: # Compressed data includes an end-of-stream (EOS) marker - zinfo.flag_bits |= 0x02 + zinfo.flag_bits |= 0x02 - self._writecheck(zinfo) - self._didModify = True + self._writecheck(zinfo) + self._didModify = True - if isdir: - zinfo.file_size = 0 - zinfo.compress_size = 0 - zinfo.CRC = 0 - zinfo.external_attr |= 0x10 # MS-DOS directory flag self.filelist.append(zinfo) self.NameToInfo[zinfo.filename] = zinfo self.fp.write(zinfo.FileHeader(False)) self.start_dir = self.fp.tell() - return - - cmpr = _get_compressor(zinfo.compress_type) - if not self._seekable: - zinfo.flag_bits |= 0x08 - with open(filename, "rb") as fp: - # Must overwrite CRC and sizes with correct data later - zinfo.CRC = CRC = 0 - zinfo.compress_size = compress_size = 0 - # Compressed size can be larger than uncompressed size - zip64 = self._allowZip64 and \ - zinfo.file_size * 1.05 > ZIP64_LIMIT - self.fp.write(zinfo.FileHeader(zip64)) - file_size = 0 - while 1: - buf = fp.read(1024 * 8) - if not buf: - break - file_size = file_size + len(buf) - CRC = crc32(buf, CRC) - if cmpr: - buf = cmpr.compress(buf) - compress_size = compress_size + len(buf) - self.fp.write(buf) - if cmpr: - buf = cmpr.flush() - compress_size = compress_size + len(buf) - self.fp.write(buf) - zinfo.compress_size = compress_size - else: - zinfo.compress_size = file_size - zinfo.CRC = CRC - zinfo.file_size = file_size - if zinfo.flag_bits & 0x08: - # Write CRC and file sizes after the file data - fmt = ' ZIP64_LIMIT: - raise RuntimeError('File size has increased during compressing') - if compress_size > ZIP64_LIMIT: - raise RuntimeError('Compressed size larger than uncompressed size') - # Seek backwards and write file header (which will now include - # correct CRC and file sizes) - self.start_dir = self.fp.tell() # Preserve current position in file - self.fp.seek(zinfo.header_offset) - self.fp.write(zinfo.FileHeader(zip64)) - self.fp.seek(self.start_dir) - self.filelist.append(zinfo) - self.NameToInfo[zinfo.filename] = zinfo + else: + with open(filename, "rb") as src, self.open(zinfo, 'w') as dest: + shutil.copyfileobj(src, dest, 1024*8) def writestr(self, zinfo_or_arcname, data, compress_type=None): """Write a file into the archive. The contents is 'data', which @@ -1548,47 +1629,20 @@ class ZipFile: zinfo = zinfo_or_arcname if not self.fp: - raise RuntimeError( + raise ValueError( "Attempt to write to ZIP archive that was already closed") + if self._writing: + raise ValueError( + "Can't write to ZIP archive while an open writing handle exists." + ) + + if compress_type is not None: + zinfo.compress_type = compress_type zinfo.file_size = len(data) # Uncompressed size with self._lock: - if self._seekable: - self.fp.seek(self.start_dir) - zinfo.header_offset = self.fp.tell() # Start of header data - if compress_type is not None: - zinfo.compress_type = compress_type - zinfo.header_offset = self.fp.tell() # Start of header data - if compress_type is not None: - zinfo.compress_type = compress_type - if zinfo.compress_type == ZIP_LZMA: - # Compressed data includes an end-of-stream (EOS) marker - zinfo.flag_bits |= 0x02 - - self._writecheck(zinfo) - self._didModify = True - zinfo.CRC = crc32(data) # CRC-32 checksum - co = _get_compressor(zinfo.compress_type) - if co: - data = co.compress(data) + co.flush() - zinfo.compress_size = len(data) # Compressed size - else: - zinfo.compress_size = zinfo.file_size - zip64 = zinfo.file_size > ZIP64_LIMIT or \ - zinfo.compress_size > ZIP64_LIMIT - if zip64 and not self._allowZip64: - raise LargeZipFile("Filesize would require ZIP64 extensions") - self.fp.write(zinfo.FileHeader(zip64)) - self.fp.write(data) - if zinfo.flag_bits & 0x08: - # Write CRC and file sizes after the file data - fmt = ' ZIP64_LIMIT: - extra.append(zinfo.header_offset) + header_offset = zinfo.header_offset - self._start_disk + if header_offset > ZIP64_LIMIT: + extra.append(header_offset) header_offset = 0xffffffff - else: - header_offset = zinfo.header_offset extra_data = zinfo.extra min_version = 0 @@ -1678,7 +1736,7 @@ class ZipFile: # Write end-of-zip-archive record centDirCount = len(self.filelist) centDirSize = pos2 - self.start_dir - centDirOffset = self.start_dir + centDirOffset = self.start_dir - self._start_disk requires_zip64 = None if centDirCount > ZIP_FILECOUNT_LIMIT: requires_zip64 = "Files count" @@ -1745,7 +1803,7 @@ class PyZipFile(ZipFile): if filterfunc and not filterfunc(pathname): if self.debug: label = 'path' if os.path.isdir(pathname) else 'file' - print('%s "%s" skipped by filterfunc' % (label, pathname)) + print('%s %r skipped by filterfunc' % (label, pathname)) return dir, name = os.path.split(pathname) if os.path.isdir(pathname): @@ -1776,7 +1834,7 @@ class PyZipFile(ZipFile): elif ext == ".py": if filterfunc and not filterfunc(path): if self.debug: - print('file "%s" skipped by filterfunc' % path) + print('file %r skipped by filterfunc' % path) continue fname, arcname = self._get_codename(path[0:-3], basename) @@ -1793,7 +1851,7 @@ class PyZipFile(ZipFile): if ext == ".py": if filterfunc and not filterfunc(path): if self.debug: - print('file "%s" skipped by filterfunc' % path) + print('file %r skipped by filterfunc' % path) continue fname, arcname = self._get_codename(path[0:-3], basename) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 518eeb9..8dfd092 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -13,7 +13,7 @@ sphinx-build and the current versions of Sphinx now require at least Python 2.6. In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script -requires an installed third-party version of +requires an installed version of hg and a third-party version of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5 (for 10.6 or later) installed in /Library/Frameworks. When installed, the Python built by this script will attempt to dynamically link first to @@ -23,7 +23,7 @@ installing the most recent ActiveTcl 8.4 or 8.5 version. 32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5 and the installation of additional components, such as a newer Python -(2.5 is needed for Python parser updates) and for the documentation +(2.5 is needed for Python parser updates), hg, and for the documentation build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later). Usage: see USAGE variable in the script. @@ -101,6 +101,7 @@ def getFullVersion(): FW_PREFIX = ["Library", "Frameworks", "Python.framework"] FW_VERSION_PREFIX = "--undefined--" # initialized in parseOptions +FW_SSL_DIRECTORY = "--undefined--" # initialized in parseOptions # The directory we'll use to create the build (will be erased and recreated) WORKDIR = "/tmp/_py" @@ -206,45 +207,15 @@ def library_recipes(): LT_10_5 = bool(getDeptargetTuple() < (10, 5)) - if not (10, 5) < getDeptargetTuple() < (10, 10): - # The OpenSSL libs shipped with OS X 10.5 and earlier are - # hopelessly out-of-date and do not include Apple's tie-in to - # the root certificates in the user and system keychains via TEA - # that was introduced in OS X 10.6. Note that this applies to - # programs built and linked with a 10.5 SDK even when run on - # newer versions of OS X. - # - # Dealing with CAs is messy. For now, just supply a - # local libssl and libcrypto for the older installer variants - # (e.g. the python.org 10.5+ 32-bit-only installer) that use the - # same default ssl certfile location as the system libs do: - # /System/Library/OpenSSL/cert.pem - # Then at least TLS connections can be negotiated with sites that - # use sha-256 certs like python.org, assuming the proper CA certs - # have been supplied. The default CA cert management issues for - # 10.5 and earlier builds are the same as before, other than it is - # now more obvious with cert checking enabled by default in the - # standard library. - # - # For builds with 10.6 through 10.9 SDKs, - # continue to use the deprecated but - # less out-of-date Apple 0.9.8 libs for now. While they are less - # secure than using an up-to-date 1.0.1 version, doing so - # avoids the big problems of forcing users to have to manage - # default CAs themselves, thanks to the Apple libs using private TEA - # APIs for cert validation from keychains if validation using the - # standard OpenSSL locations (/System/Library/OpenSSL, normally empty) - # fails. - # - # Since Apple removed the header files for the deprecated system - # OpenSSL as of the Xcode 7 release (for OS X 10.10+), we do not - # have much choice but to build our own copy here, too. + # Since Apple removed the header files for the deprecated system + # OpenSSL as of the Xcode 7 release (for OS X 10.10+), we do not + # have much choice but to build our own copy here, too. - result.extend([ + result.extend([ dict( - name="OpenSSL 1.0.2k", - url="https://www.openssl.org/source/openssl-1.0.2k.tar.gz", - checksum='f965fc0bf01bf882b31314b61391ae65', + name="OpenSSL 1.0.2j", + url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz", + checksum='96322138f0b69e61b7212bc53d5e912b', patches=[ "openssl_sdk_makedepend.patch", ], @@ -252,7 +223,7 @@ def library_recipes(): configure=None, install=None, ), - ]) + ]) # Disable for now if False: # if getDeptargetTuple() > (10, 5): @@ -299,9 +270,9 @@ def library_recipes(): if PYTHON_3: result.extend([ dict( - name="XZ 5.0.5", - url="http://tukaani.org/xz/xz-5.0.5.tar.gz", - checksum='19d924e066b6fff0bc9d1981b4e53196', + name="XZ 5.2.2", + url="http://tukaani.org/xz/xz-5.2.2.tar.gz", + checksum='7cf6a8544a7dae8e8106fdf7addfa28c', configure_pre=[ '--disable-dependency-tracking', ] @@ -344,10 +315,11 @@ def library_recipes(): ), ), dict( - name="SQLite 3.8.11", - url="https://www.sqlite.org/2015/sqlite-autoconf-3081100.tar.gz", - checksum='77b451925121028befbddbf45ea2bc49', + name="SQLite 3.14.2", + url="https://www.sqlite.org/2016/sqlite-autoconf-3140200.tar.gz", + checksum='90c53cacb811db27f990b8292bd96159', extra_cflags=('-Os ' + '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' '-DSQLITE_ENABLE_FTS3_PARENTHESIS ' '-DSQLITE_ENABLE_RTREE ' @@ -663,8 +635,9 @@ def checkEnvironment(): base_path = base_path + ':' + OLD_DEVELOPER_TOOLS os.environ['PATH'] = base_path print("Setting default PATH: %s"%(os.environ['PATH'])) - # Ensure we have access to sphinx-build. - # You may have to create a link in /usr/bin for it. + # Ensure ws have access to hg and to sphinx-build. + # You may have to create links in /usr/bin for them. + runCommand('hg --version') runCommand('sphinx-build --version') def parseOptions(args=None): @@ -674,6 +647,7 @@ def parseOptions(args=None): global WORKDIR, DEPSRC, SDKPATH, SRCDIR, DEPTARGET global UNIVERSALOPTS, UNIVERSALARCHS, ARCHLIST, CC, CXX global FW_VERSION_PREFIX + global FW_SSL_DIRECTORY if args is None: args = sys.argv[1:] @@ -734,6 +708,7 @@ def parseOptions(args=None): CC, CXX = getTargetCompilers() FW_VERSION_PREFIX = FW_PREFIX[:] + ["Versions", getVersion()] + FW_SSL_DIRECTORY = FW_VERSION_PREFIX[:] + ["etc", "openssl"] print("-- Settings:") print(" * Source directory: %s" % SRCDIR) @@ -875,7 +850,7 @@ def build_universal_openssl(basedir, archList): "shared", "--install_prefix=%s"%shellQuote(archbase), "--prefix=%s"%os.path.join("/", *FW_VERSION_PREFIX), - "--openssldir=/System/Library/OpenSSL", + "--openssldir=%s"%os.path.join("/", *FW_SSL_DIRECTORY), ] if no_asm: configure_opts.append("no-asm") @@ -1114,10 +1089,10 @@ def buildPythonDocs(): docdir = os.path.join(rootDir, 'pydocs') curDir = os.getcwd() os.chdir(buildDir) + # The Doc build changed for 3.4 (technically, for 3.4.1) and for 2.7.9 runCommand('make clean') - # Create virtual environment for docs builds with blurb and sphinx - runCommand('make venv') - runCommand('make html PYTHON=venv/bin/python') + # Assume sphinx-build is on our PATH, checked in checkEnvironment + runCommand('make html') os.chdir(curDir) if not os.path.exists(docdir): os.mkdir(docdir) @@ -1167,25 +1142,11 @@ def buildPython(): shellQuote(WORKDIR)[1:-1], shellQuote(WORKDIR)[1:-1])) - # Look for environment value BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS - # and, if defined, append its value to the make command. This allows - # us to pass in version control tags, like GITTAG, to a build from a - # tarball rather than from a vcs checkout, thus eliminating the need - # to have a working copy of the vcs program on the build machine. - # - # A typical use might be: - # export BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS=" \ - # GITVERSION='echo 123456789a' \ - # GITTAG='echo v3.6.0' \ - # GITBRANCH='echo 3.6'" - - make_extras = os.getenv("BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS") - if make_extras: - make_cmd = "make " + make_extras - else: - make_cmd = "make" - print("Running " + make_cmd) - runCommand(make_cmd) + print("Running make touch") + runCommand("make touch") + + print("Running make") + runCommand("make") print("Running make install") runCommand("make install DESTDIR=%s"%( @@ -1207,12 +1168,14 @@ def buildPython(): 'Python.framework', 'Versions', getVersion(), 'lib')))) - path_to_lib = os.path.join(rootDir, 'Library', 'Frameworks', - 'Python.framework', 'Versions', - version, 'lib', 'python%s'%(version,)) + frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework') + frmDirVersioned = os.path.join(frmDir, 'Versions', version) + path_to_lib = os.path.join(frmDirVersioned, 'lib', 'python%s'%(version,)) + # create directory for OpenSSL certificates + sslDir = os.path.join(frmDirVersioned, 'etc', 'openssl') + os.makedirs(sslDir) print("Fix file modes") - frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework') gid = grp.getgrnam('admin').gr_gid shared_lib_error = False @@ -1262,6 +1225,8 @@ def buildPython(): LDVERSION = LDVERSION.replace('$(VERSION)', VERSION) LDVERSION = LDVERSION.replace('$(ABIFLAGS)', ABIFLAGS) config_suffix = '-' + LDVERSION + if getVersionMajorMinor() >= (3, 6): + config_suffix = config_suffix + '-darwin' else: config_suffix = '' # Python 2.x @@ -1287,7 +1252,7 @@ def buildPython(): fp.write(data) fp.close() - # fix _sysconfigdata if it exists + # fix _sysconfigdata # # TODO: make this more robust! test_sysconfig_module of # distutils.tests.test_sysconfig.SysconfigTestCase tests that @@ -1301,28 +1266,31 @@ def buildPython(): # _sysconfigdata.py). import pprint - path = os.path.join(path_to_lib, '_sysconfigdata.py') - if os.path.exists(path): - fp = open(path, 'r') - data = fp.read() - fp.close() - # create build_time_vars dict - exec(data) - vars = {} - for k, v in build_time_vars.items(): - if type(v) == type(''): - for p in (include_path, lib_path): - v = v.replace(' ' + p, '') - v = v.replace(p + ' ', '') - vars[k] = v - - fp = open(path, 'w') - # duplicated from sysconfig._generate_posix_vars() - fp.write('# system configuration generated and used by' - ' the sysconfig module\n') - fp.write('build_time_vars = ') - pprint.pprint(vars, stream=fp) - fp.close() + if getVersionMajorMinor() >= (3, 6): + # XXX this is extra-fragile + path = os.path.join(path_to_lib, '_sysconfigdata_m_darwin_darwin.py') + else: + path = os.path.join(path_to_lib, '_sysconfigdata.py') + fp = open(path, 'r') + data = fp.read() + fp.close() + # create build_time_vars dict + exec(data) + vars = {} + for k, v in build_time_vars.items(): + if type(v) == type(''): + for p in (include_path, lib_path): + v = v.replace(' ' + p, '') + v = v.replace(p + ' ', '') + vars[k] = v + + fp = open(path, 'w') + # duplicated from sysconfig._generate_posix_vars() + fp.write('# system configuration generated and used by' + ' the sysconfig module\n') + fp.write('build_time_vars = ') + pprint.pprint(vars, stream=fp) + fp.close() # Add symlinks in /usr/local/bin, using relative links usr_local_bin = os.path.join(rootDir, 'usr', 'local', 'bin') @@ -1649,6 +1617,8 @@ def main(): patchFile("resources/ReadMe.rtf", fn) fn = os.path.join(folder, "Update Shell Profile.command") patchScript("scripts/postflight.patch-profile", fn) + fn = os.path.join(folder, "Install Certificates.command") + patchScript("resources/install_certificates.command", fn) os.chmod(folder, STAT_0o755) setIcon(folder, "../Icons/Python Folder.icns") diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch index 0caac0a..e22d67e 100644 --- a/Mac/BuildScript/openssl_sdk_makedepend.patch +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch @@ -1,6 +1,6 @@ # HG changeset patch # -# using openssl 1.0.2k +# using openssl 1.0.2j # # - support building with an OS X SDK diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index 65e3f14..ac68786 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -1,106 +1,76 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170 +{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf750 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;} {\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} \margl1440\margr1440\vieww13380\viewh14600\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \b \cf0 \ul \ulc0 Which installer variant should I use? \b0 \ulnone \ \ -Python.org provides two installer variants for download: one that installs a +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\b \cf0 **NEW** +\b0 For Python 3.6, the python.org website now provides only one installer variant for download: one that installs a \i 64-bit/32-bit Intel \i0 Python capable of running on \i Mac OS X 10.6 (Snow Leopard) -\i0 or later; and one that installs a -\i 32-bit-only (Intel and PPC) -\i0 Python capable of running on -\i Mac OS X 10.5 (Leopard) \i0 or later. This ReadMe was installed with the \i $MACOSX_DEPLOYMENT_TARGET -\i0 variant. Unless you are installing to an 10.5 system or you need to build applications that can run on 10.5 systems, use the 10.6 variant if possible. There are some additional operating system functions that are supported starting with 10.6 and you may see better performance using 64-bit mode. By default, Python will automatically run in 64-bit mode if your system supports it. Also see -\i Certificate verification and OpenSSL -\i0 below. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in OS X itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file. +\i0 variant. By default, Python will automatically run in 64-bit mode if your system supports it. The Python installed by this installer is built with private copies of some third-party libraries not included with or newer than those in OS X itself. The list of these libraries is included at the end of the License.rtf file. \b \ul \ \ -Update your version of Tcl/Tk to use IDLE or other Tk applications -\b0 \ulnone \ -\ -To use IDLE or other programs that use the Tkinter graphical user interface toolkit, you need to install a newer third-party version of the -\i Tcl/Tk -\i0 frameworks. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of -\i Tcl/Tk -\i0 for this version of Python and of Mac OS X.\ - -\b \ul \ Certificate verification and OpenSSL\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\b0 \ulnone \ -Python 3.5 includes a number of network security enhancements that were released in Python 3.4.3 and Python 2.7.10. {\field{\*\fldinst{HYPERLINK "https://www.python.org/dev/peps/pep-0476/"}}{\fldrslt PEP 476}} changes several standard library modules, like -\i httplib -\i0 , -\i urllib -\i0 , and -\i xmlrpclib -\i0 , to by default verify certificates presented by servers over secure (TLS) connections. The verification is performed by the OpenSSL libraries that Python is linked to. Prior to 3.4.3, both python.org installers dynamically linked with Apple-supplied OpenSSL libraries shipped with OS X. OS X provides a multiple level security framework that stores trust certificates in system and user keychains managed by the +\b0 \cf0 \ulnone \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\b \cf0 **NEW** +\b0 This variant of Python 3.6 now includes its own private copy of OpenSSL 1.0.2. Unlike previous releases, the deprecated Apple-supplied OpenSSL libraries are no longer used. This also means that the trust certificates in system and user keychains managed by the \i Keychain Access \i0 application and the \i security -\i0 command line utility.\ -\ -For OS X 10.5, Apple provides -\i OpenSSL 0.9.7 -\i0 libraries. This version of Apple's OpenSSL -\b does not -\b0 use the certificates from the system security framework, even when used on newer versions of OS X. Instead it consults a traditional OpenSSL concatenated certificate file ( -\i cafile -\i0 ) or certificate directory ( -\i capath -\i0 ), located in -\f1 /System/Library/OpenSSL -\f0 . These directories are typically empty and not managed by OS X; you must manage them yourself or supply your own SSL contexts. OpenSSL 0.9.7 is obsolete by current security standards, lacking a number of important features found in later versions. Among the problems this causes is the inability to verify higher-security certificates now used by python.org services, including -\i t{\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi"}}{\fldrslt he Python Package Index, PyPI}} -\i0 . To solve this problem, the -\i 10.5+ 32-bit-only python.org variant -\i0 is linked with a private copy of -\i OpenSSL 1.0.2 -\i0 ; it consults the same default certificate directory, -\f1 /System/Library/OpenSSL -\f0 . As before, it is still necessary to manage certificates yourself when you use this Python variant and, with certificate verification now enabled by default, you may now need to take additional steps to ensure your Python programs have access to CA certificates you trust. If you use this Python variant to build standalone applications with third-party tools like {\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/py2app/"}}{\fldrslt -\f1 py2app}}, you may now need to bundle CA certificates in them or otherwise supply non-default SSL contexts.\ -\ -For OS X 10.6+, Apple also provides -\i OpenSSL -\i0 -\i 0.9.8 libraries -\i0 . Apple's 0.9.8 version includes an important additional feature: if a certificate cannot be verified using the manually administered certificates in -\f1 /System/Library/OpenSSL -\f0 , the certificates managed by the system security framework In the user and system keychains are also consulted (using Apple private APIs). For this reason, the -\i 64-bit/32-bit 10.6+ python.org variant -\i0 continues to be dynamically linked with Apple's OpenSSL 0.9.8 since it was felt that the loss of the system-provided certificates and management tools outweighs the additional security features provided by newer versions of OpenSSL. This will likely change in future releases of the python.org installers as Apple has deprecated use of the system-supplied OpenSSL libraries. If you do need features from newer versions of OpenSSL, there are third-party OpenSSL wrapper packages available through -\i PyPI -\i0 .\ +\i0 command line utility are no longer used as defaults by the Python +\f1 ssl +\f0 module. For 3.6.0, a sample command script is included in +\f1 /Applications/Python 3.6 +\f0 to install a curated bundle of default root certificates from the third-party +\f1 certifi +\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.python.org/pypi/certifi"}}{\fldrslt https://pypi.python.org/pypi/certifi}}). If you choose to use +\f1 certifi +\f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt project's email update service}} to be notified when the certificate bundle is updated.\ \ The bundled \f1 pip -\f0 included with the Python 3.5 installers has its own default certificate store for verifying download connections.\ +\f0 included with the Python 3.6 installer has its own default certificate store for verifying download connections.\ \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\b \ul Other changes\ +\b \cf0 \ul Update your version of Tcl/Tk to use IDLE or other Tk applications +\b0 \ulnone \ +\ +To use IDLE or other programs that use the Tkinter graphical user interface toolkit, you need to install a newer third-party version of the +\i Tcl/Tk +\i0 frameworks. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of +\i Tcl/Tk +\i0 for this version of Python and of Mac OS X. For the initial release of Python 3.6, the installer is still linked with Tcl/Tk 8.5.\ + +\b \ul \ +Other changes\ \b0 \ulnone \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\cf0 For other changes in this release, see the +For other changes in this release, see the \i What's new \i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its \i Release Notes \i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\b \cf0 \ul \ +\b \ul \ Python 3 and Python 2 Co-existence\ \b0 \ulnone \ diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf index dfb75d8..3a9ab04 100644 --- a/Mac/BuildScript/resources/Welcome.rtf +++ b/Mac/BuildScript/resources/Welcome.rtf @@ -1,8 +1,9 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160 +{\rtf1\ansi\ansicpg1252\cocoartf1504 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;\csgray\c100000;} \paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 \f0\fs24 \cf0 This package will install \b Python $FULL_VERSION @@ -16,8 +17,14 @@ \b IDLE \b0 .\ \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 -\b IMPORTANT: +\b \cf0 NEW: +\b0 There are important changes in this release regarding network security and trust certificates. Please see the ReadMe for more details.\ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 + +\b \cf0 IMPORTANT: \b0 \b IDLE \b0 and other programs using the diff --git a/Mac/BuildScript/resources/install_certificates.command b/Mac/BuildScript/resources/install_certificates.command new file mode 100755 index 0000000..1d2e2d8 --- /dev/null +++ b/Mac/BuildScript/resources/install_certificates.command @@ -0,0 +1,48 @@ +#!/bin/sh + +/Library/Frameworks/Python.framework/Versions/@PYVER@/bin/python@PYVER@ << "EOF" + +# install_certifi.py +# +# sample script to install or update a set of default Root Certificates +# for the ssl module. Uses the certificates provided by the certifi package: +# https://pypi.python.org/pypi/certifi + +import os +import os.path +import ssl +import stat +import subprocess +import sys + +STAT_0o775 = ( stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR + | stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP + | stat.S_IROTH | stat.S_IXOTH ) + +def main(): + openssl_dir, openssl_cafile = os.path.split( + ssl.get_default_verify_paths().openssl_cafile) + + print(" -- pip install --upgrade certifi") + subprocess.check_call([sys.executable, + "-E", "-s", "-m", "pip", "install", "--upgrade", "certifi"]) + + import certifi + + # change working directory to the default SSL directory + os.chdir(openssl_dir) + relpath_to_certifi_cafile = os.path.relpath(certifi.where()) + print(" -- removing any existing file or link") + try: + os.remove(openssl_cafile) + except FileNotFoundError: + pass + print(" -- creating symlink to certifi certificate bundle") + os.symlink(relpath_to_certifi_cafile, openssl_cafile) + print(" -- setting permissions") + os.chmod(openssl_cafile, STAT_0o775) + print(" -- update complete") + +if __name__ == '__main__': + main() +EOF diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist index 5507687..f7c3b35 100644 --- a/Mac/IDLE/IDLE.app/Contents/Info.plist +++ b/Mac/IDLE/IDLE.app/Contents/Info.plist @@ -36,7 +36,7 @@ CFBundleExecutable IDLE CFBundleGetInfoString - %version%, © 2001-2017 Python Software Foundation + %version%, © 2001-2016 Python Software Foundation CFBundleIconFile IDLE.icns CFBundleIdentifier diff --git a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py index 986760d..5994c18 100644 --- a/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py +++ b/Mac/IDLE/IDLE.app/Contents/Resources/idlemain.py @@ -68,6 +68,6 @@ for idx, value in enumerate(sys.argv): break # Now it is safe to import idlelib. -from idlelib.PyShell import main +from idlelib.pyshell import main if __name__ == '__main__': main() diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in index f1ab79f..4a5eeb5 100644 --- a/Mac/PythonLauncher/Info.plist.in +++ b/Mac/PythonLauncher/Info.plist.in @@ -40,7 +40,7 @@ CFBundleExecutable Python Launcher CFBundleGetInfoString - %VERSION%, © 2001-2017 Python Software Foundation + %VERSION%, © 2001-2016 Python Software Foundation CFBundleIconFile PythonLauncher.icns CFBundleIdentifier diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in index a23166e..a0bb971 100644 --- a/Mac/Resources/app/Info.plist.in +++ b/Mac/Resources/app/Info.plist.in @@ -37,7 +37,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - %version%, (c) 2001-2017 Python Software Foundation. + %version%, (c) 2001-2016 Python Software Foundation. CFBundleName Python CFBundlePackageType diff --git a/Mac/Resources/framework/Info.plist.in b/Mac/Resources/framework/Info.plist.in index 7a64619..fcba7d9 100644 --- a/Mac/Resources/framework/Info.plist.in +++ b/Mac/Resources/framework/Info.plist.in @@ -17,9 +17,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - %VERSION%, (c) 2001-2017 Python Software Foundation. + %VERSION%, (c) 2001-2016 Python Software Foundation. CFBundleLongVersionString - %VERSION%, (c) 2001-2017 Python Software Foundation. + %VERSION%, (c) 2001-2016 Python Software Foundation. CFBundleSignature ???? CFBundleVersion diff --git a/Makefile.pre.in b/Makefile.pre.in index 144c1f8..cd7d33d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -41,14 +41,18 @@ RANLIB= @RANLIB@ READELF= @READELF@ SOABI= @SOABI@ LDVERSION= @LDVERSION@ -GITVERSION= @GITVERSION@ -GITTAG= @GITTAG@ -GITBRANCH= @GITBRANCH@ +HGVERSION= @HGVERSION@ +HGTAG= @HGTAG@ +HGBRANCH= @HGBRANCH@ PGO_PROF_GEN_FLAG=@PGO_PROF_GEN_FLAG@ PGO_PROF_USE_FLAG=@PGO_PROF_USE_FLAG@ LLVM_PROF_MERGER=@LLVM_PROF_MERGER@ LLVM_PROF_FILE=@LLVM_PROF_FILE@ LLVM_PROF_ERR=@LLVM_PROF_ERR@ +DTRACE= @DTRACE@ +DFLAGS= @DFLAGS@ +DTRACE_HEADERS= @DTRACE_HEADERS@ +DTRACE_OBJS= @DTRACE_OBJS@ GNULD= @GNULD@ @@ -103,8 +107,6 @@ ARFLAGS= @ARFLAGS@ CFLAGSFORSHARED=@CFLAGSFORSHARED@ # C flags used for building the interpreter object files PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE -# Strict or non-strict aliasing flags used to compile dtoa.c, see above -CFLAGS_ALIASING=@CFLAGS_ALIASING@ # Machine-dependent subdirectories @@ -112,6 +114,7 @@ MACHDEP= @MACHDEP@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ +MULTIARCH_CPPFLAGS = @MULTIARCH_CPPFLAGS@ # Install prefix for architecture-independent files prefix= @prefix@ @@ -224,7 +227,7 @@ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) -PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@ +PYTHON_FOR_GEN=@PYTHON_FOR_GEN@ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ BUILD_GNU_TYPE= @build@ @@ -237,7 +240,7 @@ TCLTK_LIBS= @TCLTK_LIBS@ # The task to run while instrumented when building the profile-opt target. # We exclude unittests with -x that take a rediculious amount of time to # run in the instrumented training build or do not provide much value. -PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_subprocess +PROFILE_TASK=-m test.regrtest --pgo # report files for gcov / lcov coverage report COVERAGE_INFO= $(abs_builddir)/coverage.info @@ -256,9 +259,6 @@ MODULE_OBJS= \ Modules/main.o \ Modules/gcmodule.o -# Used of signalmodule.o is not available -SIGNAL_OBJS= @SIGNAL_OBJS@ - IO_H= Modules/_io/_iomodule.h IO_OBJS= \ @@ -271,6 +271,11 @@ IO_OBJS= \ Modules/_io/stringio.o ########################################################################## +# Grammar +GRAMMAR_H= Include/graminit.h +GRAMMAR_C= Python/graminit.c +GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar + LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ @@ -278,18 +283,6 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ # Parser PGEN= Parser/pgen$(EXE) -PSRCS= \ - Parser/acceler.c \ - Parser/grammar1.c \ - Parser/listnode.c \ - Parser/node.c \ - Parser/parser.c \ - Parser/bitset.c \ - Parser/metagrammar.c \ - Parser/firstsets.c \ - Parser/grammar.c \ - Parser/pgen.c - POBJS= \ Parser/acceler.o \ Parser/grammar1.o \ @@ -304,16 +297,6 @@ POBJS= \ PARSER_OBJS= $(POBJS) Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o -PGSRCS= \ - Objects/obmalloc.c \ - Python/dynamic_annotations.c \ - Python/mysnprintf.c \ - Python/pyctype.c \ - Parser/tokenizer_pgen.c \ - Parser/printgrammar.c \ - Parser/parsetok_pgen.c \ - Parser/pgenmain.c - PGOBJS= \ Objects/obmalloc.o \ Python/dynamic_annotations.o \ @@ -329,12 +312,40 @@ PARSER_HEADERS= \ $(srcdir)/Include/parsetok.h \ $(srcdir)/Parser/tokenizer.h -PGENSRCS= $(PSRCS) $(PGSRCS) PGENOBJS= $(POBJS) $(PGOBJS) ########################################################################## +# opcode.h generation +OPCODE_H_DIR= $(srcdir)/Include +OPCODE_H_SCRIPT= $(srcdir)/Tools/scripts/generate_opcode_h.py +OPCODE_H= $(OPCODE_H_DIR)/opcode.h +OPCODE_H_GEN= $(PYTHON_FOR_GEN) $(OPCODE_H_SCRIPT) $(srcdir)/Lib/opcode.py $(OPCODE_H) + +########################################################################## +# AST +AST_H_DIR= Include +AST_H= $(AST_H_DIR)/Python-ast.h +AST_C_DIR= Python +AST_C= $(AST_C_DIR)/Python-ast.c +AST_ASDL= $(srcdir)/Parser/Python.asdl + +ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py +# Note that a build now requires Python to exist before the build starts. +# Use "hg touch" to fix up screwed up file mtimes in a checkout. +ASDLGEN= $(PYTHON_FOR_GEN) $(srcdir)/Parser/asdl_c.py + +########################################################################## # Python +OPCODETARGETS_H= \ + Python/opcode_targets.h + +OPCODETARGETGEN= \ + $(srcdir)/Python/makeopcodetargets.py + +OPCODETARGETGEN_FILES= \ + $(OPCODETARGETGEN) $(srcdir)/Lib/opcode.py + PYTHON_OBJS= \ Python/_warnings.o \ Python/Python-ast.o \ @@ -385,7 +396,8 @@ PYTHON_OBJS= \ Python/$(DYNLOADFILE) \ $(LIBOBJS) \ $(MACHDEP_OBJS) \ - $(THREADOBJ) + $(THREADOBJ) \ + $(DTRACE_OBJS) ########################################################################## @@ -439,13 +451,21 @@ LIBRARY_OBJS_OMIT_FROZEN= \ $(OBJECT_OBJS) \ $(PYTHON_OBJS) \ $(MODULE_OBJS) \ - $(SIGNAL_OBJS) \ $(MODOBJS) LIBRARY_OBJS= \ $(LIBRARY_OBJS_OMIT_FROZEN) \ Python/frozen.o +########################################################################## +# DTrace + +# On some systems, object files that reference DTrace probes need to be modified +# in-place by dtrace(1). +DTRACE_DEPS = \ + Python/ceval.o +# XXX: should gcmodule, etc. be here, too? + ######################################################################### # Rules @@ -501,15 +521,23 @@ coverage-lcov: --base-directory $(realpath $(abs_builddir)) \ --path $(realpath $(abs_srcdir)) \ --output-file $(COVERAGE_INFO) - : # remove 3rd party modules and system headers + : # remove 3rd party modules, system headers and internal files with + : # debug, test or dummy functions. @lcov --remove $(COVERAGE_INFO) \ + '*/Modules/_blake2/impl/*' \ '*/Modules/_ctypes/libffi*/*' \ '*/Modules/_decimal/libmpdec/*' \ + '*/Modules/_sha3/kcp/*' \ '*/Modules/expat/*' \ '*/Modules/zlib/*' \ '*/Include/*' \ + '*/Modules/xx*.c' \ + '*/Parser/listnode.c' \ + '*/Python/pyfpe.c' \ + '*/Python/pystrcmp.c' \ '/usr/include/*' \ '/usr/local/include/*' \ + '/usr/lib/gcc/*' \ --output-file $(COVERAGE_INFO) @genhtml $(COVERAGE_INFO) --output-directory $(COVERAGE_REPORT) \ $(COVERAGE_REPORT_OPTIONS) @@ -517,8 +545,7 @@ coverage-lcov: @echo "lcov report at $(COVERAGE_REPORT)/index.html" @echo -# Force regeneration of parser and importlib -coverage-report: regen-grammar regen-importlib +coverage-report: : # force rebuilding of parser and importlib @touch $(GRAMMAR_INPUT) @touch $(srcdir)/Lib/importlib/_bootstrap.py @@ -533,7 +560,7 @@ coverage-report: regen-grammar regen-importlib # Run "Argument Clinic" over all source files # (depends on python having already been built) .PHONY=clinic -clinic: $(BUILDPYTHON) +clinic: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c $(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make # Build the interpreter @@ -541,7 +568,7 @@ $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform + $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for @@ -563,6 +590,11 @@ pybuilddir.txt: $(BUILDPYTHON) Modules/_math.o: Modules/_math.c Modules/_math.h $(CC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $< +# blake2s is auto-generated from blake2b +$(srcdir)/Modules/_blake2/blake2s_impl.c: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py + $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Modules/_blake2/blake2b2s.py + $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/clinic/clinic.py -f $@ + # Build the shared modules # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. @@ -576,6 +608,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + # Build static library # avoid long command lines, same as LIBRARY_OBJS $(LIBRARY): $(LIBRARY_OBJS) @@ -584,7 +617,7 @@ $(LIBRARY): $(LIBRARY_OBJS) $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) + $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(AR) $(ARFLAGS) $@ $(MODOBJS) $(RANLIB) $@ @@ -688,24 +721,14 @@ Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -.PHONY: regen-importlib -regen-importlib: Programs/_freeze_importlib - # Regenerate Python/importlib_external.h - # from Lib/importlib/_bootstrap_external.py using _freeze_importlib +Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib Python/marshal.c ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap_external.py \ - $(srcdir)/Python/importlib_external.h - # Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py - # using _freeze_importlib - ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap.py \ - $(srcdir)/Python/importlib.h - + $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h -############################################################################ -# Regenerate all generated files +Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib Python/marshal.c + ./Programs/_freeze_importlib \ + $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h -regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast regen-importlib ############################################################################ # Special rules for object files @@ -714,13 +737,12 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ $(OBJECT_OBJS) \ $(PYTHON_OBJS) \ $(MODULE_OBJS) \ - $(SIGNAL_OBJS) \ $(MODOBJS) \ $(srcdir)/Modules/getbuildinfo.c $(CC) -c $(PY_CORE_CFLAGS) \ - -DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \ - -DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \ - -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \ + -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \ + -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \ + -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ -o $@ $(srcdir)/Modules/getbuildinfo.c Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile @@ -760,22 +782,20 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ + $(MULTIARCH_CPPFLAGS) \ -o $@ $(srcdir)/Python/sysmodule.c $(IO_OBJS): $(IO_H) +$(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN) + @$(MKDIR_P) Include + $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) +$(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H) + touch $(GRAMMAR_C) + $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -.PHONY: regen-grammar -regen-grammar: $(PGEN) - # Regenerate Include/graminit.h and Python/graminit.c - # from Grammar/Grammar using pgen - @$(MKDIR_P) Include - $(PGEN) $(srcdir)/Grammar/Grammar \ - $(srcdir)/Include/graminit.h \ - $(srcdir)/Python/graminit.c - Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ $(srcdir)/Include/grammar.h @@ -787,28 +807,18 @@ Parser/printgrammar.o: $(srcdir)/Parser/printgrammar.c Parser/pgenmain.o: $(srcdir)/Include/parsetok.h -.PHONY=regen-ast -regen-ast: - # Regenerate Include/Python-ast.h using Parser/asdl_c.py -h - $(MKDIR_P) $(srcdir)/Include - $(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \ - -h $(srcdir)/Include \ - $(srcdir)/Parser/Python.asdl - # Regenerate Python/Python-ast.c using Parser/asdl_c.py -c - $(MKDIR_P) $(srcdir)/Python - $(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \ - -c $(srcdir)/Python \ - $(srcdir)/Parser/Python.asdl - -.PHONY: regen-opcode -regen-opcode: - # Regenerate Include/opcode.h from Lib/opcode.py - # using Tools/scripts/generate_opcode_h.py - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_opcode_h.py \ - $(srcdir)/Lib/opcode.py \ - $(srcdir)/Include/opcode.h - -Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h +$(AST_H): $(AST_ASDL) $(ASDLGEN_FILES) + $(MKDIR_P) $(AST_H_DIR) + $(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL) + +$(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN_FILES) + $(MKDIR_P) $(AST_C_DIR) + $(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL) + +$(OPCODE_H): $(srcdir)/Lib/opcode.py $(OPCODE_H_SCRIPT) + $(OPCODE_H_GEN) + +Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -854,29 +864,32 @@ Objects/bytearrayobject.o: $(srcdir)/Objects/bytearrayobject.c $(BYTESTR_DEPS) Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c $(UNICODE_DEPS) -Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h +Objects/odictobject.o: $(srcdir)/Objects/dict-common.h +Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h $(srcdir)/Objects/dict-common.h Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h -.PHONY: regen-opcode-targets -regen-opcode-targets: - # Regenerate Python/opcode_targets.h from Lib/opcode.py - # using Python/makeopcodetargets.py - $(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \ - $(srcdir)/Python/opcode_targets.h +$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES) + $(PYTHON_FOR_GEN) $(OPCODETARGETGEN) $(OPCODETARGETS_H) -Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h +Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h -Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h +Python/frozen.o: Python/importlib.h Python/importlib_external.h -Objects/typeobject.o: Objects/typeslots.inc +# Generate DTrace probe macros, then rename them (PYTHON_ -> PyDTrace_) to +# follow our naming conventions. dtrace(1) uses the output filename to generate +# an include guard, so we can't use a pipeline to transform its output. +Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d + $(DTRACE) $(DFLAGS) -o $@ -h -s $< + : sed in-place edit with POSIX-only tools + sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp + mv $@.tmp $@ + +Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) + $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) -.PHONY: regen-typeslots -regen-typeslots: - # Regenerate Objects/typeslots.inc from Include/typeslotsh - # using Objects/typeslots.py - $(PYTHON_FOR_REGEN) $(srcdir)/Objects/typeslots.py \ - < $(srcdir)/Include/typeslots.h \ - $(srcdir)/Objects/typeslots.inc +Objects/typeobject.o: Objects/typeslots.inc +Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py + $(PYTHON_FOR_GEN) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h Objects/typeslots.inc ############################################################################ # Header files @@ -929,8 +942,9 @@ PYTHON_HEADERS= \ $(srcdir)/Include/node.h \ $(srcdir)/Include/object.h \ $(srcdir)/Include/objimpl.h \ - $(srcdir)/Include/opcode.h \ + $(OPCODE_H) \ $(srcdir)/Include/osdefs.h \ + $(srcdir)/Include/osmodule.h \ $(srcdir)/Include/patchlevel.h \ $(srcdir)/Include/pgen.h \ $(srcdir)/Include/pgenheaders.h \ @@ -939,6 +953,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/pycapsule.h \ $(srcdir)/Include/pyctype.h \ $(srcdir)/Include/pydebug.h \ + $(srcdir)/Include/pydtrace.h \ $(srcdir)/Include/pyerrors.h \ $(srcdir)/Include/pyfpe.h \ $(srcdir)/Include/pyhash.h \ @@ -970,7 +985,8 @@ PYTHON_HEADERS= \ $(srcdir)/Include/weakrefobject.h \ pyconfig.h \ $(PARSER_HEADERS) \ - $(srcdir)/Include/Python-ast.h + $(AST_H) \ + $(DTRACE_HEADERS) $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) @@ -980,11 +996,11 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) TESTOPTS= $(EXTRATESTOPTS) TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py -TESTTIMEOUT= 3600 +TESTTIMEOUT= 1200 # Run a basic set of regression tests. # This excludes some tests that are particularly resource-intensive. -test: @DEF_MAKE_RULE@ platform +test: all platform $(TESTRUNNER) $(TESTOPTS) # Run the full test suite twice - once without .pyc files, and once with. @@ -994,7 +1010,7 @@ test: @DEF_MAKE_RULE@ platform # the bytecode read from a .pyc file had the bug, sometimes the directly # generated bytecode. This is sometimes a very shy bug needing a lot of # sample data. -testall: @DEF_MAKE_RULE@ platform +testall: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f @@ -1003,7 +1019,7 @@ testall: @DEF_MAKE_RULE@ platform # Run the test suite for both architectures in a Universal build on OSX. # Must be run on an Intel box. -testuniversal: @DEF_MAKE_RULE@ platform +testuniversal: all platform if [ `arch` != 'i386' ];then \ echo "This can only be used on OSX/i386" ;\ exit 1 ;\ @@ -1018,7 +1034,7 @@ buildbottest: build_all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTRUNNER) -j 1 -u all -W --timeout=$(TESTTIMEOUT) $(TESTOPTS) + $(TESTRUNNER) -j 1 -u all -W --slowest --timeout=$(TESTTIMEOUT) $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ @@ -1026,7 +1042,7 @@ QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multiprocessing_forkserver \ test_mailbox test_socket test_poll \ test_select test_zipfile test_concurrent_futures -quicktest: @DEF_MAKE_RULE@ platform +quicktest: all platform $(TESTRUNNER) $(QUICKTESTOPTS) @@ -1171,16 +1187,16 @@ maninstall: altmaninstall (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python3.1) # Install the library -PLATDIR= @PLATDIR@ -MACHDEPS= $(PLATDIR) XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk site-packages test \ test/audiodata \ test/capath test/data \ test/cjkencodings test/decimaltestdata test/xmltestdata \ + test/dtracedata \ test/eintrdata \ test/imghdrdata \ + test/libregrtest \ test/subprocessdata test/sndhdrdata test/support \ test/tracedmodules test/encoded_modules \ test/test_import \ @@ -1228,9 +1244,9 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ turtledemo \ multiprocessing multiprocessing/dummy \ unittest unittest/test unittest/test/testmock \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ - curses pydoc_data $(MACHDEPS) -libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c + venv venv/scripts venv/scripts/posix \ + curses pydoc_data +libinstall: build_all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -1250,7 +1266,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c else true; \ fi; \ done - @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \ + @for i in $(srcdir)/Lib/*.py; \ do \ if test -x $$i; then \ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ @@ -1285,6 +1301,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c esac; \ done; \ done + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ + $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ @@ -1322,23 +1340,6 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -# Create the PLATDIR source directory, if one wasn't distributed.. -$(srcdir)/Lib/$(PLATDIR): - mkdir $(srcdir)/Lib/$(PLATDIR) - cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen - export PATH; PATH="`pwd`:$$PATH"; \ - export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ - export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ - export EXE; EXE="$(BUILDEXE)"; \ - if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \ - export PYTHON_FOR_BUILD; \ - if [ "$(BUILD_GNU_TYPE)" = "$(HOST_GNU_TYPE)" ]; then \ - PYTHON_FOR_BUILD="$(BUILDPYTHON)"; \ - else \ - PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \ - fi; \ - cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen - python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh # Substitution happens here, as the completely-expanded BINDIR # is not available in configure @@ -1378,7 +1379,7 @@ LIBPL= @LIBPL@ # pkgconfig directory LIBPC= $(LIBDIR)/pkgconfig -libainstall: @DEF_MAKE_RULE@ python-config +libainstall: all python-config @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -1435,7 +1436,7 @@ sharedinstall: sharedmods --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ - -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ # Here are a couple of targets for MacOSX again, to install a full @@ -1481,10 +1482,10 @@ frameworkinstallstructure: $(LDLIBRARY) # Install a number of symlinks to keep software that expects a normal unix # install (which includes python-config) happy. frameworkinstallmaclib: - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).a" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).dylib" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).a" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).dylib" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(LDVERSION).a" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(LDVERSION).dylib" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(VERSION).a" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(VERSION).dylib" $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(LDVERSION).dylib" $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib" @@ -1534,13 +1535,6 @@ config.status: $(srcdir)/configure .c.o: $(CC) -c $(PY_CORE_CFLAGS) -o $@ $< -# bpo-30104: dtoa.c uses union to cast double to unsigned long[2]. clang 4.0 -# with -O2 or higher and strict aliasing miscompiles the ratio() function -# causing rounding issues. Compile dtoa.c using -fno-strict-aliasing on clang. -# https://bugs.llvm.org//show_bug.cgi?id=31928 -Python/dtoa.o: Python/dtoa.c - $(CC) -c $(PY_CORE_CFLAGS) $(CFLAGS_ALIASING) -o $@ $< - # Run reindent on the library reindent: ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib @@ -1551,12 +1545,9 @@ recheck: $(SHELL) config.status --recheck $(SHELL) config.status -# Regenerate configure and pyconfig.h.in -.PHONY: autoconf +# Rebuild the configure script from configure.ac; also rebuild pyconfig.h.in autoconf: - # Regenerate the configure script from configure.ac using autoconf (cd $(srcdir); autoconf -Wall) - # Regenerate pyconfig.h.in from configure.ac using autoheader (cd $(srcdir); autoheader -Wall) # Create a tags file for vi @@ -1573,6 +1564,14 @@ TAGS:: etags Include/*.h; \ for i in $(SRCDIRS); do etags -a $$i/*.[ch]; done +# This fixes up the mtimes of checked-in generated files, assuming that they +# only *appear* to be outdated because of checkout order. +# This is run while preparing a source release tarball, and can be run manually +# to avoid bootstrap issues. +touch: + cd $(srcdir); \ + hg --config extensions.touch=Tools/hg/hgtouch.py touch -v + # Sanitation targets -- clean leaves libraries, executables and tags # files, which clobber removes as well pycremoval: @@ -1601,6 +1600,7 @@ clean: pycremoval -rm -f Lib/lib2to3/*Grammar*.pickle -rm -f Programs/_testembed Programs/_freeze_importlib -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';' + -rm -f Include/pydtrace_probes.h profile-removal: find . -name '*.gc??' -exec rm -f {} ';' @@ -1639,7 +1639,7 @@ distclean: clobber -exec rm -f {} ';' # Check for smelly exported symbols (not starting with Py/_Py) -smelly: @DEF_MAKE_RULE@ +smelly: all nm -p $(LIBRARY) | \ sed -n "/ [TDB] /s/.* //p" | grep -v "^_*Py" | sort -u; \ @@ -1665,7 +1665,6 @@ funny: -o -name '*.tmSnippet' \ -o -name 'Setup' \ -o -name 'Setup.*' \ - -o -name regen \ -o -name README \ -o -name NEWS \ -o -name HISTORY \ @@ -1677,7 +1676,7 @@ funny: -o -print # Perform some verification checks on any modified files. -patchcheck: @DEF_MAKE_RULE@ +patchcheck: all $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py # Dependencies @@ -1690,7 +1689,7 @@ Python/thread.o: @THREADHEADERS@ .PHONY: maninstall libinstall inclinstall libainstall sharedinstall .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools -.PHONY: frameworkaltinstallunixtools recheck clean clobber distclean +.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean .PHONY: smelly funny patchcheck touch altmaninstall commoninstall .PHONY: gdbhooks diff --git a/Misc/ACKS b/Misc/ACKS index fbf110d..2a3a278 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -41,7 +41,6 @@ A. Amoroso Mark Anacker Shashwat Anand Anders Andersen -Tycho Andersen John Anderson Pehr Anderson Erik Andersén @@ -56,7 +55,6 @@ Ankur Ankan Heidi Annexstad Ramchandra Apte Éric Araujo -Alexandru Ardelean Alicia Arlen Jeffrey Armstrong Jason Asbahr @@ -122,6 +120,7 @@ Ben Bell Thomas Bellman Alexander “Саша” Belopolsky Eli Bendersky +Nikhil Benesch David Benjamin Oscar Benjamin Andrew Bennetts @@ -157,7 +156,7 @@ Finn Bock Paul Boddie Matthew Boedicker Robin Boerdijk -Andra Bogildea +Nikolay Bogoychev David Bolen Wouter Bolsterlee Gawain Bolton @@ -190,7 +189,6 @@ Tom Bridgman Anthony Briggs Keith Briggs Tobias Brink -Dillon Brock Richard Brodie Michael Broghton Ammar Brohi @@ -219,7 +217,6 @@ Alastair Burt Tarn Weisner Burton Lee Busby Katherine Busch -Matthias Bussonnier Ralph Butler Laurent De Buyst Zach Byrne @@ -247,6 +244,7 @@ Octavian Cerna Michael Cetrulo Dave Chambers Pascal Chambon +Nicholas Chammas John Chandler Hye-Shik Chang Jeffrey Chang @@ -305,22 +303,24 @@ Garrett Cooper Greg Copeland Ian Cordasco Aldo Cortesi -Mircea Cosbuc David Costanzo Scott Cotton Greg Couch David Cournapeau Julien Courteau Steve Cousins +Francisco Couzo Alex Coventry Matthew Dixon Cowles Ryan Coyner Christopher A. Craig Jeremy Craven Laura Creighton +Tyler Crompton Simon Cross Felipe Cruz Drew Csillag +Alessandro Cucci Joaquin Cuenca Abela Sebastian Cufre John Cugini @@ -343,7 +343,6 @@ A. Jesse Jiryu Davis Merlijn van Deen John DeGood Ned Deily -Jim DeLaHunt Vincent Delft Arnaud Delobelle Konrad Delong @@ -366,6 +365,7 @@ Humberto Diogenes Yves Dionne Daniel Dittmar Josip Djolonga +Walter Dörwald Jaromir Dolecek Ismail Donmez Robert Donohue @@ -393,7 +393,6 @@ Eugene Dvurechenski Karmen Dykstra Josip Dzolonga Maxim Dzumanenko -Walter Dörwald Hans Eckardt Rodolpho Eckhardt Ulrich Eckhardt @@ -536,7 +535,6 @@ Tim Graham Kim Gräsman Nathaniel Gray Eddy De Greef -Duane Griffin Grant Griffin Andrea Griffini Duncan Grisby @@ -546,7 +544,6 @@ Eric Groo Daniel Andrade Groppe Dag Gruneau Filip Gruszczyński -Grzegorz Grzywacz Thomas Guettler Yuyang Guo Anuj Gupta @@ -554,8 +551,10 @@ Michael Guravage Lars Gustäbel Thomas Güttler Jonas H. +Joseph Hackman Barry Haddow Philipp Hagemeister +John Hagen Paul ten Hagen Rasmus Hahn Peter Haight @@ -612,7 +611,6 @@ Wouter van Heyst Kelsey Hightower Jason Hildebrand Aaron Hill -Joel Hillacre Richie Hindle Konrad Hinsen David Hobley @@ -764,13 +762,11 @@ Lawrence Kesteloot Vivek Khera Dhiru Kholia Akshit Khurana -Sanyam Khurana Mads Kiilerich Jason Killen Jan Kim Taek Joo Kim Sam Kimbrel -Tomohiko Kinebuchi James King W. Trevor King Paul Kippes @@ -797,6 +793,7 @@ Damon Kohler Marko Kohtala Vajrasky Kok Guido Kollerie +Jacek Kołodziej Jacek Konieczny Arkady Koplyarov Peter A. Koren @@ -808,6 +805,7 @@ Daniel Kozan Jerzy Kozera Maksim Kozyarchuk Stefan Krah +Rolf Krahl Bob Kras Sebastian Kreft Holger Krekel @@ -840,6 +838,7 @@ Torsten Landschoff Tino Lange Glenn Langford Andrew Langmead +Wolfgang Langner Detlef Lannert Soren Larsen Amos Latteier @@ -851,7 +850,6 @@ Julia Lawall Chris Lawrence Mark Lawrence Chris Laws -Michael Layzell Michael Lazar Brian Leair Mathieu Leduc-Hamel @@ -903,24 +901,27 @@ Eric Lindvall Gregor Lingl Everett Lipman Mirko Liss +Alexander Liu Nick Lockwood Stephanie Lockwood +Martin von Löwis Hugo Lopes Tavares Guillermo López-Anglada Anne Lord +Alex LordThorsen Tom Loredo Justin Love Ned Jackson Lovely Peter Lovett Chalmer Lowe Jason Lowe -Martin von Löwis Tony Lownds Ray Loyzaga Kang-Hao (Kenny) Lu Lukas Lueg Loren Luke Fredrik Lundh +Mike Lundy Zhongyue Luo Mark Lutz Taras Lyapun @@ -1057,13 +1058,11 @@ Vilmos Nebehaj Fredrik Nehr Tony Nelson Trent Nelson -Osvaldo Santana Neto Chad Netzer Max Neunhöffer Anthon van der Neut George Neville-Neil Hieu Nguyen -Nam Nguyen Johannes Nicolai Samuel Nicolary Jonathan Niehof @@ -1095,7 +1094,6 @@ Milan Oberkirch Pascal Oberndoerfer Jeffrey Ollie Adam Olsen -Bryan Olson Grant Olson Koray Oner Piet van Oostrum @@ -1104,9 +1102,7 @@ Jason Orendorff Douglas Orr William Orr Michele Orrù -Tomáš Orsava Oleg Oshmyan -Denis Osipov Denis S. Otkidach Peter Otten Michael Otteneder @@ -1142,7 +1138,6 @@ Alecsandru Patrascu Randy Pausch Samuele Pedroni Justin Peel -Loic Pefferkorn Marcel van der Peijl Berker Peksag Andreas Pelme @@ -1168,9 +1163,11 @@ Ronny Pfannschmidt Geoff Philbrick Gavrie Philipson Adrian Phillips +Dusty Phillips Christopher J. Phoenix James Pickering Neale Pickett +Steve Piercy Jim St. Pierre Dan Pierson Martijn Pieters @@ -1222,6 +1219,7 @@ Jeff Ramnani Bayard Randel Varpu Rantala Brodie Rao +Rémi Rampin Senko Rasic Antti Rasinen Nikolaus Rath @@ -1272,6 +1270,7 @@ Mark Roddy Kevin Rodgers Sean Rodman Giampaolo Rodola +Mauro S. M. Rodrigues Elson Rodriguez Adi Roiban Luis Rojas @@ -1315,6 +1314,7 @@ Constantina S. Matthieu S Patrick Sabin Sébastien Sablé +Amit Saha Suman Saha Hajime Saitou George Sakkis @@ -1348,6 +1348,7 @@ Michael Schneider Peter Schneider-Kamp Arvin Schnell Nofar Schnider +Ed Schouten Scott Schram Robin Schreiber Chad J. Schroeder @@ -1360,7 +1361,6 @@ Federico Schwindt Barry Scott Steven Scott Nick Seidenman -Michael Seifert Žiga Seilnacht Yury Selivanov Fred Sells @@ -1423,6 +1423,7 @@ Mark Smith Roy Smith Ryan Smith-Roberts Rafal Smotrzyk +Josh Snider Eric Snow Dirk Soede Nir Soffer @@ -1450,11 +1451,13 @@ Greg Stein Marek Stepniowski Baruch Sterin Chris Stern +Eli Stevens Alex Stewart Victor Stinner Richard Stoakley Peter Stoehr Casper Stoel +Daniel Stokes Michael Stone Serhiy Storchaka Ken Stox @@ -1480,6 +1483,7 @@ John Szakmeister Piotr Szczepaniak Amir Szekely Maciej Szulik +Joel Taddei Arfrever Frehtes Taifersar Arahesis Hideaki Takahashi Takase Arihiro @@ -1492,8 +1496,10 @@ William Tanksley Christian Tanzer Steven Taschuk Amy Taylor +Julian Taylor Monty Taylor Anatoly Techtonik +Martin Teichmann Gustavo Temple Mikhail Terekhov Victor Terrón @@ -1675,6 +1681,7 @@ Arnon Yaari Alakshendra Yadav Hirokazu Yamamoto Ka-Ping Yee +Chi Hsuan Yen Jason Yeo EungJun Yi Bob Yodlowski @@ -1691,11 +1698,11 @@ Artur Zaprzala Mike Zarnstorff Yury V. Zaytsev Siebren van der Zee -Christophe Zeitouny Nickolai Zeldovich Yuxiao Zeng Uwe Zessin Cheng Zhang +Xiang Zhang Kai Zhu Tarek Ziadé Jelle Zijlstra @@ -1703,5 +1710,3 @@ Gennadiy Zlobin Doug Zongker Peter Åstrand evilzero -Chi Hsuan Yen -Dhushyanth Ramasamy diff --git a/Misc/HISTORY b/Misc/HISTORY index 38f3db5..6cadaec 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -8,6 +8,4307 @@ As you read on you go back to the dark ages of Python's history. ====================================================================== +What's New in Python 3.4.0? +=========================== + +Release date: 2014-03-16 + +Library +------- + +- Issue #20939: Fix test_geturl failure in test_urllibnet due to + new redirect of http://www.python.org/ to https://www.python.org. + +Documentation +------------- + +- Merge in all documentation changes since branching 3.4.0rc1. + + +What's New in Python 3.4.0 release candidate 3? +=============================================== + +Release date: 2014-03-09 + +Core and Builtins +----------------- + +- Issue #20786: Fix signatures for dict.__delitem__ and + property.__delete__ builtins. + +Library +------- + +- Issue #20839: Don't trigger a DeprecationWarning in the still supported + pkgutil.get_loader() API when __loader__ isn't set on a module (nor + when pkgutil.find_loader() is called directly). + +Build +----- + +- Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows. + +- Issue #20748: Uninstalling pip does not leave behind the pyc of + the uninstaller anymore. + +- Issue #20568: The Windows installer now installs the unversioned ``pip`` + command in addition to the versioned ``pip3`` and ``pip3.4`` commands. + +- Issue #20757: The ensurepip helper for the Windows uninstaller now skips + uninstalling pip (rather than failing) if the user has updated pip to a + different version from the one bundled with ensurepip. + +- Issue #20465: Update OS X and Windows installer builds to use + SQLite 3.8.3.1. + + +What's New in Python 3.4.0 release candidate 2? +=============================================== + +Release date: 2014-02-23 + +Core and Builtins +----------------- + +- Issue #20625: Parameter names in __annotations__ were not mangled properly. + Discovered by Jonas Wielicki, patch by Yury Selivanov. + +- Issue #20261: In pickle, lookup __getnewargs__ and __getnewargs_ex__ on the + type of the object. + +- Issue #20619: Give the AST nodes of keyword-only arguments a column and line + number. + +- Issue #20526: Revert changes of issue #19466 which introduces a regression: + don't clear anymore the state of Python threads early during the Python + shutdown. + +Library +------- + +- Issue #20710: The pydoc summary line no longer displays the "self" parameter + for bound methods. + +- Issue #20566: Change asyncio.as_completed() to use a Queue, to + avoid O(N**2) behavior. + +- Issue #20704: Implement new debug API in asyncio. Add new methods + BaseEventLoop.set_debug() and BaseEventLoop.get_debug(). + Add support for setting 'asyncio.tasks._DEBUG' variable with + 'PYTHONASYNCIODEBUG' environment variable. + +- asyncio: Refactoring and fixes: BaseEventLoop.sock_connect() raises an + error if the address is not resolved; use __slots__ in Handle and + TimerHandle; as_completed() and wait() raise TypeError if the passed + list of Futures is a single Future; call_soon() and other 'call_*()' + functions raise TypeError if the passed callback is a coroutine + function; _ProactorBasePipeTransport uses _FlowControlMixin; + WriteTransport.set_write_buffer_size() calls _maybe_pause_protocol() + to consider pausing receiving if the watermark limits have changed; + fix _check_resolved_address() for IPv6 address; and other minor + improvements, along with multiple documentation updates. + +- Issue #20684: Fix inspect.getfullargspec() to not to follow __wrapped__ + chains. Make its behaviour consistent with bound methods first argument. + Patch by Nick Coghlan and Yury Selivanov. + +- Issue #20681: Add new error handling API in asyncio. New APIs: + loop.set_exception_handler(), loop.default_exception_handler(), and + loop.call_exception_handler(). + +- Issue #20673: Implement support for UNIX Domain Sockets in asyncio. + New APIs: loop.create_unix_connection(), loop.create_unix_server(), + streams.open_unix_connection(), and streams.start_unix_server(). + +- Issue #20616: Add a format() method to tracemalloc.Traceback. + +- Issue #19744: the ensurepip installation step now just prints a warning to + stderr rather than failing outright if SSL/TLS is unavailable. This allows + local installation of POSIX builds without SSL/TLS support. + +- Issue #20594: Avoid name clash with the libc function posix_close. + +Build +----- + +- Issue #20641: Run MSI custom actions (pip installation, pyc compilation) + with the NoImpersonate flag, to support elevated execution (UAC). + +- Issue #20221: Removed conflicting (or circular) hypot definition when + compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. + +- Issue #20609: Restored the ability to build 64-bit Windows binaries on + 32-bit Windows, which was broken by the change in issue #19788. + + +What's New in Python 3.4.0 release candidate 1? +=============================================== + +Release date: 2014-02-10 + +Core and Builtins +----------------- + +- Issue #19255: The builtins module is restored to initial value before + cleaning other modules. The sys and builtins modules are cleaned last. + +- Issue #20588: Make Python-ast.c C89 compliant. + +- Issue #20437: Fixed 22 potential bugs when deleting object references. + +- Issue #20500: Displaying an exception at interpreter shutdown no longer + risks triggering an assertion failure in PyObject_Str. + +- Issue #20538: UTF-7 incremental decoder produced inconsistent string when + input was truncated in BASE64 section. + +- Issue #20404: io.TextIOWrapper (and hence the open() builtin) now uses the + internal codec marking system added for issue #19619 to throw LookupError + for known non-text encodings at stream construction time. The existing + output type checks remain in place to deal with unmarked third party + codecs. + +- Issue #17162: Add PyType_GetSlot. + +- Issue #20162: Fix an alignment issue in the siphash24() hash function which + caused a crash on PowerPC 64-bit (ppc64). + +Library +------- + +- Issue #20530: The signatures for slot builtins have been updated + to reflect the fact that they only accept positional-only arguments. + +- Issue #20517: Functions in the os module that accept two filenames + now register both filenames in the exception on failure. + +- Issue #20563: The ipaddress module API is now considered stable. + +- Issue #14983: email.generator now always adds a line end after each MIME + boundary marker, instead of doing so only when there is an epilogue. This + fixes an RFC compliance bug and solves an issue with signed MIME parts. + +- Issue #20540: Fix a performance regression (vs. Python 3.2) when layering + a multiprocessing Connection over a TCP socket. For small payloads, Nagle's + algorithm would introduce idle delays before the entire transmission of a + message. + +- Issue #16983: the new email header parsing code will now decode encoded words + that are (incorrectly) surrounded by quotes, and register a defect. + +- Issue #19772: email.generator no longer mutates the message object when + doing a down-transform from 8bit to 7bit CTEs. + +- Issue #20536: the statistics module now correctly handle Decimal instances + with positive exponents + +- Issue #18805: the netmask/hostmask parsing in ipaddress now more reliably + filters out illegal values and correctly allows any valid prefix length. + +- Issue #20481: For at least Python 3.4, the statistics module will require + that all inputs for a single operation be of a single consistent type, or + else a mixed of ints and a single other consistent type. This avoids + some interoperability issues that arose with the previous approach of + coercing to a suitable common type. + +- Issue #20478: the statistics module now treats collections.Counter inputs + like any other iterable. + +- Issue #17369: get_filename was raising an exception if the filename + parameter's RFC2231 encoding was broken in certain ways. This was + a regression relative to python2. + +- Issue #20013: Some imap servers disconnect if the current mailbox is + deleted, and imaplib did not handle that case gracefully. Now it + handles the 'bye' correctly. + +- Issue #20531: Revert 3.4 version of fix for #19063, and apply the 3.3 + version. That is, do *not* raise an error if unicode is passed to + email.message.Message.set_payload. + +- Issue #20476: If a non-compat32 policy is used with any of the email parsers, + EmailMessage is now used as the factory class. The factory class should + really come from the policy; that will get fixed in 3.5. + +- Issue #19920: TarFile.list() no longer fails when outputs a listing + containing non-encodable characters. Based on patch by Vajrasky Kok. + +- Issue #20515: Fix NULL pointer dereference introduced by issue #20368. + +- Issue #19186: Restore namespacing of expat symbols inside the pyexpat module. + +- Issue #20053: ensurepip (and hence venv) are no longer affected by the + settings in the default pip configuration file. + +- Issue #20426: When passing the re.DEBUG flag, re.compile() displays the + debug output every time it is called, regardless of the compilation cache. + +- Issue #20368: The null character now correctly passed from Tcl to Python. + Improved error handling in variables-related commands. + +- Issue #20435: Fix _pyio.StringIO.getvalue() to take into account newline + translation settings. + +- tracemalloc: Fix slicing traces and fix slicing a traceback. + +- Issue #20354: Fix an alignment issue in the tracemalloc module on 64-bit + platforms. Bug seen on 64-bit Linux when using "make profile-opt". + +- Issue #17159: inspect.signature now accepts duck types of functions, + which adds support for Cython functions. Initial patch by Stefan Behnel. + +- Issue #18801: Fix inspect.classify_class_attrs to correctly classify + object.__new__ and object.__init__. + +- Fixed cmath.isinf's name in its argument parsing code. + +- Issue #20311, #20452: poll and epoll now round the timeout away from zero, + instead of rounding towards zero, in select and selectors modules: + select.epoll.poll(), selectors.PollSelector.poll() and + selectors.EpollSelector.poll(). For example, a timeout of one microsecond + (1e-6) is now rounded to one millisecondi (1e-3), instead of being rounded to + zero. However, the granularity property and asyncio's resolution feature + were removed again. + +- asyncio: Some refactoring; various fixes; add write flow control to + unix pipes; Future.set_exception() instantiates the exception + argument if it is a class; improved proactor pipe transport; support + wait_for(f, None); don't log broken/disconnected pipes; use + ValueError instead of assert for forbidden subprocess_{shell,exec} + arguments; added a convenience API for subprocess management; added + StreamReader.at_eof(); properly handle duplicate coroutines/futures + in gather(), wait(), as_completed(); use a bytearray for buffering + in StreamReader; and more. + +- Issue #20288: fix handling of invalid numeric charrefs in HTMLParser. + +- Issue #20424: Python implementation of io.StringIO now supports lone surrogates. + +- Issue #20308: inspect.signature now works on classes without user-defined + __init__ or __new__ methods. + +- Issue #20372: inspect.getfile (and a bunch of other inspect functions that + use it) doesn't crash with unexpected AttributeError on classes defined in C + without __module__. + +- Issue #20356: inspect.signature formatting uses '/' to separate + positional-only parameters from others. + +- Issue #20223: inspect.signature now supports methods defined with + functools.partialmethods. + +- Issue #19456: ntpath.join() now joins relative paths correctly when a drive + is present. + +- Issue #19077: tempfile.TemporaryDirectory cleanup no longer fails when + called during shutdown. Emitting resource warning in __del__ no longer fails. + Original patch by Antoine Pitrou. + +- Issue #20394: Silence Coverity warning in audioop module. + +- Issue #20367: Fix behavior of concurrent.futures.as_completed() for + duplicate arguments. Patch by Glenn Langford. + +- Issue #8260: The read(), readline() and readlines() methods of + codecs.StreamReader returned incomplete data when were called after + readline() or read(size). Based on patch by Amaury Forgeot d'Arc. + +- Issue #20105: the codec exception chaining now correctly sets the + traceback of the original exception as its __traceback__ attribute. + +- Issue #17481: inspect.getfullargspec() now uses inspect.signature() API. + +- Issue #15304: concurrent.futures.wait() can block forever even if + Futures have completed. Patch by Glenn Langford. + +- Issue #14455: plistlib: fix serializing integers in the range + of an unsigned long long but outside of the range of signed long long for + binary plist files. + +IDLE +---- + +- Issue #20406: Use Python application icons for Idle window title bars. + Patch mostly by Serhiy Storchaka. + +- Update the python.gif icon for the Idle classbrowser and pathbowser + from the old green snake to the new blue and yellow snakes. + +- Issue #17721: Remove non-functional configuration dialog help button until we + make it actually gives some help when clicked. Patch by Guilherme Simões. + +Tests +----- + +- Issue #20532: Tests which use _testcapi now are marked as CPython only. + +- Issue #19920: Added tests for TarFile.list(). Based on patch by Vajrasky Kok. + +- Issue #19990: Added tests for the imghdr module. Based on patch by + Claudiu Popa. + +- Issue #20474: Fix test_socket "unexpected success" failures on OS X 10.7+. + +Tools/Demos +----------- + +- Issue #20530: Argument Clinic's signature format has been revised again. + The new syntax is highly human readable while still preventing false + positives. The syntax also extends Python syntax to denote "self" and + positional-only parameters, allowing inspect.Signature objects to be + totally accurate for all supported builtins in Python 3.4. + +- Issue #20456: Argument Clinic now observes the C preprocessor conditional + compilation statements of the C files it parses. When a Clinic block is + inside a conditional code, it adjusts its output to match, including + automatically generating an empty methoddef macro. + +- Issue #20456: Cloned functions in Argument Clinic now use the correct + name, not the name of the function they were cloned from, for text + strings inside generated code. + +- Issue #20456: Fixed Argument Clinic's test suite and "--converters" feature. + +- Issue #20456: Argument Clinic now allows specifying different names + for a parameter in Python and C, using "as" on the parameter line. + +- Issue #20326: Argument Clinic now uses a simple, unique signature to + annotate text signatures in docstrings, resulting in fewer false + positives. "self" parameters are also explicitly marked, allowing + inspect.Signature() to authoritatively detect (and skip) said parameters. + +- Issue #20326: Argument Clinic now generates separate checksums for the + input and output sections of the block, allowing external tools to verify + that the input has not changed (and thus the output is not out-of-date). + +Build +----- + +- Issue #20465: Update SQLite shipped with OS X installer to 3.8.3. + +C-API +----- + +- Issue #20517: Added new functions allowing OSError exceptions to reference + two filenames instead of one: PyErr_SetFromErrnoWithFilenameObjects() and + PyErr_SetExcFromWindowsErrWithFilenameObjects(). + +Documentation +------------- + +- Issue #20488: Change wording to say importlib is *the* implementation of + import instead of just *an* implementation. + +- Issue #6386: Clarify in the tutorial that specifying a symlink to execute + means the directory containing the executed script and not the symlink is + added to sys.path. + + +What's New in Python 3.4.0 Beta 3? +================================== + +Release date: 2014-01-26 + +Core and Builtins +----------------- + +- Issue #20189: Four additional builtin types (PyTypeObject, + PyMethodDescr_Type, _PyMethodWrapper_Type, and PyWrapperDescr_Type) + have been modified to provide introspection information for builtins. + +- Issue #17825: Cursor "^" is correctly positioned for SyntaxError and + IndentationError. + +- Issue #2382: SyntaxError cursor "^" is now written at correct position in most + cases when multibyte characters are in line (before "^"). This still not + works correctly with wide East Asian characters. + +- Issue #18960: The first line of Python script could be executed twice when + the source encoding was specified on the second line. Now the source encoding + declaration on the second line isn't effective if the first line contains + anything except a comment. 'python -x' works now again with files with the + source encoding declarations, and can be used to make Python batch files + on Windows. + +Library +------- + +- asyncio: Various improvements and small changes not all covered by + issues listed below. E.g. wait_for() now cancels the inner task if + the timeout occcurs; tweaked the set of exported symbols; renamed + Empty/Full to QueueEmpty/QueueFull; "with (yield from lock)" now + uses a separate context manager; readexactly() raises if not enough + data was read; PTY support tweaks. + +- Issue #20311: asyncio: Add a granularity attribute to BaseEventLoop: maximum + between the resolution of the BaseEventLoop.time() method and the resolution + of the selector. The granuarility is used in the scheduler to round time and + deadline. + +- Issue #20311: selectors: Add a resolution attribute to BaseSelector. + +- Issue #20189: unittest.mock now no longer assumes that any object for + which it could get an inspect.Signature is a callable written in Python. + Fix courtesy of Michael Foord. + +- Issue #20317: ExitStack.__exit__ could create a self-referential loop if an + exception raised by a cleanup operation already had its context set + correctly (for example, by the @contextmanager decorator). The infinite + loop this caused is now avoided by checking if the expected context is + already set before trying to fix it. + +- Issue #20374: Fix build with GNU readline >= 6.3. + +- Issue #20262: Warnings are raised now when duplicate names are added in the + ZIP file or too long ZIP file comment is truncated. + +- Issue #20165: The unittest module no longer considers tests marked with + @expectedFailure successful if they pass. + +- Issue #18574: Added missing newline in 100-Continue reply from + http.server.BaseHTTPRequestHandler. Patch by Nikolaus Rath. + +- Issue #20270: urllib.urlparse now supports empty ports. + +- Issue #20243: TarFile no longer raise ReadError when opened in write mode. + +- Issue #20238: TarFile opened with external fileobj and "w:gz" mode didn't + write complete output on close. + +- Issue #20245: The open functions in the tarfile module now correctly handle + empty mode. + +- Issue #20242: Fixed basicConfig() format strings for the alternative + formatting styles. Thanks to kespindler for the bug report and patch. + +- Issue #20246: Fix buffer overflow in socket.recvfrom_into. + +- Issues #20206 and #5803: Fix edge case in email.quoprimime.encode where it + truncated lines ending in a character needing encoding but no newline by + using a more efficient algorithm that doesn't have the bug. + +- Issue #19082: Working xmlrpc.server and xmlrpc.client examples. Both in + modules and in documentation. Initial patch contributed by Vajrasky Kok. + +- Issue #20138: The wsgiref.application_uri() and wsgiref.request_uri() + functions now conform to PEP 3333 when handle non-ASCII URLs. + +- Issue #19097: Raise the correct Exception when cgi.FieldStorage is given an + invalid fileobj. + +- Issue #20152: Ported Python/import.c over to Argument Clinic. + +- Issue #13107: argparse and optparse no longer raises an exception when output + a help on environment with too small COLUMNS. Based on patch by + Elazar Gershuni. + +- Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly + asked for. + +- Issue #18960: The tokenize module now ignore the source encoding declaration + on the second line if the first line contains anything except a comment. + +- Issue #20078: Reading malformed zipfiles no longer hangs with 100% CPU + consumption. + +- Issue #20113: os.readv() and os.writev() now raise an OSError exception on + error instead of returning -1. + +- Issue #19719: Make importlib.abc.MetaPathFinder.find_module(), + PathEntryFinder.find_loader(), and Loader.load_module() use PEP 451 APIs to + help with backwards-compatibility. + +- Issue #20144: inspect.Signature now supports parsing simple symbolic + constants as parameter default values in __text_signature__. + +- Issue #20072: Fixed multiple errors in tkinter with wantobjects is False. + +- Issue #20229: Avoid plistlib deprecation warning in platform.mac_ver(). + +- Issue #14455: Fix some problems with the new binary plist support in plistlib. + +IDLE +---- + +- Issue #17390: Add Python version to Idle editor window title bar. + Original patches by Edmond Burnett and Kent Johnson. + +- Issue #18960: IDLE now ignores the source encoding declaration on the second + line if the first line contains anything except a comment. + +Tests +----- + +- Issue #20358: Tests for curses.window.overlay and curses.window.overwrite + no longer specify min{row,col} > max{row,col}. + +- Issue #19804: The test_find_mac test in test_uuid is now skipped if the + ifconfig executable is not available. + +- Issue #19886: Use better estimated memory requirements for bigmem tests. + +Tools/Demos +----------- + +- Issue #20390: Argument Clinic's "file" output preset now defaults to + "{dirname}/clinic/{basename}.h". + +- Issue #20390: Argument Clinic's "class" directive syntax has been extended + with two new required arguments: "typedef" and "type_object". + +- Issue #20390: Argument Clinic: If __new__ or __init__ functions didn't use + kwargs (or args), the PyArg_NoKeywords (or PyArg_NoPositional) calls + generated are only run when the type object is an exact match. + +- Issue #20390: Argument Clinic now fails if you have required parameters after + optional parameters. + +- Issue #20390: Argument Clinic converters now have a new template they can + inject code into: "modifiers". Code put there is run in the parsing + function after argument parsing but before the call to the impl. + +- Issue #20376: Argument Clinic now escapes backslashes in docstrings. + +- Issue #20381: Argument Clinic now sanity checks the default argument when + c_default is also specified, providing a nice failure message for + disallowed values. + +- Issue #20189: Argument Clinic now ensures that parser functions for + __new__ are always of type newfunc, the type of the tp_new slot. + Similarly, parser functions for __init__ are now always of type initproc, + the type of tp_init. + +- Issue #20189: Argument Clinic now suppresses the docstring for __new__ + and __init__ functions if no docstring is provided in the input. + +- Issue #20189: Argument Clinic now suppresses the "self" parameter in the + impl for @staticmethod functions. + +- Issue #20294: Argument Clinic now supports argument parsing for __new__ and + __init__ functions. + +- Issue #20299: Argument Clinic custom converters may now change the default + value of c_default and py_default with a class member. + +- Issue #20287: Argument Clinic's output is now configurable, allowing + delaying its output or even redirecting it to a separate file. + +- Issue #20226: Argument Clinic now permits simple expressions + (e.g. "sys.maxsize - 1") as default values for parameters. + +- Issue #19936: Added executable bits or shebang lines to Python scripts which + requires them. Disable executable bits and shebang lines in test and + benchmark files in order to prevent using a random system python, and in + source files of modules which don't provide command line interface. Fixed + shebang lines in the unittestgui and checkpip scripts. + +- Issue #20268: Argument Clinic now supports cloning the parameters and + return converter of existing functions. + +- Issue #20228: Argument Clinic now has special support for class special + methods. + +- Issue #20214: Fixed a number of small issues and documentation errors in + Argument Clinic (see issue for details). + +- Issue #20196: Fixed a bug where Argument Clinic did not generate correct + parsing code for functions with positional-only parameters where all arguments + are optional. + +- Issue #18960: 2to3 and the findnocoding.py script now ignore the source + encoding declaration on the second line if the first line contains anything + except a comment. + +- Issue #19723: The marker comments Argument Clinic uses have been changed + to improve readability. + +- Issue #20157: When Argument Clinic renames a parameter because its name + collides with a C keyword, it no longer exposes that rename to PyArg_Parse. + +- Issue #20141: Improved Argument Clinic's support for the PyArg_Parse "O!" + format unit. + +- Issue #20144: Argument Clinic now supports simple symbolic constants + as parameter default values. + +- Issue #20143: The line numbers reported in Argument Clinic errors are + now more accurate. + +- Issue #20142: Py_buffer variables generated by Argument Clinic are now + initialized with a default value. + +Build +----- + +- Issue #12837: Silence a tautological comparison warning on OS X under Clang in + socketmodule.c. + + +What's New in Python 3.4.0 Beta 2? +================================== + +Release date: 2014-01-05 + +Core and Builtins +----------------- + +- Issue #17432: Drop UCS2 from names of Unicode functions in python3.def. + +- Issue #19526: Exclude all new API from the stable ABI. Exceptions can be + made if a need is demonstrated. + +- Issue #19969: PyBytes_FromFormatV() now raises an OverflowError if "%c" + argument is not in range [0; 255]. + +- Issue #19995: %c, %o, %x, and %X now issue a DeprecationWarning on non-integer + input; reworded docs to clarify that an integer type should define both __int__ + and __index__. + +- Issue #19787: PyThread_set_key_value() now always set the value. In Python + 3.3, the function did nothing if the key already exists (if the current value + is a non-NULL pointer). + +- Issue #14432: Remove the thread state field from the frame structure. Fix a + crash when a generator is created in a C thread that is destroyed while the + generator is still used. The issue was that a generator contains a frame, and + the frame kept a reference to the Python state of the destroyed C thread. The + crash occurs when a trace function is setup. + +- Issue #19576: PyGILState_Ensure() now initializes threads. At startup, Python + has no concrete GIL. If PyGILState_Ensure() is called from a new thread for + the first time and PyEval_InitThreads() was not called yet, a GIL needs to be + created. + +- Issue #17576: Deprecation warning emitted now when __int__() or __index__() + return not int instance. + +- Issue #19932: Fix typo in import.h, missing whitespaces in function prototypes. + +- Issue #19736: Add module-level statvfs constants defined for GNU/glibc + based systems. + +- Issue #20097: Fix bad use of "self" in importlib's WindowsRegistryFinder. + +- Issue #19729: In str.format(), fix recursive expansion in format spec. + +- Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2 + billion characters) input strings in _Py_dg_strtod. + +Library +------- + +- Issue #20154: Deadlock in asyncio.StreamReader.readexactly(). + +- Issue #16113: Remove sha3 module again. + +- Issue #20111: pathlib.Path.with_suffix() now sanity checks the given suffix. + +- Fix breakage in TestSuite.countTestCases() introduced by issue #11798. + +- Issue #20108: Avoid parameter name clash in inspect.getcallargs(). + +- Issue #19918: Fix PurePath.relative_to() under Windows. + +- Issue #19422: Explicitly disallow non-SOCK_STREAM sockets in the ssl + module, rather than silently let them emit clear text data. + +- Issue #20046: Locale alias table no longer contains entities which can be + calculated. Generalized support of the euro modifier. + +- Issue #20027: Fixed locale aliases for devanagari locales. + +- Issue #20067: Tkinter variables now work when wantobjects is false. + +- Issue #19020: Tkinter now uses splitlist() instead of split() in configure + methods. + +- Issue #19744: ensurepip now provides a better error message when Python is + built without SSL/TLS support (pip currently requires that support to run, + even if only operating with local wheel files) + +- Issue #19734: ensurepip now ignores all pip environment variables to avoid + odd behaviour based on user configuration settings + +- Fix TypeError on "setup.py upload --show-response". + +- Issue #20045: Fix "setup.py register --list-classifiers". + +- Issue #18879: When a method is looked up on a temporary file, avoid closing + the file before the method is possibly called. + +- Issue #20037: Avoid crashes when opening a text file late at interpreter + shutdown. + +- Issue #19967: Thanks to the PEP 442, asyncio.Future now uses a + destructor to log uncaught exceptions, instead of the dedicated + _TracebackLogger class. + +- Added a Task.current_task() class method to asyncio. + +- Issue #19850: Set SA_RESTART in asyncio when registering a signal + handler to limit EINTR occurrences. + +- Implemented write flow control in asyncio for proactor event loop (Windows). + +- Change write buffer in asyncio use to avoid O(N**2) behavior. Make + write()/sendto() accept bytearray/memoryview. + +- Issue #20034: Updated alias mapping to most recent locale.alias file + from X.org distribution using makelocalealias.py. + +- Issue #5815: Fixed support for locales with modifiers. Fixed support for + locale encodings with hyphens. + +- Issue #20026: Fix the sqlite module to handle correctly invalid isolation + level (wrong type). + +- Issue #18829: csv.Dialect() now checks type for delimiter, escapechar and + quotechar fields. Original patch by Vajrasky Kok. + +- Issue #19855: uuid.getnode() on Unix now looks on the PATH for the + executables used to find the mac address, with /sbin and /usr/sbin as + fallbacks. + +- Issue #20007: HTTPResponse.read(0) no more prematurely closes connection. + Original patch by Simon Sapin. + +- Issue #19946: multiprocessing now uses runpy to initialize __main__ in + child processes when necessary, allowing it to correctly handle scripts + without suffixes and submodules that use explicit relative imports or + otherwise rely on parent modules being correctly imported prior to + execution. + +- Issue #19921: When Path.mkdir() is called with parents=True, any missing + parent is created with the default permissions, ignoring the mode argument + (mimicking the POSIX "mkdir -p" command). + +- Issue #19887: Improve the Path.resolve() algorithm to support certain + symlink chains. + +- Issue #19912: Fixed numerous bugs in ntpath.splitunc(). + +- Issue #19911: ntpath.splitdrive() now correctly processes the 'İ' character + (U+0130, LATIN CAPITAL LETTER I WITH DOT ABOVE). + +- Issue #19532: python -m compileall with no filename/directory arguments now + respects the -f and -q flags instead of ignoring them. + +- Issue #19623: Fixed writing to unseekable files in the aifc module. + +- Issue #19946: multiprocessing.spawn now raises ImportError when the module to + be used as the main module cannot be imported. + +- Issue #17919: select.poll.register() again works with poll.POLLNVAL on AIX. + Fixed integer overflow in the eventmask parameter. + +- Issue #19063: if a Charset's body_encoding was set to None, the email + package would generate a message claiming the Content-Transfer-Encoding + was 7bit, and produce garbage output for the content. This now works. + A couple of other set_payload mishandlings of non-ASCII are also fixed. + In addition, calling set_payload with a string argument without + specifying a charset now raises an error (this is a new error in 3.4). + +- Issue #15475: Add __sizeof__ implementations for itertools objects. + +- Issue #19944: Fix importlib.find_spec() so it imports parents as needed + and move the function to importlib.util. + +- Issue #19880: Fix a reference leak in unittest.TestCase. Explicitly break + reference cycles between frames and the _Outcome instance. + +- Issue #17429: platform.linux_distribution() now decodes files from the UTF-8 + encoding with the surrogateescape error handler, instead of decoding from the + locale encoding in strict mode. It fixes the function on Fedora 19 which is + probably the first major distribution release with a non-ASCII name. Patch + written by Toshio Kuratomi. + +- Issue #19343: Expose FreeBSD-specific APIs in resource module. Original + patch by Koobs. + +- Issue #19929: Call os.read with 32768 within subprocess.Popen.communicate + rather than 4096 for efficiency. A microbenchmark shows Linux and OS X + both using ~50% less cpu time this way. + +- Issue #19506: Use a memoryview to avoid a data copy when piping data + to stdin within subprocess.Popen.communicate. 5-10% less cpu usage. + +- Issue #19876: selectors unregister() no longer raises ValueError or OSError + if the FD is closed (as long as it was registered). + +- Issue #19908: pathlib now joins relative Windows paths correctly when a drive + is present. Original patch by Antoine Pitrou. + +- Issue #19296: Silence compiler warning in dbm_open + +- Issue #6784: Strings from Python 2 can now be unpickled as bytes + objects by setting the encoding argument of Unpickler to be 'bytes'. + Initial patch by Merlijn van Deen. + +- Issue #19839: Fix regression in bz2 module's handling of non-bzip2 data at + EOF, and analogous bug in lzma module. + +- Issue #19881: Fix pickling bug where cpickle would emit bad pickle data for + large bytes string (i.e., with size greater than 2**32-1). + +- Issue #19138: doctest's IGNORE_EXCEPTION_DETAIL now allows a match when + no exception detail exists (no colon following the exception's name, or + a colon does follow but no text follows the colon). + +- Issue #19927: Add __eq__ to path-based loaders in importlib. + +- Issue #19827: On UNIX, setblocking() and settimeout() methods of + socket.socket can now avoid a second syscall if the ioctl() function can be + used, or if the non-blocking flag of the socket is unchanged. + +- Issue #19785: smtplib now supports SSLContext.check_hostname and server name + indication for TLS/SSL connections. + +- Issue #19784: poplib now supports SSLContext.check_hostname and server name + indication for TLS/SSL connections. + +- Issue #19783: nntplib now supports SSLContext.check_hostname and server name + indication for TLS/SSL connections. + +- Issue #19782: imaplib now supports SSLContext.check_hostname and server name + indication for TLS/SSL connections. + +- Issue #20123: Fix pydoc.synopsis() for "binary" modules. + +- Issue #19834: Support unpickling of exceptions pickled by Python 2. + +- Issue #19781: ftplib now supports SSLContext.check_hostname and server name + indication for TLS/SSL connections. + +- Issue #19509: Add SSLContext.check_hostname to match the peer's certificate + with server_hostname on handshake. + +- Issue #15798: Fixed subprocess.Popen() to no longer fail if file + descriptor 0, 1 or 2 is closed. + +- Issue #17897: Optimized unpickle prefetching. + +- Issue #3693: Make the error message more helpful when the array.array() + constructor is given a str. Move the array module typecode documentation to + the docstring of the constructor. + +- Issue #19088: Fixed incorrect caching of the copyreg module in + object.__reduce__() and object.__reduce_ex__(). + +- Issue #19698: Removed exec_module() methods from + importlib.machinery.BuiltinImporter and ExtensionFileLoader. + +- Issue #18864: Added a setter for ModuleSpec.has_location. + +- Fixed _pickle.Unpickler to not fail when loading empty strings as + persistent IDs. + +- Issue #11480: Fixed copy.copy to work with classes with custom metaclasses. + Patch by Daniel Urban. + +- Issue #6477: Added support for pickling the types of built-in singletons + (i.e., Ellipsis, NotImplemented, None). + +- Issue #19713: Add remaining PEP 451-related deprecations and move away + from using find_module/find_loaer/load_module. + +- Issue #19708: Update pkgutil to use the new importer APIs. + +- Issue #19703: Update pydoc to use the new importer APIs. + +- Issue #19851: Fixed a regression in reloading sub-modules. + +- ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME. + +- Issue #19802: Add socket.SO_PRIORITY. + +- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with + virtual interface. Original patch by Kent Frazier. + +- Issue #11489: JSON decoder now accepts lone surrogates. + +- Issue #19545: Avoid chained exceptions while passing stray % to + time.strptime(). Initial patch by Claudiu Popa. + +IDLE +---- + +- Issue #20058: sys.stdin.readline() in IDLE now always returns only one line. + +- Issue #19481: print() of string subclass instance in IDLE no longer hangs. + +- Issue #18270: Prevent possible IDLE AttributeError on OS X when no initial + shell window is present. + +Tests +----- + +- Issue #20055: Fix test_shutil under Windows with symlink privileges held. + Patch by Vajrasky Kok. + +- Issue #20070: Don't run test_urllib2net when network resources are not + enabled. + +- Issue #19938: Re-enabled test_bug_1333982 in test_dis, which had been + disabled since 3.0 due to the changes in listcomp handling. + +- Issue #19320: test_tcl no longer fails when wantobjects is false. + +- Issue #19919: Fix flaky SSL test. connect_ex() sometimes returns + EWOULDBLOCK on Windows or VMs hosted on Windows. + +- Issue #19912: Added tests for ntpath.splitunc(). + +- Issue #19828: Fixed test_site when the whole suite is run with -S. + +- Issue #19928: Implemented a test for repr() of cell objects. + +- Issue #19535: Fixed test_docxmlrpc, test_functools, test_inspect, and + test_statistics when python is run with -OO. + +- Issue #19926: Removed unneeded test_main from test_abstract_numbers. + Patch by Vajrasky Kok. + +- Issue #19572: More skipped tests explicitly marked as skipped. + +- Issue #19595, #19987: Re-enabled a long-disabled test in test_winsound. + +- Issue #19588: Fixed tests in test_random that were silently skipped most + of the time. Patch by Julian Gindi. + +Build +----- + +- Issue #19728: Enable pip installation by default on Windows. + +- Issue #16136: Remove VMS support + +- Issue #18215: Add script Tools/ssl/test_multiple_versions.py to compile and + run Python's unit tests with multiple versions of OpenSSL. + +- Issue #19922: define _INCLUDE__STDC_A1_SOURCE in HP-UX to include mbstate_t + for mbrtowc(). + +- Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the + pythoncore sub-project. This should prevent build errors due a previous + build's python(_d).exe still running. + +Documentation +------------- + +- Issue #20265: Updated some parts of the Using Windows document. + +- Issue #20266: Updated some parts of the Windows FAQ. + +- Issue #20255: Updated the about and bugs pages. + +- Issue #20253: Fixed a typo in the ipaddress docs that advertised an + illegal attribute name. Found by INADA Naoki. + +- Issue #18840: Introduce the json module in the tutorial, and de-emphasize + the pickle module. + +- Issue #19845: Updated the Compiling Python on Windows section. + +- Issue #19795: Improved markup of True/False constants. + +Tools/Demos +----------- + +- Issue #19659: Added documentation for Argument Clinic. + +- Issue #19976: Argument Clinic METH_NOARGS functions now always + take two parameters. + + +What's New in Python 3.4.0 Beta 1? +================================== + +Release date: 2013-11-24 + +Core and Builtins +----------------- + +- Use the repr of a module name in more places in import, especially + exceptions. + +- Issue #19619: str.encode, bytes.decode and bytearray.decode now use an + internal API to throw LookupError for known non-text encodings, rather + than attempting the encoding or decoding operation and then throwing a + TypeError for an unexpected output type. (The latter mechanism remains + in place for third party non-text encodings) + +- Issue #19183: Implement PEP 456 'secure and interchangeable hash algorithm'. + Python now uses SipHash24 on all major platforms. + +- Issue #12892: The utf-16* and utf-32* encoders no longer allow surrogate code + points (U+D800-U+DFFF) to be encoded. The utf-32* decoders no longer decode + byte sequences that correspond to surrogate code points. The surrogatepass + error handler now works with the utf-16* and utf-32* codecs. Based on + patches by Victor Stinner and Kang-Hao (Kenny) Lu. + +- Issue #17806: Added keyword-argument support for "tabsize" to + str/bytes.expandtabs(). + +- Issue #17828: Output type errors in str.encode(), bytes.decode() and + bytearray.decode() now direct users to codecs.encode() or codecs.decode() + as appropriate. + +- Issue #17828: The interpreter now attempts to chain errors that occur in + codec processing with a replacement exception of the same type that + includes the codec name in the error message. It ensures it only does this + when the creation of the replacement exception won't lose any information. + +- Issue #19466: Clear the frames of daemon threads earlier during the + Python shutdown to call object destructors. So "unclosed file" resource + warnings are now correctly emitted for daemon threads. + +- Issue #19514: Deduplicate some _Py_IDENTIFIER declarations. + Patch by Andrei Dorian Duma. + +- Issue #17936: Fix O(n**2) behaviour when adding or removing many subclasses + of a given type. + +- Issue #19428: zipimport now handles errors when reading truncated or invalid + ZIP archive. + +- Issue #18408: Add a new PyFrame_FastToLocalsWithError() function to handle + exceptions when merging fast locals into f_locals of a frame. + PyEval_GetLocals() now raises an exception and return NULL on failure. + +- Issue #19369: Optimized the usage of __length_hint__(). + +- Issue #28026: Raise ImportError when exec_module() exists but + create_module() is missing. + +- Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the + Python executable and not removed by the linker's optimizer. + +- Issue #19306: Add extra hints to the faulthandler module's stack + dumps that these are "upside down". + +Library +------- + +- Issue #3158: doctest can now find doctests in functions and methods + written in C. + +- Issue #13477: Added command line interface to the tarfile module. + Original patch by Berker Peksag. + +- Issue #19674: inspect.signature() now produces a correct signature + for some builtins. + +- Issue #19722: Added opcode.stack_effect(), which + computes the stack effect of bytecode instructions. + +- Issue #19735: Implement private function ssl._create_stdlib_context() to + create SSLContext objects in Python's stdlib module. It provides a single + configuration point and makes use of SSLContext.load_default_certs(). + +- Issue #16203: Add re.fullmatch() function and regex.fullmatch() method, + which anchor the pattern at both ends of the string to match. + Original patch by Matthew Barnett. + +- Issue #13592: Improved the repr for regular expression pattern objects. + Based on patch by Hugo Lopes Tavares. + +- Issue #19641: Added the audioop.byteswap() function to convert big-endian + samples to little-endian and vice versa. + +- Issue #15204: Deprecated the 'U' mode in file-like objects. + +- Issue #17810: Implement PEP 3154, pickle protocol 4. + +- Issue #19668: Added support for the cp1125 encoding. + +- Issue #19689: Add ssl.create_default_context() factory function. It creates + a new SSLContext object with secure default settings. + +- Issue #19727: os.utime(..., None) is now potentially more precise + under Windows. + +- Issue #17201: ZIP64 extensions now are enabled by default. Patch by + William Mallard. + +- Issue #19292: Add SSLContext.load_default_certs() to load default root CA + certificates from default stores or system stores. By default the method + loads CA certs for authentication of server certs. + +- Issue #19673: Add pathlib to the stdlib as a provisional module (PEP 428). + +- Issue #16596: pdb in a generator now properly skips over yield and + yield from rather than stepping out of the generator into its + caller. (This is essential for stepping through asyncio coroutines.) + +- Issue #17916: Added dis.Bytecode.from_traceback() and + dis.Bytecode.current_offset to easily display "current instruction" + markers in the new disassembly API (Patch by Claudiu Popa). + +- Issue #19552: venv now supports bootstrapping pip into virtual environments + +- Issue #17134: Finalize interface to Windows' certificate store. Cert and + CRL enumeration are now two functions. enum_certificates() also returns + purpose flags as set of OIDs. + +- Issue #19555: Restore sysconfig.get_config_var('SO'), (and the distutils + equivalent) with a DeprecationWarning pointing people at $EXT_SUFFIX. + +- Issue #8813: Add SSLContext.verify_flags to change the verification flags + of the context in order to enable certification revocation list (CRL) + checks or strict X509 rules. + +- Issue #18294: Fix the zlib module to make it 64-bit safe. + +- Issue #19682: Fix compatibility issue with old version of OpenSSL that + was introduced by Issue #18379. + +- Issue #14455: plistlib now supports binary plists and has an updated API. + +- Issue #19633: Fixed writing not compressed 16- and 32-bit wave files on + big-endian platforms. + +- Issue #18379: SSLSocket.getpeercert() returns CA issuer AIA fields, OCSP + and CRL distribution points. + +- Issue #18138: Implement cadata argument of SSLContext.load_verify_location() + to load CA certificates and CRL from memory. It supports PEM and DER + encoded strings. + +- Issue #18775: Add name and block_size attribute to HMAC object. They now + provide the same API elements as non-keyed cryptographic hash functions. + +- Issue #17276: MD5 as default digestmod for HMAC is deprecated. The HMAC + module supports digestmod names, e.g. hmac.HMAC('sha1'). + +- Issue #19449: in csv's writerow, handle non-string keys when generating the + error message that certain keys are not in the 'fieldnames' list. + +- Issue #13633: Added a new convert_charrefs keyword arg to HTMLParser that, + when True, automatically converts all character references. + +- Issue #2927: Added the unescape() function to the html module. + +- Issue #8402: Added the escape() function to the glob module. + +- Issue #17618: Add Base85 and Ascii85 encoding/decoding to the base64 module. + +- Issue #19634: time.strftime("%y") now raises a ValueError on AIX when given a + year before 1900. + +- Fix test.support.bind_port() to not cause an error when Python was compiled + on a system with SO_REUSEPORT defined in the headers but run on a system + with an OS kernel that does not support that reasonably new socket option. + +- Fix compilation error under gcc of the ctypes module bundled libffi for arm. + +- Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID, + NID, short name and long name. + +- Issue #19282: dbm.open now supports the context management protocol. + (Initial patch by Claudiu Popa) + +- Issue #8311: Added support for writing any bytes-like objects in the aifc, + sunau, and wave modules. + +- Issue #5202: Added support for unseekable files in the wave module. + +- Issue #19544 and Issue #1180: Restore global option to ignore + ~/.pydistutils.cfg in Distutils, accidentally removed in backout of + distutils2 changes. + +- Issue #19523: Closed FileHandler leak which occurred when delay was set. + +- Issue #19544 and Issue #6516: Restore support for --user and --group + parameters to sdist command accidentally rolled back as part of the + distutils2 rollback. + +- Issue #13674: Prevented time.strftime from crashing on Windows when given + a year before 1900 and a format of %y. + +- Issue #19406: implementation of the ensurepip module (part of PEP 453). + Patch by Donald Stufft and Nick Coghlan. + +- Issue #19544 and Issue #6286: Restore use of urllib over http allowing use + of http_proxy for Distutils upload command, a feature accidentally lost + in the rollback of distutils2. + +- Issue #19544 and Issue #7457: Restore the read_pkg_file method to + distutils.dist.DistributionMetadata accidentally removed in the undo of + distutils2. + +- Issue #16685: Added support for any bytes-like objects in the audioop module. + Removed support for strings. + +- Issue #7171: Add Windows implementation of ``inet_ntop`` and ``inet_pton`` + to socket module. Patch by Atsuo Ishimoto. + +- Issue #19261: Added support for writing 24-bit samples in the sunau module. + +- Issue #1097797: Added CP273 encoding, used on IBM mainframes in + Germany and Austria. Mapping provided by Michael Bierenfeld. + +- Issue #1575020: Fixed support of 24-bit wave files on big-endian platforms. + +- Issue #19378: Fixed a number of cases in the dis module where the new + "file" parameter was not being honoured correctly + +- Issue #19378: Removed the "dis.Bytecode.show_info" method + +- Issue #19378: Renamed the "dis.Bytecode.display_code" method to + "dis.Bytecode.dis" and converted it to returning a string rather than + printing output. + +- Issue #19378: the "line_offset" parameter in the new "dis.get_instructions" + API has been renamed to "first_line" (and the default value and usage + changed accordingly). This should reduce confusion with the more common use + of "offset" in the dis docs to refer to bytecode offsets. + +- Issue #18678: Corrected spwd struct member names in spwd module: + sp_nam->sp_namp, and sp_pwd->sp_pwdp. The old names are kept as extra + structseq members, for backward compatibility. + +- Issue #6157: Fixed tkinter.Text.debug(). tkinter.Text.bbox() now raises + TypeError instead of TclError on wrong number of arguments. Original patch + by Guilherme Polo. + +- Issue #10197: Rework subprocess.get[status]output to use subprocess + functionality and thus to work on Windows. Patch by Nick Coghlan + +- Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of + integers instead of a string. Based on patch by Guilherme Polo. + +- Issue #19403: contextlib.redirect_stdout is now reentrant + +- Issue #19286: Directories in ``package_data`` are no longer added to + the filelist, preventing failure outlined in the ticket. + +- Issue #19480: HTMLParser now accepts all valid start-tag names as defined + by the HTML5 standard. + +- Issue #15114: The html.parser module now raises a DeprecationWarning when the + strict argument of HTMLParser or the HTMLParser.error method are used. + +- Issue #19410: Undo the special-casing removal of '' for + importlib.machinery.FileFinder. + +- Issue #19424: Fix the warnings module to accept filename containing surrogate + characters. + +- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler. + +- Issue #19227: Remove pthread_atfork() handler. The handler was added to + solve #18747 but has caused issues. + +- Issue #19420: Fix reference leak in module initialization code of + _hashopenssl.c + +- Issue #19329: Optimized compiling charsets in regular expressions. + +- Issue #19227: Try to fix deadlocks caused by re-seeding then OpenSSL + pseudo-random number generator on fork(). + +- Issue #16037: HTTPMessage.readheaders() raises an HTTPException when more than + 100 headers are read. Adapted from patch by Jyrki Pulliainen. + +- Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to + prevent readline() calls from consuming too much memory. Patch by Jyrki + Pulliainen. + +- Issue #16041: CVE-2013-1752: poplib: Limit maximum line lengths to 2048 to + prevent readline() calls from consuming too much memory. Patch by Jyrki + Pulliainen. + +- Issue #17997: Change behavior of ``ssl.match_hostname()`` to follow RFC 6125, + for security reasons. It now doesn't match multiple wildcards nor wildcards + inside IDN fragments. + +- Issue #16039: CVE-2013-1752: Change use of readline in imaplib module to limit + line length. Patch by Emil Lind. + +- Issue #19330: the unnecessary wrapper functions have been removed from the + implementations of the new contextlib.redirect_stdout and + contextlib.suppress context managers, which also ensures they provide + reasonable help() output on instances + +- Issue #19393: Fix symtable.symtable function to not be confused when there are + functions or classes named "top". + +- Issue #18685: Restore re performance to pre-PEP 393 levels. + +- Issue #19339: telnetlib module is now using time.monotonic() when available + to compute timeout. + +- Issue #19399: fix sporadic test_subprocess failure. + +- Issue #13234: Fix os.listdir to work with extended paths on Windows. + Patch by Santoso Wijaya. + +- Issue #19375: The site module adding a "site-python" directory to sys.path, + if it exists, is now deprecated. + +- Issue #19379: Lazily import linecache in the warnings module, to make + startup with warnings faster until a warning gets printed. + +- Issue #19288: Fixed the "in" operator of dbm.gnu databases for string + argument. Original patch by Arfrever Frehtes Taifersar Arahesis. + +- Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string + argument. Original patch by Arfrever Frehtes Taifersar Arahesis. + +- Issue #19327: Fixed the working of regular expressions with too big charset. + +- Issue #17400: New 'is_global' attribute for ipaddress to tell if an address + is allocated by IANA for global or private networks. + +- Issue #19350: Increasing the test coverage of macurl2path. Patch by Colin + Williams. + +- Issue #19365: Optimized the parsing of long replacement string in re.sub*() + functions. + +- Issue #19352: Fix unittest discovery when a module can be reached + through several paths (e.g. under Debian/Ubuntu with virtualenv). + +- Issue #15207: Fix mimetypes to read from correct part of Windows registry + Original patch by Dave Chambers + +- Issue #16595: Add prlimit() to resource module. + +- Issue #19324: Expose Linux-specific constants in resource module. + +- Load SSL's error strings in hashlib. + +- Issue #18527: Upgrade internal copy of zlib to 1.2.8. + +- Issue #19274: Add a filterfunc parameter to PyZipFile.writepy. + +- Issue #8964: fix platform._sys_version to handle IronPython 2.6+. + Patch by Martin Matusiak. + +- Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules. + +- Issue #18958: Improve error message for json.load(s) while passing a string + that starts with a UTF-8 BOM. + +- Issue #19307: Improve error message for json.load(s) while passing objects + of the wrong type. + +- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by + limiting the call to readline(). Original patch by Michał + Jastrzębski and Giampaolo Rodola. + +- Issue #17087: Improved the repr for regular expression match objects. + +Tests +----- + +- Issue #19664: test_userdict's repr test no longer depends on the order + of dict elements. + +- Issue #19440: Clean up test_capi by removing an unnecessary __future__ + import, converting from test_main to unittest.main, and running the + _testcapi module tests as subTests of a unittest TestCase method. + +- Issue #19378: the main dis module tests are now run with both stdout + redirection *and* passing an explicit file parameter + +- Issue #19378: removed the not-actually-helpful assertInstructionMatches + and assertBytecodeExactlyMatches helpers from bytecode_helper + +- Issue #18702: All skipped tests now reported as skipped. + +- Issue #19439: interpreter embedding tests are now executed on Windows + (Patch by Zachary Ware) + +- Issue #19085: Added basic tests for all tkinter widget options. + +- Issue #19384: Fix test_py_compile for root user, patch by Claudiu Popa. + +Documentation +------------- + +- Issue #18326: Clarify that list.sort's arguments are keyword-only. Also, + attempt to reduce confusion in the glossary by not saying there are + different "types" of arguments and parameters. + +Build +----- + +- Issue #19358: "make clinic" now runs the Argument Clinic preprocessor + over all CPython source files. + +- Update SQLite to 3.8.1, xz to 5.0.5, and Tcl/Tk to 8.6.1 on Windows. + +- Issue #16632: Enable DEP and ASLR on Windows. + +- Issue #17791: Drop PREFIX and EXEC_PREFIX definitions from PC/pyconfig.h + +- Add workaround for VS 2010 nmake clean issue. VS 2010 doesn't set up PATH + for nmake.exe correctly. + +- Issue #19550: Implement Windows installer changes of PEP 453 (ensurepip). + +- Issue #19520: Fix compiler warning in the _sha3 module on 32bit Windows. + +- Issue #19356: Avoid using a C variabled named "_self", it's a reserved + word in some C compilers. + +- Issue #15792: Correct build options on Win64. Patch by Jeremy Kloth. + +- Issue #19373: Apply upstream change to Tk 8.5.15 fixing OS X 10.9 + screen refresh problem for OS X installer build. + +- Issue #19649: On OS X, the same set of file names are now installed + in bin directories for all configurations: non-framework vs framework, + and single arch vs universal builds. pythonx.y-32 is now always + installed for 64-bit/32-bit universal builds. The obsolete and + undocumented pythonw* symlinks are no longer installed anywhere. + +- Issue #19553: PEP 453 - "make install" and "make altinstall" now install or + upgrade pip by default, using the bundled pip provided by the new ensurepip + module. A new configure option, --with-ensurepip[=upgrade|install|no], is + available to override the default ensurepip "--upgrade" option. The option + can also be set with "make [alt]install ENSUREPIP=[upgrade|install|no]". + +- Issue #19551: PEP 453 - the OS X installer now installs pip by default. + +- Update third-party libraries for OS X installers: xz 5.0.3 -> 5.0.5, + SQLite 3.7.13 -> 3.8.1 + +- Issue #15663: Revert OS X installer built-in Tcl/Tk support for 3.4.0b1. + Some third-party projects, such as Matplotlib and PIL/Pillow, + depended on being able to build with Tcl and Tk frameworks in + /Library/Frameworks. + +Tools/Demos +----------- + +- Issue #19730: Argument Clinic now supports all the existing PyArg + "format units" as legacy converters, as well as two new features: + "self converters" and the "version" directive. + +- Issue #19552: pyvenv now bootstraps pip into virtual environments by + default (pass --without-pip to request the old behaviour) + +- Issue #19390: Argument Clinic no longer accepts malformed Python + and C ids. + + +What's New in Python 3.4.0 Alpha 4? +=================================== + +Release date: 2013-10-20 + +Core and Builtins +----------------- + +- Issue #19301: Give classes and functions that are explicitly marked global a + global qualname. + +- Issue #19279: UTF-7 decoder no longer produces illegal strings. + +- Issue #16612: Add "Argument Clinic", a compile-time preprocessor for + C files to generate argument parsing code. (See PEP 436.) + +- Issue #18810: Shift stat calls in importlib.machinery.FileFinder such that + the code is optimistic that if something exists in a directory named exactly + like the possible package being searched for that it's in actuality a + directory. + +- Issue #18416: importlib.machinery.PathFinder now treats '' as the cwd and + importlib.machinery.FileFinder no longer special-cases '' to '.'. This leads + to modules imported from cwd to now possess an absolute file path for + __file__ (this does not affect modules specified by path on the CLI but it + does affect -m/runpy). It also allows FileFinder to be more consistent by not + having an edge case. + +- Issue #4555: All exported C symbols are now prefixed with either + "Py" or "_Py". + +- Issue #19219: Speed up marshal.loads(), and make pyc files slightly + (5% to 10%) smaller. + +- Issue #19221: Upgrade Unicode database to version 6.3.0. + +- Issue #16742: The result of the C callback PyOS_ReadlineFunctionPointer must + now be a string allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or NULL + if an error occurred), instead of a string allocated by PyMem_Malloc() or + PyMem_Realloc(). + +- Issue #19199: Remove ``PyThreadState.tick_counter`` field + +- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at + least one place so as to avoid regressions. + +- Issue #19087: Improve bytearray allocation in order to allow cheap popping + of data at the front (slice deletion). + +- Issue #19014: memoryview.cast() is now allowed on zero-length views. + +- Issue #18690: memoryview is now automatically registered with + collections.abc.Sequence + +- Issue #19078: memoryview now correctly supports the reversed builtin + (Patch by Claudiu Popa) + +Library +------- + +- Issue #17457: unittest test discovery now works with namespace packages. + Patch by Claudiu Popa. + +- Issue #18235: Fix the sysconfig variables LDSHARED and BLDSHARED under AIX. + Patch by David Edelsohn. + +- Issue #18606: Add the new "statistics" module (PEP 450). Contributed + by Steven D'Aprano. + +- Issue #12866: The audioop module now supports 24-bit samples. + +- Issue #19254: Provide an optimized Python implementation of pbkdf2_hmac. + +- Issues #19201, Issue #19222, Issue #19223: Add "x" mode (exclusive creation) + in opening file to bz2, gzip and lzma modules. Patches by Tim Heaney and + Vajrasky Kok. + +- Fix a reference count leak in _sre. + +- Issue #19262: Initial check in of the 'asyncio' package (a.k.a. Tulip, + a.k.a. PEP 3156). There are no docs yet, and the PEP is slightly + out of date with the code. This module will have *provisional* status + in Python 3.4. + +- Issue #19276: Fixed the wave module on 64-bit big-endian platforms. + +- Issue #19266: Rename the new-in-3.4 ``contextlib.ignore`` context manager + to ``contextlib.suppress`` in order to be more consistent with existing + descriptions of that operation elsewhere in the language and standard + library documentation (Patch by Zero Piraeus). + +- Issue #18891: Completed the new email package (provisional) API additions + by adding new classes EmailMessage, MIMEPart, and ContentManager. + +- Issue #18281: Unused stat constants removed from `tarfile`. + +- Issue #18999: Multiprocessing now supports 'contexts' with the same API + as the module, but bound to specified start methods. + +- Issue #18468: The re.split, re.findall, and re.sub functions and the group() + and groups() methods of match object now always return a string or a bytes + object. + +- Issue #18725: The textwrap module now supports truncating multiline text. + +- Issue #18776: atexit callbacks now display their full traceback when they + raise an exception. + +- Issue #17827: Add the missing documentation for ``codecs.encode`` and + ``codecs.decode``. + +- Issue #19218: Rename collections.abc to _collections_abc in order to + speed up interpreter start. + +- Issue #18582: Add 'pbkdf2_hmac' to the hashlib module. It implements PKCS#5 + password-based key derivation functions with HMAC as pseudorandom function. + +- Issue #19131: The aifc module now correctly reads and writes sampwidth of + compressed streams. + +- Issue #19209: Remove import of copyreg from the os module to speed up + interpreter startup. stat_result and statvfs_result are now hard-coded to + reside in the os module. + +- Issue #19205: Don't import the 're' module in site and sysconfig module to + speed up interpreter start. + +- Issue #9548: Add a minimal "_bootlocale" module that is imported by the + _io module instead of the full locale module. + +- Issue #18764: Remove the 'print' alias for the PDB 'p' command so that it no + longer shadows the print function. + +- Issue #19158: A rare race in BoundedSemaphore could allow .release() too + often. + +- Issue #15805: Add contextlib.redirect_stdout(). + +- Issue #18716: Deprecate the formatter module. + +- Issue #10712: 2to3 has a new "asserts" fixer that replaces deprecated names + of unittest methods (e.g. failUnlessEqual -> assertEqual). + +- Issue #18037: 2to3 now escapes ``'\u'`` and ``'\U'`` in native strings. + +- Issue #17839: base64.decodebytes and base64.encodebytes now accept any + object that exports a 1 dimensional array of bytes (this means the same + is now also true for base64_codec) + +- Issue #19132: The pprint module now supports compact mode. + +- Issue #19137: The pprint module now correctly formats instances of set and + frozenset subclasses. + +- Issue #10042: functools.total_ordering now correctly handles + NotImplemented being returned by the underlying comparison function (Patch + by Katie Miller) + +- Issue #19092: contextlib.ExitStack now correctly reraises exceptions + from the __exit__ callbacks of inner context managers (Patch by Hrvoje + Nikšić) + +- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except + when necessary. Patch by Oscar Benjamin. + +- Issue #5845: In site.py, only load readline history from ~/.python_history + if no history has been read already. This avoids double writes to the + history file at shutdown. + +- Properly initialize all fields of a SSL object after allocation. + +- Issue #19095: SSLSocket.getpeercert() now raises ValueError when the + SSL handshake hasn't been done. + +- Issue #4366: Fix building extensions on all platforms when --enable-shared + is used. + +- Issue #19030: Fixed `inspect.getmembers` and `inspect.classify_class_attrs` + to attempt activating descriptors before falling back to a __dict__ search + for faulty descriptors. `inspect.classify_class_attrs` no longer returns + Attributes whose home class is None. + +C API +----- + +- Issue #1772673: The type of `char*` arguments now changed to `const char*`. + +- Issue #16129: Added a `Py_SetStandardStreamEncoding` pre-initialization API + to allow embedding applications like Blender to force a particular + encoding and error handler for the standard IO streams (initial patch by + Bastien Montagne) + +Tests +----- + +- Issue #19275: Fix test_site on AMD64 Snow Leopard + +- Issue #14407: Fix unittest test discovery in test_concurrent_futures. + +- Issue #18919: Unified and extended tests for audio modules: aifc, sunau and + wave. + +- Issue #18714: Added tests for ``pdb.find_function()``. + +Documentation +------------- + +- Issue #18758: Fixed and improved cross-references. + +- Issue #18972: Modernize email examples and use the argparse module in them. + +Build +----- + +- Issue #19130: Correct PCbuild/readme.txt, Python 3.3 and 3.4 require VS 2010. + +- Issue #15663: Update OS X 10.6+ installer to use Tcl/Tk 8.5.15. + +- Issue #14499: Fix several problems with OS X universal build support: + 1. ppc arch detection for extension module builds broke with Xcode 5 + 2. ppc arch detection in configure did not work on OS X 10.4 + 3. -sysroot and -arch flags were unnecessarily duplicated + 4. there was no obvious way to configure an intel-32 only build. + +- Issue #19019: Change the OS X installer build script to use CFLAGS instead + of OPT for special build options. By setting OPT, some compiler-specific + options like -fwrapv were overridden and thus not used, which could result + in broken interpreters when building with clang. + + +What's New in Python 3.4.0 Alpha 3? +=================================== + +Release date: 2013-09-29 + +Core and Builtins +----------------- + +- Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional. + +- Issue #19098: Prevent overflow in the compiler when the recursion limit is set + absurdly high. + +Library +------- + +- Issue #18929: `inspect.classify_class_attrs()` now correctly finds class + attributes returned by `dir()` that are located in the metaclass. + +- Issue #18950: Fix miscellaneous bugs in the sunau module. + Au_read.readframes() now updates current file position and reads correct + number of frames from multichannel stream. Au_write.writeframesraw() now + correctly updates current file position. Au_read.getnframes() now returns an + integer (as in Python 2). Au_read and Au_write now correctly works with file + object if start file position is not a zero. + +- Issue #18594: The fast path for collections.Counter() was never taken + due to an over-restrictive type check. + +- Issue #19053: ZipExtFile.read1() with non-zero argument no more returns empty + bytes until end of data. + +- logging: added support for Unix domain sockets to SocketHandler and + DatagramHandler. + +- Issue #18996: TestCase.assertEqual() now more cleverly shorten differing + strings in error report. + +- Issue #19034: repr() for tkinter.Tcl_Obj now exposes string reperesentation. + +- Issue #18978: ``urllib.request.Request`` now allows the method to be + indicated on the class and no longer sets it to None in ``__init__``. + +- Issue #18626: the inspect module now offers a basic command line + introspection interface (Initial patch by Claudiu Popa) + +- Issue #3015: Fixed tkinter with wantobject=False. Any Tcl command call + returned empty string. + +- Issue #19037: The mailbox module now makes all changes to maildir files + before moving them into place, to avoid race conditions with other programs + that may be accessing the maildir directory. + +- Issue #14984: On POSIX systems, when netrc is called without a filename + argument (and therefore is reading the user's $HOME/.netrc file), it now + enforces the same security rules as typical ftp clients: the .netrc file must + be owned by the user that owns the process and must not be readable by any + other user. + +- Issue #18873: The tokenize module now detects Python source code encoding + only in comment lines. + +- Issue #17764: Enable http.server to bind to a user specified network + interface. Patch contributed by Malte Swart. + +- Issue #18937: Add an assertLogs() context manager to unittest.TestCase + to ensure that a block of code emits a message using the logging module. + +- Issue #17324: Fix http.server's request handling case on trailing '/'. Patch + contributed by Vajrasky Kok. + +- Issue #19018: The heapq.merge() function no longer suppresses IndexError + in the underlying iterables. + +- Issue #18784: The uuid module no longer attempts to load libc via ctypes.CDLL + if all the necessary functions have already been found in libuuid. Patch by + Evgeny Sologubov. + +- The :envvar:`PYTHONFAULTHANDLER` environment variable now only enables the + faulthandler module if the variable is non-empty. Same behaviour than other + variables like :envvar:`PYTHONDONTWRITEBYTECODE`. + +- Issue #1565525: New function ``traceback.clear_frames`` will clear + the local variables of all the stack frames referenced by a traceback + object. + +Tests +----- + +- Issue #18952: Fix regression in support data downloads introduced when + test.support was converted to a package. Regression noticed by Zachary + Ware. + +IDLE +---- + +- Issue #18873: IDLE now detects Python source code encoding only in comment + lines. + +- Issue #18988: The "Tab" key now works when a word is already autocompleted. + +Documentation +------------- + +- Issue #17003: Unified the size argument names in the io module with common + practice. + +Build +----- + +- Issue #18596: Support the use of address sanity checking in recent versions + of clang and GCC by appropriately marking known false alarms in the small + object allocator. Patch contributed by Dhiru Kholia. + +Tools/Demos +----------- + +- Issue #18873: 2to3 and the findnocoding.py script now detect Python source + code encoding only in comment lines. + + +What's New in Python 3.4.0 Alpha 2? +=================================== + +Release date: 2013-09-09 + +Core and Builtins +----------------- + +- Issue #18942: sys._debugmallocstats() output was damaged on Windows. + +- Issue #18571: Implementation of the PEP 446: file descriptors and file + handles are now created non-inheritable; add functions + os.get/set_inheritable(), os.get/set_handle_inheritable() and + socket.socket.get/set_inheritable(). + +- Issue #11619: The parser and the import machinery do not encode Unicode + filenames anymore on Windows. + +- Issue #18808: Non-daemon threads are now automatically joined when + a sub-interpreter is shutdown (it would previously dump a fatal error). + +- Remove support for compiling on systems without getcwd(). + +- Issue #18774: Remove last bits of GNU PTH thread code and thread_pth.h. + +- Issue #18771: Add optimization to set object lookups to reduce the cost + of hash collisions. The core idea is to inspect a second key/hash pair + for each cache line retrieved. + +- Issue #16105: When a signal handler fails to write to the file descriptor + registered with ``signal.set_wakeup_fd()``, report an exception instead + of ignoring the error. + +- Issue #18722: Remove uses of the "register" keyword in C code. + +- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions. + +- Issue #16499: Add command line option for isolated mode. + +- Issue #15301: Parsing fd, uid, and gid parameters for builtins + in Modules/posixmodule.c is now far more robust. + +- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc() + fail. + +- Issue #17934: Add a clear() method to frame objects, to help clean up + expensive details (local variables) and break reference cycles. + +- Issue #18780: %-formatting codes %d, %i, and %u now treat int-subclasses + as int (displays value of int-subclass instead of str(int-subclass) ). + +Library +------- + +- Issue #18808: Thread.join() now waits for the underlying thread state to + be destroyed before returning. This prevents unpredictable aborts in + Py_EndInterpreter() when some non-daemon threads are still running. + +- Issue #18458: Prevent crashes with newer versions of libedit. Its readline + emulation has changed from 0-based indexing to 1-based like gnu readline. + +- Issue #18852: Handle case of ``readline.__doc__`` being ``None`` in the new + readline activation code in ``site.py``. + +- Issue #18672: Fixed format specifiers for Py_ssize_t in debugging output in + the _sre module. + +- Issue #18830: inspect.getclasstree() no longer produces duplicate entries even + when input list contains duplicates. + +- Issue #18878: sunau.open now supports the context management protocol. Based on + patches by Claudiu Popa and R. David Murray. + +- Issue #18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit, don't cast + 64-bit pointer to long (32 bits). + +- Issue #18876: The FileIO.mode attribute now better reflects the actual mode + under which the file was opened. Patch by Erik Bray. + +- Issue #16853: Add new selectors module. + +- Issue #18882: Add threading.main_thread() function. + +- Issue #18901: The sunau getparams method now returns a namedtuple rather than + a plain tuple. Patch by Claudiu Popa. + +- Issue #17487: The result of the wave getparams method now is pickleable again. + Patch by Claudiu Popa. + +- Issue #18756: os.urandom() now uses a lazily-opened persistent file + descriptor, so as to avoid using many file descriptors when run in + parallel from multiple threads. + +- Issue #18418: After fork(), reinit all threads states, not only active ones. + Patch by A. Jesse Jiryu Davis. + +- Issue #17974: Switch unittest from using getopt to using argparse. + +- Issue #11798: TestSuite now drops references to own tests after execution. + +- Issue #16611: http.cookie now correctly parses the 'secure' and 'httponly' + cookie flags. + +- Issue #11973: Fix a problem in kevent. The flags and fflags fields are now + properly handled as unsigned. + +- Issue #18807: ``pyvenv`` now takes a --copies argument allowing copies + instead of symlinks even where symlinks are available and the default. + +- Issue #18538: ``python -m dis`` now uses argparse for argument processing. + Patch by Michele Orrù. + +- Issue #18394: Close cgi.FieldStorage's optional file. + +- Issue #17702: On error, os.environb now suppresses the exception context + when raising a new KeyError with the original key. + +- Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6. + +- Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj + argument. + +- Issue #17211: Yield a namedtuple in pkgutil. + Patch by Ramchandra Apte. + +- Issue #18324: set_payload now correctly handles binary input. This also + supersedes the previous fixes for #14360, #1717, and #16564. + +- Issue #18794: Add a fileno() method and a closed attribute to select.devpoll + objects. + +- Issue #17119: Fixed integer overflows when processing large strings and tuples + in the tkinter module. + +- Issue #15352: Rebuild frozen modules when marshal.c is changed. + +- Issue #18747: Re-seed OpenSSL's pseudo-random number generator after fork. + A pthread_atfork() parent handler is used to seed the PRNG with pid, time + and some stack data. + +- Issue #8865: Concurrent invocation of select.poll.poll() now raises a + RuntimeError exception. Patch by Christian Schubert. + +- Issue #18777: The ssl module now uses the new CRYPTO_THREADID API of + OpenSSL 1.0.0+ instead of the deprecated CRYPTO id callback function. + +- Issue #18768: Correct doc string of RAND_edg(). Patch by Vajrasky Kok. + +- Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke + malloc weak symbols. + +- Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes + inside subjectAltName correctly. Formerly the module has used OpenSSL's + GENERAL_NAME_print() function to get the string representation of ASN.1 + strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and + ``uniformResourceIdentifier`` (URI). + +- Issue #18701: Remove support of old CPython versions (<3.0) from C code. + +- Issue #18756: Improve error reporting in os.urandom() when the failure + is due to something else than /dev/urandom not existing (for example, + exhausting the file descriptor limit). + +- Issue #18673: Add O_TMPFILE to os module. O_TMPFILE requires Linux kernel + 3.11 or newer. It's only defined on system with 3.11 uapi headers, too. + +- Issue #18532: Change the builtin hash algorithms' names to lower case names + as promised by hashlib's documentation. + +- Issue #8713: add new spwan and forkserver start methods, and new functions + get_all_start_methods, get_start_method, and set_start_method, to + multiprocessing. + +- Issue #18405: Improve the entropy of crypt.mksalt(). + +- Issue #12015: The tempfile module now uses a suffix of 8 random characters + instead of 6, to reduce the risk of filename collision. The entropy was + reduced when uppercase letters were removed from the charset used to generate + random characters. + +- Issue #18585: Add :func:`textwrap.shorten` to collapse and truncate a + piece of text to a given length. + +- Issue #18598: Tweak exception message for importlib.import_module() to + include the module name when a key argument is missing. + +- Issue #19151: Fix docstring and use of _get_supported_file_loaders() to + reflect 2-tuples. + +- Issue #19152: Add ExtensionFileLoader.get_filename(). + +- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get + docstrings and ValueError messages. Patch by Zhongyue Luo + +- Fix refcounting issue with extension types in tkinter. + +- Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error + if methods have annotations; it now correctly displays the annotations. + +- Issue #18600: Added policy argument to email.message.Message.as_string, + and as_bytes and __bytes__ methods to Message. + +- Issue #18671: Output more information when logging exceptions occur. + +- Issue #18621: Prevent the site module's patched builtins from keeping + too many references alive for too long. + +- Issue #4885: Add weakref support to mmap objects. Patch by Valerie Lambert. + +- Issue #8860: Fixed rounding in timedelta constructor. + +- Issue #18849: Fixed a Windows-specific tempfile bug where collision with an + existing directory caused mkstemp and related APIs to fail instead of + retrying. Report and fix by Vlad Shcherbina. + +- Issue #18920: argparse's default destination for the version action (-v, + --version) has also been changed to stdout, to match the Python executable. + +Tests +----- + +- Issue #18623: Factor out the _SuppressCoreFiles context manager into + test.support. Patch by Valerie Lambert. + +- Issue #12037: Fix test_email for desktop Windows. + +- Issue #15507: test_subprocess's test_send_signal could fail if the test + runner were run in an environment where the process inherited an ignore + setting for SIGINT. Restore the SIGINT handler to the desired + KeyboardInterrupt raising one during that test. + +- Issue #16799: Switched from getopt to argparse style in regrtest's argument + parsing. Added more tests for regrtest's argument parsing. + +- Issue #18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as + possible, since "localhost" goes through a DNS lookup under recent Windows + versions. + +IDLE +---- + +- Issue #18489: Add tests for SearchEngine. Original patch by Phil Webster. + +Documentation +------------- + +- Issue #18743: Fix references to non-existent "StringIO" module. + +- Issue #18783: Removed existing mentions of Python long type in docstrings, + error messages and comments. + +Build +----- + +- Issue #1584: Provide configure options to override default search paths for + Tcl and Tk when building _tkinter. + +- Issue #15663: Tcl/Tk 8.5.14 is now included with the OS X 10.6+ 64-/32-bit + installer. It is no longer necessary to install a third-party version of + Tcl/Tk 8.5 to work around the problems in the Apple-supplied Tcl/Tk 8.5 + shipped in OS X 10.6 and later releases. + +Tools/Demos +----------- + +- Issue #18922: Now The Lib/smtpd.py and Tools/i18n/msgfmt.py scripts write + their version strings to stdout, and not to sderr. + + +What's New in Python 3.4.0 Alpha 1? +=================================== + +Release date: 2013-08-03 + +Core and Builtins +----------------- + +- Issue #16741: Fix an error reporting in int(). + +- Issue #17899: Fix rare file descriptor leak in os.listdir(). + +- Issue #10241: Clear extension module dict copies at interpreter shutdown. + Patch by Neil Schemenauer, minimally modified. + +- Issue #9035: ismount now recognises volumes mounted below a drive root + on Windows. Original patch by Atsuo Ishimoto. + +- Issue #18214: Improve finalization of Python modules to avoid setting + their globals to None, in most cases. + +- Issue #18112: PEP 442 implementation (safe object finalization). + +- Issue #18552: Check return value of PyArena_AddPyObject() in + obj2ast_object(). + +- Issue #18560: Fix potential NULL pointer dereference in sum(). + +- Issue #18520: Add a new PyStructSequence_InitType2() function, same than + PyStructSequence_InitType() except that it has a return value (0 on success, + -1 on error). + +- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0], + prefix and exec_prefix if the operation system does not obey MAXPATHLEN. + +- Issue #18408: Fix many various bugs in code handling errors, especially + on memory allocation failure (MemoryError). + +- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all(). + +- Issue #18342: Use the repr of a module name when an import fails when using + ``from ... import ...``. + +- Issue #17872: Fix a segfault in marshal.load() when input stream returns + more bytes than requested. + +- Issue #18338: `python --version` now prints version string to stdout, and + not to stderr. Patch by Berker Peksag and Michael Dickens. + +- Issue #18426: Fix NULL pointer dereference in C extension import when + PyModule_GetDef() returns an error. + +- Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix + a stack overflow in the marshal module (fix a crash in test_marshal). + Patch written by Jeremy Kloth. + +- Issue #3329: Implement the PEP 445: Add new APIs to customize Python memory + allocators. + +- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the + tstate is first removed from TLS and then deallocated. + +- Issue #13483: Use VirtualAlloc in obmalloc on Windows. + +- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise + OverflowError when an argument of %c format is out of range. + +- Issue #18111: The min() and max() functions now support a default argument + to be returned instead of raising a ValueError on an empty sequence. + (Contributed by Julian Berman.) + +- Issue #18137: Detect integer overflow on precision in float.__format__() + and complex.__format__(). + +- Issue #15767: Introduce ModuleNotFoundError which is raised when a module + could not be found. + +- Issue #18183: Fix various unicode operations on strings with large unicode + codepoints. + +- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows(). + +- Issue #18038: SyntaxError raised during compilation sources with illegal + encoding now always contains an encoding name. + +- Issue #17931: Resolve confusion on Windows between pids and process + handles. + +- Tweak the exception message when the magic number or size value in a bytecode + file is truncated. + +- Issue #17932: Fix an integer overflow issue on Windows 64-bit in iterators: + change the C type of seqiterobject.it_index from long to Py_ssize_t. + +- Issue #18065: Don't set __path__ to the package name for frozen packages. + +- Issue #18088: When reloading a module, unconditionally reset all relevant + attributes on the module (e.g. __name__, __loader__, __package__, __file__, + __cached__). + +- Issue #17937: Try harder to collect cyclic garbage at shutdown. + +- Issue #12370: Prevent class bodies from interfering with the __class__ + closure. + +- Issue #17644: Fix a crash in str.format when curly braces are used in square + brackets. + +- Issue #17237: Fix crash in the ASCII decoder on m68k. + +- Issue #17927: Frame objects kept arguments alive if they had been + copied into a cell, even if the cell was cleared. + +- Issue #1545463: At shutdown, defer finalization of codec modules so + that stderr remains usable. + +- Issue #7330: Implement width and precision (ex: "%5.3s") for the format + string of PyUnicode_FromFormat() function, original patch written by Ysj Ray. + +- Issue #1545463: Global variables caught in reference cycles are now + garbage-collected at shutdown. + +- Issue #17094: Clear stale thread states after fork(). Note that this + is a potentially disruptive change since it may release some system + resources which would otherwise remain perpetually alive (e.g. database + connections kept in thread-local storage). + +- Issue #17408: Avoid using an obsolete instance of the copyreg module when + the interpreter is shutdown and then started again. + +- Issue #5845: Enable tab-completion in the interactive interpreter by + default, thanks to a new sys.__interactivehook__. + +- Issue #17115,17116: Module initialization now includes setting __package__ and + __loader__ attributes to None. + +- Issue #17853: Ensure locals of a class that shadow free variables always win + over the closures. + +- Issue #17863: In the interactive console, don't loop forever if the encoding + can't be fetched from stdin. + +- Issue #17867: Raise an ImportError if __import__ is not found in __builtins__. + +- Issue #18698: Ensure importlib.reload() returns the module out of sys.modules. + +- Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, + such as was shipped with Centos 5 and Mac OS X 10.4. + +- Issue #17413: sys.settrace callbacks were being passed a string instead of an + exception instance for the 'value' element of the arg tuple if the exception + originated from C code; now an exception instance is always provided. + +- Issue #17782: Fix undefined behaviour on platforms where + ``struct timespec``'s "tv_nsec" member is not a C long. + +- Issue #17722: When looking up __round__, resolve descriptors. + +- Issue #16061: Speed up str.replace() for replacing 1-character strings. + +- Issue #17715: Fix segmentation fault from raising an exception in a __trunc__ + method. + +- Issue #17643: Add __callback__ attribute to weakref.ref. + +- Issue #16447: Fixed potential segmentation fault when setting __name__ on a + class. + +- Issue #17669: Fix crash involving finalization of generators using yield from. + +- Issue #14439: Python now prints the traceback on runpy failure at startup. + +- Issue #17469: Fix _Py_GetAllocatedBlocks() and sys.getallocatedblocks() + when running on valgrind. + +- Issue #17619: Make input() check for Ctrl-C correctly on Windows. + +- Issue #17357: Add missing verbosity messages for -v/-vv that were lost during + the importlib transition. + +- Issue #17610: Don't rely on non-standard behavior of the C qsort() function. + +- Issue #17323: The "[X refs, Y blocks]" printed by debug builds has been + disabled by default. It can be re-enabled with the `-X showrefcount` option. + +- Issue #17328: Fix possible refleak in dict.setdefault. + +- Issue #17275: Corrected class name in init error messages of the C version of + BufferedWriter and BufferedRandom. + +- Issue #7963: Fixed misleading error message that issued when object is + called without arguments. + +- Issue #8745: Small speed up zipimport on Windows. Patch by Catalin Iacob. + +- Issue #5308: Raise ValueError when marshalling too large object (a sequence + with size >= 2**31), instead of producing illegal marshal data. + +- Issue #12983: Bytes literals with invalid ``\x`` escape now raise a SyntaxError + and a full traceback including line number. + +- Issue #16967: In function definition, evaluate positional defaults before + keyword-only defaults. + +- Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) + in the interpreter. + +- Issue #17137: When a Unicode string is resized, the internal wide character + string (wstr) format is now cleared. + +- Issue #17043: The unicode-internal decoder no longer read past the end of + input buffer. + +- Issue #17098: All modules now have __loader__ set even if they pre-exist the + bootstrapping of importlib. + +- Issue #16979: Fix error handling bugs in the unicode-escape-decode decoder. + +- Issue #16772: The base argument to the int constructor no longer accepts + floats, or other non-integer objects with an __int__ method. Objects + with an __index__ method are now accepted. + +- Issue #10156: In the interpreter's initialization phase, unicode globals + are now initialized dynamically as needed. + +- Issue #16980: Fix processing of escaped non-ascii bytes in the + unicode-escape-decode decoder. + +- Issue #16975: Fix error handling bug in the escape-decode bytes decoder. + +- Issue #14850: Now a charmap decoder treats U+FFFE as "undefined mapping" + in any mapping, not only in a string. + +- Issue #16613: Add *m* argument to ``collections.Chainmap.new_child`` to + allow the new child map to be specified explicitly. + +- Issue #16730: importlib.machinery.FileFinder now no longers raises an + exception when trying to populate its cache and it finds out the directory is + unreadable or has turned into a file. Reported and diagnosed by + David Pritchard. + +- Issue #16906: Fix a logic error that prevented most static strings from being + cleared. + +- Issue #11461: Fix the incremental UTF-16 decoder. Original patch by + Amaury Forgeot d'Arc. + +- Issue #16856: Fix a segmentation fault from calling repr() on a dict with + a key whose repr raise an exception. + +- Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB. + +- Issue #16761: Calling int() with base argument only now raises TypeError. + +- Issue #16759: Support the full DWORD (unsigned long) range in Reg2Py + when retrieving a REG_DWORD value. This corrects functions like + winreg.QueryValueEx that may have been returning truncated values. + +- Issue #14420: Support the full DWORD (unsigned long) range in Py2Reg + when passed a REG_DWORD value. Fixes OverflowError in winreg.SetValueEx. + +- Issue #11939: Set the st_dev attribute of stat_result to allow Windows to + take advantage of the os.path.samefile/sameopenfile/samestat implementations + used by other platforms. + +- Issue #16772: The int() constructor's second argument (base) no longer + accepts non integer values. Consistent with the behavior in Python 2. + +- Issue #14470: Remove w9xpopen support per PEP 11. + +- Issue #9856: Replace deprecation warning with raising TypeError + in object.__format__. Patch by Florent Xicluna. + +- Issue #16597: In buffered and text IO, call close() on the underlying stream + if invoking flush() fails. + +- Issue #16722: In the bytes() constructor, try to call __bytes__ on the + argument before __index__. + +- Issue #16421: loading multiple modules from one shared object is now + handled correctly (previously, the first module loaded from that file + was silently returned). Patch by Václav Šmilauer. + +- Issue #16602: When a weakref's target was part of a long deallocation + chain, the object could remain reachable through its weakref even though + its refcount had dropped to zero. + +- Issue #16495: Remove extraneous NULL encoding check from bytes_decode(). + +- Issue #16619: Create NameConstant AST class to represent None, True, and False + literals. As a result, these constants are never loaded at runtime from + builtins. + +- Issue #16455: On FreeBSD and Solaris, if the locale is C, the + ASCII/surrogateescape codec is now used (instead of the locale encoding) to + decode the command line arguments. This change fixes inconsistencies with + os.fsencode() and os.fsdecode(), because these operating systems announce an + ASCII locale encoding, but actually use the ISO-8859-1 encoding in practice. + +- Issue #16562: Optimize dict equality testing. Patch by Serhiy Storchaka. + +- Issue #16588: Silence unused-but-set warnings in Python/thread_pthread + +- Issue #16592: stringlib_bytes_join doesn't raise MemoryError on allocation + failure. + +- Issue #16546: Fix: ast.YieldFrom argument is now mandatory. + +- Issue #16514: Fix regression causing a traceback when sys.path[0] is None + (actually, any non-string or non-bytes type). + +- Issue #16306: Fix multiple error messages when unknown command line + parameters where passed to the interpreter. Patch by Hieu Nguyen. + +- Issue #16215: Fix potential double memory free in str.replace(). Patch + by Serhiy Storchaka. + +- Issue #16290: A float return value from the __complex__ special method is no + longer accepted in the complex() constructor. + +- Issue #16416: On Mac OS X, operating system data are now always + encoded/decoded to/from UTF-8/surrogateescape, instead of the locale encoding + (which may be ASCII if no locale environment variable is set), to avoid + inconsistencies with os.fsencode() and os.fsdecode() functions which are + already using UTF-8/surrogateescape. + +- Issue #16453: Fix equality testing of dead weakref objects. + +- Issue #9535: Fix pending signals that have been received but not yet + handled by Python to not persist after os.fork() in the child process. + +- Issue #14794: Fix slice.indices to return correct results for huge values, + rather than raising OverflowError. + +- Issue #15001: fix segfault on "del sys.modules['__main__']". Patch by Victor + Stinner. + +- Issue #8271: the utf-8 decoder now outputs the correct number of U+FFFD + characters when used with the 'replace' error handler on invalid utf-8 + sequences. Patch by Serhiy Storchaka, tests by Ezio Melotti. + +- Issue #5765: Apply a hard recursion limit in the compiler instead of + blowing the stack and segfaulting. Initial patch by Andrea Griffini. + +- Issue #16402: When slicing a range, fix shadowing of exceptions from + __index__. + +- Issue #16336: fix input checking in the surrogatepass error handler. + Patch by Serhiy Storchaka. + +- Issue #8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now + raises an error. + +- Issue #7317: Display full tracebacks when an error occurs asynchronously. + Patch by Alon Horev with update by Alexey Kachayev. + +- Issue #16309: Make PYTHONPATH="" behavior the same as if PYTHONPATH + not set at all. + +- Issue #10189: Improve the error reporting of SyntaxErrors related to global + and nonlocal statements. + +- Fix segfaults on setting __qualname__ on builtin types and attempting to + delete it on any type. + +- Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch + written by Serhiy Storchaka. + +- Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass + received a nonempty dict from the constructor. + +- Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a + class's __dict__ and on type. + +- Issue #12805: Make bytes.join and bytearray.join faster when the separator + is empty. Patch by Serhiy Storchaka. + +- Issue #6074: Ensure cached bytecode files can always be updated by the + user that created them, even when the source file is read-only. + +- Issue #15958: bytes.join and bytearray.join now accept arbitrary buffer + objects. + +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + +- Issue #16160: Subclass support now works for types.SimpleNamespace. + +- Issue #16148: Implement PEP 424, adding operator.length_hint and + PyObject_LengthHint. + +- Upgrade Unicode data (UCD) to version 6.2. + +- Issue #15379: Fix passing of non-BMP characters as integers for the charmap + decoder (already working as unicode strings). Patch by Serhiy Storchaka. + +- Issue #15144: Fix possible integer overflow when handling pointers as integer + values, by using `Py_uintptr_t` instead of `size_t`. Patch by Serhiy + Storchaka. + +- Issue #15965: Explicitly cast `AT_FDCWD` as (int). Required on Solaris 10 + (which defines `AT_FDCWD` as ``0xffd19553``), harmless on other platforms. + +- Issue #15839: Convert SystemErrors in `super()` to RuntimeErrors. + +- Issue #15448: Buffered IO now frees the buffer when closed, instead + of when deallocating. + +- Issue #15846: Fix SystemError which happened when using `ast.parse()` in an + exception handler on code with syntax errors. + +- Issue #15897: zipimport.c doesn't check return value of fseek(). + Patch by Felipe Cruz. + +- Issue #15801: Make sure mappings passed to '%' formatting are actually + subscriptable. + +- Issue #15111: __import__ should propagate ImportError when raised as a + side-effect of a module triggered from using fromlist. + +- Issue #15022: Add pickle and comparison support to types.SimpleNamespace. + +Library +------- + +- Issue #4331: Added functools.partialmethod (Initial patch by Alon Horev) + +- Issue #13461: Fix a crash in the TextIOWrapper.tell method on 64-bit + platforms. Patch by Yogesh Chaudhari. + +- Issue #18681: Fix a NameError in importlib.reload() (noticed by Weizhao Li). + +- Issue #14323: Expanded the number of digits in the coefficients for the + RGB -- YIQ conversions so that they match the FCC NTSC versions. + +- Issue #17998: Fix an internal error in regular expression engine. + +- Issue #17557: Fix os.getgroups() to work with the modified behavior of + getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. + +- Issue #18608: Avoid keeping a strong reference to the locale module + inside the _io module. + +- Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters, + and make it GC-aware. + +- Issue #15699: The readline module now uses PEP 3121-style module + initialization, so as to reclaim allocated resources (Python callbacks) + at shutdown. Original patch by Robin Schreiber. + +- Issue #17616: wave.open now supports the context management protocol. + +- Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns + 'SHA1' instead of 'SHA'. + +- Issue #13266: Added inspect.unwrap to easily unravel __wrapped__ chains + (initial patch by Daniel Urban and Aaron Iles) + +- Issue #18561: Skip name in ctypes' _build_callargs() if name is NULL. + +- Issue #18559: Fix NULL pointer dereference error in _pickle module + +- Issue #18556: Check the return type of PyUnicode_AsWideChar() in ctype's + U_set(). + +- Issue #17818: aifc.getparams now returns a namedtuple. + +- Issue #18549: Eliminate dead code in socket_ntohl() + +- Issue #18530: Remove additional stat call from posixpath.ismount. + Patch by Alex Gaynor. + +- Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj() + +- Issue #9177: Calling read() or write() now raises ValueError, not + AttributeError, on a closed SSL socket. Patch by Senko Rasic. + +- Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 + + gcc. + +- Issue #18479: Changed venv Activate.ps1 to make deactivate a function, and + removed Deactivate.ps1. + +- Issue #18480: Add missing call to PyType_Ready to the _elementtree extension. + +- Issue #17778: Fix test discovery for test_multiprocessing. (Patch by + Zachary Ware.) + +- Issue #18393: The private module _gestalt and private functions + platform._mac_ver_gestalt, platform._mac_ver_lookup and + platform._bcd2str have been removed. This does not affect the public + interface of the platform module. + +- Issue #17482: functools.update_wrapper (and functools.wraps) now set the + __wrapped__ attribute correctly even if the underlying function has a + __wrapped__ attribute set. + +- Issue #18431: The new email header parser now decodes RFC2047 encoded words + in structured headers. + +- Issue #18432: The sched module's queue method was incorrectly returning + an iterator instead of a list. + +- Issue #18044: The new email header parser was mis-parsing encoded words where + an encoded character immediately followed the '?' that follows the CTE + character, resulting in a decoding failure. They are now decoded correctly. + +- Issue #18101: Tcl.split() now process strings nested in a tuple as it + do with byte strings. + +- Issue #18116: getpass was always getting an error when testing /dev/tty, + and thus was always falling back to stdin, and would then raise an exception + if stdin could not be used (such as /dev/null). It also leaked an open file. + All of these issues are now fixed. + +- Issue #17198: Fix a NameError in the dbm module. Patch by Valentina + Mukhamedzhanova. + +- Issue #18013: Fix cgi.FieldStorage to parse the W3C sample form. + +- Issue #18020: improve html.escape speed by an order of magnitude. + Patch by Matt Bryant. + +- Issue #18347: ElementTree's html serializer now preserves the case of + closing tags. + +- Issue #17261: Ensure multiprocessing's proxies use proper address. + +- Issue #18343: faulthandler.register() now keeps the previous signal handler + when the function is called twice, so faulthandler.unregister() restores + correctly the original signal handler. + +- Issue #17097: Make multiprocessing ignore EINTR. + +- Issue #18339: Negative ints keys in unpickler.memo dict no longer cause a + segfault inside the _pickle C extension. + +- Issue #18240: The HMAC module is no longer restricted to bytes and accepts + any bytes-like object, e.g. memoryview. Original patch by Jonas Borgström. + +- Issue #18224: Removed pydoc script from created venv, as it causes problems + on Windows and adds no value over and above python -m pydoc ... + +- Issue #18155: The csv module now correctly handles csv files that use + a delimiter character that has a special meaning in regexes, instead of + throwing an exception. + +- Issue #14360: encode_quopri can now be successfully used as an encoder + when constructing a MIMEApplication object. + +- Issue #11390: Add -o and -f command line options to the doctest CLI to + specify doctest options (and convert it to using argparse). + +- Issue #18135: ssl.SSLSocket.write() now raises an OverflowError if the input + string in longer than 2 gigabytes, and ssl.SSLContext.load_cert_chain() + raises a ValueError if the password is longer than 2 gigabytes. The ssl + module does not support partial write. + +- Issue #11016: Add C implementation of the stat module as _stat. + +- Issue #18248: Fix libffi build on AIX. + +- Issue #18259: Declare sethostname in socketmodule.c for AIX + +- Issue #18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list() + lists all loaded CA certificates and cert_store_stats() returns amount of + loaded X.509 certs, X.509 CA certs and CRLs. + +- Issue #18167: cgi.FieldStorage no longer fails to handle multipart/form-data + when ``\r\n`` appears at end of 65535 bytes without other newlines. + +- Issue #18076: Introduce importlib.util.decode_source(). + +- Issue #18357: add tests for dictview set difference. + Patch by Fraser Tweedale. + +- importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or + UnicodeDecodeError into ImportError. + +- Issue #18058, 18057: Make the namespace package loader meet the + importlib.abc.InspectLoader ABC, allowing for namespace packages to work with + runpy. + +- Issue #17177: The imp module is pending deprecation. + +- subprocess: Prevent a possible double close of parent pipe fds when the + subprocess exec runs into an error. Prevent a regular multi-close of the + /dev/null fd when any of stdin, stdout and stderr was set to DEVNULL. + +- Issue #18194: Introduce importlib.util.cache_from_source() and + source_from_cache() while documenting the equivalent functions in imp as + deprecated. + +- Issue #17907: Document imp.new_module() as deprecated in favour of + types.ModuleType. + +- Issue #18192: Introduce importlib.util.MAGIC_NUMBER and document as deprecated + imp.get_magic(). + +- Issue #18149: Add filecmp.clear_cache() to manually clear the filecmp cache. + Patch by Mark Levitt + +- Issue #18193: Add importlib.reload(). + +- Issue #18157: Stop using imp.load_module() in pydoc. + +- Issue #16102: Make uuid._netbios_getnode() work again on Python 3. + +- Issue #17134: Add ssl.enum_cert_store() as interface to Windows' cert store. + +- Issue #18143: Implement ssl.get_default_verify_paths() in order to debug + the default locations for cafile and capath. + +- Issue #17314: Move multiprocessing.forking over to importlib. + +- Issue #11959: SMTPServer and SMTPChannel now take an optional map, use of + which avoids affecting global state. + +- Issue #18109: os.uname() now decodes fields from the locale encoding, and + socket.gethostname() now decodes the hostname from the locale encoding, + instead of using the UTF-8 encoding in strict mode. + +- Issue #18089: Implement importlib.abc.InspectLoader.load_module. + +- Issue #18088: Introduce importlib.abc.Loader.init_module_attrs for setting + module attributes. Leads to the pending deprecation of + importlib.util.module_for_loader. + +- Issue #17403: urllib.parse.robotparser normalizes the urls before adding to + ruleline. This helps in handling certain types invalid urls in a conservative + manner. Patch contributed by Mher Movsisyan. + +- Issue #18070: Have importlib.util.module_for_loader() set attributes + unconditionally in order to properly support reloading. + +- Added importlib.util.module_to_load to return a context manager to provide the + proper module object to load. + +- Issue #18025: Fixed a segfault in io.BufferedIOBase.readinto() when raw + stream's read() returns more bytes than requested. + +- Issue #18011: As was originally intended, base64.b32decode() now raises a + binascii.Error if there are non-b32-alphabet characters present in the input + string, instead of a TypeError. + +- Issue #18072: Implement importlib.abc.InspectLoader.get_code() and + importlib.abc.ExecutionLoader.get_code(). + +- Issue #8240: Set the SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER flag on SSL + sockets. + +- Issue #17269: Workaround for socket.getaddrinfo crash on MacOS X + with port None or "0" and flags AI_NUMERICSERV. + +- Issue #16986: ElementTree now correctly works with string input when the + internal XML encoding is not UTF-8 or US-ASCII. + +- Issue #17996: socket module now exposes AF_LINK constant on BSD and OSX. + +- Issue #17900: Allowed pickling of recursive OrderedDicts. Decreased pickled + size and pickling time. + +- Issue #17914: Add os.cpu_count(). Patch by Yogesh Chaudhari, based on an + initial patch by Trent Nelson. + +- Issue #17812: Fixed quadratic complexity of base64.b32encode(). + Optimize base64.b32encode() and base64.b32decode() (speed up to 3x). + +- Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of + service using certificates with many wildcards (CVE-2013-2099). + +- Issue #15758: Fix FileIO.readall() so it no longer has O(n**2) complexity. + +- Issue #14596: The struct.Struct() objects now use a more compact + implementation. + +- Issue #17981: logging's SysLogHandler now closes the socket when it catches + socket OSErrors. + +- Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function + is long, not int. + +- Fix typos in the multiprocessing module. + +- Issue #17754: Make ctypes.util.find_library() independent of the locale. + +- Issue #17968: Fix memory leak in os.listxattr(). + +- Issue #17606: Fixed support of encoded byte strings in the XMLGenerator + characters() and ignorableWhitespace() methods. Original patch by Sebastian + Ortiz Vasquez. + +- Issue #17732: Ignore distutils.cfg options pertaining to install paths if a + virtual environment is active. + +- Issue #17915: Fix interoperability of xml.sax with file objects returned by + codecs.open(). + +- Issue #16601: Restarting iteration over tarfile really restarts rather + than continuing from where it left off. Patch by Michael Birtwell. + +- Issue #17289: The readline module now plays nicer with external modules + or applications changing the rl_completer_word_break_characters global + variable. Initial patch by Bradley Froehle. + +- Issue #12181: select module: Fix struct kevent definition on OpenBSD 64-bit + platforms. Patch by Federico Schwindt. + +- Issue #11816: multiple improvements to the dis module: get_instructions + generator, ability to redirect output to a file, Bytecode and Instruction + abstractions. Patch by Nick Coghlan, Ryan Kelly and Thomas Kluyver. + +- Issue #13831: Embed stringification of remote traceback in local + traceback raised when pool task raises an exception. + +- Issue #15528: Add weakref.finalize to support finalization using + weakref callbacks. + +- Issue #14173: Avoid crashing when reading a signal handler during + interpreter shutdown. + +- Issue #15902: Fix imp.load_module() accepting None as a file when loading an + extension module. + +- Issue #13721: SSLSocket.getpeercert() and SSLSocket.do_handshake() now + raise an OSError with ENOTCONN, instead of an AttributeError, when the + SSLSocket is not connected. + +- Issue #14679: add an __all__ (that contains only HTMLParser) to html.parser. + +- Issue #17802: Fix an UnboundLocalError in html.parser. Initial tests by + Thomas Barlow. + +- Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by + extension load_module()) now have a better chance of working when reloaded. + +- Issue #17804: New function ``struct.iter_unpack`` allows for streaming + struct unpacking. + +- Issue #17830: When keyword.py is used to update a keyword file, it now + preserves the line endings of the original file. + +- Issue #17272: Making the urllib.request's Request.full_url a descriptor. + Fixes bugs with assignment to full_url. Patch by Demian Brecht. + +- Issue #17353: Plistlib emitted empty data tags with deeply nested datastructures + +- Issue #11714: Use 'with' statements to assure a Semaphore releases a + condition variable. Original patch by Thomas Rachel. + +- Issue #16624: `subprocess.check_output` now accepts an `input` argument, + allowing the subprocess's stdin to be provided as a (byte) string. + Patch by Zack Weinberg. + +- Issue #17795: Reverted backwards-incompatible change in SysLogHandler with + Unix domain sockets. + +- Issue #16694: Add a pure Python implementation of the operator module. + Patch by Zachary Ware. + +- Issue #11182: remove the unused and undocumented pydoc.Scanner class. + Patch by Martin Morrison. + +- Issue #17741: Add ElementTree.XMLPullParser, an event-driven parser for + non-blocking applications. + +- Issue #17555: Fix ForkAwareThreadLock so that size of after fork + registry does not grow exponentially with generation of process. + +- Issue #17707: fix regression in multiprocessing.Queue's get() method where + it did not block for short timeouts. + +- Issue #17720: Fix the Python implementation of pickle.Unpickler to correctly + process the APPENDS opcode when it is used on non-list objects. + +- Issue #17012: shutil.which() no longer falls back to the PATH environment + variable if an empty path argument is specified. Patch by Serhiy Storchaka. + +- Issue #17710: Fix pickle raising a SystemError on bogus input. + +- Issue #17341: Include the invalid name in the error messages from re about + invalid group names. + +- Issue #17702: os.environ now raises KeyError with the original environment + variable name (str on UNIX), instead of using the encoded name (bytes on + UNIX). + +- Issue #16163: Make the importlib based version of pkgutil.iter_importers + work for submodules. Initial patch by Berker Peksag. + +- Issue #16804: Fix a bug in the 'site' module that caused running + 'python -S -m site' to incorrectly throw an exception. + +- Issue #15480: Remove the deprecated and unused TYPE_INT64 code from marshal. + Initial patch by Daniel Riti. + +- Issue #2118: SMTPException is now a subclass of OSError. + +- Issue #17016: Get rid of possible pointer wraparounds and integer overflows + in the re module. Patch by Nickolai Zeldovich. + +- Issue #16658: add missing return to HTTPConnection.send(). + Patch by Jeff Knupp. + +- Issue #9556: the logging package now allows specifying a time-of-day for a + TimedRotatingFileHandler to rotate. + +- Issue #14971: unittest test discovery no longer gets confused when a function + has a different __name__ than its name in the TestCase class dictionary. + +- Issue #17487: The wave getparams method now returns a namedtuple rather than + a plain tuple. + +- Issue #17675: socket repr() provides local and remote addresses (if any). + Patch by Giampaolo Rodola' + +- Issue #17093: Make the ABCs in importlib.abc provide default values or raise + reasonable exceptions for their methods to make them more amenable to super() + calls. + +- Issue #17566: Make importlib.abc.Loader.module_repr() optional instead of an + abstractmethod; now it raises NotImplementedError so as to be ignored by default. + +- Issue #17678: Remove the use of deprecated method in http/cookiejar.py by + changing the call to get_origin_req_host() to origin_req_host. + +- Issue #17666: Fix reading gzip files with an extra field. + +- Issue #16475: Support object instancing, recursion and interned strings + in marshal + +- Issue #17502: Process DEFAULT values in mock side_effect that returns iterator. + +- Issue #16795: On the ast.arguments object, unify vararg with varargannotation + and kwarg and kwargannotation. Change the column offset of ast.Attribute to be + at the attribute name. + +- Issue #17434: Properly raise a SyntaxError when a string occurs between future + imports. + +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when + it has a value of None or the attribute doesn't exist. + +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined" + error message has been removed. Patch by Ram Rachum. + +- Issue #18080: When building a C extension module on OS X, if the compiler + is overridden with the CC environment variable, use the new compiler as + the default for linking if LDSHARED is not also overridden. This restores + Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0. + +- Issue #18113: Fixed a refcount leak in the curses.panel module's + set_userptr() method. Reported by Atsuo Ishimoto. + +- Implement PEP 443 "Single-dispatch generic functions". + +- Implement PEP 435 "Adding an Enum type to the Python standard library". + +- Issue #15596: Faster pickling of unicode strings. + +- Issue #17572: Avoid chained exceptions when passing bad directives to + time.strptime(). Initial patch by Claudiu Popa. + +- Issue #17435: threading.Timer's __init__ method no longer uses mutable + default values for the args and kwargs parameters. + +- Issue #17526: fix an IndexError raised while passing code without filename to + inspect.findsource(). Initial patch by Tyler Doyle. + +- Issue #17540: Added style parameter to logging formatter configuration by dict. + +- Issue #16692: The ssl module now supports TLS 1.1 and TLS 1.2. Initial + patch by Michele Orrù. + +- Issue #17025: multiprocessing: Reduce Queue and SimpleQueue contention. + +- Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser, + iceweasel, iceape. + +- Issue #17150: pprint now uses line continuations to wrap long string + literals. + +- Issue #17488: Change the subprocess.Popen bufsize parameter default value + from unbuffered (0) to buffering (-1) to match the behavior existing code + expects and match the behavior of the subprocess module in Python 2 to avoid + introducing hard to track down bugs. + +- Issue #17521: Corrected non-enabling of logger following two calls to + fileConfig(). + +- Issue #17508: Corrected logging MemoryHandler configuration in dictConfig() + where the target handler wasn't configured first. + +- Issue #17209: curses.window.get_wch() now correctly handles KeyboardInterrupt + (CTRL+c). + +- Issue #5713: smtplib now handles 421 (closing connection) error codes when + sending mail by closing the socket and reporting the 421 error code via the + exception appropriate to the command that received the error response. + +- Issue #16997: unittest.TestCase now provides a subTest() context manager + to procedurally generate, in an easy way, small test instances. + +- Issue #17485: Also delete the Request Content-Length header if the data + attribute is deleted. (Follow on to issue Issue #16464). + +- Issue #15927: CVS now correctly parses escaped newlines and carriage + when parsing with quoting turned off. + +- Issue #17467: add readline and readlines support to mock_open in + unittest.mock. + +- Issue #13248: removed deprecated and undocumented difflib.isbjunk, + isbpopular. + +- Issue #17192: Update the ctypes module's libffi to v3.0.13. This + specifically addresses a stack misalignment issue on x86 and issues on + some more recent platforms. + +- Issue #8862: Fixed curses cleanup when getkey is interrupted by a signal. + +- Issue #17443: imaplib.IMAP4_stream was using the default unbuffered IO + in subprocess, but the imap code assumes buffered IO. In Python2 this + worked by accident. IMAP4_stream now explicitly uses buffered IO. + +- Issue #17476: Fixed regression relative to Python2 in undocumented pydoc + 'allmethods'; it was missing unbound methods on the class. + +- Issue #17474: Remove the deprecated methods of Request class. + +- Issue #16709: unittest discover order is no-longer filesystem specific. Patch + by Jeff Ramnani. + +- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in pypirc. + +- Issue #5024: sndhdr.whichhdr now returns the frame count for WAV files + rather than -1. + +- Issue #17460: Remove the strict argument of HTTPConnection and removing the + DeprecationWarning being issued from 3.2 onwards. + +- Issue #16880: Do not assume _imp.load_dynamic() is defined in the imp module. + +- Issue #16389: Fixed a performance regression relative to Python 3.1 in the + caching of compiled regular expressions. + +- Added missing FeedParser and BytesFeedParser to email.parser.__all__. + +- Issue #17431: Fix missing import of BytesFeedParser in email.parser. + +- Issue #12921: http.server's send_error takes an explain argument to send more + information in response. Patch contributed by Karl. + +- Issue #17414: Add timeit, repeat, and default_timer to timeit.__all__. + +- Issue #1285086: Get rid of the refcounting hack and speed up + urllib.parse.unquote() and urllib.parse.unquote_to_bytes(). + +- Issue #17099: Have importlib.find_loader() raise ValueError when __loader__ + is not set, harmonizing with what happens when the attribute is set to None. + +- Expose the O_PATH constant in the os module if it is available. + +- Issue #17368: Fix an off-by-one error in the Python JSON decoder that caused + a failure while decoding empty object literals when object_pairs_hook was + specified. + +- Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO + queue now uses a deque instead of a list. + +- Issue #15806: Add contextlib.ignore(). This creates a context manager to + ignore specified exceptions, replacing the "except SomeException: pass" idiom. + +- Issue #14645: The email generator classes now produce output using the + specified linesep throughout. Previously if the prolog, epilog, or + body were stored with a different linesep, that linesep was used. This + fix corrects an RFC non-compliance issue with smtplib.send_message. + +- Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when + the list is being resized concurrently. + +- Issue #16962: Use getdents64 instead of the obsolete getdents syscall + in the subprocess module on Linux. + +- Issue #16935: unittest now counts the module as skipped if it raises SkipTest, + instead of counting it as an error. Patch by Zachary Ware. + +- Issue #17018: Make Process.join() retry if os.waitpid() fails with EINTR. + +- Issue #17223: array module: Fix a crasher when converting an array containing + invalid characters (outside range [U+0000; U+10ffff]) to Unicode: + repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob. + +- Issue #17197: profile/cProfile modules refactored so that code of run() and + runctx() utility functions is not duplicated in both modules. + +- Issue #14720: sqlite3: Convert datetime microseconds correctly. + Patch by Lowe Thiderman. + +- Issue #15132: Allow a list for the defaultTest argument of + unittest.TestProgram. Patch by Jyrki Pulliainen. + +- Issue #17225: JSON decoder now counts columns in the first line starting + with 1, as in other lines. + +- Issue #6623: Added explicit DeprecationWarning for ftplib.netrc, which has + been deprecated and undocumented for a long time. + +- Issue #13700: Fix byte/string handling in imaplib authentication when an + authobject is specified. + +- Issue #13153: Tkinter functions now raise TclError instead of ValueError when + a string argument contains non-BMP character. + +- Issue #9669: Protect re against infinite loops on zero-width matching in + non-greedy repeat. Patch by Matthew Barnett. + +- Issue #13169: The maximal repetition number in a regular expression has been + increased from 65534 to 2147483647 (on 32-bit platform) or 4294967294 (on + 64-bit). + +- Issue #17143: Fix a missing import in the trace module. Initial patch by + Berker Peksag. + +- Issue #15220: email.feedparser's line splitting algorithm is now simpler and + faster. + +- Issue #16743: Fix mmap overflow check on 32 bit Windows. + +- Issue #16996: webbrowser module now uses shutil.which() to find a + web-browser on the executable search path. + +- Issue #16800: tempfile.gettempdir() no longer left temporary files when + the disk is full. Original patch by Amir Szekely. + +- Issue #17192: Import libffi-3.0.12. + +- Issue #16564: Fixed regression relative to Python2 in the operation of + email.encoders.encode_7or8bit when used with binary data. + +- Issue #17052: unittest discovery should use self.testLoader. + +- Issue #4591: Uid and gid values larger than 2**31 are supported now. + +- Issue #17141: random.vonmisesvariate() no longer hangs for large kappas. + +- Issue #17149: Fix random.vonmisesvariate to always return results in + [0, 2*math.pi]. + +- Issue #1470548: XMLGenerator now works with binary output streams. + +- Issue #6975: os.path.realpath() now correctly resolves multiple nested + symlinks on POSIX platforms. + +- Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the + filename as a URI, allowing custom options to be passed. + +- Issue #16564: Fixed regression relative to Python2 in the operation of + email.encoders.encode_noop when used with binary data. + +- Issue #10355: The mode, name, encoding and newlines properties now work on + SpooledTemporaryFile objects even when they have not yet rolled over. + Obsolete method xreadline (which has never worked in Python 3) has been + removed. + +- Issue #16686: Fixed a lot of bugs in audioop module. Fixed crashes in + avgpp(), maxpp() and ratecv(). Fixed an integer overflow in add(), bias(), + and ratecv(). reverse(), lin2lin() and ratecv() no more lose precision for + 32-bit samples. max() and rms() no more returns a negative result and + various other functions now work correctly with 32-bit sample -0x80000000. + +- Issue #17073: Fix some integer overflows in sqlite3 module. + +- Issue #16723: httplib.HTTPResponse no longer marked closed when the connection + is automatically closed. + +- Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by + Brian Thorne. + +- Issue #16948: Fix quoted printable body encoding for non-latin1 character + sets in the email package. + +- Issue #16811: Fix folding of headers with no value in the provisional email + policies. + +- Issue #17132: Update symbol for "yield from" grammar changes. + +- Issue #17076: Make copying of xattrs more tolerant of missing FS support. + Patch by Thomas Wouters. + +- Issue #17089: Expat parser now correctly works with string input when the + internal XML encoding is not UTF-8 or US-ASCII. It also now accepts bytes + and strings larger than 2 GiB. + +- Issue #6083: Fix multiple segmentation faults occurred when PyArg_ParseTuple + parses nested mutating sequence. + +- Issue #5289: Fix ctypes.util.find_library on Solaris. + +- Issue #17106: Fix a segmentation fault in io.TextIOWrapper when an underlying + stream or a decoder produces data of an unexpected type (i.e. when + io.TextIOWrapper initialized with text stream or use bytes-to-bytes codec). + +- Issue #17015: When it has a spec, a Mock object now inspects its signature + when matching calls, so that arguments can be matched positionally or + by name. + +- Issue #15633: httplib.HTTPResponse is now mark closed when the server + sends less than the advertised Content-Length. + +- Issue #12268: The io module file object write methods no longer abort early + when one of its write system calls is interrupted (EINTR). + +- Issue #6972: The zipfile module no longer overwrites files outside of + its destination path when extracting malicious zip files. + +- Issue #4844: ZipFile now raises BadZipFile when opens a ZIP file with an + incomplete "End of Central Directory" record. Original patch by Guilherme + Polo and Alan McIntyre. + +- Issue #17071: Signature.bind() now works when one of the keyword arguments + is named ``self``. + +- Issue #12004: Fix an internal error in PyZipFile when writing an invalid + Python file. Patch by Ben Morgan. + +- Have py_compile use importlib as much as possible to avoid code duplication. + Code now raises FileExistsError if the file path to be used for the + byte-compiled file is a symlink or non-regular file as a warning that import + will not keep the file path type if it writes to that path. + +- Issue #16972: Have site.addpackage() consider already known paths even when + none are explicitly passed in. Bug report and fix by Kirill. + +- Issue #1602133: on Mac OS X a shared library build (``--enable-shared``) + now fills the ``os.environ`` variable correctly. + +- Issue #15505: `unittest.installHandler` no longer assumes SIGINT handler is + set to a callable object. + +- Issue #13454: Fix a crash when deleting an iterator created by itertools.tee() + if all other iterators were very advanced before. + +- Issue #12411: Fix to cgi.parse_multipart to correctly use bytes boundaries + and bytes data. Patch by Jonas Wagner. + +- Issue #16957: shutil.which() no longer searches a bare file name in the + current directory on Unix and no longer searches a relative file path with + a directory part in PATH directories. Patch by Thomas Kluyver. + +- Issue #1159051: GzipFile now raises EOFError when reading a corrupted file + with truncated header or footer. + +- Issue #16993: shutil.which() now preserves the case of the path and extension + on Windows. + +- Issue #16992: On Windows in signal.set_wakeup_fd, validate the file + descriptor argument. + +- Issue #16422: For compatibility with the Python version, the C version of + decimal now uses strings instead of integers for rounding mode constants. + +- Issue #15861: tkinter now correctly works with lists and tuples containing + strings with whitespaces, backslashes or unbalanced braces. + +- Issue #9720: zipfile now writes correct local headers for files larger than + 4 GiB. + +- Issue #16955: Fix the poll() method for multiprocessing's socket + connections on Windows. + +- SSLContext.load_dh_params() now properly closes the input file. + +- Issue #15031: Refactor some .pyc management code to cut down on code + duplication. Thanks to Ronan Lamy for the report and taking an initial stab + at the problem. + +- Issue #16398: Optimize deque.rotate() so that it only moves pointers + and doesn't touch the underlying data with increfs and decrefs. + +- Issue #16900: Issue a ResourceWarning when an ssl socket is left unclosed. + +- Issue #13899: ``\A``, ``\Z``, and ``\B`` now correctly match the A, Z, + and B literals when used inside character classes (e.g. ``'[\A]'``). + Patch by Matthew Barnett. + +- Issue #15545: Fix regression in sqlite3's iterdump method where it was + failing if the connection used a row factory (such as sqlite3.Row) that + produced unsortable objects. (Regression was introduced by fix for 9750). + +- fcntl: add F_DUPFD_CLOEXEC constant, available on Linux 2.6.24+. + +- Issue #15972: Fix error messages when os functions expecting a file name or + file descriptor receive the incorrect type. + +- Issue #8109: The ssl module now has support for server-side SNI, thanks + to a :meth:`SSLContext.set_servername_callback` method. Patch by Daniel + Black. + +- Issue #16860: In tempfile, use O_CLOEXEC when available to set the + close-on-exec flag atomically. + +- Issue #16674: random.getrandbits() is now 20-40% faster for small integers. + +- Issue #16009: JSON error messages now provide more information. + +- Issue #16828: Fix error incorrectly raised by bz2.compress(b'') and + bz2.BZ2Compressor.compress(b''). Initial patch by Martin Packman. + +- Issue #16833: In http.client.HTTPConnection, do not concatenate the request + headers and body when the payload exceeds 16 KB, since it can consume more + memory for no benefit. Patch by Benno Leslie. + +- Issue #16541: tk_setPalette() now works with keyword arguments. + +- Issue #16820: In configparser, `parser.popitem()` no longer raises ValueError. + This makes `parser.clean()` work correctly. + +- Issue #16820: In configparser, ``parser['section'] = {}`` now preserves + section order within the parser. This makes `parser.update()` preserve section + order as well. + +- Issue #16820: In configparser, ``parser['DEFAULT'] = {}`` now correctly + clears previous values stored in the default section. Same goes for + ``parser.update({'DEFAULT': {}})``. + +- Issue #9586: Redefine SEM_FAILED on MacOSX to keep compiler happy. + +- Issue #16787: Increase asyncore and asynchat default output buffers size, to + decrease CPU usage and increase throughput. + +- Issue #10527: make multiprocessing use poll() instead of select() if available. + +- Issue #16688: Now regexes contained backreferences correctly work with + non-ASCII strings. Patch by Matthew Barnett. + +- Issue #16486: Make aifc files act as context managers. + +- Issue #16485: Now file descriptors are closed if file header patching failed + on closing an aifc file. + +- Issue #16640: Run less code under a lock in sched module. + +- Issue #16165: sched.scheduler.run() no longer blocks a scheduler for other + threads. + +- Issue #16641: Default values of sched.scheduler.enter() are no longer + modifiable. + +- Issue #16618: Make glob.glob match consistently across strings and bytes + regarding leading dots. Patch by Serhiy Storchaka. + +- Issue #16788: Add samestat to Lib/ntpath.py + +- Issue #16713: Parsing of 'tel' urls using urlparse separates params from + path. + +- Issue #16443: Add docstrings to regular expression match objects. + Patch by Anton Kasyanov. + +- Issue #15701: Fix HTTPError info method call to return the headers information. + +- Issue #16752: Add a missing import to modulefinder. Patch by Berker Peksag. + +- Issue #16646: ftplib.FTP.makeport() might lose socket error details. + (patch by Serhiy Storchaka) + +- Issue #16626: Fix infinite recursion in glob.glob() on Windows when the + pattern contains a wildcard in the drive or UNC path. Patch by Serhiy + Storchaka. + +- Issue #15783: Except for the number methods, the C version of decimal now + supports all None default values present in decimal.py. These values were + largely undocumented. + +- Issue #11175: argparse.FileType now accepts encoding and errors + arguments. Patch by Lucas Maystre. + +- Issue #16488: epoll() objects now support the `with` statement. Patch + by Serhiy Storchaka. + +- Issue #16298: In HTTPResponse.read(), close the socket when there is no + Content-Length and the incoming stream is finished. Patch by Eran + Rundstein. + +- Issue #16049: Add abc.ABC class to enable the use of inheritance to create + ABCs, rather than the more cumbersome metaclass=ABCMeta. Patch by Bruno + Dupuis. + +- Expose the TCP_FASTOPEN and MSG_FASTOPEN flags in socket when they're + available. + +- Issue #15701: Add a .headers attribute to urllib.error.HTTPError. Patch + contributed by Berker Peksag. + +- Issue #15872: Fix 3.3 regression introduced by the new fd-based shutil.rmtree + that caused it to not ignore certain errors when ignore_errors was set. + Patch by Alessandro Moura and Serhiy Storchaka. + +- Issue #16248: Disable code execution from the user's home directory by + tkinter when the -E flag is passed to Python. Patch by Zachary Ware. + +- Issue #13390: New function :func:`sys.getallocatedblocks()` returns the + number of memory blocks currently allocated. + +- Issue #16628: Fix a memory leak in ctypes.resize(). + +- Issue #13614: Fix setup.py register failure with invalid rst in description. + Patch by Julien Courteau and Pierre Paul Lefebvre. + +- Issue #13512: Create ~/.pypirc securely (CVE-2011-4944). Initial patch by + Philip Jenvey, tested by Mageia and Debian. + +- Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking later + on. Initial patch by SilentGhost and Jeff Ramnani. + +- Issue #13120: Allow calling pdb.set_trace() from thread. + Patch by Ilya Sandler. + +- Issue #16585: Make CJK encoders support error handlers that return bytes per + PEP 383. + +- Issue #10182: The re module doesn't truncate indices to 32 bits anymore. + Patch by Serhiy Storchaka. + +- Issue #16333: use (",", ": ") as default separator in json when indent is + specified, to avoid trailing whitespace. Patch by Serhiy Storchaka. + +- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous + list() calls aren't added to filter(), map(), and zip() which are directly + passed enumerate(). + +- Issue #16464: Reset the Content-Length header when a urllib Request is reused + with new data. + +- Issue #12848: The pure Python pickle implementation now treats object + lengths as unsigned 32-bit integers, like the C implementation does. + Patch by Serhiy Storchaka. + +- Issue #16423: urllib.request now has support for ``data:`` URLs. Patch by + Mathias Panzenböck. + +- Issue #4473: Add a POP3.stls() to switch a clear-text POP3 session into + an encrypted POP3 session, on supported servers. Patch by Lorenzo Catucci. + +- Issue #4473: Add a POP3.capa() method to query the capabilities advertised + by the POP3 server. Patch by Lorenzo Catucci. + +- Issue #4473: Ensure the socket is shutdown cleanly in POP3.close(). + Patch by Lorenzo Catucci. + +- Issue #16522: added FAIL_FAST flag to doctest. + +- Issue #15627: Add the importlib.abc.InspectLoader.source_to_code() method. + +- Issue #16408: Fix file descriptors not being closed in error conditions + in the zipfile module. Patch by Serhiy Storchaka. + +- Issue #14631: Add a new :class:`weakref.WeakMethod` to simulate weak + references to bound methods. + +- Issue #16469: Fix exceptions from float -> Fraction and Decimal -> Fraction + conversions for special values to be consistent with those for float -> int + and Decimal -> int. Patch by Alexey Kachayev. + +- Issue #16481: multiprocessing no longer leaks process handles on Windows. + +- Issue #12428: Add a pure Python implementation of functools.partial(). + Patch by Brian Thorne. + +- Issue #16140: The subprocess module no longer double closes its child + subprocess.PIPE parent file descriptors on child error prior to exec(). + +- Remove a bare print to stdout from the subprocess module that could have + happened if the child process wrote garbage to its pre-exec error pipe. + +- The subprocess module now raises its own SubprocessError instead of a + RuntimeError in various error situations which should not normally happen. + +- Issue #16327: The subprocess module no longer leaks file descriptors + used for stdin/stdout/stderr pipes to the child when fork() fails. + +- Issue #14396: Handle the odd rare case of waitpid returning 0 when not + expected in subprocess.Popen.wait(). + +- Issue #16411: Fix a bug where zlib.decompressobj().flush() might try to access + previously-freed memory. Patch by Serhiy Storchaka. + +- Issue #16357: fix calling accept() on a SSLSocket created through + SSLContext.wrap_socket(). Original patch by Jeff McNeil. + +- Issue #16409: The reporthook callback made by the legacy + urllib.request.urlretrieve API now properly supplies a constant non-zero + block_size as it did in Python 3.2 and 2.7. This matches the behavior of + urllib.request.URLopener.retrieve. + +- Issue #16431: Use the type information when constructing a Decimal subtype + from a Decimal argument. + +- Issue #15641: Clean up deprecated classes from importlib. + Patch by Taras Lyapun. + +- Issue #16350: zlib.decompressobj().decompress() now accumulates data from + successive calls after EOF in unused_data, instead of only saving the argument + to the last call. decompressobj().flush() now correctly sets unused_data and + unconsumed_tail. A bug in the handling of MemoryError when setting the + unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka. + +- Issue #12759: sre_parse now raises a proper error when the name of the group + is missing. Initial patch by Serhiy Storchaka. + +- Issue #16152: fix tokenize to ignore whitespace at the end of the code when + no newline is found. Patch by Ned Batchelder. + +- Issue #16284: Prevent keeping unnecessary references to worker functions + in concurrent.futures ThreadPoolExecutor. + +- Issue #16230: Fix a crash in select.select() when one of the lists changes + size while iterated on. Patch by Serhiy Storchaka. + +- Issue #16228: Fix a crash in the json module where a list changes size + while it is being encoded. Patch by Serhiy Storchaka. + +- Issue #16351: New function gc.get_stats() returns per-generation collection + statistics. + +- Issue #14897: Enhance error messages of struct.pack and + struct.pack_into. Patch by Matti Mäki. + +- Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. + Patch by Serhiy Storchaka. + +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + +- Issue #16307: Fix multiprocessing.Pool.map_async not calling its callbacks. + Patch by Janne Karila. + +- Issue #16305: Fix a segmentation fault occurring when interrupting + math.factorial. + +- Issue #16116: Fix include and library paths to be correct when building C + extensions in venvs. + +- Issue #16245: Fix the value of a few entities in html.entities.html5. + +- Issue #16301: Fix the localhost verification in urllib/request.py for ``file://`` + urls. + +- Issue #16250: Fix the invocations of URLError which had misplaced filename + attribute for exception. + +- Issue #10836: Fix exception raised when file not found in urlretrieve + Initial patch by Ezio Melotti. + +- Issue #14398: Fix size truncation and overflow bugs in the bz2 module. + +- Issue #12692: Fix resource leak in urllib.request when talking to an HTTP + server that does not include a ``Connection: close`` header in its responses. + +- Issue #12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. + Patch by Atsuo Ishimoto. + +- Improve performance of `lzma.LZMAFile` (see also issue #16034). + +- Issue #16220: wsgiref now always calls close() on an iterable response. + Patch by Brent Tubbs. + +- Issue #16270: urllib may hang when used for retrieving files via FTP by using + a context manager. Patch by Giampaolo Rodola'. + +- Issue #16461: Wave library should be able to deal with 4GB wav files, + and sample rate of 44100 Hz. + +- Issue #16176: Properly identify Windows 8 via platform.platform() + +- Issue #16088: BaseHTTPRequestHandler's send_error method includes a + Content-Length header in its response now. Patch by Antoine Pitrou. + +- Issue #16114: The subprocess module no longer provides a misleading error + message stating that args[0] did not exist when either the cwd or executable + keyword arguments specified a path that did not exist. + +- Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. + +- Issue #16110: logging.fileConfig now accepts a pre-initialised ConfigParser + instance. + +- Issue #1492704: shutil.copyfile() raises a distinct SameFileError now if + source and destination are the same file. Patch by Atsuo Ishimoto. + +- Issue #13896: Make shelf instances work with 'with' as context managers. + Original patch by Filip Gruszczyński. + +- Issue #15417: Add support for csh and fish in venv activation scripts. + +- Issue #14377: ElementTree.write and some of the module-level functions have + a new parameter - *short_empty_elements*. It controls how elements with no + contents are emitted. + +- Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element + element_factory (fixes a regression in SimpleTAL). + +- Issue #9650: List commonly used format codes in time.strftime and + time.strptime docsttings. Original patch by Mike Hoy. + +- Issue #15452: logging configuration socket listener now has a verify option + that allows an application to apply a verification function to the + received configuration data before it is acted upon. + +- Issue #16034: Fix performance regressions in the new `bz2.BZ2File` + implementation. Initial patch by Serhiy Storchaka. + +- `pty.spawn()` now returns the child process status returned by `os.waitpid()`. + +- Issue #15756: `subprocess.poll()` now properly handles `errno.ECHILD` to + return a returncode of 0 when the child has already exited or cannot be waited + on. + +- Issue #15323: Improve failure message of `Mock.assert_called_once_with()`. + +- Issue #16064: ``unittest -m`` claims executable is "python", not "python3". + +- Issue #12376: Pass on parameters in `TextTestResult.__init__()` super call. + +- Issue #15222: Insert blank line after each message in mbox mailboxes. + +- Issue #16013: Fix `csv.Reader` parsing issue with ending quote characters. + Patch by Serhiy Storchaka. + +- Issue #15421: Fix an OverflowError in `Calendar.itermonthdates()` after + `datetime.MAXYEAR`. Patch by Cédric Krier. + +- Issue #16112: platform.architecture does not correctly escape argument to + /usr/bin/file. Patch by David Benjamin. + +- Issue #15970: `xml.etree.ElementTree` now serializes correctly the empty HTML + elements 'meta' and 'param'. + +- Issue #15842: The `SocketIO.{readable,writable,seekable}` methods now raise + ValueError when the file-like object is closed. Patch by Alessandro Moura. + +- Issue #15876: Fix a refleak in the `curses` module: window.encoding. + +- Issue #15881: Fix `atexit` hook in `multiprocessing`. Original patch by Chris + McDonough. + +- Issue #15841: The readable(), writable() and seekable() methods of + `io.BytesIO` and `io.StringIO` objects now raise ValueError when the object + has been closed. Patch by Alessandro Moura. + +- Issue #15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening + `os.devnull` explicitly and leaving it open. + +- Issue #15509: `webbrowser.UnixBrowser` no longer passes empty arguments to + Popen when ``%action`` substitutions produce empty strings. + +- Issue #12776, issue #11839: Call `argparse` type function (specified by + add_argument) only once. Before, the type function was called twice in the + case where the default was specified and the argument was given as well. This + was especially problematic for the FileType type, as a default file would + always be opened, even if a file argument was specified on the command line. + +- Issue #15906: Fix a regression in argparse caused by the preceding change, + when ``action='append'``, ``type='str'`` and ``default=[]``. + +- Issue #16113: Added sha3 module based on the Keccak reference implementation + 3.2. The `hashlib` module has four additional hash algorithms: `sha3_224`, + `sha3_256`, `sha3_384` and `sha3_512`. As part of the patch some common + code was moved from _hashopenssl.c to hashlib.h. + +- ctypes.call_commethod was removed, since its only usage was in the defunct + samples directory. + +- Issue #16692: Added TLSv1.1 and TLSv1.2 support for the ssl modules. + +- Issue #16832: add abc.get_cache_token() to expose cache validity checking + support in ABCMeta. + +IDLE +---- + +- Issue #18429: Format / Format Paragraph, now works when comment blocks + are selected. As with text blocks, this works best when the selection + only includes complete lines. + +- Issue #18226: Add docstrings and unittests for FormatParagraph.py. + Original patches by Todd Rovito and Phil Webster. + +- Issue #18279: Format - Strip trailing whitespace no longer marks a file as + changed when it has not been changed. This fix followed the addition of a + test file originally written by Phil Webster (the issue's main goal). + +- Issue #7136: In the Idle File menu, "New Window" is renamed "New File". + Patch by Tal Einat, Roget Serwy, and Todd Rovito. + +- Remove dead imports of imp. + +- Issue #18196: Avoid displaying spurious SystemExit tracebacks. + +- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition. + +- Issue #17511: Keep IDLE find dialog open after clicking "Find Next". + Original patch by Sarah K. + +- Issue #18055: Move IDLE off of imp and on to importlib. + +- Issue #15392: Create a unittest framework for IDLE. + Initial patch by Rajagopalasarma Jayakrishnan. + See Lib/idlelib/idle_test/README.txt for how to run Idle tests. + +- Issue #14146: Highlight source line while debugging on Windows. + +- Issue #17838: Allow sys.stdin to be reassigned. + +- Issue #13495: Avoid loading the color delegator twice in IDLE. + +- Issue #17798: Allow IDLE to edit new files when specified on command line. + +- Issue #14735: Update IDLE docs to omit "Control-z on Windows". + +- Issue #17532: Always include Options menu for IDLE on OS X. + Patch by Guilherme Simões. + +- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit(). + +- Issue #17657: Show full Tk version in IDLE's about dialog. + Patch by Todd Rovito. + +- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE. + +- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE. + +- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box. + +- Issue #17625: In IDLE, close the replace dialog after it is used. + +- Issue #14254: IDLE now handles readline correctly across shell restarts. + +- Issue #17614: IDLE no longer raises exception when quickly closing a file. + +- Issue #6698: IDLE now opens just an editor window when configured to do so. + +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer + raises an exception. + +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. + +- Issue #17114: IDLE now uses non-strict config parser. + +- Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase + interface and support all mandatory methods and properties. + +- Issue #5066: Update IDLE docs. Patch by Todd Rovito. + +- Issue #16829: IDLE printing no longer fails if there are spaces or other + special characters in the file path. + +- Issue #16491: IDLE now prints chained exception tracebacks. + +- Issue #16819: IDLE method completion now correctly works for bytes literals. + +- Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by + Roger Serwy. + +- Issue #16511: Use default IDLE width and height if config param is not valid. + Patch Serhiy Storchaka. + +- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu. + Patch by Todd Rovito. + +- Issue #16123: IDLE - deprecate running without a subprocess. + Patch by Roger Serwy. + +Tests +----- + +- Issue #1666318: Add a test that shutil.copytree() retains directory + permissions. Patch by Catherine Devlin. + +- Issue #18273: move the tests in Lib/test/json_tests to Lib/test/test_json + and make them discoverable by unittest. Patch by Zachary Ware. + +- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger). + +- Issue #18396: Fix spurious test failure in test_signal on Windows when + faulthandler is enabled (Patch by Jeremy Kloth) + +- Issue #17046: Fix broken test_executable_without_cwd in test_subprocess. + +- Issue #15415: Add new temp_dir() and change_cwd() context managers to + test.support, and refactor temp_cwd() to use them. Patch by Chris Jerdonek. + +- Issue #15494: test.support is now a package rather than a module (Initial + patch by Indra Talip) + +- Issue #17944: test_zipfile now discoverable and uses subclassing to + generate tests for different compression types. Fixed a bug with skipping + some tests due to use of exhausted iterators. + +- Issue #18266: test_largefile now works with unittest test discovery and + supports running only selected tests. Patch by Zachary Ware. + +- Issue #17767: test_locale now works with unittest test discovery. + Original patch by Zachary Ware. + +- Issue #18375: Assume --randomize when --randseed is used for running the + testsuite. + +- Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé. + +- Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds + in ASN1_TIME fields. + +- Issue #18094: test_uuid no longer reports skipped tests as passed. + +- Issue #17992: Add timeouts to asyncore and asynchat tests so that they won't + accidentally hang. + +- Issue #17833: Fix test_gdb failures seen on machines where debug symbols + for glibc are available (seen on PPC64 Linux). + +- Issue #7855: Add tests for ctypes/winreg for issues found in IronPython. + Initial patch by Dino Viehland. + +- Issue #11078: test___all__ now checks for duplicates in __all__. + Initial patch by R. David Murray. + +- Issue #17712: Fix test_gdb failures on Ubuntu 13.04. + +- Issue #17835: Fix test_io when the default OS pipe buffer size is larger + than one million bytes. + +- Issue #17065: Use process-unique key for winreg tests to avoid failures if + test is run multiple times in parallel (eg: on a buildbot host). + +- Issue #12820: add tests for the xml.dom.minicompat module. + Patch by John Chandler and Phil Connell. + +- Issue #17691: test_univnewlines now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17790: test_set now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17789: test_random now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17779: test_osx_env now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17766: test_iterlen now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17690: test_time now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17692: test_sqlite now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #11995: test_pydoc doesn't import all sys.path modules anymore. + +- Issue #17448: test_sax now skips if there are no xml parsers available + instead of raising an ImportError. + +- Issue #11420: make test suite pass with -B/DONTWRITEBYTECODE set. + Initial patch by Thomas Wouters. + +- Issue #10652: make tcl/tk tests run after __all__ test, patch by + Zachary Ware. + +- Issue #11963: remove human verification from test_parser and test_subprocess. + +- Issue #11732: add a new suppress_crash_popup() context manager to test.support + that disables crash popups on Windows and use it in test_faulthandler and + test_capi. + +- Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu. + +- Issue #17283: Share code between `__main__.py` and `regrtest.py` in + `Lib/test`. + +- Issue #17249: convert a test in test_capi to use unittest and reap threads. + +- Issue #17107: Test client-side SNI support in urllib.request thanks to + the new server-side SNI support in the ssl module. Initial patch by + Daniel Black. + +- Issue #17041: Fix testing when Python is configured with the + --without-doc-strings. + +- Issue #16923: Fix ResourceWarnings in test_ssl. + +- Issue #15539: Added regression tests for Tools/scripts/pindent.py. + +- Issue #17479: test_io now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17066: test_robotparser now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17334: test_index now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17333: test_imaplib now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17082: test_dbm* now work with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17079: test_ctypes now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17304: test_hash now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17303: test_future* now work with unittest test discovery. + Patch by Zachary Ware. + +- Issue #17163: test_file now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16925: test_configparser now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16918: test_codecs now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16919: test_crypt now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16910: test_bytes, test_unicode, and test_userstring now work with + unittest test discovery. Patch by Zachary Ware. + +- Issue #16905: test_warnings now works with unittest test discovery. + Initial patch by Berker Peksag. + +- Issue #16898: test_bufio now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16888: test_array now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16896: test_asyncore now works with unittest test discovery. + Patch by Zachary Ware. + +- Issue #16897: test_bisect now works with unittest test discovery. + Initial patch by Zachary Ware. + +- Issue #16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath + now work with unittest test discovery. Patch by Zachary Ware. + +- Issue #16748: test_heapq now works with unittest test discovery. + +- Issue #10646: Tests rearranged for os.samefile/samestat to check for not + just symlinks but also hard links. + +- Issue #15302: Switch regrtest from using getopt to using argparse. + +- Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize + options. + +- Issue #16702: test_urllib2_localnet tests now correctly ignores proxies for + localhost tests. + +- Issue #16664: Add regression tests for glob's behaviour concerning entries + starting with a ".". Patch by Sebastian Kreft. + +- Issue #13390: The ``-R`` option to regrtest now also checks for memory + allocation leaks, using :func:`sys.getallocatedblocks()`. + +- Issue #16559: Add more tests for the json module, including some from the + official test suite at json.org. Patch by Serhiy Storchaka. + +- Issue #16661: Fix the `os.getgrouplist()` test by not assuming that it gives + the same output as :command:`id -G`. + +- Issue #16115: Add some tests for the executable argument to + subprocess.Popen(). Initial patch by Kushal Das. + +- Issue #16126: PyErr_Format format mismatch in _testcapimodule.c. + Patch by Serhiy Storchaka. + +- Issue #15304: Fix warning message when `os.chdir()` fails inside + `test.support.temp_cwd()`. Patch by Chris Jerdonek. + +- Issue #15802: Fix test logic in `TestMaildir.test_create_tmp()`. Patch by + Serhiy Storchaka. + +- Issue #15557: Added a test suite for the webbrowser module, thanks to Anton + Barkovsky. + +- Issue #16698: Skip posix test_getgroups when built with OS X + deployment target prior to 10.6. + +Build +----- + +- Issue #16067: Add description into MSI file to replace installer's + temporary name. + +- Issue #18257: Fix readlink usage in python-config. Install the python + version again on Darwin. + +- Issue #18481: Add C coverage reporting with gcov and lcov. A new make target + "coverage-report" creates an instrumented Python build, runs unit tests + and creates a HTML. The report can be updated with "make coverage-lcov". + +- Issue #17845: Clarified the message printed when some module are not built. + +- Issue #18256: Compilation fix for recent AIX releases. Patch by + David Edelsohn. + +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC + 4.8. + +- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1 + on Windows. + +- Issue #17591: Use lowercase filenames when including Windows header files. + Patch by Roumen Petrov. + +- Issue #17550: Fix the --enable-profiling configure switch. + +- Issue #17425: Build with openssl 1.0.1d on Windows. + +- Issue #16754: Fix the incorrect shared library extension on linux. Introduce + two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of + SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4. + +- Issue #5033: Fix building of the sqlite3 extension module when the + SQLite library version has "beta" in it. Patch by Andreas Pelme. + +- Issue #17228: Fix building without pymalloc. + +- Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac. + +- Issue #16235: Implement python-config as a shell script. + +- Issue #16769: Remove outdated Visual Studio projects. + +- Issue #17031: Fix running regen in cross builds. + +- Issue #3754: fix typo in pthread AC_CACHE_VAL. + +- Issue #15484: Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds; + use _PYTHON_PROJECT_BASE in distutils/sysconfig.py. + +- Drop support for Windows 2000 (changeset e52df05b496a). + +- Issue #17029: Let h2py search the multiarch system include directory. + +- Issue #16953: Fix socket module compilation on platforms with + HAVE_BROKEN_POLL. Patch by Jeffrey Armstrong. + +- Issue #16320: Remove redundant Makefile dependencies for strings and bytes. + +- Cross compiling needs host and build settings. configure no longer + creates a broken PYTHON_FOR_BUILD variable when --build is missing. + +- Fix cross compiling issue in setup.py, ensure that lib_dirs and inc_dirs are + defined in cross compiling mode, too. + +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host. + +- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf + +- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. + +- Issue #15298: ensure _sysconfigdata is generated in build directory, not + source directory. + +- Issue #15833: Fix a regression in 3.3 that resulted in exceptions being + raised if importlib failed to write byte-compiled files. This affected + attempts to build Python out-of-tree from a read-only source directory. + +- Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError + after 2801bf875a24 (see #15801). + +- Issue #16135: Remove OS/2 support. + +- Issue #15819: Make sure we can build Python out-of-tree from a read-only + source directory. (Somewhat related to issue #9860.) + +- Issue #15587: Enable Tk high-resolution text rendering on Macs with + Retina displays. Applies to Tkinter apps, such as IDLE, on OS X + framework builds linked with Cocoa Tk 8.5. + +- Issue #17161: make install now also installs a python3 man page. + +C-API +----- + +- Issue #18351: Fix various issues in a function in importlib provided to help + PyImport_ExecCodeModuleWithPathnames() (and thus by extension + PyImport_ExecCodeModule() and PyImport_ExecCodeModuleEx()). + +- Issue #15767: Added PyErr_SetImportErrorSubclass(). + +- PyErr_SetImportError() now sets TypeError when its msg argument is set. + +- Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and + PyObject_CallMethod() now changed to `const char*`. Based on patches by + Jörg Müller and Lars Buitinck. + +- Issue #17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now + expand their arguments once instead of multiple times. Patch written by Illia + Polosukhin. + +- Issue #17522: Add the PyGILState_Check() API. + +- Issue #17327: Add PyDict_SetDefault. + +- Issue #16881: Fix Py_ARRAY_LENGTH macro for GCC < 3.1. + +- Issue #16505: Remove unused Py_TPFLAGS_INT_SUBCLASS. + +- Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned + (unsigned long and unsigned int) to avoid an undefined behaviour with + Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is + now unsigned too (unsigned long, instead of long). + +- Issue #16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified + endianness detection and handling. + +Documentation +------------- + +- Issue #23006: Improve the documentation and indexing of dict.__missing__. + Add an entry in the language datamodel special methods section. + Revise and index its discussion in the stdtypes mapping/dict section. + +- Issue #17701: Improving strftime documentation. + +- Issue #18440: Clarify that `hash()` can truncate the value returned from an + object's custom `__hash__()` method. + +- Issue #17844: Add links to encoders and decoders for bytes-to-bytes codecs. + +- Issue #14097: improve the "introduction" page of the tutorial. + +- Issue #17977: The documentation for the cadefault argument's default value + in urllib.request.urlopen() is fixed to match the code. + +- Issue #6696: add documentation for the Profile objects, and improve + profile/cProfile docs. Patch by Tom Pinckney. + +- Issue #15940: Specify effect of locale on time functions. + +- Issue #17538: Document XML vulnerabilties + +- Issue #16642: sched.scheduler timefunc initial default is time.monotonic. + Patch by Ramchandra Apte + +- Issue #17047: remove doubled words in docs and docstrings + reported by Serhiy Storchaka and Matthew Barnett. + +- Issue #15465: Document the versioning macros in the C API docs rather than + the standard library docs. Patch by Kushal Das. + +- Issue #16406: Combine the pages for uploading and registering to PyPI. + +- Issue #16403: Document how distutils uses the maintainer field in + PKG-INFO. Patch by Jyrki Pulliainen. + +- Issue #16695: Document how glob handles filenames starting with a + dot. Initial patch by Jyrki Pulliainen. + +- Issue #8890: Stop advertising an insecure practice by replacing uses + of the /tmp directory with better alternatives in the documentation. + Patch by Geoff Wilson. + +- Issue #17203: add long option names to unittest discovery docs. + +- Issue #13094: add "Why do lambdas defined in a loop with different values + all return the same result?" programming FAQ. + +- Issue #14901: Update portions of the Windows FAQ. + Patch by Ashish Nitin Patil. + +- Issue #16267: Better document the 3.3+ approach to combining + @abstractmethod with @staticmethod, @classmethod and @property + +- Issue #15209: Clarify exception chaining description in exceptions module + documentation + +- Issue #15990: Improve argument/parameter documentation. + +- Issue #16209: Move the documentation for the str built-in function to a new + str class entry in the "Text Sequence Type" section. + +- Issue #13538: Improve str() and object.__str__() documentation. + +- Issue #16489: Make it clearer that importlib.find_loader() needs parent + packages to be explicitly imported. + +- Issue #16400: Update the description of which versions of a given package + PyPI displays. + +- Issue #15677: Document that zlib and gzip accept a compression level of 0 to + mean 'no compression'. Patch by Brian Brazil. + +- Issue #16197: Update winreg docstrings and documentation to match code. + Patch by Zachary Ware. + +- Issue #8040: added a version switcher to the documentation. Patch by + Yury Selivanov. + +- Issue #16241: Document -X faulthandler command line option. + Patch by Marek Šuppa. + +- Additional comments and some style changes in the concurrent.futures URL + retrieval example + +- Issue #16115: Improve subprocess.Popen() documentation around args, shell, + and executable arguments. + +- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with + great native-speaker help from R. David Murray. + +- Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd + argument. + +- Issue #15979: Improve timeit documentation. + +- Issue #16036: Improve documentation of built-in `int()`'s signature and + arguments. + +- Issue #15935: Clarification of `argparse` docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +- Issue #15116: Remove references to appscript as it is no longer being + supported. + +Tools/Demos +----------- + +- Issue #18817: Fix a resource warning in Lib/aifc.py demo. Patch by + Vajrasky Kok. + +- Issue #18439: Make patchcheck work on Windows for ACKS, NEWS. + +- Issue #18448: Fix a typo in Tools/demo/eiffel.py. + +- Issue #18457: Fixed saving of formulas and complex numbers in + Tools/demo/ss1.py. + +- Issue #18449: Make Tools/demo/ss1.py work again on Python 3. Patch by + Févry Thibault. + +- Issue #12990: The "Python Launcher" on OSX could not launch python scripts + that have paths that include wide characters. + +- Issue #15239: Make mkstringprep.py work again on Python 3. + +- Issue #17028: Allowed Python arguments to be supplied to the Windows + launcher. + +- Issue #17156: pygettext.py now detects the encoding of source files and + correctly writes and escapes non-ascii characters. + +- Issue #15539: Fix a number of bugs in Tools/scripts/pindent.py. Now + pindent.py works with a "with" statement. pindent.py no longer produces + improper indentation. pindent.py now works with continued lines broken after + "class" or "def" keywords and with continuations at the start of line. + +- Issue #11797: Add a 2to3 fixer that maps reload() to imp.reload(). + +- Issue #10966: Remove the concept of unexpected skipped tests. + +- Issue #9893: Removed the Misc/Vim directory. + +- Removed the Misc/TextMate directory. + +- Issue #16245: Add the Tools/scripts/parse_html5_entities.py script to parse + the list of HTML5 entities and update the html.entities.html5 dictionary. + +- Issue #15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. + +- Issue #16549: Make json.tool work again on Python 3 and add tests. + Initial patch by Berker Peksag and Serhiy Storchaka. + +- Issue #13301: use ast.literal_eval() instead of eval() in Tools/i18n/msgfmt.py. + Patch by Serhiy Storchaka. + +Windows +------- + +- Issue #18569: The installer now adds .py to the PATHEXT variable when extensions + are registered. Patch by Paul Moore. + + What's New in Python 3.3.0? =========================== @@ -2194,7 +6495,7 @@ Core and Builtins NULL). - Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse - the format string in the 3 steps, fix crashes on invalid format strings. + the format string in the 3 steps, fix crashs on invalid format strings. - Issue #13007: whichdb should recognize gdbm 1.9 magic numbers. @@ -3285,7 +7586,7 @@ Library - Issue #11382: Trivial system calls, such as dup() or pipe(), needn't release the GIL. Patch by Charles-François Natali. -- Issue #11223: Add threading._info() function providing information about +- Issue #11223: Add threading._info() function providing informations about the thread implementation. - Issue #11731: simplify/enhance email parser/generator API by introducing diff --git a/Misc/NEWS b/Misc/NEWS index 0643937..848add0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2,9821 +2,6733 @@ Python News +++++++++++ -What's New in Python 3.5.4 final? -================================= - -*Release date: 2017-08-07* +What's New in Python 3.6.0? +=========================== -Library -------- +*Release date: 2016-12-23* -- bpo-30119: ftplib.FTP.putline() now throws ValueError on commands that - contains CR or LF. Patch by Dong-hee Na. +- No changes since release candidate 2 -What's New in Python 3.5.4 release candidate 1? +What's New in Python 3.6.0 release candidate 2? =============================================== -*Release date: 2017-07-23* - -Security --------- - -- bpo-30730: Prevent environment variables injection in subprocess on - Windows. Prevent passing other environment variables and command - arguments. - -- bpo-30694: Upgrade expat copy from 2.2.0 to 2.2.1 to get fixes of multiple - security vulnerabilities including: CVE-2017-9233 (External entity - infinite loop DoS), CVE-2016-9063 (Integer overflow, re-fix), - CVE-2016-0718 (Fix regression bugs from 2.2.0's fix to CVE-2016-0718) and - CVE-2012-0876 (Counter hash flooding with SipHash). Note: the - CVE-2016-5300 (Use os- specific entropy sources like getrandom) doesn't - impact Python, since Python already gets entropy from the OS to set the - expat secret using ``XML_SetHashSalt()``. - -- bpo-30500: Fix urllib.parse.splithost() to correctly parse fragments. For - example, ``splithost('//127.0.0.1#@evil.com/')`` now correctly returns the - ``127.0.0.1`` host, instead of treating ``@evil.com`` as the host in an - authentification (``login@host``). - -- bpo-29591: Update expat copy from 2.1.1 to 2.2.0 to get fixes of - CVE-2016-0718 and CVE-2016-4472. See - https://sourceforge.net/p/expat/bugs/537/ for more information. +*Release date: 2016-12-16* Core and Builtins ----------------- -- bpo-30876: Relative import from unloaded package now reimports the package - instead of failing with SystemError. Relative import from non-package now - fails with ImportError rather than SystemError. +- Issue #28147: Fix a memory leak in split-table dictionaries: setattr() + must not convert combined table into split table. Patch written by INADA + Naoki. -- bpo-30765: Avoid blocking in pthread_mutex_lock() when - PyThread_acquire_lock() is asked not to block. +- Issue #28990: Fix asynchio SSL hanging if connection is closed before + handshake is completed. (Patch by HoHo-Ho) -- bpo-27945: Fixed various segfaults with dict when input collections are - mutated during searching, inserting or comparing. Based on patches by - Duane Griffin and Tim Mitchell. +Tools/Demos +----------- -- bpo-25794: Fixed type.__setattr__() and type.__delattr__() for non- - interned attribute names. Based on patch by Eryk Sun. +- Issue #28770: Fix python-gdb.py for fastcalls. -- bpo-29935: Fixed error messages in the index() method of tuple, list and - deque when pass indices of wrong type. +Windows +------- -- bpo-28876: ``bool(range)`` works even if ``len(range)`` raises - :exc:`OverflowError`. +- Issue #28896: Deprecate WindowsRegistryFinder. -- bpo-29600: Fix wrapping coroutine return values in StopIteration. +Build +----- -- bpo-29537: Restore runtime compatibility with bytecode files generated by - CPython 3.5.0 to 3.5.2, and adjust the eval loop to avoid the problems - that could be caused by the malformed variant of the - BUILD_MAP_UNPACK_WITH_CALL opcode that they may contain. Patch by Petr - Viktorin, Serhiy Storchaka, and Nick Coghlan. +- Issue #28898: Prevent gdb build errors due to HAVE_LONG_LONG redefinition. -- bpo-28598: Support __rmod__ for subclasses of str being called before - str.__mod__. Patch by Martijn Pieters. -- bpo-29602: Fix incorrect handling of signed zeros in complex constructor - for complex subclasses and for inputs having a __complex__ method. Patch - by Serhiy Storchaka. +What's New in Python 3.6.0 release candidate 1? +=============================================== -- bpo-29347: Fixed possibly dereferencing undefined pointers when creating - weakref objects. +*Release date: 2016-12-06* -- bpo-29438: Fixed use-after-free problem in key sharing dict. +Core and Builtins +----------------- -- bpo-29319: Prevent RunMainFromImporter overwriting sys.path[0]. +- Issue #23722: Rather than silently producing a class that doesn't support + zero-argument ``super()`` in methods, failing to pass the new + ``__classcell__`` namespace entry up to ``type.__new__`` now results in a + ``DeprecationWarning`` and a class that supports zero-argument ``super()``. -- bpo-29337: Fixed possible BytesWarning when compare the code objects. - Warnings could be emitted at compile time. +- Issue #28797: Modifying the class __dict__ inside the __set_name__ method of + a descriptor that is used inside that class no longer prevents calling the + __set_name__ method of other descriptors. -- bpo-29478: If max_line_length=None is specified while using the Compat32 - policy, it is no longer ignored. Patch by Mircea Cosbuc. +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking + if the next instruction is YIELD_FROM. Regression introduced by WORDCODE + (issue #26647). Library ------- -- bpo-29403: Fix ``unittest.mock``'s autospec to not fail on method-bound - builtin functions. Patch by Aaron Gallagher. - -- bpo-30961: Fix decrementing a borrowed reference in tracemalloc. - -- bpo-30886: Fix multiprocessing.Queue.join_thread(): it now waits until the - thread completes, even if the thread was started by the same process which - created the queue. - -- bpo-29854: Fix segfault in readline when using readline's history-size - option. Patch by Nir Soffer. - -- bpo-30807: signal.setitimer() may disable the timer when passed a tiny - value. - - Tiny values (such as 1e-6) are valid non-zero values for setitimer(), - which is specified as taking microsecond-resolution intervals. However, on - some platform, our conversion routine could convert 1e-6 into a zero - interval, therefore disabling the timer instead of (re-)scheduling it. +- Issue #27030: Unknown escapes in re.sub() replacement template are allowed + again. But they still are deprecated and will be disabled in 3.7. -- bpo-30441: Fix bug when modifying os.environ while iterating over it +- Issue #28835: Fix a regression introduced in warnings.catch_warnings(): + call warnings.showwarning() if it was overriden inside the context manager. -- bpo-30532: Fix email header value parser dropping folding white space in - certain cases. +- Issue #27172: To assist with upgrades from 2.7, the previously documented + deprecation of ``inspect.getfullargspec()`` has been reversed. This decision + may be revisited again after the Python 2.7 branch is no longer officially + supported. -- bpo-29169: Update zlib to 1.2.11. +- Issue #24142: Reading a corrupt config file left configparser in an + invalid state. Original patch by Florian Höch. -- bpo-30879: os.listdir() and os.scandir() now emit bytes names when called - with bytes- like argument. +- Issue #28843: Fix asyncio C Task to handle exceptions __traceback__. -- bpo-30746: Prohibited the '=' character in environment variable names in - ``os.putenv()`` and ``os.spawn*()``. +C API +----- -- bpo-29755: Fixed the lgettext() family of functions in the gettext module. - They now always return bytes. +- Issue #28808: PyUnicode_CompareWithASCIIString() now never raises exceptions. -- bpo-30645: Fix path calculation in imp.load_package(), fixing it for cases - when a package is only shipped with bytecodes. Patch by Alexandru - Ardelean. +Documentation +------------- -- bpo-23890: unittest.TestCase.assertRaises() now manually breaks a - reference cycle to not keep objects alive longer than expected. +- Issue #23722: The data model reference and the porting section in the What's + New guide now cover the additional ``__classcell__`` handling needed for + custom metaclasses to fully support PEP 487 and zero-argument ``super()``. -- bpo-30149: inspect.signature() now supports callables with variable- - argument parameters wrapped with partialmethod. Patch by Dong-hee Na. +Tools/Demos +----------- -- bpo-29931: Fixed comparison check for ipaddress.ip_interface objects. - Patch by Sanjay Sundaresan. +- Issue #28023: Fix python-gdb.py didn't support new dict implementation. -- bpo-24484: Avoid race condition in multiprocessing cleanup. -- bpo-28994: The traceback no longer displayed for SystemExit raised in a - callback registered by atexit. +What's New in Python 3.6.0 beta 4? +================================== -- bpo-30508: Don't log exceptions if Task/Future "cancel()" method was - called. +*Release date: 2016-11-21* -- bpo-28556: Updates to typing module: Add generic AsyncContextManager, add - support for ContextManager on all versions. Original PRs by Jelle Zijlstra - and Ivan Levkivskyi +Core and Builtins +----------------- -- bpo-29870: Fix ssl sockets leaks when connection is aborted in asyncio/ssl - implementation. Patch by Michaël Sghaïer. +- Issue #28532: Show sys.version when -V option is supplied twice. -- bpo-29743: Closing transport during handshake process leaks open socket. - Patch by Nikolay Kim +- Issue #27100: The with-statement now checks for __enter__ before it + checks for __exit__. This gives less confusing error messages when + both methods are missing. Patch by Jonathan Ellington. -- bpo-27585: Fix waiter cancellation in asyncio.Lock. Patch by Mathieu - Sornay. +- Issue #28746: Fix the set_inheritable() file descriptor method on platforms + that do not have the ioctl FIOCLEX and FIONCLEX commands. -- bpo-30418: On Windows, subprocess.Popen.communicate() now also ignore - EINVAL on stdin.write() if the child process is still running but closed - the pipe. +- Issue #26920: Fix not getting the locale's charset upon initializing the + interpreter, on platforms that do not have langinfo. -- bpo-30378: Fix the problem that logging.handlers.SysLogHandler cannot - handle IPv6 addresses. +- Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X + when decode astral characters. Patch by Xiang Zhang. -- bpo-29960: Preserve generator state when _random.Random.setstate() raises - an exception. Patch by Bryan Olson. +- Issue #19398: Extra slash no longer added to sys.path components in case of + empty compile-time PYTHONPATH components. -- bpo-30414: multiprocessing.Queue._feed background running thread do not - break from main loop on exception. +- Issue #28665: Improve speed of the STORE_DEREF opcode by 40%. -- bpo-30003: Fix handling escape characters in HZ codec. Based on patch by - Ma Lin. +- Issue #28583: PyDict_SetDefault didn't combine split table when needed. + Patch by Xiang Zhang. -- bpo-30301: Fix AttributeError when using SimpleQueue.empty() under *spawn* - and *forkserver* start methods. +- Issue #27243: Change PendingDeprecationWarning -> DeprecationWarning. + As it was agreed in the issue, __aiter__ returning an awaitable + should result in PendingDeprecationWarning in 3.5 and in + DeprecationWarning in 3.6. -- bpo-30329: imaplib and poplib now catch the Windows socket WSAEINVAL error - (code 10022) on shutdown(SHUT_RDWR): An invalid operation was attempted. - This error occurs sometimes on SSL connections. +- Issue #26182: Fix a refleak in code that raises DeprecationWarning. -- bpo-30375: Warnings emitted when compile a regular expression now always - point to the line in the user code. Previously they could point into - inners of the re module if emitted from inside of groups or conditionals. +- Issue #28721: Fix asynchronous generators aclose() and athrow() to + handle StopAsyncIteration propagation properly. -- bpo-30048: Fixed ``Task.cancel()`` can be ignored when the task is running - coroutine and the coroutine returned without any more ``await``. +Library +------- -- bpo-29990: Fix range checking in GB18030 decoder. Original patch by Ma - Lin. +- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and + :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by + Omar Sandoval. -- bpo-26293: Change resulted because of zipfile breakage. (See also: - bpo-29094) +- Issue #28752: Restored the __reduce__() methods of datetime objects. -- bpo-30243: Removed the __init__ methods of _json's scanner and encoder. - Misusing them could cause memory leaks or crashes. Now scanner and - encoder objects are completely initialized in the __new__ methods. +- Issue #28727: Regular expression patterns, _sre.SRE_Pattern objects created + by re.compile(), become comparable (only x==y and x!=y operators). This + change should fix the issue #18383: don't duplicate warning filters when the + warnings module is reloaded (thing usually only done in unit tests). -- bpo-30185: Avoid KeyboardInterrupt tracebacks in forkserver helper process - when Ctrl-C is received. +- Issue #20572: The subprocess.Popen.wait method's undocumented + endtime parameter now raises a DeprecationWarning. -- bpo-28556: Various updates to typing module: add typing.NoReturn type, use - WrapperDescriptorType, minor bug-fixes. Original PRs by Jim Fasarakis- - Hilliard and Ivan Levkivskyi. +- Issue #25659: In ctypes, prevent a crash calling the from_buffer() and + from_buffer_copy() methods on abstract classes like Array. -- bpo-30205: Fix getsockname() for unbound AF_UNIX sockets on Linux. +- Issue #19717: Makes Path.resolve() succeed on paths that do not exist. + Patch by Vajrasky Kok -- bpo-30070: Fixed leaks and crashes in errors handling in the parser - module. +- Issue #28563: Fixed possible DoS and arbitrary code execution when handle + plural form selections in the gettext module. The expression parser now + supports exact syntax supported by GNU gettext. -- bpo-30061: Fixed crashes in IOBase methods __next__() and readlines() when - readline() or __next__() respectively return non-sizeable object. Fixed - possible other errors caused by not checking results of PyObject_Size(), - PySequence_Size(), or PyMapping_Size(). +- Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when + the garbage collector is invoked in other thread. Based on patch by + Sebastian Cufre. -- bpo-30068: _io._IOBase.readlines will check if it's closed first when hint - is present. +- Issue #28600: Optimize loop.call_soon. -- bpo-29694: Fixed race condition in pathlib mkdir with flags parents=True. - Patch by Armin Rigo. +- Issue #28613: Fix get_event_loop() return the current loop if + called from coroutines/callbacks. -- bpo-29692: Fixed arbitrary unchaining of RuntimeError exceptions in - contextlib.contextmanager. Patch by Siddharth Velankar. +- Issue #28634: Fix asyncio.isfuture() to support unittest.Mock. -- bpo-29998: Pickling and copying ImportError now preserves name and path - attributes. +- Issue #26081: Fix refleak in _asyncio.Future.__iter__().throw. -- bpo-29942: Fix a crash in itertools.chain.from_iterable when encountering - long runs of empty iterables. +- Issue #28639: Fix inspect.isawaitable to always return bool + Patch by Justin Mayfield. -- bpo-27863: Fixed multiple crashes in ElementTree caused by race conditions - and wrong types. +- Issue #28652: Make loop methods reject socket kinds they do not support. -- bpo-28699: Fixed a bug in pools in multiprocessing.pool that raising an - exception at the very first of an iterable may swallow the exception or - make the program hang. Patch by Davin Potts and Xiang Zhang. +- Issue #28653: Fix a refleak in functools.lru_cache. -- bpo-25803: Avoid incorrect errors raised by Path.mkdir(exist_ok=True) when - the OS gives priority to errors such as EACCES over EEXIST. +- Issue #28703: Fix asyncio.iscoroutinefunction to handle Mock objects. -- bpo-29861: Release references to tasks, their arguments and their results - as soon as they are finished in multiprocessing.Pool. +- Issue #28704: Fix create_unix_server to support Path-like objects + (PEP 519). -- bpo-29884: faulthandler: Restore the old sigaltstack during teardown. - Patch by Christophe Zeitouny. +- Issue #28720: Add collections.abc.AsyncGenerator. -- bpo-25455: Fixed crashes in repr of recursive buffered file-like objects. +Documentation +------------- -- bpo-29800: Fix crashes in partial.__repr__ if the keys of partial.keywords - are not strings. Patch by Michael Seifert. +- Issue #28513: Documented command-line interface of zipfile. -- bpo-29742: get_extra_info() raises exception if get called on closed ssl - transport. Patch by Nikolay Kim. +Tests +----- -- bpo-8256: Fixed possible failing or crashing input() if attributes - "encoding" or "errors" of sys.stdin or sys.stdout are not set or are not - strings. +- Issue #28666: Now test.support.rmtree is able to remove unwritable or + unreadable directories. -- bpo-28298: Fix a bug that prevented array 'Q', 'L' and 'I' from accepting - big intables (objects that have __int__) as elements. Patch by Oren - Milman. +- Issue #23839: Various caches now are cleared before running every test file. -- bpo-29615: SimpleXMLRPCDispatcher no longer chains KeyError (or any other - exception) to exception(s) raised in the dispatched methods. Patch by Petr - Motejlek. +Build +----- -- bpo-29704: asyncio.subprocess.SubprocessStreamProtocol no longer closes - before all pipes are closed. +- Issue #10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and + Michael Haubenwallner. -- bpo-29703: Fix asyncio to support instantiation of new event loops in - child processes. +- Issue #26359: Rename --with-optimiations to --enable-optimizations. -- bpo-29376: Fix assertion error in threading._DummyThread.is_alive(). +- Issue #28676: Prevent missing 'getentropy' declaration warning on macOS. + Patch by Gareth Rees. -- bpo-29110: Fix file object leak in aifc.open() when file is given as a - filesystem path and is not in valid AIFF format. Patch by Anthony Zhang. -- bpo-28961: Fix unittest.mock._Call helper: don't ignore the name parameter - anymore. Patch written by Jiajun Huang. +What's New in Python 3.6.0 beta 3? +================================== -- bpo-29532: Altering a kwarg dictionary passed to functools.partial() no - longer affects a partial object after creation. +*Release date: 2016-10-31* -- bpo-28556: Various updates to typing module: typing.Counter, - typing.ChainMap, improved ABC caching, etc. Original PRs by Jelle - Zijlstra, Ivan Levkivskyi, Manuel Krebber, and Łukasz Langa. +Core and Builtins +----------------- -- bpo-29100: Fix datetime.fromtimestamp() regression introduced in Python - 3.6.0: check minimum and maximum years. +- Issue #28128: Deprecation warning for invalid str and byte escape + sequences now prints better information about where the error + occurs. Patch by Serhiy Storchaka and Eric Smith. -- bpo-29519: Fix weakref spewing exceptions during interpreter shutdown when - used with a rare combination of multiprocessing and custom codecs. +- Issue #28509: dict.update() no longer allocate unnecessary large memory. -- bpo-29416: Prevent infinite loop in pathlib.Path.mkdir +- Issue #28426: Fixed potential crash in PyUnicode_AsDecodedObject() in debug + build. -- bpo-29444: Fixed out-of-bounds buffer access in the group() method of the - match object. Based on patch by WGH. +- Issue #28517: Fixed of-by-one error in the peephole optimizer that caused + keeping unreachable code. -- bpo-29335: Fix subprocess.Popen.wait() when the child process has exited - to a stopped instead of terminated state (ex: when under ptrace). +- Issue #28214: Improved exception reporting for problematic __set_name__ + attributes. -- bpo-29290: Fix a regression in argparse that help messages would wrap at - non-breaking spaces. +- Issue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception + loss in PyTraceBack_Here(). -- bpo-28735: Fixed the comparison of mock.MagickMock with mock.ANY. +- Issue #28471: Fix "Python memory allocator called without holding the GIL" + crash in socket.setblocking. -- bpo-29011: Fix an important omission by adding Deque to the typing module. +Library +------- -- bpo-29219: Fixed infinite recursion in the repr of uninitialized - ctypes.CDLL instances. +- Issue #27517: LZMA compressor and decompressor no longer raise exceptions if + given empty data twice. Patch by Benjamin Fogle. -- bpo-28969: Fixed race condition in C implementation of - functools.lru_cache. KeyError could be raised when cached function with - full cache was simultaneously called from differen threads with the same - uncached arguments. +- Issue #28549: Fixed segfault in curses's addch() with ncurses6. -- bpo-29142: In urllib.request, suffixes in no_proxy environment variable - with leading dots could match related hostnames again (e.g. .b.c matches - a.b.c). Patch by Milan Oberkirch. +- Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar + file with compression before trying to open it without compression. Otherwise + it had 50% chance failed with ignore_zeros=True. -Documentation -------------- +- Issue #23262: The webbrowser module now supports Firefox 36+ and derived + browsers. Based on patch by Oleg Broytman. -- bpo-30176: Add missing attribute related constants in curses - documentation. +- Issue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused + by representing the scale as float value internally in Tk. tkinter.IntVar + now works if float value is set to underlying Tk variable. -- bpo-26985: Add missing info of code object in inspect documentation. +- Issue #18844: The various ways of specifying weights for random.choices() + now produce the same result sequences. -- bpo-28929: Link the documentation to its source file on GitHub. +- Issue #28255: calendar.TextCalendar().prmonth() no longer prints a space + at the start of new line after printing a month's calendar. Patch by + Xiang Zhang. -- bpo-25008: Document smtpd.py as effectively deprecated and add a pointer - to aiosmtpd, a third-party asyncio-based replacement. +- Issue #20491: The textwrap.TextWrapper class now honors non-breaking spaces. + Based on patch by Kaarle Ritvanen. -- bpo-26355: Add canonical header link on each page to corresponding major - version of the documentation. Patch by Matthias Bussonnier. +- Issue #28353: os.fwalk() no longer fails on broken links. -- bpo-29349: Fix Python 2 syntax in code for building the documentation. +- Issue #28430: Fix iterator of C implemented asyncio.Future doesn't accept + non-None value is passed to it.send(val). -Tests ------ +- Issue #27025: Generated names for Tkinter widgets now start by the "!" prefix + for readability (was "`"). -- bpo-30822: Fix regrtest command line parser to allow passing -u - extralargefile to run test_zipfile64. +- Issue #25464: Fixed HList.header_exists() in tkinter.tix module by addin + a workaround to Tix library bug. -- bpo-30383: regrtest: Enhance regrtest and backport features from the - master branch. +- Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive. - Add options: --coverage, --testdir, --list-tests (list test files, don't - run them), --list-cases (list test identifiers, don't run them, - :issue:`30523`), --matchfile (load a list of test filters from a text - file, :issue:`30540`), --slowest (alias to --slow). +- Issue #25953: re.sub() now raises an error for invalid numerical group + reference in replacement template even if the pattern is not found in + the string. Error message for invalid group reference now includes the + group index and the position of the reference. + Based on patch by SilentGhost. - Enhance output: add timestamp, test result, currently running tests, - "Tests result: xxx" summary with total duration, etc. +- Issue #18219: Optimize csv.DictWriter for large number of columns. + Patch by Mariatta Wijaya. - Fix reference leak hunting in regrtest, --huntrleaks: regrtest now warms - up caches, create explicitly all internal singletons which are created on - demand to prevent false positives when checking for reference leaks. - (:issue:`30675`). +- Issue #28448: Fix C implemented asyncio.Future didn't work on Windows. -- bpo-30357: test_thread: setUp() now uses support.threading_setup() and - support.threading_cleanup() to wait until threads complete to avoid random - side effects on following tests. Initial patch written by Grzegorz - Grzywacz. +- Issue #28480: Fix error building socket module when multithreading is + disabled. -- bpo-28087: Skip test_asyncore and test_eintr poll failures on macOS. Skip - some tests of select.poll when running on macOS due to unresolved issues - with the underlying system poll function on some macOS versions. +- Issue #24452: Make webbrowser support Chrome on Mac OS X. -- bpo-30197: Enhanced functions swap_attr() and swap_item() in the - test.support module. They now work when delete replaced attribute or item - inside the with statement. The old value of the attribute or item (or - None if it doesn't exist) now will be assigned to the target of the "as" - clause, if there is one. +- Issue #20766: Fix references leaked by pdb in the handling of SIGINT + handlers. -- bpo-29571: to match the behaviour of the ``re.LOCALE`` flag, - test_re.test_locale_flag now uses ``locale.getpreferredencoding(False)`` - to determine the candidate encoding for the test regex (allowing it to - correctly skip the test when the default locale encoding is a multi-byte - encoding) +- Issue #28492: Fix how StopIteration exception is raised in _asyncio.Future. -Build ------ +- Issue #28500: Fix asyncio to handle async gens GC from another thread. -- bpo-29243: Prevent unnecessary rebuilding of Python during ``make test``, - ``make install`` and some other make targets when configured with - ``--enable- optimizations``. +- Issue #26923: Fix asyncio.Gather to refuse being cancelled once all + children are done. + Patch by Johannes Ebke. -- bpo-23404: Don't regenerate generated files based on file modification - time anymore: the action is now explicit. Replace ``make touch`` with - ``make regen-all``. +- Issue #26796: Don't configure the number of workers for default + threadpool executor. + Initial patch by Hans Lawrenz. -- bpo-29643: Fix ``--enable-optimization`` didn't work. +- Issue #28544: Implement asyncio.Task in C. Windows ------- -- bpo-30687: Locate msbuild.exe on Windows when building rather than - vcvarsall.bat +- Issue #28522: Fixes mishandled buffer reallocation in getpathp.c -- bpo-29392: Prevent crash when passing invalid arguments into msvcrt - module. - -C API +Build ----- -- bpo-27867: Function PySlice_GetIndicesEx() is replaced with a macro if - Py_LIMITED_API is set to the value between 0x03050400 and 0x03060000 (not - including) or 0x03060100 or higher. +- Issue #28444: Fix missing extensions modules when cross compiling. -- bpo-29083: Fixed the declaration of some public API functions. - PyArg_VaParse() and PyArg_VaParseTupleAndKeywords() were not available in - limited API. PyArg_ValidateKeywordArguments(), PyArg_UnpackTuple() and - Py_BuildValue() were not available in limited API of version < 3.3 when - PY_SSIZE_T_CLEAN is defined. +- Issue #28208: Update Windows build and OS X installers to use SQLite 3.14.2. +- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j. -What's New in Python 3.5.3 final? -================================= - -*Release date: 2017-01-17* +Tests +----- -There were no code changes between 3.5.3rc1 and 3.5.3 final. +- Issue #26944: Fix test_posix for Android where 'id -G' is entirely wrong or + missing the effective gid. +- Issue #28409: regrtest: fix the parser of command line arguments. -What's New in Python 3.5.3 release candidate 1? -=============================================== +What's New in Python 3.6.0 beta 2? +================================== -*Release date: 2017-01-02* +*Release date: 2016-10-10* Core and Builtins ----------------- -- bpo-29073: bytearray formatting no longer truncates on first null byte. - -- bpo-28932: Do not include if it does not exist. - -- bpo-28147: Fix a memory leak in split-table dictionaries: setattr() must - not convert combined table into split table. - -- bpo-25677: Correct the positioning of the syntax error caret for indented - blocks. Based on patch by Michael Layzell. - -- bpo-29000: Fixed bytes formatting of octals with zero padding in alternate - form. - -- bpo-28512: Fixed setting the offset attribute of SyntaxError by - PyErr_SyntaxLocationEx() and PyErr_SyntaxLocationObject(). - -- bpo-28991: functools.lru_cache() was susceptible to an obscure reentrancy - bug caused by a monkey-patched len() function. +- Issue #28183: Optimize and cleanup dict iteration. -- bpo-28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X - when decode astral characters. Patch by Xiang Zhang. - -- bpo-19398: Extra slash no longer added to sys.path components in case of - empty compile- time PYTHONPATH components. - -- bpo-28426: Fixed potential crash in PyUnicode_AsDecodedObject() in debug - build. +- Issue #26081: Added C implementation of asyncio.Future. + Original patch by Yury Selivanov. -- bpo-23782: Fixed possible memory leak in _PyTraceback_Add() and exception - loss in PyTraceBack_Here(). - -- bpo-28379: Added sanity checks and tests for PyUnicode_CopyCharacters(). +- Issue #28379: Added sanity checks and tests for PyUnicode_CopyCharacters(). Patch by Xiang Zhang. -- bpo-28376: The type of long range iterator is now registered as Iterator. +- Issue #28376: The type of long range iterator is now registered as Iterator. Patch by Oren Milman. -- bpo-28376: The constructor of range_iterator now checks that step is not - 0. Patch by Oren Milman. +- Issue #28376: Creating instances of range_iterator by calling range_iterator + type now is deprecated. Patch by Oren Milman. + +- Issue #28376: The constructor of range_iterator now checks that step is not 0. + Patch by Oren Milman. -- bpo-26906: Resolving special methods of uninitialized type now causes +- Issue #26906: Resolving special methods of uninitialized type now causes implicit initialization of the type instead of a fail. -- bpo-18287: PyType_Ready() now checks that tp_name is not NULL. Original - patch by Niklas Koep. +- Issue #18287: PyType_Ready() now checks that tp_name is not NULL. + Original patch by Niklas Koep. -- bpo-24098: Fixed possible crash when AST is changed in process of +- Issue #24098: Fixed possible crash when AST is changed in process of compiling it. -- bpo-28350: String constants with null character no longer interned. +- Issue #28201: Dict reduces possibility of 2nd conflict in hash table when + hashes have same lower bits. -- bpo-26617: Fix crash when GC runs during weakref callbacks. +- Issue #28350: String constants with null character no longer interned. -- bpo-27942: String constants now interned recursively in tuples and - frozensets. +- Issue #26617: Fix crash when GC runs during weakref callbacks. -- bpo-21578: Fixed misleading error message when ImportError called with +- Issue #27942: String constants now interned recursively in tuples and frozensets. + +- Issue #21578: Fixed misleading error message when ImportError called with invalid keyword args. -- bpo-28203: Fix incorrect type in error message from ``complex(1.0, - {2:3})``. Patch by Soumya Sharma. +- Issue #28203: Fix incorrect type in complex(1.0, {2:3}) error message. + Patch by Soumya Sharma. -- bpo-27955: Fallback on reading /dev/urandom device when the getrandom() - syscall fails with EPERM, for example when blocked by SECCOMP. +- Issue #28086: Single var-positional argument of tuple subtype was passed + unscathed to the C-defined function. Now it is converted to exact tuple. -- bpo-28131: Fix a regression in zipimport's compile_source(). zipimport - should use the same optimization level as the interpreter. +- Issue #28214: Now __set_name__ is looked up on the class instead of the + instance. -- bpo-25221: Fix corrupted result from PyLong_FromLong(0) when Python is - compiled with NSMALLPOSINTS = 0. +- Issue #27955: Fallback on reading /dev/urandom device when the getrandom() + syscall fails with EPERM, for example when blocked by SECCOMP. -- bpo-25758: Prevents zipimport from unnecessarily encoding a filename - (patch by Eryk Sun) +- Issue #28192: Don't import readline in isolated mode. -- bpo-28189: dictitems_contains no longer swallows compare errors. (Patch by - Xiang Zhang) +- Upgrade internal unicode databases to Unicode version 9.0.0. -- bpo-27812: Properly clear out a generator's frame's backreference to the - generator to prevent crashes in frame.clear(). +- Issue #28131: Fix a regression in zipimport's compile_source(). zipimport + should use the same optimization level as the interpreter. -- bpo-27811: Fix a crash when a coroutine that has not been awaited is - finalized with warnings-as-errors enabled. +- Issue #28126: Replace Py_MEMCPY with memcpy(). Visual Studio can properly + optimize memcpy(). -- bpo-27587: Fix another issue found by PVS-Studio: Null pointer check after - use of 'def' in _PyState_AddModule(). Initial patch by Christian Heimes. +- Issue #28120: Fix dict.pop() for splitted dictionary when trying to remove a + "pending key" (Not yet inserted in split-table). Patch by Xiang Zhang. -- bpo-26020: set literal evaluation order did not match documented - behaviour. +- Issue #26182: Raise DeprecationWarning when async and await keywords are + used as variable/attribute/class/function name. -- bpo-27782: Multi-phase extension module import now correctly allows the - ``m_methods`` field to be used to add module level functions to instances - of non-module types returned from ``Py_create_mod``. Patch by Xiang Zhang. +Library +------- -- bpo-27936: The round() function accepted a second None argument for some - types but not for others. Fixed the inconsistency by accepting None for - all numeric types. +- Issue #27998: Fixed bytes path support in os.scandir() on Windows. + Patch by Eryk Sun. -- bpo-27487: Warn if a submodule argument to "python -m" or - runpy.run_module() is found in sys.modules after parent packages are - imported, but before the submodule is executed. +- Issue #28317: The disassembler now decodes FORMAT_VALUE argument. -- bpo-27558: Fix a SystemError in the implementation of "raise" statement. - In a brand new thread, raise a RuntimeError since there is no active - exception to reraise. Patch written by Xiang Zhang. +- Issue #26293: Fixed writing ZIP files that starts not from the start of the + file. Offsets in ZIP file now are relative to the start of the archive in + conforming to the specification. -- bpo-27419: Standard __import__() no longer look up "__import__" in globals - or builtins for importing submodules or "from import". Fixed handling an - error of non- string package name. +- Issue #28380: unittest.mock Mock autospec functions now properly support + assert_called, assert_not_called, and assert_called_once. -- bpo-27083: Respect the PYTHONCASEOK environment variable under Windows. +- Issue #27181 remove statistics.geometric_mean and defer until 3.7. -- bpo-27514: Make having too many statically nested blocks a SyntaxError - instead of SystemError. +- Issue #28229: lzma module now supports pathlib. -- bpo-27473: Fixed possible integer overflow in bytes and bytearray - concatenations. Patch by Xiang Zhang. +- Issue #28321: Fixed writing non-BMP characters with binary format in plistlib. -- bpo-27507: Add integer overflow check in bytearray.extend(). Patch by - Xiang Zhang. +- Issue #28225: bz2 module now supports pathlib. Initial patch by Ethan Furman. -- bpo-27581: Don't rely on wrapping for overflow check in - PySequence_Tuple(). Patch by Xiang Zhang. +- Issue #28227: gzip now supports pathlib. Patch by Ethan Furman. -- bpo-27443: __length_hint__() of bytearray iterators no longer return a - negative integer for a resized bytearray. +- Issue #27358: Optimized merging var-keyword arguments and improved error + message when pass a non-mapping as a var-keyword argument. -- bpo-27942: Fix memory leak in codeobject.c +- Issue #28257: Improved error message when pass a non-iterable as + a var-positional argument. Added opcode BUILD_TUPLE_UNPACK_WITH_CALL. -Library -------- +- Issue #28322: Fixed possible crashes when unpickle itertools objects from + incorrect pickle data. Based on patch by John Leitch. -- bpo-15812: inspect.getframeinfo() now correctly shows the first line of a - context. Patch by Sam Breese. +- Issue #28228: imghdr now supports pathlib. -- bpo-29094: Offsets in a ZIP file created with extern file object and modes - "w" and "x" now are relative to the start of the file. +- Issue #28226: compileall now supports pathlib. -- bpo-13051: Fixed recursion errors in large or resized - curses.textpad.Textbox. Based on patch by Tycho Andersen. +- Issue #28314: Fix function declaration (C flags) for the getiterator() method + of xml.etree.ElementTree.Element. -- bpo-29119: Fix weakrefs in the pure python version of - collections.OrderedDict move_to_end() method. Contributed by Andra - Bogildea. +- Issue #28148: Stop using localtime() and gmtime() in the time + module. -- bpo-9770: curses.ascii predicates now work correctly with negative - integers. + Introduced platform independent _PyTime_localtime API that is + similar to POSIX localtime_r, but available on all platforms. Patch + by Ed Schouten. -- bpo-28427: old keys should not remove new values from WeakValueDictionary - when collecting from another thread. +- Issue #28253: Fixed calendar functions for extreme months: 0001-01 + and 9999-12. -- bpo-28923: Remove editor artifacts from Tix.py. + Methods itermonthdays() and itermonthdays2() are reimplemented so + that they don't call itermonthdates() which can cause datetime.date + under/overflow. -- bpo-28871: Fixed a crash when deallocate deep ElementTree. +- Issue #28275: Fixed possible use after free in the decompress() + methods of the LZMADecompressor and BZ2Decompressor classes. + Original patch by John Leitch. -- bpo-19542: Fix bugs in WeakValueDictionary.setdefault() and - WeakValueDictionary.pop() when a GC collection happens in another thread. +- Issue #27897: Fixed possible crash in sqlite3.Connection.create_collation() + if pass invalid string-like object as a name. Patch by Xiang Zhang. -- bpo-20191: Fixed a crash in resource.prlimit() when pass a sequence that - doesn't own its elements as limits. +- Issue #18844: random.choices() now has k as a keyword-only argument + to improve the readability of common cases and come into line + with the signature used in other languages. -- bpo-28779: multiprocessing.set_forkserver_preload() would crash the - forkserver process if a preloaded module instantiated some multiprocessing - objects such as locks. +- Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py. + Patch by Madison May. -- bpo-28847: dbm.dumb now supports reading read-only files and no longer - writes the index file when it is not changed. +- Issue #27611: Fixed support of default root window in the tkinter.tix module. + Added the master parameter in the DisplayStyle constructor. -- bpo-25659: In ctypes, prevent a crash calling the from_buffer() and - from_buffer_copy() methods on abstract classes like Array. +- Issue #27348: In the traceback module, restore the formatting of exception + messages like "Exception: None". This fixes a regression introduced in + 3.5a2. -- bpo-28732: Fix crash in os.spawnv() with no elements in args +- Issue #25651: Allow falsy values to be used for msg parameter of subTest(). -- bpo-28485: Always raise ValueError for negative - compileall.compile_dir(workers=...) parameter, even when multithreading is - unavailable. +- Issue #27778: Fix a memory leak in os.getrandom() when the getrandom() is + interrupted by a signal and a signal handler raises a Python exception. -- bpo-28387: Fixed possible crash in _io.TextIOWrapper deallocator when the - garbage collector is invoked in other thread. Based on patch by Sebastian - Cufre. +- Issue #28200: Fix memory leak on Windows in the os module (fix + path_converter() function). -- bpo-27517: LZMA compressor and decompressor no longer raise exceptions if - given empty data twice. Patch by Benjamin Fogle. +- Issue #25400: RobotFileParser now correctly returns default values for + crawl_delay and request_rate. Initial patch by Peter Wirtz. -- bpo-28549: Fixed segfault in curses's addch() with ncurses6. +- Issue #27932: Prevent memory leak in win32_ver(). -- bpo-28449: tarfile.open() with mode "r" or "r:" now tries to open a tar - file with compression before trying to open it without compression. - Otherwise it had 50% chance failed with ignore_zeros=True. +- Fix UnboundLocalError in socket._sendfile_use_sendfile. -- bpo-23262: The webbrowser module now supports Firefox 36+ and derived - browsers. Based on patch by Oleg Broytman. +- Issue #28075: Check for ERROR_ACCESS_DENIED in Windows implementation of + os.stat(). Patch by Eryk Sun. -- bpo-27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused - by representing the scale as float value internally in Tk. tkinter.IntVar - now works if float value is set to underlying Tk variable. +- Issue #22493: Warning message emitted by using inline flags in the middle of + regular expression now contains a (truncated) regex pattern. + Patch by Tim Graham. -- bpo-28255: calendar.TextCalendar().prmonth() no longer prints a space at - the start of new line after printing a month's calendar. Patch by Xiang - Zhang. +- Issue #25270: Prevent codecs.escape_encode() from raising SystemError when + an empty bytestring is passed. -- bpo-20491: The textwrap.TextWrapper class now honors non-breaking spaces. - Based on patch by Kaarle Ritvanen. +- Issue #28181: Get antigravity over HTTPS. Patch by Kaartic Sivaraam. -- bpo-28353: os.fwalk() no longer fails on broken links. +- Issue #25895: Enable WebSocket URL schemes in urllib.parse.urljoin. + Patch by Gergely Imreh and Markus Holtermann. -- bpo-25464: Fixed HList.header_exists() in tkinter.tix module by addin a - workaround to Tix library bug. +- Issue #28114: Fix a crash in parse_envlist() when env contains byte strings. + Patch by Eryk Sun. -- bpo-28488: shutil.make_archive() no longer add entry "./" to ZIP archive. +- Issue #27599: Fixed buffer overrun in binascii.b2a_qp() and binascii.a2b_qp(). -- bpo-24452: Make webbrowser support Chrome on Mac OS X. +- Issue #27906: Fix socket accept exhaustion during high TCP traffic. + Patch by Kevin Conway. -- bpo-20766: Fix references leaked by pdb in the handling of SIGINT - handlers. +- Issue #28174: Handle when SO_REUSEPORT isn't properly supported. + Patch by Seth Michael Larson. -- bpo-26293: Fixed writing ZIP files that starts not from the start of the - file. Offsets in ZIP file now are relative to the start of the archive in - conforming to the specification. +- Issue #26654: Inspect functools.partial in asyncio.Handle.__repr__. + Patch by iceboy. -- bpo-28321: Fixed writing non-BMP characters with binary format in - plistlib. +- Issue #26909: Fix slow pipes IO in asyncio. + Patch by INADA Naoki. -- bpo-28322: Fixed possible crashes when unpickle itertools objects from - incorrect pickle data. Based on patch by John Leitch. +- Issue #28176: Fix callbacks race in asyncio.SelectorLoop.sock_connect. -- Fix possible integer overflows and crashes in the mmap module with unusual - usage patterns. +- Issue #27759: Fix selectors incorrectly retain invalid file descriptors. + Patch by Mark Williams. -- bpo-1703178: Fix the ability to pass the --link-objects option to the - distutils build_ext command. +- Issue #28368: Refuse monitoring processes if the child watcher has no + loop attached. + Patch by Vincent Michel. -- bpo-28253: Fixed calendar functions for extreme months: 0001-01 and - 9999-12. +- Issue #28369: Raise RuntimeError when transport's FD is used with + add_reader, add_writer, etc. - Methods itermonthdays() and itermonthdays2() are reimplemented so that - they don't call itermonthdates() which can cause datetime.date - under/overflow. +- Issue #28370: Speedup asyncio.StreamReader.readexactly. + Patch by Коренберг Марк. -- bpo-28275: Fixed possible use after free in the decompress() methods of - the LZMADecompressor and BZ2Decompressor classes. Original patch by John - Leitch. +- Issue #28371: Deprecate passing asyncio.Handles to run_in_executor. -- bpo-27897: Fixed possible crash in sqlite3.Connection.create_collation() - if pass invalid string-like object as a name. Patch by Xiang Zhang. +- Issue #28372: Fix asyncio to support formatting of non-python coroutines. -- bpo-18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py. - Patch by Madison May. +- Issue #28399: Remove UNIX socket from FS before binding. + Patch by Коренберг Марк. -- bpo-27611: Fixed support of default root window in the tkinter.tix module. +- Issue #27972: Prohibit Tasks to await on themselves. -- bpo-27348: In the traceback module, restore the formatting of exception - messages like "Exception: None". This fixes a regression introduced in - 3.5a2. +Windows +------- -- bpo-25651: Allow falsy values to be used for msg parameter of subTest(). +- Issue #28402: Adds signed catalog files for stdlib on Windows. -- bpo-27932: Prevent memory leak in win32_ver(). +- Issue #28333: Enables Unicode for ps1/ps2 and input() prompts. (Patch by + Eryk Sun) -- Fix UnboundLocalError in socket._sendfile_use_sendfile. +- Issue #28251: Improvements to help manuals on Windows. -- bpo-28075: Check for ERROR_ACCESS_DENIED in Windows implementation of - os.stat(). Patch by Eryk Sun. +- Issue #28110: launcher.msi has different product codes between 32-bit and + 64-bit -- bpo-25270: Prevent codecs.escape_encode() from raising SystemError when an - empty bytestring is passed. +- Issue #28161: Opening CON for write access fails -- bpo-28181: Get antigravity over HTTPS. Patch by Kaartic Sivaraam. +- Issue #28162: WindowsConsoleIO readall() fails if first line starts with + Ctrl+Z -- bpo-25895: Enable WebSocket URL schemes in urllib.parse.urljoin. Patch by - Gergely Imreh and Markus Holtermann. +- Issue #28163: WindowsConsoleIO fileno() passes wrong flags to + _open_osfhandle -- bpo-27599: Fixed buffer overrun in binascii.b2a_qp() and - binascii.a2b_qp(). +- Issue #28164: _PyIO_get_console_type fails for various paths -- bpo-19003: m email.generator now replaces only ``\r`` and/or ``\n`` line - endings, per the RFC, instead of all unicode line endings. +- Issue #28137: Renames Windows path file to ._pth -- bpo-28019: itertools.count() no longer rounds non-integer step in range - between 1.0 and 2.0 to 1. +- Issue #28138: Windows ._pth file should allow import site -- bpo-25969: Update the lib2to3 grammar to handle the unpacking - generalizations added in 3.5. +C API +----- -- bpo-14977: mailcap now respects the order of the lines in the mailcap - files ("first match"), as required by RFC 1542. Patch by Michael Lazar. +- Issue #28426: Deprecated undocumented functions PyUnicode_AsEncodedObject(), + PyUnicode_AsDecodedObject(), PyUnicode_AsDecodedUnicode() and + PyUnicode_AsEncodedUnicode(). -- bpo-24594: Validates persist parameter when opening MSI database +Build +----- -- bpo-17582: xml.etree.ElementTree nows preserves whitespaces in attributes - (Patch by Duane Griffin. Reviewed and approved by Stefan Behnel.) +- Issue #28258: Fixed build with Estonian locale (python-config and distclean + targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. -- bpo-28047: Fixed calculation of line length used for the base64 CTE in the - new email policies. +- Issue #26661: setup.py now detects system libffi with multiarch wrapper. -- bpo-27445: Don't pass str(_charset) to MIMEText.set_payload(). Patch by - Claude Paroz. +- Issue #15819: Remove redundant include search directory option for building + outside the source tree. -- bpo-22450: urllib now includes an ``Accept: */*`` header among the default - headers. This makes the results of REST API requests more consistent and - predictable especially when proxy servers are involved. +Tests +----- -- lib2to3.pgen3.driver.load_grammar() now creates a stable cache file - between runs given the same Grammar.txt input regardless of the hash - randomization setting. +- Issue #28217: Adds _testconsole module to test console input. -- bpo-27570: Avoid zero-length memcpy() etc calls with null source pointers - in the "ctypes" and "array" modules. -- bpo-22233: Break email header lines *only* on the RFC specified CR and LF - characters, not on arbitrary unicode line breaks. This also fixes a bug - in HTTP header parsing. +What's New in Python 3.6.0 beta 1? +================================== -- bpo-27988: Fix email iter_attachments incorrect mutation of payload list. +*Release date: 2016-09-12* -- bpo-27691: Fix ssl module's parsing of GEN_RID subject alternative name - fields in X.509 certs. +Core and Builtins +----------------- -- bpo-27850: Remove 3DES from ssl module's default cipher list to counter - measure sweet32 attack (CVE-2016-2183). +- Issue #23722: The __class__ cell used by zero-argument super() is now + initialized from type.__new__ rather than __build_class__, so class methods + relying on that will now work correctly when called from metaclass methods + during class creation. Patch by Martin Teichmann. -- bpo-27766: Add ChaCha20 Poly1305 to ssl module's default ciper list. - (Required OpenSSL 1.1.0 or LibreSSL). +- Issue #25221: Fix corrupted result from PyLong_FromLong(0) when Python + is compiled with NSMALLPOSINTS = 0. -- bpo-26470: Port ssl and hashlib module to OpenSSL 1.1.0. +- Issue #27080: Implement formatting support for PEP 515. Initial patch + by Chris Angelico. -- Remove support for passing a file descriptor to os.access. It never worked - but previously didn't raise. +- Issue #27199: In tarfile, expose copyfileobj bufsize to improve throughput. + Patch by Jason Fried. -- bpo-12885: Fix error when distutils encounters symlink. +- Issue #27948: In f-strings, only allow backslashes inside the braces + (where the expressions are). This is a breaking change from the 3.6 + alpha releases, where backslashes are allowed anywhere in an + f-string. Also, require that expressions inside f-strings be + enclosed within literal braces, and not escapes like + f'\x7b"hi"\x7d'. -- bpo-27881: Fixed possible bugs when setting - sqlite3.Connection.isolation_level. Based on patch by Xiang Zhang. +- Issue #28046: Remove platform-specific directories from sys.path. -- bpo-27861: Fixed a crash in sqlite3.Connection.cursor() when a factory - creates not a cursor. Patch by Xiang Zhang. +- Issue #28071: Add early-out for differencing from an empty set. -- bpo-19884: Avoid spurious output on OS X with Gnu Readline. +- Issue #25758: Prevents zipimport from unnecessarily encoding a filename + (patch by Eryk Sun) -- bpo-27706: Restore deterministic behavior of random.Random().seed() for - string seeds using seeding version 1. Allows sequences of calls to - random() to exactly match those obtained in Python 2. Patch by Nofar - Schnider. +- Issue #25856: The __module__ attribute of extension classes and functions + now is interned. This leads to more compact pickle data with protocol 4. -- bpo-10513: Fix a regression in Connection.commit(). Statements should not - be reset after a commit. +- Issue #27213: Rework CALL_FUNCTION* opcodes to produce shorter and more + efficient bytecode. Patch by Demur Rumed, design by Serhiy Storchaka, + reviewed by Serhiy Storchaka and Victor Stinner. -- A new version of typing.py from https://github.com/python/typing: - - Collection (only for 3.6) (Issue #27598) - Add FrozenSet to __all__ - (upstream #261) - fix crash in _get_type_vars() (upstream #259) - Remove - the dict constraint in ForwardRef._eval_type (upstream #252) +- Issue #26331: Implement tokenizing support for PEP 515. Patch by Georg Brandl. -- bpo-27539: Fix unnormalised ``Fraction.__pow__`` result in the case of - negative exponent and negative base. +- Issue #27999: Make "global after use" a SyntaxError, and ditto for nonlocal. + Patch by Ivan Levkivskyi. -- bpo-21718: cursor.description is now available for queries using CTEs. +- Issue #28003: Implement PEP 525 -- Asynchronous Generators. -- bpo-2466: posixpath.ismount now correctly recognizes mount points which - the user does not have permission to access. +- Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. + Patch by Ivan Levkivskyi. -- bpo-27773: Correct some memory management errors server_hostname in - _ssl.wrap_socket(). +- Issue #26058: Add a new private version to the builtin dict type, incremented + at each dictionary creation and at each dictionary change. Implementation of + the PEP 509. -- bpo-26750: unittest.mock.create_autospec() now works properly for - subclasses of property() and other data descriptors. +- Issue #27364: A backslash-character pair that is not a valid escape sequence + now generates a DeprecationWarning. Patch by Emanuel Barry. -- In the curses module, raise an error if window.getstr() or window.instr() - is passed a negative value. +- Issue #27350: `dict` implementation is changed like PyPy. It is more compact + and preserves insertion order. + (Concept developed by Raymond Hettinger and patch by Inada Naoki.) -- bpo-27783: Fix possible usage of uninitialized memory in - operator.methodcaller. +- Issue #27911: Remove unnecessary error checks in + ``exec_builtin_or_dynamic()``. -- bpo-27774: Fix possible Py_DECREF on unowned object in _sre. +- Issue #27078: Added BUILD_STRING opcode. Optimized f-strings evaluation. -- bpo-27760: Fix possible integer overflow in binascii.b2a_qp. +- Issue #17884: Python now requires systems with inttypes.h and stdint.h -- bpo-27758: Fix possible integer overflow in the _csv module for large - record lengths. +- Issue #27961: Require platforms to support ``long long``. Python hasn't + compiled without ``long long`` for years, so this is basically a formality. -- bpo-27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the - HTTP_PROXY variable when REQUEST_METHOD environment is set, which - indicates that the script is in CGI mode. +- Issue #27355: Removed support for Windows CE. It was never finished, + and Windows CE is no longer a relevant platform for Python. -- bpo-27656: Do not assume sched.h defines any SCHED_* constants. +- Implement PEP 523. -- bpo-27130: In the "zlib" module, fix handling of large buffers (typically - 4 GiB) when compressing and decompressing. Previously, inputs were - limited to 4 GiB, and compression and decompression operations did not - properly handle results of 4 GiB. +- Issue #27870: A left shift of zero by a large integer no longer attempts + to allocate large amounts of memory. -- bpo-27533: Release GIL in nt._isdir +- Issue #25402: In int-to-decimal-string conversion, improve the estimate + of the intermediate memory required, and remove an unnecessarily strict + overflow check. Patch by Serhiy Storchaka. -- bpo-17711: Fixed unpickling by the persistent ID with protocol 0. Original - patch by Alexandre Vassalotti. +- Issue #27214: In long_invert, be more careful about modifying object + returned by long_add, and remove an unnecessary check for small longs. + Thanks Oren Milman for analysis and patch. -- bpo-27522: Avoid an unintentional reference cycle in email.feedparser. +- Issue #27506: Support passing the bytes/bytearray.translate() "delete" + argument by keyword. -- bpo-26844: Fix error message for imp.find_module() to refer to 'path' - instead of 'name'. Patch by Lev Maximov. +- Issue #27812: Properly clear out a generator's frame's backreference to the + generator to prevent crashes in frame.clear(). -- bpo-23804: Fix SSL zero-length recv() calls to not block and not raise an - error about unclean EOF. +- Issue #27811: Fix a crash when a coroutine that has not been awaited is + finalized with warnings-as-errors enabled. -- bpo-27466: Change time format returned by http.cookie.time2netscape, - confirming the netscape cookie format and making it consistent with - documentation. +- Issue #27587: Fix another issue found by PVS-Studio: Null pointer check + after use of 'def' in _PyState_AddModule(). + Initial patch by Christian Heimes. -- bpo-26664: Fix activate.fish by removing mis-use of ``$``. +- Issue #27792: The modulo operation applied to ``bool`` and other + ``int`` subclasses now always returns an ``int``. Previously + the return type depended on the input values. Patch by Xiang Zhang. -- bpo-22115: Fixed tracing Tkinter variables: trace_vdelete() with wrong - mode no longer break tracing, trace_vinfo() now always returns a list of - pairs of strings, tracing in the "u" mode now works. +- Issue #26984: int() now always returns an instance of exact int. -- Fix a scoping issue in importlib.util.LazyLoader which triggered an - UnboundLocalError when lazy-loading a module that was already put into - sys.modules. +- Issue #25604: Fix a minor bug in integer true division; this bug could + potentially have caused off-by-one-ulp results on platforms with + unreliable ldexp implementations. -- bpo-27079: Fixed curses.ascii functions isblank(), iscntrl() and - ispunct(). +- Issue #24254: Make class definition namespace ordered by default. -- bpo-26754: Some functions (compile() etc) accepted a filename argument - encoded as an iterable of integers. Now only strings and byte-like objects - are accepted. +- Issue #27662: Fix an overflow check in ``List_New``: the original code was + checking against ``Py_SIZE_MAX`` instead of the correct upper bound of + ``Py_SSIZE_T_MAX``. Patch by Xiang Zhang. -- bpo-27048: Prevents distutils failing on Windows when environment - variables contain non-ASCII characters +- Issue #27782: Multi-phase extension module import now correctly allows the + ``m_methods`` field to be used to add module level functions to instances + of non-module types returned from ``Py_create_mod``. Patch by Xiang Zhang. -- bpo-27330: Fixed possible leaks in the ctypes module. +- Issue #27936: The round() function accepted a second None argument + for some types but not for others. Fixed the inconsistency by + accepting None for all numeric types. -- bpo-27238: Got rid of bare excepts in the turtle module. Original patch - by Jelle Zijlstra. +- Issue #27487: Warn if a submodule argument to "python -m" or + runpy.run_module() is found in sys.modules after parent packages are + imported, but before the submodule is executed. -- bpo-27122: When an exception is raised within the context being managed by - a contextlib.ExitStack() and one of the exit stack generators catches and - raises it in a chain, do not re-raise the original exception when exiting, - let the new chained one through. This avoids the PEP 479 bug described in - issue25782. +- Issue #27157: Make only type() itself accept the one-argument form. + Patch by Eryk Sun and Emanuel Barry. + +- Issue #27558: Fix a SystemError in the implementation of "raise" statement. + In a brand new thread, raise a RuntimeError since there is no active + exception to reraise. Patch written by Xiang Zhang. -Security --------- +- Issue #28008: Implement PEP 530 -- asynchronous comprehensions. -- bpo-27278: Fix os.urandom() implementation using getrandom() on Linux. - Truncate size to INT_MAX and loop until we collected enough random bytes, - instead of casting a directly Py_ssize_t to int. +- Issue #27942: Fix memory leak in codeobject.c Library ------- -- bpo-26386: Fixed ttk.TreeView selection operations with item id's - containing spaces. +- Issue #28732: Fix crash in os.spawnv() with no elements in args -Security --------- +- Issue #28485: Always raise ValueError for negative + compileall.compile_dir(workers=...) parameter, even when multithreading is + unavailable. -- bpo-22636: Avoid shell injection problems with ctypes.util.find_library(). +- Issue #28037: Use sqlite3_get_autocommit() instead of setting + Connection->inTransaction manually. -Library -------- +- Issue #25283: Attributes tm_gmtoff and tm_zone are now available on + all platforms in the return values of time.localtime() and + time.gmtime(). -- bpo-16182: Fix various functions in the "readline" module to use the - locale encoding, and fix get_begidx() and get_endidx() to return code - point indexes. +- Issue #24454: Regular expression match object groups are now + accessible using __getitem__. "mo[x]" is equivalent to + "mo.group(x)". -- bpo-27392: Add loop.connect_accepted_socket(). Patch by Jim Fulton. +- Issue #10740: sqlite3 no longer implicitly commit an open transaction + before DDL statements. -- bpo-27930: Improved behaviour of logging.handlers.QueueListener. Thanks to - Paulo Andrade and Petr Viktorin for the analysis and patch. +- Issue #17941: Add a *module* parameter to collections.namedtuple(). -- bpo-21201: Improves readability of multiprocessing error message. Thanks - to Wojciech Walczak for patch. +- Issue #22493: Inline flags now should be used only at the start of the + regular expression. Deprecation warning is emitted if uses them in the + middle of the regular expression. -- bpo-27456: asyncio: Set TCP_NODELAY by default. +- Issue #26885: xmlrpc now supports unmarshalling additional data types used + by Apache XML-RPC implementation for numerics and None. -- bpo-27906: Fix socket accept exhaustion during high TCP traffic. Patch by - Kevin Conway. +- Issue #28070: Fixed parsing inline verbose flag in regular expressions. -- bpo-28174: Handle when SO_REUSEPORT isn't properly supported. Patch by - Seth Michael Larson. +- Issue #19500: Add client-side SSL session resumption to the ssl module. -- bpo-26654: Inspect functools.partial in asyncio.Handle.__repr__. Patch by - iceboy. +- Issue #28022: Deprecate ssl-related arguments in favor of SSLContext. The + deprecation include manual creation of SSLSocket and certfile/keyfile + (or similar) in ftplib, httplib, imaplib, smtplib, poplib and urllib. -- bpo-26909: Fix slow pipes IO in asyncio. Patch by INADA Naoki. +- Issue #28043: SSLContext has improved default settings: OP_NO_SSLv2, + OP_NO_SSLv3, OP_NO_COMPRESSION, OP_CIPHER_SERVER_PREFERENCE, + OP_SINGLE_DH_USE, OP_SINGLE_ECDH_USE and HIGH ciphers without MD5. -- bpo-28176: Fix callbacks race in asyncio.SelectorLoop.sock_connect. +- Issue #24693: Changed some RuntimeError's in the zipfile module to more + appropriate types. Improved some error messages and debugging output. -- bpo-27759: Fix selectors incorrectly retain invalid file descriptors. - Patch by Mark Williams. +- Issue #17909: ``json.load`` and ``json.loads`` now support binary input + encoded as UTF-8, UTF-16 or UTF-32. Patch by Serhiy Storchaka. -- bpo-28368: Refuse monitoring processes if the child watcher has no loop - attached. Patch by Vincent Michel. +- Issue #27137: the pure Python fallback implementation of ``functools.partial`` + now matches the behaviour of its accelerated C counterpart for subclassing, + pickling and text representation purposes. Patch by Emanuel Barry and + Serhiy Storchaka. -- bpo-28369: Raise RuntimeError when transport's FD is used with add_reader, - add_writer, etc. +- Fix possible integer overflows and crashes in the mmap module with unusual + usage patterns. -- bpo-28370: Speedup asyncio.StreamReader.readexactly. Patch by Коренберг - Марк. +- Issue #1703178: Fix the ability to pass the --link-objects option to the + distutils build_ext command. -- bpo-28371: Deprecate passing asyncio.Handles to run_in_executor. +- Issue #28019: itertools.count() no longer rounds non-integer step in range + between 1.0 and 2.0 to 1. -- bpo-28372: Fix asyncio to support formatting of non-python coroutines. +- Issue #18401: Pdb now supports the 'readrc' keyword argument to control + whether .pdbrc files should be read. Patch by Martin Matusiak and + Sam Kimbrel. -- bpo-28399: Remove UNIX socket from FS before binding. Patch by Коренберг - Марк. +- Issue #25969: Update the lib2to3 grammar to handle the unpacking + generalizations added in 3.5. -- bpo-27972: Prohibit Tasks to await on themselves. +- Issue #14977: mailcap now respects the order of the lines in the mailcap + files ("first match"), as required by RFC 1542. Patch by Michael Lazar. -- bpo-26923: Fix asyncio.Gather to refuse being cancelled once all children - are done. Patch by Johannes Ebke. +- Issue #28082: Convert re flag constants to IntFlag. -- bpo-26796: Don't configure the number of workers for default threadpool - executor. Initial patch by Hans Lawrenz. +- Issue #28025: Convert all ssl module constants to IntEnum and IntFlags. + SSLContext properties now return flags and enums. -- bpo-28600: Optimize loop.call_soon(). +- Issue #23591: Add Flag, IntFlag, and auto() to enum module. -- bpo-28613: Fix get_event_loop() return the current loop if called from - coroutines/callbacks. +- Issue #433028: Added support of modifier spans in regular expressions. -- bpo-28639: Fix inspect.isawaitable to always return bool Patch by Justin - Mayfield. +- Issue #24594: Validates persist parameter when opening MSI database -- bpo-28652: Make loop methods reject socket kinds they do not support. +- Issue #17582: xml.etree.ElementTree nows preserves whitespaces in attributes + (Patch by Duane Griffin. Reviewed and approved by Stefan Behnel.) -- bpo-28653: Fix a refleak in functools.lru_cache. +- Issue #28047: Fixed calculation of line length used for the base64 CTE + in the new email policies. -- bpo-28703: Fix asyncio.iscoroutinefunction to handle Mock objects. +- Issue #27576: Fix call order in OrderedDict.__init__(). -- bpo-24142: Reading a corrupt config file left the parser in an invalid - state. Original patch by Florian Höch. +- email.generator.DecodedGenerator now supports the policy keyword. -- bpo-28990: Fix SSL hanging if connection is closed before handshake - completed. (Patch by HoHo-Ho) +- Issue #28027: Remove undocumented modules from ``Lib/plat-*``: IN, CDROM, + DLFCN, TYPES, CDIO, and STROPTS. -IDLE ----- +- Issue #27445: Don't pass str(_charset) to MIMEText.set_payload(). + Patch by Claude Paroz. -- bpo-15308: Add 'interrupt execution' (^C) to Shell menu. Patch by Roger - Serwy, updated by Bayard Randel. +- Issue #24277: The new email API is no longer provisional, and the docs + have been reorganized and rewritten to emphasize the new API. -- bpo-27922: Stop IDLE tests from 'flashing' gui widgets on the screen. +- Issue #22450: urllib now includes an "Accept: */*" header among the + default headers. This makes the results of REST API requests more + consistent and predictable especially when proxy servers are involved. -- Add version to title of IDLE help window. +- lib2to3.pgen3.driver.load_grammar() now creates a stable cache file + between runs given the same Grammar.txt input regardless of the hash + randomization setting. -- bpo-25564: In section on IDLE -- console differences, mention that using - exec means that __builtins__ is defined for each statement. +- Issue #28005: Allow ImportErrors in encoding implementation to propagate. -- bpo-27714: text_textview and test_autocomplete now pass when re-run in the - same process. This occurs when test_idle fails when run with the -w - option but without -jn. Fix warning from test_config. +- Issue #26667: Support path-like objects in importlib.util. -- bpo-25507: IDLE no longer runs buggy code because of its tkinter imports. - Users must include the same imports required to run directly in Python. +- Issue #27570: Avoid zero-length memcpy() etc calls with null source + pointers in the "ctypes" and "array" modules. -- bpo-27452: add line counter and crc to IDLE configHandler test dump. +- Issue #22233: Break email header lines *only* on the RFC specified CR and LF + characters, not on arbitrary unicode line breaks. This also fixes a bug in + HTTP header parsing. -- bpo-27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names. +- Issue 27331: The email.mime classes now all accept an optional policy keyword. -- bpo-27245: IDLE: Cleanly delete custom themes and key bindings. - Previously, when IDLE was started from a console or by import, a cascade - of warnings was emitted. Patch by Serhiy Storchaka. +- Issue 27988: Fix email iter_attachments incorrect mutation of payload list. -C API ------ +- Issue #16113: Add SHA-3 and SHAKE support to hashlib module. -- bpo-28808: PyUnicode_CompareWithASCIIString() now never raises exceptions. +- Eliminate a tautological-pointer-compare warning in _scproxy.c. -- bpo-26754: PyUnicode_FSDecoder() accepted a filename argument encoded as - an iterable of integers. Now only strings and bytes-like objects are - accepted. +- Issue #27776: The :func:`os.urandom` function does now block on Linux 3.17 + and newer until the system urandom entropy pool is initialized to increase + the security. This change is part of the :pep:`524`. -Documentation -------------- +- Issue #27778: Expose the Linux ``getrandom()`` syscall as a new + :func:`os.getrandom` function. This change is part of the :pep:`524`. -- bpo-28513: Documented command-line interface of zipfile. +- Issue #27691: Fix ssl module's parsing of GEN_RID subject alternative name + fields in X.509 certs. -Tests ------ +- Issue #18844: Add random.choices(). -- bpo-28950: Disallow -j0 to be combined with -T/-l/-M in regrtest command - line arguments. +- Issue #25761: Improved error reporting about truncated pickle data in + C implementation of unpickler. UnpicklingError is now raised instead of + AttributeError and ValueError in some cases. -- bpo-28666: Now test.support.rmtree is able to remove unwritable or - unreadable directories. +- Issue #26798: Add BLAKE2 (blake2b and blake2s) to hashlib. -- bpo-23839: Various caches now are cleared before running every test file. +- Issue #26032: Optimized globbing in pathlib by using os.scandir(); it is now + about 1.5--4 times faster. -- bpo-28409: regrtest: fix the parser of command line arguments. +- Issue #25596: Optimized glob() and iglob() functions in the + glob module; they are now about 3--6 times faster. -- bpo-27787: Call gc.collect() before checking each test for "dangling - threads", since the dangling threads are weak references. +- Issue #27928: Add scrypt (password-based key derivation function) to + hashlib module (requires OpenSSL 1.1.0). -- bpo-27369: In test_pyexpat, avoid testing an error message detail that - changed in Expat 2.2.0. +- Issue #27850: Remove 3DES from ssl module's default cipher list to counter + measure sweet32 attack (CVE-2016-2183). -Tools/Demos ------------ +- Issue #27766: Add ChaCha20 Poly1305 to ssl module's default ciper list. + (Required OpenSSL 1.1.0 or LibreSSL). -- bpo-27952: Get Tools/scripts/fixcid.py working with Python 3 and the - current "re" module, avoid invalid Python backslash escapes, and fix a bug - parsing escaped C quote signs. +- Issue #25387: Check return value of winsound.MessageBeep. -- bpo-27332: Fixed the type of the first argument of module-level functions - generated by Argument Clinic. Patch by Petr Viktorin. +- Issue #27866: Add SSLContext.get_ciphers() method to get a list of all + enabled ciphers. -- bpo-27418: Fixed Tools/importbench/importbench.py. +- Issue #27744: Add AF_ALG (Linux Kernel crypto) to socket module. -Windows -------- +- Issue #26470: Port ssl and hashlib module to OpenSSL 1.1.0. -- bpo-28251: Improvements to help manuals on Windows. +- Issue #11620: Fix support for SND_MEMORY in winsound.PlaySound. Based on a + patch by Tim Lesher. -- bpo-28110: launcher.msi has different product codes between 32-bit and - 64-bit +- Issue #11734: Add support for IEEE 754 half-precision floats to the + struct module. Based on a patch by Eli Stevens. -- bpo-25144: Ensures TargetDir is set before continuing with custom install. +- Issue #27919: Deprecated ``extra_path`` distribution option in distutils + packaging. -- bpo-27469: Adds a shell extension to the launcher so that drag and drop - works correctly. +- Issue #23229: Add new ``cmath`` constants: ``cmath.inf`` and ``cmath.nan`` to + match ``math.inf`` and ``math.nan``, and also ``cmath.infj`` and + ``cmath.nanj`` to match the format used by complex repr. -- bpo-27309: Enabled proper Windows styles in python[w].exe manifest. +- Issue #27842: The csv.DictReader now returns rows of type OrderedDict. + (Contributed by Steve Holden.) -Build ------ +- Remove support for passing a file descriptor to os.access. It never worked but + previously didn't raise. -- bpo-29080: Removes hard dependency on hg.exe from PCBuild/build.bat +- Issue #12885: Fix error when distutils encounters symlink. -- bpo-23903: Added missed names to PC/python3.def. +- Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level. + Based on patch by Xiang Zhang. -- bpo-10656: Fix out-of-tree building on AIX. Patch by Tristan Carel and - Michael Haubenwallner. +- Issue #27861: Fixed a crash in sqlite3.Connection.cursor() when a factory + creates not a cursor. Patch by Xiang Zhang. -- bpo-26359: Rename --with-optimiations to --enable-optimizations. +- Issue #19884: Avoid spurious output on OS X with Gnu Readline. -- bpo-28444: Fix missing extensions modules when cross compiling. +- Issue #27706: Restore deterministic behavior of random.Random().seed() + for string seeds using seeding version 1. Allows sequences of calls + to random() to exactly match those obtained in Python 2. + Patch by Nofar Schnider. -- bpo-28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j. +- Issue #10513: Fix a regression in Connection.commit(). Statements should + not be reset after a commit. -- bpo-28258: Fixed build with Estonian locale (python-config and distclean - targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. +- Issue #12319: Chunked transfer encoding support added to + http.client.HTTPConnection requests. The + urllib.request.AbstractHTTPHandler class does not enforce a Content-Length + header any more. If a HTTP request has a file or iterable body, but no + Content-Length header, the library now falls back to use chunked transfer- + encoding. -- bpo-26661: setup.py now detects system libffi with multiarch wrapper. +- A new version of typing.py from https://github.com/python/typing: + - Collection (only for 3.6) (Issue #27598) + - Add FrozenSet to __all__ (upstream #261) + - fix crash in _get_type_vars() (upstream #259) + - Remove the dict constraint in ForwardRef._eval_type (upstream #252) -- bpo-28066: Fix the logic that searches build directories for generated - include files when building outside the source tree. +- Issue #27832: Make ``_normalize`` parameter to ``Fraction`` constuctor + keyword-only, so that ``Fraction(2, 3, 4)`` now raises ``TypeError``. -- bpo-15819: Remove redundant include search directory option for building - outside the source tree. +- Issue #27539: Fix unnormalised ``Fraction.__pow__`` result in the case + of negative exponent and negative base. -- bpo-27566: Fix clean target in freeze makefile (patch by Lisa Roach) +- Issue #21718: cursor.description is now available for queries using CTEs. -- bpo-27705: Update message in validate_ucrtbase.py +- Issue #27819: In distutils sdists, simply produce the "gztar" (gzipped tar + format) distributions on all platforms unless "formats" is supplied. -- bpo-27983: Cause lack of llvm-profdata tool when using clang as required - for PGO linking to be a configure time error rather than make time when - --with- optimizations is enabled. Also improve our ability to find the - llvm- profdata tool on MacOS and some Linuxes. +- Issue #2466: posixpath.ismount now correctly recognizes mount points which + the user does not have permission to access. -- bpo-26307: The profile-opt build now applies PGO to the built-in modules. +- Issue #9998: On Linux, ctypes.util.find_library now looks in LD_LIBRARY_PATH + for shared libraries. -- bpo-26359: Add the --with-optimizations configure flag. +- Issue #27573: exit message for code.interact is now configurable. -- bpo-27713: Suppress spurious build warnings when updating importlib's - bootstrap files. Patch by Xiang Zhang +- Issue #27930: Improved behaviour of logging.handlers.QueueListener. + Thanks to Paulo Andrade and Petr Viktorin for the analysis and patch. -- bpo-25825: Correct the references to Modules/python.exp and ld_so_aix, - which are required on AIX. This updates references to an installation - path that was changed in 3.2a4, and undoes changed references to the build - tree that were made in 3.5.0a1. +- Issue #6766: Distributed reference counting added to multiprocessing + to support nesting of shared values / proxy objects. -- bpo-27453: CPP invocation in configure must use CPPFLAGS. Patch by Chi - Hsuan Yen. +- Issue #21201: Improves readability of multiprocessing error message. Thanks + to Wojciech Walczak for patch. -- bpo-27641: The configure script now inserts comments into the makefile to - prevent the pgen and _freeze_importlib executables from being cross- - compiled. +- asyncio: Add set_protocol / get_protocol to Transports. -- bpo-26662: Set PYTHON_FOR_GEN in configure as the Python program to be - used for file generation during the build. +- Issue #27456: asyncio: Set TCP_NODELAY by default. -- bpo-10910: Avoid C++ compilation errors on FreeBSD and OS X. Also update - FreedBSD version checks for the original ctype UTF-8 workaround. +IDLE +---- -- bpo-28676: Prevent missing 'getentropy' declaration warning on macOS. - Patch by Gareth Rees. +- Issue #15308: Add 'interrupt execution' (^C) to Shell menu. + Patch by Roger Serwy, updated by Bayard Randel. +- Issue #27922: Stop IDLE tests from 'flashing' gui widgets on the screen. -What's New in Python 3.5.2 final? -================================= +- Issue #27891: Consistently group and sort imports within idlelib modules. -*Release date: 2016-06-26* +- Issue #17642: add larger font sizes for classroom projection. -Core and Builtins ------------------ +- Add version to title of IDLE help window. -- bpo-26930: Update Windows builds to use OpenSSL 1.0.2h. +- Issue #25564: In section on IDLE -- console differences, mention that + using exec means that __builtins__ is defined for each statement. + +- Issue #27821: Fix 3.6.0a3 regression that prevented custom key sets + from being selected when no custom theme was defined. + +C API +----- + +- Issue #26900: Excluded underscored names and other private API from limited API. + +- Issue #26027: Add support for path-like objects in PyUnicode_FSConverter() & + PyUnicode_FSDecoder(). Tests ----- -- bpo-26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test. +- Issue #27427: Additional tests for the math module. Patch by Francisco Couzo. -IDLE ----- +- Issue #27953: Skip math and cmath tests that fail on OS X 10.4 due to a + poor libm implementation of tan. -- bpo-27365: Allow non-ascii in idlelib/NEWS.txt - minimal part for 3.5.2. +- Issue #26040: Improve test_math and test_cmath coverage and rigour. Patch by + Jeff Allen. +- Issue #27787: Call gc.collect() before checking each test for "dangling + threads", since the dangling threads are weak references. -What's New in Python 3.5.2 release candidate 1? -=============================================== +Build +----- -*Release date: 2016-06-12* +- Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach) -Core and Builtins ------------------ +- Issue #27705: Update message in validate_ucrtbase.py -- bpo-27066: Fixed SystemError if a custom opener (for open()) returns a - negative number without setting an exception. +- Issue #27976: Deprecate building _ctypes with the bundled copy of libffi on + non-OSX UNIX platforms. -- bpo-20041: Fixed TypeError when frame.f_trace is set to None. Patch by - Xavier de Gaye. +- Issue #27983: Cause lack of llvm-profdata tool when using clang as + required for PGO linking to be a configure time error rather than + make time when --with-optimizations is enabled. Also improve our + ability to find the llvm-profdata tool on MacOS and some Linuxes. -- bpo-26168: Fixed possible refleaks in failing Py_BuildValue() with the "N" - format unit. +- Issue #21590: Support for DTrace and SystemTap probes. -- bpo-26991: Fix possible refleak when creating a function with annotations. +- Issue #26307: The profile-opt build now applies PGO to the built-in modules. -- bpo-27039: Fixed bytearray.remove() for values greater than 127. Patch by - Joe Jevnik. +- Issue #26539: Add the --with-optimizations flag to turn on LTO and PGO build + support when available. -- bpo-23640: int.from_bytes() no longer bypasses constructors for - subclasses. +- Issue #27917: Set platform triplets for Android builds. -- bpo-26811: gc.get_objects() no longer contains a broken tuple with NULL - pointer. +- Issue #25825: Update references to the $(LIBPL) installation path on AIX. + This path was changed in 3.2a4. -- bpo-20120: Use RawConfigParser for .pypirc parsing, removing support for - interpolation unintentionally added with move to Python 3. Behavior no - longer does any interpolation in .pypirc files, matching behavior in - Python 2.7 and Setuptools 19.0. +- Update OS X installer to use SQLite 3.14.1 and XZ 5.2.2. -- bpo-26659: Make the builtin slice type support cycle collection. +- Issue #21122: Fix LTO builds on OS X. -- bpo-26718: super.__init__ no longer leaks memory if called multiple times. - NOTE: A direct call of super.__init__ is not endorsed! +- Issue #17128: Build OS X installer with a private copy of OpenSSL. + Also provide a sample Install Certificates command script to install a + set of root certificates from the third-party certifi module. -- bpo-25339: PYTHONIOENCODING now has priority over locale in setting the - error handler for stdin and stdout. +Tools/Demos +----------- -- bpo-26494: Fixed crash on iterating exhausting iterators. Affected classes - are generic sequence iterators, iterators of str, bytes, bytearray, list, - tuple, set, frozenset, dict, OrderedDict, corresponding views and - os.scandir() iterator. +- Issue #27952: Get Tools/scripts/fixcid.py working with Python 3 and the + current "re" module, avoid invalid Python backslash escapes, and fix a bug + parsing escaped C quote signs. -- bpo-26581: If coding cookie is specified multiple times on a line in - Python source code file, only the first one is taken to account. +Windows +------- -- bpo-26464: Fix str.translate() when string is ASCII and first replacements - removes character, but next replacement uses a non-ASCII character or a - string longer than 1 character. Regression introduced in Python 3.5.0. +- Issue #28065: Update xz dependency to 5.2.2 and build it from source. -- bpo-22836: Ensure exception reports from PyErr_Display() and - PyErr_WriteUnraisable() are sensible even when formatting them produces - secondary errors. This affects the reports produced by - sys.__excepthook__() and when __del__() raises an exception. +- Issue #25144: Ensures TargetDir is set before continuing with custom + install. -- bpo-26302: Correct behavior to reject comma as a legal character for - cookie names. +- Issue #1602: Windows console doesn't input or print Unicode (PEP 528) -- bpo-4806: Avoid masking the original TypeError exception when using star - (``*``) unpacking in function calls. Based on patch by Hagen Fürstenau - and Daniel Urban. +- Issue #27781: Change file system encoding on Windows to UTF-8 (PEP 529) -- bpo-27138: Fix the doc comment for FileFinder.find_spec(). +- Issue #27731: Opt-out of MAX_PATH on Windows 10 -- bpo-26154: Add a new private _PyThreadState_UncheckedGet() function to get - the current Python thread state, but don't issue a fatal error if it is - NULL. This new function must be used instead of accessing directly the - _PyThreadState_Current variable. The variable is no more exposed since - Python 3.5.1 to hide the exact implementation of atomic C types, to avoid - compiler issues. +- Issue #6135: Adds encoding and errors parameters to subprocess. -- bpo-26194: Deque.insert() gave odd results for bounded deques that had - reached their maximum size. Now an IndexError will be raised when - attempting to insert into a full deque. +- Issue #27959: Adds oem encoding, alias ansi to mbcs, move aliasmbcs to + codec lookup. -- bpo-25843: When compiling code, don't merge constants if they are equal - but have a different types. For example, ``f1, f2 = lambda: 1, lambda: - 1.0`` is now correctly compiled to two different functions: ``f1()`` - returns ``1`` (``int``) and ``f2()`` returns ``1.0`` (``int``), even if - ``1`` and ``1.0`` are equal. +- Issue #27982: The functions of the winsound module now accept keyword + arguments. -- bpo-22995: [UPDATE] Comment out the one of the pickleability tests in - _PyObject_GetState() due to regressions observed in Cython-based projects. +- Issue #20366: Build full text search support into SQLite on Windows. -- bpo-25961: Disallowed null characters in the type name. +- Issue #27756: Adds new icons for Python files and processes on Windows. + Designs by Cherry Wang. -- bpo-25973: Fix segfault when an invalid nonlocal statement binds a name - starting with two underscores. +- Issue #27883: Update sqlite to 3.14.1.0 on Windows. -- bpo-22995: Instances of extension types with a state that aren't - subclasses of list or dict and haven't implemented any pickle-related - methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__, or - __getstate__), can no longer be pickled. Including memoryview. -- bpo-20440: Massive replacing unsafe attribute setting code with special - macro Py_SETREF. +What's New in Python 3.6.0 alpha 4? +=================================== -- bpo-25766: Special method __bytes__() now works in str subclasses. +*Release date: 2016-08-15* -- bpo-25421: __sizeof__ methods of builtin types now use dynamic basic size. - This allows sys.getsize() to work correctly with their subclasses with - __slots__ defined. +Core and Builtins +----------------- -- bpo-25709: Fixed problem with in-place string concatenation and utf-8 - cache. +- Issue #27704: Optimized creating bytes and bytearray from byte-like objects + and iterables. Speed up to 3 times for short objects. Original patch by + Naoki Inada. -- bpo-27147: Mention PEP 420 in the importlib docs. +- Issue #26823: Large sections of repeated lines in tracebacks are now + abbreviated as "[Previous line repeated {count} more times]" by the builtin + traceback rendering. Patch by Emanuel Barry. -- bpo-24097: Fixed crash in object.__reduce__() if slot name is freed inside - __getattr__. +- Issue #27574: Decreased an overhead of parsing keyword arguments in functions + implemented with using Argument Clinic. -- bpo-24731: Fixed crash on converting objects with special methods - __bytes__, __trunc__, and __float__ returning instances of subclasses of - bytes, int, and float to subclasses of bytes, int, and float - correspondingly. +- Issue #22557: Now importing already imported modules is up to 2.5 times + faster. -- bpo-26478: Fix semantic bugs when using binary operators with dictionary - views and tuples. +- Issue #17596: Include to help with Min GW building. -- bpo-26171: Fix possible integer overflow and heap corruption in - zipimporter.get_data(). +- Issue #17599: On Windows, rename the privately defined REPARSE_DATA_BUFFER + structure to avoid conflicting with the definition from Min GW. -- bpo-25660: Fix TAB key behaviour in REPL with readline. +- Issue #27507: Add integer overflow check in bytearray.extend(). Patch by + Xiang Zhang. -- bpo-25887: Raise a RuntimeError when a coroutine object is awaited more - than once. +- Issue #27581: Don't rely on wrapping for overflow check in + PySequence_Tuple(). Patch by Xiang Zhang. -- bpo-27243: Update the __aiter__ protocol: instead of returning an - awaitable that resolves to an asynchronous iterator, the asynchronous - iterator should be returned directly. Doing the former will trigger a - PendingDeprecationWarning. +- Issue #1621: Avoid signed integer overflow in list and tuple operations. + Patch by Xiang Zhang. + +- Issue #27419: Standard __import__() no longer look up "__import__" in globals + or builtins for importing submodules or "from import". Fixed a crash if + raise a warning about unabling to resolve package from __spec__ or + __package__. -Security --------- +- Issue #27083: Respect the PYTHONCASEOK environment variable under Windows. -- bpo-26556: Update expat to 2.1.1, fixes CVE-2015-1283. +- Issue #27514: Make having too many statically nested blocks a SyntaxError + instead of SystemError. -- Fix TLS stripping vulnerability in smtplib, CVE-2016-0772. Reported by - Team Oststrom +- Issue #27366: Implemented PEP 487 (Simpler customization of class creation). + Upon subclassing, the __init_subclass__ classmethod is called on the base + class. Descriptors are initialized with __set_name__ after class creation. Library ------- -- bpo-21386: Implement missing IPv4Address.is_global property. It was - documented since 07a5610bae9d. Initial patch by Roger Luethi. +- Issue #26027, #27524: Add PEP 519/__fspath__() support to the os and os.path + modules. Includes code from Jelle Zijlstra. -- bpo-20900: distutils register command now decodes HTTP responses - correctly. Initial patch by ingrid. +- Issue #27598: Add Collections to collections.abc. + Patch by Ivan Levkivskyi, docs by Neil Girdhar. -- A new version of typing.py provides several new classes and features: - @overload outside stubs, Reversible, DefaultDict, Text, ContextManager, - Type[], NewType(), TYPE_CHECKING, and numerous bug fixes (note that some - of the new features are not yet implemented in mypy or other static - analyzers). Also classes for PEP 492 (Awaitable, AsyncIterable, - AsyncIterator) have been added (in fact they made it into 3.5.1 but were - never mentioned). +- Issue #25958: Support "anti-registration" of special methods from + various ABCs, like __hash__, __iter__ or __len__. All these (and + several more) can be set to None in an implementation class and the + behavior will be as if the method is not defined at all. + (Previously, this mechanism existed only for __hash__, to make + mutable classes unhashable.) Code contributed by Andrew Barnert and + Ivan Levkivskyi. -- bpo-25738: Stop http.server.BaseHTTPRequestHandler.send_error() from - sending a message body for 205 Reset Content. Also, don't send Content - header fields in responses that don't have a body. Patch by Susumu - Koshiba. +- Issue #16764: Support keyword arguments to zlib.decompress(). Patch by + Xiang Zhang. -- bpo-21313: Fix the "platform" module to tolerate when sys.version contains - truncated build information. +- Issue #27736: Prevent segfault after interpreter re-initialization due + to ref count problem introduced in code for Issue #27038 in 3.6.0a3. + Patch by Xiang Zhang. -Security --------- +- Issue #25628: The *verbose* and *rename* parameters for + collections.namedtuple are now keyword-only. -- bpo-26839: On Linux, :func:`os.urandom` now calls ``getrandom()`` with - ``GRND_NONBLOCK`` to fall back on reading ``/dev/urandom`` if the urandom - entropy pool is not initialized yet. Patch written by Colm Buckley. +- Issue #12345: Add mathematical constant tau to math and cmath. See also + PEP 628. -Library -------- +- Issue #26823: traceback.StackSummary.format now abbreviates large sections of + repeated lines as "[Previous line repeated {count} more times]" (this change + then further affects other traceback display operations in the module). Patch + by Emanuel Barry. -- bpo-27164: In the zlib module, allow decompressing raw Deflate streams - with a predefined zdict. Based on patch by Xiang Zhang. +- Issue #27664: Add to concurrent.futures.thread.ThreadPoolExecutor() + the ability to specify a thread name prefix. -- bpo-24291: Fix wsgiref.simple_server.WSGIRequestHandler to completely - write data to the client. Previously it could do partial writes and - truncate data. Also, wsgiref.handler.ServerHandler can now handle stdout - doing partial writes, but this is deprecated. +- Issue #27181: Add geometric_mean and harmonic_mean to statistics module. -- bpo-26809: Add ``__all__`` to :mod:`string`. Patch by Emanuel Barry. +- Issue #27573: code.interact now prints an message when exiting. -- bpo-26373: subprocess.Popen.communicate now correctly ignores - BrokenPipeError when the child process dies before .communicate() is - called in more/all circumstances. +- Issue #6422: Add autorange method to timeit.Timer objects. -- bpo-21776: distutils.upload now correctly handles HTTPError. Initial patch - by Claudiu Popa. +- Issue #27773: Correct some memory management errors server_hostname in + _ssl.wrap_socket(). -- bpo-27114: Fix SSLContext._load_windows_store_certs fails with - PermissionError +- Issue #26750: unittest.mock.create_autospec() now works properly for + subclasses of property() and other data descriptors. Removes the never + publicly used, never documented unittest.mock.DescriptorTypes tuple. -- bpo-18383: Avoid creating duplicate filters when using filterwarnings and - simplefilter. Based on patch by Alex Shkop. +- Issue #26754: Undocumented support of general bytes-like objects + as path in compile() and similar functions is now deprecated. -- bpo-27057: Fix os.set_inheritable() on Android, ioctl() is blocked by - SELinux and fails with EACCESS. The function now falls back to fcntl(). - Patch written by Michał Bednarski. +- Issue #26800: Undocumented support of general bytes-like objects + as paths in os functions is now deprecated. -- bpo-27014: Fix infinite recursion using typing.py. Thanks to Kalle Tuure! +- Issue #26981: Add _order_ compatibility shim to enum.Enum for + Python 2/3 code bases. -- bpo-14132: Fix urllib.request redirect handling when the target only has a - query string. Original fix by Ján Janech. +- Issue #27661: Added tzinfo keyword argument to datetime.combine. -- bpo-17214: The "urllib.request" module now percent-encodes non-ASCII bytes - found in redirect target URLs. Some servers send Location header fields - with non- ASCII bytes, but "http.client" requires the request target to be - ASCII- encodable, otherwise a UnicodeEncodeError is raised. Based on - patch by Christian Heimes. +- In the curses module, raise an error if window.getstr() or window.instr() is + passed a negative value. -- bpo-26892: Honor debuglevel flag in urllib.request.HTTPHandler. Patch - contributed by Chi Hsuan Yen. +- Issue #27783: Fix possible usage of uninitialized memory in + operator.methodcaller. -- bpo-22274: In the subprocess module, allow stderr to be redirected to - stdout even when stdout is not redirected. Patch by Akira Li. +- Issue #27774: Fix possible Py_DECREF on unowned object in _sre. -- bpo-26807: mock_open 'files' no longer error on readline at end of file. - Patch from Yolanda Robla. +- Issue #27760: Fix possible integer overflow in binascii.b2a_qp. -- bpo-25745: Fixed leaking a userptr in curses panel destructor. +- Issue #27758: Fix possible integer overflow in the _csv module for large + record lengths. -- bpo-26977: Removed unnecessary, and ignored, call to sum of squares helper - in statistics.pvariance. +- Issue #27568: Prevent HTTPoxy attack (CVE-2016-1000110). Ignore the + HTTP_PROXY variable when REQUEST_METHOD environment is set, which indicates + that the script is in CGI mode. -- bpo-26881: The modulefinder module now supports extended opcode arguments. +- Issue #7063: Remove dead code from the "array" module's slice handling. + Patch by Chuck. -- bpo-23815: Fixed crashes related to directly created instances of types in - _tkinter and curses.panel modules. +- Issue #27656: Do not assume sched.h defines any SCHED_* constants. -- bpo-17765: weakref.ref() no longer silently ignores keyword arguments. - Patch by Georg Brandl. +- Issue #27130: In the "zlib" module, fix handling of large buffers + (typically 4 GiB) when compressing and decompressing. Previously, inputs + were limited to 4 GiB, and compression and decompression operations did not + properly handle results of 4 GiB. -- bpo-26873: xmlrpc now raises ResponseError on unsupported type tags - instead of silently return incorrect result. +- Issue #24773: Implemented PEP 495 (Local Time Disambiguation). + +- Expose the EPOLLEXCLUSIVE constant (when it is defined) in the select module. -- bpo-26711: Fixed the comparison of plistlib.Data with other types. +- Issue #27567: Expose the EPOLLRDHUP and POLLRDHUP constants in the select + module. -- bpo-24114: Fix an uninitialized variable in `ctypes.util`. +- Issue #1621: Avoid signed int negation overflow in the "audioop" module. - The bug only occurs on SunOS when the ctypes implementation searches for - the `crle` program. Patch by Xiang Zhang. Tested on SunOS by Kees Bos. +- Issue #27533: Release GIL in nt._isdir -- bpo-26864: In urllib.request, change the proxy bypass host checking - against no_proxy to be case-insensitive, and to not match unrelated host - names that happen to have a bypassed hostname as a suffix. Patch by Xiang - Zhang. +- Issue #17711: Fixed unpickling by the persistent ID with protocol 0. + Original patch by Alexandre Vassalotti. -- bpo-26634: recursive_repr() now sets __qualname__ of wrapper. Patch by - Xiang Zhang. +- Issue #27522: Avoid an unintentional reference cycle in email.feedparser. -- bpo-26804: urllib.request will prefer lower_case proxy environment - variables over UPPER_CASE or Mixed_Case ones. Patch contributed by Hans- - Peter Jansen. +- Issue #27512: Fix a segfault when os.fspath() called an __fspath__() method + that raised an exception. Patch by Xiang Zhang. -- bpo-26837: assertSequenceEqual() now correctly outputs non-stringified - differing items (like bytes in the -b mode). This affects - assertListEqual() and assertTupleEqual(). +IDLE +---- -- bpo-26041: Remove "will be removed in Python 3.7" from deprecation - messages of platform.dist() and platform.linux_distribution(). Patch by - Kumaripaba Miyurusara Athukorala. +- Issue #27714: text_textview and test_autocomplete now pass when re-run + in the same process. This occurs when test_idle fails when run with the + -w option but without -jn. Fix warning from test_config. -- bpo-26822: itemgetter, attrgetter and methodcaller objects no longer - silently ignore keyword arguments. +- Issue #27621: Put query response validation error messages in the query + box itself instead of in a separate massagebox. Redo tests to match. + Add Mac OSX refinements. Original patch by Mark Roseman. -- bpo-26733: Disassembling a class now disassembles class and static - methods. Patch by Xiang Zhang. +- Issue #27620: Escape key now closes Query box as cancelled. -- bpo-26801: Fix error handling in :func:`shutil.get_terminal_size`, catch - :exc:`AttributeError` instead of :exc:`NameError`. Patch written by - Emanuel Barry. +- Issue #27609: IDLE: tab after initial whitespace should tab, not + autocomplete. This fixes problem with writing docstrings at least + twice indented. -- bpo-24838: tarfile's ustar and gnu formats now correctly calculate name - and link field limits for multibyte character encodings like utf-8. +- Issue #27609: Explicitly return None when there are also non-None + returns. In a few cases, reverse a condition and eliminate a return. + +- Issue #25507: IDLE no longer runs buggy code because of its tkinter imports. + Users must include the same imports required to run directly in Python. -Security --------- +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. -- bpo-26657: Fix directory traversal vulnerability with http.server on - Windows. This fixes a regression that was introduced in 3.3.4rc1 and - 3.4.0rc1. Based on patch by Philipp Hagemeister. +- Issue #27452: add line counter and crc to IDLE configHandler test dump. -Library +Tests +----- + +- Issue #25805: Skip a test in test_pkgutil as needed that doesn't work when + ``__name__ == __main__``. Patch by SilentGhost. + +- Issue #27472: Add test.support.unix_shell as the path to the default shell. + +- Issue #27369: In test_pyexpat, avoid testing an error message detail that + changed in Expat 2.2.0. + +- Issue #27594: Prevent assertion error when running test_ast with coverage + enabled: ensure code object has a valid first line number. + Patch suggested by Ivan Levkivskyi. + +Windows ------- -- bpo-26717: Stop encoding Latin-1-ized WSGI paths with UTF-8. Patch by - Anthony Sottile. +- Issue #27647: Update bundled Tcl/Tk to 8.6.6. -- bpo-26735: Fix :func:`os.urandom` on Solaris 11.3 and newer when reading - more than 1,024 bytes: call ``getrandom()`` multiple times with a limit of - 1024 bytes per call. +- Issue #27610: Adds PEP 514 metadata to Windows installer -- bpo-16329: Add .webm to mimetypes.types_map. Patch by Giampaolo Rodola'. +- Issue #27469: Adds a shell extension to the launcher so that drag and drop + works correctly. -- bpo-13952: Add .csv to mimetypes.types_map. Patch by Geoff Wilson. +- Issue #27309: Enables proper Windows styles in python[w].exe manifest. -- bpo-26709: Fixed Y2038 problem in loading binary PLists. +Build +----- -- bpo-23735: Handle terminal resizing with Readline 6.3+ by installing our - own SIGWINCH handler. Patch by Eric Price. +- Issue #27713: Suppress spurious build warnings when updating importlib's + bootstrap files. Patch by Xiang Zhang -- bpo-26586: In http.server, respond with "413 Request header fields too - large" if there are too many header fields to parse, rather than killing - the connection and raising an unhandled exception. Patch by Xiang Zhang. +- Issue #25825: Correct the references to Modules/python.exp, which is + required on AIX. The references were accidentally changed in 3.5.0a1. -- bpo-22854: Change BufferedReader.writable() and BufferedWriter.readable() - to always return False. +- Issue #27453: CPP invocation in configure must use CPPFLAGS. Patch by + Chi Hsuan Yen. -- bpo-25195: Fix a regression in mock.MagicMock. _Call is a subclass of - tuple (changeset 3603bae63c13 only works for classes) so we need to - implement __ne__ ourselves. Patch by Andrew Plummer. +- Issue #27641: The configure script now inserts comments into the makefile + to prevent the pgen and _freeze_importlib executables from being cross- + compiled. -- bpo-26644: Raise ValueError rather than SystemError when a negative length - is passed to SSLSocket.recv() or read(). +- Issue #26662: Set PYTHON_FOR_GEN in configure as the Python program to be + used for file generation during the build. -- bpo-23804: Fix SSL recv(0) and read(0) methods to return zero bytes - instead of up to 1024. +- Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X. + Also update FreedBSD version checks for the original ctype UTF-8 workaround. -- bpo-26616: Fixed a bug in datetime.astimezone() method. -- bpo-21925: :func:`warnings.formatwarning` now catches exceptions on - ``linecache.getline(...)`` to be able to log :exc:`ResourceWarning` - emitted late during the Python shutdown process. +What's New in Python 3.6.0 alpha 3? +=================================== -- bpo-24266: Ctrl+C during Readline history search now cancels the search - mode when compiled with Readline 7. +*Release date: 2016-07-11* -- bpo-26560: Avoid potential ValueError in BaseHandler.start_response. - Initial patch by Peter Inglesby. +Core and Builtins +----------------- -Security --------- +- Issue #27473: Fixed possible integer overflow in bytes and bytearray + concatenations. Patch by Xiang Zhang. -- bpo-26313: ssl.py _load_windows_store_certs fails if windows cert store is - empty. Patch by Baji. +- Issue #23034: The output of a special Python build with defined COUNT_ALLOCS, + SHOW_ALLOC_COUNT or SHOW_TRACK_COUNT macros is now off by default. It can + be re-enabled using the "-X showalloccount" option. It now outputs to stderr + instead of stdout. + +- Issue #27443: __length_hint__() of bytearray iterators no longer return a + negative integer for a resized bytearray. + +- Issue #27007: The fromhex() class methods of bytes and bytearray subclasses + now return an instance of corresponding subclass. Library ------- -- bpo-26569: Fix :func:`pyclbr.readmodule` and :func:`pyclbr.readmodule_ex` - to support importing packages. +- Issue #26844: Fix error message for imp.find_module() to refer to 'path' + instead of 'name'. Patch by Lev Maximov. -- bpo-26499: Account for remaining Content-Length in HTTPResponse.readline() - and read1(). Based on patch by Silent Ghost. Also document that - HTTPResponse now supports these methods. +- Issue #23804: Fix SSL zero-length recv() calls to not block and not raise + an error about unclean EOF. -- bpo-25320: Handle sockets in directories unittest discovery is scanning. - Patch from Victor van den Elzen. +- Issue #27466: Change time format returned by http.cookie.time2netscape, + confirming the netscape cookie format and making it consistent with + documentation. -- bpo-16181: cookiejar.http2time() now returns None if year is higher than - datetime.MAXYEAR. +- Issue #21708: Deprecated dbm.dumb behavior that differs from common dbm + behavior: creating a database in 'r' and 'w' modes and modifying a database + in 'r' mode. -- bpo-26513: Fixes platform module detection of Windows Server +- Issue #26721: Change the socketserver.StreamRequestHandler.wfile attribute + to implement BufferedIOBase. In particular, the write() method no longer + does partial writes. -- bpo-23718: Fixed parsing time in week 0 before Jan 1. Original patch by - Tamás Bence Gedai. +- Issue #22115: Added methods trace_add, trace_remove and trace_info in the + tkinter.Variable class. They replace old methods trace_variable, trace, + trace_vdelete and trace_vinfo that use obsolete Tcl commands and might + not work in future versions of Tcl. Fixed old tracing methods: + trace_vdelete() with wrong mode no longer break tracing, trace_vinfo() now + always returns a list of pairs of strings, tracing in the "u" mode now works. -- bpo-20589: Invoking Path.owner() and Path.group() on Windows now raise - NotImplementedError instead of ImportError. +- Issue #26243: Only the level argument to zlib.compress() is keyword argument + now. The first argument is positional-only. -- bpo-26177: Fixed the keys() method for Canvas and Scrollbar widgets. +- Issue #27038: Expose the DirEntry type as os.DirEntry. Code patch by + Jelle Zijlstra. -- bpo-15068: Got rid of excessive buffering in the fileinput module. The - bufsize parameter is no longer used. +- Issue #27186: Update os.fspath()/PyOS_FSPath() to check the return value of + __fspath__() to be either str or bytes. -- bpo-2202: Fix UnboundLocalError in - AbstractDigestAuthHandler.get_algorithm_impls. Initial patch by Mathieu - Dupuy. +- Issue #18726: All optional parameters of the dump(), dumps(), + load() and loads() functions and JSONEncoder and JSONDecoder class + constructors in the json module are now keyword-only. -- bpo-25718: Fixed pickling and copying the accumulate() iterator with total - is None. +- Issue #27319: Methods selection_set(), selection_add(), selection_remove() + and selection_toggle() of ttk.TreeView now allow passing multiple items as + multiple arguments instead of passing them as a tuple. Deprecated + undocumented ability of calling the selection() method with arguments. -- bpo-26475: Fixed debugging output for regular expressions with the (?x) - flag. +- Issue #27079: Fixed curses.ascii functions isblank(), iscntrl() and ispunct(). -- bpo-26457: Fixed the subnets() methods in IP network classes for the case - when resulting prefix length is equal to maximal prefix length. Based on - patch by Xiang Zhang. +- Issue #27294: Numerical state in the repr for Tkinter event objects is now + represented as a combination of known flags. -- bpo-26385: Remove the file if the internal open() call in - NamedTemporaryFile() fails. Patch by Silent Ghost. +- Issue #27177: Match objects in the re module now support index-like objects + as group indices. Based on patches by Jeroen Demeyer and Xiang Zhang. -- bpo-26402: Fix XML-RPC client to retry when the server shuts down a - persistent connection. This was a regression related to the new - http.client.RemoteDisconnected exception in 3.5.0a4. +- Issue #26754: Some functions (compile() etc) accepted a filename argument + encoded as an iterable of integers. Now only strings and byte-like objects + are accepted. -- bpo-25913: Leading ``<~`` is optional now in base64.a85decode() with - adobe=True. Patch by Swati Jaiswal. +- Issue #26536: socket.ioctl now supports SIO_LOOPBACK_FAST_PATH. Patch by + Daniel Stokes. -- bpo-26186: Remove an invalid type check in importlib.util.LazyLoader. +- Issue #27048: Prevents distutils failing on Windows when environment + variables contain non-ASCII characters -- bpo-26367: importlib.__import__() raises SystemError like - builtins.__import__() when ``level`` is specified but without an - accompanying package specified. +- Issue #27330: Fixed possible leaks in the ctypes module. -- bpo-26309: In the "socketserver" module, shut down the request (closing - the connected socket) when verify_request() returns false. Patch by Aviv - Palivoda. +- Issue #27238: Got rid of bare excepts in the turtle module. Original patch + by Jelle Zijlstra. -Security --------- +- Issue #27122: When an exception is raised within the context being managed + by a contextlib.ExitStack() and one of the exit stack generators + catches and raises it in a chain, do not re-raise the original exception + when exiting, let the new chained one through. This avoids the PEP 479 + bug described in issue25782. -- bpo-25939: On Windows open the cert store readonly in - ssl.enum_certificates. +- [Security] Issue #27278: Fix os.urandom() implementation using getrandom() on + Linux. Truncate size to INT_MAX and loop until we collected enough random + bytes, instead of casting a directly Py_ssize_t to int. -Library -------- +- Issue #16864: sqlite3.Cursor.lastrowid now supports REPLACE statement. + Initial patch by Alex LordThorsen. -- bpo-25995: os.walk() no longer uses FDs proportional to the tree depth. +- Issue #26386: Fixed ttk.TreeView selection operations with item id's + containing spaces. -- bpo-26117: The os.scandir() iterator now closes file descriptor not only - when the iteration is finished, but when it was failed with error. +- Issue #8637: Honor a pager set by the env var MANPAGER (in preference to + one set by the env var PAGER). -- bpo-25911: Restored support of bytes paths in os.walk() on Windows. +- [Security] Issue #22636: Avoid shell injection problems with + ctypes.util.find_library(). -- bpo-26045: Add UTF-8 suggestion to error message when posting a non- - Latin-1 string with http.client. +- Issue #16182: Fix various functions in the "readline" module to use the + locale encoding, and fix get_begidx() and get_endidx() to return code point + indexes. -- bpo-12923: Reset FancyURLopener's redirect counter even if there is an - exception. Based on patches by Brian Brazil and Daniel Rocco. +- Issue #27392: Add loop.connect_accepted_socket(). + Patch by Jim Fulton. -- bpo-25945: Fixed a crash when unpickle the functools.partial object with - wrong state. Fixed a leak in failed functools.partial constructor. "args" - and "keywords" attributes of functools.partial have now always types tuple - and dict correspondingly. +IDLE +---- -- bpo-26202: copy.deepcopy() now correctly copies range() objects with non- - atomic attributes. +- Issue #27477: IDLE search dialogs now use ttk widgets. -- bpo-23076: Path.glob() now raises a ValueError if it's called with an - invalid pattern. Patch by Thomas Nyberg. +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. -- bpo-19883: Fixed possible integer overflows in zipimport. +- Issue #27452: make command line "idle-test> python test_help.py" work. + __file__ is relative when python is started in the file's directory. -- bpo-26227: On Windows, getnameinfo(), gethostbyaddr() and - gethostbyname_ex() functions of the socket module now decode the hostname - from the ANSI code page rather than UTF-8. +- Issue #27452: add line counter and crc to IDLE configHandler test dump. -- bpo-26147: xmlrpc now works with strings not encodable with used non-UTF-8 - encoding. +- Issue #27380: IDLE: add query.py with base Query dialog and ttk widgets. + Module had subclasses SectionName, ModuleName, and HelpSource, which are + used to get information from users by configdialog and file =>Load Module. + Each subclass has itw own validity checks. Using ModuleName allows users + to edit bad module names instead of starting over. + Add tests and delete the two files combined into the new one. -- bpo-25935: Garbage collector now breaks reference loops with OrderedDict. +- Issue #27372: Test_idle no longer changes the locale. -- bpo-16620: Fixed AttributeError in msilib.Directory.glob(). +- Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names. -- bpo-26013: Added compatibility with broken protocol 2 pickles created in - old Python 3 versions (3.4.3 and lower). +- Issue #27245: IDLE: Cleanly delete custom themes and key bindings. + Previously, when IDLE was started from a console or by import, a cascade + of warnings was emitted. Patch by Serhiy Storchaka. -- bpo-25850: Use cross-compilation by default for 64-bit Windows. +- Issue #24137: Run IDLE, test_idle, and htest with tkinter default root + disabled. Fix code and tests that fail with this restriction. Fix htests to + not create a second and redundant root and mainloop. -- bpo-17633: Improve zipimport's support for namespace packages. +- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import. -- bpo-24705: Fix sysconfig._parse_makefile not expanding ${} vars appearing - before $() vars. +C API +----- -- bpo-22138: Fix mock.patch behavior when patching descriptors. Restore - original values after patching. Patch contributed by Sean McCully. +- Issue #26754: PyUnicode_FSDecoder() accepted a filename argument encoded as + an iterable of integers. Now only strings and byte-like objects are accepted. -- bpo-25672: In the ssl module, enable the SSL_MODE_RELEASE_BUFFERS mode - option if it is safe to do so. +Build +----- -- bpo-26012: Don't traverse into symlinks for ``**`` pattern in - pathlib.Path.[r]glob(). +- Issue #28066: Fix the logic that searches build directories for generated + include files when building outside the source tree. -- bpo-24120: Ignore PermissionError when traversing a tree with - pathlib.Path.[r]glob(). Patch by Ulrich Petri. +- Issue #27442: Expose the Android API level that python was built against, in + sysconfig.get_config_vars() as 'ANDROID_API_LEVEL'. -- bpo-25447: fileinput now uses sys.stdin as-is if it does not have a buffer - attribute (restores backward compatibility). +- Issue #27434: The interpreter that runs the cross-build, found in PATH, must + now be of the same feature version (e.g. 3.6) as the source being built. -- bpo-25447: Copying the lru_cache() wrapper object now always works, - independedly from the type of the wrapped object (by returning the - original object unchanged). +- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h. -- bpo-24103: Fixed possible use after free in ElementTree.XMLPullParser. +- Issue #23968: Rename the platform directory from plat-$(MACHDEP) to + plat-$(PLATFORM_TRIPLET). + Rename the config directory (LIBPL) from config-$(LDVERSION) to + config-$(LDVERSION)-$(PLATFORM_TRIPLET). + Install the platform specifc _sysconfigdata module into the platform + directory and rename it to include the ABIFLAGS. -- bpo-25860: os.fwalk() no longer skips remaining directories when error - occurs. Original patch by Samson Lee. +- Don't use largefile support for GNU/Hurd. -- bpo-25914: Fixed and simplified OrderedDict.__sizeof__. +Tools/Demos +----------- -- bpo-25902: Fixed various refcount issues in ElementTree iteration. +- Issue #27332: Fixed the type of the first argument of module-level functions + generated by Argument Clinic. Patch by Petr Viktorin. -- bpo-25717: Restore the previous behaviour of tolerating most fstat() - errors when opening files. This was a regression in 3.5a1, and stopped - anonymous temporary files from working in special cases. +- Issue #27418: Fixed Tools/importbench/importbench.py. -- bpo-24903: Fix regression in number of arguments compileall accepts when - '-d' is specified. The check on the number of arguments has been dropped - completely as it never worked correctly anyway. +Documentation +------------- -- bpo-25764: In the subprocess module, preserve any exception caused by - fork() failure when preexec_fn is used. +- Issue #19489: Moved the search box from the sidebar to the header and footer + of each page. Patch by Ammar Askar. -- bpo-6478: _strptime's regexp cache now is reset after changing timezone - with time.tzset(). +- Issue #27285: Update documentation to reflect the deprecation of ``pyvenv`` + and normalize on the term "virtual environment". Patch by Steve Piercy. -- bpo-14285: When executing a package with the "python -m package" option, - and package initialization fails, a proper traceback is now reported. The - "runpy" module now lets exceptions from package initialization pass back - to the caller, rather than raising ImportError. +Tests +----- -- bpo-19771: Also in runpy and the "-m" option, omit the irrelevant message - ". . . is a package and cannot be directly executed" if the package could - not even be initialized (e.g. due to a bad ``*.pyc`` file). +- Issue #27027: Added test.support.is_android that is True when this is an + Android build. -- bpo-25177: Fixed problem with the mean of very small and very large - numbers. As a side effect, statistics.mean and statistics.variance should - be significantly faster. -- bpo-25718: Fixed copying object with state with boolean value is false. +What's New in Python 3.6.0 alpha 2? +=================================== -- bpo-10131: Fixed deep copying of minidom documents. Based on patch by - Marian Ganisin. +*Release date: 2016-06-13* -- bpo-25725: Fixed a reference leak in pickle.loads() when unpickling - invalid data including tuple instructions. +Core and Builtins +----------------- -- bpo-25663: In the Readline completer, avoid listing duplicate global - names, and search the global namespace before searching builtins. +- Issue #27095: Simplified MAKE_FUNCTION and removed MAKE_CLOSURE opcodes. + Patch by Demur Rumed. -- bpo-25688: Fixed file leak in ElementTree.iterparse() raising an error. +- Issue #27190: Raise NotSupportedError if sqlite3 is older than 3.3.1. + Patch by Dave Sawyer. -- bpo-23914: Fixed SystemError raised by unpickler on broken pickle data. +- Issue #27286: Fixed compiling BUILD_MAP_UNPACK_WITH_CALL opcode. Calling + function with generalized unpacking (PEP 448) and conflicting keyword names + could cause undefined behavior. -- bpo-25691: Fixed crash on deleting ElementTree.Element attributes. +- Issue #27140: Added BUILD_CONST_KEY_MAP opcode. -- bpo-25624: ZipFile now always writes a ZIP_STORED header for directory - entries. Patch by Dingyuan Wang. +- Issue #27186: Add support for os.PathLike objects to open() (part of PEP 519). -- Skip getaddrinfo if host is already resolved. Patch by A. Jesse Jiryu - Davis. +- Issue #27066: Fixed SystemError if a custom opener (for open()) returns a + negative number without setting an exception. -- bpo-26050: Add asyncio.StreamReader.readuntil() method. Patch by Марк - Коренберг. +- Issue #26983: float() now always return an instance of exact float. + The deprecation warning is emitted if __float__ returns an instance of + a strict subclass of float. In a future versions of Python this can + be an error. -- bpo-25924: Avoid unnecessary serialization of getaddrinfo(3) calls on OS X - versions 10.5 or higher. Original patch by A. Jesse Jiryu Davis. +- Issue #27097: Python interpreter is now about 7% faster due to optimized + instruction decoding. Based on patch by Demur Rumed. -- bpo-26406: Avoid unnecessary serialization of getaddrinfo(3) calls on - current versions of OpenBSD and NetBSD. Patch by A. Jesse Jiryu Davis. +- Issue #26647: Python interpreter now uses 16-bit wordcode instead of bytecode. + Patch by Demur Rumed. -- bpo-26848: Fix asyncio/subprocess.communicate() to handle empty input. - Patch by Jack O'Connor. +- Issue #23275: Allow assigning to an empty target list in round brackets: + () = iterable. -- bpo-27040: Add loop.get_exception_handler method +- Issue #27243: Update the __aiter__ protocol: instead of returning + an awaitable that resolves to an asynchronous iterator, the asynchronous + iterator should be returned directly. Doing the former will trigger a + PendingDeprecationWarning. -- bpo-27041: asyncio: Add loop.create_future method -- bpo-27223: asyncio: Fix _read_ready and _write_ready to respect - _conn_lost. Patch by Łukasz Langa. +Library +------- -- bpo-22970: asyncio: Fix inconsistency cancelling Condition.wait. Patch by - David Coles. +- Comment out socket (SO_REUSEPORT) and posix (O_SHLOCK, O_EXLOCK) constants + exposed on the API which are not implemented on GNU/Hurd. They would not + work at runtime anyway. -IDLE ----- +- Issue #27025: Generated names for Tkinter widgets are now more meanful + and recognizirable. -- bpo-5124: Paste with text selected now replaces the selection on X11. This - matches how paste works on Windows, Mac, most modern Linux apps, and ttk - widgets. Original patch by Serhiy Storchaka. +- Issue #25455: Fixed crashes in repr of recursive ElementTree.Element and + functools.partial objects. -- bpo-24759: Make clear in idlelib.idle_test.__init__ that the directory is - a private implementation of test.test_idle and tool for maintainers. +- Issue #27294: Improved repr for Tkinter event objects. -- bpo-27196: Stop 'ThemeChanged' warnings when running IDLE tests. These - persisted after other warnings were suppressed in #20567. Apply Serhiy - Storchaka's update_idletasks solution to four test files. Record this - additional advice in idle_test/README.txt +- Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__. + Patch by Gareth Rees. -- bpo-20567: Revise idle_test/README.txt with advice about avoiding tk - warning messages from tests. Apply advice to several IDLE tests. +- [Security] Issue #26556: Update expat to 2.1.1, fixes CVE-2015-1283. -- bpo-27117: Make colorizer htest and turtledemo work with dark themes. Move - code for configuring text widget colors to a new function. +- [Security] Fix TLS stripping vulnerability in smtplib, CVE-2016-0772. + Reported by Team Oststrom. -- bpo-26673: When tk reports font size as 0, change to size 10. Such fonts - on Linux prevented the configuration dialog from opening. +- Issue #21386: Implement missing IPv4Address.is_global property. It was + documented since 07a5610bae9d. Initial patch by Roger Luethi. -- bpo-21939: Add test for IDLE's percolator. Original patch by Saimadhav - Heblikar. +- Issue #27029: Removed deprecated support of universal newlines mode from + ZipFile.open(). -- bpo-21676: Add test for IDLE's replace dialog. Original patch by Saimadhav - Heblikar. +- Issue #27030: Unknown escapes consisting of ``'\'`` and an ASCII letter in + regular expressions now are errors. The re.LOCALE flag now can be used + only with bytes patterns. -- bpo-18410: Add test for IDLE's search dialog. Original patch by Westley - Martínez. +- Issue #27186: Add os.PathLike support to DirEntry (part of PEP 519). + Initial patch by Jelle Zijlstra. -- bpo-21703: Add test for IDLE's undo delegator. Original patch by Saimadhav - Heblikar . +- Issue #20900: distutils register command now decodes HTTP responses + correctly. Initial patch by ingrid. -- bpo-27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks. +- Issue #27186: Add os.PathLike support to pathlib, removing its provisional + status (part of PEP 519). Initial patch by Dusty Phillips. -- bpo-23977: Add more asserts to test_delegator. +- Issue #27186: Add support for os.PathLike objects to os.fsencode() and + os.fsdecode() (part of PEP 519). -- bpo-20640: Add tests for idlelib.configHelpSourceEdit. Patch by Saimadhav - Heblikar. +- Issue #27186: Introduce os.PathLike and os.fspath() (part of PEP 519). -- In the 'IDLE-console differences' section of the IDLE doc, clarify how - running with IDLE affects sys.modules and the standard streams. +- A new version of typing.py provides several new classes and + features: @overload outside stubs, Reversible, DefaultDict, Text, + ContextManager, Type[], NewType(), TYPE_CHECKING, and numerous bug + fixes (note that some of the new features are not yet implemented in + mypy or other static analyzers). Also classes for PEP 492 + (Awaitable, AsyncIterable, AsyncIterator) have been added (in fact + they made it into 3.5.1 but were never mentioned). -- bpo-25507: fix incorrect change in IOBinding that prevented printing. - Augment IOBinding htest to include all major IOBinding functions. +- Issue #25738: Stop http.server.BaseHTTPRequestHandler.send_error() from + sending a message body for 205 Reset Content. Also, don't send Content + header fields in responses that don't have a body. Patch by Susumu + Koshiba. -- bpo-25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION - MARK in README.txt and open this and NEWS.txt with 'ascii'. Re-encode - CREDITS.txt to utf-8 and open it with 'utf-8'. +- Issue #21313: Fix the "platform" module to tolerate when sys.version + contains truncated build information. -Documentation -------------- +- [Security] Issue #26839: On Linux, :func:`os.urandom` now calls + ``getrandom()`` with ``GRND_NONBLOCK`` to fall back on reading + ``/dev/urandom`` if the urandom entropy pool is not initialized yet. Patch + written by Colm Buckley. -- bpo-19489: Moved the search box from the sidebar to the header and footer - of each page. Patch by Ammar Askar. +- Issue #23883: Added missing APIs to __all__ to match the documented APIs + for the following modules: cgi, mailbox, mimetypes, plistlib and smtpd. + Patches by Jacek Kołodziej. -- bpo-24136: Document the new PEP 448 unpacking syntax of 3.5. +- Issue #27164: In the zlib module, allow decompressing raw Deflate streams + with a predefined zdict. Based on patch by Xiang Zhang. + +- Issue #24291: Fix wsgiref.simple_server.WSGIRequestHandler to completely + write data to the client. Previously it could do partial writes and + truncate data. Also, wsgiref.handler.ServerHandler can now handle stdout + doing partial writes, but this is deprecated. -- bpo-26736: Used HTTPS for external links in the documentation if possible. +- Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig. -- bpo-6953: Rework the Readline module documentation to group related - functions together, and add more details such as what underlying Readline - functions and variables are accessed. +- Issue #19611: :mod:`inspect` now reports the implicit ``.0`` parameters + generated by the compiler for comprehension and generator expression scopes + as if they were positional-only parameters called ``implicit0``. + Patch by Jelle Zijlstra. -- bpo-23606: Adds note to ctypes documentation regarding cdll.msvcrt. +- Issue #26809: Add ``__all__`` to :mod:`string`. Patch by Emanuel Barry. -- bpo-25500: Fix documentation to not claim that __import__ is searched for - in the global scope. +- Issue #26373: subprocess.Popen.communicate now correctly ignores + BrokenPipeError when the child process dies before .communicate() + is called in more/all circumstances. -- bpo-26014: Update 3.x packaging documentation: * "See also" links to the - new docs are now provided in the legacy pages * links to setuptools - documentation have been updated +- signal, socket, and ssl module IntEnum constant name lookups now return a + consistent name for values having multiple names. Ex: signal.Signals(6) + now refers to itself as signal.SIGALRM rather than flipping between that + and signal.SIGIOT based on the interpreter's hash randomization seed. -Tests ------ +- Issue #27167: Clarify the subprocess.CalledProcessError error message text + when the child process died due to a signal. -- bpo-21916: Added tests for the turtle module. Patch by ingrid, Gregory - Loyse and Jelle Zijlstra. +- Issue #25931: Don't define socketserver.Forking* names on platforms such + as Windows that do not support os.fork(). -- bpo-26523: The multiprocessing thread pool (multiprocessing.dummy.Pool) - was untested. +- Issue #21776: distutils.upload now correctly handles HTTPError. + Initial patch by Claudiu Popa. -- bpo-26015: Added new tests for pickling iterators of mutable sequences. +- Issue #26526: Replace custom parse tree validation in the parser + module with a simple DFA validator. -- bpo-26325: Added test.support.check_no_resource_warning() to check that no - ResourceWarning is emitted. +- Issue #27114: Fix SSLContext._load_windows_store_certs fails with + PermissionError -- bpo-25940: Changed test_ssl to use self-signed.pythontest.net. This - avoids relying on svn.python.org, which recently changed root certificate. +- Issue #18383: Avoid creating duplicate filters when using filterwarnings + and simplefilter. Based on patch by Alex Shkop. -- bpo-25616: Tests for OrderedDict are extracted from test_collections into - separate file test_ordered_dict. +- Issue #23026: winreg.QueryValueEx() now return an integer for REG_QWORD type. -- bpo-26583: Skip test_timestamp_overflow in test_import if bytecode files - cannot be written. +- Issue #26741: subprocess.Popen destructor now emits a ResourceWarning warning + if the child process is still running. -Build ------ +- Issue #27056: Optimize pickle.load() and pickle.loads(), up to 10% faster + to deserialize a lot of small objects. -- bpo-26884: Fix linking extension modules for cross builds. Patch by Xavier - de Gaye. +- Issue #21271: New keyword only parameters in reset_mock call. -- bpo-22359: Disable the rules for running _freeze_importlib and pgen when - cross- compiling. The output of these programs is normally saved with the - source code anyway, and is still regenerated when doing a native build. - Patch by Xavier de Gaye. +IDLE +---- -- bpo-27229: Fix the cross-compiling pgen rule for in-tree builds. Patch by - Xavier de Gaye. +- Issue #5124: Paste with text selected now replaces the selection on X11. + This matches how paste works on Windows, Mac, most modern Linux apps, + and ttk widgets. Original patch by Serhiy Storchaka. -- bpo-21668: Link audioop, _datetime, _ctypes_test modules to libm, except - on Mac OS X. Patch written by Xavier de Gaye. +- Issue #24750: Switch all scrollbars in IDLE to ttk versions. + Where needed, minimal tests are added to cover changes. -- bpo-25702: A --with-lto configure option has been added that will enable - link time optimizations at build time during a make profile-opt. Some - compilers and toolchains are known to not produce stable code when using - LTO, be sure to test things thoroughly before relying on it. It can - provide a few % speed up over profile-opt alone. +- Issue #24759: IDLE requires tk 8.5 and availability ttk widgets. + Delete now unneeded tk version tests and code for older versions. + Add test for IDLE syntax colorizoer. -- bpo-26624: Adds validation of ucrtbase[d].dll version with warning for old - versions. +- Issue #27239: idlelib.macosx.isXyzTk functions initialize as needed. -- bpo-17603: Avoid error about nonexistant fileblocks.o file by using a - lower-level check for st_blocks in struct stat. +- Issue #27262: move Aqua unbinding code, which enable context menus, to maxosx. -- bpo-26079: Fixing the build output folder for tix-8.4.3.6. Patch by Bjoern - Thiel. +- Issue #24759: Make clear in idlelib.idle_test.__init__ that the directory + is a private implementation of test.test_idle and tool for maintainers. -- bpo-26465: Update Windows builds to use OpenSSL 1.0.2g. +- Issue #27196: Stop 'ThemeChanged' warnings when running IDLE tests. + These persisted after other warnings were suppressed in #20567. + Apply Serhiy Storchaka's update_idletasks solution to four test files. + Record this additional advice in idle_test/README.txt -- bpo-24421: Compile Modules/_math.c once, before building extensions. - Previously it could fail to compile properly if the math and cmath builds - were concurrent. +- Issue #20567: Revise idle_test/README.txt with advice about avoiding + tk warning messages from tests. Apply advice to several IDLE tests. -- bpo-25348: Added ``--pgo`` and ``--pgo-job`` arguments to - ``PCbuild\build.bat`` for building with Profile-Guided Optimization. The - old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls - ``PCbuild\build.bat --pgo %*``. +- Issue #24225: Update idlelib/README.txt with new file names + and event handlers. -- bpo-25827: Add support for building with ICC to ``configure``, including a - new ``--with-icc`` flag. +- Issue #27156: Remove obsolete code not used by IDLE. Replacements: + 1. help.txt, replaced by help.html, is out-of-date and should not be used. + Its dedicated viewer has be replaced by the html viewer in help.py. + 2. ``import idlever; I = idlever.IDLE_VERSION`` is the same as + ``import sys; I = version[:version.index(' ')]`` + 3. After ``ob = stackviewer.VariablesTreeItem(*args)``, + ``ob.keys() == list(ob.object.keys)``. + 4. In macosc, runningAsOSXAPP == isAquaTk; idCarbonAquaTk == isCarbonTk -- bpo-25696: Fix installation of Python on UNIX with make -j9. +- Issue #27117: Make colorizer htest and turtledemo work with dark themes. + Move code for configuring text widget colors to a new function. -- bpo-26930: Update OS X 10.5+ 32-bit-only installer to build and link with - OpenSSL 1.0.2h. +- Issue #24225: Rename many `idlelib/*.py` and `idle_test/test_*.py` files. + Edit files to replace old names with new names when the old name + referred to the module rather than the class it contained. + See the issue and IDLE section in What's New in 3.6 for more. -- bpo-26268: Update Windows builds to use OpenSSL 1.0.2f. +- Issue #26673: When tk reports font size as 0, change to size 10. + Such fonts on Linux prevented the configuration dialog from opening. -- bpo-25136: Support Apple Xcode 7's new textual SDK stub libraries. +- Issue #21939: Add test for IDLE's percolator. + Original patch by Saimadhav Heblikar. -- bpo-24324: Do not enable unreachable code warnings when using gcc as the - option does not work correctly in older versions of gcc and has been - silently removed as of gcc-4.5. +- Issue #21676: Add test for IDLE's replace dialog. + Original patch by Saimadhav Heblikar. -Windows -------- +- Issue #18410: Add test for IDLE's search dialog. + Original patch by Westley Martínez. -- bpo-27053: Updates make_zip.py to correctly generate library ZIP file. +- Issue #21703: Add test for undo delegator. Patch mostly by + Saimadhav Heblikar . -- bpo-26268: Update the prepare_ssl.py script to handle OpenSSL releases - that don't include the contents of the include directory (that is, 1.0.2e - and later). +- Issue #27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks. -- bpo-26071: bdist_wininst created binaries fail to start and find 32bit - Python +- Issue #23977: Add more asserts to test_delegator. -- bpo-26073: Update the list of magic numbers in launcher +Documentation +------------- -- bpo-26065: Excludes venv from library when generating embeddable distro. +- Issue #16484: Change the default PYTHONDOCS URL to "https:", and fix the + resulting links to use lowercase. Patch by Sean Rodman, test by Kaushik + Nadikuditi. -Tools/Demos ------------ +- Issue #24136: Document the new PEP 448 unpacking syntax of 3.5. -- bpo-26799: Fix python-gdb.py: don't get C types once when the Python code - is loaded, but get C types on demand. The C types can change if python- - gdb.py is loaded before the Python executable. Patch written by Thomas - Ilsche. +- Issue #22558: Add remaining doc links to source code for Python-coded modules. + Patch by Yoni Lavi. -- bpo-26271: Fix the Freeze tool to properly use flags passed through - configure. Patch by Daniel Shaulov. +Tests +----- -- bpo-26489: Add dictionary unpacking support to Tools/parser/unparse.py. - Patch by Guo Ci Teo. +- Issue #25285: regrtest now uses subprocesses when the -j1 command line option + is used: each test file runs in a fresh child process. Before, the -j1 option + was ignored. -- bpo-26316: Fix variable name typo in Argument Clinic. +- Issue #25285: Tools/buildbot/test.bat script now uses -j1 by default to run + each test file in fresh child process. Windows ------- -- bpo-17500: Remove unused and outdated icons. (See also: - https://github.com/python/pythondotorg/issues/945) +- Issue #27064: The py.exe launcher now defaults to Python 3. + The Windows launcher ``py.exe`` no longer prefers an installed + Python 2 version over Python 3 by default when used interactively. +Build +----- -What's New in Python 3.5.1 final? -================================= - -*Release date: 2015-12-06* - -Core and Builtins ------------------ - -- bpo-25709: Fixed problem with in-place string concatenation and utf-8 - cache. - -Windows -------- - -- bpo-25715: Python 3.5.1 installer shows wrong upgrade path and incorrect - logic for launcher detection. - - -What's New in Python 3.5.1 release candidate 1? -=============================================== - -*Release date: 2015-11-22* - -Core and Builtins ------------------ - -- bpo-25630: Fix a possible segfault during argument parsing in functions - that accept filesystem paths. - -- bpo-23564: Fixed a partially broken sanity check in the _posixsubprocess - internals regarding how fds_to_pass were passed to the child. The bug had - no actual impact as subprocess.py already avoided it. - -- bpo-25388: Fixed tokenizer crash when processing undecodable source code - with a null byte. - -- bpo-25462: The hash of the key now is calculated only once in most - operations in C implementation of OrderedDict. - -- bpo-22995: Default implementation of __reduce__ and __reduce_ex__ now - rejects builtin types with not defined __new__. - -- bpo-25555: Fix parser and AST: fill lineno and col_offset of "arg" node - when compiling AST from Python objects. - -- bpo-24802: Avoid buffer overreads when int(), float(), compile(), exec() - and eval() are passed bytes-like objects. These objects are not - necessarily terminated by a null byte, but the functions assumed they - were. - -- bpo-24726: Fixed a crash and leaking NULL in repr() of OrderedDict that - was mutated by direct calls of dict methods. - -- bpo-25449: Iterating OrderedDict with keys with unstable hash now raises - KeyError in C implementations as well as in Python implementation. - -- bpo-25395: Fixed crash when highly nested OrderedDict structures were - garbage collected. - -- bpo-25274: sys.setrecursionlimit() now raises a RecursionError if the new - recursion limit is too low depending at the current recursion depth. - Modify also the "lower-water mark" formula to make it monotonic. This mark - is used to decide when the overflowed flag of the thread state is reset. - -- bpo-24402: Fix input() to prompt to the redirected stdout when - sys.stdout.fileno() fails. - -- bpo-24806: Prevent builtin types that are not allowed to be subclassed - from being subclassed through multiple inheritance. - -- bpo-24848: Fixed a number of bugs in UTF-7 decoding of misformed data. - -- bpo-25280: Import trace messages emitted in verbose (-v) mode are no - longer formatted twice. - -- bpo-25003: On Solaris 11.3 or newer, os.urandom() now uses the getrandom() - function instead of the getentropy() function. The getentropy() function - is blocking to generate very good quality entropy, os.urandom() doesn't - need such high- quality entropy. - -- bpo-25182: The stdprinter (used as sys.stderr before the io module is - imported at startup) now uses the backslashreplace error handler. - -- bpo-25131: Make the line number and column offset of set/dict literals and - comprehensions correspond to the opening brace. - -- bpo-25150: Hide the private _Py_atomic_xxx symbols from the public - Python.h header to fix a compilation error with OpenMP. - PyThreadState_GET() becomes an alias to PyThreadState_Get() to avoid ABI - incompatibilies. - -Library -------- - -- bpo-25626: Change three zlib functions to accept sizes that fit in - Py_ssize_t, but internally cap those sizes to UINT_MAX. This resolves a - regression in 3.5 where GzipFile.read() failed to read chunks larger than - 2 or 4 GiB. The change affects the zlib.Decompress.decompress() - max_length parameter, the zlib.decompress() bufsize parameter, and the - zlib.Decompress.flush() length parameter. - -- bpo-25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True) - when the OS gives priority to errors such as EACCES over EEXIST. - -- bpo-25593: Change semantics of EventLoop.stop() in asyncio. - -- bpo-6973: When we know a subprocess.Popen process has died, do not allow - the send_signal(), terminate(), or kill() methods to do anything as they - could potentially signal a different process. - -- bpo-25590: In the Readline completer, only call getattr() once per - attribute. - -- bpo-25498: Fix a crash when garbage-collecting ctypes objects created by - wrapping a memoryview. This was a regression made in 3.5a1. Based on - patch by Eryksun. - -- bpo-25584: Added "escape" to the __all__ list in the glob module. - -- bpo-25584: Fixed recursive glob() with patterns starting with ``**``. - -- bpo-25446: Fix regression in smtplib's AUTH LOGIN support. - -- bpo-18010: Fix the pydoc web server's module search function to handle - exceptions from importing packages. - -- bpo-25554: Got rid of circular references in regular expression parsing. - -- bpo-25510: fileinput.FileInput.readline() now returns b'' instead of '' at - the end if the FileInput was opened with binary mode. Patch by Ryosuke - Ito. - -- bpo-25503: Fixed inspect.getdoc() for inherited docstrings of properties. - Original patch by John Mark Vandenberg. - -- bpo-25515: Always use os.urandom as a source of randomness in uuid.uuid4. - -- bpo-21827: Fixed textwrap.dedent() for the case when largest common - whitespace is a substring of smallest leading whitespace. Based on patch - by Robert Li. - -- bpo-25447: The lru_cache() wrapper objects now can be copied and pickled - (by returning the original object unchanged). - -- bpo-25390: typing: Don't crash on Union[str, Pattern]. - -- bpo-25441: asyncio: Raise error from drain() when socket is closed. - -- bpo-25410: Cleaned up and fixed minor bugs in C implementation of - OrderedDict. - -- bpo-25411: Improved Unicode support in SMTPHandler through better use of - the email package. Thanks to user simon04 for the patch. +- Issue #27229: Fix the cross-compiling pgen rule for in-tree builds. Patch + by Xavier de Gaye. -- bpo-25407: Remove mentions of the formatter module being removed in Python - 3.6. +- Issue #26930: Update OS X 10.5+ 32-bit-only installer to build + and link with OpenSSL 1.0.2h. -- bpo-25406: Fixed a bug in C implementation of OrderedDict.move_to_end() - that caused segmentation fault or hang in iterating after moving several - items to the start of ordered dict. +Misc +---- -- bpo-25364: zipfile now works in threads disabled builds. +- Issue #17500, and https://github.com/python/pythondotorg/issues/945: Remove + unused and outdated icons. -- bpo-25328: smtpd's SMTPChannel now correctly raises a ValueError if both - decode_data and enable_SMTPUTF8 are set to true. +C API +----- -- bpo-25316: distutils raises OSError instead of DistutilsPlatformError when - MSVC is not installed. +- Issue #27186: Add the PyOS_FSPath() function (part of PEP 519). -- bpo-25380: Fixed protocol for the STACK_GLOBAL opcode in - pickletools.opcodes. +- Issue #26282: PyArg_ParseTupleAndKeywords() now supports positional-only + parameters. -- bpo-23972: Updates asyncio datagram create method allowing reuseport and - reuseaddr socket options to be set prior to binding the socket. Mirroring - the existing asyncio create_server method the reuseaddr option for - datagram sockets defaults to True if the O/S is 'posix' (except if the - platform is Cygwin). Patch by Chris Laws. +Tools/Demos +----------- -- bpo-25304: Add asyncio.run_coroutine_threadsafe(). This lets you submit a - coroutine to a loop from another thread, returning a - concurrent.futures.Future. By Vincent Michel. +- Issue #26282: Argument Clinic now supports positional-only and keyword + parameters in the same function. -- bpo-25232: Fix CGIRequestHandler to split the query from the URL at the - first question mark (?) rather than the last. Patch from Xiang Zhang. -- bpo-24657: Prevent CGIRequestHandler from collapsing slashes in the query - part of the URL as if it were a path. Patch from Xiang Zhang. +What's New in Python 3.6.0 alpha 1? +=================================== -- bpo-24483: C implementation of functools.lru_cache() now calculates key's - hash only once. +Release date: 2016-05-16 -- bpo-22958: Constructor and update method of weakref.WeakValueDictionary - now accept the self and the dict keyword arguments. +Core and Builtins +----------------- -- bpo-22609: Constructor of collections.UserDict now accepts the self - keyword argument. +- Issue #20041: Fixed TypeError when frame.f_trace is set to None. + Patch by Xavier de Gaye. -- bpo-25111: Fixed comparison of traceback.FrameSummary. +- Issue #26168: Fixed possible refleaks in failing Py_BuildValue() with the "N" + format unit. -- bpo-25262: Added support for BINBYTES8 opcode in Python implementation of - unpickler. Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8 - opcodes no longer silently ignored on 32-bit platforms in C - implementation. +- Issue #26991: Fix possible refleak when creating a function with annotations. -- bpo-25034: Fix string.Formatter problem with auto-numbering and nested - format_specs. Patch by Anthon van der Neut. +- Issue #27039: Fixed bytearray.remove() for values greater than 127. Based on + patch by Joe Jevnik. -- bpo-25233: Rewrite the guts of asyncio.Queue and asyncio.Semaphore to be - more understandable and correct. +- Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses. -- bpo-25203: Failed readline.set_completer_delims() no longer left the - module in inconsistent state. +- Issue #27005: Optimized the float.fromhex() class method for exact float. + It is now 2 times faster. -- bpo-23600: Default implementation of tzinfo.fromutc() was returning wrong - results in some cases. +- Issue #18531: Single var-keyword argument of dict subtype was passed + unscathed to the C-defined function. Now it is converted to exact dict. -- bpo-23329: Allow the ssl module to be built with older versions of - LibreSSL. +- Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL + pointer. -- Prevent overflow in _Unpickler_Read. +- Issue #20120: Use RawConfigParser for .pypirc parsing, + removing support for interpolation unintentionally added + with move to Python 3. Behavior no longer does any + interpolation in .pypirc files, matching behavior in Python + 2.7 and Setuptools 19.0. -- bpo-25047: The XML encoding declaration written by Element Tree now - respects the letter case given by the user. This restores the ability to - write encoding names in uppercase like "UTF-8", which worked in Python 2. +- Issue #26249: Memory functions of the :c:func:`PyMem_Malloc` domain + (:c:data:`PYMEM_DOMAIN_MEM`) now use the :ref:`pymalloc allocator ` + rather than system :c:func:`malloc`. Applications calling + :c:func:`PyMem_Malloc` without holding the GIL can now crash: use + ``PYTHONMALLOC=debug`` environment variable to validate the usage of memory + allocators in your application. -- bpo-25135: Make deque_clear() safer by emptying the deque before clearing. - This helps avoid possible reentrancy issues. +- Issue #26802: Optimize function calls only using unpacking like + ``func(*tuple)`` (no other positional argument, no keyword): avoid copying + the tuple. Patch written by Joe Jevnik. -- bpo-19143: platform module now reads Windows version from kernel32.dll to - avoid compatibility shims. +- Issue #26659: Make the builtin slice type support cycle collection. -- bpo-25092: Fix datetime.strftime() failure when errno was already set to - EINVAL. +- Issue #26718: super.__init__ no longer leaks memory if called multiple times. + NOTE: A direct call of super.__init__ is not endorsed! -- bpo-23517: Fix rounding in fromtimestamp() and utcfromtimestamp() methods - of datetime.datetime: microseconds are now rounded to nearest with ties - going to nearest even integer (ROUND_HALF_EVEN), instead of being rounding - towards minus infinity (ROUND_FLOOR). It's important that these methods - use the same rounding mode than datetime.timedelta to keep the property: - (datetime(1970,1,1) + timedelta(seconds=t)) == - datetime.utcfromtimestamp(t). It also the rounding mode used by - round(float) for example. +- Issue #27138: Fix the doc comment for FileFinder.find_spec(). -- bpo-25155: Fix datetime.datetime.now() and datetime.datetime.utcnow() on - Windows to support date after year 2038. It was a regression introduced in - Python 3.5.0. +- Issue #27147: Mention PEP 420 in the importlib docs. -- bpo-25108: Omitted internal frames in traceback functions print_stack(), - format_stack(), and extract_stack() called without arguments. +- Issue #25339: PYTHONIOENCODING now has priority over locale in setting the + error handler for stdin and stdout. -- bpo-25118: Fix a regression of Python 3.5.0 in os.waitpid() on Windows. +- Issue #26494: Fixed crash on iterating exhausting iterators. + Affected classes are generic sequence iterators, iterators of str, bytes, + bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding + views and os.scandir() iterator. -- bpo-24684: socket.socket.getaddrinfo() now calls - PyUnicode_AsEncodedString() instead of calling the encode() method of the - host, to handle correctly custom string with an encode() method which - doesn't return a byte string. The encoder of the IDNA codec is now called - directly instead of calling the encode() method of the string. +- Issue #26574: Optimize ``bytes.replace(b'', b'.')`` and + ``bytearray.replace(b'', b'.')``. Patch written by Josh Snider. -- bpo-25060: Correctly compute stack usage of the BUILD_MAP opcode. +- Issue #26581: If coding cookie is specified multiple times on a line in + Python source code file, only the first one is taken to account. -- bpo-24857: Comparing call_args to a long sequence now correctly returns a - boolean result instead of raising an exception. Patch by A Kaptur. +- Issue #19711: Add tests for reloading namespace packages. -- bpo-23144: Make sure that HTMLParser.feed() returns all the data, even - when convert_charrefs is True. +- Issue #21099: Switch applicable importlib tests to use PEP 451 API. -- bpo-24982: shutil.make_archive() with the "zip" format now adds entries - for directories (including empty directories) in ZIP file. +- Issue #26563: Debug hooks on Python memory allocators now raise a fatal + error if functions of the :c:func:`PyMem_Malloc` family are called without + holding the GIL. -- bpo-25019: Fixed a crash caused by setting non-string key of expat parser. - Based on patch by John Leitch. +- Issue #26564: On error, the debug hooks on Python memory allocators now use + the :mod:`tracemalloc` module to get the traceback where a memory block was + allocated. -- bpo-16180: Exit pdb if file has syntax error, instead of trapping user in - an infinite loop. Patch by Xavier de Gaye. +- Issue #26558: The debug hooks on Python memory allocator + :c:func:`PyObject_Malloc` now detect when functions are called without + holding the GIL. -- bpo-24891: Fix a race condition at Python startup if the file descriptor - of stdin (0), stdout (1) or stderr (2) is closed while Python is creating - sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set - to None if the creation of the object failed, instead of raising an - OSError exception. Initial patch written by Marco Paolini. +- Issue #26516: Add :envvar:`PYTHONMALLOC` environment variable to set the + Python memory allocators and/or install debug hooks. -- bpo-24992: Fix error handling and a race condition (related to garbage - collection) in collections.OrderedDict constructor. +- Issue #26516: The :c:func:`PyMem_SetupDebugHooks` function can now also be + used on Python compiled in release mode. -- bpo-24881: Fixed setting binary mode in Python implementation of FileIO on - Windows and Cygwin. Patch from Akira Li. +- Issue #26516: The :envvar:`PYTHONMALLOCSTATS` environment variable can now + also be used on Python compiled in release mode. It now has no effect if + set to an empty string. -- bpo-25578: Fix (another) memory leak in SSLSocket.getpeercer(). +- Issue #26516: In debug mode, debug hooks are now also installed on Python + memory allocators when Python is configured without pymalloc. -- bpo-25530: Disable the vulnerable SSLv3 protocol by default when creating - ssl.SSLContext. +- Issue #26464: Fix str.translate() when string is ASCII and first replacements + removes character, but next replacement uses a non-ASCII character or a + string longer than 1 character. Regression introduced in Python 3.5.0. -- bpo-25569: Fix memory leak in SSLSocket.getpeercert(). +- Issue #22836: Ensure exception reports from PyErr_Display() and + PyErr_WriteUnraisable() are sensible even when formatting them produces + secondary errors. This affects the reports produced by + sys.__excepthook__() and when __del__() raises an exception. -- bpo-25471: Sockets returned from accept() shouldn't appear to be - nonblocking. +- Issue #26302: Correct behavior to reject comma as a legal character for + cookie names. -- bpo-25319: When threading.Event is reinitialized, the underlying condition - should use a regular lock rather than a recursive lock. +- Issue #26136: Upgrade the warning when a generator raises StopIteration + from PendingDeprecationWarning to DeprecationWarning. Patch by Anish + Shah. -- bpo-21112: Fix regression in unittest.expectedFailure on subclasses. Patch - from Berker Peksag. +- Issue #26204: The compiler now ignores all constant statements: bytes, str, + int, float, complex, name constants (None, False, True), Ellipsis + and ast.Constant; not only str and int. For example, ``1.0`` is now ignored + in ``def f(): 1.0``. -- bpo-24764: cgi.FieldStorage.read_multi() now ignores the Content-Length - header in part headers. Patch written by Peter Landry and reviewed by - Pierre Quentel. +- Issue #4806: Avoid masking the original TypeError exception when using star + (*) unpacking in function calls. Based on patch by Hagen Fürstenau and + Daniel Urban. -- bpo-24913: Fix overrun error in deque.index(). Found by John Leitch and - Bryce Darling. +- Issue #26146: Add a new kind of AST node: ``ast.Constant``. It can be used + by external AST optimizers, but the compiler does not emit directly such + node. -- bpo-24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu. +- Issue #23601: Sped-up allocation of dict key objects by using Python's + small object allocator. (Contributed by Julian Taylor.) -- bpo-21159: Improve message in - configparser.InterpolationMissingOptionError. Patch from Łukasz Langa. +- Issue #18018: Import raises ImportError instead of SystemError if a relative + import is attempted without a known parent package. -- bpo-20362: Honour TestCase.longMessage correctly in assertRegex. Patch - from Ilia Kurenkov. +- Issue #25843: When compiling code, don't merge constants if they are equal + but have a different types. For example, ``f1, f2 = lambda: 1, lambda: 1.0`` + is now correctly compiled to two different functions: ``f1()`` returns ``1`` + (``int``) and ``f2()`` returns ``1.0`` (``float``), even if ``1`` and ``1.0`` + are equal. -- bpo-23572: Fixed functools.singledispatch on classes with falsy - metaclasses. Patch by Ethan Furman. +- Issue #26107: The format of the ``co_lnotab`` attribute of code objects + changes to support negative line number delta. -- asyncio: ensure_future() now accepts awaitable objects. +- Issue #26154: Add a new private _PyThreadState_UncheckedGet() function to get + the current Python thread state, but don't issue a fatal error if it is NULL. + This new function must be used instead of accessing directly the + _PyThreadState_Current variable. The variable is no more exposed since + Python 3.5.1 to hide the exact implementation of atomic C types, to avoid + compiler issues. -IDLE ----- +- Issue #25791: If __package__ != __spec__.parent or if neither __package__ or + __spec__ are defined then ImportWarning is raised. -- bpo-15348: Stop the debugger engine (normally in a user process) before - closing the debugger window (running in the IDLE process). This prevents - the RuntimeErrors that were being caught and ignored. +- Issue #22995: [UPDATE] Comment out the one of the pickleability tests in + _PyObject_GetState() due to regressions observed in Cython-based projects. -- bpo-24455: Prevent IDLE from hanging when a) closing the shell while the - debugger is active (15347); b) closing the debugger with the [X] button - (15348); and c) activating the debugger when already active (24455). The - patch by Mark Roseman does this by making two changes. 1. Suspend and - resume the gui.interaction method with the tcl vwait mechanism intended - for this purpose (instead of root.mainloop & .quit). 2. In gui.run, allow - any existing interaction to terminate first. +- Issue #25961: Disallowed null characters in the type name. -- Change 'The program' to 'Your program' in an IDLE 'kill program?' message - to make it clearer that the program referred to is the currently running - user program, not IDLE itself. +- Issue #25973: Fix segfault when an invalid nonlocal statement binds a name + starting with two underscores. -- bpo-24750: Improve the appearance of the IDLE editor window status bar. - Patch by Mark Roseman. +- Issue #22995: Instances of extension types with a state that aren't + subclasses of list or dict and haven't implemented any pickle-related + methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__, + or __getstate__), can no longer be pickled. Including memoryview. -- bpo-25313: Change the handling of new built-in text color themes to better - address the compatibility problem introduced by the addition of IDLE Dark. - Consistently use the revised idleConf.CurrentTheme everywhere in idlelib. +- Issue #20440: Massive replacing unsafe attribute setting code with special + macro Py_SETREF. -- bpo-24782: Extension configuration is now a tab in the IDLE Preferences - dialog rather than a separate dialog. The former tabs are now a sorted - list. Patch by Mark Roseman. +- Issue #25766: Special method __bytes__() now works in str subclasses. -- bpo-22726: Re-activate the config dialog help button with some content - about the other buttons and the new IDLE Dark theme. +- Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size. + This allows sys.getsize() to work correctly with their subclasses with + __slots__ defined. -- bpo-24820: IDLE now has an 'IDLE Dark' built-in text color theme. It is - more or less IDLE Classic inverted, with a cobalt blue background. - Strings, comments, keywords, ... are still green, red, orange, ... . To - use it with IDLEs released before November 2015, hit the 'Save as New - Custom Theme' button and enter a new name, such as 'Custom Dark'. The - custom theme will work with any IDLE release, and can be modified. +- Issue #25709: Fixed problem with in-place string concatenation and utf-8 + cache. -- bpo-25224: README.txt is now an idlelib index for IDLE developers and - curious users. The previous user content is now in the IDLE doc chapter. - 'IDLE' now means 'Integrated Development and Learning Environment'. +- Issue #5319: New Py_FinalizeEx() API allowing Python to set an exit status + of 120 on failure to flush buffered streams. -- bpo-24820: Users can now set breakpoint colors in Settings -> Custom - Highlighting. Original patch by Mark Roseman. +- Issue #25485: telnetlib.Telnet is now a context manager. -- bpo-24972: Inactive selection background now matches active selection - background, as configured by users, on all systems. Found items are now - always highlighted on Windows. Initial patch by Mark Roseman. +- Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside + __getattr__. -- bpo-24570: Idle: make calltip and completion boxes appear on Macs affected - by a tk regression. Initial patch by Mark Roseman. +- Issue #24731: Fixed crash on converting objects with special methods + __bytes__, __trunc__, and __float__ returning instances of subclasses of + bytes, int, and float to subclasses of bytes, int, and float correspondingly. -- bpo-24988: Idle ScrolledList context menus (used in debugger) now work on - Mac Aqua. Patch by Mark Roseman. +- Issue #25630: Fix a possible segfault during argument parsing in functions + that accept filesystem paths. -- bpo-24801: Make right-click for context menu work on Mac Aqua. Patch by - Mark Roseman. +- Issue #23564: Fixed a partially broken sanity check in the _posixsubprocess + internals regarding how fds_to_pass were passed to the child. The bug had + no actual impact as subprocess.py already avoided it. -- bpo-25173: Associate tkinter messageboxes with a specific widget. For Mac - OSX, make them a 'sheet'. Patch by Mark Roseman. +- Issue #25388: Fixed tokenizer crash when processing undecodable source code + with a null byte. -- bpo-25198: Enhance the initial html viewer now used for Idle Help. * - Properly indent fixed-pitch text (patch by Mark Roseman). * Give code - snippet a very Sphinx- like light blueish-gray background. * Re-use - initial width and height set by users for shell and editor. * When the - Table of Contents (TOC) menu is used, put the section header at the top of - the screen. +- Issue #25462: The hash of the key now is calculated only once in most + operations in C implementation of OrderedDict. -- bpo-25225: Condense and rewrite Idle doc section on text colors. +- Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now + rejects builtin types with not defined __new__. -- bpo-21995: Explain some differences between IDLE and console Python. +- Issue #24802: Avoid buffer overreads when int(), float(), compile(), exec() + and eval() are passed bytes-like objects. These objects are not + necessarily terminated by a null byte, but the functions assumed they were. -- bpo-22820: Explain need for *print* when running file from Idle editor. +- Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node + when compiling AST from Python objects. -- bpo-25224: Doc: augment Idle feature list and no-subprocess section. +- Issue #24726: Fixed a crash and leaking NULL in repr() of OrderedDict that + was mutated by direct calls of dict methods. -- bpo-25219: Update doc for Idle command line options. Some were missing and - notes were not correct. +- Issue #25449: Iterating OrderedDict with keys with unstable hash now raises + KeyError in C implementations as well as in Python implementation. -- bpo-24861: Most of idlelib is private and subject to change. Use - idleib.idle.* to start Idle. See idlelib.__init__.__doc__. +- Issue #25395: Fixed crash when highly nested OrderedDict structures were + garbage collected. -- bpo-25199: Idle: add synchronization comments for future maintainers. +- Issue #25401: Optimize bytes.fromhex() and bytearray.fromhex(): they are now + between 2x and 3.5x faster. -- bpo-16893: Replace help.txt with help.html for Idle doc display. The new - idlelib/help.html is rstripped Doc/build/html/library/idle.html. It looks - better than help.txt and will better document Idle as released. The - tkinter html viewer that works for this file was written by Mark Roseman. - The now unused EditorWindow.HelpDialog class and helt.txt file are - deprecated. +- Issue #25399: Optimize bytearray % args using the new private _PyBytesWriter + API. Formatting is now between 2.5 and 5 times faster. -- bpo-24199: Deprecate unused idlelib.idlever with possible removal in 3.6. +- Issue #25274: sys.setrecursionlimit() now raises a RecursionError if the new + recursion limit is too low depending at the current recursion depth. Modify + also the "lower-water mark" formula to make it monotonic. This mark is used + to decide when the overflowed flag of the thread state is reset. -- bpo-24790: Remove extraneous code (which also create 2 & 3 conflicts). +- Issue #24402: Fix input() to prompt to the redirected stdout when + sys.stdout.fileno() fails. -Documentation -------------- +- Issue #25349: Optimize bytes % args using the new private _PyBytesWriter API. + Formatting is now up to 2 times faster. -- bpo-22558: Add remaining doc links to source code for Python-coded - modules. Patch by Yoni Lavi. +- Issue #24806: Prevent builtin types that are not allowed to be subclassed from + being subclassed through multiple inheritance. -- bpo-12067: Rewrite Comparisons section in the Expressions chapter of the - language reference. Some of the details of comparing mixed types were - incorrect or ambiguous. NotImplemented is only relevant at a lower level - than the Expressions chapter. Added details of comparing range() objects, - and default behaviour and consistency suggestions for user-defined - classes. Patch from Andy Maier. +- Issue #25301: The UTF-8 decoder is now up to 15 times as fast for error + handlers: ``ignore``, ``replace`` and ``surrogateescape``. -- bpo-24952: Clarify the default size argument of stack_size() in the - "threading" and "_thread" modules. Patch from Mattip. +- Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data. -- bpo-23725: Overhaul tempfile docs. Note deprecated status of mktemp. Patch - from Zbigniew Jędrzejewski-Szmek. +- Issue #25267: The UTF-8 encoder is now up to 75 times as fast for error + handlers: ``ignore``, ``replace``, ``surrogateescape``, ``surrogatepass``. + Patch co-written with Serhiy Storchaka. -- bpo-24808: Update the types of some PyTypeObject fields. Patch by Joseph - Weston. +- Issue #25280: Import trace messages emitted in verbose (-v) mode are no + longer formatted twice. -- bpo-22812: Fix unittest discovery examples. Patch from Pam McA'Nulty. +- Issue #25227: Optimize ASCII and latin1 encoders with the ``surrogateescape`` + error handler: the encoders are now up to 3 times as fast. Initial patch + written by Serhiy Storchaka. -Tests ------ +- Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the + getrandom() function instead of the getentropy() function. The getentropy() + function is blocking to generate very good quality entropy, os.urandom() + doesn't need such high-quality entropy. -- bpo-25449: Added tests for OrderedDict subclasses. +- Issue #9232: Modify Python's grammar to allow trailing commas in the + argument list of a function declaration. For example, "def f(\*, a = + 3,): pass" is now legal. Patch from Mark Dickinson. -- bpo-25099: Make test_compileall not fail when an entry on sys.path cannot - be written to (commonly seen in administrative installs on Windows). +- Issue #24965: Implement PEP 498 "Literal String Interpolation". This + allows you to embed expressions inside f-strings, which are + converted to normal strings at run time. Given x=3, then + f'value={x}' == 'value=3'. Patch by Eric V. Smith. -- bpo-23919: Prevents assert dialogs appearing in the test suite. +- Issue #26478: Fix semantic bugs when using binary operators with dictionary + views and tuples. -- ``PCbuild\rt.bat`` now accepts an unlimited number of arguments to pass - along to regrtest.py. Previously there was a limit of 9. +- Issue #26171: Fix possible integer overflow and heap corruption in + zipimporter.get_data(). -Build ------ +- Issue #25660: Fix TAB key behaviour in REPL with readline. -- bpo-24915: Add LLVM support for PGO builds and use the test suite to - generate the profile data. Initial patch by Alecsandru Patrascu of Intel. +- Issue #26288: Optimize PyLong_AsDouble. -- bpo-24910: Windows MSIs now have unique display names. +- Issues #26289 and #26315: Optimize floor and modulo division for + single-digit longs. Microbenchmarks show 2-2.5x improvement. Built-in + 'divmod' function is now also ~10% faster. -- bpo-24986: It is now possible to build Python on Windows without errors - when external libraries are not available. +- Issue #25887: Raise a RuntimeError when a coroutine object is awaited + more than once. -Windows +Library ------- -- bpo-25450: Updates shortcuts to start Python in installation directory. - -- bpo-25164: Changes default all-users install directory to match per-user - directory. - -- bpo-25143: Improves installer error messages for unsupported platforms. - -- bpo-25163: Display correct directory in installer when using non-default - settings. - -- bpo-25361: Disables use of SSE2 instructions in Windows 32-bit build - -- bpo-25089: Adds logging to installer for case where launcher is not - selected on upgrade. +- Issue #27057: Fix os.set_inheritable() on Android, ioctl() is blocked by + SELinux and fails with EACCESS. The function now falls back to fcntl(). + Patch written by Michał Bednarski. -- bpo-25165: Windows uninstallation should not remove launcher if other - versions remain +- Issue #27014: Fix infinite recursion using typing.py. Thanks to Kalle Tuure! -- bpo-25112: py.exe launcher is missing icons +- Issue #27031: Removed dummy methods in Tkinter widget classes: tk_menuBar() + and tk_bindForTraversal(). -- bpo-25102: Windows installer does not precompile for -O or -OO. +- Issue #14132: Fix urllib.request redirect handling when the target only has + a query string. Original fix by Ján Janech. -- bpo-25081: Makes Back button in installer go back to upgrade page when - upgrading. +- Issue #17214: The "urllib.request" module now percent-encodes non-ASCII + bytes found in redirect target URLs. Some servers send Location header + fields with non-ASCII bytes, but "http.client" requires the request target + to be ASCII-encodable, otherwise a UnicodeEncodeError is raised. Based on + patch by Christian Heimes. -- bpo-25091: Increases font size of the installer. +- Issue #27033: The default value of the decode_data parameter for + smtpd.SMTPChannel and smtpd.SMTPServer constructors is changed to False. -- bpo-25126: Clarifies that the non-web installer will download some - components. +- Issue #27034: Removed deprecated class asynchat.fifo. -- bpo-25213: Restores requestedExecutionLevel to manifest to disable UAC - virtualization. +- Issue #26870: Added readline.set_auto_history(), which can stop entries + being automatically added to the history list. Based on patch by Tyler + Crompton. -- bpo-25022: Removed very outdated PC/example_nt/ directory. +- Issue #26039: zipfile.ZipFile.open() can now be used to write data into a ZIP + file, as well as for extracting data. Patch by Thomas Kluyver. -Tools/Demos ------------ +- Issue #26892: Honor debuglevel flag in urllib.request.HTTPHandler. Patch + contributed by Chi Hsuan Yen. -- bpo-25440: Fix output of python-config --extension-suffix. +- Issue #22274: In the subprocess module, allow stderr to be redirected to + stdout even when stdout is not redirected. Patch by Akira Li. +- Issue #26807: mock_open 'files' no longer error on readline at end of file. + Patch from Yolanda Robla. -What's New in Python 3.5.0 final? -================================= +- Issue #25745: Fixed leaking a userptr in curses panel destructor. -*Release date: 2015-09-13* +- Issue #26977: Removed unnecessary, and ignored, call to sum of squares helper + in statistics.pvariance. -Build ------ +- Issue #26002: Use bisect in statistics.median instead of a linear search. + Patch by Upendra Kuma. -- bpo-25071: Windows installer should not require TargetDir parameter when - installing quietly. +- Issue #25974: Make use of new Decimal.as_integer_ratio() method in statistics + module. Patch by Stefan Krah. +- Issue #26996: Add secrets module as described in PEP 506. -What's New in Python 3.5.0 release candidate 4? -=============================================== +- Issue #26881: The modulefinder module now supports extended opcode arguments. -*Release date: 2015-09-09* +- Issue #23815: Fixed crashes related to directly created instances of types in + _tkinter and curses.panel modules. -Library -------- +- Issue #17765: weakref.ref() no longer silently ignores keyword arguments. + Patch by Georg Brandl. -- bpo-25029: Fixes MemoryError in test_strptime. +- Issue #26873: xmlrpc now raises ResponseError on unsupported type tags + instead of silently return incorrect result. -Build ------ +- Issue #26915: The __contains__ methods in the collections ABCs now check + for identity before checking equality. This better matches the behavior + of the concrete classes, allows sensible handling of NaNs, and makes it + easier to reason about container invariants. -- bpo-25027: Reverts partial-static build options and adds vcruntime140.dll - to Windows installation. +- Issue #26711: Fixed the comparison of plistlib.Data with other types. +- Issue #24114: Fix an uninitialized variable in `ctypes.util`. -What's New in Python 3.5.0 release candidate 3? -=============================================== + The bug only occurs on SunOS when the ctypes implementation searches + for the `crle` program. Patch by Xiang Zhang. Tested on SunOS by + Kees Bos. -*Release date: 2015-09-07* +- Issue #26864: In urllib.request, change the proxy bypass host checking + against no_proxy to be case-insensitive, and to not match unrelated host + names that happen to have a bypassed hostname as a suffix. Patch by Xiang + Zhang. -Core and Builtins ------------------ +- Issue #24902: Print server URL on http.server startup. Initial patch by + Felix Kaiser. -- bpo-24305: Prevent import subsystem stack frames from being counted by the - warnings.warn(stacklevel=) parameter. +- Issue #25788: fileinput.hook_encoded() now supports an "errors" argument + for passing to open. Original patch by Joseph Hackman. -- bpo-24912: Prevent __class__ assignment to immutable built-in objects. +- Issue #26634: recursive_repr() now sets __qualname__ of wrapper. Patch by + Xiang Zhang. -- bpo-24975: Fix AST compilation for PEP 448 syntax. +- Issue #26804: urllib.request will prefer lower_case proxy environment + variables over UPPER_CASE or Mixed_Case ones. Patch contributed by Hans-Peter + Jansen. -Library -------- +- Issue #26837: assertSequenceEqual() now correctly outputs non-stringified + differing items (like bytes in the -b mode). This affects assertListEqual() + and assertTupleEqual(). -- bpo-24917: time_strftime() buffer over-read. +- Issue #26041: Remove "will be removed in Python 3.7" from deprecation + messages of platform.dist() and platform.linux_distribution(). + Patch by Kumaripaba Miyurusara Athukorala. -- bpo-24748: To resolve a compatibility problem found with py2exe and - pywin32, imp.load_dynamic() once again ignores previously loaded modules - to support Python modules replacing themselves with extension modules. - Patch by Petr Viktorin. +- Issue #26822: itemgetter, attrgetter and methodcaller objects no longer + silently ignore keyword arguments. -- bpo-24635: Fixed a bug in typing.py where isinstance([], typing.Iterable) - would return True once, then False on subsequent calls. +- Issue #26733: Disassembling a class now disassembles class and static methods. + Patch by Xiang Zhang. -- bpo-24989: Fixed buffer overread in BytesIO.readline() if a position is - set beyond size. Based on patch by John Leitch. +- Issue #26801: Fix error handling in :func:`shutil.get_terminal_size`, catch + :exc:`AttributeError` instead of :exc:`NameError`. Patch written by Emanuel + Barry. -- bpo-24913: Fix overrun error in deque.index(). Found by John Leitch and - Bryce Darling. +- Issue #24838: tarfile's ustar and gnu formats now correctly calculate name + and link field limits for multibyte character encodings like utf-8. +- [Security] Issue #26657: Fix directory traversal vulnerability with + http.server on Windows. This fixes a regression that was introduced in + 3.3.4rc1 and 3.4.0rc1. Based on patch by Philipp Hagemeister. -What's New in Python 3.5.0 release candidate 2? -=============================================== +- Issue #26717: Stop encoding Latin-1-ized WSGI paths with UTF-8. Patch by + Anthony Sottile. -*Release date: 2015-08-25* +- Issue #26782: Add STARTUPINFO to subprocess.__all__ on Windows. -Core and Builtins ------------------ - -- bpo-24769: Interpreter now starts properly when dynamic loading is - disabled. Patch by Petr Viktorin. - -- bpo-21167: NAN operations are now handled correctly when python is - compiled with ICC even if -fp-model strict is not specified. - -- bpo-24492: A "package" lacking a __name__ attribute when trying to perform - a ``from .. import ...`` statement will trigger an ImportError instead of - an AttributeError. - -Library -------- - -- bpo-24847: Removes vcruntime140.dll dependency from Tcl/Tk. - -- bpo-24839: platform._syscmd_ver raises DeprecationWarning - -- bpo-24867: Fix Task.get_stack() for 'async def' coroutines - - -What's New in Python 3.5.0 release candidate 1? -=============================================== - -*Release date: 2015-08-09* - -Core and Builtins ------------------ - -- bpo-24667: Resize odict in all cases that the underlying dict resizes. - -Library -------- - -- bpo-24824: Signatures of codecs.encode() and codecs.decode() now are - compatible with pydoc. - -- bpo-24634: Importing uuid should not try to load libc on Windows - -- bpo-24798: _msvccompiler.py doesn't properly support manifests - -- bpo-4395: Better testing and documentation of binary operators. Patch by - Martin Panter. - -- bpo-23973: Update typing.py from GitHub repo. - -- bpo-23004: mock_open() now reads binary data correctly when the type of - read_data is bytes. Initial patch by Aaron Hill. - -- bpo-23888: Handle fractional time in cookie expiry. Patch by ssh. - -- bpo-23652: Make it possible to compile the select module against the libc - headers from the Linux Standard Base, which do not include some EPOLL - macros. Patch by Matt Frank. - -- bpo-22932: Fix timezones in email.utils.formatdate. Patch from Dmitry - Shachnev. - -- bpo-23779: imaplib raises TypeError if authenticator tries to abort. Patch - from Craig Holmquist. - -- bpo-23319: Fix ctypes.BigEndianStructure, swap correctly bytes. Patch - written by Matthieu Gautier. - -- bpo-23254: Document how to close the TCPServer listening socket. Patch - from Martin Panter. - -- bpo-19450: Update Windows and OS X installer builds to use SQLite 3.8.11. - -- bpo-17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella. - -- bpo-24791: Fix grammar regression for call syntax: 'g(\*a or b)'. - -IDLE ----- - -- bpo-23672: Allow Idle to edit and run files with astral chars in name. - Patch by Mohd Sanad Zaki Rizvi. - -- bpo-24745: Idle editor default font. Switch from Courier to platform- - sensitive TkFixedFont. This should not affect current customized font - selections. If there is a problem, edit $HOME/.idlerc/config-main.cfg and - remove 'fontxxx' entries from [Editor Window]. Patch by Mark Roseman. - -- bpo-21192: Idle editor. When a file is run, put its name in the restart - bar. Do not print false prompts. Original patch by Adnan Umer. - -- bpo-13884: Idle menus. Remove tearoff lines. Patch by Roger Serwy. - -Documentation -------------- - -- bpo-24129: Clarify the reference documentation for name resolution. This - includes removing the assumption that readers will be familiar with the - name resolution scheme Python used prior to the introduction of lexical - scoping for function namespaces. Patch by Ivan Levkivskyi. - -- bpo-20769: Improve reload() docs. Patch by Dorian Pula. - -- bpo-23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. - -- bpo-24729: Correct IO tutorial to match implementation regarding encoding - parameter to open function. - -Tests ------ - -- bpo-24751: When running regrtest with the ``-w`` command line option, a - test run is no longer marked as a failure if all tests succeed when re- - run. - - -What's New in Python 3.5.0 beta 4? -================================== - -*Release date: 2015-07-26* - -Core and Builtins ------------------ - -- bpo-23573: Restored optimization of bytes.rfind() and bytearray.rfind() - for single-byte argument on Linux. - -- bpo-24569: Make PEP 448 dictionary evaluation more consistent. - -- bpo-24583: Fix crash when set is mutated while being updated. - -- bpo-24407: Fix crash when dict is mutated while being updated. - -- bpo-24619: New approach for tokenizing async/await. As a consequence, it - is now possible to have one-line 'async def foo(): await ..' functions. - -- bpo-24687: Plug refleak on SyntaxError in function parameters annotations. - -- bpo-15944: memoryview: Allow arbitrary formats when casting to bytes. - Patch by Martin Panter. - -Library -------- - -- bpo-23441: rcompleter now prints a tab character instead of displaying - possible completions for an empty word. Initial patch by Martin Sekera. - -- bpo-24683: Fixed crashes in _json functions called with arguments of - inappropriate type. - -- bpo-21697: shutil.copytree() now correctly handles symbolic links that - point to directories. Patch by Eduardo Seabra and Thomas Kluyver. - -- bpo-14373: Fixed segmentation fault when gc.collect() is called during - constructing lru_cache (C implementation). - -- bpo-24695: Fix a regression in traceback.print_exception(). If - exc_traceback is None we shouldn't print a traceback header like described - in the documentation. - -- bpo-24620: Random.setstate() now validates the value of state last - element. - -- bpo-22485: Fixed an issue that caused `inspect.getsource` to return - incorrect results on nested functions. - -- bpo-22153: Improve unittest docs. Patch from Martin Panter and evilzero. - -- bpo-24580: Symbolic group references to open group in re patterns now are - explicitly forbidden as well as numeric group references. - -- bpo-24206: Fixed __eq__ and __ne__ methods of inspect classes. - -- bpo-24631: Fixed regression in the timeit module with multiline setup. - -- bpo-18622: unittest.mock.mock_open().reset_mock would recurse infinitely. - Patch from Nicola Palumbo and Laurent De Buyst. - -- bpo-23661: unittest.mock side_effects can now be exceptions again. This - was a regression vs Python 3.4. Patch from Ignacio Rossi - -- bpo-24608: chunk.Chunk.read() now always returns bytes, not str. - -- bpo-18684: Fixed reading out of the buffer in the re module. - -- bpo-24259: tarfile now raises a ReadError if an archive is truncated - inside a data segment. - -- bpo-15014: SMTP.auth() and SMTP.login() now support RFC 4954's optional - initial- response argument to the SMTP AUTH command. - -- bpo-24669: Fix inspect.getsource() for 'async def' functions. Patch by Kai - Groner. - -- bpo-24688: ast.get_docstring() for 'async def' functions. - -Build ------ - -- bpo-24603: Update Windows builds and OS X 10.5 installer to use OpenSSL - 1.0.2d. - - -What's New in Python 3.5.0 beta 3? -================================== - -*Release date: 2015-07-05* - -Core and Builtins ------------------ - -- bpo-24467: Fixed possible buffer over-read in bytearray. The bytearray - object now always allocates place for trailing null byte and it's buffer - now is always null-terminated. - -- Upgrade to Unicode 8.0.0. - -- bpo-24345: Add Py_tp_finalize slot for the stable ABI. - -- bpo-24400: Introduce a distinct type for PEP 492 coroutines; add - types.CoroutineType, inspect.getcoroutinestate, - inspect.getcoroutinelocals; coroutines no longer use CO_GENERATOR flag; - sys.set_coroutine_wrapper works only for 'async def' coroutines; - inspect.iscoroutine no longer uses collections.abc.Coroutine, it's - intended to test for pure 'async def' coroutines only; add new opcode: - GET_YIELD_FROM_ITER; fix generators wrapper used in types.coroutine to be - instance of collections.abc.Generator; collections.abc.Awaitable and - collections.abc.Coroutine can no longer be used to detect generator-based - coroutines--use inspect.isawaitable instead. - -- bpo-24450: Add gi_yieldfrom to generators and cr_await to coroutines. - Contributed by Benno Leslie and Yury Selivanov. - -- bpo-19235: Add new RecursionError exception. Patch by Georg Brandl. - -Library -------- - -- bpo-21750: mock_open.read_data can now be read from each instance, as it - could in Python 3.3. - -- bpo-24552: Fix use after free in an error case of the _pickle module. - -- bpo-24514: tarfile now tolerates number fields consisting of only - whitespace. - -- bpo-19176: Fixed doctype() related bugs in C implementation of - ElementTree. A deprecation warning no longer issued by XMLParser subclass - with default doctype() method. Direct call of doctype() now issues a - warning. Parser's doctype() now is not called if target's doctype() is - called. Based on patch by Martin Panter. - -- bpo-20387: Restore semantic round-trip correctness in tokenize/untokenize - for tab- indented blocks. - -- bpo-24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm() - functions of the audioop module. - -- bpo-24336: The contextmanager decorator now works with functions with - keyword arguments called "func" and "self". Patch by Martin Panter. - -- bpo-24522: Fix possible integer overflow in json accelerator module. - -- bpo-24489: ensure a previously set C errno doesn't disturb cmath.polar(). - -- bpo-24408: Fixed AttributeError in measure() and metrics() methods of - tkinter.Font. - -- bpo-14373: C implementation of functools.lru_cache() now can be used with - methods. - -- bpo-24347: Set KeyError if PyDict_GetItemWithError returns NULL. - -- bpo-24348: Drop superfluous incref/decref. - -- bpo-24359: Check for changed OrderedDict size during iteration. - -- bpo-24368: Support keyword arguments in OrderedDict methods. - -- bpo-24362: Simplify the C OrderedDict fast nodes resize logic. - -- bpo-24377: Fix a ref leak in OrderedDict.__repr__. - -- bpo-24369: Defend against key-changes during iteration. - -Tests ------ - -- bpo-24373: _testmultiphase and xxlimited now use tp_traverse and - tp_finalize to avoid reference leaks encountered when combining tp_dealloc - with PyType_FromSpec (see issue #16690 for details) - -Documentation -------------- - -- bpo-24458: Update documentation to cover multi-phase initialization for - extension modules (PEP 489). Patch by Petr Viktorin. - -- bpo-24351: Clarify what is meant by "identifier" in the context of - string.Template instances. - -Build ------ - -- bpo-24432: Update Windows builds and OS X 10.5 installer to use OpenSSL - 1.0.2c. - - -What's New in Python 3.5.0 beta 2? -================================== - -*Release date: 2015-05-31* - -Core and Builtins ------------------ - -- bpo-24284: The startswith and endswith methods of the str class no longer - return True when finding the empty string and the indexes are completely - out of range. - -- bpo-24115: Update uses of PyObject_IsTrue(), PyObject_Not(), - PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains() - to check for and handle errors correctly. - -- bpo-24328: Fix importing one character extension modules. - -- bpo-11205: In dictionary displays, evaluate the key before the value. - -- bpo-24285: Fixed regression that prevented importing extension modules - from inside packages. Patch by Petr Viktorin. - -Library -------- - -- bpo-23247: Fix a crash in the StreamWriter.reset() of CJK codecs. - -- bpo-24270: Add math.isclose() and cmath.isclose() functions as per PEP - 485. Contributed by Chris Barker and Tal Einat. - -- bpo-5633: Fixed timeit when the statement is a string and the setup is - not. - -- bpo-24326: Fixed audioop.ratecv() with non-default weightB argument. - Original patch by David Moore. - -- bpo-16991: Add a C implementation of OrderedDict. - -- bpo-23934: Fix inspect.signature to fail correctly for builtin types - lacking signature information. Initial patch by James Powell. - - -What's New in Python 3.5.0 beta 1? -================================== - -*Release date: 2015-05-24* - -Core and Builtins ------------------ - -- bpo-24276: Fixed optimization of property descriptor getter. - -- bpo-24268: PEP 489: Multi-phase extension module initialization. Patch by - Petr Viktorin. - -- bpo-23955: Add pyvenv.cfg option to suppress registry/environment lookup - for generating sys.path on Windows. - -- bpo-24257: Fixed system error in the comparison of faked - types.SimpleNamespace. - -- bpo-22939: Fixed integer overflow in iterator object. Patch by Clement - Rouault. - -- bpo-23985: Fix a possible buffer overrun when deleting a slice from the - front of a bytearray and then appending some other bytes data. - -- bpo-24102: Fixed exception type checking in standard error handlers. - -- bpo-15027: The UTF-32 encoder is now 3x to 7x faster. - -- bpo-23290: Optimize set_merge() for cases where the target is empty. - (Contributed by Serhiy Storchaka.) - -- bpo-2292: PEP 448: Additional Unpacking Generalizations. - -- bpo-24096: Make warnings.warn_explicit more robust against mutation of the - warnings.filters list. - -- bpo-23996: Avoid a crash when a delegated generator raises an unnormalized - StopIteration exception. Patch by Stefan Behnel. - -- bpo-23910: Optimize property() getter calls. Patch by Joe Jevnik. - -- bpo-23911: Move path-based importlib bootstrap code to a separate frozen - module. - -- bpo-24192: Fix namespace package imports. - -- bpo-24022: Fix tokenizer crash when processing undecodable source code. - -- bpo-9951: Added a hex() method to bytes, bytearray, and memoryview. - -- bpo-22906: PEP 479: Change StopIteration handling inside generators. - -- bpo-24017: PEP 492: Coroutines with async and await syntax. - -Library -------- - -- bpo-14373: Added C implementation of functools.lru_cache(). Based on - patches by Matt Joiner and Alexey Kachayev. - -- bpo-24230: The tempfile module now accepts bytes for prefix, suffix and - dir parameters and returns bytes in such situations (matching the os - module APIs). - -- bpo-22189: collections.UserString now supports __getnewargs__(), - __rmod__(), casefold(), format_map(), isprintable(), and maketrans(). - Patch by Joe Jevnik. - -- bpo-24244: Prevents termination when an invalid format string is - encountered on Windows in strftime. - -- bpo-23973: PEP 484: Add the typing module. - -- bpo-23086: The collections.abc.Sequence() abstract base class added - *start* and *stop* parameters to the index() mixin. Patch by Devin - Jeanpierre. - -- bpo-20035: Replaced the ``tkinter._fix`` module used for setting up the - Tcl/Tk environment on Windows with a private function in the ``_tkinter`` - module that makes no permanent changes to the environment. - -- bpo-24257: Fixed segmentation fault in sqlite3.Row constructor with faked - cursor type. - -- bpo-15836: assertRaises(), assertRaisesRegex(), assertWarns() and - assertWarnsRegex() assertments now check the type of the first argument to - prevent possible user error. Based on patch by Daniel Wagner-Hall. - -- bpo-9858: Add missing method stubs to _io.RawIOBase. Patch by Laura - Rupprecht. - -- bpo-22955: attrgetter, itemgetter and methodcaller objects in the operator - module now support pickling. Added readable and evaluable repr for these - objects. Based on patch by Josh Rosenberg. - -- bpo-22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again when - a directory with the chosen name already exists on Windows as well as on - Unix. tempfile.mkstemp() now fails early if parent directory is not valid - (not exists or is a file) on Windows. - -- bpo-23780: Improved error message in os.path.join() with single argument. - -- bpo-6598: Increased time precision and random number range in - email.utils.make_msgid() to strengthen the uniqueness of the message ID. - -- bpo-24091: Fixed various crashes in corner cases in C implementation of - ElementTree. - -- bpo-21931: msilib.FCICreate() now raises TypeError in the case of a bad - argument instead of a ValueError with a bogus FCI error number. Patch by - Jeffrey Armstrong. - -- bpo-13866: *quote_via* argument added to urllib.parse.urlencode. - -- bpo-20098: New mangle_from policy option for email, default True for - compat32, but False for all other policies. - -- bpo-24211: The email library now supports RFC 6532: it can generate - headers using utf-8 instead of encoded words. - -- bpo-16314: Added support for the LZMA compression in distutils. - -- bpo-21804: poplib now supports RFC 6856 (UTF8). - -- bpo-18682: Optimized pprint functions for builtin scalar types. - -- bpo-22027: smtplib now supports RFC 6531 (SMTPUTF8). - -- bpo-23488: Random generator objects now consume 2x less memory on 64-bit. - -- bpo-1322: platform.dist() and platform.linux_distribution() functions are - now deprecated. Initial patch by Vajrasky Kok. - -- bpo-22486: Added the math.gcd() function. The fractions.gcd() function - now is deprecated. Based on patch by Mark Dickinson. - -- bpo-24064: Property() docstrings are now writeable. (Patch by Berker - Peksag.) - -- bpo-22681: Added support for the koi8_t encoding. - -- bpo-22682: Added support for the kz1048 encoding. - -- bpo-23796: peek and read1 methods of BufferedReader now raise ValueError - if they called on a closed object. Patch by John Hergenroeder. - -- bpo-21795: smtpd now supports the 8BITMIME extension whenever the new - *decode_data* constructor argument is set to False. - -- bpo-24155: optimize heapq.heapify() for better cache performance when - heapifying large lists. - -- bpo-21800: imaplib now supports RFC 5161 (enable), RFC 6855 - (utf8/internationalized email) and automatically encodes non-ASCII - usernames and passwords to UTF8. - -- bpo-20274: When calling a _sqlite.Connection, it now complains if passed - any keyword arguments. Previously it silently ignored them. - -- bpo-20274: Remove ignored and erroneous "kwargs" parameters from three - METH_VARARGS methods on _sqlite.Connection. - -- bpo-24134: assertRaises(), assertRaisesRegex(), assertWarns() and - assertWarnsRegex() checks now emits a deprecation warning when callable is - None or keyword arguments except msg is passed in the context manager - mode. - -- bpo-24018: Add a collections.abc.Generator abstract base class. - Contributed by Stefan Behnel. - -- bpo-23880: Tkinter's getint() and getdouble() now support Tcl_Obj. - Tkinter's getdouble() now supports any numbers (in particular int). - -- bpo-22619: Added negative limit support in the traceback module. Based on - patch by Dmitry Kazakov. - -- bpo-24094: Fix possible crash in json.encode with poorly behaved dict - subclasses. - -- bpo-9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes. - Patch written by William Orr. - -- bpo-17445: add difflib.diff_bytes() to support comparison of byte strings - (fixes a regression from Python 2). - -- bpo-23917: Fall back to sequential compilation when ProcessPoolExecutor - doesn't exist. Patch by Claudiu Popa. - -- bpo-23008: Fixed resolving attributes with boolean value is False in - pydoc. - -- Fix asyncio issue 235: LifoQueue and PriorityQueue's put didn't increment - unfinished tasks (this bug was introduced when JoinableQueue was merged - with Queue). - -- bpo-23908: os functions now reject paths with embedded null character on - Windows instead of silently truncating them. - -- bpo-23728: binascii.crc_hqx() could return an integer outside of the range - 0-0xffff for empty data. - -- bpo-23887: urllib.error.HTTPError now has a proper repr() representation. - Patch by Berker Peksag. - -- asyncio: New event loop APIs: set_task_factory() and get_task_factory(). - -- asyncio: async() function is deprecated in favour of ensure_future(). - -- bpo-24178: asyncio.Lock, Condition, Semaphore, and BoundedSemaphore - support new 'async with' syntax. Contributed by Yury Selivanov. - -- bpo-24179: Support 'async for' for asyncio.StreamReader. Contributed by - Yury Selivanov. - -- bpo-24184: Add AsyncIterator and AsyncIterable ABCs to collections.abc. - Contributed by Yury Selivanov. - -- bpo-22547: Implement informative __repr__ for inspect.BoundArguments. - Contributed by Yury Selivanov. - -- bpo-24190: Implement inspect.BoundArgument.apply_defaults() method. - Contributed by Yury Selivanov. - -- bpo-20691: Add 'follow_wrapped' argument to - inspect.Signature.from_callable() and inspect.signature(). Contributed by - Yury Selivanov. - -- bpo-24248: Deprecate inspect.Signature.from_function() and - inspect.Signature.from_builtin(). - -- bpo-23898: Fix inspect.classify_class_attrs() to support attributes with - overloaded __eq__ and __bool__. Patch by Mike Bayer. - -- bpo-24298: Fix inspect.signature() to correctly unwrap wrappers around - bound methods. - -IDLE ----- - -- bpo-23184: remove unused names and imports in idlelib. Initial patch by Al - Sweigart. - -Tests ------ - -- bpo-21520: test_zipfile no longer fails if the word 'bad' appears anywhere - in the name of the current directory. - -- bpo-9517: Move script_helper into the support package. Patch by Christie - Wilson. - -Documentation -------------- - -- bpo-22155: Add File Handlers subsection with createfilehandler to tkinter - doc. Remove obsolete example from FAQ. Patch by Martin Panter. - -- bpo-24029: Document the name binding behavior for submodule imports. - -- bpo-24077: Fix typo in man page for -I command option: -s, not -S - -Tools/Demos ------------ - -- bpo-24000: Improved Argument Clinic's mapping of converters to legacy - "format units". Updated the documentation to match. - -- bpo-24001: Argument Clinic converters now use accept={type} instead of - types={'type'} to specify the types the converter accepts. - -- bpo-23330: h2py now supports arbitrary filenames in #include. - -- bpo-24031: make patchcheck now supports git checkouts, too. - - -What's New in Python 3.5.0 alpha 4? -=================================== - -*Release date: 2015-04-19* - -Core and Builtins ------------------ - -- bpo-22980: Under Linux, GNU/KFreeBSD and the Hurd, C extensions now - include the architecture triplet in the extension name, to make it easy to - test builds for different ABIs in the same working tree. Under OS X, the - extension name now includes PEP 3149-style information. - -- bpo-22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES. Patch - courtesy of Joe Jevnik. - -- bpo-23731: Implement PEP 488: removal of .pyo files. - -- bpo-23726: Don't enable GC for user subclasses of non-GC types that don't - add any new fields. Patch by Eugene Toder. - -- bpo-23309: Avoid a deadlock at shutdown if a daemon thread is aborted - while it is holding a lock to a buffered I/O object, and the main thread - tries to use the same I/O object (typically stdout or stderr). A fatal - error is emitted instead. - -- bpo-22977: Fixed formatting Windows error messages on Wine. Patch by - Martin Panter. - -- bpo-23466: %c, %o, %x, and %X in bytes formatting now raise TypeError on - non-integer input. - -- bpo-24044: Fix possible null pointer dereference in list.sort in out of - memory conditions. - -- bpo-21354: PyCFunction_New function is exposed by python DLL again. - -Library -------- - -- bpo-23840: tokenize.open() now closes the temporary binary file on error - to fix a resource warning. - -- bpo-16914: new debuglevel 2 in smtplib adds timestamps to debug output. - -- bpo-7159: urllib.request now supports sending auth credentials - automatically after the first 401. This enhancement is a superset of the - enhancement from issue #19494 and supersedes that change. - -- bpo-23703: Fix a regression in urljoin() introduced in 901e4e52b20a. Patch - by Demian Brecht. - -- bpo-4254: Adds _curses.update_lines_cols(). Patch by Arnon Yaari - -- bpo-19933: Provide default argument for ndigits in round. Patch by - Vajrasky Kok. - -- bpo-23193: Add a numeric_owner parameter to tarfile.TarFile.extract and - tarfile.TarFile.extractall. Patch by Michael Vogt and Eric Smith. - -- bpo-23342: Add a subprocess.run() function than returns a CalledProcess - instance for a more consistent API than the existing call* functions. - -- bpo-21217: inspect.getsourcelines() now tries to compute the start and end - lines from the code object, fixing an issue when a lambda function is used - as decorator argument. Patch by Thomas Ballinger and Allison Kaptur. - -- bpo-24521: Fix possible integer overflows in the pickle module. - -- bpo-22931: Allow '[' and ']' in cookie values. - -- The keywords attribute of functools.partial is now always a dictionary. - -- bpo-23811: Add missing newline to the PyCompileError error message. Patch - by Alex Shkop. - -- bpo-21116: Avoid blowing memory when allocating a multiprocessing shared - array that's larger than 50% of the available RAM. Patch by Médéric - Boquien. - -- bpo-22982: Improve BOM handling when seeking to multiple positions of a - writable text file. - -- bpo-23464: Removed deprecated asyncio JoinableQueue. - -- bpo-23529: Limit the size of decompressed data when reading from GzipFile, - BZ2File or LZMAFile. This defeats denial of service attacks using - compressed bombs (i.e. compressed payloads which decompress to a huge - size). Patch by Martin Panter and Nikolaus Rath. - -- bpo-21859: Added Python implementation of io.FileIO. - -- bpo-23865: close() methods in multiple modules now are idempotent and more - robust at shutdown. If they need to release multiple resources, all are - released even if errors occur. - -- bpo-23400: Raise same exception on both Python 2 and 3 if sem_open is not - available. Patch by Davin Potts. - -- bpo-10838: The subprocess now module includes SubprocessError and - TimeoutError in its list of exported names for the users wild enough to - use ``from subprocess import *``. - -- bpo-23411: Added DefragResult, ParseResult, SplitResult, - DefragResultBytes, ParseResultBytes, and SplitResultBytes to - urllib.parse.__all__. Patch by Martin Panter. - -- bpo-23881: urllib.request.ftpwrapper constructor now closes the socket if - the FTP connection failed to fix a ResourceWarning. - -- bpo-23853: :meth:`socket.socket.sendall` does no more reset the socket - timeout each time data is sent successfully. The socket timeout is now the - maximum total duration to send all data. - -- bpo-22721: An order of multiline pprint output of set or dict containing - orderable and non-orderable elements no longer depends on iteration order - of set or dict. - -- bpo-15133: _tkinter.tkapp.getboolean() now supports Tcl_Obj and always - returns bool. tkinter.BooleanVar now validates input values (accepted - bool, int, str, and Tcl_Obj). tkinter.BooleanVar.get() now always returns - bool. - -- bpo-10590: xml.sax.parseString() now supports string argument. - -- bpo-23338: Fixed formatting ctypes error messages on Cygwin. Patch by - Makoto Kato. - -- bpo-15582: inspect.getdoc() now follows inheritance chains. - -- bpo-2175: SAX parsers now support a character stream of InputSource - object. - -- bpo-16840: Tkinter now supports 64-bit integers added in Tcl 8.4 and - arbitrary precision integers added in Tcl 8.5. - -- bpo-23834: Fix socket.sendto(), use the C Py_ssize_t type to store the - result of sendto() instead of the C int type. - -- bpo-23618: :meth:`socket.socket.connect` now waits until the connection - completes instead of raising :exc:`InterruptedError` if the connection is - interrupted by signals, signal handlers don't raise an exception and the - socket is blocking or has a timeout. :meth:`socket.socket.connect` still - raise :exc:`InterruptedError` for non-blocking sockets. - -- bpo-21526: Tkinter now supports new boolean type in Tcl 8.5. - -- bpo-23836: Fix the faulthandler module to handle reentrant calls to its - signal handlers. - -- bpo-23838: linecache now clears the cache and returns an empty result on - MemoryError. - -- bpo-10395: Added os.path.commonpath(). Implemented in posixpath and - ntpath. Based on patch by Rafik Draoui. - -- bpo-23611: Serializing more "lookupable" objects (such as unbound methods - or nested classes) now are supported with pickle protocols < 4. - -- bpo-13583: sqlite3.Row now supports slice indexing. - -- bpo-18473: Fixed 2to3 and 3to2 compatible pickle mappings. Fixed - ambigious reverse mappings. Added many new mappings. Import mapping is - no longer applied to modules already mapped with full name mapping. - -- bpo-23485: select.select() is now retried automatically with the - recomputed timeout when interrupted by a signal, except if the signal - handler raises an exception. This change is part of the PEP 475. - -- bpo-23752: When built from an existing file descriptor, io.FileIO() now - only calls fstat() once. Before fstat() was called twice, which was not - necessary. - -- bpo-23704: collections.deque() objects now support __add__, __mul__, and - __imul__(). - -- bpo-23171: csv.Writer.writerow() now supports arbitrary iterables. - -- bpo-23745: The new email header parser now handles duplicate MIME - parameter names without error, similar to how get_param behaves. - -- bpo-22117: Fix os.utime(), it now rounds the timestamp towards minus - infinity (-inf) instead of rounding towards zero. - -- bpo-23310: Fix MagicMock's initializer to work with __methods__, just like - configure_mock(). Patch by Kasia Jachim. - -Build ------ - -- bpo-23817: FreeBSD now uses "1.0" in the SOVERSION as other operating - systems, instead of just "1". - -- bpo-23501: Argument Clinic now generates code into separate files by - default. - -Tests ------ - -- bpo-23799: Added test.support.start_threads() for running and cleaning up - multiple threads. - -- bpo-22390: test.regrtest now emits a warning if temporary files or - directories are left after running a test. - -Tools/Demos ------------ - -- bpo-18128: pygettext now uses standard +NNNN format in the POT-Creation- - Date header. - -- bpo-23935: Argument Clinic's understanding of format units accepting - bytes, bytearrays, and buffers is now consistent with both the - documentation and the implementation. - -- bpo-23944: Argument Clinic now wraps long impl prototypes at column 78. - -- bpo-20586: Argument Clinic now ensures that functions without docstrings - have signatures. - -- bpo-23492: Argument Clinic now generates argument parsing code with - PyArg_Parse instead of PyArg_ParseTuple if possible. - -- bpo-23500: Argument Clinic is now smarter about generating the "#ifndef" - (empty) definition of the methoddef macro: it's only generated once, even - if Argument Clinic processes the same symbol multiple times, and it's - emitted at the end of all processing rather than immediately after the - first use. - -C API ------ - -- bpo-23998: PyImport_ReInitLock() now checks for lock allocation error - - -What's New in Python 3.5.0 alpha 3? -=================================== - -*Release date: 2015-03-28* - -Core and Builtins ------------------ - -- bpo-23573: Increased performance of string search operations (str.find, - str.index, str.count, the in operator, str.split, str.partition) with - arguments of different kinds (UCS1, UCS2, UCS4). - -- bpo-23753: Python doesn't support anymore platforms without stat() or - fstat(), these functions are always required. - -- bpo-23681: The -b option now affects comparisons of bytes with int. - -- bpo-23632: Memoryviews now allow tuple indexing (including for multi- - dimensional memoryviews). - -- bpo-23192: Fixed generator lambdas. Patch by Bruno Cauet. - -- bpo-23629: Fix the default __sizeof__ implementation for variable-sized - objects. - -Library -------- - -- bpo-14260: The groupindex attribute of regular expression pattern object - now is non- modifiable mapping. - -- bpo-23792: Ignore KeyboardInterrupt when the pydoc pager is active. This - mimics the behavior of the standard unix pagers, and prevents pipepager - from shutting down while the pager itself is still running. - -- bpo-23775: pprint() of OrderedDict now outputs the same representation as - repr(). - -- bpo-23765: Removed IsBadStringPtr calls in ctypes - -- bpo-22364: Improved some re error messages using regex for hints. - -- bpo-23742: ntpath.expandvars() no longer loses unbalanced single quotes. - -- bpo-21717: The zipfile.ZipFile.open function now supports 'x' (exclusive - creation) mode. - -- bpo-21802: The reader in BufferedRWPair now is closed even when closing - writer failed in BufferedRWPair.close(). - -- bpo-23622: Unknown escapes in regular expressions that consist of ``'\'`` - and ASCII letter now raise a deprecation warning and will be forbidden in - Python 3.6. - -- bpo-23671: string.Template now allows specifying the "self" parameter as a - keyword argument. string.Formatter now allows specifying the "self" and - the "format_string" parameters as keyword arguments. - -- bpo-23502: The pprint module now supports mapping proxies. - -- bpo-17530: pprint now wraps long bytes objects and bytearrays. - -- bpo-22687: Fixed some corner cases in breaking words in tetxtwrap. Got rid - of quadratic complexity in breaking long words. - -- bpo-4727: The copy module now uses pickle protocol 4 (PEP 3154) and - supports copying of instances of classes whose __new__ method takes - keyword-only arguments. - -- bpo-23491: Added a zipapp module to support creating executable zip file - archives of Python code. Registered ".pyz" and ".pyzw" extensions on - Windows for these archives (PEP 441). - -- bpo-23657: Avoid explicit checks for str in zipapp, adding support for - pathlib.Path objects as arguments. - -- bpo-23688: Added support of arbitrary bytes-like objects and avoided - unnecessary copying of memoryview in gzip.GzipFile.write(). Original patch - by Wolfgang Maier. - -- bpo-23252: Added support for writing ZIP files to unseekable streams. - -- bpo-23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes. - -- bpo-23539: If body is None, http.client.HTTPConnection.request now sets - Content-Length to 0 for PUT, POST, and PATCH headers to avoid 411 errors - from some web servers. - -- bpo-22351: The nntplib.NNTP constructor no longer leaves the connection - and socket open until the garbage collector cleans them up. Patch by - Martin Panter. - -- bpo-23704: collections.deque() objects now support methods for index(), - insert(), and copy(). This allows deques to be registered as a - MutableSequence and it improves their substitutability for lists. - -- bpo-23715: :func:`signal.sigwaitinfo` and :func:`signal.sigtimedwait` are - now retried when interrupted by a signal not in the *sigset* parameter, if - the signal handler does not raise an exception. signal.sigtimedwait() - recomputes the timeout with a monotonic clock when it is retried. - -- bpo-23001: Few functions in modules mmap, ossaudiodev, socket, ssl, and - codecs, that accepted only read-only bytes-like object now accept writable - bytes-like object too. - -- bpo-23646: If time.sleep() is interrupted by a signal, the sleep is now - retried with the recomputed delay, except if the signal handler raises an - exception (PEP 475). - -- bpo-23136: _strptime now uniformly handles all days in week 0, including - Dec 30 of previous year. Based on patch by Jim Carroll. - -- bpo-23700: Iterator of NamedTemporaryFile now keeps a reference to - NamedTemporaryFile instance. Patch by Bohuslav Kabrda. - -- bpo-22903: The fake test case created by unittest.loader when it fails - importing a test module is now picklable. - -- bpo-22181: On Linux, os.urandom() now uses the new getrandom() syscall if - available, syscall introduced in the Linux kernel 3.17. It is more - reliable and more secure, because it avoids the need of a file descriptor - and waits until the kernel has enough entropy. - -- bpo-2211: Updated the implementation of the http.cookies.Morsel class. - Setting attributes key, value and coded_value directly now is deprecated. - update() and setdefault() now transform and check keys. Comparing for - equality now takes into account attributes key, value and coded_value. - copy() now returns a Morsel, not a dict. repr() now contains all - attributes. Optimized checking keys and quoting values. Added new tests. - Original patch by Demian Brecht. - -- bpo-18983: Allow selection of output units in timeit. Patch by Julian - Gindi. - -- bpo-23631: Fix traceback.format_list when a traceback has been mutated. - -- bpo-23568: Add rdivmod support to MagicMock() objects. Patch by Håkan - Lövdahl. - -- bpo-2052: Add charset parameter to HtmlDiff.make_file(). - -- bpo-23668: Support os.truncate and os.ftruncate on Windows. - -- bpo-23138: Fixed parsing cookies with absent keys or values in cookiejar. - Patch by Demian Brecht. - -- bpo-23051: multiprocessing.Pool methods imap() and imap_unordered() now - handle exceptions raised by an iterator. Patch by Alon Diamant and Davin - Potts. - -- bpo-23581: Add matmul support to MagicMock. Patch by Håkan Lövdahl. - -- bpo-23566: enable(), register(), dump_traceback() and - dump_traceback_later() functions of faulthandler now accept file - descriptors. Patch by Wei Wu. - -- bpo-22928: Disabled HTTP header injections in http.client. Original patch - by Demian Brecht. - -- bpo-23615: Modules bz2, tarfile and tokenize now can be reloaded with - imp.reload(). Patch by Thomas Kluyver. - -- bpo-23605: os.walk() now calls os.scandir() instead of os.listdir(). The - usage of os.scandir() reduces the number of calls to os.stat(). Initial - patch written by Ben Hoyt. - -Build ------ - -- bpo-23585: make patchcheck will ensure the interpreter is built. - -Tests ------ - -- bpo-23583: Added tests for standard IO streams in IDLE. - -- bpo-22289: Prevent test_urllib2net failures due to ftp connection timeout. - -Tools/Demos ------------ - -- bpo-22826: The result of open() in Tools/freeze/bkfile.py is now better - compatible with regular files (in particular it now supports the context - management protocol). - - -What's New in Python 3.5.0 alpha 2? -=================================== - -*Release date: 2015-03-09* - -Core and Builtins ------------------ - -- bpo-23571: PyObject_Call() and PyCFunction_Call() now raise a SystemError - if a function returns a result and raises an exception. The SystemError is - chained to the previous exception. - -Library -------- - -- bpo-22524: New os.scandir() function, part of the PEP 471: "os.scandir() - function -- a better and faster directory iterator". Patch written by Ben - Hoyt. - -- bpo-23103: Reduced the memory consumption of IPv4Address and IPv6Address. - -- bpo-21793: BaseHTTPRequestHandler again logs response code as numeric, not - as stringified enum. Patch by Demian Brecht. - -- bpo-23476: In the ssl module, enable OpenSSL's X509_V_FLAG_TRUSTED_FIRST - flag on certificate stores when it is available. - -- bpo-23576: Avoid stalling in SSL reads when EOF has been reached in the - SSL layer but the underlying connection hasn't been closed. - -- bpo-23504: Added an __all__ to the types module. - -- bpo-23563: Optimized utility functions in urllib.parse. - -- bpo-7830: Flatten nested functools.partial. - -- bpo-20204: Added the __module__ attribute to _tkinter classes. - -- bpo-19980: Improved help() for non-recognized strings. help('') now shows - the help on str. help('help') now shows the help on help(). Original - patch by Mark Lawrence. - -- bpo-23521: Corrected pure python implementation of timedelta division. - - Eliminated OverflowError from ``timedelta * float`` for some floats; - Corrected rounding in timedlta true division. - -- bpo-21619: Popen objects no longer leave a zombie after exit in the with - statement if the pipe was broken. Patch by Martin Panter. - -- bpo-22936: Make it possible to show local variables in tracebacks for both - the traceback module and unittest. - -- bpo-15955: Add an option to limit the output size in bz2.decompress(). - Patch by Nikolaus Rath. - -- bpo-6639: Module-level turtle functions no longer raise TclError after - closing the window. - -- bpo-814253: Group references and conditional group references now work in - lookbehind assertions in regular expressions. (See also: bpo-9179) - -- bpo-23215: Multibyte codecs with custom error handlers that ignores errors - consumed too much memory and raised SystemError or MemoryError. Original - patch by Aleksi Torhamo. - -- bpo-5700: io.FileIO() called flush() after closing the file. flush() was - not called in close() if closefd=False. - -- bpo-23374: Fixed pydoc failure with non-ASCII files when stdout encoding - differs from file system encoding (e.g. on Mac OS). - -- bpo-23481: Remove RC4 from the SSL module's default cipher list. - -- bpo-21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty - docstrings. - -- bpo-22885: Fixed arbitrary code execution vulnerability in the dbm.dumb - module. Original patch by Claudiu Popa. - -- bpo-23239: ssl.match_hostname() now supports matching of IP addresses. - -- bpo-23146: Fix mishandling of absolute Windows paths with forward slashes - in pathlib. - -- bpo-23096: Pickle representation of floats with protocol 0 now is the same - for both Python and C implementations. - -- bpo-19105: pprint now more efficiently uses free space at the right. - -- bpo-14910: Add allow_abbrev parameter to argparse.ArgumentParser. Patch by - Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson. - -- bpo-21717: tarfile.open() now supports 'x' (exclusive creation) mode. - -- bpo-23344: marshal.dumps() is now 20-25% faster on average. - -- bpo-20416: marshal.dumps() with protocols 3 and 4 is now 40-50% faster on - average. - -- bpo-23421: Fixed compression in tarfile CLI. Patch by wdv4758h. - -- bpo-23367: Fix possible overflows in the unicodedata module. - -- bpo-23361: Fix possible overflow in Windows subprocess creation code. - -- logging.handlers.QueueListener now takes a respect_handler_level keyword - argument which, if set to True, will pass messages to handlers taking - handler levels into account. - -- bpo-19705: turtledemo now has a visual sorting algorithm demo. Original - patch from Jason Yeo. - -- bpo-23801: Fix issue where cgi.FieldStorage did not always ignore the - entire preamble to a multipart body. - -Build ------ - -- bpo-23445: pydebug builds now use "gcc -Og" where possible, to make the - resulting executable faster. - -- bpo-23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a. - -C API ------ - -- bpo-20204: Deprecation warning is now raised for builtin types without the - __module__ attribute. - -Windows -------- - -- bpo-23465: Implement PEP 486 - Make the Python Launcher aware of virtual - environments. Patch by Paul Moore. - -- bpo-23437: Make user scripts directory versioned on Windows. Patch by Paul - Moore. - - -What's New in Python 3.5.0 alpha 1? -=================================== - -*Release date: 2015-02-08* - -Core and Builtins ------------------ - -- bpo-23285: PEP 475 - EINTR handling. - -- bpo-22735: Fix many edge cases (including crashes) involving custom mro() - implementations. - -- bpo-22896: Avoid using PyObject_AsCharBuffer(), PyObject_AsReadBuffer() - and PyObject_AsWriteBuffer(). - -- bpo-21295: Revert some changes (issue #16795) to AST line numbers and - column offsets that constituted a regression. - -- bpo-22986: Allow changing an object's __class__ between a dynamic type and - static type in some cases. - -- bpo-15859: PyUnicode_EncodeFSDefault(), PyUnicode_EncodeMBCS() and - PyUnicode_EncodeCodePage() now raise an exception if the object is not a - Unicode object. For PyUnicode_EncodeFSDefault(), it was already the case - on platforms other than Windows. Patch written by Campbell Barton. - -- bpo-21408: The default __ne__() now returns NotImplemented if __eq__() - returned NotImplemented. Original patch by Martin Panter. - -- bpo-23321: Fixed a crash in str.decode() when error handler returned - replacment string longer than mailformed input data. - -- bpo-22286: The "backslashreplace" error handlers now works with decoding - and translating. - -- bpo-23253: Delay-load ShellExecute[AW] in os.startfile for reduced startup - overhead on Windows. - -- bpo-22038: pyatomic.h now uses stdatomic.h or GCC built-in functions for - atomic memory access if available. Patch written by Vitor de Lima and - Gustavo Temple. - -- bpo-20284: %-interpolation (aka printf) formatting added for bytes and - bytearray. - -- bpo-23048: Fix jumping out of an infinite while loop in the pdb. - -- bpo-20335: bytes constructor now raises TypeError when encoding or errors - is specified with non-string argument. Based on patch by Renaud Blanch. - -- bpo-22834: If the current working directory ends up being set to a non- - existent directory then import will no longer raise FileNotFoundError. - -- bpo-22869: Move the interpreter startup & shutdown code to a new dedicated - pylifecycle.c module - -- bpo-22847: Improve method cache efficiency. - -- bpo-22335: Fix crash when trying to enlarge a bytearray to 0x7fffffff - bytes on a 32-bit platform. - -- bpo-22653: Fix an assertion failure in debug mode when doing a reentrant - dict insertion in debug mode. - -- bpo-22643: Fix integer overflow in Unicode case operations (upper, lower, - title, swapcase, casefold). - -- bpo-17636: Circular imports involving relative imports are now supported. - -- bpo-22604: Fix assertion error in debug mode when dividing a complex - number by (nan+0j). - -- bpo-21052: Do not raise ImportWarning when sys.path_hooks or sys.meta_path - are set to None. - -- bpo-16518: Use 'bytes-like object required' in error messages that - previously used the far more cryptic "'x' does not support the buffer - protocol. - -- bpo-22470: Fixed integer overflow issues in "backslashreplace", - "xmlcharrefreplace", and "surrogatepass" error handlers. - -- bpo-22540: speed up `PyObject_IsInstance` and `PyObject_IsSubclass` in the - common case that the second argument has metaclass `type`. - -- bpo-18711: Add a new `PyErr_FormatV` function, similar to `PyErr_Format` - but accepting a `va_list` argument. - -- bpo-22520: Fix overflow checking when generating the repr of a unicode - object. - -- bpo-22519: Fix overflow checking in PyBytes_Repr. - -- bpo-22518: Fix integer overflow issues in latin-1 encoding. - -- bpo-16324: _charset parameter of MIMEText now also accepts - email.charset.Charset instances. Initial patch by Claude Paroz. - -- bpo-1764286: Fix inspect.getsource() to support decorated functions. Patch - by Claudiu Popa. - -- bpo-18554: os.__all__ includes posix functions. - -- bpo-21391: Use os.path.abspath in the shutil module. - -- bpo-11471: avoid generating a JUMP_FORWARD instruction at the end of an - if-block if there is no else-clause. Original patch by Eugene Toder. - -- bpo-22215: Now ValueError is raised instead of TypeError when str or bytes - argument contains not permitted null character or byte. - -- bpo-22258: Fix the internal function set_inheritable() on Illumos. This - platform exposes the function ``ioctl(FIOCLEX)``, but calling it fails - with errno is ENOTTY: "Inappropriate ioctl for device". set_inheritable() - now falls back to the slower ``fcntl()`` (``F_GETFD`` and then - ``F_SETFD``). - -- bpo-21389: Displaying the __qualname__ of the underlying function in the - repr of a bound method. - -- bpo-22206: Using pthread, PyThread_create_key() now sets errno to ENOMEM - and returns -1 (error) on integer overflow. - -- bpo-20184: Argument Clinic based signature introspection added for 30 of - the builtin functions. - -- bpo-22116: C functions and methods (of the 'builtin_function_or_method' - type) can now be weakref'ed. Patch by Wei Wu. - -- bpo-22077: Improve index error messages for bytearrays, bytes, lists, and - tuples by adding 'or slices'. Added ', not ' for bytearrays. - Original patch by Claudiu Popa. - -- bpo-20179: Apply Argument Clinic to bytes and bytearray. Patch by Tal - Einat. - -- bpo-22082: Clear interned strings in slotdefs. - -- Upgrade Unicode database to Unicode 7.0.0. - -- bpo-21897: Fix a crash with the f_locals attribute with closure variables - when frame.clear() has been called. - -- bpo-21205: Add a new ``__qualname__`` attribute to generator, the - qualified name, and use it in the representation of a generator - (``repr(gen)``). The default name of the generator (``__name__`` - attribute) is now get from the function instead of the code. Use - ``gen.gi_code.co_name`` to get the name of the code. - -- bpo-21669: With the aid of heuristics in SyntaxError.__init__, the parser - now attempts to generate more meaningful (or at least more search engine - friendly) error messages when "exec" and "print" are used as statements. - -- bpo-21642: In the conditional if-else expression, allow an integer written - with no space between itself and the ``else`` keyword (e.g. ``True if - 42else False``) to be valid syntax. - -- bpo-21523: Fix over-pessimistic computation of the stack effect of some - opcodes in the compiler. This also fixes a quadratic compilation time - issue noticeable when compiling code with a large number of "and" and "or" - operators. - -- bpo-21418: Fix a crash in the builtin function super() when called without - argument and without current frame (ex: embedded Python). - -- bpo-21425: Fix flushing of standard streams in the interactive - interpreter. - -- bpo-21435: In rare cases, when running finalizers on objects in cyclic - trash a bad pointer dereference could occur due to a subtle flaw in - internal iteration logic. - -- bpo-21377: PyBytes_Concat() now tries to concatenate in-place when the - first argument has a reference count of 1. Patch by Nikolaus Rath. - -- bpo-20355: -W command line options now have higher priority than the - PYTHONWARNINGS environment variable. Patch by Arfrever. - -- bpo-21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c. - -- bpo-20904: Support setting FPU precision on m68k. - -- bpo-21209: Fix sending tuples to custom generator objects with the yield - from syntax. - -- bpo-21193: pow(a, b, c) now raises ValueError rather than TypeError when b - is negative. Patch by Josh Rosenberg. - -- bpo-21176: PEP 465: Add the '@' operator for matrix multiplication. - -- bpo-21134: Fix segfault when str is called on an uninitialized - UnicodeEncodeError, UnicodeDecodeError, or UnicodeTranslateError object. - -- bpo-19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas - Schwab. - -- bpo-20929: Add a type cast to avoid shifting a negative number. - -- bpo-20731: Properly position in source code files even if they are opened - in text mode. Patch by Serhiy Storchaka. - -- bpo-20637: Key-sharing now also works for instance dictionaries of - subclasses. Patch by Peter Ingebretson. - -- bpo-8297: Attributes missing from modules now include the module name in - the error text. Original patch by ysj.ray. - -- bpo-19995: %c, %o, %x, and %X now raise TypeError on non-integer input. - -- bpo-19655: The ASDL parser - used by the build process to generate code - for managing the Python AST in C - was rewritten. The new parser is self - contained and does not require to carry long the spark.py parser-generator - library; spark.py was removed from the source base. - -- bpo-12546: Allow ``\x00`` to be used as a fill character when using str, - int, float, and complex __format__ methods. - -- bpo-20480: Add ipaddress.reverse_pointer. Patch by Leon Weber. - -- bpo-13598: Modify string.Formatter to support auto-numbering of - replacement fields. It now matches the behavior of str.format() in this - regard. Patches by Phil Elson and Ramchandra Apte. - -- bpo-8931: Make alternate formatting ('#') for type 'c' raise an exception. - In versions prior to 3.5, '#' with 'c' had no effect. Now specifying it is - an error. Patch by Torsten Landschoff. - -- bpo-23165: Perform overflow checks before allocating memory in the - _Py_char2wchar function. - -Library -------- - -- bpo-23399: pyvenv creates relative symlinks where possible. - -- bpo-20289: cgi.FieldStorage() now supports the context management - protocol. - -- bpo-13128: Print response headers for CONNECT requests when debuglevel > - 0. Patch by Demian Brecht. - -- bpo-15381: Optimized io.BytesIO to make less allocations and copyings. - -- bpo-22818: Splitting on a pattern that could match an empty string now - raises a warning. Patterns that can only match empty strings are now - rejected. - -- bpo-23099: Closing io.BytesIO with exported buffer is rejected now to - prevent corrupting exported buffer. - -- bpo-23326: Removed __ne__ implementations. Since fixing default __ne__ - implementation in issue #21408 they are redundant. - -- bpo-23363: Fix possible overflow in itertools.permutations. - -- bpo-23364: Fix possible overflow in itertools.product. - -- bpo-23366: Fixed possible integer overflow in itertools.combinations. - -- bpo-23369: Fixed possible integer overflow in - _json.encode_basestring_ascii. - -- bpo-23353: Fix the exception handling of generators in - PyEval_EvalFrameEx(). At entry, save or swap the exception state even if - PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception - state is now always restored or swapped, not only if why is WHY_YIELD or - WHY_RETURN. Patch co-written with Antoine Pitrou. - -- bpo-14099: Restored support of writing ZIP files to tellable but non- - seekable streams. - -- bpo-14099: Writing to ZipFile and reading multiple ZipExtFiles is - threadsafe now. - -- bpo-19361: JSON decoder now raises JSONDecodeError instead of ValueError. - -- bpo-18518: timeit now rejects statements which can't be compiled outside a - function or a loop (e.g. "return" or "break"). - -- bpo-23094: Fixed readline with frames in Python implementation of pickle. - -- bpo-23268: Fixed bugs in the comparison of ipaddress classes. - -- bpo-21408: Removed incorrect implementations of __ne__() which didn't - returned NotImplemented if __eq__() returned NotImplemented. The default - __ne__() now works correctly. - -- bpo-19996: :class:`email.feedparser.FeedParser` now handles (malformed) - headers with no key rather than assuming the body has started. - -- bpo-20188: Support Application-Layer Protocol Negotiation (ALPN) in the - ssl module. - -- bpo-23133: Pickling of ipaddress objects now produces more compact and - portable representation. - -- bpo-23248: Update ssl error codes from latest OpenSSL git master. - -- bpo-23266: Much faster implementation of ipaddress.collapse_addresses() - when there are many non-consecutive addresses. - -- bpo-23098: 64-bit dev_t is now supported in the os module. - -- bpo-21817: When an exception is raised in a task submitted to a - ProcessPoolExecutor, the remote traceback is now displayed in the parent - process. Patch by Claudiu Popa. - -- bpo-15955: Add an option to limit output size when decompressing LZMA - data. Patch by Nikolaus Rath and Martin Panter. - -- bpo-23250: In the http.cookies module, capitalize "HttpOnly" and "Secure" - as they are written in the standard. - -- bpo-23063: In the disutils' check command, fix parsing of reST with code - or code-block directives. - -- bpo-23209: selectors.BaseSelector.get_key() now raises a RuntimeError if - the selector is closed. And selectors.BaseSelector.close() now clears its - internal reference to the selector mapping to break a reference cycle. - Initial patch written by Martin Richard. (See also: bpo-23225) - -- bpo-17911: Provide a way to seed the linecache for a PEP-302 module - without actually loading the code. - -- bpo-17911: Provide a new object API for traceback, including the ability - to not lookup lines at all until the traceback is actually rendered, - without any trace of the original objects being kept alive. - -- bpo-19777: Provide a home() classmethod on Path objects. Contributed by - Victor Salgado and Mayank Tripathi. - -- bpo-23206: Make ``json.dumps(..., ensure_ascii=False)`` as fast as the - default case of ``ensure_ascii=True``. Patch by Naoki Inada. - -- bpo-23185: Add math.inf and math.nan constants. - -- bpo-23186: Add ssl.SSLObject.shared_ciphers() and - ssl.SSLSocket.shared_ciphers() to fetch the client's list ciphers sent at - handshake. - -- bpo-23143: Remove compatibility with OpenSSLs older than 0.9.8. - -- bpo-23132: Improve performance and introspection support of comparison - methods created by functool.total_ordering. - -- bpo-19776: Add an expanduser() method on Path objects. - -- bpo-23112: Fix SimpleHTTPServer to correctly carry the query string and - fragment when it redirects to add a trailing slash. - -- bpo-21793: Added http.HTTPStatus enums (i.e. HTTPStatus.OK, - HTTPStatus.NOT_FOUND). Patch by Demian Brecht. - -- bpo-23093: In the io, module allow more operations to work on detached - streams. - -- bpo-23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol - version. - -- bpo-22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(), - instead of reading /dev/urandom, to get pseudo-random bytes. - -- bpo-19104: pprint now produces evaluable output for wrapped strings. - -- bpo-23071: Added missing names to codecs.__all__. Patch by Martin Panter. - -- bpo-22783: Pickling now uses the NEWOBJ opcode instead of the NEWOBJ_EX - opcode if possible. - -- bpo-15513: Added a __sizeof__ implementation for pickle classes. - -- bpo-19858: pickletools.optimize() now aware of the MEMOIZE opcode, can - produce more compact result and no longer produces invalid output if input - data contains MEMOIZE opcodes together with PUT or BINPUT opcodes. - -- bpo-22095: Fixed HTTPConnection.set_tunnel with default port. The port - value in the host header was set to "None". Patch by Demian Brecht. - -- bpo-23016: A warning no longer produces an AttributeError when the program - is run with pythonw.exe. - -- bpo-21775: shutil.copytree(): fix crash when copying to VFAT. An exception - handler assumed that OSError objects always have a 'winerror' attribute. - That is not the case, so the exception handler itself raised - AttributeError when run on Linux (and, presumably, any other non-Windows - OS). Patch by Greg Ward. - -- bpo-1218234: Fix inspect.getsource() to load updated source of reloaded - module. Initial patch by Berker Peksag. - -- bpo-21740: Support wrapped callables in doctest. Patch by Claudiu Popa. - -- bpo-23009: Make sure selectors.EpollSelecrtor.select() works when no FD is - registered. - -- bpo-22959: In the constructor of http.client.HTTPSConnection, prefer the - context's check_hostname attribute over the *check_hostname* parameter. - -- bpo-22696: Add function :func:`sys.is_finalizing` to know about - interpreter shutdown. - -- bpo-16043: Add a default limit for the amount of data - xmlrpclib.gzip_decode will return. This resolves CVE-2013-1753. - -- bpo-14099: ZipFile.open() no longer reopen the underlying file. Objects - returned by ZipFile.open() can now operate independently of the ZipFile - even if the ZipFile was created by passing in a file-like object as the - first argument to the constructor. - -- bpo-22966: Fix __pycache__ pyc file name clobber when pyc_compile is asked - to compile a source file containing multiple dots in the source file name. - -- bpo-21971: Update turtledemo doc and add module to the index. - -- bpo-21032: Fixed socket leak if HTTPConnection.getresponse() fails. - Original patch by Martin Panter. - -- bpo-22407: Deprecated the use of re.LOCALE flag with str patterns or - re.ASCII. It was newer worked. - -- bpo-22902: The "ip" command is now used on Linux to determine MAC address - in uuid.getnode(). Pach by Bruno Cauet. - -- bpo-22960: Add a context argument to xmlrpclib.ServerProxy constructor. - -- bpo-22389: Add contextlib.redirect_stderr(). - -- bpo-21356: Make ssl.RAND_egd() optional to support LibreSSL. The - availability of the function is checked during the compilation. Patch - written by Bernard Spil. - -- bpo-22915: SAX parser now supports files opened with file descriptor or - bytes path. - -- bpo-22609: Constructors and update methods of mapping classes in the - collections module now accept the self keyword argument. - -- bpo-22940: Add readline.append_history_file. - -- bpo-19676: Added the "namereplace" error handler. - -- bpo-22788: Add *context* parameter to logging.handlers.HTTPHandler. - -- bpo-22921: Allow SSLContext to take the *hostname* parameter even if - OpenSSL doesn't support SNI. - -- bpo-22894: TestCase.subTest() would cause the test suite to be stopped - when in failfast mode, even in the absence of failures. - -- bpo-22796: HTTP cookie parsing is now stricter, in order to protect - against potential injection attacks. - -- bpo-22370: Windows detection in pathlib is now more robust. - -- bpo-22841: Reject coroutines in asyncio add_signal_handler(). Patch by - Ludovic.Gasc. - -- bpo-19494: Added urllib.request.HTTPBasicPriorAuthHandler. Patch by Matej - Cepl. - -- bpo-22578: Added attributes to the re.error class. - -- bpo-22849: Fix possible double free in the io.TextIOWrapper constructor. - -- bpo-12728: Different Unicode characters having the same uppercase but - different lowercase are now matched in case-insensitive regular - expressions. - -- bpo-22821: Fixed fcntl() with integer argument on 64-bit big-endian - platforms. - -- bpo-21650: Add an `--sort-keys` option to json.tool CLI. - -- bpo-22824: Updated reprlib output format for sets to use set literals. - Patch contributed by Berker Peksag. - -- bpo-22824: Updated reprlib output format for arrays to display empty - arrays without an unnecessary empty list. Suggested by Serhiy Storchaka. - -- bpo-22406: Fixed the uu_codec codec incorrectly ported to 3.x. Based on - patch by Martin Panter. - -- bpo-17293: uuid.getnode() now determines MAC address on AIX using netstat. - Based on patch by Aivars Kalvāns. - -- bpo-22769: Fixed ttk.Treeview.tag_has() when called without arguments. - -- bpo-22417: Verify certificates by default in httplib (PEP 476). - -- bpo-22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2 - and above. Patch by Tim Graham. - -- bpo-22776: Brought excluded code into the scope of a try block in - SysLogHandler.emit(). - -- bpo-22665: Add missing get_terminal_size and SameFileError to - shutil.__all__. - -- bpo-6623: Remove deprecated Netrc class in the ftplib module. Patch by - Matt Chaput. - -- bpo-17381: Fixed handling of case-insensitive ranges in regular - expressions. - -- bpo-22410: Module level functions in the re module now cache compiled - locale-dependent regular expressions taking into account the locale. - -- bpo-22759: Query methods on pathlib.Path() (exists(), is_dir(), etc.) now - return False when the underlying stat call raises NotADirectoryError. - -- bpo-8876: distutils now falls back to copying files when hard linking - doesn't work. This allows use with special filesystems such as VirtualBox - shared folders. - -- bpo-22217: Implemented reprs of classes in the zipfile module. - -- bpo-22457: Honour load_tests in the start_dir of discovery. - -- bpo-18216: gettext now raises an error when a .mo file has an unsupported - major version number. Patch by Aaron Hill. - -- bpo-13918: Provide a locale.delocalize() function which can remove locale- - specific number formatting from a string representing a number, without - then converting it to a specific type. Patch by Cédric Krier. - -- bpo-22676: Make the pickling of global objects which don't have a - __module__ attribute less slow. - -- bpo-18853: Fixed ResourceWarning in shlex.__nain__. - -- bpo-9351: Defaults set with set_defaults on an argparse subparser are no - longer ignored when also set on the parent parser. - -- bpo-7559: unittest test loading ImportErrors are reported as import errors - with their import exception rather than as attribute errors after the - import has already failed. - -- bpo-19746: Make it possible to examine the errors from unittest discovery - without executing the test suite. The new `errors` attribute on TestLoader - exposes these non-fatal errors encountered during discovery. - -- bpo-21991: Make email.headerregistry's header 'params' attributes be read- - only (MappingProxyType). Previously the dictionary was modifiable but a - new one was created on each access of the attribute. - -- bpo-22638: SSLv3 is now disabled throughout the standard library. It can - still be enabled by instantiating a SSLContext manually. - -- bpo-22641: In asyncio, the default SSL context for client connections is - now created using ssl.create_default_context(), for stronger security. - -- bpo-17401: Include closefd in io.FileIO repr. - -- bpo-21338: Add silent mode for compileall. quiet parameters of - compile_{dir, file, path} functions now have a multilevel value. Also, -q - option of the CLI now have a multilevel value. Patch by Thomas Kluyver. - -- bpo-20152: Convert the array and cmath modules to Argument Clinic. - -- bpo-18643: Add socket.socketpair() on Windows. - -- bpo-22435: Fix a file descriptor leak when socketserver bind fails. - -- bpo-13096: Fixed segfault in CTypes POINTER handling of large values. - -- bpo-11694: Raise ConversionError in xdrlib as documented. Patch by Filip - Gruszczyński and Claudiu Popa. - -- bpo-19380: Optimized parsing of regular expressions. - -- bpo-1519638: Now unmatched groups are replaced with empty strings in - re.sub() and re.subn(). - -- bpo-18615: sndhdr.what/whathdr now return a namedtuple. - -- bpo-22462: Fix pyexpat's creation of a dummy frame to make it appear in - exception tracebacks. - -- bpo-21965: Add support for in-memory SSL to the ssl module. Patch by - Geert Jansen. - -- bpo-21173: Fix len() on a WeakKeyDictionary when .clear() was called with - an iterator alive. - -- bpo-11866: Eliminated race condition in the computation of names for new - threads. - -- bpo-21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules is - mutated while iterating. Patch by Olivier Grisel. - -- bpo-11271: concurrent.futures.Executor.map() now takes a *chunksize* - argument to allow batching of tasks in child processes and improve - performance of ProcessPoolExecutor. Patch by Dan O'Reilly. - -- bpo-21883: os.path.join() and os.path.relpath() now raise a TypeError with - more helpful error message for unsupported or mismatched types of - arguments. - -- bpo-22219: The zipfile module CLI now adds entries for directories - (including empty directories) in ZIP file. - -- bpo-22449: In the ssl.SSLContext.load_default_certs, consult the - environmental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows. - -- bpo-22508: The email.__version__ variable has been removed; the email code - is no longer shipped separately from the stdlib, and __version__ hasn't - been updated in several releases. - -- bpo-20076: Added non derived UTF-8 aliases to locale aliases table. - -- bpo-20079: Added locales supported in glibc 2.18 to locale alias table. - -- bpo-20218: Added convenience methods read_text/write_text and read_bytes/ - write_bytes to pathlib.Path objects. - -- bpo-22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor - os.posix_fallocate() because their prototypes in system headers are wrong. - -- bpo-22517: When an io.BufferedRWPair object is deallocated, clear its - weakrefs. - -- bpo-22437: Number of capturing groups in regular expression is no longer - limited by 100. - -- bpo-17442: InteractiveInterpreter now displays the full chained traceback - in its showtraceback method, to match the built in interactive - interpreter. - -- bpo-23392: Added tests for marshal C API that works with FILE*. - -- bpo-10510: distutils register and upload methods now use HTML standards - compliant CRLF line endings. - -- bpo-9850: Fixed macpath.join() for empty first component. Patch by Oleg - Oshmyan. - -- bpo-5309: distutils' build and build_ext commands now accept a ``-j`` - option to enable parallel building of extension modules. - -- bpo-22448: Improve canceled timer handles cleanup to prevent unbound - memory usage. Patch by Joshua Moore-Oliva. - -- bpo-22427: TemporaryDirectory no longer attempts to clean up twice when - used in the with statement in generator. - -- bpo-22362: Forbidden ambiguous octal escapes out of range 0-0o377 in - regular expressions. - -- bpo-20912: Now directories added to ZIP file have correct Unix and MS-DOS - directory attributes. - -- bpo-21866: ZipFile.close() no longer writes ZIP64 central directory - records if allowZip64 is false. - -- bpo-22278: Fix urljoin problem with relative urls, a regression observed - after changes to issue22118 were submitted. - -- bpo-22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re - module. Removed trailing spaces in debugging output. - -- bpo-22423: Unhandled exception in thread no longer causes unhandled - AttributeError when sys.stderr is None. - -- bpo-21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects line - buffering, rather than block buffering. Patch by Akira Li. - -- bpo-21091: Fix API bug: email.message.EmailMessage.is_attachment is now a - method. - -- bpo-21079: Fix email.message.EmailMessage.is_attachment to return the - correct result when the header has parameters as well as a value. - -- bpo-22247: Add NNTPError to nntplib.__all__. - -- bpo-22366: urllib.request.urlopen will accept a context object - (SSLContext) as an argument which will then be used for HTTPS connection. - Patch by Alex Gaynor. - -- bpo-4180: The warnings registries are now reset when the filters are - modified. - -- bpo-22419: Limit the length of incoming HTTP request in wsgiref server to - 65536 bytes and send a 414 error code for higher lengths. Patch - contributed by Devin Cook. - -- Lax cookie parsing in http.cookies could be a security issue when combined - with non-standard cookie handling in some Web browsers. Reported by - Sergey Bobrov. - -- bpo-20537: logging methods now accept an exception instance as well as a - Boolean value or exception tuple. Thanks to Yury Selivanov for the patch. - -- bpo-22384: An exception in Tkinter callback no longer crashes the program - when it is run with pythonw.exe. - -- bpo-22168: Prevent turtle AttributeError with non-default Canvas on OS X. - -- bpo-21147: sqlite3 now raises an exception if the request contains a null - character instead of truncating it. Based on patch by Victor Stinner. - -- bpo-13968: The glob module now supports recursive search in subdirectories - using the ``**`` pattern. - -- bpo-21951: Fixed a crash in Tkinter on AIX when called Tcl command with - empty string or tuple argument. - -- bpo-21951: Tkinter now most likely raises MemoryError instead of crash if - the memory allocation fails. - -- bpo-22338: Fix a crash in the json module on memory allocation failure. - -- bpo-12410: imaplib.IMAP4 now supports the context management protocol. - Original patch by Tarek Ziadé. - -- bpo-21270: We now override tuple methods in mock.call objects so that they - can be used as normal call attributes. - -- bpo-16662: load_tests() is now unconditionally run when it is present in a - package's __init__.py. TestLoader.loadTestsFromModule() still accepts - use_load_tests, but it is deprecated and ignored. A new keyword-only - attribute `pattern` is added and documented. Patch given by Robert - Collins, tweaked by Barry Warsaw. - -- bpo-22226: First letter no longer is stripped from the "status" key in the - result of Treeview.heading(). - -- bpo-19524: Fixed resource leak in the HTTP connection when an invalid - response is received. Patch by Martin Panter. - -- bpo-20421: Add a .version() method to SSL sockets exposing the actual - protocol version in use. - -- bpo-19546: configparser exceptions no longer expose implementation - details. Chained KeyErrors are removed, which leads to cleaner tracebacks. - Patch by Claudiu Popa. - -- bpo-22051: turtledemo no longer reloads examples to re-run them. - Initialization of variables and gui setup should be done in main(), which - is called each time a demo is run, but not on import. - -- bpo-21933: Turtledemo users can change the code font size with a menu - selection or control(command) '-' or '+' or control-mousewheel. Original - patch by Lita Cho. - -- bpo-21597: The separator between the turtledemo text pane and the drawing - canvas can now be grabbed and dragged with a mouse. The code text pane - can be widened to easily view or copy the full width of the text. The - canvas can be widened on small screens. Original patches by Jan Kanis and - Lita Cho. - -- bpo-18132: Turtledemo buttons no longer disappear when the window is - shrunk. Original patches by Jan Kanis and Lita Cho. - -- bpo-22043: time.monotonic() is now always available. - ``threading.Lock.acquire()``, ``threading.RLock.acquire()`` and socket - operations now use a monotonic clock, instead of the system clock, when a - timeout is used. - -- bpo-21527: Add a default number of workers to ThreadPoolExecutor equal to - 5 times the number of CPUs. Patch by Claudiu Popa. - -- bpo-22216: smtplib now resets its state more completely after a quit. The - most obvious consequence of the previous behavior was a STARTTLS failure - during a connect/starttls/quit/connect/starttls sequence. - -- bpo-22098: ctypes' BigEndianStructure and LittleEndianStructure now define - an empty __slots__ so that subclasses don't always get an instance dict. - Patch by Claudiu Popa. - -- bpo-22185: Fix an occasional RuntimeError in threading.Condition.wait() - caused by mutation of the waiters queue without holding the lock. Patch - by Doug Zongker. - -- bpo-22287: On UNIX, _PyTime_gettimeofday() now uses - clock_gettime(CLOCK_REALTIME) if available. As a side effect, Python now - depends on the librt library on Solaris and on Linux (only with glibc - older than 2.17). - -- bpo-22182: Use e.args to unpack exceptions correctly in - distutils.file_util.move_file. Patch by Claudiu Popa. - -- The webbrowser module now uses subprocess's start_new_session=True rather - than a potentially risky preexec_fn=os.setsid call. - -- bpo-22042: signal.set_wakeup_fd(fd) now raises an exception if the file - descriptor is in blocking mode. - -- bpo-16808: inspect.stack() now returns a named tuple instead of a tuple. - Patch by Daniel Shahaf. - -- bpo-22236: Fixed Tkinter images copying operations in NoDefaultRoot mode. - -- bpo-2527: Add a *globals* argument to timeit functions, in order to - override the globals namespace in which the timed code is executed. Patch - by Ben Roberts. - -- bpo-22118: Switch urllib.parse to use RFC 3986 semantics for the - resolution of relative URLs, rather than RFCs 1808 and 2396. Patch by - Demian Brecht. - -- bpo-21549: Added the "members" parameter to TarFile.list(). - -- bpo-19628: Allow compileall recursion depth to be specified with a -r - option. - -- bpo-15696: Add a __sizeof__ implementation for mmap objects on Windows. - -- bpo-22068: Avoided reference loops with Variables and Fonts in Tkinter. - -- bpo-22165: SimpleHTTPRequestHandler now supports undecodable file names. - -- bpo-15381: Optimized line reading in io.BytesIO. - -- bpo-8797: Raise HTTPError on failed Basic Authentication immediately. - Initial patch by Sam Bull. - -- bpo-20729: Restored the use of lazy iterkeys()/itervalues()/iteritems() in - the mailbox module. - -- bpo-21448: Changed FeedParser feed() to avoid O(N**2) behavior when - parsing long line. Original patch by Raymond Hettinger. - -- bpo-22184: The functools LRU Cache decorator factory now gives an earlier - and clearer error message when the user forgets the required parameters. - -- bpo-17923: glob() patterns ending with a slash no longer match non-dirs on - AIX. Based on patch by Delhallt. - -- bpo-21725: Added support for RFC 6531 (SMTPUTF8) in smtpd. - -- bpo-22176: Update the ctypes module's libffi to v3.1. This release adds - support for the Linux AArch64 and POWERPC ELF ABIv2 little endian - architectures. - -- bpo-5411: Added support for the "xztar" format in the shutil module. - -- bpo-21121: Don't force 3rd party C extensions to be built with - -Werror=declaration- after-statement. - -- bpo-21975: Fixed crash when using uninitialized sqlite3.Row (in particular - when unpickling pickled sqlite3.Row). sqlite3.Row is now initialized in - the __new__() method. - -- bpo-20170: Convert posixmodule to use Argument Clinic. - -- bpo-21539: Add an *exists_ok* argument to `Pathlib.mkdir()` to mimic - `mkdir -p` and `os.makedirs()` functionality. When true, ignore - FileExistsErrors. Patch by Berker Peksag. - -- bpo-22127: Bypass IDNA for pure-ASCII host names in the socket module (in - particular for numeric IPs). - -- bpo-21047: set the default value for the *convert_charrefs* argument of - HTMLParser to True. Patch by Berker Peksag. - -- Add an __all__ to html.entities. - -- bpo-15114: the strict mode and argument of HTMLParser, HTMLParser.error, - and the HTMLParserError exception have been removed. - -- bpo-22085: Dropped support of Tk 8.3 in Tkinter. - -- bpo-21580: Now Tkinter correctly handles bytes arguments passed to Tk. In - particular this allows initializing images from binary data. - -- bpo-22003: When initialized from a bytes object, io.BytesIO() now defers - making a copy until it is mutated, improving performance and memory use on - some use cases. Patch by David Wilson. - -- bpo-22018: On Windows, signal.set_wakeup_fd() now also supports sockets. A - side effect is that Python depends to the WinSock library. - -- bpo-22054: Add os.get_blocking() and os.set_blocking() functions to get - and set the blocking mode of a file descriptor (False if the O_NONBLOCK - flag is set, True otherwise). These functions are not available on - Windows. - -- bpo-17172: Make turtledemo start as active on OS X even when run with - subprocess. Patch by Lita Cho. - -- bpo-21704: Fix build error for _multiprocessing when semaphores are not - available. Patch by Arfrever Frehtes Taifersar Arahesis. - -- bpo-20173: Convert sha1, sha256, sha512 and md5 to ArgumentClinic. Patch - by Vajrasky Kok. - -- Fix repr(_socket.socket) on Windows 64-bit: don't fail with OverflowError - on closed socket. repr(socket.socket) already works fine. - -- bpo-22033: Reprs of most Python implemened classes now contain actual - class name instead of hardcoded one. - -- bpo-21947: The dis module can now disassemble generator-iterator objects - based on their gi_code attribute. Patch by Clement Rouault. - -- bpo-16133: The asynchat.async_chat.handle_read() method now ignores - BlockingIOError exceptions. - -- bpo-22044: Fixed premature DECREF in call_tzinfo_method. Patch by Tom - Flanagan. - -- bpo-19884: readline: Disable the meta modifier key if stdout is not a - terminal to not write the ANSI sequence ``"\033[1034h"`` into stdout. This - sequence is used on some terminal (ex: TERM=xterm-256color") to enable - support of 8 bit characters. - -- bpo-4350: Removed a number of out-of-dated and non-working for a long time - Tkinter methods. - -- bpo-6167: Scrollbar.activate() now returns the name of active element if - the argument is not specified. Scrollbar.set() now always accepts only 2 - arguments. - -- bpo-15275: Clean up and speed up the ntpath module. - -- bpo-21888: plistlib's load() and loads() now work if the fmt parameter is - specified. - -- bpo-22032: __qualname__ instead of __name__ is now always used to format - fully qualified class names of Python implemented classes. - -- bpo-22031: Reprs now always use hexadecimal format with the "0x" prefix - when contain an id in form " at 0x...". - -- bpo-22018: signal.set_wakeup_fd() now raises an OSError instead of a - ValueError on ``fstat()`` failure. - -- bpo-21044: tarfile.open() now handles fileobj with an integer 'name' - attribute. Based on patch by Antoine Pietri. - -- bpo-21966: Respect -q command-line option when code module is ran. - -- bpo-19076: Don't pass the redundant 'file' argument to self.error(). - -- bpo-16382: Improve exception message of warnings.warn() for bad category. - Initial patch by Phil Elson. - -- bpo-21932: os.read() now uses a :c:func:`Py_ssize_t` type instead of - :c:type:`int` for the size to support reading more than 2 GB at once. On - Windows, the size is truncted to INT_MAX. As any call to os.read(), the OS - may read less bytes than the number of requested bytes. - -- bpo-21942: Fixed source file viewing in pydoc's server mode on Windows. - -- bpo-11259: asynchat.async_chat().set_terminator() now raises a ValueError - if the number of received bytes is negative. - -- bpo-12523: asynchat.async_chat.push() now raises a TypeError if it doesn't - get a bytes string - -- bpo-21707: Add missing kwonlyargcount argument to - ModuleFinder.replace_paths_in_code(). - -- bpo-20639: calling Path.with_suffix('') allows removing the suffix again. - Patch by July Tikhonov. - -- bpo-21714: Disallow the construction of invalid paths using - Path.with_name(). Original patch by Antony Lee. - -- bpo-15014: Added 'auth' method to smtplib to make implementing auth - mechanisms simpler, and used it internally in the login method. - -- bpo-21151: Fixed a segfault in the winreg module when ``None`` is passed - as a ``REG_BINARY`` value to SetValueEx. Patch by John Ehresman. - -- bpo-21090: io.FileIO.readall() does not ignore I/O errors anymore. Before, - it ignored I/O errors if at least the first C call read() succeed. - -- bpo-5800: headers parameter of wsgiref.headers.Headers is now optional. - Initial patch by Pablo Torres Navarrete and SilentGhost. - -- bpo-21781: ssl.RAND_add() now supports strings longer than 2 GB. - -- bpo-21679: Prevent extraneous fstat() calls during open(). Patch by - Bohuslav Kabrda. - -- bpo-21863: cProfile now displays the module name of C extension functions, - in addition to their own name. - -- bpo-11453: asyncore: emit a ResourceWarning when an unclosed file_wrapper - object is destroyed. The destructor now closes the file if needed. The - close() method can now be called twice: the second call does nothing. - -- bpo-21858: Better handling of Python exceptions in the sqlite3 module. - -- bpo-21476: Make sure the email.parser.BytesParser TextIOWrapper is - discarded after parsing, so the input file isn't unexpectedly closed. - -- bpo-20295: imghdr now recognizes OpenEXR format images. - -- bpo-21729: Used the "with" statement in the dbm.dumb module to ensure - files closing. Patch by Claudiu Popa. - -- bpo-21491: socketserver: Fix a race condition in child processes reaping. - -- bpo-21719: Added the ``st_file_attributes`` field to os.stat_result on - Windows. - -- bpo-21832: Require named tuple inputs to be exact strings. - -- bpo-21722: The distutils "upload" command now exits with a non-zero return - code when uploading fails. Patch by Martin Dengler. - -- bpo-21723: asyncio.Queue: support any type of number (ex: float) for the - maximum size. Patch written by Vajrasky Kok. - -- bpo-21711: support for "site-python" directories has now been removed from - the site module (it was deprecated in 3.4). - -- bpo-17552: new socket.sendfile() method allowing a file to be sent over a - socket by using high-performance os.sendfile() on UNIX. Patch by Giampaolo - Rodola'. - -- bpo-18039: dbm.dump.open() now always creates a new database when the flag - has the value 'n'. Patch by Claudiu Popa. - -- bpo-21326: Add a new is_closed() method to asyncio.BaseEventLoop. - run_forever() and run_until_complete() methods of asyncio.BaseEventLoop - now raise an exception if the event loop was closed. - -- bpo-21766: Prevent a security hole in CGIHTTPServer by URL unquoting paths - before checking for a CGI script at that path. - -- bpo-21310: Fixed possible resource leak in failed open(). - -- bpo-21256: Printout of keyword args should be in deterministic order in a - mock function call. This will help to write better doctests. - -- bpo-21677: Fixed chaining nonnormalized exceptions in io close() methods. - -- bpo-11709: Fix the pydoc.help function to not fail when sys.stdin is not a - valid file. - -- bpo-21515: tempfile.TemporaryFile now uses os.O_TMPFILE flag is available. - -- bpo-13223: Fix pydoc.writedoc so that the HTML documentation for methods - that use 'self' in the example code is generated correctly. - -- bpo-21463: In urllib.request, fix pruning of the FTP cache. - -- bpo-21618: The subprocess module could fail to close open fds that were - inherited by the calling process and already higher than POSIX resource - limits would otherwise allow. On systems with a functioning /proc/self/fd - or /dev/fd interface the max is now ignored and all fds are closed. - -- bpo-20383: Introduce importlib.util.module_from_spec() as the preferred - way to create a new module. - -- bpo-21552: Fixed possible integer overflow of too long string lengths in - the tkinter module on 64-bit platforms. - -- bpo-14315: The zipfile module now ignores extra fields in the central - directory that are too short to be parsed instead of letting a - struct.unpack error bubble up as this "bad data" appears in many real - world zip files in the wild and is ignored by other zip tools. - -- bpo-13742: Added "key" and "reverse" parameters to heapq.merge(). (First - draft of patch contributed by Simon Sapin.) - -- bpo-21402: tkinter.ttk now works when default root window is not set. - -- bpo-3015: _tkinter.create() now creates tkapp object with wantobject=1 by - default. - -- bpo-10203: sqlite3.Row now truly supports sequence protocol. In - particular it supports reverse() and negative indices. Original patch by - Claudiu Popa. - -- bpo-18807: If copying (no symlinks) specified for a venv, then the python - interpreter aliases (python, python3) are now created by copying rather - than symlinking. - -- bpo-20197: Added support for the WebP image type in the imghdr module. - Patch by Fabrice Aneche and Claudiu Popa. - -- bpo-21513: Speedup some properties of IP addresses (IPv4Address, - IPv6Address) such as .is_private or .is_multicast. - -- bpo-21137: Improve the repr for threading.Lock() and its variants by - showing the "locked" or "unlocked" status. Patch by Berker Peksag. - -- bpo-21538: The plistlib module now supports loading of binary plist files - when reference or offset size is not a power of two. - -- bpo-21455: Add a default backlog to socket.listen(). - -- bpo-21525: Most Tkinter methods which accepted tuples now accept lists - too. - -- bpo-22166: With the assistance of a new internal _codecs._forget_codec - helping function, test_codecs now clears the encoding caches to avoid the - appearance of a reference leak - -- bpo-22236: Tkinter tests now don't reuse default root window. New root - window is created for every test class. - -- bpo-10744: Fix PEP 3118 format strings on ctypes objects with a nontrivial - shape. - -- bpo-20826: Optimize ipaddress.collapse_addresses(). - -- bpo-21487: Optimize ipaddress.summarize_address_range() and - ipaddress.{IPv4Network,IPv6Network}.subnets(). - -- bpo-21486: Optimize parsing of netmasks in ipaddress.IPv4Network and - ipaddress.IPv6Network. - -- bpo-13916: Disallowed the surrogatepass error handler for non UTF-\* - encodings. - -- bpo-20998: Fixed re.fullmatch() of repeated single character pattern with - ignore case. Original patch by Matthew Barnett. - -- bpo-21075: fileinput.FileInput now reads bytes from standard stream if - binary mode is specified. Patch by Sam Kimbrel. - -- bpo-19775: Add a samefile() method to pathlib Path objects. Initial patch - by Vajrasky Kok. - -- bpo-21226: Set up modules properly in PyImport_ExecCodeModuleObject (and - friends). - -- bpo-21398: Fix a unicode error in the pydoc pager when the documentation - contains characters not encodable to the stdout encoding. - -- bpo-16531: ipaddress.IPv4Network and ipaddress.IPv6Network now accept an - (address, netmask) tuple argument, so as to easily construct network - objects from existing addresses. - -- bpo-21156: importlib.abc.InspectLoader.source_to_code() is now a - staticmethod. - -- bpo-21424: Simplified and optimized heaqp.nlargest() and nmsmallest() to - make fewer tuple comparisons. - -- bpo-21396: Fix TextIOWrapper(..., write_through=True) to not force a - flush() on the underlying binary stream. Patch by akira. - -- bpo-18314: Unlink now removes junctions on Windows. Patch by Kim Gräsman - -- bpo-21088: Bugfix for curses.window.addch() regression in 3.4.0. In - porting to Argument Clinic, the first two arguments were reversed. - -- bpo-21407: _decimal: The module now supports function signatures. - -- bpo-10650: Remove the non-standard 'watchexp' parameter from the - Decimal.quantize() method in the Python version. It had never been - present in the C version. - -- bpo-21469: Reduced the risk of false positives in robotparser by checking - to make sure that robots.txt has been read or does not exist prior to - returning True in can_fetch(). - -- bpo-19414: Have the OrderedDict mark deleted links as unusable. This gives - an early failure if the link is deleted during iteration. - -- bpo-21421: Add __slots__ to the MappingViews ABC. Patch by Josh Rosenberg. - -- bpo-21101: Eliminate double hashing in the C speed-up code for - collections.Counter(). - -- bpo-21321: itertools.islice() now releases the reference to the source - iterator when the slice is exhausted. Patch by Anton Afanasyev. - -- bpo-21057: TextIOWrapper now allows the underlying binary stream's read() - or read1() method to return an arbitrary bytes-like object (such as a - memoryview). Patch by Nikolaus Rath. - -- bpo-20951: SSLSocket.send() now raises either SSLWantReadError or - SSLWantWriteError on a non-blocking socket if the operation would block. - Previously, it would return 0. Patch by Nikolaus Rath. - -- bpo-13248: removed previously deprecated asyncore.dispatcher __getattr__ - cheap inheritance hack. - -- bpo-9815: assertRaises now tries to clear references to local variables in - the exception's traceback. - -- bpo-19940: ssl.cert_time_to_seconds() now interprets the given time string - in the UTC timezone (as specified in RFC 5280), not the local timezone. - -- bpo-13204: Calling sys.flags.__new__ would crash the interpreter, now it - raises a TypeError. - -- bpo-19385: Make operations on a closed dbm.dumb database always raise the - same exception. - -- bpo-21207: Detect when the os.urandom cached fd has been closed or - replaced, and open it anew. - -- bpo-21291: subprocess's Popen.wait() is now thread safe so that multiple - threads may be calling wait() or poll() on a Popen instance at the same - time without losing the Popen.returncode value. - -- bpo-21127: Path objects can now be instantiated from str subclass - instances (such as ``numpy.str_``). - -- bpo-15002: urllib.response object to use _TemporaryFileWrapper (and - _TemporaryFileCloser) facility. Provides a better way to handle file - descriptor close. Patch contributed by Christian Theune. - -- bpo-12220: mindom now raises a custom ValueError indicating it doesn't - support spaces in URIs instead of letting a 'split' ValueError bubble up. - -- bpo-21068: The ssl.PROTOCOL* constants are now enum members. - -- bpo-21276: posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd. - -- bpo-21262: New method assert_not_called for Mock. It raises AssertionError - if the mock has been called. - -- bpo-21238: New keyword argument `unsafe` to Mock. It raises - `AttributeError` incase of an attribute startswith assert or assret. - -- bpo-20896: ssl.get_server_certificate() now uses PROTOCOL_SSLv23, not - PROTOCOL_SSLv3, for maximum compatibility. - -- bpo-21239: patch.stopall() didn't work deterministically when the same - name was patched more than once. - -- bpo-21203: Updated fileConfig and dictConfig to remove inconsistencies. - Thanks to Jure Koren for the patch. - -- bpo-21222: Passing name keyword argument to mock.create_autospec now - works. - -- bpo-21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX. - -- bpo-17498: Some SMTP servers disconnect after certain errors, violating - strict RFC conformance. Instead of losing the error code when we issue - the subsequent RSET, smtplib now returns the error code and defers raising - the SMTPServerDisconnected error until the next command is issued. - -- bpo-17826: setting an iterable side_effect on a mock function created by - create_autospec now works. Patch by Kushal Das. - -- bpo-7776: Fix ``Host:`` header and reconnection when using - http.client.HTTPConnection.set_tunnel(). Patch by Nikolaus Rath. - -- bpo-20968: unittest.mock.MagicMock now supports division. Patch by - Johannes Baiter. - -- bpo-21529: Fix arbitrary memory access in JSONDecoder.raw_decode with a - negative second parameter. Bug reported by Guido Vranken. (See also: - CVE-2014-4616) - -- bpo-21169: getpass now handles non-ascii characters that the input stream - encoding cannot encode by re-encoding using the replace error handler. - -- bpo-21171: Fixed undocumented filter API of the rot13 codec. Patch by - Berker Peksag. - -- bpo-20539: Improved math.factorial error message for large positive inputs - and changed exception type (OverflowError -> ValueError) for large - negative inputs. - -- bpo-21172: isinstance check relaxed from dict to collections.Mapping. - -- bpo-21155: asyncio.EventLoop.create_unix_server() now raises a ValueError - if path and sock are specified at the same time. - -- bpo-21136: Avoid unnecessary normalization of Fractions resulting from - power and other operations. Patch by Raymond Hettinger. - -- bpo-17621: Introduce importlib.util.LazyLoader. - -- bpo-21076: signal module constants were turned into enums. Patch by - Giampaolo Rodola'. - -- bpo-20636: Improved the repr of Tkinter widgets. - -- bpo-19505: The items, keys, and values views of OrderedDict now support - reverse iteration using reversed(). - -- bpo-21149: Improved thread-safety in logging cleanup during interpreter - shutdown. Thanks to Devin Jeanpierre for the patch. - -- bpo-21058: Fix a leak of file descriptor in - :func:`tempfile.NamedTemporaryFile`, close the file descriptor if - :func:`io.open` fails - -- bpo-21200: Return None from pkgutil.get_loader() when __spec__ is missing. - -- bpo-21013: Enhance ssl.create_default_context() when used for server side - sockets to provide better security by default. - -- bpo-20145: `assertRaisesRegex` and `assertWarnsRegex` now raise a - TypeError if the second argument is not a string or compiled regex. - -- bpo-20633: Replace relative import by absolute import. - -- bpo-20980: Stop wrapping exception when using ThreadPool. - -- bpo-21082: In os.makedirs, do not set the process-wide umask. Note this - changes behavior of makedirs when exist_ok=True. - -- bpo-20990: Fix issues found by pyflakes for multiprocessing. - -- bpo-21015: SSL contexts will now automatically select an elliptic curve - for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to - "prime256v1". - -- bpo-21000: Improve the command-line interface of json.tool. - -- bpo-20995: Enhance default ciphers used by the ssl module to enable better - security and prioritize perfect forward secrecy. - -- bpo-20884: Don't assume that __file__ is defined on importlib.__init__. - -- bpo-21499: Ignore __builtins__ in several test_importlib.test_api tests. - -- bpo-20627: xmlrpc.client.ServerProxy is now a context manager. - -- bpo-19165: The formatter module now raises DeprecationWarning instead of - PendingDeprecationWarning. - -- bpo-13936: Remove the ability of datetime.time instances to be considered - false in boolean contexts. - -- bpo-18931: selectors module now supports /dev/poll on Solaris. Patch by - Giampaolo Rodola'. - -- bpo-19977: When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale), - :py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the - ``surrogateescape`` error handler, instead of the ``strict`` error - handler. - -- bpo-20574: Implement incremental decoder for cp65001 code (Windows code - page 65001, Microsoft UTF-8). - -- bpo-20879: Delay the initialization of encoding and decoding tables for - base32, ascii85 and base85 codecs in the base64 module, and delay the - initialization of the unquote_to_bytes() table of the urllib.parse module, - to not waste memory if these modules are not used. - -- bpo-19157: Include the broadcast address in the usuable hosts for IPv6 in - ipaddress. - -- bpo-11599: When an external command (e.g. compiler) fails, distutils now - prints out the whole command line (instead of just the command name) if - the environment variable DISTUTILS_DEBUG is set. - -- bpo-4931: distutils should not produce unhelpful "error: None" messages - anymore. distutils.util.grok_environment_error is kept but doc-deprecated. - -- bpo-20875: Prevent possible gzip "'read' is not defined" NameError. Patch - by Claudiu Popa. - -- bpo-11558: ``email.message.Message.attach`` now returns a more useful - error message if ``attach`` is called on a message for which - ``is_multipart`` is False. - -- bpo-20283: RE pattern methods now accept the string keyword parameters as - documented. The pattern and source keyword parameters are left as - deprecated aliases. - -- bpo-20778: Fix modulefinder to work with bytecode-only modules. - -- bpo-20791: copy.copy() now doesn't make a copy when the input is a bytes - object. Initial patch by Peter Otten. - -- bpo-19748: On AIX, time.mktime() now raises an OverflowError for year - outsize range [1902; 2037]. - -- bpo-19573: inspect.signature: Use enum for parameter kind constants. - -- bpo-20726: inspect.signature: Make Signature and Parameter picklable. - -- bpo-17373: Add inspect.Signature.from_callable method. - -- bpo-20378: Improve repr of inspect.Signature and inspect.Parameter. - -- bpo-20816: Fix inspect.getcallargs() to raise correct TypeError for - missing keyword- only arguments. Patch by Jeremiah Lowin. - -- bpo-20817: Fix inspect.getcallargs() to fail correctly if more than 3 - arguments are missing. Patch by Jeremiah Lowin. - -- bpo-6676: Ensure a meaningful exception is raised when attempting to parse - more than one XML document per pyexpat xmlparser instance. (Original - patches by Hirokazu Yamamoto and Amaury Forgeot d'Arc, with suggested - wording by David Gutteridge) - -- bpo-21117: Fix inspect.signature to better support functools.partial. Due - to the specifics of functools.partial implementation, positional-or- - keyword arguments passed as keyword arguments become keyword-only. - -- bpo-20334: inspect.Signature and inspect.Parameter are now hashable. - Thanks to Antony Lee for bug reports and suggestions. - -- bpo-15916: doctest.DocTestSuite returns an empty unittest.TestSuite - instead of raising ValueError if it finds no tests - -- bpo-21209: Fix asyncio.tasks.CoroWrapper to workaround a bug in yield-from - implementation in CPythons prior to 3.4.1. - -- asyncio: Add gi_{frame,running,code} properties to CoroWrapper (upstream - issue #163). - -- bpo-21311: Avoid exception in _osx_support with non-standard compiler - configurations. Patch by John Szakmeister. - -- bpo-11571: Ensure that the turtle window becomes the topmost window when - launched on OS X. - -- bpo-21801: Validate that __signature__ is None or an instance of - Signature. - -- bpo-21923: Prevent AttributeError in - distutils.sysconfig.customize_compiler due to possible uninitialized - _config_vars. - -- bpo-21323: Fix http.server to again handle scripts in CGI subdirectories, - broken by the fix for security issue #19435. Patch by Zach Byrne. - -- bpo-22733: Fix ffi_prep_args not zero-extending argument values correctly - on 64-bit Windows. - -- bpo-23302: Default to TCP_NODELAY=1 upon establishing an HTTPConnection. - Removed use of hard-coded MSS as it's an optimization that's no longer - needed with Nagle disabled. - -IDLE ----- - -- bpo-20577: Configuration of the max line length for the FormatParagraph - extension has been moved from the General tab of the Idle preferences - dialog to the FormatParagraph tab of the Config Extensions dialog. Patch - by Tal Einat. - -- bpo-16893: Update Idle doc chapter to match current Idle and add new - information. - -- bpo-3068: Add Idle extension configuration dialog to Options menu. Changes - are written to HOME/.idlerc/config-extensions.cfg. Original patch by Tal - Einat. - -- bpo-16233: A module browser (File : Class Browser, Alt+C) requires an - editor window with a filename. When Class Browser is requested otherwise, - from a shell, output window, or 'Untitled' editor, Idle no longer displays - an error box. It now pops up an Open Module box (Alt+M). If a valid name - is entered and a module is opened, a corresponding browser is also opened. - -- bpo-4832: Save As to type Python files automatically adds .py to the name - you enter (even if your system does not display it). Some systems - automatically add .txt when type is Text files. - -- bpo-21986: Code objects are not normally pickled by the pickle module. To - match this, they are no longer pickled when running under Idle. - -- bpo-17390: Adjust Editor window title; remove 'Python', move version to - end. - -- bpo-14105: Idle debugger breakpoints no longer disappear when inserting or - deleting lines. - -- bpo-17172: Turtledemo can now be run from Idle. Currently, the entry is on - the Help menu, but it may move to Run. Patch by Ramchandra Apt and Lita - Cho. - -- bpo-21765: Add support for non-ascii identifiers to HyperParser. - -- bpo-21940: Add unittest for WidgetRedirector. Initial patch by Saimadhav - Heblikar. - -- bpo-18592: Add unittest for SearchDialogBase. Patch by Phil Webster. - -- bpo-21694: Add unittest for ParenMatch. Patch by Saimadhav Heblikar. - -- bpo-21686: add unittest for HyperParser. Original patch by Saimadhav - Heblikar. - -- bpo-12387: Add missing upper(lower)case versions of default Windows key - bindings for Idle so Caps Lock does not disable them. Patch by Roger - Serwy. - -- bpo-21695: Closing a Find-in-files output window while the search is still - in progress no longer closes Idle. - -- bpo-18910: Add unittest for textView. Patch by Phil Webster. - -- bpo-18292: Add unittest for AutoExpand. Patch by Saihadhav Heblikar. - -- bpo-18409: Add unittest for AutoComplete. Patch by Phil Webster. - -- bpo-21477: htest.py - Improve framework, complete set of tests. Patches by - Saimadhav Heblikar - -- bpo-18104: Add idlelib/idle_test/htest.py with a few sample tests to begin - consolidating and improving human-validated tests of Idle. Change other - files as needed to work with htest. Running the module as __main__ runs - all tests. - -- bpo-21139: Change default paragraph width to 72, the PEP 8 recommendation. - -- bpo-21284: Paragraph reformat test passes after user changes reformat - width. - -- bpo-17654: Ensure IDLE menus are customized properly on OS X for non- - framework builds and for all variants of Tk. - -- bpo-23180: Rename IDLE "Windows" menu item to "Window". Patch by Al - Sweigart. - -Build ------ - -- bpo-15506: Use standard PKG_PROG_PKG_CONFIG autoconf macro in the - configure script. - -- bpo-22935: Allow the ssl module to be compiled if openssl doesn't support - SSL 3. - -- bpo-22592: Drop support of the Borland C compiler to build Python. The - distutils module still supports it to build extensions. - -- bpo-22591: Drop support of MS-DOS, especially of the DJGPP compiler (MS- - DOS port of GCC). - -- bpo-16537: Check whether self.extensions is empty in setup.py. Patch by - Jonathan Hosmer. - -- bpo-22359: Remove incorrect uses of recursive make. Patch by Jonas - Wagner. - -- bpo-21958: Define HAVE_ROUND when building with Visual Studio 2013 and - above. Patch by Zachary Turner. - -- bpo-18093: the programs that embed the CPython runtime are now in a - separate "Programs" directory, rather than being kept in the Modules - directory. - -- bpo-15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/ - now display special message when and only when there are failures. - -- bpo-21141: The Windows build process no longer attempts to find Perl, - instead relying on OpenSSL source being configured and ready to build. - The ``PCbuild\build_ssl.py`` script has been re-written and re-named to - ``PCbuild\prepare_ssl.py``, and takes care of configuring OpenSSL source - for both 32 and 64 bit platforms. OpenSSL sources obtained from - svn.python.org will always be pre-configured and ready to build. - -- bpo-21037: Add a build option to enable AddressSanitizer support. - -- bpo-19962: The Windows build process now creates "python.bat" in the root - of the source tree, which passes all arguments through to the most - recently built interpreter. - -- bpo-21285: Refactor and fix curses configure check to always search in a - ncursesw directory. - -- bpo-15234: For BerkelyDB and Sqlite, only add the found library and - include directories if they aren't already being searched. This avoids an - explicit runtime library dependency. - -- bpo-17861: Tools/scripts/generate_opcode_h.py automatically regenerates - Include/opcode.h from Lib/opcode.py if the latter gets any change. - -- bpo-20644: OS X installer build support for documentation build changes in - 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. - -- bpo-20022: Eliminate use of deprecated bundlebuilder in OS X builds. - -- bpo-15968: Incorporated Tcl, Tk, and Tix builds into the Windows build - solution. - -- bpo-17095: Fix Modules/Setup *shared* support. - -- bpo-21811: Anticipated fixes to support OS X versions > 10.9. - -- bpo-21166: Prevent possible segfaults and other random failures of python - --generate- posix-vars in pybuilddir.txt build target. - -- bpo-18096: Fix library order returned by python-config. - -- bpo-17219: Add library build dir for Python extension cross-builds. - -- bpo-22919: Windows build updated to support VC 14.0 (Visual Studio 2015), - which will be used for the official release. - -- bpo-21236: Build _msi.pyd with cabinet.lib instead of fci.lib - -- bpo-17128: Use private version of OpenSSL for OS X 10.5+ installer. - -C API ------ - -- bpo-14203: Remove obsolete support for view==NULL in PyBuffer_FillInfo(), - bytearray_getbuffer(), bytesiobuf_getbuffer() and array_buffer_getbuf(). - All functions now raise BufferError in that case. - -- bpo-22445: PyBuffer_IsContiguous() now implements precise contiguity - tests, compatible with NumPy's NPY_RELAXED_STRIDES_CHECKING compilation - flag. Previously the function reported false negatives for corner cases. - -- bpo-22079: PyType_Ready() now checks that statically allocated type has no - dynamically allocated bases. - -- bpo-22453: Removed non-documented macro PyObject_REPR(). - -- bpo-18395: Rename ``_Py_char2wchar()`` to :c:func:`Py_DecodeLocale`, - rename ``_Py_wchar2char()`` to :c:func:`Py_EncodeLocale`, and document - these functions. - -- bpo-21233: Add new C functions: PyMem_RawCalloc(), PyMem_Calloc(), - PyObject_Calloc(), _PyObject_GC_Calloc(). bytes(int) is now using - ``calloc()`` instead of ``malloc()`` for large objects which is faster and - use less memory. - -- bpo-20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to - match what importlib does; this affects _frozen_importlib as well as any - module loaded using imp.init_frozen(). - -Documentation -------------- - -- bpo-19548: Update the codecs module documentation to better cover the - distinction between text encodings and other codecs, together with other - clarifications. Patch by Martin Panter. - -- bpo-22394: Doc/Makefile now supports ``make venv PYTHON=../python`` to - create a venv for generating the documentation, e.g., ``make html - PYTHON=venv/bin/python3``. - -- bpo-21514: The documentation of the json module now refers to new JSON RFC - 7159 instead of obsoleted RFC 4627. - -- bpo-21777: The binary sequence methods on bytes and bytearray are now - documented explicitly, rather than assuming users will be able to derive - the expected behaviour from the behaviour of the corresponding str - methods. - -- bpo-6916: undocument deprecated asynchat.fifo class. - -- bpo-17386: Expanded functionality of the ``Doc/make.bat`` script to make - it much more comparable to ``Doc/Makefile``. - -- bpo-21312: Update the thread_foobar.h template file to include newer - threading APIs. Patch by Jack McCracken. - -- bpo-21043: Remove the recommendation for specific CA organizations and to - mention the ability to load the OS certificates. - -- bpo-20765: Add missing documentation for PurePath.with_name() and - PurePath.with_suffix(). - -- bpo-19407: New package installation and distribution guides based on the - Python Packaging Authority tools. Existing guides have been retained as - legacy links from the distutils docs, as they still contain some required - reference material for tool developers that isn't recorded anywhere else. - -- bpo-19697: Document cases where __main__.__spec__ is None. - -Tests ------ - -- bpo-18982: Add tests for CLI of the calendar module. - -- bpo-19548: Added some additional checks to test_codecs to ensure that - statements in the updated documentation remain accurate. Patch by Martin - Panter. - -- bpo-22838: All test_re tests now work with unittest test discovery. - -- bpo-22173: Update lib2to3 tests to use unittest test discovery. - -- bpo-16000: Convert test_curses to use unittest. - -- bpo-21456: Skip two tests in test_urllib2net.py if _ssl module not - present. Patch by Remi Pointel. - -- bpo-20746: Fix test_pdb to run in refleak mode (-R). Patch by Xavier de - Gaye. - -- bpo-22060: test_ctypes has been somewhat cleaned up and simplified; it now - uses unittest test discovery to find its tests. - -- bpo-22104: regrtest.py no longer holds a reference to the suite of tests - loaded from test modules that don't define test_main(). - -- bpo-22111: Assorted cleanups in test_imaplib. Patch by Milan Oberkirch. - -- bpo-22002: Added ``load_package_tests`` function to test.support and used - it to implement/augment test discovery in test_asyncio, test_email, - test_importlib, test_json, and test_tools. - -- bpo-21976: Fix test_ssl to accept LibreSSL version strings. Thanks to - William Orr. - -- bpo-21918: Converted test_tools from a module to a package containing - separate test files for each tested script. - -- bpo-9554: Use modern unittest features in test_argparse. Initial patch by - Denver Coneybeare and Radu Voicilas. - -- bpo-20155: Changed HTTP method names in failing tests in test_httpservers - so that packet filtering software (specifically Windows Base Filtering - Engine) does not interfere with the transaction semantics expected by the - tests. - -- bpo-19493: Refactored the ctypes test package to skip tests explicitly - rather than silently. - -- bpo-18492: All resources are now allowed when tests are not run by - regrtest.py. - -- bpo-21634: Fix pystone micro-benchmark: use floor division instead of true - division to benchmark integers instead of floating point numbers. Set - pystone version to 1.2. Patch written by Lennart Regebro. - -- bpo-21605: Added tests for Tkinter images. - -- bpo-21493: Added test for ntpath.expanduser(). Original patch by Claudiu - Popa. - -- bpo-19925: Added tests for the spwd module. Original patch by Vajrasky - Kok. - -- bpo-21522: Added Tkinter tests for Listbox.itemconfigure(), - PanedWindow.paneconfigure(), and Menu.entryconfigure(). - -- bpo-17756: Fix test_code test when run from the installed location. - -- bpo-17752: Fix distutils tests when run from the installed location. - -- bpo-18604: Consolidated checks for GUI availability. All platforms now at - least check whether Tk can be instantiated when the GUI resource is - requested. +- Issue #26404: Add context manager to socketserver. Patch by Aviv Palivoda. -- bpo-21275: Fix a socket test on KFreeBSD. +- Issue #26735: Fix :func:`os.urandom` on Solaris 11.3 and newer when reading + more than 1,024 bytes: call ``getrandom()`` multiple times with a limit of + 1024 bytes per call. -- bpo-21223: Pass test_site/test_startup_imports when some of the extensions - are built as builtins. +- Issue #26585: Eliminate http.server._quote_html() and use + html.escape(quote=False). Patch by Xiang Zhang. -- bpo-20635: Added tests for Tk geometry managers. +- Issue #26685: Raise OSError if closing a socket fails. -- Add test case for freeze. +- Issue #16329: Add .webm to mimetypes.types_map. Patch by Giampaolo Rodola'. -- bpo-20743: Fix a reference leak in test_tcl. +- Issue #13952: Add .csv to mimetypes.types_map. Patch by Geoff Wilson. -- bpo-21097: Move test_namespace_pkgs into test_importlib. +- Issue #26587: the site module now allows .pth files to specify files to be + added to sys.path (e.g. zip files). -- bpo-21503: Use test_both() consistently in test_importlib. +- Issue #25609: Introduce contextlib.AbstractContextManager and + typing.ContextManager. -- bpo-20939: Avoid various network test failures due to new redirect of - http://www.python.org/ to https://www.python.org: use - http://www.example.com instead. +- Issue #26709: Fixed Y2038 problem in loading binary PLists. -- bpo-20668: asyncio tests no longer rely on tests.txt file. (Patch by - Vajrasky Kok) +- Issue #23735: Handle terminal resizing with Readline 6.3+ by installing our + own SIGWINCH handler. Patch by Eric Price. -- bpo-21093: Prevent failures of ctypes test_macholib on OS X if a copy of - libz exists in $HOME/lib or /usr/local/lib. +- Issue #25951: Change SSLSocket.sendall() to return None, as explicitly + documented for plain socket objects. Patch by Aviv Palivoda. -- bpo-22770: Prevent some Tk segfaults on OS X when running gui tests. +- Issue #26586: In http.server, respond with "413 Request header fields too + large" if there are too many header fields to parse, rather than killing + the connection and raising an unhandled exception. Patch by Xiang Zhang. -- bpo-23211: Workaround test_logging failure on some OS X 10.6 systems. +- Issue #26676: Added missing XMLPullParser to ElementTree.__all__. -- bpo-23345: Prevent test_ssl failures with large OpenSSL patch level values - (like 0.9.8zc). +- Issue #22854: Change BufferedReader.writable() and + BufferedWriter.readable() to always return False. -Tools/Demos ------------ +- Issue #26492: Exhausted iterator of array.array now conforms with the behavior + of iterators of other mutable sequences: it lefts exhausted even if iterated + array is extended. -- bpo-22314: pydoc now works when the LINES environment variable is set. +- Issue #26641: doctest.DocFileTest and doctest.testfile() now support + packages (module splitted into multiple directories) for the package + parameter. -- bpo-22615: Argument Clinic now supports the "type" argument for the int - converter. This permits using the int converter with enums and typedefs. +- Issue #25195: Fix a regression in mock.MagicMock. _Call is a subclass of + tuple (changeset 3603bae63c13 only works for classes) so we need to + implement __ne__ ourselves. Patch by Andrew Plummer. -- bpo-20076: The makelocalealias.py script no longer ignores UTF-8 mapping. +- Issue #26644: Raise ValueError rather than SystemError when a negative + length is passed to SSLSocket.recv() or read(). -- bpo-20079: The makelocalealias.py script now can parse the SUPPORTED file - from glibc sources and supports command line options for source paths. +- Issue #23804: Fix SSL recv(0) and read(0) methods to return zero bytes + instead of up to 1024. -- bpo-22201: Command-line interface of the zipfile module now correctly - extracts ZIP files with directory entries. Patch by Ryan Wilson. +- Issue #26616: Fixed a bug in datetime.astimezone() method. -- bpo-22120: For functions using an unsigned integer return converter, - Argument Clinic now generates a cast to that type for the comparison to -1 - in the generated code. (This suppresses a compilation warning.) +- Issue #26637: The :mod:`importlib` module now emits an :exc:`ImportError` + rather than a :exc:`TypeError` if :func:`__import__` is tried during the + Python shutdown process but :data:`sys.path` is already cleared (set to + ``None``). -- bpo-18974: Tools/scripts/diff.py now uses argparse instead of optparse. +- Issue #21925: :func:`warnings.formatwarning` now catches exceptions when + calling :func:`linecache.getline` and + :func:`tracemalloc.get_object_traceback` to be able to log + :exc:`ResourceWarning` emitted late during the Python shutdown process. -- bpo-21906: Make Tools/scripts/md5sum.py work in Python 3. Patch by Zachary - Ware. +- Issue #23848: On Windows, faulthandler.enable() now also installs an + exception handler to dump the traceback of all Python threads on any Windows + exception, not only on UNIX signals (SIGSEGV, SIGFPE, SIGABRT). -- bpo-21629: Fix Argument Clinic's "--converters" feature. +- Issue #26530: Add C functions :c:func:`_PyTraceMalloc_Track` and + :c:func:`_PyTraceMalloc_Untrack` to track memory blocks using the + :mod:`tracemalloc` module. Add :c:func:`_PyTraceMalloc_GetTraceback` to get + the traceback of an object. -- Add support for ``yield from`` to 2to3. +- Issue #26588: The _tracemalloc now supports tracing memory allocations of + multiple address spaces (domains). -- Add support for the PEP 465 matrix multiplication operator to 2to3. +- Issue #24266: Ctrl+C during Readline history search now cancels the search + mode when compiled with Readline 7. -- bpo-16047: Fix module exception list and __file__ handling in freeze. - Patch by Meador Inge. +- Issue #26590: Implement a safe finalizer for the _socket.socket type. It now + releases the GIL to close the socket. -- bpo-11824: Consider ABI tags in freeze. Patch by Meador Inge. +- Issue #18787: spwd.getspnam() now raises a PermissionError if the user + doesn't have privileges. -- bpo-20535: PYTHONWARNING no longer affects the run_tests.py script. Patch - by Arfrever Frehtes Taifersar Arahesis. +- Issue #26560: Avoid potential ValueError in BaseHandler.start_response. + Initial patch by Peter Inglesby. -Windows -------- +- Issue #26567: Add a new function :c:func:`PyErr_ResourceWarning` function to + pass the destroyed object. Add a *source* attribute to + :class:`warnings.WarningMessage`. Add warnings._showwarnmsg() which uses + tracemalloc to get the traceback where source object was allocated. -- bpo-23260: Update Windows installer +- [Security] Issue #26313: ssl.py _load_windows_store_certs fails if windows + cert store is empty. Patch by Baji. -- The bundled version of Tcl/Tk has been updated to 8.6.3. The most visible - result of this change is the addition of new native file dialogs when - running on Windows Vista or newer. See Tcl/Tk's TIP 432 for more - information. Also, this version of Tcl/Tk includes support for Windows - 10. +- Issue #26569: Fix :func:`pyclbr.readmodule` and :func:`pyclbr.readmodule_ex` + to support importing packages. -- bpo-17896: The Windows build scripts now expect external library sources - to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. +- Issue #26499: Account for remaining Content-Length in + HTTPResponse.readline() and read1(). Based on patch by Silent Ghost. + Also document that HTTPResponse now supports these methods. -- bpo-17717: The Windows build scripts now use a copy of NASM pulled from - svn.python.org to build OpenSSL. +- Issue #25320: Handle sockets in directories unittest discovery is scanning. + Patch from Victor van den Elzen. -- bpo-21907: Improved the batch scripts provided for building Python. +- Issue #16181: cookiejar.http2time() now returns None if year is higher than + datetime.MAXYEAR. -- bpo-22644: The bundled version of OpenSSL has been updated to 1.0.1j. +- Issue #26513: Fixes platform module detection of Windows Server -- bpo-10747: Use versioned labels in the Windows start menu. Patch by Olive - Kilburn. +- Issue #23718: Fixed parsing time in week 0 before Jan 1. Original patch by + Tamás Bence Gedai. -- bpo-22980: .pyd files with a version and platform tag (for example, - ".cp35-win32.pyd") will now be loaded in preference to those without tags. +- Issue #26323: Add Mock.assert_called() and Mock.assert_called_once() + methods to unittest.mock. Patch written by Amit Saha. +- Issue #20589: Invoking Path.owner() and Path.group() on Windows now raise + NotImplementedError instead of ImportError. -What's New in Python 3.4.0 final? -================================= +- Issue #26177: Fixed the keys() method for Canvas and Scrollbar widgets. -*Release date: 2014-03-16* +- Issue #15068: Got rid of excessive buffering in fileinput. + The bufsize parameter is now deprecated and ignored. -Library -------- +- Issue #19475: Added an optional argument timespec to the datetime + isoformat() method to choose the precision of the time component. -- bpo-20939: Fix test_geturl failure in test_urllibnet due to new redirect - of http://www.python.org/ to https://www.python.org. +- Issue #2202: Fix UnboundLocalError in + AbstractDigestAuthHandler.get_algorithm_impls. Initial patch by Mathieu + Dupuy. -Documentation -------------- +- Issue #26167: Minimized overhead in copy.copy() and copy.deepcopy(). + Optimized copying and deepcopying bytearrays, NotImplemented, slices, + short lists, tuples, dicts, sets. -- Merge in all documentation changes since branching 3.4.0rc1. +- Issue #25718: Fixed pickling and copying the accumulate() iterator with + total is None. +- Issue #26475: Fixed debugging output for regular expressions with the (?x) + flag. -What's New in Python 3.4.0 release candidate 3? -=============================================== +- Issue #26482: Allowed pickling recursive dequeues. -*Release date: 2014-03-09* +- Issue #26335: Make mmap.write() return the number of bytes written like + other write methods. Patch by Jakub Stasiak. -Core and Builtins ------------------ +- Issue #26457: Fixed the subnets() methods in IP network classes for the case + when resulting prefix length is equal to maximal prefix length. + Based on patch by Xiang Zhang. -- bpo-20786: Fix signatures for dict.__delitem__ and property.__delete__ - builtins. +- Issue #26385: Remove the file if the internal open() call in + NamedTemporaryFile() fails. Patch by Silent Ghost. -Library -------- +- Issue #26402: Fix XML-RPC client to retry when the server shuts down a + persistent connection. This was a regression related to the new + http.client.RemoteDisconnected exception in 3.5.0a4. -- bpo-20839: Don't trigger a DeprecationWarning in the still supported - pkgutil.get_loader() API when __loader__ isn't set on a module (nor when - pkgutil.find_loader() is called directly). +- Issue #25913: Leading ``<~`` is optional now in base64.a85decode() with + adobe=True. Patch by Swati Jaiswal. -Build ------ +- Issue #26186: Remove an invalid type check in importlib.util.LazyLoader. -- bpo-14512: Launch pydoc -b instead of pydocgui.pyw on Windows. +- Issue #26367: importlib.__import__() raises ImportError like + builtins.__import__() when ``level`` is specified but without an accompanying + package specified. -- bpo-20748: Uninstalling pip does not leave behind the pyc of the - uninstaller anymore. +- Issue #26309: In the "socketserver" module, shut down the request (closing + the connected socket) when verify_request() returns false. Patch by Aviv + Palivoda. -- bpo-20568: The Windows installer now installs the unversioned ``pip`` - command in addition to the versioned ``pip3`` and ``pip3.4`` commands. +- Issue #23430: Change the socketserver module to only catch exceptions + raised from a request handler that are derived from Exception (instead of + BaseException). Therefore SystemExit and KeyboardInterrupt no longer + trigger the handle_error() method, and will now to stop a single-threaded + server. -- bpo-20757: The ensurepip helper for the Windows uninstaller now skips - uninstalling pip (rather than failing) if the user has updated pip to a - different version from the one bundled with ensurepip. +- [Security] Issue #25939: On Windows open the cert store readonly in + ssl.enum_certificates. -- bpo-20465: Update OS X and Windows installer builds to use SQLite 3.8.3.1. +- Issue #25995: os.walk() no longer uses FDs proportional to the tree depth. +- Issue #25994: Added the close() method and the support of the context manager + protocol for the os.scandir() iterator. -What's New in Python 3.4.0 release candidate 2? -=============================================== +- Issue #23992: multiprocessing: make MapResult not fail-fast upon exception. -*Release date: 2014-02-23* +- Issue #26243: Support keyword arguments to zlib.compress(). Patch by Aviv + Palivoda. -Core and Builtins ------------------ +- Issue #26117: The os.scandir() iterator now closes file descriptor not only + when the iteration is finished, but when it was failed with error. -- bpo-20625: Parameter names in __annotations__ were not mangled properly. - Discovered by Jonas Wielicki, patch by Yury Selivanov. +- Issue #25949: __dict__ for an OrderedDict instance is now created only when + needed. -- bpo-20261: In pickle, lookup __getnewargs__ and __getnewargs_ex__ on the - type of the object. +- Issue #25911: Restored support of bytes paths in os.walk() on Windows. -- bpo-20619: Give the AST nodes of keyword-only arguments a column and line - number. +- Issue #26045: Add UTF-8 suggestion to error message when posting a + non-Latin-1 string with http.client. -- bpo-20526: Revert changes of issue #19466 which introduces a regression: - don't clear anymore the state of Python threads early during the Python - shutdown. +- Issue #26039: Added zipfile.ZipInfo.from_file() and zipinfo.ZipInfo.is_dir(). + Patch by Thomas Kluyver. -Library -------- +- Issue #12923: Reset FancyURLopener's redirect counter even if there is an + exception. Based on patches by Brian Brazil and Daniel Rocco. -- bpo-20710: The pydoc summary line no longer displays the "self" parameter - for bound methods. +- Issue #25945: Fixed a crash when unpickle the functools.partial object with + wrong state. Fixed a leak in failed functools.partial constructor. + "args" and "keywords" attributes of functools.partial have now always types + tuple and dict correspondingly. -- bpo-20566: Change asyncio.as_completed() to use a Queue, to avoid O(N**2) - behavior. +- Issue #26202: copy.deepcopy() now correctly copies range() objects with + non-atomic attributes. -- bpo-20704: Implement new debug API in asyncio. Add new methods - BaseEventLoop.set_debug() and BaseEventLoop.get_debug(). Add support for - setting 'asyncio.tasks._DEBUG' variable with 'PYTHONASYNCIODEBUG' - environment variable. +- Issue #23076: Path.glob() now raises a ValueError if it's called with an + invalid pattern. Patch by Thomas Nyberg. -- asyncio: Refactoring and fixes: BaseEventLoop.sock_connect() raises an - error if the address is not resolved; use __slots__ in Handle and - TimerHandle; as_completed() and wait() raise TypeError if the passed list - of Futures is a single Future; call_soon() and other 'call_*()' functions - raise TypeError if the passed callback is a coroutine function; - _ProactorBasePipeTransport uses _FlowControlMixin; - WriteTransport.set_write_buffer_size() calls _maybe_pause_protocol() to - consider pausing receiving if the watermark limits have changed; fix - _check_resolved_address() for IPv6 address; and other minor improvements, - along with multiple documentation updates. +- Issue #19883: Fixed possible integer overflows in zipimport. -- bpo-20684: Fix inspect.getfullargspec() to not to follow __wrapped__ - chains. Make its behaviour consistent with bound methods first argument. - Patch by Nick Coghlan and Yury Selivanov. +- Issue #26227: On Windows, getnameinfo(), gethostbyaddr() and + gethostbyname_ex() functions of the socket module now decode the hostname + from the ANSI code page rather than UTF-8. -- bpo-20681: Add new error handling API in asyncio. New APIs: - loop.set_exception_handler(), loop.default_exception_handler(), and - loop.call_exception_handler(). +- Issue #26099: The site module now writes an error into stderr if + sitecustomize module can be imported but executing the module raise an + ImportError. Same change for usercustomize. -- bpo-20673: Implement support for UNIX Domain Sockets in asyncio. New APIs: - loop.create_unix_connection(), loop.create_unix_server(), - streams.open_unix_connection(), and streams.start_unix_server(). +- Issue #26147: xmlrpc now works with strings not encodable with used + non-UTF-8 encoding. -- bpo-20616: Add a format() method to tracemalloc.Traceback. +- Issue #25935: Garbage collector now breaks reference loops with OrderedDict. -- bpo-19744: the ensurepip installation step now just prints a warning to - stderr rather than failing outright if SSL/TLS is unavailable. This allows - local installation of POSIX builds without SSL/TLS support. +- Issue #16620: Fixed AttributeError in msilib.Directory.glob(). -- bpo-20594: Avoid name clash with the libc function posix_close. +- Issue #26013: Added compatibility with broken protocol 2 pickles created + in old Python 3 versions (3.4.3 and lower). -Build ------ +- Issue #26129: Deprecated accepting non-integers in grp.getgrgid(). -- bpo-20641: Run MSI custom actions (pip installation, pyc compilation) with - the NoImpersonate flag, to support elevated execution (UAC). +- Issue #25850: Use cross-compilation by default for 64-bit Windows. -- bpo-20221: Removed conflicting (or circular) hypot definition when - compiled with VS 2010 or above. Initial patch by Tabrez Mohammed. +- Issue #25822: Add docstrings to the fields of urllib.parse results. + Patch contributed by Swati Jaiswal. -- bpo-20609: Restored the ability to build 64-bit Windows binaries on 32-bit - Windows, which was broken by the change in issue #19788. +- Issue #22642: Convert trace module option parsing mechanism to argparse. + Patch contributed by SilentGhost. +- Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars + appearing before $() vars. -What's New in Python 3.4.0 release candidate 1? -=============================================== +- Issue #26069: Remove the deprecated apis in the trace module. -*Release date: 2014-02-10* +- Issue #22138: Fix mock.patch behavior when patching descriptors. Restore + original values after patching. Patch contributed by Sean McCully. -Core and Builtins ------------------ +- Issue #25672: In the ssl module, enable the SSL_MODE_RELEASE_BUFFERS mode + option if it is safe to do so. -- bpo-19255: The builtins module is restored to initial value before - cleaning other modules. The sys and builtins modules are cleaned last. +- Issue #26012: Don't traverse into symlinks for ** pattern in + pathlib.Path.[r]glob(). -- bpo-20588: Make Python-ast.c C89 compliant. +- Issue #24120: Ignore PermissionError when traversing a tree with + pathlib.Path.[r]glob(). Patch by Ulrich Petri. -- bpo-20437: Fixed 22 potential bugs when deleting object references. +- Issue #21815: Accept ] characters in the data portion of imap responses, + in order to handle the flags with square brackets accepted and produced + by servers such as gmail. -- bpo-20500: Displaying an exception at interpreter shutdown no longer risks - triggering an assertion failure in PyObject_Str. +- Issue #25447: fileinput now uses sys.stdin as-is if it does not have a + buffer attribute (restores backward compatibility). -- bpo-20538: UTF-7 incremental decoder produced inconsistent string when - input was truncated in BASE64 section. +- Issue #25971: Optimized creating Fractions from floats by 2 times and from + Decimals by 3 times. -- bpo-20404: io.TextIOWrapper (and hence the open() builtin) now uses the - internal codec marking system added for issue #19619 to throw LookupError - for known non- text encodings at stream construction time. The existing - output type checks remain in place to deal with unmarked third party - codecs. +- Issue #25802: Document as deprecated the remaining implementations of + importlib.abc.Loader.load_module(). -- bpo-17162: Add PyType_GetSlot. +- Issue #25928: Add Decimal.as_integer_ratio(). -- bpo-20162: Fix an alignment issue in the siphash24() hash function which - caused a crash on PowerPC 64-bit (ppc64). +- Issue #25447: Copying the lru_cache() wrapper object now always works, + independently from the type of the wrapped object (by returning the original + object unchanged). -Library -------- +- Issue #25768: Have the functions in compileall return booleans instead of + ints and add proper documentation and tests for the return values. -- bpo-20530: The signatures for slot builtins have been updated to reflect - the fact that they only accept positional-only arguments. +- Issue #24103: Fixed possible use after free in ElementTree.XMLPullParser. -- bpo-20517: Functions in the os module that accept two filenames now - register both filenames in the exception on failure. +- Issue #25860: os.fwalk() no longer skips remaining directories when error + occurs. Original patch by Samson Lee. -- bpo-20563: The ipaddress module API is now considered stable. +- Issue #25914: Fixed and simplified OrderedDict.__sizeof__. -- bpo-14983: email.generator now always adds a line end after each MIME - boundary marker, instead of doing so only when there is an epilogue. This - fixes an RFC compliance bug and solves an issue with signed MIME parts. +- Issue #25869: Optimized deepcopying ElementTree; it is now 20 times faster. -- bpo-20540: Fix a performance regression (vs. Python 3.2) when layering a - multiprocessing Connection over a TCP socket. For small payloads, Nagle's - algorithm would introduce idle delays before the entire transmission of a - message. +- Issue #25873: Optimized iterating ElementTree. Iterating elements + Element.iter() is now 40% faster, iterating text Element.itertext() + is now up to 2.5 times faster. -- bpo-16983: the new email header parsing code will now decode encoded words - that are (incorrectly) surrounded by quotes, and register a defect. +- Issue #25902: Fixed various refcount issues in ElementTree iteration. -- bpo-19772: email.generator no longer mutates the message object when doing - a down- transform from 8bit to 7bit CTEs. +- Issue #22227: The TarFile iterator is reimplemented using generator. + This implementation is simpler that using class. -- bpo-20536: the statistics module now correctly handle Decimal instances - with positive exponents +- Issue #25638: Optimized ElementTree.iterparse(); it is now 2x faster. + Optimized ElementTree parsing; it is now 10% faster. -- bpo-18805: the netmask/hostmask parsing in ipaddress now more reliably - filters out illegal values and correctly allows any valid prefix length. +- Issue #25761: Improved detecting errors in broken pickle data. -- bpo-20481: For at least Python 3.4, the statistics module will require - that all inputs for a single operation be of a single consistent type, or - else a mixed of ints and a single other consistent type. This avoids some - interoperability issues that arose with the previous approach of coercing - to a suitable common type. +- Issue #25717: Restore the previous behaviour of tolerating most fstat() + errors when opening files. This was a regression in 3.5a1, and stopped + anonymous temporary files from working in special cases. -- bpo-20478: the statistics module now treats collections.Counter inputs - like any other iterable. +- Issue #24903: Fix regression in number of arguments compileall accepts when + '-d' is specified. The check on the number of arguments has been dropped + completely as it never worked correctly anyway. -- bpo-17369: get_filename was raising an exception if the filename - parameter's RFC2231 encoding was broken in certain ways. This was a - regression relative to python2. +- Issue #25764: In the subprocess module, preserve any exception caused by + fork() failure when preexec_fn is used. -- bpo-20013: Some imap servers disconnect if the current mailbox is deleted, - and imaplib did not handle that case gracefully. Now it handles the 'bye' - correctly. +- Issue #25771: Tweak the exception message for importlib.util.resolve_name() + when 'package' isn't specified but necessary. -- bpo-20531: Revert 3.4 version of fix for #19063, and apply the 3.3 - version. That is, do *not* raise an error if unicode is passed to - email.message.Message.set_payload. +- Issue #6478: _strptime's regexp cache now is reset after changing timezone + with time.tzset(). -- bpo-20476: If a non-compat32 policy is used with any of the email parsers, - EmailMessage is now used as the factory class. The factory class should - really come from the policy; that will get fixed in 3.5. +- Issue #14285: When executing a package with the "python -m package" option, + and package initialization fails, a proper traceback is now reported. The + "runpy" module now lets exceptions from package initialization pass back to + the caller, rather than raising ImportError. -- bpo-19920: TarFile.list() no longer fails when outputs a listing - containing non- encodable characters. Based on patch by Vajrasky Kok. +- Issue #19771: Also in runpy and the "-m" option, omit the irrelevant + message ". . . is a package and cannot be directly executed" if the package + could not even be initialized (e.g. due to a bad ``*.pyc`` file). -- bpo-20515: Fix NULL pointer dereference introduced by issue #20368. +- Issue #25177: Fixed problem with the mean of very small and very large + numbers. As a side effect, statistics.mean and statistics.variance should + be significantly faster. -- bpo-19186: Restore namespacing of expat symbols inside the pyexpat module. +- Issue #25718: Fixed copying object with state with boolean value is false. -- bpo-20053: ensurepip (and hence venv) are no longer affected by the - settings in the default pip configuration file. +- Issue #10131: Fixed deep copying of minidom documents. Based on patch + by Marian Ganisin. -- bpo-20426: When passing the re.DEBUG flag, re.compile() displays the debug - output every time it is called, regardless of the compilation cache. +- Issue #7990: dir() on ElementTree.Element now lists properties: "tag", + "text", "tail" and "attrib". Original patch by Santoso Wijaya. -- bpo-20368: The null character now correctly passed from Tcl to Python. - Improved error handling in variables-related commands. +- Issue #25725: Fixed a reference leak in pickle.loads() when unpickling + invalid data including tuple instructions. -- bpo-20435: Fix _pyio.StringIO.getvalue() to take into account newline - translation settings. +- Issue #25663: In the Readline completer, avoid listing duplicate global + names, and search the global namespace before searching builtins. -- tracemalloc: Fix slicing traces and fix slicing a traceback. +- Issue #25688: Fixed file leak in ElementTree.iterparse() raising an error. -- bpo-20354: Fix an alignment issue in the tracemalloc module on 64-bit - platforms. Bug seen on 64-bit Linux when using "make profile-opt". +- Issue #23914: Fixed SystemError raised by unpickler on broken pickle data. -- bpo-17159: inspect.signature now accepts duck types of functions, which - adds support for Cython functions. Initial patch by Stefan Behnel. +- Issue #25691: Fixed crash on deleting ElementTree.Element attributes. -- bpo-18801: Fix inspect.classify_class_attrs to correctly classify - object.__new__ and object.__init__. +- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory + entries. Patch by Dingyuan Wang. -- Fixed cmath.isinf's name in its argument parsing code. +- Issue #25626: Change three zlib functions to accept sizes that fit in + Py_ssize_t, but internally cap those sizes to UINT_MAX. This resolves a + regression in 3.5 where GzipFile.read() failed to read chunks larger than 2 + or 4 GiB. The change affects the zlib.Decompress.decompress() max_length + parameter, the zlib.decompress() bufsize parameter, and the + zlib.Decompress.flush() length parameter. -- bpo-20311: poll and epoll now round the timeout away from zero, instead of - rounding towards zero, in select and selectors modules: - select.epoll.poll(), selectors.PollSelector.poll() and - selectors.EpollSelector.poll(). For example, a timeout of one microsecond - (1e-6) is now rounded to one millisecondi (1e-3), instead of being rounded - to zero. However, the granularity property and asyncio's resolution - feature were removed again. (See also: bpo-20452) +- Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True) + when the OS gives priority to errors such as EACCES over EEXIST. -- asyncio: Some refactoring; various fixes; add write flow control to unix - pipes; Future.set_exception() instantiates the exception argument if it is - a class; improved proactor pipe transport; support wait_for(f, None); - don't log broken/disconnected pipes; use ValueError instead of assert for - forbidden subprocess_{shell,exec} arguments; added a convenience API for - subprocess management; added StreamReader.at_eof(); properly handle - duplicate coroutines/futures in gather(), wait(), as_completed(); use a - bytearray for buffering in StreamReader; and more. +- Issue #25593: Change semantics of EventLoop.stop() in asyncio. -- bpo-20288: fix handling of invalid numeric charrefs in HTMLParser. +- Issue #6973: When we know a subprocess.Popen process has died, do + not allow the send_signal(), terminate(), or kill() methods to do + anything as they could potentially signal a different process. -- bpo-20424: Python implementation of io.StringIO now supports lone - surrogates. +- Issue #23883: Added missing APIs to __all__ to match the documented APIs + for the following modules: calendar, csv, enum, fileinput, ftplib, logging, + optparse, tarfile, threading and wave. Also added a + test.support.check__all__() helper. Patches by Jacek Kołodziej, Mauro + S. M. Rodrigues and Joel Taddei. -- bpo-20308: inspect.signature now works on classes without user-defined - __init__ or __new__ methods. +- Issue #25590: In the Readline completer, only call getattr() once per + attribute. Also complete names of attributes such as properties and slots + which are listed by dir() but not yet created on an instance. -- bpo-20372: inspect.getfile (and a bunch of other inspect functions that - use it) doesn't crash with unexpected AttributeError on classes defined in - C without __module__. +- Issue #25498: Fix a crash when garbage-collecting ctypes objects created + by wrapping a memoryview. This was a regression made in 3.5a1. Based + on patch by Eryksun. -- bpo-20356: inspect.signature formatting uses '/' to separate positional- - only parameters from others. +- Issue #25584: Added "escape" to the __all__ list in the glob module. -- bpo-20223: inspect.signature now supports methods defined with - functools.partialmethods. +- Issue #25584: Fixed recursive glob() with patterns starting with '\*\*'. -- bpo-19456: ntpath.join() now joins relative paths correctly when a drive - is present. +- Issue #25446: Fix regression in smtplib's AUTH LOGIN support. -- bpo-19077: tempfile.TemporaryDirectory cleanup no longer fails when called - during shutdown. Emitting resource warning in __del__ no longer fails. - Original patch by Antoine Pitrou. +- Issue #18010: Fix the pydoc web server's module search function to handle + exceptions from importing packages. -- bpo-20394: Silence Coverity warning in audioop module. +- Issue #25554: Got rid of circular references in regular expression parsing. -- bpo-20367: Fix behavior of concurrent.futures.as_completed() for duplicate - arguments. Patch by Glenn Langford. +- Issue #18973: Command-line interface of the calendar module now uses argparse + instead of optparse. -- bpo-8260: The read(), readline() and readlines() methods of - codecs.StreamReader returned incomplete data when were called after - readline() or read(size). Based on patch by Amaury Forgeot d'Arc. +- Issue #25510: fileinput.FileInput.readline() now returns b'' instead of '' + at the end if the FileInput was opened with binary mode. + Patch by Ryosuke Ito. -- bpo-20105: the codec exception chaining now correctly sets the traceback - of the original exception as its __traceback__ attribute. +- Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. + Original patch by John Mark Vandenberg. -- bpo-17481: inspect.getfullargspec() now uses inspect.signature() API. +- Issue #25515: Always use os.urandom as a source of randomness in uuid.uuid4. -- bpo-15304: concurrent.futures.wait() can block forever even if Futures - have completed. Patch by Glenn Langford. +- Issue #21827: Fixed textwrap.dedent() for the case when largest common + whitespace is a substring of smallest leading whitespace. + Based on patch by Robert Li. -- bpo-14455: plistlib: fix serializing integers in the range of an unsigned - long long but outside of the range of signed long long for binary plist - files. +- Issue #25447: The lru_cache() wrapper objects now can be copied and pickled + (by returning the original object unchanged). -IDLE ----- +- Issue #25390: typing: Don't crash on Union[str, Pattern]. -- bpo-20406: Use Python application icons for Idle window title bars. Patch - mostly by Serhiy Storchaka. +- Issue #25441: asyncio: Raise error from drain() when socket is closed. -- Update the python.gif icon for the Idle classbrowser and pathbowser from - the old green snake to the new blue and yellow snakes. +- Issue #25410: Cleaned up and fixed minor bugs in C implementation of + OrderedDict. -- bpo-17721: Remove non-functional configuration dialog help button until we - make it actually gives some help when clicked. Patch by Guilherme Simões. +- Issue #25411: Improved Unicode support in SMTPHandler through better use of + the email package. Thanks to user simon04 for the patch. -Tests ------ +- Move the imp module from a PendingDeprecationWarning to DeprecationWarning. -- bpo-20532: Tests which use _testcapi now are marked as CPython only. +- Issue #25407: Remove mentions of the formatter module being removed in + Python 3.6. -- bpo-19920: Added tests for TarFile.list(). Based on patch by Vajrasky - Kok. +- Issue #25406: Fixed a bug in C implementation of OrderedDict.move_to_end() + that caused segmentation fault or hang in iterating after moving several + items to the start of ordered dict. -- bpo-19990: Added tests for the imghdr module. Based on patch by Claudiu - Popa. +- Issue #25382: pickletools.dis() now outputs implicit memo index for the + MEMOIZE opcode. -- bpo-20474: Fix test_socket "unexpected success" failures on OS X 10.7+. +- Issue #25357: Add an optional newline paramer to binascii.b2a_base64(). + base64.b64encode() uses it to avoid a memory copy. -Tools/Demos ------------ +- Issue #24164: Objects that need calling ``__new__`` with keyword arguments, + can now be pickled using pickle protocols older than protocol version 4. -- bpo-20530: Argument Clinic's signature format has been revised again. The - new syntax is highly human readable while still preventing false - positives. The syntax also extends Python syntax to denote "self" and - positional-only parameters, allowing inspect.Signature objects to be - totally accurate for all supported builtins in Python 3.4. +- Issue #25364: zipfile now works in threads disabled builds. -- bpo-20456: Argument Clinic now observes the C preprocessor conditional - compilation statements of the C files it parses. When a Clinic block is - inside a conditional code, it adjusts its output to match, including - automatically generating an empty methoddef macro. +- Issue #25328: smtpd's SMTPChannel now correctly raises a ValueError if both + decode_data and enable_SMTPUTF8 are set to true. -- bpo-20456: Cloned functions in Argument Clinic now use the correct name, - not the name of the function they were cloned from, for text strings - inside generated code. +- Issue #16099: RobotFileParser now supports Crawl-delay and Request-rate + extensions. Patch by Nikolay Bogoychev. -- bpo-20456: Fixed Argument Clinic's test suite and "--converters" feature. +- Issue #25316: distutils raises OSError instead of DistutilsPlatformError + when MSVC is not installed. -- bpo-20456: Argument Clinic now allows specifying different names for a - parameter in Python and C, using "as" on the parameter line. +- Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in + pickletools.opcodes. -- bpo-20326: Argument Clinic now uses a simple, unique signature to annotate - text signatures in docstrings, resulting in fewer false positives. "self" - parameters are also explicitly marked, allowing inspect.Signature() to - authoritatively detect (and skip) said parameters. +- Issue #23972: Updates asyncio datagram create method allowing reuseport + and reuseaddr socket options to be set prior to binding the socket. + Mirroring the existing asyncio create_server method the reuseaddr option + for datagram sockets defaults to True if the O/S is 'posix' (except if the + platform is Cygwin). Patch by Chris Laws. -- bpo-20326: Argument Clinic now generates separate checksums for the input - and output sections of the block, allowing external tools to verify that - the input has not changed (and thus the output is not out-of-date). +- Issue #25304: Add asyncio.run_coroutine_threadsafe(). This lets you + submit a coroutine to a loop from another thread, returning a + concurrent.futures.Future. By Vincent Michel. -Build ------ +- Issue #25232: Fix CGIRequestHandler to split the query from the URL at the + first question mark (?) rather than the last. Patch from Xiang Zhang. -- bpo-20465: Update SQLite shipped with OS X installer to 3.8.3. +- Issue #24657: Prevent CGIRequestHandler from collapsing slashes in the + query part of the URL as if it were a path. Patch from Xiang Zhang. -C API ------ +- Issue #25287: Don't add crypt.METHOD_CRYPT to crypt.methods if it's not + supported. Check if it is supported, it may not be supported on OpenBSD for + example. -- bpo-20517: Added new functions allowing OSError exceptions to reference - two filenames instead of one: PyErr_SetFromErrnoWithFilenameObjects() and - PyErr_SetExcFromWindowsErrWithFilenameObjects(). +- Issue #23600: Default implementation of tzinfo.fromutc() was returning + wrong results in some cases. -Documentation -------------- +- Issue #25203: Failed readline.set_completer_delims() no longer left the + module in inconsistent state. -- bpo-20488: Change wording to say importlib is *the* implementation of - import instead of just *an* implementation. +- Issue #25011: rlcompleter now omits private and special attribute names unless + the prefix starts with underscores. -- bpo-6386: Clarify in the tutorial that specifying a symlink to execute - means the directory containing the executed script and not the symlink is - added to sys.path. +- Issue #25209: rlcompleter now can add a space or a colon after completed + keyword. +- Issue #22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'. -What's New in Python 3.4.0 beta 3? -================================== +- Issue #23517: fromtimestamp() and utcfromtimestamp() methods of + datetime.datetime now round microseconds to nearest with ties going to + nearest even integer (ROUND_HALF_EVEN), as round(float), instead of rounding + towards -Infinity (ROUND_FLOOR). -*Release date: 2014-01-26* +- Issue #23552: Timeit now warns when there is substantial (4x) variance + between best and worst times. Patch from Serhiy Storchaka. -Core and Builtins ------------------ +- Issue #24633: site-packages/README -> README.txt. -- bpo-20189: Four additional builtin types (PyTypeObject, - PyMethodDescr_Type, _PyMethodWrapper_Type, and PyWrapperDescr_Type) have - been modified to provide introspection information for builtins. +- Issue #24879: help() and pydoc can now list named tuple fields in the + order they were defined rather than alphabetically. The ordering is + determined by the _fields attribute if present. -- bpo-17825: Cursor "^" is correctly positioned for SyntaxError and - IndentationError. +- Issue #24874: Improve speed of itertools.cycle() and make its + pickle more compact. -- bpo-2382: SyntaxError cursor "^" is now written at correct position in - most cases when multibyte characters are in line (before "^"). This still - not works correctly with wide East Asian characters. +- Fix crash in itertools.cycle.__setstate__() when the first argument wasn't + a list. -- bpo-18960: The first line of Python script could be executed twice when - the source encoding was specified on the second line. Now the source - encoding declaration on the second line isn't effective if the first line - contains anything except a comment. 'python -x' works now again with - files with the source encoding declarations, and can be used to make - Python batch files on Windows. +- Issue #20059: urllib.parse raises ValueError on all invalid ports. + Patch by Martin Panter. -Library -------- +- Issue #24360: Improve __repr__ of argparse.Namespace() for invalid + identifiers. Patch by Matthias Bussonnier. -- asyncio: Various improvements and small changes not all covered by issues - listed below. E.g. wait_for() now cancels the inner task if the timeout - occcurs; tweaked the set of exported symbols; renamed Empty/Full to - QueueEmpty/QueueFull; "with (yield from lock)" now uses a separate context - manager; readexactly() raises if not enough data was read; PTY support - tweaks. +- Issue #23426: run_setup was broken in distutils. + Patch from Alexander Belopolsky. -- bpo-20311: asyncio: Add a granularity attribute to BaseEventLoop: maximum - between the resolution of the BaseEventLoop.time() method and the - resolution of the selector. The granuarility is used in the scheduler to - round time and deadline. +- Issue #13938: 2to3 converts StringTypes to a tuple. Patch from Mark Hammond. -- bpo-20311: selectors: Add a resolution attribute to BaseSelector. +- Issue #2091: open() accepted a 'U' mode string containing '+', but 'U' can + only be used with 'r'. Patch from Jeff Balogh and John O'Connor. -- bpo-20189: unittest.mock now no longer assumes that any object for which - it could get an inspect.Signature is a callable written in Python. Fix - courtesy of Michael Foord. +- Issue #8585: improved tests for zipimporter2. Patch from Mark Lawrence. -- bpo-20317: ExitStack.__exit__ could create a self-referential loop if an - exception raised by a cleanup operation already had its context set - correctly (for example, by the @contextmanager decorator). The infinite - loop this caused is now avoided by checking if the expected context is - already set before trying to fix it. +- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely. + Patch from Nicola Palumbo and Laurent De Buyst. -- bpo-20374: Fix build with GNU readline >= 6.3. +- Issue #24426: Fast searching optimization in regular expressions now works + for patterns that starts with capturing groups. Fast searching optimization + now can't be disabled at compile time. -- bpo-20262: Warnings are raised now when duplicate names are added in the - ZIP file or too long ZIP file comment is truncated. +- Issue #23661: unittest.mock side_effects can now be exceptions again. This + was a regression vs Python 3.4. Patch from Ignacio Rossi -- bpo-20165: The unittest module no longer considers tests marked with - @expectedFailure successful if they pass. +- Issue #13248: Remove deprecated inspect.getmoduleinfo function. -- bpo-18574: Added missing newline in 100-Continue reply from - http.server.BaseHTTPRequestHandler. Patch by Nikolaus Rath. +- Issue #25578: Fix (another) memory leak in SSLSocket.getpeercer(). -- bpo-20270: urllib.urlparse now supports empty ports. +- Issue #25530: Disable the vulnerable SSLv3 protocol by default when creating + ssl.SSLContext. -- bpo-20243: TarFile no longer raise ReadError when opened in write mode. +- Issue #25569: Fix memory leak in SSLSocket.getpeercert(). -- bpo-20238: TarFile opened with external fileobj and "w:gz" mode didn't - write complete output on close. +- Issue #25471: Sockets returned from accept() shouldn't appear to be + nonblocking. -- bpo-20245: The open functions in the tarfile module now correctly handle - empty mode. +- Issue #25319: When threading.Event is reinitialized, the underlying condition + should use a regular lock rather than a recursive lock. -- bpo-20242: Fixed basicConfig() format strings for the alternative - formatting styles. Thanks to kespindler for the bug report and patch. +- Skip getaddrinfo if host is already resolved. + Patch by A. Jesse Jiryu Davis. -- bpo-20246: Fix buffer overflow in socket.recvfrom_into. +- Issue #26050: Add asyncio.StreamReader.readuntil() method. + Patch by Марк Коренберг. -- bpo-20206: Fix edge case in email.quoprimime.encode where it truncated - lines ending in a character needing encoding but no newline by using a - more efficient algorithm that doesn't have the bug. (See also: bpo-5803) +- Issue #25924: Avoid unnecessary serialization of getaddrinfo(3) calls on + OS X versions 10.5 or higher. Original patch by A. Jesse Jiryu Davis. -- bpo-19082: Working xmlrpc.server and xmlrpc.client examples. Both in - modules and in documentation. Initial patch contributed by Vajrasky Kok. +- Issue #26406: Avoid unnecessary serialization of getaddrinfo(3) calls on + current versions of OpenBSD and NetBSD. Patch by A. Jesse Jiryu Davis. -- bpo-20138: The wsgiref.application_uri() and wsgiref.request_uri() - functions now conform to PEP 3333 when handle non-ASCII URLs. +- Issue #26848: Fix asyncio/subprocess.communicate() to handle empty input. + Patch by Jack O'Connor. -- bpo-19097: Raise the correct Exception when cgi.FieldStorage is given an - invalid fileobj. +- Issue #27040: Add loop.get_exception_handler method -- bpo-20152: Ported Python/import.c over to Argument Clinic. +- Issue #27041: asyncio: Add loop.create_future method -- bpo-13107: argparse and optparse no longer raises an exception when output - a help on environment with too small COLUMNS. Based on patch by Elazar - Gershuni. +IDLE +---- -- bpo-20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly - asked for. +- Issue #20640: Add tests for idlelib.configHelpSourceEdit. + Patch by Saimadhav Heblikar. -- bpo-18960: The tokenize module now ignore the source encoding declaration - on the second line if the first line contains anything except a comment. +- In the 'IDLE-console differences' section of the IDLE doc, clarify + how running with IDLE affects sys.modules and the standard streams. -- bpo-20078: Reading malformed zipfiles no longer hangs with 100% CPU - consumption. +- Issue #25507: fix incorrect change in IOBinding that prevented printing. + Augment IOBinding htest to include all major IOBinding functions. -- bpo-20113: os.readv() and os.writev() now raise an OSError exception on - error instead of returning -1. +- Issue #25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION + MARK in README.txt and open this and NEWS.txt with 'ascii'. + Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'. -- bpo-19719: Make importlib.abc.MetaPathFinder.find_module(), - PathEntryFinder.find_loader(), and Loader.load_module() use PEP 451 APIs - to help with backwards-compatibility. +- Issue #15348: Stop the debugger engine (normally in a user process) + before closing the debugger window (running in the IDLE process). + This prevents the RuntimeErrors that were being caught and ignored. -- bpo-20144: inspect.Signature now supports parsing simple symbolic - constants as parameter default values in __text_signature__. +- Issue #24455: Prevent IDLE from hanging when a) closing the shell while the + debugger is active (15347); b) closing the debugger with the [X] button + (15348); and c) activating the debugger when already active (24455). + The patch by Mark Roseman does this by making two changes. + 1. Suspend and resume the gui.interaction method with the tcl vwait + mechanism intended for this purpose (instead of root.mainloop & .quit). + 2. In gui.run, allow any existing interaction to terminate first. -- bpo-20072: Fixed multiple errors in tkinter with wantobjects is False. +- Change 'The program' to 'Your program' in an IDLE 'kill program?' message + to make it clearer that the program referred to is the currently running + user program, not IDLE itself. -- bpo-20229: Avoid plistlib deprecation warning in platform.mac_ver(). +- Issue #24750: Improve the appearance of the IDLE editor window status bar. + Patch by Mark Roseman. -- bpo-14455: Fix some problems with the new binary plist support in - plistlib. +- Issue #25313: Change the handling of new built-in text color themes to better + address the compatibility problem introduced by the addition of IDLE Dark. + Consistently use the revised idleConf.CurrentTheme everywhere in idlelib. -IDLE ----- +- Issue #24782: Extension configuration is now a tab in the IDLE Preferences + dialog rather than a separate dialog. The former tabs are now a sorted + list. Patch by Mark Roseman. -- bpo-17390: Add Python version to Idle editor window title bar. Original - patches by Edmond Burnett and Kent Johnson. +- Issue #22726: Re-activate the config dialog help button with some content + about the other buttons and the new IDLE Dark theme. -- bpo-18960: IDLE now ignores the source encoding declaration on the second - line if the first line contains anything except a comment. +- Issue #24820: IDLE now has an 'IDLE Dark' built-in text color theme. + It is more or less IDLE Classic inverted, with a cobalt blue background. + Strings, comments, keywords, ... are still green, red, orange, ... . + To use it with IDLEs released before November 2015, hit the + 'Save as New Custom Theme' button and enter a new name, + such as 'Custom Dark'. The custom theme will work with any IDLE + release, and can be modified. -Tests ------ +- Issue #25224: README.txt is now an idlelib index for IDLE developers and + curious users. The previous user content is now in the IDLE doc chapter. + 'IDLE' now means 'Integrated Development and Learning Environment'. -- bpo-20358: Tests for curses.window.overlay and curses.window.overwrite no - longer specify min{row,col} > max{row,col}. +- Issue #24820: Users can now set breakpoint colors in + Settings -> Custom Highlighting. Original patch by Mark Roseman. -- bpo-19804: The test_find_mac test in test_uuid is now skipped if the - ifconfig executable is not available. +- Issue #24972: Inactive selection background now matches active selection + background, as configured by users, on all systems. Found items are now + always highlighted on Windows. Initial patch by Mark Roseman. -- bpo-19886: Use better estimated memory requirements for bigmem tests. +- Issue #24570: Idle: make calltip and completion boxes appear on Macs + affected by a tk regression. Initial patch by Mark Roseman. -Tools/Demos ------------ +- Issue #24988: Idle ScrolledList context menus (used in debugger) + now work on Mac Aqua. Patch by Mark Roseman. -- bpo-20390: Argument Clinic's "file" output preset now defaults to - "{dirname}/clinic/{basename}.h". +- Issue #24801: Make right-click for context menu work on Mac Aqua. + Patch by Mark Roseman. -- bpo-20390: Argument Clinic's "class" directive syntax has been extended - with two new required arguments: "typedef" and "type_object". +- Issue #25173: Associate tkinter messageboxes with a specific widget. + For Mac OSX, make them a 'sheet'. Patch by Mark Roseman. -- bpo-20390: Argument Clinic: If __new__ or __init__ functions didn't use - kwargs (or args), the PyArg_NoKeywords (or PyArg_NoPositional) calls - generated are only run when the type object is an exact match. +- Issue #25198: Enhance the initial html viewer now used for Idle Help. + * Properly indent fixed-pitch text (patch by Mark Roseman). + * Give code snippet a very Sphinx-like light blueish-gray background. + * Re-use initial width and height set by users for shell and editor. + * When the Table of Contents (TOC) menu is used, put the section header + at the top of the screen. -- bpo-20390: Argument Clinic now fails if you have required parameters after - optional parameters. +- Issue #25225: Condense and rewrite Idle doc section on text colors. -- bpo-20390: Argument Clinic converters now have a new template they can - inject code into: "modifiers". Code put there is run in the parsing - function after argument parsing but before the call to the impl. +- Issue #21995: Explain some differences between IDLE and console Python. -- bpo-20376: Argument Clinic now escapes backslashes in docstrings. +- Issue #22820: Explain need for *print* when running file from Idle editor. -- bpo-20381: Argument Clinic now sanity checks the default argument when - c_default is also specified, providing a nice failure message for - disallowed values. +- Issue #25224: Doc: augment Idle feature list and no-subprocess section. -- bpo-20189: Argument Clinic now ensures that parser functions for __new__ - are always of type newfunc, the type of the tp_new slot. Similarly, parser - functions for __init__ are now always of type initproc, the type of - tp_init. +- Issue #25219: Update doc for Idle command line options. + Some were missing and notes were not correct. -- bpo-20189: Argument Clinic now suppresses the docstring for __new__ and - __init__ functions if no docstring is provided in the input. +- Issue #24861: Most of idlelib is private and subject to change. + Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__. -- bpo-20189: Argument Clinic now suppresses the "self" parameter in the impl - for @staticmethod functions. +- Issue #25199: Idle: add synchronization comments for future maintainers. -- bpo-20294: Argument Clinic now supports argument parsing for __new__ and - __init__ functions. +- Issue #16893: Replace help.txt with help.html for Idle doc display. + The new idlelib/help.html is rstripped Doc/build/html/library/idle.html. + It looks better than help.txt and will better document Idle as released. + The tkinter html viewer that works for this file was written by Rose Roseman. + The now unused EditorWindow.HelpDialog class and helt.txt file are deprecated. -- bpo-20299: Argument Clinic custom converters may now change the default - value of c_default and py_default with a class member. +- Issue #24199: Deprecate unused idlelib.idlever with possible removal in 3.6. -- bpo-20287: Argument Clinic's output is now configurable, allowing delaying - its output or even redirecting it to a separate file. +- Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts). -- bpo-20226: Argument Clinic now permits simple expressions (e.g. - "sys.maxsize - 1") as default values for parameters. +Documentation +------------- -- bpo-19936: Added executable bits or shebang lines to Python scripts which - requires them. Disable executable bits and shebang lines in test and - benchmark files in order to prevent using a random system python, and in - source files of modules which don't provide command line interface. Fixed - shebang lines in the unittestgui and checkpip scripts. +- Issue #26736: Used HTTPS for external links in the documentation if possible. -- bpo-20268: Argument Clinic now supports cloning the parameters and return - converter of existing functions. +- Issue #6953: Rework the Readline module documentation to group related + functions together, and add more details such as what underlying Readline + functions and variables are accessed. -- bpo-20228: Argument Clinic now has special support for class special - methods. +- Issue #23606: Adds note to ctypes documentation regarding cdll.msvcrt. -- bpo-20214: Fixed a number of small issues and documentation errors in - Argument Clinic (see issue for details). +- Issue #24952: Clarify the default size argument of stack_size() in + the "threading" and "_thread" modules. Patch from Mattip. -- bpo-20196: Fixed a bug where Argument Clinic did not generate correct - parsing code for functions with positional-only parameters where all - arguments are optional. +- Issue #26014: Update 3.x packaging documentation: + * "See also" links to the new docs are now provided in the legacy pages + * links to setuptools documentation have been updated -- bpo-18960: 2to3 and the findnocoding.py script now ignore the source - encoding declaration on the second line if the first line contains - anything except a comment. +Tests +----- -- bpo-19723: The marker comments Argument Clinic uses have been changed to - improve readability. +- Issue #21916: Added tests for the turtle module. Patch by ingrid, + Gregory Loyse and Jelle Zijlstra. -- bpo-20157: When Argument Clinic renames a parameter because its name - collides with a C keyword, it no longer exposes that rename to - PyArg_Parse. +- Issue #26295: When using "python3 -m test --testdir=TESTDIR", regrtest + doesn't add "test." prefix to test module names. -- bpo-20141: Improved Argument Clinic's support for the PyArg_Parse "O!" - format unit. +- Issue #26523: The multiprocessing thread pool (multiprocessing.dummy.Pool) + was untested. -- bpo-20144: Argument Clinic now supports simple symbolic constants as - parameter default values. +- Issue #26015: Added new tests for pickling iterators of mutable sequences. -- bpo-20143: The line numbers reported in Argument Clinic errors are now - more accurate. +- Issue #26325: Added test.support.check_no_resource_warning() to check that + no ResourceWarning is emitted. -- bpo-20142: Py_buffer variables generated by Argument Clinic are now - initialized with a default value. +- Issue #25940: Changed test_ssl to use its internal local server more. This + avoids relying on svn.python.org, which recently changed root certificate. -Build ------ +- Issue #25616: Tests for OrderedDict are extracted from test_collections + into separate file test_ordered_dict. -- bpo-12837: Silence a tautological comparison warning on OS X under Clang - in socketmodule.c. +- Issue #25449: Added tests for OrderedDict subclasses. +- Issue #25188: Add -P/--pgo to test.regrtest to suppress error output when + running the test suite for the purposes of a PGO build. Initial patch by + Alecsandru Patrascu. -What's New in Python 3.4.0 beta 2? -================================== +- Issue #22806: Add ``python -m test --list-tests`` command to list tests. -*Release date: 2014-01-05* +- Issue #18174: ``python -m test --huntrleaks ...`` now also checks for leak of + file descriptors. Patch written by Richard Oudkerk. -Core and Builtins ------------------ +- Issue #25260: Fix ``python -m test --coverage`` on Windows. Remove the + list of ignored directories. -- bpo-17432: Drop UCS2 from names of Unicode functions in python3.def. +- ``PCbuild\rt.bat`` now accepts an unlimited number of arguments to pass along + to regrtest.py. Previously there was a limit of 9. -- bpo-19526: Exclude all new API from the stable ABI. Exceptions can be made - if a need is demonstrated. +- Issue #26583: Skip test_timestamp_overflow in test_import if bytecode + files cannot be written. -- bpo-19969: PyBytes_FromFormatV() now raises an OverflowError if "%c" - argument is not in range [0; 255]. +Build +----- -- bpo-19995: %c, %o, %x, and %X now issue a DeprecationWarning on non- - integer input; reworded docs to clarify that an integer type should define - both __int__ and __index__. +- Issue #21277: Don't try to link _ctypes with a ffi_convenience library. -- bpo-19787: PyThread_set_key_value() now always set the value. In Python - 3.3, the function did nothing if the key already exists (if the current - value is a non-NULL pointer). +- Issue #26884: Fix linking extension modules for cross builds. + Patch by Xavier de Gaye. -- bpo-14432: Remove the thread state field from the frame structure. Fix a - crash when a generator is created in a C thread that is destroyed while - the generator is still used. The issue was that a generator contains a - frame, and the frame kept a reference to the Python state of the destroyed - C thread. The crash occurs when a trace function is setup. +- Issue #26932: Fixed support of RTLD_* constants defined as enum values, + not via macros (in particular on Android). Patch by Chi Hsuan Yen. -- bpo-19576: PyGILState_Ensure() now initializes threads. At startup, Python - has no concrete GIL. If PyGILState_Ensure() is called from a new thread - for the first time and PyEval_InitThreads() was not called yet, a GIL - needs to be created. +- Issue #22359: Disable the rules for running _freeze_importlib and pgen when + cross-compiling. The output of these programs is normally saved with the + source code anyway, and is still regenerated when doing a native build. + Patch by Xavier de Gaye. -- bpo-17576: Deprecation warning emitted now when __int__() or __index__() - return not int instance. +- Issue #21668: Link audioop, _datetime, _ctypes_test modules to libm, + except on Mac OS X. Patch written by Chi Hsuan Yen. -- bpo-19932: Fix typo in import.h, missing whitespaces in function - prototypes. +- Issue #25702: A --with-lto configure option has been added that will + enable link time optimizations at build time during a make profile-opt. + Some compilers and toolchains are known to not produce stable code when + using LTO, be sure to test things thoroughly before relying on it. + It can provide a few % speed up over profile-opt alone. -- bpo-19736: Add module-level statvfs constants defined for GNU/glibc based - systems. +- Issue #26624: Adds validation of ucrtbase[d].dll version with warning + for old versions. -- bpo-20097: Fix bad use of "self" in importlib's WindowsRegistryFinder. +- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a + lower-level check for st_blocks in struct stat. -- bpo-19729: In str.format(), fix recursive expansion in format spec. +- Issue #26079: Fixing the build output folder for tix-8.4.3.6. Patch by + Bjoern Thiel. -- bpo-19638: Fix possible crash / undefined behaviour from huge (more than 2 - billion characters) input strings in _Py_dg_strtod. +- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g. -Library -------- +- Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to + ``PCbuild\build.bat`` for building with Profile-Guided Optimization. The + old ``PCbuild\build_pgo.bat`` script is removed. -- bpo-20154: Deadlock in asyncio.StreamReader.readexactly(). +- Issue #25827: Add support for building with ICC to ``configure``, including + a new ``--with-icc`` flag. -- bpo-16113: Remove sha3 module again. +- Issue #25696: Fix installation of Python on UNIX with make -j9. -- bpo-20111: pathlib.Path.with_suffix() now sanity checks the given suffix. +- Issue #24986: It is now possible to build Python on Windows without errors + when external libraries are not available. -- Fix breakage in TestSuite.countTestCases() introduced by issue #11798. +- Issue #24421: Compile Modules/_math.c once, before building extensions. + Previously it could fail to compile properly if the math and cmath builds + were concurrent. -- bpo-20108: Avoid parameter name clash in inspect.getcallargs(). +- Issue #26465: Update OS X 10.5+ 32-bit-only installer to build + and link with OpenSSL 1.0.2g. -- bpo-19918: Fix PurePath.relative_to() under Windows. +- Issue #26268: Update Windows builds to use OpenSSL 1.0.2f. -- bpo-19422: Explicitly disallow non-SOCK_STREAM sockets in the ssl module, - rather than silently let them emit clear text data. +- Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries. -- bpo-20046: Locale alias table no longer contains entities which can be - calculated. Generalized support of the euro modifier. +- Issue #24324: Do not enable unreachable code warnings when using + gcc as the option does not work correctly in older versions of gcc + and has been silently removed as of gcc-4.5. -- bpo-20027: Fixed locale aliases for devanagari locales. +Windows +------- -- bpo-20067: Tkinter variables now work when wantobjects is false. +- Issue #27053: Updates make_zip.py to correctly generate library ZIP file. -- bpo-19020: Tkinter now uses splitlist() instead of split() in configure - methods. +- Issue #26268: Update the prepare_ssl.py script to handle OpenSSL releases + that don't include the contents of the include directory (that is, 1.0.2e + and later). -- bpo-19744: ensurepip now provides a better error message when Python is - built without SSL/TLS support (pip currently requires that support to run, - even if only operating with local wheel files) +- Issue #26071: bdist_wininst created binaries fail to start and find + 32bit Python -- bpo-19734: ensurepip now ignores all pip environment variables to avoid - odd behaviour based on user configuration settings +- Issue #26073: Update the list of magic numbers in launcher -- Fix TypeError on "setup.py upload --show-response". +- Issue #26065: Excludes venv from library when generating embeddable + distro. -- bpo-20045: Fix "setup.py register --list-classifiers". +- Issue #25022: Removed very outdated PC/example_nt/ directory. -- bpo-18879: When a method is looked up on a temporary file, avoid closing - the file before the method is possibly called. +Tools/Demos +----------- -- bpo-20037: Avoid crashes when opening a text file late at interpreter - shutdown. +- Issue #26799: Fix python-gdb.py: don't get C types once when the Python code + is loaded, but get C types on demand. The C types can change if + python-gdb.py is loaded before the Python executable. Patch written by Thomas + Ilsche. -- bpo-19967: Thanks to the PEP 442, asyncio.Future now uses a destructor to - log uncaught exceptions, instead of the dedicated _TracebackLogger class. +- Issue #26271: Fix the Freeze tool to properly use flags passed through + configure. Patch by Daniel Shaulov. -- Added a Task.current_task() class method to asyncio. +- Issue #26489: Add dictionary unpacking support to Tools/parser/unparse.py. + Patch by Guo Ci Teo. -- bpo-19850: Set SA_RESTART in asyncio when registering a signal handler to - limit EINTR occurrences. +- Issue #26316: Fix variable name typo in Argument Clinic. -- Implemented write flow control in asyncio for proactor event loop - (Windows). +- Issue #25440: Fix output of python-config --extension-suffix. -- Change write buffer in asyncio use to avoid O(N**2) behavior. Make - write()/sendto() accept bytearray/memoryview. +- Issue #25154: The pyvenv script has been deprecated in favour of + `python3 -m venv`. -- bpo-20034: Updated alias mapping to most recent locale.alias file from - X.org distribution using makelocalealias.py. +C API +----- -- bpo-5815: Fixed support for locales with modifiers. Fixed support for - locale encodings with hyphens. +- Issue #26312: SystemError is now raised in all programming bugs with using + PyArg_ParseTupleAndKeywords(). RuntimeError did raised before in some + programming bugs. -- bpo-20026: Fix the sqlite module to handle correctly invalid isolation - level (wrong type). +- Issue #26198: ValueError is now raised instead of TypeError on buffer + overflow in parsing "es#" and "et#" format units. SystemError is now raised + instead of TypeError on programmical error in parsing format string. -- bpo-18829: csv.Dialect() now checks type for delimiter, escapechar and - quotechar fields. Original patch by Vajrasky Kok. -- bpo-19855: uuid.getnode() on Unix now looks on the PATH for the - executables used to find the mac address, with /sbin and /usr/sbin as - fallbacks. +What's New in Python 3.5.1 final? +================================= -- bpo-20007: HTTPResponse.read(0) no more prematurely closes connection. - Original patch by Simon Sapin. +Release date: 2015-12-06 -- bpo-19946: multiprocessing now uses runpy to initialize __main__ in child - processes when necessary, allowing it to correctly handle scripts without - suffixes and submodules that use explicit relative imports or otherwise - rely on parent modules being correctly imported prior to execution. +Core and Builtins +----------------- -- bpo-19921: When Path.mkdir() is called with parents=True, any missing - parent is created with the default permissions, ignoring the mode argument - (mimicking the POSIX "mkdir -p" command). +- Issue #25709: Fixed problem with in-place string concatenation and + utf-8 cache. -- bpo-19887: Improve the Path.resolve() algorithm to support certain symlink - chains. +Windows +------- -- bpo-19912: Fixed numerous bugs in ntpath.splitunc(). +- Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect + logic for launcher detection. -- bpo-19911: ntpath.splitdrive() now correctly processes the 'İ' character - (U+0130, LATIN CAPITAL LETTER I WITH DOT ABOVE). -- bpo-19532: python -m compileall with no filename/directory arguments now - respects the -f and -q flags instead of ignoring them. +What's New in Python 3.5.1 release candidate 1? +=============================================== -- bpo-19623: Fixed writing to unseekable files in the aifc module. +Release date: 2015-11-22 -- bpo-19946: multiprocessing.spawn now raises ImportError when the module to - be used as the main module cannot be imported. +Core and Builtins +----------------- -- bpo-17919: select.poll.register() again works with poll.POLLNVAL on AIX. - Fixed integer overflow in the eventmask parameter. +- Issue #25630: Fix a possible segfault during argument parsing in functions + that accept filesystem paths. -- bpo-19063: if a Charset's body_encoding was set to None, the email package - would generate a message claiming the Content-Transfer-Encoding was 7bit, - and produce garbage output for the content. This now works. A couple of - other set_payload mishandlings of non-ASCII are also fixed. In addition, - calling set_payload with a string argument without specifying a charset - now raises an error (this is a new error in 3.4). +- Issue #23564: Fixed a partially broken sanity check in the _posixsubprocess + internals regarding how fds_to_pass were passed to the child. The bug had + no actual impact as subprocess.py already avoided it. -- bpo-15475: Add __sizeof__ implementations for itertools objects. +- Issue #25388: Fixed tokenizer crash when processing undecodable source code + with a null byte. -- bpo-19944: Fix importlib.find_spec() so it imports parents as needed and - move the function to importlib.util. +- Issue #25462: The hash of the key now is calculated only once in most + operations in C implementation of OrderedDict. -- bpo-19880: Fix a reference leak in unittest.TestCase. Explicitly break - reference cycles between frames and the _Outcome instance. +- Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now + rejects builtin types with not defined __new__. -- bpo-17429: platform.linux_distribution() now decodes files from the UTF-8 - encoding with the surrogateescape error handler, instead of decoding from - the locale encoding in strict mode. It fixes the function on Fedora 19 - which is probably the first major distribution release with a non-ASCII - name. Patch written by Toshio Kuratomi. +- Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node + when compiling AST from Python objects. -- bpo-19343: Expose FreeBSD-specific APIs in resource module. Original - patch by Koobs. +- Issue #24802: Avoid buffer overreads when int(), float(), compile(), exec() + and eval() are passed bytes-like objects. These objects are not + necessarily terminated by a null byte, but the functions assumed they were. -- bpo-19929: Call os.read with 32768 within subprocess.Popen.communicate - rather than 4096 for efficiency. A microbenchmark shows Linux and OS X - both using ~50% less cpu time this way. +- Issue #24726: Fixed a crash and leaking NULL in repr() of OrderedDict that + was mutated by direct calls of dict methods. -- bpo-19506: Use a memoryview to avoid a data copy when piping data to stdin - within subprocess.Popen.communicate. 5-10% less cpu usage. +- Issue #25449: Iterating OrderedDict with keys with unstable hash now raises + KeyError in C implementations as well as in Python implementation. -- bpo-19876: selectors unregister() no longer raises ValueError or OSError - if the FD is closed (as long as it was registered). +- Issue #25395: Fixed crash when highly nested OrderedDict structures were + garbage collected. -- bpo-19908: pathlib now joins relative Windows paths correctly when a drive - is present. Original patch by Antoine Pitrou. +- Issue #25274: sys.setrecursionlimit() now raises a RecursionError if the new + recursion limit is too low depending at the current recursion depth. Modify + also the "lower-water mark" formula to make it monotonic. This mark is used + to decide when the overflowed flag of the thread state is reset. -- bpo-19296: Silence compiler warning in dbm_open +- Issue #24402: Fix input() to prompt to the redirected stdout when + sys.stdout.fileno() fails. -- bpo-6784: Strings from Python 2 can now be unpickled as bytes objects by - setting the encoding argument of Unpickler to be 'bytes'. Initial patch by - Merlijn van Deen. +- Issue #24806: Prevent builtin types that are not allowed to be subclassed from + being subclassed through multiple inheritance. -- bpo-19839: Fix regression in bz2 module's handling of non-bzip2 data at - EOF, and analogous bug in lzma module. +- Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data. -- bpo-19881: Fix pickling bug where cpickle would emit bad pickle data for - large bytes string (i.e., with size greater than 2**32-1). +- Issue #25280: Import trace messages emitted in verbose (-v) mode are no + longer formatted twice. -- bpo-19138: doctest's IGNORE_EXCEPTION_DETAIL now allows a match when no - exception detail exists (no colon following the exception's name, or a - colon does follow but no text follows the colon). +- Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the + getrandom() function instead of the getentropy() function. The getentropy() + function is blocking to generate very good quality entropy, os.urandom() + doesn't need such high-quality entropy. -- bpo-19927: Add __eq__ to path-based loaders in importlib. +- Issue #25182: The stdprinter (used as sys.stderr before the io module is + imported at startup) now uses the backslashreplace error handler. -- bpo-19827: On UNIX, setblocking() and settimeout() methods of - socket.socket can now avoid a second syscall if the ioctl() function can - be used, or if the non- blocking flag of the socket is unchanged. +- Issue #25131: Make the line number and column offset of set/dict literals and + comprehensions correspond to the opening brace. -- bpo-19785: smtplib now supports SSLContext.check_hostname and server name - indication for TLS/SSL connections. +- Issue #25150: Hide the private _Py_atomic_xxx symbols from the public + Python.h header to fix a compilation error with OpenMP. PyThreadState_GET() + becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies. -- bpo-19784: poplib now supports SSLContext.check_hostname and server name - indication for TLS/SSL connections. +Library +------- -- bpo-19783: nntplib now supports SSLContext.check_hostname and server name - indication for TLS/SSL connections. +- Issue #25626: Change three zlib functions to accept sizes that fit in + Py_ssize_t, but internally cap those sizes to UINT_MAX. This resolves a + regression in 3.5 where GzipFile.read() failed to read chunks larger than 2 + or 4 GiB. The change affects the zlib.Decompress.decompress() max_length + parameter, the zlib.decompress() bufsize parameter, and the + zlib.Decompress.flush() length parameter. -- bpo-19782: imaplib now supports SSLContext.check_hostname and server name - indication for TLS/SSL connections. +- Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True) + when the OS gives priority to errors such as EACCES over EEXIST. -- bpo-20123: Fix pydoc.synopsis() for "binary" modules. +- Issue #25593: Change semantics of EventLoop.stop() in asyncio. -- bpo-19834: Support unpickling of exceptions pickled by Python 2. +- Issue #6973: When we know a subprocess.Popen process has died, do + not allow the send_signal(), terminate(), or kill() methods to do + anything as they could potentially signal a different process. -- bpo-19781: ftplib now supports SSLContext.check_hostname and server name - indication for TLS/SSL connections. +- Issue #25590: In the Readline completer, only call getattr() once per + attribute. -- bpo-19509: Add SSLContext.check_hostname to match the peer's certificate - with server_hostname on handshake. +- Issue #25498: Fix a crash when garbage-collecting ctypes objects created + by wrapping a memoryview. This was a regression made in 3.5a1. Based + on patch by Eryksun. -- bpo-15798: Fixed subprocess.Popen() to no longer fail if file descriptor - 0, 1 or 2 is closed. +- Issue #25584: Added "escape" to the __all__ list in the glob module. -- bpo-17897: Optimized unpickle prefetching. +- Issue #25584: Fixed recursive glob() with patterns starting with '\*\*'. -- bpo-3693: Make the error message more helpful when the array.array() - constructor is given a str. Move the array module typecode documentation - to the docstring of the constructor. +- Issue #25446: Fix regression in smtplib's AUTH LOGIN support. -- bpo-19088: Fixed incorrect caching of the copyreg module in - object.__reduce__() and object.__reduce_ex__(). +- Issue #18010: Fix the pydoc web server's module search function to handle + exceptions from importing packages. -- bpo-19698: Removed exec_module() methods from - importlib.machinery.BuiltinImporter and ExtensionFileLoader. +- Issue #25554: Got rid of circular references in regular expression parsing. -- bpo-18864: Added a setter for ModuleSpec.has_location. +- Issue #25510: fileinput.FileInput.readline() now returns b'' instead of '' + at the end if the FileInput was opened with binary mode. + Patch by Ryosuke Ito. -- Fixed _pickle.Unpickler to not fail when loading empty strings as - persistent IDs. +- Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. + Original patch by John Mark Vandenberg. -- bpo-11480: Fixed copy.copy to work with classes with custom metaclasses. - Patch by Daniel Urban. +- Issue #25515: Always use os.urandom as a source of randomness in uuid.uuid4. -- bpo-6477: Added support for pickling the types of built-in singletons - (i.e., Ellipsis, NotImplemented, None). +- Issue #21827: Fixed textwrap.dedent() for the case when largest common + whitespace is a substring of smallest leading whitespace. + Based on patch by Robert Li. -- bpo-19713: Add remaining PEP 451-related deprecations and move away from - using find_module/find_loaer/load_module. +- Issue #25447: The lru_cache() wrapper objects now can be copied and pickled + (by returning the original object unchanged). -- bpo-19708: Update pkgutil to use the new importer APIs. +- Issue #25390: typing: Don't crash on Union[str, Pattern]. -- bpo-19703: Update pydoc to use the new importer APIs. +- Issue #25441: asyncio: Raise error from drain() when socket is closed. -- bpo-19851: Fixed a regression in reloading sub-modules. +- Issue #25410: Cleaned up and fixed minor bugs in C implementation of + OrderedDict. -- ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME. +- Issue #25411: Improved Unicode support in SMTPHandler through better use of + the email package. Thanks to user simon04 for the patch. -- bpo-19802: Add socket.SO_PRIORITY. +- Issue #25407: Remove mentions of the formatter module being removed in + Python 3.6. -- bpo-11508: Fixed uuid.getnode() and uuid.uuid1() on environment with - virtual interface. Original patch by Kent Frazier. +- Issue #25406: Fixed a bug in C implementation of OrderedDict.move_to_end() + that caused segmentation fault or hang in iterating after moving several + items to the start of ordered dict. -- bpo-11489: JSON decoder now accepts lone surrogates. +- Issue #25364: zipfile now works in threads disabled builds. -- bpo-19545: Avoid chained exceptions while passing stray % to - time.strptime(). Initial patch by Claudiu Popa. +- Issue #25328: smtpd's SMTPChannel now correctly raises a ValueError if both + decode_data and enable_SMTPUTF8 are set to true. -IDLE ----- +- Issue #25316: distutils raises OSError instead of DistutilsPlatformError + when MSVC is not installed. -- bpo-20058: sys.stdin.readline() in IDLE now always returns only one line. +- Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in + pickletools.opcodes. -- bpo-19481: print() of string subclass instance in IDLE no longer hangs. +- Issue #23972: Updates asyncio datagram create method allowing reuseport + and reuseaddr socket options to be set prior to binding the socket. + Mirroring the existing asyncio create_server method the reuseaddr option + for datagram sockets defaults to True if the O/S is 'posix' (except if the + platform is Cygwin). Patch by Chris Laws. -- bpo-18270: Prevent possible IDLE AttributeError on OS X when no initial - shell window is present. +- Issue #25304: Add asyncio.run_coroutine_threadsafe(). This lets you + submit a coroutine to a loop from another thread, returning a + concurrent.futures.Future. By Vincent Michel. -Tests ------ +- Issue #25232: Fix CGIRequestHandler to split the query from the URL at the + first question mark (?) rather than the last. Patch from Xiang Zhang. -- bpo-20055: Fix test_shutil under Windows with symlink privileges held. - Patch by Vajrasky Kok. +- Issue #24657: Prevent CGIRequestHandler from collapsing slashes in the + query part of the URL as if it were a path. Patch from Xiang Zhang. -- bpo-20070: Don't run test_urllib2net when network resources are not - enabled. +- Issue #24483: C implementation of functools.lru_cache() now calculates key's + hash only once. -- bpo-19938: Re-enabled test_bug_1333982 in test_dis, which had been - disabled since 3.0 due to the changes in listcomp handling. +- Issue #22958: Constructor and update method of weakref.WeakValueDictionary + now accept the self and the dict keyword arguments. -- bpo-19320: test_tcl no longer fails when wantobjects is false. +- Issue #22609: Constructor of collections.UserDict now accepts the self keyword + argument. -- bpo-19919: Fix flaky SSL test. connect_ex() sometimes returns EWOULDBLOCK - on Windows or VMs hosted on Windows. +- Issue #25111: Fixed comparison of traceback.FrameSummary. -- bpo-19912: Added tests for ntpath.splitunc(). +- Issue #25262: Added support for BINBYTES8 opcode in Python implementation of + unpickler. Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8 + opcodes no longer silently ignored on 32-bit platforms in C implementation. -- bpo-19828: Fixed test_site when the whole suite is run with -S. +- Issue #25034: Fix string.Formatter problem with auto-numbering and + nested format_specs. Patch by Anthon van der Neut. -- bpo-19928: Implemented a test for repr() of cell objects. +- Issue #25233: Rewrite the guts of asyncio.Queue and + asyncio.Semaphore to be more understandable and correct. -- bpo-19535: Fixed test_docxmlrpc, test_functools, test_inspect, and - test_statistics when python is run with -OO. +- Issue #25203: Failed readline.set_completer_delims() no longer left the + module in inconsistent state. -- bpo-19926: Removed unneeded test_main from test_abstract_numbers. Patch by - Vajrasky Kok. +- Issue #23600: Default implementation of tzinfo.fromutc() was returning + wrong results in some cases. -- bpo-19572: More skipped tests explicitly marked as skipped. +- Issue #23329: Allow the ssl module to be built with older versions of + LibreSSL. -- bpo-19595: Re-enabled a long-disabled test in test_winsound. (See also: - bpo-19987) +- Prevent overflow in _Unpickler_Read. -- bpo-19588: Fixed tests in test_random that were silently skipped most of - the time. Patch by Julian Gindi. +- Issue #25047: The XML encoding declaration written by Element Tree now + respects the letter case given by the user. This restores the ability to + write encoding names in uppercase like "UTF-8", which worked in Python 2. -Build ------ +- Issue #25135: Make deque_clear() safer by emptying the deque before clearing. + This helps avoid possible reentrancy issues. -- bpo-19728: Enable pip installation by default on Windows. +- Issue #19143: platform module now reads Windows version from kernel32.dll to + avoid compatibility shims. -- bpo-16136: Remove VMS support +- Issue #25092: Fix datetime.strftime() failure when errno was already set to + EINVAL. -- bpo-18215: Add script Tools/ssl/test_multiple_versions.py to compile and - run Python's unit tests with multiple versions of OpenSSL. +- Issue #23517: Fix rounding in fromtimestamp() and utcfromtimestamp() methods + of datetime.datetime: microseconds are now rounded to nearest with ties + going to nearest even integer (ROUND_HALF_EVEN), instead of being rounding + towards minus infinity (ROUND_FLOOR). It's important that these methods use + the same rounding mode than datetime.timedelta to keep the property: + (datetime(1970,1,1) + timedelta(seconds=t)) == datetime.utcfromtimestamp(t). + It also the rounding mode used by round(float) for example. -- bpo-19922: define _INCLUDE__STDC_A1_SOURCE in HP-UX to include mbstate_t - for mbrtowc(). +- Issue #25155: Fix datetime.datetime.now() and datetime.datetime.utcnow() on + Windows to support date after year 2038. It was a regression introduced in + Python 3.5.0. -- bpo-19788: kill_python(_d).exe is now run as a PreBuildEvent on the - pythoncore sub- project. This should prevent build errors due a previous - build's python(_d).exe still running. +- Issue #25108: Omitted internal frames in traceback functions print_stack(), + format_stack(), and extract_stack() called without arguments. -Documentation -------------- +- Issue #25118: Fix a regression of Python 3.5.0 in os.waitpid() on Windows. -- bpo-20265: Updated some parts of the Using Windows document. +- Issue #24684: socket.socket.getaddrinfo() now calls + PyUnicode_AsEncodedString() instead of calling the encode() method of the + host, to handle correctly custom string with an encode() method which doesn't + return a byte string. The encoder of the IDNA codec is now called directly + instead of calling the encode() method of the string. -- bpo-20266: Updated some parts of the Windows FAQ. +- Issue #25060: Correctly compute stack usage of the BUILD_MAP opcode. -- bpo-20255: Updated the about and bugs pages. +- Issue #24857: Comparing call_args to a long sequence now correctly returns a + boolean result instead of raising an exception. Patch by A Kaptur. -- bpo-20253: Fixed a typo in the ipaddress docs that advertised an illegal - attribute name. Found by INADA Naoki. +- Issue #23144: Make sure that HTMLParser.feed() returns all the data, even + when convert_charrefs is True. -- bpo-18840: Introduce the json module in the tutorial, and de-emphasize the - pickle module. +- Issue #24982: shutil.make_archive() with the "zip" format now adds entries + for directories (including empty directories) in ZIP file. -- bpo-19845: Updated the Compiling Python on Windows section. +- Issue #25019: Fixed a crash caused by setting non-string key of expat parser. + Based on patch by John Leitch. -- bpo-19795: Improved markup of True/False constants. +- Issue #16180: Exit pdb if file has syntax error, instead of trapping user + in an infinite loop. Patch by Xavier de Gaye. -Tools/Demos ------------ +- Issue #24891: Fix a race condition at Python startup if the file descriptor + of stdin (0), stdout (1) or stderr (2) is closed while Python is creating + sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set + to None if the creation of the object failed, instead of raising an OSError + exception. Initial patch written by Marco Paolini. -- bpo-19659: Added documentation for Argument Clinic. +- Issue #24992: Fix error handling and a race condition (related to garbage + collection) in collections.OrderedDict constructor. -- bpo-19976: Argument Clinic METH_NOARGS functions now always take two - parameters. +- Issue #24881: Fixed setting binary mode in Python implementation of FileIO + on Windows and Cygwin. Patch from Akira Li. +- Issue #25578: Fix (another) memory leak in SSLSocket.getpeercer(). -What's New in Python 3.4.0 beta 1? -================================== +- Issue #25530: Disable the vulnerable SSLv3 protocol by default when creating + ssl.SSLContext. -*Release date: 2013-11-24* +- Issue #25569: Fix memory leak in SSLSocket.getpeercert(). -Core and Builtins ------------------ +- Issue #25471: Sockets returned from accept() shouldn't appear to be + nonblocking. -- Use the repr of a module name in more places in import, especially - exceptions. +- Issue #25319: When threading.Event is reinitialized, the underlying condition + should use a regular lock rather than a recursive lock. -- bpo-19619: str.encode, bytes.decode and bytearray.decode now use an - internal API to throw LookupError for known non-text encodings, rather - than attempting the encoding or decoding operation and then throwing a - TypeError for an unexpected output type. (The latter mechanism remains in - place for third party non-text encodings) +- Issue #21112: Fix regression in unittest.expectedFailure on subclasses. + Patch from Berker Peksag. -- bpo-19183: Implement PEP 456 'secure and interchangeable hash algorithm'. - Python now uses SipHash24 on all major platforms. +- Issue #24764: cgi.FieldStorage.read_multi() now ignores the Content-Length + header in part headers. Patch written by Peter Landry and reviewed by Pierre + Quentel. -- bpo-12892: The utf-16* and utf-32* encoders no longer allow surrogate code - points (U+D800-U+DFFF) to be encoded. The utf-32* decoders no longer - decode byte sequences that correspond to surrogate code points. The - surrogatepass error handler now works with the utf-16* and utf-32* codecs. - Based on patches by Victor Stinner and Kang-Hao (Kenny) Lu. +- Issue #24913: Fix overrun error in deque.index(). + Found by John Leitch and Bryce Darling. -- bpo-17806: Added keyword-argument support for "tabsize" to - str/bytes.expandtabs(). +- Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu. -- bpo-17828: Output type errors in str.encode(), bytes.decode() and - bytearray.decode() now direct users to codecs.encode() or codecs.decode() - as appropriate. +- Issue #21159: Improve message in configparser.InterpolationMissingOptionError. + Patch from Łukasz Langa. -- bpo-17828: The interpreter now attempts to chain errors that occur in - codec processing with a replacement exception of the same type that - includes the codec name in the error message. It ensures it only does this - when the creation of the replacement exception won't lose any information. +- Issue #20362: Honour TestCase.longMessage correctly in assertRegex. + Patch from Ilia Kurenkov. -- bpo-19466: Clear the frames of daemon threads earlier during the Python - shutdown to call object destructors. So "unclosed file" resource warnings - are now correctly emitted for daemon threads. +- Issue #23572: Fixed functools.singledispatch on classes with falsy + metaclasses. Patch by Ethan Furman. -- bpo-19514: Deduplicate some _Py_IDENTIFIER declarations. Patch by Andrei - Dorian Duma. +- asyncio: ensure_future() now accepts awaitable objects. -- bpo-17936: Fix O(n**2) behaviour when adding or removing many subclasses - of a given type. +IDLE +---- -- bpo-19428: zipimport now handles errors when reading truncated or invalid - ZIP archive. +- Issue #15348: Stop the debugger engine (normally in a user process) + before closing the debugger window (running in the IDLE process). + This prevents the RuntimeErrors that were being caught and ignored. -- bpo-18408: Add a new PyFrame_FastToLocalsWithError() function to handle - exceptions when merging fast locals into f_locals of a frame. - PyEval_GetLocals() now raises an exception and return NULL on failure. +- Issue #24455: Prevent IDLE from hanging when a) closing the shell while the + debugger is active (15347); b) closing the debugger with the [X] button + (15348); and c) activating the debugger when already active (24455). + The patch by Mark Roseman does this by making two changes. + 1. Suspend and resume the gui.interaction method with the tcl vwait + mechanism intended for this purpose (instead of root.mainloop & .quit). + 2. In gui.run, allow any existing interaction to terminate first. -- bpo-19369: Optimized the usage of __length_hint__(). +- Change 'The program' to 'Your program' in an IDLE 'kill program?' message + to make it clearer that the program referred to is the currently running + user program, not IDLE itself. -- bpo-18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the - Python executable and not removed by the linker's optimizer. +- Issue #24750: Improve the appearance of the IDLE editor window status bar. + Patch by Mark Roseman. -- bpo-19306: Add extra hints to the faulthandler module's stack dumps that - these are "upside down". +- Issue #25313: Change the handling of new built-in text color themes to better + address the compatibility problem introduced by the addition of IDLE Dark. + Consistently use the revised idleConf.CurrentTheme everywhere in idlelib. -Library -------- +- Issue #24782: Extension configuration is now a tab in the IDLE Preferences + dialog rather than a separate dialog. The former tabs are now a sorted + list. Patch by Mark Roseman. -- bpo-3158: doctest can now find doctests in functions and methods written - in C. +- Issue #22726: Re-activate the config dialog help button with some content + about the other buttons and the new IDLE Dark theme. -- bpo-13477: Added command line interface to the tarfile module. Original - patch by Berker Peksag. +- Issue #24820: IDLE now has an 'IDLE Dark' built-in text color theme. + It is more or less IDLE Classic inverted, with a cobalt blue background. + Strings, comments, keywords, ... are still green, red, orange, ... . + To use it with IDLEs released before November 2015, hit the + 'Save as New Custom Theme' button and enter a new name, + such as 'Custom Dark'. The custom theme will work with any IDLE + release, and can be modified. -- bpo-19674: inspect.signature() now produces a correct signature for some - builtins. +- Issue #25224: README.txt is now an idlelib index for IDLE developers and + curious users. The previous user content is now in the IDLE doc chapter. + 'IDLE' now means 'Integrated Development and Learning Environment'. -- bpo-19722: Added opcode.stack_effect(), which computes the stack effect of - bytecode instructions. +- Issue #24820: Users can now set breakpoint colors in + Settings -> Custom Highlighting. Original patch by Mark Roseman. -- bpo-19735: Implement private function ssl._create_stdlib_context() to - create SSLContext objects in Python's stdlib module. It provides a single - configuration point and makes use of SSLContext.load_default_certs(). +- Issue #24972: Inactive selection background now matches active selection + background, as configured by users, on all systems. Found items are now + always highlighted on Windows. Initial patch by Mark Roseman. -- bpo-16203: Add re.fullmatch() function and regex.fullmatch() method, which - anchor the pattern at both ends of the string to match. Original patch by - Matthew Barnett. +- Issue #24570: Idle: make calltip and completion boxes appear on Macs + affected by a tk regression. Initial patch by Mark Roseman. -- bpo-13592: Improved the repr for regular expression pattern objects. Based - on patch by Hugo Lopes Tavares. +- Issue #24988: Idle ScrolledList context menus (used in debugger) + now work on Mac Aqua. Patch by Mark Roseman. -- bpo-19641: Added the audioop.byteswap() function to convert big-endian - samples to little-endian and vice versa. +- Issue #24801: Make right-click for context menu work on Mac Aqua. + Patch by Mark Roseman. -- bpo-15204: Deprecated the 'U' mode in file-like objects. +- Issue #25173: Associate tkinter messageboxes with a specific widget. + For Mac OSX, make them a 'sheet'. Patch by Mark Roseman. -- bpo-17810: Implement PEP 3154, pickle protocol 4. +- Issue #25198: Enhance the initial html viewer now used for Idle Help. + * Properly indent fixed-pitch text (patch by Mark Roseman). + * Give code snippet a very Sphinx-like light blueish-gray background. + * Re-use initial width and height set by users for shell and editor. + * When the Table of Contents (TOC) menu is used, put the section header + at the top of the screen. -- bpo-19668: Added support for the cp1125 encoding. +- Issue #25225: Condense and rewrite Idle doc section on text colors. -- bpo-19689: Add ssl.create_default_context() factory function. It creates a - new SSLContext object with secure default settings. +- Issue #21995: Explain some differences between IDLE and console Python. -- bpo-19727: os.utime(..., None) is now potentially more precise under - Windows. +- Issue #22820: Explain need for *print* when running file from Idle editor. -- bpo-17201: ZIP64 extensions now are enabled by default. Patch by William - Mallard. +- Issue #25224: Doc: augment Idle feature list and no-subprocess section. -- bpo-19292: Add SSLContext.load_default_certs() to load default root CA - certificates from default stores or system stores. By default the method - loads CA certs for authentication of server certs. +- Issue #25219: Update doc for Idle command line options. + Some were missing and notes were not correct. -- bpo-19673: Add pathlib to the stdlib as a provisional module (PEP 428). +- Issue #24861: Most of idlelib is private and subject to change. + Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__. -- bpo-16596: pdb in a generator now properly skips over yield and yield from - rather than stepping out of the generator into its caller. (This is - essential for stepping through asyncio coroutines.) +- Issue #25199: Idle: add synchronization comments for future maintainers. -- bpo-17916: Added dis.Bytecode.from_traceback() and - dis.Bytecode.current_offset to easily display "current instruction" - markers in the new disassembly API (Patch by Claudiu Popa). +- Issue #16893: Replace help.txt with help.html for Idle doc display. + The new idlelib/help.html is rstripped Doc/build/html/library/idle.html. + It looks better than help.txt and will better document Idle as released. + The tkinter html viewer that works for this file was written by Mark Roseman. + The now unused EditorWindow.HelpDialog class and helt.txt file are deprecated. -- bpo-19552: venv now supports bootstrapping pip into virtual environments +- Issue #24199: Deprecate unused idlelib.idlever with possible removal in 3.6. -- bpo-17134: Finalize interface to Windows' certificate store. Cert and CRL - enumeration are now two functions. enum_certificates() also returns - purpose flags as set of OIDs. +- Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts). -- bpo-19555: Restore sysconfig.get_config_var('SO'), (and the distutils - equivalent) with a DeprecationWarning pointing people at $EXT_SUFFIX. +Documentation +------------- -- bpo-8813: Add SSLContext.verify_flags to change the verification flags of - the context in order to enable certification revocation list (CRL) checks - or strict X509 rules. +- Issue #12067: Rewrite Comparisons section in the Expressions chapter of the + language reference. Some of the details of comparing mixed types were + incorrect or ambiguous. NotImplemented is only relevant at a lower level + than the Expressions chapter. Added details of comparing range() objects, + and default behaviour and consistency suggestions for user-defined classes. + Patch from Andy Maier. -- bpo-18294: Fix the zlib module to make it 64-bit safe. +- Issue #24952: Clarify the default size argument of stack_size() in + the "threading" and "_thread" modules. Patch from Mattip. -- bpo-19682: Fix compatibility issue with old version of OpenSSL that was - introduced by Issue #18379. +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp. + Patch from Zbigniew Jędrzejewski-Szmek. -- bpo-14455: plistlib now supports binary plists and has an updated API. +- Issue #24808: Update the types of some PyTypeObject fields. Patch by + Joseph Weston. -- bpo-19633: Fixed writing not compressed 16- and 32-bit wave files on big- - endian platforms. +- Issue #22812: Fix unittest discovery examples. + Patch from Pam McA'Nulty. -- bpo-18379: SSLSocket.getpeercert() returns CA issuer AIA fields, OCSP and - CRL distribution points. +Tests +----- -- bpo-18138: Implement cadata argument of SSLContext.load_verify_location() - to load CA certificates and CRL from memory. It supports PEM and DER - encoded strings. +- Issue #25449: Added tests for OrderedDict subclasses. -- bpo-18775: Add name and block_size attribute to HMAC object. They now - provide the same API elements as non-keyed cryptographic hash functions. +- Issue #25099: Make test_compileall not fail when an entry on sys.path cannot + be written to (commonly seen in administrative installs on Windows). -- bpo-17276: MD5 as default digestmod for HMAC is deprecated. The HMAC - module supports digestmod names, e.g. hmac.HMAC('sha1'). +- Issue #23919: Prevents assert dialogs appearing in the test suite. -- bpo-19449: in csv's writerow, handle non-string keys when generating the - error message that certain keys are not in the 'fieldnames' list. +- ``PCbuild\rt.bat`` now accepts an unlimited number of arguments to pass along + to regrtest.py. Previously there was a limit of 9. -- bpo-13633: Added a new convert_charrefs keyword arg to HTMLParser that, - when True, automatically converts all character references. +Build +----- -- bpo-2927: Added the unescape() function to the html module. +- Issue #24915: Add LLVM support for PGO builds and use the test suite to + generate the profile data. Initial patch by Alecsandru Patrascu of Intel. -- bpo-8402: Added the escape() function to the glob module. +- Issue #24910: Windows MSIs now have unique display names. -- bpo-17618: Add Base85 and Ascii85 encoding/decoding to the base64 module. +- Issue #24986: It is now possible to build Python on Windows without errors + when external libraries are not available. -- bpo-19634: time.strftime("%y") now raises a ValueError on AIX when given a - year before 1900. +Windows +------- -- Fix test.support.bind_port() to not cause an error when Python was - compiled on a system with SO_REUSEPORT defined in the headers but run on a - system with an OS kernel that does not support that reasonably new socket - option. +- Issue #25450: Updates shortcuts to start Python in installation directory. -- Fix compilation error under gcc of the ctypes module bundled libffi for - arm. +- Issue #25164: Changes default all-users install directory to match per-user + directory. -- bpo-19448: Add private API to SSL module to lookup ASN.1 objects by OID, - NID, short name and long name. +- Issue #25143: Improves installer error messages for unsupported platforms. -- bpo-19282: dbm.open now supports the context management protocol. (Initial - patch by Claudiu Popa) +- Issue #25163: Display correct directory in installer when using non-default + settings. -- bpo-8311: Added support for writing any bytes-like objects in the aifc, - sunau, and wave modules. +- Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build -- bpo-5202: Added support for unseekable files in the wave module. +- Issue #25089: Adds logging to installer for case where launcher is not + selected on upgrade. -- bpo-19544: Restore global option to ignore ~/.pydistutils.cfg in - Distutils, accidentally removed in backout of distutils2 changes. (See - also: bpo-1180) +- Issue #25165: Windows uninstallation should not remove launcher if other + versions remain -- bpo-19523: Closed FileHandler leak which occurred when delay was set. +- Issue #25112: py.exe launcher is missing icons -- bpo-19544: Restore support for --user and --group parameters to sdist - command accidentally rolled back as part of the distutils2 rollback. (See - also: bpo-6516) +- Issue #25102: Windows installer does not precompile for -O or -OO. -- bpo-13674: Prevented time.strftime from crashing on Windows when given a - year before 1900 and a format of %y. +- Issue #25081: Makes Back button in installer go back to upgrade page when + upgrading. -- bpo-19406: implementation of the ensurepip module (part of PEP 453). Patch - by Donald Stufft and Nick Coghlan. +- Issue #25091: Increases font size of the installer. -- bpo-19544: Restore use of urllib over http allowing use of http_proxy for - Distutils upload command, a feature accidentally lost in the rollback of - distutils2. (See also: bpo-6286) +- Issue #25126: Clarifies that the non-web installer will download some + components. -- bpo-19544: Restore the read_pkg_file method to - distutils.dist.DistributionMetadata accidentally removed in the undo of - distutils2. (See also: bpo-7457) +- Issue #25213: Restores requestedExecutionLevel to manifest to disable + UAC virtualization. -- bpo-16685: Added support for any bytes-like objects in the audioop module. - Removed support for strings. +- Issue #25022: Removed very outdated PC/example_nt/ directory. -- bpo-7171: Add Windows implementation of ``inet_ntop`` and ``inet_pton`` to - socket module. Patch by Atsuo Ishimoto. +Tools/Demos +----------- -- bpo-19261: Added support for writing 24-bit samples in the sunau module. +- Issue #25440: Fix output of python-config --extension-suffix. -- bpo-1097797: Added CP273 encoding, used on IBM mainframes in Germany and - Austria. Mapping provided by Michael Bierenfeld. -- bpo-1575020: Fixed support of 24-bit wave files on big-endian platforms. +What's New in Python 3.5.0 final? +================================= -- bpo-19378: Fixed a number of cases in the dis module where the new "file" - parameter was not being honoured correctly +Release date: 2015-09-13 -- bpo-19378: Removed the "dis.Bytecode.show_info" method +Build +----- -- bpo-19378: Renamed the "dis.Bytecode.display_code" method to - "dis.Bytecode.dis" and converted it to returning a string rather than - printing output. +- Issue #25071: Windows installer should not require TargetDir + parameter when installing quietly. -- bpo-19378: the "line_offset" parameter in the new "dis.get_instructions" - API has been renamed to "first_line" (and the default value and usage - changed accordingly). This should reduce confusion with the more common - use of "offset" in the dis docs to refer to bytecode offsets. -- bpo-18678: Corrected spwd struct member names in spwd module: - sp_nam->sp_namp, and sp_pwd->sp_pwdp. The old names are kept as extra - structseq members, for backward compatibility. +What's New in Python 3.5.0 release candidate 4? +=============================================== -- bpo-6157: Fixed tkinter.Text.debug(). tkinter.Text.bbox() now raises - TypeError instead of TclError on wrong number of arguments. Original - patch by Guilherme Polo. +Release date: 2015-09-09 -- bpo-10197: Rework subprocess.get[status]output to use subprocess - functionality and thus to work on Windows. Patch by Nick Coghlan +Library +------- -- bpo-6160: The bbox() method of tkinter.Spinbox now returns a tuple of - integers instead of a string. Based on patch by Guilherme Polo. +- Issue #25029: Fixes MemoryError in test_strptime. -- bpo-19403: contextlib.redirect_stdout is now reentrant +Build +----- -- bpo-19286: Directories in ``package_data`` are no longer added to the - filelist, preventing failure outlined in the ticket. +- Issue #25027: Reverts partial-static build options and adds + vcruntime140.dll to Windows installation. -- bpo-19480: HTMLParser now accepts all valid start-tag names as defined by - the HTML5 standard. -- bpo-15114: The html.parser module now raises a DeprecationWarning when the - strict argument of HTMLParser or the HTMLParser.error method are used. +What's New in Python 3.5.0 release candidate 3? +=============================================== -- bpo-19410: Undo the special-casing removal of '' for - importlib.machinery.FileFinder. +Release date: 2015-09-07 -- bpo-19424: Fix the warnings module to accept filename containing surrogate - characters. +Core and Builtins +----------------- -- bpo-19435: Fix directory traversal attack on CGIHttpRequestHandler. +- Issue #24305: Prevent import subsystem stack frames from being counted + by the warnings.warn(stacklevel=) parameter. -- bpo-19227: Remove pthread_atfork() handler. The handler was added to solve - #18747 but has caused issues. +- Issue #24912: Prevent __class__ assignment to immutable built-in objects. -- bpo-19420: Fix reference leak in module initialization code of - _hashopenssl.c +- Issue #24975: Fix AST compilation for PEP 448 syntax. -- bpo-19329: Optimized compiling charsets in regular expressions. +Library +------- -- bpo-19227: Try to fix deadlocks caused by re-seeding then OpenSSL pseudo- - random number generator on fork(). +- Issue #24917: time_strftime() buffer over-read. -- bpo-16037: HTTPMessage.readheaders() raises an HTTPException when more - than 100 headers are read. Adapted from patch by Jyrki Pulliainen. +- Issue #24748: To resolve a compatibility problem found with py2exe and + pywin32, imp.load_dynamic() once again ignores previously loaded modules + to support Python modules replacing themselves with extension modules. + Patch by Petr Viktorin. -- bpo-16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to - prevent readline() calls from consuming too much memory. Patch by Jyrki - Pulliainen. +- Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable) + would return True once, then False on subsequent calls. -- bpo-16041: CVE-2013-1752: poplib: Limit maximum line lengths to 2048 to - prevent readline() calls from consuming too much memory. Patch by Jyrki - Pulliainen. +- Issue #24989: Fixed buffer overread in BytesIO.readline() if a position is + set beyond size. Based on patch by John Leitch. -- bpo-17997: Change behavior of ``ssl.match_hostname()`` to follow RFC 6125, - for security reasons. It now doesn't match multiple wildcards nor - wildcards inside IDN fragments. +- Issue #24913: Fix overrun error in deque.index(). + Found by John Leitch and Bryce Darling. -- bpo-16039: CVE-2013-1752: Change use of readline in imaplib module to - limit line length. Patch by Emil Lind. -- bpo-19330: the unnecessary wrapper functions have been removed from the - implementations of the new contextlib.redirect_stdout and - contextlib.suppress context managers, which also ensures they provide - reasonable help() output on instances +What's New in Python 3.5.0 release candidate 2? +=============================================== -- bpo-19393: Fix symtable.symtable function to not be confused when there - are functions or classes named "top". +Release date: 2015-08-25 -- bpo-18685: Restore re performance to pre-PEP 393 levels. +Core and Builtins +----------------- -- bpo-19339: telnetlib module is now using time.monotonic() when available - to compute timeout. +- Issue #24769: Interpreter now starts properly when dynamic loading + is disabled. Patch by Petr Viktorin. -- bpo-19399: fix sporadic test_subprocess failure. +- Issue #21167: NAN operations are now handled correctly when python is + compiled with ICC even if -fp-model strict is not specified. -- bpo-13234: Fix os.listdir to work with extended paths on Windows. Patch by - Santoso Wijaya. +- Issue #24492: A "package" lacking a __name__ attribute when trying to perform + a ``from .. import ...`` statement will trigger an ImportError instead of an + AttributeError. -- bpo-19375: The site module adding a "site-python" directory to sys.path, - if it exists, is now deprecated. +Library +------- -- bpo-19379: Lazily import linecache in the warnings module, to make startup - with warnings faster until a warning gets printed. +- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk. -- bpo-19288: Fixed the "in" operator of dbm.gnu databases for string - argument. Original patch by Arfrever Frehtes Taifersar Arahesis. +- Issue #24839: platform._syscmd_ver raises DeprecationWarning -- bpo-19287: Fixed the "in" operator of dbm.ndbm databases for string - argument. Original patch by Arfrever Frehtes Taifersar Arahesis. +- Issue #24867: Fix Task.get_stack() for 'async def' coroutines -- bpo-19327: Fixed the working of regular expressions with too big charset. -- bpo-17400: New 'is_global' attribute for ipaddress to tell if an address - is allocated by IANA for global or private networks. +What's New in Python 3.5.0 release candidate 1? +=============================================== -- bpo-19350: Increasing the test coverage of macurl2path. Patch by Colin - Williams. +Release date: 2015-08-09 -- bpo-19365: Optimized the parsing of long replacement string in re.sub*() - functions. +Core and Builtins +----------------- -- bpo-19352: Fix unittest discovery when a module can be reached through - several paths (e.g. under Debian/Ubuntu with virtualenv). +- Issue #24667: Resize odict in all cases that the underlying dict resizes. -- bpo-15207: Fix mimetypes to read from correct part of Windows registry - Original patch by Dave Chambers +Library +------- -- bpo-16595: Add prlimit() to resource module. +- Issue #24824: Signatures of codecs.encode() and codecs.decode() now are + compatible with pydoc. -- bpo-19324: Expose Linux-specific constants in resource module. +- Issue #24634: Importing uuid should not try to load libc on Windows -- Load SSL's error strings in hashlib. +- Issue #24798: _msvccompiler.py doesn't properly support manifests -- bpo-18527: Upgrade internal copy of zlib to 1.2.8. +- Issue #4395: Better testing and documentation of binary operators. + Patch by Martin Panter. -- bpo-19274: Add a filterfunc parameter to PyZipFile.writepy. +- Issue #23973: Update typing.py from GitHub repo. -- bpo-8964: fix platform._sys_version to handle IronPython 2.6+. Patch by - Martin Matusiak. +- Issue #23004: mock_open() now reads binary data correctly when the type of + read_data is bytes. Initial patch by Aaron Hill. -- bpo-19413: Restore pre-3.3 reload() semantics of re-finding modules. +- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh. -- bpo-18958: Improve error message for json.load(s) while passing a string - that starts with a UTF-8 BOM. +- Issue #23652: Make it possible to compile the select module against the + libc headers from the Linux Standard Base, which do not include some + EPOLL macros. Patch by Matt Frank. -- bpo-19307: Improve error message for json.load(s) while passing objects of - the wrong type. +- Issue #22932: Fix timezones in email.utils.formatdate. + Patch from Dmitry Shachnev. -- bpo-16038: CVE-2013-1752: ftplib: Limit amount of data read by limiting - the call to readline(). Original patch by Michał Jastrzębski and - Giampaolo Rodola. +- Issue #23779: imaplib raises TypeError if authenticator tries to abort. + Patch from Craig Holmquist. -- bpo-17087: Improved the repr for regular expression match objects. +- Issue #23319: Fix ctypes.BigEndianStructure, swap correctly bytes. Patch + written by Matthieu Gautier. -Tests ------ +- Issue #23254: Document how to close the TCPServer listening socket. + Patch from Martin Panter. -- bpo-19664: test_userdict's repr test no longer depends on the order of - dict elements. +- Issue #19450: Update Windows and OS X installer builds to use SQLite 3.8.11. -- bpo-19440: Clean up test_capi by removing an unnecessary __future__ - import, converting from test_main to unittest.main, and running the - _testcapi module tests as subTests of a unittest TestCase method. +- Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella. -- bpo-19378: the main dis module tests are now run with both stdout - redirection *and* passing an explicit file parameter +- Issue #24791: Fix grammar regression for call syntax: 'g(\*a or b)'. -- bpo-19378: removed the not-actually-helpful assertInstructionMatches and - assertBytecodeExactlyMatches helpers from bytecode_helper +IDLE +---- -- bpo-18702: All skipped tests now reported as skipped. +- Issue #23672: Allow Idle to edit and run files with astral chars in name. + Patch by Mohd Sanad Zaki Rizvi. -- bpo-19439: interpreter embedding tests are now executed on Windows (Patch - by Zachary Ware) +- Issue #24745: Idle editor default font. Switch from Courier to + platform-sensitive TkFixedFont. This should not affect current customized + font selections. If there is a problem, edit $HOME/.idlerc/config-main.cfg + and remove 'fontxxx' entries from [Editor Window]. Patch by Mark Roseman. -- bpo-19085: Added basic tests for all tkinter widget options. +- Issue #21192: Idle editor. When a file is run, put its name in the restart bar. + Do not print false prompts. Original patch by Adnan Umer. -- bpo-19384: Fix test_py_compile for root user, patch by Claudiu Popa. +- Issue #13884: Idle menus. Remove tearoff lines. Patch by Roger Serwy. Documentation ------------- -- bpo-18326: Clarify that list.sort's arguments are keyword-only. Also, - attempt to reduce confusion in the glossary by not saying there are - different "types" of arguments and parameters. +- Issue #24129: Clarify the reference documentation for name resolution. + This includes removing the assumption that readers will be familiar with the + name resolution scheme Python used prior to the introduction of lexical + scoping for function namespaces. Patch by Ivan Levkivskyi. -Build ------ +- Issue #20769: Improve reload() docs. Patch by Dorian Pula. -- bpo-19358: "make clinic" now runs the Argument Clinic preprocessor over - all CPython source files. +- Issue #23589: Remove duplicate sentence from the FAQ. Patch by Yongzhi Pan. -- Update SQLite to 3.8.1, xz to 5.0.5, and Tcl/Tk to 8.6.1 on Windows. +- Issue #24729: Correct IO tutorial to match implementation regarding + encoding parameter to open function. -- bpo-16632: Enable DEP and ASLR on Windows. +Tests +----- -- bpo-17791: Drop PREFIX and EXEC_PREFIX definitions from PC/pyconfig.h +- Issue #24751: When running regrtest with the ``-w`` command line option, + a test run is no longer marked as a failure if all tests succeed when + re-run. -- Add workaround for VS 2010 nmake clean issue. VS 2010 doesn't set up PATH - for nmake.exe correctly. -- bpo-19550: Implement Windows installer changes of PEP 453 (ensurepip). +What's New in Python 3.5.0 beta 4? +================================== -- bpo-19520: Fix compiler warning in the _sha3 module on 32bit Windows. +Release date: 2015-07-26 -- bpo-19356: Avoid using a C variabled named "_self", it's a reserved word - in some C compilers. +Core and Builtins +----------------- -- bpo-15792: Correct build options on Win64. Patch by Jeremy Kloth. +- Issue #23573: Restored optimization of bytes.rfind() and bytearray.rfind() + for single-byte argument on Linux. -- bpo-19373: Apply upstream change to Tk 8.5.15 fixing OS X 10.9 screen - refresh problem for OS X installer build. +- Issue #24569: Make PEP 448 dictionary evaluation more consistent. -- bpo-19649: On OS X, the same set of file names are now installed in bin - directories for all configurations: non-framework vs framework, and single - arch vs universal builds. pythonx.y-32 is now always installed for - 64-bit/32-bit universal builds. The obsolete and undocumented pythonw* - symlinks are no longer installed anywhere. +- Issue #24583: Fix crash when set is mutated while being updated. -- bpo-19553: PEP 453 - "make install" and "make altinstall" now install or - upgrade pip by default, using the bundled pip provided by the new - ensurepip module. A new configure option, --with- - ensurepip[=upgrade|install|no], is available to override the default - ensurepip "--upgrade" option. The option can also be set with "make - [alt]install ENSUREPIP=[upgrade|install|no]". +- Issue #24407: Fix crash when dict is mutated while being updated. -- bpo-19551: PEP 453 - the OS X installer now installs pip by default. +- Issue #24619: New approach for tokenizing async/await. As a consequence, + it is now possible to have one-line 'async def foo(): await ..' functions. -- Update third-party libraries for OS X installers: xz 5.0.3 -> 5.0.5, - SQLite 3.7.13 -> 3.8.1 +- Issue #24687: Plug refleak on SyntaxError in function parameters + annotations. -- bpo-15663: Revert OS X installer built-in Tcl/Tk support for 3.4.0b1. Some - third-party projects, such as Matplotlib and PIL/Pillow, depended on being - able to build with Tcl and Tk frameworks in /Library/Frameworks. +- Issue #15944: memoryview: Allow arbitrary formats when casting to bytes. + Patch by Martin Panter. -Tools/Demos ------------ +Library +------- -- bpo-19730: Argument Clinic now supports all the existing PyArg "format - units" as legacy converters, as well as two new features: "self - converters" and the "version" directive. +- Issue #23441: rcompleter now prints a tab character instead of displaying + possible completions for an empty word. Initial patch by Martin Sekera. -- bpo-19552: pyvenv now bootstraps pip into virtual environments by default - (pass --without-pip to request the old behaviour) +- Issue #24683: Fixed crashes in _json functions called with arguments of + inappropriate type. -- bpo-19390: Argument Clinic no longer accepts malformed Python and C ids. +- Issue #21697: shutil.copytree() now correctly handles symbolic links that + point to directories. Patch by Eduardo Seabra and Thomas Kluyver. +- Issue #14373: Fixed segmentation fault when gc.collect() is called during + constructing lru_cache (C implementation). -What's New in Python 3.4.0 alpha 4? -=================================== +- Issue #24695: Fix a regression in traceback.print_exception(). If + exc_traceback is None we shouldn't print a traceback header like described + in the documentation. -*Release date: 2013-10-20* +- Issue #24620: Random.setstate() now validates the value of state last element. -Core and Builtins ------------------ +- Issue #22485: Fixed an issue that caused `inspect.getsource` to return + incorrect results on nested functions. -- bpo-19301: Give classes and functions that are explicitly marked global a - global qualname. +- Issue #22153: Improve unittest docs. Patch from Martin Panter and evilzero. -- bpo-19279: UTF-7 decoder no longer produces illegal strings. +- Issue #24580: Symbolic group references to open group in re patterns now are + explicitly forbidden as well as numeric group references. -- bpo-16612: Add "Argument Clinic", a compile-time preprocessor for C files - to generate argument parsing code. (See PEP 436.) +- Issue #24206: Fixed __eq__ and __ne__ methods of inspect classes. -- bpo-18810: Shift stat calls in importlib.machinery.FileFinder such that - the code is optimistic that if something exists in a directory named - exactly like the possible package being searched for that it's in - actuality a directory. +- Issue #24631: Fixed regression in the timeit module with multiline setup. -- bpo-18416: importlib.machinery.PathFinder now treats '' as the cwd and - importlib.machinery.FileFinder no longer special-cases '' to '.'. This - leads to modules imported from cwd to now possess an absolute file path - for __file__ (this does not affect modules specified by path on the CLI - but it does affect -m/runpy). It also allows FileFinder to be more - consistent by not having an edge case. +- Issue #24608: chunk.Chunk.read() now always returns bytes, not str. -- bpo-4555: All exported C symbols are now prefixed with either "Py" or - "_Py". +- Issue #18684: Fixed reading out of the buffer in the re module. -- bpo-19219: Speed up marshal.loads(), and make pyc files slightly (5% to - 10%) smaller. +- Issue #24259: tarfile now raises a ReadError if an archive is truncated + inside a data segment. -- bpo-19221: Upgrade Unicode database to version 6.3.0. +- Issue #15014: SMTP.auth() and SMTP.login() now support RFC 4954's optional + initial-response argument to the SMTP AUTH command. -- bpo-16742: The result of the C callback PyOS_ReadlineFunctionPointer must - now be a string allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or - NULL if an error occurred), instead of a string allocated by - PyMem_Malloc() or PyMem_Realloc(). +- Issue #6549: Remove hyphen from ttk.Style().element options. Only return result + from ttk.Style().configure if a result was generated or a query submitted. -- bpo-19199: Remove ``PyThreadState.tick_counter`` field +- Issue #24669: Fix inspect.getsource() for 'async def' functions. + Patch by Kai Groner. -- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at - least one place so as to avoid regressions. +- Issue #24688: ast.get_docstring() for 'async def' functions. -- bpo-19087: Improve bytearray allocation in order to allow cheap popping of - data at the front (slice deletion). +Build +----- -- bpo-19014: memoryview.cast() is now allowed on zero-length views. +- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL + 1.0.2d. -- bpo-18690: memoryview is now automatically registered with - collections.abc.Sequence +What's New in Python 3.5.0 beta 3? +================================== -- bpo-19078: memoryview now correctly supports the reversed builtin (Patch - by Claudiu Popa) +Release date: 2015-07-05 -Library -------- +Core and Builtins +----------------- -- bpo-17457: unittest test discovery now works with namespace packages. - Patch by Claudiu Popa. +- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray + object now always allocates place for trailing null byte and it's buffer now + is always null-terminated. + +- Upgrade to Unicode 8.0.0. -- bpo-18235: Fix the sysconfig variables LDSHARED and BLDSHARED under AIX. - Patch by David Edelsohn. +- Issue #24345: Add Py_tp_finalize slot for the stable ABI. -- bpo-18606: Add the new "statistics" module (PEP 450). Contributed by - Steven D'Aprano. +- Issue #24400: Introduce a distinct type for PEP 492 coroutines; add + types.CoroutineType, inspect.getcoroutinestate, inspect.getcoroutinelocals; + coroutines no longer use CO_GENERATOR flag; sys.set_coroutine_wrapper + works only for 'async def' coroutines; inspect.iscoroutine no longer + uses collections.abc.Coroutine, it's intended to test for pure 'async def' + coroutines only; add new opcode: GET_YIELD_FROM_ITER; fix generators wrapper + used in types.coroutine to be instance of collections.abc.Generator; + collections.abc.Awaitable and collections.abc.Coroutine can no longer + be used to detect generator-based coroutines--use inspect.isawaitable + instead. -- bpo-12866: The audioop module now supports 24-bit samples. +- Issue #24450: Add gi_yieldfrom to generators and cr_await to coroutines. + Contributed by Benno Leslie and Yury Selivanov. -- bpo-19254: Provide an optimized Python implementation of pbkdf2_hmac. +- Issue #19235: Add new RecursionError exception. Patch by Georg Brandl. -- bpo-19201: Add "x" mode (exclusive creation) in opening file to bz2, gzip - and lzma modules. Patches by Tim Heaney and Vajrasky Kok. (See also: - bpo-19222, bpo-19223) +Library +------- -- Fix a reference count leak in _sre. +- Issue #21750: mock_open.read_data can now be read from each instance, as it + could in Python 3.3. -- bpo-19262: Initial check in of the 'asyncio' package (a.k.a. Tulip, a.k.a. - PEP 3156). There are no docs yet, and the PEP is slightly out of date with - the code. This module will have *provisional* status in Python 3.4. +- Issue #24552: Fix use after free in an error case of the _pickle module. -- bpo-19276: Fixed the wave module on 64-bit big-endian platforms. +- Issue #24514: tarfile now tolerates number fields consisting of only + whitespace. -- bpo-19266: Rename the new-in-3.4 ``contextlib.ignore`` context manager to - ``contextlib.suppress`` in order to be more consistent with existing - descriptions of that operation elsewhere in the language and standard - library documentation (Patch by Zero Piraeus). +- Issue #19176: Fixed doctype() related bugs in C implementation of ElementTree. + A deprecation warning no longer issued by XMLParser subclass with default + doctype() method. Direct call of doctype() now issues a warning. Parser's + doctype() now is not called if target's doctype() is called. Based on patch + by Martin Panter. -- bpo-18891: Completed the new email package (provisional) API additions by - adding new classes EmailMessage, MIMEPart, and ContentManager. +- Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize + for tab-indented blocks. -- bpo-18281: Unused stat constants removed from `tarfile`. +- Issue #24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm() + functions of the audioop module. -- bpo-18999: Multiprocessing now supports 'contexts' with the same API as - the module, but bound to specified start methods. +- Issue #24336: The contextmanager decorator now works with functions with + keyword arguments called "func" and "self". Patch by Martin Panter. -- bpo-18468: The re.split, re.findall, and re.sub functions and the group() - and groups() methods of match object now always return a string or a bytes - object. +- Issue #24522: Fix possible integer overflow in json accelerator module. -- bpo-18725: The textwrap module now supports truncating multiline text. +- Issue #24489: ensure a previously set C errno doesn't disturb cmath.polar(). -- bpo-18776: atexit callbacks now display their full traceback when they - raise an exception. +- Issue #24408: Fixed AttributeError in measure() and metrics() methods of + tkinter.Font. -- bpo-17827: Add the missing documentation for ``codecs.encode`` and - ``codecs.decode``. +- Issue #14373: C implementation of functools.lru_cache() now can be used with + methods. -- bpo-19218: Rename collections.abc to _collections_abc in order to speed up - interpreter start. +- Issue #24347: Set KeyError if PyDict_GetItemWithError returns NULL. -- bpo-18582: Add 'pbkdf2_hmac' to the hashlib module. It implements PKCS#5 - password-based key derivation functions with HMAC as pseudorandom - function. +- Issue #24348: Drop superfluous incref/decref. -- bpo-19131: The aifc module now correctly reads and writes sampwidth of - compressed streams. +- Issue #24359: Check for changed OrderedDict size during iteration. -- bpo-19209: Remove import of copyreg from the os module to speed up - interpreter startup. stat_result and statvfs_result are now hard-coded to - reside in the os module. +- Issue #24368: Support keyword arguments in OrderedDict methods. -- bpo-19205: Don't import the 're' module in site and sysconfig module to - speed up interpreter start. +- Issue #24362: Simplify the C OrderedDict fast nodes resize logic. -- bpo-9548: Add a minimal "_bootlocale" module that is imported by the _io - module instead of the full locale module. +- Issue #24377: Fix a ref leak in OrderedDict.__repr__. -- bpo-18764: Remove the 'print' alias for the PDB 'p' command so that it no - longer shadows the print function. +- Issue #24369: Defend against key-changes during iteration. -- bpo-19158: A rare race in BoundedSemaphore could allow .release() too - often. +Tests +----- -- bpo-15805: Add contextlib.redirect_stdout(). +- Issue #24373: _testmultiphase and xxlimited now use tp_traverse and + tp_finalize to avoid reference leaks encountered when combining tp_dealloc + with PyType_FromSpec (see issue #16690 for details) -- bpo-18716: Deprecate the formatter module. +Documentation +------------- -- bpo-10712: 2to3 has a new "asserts" fixer that replaces deprecated names - of unittest methods (e.g. failUnlessEqual -> assertEqual). +- Issue #24458: Update documentation to cover multi-phase initialization for + extension modules (PEP 489). Patch by Petr Viktorin. -- bpo-18037: 2to3 now escapes ``'\u'`` and ``'\U'`` in native strings. +- Issue #24351: Clarify what is meant by "identifier" in the context of + string.Template instances. -- bpo-17839: base64.decodebytes and base64.encodebytes now accept any object - that exports a 1 dimensional array of bytes (this means the same is now - also true for base64_codec) +Build +----- -- bpo-19132: The pprint module now supports compact mode. +- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL + 1.0.2c. -- bpo-19137: The pprint module now correctly formats instances of set and - frozenset subclasses. -- bpo-10042: functools.total_ordering now correctly handles NotImplemented - being returned by the underlying comparison function (Patch by Katie - Miller) +What's New in Python 3.5.0 beta 2? +================================== -- bpo-19092: contextlib.ExitStack now correctly reraises exceptions from the - __exit__ callbacks of inner context managers (Patch by Hrvoje Nikšić) +Release date: 2015-05-31 -- bpo-12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except - when necessary. Patch by Oscar Benjamin. +Core and Builtins +----------------- -- bpo-5845: In site.py, only load readline history from ~/.python_history if - no history has been read already. This avoids double writes to the - history file at shutdown. +- Issue #24284: The startswith and endswith methods of the str class no longer + return True when finding the empty string and the indexes are completely out + of range. -- Properly initialize all fields of a SSL object after allocation. +- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(), + PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains() + to check for and handle errors correctly. -- bpo-19095: SSLSocket.getpeercert() now raises ValueError when the SSL - handshake hasn't been done. +- Issue #24328: Fix importing one character extension modules. -- bpo-4366: Fix building extensions on all platforms when --enable-shared is - used. +- Issue #11205: In dictionary displays, evaluate the key before the value. -- bpo-19030: Fixed `inspect.getmembers` and `inspect.classify_class_attrs` - to attempt activating descriptors before falling back to a __dict__ search - for faulty descriptors. `inspect.classify_class_attrs` no longer returns - Attributes whose home class is None. +- Issue #24285: Fixed regression that prevented importing extension modules + from inside packages. Patch by Petr Viktorin. -C API ------ +Library +------- -- bpo-1772673: The type of `char*` arguments now changed to `const char*`. +- Issue #23247: Fix a crash in the StreamWriter.reset() of CJK codecs. -- bpo-16129: Added a `Py_SetStandardStreamEncoding` pre-initialization API - to allow embedding applications like Blender to force a particular - encoding and error handler for the standard IO streams (initial patch by - Bastien Montagne) +- Issue #24270: Add math.isclose() and cmath.isclose() functions as per PEP 485. + Contributed by Chris Barker and Tal Einat. -Tests ------ +- Issue #5633: Fixed timeit when the statement is a string and the setup is not. -- bpo-19275: Fix test_site on AMD64 Snow Leopard +- Issue #24326: Fixed audioop.ratecv() with non-default weightB argument. + Original patch by David Moore. -- bpo-14407: Fix unittest test discovery in test_concurrent_futures. +- Issue #16991: Add a C implementation of OrderedDict. -- bpo-18919: Unified and extended tests for audio modules: aifc, sunau and - wave. +- Issue #23934: Fix inspect.signature to fail correctly for builtin types + lacking signature information. Initial patch by James Powell. -- bpo-18714: Added tests for ``pdb.find_function()``. -Documentation -------------- +What's New in Python 3.5.0 beta 1? +================================== -- bpo-18758: Fixed and improved cross-references. +Release date: 2015-05-24 -- bpo-18972: Modernize email examples and use the argparse module in them. +Core and Builtins +----------------- -Build ------ +- Issue #24276: Fixed optimization of property descriptor getter. -- bpo-19130: Correct PCbuild/readme.txt, Python 3.3 and 3.4 require VS 2010. +- Issue #24268: PEP 489: Multi-phase extension module initialization. + Patch by Petr Viktorin. -- bpo-15663: Update OS X 10.6+ installer to use Tcl/Tk 8.5.15. +- Issue #23359: Optimize set object internals by specializing the + hash table search into a lookup function and an insert function. -- bpo-14499: Fix several problems with OS X universal build support: 1. - ppc arch detection for extension module builds broke with Xcode 5 2. ppc - arch detection in configure did not work on OS X 10.4 3. -sysroot and - -arch flags were unnecessarily duplicated 4. there was no obvious way to - configure an intel-32 only build. +- Issue #23955: Add pyvenv.cfg option to suppress registry/environment + lookup for generating sys.path on Windows. -- bpo-19019: Change the OS X installer build script to use CFLAGS instead of - OPT for special build options. By setting OPT, some compiler-specific - options like -fwrapv were overridden and thus not used, which could result - in broken interpreters when building with clang. +- Issue #24257: Fixed system error in the comparison of faked + types.SimpleNamespace. +- Issue #22939: Fixed integer overflow in iterator object. Patch by + Clement Rouault. -What's New in Python 3.4.0 alpha 3? -=================================== +- Issue #23985: Fix a possible buffer overrun when deleting a slice from + the front of a bytearray and then appending some other bytes data. -*Release date: 2013-09-29* +- Issue #24102: Fixed exception type checking in standard error handlers. -Core and Builtins ------------------ +- Issue #15027: The UTF-32 encoder is now 3x to 7x faster. -- bpo-18818: The "encodingname" part of PYTHONIOENCODING is now optional. +- Issue #23290: Optimize set_merge() for cases where the target is empty. + (Contributed by Serhiy Storchaka.) -- bpo-19098: Prevent overflow in the compiler when the recursion limit is - set absurdly high. +- Issue #2292: PEP 448: Additional Unpacking Generalizations. -Library -------- +- Issue #24096: Make warnings.warn_explicit more robust against mutation of the + warnings.filters list. -- bpo-18929: `inspect.classify_class_attrs()` now correctly finds class - attributes returned by `dir()` that are located in the metaclass. +- Issue #23996: Avoid a crash when a delegated generator raises an + unnormalized StopIteration exception. Patch by Stefan Behnel. -- bpo-18950: Fix miscellaneous bugs in the sunau module. - Au_read.readframes() now updates current file position and reads correct - number of frames from multichannel stream. Au_write.writeframesraw() now - correctly updates current file position. Au_read.getnframes() now returns - an integer (as in Python 2). Au_read and Au_write now correctly works with - file object if start file position is not a zero. +- Issue #23910: Optimize property() getter calls. Patch by Joe Jevnik. -- bpo-18594: The fast path for collections.Counter() was never taken due to - an over- restrictive type check. +- Issue #23911: Move path-based importlib bootstrap code to a separate + frozen module. -- bpo-19053: ZipExtFile.read1() with non-zero argument no more returns empty - bytes until end of data. +- Issue #24192: Fix namespace package imports. -- logging: added support for Unix domain sockets to SocketHandler and - DatagramHandler. +- Issue #24022: Fix tokenizer crash when processing undecodable source code. -- bpo-18996: TestCase.assertEqual() now more cleverly shorten differing - strings in error report. +- Issue #9951: Added a hex() method to bytes, bytearray, and memoryview. -- bpo-19034: repr() for tkinter.Tcl_Obj now exposes string reperesentation. +- Issue #22906: PEP 479: Change StopIteration handling inside generators. -- bpo-18978: ``urllib.request.Request`` now allows the method to be - indicated on the class and no longer sets it to None in ``__init__``. +- Issue #24017: PEP 492: Coroutines with async and await syntax. -- bpo-18626: the inspect module now offers a basic command line - introspection interface (Initial patch by Claudiu Popa) +Library +------- -- bpo-3015: Fixed tkinter with wantobject=False. Any Tcl command call - returned empty string. +- Issue #14373: Added C implementation of functools.lru_cache(). Based on + patches by Matt Joiner and Alexey Kachayev. -- bpo-19037: The mailbox module now makes all changes to maildir files - before moving them into place, to avoid race conditions with other - programs that may be accessing the maildir directory. +- Issue #24230: The tempfile module now accepts bytes for prefix, suffix and dir + parameters and returns bytes in such situations (matching the os module APIs). -- bpo-14984: On POSIX systems, when netrc is called without a filename - argument (and therefore is reading the user's $HOME/.netrc file), it now - enforces the same security rules as typical ftp clients: the .netrc file - must be owned by the user that owns the process and must not be readable - by any other user. +- Issue #22189: collections.UserString now supports __getnewargs__(), + __rmod__(), casefold(), format_map(), isprintable(), and maketrans(). + Patch by Joe Jevnik. -- bpo-18873: The tokenize module now detects Python source code encoding - only in comment lines. +- Issue #24244: Prevents termination when an invalid format string is + encountered on Windows in strftime. -- bpo-17764: Enable http.server to bind to a user specified network - interface. Patch contributed by Malte Swart. +- Issue #23973: PEP 484: Add the typing module. -- bpo-18937: Add an assertLogs() context manager to unittest.TestCase to - ensure that a block of code emits a message using the logging module. +- Issue #23086: The collections.abc.Sequence() abstract base class added + *start* and *stop* parameters to the index() mixin. + Patch by Devin Jeanpierre. -- bpo-17324: Fix http.server's request handling case on trailing '/'. Patch - contributed by Vajrasky Kok. +- Issue #20035: Replaced the ``tkinter._fix`` module used for setting up the + Tcl/Tk environment on Windows with a private function in the ``_tkinter`` + module that makes no permanent changes to the environment. -- bpo-19018: The heapq.merge() function no longer suppresses IndexError in - the underlying iterables. +- Issue #24257: Fixed segmentation fault in sqlite3.Row constructor with faked + cursor type. -- bpo-18784: The uuid module no longer attempts to load libc via ctypes.CDLL - if all the necessary functions have already been found in libuuid. Patch - by Evgeny Sologubov. +- Issue #15836: assertRaises(), assertRaisesRegex(), assertWarns() and + assertWarnsRegex() assertments now check the type of the first argument + to prevent possible user error. Based on patch by Daniel Wagner-Hall. -- The :envvar:`PYTHONFAULTHANDLER` environment variable now only enables the - faulthandler module if the variable is non-empty. Same behaviour than - other variables like :envvar:`PYTHONDONTWRITEBYTECODE`. +- Issue #9858: Add missing method stubs to _io.RawIOBase. Patch by Laura + Rupprecht. -- bpo-1565525: New function ``traceback.clear_frames`` will clear the local - variables of all the stack frames referenced by a traceback object. +- Issue #22955: attrgetter, itemgetter and methodcaller objects in the operator + module now support pickling. Added readable and evaluable repr for these + objects. Based on patch by Josh Rosenberg. -Tests ------ +- Issue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again + when a directory with the chosen name already exists on Windows as well as + on Unix. tempfile.mkstemp() now fails early if parent directory is not + valid (not exists or is a file) on Windows. -- bpo-18952: Fix regression in support data downloads introduced when - test.support was converted to a package. Regression noticed by Zachary - Ware. +- Issue #23780: Improved error message in os.path.join() with single argument. -IDLE ----- +- Issue #6598: Increased time precision and random number range in + email.utils.make_msgid() to strengthen the uniqueness of the message ID. -- bpo-18873: IDLE now detects Python source code encoding only in comment - lines. +- Issue #24091: Fixed various crashes in corner cases in C implementation of + ElementTree. -- bpo-18988: The "Tab" key now works when a word is already autocompleted. +- Issue #21931: msilib.FCICreate() now raises TypeError in the case of a bad + argument instead of a ValueError with a bogus FCI error number. + Patch by Jeffrey Armstrong. -Documentation -------------- +- Issue #13866: *quote_via* argument added to urllib.parse.urlencode. -- bpo-17003: Unified the size argument names in the io module with common - practice. +- Issue #20098: New mangle_from policy option for email, default True + for compat32, but False for all other policies. -Build ------ +- Issue #24211: The email library now supports RFC 6532: it can generate + headers using utf-8 instead of encoded words. -- bpo-18596: Support the use of address sanity checking in recent versions - of clang and GCC by appropriately marking known false alarms in the small - object allocator. Patch contributed by Dhiru Kholia. +- Issue #16314: Added support for the LZMA compression in distutils. -Tools/Demos ------------ +- Issue #21804: poplib now supports RFC 6856 (UTF8). -- bpo-18873: 2to3 and the findnocoding.py script now detect Python source - code encoding only in comment lines. +- Issue #18682: Optimized pprint functions for builtin scalar types. +- Issue #22027: smtplib now supports RFC 6531 (SMTPUTF8). -What's New in Python 3.4.0 alpha 2? -=================================== +- Issue #23488: Random generator objects now consume 2x less memory on 64-bit. -*Release date: 2013-09-09* +- Issue #1322: platform.dist() and platform.linux_distribution() functions are + now deprecated. Initial patch by Vajrasky Kok. -Core and Builtins ------------------ +- Issue #22486: Added the math.gcd() function. The fractions.gcd() function now is + deprecated. Based on patch by Mark Dickinson. -- bpo-18942: sys._debugmallocstats() output was damaged on Windows. +- Issue #24064: Property() docstrings are now writeable. + (Patch by Berker Peksag.) -- bpo-18571: Implementation of the PEP 446: file descriptors and file - handles are now created non-inheritable; add functions - os.get/set_inheritable(), os.get/set_handle_inheritable() and - socket.socket.get/set_inheritable(). +- Issue #22681: Added support for the koi8_t encoding. -- bpo-11619: The parser and the import machinery do not encode Unicode - filenames anymore on Windows. +- Issue #22682: Added support for the kz1048 encoding. -- bpo-18808: Non-daemon threads are now automatically joined when a sub- - interpreter is shutdown (it would previously dump a fatal error). +- Issue #23796: peek and read1 methods of BufferedReader now raise ValueError + if they called on a closed object. Patch by John Hergenroeder. -- Remove support for compiling on systems without getcwd(). +- Issue #21795: smtpd now supports the 8BITMIME extension whenever + the new *decode_data* constructor argument is set to False. -- bpo-18774: Remove last bits of GNU PTH thread code and thread_pth.h. +- Issue #24155: optimize heapq.heapify() for better cache performance + when heapifying large lists. -- bpo-18771: Add optimization to set object lookups to reduce the cost of - hash collisions. The core idea is to inspect a second key/hash pair for - each cache line retrieved. +- Issue #21800: imaplib now supports RFC 5161 (enable), RFC 6855 + (utf8/internationalized email) and automatically encodes non-ASCII + usernames and passwords to UTF8. -- bpo-16105: When a signal handler fails to write to the file descriptor - registered with ``signal.set_wakeup_fd()``, report an exception instead of - ignoring the error. +- Issue #20274: When calling a _sqlite.Connection, it now complains if passed + any keyword arguments. Previously it silently ignored them. -- bpo-18722: Remove uses of the "register" keyword in C code. +- Issue #20274: Remove ignored and erroneous "kwargs" parameters from three + METH_VARARGS methods on _sqlite.Connection. -- bpo-18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions. +- Issue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and + assertWarnsRegex() checks now emits a deprecation warning when callable is + None or keyword arguments except msg is passed in the context manager mode. -- bpo-16499: Add command line option for isolated mode. +- Issue #24018: Add a collections.abc.Generator abstract base class. + Contributed by Stefan Behnel. -- bpo-15301: Parsing fd, uid, and gid parameters for builtins in - Modules/posixmodule.c is now far more robust. +- Issue #23880: Tkinter's getint() and getdouble() now support Tcl_Obj. + Tkinter's getdouble() now supports any numbers (in particular int). -- bpo-18368: PyOS_StdioReadline() no longer leaks memory when realloc() - fail. +- Issue #22619: Added negative limit support in the traceback module. + Based on patch by Dmitry Kazakov. -- bpo-17934: Add a clear() method to frame objects, to help clean up - expensive details (local variables) and break reference cycles. +- Issue #24094: Fix possible crash in json.encode with poorly behaved dict + subclasses. -- bpo-18780: %-formatting codes %d, %i, and %u now treat int-subclasses as - int (displays value of int-subclass instead of str(int-subclass) ). +- Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes. + Patch written by William Orr. -Library -------- +- Issue #17445: add difflib.diff_bytes() to support comparison of + byte strings (fixes a regression from Python 2). -- bpo-18808: Thread.join() now waits for the underlying thread state to be - destroyed before returning. This prevents unpredictable aborts in - Py_EndInterpreter() when some non-daemon threads are still running. +- Issue #23917: Fall back to sequential compilation when ProcessPoolExecutor + doesn't exist. Patch by Claudiu Popa. -- bpo-18458: Prevent crashes with newer versions of libedit. Its readline - emulation has changed from 0-based indexing to 1-based like gnu readline. +- Issue #23008: Fixed resolving attributes with boolean value is False in pydoc. -- bpo-18852: Handle case of ``readline.__doc__`` being ``None`` in the new - readline activation code in ``site.py``. +- Fix asyncio issue 235: LifoQueue and PriorityQueue's put didn't + increment unfinished tasks (this bug was introduced when + JoinableQueue was merged with Queue). -- bpo-18672: Fixed format specifiers for Py_ssize_t in debugging output in - the _sre module. +- Issue #23908: os functions now reject paths with embedded null character + on Windows instead of silently truncating them. -- bpo-18830: inspect.getclasstree() no longer produces duplicate entries - even when input list contains duplicates. +- Issue #23728: binascii.crc_hqx() could return an integer outside of the range + 0-0xffff for empty data. -- bpo-18878: sunau.open now supports the context management protocol. Based - on patches by Claudiu Popa and R. David Murray. +- Issue #23887: urllib.error.HTTPError now has a proper repr() representation. + Patch by Berker Peksag. -- bpo-18909: Fix _tkinter.tkapp.interpaddr() on Windows 64-bit, don't cast - 64-bit pointer to long (32 bits). +- asyncio: New event loop APIs: set_task_factory() and get_task_factory(). -- bpo-18876: The FileIO.mode attribute now better reflects the actual mode - under which the file was opened. Patch by Erik Bray. +- asyncio: async() function is deprecated in favour of ensure_future(). -- bpo-16853: Add new selectors module. +- Issue #24178: asyncio.Lock, Condition, Semaphore, and BoundedSemaphore + support new 'async with' syntax. Contributed by Yury Selivanov. -- bpo-18882: Add threading.main_thread() function. +- Issue #24179: Support 'async for' for asyncio.StreamReader. + Contributed by Yury Selivanov. -- bpo-18901: The sunau getparams method now returns a namedtuple rather than - a plain tuple. Patch by Claudiu Popa. +- Issue #24184: Add AsyncIterator and AsyncIterable ABCs to + collections.abc. Contributed by Yury Selivanov. -- bpo-17487: The result of the wave getparams method now is pickleable - again. Patch by Claudiu Popa. +- Issue #22547: Implement informative __repr__ for inspect.BoundArguments. + Contributed by Yury Selivanov. -- bpo-18756: os.urandom() now uses a lazily-opened persistent file - descriptor, so as to avoid using many file descriptors when run in - parallel from multiple threads. +- Issue #24190: Implement inspect.BoundArgument.apply_defaults() method. + Contributed by Yury Selivanov. -- bpo-18418: After fork(), reinit all threads states, not only active ones. - Patch by A. Jesse Jiryu Davis. +- Issue #20691: Add 'follow_wrapped' argument to + inspect.Signature.from_callable() and inspect.signature(). + Contributed by Yury Selivanov. -- bpo-17974: Switch unittest from using getopt to using argparse. +- Issue #24248: Deprecate inspect.Signature.from_function() and + inspect.Signature.from_builtin(). -- bpo-11798: TestSuite now drops references to own tests after execution. +- Issue #23898: Fix inspect.classify_class_attrs() to support attributes + with overloaded __eq__ and __bool__. Patch by Mike Bayer. -- bpo-16611: http.cookie now correctly parses the 'secure' and 'httponly' - cookie flags. +- Issue #24298: Fix inspect.signature() to correctly unwrap wrappers + around bound methods. -- bpo-11973: Fix a problem in kevent. The flags and fflags fields are now - properly handled as unsigned. +IDLE +---- -- bpo-18807: ``pyvenv`` now takes a --copies argument allowing copies - instead of symlinks even where symlinks are available and the default. +- Issue #23184: remove unused names and imports in idlelib. + Initial patch by Al Sweigart. -- bpo-18538: ``python -m dis`` now uses argparse for argument processing. - Patch by Michele Orrù. +Tests +----- -- bpo-18394: Close cgi.FieldStorage's optional file. +- Issue #21520: test_zipfile no longer fails if the word 'bad' appears + anywhere in the name of the current directory. -- bpo-17702: On error, os.environb now suppresses the exception context when - raising a new KeyError with the original key. +- Issue #9517: Move script_helper into the support package. + Patch by Christie Wilson. -- bpo-16809: Fixed some tkinter incompatibilities with Tcl/Tk 8.6. +Documentation +------------- -- bpo-16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj - argument. +- Issue #22155: Add File Handlers subsection with createfilehandler to tkinter + doc. Remove obsolete example from FAQ. Patch by Martin Panter. -- bpo-18324: set_payload now correctly handles binary input. This also - supersedes the previous fixes for #14360, #1717, and #16564. +- Issue #24029: Document the name binding behavior for submodule imports. -- bpo-18794: Add a fileno() method and a closed attribute to select.devpoll - objects. +- Issue #24077: Fix typo in man page for -I command option: -s, not -S -- bpo-17119: Fixed integer overflows when processing large strings and - tuples in the tkinter module. +Tools/Demos +----------- -- bpo-18747: Re-seed OpenSSL's pseudo-random number generator after fork. A - pthread_atfork() parent handler is used to seed the PRNG with pid, time - and some stack data. +- Issue #24000: Improved Argument Clinic's mapping of converters to legacy + "format units". Updated the documentation to match. -- bpo-8865: Concurrent invocation of select.poll.poll() now raises a - RuntimeError exception. Patch by Christian Schubert. +- Issue #24001: Argument Clinic converters now use accept={type} + instead of types={'type'} to specify the types the converter accepts. -- bpo-18777: The ssl module now uses the new CRYPTO_THREADID API of OpenSSL - 1.0.0+ instead of the deprecated CRYPTO id callback function. +- Issue #23330: h2py now supports arbitrary filenames in #include. -- bpo-18768: Correct doc string of RAND_edg(). Patch by Vajrasky Kok. +- Issue #24031: make patchcheck now supports git checkouts, too. -- bpo-18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke - malloc weak symbols. -- bpo-18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes inside - subjectAltName correctly. Formerly the module has used OpenSSL's - GENERAL_NAME_print() function to get the string representation of ASN.1 - strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and - ``uniformResourceIdentifier`` (URI). +What's New in Python 3.5.0 alpha 4? +=================================== -- bpo-18701: Remove support of old CPython versions (<3.0) from C code. +Release date: 2015-04-19 -- bpo-18756: Improve error reporting in os.urandom() when the failure is due - to something else than /dev/urandom not existing (for example, exhausting - the file descriptor limit). +Core and Builtins +----------------- -- bpo-18673: Add O_TMPFILE to os module. O_TMPFILE requires Linux kernel - 3.11 or newer. It's only defined on system with 3.11 uapi headers, too. +- Issue #22980: Under Linux, GNU/KFreeBSD and the Hurd, C extensions now include + the architecture triplet in the extension name, to make it easy to test builds + for different ABIs in the same working tree. Under OS X, the extension name + now includes PEP 3149-style information. -- bpo-18532: Change the builtin hash algorithms' names to lower case names - as promised by hashlib's documentation. +- Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES. + Patch courtesy of Joe Jevnik. -- bpo-8713: add new spwan and forkserver start methods, and new functions - get_all_start_methods, get_start_method, and set_start_method, to - multiprocessing. +- Issue #23731: Implement PEP 488: removal of .pyo files. -- bpo-18405: Improve the entropy of crypt.mksalt(). +- Issue #23726: Don't enable GC for user subclasses of non-GC types that + don't add any new fields. Patch by Eugene Toder. -- bpo-12015: The tempfile module now uses a suffix of 8 random characters - instead of 6, to reduce the risk of filename collision. The entropy was - reduced when uppercase letters were removed from the charset used to - generate random characters. +- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted + while it is holding a lock to a buffered I/O object, and the main thread + tries to use the same I/O object (typically stdout or stderr). A fatal + error is emitted instead. -- bpo-18585: Add :func:`textwrap.shorten` to collapse and truncate a piece - of text to a given length. +- Issue #22977: Fixed formatting Windows error messages on Wine. + Patch by Martin Panter. -- bpo-18598: Tweak exception message for importlib.import_module() to - include the module name when a key argument is missing. +- Issue #23466: %c, %o, %x, and %X in bytes formatting now raise TypeError on + non-integer input. -- bpo-19151: Fix docstring and use of _get_supported_file_loaders() to - reflect 2-tuples. +- Issue #24044: Fix possible null pointer dereference in list.sort in out of + memory conditions. -- bpo-19152: Add ExtensionFileLoader.get_filename(). +- Issue #21354: PyCFunction_New function is exposed by python DLL again. -- bpo-18676: Change 'positive' to 'non-negative' in queue.py put and get - docstrings and ValueError messages. Patch by Zhongyue Luo +Library +------- -- Fix refcounting issue with extension types in tkinter. +- Issue #23840: tokenize.open() now closes the temporary binary file on error + to fix a resource warning. -- bpo-8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error - if methods have annotations; it now correctly displays the annotations. +- Issue #16914: new debuglevel 2 in smtplib adds timestamps to debug output. -- bpo-18600: Added policy argument to email.message.Message.as_string, and - as_bytes and __bytes__ methods to Message. +- Issue #7159: urllib.request now supports sending auth credentials + automatically after the first 401. This enhancement is a superset of the + enhancement from issue #19494 and supersedes that change. -- bpo-18671: Output more information when logging exceptions occur. +- Issue #23703: Fix a regression in urljoin() introduced in 901e4e52b20a. + Patch by Demian Brecht. -- bpo-18621: Prevent the site module's patched builtins from keeping too - many references alive for too long. +- Issue #4254: Adds _curses.update_lines_cols(). Patch by Arnon Yaari -- bpo-4885: Add weakref support to mmap objects. Patch by Valerie Lambert. +- Issue #19933: Provide default argument for ndigits in round. Patch by + Vajrasky Kok. -- bpo-8860: Fixed rounding in timedelta constructor. +- Issue #23193: Add a numeric_owner parameter to + tarfile.TarFile.extract and tarfile.TarFile.extractall. Patch by + Michael Vogt and Eric Smith. -- bpo-18849: Fixed a Windows-specific tempfile bug where collision with an - existing directory caused mkstemp and related APIs to fail instead of - retrying. Report and fix by Vlad Shcherbina. +- Issue #23342: Add a subprocess.run() function than returns a CalledProcess + instance for a more consistent API than the existing call* functions. -- bpo-18920: argparse's default destination for the version action (-v, - --version) has also been changed to stdout, to match the Python - executable. +- Issue #21217: inspect.getsourcelines() now tries to compute the start and end + lines from the code object, fixing an issue when a lambda function is used as + decorator argument. Patch by Thomas Ballinger and Allison Kaptur. -Tests ------ +- Issue #24521: Fix possible integer overflows in the pickle module. -- bpo-18623: Factor out the _SuppressCoreFiles context manager into - test.support. Patch by Valerie Lambert. +- Issue #22931: Allow '[' and ']' in cookie values. -- bpo-12037: Fix test_email for desktop Windows. +- The keywords attribute of functools.partial is now always a dictionary. -- bpo-15507: test_subprocess's test_send_signal could fail if the test - runner were run in an environment where the process inherited an ignore - setting for SIGINT. Restore the SIGINT handler to the desired - KeyboardInterrupt raising one during that test. +- Issue #23811: Add missing newline to the PyCompileError error message. + Patch by Alex Shkop. -- bpo-16799: Switched from getopt to argparse style in regrtest's argument - parsing. Added more tests for regrtest's argument parsing. +- Issue #21116: Avoid blowing memory when allocating a multiprocessing shared + array that's larger than 50% of the available RAM. Patch by Médéric Boquien. -- bpo-18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as - possible, since "localhost" goes through a DNS lookup under recent Windows - versions. +- Issue #22982: Improve BOM handling when seeking to multiple positions of + a writable text file. -IDLE ----- +- Issue #23464: Removed deprecated asyncio JoinableQueue. -- bpo-18489: Add tests for SearchEngine. Original patch by Phil Webster. +- Issue #23529: Limit the size of decompressed data when reading from + GzipFile, BZ2File or LZMAFile. This defeats denial of service attacks + using compressed bombs (i.e. compressed payloads which decompress to a huge + size). Patch by Martin Panter and Nikolaus Rath. -Documentation -------------- +- Issue #21859: Added Python implementation of io.FileIO. -- bpo-18743: Fix references to non-existent "StringIO" module. +- Issue #23865: close() methods in multiple modules now are idempotent and more + robust at shutdown. If they need to release multiple resources, all are + released even if errors occur. -- bpo-18783: Removed existing mentions of Python long type in docstrings, - error messages and comments. +- Issue #23400: Raise same exception on both Python 2 and 3 if sem_open is not + available. Patch by Davin Potts. -Build ------ +- Issue #10838: The subprocess now module includes SubprocessError and + TimeoutError in its list of exported names for the users wild enough + to use ``from subprocess import *``. -- bpo-1584: Provide configure options to override default search paths for - Tcl and Tk when building _tkinter. +- Issue #23411: Added DefragResult, ParseResult, SplitResult, DefragResultBytes, + ParseResultBytes, and SplitResultBytes to urllib.parse.__all__. + Patch by Martin Panter. -- bpo-15663: Tcl/Tk 8.5.14 is now included with the OS X 10.6+ 64-/32-bit - installer. It is no longer necessary to install a third-party version of - Tcl/Tk 8.5 to work around the problems in the Apple-supplied Tcl/Tk 8.5 - shipped in OS X 10.6 and later releases. +- Issue #23881: urllib.request.ftpwrapper constructor now closes the socket if + the FTP connection failed to fix a ResourceWarning. -Tools/Demos ------------ +- Issue #23853: :meth:`socket.socket.sendall` does no more reset the socket + timeout each time data is sent successfully. The socket timeout is now the + maximum total duration to send all data. -- bpo-18922: Now The Lib/smtpd.py and Tools/i18n/msgfmt.py scripts write - their version strings to stdout, and not to sderr. +- Issue #22721: An order of multiline pprint output of set or dict containing + orderable and non-orderable elements no longer depends on iteration order of + set or dict. +- Issue #15133: _tkinter.tkapp.getboolean() now supports Tcl_Obj and always + returns bool. tkinter.BooleanVar now validates input values (accepted bool, + int, str, and Tcl_Obj). tkinter.BooleanVar.get() now always returns bool. -What's New in Python 3.4.0 alpha 1? -=================================== +- Issue #10590: xml.sax.parseString() now supports string argument. -*Release date: 2013-08-03* +- Issue #23338: Fixed formatting ctypes error messages on Cygwin. + Patch by Makoto Kato. -Core and Builtins ------------------ +- Issue #15582: inspect.getdoc() now follows inheritance chains. -- bpo-16741: Fix an error reporting in int(). +- Issue #2175: SAX parsers now support a character stream of InputSource object. -- bpo-17899: Fix rare file descriptor leak in os.listdir(). +- Issue #16840: Tkinter now supports 64-bit integers added in Tcl 8.4 and + arbitrary precision integers added in Tcl 8.5. -- bpo-10241: Clear extension module dict copies at interpreter shutdown. - Patch by Neil Schemenauer, minimally modified. +- Issue #23834: Fix socket.sendto(), use the C Py_ssize_t type to store the + result of sendto() instead of the C int type. -- bpo-9035: ismount now recognises volumes mounted below a drive root on - Windows. Original patch by Atsuo Ishimoto. +- Issue #23618: :meth:`socket.socket.connect` now waits until the connection + completes instead of raising :exc:`InterruptedError` if the connection is + interrupted by signals, signal handlers don't raise an exception and the + socket is blocking or has a timeout. :meth:`socket.socket.connect` still + raise :exc:`InterruptedError` for non-blocking sockets. -- bpo-18214: Improve finalization of Python modules to avoid setting their - globals to None, in most cases. +- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5. -- bpo-18112: PEP 442 implementation (safe object finalization). +- Issue #23836: Fix the faulthandler module to handle reentrant calls to + its signal handlers. -- bpo-18552: Check return value of PyArena_AddPyObject() in - obj2ast_object(). +- Issue #23838: linecache now clears the cache and returns an empty result on + MemoryError. -- bpo-18560: Fix potential NULL pointer dereference in sum(). +- Issue #10395: Added os.path.commonpath(). Implemented in posixpath and ntpath. + Based on patch by Rafik Draoui. -- bpo-18520: Add a new PyStructSequence_InitType2() function, same than - PyStructSequence_InitType() except that it has a return value (0 on - success, -1 on error). +- Issue #23611: Serializing more "lookupable" objects (such as unbound methods + or nested classes) now are supported with pickle protocols < 4. -- bpo-15905: Fix theoretical buffer overflow in handling of sys.argv[0], - prefix and exec_prefix if the operation system does not obey MAXPATHLEN. +- Issue #13583: sqlite3.Row now supports slice indexing. -- bpo-18408: Fix many various bugs in code handling errors, especially on - memory allocation failure (MemoryError). +- Issue #18473: Fixed 2to3 and 3to2 compatible pickle mappings. Fixed + ambigious reverse mappings. Added many new mappings. Import mapping is no + longer applied to modules already mapped with full name mapping. -- bpo-18344: Fix potential ref-leaks in _bufferedreader_read_all(). +- Issue #23485: select.select() is now retried automatically with the + recomputed timeout when interrupted by a signal, except if the signal handler + raises an exception. This change is part of the PEP 475. -- bpo-18342: Use the repr of a module name when an import fails when using - ``from ... import ...``. +- Issue #23752: When built from an existing file descriptor, io.FileIO() now + only calls fstat() once. Before fstat() was called twice, which was not + necessary. -- bpo-17872: Fix a segfault in marshal.load() when input stream returns more - bytes than requested. +- Issue #23704: collections.deque() objects now support __add__, __mul__, and + __imul__(). -- bpo-18338: `python --version` now prints version string to stdout, and not - to stderr. Patch by Berker Peksag and Michael Dickens. +- Issue #23171: csv.Writer.writerow() now supports arbitrary iterables. -- bpo-18426: Fix NULL pointer dereference in C extension import when - PyModule_GetDef() returns an error. +- Issue #23745: The new email header parser now handles duplicate MIME + parameter names without error, similar to how get_param behaves. -- bpo-17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix - a stack overflow in the marshal module (fix a crash in test_marshal). - Patch written by Jeremy Kloth. +- Issue #22117: Fix os.utime(), it now rounds the timestamp towards minus + infinity (-inf) instead of rounding towards zero. -- bpo-3329: Implement the PEP 445: Add new APIs to customize Python memory - allocators. +- Issue #23310: Fix MagicMock's initializer to work with __methods__, just + like configure_mock(). Patch by Kasia Jachim. -- bpo-18328: Reorder ops in PyThreadState_Delete*() functions. Now the - tstate is first removed from TLS and then deallocated. +Build +----- -- bpo-13483: Use VirtualAlloc in obmalloc on Windows. +- Issue #23817: FreeBSD now uses "1.0" in the SOVERSION as other operating + systems, instead of just "1". -- bpo-18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise - OverflowError when an argument of %c format is out of range. +- Issue #23501: Argument Clinic now generates code into separate files by default. -- bpo-18111: The min() and max() functions now support a default argument to - be returned instead of raising a ValueError on an empty sequence. - (Contributed by Julian Berman.) +Tests +----- -- bpo-18137: Detect integer overflow on precision in float.__format__() and - complex.__format__(). +- Issue #23799: Added test.support.start_threads() for running and + cleaning up multiple threads. -- bpo-18183: Fix various unicode operations on strings with large unicode - codepoints. +- Issue #22390: test.regrtest now emits a warning if temporary files or + directories are left after running a test. -- bpo-18180: Fix ref leak in _PyImport_GetDynLoadWindows(). +Tools/Demos +----------- -- bpo-18038: SyntaxError raised during compilation sources with illegal - encoding now always contains an encoding name. +- Issue #18128: pygettext now uses standard +NNNN format in the + POT-Creation-Date header. -- bpo-17931: Resolve confusion on Windows between pids and process handles. +- Issue #23935: Argument Clinic's understanding of format units + accepting bytes, bytearrays, and buffers is now consistent with + both the documentation and the implementation. -- Tweak the exception message when the magic number or size value in a - bytecode file is truncated. +- Issue #23944: Argument Clinic now wraps long impl prototypes at column 78. -- bpo-17932: Fix an integer overflow issue on Windows 64-bit in iterators: - change the C type of seqiterobject.it_index from long to Py_ssize_t. +- Issue #20586: Argument Clinic now ensures that functions without docstrings + have signatures. -- bpo-18065: Don't set __path__ to the package name for frozen packages. +- Issue #23492: Argument Clinic now generates argument parsing code with + PyArg_Parse instead of PyArg_ParseTuple if possible. -- bpo-18088: When reloading a module, unconditionally reset all relevant - attributes on the module (e.g. __name__, __loader__, __package__, - __file__, __cached__). +- Issue #23500: Argument Clinic is now smarter about generating the "#ifndef" + (empty) definition of the methoddef macro: it's only generated once, even + if Argument Clinic processes the same symbol multiple times, and it's emitted + at the end of all processing rather than immediately after the first use. -- bpo-17937: Try harder to collect cyclic garbage at shutdown. +C API +----- -- bpo-12370: Prevent class bodies from interfering with the __class__ - closure. +- Issue #23998: PyImport_ReInitLock() now checks for lock allocation error -- bpo-17644: Fix a crash in str.format when curly braces are used in square - brackets. -- bpo-17237: Fix crash in the ASCII decoder on m68k. +What's New in Python 3.5.0 alpha 3? +=================================== -- bpo-17927: Frame objects kept arguments alive if they had been copied into - a cell, even if the cell was cleared. +Release date: 2015-03-28 -- bpo-1545463: At shutdown, defer finalization of codec modules so that - stderr remains usable. +Core and Builtins +----------------- -- bpo-7330: Implement width and precision (ex: "%5.3s") for the format - string of PyUnicode_FromFormat() function, original patch written by Ysj - Ray. +- Issue #23573: Increased performance of string search operations (str.find, + str.index, str.count, the in operator, str.split, str.partition) with + arguments of different kinds (UCS1, UCS2, UCS4). -- bpo-1545463: Global variables caught in reference cycles are now garbage- - collected at shutdown. +- Issue #23753: Python doesn't support anymore platforms without stat() or + fstat(), these functions are always required. -- bpo-17094: Clear stale thread states after fork(). Note that this is a - potentially disruptive change since it may release some system resources - which would otherwise remain perpetually alive (e.g. database connections - kept in thread-local storage). +- Issue #23681: The -b option now affects comparisons of bytes with int. -- bpo-17408: Avoid using an obsolete instance of the copyreg module when the - interpreter is shutdown and then started again. +- Issue #23632: Memoryviews now allow tuple indexing (including for + multi-dimensional memoryviews). -- bpo-5845: Enable tab-completion in the interactive interpreter by default, - thanks to a new sys.__interactivehook__. +- Issue #23192: Fixed generator lambdas. Patch by Bruno Cauet. -- bpo-17115: Module initialization now includes setting __package__ and - __loader__ attributes to None. (See also: bpo-17116) +- Issue #23629: Fix the default __sizeof__ implementation for variable-sized + objects. -- bpo-17853: Ensure locals of a class that shadow free variables always win - over the closures. +Library +------- -- bpo-17863: In the interactive console, don't loop forever if the encoding - can't be fetched from stdin. +- Issue #14260: The groupindex attribute of regular expression pattern object + now is non-modifiable mapping. -- bpo-17867: Raise an ImportError if __import__ is not found in - __builtins__. +- Issue #23792: Ignore KeyboardInterrupt when the pydoc pager is active. + This mimics the behavior of the standard unix pagers, and prevents + pipepager from shutting down while the pager itself is still running. -- bpo-18698: Ensure importlib.reload() returns the module out of - sys.modules. +- Issue #23775: pprint() of OrderedDict now outputs the same representation + as repr(). -- bpo-17857: Prevent build failures with pre-3.5.0 versions of sqlite3, such - as was shipped with Centos 5 and Mac OS X 10.4. +- Issue #23765: Removed IsBadStringPtr calls in ctypes -- bpo-17413: sys.settrace callbacks were being passed a string instead of an - exception instance for the 'value' element of the arg tuple if the - exception originated from C code; now an exception instance is always - provided. +- Issue #22364: Improved some re error messages using regex for hints. -- bpo-17782: Fix undefined behaviour on platforms where ``struct - timespec``'s "tv_nsec" member is not a C long. +- Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes. -- bpo-17722: When looking up __round__, resolve descriptors. +- Issue #21717: The zipfile.ZipFile.open function now supports 'x' (exclusive + creation) mode. -- bpo-16061: Speed up str.replace() for replacing 1-character strings. +- Issue #21802: The reader in BufferedRWPair now is closed even when closing + writer failed in BufferedRWPair.close(). -- bpo-17715: Fix segmentation fault from raising an exception in a __trunc__ - method. +- Issue #23622: Unknown escapes in regular expressions that consist of ``'\'`` + and an ASCII letter now raise a deprecation warning and will be forbidden + in Python 3.6. -- bpo-17643: Add __callback__ attribute to weakref.ref. +- Issue #23671: string.Template now allows specifying the "self" parameter as + a keyword argument. string.Formatter now allows specifying the "self" and + the "format_string" parameters as keyword arguments. -- bpo-16447: Fixed potential segmentation fault when setting __name__ on a - class. +- Issue #23502: The pprint module now supports mapping proxies. -- bpo-17669: Fix crash involving finalization of generators using yield - from. +- Issue #17530: pprint now wraps long bytes objects and bytearrays. -- bpo-14439: Python now prints the traceback on runpy failure at startup. +- Issue #22687: Fixed some corner cases in breaking words in tetxtwrap. + Got rid of quadratic complexity in breaking long words. -- bpo-17469: Fix _Py_GetAllocatedBlocks() and sys.getallocatedblocks() when - running on valgrind. +- Issue #4727: The copy module now uses pickle protocol 4 (PEP 3154) and + supports copying of instances of classes whose __new__ method takes + keyword-only arguments. -- bpo-17619: Make input() check for Ctrl-C correctly on Windows. +- Issue #23491: Added a zipapp module to support creating executable zip + file archives of Python code. Registered ".pyz" and ".pyzw" extensions + on Windows for these archives (PEP 441). -- bpo-17357: Add missing verbosity messages for -v/-vv that were lost during - the importlib transition. +- Issue #23657: Avoid explicit checks for str in zipapp, adding support + for pathlib.Path objects as arguments. -- bpo-17610: Don't rely on non-standard behavior of the C qsort() function. +- Issue #23688: Added support of arbitrary bytes-like objects and avoided + unnecessary copying of memoryview in gzip.GzipFile.write(). + Original patch by Wolfgang Maier. -- bpo-17323: The "[X refs, Y blocks]" printed by debug builds has been - disabled by default. It can be re-enabled with the `-X showrefcount` - option. +- Issue #23252: Added support for writing ZIP files to unseekable streams. -- bpo-17328: Fix possible refleak in dict.setdefault. +- Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes. -- bpo-17275: Corrected class name in init error messages of the C version of - BufferedWriter and BufferedRandom. +- Issue #23539: If body is None, http.client.HTTPConnection.request now sets + Content-Length to 0 for PUT, POST, and PATCH headers to avoid 411 errors from + some web servers. -- bpo-7963: Fixed misleading error message that issued when object is called - without arguments. +- Issue #22351: The nntplib.NNTP constructor no longer leaves the connection + and socket open until the garbage collector cleans them up. Patch by + Martin Panter. -- bpo-8745: Small speed up zipimport on Windows. Patch by Catalin Iacob. +- Issue #23704: collections.deque() objects now support methods for index(), + insert(), and copy(). This allows deques to be registered as a + MutableSequence and it improves their substitutability for lists. -- bpo-5308: Raise ValueError when marshalling too large object (a sequence - with size >= 2**31), instead of producing illegal marshal data. +- Issue #23715: :func:`signal.sigwaitinfo` and :func:`signal.sigtimedwait` are + now retried when interrupted by a signal not in the *sigset* parameter, if + the signal handler does not raise an exception. signal.sigtimedwait() + recomputes the timeout with a monotonic clock when it is retried. -- bpo-12983: Bytes literals with invalid ``\x`` escape now raise a - SyntaxError and a full traceback including line number. +- Issue #23001: Few functions in modules mmap, ossaudiodev, socket, ssl, and + codecs, that accepted only read-only bytes-like object now accept writable + bytes-like object too. -- bpo-16967: In function definition, evaluate positional defaults before - keyword-only defaults. +- Issue #23646: If time.sleep() is interrupted by a signal, the sleep is now + retried with the recomputed delay, except if the signal handler raises an + exception (PEP 475). -- bpo-17173: Remove uses of locale-dependent C functions (isalpha() etc.) in - the interpreter. +- Issue #23136: _strptime now uniformly handles all days in week 0, including + Dec 30 of previous year. Based on patch by Jim Carroll. -- bpo-17137: When a Unicode string is resized, the internal wide character - string (wstr) format is now cleared. +- Issue #23700: Iterator of NamedTemporaryFile now keeps a reference to + NamedTemporaryFile instance. Patch by Bohuslav Kabrda. -- bpo-17043: The unicode-internal decoder no longer read past the end of - input buffer. +- Issue #22903: The fake test case created by unittest.loader when it fails + importing a test module is now picklable. -- bpo-17098: All modules now have __loader__ set even if they pre-exist the - bootstrapping of importlib. +- Issue #22181: On Linux, os.urandom() now uses the new getrandom() syscall if + available, syscall introduced in the Linux kernel 3.17. It is more reliable + and more secure, because it avoids the need of a file descriptor and waits + until the kernel has enough entropy. -- bpo-16979: Fix error handling bugs in the unicode-escape-decode decoder. +- Issue #2211: Updated the implementation of the http.cookies.Morsel class. + Setting attributes key, value and coded_value directly now is deprecated. + update() and setdefault() now transform and check keys. Comparing for + equality now takes into account attributes key, value and coded_value. + copy() now returns a Morsel, not a dict. repr() now contains all attributes. + Optimized checking keys and quoting values. Added new tests. + Original patch by Demian Brecht. -- bpo-16772: The base argument to the int constructor no longer accepts - floats, or other non-integer objects with an __int__ method. Objects with - an __index__ method are now accepted. +- Issue #18983: Allow selection of output units in timeit. + Patch by Julian Gindi. -- bpo-10156: In the interpreter's initialization phase, unicode globals are - now initialized dynamically as needed. +- Issue #23631: Fix traceback.format_list when a traceback has been mutated. -- bpo-16980: Fix processing of escaped non-ascii bytes in the unicode- - escape-decode decoder. +- Issue #23568: Add rdivmod support to MagicMock() objects. + Patch by Håkan Lövdahl. -- bpo-16975: Fix error handling bug in the escape-decode bytes decoder. +- Issue #2052: Add charset parameter to HtmlDiff.make_file(). -- bpo-14850: Now a charmap decoder treats U+FFFE as "undefined mapping" in - any mapping, not only in a string. +- Issue #23668: Support os.truncate and os.ftruncate on Windows. -- bpo-16613: Add *m* argument to ``collections.Chainmap.new_child`` to allow - the new child map to be specified explicitly. +- Issue #23138: Fixed parsing cookies with absent keys or values in cookiejar. + Patch by Demian Brecht. -- bpo-16730: importlib.machinery.FileFinder now no longers raises an - exception when trying to populate its cache and it finds out the directory - is unreadable or has turned into a file. Reported and diagnosed by David - Pritchard. +- Issue #23051: multiprocessing.Pool methods imap() and imap_unordered() now + handle exceptions raised by an iterator. Patch by Alon Diamant and Davin + Potts. -- bpo-16906: Fix a logic error that prevented most static strings from being - cleared. +- Issue #23581: Add matmul support to MagicMock. Patch by Håkan Lövdahl. -- bpo-11461: Fix the incremental UTF-16 decoder. Original patch by Amaury - Forgeot d'Arc. +- Issue #23566: enable(), register(), dump_traceback() and + dump_traceback_later() functions of faulthandler now accept file + descriptors. Patch by Wei Wu. -- bpo-16856: Fix a segmentation fault from calling repr() on a dict with a - key whose repr raise an exception. +- Issue #22928: Disabled HTTP header injections in http.client. + Original patch by Demian Brecht. -- bpo-16367: Fix FileIO.readall() on Windows for files larger than 2 GB. +- Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with + imp.reload(). Patch by Thomas Kluyver. -- bpo-16761: Calling int() with base argument only now raises TypeError. +- Issue #23605: os.walk() now calls os.scandir() instead of os.listdir(). + The usage of os.scandir() reduces the number of calls to os.stat(). + Initial patch written by Ben Hoyt. -- bpo-16759: Support the full DWORD (unsigned long) range in Reg2Py when - retrieving a REG_DWORD value. This corrects functions like - winreg.QueryValueEx that may have been returning truncated values. +Build +----- -- bpo-14420: Support the full DWORD (unsigned long) range in Py2Reg when - passed a REG_DWORD value. Fixes OverflowError in winreg.SetValueEx. +- Issue #23585: make patchcheck will ensure the interpreter is built. -- bpo-11939: Set the st_dev attribute of stat_result to allow Windows to - take advantage of the os.path.samefile/sameopenfile/samestat - implementations used by other platforms. +Tests +----- -- bpo-16772: The int() constructor's second argument (base) no longer - accepts non integer values. Consistent with the behavior in Python 2. +- Issue #23583: Added tests for standard IO streams in IDLE. -- bpo-14470: Remove w9xpopen support per PEP 11. +- Issue #22289: Prevent test_urllib2net failures due to ftp connection timeout. -- bpo-9856: Replace deprecation warning with raising TypeError in - object.__format__. Patch by Florent Xicluna. +Tools/Demos +----------- -- bpo-16597: In buffered and text IO, call close() on the underlying stream - if invoking flush() fails. +- Issue #22826: The result of open() in Tools/freeze/bkfile.py is now better + compatible with regular files (in particular it now supports the context + management protocol). -- bpo-16722: In the bytes() constructor, try to call __bytes__ on the - argument before __index__. -- bpo-16421: loading multiple modules from one shared object is now handled - correctly (previously, the first module loaded from that file was silently - returned). Patch by Václav Šmilauer. +What's New in Python 3.5 alpha 2? +================================= -- bpo-16602: When a weakref's target was part of a long deallocation chain, - the object could remain reachable through its weakref even though its - refcount had dropped to zero. +Release date: 2015-03-09 -- bpo-16495: Remove extraneous NULL encoding check from bytes_decode(). +Core and Builtins +----------------- -- bpo-16619: Create NameConstant AST class to represent None, True, and - False literals. As a result, these constants are never loaded at runtime - from builtins. +- Issue #23571: PyObject_Call() and PyCFunction_Call() now raise a SystemError + if a function returns a result and raises an exception. The SystemError is + chained to the previous exception. -- bpo-16455: On FreeBSD and Solaris, if the locale is C, the - ASCII/surrogateescape codec is now used (instead of the locale encoding) - to decode the command line arguments. This change fixes inconsistencies - with os.fsencode() and os.fsdecode(), because these operating systems - announce an ASCII locale encoding, but actually use the ISO-8859-1 - encoding in practice. +Library +------- -- bpo-16562: Optimize dict equality testing. Patch by Serhiy Storchaka. +- Issue #22524: New os.scandir() function, part of the PEP 471: "os.scandir() + function -- a better and faster directory iterator". Patch written by Ben + Hoyt. -- bpo-16588: Silence unused-but-set warnings in Python/thread_pthread +- Issue #23103: Reduced the memory consumption of IPv4Address and IPv6Address. -- bpo-16592: stringlib_bytes_join doesn't raise MemoryError on allocation - failure. +- Issue #21793: BaseHTTPRequestHandler again logs response code as numeric, + not as stringified enum. Patch by Demian Brecht. -- bpo-16546: Fix: ast.YieldFrom argument is now mandatory. +- Issue #23476: In the ssl module, enable OpenSSL's X509_V_FLAG_TRUSTED_FIRST + flag on certificate stores when it is available. -- bpo-16514: Fix regression causing a traceback when sys.path[0] is None - (actually, any non-string or non-bytes type). +- Issue #23576: Avoid stalling in SSL reads when EOF has been reached in the + SSL layer but the underlying connection hasn't been closed. -- bpo-16306: Fix multiple error messages when unknown command line - parameters where passed to the interpreter. Patch by Hieu Nguyen. +- Issue #23504: Added an __all__ to the types module. -- bpo-16215: Fix potential double memory free in str.replace(). Patch by - Serhiy Storchaka. +- Issue #23563: Optimized utility functions in urllib.parse. -- bpo-16290: A float return value from the __complex__ special method is no - longer accepted in the complex() constructor. +- Issue #7830: Flatten nested functools.partial. -- bpo-16416: On Mac OS X, operating system data are now always - encoded/decoded to/from UTF-8/surrogateescape, instead of the locale - encoding (which may be ASCII if no locale environment variable is set), to - avoid inconsistencies with os.fsencode() and os.fsdecode() functions which - are already using UTF-8/surrogateescape. +- Issue #20204: Added the __module__ attribute to _tkinter classes. -- bpo-16453: Fix equality testing of dead weakref objects. +- Issue #19980: Improved help() for non-recognized strings. help('') now + shows the help on str. help('help') now shows the help on help(). + Original patch by Mark Lawrence. -- bpo-9535: Fix pending signals that have been received but not yet handled - by Python to not persist after os.fork() in the child process. +- Issue #23521: Corrected pure python implementation of timedelta division. -- bpo-14794: Fix slice.indices to return correct results for huge values, - rather than raising OverflowError. + * Eliminated OverflowError from timedelta * float for some floats; + * Corrected rounding in timedlta true division. -- bpo-15001: fix segfault on "del sys.modules['__main__']". Patch by Victor - Stinner. +- Issue #21619: Popen objects no longer leave a zombie after exit in the with + statement if the pipe was broken. Patch by Martin Panter. -- bpo-8271: the utf-8 decoder now outputs the correct number of U+FFFD - characters when used with the 'replace' error handler on invalid utf-8 - sequences. Patch by Serhiy Storchaka, tests by Ezio Melotti. +- Issue #22936: Make it possible to show local variables in tracebacks for + both the traceback module and unittest. -- bpo-5765: Apply a hard recursion limit in the compiler instead of blowing - the stack and segfaulting. Initial patch by Andrea Griffini. +- Issue #15955: Add an option to limit the output size in bz2.decompress(). + Patch by Nikolaus Rath. -- bpo-16402: When slicing a range, fix shadowing of exceptions from - __index__. +- Issue #6639: Module-level turtle functions no longer raise TclError after + closing the window. -- bpo-16336: fix input checking in the surrogatepass error handler. Patch by - Serhiy Storchaka. +- Issues #814253, #9179: Group references and conditional group references now + work in lookbehind assertions in regular expressions. -- bpo-8401: assigning an int to a bytearray slice (e.g. b[3:4] = 5) now - raises an error. +- Issue #23215: Multibyte codecs with custom error handlers that ignores errors + consumed too much memory and raised SystemError or MemoryError. + Original patch by Aleksi Torhamo. -- bpo-7317: Display full tracebacks when an error occurs asynchronously. - Patch by Alon Horev with update by Alexey Kachayev. +- Issue #5700: io.FileIO() called flush() after closing the file. + flush() was not called in close() if closefd=False. -- bpo-16309: Make PYTHONPATH="" behavior the same as if PYTHONPATH not set - at all. +- Issue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding + differs from file system encoding (e.g. on Mac OS). -- bpo-10189: Improve the error reporting of SyntaxErrors related to global - and nonlocal statements. +- Issue #23481: Remove RC4 from the SSL module's default cipher list. -- Fix segfaults on setting __qualname__ on builtin types and attempting to - delete it on any type. +- Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty + docstrings. -- bpo-14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch - written by Serhiy Storchaka. +- Issue #22885: Fixed arbitrary code execution vulnerability in the dbm.dumb + module. Original patch by Claudiu Popa. -- bpo-16345: Fix an infinite loop when ``fromkeys`` on a dict subclass - received a nonempty dict from the constructor. +- Issue #23239: ssl.match_hostname() now supports matching of IP addresses. -- bpo-16271: Fix strange bugs that resulted from __qualname__ appearing in a - class's __dict__ and on type. +- Issue #23146: Fix mishandling of absolute Windows paths with forward + slashes in pathlib. -- bpo-12805: Make bytes.join and bytearray.join faster when the separator is - empty. Patch by Serhiy Storchaka. +- Issue #23096: Pickle representation of floats with protocol 0 now is the same + for both Python and C implementations. -- bpo-6074: Ensure cached bytecode files can always be updated by the user - that created them, even when the source file is read-only. +- Issue #19105: pprint now more efficiently uses free space at the right. -- bpo-15958: bytes.join and bytearray.join now accept arbitrary buffer - objects. +- Issue #14910: Add allow_abbrev parameter to argparse.ArgumentParser. Patch by + Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson. -- bpo-14783: Improve int() docstring and switch docstrings for str(), - range(), and slice() to use multi-line signatures. +- Issue #21717: tarfile.open() now supports 'x' (exclusive creation) mode. -- bpo-16160: Subclass support now works for types.SimpleNamespace. +- Issue #23344: marshal.dumps() is now 20-25% faster on average. -- bpo-16148: Implement PEP 424, adding operator.length_hint and - PyObject_LengthHint. +- Issue #20416: marshal.dumps() with protocols 3 and 4 is now 40-50% faster on + average. -- Upgrade Unicode data (UCD) to version 6.2. +- Issue #23421: Fixed compression in tarfile CLI. Patch by wdv4758h. -- bpo-15379: Fix passing of non-BMP characters as integers for the charmap - decoder (already working as unicode strings). Patch by Serhiy Storchaka. +- Issue #23367: Fix possible overflows in the unicodedata module. -- bpo-15144: Fix possible integer overflow when handling pointers as integer - values, by using `Py_uintptr_t` instead of `size_t`. Patch by Serhiy - Storchaka. +- Issue #23361: Fix possible overflow in Windows subprocess creation code. -- bpo-15965: Explicitly cast `AT_FDCWD` as (int). Required on Solaris 10 - (which defines `AT_FDCWD` as ``0xffd19553``), harmless on other platforms. +- logging.handlers.QueueListener now takes a respect_handler_level keyword + argument which, if set to True, will pass messages to handlers taking handler + levels into account. -- bpo-15839: Convert SystemErrors in `super()` to RuntimeErrors. +- Issue #19705: turtledemo now has a visual sorting algorithm demo. Original + patch from Jason Yeo. -- bpo-15448: Buffered IO now frees the buffer when closed, instead of when - deallocating. +- Issue #23801: Fix issue where cgi.FieldStorage did not always ignore the + entire preamble to a multipart body. -- bpo-15846: Fix SystemError which happened when using `ast.parse()` in an - exception handler on code with syntax errors. +Build +----- -- bpo-15897: zipimport.c doesn't check return value of fseek(). Patch by - Felipe Cruz. +- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make + the resulting executable faster. -- bpo-15801: Make sure mappings passed to '%' formatting are actually - subscriptable. +- Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a. -- bpo-15111: __import__ should propagate ImportError when raised as a side- - effect of a module triggered from using fromlist. +C API +----- -- bpo-15022: Add pickle and comparison support to types.SimpleNamespace. +- Issue #20204: Deprecation warning is now raised for builtin types without the + __module__ attribute. -Library +Windows ------- -- bpo-4331: Added functools.partialmethod (Initial patch by Alon Horev) +- Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual + environments. Patch by Paul Moore. + +- Issue #23437: Make user scripts directory versioned on Windows. Patch by Paul + Moore. -- bpo-13461: Fix a crash in the TextIOWrapper.tell method on 64-bit - platforms. Patch by Yogesh Chaudhari. -- bpo-18681: Fix a NameError in importlib.reload() (noticed by Weizhao Li). +What's New in Python 3.5 alpha 1? +================================= -- bpo-14323: Expanded the number of digits in the coefficients for the RGB - -- YIQ conversions so that they match the FCC NTSC versions. +Release date: 2015-02-08 -- bpo-17998: Fix an internal error in regular expression engine. +Core and Builtins +----------------- -- bpo-17557: Fix os.getgroups() to work with the modified behavior of - getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. +- Issue #23285: PEP 475 - EINTR handling. -- bpo-18608: Avoid keeping a strong reference to the locale module inside - the _io module. +- Issue #22735: Fix many edge cases (including crashes) involving custom mro() + implementations. -- bpo-18619: Fix atexit leaking callbacks registered from sub-interpreters, - and make it GC-aware. +- Issue #22896: Avoid using PyObject_AsCharBuffer(), PyObject_AsReadBuffer() + and PyObject_AsWriteBuffer(). -- bpo-15699: The readline module now uses PEP 3121-style module - initialization, so as to reclaim allocated resources (Python callbacks) at - shutdown. Original patch by Robin Schreiber. +- Issue #21295: Revert some changes (issue #16795) to AST line numbers and + column offsets that constituted a regression. -- bpo-17616: wave.open now supports the context management protocol. +- Issue #22986: Allow changing an object's __class__ between a dynamic type and + static type in some cases. -- bpo-18599: Fix name attribute of _sha1.sha1() object. It now returns - 'SHA1' instead of 'SHA'. +- Issue #15859: PyUnicode_EncodeFSDefault(), PyUnicode_EncodeMBCS() and + PyUnicode_EncodeCodePage() now raise an exception if the object is not a + Unicode object. For PyUnicode_EncodeFSDefault(), it was already the case on + platforms other than Windows. Patch written by Campbell Barton. -- bpo-13266: Added inspect.unwrap to easily unravel __wrapped__ chains - (initial patch by Daniel Urban and Aaron Iles) +- Issue #21408: The default __ne__() now returns NotImplemented if __eq__() + returned NotImplemented. Original patch by Martin Panter. -- bpo-18561: Skip name in ctypes' _build_callargs() if name is NULL. +- Issue #23321: Fixed a crash in str.decode() when error handler returned + replacment string longer than mailformed input data. -- bpo-18559: Fix NULL pointer dereference error in _pickle module +- Issue #22286: The "backslashreplace" error handlers now works with + decoding and translating. -- bpo-18556: Check the return type of PyUnicode_AsWideChar() in ctype's - U_set(). +- Issue #23253: Delay-load ShellExecute[AW] in os.startfile for reduced + startup overhead on Windows. -- bpo-17818: aifc.getparams now returns a namedtuple. +- Issue #22038: pyatomic.h now uses stdatomic.h or GCC built-in functions for + atomic memory access if available. Patch written by Vitor de Lima and Gustavo + Temple. -- bpo-18549: Eliminate dead code in socket_ntohl() +- Issue #20284: %-interpolation (aka printf) formatting added for bytes and + bytearray. -- bpo-18530: Remove additional stat call from posixpath.ismount. Patch by - Alex Gaynor. +- Issue #23048: Fix jumping out of an infinite while loop in the pdb. -- bpo-18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj() +- Issue #20335: bytes constructor now raises TypeError when encoding or errors + is specified with non-string argument. Based on patch by Renaud Blanch. -- bpo-9177: Calling read() or write() now raises ValueError, not - AttributeError, on a closed SSL socket. Patch by Senko Rasic. +- Issue #22834: If the current working directory ends up being set to a + non-existent directory then import will no longer raise FileNotFoundError. -- bpo-18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 + - gcc. +- Issue #22869: Move the interpreter startup & shutdown code to a new + dedicated pylifecycle.c module -- bpo-18479: Changed venv Activate.ps1 to make deactivate a function, and - removed Deactivate.ps1. +- Issue #22847: Improve method cache efficiency. -- bpo-18480: Add missing call to PyType_Ready to the _elementtree extension. +- Issue #22335: Fix crash when trying to enlarge a bytearray to 0x7fffffff + bytes on a 32-bit platform. -- bpo-17778: Fix test discovery for test_multiprocessing. (Patch by Zachary - Ware.) +- Issue #22653: Fix an assertion failure in debug mode when doing a reentrant + dict insertion in debug mode. -- bpo-18393: The private module _gestalt and private functions - platform._mac_ver_gestalt, platform._mac_ver_lookup and platform._bcd2str - have been removed. This does not affect the public interface of the - platform module. +- Issue #22643: Fix integer overflow in Unicode case operations (upper, lower, + title, swapcase, casefold). -- bpo-17482: functools.update_wrapper (and functools.wraps) now set the - __wrapped__ attribute correctly even if the underlying function has a - __wrapped__ attribute set. +- Issue #17636: Circular imports involving relative imports are now + supported. -- bpo-18431: The new email header parser now decodes RFC2047 encoded words - in structured headers. +- Issue #22604: Fix assertion error in debug mode when dividing a complex + number by (nan+0j). -- bpo-18432: The sched module's queue method was incorrectly returning an - iterator instead of a list. +- Issue #21052: Do not raise ImportWarning when sys.path_hooks or sys.meta_path + are set to None. -- bpo-18044: The new email header parser was mis-parsing encoded words where - an encoded character immediately followed the '?' that follows the CTE - character, resulting in a decoding failure. They are now decoded - correctly. +- Issue #16518: Use 'bytes-like object required' in error messages that + previously used the far more cryptic "'x' does not support the buffer + protocol. -- bpo-18101: Tcl.split() now process strings nested in a tuple as it do with - byte strings. +- Issue #22470: Fixed integer overflow issues in "backslashreplace", + "xmlcharrefreplace", and "surrogatepass" error handlers. -- bpo-18116: getpass was always getting an error when testing /dev/tty, and - thus was always falling back to stdin, and would then raise an exception - if stdin could not be used (such as /dev/null). It also leaked an open - file. All of these issues are now fixed. +- Issue #22540: speed up `PyObject_IsInstance` and `PyObject_IsSubclass` in the + common case that the second argument has metaclass `type`. -- bpo-17198: Fix a NameError in the dbm module. Patch by Valentina - Mukhamedzhanova. +- Issue #18711: Add a new `PyErr_FormatV` function, similar to `PyErr_Format` + but accepting a `va_list` argument. -- bpo-18013: Fix cgi.FieldStorage to parse the W3C sample form. +- Issue #22520: Fix overflow checking when generating the repr of a unicode + object. -- bpo-18020: improve html.escape speed by an order of magnitude. Patch by - Matt Bryant. +- Issue #22519: Fix overflow checking in PyBytes_Repr. -- bpo-18347: ElementTree's html serializer now preserves the case of closing - tags. +- Issue #22518: Fix integer overflow issues in latin-1 encoding. -- bpo-17261: Ensure multiprocessing's proxies use proper address. +- Issue #16324: _charset parameter of MIMEText now also accepts + email.charset.Charset instances. Initial patch by Claude Paroz. -- bpo-18343: faulthandler.register() now keeps the previous signal handler - when the function is called twice, so faulthandler.unregister() restores - correctly the original signal handler. +- Issue #1764286: Fix inspect.getsource() to support decorated functions. + Patch by Claudiu Popa. -- bpo-17097: Make multiprocessing ignore EINTR. +- Issue #18554: os.__all__ includes posix functions. -- bpo-18339: Negative ints keys in unpickler.memo dict no longer cause a - segfault inside the _pickle C extension. +- Issue #21391: Use os.path.abspath in the shutil module. -- bpo-18240: The HMAC module is no longer restricted to bytes and accepts - any bytes-like object, e.g. memoryview. Original patch by Jonas Borgström. +- Issue #11471: avoid generating a JUMP_FORWARD instruction at the end of + an if-block if there is no else-clause. Original patch by Eugene Toder. -- bpo-18224: Removed pydoc script from created venv, as it causes problems - on Windows and adds no value over and above python -m pydoc ... +- Issue #22215: Now ValueError is raised instead of TypeError when str or bytes + argument contains not permitted null character or byte. -- bpo-18155: The csv module now correctly handles csv files that use a - delimiter character that has a special meaning in regexes, instead of - throwing an exception. +- Issue #22258: Fix the internal function set_inheritable() on Illumos. + This platform exposes the function ``ioctl(FIOCLEX)``, but calling it fails + with errno is ENOTTY: "Inappropriate ioctl for device". set_inheritable() + now falls back to the slower ``fcntl()`` (``F_GETFD`` and then ``F_SETFD``). -- bpo-14360: encode_quopri can now be successfully used as an encoder when - constructing a MIMEApplication object. +- Issue #21389: Displaying the __qualname__ of the underlying function in the + repr of a bound method. -- bpo-11390: Add -o and -f command line options to the doctest CLI to - specify doctest options (and convert it to using argparse). +- Issue #22206: Using pthread, PyThread_create_key() now sets errno to ENOMEM + and returns -1 (error) on integer overflow. -- bpo-18135: ssl.SSLSocket.write() now raises an OverflowError if the input - string in longer than 2 gigabytes, and ssl.SSLContext.load_cert_chain() - raises a ValueError if the password is longer than 2 gigabytes. The ssl - module does not support partial write. +- Issue #20184: Argument Clinic based signature introspection added for + 30 of the builtin functions. -- bpo-11016: Add C implementation of the stat module as _stat. +- Issue #22116: C functions and methods (of the 'builtin_function_or_method' + type) can now be weakref'ed. Patch by Wei Wu. -- bpo-18248: Fix libffi build on AIX. +- Issue #22077: Improve index error messages for bytearrays, bytes, lists, + and tuples by adding 'or slices'. Added ', not ' for bytearrays. + Original patch by Claudiu Popa. -- bpo-18259: Declare sethostname in socketmodule.c for AIX +- Issue #20179: Apply Argument Clinic to bytes and bytearray. + Patch by Tal Einat. -- bpo-18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list() - lists all loaded CA certificates and cert_store_stats() returns amount of - loaded X.509 certs, X.509 CA certs and CRLs. +- Issue #22082: Clear interned strings in slotdefs. -- bpo-18167: cgi.FieldStorage no longer fails to handle multipart/form-data - when ``\r\n`` appears at end of 65535 bytes without other newlines. +- Upgrade Unicode database to Unicode 7.0.0. -- bpo-18076: Introduce importlib.util.decode_source(). +- Issue #21897: Fix a crash with the f_locals attribute with closure + variables when frame.clear() has been called. -- bpo-18357: add tests for dictview set difference. Patch by Fraser - Tweedale. +- Issue #21205: Add a new ``__qualname__`` attribute to generator, the + qualified name, and use it in the representation of a generator + (``repr(gen)``). The default name of the generator (``__name__`` attribute) + is now get from the function instead of the code. Use ``gen.gi_code.co_name`` + to get the name of the code. -- importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or - UnicodeDecodeError into ImportError. +- Issue #21669: With the aid of heuristics in SyntaxError.__init__, the + parser now attempts to generate more meaningful (or at least more search + engine friendly) error messages when "exec" and "print" are used as + statements. -- bpo-18058: Make the namespace package loader meet the - importlib.abc.InspectLoader ABC, allowing for namespace packages to work - with runpy. (See also: bpo-18057) +- Issue #21642: In the conditional if-else expression, allow an integer written + with no space between itself and the ``else`` keyword (e.g. ``True if 42else + False``) to be valid syntax. -- bpo-17177: The imp module is pending deprecation. +- Issue #21523: Fix over-pessimistic computation of the stack effect of + some opcodes in the compiler. This also fixes a quadratic compilation + time issue noticeable when compiling code with a large number of "and" + and "or" operators. -- subprocess: Prevent a possible double close of parent pipe fds when the - subprocess exec runs into an error. Prevent a regular multi-close of the - /dev/null fd when any of stdin, stdout and stderr was set to DEVNULL. +- Issue #21418: Fix a crash in the builtin function super() when called without + argument and without current frame (ex: embedded Python). -- bpo-18194: Introduce importlib.util.cache_from_source() and - source_from_cache() while documenting the equivalent functions in imp as - deprecated. +- Issue #21425: Fix flushing of standard streams in the interactive + interpreter. -- bpo-17907: Document imp.new_module() as deprecated in favour of - types.ModuleType. +- Issue #21435: In rare cases, when running finalizers on objects in cyclic + trash a bad pointer dereference could occur due to a subtle flaw in + internal iteration logic. -- bpo-18192: Introduce importlib.util.MAGIC_NUMBER and document as - deprecated imp.get_magic(). +- Issue #21377: PyBytes_Concat() now tries to concatenate in-place when the + first argument has a reference count of 1. Patch by Nikolaus Rath. -- bpo-18149: Add filecmp.clear_cache() to manually clear the filecmp cache. - Patch by Mark Levitt +- Issue #20355: -W command line options now have higher priority than the + PYTHONWARNINGS environment variable. Patch by Arfrever. -- bpo-18193: Add importlib.reload(). +- Issue #21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c. -- bpo-18157: Stop using imp.load_module() in pydoc. +- Issue #20904: Support setting FPU precision on m68k. -- bpo-16102: Make uuid._netbios_getnode() work again on Python 3. +- Issue #21209: Fix sending tuples to custom generator objects with the yield + from syntax. -- bpo-17134: Add ssl.enum_cert_store() as interface to Windows' cert store. +- Issue #21193: pow(a, b, c) now raises ValueError rather than TypeError when b + is negative. Patch by Josh Rosenberg. -- bpo-18143: Implement ssl.get_default_verify_paths() in order to debug the - default locations for cafile and capath. +- PEP 465 and Issue #21176: Add the '@' operator for matrix multiplication. -- bpo-17314: Move multiprocessing.forking over to importlib. +- Issue #21134: Fix segfault when str is called on an uninitialized + UnicodeEncodeError, UnicodeDecodeError, or UnicodeTranslateError object. -- bpo-11959: SMTPServer and SMTPChannel now take an optional map, use of - which avoids affecting global state. +- Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by + Andreas Schwab. -- bpo-18109: os.uname() now decodes fields from the locale encoding, and - socket.gethostname() now decodes the hostname from the locale encoding, - instead of using the UTF-8 encoding in strict mode. +- Issue #20929: Add a type cast to avoid shifting a negative number. -- bpo-18089: Implement importlib.abc.InspectLoader.load_module. +- Issue #20731: Properly position in source code files even if they + are opened in text mode. Patch by Serhiy Storchaka. -- bpo-18088: Introduce importlib.abc.Loader.init_module_attrs for setting - module attributes. Leads to the pending deprecation of - importlib.util.module_for_loader. +- Issue #20637: Key-sharing now also works for instance dictionaries of + subclasses. Patch by Peter Ingebretson. -- bpo-17403: urllib.parse.robotparser normalizes the urls before adding to - ruleline. This helps in handling certain types invalid urls in a - conservative manner. Patch contributed by Mher Movsisyan. +- Issue #8297: Attributes missing from modules now include the module name + in the error text. Original patch by ysj.ray. -- bpo-18070: Have importlib.util.module_for_loader() set attributes - unconditionally in order to properly support reloading. +- Issue #19995: %c, %o, %x, and %X now raise TypeError on non-integer input. -- Added importlib.util.module_to_load to return a context manager to provide - the proper module object to load. +- Issue #19655: The ASDL parser - used by the build process to generate code for + managing the Python AST in C - was rewritten. The new parser is self contained + and does not require to carry long the spark.py parser-generator library; + spark.py was removed from the source base. -- bpo-18025: Fixed a segfault in io.BufferedIOBase.readinto() when raw - stream's read() returns more bytes than requested. +- Issue #12546: Allow ``\x00`` to be used as a fill character when using str, int, + float, and complex __format__ methods. -- bpo-18011: As was originally intended, base64.b32decode() now raises a - binascii.Error if there are non-b32-alphabet characters present in the - input string, instead of a TypeError. +- Issue #20480: Add ipaddress.reverse_pointer. Patch by Leon Weber. -- bpo-18072: Implement importlib.abc.InspectLoader.get_code() and - importlib.abc.ExecutionLoader.get_code(). +- Issue #13598: Modify string.Formatter to support auto-numbering of + replacement fields. It now matches the behavior of str.format() in + this regard. Patches by Phil Elson and Ramchandra Apte. -- bpo-8240: Set the SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER flag on SSL sockets. +- Issue #8931: Make alternate formatting ('#') for type 'c' raise an + exception. In versions prior to 3.5, '#' with 'c' had no effect. Now + specifying it is an error. Patch by Torsten Landschoff. -- bpo-17269: Workaround for socket.getaddrinfo crash on MacOS X with port - None or "0" and flags AI_NUMERICSERV. +- Issue #23165: Perform overflow checks before allocating memory in the + _Py_char2wchar function. -- bpo-16986: ElementTree now correctly works with string input when the - internal XML encoding is not UTF-8 or US-ASCII. +Library +------- -- bpo-17996: socket module now exposes AF_LINK constant on BSD and OSX. +- Issue #23399: pyvenv creates relative symlinks where possible. -- bpo-17900: Allowed pickling of recursive OrderedDicts. Decreased pickled - size and pickling time. +- Issue #20289: cgi.FieldStorage() now supports the context management + protocol. -- bpo-17914: Add os.cpu_count(). Patch by Yogesh Chaudhari, based on an - initial patch by Trent Nelson. +- Issue #13128: Print response headers for CONNECT requests when debuglevel + > 0. Patch by Demian Brecht. -- bpo-17812: Fixed quadratic complexity of base64.b32encode(). Optimize - base64.b32encode() and base64.b32decode() (speed up to 3x). +- Issue #15381: Optimized io.BytesIO to make less allocations and copyings. -- bpo-17980: Fix possible abuse of ssl.match_hostname() for denial of - service using certificates with many wildcards (CVE-2013-2099). +- Issue #22818: Splitting on a pattern that could match an empty string now + raises a warning. Patterns that can only match empty strings are now + rejected. -- bpo-15758: Fix FileIO.readall() so it no longer has O(n**2) complexity. +- Issue #23099: Closing io.BytesIO with exported buffer is rejected now to + prevent corrupting exported buffer. -- bpo-14596: The struct.Struct() objects now use a more compact - implementation. +- Issue #23326: Removed __ne__ implementations. Since fixing default __ne__ + implementation in issue #21408 they are redundant. -- bpo-17981: logging's SysLogHandler now closes the socket when it catches - socket OSErrors. +- Issue #23363: Fix possible overflow in itertools.permutations. -- bpo-17964: Fix os.sysconf(): the return type of the C sysconf() function - is long, not int. +- Issue #23364: Fix possible overflow in itertools.product. -- Fix typos in the multiprocessing module. +- Issue #23366: Fixed possible integer overflow in itertools.combinations. -- bpo-17754: Make ctypes.util.find_library() independent of the locale. +- Issue #23369: Fixed possible integer overflow in + _json.encode_basestring_ascii. -- bpo-17968: Fix memory leak in os.listxattr(). +- Issue #23353: Fix the exception handling of generators in + PyEval_EvalFrameEx(). At entry, save or swap the exception state even if + PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state + is now always restored or swapped, not only if why is WHY_YIELD or + WHY_RETURN. Patch co-written with Antoine Pitrou. -- bpo-17606: Fixed support of encoded byte strings in the XMLGenerator - characters() and ignorableWhitespace() methods. Original patch by - Sebastian Ortiz Vasquez. +- Issue #14099: Restored support of writing ZIP files to tellable but + non-seekable streams. -- bpo-17732: Ignore distutils.cfg options pertaining to install paths if a - virtual environment is active. +- Issue #14099: Writing to ZipFile and reading multiple ZipExtFiles is + threadsafe now. -- bpo-17915: Fix interoperability of xml.sax with file objects returned by - codecs.open(). +- Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. -- bpo-16601: Restarting iteration over tarfile really restarts rather than - continuing from where it left off. Patch by Michael Birtwell. +- Issue #18518: timeit now rejects statements which can't be compiled outside + a function or a loop (e.g. "return" or "break"). -- bpo-17289: The readline module now plays nicer with external modules or - applications changing the rl_completer_word_break_characters global - variable. Initial patch by Bradley Froehle. +- Issue #23094: Fixed readline with frames in Python implementation of pickle. -- bpo-12181: select module: Fix struct kevent definition on OpenBSD 64-bit - platforms. Patch by Federico Schwindt. +- Issue #23268: Fixed bugs in the comparison of ipaddress classes. -- bpo-11816: multiple improvements to the dis module: get_instructions - generator, ability to redirect output to a file, Bytecode and Instruction - abstractions. Patch by Nick Coghlan, Ryan Kelly and Thomas Kluyver. +- Issue #21408: Removed incorrect implementations of __ne__() which didn't + returned NotImplemented if __eq__() returned NotImplemented. The default + __ne__() now works correctly. -- bpo-13831: Embed stringification of remote traceback in local traceback - raised when pool task raises an exception. +- Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed) + headers with no key rather than assuming the body has started. -- bpo-15528: Add weakref.finalize to support finalization using weakref - callbacks. +- Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl + module. -- bpo-14173: Avoid crashing when reading a signal handler during interpreter - shutdown. +- Issue #23133: Pickling of ipaddress objects now produces more compact and + portable representation. -- bpo-15902: Fix imp.load_module() accepting None as a file when loading an - extension module. +- Issue #23248: Update ssl error codes from latest OpenSSL git master. -- bpo-13721: SSLSocket.getpeercert() and SSLSocket.do_handshake() now raise - an OSError with ENOTCONN, instead of an AttributeError, when the SSLSocket - is not connected. +- Issue #23266: Much faster implementation of ipaddress.collapse_addresses() + when there are many non-consecutive addresses. -- bpo-14679: add an __all__ (that contains only HTMLParser) to html.parser. +- Issue #23098: 64-bit dev_t is now supported in the os module. -- bpo-17802: Fix an UnboundLocalError in html.parser. Initial tests by - Thomas Barlow. +- Issue #21817: When an exception is raised in a task submitted to a + ProcessPoolExecutor, the remote traceback is now displayed in the + parent process. Patch by Claudiu Popa. -- bpo-17358: Modules loaded by imp.load_source() and load_compiled() (and by - extension load_module()) now have a better chance of working when - reloaded. +- Issue #15955: Add an option to limit output size when decompressing LZMA + data. Patch by Nikolaus Rath and Martin Panter. -- bpo-17804: New function ``struct.iter_unpack`` allows for streaming struct - unpacking. +- Issue #23250: In the http.cookies module, capitalize "HttpOnly" and "Secure" + as they are written in the standard. -- bpo-17830: When keyword.py is used to update a keyword file, it now - preserves the line endings of the original file. +- Issue #23063: In the disutils' check command, fix parsing of reST with code or + code-block directives. -- bpo-17272: Making the urllib.request's Request.full_url a descriptor. - Fixes bugs with assignment to full_url. Patch by Demian Brecht. +- Issue #23209, #23225: selectors.BaseSelector.get_key() now raises a + RuntimeError if the selector is closed. And selectors.BaseSelector.close() + now clears its internal reference to the selector mapping to break a + reference cycle. Initial patch written by Martin Richard. -- bpo-17353: Plistlib emitted empty data tags with deeply nested - datastructures +- Issue #17911: Provide a way to seed the linecache for a PEP-302 module + without actually loading the code. -- bpo-11714: Use 'with' statements to assure a Semaphore releases a - condition variable. Original patch by Thomas Rachel. +- Issue #17911: Provide a new object API for traceback, including the ability + to not lookup lines at all until the traceback is actually rendered, without + any trace of the original objects being kept alive. -- bpo-16624: `subprocess.check_output` now accepts an `input` argument, - allowing the subprocess's stdin to be provided as a (byte) string. Patch - by Zack Weinberg. +- Issue #19777: Provide a home() classmethod on Path objects. Contributed + by Victor Salgado and Mayank Tripathi. -- bpo-17795: Reverted backwards-incompatible change in SysLogHandler with - Unix domain sockets. +- Issue #23206: Make ``json.dumps(..., ensure_ascii=False)`` as fast as the + default case of ``ensure_ascii=True``. Patch by Naoki Inada. -- bpo-16694: Add a pure Python implementation of the operator module. Patch - by Zachary Ware. +- Issue #23185: Add math.inf and math.nan constants. -- bpo-11182: remove the unused and undocumented pydoc.Scanner class. Patch - by Martin Morrison. +- Issue #23186: Add ssl.SSLObject.shared_ciphers() and + ssl.SSLSocket.shared_ciphers() to fetch the client's list ciphers sent at + handshake. -- bpo-17741: Add ElementTree.XMLPullParser, an event-driven parser for non- - blocking applications. +- Issue #23143: Remove compatibility with OpenSSLs older than 0.9.8. -- bpo-17555: Fix ForkAwareThreadLock so that size of after fork registry - does not grow exponentially with generation of process. +- Issue #23132: Improve performance and introspection support of comparison + methods created by functool.total_ordering. -- bpo-17707: fix regression in multiprocessing.Queue's get() method where it - did not block for short timeouts. +- Issue #19776: Add an expanduser() method on Path objects. -- bpo-17720: Fix the Python implementation of pickle.Unpickler to correctly - process the APPENDS opcode when it is used on non-list objects. +- Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and + fragment when it redirects to add a trailing slash. -- bpo-17012: shutil.which() no longer falls back to the PATH environment - variable if an empty path argument is specified. Patch by Serhiy - Storchaka. +- Issue #21793: Added http.HTTPStatus enums (i.e. HTTPStatus.OK, + HTTPStatus.NOT_FOUND). Patch by Demian Brecht. -- bpo-17710: Fix pickle raising a SystemError on bogus input. +- Issue #23093: In the io, module allow more operations to work on detached + streams. -- bpo-17341: Include the invalid name in the error messages from re about - invalid group names. +- Issue #23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol + version. -- bpo-17702: os.environ now raises KeyError with the original environment - variable name (str on UNIX), instead of using the encoded name (bytes on - UNIX). +- Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(), + instead of reading /dev/urandom, to get pseudo-random bytes. -- bpo-16163: Make the importlib based version of pkgutil.iter_importers work - for submodules. Initial patch by Berker Peksag. +- Issue #19104: pprint now produces evaluable output for wrapped strings. -- bpo-16804: Fix a bug in the 'site' module that caused running 'python -S - -m site' to incorrectly throw an exception. +- Issue #23071: Added missing names to codecs.__all__. Patch by Martin Panter. -- bpo-15480: Remove the deprecated and unused TYPE_INT64 code from marshal. - Initial patch by Daniel Riti. +- Issue #22783: Pickling now uses the NEWOBJ opcode instead of the NEWOBJ_EX + opcode if possible. -- bpo-2118: SMTPException is now a subclass of OSError. +- Issue #15513: Added a __sizeof__ implementation for pickle classes. -- bpo-17016: Get rid of possible pointer wraparounds and integer overflows - in the re module. Patch by Nickolai Zeldovich. +- Issue #19858: pickletools.optimize() now aware of the MEMOIZE opcode, can + produce more compact result and no longer produces invalid output if input + data contains MEMOIZE opcodes together with PUT or BINPUT opcodes. -- bpo-16658: add missing return to HTTPConnection.send(). Patch by Jeff - Knupp. +- Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port + value in the host header was set to "None". Patch by Demian Brecht. -- bpo-9556: the logging package now allows specifying a time-of-day for a - TimedRotatingFileHandler to rotate. +- Issue #23016: A warning no longer produces an AttributeError when the program + is run with pythonw.exe. -- bpo-14971: unittest test discovery no longer gets confused when a function - has a different __name__ than its name in the TestCase class dictionary. +- Issue #21775: shutil.copytree(): fix crash when copying to VFAT. An exception + handler assumed that OSError objects always have a 'winerror' attribute. + That is not the case, so the exception handler itself raised AttributeError + when run on Linux (and, presumably, any other non-Windows OS). + Patch by Greg Ward. -- bpo-17487: The wave getparams method now returns a namedtuple rather than - a plain tuple. +- Issue #1218234: Fix inspect.getsource() to load updated source of + reloaded module. Initial patch by Berker Peksag. -- bpo-17675: socket repr() provides local and remote addresses (if any). - Patch by Giampaolo Rodola' +- Issue #21740: Support wrapped callables in doctest. Patch by Claudiu Popa. -- bpo-17093: Make the ABCs in importlib.abc provide default values or raise - reasonable exceptions for their methods to make them more amenable to - super() calls. +- Issue #23009: Make sure selectors.EpollSelecrtor.select() works when no + FD is registered. -- bpo-17566: Make importlib.abc.Loader.module_repr() optional instead of an - abstractmethod; now it raises NotImplementedError so as to be ignored by - default. +- Issue #22959: In the constructor of http.client.HTTPSConnection, prefer the + context's check_hostname attribute over the *check_hostname* parameter. -- bpo-17678: Remove the use of deprecated method in http/cookiejar.py by - changing the call to get_origin_req_host() to origin_req_host. +- Issue #22696: Add function :func:`sys.is_finalizing` to know about + interpreter shutdown. -- bpo-17666: Fix reading gzip files with an extra field. +- Issue #16043: Add a default limit for the amount of data xmlrpclib.gzip_decode + will return. This resolves CVE-2013-1753. -- bpo-16475: Support object instancing, recursion and interned strings in - marshal +- Issue #14099: ZipFile.open() no longer reopen the underlying file. Objects + returned by ZipFile.open() can now operate independently of the ZipFile even + if the ZipFile was created by passing in a file-like object as the first + argument to the constructor. -- bpo-17502: Process DEFAULT values in mock side_effect that returns - iterator. +- Issue #22966: Fix __pycache__ pyc file name clobber when pyc_compile is + asked to compile a source file containing multiple dots in the source file + name. -- bpo-16795: On the ast.arguments object, unify vararg with varargannotation - and kwarg and kwargannotation. Change the column offset of ast.Attribute - to be at the attribute name. +- Issue #21971: Update turtledemo doc and add module to the index. -- bpo-17434: Properly raise a SyntaxError when a string occurs between - future imports. +- Issue #21032: Fixed socket leak if HTTPConnection.getresponse() fails. + Original patch by Martin Panter. -- bpo-17117: Import and @importlib.util.set_loader now set __loader__ when - it has a value of None or the attribute doesn't exist. +- Issue #22407: Deprecated the use of re.LOCALE flag with str patterns or + re.ASCII. It was newer worked. -- bpo-17032: The "global" in the "NameError: global name 'x' is not defined" - error message has been removed. Patch by Ram Rachum. +- Issue #22902: The "ip" command is now used on Linux to determine MAC address + in uuid.getnode(). Pach by Bruno Cauet. -- bpo-18080: When building a C extension module on OS X, if the compiler is - overridden with the CC environment variable, use the new compiler as the - default for linking if LDSHARED is not also overridden. This restores - Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0. +- Issue #22960: Add a context argument to xmlrpclib.ServerProxy constructor. -- bpo-18113: Fixed a refcount leak in the curses.panel module's - set_userptr() method. Reported by Atsuo Ishimoto. +- Issue #22389: Add contextlib.redirect_stderr(). -- Implement PEP 443 "Single-dispatch generic functions". +- Issue #21356: Make ssl.RAND_egd() optional to support LibreSSL. The + availability of the function is checked during the compilation. Patch written + by Bernard Spil. -- Implement PEP 435 "Adding an Enum type to the Python standard library". +- Issue #22915: SAX parser now supports files opened with file descriptor or + bytes path. -- bpo-15596: Faster pickling of unicode strings. +- Issue #22609: Constructors and update methods of mapping classes in the + collections module now accept the self keyword argument. -- bpo-17572: Avoid chained exceptions when passing bad directives to - time.strptime(). Initial patch by Claudiu Popa. +- Issue #22940: Add readline.append_history_file. -- bpo-17435: threading.Timer's __init__ method no longer uses mutable - default values for the args and kwargs parameters. +- Issue #19676: Added the "namereplace" error handler. -- bpo-17526: fix an IndexError raised while passing code without filename to - inspect.findsource(). Initial patch by Tyler Doyle. +- Issue #22788: Add *context* parameter to logging.handlers.HTTPHandler. -- bpo-17540: Added style parameter to logging formatter configuration by - dict. +- Issue #22921: Allow SSLContext to take the *hostname* parameter even if + OpenSSL doesn't support SNI. -- bpo-16692: The ssl module now supports TLS 1.1 and TLS 1.2. Initial patch - by Michele Orrù. +- Issue #22894: TestCase.subTest() would cause the test suite to be stopped + when in failfast mode, even in the absence of failures. -- bpo-17025: multiprocessing: Reduce Queue and SimpleQueue contention. +- Issue #22796: HTTP cookie parsing is now stricter, in order to protect + against potential injection attacks. -- bpo-17536: Add to webbrowser's browser list: www-browser, x-www-browser, - iceweasel, iceape. +- Issue #22370: Windows detection in pathlib is now more robust. -- bpo-17150: pprint now uses line continuations to wrap long string - literals. +- Issue #22841: Reject coroutines in asyncio add_signal_handler(). + Patch by Ludovic.Gasc. -- bpo-17488: Change the subprocess.Popen bufsize parameter default value - from unbuffered (0) to buffering (-1) to match the behavior existing code - expects and match the behavior of the subprocess module in Python 2 to - avoid introducing hard to track down bugs. +- Issue #19494: Added urllib.request.HTTPBasicPriorAuthHandler. Patch by + Matej Cepl. -- bpo-17521: Corrected non-enabling of logger following two calls to - fileConfig(). +- Issue #22578: Added attributes to the re.error class. -- bpo-17508: Corrected logging MemoryHandler configuration in dictConfig() - where the target handler wasn't configured first. +- Issue #22849: Fix possible double free in the io.TextIOWrapper constructor. -- bpo-17209: curses.window.get_wch() now correctly handles KeyboardInterrupt - (CTRL+c). +- Issue #12728: Different Unicode characters having the same uppercase but + different lowercase are now matched in case-insensitive regular expressions. -- bpo-5713: smtplib now handles 421 (closing connection) error codes when - sending mail by closing the socket and reporting the 421 error code via - the exception appropriate to the command that received the error response. +- Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian + platforms. -- bpo-16997: unittest.TestCase now provides a subTest() context manager to - procedurally generate, in an easy way, small test instances. +- Issue #21650: Add an `--sort-keys` option to json.tool CLI. -- bpo-17485: Also delete the Request Content-Length header if the data - attribute is deleted. (Follow on to issue Issue #16464). +- Issue #22824: Updated reprlib output format for sets to use set literals. + Patch contributed by Berker Peksag. -- bpo-15927: CVS now correctly parses escaped newlines and carriage when - parsing with quoting turned off. +- Issue #22824: Updated reprlib output format for arrays to display empty + arrays without an unnecessary empty list. Suggested by Serhiy Storchaka. -- bpo-17467: add readline and readlines support to mock_open in - unittest.mock. +- Issue #22406: Fixed the uu_codec codec incorrectly ported to 3.x. + Based on patch by Martin Panter. -- bpo-13248: removed deprecated and undocumented difflib.isbjunk, - isbpopular. +- Issue #17293: uuid.getnode() now determines MAC address on AIX using netstat. + Based on patch by Aivars Kalvāns. -- bpo-17192: Update the ctypes module's libffi to v3.0.13. This - specifically addresses a stack misalignment issue on x86 and issues on - some more recent platforms. +- Issue #22769: Fixed ttk.Treeview.tag_has() when called without arguments. -- bpo-8862: Fixed curses cleanup when getkey is interrupted by a signal. +- Issue #22417: Verify certificates by default in httplib (PEP 476). -- bpo-17443: imaplib.IMAP4_stream was using the default unbuffered IO in - subprocess, but the imap code assumes buffered IO. In Python2 this worked - by accident. IMAP4_stream now explicitly uses buffered IO. +- Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2 + and above. Patch by Tim Graham. -- bpo-17476: Fixed regression relative to Python2 in undocumented pydoc - 'allmethods'; it was missing unbound methods on the class. +- Issue #22776: Brought excluded code into the scope of a try block in + SysLogHandler.emit(). -- bpo-17474: Remove the deprecated methods of Request class. +- Issue #22665: Add missing get_terminal_size and SameFileError to + shutil.__all__. -- bpo-16709: unittest discover order is no-longer filesystem specific. Patch - by Jeff Ramnani. +- Issue #6623: Remove deprecated Netrc class in the ftplib module. Patch by + Matt Chaput. -- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in - pypirc. +- Issue #17381: Fixed handling of case-insensitive ranges in regular + expressions. -- bpo-5024: sndhdr.whichhdr now returns the frame count for WAV files rather - than -1. +- Issue #22410: Module level functions in the re module now cache compiled + locale-dependent regular expressions taking into account the locale. -- bpo-17460: Remove the strict argument of HTTPConnection and removing the - DeprecationWarning being issued from 3.2 onwards. +- Issue #22759: Query methods on pathlib.Path() (exists(), is_dir(), etc.) + now return False when the underlying stat call raises NotADirectoryError. -- bpo-16880: Do not assume _imp.load_dynamic() is defined in the imp module. +- Issue #8876: distutils now falls back to copying files when hard linking + doesn't work. This allows use with special filesystems such as VirtualBox + shared folders. -- bpo-16389: Fixed a performance regression relative to Python 3.1 in the - caching of compiled regular expressions. +- Issue #22217: Implemented reprs of classes in the zipfile module. -- Added missing FeedParser and BytesFeedParser to email.parser.__all__. +- Issue #22457: Honour load_tests in the start_dir of discovery. -- bpo-17431: Fix missing import of BytesFeedParser in email.parser. +- Issue #18216: gettext now raises an error when a .mo file has an + unsupported major version number. Patch by Aaron Hill. -- bpo-12921: http.server's send_error takes an explain argument to send more - information in response. Patch contributed by Karl. +- Issue #13918: Provide a locale.delocalize() function which can remove + locale-specific number formatting from a string representing a number, + without then converting it to a specific type. Patch by Cédric Krier. -- bpo-17414: Add timeit, repeat, and default_timer to timeit.__all__. +- Issue #22676: Make the pickling of global objects which don't have a + __module__ attribute less slow. -- bpo-1285086: Get rid of the refcounting hack and speed up - urllib.parse.unquote() and urllib.parse.unquote_to_bytes(). +- Issue #18853: Fixed ResourceWarning in shlex.__nain__. -- bpo-17099: Have importlib.find_loader() raise ValueError when __loader__ - is not set, harmonizing with what happens when the attribute is set to - None. +- Issue #9351: Defaults set with set_defaults on an argparse subparser + are no longer ignored when also set on the parent parser. -- Expose the O_PATH constant in the os module if it is available. +- Issue #7559: unittest test loading ImportErrors are reported as import errors + with their import exception rather than as attribute errors after the import + has already failed. -- bpo-17368: Fix an off-by-one error in the Python JSON decoder that caused - a failure while decoding empty object literals when object_pairs_hook was - specified. +- Issue #19746: Make it possible to examine the errors from unittest + discovery without executing the test suite. The new `errors` attribute + on TestLoader exposes these non-fatal errors encountered during discovery. -- bpo-17385: Fix quadratic behavior in threading.Condition. The FIFO queue - now uses a deque instead of a list. +- Issue #21991: Make email.headerregistry's header 'params' attributes + be read-only (MappingProxyType). Previously the dictionary was modifiable + but a new one was created on each access of the attribute. -- bpo-15806: Add contextlib.ignore(). This creates a context manager to - ignore specified exceptions, replacing the "except SomeException: pass" - idiom. +- Issue #22638: SSLv3 is now disabled throughout the standard library. + It can still be enabled by instantiating a SSLContext manually. -- bpo-14645: The email generator classes now produce output using the - specified linesep throughout. Previously if the prolog, epilog, or body - were stored with a different linesep, that linesep was used. This fix - corrects an RFC non- compliance issue with smtplib.send_message. +- Issue #22641: In asyncio, the default SSL context for client connections + is now created using ssl.create_default_context(), for stronger security. -- bpo-17278: Fix a crash in heapq.heappush() and heapq.heappop() when the - list is being resized concurrently. +- Issue #17401: Include closefd in io.FileIO repr. -- bpo-16962: Use getdents64 instead of the obsolete getdents syscall in the - subprocess module on Linux. +- Issue #21338: Add silent mode for compileall. quiet parameters of + compile_{dir, file, path} functions now have a multilevel value. Also, + -q option of the CLI now have a multilevel value. Patch by Thomas Kluyver. -- bpo-16935: unittest now counts the module as skipped if it raises - SkipTest, instead of counting it as an error. Patch by Zachary Ware. +- Issue #20152: Convert the array and cmath modules to Argument Clinic. -- bpo-17018: Make Process.join() retry if os.waitpid() fails with EINTR. +- Issue #18643: Add socket.socketpair() on Windows. -- bpo-17223: array module: Fix a crasher when converting an array containing - invalid characters (outside range [U+0000; U+10ffff]) to Unicode: - repr(array), str(array) and array.tounicode(). Patch written by Manuel - Jacob. +- Issue #22435: Fix a file descriptor leak when socketserver bind fails. -- bpo-17197: profile/cProfile modules refactored so that code of run() and - runctx() utility functions is not duplicated in both modules. +- Issue #13096: Fixed segfault in CTypes POINTER handling of large + values. -- bpo-14720: sqlite3: Convert datetime microseconds correctly. Patch by Lowe - Thiderman. +- Issue #11694: Raise ConversionError in xdrlib as documented. Patch + by Filip Gruszczyński and Claudiu Popa. -- bpo-15132: Allow a list for the defaultTest argument of - unittest.TestProgram. Patch by Jyrki Pulliainen. +- Issue #19380: Optimized parsing of regular expressions. -- bpo-17225: JSON decoder now counts columns in the first line starting with - 1, as in other lines. +- Issue #1519638: Now unmatched groups are replaced with empty strings in re.sub() + and re.subn(). -- bpo-6623: Added explicit DeprecationWarning for ftplib.netrc, which has - been deprecated and undocumented for a long time. +- Issue #18615: sndhdr.what/whathdr now return a namedtuple. -- bpo-13700: Fix byte/string handling in imaplib authentication when an - authobject is specified. +- Issue #22462: Fix pyexpat's creation of a dummy frame to make it + appear in exception tracebacks. -- bpo-13153: Tkinter functions now raise TclError instead of ValueError when - a string argument contains non-BMP character. +- Issue #21965: Add support for in-memory SSL to the ssl module. Patch + by Geert Jansen. -- bpo-9669: Protect re against infinite loops on zero-width matching in non- - greedy repeat. Patch by Matthew Barnett. +- Issue #21173: Fix len() on a WeakKeyDictionary when .clear() was called + with an iterator alive. -- bpo-13169: The maximal repetition number in a regular expression has been - increased from 65534 to 2147483647 (on 32-bit platform) or 4294967294 (on - 64-bit). +- Issue #11866: Eliminated race condition in the computation of names + for new threads. -- bpo-17143: Fix a missing import in the trace module. Initial patch by - Berker Peksag. +- Issue #21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules + is mutated while iterating. Patch by Olivier Grisel. -- bpo-15220: email.feedparser's line splitting algorithm is now simpler and - faster. +- Issue #11271: concurrent.futures.Executor.map() now takes a *chunksize* + argument to allow batching of tasks in child processes and improve + performance of ProcessPoolExecutor. Patch by Dan O'Reilly. -- bpo-16743: Fix mmap overflow check on 32 bit Windows. +- Issue #21883: os.path.join() and os.path.relpath() now raise a TypeError with + more helpful error message for unsupported or mismatched types of arguments. -- bpo-16996: webbrowser module now uses shutil.which() to find a web-browser - on the executable search path. +- Issue #22219: The zipfile module CLI now adds entries for directories + (including empty directories) in ZIP file. -- bpo-16800: tempfile.gettempdir() no longer left temporary files when the - disk is full. Original patch by Amir Szekely. +- Issue #22449: In the ssl.SSLContext.load_default_certs, consult the + environmental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows. -- bpo-17192: Import libffi-3.0.12. +- Issue #22508: The email.__version__ variable has been removed; the email + code is no longer shipped separately from the stdlib, and __version__ + hasn't been updated in several releases. -- bpo-16564: Fixed regression relative to Python2 in the operation of - email.encoders.encode_7or8bit when used with binary data. +- Issue #20076: Added non derived UTF-8 aliases to locale aliases table. -- bpo-17052: unittest discovery should use self.testLoader. +- Issue #20079: Added locales supported in glibc 2.18 to locale alias table. -- bpo-4591: Uid and gid values larger than 2**31 are supported now. +- Issue #20218: Added convenience methods read_text/write_text and read_bytes/ + write_bytes to pathlib.Path objects. -- bpo-17141: random.vonmisesvariate() no longer hangs for large kappas. +- Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor + os.posix_fallocate() because their prototypes in system headers are wrong. -- bpo-17149: Fix random.vonmisesvariate to always return results in [0, - 2*math.pi]. +- Issue #22517: When an io.BufferedRWPair object is deallocated, clear its + weakrefs. -- bpo-1470548: XMLGenerator now works with binary output streams. +- Issue #22437: Number of capturing groups in regular expression is no longer + limited by 100. -- bpo-6975: os.path.realpath() now correctly resolves multiple nested - symlinks on POSIX platforms. +- Issue #17442: InteractiveInterpreter now displays the full chained traceback + in its showtraceback method, to match the built in interactive interpreter. -- bpo-13773: sqlite3.connect() gets a new `uri` parameter to pass the - filename as a URI, allowing custom options to be passed. +- Issue #23392: Added tests for marshal C API that works with FILE*. -- bpo-16564: Fixed regression relative to Python2 in the operation of - email.encoders.encode_noop when used with binary data. -- bpo-10355: The mode, name, encoding and newlines properties now work on - SpooledTemporaryFile objects even when they have not yet rolled over. - Obsolete method xreadline (which has never worked in Python 3) has been - removed. +- Issue #10510: distutils register and upload methods now use HTML standards + compliant CRLF line endings. -- bpo-16686: Fixed a lot of bugs in audioop module. Fixed crashes in - avgpp(), maxpp() and ratecv(). Fixed an integer overflow in add(), - bias(), and ratecv(). reverse(), lin2lin() and ratecv() no more lose - precision for 32-bit samples. max() and rms() no more returns a negative - result and various other functions now work correctly with 32-bit sample - -0x80000000. +- Issue #9850: Fixed macpath.join() for empty first component. Patch by + Oleg Oshmyan. -- bpo-17073: Fix some integer overflows in sqlite3 module. +- Issue #5309: distutils' build and build_ext commands now accept a ``-j`` + option to enable parallel building of extension modules. -- bpo-16723: httplib.HTTPResponse no longer marked closed when the - connection is automatically closed. +- Issue #22448: Improve canceled timer handles cleanup to prevent + unbound memory usage. Patch by Joshua Moore-Oliva. -- bpo-15359: Add CAN_BCM protocol support to the socket module. Patch by - Brian Thorne. +- Issue #22427: TemporaryDirectory no longer attempts to clean up twice when + used in the with statement in generator. -- bpo-16948: Fix quoted printable body encoding for non-latin1 character - sets in the email package. +- Issue #22362: Forbidden ambiguous octal escapes out of range 0-0o377 in + regular expressions. -- bpo-16811: Fix folding of headers with no value in the provisional email - policies. +- Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS + directory attributes. -- bpo-17132: Update symbol for "yield from" grammar changes. +- Issue #21866: ZipFile.close() no longer writes ZIP64 central directory + records if allowZip64 is false. -- bpo-17076: Make copying of xattrs more tolerant of missing FS support. - Patch by Thomas Wouters. +- Issue #22278: Fix urljoin problem with relative urls, a regression observed + after changes to issue22118 were submitted. -- bpo-17089: Expat parser now correctly works with string input when the - internal XML encoding is not UTF-8 or US-ASCII. It also now accepts bytes - and strings larger than 2 GiB. +- Issue #22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re + module. Removed trailing spaces in debugging output. -- bpo-6083: Fix multiple segmentation faults occurred when PyArg_ParseTuple - parses nested mutating sequence. +- Issue #22423: Unhandled exception in thread no longer causes unhandled + AttributeError when sys.stderr is None. -- bpo-5289: Fix ctypes.util.find_library on Solaris. +- Issue #21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects + line buffering, rather than block buffering. Patch by Akira Li. -- bpo-17106: Fix a segmentation fault in io.TextIOWrapper when an underlying - stream or a decoder produces data of an unexpected type (i.e. when - io.TextIOWrapper initialized with text stream or use bytes-to-bytes - codec). +- Issue #21091: Fix API bug: email.message.EmailMessage.is_attachment is now + a method. -- bpo-17015: When it has a spec, a Mock object now inspects its signature - when matching calls, so that arguments can be matched positionally or by - name. +- Issue #21079: Fix email.message.EmailMessage.is_attachment to return the + correct result when the header has parameters as well as a value. -- bpo-15633: httplib.HTTPResponse is now mark closed when the server sends - less than the advertised Content-Length. +- Issue #22247: Add NNTPError to nntplib.__all__. -- bpo-12268: The io module file object write methods no longer abort early - when one of its write system calls is interrupted (EINTR). +- Issue #22366: urllib.request.urlopen will accept a context object + (SSLContext) as an argument which will then be used for HTTPS connection. + Patch by Alex Gaynor. -- bpo-6972: The zipfile module no longer overwrites files outside of its - destination path when extracting malicious zip files. +- Issue #4180: The warnings registries are now reset when the filters + are modified. -- bpo-4844: ZipFile now raises BadZipFile when opens a ZIP file with an - incomplete "End of Central Directory" record. Original patch by Guilherme - Polo and Alan McIntyre. +- Issue #22419: Limit the length of incoming HTTP request in wsgiref server to + 65536 bytes and send a 414 error code for higher lengths. Patch contributed + by Devin Cook. -- bpo-17071: Signature.bind() now works when one of the keyword arguments is - named ``self``. +- Lax cookie parsing in http.cookies could be a security issue when combined + with non-standard cookie handling in some Web browsers. Reported by + Sergey Bobrov. -- bpo-12004: Fix an internal error in PyZipFile when writing an invalid - Python file. Patch by Ben Morgan. +- Issue #20537: logging methods now accept an exception instance as well as a + Boolean value or exception tuple. Thanks to Yury Selivanov for the patch. -- Have py_compile use importlib as much as possible to avoid code - duplication. Code now raises FileExistsError if the file path to be used - for the byte- compiled file is a symlink or non-regular file as a warning - that import will not keep the file path type if it writes to that path. +- Issue #22384: An exception in Tkinter callback no longer crashes the program + when it is run with pythonw.exe. -- bpo-16972: Have site.addpackage() consider already known paths even when - none are explicitly passed in. Bug report and fix by Kirill. +- Issue #22168: Prevent turtle AttributeError with non-default Canvas on OS X. -- bpo-1602133: on Mac OS X a shared library build (``--enable-shared``) now - fills the ``os.environ`` variable correctly. +- Issue #21147: sqlite3 now raises an exception if the request contains a null + character instead of truncating it. Based on patch by Victor Stinner. -- bpo-15505: `unittest.installHandler` no longer assumes SIGINT handler is - set to a callable object. +- Issue #13968: The glob module now supports recursive search in + subdirectories using the "**" pattern. -- bpo-13454: Fix a crash when deleting an iterator created by - itertools.tee() if all other iterators were very advanced before. +- Issue #21951: Fixed a crash in Tkinter on AIX when called Tcl command with + empty string or tuple argument. -- bpo-12411: Fix to cgi.parse_multipart to correctly use bytes boundaries - and bytes data. Patch by Jonas Wagner. +- Issue #21951: Tkinter now most likely raises MemoryError instead of crash + if the memory allocation fails. -- bpo-16957: shutil.which() no longer searches a bare file name in the - current directory on Unix and no longer searches a relative file path with - a directory part in PATH directories. Patch by Thomas Kluyver. +- Issue #22338: Fix a crash in the json module on memory allocation failure. -- bpo-1159051: GzipFile now raises EOFError when reading a corrupted file - with truncated header or footer. +- Issue #12410: imaplib.IMAP4 now supports the context management protocol. + Original patch by Tarek Ziadé. -- bpo-16993: shutil.which() now preserves the case of the path and extension - on Windows. +- Issue #21270: We now override tuple methods in mock.call objects so that + they can be used as normal call attributes. -- bpo-16992: On Windows in signal.set_wakeup_fd, validate the file - descriptor argument. +- Issue #16662: load_tests() is now unconditionally run when it is present in + a package's __init__.py. TestLoader.loadTestsFromModule() still accepts + use_load_tests, but it is deprecated and ignored. A new keyword-only + attribute `pattern` is added and documented. Patch given by Robert Collins, + tweaked by Barry Warsaw. -- bpo-16422: For compatibility with the Python version, the C version of - decimal now uses strings instead of integers for rounding mode constants. +- Issue #22226: First letter no longer is stripped from the "status" key in + the result of Treeview.heading(). -- bpo-15861: tkinter now correctly works with lists and tuples containing - strings with whitespaces, backslashes or unbalanced braces. +- Issue #19524: Fixed resource leak in the HTTP connection when an invalid + response is received. Patch by Martin Panter. -- bpo-9720: zipfile now writes correct local headers for files larger than 4 - GiB. +- Issue #20421: Add a .version() method to SSL sockets exposing the actual + protocol version in use. -- bpo-16955: Fix the poll() method for multiprocessing's socket connections - on Windows. +- Issue #19546: configparser exceptions no longer expose implementation details. + Chained KeyErrors are removed, which leads to cleaner tracebacks. Patch by + Claudiu Popa. -- SSLContext.load_dh_params() now properly closes the input file. +- Issue #22051: turtledemo no longer reloads examples to re-run them. + Initialization of variables and gui setup should be done in main(), + which is called each time a demo is run, but not on import. -- bpo-15031: Refactor some .pyc management code to cut down on code - duplication. Thanks to Ronan Lamy for the report and taking an initial - stab at the problem. +- Issue #21933: Turtledemo users can change the code font size with a menu + selection or control(command) '-' or '+' or control-mousewheel. + Original patch by Lita Cho. -- bpo-16398: Optimize deque.rotate() so that it only moves pointers and - doesn't touch the underlying data with increfs and decrefs. +- Issue #21597: The separator between the turtledemo text pane and the drawing + canvas can now be grabbed and dragged with a mouse. The code text pane can + be widened to easily view or copy the full width of the text. The canvas + can be widened on small screens. Original patches by Jan Kanis and Lita Cho. -- bpo-16900: Issue a ResourceWarning when an ssl socket is left unclosed. +- Issue #18132: Turtledemo buttons no longer disappear when the window is + shrunk. Original patches by Jan Kanis and Lita Cho. -- bpo-13899: ``\A``, ``\Z``, and ``\B`` now correctly match the A, Z, and B - literals when used inside character classes (e.g. ``'[\A]'``). Patch by - Matthew Barnett. +- Issue #22043: time.monotonic() is now always available. + ``threading.Lock.acquire()``, ``threading.RLock.acquire()`` and socket + operations now use a monotonic clock, instead of the system clock, when a + timeout is used. -- bpo-15545: Fix regression in sqlite3's iterdump method where it was - failing if the connection used a row factory (such as sqlite3.Row) that - produced unsortable objects. (Regression was introduced by fix for 9750). +- Issue #21527: Add a default number of workers to ThreadPoolExecutor equal + to 5 times the number of CPUs. Patch by Claudiu Popa. -- fcntl: add F_DUPFD_CLOEXEC constant, available on Linux 2.6.24+. +- Issue #22216: smtplib now resets its state more completely after a quit. The + most obvious consequence of the previous behavior was a STARTTLS failure + during a connect/starttls/quit/connect/starttls sequence. -- bpo-15972: Fix error messages when os functions expecting a file name or - file descriptor receive the incorrect type. +- Issue #22098: ctypes' BigEndianStructure and LittleEndianStructure now + define an empty __slots__ so that subclasses don't always get an instance + dict. Patch by Claudiu Popa. -- bpo-8109: The ssl module now has support for server-side SNI, thanks to a - :meth:`SSLContext.set_servername_callback` method. Patch by Daniel Black. +- Issue #22185: Fix an occasional RuntimeError in threading.Condition.wait() + caused by mutation of the waiters queue without holding the lock. Patch + by Doug Zongker. -- bpo-16860: In tempfile, use O_CLOEXEC when available to set the close-on- - exec flag atomically. +- Issue #22287: On UNIX, _PyTime_gettimeofday() now uses + clock_gettime(CLOCK_REALTIME) if available. As a side effect, Python now + depends on the librt library on Solaris and on Linux (only with glibc older + than 2.17). -- bpo-16674: random.getrandbits() is now 20-40% faster for small integers. +- Issue #22182: Use e.args to unpack exceptions correctly in + distutils.file_util.move_file. Patch by Claudiu Popa. -- bpo-16009: JSON error messages now provide more information. +- The webbrowser module now uses subprocess's start_new_session=True rather + than a potentially risky preexec_fn=os.setsid call. -- bpo-16828: Fix error incorrectly raised by bz2.compress(b'') and - bz2.BZ2Compressor.compress(b''). Initial patch by Martin Packman. +- Issue #22042: signal.set_wakeup_fd(fd) now raises an exception if the file + descriptor is in blocking mode. -- bpo-16833: In http.client.HTTPConnection, do not concatenate the request - headers and body when the payload exceeds 16 KB, since it can consume more - memory for no benefit. Patch by Benno Leslie. +- Issue #16808: inspect.stack() now returns a named tuple instead of a tuple. + Patch by Daniel Shahaf. -- bpo-16541: tk_setPalette() now works with keyword arguments. +- Issue #22236: Fixed Tkinter images copying operations in NoDefaultRoot mode. -- bpo-16820: In configparser, `parser.popitem()` no longer raises - ValueError. This makes `parser.clean()` work correctly. +- Issue #2527: Add a *globals* argument to timeit functions, in order to + override the globals namespace in which the timed code is executed. + Patch by Ben Roberts. -- bpo-16820: In configparser, ``parser['section'] = {}`` now preserves - section order within the parser. This makes `parser.update()` preserve - section order as well. +- Issue #22118: Switch urllib.parse to use RFC 3986 semantics for the + resolution of relative URLs, rather than RFCs 1808 and 2396. + Patch by Demian Brecht. -- bpo-16820: In configparser, ``parser['DEFAULT'] = {}`` now correctly - clears previous values stored in the default section. Same goes for - ``parser.update({'DEFAULT': {}})``. +- Issue #21549: Added the "members" parameter to TarFile.list(). -- bpo-9586: Redefine SEM_FAILED on MacOSX to keep compiler happy. +- Issue #19628: Allow compileall recursion depth to be specified with a -r + option. -- bpo-16787: Increase asyncore and asynchat default output buffers size, to - decrease CPU usage and increase throughput. +- Issue #15696: Add a __sizeof__ implementation for mmap objects on Windows. -- bpo-10527: make multiprocessing use poll() instead of select() if - available. +- Issue #22068: Avoided reference loops with Variables and Fonts in Tkinter. -- bpo-16688: Now regexes contained backreferences correctly work with non- - ASCII strings. Patch by Matthew Barnett. +- Issue #22165: SimpleHTTPRequestHandler now supports undecodable file names. -- bpo-16486: Make aifc files act as context managers. +- Issue #15381: Optimized line reading in io.BytesIO. -- bpo-16485: Now file descriptors are closed if file header patching failed - on closing an aifc file. +- Issue #8797: Raise HTTPError on failed Basic Authentication immediately. + Initial patch by Sam Bull. -- bpo-16640: Run less code under a lock in sched module. +- Issue #20729: Restored the use of lazy iterkeys()/itervalues()/iteritems() + in the mailbox module. -- bpo-16165: sched.scheduler.run() no longer blocks a scheduler for other - threads. +- Issue #21448: Changed FeedParser feed() to avoid O(N**2) behavior when + parsing long line. Original patch by Raymond Hettinger. -- bpo-16641: Default values of sched.scheduler.enter() are no longer - modifiable. +- Issue #22184: The functools LRU Cache decorator factory now gives an earlier + and clearer error message when the user forgets the required parameters. -- bpo-16618: Make glob.glob match consistently across strings and bytes - regarding leading dots. Patch by Serhiy Storchaka. +- Issue #17923: glob() patterns ending with a slash no longer match non-dirs on + AIX. Based on patch by Delhallt. -- bpo-16788: Add samestat to Lib/ntpath.py +- Issue #21725: Added support for RFC 6531 (SMTPUTF8) in smtpd. -- bpo-16713: Parsing of 'tel' urls using urlparse separates params from - path. +- Issue #22176: Update the ctypes module's libffi to v3.1. This release + adds support for the Linux AArch64 and POWERPC ELF ABIv2 little endian + architectures. -- bpo-16443: Add docstrings to regular expression match objects. Patch by - Anton Kasyanov. +- Issue #5411: Added support for the "xztar" format in the shutil module. -- bpo-15701: Fix HTTPError info method call to return the headers - information. +- Issue #21121: Don't force 3rd party C extensions to be built with + -Werror=declaration-after-statement. -- bpo-16752: Add a missing import to modulefinder. Patch by Berker Peksag. +- Issue #21975: Fixed crash when using uninitialized sqlite3.Row (in particular + when unpickling pickled sqlite3.Row). sqlite3.Row is now initialized in the + __new__() method. -- bpo-16646: ftplib.FTP.makeport() might lose socket error details. (patch - by Serhiy Storchaka) +- Issue #20170: Convert posixmodule to use Argument Clinic. -- bpo-16626: Fix infinite recursion in glob.glob() on Windows when the - pattern contains a wildcard in the drive or UNC path. Patch by Serhiy - Storchaka. +- Issue #21539: Add an *exists_ok* argument to `Pathlib.mkdir()` to mimic + `mkdir -p` and `os.makedirs()` functionality. When true, ignore + FileExistsErrors. Patch by Berker Peksag. -- bpo-15783: Except for the number methods, the C version of decimal now - supports all None default values present in decimal.py. These values were - largely undocumented. +- Issue #22127: Bypass IDNA for pure-ASCII host names in the socket module + (in particular for numeric IPs). -- bpo-11175: argparse.FileType now accepts encoding and errors arguments. - Patch by Lucas Maystre. +- Issue #21047: set the default value for the *convert_charrefs* argument + of HTMLParser to True. Patch by Berker Peksag. -- bpo-16488: epoll() objects now support the `with` statement. Patch by - Serhiy Storchaka. +- Add an __all__ to html.entities. -- bpo-16298: In HTTPResponse.read(), close the socket when there is no - Content-Length and the incoming stream is finished. Patch by Eran - Rundstein. +- Issue #15114: the strict mode and argument of HTMLParser, HTMLParser.error, + and the HTMLParserError exception have been removed. -- bpo-16049: Add abc.ABC class to enable the use of inheritance to create - ABCs, rather than the more cumbersome metaclass=ABCMeta. Patch by Bruno - Dupuis. +- Issue #22085: Dropped support of Tk 8.3 in Tkinter. -- Expose the TCP_FASTOPEN and MSG_FASTOPEN flags in socket when they're - available. +- Issue #21580: Now Tkinter correctly handles bytes arguments passed to Tk. + In particular this allows initializing images from binary data. -- bpo-15701: Add a .headers attribute to urllib.error.HTTPError. Patch - contributed by Berker Peksag. +- Issue #22003: When initialized from a bytes object, io.BytesIO() now + defers making a copy until it is mutated, improving performance and + memory use on some use cases. Patch by David Wilson. -- bpo-15872: Fix 3.3 regression introduced by the new fd-based shutil.rmtree - that caused it to not ignore certain errors when ignore_errors was set. - Patch by Alessandro Moura and Serhiy Storchaka. +- Issue #22018: On Windows, signal.set_wakeup_fd() now also supports sockets. + A side effect is that Python depends to the WinSock library. -- bpo-16248: Disable code execution from the user's home directory by - tkinter when the -E flag is passed to Python. Patch by Zachary Ware. +- Issue #22054: Add os.get_blocking() and os.set_blocking() functions to get + and set the blocking mode of a file descriptor (False if the O_NONBLOCK flag + is set, True otherwise). These functions are not available on Windows. -- bpo-13390: New function :func:`sys.getallocatedblocks()` returns the - number of memory blocks currently allocated. +- Issue #17172: Make turtledemo start as active on OS X even when run with + subprocess. Patch by Lita Cho. -- bpo-16628: Fix a memory leak in ctypes.resize(). +- Issue #21704: Fix build error for _multiprocessing when semaphores + are not available. Patch by Arfrever Frehtes Taifersar Arahesis. -- bpo-13614: Fix setup.py register failure with invalid rst in description. - Patch by Julien Courteau and Pierre Paul Lefebvre. +- Issue #20173: Convert sha1, sha256, sha512 and md5 to ArgumentClinic. + Patch by Vajrasky Kok. -- bpo-13512: Create ~/.pypirc securely (CVE-2011-4944). Initial patch by - Philip Jenvey, tested by Mageia and Debian. +- Fix repr(_socket.socket) on Windows 64-bit: don't fail with OverflowError + on closed socket. repr(socket.socket) already works fine. -- bpo-7719: Make distutils ignore ``.nfs*`` files instead of choking later - on. Initial patch by SilentGhost and Jeff Ramnani. +- Issue #22033: Reprs of most Python implemened classes now contain actual + class name instead of hardcoded one. -- bpo-13120: Allow calling pdb.set_trace() from thread. Patch by Ilya - Sandler. +- Issue #21947: The dis module can now disassemble generator-iterator + objects based on their gi_code attribute. Patch by Clement Rouault. -- bpo-16585: Make CJK encoders support error handlers that return bytes per - PEP 383. +- Issue #16133: The asynchat.async_chat.handle_read() method now ignores + BlockingIOError exceptions. -- bpo-10182: The re module doesn't truncate indices to 32 bits anymore. - Patch by Serhiy Storchaka. +- Issue #22044: Fixed premature DECREF in call_tzinfo_method. + Patch by Tom Flanagan. -- bpo-16333: use (",", ": ") as default separator in json when indent is - specified, to avoid trailing whitespace. Patch by Serhiy Storchaka. +- Issue #19884: readline: Disable the meta modifier key if stdout is not + a terminal to not write the ANSI sequence ``"\033[1034h"`` into stdout. This + sequence is used on some terminal (ex: TERM=xterm-256color") to enable + support of 8 bit characters. -- bpo-16573: In 2to3, treat enumerate() like a consuming call, so - superfluous list() calls aren't added to filter(), map(), and zip() which - are directly passed enumerate(). +- Issue #4350: Removed a number of out-of-dated and non-working for a long time + Tkinter methods. -- bpo-16464: Reset the Content-Length header when a urllib Request is reused - with new data. +- Issue #6167: Scrollbar.activate() now returns the name of active element if + the argument is not specified. Scrollbar.set() now always accepts only 2 + arguments. -- bpo-12848: The pure Python pickle implementation now treats object lengths - as unsigned 32-bit integers, like the C implementation does. Patch by - Serhiy Storchaka. +- Issue #15275: Clean up and speed up the ntpath module. -- bpo-16423: urllib.request now has support for ``data:`` URLs. Patch by - Mathias Panzenböck. +- Issue #21888: plistlib's load() and loads() now work if the fmt parameter is + specified. -- bpo-4473: Add a POP3.stls() to switch a clear-text POP3 session into an - encrypted POP3 session, on supported servers. Patch by Lorenzo Catucci. +- Issue #22032: __qualname__ instead of __name__ is now always used to format + fully qualified class names of Python implemented classes. -- bpo-4473: Add a POP3.capa() method to query the capabilities advertised by - the POP3 server. Patch by Lorenzo Catucci. +- Issue #22031: Reprs now always use hexadecimal format with the "0x" prefix + when contain an id in form " at 0x...". -- bpo-4473: Ensure the socket is shutdown cleanly in POP3.close(). Patch by - Lorenzo Catucci. +- Issue #22018: signal.set_wakeup_fd() now raises an OSError instead of a + ValueError on ``fstat()`` failure. -- bpo-16522: added FAIL_FAST flag to doctest. +- Issue #21044: tarfile.open() now handles fileobj with an integer 'name' + attribute. Based on patch by Antoine Pietri. -- bpo-15627: Add the importlib.abc.InspectLoader.source_to_code() method. +- Issue #21966: Respect -q command-line option when code module is ran. -- bpo-16408: Fix file descriptors not being closed in error conditions in - the zipfile module. Patch by Serhiy Storchaka. +- Issue #19076: Don't pass the redundant 'file' argument to self.error(). -- bpo-14631: Add a new :class:`weakref.WeakMethod` to simulate weak - references to bound methods. +- Issue #16382: Improve exception message of warnings.warn() for bad + category. Initial patch by Phil Elson. -- bpo-16469: Fix exceptions from float -> Fraction and Decimal -> Fraction - conversions for special values to be consistent with those for float -> - int and Decimal -> int. Patch by Alexey Kachayev. +- Issue #21932: os.read() now uses a :c:func:`Py_ssize_t` type instead of + :c:type:`int` for the size to support reading more than 2 GB at once. On + Windows, the size is truncted to INT_MAX. As any call to os.read(), the OS + may read less bytes than the number of requested bytes. -- bpo-16481: multiprocessing no longer leaks process handles on Windows. +- Issue #21942: Fixed source file viewing in pydoc's server mode on Windows. -- bpo-12428: Add a pure Python implementation of functools.partial(). Patch - by Brian Thorne. +- Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError + if the number of received bytes is negative. -- bpo-16140: The subprocess module no longer double closes its child - subprocess.PIPE parent file descriptors on child error prior to exec(). +- Issue #12523: asynchat.async_chat.push() now raises a TypeError if it doesn't + get a bytes string -- Remove a bare print to stdout from the subprocess module that could have - happened if the child process wrote garbage to its pre-exec error pipe. +- Issue #21707: Add missing kwonlyargcount argument to + ModuleFinder.replace_paths_in_code(). -- The subprocess module now raises its own SubprocessError instead of a - RuntimeError in various error situations which should not normally happen. +- Issue #20639: calling Path.with_suffix('') allows removing the suffix + again. Patch by July Tikhonov. -- bpo-16327: The subprocess module no longer leaks file descriptors used for - stdin/stdout/stderr pipes to the child when fork() fails. +- Issue #21714: Disallow the construction of invalid paths using + Path.with_name(). Original patch by Antony Lee. -- bpo-14396: Handle the odd rare case of waitpid returning 0 when not - expected in subprocess.Popen.wait(). +- Issue #15014: Added 'auth' method to smtplib to make implementing auth + mechanisms simpler, and used it internally in the login method. -- bpo-16411: Fix a bug where zlib.decompressobj().flush() might try to - access previously- freed memory. Patch by Serhiy Storchaka. +- Issue #21151: Fixed a segfault in the winreg module when ``None`` is passed + as a ``REG_BINARY`` value to SetValueEx. Patch by John Ehresman. -- bpo-16357: fix calling accept() on a SSLSocket created through - SSLContext.wrap_socket(). Original patch by Jeff McNeil. +- Issue #21090: io.FileIO.readall() does not ignore I/O errors anymore. Before, + it ignored I/O errors if at least the first C call read() succeed. -- bpo-16409: The reporthook callback made by the legacy - urllib.request.urlretrieve API now properly supplies a constant non-zero - block_size as it did in Python 3.2 and 2.7. This matches the behavior of - urllib.request.URLopener.retrieve. +- Issue #5800: headers parameter of wsgiref.headers.Headers is now optional. + Initial patch by Pablo Torres Navarrete and SilentGhost. -- bpo-16431: Use the type information when constructing a Decimal subtype - from a Decimal argument. +- Issue #21781: ssl.RAND_add() now supports strings longer than 2 GB. -- bpo-15641: Clean up deprecated classes from importlib. Patch by Taras - Lyapun. +- Issue #21679: Prevent extraneous fstat() calls during open(). Patch by + Bohuslav Kabrda. -- bpo-16350: zlib.decompressobj().decompress() now accumulates data from - successive calls after EOF in unused_data, instead of only saving the - argument to the last call. decompressobj().flush() now correctly sets - unused_data and unconsumed_tail. A bug in the handling of MemoryError when - setting the unconsumed_tail attribute has also been fixed. Patch by Serhiy - Storchaka. +- Issue #21863: cProfile now displays the module name of C extension functions, + in addition to their own name. -- bpo-12759: sre_parse now raises a proper error when the name of the group - is missing. Initial patch by Serhiy Storchaka. +- Issue #11453: asyncore: emit a ResourceWarning when an unclosed file_wrapper + object is destroyed. The destructor now closes the file if needed. The + close() method can now be called twice: the second call does nothing. -- bpo-16152: fix tokenize to ignore whitespace at the end of the code when - no newline is found. Patch by Ned Batchelder. +- Issue #21858: Better handling of Python exceptions in the sqlite3 module. -- bpo-16284: Prevent keeping unnecessary references to worker functions in - concurrent.futures ThreadPoolExecutor. +- Issue #21476: Make sure the email.parser.BytesParser TextIOWrapper is + discarded after parsing, so the input file isn't unexpectedly closed. -- bpo-16230: Fix a crash in select.select() when one of the lists changes - size while iterated on. Patch by Serhiy Storchaka. +- Issue #20295: imghdr now recognizes OpenEXR format images. -- bpo-16228: Fix a crash in the json module where a list changes size while - it is being encoded. Patch by Serhiy Storchaka. +- Issue #21729: Used the "with" statement in the dbm.dumb module to ensure + files closing. Patch by Claudiu Popa. -- bpo-16351: New function gc.get_stats() returns per-generation collection - statistics. +- Issue #21491: socketserver: Fix a race condition in child processes reaping. -- bpo-14897: Enhance error messages of struct.pack and struct.pack_into. - Patch by Matti Mäki. +- Issue #21719: Added the ``st_file_attributes`` field to os.stat_result on + Windows. -- bpo-16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions. - Patch by Serhiy Storchaka. +- Issue #21832: Require named tuple inputs to be exact strings. -- bpo-12890: cgitb no longer prints spurious

tags in text mode when the - logdir option is specified. +- Issue #21722: The distutils "upload" command now exits with a non-zero + return code when uploading fails. Patch by Martin Dengler. -- bpo-16307: Fix multiprocessing.Pool.map_async not calling its callbacks. - Patch by Janne Karila. +- Issue #21723: asyncio.Queue: support any type of number (ex: float) for the + maximum size. Patch written by Vajrasky Kok. -- bpo-16305: Fix a segmentation fault occurring when interrupting - math.factorial. +- Issue #21711: support for "site-python" directories has now been removed + from the site module (it was deprecated in 3.4). -- bpo-16116: Fix include and library paths to be correct when building C - extensions in venvs. +- Issue #17552: new socket.sendfile() method allowing a file to be sent over a + socket by using high-performance os.sendfile() on UNIX. + Patch by Giampaolo Rodola'. -- bpo-16245: Fix the value of a few entities in html.entities.html5. +- Issue #18039: dbm.dump.open() now always creates a new database when the + flag has the value 'n'. Patch by Claudiu Popa. -- bpo-16301: Fix the localhost verification in urllib/request.py for - ``file://`` urls. +- Issue #21326: Add a new is_closed() method to asyncio.BaseEventLoop. + run_forever() and run_until_complete() methods of asyncio.BaseEventLoop now + raise an exception if the event loop was closed. -- bpo-16250: Fix the invocations of URLError which had misplaced filename - attribute for exception. +- Issue #21766: Prevent a security hole in CGIHTTPServer by URL unquoting paths + before checking for a CGI script at that path. -- bpo-10836: Fix exception raised when file not found in urlretrieve Initial - patch by Ezio Melotti. +- Issue #21310: Fixed possible resource leak in failed open(). -- bpo-14398: Fix size truncation and overflow bugs in the bz2 module. +- Issue #21256: Printout of keyword args should be in deterministic order in + a mock function call. This will help to write better doctests. -- bpo-12692: Fix resource leak in urllib.request when talking to an HTTP - server that does not include a ``Connection: close`` header in its - responses. +- Issue #21677: Fixed chaining nonnormalized exceptions in io close() methods. -- bpo-12034: Fix bogus caching of result in check_GetFinalPathNameByHandle. - Patch by Atsuo Ishimoto. +- Issue #11709: Fix the pydoc.help function to not fail when sys.stdin is not a + valid file. -- Improve performance of `lzma.LZMAFile` (see also issue #16034). +- Issue #21515: tempfile.TemporaryFile now uses os.O_TMPFILE flag is available. -- bpo-16220: wsgiref now always calls close() on an iterable response. Patch - by Brent Tubbs. +- Issue #13223: Fix pydoc.writedoc so that the HTML documentation for methods + that use 'self' in the example code is generated correctly. -- bpo-16270: urllib may hang when used for retrieving files via FTP by using - a context manager. Patch by Giampaolo Rodola'. +- Issue #21463: In urllib.request, fix pruning of the FTP cache. -- bpo-16461: Wave library should be able to deal with 4GB wav files, and - sample rate of 44100 Hz. +- Issue #21618: The subprocess module could fail to close open fds that were + inherited by the calling process and already higher than POSIX resource + limits would otherwise allow. On systems with a functioning /proc/self/fd + or /dev/fd interface the max is now ignored and all fds are closed. -- bpo-16176: Properly identify Windows 8 via platform.platform() +- Issue #20383: Introduce importlib.util.module_from_spec() as the preferred way + to create a new module. -- bpo-16088: BaseHTTPRequestHandler's send_error method includes a Content- - Length header in its response now. Patch by Antoine Pitrou. +- Issue #21552: Fixed possible integer overflow of too long string lengths in + the tkinter module on 64-bit platforms. -- bpo-16114: The subprocess module no longer provides a misleading error - message stating that args[0] did not exist when either the cwd or - executable keyword arguments specified a path that did not exist. +- Issue #14315: The zipfile module now ignores extra fields in the central + directory that are too short to be parsed instead of letting a struct.unpack + error bubble up as this "bad data" appears in many real world zip files in + the wild and is ignored by other zip tools. -- bpo-16169: Fix ctypes.WinError()'s confusion between errno and winerror. +- Issue #13742: Added "key" and "reverse" parameters to heapq.merge(). + (First draft of patch contributed by Simon Sapin.) -- bpo-16110: logging.fileConfig now accepts a pre-initialised ConfigParser - instance. +- Issue #21402: tkinter.ttk now works when default root window is not set. -- bpo-1492704: shutil.copyfile() raises a distinct SameFileError now if - source and destination are the same file. Patch by Atsuo Ishimoto. +- Issue #3015: _tkinter.create() now creates tkapp object with wantobject=1 by + default. -- bpo-13896: Make shelf instances work with 'with' as context managers. - Original patch by Filip Gruszczyński. +- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particular + it supports reverse() and negative indices. Original patch by Claudiu Popa. -- bpo-15417: Add support for csh and fish in venv activation scripts. +- Issue #18807: If copying (no symlinks) specified for a venv, then the python + interpreter aliases (python, python3) are now created by copying rather than + symlinking. -- bpo-14377: ElementTree.write and some of the module-level functions have a - new parameter - *short_empty_elements*. It controls how elements with no - contents are emitted. +- Issue #20197: Added support for the WebP image type in the imghdr module. + Patch by Fabrice Aneche and Claudiu Popa. -- bpo-16089: Allow ElementTree.TreeBuilder to work again with a non-Element - element_factory (fixes a regression in SimpleTAL). +- Issue #21513: Speedup some properties of IP addresses (IPv4Address, + IPv6Address) such as .is_private or .is_multicast. -- bpo-9650: List commonly used format codes in time.strftime and - time.strptime docsttings. Original patch by Mike Hoy. +- Issue #21137: Improve the repr for threading.Lock() and its variants + by showing the "locked" or "unlocked" status. Patch by Berker Peksag. -- bpo-15452: logging configuration socket listener now has a verify option - that allows an application to apply a verification function to the - received configuration data before it is acted upon. +- Issue #21538: The plistlib module now supports loading of binary plist files + when reference or offset size is not a power of two. -- bpo-16034: Fix performance regressions in the new `bz2.BZ2File` - implementation. Initial patch by Serhiy Storchaka. +- Issue #21455: Add a default backlog to socket.listen(). -- `pty.spawn()` now returns the child process status returned by - `os.waitpid()`. +- Issue #21525: Most Tkinter methods which accepted tuples now accept lists too. -- bpo-15756: `subprocess.poll()` now properly handles `errno.ECHILD` to - return a returncode of 0 when the child has already exited or cannot be - waited on. +- Issue #22166: With the assistance of a new internal _codecs._forget_codec + helping function, test_codecs now clears the encoding caches to avoid the + appearance of a reference leak -- bpo-15323: Improve failure message of `Mock.assert_called_once_with()`. +- Issue #22236: Tkinter tests now don't reuse default root window. New root + window is created for every test class. -- bpo-16064: ``unittest -m`` claims executable is "python", not "python3". +- Issue #10744: Fix PEP 3118 format strings on ctypes objects with a nontrivial + shape. -- bpo-12376: Pass on parameters in `TextTestResult.__init__()` super call. +- Issue #20826: Optimize ipaddress.collapse_addresses(). -- bpo-15222: Insert blank line after each message in mbox mailboxes. +- Issue #21487: Optimize ipaddress.summarize_address_range() and + ipaddress.{IPv4Network,IPv6Network}.subnets(). -- bpo-16013: Fix `csv.Reader` parsing issue with ending quote characters. - Patch by Serhiy Storchaka. +- Issue #21486: Optimize parsing of netmasks in ipaddress.IPv4Network and + ipaddress.IPv6Network. -- bpo-15421: Fix an OverflowError in `Calendar.itermonthdates()` after - `datetime.MAXYEAR`. Patch by Cédric Krier. +- Issue #13916: Disallowed the surrogatepass error handler for non UTF-\* + encodings. -- bpo-16112: platform.architecture does not correctly escape argument to - /usr/bin/file. Patch by David Benjamin. +- Issue #20998: Fixed re.fullmatch() of repeated single character pattern + with ignore case. Original patch by Matthew Barnett. -- bpo-15970: `xml.etree.ElementTree` now serializes correctly the empty HTML - elements 'meta' and 'param'. +- Issue #21075: fileinput.FileInput now reads bytes from standard stream if + binary mode is specified. Patch by Sam Kimbrel. -- bpo-15842: The `SocketIO.{readable,writable,seekable}` methods now raise - ValueError when the file-like object is closed. Patch by Alessandro - Moura. +- Issue #19775: Add a samefile() method to pathlib Path objects. Initial + patch by Vajrasky Kok. -- bpo-15876: Fix a refleak in the `curses` module: window.encoding. +- Issue #21226: Set up modules properly in PyImport_ExecCodeModuleObject + (and friends). -- bpo-15881: Fix `atexit` hook in `multiprocessing`. Original patch by - Chris McDonough. +- Issue #21398: Fix a unicode error in the pydoc pager when the documentation + contains characters not encodable to the stdout encoding. -- bpo-15841: The readable(), writable() and seekable() methods of - `io.BytesIO` and `io.StringIO` objects now raise ValueError when the - object has been closed. Patch by Alessandro Moura. +- Issue #16531: ipaddress.IPv4Network and ipaddress.IPv6Network now accept + an (address, netmask) tuple argument, so as to easily construct network + objects from existing addresses. -- bpo-15447: Use `subprocess.DEVNULL` in webbrowser, instead of opening - `os.devnull` explicitly and leaving it open. +- Issue #21156: importlib.abc.InspectLoader.source_to_code() is now a + staticmethod. -- bpo-15509: `webbrowser.UnixBrowser` no longer passes empty arguments to - Popen when ``%action`` substitutions produce empty strings. +- Issue #21424: Simplified and optimized heaqp.nlargest() and nmsmallest() + to make fewer tuple comparisons. -- bpo-12776: Call `argparse` type function (specified by add_argument) only - once. Before, the type function was called twice in the case where the - default was specified and the argument was given as well. This was - especially problematic for the FileType type, as a default file would - always be opened, even if a file argument was specified on the command - line. (See also: bpo-11839) +- Issue #21396: Fix TextIOWrapper(..., write_through=True) to not force a + flush() on the underlying binary stream. Patch by akira. -- bpo-15906: Fix a regression in argparse caused by the preceding change, - when ``action='append'``, ``type='str'`` and ``default=[]``. +- Issue #18314: Unlink now removes junctions on Windows. Patch by Kim Gräsman -- bpo-16113: Added sha3 module based on the Keccak reference implementation - 3.2. The `hashlib` module has four additional hash algorithms: `sha3_224`, - `sha3_256`, `sha3_384` and `sha3_512`. As part of the patch some common - code was moved from _hashopenssl.c to hashlib.h. +- Issue #21088: Bugfix for curses.window.addch() regression in 3.4.0. + In porting to Argument Clinic, the first two arguments were reversed. -- ctypes.call_commethod was removed, since its only usage was in the defunct - samples directory. +- Issue #21407: _decimal: The module now supports function signatures. -- bpo-16692: Added TLSv1.1 and TLSv1.2 support for the ssl modules. +- Issue #10650: Remove the non-standard 'watchexp' parameter from the + Decimal.quantize() method in the Python version. It had never been + present in the C version. -- bpo-16832: add abc.get_cache_token() to expose cache validity checking - support in ABCMeta. +- Issue #21469: Reduced the risk of false positives in robotparser by + checking to make sure that robots.txt has been read or does not exist + prior to returning True in can_fetch(). -IDLE ----- +- Issue #19414: Have the OrderedDict mark deleted links as unusable. + This gives an early failure if the link is deleted during iteration. -- bpo-18429: Format / Format Paragraph, now works when comment blocks are - selected. As with text blocks, this works best when the selection only - includes complete lines. +- Issue #21421: Add __slots__ to the MappingViews ABC. + Patch by Josh Rosenberg. -- bpo-18226: Add docstrings and unittests for FormatParagraph.py. Original - patches by Todd Rovito and Phil Webster. +- Issue #21101: Eliminate double hashing in the C speed-up code for + collections.Counter(). -- bpo-18279: Format - Strip trailing whitespace no longer marks a file as - changed when it has not been changed. This fix followed the addition of a - test file originally written by Phil Webster (the issue's main goal). +- Issue #21321: itertools.islice() now releases the reference to the source + iterator when the slice is exhausted. Patch by Anton Afanasyev. -- bpo-7136: In the Idle File menu, "New Window" is renamed "New File". Patch - by Tal Einat, Roget Serwy, and Todd Rovito. +- Issue #21057: TextIOWrapper now allows the underlying binary stream's + read() or read1() method to return an arbitrary bytes-like object + (such as a memoryview). Patch by Nikolaus Rath. -- Remove dead imports of imp. +- Issue #20951: SSLSocket.send() now raises either SSLWantReadError or + SSLWantWriteError on a non-blocking socket if the operation would block. + Previously, it would return 0. Patch by Nikolaus Rath. -- bpo-18196: Avoid displaying spurious SystemExit tracebacks. +- Issue #13248: removed previously deprecated asyncore.dispatcher __getattr__ + cheap inheritance hack. -- bpo-5492: Avoid traceback when exiting IDLE caused by a race condition. +- Issue #9815: assertRaises now tries to clear references to local variables + in the exception's traceback. -- bpo-17511: Keep IDLE find dialog open after clicking "Find Next". Original - patch by Sarah K. +- Issue #19940: ssl.cert_time_to_seconds() now interprets the given time + string in the UTC timezone (as specified in RFC 5280), not the local + timezone. -- bpo-18055: Move IDLE off of imp and on to importlib. +- Issue #13204: Calling sys.flags.__new__ would crash the interpreter, + now it raises a TypeError. -- bpo-15392: Create a unittest framework for IDLE. Initial patch by - Rajagopalasarma Jayakrishnan. See Lib/idlelib/idle_test/README.txt for how - to run Idle tests. +- Issue #19385: Make operations on a closed dbm.dumb database always raise the + same exception. -- bpo-14146: Highlight source line while debugging on Windows. +- Issue #21207: Detect when the os.urandom cached fd has been closed or + replaced, and open it anew. -- bpo-17838: Allow sys.stdin to be reassigned. +- Issue #21291: subprocess's Popen.wait() is now thread safe so that + multiple threads may be calling wait() or poll() on a Popen instance + at the same time without losing the Popen.returncode value. -- bpo-13495: Avoid loading the color delegator twice in IDLE. +- Issue #21127: Path objects can now be instantiated from str subclass + instances (such as ``numpy.str_``). -- bpo-17798: Allow IDLE to edit new files when specified on command line. +- Issue #15002: urllib.response object to use _TemporaryFileWrapper (and + _TemporaryFileCloser) facility. Provides a better way to handle file + descriptor close. Patch contributed by Christian Theune. -- bpo-14735: Update IDLE docs to omit "Control-z on Windows". +- Issue #12220: mindom now raises a custom ValueError indicating it doesn't + support spaces in URIs instead of letting a 'split' ValueError bubble up. -- bpo-17532: Always include Options menu for IDLE on OS X. Patch by - Guilherme Simões. +- Issue #21068: The ssl.PROTOCOL* constants are now enum members. -- bpo-17585: Fixed IDLE regression. Now closes when using exit() or quit(). +- Issue #21276: posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd. -- bpo-17657: Show full Tk version in IDLE's about dialog. Patch by Todd - Rovito. +- Issue #21262: New method assert_not_called for Mock. + It raises AssertionError if the mock has been called. -- bpo-17613: Prevent traceback when removing syntax colorizer in IDLE. +- Issue #21238: New keyword argument `unsafe` to Mock. It raises + `AttributeError` incase of an attribute startswith assert or assret. -- bpo-1207589: Backwards-compatibility patch for right-click menu in IDLE. +- Issue #20896: ssl.get_server_certificate() now uses PROTOCOL_SSLv23, not + PROTOCOL_SSLv3, for maximum compatibility. -- bpo-16887: IDLE now accepts Cancel in tabify/untabify dialog box. +- Issue #21239: patch.stopall() didn't work deterministically when the same + name was patched more than once. -- bpo-17625: In IDLE, close the replace dialog after it is used. +- Issue #21203: Updated fileConfig and dictConfig to remove inconsistencies. + Thanks to Jure Koren for the patch. -- bpo-14254: IDLE now handles readline correctly across shell restarts. +- Issue #21222: Passing name keyword argument to mock.create_autospec now + works. -- bpo-17614: IDLE no longer raises exception when quickly closing a file. +- Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX. -- bpo-6698: IDLE now opens just an editor window when configured to do so. +- Issue #17498: Some SMTP servers disconnect after certain errors, violating + strict RFC conformance. Instead of losing the error code when we issue the + subsequent RSET, smtplib now returns the error code and defers raising the + SMTPServerDisconnected error until the next command is issued. -- bpo-8900: Using keyboard shortcuts in IDLE to open a file no longer raises - an exception. +- Issue #17826: setting an iterable side_effect on a mock function created by + create_autospec now works. Patch by Kushal Das. -- bpo-6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo. +- Issue #7776: Fix ``Host:`` header and reconnection when using + http.client.HTTPConnection.set_tunnel(). Patch by Nikolaus Rath. -- bpo-17114: IDLE now uses non-strict config parser. +- Issue #20968: unittest.mock.MagicMock now supports division. + Patch by Johannes Baiter. -- bpo-9290: In IDLE the sys.std* streams now implement io.TextIOBase - interface and support all mandatory methods and properties. +- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in + JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido + Vranken. -- bpo-5066: Update IDLE docs. Patch by Todd Rovito. +- Issue #21169: getpass now handles non-ascii characters that the + input stream encoding cannot encode by re-encoding using the + replace error handler. -- bpo-16829: IDLE printing no longer fails if there are spaces or other - special characters in the file path. +- Issue #21171: Fixed undocumented filter API of the rot13 codec. + Patch by Berker Peksag. -- bpo-16491: IDLE now prints chained exception tracebacks. +- Issue #20539: Improved math.factorial error message for large positive inputs + and changed exception type (OverflowError -> ValueError) for large negative + inputs. -- bpo-16819: IDLE method completion now correctly works for bytes literals. +- Issue #21172: isinstance check relaxed from dict to collections.Mapping. -- bpo-16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by - Roger Serwy. +- Issue #21155: asyncio.EventLoop.create_unix_server() now raises a ValueError + if path and sock are specified at the same time. -- bpo-16511: Use default IDLE width and height if config param is not valid. - Patch Serhiy Storchaka. +- Issue #21136: Avoid unnecessary normalization of Fractions resulting from + power and other operations. Patch by Raymond Hettinger. -- bpo-1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu. - Patch by Todd Rovito. +- Issue #17621: Introduce importlib.util.LazyLoader. -- bpo-16123: IDLE - deprecate running without a subprocess. Patch by Roger - Serwy. +- Issue #21076: signal module constants were turned into enums. + Patch by Giampaolo Rodola'. -Tests ------ +- Issue #20636: Improved the repr of Tkinter widgets. -- bpo-1666318: Add a test that shutil.copytree() retains directory - permissions. Patch by Catherine Devlin. +- Issue #19505: The items, keys, and values views of OrderedDict now support + reverse iteration using reversed(). -- bpo-18273: move the tests in Lib/test/json_tests to Lib/test/test_json and - make them discoverable by unittest. Patch by Zachary Ware. +- Issue #21149: Improved thread-safety in logging cleanup during interpreter + shutdown. Thanks to Devin Jeanpierre for the patch. -- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger). +- Issue #21058: Fix a leak of file descriptor in + :func:`tempfile.NamedTemporaryFile`, close the file descriptor if + :func:`io.open` fails -- bpo-18396: Fix spurious test failure in test_signal on Windows when - faulthandler is enabled (Patch by Jeremy Kloth) +- Issue #21200: Return None from pkgutil.get_loader() when __spec__ is missing. -- bpo-17046: Fix broken test_executable_without_cwd in test_subprocess. +- Issue #21013: Enhance ssl.create_default_context() when used for server side + sockets to provide better security by default. -- bpo-15415: Add new temp_dir() and change_cwd() context managers to - test.support, and refactor temp_cwd() to use them. Patch by Chris - Jerdonek. +- Issue #20145: `assertRaisesRegex` and `assertWarnsRegex` now raise a + TypeError if the second argument is not a string or compiled regex. -- bpo-15494: test.support is now a package rather than a module (Initial - patch by Indra Talip) +- Issue #20633: Replace relative import by absolute import. -- bpo-17944: test_zipfile now discoverable and uses subclassing to generate - tests for different compression types. Fixed a bug with skipping some - tests due to use of exhausted iterators. +- Issue #20980: Stop wrapping exception when using ThreadPool. -- bpo-18266: test_largefile now works with unittest test discovery and - supports running only selected tests. Patch by Zachary Ware. +- Issue #21082: In os.makedirs, do not set the process-wide umask. Note this + changes behavior of makedirs when exist_ok=True. -- bpo-17767: test_locale now works with unittest test discovery. Original - patch by Zachary Ware. +- Issue #20990: Fix issues found by pyflakes for multiprocessing. -- bpo-18375: Assume --randomize when --randseed is used for running the - testsuite. +- Issue #21015: SSL contexts will now automatically select an elliptic + curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise + default to "prime256v1". -- bpo-11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé. +- Issue #21000: Improve the command-line interface of json.tool. -- bpo-18207: Fix test_ssl for some versions of OpenSSL that ignore seconds - in ASN1_TIME fields. +- Issue #20995: Enhance default ciphers used by the ssl module to enable + better security and prioritize perfect forward secrecy. -- bpo-18094: test_uuid no longer reports skipped tests as passed. +- Issue #20884: Don't assume that __file__ is defined on importlib.__init__. -- bpo-17992: Add timeouts to asyncore and asynchat tests so that they won't - accidentally hang. +- Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests. -- bpo-17833: Fix test_gdb failures seen on machines where debug symbols for - glibc are available (seen on PPC64 Linux). +- Issue #20627: xmlrpc.client.ServerProxy is now a context manager. -- bpo-7855: Add tests for ctypes/winreg for issues found in IronPython. - Initial patch by Dino Viehland. +- Issue #19165: The formatter module now raises DeprecationWarning instead of + PendingDeprecationWarning. -- bpo-11078: test___all__ now checks for duplicates in __all__. Initial - patch by R. David Murray. +- Issue #13936: Remove the ability of datetime.time instances to be considered + false in boolean contexts. -- bpo-17712: Fix test_gdb failures on Ubuntu 13.04. +- Issue #18931: selectors module now supports /dev/poll on Solaris. + Patch by Giampaolo Rodola'. -- bpo-17835: Fix test_io when the default OS pipe buffer size is larger than - one million bytes. +- Issue #19977: When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale), + :py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the + ``surrogateescape`` error handler, instead of the ``strict`` error handler. -- bpo-17065: Use process-unique key for winreg tests to avoid failures if - test is run multiple times in parallel (eg: on a buildbot host). +- Issue #20574: Implement incremental decoder for cp65001 code (Windows code + page 65001, Microsoft UTF-8). -- bpo-12820: add tests for the xml.dom.minicompat module. Patch by John - Chandler and Phil Connell. +- Issue #20879: Delay the initialization of encoding and decoding tables for + base32, ascii85 and base85 codecs in the base64 module, and delay the + initialization of the unquote_to_bytes() table of the urllib.parse module, to + not waste memory if these modules are not used. -- bpo-17691: test_univnewlines now works with unittest test discovery. Patch - by Zachary Ware. +- Issue #19157: Include the broadcast address in the usuable hosts for IPv6 + in ipaddress. -- bpo-17790: test_set now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #11599: When an external command (e.g. compiler) fails, distutils now + prints out the whole command line (instead of just the command name) if the + environment variable DISTUTILS_DEBUG is set. -- bpo-17789: test_random now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #4931: distutils should not produce unhelpful "error: None" messages + anymore. distutils.util.grok_environment_error is kept but doc-deprecated. -- bpo-17779: test_osx_env now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #20875: Prevent possible gzip "'read' is not defined" NameError. + Patch by Claudiu Popa. -- bpo-17766: test_iterlen now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #11558: ``email.message.Message.attach`` now returns a more + useful error message if ``attach`` is called on a message for which + ``is_multipart`` is False. -- bpo-17690: test_time now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #20283: RE pattern methods now accept the string keyword parameters + as documented. The pattern and source keyword parameters are left as + deprecated aliases. -- bpo-17692: test_sqlite now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #20778: Fix modulefinder to work with bytecode-only modules. -- bpo-11995: test_pydoc doesn't import all sys.path modules anymore. +- Issue #20791: copy.copy() now doesn't make a copy when the input is + a bytes object. Initial patch by Peter Otten. -- bpo-17448: test_sax now skips if there are no xml parsers available - instead of raising an ImportError. +- Issue #19748: On AIX, time.mktime() now raises an OverflowError for year + outsize range [1902; 2037]. -- bpo-11420: make test suite pass with -B/DONTWRITEBYTECODE set. Initial - patch by Thomas Wouters. +- Issue #19573: inspect.signature: Use enum for parameter kind constants. -- bpo-10652: make tcl/tk tests run after __all__ test, patch by Zachary - Ware. +- Issue #20726: inspect.signature: Make Signature and Parameter picklable. -- bpo-11963: remove human verification from test_parser and test_subprocess. +- Issue #17373: Add inspect.Signature.from_callable method. -- bpo-11732: add a new suppress_crash_popup() context manager to - test.support that disables crash popups on Windows and use it in - test_faulthandler and test_capi. +- Issue #20378: Improve repr of inspect.Signature and inspect.Parameter. -- bpo-13898: test_ssl no longer prints a spurious stack trace on Ubuntu. +- Issue #20816: Fix inspect.getcallargs() to raise correct TypeError for + missing keyword-only arguments. Patch by Jeremiah Lowin. -- bpo-17283: Share code between `__main__.py` and `regrtest.py` in - `Lib/test`. +- Issue #20817: Fix inspect.getcallargs() to fail correctly if more + than 3 arguments are missing. Patch by Jeremiah Lowin. -- bpo-17249: convert a test in test_capi to use unittest and reap threads. +- Issue #6676: Ensure a meaningful exception is raised when attempting + to parse more than one XML document per pyexpat xmlparser instance. + (Original patches by Hirokazu Yamamoto and Amaury Forgeot d'Arc, with + suggested wording by David Gutteridge) -- bpo-17107: Test client-side SNI support in urllib.request thanks to the - new server-side SNI support in the ssl module. Initial patch by Daniel - Black. +- Issue #21117: Fix inspect.signature to better support functools.partial. + Due to the specifics of functools.partial implementation, + positional-or-keyword arguments passed as keyword arguments become + keyword-only. -- bpo-17041: Fix testing when Python is configured with the --without-doc- - strings. +- Issue #20334: inspect.Signature and inspect.Parameter are now hashable. + Thanks to Antony Lee for bug reports and suggestions. -- bpo-16923: Fix ResourceWarnings in test_ssl. +- Issue #15916: doctest.DocTestSuite returns an empty unittest.TestSuite instead + of raising ValueError if it finds no tests -- bpo-15539: Added regression tests for Tools/scripts/pindent.py. +- Issue #21209: Fix asyncio.tasks.CoroWrapper to workaround a bug + in yield-from implementation in CPythons prior to 3.4.1. -- bpo-17479: test_io now works with unittest test discovery. Patch by - Zachary Ware. +- asyncio: Add gi_{frame,running,code} properties to CoroWrapper + (upstream issue #163). -- bpo-17066: test_robotparser now works with unittest test discovery. Patch - by Zachary Ware. +- Issue #21311: Avoid exception in _osx_support with non-standard compiler + configurations. Patch by John Szakmeister. -- bpo-17334: test_index now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #11571: Ensure that the turtle window becomes the topmost window + when launched on OS X. -- bpo-17333: test_imaplib now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #21801: Validate that __signature__ is None or an instance of Signature. -- bpo-17082: test_dbm* now work with unittest test discovery. Patch by - Zachary Ware. +- Issue #21923: Prevent AttributeError in distutils.sysconfig.customize_compiler + due to possible uninitialized _config_vars. -- bpo-17079: test_ctypes now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #21323: Fix http.server to again handle scripts in CGI subdirectories, + broken by the fix for security issue #19435. Patch by Zach Byrne. -- bpo-17304: test_hash now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #22733: Fix ffi_prep_args not zero-extending argument values correctly + on 64-bit Windows. -- bpo-17303: test_future* now work with unittest test discovery. Patch by - Zachary Ware. +- Issue #23302: Default to TCP_NODELAY=1 upon establishing an HTTPConnection. + Removed use of hard-coded MSS as it's an optimization that's no longer needed + with Nagle disabled. -- bpo-17163: test_file now works with unittest test discovery. Patch by - Zachary Ware. +IDLE +---- -- bpo-16925: test_configparser now works with unittest test discovery. Patch - by Zachary Ware. +- Issue #20577: Configuration of the max line length for the FormatParagraph + extension has been moved from the General tab of the Idle preferences dialog + to the FormatParagraph tab of the Config Extensions dialog. + Patch by Tal Einat. -- bpo-16918: test_codecs now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #16893: Update Idle doc chapter to match current Idle and add new + information. -- bpo-16919: test_crypt now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #3068: Add Idle extension configuration dialog to Options menu. + Changes are written to HOME/.idlerc/config-extensions.cfg. + Original patch by Tal Einat. -- bpo-16910: test_bytes, test_unicode, and test_userstring now work with - unittest test discovery. Patch by Zachary Ware. +- Issue #16233: A module browser (File : Class Browser, Alt+C) requires an + editor window with a filename. When Class Browser is requested otherwise, + from a shell, output window, or 'Untitled' editor, Idle no longer displays + an error box. It now pops up an Open Module box (Alt+M). If a valid name + is entered and a module is opened, a corresponding browser is also opened. -- bpo-16905: test_warnings now works with unittest test discovery. Initial - patch by Berker Peksag. +- Issue #4832: Save As to type Python files automatically adds .py to the + name you enter (even if your system does not display it). Some systems + automatically add .txt when type is Text files. -- bpo-16898: test_bufio now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #21986: Code objects are not normally pickled by the pickle module. + To match this, they are no longer pickled when running under Idle. -- bpo-16888: test_array now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #17390: Adjust Editor window title; remove 'Python', + move version to end. -- bpo-16896: test_asyncore now works with unittest test discovery. Patch by - Zachary Ware. +- Issue #14105: Idle debugger breakpoints no longer disappear + when inserting or deleting lines. -- bpo-16897: test_bisect now works with unittest test discovery. Initial - patch by Zachary Ware. +- Issue #17172: Turtledemo can now be run from Idle. + Currently, the entry is on the Help menu, but it may move to Run. + Patch by Ramchandra Apt and Lita Cho. -- bpo-16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath - now work with unittest test discovery. Patch by Zachary Ware. +- Issue #21765: Add support for non-ascii identifiers to HyperParser. -- bpo-16748: test_heapq now works with unittest test discovery. +- Issue #21940: Add unittest for WidgetRedirector. Initial patch by Saimadhav + Heblikar. -- bpo-10646: Tests rearranged for os.samefile/samestat to check for not just - symlinks but also hard links. +- Issue #18592: Add unittest for SearchDialogBase. Patch by Phil Webster. -- bpo-15302: Switch regrtest from using getopt to using argparse. +- Issue #21694: Add unittest for ParenMatch. Patch by Saimadhav Heblikar. -- bpo-15324: Fix regrtest parsing of --fromfile, --match, and --randomize - options. +- Issue #21686: add unittest for HyperParser. Original patch by Saimadhav + Heblikar. -- bpo-16702: test_urllib2_localnet tests now correctly ignores proxies for - localhost tests. +- Issue #12387: Add missing upper(lower)case versions of default Windows key + bindings for Idle so Caps Lock does not disable them. Patch by Roger Serwy. -- bpo-16664: Add regression tests for glob's behaviour concerning entries - starting with a ".". Patch by Sebastian Kreft. +- Issue #21695: Closing a Find-in-files output window while the search is + still in progress no longer closes Idle. -- bpo-13390: The ``-R`` option to regrtest now also checks for memory - allocation leaks, using :func:`sys.getallocatedblocks()`. +- Issue #18910: Add unittest for textView. Patch by Phil Webster. -- bpo-16559: Add more tests for the json module, including some from the - official test suite at json.org. Patch by Serhiy Storchaka. +- Issue #18292: Add unittest for AutoExpand. Patch by Saihadhav Heblikar. -- bpo-16661: Fix the `os.getgrouplist()` test by not assuming that it gives - the same output as :command:`id -G`. +- Issue #18409: Add unittest for AutoComplete. Patch by Phil Webster. -- bpo-16115: Add some tests for the executable argument to - subprocess.Popen(). Initial patch by Kushal Das. +- Issue #21477: htest.py - Improve framework, complete set of tests. + Patches by Saimadhav Heblikar -- bpo-16126: PyErr_Format format mismatch in _testcapimodule.c. Patch by - Serhiy Storchaka. +- Issue #18104: Add idlelib/idle_test/htest.py with a few sample tests to begin + consolidating and improving human-validated tests of Idle. Change other files + as needed to work with htest. Running the module as __main__ runs all tests. -- bpo-15304: Fix warning message when `os.chdir()` fails inside - `test.support.temp_cwd()`. Patch by Chris Jerdonek. +- Issue #21139: Change default paragraph width to 72, the PEP 8 recommendation. -- bpo-15802: Fix test logic in `TestMaildir.test_create_tmp()`. Patch by - Serhiy Storchaka. +- Issue #21284: Paragraph reformat test passes after user changes reformat width. -- bpo-15557: Added a test suite for the webbrowser module, thanks to Anton - Barkovsky. +- Issue #17654: Ensure IDLE menus are customized properly on OS X for + non-framework builds and for all variants of Tk. -- bpo-16698: Skip posix test_getgroups when built with OS X deployment - target prior to 10.6. +- Issue #23180: Rename IDLE "Windows" menu item to "Window". + Patch by Al Sweigart. Build ----- -- bpo-16067: Add description into MSI file to replace installer's temporary - name. +- Issue #15506: Use standard PKG_PROG_PKG_CONFIG autoconf macro in the configure + script. -- bpo-18257: Fix readlink usage in python-config. Install the python - version again on Darwin. +- Issue #22935: Allow the ssl module to be compiled if openssl doesn't support + SSL 3. -- bpo-18481: Add C coverage reporting with gcov and lcov. A new make target - "coverage- report" creates an instrumented Python build, runs unit tests - and creates a HTML. The report can be updated with "make coverage-lcov". +- Issue #22592: Drop support of the Borland C compiler to build Python. The + distutils module still supports it to build extensions. -- bpo-17845: Clarified the message printed when some module are not built. +- Issue #22591: Drop support of MS-DOS, especially of the DJGPP compiler + (MS-DOS port of GCC). -- bpo-18256: Compilation fix for recent AIX releases. Patch by David - Edelsohn. +- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by + Jonathan Hosmer. -- bpo-17547: In configure, explicitly pass -Wformat for the benefit for GCC - 4.8. +- Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas + Wagner. -- bpo-15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1 - on Windows. +- Issue #21958: Define HAVE_ROUND when building with Visual Studio 2013 and + above. Patch by Zachary Turner. -- bpo-17591: Use lowercase filenames when including Windows header files. - Patch by Roumen Petrov. +- Issue #18093: the programs that embed the CPython runtime are now in a + separate "Programs" directory, rather than being kept in the Modules + directory. -- bpo-17550: Fix the --enable-profiling configure switch. +- Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/ + now display special message when and only when there are failures. -- bpo-17425: Build with openssl 1.0.1d on Windows. +- Issue #21141: The Windows build process no longer attempts to find Perl, + instead relying on OpenSSL source being configured and ready to build. The + ``PCbuild\build_ssl.py`` script has been re-written and re-named to + ``PCbuild\prepare_ssl.py``, and takes care of configuring OpenSSL source + for both 32 and 64 bit platforms. OpenSSL sources obtained from + svn.python.org will always be pre-configured and ready to build. -- bpo-16754: Fix the incorrect shared library extension on linux. Introduce - two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of - SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4. +- Issue #21037: Add a build option to enable AddressSanitizer support. -- bpo-5033: Fix building of the sqlite3 extension module when the SQLite - library version has "beta" in it. Patch by Andreas Pelme. +- Issue #19962: The Windows build process now creates "python.bat" in the + root of the source tree, which passes all arguments through to the most + recently built interpreter. -- bpo-17228: Fix building without pymalloc. +- Issue #21285: Refactor and fix curses configure check to always search + in a ncursesw directory. -- bpo-3718: Use AC_ARG_VAR to set MACHDEP in configure.ac. +- Issue #15234: For BerkelyDB and Sqlite, only add the found library and + include directories if they aren't already being searched. This avoids + an explicit runtime library dependency. -- bpo-16235: Implement python-config as a shell script. +- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates + Include/opcode.h from Lib/opcode.py if the latter gets any change. -- bpo-16769: Remove outdated Visual Studio projects. +- Issue #20644: OS X installer build support for documentation build changes + in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. -- bpo-17031: Fix running regen in cross builds. +- Issue #20022: Eliminate use of deprecated bundlebuilder in OS X builds. -- bpo-3754: fix typo in pthread AC_CACHE_VAL. +- Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build + solution. -- bpo-15484: Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds; use - _PYTHON_PROJECT_BASE in distutils/sysconfig.py. +- Issue #17095: Fix Modules/Setup *shared* support. -- Drop support for Windows 2000 (changeset e52df05b496a). +- Issue #21811: Anticipated fixes to support OS X versions > 10.9. -- bpo-17029: Let h2py search the multiarch system include directory. +- Issue #21166: Prevent possible segfaults and other random failures of + python --generate-posix-vars in pybuilddir.txt build target. -- bpo-16953: Fix socket module compilation on platforms with - HAVE_BROKEN_POLL. Patch by Jeffrey Armstrong. +- Issue #18096: Fix library order returned by python-config. -- bpo-16320: Remove redundant Makefile dependencies for strings and bytes. +- Issue #17219: Add library build dir for Python extension cross-builds. -- Cross compiling needs host and build settings. configure no longer creates - a broken PYTHON_FOR_BUILD variable when --build is missing. +- Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), + which will be used for the official release. -- Fix cross compiling issue in setup.py, ensure that lib_dirs and inc_dirs - are defined in cross compiling mode, too. +- Issue #21236: Build _msi.pyd with cabinet.lib instead of fci.lib -- bpo-16836: Enable IPv6 support even if IPv6 is disabled on the build host. +- Issue #17128: Use private version of OpenSSL for OS X 10.5+ installer. -- bpo-16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf +C API +----- -- bpo-16262: fix out-of-src-tree builds, if mercurial is not installed. +- Issue #14203: Remove obsolete support for view==NULL in PyBuffer_FillInfo(), + bytearray_getbuffer(), bytesiobuf_getbuffer() and array_buffer_getbuf(). + All functions now raise BufferError in that case. -- bpo-15298: ensure _sysconfigdata is generated in build directory, not - source directory. +- Issue #22445: PyBuffer_IsContiguous() now implements precise contiguity + tests, compatible with NumPy's NPY_RELAXED_STRIDES_CHECKING compilation + flag. Previously the function reported false negatives for corner cases. -- bpo-15833: Fix a regression in 3.3 that resulted in exceptions being - raised if importlib failed to write byte-compiled files. This affected - attempts to build Python out-of-tree from a read-only source directory. +- Issue #22079: PyType_Ready() now checks that statically allocated type has + no dynamically allocated bases. -- bpo-15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError - after 2801bf875a24 (see #15801). +- Issue #22453: Removed non-documented macro PyObject_REPR(). -- bpo-16135: Remove OS/2 support. +- Issue #18395: Rename ``_Py_char2wchar()`` to :c:func:`Py_DecodeLocale`, + rename ``_Py_wchar2char()`` to :c:func:`Py_EncodeLocale`, and document + these functions. -- bpo-15819: Make sure we can build Python out-of-tree from a read-only - source directory. (Somewhat related to issue #9860.) +- Issue #21233: Add new C functions: PyMem_RawCalloc(), PyMem_Calloc(), + PyObject_Calloc(), _PyObject_GC_Calloc(). bytes(int) is now using + ``calloc()`` instead of ``malloc()`` for large objects which is faster and + use less memory. -- bpo-15587: Enable Tk high-resolution text rendering on Macs with Retina - displays. Applies to Tkinter apps, such as IDLE, on OS X framework builds - linked with Cocoa Tk 8.5. +- Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets __file__ to + match what importlib does; this affects _frozen_importlib as well as any + module loaded using imp.init_frozen(). -- bpo-17161: make install now also installs a python3 man page. +Documentation +------------- -C API ------ +- Issue #19548: Update the codecs module documentation to better cover the + distinction between text encodings and other codecs, together with other + clarifications. Patch by Martin Panter. -- bpo-18351: Fix various issues in a function in importlib provided to help - PyImport_ExecCodeModuleWithPathnames() (and thus by extension - PyImport_ExecCodeModule() and PyImport_ExecCodeModuleEx()). +- Issue #22394: Doc/Makefile now supports ``make venv PYTHON=../python`` to + create a venv for generating the documentation, e.g., + ``make html PYTHON=venv/bin/python3``. -- bpo-9369: The types of `char*` arguments of PyObject_CallFunction() and - PyObject_CallMethod() now changed to `const char*`. Based on patches by - Jörg Müller and Lars Buitinck. +- Issue #21514: The documentation of the json module now refers to new JSON RFC + 7159 instead of obsoleted RFC 4627. -- bpo-17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now - expand their arguments once instead of multiple times. Patch written by - Illia Polosukhin. +- Issue #21777: The binary sequence methods on bytes and bytearray are now + documented explicitly, rather than assuming users will be able to derive + the expected behaviour from the behaviour of the corresponding str methods. -- bpo-17522: Add the PyGILState_Check() API. +- Issue #6916: undocument deprecated asynchat.fifo class. -- bpo-17327: Add PyDict_SetDefault. +- Issue #17386: Expanded functionality of the ``Doc/make.bat`` script to make + it much more comparable to ``Doc/Makefile``. -- bpo-16881: Fix Py_ARRAY_LENGTH macro for GCC < 3.1. +- Issue #21312: Update the thread_foobar.h template file to include newer + threading APIs. Patch by Jack McCracken. -- bpo-16505: Remove unused Py_TPFLAGS_INT_SUBCLASS. +- Issue #21043: Remove the recommendation for specific CA organizations and to + mention the ability to load the OS certificates. -- bpo-16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned - (unsigned long and unsigned int) to avoid an undefined behaviour with - Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is now - unsigned too (unsigned long, instead of long). +- Issue #20765: Add missing documentation for PurePath.with_name() and + PurePath.with_suffix(). -- bpo-16166: Add PY_LITTLE_ENDIAN and PY_BIG_ENDIAN macros and unified - endianness detection and handling. +- Issue #19407: New package installation and distribution guides based on + the Python Packaging Authority tools. Existing guides have been retained + as legacy links from the distutils docs, as they still contain some + required reference material for tool developers that isn't recorded + anywhere else. -Documentation -------------- +- Issue #19697: Document cases where __main__.__spec__ is None. -- bpo-23006: Improve the documentation and indexing of dict.__missing__. Add - an entry in the language datamodel special methods section. Revise and - index its discussion in the stdtypes mapping/dict section. +Tests +----- -- bpo-17701: Improving strftime documentation. +- Issue #18982: Add tests for CLI of the calendar module. -- bpo-18440: Clarify that `hash()` can truncate the value returned from an - object's custom `__hash__()` method. +- Issue #19548: Added some additional checks to test_codecs to ensure that + statements in the updated documentation remain accurate. Patch by Martin + Panter. -- bpo-17844: Add links to encoders and decoders for bytes-to-bytes codecs. +- Issue #22838: All test_re tests now work with unittest test discovery. -- bpo-14097: improve the "introduction" page of the tutorial. +- Issue #22173: Update lib2to3 tests to use unittest test discovery. -- bpo-17977: The documentation for the cadefault argument's default value in - urllib.request.urlopen() is fixed to match the code. +- Issue #16000: Convert test_curses to use unittest. -- bpo-6696: add documentation for the Profile objects, and improve - profile/cProfile docs. Patch by Tom Pinckney. +- Issue #21456: Skip two tests in test_urllib2net.py if _ssl module not + present. Patch by Remi Pointel. -- bpo-15940: Specify effect of locale on time functions. +- Issue #20746: Fix test_pdb to run in refleak mode (-R). Patch by Xavier + de Gaye. -- bpo-17538: Document XML vulnerabilties +- Issue #22060: test_ctypes has been somewhat cleaned up and simplified; it + now uses unittest test discovery to find its tests. -- bpo-16642: sched.scheduler timefunc initial default is time.monotonic. - Patch by Ramchandra Apte +- Issue #22104: regrtest.py no longer holds a reference to the suite of tests + loaded from test modules that don't define test_main(). -- bpo-17047: remove doubled words in docs and docstrings reported by Serhiy - Storchaka and Matthew Barnett. +- Issue #22111: Assorted cleanups in test_imaplib. Patch by Milan Oberkirch. -- bpo-15465: Document the versioning macros in the C API docs rather than - the standard library docs. Patch by Kushal Das. +- Issue #22002: Added ``load_package_tests`` function to test.support and used + it to implement/augment test discovery in test_asyncio, test_email, + test_importlib, test_json, and test_tools. -- bpo-16406: Combine the pages for uploading and registering to PyPI. +- Issue #21976: Fix test_ssl to accept LibreSSL version strings. Thanks + to William Orr. -- bpo-16403: Document how distutils uses the maintainer field in PKG-INFO. - Patch by Jyrki Pulliainen. +- Issue #21918: Converted test_tools from a module to a package containing + separate test files for each tested script. -- bpo-16695: Document how glob handles filenames starting with a dot. - Initial patch by Jyrki Pulliainen. +- Issue #9554: Use modern unittest features in test_argparse. Initial patch by + Denver Coneybeare and Radu Voicilas. -- bpo-8890: Stop advertising an insecure practice by replacing uses of the - /tmp directory with better alternatives in the documentation. Patch by - Geoff Wilson. +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers + so that packet filtering software (specifically Windows Base Filtering Engine) + does not interfere with the transaction semantics expected by the tests. -- bpo-17203: add long option names to unittest discovery docs. +- Issue #19493: Refactored the ctypes test package to skip tests explicitly + rather than silently. -- bpo-13094: add "Why do lambdas defined in a loop with different values all - return the same result?" programming FAQ. +- Issue #18492: All resources are now allowed when tests are not run by + regrtest.py. -- bpo-14901: Update portions of the Windows FAQ. Patch by Ashish Nitin - Patil. +- Issue #21634: Fix pystone micro-benchmark: use floor division instead of true + division to benchmark integers instead of floating point numbers. Set pystone + version to 1.2. Patch written by Lennart Regebro. -- bpo-16267: Better document the 3.3+ approach to combining @abstractmethod - with @staticmethod, @classmethod and @property +- Issue #21605: Added tests for Tkinter images. -- bpo-15209: Clarify exception chaining description in exceptions module - documentation +- Issue #21493: Added test for ntpath.expanduser(). Original patch by + Claudiu Popa. -- bpo-15990: Improve argument/parameter documentation. +- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok. -- bpo-16209: Move the documentation for the str built-in function to a new - str class entry in the "Text Sequence Type" section. +- Issue #21522: Added Tkinter tests for Listbox.itemconfigure(), + PanedWindow.paneconfigure(), and Menu.entryconfigure(). -- bpo-13538: Improve str() and object.__str__() documentation. +- Issue #17756: Fix test_code test when run from the installed location. -- bpo-16489: Make it clearer that importlib.find_loader() needs parent - packages to be explicitly imported. +- Issue #17752: Fix distutils tests when run from the installed location. -- bpo-16400: Update the description of which versions of a given package - PyPI displays. +- Issue #18604: Consolidated checks for GUI availability. All platforms now + at least check whether Tk can be instantiated when the GUI resource is + requested. -- bpo-15677: Document that zlib and gzip accept a compression level of 0 to - mean 'no compression'. Patch by Brian Brazil. +- Issue #21275: Fix a socket test on KFreeBSD. -- bpo-16197: Update winreg docstrings and documentation to match code. Patch - by Zachary Ware. +- Issue #21223: Pass test_site/test_startup_imports when some of the extensions + are built as builtins. -- bpo-8040: added a version switcher to the documentation. Patch by Yury - Selivanov. +- Issue #20635: Added tests for Tk geometry managers. -- bpo-16241: Document -X faulthandler command line option. Patch by Marek - Å uppa. +- Add test case for freeze. -- Additional comments and some style changes in the concurrent.futures URL - retrieval example +- Issue #20743: Fix a reference leak in test_tcl. -- bpo-16115: Improve subprocess.Popen() documentation around args, shell, - and executable arguments. +- Issue #21097: Move test_namespace_pkgs into test_importlib. -- bpo-13498: Clarify docs of os.makedirs()'s exist_ok argument. Done with - great native- speaker help from R. David Murray. +- Issue #21503: Use test_both() consistently in test_importlib. -- bpo-15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd - argument. +- Issue #20939: Avoid various network test failures due to new + redirect of http://www.python.org/ to https://www.python.org: + use http://www.example.com instead. -- bpo-15979: Improve timeit documentation. +- Issue #20668: asyncio tests no longer rely on tests.txt file. + (Patch by Vajrasky Kok) -- bpo-16036: Improve documentation of built-in `int()`'s signature and - arguments. +- Issue #21093: Prevent failures of ctypes test_macholib on OS X if a + copy of libz exists in $HOME/lib or /usr/local/lib. -- bpo-15935: Clarification of `argparse` docs, re: add_argument() type and - default arguments. Patch contributed by Chris Jerdonek. +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. -- bpo-11964: Document a change in v3.2 to the behavior of the indent - parameter of json encoding operations. +- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems. -- bpo-15116: Remove references to appscript as it is no longer being - supported. +- Issue #23345: Prevent test_ssl failures with large OpenSSL patch level + values (like 0.9.8zc). Tools/Demos ----------- -- bpo-18817: Fix a resource warning in Lib/aifc.py demo. Patch by Vajrasky - Kok. +- Issue #22314: pydoc now works when the LINES environment variable is set. + +- Issue #22615: Argument Clinic now supports the "type" argument for the + int converter. This permits using the int converter with enums and + typedefs. + +- Issue #20076: The makelocalealias.py script no longer ignores UTF-8 mapping. -- bpo-18439: Make patchcheck work on Windows for ACKS, NEWS. +- Issue #20079: The makelocalealias.py script now can parse the SUPPORTED file + from glibc sources and supports command line options for source paths. + +- Issue #22201: Command-line interface of the zipfile module now correctly + extracts ZIP files with directory entries. Patch by Ryan Wilson. -- bpo-18448: Fix a typo in Tools/demo/eiffel.py. +- Issue #22120: For functions using an unsigned integer return converter, + Argument Clinic now generates a cast to that type for the comparison + to -1 in the generated code. (This suppresses a compilation warning.) -- bpo-18457: Fixed saving of formulas and complex numbers in - Tools/demo/ss1.py. +- Issue #18974: Tools/scripts/diff.py now uses argparse instead of optparse. -- bpo-18449: Make Tools/demo/ss1.py work again on Python 3. Patch by Févry - Thibault. +- Issue #21906: Make Tools/scripts/md5sum.py work in Python 3. + Patch by Zachary Ware. -- bpo-12990: The "Python Launcher" on OSX could not launch python scripts - that have paths that include wide characters. +- Issue #21629: Fix Argument Clinic's "--converters" feature. -- bpo-15239: Make mkstringprep.py work again on Python 3. +- Add support for ``yield from`` to 2to3. -- bpo-17028: Allowed Python arguments to be supplied to the Windows - launcher. +- Add support for the PEP 465 matrix multiplication operator to 2to3. -- bpo-17156: pygettext.py now detects the encoding of source files and - correctly writes and escapes non-ascii characters. +- Issue #16047: Fix module exception list and __file__ handling in freeze. + Patch by Meador Inge. -- bpo-15539: Fix a number of bugs in Tools/scripts/pindent.py. Now - pindent.py works with a "with" statement. pindent.py no longer produces - improper indentation. pindent.py now works with continued lines broken - after "class" or "def" keywords and with continuations at the start of - line. +- Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge. -- bpo-11797: Add a 2to3 fixer that maps reload() to imp.reload(). +- Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. + Patch by Arfrever Frehtes Taifersar Arahesis. -- bpo-10966: Remove the concept of unexpected skipped tests. +Windows +------- -- bpo-9893: Removed the Misc/Vim directory. +- Issue #23260: Update Windows installer -- Removed the Misc/TextMate directory. +- The bundled version of Tcl/Tk has been updated to 8.6.3. The most visible + result of this change is the addition of new native file dialogs when + running on Windows Vista or newer. See Tcl/Tk's TIP 432 for more + information. Also, this version of Tcl/Tk includes support for Windows 10. -- bpo-16245: Add the Tools/scripts/parse_html5_entities.py script to parse - the list of HTML5 entities and update the html.entities.html5 dictionary. +- Issue #17896: The Windows build scripts now expect external library sources + to be in ``PCbuild\..\externals`` rather than ``PCbuild\..\..``. -- bpo-15378: Fix Tools/unicode/comparecodecs.py. Patch by Serhiy Storchaka. +- Issue #17717: The Windows build scripts now use a copy of NASM pulled from + svn.python.org to build OpenSSL. -- bpo-16549: Make json.tool work again on Python 3 and add tests. Initial - patch by Berker Peksag and Serhiy Storchaka. +- Issue #21907: Improved the batch scripts provided for building Python. -- bpo-13301: use ast.literal_eval() instead of eval() in - Tools/i18n/msgfmt.py. Patch by Serhiy Storchaka. +- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. -Windows -------- +- Issue #10747: Use versioned labels in the Windows start menu. + Patch by Olive Kilburn. -- bpo-18569: The installer now adds .py to the PATHEXT variable when - extensions are registered. Patch by Paul Moore. +- Issue #22980: .pyd files with a version and platform tag (for example, + ".cp35-win32.pyd") will now be loaded in preference to those without tags. **(For information about older versions, consult the HISTORY file.)** diff --git a/Misc/README.valgrind b/Misc/README.valgrind index b5a9a32..908f137 100644 --- a/Misc/README.valgrind +++ b/Misc/README.valgrind @@ -2,6 +2,9 @@ This document describes some caveats about the use of Valgrind with Python. Valgrind is used periodically by Python developers to try to ensure there are no memory leaks or invalid memory reads/writes. +UPDATE: Python 3.6 now supports PYTHONMALLOC=malloc environment variable which +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 diff --git a/Misc/SpecialBuilds.txt b/Misc/SpecialBuilds.txt index 3004174..82fa23e 100644 --- a/Misc/SpecialBuilds.txt +++ b/Misc/SpecialBuilds.txt @@ -65,9 +65,9 @@ sys.getobjects(max[, type]) simply by virtue of being in the list. envvar PYTHONDUMPREFS - If this envvar exists, Py_Finalize() arranges to print a list of all + If this envvar exists, Py_FinalizeEx() arranges to print a list of all still-live heap objects. This is printed twice, in different formats, - before and after Py_Finalize has cleaned up everything it can clean up. The + before and after Py_FinalizeEx has cleaned up everything it can clean up. The first output block produces the repr() of each object so is more informative; however, a lot of stuff destined to die is still alive then. The second output block is much harder to work with (repr() can't be invoked @@ -144,7 +144,7 @@ Special gimmicks: envvar PYTHONMALLOCSTATS If this envvar exists, a report of pymalloc summary statistics is printed to - stderr whenever a new arena is allocated, and also by Py_Finalize(). + stderr whenever a new arena is allocated, and also by Py_FinalizeEx(). Changed in 2.5: The number of extra bytes allocated is 4*sizeof(size_t). Before it was 16 on all boxes, reflecting that Python couldn't make use of @@ -179,7 +179,7 @@ Each type object grows three new members: */ int tp_maxalloc; -Allocation and deallocation code keeps these counts up to date. Py_Finalize() +Allocation and deallocation code keeps these counts up to date. Py_FinalizeEx() displays a summary of the info returned by sys.getcounts() (see below), along with assorted other special allocation counts (like the number of tuple allocations satisfied by a tuple free-list, the number of 1-character strings @@ -234,29 +234,3 @@ When this symbol is defined, the ceval mainloop and helper functions count the number of function calls made. It keeps detailed statistics about what kind of object was called and whether the call hit any of the special fast paths in the code. - - -WITH_TSC --------- - -Super-lowlevel profiling of the interpreter. When enabled, the sys module grows -a new function: - -settscdump(bool) - If true, tell the Python interpreter to dump VM measurements to stderr. If - false, turn off dump. The measurements are based on the processor's - time-stamp counter. - -This build option requires a small amount of platform specific code. Currently -this code is present for linux/x86 and any PowerPC platform that uses GCC -(i.e. OS X and linux/ppc). - -On the PowerPC the rate at which the time base register is incremented is not -defined by the architecture specification, so you'll need to find the manual for -your specific processor. For the 750CX, 750CXe and 750FX (all sold as the G3) -we find: - - The time base counter is clocked at a frequency that is one-fourth that of - the bus clock. - -This build is enabled by the --with-tsc flag to configure. diff --git a/Misc/coverity_model.c b/Misc/coverity_model.c index 749f2f0..1ae6179 100644 --- a/Misc/coverity_model.c +++ b/Misc/coverity_model.c @@ -22,7 +22,6 @@ #define assert(op) /* empty */ typedef int sdigit; typedef long Py_ssize_t; -typedef long long PY_LONG_LONG; typedef unsigned short wchar_t; typedef struct {} PyObject; typedef struct {} grammar; @@ -63,7 +62,7 @@ PyObject *PyLong_FromLong(long ival) return NULL; } -PyObject *PyLong_FromLongLong(PY_LONG_LONG ival) +PyObject *PyLong_FromLongLong(long long ival) { return PyLong_FromLong((long)ival); } @@ -94,7 +93,7 @@ wchar_t *Py_DecodeLocale(const char* arg, size_t *size) } /* Parser/pgenmain.c */ -grammar *getgrammar(char *filename) +grammar *getgrammar(const char *filename) { grammar *g; __coverity_tainted_data_sink__(filename); diff --git a/Misc/python.man b/Misc/python.man index 28f19b6..385b654 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -194,7 +194,8 @@ searching for a module. Also provides information on module cleanup at exit. .TP .B \-V ", " \-\-version -Prints the Python version number of the executable and exits. +Prints the Python version number of the executable and exits. When given +twice, print more information about the build. .TP .BI "\-W " argument Warning control. Python sometimes prints warning message to diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in index adac030..6450528 100644 --- a/Modules/Setup.config.in +++ b/Modules/Setup.config.in @@ -6,8 +6,5 @@ # Threading @USE_THREAD_MODULE@_thread _threadmodule.c -# The signal module -@USE_SIGNAL_MODULE@_signal signalmodule.c - # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. diff --git a/Modules/Setup.dist b/Modules/Setup.dist index 06ba6ad..8b87fc8 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -117,6 +117,7 @@ _operator _operator.c # operator.add() and similar goodies _collections _collectionsmodule.c # Container types itertools itertoolsmodule.c # Functions creating iterators for efficient looping atexit atexitmodule.c # Register functions to be run at interpreter-shutdown +_signal signalmodule.c _stat _stat.c # stat.h interface time timemodule.c # -lm # time operations and variables @@ -180,6 +181,7 @@ _symtable symtablemodule.c #_datetime _datetimemodule.c # datetime accelerator #_bisect _bisectmodule.c # Bisection algorithms #_heapq _heapqmodule.c # Heap queue algorithm +#_asyncio _asynciomodule.c # Fast asyncio Future #unicodedata unicodedata.c # static Unicode character database @@ -249,6 +251,8 @@ _symtable symtablemodule.c #_sha256 sha256module.c #_sha512 sha512module.c +# _blake module +#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c # The _tkinter module. # diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c new file mode 100644 index 0000000..4e8f74a --- /dev/null +++ b/Modules/_asynciomodule.c @@ -0,0 +1,2468 @@ +#include "Python.h" +#include "structmember.h" + + +/*[clinic input] +module _asyncio +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=8fd17862aa989c69]*/ + + +/* identifiers used from some functions */ +_Py_IDENTIFIER(add_done_callback); +_Py_IDENTIFIER(call_soon); +_Py_IDENTIFIER(cancel); +_Py_IDENTIFIER(send); +_Py_IDENTIFIER(throw); +_Py_IDENTIFIER(_step); +_Py_IDENTIFIER(_schedule_callbacks); +_Py_IDENTIFIER(_wakeup); + + +/* State of the _asyncio module */ +static PyObject *all_tasks; +static PyObject *current_tasks; +static PyObject *traceback_extract_stack; +static PyObject *asyncio_get_event_loop; +static PyObject *asyncio_future_repr_info_func; +static PyObject *asyncio_task_repr_info_func; +static PyObject *asyncio_task_get_stack_func; +static PyObject *asyncio_task_print_stack_func; +static PyObject *asyncio_InvalidStateError; +static PyObject *asyncio_CancelledError; +static PyObject *inspect_isgenerator; + + +typedef enum { + STATE_PENDING, + STATE_CANCELLED, + STATE_FINISHED +} fut_state; + +#define FutureObj_HEAD(prefix) \ + PyObject_HEAD \ + PyObject *prefix##_loop; \ + PyObject *prefix##_callbacks; \ + PyObject *prefix##_exception; \ + PyObject *prefix##_result; \ + PyObject *prefix##_source_tb; \ + fut_state prefix##_state; \ + int prefix##_log_tb; \ + int prefix##_blocking; \ + PyObject *dict; \ + PyObject *prefix##_weakreflist; + +typedef struct { + FutureObj_HEAD(fut) +} FutureObj; + +typedef struct { + FutureObj_HEAD(task) + PyObject *task_fut_waiter; + PyObject *task_coro; + int task_must_cancel; + int task_log_destroy_pending; +} TaskObj; + +typedef struct { + PyObject_HEAD + TaskObj *sw_task; + PyObject *sw_arg; +} TaskSendMethWrapper; + +typedef struct { + PyObject_HEAD + TaskObj *ww_task; +} TaskWakeupMethWrapper; + + +#include "clinic/_asynciomodule.c.h" + + +/*[clinic input] +class _asyncio.Future "FutureObj *" "&Future_Type" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=00d3e4abca711e0f]*/ + +/* Get FutureIter from Future */ +static PyObject* future_new_iter(PyObject *); +static inline int future_call_schedule_callbacks(FutureObj *); + +static int +future_schedule_callbacks(FutureObj *fut) +{ + Py_ssize_t len; + PyObject* iters; + int i; + + if (fut->fut_callbacks == NULL) { + PyErr_SetString(PyExc_RuntimeError, "NULL callbacks"); + return -1; + } + + len = PyList_GET_SIZE(fut->fut_callbacks); + if (len == 0) { + return 0; + } + + iters = PyList_GetSlice(fut->fut_callbacks, 0, len); + if (iters == NULL) { + return -1; + } + if (PyList_SetSlice(fut->fut_callbacks, 0, len, NULL) < 0) { + Py_DECREF(iters); + return -1; + } + + for (i = 0; i < len; i++) { + PyObject *handle = NULL; + PyObject *cb = PyList_GET_ITEM(iters, i); + + handle = _PyObject_CallMethodId( + fut->fut_loop, &PyId_call_soon, "OO", cb, fut, NULL); + + if (handle == NULL) { + Py_DECREF(iters); + return -1; + } + else { + Py_DECREF(handle); + } + } + + Py_DECREF(iters); + return 0; +} + +static int +future_init(FutureObj *fut, PyObject *loop) +{ + PyObject *res = NULL; + _Py_IDENTIFIER(get_debug); + + if (loop == NULL || loop == Py_None) { + loop = PyObject_CallObject(asyncio_get_event_loop, NULL); + if (loop == NULL) { + return -1; + } + } + else { + Py_INCREF(loop); + } + Py_CLEAR(fut->fut_loop); + fut->fut_loop = loop; + + res = _PyObject_CallMethodId(fut->fut_loop, &PyId_get_debug, NULL); + if (res == NULL) { + return -1; + } + if (PyObject_IsTrue(res)) { + Py_CLEAR(res); + fut->fut_source_tb = PyObject_CallObject(traceback_extract_stack, NULL); + if (fut->fut_source_tb == NULL) { + return -1; + } + } + else { + Py_CLEAR(res); + } + + fut->fut_callbacks = PyList_New(0); + if (fut->fut_callbacks == NULL) { + return -1; + } + + return 0; +} + +static PyObject * +future_set_result(FutureObj *fut, PyObject *res) +{ + if (fut->fut_state != STATE_PENDING) { + PyErr_SetString(asyncio_InvalidStateError, "invalid state"); + return NULL; + } + + Py_INCREF(res); + fut->fut_result = res; + fut->fut_state = STATE_FINISHED; + + if (future_call_schedule_callbacks(fut) == -1) { + return NULL; + } + Py_RETURN_NONE; +} + +static PyObject * +future_set_exception(FutureObj *fut, PyObject *exc) +{ + PyObject *exc_val = NULL; + + if (fut->fut_state != STATE_PENDING) { + PyErr_SetString(asyncio_InvalidStateError, "invalid state"); + return NULL; + } + + if (PyExceptionClass_Check(exc)) { + exc_val = PyObject_CallObject(exc, NULL); + if (exc_val == NULL) { + return NULL; + } + } + else { + exc_val = exc; + Py_INCREF(exc_val); + } + if (!PyExceptionInstance_Check(exc_val)) { + Py_DECREF(exc_val); + PyErr_SetString(PyExc_TypeError, "invalid exception object"); + return NULL; + } + if ((PyObject*)Py_TYPE(exc_val) == PyExc_StopIteration) { + Py_DECREF(exc_val); + PyErr_SetString(PyExc_TypeError, + "StopIteration interacts badly with generators " + "and cannot be raised into a Future"); + return NULL; + } + + fut->fut_exception = exc_val; + fut->fut_state = STATE_FINISHED; + + if (future_call_schedule_callbacks(fut) == -1) { + return NULL; + } + + fut->fut_log_tb = 1; + Py_RETURN_NONE; +} + +static int +future_get_result(FutureObj *fut, PyObject **result) +{ + PyObject *exc; + + if (fut->fut_state == STATE_CANCELLED) { + exc = _PyObject_CallNoArg(asyncio_CancelledError); + if (exc == NULL) { + return -1; + } + *result = exc; + return 1; + } + + if (fut->fut_state != STATE_FINISHED) { + PyObject *msg = PyUnicode_FromString("Result is not ready."); + if (msg == NULL) { + return -1; + } + + exc = _PyObject_CallArg1(asyncio_InvalidStateError, msg); + Py_DECREF(msg); + if (exc == NULL) { + return -1; + } + + *result = exc; + return 1; + } + + fut->fut_log_tb = 0; + if (fut->fut_exception != NULL) { + Py_INCREF(fut->fut_exception); + *result = fut->fut_exception; + return 1; + } + + Py_INCREF(fut->fut_result); + *result = fut->fut_result; + return 0; +} + +static PyObject * +future_add_done_callback(FutureObj *fut, PyObject *arg) +{ + if (fut->fut_state != STATE_PENDING) { + PyObject *handle = _PyObject_CallMethodId( + fut->fut_loop, &PyId_call_soon, "OO", arg, fut, NULL); + + if (handle == NULL) { + return NULL; + } + else { + Py_DECREF(handle); + } + } + else { + int err = PyList_Append(fut->fut_callbacks, arg); + if (err != 0) { + return NULL; + } + } + Py_RETURN_NONE; +} + +static PyObject * +future_cancel(FutureObj *fut) +{ + if (fut->fut_state != STATE_PENDING) { + Py_RETURN_FALSE; + } + fut->fut_state = STATE_CANCELLED; + + if (future_call_schedule_callbacks(fut) == -1) { + return NULL; + } + + Py_RETURN_TRUE; +} + +/*[clinic input] +_asyncio.Future.__init__ + + * + loop: 'O' = NULL + +This class is *almost* compatible with concurrent.futures.Future. + + Differences: + + - result() and exception() do not take a timeout argument and + raise an exception when the future isn't done yet. + + - Callbacks registered with add_done_callback() are always called + via the event loop's call_soon_threadsafe(). + + - This class is not compatible with the wait() and as_completed() + methods in the concurrent.futures package. +[clinic start generated code]*/ + +static int +_asyncio_Future___init___impl(FutureObj *self, PyObject *loop) +/*[clinic end generated code: output=9ed75799eaccb5d6 input=8e1681f23605be2d]*/ + +{ + return future_init(self, loop); +} + +static int +FutureObj_clear(FutureObj *fut) +{ + Py_CLEAR(fut->fut_loop); + Py_CLEAR(fut->fut_callbacks); + Py_CLEAR(fut->fut_result); + Py_CLEAR(fut->fut_exception); + Py_CLEAR(fut->fut_source_tb); + Py_CLEAR(fut->dict); + return 0; +} + +static int +FutureObj_traverse(FutureObj *fut, visitproc visit, void *arg) +{ + Py_VISIT(fut->fut_loop); + Py_VISIT(fut->fut_callbacks); + Py_VISIT(fut->fut_result); + Py_VISIT(fut->fut_exception); + Py_VISIT(fut->fut_source_tb); + Py_VISIT(fut->dict); + return 0; +} + +/*[clinic input] +_asyncio.Future.result + +Return the result this future represents. + +If the future has been cancelled, raises CancelledError. If the +future's result isn't yet available, raises InvalidStateError. If +the future is done and has an exception set, this exception is raised. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_result_impl(FutureObj *self) +/*[clinic end generated code: output=f35f940936a4b1e5 input=49ecf9cf5ec50dc5]*/ +{ + PyObject *result; + int res = future_get_result(self, &result); + + if (res == -1) { + return NULL; + } + + if (res == 0) { + return result; + } + + assert(res == 1); + + PyErr_SetObject(PyExceptionInstance_Class(result), result); + Py_DECREF(result); + return NULL; +} + +/*[clinic input] +_asyncio.Future.exception + +Return the exception that was set on this future. + +The exception (or None if no exception was set) is returned only if +the future is done. If the future has been cancelled, raises +CancelledError. If the future isn't done yet, raises +InvalidStateError. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_exception_impl(FutureObj *self) +/*[clinic end generated code: output=88b20d4f855e0710 input=733547a70c841c68]*/ +{ + if (self->fut_state == STATE_CANCELLED) { + PyErr_SetString(asyncio_CancelledError, ""); + return NULL; + } + + if (self->fut_state != STATE_FINISHED) { + PyErr_SetString(asyncio_InvalidStateError, "Result is not ready."); + return NULL; + } + + if (self->fut_exception != NULL) { + self->fut_log_tb = 0; + Py_INCREF(self->fut_exception); + return self->fut_exception; + } + + Py_RETURN_NONE; +} + +/*[clinic input] +_asyncio.Future.set_result + + res: 'O' + / + +Mark the future done and set its result. + +If the future is already done when this method is called, raises +InvalidStateError. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_set_result(FutureObj *self, PyObject *res) +/*[clinic end generated code: output=a620abfc2796bfb6 input=8619565e0503357e]*/ +{ + return future_set_result(self, res); +} + +/*[clinic input] +_asyncio.Future.set_exception + + exception: 'O' + / + +Mark the future done and set an exception. + +If the future is already done when this method is called, raises +InvalidStateError. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_set_exception(FutureObj *self, PyObject *exception) +/*[clinic end generated code: output=f1c1b0cd321be360 input=1377dbe15e6ea186]*/ +{ + return future_set_exception(self, exception); +} + +/*[clinic input] +_asyncio.Future.add_done_callback + + fn: 'O' + / + +Add a callback to be run when the future becomes done. + +The callback is called with a single argument - the future object. If +the future is already done when this is called, the callback is +scheduled with call_soon. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_add_done_callback(FutureObj *self, PyObject *fn) +/*[clinic end generated code: output=819e09629b2ec2b5 input=8cce187e32cec6a8]*/ +{ + return future_add_done_callback(self, fn); +} + +/*[clinic input] +_asyncio.Future.remove_done_callback + + fn: 'O' + / + +Remove all instances of a callback from the "call when done" list. + +Returns the number of callbacks removed. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_remove_done_callback(FutureObj *self, PyObject *fn) +/*[clinic end generated code: output=5ab1fb52b24ef31f input=3fedb73e1409c31c]*/ +{ + PyObject *newlist; + Py_ssize_t len, i, j=0; + + len = PyList_GET_SIZE(self->fut_callbacks); + if (len == 0) { + return PyLong_FromSsize_t(0); + } + + newlist = PyList_New(len); + if (newlist == NULL) { + return NULL; + } + + for (i = 0; i < len; i++) { + int ret; + PyObject *item = PyList_GET_ITEM(self->fut_callbacks, i); + + if ((ret = PyObject_RichCompareBool(fn, item, Py_EQ)) < 0) { + goto fail; + } + if (ret == 0) { + Py_INCREF(item); + PyList_SET_ITEM(newlist, j, item); + j++; + } + } + + if (PyList_SetSlice(newlist, j, len, NULL) < 0) { + goto fail; + } + if (PyList_SetSlice(self->fut_callbacks, 0, len, newlist) < 0) { + goto fail; + } + Py_DECREF(newlist); + return PyLong_FromSsize_t(len - j); + +fail: + Py_DECREF(newlist); + return NULL; +} + +/*[clinic input] +_asyncio.Future.cancel + +Cancel the future and schedule callbacks. + +If the future is already done or cancelled, return False. Otherwise, +change the future's state to cancelled, schedule the callbacks and +return True. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_cancel_impl(FutureObj *self) +/*[clinic end generated code: output=e45b932ba8bd68a1 input=515709a127995109]*/ +{ + return future_cancel(self); +} + +/*[clinic input] +_asyncio.Future.cancelled + +Return True if the future was cancelled. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_cancelled_impl(FutureObj *self) +/*[clinic end generated code: output=145197ced586357d input=943ab8b7b7b17e45]*/ +{ + if (self->fut_state == STATE_CANCELLED) { + Py_RETURN_TRUE; + } + else { + Py_RETURN_FALSE; + } +} + +/*[clinic input] +_asyncio.Future.done + +Return True if the future is done. + +Done means either that a result / exception are available, or that the +future was cancelled. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future_done_impl(FutureObj *self) +/*[clinic end generated code: output=244c5ac351145096 input=28d7b23fdb65d2ac]*/ +{ + if (self->fut_state == STATE_PENDING) { + Py_RETURN_FALSE; + } + else { + Py_RETURN_TRUE; + } +} + +static PyObject * +FutureObj_get_blocking(FutureObj *fut) +{ + if (fut->fut_blocking) { + Py_RETURN_TRUE; + } + else { + Py_RETURN_FALSE; + } +} + +static int +FutureObj_set_blocking(FutureObj *fut, PyObject *val) +{ + int is_true = PyObject_IsTrue(val); + if (is_true < 0) { + return -1; + } + fut->fut_blocking = is_true; + return 0; +} + +static PyObject * +FutureObj_get_log_traceback(FutureObj *fut) +{ + if (fut->fut_log_tb) { + Py_RETURN_TRUE; + } + else { + Py_RETURN_FALSE; + } +} + +static PyObject * +FutureObj_get_loop(FutureObj *fut) +{ + if (fut->fut_loop == NULL) { + Py_RETURN_NONE; + } + Py_INCREF(fut->fut_loop); + return fut->fut_loop; +} + +static PyObject * +FutureObj_get_callbacks(FutureObj *fut) +{ + if (fut->fut_callbacks == NULL) { + Py_RETURN_NONE; + } + Py_INCREF(fut->fut_callbacks); + return fut->fut_callbacks; +} + +static PyObject * +FutureObj_get_result(FutureObj *fut) +{ + if (fut->fut_result == NULL) { + Py_RETURN_NONE; + } + Py_INCREF(fut->fut_result); + return fut->fut_result; +} + +static PyObject * +FutureObj_get_exception(FutureObj *fut) +{ + if (fut->fut_exception == NULL) { + Py_RETURN_NONE; + } + Py_INCREF(fut->fut_exception); + return fut->fut_exception; +} + +static PyObject * +FutureObj_get_source_traceback(FutureObj *fut) +{ + if (fut->fut_source_tb == NULL) { + Py_RETURN_NONE; + } + Py_INCREF(fut->fut_source_tb); + return fut->fut_source_tb; +} + +static PyObject * +FutureObj_get_state(FutureObj *fut) +{ + _Py_IDENTIFIER(PENDING); + _Py_IDENTIFIER(CANCELLED); + _Py_IDENTIFIER(FINISHED); + PyObject *ret = NULL; + + switch (fut->fut_state) { + case STATE_PENDING: + ret = _PyUnicode_FromId(&PyId_PENDING); + break; + case STATE_CANCELLED: + ret = _PyUnicode_FromId(&PyId_CANCELLED); + break; + case STATE_FINISHED: + ret = _PyUnicode_FromId(&PyId_FINISHED); + break; + default: + assert (0); + } + Py_INCREF(ret); + return ret; +} + +/*[clinic input] +_asyncio.Future._repr_info +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future__repr_info_impl(FutureObj *self) +/*[clinic end generated code: output=fa69e901bd176cfb input=f21504d8e2ae1ca2]*/ +{ + return PyObject_CallFunctionObjArgs( + asyncio_future_repr_info_func, self, NULL); +} + +/*[clinic input] +_asyncio.Future._schedule_callbacks +[clinic start generated code]*/ + +static PyObject * +_asyncio_Future__schedule_callbacks_impl(FutureObj *self) +/*[clinic end generated code: output=5e8958d89ea1c5dc input=4f5f295f263f4a88]*/ +{ + int ret = future_schedule_callbacks(self); + if (ret == -1) { + return NULL; + } + Py_RETURN_NONE; +} + +static PyObject * +FutureObj_repr(FutureObj *fut) +{ + _Py_IDENTIFIER(_repr_info); + + PyObject *_repr_info = _PyUnicode_FromId(&PyId__repr_info); // borrowed + if (_repr_info == NULL) { + return NULL; + } + + PyObject *rinfo = PyObject_CallMethodObjArgs((PyObject*)fut, _repr_info, + NULL); + if (rinfo == NULL) { + return NULL; + } + + PyObject *sp = PyUnicode_FromString(" "); + if (sp == NULL) { + Py_DECREF(rinfo); + return NULL; + } + + PyObject *rinfo_s = PyUnicode_Join(sp, rinfo); + Py_DECREF(sp); + Py_DECREF(rinfo); + if (rinfo_s == NULL) { + return NULL; + } + + PyObject *rstr = NULL; + PyObject *type_name = PyObject_GetAttrString((PyObject*)Py_TYPE(fut), + "__name__"); + if (type_name != NULL) { + rstr = PyUnicode_FromFormat("<%S %S>", type_name, rinfo_s); + Py_DECREF(type_name); + } + Py_DECREF(rinfo_s); + return rstr; +} + +static void +FutureObj_finalize(FutureObj *fut) +{ + _Py_IDENTIFIER(call_exception_handler); + _Py_IDENTIFIER(message); + _Py_IDENTIFIER(exception); + _Py_IDENTIFIER(future); + _Py_IDENTIFIER(source_traceback); + + if (!fut->fut_log_tb) { + return; + } + assert(fut->fut_exception != NULL); + fut->fut_log_tb = 0;; + + PyObject *error_type, *error_value, *error_traceback; + /* Save the current exception, if any. */ + PyErr_Fetch(&error_type, &error_value, &error_traceback); + + PyObject *context = NULL; + PyObject *type_name = NULL; + PyObject *message = NULL; + PyObject *func = NULL; + PyObject *res = NULL; + + context = PyDict_New(); + if (context == NULL) { + goto finally; + } + + type_name = PyObject_GetAttrString((PyObject*)Py_TYPE(fut), "__name__"); + if (type_name == NULL) { + goto finally; + } + + message = PyUnicode_FromFormat( + "%S exception was never retrieved", type_name); + if (message == NULL) { + goto finally; + } + + if (_PyDict_SetItemId(context, &PyId_message, message) < 0 || + _PyDict_SetItemId(context, &PyId_exception, fut->fut_exception) < 0 || + _PyDict_SetItemId(context, &PyId_future, (PyObject*)fut) < 0) { + goto finally; + } + if (fut->fut_source_tb != NULL) { + if (_PyDict_SetItemId(context, &PyId_source_traceback, + fut->fut_source_tb) < 0) { + goto finally; + } + } + + func = _PyObject_GetAttrId(fut->fut_loop, &PyId_call_exception_handler); + if (func != NULL) { + res = _PyObject_CallArg1(func, context); + if (res == NULL) { + PyErr_WriteUnraisable(func); + } + } + +finally: + Py_CLEAR(context); + Py_CLEAR(type_name); + Py_CLEAR(message); + Py_CLEAR(func); + Py_CLEAR(res); + + /* Restore the saved exception. */ + PyErr_Restore(error_type, error_value, error_traceback); +} + + +static PyAsyncMethods FutureType_as_async = { + (unaryfunc)future_new_iter, /* am_await */ + 0, /* am_aiter */ + 0 /* am_anext */ +}; + +static PyMethodDef FutureType_methods[] = { + _ASYNCIO_FUTURE_RESULT_METHODDEF + _ASYNCIO_FUTURE_EXCEPTION_METHODDEF + _ASYNCIO_FUTURE_SET_RESULT_METHODDEF + _ASYNCIO_FUTURE_SET_EXCEPTION_METHODDEF + _ASYNCIO_FUTURE_ADD_DONE_CALLBACK_METHODDEF + _ASYNCIO_FUTURE_REMOVE_DONE_CALLBACK_METHODDEF + _ASYNCIO_FUTURE_CANCEL_METHODDEF + _ASYNCIO_FUTURE_CANCELLED_METHODDEF + _ASYNCIO_FUTURE_DONE_METHODDEF + _ASYNCIO_FUTURE__REPR_INFO_METHODDEF + _ASYNCIO_FUTURE__SCHEDULE_CALLBACKS_METHODDEF + {NULL, NULL} /* Sentinel */ +}; + +#define FUTURE_COMMON_GETSETLIST \ + {"_state", (getter)FutureObj_get_state, NULL, NULL}, \ + {"_asyncio_future_blocking", (getter)FutureObj_get_blocking, \ + (setter)FutureObj_set_blocking, NULL}, \ + {"_loop", (getter)FutureObj_get_loop, NULL, NULL}, \ + {"_callbacks", (getter)FutureObj_get_callbacks, NULL, NULL}, \ + {"_result", (getter)FutureObj_get_result, NULL, NULL}, \ + {"_exception", (getter)FutureObj_get_exception, NULL, NULL}, \ + {"_log_traceback", (getter)FutureObj_get_log_traceback, NULL, NULL}, \ + {"_source_traceback", (getter)FutureObj_get_source_traceback, NULL, NULL}, + +static PyGetSetDef FutureType_getsetlist[] = { + FUTURE_COMMON_GETSETLIST + {NULL} /* Sentinel */ +}; + +static void FutureObj_dealloc(PyObject *self); + +static PyTypeObject FutureType = { + PyVarObject_HEAD_INIT(NULL, 0) + "_asyncio.Future", + sizeof(FutureObj), /* tp_basicsize */ + .tp_dealloc = FutureObj_dealloc, + .tp_as_async = &FutureType_as_async, + .tp_repr = (reprfunc)FutureObj_repr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE + | Py_TPFLAGS_HAVE_FINALIZE, + .tp_doc = _asyncio_Future___init____doc__, + .tp_traverse = (traverseproc)FutureObj_traverse, + .tp_clear = (inquiry)FutureObj_clear, + .tp_weaklistoffset = offsetof(FutureObj, fut_weakreflist), + .tp_iter = (getiterfunc)future_new_iter, + .tp_methods = FutureType_methods, + .tp_getset = FutureType_getsetlist, + .tp_dictoffset = offsetof(FutureObj, dict), + .tp_init = (initproc)_asyncio_Future___init__, + .tp_new = PyType_GenericNew, + .tp_finalize = (destructor)FutureObj_finalize, +}; + +#define Future_CheckExact(obj) (Py_TYPE(obj) == &FutureType) + +static inline int +future_call_schedule_callbacks(FutureObj *fut) +{ + if (Future_CheckExact(fut)) { + return future_schedule_callbacks(fut); + } + else { + /* `fut` is a subclass of Future */ + PyObject *ret = _PyObject_CallMethodId( + (PyObject*)fut, &PyId__schedule_callbacks, NULL); + if (ret == NULL) { + return -1; + } + + Py_DECREF(ret); + return 0; + } +} + +static void +FutureObj_dealloc(PyObject *self) +{ + FutureObj *fut = (FutureObj *)self; + + if (Future_CheckExact(fut)) { + /* When fut is subclass of Future, finalizer is called from + * subtype_dealloc. + */ + if (PyObject_CallFinalizerFromDealloc(self) < 0) { + // resurrected. + return; + } + } + + if (fut->fut_weakreflist != NULL) { + PyObject_ClearWeakRefs(self); + } + + (void)FutureObj_clear(fut); + Py_TYPE(fut)->tp_free(fut); +} + + +/*********************** Future Iterator **************************/ + +typedef struct { + PyObject_HEAD + FutureObj *future; +} futureiterobject; + +static void +FutureIter_dealloc(futureiterobject *it) +{ + PyObject_GC_UnTrack(it); + Py_XDECREF(it->future); + PyObject_GC_Del(it); +} + +static PyObject * +FutureIter_iternext(futureiterobject *it) +{ + PyObject *res; + FutureObj *fut = it->future; + + if (fut == NULL) { + return NULL; + } + + if (fut->fut_state == STATE_PENDING) { + if (!fut->fut_blocking) { + fut->fut_blocking = 1; + Py_INCREF(fut); + return (PyObject *)fut; + } + PyErr_Format(PyExc_AssertionError, + "yield from wasn't used with future"); + return NULL; + } + + res = _asyncio_Future_result_impl(fut); + if (res != NULL) { + /* The result of the Future is not an exception. */ + if (_PyGen_SetStopIterationValue(res) < 0) { + Py_DECREF(res); + return NULL; + } + Py_DECREF(res); + } + + it->future = NULL; + Py_DECREF(fut); + return NULL; +} + +static PyObject * +FutureIter_send(futureiterobject *self, PyObject *unused) +{ + /* Future.__iter__ doesn't care about values that are pushed to the + * generator, it just returns "self.result(). + */ + return FutureIter_iternext(self); +} + +static PyObject * +FutureIter_throw(futureiterobject *self, PyObject *args) +{ + PyObject *type=NULL, *val=NULL, *tb=NULL; + if (!PyArg_ParseTuple(args, "O|OO", &type, &val, &tb)) + return NULL; + + if (val == Py_None) { + val = NULL; + } + if (tb == Py_None) { + tb = NULL; + } else if (tb != NULL && !PyTraceBack_Check(tb)) { + PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback"); + return NULL; + } + + Py_INCREF(type); + Py_XINCREF(val); + Py_XINCREF(tb); + + if (PyExceptionClass_Check(type)) { + PyErr_NormalizeException(&type, &val, &tb); + /* No need to call PyException_SetTraceback since we'll be calling + PyErr_Restore for `type`, `val`, and `tb`. */ + } else if (PyExceptionInstance_Check(type)) { + if (val) { + PyErr_SetString(PyExc_TypeError, + "instance exception may not have a separate value"); + goto fail; + } + val = type; + type = PyExceptionInstance_Class(type); + Py_INCREF(type); + if (tb == NULL) + tb = PyException_GetTraceback(val); + } else { + PyErr_SetString(PyExc_TypeError, + "exceptions must be classes deriving BaseException or " + "instances of such a class"); + goto fail; + } + + Py_CLEAR(self->future); + + PyErr_Restore(type, val, tb); + + return FutureIter_iternext(self); + + fail: + Py_DECREF(type); + Py_XDECREF(val); + Py_XDECREF(tb); + return NULL; +} + +static PyObject * +FutureIter_close(futureiterobject *self, PyObject *arg) +{ + Py_CLEAR(self->future); + Py_RETURN_NONE; +} + +static int +FutureIter_traverse(futureiterobject *it, visitproc visit, void *arg) +{ + Py_VISIT(it->future); + return 0; +} + +static PyMethodDef FutureIter_methods[] = { + {"send", (PyCFunction)FutureIter_send, METH_O, NULL}, + {"throw", (PyCFunction)FutureIter_throw, METH_VARARGS, NULL}, + {"close", (PyCFunction)FutureIter_close, METH_NOARGS, NULL}, + {NULL, NULL} /* Sentinel */ +}; + +static PyTypeObject FutureIterType = { + PyVarObject_HEAD_INIT(NULL, 0) + "_asyncio.FutureIter", + .tp_basicsize = sizeof(futureiterobject), + .tp_itemsize = 0, + .tp_dealloc = (destructor)FutureIter_dealloc, + .tp_getattro = PyObject_GenericGetAttr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, + .tp_traverse = (traverseproc)FutureIter_traverse, + .tp_iter = PyObject_SelfIter, + .tp_iternext = (iternextfunc)FutureIter_iternext, + .tp_methods = FutureIter_methods, +}; + +static PyObject * +future_new_iter(PyObject *fut) +{ + futureiterobject *it; + + if (!PyObject_TypeCheck(fut, &FutureType)) { + PyErr_BadInternalCall(); + return NULL; + } + it = PyObject_GC_New(futureiterobject, &FutureIterType); + if (it == NULL) { + return NULL; + } + Py_INCREF(fut); + it->future = (FutureObj*)fut; + PyObject_GC_Track(it); + return (PyObject*)it; +} + + +/*********************** Task **************************/ + + +/*[clinic input] +class _asyncio.Task "TaskObj *" "&Task_Type" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=719dcef0fcc03b37]*/ + +static int task_call_step_soon(TaskObj *, PyObject *); +static inline PyObject * task_call_wakeup(TaskObj *, PyObject *); +static inline PyObject * task_call_step(TaskObj *, PyObject *); +static PyObject * task_wakeup(TaskObj *, PyObject *); +static PyObject * task_step(TaskObj *, PyObject *); + +/* ----- Task._step wrapper */ + +static int +TaskSendMethWrapper_clear(TaskSendMethWrapper *o) +{ + Py_CLEAR(o->sw_task); + Py_CLEAR(o->sw_arg); + return 0; +} + +static void +TaskSendMethWrapper_dealloc(TaskSendMethWrapper *o) +{ + PyObject_GC_UnTrack(o); + (void)TaskSendMethWrapper_clear(o); + Py_TYPE(o)->tp_free(o); +} + +static PyObject * +TaskSendMethWrapper_call(TaskSendMethWrapper *o, + PyObject *args, PyObject *kwds) +{ + return task_call_step(o->sw_task, o->sw_arg); +} + +static int +TaskSendMethWrapper_traverse(TaskSendMethWrapper *o, + visitproc visit, void *arg) +{ + Py_VISIT(o->sw_task); + Py_VISIT(o->sw_arg); + return 0; +} + +static PyObject * +TaskSendMethWrapper_get___self__(TaskSendMethWrapper *o) +{ + if (o->sw_task) { + Py_INCREF(o->sw_task); + return (PyObject*)o->sw_task; + } + Py_RETURN_NONE; +} + +static PyGetSetDef TaskSendMethWrapper_getsetlist[] = { + {"__self__", (getter)TaskSendMethWrapper_get___self__, NULL, NULL}, + {NULL} /* Sentinel */ +}; + +PyTypeObject TaskSendMethWrapper_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "TaskSendMethWrapper", + .tp_basicsize = sizeof(TaskSendMethWrapper), + .tp_itemsize = 0, + .tp_getset = TaskSendMethWrapper_getsetlist, + .tp_dealloc = (destructor)TaskSendMethWrapper_dealloc, + .tp_call = (ternaryfunc)TaskSendMethWrapper_call, + .tp_getattro = PyObject_GenericGetAttr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, + .tp_traverse = (traverseproc)TaskSendMethWrapper_traverse, + .tp_clear = (inquiry)TaskSendMethWrapper_clear, +}; + +static PyObject * +TaskSendMethWrapper_new(TaskObj *task, PyObject *arg) +{ + TaskSendMethWrapper *o; + o = PyObject_GC_New(TaskSendMethWrapper, &TaskSendMethWrapper_Type); + if (o == NULL) { + return NULL; + } + + Py_INCREF(task); + o->sw_task = task; + + Py_XINCREF(arg); + o->sw_arg = arg; + + PyObject_GC_Track(o); + return (PyObject*) o; +} + +/* ----- Task._wakeup wrapper */ + +static PyObject * +TaskWakeupMethWrapper_call(TaskWakeupMethWrapper *o, + PyObject *args, PyObject *kwds) +{ + PyObject *fut; + + if (!PyArg_ParseTuple(args, "O|", &fut)) { + return NULL; + } + + return task_call_wakeup(o->ww_task, fut); +} + +static int +TaskWakeupMethWrapper_clear(TaskWakeupMethWrapper *o) +{ + Py_CLEAR(o->ww_task); + return 0; +} + +static int +TaskWakeupMethWrapper_traverse(TaskWakeupMethWrapper *o, + visitproc visit, void *arg) +{ + Py_VISIT(o->ww_task); + return 0; +} + +static void +TaskWakeupMethWrapper_dealloc(TaskWakeupMethWrapper *o) +{ + PyObject_GC_UnTrack(o); + (void)TaskWakeupMethWrapper_clear(o); + Py_TYPE(o)->tp_free(o); +} + +PyTypeObject TaskWakeupMethWrapper_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "TaskWakeupMethWrapper", + .tp_basicsize = sizeof(TaskWakeupMethWrapper), + .tp_itemsize = 0, + .tp_dealloc = (destructor)TaskWakeupMethWrapper_dealloc, + .tp_call = (ternaryfunc)TaskWakeupMethWrapper_call, + .tp_getattro = PyObject_GenericGetAttr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, + .tp_traverse = (traverseproc)TaskWakeupMethWrapper_traverse, + .tp_clear = (inquiry)TaskWakeupMethWrapper_clear, +}; + +static PyObject * +TaskWakeupMethWrapper_new(TaskObj *task) +{ + TaskWakeupMethWrapper *o; + o = PyObject_GC_New(TaskWakeupMethWrapper, &TaskWakeupMethWrapper_Type); + if (o == NULL) { + return NULL; + } + + Py_INCREF(task); + o->ww_task = task; + + PyObject_GC_Track(o); + return (PyObject*) o; +} + +/* ----- Task */ + +/*[clinic input] +_asyncio.Task.__init__ + + coro: 'O' + * + loop: 'O' = NULL + +A coroutine wrapped in a Future. +[clinic start generated code]*/ + +static int +_asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop) +/*[clinic end generated code: output=9f24774c2287fc2f input=71d8d28c201a18cd]*/ +{ + PyObject *res; + _Py_IDENTIFIER(add); + + if (future_init((FutureObj*)self, loop)) { + return -1; + } + + self->task_fut_waiter = NULL; + self->task_must_cancel = 0; + self->task_log_destroy_pending = 1; + + Py_INCREF(coro); + self->task_coro = coro; + + if (task_call_step_soon(self, NULL)) { + return -1; + } + + res = _PyObject_CallMethodId(all_tasks, &PyId_add, "O", self, NULL); + if (res == NULL) { + return -1; + } + Py_DECREF(res); + + return 0; +} + +static int +TaskObj_clear(TaskObj *task) +{ + (void)FutureObj_clear((FutureObj*) task); + Py_CLEAR(task->task_coro); + Py_CLEAR(task->task_fut_waiter); + return 0; +} + +static int +TaskObj_traverse(TaskObj *task, visitproc visit, void *arg) +{ + Py_VISIT(task->task_coro); + Py_VISIT(task->task_fut_waiter); + (void)FutureObj_traverse((FutureObj*) task, visit, arg); + return 0; +} + +static PyObject * +TaskObj_get_log_destroy_pending(TaskObj *task) +{ + if (task->task_log_destroy_pending) { + Py_RETURN_TRUE; + } + else { + Py_RETURN_FALSE; + } +} + +static int +TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val) +{ + int is_true = PyObject_IsTrue(val); + if (is_true < 0) { + return -1; + } + task->task_log_destroy_pending = is_true; + return 0; +} + +static PyObject * +TaskObj_get_must_cancel(TaskObj *task) +{ + if (task->task_must_cancel) { + Py_RETURN_TRUE; + } + else { + Py_RETURN_FALSE; + } +} + +static PyObject * +TaskObj_get_coro(TaskObj *task) +{ + if (task->task_coro) { + Py_INCREF(task->task_coro); + return task->task_coro; + } + + Py_RETURN_NONE; +} + +static PyObject * +TaskObj_get_fut_waiter(TaskObj *task) +{ + if (task->task_fut_waiter) { + Py_INCREF(task->task_fut_waiter); + return task->task_fut_waiter; + } + + Py_RETURN_NONE; +} + +/*[clinic input] +@classmethod +_asyncio.Task.current_task + + loop: 'O' = NULL + +Return the currently running task in an event loop or None. + +By default the current task for the current event loop is returned. + +None is returned when called not in the context of a Task. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop) +/*[clinic end generated code: output=99fbe7332c516e03 input=cd784537f02cf833]*/ +{ + PyObject *res; + + if (loop == NULL) { + loop = PyObject_CallObject(asyncio_get_event_loop, NULL); + if (loop == NULL) { + return NULL; + } + + res = PyDict_GetItem(current_tasks, loop); + Py_DECREF(loop); + } + else { + res = PyDict_GetItem(current_tasks, loop); + } + + if (res == NULL) { + Py_RETURN_NONE; + } + else { + Py_INCREF(res); + return res; + } +} + +static PyObject * +task_all_tasks(PyObject *loop) +{ + PyObject *task; + PyObject *task_loop; + PyObject *set; + PyObject *iter; + + assert(loop != NULL); + + set = PySet_New(NULL); + if (set == NULL) { + return NULL; + } + + iter = PyObject_GetIter(all_tasks); + if (iter == NULL) { + goto fail; + } + + while ((task = PyIter_Next(iter))) { + task_loop = PyObject_GetAttrString(task, "_loop"); + if (task_loop == NULL) { + Py_DECREF(task); + goto fail; + } + if (task_loop == loop) { + if (PySet_Add(set, task) == -1) { + Py_DECREF(task_loop); + Py_DECREF(task); + goto fail; + } + } + Py_DECREF(task_loop); + Py_DECREF(task); + } + + Py_DECREF(iter); + return set; + +fail: + Py_XDECREF(set); + Py_XDECREF(iter); + return NULL; +} + +/*[clinic input] +@classmethod +_asyncio.Task.all_tasks + + loop: 'O' = NULL + +Return a set of all tasks for an event loop. + +By default all tasks for the current event loop are returned. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop) +/*[clinic end generated code: output=11f9b20749ccca5d input=cd64aa5f88bd5c49]*/ +{ + PyObject *res; + + if (loop == NULL) { + loop = PyObject_CallObject(asyncio_get_event_loop, NULL); + if (loop == NULL) { + return NULL; + } + + res = task_all_tasks(loop); + Py_DECREF(loop); + } + else { + res = task_all_tasks(loop); + } + + return res; +} + +/*[clinic input] +_asyncio.Task._repr_info +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task__repr_info_impl(TaskObj *self) +/*[clinic end generated code: output=6a490eb66d5ba34b input=3c6d051ed3ddec8b]*/ +{ + return PyObject_CallFunctionObjArgs( + asyncio_task_repr_info_func, self, NULL); +} + +/*[clinic input] +_asyncio.Task.cancel + +Request that this task cancel itself. + +This arranges for a CancelledError to be thrown into the +wrapped coroutine on the next cycle through the event loop. +The coroutine then has a chance to clean up or even deny +the request using try/except/finally. + +Unlike Future.cancel, this does not guarantee that the +task will be cancelled: the exception might be caught and +acted upon, delaying cancellation of the task or preventing +cancellation completely. The task may also return a value or +raise a different exception. + +Immediately after this method is called, Task.cancelled() will +not return True (unless the task was already cancelled). A +task will be marked as cancelled when the wrapped coroutine +terminates with a CancelledError exception (even if cancel() +was not called). +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_cancel_impl(TaskObj *self) +/*[clinic end generated code: output=6bfc0479da9d5757 input=13f9bf496695cb52]*/ +{ + if (self->task_state != STATE_PENDING) { + Py_RETURN_FALSE; + } + + if (self->task_fut_waiter) { + PyObject *res; + int is_true; + + res = _PyObject_CallMethodId( + self->task_fut_waiter, &PyId_cancel, NULL); + if (res == NULL) { + return NULL; + } + + is_true = PyObject_IsTrue(res); + Py_DECREF(res); + if (is_true < 0) { + return NULL; + } + + if (is_true) { + Py_RETURN_TRUE; + } + } + + self->task_must_cancel = 1; + Py_RETURN_TRUE; +} + +/*[clinic input] +_asyncio.Task.get_stack + + * + limit: 'O' = None + +Return the list of stack frames for this task's coroutine. + +If the coroutine is not done, this returns the stack where it is +suspended. If the coroutine has completed successfully or was +cancelled, this returns an empty list. If the coroutine was +terminated by an exception, this returns the list of traceback +frames. + +The frames are always ordered from oldest to newest. + +The optional limit gives the maximum number of frames to +return; by default all available frames are returned. Its +meaning differs depending on whether a stack or a traceback is +returned: the newest frames of a stack are returned, but the +oldest frames of a traceback are returned. (This matches the +behavior of the traceback module.) + +For reasons beyond our control, only one stack frame is +returned for a suspended coroutine. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_get_stack_impl(TaskObj *self, PyObject *limit) +/*[clinic end generated code: output=c9aeeeebd1e18118 input=b1920230a766d17a]*/ +{ + return PyObject_CallFunctionObjArgs( + asyncio_task_get_stack_func, self, limit, NULL); +} + +/*[clinic input] +_asyncio.Task.print_stack + + * + limit: 'O' = None + file: 'O' = None + +Print the stack or traceback for this task's coroutine. + +This produces output similar to that of the traceback module, +for the frames retrieved by get_stack(). The limit argument +is passed to get_stack(). The file argument is an I/O stream +to which the output is written; by default output is written +to sys.stderr. +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_print_stack_impl(TaskObj *self, PyObject *limit, + PyObject *file) +/*[clinic end generated code: output=7339e10314cd3f4d input=19f1e99ab5400bc3]*/ +{ + return PyObject_CallFunctionObjArgs( + asyncio_task_print_stack_func, self, limit, file, NULL); +} + +/*[clinic input] +_asyncio.Task._step + + exc: 'O' = NULL +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task__step_impl(TaskObj *self, PyObject *exc) +/*[clinic end generated code: output=7ed23f0cefd5ae42 input=ada4b2324e5370af]*/ +{ + return task_step(self, exc == Py_None ? NULL : exc); +} + +/*[clinic input] +_asyncio.Task._wakeup + + fut: 'O' +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task__wakeup_impl(TaskObj *self, PyObject *fut) +/*[clinic end generated code: output=75cb341c760fd071 input=11ee4918a5bdbf21]*/ +{ + return task_wakeup(self, fut); +} + +static void +TaskObj_finalize(TaskObj *task) +{ + _Py_IDENTIFIER(call_exception_handler); + _Py_IDENTIFIER(task); + _Py_IDENTIFIER(message); + _Py_IDENTIFIER(source_traceback); + + PyObject *message = NULL; + PyObject *context = NULL; + PyObject *func = NULL; + PyObject *res = NULL; + + PyObject *error_type, *error_value, *error_traceback; + + if (task->task_state != STATE_PENDING || !task->task_log_destroy_pending) { + goto done; + } + + /* Save the current exception, if any. */ + PyErr_Fetch(&error_type, &error_value, &error_traceback); + + context = PyDict_New(); + if (context == NULL) { + goto finally; + } + + message = PyUnicode_FromString("Task was destroyed but it is pending!"); + if (message == NULL) { + goto finally; + } + + if (_PyDict_SetItemId(context, &PyId_message, message) < 0 || + _PyDict_SetItemId(context, &PyId_task, (PyObject*)task) < 0) + { + goto finally; + } + + if (task->task_source_tb != NULL) { + if (_PyDict_SetItemId(context, &PyId_source_traceback, + task->task_source_tb) < 0) + { + goto finally; + } + } + + func = _PyObject_GetAttrId(task->task_loop, &PyId_call_exception_handler); + if (func != NULL) { + res = _PyObject_CallArg1(func, context); + if (res == NULL) { + PyErr_WriteUnraisable(func); + } + } + +finally: + Py_CLEAR(context); + Py_CLEAR(message); + Py_CLEAR(func); + Py_CLEAR(res); + + /* Restore the saved exception. */ + PyErr_Restore(error_type, error_value, error_traceback); + +done: + FutureObj_finalize((FutureObj*)task); +} + +static void TaskObj_dealloc(PyObject *); /* Needs Task_CheckExact */ + +static PyMethodDef TaskType_methods[] = { + _ASYNCIO_FUTURE_RESULT_METHODDEF + _ASYNCIO_FUTURE_EXCEPTION_METHODDEF + _ASYNCIO_FUTURE_SET_RESULT_METHODDEF + _ASYNCIO_FUTURE_SET_EXCEPTION_METHODDEF + _ASYNCIO_FUTURE_ADD_DONE_CALLBACK_METHODDEF + _ASYNCIO_FUTURE_REMOVE_DONE_CALLBACK_METHODDEF + _ASYNCIO_FUTURE_CANCELLED_METHODDEF + _ASYNCIO_FUTURE_DONE_METHODDEF + _ASYNCIO_TASK_CURRENT_TASK_METHODDEF + _ASYNCIO_TASK_ALL_TASKS_METHODDEF + _ASYNCIO_TASK_CANCEL_METHODDEF + _ASYNCIO_TASK_GET_STACK_METHODDEF + _ASYNCIO_TASK_PRINT_STACK_METHODDEF + _ASYNCIO_TASK__WAKEUP_METHODDEF + _ASYNCIO_TASK__STEP_METHODDEF + _ASYNCIO_TASK__REPR_INFO_METHODDEF + {NULL, NULL} /* Sentinel */ +}; + +static PyGetSetDef TaskType_getsetlist[] = { + FUTURE_COMMON_GETSETLIST + {"_log_destroy_pending", (getter)TaskObj_get_log_destroy_pending, + (setter)TaskObj_set_log_destroy_pending, NULL}, + {"_must_cancel", (getter)TaskObj_get_must_cancel, NULL, NULL}, + {"_coro", (getter)TaskObj_get_coro, NULL, NULL}, + {"_fut_waiter", (getter)TaskObj_get_fut_waiter, NULL, NULL}, + {NULL} /* Sentinel */ +}; + +static PyTypeObject TaskType = { + PyVarObject_HEAD_INIT(NULL, 0) + "_asyncio.Task", + sizeof(TaskObj), /* tp_basicsize */ + .tp_base = &FutureType, + .tp_dealloc = TaskObj_dealloc, + .tp_as_async = &FutureType_as_async, + .tp_repr = (reprfunc)FutureObj_repr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE + | Py_TPFLAGS_HAVE_FINALIZE, + .tp_doc = _asyncio_Task___init____doc__, + .tp_traverse = (traverseproc)TaskObj_traverse, + .tp_clear = (inquiry)TaskObj_clear, + .tp_weaklistoffset = offsetof(TaskObj, task_weakreflist), + .tp_iter = (getiterfunc)future_new_iter, + .tp_methods = TaskType_methods, + .tp_getset = TaskType_getsetlist, + .tp_dictoffset = offsetof(TaskObj, dict), + .tp_init = (initproc)_asyncio_Task___init__, + .tp_new = PyType_GenericNew, + .tp_finalize = (destructor)TaskObj_finalize, +}; + +#define Task_CheckExact(obj) (Py_TYPE(obj) == &TaskType) + +static void +TaskObj_dealloc(PyObject *self) +{ + TaskObj *task = (TaskObj *)self; + + if (Task_CheckExact(self)) { + /* When fut is subclass of Task, finalizer is called from + * subtype_dealloc. + */ + if (PyObject_CallFinalizerFromDealloc(self) < 0) { + // resurrected. + return; + } + } + + if (task->task_weakreflist != NULL) { + PyObject_ClearWeakRefs(self); + } + + (void)TaskObj_clear(task); + Py_TYPE(task)->tp_free(task); +} + +static inline PyObject * +task_call_wakeup(TaskObj *task, PyObject *fut) +{ + if (Task_CheckExact(task)) { + return task_wakeup(task, fut); + } + else { + /* `task` is a subclass of Task */ + return _PyObject_CallMethodId( + (PyObject*)task, &PyId__wakeup, "O", fut, NULL); + } +} + +static inline PyObject * +task_call_step(TaskObj *task, PyObject *arg) +{ + if (Task_CheckExact(task)) { + return task_step(task, arg); + } + else { + /* `task` is a subclass of Task */ + if (arg == NULL) { + arg = Py_None; + } + return _PyObject_CallMethodId( + (PyObject*)task, &PyId__step, "O", arg, NULL); + } +} + +static int +task_call_step_soon(TaskObj *task, PyObject *arg) +{ + PyObject *handle; + + PyObject *cb = TaskSendMethWrapper_new(task, arg); + if (cb == NULL) { + return -1; + } + + handle = _PyObject_CallMethodId( + task->task_loop, &PyId_call_soon, "O", cb, NULL); + Py_DECREF(cb); + if (handle == NULL) { + return -1; + } + + Py_DECREF(handle); + return 0; +} + +static PyObject * +task_set_error_soon(TaskObj *task, PyObject *et, const char *format, ...) +{ + PyObject* msg; + + va_list vargs; +#ifdef HAVE_STDARG_PROTOTYPES + va_start(vargs, format); +#else + va_start(vargs); +#endif + msg = PyUnicode_FromFormatV(format, vargs); + va_end(vargs); + + if (msg == NULL) { + return NULL; + } + + PyObject *e = PyObject_CallFunctionObjArgs(et, msg, NULL); + Py_DECREF(msg); + if (e == NULL) { + return NULL; + } + + if (task_call_step_soon(task, e) == -1) { + Py_DECREF(e); + return NULL; + } + + Py_DECREF(e); + Py_RETURN_NONE; +} + +static PyObject * +task_step_impl(TaskObj *task, PyObject *exc) +{ + int res; + int clear_exc = 0; + PyObject *result = NULL; + PyObject *coro = task->task_coro; + PyObject *o; + + if (task->task_state != STATE_PENDING) { + PyErr_Format(PyExc_AssertionError, + "_step(): already done: %R %R", + task, + exc ? exc : Py_None); + goto fail; + } + + if (task->task_must_cancel) { + assert(exc != Py_None); + + if (exc) { + /* Check if exc is a CancelledError */ + res = PyObject_IsInstance(exc, asyncio_CancelledError); + if (res == -1) { + /* An error occurred, abort */ + goto fail; + } + if (res == 0) { + /* exc is not CancelledError; reset it to NULL */ + exc = NULL; + } + } + + if (!exc) { + /* exc was not a CancelledError */ + exc = PyObject_CallFunctionObjArgs(asyncio_CancelledError, NULL); + if (!exc) { + goto fail; + } + clear_exc = 1; + } + + task->task_must_cancel = 0; + } + + Py_CLEAR(task->task_fut_waiter); + + if (exc == NULL) { + if (PyGen_CheckExact(coro) || PyCoro_CheckExact(coro)) { + result = _PyGen_Send((PyGenObject*)coro, Py_None); + } + else { + result = _PyObject_CallMethodIdObjArgs( + coro, &PyId_send, Py_None, NULL); + } + } + else { + result = _PyObject_CallMethodIdObjArgs( + coro, &PyId_throw, exc, NULL); + if (clear_exc) { + /* We created 'exc' during this call */ + Py_CLEAR(exc); + } + } + + if (result == NULL) { + PyObject *et, *ev, *tb; + + if (_PyGen_FetchStopIterationValue(&o) == 0) { + /* The error is StopIteration and that means that + the underlying coroutine has resolved */ + PyObject *res = future_set_result((FutureObj*)task, o); + Py_DECREF(o); + if (res == NULL) { + return NULL; + } + Py_DECREF(res); + Py_RETURN_NONE; + } + + if (PyErr_ExceptionMatches(asyncio_CancelledError)) { + /* CancelledError */ + PyErr_Clear(); + return future_cancel((FutureObj*)task); + } + + /* Some other exception; pop it and call Task.set_exception() */ + PyErr_Fetch(&et, &ev, &tb); + assert(et); + if (!ev || !PyObject_TypeCheck(ev, (PyTypeObject *) et)) { + PyErr_NormalizeException(&et, &ev, &tb); + } + if (tb != NULL) { + PyException_SetTraceback(ev, tb); + } + o = future_set_exception((FutureObj*)task, ev); + if (!o) { + /* An exception in Task.set_exception() */ + Py_XDECREF(et); + Py_XDECREF(tb); + Py_XDECREF(ev); + goto fail; + } + assert(o == Py_None); + Py_CLEAR(o); + + if (!PyErr_GivenExceptionMatches(et, PyExc_Exception)) { + /* We've got a BaseException; re-raise it */ + PyErr_Restore(et, ev, tb); + goto fail; + } + + Py_XDECREF(et); + Py_XDECREF(tb); + Py_XDECREF(ev); + + Py_RETURN_NONE; + } + + if (result == (PyObject*)task) { + /* We have a task that wants to await on itself */ + goto self_await; + } + + /* Check if `result` is FutureObj or TaskObj (and not a subclass) */ + if (Future_CheckExact(result) || Task_CheckExact(result)) { + PyObject *wrapper; + PyObject *res; + FutureObj *fut = (FutureObj*)result; + + /* Check if `result` future is attached to a different loop */ + if (fut->fut_loop != task->task_loop) { + goto different_loop; + } + + if (fut->fut_blocking) { + fut->fut_blocking = 0; + + /* result.add_done_callback(task._wakeup) */ + wrapper = TaskWakeupMethWrapper_new(task); + if (wrapper == NULL) { + goto fail; + } + res = future_add_done_callback((FutureObj*)result, wrapper); + Py_DECREF(wrapper); + if (res == NULL) { + goto fail; + } + Py_DECREF(res); + + /* task._fut_waiter = result */ + task->task_fut_waiter = result; /* no incref is necessary */ + + if (task->task_must_cancel) { + PyObject *r; + r = future_cancel(fut); + if (r == NULL) { + return NULL; + } + if (r == Py_True) { + task->task_must_cancel = 0; + } + Py_DECREF(r); + } + + Py_RETURN_NONE; + } + else { + goto yield_insteadof_yf; + } + } + + /* Check if `result` is a Future-compatible object */ + o = PyObject_GetAttrString(result, "_asyncio_future_blocking"); + if (o == NULL) { + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + PyErr_Clear(); + } + else { + goto fail; + } + } + else { + if (o == Py_None) { + Py_CLEAR(o); + } + else { + /* `result` is a Future-compatible object */ + PyObject *wrapper; + PyObject *res; + + int blocking = PyObject_IsTrue(o); + Py_CLEAR(o); + if (blocking < 0) { + goto fail; + } + + /* Check if `result` future is attached to a different loop */ + PyObject *oloop = PyObject_GetAttrString(result, "_loop"); + if (oloop == NULL) { + goto fail; + } + if (oloop != task->task_loop) { + Py_DECREF(oloop); + goto different_loop; + } + else { + Py_DECREF(oloop); + } + + if (blocking) { + /* result._asyncio_future_blocking = False */ + if (PyObject_SetAttrString( + result, "_asyncio_future_blocking", Py_False) == -1) { + goto fail; + } + + /* result.add_done_callback(task._wakeup) */ + wrapper = TaskWakeupMethWrapper_new(task); + if (wrapper == NULL) { + goto fail; + } + res = _PyObject_CallMethodId( + result, &PyId_add_done_callback, "O", wrapper, NULL); + Py_DECREF(wrapper); + if (res == NULL) { + goto fail; + } + Py_DECREF(res); + + /* task._fut_waiter = result */ + task->task_fut_waiter = result; /* no incref is necessary */ + + if (task->task_must_cancel) { + PyObject *r; + int is_true; + r = _PyObject_CallMethodId(result, &PyId_cancel, NULL); + if (r == NULL) { + return NULL; + } + is_true = PyObject_IsTrue(r); + Py_DECREF(r); + if (is_true < 0) { + return NULL; + } + else if (is_true) { + task->task_must_cancel = 0; + } + } + + Py_RETURN_NONE; + } + else { + goto yield_insteadof_yf; + } + } + } + + /* Check if `result` is None */ + if (result == Py_None) { + /* Bare yield relinquishes control for one event loop iteration. */ + if (task_call_step_soon(task, NULL)) { + goto fail; + } + return result; + } + + /* Check if `result` is a generator */ + o = PyObject_CallFunctionObjArgs(inspect_isgenerator, result, NULL); + if (o == NULL) { + /* An exception in inspect.isgenerator */ + goto fail; + } + res = PyObject_IsTrue(o); + Py_CLEAR(o); + if (res == -1) { + /* An exception while checking if 'val' is True */ + goto fail; + } + if (res == 1) { + /* `result` is a generator */ + PyObject *ret; + ret = task_set_error_soon( + task, PyExc_RuntimeError, + "yield was used instead of yield from for " + "generator in task %R with %S", task, result); + Py_DECREF(result); + return ret; + } + + /* The `result` is none of the above */ + Py_DECREF(result); + return task_set_error_soon( + task, PyExc_RuntimeError, "Task got bad yield: %R", result); + +self_await: + o = task_set_error_soon( + task, PyExc_RuntimeError, + "Task cannot await on itself: %R", task); + Py_DECREF(result); + return o; + +yield_insteadof_yf: + o = task_set_error_soon( + task, PyExc_RuntimeError, + "yield was used instead of yield from " + "in task %R with %R", + task, result); + Py_DECREF(result); + return o; + +different_loop: + o = task_set_error_soon( + task, PyExc_RuntimeError, + "Task %R got Future %R attached to a different loop", + task, result); + Py_DECREF(result); + return o; + +fail: + Py_XDECREF(result); + return NULL; +} + +static PyObject * +task_step(TaskObj *task, PyObject *exc) +{ + PyObject *res; + PyObject *ot; + + if (PyDict_SetItem(current_tasks, + task->task_loop, (PyObject*)task) == -1) + { + return NULL; + } + + res = task_step_impl(task, exc); + + if (res == NULL) { + PyObject *et, *ev, *tb; + PyErr_Fetch(&et, &ev, &tb); + ot = _PyDict_Pop(current_tasks, task->task_loop, NULL); + if (ot == NULL) { + Py_XDECREF(et); + Py_XDECREF(tb); + Py_XDECREF(ev); + return NULL; + } + Py_DECREF(ot); + PyErr_Restore(et, ev, tb); + return NULL; + } + else { + ot = _PyDict_Pop(current_tasks, task->task_loop, NULL); + if (ot == NULL) { + Py_DECREF(res); + return NULL; + } + else { + Py_DECREF(ot); + return res; + } + } +} + +static PyObject * +task_wakeup(TaskObj *task, PyObject *o) +{ + assert(o); + + if (Future_CheckExact(o) || Task_CheckExact(o)) { + PyObject *fut_result = NULL; + int res = future_get_result((FutureObj*)o, &fut_result); + PyObject *result; + + switch(res) { + case -1: + assert(fut_result == NULL); + return NULL; + case 0: + Py_DECREF(fut_result); + return task_call_step(task, NULL); + default: + assert(res == 1); + result = task_call_step(task, fut_result); + Py_DECREF(fut_result); + return result; + } + } + + PyObject *fut_result = PyObject_CallMethod(o, "result", NULL); + if (fut_result == NULL) { + PyObject *et, *ev, *tb; + PyObject *res; + + PyErr_Fetch(&et, &ev, &tb); + if (!ev || !PyObject_TypeCheck(ev, (PyTypeObject *) et)) { + PyErr_NormalizeException(&et, &ev, &tb); + } + + res = task_call_step(task, ev); + + Py_XDECREF(et); + Py_XDECREF(tb); + Py_XDECREF(ev); + + return res; + } + else { + Py_DECREF(fut_result); + return task_call_step(task, NULL); + } +} + + +/*********************** Module **************************/ + + +static void +module_free(void *m) +{ + Py_CLEAR(current_tasks); + Py_CLEAR(all_tasks); + Py_CLEAR(traceback_extract_stack); + Py_CLEAR(asyncio_get_event_loop); + Py_CLEAR(asyncio_future_repr_info_func); + Py_CLEAR(asyncio_task_repr_info_func); + Py_CLEAR(asyncio_task_get_stack_func); + Py_CLEAR(asyncio_task_print_stack_func); + Py_CLEAR(asyncio_InvalidStateError); + Py_CLEAR(asyncio_CancelledError); + Py_CLEAR(inspect_isgenerator); +} + +static int +module_init(void) +{ + PyObject *module = NULL; + PyObject *cls; + +#define WITH_MOD(NAME) \ + Py_CLEAR(module); \ + module = PyImport_ImportModule(NAME); \ + if (module == NULL) { \ + return -1; \ + } + +#define GET_MOD_ATTR(VAR, NAME) \ + VAR = PyObject_GetAttrString(module, NAME); \ + if (VAR == NULL) { \ + goto fail; \ + } + + WITH_MOD("asyncio.events") + GET_MOD_ATTR(asyncio_get_event_loop, "get_event_loop") + + WITH_MOD("asyncio.base_futures") + GET_MOD_ATTR(asyncio_future_repr_info_func, "_future_repr_info") + GET_MOD_ATTR(asyncio_InvalidStateError, "InvalidStateError") + GET_MOD_ATTR(asyncio_CancelledError, "CancelledError") + + WITH_MOD("asyncio.base_tasks") + GET_MOD_ATTR(asyncio_task_repr_info_func, "_task_repr_info") + GET_MOD_ATTR(asyncio_task_get_stack_func, "_task_get_stack") + GET_MOD_ATTR(asyncio_task_print_stack_func, "_task_print_stack") + + WITH_MOD("inspect") + GET_MOD_ATTR(inspect_isgenerator, "isgenerator") + + WITH_MOD("traceback") + GET_MOD_ATTR(traceback_extract_stack, "extract_stack") + + WITH_MOD("weakref") + GET_MOD_ATTR(cls, "WeakSet") + all_tasks = PyObject_CallObject(cls, NULL); + Py_CLEAR(cls); + if (all_tasks == NULL) { + goto fail; + } + + current_tasks = PyDict_New(); + if (current_tasks == NULL) { + goto fail; + } + + Py_CLEAR(module); + return 0; + +fail: + Py_CLEAR(module); + module_free(NULL); + return -1; + +#undef WITH_MOD +#undef GET_MOD_ATTR +} + +PyDoc_STRVAR(module_doc, "Accelerator module for asyncio"); + +static struct PyModuleDef _asynciomodule = { + PyModuleDef_HEAD_INIT, /* m_base */ + "_asyncio", /* m_name */ + module_doc, /* m_doc */ + -1, /* m_size */ + NULL, /* m_methods */ + NULL, /* m_slots */ + NULL, /* m_traverse */ + NULL, /* m_clear */ + (freefunc)module_free /* m_free */ +}; + + +PyMODINIT_FUNC +PyInit__asyncio(void) +{ + if (module_init() < 0) { + return NULL; + } + if (PyType_Ready(&FutureType) < 0) { + return NULL; + } + if (PyType_Ready(&FutureIterType) < 0) { + return NULL; + } + if (PyType_Ready(&TaskSendMethWrapper_Type) < 0) { + return NULL; + } + if(PyType_Ready(&TaskWakeupMethWrapper_Type) < 0) { + return NULL; + } + if (PyType_Ready(&TaskType) < 0) { + return NULL; + } + + PyObject *m = PyModule_Create(&_asynciomodule); + if (m == NULL) { + return NULL; + } + + Py_INCREF(&FutureType); + if (PyModule_AddObject(m, "Future", (PyObject *)&FutureType) < 0) { + Py_DECREF(&FutureType); + return NULL; + } + + Py_INCREF(&TaskType); + if (PyModule_AddObject(m, "Task", (PyObject *)&TaskType) < 0) { + Py_DECREF(&TaskType); + return NULL; + } + + return m; +} diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c index 02b55d1..22ddbf2 100644 --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -12,7 +12,8 @@ static Py_ssize_t internal_bisect_right(PyObject *list, PyObject *item, Py_ssize_t lo, Py_ssize_t hi) { PyObject *litem; - Py_ssize_t mid, res; + Py_ssize_t mid; + int res; if (lo < 0) { PyErr_SetString(PyExc_ValueError, "lo must be non-negative"); @@ -115,7 +116,8 @@ static Py_ssize_t internal_bisect_left(PyObject *list, PyObject *item, Py_ssize_t lo, Py_ssize_t hi) { PyObject *litem; - Py_ssize_t mid, res; + Py_ssize_t mid; + int res; if (lo < 0) { PyErr_SetString(PyExc_ValueError, "lo must be non-negative"); diff --git a/Modules/_blake2/blake2b2s.py b/Modules/_blake2/blake2b2s.py new file mode 100755 index 0000000..01cf265 --- /dev/null +++ b/Modules/_blake2/blake2b2s.py @@ -0,0 +1,49 @@ +#!/usr/bin/python3 + +import os +import re + +HERE = os.path.dirname(os.path.abspath(__file__)) +BLAKE2 = os.path.join(HERE, 'impl') + +PUBLIC_SEARCH = re.compile(r'\ int (blake2[bs]p?[a-z_]*)\(') + + +def getfiles(): + for name in os.listdir(BLAKE2): + name = os.path.join(BLAKE2, name) + if os.path.isfile(name): + yield name + + +def find_public(): + public_funcs = set() + for name in getfiles(): + with open(name) as f: + for line in f: + # find public functions + mo = PUBLIC_SEARCH.search(line) + if mo: + public_funcs.add(mo.group(1)) + + for f in sorted(public_funcs): + print('#define {0:<18} PyBlake2_{0}'.format(f)) + + return public_funcs + + +def main(): + lines = [] + with open(os.path.join(HERE, 'blake2b_impl.c')) as f: + for line in f: + line = line.replace('blake2b', 'blake2s') + line = line.replace('BLAKE2b', 'BLAKE2s') + line = line.replace('BLAKE2B', 'BLAKE2S') + lines.append(line) + with open(os.path.join(HERE, 'blake2s_impl.c'), 'w') as f: + f.write(''.join(lines)) + # find_public() + + +if __name__ == '__main__': + main() diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c new file mode 100644 index 0000000..58b502b --- /dev/null +++ b/Modules/_blake2/blake2b_impl.c @@ -0,0 +1,460 @@ +/* + * Written in 2013 by Dmitry Chestnykh + * Modified for CPython by Christian Heimes + * + * To the extent possible under law, the author have dedicated all + * copyright and related and neighboring rights to this software to + * the public domain worldwide. This software is distributed without + * any warranty. http://creativecommons.org/publicdomain/zero/1.0/ + */ + +/* WARNING: autogenerated file! + * + * The blake2s_impl.c is autogenerated from blake2b_impl.c. + */ + +#include "Python.h" +#include "pystrhex.h" +#ifdef WITH_THREAD +#include "pythread.h" +#endif + +#include "../hashlib.h" +#include "blake2ns.h" + +#define HAVE_BLAKE2B 1 +#define BLAKE2_LOCAL_INLINE(type) Py_LOCAL_INLINE(type) + +#include "impl/blake2.h" +#include "impl/blake2-impl.h" /* for secure_zero_memory() and store48() */ + +#ifdef BLAKE2_USE_SSE +#include "impl/blake2b.c" +#else +#include "impl/blake2b-ref.c" +#endif + + +extern PyTypeObject PyBlake2_BLAKE2bType; + +typedef struct { + PyObject_HEAD + blake2b_param param; + blake2b_state state; +#ifdef WITH_THREAD + PyThread_type_lock lock; +#endif +} BLAKE2bObject; + +#include "clinic/blake2b_impl.c.h" + +/*[clinic input] +module _blake2b +class _blake2b.blake2b "BLAKE2bObject *" "&PyBlake2_BLAKE2bType" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=6893358c6622aecf]*/ + + +static BLAKE2bObject * +new_BLAKE2bObject(PyTypeObject *type) +{ + BLAKE2bObject *self; + self = (BLAKE2bObject *)type->tp_alloc(type, 0); +#ifdef WITH_THREAD + if (self != NULL) { + self->lock = NULL; + } +#endif + return self; +} + +/*[clinic input] +@classmethod +_blake2b.blake2b.__new__ as py_blake2b_new + string as data: object = NULL + * + digest_size: int(c_default="BLAKE2B_OUTBYTES") = _blake2b.blake2b.MAX_DIGEST_SIZE + key: Py_buffer = None + salt: Py_buffer = None + person: Py_buffer = None + fanout: int = 1 + depth: int = 1 + leaf_size as leaf_size_obj: object = NULL + node_offset as node_offset_obj: object = NULL + node_depth: int = 0 + inner_size: int = 0 + last_node: bool = False + +Return a new BLAKE2b hash object. +[clinic start generated code]*/ + +static PyObject * +py_blake2b_new_impl(PyTypeObject *type, PyObject *data, int digest_size, + Py_buffer *key, Py_buffer *salt, Py_buffer *person, + int fanout, int depth, PyObject *leaf_size_obj, + PyObject *node_offset_obj, int node_depth, + int inner_size, int last_node) +/*[clinic end generated code: output=7506d8d890e5f13b input=e41548dfa0866031]*/ +{ + BLAKE2bObject *self = NULL; + Py_buffer buf; + + unsigned long leaf_size = 0; + unsigned long long node_offset = 0; + + self = new_BLAKE2bObject(type); + if (self == NULL) { + goto error; + } + + /* Zero parameter block. */ + memset(&self->param, 0, sizeof(self->param)); + + /* Set digest size. */ + if (digest_size <= 0 || digest_size > BLAKE2B_OUTBYTES) { + PyErr_Format(PyExc_ValueError, + "digest_size must be between 1 and %d bytes", + BLAKE2B_OUTBYTES); + goto error; + } + self->param.digest_length = digest_size; + + /* Set salt parameter. */ + if ((salt->obj != NULL) && salt->len) { + if (salt->len > BLAKE2B_SALTBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum salt length is %d bytes", + BLAKE2B_SALTBYTES); + goto error; + } + memcpy(self->param.salt, salt->buf, salt->len); + } + + /* Set personalization parameter. */ + if ((person->obj != NULL) && person->len) { + if (person->len > BLAKE2B_PERSONALBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum person length is %d bytes", + BLAKE2B_PERSONALBYTES); + goto error; + } + memcpy(self->param.personal, person->buf, person->len); + } + + /* Set tree parameters. */ + if (fanout < 0 || fanout > 255) { + PyErr_SetString(PyExc_ValueError, + "fanout must be between 0 and 255"); + goto error; + } + self->param.fanout = (uint8_t)fanout; + + if (depth <= 0 || depth > 255) { + PyErr_SetString(PyExc_ValueError, + "depth must be between 1 and 255"); + goto error; + } + self->param.depth = (uint8_t)depth; + + if (leaf_size_obj != NULL) { + leaf_size = PyLong_AsUnsignedLong(leaf_size_obj); + if (leaf_size == (unsigned long) -1 && PyErr_Occurred()) { + goto error; + } + if (leaf_size > 0xFFFFFFFFU) { + PyErr_SetString(PyExc_OverflowError, "leaf_size is too large"); + goto error; + } + } + self->param.leaf_length = (unsigned int)leaf_size; + + if (node_offset_obj != NULL) { + node_offset = PyLong_AsUnsignedLongLong(node_offset_obj); + if (node_offset == (unsigned long long) -1 && PyErr_Occurred()) { + goto error; + } + } +#ifdef HAVE_BLAKE2S + if (node_offset > 0xFFFFFFFFFFFFULL) { + /* maximum 2**48 - 1 */ + PyErr_SetString(PyExc_OverflowError, "node_offset is too large"); + goto error; + } + store48(&(self->param.node_offset), node_offset); +#else + self->param.node_offset = node_offset; +#endif + + if (node_depth < 0 || node_depth > 255) { + PyErr_SetString(PyExc_ValueError, + "node_depth must be between 0 and 255"); + goto error; + } + self->param.node_depth = node_depth; + + if (inner_size < 0 || inner_size > BLAKE2B_OUTBYTES) { + PyErr_Format(PyExc_ValueError, + "inner_size must be between 0 and is %d", + BLAKE2B_OUTBYTES); + goto error; + } + self->param.inner_length = inner_size; + + /* Set key length. */ + if ((key->obj != NULL) && key->len) { + if (key->len > BLAKE2B_KEYBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum key length is %d bytes", + BLAKE2B_KEYBYTES); + goto error; + } + self->param.key_length = (uint8_t)key->len; + } + + /* Initialize hash state. */ + if (blake2b_init_param(&self->state, &self->param) < 0) { + PyErr_SetString(PyExc_RuntimeError, + "error initializing hash state"); + goto error; + } + + /* Set last node flag (must come after initialization). */ + self->state.last_node = last_node; + + /* Process key block if any. */ + if (self->param.key_length) { + uint8_t block[BLAKE2B_BLOCKBYTES]; + memset(block, 0, sizeof(block)); + memcpy(block, key->buf, key->len); + blake2b_update(&self->state, block, sizeof(block)); + secure_zero_memory(block, sizeof(block)); + } + + /* Process initial data if any. */ + if (data != NULL) { + GET_BUFFER_VIEW_OR_ERROR(data, &buf, goto error); + + if (buf.len >= HASHLIB_GIL_MINSIZE) { + Py_BEGIN_ALLOW_THREADS + blake2b_update(&self->state, buf.buf, buf.len); + Py_END_ALLOW_THREADS + } else { + blake2b_update(&self->state, buf.buf, buf.len); + } + PyBuffer_Release(&buf); + } + + return (PyObject *)self; + + error: + if (self != NULL) { + Py_DECREF(self); + } + return NULL; +} + +/*[clinic input] +_blake2b.blake2b.copy + +Return a copy of the hash object. +[clinic start generated code]*/ + +static PyObject * +_blake2b_blake2b_copy_impl(BLAKE2bObject *self) +/*[clinic end generated code: output=c89cd33550ab1543 input=4c9c319f18f10747]*/ +{ + BLAKE2bObject *cpy; + + if ((cpy = new_BLAKE2bObject(Py_TYPE(self))) == NULL) + return NULL; + + ENTER_HASHLIB(self); + cpy->param = self->param; + cpy->state = self->state; + LEAVE_HASHLIB(self); + return (PyObject *)cpy; +} + +/*[clinic input] +_blake2b.blake2b.update + + obj: object + / + +Update this hash object's state with the provided string. +[clinic start generated code]*/ + +static PyObject * +_blake2b_blake2b_update(BLAKE2bObject *self, PyObject *obj) +/*[clinic end generated code: output=a888f07c4cddbe94 input=3ecb8c13ee4260f2]*/ +{ + Py_buffer buf; + + GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); + +#ifdef WITH_THREAD + if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE) + self->lock = PyThread_allocate_lock(); + + if (self->lock != NULL) { + Py_BEGIN_ALLOW_THREADS + PyThread_acquire_lock(self->lock, 1); + blake2b_update(&self->state, buf.buf, buf.len); + PyThread_release_lock(self->lock); + Py_END_ALLOW_THREADS + } else { + blake2b_update(&self->state, buf.buf, buf.len); + } +#else + blake2b_update(&self->state, buf.buf, buf.len); +#endif /* !WITH_THREAD */ + PyBuffer_Release(&buf); + + Py_INCREF(Py_None); + return Py_None; +} + +/*[clinic input] +_blake2b.blake2b.digest + +Return the digest value as a string of binary data. +[clinic start generated code]*/ + +static PyObject * +_blake2b_blake2b_digest_impl(BLAKE2bObject *self) +/*[clinic end generated code: output=b13a79360d984740 input=ac2fa462ebb1b9c7]*/ +{ + uint8_t digest[BLAKE2B_OUTBYTES]; + blake2b_state state_cpy; + + ENTER_HASHLIB(self); + state_cpy = self->state; + blake2b_final(&state_cpy, digest, self->param.digest_length); + LEAVE_HASHLIB(self); + return PyBytes_FromStringAndSize((const char *)digest, + self->param.digest_length); +} + +/*[clinic input] +_blake2b.blake2b.hexdigest + +Return the digest value as a string of hexadecimal digits. +[clinic start generated code]*/ + +static PyObject * +_blake2b_blake2b_hexdigest_impl(BLAKE2bObject *self) +/*[clinic end generated code: output=6a503611715b24bd input=d58f0b2f37812e33]*/ +{ + uint8_t digest[BLAKE2B_OUTBYTES]; + blake2b_state state_cpy; + + ENTER_HASHLIB(self); + state_cpy = self->state; + blake2b_final(&state_cpy, digest, self->param.digest_length); + LEAVE_HASHLIB(self); + return _Py_strhex((const char *)digest, self->param.digest_length); +} + + +static PyMethodDef py_blake2b_methods[] = { + _BLAKE2B_BLAKE2B_COPY_METHODDEF + _BLAKE2B_BLAKE2B_DIGEST_METHODDEF + _BLAKE2B_BLAKE2B_HEXDIGEST_METHODDEF + _BLAKE2B_BLAKE2B_UPDATE_METHODDEF + {NULL, NULL} +}; + + + +static PyObject * +py_blake2b_get_name(BLAKE2bObject *self, void *closure) +{ + return PyUnicode_FromString("blake2b"); +} + + + +static PyObject * +py_blake2b_get_block_size(BLAKE2bObject *self, void *closure) +{ + return PyLong_FromLong(BLAKE2B_BLOCKBYTES); +} + + + +static PyObject * +py_blake2b_get_digest_size(BLAKE2bObject *self, void *closure) +{ + return PyLong_FromLong(self->param.digest_length); +} + + +static PyGetSetDef py_blake2b_getsetters[] = { + {"name", (getter)py_blake2b_get_name, + NULL, NULL, NULL}, + {"block_size", (getter)py_blake2b_get_block_size, + NULL, NULL, NULL}, + {"digest_size", (getter)py_blake2b_get_digest_size, + NULL, NULL, NULL}, + {NULL} +}; + + +static void +py_blake2b_dealloc(PyObject *self) +{ + BLAKE2bObject *obj = (BLAKE2bObject *)self; + + /* Try not to leave state in memory. */ + secure_zero_memory(&obj->param, sizeof(obj->param)); + secure_zero_memory(&obj->state, sizeof(obj->state)); +#ifdef WITH_THREAD + if (obj->lock) { + PyThread_free_lock(obj->lock); + obj->lock = NULL; + } +#endif + PyObject_Del(self); +} + + +PyTypeObject PyBlake2_BLAKE2bType = { + PyVarObject_HEAD_INIT(NULL, 0) + "_blake2.blake2b", /* tp_name */ + sizeof(BLAKE2bObject), /* tp_size */ + 0, /* tp_itemsize */ + py_blake2b_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + py_blake2b_new__doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + py_blake2b_methods, /* tp_methods */ + 0, /* tp_members */ + py_blake2b_getsetters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + py_blake2b_new, /* tp_new */ +}; diff --git a/Modules/_blake2/blake2module.c b/Modules/_blake2/blake2module.c new file mode 100644 index 0000000..e2a3d42 --- /dev/null +++ b/Modules/_blake2/blake2module.c @@ -0,0 +1,105 @@ +/* + * Written in 2013 by Dmitry Chestnykh + * Modified for CPython by Christian Heimes + * + * To the extent possible under law, the author have dedicated all + * copyright and related and neighboring rights to this software to + * the public domain worldwide. This software is distributed without + * any warranty. http://creativecommons.org/publicdomain/zero/1.0/ + */ + +#include "Python.h" + +#include "impl/blake2.h" + +extern PyTypeObject PyBlake2_BLAKE2bType; +extern PyTypeObject PyBlake2_BLAKE2sType; + + +PyDoc_STRVAR(blake2mod__doc__, +"_blake2b provides BLAKE2b for hashlib\n" +); + + +static struct PyMethodDef blake2mod_functions[] = { + {NULL, NULL} +}; + +static struct PyModuleDef blake2_module = { + PyModuleDef_HEAD_INIT, + "_blake2", + blake2mod__doc__, + -1, + blake2mod_functions, + NULL, + NULL, + NULL, + NULL +}; + +#define ADD_INT(d, name, value) do { \ + PyObject *x = PyLong_FromLong(value); \ + if (!x) { \ + Py_DECREF(m); \ + return NULL; \ + } \ + if (PyDict_SetItemString(d, name, x) < 0) { \ + Py_DECREF(m); \ + return NULL; \ + } \ + Py_DECREF(x); \ +} while(0) + + +PyMODINIT_FUNC +PyInit__blake2(void) +{ + PyObject *m; + PyObject *d; + + m = PyModule_Create(&blake2_module); + if (m == NULL) + return NULL; + + /* BLAKE2b */ + Py_TYPE(&PyBlake2_BLAKE2bType) = &PyType_Type; + if (PyType_Ready(&PyBlake2_BLAKE2bType) < 0) { + return NULL; + } + + Py_INCREF(&PyBlake2_BLAKE2bType); + PyModule_AddObject(m, "blake2b", (PyObject *)&PyBlake2_BLAKE2bType); + + d = PyBlake2_BLAKE2bType.tp_dict; + ADD_INT(d, "SALT_SIZE", BLAKE2B_SALTBYTES); + ADD_INT(d, "PERSON_SIZE", BLAKE2B_PERSONALBYTES); + ADD_INT(d, "MAX_KEY_SIZE", BLAKE2B_KEYBYTES); + ADD_INT(d, "MAX_DIGEST_SIZE", BLAKE2B_OUTBYTES); + + PyModule_AddIntConstant(m, "BLAKE2B_SALT_SIZE", BLAKE2B_SALTBYTES); + PyModule_AddIntConstant(m, "BLAKE2B_PERSON_SIZE", BLAKE2B_PERSONALBYTES); + PyModule_AddIntConstant(m, "BLAKE2B_MAX_KEY_SIZE", BLAKE2B_KEYBYTES); + PyModule_AddIntConstant(m, "BLAKE2B_MAX_DIGEST_SIZE", BLAKE2B_OUTBYTES); + + /* BLAKE2s */ + Py_TYPE(&PyBlake2_BLAKE2sType) = &PyType_Type; + if (PyType_Ready(&PyBlake2_BLAKE2sType) < 0) { + return NULL; + } + + Py_INCREF(&PyBlake2_BLAKE2sType); + PyModule_AddObject(m, "blake2s", (PyObject *)&PyBlake2_BLAKE2sType); + + d = PyBlake2_BLAKE2sType.tp_dict; + ADD_INT(d, "SALT_SIZE", BLAKE2S_SALTBYTES); + ADD_INT(d, "PERSON_SIZE", BLAKE2S_PERSONALBYTES); + ADD_INT(d, "MAX_KEY_SIZE", BLAKE2S_KEYBYTES); + ADD_INT(d, "MAX_DIGEST_SIZE", BLAKE2S_OUTBYTES); + + PyModule_AddIntConstant(m, "BLAKE2S_SALT_SIZE", BLAKE2S_SALTBYTES); + PyModule_AddIntConstant(m, "BLAKE2S_PERSON_SIZE", BLAKE2S_PERSONALBYTES); + PyModule_AddIntConstant(m, "BLAKE2S_MAX_KEY_SIZE", BLAKE2S_KEYBYTES); + PyModule_AddIntConstant(m, "BLAKE2S_MAX_DIGEST_SIZE", BLAKE2S_OUTBYTES); + + return m; +} diff --git a/Modules/_blake2/blake2ns.h b/Modules/_blake2/blake2ns.h new file mode 100644 index 0000000..53bce8e --- /dev/null +++ b/Modules/_blake2/blake2ns.h @@ -0,0 +1,32 @@ +/* Prefix all public blake2 symbols with PyBlake2_ + */ + +#ifndef Py_BLAKE2_NS +#define Py_BLAKE2_NS + +#define blake2b PyBlake2_blake2b +#define blake2b_compress PyBlake2_blake2b_compress +#define blake2b_final PyBlake2_blake2b_final +#define blake2b_init PyBlake2_blake2b_init +#define blake2b_init_key PyBlake2_blake2b_init_key +#define blake2b_init_param PyBlake2_blake2b_init_param +#define blake2b_update PyBlake2_blake2b_update +#define blake2bp PyBlake2_blake2bp +#define blake2bp_final PyBlake2_blake2bp_final +#define blake2bp_init PyBlake2_blake2bp_init +#define blake2bp_init_key PyBlake2_blake2bp_init_key +#define blake2bp_update PyBlake2_blake2bp_update +#define blake2s PyBlake2_blake2s +#define blake2s_compress PyBlake2_blake2s_compress +#define blake2s_final PyBlake2_blake2s_final +#define blake2s_init PyBlake2_blake2s_init +#define blake2s_init_key PyBlake2_blake2s_init_key +#define blake2s_init_param PyBlake2_blake2s_init_param +#define blake2s_update PyBlake2_blake2s_update +#define blake2sp PyBlake2_blake2sp +#define blake2sp_final PyBlake2_blake2sp_final +#define blake2sp_init PyBlake2_blake2sp_init +#define blake2sp_init_key PyBlake2_blake2sp_init_key +#define blake2sp_update PyBlake2_blake2sp_update + +#endif /* Py_BLAKE2_NS */ diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c new file mode 100644 index 0000000..11d2e02 --- /dev/null +++ b/Modules/_blake2/blake2s_impl.c @@ -0,0 +1,460 @@ +/* + * Written in 2013 by Dmitry Chestnykh + * Modified for CPython by Christian Heimes + * + * To the extent possible under law, the author have dedicated all + * copyright and related and neighboring rights to this software to + * the public domain worldwide. This software is distributed without + * any warranty. http://creativecommons.org/publicdomain/zero/1.0/ + */ + +/* WARNING: autogenerated file! + * + * The blake2s_impl.c is autogenerated from blake2s_impl.c. + */ + +#include "Python.h" +#include "pystrhex.h" +#ifdef WITH_THREAD +#include "pythread.h" +#endif + +#include "../hashlib.h" +#include "blake2ns.h" + +#define HAVE_BLAKE2S 1 +#define BLAKE2_LOCAL_INLINE(type) Py_LOCAL_INLINE(type) + +#include "impl/blake2.h" +#include "impl/blake2-impl.h" /* for secure_zero_memory() and store48() */ + +#ifdef BLAKE2_USE_SSE +#include "impl/blake2s.c" +#else +#include "impl/blake2s-ref.c" +#endif + + +extern PyTypeObject PyBlake2_BLAKE2sType; + +typedef struct { + PyObject_HEAD + blake2s_param param; + blake2s_state state; +#ifdef WITH_THREAD + PyThread_type_lock lock; +#endif +} BLAKE2sObject; + +#include "clinic/blake2s_impl.c.h" + +/*[clinic input] +module _blake2s +class _blake2s.blake2s "BLAKE2sObject *" "&PyBlake2_BLAKE2sType" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=edbfcf7557a685a7]*/ + + +static BLAKE2sObject * +new_BLAKE2sObject(PyTypeObject *type) +{ + BLAKE2sObject *self; + self = (BLAKE2sObject *)type->tp_alloc(type, 0); +#ifdef WITH_THREAD + if (self != NULL) { + self->lock = NULL; + } +#endif + return self; +} + +/*[clinic input] +@classmethod +_blake2s.blake2s.__new__ as py_blake2s_new + string as data: object = NULL + * + digest_size: int(c_default="BLAKE2S_OUTBYTES") = _blake2s.blake2s.MAX_DIGEST_SIZE + key: Py_buffer = None + salt: Py_buffer = None + person: Py_buffer = None + fanout: int = 1 + depth: int = 1 + leaf_size as leaf_size_obj: object = NULL + node_offset as node_offset_obj: object = NULL + node_depth: int = 0 + inner_size: int = 0 + last_node: bool = False + +Return a new BLAKE2s hash object. +[clinic start generated code]*/ + +static PyObject * +py_blake2s_new_impl(PyTypeObject *type, PyObject *data, int digest_size, + Py_buffer *key, Py_buffer *salt, Py_buffer *person, + int fanout, int depth, PyObject *leaf_size_obj, + PyObject *node_offset_obj, int node_depth, + int inner_size, int last_node) +/*[clinic end generated code: output=fe060b258a8cbfc6 input=458cfdcb3d0d47ff]*/ +{ + BLAKE2sObject *self = NULL; + Py_buffer buf; + + unsigned long leaf_size = 0; + unsigned long long node_offset = 0; + + self = new_BLAKE2sObject(type); + if (self == NULL) { + goto error; + } + + /* Zero parameter block. */ + memset(&self->param, 0, sizeof(self->param)); + + /* Set digest size. */ + if (digest_size <= 0 || digest_size > BLAKE2S_OUTBYTES) { + PyErr_Format(PyExc_ValueError, + "digest_size must be between 1 and %d bytes", + BLAKE2S_OUTBYTES); + goto error; + } + self->param.digest_length = digest_size; + + /* Set salt parameter. */ + if ((salt->obj != NULL) && salt->len) { + if (salt->len > BLAKE2S_SALTBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum salt length is %d bytes", + BLAKE2S_SALTBYTES); + goto error; + } + memcpy(self->param.salt, salt->buf, salt->len); + } + + /* Set personalization parameter. */ + if ((person->obj != NULL) && person->len) { + if (person->len > BLAKE2S_PERSONALBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum person length is %d bytes", + BLAKE2S_PERSONALBYTES); + goto error; + } + memcpy(self->param.personal, person->buf, person->len); + } + + /* Set tree parameters. */ + if (fanout < 0 || fanout > 255) { + PyErr_SetString(PyExc_ValueError, + "fanout must be between 0 and 255"); + goto error; + } + self->param.fanout = (uint8_t)fanout; + + if (depth <= 0 || depth > 255) { + PyErr_SetString(PyExc_ValueError, + "depth must be between 1 and 255"); + goto error; + } + self->param.depth = (uint8_t)depth; + + if (leaf_size_obj != NULL) { + leaf_size = PyLong_AsUnsignedLong(leaf_size_obj); + if (leaf_size == (unsigned long) -1 && PyErr_Occurred()) { + goto error; + } + if (leaf_size > 0xFFFFFFFFU) { + PyErr_SetString(PyExc_OverflowError, "leaf_size is too large"); + goto error; + } + } + self->param.leaf_length = (unsigned int)leaf_size; + + if (node_offset_obj != NULL) { + node_offset = PyLong_AsUnsignedLongLong(node_offset_obj); + if (node_offset == (unsigned long long) -1 && PyErr_Occurred()) { + goto error; + } + } +#ifdef HAVE_BLAKE2S + if (node_offset > 0xFFFFFFFFFFFFULL) { + /* maximum 2**48 - 1 */ + PyErr_SetString(PyExc_OverflowError, "node_offset is too large"); + goto error; + } + store48(&(self->param.node_offset), node_offset); +#else + self->param.node_offset = node_offset; +#endif + + if (node_depth < 0 || node_depth > 255) { + PyErr_SetString(PyExc_ValueError, + "node_depth must be between 0 and 255"); + goto error; + } + self->param.node_depth = node_depth; + + if (inner_size < 0 || inner_size > BLAKE2S_OUTBYTES) { + PyErr_Format(PyExc_ValueError, + "inner_size must be between 0 and is %d", + BLAKE2S_OUTBYTES); + goto error; + } + self->param.inner_length = inner_size; + + /* Set key length. */ + if ((key->obj != NULL) && key->len) { + if (key->len > BLAKE2S_KEYBYTES) { + PyErr_Format(PyExc_ValueError, + "maximum key length is %d bytes", + BLAKE2S_KEYBYTES); + goto error; + } + self->param.key_length = (uint8_t)key->len; + } + + /* Initialize hash state. */ + if (blake2s_init_param(&self->state, &self->param) < 0) { + PyErr_SetString(PyExc_RuntimeError, + "error initializing hash state"); + goto error; + } + + /* Set last node flag (must come after initialization). */ + self->state.last_node = last_node; + + /* Process key block if any. */ + if (self->param.key_length) { + uint8_t block[BLAKE2S_BLOCKBYTES]; + memset(block, 0, sizeof(block)); + memcpy(block, key->buf, key->len); + blake2s_update(&self->state, block, sizeof(block)); + secure_zero_memory(block, sizeof(block)); + } + + /* Process initial data if any. */ + if (data != NULL) { + GET_BUFFER_VIEW_OR_ERROR(data, &buf, goto error); + + if (buf.len >= HASHLIB_GIL_MINSIZE) { + Py_BEGIN_ALLOW_THREADS + blake2s_update(&self->state, buf.buf, buf.len); + Py_END_ALLOW_THREADS + } else { + blake2s_update(&self->state, buf.buf, buf.len); + } + PyBuffer_Release(&buf); + } + + return (PyObject *)self; + + error: + if (self != NULL) { + Py_DECREF(self); + } + return NULL; +} + +/*[clinic input] +_blake2s.blake2s.copy + +Return a copy of the hash object. +[clinic start generated code]*/ + +static PyObject * +_blake2s_blake2s_copy_impl(BLAKE2sObject *self) +/*[clinic end generated code: output=6c5bada404b7aed7 input=c8858e887ae4a07a]*/ +{ + BLAKE2sObject *cpy; + + if ((cpy = new_BLAKE2sObject(Py_TYPE(self))) == NULL) + return NULL; + + ENTER_HASHLIB(self); + cpy->param = self->param; + cpy->state = self->state; + LEAVE_HASHLIB(self); + return (PyObject *)cpy; +} + +/*[clinic input] +_blake2s.blake2s.update + + obj: object + / + +Update this hash object's state with the provided string. +[clinic start generated code]*/ + +static PyObject * +_blake2s_blake2s_update(BLAKE2sObject *self, PyObject *obj) +/*[clinic end generated code: output=fe8438a1d3cede87 input=47a408b9a3cc05c5]*/ +{ + Py_buffer buf; + + GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); + +#ifdef WITH_THREAD + if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE) + self->lock = PyThread_allocate_lock(); + + if (self->lock != NULL) { + Py_BEGIN_ALLOW_THREADS + PyThread_acquire_lock(self->lock, 1); + blake2s_update(&self->state, buf.buf, buf.len); + PyThread_release_lock(self->lock); + Py_END_ALLOW_THREADS + } else { + blake2s_update(&self->state, buf.buf, buf.len); + } +#else + blake2s_update(&self->state, buf.buf, buf.len); +#endif /* !WITH_THREAD */ + PyBuffer_Release(&buf); + + Py_INCREF(Py_None); + return Py_None; +} + +/*[clinic input] +_blake2s.blake2s.digest + +Return the digest value as a string of binary data. +[clinic start generated code]*/ + +static PyObject * +_blake2s_blake2s_digest_impl(BLAKE2sObject *self) +/*[clinic end generated code: output=80e81a48c6f79cf9 input=feb9a220135bdeba]*/ +{ + uint8_t digest[BLAKE2S_OUTBYTES]; + blake2s_state state_cpy; + + ENTER_HASHLIB(self); + state_cpy = self->state; + blake2s_final(&state_cpy, digest, self->param.digest_length); + LEAVE_HASHLIB(self); + return PyBytes_FromStringAndSize((const char *)digest, + self->param.digest_length); +} + +/*[clinic input] +_blake2s.blake2s.hexdigest + +Return the digest value as a string of hexadecimal digits. +[clinic start generated code]*/ + +static PyObject * +_blake2s_blake2s_hexdigest_impl(BLAKE2sObject *self) +/*[clinic end generated code: output=db6c5028c0a3c2e5 input=4e4877b8bd7aea91]*/ +{ + uint8_t digest[BLAKE2S_OUTBYTES]; + blake2s_state state_cpy; + + ENTER_HASHLIB(self); + state_cpy = self->state; + blake2s_final(&state_cpy, digest, self->param.digest_length); + LEAVE_HASHLIB(self); + return _Py_strhex((const char *)digest, self->param.digest_length); +} + + +static PyMethodDef py_blake2s_methods[] = { + _BLAKE2S_BLAKE2S_COPY_METHODDEF + _BLAKE2S_BLAKE2S_DIGEST_METHODDEF + _BLAKE2S_BLAKE2S_HEXDIGEST_METHODDEF + _BLAKE2S_BLAKE2S_UPDATE_METHODDEF + {NULL, NULL} +}; + + + +static PyObject * +py_blake2s_get_name(BLAKE2sObject *self, void *closure) +{ + return PyUnicode_FromString("blake2s"); +} + + + +static PyObject * +py_blake2s_get_block_size(BLAKE2sObject *self, void *closure) +{ + return PyLong_FromLong(BLAKE2S_BLOCKBYTES); +} + + + +static PyObject * +py_blake2s_get_digest_size(BLAKE2sObject *self, void *closure) +{ + return PyLong_FromLong(self->param.digest_length); +} + + +static PyGetSetDef py_blake2s_getsetters[] = { + {"name", (getter)py_blake2s_get_name, + NULL, NULL, NULL}, + {"block_size", (getter)py_blake2s_get_block_size, + NULL, NULL, NULL}, + {"digest_size", (getter)py_blake2s_get_digest_size, + NULL, NULL, NULL}, + {NULL} +}; + + +static void +py_blake2s_dealloc(PyObject *self) +{ + BLAKE2sObject *obj = (BLAKE2sObject *)self; + + /* Try not to leave state in memory. */ + secure_zero_memory(&obj->param, sizeof(obj->param)); + secure_zero_memory(&obj->state, sizeof(obj->state)); +#ifdef WITH_THREAD + if (obj->lock) { + PyThread_free_lock(obj->lock); + obj->lock = NULL; + } +#endif + PyObject_Del(self); +} + + +PyTypeObject PyBlake2_BLAKE2sType = { + PyVarObject_HEAD_INIT(NULL, 0) + "_blake2.blake2s", /* tp_name */ + sizeof(BLAKE2sObject), /* tp_size */ + 0, /* tp_itemsize */ + py_blake2s_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + py_blake2s_new__doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + py_blake2s_methods, /* tp_methods */ + 0, /* tp_members */ + py_blake2s_getsetters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + py_blake2s_new, /* tp_new */ +}; diff --git a/Modules/_blake2/clinic/blake2b_impl.c.h b/Modules/_blake2/clinic/blake2b_impl.c.h new file mode 100644 index 0000000..71c073a --- /dev/null +++ b/Modules/_blake2/clinic/blake2b_impl.c.h @@ -0,0 +1,125 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +PyDoc_STRVAR(py_blake2b_new__doc__, +"blake2b(string=None, *, digest_size=_blake2b.blake2b.MAX_DIGEST_SIZE,\n" +" key=None, salt=None, person=None, fanout=1, depth=1,\n" +" leaf_size=None, node_offset=None, node_depth=0, inner_size=0,\n" +" last_node=False)\n" +"--\n" +"\n" +"Return a new BLAKE2b hash object."); + +static PyObject * +py_blake2b_new_impl(PyTypeObject *type, PyObject *data, int digest_size, + Py_buffer *key, Py_buffer *salt, Py_buffer *person, + int fanout, int depth, PyObject *leaf_size_obj, + PyObject *node_offset_obj, int node_depth, + int inner_size, int last_node); + +static PyObject * +py_blake2b_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"string", "digest_size", "key", "salt", "person", "fanout", "depth", "leaf_size", "node_offset", "node_depth", "inner_size", "last_node", NULL}; + static _PyArg_Parser _parser = {"|O$iy*y*y*iiOOiip:blake2b", _keywords, 0}; + PyObject *data = NULL; + int digest_size = BLAKE2B_OUTBYTES; + Py_buffer key = {NULL, NULL}; + Py_buffer salt = {NULL, NULL}; + Py_buffer person = {NULL, NULL}; + int fanout = 1; + int depth = 1; + PyObject *leaf_size_obj = NULL; + PyObject *node_offset_obj = NULL; + int node_depth = 0; + int inner_size = 0; + int last_node = 0; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &data, &digest_size, &key, &salt, &person, &fanout, &depth, &leaf_size_obj, &node_offset_obj, &node_depth, &inner_size, &last_node)) { + goto exit; + } + return_value = py_blake2b_new_impl(type, data, digest_size, &key, &salt, &person, fanout, depth, leaf_size_obj, node_offset_obj, node_depth, inner_size, last_node); + +exit: + /* Cleanup for key */ + if (key.obj) { + PyBuffer_Release(&key); + } + /* Cleanup for salt */ + if (salt.obj) { + PyBuffer_Release(&salt); + } + /* Cleanup for person */ + if (person.obj) { + PyBuffer_Release(&person); + } + + return return_value; +} + +PyDoc_STRVAR(_blake2b_blake2b_copy__doc__, +"copy($self, /)\n" +"--\n" +"\n" +"Return a copy of the hash object."); + +#define _BLAKE2B_BLAKE2B_COPY_METHODDEF \ + {"copy", (PyCFunction)_blake2b_blake2b_copy, METH_NOARGS, _blake2b_blake2b_copy__doc__}, + +static PyObject * +_blake2b_blake2b_copy_impl(BLAKE2bObject *self); + +static PyObject * +_blake2b_blake2b_copy(BLAKE2bObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2b_blake2b_copy_impl(self); +} + +PyDoc_STRVAR(_blake2b_blake2b_update__doc__, +"update($self, obj, /)\n" +"--\n" +"\n" +"Update this hash object\'s state with the provided string."); + +#define _BLAKE2B_BLAKE2B_UPDATE_METHODDEF \ + {"update", (PyCFunction)_blake2b_blake2b_update, METH_O, _blake2b_blake2b_update__doc__}, + +PyDoc_STRVAR(_blake2b_blake2b_digest__doc__, +"digest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of binary data."); + +#define _BLAKE2B_BLAKE2B_DIGEST_METHODDEF \ + {"digest", (PyCFunction)_blake2b_blake2b_digest, METH_NOARGS, _blake2b_blake2b_digest__doc__}, + +static PyObject * +_blake2b_blake2b_digest_impl(BLAKE2bObject *self); + +static PyObject * +_blake2b_blake2b_digest(BLAKE2bObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2b_blake2b_digest_impl(self); +} + +PyDoc_STRVAR(_blake2b_blake2b_hexdigest__doc__, +"hexdigest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of hexadecimal digits."); + +#define _BLAKE2B_BLAKE2B_HEXDIGEST_METHODDEF \ + {"hexdigest", (PyCFunction)_blake2b_blake2b_hexdigest, METH_NOARGS, _blake2b_blake2b_hexdigest__doc__}, + +static PyObject * +_blake2b_blake2b_hexdigest_impl(BLAKE2bObject *self); + +static PyObject * +_blake2b_blake2b_hexdigest(BLAKE2bObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2b_blake2b_hexdigest_impl(self); +} +/*[clinic end generated code: output=535a54852c98e51c input=a9049054013a1b77]*/ diff --git a/Modules/_blake2/clinic/blake2s_impl.c.h b/Modules/_blake2/clinic/blake2s_impl.c.h new file mode 100644 index 0000000..ca908d3 --- /dev/null +++ b/Modules/_blake2/clinic/blake2s_impl.c.h @@ -0,0 +1,125 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +PyDoc_STRVAR(py_blake2s_new__doc__, +"blake2s(string=None, *, digest_size=_blake2s.blake2s.MAX_DIGEST_SIZE,\n" +" key=None, salt=None, person=None, fanout=1, depth=1,\n" +" leaf_size=None, node_offset=None, node_depth=0, inner_size=0,\n" +" last_node=False)\n" +"--\n" +"\n" +"Return a new BLAKE2s hash object."); + +static PyObject * +py_blake2s_new_impl(PyTypeObject *type, PyObject *data, int digest_size, + Py_buffer *key, Py_buffer *salt, Py_buffer *person, + int fanout, int depth, PyObject *leaf_size_obj, + PyObject *node_offset_obj, int node_depth, + int inner_size, int last_node); + +static PyObject * +py_blake2s_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"string", "digest_size", "key", "salt", "person", "fanout", "depth", "leaf_size", "node_offset", "node_depth", "inner_size", "last_node", NULL}; + static _PyArg_Parser _parser = {"|O$iy*y*y*iiOOiip:blake2s", _keywords, 0}; + PyObject *data = NULL; + int digest_size = BLAKE2S_OUTBYTES; + Py_buffer key = {NULL, NULL}; + Py_buffer salt = {NULL, NULL}; + Py_buffer person = {NULL, NULL}; + int fanout = 1; + int depth = 1; + PyObject *leaf_size_obj = NULL; + PyObject *node_offset_obj = NULL; + int node_depth = 0; + int inner_size = 0; + int last_node = 0; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &data, &digest_size, &key, &salt, &person, &fanout, &depth, &leaf_size_obj, &node_offset_obj, &node_depth, &inner_size, &last_node)) { + goto exit; + } + return_value = py_blake2s_new_impl(type, data, digest_size, &key, &salt, &person, fanout, depth, leaf_size_obj, node_offset_obj, node_depth, inner_size, last_node); + +exit: + /* Cleanup for key */ + if (key.obj) { + PyBuffer_Release(&key); + } + /* Cleanup for salt */ + if (salt.obj) { + PyBuffer_Release(&salt); + } + /* Cleanup for person */ + if (person.obj) { + PyBuffer_Release(&person); + } + + return return_value; +} + +PyDoc_STRVAR(_blake2s_blake2s_copy__doc__, +"copy($self, /)\n" +"--\n" +"\n" +"Return a copy of the hash object."); + +#define _BLAKE2S_BLAKE2S_COPY_METHODDEF \ + {"copy", (PyCFunction)_blake2s_blake2s_copy, METH_NOARGS, _blake2s_blake2s_copy__doc__}, + +static PyObject * +_blake2s_blake2s_copy_impl(BLAKE2sObject *self); + +static PyObject * +_blake2s_blake2s_copy(BLAKE2sObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2s_blake2s_copy_impl(self); +} + +PyDoc_STRVAR(_blake2s_blake2s_update__doc__, +"update($self, obj, /)\n" +"--\n" +"\n" +"Update this hash object\'s state with the provided string."); + +#define _BLAKE2S_BLAKE2S_UPDATE_METHODDEF \ + {"update", (PyCFunction)_blake2s_blake2s_update, METH_O, _blake2s_blake2s_update__doc__}, + +PyDoc_STRVAR(_blake2s_blake2s_digest__doc__, +"digest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of binary data."); + +#define _BLAKE2S_BLAKE2S_DIGEST_METHODDEF \ + {"digest", (PyCFunction)_blake2s_blake2s_digest, METH_NOARGS, _blake2s_blake2s_digest__doc__}, + +static PyObject * +_blake2s_blake2s_digest_impl(BLAKE2sObject *self); + +static PyObject * +_blake2s_blake2s_digest(BLAKE2sObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2s_blake2s_digest_impl(self); +} + +PyDoc_STRVAR(_blake2s_blake2s_hexdigest__doc__, +"hexdigest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of hexadecimal digits."); + +#define _BLAKE2S_BLAKE2S_HEXDIGEST_METHODDEF \ + {"hexdigest", (PyCFunction)_blake2s_blake2s_hexdigest, METH_NOARGS, _blake2s_blake2s_hexdigest__doc__}, + +static PyObject * +_blake2s_blake2s_hexdigest_impl(BLAKE2sObject *self); + +static PyObject * +_blake2s_blake2s_hexdigest(BLAKE2sObject *self, PyObject *Py_UNUSED(ignored)) +{ + return _blake2s_blake2s_hexdigest_impl(self); +} +/*[clinic end generated code: output=535ea7903f9ccf76 input=a9049054013a1b77]*/ diff --git a/Modules/_blake2/impl/blake2-config.h b/Modules/_blake2/impl/blake2-config.h new file mode 100644 index 0000000..40455b1 --- /dev/null +++ b/Modules/_blake2/impl/blake2-config.h @@ -0,0 +1,74 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2_CONFIG_H__ +#define __BLAKE2_CONFIG_H__ + +/* These don't work everywhere */ +#if defined(__SSE2__) || defined(__x86_64__) || defined(__amd64__) +#define HAVE_SSE2 +#endif + +#if defined(__SSSE3__) +#define HAVE_SSSE3 +#endif + +#if defined(__SSE4_1__) +#define HAVE_SSE41 +#endif + +#if defined(__AVX__) +#define HAVE_AVX +#endif + +#if defined(__XOP__) +#define HAVE_XOP +#endif + + +#ifdef HAVE_AVX2 +#ifndef HAVE_AVX +#define HAVE_AVX +#endif +#endif + +#ifdef HAVE_XOP +#ifndef HAVE_AVX +#define HAVE_AVX +#endif +#endif + +#ifdef HAVE_AVX +#ifndef HAVE_SSE41 +#define HAVE_SSE41 +#endif +#endif + +#ifdef HAVE_SSE41 +#ifndef HAVE_SSSE3 +#define HAVE_SSSE3 +#endif +#endif + +#ifdef HAVE_SSSE3 +#define HAVE_SSE2 +#endif + +#if !defined(HAVE_SSE2) +#error "This code requires at least SSE2." +#endif + +#endif + diff --git a/Modules/_blake2/impl/blake2-impl.h b/Modules/_blake2/impl/blake2-impl.h new file mode 100644 index 0000000..bbe3c0f --- /dev/null +++ b/Modules/_blake2/impl/blake2-impl.h @@ -0,0 +1,139 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2_IMPL_H__ +#define __BLAKE2_IMPL_H__ + +#include +#include + +BLAKE2_LOCAL_INLINE(uint32_t) load32( const void *src ) +{ +#if defined(NATIVE_LITTLE_ENDIAN) + uint32_t w; + memcpy(&w, src, sizeof w); + return w; +#else + const uint8_t *p = ( const uint8_t * )src; + uint32_t w = *p++; + w |= ( uint32_t )( *p++ ) << 8; + w |= ( uint32_t )( *p++ ) << 16; + w |= ( uint32_t )( *p++ ) << 24; + return w; +#endif +} + +BLAKE2_LOCAL_INLINE(uint64_t) load64( const void *src ) +{ +#if defined(NATIVE_LITTLE_ENDIAN) + uint64_t w; + memcpy(&w, src, sizeof w); + return w; +#else + const uint8_t *p = ( const uint8_t * )src; + uint64_t w = *p++; + w |= ( uint64_t )( *p++ ) << 8; + w |= ( uint64_t )( *p++ ) << 16; + w |= ( uint64_t )( *p++ ) << 24; + w |= ( uint64_t )( *p++ ) << 32; + w |= ( uint64_t )( *p++ ) << 40; + w |= ( uint64_t )( *p++ ) << 48; + w |= ( uint64_t )( *p++ ) << 56; + return w; +#endif +} + +BLAKE2_LOCAL_INLINE(void) store32( void *dst, uint32_t w ) +{ +#if defined(NATIVE_LITTLE_ENDIAN) + memcpy(dst, &w, sizeof w); +#else + uint8_t *p = ( uint8_t * )dst; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; +#endif +} + +BLAKE2_LOCAL_INLINE(void) store64( void *dst, uint64_t w ) +{ +#if defined(NATIVE_LITTLE_ENDIAN) + memcpy(dst, &w, sizeof w); +#else + uint8_t *p = ( uint8_t * )dst; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; +#endif +} + +BLAKE2_LOCAL_INLINE(uint64_t) load48( const void *src ) +{ + const uint8_t *p = ( const uint8_t * )src; + uint64_t w = *p++; + w |= ( uint64_t )( *p++ ) << 8; + w |= ( uint64_t )( *p++ ) << 16; + w |= ( uint64_t )( *p++ ) << 24; + w |= ( uint64_t )( *p++ ) << 32; + w |= ( uint64_t )( *p++ ) << 40; + return w; +} + +BLAKE2_LOCAL_INLINE(void) store48( void *dst, uint64_t w ) +{ + uint8_t *p = ( uint8_t * )dst; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; w >>= 8; + *p++ = ( uint8_t )w; +} + +BLAKE2_LOCAL_INLINE(uint32_t) rotl32( const uint32_t w, const unsigned c ) +{ + return ( w << c ) | ( w >> ( 32 - c ) ); +} + +BLAKE2_LOCAL_INLINE(uint64_t) rotl64( const uint64_t w, const unsigned c ) +{ + return ( w << c ) | ( w >> ( 64 - c ) ); +} + +BLAKE2_LOCAL_INLINE(uint32_t) rotr32( const uint32_t w, const unsigned c ) +{ + return ( w >> c ) | ( w << ( 32 - c ) ); +} + +BLAKE2_LOCAL_INLINE(uint64_t) rotr64( const uint64_t w, const unsigned c ) +{ + return ( w >> c ) | ( w << ( 64 - c ) ); +} + +/* prevents compiler optimizing out memset() */ +BLAKE2_LOCAL_INLINE(void) secure_zero_memory(void *v, size_t n) +{ + static void *(*const volatile memset_v)(void *, int, size_t) = &memset; + memset_v(v, 0, n); +} + +#endif + diff --git a/Modules/_blake2/impl/blake2.h b/Modules/_blake2/impl/blake2.h new file mode 100644 index 0000000..1a9fdf4 --- /dev/null +++ b/Modules/_blake2/impl/blake2.h @@ -0,0 +1,161 @@ +/* + BLAKE2 reference source code package - reference C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2_H__ +#define __BLAKE2_H__ + +#include +#include + +#ifdef BLAKE2_NO_INLINE +#define BLAKE2_LOCAL_INLINE(type) static type +#endif + +#ifndef BLAKE2_LOCAL_INLINE +#define BLAKE2_LOCAL_INLINE(type) static inline type +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + + enum blake2s_constant + { + BLAKE2S_BLOCKBYTES = 64, + BLAKE2S_OUTBYTES = 32, + BLAKE2S_KEYBYTES = 32, + BLAKE2S_SALTBYTES = 8, + BLAKE2S_PERSONALBYTES = 8 + }; + + enum blake2b_constant + { + BLAKE2B_BLOCKBYTES = 128, + BLAKE2B_OUTBYTES = 64, + BLAKE2B_KEYBYTES = 64, + BLAKE2B_SALTBYTES = 16, + BLAKE2B_PERSONALBYTES = 16 + }; + + typedef struct __blake2s_state + { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[2 * BLAKE2S_BLOCKBYTES]; + size_t buflen; + uint8_t last_node; + } blake2s_state; + + typedef struct __blake2b_state + { + uint64_t h[8]; + uint64_t t[2]; + uint64_t f[2]; + uint8_t buf[2 * BLAKE2B_BLOCKBYTES]; + size_t buflen; + uint8_t last_node; + } blake2b_state; + + typedef struct __blake2sp_state + { + blake2s_state S[8][1]; + blake2s_state R[1]; + uint8_t buf[8 * BLAKE2S_BLOCKBYTES]; + size_t buflen; + } blake2sp_state; + + typedef struct __blake2bp_state + { + blake2b_state S[4][1]; + blake2b_state R[1]; + uint8_t buf[4 * BLAKE2B_BLOCKBYTES]; + size_t buflen; + } blake2bp_state; + + +#pragma pack(push, 1) + typedef struct __blake2s_param + { + uint8_t digest_length; /* 1 */ + uint8_t key_length; /* 2 */ + uint8_t fanout; /* 3 */ + uint8_t depth; /* 4 */ + uint32_t leaf_length; /* 8 */ + uint8_t node_offset[6];// 14 + uint8_t node_depth; /* 15 */ + uint8_t inner_length; /* 16 */ + /* uint8_t reserved[0]; */ + uint8_t salt[BLAKE2S_SALTBYTES]; /* 24 */ + uint8_t personal[BLAKE2S_PERSONALBYTES]; /* 32 */ + } blake2s_param; + + typedef struct __blake2b_param + { + uint8_t digest_length; /* 1 */ + uint8_t key_length; /* 2 */ + uint8_t fanout; /* 3 */ + uint8_t depth; /* 4 */ + uint32_t leaf_length; /* 8 */ + uint64_t node_offset; /* 16 */ + uint8_t node_depth; /* 17 */ + uint8_t inner_length; /* 18 */ + uint8_t reserved[14]; /* 32 */ + uint8_t salt[BLAKE2B_SALTBYTES]; /* 48 */ + uint8_t personal[BLAKE2B_PERSONALBYTES]; /* 64 */ + } blake2b_param; +#pragma pack(pop) + + /* Streaming API */ + int blake2s_init( blake2s_state *S, const uint8_t outlen ); + int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ); + int blake2s_init_param( blake2s_state *S, const blake2s_param *P ); + int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen ); + int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen ); + + int blake2b_init( blake2b_state *S, const uint8_t outlen ); + int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ); + int blake2b_init_param( blake2b_state *S, const blake2b_param *P ); + int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen ); + int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen ); + + int blake2sp_init( blake2sp_state *S, const uint8_t outlen ); + int blake2sp_init_key( blake2sp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ); + int blake2sp_update( blake2sp_state *S, const uint8_t *in, uint64_t inlen ); + int blake2sp_final( blake2sp_state *S, uint8_t *out, uint8_t outlen ); + + int blake2bp_init( blake2bp_state *S, const uint8_t outlen ); + int blake2bp_init_key( blake2bp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ); + int blake2bp_update( blake2bp_state *S, const uint8_t *in, uint64_t inlen ); + int blake2bp_final( blake2bp_state *S, uint8_t *out, uint8_t outlen ); + + /* Simple API */ + int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ); + int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ); + + int blake2sp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ); + int blake2bp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ); + + static inline int blake2( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ) + { + return blake2b( out, in, key, outlen, inlen, keylen ); + } + +#if defined(__cplusplus) +} +#endif + +#endif + diff --git a/Modules/_blake2/impl/blake2b-load-sse2.h b/Modules/_blake2/impl/blake2b-load-sse2.h new file mode 100644 index 0000000..0004a98 --- /dev/null +++ b/Modules/_blake2/impl/blake2b-load-sse2.h @@ -0,0 +1,70 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2B_LOAD_SSE2_H__ +#define __BLAKE2B_LOAD_SSE2_H__ + +#define LOAD_MSG_0_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4) +#define LOAD_MSG_0_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5) +#define LOAD_MSG_0_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12) +#define LOAD_MSG_0_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13) +#define LOAD_MSG_1_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9) +#define LOAD_MSG_1_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15) +#define LOAD_MSG_1_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11) +#define LOAD_MSG_1_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7) +#define LOAD_MSG_2_1(b0, b1) b0 = _mm_set_epi64x(m12, m11); b1 = _mm_set_epi64x(m15, m5) +#define LOAD_MSG_2_2(b0, b1) b0 = _mm_set_epi64x(m0, m8); b1 = _mm_set_epi64x(m13, m2) +#define LOAD_MSG_2_3(b0, b1) b0 = _mm_set_epi64x(m3, m10); b1 = _mm_set_epi64x(m9, m7) +#define LOAD_MSG_2_4(b0, b1) b0 = _mm_set_epi64x(m6, m14); b1 = _mm_set_epi64x(m4, m1) +#define LOAD_MSG_3_1(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m13) +#define LOAD_MSG_3_2(b0, b1) b0 = _mm_set_epi64x(m1, m9); b1 = _mm_set_epi64x(m14, m12) +#define LOAD_MSG_3_3(b0, b1) b0 = _mm_set_epi64x(m5, m2); b1 = _mm_set_epi64x(m15, m4) +#define LOAD_MSG_3_4(b0, b1) b0 = _mm_set_epi64x(m10, m6); b1 = _mm_set_epi64x(m8, m0) +#define LOAD_MSG_4_1(b0, b1) b0 = _mm_set_epi64x(m5, m9); b1 = _mm_set_epi64x(m10, m2) +#define LOAD_MSG_4_2(b0, b1) b0 = _mm_set_epi64x(m7, m0); b1 = _mm_set_epi64x(m15, m4) +#define LOAD_MSG_4_3(b0, b1) b0 = _mm_set_epi64x(m11, m14); b1 = _mm_set_epi64x(m3, m6) +#define LOAD_MSG_4_4(b0, b1) b0 = _mm_set_epi64x(m12, m1); b1 = _mm_set_epi64x(m13, m8) +#define LOAD_MSG_5_1(b0, b1) b0 = _mm_set_epi64x(m6, m2); b1 = _mm_set_epi64x(m8, m0) +#define LOAD_MSG_5_2(b0, b1) b0 = _mm_set_epi64x(m10, m12); b1 = _mm_set_epi64x(m3, m11) +#define LOAD_MSG_5_3(b0, b1) b0 = _mm_set_epi64x(m7, m4); b1 = _mm_set_epi64x(m1, m15) +#define LOAD_MSG_5_4(b0, b1) b0 = _mm_set_epi64x(m5, m13); b1 = _mm_set_epi64x(m9, m14) +#define LOAD_MSG_6_1(b0, b1) b0 = _mm_set_epi64x(m1, m12); b1 = _mm_set_epi64x(m4, m14) +#define LOAD_MSG_6_2(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m10, m13) +#define LOAD_MSG_6_3(b0, b1) b0 = _mm_set_epi64x(m6, m0); b1 = _mm_set_epi64x(m8, m9) +#define LOAD_MSG_6_4(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m2) +#define LOAD_MSG_7_1(b0, b1) b0 = _mm_set_epi64x(m7, m13); b1 = _mm_set_epi64x(m3, m12) +#define LOAD_MSG_7_2(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m9, m1) +#define LOAD_MSG_7_3(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m2, m8) +#define LOAD_MSG_7_4(b0, b1) b0 = _mm_set_epi64x(m4, m0); b1 = _mm_set_epi64x(m10, m6) +#define LOAD_MSG_8_1(b0, b1) b0 = _mm_set_epi64x(m14, m6); b1 = _mm_set_epi64x(m0, m11) +#define LOAD_MSG_8_2(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m8, m3) +#define LOAD_MSG_8_3(b0, b1) b0 = _mm_set_epi64x(m13, m12); b1 = _mm_set_epi64x(m10, m1) +#define LOAD_MSG_8_4(b0, b1) b0 = _mm_set_epi64x(m7, m2); b1 = _mm_set_epi64x(m5, m4) +#define LOAD_MSG_9_1(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m1, m7) +#define LOAD_MSG_9_2(b0, b1) b0 = _mm_set_epi64x(m4, m2); b1 = _mm_set_epi64x(m5, m6) +#define LOAD_MSG_9_3(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m13, m3) +#define LOAD_MSG_9_4(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m0, m12) +#define LOAD_MSG_10_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4) +#define LOAD_MSG_10_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5) +#define LOAD_MSG_10_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12) +#define LOAD_MSG_10_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13) +#define LOAD_MSG_11_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9) +#define LOAD_MSG_11_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15) +#define LOAD_MSG_11_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11) +#define LOAD_MSG_11_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7) + + +#endif + diff --git a/Modules/_blake2/impl/blake2b-load-sse41.h b/Modules/_blake2/impl/blake2b-load-sse41.h new file mode 100644 index 0000000..42a1349 --- /dev/null +++ b/Modules/_blake2/impl/blake2b-load-sse41.h @@ -0,0 +1,404 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2B_LOAD_SSE41_H__ +#define __BLAKE2B_LOAD_SSE41_H__ + +#define LOAD_MSG_0_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m0, m1); \ +b1 = _mm_unpacklo_epi64(m2, m3); \ +} while(0) + + +#define LOAD_MSG_0_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m0, m1); \ +b1 = _mm_unpackhi_epi64(m2, m3); \ +} while(0) + + +#define LOAD_MSG_0_3(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m4, m5); \ +b1 = _mm_unpacklo_epi64(m6, m7); \ +} while(0) + + +#define LOAD_MSG_0_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m4, m5); \ +b1 = _mm_unpackhi_epi64(m6, m7); \ +} while(0) + + +#define LOAD_MSG_1_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m7, m2); \ +b1 = _mm_unpackhi_epi64(m4, m6); \ +} while(0) + + +#define LOAD_MSG_1_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m5, m4); \ +b1 = _mm_alignr_epi8(m3, m7, 8); \ +} while(0) + + +#define LOAD_MSG_1_3(b0, b1) \ +do \ +{ \ +b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \ +b1 = _mm_unpackhi_epi64(m5, m2); \ +} while(0) + + +#define LOAD_MSG_1_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m6, m1); \ +b1 = _mm_unpackhi_epi64(m3, m1); \ +} while(0) + + +#define LOAD_MSG_2_1(b0, b1) \ +do \ +{ \ +b0 = _mm_alignr_epi8(m6, m5, 8); \ +b1 = _mm_unpackhi_epi64(m2, m7); \ +} while(0) + + +#define LOAD_MSG_2_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m4, m0); \ +b1 = _mm_blend_epi16(m1, m6, 0xF0); \ +} while(0) + + +#define LOAD_MSG_2_3(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m5, m1, 0xF0); \ +b1 = _mm_unpackhi_epi64(m3, m4); \ +} while(0) + + +#define LOAD_MSG_2_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m7, m3); \ +b1 = _mm_alignr_epi8(m2, m0, 8); \ +} while(0) + + +#define LOAD_MSG_3_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m3, m1); \ +b1 = _mm_unpackhi_epi64(m6, m5); \ +} while(0) + + +#define LOAD_MSG_3_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m4, m0); \ +b1 = _mm_unpacklo_epi64(m6, m7); \ +} while(0) + + +#define LOAD_MSG_3_3(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m1, m2, 0xF0); \ +b1 = _mm_blend_epi16(m2, m7, 0xF0); \ +} while(0) + + +#define LOAD_MSG_3_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m3, m5); \ +b1 = _mm_unpacklo_epi64(m0, m4); \ +} while(0) + + +#define LOAD_MSG_4_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m4, m2); \ +b1 = _mm_unpacklo_epi64(m1, m5); \ +} while(0) + + +#define LOAD_MSG_4_2(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m0, m3, 0xF0); \ +b1 = _mm_blend_epi16(m2, m7, 0xF0); \ +} while(0) + + +#define LOAD_MSG_4_3(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m7, m5, 0xF0); \ +b1 = _mm_blend_epi16(m3, m1, 0xF0); \ +} while(0) + + +#define LOAD_MSG_4_4(b0, b1) \ +do \ +{ \ +b0 = _mm_alignr_epi8(m6, m0, 8); \ +b1 = _mm_blend_epi16(m4, m6, 0xF0); \ +} while(0) + + +#define LOAD_MSG_5_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m1, m3); \ +b1 = _mm_unpacklo_epi64(m0, m4); \ +} while(0) + + +#define LOAD_MSG_5_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m6, m5); \ +b1 = _mm_unpackhi_epi64(m5, m1); \ +} while(0) + + +#define LOAD_MSG_5_3(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m2, m3, 0xF0); \ +b1 = _mm_unpackhi_epi64(m7, m0); \ +} while(0) + + +#define LOAD_MSG_5_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m6, m2); \ +b1 = _mm_blend_epi16(m7, m4, 0xF0); \ +} while(0) + + +#define LOAD_MSG_6_1(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m6, m0, 0xF0); \ +b1 = _mm_unpacklo_epi64(m7, m2); \ +} while(0) + + +#define LOAD_MSG_6_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m2, m7); \ +b1 = _mm_alignr_epi8(m5, m6, 8); \ +} while(0) + + +#define LOAD_MSG_6_3(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m0, m3); \ +b1 = _mm_shuffle_epi32(m4, _MM_SHUFFLE(1,0,3,2)); \ +} while(0) + + +#define LOAD_MSG_6_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m3, m1); \ +b1 = _mm_blend_epi16(m1, m5, 0xF0); \ +} while(0) + + +#define LOAD_MSG_7_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m6, m3); \ +b1 = _mm_blend_epi16(m6, m1, 0xF0); \ +} while(0) + + +#define LOAD_MSG_7_2(b0, b1) \ +do \ +{ \ +b0 = _mm_alignr_epi8(m7, m5, 8); \ +b1 = _mm_unpackhi_epi64(m0, m4); \ +} while(0) + + +#define LOAD_MSG_7_3(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m2, m7); \ +b1 = _mm_unpacklo_epi64(m4, m1); \ +} while(0) + + +#define LOAD_MSG_7_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m0, m2); \ +b1 = _mm_unpacklo_epi64(m3, m5); \ +} while(0) + + +#define LOAD_MSG_8_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m3, m7); \ +b1 = _mm_alignr_epi8(m0, m5, 8); \ +} while(0) + + +#define LOAD_MSG_8_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m7, m4); \ +b1 = _mm_alignr_epi8(m4, m1, 8); \ +} while(0) + + +#define LOAD_MSG_8_3(b0, b1) \ +do \ +{ \ +b0 = m6; \ +b1 = _mm_alignr_epi8(m5, m0, 8); \ +} while(0) + + +#define LOAD_MSG_8_4(b0, b1) \ +do \ +{ \ +b0 = _mm_blend_epi16(m1, m3, 0xF0); \ +b1 = m2; \ +} while(0) + + +#define LOAD_MSG_9_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m5, m4); \ +b1 = _mm_unpackhi_epi64(m3, m0); \ +} while(0) + + +#define LOAD_MSG_9_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m1, m2); \ +b1 = _mm_blend_epi16(m3, m2, 0xF0); \ +} while(0) + + +#define LOAD_MSG_9_3(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m7, m4); \ +b1 = _mm_unpackhi_epi64(m1, m6); \ +} while(0) + + +#define LOAD_MSG_9_4(b0, b1) \ +do \ +{ \ +b0 = _mm_alignr_epi8(m7, m5, 8); \ +b1 = _mm_unpacklo_epi64(m6, m0); \ +} while(0) + + +#define LOAD_MSG_10_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m0, m1); \ +b1 = _mm_unpacklo_epi64(m2, m3); \ +} while(0) + + +#define LOAD_MSG_10_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m0, m1); \ +b1 = _mm_unpackhi_epi64(m2, m3); \ +} while(0) + + +#define LOAD_MSG_10_3(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m4, m5); \ +b1 = _mm_unpacklo_epi64(m6, m7); \ +} while(0) + + +#define LOAD_MSG_10_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpackhi_epi64(m4, m5); \ +b1 = _mm_unpackhi_epi64(m6, m7); \ +} while(0) + + +#define LOAD_MSG_11_1(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m7, m2); \ +b1 = _mm_unpackhi_epi64(m4, m6); \ +} while(0) + + +#define LOAD_MSG_11_2(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m5, m4); \ +b1 = _mm_alignr_epi8(m3, m7, 8); \ +} while(0) + + +#define LOAD_MSG_11_3(b0, b1) \ +do \ +{ \ +b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \ +b1 = _mm_unpackhi_epi64(m5, m2); \ +} while(0) + + +#define LOAD_MSG_11_4(b0, b1) \ +do \ +{ \ +b0 = _mm_unpacklo_epi64(m6, m1); \ +b1 = _mm_unpackhi_epi64(m3, m1); \ +} while(0) + + +#endif + diff --git a/Modules/_blake2/impl/blake2b-ref.c b/Modules/_blake2/impl/blake2b-ref.c new file mode 100644 index 0000000..ab375a4 --- /dev/null +++ b/Modules/_blake2/impl/blake2b-ref.c @@ -0,0 +1,420 @@ +/* + BLAKE2 reference source code package - reference C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ + +#include +#include +#include + +#include "blake2.h" +#include "blake2-impl.h" + +static const uint64_t blake2b_IV[8] = +{ + 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL +}; + +static const uint8_t blake2b_sigma[12][16] = +{ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } , + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 } , + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 } , + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 } , + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 } , + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 } , + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 } , + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 } , + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13 , 0 } , + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } +}; + + +BLAKE2_LOCAL_INLINE(int) blake2b_set_lastnode( blake2b_state *S ) +{ + S->f[1] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_clear_lastnode( blake2b_state *S ) +{ + S->f[1] = 0; + return 0; +} + +/* Some helper functions, not necessarily useful */ +BLAKE2_LOCAL_INLINE(int) blake2b_is_lastblock( const blake2b_state *S ) +{ + return S->f[0] != 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_set_lastblock( blake2b_state *S ) +{ + if( S->last_node ) blake2b_set_lastnode( S ); + + S->f[0] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_clear_lastblock( blake2b_state *S ) +{ + if( S->last_node ) blake2b_clear_lastnode( S ); + + S->f[0] = 0; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_increment_counter( blake2b_state *S, const uint64_t inc ) +{ + S->t[0] += inc; + S->t[1] += ( S->t[0] < inc ); + return 0; +} + + + +/* Parameter-related functions */ +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length ) +{ + P->digest_length = digest_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_fanout( blake2b_param *P, const uint8_t fanout ) +{ + P->fanout = fanout; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_max_depth( blake2b_param *P, const uint8_t depth ) +{ + P->depth = depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_leaf_length( blake2b_param *P, const uint32_t leaf_length ) +{ + store32( &P->leaf_length, leaf_length ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_node_offset( blake2b_param *P, const uint64_t node_offset ) +{ + store64( &P->node_offset, node_offset ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_node_depth( blake2b_param *P, const uint8_t node_depth ) +{ + P->node_depth = node_depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_inner_length( blake2b_param *P, const uint8_t inner_length ) +{ + P->inner_length = inner_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] ) +{ + memcpy( P->salt, salt, BLAKE2B_SALTBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_personal( blake2b_param *P, const uint8_t personal[BLAKE2B_PERSONALBYTES] ) +{ + memcpy( P->personal, personal, BLAKE2B_PERSONALBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_init0( blake2b_state *S ) +{ + int i; + memset( S, 0, sizeof( blake2b_state ) ); + + for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i]; + + return 0; +} + +/* init xors IV with input parameter block */ +int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) +{ + const uint8_t *p = ( const uint8_t * )( P ); + size_t i; + + blake2b_init0( S ); + + /* IV XOR ParamBlock */ + for( i = 0; i < 8; ++i ) + S->h[i] ^= load64( p + sizeof( S->h[i] ) * i ); + + return 0; +} + + + +int blake2b_init( blake2b_state *S, const uint8_t outlen ) +{ + blake2b_param P[1]; + + if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1; + + P->digest_length = outlen; + P->key_length = 0; + P->fanout = 1; + P->depth = 1; + store32( &P->leaf_length, 0 ); + store64( &P->node_offset, 0 ); + P->node_depth = 0; + P->inner_length = 0; + memset( P->reserved, 0, sizeof( P->reserved ) ); + memset( P->salt, 0, sizeof( P->salt ) ); + memset( P->personal, 0, sizeof( P->personal ) ); + return blake2b_init_param( S, P ); +} + + +int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ) +{ + blake2b_param P[1]; + + if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1; + + if ( !key || !keylen || keylen > BLAKE2B_KEYBYTES ) return -1; + + P->digest_length = outlen; + P->key_length = keylen; + P->fanout = 1; + P->depth = 1; + store32( &P->leaf_length, 0 ); + store64( &P->node_offset, 0 ); + P->node_depth = 0; + P->inner_length = 0; + memset( P->reserved, 0, sizeof( P->reserved ) ); + memset( P->salt, 0, sizeof( P->salt ) ); + memset( P->personal, 0, sizeof( P->personal ) ); + + if( blake2b_init_param( S, P ) < 0 ) return -1; + + { + uint8_t block[BLAKE2B_BLOCKBYTES]; + memset( block, 0, BLAKE2B_BLOCKBYTES ); + memcpy( block, key, keylen ); + blake2b_update( S, block, BLAKE2B_BLOCKBYTES ); + secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */ + } + return 0; +} + +static int blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ) +{ + uint64_t m[16]; + uint64_t v[16]; + int i; + + for( i = 0; i < 16; ++i ) + m[i] = load64( block + i * sizeof( m[i] ) ); + + for( i = 0; i < 8; ++i ) + v[i] = S->h[i]; + + v[ 8] = blake2b_IV[0]; + v[ 9] = blake2b_IV[1]; + v[10] = blake2b_IV[2]; + v[11] = blake2b_IV[3]; + v[12] = S->t[0] ^ blake2b_IV[4]; + v[13] = S->t[1] ^ blake2b_IV[5]; + v[14] = S->f[0] ^ blake2b_IV[6]; + v[15] = S->f[1] ^ blake2b_IV[7]; +#define G(r,i,a,b,c,d) \ + do { \ + a = a + b + m[blake2b_sigma[r][2*i+0]]; \ + d = rotr64(d ^ a, 32); \ + c = c + d; \ + b = rotr64(b ^ c, 24); \ + a = a + b + m[blake2b_sigma[r][2*i+1]]; \ + d = rotr64(d ^ a, 16); \ + c = c + d; \ + b = rotr64(b ^ c, 63); \ + } while(0) +#define ROUND(r) \ + do { \ + G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \ + G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \ + G(r,2,v[ 2],v[ 6],v[10],v[14]); \ + G(r,3,v[ 3],v[ 7],v[11],v[15]); \ + G(r,4,v[ 0],v[ 5],v[10],v[15]); \ + G(r,5,v[ 1],v[ 6],v[11],v[12]); \ + G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \ + G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \ + } while(0) + ROUND( 0 ); + ROUND( 1 ); + ROUND( 2 ); + ROUND( 3 ); + ROUND( 4 ); + ROUND( 5 ); + ROUND( 6 ); + ROUND( 7 ); + ROUND( 8 ); + ROUND( 9 ); + ROUND( 10 ); + ROUND( 11 ); + + for( i = 0; i < 8; ++i ) + S->h[i] = S->h[i] ^ v[i] ^ v[i + 8]; + +#undef G +#undef ROUND + return 0; +} + +/* inlen now in bytes */ +int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen ) +{ + while( inlen > 0 ) + { + size_t left = S->buflen; + size_t fill = 2 * BLAKE2B_BLOCKBYTES - left; + + if( inlen > fill ) + { + memcpy( S->buf + left, in, fill ); /* Fill buffer */ + S->buflen += fill; + blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES ); + blake2b_compress( S, S->buf ); /* Compress */ + memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */ + S->buflen -= BLAKE2B_BLOCKBYTES; + in += fill; + inlen -= fill; + } + else /* inlen <= fill */ + { + memcpy( S->buf + left, in, (size_t)inlen ); + S->buflen += (size_t)inlen; /* Be lazy, do not compress */ + in += inlen; + inlen -= inlen; + } + } + + return 0; +} + +/* Is this correct? */ +int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen ) +{ + uint8_t buffer[BLAKE2B_OUTBYTES] = {0}; + int i; + + if( out == NULL || outlen == 0 || outlen > BLAKE2B_OUTBYTES ) + return -1; + + if( blake2b_is_lastblock( S ) ) + return -1; + + if( S->buflen > BLAKE2B_BLOCKBYTES ) + { + blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES ); + blake2b_compress( S, S->buf ); + S->buflen -= BLAKE2B_BLOCKBYTES; + memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen ); + } + + blake2b_increment_counter( S, S->buflen ); + blake2b_set_lastblock( S ); + memset( S->buf + S->buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */ + blake2b_compress( S, S->buf ); + + for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */ + store64( buffer + sizeof( S->h[i] ) * i, S->h[i] ); + + memcpy( out, buffer, outlen ); + return 0; +} + +/* inlen, at least, should be uint64_t. Others can be size_t. */ +int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ) +{ + blake2b_state S[1]; + + /* Verify parameters */ + if ( NULL == in && inlen > 0 ) return -1; + + if ( NULL == out ) return -1; + + if( NULL == key && keylen > 0 ) return -1; + + if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1; + + if( keylen > BLAKE2B_KEYBYTES ) return -1; + + if( keylen > 0 ) + { + if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1; + } + else + { + if( blake2b_init( S, outlen ) < 0 ) return -1; + } + + blake2b_update( S, ( const uint8_t * )in, inlen ); + blake2b_final( S, out, outlen ); + return 0; +} + +#if defined(SUPERCOP) +int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) +{ + return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 ); +} +#endif + +#if defined(BLAKE2B_SELFTEST) +#include +#include "blake2-kat.h" +int main( int argc, char **argv ) +{ + uint8_t key[BLAKE2B_KEYBYTES]; + uint8_t buf[KAT_LENGTH]; + size_t i; + + for( i = 0; i < BLAKE2B_KEYBYTES; ++i ) + key[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + buf[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + { + uint8_t hash[BLAKE2B_OUTBYTES]; + blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES ); + + if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) ) + { + puts( "error" ); + return -1; + } + } + + puts( "ok" ); + return 0; +} +#endif + diff --git a/Modules/_blake2/impl/blake2b-round.h b/Modules/_blake2/impl/blake2b-round.h new file mode 100644 index 0000000..4ce2255 --- /dev/null +++ b/Modules/_blake2/impl/blake2b-round.h @@ -0,0 +1,159 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2B_ROUND_H__ +#define __BLAKE2B_ROUND_H__ + +#define LOADU(p) _mm_loadu_si128( (const __m128i *)(p) ) +#define STOREU(p,r) _mm_storeu_si128((__m128i *)(p), r) + +#define TOF(reg) _mm_castsi128_ps((reg)) +#define TOI(reg) _mm_castps_si128((reg)) + +#define LIKELY(x) __builtin_expect((x),1) + + +/* Microarchitecture-specific macros */ +#ifndef HAVE_XOP +#ifdef HAVE_SSSE3 +#define _mm_roti_epi64(x, c) \ + (-(c) == 32) ? _mm_shuffle_epi32((x), _MM_SHUFFLE(2,3,0,1)) \ + : (-(c) == 24) ? _mm_shuffle_epi8((x), r24) \ + : (-(c) == 16) ? _mm_shuffle_epi8((x), r16) \ + : (-(c) == 63) ? _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_add_epi64((x), (x))) \ + : _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_slli_epi64((x), 64-(-(c)))) +#else +#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-(c)) )) +#endif +#else +/* ... */ +#endif + + + +#define G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \ + row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \ + row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \ + \ + row4l = _mm_xor_si128(row4l, row1l); \ + row4h = _mm_xor_si128(row4h, row1h); \ + \ + row4l = _mm_roti_epi64(row4l, -32); \ + row4h = _mm_roti_epi64(row4h, -32); \ + \ + row3l = _mm_add_epi64(row3l, row4l); \ + row3h = _mm_add_epi64(row3h, row4h); \ + \ + row2l = _mm_xor_si128(row2l, row3l); \ + row2h = _mm_xor_si128(row2h, row3h); \ + \ + row2l = _mm_roti_epi64(row2l, -24); \ + row2h = _mm_roti_epi64(row2h, -24); \ + +#define G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \ + row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \ + row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \ + \ + row4l = _mm_xor_si128(row4l, row1l); \ + row4h = _mm_xor_si128(row4h, row1h); \ + \ + row4l = _mm_roti_epi64(row4l, -16); \ + row4h = _mm_roti_epi64(row4h, -16); \ + \ + row3l = _mm_add_epi64(row3l, row4l); \ + row3h = _mm_add_epi64(row3h, row4h); \ + \ + row2l = _mm_xor_si128(row2l, row3l); \ + row2h = _mm_xor_si128(row2h, row3h); \ + \ + row2l = _mm_roti_epi64(row2l, -63); \ + row2h = _mm_roti_epi64(row2h, -63); \ + +#if defined(HAVE_SSSE3) +#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \ + t0 = _mm_alignr_epi8(row2h, row2l, 8); \ + t1 = _mm_alignr_epi8(row2l, row2h, 8); \ + row2l = t0; \ + row2h = t1; \ + \ + t0 = row3l; \ + row3l = row3h; \ + row3h = t0; \ + \ + t0 = _mm_alignr_epi8(row4h, row4l, 8); \ + t1 = _mm_alignr_epi8(row4l, row4h, 8); \ + row4l = t1; \ + row4h = t0; + +#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \ + t0 = _mm_alignr_epi8(row2l, row2h, 8); \ + t1 = _mm_alignr_epi8(row2h, row2l, 8); \ + row2l = t0; \ + row2h = t1; \ + \ + t0 = row3l; \ + row3l = row3h; \ + row3h = t0; \ + \ + t0 = _mm_alignr_epi8(row4l, row4h, 8); \ + t1 = _mm_alignr_epi8(row4h, row4l, 8); \ + row4l = t1; \ + row4h = t0; +#else + +#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \ + t0 = row4l;\ + t1 = row2l;\ + row4l = row3l;\ + row3l = row3h;\ + row3h = row4l;\ + row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0)); \ + row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h)); \ + row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h)); \ + row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1)) + +#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \ + t0 = row3l;\ + row3l = row3h;\ + row3h = t0;\ + t0 = row2l;\ + t1 = row4l;\ + row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l)); \ + row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h)); \ + row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h)); \ + row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1)) + +#endif + +#if defined(HAVE_SSE41) +#include "blake2b-load-sse41.h" +#else +#include "blake2b-load-sse2.h" +#endif + +#define ROUND(r) \ + LOAD_MSG_ ##r ##_1(b0, b1); \ + G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \ + LOAD_MSG_ ##r ##_2(b0, b1); \ + G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \ + DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); \ + LOAD_MSG_ ##r ##_3(b0, b1); \ + G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \ + LOAD_MSG_ ##r ##_4(b0, b1); \ + G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \ + UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); + +#endif + diff --git a/Modules/_blake2/impl/blake2b.c b/Modules/_blake2/impl/blake2b.c new file mode 100644 index 0000000..ebb65bb --- /dev/null +++ b/Modules/_blake2/impl/blake2b.c @@ -0,0 +1,453 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ + +#include +#include +#include + +#include "blake2.h" +#include "blake2-impl.h" + +#include "blake2-config.h" + +#ifdef _MSC_VER +#include /* for _mm_set_epi64x */ +#endif +#include +#if defined(HAVE_SSSE3) +#include +#endif +#if defined(HAVE_SSE41) +#include +#endif +#if defined(HAVE_AVX) +#include +#endif +#if defined(HAVE_XOP) +#include +#endif + +#include "blake2b-round.h" + +static const uint64_t blake2b_IV[8] = +{ + 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL +}; + +static const uint8_t blake2b_sigma[12][16] = +{ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } , + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 } , + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 } , + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 } , + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 } , + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 } , + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 } , + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 } , + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13 , 0 } , + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } +}; + + +/* Some helper functions, not necessarily useful */ +BLAKE2_LOCAL_INLINE(int) blake2b_set_lastnode( blake2b_state *S ) +{ + S->f[1] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_clear_lastnode( blake2b_state *S ) +{ + S->f[1] = 0; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_is_lastblock( const blake2b_state *S ) +{ + return S->f[0] != 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_set_lastblock( blake2b_state *S ) +{ + if( S->last_node ) blake2b_set_lastnode( S ); + + S->f[0] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_clear_lastblock( blake2b_state *S ) +{ + if( S->last_node ) blake2b_clear_lastnode( S ); + + S->f[0] = 0; + return 0; +} + + +BLAKE2_LOCAL_INLINE(int) blake2b_increment_counter( blake2b_state *S, const uint64_t inc ) +{ +#if __x86_64__ + /* ADD/ADC chain */ + __uint128_t t = ( ( __uint128_t )S->t[1] << 64 ) | S->t[0]; + t += inc; + S->t[0] = ( uint64_t )( t >> 0 ); + S->t[1] = ( uint64_t )( t >> 64 ); +#else + S->t[0] += inc; + S->t[1] += ( S->t[0] < inc ); +#endif + return 0; +} + + +/* Parameter-related functions */ +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length ) +{ + P->digest_length = digest_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_fanout( blake2b_param *P, const uint8_t fanout ) +{ + P->fanout = fanout; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_max_depth( blake2b_param *P, const uint8_t depth ) +{ + P->depth = depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_leaf_length( blake2b_param *P, const uint32_t leaf_length ) +{ + P->leaf_length = leaf_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_node_offset( blake2b_param *P, const uint64_t node_offset ) +{ + P->node_offset = node_offset; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_node_depth( blake2b_param *P, const uint8_t node_depth ) +{ + P->node_depth = node_depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_inner_length( blake2b_param *P, const uint8_t inner_length ) +{ + P->inner_length = inner_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] ) +{ + memcpy( P->salt, salt, BLAKE2B_SALTBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_param_set_personal( blake2b_param *P, const uint8_t personal[BLAKE2B_PERSONALBYTES] ) +{ + memcpy( P->personal, personal, BLAKE2B_PERSONALBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_init0( blake2b_state *S ) +{ + int i; + memset( S, 0, sizeof( blake2b_state ) ); + + for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i]; + + return 0; +} + +/* init xors IV with input parameter block */ +int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) +{ + /*blake2b_init0( S ); */ + const uint8_t * v = ( const uint8_t * )( blake2b_IV ); + const uint8_t * p = ( const uint8_t * )( P ); + uint8_t * h = ( uint8_t * )( S->h ); + int i; + /* IV XOR ParamBlock */ + memset( S, 0, sizeof( blake2b_state ) ); + + for( i = 0; i < BLAKE2B_OUTBYTES; ++i ) h[i] = v[i] ^ p[i]; + + return 0; +} + + +/* Some sort of default parameter block initialization, for sequential blake2b */ +int blake2b_init( blake2b_state *S, const uint8_t outlen ) +{ + const blake2b_param P = + { + outlen, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + {0}, + {0}, + {0} + }; + + if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1; + + return blake2b_init_param( S, &P ); +} + +int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ) +{ + const blake2b_param P = + { + outlen, + keylen, + 1, + 1, + 0, + 0, + 0, + 0, + {0}, + {0}, + {0} + }; + + if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1; + + if ( ( !keylen ) || keylen > BLAKE2B_KEYBYTES ) return -1; + + if( blake2b_init_param( S, &P ) < 0 ) + return 0; + + { + uint8_t block[BLAKE2B_BLOCKBYTES]; + memset( block, 0, BLAKE2B_BLOCKBYTES ); + memcpy( block, key, keylen ); + blake2b_update( S, block, BLAKE2B_BLOCKBYTES ); + secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */ + } + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ) +{ + __m128i row1l, row1h; + __m128i row2l, row2h; + __m128i row3l, row3h; + __m128i row4l, row4h; + __m128i b0, b1; + __m128i t0, t1; +#if defined(HAVE_SSSE3) && !defined(HAVE_XOP) + const __m128i r16 = _mm_setr_epi8( 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9 ); + const __m128i r24 = _mm_setr_epi8( 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10 ); +#endif +#if defined(HAVE_SSE41) + const __m128i m0 = LOADU( block + 00 ); + const __m128i m1 = LOADU( block + 16 ); + const __m128i m2 = LOADU( block + 32 ); + const __m128i m3 = LOADU( block + 48 ); + const __m128i m4 = LOADU( block + 64 ); + const __m128i m5 = LOADU( block + 80 ); + const __m128i m6 = LOADU( block + 96 ); + const __m128i m7 = LOADU( block + 112 ); +#else + const uint64_t m0 = ( ( uint64_t * )block )[ 0]; + const uint64_t m1 = ( ( uint64_t * )block )[ 1]; + const uint64_t m2 = ( ( uint64_t * )block )[ 2]; + const uint64_t m3 = ( ( uint64_t * )block )[ 3]; + const uint64_t m4 = ( ( uint64_t * )block )[ 4]; + const uint64_t m5 = ( ( uint64_t * )block )[ 5]; + const uint64_t m6 = ( ( uint64_t * )block )[ 6]; + const uint64_t m7 = ( ( uint64_t * )block )[ 7]; + const uint64_t m8 = ( ( uint64_t * )block )[ 8]; + const uint64_t m9 = ( ( uint64_t * )block )[ 9]; + const uint64_t m10 = ( ( uint64_t * )block )[10]; + const uint64_t m11 = ( ( uint64_t * )block )[11]; + const uint64_t m12 = ( ( uint64_t * )block )[12]; + const uint64_t m13 = ( ( uint64_t * )block )[13]; + const uint64_t m14 = ( ( uint64_t * )block )[14]; + const uint64_t m15 = ( ( uint64_t * )block )[15]; +#endif + row1l = LOADU( &S->h[0] ); + row1h = LOADU( &S->h[2] ); + row2l = LOADU( &S->h[4] ); + row2h = LOADU( &S->h[6] ); + row3l = LOADU( &blake2b_IV[0] ); + row3h = LOADU( &blake2b_IV[2] ); + row4l = _mm_xor_si128( LOADU( &blake2b_IV[4] ), LOADU( &S->t[0] ) ); + row4h = _mm_xor_si128( LOADU( &blake2b_IV[6] ), LOADU( &S->f[0] ) ); + ROUND( 0 ); + ROUND( 1 ); + ROUND( 2 ); + ROUND( 3 ); + ROUND( 4 ); + ROUND( 5 ); + ROUND( 6 ); + ROUND( 7 ); + ROUND( 8 ); + ROUND( 9 ); + ROUND( 10 ); + ROUND( 11 ); + row1l = _mm_xor_si128( row3l, row1l ); + row1h = _mm_xor_si128( row3h, row1h ); + STOREU( &S->h[0], _mm_xor_si128( LOADU( &S->h[0] ), row1l ) ); + STOREU( &S->h[2], _mm_xor_si128( LOADU( &S->h[2] ), row1h ) ); + row2l = _mm_xor_si128( row4l, row2l ); + row2h = _mm_xor_si128( row4h, row2h ); + STOREU( &S->h[4], _mm_xor_si128( LOADU( &S->h[4] ), row2l ) ); + STOREU( &S->h[6], _mm_xor_si128( LOADU( &S->h[6] ), row2h ) ); + return 0; +} + + +int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen ) +{ + while( inlen > 0 ) + { + size_t left = S->buflen; + size_t fill = 2 * BLAKE2B_BLOCKBYTES - left; + + if( inlen > fill ) + { + memcpy( S->buf + left, in, fill ); /* Fill buffer */ + S->buflen += fill; + blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES ); + blake2b_compress( S, S->buf ); /* Compress */ + memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */ + S->buflen -= BLAKE2B_BLOCKBYTES; + in += fill; + inlen -= fill; + } + else /* inlen <= fill */ + { + memcpy( S->buf + left, in, inlen ); + S->buflen += inlen; /* Be lazy, do not compress */ + in += inlen; + inlen -= inlen; + } + } + + return 0; +} + + +int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen ) +{ + if( outlen > BLAKE2B_OUTBYTES ) + return -1; + + if( blake2b_is_lastblock( S ) ) + return -1; + + if( S->buflen > BLAKE2B_BLOCKBYTES ) + { + blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES ); + blake2b_compress( S, S->buf ); + S->buflen -= BLAKE2B_BLOCKBYTES; + memmove( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen ); + } + + blake2b_increment_counter( S, S->buflen ); + blake2b_set_lastblock( S ); + memset( S->buf + S->buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */ + blake2b_compress( S, S->buf ); + memcpy( out, &S->h[0], outlen ); + return 0; +} + + +int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ) +{ + blake2b_state S[1]; + + /* Verify parameters */ + if ( NULL == in && inlen > 0 ) return -1; + + if ( NULL == out ) return -1; + + if( NULL == key && keylen > 0 ) return -1; + + if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1; + + if( keylen > BLAKE2B_KEYBYTES ) return -1; + + if( keylen ) + { + if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1; + } + else + { + if( blake2b_init( S, outlen ) < 0 ) return -1; + } + + blake2b_update( S, ( const uint8_t * )in, inlen ); + blake2b_final( S, out, outlen ); + return 0; +} + +#if defined(SUPERCOP) +int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) +{ + return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 ); +} +#endif + +#if defined(BLAKE2B_SELFTEST) +#include +#include "blake2-kat.h" +int main( int argc, char **argv ) +{ + uint8_t key[BLAKE2B_KEYBYTES]; + uint8_t buf[KAT_LENGTH]; + size_t i; + + for( i = 0; i < BLAKE2B_KEYBYTES; ++i ) + key[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + buf[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + { + uint8_t hash[BLAKE2B_OUTBYTES]; + blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES ); + + if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) ) + { + puts( "error" ); + return -1; + } + } + + puts( "ok" ); + return 0; +} +#endif + diff --git a/Modules/_blake2/impl/blake2s-load-sse2.h b/Modules/_blake2/impl/blake2s-load-sse2.h new file mode 100644 index 0000000..eadefa7 --- /dev/null +++ b/Modules/_blake2/impl/blake2s-load-sse2.h @@ -0,0 +1,61 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2S_LOAD_SSE2_H__ +#define __BLAKE2S_LOAD_SSE2_H__ + +#define LOAD_MSG_0_1(buf) buf = _mm_set_epi32(m6,m4,m2,m0) +#define LOAD_MSG_0_2(buf) buf = _mm_set_epi32(m7,m5,m3,m1) +#define LOAD_MSG_0_3(buf) buf = _mm_set_epi32(m14,m12,m10,m8) +#define LOAD_MSG_0_4(buf) buf = _mm_set_epi32(m15,m13,m11,m9) +#define LOAD_MSG_1_1(buf) buf = _mm_set_epi32(m13,m9,m4,m14) +#define LOAD_MSG_1_2(buf) buf = _mm_set_epi32(m6,m15,m8,m10) +#define LOAD_MSG_1_3(buf) buf = _mm_set_epi32(m5,m11,m0,m1) +#define LOAD_MSG_1_4(buf) buf = _mm_set_epi32(m3,m7,m2,m12) +#define LOAD_MSG_2_1(buf) buf = _mm_set_epi32(m15,m5,m12,m11) +#define LOAD_MSG_2_2(buf) buf = _mm_set_epi32(m13,m2,m0,m8) +#define LOAD_MSG_2_3(buf) buf = _mm_set_epi32(m9,m7,m3,m10) +#define LOAD_MSG_2_4(buf) buf = _mm_set_epi32(m4,m1,m6,m14) +#define LOAD_MSG_3_1(buf) buf = _mm_set_epi32(m11,m13,m3,m7) +#define LOAD_MSG_3_2(buf) buf = _mm_set_epi32(m14,m12,m1,m9) +#define LOAD_MSG_3_3(buf) buf = _mm_set_epi32(m15,m4,m5,m2) +#define LOAD_MSG_3_4(buf) buf = _mm_set_epi32(m8,m0,m10,m6) +#define LOAD_MSG_4_1(buf) buf = _mm_set_epi32(m10,m2,m5,m9) +#define LOAD_MSG_4_2(buf) buf = _mm_set_epi32(m15,m4,m7,m0) +#define LOAD_MSG_4_3(buf) buf = _mm_set_epi32(m3,m6,m11,m14) +#define LOAD_MSG_4_4(buf) buf = _mm_set_epi32(m13,m8,m12,m1) +#define LOAD_MSG_5_1(buf) buf = _mm_set_epi32(m8,m0,m6,m2) +#define LOAD_MSG_5_2(buf) buf = _mm_set_epi32(m3,m11,m10,m12) +#define LOAD_MSG_5_3(buf) buf = _mm_set_epi32(m1,m15,m7,m4) +#define LOAD_MSG_5_4(buf) buf = _mm_set_epi32(m9,m14,m5,m13) +#define LOAD_MSG_6_1(buf) buf = _mm_set_epi32(m4,m14,m1,m12) +#define LOAD_MSG_6_2(buf) buf = _mm_set_epi32(m10,m13,m15,m5) +#define LOAD_MSG_6_3(buf) buf = _mm_set_epi32(m8,m9,m6,m0) +#define LOAD_MSG_6_4(buf) buf = _mm_set_epi32(m11,m2,m3,m7) +#define LOAD_MSG_7_1(buf) buf = _mm_set_epi32(m3,m12,m7,m13) +#define LOAD_MSG_7_2(buf) buf = _mm_set_epi32(m9,m1,m14,m11) +#define LOAD_MSG_7_3(buf) buf = _mm_set_epi32(m2,m8,m15,m5) +#define LOAD_MSG_7_4(buf) buf = _mm_set_epi32(m10,m6,m4,m0) +#define LOAD_MSG_8_1(buf) buf = _mm_set_epi32(m0,m11,m14,m6) +#define LOAD_MSG_8_2(buf) buf = _mm_set_epi32(m8,m3,m9,m15) +#define LOAD_MSG_8_3(buf) buf = _mm_set_epi32(m10,m1,m13,m12) +#define LOAD_MSG_8_4(buf) buf = _mm_set_epi32(m5,m4,m7,m2) +#define LOAD_MSG_9_1(buf) buf = _mm_set_epi32(m1,m7,m8,m10) +#define LOAD_MSG_9_2(buf) buf = _mm_set_epi32(m5,m6,m4,m2) +#define LOAD_MSG_9_3(buf) buf = _mm_set_epi32(m13,m3,m9,m15) +#define LOAD_MSG_9_4(buf) buf = _mm_set_epi32(m0,m12,m14,m11) + + +#endif diff --git a/Modules/_blake2/impl/blake2s-load-sse41.h b/Modules/_blake2/impl/blake2s-load-sse41.h new file mode 100644 index 0000000..54bf0cd --- /dev/null +++ b/Modules/_blake2/impl/blake2s-load-sse41.h @@ -0,0 +1,231 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2S_LOAD_SSE41_H__ +#define __BLAKE2S_LOAD_SSE41_H__ + +#define LOAD_MSG_0_1(buf) \ +buf = TOI(_mm_shuffle_ps(TOF(m0), TOF(m1), _MM_SHUFFLE(2,0,2,0))); + +#define LOAD_MSG_0_2(buf) \ +buf = TOI(_mm_shuffle_ps(TOF(m0), TOF(m1), _MM_SHUFFLE(3,1,3,1))); + +#define LOAD_MSG_0_3(buf) \ +buf = TOI(_mm_shuffle_ps(TOF(m2), TOF(m3), _MM_SHUFFLE(2,0,2,0))); + +#define LOAD_MSG_0_4(buf) \ +buf = TOI(_mm_shuffle_ps(TOF(m2), TOF(m3), _MM_SHUFFLE(3,1,3,1))); + +#define LOAD_MSG_1_1(buf) \ +t0 = _mm_blend_epi16(m1, m2, 0x0C); \ +t1 = _mm_slli_si128(m3, 4); \ +t2 = _mm_blend_epi16(t0, t1, 0xF0); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,1,0,3)); + +#define LOAD_MSG_1_2(buf) \ +t0 = _mm_shuffle_epi32(m2,_MM_SHUFFLE(0,0,2,0)); \ +t1 = _mm_blend_epi16(m1,m3,0xC0); \ +t2 = _mm_blend_epi16(t0, t1, 0xF0); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1)); + +#define LOAD_MSG_1_3(buf) \ +t0 = _mm_slli_si128(m1, 4); \ +t1 = _mm_blend_epi16(m2, t0, 0x30); \ +t2 = _mm_blend_epi16(m0, t1, 0xF0); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1)); + +#define LOAD_MSG_1_4(buf) \ +t0 = _mm_unpackhi_epi32(m0,m1); \ +t1 = _mm_slli_si128(m3, 4); \ +t2 = _mm_blend_epi16(t0, t1, 0x0C); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,3,0,1)); + +#define LOAD_MSG_2_1(buf) \ +t0 = _mm_unpackhi_epi32(m2,m3); \ +t1 = _mm_blend_epi16(m3,m1,0x0C); \ +t2 = _mm_blend_epi16(t0, t1, 0x0F); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(3,1,0,2)); + +#define LOAD_MSG_2_2(buf) \ +t0 = _mm_unpacklo_epi32(m2,m0); \ +t1 = _mm_blend_epi16(t0, m0, 0xF0); \ +t2 = _mm_slli_si128(m3, 8); \ +buf = _mm_blend_epi16(t1, t2, 0xC0); + +#define LOAD_MSG_2_3(buf) \ +t0 = _mm_blend_epi16(m0, m2, 0x3C); \ +t1 = _mm_srli_si128(m1, 12); \ +t2 = _mm_blend_epi16(t0,t1,0x03); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,0,3,2)); + +#define LOAD_MSG_2_4(buf) \ +t0 = _mm_slli_si128(m3, 4); \ +t1 = _mm_blend_epi16(m0, m1, 0x33); \ +t2 = _mm_blend_epi16(t1, t0, 0xC0); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(0,1,2,3)); + +#define LOAD_MSG_3_1(buf) \ +t0 = _mm_unpackhi_epi32(m0,m1); \ +t1 = _mm_unpackhi_epi32(t0, m2); \ +t2 = _mm_blend_epi16(t1, m3, 0x0C); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(3,1,0,2)); + +#define LOAD_MSG_3_2(buf) \ +t0 = _mm_slli_si128(m2, 8); \ +t1 = _mm_blend_epi16(m3,m0,0x0C); \ +t2 = _mm_blend_epi16(t1, t0, 0xC0); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,0,1,3)); + +#define LOAD_MSG_3_3(buf) \ +t0 = _mm_blend_epi16(m0,m1,0x0F); \ +t1 = _mm_blend_epi16(t0, m3, 0xC0); \ +buf = _mm_shuffle_epi32(t1, _MM_SHUFFLE(3,0,1,2)); + +#define LOAD_MSG_3_4(buf) \ +t0 = _mm_unpacklo_epi32(m0,m2); \ +t1 = _mm_unpackhi_epi32(m1,m2); \ +buf = _mm_unpacklo_epi64(t1,t0); + +#define LOAD_MSG_4_1(buf) \ +t0 = _mm_unpacklo_epi64(m1,m2); \ +t1 = _mm_unpackhi_epi64(m0,m2); \ +t2 = _mm_blend_epi16(t0,t1,0x33); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,0,1,3)); + +#define LOAD_MSG_4_2(buf) \ +t0 = _mm_unpackhi_epi64(m1,m3); \ +t1 = _mm_unpacklo_epi64(m0,m1); \ +buf = _mm_blend_epi16(t0,t1,0x33); + +#define LOAD_MSG_4_3(buf) \ +t0 = _mm_unpackhi_epi64(m3,m1); \ +t1 = _mm_unpackhi_epi64(m2,m0); \ +buf = _mm_blend_epi16(t1,t0,0x33); + +#define LOAD_MSG_4_4(buf) \ +t0 = _mm_blend_epi16(m0,m2,0x03); \ +t1 = _mm_slli_si128(t0, 8); \ +t2 = _mm_blend_epi16(t1,m3,0x0F); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,2,0,3)); + +#define LOAD_MSG_5_1(buf) \ +t0 = _mm_unpackhi_epi32(m0,m1); \ +t1 = _mm_unpacklo_epi32(m0,m2); \ +buf = _mm_unpacklo_epi64(t0,t1); + +#define LOAD_MSG_5_2(buf) \ +t0 = _mm_srli_si128(m2, 4); \ +t1 = _mm_blend_epi16(m0,m3,0x03); \ +buf = _mm_blend_epi16(t1,t0,0x3C); + +#define LOAD_MSG_5_3(buf) \ +t0 = _mm_blend_epi16(m1,m0,0x0C); \ +t1 = _mm_srli_si128(m3, 4); \ +t2 = _mm_blend_epi16(t0,t1,0x30); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,2,3,0)); + +#define LOAD_MSG_5_4(buf) \ +t0 = _mm_unpacklo_epi64(m1,m2); \ +t1= _mm_shuffle_epi32(m3, _MM_SHUFFLE(0,2,0,1)); \ +buf = _mm_blend_epi16(t0,t1,0x33); + +#define LOAD_MSG_6_1(buf) \ +t0 = _mm_slli_si128(m1, 12); \ +t1 = _mm_blend_epi16(m0,m3,0x33); \ +buf = _mm_blend_epi16(t1,t0,0xC0); + +#define LOAD_MSG_6_2(buf) \ +t0 = _mm_blend_epi16(m3,m2,0x30); \ +t1 = _mm_srli_si128(m1, 4); \ +t2 = _mm_blend_epi16(t0,t1,0x03); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(2,1,3,0)); + +#define LOAD_MSG_6_3(buf) \ +t0 = _mm_unpacklo_epi64(m0,m2); \ +t1 = _mm_srli_si128(m1, 4); \ +buf = _mm_shuffle_epi32(_mm_blend_epi16(t0,t1,0x0C), _MM_SHUFFLE(2,3,1,0)); + +#define LOAD_MSG_6_4(buf) \ +t0 = _mm_unpackhi_epi32(m1,m2); \ +t1 = _mm_unpackhi_epi64(m0,t0); \ +buf = _mm_shuffle_epi32(t1, _MM_SHUFFLE(3,0,1,2)); + +#define LOAD_MSG_7_1(buf) \ +t0 = _mm_unpackhi_epi32(m0,m1); \ +t1 = _mm_blend_epi16(t0,m3,0x0F); \ +buf = _mm_shuffle_epi32(t1,_MM_SHUFFLE(2,0,3,1)); + +#define LOAD_MSG_7_2(buf) \ +t0 = _mm_blend_epi16(m2,m3,0x30); \ +t1 = _mm_srli_si128(m0,4); \ +t2 = _mm_blend_epi16(t0,t1,0x03); \ +buf = _mm_shuffle_epi32(t2, _MM_SHUFFLE(1,0,2,3)); + +#define LOAD_MSG_7_3(buf) \ +t0 = _mm_unpackhi_epi64(m0,m3); \ +t1 = _mm_unpacklo_epi64(m1,m2); \ +t2 = _mm_blend_epi16(t0,t1,0x3C); \ +buf = _mm_shuffle_epi32(t2,_MM_SHUFFLE(0,2,3,1)); + +#define LOAD_MSG_7_4(buf) \ +t0 = _mm_unpacklo_epi32(m0,m1); \ +t1 = _mm_unpackhi_epi32(m1,m2); \ +buf = _mm_unpacklo_epi64(t0,t1); + +#define LOAD_MSG_8_1(buf) \ +t0 = _mm_unpackhi_epi32(m1,m3); \ +t1 = _mm_unpacklo_epi64(t0,m0); \ +t2 = _mm_blend_epi16(t1,m2,0xC0); \ +buf = _mm_shufflehi_epi16(t2,_MM_SHUFFLE(1,0,3,2)); + +#define LOAD_MSG_8_2(buf) \ +t0 = _mm_unpackhi_epi32(m0,m3); \ +t1 = _mm_blend_epi16(m2,t0,0xF0); \ +buf = _mm_shuffle_epi32(t1,_MM_SHUFFLE(0,2,1,3)); + +#define LOAD_MSG_8_3(buf) \ +t0 = _mm_blend_epi16(m2,m0,0x0C); \ +t1 = _mm_slli_si128(t0,4); \ +buf = _mm_blend_epi16(t1,m3,0x0F); + +#define LOAD_MSG_8_4(buf) \ +t0 = _mm_blend_epi16(m1,m0,0x30); \ +buf = _mm_shuffle_epi32(t0,_MM_SHUFFLE(1,0,3,2)); + +#define LOAD_MSG_9_1(buf) \ +t0 = _mm_blend_epi16(m0,m2,0x03); \ +t1 = _mm_blend_epi16(m1,m2,0x30); \ +t2 = _mm_blend_epi16(t1,t0,0x0F); \ +buf = _mm_shuffle_epi32(t2,_MM_SHUFFLE(1,3,0,2)); + +#define LOAD_MSG_9_2(buf) \ +t0 = _mm_slli_si128(m0,4); \ +t1 = _mm_blend_epi16(m1,t0,0xC0); \ +buf = _mm_shuffle_epi32(t1,_MM_SHUFFLE(1,2,0,3)); + +#define LOAD_MSG_9_3(buf) \ +t0 = _mm_unpackhi_epi32(m0,m3); \ +t1 = _mm_unpacklo_epi32(m2,m3); \ +t2 = _mm_unpackhi_epi64(t0,t1); \ +buf = _mm_shuffle_epi32(t2,_MM_SHUFFLE(3,0,2,1)); + +#define LOAD_MSG_9_4(buf) \ +t0 = _mm_blend_epi16(m3,m2,0xC0); \ +t1 = _mm_unpacklo_epi32(m0,m3); \ +t2 = _mm_blend_epi16(t0,t1,0x0F); \ +buf = _mm_shuffle_epi32(t2,_MM_SHUFFLE(0,1,2,3)); + +#endif + diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h new file mode 100644 index 0000000..a3b5d65 --- /dev/null +++ b/Modules/_blake2/impl/blake2s-load-xop.h @@ -0,0 +1,191 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2S_LOAD_XOP_H__ +#define __BLAKE2S_LOAD_XOP_H__ + +#define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ + +/* Basic VPPERM emulation, for testing purposes */ +/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) +{ + const __m128i sixteen = _mm_set1_epi8(16); + const __m128i t0 = _mm_shuffle_epi8(src1, sel); + const __m128i s1 = _mm_shuffle_epi8(src2, _mm_sub_epi8(sel, sixteen)); + const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), + _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ + return _mm_blendv_epi8(t0, s1, mask); +}*/ + +#define LOAD_MSG_0_1(buf) \ +buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); + +#define LOAD_MSG_0_2(buf) \ +buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(7),TOB(5),TOB(3),TOB(1)) ); + +#define LOAD_MSG_0_3(buf) \ +buf = _mm_perm_epi8(m2, m3, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); + +#define LOAD_MSG_0_4(buf) \ +buf = _mm_perm_epi8(m2, m3, _mm_set_epi32(TOB(7),TOB(5),TOB(3),TOB(1)) ); + +#define LOAD_MSG_1_1(buf) \ +t0 = _mm_perm_epi8(m1, m2, _mm_set_epi32(TOB(0),TOB(5),TOB(0),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(5),TOB(2),TOB(1),TOB(6)) ); + +#define LOAD_MSG_1_2(buf) \ +t1 = _mm_perm_epi8(m1, m2, _mm_set_epi32(TOB(2),TOB(0),TOB(4),TOB(6)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(7),TOB(1),TOB(0)) ); + +#define LOAD_MSG_1_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(5),TOB(0),TOB(0),TOB(1)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(3),TOB(7),TOB(1),TOB(0)) ); + +#define LOAD_MSG_1_4(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(3),TOB(7),TOB(2),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(4)) ); + +#define LOAD_MSG_2_1(buf) \ +t0 = _mm_perm_epi8(m1, m2, _mm_set_epi32(TOB(0),TOB(1),TOB(0),TOB(7)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(7),TOB(2),TOB(4),TOB(0)) ); + +#define LOAD_MSG_2_2(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(0),TOB(2),TOB(0),TOB(4)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(5),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_2_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(7),TOB(3),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(5),TOB(2),TOB(1),TOB(6)) ); + +#define LOAD_MSG_2_4(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(4),TOB(1),TOB(6),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(6)) ); + +#define LOAD_MSG_3_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(0),TOB(3),TOB(7)) ); \ +t0 = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(7),TOB(2),TOB(1),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(5),TOB(1),TOB(0)) ); + +#define LOAD_MSG_3_2(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(0),TOB(0),TOB(1),TOB(5)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(6),TOB(4),TOB(1),TOB(0)) ); + +#define LOAD_MSG_3_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(4),TOB(5),TOB(2)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(7),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_3_4(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(0),TOB(0),TOB(6)) ); \ +buf = _mm_perm_epi8(t1, m2, _mm_set_epi32(TOB(4),TOB(2),TOB(6),TOB(0)) ); + +#define LOAD_MSG_4_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(2),TOB(5),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(6),TOB(2),TOB(1),TOB(5)) ); + +#define LOAD_MSG_4_2(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(4),TOB(7),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(7),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_4_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(3),TOB(6),TOB(0),TOB(0)) ); \ +t0 = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(3),TOB(2),TOB(7),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(6)) ); + +#define LOAD_MSG_4_4(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(0),TOB(4),TOB(0),TOB(1)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(5),TOB(2),TOB(4),TOB(0)) ); + +#define LOAD_MSG_5_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(0),TOB(6),TOB(2)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(4),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_5_2(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(3),TOB(7),TOB(6),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(4)) ); + +#define LOAD_MSG_5_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(1),TOB(0),TOB(7),TOB(4)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(7),TOB(1),TOB(0)) ); + +#define LOAD_MSG_5_4(buf) \ +t1 = _mm_perm_epi8(m1, m2, _mm_set_epi32(TOB(5),TOB(0),TOB(1),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(6),TOB(1),TOB(5)) ); + +#define LOAD_MSG_6_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(4),TOB(0),TOB(1),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(6),TOB(1),TOB(4)) ); + +#define LOAD_MSG_6_2(buf) \ +t1 = _mm_perm_epi8(m1, m2, _mm_set_epi32(TOB(6),TOB(0),TOB(0),TOB(1)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(5),TOB(7),TOB(0)) ); + +#define LOAD_MSG_6_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(0),TOB(6),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(4),TOB(5),TOB(1),TOB(0)) ); + +#define LOAD_MSG_6_4(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(2),TOB(3),TOB(7)) ); \ +buf = _mm_perm_epi8(t1, m2, _mm_set_epi32(TOB(7),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_7_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(3),TOB(0),TOB(7),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(4),TOB(1),TOB(5)) ); + +#define LOAD_MSG_7_2(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(5),TOB(1),TOB(0),TOB(7)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(6),TOB(0)) ); + +#define LOAD_MSG_7_3(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(2),TOB(0),TOB(0),TOB(5)) ); \ +t0 = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(3),TOB(4),TOB(1),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(7),TOB(0)) ); + +#define LOAD_MSG_7_4(buf) \ +t1 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(6),TOB(4),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m2, _mm_set_epi32(TOB(6),TOB(2),TOB(1),TOB(0)) ); + +#define LOAD_MSG_8_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(0),TOB(0),TOB(0),TOB(6)) ); \ +t0 = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(3),TOB(7),TOB(1),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(6),TOB(0)) ); + +#define LOAD_MSG_8_2(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(4),TOB(3),TOB(5),TOB(0)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(1),TOB(7)) ); + +#define LOAD_MSG_8_3(buf) \ +t0 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(6),TOB(1),TOB(0),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(3),TOB(2),TOB(5),TOB(4)) ); \ + +#define LOAD_MSG_8_4(buf) \ +buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(5),TOB(4),TOB(7),TOB(2)) ); + +#define LOAD_MSG_9_1(buf) \ +t0 = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(1),TOB(7),TOB(0),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m2, _mm_set_epi32(TOB(3),TOB(2),TOB(4),TOB(6)) ); + +#define LOAD_MSG_9_2(buf) \ +buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(5),TOB(6),TOB(4),TOB(2)) ); + +#define LOAD_MSG_9_3(buf) \ +t0 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(0),TOB(3),TOB(5),TOB(0)) ); \ +buf = _mm_perm_epi8(t0, m3, _mm_set_epi32(TOB(5),TOB(2),TOB(1),TOB(7)) ); + +#define LOAD_MSG_9_4(buf) \ +t1 = _mm_perm_epi8(m0, m2, _mm_set_epi32(TOB(0),TOB(0),TOB(0),TOB(7)) ); \ +buf = _mm_perm_epi8(t1, m3, _mm_set_epi32(TOB(3),TOB(4),TOB(6),TOB(0)) ); + +#endif + diff --git a/Modules/_blake2/impl/blake2s-ref.c b/Modules/_blake2/impl/blake2s-ref.c new file mode 100644 index 0000000..6636753 --- /dev/null +++ b/Modules/_blake2/impl/blake2s-ref.c @@ -0,0 +1,411 @@ +/* + BLAKE2 reference source code package - reference C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ + +#include +#include +#include + +#include "blake2.h" +#include "blake2-impl.h" + +static const uint32_t blake2s_IV[8] = +{ + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = +{ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } , + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 } , + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 } , + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 } , + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 } , + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 } , + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 } , + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 } , + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13 , 0 } , +}; + +BLAKE2_LOCAL_INLINE(int) blake2s_set_lastnode( blake2s_state *S ) +{ + S->f[1] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_clear_lastnode( blake2s_state *S ) +{ + S->f[1] = 0; + return 0; +} + +/* Some helper functions, not necessarily useful */ +BLAKE2_LOCAL_INLINE(int) blake2s_is_lastblock( const blake2s_state *S ) +{ + return S->f[0] != 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_set_lastblock( blake2s_state *S ) +{ + if( S->last_node ) blake2s_set_lastnode( S ); + + S->f[0] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_clear_lastblock( blake2s_state *S ) +{ + if( S->last_node ) blake2s_clear_lastnode( S ); + + S->f[0] = 0; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_increment_counter( blake2s_state *S, const uint32_t inc ) +{ + S->t[0] += inc; + S->t[1] += ( S->t[0] < inc ); + return 0; +} + +/* Parameter-related functions */ +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_digest_length( blake2s_param *P, const uint8_t digest_length ) +{ + P->digest_length = digest_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_fanout( blake2s_param *P, const uint8_t fanout ) +{ + P->fanout = fanout; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_max_depth( blake2s_param *P, const uint8_t depth ) +{ + P->depth = depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_leaf_length( blake2s_param *P, const uint32_t leaf_length ) +{ + store32( &P->leaf_length, leaf_length ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_node_offset( blake2s_param *P, const uint64_t node_offset ) +{ + store48( P->node_offset, node_offset ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_node_depth( blake2s_param *P, const uint8_t node_depth ) +{ + P->node_depth = node_depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_inner_length( blake2s_param *P, const uint8_t inner_length ) +{ + P->inner_length = inner_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_salt( blake2s_param *P, const uint8_t salt[BLAKE2S_SALTBYTES] ) +{ + memcpy( P->salt, salt, BLAKE2S_SALTBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_personal( blake2s_param *P, const uint8_t personal[BLAKE2S_PERSONALBYTES] ) +{ + memcpy( P->personal, personal, BLAKE2S_PERSONALBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_init0( blake2s_state *S ) +{ + int i; + memset( S, 0, sizeof( blake2s_state ) ); + + for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i]; + + return 0; +} + +/* init2 xors IV with input parameter block */ +int blake2s_init_param( blake2s_state *S, const blake2s_param *P ) +{ + const uint32_t *p = ( const uint32_t * )( P ); + size_t i; + + blake2s_init0( S ); + + /* IV XOR ParamBlock */ + for( i = 0; i < 8; ++i ) + S->h[i] ^= load32( &p[i] ); + + return 0; +} + + +/* Sequential blake2s initialization */ +int blake2s_init( blake2s_state *S, const uint8_t outlen ) +{ + blake2s_param P[1]; + + /* Move interval verification here? */ + if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1; + + P->digest_length = outlen; + P->key_length = 0; + P->fanout = 1; + P->depth = 1; + store32( &P->leaf_length, 0 ); + store48( &P->node_offset, 0 ); + P->node_depth = 0; + P->inner_length = 0; + /* memset(P->reserved, 0, sizeof(P->reserved) ); */ + memset( P->salt, 0, sizeof( P->salt ) ); + memset( P->personal, 0, sizeof( P->personal ) ); + return blake2s_init_param( S, P ); +} + +int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ) +{ + blake2s_param P[1]; + + if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1; + + if ( !key || !keylen || keylen > BLAKE2S_KEYBYTES ) return -1; + + P->digest_length = outlen; + P->key_length = keylen; + P->fanout = 1; + P->depth = 1; + store32( &P->leaf_length, 0 ); + store48( &P->node_offset, 0 ); + P->node_depth = 0; + P->inner_length = 0; + /* memset(P->reserved, 0, sizeof(P->reserved) ); */ + memset( P->salt, 0, sizeof( P->salt ) ); + memset( P->personal, 0, sizeof( P->personal ) ); + + if( blake2s_init_param( S, P ) < 0 ) return -1; + + { + uint8_t block[BLAKE2S_BLOCKBYTES]; + memset( block, 0, BLAKE2S_BLOCKBYTES ); + memcpy( block, key, keylen ); + blake2s_update( S, block, BLAKE2S_BLOCKBYTES ); + secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from stack */ + } + return 0; +} + +static int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCKBYTES] ) +{ + uint32_t m[16]; + uint32_t v[16]; + size_t i; + + for( i = 0; i < 16; ++i ) + m[i] = load32( block + i * sizeof( m[i] ) ); + + for( i = 0; i < 8; ++i ) + v[i] = S->h[i]; + + v[ 8] = blake2s_IV[0]; + v[ 9] = blake2s_IV[1]; + v[10] = blake2s_IV[2]; + v[11] = blake2s_IV[3]; + v[12] = S->t[0] ^ blake2s_IV[4]; + v[13] = S->t[1] ^ blake2s_IV[5]; + v[14] = S->f[0] ^ blake2s_IV[6]; + v[15] = S->f[1] ^ blake2s_IV[7]; +#define G(r,i,a,b,c,d) \ + do { \ + a = a + b + m[blake2s_sigma[r][2*i+0]]; \ + d = rotr32(d ^ a, 16); \ + c = c + d; \ + b = rotr32(b ^ c, 12); \ + a = a + b + m[blake2s_sigma[r][2*i+1]]; \ + d = rotr32(d ^ a, 8); \ + c = c + d; \ + b = rotr32(b ^ c, 7); \ + } while(0) +#define ROUND(r) \ + do { \ + G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \ + G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \ + G(r,2,v[ 2],v[ 6],v[10],v[14]); \ + G(r,3,v[ 3],v[ 7],v[11],v[15]); \ + G(r,4,v[ 0],v[ 5],v[10],v[15]); \ + G(r,5,v[ 1],v[ 6],v[11],v[12]); \ + G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \ + G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \ + } while(0) + ROUND( 0 ); + ROUND( 1 ); + ROUND( 2 ); + ROUND( 3 ); + ROUND( 4 ); + ROUND( 5 ); + ROUND( 6 ); + ROUND( 7 ); + ROUND( 8 ); + ROUND( 9 ); + + for( i = 0; i < 8; ++i ) + S->h[i] = S->h[i] ^ v[i] ^ v[i + 8]; + +#undef G +#undef ROUND + return 0; +} + + +int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen ) +{ + while( inlen > 0 ) + { + size_t left = S->buflen; + size_t fill = 2 * BLAKE2S_BLOCKBYTES - left; + + if( inlen > fill ) + { + memcpy( S->buf + left, in, fill ); /* Fill buffer */ + S->buflen += fill; + blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES ); + blake2s_compress( S, S->buf ); /* Compress */ + memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, BLAKE2S_BLOCKBYTES ); /* Shift buffer left */ + S->buflen -= BLAKE2S_BLOCKBYTES; + in += fill; + inlen -= fill; + } + else /* inlen <= fill */ + { + memcpy( S->buf + left, in, (size_t)inlen ); + S->buflen += (size_t)inlen; /* Be lazy, do not compress */ + in += inlen; + inlen -= inlen; + } + } + + return 0; +} + +int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen ) +{ + uint8_t buffer[BLAKE2S_OUTBYTES] = {0}; + int i; + + if( out == NULL || outlen == 0 || outlen > BLAKE2S_OUTBYTES ) + return -1; + + if( blake2s_is_lastblock( S ) ) + return -1; + + + if( S->buflen > BLAKE2S_BLOCKBYTES ) + { + blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES ); + blake2s_compress( S, S->buf ); + S->buflen -= BLAKE2S_BLOCKBYTES; + memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen ); + } + + blake2s_increment_counter( S, ( uint32_t )S->buflen ); + blake2s_set_lastblock( S ); + memset( S->buf + S->buflen, 0, 2 * BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */ + blake2s_compress( S, S->buf ); + + for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */ + store32( buffer + sizeof( S->h[i] ) * i, S->h[i] ); + + memcpy( out, buffer, outlen ); + return 0; +} + +int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ) +{ + blake2s_state S[1]; + + /* Verify parameters */ + if ( NULL == in && inlen > 0 ) return -1; + + if ( NULL == out ) return -1; + + if ( NULL == key && keylen > 0) return -1; + + if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1; + + if( keylen > BLAKE2S_KEYBYTES ) return -1; + + if( keylen > 0 ) + { + if( blake2s_init_key( S, outlen, key, keylen ) < 0 ) return -1; + } + else + { + if( blake2s_init( S, outlen ) < 0 ) return -1; + } + + blake2s_update( S, ( const uint8_t * )in, inlen ); + blake2s_final( S, out, outlen ); + return 0; +} + +#if defined(SUPERCOP) +int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) +{ + return blake2s( out, in, NULL, BLAKE2S_OUTBYTES, inlen, 0 ); +} +#endif + +#if defined(BLAKE2S_SELFTEST) +#include +#include "blake2-kat.h" +int main( int argc, char **argv ) +{ + uint8_t key[BLAKE2S_KEYBYTES]; + uint8_t buf[KAT_LENGTH]; + size_t i; + + for( i = 0; i < BLAKE2S_KEYBYTES; ++i ) + key[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + buf[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + { + uint8_t hash[BLAKE2S_OUTBYTES]; + blake2s( hash, buf, key, BLAKE2S_OUTBYTES, i, BLAKE2S_KEYBYTES ); + + if( 0 != memcmp( hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES ) ) + { + puts( "error" ); + return -1; + } + } + + puts( "ok" ); + return 0; +} +#endif + + diff --git a/Modules/_blake2/impl/blake2s-round.h b/Modules/_blake2/impl/blake2s-round.h new file mode 100644 index 0000000..7470d92 --- /dev/null +++ b/Modules/_blake2/impl/blake2s-round.h @@ -0,0 +1,90 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ +#pragma once +#ifndef __BLAKE2S_ROUND_H__ +#define __BLAKE2S_ROUND_H__ + +#define LOADU(p) _mm_loadu_si128( (const __m128i *)(p) ) +#define STOREU(p,r) _mm_storeu_si128((__m128i *)(p), r) + +#define TOF(reg) _mm_castsi128_ps((reg)) +#define TOI(reg) _mm_castps_si128((reg)) + +#define LIKELY(x) __builtin_expect((x),1) + + +/* Microarchitecture-specific macros */ +#ifndef HAVE_XOP +#ifdef HAVE_SSSE3 +#define _mm_roti_epi32(r, c) ( \ + (8==-(c)) ? _mm_shuffle_epi8(r,r8) \ + : (16==-(c)) ? _mm_shuffle_epi8(r,r16) \ + : _mm_xor_si128(_mm_srli_epi32( (r), -(c) ),_mm_slli_epi32( (r), 32-(-(c)) )) ) +#else +#define _mm_roti_epi32(r, c) _mm_xor_si128(_mm_srli_epi32( (r), -(c) ),_mm_slli_epi32( (r), 32-(-(c)) )) +#endif +#else +/* ... */ +#endif + + +#define G1(row1,row2,row3,row4,buf) \ + row1 = _mm_add_epi32( _mm_add_epi32( row1, buf), row2 ); \ + row4 = _mm_xor_si128( row4, row1 ); \ + row4 = _mm_roti_epi32(row4, -16); \ + row3 = _mm_add_epi32( row3, row4 ); \ + row2 = _mm_xor_si128( row2, row3 ); \ + row2 = _mm_roti_epi32(row2, -12); + +#define G2(row1,row2,row3,row4,buf) \ + row1 = _mm_add_epi32( _mm_add_epi32( row1, buf), row2 ); \ + row4 = _mm_xor_si128( row4, row1 ); \ + row4 = _mm_roti_epi32(row4, -8); \ + row3 = _mm_add_epi32( row3, row4 ); \ + row2 = _mm_xor_si128( row2, row3 ); \ + row2 = _mm_roti_epi32(row2, -7); + +#define DIAGONALIZE(row1,row2,row3,row4) \ + row4 = _mm_shuffle_epi32( row4, _MM_SHUFFLE(2,1,0,3) ); \ + row3 = _mm_shuffle_epi32( row3, _MM_SHUFFLE(1,0,3,2) ); \ + row2 = _mm_shuffle_epi32( row2, _MM_SHUFFLE(0,3,2,1) ); + +#define UNDIAGONALIZE(row1,row2,row3,row4) \ + row4 = _mm_shuffle_epi32( row4, _MM_SHUFFLE(0,3,2,1) ); \ + row3 = _mm_shuffle_epi32( row3, _MM_SHUFFLE(1,0,3,2) ); \ + row2 = _mm_shuffle_epi32( row2, _MM_SHUFFLE(2,1,0,3) ); + +#if defined(HAVE_XOP) +#include "blake2s-load-xop.h" +#elif defined(HAVE_SSE41) +#include "blake2s-load-sse41.h" +#else +#include "blake2s-load-sse2.h" +#endif + +#define ROUND(r) \ + LOAD_MSG_ ##r ##_1(buf1); \ + G1(row1,row2,row3,row4,buf1); \ + LOAD_MSG_ ##r ##_2(buf2); \ + G2(row1,row2,row3,row4,buf2); \ + DIAGONALIZE(row1,row2,row3,row4); \ + LOAD_MSG_ ##r ##_3(buf3); \ + G1(row1,row2,row3,row4,buf3); \ + LOAD_MSG_ ##r ##_4(buf4); \ + G2(row1,row2,row3,row4,buf4); \ + UNDIAGONALIZE(row1,row2,row3,row4); \ + +#endif + diff --git a/Modules/_blake2/impl/blake2s.c b/Modules/_blake2/impl/blake2s.c new file mode 100644 index 0000000..69385dc --- /dev/null +++ b/Modules/_blake2/impl/blake2s.c @@ -0,0 +1,435 @@ +/* + BLAKE2 reference source code package - optimized C implementations + + Copyright 2012, Samuel Neves . You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. +*/ + +#include +#include +#include + +#include "blake2.h" +#include "blake2-impl.h" + +#include "blake2-config.h" + + +#include +#if defined(HAVE_SSSE3) +#include +#endif +#if defined(HAVE_SSE41) +#include +#endif +#if defined(HAVE_AVX) +#include +#endif +#if defined(HAVE_XOP) +#include +#endif + +#include "blake2s-round.h" + +static const uint32_t blake2s_IV[8] = +{ + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = +{ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } , + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } , + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 } , + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 } , + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 } , + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 } , + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 } , + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 } , + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 } , + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13 , 0 } , +}; + + +/* Some helper functions, not necessarily useful */ +BLAKE2_LOCAL_INLINE(int) blake2s_set_lastnode( blake2s_state *S ) +{ + S->f[1] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_clear_lastnode( blake2s_state *S ) +{ + S->f[1] = 0; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_is_lastblock( const blake2s_state *S ) +{ + return S->f[0] != 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_set_lastblock( blake2s_state *S ) +{ + if( S->last_node ) blake2s_set_lastnode( S ); + + S->f[0] = -1; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_clear_lastblock( blake2s_state *S ) +{ + if( S->last_node ) blake2s_clear_lastnode( S ); + + S->f[0] = 0; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_increment_counter( blake2s_state *S, const uint32_t inc ) +{ + uint64_t t = ( ( uint64_t )S->t[1] << 32 ) | S->t[0]; + t += inc; + S->t[0] = ( uint32_t )( t >> 0 ); + S->t[1] = ( uint32_t )( t >> 32 ); + return 0; +} + + +/* Parameter-related functions */ +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_digest_length( blake2s_param *P, const uint8_t digest_length ) +{ + P->digest_length = digest_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_fanout( blake2s_param *P, const uint8_t fanout ) +{ + P->fanout = fanout; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_max_depth( blake2s_param *P, const uint8_t depth ) +{ + P->depth = depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_leaf_length( blake2s_param *P, const uint32_t leaf_length ) +{ + P->leaf_length = leaf_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_node_offset( blake2s_param *P, const uint64_t node_offset ) +{ + store48( P->node_offset, node_offset ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_node_depth( blake2s_param *P, const uint8_t node_depth ) +{ + P->node_depth = node_depth; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_inner_length( blake2s_param *P, const uint8_t inner_length ) +{ + P->inner_length = inner_length; + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_salt( blake2s_param *P, const uint8_t salt[BLAKE2S_SALTBYTES] ) +{ + memcpy( P->salt, salt, BLAKE2S_SALTBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_param_set_personal( blake2s_param *P, const uint8_t personal[BLAKE2S_PERSONALBYTES] ) +{ + memcpy( P->personal, personal, BLAKE2S_PERSONALBYTES ); + return 0; +} + +BLAKE2_LOCAL_INLINE(int) blake2s_init0( blake2s_state *S ) +{ + int i; + memset( S, 0, sizeof( blake2s_state ) ); + + for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i]; + + return 0; +} + +/* init2 xors IV with input parameter block */ +int blake2s_init_param( blake2s_state *S, const blake2s_param *P ) +{ + /*blake2s_init0( S ); */ + const uint8_t * v = ( const uint8_t * )( blake2s_IV ); + const uint8_t * p = ( const uint8_t * )( P ); + uint8_t * h = ( uint8_t * )( S->h ); + int i; + /* IV XOR ParamBlock */ + memset( S, 0, sizeof( blake2s_state ) ); + + for( i = 0; i < BLAKE2S_OUTBYTES; ++i ) h[i] = v[i] ^ p[i]; + + return 0; +} + + +/* Some sort of default parameter block initialization, for sequential blake2s */ +int blake2s_init( blake2s_state *S, const uint8_t outlen ) +{ + const blake2s_param P = + { + outlen, + 0, + 1, + 1, + 0, + {0}, + 0, + 0, + {0}, + {0} + }; + /* Move interval verification here? */ + if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1; + return blake2s_init_param( S, &P ); +} + + +int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ) +{ + const blake2s_param P = + { + outlen, + keylen, + 1, + 1, + 0, + {0}, + 0, + 0, + {0}, + {0} + }; + + /* Move interval verification here? */ + if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1; + + if ( ( !key ) || ( !keylen ) || keylen > BLAKE2S_KEYBYTES ) return -1; + + if( blake2s_init_param( S, &P ) < 0 ) + return -1; + + { + uint8_t block[BLAKE2S_BLOCKBYTES]; + memset( block, 0, BLAKE2S_BLOCKBYTES ); + memcpy( block, key, keylen ); + blake2s_update( S, block, BLAKE2S_BLOCKBYTES ); + secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from stack */ + } + return 0; +} + + +BLAKE2_LOCAL_INLINE(int) blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCKBYTES] ) +{ + __m128i row1, row2, row3, row4; + __m128i buf1, buf2, buf3, buf4; +#if defined(HAVE_SSE41) + __m128i t0, t1; +#if !defined(HAVE_XOP) + __m128i t2; +#endif +#endif + __m128i ff0, ff1; +#if defined(HAVE_SSSE3) && !defined(HAVE_XOP) + const __m128i r8 = _mm_set_epi8( 12, 15, 14, 13, 8, 11, 10, 9, 4, 7, 6, 5, 0, 3, 2, 1 ); + const __m128i r16 = _mm_set_epi8( 13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2 ); +#endif +#if defined(HAVE_SSE41) + const __m128i m0 = LOADU( block + 00 ); + const __m128i m1 = LOADU( block + 16 ); + const __m128i m2 = LOADU( block + 32 ); + const __m128i m3 = LOADU( block + 48 ); +#else + const uint32_t m0 = ( ( uint32_t * )block )[ 0]; + const uint32_t m1 = ( ( uint32_t * )block )[ 1]; + const uint32_t m2 = ( ( uint32_t * )block )[ 2]; + const uint32_t m3 = ( ( uint32_t * )block )[ 3]; + const uint32_t m4 = ( ( uint32_t * )block )[ 4]; + const uint32_t m5 = ( ( uint32_t * )block )[ 5]; + const uint32_t m6 = ( ( uint32_t * )block )[ 6]; + const uint32_t m7 = ( ( uint32_t * )block )[ 7]; + const uint32_t m8 = ( ( uint32_t * )block )[ 8]; + const uint32_t m9 = ( ( uint32_t * )block )[ 9]; + const uint32_t m10 = ( ( uint32_t * )block )[10]; + const uint32_t m11 = ( ( uint32_t * )block )[11]; + const uint32_t m12 = ( ( uint32_t * )block )[12]; + const uint32_t m13 = ( ( uint32_t * )block )[13]; + const uint32_t m14 = ( ( uint32_t * )block )[14]; + const uint32_t m15 = ( ( uint32_t * )block )[15]; +#endif + row1 = ff0 = LOADU( &S->h[0] ); + row2 = ff1 = LOADU( &S->h[4] ); + row3 = _mm_setr_epi32( 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A ); + row4 = _mm_xor_si128( _mm_setr_epi32( 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 ), LOADU( &S->t[0] ) ); + ROUND( 0 ); + ROUND( 1 ); + ROUND( 2 ); + ROUND( 3 ); + ROUND( 4 ); + ROUND( 5 ); + ROUND( 6 ); + ROUND( 7 ); + ROUND( 8 ); + ROUND( 9 ); + STOREU( &S->h[0], _mm_xor_si128( ff0, _mm_xor_si128( row1, row3 ) ) ); + STOREU( &S->h[4], _mm_xor_si128( ff1, _mm_xor_si128( row2, row4 ) ) ); + return 0; +} + +/* inlen now in bytes */ +int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen ) +{ + while( inlen > 0 ) + { + size_t left = S->buflen; + size_t fill = 2 * BLAKE2S_BLOCKBYTES - left; + + if( inlen > fill ) + { + memcpy( S->buf + left, in, fill ); /* Fill buffer */ + S->buflen += fill; + blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES ); + blake2s_compress( S, S->buf ); /* Compress */ + memcpy( S->buf, S->buf + BLAKE2S_BLOCKBYTES, BLAKE2S_BLOCKBYTES ); /* Shift buffer left */ + S->buflen -= BLAKE2S_BLOCKBYTES; + in += fill; + inlen -= fill; + } + else /* inlen <= fill */ + { + memcpy( S->buf + left, in, inlen ); + S->buflen += inlen; /* Be lazy, do not compress */ + in += inlen; + inlen -= inlen; + } + } + + return 0; +} + +/* Is this correct? */ +int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen ) +{ + uint8_t buffer[BLAKE2S_OUTBYTES] = {0}; + int i; + + if( outlen > BLAKE2S_OUTBYTES ) + return -1; + + if( blake2s_is_lastblock( S ) ) + return -1; + + if( S->buflen > BLAKE2S_BLOCKBYTES ) + { + blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES ); + blake2s_compress( S, S->buf ); + S->buflen -= BLAKE2S_BLOCKBYTES; + memmove( S->buf, S->buf + BLAKE2S_BLOCKBYTES, S->buflen ); + } + + blake2s_increment_counter( S, ( uint32_t )S->buflen ); + blake2s_set_lastblock( S ); + memset( S->buf + S->buflen, 0, 2 * BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */ + blake2s_compress( S, S->buf ); + + for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */ + store32( buffer + sizeof( S->h[i] ) * i, S->h[i] ); + + memcpy( out, buffer, outlen ); + return 0; +} + +/* inlen, at least, should be uint64_t. Others can be size_t. */ +int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ) +{ + blake2s_state S[1]; + + /* Verify parameters */ + if ( NULL == in && inlen > 0 ) return -1; + + if ( NULL == out ) return -1; + + if ( NULL == key && keylen > 0) return -1; + + if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1; + + if( keylen > BLAKE2S_KEYBYTES ) return -1; + + if( keylen > 0 ) + { + if( blake2s_init_key( S, outlen, key, keylen ) < 0 ) return -1; + } + else + { + if( blake2s_init( S, outlen ) < 0 ) return -1; + } + + blake2s_update( S, ( const uint8_t * )in, inlen ); + blake2s_final( S, out, outlen ); + return 0; +} + +#if defined(SUPERCOP) +int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) +{ + return blake2s( out, in, NULL, BLAKE2S_OUTBYTES, inlen, 0 ); +} +#endif + +#if defined(BLAKE2S_SELFTEST) +#include +#include "blake2-kat.h" +int main( int argc, char **argv ) +{ + uint8_t key[BLAKE2S_KEYBYTES]; + uint8_t buf[KAT_LENGTH]; + size_t i; + + for( i = 0; i < BLAKE2S_KEYBYTES; ++i ) + key[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + buf[i] = ( uint8_t )i; + + for( i = 0; i < KAT_LENGTH; ++i ) + { + uint8_t hash[BLAKE2S_OUTBYTES]; + + if( blake2s( hash, buf, key, BLAKE2S_OUTBYTES, i, BLAKE2S_KEYBYTES ) < 0 || + 0 != memcmp( hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES ) ) + { + puts( "error" ); + return -1; + } + } + + puts( "ok" ); + return 0; +} +#endif + + diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c index 67e1b65..5cea42c 100644 --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -594,7 +594,6 @@ error: /*[clinic input] _bz2.BZ2Decompressor.decompress - self: self(type="BZ2Decompressor *") data: Py_buffer max_length: Py_ssize_t=-1 @@ -617,7 +616,7 @@ the unused_data attribute. static PyObject * _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data, Py_ssize_t max_length) -/*[clinic end generated code: output=23e41045deb240a3 input=9558b424c8b00516]*/ +/*[clinic end generated code: output=23e41045deb240a3 input=52e1ffc66a8ea624]*/ { PyObject *result = NULL; diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index 9b1194e..586b73a 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -20,10 +20,6 @@ _decode(char_buffer_obj[,errors='strict']) -> (Unicode object, bytes consumed) - _encode() interfaces also accept non-Unicode object as - input. The objects are then converted to Unicode using - PyUnicode_FromObject() prior to applying the conversion. - These s are available: utf_8, unicode_escape, raw_unicode_escape, unicode_internal, latin_1, ascii (7-bit), mbcs (on win32). @@ -608,7 +604,7 @@ _codecs_charmap_decode_impl(PyObject *module, Py_buffer *data, return codec_tuple(decoded, data->len); } -#ifdef HAVE_MBCS +#ifdef MS_WINDOWS /*[clinic input] _codecs.mbcs_decode @@ -630,6 +626,25 @@ _codecs_mbcs_decode_impl(PyObject *module, Py_buffer *data, } /*[clinic input] +_codecs.oem_decode + data: Py_buffer + errors: str(accept={str, NoneType}) = NULL + final: int(c_default="0") = False + / +[clinic start generated code]*/ + +static PyObject * +_codecs_oem_decode_impl(PyObject *module, Py_buffer *data, + const char *errors, int final) +/*[clinic end generated code: output=da1617612f3fcad8 input=95b8a92c446b03cd]*/ +{ + Py_ssize_t consumed = data->len; + PyObject *decoded = PyUnicode_DecodeCodePageStateful(CP_OEMCP, + data->buf, data->len, errors, final ? NULL : &consumed); + return codec_tuple(decoded, consumed); +} + +/*[clinic input] _codecs.code_page_decode codepage: int data: Py_buffer @@ -651,7 +666,7 @@ _codecs_code_page_decode_impl(PyObject *module, int codepage, return codec_tuple(decoded, consumed); } -#endif /* HAVE_MBCS */ +#endif /* MS_WINDOWS */ /* --- Encoder ------------------------------------------------------------ */ @@ -718,7 +733,7 @@ _codecs_unicode_internal_encode_impl(PyObject *module, PyObject *obj, /*[clinic input] _codecs.utf_7_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -726,24 +741,15 @@ _codecs.utf_7_encode static PyObject * _codecs_utf_7_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=0feda21ffc921bc8 input=fd91a78f103b0421]*/ +/*[clinic end generated code: output=0feda21ffc921bc8 input=d1a47579e79cbe15]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF7(str, 0, 0, errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF7(str, 0, 0, errors), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.utf_8_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -751,19 +757,10 @@ _codecs.utf_8_encode static PyObject * _codecs_utf_8_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=02bf47332b9c796c input=2c22d40532f071f3]*/ +/*[clinic end generated code: output=02bf47332b9c796c input=42e3ba73c4392eef]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(PyUnicode_AsEncodedString(str, "utf-8", errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_AsUTF8String(str, errors), + PyUnicode_GET_LENGTH(str)); } /* This version provides access to the byteorder parameter of the @@ -775,7 +772,7 @@ _codecs_utf_8_encode_impl(PyObject *module, PyObject *str, /*[clinic input] _codecs.utf_16_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL byteorder: int = 0 / @@ -784,24 +781,15 @@ _codecs.utf_16_encode static PyObject * _codecs_utf_16_encode_impl(PyObject *module, PyObject *str, const char *errors, int byteorder) -/*[clinic end generated code: output=c654e13efa2e64e4 input=3935a489b2d5385e]*/ +/*[clinic end generated code: output=c654e13efa2e64e4 input=ff46416b04edb944]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, byteorder), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, byteorder), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.utf_16_le_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -809,24 +797,15 @@ _codecs.utf_16_le_encode static PyObject * _codecs_utf_16_le_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=431b01e55f2d4995 input=bc27df05d1d20dfe]*/ +/*[clinic end generated code: output=431b01e55f2d4995 input=cb385455ea8f2fe0]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, -1), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, -1), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.utf_16_be_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -834,19 +813,10 @@ _codecs.utf_16_be_encode static PyObject * _codecs_utf_16_be_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=96886a6fd54dcae3 input=5a69d4112763462b]*/ +/*[clinic end generated code: output=96886a6fd54dcae3 input=9119997066bdaefd]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, +1), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, +1), + PyUnicode_GET_LENGTH(str)); } /* This version provides access to the byteorder parameter of the @@ -858,7 +828,7 @@ _codecs_utf_16_be_encode_impl(PyObject *module, PyObject *str, /*[clinic input] _codecs.utf_32_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL byteorder: int = 0 / @@ -867,24 +837,15 @@ _codecs.utf_32_encode static PyObject * _codecs_utf_32_encode_impl(PyObject *module, PyObject *str, const char *errors, int byteorder) -/*[clinic end generated code: output=5c760da0c09a8b83 input=434a1efa492b8d58]*/ +/*[clinic end generated code: output=5c760da0c09a8b83 input=c5e77da82fbe5c2a]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, byteorder), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, byteorder), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.utf_32_le_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -892,24 +853,15 @@ _codecs.utf_32_le_encode static PyObject * _codecs_utf_32_le_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=b65cd176de8e36d6 input=dfa2d7dc78b99422]*/ +/*[clinic end generated code: output=b65cd176de8e36d6 input=9993b25fe0877848]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, -1), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, -1), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.utf_32_be_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -917,24 +869,15 @@ _codecs.utf_32_be_encode static PyObject * _codecs_utf_32_be_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=1d9e71a9358709e9 input=4595617b18169002]*/ +/*[clinic end generated code: output=1d9e71a9358709e9 input=d3e0ccaa02920431]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, +1), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, +1), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.unicode_escape_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -942,24 +885,15 @@ _codecs.unicode_escape_encode static PyObject * _codecs_unicode_escape_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=66271b30bc4f7a3c input=8273506f14076912]*/ +/*[clinic end generated code: output=66271b30bc4f7a3c input=65d9eefca65b455a]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(PyUnicode_AsUnicodeEscapeString(str), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(PyUnicode_AsUnicodeEscapeString(str), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.raw_unicode_escape_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -967,24 +901,15 @@ _codecs.raw_unicode_escape_encode static PyObject * _codecs_raw_unicode_escape_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=a66a806ed01c830a input=181755d5dfacef3c]*/ +/*[clinic end generated code: output=a66a806ed01c830a input=5aa33e4a133391ab]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(PyUnicode_AsRawUnicodeEscapeString(str), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(PyUnicode_AsRawUnicodeEscapeString(str), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.latin_1_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -992,24 +917,15 @@ _codecs.latin_1_encode static PyObject * _codecs_latin_1_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=2c28c83a27884e08 input=f03f6dcf1d84bee4]*/ +/*[clinic end generated code: output=2c28c83a27884e08 input=30b11c9e49a65150]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_AsLatin1String(str, errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_AsLatin1String(str, errors), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.ascii_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -1017,24 +933,15 @@ _codecs.ascii_encode static PyObject * _codecs_ascii_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=b5e035182d33befc input=d87e25a10a593fee]*/ +/*[clinic end generated code: output=b5e035182d33befc input=843a1d268e6dfa8e]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_AsASCIIString(str, errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_AsASCIIString(str, errors), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.charmap_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL mapping: object = NULL / @@ -1043,22 +950,13 @@ _codecs.charmap_encode static PyObject * _codecs_charmap_encode_impl(PyObject *module, PyObject *str, const char *errors, PyObject *mapping) -/*[clinic end generated code: output=047476f48495a9e9 input=85f4172661e8dad9]*/ +/*[clinic end generated code: output=047476f48495a9e9 input=0752cde07a6d6d00]*/ { - PyObject *v; - if (mapping == Py_None) mapping = NULL; - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(_PyUnicode_EncodeCharmap(str, mapping, errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(_PyUnicode_EncodeCharmap(str, mapping, errors), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] @@ -1074,36 +972,42 @@ _codecs_charmap_build_impl(PyObject *module, PyObject *map) return PyUnicode_BuildEncodingMap(map); } -#ifdef HAVE_MBCS +#ifdef MS_WINDOWS /*[clinic input] _codecs.mbcs_encode - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ static PyObject * _codecs_mbcs_encode_impl(PyObject *module, PyObject *str, const char *errors) -/*[clinic end generated code: output=76e2e170c966c080 input=65c09ee1e4203263]*/ +/*[clinic end generated code: output=76e2e170c966c080 input=de471e0815947553]*/ { - PyObject *v; + return codec_tuple(PyUnicode_EncodeCodePage(CP_ACP, str, errors), + PyUnicode_GET_LENGTH(str)); +} - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(PyUnicode_EncodeCodePage(CP_ACP, str, errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; +/*[clinic input] +_codecs.oem_encode + str: unicode + errors: str(accept={str, NoneType}) = NULL + / +[clinic start generated code]*/ + +static PyObject * +_codecs_oem_encode_impl(PyObject *module, PyObject *str, const char *errors) +/*[clinic end generated code: output=65d5982c737de649 input=3fc5f0028aad3cda]*/ +{ + return codec_tuple(PyUnicode_EncodeCodePage(CP_OEMCP, str, errors), + PyUnicode_GET_LENGTH(str)); } /*[clinic input] _codecs.code_page_encode code_page: int - str: object + str: unicode errors: str(accept={str, NoneType}) = NULL / [clinic start generated code]*/ @@ -1111,24 +1015,13 @@ _codecs.code_page_encode static PyObject * _codecs_code_page_encode_impl(PyObject *module, int code_page, PyObject *str, const char *errors) -/*[clinic end generated code: output=45673f6085657a9e input=c8562ec460c2e309]*/ +/*[clinic end generated code: output=45673f6085657a9e input=786421ae617d680b]*/ { - PyObject *v; - - str = PyUnicode_FromObject(str); - if (str == NULL || PyUnicode_READY(str) < 0) { - Py_XDECREF(str); - return NULL; - } - v = codec_tuple(PyUnicode_EncodeCodePage(code_page, - str, - errors), - PyUnicode_GET_LENGTH(str)); - Py_DECREF(str); - return v; + return codec_tuple(PyUnicode_EncodeCodePage(code_page, str, errors), + PyUnicode_GET_LENGTH(str)); } -#endif /* HAVE_MBCS */ +#endif /* MS_WINDOWS */ /* --- Error handler registry --------------------------------------------- */ @@ -1216,6 +1109,8 @@ static PyMethodDef _codecs_functions[] = { _CODECS_READBUFFER_ENCODE_METHODDEF _CODECS_MBCS_ENCODE_METHODDEF _CODECS_MBCS_DECODE_METHODDEF + _CODECS_OEM_ENCODE_METHODDEF + _CODECS_OEM_DECODE_METHODDEF _CODECS_CODE_PAGE_ENCODE_METHODDEF _CODECS_CODE_PAGE_DECODE_METHODDEF _CODECS_REGISTER_ERROR_METHODDEF diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 08fceca..6608798 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -81,7 +81,7 @@ typedef struct { Py_ssize_t leftindex; /* 0 <= leftindex < BLOCKLEN */ Py_ssize_t rightindex; /* 0 <= rightindex < BLOCKLEN */ size_t state; /* incremented whenever the indices move */ - Py_ssize_t maxlen; + Py_ssize_t maxlen; /* maxlen is -1 for unbounded deques */ PyObject *weakreflist; } dequeobject; @@ -108,29 +108,18 @@ static PyTypeObject deque_type; #define CHECK_NOT_END(link) #endif -/* To prevent len from overflowing PY_SSIZE_T_MAX, we refuse to - allocate new blocks if the current len is nearing overflow. -*/ - -#define MAX_DEQUE_LEN (PY_SSIZE_T_MAX - 3*BLOCKLEN) - /* A simple freelisting scheme is used to minimize calls to the memory allocator. It accommodates common use cases where new blocks are being added at about the same rate as old blocks are being freed. */ -#define MAXFREEBLOCKS 10 +#define MAXFREEBLOCKS 16 static Py_ssize_t numfreeblocks = 0; static block *freeblocks[MAXFREEBLOCKS]; static block * -newblock(Py_ssize_t len) { +newblock(void) { block *b; - if (len >= MAX_DEQUE_LEN) { - PyErr_SetString(PyExc_OverflowError, - "cannot add more blocks to the deque"); - return NULL; - } if (numfreeblocks) { numfreeblocks--; return freeblocks[numfreeblocks]; @@ -154,12 +143,6 @@ freeblock(block *b) } } -/* XXX Todo: - If aligned memory allocations become available, make the - deque object 64 byte aligned so that all of the fields - can be retrieved or updated in a single cache line. -*/ - static PyObject * deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { @@ -171,7 +154,7 @@ deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (deque == NULL) return NULL; - b = newblock(0); + b = newblock(); if (b == NULL) { Py_DECREF(deque); return NULL; @@ -207,7 +190,7 @@ deque_pop(dequeobject *deque, PyObject *unused) Py_SIZE(deque)--; deque->state++; - if (deque->rightindex == -1) { + if (deque->rightindex < 0) { if (Py_SIZE(deque)) { prevblock = deque->rightblock->leftlink; assert(deque->leftblock != deque->rightblock); @@ -270,42 +253,24 @@ PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element."); /* The deque's size limit is d.maxlen. The limit can be zero or positive. * If there is no limit, then d.maxlen == -1. * - * After an item is added to a deque, we check to see if the size has grown past - * the limit. If it has, we get the size back down to the limit by popping an - * item off of the opposite end. The methods that can trigger this are append(), - * appendleft(), extend(), and extendleft(). + * After an item is added to a deque, we check to see if the size has + * grown past the limit. If it has, we get the size back down to the limit + * by popping an item off of the opposite end. The methods that can + * trigger this are append(), appendleft(), extend(), and extendleft(). + * + * The macro to check whether a deque needs to be trimmed uses a single + * unsigned test that returns true whenever 0 <= maxlen < Py_SIZE(deque). */ -static void -deque_trim_right(dequeobject *deque) -{ - if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) { - PyObject *rv = deque_pop(deque, NULL); - assert(rv != NULL); - assert(Py_SIZE(deque) <= deque->maxlen); - Py_DECREF(rv); - } -} +#define NEEDS_TRIM(deque, maxlen) ((size_t)(maxlen) < (size_t)(Py_SIZE(deque))) -static void -deque_trim_left(dequeobject *deque) -{ - if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) { - PyObject *rv = deque_popleft(deque, NULL); - assert(rv != NULL); - assert(Py_SIZE(deque) <= deque->maxlen); - Py_DECREF(rv); - } -} - -static PyObject * -deque_append(dequeobject *deque, PyObject *item) +static int +deque_append_internal(dequeobject *deque, PyObject *item, Py_ssize_t maxlen) { - deque->state++; if (deque->rightindex == BLOCKLEN - 1) { - block *b = newblock(Py_SIZE(deque)); + block *b = newblock(); if (b == NULL) - return NULL; + return -1; b->leftlink = deque->rightblock; CHECK_END(deque->rightblock->rightlink); deque->rightblock->rightlink = b; @@ -313,24 +278,36 @@ deque_append(dequeobject *deque, PyObject *item) MARK_END(b->rightlink); deque->rightindex = -1; } - Py_INCREF(item); Py_SIZE(deque)++; deque->rightindex++; deque->rightblock->data[deque->rightindex] = item; - deque_trim_left(deque); + if (NEEDS_TRIM(deque, maxlen)) { + PyObject *olditem = deque_popleft(deque, NULL); + Py_DECREF(olditem); + } else { + deque->state++; + } + return 0; +} + +static PyObject * +deque_append(dequeobject *deque, PyObject *item) +{ + Py_INCREF(item); + if (deque_append_internal(deque, item, deque->maxlen) < 0) + return NULL; Py_RETURN_NONE; } PyDoc_STRVAR(append_doc, "Add an element to the right side of the deque."); -static PyObject * -deque_appendleft(dequeobject *deque, PyObject *item) +static int +deque_appendleft_internal(dequeobject *deque, PyObject *item, Py_ssize_t maxlen) { - deque->state++; if (deque->leftindex == 0) { - block *b = newblock(Py_SIZE(deque)); + block *b = newblock(); if (b == NULL) - return NULL; + return -1; b->rightlink = deque->leftblock; CHECK_END(deque->leftblock->leftlink); deque->leftblock->leftlink = b; @@ -338,37 +315,65 @@ deque_appendleft(dequeobject *deque, PyObject *item) MARK_END(b->leftlink); deque->leftindex = BLOCKLEN; } - Py_INCREF(item); Py_SIZE(deque)++; deque->leftindex--; deque->leftblock->data[deque->leftindex] = item; - deque_trim_right(deque); + if (NEEDS_TRIM(deque, deque->maxlen)) { + PyObject *olditem = deque_pop(deque, NULL); + Py_DECREF(olditem); + } else { + deque->state++; + } + return 0; +} + +static PyObject * +deque_appendleft(dequeobject *deque, PyObject *item) +{ + Py_INCREF(item); + if (deque_appendleft_internal(deque, item, deque->maxlen) < 0) + return NULL; Py_RETURN_NONE; } PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque."); +static PyObject* +finalize_iterator(PyObject *it) +{ + if (PyErr_Occurred()) { + if (PyErr_ExceptionMatches(PyExc_StopIteration)) + PyErr_Clear(); + else { + Py_DECREF(it); + return NULL; + } + } + Py_DECREF(it); + Py_RETURN_NONE; +} /* Run an iterator to exhaustion. Shortcut for the extend/extendleft methods when maxlen == 0. */ static PyObject* consume_iterator(PyObject *it) { + PyObject *(*iternext)(PyObject *); PyObject *item; - while ((item = PyIter_Next(it)) != NULL) { + iternext = *Py_TYPE(it)->tp_iternext; + while ((item = iternext(it)) != NULL) { Py_DECREF(item); } - Py_DECREF(it); - if (PyErr_Occurred()) - return NULL; - Py_RETURN_NONE; + return finalize_iterator(it); } static PyObject * deque_extend(dequeobject *deque, PyObject *iterable) { PyObject *it, *item; + PyObject *(*iternext)(PyObject *); + Py_ssize_t maxlen = deque->maxlen; /* Handle case where id(deque) == id(iterable) */ if ((PyObject *)deque == iterable) { @@ -381,6 +386,13 @@ deque_extend(dequeobject *deque, PyObject *iterable) return result; } + it = PyObject_GetIter(iterable); + if (it == NULL) + return NULL; + + if (maxlen == 0) + return consume_iterator(it); + /* Space saving heuristic. Start filling from the left */ if (Py_SIZE(deque) == 0) { assert(deque->leftblock == deque->rightblock); @@ -389,17 +401,10 @@ deque_extend(dequeobject *deque, PyObject *iterable) deque->rightindex = 0; } - it = PyObject_GetIter(iterable); - if (it == NULL) - return NULL; - - if (deque->maxlen == 0) - return consume_iterator(it); - - while ((item = PyIter_Next(it)) != NULL) { - deque->state++; + iternext = *Py_TYPE(it)->tp_iternext; + while ((item = iternext(it)) != NULL) { if (deque->rightindex == BLOCKLEN - 1) { - block *b = newblock(Py_SIZE(deque)); + block *b = newblock(); if (b == NULL) { Py_DECREF(item); Py_DECREF(it); @@ -415,14 +420,14 @@ deque_extend(dequeobject *deque, PyObject *iterable) Py_SIZE(deque)++; deque->rightindex++; deque->rightblock->data[deque->rightindex] = item; - deque_trim_left(deque); - } - if (PyErr_Occurred()) { - Py_DECREF(it); - return NULL; + if (NEEDS_TRIM(deque, maxlen)) { + PyObject *olditem = deque_popleft(deque, NULL); + Py_DECREF(olditem); + } else { + deque->state++; + } } - Py_DECREF(it); - Py_RETURN_NONE; + return finalize_iterator(it); } PyDoc_STRVAR(extend_doc, @@ -432,6 +437,8 @@ static PyObject * deque_extendleft(dequeobject *deque, PyObject *iterable) { PyObject *it, *item; + PyObject *(*iternext)(PyObject *); + Py_ssize_t maxlen = deque->maxlen; /* Handle case where id(deque) == id(iterable) */ if ((PyObject *)deque == iterable) { @@ -444,6 +451,13 @@ deque_extendleft(dequeobject *deque, PyObject *iterable) return result; } + it = PyObject_GetIter(iterable); + if (it == NULL) + return NULL; + + if (maxlen == 0) + return consume_iterator(it); + /* Space saving heuristic. Start filling from the right */ if (Py_SIZE(deque) == 0) { assert(deque->leftblock == deque->rightblock); @@ -452,17 +466,10 @@ deque_extendleft(dequeobject *deque, PyObject *iterable) deque->rightindex = BLOCKLEN - 2; } - it = PyObject_GetIter(iterable); - if (it == NULL) - return NULL; - - if (deque->maxlen == 0) - return consume_iterator(it); - - while ((item = PyIter_Next(it)) != NULL) { - deque->state++; + iternext = *Py_TYPE(it)->tp_iternext; + while ((item = iternext(it)) != NULL) { if (deque->leftindex == 0) { - block *b = newblock(Py_SIZE(deque)); + block *b = newblock(); if (b == NULL) { Py_DECREF(item); Py_DECREF(it); @@ -478,14 +485,14 @@ deque_extendleft(dequeobject *deque, PyObject *iterable) Py_SIZE(deque)++; deque->leftindex--; deque->leftblock->data[deque->leftindex] = item; - deque_trim_right(deque); - } - if (PyErr_Occurred()) { - Py_DECREF(it); - return NULL; + if (NEEDS_TRIM(deque, maxlen)) { + PyObject *olditem = deque_pop(deque, NULL); + Py_DECREF(olditem); + } else { + deque->state++; + } } - Py_DECREF(it); - Py_RETURN_NONE; + return finalize_iterator(it); } PyDoc_STRVAR(extendleft_doc, @@ -504,7 +511,40 @@ deque_inplace_concat(dequeobject *deque, PyObject *other) return (PyObject *)deque; } -static PyObject *deque_copy(PyObject *deque); +static PyObject * +deque_copy(PyObject *deque) +{ + dequeobject *old_deque = (dequeobject *)deque; + if (Py_TYPE(deque) == &deque_type) { + dequeobject *new_deque; + PyObject *rv; + + new_deque = (dequeobject *)deque_new(&deque_type, (PyObject *)NULL, (PyObject *)NULL); + if (new_deque == NULL) + return NULL; + new_deque->maxlen = old_deque->maxlen; + /* Fast path for the deque_repeat() common case where len(deque) == 1 */ + if (Py_SIZE(deque) == 1) { + PyObject *item = old_deque->leftblock->data[old_deque->leftindex]; + rv = deque_append(new_deque, item); + } else { + rv = deque_extend(new_deque, deque); + } + if (rv != NULL) { + Py_DECREF(rv); + return (PyObject *)new_deque; + } + Py_DECREF(new_deque); + return NULL; + } + if (old_deque->maxlen < 0) + return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "O", deque, NULL); + else + return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi", + deque, old_deque->maxlen, NULL); +} + +PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque."); static PyObject * deque_concat(dequeobject *deque, PyObject *other) @@ -534,38 +574,102 @@ deque_concat(dequeobject *deque, PyObject *other) return new_deque; } -static void deque_clear(dequeobject *deque); - -static PyObject * -deque_repeat(dequeobject *deque, Py_ssize_t n) +static void +deque_clear(dequeobject *deque) { - dequeobject *new_deque; - PyObject *result; + block *b; + block *prevblock; + block *leftblock; + Py_ssize_t leftindex; + Py_ssize_t n, m; + PyObject *item; + PyObject **itemptr, **limit; - /* XXX add a special case for when maxlen is defined */ - if (n < 0) - n = 0; - else if (n > 0 && Py_SIZE(deque) > MAX_DEQUE_LEN / n) - return PyErr_NoMemory(); + if (Py_SIZE(deque) == 0) + return; - new_deque = (dequeobject *)deque_new(&deque_type, (PyObject *)NULL, (PyObject *)NULL); - new_deque->maxlen = deque->maxlen; + /* During the process of clearing a deque, decrefs can cause the + deque to mutate. To avoid fatal confusion, we have to make the + deque empty before clearing the blocks and never refer to + anything via deque->ref while clearing. (This is the same + technique used for clearing lists, sets, and dicts.) - for ( ; n ; n--) { - result = deque_extend(new_deque, (PyObject *)deque); - if (result == NULL) { - Py_DECREF(new_deque); - return NULL; + Making the deque empty requires allocating a new empty block. In + the unlikely event that memory is full, we fall back to an + alternate method that doesn't require a new block. Repeating + pops in a while-loop is slower, possibly re-entrant (and a clever + adversary could cause it to never terminate). + */ + + b = newblock(); + if (b == NULL) { + PyErr_Clear(); + goto alternate_method; + } + + /* Remember the old size, leftblock, and leftindex */ + n = Py_SIZE(deque); + leftblock = deque->leftblock; + leftindex = deque->leftindex; + + /* Set the deque to be empty using the newly allocated block */ + MARK_END(b->leftlink); + MARK_END(b->rightlink); + Py_SIZE(deque) = 0; + deque->leftblock = b; + deque->rightblock = b; + deque->leftindex = CENTER + 1; + deque->rightindex = CENTER; + deque->state++; + + /* Now the old size, leftblock, and leftindex are disconnected from + the empty deque and we can use them to decref the pointers. + */ + m = (BLOCKLEN - leftindex > n) ? n : BLOCKLEN - leftindex; + itemptr = &leftblock->data[leftindex]; + limit = itemptr + m; + n -= m; + while (1) { + if (itemptr == limit) { + if (n == 0) + break; + CHECK_NOT_END(leftblock->rightlink); + prevblock = leftblock; + leftblock = leftblock->rightlink; + m = (n > BLOCKLEN) ? BLOCKLEN : n; + itemptr = leftblock->data; + limit = itemptr + m; + n -= m; + freeblock(prevblock); } - Py_DECREF(result); + item = *(itemptr++); + Py_DECREF(item); + } + CHECK_END(leftblock->rightlink); + freeblock(leftblock); + return; + + alternate_method: + while (Py_SIZE(deque)) { + item = deque_pop(deque, NULL); + assert (item != NULL); + Py_DECREF(item); } - return (PyObject *)new_deque; } static PyObject * +deque_clearmethod(dequeobject *deque) +{ + deque_clear(deque); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(clear_doc, "Remove all elements from the deque."); + +static PyObject * deque_inplace_repeat(dequeobject *deque, Py_ssize_t n) { - Py_ssize_t i, size; + Py_ssize_t i, m, size; PyObject *seq; PyObject *rv; @@ -581,27 +685,47 @@ deque_inplace_repeat(dequeobject *deque, Py_ssize_t n) return (PyObject *)deque; } - if (size > MAX_DEQUE_LEN / n) { - return PyErr_NoMemory(); - } - if (size == 1) { /* common case, repeating a single element */ PyObject *item = deque->leftblock->data[deque->leftindex]; - if (deque->maxlen != -1 && n > deque->maxlen) + if (deque->maxlen >= 0 && n > deque->maxlen) n = deque->maxlen; - for (i = 0 ; i < n-1 ; i++) { - rv = deque_append(deque, item); - if (rv == NULL) - return NULL; - Py_DECREF(rv); + deque->state++; + for (i = 0 ; i < n-1 ; ) { + if (deque->rightindex == BLOCKLEN - 1) { + block *b = newblock(); + if (b == NULL) { + Py_SIZE(deque) += i; + return NULL; + } + b->leftlink = deque->rightblock; + CHECK_END(deque->rightblock->rightlink); + deque->rightblock->rightlink = b; + deque->rightblock = b; + MARK_END(b->rightlink); + deque->rightindex = -1; + } + m = n - 1 - i; + if (m > BLOCKLEN - 1 - deque->rightindex) + m = BLOCKLEN - 1 - deque->rightindex; + i += m; + while (m--) { + deque->rightindex++; + Py_INCREF(item); + deque->rightblock->data[deque->rightindex] = item; + } } + Py_SIZE(deque) += i; Py_INCREF(deque); return (PyObject *)deque; } + if ((size_t)size > PY_SSIZE_T_MAX / (size_t)n) { + return PyErr_NoMemory(); + } + seq = PySequence_List((PyObject *)deque); if (seq == NULL) return seq; @@ -619,6 +743,20 @@ deque_inplace_repeat(dequeobject *deque, Py_ssize_t n) return (PyObject *)deque; } +static PyObject * +deque_repeat(dequeobject *deque, Py_ssize_t n) +{ + dequeobject *new_deque; + PyObject *rv; + + new_deque = (dequeobject *)deque_copy((PyObject *) deque); + if (new_deque == NULL) + return NULL; + rv = deque_inplace_repeat(new_deque, n); + Py_DECREF(new_deque); + return rv; +} + /* The rotate() method is part of the public API and is used internally as a primitive for other methods. @@ -671,7 +809,7 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) while (n > 0) { if (leftindex == 0) { if (b == NULL) { - b = newblock(len); + b = newblock(); if (b == NULL) goto done; } @@ -702,7 +840,7 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) *(dest++) = *(src++); } while (--m); } - if (rightindex == -1) { + if (rightindex < 0) { assert(leftblock != rightblock); assert(b == NULL); b = rightblock; @@ -715,7 +853,7 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) while (n < 0) { if (rightindex == BLOCKLEN - 1) { if (b == NULL) { - b = newblock(len); + b = newblock(); if (b == NULL) goto done; } @@ -790,11 +928,11 @@ deque_reverse(dequeobject *deque, PyObject *unused) block *rightblock = deque->rightblock; Py_ssize_t leftindex = deque->leftindex; Py_ssize_t rightindex = deque->rightindex; - Py_ssize_t n = Py_SIZE(deque) / 2; - Py_ssize_t i; + Py_ssize_t n = Py_SIZE(deque) >> 1; PyObject *tmp; - for (i=0 ; ileftlink; rightindex = BLOCKLEN - 1; } @@ -831,20 +969,19 @@ deque_count(dequeobject *deque, PyObject *v) block *b = deque->leftblock; Py_ssize_t index = deque->leftindex; Py_ssize_t n = Py_SIZE(deque); - Py_ssize_t i; Py_ssize_t count = 0; size_t start_state = deque->state; PyObject *item; int cmp; - for (i=0 ; idata[index]; cmp = PyObject_RichCompareBool(item, v, Py_EQ); - if (cmp > 0) - count++; - else if (cmp < 0) + if (cmp < 0) return NULL; + count += cmp; if (start_state != deque->state) { PyErr_SetString(PyExc_RuntimeError, @@ -871,12 +1008,12 @@ deque_contains(dequeobject *deque, PyObject *v) block *b = deque->leftblock; Py_ssize_t index = deque->leftindex; Py_ssize_t n = Py_SIZE(deque); - Py_ssize_t i; size_t start_state = deque->state; PyObject *item; int cmp; - for (i=0 ; idata[index]; cmp = PyObject_RichCompareBool(item, v, Py_EQ); @@ -906,15 +1043,16 @@ deque_len(dequeobject *deque) static PyObject * deque_index(dequeobject *deque, PyObject *args) { - Py_ssize_t i, start=0, stop=Py_SIZE(deque); + Py_ssize_t i, n, start=0, stop=Py_SIZE(deque); PyObject *v, *item; block *b = deque->leftblock; Py_ssize_t index = deque->leftindex; size_t start_state = deque->state; + int cmp; if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, - _PyEval_SliceIndexNotNone, &start, - _PyEval_SliceIndexNotNone, &stop)) + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) return NULL; if (start < 0) { start += Py_SIZE(deque); @@ -928,22 +1066,32 @@ deque_index(dequeobject *deque, PyObject *args) } if (stop > Py_SIZE(deque)) stop = Py_SIZE(deque); + if (start > stop) + start = stop; + assert(0 <= start && start <= stop && stop <= Py_SIZE(deque)); - for (i=0 ; i= start) { - int cmp; - CHECK_NOT_END(b); - item = b->data[index]; - cmp = PyObject_RichCompareBool(item, v, Py_EQ); - if (cmp > 0) - return PyLong_FromSsize_t(i); - else if (cmp < 0) - return NULL; - if (start_state != deque->state) { - PyErr_SetString(PyExc_RuntimeError, - "deque mutated during iteration"); - return NULL; - } + /* XXX Replace this loop with faster code from deque_item() */ + for (i=0 ; irightlink; + index = 0; + } + } + + n = stop - i + 1; + while (--n) { + CHECK_NOT_END(b); + item = b->data[index]; + cmp = PyObject_RichCompareBool(item, v, Py_EQ); + if (cmp > 0) + return PyLong_FromSsize_t(stop - n); + if (cmp < 0) + return NULL; + if (start_state != deque->state) { + PyErr_SetString(PyExc_RuntimeError, + "deque mutated during iteration"); + return NULL; } index++; if (index == BLOCKLEN) { @@ -1037,84 +1185,10 @@ deque_remove(dequeobject *deque, PyObject *value) PyDoc_STRVAR(remove_doc, "D.remove(value) -- remove first occurrence of value."); -static void -deque_clear(dequeobject *deque) -{ - block *b; - block *prevblock; - block *leftblock; - Py_ssize_t leftindex; - Py_ssize_t n; - PyObject *item; - - if (Py_SIZE(deque) == 0) - return; - - /* During the process of clearing a deque, decrefs can cause the - deque to mutate. To avoid fatal confusion, we have to make the - deque empty before clearing the blocks and never refer to - anything via deque->ref while clearing. (This is the same - technique used for clearing lists, sets, and dicts.) - - Making the deque empty requires allocating a new empty block. In - the unlikely event that memory is full, we fall back to an - alternate method that doesn't require a new block. Repeating - pops in a while-loop is slower, possibly re-entrant (and a clever - adversary could cause it to never terminate). - */ - - b = newblock(0); - if (b == NULL) { - PyErr_Clear(); - goto alternate_method; - } - - /* Remember the old size, leftblock, and leftindex */ - leftblock = deque->leftblock; - leftindex = deque->leftindex; - n = Py_SIZE(deque); - - /* Set the deque to be empty using the newly allocated block */ - MARK_END(b->leftlink); - MARK_END(b->rightlink); - Py_SIZE(deque) = 0; - deque->leftblock = b; - deque->rightblock = b; - deque->leftindex = CENTER + 1; - deque->rightindex = CENTER; - deque->state++; - - /* Now the old size, leftblock, and leftindex are disconnected from - the empty deque and we can use them to decref the pointers. - */ - while (n--) { - item = leftblock->data[leftindex]; - Py_DECREF(item); - leftindex++; - if (leftindex == BLOCKLEN && n) { - CHECK_NOT_END(leftblock->rightlink); - prevblock = leftblock; - leftblock = leftblock->rightlink; - leftindex = 0; - freeblock(prevblock); - } - } - CHECK_END(leftblock->rightlink); - freeblock(leftblock); - return; - - alternate_method: - while (Py_SIZE(deque)) { - item = deque_pop(deque, NULL); - assert (item != NULL); - Py_DECREF(item); - } -} - static int valid_index(Py_ssize_t i, Py_ssize_t limit) { - /* The cast to size_t let us use just a single comparison + /* The cast to size_t lets us use just a single comparison to check whether i is in the range: 0 <= i < limit */ return (size_t) i < (size_t) limit; } @@ -1143,14 +1217,16 @@ deque_item(dequeobject *deque, Py_ssize_t i) i = (Py_ssize_t)((size_t) i % BLOCKLEN); if (index < (Py_SIZE(deque) >> 1)) { b = deque->leftblock; - while (n--) + n++; + while (--n) b = b->rightlink; } else { n = (Py_ssize_t)( ((size_t)(deque->leftindex + Py_SIZE(deque) - 1)) / BLOCKLEN - n); b = deque->rightblock; - while (n--) + n++; + while (--n) b = b->leftlink; } } @@ -1194,14 +1270,16 @@ deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v) i = (Py_ssize_t)((size_t) i % BLOCKLEN); if (index <= halflen) { b = deque->leftblock; - while (n--) + n++; + while (--n) b = b->rightlink; } else { n = (Py_ssize_t)( ((size_t)(deque->leftindex + Py_SIZE(deque) - 1)) / BLOCKLEN - n); b = deque->rightblock; - while (n--) + n++; + while (--n) b = b->leftlink; } Py_INCREF(v); @@ -1211,15 +1289,6 @@ deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v) return 0; } -static PyObject * -deque_clearmethod(dequeobject *deque) -{ - deque_clear(deque); - Py_RETURN_NONE; -} - -PyDoc_STRVAR(clear_doc, "Remove all elements from the deque."); - static void deque_dealloc(dequeobject *deque) { @@ -1243,6 +1312,7 @@ deque_traverse(dequeobject *deque, visitproc visit, void *arg) PyObject *item; Py_ssize_t index; Py_ssize_t indexlo = deque->leftindex; + Py_ssize_t indexhigh; for (b = deque->leftblock; b != deque->rightblock; b = b->rightlink) { for (index = indexlo; index < BLOCKLEN ; index++) { @@ -1251,7 +1321,8 @@ deque_traverse(dequeobject *deque, visitproc visit, void *arg) } indexlo = 0; } - for (index = indexlo; index <= deque->rightindex; index++) { + indexhigh = deque->rightindex; + for (index = indexlo; index <= indexhigh; index++) { item = b->data[index]; Py_VISIT(item); } @@ -1259,45 +1330,33 @@ deque_traverse(dequeobject *deque, visitproc visit, void *arg) } static PyObject * -deque_copy(PyObject *deque) -{ - if (((dequeobject *)deque)->maxlen == -1) - return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "O", deque, NULL); - else - return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi", - deque, ((dequeobject *)deque)->maxlen, NULL); -} - -PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque."); - -static PyObject * deque_reduce(dequeobject *deque) { - PyObject *dict, *result, *aslist; + PyObject *dict, *it; _Py_IDENTIFIER(__dict__); dict = _PyObject_GetAttrId((PyObject *)deque, &PyId___dict__); - if (dict == NULL) + if (dict == NULL) { + if (!PyErr_ExceptionMatches(PyExc_AttributeError)) { + return NULL; + } PyErr_Clear(); - aslist = PySequence_List((PyObject *)deque); - if (aslist == NULL) { - Py_XDECREF(dict); + dict = Py_None; + Py_INCREF(dict); + } + + it = PyObject_GetIter((PyObject *)deque); + if (it == NULL) { + Py_DECREF(dict); return NULL; } - if (dict == NULL) { - if (deque->maxlen == -1) - result = Py_BuildValue("O(O)", Py_TYPE(deque), aslist); - else - result = Py_BuildValue("O(On)", Py_TYPE(deque), aslist, deque->maxlen); - } else { - if (deque->maxlen == -1) - result = Py_BuildValue("O(OO)O", Py_TYPE(deque), aslist, Py_None, dict); - else - result = Py_BuildValue("O(On)O", Py_TYPE(deque), aslist, deque->maxlen, dict); + + if (deque->maxlen < 0) { + return Py_BuildValue("O()NN", Py_TYPE(deque), dict, it); + } + else { + return Py_BuildValue("O(()n)NN", Py_TYPE(deque), deque->maxlen, dict, it); } - Py_XDECREF(dict); - Py_DECREF(aslist); - return result; } PyDoc_STRVAR(reduce_doc, "Return state information for pickling."); @@ -1320,7 +1379,7 @@ deque_repr(PyObject *deque) Py_ReprLeave(deque); return NULL; } - if (((dequeobject *)deque)->maxlen != -1) + if (((dequeobject *)deque)->maxlen >= 0) result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)", aslist, ((dequeobject *)deque)->maxlen); else @@ -1381,7 +1440,7 @@ deque_richcompare(PyObject *v, PyObject *w, int op) } Py_DECREF(x); Py_DECREF(y); - if (b == -1) + if (b < 0) goto done; } /* We reached the end of one deque or both */ @@ -1416,8 +1475,14 @@ deque_init(dequeobject *deque, PyObject *args, PyObject *kwdargs) Py_ssize_t maxlen = -1; char *kwlist[] = {"iterable", "maxlen", 0}; - if (!PyArg_ParseTupleAndKeywords(args, kwdargs, "|OO:deque", kwlist, &iterable, &maxlenobj)) - return -1; + if (kwdargs == NULL) { + if (!PyArg_UnpackTuple(args, "deque()", 0, 2, &iterable, &maxlenobj)) + return -1; + } else { + if (!PyArg_ParseTupleAndKeywords(args, kwdargs, "|OO:deque", kwlist, + &iterable, &maxlenobj)) + return -1; + } if (maxlenobj != NULL && maxlenobj != Py_None) { maxlen = PyLong_AsSsize_t(maxlenobj); if (maxlen == -1 && PyErr_Occurred()) @@ -1446,7 +1511,7 @@ deque_sizeof(dequeobject *deque, void *unused) Py_ssize_t blocks; res = _PyObject_SIZE(Py_TYPE(deque)); - blocks = (deque->leftindex + Py_SIZE(deque) + BLOCKLEN - 1) / BLOCKLEN; + blocks = (size_t)(deque->leftindex + Py_SIZE(deque) + BLOCKLEN - 1) / BLOCKLEN; assert(deque->leftindex + Py_SIZE(deque) - 1 == (blocks - 1) * BLOCKLEN + deque->rightindex); res += blocks * sizeof(block); @@ -1465,7 +1530,7 @@ deque_bool(dequeobject *deque) static PyObject * deque_get_maxlen(dequeobject *deque) { - if (deque->maxlen == -1) + if (deque->maxlen < 0) Py_RETURN_NONE; return PyLong_FromSsize_t(deque->maxlen); } @@ -1806,7 +1871,7 @@ dequereviter_next(dequeiterobject *it) item = it->b->data[it->index]; it->index--; it->counter--; - if (it->index == -1 && it->counter > 0) { + if (it->index < 0 && it->counter > 0) { CHECK_NOT_END(it->b->leftlink); it->b = it->b->leftlink; it->index = BLOCKLEN - 1; @@ -1980,7 +2045,7 @@ defdict_reduce(defdictobject *dd) args = PyTuple_Pack(1, dd->default_factory); if (args == NULL) return NULL; - items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, "()"); + items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, NULL); if (items == NULL) { Py_DECREF(args); return NULL; @@ -2169,7 +2234,7 @@ static PyTypeObject defdict_type = { PyDoc_STRVAR(_count_elements_doc, "_count_elements(mapping, iterable) -> None\n\ \n\ -Count elements in the iterable, updating the mapping"); +Count elements in the iterable, updating the mappping"); static PyObject * _count_elements(PyObject *self, PyObject *args) @@ -2235,13 +2300,15 @@ _count_elements(PyObject *self, PyObject *args) oldval = _PyDict_GetItem_KnownHash(mapping, key, hash); if (oldval == NULL) { - if (_PyDict_SetItem_KnownHash(mapping, key, one, hash) == -1) + if (PyErr_Occurred()) + goto done; + if (_PyDict_SetItem_KnownHash(mapping, key, one, hash) < 0) goto done; } else { newval = PyNumber_Add(oldval, one); if (newval == NULL) goto done; - if (_PyDict_SetItem_KnownHash(mapping, key, newval, hash) == -1) + if (_PyDict_SetItem_KnownHash(mapping, key, newval, hash) < 0) goto done; Py_CLEAR(newval); } @@ -2267,7 +2334,7 @@ _count_elements(PyObject *self, PyObject *args) Py_DECREF(oldval); if (newval == NULL) break; - if (PyObject_SetItem(mapping, key, newval) == -1) + if (PyObject_SetItem(mapping, key, newval) < 0) break; Py_CLEAR(newval); Py_DECREF(key); diff --git a/Modules/_csv.c b/Modules/_csv.c index b428279..7a78541 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -60,10 +60,10 @@ typedef enum { typedef struct { QuoteStyle style; - char *name; + const char *name; } StyleDesc; -static StyleDesc quote_styles[] = { +static const StyleDesc quote_styles[] = { { QUOTE_MINIMAL, "QUOTE_MINIMAL" }, { QUOTE_ALL, "QUOTE_ALL" }, { QUOTE_NONNUMERIC, "QUOTE_NONNUMERIC" }, @@ -286,7 +286,7 @@ _set_str(const char *name, PyObject **target, PyObject *src, const char *dflt) static int dialect_check_quoting(int quoting) { - StyleDesc *qs; + const StyleDesc *qs; for (qs = quote_styles; qs->name; qs++) { if ((int)qs->style == quoting) @@ -518,15 +518,13 @@ static PyTypeObject Dialect_Type = { static PyObject * _call_dialect(PyObject *dialect_inst, PyObject *kwargs) { - PyObject *ctor_args; - PyObject *dialect; - - ctor_args = Py_BuildValue(dialect_inst ? "(O)" : "()", dialect_inst); - if (ctor_args == NULL) - return NULL; - dialect = PyObject_Call((PyObject *)&Dialect_Type, ctor_args, kwargs); - Py_DECREF(ctor_args); - return dialect; + PyObject *type = (PyObject *)&Dialect_Type; + if (dialect_inst) { + return _PyObject_FastCallDict(type, &dialect_inst, 1, kwargs); + } + else { + return _PyObject_FastCallDict(type, NULL, 0, kwargs); + } } /* @@ -1648,7 +1646,7 @@ PyMODINIT_FUNC PyInit__csv(void) { PyObject *module; - StyleDesc *style; + const StyleDesc *style; if (PyType_Ready(&Dialect_Type) < 0) return NULL; diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 33fe659..df3aede 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -111,12 +111,6 @@ bytes(cdata) #ifndef IS_INTRESOURCE #define IS_INTRESOURCE(x) (((size_t)(x) >> 16) == 0) #endif -# ifdef _WIN32_WCE -/* Unlike desktop Windows, WinCE has both W and A variants of - GetProcAddress, but the default W version is not what we want */ -# undef GetProcAddress -# define GetProcAddress GetProcAddressA -# endif #else #include "ctypes_dlfcn.h" #endif @@ -435,7 +429,7 @@ UnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return StructUnionType_new(type, args, kwds, 0); } -static char from_address_doc[] = +static const char from_address_doc[] = "C.from_address(integer) -> C instance\naccess a C instance at the specified address"; static PyObject * @@ -453,7 +447,7 @@ CDataType_from_address(PyObject *type, PyObject *value) return PyCData_AtAddress(type, buf); } -static char from_buffer_doc[] = +static const char from_buffer_doc[] = "C.from_buffer(object, offset=0) -> C instance\ncreate a C instance from a writeable buffer"; static int @@ -527,7 +521,7 @@ CDataType_from_buffer(PyObject *type, PyObject *args) return result; } -static char from_buffer_copy_doc[] = +static const char from_buffer_copy_doc[] = "C.from_buffer_copy(object, offset=0) -> C instance\ncreate a C instance from a readable buffer"; static PyObject * @@ -572,7 +566,7 @@ CDataType_from_buffer_copy(PyObject *type, PyObject *args) return result; } -static char in_dll_doc[] = +static const char in_dll_doc[] = "C.in_dll(dll, name) -> C instance\naccess a C instance in a dll"; static PyObject * @@ -629,7 +623,7 @@ CDataType_in_dll(PyObject *type, PyObject *args) return PyCData_AtAddress(type, address); } -static char from_param_doc[] = +static const char from_param_doc[] = "Convert a Python object into a function call parameter."; static PyObject * @@ -1494,7 +1488,7 @@ _type_ attribute. */ -static char *SIMPLE_TYPE_CHARS = "cbBhHiIlLdfuzZqQPXOv?g"; +static const char SIMPLE_TYPE_CHARS[] = "cbBhHiIlLdfuzZqQPXOv?g"; static PyObject * c_wchar_p_from_param(PyObject *type, PyObject *value) @@ -1735,7 +1729,7 @@ c_void_p_from_param(PyObject *type, PyObject *value) if (stgd && CDataObject_Check(value) && stgd->proto && PyUnicode_Check(stgd->proto)) { PyCArgObject *parg; - switch (_PyUnicode_AsString(stgd->proto)[0]) { + switch (PyUnicode_AsUTF8(stgd->proto)[0]) { case 'z': /* c_char_p */ case 'Z': /* c_wchar_p */ parg = PyCArgObject_new(); @@ -1847,7 +1841,7 @@ PyCSimpleType_paramfunc(CDataObject *self) dict = PyObject_stgdict((PyObject *)self); assert(dict); /* Cannot be NULL for CDataObject instances */ - fmt = _PyUnicode_AsString(dict->proto); + fmt = PyUnicode_AsUTF8(dict->proto); assert(fmt); fd = _ctypes_get_fielddesc(fmt); @@ -2071,7 +2065,7 @@ PyCSimpleType_from_param(PyObject *type, PyObject *value) assert(dict); /* I think we can rely on this being a one-character string */ - fmt = _PyUnicode_AsString(dict->proto); + fmt = PyUnicode_AsUTF8(dict->proto); assert(fmt); fd = _ctypes_get_fielddesc(fmt); @@ -2419,7 +2413,7 @@ unique_key(CDataObject *target, Py_ssize_t index) char *cp = string; size_t bytes_left; - assert(sizeof(string) - 1 > sizeof(Py_ssize_t) * 2); + Py_BUILD_ASSERT(sizeof(string) - 1 > sizeof(Py_ssize_t) * 2); cp += sprintf(cp, "%x", Py_SAFE_DOWNCAST(index, Py_ssize_t, int)); while (target->b_base) { bytes_left = sizeof(string) - (cp - string) - 1; @@ -3080,7 +3074,7 @@ static PyGetSetDef PyCFuncPtr_getsets[] = { }; #ifdef MS_WIN32 -static PPROC FindAddress(void *handle, char *name, PyObject *type) +static PPROC FindAddress(void *handle, const char *name, PyObject *type) { #ifdef MS_WIN64 /* win64 has no stdcall calling conv, so it should @@ -3140,7 +3134,7 @@ _check_outarg_type(PyObject *arg, Py_ssize_t index) /* simple pointer types, c_void_p, c_wchar_p, BSTR, ... */ && PyUnicode_Check(dict->proto) /* We only allow c_void_p, c_char_p and c_wchar_p as a simple output parameter type */ - && (strchr("PzZ", _PyUnicode_AsString(dict->proto)[0]))) { + && (strchr("PzZ", PyUnicode_AsUTF8(dict->proto)[0]))) { return 1; } @@ -3214,7 +3208,7 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags) } static int -_get_name(PyObject *obj, char **pname) +_get_name(PyObject *obj, const char **pname) { #ifdef MS_WIN32 if (PyLong_Check(obj)) { @@ -3230,7 +3224,7 @@ _get_name(PyObject *obj, char **pname) return *pname ? 1 : 0; } if (PyUnicode_Check(obj)) { - *pname = _PyUnicode_AsString(obj); + *pname = PyUnicode_AsUTF8(obj); return *pname ? 1 : 0; } PyErr_SetString(PyExc_TypeError, @@ -3242,7 +3236,7 @@ _get_name(PyObject *obj, char **pname) static PyObject * PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds) { - char *name; + const char *name; int (* address)(void); PyObject *ftuple; PyObject *dll; @@ -4279,10 +4273,11 @@ Array_subscript(PyObject *myself, PyObject *item) PyObject *np; Py_ssize_t start, stop, step, slicelen, cur, i; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + self->b_length, &start, &stop, + &step, &slicelen) < 0) { return NULL; } - slicelen = PySlice_AdjustIndices(self->b_length, &start, &stop, step); stgdict = PyObject_stgdict((PyObject *)self); assert(stgdict); /* Cannot be NULL for array object instances */ @@ -4419,10 +4414,11 @@ Array_ass_subscript(PyObject *myself, PyObject *item, PyObject *value) else if (PySlice_Check(item)) { Py_ssize_t start, stop, step, slicelen, otherlen, i, cur; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + self->b_length, &start, &stop, + &step, &slicelen) < 0) { return -1; } - slicelen = PySlice_AdjustIndices(self->b_length, &start, &stop, step); if ((step < 0 && start < stop) || (step > 0 && start > stop)) stop = start; @@ -5130,13 +5126,12 @@ static const char module_docs[] = #ifdef MS_WIN32 -static char comerror_doc[] = "Raised when a COM method call failed."; +static const char comerror_doc[] = "Raised when a COM method call failed."; int comerror_init(PyObject *self, PyObject *args, PyObject *kwds) { PyObject *hresult, *text, *details; - PyBaseExceptionObject *bself; PyObject *a; int status; @@ -5163,9 +5158,8 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds) if (PyObject_SetAttrString(self, "details", details) < 0) return -1; - bself = (PyBaseExceptionObject *)self; Py_INCREF(args); - Py_SETREF(bself->args, args); + Py_SETREF(((PyBaseExceptionObject *)self)->args, args); return 0; } @@ -5245,7 +5239,7 @@ cast_check_pointertype(PyObject *arg) dict = PyType_stgdict(arg); if (dict) { if (PyUnicode_Check(dict->proto) - && (strchr("sPzUZXO", _PyUnicode_AsString(dict->proto)[0]))) { + && (strchr("sPzUZXO", PyUnicode_AsUTF8(dict->proto)[0]))) { /* simple pointer types, c_void_p, c_wchar_p, BSTR, ... */ return 1; } @@ -5495,14 +5489,14 @@ PyInit__ctypes(void) #endif /* If RTLD_LOCAL is not defined (Windows!), set it to zero. */ -#ifndef RTLD_LOCAL +#if !HAVE_DECL_RTLD_LOCAL #define RTLD_LOCAL 0 #endif /* If RTLD_GLOBAL is not defined (cygwin), set it to the same value as RTLD_LOCAL. */ -#ifndef RTLD_GLOBAL +#if !HAVE_DECL_RTLD_GLOBAL #define RTLD_GLOBAL RTLD_LOCAL #endif diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c index e3240c5..629ddf6 100644 --- a/Modules/_ctypes/_ctypes_test.c +++ b/Modules/_ctypes/_ctypes_test.c @@ -44,19 +44,6 @@ _testfunc_cbk_large_struct(Test in, void (*func)(Test)) func(in); } -/* - * See issue 29565. Update a structure passed by value; - * the caller should not see any change. - */ - -EXPORT(void) -_testfunc_large_struct_update_value(Test in) -{ - ((volatile Test *)&in)->first = 0x0badf00d; - ((volatile Test *)&in)->second = 0x0badf00d; - ((volatile Test *)&in)->third = 0x0badf00d; -} - EXPORT(void)testfunc_array(int values[4]) { printf("testfunc_array %d %d %d %d\n", @@ -246,16 +233,15 @@ EXPORT(int) _testfunc_callback_with_pointer(int (*func)(int *)) return (*func)(table); } -#ifdef HAVE_LONG_LONG -EXPORT(PY_LONG_LONG) _testfunc_q_bhilfdq(signed char b, short h, int i, long l, float f, - double d, PY_LONG_LONG q) +EXPORT(long long) _testfunc_q_bhilfdq(signed char b, short h, int i, long l, float f, + double d, long long q) { - return (PY_LONG_LONG)(b + h + i + l + f + d + q); + return (long long)(b + h + i + l + f + d + q); } -EXPORT(PY_LONG_LONG) _testfunc_q_bhilfd(signed char b, short h, int i, long l, float f, double d) +EXPORT(long long) _testfunc_q_bhilfd(signed char b, short h, int i, long l, float f, double d) { - return (PY_LONG_LONG)(b + h + i + l + f + d); + return (long long)(b + h + i + l + f + d); } EXPORT(int) _testfunc_callback_i_if(int value, int (*func)(int)) @@ -268,10 +254,10 @@ EXPORT(int) _testfunc_callback_i_if(int value, int (*func)(int)) return sum; } -EXPORT(PY_LONG_LONG) _testfunc_callback_q_qf(PY_LONG_LONG value, - PY_LONG_LONG (*func)(PY_LONG_LONG)) +EXPORT(long long) _testfunc_callback_q_qf(long long value, + long long (*func)(long long)) { - PY_LONG_LONG sum = 0; + long long sum = 0; while (value != 0) { sum += func(value); @@ -280,8 +266,6 @@ EXPORT(PY_LONG_LONG) _testfunc_callback_q_qf(PY_LONG_LONG value, return sum; } -#endif - typedef struct { char *name; char *value; @@ -397,8 +381,8 @@ EXPORT(void) _py_func(void) { } -EXPORT(PY_LONG_LONG) last_tf_arg_s; -EXPORT(unsigned PY_LONG_LONG) last_tf_arg_u; +EXPORT(long long) last_tf_arg_s; +EXPORT(unsigned long long) last_tf_arg_u; struct BITS { int A: 1, B:2, C:3, D:4, E: 5, F: 6, G: 7, H: 8, I: 9; @@ -461,8 +445,8 @@ static PyMethodDef module_methods[] = { { NULL, NULL, 0, NULL}, }; -#define S last_tf_arg_s = (PY_LONG_LONG)c -#define U last_tf_arg_u = (unsigned PY_LONG_LONG)c +#define S last_tf_arg_s = (long long)c +#define U last_tf_arg_u = (unsigned long long)c EXPORT(signed char) tf_b(signed char c) { S; return c/3; } EXPORT(unsigned char) tf_B(unsigned char c) { U; return c/3; } @@ -472,8 +456,8 @@ EXPORT(int) tf_i(int c) { S; return c/3; } EXPORT(unsigned int) tf_I(unsigned int c) { U; return c/3; } EXPORT(long) tf_l(long c) { S; return c/3; } EXPORT(unsigned long) tf_L(unsigned long c) { U; return c/3; } -EXPORT(PY_LONG_LONG) tf_q(PY_LONG_LONG c) { S; return c/3; } -EXPORT(unsigned PY_LONG_LONG) tf_Q(unsigned PY_LONG_LONG c) { U; return c/3; } +EXPORT(long long) tf_q(long long c) { S; return c/3; } +EXPORT(unsigned long long) tf_Q(unsigned long long c) { U; return c/3; } EXPORT(float) tf_f(float c) { S; return c/3; } EXPORT(double) tf_d(double c) { S; return c/3; } EXPORT(long double) tf_D(long double c) { S; return c/3; } @@ -487,8 +471,8 @@ EXPORT(int) __stdcall s_tf_i(int c) { S; return c/3; } EXPORT(unsigned int) __stdcall s_tf_I(unsigned int c) { U; return c/3; } EXPORT(long) __stdcall s_tf_l(long c) { S; return c/3; } EXPORT(unsigned long) __stdcall s_tf_L(unsigned long c) { U; return c/3; } -EXPORT(PY_LONG_LONG) __stdcall s_tf_q(PY_LONG_LONG c) { S; return c/3; } -EXPORT(unsigned PY_LONG_LONG) __stdcall s_tf_Q(unsigned PY_LONG_LONG c) { U; return c/3; } +EXPORT(long long) __stdcall s_tf_q(long long c) { S; return c/3; } +EXPORT(unsigned long long) __stdcall s_tf_Q(unsigned long long c) { U; return c/3; } EXPORT(float) __stdcall s_tf_f(float c) { S; return c/3; } EXPORT(double) __stdcall s_tf_d(double c) { S; return c/3; } EXPORT(long double) __stdcall s_tf_D(long double c) { S; return c/3; } @@ -503,8 +487,8 @@ EXPORT(int) tf_bi(signed char x, int c) { S; return c/3; } EXPORT(unsigned int) tf_bI(signed char x, unsigned int c) { U; return c/3; } EXPORT(long) tf_bl(signed char x, long c) { S; return c/3; } EXPORT(unsigned long) tf_bL(signed char x, unsigned long c) { U; return c/3; } -EXPORT(PY_LONG_LONG) tf_bq(signed char x, PY_LONG_LONG c) { S; return c/3; } -EXPORT(unsigned PY_LONG_LONG) tf_bQ(signed char x, unsigned PY_LONG_LONG c) { U; return c/3; } +EXPORT(long long) tf_bq(signed char x, long long c) { S; return c/3; } +EXPORT(unsigned long long) tf_bQ(signed char x, unsigned long long c) { U; return c/3; } EXPORT(float) tf_bf(signed char x, float c) { S; return c/3; } EXPORT(double) tf_bd(signed char x, double c) { S; return c/3; } EXPORT(long double) tf_bD(signed char x, long double c) { S; return c/3; } @@ -519,8 +503,8 @@ EXPORT(int) __stdcall s_tf_bi(signed char x, int c) { S; return c/3; } EXPORT(unsigned int) __stdcall s_tf_bI(signed char x, unsigned int c) { U; return c/3; } EXPORT(long) __stdcall s_tf_bl(signed char x, long c) { S; return c/3; } EXPORT(unsigned long) __stdcall s_tf_bL(signed char x, unsigned long c) { U; return c/3; } -EXPORT(PY_LONG_LONG) __stdcall s_tf_bq(signed char x, PY_LONG_LONG c) { S; return c/3; } -EXPORT(unsigned PY_LONG_LONG) __stdcall s_tf_bQ(signed char x, unsigned PY_LONG_LONG c) { U; return c/3; } +EXPORT(long long) __stdcall s_tf_bq(signed char x, long long c) { S; return c/3; } +EXPORT(unsigned long long) __stdcall s_tf_bQ(signed char x, unsigned long long c) { U; return c/3; } EXPORT(float) __stdcall s_tf_bf(signed char x, float c) { S; return c/3; } EXPORT(double) __stdcall s_tf_bd(signed char x, double c) { S; return c/3; } EXPORT(long double) __stdcall s_tf_bD(signed char x, long double c) { S; return c/3; } diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 91413d7..b958f30 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -77,7 +77,7 @@ PyTypeObject PyCThunk_Type = { /**************************************************************/ static void -PrintError(char *msg, ...) +PrintError(const char *msg, ...) { char buf[512]; PyObject *f = PySys_GetObject("stderr"); diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 70e416b..7d542fb 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -382,7 +382,7 @@ static void SetException(DWORD code, EXCEPTION_RECORD *pr) whose operation is not allowed in the current machine mode. */ PyErr_SetString(PyExc_OSError, - "exception: priviledged instruction"); + "exception: privileged instruction"); break; case EXCEPTION_NONCONTINUABLE_EXCEPTION: @@ -474,7 +474,6 @@ PyCArg_repr(PyCArgObject *self) self->tag, self->value.l); break; -#ifdef HAVE_LONG_LONG case 'q': case 'Q': sprintf(buffer, @@ -485,7 +484,6 @@ PyCArg_repr(PyCArgObject *self) #endif self->tag, self->value.q); break; -#endif case 'd': sprintf(buffer, "", self->tag, self->value.d); @@ -593,9 +591,7 @@ union result { short h; int i; long l; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG q; -#endif + long long q; long double D; double d; float f; @@ -672,7 +668,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa) #ifdef CTYPES_UNICODE if (PyUnicode_Check(obj)) { pa->ffi_type = &ffi_type_pointer; - pa->value.p = _PyUnicode_AsWideCharString(obj); + pa->value.p = PyUnicode_AsWideCharString(obj, NULL); if (pa->value.p == NULL) return -1; pa->keep = PyCapsule_New(pa->value.p, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor); @@ -930,7 +926,7 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker) * Raise a new exception 'exc_class', adding additional text to the original * exception string. */ -void _ctypes_extend_error(PyObject *exc_class, char *fmt, ...) +void _ctypes_extend_error(PyObject *exc_class, const char *fmt, ...) { va_list vargs; PyObject *tp, *v, *tb, *s, *cls_str, *msg_str; @@ -1203,7 +1199,7 @@ _parse_voidp(PyObject *obj, void **address) #ifdef MS_WIN32 -static char format_error_doc[] = +static const char format_error_doc[] = "FormatError([integer]) -> string\n\ \n\ Convert a win32 error code into a string. If the error code is not\n\ @@ -1227,7 +1223,7 @@ static PyObject *format_error(PyObject *self, PyObject *args) return result; } -static char load_library_doc[] = +static const char load_library_doc[] = "LoadLibrary(name) -> handle\n\ \n\ Load an executable (usually a DLL), and return a handle to it.\n\ @@ -1235,15 +1231,14 @@ The handle may be used to locate exported functions in this\n\ module.\n"; static PyObject *load_library(PyObject *self, PyObject *args) { - const WCHAR *name; + WCHAR *name; PyObject *nameobj; PyObject *ignored; HMODULE hMod; - - if (!PyArg_ParseTuple(args, "U|O:LoadLibrary", &nameobj, &ignored)) + if (!PyArg_ParseTuple(args, "O|O:LoadLibrary", &nameobj, &ignored)) return NULL; - name = _PyUnicode_AsUnicode(nameobj); + name = PyUnicode_AsUnicode(nameobj); if (!name) return NULL; @@ -1257,7 +1252,7 @@ static PyObject *load_library(PyObject *self, PyObject *args) #endif } -static char free_library_doc[] = +static const char free_library_doc[] = "FreeLibrary(handle) -> void\n\ \n\ Free the handle of an executable previously loaded by LoadLibrary.\n"; @@ -1272,7 +1267,7 @@ static PyObject *free_library(PyObject *self, PyObject *args) return Py_None; } -static char copy_com_pointer_doc[] = +static const char copy_com_pointer_doc[] = "CopyComPointer(src, dst) -> HRESULT value\n"; static PyObject * @@ -1310,7 +1305,7 @@ static PyObject *py_dl_open(PyObject *self, PyObject *args) PyObject *name, *name2; char *name_str; void * handle; -#ifdef RTLD_LOCAL +#if HAVE_DECL_RTLD_LOCAL int mode = RTLD_NOW | RTLD_LOCAL; #else /* cygwin doesn't define RTLD_LOCAL */ @@ -1442,7 +1437,7 @@ call_cdeclfunction(PyObject *self, PyObject *args) /***************************************************************** * functions */ -static char sizeof_doc[] = +static const char sizeof_doc[] = "sizeof(C type) -> integer\n" "sizeof(C instance) -> integer\n" "Return the size in bytes of a C instance"; @@ -1463,7 +1458,7 @@ sizeof_func(PyObject *self, PyObject *obj) return NULL; } -static char alignment_doc[] = +static const char alignment_doc[] = "alignment(C type) -> integer\n" "alignment(C instance) -> integer\n" "Return the alignment requirements of a C instance"; @@ -1486,7 +1481,7 @@ align_func(PyObject *self, PyObject *obj) return NULL; } -static char byref_doc[] = +static const char byref_doc[] = "byref(C instance[, offset=0]) -> byref-object\n" "Return a pointer lookalike to a C instance, only usable\n" "as function argument"; @@ -1530,7 +1525,7 @@ byref(PyObject *self, PyObject *args) return (PyObject *)parg; } -static char addressof_doc[] = +static const char addressof_doc[] = "addressof(C instance) -> integer\n" "Return the address of the C instance internal buffer"; diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index cb5c3ce..a43585f 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -379,14 +379,12 @@ get_ulong(PyObject *v, unsigned long *p) return 0; } -#ifdef HAVE_LONG_LONG - /* Same, but handling native long long. */ static int -get_longlong(PyObject *v, PY_LONG_LONG *p) +get_longlong(PyObject *v, long long *p) { - PY_LONG_LONG x; + long long x; if (PyFloat_Check(v)) { PyErr_SetString(PyExc_TypeError, "int expected instead of float"); @@ -402,23 +400,21 @@ get_longlong(PyObject *v, PY_LONG_LONG *p) /* Same, but handling native unsigned long long. */ static int -get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) +get_ulonglong(PyObject *v, unsigned long long *p) { - unsigned PY_LONG_LONG x; + unsigned long long x; if (PyFloat_Check(v)) { PyErr_SetString(PyExc_TypeError, "int expected instead of float"); return -1; } x = PyLong_AsUnsignedLongLongMask(v); - if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) + if (x == (unsigned long long)-1 && PyErr_Occurred()) return -1; *p = x; return 0; } -#endif - /***************************************************************** * Integer fields, with bitfield support */ @@ -715,14 +711,6 @@ vBOOL_get(void *ptr, Py_ssize_t size) } #endif -#ifdef HAVE_C99_BOOL -#define BOOL_TYPE _Bool -#else -#define BOOL_TYPE char -#undef SIZEOF__BOOL -#define SIZEOF__BOOL 1 -#endif - static PyObject * bool_set(void *ptr, PyObject *value, Py_ssize_t size) { @@ -730,10 +718,10 @@ bool_set(void *ptr, PyObject *value, Py_ssize_t size) case -1: return NULL; case 0: - *(BOOL_TYPE *)ptr = 0; + *(_Bool *)ptr = 0; _RET(value); default: - *(BOOL_TYPE *)ptr = 1; + *(_Bool *)ptr = 1; _RET(value); } } @@ -741,7 +729,7 @@ bool_set(void *ptr, PyObject *value, Py_ssize_t size) static PyObject * bool_get(void *ptr, Py_ssize_t size) { - return PyBool_FromLong((long)*(BOOL_TYPE *)ptr); + return PyBool_FromLong((long)*(_Bool *)ptr); } static PyObject * @@ -888,16 +876,15 @@ L_get_sw(void *ptr, Py_ssize_t size) return PyLong_FromUnsignedLong(val); } -#ifdef HAVE_LONG_LONG static PyObject * q_set(void *ptr, PyObject *value, Py_ssize_t size) { - PY_LONG_LONG val; - PY_LONG_LONG x; + long long val; + long long x; if (get_longlong(value, &val) < 0) return NULL; memcpy(&x, ptr, sizeof(x)); - x = SET(PY_LONG_LONG, x, val, size); + x = SET(long long, x, val, size); memcpy(ptr, &x, sizeof(x)); _RET(value); } @@ -905,13 +892,13 @@ q_set(void *ptr, PyObject *value, Py_ssize_t size) static PyObject * q_set_sw(void *ptr, PyObject *value, Py_ssize_t size) { - PY_LONG_LONG val; - PY_LONG_LONG field; + long long val; + long long field; if (get_longlong(value, &val) < 0) return NULL; memcpy(&field, ptr, sizeof(field)); field = SWAP_8(field); - field = SET(PY_LONG_LONG, field, val, size); + field = SET(long long, field, val, size); field = SWAP_8(field); memcpy(ptr, &field, sizeof(field)); _RET(value); @@ -920,7 +907,7 @@ q_set_sw(void *ptr, PyObject *value, Py_ssize_t size) static PyObject * q_get(void *ptr, Py_ssize_t size) { - PY_LONG_LONG val; + long long val; memcpy(&val, ptr, sizeof(val)); GET_BITFIELD(val, size); return PyLong_FromLongLong(val); @@ -929,7 +916,7 @@ q_get(void *ptr, Py_ssize_t size) static PyObject * q_get_sw(void *ptr, Py_ssize_t size) { - PY_LONG_LONG val; + long long val; memcpy(&val, ptr, sizeof(val)); val = SWAP_8(val); GET_BITFIELD(val, size); @@ -939,12 +926,12 @@ q_get_sw(void *ptr, Py_ssize_t size) static PyObject * Q_set(void *ptr, PyObject *value, Py_ssize_t size) { - unsigned PY_LONG_LONG val; - unsigned PY_LONG_LONG x; + unsigned long long val; + unsigned long long x; if (get_ulonglong(value, &val) < 0) return NULL; memcpy(&x, ptr, sizeof(x)); - x = SET(PY_LONG_LONG, x, val, size); + x = SET(long long, x, val, size); memcpy(ptr, &x, sizeof(x)); _RET(value); } @@ -952,13 +939,13 @@ Q_set(void *ptr, PyObject *value, Py_ssize_t size) static PyObject * Q_set_sw(void *ptr, PyObject *value, Py_ssize_t size) { - unsigned PY_LONG_LONG val; - unsigned PY_LONG_LONG field; + unsigned long long val; + unsigned long long field; if (get_ulonglong(value, &val) < 0) return NULL; memcpy(&field, ptr, sizeof(field)); field = SWAP_8(field); - field = SET(unsigned PY_LONG_LONG, field, val, size); + field = SET(unsigned long long, field, val, size); field = SWAP_8(field); memcpy(ptr, &field, sizeof(field)); _RET(value); @@ -967,7 +954,7 @@ Q_set_sw(void *ptr, PyObject *value, Py_ssize_t size) static PyObject * Q_get(void *ptr, Py_ssize_t size) { - unsigned PY_LONG_LONG val; + unsigned long long val; memcpy(&val, ptr, sizeof(val)); GET_BITFIELD(val, size); return PyLong_FromUnsignedLongLong(val); @@ -976,13 +963,12 @@ Q_get(void *ptr, Py_ssize_t size) static PyObject * Q_get_sw(void *ptr, Py_ssize_t size) { - unsigned PY_LONG_LONG val; + unsigned long long val; memcpy(&val, ptr, sizeof(val)); val = SWAP_8(val); GET_BITFIELD(val, size); return PyLong_FromUnsignedLongLong(val); } -#endif /***************************************************************** * non-integer accessor methods, not supporting bit fields @@ -1386,7 +1372,7 @@ Z_set(void *ptr, PyObject *value, Py_ssize_t size) /* We must create a wchar_t* buffer from the unicode object, and keep it alive */ - buffer = _PyUnicode_AsWideCharString(value); + buffer = PyUnicode_AsWideCharString(value, NULL); if (!buffer) return NULL; keep = PyCapsule_New(buffer, CTYPES_CFIELD_CAPSULE_NAME_PYMEM, pymem_destructor); @@ -1490,10 +1476,8 @@ P_set(void *ptr, PyObject *value, Py_ssize_t size) #if SIZEOF_VOID_P <= SIZEOF_LONG v = (void *)PyLong_AsUnsignedLongMask(value); #else -#ifndef HAVE_LONG_LONG -# error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long" -#elif SIZEOF_LONG_LONG < SIZEOF_VOID_P -# error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" +#if SIZEOF_LONG_LONG < SIZEOF_VOID_P +# error "PyLong_AsVoidPtr: sizeof(long long) < sizeof(void*)" #endif v = (void *)PyLong_AsUnsignedLongLongMask(value); #endif @@ -1538,14 +1522,12 @@ static struct fielddesc formattable[] = { #else # error #endif -#ifdef HAVE_LONG_LONG #if SIZEOF_LONG_LONG == 8 { 'q', q_set, q_get, &ffi_type_sint64, q_set_sw, q_get_sw}, { 'Q', Q_set, Q_get, &ffi_type_uint64, Q_set_sw, Q_get_sw}, #else # error #endif -#endif { 'P', P_set, P_get, &ffi_type_pointer}, { 'z', z_set, z_get, &ffi_type_pointer}, #ifdef CTYPES_UNICODE @@ -1635,10 +1617,8 @@ typedef struct { char c; wchar_t *x; } s_wchar_p; #endif */ -#ifdef HAVE_LONG_LONG -typedef struct { char c; PY_LONG_LONG x; } s_long_long; -#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG)) -#endif +typedef struct { char c; long long x; } s_long_long; +#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(long long)) /* from ffi.h: typedef struct _ffi_type diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index f2df5c0..5d3b966 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -31,9 +31,7 @@ union value { long l; float f; double d; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG ll; -#endif + long long ll; long double D; }; @@ -303,9 +301,7 @@ struct tagPyCArgObject { short h; int i; long l; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG q; -#endif + long long q; long double D; double d; float f; @@ -327,7 +323,7 @@ extern int PyCData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value, Py_ssize_t index, Py_ssize_t size, char *ptr); -extern void _ctypes_extend_error(PyObject *exc_class, char *fmt, ...); +extern void _ctypes_extend_error(PyObject *exc_class, const char *fmt, ...); struct basespec { CDataObject *base; diff --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c index 6e474b7..55c2d76 100644 --- a/Modules/_ctypes/libffi/src/dlmalloc.c +++ b/Modules/_ctypes/libffi/src/dlmalloc.c @@ -525,7 +525,7 @@ DEFAULT_MMAP_THRESHOLD default: 256K #define MMAP_CLEARS 1 #endif /* MMAP_CLEARS */ #ifndef HAVE_MREMAP -#ifdef linux +#ifdef __linux__ #define HAVE_MREMAP 1 #else /* linux */ #define HAVE_MREMAP 0 diff --git a/Modules/_ctypes/libffi_arm_wince/debug.c b/Modules/_ctypes/libffi_arm_wince/debug.c deleted file mode 100644 index 98f1f9f..0000000 --- a/Modules/_ctypes/libffi_arm_wince/debug.c +++ /dev/null @@ -1,59 +0,0 @@ -/* ----------------------------------------------------------------------- - debug.c - Copyright (c) 1996 Red Hat, Inc. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - ``Software''), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - ----------------------------------------------------------------------- */ - -#include -#include -#include -#include - -/* General debugging routines */ - -void ffi_stop_here(void) -{ - /* This function is only useful for debugging purposes. - Place a breakpoint on ffi_stop_here to be notified of - significant events. */ -} - -/* This function should only be called via the FFI_ASSERT() macro */ - -void ffi_assert(char *expr, char *file, int line) -{ - fprintf(stderr, "ASSERTION FAILURE: %s at %s:%d\n", expr, file, line); - ffi_stop_here(); - abort(); -} - -/* Perform a sanity check on an ffi_type structure */ - -void ffi_type_test(ffi_type *a, char *file, int line) -{ - FFI_ASSERT_AT(a != NULL, file, line); - - /*@-usedef@*/ - FFI_ASSERT_AT(a->type <= FFI_TYPE_LAST, file, line); - FFI_ASSERT_AT(a->type == FFI_TYPE_VOID || a->size > 0, file, line); - FFI_ASSERT_AT(a->type == FFI_TYPE_VOID || a->alignment > 0, file, line); - FFI_ASSERT_AT(a->type != FFI_TYPE_STRUCT || a->elements != NULL, file, line); - /*@=usedef@*/ -} diff --git a/Modules/_ctypes/libffi_arm_wince/ffi.c b/Modules/_ctypes/libffi_arm_wince/ffi.c deleted file mode 100644 index 1193aaa..0000000 --- a/Modules/_ctypes/libffi_arm_wince/ffi.c +++ /dev/null @@ -1,310 +0,0 @@ -/* ----------------------------------------------------------------------- - ffi.c - Copyright (c) 1998 Red Hat, Inc. - - ARM Foreign Function Interface - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - ``Software''), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - ----------------------------------------------------------------------- */ - -#include -#include - -#include - -#ifdef _WIN32_WCE -#pragma warning (disable : 4142) /* benign redefinition of type */ -#include -#endif - -/* ffi_prep_args is called by the assembly routine once stack space - has been allocated for the function's arguments */ - -/*@-exportheader@*/ -void ffi_prep_args(char *stack, extended_cif *ecif) -/*@=exportheader@*/ -{ - register unsigned int i; - register void **p_argv; - register char *argp; - register ffi_type **p_arg; - - argp = stack; - - if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT ) { - *(void **) argp = ecif->rvalue; - argp += 4; - } - - p_argv = ecif->avalue; - - for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; - (i != 0); - i--, p_arg++) - { - size_t z; - size_t argalign = (*p_arg)->alignment; - -#ifdef _WIN32_WCE - if (argalign > 4) - argalign = 4; -#endif - /* Align if necessary */ - if ((argalign - 1) & (unsigned) argp) { - argp = (char *) ALIGN(argp, argalign); - } - - z = (*p_arg)->size; - if (z < sizeof(int)) - { - z = sizeof(int); - switch ((*p_arg)->type) - { - case FFI_TYPE_SINT8: - *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); - break; - - case FFI_TYPE_UINT8: - *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv); - break; - - case FFI_TYPE_SINT16: - *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv); - break; - - case FFI_TYPE_UINT16: - *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv); - break; - - case FFI_TYPE_STRUCT: - /* *p_argv may not be aligned for a UINT32 */ - memcpy(argp, *p_argv, z); - break; - - default: - FFI_ASSERT(0); - } - } - else if (z == sizeof(int)) - { - *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); - } - else - { - memcpy(argp, *p_argv, z); - } - p_argv++; - argp += z; - } - - return; -} - -/* Perform machine dependent cif processing */ -ffi_status ffi_prep_cif_machdep(ffi_cif *cif) -{ - /* Set the return type flag */ - switch (cif->rtype->type) - { - case FFI_TYPE_VOID: - case FFI_TYPE_STRUCT: - case FFI_TYPE_FLOAT: - case FFI_TYPE_DOUBLE: - case FFI_TYPE_SINT64: - cif->flags = (unsigned) cif->rtype->type; - break; - - case FFI_TYPE_UINT64: - cif->flags = FFI_TYPE_SINT64; - break; - - default: - cif->flags = FFI_TYPE_INT; - break; - } - - return FFI_OK; -} - -/*@-declundef@*/ -/*@-exportheader@*/ -extern void ffi_call_SYSV(void (*)(char *, extended_cif *), - /*@out@*/ extended_cif *, - unsigned, unsigned, - /*@out@*/ unsigned *, - void (*fn)()); -/*@=declundef@*/ -/*@=exportheader@*/ - -/* Return type changed from void for ctypes */ -int ffi_call(/*@dependent@*/ ffi_cif *cif, - void (*fn)(), - /*@out@*/ void *rvalue, - /*@dependent@*/ void **avalue) -{ - extended_cif ecif; - - ecif.cif = cif; - ecif.avalue = avalue; - - /* If the return value is a struct and we don't have a return */ - /* value address then we need to make one */ - - if ((rvalue == NULL) && - (cif->rtype->type == FFI_TYPE_STRUCT)) - { - /*@-sysunrecog@*/ - ecif.rvalue = alloca(cif->rtype->size); - /*@=sysunrecog@*/ - } - else - ecif.rvalue = rvalue; - - - switch (cif->abi) - { - case FFI_SYSV: - /*@-usedef@*/ - ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, - cif->flags, ecif.rvalue, fn); - /*@=usedef@*/ - break; - default: - FFI_ASSERT(0); - break; - } - /* I think calculating the real stack pointer delta is not useful - because stdcall is not supported */ - return 0; -} - -/** private members **/ - -static void ffi_prep_incoming_args_SYSV (char *stack, void **ret, - void** args, ffi_cif* cif); - -/* This function is called by ffi_closure_SYSV in sysv.asm */ - -unsigned int -ffi_closure_SYSV_inner (ffi_closure *closure, char *in_args, void *rvalue) -{ - ffi_cif *cif = closure->cif; - void **out_args; - - out_args = (void **) alloca(cif->nargs * sizeof (void *)); - - /* this call will initialize out_args, such that each - * element in that array points to the corresponding - * value on the stack; and if the function returns - * a structure, it will re-set rvalue to point to the - * structure return address. */ - - ffi_prep_incoming_args_SYSV(in_args, &rvalue, out_args, cif); - - (closure->fun)(cif, rvalue, out_args, closure->user_data); - - /* Tell ffi_closure_SYSV what the returntype is */ - return cif->flags; -} - -/*@-exportheader@*/ -static void -ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, - void **avalue, ffi_cif *cif) -/*@=exportheader@*/ -{ - unsigned int i; - void **p_argv; - char *argp; - ffi_type **p_arg; - - argp = stack; - - if ( cif->rtype->type == FFI_TYPE_STRUCT ) { - *rvalue = *(void **) argp; - argp += 4; - } - - p_argv = avalue; - - for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++) - { - size_t z; - size_t argalign = (*p_arg)->alignment; - -#ifdef _WIN32_WCE - if (argalign > 4) - argalign = 4; -#endif - /* Align if necessary */ - if ((argalign - 1) & (unsigned) argp) { - argp = (char *) ALIGN(argp, argalign); - } - - z = (*p_arg)->size; - if (z < sizeof(int)) - z = sizeof(int); - - *p_argv = (void*) argp; - - p_argv++; - argp += z; - } -} - -/* - add ip, pc, #-8 ; ip = address of this trampoline == address of ffi_closure - ldr pc, [pc, #-4] ; jump to __fun - DCD __fun -*/ -#define FFI_INIT_TRAMPOLINE(TRAMP,FUN) \ -{ \ - unsigned int *__tramp = (unsigned int *)(TRAMP); \ - __tramp[0] = 0xe24fc008; /* add ip, pc, #-8 */ \ - __tramp[1] = 0xe51ff004; /* ldr pc, [pc, #-4] */ \ - __tramp[2] = (unsigned int)(FUN); \ - } - -/* the cif must already be prep'ed */ - -/* defined in sysv.asm */ -void ffi_closure_SYSV(void); - -ffi_status -ffi_prep_closure (ffi_closure* closure, - ffi_cif* cif, - void (*fun)(ffi_cif*,void*,void**,void*), - void *user_data) -{ - FFI_ASSERT (cif->abi == FFI_SYSV); - - FFI_INIT_TRAMPOLINE (&closure->tramp[0], &ffi_closure_SYSV); - - closure->cif = cif; - closure->user_data = user_data; - closure->fun = fun; - -#ifdef _WIN32_WCE - /* This is important to allow calling the trampoline safely */ - FlushInstructionCache(GetCurrentProcess(), 0, 0); -#endif - - return FFI_OK; -} - diff --git a/Modules/_ctypes/libffi_arm_wince/ffi.h b/Modules/_ctypes/libffi_arm_wince/ffi.h deleted file mode 100644 index 67975b6..0000000 --- a/Modules/_ctypes/libffi_arm_wince/ffi.h +++ /dev/null @@ -1,317 +0,0 @@ -/* -----------------------------------------------------------------*-C-*- - libffi 2.00-beta-wince - Copyright (c) 1996-2003 Red Hat, Inc. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - ``Software''), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - ----------------------------------------------------------------------- */ - -/* ------------------------------------------------------------------- - The basic API is described in the README file. - - The raw API is designed to bypass some of the argument packing - and unpacking on architectures for which it can be avoided. - - The closure API allows interpreted functions to be packaged up - inside a C function pointer, so that they can be called as C functions, - with no understanding on the client side that they are interpreted. - It can also be used in other cases in which it is necessary to package - up a user specified parameter and a function pointer as a single - function pointer. - - The closure API must be implemented in order to get its functionality, - e.g. for use by gij. Routines are provided to emulate the raw API - if the underlying platform doesn't allow faster implementation. - - More details on the raw and cloure API can be found in: - - http://gcc.gnu.org/ml/java/1999-q3/msg00138.html - - and - - http://gcc.gnu.org/ml/java/1999-q3/msg00174.html - -------------------------------------------------------------------- */ - -#ifndef LIBFFI_H -#define LIBFFI_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Specify which architecture libffi is configured for. */ -/*#define @TARGET@*/ - -/* ---- System configuration information --------------------------------- */ - -#include - -#ifndef LIBFFI_ASM - -#include -#include - -/* LONG_LONG_MAX is not always defined (not if STRICT_ANSI, for example). - But we can find it either under the correct ANSI name, or under GNU - C's internal name. */ -#ifdef LONG_LONG_MAX -# define FFI_LONG_LONG_MAX LONG_LONG_MAX -#else -# ifdef LLONG_MAX -# define FFI_LONG_LONG_MAX LLONG_MAX -# else -# ifdef __GNUC__ -# define FFI_LONG_LONG_MAX __LONG_LONG_MAX__ -# endif -# ifdef _MSC_VER -# define FFI_LONG_LONG_MAX _I64_MAX -# endif -# endif -#endif - -#if SCHAR_MAX == 127 -# define ffi_type_uchar ffi_type_uint8 -# define ffi_type_schar ffi_type_sint8 -#else - #error "char size not supported" -#endif - -#if SHRT_MAX == 32767 -# define ffi_type_ushort ffi_type_uint16 -# define ffi_type_sshort ffi_type_sint16 -#elif SHRT_MAX == 2147483647 -# define ffi_type_ushort ffi_type_uint32 -# define ffi_type_sshort ffi_type_sint32 -#else - #error "short size not supported" -#endif - -#if INT_MAX == 32767 -# define ffi_type_uint ffi_type_uint16 -# define ffi_type_sint ffi_type_sint16 -#elif INT_MAX == 2147483647 -# define ffi_type_uint ffi_type_uint32 -# define ffi_type_sint ffi_type_sint32 -#elif INT_MAX == 9223372036854775807 -# define ffi_type_uint ffi_type_uint64 -# define ffi_type_sint ffi_type_sint64 -#else - #error "int size not supported" -#endif - -#define ffi_type_ulong ffi_type_uint64 -#define ffi_type_slong ffi_type_sint64 -#if LONG_MAX == 2147483647 -# if FFI_LONG_LONG_MAX != 9223372036854775807 - #error "no 64-bit data type supported" -# endif -#elif LONG_MAX != 9223372036854775807 - #error "long size not supported" -#endif - -/* The closure code assumes that this works on pointers, i.e. a size_t */ -/* can hold a pointer. */ - -typedef struct _ffi_type -{ - size_t size; - unsigned short alignment; - unsigned short type; - /*@null@*/ struct _ffi_type **elements; -} ffi_type; - -/* These are defined in types.c */ -extern ffi_type ffi_type_void; -extern ffi_type ffi_type_uint8; -extern ffi_type ffi_type_sint8; -extern ffi_type ffi_type_uint16; -extern ffi_type ffi_type_sint16; -extern ffi_type ffi_type_uint32; -extern ffi_type ffi_type_sint32; -extern ffi_type ffi_type_uint64; -extern ffi_type ffi_type_sint64; -extern ffi_type ffi_type_float; -extern ffi_type ffi_type_double; -extern ffi_type ffi_type_longdouble; -extern ffi_type ffi_type_pointer; - - -typedef enum { - FFI_OK = 0, - FFI_BAD_TYPEDEF, - FFI_BAD_ABI -} ffi_status; - -typedef unsigned FFI_TYPE; - -typedef struct { - ffi_abi abi; - unsigned nargs; - /*@dependent@*/ ffi_type **arg_types; - /*@dependent@*/ ffi_type *rtype; - unsigned bytes; - unsigned flags; -#ifdef FFI_EXTRA_CIF_FIELDS - FFI_EXTRA_CIF_FIELDS; -#endif -} ffi_cif; - -/* ---- Definitions for the raw API -------------------------------------- */ - -#ifndef FFI_SIZEOF_ARG -# if LONG_MAX == 2147483647 -# define FFI_SIZEOF_ARG 4 -# elif LONG_MAX == 9223372036854775807 -# define FFI_SIZEOF_ARG 8 -# endif -#endif - -typedef union { - ffi_sarg sint; - ffi_arg uint; - float flt; - char data[FFI_SIZEOF_ARG]; - void* ptr; -} ffi_raw; - -void ffi_raw_call (/*@dependent@*/ ffi_cif *cif, - void (*fn)(), - /*@out@*/ void *rvalue, - /*@dependent@*/ ffi_raw *avalue); - -void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw); -void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args); -size_t ffi_raw_size (ffi_cif *cif); - -/* This is analogous to the raw API, except it uses Java parameter */ -/* packing, even on 64-bit machines. I.e. on 64-bit machines */ -/* longs and doubles are followed by an empty 64-bit word. */ - -void ffi_java_raw_call (/*@dependent@*/ ffi_cif *cif, - void (*fn)(), - /*@out@*/ void *rvalue, - /*@dependent@*/ ffi_raw *avalue); - -void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw); -void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args); -size_t ffi_java_raw_size (ffi_cif *cif); - -/* ---- Definitions for closures ----------------------------------------- */ - -#if FFI_CLOSURES - -typedef struct { - char tramp[FFI_TRAMPOLINE_SIZE]; - ffi_cif *cif; - void (*fun)(ffi_cif*,void*,void**,void*); - void *user_data; -} ffi_closure; - -ffi_status -ffi_prep_closure (ffi_closure*, - ffi_cif *, - void (*fun)(ffi_cif*,void*,void**,void*), - void *user_data); - -typedef struct { - char tramp[FFI_TRAMPOLINE_SIZE]; - - ffi_cif *cif; - -#if !FFI_NATIVE_RAW_API - - /* if this is enabled, then a raw closure has the same layout - as a regular closure. We use this to install an intermediate - handler to do the transaltion, void** -> ffi_raw*. */ - - void (*translate_args)(ffi_cif*,void*,void**,void*); - void *this_closure; - -#endif - - void (*fun)(ffi_cif*,void*,ffi_raw*,void*); - void *user_data; - -} ffi_raw_closure; - -ffi_status -ffi_prep_raw_closure (ffi_raw_closure*, - ffi_cif *cif, - void (*fun)(ffi_cif*,void*,ffi_raw*,void*), - void *user_data); - -ffi_status -ffi_prep_java_raw_closure (ffi_raw_closure*, - ffi_cif *cif, - void (*fun)(ffi_cif*,void*,ffi_raw*,void*), - void *user_data); - -#endif /* FFI_CLOSURES */ - -/* ---- Public interface definition -------------------------------------- */ - -ffi_status ffi_prep_cif(/*@out@*/ /*@partial@*/ ffi_cif *cif, - ffi_abi abi, - unsigned int nargs, - /*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type *rtype, - /*@dependent@*/ ffi_type **atypes); - -/* Return type changed from void for ctypes */ -int ffi_call(/*@dependent@*/ ffi_cif *cif, - void (*fn)(), - /*@out@*/ void *rvalue, - /*@dependent@*/ void **avalue); - -/* Useful for eliminating compiler warnings */ -#define FFI_FN(f) ((void (*)())f) - -/* ---- Definitions shared with assembly code ---------------------------- */ - -#endif - -/* If these change, update src/mips/ffitarget.h. */ -#define FFI_TYPE_VOID 0 -#define FFI_TYPE_INT 1 -#define FFI_TYPE_FLOAT 2 -#define FFI_TYPE_DOUBLE 3 -#if 0 /*@HAVE_LONG_DOUBLE@*/ -#define FFI_TYPE_LONGDOUBLE 4 -#else -#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE -#endif -#define FFI_TYPE_UINT8 5 -#define FFI_TYPE_SINT8 6 -#define FFI_TYPE_UINT16 7 -#define FFI_TYPE_SINT16 8 -#define FFI_TYPE_UINT32 9 -#define FFI_TYPE_SINT32 10 -#define FFI_TYPE_UINT64 11 -#define FFI_TYPE_SINT64 12 -#define FFI_TYPE_STRUCT 13 -#define FFI_TYPE_POINTER 14 - -/* This should always refer to the last type code (for sanity checks) */ -#define FFI_TYPE_LAST FFI_TYPE_POINTER - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/Modules/_ctypes/libffi_arm_wince/ffi_common.h b/Modules/_ctypes/libffi_arm_wince/ffi_common.h deleted file mode 100644 index bf879d1..0000000 --- a/Modules/_ctypes/libffi_arm_wince/ffi_common.h +++ /dev/null @@ -1,111 +0,0 @@ -/* ----------------------------------------------------------------------- - ffi_common.h - Copyright (c) 1996 Red Hat, Inc. - - Common internal definitions and macros. Only necessary for building - libffi. - ----------------------------------------------------------------------- */ - -#ifndef FFI_COMMON_H -#define FFI_COMMON_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Do not move this. Some versions of AIX are very picky about where - this is positioned. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif - -/* Check for the existence of memcpy. */ -#if STDC_HEADERS -# include -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif - -#if defined(FFI_DEBUG) -#include -#endif - -#ifdef FFI_DEBUG -/*@exits@*/ void ffi_assert(/*@temp@*/ char *expr, /*@temp@*/ char *file, int line); -void ffi_stop_here(void); -void ffi_type_test(/*@temp@*/ /*@out@*/ ffi_type *a, /*@temp@*/ char *file, int line); - -#define FFI_ASSERT(x) ((x) ? (void)0 : ffi_assert(#x, __FILE__,__LINE__)) -#define FFI_ASSERT_AT(x, f, l) ((x) ? 0 : ffi_assert(#x, (f), (l))) -#define FFI_ASSERT_VALID_TYPE(x) ffi_type_test (x, __FILE__, __LINE__) -#else -#define FFI_ASSERT(x) -#define FFI_ASSERT_AT(x, f, l) -#define FFI_ASSERT_VALID_TYPE(x) -#endif - -#define ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1) - -/* Perform machine dependent cif processing */ -ffi_status ffi_prep_cif_machdep(ffi_cif *cif); - -/* Extended cif, used in callback from assembly routine */ -typedef struct -{ - /*@dependent@*/ ffi_cif *cif; - /*@dependent@*/ void *rvalue; - /*@dependent@*/ void **avalue; -} extended_cif; - -/* Terse sized type definitions. */ -#if defined(__GNUC__) - -typedef unsigned int UINT8 __attribute__((__mode__(__QI__))); -typedef signed int SINT8 __attribute__((__mode__(__QI__))); -typedef unsigned int UINT16 __attribute__((__mode__(__HI__))); -typedef signed int SINT16 __attribute__((__mode__(__HI__))); -typedef unsigned int UINT32 __attribute__((__mode__(__SI__))); -typedef signed int SINT32 __attribute__((__mode__(__SI__))); -typedef unsigned int UINT64 __attribute__((__mode__(__DI__))); -typedef signed int SINT64 __attribute__((__mode__(__DI__))); - -#elif defined(_MSC_VER) - -typedef unsigned __int8 UINT8; -typedef signed __int8 SINT8; -typedef unsigned __int16 UINT16; -typedef signed __int16 SINT16; -typedef unsigned __int32 UINT32; -typedef signed __int32 SINT32; -typedef unsigned __int64 UINT64; -typedef signed __int64 SINT64; - -#else -#error "Need typedefs here" -#endif - -typedef float FLOAT32; - - -#ifdef __cplusplus -} -#endif - -#endif - - diff --git a/Modules/_ctypes/libffi_arm_wince/fficonfig.h b/Modules/_ctypes/libffi_arm_wince/fficonfig.h deleted file mode 100644 index 3c7964c..0000000 --- a/Modules/_ctypes/libffi_arm_wince/fficonfig.h +++ /dev/null @@ -1,152 +0,0 @@ -/* fficonfig.h created manually for Windows CE on ARM */ -/* fficonfig.h.in. Generated from configure.ac by autoheader. */ - -/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#define BYTEORDER 1234 - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to the flags needed for the .section .eh_frame directive. */ -/* #undef EH_FRAME_FLAGS */ - -/* Define this if you want extra debugging. */ -#ifdef DEBUG /* Defined by the project settings for Debug builds */ -#define FFI_DEBUG -#else -#undef FFI_DEBUG -#endif - -/* Define this is you do not want support for the raw API. */ -/* #undef FFI_NO_RAW_API */ - -/* Define this is you do not want support for aggregate types. */ -/* #undef FFI_NO_STRUCTS */ - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define if your assembler supports .register. */ -/* #undef HAVE_AS_REGISTER_PSEUDO_OP */ - -/* Define if your assembler and linker support unaligned PC relative relocs. - */ -/* #undef HAVE_AS_SPARC_UA_PCREL */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define if you have the long double type and it is bigger than a double */ -/* This differs from the MSVC build, but even there it should not be defined */ -/* #undef HAVE_LONG_DOUBLE */ - -/* Define to 1 if you have the `memcpy' function. */ -#define HAVE_MEMCPY 1 - -/* Define to 1 if you have the header file. */ -/* WinCE has this but I don't think we need to use it */ -/* #undef HAVE_MEMORY_H */ - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define if mmap with MAP_ANON(YMOUS) works. */ -/* #undef HAVE_MMAP_ANON */ - -/* Define if mmap of /dev/zero works. */ -/* #undef HAVE_MMAP_DEV_ZERO */ - -/* Define if read-only mmap of a plain file works. */ -/* #undef HAVE_MMAP_FILE */ - -/* Define if .eh_frame sections should be read-only. */ -/* #undef HAVE_RO_EH_FRAME */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STAT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TYPES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define if the host machine stores words of multi-word integers in - big-endian order. */ -/* #undef HOST_WORDS_BIG_ENDIAN */ - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -/* #undef PACKAGE */ - -/* Define to the address where bug reports for this package should be sent. */ -/* #undef PACKAGE_BUGREPORT */ - -/* Define to the full name of this package. */ -/* #undef PACKAGE_NAME */ - -/* Define to the full name and version of this package. */ -/* #undef PACKAGE_STRING */ - -/* Define to the one symbol short name of this package. */ -/* #undef PACKAGE_TARNAME */ - -/* Define to the version of this package. */ -/* #undef PACKAGE_VERSION */ - -/* The number of bytes in type double */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in type long double */ -#define SIZEOF_LONG_DOUBLE 8 - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define this if you are using Purify and want to suppress spurious messages. - */ -/* #undef USING_PURIFY */ - -/* Version number of package */ -/* #undef VERSION */ - -/* whether byteorder is bigendian */ -/* #undef WORDS_BIGENDIAN */ - -#define alloca _alloca - -#define abort() exit(999) diff --git a/Modules/_ctypes/libffi_arm_wince/ffitarget.h b/Modules/_ctypes/libffi_arm_wince/ffitarget.h deleted file mode 100644 index 2627b25..0000000 --- a/Modules/_ctypes/libffi_arm_wince/ffitarget.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -----------------------------------------------------------------*-C-*- - ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc. - Target configuration macros for ARM. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - ``Software''), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - ----------------------------------------------------------------------- */ - -#ifndef LIBFFI_TARGET_H -#define LIBFFI_TARGET_H - -#ifndef LIBFFI_ASM -typedef unsigned long ffi_arg; -typedef signed long ffi_sarg; - -typedef enum ffi_abi { - FFI_FIRST_ABI = 0, - FFI_SYSV, - FFI_DEFAULT_ABI = FFI_SYSV, - FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 -} ffi_abi; -#endif - -/* ---- Definitions for closures ----------------------------------------- */ - -#define FFI_CLOSURES 1 -#define FFI_TRAMPOLINE_SIZE 12 - -#define FFI_NATIVE_RAW_API 0 - -#endif - diff --git a/Modules/_ctypes/libffi_arm_wince/prep_cif.c b/Modules/_ctypes/libffi_arm_wince/prep_cif.c deleted file mode 100644 index 9edce2f..0000000 --- a/Modules/_ctypes/libffi_arm_wince/prep_cif.c +++ /dev/null @@ -1,175 +0,0 @@ -/* ----------------------------------------------------------------------- - prep_cif.c - Copyright (c) 1996, 1998 Red Hat, Inc. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - ``Software''), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - ----------------------------------------------------------------------- */ - -#include -#include -#include - - -/* Round up to FFI_SIZEOF_ARG. */ - -#define STACK_ARG_SIZE(x) ALIGN(x, FFI_SIZEOF_ARG) - -/* Perform machine independent initialization of aggregate type - specifications. */ - -static ffi_status initialize_aggregate(/*@out@*/ ffi_type *arg) -{ - ffi_type **ptr; - - FFI_ASSERT(arg != NULL); - - /*@-usedef@*/ - - FFI_ASSERT(arg->elements != NULL); - FFI_ASSERT(arg->size == 0); - FFI_ASSERT(arg->alignment == 0); - - ptr = &(arg->elements[0]); - - while ((*ptr) != NULL) - { - if (((*ptr)->size == 0) && (initialize_aggregate((*ptr)) != FFI_OK)) - return FFI_BAD_TYPEDEF; - - /* Perform a sanity check on the argument type */ - FFI_ASSERT_VALID_TYPE(*ptr); - - arg->size = ALIGN(arg->size, (*ptr)->alignment); - arg->size += (*ptr)->size; - - arg->alignment = (arg->alignment > (*ptr)->alignment) ? - arg->alignment : (*ptr)->alignment; - - ptr++; - } - - /* Structure size includes tail padding. This is important for - structures that fit in one register on ABIs like the PowerPC64 - Linux ABI that right justify small structs in a register. - It's also needed for nested structure layout, for example - struct A { long a; char b; }; struct B { struct A x; char y; }; - should find y at an offset of 2*sizeof(long) and result in a - total size of 3*sizeof(long). */ - arg->size = ALIGN (arg->size, arg->alignment); - - if (arg->size == 0) - return FFI_BAD_TYPEDEF; - else - return FFI_OK; - - /*@=usedef@*/ -} - -/* Perform machine independent ffi_cif preparation, then call - machine dependent routine. */ - -ffi_status ffi_prep_cif(/*@out@*/ /*@partial@*/ ffi_cif *cif, - ffi_abi abi, unsigned int nargs, - /*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type *rtype, - /*@dependent@*/ ffi_type **atypes) -{ - unsigned bytes = 0; - unsigned int i; - ffi_type **ptr; - - FFI_ASSERT(cif != NULL); - FFI_ASSERT((abi > FFI_FIRST_ABI) && (abi <= FFI_DEFAULT_ABI)); - - cif->abi = abi; - cif->arg_types = atypes; - cif->nargs = nargs; - cif->rtype = rtype; - - cif->flags = 0; - - /* Initialize the return type if necessary */ - /*@-usedef@*/ - if ((cif->rtype->size == 0) && (initialize_aggregate(cif->rtype) != FFI_OK)) - return FFI_BAD_TYPEDEF; - /*@=usedef@*/ - - /* Perform a sanity check on the return type */ - FFI_ASSERT_VALID_TYPE(cif->rtype); - - /* x86-64 and s390 stack space allocation is handled in prep_machdep. */ -#if !defined M68K && !defined __x86_64__ && !defined S390 - /* Make space for the return structure pointer */ - if (cif->rtype->type == FFI_TYPE_STRUCT - /* MSVC returns small structures in registers. But we have a different - workaround: pretend int32 or int64 return type, and converting to - structure afterwards. */ -#ifdef SPARC - && (cif->abi != FFI_V9 || cif->rtype->size > 32) -#endif - ) - bytes = STACK_ARG_SIZE(sizeof(void*)); -#endif - - for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) - { - - /* Initialize any uninitialized aggregate type definitions */ - if (((*ptr)->size == 0) && (initialize_aggregate((*ptr)) != FFI_OK)) - return FFI_BAD_TYPEDEF; - - /* Perform a sanity check on the argument type, do this - check after the initialization. */ - FFI_ASSERT_VALID_TYPE(*ptr); - -#if !defined __x86_64__ && !defined S390 -#ifdef SPARC - if (((*ptr)->type == FFI_TYPE_STRUCT - && ((*ptr)->size > 16 || cif->abi != FFI_V9)) - || ((*ptr)->type == FFI_TYPE_LONGDOUBLE - && cif->abi != FFI_V9)) - bytes += sizeof(void*); - else -#endif - { -#ifndef _MSC_VER - /* Don't know if this is a libffi bug or not. At least on - Windows with MSVC, function call parameters are *not* - aligned in the same way as structure fields are, they are - only aligned in integer boundaries. - - This doesn't do any harm for cdecl functions and closures, - since the caller cleans up the stack, but it is wrong for - stdcall functions where the callee cleans. - */ - - /* Add any padding if necessary */ - if (((*ptr)->alignment - 1) & bytes) - bytes = ALIGN(bytes, (*ptr)->alignment); - -#endif - bytes += STACK_ARG_SIZE((*ptr)->size); - } -#endif - } - - cif->bytes = bytes; - - /* Perform machine dependent cif processing */ - return ffi_prep_cif_machdep(cif); -} diff --git a/Modules/_ctypes/libffi_arm_wince/sysv.asm b/Modules/_ctypes/libffi_arm_wince/sysv.asm deleted file mode 100644 index db78b90..0000000 --- a/Modules/_ctypes/libffi_arm_wince/sysv.asm +++ /dev/null @@ -1,228 +0,0 @@ -; ----------------------------------------------------------------------- -; sysv.S - Copyright (c) 1998 Red Hat, Inc. -; -; ARM Foreign Function Interface -; -; Permission is hereby granted, free of charge, to any person obtaining -; a copy of this software and associated documentation files (the -; ``Software''), to deal in the Software without restriction, including -; without limitation the rights to use, copy, modify, merge, publish, -; distribute, sublicense, and/or sell copies of the Software, and to -; permit persons to whom the Software is furnished to do so, subject to -; the following conditions: -; -; The above copyright notice and this permission notice shall be included -; in all copies or substantial portions of the Software. -; -; THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS -; OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -; IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR -; OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -; ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -; OTHER DEALINGS IN THE SOFTWARE. -; ----------------------------------------------------------------------- */ - -;#define LIBFFI_ASM -;#include -;#include -;#ifdef HAVE_MACHINE_ASM_H -;#include -;#else -;#ifdef __USER_LABEL_PREFIX__ -;#define CONCAT1(a, b) CONCAT2(a, b) -;#define CONCAT2(a, b) a ## b - -;/* Use the right prefix for global labels. */ -;#define CNAME(x) CONCAT1 (__USER_LABEL_PREFIX__, x) -;#else -;#define CNAME(x) x -;#endif -;#define ENTRY(x) .globl CNAME(x); .type CNAME(x),%function; CNAME(x): -;#endif - - -FFI_TYPE_VOID EQU 0 -FFI_TYPE_INT EQU 1 -FFI_TYPE_FLOAT EQU 2 -FFI_TYPE_DOUBLE EQU 3 -;FFI_TYPE_LONGDOUBLE EQU 4 -FFI_TYPE_UINT8 EQU 5 -FFI_TYPE_SINT8 EQU 6 -FFI_TYPE_UINT16 EQU 7 -FFI_TYPE_SINT16 EQU 8 -FFI_TYPE_UINT32 EQU 9 -FFI_TYPE_SINT32 EQU 10 -FFI_TYPE_UINT64 EQU 11 -FFI_TYPE_SINT64 EQU 12 -FFI_TYPE_STRUCT EQU 13 -FFI_TYPE_POINTER EQU 14 - -; WinCE always uses software floating point (I think) -__SOFTFP__ EQU {TRUE} - - - AREA |.text|, CODE, ARM ; .text - - - ; a1: ffi_prep_args - ; a2: &ecif - ; a3: cif->bytes - ; a4: fig->flags - ; sp+0: ecif.rvalue - ; sp+4: fn - - ; This assumes we are using gas. -;ENTRY(ffi_call_SYSV) - - EXPORT |ffi_call_SYSV| - -|ffi_call_SYSV| PROC - - ; Save registers - stmfd sp!, {a1-a4, fp, lr} - mov fp, sp - - ; Make room for all of the new args. - sub sp, fp, a3 - - ; Place all of the ffi_prep_args in position - mov ip, a1 - mov a1, sp - ; a2 already set - - ; And call - mov lr, pc - mov pc, ip - - ; move first 4 parameters in registers - ldr a1, [sp, #0] - ldr a2, [sp, #4] - ldr a3, [sp, #8] - ldr a4, [sp, #12] - - ; and adjust stack - ldr ip, [fp, #8] - cmp ip, #16 - movge ip, #16 - add sp, sp, ip - - ; call function - mov lr, pc - ldr pc, [fp, #28] - - ; Remove the space we pushed for the args - mov sp, fp - - ; Load a3 with the pointer to storage for the return value - ldr a3, [sp, #24] - - ; Load a4 with the return type code - ldr a4, [sp, #12] - - ; If the return value pointer is NULL, assume no return value. - cmp a3, #0 - beq call_epilogue - -; return INT - cmp a4, #FFI_TYPE_INT - streq a1, [a3] - beq call_epilogue - -; return FLOAT - cmp a4, #FFI_TYPE_FLOAT - [ __SOFTFP__ ;ifdef __SOFTFP__ - streq a1, [a3] - | ;else - stfeqs f0, [a3] - ] ;endif - beq call_epilogue - -; return DOUBLE or LONGDOUBLE - cmp a4, #FFI_TYPE_DOUBLE - [ __SOFTFP__ ;ifdef __SOFTFP__ - stmeqia a3, {a1, a2} - | ;else - stfeqd f0, [a3] - ] ;endif - beq call_epilogue - -; return SINT64 or UINT64 - cmp a4, #FFI_TYPE_SINT64 - stmeqia a3, {a1, a2} - -call_epilogue - ldmfd sp!, {a1-a4, fp, pc} - -;.ffi_call_SYSV_end: - ;.size CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV) - ENDP - - -RESERVE_RETURN EQU 16 - - ; This function is called by the trampoline - ; It is NOT callable from C - ; ip = pointer to struct ffi_closure - - IMPORT |ffi_closure_SYSV_inner| - - EXPORT |ffi_closure_SYSV| -|ffi_closure_SYSV| PROC - - ; Store the argument registers on the stack - stmfd sp!, {a1-a4} - ; Push the return address onto the stack - stmfd sp!, {lr} - - mov a1, ip ; first arg = address of ffi_closure - add a2, sp, #4 ; second arg = sp+4 (points to saved a1) - - ; Allocate space for a non-struct return value - sub sp, sp, #RESERVE_RETURN - mov a3, sp ; third arg = return value address - - ; static unsigned int - ; ffi_closure_SYSV_inner (ffi_closure *closure, char *in_args, void *rvalue) - bl ffi_closure_SYSV_inner - ; a1 now contains the return type code - - ; At this point the return value is on the stack - ; Transfer it to the correct registers if necessary - -; return INT - cmp a1, #FFI_TYPE_INT - ldreq a1, [sp] - beq closure_epilogue - -; return FLOAT - cmp a1, #FFI_TYPE_FLOAT - [ __SOFTFP__ ;ifdef __SOFTFP__ - ldreq a1, [sp] - | ;else - stfeqs f0, [sp] - ] ;endif - beq closure_epilogue - -; return DOUBLE or LONGDOUBLE - cmp a1, #FFI_TYPE_DOUBLE - [ __SOFTFP__ ;ifdef __SOFTFP__ - ldmeqia sp, {a1, a2} - | ;else - stfeqd f0, [sp] - ] ;endif - beq closure_epilogue - -; return SINT64 or UINT64 - cmp a1, #FFI_TYPE_SINT64 - ldmeqia sp, {a1, a2} - -closure_epilogue - add sp, sp, #RESERVE_RETURN ; remove return value buffer - ldmfd sp!, {ip} ; ip = pop return address - add sp, sp, #16 ; remove saved argument registers {a1-a4} from the stack - mov pc, ip ; return - - ENDP ; ffi_closure_SYSV - - END diff --git a/Modules/_ctypes/libffi_msvc/ffi.c b/Modules/_ctypes/libffi_msvc/ffi.c index 91a27dc..1d82929 100644 --- a/Modules/_ctypes/libffi_msvc/ffi.c +++ b/Modules/_ctypes/libffi_msvc/ffi.c @@ -239,16 +239,6 @@ ffi_call(/*@dependent@*/ ffi_cif *cif, break; #else case FFI_SYSV: - /* If a single argument takes more than 8 bytes, - then a copy is passed by reference. */ - for (unsigned i = 0; i < cif->nargs; i++) { - size_t z = cif->arg_types[i]->size; - if (z > 8) { - void *temp = alloca(z); - memcpy(temp, avalue[i], z); - avalue[i] = temp; - } - } /*@-usedef@*/ return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes, cif->flags, ecif.rvalue, fn); diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c index 6c0fda9..716d1e9 100644 --- a/Modules/_ctypes/stgdict.c +++ b/Modules/_ctypes/stgdict.c @@ -489,7 +489,7 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct if (isStruct && !isPacked) { char *fieldfmt = dict->format ? dict->format : "B"; - char *fieldname = _PyUnicode_AsString(name); + char *fieldname = PyUnicode_AsUTF8(name); char *ptr; Py_ssize_t len; char *buf; diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c index 228f497..18ef335 100644 --- a/Modules/_curses_panel.c +++ b/Modules/_curses_panel.c @@ -6,7 +6,7 @@ /* Release Number */ -static char *PyCursesVersion = "2.1"; +static const char PyCursesVersion[] = "2.1"; /* Includes */ @@ -56,7 +56,7 @@ static struct PyModuleDef _curses_panelmodule; */ static PyObject * -PyCursesCheckERR(int code, char *fname) +PyCursesCheckERR(int code, const char *fname) { if (code != ERR) { Py_INCREF(Py_None); diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 0cf17de..3bf2ca7 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -342,11 +342,10 @@ static int PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj, PyObject **bytes, wchar_t **wstr) { - char *str; if (PyUnicode_Check(obj)) { #ifdef HAVE_NCURSESW assert (wstr != NULL); - *wstr = _PyUnicode_AsWideCharString(obj); + *wstr = PyUnicode_AsWideCharString(obj, NULL); if (*wstr == NULL) return 0; return 2; @@ -355,20 +354,12 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj, *bytes = PyUnicode_AsEncodedString(obj, win->encoding, NULL); if (*bytes == NULL) return 0; - /* check for embedded null bytes */ - if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) { - return 0; - } return 1; #endif } else if (PyBytes_Check(obj)) { Py_INCREF(obj); *bytes = obj; - /* check for embedded null bytes */ - if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) { - return 0; - } return 1; } @@ -2316,7 +2307,7 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream) goto error; } - data = _PyObject_CallMethodId(stream, &PyId_read, ""); + data = _PyObject_CallMethodId(stream, &PyId_read, NULL); if (data == NULL) goto error; if (!PyBytes_Check(data)) { diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index f419cb2..c09cce9 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -56,6 +56,7 @@ class datetime.datetime "PyDateTime_DateTime *" "&PyDateTime_DateTimeType" #define DATE_GET_MINUTE PyDateTime_DATE_GET_MINUTE #define DATE_GET_SECOND PyDateTime_DATE_GET_SECOND #define DATE_GET_MICROSECOND PyDateTime_DATE_GET_MICROSECOND +#define DATE_GET_FOLD PyDateTime_DATE_GET_FOLD /* Date accessors for date and datetime. */ #define SET_YEAR(o, v) (((o)->data[0] = ((v) & 0xff00) >> 8), \ @@ -71,12 +72,14 @@ class datetime.datetime "PyDateTime_DateTime *" "&PyDateTime_DateTimeType" (((o)->data[7] = ((v) & 0xff0000) >> 16), \ ((o)->data[8] = ((v) & 0x00ff00) >> 8), \ ((o)->data[9] = ((v) & 0x0000ff))) +#define DATE_SET_FOLD(o, v) (PyDateTime_DATE_GET_FOLD(o) = (v)) /* Time accessors for time. */ #define TIME_GET_HOUR PyDateTime_TIME_GET_HOUR #define TIME_GET_MINUTE PyDateTime_TIME_GET_MINUTE #define TIME_GET_SECOND PyDateTime_TIME_GET_SECOND #define TIME_GET_MICROSECOND PyDateTime_TIME_GET_MICROSECOND +#define TIME_GET_FOLD PyDateTime_TIME_GET_FOLD #define TIME_SET_HOUR(o, v) (PyDateTime_TIME_GET_HOUR(o) = (v)) #define TIME_SET_MINUTE(o, v) (PyDateTime_TIME_GET_MINUTE(o) = (v)) #define TIME_SET_SECOND(o, v) (PyDateTime_TIME_GET_SECOND(o) = (v)) @@ -84,6 +87,7 @@ class datetime.datetime "PyDateTime_DateTime *" "&PyDateTime_DateTimeType" (((o)->data[3] = ((v) & 0xff0000) >> 16), \ ((o)->data[4] = ((v) & 0x00ff00) >> 8), \ ((o)->data[5] = ((v) & 0x0000ff))) +#define TIME_SET_FOLD(o, v) (PyDateTime_TIME_GET_FOLD(o) = (v)) /* Delta accessors for timedelta. */ #define GET_TD_DAYS(o) (((PyDateTime_Delta *)(o))->days) @@ -184,12 +188,12 @@ divide_nearest(PyObject *m, PyObject *n) * and the number of days before that month in the same year. These * are correct for non-leap years only. */ -static int _days_in_month[] = { +static const int _days_in_month[] = { 0, /* unused; this vector uses 1-based indexing */ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -static int _days_before_month[] = { +static const int _days_before_month[] = { 0, /* unused; this vector uses 1-based indexing */ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; @@ -417,7 +421,7 @@ check_date_args(int year, int month, int day) * aren't, raise ValueError and return -1. */ static int -check_time_args(int h, int m, int s, int us) +check_time_args(int h, int m, int s, int us, int fold) { if (h < 0 || h > 23) { PyErr_SetString(PyExc_ValueError, @@ -439,6 +443,11 @@ check_time_args(int h, int m, int s, int us) "microsecond must be in 0..999999"); return -1; } + if (fold != 0 && fold != 1) { + PyErr_SetString(PyExc_ValueError, + "fold must be either 0 or 1"); + return -1; + } return 0; } @@ -674,8 +683,8 @@ new_date_ex(int year, int month, int day, PyTypeObject *type) /* Create a datetime instance with no range checking. */ static PyObject * -new_datetime_ex(int year, int month, int day, int hour, int minute, - int second, int usecond, PyObject *tzinfo, PyTypeObject *type) +new_datetime_ex2(int year, int month, int day, int hour, int minute, + int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type) { PyDateTime_DateTime *self; char aware = tzinfo != Py_None; @@ -692,18 +701,27 @@ new_datetime_ex(int year, int month, int day, int hour, int minute, Py_INCREF(tzinfo); self->tzinfo = tzinfo; } + DATE_SET_FOLD(self, fold); } return (PyObject *)self; } -#define new_datetime(y, m, d, hh, mm, ss, us, tzinfo) \ - new_datetime_ex(y, m, d, hh, mm, ss, us, tzinfo, \ +static PyObject * +new_datetime_ex(int year, int month, int day, int hour, int minute, + int second, int usecond, PyObject *tzinfo, PyTypeObject *type) +{ + return new_datetime_ex2(year, month, day, hour, minute, second, usecond, + tzinfo, 0, type); +} + +#define new_datetime(y, m, d, hh, mm, ss, us, tzinfo, fold) \ + new_datetime_ex2(y, m, d, hh, mm, ss, us, tzinfo, fold, \ &PyDateTime_DateTimeType) /* Create a time instance with no range checking. */ static PyObject * -new_time_ex(int hour, int minute, int second, int usecond, - PyObject *tzinfo, PyTypeObject *type) +new_time_ex2(int hour, int minute, int second, int usecond, + PyObject *tzinfo, int fold, PyTypeObject *type) { PyDateTime_Time *self; char aware = tzinfo != Py_None; @@ -720,12 +738,20 @@ new_time_ex(int hour, int minute, int second, int usecond, Py_INCREF(tzinfo); self->tzinfo = tzinfo; } + TIME_SET_FOLD(self, fold); } return (PyObject *)self; } -#define new_time(hh, mm, ss, us, tzinfo) \ - new_time_ex(hh, mm, ss, us, tzinfo, &PyDateTime_TimeType) +static PyObject * +new_time_ex(int hour, int minute, int second, int usecond, + PyObject *tzinfo, PyTypeObject *type) +{ + return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type); +} + +#define new_time(hh, mm, ss, us, tzinfo, fold) \ + new_time_ex2(hh, mm, ss, us, tzinfo, fold, &PyDateTime_TimeType) /* Create a timedelta instance. Normalize the members iff normalize is * true. Passing false is a speed optimization, if you know for sure @@ -873,7 +899,7 @@ get_tzinfo_member(PyObject *self) * this returns NULL. Else result is returned. */ static PyObject * -call_tzinfo_method(PyObject *tzinfo, char *name, PyObject *tzinfoarg) +call_tzinfo_method(PyObject *tzinfo, const char *name, PyObject *tzinfoarg) { PyObject *offset; @@ -887,10 +913,10 @@ call_tzinfo_method(PyObject *tzinfo, char *name, PyObject *tzinfoarg) if (offset == Py_None || offset == NULL) return offset; if (PyDelta_Check(offset)) { - if (GET_TD_MICROSECONDS(offset) != 0 || GET_TD_SECONDS(offset) % 60 != 0) { + if (GET_TD_MICROSECONDS(offset) != 0) { Py_DECREF(offset); PyErr_Format(PyExc_ValueError, "offset must be a timedelta" - " representing a whole number of minutes"); + " representing a whole number of seconds"); return NULL; } if ((GET_TD_DAYS(offset) == -1 && GET_TD_SECONDS(offset) == 0) || @@ -1002,6 +1028,30 @@ append_keyword_tzinfo(PyObject *repr, PyObject *tzinfo) return repr; } +/* repr is like "someclass(arg1, arg2)". If fold isn't 0, + * stuff + * ", fold=" + repr(tzinfo) + * before the closing ")". + */ +static PyObject * +append_keyword_fold(PyObject *repr, int fold) +{ + PyObject *temp; + + assert(PyUnicode_Check(repr)); + if (fold == 0) + return repr; + /* Get rid of the trailing ')'. */ + assert(PyUnicode_READ_CHAR(repr, PyUnicode_GET_LENGTH(repr)-1) == ')'); + temp = PyUnicode_Substring(repr, 0, PyUnicode_GET_LENGTH(repr) - 1); + Py_DECREF(repr); + if (temp == NULL) + return NULL; + repr = PyUnicode_FromFormat("%U, fold=%d)", temp, fold); + Py_DECREF(temp); + return repr; +} + /* --------------------------------------------------------------------------- * String format helpers. */ @@ -1009,10 +1059,10 @@ append_keyword_tzinfo(PyObject *repr, PyObject *tzinfo) static PyObject * format_ctime(PyDateTime_Date *date, int hours, int minutes, int seconds) { - static const char *DayNames[] = { + static const char * const DayNames[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" }; - static const char *MonthNames[] = { + static const char * const MonthNames[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; @@ -1057,10 +1107,8 @@ format_utcoffset(char *buf, size_t buflen, const char *sep, } /* Offset is normalized, so it is negative if days < 0 */ if (GET_TD_DAYS(offset) < 0) { - PyObject *temp = offset; sign = '-'; - offset = delta_negative((PyDateTime_Delta *)offset); - Py_DECREF(temp); + Py_SETREF(offset, delta_negative((PyDateTime_Delta *)offset)); if (offset == NULL) return -1; } @@ -1072,10 +1120,11 @@ format_utcoffset(char *buf, size_t buflen, const char *sep, Py_DECREF(offset); minutes = divmod(seconds, 60, &seconds); hours = divmod(minutes, 60, &minutes); - assert(seconds == 0); - /* XXX ignore sub-minute data, currently not allowed. */ - PyOS_snprintf(buf, buflen, "%c%02d%s%02d", sign, hours, sep, minutes); - + if (seconds == 0) + PyOS_snprintf(buf, buflen, "%c%02d%s%02d", sign, hours, sep, minutes); + else + PyOS_snprintf(buf, buflen, "%c%02d%s%02d%s%02d", sign, hours, + sep, minutes, sep, seconds); return 0; } @@ -1170,7 +1219,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, assert(object && format && timetuple); assert(PyUnicode_Check(format)); /* Convert the input format to a C string and size */ - pin = _PyUnicode_AsStringAndSize(format, &flen); + pin = PyUnicode_AsUTF8AndSize(format, &flen); if (!pin) return NULL; @@ -1238,7 +1287,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, } assert(Zreplacement != NULL); assert(PyUnicode_Check(Zreplacement)); - ptoappend = _PyUnicode_AsStringAndSize(Zreplacement, + ptoappend = PyUnicode_AsUTF8AndSize(Zreplacement, &ntoappend); if (ptoappend == NULL) goto Done; @@ -1323,7 +1372,7 @@ time_time(void) if (time != NULL) { _Py_IDENTIFIER(time); - result = _PyObject_CallMethodId(time, &PyId_time, "()"); + result = _PyObject_CallMethodId(time, &PyId_time, NULL); Py_DECREF(time); } return result; @@ -2307,7 +2356,7 @@ static PyMethodDef delta_methods[] = { {NULL, NULL}, }; -static char delta_doc[] = +static const char delta_doc[] = PyDoc_STR("Difference between two datetime values."); static PyNumberMethods delta_as_number = { @@ -2462,27 +2511,19 @@ date_new(PyTypeObject *type, PyObject *args, PyObject *kw) static PyObject * date_local_from_object(PyObject *cls, PyObject *obj) { - struct tm *tm; + struct tm tm; time_t t; if (_PyTime_ObjectToTime_t(obj, &t, _PyTime_ROUND_FLOOR) == -1) return NULL; - tm = localtime(&t); - if (tm == NULL) { - /* unconvertible time */ -#ifdef EINVAL - if (errno == 0) - errno = EINVAL; -#endif - PyErr_SetFromErrno(PyExc_OSError); + if (_PyTime_localtime(t, &tm) != 0) return NULL; - } return PyObject_CallFunction(cls, "iii", - tm->tm_year + 1900, - tm->tm_mon + 1, - tm->tm_mday); + tm.tm_year + 1900, + tm.tm_mon + 1, + tm.tm_mday); } /* Return new date from current time. @@ -2648,7 +2689,7 @@ date_isoformat(PyDateTime_Date *self) static PyObject * date_str(PyDateTime_Date *self) { - return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()"); + return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL); } @@ -2674,7 +2715,7 @@ date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw) &format)) return NULL; - tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, "()"); + tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, NULL); if (tuple == NULL) return NULL; result = wrap_strftime((PyObject *)self, format, tuple, @@ -2786,9 +2827,10 @@ static PyObject *date_getstate(PyDateTime_Date *self); static Py_hash_t date_hash(PyDateTime_Date *self) { - if (self->hashcode == -1) + if (self->hashcode == -1) { self->hashcode = generic_hash( (unsigned char *)self->data, _PyDateTime_DATE_DATASIZE); + } return self->hashcode; } @@ -2886,7 +2928,7 @@ static PyMethodDef date_methods[] = { {NULL, NULL} }; -static char date_doc[] = +static const char date_doc[] = PyDoc_STR("date(year, month, day) --> date object"); static PyNumberMethods date_as_number = { @@ -3047,10 +3089,8 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) if (dst == Py_None) goto Inconsistent; if (delta_bool((PyDateTime_Delta *)dst) != 0) { - PyObject *temp = result; - result = add_datetime_timedelta((PyDateTime_DateTime *)result, - (PyDateTime_Delta *)dst, 1); - Py_DECREF(temp); + Py_SETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result, + (PyDateTime_Delta *)dst, 1)); if (result == NULL) goto Fail; } @@ -3080,37 +3120,34 @@ Fail: static PyObject * tzinfo_reduce(PyObject *self) { - PyObject *args, *state, *tmp; + PyObject *args, *state; PyObject *getinitargs, *getstate; _Py_IDENTIFIER(__getinitargs__); _Py_IDENTIFIER(__getstate__); - tmp = PyTuple_New(0); - if (tmp == NULL) - return NULL; - getinitargs = _PyObject_GetAttrId(self, &PyId___getinitargs__); if (getinitargs != NULL) { - args = PyObject_CallObject(getinitargs, tmp); + args = _PyObject_CallNoArg(getinitargs); Py_DECREF(getinitargs); if (args == NULL) { - Py_DECREF(tmp); return NULL; } } else { PyErr_Clear(); - args = tmp; - Py_INCREF(args); + + args = PyTuple_New(0); + if (args == NULL) { + return NULL; + } } getstate = _PyObject_GetAttrId(self, &PyId___getstate__); if (getstate != NULL) { - state = PyObject_CallObject(getstate, tmp); + state = _PyObject_CallNoArg(getstate); Py_DECREF(getstate); if (state == NULL) { Py_DECREF(args); - Py_DECREF(tmp); return NULL; } } @@ -3119,13 +3156,12 @@ tzinfo_reduce(PyObject *self) PyErr_Clear(); state = Py_None; dictptr = _PyObject_GetDictPtr(self); - if (dictptr && *dictptr && PyDict_Size(*dictptr)) + if (dictptr && *dictptr && PyDict_Size(*dictptr)) { state = *dictptr; + } Py_INCREF(state); } - Py_DECREF(tmp); - if (state == Py_None) { Py_DECREF(state); return Py_BuildValue("(ON)", Py_TYPE(self), args); @@ -3155,7 +3191,7 @@ static PyMethodDef tzinfo_methods[] = { {NULL, NULL} }; -static char tzinfo_doc[] = +static const char tzinfo_doc[] = PyDoc_STR("Abstract base class for time zone info objects."); static PyTypeObject PyDateTime_TZInfoType = { @@ -3287,6 +3323,11 @@ timezone_str(PyDateTime_TimeZone *self) Py_INCREF(self->name); return self->name; } + if ((PyObject *)self == PyDateTime_TimeZone_UTC || + (GET_TD_DAYS(self->offset) == 0 && + GET_TD_SECONDS(self->offset) == 0 && + GET_TD_MICROSECONDS(self->offset) == 0)) + return PyUnicode_FromString("UTC"); /* Offset is normalized, so it is negative if days < 0 */ if (GET_TD_DAYS(self->offset) < 0) { sign = '-'; @@ -3382,7 +3423,7 @@ static PyMethodDef timezone_methods[] = { {NULL, NULL} }; -static char timezone_doc[] = +static const char timezone_doc[] = PyDoc_STR("Fixed offset from UTC implementation of tzinfo."); static PyTypeObject PyDateTime_TimeZoneType = { @@ -3466,12 +3507,19 @@ time_tzinfo(PyDateTime_Time *self, void *unused) return result; } +static PyObject * +time_fold(PyDateTime_Time *self, void *unused) +{ + return PyLong_FromLong(TIME_GET_FOLD(self)); +} + static PyGetSetDef time_getset[] = { {"hour", (getter)time_hour}, {"minute", (getter)time_minute}, {"second", (getter)py_time_second}, {"microsecond", (getter)time_microsecond}, - {"tzinfo", (getter)time_tzinfo}, + {"tzinfo", (getter)time_tzinfo}, + {"fold", (getter)time_fold}, {NULL} }; @@ -3480,7 +3528,7 @@ static PyGetSetDef time_getset[] = { */ static char *time_kws[] = {"hour", "minute", "second", "microsecond", - "tzinfo", NULL}; + "tzinfo", "fold", NULL}; static PyObject * time_new(PyTypeObject *type, PyObject *args, PyObject *kw) @@ -3492,13 +3540,14 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw) int second = 0; int usecond = 0; PyObject *tzinfo = Py_None; + int fold = 0; /* Check for invocation from pickle with __getstate__ state */ if (PyTuple_GET_SIZE(args) >= 1 && PyTuple_GET_SIZE(args) <= 2 && PyBytes_Check(state = PyTuple_GET_ITEM(args, 0)) && PyBytes_GET_SIZE(state) == _PyDateTime_TIME_DATASIZE && - ((unsigned char) (PyBytes_AS_STRING(state)[0])) < 24) + (0x7F & ((unsigned char) (PyBytes_AS_STRING(state)[0]))) < 24) { PyDateTime_Time *me; char aware; @@ -3523,19 +3572,26 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw) Py_INCREF(tzinfo); me->tzinfo = tzinfo; } + if (pdata[0] & (1 << 7)) { + me->data[0] -= 128; + me->fold = 1; + } + else { + me->fold = 0; + } } return (PyObject *)me; } - if (PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO", time_kws, + if (PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO$i", time_kws, &hour, &minute, &second, &usecond, - &tzinfo)) { - if (check_time_args(hour, minute, second, usecond) < 0) + &tzinfo, &fold)) { + if (check_time_args(hour, minute, second, usecond, fold) < 0) return NULL; if (check_tzinfo_subclass(tzinfo) < 0) return NULL; - self = new_time_ex(hour, minute, second, usecond, tzinfo, - type); + self = new_time_ex2(hour, minute, second, usecond, tzinfo, fold, + type); } return self; } @@ -3585,6 +3641,7 @@ time_repr(PyDateTime_Time *self) int m = TIME_GET_MINUTE(self); int s = TIME_GET_SECOND(self); int us = TIME_GET_MICROSECOND(self); + int fold = TIME_GET_FOLD(self); PyObject *result = NULL; if (us) @@ -3597,33 +3654,68 @@ time_repr(PyDateTime_Time *self) result = PyUnicode_FromFormat("%s(%d, %d)", type_name, h, m); if (result != NULL && HASTZINFO(self)) result = append_keyword_tzinfo(result, self->tzinfo); + if (result != NULL && fold) + result = append_keyword_fold(result, fold); return result; } static PyObject * time_str(PyDateTime_Time *self) { - return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, "()"); + return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL); } static PyObject * -time_isoformat(PyDateTime_Time *self, PyObject *unused) +time_isoformat(PyDateTime_Time *self, PyObject *args, PyObject *kw) { char buf[100]; + char *timespec = NULL; + static char *keywords[] = {"timespec", NULL}; PyObject *result; int us = TIME_GET_MICROSECOND(self); + static char *specs[][2] = { + {"hours", "%02d"}, + {"minutes", "%02d:%02d"}, + {"seconds", "%02d:%02d:%02d"}, + {"milliseconds", "%02d:%02d:%02d.%03d"}, + {"microseconds", "%02d:%02d:%02d.%06d"}, + }; + size_t given_spec; - if (us) - result = PyUnicode_FromFormat("%02d:%02d:%02d.%06d", - TIME_GET_HOUR(self), - TIME_GET_MINUTE(self), - TIME_GET_SECOND(self), - us); - else - result = PyUnicode_FromFormat("%02d:%02d:%02d", - TIME_GET_HOUR(self), - TIME_GET_MINUTE(self), - TIME_GET_SECOND(self)); + if (!PyArg_ParseTupleAndKeywords(args, kw, "|s:isoformat", keywords, ×pec)) + return NULL; + + if (timespec == NULL || strcmp(timespec, "auto") == 0) { + if (us == 0) { + /* seconds */ + given_spec = 2; + } + else { + /* microseconds */ + given_spec = 4; + } + } + else { + for (given_spec = 0; given_spec < Py_ARRAY_LENGTH(specs); given_spec++) { + if (strcmp(timespec, specs[given_spec][0]) == 0) { + if (given_spec == 3) { + /* milliseconds */ + us = us / 1000; + } + break; + } + } + } + + if (given_spec == Py_ARRAY_LENGTH(specs)) { + PyErr_Format(PyExc_ValueError, "Unknown timespec value"); + return NULL; + } + else { + result = PyUnicode_FromFormat(specs[given_spec][1], + TIME_GET_HOUR(self), TIME_GET_MINUTE(self), + TIME_GET_SECOND(self), us); + } if (result == NULL || !HASTZINFO(self) || self->tzinfo == Py_None) return result; @@ -3750,9 +3842,23 @@ static Py_hash_t time_hash(PyDateTime_Time *self) { if (self->hashcode == -1) { - PyObject *offset; - - offset = time_utcoffset((PyObject *)self, NULL); + PyObject *offset, *self0; + if (DATE_GET_FOLD(self)) { + self0 = new_time_ex2(DATE_GET_HOUR(self), + DATE_GET_MINUTE(self), + DATE_GET_SECOND(self), + DATE_GET_MICROSECOND(self), + HASTZINFO(self) ? self->tzinfo : Py_None, + 0, Py_TYPE(self)); + if (self0 == NULL) + return -1; + } + else { + self0 = (PyObject *)self; + Py_INCREF(self0); + } + offset = time_utcoffset(self0, NULL); + Py_DECREF(self0); if (offset == NULL) return -1; @@ -3798,15 +3904,24 @@ time_replace(PyDateTime_Time *self, PyObject *args, PyObject *kw) int ss = TIME_GET_SECOND(self); int us = TIME_GET_MICROSECOND(self); PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None; + int fold = TIME_GET_FOLD(self); - if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO:replace", + if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO$i:replace", time_kws, - &hh, &mm, &ss, &us, &tzinfo)) + &hh, &mm, &ss, &us, &tzinfo, &fold)) return NULL; tuple = Py_BuildValue("iiiiO", hh, mm, ss, us, tzinfo); if (tuple == NULL) return NULL; clone = time_new(Py_TYPE(self), tuple, NULL); + if (clone != NULL) { + if (fold != 0 && fold != 1) { + PyErr_SetString(PyExc_ValueError, + "fold must be either 0 or 1"); + return NULL; + } + TIME_SET_FOLD(clone, fold); + } Py_DECREF(tuple); return clone; } @@ -3819,7 +3934,7 @@ time_replace(PyDateTime_Time *self, PyObject *args, PyObject *kw) * __getstate__ isn't exposed. */ static PyObject * -time_getstate(PyDateTime_Time *self) +time_getstate(PyDateTime_Time *self, int proto) { PyObject *basestate; PyObject *result = NULL; @@ -3827,6 +3942,9 @@ time_getstate(PyDateTime_Time *self) basestate = PyBytes_FromStringAndSize((char *)self->data, _PyDateTime_TIME_DATASIZE); if (basestate != NULL) { + if (proto > 3 && TIME_GET_FOLD(self)) + /* Set the first bit of the first byte */ + PyBytes_AS_STRING(basestate)[0] |= (1 << 7); if (! HASTZINFO(self) || self->tzinfo == Py_None) result = PyTuple_Pack(1, basestate); else @@ -3837,16 +3955,27 @@ time_getstate(PyDateTime_Time *self) } static PyObject * +time_reduce_ex(PyDateTime_Time *self, PyObject *args) +{ + int proto; + if (!PyArg_ParseTuple(args, "i:__reduce_ex__", &proto)) + return NULL; + + return Py_BuildValue("(ON)", Py_TYPE(self), time_getstate(self, proto)); +} + +static PyObject * time_reduce(PyDateTime_Time *self, PyObject *arg) { - return Py_BuildValue("(ON)", Py_TYPE(self), time_getstate(self)); + return Py_BuildValue("(ON)", Py_TYPE(self), time_getstate(self, 2)); } static PyMethodDef time_methods[] = { - {"isoformat", (PyCFunction)time_isoformat, METH_NOARGS, - PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]" - "[+HH:MM].")}, + {"isoformat", (PyCFunction)time_isoformat, METH_VARARGS | METH_KEYWORDS, + PyDoc_STR("Return string in ISO 8601 format, [HH[:MM[:SS[.mmm[uuu]]]]]" + "[+HH:MM].\n\n" + "timespec specifies what components of the time to include.\n")}, {"strftime", (PyCFunction)time_strftime, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("format -> strftime() style string.")}, @@ -3866,13 +3995,16 @@ static PyMethodDef time_methods[] = { {"replace", (PyCFunction)time_replace, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("Return time with new specified fields.")}, + {"__reduce_ex__", (PyCFunction)time_reduce_ex, METH_VARARGS, + PyDoc_STR("__reduce_ex__(proto) -> (cls, state)")}, + {"__reduce__", (PyCFunction)time_reduce, METH_NOARGS, PyDoc_STR("__reduce__() -> (cls, state)")}, {NULL, NULL} }; -static char time_doc[] = +static const char time_doc[] = PyDoc_STR("time([hour[, minute[, second[, microsecond[, tzinfo]]]]]) --> a time object\n\ \n\ All arguments are optional. tzinfo may be None, or an instance of\n\ @@ -3960,12 +4092,19 @@ datetime_tzinfo(PyDateTime_DateTime *self, void *unused) return result; } +static PyObject * +datetime_fold(PyDateTime_DateTime *self, void *unused) +{ + return PyLong_FromLong(DATE_GET_FOLD(self)); +} + static PyGetSetDef datetime_getset[] = { {"hour", (getter)datetime_hour}, {"minute", (getter)datetime_minute}, {"second", (getter)datetime_second}, {"microsecond", (getter)datetime_microsecond}, - {"tzinfo", (getter)datetime_tzinfo}, + {"tzinfo", (getter)datetime_tzinfo}, + {"fold", (getter)datetime_fold}, {NULL} }; @@ -3975,7 +4114,7 @@ static PyGetSetDef datetime_getset[] = { static char *datetime_kws[] = { "year", "month", "day", "hour", "minute", "second", - "microsecond", "tzinfo", NULL + "microsecond", "tzinfo", "fold", NULL }; static PyObject * @@ -3990,6 +4129,7 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw) int minute = 0; int second = 0; int usecond = 0; + int fold = 0; PyObject *tzinfo = Py_None; /* Check for invocation from pickle with __getstate__ state */ @@ -3997,7 +4137,7 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw) PyTuple_GET_SIZE(args) <= 2 && PyBytes_Check(state = PyTuple_GET_ITEM(args, 0)) && PyBytes_GET_SIZE(state) == _PyDateTime_DATETIME_DATASIZE && - MONTH_IS_SANE(PyBytes_AS_STRING(state)[2])) + MONTH_IS_SANE(PyBytes_AS_STRING(state)[2] & 0x7F)) { PyDateTime_DateTime *me; char aware; @@ -4022,28 +4162,73 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw) Py_INCREF(tzinfo); me->tzinfo = tzinfo; } + if (pdata[2] & (1 << 7)) { + me->data[2] -= 128; + me->fold = 1; + } + else { + me->fold = 0; + } } return (PyObject *)me; } - if (PyArg_ParseTupleAndKeywords(args, kw, "iii|iiiiO", datetime_kws, + if (PyArg_ParseTupleAndKeywords(args, kw, "iii|iiiiO$i", datetime_kws, &year, &month, &day, &hour, &minute, - &second, &usecond, &tzinfo)) { + &second, &usecond, &tzinfo, &fold)) { if (check_date_args(year, month, day) < 0) return NULL; - if (check_time_args(hour, minute, second, usecond) < 0) + if (check_time_args(hour, minute, second, usecond, fold) < 0) return NULL; if (check_tzinfo_subclass(tzinfo) < 0) return NULL; - self = new_datetime_ex(year, month, day, + self = new_datetime_ex2(year, month, day, hour, minute, second, usecond, - tzinfo, type); + tzinfo, fold, type); } return self; } -/* TM_FUNC is the shared type of localtime() and gmtime(). */ -typedef struct tm *(*TM_FUNC)(const time_t *timer); +/* TM_FUNC is the shared type of _PyTime_localtime() and + * _PyTime_gmtime(). */ +typedef int (*TM_FUNC)(time_t timer, struct tm*); + +/* As of version 2015f max fold in IANA database is + * 23 hours at 1969-09-30 13:00:00 in Kwajalein. */ +static long long max_fold_seconds = 24 * 3600; +/* NB: date(1970,1,1).toordinal() == 719163 */ +static long long epoch = 719163LL * 24 * 60 * 60; + +static long long +utc_to_seconds(int year, int month, int day, + int hour, int minute, int second) +{ + long long ordinal = ymd_to_ord(year, month, day); + return ((ordinal * 24 + hour) * 60 + minute) * 60 + second; +} + +static long long +local(long long u) +{ + struct tm local_time; + time_t t; + u -= epoch; + t = u; + if (t != u) { + PyErr_SetString(PyExc_OverflowError, + "timestamp out of range for platform time_t"); + return -1; + } + /* XXX: add bounds checking */ + if (_PyTime_localtime(t, &local_time) != 0) + return -1; + return utc_to_seconds(local_time.tm_year + 1900, + local_time.tm_mon + 1, + local_time.tm_mday, + local_time.tm_hour, + local_time.tm_min, + local_time.tm_sec); +} /* Internal helper. * Build datetime from a time_t and a distinct count of microseconds. @@ -4053,72 +4238,46 @@ static PyObject * datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us, PyObject *tzinfo) { - struct tm *tm; + struct tm tm; + int year, month, day, hour, minute, second, fold = 0; - tm = f(&timet); - if (tm == NULL) { -#ifdef EINVAL - if (errno == 0) - errno = EINVAL; -#endif - return PyErr_SetFromErrno(PyExc_OSError); - } + if (f(timet, &tm) != 0) + return NULL; + year = tm.tm_year + 1900; + month = tm.tm_mon + 1; + day = tm.tm_mday; + hour = tm.tm_hour; + minute = tm.tm_min; /* The platform localtime/gmtime may insert leap seconds, - * indicated by tm->tm_sec > 59. We don't care about them, + * indicated by tm.tm_sec > 59. We don't care about them, * except to the extent that passing them on to the datetime * constructor would raise ValueError for a reason that * made no sense to the user. */ - if (tm->tm_sec > 59) - tm->tm_sec = 59; - return PyObject_CallFunction(cls, "iiiiiiiO", - tm->tm_year + 1900, - tm->tm_mon + 1, - tm->tm_mday, - tm->tm_hour, - tm->tm_min, - tm->tm_sec, - us, - tzinfo); -} - -static time_t -_PyTime_DoubleToTimet(double x) -{ - time_t result; - double diff; - - result = (time_t)x; - /* How much info did we lose? time_t may be an integral or - * floating type, and we don't know which. If it's integral, - * we don't know whether C truncates, rounds, returns the floor, - * etc. If we lost a second or more, the C rounding is - * unreasonable, or the input just doesn't fit in a time_t; - * call it an error regardless. Note that the original cast to - * time_t can cause a C error too, but nothing we can do to - * worm around that. - */ - diff = x - (double)result; - if (diff <= -1.0 || diff >= 1.0) { - PyErr_SetString(PyExc_OverflowError, - "timestamp out of range for platform time_t"); - result = (time_t)-1; - } - return result; -} + second = Py_MIN(59, tm.tm_sec); -/* Round a double to the nearest long. |x| must be small enough to fit - * in a C long; this is not checked. - */ -static double -_PyTime_RoundHalfEven(double x) -{ - double rounded = round(x); - if (fabs(x-rounded) == 0.5) - /* halfway case: round to even */ - rounded = 2.0*round(x/2.0); - return rounded; + if (tzinfo == Py_None && f == _PyTime_localtime) { + long long probe_seconds, result_seconds, transition; + + result_seconds = utc_to_seconds(year, month, day, + hour, minute, second); + /* Probe max_fold_seconds to detect a fold. */ + probe_seconds = local(epoch + timet - max_fold_seconds); + if (probe_seconds == -1) + return NULL; + transition = result_seconds - probe_seconds - max_fold_seconds; + if (transition < 0) { + probe_seconds = local(epoch + timet + transition); + if (probe_seconds == -1) + return NULL; + if (probe_seconds == result_seconds) + fold = 1; + } + } + return new_datetime_ex2(year, month, day, hour, + minute, second, us, tzinfo, fold, + (PyTypeObject *)cls); } /* Internal helper. @@ -4129,32 +4288,17 @@ _PyTime_RoundHalfEven(double x) * to get that much precision (e.g., C time() isn't good enough). */ static PyObject * -datetime_from_timestamp(PyObject *cls, TM_FUNC f, double timestamp, +datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp, PyObject *tzinfo) { time_t timet; - double fraction; - int us; + long us; - timet = _PyTime_DoubleToTimet(timestamp); - if (timet == (time_t)-1 && PyErr_Occurred()) + if (_PyTime_ObjectToTimeval(timestamp, + &timet, &us, _PyTime_ROUND_HALF_EVEN) == -1) return NULL; - fraction = timestamp - (double)timet; - us = (int)_PyTime_RoundHalfEven(fraction * 1e6); - if (us < 0) { - /* Truncation towards zero is not what we wanted - for negative numbers (Python's mod semantics) */ - timet -= 1; - us += 1000000; - } - /* If timestamp is less than one microsecond smaller than a - * full second, round up. Otherwise, ValueErrors are raised - * for some floats. */ - if (us == 1000000) { - timet += 1; - us = 0; - } - return datetime_from_timet_and_us(cls, f, timet, us, tzinfo); + + return datetime_from_timet_and_us(cls, f, timet, (int)us, tzinfo); } /* Internal helper. @@ -4201,14 +4345,12 @@ datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz) return NULL; self = datetime_best_possible((PyObject *)type, - tz == Py_None ? localtime : gmtime, + tz == Py_None ? _PyTime_localtime : + _PyTime_gmtime, tz); if (self != NULL && tz != Py_None) { /* Convert UTC to tzinfo's zone. */ - PyObject *temp = self; - - self = _PyObject_CallMethodId(tz, &PyId_fromutc, "O", self); - Py_DECREF(temp); + self = _PyObject_CallMethodId(tz, &PyId_fromutc, "N", self); } return self; } @@ -4219,7 +4361,7 @@ datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz) static PyObject * datetime_utcnow(PyObject *cls, PyObject *dummy) { - return datetime_best_possible(cls, gmtime, Py_None); + return datetime_best_possible(cls, _PyTime_gmtime, Py_None); } /* Return new local datetime from timestamp (Python timestamp -- a double). */ @@ -4227,26 +4369,24 @@ static PyObject * datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw) { PyObject *self; - double timestamp; + PyObject *timestamp; PyObject *tzinfo = Py_None; static char *keywords[] = {"timestamp", "tz", NULL}; - if (! PyArg_ParseTupleAndKeywords(args, kw, "d|O:fromtimestamp", + if (! PyArg_ParseTupleAndKeywords(args, kw, "O|O:fromtimestamp", keywords, ×tamp, &tzinfo)) return NULL; if (check_tzinfo_subclass(tzinfo) < 0) return NULL; self = datetime_from_timestamp(cls, - tzinfo == Py_None ? localtime : gmtime, + tzinfo == Py_None ? _PyTime_localtime : + _PyTime_gmtime, timestamp, tzinfo); if (self != NULL && tzinfo != Py_None) { /* Convert UTC to tzinfo's zone. */ - PyObject *temp = self; - - self = _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", self); - Py_DECREF(temp); + self = _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "N", self); } return self; } @@ -4255,11 +4395,11 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw) static PyObject * datetime_utcfromtimestamp(PyObject *cls, PyObject *args) { - double timestamp; + PyObject *timestamp; PyObject *result = NULL; - if (PyArg_ParseTuple(args, "d:utcfromtimestamp", ×tamp)) - result = datetime_from_timestamp(cls, gmtime, timestamp, + if (PyArg_ParseTuple(args, "O:utcfromtimestamp", ×tamp)) + result = datetime_from_timestamp(cls, _PyTime_gmtime, timestamp, Py_None); return result; } @@ -4288,27 +4428,32 @@ datetime_strptime(PyObject *cls, PyObject *args) static PyObject * datetime_combine(PyObject *cls, PyObject *args, PyObject *kw) { - static char *keywords[] = {"date", "time", NULL}; + static char *keywords[] = {"date", "time", "tzinfo", NULL}; PyObject *date; PyObject *time; + PyObject *tzinfo = NULL; PyObject *result = NULL; - if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!:combine", keywords, + if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!|O:combine", keywords, &PyDateTime_DateType, &date, - &PyDateTime_TimeType, &time)) { - PyObject *tzinfo = Py_None; - - if (HASTZINFO(time)) - tzinfo = ((PyDateTime_Time *)time)->tzinfo; + &PyDateTime_TimeType, &time, &tzinfo)) { + if (tzinfo == NULL) { + if (HASTZINFO(time)) + tzinfo = ((PyDateTime_Time *)time)->tzinfo; + else + tzinfo = Py_None; + } result = PyObject_CallFunction(cls, "iiiiiiiO", - GET_YEAR(date), - GET_MONTH(date), - GET_DAY(date), - TIME_GET_HOUR(time), - TIME_GET_MINUTE(time), - TIME_GET_SECOND(time), - TIME_GET_MICROSECOND(time), - tzinfo); + GET_YEAR(date), + GET_MONTH(date), + GET_DAY(date), + TIME_GET_HOUR(time), + TIME_GET_MINUTE(time), + TIME_GET_SECOND(time), + TIME_GET_MICROSECOND(time), + tzinfo); + if (result) + DATE_SET_FOLD(result, TIME_GET_FOLD(time)); } return result; } @@ -4376,7 +4521,7 @@ add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta, else return new_datetime(year, month, day, hour, minute, second, microsecond, - HASTZINFO(date) ? date->tzinfo : Py_None); + HASTZINFO(date) ? date->tzinfo : Py_None, 0); } static PyObject * @@ -4469,9 +4614,7 @@ datetime_subtract(PyObject *left, PyObject *right) return NULL; if (offdiff != NULL) { - PyObject *temp = result; - result = delta_subtract(result, offdiff); - Py_DECREF(temp); + Py_SETREF(result, delta_subtract(result, offdiff)); Py_DECREF(offdiff); } } @@ -4521,6 +4664,8 @@ datetime_repr(PyDateTime_DateTime *self) GET_YEAR(self), GET_MONTH(self), GET_DAY(self), DATE_GET_HOUR(self), DATE_GET_MINUTE(self)); } + if (baserepr != NULL && DATE_GET_FOLD(self) != 0) + baserepr = append_keyword_fold(baserepr, DATE_GET_FOLD(self)); if (baserepr == NULL || ! HASTZINFO(self)) return baserepr; return append_keyword_tzinfo(baserepr, self->tzinfo); @@ -4536,25 +4681,55 @@ static PyObject * datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) { int sep = 'T'; - static char *keywords[] = {"sep", NULL}; + char *timespec = NULL; + static char *keywords[] = {"sep", "timespec", NULL}; char buffer[100]; - PyObject *result; + PyObject *result = NULL; int us = DATE_GET_MICROSECOND(self); + static char *specs[][2] = { + {"hours", "%04d-%02d-%02d%c%02d"}, + {"minutes", "%04d-%02d-%02d%c%02d:%02d"}, + {"seconds", "%04d-%02d-%02d%c%02d:%02d:%02d"}, + {"milliseconds", "%04d-%02d-%02d%c%02d:%02d:%02d.%03d"}, + {"microseconds", "%04d-%02d-%02d%c%02d:%02d:%02d.%06d"}, + }; + size_t given_spec; - if (!PyArg_ParseTupleAndKeywords(args, kw, "|C:isoformat", keywords, &sep)) + if (!PyArg_ParseTupleAndKeywords(args, kw, "|Cs:isoformat", keywords, &sep, ×pec)) return NULL; - if (us) - result = PyUnicode_FromFormat("%04d-%02d-%02d%c%02d:%02d:%02d.%06d", + + if (timespec == NULL || strcmp(timespec, "auto") == 0) { + if (us == 0) { + /* seconds */ + given_spec = 2; + } + else { + /* microseconds */ + given_spec = 4; + } + } + else { + for (given_spec = 0; given_spec < Py_ARRAY_LENGTH(specs); given_spec++) { + if (strcmp(timespec, specs[given_spec][0]) == 0) { + if (given_spec == 3) { + us = us / 1000; + } + break; + } + } + } + + if (given_spec == Py_ARRAY_LENGTH(specs)) { + PyErr_Format(PyExc_ValueError, "Unknown timespec value"); + return NULL; + } + else { + result = PyUnicode_FromFormat(specs[given_spec][1], GET_YEAR(self), GET_MONTH(self), GET_DAY(self), (int)sep, DATE_GET_HOUR(self), DATE_GET_MINUTE(self), DATE_GET_SECOND(self), us); - else - result = PyUnicode_FromFormat("%04d-%02d-%02d%c%02d:%02d:%02d", - GET_YEAR(self), GET_MONTH(self), - GET_DAY(self), (int)sep, - DATE_GET_HOUR(self), DATE_GET_MINUTE(self), - DATE_GET_SECOND(self)); + } if (!result || !HASTZINFO(self)) return result; @@ -4581,6 +4756,70 @@ datetime_ctime(PyDateTime_DateTime *self) /* Miscellaneous methods. */ static PyObject * +flip_fold(PyObject *dt) +{ + return new_datetime_ex2(GET_YEAR(dt), + GET_MONTH(dt), + GET_DAY(dt), + DATE_GET_HOUR(dt), + DATE_GET_MINUTE(dt), + DATE_GET_SECOND(dt), + DATE_GET_MICROSECOND(dt), + HASTZINFO(dt) ? + ((PyDateTime_DateTime *)dt)->tzinfo : Py_None, + !DATE_GET_FOLD(dt), + Py_TYPE(dt)); +} + +static PyObject * +get_flip_fold_offset(PyObject *dt) +{ + PyObject *result, *flip_dt; + + flip_dt = flip_fold(dt); + if (flip_dt == NULL) + return NULL; + result = datetime_utcoffset(flip_dt, NULL); + Py_DECREF(flip_dt); + return result; +} + +/* PEP 495 exception: Whenever one or both of the operands in + * inter-zone comparison is such that its utcoffset() depends + * on the value of its fold fold attribute, the result is False. + * + * Return 1 if exception applies, 0 if not, and -1 on error. + */ +static int +pep495_eq_exception(PyObject *self, PyObject *other, + PyObject *offset_self, PyObject *offset_other) +{ + int result = 0; + PyObject *flip_offset; + + flip_offset = get_flip_fold_offset(self); + if (flip_offset == NULL) + return -1; + if (flip_offset != offset_self && + delta_cmp(flip_offset, offset_self)) + { + result = 1; + goto done; + } + Py_DECREF(flip_offset); + + flip_offset = get_flip_fold_offset(other); + if (flip_offset == NULL) + return -1; + if (flip_offset != offset_other && + delta_cmp(flip_offset, offset_other)) + result = 1; + done: + Py_DECREF(flip_offset); + return result; +} + +static PyObject * datetime_richcompare(PyObject *self, PyObject *other, int op) { PyObject *result = NULL; @@ -4627,6 +4866,13 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) diff = memcmp(((PyDateTime_DateTime *)self)->data, ((PyDateTime_DateTime *)other)->data, _PyDateTime_DATETIME_DATASIZE); + if ((op == Py_EQ || op == Py_NE) && diff == 0) { + int ex = pep495_eq_exception(self, other, offset1, offset2); + if (ex == -1) + goto done; + if (ex) + diff = 1; + } result = diff_to_bool(diff, op); } else if (offset1 != Py_None && offset2 != Py_None) { @@ -4642,6 +4888,13 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) diff = GET_TD_SECONDS(delta) | GET_TD_MICROSECONDS(delta); Py_DECREF(delta); + if ((op == Py_EQ || op == Py_NE) && diff == 0) { + int ex = pep495_eq_exception(self, other, offset1, offset2); + if (ex == -1) + goto done; + if (ex) + diff = 1; + } result = diff_to_bool(diff, op); } else if (op == Py_EQ) { @@ -4667,9 +4920,26 @@ static Py_hash_t datetime_hash(PyDateTime_DateTime *self) { if (self->hashcode == -1) { - PyObject *offset; - - offset = datetime_utcoffset((PyObject *)self, NULL); + PyObject *offset, *self0; + if (DATE_GET_FOLD(self)) { + self0 = new_datetime_ex2(GET_YEAR(self), + GET_MONTH(self), + GET_DAY(self), + DATE_GET_HOUR(self), + DATE_GET_MINUTE(self), + DATE_GET_SECOND(self), + DATE_GET_MICROSECOND(self), + HASTZINFO(self) ? self->tzinfo : Py_None, + 0, Py_TYPE(self)); + if (self0 == NULL) + return -1; + } + else { + self0 = (PyObject *)self; + Py_INCREF(self0); + } + offset = datetime_utcoffset(self0, NULL); + Py_DECREF(self0); if (offset == NULL) return -1; @@ -4723,76 +4993,80 @@ datetime_replace(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) int ss = DATE_GET_SECOND(self); int us = DATE_GET_MICROSECOND(self); PyObject *tzinfo = HASTZINFO(self) ? self->tzinfo : Py_None; + int fold = DATE_GET_FOLD(self); - if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiiiiO:replace", + if (! PyArg_ParseTupleAndKeywords(args, kw, "|iiiiiiiO$i:replace", datetime_kws, &y, &m, &d, &hh, &mm, &ss, &us, - &tzinfo)) + &tzinfo, &fold)) return NULL; tuple = Py_BuildValue("iiiiiiiO", y, m, d, hh, mm, ss, us, tzinfo); if (tuple == NULL) return NULL; clone = datetime_new(Py_TYPE(self), tuple, NULL); + + if (clone != NULL) { + if (fold != 0 && fold != 1) { + PyErr_SetString(PyExc_ValueError, + "fold must be either 0 or 1"); + return NULL; + } + DATE_SET_FOLD(clone, fold); + } Py_DECREF(tuple); return clone; } static PyObject * -local_timezone(PyDateTime_DateTime *utc_time) +local_timezone_from_timestamp(time_t timestamp) { PyObject *result = NULL; - struct tm *timep; - time_t timestamp; PyObject *delta; - PyObject *one_second; - PyObject *seconds; + struct tm local_time_tm; PyObject *nameo = NULL; const char *zone = NULL; - delta = new_delta(ymd_to_ord(GET_YEAR(utc_time), GET_MONTH(utc_time), - GET_DAY(utc_time)) - 719163, - 60 * (60 * DATE_GET_HOUR(utc_time) + - DATE_GET_MINUTE(utc_time)) + - DATE_GET_SECOND(utc_time), - 0, 0); - if (delta == NULL) + if (_PyTime_localtime(timestamp, &local_time_tm) != 0) return NULL; - one_second = new_delta(0, 1, 0, 0); - if (one_second == NULL) - goto error; - seconds = divide_timedelta_timedelta((PyDateTime_Delta *)delta, - (PyDateTime_Delta *)one_second); - Py_DECREF(one_second); - if (seconds == NULL) - goto error; - Py_DECREF(delta); - timestamp = PyLong_AsLong(seconds); - Py_DECREF(seconds); - if (timestamp == -1 && PyErr_Occurred()) - return NULL; - timep = localtime(×tamp); #ifdef HAVE_STRUCT_TM_TM_ZONE - zone = timep->tm_zone; - delta = new_delta(0, timep->tm_gmtoff, 0, 1); + zone = local_time_tm.tm_zone; + delta = new_delta(0, local_time_tm.tm_gmtoff, 0, 1); #else /* HAVE_STRUCT_TM_TM_ZONE */ { - PyObject *local_time; - local_time = new_datetime(timep->tm_year + 1900, timep->tm_mon + 1, - timep->tm_mday, timep->tm_hour, timep->tm_min, - timep->tm_sec, DATE_GET_MICROSECOND(utc_time), - utc_time->tzinfo); - if (local_time == NULL) - goto error; - delta = datetime_subtract(local_time, (PyObject*)utc_time); - /* XXX: before relying on tzname, we should compare delta - to the offset implied by timezone/altzone */ - if (daylight && timep->tm_isdst >= 0) - zone = tzname[timep->tm_isdst % 2]; - else - zone = tzname[0]; + PyObject *local_time, *utc_time; + struct tm utc_time_tm; + char buf[100]; + strftime(buf, sizeof(buf), "%Z", &local_time_tm); + zone = buf; + local_time = new_datetime(local_time_tm.tm_year + 1900, + local_time_tm.tm_mon + 1, + local_time_tm.tm_mday, + local_time_tm.tm_hour, + local_time_tm.tm_min, + local_time_tm.tm_sec, 0, Py_None, 0); + if (local_time == NULL) { + return NULL; + } + if (_PyTime_gmtime(timestamp, &utc_time_tm) != 0) + return NULL; + utc_time = new_datetime(utc_time_tm.tm_year + 1900, + utc_time_tm.tm_mon + 1, + utc_time_tm.tm_mday, + utc_time_tm.tm_hour, + utc_time_tm.tm_min, + utc_time_tm.tm_sec, 0, Py_None, 0); + if (utc_time == NULL) { + Py_DECREF(local_time); + return NULL; + } + delta = datetime_subtract(local_time, utc_time); Py_DECREF(local_time); + Py_DECREF(utc_time); } #endif /* HAVE_STRUCT_TM_TM_ZONE */ + if (delta == NULL) { + return NULL; + } if (zone != NULL) { nameo = PyUnicode_DecodeLocale(zone, "surrogateescape"); if (nameo == NULL) @@ -4805,12 +5079,65 @@ local_timezone(PyDateTime_DateTime *utc_time) return result; } +static PyObject * +local_timezone(PyDateTime_DateTime *utc_time) +{ + time_t timestamp; + PyObject *delta; + PyObject *one_second; + PyObject *seconds; + + delta = datetime_subtract((PyObject *)utc_time, PyDateTime_Epoch); + if (delta == NULL) + return NULL; + one_second = new_delta(0, 1, 0, 0); + if (one_second == NULL) { + Py_DECREF(delta); + return NULL; + } + seconds = divide_timedelta_timedelta((PyDateTime_Delta *)delta, + (PyDateTime_Delta *)one_second); + Py_DECREF(one_second); + Py_DECREF(delta); + if (seconds == NULL) + return NULL; + timestamp = _PyLong_AsTime_t(seconds); + Py_DECREF(seconds); + if (timestamp == -1 && PyErr_Occurred()) + return NULL; + return local_timezone_from_timestamp(timestamp); +} + +static long long +local_to_seconds(int year, int month, int day, + int hour, int minute, int second, int fold); + +static PyObject * +local_timezone_from_local(PyDateTime_DateTime *local_dt) +{ + long long seconds; + time_t timestamp; + seconds = local_to_seconds(GET_YEAR(local_dt), + GET_MONTH(local_dt), + GET_DAY(local_dt), + DATE_GET_HOUR(local_dt), + DATE_GET_MINUTE(local_dt), + DATE_GET_SECOND(local_dt), + DATE_GET_FOLD(local_dt)); + if (seconds == -1) + return NULL; + /* XXX: add bounds check */ + timestamp = seconds - epoch; + return local_timezone_from_timestamp(timestamp); +} + static PyDateTime_DateTime * datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) { PyDateTime_DateTime *result; PyObject *offset; PyObject *temp; + PyObject *self_tzinfo; PyObject *tzinfo = Py_None; static char *keywords[] = {"tz", NULL}; @@ -4821,27 +5148,27 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) if (check_tzinfo_subclass(tzinfo) == -1) return NULL; - if (!HASTZINFO(self) || self->tzinfo == Py_None) - goto NeedAware; + if (!HASTZINFO(self) || self->tzinfo == Py_None) { + self_tzinfo = local_timezone_from_local(self); + if (self_tzinfo == NULL) + return NULL; + } else { + self_tzinfo = self->tzinfo; + Py_INCREF(self_tzinfo); + } /* Conversion to self's own time zone is a NOP. */ - if (self->tzinfo == tzinfo) { + if (self_tzinfo == tzinfo) { + Py_DECREF(self_tzinfo); Py_INCREF(self); return self; } /* Convert self to UTC. */ - offset = datetime_utcoffset((PyObject *)self, NULL); + offset = call_utcoffset(self_tzinfo, (PyObject *)self); + Py_DECREF(self_tzinfo); if (offset == NULL) return NULL; - if (offset == Py_None) { - Py_DECREF(offset); - NeedAware: - PyErr_SetString(PyExc_ValueError, "astimezone() cannot be applied to " - "a naive datetime"); - return NULL; - } - /* result = self - offset */ result = (PyDateTime_DateTime *)add_datetime_timedelta(self, (PyDateTime_Delta *)offset, -1); @@ -4849,6 +5176,32 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) if (result == NULL) return NULL; + /* Make sure result is aware and UTC. */ + if (!HASTZINFO(result)) { + temp = (PyObject *)result; + result = (PyDateTime_DateTime *) + new_datetime_ex2(GET_YEAR(result), + GET_MONTH(result), + GET_DAY(result), + DATE_GET_HOUR(result), + DATE_GET_MINUTE(result), + DATE_GET_SECOND(result), + DATE_GET_MICROSECOND(result), + PyDateTime_TimeZone_UTC, + DATE_GET_FOLD(result), + Py_TYPE(result)); + Py_DECREF(temp); + if (result == NULL) + return NULL; + } + else { + /* Result is already aware - just replace tzinfo. */ + temp = result->tzinfo; + result->tzinfo = PyDateTime_TimeZone_UTC; + Py_INCREF(result->tzinfo); + Py_DECREF(temp); + } + /* Attach new tzinfo and let fromutc() do the rest. */ temp = result->tzinfo; if (tzinfo == Py_None) { @@ -4896,6 +5249,56 @@ datetime_timetuple(PyDateTime_DateTime *self) dstflag); } +static long long +local_to_seconds(int year, int month, int day, + int hour, int minute, int second, int fold) +{ + long long t, a, b, u1, u2, t1, t2, lt; + t = utc_to_seconds(year, month, day, hour, minute, second); + /* Our goal is to solve t = local(u) for u. */ + lt = local(t); + if (lt == -1) + return -1; + a = lt - t; + u1 = t - a; + t1 = local(u1); + if (t1 == -1) + return -1; + if (t1 == t) { + /* We found one solution, but it may not be the one we need. + * Look for an earlier solution (if `fold` is 0), or a + * later one (if `fold` is 1). */ + if (fold) + u2 = u1 + max_fold_seconds; + else + u2 = u1 - max_fold_seconds; + lt = local(u2); + if (lt == -1) + return -1; + b = lt - u2; + if (a == b) + return u1; + } + else { + b = t1 - u1; + assert(a != b); + } + u2 = t - b; + t2 = local(u2); + if (t2 == -1) + return -1; + if (t2 == t) + return u2; + if (t1 == t) + return u1; + /* We have found both offsets a and b, but neither t - a nor t - b is + * a solution. This means t is in the gap. */ + return fold?Py_MIN(u1, u2):Py_MAX(u1, u2); +} + +/* date(1970,1,1).toordinal() == 719163 */ +#define EPOCH_SECONDS (719163LL * 24 * 60 * 60) + static PyObject * datetime_timestamp(PyDateTime_DateTime *self) { @@ -4910,33 +5313,18 @@ datetime_timestamp(PyDateTime_DateTime *self) Py_DECREF(delta); } else { - struct tm time; - time_t timestamp; - memset((void *) &time, '\0', sizeof(struct tm)); - time.tm_year = GET_YEAR(self) - 1900; - time.tm_mon = GET_MONTH(self) - 1; - time.tm_mday = GET_DAY(self); - time.tm_hour = DATE_GET_HOUR(self); - time.tm_min = DATE_GET_MINUTE(self); - time.tm_sec = DATE_GET_SECOND(self); - time.tm_wday = -1; - time.tm_isdst = -1; - timestamp = mktime(&time); - if (timestamp == (time_t)(-1) -#ifndef _AIX - /* Return value of -1 does not necessarily mean an error, - * but tm_wday cannot remain set to -1 if mktime succeeded. */ - && time.tm_wday == -1 -#else - /* on AIX, tm_wday is always sets, even on error */ -#endif - ) - { - PyErr_SetString(PyExc_OverflowError, - "timestamp out of range"); + long long seconds; + seconds = local_to_seconds(GET_YEAR(self), + GET_MONTH(self), + GET_DAY(self), + DATE_GET_HOUR(self), + DATE_GET_MINUTE(self), + DATE_GET_SECOND(self), + DATE_GET_FOLD(self)); + if (seconds == -1) return NULL; - } - result = PyFloat_FromDouble(timestamp + DATE_GET_MICROSECOND(self) / 1e6); + result = PyFloat_FromDouble(seconds - EPOCH_SECONDS + + DATE_GET_MICROSECOND(self) / 1e6); } return result; } @@ -4956,7 +5344,8 @@ datetime_gettime(PyDateTime_DateTime *self) DATE_GET_MINUTE(self), DATE_GET_SECOND(self), DATE_GET_MICROSECOND(self), - Py_None); + Py_None, + DATE_GET_FOLD(self)); } static PyObject * @@ -4966,7 +5355,8 @@ datetime_gettimetz(PyDateTime_DateTime *self) DATE_GET_MINUTE(self), DATE_GET_SECOND(self), DATE_GET_MICROSECOND(self), - GET_DT_TZINFO(self)); + GET_DT_TZINFO(self), + DATE_GET_FOLD(self)); } static PyObject * @@ -5018,7 +5408,7 @@ datetime_utctimetuple(PyDateTime_DateTime *self) * __getstate__ isn't exposed. */ static PyObject * -datetime_getstate(PyDateTime_DateTime *self) +datetime_getstate(PyDateTime_DateTime *self, int proto) { PyObject *basestate; PyObject *result = NULL; @@ -5026,6 +5416,9 @@ datetime_getstate(PyDateTime_DateTime *self) basestate = PyBytes_FromStringAndSize((char *)self->data, _PyDateTime_DATETIME_DATASIZE); if (basestate != NULL) { + if (proto > 3 && DATE_GET_FOLD(self)) + /* Set the first bit of the third byte */ + PyBytes_AS_STRING(basestate)[2] |= (1 << 7); if (! HASTZINFO(self) || self->tzinfo == Py_None) result = PyTuple_Pack(1, basestate); else @@ -5036,9 +5429,19 @@ datetime_getstate(PyDateTime_DateTime *self) } static PyObject * +datetime_reduce_ex(PyDateTime_DateTime *self, PyObject *args) +{ + int proto; + if (!PyArg_ParseTuple(args, "i:__reduce_ex__", &proto)) + return NULL; + + return Py_BuildValue("(ON)", Py_TYPE(self), datetime_getstate(self, proto)); +} + +static PyObject * datetime_reduce(PyDateTime_DateTime *self, PyObject *arg) { - return Py_BuildValue("(ON)", Py_TYPE(self), datetime_getstate(self)); + return Py_BuildValue("(ON)", Py_TYPE(self), datetime_getstate(self, 2)); } static PyMethodDef datetime_methods[] = { @@ -5093,9 +5496,12 @@ static PyMethodDef datetime_methods[] = { {"isoformat", (PyCFunction)datetime_isoformat, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("[sep] -> string in ISO 8601 format, " - "YYYY-MM-DDTHH:MM:SS[.mmmmmm][+HH:MM].\n\n" + "YYYY-MM-DDT[HH[:MM[:SS[.mmm[uuu]]]]][+HH:MM].\n" "sep is used to separate the year from the time, and " - "defaults to 'T'.")}, + "defaults to 'T'.\n" + "timespec specifies what components of the time to include" + " (allowed values are 'auto', 'hours', 'minutes', 'seconds'," + " 'milliseconds', and 'microseconds').\n")}, {"utcoffset", (PyCFunction)datetime_utcoffset, METH_NOARGS, PyDoc_STR("Return self.tzinfo.utcoffset(self).")}, @@ -5112,13 +5518,16 @@ static PyMethodDef datetime_methods[] = { {"astimezone", (PyCFunction)datetime_astimezone, METH_VARARGS | METH_KEYWORDS, PyDoc_STR("tz -> convert to local time in new timezone tz\n")}, + {"__reduce_ex__", (PyCFunction)datetime_reduce_ex, METH_VARARGS, + PyDoc_STR("__reduce_ex__(proto) -> (cls, state)")}, + {"__reduce__", (PyCFunction)datetime_reduce, METH_NOARGS, PyDoc_STR("__reduce__() -> (cls, state)")}, {NULL, NULL} }; -static char datetime_doc[] = +static const char datetime_doc[] = PyDoc_STR("datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])\n\ \n\ The year, month and day arguments are required. tzinfo may be None, or an\n\ @@ -5201,7 +5610,9 @@ static PyDateTime_CAPI CAPI = { new_time_ex, new_delta_ex, datetime_fromtimestamp, - date_fromtimestamp + date_fromtimestamp, + new_datetime_ex2, + new_time_ex2 }; @@ -5282,12 +5693,12 @@ PyInit__datetime(void) /* time values */ d = PyDateTime_TimeType.tp_dict; - x = new_time(0, 0, 0, 0, Py_None); + x = new_time(0, 0, 0, 0, Py_None, 0); if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) return NULL; Py_DECREF(x); - x = new_time(23, 59, 59, 999999, Py_None); + x = new_time(23, 59, 59, 999999, Py_None, 0); if (x == NULL || PyDict_SetItemString(d, "max", x) < 0) return NULL; Py_DECREF(x); @@ -5300,12 +5711,12 @@ PyInit__datetime(void) /* datetime values */ d = PyDateTime_DateTimeType.tp_dict; - x = new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None); + x = new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None, 0); if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) return NULL; Py_DECREF(x); - x = new_datetime(MAXYEAR, 12, 31, 23, 59, 59, 999999, Py_None); + x = new_datetime(MAXYEAR, 12, 31, 23, 59, 59, 999999, Py_None, 0); if (x == NULL || PyDict_SetItemString(d, "max", x) < 0) return NULL; Py_DECREF(x); @@ -5347,7 +5758,7 @@ PyInit__datetime(void) /* Epoch */ PyDateTime_Epoch = new_datetime(1970, 1, 1, 0, 0, 0, 0, - PyDateTime_TimeZone_UTC); + PyDateTime_TimeZone_UTC, 0); if (PyDateTime_Epoch == NULL) return NULL; @@ -5382,19 +5793,19 @@ PyInit__datetime(void) /* A 4-year cycle has an extra leap day over what we'd get from * pasting together 4 single years. */ - assert(DI4Y == 4 * 365 + 1); + Py_BUILD_ASSERT(DI4Y == 4 * 365 + 1); assert(DI4Y == days_before_year(4+1)); /* Similarly, a 400-year cycle has an extra leap day over what we'd * get from pasting together 4 100-year cycles. */ - assert(DI400Y == 4 * DI100Y + 1); + Py_BUILD_ASSERT(DI400Y == 4 * DI100Y + 1); assert(DI400Y == days_before_year(400+1)); /* OTOH, a 100-year cycle has one fewer leap day than we'd get from * pasting together 25 4-year cycles. */ - assert(DI100Y == 25 * DI4Y - 1); + Py_BUILD_ASSERT(DI100Y == 25 * DI4Y - 1); assert(DI100Y == days_before_year(100+1)); one = PyLong_FromLong(1); diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index ea8790b..804978a 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -14,16 +14,16 @@ */ #if defined(HAVE_NDBM_H) #include -static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ +static const char which_dbm[] = "GNU gdbm"; /* EMX port of GDBM */ #elif defined(HAVE_GDBM_NDBM_H) #include -static char *which_dbm = "GNU gdbm"; +static const char which_dbm[] = "GNU gdbm"; #elif defined(HAVE_GDBM_DASH_NDBM_H) #include -static char *which_dbm = "GNU gdbm"; +static const char which_dbm[] = "GNU gdbm"; #elif defined(HAVE_BERKDB_H) #include -static char *which_dbm = "Berkeley DB"; +static const char which_dbm[] = "Berkeley DB"; #else #error "No ndbm.h available!" #endif diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index e15941a..9956786 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -36,7 +36,6 @@ #include #include "docstrings.h" -#include "memory.h" #if !defined(MPD_VERSION_HEX) || MPD_VERSION_HEX < 0x02040100 @@ -1119,12 +1118,12 @@ context_getattr(PyObject *self, PyObject *name) PyObject *retval; if (PyUnicode_Check(name)) { - if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) { + if (_PyUnicode_EqualToASCIIString(name, "traps")) { retval = ((PyDecContextObject *)self)->traps; Py_INCREF(retval); return retval; } - if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) { + if (_PyUnicode_EqualToASCIIString(name, "flags")) { retval = ((PyDecContextObject *)self)->flags; Py_INCREF(retval); return retval; @@ -1144,10 +1143,10 @@ context_setattr(PyObject *self, PyObject *name, PyObject *value) } if (PyUnicode_Check(name)) { - if (PyUnicode_CompareWithASCIIString(name, "traps") == 0) { + if (_PyUnicode_EqualToASCIIString(name, "traps")) { return context_settraps_dict(self, value); } - if (PyUnicode_CompareWithASCIIString(name, "flags") == 0) { + if (_PyUnicode_EqualToASCIIString(name, "flags")) { return context_setstatus_dict(self, value); } } @@ -1890,12 +1889,13 @@ is_space(enum PyUnicode_Kind kind, void *data, Py_ssize_t pos) /* Return the ASCII representation of a numeric Unicode string. The numeric string may contain ascii characters in the range [1, 127], any Unicode space and any unicode digit. If strip_ws is true, leading and trailing - whitespace is stripped. + whitespace is stripped. If ignore_underscores is true, underscores are + ignored. Return NULL if malloc fails and an empty string if invalid characters are found. */ static char * -numeric_as_ascii(const PyObject *u, int strip_ws) +numeric_as_ascii(const PyObject *u, int strip_ws, int ignore_underscores) { enum PyUnicode_Kind kind; void *data; @@ -1930,6 +1930,9 @@ numeric_as_ascii(const PyObject *u, int strip_ws) for (; j < len; j++) { ch = PyUnicode_READ(kind, data, j); + if (ignore_underscores && ch == '_') { + continue; + } if (0 < ch && ch <= 127) { *cp++ = ch; continue; @@ -2012,7 +2015,7 @@ PyDecType_FromUnicode(PyTypeObject *type, const PyObject *u, PyObject *dec; char *s; - s = numeric_as_ascii(u, 0); + s = numeric_as_ascii(u, 0, 0); if (s == NULL) { return NULL; } @@ -2032,7 +2035,7 @@ PyDecType_FromUnicodeExactWS(PyTypeObject *type, const PyObject *u, PyObject *dec; char *s; - s = numeric_as_ascii(u, 1); + s = numeric_as_ascii(u, 1, 1); if (s == NULL) { return NULL; } @@ -2446,14 +2449,14 @@ dectuple_as_str(PyObject *dectuple) tmp = PyTuple_GET_ITEM(dectuple, 2); if (PyUnicode_Check(tmp)) { /* special */ - if (PyUnicode_CompareWithASCIIString(tmp, "F") == 0) { + if (_PyUnicode_EqualToASCIIString(tmp, "F")) { strcat(sign_special, "Inf"); is_infinite = 1; } - else if (PyUnicode_CompareWithASCIIString(tmp, "n") == 0) { + else if (_PyUnicode_EqualToASCIIString(tmp, "n")) { strcat(sign_special, "NaN"); } - else if (PyUnicode_CompareWithASCIIString(tmp, "N") == 0) { + else if (_PyUnicode_EqualToASCIIString(tmp, "N")) { strcat(sign_special, "sNaN"); } else { @@ -3394,6 +3397,105 @@ dec_as_long(PyObject *dec, PyObject *context, int round) return (PyObject *) pylong; } +/* Convert a Decimal to its exact integer ratio representation. */ +static PyObject * +dec_as_integer_ratio(PyObject *self, PyObject *args UNUSED) +{ + PyObject *numerator = NULL; + PyObject *denominator = NULL; + PyObject *exponent = NULL; + PyObject *result = NULL; + PyObject *tmp; + mpd_ssize_t exp; + PyObject *context; + uint32_t status = 0; + + if (mpd_isspecial(MPD(self))) { + if (mpd_isnan(MPD(self))) { + PyErr_SetString(PyExc_ValueError, + "cannot convert NaN to integer ratio"); + } + else { + PyErr_SetString(PyExc_OverflowError, + "cannot convert Infinity to integer ratio"); + } + return NULL; + } + + CURRENT_CONTEXT(context); + + tmp = dec_alloc(); + if (tmp == NULL) { + return NULL; + } + + if (!mpd_qcopy(MPD(tmp), MPD(self), &status)) { + Py_DECREF(tmp); + PyErr_NoMemory(); + return NULL; + } + + exp = mpd_iszero(MPD(tmp)) ? 0 : MPD(tmp)->exp; + MPD(tmp)->exp = 0; + + /* context and rounding are unused here: the conversion is exact */ + numerator = dec_as_long(tmp, context, MPD_ROUND_FLOOR); + Py_DECREF(tmp); + if (numerator == NULL) { + goto error; + } + + exponent = PyLong_FromSsize_t(exp < 0 ? -exp : exp); + if (exponent == NULL) { + goto error; + } + + tmp = PyLong_FromLong(10); + if (tmp == NULL) { + goto error; + } + + Py_SETREF(exponent, _py_long_power(tmp, exponent, Py_None)); + Py_DECREF(tmp); + if (exponent == NULL) { + goto error; + } + + if (exp >= 0) { + Py_SETREF(numerator, _py_long_multiply(numerator, exponent)); + if (numerator == NULL) { + goto error; + } + denominator = PyLong_FromLong(1); + if (denominator == NULL) { + goto error; + } + } + else { + denominator = exponent; + exponent = NULL; + tmp = _PyLong_GCD(numerator, denominator); + if (tmp == NULL) { + goto error; + } + Py_SETREF(numerator, _py_long_floor_divide(numerator, tmp)); + Py_SETREF(denominator, _py_long_floor_divide(denominator, tmp)); + Py_DECREF(tmp); + if (numerator == NULL || denominator == NULL) { + goto error; + } + } + + result = PyTuple_Pack(2, numerator, denominator); + + +error: + Py_XDECREF(exponent); + Py_XDECREF(denominator); + Py_XDECREF(numerator); + return result; +} + static PyObject * PyDec_ToIntegralValue(PyObject *dec, PyObject *args, PyObject *kwds) { @@ -4702,6 +4804,7 @@ static PyMethodDef dec_methods [] = /* Miscellaneous */ { "from_float", dec_from_float, METH_O|METH_CLASS, doc_from_float }, { "as_tuple", PyDec_AsTuple, METH_NOARGS, doc_as_tuple }, + { "as_integer_ratio", dec_as_integer_ratio, METH_NOARGS, doc_as_integer_ratio }, /* Special methods */ { "__copy__", dec_copy, METH_NOARGS, NULL }, diff --git a/Modules/_decimal/docstrings.h b/Modules/_decimal/docstrings.h index 71029a9..f7fd6e7 100644 --- a/Modules/_decimal/docstrings.h +++ b/Modules/_decimal/docstrings.h @@ -70,6 +70,15 @@ PyDoc_STRVAR(doc_as_tuple, Return a tuple representation of the number.\n\ \n"); +PyDoc_STRVAR(doc_as_integer_ratio, +"as_integer_ratio($self, /)\n--\n\n\ +Decimal.as_integer_ratio() -> (int, int)\n\ +\n\ +Return a pair of integers, whose ratio is exactly equal to the original\n\ +Decimal and with a positive denominator. The ratio is in lowest terms.\n\ +Raise OverflowError on infinities and a ValueError on NaNs.\n\ +\n"); + PyDoc_STRVAR(doc_canonical, "canonical($self, /)\n--\n\n\ Return the canonical encoding of the argument. Currently, the encoding\n\ diff --git a/Modules/_decimal/libmpdec/basearith.c b/Modules/_decimal/libmpdec/basearith.c index 35de6b8..dfe1523 100644 --- a/Modules/_decimal/libmpdec/basearith.c +++ b/Modules/_decimal/libmpdec/basearith.c @@ -32,7 +32,6 @@ #include #include #include "constants.h" -#include "memory.h" #include "typearith.h" #include "basearith.h" diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c index a45a429..3aadfb0 100644 --- a/Modules/_decimal/libmpdec/io.c +++ b/Modules/_decimal/libmpdec/io.c @@ -37,7 +37,6 @@ #include #include "bits.h" #include "constants.h" -#include "memory.h" #include "typearith.h" #include "io.h" diff --git a/Modules/_decimal/libmpdec/memory.c b/Modules/_decimal/libmpdec/memory.c index 0f41fe5..a854e09 100644 --- a/Modules/_decimal/libmpdec/memory.c +++ b/Modules/_decimal/libmpdec/memory.c @@ -30,7 +30,12 @@ #include #include #include "typearith.h" -#include "memory.h" +#include "mpalloc.h" + + +#if defined(_MSC_VER) + #pragma warning(disable : 4232) +#endif /* Guaranteed minimum allocation for a coefficient. May be changed once diff --git a/Modules/_decimal/libmpdec/memory.h b/Modules/_decimal/libmpdec/mpalloc.h similarity index 98% rename from Modules/_decimal/libmpdec/memory.h rename to Modules/_decimal/libmpdec/mpalloc.h index 9c98d1a..efd7119 100644 --- a/Modules/_decimal/libmpdec/memory.h +++ b/Modules/_decimal/libmpdec/mpalloc.h @@ -26,8 +26,8 @@ */ -#ifndef MEMORY_H -#define MEMORY_H +#ifndef MPALLOC_H +#define MPALLOC_H #include "mpdecimal.h" diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c index 593f9f5..328ab92 100644 --- a/Modules/_decimal/libmpdec/mpdecimal.c +++ b/Modules/_decimal/libmpdec/mpdecimal.c @@ -36,7 +36,7 @@ #include "bits.h" #include "convolute.h" #include "crt.h" -#include "memory.h" +#include "mpalloc.h" #include "typearith.h" #include "umodarith.h" diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h index 5ca7413..daf2b9d 100644 --- a/Modules/_decimal/libmpdec/mpdecimal.h +++ b/Modules/_decimal/libmpdec/mpdecimal.h @@ -48,6 +48,8 @@ extern "C" { #include #include #include +#include +#include #ifdef _MSC_VER #include "vccompat.h" @@ -59,12 +61,6 @@ extern "C" { #define MPD_HIDE_SYMBOLS_END #define EXTINLINE extern inline #else - #ifdef HAVE_STDINT_H - #include - #endif - #ifdef HAVE_INTTYPES_H - #include - #endif #ifndef __GNUC_STDC_INLINE__ #define __GNUC_STDC_INLINE__ 1 #endif @@ -108,9 +104,9 @@ MPD_PRAGMA(MPD_HIDE_SYMBOLS_START) #define MPD_MAJOR_VERSION 2 #define MPD_MINOR_VERSION 4 -#define MPD_MICRO_VERSION 1 +#define MPD_MICRO_VERSION 2 -#define MPD_VERSION "2.4.1" +#define MPD_VERSION "2.4.2" #define MPD_VERSION_HEX ((MPD_MAJOR_VERSION << 24) | \ (MPD_MINOR_VERSION << 16) | \ diff --git a/Modules/_decimal/libmpdec/vccompat.h b/Modules/_decimal/libmpdec/vccompat.h index f58e023..dd131d8 100644 --- a/Modules/_decimal/libmpdec/vccompat.h +++ b/Modules/_decimal/libmpdec/vccompat.h @@ -32,7 +32,6 @@ /* Visual C fixes: no stdint.h, no snprintf ... */ #ifdef _MSC_VER - #include "vcstdint.h" #undef inline #define inline __inline #undef random @@ -49,10 +48,6 @@ #undef strtoll #define strtoll _strtoi64 #define strdup _strdup - #define PRIi64 "I64i" - #define PRIu64 "I64u" - #define PRIi32 "I32i" - #define PRIu32 "I32u" #endif diff --git a/Modules/_decimal/tests/deccheck.py b/Modules/_decimal/tests/deccheck.py index ab7d5bd..f907531 100644 --- a/Modules/_decimal/tests/deccheck.py +++ b/Modules/_decimal/tests/deccheck.py @@ -50,8 +50,8 @@ Functions = { '__abs__', '__bool__', '__ceil__', '__complex__', '__copy__', '__floor__', '__float__', '__hash__', '__int__', '__neg__', '__pos__', '__reduce__', '__repr__', '__str__', '__trunc__', - 'adjusted', 'as_tuple', 'canonical', 'conjugate', 'copy_abs', - 'copy_negate', 'is_canonical', 'is_finite', 'is_infinite', + 'adjusted', 'as_integer_ratio', 'as_tuple', 'canonical', 'conjugate', + 'copy_abs', 'copy_negate', 'is_canonical', 'is_finite', 'is_infinite', 'is_nan', 'is_qnan', 'is_signed', 'is_snan', 'is_zero', 'radix' ), # Unary with optional context: @@ -128,7 +128,7 @@ ContextFunctions = { # Functions that require a restricted exponent range for reasonable runtimes. UnaryRestricted = [ '__ceil__', '__floor__', '__int__', '__trunc__', - 'to_integral', 'to_integral_value' + 'as_integer_ratio', 'to_integral', 'to_integral_value' ] BinaryRestricted = ['__round__'] diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index fedef10..5937520 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -57,9 +57,9 @@ do { memory -= size; printf("%8d - %s\n", memory, comment); } while (0) that all use of text and tail as object pointers must be wrapped in JOIN_OBJ. see comments in the ElementObject definition for more info. */ -#define JOIN_GET(p) ((Py_uintptr_t) (p) & 1) -#define JOIN_SET(p, flag) ((void*) ((Py_uintptr_t) (JOIN_OBJ(p)) | (flag))) -#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~(Py_uintptr_t)1)) +#define JOIN_GET(p) ((uintptr_t) (p) & 1) +#define JOIN_SET(p, flag) ((void*) ((uintptr_t) (JOIN_OBJ(p)) | (flag))) +#define JOIN_OBJ(p) ((PyObject*) ((uintptr_t) (p) & ~(uintptr_t)1)) /* Py_CLEAR for a PyObject* that uses a join flag. Pass the pointer by * reference since this function sets it to NULL. @@ -129,33 +129,9 @@ elementtree_free(void *m) /* helpers */ LOCAL(PyObject*) -deepcopy(PyObject* object, PyObject* memo) -{ - /* do a deep copy of the given object */ - PyObject* args; - PyObject* result; - elementtreestate *st = ET_STATE_GLOBAL; - - if (!st->deepcopy_obj) { - PyErr_SetString( - PyExc_RuntimeError, - "deepcopy helper not found" - ); - return NULL; - } - - args = PyTuple_Pack(2, object, memo); - if (!args) - return NULL; - result = PyObject_CallObject(st->deepcopy_obj, args); - Py_DECREF(args); - return result; -} - -LOCAL(PyObject*) list_join(PyObject* list) { - /* join list elements */ + /* join list elements (destroying the list in the process) */ PyObject* joiner; PyObject* result; @@ -164,6 +140,8 @@ list_join(PyObject* list) return NULL; result = PyUnicode_Join(joiner, list); Py_DECREF(joiner); + if (result) + Py_DECREF(list); return result; } @@ -418,10 +396,8 @@ element_init(PyObject *self, PyObject *args, PyObject *kwds) Py_XDECREF(attrib); /* Replace the objects already pointed to by tag, text and tail. */ - tmp = self_elem->tag; Py_INCREF(tag); - self_elem->tag = tag; - Py_DECREF(tmp); + Py_XSETREF(self_elem->tag, tag); tmp = self_elem->text; Py_INCREF(Py_None); @@ -532,17 +508,15 @@ element_get_text(ElementObject* self) { /* return borrowed reference to text attribute */ - PyObject *res = self->text; + PyObject* res = self->text; if (JOIN_GET(res)) { res = JOIN_OBJ(res); if (PyList_CheckExact(res)) { - PyObject *tmp = list_join(res); - if (!tmp) + res = list_join(res); + if (!res) return NULL; - self->text = tmp; - Py_DECREF(res); - res = tmp; + self->text = res; } } @@ -554,17 +528,15 @@ element_get_tail(ElementObject* self) { /* return borrowed reference to text attribute */ - PyObject *res = self->tail; + PyObject* res = self->tail; if (JOIN_GET(res)) { res = JOIN_OBJ(res); if (PyList_CheckExact(res)) { - PyObject *tmp = list_join(res); - if (!tmp) + res = list_join(res); + if (!res) return NULL; - self->tail = tmp; - Py_DECREF(res); - res = tmp; + self->tail = res; } } @@ -654,7 +626,6 @@ static void element_dealloc(ElementObject* self) { PyObject_GC_UnTrack(self); - Py_TRASHCAN_SAFE_BEGIN(self) if (self->weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) self); @@ -665,7 +636,6 @@ element_dealloc(ElementObject* self) RELEASE(sizeof(ElementObject), "destroy element"); Py_TYPE(self)->tp_free((PyObject *)self); - Py_TRASHCAN_SAFE_END(self) } /* -------------------------------------------------------------------- */ @@ -752,6 +722,9 @@ _elementtree_Element___copy___impl(ElementObject *self) return (PyObject*) element; } +/* Helper for a deep copy. */ +LOCAL(PyObject *) deepcopy(PyObject *, PyObject *); + /*[clinic input] _elementtree.Element.__deepcopy__ @@ -824,7 +797,7 @@ _elementtree_Element___deepcopy__(ElementObject *self, PyObject *memo) } /* add object to memo dictionary (so deepcopy won't visit it again) */ - id = PyLong_FromSsize_t((Py_uintptr_t) self); + id = PyLong_FromSsize_t((uintptr_t) self); if (!id) goto error; @@ -842,6 +815,53 @@ _elementtree_Element___deepcopy__(ElementObject *self, PyObject *memo) return NULL; } +LOCAL(PyObject *) +deepcopy(PyObject *object, PyObject *memo) +{ + /* do a deep copy of the given object */ + elementtreestate *st; + PyObject *stack[2]; + + /* Fast paths */ + if (object == Py_None || PyUnicode_CheckExact(object)) { + Py_INCREF(object); + return object; + } + + if (Py_REFCNT(object) == 1) { + if (PyDict_CheckExact(object)) { + PyObject *key, *value; + Py_ssize_t pos = 0; + int simple = 1; + while (PyDict_Next(object, &pos, &key, &value)) { + if (!PyUnicode_CheckExact(key) || !PyUnicode_CheckExact(value)) { + simple = 0; + break; + } + } + if (simple) + return PyDict_Copy(object); + /* Fall through to general case */ + } + else if (Element_CheckExact(object)) { + return _elementtree_Element___deepcopy__((ElementObject *)object, memo); + } + } + + /* General case */ + st = ET_STATE_GLOBAL; + if (!st->deepcopy_obj) { + PyErr_SetString(PyExc_RuntimeError, + "deepcopy helper not found"); + return NULL; + } + + stack[0] = object; + stack[1] = memo; + return _PyObject_FastCall(st->deepcopy_obj, stack, 2); +} + + /*[clinic input] _elementtree.Element.__sizeof__ -> Py_ssize_t @@ -1688,11 +1708,11 @@ element_subscr(PyObject* self_, PyObject* item) if (!self->extra) return PyList_New(0); - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + self->extra->length, + &start, &stop, &step, &slicelen) < 0) { return NULL; } - slicelen = PySlice_AdjustIndices(self->extra->length, &start, &stop, - step); if (slicelen <= 0) return PyList_New(0); @@ -1744,11 +1764,11 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value) return -1; } - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + self->extra->length, + &start, &stop, &step, &slicelen) < 0) { return -1; } - slicelen = PySlice_AdjustIndices(self->extra->length, &start, &stop, - step); if (value == NULL) { /* Delete slice */ @@ -1767,7 +1787,7 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value) step = -step; } - assert((size_t)slicelen <= PY_SIZE_MAX / sizeof(PyObject *)); + assert((size_t)slicelen <= SIZE_MAX / sizeof(PyObject *)); /* recycle is a list that will contain all the children * scheduled for removal. @@ -1896,92 +1916,90 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value) } static PyObject* -element_getattro(ElementObject* self, PyObject* nameobj) +element_tag_getter(ElementObject *self, void *closure) { - PyObject* res; - char *name = ""; + PyObject *res = self->tag; + Py_INCREF(res); + return res; +} - if (PyUnicode_Check(nameobj)) - name = _PyUnicode_AsString(nameobj); +static PyObject* +element_text_getter(ElementObject *self, void *closure) +{ + PyObject *res = element_get_text(self); + Py_XINCREF(res); + return res; +} - if (name == NULL) - return NULL; +static PyObject* +element_tail_getter(ElementObject *self, void *closure) +{ + PyObject *res = element_get_tail(self); + Py_XINCREF(res); + return res; +} - /* handle common attributes first */ - if (strcmp(name, "tag") == 0) { - res = self->tag; - Py_INCREF(res); - return res; - } else if (strcmp(name, "text") == 0) { - res = element_get_text(self); - Py_XINCREF(res); - return res; +static PyObject* +element_attrib_getter(ElementObject *self, void *closure) +{ + PyObject *res; + if (!self->extra) { + if (create_extra(self, NULL) < 0) + return NULL; } + res = element_get_attrib(self); + Py_XINCREF(res); + return res; +} - /* methods */ - res = PyObject_GenericGetAttr((PyObject*) self, nameobj); - if (res) - return res; - - /* less common attributes */ - if (strcmp(name, "tail") == 0) { - PyErr_Clear(); - res = element_get_tail(self); - } else if (strcmp(name, "attrib") == 0) { - PyErr_Clear(); - if (!self->extra) { - if (create_extra(self, NULL) < 0) - return NULL; - } - res = element_get_attrib(self); +/* macro for setter validation */ +#define _VALIDATE_ATTR_VALUE(V) \ + if ((V) == NULL) { \ + PyErr_SetString( \ + PyExc_AttributeError, \ + "can't delete element attribute"); \ + return -1; \ } - if (!res) - return NULL; - - Py_INCREF(res); - return res; +static int +element_tag_setter(ElementObject *self, PyObject *value, void *closure) +{ + _VALIDATE_ATTR_VALUE(value); + Py_INCREF(value); + Py_SETREF(self->tag, value); + return 0; } static int -element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value) +element_text_setter(ElementObject *self, PyObject *value, void *closure) { - char *name = ""; + _VALIDATE_ATTR_VALUE(value); + Py_INCREF(value); + Py_DECREF(JOIN_OBJ(self->text)); + self->text = value; + return 0; +} - if (value == NULL) { - PyErr_SetString(PyExc_AttributeError, - "can't delete attribute"); - return -1; - } - if (PyUnicode_Check(nameobj)) - name = _PyUnicode_AsString(nameobj); - if (name == NULL) - return -1; +static int +element_tail_setter(ElementObject *self, PyObject *value, void *closure) +{ + _VALIDATE_ATTR_VALUE(value); + Py_INCREF(value); + Py_DECREF(JOIN_OBJ(self->tail)); + self->tail = value; + return 0; +} - if (strcmp(name, "tag") == 0) { - Py_INCREF(value); - Py_SETREF(self->tag, value); - } else if (strcmp(name, "text") == 0) { - Py_DECREF(JOIN_OBJ(self->text)); - self->text = value; - Py_INCREF(self->text); - } else if (strcmp(name, "tail") == 0) { - Py_DECREF(JOIN_OBJ(self->tail)); - self->tail = value; - Py_INCREF(self->tail); - } else if (strcmp(name, "attrib") == 0) { - if (!self->extra) { - if (create_extra(self, NULL) < 0) - return -1; - } - Py_INCREF(value); - Py_SETREF(self->extra->attrib, value); - } else { - PyErr_SetString(PyExc_AttributeError, - "Can't set arbitrary attributes on Element"); - return -1; +static int +element_attrib_setter(ElementObject *self, PyObject *value, void *closure) +{ + _VALIDATE_ATTR_VALUE(value); + if (!self->extra) { + if (create_extra(self, NULL) < 0) + return -1; } - + Py_INCREF(value); + Py_SETREF(self->extra->attrib, value); return 0; } @@ -2001,22 +2019,22 @@ static PySequenceMethods element_as_sequence = { * pre-order traversal. To keep track of which sub-element should be returned * next, a stack of parents is maintained. This is a standard stack-based * iterative pre-order traversal of a tree. - * The stack is managed using a single-linked list starting at parent_stack. - * Each stack node contains the saved parent to which we should return after + * The stack is managed using a continuous array. + * Each stack item contains the saved parent to which we should return after * the current one is exhausted, and the next child to examine in that parent. */ typedef struct ParentLocator_t { ElementObject *parent; Py_ssize_t child_index; - struct ParentLocator_t *next; } ParentLocator; typedef struct { PyObject_HEAD ParentLocator *parent_stack; + Py_ssize_t parent_stack_used; + Py_ssize_t parent_stack_size; ElementObject *root_element; PyObject *sought_tag; - int root_done; int gettext; } ElementIterObject; @@ -2024,13 +2042,11 @@ typedef struct { static void elementiter_dealloc(ElementIterObject *it) { - ParentLocator *p = it->parent_stack; - while (p) { - ParentLocator *temp = p; - Py_XDECREF(p->parent); - p = p->next; - PyObject_Free(temp); - } + Py_ssize_t i = it->parent_stack_used; + it->parent_stack_used = 0; + while (i--) + Py_XDECREF(it->parent_stack[i].parent); + PyMem_Free(it->parent_stack); Py_XDECREF(it->sought_tag); Py_XDECREF(it->root_element); @@ -2042,11 +2058,9 @@ elementiter_dealloc(ElementIterObject *it) static int elementiter_traverse(ElementIterObject *it, visitproc visit, void *arg) { - ParentLocator *p = it->parent_stack; - while (p) { - Py_VISIT(p->parent); - p = p->next; - } + Py_ssize_t i = it->parent_stack_used; + while (i--) + Py_VISIT(it->parent_stack[i].parent); Py_VISIT(it->root_element); Py_VISIT(it->sought_tag); @@ -2055,17 +2069,25 @@ elementiter_traverse(ElementIterObject *it, visitproc visit, void *arg) /* Helper function for elementiter_next. Add a new parent to the parent stack. */ -static ParentLocator * -parent_stack_push_new(ParentLocator *stack, ElementObject *parent) +static int +parent_stack_push_new(ElementIterObject *it, ElementObject *parent) { - ParentLocator *new_node = PyObject_Malloc(sizeof(ParentLocator)); - if (new_node) { - new_node->parent = parent; - Py_INCREF(parent); - new_node->child_index = 0; - new_node->next = stack; + ParentLocator *item; + + if (it->parent_stack_used >= it->parent_stack_size) { + Py_ssize_t new_size = it->parent_stack_size * 2; /* never overflow */ + ParentLocator *parent_stack = it->parent_stack; + PyMem_Resize(parent_stack, ParentLocator, new_size); + if (parent_stack == NULL) + return -1; + it->parent_stack = parent_stack; + it->parent_stack_size = new_size; } - return new_node; + item = it->parent_stack + it->parent_stack_used++; + Py_INCREF(parent); + item->parent = parent; + item->child_index = 0; + return 0; } static PyObject * @@ -2082,157 +2104,91 @@ elementiter_next(ElementIterObject *it) * - itertext() also has to handle tail, after finishing with all the * children of a node. */ - ElementObject *cur_parent; - Py_ssize_t child_index; int rc; ElementObject *elem; + PyObject *text; while (1) { /* Handle the case reached in the beginning and end of iteration, where - * the parent stack is empty. The root_done flag gives us indication - * whether we've just started iterating (so root_done is 0), in which - * case the root is returned. If root_done is 1 and we're here, the + * the parent stack is empty. If root_element is NULL and we're here, the * iterator is exhausted. */ - if (!it->parent_stack->parent) { - if (it->root_done) { + if (!it->parent_stack_used) { + if (!it->root_element) { PyErr_SetNone(PyExc_StopIteration); return NULL; - } else { - elem = it->root_element; - it->parent_stack = parent_stack_push_new(it->parent_stack, - elem); - if (!it->parent_stack) { - PyErr_NoMemory(); - return NULL; - } + } - Py_INCREF(elem); - it->root_done = 1; - rc = (it->sought_tag == Py_None); - if (!rc) { - rc = PyObject_RichCompareBool(elem->tag, - it->sought_tag, Py_EQ); - if (rc < 0) { - Py_DECREF(elem); - return NULL; - } - } - if (rc) { - if (it->gettext) { - PyObject *text = element_get_text(elem); - if (!text) { - Py_DECREF(elem); - return NULL; - } - Py_INCREF(text); - Py_DECREF(elem); - rc = PyObject_IsTrue(text); - if (rc > 0) - return text; - Py_DECREF(text); - if (rc < 0) - return NULL; - } else { - return (PyObject *)elem; - } - } - else { - Py_DECREF(elem); + elem = it->root_element; /* steals a reference */ + it->root_element = NULL; + } + else { + /* See if there are children left to traverse in the current parent. If + * yes, visit the next child. If not, pop the stack and try again. + */ + ParentLocator *item = &it->parent_stack[it->parent_stack_used - 1]; + Py_ssize_t child_index = item->child_index; + ElementObjectExtra *extra; + elem = item->parent; + extra = elem->extra; + if (!extra || child_index >= extra->length) { + it->parent_stack_used--; + /* Note that extra condition on it->parent_stack_used here; + * this is because itertext() is supposed to only return *inner* + * text, not text following the element it began iteration with. + */ + if (it->gettext && it->parent_stack_used) { + text = element_get_tail(elem); + goto gettext; } + Py_DECREF(elem); + continue; } + + elem = (ElementObject *)extra->children[child_index]; + item->child_index++; + Py_INCREF(elem); } - /* See if there are children left to traverse in the current parent. If - * yes, visit the next child. If not, pop the stack and try again. - */ - cur_parent = it->parent_stack->parent; - child_index = it->parent_stack->child_index; - if (cur_parent->extra && child_index < cur_parent->extra->length) { - if (!PyObject_TypeCheck(cur_parent->extra->children[child_index], &Element_Type)) { - PyErr_Format(PyExc_AttributeError, - "'%.100s' object has no attribute 'iter'", - Py_TYPE(cur_parent->extra->children[child_index])->tp_name); - return NULL; - } - elem = (ElementObject *)cur_parent->extra->children[child_index]; - it->parent_stack->child_index++; - it->parent_stack = parent_stack_push_new(it->parent_stack, - elem); - if (!it->parent_stack) { - PyErr_NoMemory(); - return NULL; - } + if (parent_stack_push_new(it, elem) < 0) { + Py_DECREF(elem); + PyErr_NoMemory(); + return NULL; + } + if (it->gettext) { + text = element_get_text(elem); + goto gettext; + } - Py_INCREF(elem); - if (it->gettext) { - PyObject *text = element_get_text(elem); - if (!text) { - Py_DECREF(elem); - return NULL; - } - Py_INCREF(text); - Py_DECREF(elem); - rc = PyObject_IsTrue(text); - if (rc > 0) - return text; - Py_DECREF(text); - if (rc < 0) - return NULL; - } else { - rc = (it->sought_tag == Py_None); - if (!rc) { - rc = PyObject_RichCompareBool(elem->tag, - it->sought_tag, Py_EQ); - if (rc < 0) { - Py_DECREF(elem); - return NULL; - } - } - if (rc) { - return (PyObject *)elem; - } - Py_DECREF(elem); - } + if (it->sought_tag == Py_None) + return (PyObject *)elem; + + rc = PyObject_RichCompareBool(elem->tag, it->sought_tag, Py_EQ); + if (rc > 0) + return (PyObject *)elem; + + Py_DECREF(elem); + if (rc < 0) + return NULL; + continue; + +gettext: + if (!text) { + Py_DECREF(elem); + return NULL; + } + if (text == Py_None) { + Py_DECREF(elem); } else { - PyObject *tail; - ParentLocator *next; - if (it->gettext) { - Py_INCREF(cur_parent); - tail = element_get_tail(cur_parent); - if (!tail) { - Py_DECREF(cur_parent); - return NULL; - } - Py_INCREF(tail); - Py_DECREF(cur_parent); - } - else { - tail = Py_None; - Py_INCREF(tail); - } - next = it->parent_stack->next; - cur_parent = it->parent_stack->parent; - PyObject_Free(it->parent_stack); - it->parent_stack = next; - Py_XDECREF(cur_parent); - - /* Note that extra condition on it->parent_stack->parent here; - * this is because itertext() is supposed to only return *inner* - * text, not text following the element it began iteration with. - */ - if (it->parent_stack->parent) { - rc = PyObject_IsTrue(tail); - if (rc > 0) - return tail; - Py_DECREF(tail); - if (rc < 0) - return NULL; - } - else { - Py_DECREF(tail); - } + Py_INCREF(text); + Py_DECREF(elem); + rc = PyObject_IsTrue(text); + if (rc > 0) + return text; + Py_DECREF(text); + if (rc < 0) + return NULL; } } @@ -2284,6 +2240,7 @@ static PyTypeObject ElementIter_Type = { 0, /* tp_new */ }; +#define INIT_PARENT_STACK_SIZE 8 static PyObject * create_elementiter(ElementObject *self, PyObject *tag, int gettext) @@ -2296,22 +2253,20 @@ create_elementiter(ElementObject *self, PyObject *tag, int gettext) Py_INCREF(tag); it->sought_tag = tag; - it->root_done = 0; it->gettext = gettext; Py_INCREF(self); it->root_element = self; PyObject_GC_Track(it); - it->parent_stack = PyObject_Malloc(sizeof(ParentLocator)); + it->parent_stack = PyMem_New(ParentLocator, INIT_PARENT_STACK_SIZE); if (it->parent_stack == NULL) { Py_DECREF(it); PyErr_NoMemory(); return NULL; } - it->parent_stack->parent = NULL; - it->parent_stack->child_index = 0; - it->parent_stack->next = NULL; + it->parent_stack_used = 0; + it->parent_stack_size = INIT_PARENT_STACK_SIZE; return (PyObject *)it; } @@ -2336,7 +2291,7 @@ typedef struct { PyObject *element_factory; /* element tracing */ - PyObject *events; /* list of events, or NULL if not collecting */ + PyObject *events_append; /* the append method of the list of events, or NULL */ PyObject *start_event_obj; /* event objects (NULL to ignore) */ PyObject *end_event_obj; PyObject *start_ns_event_obj; @@ -2371,7 +2326,7 @@ treebuilder_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } t->index = 0; - t->events = NULL; + t->events_append = NULL; t->start_event_obj = t->end_event_obj = NULL; t->start_ns_event_obj = t->end_ns_event_obj = NULL; } @@ -2390,13 +2345,9 @@ _elementtree_TreeBuilder___init___impl(TreeBuilderObject *self, PyObject *element_factory) /*[clinic end generated code: output=91cfa7558970ee96 input=1b424eeefc35249c]*/ { - PyObject *tmp; - if (element_factory) { Py_INCREF(element_factory); - tmp = self->element_factory; - self->element_factory = element_factory; - Py_XDECREF(tmp); + Py_XSETREF(self->element_factory, element_factory); } return 0; @@ -2421,7 +2372,7 @@ treebuilder_gc_clear(TreeBuilderObject *self) Py_CLEAR(self->start_ns_event_obj); Py_CLEAR(self->end_event_obj); Py_CLEAR(self->start_event_obj); - Py_CLEAR(self->events); + Py_CLEAR(self->events_append); Py_CLEAR(self->stack); Py_CLEAR(self->data); Py_CLEAR(self->last); @@ -2443,51 +2394,40 @@ treebuilder_dealloc(TreeBuilderObject *self) /* helpers for handling of arbitrary element-like objects */ static int -treebuilder_set_element_text_or_tail(PyObject *element, PyObject **data, +treebuilder_set_element_text_or_tail(PyObject *element, PyObject *data, PyObject **dest, _Py_Identifier *name) { if (Element_CheckExact(element)) { - PyObject *tmp = JOIN_OBJ(*dest); - *dest = JOIN_SET(*data, PyList_CheckExact(*data)); - *data = NULL; - Py_DECREF(tmp); + Py_DECREF(JOIN_OBJ(*dest)); + *dest = JOIN_SET(data, PyList_CheckExact(data)); return 0; } else { - PyObject *joined = list_join(*data); + PyObject *joined = list_join(data); int r; if (joined == NULL) return -1; r = _PyObject_SetAttrId(element, name, joined); Py_DECREF(joined); - if (r < 0) - return -1; - Py_CLEAR(*data); - return 0; + return r; } } -LOCAL(int) -treebuilder_flush_data(TreeBuilderObject* self) +/* These two functions steal a reference to data */ +static int +treebuilder_set_element_text(PyObject *element, PyObject *data) { - PyObject *element = self->last; - - if (!self->data) { - return 0; - } + _Py_IDENTIFIER(text); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->text, &PyId_text); +} - if (self->this == element) { - _Py_IDENTIFIER(text); - return treebuilder_set_element_text_or_tail( - element, &self->data, - &((ElementObject *) element)->text, &PyId_text); - } - else { - _Py_IDENTIFIER(tail); - return treebuilder_set_element_text_or_tail( - element, &self->data, - &((ElementObject *) element)->tail, &PyId_tail); - } +static int +treebuilder_set_element_tail(PyObject *element, PyObject *data) +{ + _Py_IDENTIFIER(tail); + return treebuilder_set_element_text_or_tail( + element, data, &((ElementObject *) element)->tail, &PyId_tail); } static int @@ -2513,13 +2453,14 @@ treebuilder_append_event(TreeBuilderObject *self, PyObject *action, PyObject *node) { if (action != NULL) { - PyObject *res = PyTuple_Pack(2, action, node); - if (res == NULL) + PyObject *res; + PyObject *event = PyTuple_Pack(2, action, node); + if (event == NULL) return -1; - if (PyList_Append(self->events, res) < 0) { - Py_DECREF(res); + res = PyObject_CallFunctionObjArgs(self->events_append, event, NULL); + Py_DECREF(event); + if (res == NULL) return -1; - } Py_DECREF(res); } return 0; @@ -2536,14 +2477,29 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag, PyObject* this; elementtreestate *st = ET_STATE_GLOBAL; - if (treebuilder_flush_data(self) < 0) { - return NULL; + if (self->data) { + if (self->this == self->last) { + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; + } + else { + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; + } + self->data = NULL; } - if (self->element_factory && self->element_factory != Py_None) { - node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib); - } else { + if (!self->element_factory || self->element_factory == Py_None) { node = create_new_element(tag, attrib); + } else if (attrib == Py_None) { + attrib = PyDict_New(); + if (!attrib) + return NULL; + node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib); + Py_DECREF(attrib); + } + else { + node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib); } if (!node) { return NULL; @@ -2633,8 +2589,15 @@ treebuilder_handle_end(TreeBuilderObject* self, PyObject* tag) { PyObject* item; - if (treebuilder_flush_data(self) < 0) { - return NULL; + if (self->data) { + if (self->this == self->last) { + if (treebuilder_set_element_text(self->last, self->data)) + return NULL; + } else { + if (treebuilder_set_element_tail(self->last, self->data)) + return NULL; + } + self->data = NULL; } if (self->index == 0) { @@ -2995,12 +2958,8 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in, attrib_in += 2; } } else { - /* Pass an empty dictionary on */ - attrib = PyDict_New(); - if (!attrib) { - Py_DECREF(tag); - return; - } + Py_INCREF(Py_None); + attrib = Py_None; } if (TreeBuilder_CheckExact(self->target)) { @@ -3009,6 +2968,14 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in, tag, attrib); } else if (self->handle_start) { + if (attrib == Py_None) { + Py_DECREF(attrib); + attrib = PyDict_New(); + if (!attrib) { + Py_DECREF(tag); + return; + } + } res = PyObject_CallFunction(self->handle_start, "OO", tag, attrib); } else res = NULL; @@ -3082,7 +3049,7 @@ expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix, if (PyErr_Occurred()) return; - if (!target->events || !target->start_ns_event_obj) + if (!target->events_append || !target->start_ns_event_obj) return; if (!uri) @@ -3105,7 +3072,7 @@ expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in) if (PyErr_Occurred()) return; - if (!target->events) + if (!target->events_append) return; treebuilder_append_event(target, target->end_ns_event_obj, Py_None); @@ -3432,7 +3399,7 @@ _elementtree_XMLParser_close_impl(XMLParserObject *self) } else if (self->handle_close) { Py_DECREF(res); - return PyObject_CallFunction(self->handle_close, ""); + return _PyObject_CallNoArg(self->handle_close); } else { return res; @@ -3594,7 +3561,7 @@ _elementtree_XMLParser_doctype_impl(XMLParserObject *self, PyObject *name, /*[clinic input] _elementtree.XMLParser._setevents - events_queue: object(subclass_of='&PyList_Type') + events_queue: object events_to_report: object = None / @@ -3604,12 +3571,12 @@ static PyObject * _elementtree_XMLParser__setevents_impl(XMLParserObject *self, PyObject *events_queue, PyObject *events_to_report) -/*[clinic end generated code: output=1440092922b13ed1 input=59db9742910c6174]*/ +/*[clinic end generated code: output=1440092922b13ed1 input=abf90830a1c3b0fc]*/ { /* activate element event reporting */ Py_ssize_t i; TreeBuilderObject *target; - PyObject *events_seq; + PyObject *events_append, *events_seq; if (!TreeBuilder_CheckExact(self->target)) { PyErr_SetString( @@ -3622,8 +3589,10 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, target = (TreeBuilderObject*) self->target; - Py_INCREF(events_queue); - Py_XSETREF(target->events, events_queue); + events_append = PyObject_GetAttrString(events_queue, "append"); + if (events_append == NULL) + return NULL; + Py_XSETREF(target->events_append, events_append); /* clear out existing events */ Py_CLEAR(target->start_event_obj); @@ -3733,7 +3702,7 @@ static PyMethodDef element_methods[] = { _ELEMENTTREE_ELEMENT_ITERTEXT_METHODDEF _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF - {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_iter__doc__}, + {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__}, _ELEMENTTREE_ELEMENT_GETCHILDREN_METHODDEF _ELEMENTTREE_ELEMENT_ITEMS_METHODDEF @@ -3756,6 +3725,26 @@ static PyMappingMethods element_as_mapping = { (objobjargproc) element_ass_subscr, }; +static PyGetSetDef element_getsetlist[] = { + {"tag", + (getter)element_tag_getter, + (setter)element_tag_setter, + "A string identifying what kind of data this element represents"}, + {"text", + (getter)element_text_getter, + (setter)element_text_setter, + "A string of text directly after the start tag, or None"}, + {"tail", + (getter)element_tail_getter, + (setter)element_tail_setter, + "A string of text directly after the end tag, or None"}, + {"attrib", + (getter)element_attrib_getter, + (setter)element_attrib_setter, + "A dictionary containing the element's attributes"}, + {NULL}, +}; + static PyTypeObject Element_Type = { PyVarObject_HEAD_INIT(NULL, 0) "xml.etree.ElementTree.Element", sizeof(ElementObject), 0, @@ -3772,8 +3761,8 @@ static PyTypeObject Element_Type = { 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ - (getattrofunc)element_getattro, /* tp_getattro */ - (setattrofunc)element_setattro, /* tp_setattro */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */ @@ -3786,7 +3775,7 @@ static PyTypeObject Element_Type = { 0, /* tp_iternext */ element_methods, /* tp_methods */ 0, /* tp_members */ - 0, /* tp_getset */ + element_getsetlist, /* tp_getset */ 0, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ @@ -3952,11 +3941,6 @@ PyInit__elementtree(void) st->deepcopy_obj = PyObject_GetAttrString(temp, "deepcopy"); Py_XDECREF(temp); - if (st->deepcopy_obj == NULL) { - return NULL; - } - - assert(!PyErr_Occurred()); if (!(st->elementpath_obj = PyImport_ImportModule("xml.etree.ElementPath"))) return NULL; diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 985bcb6..2269d05 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -88,13 +88,10 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw) if (kw == NULL) { pto->kw = PyDict_New(); } - else if (Py_REFCNT(kw) == 1) { + else { Py_INCREF(kw); pto->kw = kw; } - else { - pto->kw = PyDict_Copy(kw); - } } else { pto->kw = PyDict_Copy(pkw); @@ -131,44 +128,60 @@ partial_call(partialobject *pto, PyObject *args, PyObject *kw) { PyObject *ret; PyObject *argappl, *kwappl; + PyObject **stack; + Py_ssize_t nargs; assert (PyCallable_Check(pto->fn)); assert (PyTuple_Check(pto->args)); assert (PyDict_Check(pto->kw)); if (PyTuple_GET_SIZE(pto->args) == 0) { - argappl = args; - Py_INCREF(args); - } else if (PyTuple_GET_SIZE(args) == 0) { - argappl = pto->args; - Py_INCREF(pto->args); - } else { + stack = &PyTuple_GET_ITEM(args, 0); + nargs = PyTuple_GET_SIZE(args); + argappl = NULL; + } + else if (PyTuple_GET_SIZE(args) == 0) { + stack = &PyTuple_GET_ITEM(pto->args, 0); + nargs = PyTuple_GET_SIZE(pto->args); + argappl = NULL; + } + else { + stack = NULL; argappl = PySequence_Concat(pto->args, args); - if (argappl == NULL) + if (argappl == NULL) { return NULL; + } + assert(PyTuple_Check(argappl)); } if (PyDict_Size(pto->kw) == 0) { kwappl = kw; Py_XINCREF(kwappl); - } else { + } + else { kwappl = PyDict_Copy(pto->kw); if (kwappl == NULL) { - Py_DECREF(argappl); + Py_XDECREF(argappl); return NULL; } + if (kw != NULL) { if (PyDict_Merge(kwappl, kw, 1) != 0) { - Py_DECREF(argappl); + Py_XDECREF(argappl); Py_DECREF(kwappl); return NULL; } } } - ret = PyObject_Call(pto->fn, argappl, kwappl); - Py_DECREF(argappl); + if (stack) { + ret = _PyObject_FastCallDict(pto->fn, stack, nargs, kwappl); + } + else { + ret = PyObject_Call(pto->fn, argappl, kwappl); + Py_DECREF(argappl); + } Py_XDECREF(kwappl); return ret; } @@ -216,7 +229,7 @@ partial_repr(partialobject *pto) if (status != 0) { if (status < 0) return NULL; - return PyUnicode_FromFormat("%s(...)", Py_TYPE(pto)->tp_name); + return PyUnicode_FromString("..."); } arglist = PyUnicode_FromString(""); @@ -234,11 +247,8 @@ partial_repr(partialobject *pto) /* Pack keyword arguments */ assert (PyDict_Check(pto->kw)); for (i = 0; PyDict_Next(pto->kw, &i, &key, &value);) { - /* Prevent key.__str__ from deleting the value. */ - Py_INCREF(value); - Py_SETREF(arglist, PyUnicode_FromFormat("%U, %S=%R", arglist, + Py_SETREF(arglist, PyUnicode_FromFormat("%U, %U=%R", arglist, key, value)); - Py_DECREF(value); if (arglist == NULL) goto done; } @@ -467,12 +477,12 @@ static PyObject * keyobject_richcompare(PyObject *ko, PyObject *other, int op) { PyObject *res; - PyObject *args; PyObject *x; PyObject *y; PyObject *compare; PyObject *answer; static PyObject *zero; + PyObject* stack[2]; if (zero == NULL) { zero = PyLong_FromLong(0); @@ -496,17 +506,13 @@ keyobject_richcompare(PyObject *ko, PyObject *other, int op) /* Call the user's comparison function and translate the 3-way * result into true or false (or error). */ - args = PyTuple_New(2); - if (args == NULL) - return NULL; - Py_INCREF(x); - Py_INCREF(y); - PyTuple_SET_ITEM(args, 0, x); - PyTuple_SET_ITEM(args, 1, y); - res = PyObject_Call(compare, args, NULL); - Py_DECREF(args); - if (res == NULL) + stack[0] = x; + stack[1] = y; + res = _PyObject_FastCall(compare, stack, 2); + if (res == NULL) { return NULL; + } + answer = PyObject_RichCompare(res, zero, op); Py_DECREF(res); return answer; @@ -870,56 +876,42 @@ bounded_lru_cache_wrapper(lru_cache_object *self, PyObject *args, PyObject *kwds } if (self->full && self->root.next != &self->root) { /* Use the oldest item to store the new key and result. */ - PyObject *oldkey, *oldresult, *popresult; + PyObject *oldkey, *oldresult; /* Extricate the oldest item. */ link = self->root.next; lru_cache_extricate_link(link); /* Remove it from the cache. The cache dict holds one reference to the link, and the linked list holds yet one reference to it. */ - popresult = _PyDict_Pop_KnownHash((PyDictObject *)self->cache, - link->key, link->hash, - Py_None); - if (popresult == Py_None) { - /* Getting here means that this same key was added to the - cache while the lock was released. Since the link - update is already done, we need only return the - computed result and update the count of misses. */ - Py_DECREF(popresult); - Py_DECREF(link); - Py_DECREF(key); - } - else if (popresult == NULL) { + if (_PyDict_DelItem_KnownHash(self->cache, link->key, + link->hash) < 0) { lru_cache_append_link(self, link); Py_DECREF(key); Py_DECREF(result); return NULL; } - else { - Py_DECREF(popresult); - /* Keep a reference to the old key and old result to - prevent their ref counts from going to zero during the - update. That will prevent potentially arbitrary object - clean-up code (i.e. __del__) from running while we're - still adjusting the links. */ - oldkey = link->key; - oldresult = link->result; - - link->hash = hash; - link->key = key; - link->result = result; - if (_PyDict_SetItem_KnownHash(self->cache, key, (PyObject *)link, - hash) < 0) { - Py_DECREF(link); - Py_DECREF(oldkey); - Py_DECREF(oldresult); - return NULL; - } - lru_cache_append_link(self, link); - Py_INCREF(result); /* for return */ + /* Keep a reference to the old key and old result to + prevent their ref counts from going to zero during the + update. That will prevent potentially arbitrary object + clean-up code (i.e. __del__) from running while we're + still adjusting the links. */ + oldkey = link->key; + oldresult = link->result; + + link->hash = hash; + link->key = key; + link->result = result; + if (_PyDict_SetItem_KnownHash(self->cache, key, (PyObject *)link, + hash) < 0) { + Py_DECREF(link); Py_DECREF(oldkey); Py_DECREF(oldresult); + return NULL; } + lru_cache_append_link(self, link); + Py_INCREF(result); /* for return */ + Py_DECREF(oldkey); + Py_DECREF(oldresult); } else { /* Put result in a new link at the front of the queue. */ link = (lru_list_elem *)PyObject_GC_New(lru_list_elem, diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index b840bf5..daae71d 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -614,7 +614,7 @@ dbmopen_impl(PyObject *module, const char *name, const char *flags, int mode) return newdbmobject(name, iflags, mode); } -static char dbmmodule_open_flags[] = "rwcn" +static const char dbmmodule_open_flags[] = "rwcn" #ifdef GDBM_FAST "f" #endif diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index ff57614..daa4f3d 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -25,6 +25,12 @@ #include #include "openssl/err.h" +#include "clinic/_hashopenssl.c.h" +/*[clinic input] +module _hashlib +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=c2b4ff081bac4be1]*/ + #define MUNCH_SIZE INT_MAX #ifndef HASH_OBJ_CONSTRUCTOR @@ -713,6 +719,128 @@ pbkdf2_hmac(PyObject *self, PyObject *args, PyObject *kwdict) #endif +#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER) +#define PY_SCRYPT 1 + +/*[clinic input] +_hashlib.scrypt + + password: Py_buffer + * + salt: Py_buffer = None + n as n_obj: object(subclass_of='&PyLong_Type') = None + r as r_obj: object(subclass_of='&PyLong_Type') = None + p as p_obj: object(subclass_of='&PyLong_Type') = None + maxmem: long = 0 + dklen: long = 64 + + +scrypt password-based key derivation function. +[clinic start generated code]*/ + +static PyObject * +_hashlib_scrypt_impl(PyObject *module, Py_buffer *password, Py_buffer *salt, + PyObject *n_obj, PyObject *r_obj, PyObject *p_obj, + long maxmem, long dklen) +/*[clinic end generated code: output=14849e2aa2b7b46c input=48a7d63bf3f75c42]*/ +{ + PyObject *key_obj = NULL; + char *key; + int retval; + unsigned long n, r, p; + + if (password->len > INT_MAX) { + PyErr_SetString(PyExc_OverflowError, + "password is too long."); + return NULL; + } + + if (salt->buf == NULL) { + PyErr_SetString(PyExc_TypeError, + "salt is required"); + return NULL; + } + if (salt->len > INT_MAX) { + PyErr_SetString(PyExc_OverflowError, + "salt is too long."); + return NULL; + } + + n = PyLong_AsUnsignedLong(n_obj); + if (n == (unsigned long) -1 && PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError, + "n is required and must be an unsigned int"); + return NULL; + } + if (n < 2 || n & (n - 1)) { + PyErr_SetString(PyExc_ValueError, + "n must be a power of 2."); + return NULL; + } + + r = PyLong_AsUnsignedLong(r_obj); + if (r == (unsigned long) -1 && PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError, + "r is required and must be an unsigned int"); + return NULL; + } + + p = PyLong_AsUnsignedLong(p_obj); + if (p == (unsigned long) -1 && PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError, + "p is required and must be an unsigned int"); + return NULL; + } + + if (maxmem < 0 || maxmem > INT_MAX) { + /* OpenSSL 1.1.0 restricts maxmem to 32MB. It may change in the + future. The maxmem constant is private to OpenSSL. */ + PyErr_Format(PyExc_ValueError, + "maxmem must be positive and smaller than %d", + INT_MAX); + return NULL; + } + + if (dklen < 1 || dklen > INT_MAX) { + PyErr_Format(PyExc_ValueError, + "dklen must be greater than 0 and smaller than %d", + INT_MAX); + return NULL; + } + + /* let OpenSSL validate the rest */ + retval = EVP_PBE_scrypt(NULL, 0, NULL, 0, n, r, p, maxmem, NULL, 0); + if (!retval) { + /* sorry, can't do much better */ + PyErr_SetString(PyExc_ValueError, + "Invalid paramemter combination for n, r, p, maxmem."); + return NULL; + } + + key_obj = PyBytes_FromStringAndSize(NULL, dklen); + if (key_obj == NULL) { + return NULL; + } + key = PyBytes_AS_STRING(key_obj); + + Py_BEGIN_ALLOW_THREADS + retval = EVP_PBE_scrypt( + (const char*)password->buf, (size_t)password->len, + (const unsigned char *)salt->buf, (size_t)salt->len, + n, r, p, maxmem, + (unsigned char *)key, (size_t)dklen + ); + Py_END_ALLOW_THREADS + + if (!retval) { + Py_CLEAR(key_obj); + _setException(PyExc_ValueError); + return NULL; + } + return key_obj; +} +#endif + /* State for our callback function so that it can accumulate a result. */ typedef struct _internal_name_mapper_state { PyObject *set; @@ -836,6 +964,7 @@ static struct PyMethodDef EVP_functions[] = { {"pbkdf2_hmac", (PyCFunction)pbkdf2_hmac, METH_VARARGS|METH_KEYWORDS, pbkdf2_hmac__doc__}, #endif + _HASHLIB_SCRYPT_METHODDEF CONSTRUCTOR_METH_DEF(md5), CONSTRUCTOR_METH_DEF(sha1), CONSTRUCTOR_METH_DEF(sha224), diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 136abf5..b499e1f 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -66,7 +66,7 @@ siftup(PyListObject *heap, Py_ssize_t pos) /* Bubble up the smaller child until hitting a leaf. */ arr = _PyList_ITEMS(heap); - limit = endpos / 2; /* smallest pos that has no child */ + limit = endpos >> 1; /* smallest pos that has no child */ while (pos < limit) { /* Set childpos to index of smaller child. */ childpos = 2*pos + 1; /* leftmost child position */ @@ -78,6 +78,7 @@ siftup(PyListObject *heap, Py_ssize_t pos) if (cmp < 0) return -1; childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */ + arr = _PyList_ITEMS(heap); /* arr may have changed */ if (endpos != PyList_GET_SIZE(heap)) { PyErr_SetString(PyExc_RuntimeError, "list changed size during iteration"); @@ -85,7 +86,6 @@ siftup(PyListObject *heap, Py_ssize_t pos) } } /* Move the smaller child up. */ - arr = _PyList_ITEMS(heap); tmp1 = arr[childpos]; tmp2 = arr[pos]; arr[childpos] = tmp2; @@ -347,7 +347,7 @@ heapify_internal(PyObject *heap, int siftup_func(PyListObject *, Py_ssize_t)) n is odd = 2*j+1, this is (2*j+1-1)/2 = j so j-1 is the largest, and that's again n//2-1. */ - for (i = n/2 - 1 ; i >= 0 ; i--) + for (i = (n >> 1) - 1 ; i >= 0 ; i--) if (siftup_func((PyListObject *)heap, i)) return NULL; Py_RETURN_NONE; @@ -420,7 +420,7 @@ siftup_max(PyListObject *heap, Py_ssize_t pos) /* Bubble up the smaller child until hitting a leaf. */ arr = _PyList_ITEMS(heap); - limit = endpos / 2; /* smallest pos that has no child */ + limit = endpos >> 1; /* smallest pos that has no child */ while (pos < limit) { /* Set childpos to index of smaller child. */ childpos = 2*pos + 1; /* leftmost child position */ @@ -432,6 +432,7 @@ siftup_max(PyListObject *heap, Py_ssize_t pos) if (cmp < 0) return -1; childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */ + arr = _PyList_ITEMS(heap); /* arr may have changed */ if (endpos != PyList_GET_SIZE(heap)) { PyErr_SetString(PyExc_RuntimeError, "list changed size during iteration"); @@ -439,7 +440,6 @@ siftup_max(PyListObject *heap, Py_ssize_t pos) } } /* Move the smaller child up. */ - arr = _PyList_ITEMS(heap); tmp1 = arr[childpos]; tmp2 = arr[pos]; arr[childpos] = tmp2; diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index e9f22af..60f8b54 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -20,6 +20,9 @@ #include #endif /* HAVE_SYS_STAT_H */ +#ifdef MS_WINDOWS +#include +#endif /* Various interned strings */ @@ -52,7 +55,6 @@ PyObject *_PyIO_empty_str; PyObject *_PyIO_empty_bytes; PyObject *_PyIO_zero; - PyDoc_STRVAR(module_doc, "The io module provides the Python interfaces to stream handling. The\n" "builtin open function is defined in this module.\n" @@ -238,20 +240,33 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, int text = 0, binary = 0, universal = 0; char rawmode[6], *m; - int line_buffering, isatty; + int line_buffering, is_number; + long isatty; - PyObject *raw, *modeobj = NULL, *buffer, *wrapper, *result = NULL; + PyObject *raw, *modeobj = NULL, *buffer, *wrapper, *result = NULL, *path_or_fd = NULL; _Py_IDENTIFIER(_blksize); _Py_IDENTIFIER(isatty); _Py_IDENTIFIER(mode); _Py_IDENTIFIER(close); - if (!PyUnicode_Check(file) && - !PyBytes_Check(file) && - !PyNumber_Check(file)) { + is_number = PyNumber_Check(file); + + if (is_number) { + path_or_fd = file; + Py_INCREF(path_or_fd); + } else { + path_or_fd = PyOS_FSPath(file); + if (path_or_fd == NULL) { + return NULL; + } + } + + if (!is_number && + !PyUnicode_Check(path_or_fd) && + !PyBytes_Check(path_or_fd)) { PyErr_Format(PyExc_TypeError, "invalid file: %R", file); - return NULL; + goto error; } /* Decode mode */ @@ -292,7 +307,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, if (strchr(mode+i+1, c)) { invalid_mode: PyErr_Format(PyExc_ValueError, "invalid mode: '%s'", mode); - return NULL; + goto error; } } @@ -307,54 +322,67 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, /* Parameters validation */ if (universal) { - if (writing || appending) { + if (creating || writing || appending || updating) { PyErr_SetString(PyExc_ValueError, - "can't use U and writing mode at once"); - return NULL; + "mode U cannot be combined with x', 'w', 'a', or '+'"); + goto error; } if (PyErr_WarnEx(PyExc_DeprecationWarning, "'U' mode is deprecated", 1) < 0) - return NULL; + goto error; reading = 1; } if (text && binary) { PyErr_SetString(PyExc_ValueError, "can't have text and binary mode at once"); - return NULL; + goto error; } if (creating + reading + writing + appending > 1) { PyErr_SetString(PyExc_ValueError, "must have exactly one of create/read/write/append mode"); - return NULL; + goto error; } if (binary && encoding != NULL) { PyErr_SetString(PyExc_ValueError, "binary mode doesn't take an encoding argument"); - return NULL; + goto error; } if (binary && errors != NULL) { PyErr_SetString(PyExc_ValueError, "binary mode doesn't take an errors argument"); - return NULL; + goto error; } if (binary && newline != NULL) { PyErr_SetString(PyExc_ValueError, "binary mode doesn't take a newline argument"); - return NULL; + goto error; } /* Create the Raw file stream */ - raw = PyObject_CallFunction((PyObject *)&PyFileIO_Type, - "OsiO", file, rawmode, closefd, opener); + { + PyObject *RawIO_class = (PyObject *)&PyFileIO_Type; +#ifdef MS_WINDOWS + if (!Py_LegacyWindowsStdioFlag && _PyIO_get_console_type(path_or_fd) != '\0') { + RawIO_class = (PyObject *)&PyWindowsConsoleIO_Type; + encoding = "utf-8"; + } +#endif + raw = PyObject_CallFunction(RawIO_class, + "OsiO", path_or_fd, rawmode, closefd, opener); + } + if (raw == NULL) - return NULL; + goto error; result = raw; + Py_DECREF(path_or_fd); + path_or_fd = NULL; + modeobj = PyUnicode_FromString(mode); if (modeobj == NULL) goto error; @@ -437,10 +465,10 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, /* wraps into a TextIOWrapper */ wrapper = PyObject_CallFunction((PyObject *)&PyTextIOWrapper_Type, - "Osssi", - buffer, - encoding, errors, newline, - line_buffering); + "Osssi", + buffer, + encoding, errors, newline, + line_buffering); if (wrapper == NULL) goto error; result = wrapper; @@ -460,6 +488,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, Py_XDECREF(close_result); Py_DECREF(result); } + Py_XDECREF(path_or_fd); Py_XDECREF(modeobj); return NULL; } @@ -654,7 +683,7 @@ PyInit__io(void) /* UnsupportedOperation inherits from ValueError and IOError */ state->unsupported_operation = PyObject_CallFunction( (PyObject *)&PyType_Type, "s(OO){}", - "UnsupportedOperation", PyExc_OSError, PyExc_ValueError); + "UnsupportedOperation", PyExc_ValueError, PyExc_IOError); if (state->unsupported_operation == NULL) goto fail; Py_INCREF(state->unsupported_operation); @@ -691,6 +720,12 @@ PyInit__io(void) PyStringIO_Type.tp_base = &PyTextIOBase_Type; ADD_TYPE(&PyStringIO_Type, "StringIO"); +#ifdef MS_WINDOWS + /* WindowsConsoleIO */ + PyWindowsConsoleIO_Type.tp_base = &PyRawIOBase_Type; + ADD_TYPE(&PyWindowsConsoleIO_Type, "_WindowsConsoleIO"); +#endif + /* BufferedReader */ PyBufferedReader_Type.tp_base = &PyBufferedIOBase_Type; ADD_TYPE(&PyBufferedReader_Type, "BufferedReader"); diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h index 0c6eae2..daaebd2 100644 --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -19,6 +19,13 @@ extern PyTypeObject PyBufferedRandom_Type; extern PyTypeObject PyTextIOWrapper_Type; extern PyTypeObject PyIncrementalNewlineDecoder_Type; +#ifndef Py_LIMITED_API +#ifdef MS_WINDOWS +extern PyTypeObject PyWindowsConsoleIO_Type; +PyAPI_DATA(PyObject *) _PyWindowsConsoleIO_Type; +#define PyWindowsConsoleIO_Check(op) (PyObject_TypeCheck((op), (PyTypeObject*)_PyWindowsConsoleIO_Type)) +#endif /* MS_WINDOWS */ +#endif /* Py_LIMITED_API */ extern int _PyIO_ConvertSsize_t(PyObject *, void *); @@ -60,7 +67,7 @@ extern PyObject *_PyIncrementalNewlineDecoder_decode( * Otherwise, the line ending is specified by readnl, a str object */ extern Py_ssize_t _PyIO_find_line_ending( int translated, int universal, PyObject *readnl, - int kind, char *start, char *end, Py_ssize_t *consumed); + int kind, const char *start, const char *end, Py_ssize_t *consumed); /* Return 1 if an EnvironmentError with errno == EINTR is set (and then clears the error indicator), 0 otherwise. @@ -85,12 +92,12 @@ extern int _PyIO_trap_eintr(void); #ifdef MS_WINDOWS /* Windows uses long long for offsets */ -typedef PY_LONG_LONG Py_off_t; +typedef long long Py_off_t; # define PyLong_AsOff_t PyLong_AsLongLong # define PyLong_FromOff_t PyLong_FromLongLong -# define PY_OFF_T_MAX PY_LLONG_MAX -# define PY_OFF_T_MIN PY_LLONG_MIN -# define PY_OFF_T_COMPAT PY_LONG_LONG /* type compatible with off_t */ +# define PY_OFF_T_MAX LLONG_MAX +# define PY_OFF_T_MIN LLONG_MIN +# define PY_OFF_T_COMPAT long long /* type compatible with off_t */ # define PY_PRIdOFF "lld" /* format to use for that type */ #else @@ -104,12 +111,12 @@ typedef off_t Py_off_t; # define PY_OFF_T_MIN PY_SSIZE_T_MIN # define PY_OFF_T_COMPAT Py_ssize_t # define PY_PRIdOFF "zd" -#elif (HAVE_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG) +#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG) # define PyLong_AsOff_t PyLong_AsLongLong # define PyLong_FromOff_t PyLong_FromLongLong -# define PY_OFF_T_MAX PY_LLONG_MAX -# define PY_OFF_T_MIN PY_LLONG_MIN -# define PY_OFF_T_COMPAT PY_LONG_LONG +# define PY_OFF_T_MAX LLONG_MAX +# define PY_OFF_T_MIN LLONG_MIN +# define PY_OFF_T_COMPAT long long # define PY_PRIdOFF "lld" #elif (SIZEOF_OFF_T == SIZEOF_LONG) # define PyLong_AsOff_t PyLong_AsLong @@ -145,6 +152,10 @@ typedef struct { extern _PyIO_State *_PyIO_get_module_state(void); extern PyObject *_PyIO_get_locale_module(_PyIO_State *); +#ifdef MS_WINDOWS +extern char _PyIO_get_console_type(PyObject *); +#endif + extern PyObject *_PyIO_str_close; extern PyObject *_PyIO_str_closed; extern PyObject *_PyIO_str_decode; diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 909c4fa..cbe7425 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -659,7 +659,7 @@ _bufferedreader_raw_read(buffered *self, char *start, Py_ssize_t len); /* Sets the current error to BlockingIOError */ static void -_set_BlockingIOError(char *msg, Py_ssize_t written) +_set_BlockingIOError(const char *msg, Py_ssize_t written) { PyObject *err; PyErr_Clear(); @@ -1416,18 +1416,8 @@ buffered_repr(buffered *self) res = PyUnicode_FromFormat("<%s>", Py_TYPE(self)->tp_name); } else { - int status = Py_ReprEnter((PyObject *)self); - res = NULL; - if (status == 0) { - res = PyUnicode_FromFormat("<%s name=%R>", - Py_TYPE(self)->tp_name, nameobj); - Py_ReprLeave((PyObject *)self); - } - else if (status > 0) { - PyErr_Format(PyExc_RuntimeError, - "reentrant call inside %s.__repr__", - Py_TYPE(self)->tp_name); - } + res = PyUnicode_FromFormat("<%s name=%R>", + Py_TYPE(self)->tp_name, nameobj); Py_DECREF(nameobj); } return res; diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 9e5d78b..a1ba121 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -87,7 +87,7 @@ scan_eol(bytesio *self, Py_ssize_t len) static int unshare_buffer(bytesio *self, size_t size) { - PyObject *new_buf, *old_buf; + PyObject *new_buf; assert(SHARED_BUF(self)); assert(self->exports == 0); assert(size >= (size_t)self->string_size); @@ -96,9 +96,7 @@ unshare_buffer(bytesio *self, size_t size) return -1; memcpy(PyBytes_AS_STRING(new_buf), PyBytes_AS_STRING(self->buf), self->string_size); - old_buf = self->buf; - self->buf = new_buf; - Py_DECREF(old_buf); + Py_SETREF(self->buf, new_buf); return 0; } diff --git a/Modules/_io/clinic/_iomodule.c.h b/Modules/_io/clinic/_iomodule.c.h index 6c88e32..f2e91a9 100644 --- a/Modules/_io/clinic/_iomodule.c.h +++ b/Modules/_io/clinic/_iomodule.c.h @@ -127,7 +127,7 @@ PyDoc_STRVAR(_io_open__doc__, "opened in a binary mode."); #define _IO_OPEN_METHODDEF \ - {"open", (PyCFunction)_io_open, METH_VARARGS|METH_KEYWORDS, _io_open__doc__}, + {"open", (PyCFunction)_io_open, METH_FASTCALL, _io_open__doc__}, static PyObject * _io_open_impl(PyObject *module, PyObject *file, const char *mode, @@ -135,10 +135,11 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, const char *newline, int closefd, PyObject *opener); static PyObject * -_io_open(PyObject *module, PyObject *args, PyObject *kwargs) +_io_open(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"file", "mode", "buffering", "encoding", "errors", "newline", "closefd", "opener", NULL}; + static const char * const _keywords[] = {"file", "mode", "buffering", "encoding", "errors", "newline", "closefd", "opener", NULL}; + static _PyArg_Parser _parser = {"O|sizzziO:open", _keywords, 0}; PyObject *file; const char *mode = "r"; int buffering = -1; @@ -148,12 +149,13 @@ _io_open(PyObject *module, PyObject *args, PyObject *kwargs) int closefd = 1; PyObject *opener = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|sizzziO:open", _keywords, - &file, &mode, &buffering, &encoding, &errors, &newline, &closefd, &opener)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &file, &mode, &buffering, &encoding, &errors, &newline, &closefd, &opener)) { goto exit; + } return_value = _io_open_impl(module, file, mode, buffering, encoding, errors, newline, closefd, opener); exit: return return_value; } -/*[clinic end generated code: output=bc2c003cb7daeafe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c5b8fc8b83102bbf input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h index 437e275..58144a4 100644 --- a/Modules/_io/clinic/bufferedio.c.h +++ b/Modules/_io/clinic/bufferedio.c.h @@ -19,14 +19,16 @@ _io__BufferedIOBase_readinto(PyObject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto", &buffer)) { goto exit; + } return_value = _io__BufferedIOBase_readinto_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -48,14 +50,16 @@ _io__BufferedIOBase_readinto1(PyObject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto1", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto1", &buffer)) { goto exit; + } return_value = _io__BufferedIOBase_readinto1_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -99,8 +103,9 @@ _io__Buffered_peek(buffered *self, PyObject *args) Py_ssize_t size = 0; if (!PyArg_ParseTuple(args, "|n:peek", - &size)) + &size)) { goto exit; + } return_value = _io__Buffered_peek_impl(self, size); exit: @@ -125,8 +130,9 @@ _io__Buffered_read(buffered *self, PyObject *args) Py_ssize_t n = -1; if (!PyArg_ParseTuple(args, "|O&:read", - _PyIO_ConvertSsize_t, &n)) + _PyIO_ConvertSsize_t, &n)) { goto exit; + } return_value = _io__Buffered_read_impl(self, n); exit: @@ -150,8 +156,9 @@ _io__Buffered_read1(buffered *self, PyObject *arg) PyObject *return_value = NULL; Py_ssize_t n; - if (!PyArg_Parse(arg, "n:read1", &n)) + if (!PyArg_Parse(arg, "n:read1", &n)) { goto exit; + } return_value = _io__Buffered_read1_impl(self, n); exit: @@ -175,14 +182,16 @@ _io__Buffered_readinto(buffered *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto", &buffer)) { goto exit; + } return_value = _io__Buffered_readinto_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -204,14 +213,16 @@ _io__Buffered_readinto1(buffered *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto1", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto1", &buffer)) { goto exit; + } return_value = _io__Buffered_readinto1_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -234,8 +245,9 @@ _io__Buffered_readline(buffered *self, PyObject *args) Py_ssize_t size = -1; if (!PyArg_ParseTuple(args, "|O&:readline", - _PyIO_ConvertSsize_t, &size)) + _PyIO_ConvertSsize_t, &size)) { goto exit; + } return_value = _io__Buffered_readline_impl(self, size); exit: @@ -261,8 +273,9 @@ _io__Buffered_seek(buffered *self, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "O|i:seek", - &targetobj, &whence)) + &targetobj, &whence)) { goto exit; + } return_value = _io__Buffered_seek_impl(self, targetobj, whence); exit: @@ -288,8 +301,9 @@ _io__Buffered_truncate(buffered *self, PyObject *args) if (!PyArg_UnpackTuple(args, "truncate", 0, 1, - &pos)) + &pos)) { goto exit; + } return_value = _io__Buffered_truncate_impl(self, pos); exit: @@ -310,13 +324,15 @@ static int _io_BufferedReader___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"raw", "buffer_size", NULL}; + static const char * const _keywords[] = {"raw", "buffer_size", NULL}; + static _PyArg_Parser _parser = {"O|n:BufferedReader", _keywords, 0}; PyObject *raw; Py_ssize_t buffer_size = DEFAULT_BUFFER_SIZE; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|n:BufferedReader", _keywords, - &raw, &buffer_size)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &raw, &buffer_size)) { goto exit; + } return_value = _io_BufferedReader___init___impl((buffered *)self, raw, buffer_size); exit: @@ -341,13 +357,15 @@ static int _io_BufferedWriter___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"raw", "buffer_size", NULL}; + static const char * const _keywords[] = {"raw", "buffer_size", NULL}; + static _PyArg_Parser _parser = {"O|n:BufferedWriter", _keywords, 0}; PyObject *raw; Py_ssize_t buffer_size = DEFAULT_BUFFER_SIZE; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|n:BufferedWriter", _keywords, - &raw, &buffer_size)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &raw, &buffer_size)) { goto exit; + } return_value = _io_BufferedWriter___init___impl((buffered *)self, raw, buffer_size); exit: @@ -371,14 +389,16 @@ _io_BufferedWriter_write(buffered *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:write", &buffer)) + if (!PyArg_Parse(arg, "y*:write", &buffer)) { goto exit; + } return_value = _io_BufferedWriter_write_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -410,11 +430,13 @@ _io_BufferedRWPair___init__(PyObject *self, PyObject *args, PyObject *kwargs) Py_ssize_t buffer_size = DEFAULT_BUFFER_SIZE; if ((Py_TYPE(self) == &PyBufferedRWPair_Type) && - !_PyArg_NoKeywords("BufferedRWPair", kwargs)) + !_PyArg_NoKeywords("BufferedRWPair", kwargs)) { goto exit; + } if (!PyArg_ParseTuple(args, "OO|n:BufferedRWPair", - &reader, &writer, &buffer_size)) + &reader, &writer, &buffer_size)) { goto exit; + } return_value = _io_BufferedRWPair___init___impl((rwpair *)self, reader, writer, buffer_size); exit: @@ -439,16 +461,18 @@ static int _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"raw", "buffer_size", NULL}; + static const char * const _keywords[] = {"raw", "buffer_size", NULL}; + static _PyArg_Parser _parser = {"O|n:BufferedRandom", _keywords, 0}; PyObject *raw; Py_ssize_t buffer_size = DEFAULT_BUFFER_SIZE; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|n:BufferedRandom", _keywords, - &raw, &buffer_size)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &raw, &buffer_size)) { goto exit; + } return_value = _io_BufferedRandom___init___impl((buffered *)self, raw, buffer_size); exit: return return_value; } -/*[clinic end generated code: output=2bbb5e239b4ffe6f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a956f394ecde4cf9 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h index 5f2abb0..c64ce5c 100644 --- a/Modules/_io/clinic/bytesio.c.h +++ b/Modules/_io/clinic/bytesio.c.h @@ -171,8 +171,9 @@ _io_BytesIO_read(bytesio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "read", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_BytesIO_read_impl(self, arg); exit: @@ -215,8 +216,9 @@ _io_BytesIO_readline(bytesio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "readline", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_BytesIO_readline_impl(self, arg); exit: @@ -247,8 +249,9 @@ _io_BytesIO_readlines(bytesio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "readlines", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_BytesIO_readlines_impl(self, arg); exit: @@ -276,14 +279,16 @@ _io_BytesIO_readinto(bytesio *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto", &buffer)) { goto exit; + } return_value = _io_BytesIO_readinto_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -311,8 +316,9 @@ _io_BytesIO_truncate(bytesio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "truncate", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_BytesIO_truncate_impl(self, arg); exit: @@ -345,8 +351,9 @@ _io_BytesIO_seek(bytesio *self, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "n|i:seek", - &pos, &whence)) + &pos, &whence)) { goto exit; + } return_value = _io_BytesIO_seek_impl(self, pos, whence); exit: @@ -408,15 +415,17 @@ static int _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"initial_bytes", NULL}; + static const char * const _keywords[] = {"initial_bytes", NULL}; + static _PyArg_Parser _parser = {"|O:BytesIO", _keywords, 0}; PyObject *initvalue = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:BytesIO", _keywords, - &initvalue)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &initvalue)) { goto exit; + } return_value = _io_BytesIO___init___impl((bytesio *)self, initvalue); exit: return return_value; } -/*[clinic end generated code: output=60ce2c6272718431 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6382e8eb578eea64 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h index 1042008..908fe0f 100644 --- a/Modules/_io/clinic/fileio.c.h +++ b/Modules/_io/clinic/fileio.c.h @@ -49,15 +49,17 @@ static int _io_FileIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"file", "mode", "closefd", "opener", NULL}; + static const char * const _keywords[] = {"file", "mode", "closefd", "opener", NULL}; + static _PyArg_Parser _parser = {"O|siO:FileIO", _keywords, 0}; PyObject *nameobj; const char *mode = "r"; int closefd = 1; PyObject *opener = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|siO:FileIO", _keywords, - &nameobj, &mode, &closefd, &opener)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &nameobj, &mode, &closefd, &opener)) { goto exit; + } return_value = _io_FileIO___init___impl((fileio *)self, nameobj, mode, closefd, opener); exit: @@ -154,14 +156,16 @@ _io_FileIO_readinto(fileio *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "w*:readinto", &buffer)) + if (!PyArg_Parse(arg, "w*:readinto", &buffer)) { goto exit; + } return_value = _io_FileIO_readinto_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -210,8 +214,9 @@ _io_FileIO_read(fileio *self, PyObject *args) Py_ssize_t size = -1; if (!PyArg_ParseTuple(args, "|O&:read", - _PyIO_ConvertSsize_t, &size)) + _PyIO_ConvertSsize_t, &size)) { goto exit; + } return_value = _io_FileIO_read_impl(self, size); exit: @@ -240,14 +245,16 @@ _io_FileIO_write(fileio *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer b = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:write", &b)) + if (!PyArg_Parse(arg, "y*:write", &b)) { goto exit; + } return_value = _io_FileIO_write_impl(self, &b); exit: /* Cleanup for b */ - if (b.obj) + if (b.obj) { PyBuffer_Release(&b); + } return return_value; } @@ -280,8 +287,9 @@ _io_FileIO_seek(fileio *self, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "O|i:seek", - &pos, &whence)) + &pos, &whence)) { goto exit; + } return_value = _io_FileIO_seek_impl(self, pos, whence); exit: @@ -333,8 +341,9 @@ _io_FileIO_truncate(fileio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "truncate", 0, 1, - &posobj)) + &posobj)) { goto exit; + } return_value = _io_FileIO_truncate_impl(self, posobj); exit: @@ -364,4 +373,4 @@ _io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored)) #ifndef _IO_FILEIO_TRUNCATE_METHODDEF #define _IO_FILEIO_TRUNCATE_METHODDEF #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */ -/*[clinic end generated code: output=dcbc39b466598492 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=51924bc0ee11d58e input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h index 9762f11..edbf73a 100644 --- a/Modules/_io/clinic/iobase.c.h +++ b/Modules/_io/clinic/iobase.c.h @@ -186,8 +186,9 @@ _io__IOBase_readline(PyObject *self, PyObject *args) Py_ssize_t limit = -1; if (!PyArg_ParseTuple(args, "|O&:readline", - _PyIO_ConvertSsize_t, &limit)) + _PyIO_ConvertSsize_t, &limit)) { goto exit; + } return_value = _io__IOBase_readline_impl(self, limit); exit: @@ -217,8 +218,9 @@ _io__IOBase_readlines(PyObject *self, PyObject *args) Py_ssize_t hint = -1; if (!PyArg_ParseTuple(args, "|O&:readlines", - _PyIO_ConvertSsize_t, &hint)) + _PyIO_ConvertSsize_t, &hint)) { goto exit; + } return_value = _io__IOBase_readlines_impl(self, hint); exit: @@ -251,8 +253,9 @@ _io__RawIOBase_read(PyObject *self, PyObject *args) Py_ssize_t n = -1; if (!PyArg_ParseTuple(args, "|n:read", - &n)) + &n)) { goto exit; + } return_value = _io__RawIOBase_read_impl(self, n); exit: @@ -276,4 +279,4 @@ _io__RawIOBase_readall(PyObject *self, PyObject *Py_UNUSED(ignored)) { return _io__RawIOBase_readall_impl(self); } -/*[clinic end generated code: output=b874952f5cc248a4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=0f53fed928d8e02f input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h index a8e32a3..d2c05d7 100644 --- a/Modules/_io/clinic/stringio.c.h +++ b/Modules/_io/clinic/stringio.c.h @@ -61,8 +61,9 @@ _io_StringIO_read(stringio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "read", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_StringIO_read_impl(self, arg); exit: @@ -91,8 +92,9 @@ _io_StringIO_readline(stringio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "readline", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_StringIO_readline_impl(self, arg); exit: @@ -123,8 +125,9 @@ _io_StringIO_truncate(stringio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "truncate", 0, 1, - &arg)) + &arg)) { goto exit; + } return_value = _io_StringIO_truncate_impl(self, arg); exit: @@ -157,8 +160,9 @@ _io_StringIO_seek(stringio *self, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "n|i:seek", - &pos, &whence)) + &pos, &whence)) { goto exit; + } return_value = _io_StringIO_seek_impl(self, pos, whence); exit: @@ -217,13 +221,15 @@ static int _io_StringIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"initial_value", "newline", NULL}; + static const char * const _keywords[] = {"initial_value", "newline", NULL}; + static _PyArg_Parser _parser = {"|OO:StringIO", _keywords, 0}; PyObject *value = NULL; PyObject *newline_obj = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO:StringIO", _keywords, - &value, &newline_obj)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &value, &newline_obj)) { goto exit; + } return_value = _io_StringIO___init___impl((stringio *)self, value, newline_obj); exit: @@ -283,4 +289,4 @@ _io_StringIO_seekable(stringio *self, PyObject *Py_UNUSED(ignored)) { return _io_StringIO_seekable_impl(self); } -/*[clinic end generated code: output=f061cf3a20cd14ed input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5dd5c2a213e75405 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h index dc7e8c7..f39c355 100644 --- a/Modules/_io/clinic/textio.c.h +++ b/Modules/_io/clinic/textio.c.h @@ -24,14 +24,16 @@ static int _io_IncrementalNewlineDecoder___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"decoder", "translate", "errors", NULL}; + static const char * const _keywords[] = {"decoder", "translate", "errors", NULL}; + static _PyArg_Parser _parser = {"Oi|O:IncrementalNewlineDecoder", _keywords, 0}; PyObject *decoder; int translate; PyObject *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|O:IncrementalNewlineDecoder", _keywords, - &decoder, &translate, &errors)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &decoder, &translate, &errors)) { goto exit; + } return_value = _io_IncrementalNewlineDecoder___init___impl((nldecoder_object *)self, decoder, translate, errors); exit: @@ -44,23 +46,25 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_decode__doc__, "\n"); #define _IO_INCREMENTALNEWLINEDECODER_DECODE_METHODDEF \ - {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_VARARGS|METH_KEYWORDS, _io_IncrementalNewlineDecoder_decode__doc__}, + {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL, _io_IncrementalNewlineDecoder_decode__doc__}, static PyObject * _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self, PyObject *input, int final); static PyObject * -_io_IncrementalNewlineDecoder_decode(nldecoder_object *self, PyObject *args, PyObject *kwargs) +_io_IncrementalNewlineDecoder_decode(nldecoder_object *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"input", "final", NULL}; + static const char * const _keywords[] = {"input", "final", NULL}; + static _PyArg_Parser _parser = {"O|i:decode", _keywords, 0}; PyObject *input; int final = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:decode", _keywords, - &input, &final)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &input, &final)) { goto exit; + } return_value = _io_IncrementalNewlineDecoder_decode_impl(self, input, final); exit: @@ -153,7 +157,8 @@ static int _io_TextIOWrapper___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"buffer", "encoding", "errors", "newline", "line_buffering", "write_through", NULL}; + static const char * const _keywords[] = {"buffer", "encoding", "errors", "newline", "line_buffering", "write_through", NULL}; + static _PyArg_Parser _parser = {"O|zzzii:TextIOWrapper", _keywords, 0}; PyObject *buffer; const char *encoding = NULL; const char *errors = NULL; @@ -161,9 +166,10 @@ _io_TextIOWrapper___init__(PyObject *self, PyObject *args, PyObject *kwargs) int line_buffering = 0; int write_through = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|zzzii:TextIOWrapper", _keywords, - &buffer, &encoding, &errors, &newline, &line_buffering, &write_through)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &buffer, &encoding, &errors, &newline, &line_buffering, &write_through)) { goto exit; + } return_value = _io_TextIOWrapper___init___impl((textio *)self, buffer, encoding, errors, newline, line_buffering, write_through); exit: @@ -204,8 +210,9 @@ _io_TextIOWrapper_write(textio *self, PyObject *arg) PyObject *return_value = NULL; PyObject *text; - if (!PyArg_Parse(arg, "U:write", &text)) + if (!PyArg_Parse(arg, "U:write", &text)) { goto exit; + } return_value = _io_TextIOWrapper_write_impl(self, text); exit: @@ -230,8 +237,9 @@ _io_TextIOWrapper_read(textio *self, PyObject *args) Py_ssize_t n = -1; if (!PyArg_ParseTuple(args, "|O&:read", - _PyIO_ConvertSsize_t, &n)) + _PyIO_ConvertSsize_t, &n)) { goto exit; + } return_value = _io_TextIOWrapper_read_impl(self, n); exit: @@ -256,8 +264,9 @@ _io_TextIOWrapper_readline(textio *self, PyObject *args) Py_ssize_t size = -1; if (!PyArg_ParseTuple(args, "|n:readline", - &size)) + &size)) { goto exit; + } return_value = _io_TextIOWrapper_readline_impl(self, size); exit: @@ -283,8 +292,9 @@ _io_TextIOWrapper_seek(textio *self, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "O|i:seek", - &cookieObj, &whence)) + &cookieObj, &whence)) { goto exit; + } return_value = _io_TextIOWrapper_seek_impl(self, cookieObj, whence); exit: @@ -327,8 +337,9 @@ _io_TextIOWrapper_truncate(textio *self, PyObject *args) if (!PyArg_UnpackTuple(args, "truncate", 0, 1, - &pos)) + &pos)) { goto exit; + } return_value = _io_TextIOWrapper_truncate_impl(self, pos); exit: @@ -453,4 +464,4 @@ _io_TextIOWrapper_close(textio *self, PyObject *Py_UNUSED(ignored)) { return _io_TextIOWrapper_close_impl(self); } -/*[clinic end generated code: output=690608f85aab8ba5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=78ad14eba1667254 input=a9049054013a1b77]*/ diff --git a/Modules/_io/clinic/winconsoleio.c.h b/Modules/_io/clinic/winconsoleio.c.h new file mode 100644 index 0000000..e44fcbb --- /dev/null +++ b/Modules/_io/clinic/winconsoleio.c.h @@ -0,0 +1,331 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_close__doc__, +"close($self, /)\n" +"--\n" +"\n" +"Close the handle.\n" +"\n" +"A closed handle cannot be used for further I/O operations. close() may be\n" +"called more than once without error."); + +#define _IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF \ + {"close", (PyCFunction)_io__WindowsConsoleIO_close, METH_NOARGS, _io__WindowsConsoleIO_close__doc__}, + +static PyObject * +_io__WindowsConsoleIO_close_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_close(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_close_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO___init____doc__, +"_WindowsConsoleIO(file, mode=\'r\', closefd=True, opener=None)\n" +"--\n" +"\n" +"Open a console buffer by file descriptor.\n" +"\n" +"The mode can be \'rb\' (default), or \'wb\' for reading or writing bytes. All\n" +"other mode characters will be ignored. Mode \'b\' will be assumed if it is\n" +"omitted. The *opener* parameter is always ignored."); + +static int +_io__WindowsConsoleIO___init___impl(winconsoleio *self, PyObject *nameobj, + const char *mode, int closefd, + PyObject *opener); + +static int +_io__WindowsConsoleIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) +{ + int return_value = -1; + static const char * const _keywords[] = {"file", "mode", "closefd", "opener", NULL}; + static _PyArg_Parser _parser = {"O|siO:_WindowsConsoleIO", _keywords, 0}; + PyObject *nameobj; + const char *mode = "r"; + int closefd = 1; + PyObject *opener = Py_None; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &nameobj, &mode, &closefd, &opener)) { + goto exit; + } + return_value = _io__WindowsConsoleIO___init___impl((winconsoleio *)self, nameobj, mode, closefd, opener); + +exit: + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_fileno__doc__, +"fileno($self, /)\n" +"--\n" +"\n" +"Return the underlying file descriptor (an integer).\n" +"\n" +"fileno is only set when a file descriptor is used to open\n" +"one of the standard streams."); + +#define _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF \ + {"fileno", (PyCFunction)_io__WindowsConsoleIO_fileno, METH_NOARGS, _io__WindowsConsoleIO_fileno__doc__}, + +static PyObject * +_io__WindowsConsoleIO_fileno_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_fileno(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_fileno_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_readable__doc__, +"readable($self, /)\n" +"--\n" +"\n" +"True if console is an input buffer."); + +#define _IO__WINDOWSCONSOLEIO_READABLE_METHODDEF \ + {"readable", (PyCFunction)_io__WindowsConsoleIO_readable, METH_NOARGS, _io__WindowsConsoleIO_readable__doc__}, + +static PyObject * +_io__WindowsConsoleIO_readable_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_readable(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_readable_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_writable__doc__, +"writable($self, /)\n" +"--\n" +"\n" +"True if console is an output buffer."); + +#define _IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF \ + {"writable", (PyCFunction)_io__WindowsConsoleIO_writable, METH_NOARGS, _io__WindowsConsoleIO_writable__doc__}, + +static PyObject * +_io__WindowsConsoleIO_writable_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_writable(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_writable_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_readinto__doc__, +"readinto($self, buffer, /)\n" +"--\n" +"\n" +"Same as RawIOBase.readinto()."); + +#define _IO__WINDOWSCONSOLEIO_READINTO_METHODDEF \ + {"readinto", (PyCFunction)_io__WindowsConsoleIO_readinto, METH_O, _io__WindowsConsoleIO_readinto__doc__}, + +static PyObject * +_io__WindowsConsoleIO_readinto_impl(winconsoleio *self, Py_buffer *buffer); + +static PyObject * +_io__WindowsConsoleIO_readinto(winconsoleio *self, PyObject *arg) +{ + PyObject *return_value = NULL; + Py_buffer buffer = {NULL, NULL}; + + if (!PyArg_Parse(arg, "w*:readinto", &buffer)) { + goto exit; + } + return_value = _io__WindowsConsoleIO_readinto_impl(self, &buffer); + +exit: + /* Cleanup for buffer */ + if (buffer.obj) { + PyBuffer_Release(&buffer); + } + + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_readall__doc__, +"readall($self, /)\n" +"--\n" +"\n" +"Read all data from the console, returned as bytes.\n" +"\n" +"Return an empty bytes object at EOF."); + +#define _IO__WINDOWSCONSOLEIO_READALL_METHODDEF \ + {"readall", (PyCFunction)_io__WindowsConsoleIO_readall, METH_NOARGS, _io__WindowsConsoleIO_readall__doc__}, + +static PyObject * +_io__WindowsConsoleIO_readall_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_readall(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_readall_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_read__doc__, +"read($self, size=-1, /)\n" +"--\n" +"\n" +"Read at most size bytes, returned as bytes.\n" +"\n" +"Only makes one system call when size is a positive integer,\n" +"so less data may be returned than requested.\n" +"Return an empty bytes object at EOF."); + +#define _IO__WINDOWSCONSOLEIO_READ_METHODDEF \ + {"read", (PyCFunction)_io__WindowsConsoleIO_read, METH_VARARGS, _io__WindowsConsoleIO_read__doc__}, + +static PyObject * +_io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size); + +static PyObject * +_io__WindowsConsoleIO_read(winconsoleio *self, PyObject *args) +{ + PyObject *return_value = NULL; + Py_ssize_t size = -1; + + if (!PyArg_ParseTuple(args, "|O&:read", + _PyIO_ConvertSsize_t, &size)) { + goto exit; + } + return_value = _io__WindowsConsoleIO_read_impl(self, size); + +exit: + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_write__doc__, +"write($self, b, /)\n" +"--\n" +"\n" +"Write buffer b to file, return number of bytes written.\n" +"\n" +"Only makes one system call, so not all of the data may be written.\n" +"The number of bytes actually written is returned."); + +#define _IO__WINDOWSCONSOLEIO_WRITE_METHODDEF \ + {"write", (PyCFunction)_io__WindowsConsoleIO_write, METH_O, _io__WindowsConsoleIO_write__doc__}, + +static PyObject * +_io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b); + +static PyObject * +_io__WindowsConsoleIO_write(winconsoleio *self, PyObject *arg) +{ + PyObject *return_value = NULL; + Py_buffer b = {NULL, NULL}; + + if (!PyArg_Parse(arg, "y*:write", &b)) { + goto exit; + } + return_value = _io__WindowsConsoleIO_write_impl(self, &b); + +exit: + /* Cleanup for b */ + if (b.obj) { + PyBuffer_Release(&b); + } + + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_io__WindowsConsoleIO_isatty__doc__, +"isatty($self, /)\n" +"--\n" +"\n" +"Always True."); + +#define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF \ + {"isatty", (PyCFunction)_io__WindowsConsoleIO_isatty, METH_NOARGS, _io__WindowsConsoleIO_isatty__doc__}, + +static PyObject * +_io__WindowsConsoleIO_isatty_impl(winconsoleio *self); + +static PyObject * +_io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored)) +{ + return _io__WindowsConsoleIO_isatty_impl(self); +} + +#endif /* defined(MS_WINDOWS) */ + +#ifndef _IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF + #define _IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF + #define _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_FILENO_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_READABLE_METHODDEF + #define _IO__WINDOWSCONSOLEIO_READABLE_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_READABLE_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF + #define _IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_READINTO_METHODDEF + #define _IO__WINDOWSCONSOLEIO_READINTO_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_READINTO_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_READALL_METHODDEF + #define _IO__WINDOWSCONSOLEIO_READALL_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_READALL_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_READ_METHODDEF + #define _IO__WINDOWSCONSOLEIO_READ_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_READ_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_WRITE_METHODDEF + #define _IO__WINDOWSCONSOLEIO_WRITE_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_WRITE_METHODDEF) */ + +#ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF + #define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF +#endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */ +/*[clinic end generated code: output=9eba916f8537fff7 input=a9049054013a1b77]*/ diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index c77f055..54cfb7f 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -92,8 +92,7 @@ fileio_dealloc_warn(fileio *self, PyObject *source) if (self->fd >= 0 && self->closefd) { PyObject *exc, *val, *tb; PyErr_Fetch(&exc, &val, &tb); - if (PyErr_WarnFormat(PyExc_ResourceWarning, 1, - "unclosed file %R", source)) { + if (PyErr_ResourceWarning(source, 1, "unclosed file %R", source)) { /* Spurious errors can appear at shutdown */ if (PyErr_ExceptionMatches(PyExc_Warning)) PyErr_WriteUnraisable((PyObject *) self); @@ -118,18 +117,13 @@ internal_close(fileio *self) int fd = self->fd; self->fd = -1; /* fd is accessible and someone else may have closed it */ - if (_PyVerify_fd(fd)) { - Py_BEGIN_ALLOW_THREADS - _Py_BEGIN_SUPPRESS_IPH - err = close(fd); - if (err < 0) - save_errno = errno; - _Py_END_SUPPRESS_IPH - Py_END_ALLOW_THREADS - } else { + Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH + err = close(fd); + if (err < 0) save_errno = errno; - err = -1; - } + _Py_END_SUPPRESS_IPH + Py_END_ALLOW_THREADS } if (err < 0) { errno = save_errno; @@ -546,7 +540,7 @@ err_closed(void) } static PyObject * -err_mode(char *action) +err_mode(const char *action) { _PyIO_State *state = IO_STATE(); if (state != NULL) @@ -701,8 +695,6 @@ _io_FileIO_readall_impl(fileio *self) if (self->fd < 0) return err_closed(); - if (!_PyVerify_fd(self->fd)) - return PyErr_SetFromErrno(PyExc_IOError); _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS @@ -915,18 +907,15 @@ portable_lseek(int fd, PyObject *posobj, int whence) return NULL; } - if (_PyVerify_fd(fd)) { - Py_BEGIN_ALLOW_THREADS - _Py_BEGIN_SUPPRESS_IPH + Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS - res = _lseeki64(fd, pos, whence); + res = _lseeki64(fd, pos, whence); #else - res = lseek(fd, pos, whence); + res = lseek(fd, pos, whence); #endif - _Py_END_SUPPRESS_IPH - Py_END_ALLOW_THREADS - } else - res = -1; + _Py_END_SUPPRESS_IPH + Py_END_ALLOW_THREADS if (res < 0) return PyErr_SetFromErrno(PyExc_IOError); @@ -1049,7 +1038,7 @@ _io_FileIO_truncate_impl(fileio *self, PyObject *posobj) } #endif /* HAVE_FTRUNCATE */ -static char * +static const char * mode_string(fileio *self) { if (self->created) { @@ -1093,19 +1082,9 @@ fileio_repr(fileio *self) self->fd, mode_string(self), self->closefd ? "True" : "False"); } else { - int status = Py_ReprEnter((PyObject *)self); - res = NULL; - if (status == 0) { - res = PyUnicode_FromFormat( - "<_io.FileIO name=%R mode='%s' closefd=%s>", - nameobj, mode_string(self), self->closefd ? "True" : "False"); - Py_ReprLeave((PyObject *)self); - } - else if (status > 0) { - PyErr_Format(PyExc_RuntimeError, - "reentrant call inside %s.__repr__", - Py_TYPE(self)->tp_name); - } + res = PyUnicode_FromFormat( + "<_io.FileIO name=%R mode='%s' closefd=%s>", + nameobj, mode_string(self), self->closefd ? "True" : "False"); Py_DECREF(nameobj); } return res; @@ -1127,10 +1106,7 @@ _io_FileIO_isatty_impl(fileio *self) return err_closed(); Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - if (_PyVerify_fd(self->fd)) - res = isatty(self->fd); - else - res = 0; + res = isatty(self->fd); _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS return PyBool_FromLong(res); diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index 9acd146..472ef3b 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -625,8 +625,7 @@ iobase_iternext(PyObject *self) if (line == NULL) return NULL; - if (PyObject_Size(line) <= 0) { - /* Error or empty */ + if (PyObject_Size(line) == 0) { Py_DECREF(line); return NULL; } @@ -651,7 +650,7 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint) /*[clinic end generated code: output=2f50421677fa3dea input=1961c4a95e96e661]*/ { Py_ssize_t length = 0; - PyObject *result, *it = NULL; + PyObject *result; result = PyList_New(0); if (result == NULL) @@ -665,23 +664,19 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint) PyObject *ret = _PyObject_CallMethodId(result, &PyId_extend, "O", self); if (ret == NULL) { - goto error; + Py_DECREF(result); + return NULL; } Py_DECREF(ret); return result; } - it = PyObject_GetIter(self); - if (it == NULL) { - goto error; - } - while (1) { - Py_ssize_t line_length; - PyObject *line = PyIter_Next(it); + PyObject *line = PyIter_Next(self); if (line == NULL) { if (PyErr_Occurred()) { - goto error; + Py_DECREF(result); + return NULL; } else break; /* StopIteration raised */ @@ -689,25 +684,16 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint) if (PyList_Append(result, line) < 0) { Py_DECREF(line); - goto error; + Py_DECREF(result); + return NULL; } - line_length = PyObject_Size(line); + length += PyObject_Size(line); Py_DECREF(line); - if (line_length < 0) { - goto error; - } - if (line_length > hint - length) + + if (length > hint) break; - length += line_length; } - - Py_DECREF(it); return result; - - error: - Py_XDECREF(it); - Py_DECREF(result); - return NULL; } /*[clinic input] @@ -842,7 +828,7 @@ PyTypeObject PyIOBase_Type = { 0, /* tp_weaklist */ 0, /* tp_del */ 0, /* tp_version_tag */ - (destructor)iobase_finalize, /* tp_finalize */ + iobase_finalize, /* tp_finalize */ }; diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 06b4144..8542efd 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -438,7 +438,7 @@ stringio_iternext(stringio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; @@ -708,7 +708,7 @@ _io_StringIO___init___impl(stringio *self, PyObject *value, Py_TYPE(newline_obj)->tp_name); return -1; } - newline = _PyUnicode_AsString(newline_obj); + newline = PyUnicode_AsUTF8(newline_obj); if (newline == NULL) return -1; } diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 3ab1138..1c7200b 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -531,7 +531,7 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self) /*[clinic end generated code: output=f0d2c9c136f4e0d0 input=f8ff101825e32e7f]*/ { PyObject *buffer; - unsigned PY_LONG_LONG flag; + unsigned long long flag; if (self->decoder != Py_None) { PyObject *state = PyObject_CallMethodObjArgs(self->decoder, @@ -567,7 +567,7 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self, /*[clinic end generated code: output=c10c622508b576cb input=c53fb505a76dbbe2]*/ { PyObject *buffer; - unsigned PY_LONG_LONG flag; + unsigned long long flag; if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) return NULL; @@ -772,7 +772,7 @@ typedef struct { encodefunc_t encodefunc; } encodefuncentry; -static encodefuncentry encodefuncs[] = { +static const encodefuncentry encodefuncs[] = { {"ascii", (encodefunc_t) ascii_encode}, {"iso8859-1", (encodefunc_t) latin1_encode}, {"utf-8", (encodefunc_t) utf8_encode}, @@ -921,7 +921,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, Py_CLEAR(self->encoding); } if (self->encoding != NULL) { - encoding = _PyUnicode_AsString(self->encoding); + encoding = PyUnicode_AsUTF8(self->encoding); if (encoding == NULL) goto error; } @@ -964,7 +964,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, } self->writetranslate = (newline == NULL || newline[0] != '\0'); if (!self->readuniversal && self->readnl) { - self->writenl = _PyUnicode_AsString(self->readnl); + self->writenl = PyUnicode_AsUTF8(self->readnl); if (self->writenl == NULL) goto error; if (!strcmp(self->writenl, "\n")) @@ -1012,7 +1012,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, errors); if (self->encoder == NULL) goto error; - /* Get the normalized name of the codec */ + /* Get the normalized named of the codec */ res = _PyObject_GetAttrId(codec_info, &PyId_name); if (res == NULL) { if (PyErr_ExceptionMatches(PyExc_AttributeError)) @@ -1021,7 +1021,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, goto error; } else if (PyUnicode_Check(res)) { - encodefuncentry *e = encodefuncs; + const encodefuncentry *e = encodefuncs; while (e->name != NULL) { if (_PyUnicode_EqualToASCIIString(res, e->name)) { self->encodefunc = e->encodefunc; @@ -1637,8 +1637,8 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n) /* NOTE: `end` must point to the real end of the Py_UCS4 storage, that is to the NUL character. Otherwise the function will produce incorrect results. */ -static char * -find_control_char(int kind, char *s, char *end, Py_UCS4 ch) +static const char * +find_control_char(int kind, const char *s, const char *end, Py_UCS4 ch) { if (kind == PyUnicode_1BYTE_KIND) { assert(ch < 256); @@ -1658,13 +1658,13 @@ find_control_char(int kind, char *s, char *end, Py_UCS4 ch) Py_ssize_t _PyIO_find_line_ending( int translated, int universal, PyObject *readnl, - int kind, char *start, char *end, Py_ssize_t *consumed) + int kind, const char *start, const char *end, Py_ssize_t *consumed) { Py_ssize_t len = ((char*)end - (char*)start)/kind; if (translated) { /* Newlines are already translated, only search for \n */ - char *pos = find_control_char(kind, start, end, '\n'); + const char *pos = find_control_char(kind, start, end, '\n'); if (pos != NULL) return (pos - start)/kind + 1; else { @@ -1676,7 +1676,7 @@ _PyIO_find_line_ending( /* Universal newline search. Find any of \r, \r\n, \n * The decoder ensures that \r\n are not split in two pieces */ - char *s = start; + const char *s = start; for (;;) { Py_UCS4 ch; /* Fast path for non-control chars. The loop always ends @@ -1706,21 +1706,21 @@ _PyIO_find_line_ending( /* Assume that readnl is an ASCII character. */ assert(PyUnicode_KIND(readnl) == PyUnicode_1BYTE_KIND); if (readnl_len == 1) { - char *pos = find_control_char(kind, start, end, nl[0]); + const char *pos = find_control_char(kind, start, end, nl[0]); if (pos != NULL) return (pos - start)/kind + 1; *consumed = len; return -1; } else { - char *s = start; - char *e = end - (readnl_len - 1)*kind; - char *pos; + const char *s = start; + const char *e = end - (readnl_len - 1)*kind; + const char *pos; if (e < s) e = s; while (s < e) { Py_ssize_t i; - char *pos = find_control_char(kind, s, end, nl[0]); + const char *pos = find_control_char(kind, s, end, nl[0]); if (pos == NULL || pos >= e) break; for (i = 1; i < readnl_len; i++) { @@ -2483,7 +2483,6 @@ static PyObject * textiowrapper_repr(textio *self) { PyObject *nameobj, *modeobj, *res, *s; - int status; CHECK_INITIALIZED(self); @@ -2491,15 +2490,6 @@ textiowrapper_repr(textio *self) if (res == NULL) return NULL; - status = Py_ReprEnter((PyObject *)self); - if (status != 0) { - if (status > 0) { - PyErr_Format(PyExc_RuntimeError, - "reentrant call inside %s.__repr__", - Py_TYPE(self)->tp_name); - } - goto error; - } nameobj = _PyObject_GetAttrId((PyObject *) self, &PyId_name); if (nameobj == NULL) { if (PyErr_ExceptionMatches(PyExc_Exception)) @@ -2514,7 +2504,7 @@ textiowrapper_repr(textio *self) goto error; PyUnicode_AppendAndDel(&res, s); if (res == NULL) - goto error; + return NULL; } modeobj = _PyObject_GetAttrId((PyObject *) self, &PyId_mode); if (modeobj == NULL) { @@ -2530,21 +2520,14 @@ textiowrapper_repr(textio *self) goto error; PyUnicode_AppendAndDel(&res, s); if (res == NULL) - goto error; + return NULL; } s = PyUnicode_FromFormat("%U encoding=%R>", res, self->encoding); Py_DECREF(res); - if (status == 0) { - Py_ReprLeave((PyObject *)self); - } return s; - - error: +error: Py_XDECREF(res); - if (status == 0) { - Py_ReprLeave((PyObject *)self); - } return NULL; } @@ -2699,7 +2682,7 @@ textiowrapper_iternext(textio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c new file mode 100644 index 0000000..7b00a9e --- /dev/null +++ b/Modules/_io/winconsoleio.c @@ -0,0 +1,1154 @@ +/* + An implementation of Windows console I/O + + Classes defined here: _WindowsConsoleIO + + Written by Steve Dower +*/ + +#define PY_SSIZE_T_CLEAN +#include "Python.h" + +#ifdef MS_WINDOWS + +#include "structmember.h" +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif +#include /* For offsetof */ + +#define WIN32_LEAN_AND_MEAN +#include +#include + +#include "_iomodule.h" + +/* BUFSIZ determines how many characters can be typed at the console + before it starts blocking. */ +#if BUFSIZ < (16*1024) +#define SMALLCHUNK (2*1024) +#elif (BUFSIZ >= (2 << 25)) +#error "unreasonable BUFSIZ > 64MB defined" +#else +#define SMALLCHUNK BUFSIZ +#endif + +/* BUFMAX determines how many bytes can be read in one go. */ +#define BUFMAX (32*1024*1024) + +/* SMALLBUF determines how many utf-8 characters will be + buffered within the stream, in order to support reads + of less than one character */ +#define SMALLBUF 4 + +char _get_console_type(HANDLE handle) { + DWORD mode, peek_count; + + if (handle == INVALID_HANDLE_VALUE) + return '\0'; + + if (!GetConsoleMode(handle, &mode)) + return '\0'; + + /* Peek at the handle to see whether it is an input or output handle */ + if (GetNumberOfConsoleInputEvents(handle, &peek_count)) + return 'r'; + return 'w'; +} + +char _PyIO_get_console_type(PyObject *path_or_fd) { + int fd; + + fd = PyLong_AsLong(path_or_fd); + PyErr_Clear(); + if (fd >= 0) { + HANDLE handle; + _Py_BEGIN_SUPPRESS_IPH + handle = (HANDLE)_get_osfhandle(fd); + _Py_END_SUPPRESS_IPH + if (!handle) + return '\0'; + return _get_console_type(handle); + } + + PyObject *decoded, *decoded_upper; + + int d = PyUnicode_FSDecoder(path_or_fd, &decoded); + if (!d) { + PyErr_Clear(); + return '\0'; + } + if (!PyUnicode_Check(decoded)) { + Py_CLEAR(decoded); + return '\0'; + } + decoded_upper = PyObject_CallMethod(decoded, "upper", ""); + Py_CLEAR(decoded); + if (!decoded_upper) { + PyErr_Clear(); + return '\0'; + } + + char m = '\0'; + if (_PyUnicode_EqualToASCIIString(decoded_upper, "CONIN$")) { + m = 'r'; + } else if (_PyUnicode_EqualToASCIIString(decoded_upper, "CONOUT$")) { + m = 'w'; + } else if (_PyUnicode_EqualToASCIIString(decoded_upper, "CON")) { + m = 'x'; + } + + Py_CLEAR(decoded_upper); + return m; +} + +/*[clinic input] +module _io +class _io._WindowsConsoleIO "winconsoleio *" "&PyWindowsConsoleIO_Type" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=e897fdc1fba4e131]*/ + +/*[python input] +class io_ssize_t_converter(CConverter): + type = 'Py_ssize_t' + converter = '_PyIO_ConvertSsize_t' +[python start generated code]*/ +/*[python end generated code: output=da39a3ee5e6b4b0d input=d0a811d3cbfd1b33]*/ + +typedef struct { + PyObject_HEAD + HANDLE handle; + int fd; + unsigned int created : 1; + unsigned int readable : 1; + unsigned int writable : 1; + unsigned int closehandle : 1; + char finalizing; + unsigned int blksize; + PyObject *weakreflist; + PyObject *dict; + char buf[SMALLBUF]; + wchar_t wbuf; +} winconsoleio; + +PyTypeObject PyWindowsConsoleIO_Type; + +_Py_IDENTIFIER(name); + +int +_PyWindowsConsoleIO_closed(PyObject *self) +{ + return ((winconsoleio *)self)->handle == INVALID_HANDLE_VALUE; +} + + +/* Returns 0 on success, -1 with exception set on failure. */ +static int +internal_close(winconsoleio *self) +{ + if (self->handle != INVALID_HANDLE_VALUE) { + if (self->closehandle) { + if (self->fd >= 0) { + _Py_BEGIN_SUPPRESS_IPH + close(self->fd); + _Py_END_SUPPRESS_IPH + } + CloseHandle(self->handle); + } + self->handle = INVALID_HANDLE_VALUE; + self->fd = -1; + } + return 0; +} + +/*[clinic input] +_io._WindowsConsoleIO.close + +Close the handle. + +A closed handle cannot be used for further I/O operations. close() may be +called more than once without error. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_close_impl(winconsoleio *self) +/*[clinic end generated code: output=27ef95b66c29057b input=185617e349ae4c7b]*/ +{ + PyObject *res; + PyObject *exc, *val, *tb; + int rc; + _Py_IDENTIFIER(close); + res = _PyObject_CallMethodId((PyObject*)&PyRawIOBase_Type, + &PyId_close, "O", self); + if (!self->closehandle) { + self->handle = INVALID_HANDLE_VALUE; + return res; + } + if (res == NULL) + PyErr_Fetch(&exc, &val, &tb); + rc = internal_close(self); + if (res == NULL) + _PyErr_ChainExceptions(exc, val, tb); + if (rc < 0) + Py_CLEAR(res); + return res; +} + +static PyObject * +winconsoleio_new(PyTypeObject *type, PyObject *args, PyObject *kwds) +{ + winconsoleio *self; + + assert(type != NULL && type->tp_alloc != NULL); + + self = (winconsoleio *) type->tp_alloc(type, 0); + if (self != NULL) { + self->handle = INVALID_HANDLE_VALUE; + self->fd = -1; + self->created = 0; + self->readable = 0; + self->writable = 0; + self->closehandle = 0; + self->blksize = 0; + self->weakreflist = NULL; + } + + return (PyObject *) self; +} + +/*[clinic input] +_io._WindowsConsoleIO.__init__ + file as nameobj: object + mode: str = "r" + closefd: int(c_default="1") = True + opener: object = None + +Open a console buffer by file descriptor. + +The mode can be 'rb' (default), or 'wb' for reading or writing bytes. All +other mode characters will be ignored. Mode 'b' will be assumed if it is +omitted. The *opener* parameter is always ignored. +[clinic start generated code]*/ + +static int +_io__WindowsConsoleIO___init___impl(winconsoleio *self, PyObject *nameobj, + const char *mode, int closefd, + PyObject *opener) +/*[clinic end generated code: output=3fd9cbcdd8d95429 input=61be39633a86f5d7]*/ +{ + const char *s; + wchar_t *name = NULL; + char console_type = '\0'; + int ret = 0; + int rwa = 0; + int fd = -1; + int fd_is_own = 0; + + assert(PyWindowsConsoleIO_Check(self)); + if (self->handle >= 0) { + if (self->closehandle) { + /* Have to close the existing file first. */ + if (internal_close(self) < 0) + return -1; + } + else + self->handle = INVALID_HANDLE_VALUE; + } + + if (PyFloat_Check(nameobj)) { + PyErr_SetString(PyExc_TypeError, + "integer argument expected, got float"); + return -1; + } + + fd = _PyLong_AsInt(nameobj); + if (fd < 0) { + if (!PyErr_Occurred()) { + PyErr_SetString(PyExc_ValueError, + "negative file descriptor"); + return -1; + } + PyErr_Clear(); + } + self->fd = fd; + + if (fd < 0) { + PyObject *decodedname = Py_None; + Py_INCREF(decodedname); + + int d = PyUnicode_FSDecoder(nameobj, (void*)&decodedname); + if (!d) + return -1; + + Py_ssize_t length; + name = PyUnicode_AsWideCharString(decodedname, &length); + console_type = _PyIO_get_console_type(decodedname); + Py_CLEAR(decodedname); + if (name == NULL) + return -1; + + if (wcslen(name) != length) { + PyMem_Free(name); + PyErr_SetString(PyExc_ValueError, "embedded null character"); + return -1; + } + } + + s = mode; + while (*s) { + switch (*s++) { + case '+': + case 'a': + case 'b': + case 'x': + break; + case 'r': + if (rwa) + goto bad_mode; + rwa = 1; + self->readable = 1; + if (console_type == 'x') + console_type = 'r'; + break; + case 'w': + if (rwa) + goto bad_mode; + rwa = 1; + self->writable = 1; + if (console_type == 'x') + console_type = 'w'; + break; + default: + PyErr_Format(PyExc_ValueError, + "invalid mode: %.200s", mode); + goto error; + } + } + + if (!rwa) + goto bad_mode; + + if (fd >= 0) { + _Py_BEGIN_SUPPRESS_IPH + self->handle = (HANDLE)_get_osfhandle(fd); + _Py_END_SUPPRESS_IPH + self->closehandle = 0; + } else { + DWORD access = GENERIC_READ; + + self->closehandle = 1; + if (!closefd) { + PyErr_SetString(PyExc_ValueError, + "Cannot use closefd=False with file name"); + goto error; + } + + if (self->writable) + access = GENERIC_WRITE; + + Py_BEGIN_ALLOW_THREADS + /* Attempt to open for read/write initially, then fall back + on the specific access. This is required for modern names + CONIN$ and CONOUT$, which allow reading/writing state as + well as reading/writing content. */ + self->handle = CreateFileW(name, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if (self->handle == INVALID_HANDLE_VALUE) + self->handle = CreateFileW(name, access, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + Py_END_ALLOW_THREADS + + if (self->handle == INVALID_HANDLE_VALUE) { + PyErr_SetExcFromWindowsErrWithFilenameObject(PyExc_OSError, GetLastError(), nameobj); + goto error; + } + } + + if (console_type == '\0') + console_type = _get_console_type(self->handle); + + if (self->writable && console_type != 'w') { + PyErr_SetString(PyExc_ValueError, + "Cannot open console input buffer for writing"); + goto error; + } + if (self->readable && console_type != 'r') { + PyErr_SetString(PyExc_ValueError, + "Cannot open console output buffer for reading"); + goto error; + } + + self->blksize = DEFAULT_BUFFER_SIZE; + memset(self->buf, 0, 4); + + if (_PyObject_SetAttrId((PyObject *)self, &PyId_name, nameobj) < 0) + goto error; + + goto done; + +bad_mode: + PyErr_SetString(PyExc_ValueError, + "Must have exactly one of read or write mode"); +error: + ret = -1; + internal_close(self); + +done: + if (name) + PyMem_Free(name); + return ret; +} + +static int +winconsoleio_traverse(winconsoleio *self, visitproc visit, void *arg) +{ + Py_VISIT(self->dict); + return 0; +} + +static int +winconsoleio_clear(winconsoleio *self) +{ + Py_CLEAR(self->dict); + return 0; +} + +static void +winconsoleio_dealloc(winconsoleio *self) +{ + self->finalizing = 1; + if (_PyIOBase_finalize((PyObject *) self) < 0) + return; + _PyObject_GC_UNTRACK(self); + if (self->weakreflist != NULL) + PyObject_ClearWeakRefs((PyObject *) self); + Py_CLEAR(self->dict); + Py_TYPE(self)->tp_free((PyObject *)self); +} + +static PyObject * +err_closed(void) +{ + PyErr_SetString(PyExc_ValueError, "I/O operation on closed file"); + return NULL; +} + +static PyObject * +err_mode(const char *action) +{ + _PyIO_State *state = IO_STATE(); + if (state != NULL) + PyErr_Format(state->unsupported_operation, + "Console buffer does not support %s", action); + return NULL; +} + +/*[clinic input] +_io._WindowsConsoleIO.fileno + +Return the underlying file descriptor (an integer). + +fileno is only set when a file descriptor is used to open +one of the standard streams. + +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_fileno_impl(winconsoleio *self) +/*[clinic end generated code: output=006fa74ce3b5cfbf input=079adc330ddaabe6]*/ +{ + if (self->fd < 0 && self->handle != INVALID_HANDLE_VALUE) { + _Py_BEGIN_SUPPRESS_IPH + if (self->writable) + self->fd = _open_osfhandle((intptr_t)self->handle, _O_WRONLY | _O_BINARY); + else + self->fd = _open_osfhandle((intptr_t)self->handle, _O_RDONLY | _O_BINARY); + _Py_END_SUPPRESS_IPH + } + if (self->fd < 0) + return err_mode("fileno"); + return PyLong_FromLong(self->fd); +} + +/*[clinic input] +_io._WindowsConsoleIO.readable + +True if console is an input buffer. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_readable_impl(winconsoleio *self) +/*[clinic end generated code: output=daf9cef2743becf0 input=6be9defb5302daae]*/ +{ + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + return PyBool_FromLong((long) self->readable); +} + +/*[clinic input] +_io._WindowsConsoleIO.writable + +True if console is an output buffer. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_writable_impl(winconsoleio *self) +/*[clinic end generated code: output=e0a2ad7eae5abf67 input=cefbd8abc24df6a0]*/ +{ + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + return PyBool_FromLong((long) self->writable); +} + +static DWORD +_buflen(winconsoleio *self) +{ + for (DWORD i = 0; i < SMALLBUF; ++i) { + if (!self->buf[i]) + return i; + } + return SMALLBUF; +} + +static DWORD +_copyfrombuf(winconsoleio *self, char *buf, DWORD len) +{ + DWORD n = 0; + + while (self->buf[0] && len--) { + buf[n++] = self->buf[0]; + for (int i = 1; i < SMALLBUF; ++i) + self->buf[i - 1] = self->buf[i]; + self->buf[SMALLBUF - 1] = 0; + } + + return n; +} + +static wchar_t * +read_console_w(HANDLE handle, DWORD maxlen, DWORD *readlen) { + int err = 0, sig = 0; + + wchar_t *buf = (wchar_t*)PyMem_Malloc(maxlen * sizeof(wchar_t)); + if (!buf) + goto error; + + *readlen = 0; + + //DebugBreak(); + Py_BEGIN_ALLOW_THREADS + DWORD off = 0; + while (off < maxlen) { + DWORD n, len = min(maxlen - off, BUFSIZ); + SetLastError(0); + BOOL res = ReadConsoleW(handle, &buf[off], len, &n, NULL); + + if (!res) { + err = GetLastError(); + break; + } + if (n == 0) { + err = GetLastError(); + if (err != ERROR_OPERATION_ABORTED) + break; + err = 0; + HANDLE hInterruptEvent = _PyOS_SigintEvent(); + if (WaitForSingleObjectEx(hInterruptEvent, 100, FALSE) + == WAIT_OBJECT_0) { + ResetEvent(hInterruptEvent); + Py_BLOCK_THREADS + sig = PyErr_CheckSignals(); + Py_UNBLOCK_THREADS + if (sig < 0) + break; + } + } + *readlen += n; + + /* If we didn't read a full buffer that time, don't try + again or we will block a second time. */ + if (n < len) + break; + /* If the buffer ended with a newline, break out */ + if (buf[*readlen - 1] == '\n') + break; + /* If the buffer ends with a high surrogate, expand the + buffer and read an extra character. */ + WORD char_type; + if (off + BUFSIZ >= maxlen && + GetStringTypeW(CT_CTYPE3, &buf[*readlen - 1], 1, &char_type) && + char_type == C3_HIGHSURROGATE) { + wchar_t *newbuf; + maxlen += 1; + Py_BLOCK_THREADS + newbuf = (wchar_t*)PyMem_Realloc(buf, maxlen * sizeof(wchar_t)); + Py_UNBLOCK_THREADS + if (!newbuf) { + sig = -1; + break; + } + buf = newbuf; + /* Only advance by n and not BUFSIZ in this case */ + off += n; + continue; + } + + off += BUFSIZ; + } + + Py_END_ALLOW_THREADS + + if (sig) + goto error; + if (err) { + PyErr_SetFromWindowsErr(err); + goto error; + } + + if (*readlen > 0 && buf[0] == L'\x1a') { + PyMem_Free(buf); + buf = (wchar_t *)PyMem_Malloc(sizeof(wchar_t)); + if (!buf) + goto error; + buf[0] = L'\0'; + *readlen = 0; + } + + return buf; + +error: + if (buf) + PyMem_Free(buf); + return NULL; +} + + +static Py_ssize_t +readinto(winconsoleio *self, char *buf, Py_ssize_t len) +{ + if (self->handle == INVALID_HANDLE_VALUE) { + err_closed(); + return -1; + } + if (!self->readable) { + err_mode("reading"); + return -1; + } + if (len == 0) + return 0; + if (len > BUFMAX) { + PyErr_Format(PyExc_ValueError, "cannot read more than %d bytes", BUFMAX); + return -1; + } + + /* Each character may take up to 4 bytes in the final buffer. + This is highly conservative, but necessary to avoid + failure for any given Unicode input (e.g. \U0010ffff). + If the caller requests fewer than 4 bytes, we buffer one + character. + */ + DWORD wlen = (DWORD)(len / 4); + if (wlen == 0) { + wlen = 1; + } + + DWORD read_len = _copyfrombuf(self, buf, (DWORD)len); + if (read_len) { + buf = &buf[read_len]; + len -= read_len; + wlen -= 1; + } + if (len == read_len || wlen == 0) + return read_len; + + DWORD n; + wchar_t *wbuf = read_console_w(self->handle, wlen, &n); + if (wbuf == NULL) + return -1; + if (n == 0) { + PyMem_Free(wbuf); + return read_len; + } + + int err = 0; + DWORD u8n = 0; + + Py_BEGIN_ALLOW_THREADS + if (len < 4) { + if (WideCharToMultiByte(CP_UTF8, 0, wbuf, n, + self->buf, sizeof(self->buf) / sizeof(self->buf[0]), + NULL, NULL)) + u8n = _copyfrombuf(self, buf, (DWORD)len); + } else { + u8n = WideCharToMultiByte(CP_UTF8, 0, wbuf, n, + buf, (DWORD)len, NULL, NULL); + } + + if (u8n) { + read_len += u8n; + u8n = 0; + } else { + err = GetLastError(); + if (err == ERROR_INSUFFICIENT_BUFFER) { + /* Calculate the needed buffer for a more useful error, as this + means our "/ 4" logic above is insufficient for some input. + */ + u8n = WideCharToMultiByte(CP_UTF8, 0, wbuf, n, + NULL, 0, NULL, NULL); + } + } + Py_END_ALLOW_THREADS + + PyMem_Free(wbuf); + + if (u8n) { + PyErr_Format(PyExc_SystemError, + "Buffer had room for %d bytes but %d bytes required", + len, u8n); + return -1; + } + if (err) { + PyErr_SetFromWindowsErr(err); + return -1; + } + + return read_len; +} + +/*[clinic input] +_io._WindowsConsoleIO.readinto + buffer: Py_buffer(accept={rwbuffer}) + / + +Same as RawIOBase.readinto(). +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_readinto_impl(winconsoleio *self, Py_buffer *buffer) +/*[clinic end generated code: output=66d1bdfa3f20af39 input=4ed68da48a6baffe]*/ +{ + Py_ssize_t len = readinto(self, buffer->buf, buffer->len); + if (len < 0) + return NULL; + + return PyLong_FromSsize_t(len); +} + +static DWORD +new_buffersize(winconsoleio *self, DWORD currentsize) +{ + DWORD addend; + + /* Expand the buffer by an amount proportional to the current size, + giving us amortized linear-time behavior. For bigger sizes, use a + less-than-double growth factor to avoid excessive allocation. */ + if (currentsize > 65536) + addend = currentsize >> 3; + else + addend = 256 + currentsize; + if (addend < SMALLCHUNK) + /* Avoid tiny read() calls. */ + addend = SMALLCHUNK; + return addend + currentsize; +} + +/*[clinic input] +_io._WindowsConsoleIO.readall + +Read all data from the console, returned as bytes. + +Return an empty bytes object at EOF. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_readall_impl(winconsoleio *self) +/*[clinic end generated code: output=e6d312c684f6e23b input=4024d649a1006e69]*/ +{ + wchar_t *buf; + DWORD bufsize, n, len = 0; + PyObject *bytes; + DWORD bytes_size, rn; + + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + + bufsize = BUFSIZ; + + buf = (wchar_t*)PyMem_Malloc((bufsize + 1) * sizeof(wchar_t)); + if (buf == NULL) + return NULL; + + while (1) { + wchar_t *subbuf; + + if (len >= (Py_ssize_t)bufsize) { + DWORD newsize = new_buffersize(self, len); + if (newsize > BUFMAX) + break; + if (newsize < bufsize) { + PyErr_SetString(PyExc_OverflowError, + "unbounded read returned more bytes " + "than a Python bytes object can hold"); + PyMem_Free(buf); + return NULL; + } + bufsize = newsize; + + buf = PyMem_Realloc(buf, (bufsize + 1) * sizeof(wchar_t)); + if (!buf) { + PyMem_Free(buf); + return NULL; + } + } + + subbuf = read_console_w(self->handle, bufsize - len, &n); + + if (subbuf == NULL) { + PyMem_Free(buf); + return NULL; + } + + if (n > 0) + wcsncpy_s(&buf[len], bufsize - len + 1, subbuf, n); + + PyMem_Free(subbuf); + + /* when the read is empty we break */ + if (n == 0) + break; + + len += n; + } + + if (len == 0 && _buflen(self) == 0) { + /* when the result starts with ^Z we return an empty buffer */ + PyMem_Free(buf); + return PyBytes_FromStringAndSize(NULL, 0); + } + + if (len) { + Py_BEGIN_ALLOW_THREADS + bytes_size = WideCharToMultiByte(CP_UTF8, 0, buf, len, + NULL, 0, NULL, NULL); + Py_END_ALLOW_THREADS + + if (!bytes_size) { + DWORD err = GetLastError(); + PyMem_Free(buf); + return PyErr_SetFromWindowsErr(err); + } + } else { + bytes_size = 0; + } + + bytes_size += _buflen(self); + bytes = PyBytes_FromStringAndSize(NULL, bytes_size); + rn = _copyfrombuf(self, PyBytes_AS_STRING(bytes), bytes_size); + + if (len) { + Py_BEGIN_ALLOW_THREADS + bytes_size = WideCharToMultiByte(CP_UTF8, 0, buf, len, + &PyBytes_AS_STRING(bytes)[rn], bytes_size - rn, NULL, NULL); + Py_END_ALLOW_THREADS + + if (!bytes_size) { + DWORD err = GetLastError(); + PyMem_Free(buf); + Py_CLEAR(bytes); + return PyErr_SetFromWindowsErr(err); + } + + /* add back the number of preserved bytes */ + bytes_size += rn; + } + + PyMem_Free(buf); + if (bytes_size < (size_t)PyBytes_GET_SIZE(bytes)) { + if (_PyBytes_Resize(&bytes, n * sizeof(wchar_t)) < 0) { + Py_CLEAR(bytes); + return NULL; + } + } + return bytes; +} + +/*[clinic input] +_io._WindowsConsoleIO.read + size: io_ssize_t = -1 + / + +Read at most size bytes, returned as bytes. + +Only makes one system call when size is a positive integer, +so less data may be returned than requested. +Return an empty bytes object at EOF. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size) +/*[clinic end generated code: output=57df68af9f4b22d0 input=6c56fceec460f1dd]*/ +{ + PyObject *bytes; + Py_ssize_t bytes_size; + + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + if (!self->readable) + return err_mode("reading"); + + if (size < 0) + return _io__WindowsConsoleIO_readall_impl(self); + if (size > BUFMAX) { + PyErr_Format(PyExc_ValueError, "cannot read more than %d bytes", BUFMAX); + return NULL; + } + + bytes = PyBytes_FromStringAndSize(NULL, size); + if (bytes == NULL) + return NULL; + + bytes_size = readinto(self, PyBytes_AS_STRING(bytes), PyBytes_GET_SIZE(bytes)); + if (bytes_size < 0) { + Py_CLEAR(bytes); + return NULL; + } + + if (bytes_size < PyBytes_GET_SIZE(bytes)) { + if (_PyBytes_Resize(&bytes, bytes_size) < 0) { + Py_CLEAR(bytes); + return NULL; + } + } + + return bytes; +} + +/*[clinic input] +_io._WindowsConsoleIO.write + b: Py_buffer + / + +Write buffer b to file, return number of bytes written. + +Only makes one system call, so not all of the data may be written. +The number of bytes actually written is returned. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b) +/*[clinic end generated code: output=775bdb16fbf9137b input=be35fb624f97c941]*/ +{ + BOOL res = TRUE; + wchar_t *wbuf; + DWORD len, wlen, n = 0; + + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + if (!self->writable) + return err_mode("writing"); + + if (b->len > BUFMAX) + len = BUFMAX; + else + len = (DWORD)b->len; + + Py_BEGIN_ALLOW_THREADS + wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, NULL, 0); + + /* issue11395 there is an unspecified upper bound on how many bytes + can be written at once. We cap at 32k - the caller will have to + handle partial writes. + Since we don't know how many input bytes are being ignored, we + have to reduce and recalculate. */ + while (wlen > 32766 / sizeof(wchar_t)) { + len /= 2; + wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, NULL, 0); + } + Py_END_ALLOW_THREADS + + if (!wlen) + return PyErr_SetFromWindowsErr(0); + + wbuf = (wchar_t*)PyMem_Malloc(wlen * sizeof(wchar_t)); + + Py_BEGIN_ALLOW_THREADS + wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, wbuf, wlen); + if (wlen) { + res = WriteConsoleW(self->handle, wbuf, wlen, &n, NULL); + if (n < wlen) { + /* Wrote fewer characters than expected, which means our + * len value may be wrong. So recalculate it from the + * characters that were written. As this could potentially + * result in a different value, we also validate that value. + */ + len = WideCharToMultiByte(CP_UTF8, 0, wbuf, n, + NULL, 0, NULL, NULL); + if (len) { + wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, + NULL, 0); + assert(wlen == len); + } + } + } else + res = 0; + Py_END_ALLOW_THREADS + + if (!res) { + DWORD err = GetLastError(); + PyMem_Free(wbuf); + return PyErr_SetFromWindowsErr(err); + } + + PyMem_Free(wbuf); + return PyLong_FromSsize_t(len); +} + +static PyObject * +winconsoleio_repr(winconsoleio *self) +{ + if (self->handle == INVALID_HANDLE_VALUE) + return PyUnicode_FromFormat("<_io._WindowsConsoleIO [closed]>"); + + if (self->readable) + return PyUnicode_FromFormat("<_io._WindowsConsoleIO mode='rb' closefd=%s>", + self->closehandle ? "True" : "False"); + if (self->writable) + return PyUnicode_FromFormat("<_io._WindowsConsoleIO mode='wb' closefd=%s>", + self->closehandle ? "True" : "False"); + + PyErr_SetString(PyExc_SystemError, "_WindowsConsoleIO has invalid mode"); + return NULL; +} + +/*[clinic input] +_io._WindowsConsoleIO.isatty + +Always True. +[clinic start generated code]*/ + +static PyObject * +_io__WindowsConsoleIO_isatty_impl(winconsoleio *self) +/*[clinic end generated code: output=9eac09d287c11bd7 input=9b91591dbe356f86]*/ +{ + if (self->handle == INVALID_HANDLE_VALUE) + return err_closed(); + + Py_RETURN_TRUE; +} + +static PyObject * +winconsoleio_getstate(winconsoleio *self) +{ + PyErr_Format(PyExc_TypeError, + "cannot serialize '%s' object", Py_TYPE(self)->tp_name); + return NULL; +} + +#include "clinic/winconsoleio.c.h" + +static PyMethodDef winconsoleio_methods[] = { + _IO__WINDOWSCONSOLEIO_READ_METHODDEF + _IO__WINDOWSCONSOLEIO_READALL_METHODDEF + _IO__WINDOWSCONSOLEIO_READINTO_METHODDEF + _IO__WINDOWSCONSOLEIO_WRITE_METHODDEF + _IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF + _IO__WINDOWSCONSOLEIO_READABLE_METHODDEF + _IO__WINDOWSCONSOLEIO_WRITABLE_METHODDEF + _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF + _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF + {"__getstate__", (PyCFunction)winconsoleio_getstate, METH_NOARGS, NULL}, + {NULL, NULL} /* sentinel */ +}; + +/* 'closed' and 'mode' are attributes for compatibility with FileIO. */ + +static PyObject * +get_closed(winconsoleio *self, void *closure) +{ + return PyBool_FromLong((long)(self->handle == INVALID_HANDLE_VALUE)); +} + +static PyObject * +get_closefd(winconsoleio *self, void *closure) +{ + return PyBool_FromLong((long)(self->closehandle)); +} + +static PyObject * +get_mode(winconsoleio *self, void *closure) +{ + return PyUnicode_FromString(self->readable ? "rb" : "wb"); +} + +static PyGetSetDef winconsoleio_getsetlist[] = { + {"closed", (getter)get_closed, NULL, "True if the file is closed"}, + {"closefd", (getter)get_closefd, NULL, + "True if the file descriptor will be closed by close()."}, + {"mode", (getter)get_mode, NULL, "String giving the file mode"}, + {NULL}, +}; + +static PyMemberDef winconsoleio_members[] = { + {"_blksize", T_UINT, offsetof(winconsoleio, blksize), 0}, + {"_finalizing", T_BOOL, offsetof(winconsoleio, finalizing), 0}, + {NULL} +}; + +PyTypeObject PyWindowsConsoleIO_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_io._WindowsConsoleIO", + sizeof(winconsoleio), + 0, + (destructor)winconsoleio_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)winconsoleio_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE + | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */ + _io__WindowsConsoleIO___init____doc__, /* tp_doc */ + (traverseproc)winconsoleio_traverse, /* tp_traverse */ + (inquiry)winconsoleio_clear, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(winconsoleio, weakreflist), /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + winconsoleio_methods, /* tp_methods */ + winconsoleio_members, /* tp_members */ + winconsoleio_getsetlist, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + offsetof(winconsoleio, dict), /* tp_dictoffset */ + _io__WindowsConsoleIO___init__, /* tp_init */ + PyType_GenericAlloc, /* tp_alloc */ + winconsoleio_new, /* tp_new */ + PyObject_GC_Del, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ + 0, /* tp_del */ + 0, /* tp_version_tag */ + 0, /* tp_finalize */ +}; + +PyAPI_DATA(PyObject *) _PyWindowsConsoleIO_Type = (PyObject*)&PyWindowsConsoleIO_Type; + +#endif /* MS_WINDOWS */ diff --git a/Modules/_json.c b/Modules/_json.c index 346bd55..d3dbf98 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -89,12 +89,16 @@ static PyObject * _build_rval_index_tuple(PyObject *rval, Py_ssize_t idx); static PyObject * scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds); +static int +scanner_init(PyObject *self, PyObject *args, PyObject *kwds); static void scanner_dealloc(PyObject *self); static int scanner_clear(PyObject *self); static PyObject * encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds); +static int +encoder_init(PyObject *self, PyObject *args, PyObject *kwds); static void encoder_dealloc(PyObject *self); static int @@ -108,7 +112,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc, PyObject *dct, Py_ssiz static PyObject * _encoded_const(PyObject *obj); static void -raise_errmsg(char *msg, PyObject *s, Py_ssize_t end); +raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end); static PyObject * encoder_encode_string(PyEncoderObject *s, PyObject *obj); static PyObject * @@ -317,7 +321,7 @@ escape_unicode(PyObject *pystr) } static void -raise_errmsg(char *msg, PyObject *s, Py_ssize_t end) +raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end) { /* Use JSONDecodeError exception to raise a nice looking ValueError subclass */ static PyObject *JSONDecodeError = NULL; @@ -841,14 +845,12 @@ _parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssi int kind; Py_ssize_t end_idx; PyObject *val = NULL; - PyObject *rval; + PyObject *rval = PyList_New(0); Py_ssize_t next_idx; - - if (PyUnicode_READY(pystr) == -1) + if (rval == NULL) return NULL; - rval = PyList_New(0); - if (rval == NULL) + if (PyUnicode_READY(pystr) == -1) return NULL; str = PyUnicode_DATA(pystr); @@ -1199,21 +1201,38 @@ static PyObject * scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { PyScannerObject *s; + s = (PyScannerObject *)type->tp_alloc(type, 0); + if (s != NULL) { + s->strict = NULL; + s->object_hook = NULL; + s->object_pairs_hook = NULL; + s->parse_float = NULL; + s->parse_int = NULL; + s->parse_constant = NULL; + } + return (PyObject *)s; +} + +static int +scanner_init(PyObject *self, PyObject *args, PyObject *kwds) +{ + /* Initialize Scanner object */ PyObject *ctx; static char *kwlist[] = {"context", NULL}; + PyScannerObject *s; + + assert(PyScanner_Check(self)); + s = (PyScannerObject *)self; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:make_scanner", kwlist, &ctx)) - return NULL; + return -1; - s = (PyScannerObject *)type->tp_alloc(type, 0); - if (s == NULL) { - return NULL; + if (s->memo == NULL) { + s->memo = PyDict_New(); + if (s->memo == NULL) + goto bail; } - s->memo = PyDict_New(); - if (s->memo == NULL) - goto bail; - /* All of these will fail "gracefully" so we don't need to verify them */ s->strict = PyObject_GetAttrString(ctx, "strict"); if (s->strict == NULL) @@ -1234,11 +1253,16 @@ scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (s->parse_constant == NULL) goto bail; - return (PyObject *)s; + return 0; bail: - Py_DECREF(s); - return NULL; + Py_CLEAR(s->strict); + Py_CLEAR(s->object_hook); + Py_CLEAR(s->object_pairs_hook); + Py_CLEAR(s->parse_float); + Py_CLEAR(s->parse_int); + Py_CLEAR(s->parse_constant); + return -1; } PyDoc_STRVAR(scanner_doc, "JSON scanner object"); @@ -1280,7 +1304,7 @@ PyTypeObject PyScannerType = { 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ - 0, /* tp_init */ + scanner_init, /* tp_init */ 0,/* PyType_GenericAlloc, */ /* tp_alloc */ scanner_new, /* tp_new */ 0,/* PyObject_GC_Del, */ /* tp_free */ @@ -1289,6 +1313,25 @@ PyTypeObject PyScannerType = { static PyObject * encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { + PyEncoderObject *s; + s = (PyEncoderObject *)type->tp_alloc(type, 0); + if (s != NULL) { + s->markers = NULL; + s->defaultfn = NULL; + s->encoder = NULL; + s->indent = NULL; + s->key_separator = NULL; + s->item_separator = NULL; + s->sort_keys = NULL; + s->skipkeys = NULL; + } + return (PyObject *)s; +} + +static int +encoder_init(PyObject *self, PyObject *args, PyObject *kwds) +{ + /* initialize Encoder object */ static char *kwlist[] = {"markers", "default", "encoder", "indent", "key_separator", "item_separator", "sort_keys", "skipkeys", "allow_nan", NULL}; PyEncoderObject *s; @@ -1296,23 +1339,22 @@ encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyObject *item_separator, *sort_keys, *skipkeys; int allow_nan; + assert(PyEncoder_Check(self)); + s = (PyEncoderObject *)self; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOUUOOp:make_encoder", kwlist, &markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator, &sort_keys, &skipkeys, &allow_nan)) - return NULL; + return -1; if (markers != Py_None && !PyDict_Check(markers)) { PyErr_Format(PyExc_TypeError, "make_encoder() argument 1 must be dict or None, " "not %.200s", Py_TYPE(markers)->tp_name); - return NULL; + return -1; } - s = (PyEncoderObject *)type->tp_alloc(type, 0); - if (s == NULL) - return NULL; - s->markers = markers; s->defaultfn = defaultfn; s->encoder = encoder; @@ -1339,7 +1381,7 @@ encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_INCREF(s->item_separator); Py_INCREF(s->sort_keys); Py_INCREF(s->skipkeys); - return (PyObject *)s; + return 0; } static PyObject * @@ -1517,11 +1559,8 @@ encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc, return -1; } - if (Py_EnterRecursiveCall(" while encoding a JSON object")) { - Py_DECREF(newobj); - Py_XDECREF(ident); + if (Py_EnterRecursiveCall(" while encoding a JSON object")) return -1; - } rv = encoder_listencode_obj(s, acc, newobj, indent_level); Py_LeaveRecursiveCall(); @@ -1565,7 +1604,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc, if (open_dict == NULL || close_dict == NULL || empty_dict == NULL) return -1; } - if (PyDict_Size(dct) == 0) /* Fast path */ + if (Py_SIZE(dct) == 0) return _PyAccu_Accumulate(acc, empty_dict); if (s->markers != Py_None) { @@ -1601,10 +1640,8 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc, if (items == NULL) goto bail; sortkeys = PyObject_IsTrue(s->sort_keys); - if (sortkeys < 0 || (sortkeys && PyList_Sort(items) < 0)) { - Py_DECREF(items); + if (sortkeys < 0 || (sortkeys && PyList_Sort(items) < 0)) goto bail; - } it = PyObject_GetIter(items); Py_DECREF(items); if (it == NULL) @@ -1872,7 +1909,7 @@ PyTypeObject PyEncoderType = { 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ - 0, /* tp_init */ + encoder_init, /* tp_init */ 0, /* tp_alloc */ encoder_new, /* tp_new */ 0, /* tp_free */ @@ -1915,8 +1952,10 @@ PyInit__json(void) PyObject *m = PyModule_Create(&jsonmodule); if (!m) return NULL; + PyScannerType.tp_new = PyType_GenericNew; if (PyType_Ready(&PyScannerType) < 0) goto fail; + PyEncoderType.tp_new = PyType_GenericNew; if (PyType_Ready(&PyEncoderType) < 0) goto fail; Py_INCREF((PyObject*)&PyScannerType); diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 39e0c54..feb3802 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -49,7 +49,7 @@ PyDoc_STRVAR(setlocale__doc__, /* the grouping is terminated by either 0 or CHAR_MAX */ static PyObject* -copy_grouping(char* s) +copy_grouping(const char* s) { int i; PyObject *result, *val = NULL; @@ -215,10 +215,10 @@ PyLocale_strcoll(PyObject* self, PyObject* args) if (!PyArg_ParseTuple(args, "UU:strcoll", &os1, &os2)) return NULL; /* Convert the unicode strings to wchar[]. */ - ws1 = _PyUnicode_AsWideCharString(os1); + ws1 = PyUnicode_AsWideCharString(os1, NULL); if (ws1 == NULL) goto done; - ws2 = _PyUnicode_AsWideCharString(os2); + ws2 = PyUnicode_AsWideCharString(os2, NULL); if (ws2 == NULL) goto done; /* Collate the strings. */ @@ -252,11 +252,6 @@ PyLocale_strxfrm(PyObject* self, PyObject* args) s = PyUnicode_AsWideCharString(str, &n1); if (s == NULL) goto exit; - if (wcslen(s) != (size_t)n1) { - PyErr_SetString(PyExc_ValueError, - "embedded null character"); - goto exit; - } /* assume no change in size, first */ n1 = n1 + 1; @@ -627,53 +622,34 @@ static struct PyModuleDef _localemodule = { PyMODINIT_FUNC PyInit__locale(void) { - PyObject *m, *d, *x; + PyObject *m; #ifdef HAVE_LANGINFO_H int i; #endif m = PyModule_Create(&_localemodule); if (m == NULL) - return NULL; - - d = PyModule_GetDict(m); - - x = PyLong_FromLong(LC_CTYPE); - PyDict_SetItemString(d, "LC_CTYPE", x); - Py_XDECREF(x); - - x = PyLong_FromLong(LC_TIME); - PyDict_SetItemString(d, "LC_TIME", x); - Py_XDECREF(x); - - x = PyLong_FromLong(LC_COLLATE); - PyDict_SetItemString(d, "LC_COLLATE", x); - Py_XDECREF(x); + return NULL; - x = PyLong_FromLong(LC_MONETARY); - PyDict_SetItemString(d, "LC_MONETARY", x); - Py_XDECREF(x); + PyModule_AddIntMacro(m, LC_CTYPE); + PyModule_AddIntMacro(m, LC_TIME); + PyModule_AddIntMacro(m, LC_COLLATE); + PyModule_AddIntMacro(m, LC_MONETARY); #ifdef LC_MESSAGES - x = PyLong_FromLong(LC_MESSAGES); - PyDict_SetItemString(d, "LC_MESSAGES", x); - Py_XDECREF(x); + PyModule_AddIntMacro(m, LC_MESSAGES); #endif /* LC_MESSAGES */ - x = PyLong_FromLong(LC_NUMERIC); - PyDict_SetItemString(d, "LC_NUMERIC", x); - Py_XDECREF(x); - - x = PyLong_FromLong(LC_ALL); - PyDict_SetItemString(d, "LC_ALL", x); - Py_XDECREF(x); - - x = PyLong_FromLong(CHAR_MAX); - PyDict_SetItemString(d, "CHAR_MAX", x); - Py_XDECREF(x); + PyModule_AddIntMacro(m, LC_NUMERIC); + PyModule_AddIntMacro(m, LC_ALL); + PyModule_AddIntMacro(m, CHAR_MAX); Error = PyErr_NewException("locale.Error", NULL, NULL); - PyDict_SetItemString(d, "Error", Error); + if (Error == NULL) { + Py_DECREF(m); + return NULL; + } + PyModule_AddObject(m, "Error", Error); #ifdef HAVE_LANGINFO_H for (i = 0; langinfo_constants[i].name; i++) { @@ -681,6 +657,11 @@ PyInit__locale(void) langinfo_constants[i].value); } #endif + + if (PyErr_Occurred()) { + Py_DECREF(m); + return NULL; + } return m; } diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index 7876e71..0e7623d 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -2,17 +2,13 @@ #include "frameobject.h" #include "rotatingtree.h" -#if !defined(HAVE_LONG_LONG) -#error "This module requires long longs!" -#endif - /*** Selection of a high-precision timer ***/ #ifdef MS_WINDOWS #include -static PY_LONG_LONG +static long long hpTimer(void) { LARGE_INTEGER li; @@ -39,11 +35,11 @@ hpTimerUnit(void) #include #include -static PY_LONG_LONG +static long long hpTimer(void) { struct timeval tv; - PY_LONG_LONG ret; + long long ret; #ifdef GETTIMEOFDAY_NO_TZ gettimeofday(&tv); #else @@ -70,8 +66,8 @@ struct _ProfilerEntry; /* represents a function called from another function */ typedef struct _ProfilerSubEntry { rotating_node_t header; - PY_LONG_LONG tt; - PY_LONG_LONG it; + long long tt; + long long it; long callcount; long recursivecallcount; long recursionLevel; @@ -81,8 +77,8 @@ typedef struct _ProfilerSubEntry { typedef struct _ProfilerEntry { rotating_node_t header; PyObject *userObj; /* PyCodeObject, or a descriptive str for builtins */ - PY_LONG_LONG tt; /* total time in this entry */ - PY_LONG_LONG it; /* inline time in this entry (not in subcalls) */ + long long tt; /* total time in this entry */ + long long it; /* inline time in this entry (not in subcalls) */ long callcount; /* how many times this was called */ long recursivecallcount; /* how many times called recursively */ long recursionLevel; @@ -90,8 +86,8 @@ typedef struct _ProfilerEntry { } ProfilerEntry; typedef struct _ProfilerContext { - PY_LONG_LONG t0; - PY_LONG_LONG subt; + long long t0; + long long subt; struct _ProfilerContext *previous; ProfilerEntry *ctxEntry; } ProfilerContext; @@ -121,9 +117,9 @@ static PyTypeObject PyProfiler_Type; #define DOUBLE_TIMER_PRECISION 4294967296.0 static PyObject *empty_tuple; -static PY_LONG_LONG CallExternalTimer(ProfilerObject *pObj) +static long long CallExternalTimer(ProfilerObject *pObj) { - PY_LONG_LONG result; + long long result; PyObject *o = PyObject_Call(pObj->externalTimer, empty_tuple, NULL); if (o == NULL) { PyErr_WriteUnraisable(pObj->externalTimer); @@ -136,11 +132,11 @@ static PY_LONG_LONG CallExternalTimer(ProfilerObject *pObj) } else { /* interpret the result as a double measured in seconds. - As the profiler works with PY_LONG_LONG internally + As the profiler works with long long internally we convert it to a large integer */ double val = PyFloat_AsDouble(o); /* error handling delayed to the code below */ - result = (PY_LONG_LONG) (val * DOUBLE_TIMER_PRECISION); + result = (long long) (val * DOUBLE_TIMER_PRECISION); } Py_DECREF(o); if (PyErr_Occurred()) { @@ -342,8 +338,8 @@ initContext(ProfilerObject *pObj, ProfilerContext *self, ProfilerEntry *entry) static void Stop(ProfilerObject *pObj, ProfilerContext *self, ProfilerEntry *entry) { - PY_LONG_LONG tt = CALL_TIMER(pObj) - self->t0; - PY_LONG_LONG it = tt - self->subt; + long long tt = CALL_TIMER(pObj) - self->t0; + long long it = tt - self->subt; if (self->previous) self->previous->subt += tt; pObj->currentProfilerContext = self->previous; @@ -762,7 +758,6 @@ profiler_dealloc(ProfilerObject *op) static int profiler_init(ProfilerObject *pObj, PyObject *args, PyObject *kw) { - PyObject *o; PyObject *timer = NULL; double timeunit = 0.0; int subcalls = 1; @@ -777,11 +772,9 @@ profiler_init(ProfilerObject *pObj, PyObject *args, PyObject *kw) if (setSubcalls(pObj, subcalls) < 0 || setBuiltins(pObj, builtins) < 0) return -1; - o = pObj->externalTimer; - pObj->externalTimer = timer; - Py_XINCREF(timer); - Py_XDECREF(o); pObj->externalTimerUnit = timeunit; + Py_XINCREF(timer); + Py_XSETREF(pObj->externalTimer, timer); return 0; } diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c index e7b1ed9..bb77552 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -18,12 +18,6 @@ #include - -#ifndef PY_LONG_LONG -#error "This module requires PY_LONG_LONG to be defined" -#endif - - #ifdef WITH_THREAD #define ACQUIRE_LOCK(obj) do { \ if (!PyThread_acquire_lock((obj)->lock, 0)) { \ @@ -163,7 +157,7 @@ grow_buffer(PyObject **buf, Py_ssize_t max_length) uint32_t - the "I" (unsigned int) specifier is the right size, but silently ignores overflows on conversion. - lzma_vli - the "K" (unsigned PY_LONG_LONG) specifier is the right + lzma_vli - the "K" (unsigned long long) specifier is the right size, but like "I" it silently ignores overflows on conversion. lzma_mode and lzma_match_finder - these are enumeration types, and @@ -176,12 +170,12 @@ grow_buffer(PyObject **buf, Py_ssize_t max_length) static int \ FUNCNAME(PyObject *obj, void *ptr) \ { \ - unsigned PY_LONG_LONG val; \ + unsigned long long val; \ \ val = PyLong_AsUnsignedLongLong(obj); \ if (PyErr_Occurred()) \ return 0; \ - if ((unsigned PY_LONG_LONG)(TYPE)val != val) { \ + if ((unsigned long long)(TYPE)val != val) { \ PyErr_SetString(PyExc_OverflowError, \ "Value too large for " #TYPE " type"); \ return 0; \ @@ -398,7 +392,7 @@ parse_filter_chain_spec(lzma_filter filters[], PyObject *filterspecs) Python-level filter specifiers (represented as dicts). */ static int -spec_add_field(PyObject *spec, _Py_Identifier *key, unsigned PY_LONG_LONG value) +spec_add_field(PyObject *spec, _Py_Identifier *key, unsigned long long value) { int status; PyObject *value_object; @@ -555,7 +549,6 @@ error: /*[clinic input] _lzma.LZMACompressor.compress - self: self(type="Compressor *") data: Py_buffer / @@ -569,7 +562,7 @@ flush() method to finish the compression process. static PyObject * _lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data) -/*[clinic end generated code: output=31f615136963e00f input=8b60cb13e0ce6420]*/ +/*[clinic end generated code: output=31f615136963e00f input=64019eac7f2cc8d0]*/ { PyObject *result = NULL; @@ -585,8 +578,6 @@ _lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data) /*[clinic input] _lzma.LZMACompressor.flush - self: self(type="Compressor *") - Finish the compression process. Returns the compressed data left in internal buffers. @@ -596,7 +587,7 @@ The compressor object may not be used after this method is called. static PyObject * _lzma_LZMACompressor_flush_impl(Compressor *self) -/*[clinic end generated code: output=fec21f3e22504f50 input=3060fb26f9b4042c]*/ +/*[clinic end generated code: output=fec21f3e22504f50 input=6b369303f67ad0a8]*/ { PyObject *result = NULL; @@ -700,7 +691,6 @@ Compressor_init_raw(lzma_stream *lzs, PyObject *filterspecs) /*[-clinic input] _lzma.LZMACompressor.__init__ - self: self(type="Compressor *") format: int(c_default="FORMAT_XZ") = FORMAT_XZ The container format to use for the output. This can be FORMAT_XZ (default), FORMAT_ALONE, or FORMAT_RAW. @@ -1070,7 +1060,6 @@ error: /*[clinic input] _lzma.LZMADecompressor.decompress - self: self(type="Decompressor *") data: Py_buffer max_length: Py_ssize_t=-1 @@ -1093,7 +1082,7 @@ the unused_data attribute. static PyObject * _lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data, Py_ssize_t max_length) -/*[clinic end generated code: output=ef4e20ec7122241d input=f2bb902cc1caf203]*/ +/*[clinic end generated code: output=ef4e20ec7122241d input=60c1f135820e309d]*/ { PyObject *result = NULL; @@ -1133,7 +1122,6 @@ Decompressor_init_raw(lzma_stream *lzs, PyObject *filterspecs) /*[clinic input] _lzma.LZMADecompressor.__init__ - self: self(type="Decompressor *") format: int(c_default="FORMAT_AUTO") = FORMAT_AUTO Specifies the container format of the input stream. If this is FORMAT_AUTO (the default), the decompressor will automatically detect @@ -1159,7 +1147,7 @@ For one-shot decompression, use the decompress() function instead. static int _lzma_LZMADecompressor___init___impl(Decompressor *self, int format, PyObject *memlimit, PyObject *filters) -/*[clinic end generated code: output=3e1821f8aa36564c input=458ca6132ef29801]*/ +/*[clinic end generated code: output=3e1821f8aa36564c input=81fe684a6c2f8a27]*/ { const uint32_t decoder_flags = LZMA_TELL_ANY_CHECK | LZMA_TELL_NO_CHECK; uint64_t memlimit_ = UINT64_MAX; @@ -1454,7 +1442,7 @@ static PyModuleDef _lzmamodule = { /* Some of our constants are more than 32 bits wide, so PyModule_AddIntConstant would not work correctly on platforms with 32-bit longs. */ static int -module_add_int_constant(PyObject *m, const char *name, PY_LONG_LONG value) +module_add_int_constant(PyObject *m, const char *name, long long value) { PyObject *o = PyLong_FromLongLong(value); if (o == NULL) diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c index 4ae638e..d92a8bf 100644 --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -128,7 +128,7 @@ static PyMethodDef module_methods[] = { {"recv", multiprocessing_recv, METH_VARARGS, ""}, {"send", multiprocessing_send, METH_VARARGS, ""}, #endif -#ifndef POSIX_SEMAPHORES_NOT_ENABLED +#if !defined(POSIX_SEMAPHORES_NOT_ENABLED) && !defined(__ANDROID__) {"sem_unlink", _PyMp_sem_unlink, METH_VARARGS, ""}, #endif {NULL} diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h index 9aeea8d..512bc17 100644 --- a/Modules/_multiprocessing/multiprocessing.h +++ b/Modules/_multiprocessing/multiprocessing.h @@ -60,7 +60,7 @@ #if SIZEOF_VOID_P == SIZEOF_LONG # define F_POINTER "k" # define T_POINTER T_ULONG -#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P == SIZEOF_LONG_LONG) +#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG # define F_POINTER "K" # define T_POINTER T_ULONGLONG #else diff --git a/Modules/_operator.c b/Modules/_operator.c index dfff1d2..fb8eafc 100644 --- a/Modules/_operator.c +++ b/Modules/_operator.c @@ -1111,6 +1111,8 @@ methodcaller_reduce(methodcallerobject *mc) PyObject *functools; PyObject *partial; PyObject *constructor; + PyObject *newargs[2]; + _Py_IDENTIFIER(partial); functools = PyImport_ImportModule("functools"); if (!functools) @@ -1119,17 +1121,11 @@ methodcaller_reduce(methodcallerobject *mc) Py_DECREF(functools); if (!partial) return NULL; - newargs = PyTuple_New(2); - if (newargs == NULL) { - Py_DECREF(partial); - return NULL; - } - Py_INCREF(Py_TYPE(mc)); - PyTuple_SET_ITEM(newargs, 0, (PyObject *)Py_TYPE(mc)); - Py_INCREF(mc->name); - PyTuple_SET_ITEM(newargs, 1, mc->name); - constructor = PyObject_Call(partial, newargs, mc->kwds); - Py_DECREF(newargs); + + newargs[0] = (PyObject *)Py_TYPE(mc); + newargs[1] = mc->name; + constructor = _PyObject_FastCallDict(partial, newargs, 2, mc->kwds); + Py_DECREF(partial); return Py_BuildValue("NO", constructor, mc->args); } diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 0f62b1c..79113e0 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -153,6 +153,9 @@ typedef struct { PyObject *codecs_encode; /* builtins.getattr, used for saving nested names with protocol < 4 */ PyObject *getattr; + /* functools.partial, used for implementing __newobj_ex__ with protocols + 2 and 3 */ + PyObject *partial; } PickleState; /* Forward declaration of the _pickle module definition. */ @@ -190,6 +193,7 @@ _Pickle_ClearState(PickleState *st) Py_CLEAR(st->import_mapping_3to2); Py_CLEAR(st->codecs_encode); Py_CLEAR(st->getattr); + Py_CLEAR(st->partial); } /* Initialize the given pickle module state. */ @@ -200,6 +204,7 @@ _Pickle_InitState(PickleState *st) PyObject *copyreg = NULL; PyObject *compat_pickle = NULL; PyObject *codecs = NULL; + PyObject *functools = NULL; builtins = PyEval_GetBuiltins(); if (builtins == NULL) @@ -314,12 +319,21 @@ _Pickle_InitState(PickleState *st) } Py_CLEAR(codecs); + functools = PyImport_ImportModule("functools"); + if (!functools) + goto error; + st->partial = PyObject_GetAttrString(functools, "partial"); + if (!st->partial) + goto error; + Py_CLEAR(functools); + return 0; error: Py_CLEAR(copyreg); Py_CLEAR(compat_pickle); Py_CLEAR(codecs); + Py_CLEAR(functools); _Pickle_ClearState(st); return -1; } @@ -331,43 +345,20 @@ static PyObject * _Pickle_FastCall(PyObject *func, PyObject *obj) { PyObject *result; - PyObject *arg_tuple = PyTuple_New(1); - - /* Note: this function used to reuse the argument tuple. This used to give - a slight performance boost with older pickle implementations where many - unbuffered reads occurred (thus needing many function calls). - - However, this optimization was removed because it was too complicated - to get right. It abused the C API for tuples to mutate them which led - to subtle reference counting and concurrency bugs. Furthermore, the - introduction of protocol 4 and the prefetching optimization via peek() - significantly reduced the number of function calls we do. Thus, the - benefits became marginal at best. */ - if (arg_tuple == NULL) { - Py_DECREF(obj); - return NULL; - } - PyTuple_SET_ITEM(arg_tuple, 0, obj); - result = PyObject_Call(func, arg_tuple, NULL); - Py_CLEAR(arg_tuple); + result = _PyObject_CallArg1(func, obj); + Py_DECREF(obj); return result; } /*************************************************************************/ -static int -stack_underflow(void) -{ - PickleState *st = _Pickle_GetGlobalState(); - PyErr_SetString(st->UnpicklingError, "unpickling stack underflow"); - return -1; -} - /* Internal data type used as the unpickling stack. */ typedef struct { PyObject_VAR_HEAD PyObject **data; + int mark_set; /* is MARK set? */ + Py_ssize_t fence; /* position of top MARK or 0 */ Py_ssize_t allocated; /* number of slots in data allocated */ } Pdata; @@ -398,6 +389,8 @@ Pdata_New(void) if (!(self = PyObject_New(Pdata, &Pdata_Type))) return NULL; Py_SIZE(self) = 0; + self->mark_set = 0; + self->fence = 0; self->allocated = 8; self->data = PyMem_MALLOC(self->allocated * sizeof(PyObject *)); if (self->data) @@ -415,8 +408,7 @@ Pdata_clear(Pdata *self, Py_ssize_t clearto) { Py_ssize_t i = Py_SIZE(self); - if (clearto < 0) - return stack_underflow(); + assert(clearto >= self->fence); if (clearto >= i) return 0; @@ -452,6 +444,17 @@ Pdata_grow(Pdata *self) return -1; } +static int +Pdata_stack_underflow(Pdata *self) +{ + PickleState *st = _Pickle_GetGlobalState(); + PyErr_SetString(st->UnpicklingError, + self->mark_set ? + "unexpected MARK found" : + "unpickling stack underflow"); + return -1; +} + /* D is a Pdata*. Pop the topmost element and store it into V, which * must be an lvalue holding PyObject*. On stack underflow, UnpicklingError * is raised and V is set to NULL. @@ -459,9 +462,8 @@ Pdata_grow(Pdata *self) static PyObject * Pdata_pop(Pdata *self) { - if (Py_SIZE(self) == 0) { - PickleState *st = _Pickle_GetGlobalState(); - PyErr_SetString(st->UnpicklingError, "bad pickle data"); + if (Py_SIZE(self) <= self->fence) { + Pdata_stack_underflow(self); return NULL; } return self->data[--Py_SIZE(self)]; @@ -493,6 +495,10 @@ Pdata_poptuple(Pdata *self, Py_ssize_t start) PyObject *tuple; Py_ssize_t len, i, j; + if (start < self->fence) { + Pdata_stack_underflow(self); + return NULL; + } len = Py_SIZE(self) - start; tuple = PyTuple_New(len); if (tuple == NULL) @@ -860,7 +866,7 @@ _write_size64(char *out, size_t value) { size_t i; - assert(sizeof(size_t) <= 8); + Py_BUILD_ASSERT(sizeof(size_t) <= 8); for (i = 0; i < sizeof(size_t); i++) { out[i] = (unsigned char)((value >> (8 * i)) & 0xff); @@ -1086,6 +1092,14 @@ _Unpickler_SetStringInput(UnpicklerObject *self, PyObject *input) } static int +bad_readline(void) +{ + PickleState *st = _Pickle_GetGlobalState(); + PyErr_SetString(st->UnpicklingError, "pickle data was truncated"); + return -1; +} + +static int _Unpickler_SkipConsumed(UnpicklerObject *self) { Py_ssize_t consumed; @@ -1134,9 +1148,7 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n) return -1; if (n == READ_WHOLE_LINE) { - PyObject *empty_tuple = PyTuple_New(0); - data = PyObject_Call(self->readline, empty_tuple, NULL); - Py_DECREF(empty_tuple); + data = _PyObject_CallNoArg(self->readline); } else { PyObject *len; @@ -1174,21 +1186,9 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n) return read_size; } -/* Read `n` bytes from the unpickler's data source, storing the result in `*s`. - - This should be used for all data reads, rather than accessing the unpickler's - input buffer directly. This method deals correctly with reading from input - streams, which the input buffer doesn't deal with. - - Note that when reading from a file-like object, self->next_read_idx won't - be updated (it should remain at 0 for the entire unpickling process). You - should use this function's return value to know how many bytes you can - consume. - - Returns -1 (with an exception set) on failure. On success, return the - number of chars read. */ +/* Don't call it directly: use _Unpickler_Read() */ static Py_ssize_t -_Unpickler_Read(UnpicklerObject *self, char **s, Py_ssize_t n) +_Unpickler_ReadImpl(UnpicklerObject *self, char **s, Py_ssize_t n) { Py_ssize_t num_read; @@ -1199,27 +1199,43 @@ _Unpickler_Read(UnpicklerObject *self, char **s, Py_ssize_t n) "read would overflow (invalid bytecode)"); return -1; } - if (self->next_read_idx + n <= self->input_len) { - *s = self->input_buffer + self->next_read_idx; - self->next_read_idx += n; - return n; - } - if (!self->read) { - PyErr_Format(PyExc_EOFError, "Ran out of input"); - return -1; - } + + /* This case is handled by the _Unpickler_Read() macro for efficiency */ + assert(self->next_read_idx + n > self->input_len); + + if (!self->read) + return bad_readline(); + num_read = _Unpickler_ReadFromFile(self, n); if (num_read < 0) return -1; - if (num_read < n) { - PyErr_Format(PyExc_EOFError, "Ran out of input"); - return -1; - } + if (num_read < n) + return bad_readline(); *s = self->input_buffer; self->next_read_idx = n; return n; } +/* Read `n` bytes from the unpickler's data source, storing the result in `*s`. + + This should be used for all data reads, rather than accessing the unpickler's + input buffer directly. This method deals correctly with reading from input + streams, which the input buffer doesn't deal with. + + Note that when reading from a file-like object, self->next_read_idx won't + be updated (it should remain at 0 for the entire unpickling process). You + should use this function's return value to know how many bytes you can + consume. + + Returns -1 (with an exception set) on failure. On success, return the + number of chars read. */ +#define _Unpickler_Read(self, s, n) \ + (((n) <= (self)->input_len - (self)->next_read_idx) \ + ? (*(s) = (self)->input_buffer + (self)->next_read_idx, \ + (self)->next_read_idx += (n), \ + (n)) \ + : _Unpickler_ReadImpl(self, (s), (n))) + static Py_ssize_t _Unpickler_CopyLine(UnpicklerObject *self, char *line, Py_ssize_t len, char **result) @@ -1238,7 +1254,7 @@ _Unpickler_CopyLine(UnpicklerObject *self, char *line, Py_ssize_t len, } /* Read a line from the input stream/buffer. If we run off the end of the input - before hitting \n, return the data we found. + before hitting \n, raise an error. Returns the number of chars read, or -1 on failure. */ static Py_ssize_t @@ -1254,20 +1270,16 @@ _Unpickler_Readline(UnpicklerObject *self, char **result) return _Unpickler_CopyLine(self, line_start, num_read, result); } } - if (self->read) { - num_read = _Unpickler_ReadFromFile(self, READ_WHOLE_LINE); - if (num_read < 0) - return -1; - self->next_read_idx = num_read; - return _Unpickler_CopyLine(self, self->input_buffer, num_read, result); - } + if (!self->read) + return bad_readline(); - /* If we get here, we've run off the end of the input string. Return the - remaining string and let the caller figure it out. */ - *result = self->input_buffer + self->next_read_idx; - num_read = i - self->next_read_idx; - self->next_read_idx = i; - return num_read; + num_read = _Unpickler_ReadFromFile(self, READ_WHOLE_LINE); + if (num_read < 0) + return -1; + if (num_read == 0 || self->input_buffer[num_read - 1] != '\n') + return bad_readline(); + self->next_read_idx = num_read; + return _Unpickler_CopyLine(self, self->input_buffer, num_read, result); } /* Returns -1 (with an exception set) on failure, 0 on success. The memo array @@ -1548,9 +1560,9 @@ memo_put(PicklerObject *self, PyObject *obj) } static PyObject * -get_dotted_path(PyObject *obj, PyObject *name) -{ +get_dotted_path(PyObject *obj, PyObject *name) { _Py_static_string(PyId_dot, "."); + _Py_static_string(PyId_locals, ""); PyObject *dotted_path; Py_ssize_t i, n; @@ -1561,7 +1573,12 @@ get_dotted_path(PyObject *obj, PyObject *name) assert(n >= 1); for (i = 0; i < n; i++) { PyObject *subpath = PyList_GET_ITEM(dotted_path, i); - if (_PyUnicode_EqualToASCIIString(subpath, "")) { + PyObject *result = PyUnicode_RichCompare( + subpath, _PyUnicode_FromId(&PyId_locals), Py_EQ); + int is_equal = (result == Py_True); + assert(PyBool_Check(result)); + Py_DECREF(result); + if (is_equal) { if (obj == NULL) PyErr_Format(PyExc_AttributeError, "Can't pickle local object %R", name); @@ -1934,7 +1951,7 @@ save_long(PicklerObject *self, PyObject *obj) if (repr == NULL) goto error; - string = _PyUnicode_AsStringAndSize(repr, &size); + string = PyUnicode_AsUTF8AndSize(repr, &size); if (string == NULL) goto error; @@ -2091,38 +2108,35 @@ save_bytes(PicklerObject *self, PyObject *obj) static PyObject * raw_unicode_escape(PyObject *obj) { - PyObject *repr; char *p; Py_ssize_t i, size; - size_t expandsize; void *data; unsigned int kind; + _PyBytesWriter writer; if (PyUnicode_READY(obj)) return NULL; + _PyBytesWriter_Init(&writer); + size = PyUnicode_GET_LENGTH(obj); data = PyUnicode_DATA(obj); kind = PyUnicode_KIND(obj); - if (kind == PyUnicode_4BYTE_KIND) - expandsize = 10; - else - expandsize = 6; - if ((size_t)size > (size_t)PY_SSIZE_T_MAX / expandsize) - return PyErr_NoMemory(); - repr = PyBytes_FromStringAndSize(NULL, expandsize * size); - if (repr == NULL) - return NULL; - if (size == 0) - return repr; - assert(Py_REFCNT(repr) == 1); + p = _PyBytesWriter_Alloc(&writer, size); + if (p == NULL) + goto error; + writer.overallocate = 1; - p = PyBytes_AS_STRING(repr); for (i=0; i < size; i++) { Py_UCS4 ch = PyUnicode_READ(kind, data, i); /* Map 32-bit characters to '\Uxxxxxxxx' */ if (ch >= 0x10000) { + /* -1: subtract 1 preallocated byte */ + p = _PyBytesWriter_Prepare(&writer, p, 10-1); + if (p == NULL) + goto error; + *p++ = '\\'; *p++ = 'U'; *p++ = Py_hexdigits[(ch >> 28) & 0xf]; @@ -2134,8 +2148,13 @@ raw_unicode_escape(PyObject *obj) *p++ = Py_hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[ch & 15]; } - /* Map 16-bit characters to '\uxxxx' */ + /* Map 16-bit characters, '\\' and '\n' to '\uxxxx' */ else if (ch >= 256 || ch == '\\' || ch == '\n') { + /* -1: subtract 1 preallocated byte */ + p = _PyBytesWriter_Prepare(&writer, p, 6-1); + if (p == NULL) + goto error; + *p++ = '\\'; *p++ = 'u'; *p++ = Py_hexdigits[(ch >> 12) & 0xf]; @@ -2147,14 +2166,16 @@ raw_unicode_escape(PyObject *obj) else *p++ = (char) ch; } - size = p - PyBytes_AS_STRING(repr); - if (_PyBytes_Resize(&repr, size) < 0) - return NULL; - return repr; + + return _PyBytesWriter_Finish(&writer, p); + +error: + _PyBytesWriter_Dealloc(&writer); + return NULL; } static int -write_utf8(PicklerObject *self, char *data, Py_ssize_t size) +write_utf8(PicklerObject *self, const char *data, Py_ssize_t size) { char header[9]; Py_ssize_t len; @@ -2853,7 +2874,7 @@ save_dict(PicklerObject *self, PyObject *obj) } else { _Py_IDENTIFIER(items); - items = _PyObject_CallMethodId(obj, &PyId_items, "()"); + items = _PyObject_CallMethodId(obj, &PyId_items, NULL); if (items == NULL) goto error; iter = PyObject_GetIter(items); @@ -3530,14 +3551,13 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj) PyErr_Clear(); } else if (PyUnicode_Check(name)) { - if (self->proto >= 4) { - _Py_IDENTIFIER(__newobj_ex__); - use_newobj_ex = _PyUnicode_EqualToASCIIId( - name, &PyId___newobj_ex__); - } + _Py_IDENTIFIER(__newobj_ex__); + use_newobj_ex = PyUnicode_Compare( + name, _PyUnicode_FromId(&PyId___newobj_ex__)) == 0; if (!use_newobj_ex) { _Py_IDENTIFIER(__newobj__); - use_newobj = _PyUnicode_EqualToASCIIId(name, &PyId___newobj__); + use_newobj = PyUnicode_Compare( + name, _PyUnicode_FromId(&PyId___newobj__)) == 0; } } Py_XDECREF(name); @@ -3577,11 +3597,58 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj) return -1; } - if (save(self, cls, 0) < 0 || - save(self, args, 0) < 0 || - save(self, kwargs, 0) < 0 || - _Pickler_Write(self, &newobj_ex_op, 1) < 0) { - return -1; + if (self->proto >= 4) { + if (save(self, cls, 0) < 0 || + save(self, args, 0) < 0 || + save(self, kwargs, 0) < 0 || + _Pickler_Write(self, &newobj_ex_op, 1) < 0) { + return -1; + } + } + else { + PyObject *newargs; + PyObject *cls_new; + Py_ssize_t i; + _Py_IDENTIFIER(__new__); + + newargs = PyTuple_New(Py_SIZE(args) + 2); + if (newargs == NULL) + return -1; + + cls_new = _PyObject_GetAttrId(cls, &PyId___new__); + if (cls_new == NULL) { + Py_DECREF(newargs); + return -1; + } + PyTuple_SET_ITEM(newargs, 0, cls_new); + Py_INCREF(cls); + PyTuple_SET_ITEM(newargs, 1, cls); + for (i = 0; i < Py_SIZE(args); i++) { + PyObject *item = PyTuple_GET_ITEM(args, i); + Py_INCREF(item); + PyTuple_SET_ITEM(newargs, i + 2, item); + } + + callable = PyObject_Call(st->partial, newargs, kwargs); + Py_DECREF(newargs); + if (callable == NULL) + return -1; + + newargs = PyTuple_New(0); + if (newargs == NULL) { + Py_DECREF(callable); + return -1; + } + + if (save(self, callable, 0) < 0 || + save(self, newargs, 0) < 0 || + _Pickler_Write(self, &reduce_op, 1) < 0) { + Py_DECREF(newargs); + Py_DECREF(callable); + return -1; + } + Py_DECREF(newargs); + Py_DECREF(callable); } } else if (use_newobj) { @@ -3871,10 +3938,7 @@ save(PicklerObject *self, PyObject *obj, int pers_save) /* Check for a __reduce__ method. */ reduce_func = _PyObject_GetAttrId(obj, &PyId___reduce__); if (reduce_func != NULL) { - PyObject *empty_tuple = PyTuple_New(0); - reduce_value = PyObject_Call(reduce_func, empty_tuple, - NULL); - Py_DECREF(empty_tuple); + reduce_value = _PyObject_CallNoArg(reduce_func); } else { PyErr_Format(st->PicklingError, @@ -4391,7 +4455,7 @@ Pickler_set_memo(PicklerObject *self, PyObject *obj) } else { PyErr_Format(PyExc_TypeError, - "'memo' attribute must be an PicklerMemoProxy object" + "'memo' attribute must be a PicklerMemoProxy object" "or dict, not %.200s", Py_TYPE(obj)->tp_name); return -1; } @@ -4420,8 +4484,6 @@ Pickler_get_persid(PicklerObject *self) static int Pickler_set_persid(PicklerObject *self, PyObject *value) { - PyObject *tmp; - if (value == NULL) { PyErr_SetString(PyExc_TypeError, "attribute deletion is not supported"); @@ -4433,10 +4495,8 @@ Pickler_set_persid(PicklerObject *self, PyObject *value) return -1; } - tmp = self->pers_func; Py_INCREF(value); - self->pers_func = value; - Py_XDECREF(tmp); /* self->pers_func can be NULL, so be careful. */ + Py_XSETREF(self->pers_func, value); return 0; } @@ -4518,13 +4578,19 @@ find_class(UnpicklerObject *self, PyObject *module_name, PyObject *global_name) static Py_ssize_t marker(UnpicklerObject *self) { - PickleState *st = _Pickle_GetGlobalState(); + Py_ssize_t mark; + if (self->num_marks < 1) { + PickleState *st = _Pickle_GetGlobalState(); PyErr_SetString(st->UnpicklingError, "could not find MARK"); return -1; } - return self->marks[--self->num_marks]; + mark = self->marks[--self->num_marks]; + self->stack->mark_set = self->num_marks != 0; + self->stack->fence = self->num_marks ? + self->marks[self->num_marks - 1] : 0; + return mark; } static int @@ -4535,14 +4601,6 @@ load_none(UnpicklerObject *self) } static int -bad_readline(void) -{ - PickleState *st = _Pickle_GetGlobalState(); - PyErr_SetString(st->UnpicklingError, "pickle data was truncated"); - return -1; -} - -static int load_int(UnpicklerObject *self) { PyObject *value; @@ -4985,7 +5043,7 @@ load_counted_tuple(UnpicklerObject *self, Py_ssize_t len) PyObject *tuple; if (Py_SIZE(self->stack) < len) - return stack_underflow(); + return Pdata_stack_underflow(self->stack); tuple = Pdata_poptuple(self->stack, Py_SIZE(self->stack) - len); if (tuple == NULL) @@ -5067,6 +5125,13 @@ load_dict(UnpicklerObject *self) if ((dict = PyDict_New()) == NULL) return -1; + if ((j - i) % 2 != 0) { + PickleState *st = _Pickle_GetGlobalState(); + PyErr_SetString(st->UnpicklingError, "odd number of items for DICT"); + Py_DECREF(dict); + return -1; + } + for (k = i + 1; k < j; k += 2) { key = self->stack->data[k - 1]; value = self->stack->data[k]; @@ -5134,7 +5199,7 @@ load_obj(UnpicklerObject *self) return -1; if (Py_SIZE(self->stack) - i < 1) - return stack_underflow(); + return Pdata_stack_underflow(self->stack); args = Pdata_poptuple(self->stack, i + 1); if (args == NULL) @@ -5457,12 +5522,15 @@ load_pop(UnpicklerObject *self) */ if (self->num_marks > 0 && self->marks[self->num_marks - 1] == len) { self->num_marks--; - } else if (len > 0) { + self->stack->mark_set = self->num_marks != 0; + self->stack->fence = self->num_marks ? + self->marks[self->num_marks - 1] : 0; + } else if (len <= self->stack->fence) + return Pdata_stack_underflow(self->stack); + else { len--; Py_DECREF(self->stack->data[len]); Py_SIZE(self->stack) = len; - } else { - return stack_underflow(); } return 0; } @@ -5484,10 +5552,10 @@ static int load_dup(UnpicklerObject *self) { PyObject *last; - Py_ssize_t len; + Py_ssize_t len = Py_SIZE(self->stack); - if ((len = Py_SIZE(self->stack)) <= 0) - return stack_underflow(); + if (len <= self->stack->fence) + return Pdata_stack_underflow(self->stack); last = self->stack->data[len - 1]; PDATA_APPEND(self->stack, last, -1); return 0; @@ -5670,8 +5738,8 @@ load_put(UnpicklerObject *self) return -1; if (len < 2) return bad_readline(); - if (Py_SIZE(self->stack) <= 0) - return stack_underflow(); + if (Py_SIZE(self->stack) <= self->stack->fence) + return Pdata_stack_underflow(self->stack); value = self->stack->data[Py_SIZE(self->stack) - 1]; key = PyLong_FromString(s, NULL, 10); @@ -5699,8 +5767,8 @@ load_binput(UnpicklerObject *self) if (_Unpickler_Read(self, &s, 1) < 0) return -1; - if (Py_SIZE(self->stack) <= 0) - return stack_underflow(); + if (Py_SIZE(self->stack) <= self->stack->fence) + return Pdata_stack_underflow(self->stack); value = self->stack->data[Py_SIZE(self->stack) - 1]; idx = Py_CHARMASK(s[0]); @@ -5718,8 +5786,8 @@ load_long_binput(UnpicklerObject *self) if (_Unpickler_Read(self, &s, 4) < 0) return -1; - if (Py_SIZE(self->stack) <= 0) - return stack_underflow(); + if (Py_SIZE(self->stack) <= self->stack->fence) + return Pdata_stack_underflow(self->stack); value = self->stack->data[Py_SIZE(self->stack) - 1]; idx = calc_binsize(s, 4); @@ -5737,8 +5805,8 @@ load_memoize(UnpicklerObject *self) { PyObject *value; - if (Py_SIZE(self->stack) <= 0) - return stack_underflow(); + if (Py_SIZE(self->stack) <= self->stack->fence) + return Pdata_stack_underflow(self->stack); value = self->stack->data[Py_SIZE(self->stack) - 1]; return _Unpickler_MemoPut(self, self->memo_len, value); @@ -5752,8 +5820,8 @@ do_append(UnpicklerObject *self, Py_ssize_t x) Py_ssize_t len, i; len = Py_SIZE(self->stack); - if (x > len || x <= 0) - return stack_underflow(); + if (x > len || x <= self->stack->fence) + return Pdata_stack_underflow(self->stack); if (len == x) /* nothing to do */ return 0; @@ -5802,8 +5870,8 @@ do_append(UnpicklerObject *self, Py_ssize_t x) static int load_append(UnpicklerObject *self) { - if (Py_SIZE(self->stack) - 1 <= 0) - return stack_underflow(); + if (Py_SIZE(self->stack) - 1 <= self->stack->fence) + return Pdata_stack_underflow(self->stack); return do_append(self, Py_SIZE(self->stack) - 1); } @@ -5825,8 +5893,8 @@ do_setitems(UnpicklerObject *self, Py_ssize_t x) int status = 0; len = Py_SIZE(self->stack); - if (x > len || x <= 0) - return stack_underflow(); + if (x > len || x <= self->stack->fence) + return Pdata_stack_underflow(self->stack); if (len == x) /* nothing to do */ return 0; if ((len - x) % 2 != 0) { @@ -5879,8 +5947,8 @@ load_additems(UnpicklerObject *self) if (mark < 0) return -1; len = Py_SIZE(self->stack); - if (mark > len || mark <= 0) - return stack_underflow(); + if (mark > len || mark <= self->stack->fence) + return Pdata_stack_underflow(self->stack); if (len == mark) /* nothing to do */ return 0; @@ -5935,8 +6003,8 @@ load_build(UnpicklerObject *self) /* Stack is ... instance, state. We want to leave instance at * the stack top, possibly mutated via instance.__setstate__(state). */ - if (Py_SIZE(self->stack) < 2) - return stack_underflow(); + if (Py_SIZE(self->stack) - 2 < self->stack->fence) + return Pdata_stack_underflow(self->stack); PDATA_POP(self->stack, state); if (state == NULL) @@ -6072,7 +6140,8 @@ load_mark(UnpicklerObject *self) self->marks_size = (Py_ssize_t)alloc; } - self->marks[self->num_marks++] = Py_SIZE(self->stack); + self->stack->mark_set = 1; + self->marks[self->num_marks++] = self->stack->fence = Py_SIZE(self->stack); return 0; } @@ -6155,6 +6224,8 @@ load(UnpicklerObject *self) char *s = NULL; self->num_marks = 0; + self->stack->mark_set = 0; + self->stack->fence = 0; self->proto = 0; if (Py_SIZE(self->stack)) Pdata_clear(self->stack, 0); @@ -6167,8 +6238,13 @@ load(UnpicklerObject *self) case opcode: if (load_func(self, (arg)) < 0) break; continue; while (1) { - if (_Unpickler_Read(self, &s, 1) < 0) - break; + if (_Unpickler_Read(self, &s, 1) < 0) { + PickleState *st = _Pickle_GetGlobalState(); + if (PyErr_ExceptionMatches(st->UnpicklingError)) { + PyErr_Format(PyExc_EOFError, "Ran out of input"); + } + return NULL; + } switch ((enum opcode)s[0]) { OP(NONE, load_none) @@ -6240,15 +6316,19 @@ load(UnpicklerObject *self) break; default: - if (s[0] == '\0') { - PyErr_SetNone(PyExc_EOFError); - } - else { + { PickleState *st = _Pickle_GetGlobalState(); - PyErr_Format(st->UnpicklingError, - "invalid load key, '%c'.", s[0]); + unsigned char c = (unsigned char) *s; + if (0x20 <= c && c <= 0x7e && c != '\'' && c != '\\') { + PyErr_Format(st->UnpicklingError, + "invalid load key, '%c'.", c); + } + else { + PyErr_Format(st->UnpicklingError, + "invalid load key, '\\x%02x'.", c); + } + return NULL; } - return NULL; } break; /* and we are done! */ @@ -6859,8 +6939,6 @@ Unpickler_get_persload(UnpicklerObject *self) static int Unpickler_set_persload(UnpicklerObject *self, PyObject *value) { - PyObject *tmp; - if (value == NULL) { PyErr_SetString(PyExc_TypeError, "attribute deletion is not supported"); @@ -6873,10 +6951,8 @@ Unpickler_set_persload(UnpicklerObject *self, PyObject *value) return -1; } - tmp = self->pers_func; Py_INCREF(value); - self->pers_func = value; - Py_XDECREF(tmp); /* self->pers_func can be NULL, so be careful. */ + Py_XSETREF(self->pers_func, value); return 0; } diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index 48c1953..5007a39 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -21,8 +21,7 @@ #include #endif -#if defined(__ANDROID__) && !defined(SYS_getdents64) -/* Android doesn't expose syscalls, add the definition manually. */ +#if defined(__ANDROID__) && __ANDROID_API__ < 21 && !defined(SYS_getdents64) # include # define SYS_getdents64 __NR_getdents64 #endif @@ -72,7 +71,7 @@ _enable_gc(int need_to_reenable_gc, PyObject *gc_module) /* Convert ASCII to a positive int, no libc call. no overflow. -1 on error. */ static int -_pos_int_from_ascii(char *name) +_pos_int_from_ascii(const char *name) { int num = 0; while (*name >= '0' && *name <= '9') { @@ -112,17 +111,13 @@ _is_fdescfs_mounted_on_dev_fd(void) static int _sanity_check_python_fd_sequence(PyObject *fd_sequence) { - Py_ssize_t seq_idx; + Py_ssize_t seq_idx, seq_len = PySequence_Length(fd_sequence); long prev_fd = -1; - for (seq_idx = 0; seq_idx < PyTuple_GET_SIZE(fd_sequence); ++seq_idx) { - PyObject* py_fd = PyTuple_GET_ITEM(fd_sequence, seq_idx); - long iter_fd; - if (!PyLong_Check(py_fd)) { - return 1; - } - iter_fd = PyLong_AsLong(py_fd); + for (seq_idx = 0; seq_idx < seq_len; ++seq_idx) { + PyObject* py_fd = PySequence_Fast_GET_ITEM(fd_sequence, seq_idx); + long iter_fd = PyLong_AsLong(py_fd); if (iter_fd < 0 || iter_fd <= prev_fd || iter_fd > INT_MAX) { - /* Negative, overflow, unsorted, too big for a fd. */ + /* Negative, overflow, not a Long, unsorted, too big for a fd. */ return 1; } prev_fd = iter_fd; @@ -137,12 +132,13 @@ _is_fd_in_sorted_fd_sequence(int fd, PyObject *fd_sequence) { /* Binary search. */ Py_ssize_t search_min = 0; - Py_ssize_t search_max = PyTuple_GET_SIZE(fd_sequence) - 1; + Py_ssize_t search_max = PySequence_Length(fd_sequence) - 1; if (search_max < 0) return 0; do { long middle = (search_min + search_max) / 2; - long middle_fd = PyLong_AsLong(PyTuple_GET_ITEM(fd_sequence, middle)); + long middle_fd = PyLong_AsLong( + PySequence_Fast_GET_ITEM(fd_sequence, middle)); if (fd == middle_fd) return 1; if (fd > middle_fd) @@ -158,9 +154,9 @@ make_inheritable(PyObject *py_fds_to_keep, int errpipe_write) { Py_ssize_t i, len; - len = PyTuple_GET_SIZE(py_fds_to_keep); + len = PySequence_Length(py_fds_to_keep); for (i = 0; i < len; ++i) { - PyObject* fdobj = PyTuple_GET_ITEM(py_fds_to_keep, i); + PyObject* fdobj = PySequence_Fast_GET_ITEM(py_fds_to_keep, i); long fd = PyLong_AsLong(fdobj); assert(!PyErr_Occurred()); assert(0 <= fd && fd <= INT_MAX); @@ -217,13 +213,14 @@ static void _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep) { long end_fd = safe_get_max_fd(); - Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep); + Py_ssize_t num_fds_to_keep = PySequence_Length(py_fds_to_keep); Py_ssize_t keep_seq_idx; int fd_num; /* As py_fds_to_keep is sorted we can loop through the list closing * fds inbetween any in the keep list falling within our range. */ for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) { - PyObject* py_keep_fd = PyTuple_GET_ITEM(py_fds_to_keep, keep_seq_idx); + PyObject* py_keep_fd = PySequence_Fast_GET_ITEM(py_fds_to_keep, + keep_seq_idx); int keep_fd = PyLong_AsLong(py_keep_fd); if (keep_fd < start_fd) continue; @@ -309,7 +306,7 @@ _close_open_fds_safe(int start_fd, PyObject* py_fds_to_keep) /* Close all open file descriptors from start_fd and higher. - * Do not close any in the sorted py_fds_to_keep tuple. + * Do not close any in the sorted py_fds_to_keep list. * * This function violates the strict use of async signal safe functions. :( * It calls opendir(), readdir() and closedir(). Of these, the one most @@ -565,9 +562,8 @@ subprocess_fork_exec(PyObject* self, PyObject *args) #endif if (!PyArg_ParseTuple( - args, "OOpO!OOiiiiiiiiiiO:fork_exec", - &process_args, &executable_list, - &close_fds, &PyTuple_Type, &py_fds_to_keep, + args, "OOpOOOiiiiiiiiiiO:fork_exec", + &process_args, &executable_list, &close_fds, &py_fds_to_keep, &cwd_obj, &env_list, &p2cread, &p2cwrite, &c2pread, &c2pwrite, &errread, &errwrite, &errpipe_read, &errpipe_write, @@ -578,6 +574,10 @@ subprocess_fork_exec(PyObject* self, PyObject *args) PyErr_SetString(PyExc_ValueError, "errpipe_write must be >= 3"); return NULL; } + if (PySequence_Length(py_fds_to_keep) < 0) { + PyErr_SetString(PyExc_ValueError, "cannot get length of fds_to_keep"); + return NULL; + } if (_sanity_check_python_fd_sequence(py_fds_to_keep)) { PyErr_SetString(PyExc_ValueError, "bad value(s) in fds_to_keep"); return NULL; @@ -631,10 +631,6 @@ subprocess_fork_exec(PyObject* self, PyObject *args) goto cleanup; for (arg_num = 0; arg_num < num_args; ++arg_num) { PyObject *borrowed_arg, *converted_arg; - if (PySequence_Fast_GET_SIZE(fast_args) != num_args) { - PyErr_SetString(PyExc_RuntimeError, "args changed during iteration"); - goto cleanup; - } borrowed_arg = PySequence_Fast_GET_ITEM(fast_args, arg_num); if (PyUnicode_FSConverter(borrowed_arg, &converted_arg) == 0) goto cleanup; diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index acb116d..63759d5 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -2,7 +2,7 @@ /* ------------------------------------------------------------------ The code in this module was based on a download from: - http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html + http://www.math.keio.ac.jp/~matumoto/MT2002/emt19937ar.html It was modified in 2002 by Raymond Hettinger as follows: @@ -60,17 +60,16 @@ Any feedback is very welcome. - http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html - email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space) + http://www.math.keio.ac.jp/matumoto/emt.html + email: matumoto@math.keio.ac.jp */ /* ---------------------------------------------------------------*/ #include "Python.h" #include /* for seeding to current time */ - -#ifndef PY_UINT32_T -# error "Failed to find an exact-width 32-bit integer type" +#ifdef HAVE_PROCESS_H +# include /* needed for getpid() */ #endif /* Period parameters -- These are all magic. Don't change. */ @@ -83,7 +82,7 @@ typedef struct { PyObject_HEAD int index; - PY_UINT32_T state[N]; + uint32_t state[N]; } RandomObject; static PyTypeObject Random_Type; @@ -95,13 +94,13 @@ static PyTypeObject Random_Type; /* generates a random number on [0,0xffffffff]-interval */ -static PY_UINT32_T +static uint32_t genrand_int32(RandomObject *self) { - PY_UINT32_T y; - static PY_UINT32_T mag01[2]={0x0U, MATRIX_A}; + uint32_t y; + static const uint32_t mag01[2] = {0x0U, MATRIX_A}; /* mag01[x] = x * MATRIX_A for x=0,1 */ - PY_UINT32_T *mt; + uint32_t *mt; mt = self->state; if (self->index >= N) { /* generate N words at one time */ @@ -136,21 +135,21 @@ genrand_int32(RandomObject *self) * optimize the division away at compile-time. 67108864 is 2**26. In * effect, a contains 27 random bits shifted left 26, and b fills in the * lower 26 bits of the 53-bit numerator. - * The orginal code credited Isaku Wada for this algorithm, 2002/01/09. + * The original code credited Isaku Wada for this algorithm, 2002/01/09. */ static PyObject * random_random(RandomObject *self) { - PY_UINT32_T a=genrand_int32(self)>>5, b=genrand_int32(self)>>6; + uint32_t a=genrand_int32(self)>>5, b=genrand_int32(self)>>6; return PyFloat_FromDouble((a*67108864.0+b)*(1.0/9007199254740992.0)); } /* initializes mt[N] with a seed */ static void -init_genrand(RandomObject *self, PY_UINT32_T s) +init_genrand(RandomObject *self, uint32_t s) { int mti; - PY_UINT32_T *mt; + uint32_t *mt; mt = self->state; mt[0]= s; @@ -169,11 +168,11 @@ init_genrand(RandomObject *self, PY_UINT32_T s) /* initialize by an array with array-length */ /* init_key is the array for initializing keys */ /* key_length is its length */ -static PyObject * -init_by_array(RandomObject *self, PY_UINT32_T init_key[], size_t key_length) +static void +init_by_array(RandomObject *self, uint32_t init_key[], size_t key_length) { size_t i, j, k; /* was signed in the original code. RDH 12/16/2002 */ - PY_UINT32_T *mt; + uint32_t *mt; mt = self->state; init_genrand(self, 19650218U); @@ -181,21 +180,19 @@ init_by_array(RandomObject *self, PY_UINT32_T init_key[], size_t key_length) k = (N>key_length ? N : key_length); for (; k; k--) { mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525U)) - + init_key[j] + (PY_UINT32_T)j; /* non linear */ + + init_key[j] + (uint32_t)j; /* non linear */ i++; j++; if (i>=N) { mt[0] = mt[N-1]; i=1; } if (j>=key_length) j=0; } for (k=N-1; k; k--) { mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941U)) - - (PY_UINT32_T)i; /* non linear */ + - (uint32_t)i; /* non linear */ i++; if (i>=N) { mt[0] = mt[N-1]; i=1; } } mt[0] = 0x80000000U; /* MSB is 1; assuring non-zero initial array */ - Py_INCREF(Py_None); - return Py_None; } /* @@ -203,12 +200,43 @@ init_by_array(RandomObject *self, PY_UINT32_T init_key[], size_t key_length) * Twister download. */ +static int +random_seed_urandom(RandomObject *self) +{ + PY_UINT32_T key[N]; + + if (_PyOS_URandomNonblock(key, sizeof(key)) < 0) { + return -1; + } + init_by_array(self, key, Py_ARRAY_LENGTH(key)); + return 0; +} + +static void +random_seed_time_pid(RandomObject *self) +{ + _PyTime_t now; + uint32_t key[5]; + + now = _PyTime_GetSystemClock(); + key[0] = (PY_UINT32_T)(now & 0xffffffffU); + key[1] = (PY_UINT32_T)(now >> 32); + + key[2] = (PY_UINT32_T)getpid(); + + now = _PyTime_GetMonotonicClock(); + key[3] = (PY_UINT32_T)(now & 0xffffffffU); + key[4] = (PY_UINT32_T)(now >> 32); + + init_by_array(self, key, Py_ARRAY_LENGTH(key)); +} + static PyObject * random_seed(RandomObject *self, PyObject *args) { PyObject *result = NULL; /* guilty until proved innocent */ PyObject *n = NULL; - PY_UINT32_T *key = NULL; + uint32_t *key = NULL; size_t bits, keyused; int res; PyObject *arg = NULL; @@ -216,14 +244,17 @@ random_seed(RandomObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "seed", 0, 1, &arg)) return NULL; - if (arg == NULL || arg == Py_None) { - time_t now; + if (arg == NULL || arg == Py_None) { + if (random_seed_urandom(self) >= 0) { + PyErr_Clear(); - time(&now); - init_genrand(self, (PY_UINT32_T)now); - Py_INCREF(Py_None); - return Py_None; + /* Reading system entropy failed, fall back on the worst entropy: + use the current time and process identifier. */ + random_seed_time_pid(self); + } + Py_RETURN_NONE; } + /* This algorithm relies on the number being unsigned. * So: if the arg is a PyLong, use its absolute value. * Otherwise use its hash value, cast to unsigned. @@ -248,7 +279,7 @@ random_seed(RandomObject *self, PyObject *args) keyused = bits == 0 ? 1 : (bits - 1) / 32 + 1; /* Convert seed to byte sequence. */ - key = (PY_UINT32_T *)PyMem_Malloc((size_t)4 * keyused); + key = (uint32_t *)PyMem_Malloc((size_t)4 * keyused); if (key == NULL) { PyErr_NoMemory(); goto Done; @@ -267,13 +298,17 @@ random_seed(RandomObject *self, PyObject *args) size_t i, j; /* Reverse an array. */ for (i = 0, j = keyused - 1; i < j; i++, j--) { - PY_UINT32_T tmp = key[i]; + uint32_t tmp = key[i]; key[i] = key[j]; key[j] = tmp; } } #endif - result = init_by_array(self, key, keyused); + init_by_array(self, key, keyused); + + Py_INCREF(Py_None); + result = Py_None; + Done: Py_XDECREF(n); PyMem_Free(key); @@ -313,7 +348,6 @@ random_setstate(RandomObject *self, PyObject *state) int i; unsigned long element; long index; - PY_UINT32_T new_state[N]; if (!PyTuple_Check(state)) { PyErr_SetString(PyExc_TypeError, @@ -330,7 +364,7 @@ random_setstate(RandomObject *self, PyObject *state) element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i)); if (element == (unsigned long)-1 && PyErr_Occurred()) return NULL; - new_state[i] = (PY_UINT32_T)element; + self->state[i] = (uint32_t)element; } index = PyLong_AsLong(PyTuple_GET_ITEM(state, i)); @@ -341,8 +375,6 @@ random_setstate(RandomObject *self, PyObject *state) return NULL; } self->index = (int)index; - for (i = 0; i < N; i++) - self->state[i] = new_state[i]; Py_INCREF(Py_None); return Py_None; @@ -352,8 +384,8 @@ static PyObject * random_getrandbits(RandomObject *self, PyObject *args) { int k, i, words; - PY_UINT32_T r; - PY_UINT32_T *wordarray; + uint32_t r; + uint32_t *wordarray; PyObject *result; if (!PyArg_ParseTuple(args, "i:getrandbits", &k)) @@ -369,7 +401,7 @@ random_getrandbits(RandomObject *self, PyObject *args) return PyLong_FromUnsignedLong(genrand_int32(self) >> (32 - k)); words = (k - 1) / 32 + 1; - wordarray = (PY_UINT32_T *)PyMem_Malloc(words * 4); + wordarray = (uint32_t *)PyMem_Malloc(words * 4); if (wordarray == NULL) { PyErr_NoMemory(); return NULL; diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 66b6e34..1ce4b77 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -71,16 +71,12 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__))) result = PyDict_New(); if (result == NULL) goto error; - if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) { - aNum = CFDictionaryGetValue(proxyDict, - kSCPropNetProxiesExcludeSimpleHostnames); - if (aNum == NULL) { - v = PyBool_FromLong(0); - } else { - v = PyBool_FromLong(cfnum_to_int32(aNum)); - } - } else { + aNum = CFDictionaryGetValue(proxyDict, + kSCPropNetProxiesExcludeSimpleHostnames); + if (aNum == NULL) { v = PyBool_FromLong(0); + } else { + v = PyBool_FromLong(cfnum_to_int32(aNum)); } if (v == NULL) goto error; @@ -130,7 +126,7 @@ error: } static int -set_proxy(PyObject* proxies, char* proto, CFDictionaryRef proxyDict, +set_proxy(PyObject* proxies, const char* proto, CFDictionaryRef proxyDict, CFStringRef enabledKey, CFStringRef hostKey, CFStringRef portKey) { diff --git a/Modules/_sha3/README.txt b/Modules/_sha3/README.txt new file mode 100644 index 0000000..e34b1d1 --- /dev/null +++ b/Modules/_sha3/README.txt @@ -0,0 +1,11 @@ +Keccak Code Package +=================== + +The files in kcp are taken from the Keccak Code Package. They have been +slightly to be C89 compatible. The architecture specific header file +KeccakP-1600-SnP.h ha been renamed to KeccakP-1600-SnP-opt32.h or +KeccakP-1600-SnP-opt64.h. + +The 64bit files were generated with generic64lc/libkeccak.a.pack target, the +32bit files with generic32lc/libkeccak.a.pack. + diff --git a/Modules/_sha3/cleanup.py b/Modules/_sha3/cleanup.py new file mode 100755 index 0000000..17c56b3 --- /dev/null +++ b/Modules/_sha3/cleanup.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# Copyright (C) 2012 Christian Heimes (christian@python.org) +# Licensed to PSF under a Contributor Agreement. +# +# cleanup Keccak sources + +import os +import re + +CPP1 = re.compile("^//(.*)") +CPP2 = re.compile("\ //(.*)") + +STATICS = ("void ", "int ", "HashReturn ", + "const UINT64 ", "UINT16 ", " int prefix##") + +HERE = os.path.dirname(os.path.abspath(__file__)) +KECCAK = os.path.join(HERE, "kcp") + +def getfiles(): + for name in os.listdir(KECCAK): + name = os.path.join(KECCAK, name) + if os.path.isfile(name): + yield name + +def cleanup(f): + buf = [] + for line in f: + # mark all functions and global data as static + #if line.startswith(STATICS): + # buf.append("static " + line) + # continue + # remove UINT64 typedef, we have our own + if line.startswith("typedef unsigned long long int"): + buf.append("/* %s */\n" % line.strip()) + continue + ## remove #include "brg_endian.h" + if "brg_endian.h" in line: + buf.append("/* %s */\n" % line.strip()) + continue + # transform C++ comments into ANSI C comments + line = CPP1.sub(r"/*\1 */\n", line) + line = CPP2.sub(r" /*\1 */\n", line) + buf.append(line) + return "".join(buf) + +for name in getfiles(): + with open(name) as f: + res = cleanup(f) + with open(name, "w") as f: + f.write(res) diff --git a/Modules/_sha3/clinic/sha3module.c.h b/Modules/_sha3/clinic/sha3module.c.h new file mode 100644 index 0000000..7688e7d --- /dev/null +++ b/Modules/_sha3/clinic/sha3module.c.h @@ -0,0 +1,154 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +PyDoc_STRVAR(py_sha3_new__doc__, +"sha3_224(string=None)\n" +"--\n" +"\n" +"Return a new SHA3 hash object with a hashbit length of 28 bytes."); + +static PyObject * +py_sha3_new_impl(PyTypeObject *type, PyObject *data); + +static PyObject * +py_sha3_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha3_224", _keywords, 0}; + PyObject *data = NULL; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &data)) { + goto exit; + } + return_value = py_sha3_new_impl(type, data); + +exit: + return return_value; +} + +PyDoc_STRVAR(_sha3_sha3_224_copy__doc__, +"copy($self, /)\n" +"--\n" +"\n" +"Return a copy of the hash object."); + +#define _SHA3_SHA3_224_COPY_METHODDEF \ + {"copy", (PyCFunction)_sha3_sha3_224_copy, METH_NOARGS, _sha3_sha3_224_copy__doc__}, + +static PyObject * +_sha3_sha3_224_copy_impl(SHA3object *self); + +static PyObject * +_sha3_sha3_224_copy(SHA3object *self, PyObject *Py_UNUSED(ignored)) +{ + return _sha3_sha3_224_copy_impl(self); +} + +PyDoc_STRVAR(_sha3_sha3_224_digest__doc__, +"digest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of binary data."); + +#define _SHA3_SHA3_224_DIGEST_METHODDEF \ + {"digest", (PyCFunction)_sha3_sha3_224_digest, METH_NOARGS, _sha3_sha3_224_digest__doc__}, + +static PyObject * +_sha3_sha3_224_digest_impl(SHA3object *self); + +static PyObject * +_sha3_sha3_224_digest(SHA3object *self, PyObject *Py_UNUSED(ignored)) +{ + return _sha3_sha3_224_digest_impl(self); +} + +PyDoc_STRVAR(_sha3_sha3_224_hexdigest__doc__, +"hexdigest($self, /)\n" +"--\n" +"\n" +"Return the digest value as a string of hexadecimal digits."); + +#define _SHA3_SHA3_224_HEXDIGEST_METHODDEF \ + {"hexdigest", (PyCFunction)_sha3_sha3_224_hexdigest, METH_NOARGS, _sha3_sha3_224_hexdigest__doc__}, + +static PyObject * +_sha3_sha3_224_hexdigest_impl(SHA3object *self); + +static PyObject * +_sha3_sha3_224_hexdigest(SHA3object *self, PyObject *Py_UNUSED(ignored)) +{ + return _sha3_sha3_224_hexdigest_impl(self); +} + +PyDoc_STRVAR(_sha3_sha3_224_update__doc__, +"update($self, obj, /)\n" +"--\n" +"\n" +"Update this hash object\'s state with the provided string."); + +#define _SHA3_SHA3_224_UPDATE_METHODDEF \ + {"update", (PyCFunction)_sha3_sha3_224_update, METH_O, _sha3_sha3_224_update__doc__}, + +PyDoc_STRVAR(_sha3_shake_128_digest__doc__, +"digest($self, /, length)\n" +"--\n" +"\n" +"Return the digest value as a string of binary data."); + +#define _SHA3_SHAKE_128_DIGEST_METHODDEF \ + {"digest", (PyCFunction)_sha3_shake_128_digest, METH_FASTCALL, _sha3_shake_128_digest__doc__}, + +static PyObject * +_sha3_shake_128_digest_impl(SHA3object *self, unsigned long length); + +static PyObject * +_sha3_shake_128_digest(SHA3object *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"length", NULL}; + static _PyArg_Parser _parser = {"k:digest", _keywords, 0}; + unsigned long length; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &length)) { + goto exit; + } + return_value = _sha3_shake_128_digest_impl(self, length); + +exit: + return return_value; +} + +PyDoc_STRVAR(_sha3_shake_128_hexdigest__doc__, +"hexdigest($self, /, length)\n" +"--\n" +"\n" +"Return the digest value as a string of hexadecimal digits."); + +#define _SHA3_SHAKE_128_HEXDIGEST_METHODDEF \ + {"hexdigest", (PyCFunction)_sha3_shake_128_hexdigest, METH_FASTCALL, _sha3_shake_128_hexdigest__doc__}, + +static PyObject * +_sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length); + +static PyObject * +_sha3_shake_128_hexdigest(SHA3object *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"length", NULL}; + static _PyArg_Parser _parser = {"k:hexdigest", _keywords, 0}; + unsigned long length; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &length)) { + goto exit; + } + return_value = _sha3_shake_128_hexdigest_impl(self, length); + +exit: + return return_value; +} +/*[clinic end generated code: output=9888beab45136a56 input=a9049054013a1b77]*/ diff --git a/Modules/_sha3/kcp/KeccakHash.c b/Modules/_sha3/kcp/KeccakHash.c new file mode 100644 index 0000000..e09fb43 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakHash.c @@ -0,0 +1,82 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +#include "KeccakHash.h" + +/* ---------------------------------------------------------------- */ + +HashReturn Keccak_HashInitialize(Keccak_HashInstance *instance, unsigned int rate, unsigned int capacity, unsigned int hashbitlen, unsigned char delimitedSuffix) +{ + HashReturn result; + + if (delimitedSuffix == 0) + return FAIL; + result = (HashReturn)KeccakWidth1600_SpongeInitialize(&instance->sponge, rate, capacity); + if (result != SUCCESS) + return result; + instance->fixedOutputLength = hashbitlen; + instance->delimitedSuffix = delimitedSuffix; + return SUCCESS; +} + +/* ---------------------------------------------------------------- */ + +HashReturn Keccak_HashUpdate(Keccak_HashInstance *instance, const BitSequence *data, DataLength databitlen) +{ + if ((databitlen % 8) == 0) + return (HashReturn)KeccakWidth1600_SpongeAbsorb(&instance->sponge, data, databitlen/8); + else { + HashReturn ret = (HashReturn)KeccakWidth1600_SpongeAbsorb(&instance->sponge, data, databitlen/8); + if (ret == SUCCESS) { + /* The last partial byte is assumed to be aligned on the least significant bits */ + + unsigned char lastByte = data[databitlen/8]; + /* Concatenate the last few bits provided here with those of the suffix */ + + unsigned short delimitedLastBytes = (unsigned short)((unsigned short)lastByte | ((unsigned short)instance->delimitedSuffix << (databitlen % 8))); + if ((delimitedLastBytes & 0xFF00) == 0x0000) { + instance->delimitedSuffix = delimitedLastBytes & 0xFF; + } + else { + unsigned char oneByte[1]; + oneByte[0] = delimitedLastBytes & 0xFF; + ret = (HashReturn)KeccakWidth1600_SpongeAbsorb(&instance->sponge, oneByte, 1); + instance->delimitedSuffix = (delimitedLastBytes >> 8) & 0xFF; + } + } + return ret; + } +} + +/* ---------------------------------------------------------------- */ + +HashReturn Keccak_HashFinal(Keccak_HashInstance *instance, BitSequence *hashval) +{ + HashReturn ret = (HashReturn)KeccakWidth1600_SpongeAbsorbLastFewBits(&instance->sponge, instance->delimitedSuffix); + if (ret == SUCCESS) + return (HashReturn)KeccakWidth1600_SpongeSqueeze(&instance->sponge, hashval, instance->fixedOutputLength/8); + else + return ret; +} + +/* ---------------------------------------------------------------- */ + +HashReturn Keccak_HashSqueeze(Keccak_HashInstance *instance, BitSequence *data, DataLength databitlen) +{ + if ((databitlen % 8) != 0) + return FAIL; + return (HashReturn)KeccakWidth1600_SpongeSqueeze(&instance->sponge, data, databitlen/8); +} diff --git a/Modules/_sha3/kcp/KeccakHash.h b/Modules/_sha3/kcp/KeccakHash.h new file mode 100644 index 0000000..bbd3dc6 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakHash.h @@ -0,0 +1,114 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakHashInterface_h_ +#define _KeccakHashInterface_h_ + +#ifndef KeccakP1600_excluded + +#include "KeccakSponge.h" +#include + +typedef unsigned char BitSequence; +typedef size_t DataLength; +typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn; + +typedef struct { + KeccakWidth1600_SpongeInstance sponge; + unsigned int fixedOutputLength; + unsigned char delimitedSuffix; +} Keccak_HashInstance; + +/** + * Function to initialize the Keccak[r, c] sponge function instance used in sequential hashing mode. + * @param hashInstance Pointer to the hash instance to be initialized. + * @param rate The value of the rate r. + * @param capacity The value of the capacity c. + * @param hashbitlen The desired number of output bits, + * or 0 for an arbitrarily-long output. + * @param delimitedSuffix Bits that will be automatically appended to the end + * of the input message, as in domain separation. + * This is a byte containing from 0 to 7 bits + * formatted like the @a delimitedData parameter of + * the Keccak_SpongeAbsorbLastFewBits() function. + * @pre One must have r+c=1600 and the rate a multiple of 8 bits in this implementation. + * @return SUCCESS if successful, FAIL otherwise. + */ +HashReturn Keccak_HashInitialize(Keccak_HashInstance *hashInstance, unsigned int rate, unsigned int capacity, unsigned int hashbitlen, unsigned char delimitedSuffix); + +/** Macro to initialize a SHAKE128 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHAKE128(hashInstance) Keccak_HashInitialize(hashInstance, 1344, 256, 0, 0x1F) + +/** Macro to initialize a SHAKE256 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHAKE256(hashInstance) Keccak_HashInitialize(hashInstance, 1088, 512, 0, 0x1F) + +/** Macro to initialize a SHA3-224 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHA3_224(hashInstance) Keccak_HashInitialize(hashInstance, 1152, 448, 224, 0x06) + +/** Macro to initialize a SHA3-256 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHA3_256(hashInstance) Keccak_HashInitialize(hashInstance, 1088, 512, 256, 0x06) + +/** Macro to initialize a SHA3-384 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHA3_384(hashInstance) Keccak_HashInitialize(hashInstance, 832, 768, 384, 0x06) + +/** Macro to initialize a SHA3-512 instance as specified in the FIPS 202 standard. + */ +#define Keccak_HashInitialize_SHA3_512(hashInstance) Keccak_HashInitialize(hashInstance, 576, 1024, 512, 0x06) + +/** + * Function to give input data to be absorbed. + * @param hashInstance Pointer to the hash instance initialized by Keccak_HashInitialize(). + * @param data Pointer to the input data. + * When @a databitLen is not a multiple of 8, the last bits of data must be + * in the least significant bits of the last byte (little-endian convention). + * @param databitLen The number of input bits provided in the input data. + * @pre In the previous call to Keccak_HashUpdate(), databitlen was a multiple of 8. + * @return SUCCESS if successful, FAIL otherwise. + */ +HashReturn Keccak_HashUpdate(Keccak_HashInstance *hashInstance, const BitSequence *data, DataLength databitlen); + +/** + * Function to call after all input blocks have been input and to get + * output bits if the length was specified when calling Keccak_HashInitialize(). + * @param hashInstance Pointer to the hash instance initialized by Keccak_HashInitialize(). + * If @a hashbitlen was not 0 in the call to Keccak_HashInitialize(), the number of + * output bits is equal to @a hashbitlen. + * If @a hashbitlen was 0 in the call to Keccak_HashInitialize(), the output bits + * must be extracted using the Keccak_HashSqueeze() function. + * @param state Pointer to the state of the sponge function initialized by Init(). + * @param hashval Pointer to the buffer where to store the output data. + * @return SUCCESS if successful, FAIL otherwise. + */ +HashReturn Keccak_HashFinal(Keccak_HashInstance *hashInstance, BitSequence *hashval); + + /** + * Function to squeeze output data. + * @param hashInstance Pointer to the hash instance initialized by Keccak_HashInitialize(). + * @param data Pointer to the buffer where to store the output data. + * @param databitlen The number of output bits desired (must be a multiple of 8). + * @pre Keccak_HashFinal() must have been already called. + * @pre @a databitlen is a multiple of 8. + * @return SUCCESS if successful, FAIL otherwise. + */ +HashReturn Keccak_HashSqueeze(Keccak_HashInstance *hashInstance, BitSequence *data, DataLength databitlen); + +#endif + +#endif diff --git a/Modules/_sha3/kcp/KeccakP-1600-64.macros b/Modules/_sha3/kcp/KeccakP-1600-64.macros new file mode 100644 index 0000000..1f11fe3 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-64.macros @@ -0,0 +1,2208 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define declareABCDE \ + UINT64 Aba, Abe, Abi, Abo, Abu; \ + UINT64 Aga, Age, Agi, Ago, Agu; \ + UINT64 Aka, Ake, Aki, Ako, Aku; \ + UINT64 Ama, Ame, Ami, Amo, Amu; \ + UINT64 Asa, Ase, Asi, Aso, Asu; \ + UINT64 Bba, Bbe, Bbi, Bbo, Bbu; \ + UINT64 Bga, Bge, Bgi, Bgo, Bgu; \ + UINT64 Bka, Bke, Bki, Bko, Bku; \ + UINT64 Bma, Bme, Bmi, Bmo, Bmu; \ + UINT64 Bsa, Bse, Bsi, Bso, Bsu; \ + UINT64 Ca, Ce, Ci, Co, Cu; \ + UINT64 Da, De, Di, Do, Du; \ + UINT64 Eba, Ebe, Ebi, Ebo, Ebu; \ + UINT64 Ega, Ege, Egi, Ego, Egu; \ + UINT64 Eka, Eke, Eki, Eko, Eku; \ + UINT64 Ema, Eme, Emi, Emo, Emu; \ + UINT64 Esa, Ese, Esi, Eso, Esu; \ + +#define prepareTheta \ + Ca = Aba^Aga^Aka^Ama^Asa; \ + Ce = Abe^Age^Ake^Ame^Ase; \ + Ci = Abi^Agi^Aki^Ami^Asi; \ + Co = Abo^Ago^Ako^Amo^Aso; \ + Cu = Abu^Agu^Aku^Amu^Asu; \ + +#ifdef UseBebigokimisa +/* --- Code for round, with prepare-theta (lane complementing pattern 'bebigokimisa') */ + +/* --- 64-bit lanes mapped to 64-bit words */ + +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^( Bbe | Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + Ca = E##ba; \ + E##be = Bbe ^((~Bbi)| Bbo ); \ + Ce = E##be; \ + E##bi = Bbi ^( Bbo & Bbu ); \ + Ci = E##bi; \ + E##bo = Bbo ^( Bbu | Bba ); \ + Co = E##bo; \ + E##bu = Bbu ^( Bba & Bbe ); \ + Cu = E##bu; \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^( Bge | Bgi ); \ + Ca ^= E##ga; \ + E##ge = Bge ^( Bgi & Bgo ); \ + Ce ^= E##ge; \ + E##gi = Bgi ^( Bgo |(~Bgu)); \ + Ci ^= E##gi; \ + E##go = Bgo ^( Bgu | Bga ); \ + Co ^= E##go; \ + E##gu = Bgu ^( Bga & Bge ); \ + Cu ^= E##gu; \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^( Bke | Bki ); \ + Ca ^= E##ka; \ + E##ke = Bke ^( Bki & Bko ); \ + Ce ^= E##ke; \ + E##ki = Bki ^((~Bko)& Bku ); \ + Ci ^= E##ki; \ + E##ko = (~Bko)^( Bku | Bka ); \ + Co ^= E##ko; \ + E##ku = Bku ^( Bka & Bke ); \ + Cu ^= E##ku; \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^( Bme & Bmi ); \ + Ca ^= E##ma; \ + E##me = Bme ^( Bmi | Bmo ); \ + Ce ^= E##me; \ + E##mi = Bmi ^((~Bmo)| Bmu ); \ + Ci ^= E##mi; \ + E##mo = (~Bmo)^( Bmu & Bma ); \ + Co ^= E##mo; \ + E##mu = Bmu ^( Bma | Bme ); \ + Cu ^= E##mu; \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + Ca ^= E##sa; \ + E##se = (~Bse)^( Bsi | Bso ); \ + Ce ^= E##se; \ + E##si = Bsi ^( Bso & Bsu ); \ + Ci ^= E##si; \ + E##so = Bso ^( Bsu | Bsa ); \ + Co ^= E##so; \ + E##su = Bsu ^( Bsa & Bse ); \ + Cu ^= E##su; \ +\ + +/* --- Code for round (lane complementing pattern 'bebigokimisa') */ + +/* --- 64-bit lanes mapped to 64-bit words */ + +#define thetaRhoPiChiIota(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^( Bbe | Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + E##be = Bbe ^((~Bbi)| Bbo ); \ + E##bi = Bbi ^( Bbo & Bbu ); \ + E##bo = Bbo ^( Bbu | Bba ); \ + E##bu = Bbu ^( Bba & Bbe ); \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^( Bge | Bgi ); \ + E##ge = Bge ^( Bgi & Bgo ); \ + E##gi = Bgi ^( Bgo |(~Bgu)); \ + E##go = Bgo ^( Bgu | Bga ); \ + E##gu = Bgu ^( Bga & Bge ); \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^( Bke | Bki ); \ + E##ke = Bke ^( Bki & Bko ); \ + E##ki = Bki ^((~Bko)& Bku ); \ + E##ko = (~Bko)^( Bku | Bka ); \ + E##ku = Bku ^( Bka & Bke ); \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^( Bme & Bmi ); \ + E##me = Bme ^( Bmi | Bmo ); \ + E##mi = Bmi ^((~Bmo)| Bmu ); \ + E##mo = (~Bmo)^( Bmu & Bma ); \ + E##mu = Bmu ^( Bma | Bme ); \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + E##se = (~Bse)^( Bsi | Bso ); \ + E##si = Bsi ^( Bso & Bsu ); \ + E##so = Bso ^( Bsu | Bsa ); \ + E##su = Bsu ^( Bsa & Bse ); \ +\ + +#else /* UseBebigokimisa */ + +/* --- Code for round, with prepare-theta */ + +/* --- 64-bit lanes mapped to 64-bit words */ + +#define thetaRhoPiChiIotaPrepareTheta(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^((~Bbe)& Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + Ca = E##ba; \ + E##be = Bbe ^((~Bbi)& Bbo ); \ + Ce = E##be; \ + E##bi = Bbi ^((~Bbo)& Bbu ); \ + Ci = E##bi; \ + E##bo = Bbo ^((~Bbu)& Bba ); \ + Co = E##bo; \ + E##bu = Bbu ^((~Bba)& Bbe ); \ + Cu = E##bu; \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^((~Bge)& Bgi ); \ + Ca ^= E##ga; \ + E##ge = Bge ^((~Bgi)& Bgo ); \ + Ce ^= E##ge; \ + E##gi = Bgi ^((~Bgo)& Bgu ); \ + Ci ^= E##gi; \ + E##go = Bgo ^((~Bgu)& Bga ); \ + Co ^= E##go; \ + E##gu = Bgu ^((~Bga)& Bge ); \ + Cu ^= E##gu; \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^((~Bke)& Bki ); \ + Ca ^= E##ka; \ + E##ke = Bke ^((~Bki)& Bko ); \ + Ce ^= E##ke; \ + E##ki = Bki ^((~Bko)& Bku ); \ + Ci ^= E##ki; \ + E##ko = Bko ^((~Bku)& Bka ); \ + Co ^= E##ko; \ + E##ku = Bku ^((~Bka)& Bke ); \ + Cu ^= E##ku; \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^((~Bme)& Bmi ); \ + Ca ^= E##ma; \ + E##me = Bme ^((~Bmi)& Bmo ); \ + Ce ^= E##me; \ + E##mi = Bmi ^((~Bmo)& Bmu ); \ + Ci ^= E##mi; \ + E##mo = Bmo ^((~Bmu)& Bma ); \ + Co ^= E##mo; \ + E##mu = Bmu ^((~Bma)& Bme ); \ + Cu ^= E##mu; \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + Ca ^= E##sa; \ + E##se = Bse ^((~Bsi)& Bso ); \ + Ce ^= E##se; \ + E##si = Bsi ^((~Bso)& Bsu ); \ + Ci ^= E##si; \ + E##so = Bso ^((~Bsu)& Bsa ); \ + Co ^= E##so; \ + E##su = Bsu ^((~Bsa)& Bse ); \ + Cu ^= E##su; \ +\ + +/* --- Code for round */ + +/* --- 64-bit lanes mapped to 64-bit words */ + +#define thetaRhoPiChiIota(i, A, E) \ + Da = Cu^ROL64(Ce, 1); \ + De = Ca^ROL64(Ci, 1); \ + Di = Ce^ROL64(Co, 1); \ + Do = Ci^ROL64(Cu, 1); \ + Du = Co^ROL64(Ca, 1); \ +\ + A##ba ^= Da; \ + Bba = A##ba; \ + A##ge ^= De; \ + Bbe = ROL64(A##ge, 44); \ + A##ki ^= Di; \ + Bbi = ROL64(A##ki, 43); \ + A##mo ^= Do; \ + Bbo = ROL64(A##mo, 21); \ + A##su ^= Du; \ + Bbu = ROL64(A##su, 14); \ + E##ba = Bba ^((~Bbe)& Bbi ); \ + E##ba ^= KeccakF1600RoundConstants[i]; \ + E##be = Bbe ^((~Bbi)& Bbo ); \ + E##bi = Bbi ^((~Bbo)& Bbu ); \ + E##bo = Bbo ^((~Bbu)& Bba ); \ + E##bu = Bbu ^((~Bba)& Bbe ); \ +\ + A##bo ^= Do; \ + Bga = ROL64(A##bo, 28); \ + A##gu ^= Du; \ + Bge = ROL64(A##gu, 20); \ + A##ka ^= Da; \ + Bgi = ROL64(A##ka, 3); \ + A##me ^= De; \ + Bgo = ROL64(A##me, 45); \ + A##si ^= Di; \ + Bgu = ROL64(A##si, 61); \ + E##ga = Bga ^((~Bge)& Bgi ); \ + E##ge = Bge ^((~Bgi)& Bgo ); \ + E##gi = Bgi ^((~Bgo)& Bgu ); \ + E##go = Bgo ^((~Bgu)& Bga ); \ + E##gu = Bgu ^((~Bga)& Bge ); \ +\ + A##be ^= De; \ + Bka = ROL64(A##be, 1); \ + A##gi ^= Di; \ + Bke = ROL64(A##gi, 6); \ + A##ko ^= Do; \ + Bki = ROL64(A##ko, 25); \ + A##mu ^= Du; \ + Bko = ROL64(A##mu, 8); \ + A##sa ^= Da; \ + Bku = ROL64(A##sa, 18); \ + E##ka = Bka ^((~Bke)& Bki ); \ + E##ke = Bke ^((~Bki)& Bko ); \ + E##ki = Bki ^((~Bko)& Bku ); \ + E##ko = Bko ^((~Bku)& Bka ); \ + E##ku = Bku ^((~Bka)& Bke ); \ +\ + A##bu ^= Du; \ + Bma = ROL64(A##bu, 27); \ + A##ga ^= Da; \ + Bme = ROL64(A##ga, 36); \ + A##ke ^= De; \ + Bmi = ROL64(A##ke, 10); \ + A##mi ^= Di; \ + Bmo = ROL64(A##mi, 15); \ + A##so ^= Do; \ + Bmu = ROL64(A##so, 56); \ + E##ma = Bma ^((~Bme)& Bmi ); \ + E##me = Bme ^((~Bmi)& Bmo ); \ + E##mi = Bmi ^((~Bmo)& Bmu ); \ + E##mo = Bmo ^((~Bmu)& Bma ); \ + E##mu = Bmu ^((~Bma)& Bme ); \ +\ + A##bi ^= Di; \ + Bsa = ROL64(A##bi, 62); \ + A##go ^= Do; \ + Bse = ROL64(A##go, 55); \ + A##ku ^= Du; \ + Bsi = ROL64(A##ku, 39); \ + A##ma ^= Da; \ + Bso = ROL64(A##ma, 41); \ + A##se ^= De; \ + Bsu = ROL64(A##se, 2); \ + E##sa = Bsa ^((~Bse)& Bsi ); \ + E##se = Bse ^((~Bsi)& Bso ); \ + E##si = Bsi ^((~Bso)& Bsu ); \ + E##so = Bso ^((~Bsu)& Bsa ); \ + E##su = Bsu ^((~Bsa)& Bse ); \ +\ + +#endif /* UseBebigokimisa */ + + +#define copyFromState(X, state) \ + X##ba = state[ 0]; \ + X##be = state[ 1]; \ + X##bi = state[ 2]; \ + X##bo = state[ 3]; \ + X##bu = state[ 4]; \ + X##ga = state[ 5]; \ + X##ge = state[ 6]; \ + X##gi = state[ 7]; \ + X##go = state[ 8]; \ + X##gu = state[ 9]; \ + X##ka = state[10]; \ + X##ke = state[11]; \ + X##ki = state[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + X##ma = state[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + +#define copyToState(state, X) \ + state[ 0] = X##ba; \ + state[ 1] = X##be; \ + state[ 2] = X##bi; \ + state[ 3] = X##bo; \ + state[ 4] = X##bu; \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + state[ 7] = X##gi; \ + state[ 8] = X##go; \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + state[15] = X##ma; \ + state[16] = X##me; \ + state[17] = X##mi; \ + state[18] = X##mo; \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + state[23] = X##so; \ + state[24] = X##su; \ + +#define copyStateVariables(X, Y) \ + X##ba = Y##ba; \ + X##be = Y##be; \ + X##bi = Y##bi; \ + X##bo = Y##bo; \ + X##bu = Y##bu; \ + X##ga = Y##ga; \ + X##ge = Y##ge; \ + X##gi = Y##gi; \ + X##go = Y##go; \ + X##gu = Y##gu; \ + X##ka = Y##ka; \ + X##ke = Y##ke; \ + X##ki = Y##ki; \ + X##ko = Y##ko; \ + X##ku = Y##ku; \ + X##ma = Y##ma; \ + X##me = Y##me; \ + X##mi = Y##mi; \ + X##mo = Y##mo; \ + X##mu = Y##mu; \ + X##sa = Y##sa; \ + X##se = Y##se; \ + X##si = Y##si; \ + X##so = Y##so; \ + X##su = Y##su; \ + +#define copyFromStateAndAdd(X, state, input, laneCount) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount < 1) { \ + X##ba = state[ 0]; \ + } \ + else { \ + X##ba = state[ 0]^input[ 0]; \ + } \ + X##be = state[ 1]; \ + X##bi = state[ 2]; \ + } \ + else { \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + if (laneCount < 3) { \ + X##bi = state[ 2]; \ + } \ + else { \ + X##bi = state[ 2]^input[ 2]; \ + } \ + } \ + X##bo = state[ 3]; \ + X##bu = state[ 4]; \ + X##ga = state[ 5]; \ + X##ge = state[ 6]; \ + } \ + else { \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + if (laneCount < 6) { \ + if (laneCount < 5) { \ + X##bu = state[ 4]; \ + } \ + else { \ + X##bu = state[ 4]^input[ 4]; \ + } \ + X##ga = state[ 5]; \ + X##ge = state[ 6]; \ + } \ + else { \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + if (laneCount < 7) { \ + X##ge = state[ 6]; \ + } \ + else { \ + X##ge = state[ 6]^input[ 6]; \ + } \ + } \ + } \ + X##gi = state[ 7]; \ + X##go = state[ 8]; \ + X##gu = state[ 9]; \ + X##ka = state[10]; \ + X##ke = state[11]; \ + X##ki = state[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + } \ + else { \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount < 9) { \ + X##go = state[ 8]; \ + } \ + else { \ + X##go = state[ 8]^input[ 8]; \ + } \ + X##gu = state[ 9]; \ + X##ka = state[10]; \ + } \ + else { \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + if (laneCount < 11) { \ + X##ka = state[10]; \ + } \ + else { \ + X##ka = state[10]^input[10]; \ + } \ + } \ + X##ke = state[11]; \ + X##ki = state[12]; \ + X##ko = state[13]; \ + X##ku = state[14]; \ + } \ + else { \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + if (laneCount < 14) { \ + if (laneCount < 13) { \ + X##ki = state[12]; \ + } \ + else { \ + X##ki = state[12]^input[12]; \ + } \ + X##ko = state[13]; \ + X##ku = state[14]; \ + } \ + else { \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + if (laneCount < 15) { \ + X##ku = state[14]; \ + } \ + else { \ + X##ku = state[14]^input[14]; \ + } \ + } \ + } \ + } \ + X##ma = state[15]; \ + X##me = state[16]; \ + X##mi = state[17]; \ + X##mo = state[18]; \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + X##so = state[23]; \ + X##su = state[24]; \ + } \ + else { \ + X##ba = state[ 0]^input[ 0]; \ + X##be = state[ 1]^input[ 1]; \ + X##bi = state[ 2]^input[ 2]; \ + X##bo = state[ 3]^input[ 3]; \ + X##bu = state[ 4]^input[ 4]; \ + X##ga = state[ 5]^input[ 5]; \ + X##ge = state[ 6]^input[ 6]; \ + X##gi = state[ 7]^input[ 7]; \ + X##go = state[ 8]^input[ 8]; \ + X##gu = state[ 9]^input[ 9]; \ + X##ka = state[10]^input[10]; \ + X##ke = state[11]^input[11]; \ + X##ki = state[12]^input[12]; \ + X##ko = state[13]^input[13]; \ + X##ku = state[14]^input[14]; \ + X##ma = state[15]^input[15]; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount < 17) { \ + X##me = state[16]; \ + } \ + else { \ + X##me = state[16]^input[16]; \ + } \ + X##mi = state[17]; \ + X##mo = state[18]; \ + } \ + else { \ + X##me = state[16]^input[16]; \ + X##mi = state[17]^input[17]; \ + if (laneCount < 19) { \ + X##mo = state[18]; \ + } \ + else { \ + X##mo = state[18]^input[18]; \ + } \ + } \ + X##mu = state[19]; \ + X##sa = state[20]; \ + X##se = state[21]; \ + X##si = state[22]; \ + } \ + else { \ + X##me = state[16]^input[16]; \ + X##mi = state[17]^input[17]; \ + X##mo = state[18]^input[18]; \ + X##mu = state[19]^input[19]; \ + if (laneCount < 22) { \ + if (laneCount < 21) { \ + X##sa = state[20]; \ + } \ + else { \ + X##sa = state[20]^input[20]; \ + } \ + X##se = state[21]; \ + X##si = state[22]; \ + } \ + else { \ + X##sa = state[20]^input[20]; \ + X##se = state[21]^input[21]; \ + if (laneCount < 23) { \ + X##si = state[22]; \ + } \ + else { \ + X##si = state[22]^input[22]; \ + } \ + } \ + } \ + X##so = state[23]; \ + X##su = state[24]; \ + } \ + else { \ + X##me = state[16]^input[16]; \ + X##mi = state[17]^input[17]; \ + X##mo = state[18]^input[18]; \ + X##mu = state[19]^input[19]; \ + X##sa = state[20]^input[20]; \ + X##se = state[21]^input[21]; \ + X##si = state[22]^input[22]; \ + X##so = state[23]^input[23]; \ + if (laneCount < 25) { \ + X##su = state[24]; \ + } \ + else { \ + X##su = state[24]^input[24]; \ + } \ + } \ + } + +#define addInput(X, input, laneCount) \ + if (laneCount == 21) { \ + X##ba ^= input[ 0]; \ + X##be ^= input[ 1]; \ + X##bi ^= input[ 2]; \ + X##bo ^= input[ 3]; \ + X##bu ^= input[ 4]; \ + X##ga ^= input[ 5]; \ + X##ge ^= input[ 6]; \ + X##gi ^= input[ 7]; \ + X##go ^= input[ 8]; \ + X##gu ^= input[ 9]; \ + X##ka ^= input[10]; \ + X##ke ^= input[11]; \ + X##ki ^= input[12]; \ + X##ko ^= input[13]; \ + X##ku ^= input[14]; \ + X##ma ^= input[15]; \ + X##me ^= input[16]; \ + X##mi ^= input[17]; \ + X##mo ^= input[18]; \ + X##mu ^= input[19]; \ + X##sa ^= input[20]; \ + } \ + else if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount < 1) { \ + } \ + else { \ + X##ba ^= input[ 0]; \ + } \ + } \ + else { \ + X##ba ^= input[ 0]; \ + X##be ^= input[ 1]; \ + if (laneCount < 3) { \ + } \ + else { \ + X##bi ^= input[ 2]; \ + } \ + } \ + } \ + else { \ + X##ba ^= input[ 0]; \ + X##be ^= input[ 1]; \ + X##bi ^= input[ 2]; \ + X##bo ^= input[ 3]; \ + if (laneCount < 6) { \ + if (laneCount < 5) { \ + } \ + else { \ + X##bu ^= input[ 4]; \ + } \ + } \ + else { \ + X##bu ^= input[ 4]; \ + X##ga ^= input[ 5]; \ + if (laneCount < 7) { \ + } \ + else { \ + X##ge ^= input[ 6]; \ + } \ + } \ + } \ + } \ + else { \ + X##ba ^= input[ 0]; \ + X##be ^= input[ 1]; \ + X##bi ^= input[ 2]; \ + X##bo ^= input[ 3]; \ + X##bu ^= input[ 4]; \ + X##ga ^= input[ 5]; \ + X##ge ^= input[ 6]; \ + X##gi ^= input[ 7]; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount < 9) { \ + } \ + else { \ + X##go ^= input[ 8]; \ + } \ + } \ + else { \ + X##go ^= input[ 8]; \ + X##gu ^= input[ 9]; \ + if (laneCount < 11) { \ + } \ + else { \ + X##ka ^= input[10]; \ + } \ + } \ + } \ + else { \ + X##go ^= input[ 8]; \ + X##gu ^= input[ 9]; \ + X##ka ^= input[10]; \ + X##ke ^= input[11]; \ + if (laneCount < 14) { \ + if (laneCount < 13) { \ + } \ + else { \ + X##ki ^= input[12]; \ + } \ + } \ + else { \ + X##ki ^= input[12]; \ + X##ko ^= input[13]; \ + if (laneCount < 15) { \ + } \ + else { \ + X##ku ^= input[14]; \ + } \ + } \ + } \ + } \ + } \ + else { \ + X##ba ^= input[ 0]; \ + X##be ^= input[ 1]; \ + X##bi ^= input[ 2]; \ + X##bo ^= input[ 3]; \ + X##bu ^= input[ 4]; \ + X##ga ^= input[ 5]; \ + X##ge ^= input[ 6]; \ + X##gi ^= input[ 7]; \ + X##go ^= input[ 8]; \ + X##gu ^= input[ 9]; \ + X##ka ^= input[10]; \ + X##ke ^= input[11]; \ + X##ki ^= input[12]; \ + X##ko ^= input[13]; \ + X##ku ^= input[14]; \ + X##ma ^= input[15]; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount < 17) { \ + } \ + else { \ + X##me ^= input[16]; \ + } \ + } \ + else { \ + X##me ^= input[16]; \ + X##mi ^= input[17]; \ + if (laneCount < 19) { \ + } \ + else { \ + X##mo ^= input[18]; \ + } \ + } \ + } \ + else { \ + X##me ^= input[16]; \ + X##mi ^= input[17]; \ + X##mo ^= input[18]; \ + X##mu ^= input[19]; \ + if (laneCount < 22) { \ + if (laneCount < 21) { \ + } \ + else { \ + X##sa ^= input[20]; \ + } \ + } \ + else { \ + X##sa ^= input[20]; \ + X##se ^= input[21]; \ + if (laneCount < 23) { \ + } \ + else { \ + X##si ^= input[22]; \ + } \ + } \ + } \ + } \ + else { \ + X##me ^= input[16]; \ + X##mi ^= input[17]; \ + X##mo ^= input[18]; \ + X##mu ^= input[19]; \ + X##sa ^= input[20]; \ + X##se ^= input[21]; \ + X##si ^= input[22]; \ + X##so ^= input[23]; \ + if (laneCount < 25) { \ + } \ + else { \ + X##su ^= input[24]; \ + } \ + } \ + } + +#ifdef UseBebigokimisa + +#define copyToStateAndOutput(X, state, output, laneCount) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + state[ 0] = X##ba; \ + if (laneCount >= 1) { \ + output[ 0] = X##ba; \ + } \ + state[ 1] = X##be; \ + state[ 2] = X##bi; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = ~X##be; \ + state[ 2] = X##bi; \ + if (laneCount >= 3) { \ + output[ 2] = ~X##bi; \ + } \ + } \ + state[ 3] = X##bo; \ + state[ 4] = X##bu; \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = ~X##be; \ + state[ 2] = X##bi; \ + output[ 2] = ~X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + if (laneCount < 6) { \ + state[ 4] = X##bu; \ + if (laneCount >= 5) { \ + output[ 4] = X##bu; \ + } \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + } \ + else { \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + if (laneCount >= 7) { \ + output[ 6] = X##ge; \ + } \ + } \ + } \ + state[ 7] = X##gi; \ + state[ 8] = X##go; \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = ~X##be; \ + state[ 2] = X##bi; \ + output[ 2] = ~X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + output[ 6] = X##ge; \ + state[ 7] = X##gi; \ + output[ 7] = X##gi; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + state[ 8] = X##go; \ + if (laneCount >= 9) { \ + output[ 8] = ~X##go; \ + } \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + } \ + else { \ + state[ 8] = X##go; \ + output[ 8] = ~X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + if (laneCount >= 11) { \ + output[10] = X##ka; \ + } \ + } \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[ 8] = X##go; \ + output[ 8] = ~X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + output[10] = X##ka; \ + state[11] = X##ke; \ + output[11] = X##ke; \ + if (laneCount < 14) { \ + state[12] = X##ki; \ + if (laneCount >= 13) { \ + output[12] = ~X##ki; \ + } \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[12] = X##ki; \ + output[12] = ~X##ki; \ + state[13] = X##ko; \ + output[13] = X##ko; \ + state[14] = X##ku; \ + if (laneCount >= 15) { \ + output[14] = X##ku; \ + } \ + } \ + } \ + } \ + state[15] = X##ma; \ + state[16] = X##me; \ + state[17] = X##mi; \ + state[18] = X##mo; \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + state[23] = X##so; \ + state[24] = X##su; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = ~X##be; \ + state[ 2] = X##bi; \ + output[ 2] = ~X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + output[ 6] = X##ge; \ + state[ 7] = X##gi; \ + output[ 7] = X##gi; \ + state[ 8] = X##go; \ + output[ 8] = ~X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + output[10] = X##ka; \ + state[11] = X##ke; \ + output[11] = X##ke; \ + state[12] = X##ki; \ + output[12] = ~X##ki; \ + state[13] = X##ko; \ + output[13] = X##ko; \ + state[14] = X##ku; \ + output[14] = X##ku; \ + state[15] = X##ma; \ + output[15] = X##ma; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + state[16] = X##me; \ + if (laneCount >= 17) { \ + output[16] = X##me; \ + } \ + state[17] = X##mi; \ + state[18] = X##mo; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = ~X##mi; \ + state[18] = X##mo; \ + if (laneCount >= 19) { \ + output[18] = X##mo; \ + } \ + } \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = ~X##mi; \ + state[18] = X##mo; \ + output[18] = X##mo; \ + state[19] = X##mu; \ + output[19] = X##mu; \ + if (laneCount < 22) { \ + state[20] = X##sa; \ + if (laneCount >= 21) { \ + output[20] = ~X##sa; \ + } \ + state[21] = X##se; \ + state[22] = X##si; \ + } \ + else { \ + state[20] = X##sa; \ + output[20] = ~X##sa; \ + state[21] = X##se; \ + output[21] = X##se; \ + state[22] = X##si; \ + if (laneCount >= 23) { \ + output[22] = X##si; \ + } \ + } \ + } \ + state[23] = X##so; \ + state[24] = X##su; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = ~X##mi; \ + state[18] = X##mo; \ + output[18] = X##mo; \ + state[19] = X##mu; \ + output[19] = X##mu; \ + state[20] = X##sa; \ + output[20] = ~X##sa; \ + state[21] = X##se; \ + output[21] = X##se; \ + state[22] = X##si; \ + output[22] = X##si; \ + state[23] = X##so; \ + output[23] = X##so; \ + state[24] = X##su; \ + if (laneCount >= 25) { \ + output[24] = X##su; \ + } \ + } \ + } + +#define output(X, output, laneCount) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount >= 1) { \ + output[ 0] = X##ba; \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = ~X##be; \ + if (laneCount >= 3) { \ + output[ 2] = ~X##bi; \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = ~X##be; \ + output[ 2] = ~X##bi; \ + output[ 3] = X##bo; \ + if (laneCount < 6) { \ + if (laneCount >= 5) { \ + output[ 4] = X##bu; \ + } \ + } \ + else { \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + if (laneCount >= 7) { \ + output[ 6] = X##ge; \ + } \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = ~X##be; \ + output[ 2] = ~X##bi; \ + output[ 3] = X##bo; \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + output[ 6] = X##ge; \ + output[ 7] = X##gi; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount >= 9) { \ + output[ 8] = ~X##go; \ + } \ + } \ + else { \ + output[ 8] = ~X##go; \ + output[ 9] = X##gu; \ + if (laneCount >= 11) { \ + output[10] = X##ka; \ + } \ + } \ + } \ + else { \ + output[ 8] = ~X##go; \ + output[ 9] = X##gu; \ + output[10] = X##ka; \ + output[11] = X##ke; \ + if (laneCount < 14) { \ + if (laneCount >= 13) { \ + output[12] = ~X##ki; \ + } \ + } \ + else { \ + output[12] = ~X##ki; \ + output[13] = X##ko; \ + if (laneCount >= 15) { \ + output[14] = X##ku; \ + } \ + } \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = ~X##be; \ + output[ 2] = ~X##bi; \ + output[ 3] = X##bo; \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + output[ 6] = X##ge; \ + output[ 7] = X##gi; \ + output[ 8] = ~X##go; \ + output[ 9] = X##gu; \ + output[10] = X##ka; \ + output[11] = X##ke; \ + output[12] = ~X##ki; \ + output[13] = X##ko; \ + output[14] = X##ku; \ + output[15] = X##ma; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount >= 17) { \ + output[16] = X##me; \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = ~X##mi; \ + if (laneCount >= 19) { \ + output[18] = X##mo; \ + } \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = ~X##mi; \ + output[18] = X##mo; \ + output[19] = X##mu; \ + if (laneCount < 22) { \ + if (laneCount >= 21) { \ + output[20] = ~X##sa; \ + } \ + } \ + else { \ + output[20] = ~X##sa; \ + output[21] = X##se; \ + if (laneCount >= 23) { \ + output[22] = X##si; \ + } \ + } \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = ~X##mi; \ + output[18] = X##mo; \ + output[19] = X##mu; \ + output[20] = ~X##sa; \ + output[21] = X##se; \ + output[22] = X##si; \ + output[23] = X##so; \ + if (laneCount >= 25) { \ + output[24] = X##su; \ + } \ + } \ + } + +#define wrapOne(X, input, output, index, name) \ + X##name ^= input[index]; \ + output[index] = X##name; + +#define wrapOneInvert(X, input, output, index, name) \ + X##name ^= input[index]; \ + output[index] = ~X##name; + +#define unwrapOne(X, input, output, index, name) \ + output[index] = input[index] ^ X##name; \ + X##name ^= output[index]; + +#define unwrapOneInvert(X, input, output, index, name) \ + output[index] = ~(input[index] ^ X##name); \ + X##name ^= output[index]; \ + +#else /* UseBebigokimisa */ + + +#define copyToStateAndOutput(X, state, output, laneCount) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + state[ 0] = X##ba; \ + if (laneCount >= 1) { \ + output[ 0] = X##ba; \ + } \ + state[ 1] = X##be; \ + state[ 2] = X##bi; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = X##be; \ + state[ 2] = X##bi; \ + if (laneCount >= 3) { \ + output[ 2] = X##bi; \ + } \ + } \ + state[ 3] = X##bo; \ + state[ 4] = X##bu; \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = X##be; \ + state[ 2] = X##bi; \ + output[ 2] = X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + if (laneCount < 6) { \ + state[ 4] = X##bu; \ + if (laneCount >= 5) { \ + output[ 4] = X##bu; \ + } \ + state[ 5] = X##ga; \ + state[ 6] = X##ge; \ + } \ + else { \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + if (laneCount >= 7) { \ + output[ 6] = X##ge; \ + } \ + } \ + } \ + state[ 7] = X##gi; \ + state[ 8] = X##go; \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = X##be; \ + state[ 2] = X##bi; \ + output[ 2] = X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + output[ 6] = X##ge; \ + state[ 7] = X##gi; \ + output[ 7] = X##gi; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + state[ 8] = X##go; \ + if (laneCount >= 9) { \ + output[ 8] = X##go; \ + } \ + state[ 9] = X##gu; \ + state[10] = X##ka; \ + } \ + else { \ + state[ 8] = X##go; \ + output[ 8] = X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + if (laneCount >= 11) { \ + output[10] = X##ka; \ + } \ + } \ + state[11] = X##ke; \ + state[12] = X##ki; \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[ 8] = X##go; \ + output[ 8] = X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + output[10] = X##ka; \ + state[11] = X##ke; \ + output[11] = X##ke; \ + if (laneCount < 14) { \ + state[12] = X##ki; \ + if (laneCount >= 13) { \ + output[12]= X##ki; \ + } \ + state[13] = X##ko; \ + state[14] = X##ku; \ + } \ + else { \ + state[12] = X##ki; \ + output[12]= X##ki; \ + state[13] = X##ko; \ + output[13] = X##ko; \ + state[14] = X##ku; \ + if (laneCount >= 15) { \ + output[14] = X##ku; \ + } \ + } \ + } \ + } \ + state[15] = X##ma; \ + state[16] = X##me; \ + state[17] = X##mi; \ + state[18] = X##mo; \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + state[23] = X##so; \ + state[24] = X##su; \ + } \ + else { \ + state[ 0] = X##ba; \ + output[ 0] = X##ba; \ + state[ 1] = X##be; \ + output[ 1] = X##be; \ + state[ 2] = X##bi; \ + output[ 2] = X##bi; \ + state[ 3] = X##bo; \ + output[ 3] = X##bo; \ + state[ 4] = X##bu; \ + output[ 4] = X##bu; \ + state[ 5] = X##ga; \ + output[ 5] = X##ga; \ + state[ 6] = X##ge; \ + output[ 6] = X##ge; \ + state[ 7] = X##gi; \ + output[ 7] = X##gi; \ + state[ 8] = X##go; \ + output[ 8] = X##go; \ + state[ 9] = X##gu; \ + output[ 9] = X##gu; \ + state[10] = X##ka; \ + output[10] = X##ka; \ + state[11] = X##ke; \ + output[11] = X##ke; \ + state[12] = X##ki; \ + output[12]= X##ki; \ + state[13] = X##ko; \ + output[13] = X##ko; \ + state[14] = X##ku; \ + output[14] = X##ku; \ + state[15] = X##ma; \ + output[15] = X##ma; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + state[16] = X##me; \ + if (laneCount >= 17) { \ + output[16] = X##me; \ + } \ + state[17] = X##mi; \ + state[18] = X##mo; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = X##mi; \ + state[18] = X##mo; \ + if (laneCount >= 19) { \ + output[18] = X##mo; \ + } \ + } \ + state[19] = X##mu; \ + state[20] = X##sa; \ + state[21] = X##se; \ + state[22] = X##si; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = X##mi; \ + state[18] = X##mo; \ + output[18] = X##mo; \ + state[19] = X##mu; \ + output[19] = X##mu; \ + if (laneCount < 22) { \ + state[20] = X##sa; \ + if (laneCount >= 21) { \ + output[20] = X##sa; \ + } \ + state[21] = X##se; \ + state[22] = X##si; \ + } \ + else { \ + state[20] = X##sa; \ + output[20] = X##sa; \ + state[21] = X##se; \ + output[21] = X##se; \ + state[22] = X##si; \ + if (laneCount >= 23) { \ + output[22] = X##si; \ + } \ + } \ + } \ + state[23] = X##so; \ + state[24] = X##su; \ + } \ + else { \ + state[16] = X##me; \ + output[16] = X##me; \ + state[17] = X##mi; \ + output[17] = X##mi; \ + state[18] = X##mo; \ + output[18] = X##mo; \ + state[19] = X##mu; \ + output[19] = X##mu; \ + state[20] = X##sa; \ + output[20] = X##sa; \ + state[21] = X##se; \ + output[21] = X##se; \ + state[22] = X##si; \ + output[22] = X##si; \ + state[23] = X##so; \ + output[23] = X##so; \ + state[24] = X##su; \ + if (laneCount >= 25) { \ + output[24] = X##su; \ + } \ + } \ + } + +#define output(X, output, laneCount) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount >= 1) { \ + output[ 0] = X##ba; \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = X##be; \ + if (laneCount >= 3) { \ + output[ 2] = X##bi; \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = X##be; \ + output[ 2] = X##bi; \ + output[ 3] = X##bo; \ + if (laneCount < 6) { \ + if (laneCount >= 5) { \ + output[ 4] = X##bu; \ + } \ + } \ + else { \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + if (laneCount >= 7) { \ + output[ 6] = X##ge; \ + } \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = X##be; \ + output[ 2] = X##bi; \ + output[ 3] = X##bo; \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + output[ 6] = X##ge; \ + output[ 7] = X##gi; \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount >= 9) { \ + output[ 8] = X##go; \ + } \ + } \ + else { \ + output[ 8] = X##go; \ + output[ 9] = X##gu; \ + if (laneCount >= 11) { \ + output[10] = X##ka; \ + } \ + } \ + } \ + else { \ + output[ 8] = X##go; \ + output[ 9] = X##gu; \ + output[10] = X##ka; \ + output[11] = X##ke; \ + if (laneCount < 14) { \ + if (laneCount >= 13) { \ + output[12] = X##ki; \ + } \ + } \ + else { \ + output[12] = X##ki; \ + output[13] = X##ko; \ + if (laneCount >= 15) { \ + output[14] = X##ku; \ + } \ + } \ + } \ + } \ + } \ + else { \ + output[ 0] = X##ba; \ + output[ 1] = X##be; \ + output[ 2] = X##bi; \ + output[ 3] = X##bo; \ + output[ 4] = X##bu; \ + output[ 5] = X##ga; \ + output[ 6] = X##ge; \ + output[ 7] = X##gi; \ + output[ 8] = X##go; \ + output[ 9] = X##gu; \ + output[10] = X##ka; \ + output[11] = X##ke; \ + output[12] = X##ki; \ + output[13] = X##ko; \ + output[14] = X##ku; \ + output[15] = X##ma; \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount >= 17) { \ + output[16] = X##me; \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = X##mi; \ + if (laneCount >= 19) { \ + output[18] = X##mo; \ + } \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = X##mi; \ + output[18] = X##mo; \ + output[19] = X##mu; \ + if (laneCount < 22) { \ + if (laneCount >= 21) { \ + output[20] = X##sa; \ + } \ + } \ + else { \ + output[20] = X##sa; \ + output[21] = X##se; \ + if (laneCount >= 23) { \ + output[22] = X##si; \ + } \ + } \ + } \ + } \ + else { \ + output[16] = X##me; \ + output[17] = X##mi; \ + output[18] = X##mo; \ + output[19] = X##mu; \ + output[20] = X##sa; \ + output[21] = X##se; \ + output[22] = X##si; \ + output[23] = X##so; \ + if (laneCount >= 25) { \ + output[24] = X##su; \ + } \ + } \ + } + +#define wrapOne(X, input, output, index, name) \ + X##name ^= input[index]; \ + output[index] = X##name; + +#define wrapOneInvert(X, input, output, index, name) \ + X##name ^= input[index]; \ + output[index] = X##name; + +#define unwrapOne(X, input, output, index, name) \ + output[index] = input[index] ^ X##name; \ + X##name ^= output[index]; + +#define unwrapOneInvert(X, input, output, index, name) \ + output[index] = input[index] ^ X##name; \ + X##name ^= output[index]; + +#endif + +#define wrap(X, input, output, laneCount, trailingBits) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount < 1) { \ + X##ba ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 0, ba) \ + X##be ^= trailingBits; \ + } \ + } \ + else { \ + wrapOne(X, input, output, 0, ba) \ + wrapOneInvert(X, input, output, 1, be) \ + if (laneCount < 3) { \ + X##bi ^= trailingBits; \ + } \ + else { \ + wrapOneInvert(X, input, output, 2, bi) \ + X##bo ^= trailingBits; \ + } \ + } \ + } \ + else { \ + wrapOne(X, input, output, 0, ba) \ + wrapOneInvert(X, input, output, 1, be) \ + wrapOneInvert(X, input, output, 2, bi) \ + wrapOne(X, input, output, 3, bo) \ + if (laneCount < 6) { \ + if (laneCount < 5) { \ + X##bu ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 4, bu) \ + X##ga ^= trailingBits; \ + } \ + } \ + else { \ + wrapOne(X, input, output, 4, bu) \ + wrapOne(X, input, output, 5, ga) \ + if (laneCount < 7) { \ + X##ge ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 6, ge) \ + X##gi ^= trailingBits; \ + } \ + } \ + } \ + } \ + else { \ + wrapOne(X, input, output, 0, ba) \ + wrapOneInvert(X, input, output, 1, be) \ + wrapOneInvert(X, input, output, 2, bi) \ + wrapOne(X, input, output, 3, bo) \ + wrapOne(X, input, output, 4, bu) \ + wrapOne(X, input, output, 5, ga) \ + wrapOne(X, input, output, 6, ge) \ + wrapOne(X, input, output, 7, gi) \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount < 9) { \ + X##go ^= trailingBits; \ + } \ + else { \ + wrapOneInvert(X, input, output, 8, go) \ + X##gu ^= trailingBits; \ + } \ + } \ + else { \ + wrapOneInvert(X, input, output, 8, go) \ + wrapOne(X, input, output, 9, gu) \ + if (laneCount < 11) { \ + X##ka ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 10, ka) \ + X##ke ^= trailingBits; \ + } \ + } \ + } \ + else { \ + wrapOneInvert(X, input, output, 8, go) \ + wrapOne(X, input, output, 9, gu) \ + wrapOne(X, input, output, 10, ka) \ + wrapOne(X, input, output, 11, ke) \ + if (laneCount < 14) { \ + if (laneCount < 13) { \ + X##ki ^= trailingBits; \ + } \ + else { \ + wrapOneInvert(X, input, output, 12, ki) \ + X##ko ^= trailingBits; \ + } \ + } \ + else { \ + wrapOneInvert(X, input, output, 12, ki) \ + wrapOne(X, input, output, 13, ko) \ + if (laneCount < 15) { \ + X##ku ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 14, ku) \ + X##ma ^= trailingBits; \ + } \ + } \ + } \ + } \ + } \ + else { \ + wrapOne(X, input, output, 0, ba) \ + wrapOneInvert(X, input, output, 1, be) \ + wrapOneInvert(X, input, output, 2, bi) \ + wrapOne(X, input, output, 3, bo) \ + wrapOne(X, input, output, 4, bu) \ + wrapOne(X, input, output, 5, ga) \ + wrapOne(X, input, output, 6, ge) \ + wrapOne(X, input, output, 7, gi) \ + wrapOneInvert(X, input, output, 8, go) \ + wrapOne(X, input, output, 9, gu) \ + wrapOne(X, input, output, 10, ka) \ + wrapOne(X, input, output, 11, ke) \ + wrapOneInvert(X, input, output, 12, ki) \ + wrapOne(X, input, output, 13, ko) \ + wrapOne(X, input, output, 14, ku) \ + wrapOne(X, input, output, 15, ma) \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount < 17) { \ + X##me ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 16, me) \ + X##mi ^= trailingBits; \ + } \ + } \ + else { \ + wrapOne(X, input, output, 16, me) \ + wrapOneInvert(X, input, output, 17, mi) \ + if (laneCount < 19) { \ + X##mo ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 18, mo) \ + X##mu ^= trailingBits; \ + } \ + } \ + } \ + else { \ + wrapOne(X, input, output, 16, me) \ + wrapOneInvert(X, input, output, 17, mi) \ + wrapOne(X, input, output, 18, mo) \ + wrapOne(X, input, output, 19, mu) \ + if (laneCount < 22) { \ + if (laneCount < 21) { \ + X##sa ^= trailingBits; \ + } \ + else { \ + wrapOneInvert(X, input, output, 20, sa) \ + X##se ^= trailingBits; \ + } \ + } \ + else { \ + wrapOneInvert(X, input, output, 20, sa) \ + wrapOne(X, input, output, 21, se) \ + if (laneCount < 23) { \ + X##si ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 22, si) \ + X##so ^= trailingBits; \ + } \ + } \ + } \ + } \ + else { \ + wrapOne(X, input, output, 16, me) \ + wrapOneInvert(X, input, output, 17, mi) \ + wrapOne(X, input, output, 18, mo) \ + wrapOne(X, input, output, 19, mu) \ + wrapOneInvert(X, input, output, 20, sa) \ + wrapOne(X, input, output, 21, se) \ + wrapOne(X, input, output, 22, si) \ + wrapOne(X, input, output, 23, so) \ + if (laneCount < 25) { \ + X##su ^= trailingBits; \ + } \ + else { \ + wrapOne(X, input, output, 24, su) \ + } \ + } \ + } + +#define unwrap(X, input, output, laneCount, trailingBits) \ + if (laneCount < 16) { \ + if (laneCount < 8) { \ + if (laneCount < 4) { \ + if (laneCount < 2) { \ + if (laneCount < 1) { \ + X##ba ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 0, ba) \ + X##be ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 0, ba) \ + unwrapOneInvert(X, input, output, 1, be) \ + if (laneCount < 3) { \ + X##bi ^= trailingBits; \ + } \ + else { \ + unwrapOneInvert(X, input, output, 2, bi) \ + X##bo ^= trailingBits; \ + } \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 0, ba) \ + unwrapOneInvert(X, input, output, 1, be) \ + unwrapOneInvert(X, input, output, 2, bi) \ + unwrapOne(X, input, output, 3, bo) \ + if (laneCount < 6) { \ + if (laneCount < 5) { \ + X##bu ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 4, bu) \ + X##ga ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 4, bu) \ + unwrapOne(X, input, output, 5, ga) \ + if (laneCount < 7) { \ + X##ge ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 6, ge) \ + X##gi ^= trailingBits; \ + } \ + } \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 0, ba) \ + unwrapOneInvert(X, input, output, 1, be) \ + unwrapOneInvert(X, input, output, 2, bi) \ + unwrapOne(X, input, output, 3, bo) \ + unwrapOne(X, input, output, 4, bu) \ + unwrapOne(X, input, output, 5, ga) \ + unwrapOne(X, input, output, 6, ge) \ + unwrapOne(X, input, output, 7, gi) \ + if (laneCount < 12) { \ + if (laneCount < 10) { \ + if (laneCount < 9) { \ + X##go ^= trailingBits; \ + } \ + else { \ + unwrapOneInvert(X, input, output, 8, go) \ + X##gu ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOneInvert(X, input, output, 8, go) \ + unwrapOne(X, input, output, 9, gu) \ + if (laneCount < 11) { \ + X##ka ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 10, ka) \ + X##ke ^= trailingBits; \ + } \ + } \ + } \ + else { \ + unwrapOneInvert(X, input, output, 8, go) \ + unwrapOne(X, input, output, 9, gu) \ + unwrapOne(X, input, output, 10, ka) \ + unwrapOne(X, input, output, 11, ke) \ + if (laneCount < 14) { \ + if (laneCount < 13) { \ + X##ki ^= trailingBits; \ + } \ + else { \ + unwrapOneInvert(X, input, output, 12, ki) \ + X##ko ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOneInvert(X, input, output, 12, ki) \ + unwrapOne(X, input, output, 13, ko) \ + if (laneCount < 15) { \ + X##ku ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 14, ku) \ + X##ma ^= trailingBits; \ + } \ + } \ + } \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 0, ba) \ + unwrapOneInvert(X, input, output, 1, be) \ + unwrapOneInvert(X, input, output, 2, bi) \ + unwrapOne(X, input, output, 3, bo) \ + unwrapOne(X, input, output, 4, bu) \ + unwrapOne(X, input, output, 5, ga) \ + unwrapOne(X, input, output, 6, ge) \ + unwrapOne(X, input, output, 7, gi) \ + unwrapOneInvert(X, input, output, 8, go) \ + unwrapOne(X, input, output, 9, gu) \ + unwrapOne(X, input, output, 10, ka) \ + unwrapOne(X, input, output, 11, ke) \ + unwrapOneInvert(X, input, output, 12, ki) \ + unwrapOne(X, input, output, 13, ko) \ + unwrapOne(X, input, output, 14, ku) \ + unwrapOne(X, input, output, 15, ma) \ + if (laneCount < 24) { \ + if (laneCount < 20) { \ + if (laneCount < 18) { \ + if (laneCount < 17) { \ + X##me ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 16, me) \ + X##mi ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 16, me) \ + unwrapOneInvert(X, input, output, 17, mi) \ + if (laneCount < 19) { \ + X##mo ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 18, mo) \ + X##mu ^= trailingBits; \ + } \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 16, me) \ + unwrapOneInvert(X, input, output, 17, mi) \ + unwrapOne(X, input, output, 18, mo) \ + unwrapOne(X, input, output, 19, mu) \ + if (laneCount < 22) { \ + if (laneCount < 21) { \ + X##sa ^= trailingBits; \ + } \ + else { \ + unwrapOneInvert(X, input, output, 20, sa) \ + X##se ^= trailingBits; \ + } \ + } \ + else { \ + unwrapOneInvert(X, input, output, 20, sa) \ + unwrapOne(X, input, output, 21, se) \ + if (laneCount < 23) { \ + X##si ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 22, si) \ + X##so ^= trailingBits; \ + } \ + } \ + } \ + } \ + else { \ + unwrapOne(X, input, output, 16, me) \ + unwrapOneInvert(X, input, output, 17, mi) \ + unwrapOne(X, input, output, 18, mo) \ + unwrapOne(X, input, output, 19, mu) \ + unwrapOneInvert(X, input, output, 20, sa) \ + unwrapOne(X, input, output, 21, se) \ + unwrapOne(X, input, output, 22, si) \ + unwrapOne(X, input, output, 23, so) \ + if (laneCount < 25) { \ + X##su ^= trailingBits; \ + } \ + else { \ + unwrapOne(X, input, output, 24, su) \ + } \ + } \ + } diff --git a/Modules/_sha3/kcp/KeccakP-1600-SnP-opt32.h b/Modules/_sha3/kcp/KeccakP-1600-SnP-opt32.h new file mode 100644 index 0000000..6cf765e --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-SnP-opt32.h @@ -0,0 +1,37 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakP_1600_SnP_h_ +#define _KeccakP_1600_SnP_h_ + +/** For the documentation, see SnP-documentation.h. + */ + +#define KeccakP1600_implementation "in-place 32-bit optimized implementation" +#define KeccakP1600_stateSizeInBytes 200 +#define KeccakP1600_stateAlignment 8 + +#define KeccakP1600_StaticInitialize() +void KeccakP1600_Initialize(void *state); +void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset); +void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount); +void KeccakP1600_Permute_12rounds(void *state); +void KeccakP1600_Permute_24rounds(void *state); +void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length); + +#endif diff --git a/Modules/_sha3/kcp/KeccakP-1600-SnP-opt64.h b/Modules/_sha3/kcp/KeccakP-1600-SnP-opt64.h new file mode 100644 index 0000000..889a31a --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-SnP-opt64.h @@ -0,0 +1,49 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakP_1600_SnP_h_ +#define _KeccakP_1600_SnP_h_ + +/** For the documentation, see SnP-documentation.h. + */ + +/* #include "brg_endian.h" */ +#include "KeccakP-1600-opt64-config.h" + +#define KeccakP1600_implementation "generic 64-bit optimized implementation (" KeccakP1600_implementation_config ")" +#define KeccakP1600_stateSizeInBytes 200 +#define KeccakP1600_stateAlignment 8 +#define KeccakF1600_FastLoop_supported + +#include + +#define KeccakP1600_StaticInitialize() +void KeccakP1600_Initialize(void *state); +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) +#define KeccakP1600_AddByte(state, byte, offset) \ + ((unsigned char*)(state))[(offset)] ^= (byte) +#else +void KeccakP1600_AddByte(void *state, unsigned char data, unsigned int offset); +#endif +void KeccakP1600_AddBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_OverwriteBytes(void *state, const unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_OverwriteWithZeroes(void *state, unsigned int byteCount); +void KeccakP1600_Permute_12rounds(void *state); +void KeccakP1600_Permute_24rounds(void *state); +void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length); +void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length); +size_t KeccakF1600_FastLoop_Absorb(void *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen); + +#endif diff --git a/Modules/_sha3/kcp/KeccakP-1600-SnP.h b/Modules/_sha3/kcp/KeccakP-1600-SnP.h new file mode 100644 index 0000000..0b23f09 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-SnP.h @@ -0,0 +1,7 @@ +#if KeccakOpt == 64 + #include "KeccakP-1600-SnP-opt64.h" +#elif KeccakOpt == 32 + #include "KeccakP-1600-SnP-opt32.h" +#else + #error "No KeccakOpt" +#endif diff --git a/Modules/_sha3/kcp/KeccakP-1600-inplace32BI.c b/Modules/_sha3/kcp/KeccakP-1600-inplace32BI.c new file mode 100644 index 0000000..a2f9ffe --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-inplace32BI.c @@ -0,0 +1,1162 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +/* #include "brg_endian.h" */ +#include "KeccakP-1600-SnP.h" +#include "SnP-Relaned.h" + +typedef unsigned char UINT8; +typedef unsigned int UINT32; +/* WARNING: on 8-bit and 16-bit platforms, this should be replaced by: */ + +/*typedef unsigned long UINT32; */ + + +#define ROL32(a, offset) ((((UINT32)a) << (offset)) ^ (((UINT32)a) >> (32-(offset)))) + +/* Credit to Henry S. Warren, Hacker's Delight, Addison-Wesley, 2002 */ + +#define prepareToBitInterleaving(low, high, temp, temp0, temp1) \ + temp0 = (low); \ + temp = (temp0 ^ (temp0 >> 1)) & 0x22222222UL; temp0 = temp0 ^ temp ^ (temp << 1); \ + temp = (temp0 ^ (temp0 >> 2)) & 0x0C0C0C0CUL; temp0 = temp0 ^ temp ^ (temp << 2); \ + temp = (temp0 ^ (temp0 >> 4)) & 0x00F000F0UL; temp0 = temp0 ^ temp ^ (temp << 4); \ + temp = (temp0 ^ (temp0 >> 8)) & 0x0000FF00UL; temp0 = temp0 ^ temp ^ (temp << 8); \ + temp1 = (high); \ + temp = (temp1 ^ (temp1 >> 1)) & 0x22222222UL; temp1 = temp1 ^ temp ^ (temp << 1); \ + temp = (temp1 ^ (temp1 >> 2)) & 0x0C0C0C0CUL; temp1 = temp1 ^ temp ^ (temp << 2); \ + temp = (temp1 ^ (temp1 >> 4)) & 0x00F000F0UL; temp1 = temp1 ^ temp ^ (temp << 4); \ + temp = (temp1 ^ (temp1 >> 8)) & 0x0000FF00UL; temp1 = temp1 ^ temp ^ (temp << 8); + +#define toBitInterleavingAndXOR(low, high, even, odd, temp, temp0, temp1) \ + prepareToBitInterleaving(low, high, temp, temp0, temp1) \ + even ^= (temp0 & 0x0000FFFF) | (temp1 << 16); \ + odd ^= (temp0 >> 16) | (temp1 & 0xFFFF0000); + +#define toBitInterleavingAndAND(low, high, even, odd, temp, temp0, temp1) \ + prepareToBitInterleaving(low, high, temp, temp0, temp1) \ + even &= (temp0 & 0x0000FFFF) | (temp1 << 16); \ + odd &= (temp0 >> 16) | (temp1 & 0xFFFF0000); + +#define toBitInterleavingAndSet(low, high, even, odd, temp, temp0, temp1) \ + prepareToBitInterleaving(low, high, temp, temp0, temp1) \ + even = (temp0 & 0x0000FFFF) | (temp1 << 16); \ + odd = (temp0 >> 16) | (temp1 & 0xFFFF0000); + +/* Credit to Henry S. Warren, Hacker's Delight, Addison-Wesley, 2002 */ + +#define prepareFromBitInterleaving(even, odd, temp, temp0, temp1) \ + temp0 = (even); \ + temp1 = (odd); \ + temp = (temp0 & 0x0000FFFF) | (temp1 << 16); \ + temp1 = (temp0 >> 16) | (temp1 & 0xFFFF0000); \ + temp0 = temp; \ + temp = (temp0 ^ (temp0 >> 8)) & 0x0000FF00UL; temp0 = temp0 ^ temp ^ (temp << 8); \ + temp = (temp0 ^ (temp0 >> 4)) & 0x00F000F0UL; temp0 = temp0 ^ temp ^ (temp << 4); \ + temp = (temp0 ^ (temp0 >> 2)) & 0x0C0C0C0CUL; temp0 = temp0 ^ temp ^ (temp << 2); \ + temp = (temp0 ^ (temp0 >> 1)) & 0x22222222UL; temp0 = temp0 ^ temp ^ (temp << 1); \ + temp = (temp1 ^ (temp1 >> 8)) & 0x0000FF00UL; temp1 = temp1 ^ temp ^ (temp << 8); \ + temp = (temp1 ^ (temp1 >> 4)) & 0x00F000F0UL; temp1 = temp1 ^ temp ^ (temp << 4); \ + temp = (temp1 ^ (temp1 >> 2)) & 0x0C0C0C0CUL; temp1 = temp1 ^ temp ^ (temp << 2); \ + temp = (temp1 ^ (temp1 >> 1)) & 0x22222222UL; temp1 = temp1 ^ temp ^ (temp << 1); + +#define fromBitInterleaving(even, odd, low, high, temp, temp0, temp1) \ + prepareFromBitInterleaving(even, odd, temp, temp0, temp1) \ + low = temp0; \ + high = temp1; + +#define fromBitInterleavingAndXOR(even, odd, lowIn, highIn, lowOut, highOut, temp, temp0, temp1) \ + prepareFromBitInterleaving(even, odd, temp, temp0, temp1) \ + lowOut = lowIn ^ temp0; \ + highOut = highIn ^ temp1; + +void KeccakP1600_SetBytesInLaneToZero(void *state, unsigned int lanePosition, unsigned int offset, unsigned int length) +{ + UINT8 laneAsBytes[8]; + UINT32 low, high; + UINT32 temp, temp0, temp1; + UINT32 *stateAsHalfLanes = (UINT32*)state; + + memset(laneAsBytes, 0xFF, offset); + memset(laneAsBytes+offset, 0x00, length); + memset(laneAsBytes+offset+length, 0xFF, 8-offset-length); +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + low = *((UINT32*)(laneAsBytes+0)); + high = *((UINT32*)(laneAsBytes+4)); +#else + low = laneAsBytes[0] + | ((UINT32)(laneAsBytes[1]) << 8) + | ((UINT32)(laneAsBytes[2]) << 16) + | ((UINT32)(laneAsBytes[3]) << 24); + high = laneAsBytes[4] + | ((UINT32)(laneAsBytes[5]) << 8) + | ((UINT32)(laneAsBytes[6]) << 16) + | ((UINT32)(laneAsBytes[7]) << 24); +#endif + toBitInterleavingAndAND(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_Initialize(void *state) +{ + memset(state, 0, 200); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_AddByte(void *state, unsigned char byte, unsigned int offset) +{ + unsigned int lanePosition = offset/8; + unsigned int offsetInLane = offset%8; + UINT32 low, high; + UINT32 temp, temp0, temp1; + UINT32 *stateAsHalfLanes = (UINT32*)state; + + if (offsetInLane < 4) { + low = (UINT32)byte << (offsetInLane*8); + high = 0; + } + else { + low = 0; + high = (UINT32)byte << ((offsetInLane-4)*8); + } + toBitInterleavingAndXOR(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_AddBytesInLane(void *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length) +{ + UINT8 laneAsBytes[8]; + UINT32 low, high; + UINT32 temp, temp0, temp1; + UINT32 *stateAsHalfLanes = (UINT32*)state; + + memset(laneAsBytes, 0, 8); + memcpy(laneAsBytes+offset, data, length); +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + low = *((UINT32*)(laneAsBytes+0)); + high = *((UINT32*)(laneAsBytes+4)); +#else + low = laneAsBytes[0] + | ((UINT32)(laneAsBytes[1]) << 8) + | ((UINT32)(laneAsBytes[2]) << 16) + | ((UINT32)(laneAsBytes[3]) << 24); + high = laneAsBytes[4] + | ((UINT32)(laneAsBytes[5]) << 8) + | ((UINT32)(laneAsBytes[6]) << 16) + | ((UINT32)(laneAsBytes[7]) << 24); +#endif + toBitInterleavingAndXOR(low, high, stateAsHalfLanes[lanePosition*2+0], stateAsHalfLanes[lanePosition*2+1], temp, temp0, temp1); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_AddLanes(void *state, const unsigned char *data, unsigned int laneCount) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + const UINT32 * pI = (const UINT32 *)data; + UINT32 * pS = (UINT32*)state; + UINT32 t, x0, x1; + int i; + for (i = laneCount-1; i >= 0; --i) { +#ifdef NO_MISALIGNED_ACCESSES + UINT32 low; + UINT32 high; + memcpy(&low, pI++, 4); + memcpy(&high, pI++, 4); + toBitInterleavingAndXOR(low, high, *(pS++), *(pS++), t, x0, x1); +#else + toBitInterleavingAndXOR(*(pI++), *(pI++), *(pS++), *(pS++), t, x0, x1) +#endif + } +#else + unsigned int lanePosition; + for(lanePosition=0; lanePosition= 0; --i) { +#ifdef NO_MISALIGNED_ACCESSES + UINT32 low; + UINT32 high; + memcpy(&low, pI++, 4); + memcpy(&high, pI++, 4); + toBitInterleavingAndSet(low, high, *(pS++), *(pS++), t, x0, x1); +#else + toBitInterleavingAndSet(*(pI++), *(pI++), *(pS++), *(pS++), t, x0, x1) +#endif + } +#else + unsigned int lanePosition; + for(lanePosition=0; lanePosition> 8) & 0xFF; + laneAsBytes[2] = (low >> 16) & 0xFF; + laneAsBytes[3] = (low >> 24) & 0xFF; + laneAsBytes[4] = high & 0xFF; + laneAsBytes[5] = (high >> 8) & 0xFF; + laneAsBytes[6] = (high >> 16) & 0xFF; + laneAsBytes[7] = (high >> 24) & 0xFF; +#endif + memcpy(data, laneAsBytes+offset, length); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned int laneCount) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + UINT32 * pI = (UINT32 *)data; + const UINT32 * pS = ( const UINT32 *)state; + UINT32 t, x0, x1; + int i; + for (i = laneCount-1; i >= 0; --i) { +#ifdef NO_MISALIGNED_ACCESSES + UINT32 low; + UINT32 high; + fromBitInterleaving(*(pS++), *(pS++), low, high, t, x0, x1); + memcpy(pI++, &low, 4); + memcpy(pI++, &high, 4); +#else + fromBitInterleaving(*(pS++), *(pS++), *(pI++), *(pI++), t, x0, x1) +#endif + } +#else + unsigned int lanePosition; + for(lanePosition=0; lanePosition> 8) & 0xFF; + laneAsBytes[2] = (low >> 16) & 0xFF; + laneAsBytes[3] = (low >> 24) & 0xFF; + laneAsBytes[4] = high & 0xFF; + laneAsBytes[5] = (high >> 8) & 0xFF; + laneAsBytes[6] = (high >> 16) & 0xFF; + laneAsBytes[7] = (high >> 24) & 0xFF; + memcpy(data+lanePosition*8, laneAsBytes, 8); + } +#endif +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length) +{ + SnP_ExtractBytes(state, data, offset, length, KeccakP1600_ExtractLanes, KeccakP1600_ExtractBytesInLane, 8); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length) +{ + UINT32 *stateAsHalfLanes = (UINT32*)state; + UINT32 low, high, temp, temp0, temp1; + UINT8 laneAsBytes[8]; + unsigned int i; + + fromBitInterleaving(stateAsHalfLanes[lanePosition*2], stateAsHalfLanes[lanePosition*2+1], low, high, temp, temp0, temp1); +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + *((UINT32*)(laneAsBytes+0)) = low; + *((UINT32*)(laneAsBytes+4)) = high; +#else + laneAsBytes[0] = low & 0xFF; + laneAsBytes[1] = (low >> 8) & 0xFF; + laneAsBytes[2] = (low >> 16) & 0xFF; + laneAsBytes[3] = (low >> 24) & 0xFF; + laneAsBytes[4] = high & 0xFF; + laneAsBytes[5] = (high >> 8) & 0xFF; + laneAsBytes[6] = (high >> 16) & 0xFF; + laneAsBytes[7] = (high >> 24) & 0xFF; +#endif + for(i=0; i= 0; --i) { +#ifdef NO_MISALIGNED_ACCESSES + UINT32 low; + UINT32 high; + fromBitInterleaving(*(pS++), *(pS++), low, high, t, x0, x1); + *(pO++) = *(pI++) ^ low; + *(pO++) = *(pI++) ^ high; +#else + fromBitInterleavingAndXOR(*(pS++), *(pS++), *(pI++), *(pI++), *(pO++), *(pO++), t, x0, x1) +#endif + } +#else + unsigned int lanePosition; + for(lanePosition=0; lanePosition> 8) & 0xFF; + laneAsBytes[2] = (low >> 16) & 0xFF; + laneAsBytes[3] = (low >> 24) & 0xFF; + laneAsBytes[4] = high & 0xFF; + laneAsBytes[5] = (high >> 8) & 0xFF; + laneAsBytes[6] = (high >> 16) & 0xFF; + laneAsBytes[7] = (high >> 24) & 0xFF; + ((UINT32*)(output+lanePosition*8))[0] = ((UINT32*)(input+lanePosition*8))[0] ^ (*(const UINT32*)(laneAsBytes+0)); + ((UINT32*)(output+lanePosition*8))[1] = ((UINT32*)(input+lanePosition*8))[0] ^ (*(const UINT32*)(laneAsBytes+4)); + } +#endif +} +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length) +{ + SnP_ExtractAndAddBytes(state, input, output, offset, length, KeccakP1600_ExtractAndAddLanes, KeccakP1600_ExtractAndAddBytesInLane, 8); +} + +/* ---------------------------------------------------------------- */ + +static const UINT32 KeccakF1600RoundConstants_int2[2*24+1] = +{ + 0x00000001UL, 0x00000000UL, + 0x00000000UL, 0x00000089UL, + 0x00000000UL, 0x8000008bUL, + 0x00000000UL, 0x80008080UL, + 0x00000001UL, 0x0000008bUL, + 0x00000001UL, 0x00008000UL, + 0x00000001UL, 0x80008088UL, + 0x00000001UL, 0x80000082UL, + 0x00000000UL, 0x0000000bUL, + 0x00000000UL, 0x0000000aUL, + 0x00000001UL, 0x00008082UL, + 0x00000000UL, 0x00008003UL, + 0x00000001UL, 0x0000808bUL, + 0x00000001UL, 0x8000000bUL, + 0x00000001UL, 0x8000008aUL, + 0x00000001UL, 0x80000081UL, + 0x00000000UL, 0x80000081UL, + 0x00000000UL, 0x80000008UL, + 0x00000000UL, 0x00000083UL, + 0x00000000UL, 0x80008003UL, + 0x00000001UL, 0x80008088UL, + 0x00000000UL, 0x80000088UL, + 0x00000001UL, 0x00008000UL, + 0x00000000UL, 0x80008082UL, + 0x000000FFUL +}; + +#define KeccakAtoD_round0() \ + Cx = Abu0^Agu0^Aku0^Amu0^Asu0; \ + Du1 = Abe1^Age1^Ake1^Ame1^Ase1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Abu1^Agu1^Aku1^Amu1^Asu1; \ + Du0 = Abe0^Age0^Ake0^Ame0^Ase0; \ + Da1 = Cz^Du0; \ +\ + Cw = Abi0^Agi0^Aki0^Ami0^Asi0; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Abi1^Agi1^Aki1^Ami1^Asi1; \ + Do1 = Cy^Cx; \ +\ + Cx = Aba0^Aga0^Aka0^Ama0^Asa0; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Aba1^Aga1^Aka1^Ama1^Asa1; \ + De1 = Cz^Cw; \ +\ + Cy = Abo1^Ago1^Ako1^Amo1^Aso1; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Abo0^Ago0^Ako0^Amo0^Aso0; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ + +#define KeccakAtoD_round1() \ + Cx = Asu0^Agu0^Amu0^Abu1^Aku1; \ + Du1 = Age1^Ame0^Abe0^Ake1^Ase1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Asu1^Agu1^Amu1^Abu0^Aku0; \ + Du0 = Age0^Ame1^Abe1^Ake0^Ase0; \ + Da1 = Cz^Du0; \ +\ + Cw = Aki1^Asi1^Agi0^Ami1^Abi0; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Aki0^Asi0^Agi1^Ami0^Abi1; \ + Do1 = Cy^Cx; \ +\ + Cx = Aba0^Aka1^Asa0^Aga0^Ama1; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Aba1^Aka0^Asa1^Aga1^Ama0; \ + De1 = Cz^Cw; \ +\ + Cy = Amo0^Abo1^Ako0^Aso1^Ago0; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Amo1^Abo0^Ako1^Aso0^Ago1; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ + +#define KeccakAtoD_round2() \ + Cx = Aku1^Agu0^Abu1^Asu1^Amu1; \ + Du1 = Ame0^Ake0^Age0^Abe0^Ase1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Aku0^Agu1^Abu0^Asu0^Amu0; \ + Du0 = Ame1^Ake1^Age1^Abe1^Ase0; \ + Da1 = Cz^Du0; \ +\ + Cw = Agi1^Abi1^Asi1^Ami0^Aki1; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Agi0^Abi0^Asi0^Ami1^Aki0; \ + Do1 = Cy^Cx; \ +\ + Cx = Aba0^Asa1^Ama1^Aka1^Aga1; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Aba1^Asa0^Ama0^Aka0^Aga0; \ + De1 = Cz^Cw; \ +\ + Cy = Aso0^Amo0^Ako1^Ago0^Abo0; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Aso1^Amo1^Ako0^Ago1^Abo1; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ + +#define KeccakAtoD_round3() \ + Cx = Amu1^Agu0^Asu1^Aku0^Abu0; \ + Du1 = Ake0^Abe1^Ame1^Age0^Ase1; \ + Da0 = Cx^ROL32(Du1, 1); \ + Cz = Amu0^Agu1^Asu0^Aku1^Abu1; \ + Du0 = Ake1^Abe0^Ame0^Age1^Ase0; \ + Da1 = Cz^Du0; \ +\ + Cw = Asi0^Aki0^Abi1^Ami1^Agi1; \ + Do0 = Cw^ROL32(Cz, 1); \ + Cy = Asi1^Aki1^Abi0^Ami0^Agi0; \ + Do1 = Cy^Cx; \ +\ + Cx = Aba0^Ama0^Aga1^Asa1^Aka0; \ + De0 = Cx^ROL32(Cy, 1); \ + Cz = Aba1^Ama1^Aga0^Asa0^Aka1; \ + De1 = Cz^Cw; \ +\ + Cy = Ago1^Aso0^Ako0^Abo0^Amo1; \ + Di0 = Du0^ROL32(Cy, 1); \ + Cw = Ago0^Aso1^Ako1^Abo1^Amo0; \ + Di1 = Du1^Cw; \ +\ + Du0 = Cw^ROL32(Cz, 1); \ + Du1 = Cy^Cx; \ + +void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds) +{ + { + UINT32 Da0, De0, Di0, Do0, Du0; + UINT32 Da1, De1, Di1, Do1, Du1; + UINT32 Ca0, Ce0, Ci0, Co0, Cu0; + UINT32 Cx, Cy, Cz, Cw; + #define Ba Ca0 + #define Be Ce0 + #define Bi Ci0 + #define Bo Co0 + #define Bu Cu0 + const UINT32 *pRoundConstants = KeccakF1600RoundConstants_int2+(24-nRounds)*2; + UINT32 *stateAsHalfLanes = (UINT32*)state; + #define Aba0 stateAsHalfLanes[ 0] + #define Aba1 stateAsHalfLanes[ 1] + #define Abe0 stateAsHalfLanes[ 2] + #define Abe1 stateAsHalfLanes[ 3] + #define Abi0 stateAsHalfLanes[ 4] + #define Abi1 stateAsHalfLanes[ 5] + #define Abo0 stateAsHalfLanes[ 6] + #define Abo1 stateAsHalfLanes[ 7] + #define Abu0 stateAsHalfLanes[ 8] + #define Abu1 stateAsHalfLanes[ 9] + #define Aga0 stateAsHalfLanes[10] + #define Aga1 stateAsHalfLanes[11] + #define Age0 stateAsHalfLanes[12] + #define Age1 stateAsHalfLanes[13] + #define Agi0 stateAsHalfLanes[14] + #define Agi1 stateAsHalfLanes[15] + #define Ago0 stateAsHalfLanes[16] + #define Ago1 stateAsHalfLanes[17] + #define Agu0 stateAsHalfLanes[18] + #define Agu1 stateAsHalfLanes[19] + #define Aka0 stateAsHalfLanes[20] + #define Aka1 stateAsHalfLanes[21] + #define Ake0 stateAsHalfLanes[22] + #define Ake1 stateAsHalfLanes[23] + #define Aki0 stateAsHalfLanes[24] + #define Aki1 stateAsHalfLanes[25] + #define Ako0 stateAsHalfLanes[26] + #define Ako1 stateAsHalfLanes[27] + #define Aku0 stateAsHalfLanes[28] + #define Aku1 stateAsHalfLanes[29] + #define Ama0 stateAsHalfLanes[30] + #define Ama1 stateAsHalfLanes[31] + #define Ame0 stateAsHalfLanes[32] + #define Ame1 stateAsHalfLanes[33] + #define Ami0 stateAsHalfLanes[34] + #define Ami1 stateAsHalfLanes[35] + #define Amo0 stateAsHalfLanes[36] + #define Amo1 stateAsHalfLanes[37] + #define Amu0 stateAsHalfLanes[38] + #define Amu1 stateAsHalfLanes[39] + #define Asa0 stateAsHalfLanes[40] + #define Asa1 stateAsHalfLanes[41] + #define Ase0 stateAsHalfLanes[42] + #define Ase1 stateAsHalfLanes[43] + #define Asi0 stateAsHalfLanes[44] + #define Asi1 stateAsHalfLanes[45] + #define Aso0 stateAsHalfLanes[46] + #define Aso1 stateAsHalfLanes[47] + #define Asu0 stateAsHalfLanes[48] + #define Asu1 stateAsHalfLanes[49] + + do + { + /* --- Code for 4 rounds */ + + /* --- using factor 2 interleaving, 64-bit lanes mapped to 32-bit words */ + + KeccakAtoD_round0(); + + Ba = (Aba0^Da0); + Be = ROL32((Age0^De0), 22); + Bi = ROL32((Aki1^Di1), 22); + Bo = ROL32((Amo1^Do1), 11); + Bu = ROL32((Asu0^Du0), 7); + Aba0 = Ba ^((~Be)& Bi ); + Aba0 ^= *(pRoundConstants++); + Age0 = Be ^((~Bi)& Bo ); + Aki1 = Bi ^((~Bo)& Bu ); + Amo1 = Bo ^((~Bu)& Ba ); + Asu0 = Bu ^((~Ba)& Be ); + + Ba = (Aba1^Da1); + Be = ROL32((Age1^De1), 22); + Bi = ROL32((Aki0^Di0), 21); + Bo = ROL32((Amo0^Do0), 10); + Bu = ROL32((Asu1^Du1), 7); + Aba1 = Ba ^((~Be)& Bi ); + Aba1 ^= *(pRoundConstants++); + Age1 = Be ^((~Bi)& Bo ); + Aki0 = Bi ^((~Bo)& Bu ); + Amo0 = Bo ^((~Bu)& Ba ); + Asu1 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Aka1^Da1), 2); + Bo = ROL32((Ame1^De1), 23); + Bu = ROL32((Asi1^Di1), 31); + Ba = ROL32((Abo0^Do0), 14); + Be = ROL32((Agu0^Du0), 10); + Aka1 = Ba ^((~Be)& Bi ); + Ame1 = Be ^((~Bi)& Bo ); + Asi1 = Bi ^((~Bo)& Bu ); + Abo0 = Bo ^((~Bu)& Ba ); + Agu0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Aka0^Da0), 1); + Bo = ROL32((Ame0^De0), 22); + Bu = ROL32((Asi0^Di0), 30); + Ba = ROL32((Abo1^Do1), 14); + Be = ROL32((Agu1^Du1), 10); + Aka0 = Ba ^((~Be)& Bi ); + Ame0 = Be ^((~Bi)& Bo ); + Asi0 = Bi ^((~Bo)& Bu ); + Abo1 = Bo ^((~Bu)& Ba ); + Agu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Asa0^Da0), 9); + Ba = ROL32((Abe1^De1), 1); + Be = ROL32((Agi0^Di0), 3); + Bi = ROL32((Ako1^Do1), 13); + Bo = ROL32((Amu0^Du0), 4); + Asa0 = Ba ^((~Be)& Bi ); + Abe1 = Be ^((~Bi)& Bo ); + Agi0 = Bi ^((~Bo)& Bu ); + Ako1 = Bo ^((~Bu)& Ba ); + Amu0 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Asa1^Da1), 9); + Ba = (Abe0^De0); + Be = ROL32((Agi1^Di1), 3); + Bi = ROL32((Ako0^Do0), 12); + Bo = ROL32((Amu1^Du1), 4); + Asa1 = Ba ^((~Be)& Bi ); + Abe0 = Be ^((~Bi)& Bo ); + Agi1 = Bi ^((~Bo)& Bu ); + Ako0 = Bo ^((~Bu)& Ba ); + Amu1 = Bu ^((~Ba)& Be ); + + Be = ROL32((Aga0^Da0), 18); + Bi = ROL32((Ake0^De0), 5); + Bo = ROL32((Ami1^Di1), 8); + Bu = ROL32((Aso0^Do0), 28); + Ba = ROL32((Abu1^Du1), 14); + Aga0 = Ba ^((~Be)& Bi ); + Ake0 = Be ^((~Bi)& Bo ); + Ami1 = Bi ^((~Bo)& Bu ); + Aso0 = Bo ^((~Bu)& Ba ); + Abu1 = Bu ^((~Ba)& Be ); + + Be = ROL32((Aga1^Da1), 18); + Bi = ROL32((Ake1^De1), 5); + Bo = ROL32((Ami0^Di0), 7); + Bu = ROL32((Aso1^Do1), 28); + Ba = ROL32((Abu0^Du0), 13); + Aga1 = Ba ^((~Be)& Bi ); + Ake1 = Be ^((~Bi)& Bo ); + Ami0 = Bi ^((~Bo)& Bu ); + Aso1 = Bo ^((~Bu)& Ba ); + Abu0 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Ama1^Da1), 21); + Bu = ROL32((Ase0^De0), 1); + Ba = ROL32((Abi0^Di0), 31); + Be = ROL32((Ago1^Do1), 28); + Bi = ROL32((Aku1^Du1), 20); + Ama1 = Ba ^((~Be)& Bi ); + Ase0 = Be ^((~Bi)& Bo ); + Abi0 = Bi ^((~Bo)& Bu ); + Ago1 = Bo ^((~Bu)& Ba ); + Aku1 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Ama0^Da0), 20); + Bu = ROL32((Ase1^De1), 1); + Ba = ROL32((Abi1^Di1), 31); + Be = ROL32((Ago0^Do0), 27); + Bi = ROL32((Aku0^Du0), 19); + Ama0 = Ba ^((~Be)& Bi ); + Ase1 = Be ^((~Bi)& Bo ); + Abi1 = Bi ^((~Bo)& Bu ); + Ago0 = Bo ^((~Bu)& Ba ); + Aku0 = Bu ^((~Ba)& Be ); + + KeccakAtoD_round1(); + + Ba = (Aba0^Da0); + Be = ROL32((Ame1^De0), 22); + Bi = ROL32((Agi1^Di1), 22); + Bo = ROL32((Aso1^Do1), 11); + Bu = ROL32((Aku1^Du0), 7); + Aba0 = Ba ^((~Be)& Bi ); + Aba0 ^= *(pRoundConstants++); + Ame1 = Be ^((~Bi)& Bo ); + Agi1 = Bi ^((~Bo)& Bu ); + Aso1 = Bo ^((~Bu)& Ba ); + Aku1 = Bu ^((~Ba)& Be ); + + Ba = (Aba1^Da1); + Be = ROL32((Ame0^De1), 22); + Bi = ROL32((Agi0^Di0), 21); + Bo = ROL32((Aso0^Do0), 10); + Bu = ROL32((Aku0^Du1), 7); + Aba1 = Ba ^((~Be)& Bi ); + Aba1 ^= *(pRoundConstants++); + Ame0 = Be ^((~Bi)& Bo ); + Agi0 = Bi ^((~Bo)& Bu ); + Aso0 = Bo ^((~Bu)& Ba ); + Aku0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Asa1^Da1), 2); + Bo = ROL32((Ake1^De1), 23); + Bu = ROL32((Abi1^Di1), 31); + Ba = ROL32((Amo1^Do0), 14); + Be = ROL32((Agu0^Du0), 10); + Asa1 = Ba ^((~Be)& Bi ); + Ake1 = Be ^((~Bi)& Bo ); + Abi1 = Bi ^((~Bo)& Bu ); + Amo1 = Bo ^((~Bu)& Ba ); + Agu0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Asa0^Da0), 1); + Bo = ROL32((Ake0^De0), 22); + Bu = ROL32((Abi0^Di0), 30); + Ba = ROL32((Amo0^Do1), 14); + Be = ROL32((Agu1^Du1), 10); + Asa0 = Ba ^((~Be)& Bi ); + Ake0 = Be ^((~Bi)& Bo ); + Abi0 = Bi ^((~Bo)& Bu ); + Amo0 = Bo ^((~Bu)& Ba ); + Agu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Ama1^Da0), 9); + Ba = ROL32((Age1^De1), 1); + Be = ROL32((Asi1^Di0), 3); + Bi = ROL32((Ako0^Do1), 13); + Bo = ROL32((Abu1^Du0), 4); + Ama1 = Ba ^((~Be)& Bi ); + Age1 = Be ^((~Bi)& Bo ); + Asi1 = Bi ^((~Bo)& Bu ); + Ako0 = Bo ^((~Bu)& Ba ); + Abu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Ama0^Da1), 9); + Ba = (Age0^De0); + Be = ROL32((Asi0^Di1), 3); + Bi = ROL32((Ako1^Do0), 12); + Bo = ROL32((Abu0^Du1), 4); + Ama0 = Ba ^((~Be)& Bi ); + Age0 = Be ^((~Bi)& Bo ); + Asi0 = Bi ^((~Bo)& Bu ); + Ako1 = Bo ^((~Bu)& Ba ); + Abu0 = Bu ^((~Ba)& Be ); + + Be = ROL32((Aka1^Da0), 18); + Bi = ROL32((Abe1^De0), 5); + Bo = ROL32((Ami0^Di1), 8); + Bu = ROL32((Ago1^Do0), 28); + Ba = ROL32((Asu1^Du1), 14); + Aka1 = Ba ^((~Be)& Bi ); + Abe1 = Be ^((~Bi)& Bo ); + Ami0 = Bi ^((~Bo)& Bu ); + Ago1 = Bo ^((~Bu)& Ba ); + Asu1 = Bu ^((~Ba)& Be ); + + Be = ROL32((Aka0^Da1), 18); + Bi = ROL32((Abe0^De1), 5); + Bo = ROL32((Ami1^Di0), 7); + Bu = ROL32((Ago0^Do1), 28); + Ba = ROL32((Asu0^Du0), 13); + Aka0 = Ba ^((~Be)& Bi ); + Abe0 = Be ^((~Bi)& Bo ); + Ami1 = Bi ^((~Bo)& Bu ); + Ago0 = Bo ^((~Bu)& Ba ); + Asu0 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Aga1^Da1), 21); + Bu = ROL32((Ase0^De0), 1); + Ba = ROL32((Aki1^Di0), 31); + Be = ROL32((Abo1^Do1), 28); + Bi = ROL32((Amu1^Du1), 20); + Aga1 = Ba ^((~Be)& Bi ); + Ase0 = Be ^((~Bi)& Bo ); + Aki1 = Bi ^((~Bo)& Bu ); + Abo1 = Bo ^((~Bu)& Ba ); + Amu1 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Aga0^Da0), 20); + Bu = ROL32((Ase1^De1), 1); + Ba = ROL32((Aki0^Di1), 31); + Be = ROL32((Abo0^Do0), 27); + Bi = ROL32((Amu0^Du0), 19); + Aga0 = Ba ^((~Be)& Bi ); + Ase1 = Be ^((~Bi)& Bo ); + Aki0 = Bi ^((~Bo)& Bu ); + Abo0 = Bo ^((~Bu)& Ba ); + Amu0 = Bu ^((~Ba)& Be ); + + KeccakAtoD_round2(); + + Ba = (Aba0^Da0); + Be = ROL32((Ake1^De0), 22); + Bi = ROL32((Asi0^Di1), 22); + Bo = ROL32((Ago0^Do1), 11); + Bu = ROL32((Amu1^Du0), 7); + Aba0 = Ba ^((~Be)& Bi ); + Aba0 ^= *(pRoundConstants++); + Ake1 = Be ^((~Bi)& Bo ); + Asi0 = Bi ^((~Bo)& Bu ); + Ago0 = Bo ^((~Bu)& Ba ); + Amu1 = Bu ^((~Ba)& Be ); + + Ba = (Aba1^Da1); + Be = ROL32((Ake0^De1), 22); + Bi = ROL32((Asi1^Di0), 21); + Bo = ROL32((Ago1^Do0), 10); + Bu = ROL32((Amu0^Du1), 7); + Aba1 = Ba ^((~Be)& Bi ); + Aba1 ^= *(pRoundConstants++); + Ake0 = Be ^((~Bi)& Bo ); + Asi1 = Bi ^((~Bo)& Bu ); + Ago1 = Bo ^((~Bu)& Ba ); + Amu0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Ama0^Da1), 2); + Bo = ROL32((Abe0^De1), 23); + Bu = ROL32((Aki0^Di1), 31); + Ba = ROL32((Aso1^Do0), 14); + Be = ROL32((Agu0^Du0), 10); + Ama0 = Ba ^((~Be)& Bi ); + Abe0 = Be ^((~Bi)& Bo ); + Aki0 = Bi ^((~Bo)& Bu ); + Aso1 = Bo ^((~Bu)& Ba ); + Agu0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Ama1^Da0), 1); + Bo = ROL32((Abe1^De0), 22); + Bu = ROL32((Aki1^Di0), 30); + Ba = ROL32((Aso0^Do1), 14); + Be = ROL32((Agu1^Du1), 10); + Ama1 = Ba ^((~Be)& Bi ); + Abe1 = Be ^((~Bi)& Bo ); + Aki1 = Bi ^((~Bo)& Bu ); + Aso0 = Bo ^((~Bu)& Ba ); + Agu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Aga1^Da0), 9); + Ba = ROL32((Ame0^De1), 1); + Be = ROL32((Abi1^Di0), 3); + Bi = ROL32((Ako1^Do1), 13); + Bo = ROL32((Asu1^Du0), 4); + Aga1 = Ba ^((~Be)& Bi ); + Ame0 = Be ^((~Bi)& Bo ); + Abi1 = Bi ^((~Bo)& Bu ); + Ako1 = Bo ^((~Bu)& Ba ); + Asu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Aga0^Da1), 9); + Ba = (Ame1^De0); + Be = ROL32((Abi0^Di1), 3); + Bi = ROL32((Ako0^Do0), 12); + Bo = ROL32((Asu0^Du1), 4); + Aga0 = Ba ^((~Be)& Bi ); + Ame1 = Be ^((~Bi)& Bo ); + Abi0 = Bi ^((~Bo)& Bu ); + Ako0 = Bo ^((~Bu)& Ba ); + Asu0 = Bu ^((~Ba)& Be ); + + Be = ROL32((Asa1^Da0), 18); + Bi = ROL32((Age1^De0), 5); + Bo = ROL32((Ami1^Di1), 8); + Bu = ROL32((Abo1^Do0), 28); + Ba = ROL32((Aku0^Du1), 14); + Asa1 = Ba ^((~Be)& Bi ); + Age1 = Be ^((~Bi)& Bo ); + Ami1 = Bi ^((~Bo)& Bu ); + Abo1 = Bo ^((~Bu)& Ba ); + Aku0 = Bu ^((~Ba)& Be ); + + Be = ROL32((Asa0^Da1), 18); + Bi = ROL32((Age0^De1), 5); + Bo = ROL32((Ami0^Di0), 7); + Bu = ROL32((Abo0^Do1), 28); + Ba = ROL32((Aku1^Du0), 13); + Asa0 = Ba ^((~Be)& Bi ); + Age0 = Be ^((~Bi)& Bo ); + Ami0 = Bi ^((~Bo)& Bu ); + Abo0 = Bo ^((~Bu)& Ba ); + Aku1 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Aka0^Da1), 21); + Bu = ROL32((Ase0^De0), 1); + Ba = ROL32((Agi1^Di0), 31); + Be = ROL32((Amo0^Do1), 28); + Bi = ROL32((Abu0^Du1), 20); + Aka0 = Ba ^((~Be)& Bi ); + Ase0 = Be ^((~Bi)& Bo ); + Agi1 = Bi ^((~Bo)& Bu ); + Amo0 = Bo ^((~Bu)& Ba ); + Abu0 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Aka1^Da0), 20); + Bu = ROL32((Ase1^De1), 1); + Ba = ROL32((Agi0^Di1), 31); + Be = ROL32((Amo1^Do0), 27); + Bi = ROL32((Abu1^Du0), 19); + Aka1 = Ba ^((~Be)& Bi ); + Ase1 = Be ^((~Bi)& Bo ); + Agi0 = Bi ^((~Bo)& Bu ); + Amo1 = Bo ^((~Bu)& Ba ); + Abu1 = Bu ^((~Ba)& Be ); + + KeccakAtoD_round3(); + + Ba = (Aba0^Da0); + Be = ROL32((Abe0^De0), 22); + Bi = ROL32((Abi0^Di1), 22); + Bo = ROL32((Abo0^Do1), 11); + Bu = ROL32((Abu0^Du0), 7); + Aba0 = Ba ^((~Be)& Bi ); + Aba0 ^= *(pRoundConstants++); + Abe0 = Be ^((~Bi)& Bo ); + Abi0 = Bi ^((~Bo)& Bu ); + Abo0 = Bo ^((~Bu)& Ba ); + Abu0 = Bu ^((~Ba)& Be ); + + Ba = (Aba1^Da1); + Be = ROL32((Abe1^De1), 22); + Bi = ROL32((Abi1^Di0), 21); + Bo = ROL32((Abo1^Do0), 10); + Bu = ROL32((Abu1^Du1), 7); + Aba1 = Ba ^((~Be)& Bi ); + Aba1 ^= *(pRoundConstants++); + Abe1 = Be ^((~Bi)& Bo ); + Abi1 = Bi ^((~Bo)& Bu ); + Abo1 = Bo ^((~Bu)& Ba ); + Abu1 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Aga0^Da1), 2); + Bo = ROL32((Age0^De1), 23); + Bu = ROL32((Agi0^Di1), 31); + Ba = ROL32((Ago0^Do0), 14); + Be = ROL32((Agu0^Du0), 10); + Aga0 = Ba ^((~Be)& Bi ); + Age0 = Be ^((~Bi)& Bo ); + Agi0 = Bi ^((~Bo)& Bu ); + Ago0 = Bo ^((~Bu)& Ba ); + Agu0 = Bu ^((~Ba)& Be ); + + Bi = ROL32((Aga1^Da0), 1); + Bo = ROL32((Age1^De0), 22); + Bu = ROL32((Agi1^Di0), 30); + Ba = ROL32((Ago1^Do1), 14); + Be = ROL32((Agu1^Du1), 10); + Aga1 = Ba ^((~Be)& Bi ); + Age1 = Be ^((~Bi)& Bo ); + Agi1 = Bi ^((~Bo)& Bu ); + Ago1 = Bo ^((~Bu)& Ba ); + Agu1 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Aka0^Da0), 9); + Ba = ROL32((Ake0^De1), 1); + Be = ROL32((Aki0^Di0), 3); + Bi = ROL32((Ako0^Do1), 13); + Bo = ROL32((Aku0^Du0), 4); + Aka0 = Ba ^((~Be)& Bi ); + Ake0 = Be ^((~Bi)& Bo ); + Aki0 = Bi ^((~Bo)& Bu ); + Ako0 = Bo ^((~Bu)& Ba ); + Aku0 = Bu ^((~Ba)& Be ); + + Bu = ROL32((Aka1^Da1), 9); + Ba = (Ake1^De0); + Be = ROL32((Aki1^Di1), 3); + Bi = ROL32((Ako1^Do0), 12); + Bo = ROL32((Aku1^Du1), 4); + Aka1 = Ba ^((~Be)& Bi ); + Ake1 = Be ^((~Bi)& Bo ); + Aki1 = Bi ^((~Bo)& Bu ); + Ako1 = Bo ^((~Bu)& Ba ); + Aku1 = Bu ^((~Ba)& Be ); + + Be = ROL32((Ama0^Da0), 18); + Bi = ROL32((Ame0^De0), 5); + Bo = ROL32((Ami0^Di1), 8); + Bu = ROL32((Amo0^Do0), 28); + Ba = ROL32((Amu0^Du1), 14); + Ama0 = Ba ^((~Be)& Bi ); + Ame0 = Be ^((~Bi)& Bo ); + Ami0 = Bi ^((~Bo)& Bu ); + Amo0 = Bo ^((~Bu)& Ba ); + Amu0 = Bu ^((~Ba)& Be ); + + Be = ROL32((Ama1^Da1), 18); + Bi = ROL32((Ame1^De1), 5); + Bo = ROL32((Ami1^Di0), 7); + Bu = ROL32((Amo1^Do1), 28); + Ba = ROL32((Amu1^Du0), 13); + Ama1 = Ba ^((~Be)& Bi ); + Ame1 = Be ^((~Bi)& Bo ); + Ami1 = Bi ^((~Bo)& Bu ); + Amo1 = Bo ^((~Bu)& Ba ); + Amu1 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Asa0^Da1), 21); + Bu = ROL32((Ase0^De0), 1); + Ba = ROL32((Asi0^Di0), 31); + Be = ROL32((Aso0^Do1), 28); + Bi = ROL32((Asu0^Du1), 20); + Asa0 = Ba ^((~Be)& Bi ); + Ase0 = Be ^((~Bi)& Bo ); + Asi0 = Bi ^((~Bo)& Bu ); + Aso0 = Bo ^((~Bu)& Ba ); + Asu0 = Bu ^((~Ba)& Be ); + + Bo = ROL32((Asa1^Da0), 20); + Bu = ROL32((Ase1^De1), 1); + Ba = ROL32((Asi1^Di1), 31); + Be = ROL32((Aso1^Do0), 27); + Bi = ROL32((Asu1^Du0), 19); + Asa1 = Ba ^((~Be)& Bi ); + Ase1 = Be ^((~Bi)& Bo ); + Asi1 = Bi ^((~Bo)& Bu ); + Aso1 = Bo ^((~Bu)& Ba ); + Asu1 = Bu ^((~Ba)& Be ); + } + while ( *pRoundConstants != 0xFF ); + + #undef Aba0 + #undef Aba1 + #undef Abe0 + #undef Abe1 + #undef Abi0 + #undef Abi1 + #undef Abo0 + #undef Abo1 + #undef Abu0 + #undef Abu1 + #undef Aga0 + #undef Aga1 + #undef Age0 + #undef Age1 + #undef Agi0 + #undef Agi1 + #undef Ago0 + #undef Ago1 + #undef Agu0 + #undef Agu1 + #undef Aka0 + #undef Aka1 + #undef Ake0 + #undef Ake1 + #undef Aki0 + #undef Aki1 + #undef Ako0 + #undef Ako1 + #undef Aku0 + #undef Aku1 + #undef Ama0 + #undef Ama1 + #undef Ame0 + #undef Ame1 + #undef Ami0 + #undef Ami1 + #undef Amo0 + #undef Amo1 + #undef Amu0 + #undef Amu1 + #undef Asa0 + #undef Asa1 + #undef Ase0 + #undef Ase1 + #undef Asi0 + #undef Asi1 + #undef Aso0 + #undef Aso1 + #undef Asu0 + #undef Asu1 + } +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_Permute_12rounds(void *state) +{ + KeccakP1600_Permute_Nrounds(state, 12); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_Permute_24rounds(void *state) +{ + KeccakP1600_Permute_Nrounds(state, 24); +} diff --git a/Modules/_sha3/kcp/KeccakP-1600-opt64-config.h b/Modules/_sha3/kcp/KeccakP-1600-opt64-config.h new file mode 100644 index 0000000..9501c64 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-opt64-config.h @@ -0,0 +1,3 @@ +#define KeccakP1600_implementation_config "lane complementing, all rounds unrolled" +#define KeccakP1600_fullUnrolling +#define KeccakP1600_useLaneComplementing diff --git a/Modules/_sha3/kcp/KeccakP-1600-opt64.c b/Modules/_sha3/kcp/KeccakP-1600-opt64.c new file mode 100644 index 0000000..c90010d --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-opt64.c @@ -0,0 +1,474 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include +#include +/* #include "brg_endian.h" */ +#include "KeccakP-1600-opt64-config.h" + +#if NOT_PYTHON +typedef unsigned char UINT8; +/* typedef unsigned long long int UINT64; */ +#endif + +#if defined(KeccakP1600_useLaneComplementing) +#define UseBebigokimisa +#endif + +#if defined(_MSC_VER) +#define ROL64(a, offset) _rotl64(a, offset) +#elif defined(KeccakP1600_useSHLD) + #define ROL64(x,N) ({ \ + register UINT64 __out; \ + register UINT64 __in = x; \ + __asm__ ("shld %2,%0,%0" : "=r"(__out) : "0"(__in), "i"(N)); \ + __out; \ + }) +#else +#define ROL64(a, offset) ((((UINT64)a) << offset) ^ (((UINT64)a) >> (64-offset))) +#endif + +#include "KeccakP-1600-64.macros" +#ifdef KeccakP1600_fullUnrolling +#define FullUnrolling +#else +#define Unrolling KeccakP1600_unrolling +#endif +#include "KeccakP-1600-unrolling.macros" +#include "SnP-Relaned.h" + +static const UINT64 KeccakF1600RoundConstants[24] = { + 0x0000000000000001ULL, + 0x0000000000008082ULL, + 0x800000000000808aULL, + 0x8000000080008000ULL, + 0x000000000000808bULL, + 0x0000000080000001ULL, + 0x8000000080008081ULL, + 0x8000000000008009ULL, + 0x000000000000008aULL, + 0x0000000000000088ULL, + 0x0000000080008009ULL, + 0x000000008000000aULL, + 0x000000008000808bULL, + 0x800000000000008bULL, + 0x8000000000008089ULL, + 0x8000000000008003ULL, + 0x8000000000008002ULL, + 0x8000000000000080ULL, + 0x000000000000800aULL, + 0x800000008000000aULL, + 0x8000000080008081ULL, + 0x8000000000008080ULL, + 0x0000000080000001ULL, + 0x8000000080008008ULL }; + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_Initialize(void *state) +{ + memset(state, 0, 200); +#ifdef KeccakP1600_useLaneComplementing + ((UINT64*)state)[ 1] = ~(UINT64)0; + ((UINT64*)state)[ 2] = ~(UINT64)0; + ((UINT64*)state)[ 8] = ~(UINT64)0; + ((UINT64*)state)[12] = ~(UINT64)0; + ((UINT64*)state)[17] = ~(UINT64)0; + ((UINT64*)state)[20] = ~(UINT64)0; +#endif +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_AddBytesInLane(void *state, unsigned int lanePosition, const unsigned char *data, unsigned int offset, unsigned int length) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + UINT64 lane; + if (length == 0) + return; + if (length == 1) + lane = data[0]; + else { + lane = 0; + memcpy(&lane, data, length); + } + lane <<= offset*8; +#else + UINT64 lane = 0; + unsigned int i; + for(i=0; i>= offset*8; + for(i=0; i>= 8; + } +#endif +} + +/* ---------------------------------------------------------------- */ + +#if (PLATFORM_BYTE_ORDER != IS_LITTLE_ENDIAN) +void fromWordToBytes(UINT8 *bytes, const UINT64 word) +{ + unsigned int i; + + for(i=0; i<(64/8); i++) + bytes[i] = (word >> (8*i)) & 0xFF; +} +#endif + +void KeccakP1600_ExtractLanes(const void *state, unsigned char *data, unsigned int laneCount) +{ +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + memcpy(data, state, laneCount*8); +#else + unsigned int i; + + for(i=0; i 1) { + ((UINT64*)data)[ 1] = ~((UINT64*)data)[ 1]; + if (laneCount > 2) { + ((UINT64*)data)[ 2] = ~((UINT64*)data)[ 2]; + if (laneCount > 8) { + ((UINT64*)data)[ 8] = ~((UINT64*)data)[ 8]; + if (laneCount > 12) { + ((UINT64*)data)[12] = ~((UINT64*)data)[12]; + if (laneCount > 17) { + ((UINT64*)data)[17] = ~((UINT64*)data)[17]; + if (laneCount > 20) { + ((UINT64*)data)[20] = ~((UINT64*)data)[20]; + } + } + } + } + } + } +#endif +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractBytes(const void *state, unsigned char *data, unsigned int offset, unsigned int length) +{ + SnP_ExtractBytes(state, data, offset, length, KeccakP1600_ExtractLanes, KeccakP1600_ExtractBytesInLane, 8); +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractAndAddBytesInLane(const void *state, unsigned int lanePosition, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length) +{ + UINT64 lane = ((UINT64*)state)[lanePosition]; +#ifdef KeccakP1600_useLaneComplementing + if ((lanePosition == 1) || (lanePosition == 2) || (lanePosition == 8) || (lanePosition == 12) || (lanePosition == 17) || (lanePosition == 20)) + lane = ~lane; +#endif +#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) + { + unsigned int i; + UINT64 lane1[1]; + lane1[0] = lane; + for(i=0; i>= offset*8; + for(i=0; i>= 8; + } +#endif +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractAndAddLanes(const void *state, const unsigned char *input, unsigned char *output, unsigned int laneCount) +{ + unsigned int i; +#if (PLATFORM_BYTE_ORDER != IS_LITTLE_ENDIAN) + unsigned char temp[8]; + unsigned int j; +#endif + + for(i=0; i 1) { + ((UINT64*)output)[ 1] = ~((UINT64*)output)[ 1]; + if (laneCount > 2) { + ((UINT64*)output)[ 2] = ~((UINT64*)output)[ 2]; + if (laneCount > 8) { + ((UINT64*)output)[ 8] = ~((UINT64*)output)[ 8]; + if (laneCount > 12) { + ((UINT64*)output)[12] = ~((UINT64*)output)[12]; + if (laneCount > 17) { + ((UINT64*)output)[17] = ~((UINT64*)output)[17]; + if (laneCount > 20) { + ((UINT64*)output)[20] = ~((UINT64*)output)[20]; + } + } + } + } + } + } +#endif +} + +/* ---------------------------------------------------------------- */ + +void KeccakP1600_ExtractAndAddBytes(const void *state, const unsigned char *input, unsigned char *output, unsigned int offset, unsigned int length) +{ + SnP_ExtractAndAddBytes(state, input, output, offset, length, KeccakP1600_ExtractAndAddLanes, KeccakP1600_ExtractAndAddBytesInLane, 8); +} + +/* ---------------------------------------------------------------- */ + +size_t KeccakF1600_FastLoop_Absorb(void *state, unsigned int laneCount, const unsigned char *data, size_t dataByteLen) +{ + size_t originalDataByteLen = dataByteLen; + declareABCDE + #ifndef KeccakP1600_fullUnrolling + unsigned int i; + #endif + UINT64 *stateAsLanes = (UINT64*)state; + UINT64 *inDataAsLanes = (UINT64*)data; + + copyFromState(A, stateAsLanes) + while(dataByteLen >= laneCount*8) { + addInput(A, inDataAsLanes, laneCount) + rounds24 + inDataAsLanes += laneCount; + dataByteLen -= laneCount*8; + } + copyToState(stateAsLanes, A) + return originalDataByteLen - dataByteLen; +} diff --git a/Modules/_sha3/kcp/KeccakP-1600-unrolling.macros b/Modules/_sha3/kcp/KeccakP-1600-unrolling.macros new file mode 100644 index 0000000..405ce29 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakP-1600-unrolling.macros @@ -0,0 +1,185 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#if (defined(FullUnrolling)) +#define rounds24 \ + prepareTheta \ + thetaRhoPiChiIotaPrepareTheta( 0, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 1, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 2, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 3, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 4, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 5, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 6, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 7, E, A) \ + thetaRhoPiChiIotaPrepareTheta( 8, A, E) \ + thetaRhoPiChiIotaPrepareTheta( 9, E, A) \ + thetaRhoPiChiIotaPrepareTheta(10, A, E) \ + thetaRhoPiChiIotaPrepareTheta(11, E, A) \ + thetaRhoPiChiIotaPrepareTheta(12, A, E) \ + thetaRhoPiChiIotaPrepareTheta(13, E, A) \ + thetaRhoPiChiIotaPrepareTheta(14, A, E) \ + thetaRhoPiChiIotaPrepareTheta(15, E, A) \ + thetaRhoPiChiIotaPrepareTheta(16, A, E) \ + thetaRhoPiChiIotaPrepareTheta(17, E, A) \ + thetaRhoPiChiIotaPrepareTheta(18, A, E) \ + thetaRhoPiChiIotaPrepareTheta(19, E, A) \ + thetaRhoPiChiIotaPrepareTheta(20, A, E) \ + thetaRhoPiChiIotaPrepareTheta(21, E, A) \ + thetaRhoPiChiIotaPrepareTheta(22, A, E) \ + thetaRhoPiChiIota(23, E, A) \ + +#define rounds12 \ + prepareTheta \ + thetaRhoPiChiIotaPrepareTheta(12, A, E) \ + thetaRhoPiChiIotaPrepareTheta(13, E, A) \ + thetaRhoPiChiIotaPrepareTheta(14, A, E) \ + thetaRhoPiChiIotaPrepareTheta(15, E, A) \ + thetaRhoPiChiIotaPrepareTheta(16, A, E) \ + thetaRhoPiChiIotaPrepareTheta(17, E, A) \ + thetaRhoPiChiIotaPrepareTheta(18, A, E) \ + thetaRhoPiChiIotaPrepareTheta(19, E, A) \ + thetaRhoPiChiIotaPrepareTheta(20, A, E) \ + thetaRhoPiChiIotaPrepareTheta(21, E, A) \ + thetaRhoPiChiIotaPrepareTheta(22, A, E) \ + thetaRhoPiChiIota(23, E, A) \ + +#elif (Unrolling == 12) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i+=12) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 5, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 6, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 7, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+ 8, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+ 9, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+10, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+11, E, A) \ + } \ + +#define rounds12 \ + prepareTheta \ + thetaRhoPiChiIotaPrepareTheta(12, A, E) \ + thetaRhoPiChiIotaPrepareTheta(13, E, A) \ + thetaRhoPiChiIotaPrepareTheta(14, A, E) \ + thetaRhoPiChiIotaPrepareTheta(15, E, A) \ + thetaRhoPiChiIotaPrepareTheta(16, A, E) \ + thetaRhoPiChiIotaPrepareTheta(17, E, A) \ + thetaRhoPiChiIotaPrepareTheta(18, A, E) \ + thetaRhoPiChiIotaPrepareTheta(19, E, A) \ + thetaRhoPiChiIotaPrepareTheta(20, A, E) \ + thetaRhoPiChiIotaPrepareTheta(21, E, A) \ + thetaRhoPiChiIotaPrepareTheta(22, A, E) \ + thetaRhoPiChiIota(23, E, A) \ + +#elif (Unrolling == 6) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i+=6) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+5, E, A) \ + } \ + +#define rounds12 \ + prepareTheta \ + for(i=12; i<24; i+=6) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+4, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+5, E, A) \ + } \ + +#elif (Unrolling == 4) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i+=4) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + } \ + +#define rounds12 \ + prepareTheta \ + for(i=12; i<24; i+=4) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+3, E, A) \ + } \ + +#elif (Unrolling == 3) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i+=3) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + copyStateVariables(A, E) \ + } \ + +#define rounds12 \ + prepareTheta \ + for(i=12; i<24; i+=3) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + thetaRhoPiChiIotaPrepareTheta(i+2, A, E) \ + copyStateVariables(A, E) \ + } \ + +#elif (Unrolling == 2) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i+=2) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + } \ + +#define rounds12 \ + prepareTheta \ + for(i=12; i<24; i+=2) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + thetaRhoPiChiIotaPrepareTheta(i+1, E, A) \ + } \ + +#elif (Unrolling == 1) +#define rounds24 \ + prepareTheta \ + for(i=0; i<24; i++) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + copyStateVariables(A, E) \ + } \ + +#define rounds12 \ + prepareTheta \ + for(i=12; i<24; i++) { \ + thetaRhoPiChiIotaPrepareTheta(i , A, E) \ + copyStateVariables(A, E) \ + } \ + +#else +#error "Unrolling is not correctly specified!" +#endif diff --git a/Modules/_sha3/kcp/KeccakSponge.c b/Modules/_sha3/kcp/KeccakSponge.c new file mode 100644 index 0000000..afdb731 --- /dev/null +++ b/Modules/_sha3/kcp/KeccakSponge.c @@ -0,0 +1,92 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#include "KeccakSponge.h" + +#ifdef KeccakReference + #include "displayIntermediateValues.h" +#endif + +#ifndef KeccakP200_excluded + #include "KeccakP-200-SnP.h" + + #define prefix KeccakWidth200 + #define SnP KeccakP200 + #define SnP_width 200 + #define SnP_Permute KeccakP200_Permute_18rounds + #if defined(KeccakF200_FastLoop_supported) + #define SnP_FastLoop_Absorb KeccakF200_FastLoop_Absorb + #endif + #include "KeccakSponge.inc" + #undef prefix + #undef SnP + #undef SnP_width + #undef SnP_Permute + #undef SnP_FastLoop_Absorb +#endif + +#ifndef KeccakP400_excluded + #include "KeccakP-400-SnP.h" + + #define prefix KeccakWidth400 + #define SnP KeccakP400 + #define SnP_width 400 + #define SnP_Permute KeccakP400_Permute_20rounds + #if defined(KeccakF400_FastLoop_supported) + #define SnP_FastLoop_Absorb KeccakF400_FastLoop_Absorb + #endif + #include "KeccakSponge.inc" + #undef prefix + #undef SnP + #undef SnP_width + #undef SnP_Permute + #undef SnP_FastLoop_Absorb +#endif + +#ifndef KeccakP800_excluded + #include "KeccakP-800-SnP.h" + + #define prefix KeccakWidth800 + #define SnP KeccakP800 + #define SnP_width 800 + #define SnP_Permute KeccakP800_Permute_22rounds + #if defined(KeccakF800_FastLoop_supported) + #define SnP_FastLoop_Absorb KeccakF800_FastLoop_Absorb + #endif + #include "KeccakSponge.inc" + #undef prefix + #undef SnP + #undef SnP_width + #undef SnP_Permute + #undef SnP_FastLoop_Absorb +#endif + +#ifndef KeccakP1600_excluded + #include "KeccakP-1600-SnP.h" + + #define prefix KeccakWidth1600 + #define SnP KeccakP1600 + #define SnP_width 1600 + #define SnP_Permute KeccakP1600_Permute_24rounds + #if defined(KeccakF1600_FastLoop_supported) + #define SnP_FastLoop_Absorb KeccakF1600_FastLoop_Absorb + #endif + #include "KeccakSponge.inc" + #undef prefix + #undef SnP + #undef SnP_width + #undef SnP_Permute + #undef SnP_FastLoop_Absorb +#endif diff --git a/Modules/_sha3/kcp/KeccakSponge.h b/Modules/_sha3/kcp/KeccakSponge.h new file mode 100644 index 0000000..0f4badc --- /dev/null +++ b/Modules/_sha3/kcp/KeccakSponge.h @@ -0,0 +1,172 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _KeccakSponge_h_ +#define _KeccakSponge_h_ + +/** General information + * + * The following type and functions are not actually implemented. Their + * documentation is generic, with the prefix Prefix replaced by + * - KeccakWidth200 for a sponge function based on Keccak-f[200] + * - KeccakWidth400 for a sponge function based on Keccak-f[400] + * - KeccakWidth800 for a sponge function based on Keccak-f[800] + * - KeccakWidth1600 for a sponge function based on Keccak-f[1600] + * + * In all these functions, the rate and capacity must sum to the width of the + * chosen permutation. For instance, to use the sponge function + * Keccak[r=1344, c=256], one must use KeccakWidth1600_Sponge() or a combination + * of KeccakWidth1600_SpongeInitialize(), KeccakWidth1600_SpongeAbsorb(), + * KeccakWidth1600_SpongeAbsorbLastFewBits() and + * KeccakWidth1600_SpongeSqueeze(). + * + * The Prefix_SpongeInstance contains the sponge instance attributes for use + * with the Prefix_Sponge* functions. + * It gathers the state processed by the permutation as well as the rate, + * the position of input/output bytes in the state and the phase + * (absorbing or squeezing). + */ + +#ifdef DontReallyInclude_DocumentationOnly +/** Function to evaluate the sponge function Keccak[r, c] in a single call. + * @param rate The value of the rate r. + * @param capacity The value of the capacity c. + * @param input Pointer to the input message (before the suffix). + * @param inputByteLen The length of the input message in bytes. + * @param suffix Byte containing from 0 to 7 suffix bits + * that must be absorbed after @a input. + * These n bits must be in the least significant bit positions. + * These bits must be delimited with a bit 1 at position n + * (counting from 0=LSB to 7=MSB) and followed by bits 0 + * from position n+1 to position 7. + * Some examples: + * - If no bits are to be absorbed, then @a suffix must be 0x01. + * - If the 2-bit sequence 0,0 is to be absorbed, @a suffix must be 0x04. + * - If the 5-bit sequence 0,1,0,0,1 is to be absorbed, @a suffix must be 0x32. + * - If the 7-bit sequence 1,1,0,1,0,0,0 is to be absorbed, @a suffix must be 0x8B. + * . + * @param output Pointer to the output buffer. + * @param outputByteLen The desired number of output bytes. + * @pre One must have r+c equal to the supported width of this implementation + * and the rate a multiple of 8 bits (one byte) in this implementation. + * @pre @a suffix ≠ 0x00 + * @return Zero if successful, 1 otherwise. + */ +int Prefix_Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char suffix, unsigned char *output, size_t outputByteLen); + +/** + * Function to initialize the state of the Keccak[r, c] sponge function. + * The phase of the sponge function is set to absorbing. + * @param spongeInstance Pointer to the sponge instance to be initialized. + * @param rate The value of the rate r. + * @param capacity The value of the capacity c. + * @pre One must have r+c equal to the supported width of this implementation + * and the rate a multiple of 8 bits (one byte) in this implementation. + * @return Zero if successful, 1 otherwise. + */ +int Prefix_SpongeInitialize(Prefix_SpongeInstance *spongeInstance, unsigned int rate, unsigned int capacity); + +/** + * Function to give input data bytes for the sponge function to absorb. + * @param spongeInstance Pointer to the sponge instance initialized by Prefix_SpongeInitialize(). + * @param data Pointer to the input data. + * @param dataByteLen The number of input bytes provided in the input data. + * @pre The sponge function must be in the absorbing phase, + * i.e., Prefix_SpongeSqueeze() or Prefix_SpongeAbsorbLastFewBits() + * must not have been called before. + * @return Zero if successful, 1 otherwise. + */ +int Prefix_SpongeAbsorb(Prefix_SpongeInstance *spongeInstance, const unsigned char *data, size_t dataByteLen); + +/** + * Function to give input data bits for the sponge function to absorb + * and then to switch to the squeezing phase. + * @param spongeInstance Pointer to the sponge instance initialized by Prefix_SpongeInitialize(). + * @param delimitedData Byte containing from 0 to 7 trailing bits + * that must be absorbed. + * These n bits must be in the least significant bit positions. + * These bits must be delimited with a bit 1 at position n + * (counting from 0=LSB to 7=MSB) and followed by bits 0 + * from position n+1 to position 7. + * Some examples: + * - If no bits are to be absorbed, then @a delimitedData must be 0x01. + * - If the 2-bit sequence 0,0 is to be absorbed, @a delimitedData must be 0x04. + * - If the 5-bit sequence 0,1,0,0,1 is to be absorbed, @a delimitedData must be 0x32. + * - If the 7-bit sequence 1,1,0,1,0,0,0 is to be absorbed, @a delimitedData must be 0x8B. + * . + * @pre The sponge function must be in the absorbing phase, + * i.e., Prefix_SpongeSqueeze() or Prefix_SpongeAbsorbLastFewBits() + * must not have been called before. + * @pre @a delimitedData ≠ 0x00 + * @return Zero if successful, 1 otherwise. + */ +int Prefix_SpongeAbsorbLastFewBits(Prefix_SpongeInstance *spongeInstance, unsigned char delimitedData); + +/** + * Function to squeeze output data from the sponge function. + * If the sponge function was in the absorbing phase, this function + * switches it to the squeezing phase + * as if Prefix_SpongeAbsorbLastFewBits(spongeInstance, 0x01) was called. + * @param spongeInstance Pointer to the sponge instance initialized by Prefix_SpongeInitialize(). + * @param data Pointer to the buffer where to store the output data. + * @param dataByteLen The number of output bytes desired. + * @return Zero if successful, 1 otherwise. + */ +int Prefix_SpongeSqueeze(Prefix_SpongeInstance *spongeInstance, unsigned char *data, size_t dataByteLen); +#endif + +#include +#include "align.h" + +#define KCP_DeclareSpongeStructure(prefix, size, alignment) \ + ALIGN(alignment) typedef struct prefix##_SpongeInstanceStruct { \ + unsigned char state[size]; \ + unsigned int rate; \ + unsigned int byteIOIndex; \ + int squeezing; \ + } prefix##_SpongeInstance; + +#define KCP_DeclareSpongeFunctions(prefix) \ + int prefix##_Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char suffix, unsigned char *output, size_t outputByteLen); \ + int prefix##_SpongeInitialize(prefix##_SpongeInstance *spongeInstance, unsigned int rate, unsigned int capacity); \ + int prefix##_SpongeAbsorb(prefix##_SpongeInstance *spongeInstance, const unsigned char *data, size_t dataByteLen); \ + int prefix##_SpongeAbsorbLastFewBits(prefix##_SpongeInstance *spongeInstance, unsigned char delimitedData); \ + int prefix##_SpongeSqueeze(prefix##_SpongeInstance *spongeInstance, unsigned char *data, size_t dataByteLen); + +#ifndef KeccakP200_excluded + #include "KeccakP-200-SnP.h" + KCP_DeclareSpongeStructure(KeccakWidth200, KeccakP200_stateSizeInBytes, KeccakP200_stateAlignment) + KCP_DeclareSpongeFunctions(KeccakWidth200) +#endif + +#ifndef KeccakP400_excluded + #include "KeccakP-400-SnP.h" + KCP_DeclareSpongeStructure(KeccakWidth400, KeccakP400_stateSizeInBytes, KeccakP400_stateAlignment) + KCP_DeclareSpongeFunctions(KeccakWidth400) +#endif + +#ifndef KeccakP800_excluded + #include "KeccakP-800-SnP.h" + KCP_DeclareSpongeStructure(KeccakWidth800, KeccakP800_stateSizeInBytes, KeccakP800_stateAlignment) + KCP_DeclareSpongeFunctions(KeccakWidth800) +#endif + +#ifndef KeccakP1600_excluded + #include "KeccakP-1600-SnP.h" + KCP_DeclareSpongeStructure(KeccakWidth1600, KeccakP1600_stateSizeInBytes, KeccakP1600_stateAlignment) + KCP_DeclareSpongeFunctions(KeccakWidth1600) +#endif + +#endif diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc new file mode 100644 index 0000000..e10739d --- /dev/null +++ b/Modules/_sha3/kcp/KeccakSponge.inc @@ -0,0 +1,332 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#define JOIN0(a, b) a ## b +#define JOIN(a, b) JOIN0(a, b) + +#define Sponge JOIN(prefix, _Sponge) +#define SpongeInstance JOIN(prefix, _SpongeInstance) +#define SpongeInitialize JOIN(prefix, _SpongeInitialize) +#define SpongeAbsorb JOIN(prefix, _SpongeAbsorb) +#define SpongeAbsorbLastFewBits JOIN(prefix, _SpongeAbsorbLastFewBits) +#define SpongeSqueeze JOIN(prefix, _SpongeSqueeze) + +#define SnP_stateSizeInBytes JOIN(SnP, _stateSizeInBytes) +#define SnP_stateAlignment JOIN(SnP, _stateAlignment) +#define SnP_StaticInitialize JOIN(SnP, _StaticInitialize) +#define SnP_Initialize JOIN(SnP, _Initialize) +#define SnP_AddByte JOIN(SnP, _AddByte) +#define SnP_AddBytes JOIN(SnP, _AddBytes) +#define SnP_ExtractBytes JOIN(SnP, _ExtractBytes) + +int Sponge(unsigned int rate, unsigned int capacity, const unsigned char *input, size_t inputByteLen, unsigned char suffix, unsigned char *output, size_t outputByteLen) +{ + ALIGN(SnP_stateAlignment) unsigned char state[SnP_stateSizeInBytes]; + unsigned int partialBlock; + const unsigned char *curInput = input; + unsigned char *curOutput = output; + unsigned int rateInBytes = rate/8; + + if (rate+capacity != SnP_width) + return 1; + if ((rate <= 0) || (rate > SnP_width) || ((rate % 8) != 0)) + return 1; + if (suffix == 0) + return 1; + + /* Initialize the state */ + + SnP_StaticInitialize(); + SnP_Initialize(state); + + /* First, absorb whole blocks */ + +#ifdef SnP_FastLoop_Absorb + if (((rateInBytes % (SnP_width/200)) == 0) && (inputByteLen >= rateInBytes)) { + /* fast lane: whole lane rate */ + + size_t j; + j = SnP_FastLoop_Absorb(state, rateInBytes/(SnP_width/200), curInput, inputByteLen); + curInput += j; + inputByteLen -= j; + } +#endif + while(inputByteLen >= (size_t)rateInBytes) { + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed", curInput, rateInBytes); + #endif + SnP_AddBytes(state, curInput, 0, rateInBytes); + SnP_Permute(state); + curInput += rateInBytes; + inputByteLen -= rateInBytes; + } + + /* Then, absorb what remains */ + + partialBlock = (unsigned int)inputByteLen; + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed (part)", curInput, partialBlock); + #endif + SnP_AddBytes(state, curInput, 0, partialBlock); + + /* Finally, absorb the suffix */ + + #ifdef KeccakReference + { + unsigned char delimitedData1[1]; + delimitedData1[0] = suffix; + displayBytes(1, "Block to be absorbed (last few bits + first bit of padding)", delimitedData1, 1); + } + #endif + /* Last few bits, whose delimiter coincides with first bit of padding */ + + SnP_AddByte(state, suffix, partialBlock); + /* If the first bit of padding is at position rate-1, we need a whole new block for the second bit of padding */ + + if ((suffix >= 0x80) && (partialBlock == (rateInBytes-1))) + SnP_Permute(state); + /* Second bit of padding */ + + SnP_AddByte(state, 0x80, rateInBytes-1); + #ifdef KeccakReference + { + unsigned char block[SnP_width/8]; + memset(block, 0, SnP_width/8); + block[rateInBytes-1] = 0x80; + displayBytes(1, "Second bit of padding", block, rateInBytes); + } + #endif + SnP_Permute(state); + #ifdef KeccakReference + displayText(1, "--- Switching to squeezing phase ---"); + #endif + + /* First, output whole blocks */ + + while(outputByteLen > (size_t)rateInBytes) { + SnP_ExtractBytes(state, curOutput, 0, rateInBytes); + SnP_Permute(state); + #ifdef KeccakReference + displayBytes(1, "Squeezed block", curOutput, rateInBytes); + #endif + curOutput += rateInBytes; + outputByteLen -= rateInBytes; + } + + /* Finally, output what remains */ + + partialBlock = (unsigned int)outputByteLen; + SnP_ExtractBytes(state, curOutput, 0, partialBlock); + #ifdef KeccakReference + displayBytes(1, "Squeezed block (part)", curOutput, partialBlock); + #endif + + return 0; +} + +/* ---------------------------------------------------------------- */ +/* ---------------------------------------------------------------- */ +/* ---------------------------------------------------------------- */ + +int SpongeInitialize(SpongeInstance *instance, unsigned int rate, unsigned int capacity) +{ + if (rate+capacity != SnP_width) + return 1; + if ((rate <= 0) || (rate > SnP_width) || ((rate % 8) != 0)) + return 1; + SnP_StaticInitialize(); + SnP_Initialize(instance->state); + instance->rate = rate; + instance->byteIOIndex = 0; + instance->squeezing = 0; + + return 0; +} + +/* ---------------------------------------------------------------- */ + +int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dataByteLen) +{ + size_t i, j; + unsigned int partialBlock; + const unsigned char *curData; + unsigned int rateInBytes = instance->rate/8; + + if (instance->squeezing) + return 1; /* Too late for additional input */ + + + i = 0; + curData = data; + while(i < dataByteLen) { + if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { +#ifdef SnP_FastLoop_Absorb + /* processing full blocks first */ + + if ((rateInBytes % (SnP_width/200)) == 0) { + /* fast lane: whole lane rate */ + + j = SnP_FastLoop_Absorb(instance->state, rateInBytes/(SnP_width/200), curData, dataByteLen - i); + i += j; + curData += j; + } + else { +#endif + for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed", curData, rateInBytes); + #endif + SnP_AddBytes(instance->state, curData, 0, rateInBytes); + SnP_Permute(instance->state); + curData+=rateInBytes; + } + i = dataByteLen - j; +#ifdef SnP_FastLoop_Absorb + } +#endif + } + else { + /* normal lane: using the message queue */ + + partialBlock = (unsigned int)(dataByteLen - i); + if (partialBlock+instance->byteIOIndex > rateInBytes) + partialBlock = rateInBytes-instance->byteIOIndex; + #ifdef KeccakReference + displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); + #endif + i += partialBlock; + + SnP_AddBytes(instance->state, curData, instance->byteIOIndex, partialBlock); + curData += partialBlock; + instance->byteIOIndex += partialBlock; + if (instance->byteIOIndex == rateInBytes) { + SnP_Permute(instance->state); + instance->byteIOIndex = 0; + } + } + } + return 0; +} + +/* ---------------------------------------------------------------- */ + +int SpongeAbsorbLastFewBits(SpongeInstance *instance, unsigned char delimitedData) +{ + unsigned int rateInBytes = instance->rate/8; + + if (delimitedData == 0) + return 1; + if (instance->squeezing) + return 1; /* Too late for additional input */ + + + #ifdef KeccakReference + { + unsigned char delimitedData1[1]; + delimitedData1[0] = delimitedData; + displayBytes(1, "Block to be absorbed (last few bits + first bit of padding)", delimitedData1, 1); + } + #endif + /* Last few bits, whose delimiter coincides with first bit of padding */ + + SnP_AddByte(instance->state, delimitedData, instance->byteIOIndex); + /* If the first bit of padding is at position rate-1, we need a whole new block for the second bit of padding */ + + if ((delimitedData >= 0x80) && (instance->byteIOIndex == (rateInBytes-1))) + SnP_Permute(instance->state); + /* Second bit of padding */ + + SnP_AddByte(instance->state, 0x80, rateInBytes-1); + #ifdef KeccakReference + { + unsigned char block[SnP_width/8]; + memset(block, 0, SnP_width/8); + block[rateInBytes-1] = 0x80; + displayBytes(1, "Second bit of padding", block, rateInBytes); + } + #endif + SnP_Permute(instance->state); + instance->byteIOIndex = 0; + instance->squeezing = 1; + #ifdef KeccakReference + displayText(1, "--- Switching to squeezing phase ---"); + #endif + return 0; +} + +/* ---------------------------------------------------------------- */ + +int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByteLen) +{ + size_t i, j; + unsigned int partialBlock; + unsigned int rateInBytes = instance->rate/8; + unsigned char *curData; + + if (!instance->squeezing) + SpongeAbsorbLastFewBits(instance, 0x01); + + i = 0; + curData = data; + while(i < dataByteLen) { + if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { + for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { + SnP_Permute(instance->state); + SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); + #ifdef KeccakReference + displayBytes(1, "Squeezed block", curData, rateInBytes); + #endif + curData+=rateInBytes; + } + i = dataByteLen - j; + } + else { + /* normal lane: using the message queue */ + + if (instance->byteIOIndex == rateInBytes) { + SnP_Permute(instance->state); + instance->byteIOIndex = 0; + } + partialBlock = (unsigned int)(dataByteLen - i); + if (partialBlock+instance->byteIOIndex > rateInBytes) + partialBlock = rateInBytes-instance->byteIOIndex; + i += partialBlock; + + SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); + #ifdef KeccakReference + displayBytes(1, "Squeezed block (part)", curData, partialBlock); + #endif + curData += partialBlock; + instance->byteIOIndex += partialBlock; + } + } + return 0; +} + +/* ---------------------------------------------------------------- */ + +#undef Sponge +#undef SpongeInstance +#undef SpongeInitialize +#undef SpongeAbsorb +#undef SpongeAbsorbLastFewBits +#undef SpongeSqueeze +#undef SnP_stateSizeInBytes +#undef SnP_stateAlignment +#undef SnP_StaticInitialize +#undef SnP_Initialize +#undef SnP_AddByte +#undef SnP_AddBytes +#undef SnP_ExtractBytes diff --git a/Modules/_sha3/kcp/PlSnP-Fallback.inc b/Modules/_sha3/kcp/PlSnP-Fallback.inc new file mode 100644 index 0000000..3a9119a --- /dev/null +++ b/Modules/_sha3/kcp/PlSnP-Fallback.inc @@ -0,0 +1,257 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +/* expect PlSnP_baseParallelism, PlSnP_targetParallelism */ + +/* expect SnP_stateSizeInBytes, SnP_stateAlignment */ + +/* expect prefix */ + +/* expect SnP_* */ + + +#define JOIN0(a, b) a ## b +#define JOIN(a, b) JOIN0(a, b) + +#define PlSnP_StaticInitialize JOIN(prefix, _StaticInitialize) +#define PlSnP_InitializeAll JOIN(prefix, _InitializeAll) +#define PlSnP_AddByte JOIN(prefix, _AddByte) +#define PlSnP_AddBytes JOIN(prefix, _AddBytes) +#define PlSnP_AddLanesAll JOIN(prefix, _AddLanesAll) +#define PlSnP_OverwriteBytes JOIN(prefix, _OverwriteBytes) +#define PlSnP_OverwriteLanesAll JOIN(prefix, _OverwriteLanesAll) +#define PlSnP_OverwriteWithZeroes JOIN(prefix, _OverwriteWithZeroes) +#define PlSnP_ExtractBytes JOIN(prefix, _ExtractBytes) +#define PlSnP_ExtractLanesAll JOIN(prefix, _ExtractLanesAll) +#define PlSnP_ExtractAndAddBytes JOIN(prefix, _ExtractAndAddBytes) +#define PlSnP_ExtractAndAddLanesAll JOIN(prefix, _ExtractAndAddLanesAll) + +#if (PlSnP_baseParallelism == 1) + #define SnP_stateSizeInBytes JOIN(SnP, _stateSizeInBytes) + #define SnP_stateAlignment JOIN(SnP, _stateAlignment) +#else + #define SnP_stateSizeInBytes JOIN(SnP, _statesSizeInBytes) + #define SnP_stateAlignment JOIN(SnP, _statesAlignment) +#endif +#define PlSnP_factor ((PlSnP_targetParallelism)/(PlSnP_baseParallelism)) +#define SnP_stateOffset (((SnP_stateSizeInBytes+(SnP_stateAlignment-1))/SnP_stateAlignment)*SnP_stateAlignment) +#define stateWithIndex(i) ((unsigned char *)states+((i)*SnP_stateOffset)) + +#define SnP_StaticInitialize JOIN(SnP, _StaticInitialize) +#define SnP_Initialize JOIN(SnP, _Initialize) +#define SnP_InitializeAll JOIN(SnP, _InitializeAll) +#define SnP_AddByte JOIN(SnP, _AddByte) +#define SnP_AddBytes JOIN(SnP, _AddBytes) +#define SnP_AddLanesAll JOIN(SnP, _AddLanesAll) +#define SnP_OverwriteBytes JOIN(SnP, _OverwriteBytes) +#define SnP_OverwriteLanesAll JOIN(SnP, _OverwriteLanesAll) +#define SnP_OverwriteWithZeroes JOIN(SnP, _OverwriteWithZeroes) +#define SnP_ExtractBytes JOIN(SnP, _ExtractBytes) +#define SnP_ExtractLanesAll JOIN(SnP, _ExtractLanesAll) +#define SnP_ExtractAndAddBytes JOIN(SnP, _ExtractAndAddBytes) +#define SnP_ExtractAndAddLanesAll JOIN(SnP, _ExtractAndAddLanesAll) + +void PlSnP_StaticInitialize( void ) +{ + SnP_StaticInitialize(); +} + +void PlSnP_InitializeAll(void *states) +{ + unsigned int i; + + for(i=0; i 0) { \ + unsigned int _bytesInLane = SnP_laneLengthInBytes - _offsetInLane; \ + if (_bytesInLane > _sizeLeft) \ + _bytesInLane = _sizeLeft; \ + SnP_AddBytesInLane(state, _lanePosition, _curData, _offsetInLane, _bytesInLane); \ + _sizeLeft -= _bytesInLane; \ + _lanePosition++; \ + _offsetInLane = 0; \ + _curData += _bytesInLane; \ + } \ + } \ + } + +#define SnP_OverwriteBytes(state, data, offset, length, SnP_OverwriteLanes, SnP_OverwriteBytesInLane, SnP_laneLengthInBytes) \ + { \ + if ((offset) == 0) { \ + SnP_OverwriteLanes(state, data, (length)/SnP_laneLengthInBytes); \ + SnP_OverwriteBytesInLane(state, \ + (length)/SnP_laneLengthInBytes, \ + (data)+((length)/SnP_laneLengthInBytes)*SnP_laneLengthInBytes, \ + 0, \ + (length)%SnP_laneLengthInBytes); \ + } \ + else { \ + unsigned int _sizeLeft = (length); \ + unsigned int _lanePosition = (offset)/SnP_laneLengthInBytes; \ + unsigned int _offsetInLane = (offset)%SnP_laneLengthInBytes; \ + const unsigned char *_curData = (data); \ + while(_sizeLeft > 0) { \ + unsigned int _bytesInLane = SnP_laneLengthInBytes - _offsetInLane; \ + if (_bytesInLane > _sizeLeft) \ + _bytesInLane = _sizeLeft; \ + SnP_OverwriteBytesInLane(state, _lanePosition, _curData, _offsetInLane, _bytesInLane); \ + _sizeLeft -= _bytesInLane; \ + _lanePosition++; \ + _offsetInLane = 0; \ + _curData += _bytesInLane; \ + } \ + } \ + } + +#define SnP_ExtractBytes(state, data, offset, length, SnP_ExtractLanes, SnP_ExtractBytesInLane, SnP_laneLengthInBytes) \ + { \ + if ((offset) == 0) { \ + SnP_ExtractLanes(state, data, (length)/SnP_laneLengthInBytes); \ + SnP_ExtractBytesInLane(state, \ + (length)/SnP_laneLengthInBytes, \ + (data)+((length)/SnP_laneLengthInBytes)*SnP_laneLengthInBytes, \ + 0, \ + (length)%SnP_laneLengthInBytes); \ + } \ + else { \ + unsigned int _sizeLeft = (length); \ + unsigned int _lanePosition = (offset)/SnP_laneLengthInBytes; \ + unsigned int _offsetInLane = (offset)%SnP_laneLengthInBytes; \ + unsigned char *_curData = (data); \ + while(_sizeLeft > 0) { \ + unsigned int _bytesInLane = SnP_laneLengthInBytes - _offsetInLane; \ + if (_bytesInLane > _sizeLeft) \ + _bytesInLane = _sizeLeft; \ + SnP_ExtractBytesInLane(state, _lanePosition, _curData, _offsetInLane, _bytesInLane); \ + _sizeLeft -= _bytesInLane; \ + _lanePosition++; \ + _offsetInLane = 0; \ + _curData += _bytesInLane; \ + } \ + } \ + } + +#define SnP_ExtractAndAddBytes(state, input, output, offset, length, SnP_ExtractAndAddLanes, SnP_ExtractAndAddBytesInLane, SnP_laneLengthInBytes) \ + { \ + if ((offset) == 0) { \ + SnP_ExtractAndAddLanes(state, input, output, (length)/SnP_laneLengthInBytes); \ + SnP_ExtractAndAddBytesInLane(state, \ + (length)/SnP_laneLengthInBytes, \ + (input)+((length)/SnP_laneLengthInBytes)*SnP_laneLengthInBytes, \ + (output)+((length)/SnP_laneLengthInBytes)*SnP_laneLengthInBytes, \ + 0, \ + (length)%SnP_laneLengthInBytes); \ + } \ + else { \ + unsigned int _sizeLeft = (length); \ + unsigned int _lanePosition = (offset)/SnP_laneLengthInBytes; \ + unsigned int _offsetInLane = (offset)%SnP_laneLengthInBytes; \ + const unsigned char *_curInput = (input); \ + unsigned char *_curOutput = (output); \ + while(_sizeLeft > 0) { \ + unsigned int _bytesInLane = SnP_laneLengthInBytes - _offsetInLane; \ + if (_bytesInLane > _sizeLeft) \ + _bytesInLane = _sizeLeft; \ + SnP_ExtractAndAddBytesInLane(state, _lanePosition, _curInput, _curOutput, _offsetInLane, _bytesInLane); \ + _sizeLeft -= _bytesInLane; \ + _lanePosition++; \ + _offsetInLane = 0; \ + _curInput += _bytesInLane; \ + _curOutput += _bytesInLane; \ + } \ + } \ + } + +#endif diff --git a/Modules/_sha3/kcp/align.h b/Modules/_sha3/kcp/align.h new file mode 100644 index 0000000..6650fe8 --- /dev/null +++ b/Modules/_sha3/kcp/align.h @@ -0,0 +1,35 @@ +/* +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". + +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ + +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/ +*/ + +#ifndef _align_h_ +#define _align_h_ + +/* on Mac OS-X and possibly others, ALIGN(x) is defined in param.h, and -Werror chokes on the redef. */ + +#ifdef ALIGN +#undef ALIGN +#endif + +#if defined(__GNUC__) +#define ALIGN(x) __attribute__ ((aligned(x))) +#elif defined(_MSC_VER) +#define ALIGN(x) __declspec(align(x)) +#elif defined(__ARMCC_VERSION) +#define ALIGN(x) __align(x) +#else +#define ALIGN(x) +#endif + +#endif diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c new file mode 100644 index 0000000..11aaa1f --- /dev/null +++ b/Modules/_sha3/sha3module.c @@ -0,0 +1,757 @@ +/* SHA3 module + * + * This module provides an interface to the SHA3 algorithm + * + * See below for information about the original code this module was + * based upon. Additional work performed by: + * + * Andrew Kuchling (amk@amk.ca) + * Greg Stein (gstein@lyra.org) + * Trevor Perrin (trevp@trevp.net) + * Gregory P. Smith (greg@krypto.org) + * + * Copyright (C) 2012-2016 Christian Heimes (christian@python.org) + * Licensed to PSF under a Contributor Agreement. + * + */ + +#include "Python.h" +#include "pystrhex.h" +#include "../hashlib.h" + +/* ************************************************************************** + * SHA-3 (Keccak) and SHAKE + * + * The code is based on KeccakCodePackage from 2016-04-23 + * commit 647f93079afc4ada3d23737477a6e52511ca41fd + * + * The reference implementation is altered in this points: + * - C++ comments are converted to ANSI C comments. + * - all function names are mangled + * - typedef for UINT64 is commented out. + * - brg_endian.h is removed + * + * *************************************************************************/ + +#ifdef __sparc + /* opt64 uses un-aligned memory access that causes a BUS error with msg + * 'invalid address alignment' on SPARC. */ + #define KeccakOpt 32 +#elif PY_BIG_ENDIAN + /* opt64 is not yet supported on big endian platforms */ + #define KeccakOpt 32 +#elif SIZEOF_VOID_P == 8 && defined(PY_UINT64_T) + /* opt64 works only on little-endian 64bit platforms with unsigned int64 */ + #define KeccakOpt 64 +#else + /* opt32 is used for the remaining 32 and 64bit platforms */ + #define KeccakOpt 32 +#endif + +#if KeccakOpt == 64 && defined(PY_UINT64_T) + /* 64bit platforms with unsigned int64 */ + typedef PY_UINT64_T UINT64; + typedef unsigned char UINT8; +#endif + +/* replacement for brg_endian.h */ +#define IS_LITTLE_ENDIAN 1234 +#define IS_BIG_ENDIAN 4321 +#if PY_LITTLE_ENDIAN +#define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN +#endif +#if PY_BIG_ENDIAN +#define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN +#endif + +/* mangle names */ +#define KeccakF1600_FastLoop_Absorb _PySHA3_KeccakF1600_FastLoop_Absorb +#define Keccak_HashFinal _PySHA3_Keccak_HashFinal +#define Keccak_HashInitialize _PySHA3_Keccak_HashInitialize +#define Keccak_HashSqueeze _PySHA3_Keccak_HashSqueeze +#define Keccak_HashUpdate _PySHA3_Keccak_HashUpdate +#define KeccakP1600_AddBytes _PySHA3_KeccakP1600_AddBytes +#define KeccakP1600_AddBytesInLane _PySHA3_KeccakP1600_AddBytesInLane +#define KeccakP1600_AddLanes _PySHA3_KeccakP1600_AddLanes +#define KeccakP1600_ExtractAndAddBytes _PySHA3_KeccakP1600_ExtractAndAddBytes +#define KeccakP1600_ExtractAndAddBytesInLane _PySHA3_KeccakP1600_ExtractAndAddBytesInLane +#define KeccakP1600_ExtractAndAddLanes _PySHA3_KeccakP1600_ExtractAndAddLanes +#define KeccakP1600_ExtractBytes _PySHA3_KeccakP1600_ExtractBytes +#define KeccakP1600_ExtractBytesInLane _PySHA3_KeccakP1600_ExtractBytesInLane +#define KeccakP1600_ExtractLanes _PySHA3_KeccakP1600_ExtractLanes +#define KeccakP1600_Initialize _PySHA3_KeccakP1600_Initialize +#define KeccakP1600_OverwriteBytes _PySHA3_KeccakP1600_OverwriteBytes +#define KeccakP1600_OverwriteBytesInLane _PySHA3_KeccakP1600_OverwriteBytesInLane +#define KeccakP1600_OverwriteLanes _PySHA3_KeccakP1600_OverwriteLanes +#define KeccakP1600_OverwriteWithZeroes _PySHA3_KeccakP1600_OverwriteWithZeroes +#define KeccakP1600_Permute_12rounds _PySHA3_KeccakP1600_Permute_12rounds +#define KeccakP1600_Permute_24rounds _PySHA3_KeccakP1600_Permute_24rounds +#define KeccakWidth1600_Sponge _PySHA3_KeccakWidth1600_Sponge +#define KeccakWidth1600_SpongeAbsorb _PySHA3_KeccakWidth1600_SpongeAbsorb +#define KeccakWidth1600_SpongeAbsorbLastFewBits _PySHA3_KeccakWidth1600_SpongeAbsorbLastFewBits +#define KeccakWidth1600_SpongeInitialize _PySHA3_KeccakWidth1600_SpongeInitialize +#define KeccakWidth1600_SpongeSqueeze _PySHA3_KeccakWidth1600_SpongeSqueeze +#if KeccakOpt == 32 +#define KeccakP1600_AddByte _PySHA3_KeccakP1600_AddByte +#define KeccakP1600_Permute_Nrounds _PySHA3_KeccakP1600_Permute_Nrounds +#define KeccakP1600_SetBytesInLaneToZero _PySHA3_KeccakP1600_SetBytesInLaneToZero +#endif + +/* we are only interested in KeccakP1600 */ +#define KeccakP200_excluded 1 +#define KeccakP400_excluded 1 +#define KeccakP800_excluded 1 + +/* inline all Keccak dependencies */ +#include "kcp/KeccakHash.h" +#include "kcp/KeccakSponge.h" +#include "kcp/KeccakHash.c" +#include "kcp/KeccakSponge.c" +#if KeccakOpt == 64 + #include "kcp/KeccakP-1600-opt64.c" +#elif KeccakOpt == 32 + #include "kcp/KeccakP-1600-inplace32BI.c" +#endif + +#define SHA3_MAX_DIGESTSIZE 64 /* 64 Bytes (512 Bits) for 224 to 512 */ +#define SHA3_LANESIZE (20 * 8) /* ExtractLane needs max uint64_t[20] extra. */ +#define SHA3_state Keccak_HashInstance +#define SHA3_init Keccak_HashInitialize +#define SHA3_process Keccak_HashUpdate +#define SHA3_done Keccak_HashFinal +#define SHA3_squeeze Keccak_HashSqueeze +#define SHA3_copystate(dest, src) memcpy(&(dest), &(src), sizeof(SHA3_state)) + + +/*[clinic input] +module _sha3 +class _sha3.sha3_224 "SHA3object *" "&SHA3_224typ" +class _sha3.sha3_256 "SHA3object *" "&SHA3_256typ" +class _sha3.sha3_384 "SHA3object *" "&SHA3_384typ" +class _sha3.sha3_512 "SHA3object *" "&SHA3_512typ" +class _sha3.shake_128 "SHA3object *" "&SHAKE128type" +class _sha3.shake_256 "SHA3object *" "&SHAKE256type" +[clinic start generated code]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b8a53680f370285a]*/ + +/* The structure for storing SHA3 info */ + +typedef struct { + PyObject_HEAD + SHA3_state hash_state; +#ifdef WITH_THREAD + PyThread_type_lock lock; +#endif +} SHA3object; + +static PyTypeObject SHA3_224type; +static PyTypeObject SHA3_256type; +static PyTypeObject SHA3_384type; +static PyTypeObject SHA3_512type; +#ifdef PY_WITH_KECCAK +static PyTypeObject Keccak_224type; +static PyTypeObject Keccak_256type; +static PyTypeObject Keccak_384type; +static PyTypeObject Keccak_512type; +#endif +static PyTypeObject SHAKE128type; +static PyTypeObject SHAKE256type; + +#include "clinic/sha3module.c.h" + +static SHA3object * +newSHA3object(PyTypeObject *type) +{ + SHA3object *newobj; + newobj = (SHA3object *)PyObject_New(SHA3object, type); + if (newobj == NULL) { + return NULL; + } +#ifdef WITH_THREAD + newobj->lock = NULL; +#endif + return newobj; +} + + +/*[clinic input] +@classmethod +_sha3.sha3_224.__new__ as py_sha3_new + string as data: object = NULL + +Return a new SHA3 hash object with a hashbit length of 28 bytes. +[clinic start generated code]*/ + +static PyObject * +py_sha3_new_impl(PyTypeObject *type, PyObject *data) +/*[clinic end generated code: output=8d5c34279e69bf09 input=d7c582b950a858b6]*/ +{ + SHA3object *self = NULL; + Py_buffer buf = {NULL, NULL}; + HashReturn res; + + self = newSHA3object(type); + if (self == NULL) { + goto error; + } + + if (type == &SHA3_224type) { + res = Keccak_HashInitialize_SHA3_224(&self->hash_state); + } else if (type == &SHA3_256type) { + res = Keccak_HashInitialize_SHA3_256(&self->hash_state); + } else if (type == &SHA3_384type) { + res = Keccak_HashInitialize_SHA3_384(&self->hash_state); + } else if (type == &SHA3_512type) { + res = Keccak_HashInitialize_SHA3_512(&self->hash_state); +#ifdef PY_WITH_KECCAK + } else if (type == &Keccak_224type) { + res = Keccak_HashInitialize(&self->hash_state, 1152, 448, 224, 0x01); + } else if (type == &Keccak_256type) { + res = Keccak_HashInitialize(&self->hash_state, 1088, 512, 256, 0x01); + } else if (type == &Keccak_384type) { + res = Keccak_HashInitialize(&self->hash_state, 832, 768, 384, 0x01); + } else if (type == &Keccak_512type) { + res = Keccak_HashInitialize(&self->hash_state, 576, 1024, 512, 0x01); +#endif + } else if (type == &SHAKE128type) { + res = Keccak_HashInitialize_SHAKE128(&self->hash_state); + } else if (type == &SHAKE256type) { + res = Keccak_HashInitialize_SHAKE256(&self->hash_state); + } else { + PyErr_BadInternalCall(); + goto error; + } + + if (data) { + GET_BUFFER_VIEW_OR_ERROR(data, &buf, goto error); +#ifdef WITH_THREAD + if (buf.len >= HASHLIB_GIL_MINSIZE) { + /* invariant: New objects can't be accessed by other code yet, + * thus it's safe to release the GIL without locking the object. + */ + Py_BEGIN_ALLOW_THREADS + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + Py_END_ALLOW_THREADS + } + else { + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + } +#else + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); +#endif + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, + "internal error in SHA3 Update()"); + goto error; + } + PyBuffer_Release(&buf); + } + + return (PyObject *)self; + + error: + if (self) { + Py_DECREF(self); + } + if (data && buf.obj) { + PyBuffer_Release(&buf); + } + return NULL; +} + + +/* Internal methods for a hash object */ + +static void +SHA3_dealloc(SHA3object *self) +{ +#ifdef WITH_THREAD + if (self->lock) { + PyThread_free_lock(self->lock); + } +#endif + PyObject_Del(self); +} + + +/* External methods for a hash object */ + + +/*[clinic input] +_sha3.sha3_224.copy + +Return a copy of the hash object. +[clinic start generated code]*/ + +static PyObject * +_sha3_sha3_224_copy_impl(SHA3object *self) +/*[clinic end generated code: output=6c537411ecdcda4c input=93a44aaebea51ba8]*/ +{ + SHA3object *newobj; + + if ((newobj = newSHA3object(Py_TYPE(self))) == NULL) { + return NULL; + } + ENTER_HASHLIB(self); + SHA3_copystate(newobj->hash_state, self->hash_state); + LEAVE_HASHLIB(self); + return (PyObject *)newobj; +} + + +/*[clinic input] +_sha3.sha3_224.digest + +Return the digest value as a string of binary data. +[clinic start generated code]*/ + +static PyObject * +_sha3_sha3_224_digest_impl(SHA3object *self) +/*[clinic end generated code: output=fd531842e20b2d5b input=a5807917d219b30e]*/ +{ + unsigned char digest[SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE]; + SHA3_state temp; + HashReturn res; + + ENTER_HASHLIB(self); + SHA3_copystate(temp, self->hash_state); + LEAVE_HASHLIB(self); + res = SHA3_done(&temp, digest); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 Final()"); + return NULL; + } + return PyBytes_FromStringAndSize((const char *)digest, + self->hash_state.fixedOutputLength / 8); +} + + +/*[clinic input] +_sha3.sha3_224.hexdigest + +Return the digest value as a string of hexadecimal digits. +[clinic start generated code]*/ + +static PyObject * +_sha3_sha3_224_hexdigest_impl(SHA3object *self) +/*[clinic end generated code: output=75ad03257906918d input=2d91bb6e0d114ee3]*/ +{ + unsigned char digest[SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE]; + SHA3_state temp; + HashReturn res; + + /* Get the raw (binary) digest value */ + ENTER_HASHLIB(self); + SHA3_copystate(temp, self->hash_state); + LEAVE_HASHLIB(self); + res = SHA3_done(&temp, digest); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 Final()"); + return NULL; + } + return _Py_strhex((const char *)digest, + self->hash_state.fixedOutputLength / 8); +} + + +/*[clinic input] +_sha3.sha3_224.update + + obj: object + / + +Update this hash object's state with the provided string. +[clinic start generated code]*/ + +static PyObject * +_sha3_sha3_224_update(SHA3object *self, PyObject *obj) +/*[clinic end generated code: output=06721d55b483e0af input=be44bf0d1c279791]*/ +{ + Py_buffer buf; + HashReturn res; + + GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); + + /* add new data, the function takes the length in bits not bytes */ +#ifdef WITH_THREAD + if (self->lock == NULL && buf.len >= HASHLIB_GIL_MINSIZE) { + self->lock = PyThread_allocate_lock(); + } + /* Once a lock exists all code paths must be synchronized. We have to + * release the GIL even for small buffers as acquiring the lock may take + * an unlimited amount of time when another thread updates this object + * with lots of data. */ + if (self->lock) { + Py_BEGIN_ALLOW_THREADS + PyThread_acquire_lock(self->lock, 1); + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + PyThread_release_lock(self->lock); + Py_END_ALLOW_THREADS + } + else { + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); + } +#else + res = SHA3_process(&self->hash_state, buf.buf, buf.len * 8); +#endif + + if (res != SUCCESS) { + PyBuffer_Release(&buf); + PyErr_SetString(PyExc_RuntimeError, + "internal error in SHA3 Update()"); + return NULL; + } + + PyBuffer_Release(&buf); + Py_INCREF(Py_None); + return Py_None; +} + + +static PyMethodDef SHA3_methods[] = { + _SHA3_SHA3_224_COPY_METHODDEF + _SHA3_SHA3_224_DIGEST_METHODDEF + _SHA3_SHA3_224_HEXDIGEST_METHODDEF + _SHA3_SHA3_224_UPDATE_METHODDEF + {NULL, NULL} /* sentinel */ +}; + + +static PyObject * +SHA3_get_block_size(SHA3object *self, void *closure) +{ + int rate = self->hash_state.sponge.rate; + return PyLong_FromLong(rate / 8); +} + + +static PyObject * +SHA3_get_name(SHA3object *self, void *closure) +{ + PyTypeObject *type = Py_TYPE(self); + if (type == &SHA3_224type) { + return PyUnicode_FromString("sha3_224"); + } else if (type == &SHA3_256type) { + return PyUnicode_FromString("sha3_256"); + } else if (type == &SHA3_384type) { + return PyUnicode_FromString("sha3_384"); + } else if (type == &SHA3_512type) { + return PyUnicode_FromString("sha3_512"); +#ifdef PY_WITH_KECCAK + } else if (type == &Keccak_224type) { + return PyUnicode_FromString("keccak_224"); + } else if (type == &Keccak_256type) { + return PyUnicode_FromString("keccak_256"); + } else if (type == &Keccak_384type) { + return PyUnicode_FromString("keccak_384"); + } else if (type == &Keccak_512type) { + return PyUnicode_FromString("keccak_512"); +#endif + } else if (type == &SHAKE128type) { + return PyUnicode_FromString("shake_128"); + } else if (type == &SHAKE256type) { + return PyUnicode_FromString("shake_256"); + } else { + PyErr_BadInternalCall(); + return NULL; + } +} + + +static PyObject * +SHA3_get_digest_size(SHA3object *self, void *closure) +{ + return PyLong_FromLong(self->hash_state.fixedOutputLength / 8); +} + + +static PyObject * +SHA3_get_capacity_bits(SHA3object *self, void *closure) +{ + int capacity = 1600 - self->hash_state.sponge.rate; + return PyLong_FromLong(capacity); +} + + +static PyObject * +SHA3_get_rate_bits(SHA3object *self, void *closure) +{ + unsigned int rate = self->hash_state.sponge.rate; + return PyLong_FromLong(rate); +} + +static PyObject * +SHA3_get_suffix(SHA3object *self, void *closure) +{ + unsigned char suffix[2]; + suffix[0] = self->hash_state.delimitedSuffix; + suffix[1] = 0; + return PyBytes_FromStringAndSize((const char *)suffix, 1); +} + + +static PyGetSetDef SHA3_getseters[] = { + {"block_size", (getter)SHA3_get_block_size, NULL, NULL, NULL}, + {"name", (getter)SHA3_get_name, NULL, NULL, NULL}, + {"digest_size", (getter)SHA3_get_digest_size, NULL, NULL, NULL}, + {"_capacity_bits", (getter)SHA3_get_capacity_bits, NULL, NULL, NULL}, + {"_rate_bits", (getter)SHA3_get_rate_bits, NULL, NULL, NULL}, + {"_suffix", (getter)SHA3_get_suffix, NULL, NULL, NULL}, + {NULL} /* Sentinel */ +}; + + +#define SHA3_TYPE(type_obj, type_name, type_doc, type_methods) \ + static PyTypeObject type_obj = { \ + PyVarObject_HEAD_INIT(NULL, 0) \ + type_name, /* tp_name */ \ + sizeof(SHA3object), /* tp_size */ \ + 0, /* tp_itemsize */ \ + /* methods */ \ + (destructor)SHA3_dealloc, /* tp_dealloc */ \ + 0, /* tp_print */ \ + 0, /* tp_getattr */ \ + 0, /* tp_setattr */ \ + 0, /* tp_reserved */ \ + 0, /* tp_repr */ \ + 0, /* tp_as_number */ \ + 0, /* tp_as_sequence */ \ + 0, /* tp_as_mapping */ \ + 0, /* tp_hash */ \ + 0, /* tp_call */ \ + 0, /* tp_str */ \ + 0, /* tp_getattro */ \ + 0, /* tp_setattro */ \ + 0, /* tp_as_buffer */ \ + Py_TPFLAGS_DEFAULT, /* tp_flags */ \ + type_doc, /* tp_doc */ \ + 0, /* tp_traverse */ \ + 0, /* tp_clear */ \ + 0, /* tp_richcompare */ \ + 0, /* tp_weaklistoffset */ \ + 0, /* tp_iter */ \ + 0, /* tp_iternext */ \ + type_methods, /* tp_methods */ \ + NULL, /* tp_members */ \ + SHA3_getseters, /* tp_getset */ \ + 0, /* tp_base */ \ + 0, /* tp_dict */ \ + 0, /* tp_descr_get */ \ + 0, /* tp_descr_set */ \ + 0, /* tp_dictoffset */ \ + 0, /* tp_init */ \ + 0, /* tp_alloc */ \ + py_sha3_new, /* tp_new */ \ + } + +PyDoc_STRVAR(sha3_256__doc__, +"sha3_256([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 32 bytes."); + +PyDoc_STRVAR(sha3_384__doc__, +"sha3_384([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 48 bytes."); + +PyDoc_STRVAR(sha3_512__doc__, +"sha3_512([string]) -> SHA3 object\n\ +\n\ +Return a new SHA3 hash object with a hashbit length of 64 bytes."); + +SHA3_TYPE(SHA3_224type, "_sha3.sha3_224", py_sha3_new__doc__, SHA3_methods); +SHA3_TYPE(SHA3_256type, "_sha3.sha3_256", sha3_256__doc__, SHA3_methods); +SHA3_TYPE(SHA3_384type, "_sha3.sha3_384", sha3_384__doc__, SHA3_methods); +SHA3_TYPE(SHA3_512type, "_sha3.sha3_512", sha3_512__doc__, SHA3_methods); + +#ifdef PY_WITH_KECCAK +PyDoc_STRVAR(keccak_224__doc__, +"keccak_224([string]) -> Keccak object\n\ +\n\ +Return a new Keccak hash object with a hashbit length of 28 bytes."); + +PyDoc_STRVAR(keccak_256__doc__, +"keccak_256([string]) -> Keccak object\n\ +\n\ +Return a new Keccak hash object with a hashbit length of 32 bytes."); + +PyDoc_STRVAR(keccak_384__doc__, +"keccak_384([string]) -> Keccak object\n\ +\n\ +Return a new Keccak hash object with a hashbit length of 48 bytes."); + +PyDoc_STRVAR(keccak_512__doc__, +"keccak_512([string]) -> Keccak object\n\ +\n\ +Return a new Keccak hash object with a hashbit length of 64 bytes."); + +SHA3_TYPE(Keccak_224type, "_sha3.keccak_224", keccak_224__doc__, SHA3_methods); +SHA3_TYPE(Keccak_256type, "_sha3.keccak_256", keccak_256__doc__, SHA3_methods); +SHA3_TYPE(Keccak_384type, "_sha3.keccak_384", keccak_384__doc__, SHA3_methods); +SHA3_TYPE(Keccak_512type, "_sha3.keccak_512", keccak_512__doc__, SHA3_methods); +#endif + + +static PyObject * +_SHAKE_digest(SHA3object *self, unsigned long digestlen, int hex) +{ + unsigned char *digest = NULL; + SHA3_state temp; + int res; + PyObject *result = NULL; + + /* ExtractLane needs at least SHA3_MAX_DIGESTSIZE + SHA3_LANESIZE and + * SHA3_LANESIZE extra space. + */ + digest = (unsigned char*)PyMem_Malloc(digestlen + SHA3_LANESIZE); + if (digest == NULL) { + return PyErr_NoMemory(); + } + + /* Get the raw (binary) digest value */ + ENTER_HASHLIB(self); + SHA3_copystate(temp, self->hash_state); + LEAVE_HASHLIB(self); + res = SHA3_done(&temp, NULL); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 done()"); + goto error; + } + res = SHA3_squeeze(&temp, digest, digestlen * 8); + if (res != SUCCESS) { + PyErr_SetString(PyExc_RuntimeError, "internal error in SHA3 Squeeze()"); + return NULL; + } + if (hex) { + result = _Py_strhex((const char *)digest, digestlen); + } else { + result = PyBytes_FromStringAndSize((const char *)digest, + digestlen); + } + error: + if (digest != NULL) { + PyMem_Free(digest); + } + return result; +} + + +/*[clinic input] +_sha3.shake_128.digest + + length: unsigned_long(bitwise=True) + \ + +Return the digest value as a string of binary data. +[clinic start generated code]*/ + +static PyObject * +_sha3_shake_128_digest_impl(SHA3object *self, unsigned long length) +/*[clinic end generated code: output=2313605e2f87bb8f input=608c8ca80ae9d115]*/ +{ + return _SHAKE_digest(self, length, 0); +} + + +/*[clinic input] +_sha3.shake_128.hexdigest + + length: unsigned_long(bitwise=True) + \ + +Return the digest value as a string of hexadecimal digits. +[clinic start generated code]*/ + +static PyObject * +_sha3_shake_128_hexdigest_impl(SHA3object *self, unsigned long length) +/*[clinic end generated code: output=bf8e2f1e490944a8 input=64e56b4760db4573]*/ +{ + return _SHAKE_digest(self, length, 1); +} + + +static PyMethodDef SHAKE_methods[] = { + _SHA3_SHA3_224_COPY_METHODDEF + _SHA3_SHAKE_128_DIGEST_METHODDEF + _SHA3_SHAKE_128_HEXDIGEST_METHODDEF + _SHA3_SHA3_224_UPDATE_METHODDEF + {NULL, NULL} /* sentinel */ +}; + +PyDoc_STRVAR(shake_128__doc__, +"shake_128([string]) -> SHAKE object\n\ +\n\ +Return a new SHAKE hash object."); + +PyDoc_STRVAR(shake_256__doc__, +"shake_256([string]) -> SHAKE object\n\ +\n\ +Return a new SHAKE hash object."); + +SHA3_TYPE(SHAKE128type, "_sha3.shake_128", shake_128__doc__, SHAKE_methods); +SHA3_TYPE(SHAKE256type, "_sha3.shake_256", shake_256__doc__, SHAKE_methods); + + +/* Initialize this module. */ +static struct PyModuleDef _SHA3module = { + PyModuleDef_HEAD_INIT, + "_sha3", + NULL, + -1, + NULL, + NULL, + NULL, + NULL, + NULL +}; + + +PyMODINIT_FUNC +PyInit__sha3(void) +{ + PyObject *m = NULL; + + if ((m = PyModule_Create(&_SHA3module)) == NULL) { + return NULL; + } + +#define init_sha3type(name, type) \ + do { \ + Py_TYPE(type) = &PyType_Type; \ + if (PyType_Ready(type) < 0) { \ + goto error; \ + } \ + Py_INCREF((PyObject *)type); \ + if (PyModule_AddObject(m, name, (PyObject *)type) < 0) { \ + goto error; \ + } \ + } while(0) + + init_sha3type("sha3_224", &SHA3_224type); + init_sha3type("sha3_256", &SHA3_256type); + init_sha3type("sha3_384", &SHA3_384type); + init_sha3type("sha3_512", &SHA3_512type); +#ifdef PY_WITH_KECCAK + init_sha3type("keccak_224", &Keccak_224type); + init_sha3type("keccak_256", &Keccak_256type); + init_sha3type("keccak_384", &Keccak_384type); + init_sha3type("keccak_512", &Keccak_512type); +#endif + init_sha3type("shake_128", &SHAKE128type); + init_sha3type("shake_256", &SHAKE256type); + +#undef init_sha3type + + if (PyModule_AddIntConstant(m, "keccakopt", KeccakOpt) < 0) { + goto error; + } + if (PyModule_AddStringConstant(m, "implementation", + KeccakP1600_implementation) < 0) { + goto error; + } + + return m; + error: + Py_DECREF(m); + return NULL; +} diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c index 3689a4e..62c5893 100644 --- a/Modules/_sqlite/cache.c +++ b/Modules/_sqlite/cache.c @@ -244,8 +244,7 @@ PyObject* pysqlite_cache_display(pysqlite_Cache* self, PyObject* args) ptr = ptr->next; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyMethodDef cache_methods[] = { diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 70d0995..1c6aa54 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -165,7 +165,6 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject self->statement_cache->decref_factory = 0; Py_DECREF(self); - self->inTransaction = 0; self->detect_types = detect_types; self->timeout = timeout; (void)sqlite3_busy_timeout(self->db, (int)(timeout*1000)); @@ -202,26 +201,6 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject return 0; } -/* Empty the entire statement cache of this connection */ -void pysqlite_flush_statement_cache(pysqlite_Connection* self) -{ - pysqlite_Node* node; - pysqlite_Statement* statement; - - node = self->statement_cache->first; - - while (node) { - statement = (pysqlite_Statement*)(node->data); - (void)pysqlite_statement_finalize(statement); - node = node->next; - } - - Py_SETREF(self->statement_cache, - (pysqlite_Cache *)PyObject_CallFunction((PyObject *)&pysqlite_CacheType, "O", self)); - Py_DECREF(self); - self->statement_cache->decref_factory = 0; -} - /* action in (ACTION_RESET, ACTION_FINALIZE) */ void pysqlite_do_all_statements(pysqlite_Connection* self, int action, int reset_cursors) { @@ -366,8 +345,7 @@ PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args) } } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } /* @@ -406,9 +384,7 @@ PyObject* _pysqlite_connection_begin(pysqlite_Connection* self) } rc = pysqlite_step(statement, self); - if (rc == SQLITE_DONE) { - self->inTransaction = 1; - } else { + if (rc != SQLITE_DONE) { _pysqlite_seterror(self->db, statement); } @@ -439,7 +415,7 @@ PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args) return NULL; } - if (self->inTransaction) { + if (!sqlite3_get_autocommit(self->db)) { Py_BEGIN_ALLOW_THREADS rc = sqlite3_prepare(self->db, "COMMIT", -1, &statement, &tail); @@ -450,9 +426,7 @@ PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args) } rc = pysqlite_step(statement, self); - if (rc == SQLITE_DONE) { - self->inTransaction = 0; - } else { + if (rc != SQLITE_DONE) { _pysqlite_seterror(self->db, statement); } @@ -484,7 +458,7 @@ PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args return NULL; } - if (self->inTransaction) { + if (!sqlite3_get_autocommit(self->db)) { pysqlite_do_all_statements(self, ACTION_RESET, 1); Py_BEGIN_ALLOW_THREADS @@ -496,9 +470,7 @@ PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args } rc = pysqlite_step(statement, self); - if (rc == SQLITE_DONE) { - self->inTransaction = 0; - } else { + if (rc != SQLITE_DONE) { _pysqlite_seterror(self->db, statement); } @@ -533,7 +505,7 @@ _pysqlite_set_result(sqlite3_context* context, PyObject* py_val) } else if (PyFloat_Check(py_val)) { sqlite3_result_double(context, PyFloat_AsDouble(py_val)); } else if (PyUnicode_Check(py_val)) { - const char *str = _PyUnicode_AsString(py_val); + const char *str = PyUnicode_AsUTF8(py_val); if (str == NULL) return -1; sqlite3_result_text(context, str, -1, SQLITE_TRANSIENT); @@ -673,7 +645,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_ aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); if (*aggregate_instance == 0) { - *aggregate_instance = PyObject_CallFunction(aggregate_class, ""); + *aggregate_instance = PyObject_CallFunction(aggregate_class, NULL); if (PyErr_Occurred()) { *aggregate_instance = 0; @@ -745,7 +717,7 @@ void _pysqlite_final_callback(sqlite3_context* context) PyErr_Fetch(&exception, &value, &tb); restore = 1; - function_result = _PyObject_CallMethodId(*aggregate_instance, &PyId_finalize, ""); + function_result = _PyObject_CallMethodId(*aggregate_instance, &PyId_finalize, NULL); Py_DECREF(*aggregate_instance); @@ -874,8 +846,7 @@ PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObjec if (PyDict_SetItem(self->function_pinboard, func, Py_None) == -1) return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -906,8 +877,7 @@ PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObje if (PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None) == -1) return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -963,7 +933,7 @@ static int _progress_handler(void* user_arg) gilstate = PyGILState_Ensure(); #endif - ret = PyObject_CallFunction((PyObject*)user_arg, ""); + ret = PyObject_CallFunction((PyObject*)user_arg, NULL); if (!ret) { if (_enable_callback_tracebacks) { @@ -1042,8 +1012,7 @@ static PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, P if (PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None) == -1) return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -1072,8 +1041,7 @@ static PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* s return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* self, PyObject* args, PyObject* kwargs) @@ -1100,8 +1068,7 @@ static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* sel sqlite3_trace(self->db, _trace_callback, trace_callback); } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } #ifdef HAVE_LOAD_EXTENSION @@ -1124,8 +1091,7 @@ static PyObject* pysqlite_enable_load_extension(pysqlite_Connection* self, PyObj PyErr_SetString(pysqlite_OperationalError, "Error enabling load extension"); return NULL; } else { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -1148,8 +1114,7 @@ static PyObject* pysqlite_load_extension(pysqlite_Connection* self, PyObject* ar PyErr_SetString(pysqlite_OperationalError, errmsg); return NULL; } else { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } #endif @@ -1186,6 +1151,17 @@ static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self } } +static PyObject* pysqlite_connection_get_in_transaction(pysqlite_Connection* self, void* unused) +{ + if (!pysqlite_check_connection(self)) { + return NULL; + } + if (!sqlite3_get_autocommit(self->db)) { + Py_RETURN_TRUE; + } + Py_RETURN_FALSE; +} + static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level) { if (isolation_level == Py_None) { @@ -1196,7 +1172,6 @@ static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, Py Py_DECREF(res); self->begin_statement = NULL; - self->inTransaction = 0; } else { const char * const *candidate; PyObject *uppercase_level; @@ -1299,7 +1274,7 @@ PyObject* pysqlite_connection_execute(pysqlite_Connection* self, PyObject* args) PyObject* result = 0; PyObject* method = 0; - cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, ""); + cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL); if (!cursor) { goto error; } @@ -1328,7 +1303,7 @@ PyObject* pysqlite_connection_executemany(pysqlite_Connection* self, PyObject* a PyObject* result = 0; PyObject* method = 0; - cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, ""); + cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL); if (!cursor) { goto error; } @@ -1357,7 +1332,7 @@ PyObject* pysqlite_connection_executescript(pysqlite_Connection* self, PyObject* PyObject* result = 0; PyObject* method = 0; - cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, ""); + cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL); if (!cursor) { goto error; } @@ -1552,7 +1527,7 @@ pysqlite_connection_create_collation(pysqlite_Connection* self, PyObject* args) } } - uppercase_name_str = _PyUnicode_AsString(uppercase_name); + uppercase_name_str = PyUnicode_AsUTF8(uppercase_name); if (!uppercase_name_str) goto finally; @@ -1621,7 +1596,7 @@ pysqlite_connection_exit(pysqlite_Connection* self, PyObject* args) method_name = "rollback"; } - result = PyObject_CallMethod((PyObject*)self, method_name, ""); + result = PyObject_CallMethod((PyObject*)self, method_name, NULL); if (!result) { return NULL; } @@ -1630,12 +1605,13 @@ pysqlite_connection_exit(pysqlite_Connection* self, PyObject* args) Py_RETURN_FALSE; } -static char connection_doc[] = +static const char connection_doc[] = PyDoc_STR("SQLite database connection object."); static PyGetSetDef connection_getset[] = { {"isolation_level", (getter)pysqlite_connection_get_isolation_level, (setter)pysqlite_connection_set_isolation_level}, {"total_changes", (getter)pysqlite_connection_get_total_changes, (setter)0}, + {"in_transaction", (getter)pysqlite_connection_get_in_transaction, (setter)0}, {NULL} }; @@ -1697,7 +1673,6 @@ static struct PyMemberDef connection_members[] = {"NotSupportedError", T_OBJECT, offsetof(pysqlite_Connection, NotSupportedError), READONLY}, {"row_factory", T_OBJECT, offsetof(pysqlite_Connection, row_factory)}, {"text_factory", T_OBJECT, offsetof(pysqlite_Connection, text_factory)}, - {"in_transaction", T_BOOL, offsetof(pysqlite_Connection, inTransaction), READONLY}, {NULL} }; diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index adbfb54..2860a0c 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -37,10 +37,6 @@ typedef struct PyObject_HEAD sqlite3* db; - /* 1 if we are currently within a transaction, i. e. if a BEGIN has been - * issued */ - char inTransaction; - /* the type detection mode. Only 0, PARSE_DECLTYPES, PARSE_COLNAMES or a * bitwise combination thereof makes sense */ int detect_types; diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index e1676de..39f7a65 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -27,45 +27,7 @@ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor* self); -static char* errmsg_fetch_across_rollback = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from."; - -static pysqlite_StatementKind detect_statement_type(const char* statement) -{ - char buf[20]; - const char* src; - char* dst; - - src = statement; - /* skip over whitepace */ - while (*src == '\r' || *src == '\n' || *src == ' ' || *src == '\t') { - src++; - } - - if (*src == 0) - return STATEMENT_INVALID; - - dst = buf; - *dst = 0; - while (Py_ISALPHA(*src) && (dst - buf) < ((Py_ssize_t)sizeof(buf) - 2)) { - *dst++ = Py_TOLOWER(*src++); - } - - *dst = 0; - - if (!strcmp(buf, "select")) { - return STATEMENT_SELECT; - } else if (!strcmp(buf, "insert")) { - return STATEMENT_INSERT; - } else if (!strcmp(buf, "update")) { - return STATEMENT_UPDATE; - } else if (!strcmp(buf, "delete")) { - return STATEMENT_DELETE; - } else if (!strcmp(buf, "replace")) { - return STATEMENT_REPLACE; - } else { - return STATEMENT_OTHER; - } -} +static const char errmsg_fetch_across_rollback[] = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from."; static int pysqlite_cursor_init(pysqlite_Cursor* self, PyObject* args, PyObject* kwargs) { @@ -143,7 +105,7 @@ PyObject* _pysqlite_get_converter(PyObject* key) PyObject* retval; _Py_IDENTIFIER(upper); - upcase_key = _PyObject_CallMethodId(key, &PyId_upper, ""); + upcase_key = _PyObject_CallMethodId(key, &PyId_upper, NULL); if (!upcase_key) { return NULL; } @@ -242,8 +204,7 @@ PyObject* _pysqlite_build_column_name(const char* colname) const char* pos; if (!colname) { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } for (pos = colname;; pos++) { @@ -428,9 +389,9 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* PyObject* func_args; PyObject* result; int numcols; - int statement_type; PyObject* descriptor; PyObject* second_argument = NULL; + sqlite_int64 lastrowid; if (!check_cursor(self)) { goto error; @@ -504,14 +465,14 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* pysqlite_statement_reset(self->statement); } - operation_cstr = _PyUnicode_AsStringAndSize(operation, &operation_len); + operation_cstr = PyUnicode_AsUTF8AndSize(operation, &operation_len); if (operation_cstr == NULL) goto error; /* reset description and rowcount */ Py_INCREF(Py_None); Py_SETREF(self->description, Py_None); - self->rowcount = -1L; + self->rowcount = 0L; func_args = PyTuple_New(1); if (!func_args) { @@ -550,43 +511,19 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* pysqlite_statement_reset(self->statement); pysqlite_statement_mark_dirty(self->statement); - statement_type = detect_statement_type(operation_cstr); - if (self->connection->begin_statement) { - switch (statement_type) { - case STATEMENT_UPDATE: - case STATEMENT_DELETE: - case STATEMENT_INSERT: - case STATEMENT_REPLACE: - if (!self->connection->inTransaction) { - result = _pysqlite_connection_begin(self->connection); - if (!result) { - goto error; - } - Py_DECREF(result); - } - break; - case STATEMENT_OTHER: - /* it's a DDL statement or something similar - - we better COMMIT first so it works for all cases */ - if (self->connection->inTransaction) { - result = pysqlite_connection_commit(self->connection, NULL); - if (!result) { - goto error; - } - Py_DECREF(result); - } - break; - case STATEMENT_SELECT: - if (multiple) { - PyErr_SetString(pysqlite_ProgrammingError, - "You cannot execute SELECT statements in executemany()."); - goto error; - } - break; + /* For backwards compatibility reasons, do not start a transaction if a + DDL statement is encountered. If anybody wants transactional DDL, + they can issue a BEGIN statement manually. */ + if (self->connection->begin_statement && !sqlite3_stmt_readonly(self->statement->st) && !self->statement->is_ddl) { + if (sqlite3_get_autocommit(self->connection->db)) { + result = _pysqlite_connection_begin(self->connection); + if (!result) { + goto error; + } + Py_DECREF(result); } } - while (1) { parameters = PyIter_Next(parameters_iter); if (!parameters) { @@ -672,6 +609,20 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* } } + if (!sqlite3_stmt_readonly(self->statement->st)) { + self->rowcount += (long)sqlite3_changes(self->connection->db); + } else { + self->rowcount= -1L; + } + + if (!multiple) { + Py_DECREF(self->lastrowid); + Py_BEGIN_ALLOW_THREADS + lastrowid = sqlite3_last_insert_rowid(self->connection->db); + Py_END_ALLOW_THREADS + self->lastrowid = _pysqlite_long_from_int64(lastrowid); + } + if (rc == SQLITE_ROW) { if (multiple) { PyErr_SetString(pysqlite_ProgrammingError, "executemany() can only execute DML statements."); @@ -686,29 +637,6 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* Py_CLEAR(self->statement); } - switch (statement_type) { - case STATEMENT_UPDATE: - case STATEMENT_DELETE: - case STATEMENT_INSERT: - case STATEMENT_REPLACE: - if (self->rowcount == -1L) { - self->rowcount = 0L; - } - self->rowcount += (long)sqlite3_changes(self->connection->db); - } - - Py_DECREF(self->lastrowid); - if (!multiple && statement_type == STATEMENT_INSERT) { - sqlite_int64 lastrowid; - Py_BEGIN_ALLOW_THREADS - lastrowid = sqlite3_last_insert_rowid(self->connection->db); - Py_END_ALLOW_THREADS - self->lastrowid = _pysqlite_long_from_int64(lastrowid); - } else { - Py_INCREF(Py_None); - self->lastrowid = Py_None; - } - if (multiple) { pysqlite_statement_reset(self->statement); } @@ -716,15 +644,6 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* } error: - /* just to be sure (implicit ROLLBACKs with ON CONFLICT ROLLBACK/OR - * ROLLBACK could have happened */ - #ifdef SQLITE_VERSION_NUMBER - #if SQLITE_VERSION_NUMBER >= 3002002 - if (self->connection && self->connection->db) - self->connection->inTransaction = !sqlite3_get_autocommit(self->connection->db); - #endif - #endif - Py_XDECREF(parameters); Py_XDECREF(parameters_iter); Py_XDECREF(parameters_list); @@ -770,7 +689,7 @@ PyObject* pysqlite_cursor_executescript(pysqlite_Cursor* self, PyObject* args) self->reset = 0; if (PyUnicode_Check(script_obj)) { - script_cstr = _PyUnicode_AsString(script_obj); + script_cstr = PyUnicode_AsUTF8(script_obj); if (!script_cstr) { return NULL; } @@ -913,8 +832,7 @@ PyObject* pysqlite_cursor_fetchone(pysqlite_Cursor* self, PyObject* args) row = pysqlite_cursor_iternext(self); if (!row && !PyErr_Occurred()) { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } return row; @@ -995,8 +913,7 @@ PyObject* pysqlite_cursor_fetchall(pysqlite_Cursor* self, PyObject* args) PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args) { /* don't care, return None */ - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args) @@ -1012,8 +929,7 @@ PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args) self->closed = 1; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyMethodDef cursor_methods[] = { @@ -1049,7 +965,7 @@ static struct PyMemberDef cursor_members[] = {NULL} }; -static char cursor_doc[] = +static const char cursor_doc[] = PyDoc_STR("SQLite database cursor class."); PyTypeObject pysqlite_CursorType = { diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h index 118ba38..28bbd5f 100644 --- a/Modules/_sqlite/cursor.h +++ b/Modules/_sqlite/cursor.h @@ -51,12 +51,6 @@ typedef struct PyObject* in_weakreflist; /* List of weak references */ } pysqlite_Cursor; -typedef enum { - STATEMENT_INVALID, STATEMENT_INSERT, STATEMENT_DELETE, - STATEMENT_UPDATE, STATEMENT_REPLACE, STATEMENT_SELECT, - STATEMENT_OTHER -} pysqlite_StatementKind; - extern PyTypeObject pysqlite_CursorType; PyObject* pysqlite_cursor_execute(pysqlite_Cursor* self, PyObject* args); diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 7a7e860..cc45331 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -139,8 +139,7 @@ static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyOb PyErr_SetString(pysqlite_OperationalError, "Changing the shared_cache flag failed"); return NULL; } else { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -172,8 +171,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args) if (rc == -1) return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyDoc_STRVAR(module_register_adapter_doc, @@ -194,7 +192,7 @@ static PyObject* module_register_converter(PyObject* self, PyObject* args) } /* convert the name to upper case */ - name = _PyObject_CallMethodId(orig_name, &PyId_upper, ""); + name = _PyObject_CallMethodId(orig_name, &PyId_upper, NULL); if (!name) { goto error; } @@ -221,8 +219,7 @@ static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args) return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyDoc_STRVAR(enable_callback_tracebacks_doc, @@ -261,13 +258,13 @@ static PyMethodDef module_methods[] = { }; struct _IntConstantPair { - char* constant_name; + const char *constant_name; int constant_value; }; typedef struct _IntConstantPair IntConstantPair; -static IntConstantPair _int_constants[] = { +static const IntConstantPair _int_constants[] = { {"PARSE_DECLTYPES", PARSE_DECLTYPES}, {"PARSE_COLNAMES", PARSE_COLNAMES}, diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index 07584e3..53342f3 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -98,7 +98,7 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx) Py_XINCREF(item); return item; } else if (PyUnicode_Check(idx)) { - key = _PyUnicode_AsString(idx); + key = PyUnicode_AsUTF8(idx); if (key == NULL) return NULL; @@ -108,7 +108,7 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx) PyObject *obj; obj = PyTuple_GET_ITEM(self->description, i); obj = PyTuple_GET_ITEM(obj, 0); - compare_key = _PyUnicode_AsString(obj); + compare_key = PyUnicode_AsUTF8(obj); if (!compare_key) { return NULL; } diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index e870633..0df661b 100644 --- a/Modules/_sqlite/statement.c +++ b/Modules/_sqlite/statement.c @@ -54,11 +54,12 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con int rc; const char* sql_cstr; Py_ssize_t sql_cstr_len; + const char* p; self->st = NULL; self->in_use = 0; - sql_cstr = _PyUnicode_AsStringAndSize(sql, &sql_cstr_len); + sql_cstr = PyUnicode_AsUTF8AndSize(sql, &sql_cstr_len); if (sql_cstr == NULL) { rc = PYSQLITE_SQL_WRONG_TYPE; return rc; @@ -72,6 +73,23 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con Py_INCREF(sql); self->sql = sql; + /* determine if the statement is a DDL statement */ + self->is_ddl = 0; + for (p = sql_cstr; *p != 0; p++) { + switch (*p) { + case ' ': + case '\r': + case '\n': + case '\t': + continue; + } + + self->is_ddl = (PyOS_strnicmp(p, "create ", 7) == 0) + || (PyOS_strnicmp(p, "drop ", 5) == 0) + || (PyOS_strnicmp(p, "reindex ", 8) == 0); + break; + } + Py_BEGIN_ALLOW_THREADS rc = sqlite3_prepare(connection->db, sql_cstr, @@ -134,7 +152,7 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec rc = sqlite3_bind_double(self->st, pos, PyFloat_AsDouble(parameter)); break; case TYPE_UNICODE: - string = _PyUnicode_AsStringAndSize(parameter, &buflen); + string = PyUnicode_AsUTF8AndSize(parameter, &buflen); if (string == NULL) return -1; if (buflen > INT_MAX) { @@ -307,7 +325,7 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params) Py_ssize_t sql_len; sqlite3_stmt* new_st; - sql_cstr = _PyUnicode_AsStringAndSize(self->sql, &sql_len); + sql_cstr = PyUnicode_AsUTF8AndSize(self->sql, &sql_len); if (sql_cstr == NULL) { rc = PYSQLITE_SQL_WRONG_TYPE; return rc; diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h index 4681443..6eef168 100644 --- a/Modules/_sqlite/statement.h +++ b/Modules/_sqlite/statement.h @@ -38,6 +38,7 @@ typedef struct sqlite3_stmt* st; PyObject* sql; int in_use; + int is_ddl; PyObject* in_weakreflist; /* List of weak references */ } pysqlite_Statement; diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c index 312fe3b..351b1b4 100644 --- a/Modules/_sqlite/util.c +++ b/Modules/_sqlite/util.c @@ -113,7 +113,6 @@ int _pysqlite_seterror(sqlite3* db, sqlite3_stmt* st) PyObject * _pysqlite_long_from_int64(sqlite_int64 value) { -#ifdef HAVE_LONG_LONG # if SIZEOF_LONG_LONG < 8 if (value > PY_LLONG_MAX || value < PY_LLONG_MIN) { return _PyLong_FromByteArray(&value, sizeof(value), @@ -124,14 +123,6 @@ _pysqlite_long_from_int64(sqlite_int64 value) if (value > LONG_MAX || value < LONG_MIN) return PyLong_FromLongLong(value); # endif -#else -# if SIZEOF_LONG < 8 - if (value > LONG_MAX || value < LONG_MIN) { - return _PyLong_FromByteArray(&value, sizeof(value), - IS_LITTLE_ENDIAN, 1 /* signed */); - } -# endif -#endif return PyLong_FromLong(Py_SAFE_DOWNCAST(value, sqlite_int64, long)); } @@ -139,23 +130,13 @@ sqlite_int64 _pysqlite_long_as_int64(PyObject * py_val) { int overflow; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG value = PyLong_AsLongLongAndOverflow(py_val, &overflow); -#else - long value = PyLong_AsLongAndOverflow(py_val, &overflow); -#endif + long long value = PyLong_AsLongLongAndOverflow(py_val, &overflow); if (value == -1 && PyErr_Occurred()) return -1; if (!overflow) { -#ifdef HAVE_LONG_LONG # if SIZEOF_LONG_LONG > 8 if (-0x8000000000000000LL <= value && value <= 0x7FFFFFFFFFFFFFFFLL) # endif -#else -# if SIZEOF_LONG > 8 - if (-0x8000000000000000L <= value && value <= 0x7FFFFFFFFFFFFFFFL) -# endif -#endif return value; } else if (sizeof(value) < sizeof(sqlite_int64)) { diff --git a/Modules/_sre.c b/Modules/_sre.c index 4b376ec..979e61f 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -35,7 +35,7 @@ * other compatibility work. */ -static char copyright[] = +static const char copyright[] = " SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB "; #define PY_SSIZE_T_CLEAN @@ -62,9 +62,6 @@ static char copyright[] = /* -------------------------------------------------------------------- */ /* optional features */ -/* enables fast searching */ -#define USE_FAST_SEARCH - /* enables copy/deepcopy handling (work in progress) */ #undef USE_BUILTIN_COPY @@ -717,7 +714,7 @@ _sre_SRE_Pattern_search_impl(PatternObject *self, PyObject *string, } static PyObject* -call(char* module, char* function, PyObject* args) +call(const char* module, const char* function, PyObject* args) { PyObject* name; PyObject* mod; @@ -1059,7 +1056,6 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string, PyObject* joiner; PyObject* item; PyObject* filter; - PyObject* args; PyObject* match; void* ptr; Py_ssize_t status; @@ -1161,13 +1157,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string, match = pattern_new_match(self, &state, 1); if (!match) goto error; - args = PyTuple_Pack(1, match); - if (!args) { - Py_DECREF(match); - goto error; - } - item = PyObject_CallObject(filter, args); - Py_DECREF(args); + item = _PyObject_CallArg1(filter, match); Py_DECREF(match); if (!item) goto error; @@ -1516,14 +1506,12 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags, self->groups = groups; - Py_XINCREF(groupindex); + Py_INCREF(groupindex); self->groupindex = groupindex; - Py_XINCREF(indexgroup); + Py_INCREF(indexgroup); self->indexgroup = indexgroup; - self->weakreflist = NULL; - if (!_validate(self)) { Py_DECREF(self); return NULL; @@ -1592,7 +1580,7 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags, skip = *code; \ VTRACE(("%lu (skip to %p)\n", \ (unsigned long)skip, code+skip)); \ - if (skip-adj > (Py_uintptr_t)(end - code)) \ + if (skip-adj > (uintptr_t)(end - code)) \ FAIL; \ code++; \ } while (0) @@ -1626,7 +1614,7 @@ _validate_charset(SRE_CODE *code, SRE_CODE *end) case SRE_OP_CHARSET: offset = 256/SRE_CODE_BITS; /* 256-bit bitmap */ - if (offset > (Py_uintptr_t)(end - code)) + if (offset > (uintptr_t)(end - code)) FAIL; code += offset; break; @@ -1634,7 +1622,7 @@ _validate_charset(SRE_CODE *code, SRE_CODE *end) case SRE_OP_BIGCHARSET: GET_ARG; /* Number of blocks */ offset = 256/sizeof(SRE_CODE); /* 256-byte table */ - if (offset > (Py_uintptr_t)(end - code)) + if (offset > (uintptr_t)(end - code)) FAIL; /* Make sure that each byte points to a valid block */ for (i = 0; i < 256; i++) { @@ -1643,7 +1631,7 @@ _validate_charset(SRE_CODE *code, SRE_CODE *end) } code += offset; offset = arg * (256/SRE_CODE_BITS); /* 256-bit bitmap times arg */ - if (offset > (Py_uintptr_t)(end - code)) + if (offset > (uintptr_t)(end - code)) FAIL; code += offset; break; @@ -1794,11 +1782,11 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups) GET_ARG; prefix_len = arg; GET_ARG; /* Here comes the prefix string */ - if (prefix_len > (Py_uintptr_t)(newcode - code)) + if (prefix_len > (uintptr_t)(newcode - code)) FAIL; code += prefix_len; /* And here comes the overlap table */ - if (prefix_len > (Py_uintptr_t)(newcode - code)) + if (prefix_len > (uintptr_t)(newcode - code)) FAIL; /* Each overlap value should be < prefix_len */ for (i = 0; i < prefix_len; i++) { @@ -1927,7 +1915,7 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups) to allow arbitrary jumps anywhere in the code; so we just look for a JUMP opcode preceding our skip target. */ - if (skip >= 3 && skip-3 < (Py_uintptr_t)(end - code) && + if (skip >= 3 && skip-3 < (uintptr_t)(end - code) && code[skip-3] == SRE_OP_JUMP) { VTRACE(("both then and else parts present\n")); @@ -2015,7 +2003,6 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def) Py_buffer view; PyObject *result; void* ptr; - Py_ssize_t i, j; if (index < 0 || index >= self->groups) { /* raise IndexError if we were given a bad group number */ @@ -2037,12 +2024,8 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def) ptr = getstring(self->string, &length, &isbytes, &charsize, &view); if (ptr == NULL) return NULL; - - i = self->mark[index]; - j = self->mark[index+1]; - i = Py_MIN(i, length); - j = Py_MIN(j, length); - result = getslice(isbytes, ptr, self->string, i, j); + result = getslice(isbytes, ptr, + self->string, self->mark[index], self->mark[index+1]); if (isbytes && view.buf != NULL) PyBuffer_Release(&view); return result; @@ -2057,8 +2040,9 @@ match_getindex(MatchObject* self, PyObject* index) /* Default value */ return 0; - if (PyLong_Check(index)) - return PyLong_AsSsize_t(index); + if (PyIndex_Check(index)) { + return PyNumber_AsSsize_t(index, NULL); + } i = -1; @@ -2135,6 +2119,12 @@ match_group(MatchObject* self, PyObject* args) return result; } +static PyObject* +match_getitem(MatchObject* self, PyObject* name) +{ + return match_getslice(self, name, Py_None); +} + /*[clinic input] _sre.SRE_Match.groups @@ -2657,6 +2647,75 @@ pattern_scanner(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_ return (PyObject*) scanner; } +static Py_hash_t +pattern_hash(PatternObject *self) +{ + Py_hash_t hash, hash2; + + hash = PyObject_Hash(self->pattern); + if (hash == -1) { + return -1; + } + + hash2 = _Py_HashBytes(self->code, sizeof(self->code[0]) * self->codesize); + hash ^= hash2; + + hash ^= self->flags; + hash ^= self->isbytes; + hash ^= self->codesize; + + if (hash == -1) { + hash = -2; + } + return hash; +} + +static PyObject* +pattern_richcompare(PyObject *lefto, PyObject *righto, int op) +{ + PatternObject *left, *right; + int cmp; + + if (op != Py_EQ && op != Py_NE) { + Py_RETURN_NOTIMPLEMENTED; + } + + if (Py_TYPE(lefto) != &Pattern_Type || Py_TYPE(righto) != &Pattern_Type) { + Py_RETURN_NOTIMPLEMENTED; + } + + if (lefto == righto) { + /* a pattern is equal to itself */ + return PyBool_FromLong(op == Py_EQ); + } + + left = (PatternObject *)lefto; + right = (PatternObject *)righto; + + cmp = (left->flags == right->flags + && left->isbytes == right->isbytes + && left->codesize == right->codesize); + if (cmp) { + /* Compare the code and the pattern because the same pattern can + produce different codes depending on the locale used to compile the + pattern when the re.LOCALE flag is used. Don't compare groups, + indexgroup nor groupindex: they are derivated from the pattern. */ + cmp = (memcmp(left->code, right->code, + sizeof(left->code[0]) * left->codesize) == 0); + } + if (cmp) { + cmp = PyObject_RichCompareBool(left->pattern, right->pattern, + Py_EQ); + if (cmp < 0) { + return NULL; + } + } + if (op == Py_NE) { + cmp = !cmp; + } + return PyBool_FromLong(cmp); +} + #include "clinic/_sre.c.h" static PyMethodDef pattern_methods[] = { @@ -2701,7 +2760,7 @@ static PyTypeObject Pattern_Type = { 0, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ - 0, /* tp_hash */ + (hashfunc)pattern_hash, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ 0, /* tp_getattro */ @@ -2711,7 +2770,7 @@ static PyTypeObject Pattern_Type = { pattern_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ - 0, /* tp_richcompare */ + pattern_richcompare, /* tp_richcompare */ offsetof(PatternObject, weakreflist), /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ @@ -2720,6 +2779,13 @@ static PyTypeObject Pattern_Type = { pattern_getset, /* tp_getset */ }; +/* Match objects do not support length or assignment, but do support + __getitem__. */ +static PyMappingMethods match_as_mapping = { + NULL, + (binaryfunc)match_getitem, + NULL +}; static PyMethodDef match_methods[] = { {"group", (PyCFunction) match_group, METH_VARARGS, match_group_doc}, @@ -2765,7 +2831,7 @@ static PyTypeObject Match_Type = { (reprfunc)match_repr, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ + &match_as_mapping, /* tp_as_mapping */ 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 3b2d3ad..b198857 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -140,6 +140,8 @@ struct py_ssl_library_code { #endif #define TLS_method SSLv23_method +#define TLS_client_method SSLv23_client_method +#define TLS_server_method SSLv23_server_method static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) { @@ -147,10 +149,12 @@ static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) } #ifndef OPENSSL_NO_COMP +/* LCOV_EXCL_START */ static int COMP_get_type(const COMP_METHOD *meth) { return meth->type; } +/* LCOV_EXCL_STOP */ #endif static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) @@ -187,6 +191,19 @@ static X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) { return store->param; } + +static int +SSL_SESSION_has_ticket(const SSL_SESSION *s) +{ + return (s->tlsext_ticklen > 0) ? 1 : 0; +} + +static unsigned long +SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) +{ + return s->tlsext_tick_lifetime_hint; +} + #endif /* OpenSSL < 1.1.0 or LibreSSL */ @@ -220,14 +237,16 @@ enum py_ssl_cert_requirements { enum py_ssl_version { PY_SSL_VERSION_SSL2, PY_SSL_VERSION_SSL3=1, - PY_SSL_VERSION_TLS, + PY_SSL_VERSION_TLS, /* SSLv23 */ #if HAVE_TLSv1_2 PY_SSL_VERSION_TLS1, PY_SSL_VERSION_TLS1_1, - PY_SSL_VERSION_TLS1_2 + PY_SSL_VERSION_TLS1_2, #else - PY_SSL_VERSION_TLS1 + PY_SSL_VERSION_TLS1, #endif + PY_SSL_VERSION_TLS_CLIENT=0x10, + PY_SSL_VERSION_TLS_SERVER, }; #ifdef WITH_THREAD @@ -293,25 +312,35 @@ typedef struct { int eof_written; } PySSLMemoryBIO; +typedef struct { + PyObject_HEAD + SSL_SESSION *session; + PySSLContext *ctx; +} PySSLSession; + static PyTypeObject PySSLContext_Type; static PyTypeObject PySSLSocket_Type; static PyTypeObject PySSLMemoryBIO_Type; +static PyTypeObject PySSLSession_Type; /*[clinic input] module _ssl class _ssl._SSLContext "PySSLContext *" "&PySSLContext_Type" class _ssl._SSLSocket "PySSLSocket *" "&PySSLSocket_Type" class _ssl.MemoryBIO "PySSLMemoryBIO *" "&PySSLMemoryBIO_Type" +class _ssl.SSLSession "PySSLSession *" "&PySSLSession_Type" [clinic start generated code]*/ -/*[clinic end generated code: output=da39a3ee5e6b4b0d input=7bf7cb832638e2e1]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=bdc67fafeeaa8109]*/ #include "clinic/_ssl.c.h" static int PySSL_select(PySocketSockObject *s, int writing, _PyTime_t timeout); + #define PySSLContext_Check(v) (Py_TYPE(v) == &PySSLContext_Type) #define PySSLSocket_Check(v) (Py_TYPE(v) == &PySSLSocket_Type) #define PySSLMemoryBIO_Check(v) (Py_TYPE(v) == &PySSLMemoryBIO_Type) +#define PySSLSession_Check(v) (Py_TYPE(v) == &PySSLSession_Type) typedef enum { SOCKET_IS_NONBLOCKING, @@ -455,7 +484,7 @@ fail: } static PyObject * -PySSL_SetError(PySSLSocket *obj, int ret, char *filename, int lineno) +PySSL_SetError(PySSLSocket *obj, int ret, const char *filename, int lineno) { PyObject *type = PySSLErrorObject; char *errstr = NULL; @@ -537,7 +566,7 @@ PySSL_SetError(PySSLSocket *obj, int ret, char *filename, int lineno) } static PyObject * -_setSSLError (char *errstr, int errcode, char *filename, int lineno) { +_setSSLError (const char *errstr, int errcode, const char *filename, int lineno) { if (errstr == NULL) errcode = ERR_peek_last_error(); @@ -570,7 +599,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, self->ssl = NULL; self->Socket = NULL; self->ctx = sslctx; - Py_INCREF(sslctx); self->shutdown_seen_zero = 0; self->handshake_done = 0; self->owner = NULL; @@ -585,6 +613,8 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, self->server_hostname = hostname; } + Py_INCREF(sslctx); + /* Make sure the SSL error state is initialized */ (void) ERR_get_state(); ERR_clear_error(); @@ -1180,6 +1210,10 @@ _get_crl_dp(X509 *certificate) { int i, j; PyObject *lst, *res = NULL; +#if OPENSSL_VERSION_NUMBER >= 0x10001000L + /* Calls x509v3_cache_extensions and sets up crldp */ + X509_check_ca(certificate); +#endif dps = X509_get_ext_d2i(certificate, NID_crl_distribution_points, NULL, NULL); if (dps == NULL) @@ -1224,7 +1258,9 @@ _get_crl_dp(X509 *certificate) { done: Py_XDECREF(lst); - CRL_DIST_POINTS_free(dps); +#if OPENSSL_VERSION_NUMBER < 0x10001000L + sk_DIST_POINT_free(dps); +#endif return res; } @@ -1540,6 +1576,65 @@ cipher_to_tuple(const SSL_CIPHER *cipher) return NULL; } +#if OPENSSL_VERSION_NUMBER >= 0x10002000UL +static PyObject * +cipher_to_dict(const SSL_CIPHER *cipher) +{ + const char *cipher_name, *cipher_protocol; + + unsigned long cipher_id; + int alg_bits, strength_bits, len; + char buf[512] = {0}; +#if OPENSSL_VERSION_1_1 + int aead, nid; + const char *skcipher = NULL, *digest = NULL, *kx = NULL, *auth = NULL; +#endif + + /* can be NULL */ + cipher_name = SSL_CIPHER_get_name(cipher); + cipher_protocol = SSL_CIPHER_get_version(cipher); + cipher_id = SSL_CIPHER_get_id(cipher); + SSL_CIPHER_description(cipher, buf, sizeof(buf) - 1); + len = strlen(buf); + if (len > 1 && buf[len-1] == '\n') + buf[len-1] = '\0'; + strength_bits = SSL_CIPHER_get_bits(cipher, &alg_bits); + +#if OPENSSL_VERSION_1_1 + aead = SSL_CIPHER_is_aead(cipher); + nid = SSL_CIPHER_get_cipher_nid(cipher); + skcipher = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; + nid = SSL_CIPHER_get_digest_nid(cipher); + digest = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; + nid = SSL_CIPHER_get_kx_nid(cipher); + kx = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; + nid = SSL_CIPHER_get_auth_nid(cipher); + auth = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; +#endif + + return Py_BuildValue( + "{sksssssssisi" +#if OPENSSL_VERSION_1_1 + "sOssssssss" +#endif + "}", + "id", cipher_id, + "name", cipher_name, + "protocol", cipher_protocol, + "description", buf, + "strength_bits", strength_bits, + "alg_bits", alg_bits +#if OPENSSL_VERSION_1_1 + ,"aead", aead ? Py_True : Py_False, + "symmetric", skcipher, + "digest", digest, + "kea", kx, + "auth", auth +#endif + ); +} +#endif + /*[clinic input] _ssl._SSLSocket.shared_ciphers [clinic start generated code]*/ @@ -2248,6 +2343,152 @@ _ssl__SSLSocket_tls_unique_cb_impl(PySSLSocket *self) return retval; } +#ifdef OPENSSL_VERSION_1_1 + +static SSL_SESSION* +_ssl_session_dup(SSL_SESSION *session) { + SSL_SESSION *newsession = NULL; + int slen; + unsigned char *senc = NULL, *p; + const unsigned char *const_p; + + if (session == NULL) { + PyErr_SetString(PyExc_ValueError, "Invalid session"); + goto error; + } + + /* get length */ + slen = i2d_SSL_SESSION(session, NULL); + if (slen == 0 || slen > 0xFF00) { + PyErr_SetString(PyExc_ValueError, "i2d() failed."); + goto error; + } + if ((senc = PyMem_Malloc(slen)) == NULL) { + PyErr_NoMemory(); + goto error; + } + p = senc; + if (!i2d_SSL_SESSION(session, &p)) { + PyErr_SetString(PyExc_ValueError, "i2d() failed."); + goto error; + } + const_p = senc; + newsession = d2i_SSL_SESSION(NULL, &const_p, slen); + if (session == NULL) { + goto error; + } + PyMem_Free(senc); + return newsession; + error: + if (senc != NULL) { + PyMem_Free(senc); + } + return NULL; +} +#endif + +static PyObject * +PySSL_get_session(PySSLSocket *self, void *closure) { + /* get_session can return sessions from a server-side connection, + * it does not check for handshake done or client socket. */ + PySSLSession *pysess; + SSL_SESSION *session; + +#ifdef OPENSSL_VERSION_1_1 + /* duplicate session as workaround for session bug in OpenSSL 1.1.0, + * https://github.com/openssl/openssl/issues/1550 */ + session = SSL_get0_session(self->ssl); /* borrowed reference */ + if (session == NULL) { + Py_RETURN_NONE; + } + if ((session = _ssl_session_dup(session)) == NULL) { + return NULL; + } +#else + session = SSL_get1_session(self->ssl); + if (session == NULL) { + Py_RETURN_NONE; + } +#endif + pysess = PyObject_GC_New(PySSLSession, &PySSLSession_Type); + if (pysess == NULL) { + SSL_SESSION_free(session); + return NULL; + } + + assert(self->ctx); + pysess->ctx = self->ctx; + Py_INCREF(pysess->ctx); + pysess->session = session; + PyObject_GC_Track(pysess); + return (PyObject *)pysess; +} + +static int PySSL_set_session(PySSLSocket *self, PyObject *value, + void *closure) + { + PySSLSession *pysess; +#ifdef OPENSSL_VERSION_1_1 + SSL_SESSION *session; +#endif + int result; + + if (!PySSLSession_Check(value)) { + PyErr_SetString(PyExc_TypeError, "Value is not a SSLSession."); + return -1; + } + pysess = (PySSLSession *)value; + + if (self->ctx->ctx != pysess->ctx->ctx) { + PyErr_SetString(PyExc_ValueError, + "Session refers to a different SSLContext."); + return -1; + } + if (self->socket_type != PY_SSL_CLIENT) { + PyErr_SetString(PyExc_ValueError, + "Cannot set session for server-side SSLSocket."); + return -1; + } + if (self->handshake_done) { + PyErr_SetString(PyExc_ValueError, + "Cannot set session after handshake."); + return -1; + } +#ifdef OPENSSL_VERSION_1_1 + /* duplicate session */ + if ((session = _ssl_session_dup(pysess->session)) == NULL) { + return -1; + } + result = SSL_set_session(self->ssl, session); + /* free duplicate, SSL_set_session() bumps ref count */ + SSL_SESSION_free(session); +#else + result = SSL_set_session(self->ssl, pysess->session); +#endif + if (result == 0) { + _setSSLError(NULL, 0, __FILE__, __LINE__); + return -1; + } + return 0; +} + +PyDoc_STRVAR(PySSL_set_session_doc, +"_setter_session(session)\n\ +\ +Get / set SSLSession."); + +static PyObject * +PySSL_get_session_reused(PySSLSocket *self, void *closure) { + if (SSL_session_reused(self->ssl)) { + Py_RETURN_TRUE; + } else { + Py_RETURN_FALSE; + } +} + +PyDoc_STRVAR(PySSL_get_session_reused_doc, +"Was the client session reused during handshake?"); + static PyGetSetDef ssl_getsetlist[] = { {"context", (getter) PySSL_get_context, (setter) PySSL_set_context, PySSL_set_context_doc}, @@ -2257,6 +2498,10 @@ static PyGetSetDef ssl_getsetlist[] = { PySSL_get_server_hostname_doc}, {"owner", (getter) PySSL_get_owner, (setter) PySSL_set_owner, PySSL_get_owner_doc}, + {"session", (getter) PySSL_get_session, + (setter) PySSL_set_session, PySSL_set_session_doc}, + {"session_reused", (getter) PySSL_get_session_reused, NULL, + PySSL_get_session_reused_doc}, {NULL}, /* sentinel */ }; @@ -2316,6 +2561,33 @@ static PyTypeObject PySSLSocket_Type = { * _SSLContext objects */ +static int +_set_verify_mode(SSL_CTX *ctx, enum py_ssl_cert_requirements n) +{ + int mode; + int (*verify_cb)(int, X509_STORE_CTX *) = NULL; + + switch(n) { + case PY_SSL_CERT_NONE: + mode = SSL_VERIFY_NONE; + break; + case PY_SSL_CERT_OPTIONAL: + mode = SSL_VERIFY_PEER; + break; + case PY_SSL_CERT_REQUIRED: + mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT; + break; + default: + PyErr_SetString(PyExc_ValueError, + "invalid value for verify_mode"); + return -1; + } + /* keep current verify cb */ + verify_cb = SSL_CTX_get_verify_callback(ctx); + SSL_CTX_set_verify(ctx, mode, verify_cb); + return 0; +} + /*[clinic input] @classmethod _ssl._SSLContext.__new__ @@ -2330,6 +2602,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) PySSLContext *self; long options; SSL_CTX *ctx = NULL; + int result; #if defined(SSL_MODE_RELEASE_BUFFERS) unsigned long libver; #endif @@ -2351,8 +2624,12 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) else if (proto_version == PY_SSL_VERSION_SSL2) ctx = SSL_CTX_new(SSLv2_method()); #endif - else if (proto_version == PY_SSL_VERSION_TLS) + else if (proto_version == PY_SSL_VERSION_TLS) /* SSLv23 */ ctx = SSL_CTX_new(TLS_method()); + else if (proto_version == PY_SSL_VERSION_TLS_CLIENT) + ctx = SSL_CTX_new(TLS_client_method()); + else if (proto_version == PY_SSL_VERSION_TLS_SERVER) + ctx = SSL_CTX_new(TLS_server_method()); else proto_version = -1; PySSL_END_ALLOW_THREADS @@ -2385,16 +2662,57 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) self->set_hostname = NULL; #endif /* Don't check host name by default */ - self->check_hostname = 0; + if (proto_version == PY_SSL_VERSION_TLS_CLIENT) { + self->check_hostname = 1; + if (_set_verify_mode(self->ctx, PY_SSL_CERT_REQUIRED) == -1) { + Py_DECREF(self); + return NULL; + } + } else { + self->check_hostname = 0; + if (_set_verify_mode(self->ctx, PY_SSL_CERT_NONE) == -1) { + Py_DECREF(self); + return NULL; + } + } /* Defaults */ - SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL); options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; if (proto_version != PY_SSL_VERSION_SSL2) options |= SSL_OP_NO_SSLv2; if (proto_version != PY_SSL_VERSION_SSL3) options |= SSL_OP_NO_SSLv3; + /* Minimal security flags for server and client side context. + * Client sockets ignore server-side parameters. */ +#ifdef SSL_OP_NO_COMPRESSION + options |= SSL_OP_NO_COMPRESSION; +#endif +#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE + options |= SSL_OP_CIPHER_SERVER_PREFERENCE; +#endif +#ifdef SSL_OP_SINGLE_DH_USE + options |= SSL_OP_SINGLE_DH_USE; +#endif +#ifdef SSL_OP_SINGLE_ECDH_USE + options |= SSL_OP_SINGLE_ECDH_USE; +#endif SSL_CTX_set_options(self->ctx, options); + /* A bare minimum cipher list without completly broken cipher suites. + * It's far from perfect but gives users a better head start. */ + if (proto_version != PY_SSL_VERSION_SSL2) { + result = SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!eNULL:!MD5"); + } else { + /* SSLv2 needs MD5 */ + result = SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL:!eNULL"); + } + if (result == 0) { + Py_DECREF(self); + ERR_clear_error(); + PyErr_SetString(PySSLErrorObject, + "No cipher can be selected."); + return NULL; + } + #if defined(SSL_MODE_RELEASE_BUFFERS) /* Set SSL_MODE_RELEASE_BUFFERS. This potentially greatly reduces memory usage for no cost at all. However, don't do this for OpenSSL versions @@ -2411,12 +2729,12 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) #endif -#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +#ifndef OPENSSL_NO_ECDH /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use prime256v1 by default. This is Apache mod_ssl's initialization policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#if defined(SSL_CTX_set_ecdh_auto) +#if defined(SSL_CTX_set_ecdh_auto) && !defined(OPENSSL_VERSION_1_1) SSL_CTX_set_ecdh_auto(self->ctx, 1); #else { @@ -2499,6 +2817,52 @@ _ssl__SSLContext_set_ciphers_impl(PySSLContext *self, const char *cipherlist) Py_RETURN_NONE; } +#if OPENSSL_VERSION_NUMBER >= 0x10002000UL +/*[clinic input] +_ssl._SSLContext.get_ciphers +[clinic start generated code]*/ + +static PyObject * +_ssl__SSLContext_get_ciphers_impl(PySSLContext *self) +/*[clinic end generated code: output=a56e4d68a406dfc4 input=a2aadc9af89b79c5]*/ +{ + SSL *ssl = NULL; + STACK_OF(SSL_CIPHER) *sk = NULL; + const SSL_CIPHER *cipher; + int i=0; + PyObject *result = NULL, *dct; + + ssl = SSL_new(self->ctx); + if (ssl == NULL) { + _setSSLError(NULL, 0, __FILE__, __LINE__); + goto exit; + } + sk = SSL_get_ciphers(ssl); + + result = PyList_New(sk_SSL_CIPHER_num(sk)); + if (result == NULL) { + goto exit; + } + + for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) { + cipher = sk_SSL_CIPHER_value(sk, i); + dct = cipher_to_dict(cipher); + if (dct == NULL) { + Py_CLEAR(result); + goto exit; + } + PyList_SET_ITEM(result, i, dct); + } + + exit: + if (ssl != NULL) + SSL_free(ssl); + return result; + +} +#endif + + #ifdef OPENSSL_NPN_NEGOTIATED static int do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen, @@ -2655,28 +3019,16 @@ get_verify_mode(PySSLContext *self, void *c) static int set_verify_mode(PySSLContext *self, PyObject *arg, void *c) { - int n, mode; + int n; if (!PyArg_Parse(arg, "i", &n)) return -1; - if (n == PY_SSL_CERT_NONE) - mode = SSL_VERIFY_NONE; - else if (n == PY_SSL_CERT_OPTIONAL) - mode = SSL_VERIFY_PEER; - else if (n == PY_SSL_CERT_REQUIRED) - mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT; - else { - PyErr_SetString(PyExc_ValueError, - "invalid value for verify_mode"); - return -1; - } - if (mode == SSL_VERIFY_NONE && self->check_hostname) { + if (n == PY_SSL_CERT_NONE && self->check_hostname) { PyErr_SetString(PyExc_ValueError, "Cannot set verify_mode to CERT_NONE when " "check_hostname is enabled."); return -1; } - SSL_CTX_set_verify(self->ctx, mode, NULL); - return 0; + return _set_verify_mode(self->ctx, n); } static PyObject * @@ -3666,6 +4018,7 @@ static struct PyMethodDef context_methods[] = { _SSL__SSLCONTEXT_SET_SERVERNAME_CALLBACK_METHODDEF _SSL__SSLCONTEXT_CERT_STORE_STATS_METHODDEF _SSL__SSLCONTEXT_GET_CA_CERTS_METHODDEF + _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF {NULL, NULL} /* sentinel */ }; @@ -3931,6 +4284,194 @@ static PyTypeObject PySSLMemoryBIO_Type = { }; +/* + * SSL Session object + */ + +static void +PySSLSession_dealloc(PySSLSession *self) +{ + PyObject_GC_UnTrack(self); + Py_XDECREF(self->ctx); + if (self->session != NULL) { + SSL_SESSION_free(self->session); + } + PyObject_GC_Del(self); +} + +static PyObject * +PySSLSession_richcompare(PyObject *left, PyObject *right, int op) +{ + int result; + + if (left == NULL || right == NULL) { + PyErr_BadInternalCall(); + return NULL; + } + + if (!PySSLSession_Check(left) || !PySSLSession_Check(right)) { + Py_RETURN_NOTIMPLEMENTED; + } + + if (left == right) { + result = 0; + } else { + const unsigned char *left_id, *right_id; + unsigned int left_len, right_len; + left_id = SSL_SESSION_get_id(((PySSLSession *)left)->session, + &left_len); + right_id = SSL_SESSION_get_id(((PySSLSession *)right)->session, + &right_len); + if (left_len == right_len) { + result = memcmp(left_id, right_id, left_len); + } else { + result = 1; + } + } + + switch (op) { + case Py_EQ: + if (result == 0) { + Py_RETURN_TRUE; + } else { + Py_RETURN_FALSE; + } + break; + case Py_NE: + if (result != 0) { + Py_RETURN_TRUE; + } else { + Py_RETURN_FALSE; + } + break; + case Py_LT: + case Py_LE: + case Py_GT: + case Py_GE: + Py_RETURN_NOTIMPLEMENTED; + break; + default: + PyErr_BadArgument(); + return NULL; + } +} + +static int +PySSLSession_traverse(PySSLSession *self, visitproc visit, void *arg) +{ + Py_VISIT(self->ctx); + return 0; +} + +static int +PySSLSession_clear(PySSLSession *self) +{ + Py_CLEAR(self->ctx); + return 0; +} + + +static PyObject * +PySSLSession_get_time(PySSLSession *self, void *closure) { + return PyLong_FromLong(SSL_SESSION_get_time(self->session)); +} + +PyDoc_STRVAR(PySSLSession_get_time_doc, +"Session creation time (seconds since epoch)."); + + +static PyObject * +PySSLSession_get_timeout(PySSLSession *self, void *closure) { + return PyLong_FromLong(SSL_SESSION_get_timeout(self->session)); +} + +PyDoc_STRVAR(PySSLSession_get_timeout_doc, +"Session timeout (delta in seconds)."); + + +static PyObject * +PySSLSession_get_ticket_lifetime_hint(PySSLSession *self, void *closure) { + unsigned long hint = SSL_SESSION_get_ticket_lifetime_hint(self->session); + return PyLong_FromUnsignedLong(hint); +} + +PyDoc_STRVAR(PySSLSession_get_ticket_lifetime_hint_doc, +"Ticket life time hint."); + + +static PyObject * +PySSLSession_get_session_id(PySSLSession *self, void *closure) { + const unsigned char *id; + unsigned int len; + id = SSL_SESSION_get_id(self->session, &len); + return PyBytes_FromStringAndSize((const char *)id, len); +} + +PyDoc_STRVAR(PySSLSession_get_session_id_doc, +"Session id"); + + +static PyObject * +PySSLSession_get_has_ticket(PySSLSession *self, void *closure) { + if (SSL_SESSION_has_ticket(self->session)) { + Py_RETURN_TRUE; + } else { + Py_RETURN_FALSE; + } +} + +PyDoc_STRVAR(PySSLSession_get_has_ticket_doc, +"Does the session contain a ticket?"); + + +static PyGetSetDef PySSLSession_getsetlist[] = { + {"has_ticket", (getter) PySSLSession_get_has_ticket, NULL, + PySSLSession_get_has_ticket_doc}, + {"id", (getter) PySSLSession_get_session_id, NULL, + PySSLSession_get_session_id_doc}, + {"ticket_lifetime_hint", (getter) PySSLSession_get_ticket_lifetime_hint, + NULL, PySSLSession_get_ticket_lifetime_hint_doc}, + {"time", (getter) PySSLSession_get_time, NULL, + PySSLSession_get_time_doc}, + {"timeout", (getter) PySSLSession_get_timeout, NULL, + PySSLSession_get_timeout_doc}, + {NULL}, /* sentinel */ +}; + +static PyTypeObject PySSLSession_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_ssl.Session", /*tp_name*/ + sizeof(PySSLSession), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)PySSLSession_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_reserved*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + 0, /*tp_doc*/ + (traverseproc)PySSLSession_traverse, /*tp_traverse*/ + (inquiry)PySSLSession_clear, /*tp_clear*/ + PySSLSession_richcompare, /*tp_richcompare*/ + 0, /*tp_weaklistoffset*/ + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + 0, /*tp_methods*/ + 0, /*tp_members*/ + PySSLSession_getsetlist, /*tp_getset*/ +}; + + /* helper routines for seeding the SSL PRNG */ /*[clinic input] _ssl.RAND_add @@ -4052,6 +4593,7 @@ _ssl_RAND_status_impl(PyObject *module) } #ifndef OPENSSL_NO_EGD +/* LCOV_EXCL_START */ /*[clinic input] _ssl.RAND_egd path: object(converter="PyUnicode_FSConverter") @@ -4077,6 +4619,7 @@ _ssl_RAND_egd_impl(PyObject *module, PyObject *path) } return PyLong_FromLong(bytes); } +/* LCOV_EXCL_STOP */ #endif /* OPENSSL_NO_EGD */ @@ -4535,13 +5078,12 @@ static int _setup_ssl_threads(void) { if (_ssl_locks == NULL) { _ssl_locks_count = CRYPTO_num_locks(); - _ssl_locks = PyMem_New(PyThread_type_lock, _ssl_locks_count); + _ssl_locks = PyMem_Calloc(_ssl_locks_count, + sizeof(PyThread_type_lock)); if (_ssl_locks == NULL) { PyErr_NoMemory(); return 0; } - memset(_ssl_locks, 0, - sizeof(PyThread_type_lock) * _ssl_locks_count); for (i = 0; i < _ssl_locks_count; i++) { _ssl_locks[i] = PyThread_allocate_lock(); if (_ssl_locks[i] == NULL) { @@ -4616,6 +5158,9 @@ PyInit__ssl(void) return NULL; if (PyType_Ready(&PySSLMemoryBIO_Type) < 0) return NULL; + if (PyType_Ready(&PySSLSession_Type) < 0) + return NULL; + m = PyModule_Create(&_sslmodule); if (m == NULL) @@ -4687,6 +5232,10 @@ PyInit__ssl(void) if (PyDict_SetItemString(d, "MemoryBIO", (PyObject *)&PySSLMemoryBIO_Type) != 0) return NULL; + if (PyDict_SetItemString(d, "SSLSession", + (PyObject *)&PySSLSession_Type) != 0) + return NULL; + PyModule_AddIntConstant(m, "SSL_ERROR_ZERO_RETURN", PY_SSL_ERROR_ZERO_RETURN); PyModule_AddIntConstant(m, "SSL_ERROR_WANT_READ", @@ -4791,6 +5340,10 @@ PyInit__ssl(void) PY_SSL_VERSION_TLS); PyModule_AddIntConstant(m, "PROTOCOL_TLS", PY_SSL_VERSION_TLS); + PyModule_AddIntConstant(m, "PROTOCOL_TLS_CLIENT", + PY_SSL_VERSION_TLS_CLIENT); + PyModule_AddIntConstant(m, "PROTOCOL_TLS_SERVER", + PY_SSL_VERSION_TLS_SERVER); PyModule_AddIntConstant(m, "PROTOCOL_TLSv1", PY_SSL_VERSION_TLS1); #if HAVE_TLSv1_2 @@ -4813,6 +5366,7 @@ PyInit__ssl(void) PyModule_AddIntConstant(m, "OP_CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE); PyModule_AddIntConstant(m, "OP_SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE); + PyModule_AddIntConstant(m, "OP_NO_TICKET", SSL_OP_NO_TICKET); #ifdef SSL_OP_SINGLE_ECDH_USE PyModule_AddIntConstant(m, "OP_SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE); #endif diff --git a/Modules/_struct.c b/Modules/_struct.c index 2273129..796d168 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -60,6 +60,7 @@ typedef struct { char c; float x; } st_float; typedef struct { char c; double x; } st_double; typedef struct { char c; void *x; } st_void_p; typedef struct { char c; size_t x; } st_size_t; +typedef struct { char c; _Bool x; } st_bool; #define SHORT_ALIGN (sizeof(st_short) - sizeof(short)) #define INT_ALIGN (sizeof(st_int) - sizeof(int)) @@ -68,22 +69,12 @@ typedef struct { char c; size_t x; } st_size_t; #define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double)) #define VOID_P_ALIGN (sizeof(st_void_p) - sizeof(void *)) #define SIZE_T_ALIGN (sizeof(st_size_t) - sizeof(size_t)) +#define BOOL_ALIGN (sizeof(st_bool) - sizeof(_Bool)) /* We can't support q and Q in native mode unless the compiler does; in std mode, they're 8 bytes on all platforms. */ -#ifdef HAVE_LONG_LONG -typedef struct { char c; PY_LONG_LONG x; } s_long_long; -#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG)) -#endif - -#ifdef HAVE_C99_BOOL -#define BOOL_TYPE _Bool -typedef struct { char c; _Bool x; } s_bool; -#define BOOL_ALIGN (sizeof(s_bool) - sizeof(BOOL_TYPE)) -#else -#define BOOL_TYPE char -#define BOOL_ALIGN 0 -#endif +typedef struct { char c; long long x; } s_long_long; +#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(long long)) #ifdef __powerc #pragma options align=reset @@ -164,14 +155,12 @@ get_ulong(PyObject *v, unsigned long *p) return 0; } -#ifdef HAVE_LONG_LONG - /* Same, but handling native long long. */ static int -get_longlong(PyObject *v, PY_LONG_LONG *p) +get_longlong(PyObject *v, long long *p) { - PY_LONG_LONG x; + long long x; v = get_pylong(v); if (v == NULL) @@ -179,7 +168,7 @@ get_longlong(PyObject *v, PY_LONG_LONG *p) assert(PyLong_Check(v)); x = PyLong_AsLongLong(v); Py_DECREF(v); - if (x == (PY_LONG_LONG)-1 && PyErr_Occurred()) { + if (x == (long long)-1 && PyErr_Occurred()) { if (PyErr_ExceptionMatches(PyExc_OverflowError)) PyErr_SetString(StructError, "argument out of range"); @@ -192,9 +181,9 @@ get_longlong(PyObject *v, PY_LONG_LONG *p) /* Same, but handling native unsigned long long. */ static int -get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) +get_ulonglong(PyObject *v, unsigned long long *p) { - unsigned PY_LONG_LONG x; + unsigned long long x; v = get_pylong(v); if (v == NULL) @@ -202,7 +191,7 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) assert(PyLong_Check(v)); x = PyLong_AsUnsignedLongLong(v); Py_DECREF(v); - if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) { + if (x == (unsigned long long)-1 && PyErr_Occurred()) { if (PyErr_ExceptionMatches(PyExc_OverflowError)) PyErr_SetString(StructError, "argument out of range"); @@ -212,8 +201,6 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) return 0; } -#endif - /* Same, but handling Py_ssize_t */ static int @@ -267,6 +254,33 @@ get_size_t(PyObject *v, size_t *p) /* Floating point helpers */ static PyObject * +unpack_halffloat(const char *p, /* start of 2-byte string */ + int le) /* true for little-endian, false for big-endian */ +{ + double x; + + x = _PyFloat_Unpack2((unsigned char *)p, le); + if (x == -1.0 && PyErr_Occurred()) { + return NULL; + } + return PyFloat_FromDouble(x); +} + +static int +pack_halffloat(char *p, /* start of 2-byte string */ + PyObject *v, /* value to pack */ + int le) /* true for little-endian, false for big-endian */ +{ + double x = PyFloat_AsDouble(v); + if (x == -1.0 && PyErr_Occurred()) { + PyErr_SetString(StructError, + "required argument is not a float"); + return -1; + } + return _PyFloat_Pack2(x, (unsigned char *)p, le); +} + +static PyObject * unpack_float(const char *p, /* start of 4-byte string */ int le) /* true for little-endian, false for big-endian */ { @@ -436,40 +450,46 @@ nu_size_t(const char *p, const formatdef *f) /* Native mode doesn't support q or Q unless the platform C supports long long (or, on Windows, __int64). */ -#ifdef HAVE_LONG_LONG - static PyObject * nu_longlong(const char *p, const formatdef *f) { - PY_LONG_LONG x; + long long x; memcpy((char *)&x, p, sizeof x); if (x >= LONG_MIN && x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, long long, long)); return PyLong_FromLongLong(x); } static PyObject * nu_ulonglong(const char *p, const formatdef *f) { - unsigned PY_LONG_LONG x; + unsigned long long x; memcpy((char *)&x, p, sizeof x); if (x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned long long, long)); return PyLong_FromUnsignedLongLong(x); } -#endif - static PyObject * nu_bool(const char *p, const formatdef *f) { - BOOL_TYPE x; + _Bool x; memcpy((char *)&x, p, sizeof x); return PyBool_FromLong(x != 0); } static PyObject * +nu_halffloat(const char *p, const formatdef *f) +{ +#if PY_LITTLE_ENDIAN + return unpack_halffloat(p, 1); +#else + return unpack_halffloat(p, 0); +#endif +} + +static PyObject * nu_float(const char *p, const formatdef *f) { float x; @@ -519,7 +539,7 @@ np_ubyte(char *p, PyObject *v, const formatdef *f) "ubyte format requires 0 <= number <= 255"); return -1; } - *(unsigned char *)p = (unsigned char)x; + *p = (char)x; return 0; } @@ -643,12 +663,10 @@ np_size_t(char *p, PyObject *v, const formatdef *f) return 0; } -#ifdef HAVE_LONG_LONG - static int np_longlong(char *p, PyObject *v, const formatdef *f) { - PY_LONG_LONG x; + long long x; if (get_longlong(v, &x) < 0) return -1; memcpy(p, (char *)&x, sizeof x); @@ -658,20 +676,19 @@ np_longlong(char *p, PyObject *v, const formatdef *f) static int np_ulonglong(char *p, PyObject *v, const formatdef *f) { - unsigned PY_LONG_LONG x; + unsigned long long x; if (get_ulonglong(v, &x) < 0) return -1; memcpy(p, (char *)&x, sizeof x); return 0; } -#endif static int np_bool(char *p, PyObject *v, const formatdef *f) { int y; - BOOL_TYPE x; + _Bool x; y = PyObject_IsTrue(v); if (y < 0) return -1; @@ -681,6 +698,16 @@ np_bool(char *p, PyObject *v, const formatdef *f) } static int +np_halffloat(char *p, PyObject *v, const formatdef *f) +{ +#if PY_LITTLE_ENDIAN + return pack_halffloat(p, v, 1); +#else + return pack_halffloat(p, v, 0); +#endif +} + +static int np_float(char *p, PyObject *v, const formatdef *f) { float x = (float)PyFloat_AsDouble(v); @@ -723,7 +750,7 @@ np_void_p(char *p, PyObject *v, const formatdef *f) return 0; } -static formatdef native_table[] = { +static const formatdef native_table[] = { {'x', sizeof(char), 0, NULL}, {'b', sizeof(char), 0, nu_byte, np_byte}, {'B', sizeof(char), 0, nu_ubyte, np_ubyte}, @@ -738,11 +765,10 @@ static formatdef native_table[] = { {'L', sizeof(long), LONG_ALIGN, nu_ulong, np_ulong}, {'n', sizeof(size_t), SIZE_T_ALIGN, nu_ssize_t, np_ssize_t}, {'N', sizeof(size_t), SIZE_T_ALIGN, nu_size_t, np_size_t}, -#ifdef HAVE_LONG_LONG - {'q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_longlong, np_longlong}, - {'Q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong}, -#endif - {'?', sizeof(BOOL_TYPE), BOOL_ALIGN, nu_bool, np_bool}, + {'q', sizeof(long long), LONG_LONG_ALIGN, nu_longlong, np_longlong}, + {'Q', sizeof(long long), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong}, + {'?', sizeof(_Bool), BOOL_ALIGN, nu_bool, np_bool}, + {'e', sizeof(short), SHORT_ALIGN, nu_halffloat, np_halffloat}, {'f', sizeof(float), FLOAT_ALIGN, nu_float, np_float}, {'d', sizeof(double), DOUBLE_ALIGN, nu_double, np_double}, {'P', sizeof(void *), VOID_P_ALIGN, nu_void_p, np_void_p}, @@ -783,8 +809,7 @@ bu_uint(const char *p, const formatdef *f) static PyObject * bu_longlong(const char *p, const formatdef *f) { -#ifdef HAVE_LONG_LONG - PY_LONG_LONG x = 0; + long long x = 0; Py_ssize_t i = f->size; const unsigned char *bytes = (const unsigned char *)p; do { @@ -792,37 +817,30 @@ bu_longlong(const char *p, const formatdef *f) } while (--i > 0); /* Extend the sign bit. */ if (SIZEOF_LONG_LONG > f->size) - x |= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1))); + x |= -(x & ((long long)1 << ((8 * f->size) - 1))); if (x >= LONG_MIN && x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, long long, long)); return PyLong_FromLongLong(x); -#else - return _PyLong_FromByteArray((const unsigned char *)p, - 8, - 0, /* little-endian */ - 1 /* signed */); -#endif } static PyObject * bu_ulonglong(const char *p, const formatdef *f) { -#ifdef HAVE_LONG_LONG - unsigned PY_LONG_LONG x = 0; + unsigned long long x = 0; Py_ssize_t i = f->size; const unsigned char *bytes = (const unsigned char *)p; do { x = (x<<8) | *bytes++; } while (--i > 0); if (x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned long long, long)); return PyLong_FromUnsignedLongLong(x); -#else - return _PyLong_FromByteArray((const unsigned char *)p, - 8, - 0, /* little-endian */ - 0 /* signed */); -#endif +} + +static PyObject * +bu_halffloat(const char *p, const formatdef *f) +{ + return unpack_halffloat(p, 0); } static PyObject * @@ -850,7 +868,6 @@ bp_int(char *p, PyObject *v, const formatdef *f) { long x; Py_ssize_t i; - unsigned char *q = (unsigned char *)p; if (get_long(v, &x) < 0) return -1; i = f->size; @@ -863,7 +880,7 @@ bp_int(char *p, PyObject *v, const formatdef *f) #endif } do { - q[--i] = (unsigned char)(x & 0xffL); + p[--i] = (char)x; x >>= 8; } while (i > 0); return 0; @@ -874,7 +891,6 @@ bp_uint(char *p, PyObject *v, const formatdef *f) { unsigned long x; Py_ssize_t i; - unsigned char *q = (unsigned char *)p; if (get_ulong(v, &x) < 0) return -1; i = f->size; @@ -885,7 +901,7 @@ bp_uint(char *p, PyObject *v, const formatdef *f) RANGE_ERROR(x, f, 1, maxint - 1); } do { - q[--i] = (unsigned char)(x & 0xffUL); + p[--i] = (char)x; x >>= 8; } while (i > 0); return 0; @@ -924,6 +940,12 @@ bp_ulonglong(char *p, PyObject *v, const formatdef *f) } static int +bp_halffloat(char *p, PyObject *v, const formatdef *f) +{ + return pack_halffloat(p, v, 0); +} + +static int bp_float(char *p, PyObject *v, const formatdef *f) { double x = PyFloat_AsDouble(v); @@ -974,6 +996,7 @@ static formatdef bigendian_table[] = { {'q', 8, 0, bu_longlong, bp_longlong}, {'Q', 8, 0, bu_ulonglong, bp_ulonglong}, {'?', 1, 0, bu_bool, bp_bool}, + {'e', 2, 0, bu_halffloat, bp_halffloat}, {'f', 4, 0, bu_float, bp_float}, {'d', 8, 0, bu_double, bp_double}, {0} @@ -1013,8 +1036,7 @@ lu_uint(const char *p, const formatdef *f) static PyObject * lu_longlong(const char *p, const formatdef *f) { -#ifdef HAVE_LONG_LONG - PY_LONG_LONG x = 0; + long long x = 0; Py_ssize_t i = f->size; const unsigned char *bytes = (const unsigned char *)p; do { @@ -1022,37 +1044,30 @@ lu_longlong(const char *p, const formatdef *f) } while (i > 0); /* Extend the sign bit. */ if (SIZEOF_LONG_LONG > f->size) - x |= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1))); + x |= -(x & ((long long)1 << ((8 * f->size) - 1))); if (x >= LONG_MIN && x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, long long, long)); return PyLong_FromLongLong(x); -#else - return _PyLong_FromByteArray((const unsigned char *)p, - 8, - 1, /* little-endian */ - 1 /* signed */); -#endif } static PyObject * lu_ulonglong(const char *p, const formatdef *f) { -#ifdef HAVE_LONG_LONG - unsigned PY_LONG_LONG x = 0; + unsigned long long x = 0; Py_ssize_t i = f->size; const unsigned char *bytes = (const unsigned char *)p; do { x = (x<<8) | bytes[--i]; } while (i > 0); if (x <= LONG_MAX) - return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long)); + return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned long long, long)); return PyLong_FromUnsignedLongLong(x); -#else - return _PyLong_FromByteArray((const unsigned char *)p, - 8, - 1, /* little-endian */ - 0 /* signed */); -#endif +} + +static PyObject * +lu_halffloat(const char *p, const formatdef *f) +{ + return unpack_halffloat(p, 1); } static PyObject * @@ -1072,7 +1087,6 @@ lp_int(char *p, PyObject *v, const formatdef *f) { long x; Py_ssize_t i; - unsigned char *q = (unsigned char *)p; if (get_long(v, &x) < 0) return -1; i = f->size; @@ -1085,7 +1099,7 @@ lp_int(char *p, PyObject *v, const formatdef *f) #endif } do { - *q++ = (unsigned char)(x & 0xffL); + *p++ = (char)x; x >>= 8; } while (--i > 0); return 0; @@ -1096,7 +1110,6 @@ lp_uint(char *p, PyObject *v, const formatdef *f) { unsigned long x; Py_ssize_t i; - unsigned char *q = (unsigned char *)p; if (get_ulong(v, &x) < 0) return -1; i = f->size; @@ -1107,7 +1120,7 @@ lp_uint(char *p, PyObject *v, const formatdef *f) RANGE_ERROR(x, f, 1, maxint - 1); } do { - *q++ = (unsigned char)(x & 0xffUL); + *p++ = (char)x; x >>= 8; } while (--i > 0); return 0; @@ -1146,6 +1159,12 @@ lp_ulonglong(char *p, PyObject *v, const formatdef *f) } static int +lp_halffloat(char *p, PyObject *v, const formatdef *f) +{ + return pack_halffloat(p, v, 1); +} + +static int lp_float(char *p, PyObject *v, const formatdef *f) { double x = PyFloat_AsDouble(v); @@ -1186,6 +1205,7 @@ static formatdef lilendian_table[] = { {'Q', 8, 0, lu_ulonglong, lp_ulonglong}, {'?', 1, 0, bu_bool, bp_bool}, /* Std rep not endian dep, but potentially different from native rep -- reuse bx_bool funcs. */ + {'e', 2, 0, lu_halffloat, lp_halffloat}, {'f', 4, 0, lu_float, lp_float}, {'d', 8, 0, lu_double, lp_double}, {0} @@ -1193,7 +1213,7 @@ static formatdef lilendian_table[] = { static const formatdef * -whichtable(char **pfmt) +whichtable(const char **pfmt) { const char *fmt = (*pfmt)++; /* May be backed out of later */ switch (*fmt) { @@ -1272,7 +1292,7 @@ prepare_s(PyStructObject *self) fmt = PyBytes_AS_STRING(self->s_format); - f = whichtable((char **)&fmt); + f = whichtable(&fmt); s = fmt; size = 0; @@ -1460,7 +1480,7 @@ s_dealloc(PyStructObject *s) } static PyObject * -s_unpack_internal(PyStructObject *soself, char *startfrom) { +s_unpack_internal(PyStructObject *soself, const char *startfrom) { formatcode *code; Py_ssize_t i = 0; PyObject *result = PyTuple_New(soself->s_len); @@ -2243,7 +2263,7 @@ these can be preceded by a decimal repeat count:\n\ x: pad byte (no data); c:char; b:signed byte; B:unsigned byte;\n\ ?: _Bool (requires C99; if not available, char is used instead)\n\ h:short; H:unsigned short; i:int; I:unsigned int;\n\ - l:long; L:unsigned long; f:float; d:double.\n\ + l:long; L:unsigned long; f:float; d:double; e:half-float.\n\ Special cases (preceding decimal count indicates length):\n\ s:string (array of char); p: pascal string (with count byte).\n\ Special cases (only available in native format):\n\ @@ -2283,7 +2303,7 @@ PyInit__struct(void) /* Check endian and swap in faster functions */ { - formatdef *native = native_table; + const formatdef *native = native_table; formatdef *other, *ptr; #if PY_LITTLE_ENDIAN other = lilendian_table; diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c index 0885a03..13d3ccc 100644 --- a/Modules/_testbuffer.c +++ b/Modules/_testbuffer.c @@ -13,7 +13,7 @@ PyObject *Struct = NULL; PyObject *calcsize = NULL; /* cache simple format string */ -static const char *simple_fmt = "B"; +static const char simple_fmt[] = "B"; PyObject *simple_format = NULL; #define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0) #define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt) @@ -1714,10 +1714,10 @@ init_slice(Py_buffer *base, PyObject *key, int dim) { Py_ssize_t start, stop, step, slicelength; - if (PySlice_Unpack(key, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(key, base->shape[dim], + &start, &stop, &step, &slicelength) < 0) { return -1; } - slicelength = PySlice_AdjustIndices(base->shape[dim], &start, &stop, step); if (base->suboffsets == NULL || dim == 0) { @@ -1934,10 +1934,9 @@ slice_indices(PyObject *self, PyObject *args) "first argument must be a slice object"); return NULL; } - if (PySlice_Unpack(key, &s[0], &s[1], &s[2]) < 0) { + if (PySlice_GetIndicesEx(key, len, &s[0], &s[1], &s[2], &s[3]) < 0) { return NULL; } - s[3] = PySlice_AdjustIndices(len, &s[0], &s[1], s[2]); ret = PyTuple_New(4); if (ret == NULL) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index fabcaab..f09205f 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -60,9 +60,7 @@ test_config(PyObject *self) CHECK_SIZEOF(SIZEOF_LONG, long); CHECK_SIZEOF(SIZEOF_VOID_P, void*); CHECK_SIZEOF(SIZEOF_TIME_T, time_t); -#ifdef HAVE_LONG_LONG - CHECK_SIZEOF(SIZEOF_LONG_LONG, PY_LONG_LONG); -#endif + CHECK_SIZEOF(SIZEOF_LONG_LONG, long long); #undef CHECK_SIZEOF @@ -100,22 +98,14 @@ test_sizeof_c_types(PyObject *self) CHECK_SIGNNESS(Py_UCS1, 0); CHECK_SIGNNESS(Py_UCS2, 0); CHECK_SIGNNESS(Py_UCS4, 0); -#ifdef HAVE_INT32_T - CHECK_SIZEOF(PY_INT32_T, 4); - CHECK_SIGNNESS(PY_INT32_T, 1); -#endif -#ifdef HAVE_UINT32_T - CHECK_SIZEOF(PY_UINT32_T, 4); - CHECK_SIGNNESS(PY_UINT32_T, 0); -#endif -#ifdef HAVE_INT64_T - CHECK_SIZEOF(PY_INT64_T, 8); - CHECK_SIGNNESS(PY_INT64_T, 1); -#endif -#ifdef HAVE_UINT64_T - CHECK_SIZEOF(PY_UINT64_T, 8); - CHECK_SIGNNESS(PY_UINT64_T, 0); -#endif + CHECK_SIZEOF(int32_t, 4); + CHECK_SIGNNESS(int32_t, 1); + CHECK_SIZEOF(uint32_t, 4); + CHECK_SIGNNESS(uint32_t, 0); + CHECK_SIZEOF(int64_t, 8); + CHECK_SIGNNESS(int64_t, 1); + CHECK_SIZEOF(uint64_t, 8); + CHECK_SIGNNESS(uint64_t, 0); /* pointer/size types */ CHECK_SIZEOF(size_t, sizeof(void *)); @@ -123,10 +113,10 @@ test_sizeof_c_types(PyObject *self) CHECK_SIZEOF(Py_ssize_t, sizeof(void *)); CHECK_SIGNNESS(Py_ssize_t, 1); - CHECK_SIZEOF(Py_uintptr_t, sizeof(void *)); - CHECK_SIGNNESS(Py_uintptr_t, 0); - CHECK_SIZEOF(Py_intptr_t, sizeof(void *)); - CHECK_SIGNNESS(Py_intptr_t, 1); + CHECK_SIZEOF(uintptr_t, sizeof(void *)); + CHECK_SIGNNESS(uintptr_t, 0); + CHECK_SIZEOF(intptr_t, sizeof(void *)); + CHECK_SIGNNESS(intptr_t, 1); Py_INCREF(Py_None); return Py_None; @@ -248,13 +238,37 @@ test_dict_iteration(PyObject* self) return Py_None; } +static PyObject* +dict_getitem_knownhash(PyObject *self, PyObject *args) +{ + PyObject *mp, *key, *result; + Py_ssize_t hash; + + if (!PyArg_ParseTuple(args, "OOn:dict_getitem_knownhash", + &mp, &key, &hash)) { + return NULL; + } + + result = _PyDict_GetItem_KnownHash(mp, key, (Py_hash_t)hash); + if (result == NULL && !PyErr_Occurred()) { + _PyErr_SetKeyError(key); + return NULL; + } + + Py_XINCREF(result); + return result; +} static PyObject* dict_hassplittable(PyObject *self, PyObject *arg) { - if (!PyArg_Parse(arg, "O!:dict_hassplittable", &PyDict_Type, &arg)) { + if (!PyDict_Check(arg)) { + PyErr_Format(PyExc_TypeError, + "dict_hassplittable() argument must be dict, not '%s'", + arg->ob_type->tp_name); return NULL; } + return PyBool_FromLong(_PyDict_HasSplitTable((PyDictObject*)arg)); } @@ -366,12 +380,12 @@ test_lazy_hash_inheritance(PyObject* self) } -/* Tests of PyLong_{As, From}{Unsigned,}Long(), and (#ifdef HAVE_LONG_LONG) +/* Tests of PyLong_{As, From}{Unsigned,}Long(), and PyLong_{As, From}{Unsigned,}LongLong(). Note that the meat of the test is contained in testcapi_long.h. This is revolting, but delicate code duplication is worse: "almost - exactly the same" code is needed to test PY_LONG_LONG, but the ubiquitous + exactly the same" code is needed to test long long, but the ubiquitous dependence on type names makes it impossible to use a parameterized function. A giant macro would be even worse than this. A C++ template would be perfect. @@ -411,8 +425,6 @@ test_long_api(PyObject* self) #undef F_U_TO_PY #undef F_PY_TO_U -#ifdef HAVE_LONG_LONG - static PyObject * raise_test_longlong_error(const char* msg) { @@ -420,7 +432,7 @@ raise_test_longlong_error(const char* msg) } #define TESTNAME test_longlong_api_inner -#define TYPENAME PY_LONG_LONG +#define TYPENAME long long #define F_S_TO_PY PyLong_FromLongLong #define F_PY_TO_S PyLong_AsLongLong #define F_U_TO_PY PyLong_FromUnsignedLongLong @@ -607,7 +619,7 @@ test_long_and_overflow(PyObject *self) } /* Test the PyLong_AsLongLongAndOverflow API. General conversion to - PY_LONG_LONG is tested by test_long_api_inner. This test will + long long is tested by test_long_api_inner. This test will concentrate on proper handling of overflow. */ @@ -615,7 +627,7 @@ static PyObject * test_long_long_and_overflow(PyObject *self) { PyObject *num, *one, *temp; - PY_LONG_LONG value; + long long value; int overflow; /* Test that overflow is set properly for a large value. */ @@ -833,7 +845,7 @@ test_long_as_double(PyObject *self) return Py_None; } -/* Test the L code for PyArg_ParseTuple. This should deliver a PY_LONG_LONG +/* Test the L code for PyArg_ParseTuple. This should deliver a long long for both long and int arguments. The test may leak a little memory if it fails. */ @@ -841,7 +853,7 @@ static PyObject * test_L_code(PyObject *self) { PyObject *tuple, *num; - PY_LONG_LONG value; + long long value; tuple = PyTuple_New(1); if (tuple == NULL) @@ -879,8 +891,6 @@ test_L_code(PyObject *self) return Py_None; } -#endif /* ifdef HAVE_LONG_LONG */ - static PyObject * return_none(void *unused) { @@ -1010,7 +1020,7 @@ static PyObject * getargs_keywords(PyObject *self, PyObject *args, PyObject *kwargs) { static char *keywords[] = {"arg1","arg2","arg3","arg4","arg5", NULL}; - static char *fmt="(ii)i|(i(ii))(iii)i"; + static const char fmt[] = "(ii)i|(i(ii))(iii)i"; int int_args[10]={-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords, @@ -1037,6 +1047,21 @@ getargs_keyword_only(PyObject *self, PyObject *args, PyObject *kwargs) return Py_BuildValue("iii", required, optional, keyword_only); } +/* test PyArg_ParseTupleAndKeywords positional-only arguments */ +static PyObject * +getargs_positional_only_and_keywords(PyObject *self, PyObject *args, PyObject *kwargs) +{ + static char *keywords[] = {"", "", "keyword", NULL}; + int required = -1; + int optional = -1; + int keyword = -1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii", keywords, + &required, &optional, &keyword)) + return NULL; + return Py_BuildValue("iii", required, optional, keyword); +} + /* Functions to call PyArg_ParseTuple with integer format codes, and return the result. */ @@ -1130,11 +1155,10 @@ getargs_p(PyObject *self, PyObject *args) return PyLong_FromLong(value); } -#ifdef HAVE_LONG_LONG static PyObject * getargs_L(PyObject *self, PyObject *args) { - PY_LONG_LONG value; + long long value; if (!PyArg_ParseTuple(args, "L", &value)) return NULL; return PyLong_FromLongLong(value); @@ -1143,12 +1167,11 @@ getargs_L(PyObject *self, PyObject *args) static PyObject * getargs_K(PyObject *self, PyObject *args) { - unsigned PY_LONG_LONG value; + unsigned long long value; if (!PyArg_ParseTuple(args, "K", &value)) return NULL; return PyLong_FromUnsignedLongLong(value); } -#endif /* This function not only tests the 'k' getargs code, but also the PyLong_AsUnsignedLongMask() and PyLong_AsUnsignedLongMask() functions. */ @@ -1170,7 +1193,7 @@ test_k_code(PyObject *self) value = PyLong_AsUnsignedLongMask(num); if (value != ULONG_MAX) return raiseTestError("test_k_code", - "PyLong_AsUnsignedLongMask() returned wrong value for long 0xFFF...FFF"); + "PyLong_AsUnsignedLongMask() returned wrong value for long 0xFFF...FFF"); PyTuple_SET_ITEM(tuple, 0, num); @@ -1189,7 +1212,7 @@ test_k_code(PyObject *self) value = PyLong_AsUnsignedLongMask(num); if (value != (unsigned long)-0x42) return raiseTestError("test_k_code", - "PyLong_AsUnsignedLongMask() returned wrong value for long 0xFFF...FFF"); + "PyLong_AsUnsignedLongMask() returned wrong value for long 0xFFF...FFF"); PyTuple_SET_ITEM(tuple, 0, num); @@ -1548,7 +1571,7 @@ parse_tuple_and_keywords(PyObject *self, PyObject *args) { PyObject *sub_args; PyObject *sub_kwargs; - const char *sub_format; + char *sub_format; PyObject *sub_keywords; Py_ssize_t i, size; @@ -1561,7 +1584,7 @@ parse_tuple_and_keywords(PyObject *self, PyObject *args) double buffers[8][4]; /* double ensures alignment where necessary */ - if (!PyArg_ParseTuple(args, "OOsO:parse_tuple_and_keywords", + if (!PyArg_ParseTuple(args, "OOyO:parse_tuple_and_keywords", &sub_args, &sub_kwargs, &sub_format, &sub_keywords)) return NULL; @@ -2202,7 +2225,7 @@ _make_call(void *callable) PyObject *rc; int success; PyGILState_STATE s = PyGILState_Ensure(); - rc = PyObject_CallFunction((PyObject *)callable, ""); + rc = _PyObject_CallNoArg((PyObject *)callable); success = (rc != NULL); Py_XDECREF(rc); PyGILState_Release(s); @@ -2336,10 +2359,8 @@ test_string_from_format(PyObject *self, PyObject *args) CHECK_1_FORMAT("%zu", size_t); /* "%lld" and "%llu" support added in Python 2.7. */ -#ifdef HAVE_LONG_LONG - CHECK_1_FORMAT("%llu", unsigned PY_LONG_LONG); - CHECK_1_FORMAT("%lld", PY_LONG_LONG); -#endif + CHECK_1_FORMAT("%llu", unsigned long long); + CHECK_1_FORMAT("%lld", long long); Py_RETURN_NONE; @@ -2384,7 +2405,7 @@ test_string_to_double(PyObject *self) { result = PyOS_string_to_double(STR, NULL, NULL); \ if (result == -1.0 && PyErr_Occurred()) \ return NULL; \ - if (result != expected) { \ + if (result != (double)expected) { \ msg = "conversion of " STR " to float failed"; \ goto fail; \ } @@ -2976,7 +2997,9 @@ run_in_subinterp(PyObject *self, PyObject *args) static int check_time_rounding(int round) { - if (round != _PyTime_ROUND_FLOOR && round != _PyTime_ROUND_CEILING) { + if (round != _PyTime_ROUND_FLOOR + && round != _PyTime_ROUND_CEILING + && round != _PyTime_ROUND_HALF_EVEN) { PyErr_SetString(PyExc_ValueError, "invalid rounding"); return -1; } @@ -3471,7 +3494,7 @@ temporary_c_thread(void *data) /* Allocate a Python thread state for this thread */ state = PyGILState_Ensure(); - res = PyObject_CallFunction(test_c_thread->callback, "", NULL); + res = _PyObject_CallNoArg(test_c_thread->callback); Py_CLEAR(test_c_thread->callback); if (res == NULL) { @@ -3761,7 +3784,7 @@ test_pytime_fromsecondsobject(PyObject *self, PyObject *args) static PyObject * test_pytime_assecondsdouble(PyObject *self, PyObject *args) { - PY_LONG_LONG ns; + long long ns; _PyTime_t ts; double d; @@ -3775,7 +3798,7 @@ test_pytime_assecondsdouble(PyObject *self, PyObject *args) static PyObject * test_PyTime_AsTimeval(PyObject *self, PyObject *args) { - PY_LONG_LONG ns; + long long ns; int round; _PyTime_t t; struct timeval tv; @@ -3789,7 +3812,7 @@ test_PyTime_AsTimeval(PyObject *self, PyObject *args) if (_PyTime_AsTimeval(t, &tv, round) < 0) return NULL; - seconds = PyLong_FromLong((PY_LONG_LONG)tv.tv_sec); + seconds = PyLong_FromLong((long long)tv.tv_sec); if (seconds == NULL) return NULL; return Py_BuildValue("Nl", seconds, tv.tv_usec); @@ -3799,7 +3822,7 @@ test_PyTime_AsTimeval(PyObject *self, PyObject *args) static PyObject * test_PyTime_AsTimespec(PyObject *self, PyObject *args) { - PY_LONG_LONG ns; + long long ns; _PyTime_t t; struct timespec ts; @@ -3815,7 +3838,7 @@ test_PyTime_AsTimespec(PyObject *self, PyObject *args) static PyObject * test_PyTime_AsMilliseconds(PyObject *self, PyObject *args) { - PY_LONG_LONG ns; + long long ns; int round; _PyTime_t t, ms; @@ -3833,7 +3856,7 @@ test_PyTime_AsMilliseconds(PyObject *self, PyObject *args) static PyObject * test_PyTime_AsMicroseconds(PyObject *self, PyObject *args) { - PY_LONG_LONG ns; + long long ns; int round; _PyTime_t t, ms; @@ -3857,6 +3880,152 @@ get_recursion_depth(PyObject *self, PyObject *args) return PyLong_FromLong(tstate->recursion_depth - 1); } +static PyObject* +pymem_buffer_overflow(PyObject *self, PyObject *args) +{ + char *buffer; + + /* Deliberate buffer overflow to check that PyMem_Free() detects + the overflow when debug hooks are installed. */ + buffer = PyMem_Malloc(16); + buffer[16] = 'x'; + PyMem_Free(buffer); + + Py_RETURN_NONE; +} + +static PyObject* +pymem_api_misuse(PyObject *self, PyObject *args) +{ + char *buffer; + + /* Deliberate misusage of Python allocators: + allococate with PyMem but release with PyMem_Raw. */ + buffer = PyMem_Malloc(16); + PyMem_RawFree(buffer); + + Py_RETURN_NONE; +} + +static PyObject* +pymem_malloc_without_gil(PyObject *self, PyObject *args) +{ + char *buffer; + + /* Deliberate bug to test debug hooks on Python memory allocators: + call PyMem_Malloc() without holding the GIL */ + Py_BEGIN_ALLOW_THREADS + buffer = PyMem_Malloc(10); + Py_END_ALLOW_THREADS + + PyMem_Free(buffer); + + Py_RETURN_NONE; +} + +static PyObject* +pyobject_malloc_without_gil(PyObject *self, PyObject *args) +{ + char *buffer; + + /* Deliberate bug to test debug hooks on Python memory allocators: + call PyObject_Malloc() without holding the GIL */ + Py_BEGIN_ALLOW_THREADS + buffer = PyObject_Malloc(10); + Py_END_ALLOW_THREADS + + PyObject_Free(buffer); + + Py_RETURN_NONE; +} + +static PyObject * +tracemalloc_track(PyObject *self, PyObject *args) +{ + unsigned int domain; + PyObject *ptr_obj; + void *ptr; + Py_ssize_t size; + int release_gil = 0; + int res; + + if (!PyArg_ParseTuple(args, "IOn|i", &domain, &ptr_obj, &size, &release_gil)) + return NULL; + ptr = PyLong_AsVoidPtr(ptr_obj); + if (PyErr_Occurred()) + return NULL; + + if (release_gil) { + Py_BEGIN_ALLOW_THREADS + res = _PyTraceMalloc_Track(domain, (uintptr_t)ptr, size); + Py_END_ALLOW_THREADS + } + else { + res = _PyTraceMalloc_Track(domain, (uintptr_t)ptr, size); + } + + if (res < 0) { + PyErr_SetString(PyExc_RuntimeError, "_PyTraceMalloc_Track error"); + return NULL; + } + + Py_RETURN_NONE; +} + +static PyObject * +tracemalloc_untrack(PyObject *self, PyObject *args) +{ + unsigned int domain; + PyObject *ptr_obj; + void *ptr; + int res; + + if (!PyArg_ParseTuple(args, "IO", &domain, &ptr_obj)) + return NULL; + ptr = PyLong_AsVoidPtr(ptr_obj); + if (PyErr_Occurred()) + return NULL; + + res = _PyTraceMalloc_Untrack(domain, (uintptr_t)ptr); + if (res < 0) { + PyErr_SetString(PyExc_RuntimeError, "_PyTraceMalloc_Track error"); + return NULL; + } + + Py_RETURN_NONE; +} + +static PyObject * +tracemalloc_get_traceback(PyObject *self, PyObject *args) +{ + unsigned int domain; + PyObject *ptr_obj; + void *ptr; + + if (!PyArg_ParseTuple(args, "IO", &domain, &ptr_obj)) + return NULL; + ptr = PyLong_AsVoidPtr(ptr_obj); + if (PyErr_Occurred()) + return NULL; + + return _PyTraceMalloc_GetTraceback(domain, (uintptr_t)ptr); +} + +static PyObject * +dict_get_version(PyObject *self, PyObject *args) +{ + PyDictObject *dict; + uint64_t version; + + if (!PyArg_ParseTuple(args, "O!", &PyDict_Type, &dict)) + return NULL; + + version = dict->ma_version_tag; + + Py_BUILD_ASSERT(sizeof(unsigned PY_LONG_LONG) >= sizeof(version)); + return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)version); +} + static PyMethodDef TestMethods[] = { {"raise_exception", raise_exception, METH_VARARGS}, @@ -3867,6 +4036,7 @@ static PyMethodDef TestMethods[] = { {"test_datetime_capi", test_datetime_capi, METH_NOARGS}, {"test_list_api", (PyCFunction)test_list_api, METH_NOARGS}, {"test_dict_iteration", (PyCFunction)test_dict_iteration,METH_NOARGS}, + {"dict_getitem_knownhash", dict_getitem_knownhash, METH_VARARGS}, {"dict_hassplittable", dict_hassplittable, METH_O}, {"test_lazy_hash_inheritance", (PyCFunction)test_lazy_hash_inheritance,METH_NOARGS}, {"test_long_api", (PyCFunction)test_long_api, METH_NOARGS}, @@ -3903,6 +4073,9 @@ static PyMethodDef TestMethods[] = { METH_VARARGS|METH_KEYWORDS}, {"getargs_keyword_only", (PyCFunction)getargs_keyword_only, METH_VARARGS|METH_KEYWORDS}, + {"getargs_positional_only_and_keywords", + (PyCFunction)getargs_positional_only_and_keywords, + METH_VARARGS|METH_KEYWORDS}, {"getargs_b", getargs_b, METH_VARARGS}, {"getargs_B", getargs_B, METH_VARARGS}, {"getargs_h", getargs_h, METH_VARARGS}, @@ -3913,14 +4086,12 @@ static PyMethodDef TestMethods[] = { {"getargs_l", getargs_l, METH_VARARGS}, {"getargs_n", getargs_n, METH_VARARGS}, {"getargs_p", getargs_p, METH_VARARGS}, -#ifdef HAVE_LONG_LONG {"getargs_L", getargs_L, METH_VARARGS}, {"getargs_K", getargs_K, METH_VARARGS}, {"test_longlong_api", test_longlong_api, METH_NOARGS}, {"test_long_long_and_overflow", (PyCFunction)test_long_long_and_overflow, METH_NOARGS}, {"test_L_code", (PyCFunction)test_L_code, METH_NOARGS}, -#endif {"getargs_f", getargs_f, METH_VARARGS}, {"getargs_d", getargs_d, METH_VARARGS}, {"getargs_D", getargs_D, METH_VARARGS}, @@ -4051,6 +4222,14 @@ static PyMethodDef TestMethods[] = { {"PyTime_AsMilliseconds", test_PyTime_AsMilliseconds, METH_VARARGS}, {"PyTime_AsMicroseconds", test_PyTime_AsMicroseconds, METH_VARARGS}, {"get_recursion_depth", get_recursion_depth, METH_NOARGS}, + {"pymem_buffer_overflow", pymem_buffer_overflow, METH_NOARGS}, + {"pymem_api_misuse", pymem_api_misuse, METH_NOARGS}, + {"pymem_malloc_without_gil", pymem_malloc_without_gil, METH_NOARGS}, + {"pyobject_malloc_without_gil", pyobject_malloc_without_gil, METH_NOARGS}, + {"tracemalloc_track", tracemalloc_track, METH_VARARGS}, + {"tracemalloc_untrack", tracemalloc_untrack, METH_VARARGS}, + {"tracemalloc_get_traceback", tracemalloc_get_traceback, METH_VARARGS}, + {"dict_get_version", dict_get_version, METH_VARARGS}, {NULL, NULL} /* sentinel */ }; @@ -4070,10 +4249,8 @@ typedef struct { float float_member; double double_member; char inplace_member[6]; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG longlong_member; - unsigned PY_LONG_LONG ulonglong_member; -#endif + long long longlong_member; + unsigned long long ulonglong_member; } all_structmembers; typedef struct { @@ -4095,10 +4272,8 @@ static struct PyMemberDef test_members[] = { {"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL}, {"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL}, {"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL}, -#ifdef HAVE_LONG_LONG {"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL}, {"T_ULONGLONG", T_ULONGLONG, offsetof(test_structmembers, structmembers.ulonglong_member), 0, NULL}, -#endif {NULL} }; @@ -4110,15 +4285,9 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) "T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT", "T_LONG", "T_ULONG", "T_PYSSIZET", "T_FLOAT", "T_DOUBLE", "T_STRING_INPLACE", -#ifdef HAVE_LONG_LONG "T_LONGLONG", "T_ULONGLONG", -#endif NULL}; - static char *fmt = "|bbBhHiIlknfds#" -#ifdef HAVE_LONG_LONG - "LK" -#endif - ; + static const char fmt[] = "|bbBhHiIlknfds#LK"; test_structmembers *ob; const char *s = NULL; Py_ssize_t string_len = 0; @@ -4140,10 +4309,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) &ob->structmembers.float_member, &ob->structmembers.double_member, &s, &string_len -#ifdef HAVE_LONG_LONG , &ob->structmembers.longlong_member, &ob->structmembers.ulonglong_member -#endif )) { Py_DECREF(ob); return NULL; @@ -4469,6 +4636,7 @@ PyInit__testcapi(void) PyModule_AddObject(m, "PY_SSIZE_T_MAX", PyLong_FromSsize_t(PY_SSIZE_T_MAX)); PyModule_AddObject(m, "PY_SSIZE_T_MIN", PyLong_FromSsize_t(PY_SSIZE_T_MIN)); PyModule_AddObject(m, "SIZEOF_PYGC_HEAD", PyLong_FromSsize_t(sizeof(PyGC_Head))); + PyModule_AddObject(m, "SIZEOF_TIME_T", PyLong_FromSsize_t(sizeof(time_t))); Py_INCREF(&PyInstanceMethod_Type); PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type); diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index 41da997..4daa34e 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -61,7 +61,7 @@ Example_getattro(ExampleObject *self, PyObject *name) } static int -Example_setattr(ExampleObject *self, char *name, PyObject *v) +Example_setattr(ExampleObject *self, const char *name, PyObject *v) { if (self->x_attr == NULL) { self->x_attr = PyDict_New(); diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 34f2d09..3e96aa0 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -462,7 +462,7 @@ Split(const char *list) v = NULL; break; } - PyTuple_SetItem(v, i, w); + PyTuple_SET_ITEM(v, i, w); } } Tcl_Free(FREECAST argv); @@ -480,13 +480,13 @@ SplitObj(PyObject *arg) Py_ssize_t i, size; PyObject *elem, *newelem, *result; - size = PyTuple_Size(arg); + size = PyTuple_GET_SIZE(arg); result = NULL; /* Recursively invoke SplitObj for all tuple items. If this does not return a new object, no action is needed. */ for(i = 0; i < size; i++) { - elem = PyTuple_GetItem(arg, i); + elem = PyTuple_GET_ITEM(arg, i); newelem = SplitObj(elem); if (!newelem) { Py_XDECREF(result); @@ -502,12 +502,12 @@ SplitObj(PyObject *arg) if (!result) return NULL; for(k = 0; k < i; k++) { - elem = PyTuple_GetItem(arg, k); + elem = PyTuple_GET_ITEM(arg, k); Py_INCREF(elem); - PyTuple_SetItem(result, k, elem); + PyTuple_SET_ITEM(result, k, elem); } } - PyTuple_SetItem(result, i, newelem); + PyTuple_SET_ITEM(result, i, newelem); } if (result) return result; @@ -529,7 +529,7 @@ SplitObj(PyObject *arg) Py_XDECREF(result); return NULL; } - PyTuple_SetItem(result, i, newelem); + PyTuple_SET_ITEM(result, i, newelem); } return result; } @@ -551,7 +551,7 @@ SplitObj(PyObject *arg) else if (PyBytes_Check(arg)) { int argc; const char **argv; - char *list = PyBytes_AsString(arg); + char *list = PyBytes_AS_STRING(arg); if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) { Py_INCREF(arg); @@ -559,7 +559,7 @@ SplitObj(PyObject *arg) } Tcl_Free(FREECAST argv); if (argc > 1) - return Split(PyBytes_AsString(arg)); + return Split(PyBytes_AS_STRING(arg)); /* Fall through, returning arg. */ } Py_INCREF(arg); @@ -758,7 +758,7 @@ Tkapp_New(const char *screenName, const char *className, } Tcl_SetVar(v->interp, "tcl_library", - PyBytes_AsString(utf8_path), + PyBytes_AS_STRING(utf8_path), TCL_GLOBAL_ONLY); Py_DECREF(utf8_path); } @@ -841,7 +841,7 @@ PyTclObject_dealloc(PyTclObject *self) Py_DECREF(tp); } -static char* +static const char * PyTclObject_TclString(PyObject *self) { return Tcl_GetString(((PyTclObject*)self)->value); @@ -976,7 +976,7 @@ static PyType_Spec PyTclObject_Type_spec = { }; -#if PY_SIZE_MAX > INT_MAX +#if SIZE_MAX > INT_MAX #define CHECK_STRING_LENGTH(s) do { \ if (s != NULL && strlen(s) >= INT_MAX) { \ PyErr_SetString(PyExc_OverflowError, "string is too long"); \ @@ -1182,10 +1182,8 @@ fromWideIntObj(PyObject* tkapp, Tcl_Obj *value) { Tcl_WideInt wideValue; if (Tcl_GetWideIntFromObj(Tkapp_Interp(tkapp), value, &wideValue) == TCL_OK) { -#ifdef HAVE_LONG_LONG if (sizeof(wideValue) <= SIZEOF_LONG_LONG) return PyLong_FromLongLong(wideValue); -#endif return _PyLong_FromByteArray((unsigned char *)(void *)&wideValue, sizeof(wideValue), PY_LITTLE_ENDIAN, @@ -1306,7 +1304,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value) Py_DECREF(result); return NULL; } - PyTuple_SetItem(result, i, elem); + PyTuple_SET_ITEM(result, i, elem); } return result; } @@ -1517,8 +1515,8 @@ Tkapp_Call(PyObject *selfptr, PyObject *args) int flags = TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL; /* If args is a single tuple, replace with contents of tuple */ - if (1 == PyTuple_Size(args)){ - PyObject* item = PyTuple_GetItem(args, 0); + if (PyTuple_GET_SIZE(args) == 1) { + PyObject *item = PyTuple_GET_ITEM(args, 0); if (PyTuple_Check(item)) args = item; } @@ -1726,14 +1724,14 @@ static int varname_converter(PyObject *in, void *_out) { char *s; - char **out = (char**)_out; + const char **out = (const char**)_out; if (PyBytes_Check(in)) { - if (PyBytes_Size(in) > INT_MAX) { + if (PyBytes_GET_SIZE(in) > INT_MAX) { PyErr_SetString(PyExc_OverflowError, "bytes object is too long"); return 0; } - s = PyBytes_AsString(in); - if (strlen(s) != (size_t)PyBytes_Size(in)) { + s = PyBytes_AS_STRING(in); + if (strlen(s) != (size_t)PyBytes_GET_SIZE(in)) { PyErr_SetString(PyExc_ValueError, "embedded null byte"); return 0; } @@ -1846,7 +1844,7 @@ var_invoke(EventFunc func, PyObject *selfptr, PyObject *args, int flags) static PyObject * SetVar(PyObject *self, PyObject *args, int flags) { - char *name1, *name2; + const char *name1, *name2; PyObject *newValue; PyObject *res = NULL; Tcl_Obj *newval, *ok; @@ -1915,7 +1913,7 @@ Tkapp_GlobalSetVar(PyObject *self, PyObject *args) static PyObject * GetVar(PyObject *self, PyObject *args, int flags) { - char *name1, *name2=NULL; + const char *name1, *name2=NULL; PyObject *res = NULL; Tcl_Obj *tres; @@ -2274,10 +2272,11 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg) return NULL; for (i = 0; i < objc; i++) { PyObject *s = FromObj((PyObject*)self, objv[i]); - if (!s || PyTuple_SetItem(v, i, s)) { + if (!s) { Py_DECREF(v); return NULL; } + PyTuple_SET_ITEM(v, i, s); } return v; } @@ -2304,11 +2303,12 @@ _tkinter_tkapp_splitlist(TkappObject *self, PyObject *arg) for (i = 0; i < argc; i++) { PyObject *s = unicodeFromTclString(argv[i]); - if (!s || PyTuple_SetItem(v, i, s)) { + if (!s) { Py_DECREF(v); v = NULL; goto finally; } + PyTuple_SET_ITEM(v, i, s); } finally: @@ -2349,10 +2349,11 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg) return NULL; for (i = 0; i < objc; i++) { PyObject *s = FromObj((PyObject*)self, objv[i]); - if (!s || PyTuple_SetItem(v, i, s)) { + if (!s) { Py_DECREF(v); return NULL; } + PyTuple_SET_ITEM(v, i, s); } return v; } @@ -2410,10 +2411,11 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[ for (i = 0; i < (argc - 1); i++) { PyObject *s = unicodeFromTclString(argv[i + 1]); - if (!s || PyTuple_SetItem(arg, i, s)) { + if (!s) { Py_DECREF(arg); return PythonCmd_Error(interp); } + PyTuple_SET_ITEM(arg, i, s); } res = PyEval_CallObject(func, arg); Py_DECREF(arg); @@ -2485,7 +2487,6 @@ Tkapp_CommandProc(CommandEvent *ev, int flags) /*[clinic input] _tkinter.tkapp.createcommand - self: self(type="TkappObject *") name: str func: object / @@ -2495,7 +2496,7 @@ _tkinter.tkapp.createcommand static PyObject * _tkinter_tkapp_createcommand_impl(TkappObject *self, const char *name, PyObject *func) -/*[clinic end generated code: output=2a1c79a4ee2af410 input=2bc2c046a0914234]*/ +/*[clinic end generated code: output=2a1c79a4ee2af410 input=255785cb70edc6a0]*/ { PythonCmd_ClientData *data; int err; @@ -2561,7 +2562,6 @@ _tkinter_tkapp_createcommand_impl(TkappObject *self, const char *name, /*[clinic input] _tkinter.tkapp.deletecommand - self: self(type="TkappObject *") name: str / @@ -2569,7 +2569,7 @@ _tkinter.tkapp.deletecommand static PyObject * _tkinter_tkapp_deletecommand_impl(TkappObject *self, const char *name) -/*[clinic end generated code: output=a67e8cb5845e0d2d input=b6306468f10b219c]*/ +/*[clinic end generated code: output=a67e8cb5845e0d2d input=53e9952eae1f85f5]*/ { int err; @@ -2762,13 +2762,11 @@ typedef struct { /*[clinic input] _tkinter.tktimertoken.deletetimerhandler - self: self(type="TkttObject *") - [clinic start generated code]*/ static PyObject * _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self) -/*[clinic end generated code: output=bd7fe17f328cfa55 input=25ba5dd594e52084]*/ +/*[clinic end generated code: output=bd7fe17f328cfa55 input=40bd070ff85f5cf3]*/ { TkttObject *v = self; PyObject *func = v->func; @@ -2894,7 +2892,6 @@ _tkinter_tkapp_createtimerhandler_impl(TkappObject *self, int milliseconds, /*[clinic input] _tkinter.tkapp.mainloop - self: self(type="TkappObject *") threshold: int = 0 / @@ -2902,7 +2899,7 @@ _tkinter.tkapp.mainloop static PyObject * _tkinter_tkapp_mainloop_impl(TkappObject *self, int threshold) -/*[clinic end generated code: output=0ba8eabbe57841b0 input=ad57c9c1dd2b9470]*/ +/*[clinic end generated code: output=0ba8eabbe57841b0 input=036bcdcf03d5eca0]*/ { #ifdef WITH_THREAD PyThreadState *tstate = PyThreadState_Get(); @@ -3072,13 +3069,11 @@ Tkapp_WantObjects(PyObject *self, PyObject *args) /*[clinic input] _tkinter.tkapp.willdispatch - self: self(type="TkappObject *") - [clinic start generated code]*/ static PyObject * _tkinter_tkapp_willdispatch_impl(TkappObject *self) -/*[clinic end generated code: output=0e3f46d244642155 input=2630699767808970]*/ +/*[clinic end generated code: output=0e3f46d244642155 input=d88f5970843d6dab]*/ { self->dispatching = 1; @@ -3620,7 +3615,7 @@ PyInit__tkinter(void) return NULL; } if (str_path != NULL) { - wcs_path = _PyUnicode_AsWideCharString(str_path); + wcs_path = PyUnicode_AsWideCharString(str_path, NULL); if (wcs_path == NULL) { return NULL; } @@ -3629,14 +3624,14 @@ PyInit__tkinter(void) } } - Tcl_FindExecutable(PyBytes_AsString(cexe)); + Tcl_FindExecutable(PyBytes_AS_STRING(cexe)); if (set_var) { SetEnvironmentVariableW(L"TCL_LIBRARY", NULL); PyMem_Free(wcs_path); } #else - Tcl_FindExecutable(PyBytes_AsString(cexe)); + Tcl_FindExecutable(PyBytes_AS_STRING(cexe)); #endif /* MS_WINDOWS */ } Py_XDECREF(cexe); diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index e2a8e69..ec8bd96 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -39,7 +39,11 @@ static struct { /* limit of the number of frames in a traceback, 1 by default. Variable protected by the GIL. */ int max_nframe; -} tracemalloc_config = {TRACEMALLOC_NOT_INITIALIZED, 0, 1}; + + /* use domain in trace key? + Variable protected by the GIL. */ + int use_domain; +} tracemalloc_config = {TRACEMALLOC_NOT_INITIALIZED, 0, 1, 0}; #if defined(TRACE_RAW_MALLOC) && defined(WITH_THREAD) /* This lock is needed because tracemalloc_free() is called without @@ -54,23 +58,34 @@ static PyThread_type_lock tables_lock; # define TABLES_UNLOCK() #endif + +#define DEFAULT_DOMAIN 0 + +/* Pack the frame_t structure to reduce the memory footprint. */ +typedef struct +#ifdef __GNUC__ +__attribute__((packed)) +#endif +{ + uintptr_t ptr; + _PyTraceMalloc_domain_t domain; +} pointer_t; + /* Pack the frame_t structure to reduce the memory footprint on 64-bit - architectures: 12 bytes instead of 16. This optimization might produce - SIGBUS on architectures not supporting unaligned memory accesses (64-bit - MIPS CPU?): on such architecture, the structure must not be packed. */ + architectures: 12 bytes instead of 16. */ typedef struct #ifdef __GNUC__ __attribute__((packed)) #elif defined(_MSC_VER) -#pragma pack(push, 4) +_declspec(align(4)) #endif { + /* filename cannot be NULL: "" is used if the Python frame + filename is NULL */ PyObject *filename; unsigned int lineno; } frame_t; -#ifdef _MSC_VER -#pragma pack(pop) -#endif + typedef struct { Py_uhash_t hash; @@ -84,6 +99,7 @@ typedef struct { #define MAX_NFRAME \ ((INT_MAX - (int)sizeof(traceback_t)) / (int)sizeof(frame_t) + 1) + static PyObject *unknown_filename = NULL; static traceback_t tracemalloc_empty_traceback; @@ -96,6 +112,7 @@ typedef struct { traceback_t *traceback; } trace_t; + /* Size in bytes of currently traced memory. Protected by TABLES_LOCK(). */ static size_t tracemalloc_traced_memory = 0; @@ -122,6 +139,7 @@ static _Py_hashtable_t *tracemalloc_tracebacks = NULL; Protected by TABLES_LOCK(). */ static _Py_hashtable_t *tracemalloc_traces = NULL; + #ifdef TRACE_DEBUG static void tracemalloc_error(const char *format, ...) @@ -136,6 +154,7 @@ tracemalloc_error(const char *format, ...) } #endif + #if defined(WITH_THREAD) && defined(TRACE_RAW_MALLOC) #define REENTRANT_THREADLOCAL @@ -146,7 +165,7 @@ tracemalloc_error(const char *format, ...) # error "need native thread local storage (TLS)" #endif -static int tracemalloc_reentrant_key; +static int tracemalloc_reentrant_key = -1; /* Any non-NULL pointer can be used */ #define REENTRANT Py_True @@ -154,7 +173,10 @@ static int tracemalloc_reentrant_key; static int get_reentrant(void) { - void *ptr = PyThread_get_key_value(tracemalloc_reentrant_key); + void *ptr; + + assert(tracemalloc_reentrant_key != -1); + ptr = PyThread_get_key_value(tracemalloc_reentrant_key); if (ptr != NULL) { assert(ptr == REENTRANT); return 1; @@ -167,12 +189,14 @@ static void set_reentrant(int reentrant) { assert(reentrant == 0 || reentrant == 1); + assert(tracemalloc_reentrant_key != -1); + if (reentrant) { - assert(PyThread_get_key_value(tracemalloc_reentrant_key) == NULL); + assert(!get_reentrant()); PyThread_set_key_value(tracemalloc_reentrant_key, REENTRANT); } else { - assert(PyThread_get_key_value(tracemalloc_reentrant_key) == REENTRANT); + assert(get_reentrant()); PyThread_set_key_value(tracemalloc_reentrant_key, NULL); } } @@ -197,27 +221,75 @@ set_reentrant(int reentrant) } #endif + +static Py_uhash_t +hashtable_hash_pyobject(_Py_hashtable_t *ht, const void *pkey) +{ + PyObject *obj; + + _Py_HASHTABLE_READ_KEY(ht, pkey, obj); + return PyObject_Hash(obj); +} + + static int -hashtable_compare_unicode(const void *key, const _Py_hashtable_entry_t *entry) +hashtable_compare_unicode(_Py_hashtable_t *ht, const void *pkey, + const _Py_hashtable_entry_t *entry) { - if (key != NULL && entry->key != NULL) - return (PyUnicode_Compare((PyObject *)key, (PyObject *)entry->key) == 0); + PyObject *key1, *key2; + + _Py_HASHTABLE_READ_KEY(ht, pkey, key1); + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, key2); + + if (key1 != NULL && key2 != NULL) + return (PyUnicode_Compare(key1, key2) == 0); else - return key == entry->key; + return key1 == key2; +} + + +static Py_uhash_t +hashtable_hash_pointer_t(_Py_hashtable_t *ht, const void *pkey) +{ + pointer_t ptr; + Py_uhash_t hash; + + _Py_HASHTABLE_READ_KEY(ht, pkey, ptr); + + hash = (Py_uhash_t)_Py_HashPointer((void*)ptr.ptr); + hash ^= ptr.domain; + return hash; +} + + +static int +hashtable_compare_pointer_t(_Py_hashtable_t *ht, const void *pkey, + const _Py_hashtable_entry_t *entry) +{ + pointer_t ptr1, ptr2; + + _Py_HASHTABLE_READ_KEY(ht, pkey, ptr1); + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, ptr2); + + /* compare pointer before domain, because pointer is more likely to be + different */ + return (ptr1.ptr == ptr2.ptr && ptr1.domain == ptr2.domain); + } -static _Py_hashtable_allocator_t hashtable_alloc = {malloc, free}; static _Py_hashtable_t * -hashtable_new(size_t data_size, +hashtable_new(size_t key_size, size_t data_size, _Py_hashtable_hash_func hash_func, _Py_hashtable_compare_func compare_func) { - return _Py_hashtable_new_full(data_size, 0, + _Py_hashtable_allocator_t hashtable_alloc = {malloc, free}; + return _Py_hashtable_new_full(key_size, data_size, 0, hash_func, compare_func, - NULL, NULL, NULL, &hashtable_alloc); + &hashtable_alloc); } + static void* raw_malloc(size_t size) { @@ -230,21 +302,28 @@ raw_free(void *ptr) allocators.raw.free(allocators.raw.ctx, ptr); } + static Py_uhash_t -hashtable_hash_traceback(const void *key) +hashtable_hash_traceback(_Py_hashtable_t *ht, const void *pkey) { - const traceback_t *traceback = key; + traceback_t *traceback; + + _Py_HASHTABLE_READ_KEY(ht, pkey, traceback); return traceback->hash; } + static int -hashtable_compare_traceback(const traceback_t *traceback1, - const _Py_hashtable_entry_t *he) +hashtable_compare_traceback(_Py_hashtable_t *ht, const void *pkey, + const _Py_hashtable_entry_t *entry) { - const traceback_t *traceback2 = he->key; + traceback_t *traceback1, *traceback2; const frame_t *frame1, *frame2; int i; + _Py_HASHTABLE_READ_KEY(ht, pkey, traceback1); + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, traceback2); + if (traceback1->nframe != traceback2->nframe) return 0; @@ -263,6 +342,7 @@ hashtable_compare_traceback(const traceback_t *traceback1, return 1; } + static void tracemalloc_get_frame(PyFrameObject *pyframe, frame_t *frame) { @@ -313,15 +393,15 @@ tracemalloc_get_frame(PyFrameObject *pyframe, frame_t *frame) } /* intern the filename */ - entry = _Py_hashtable_get_entry(tracemalloc_filenames, filename); + entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_filenames, filename); if (entry != NULL) { - filename = (PyObject *)entry->key; + _Py_HASHTABLE_ENTRY_READ_KEY(tracemalloc_filenames, entry, filename); } else { /* tracemalloc_filenames is responsible to keep a reference to the filename */ Py_INCREF(filename); - if (_Py_hashtable_set(tracemalloc_filenames, filename, NULL, 0) < 0) { + if (_Py_HASHTABLE_SET_NODATA(tracemalloc_filenames, filename) < 0) { Py_DECREF(filename); #ifdef TRACE_DEBUG tracemalloc_error("failed to intern the filename"); @@ -334,6 +414,7 @@ tracemalloc_get_frame(PyFrameObject *pyframe, frame_t *frame) frame->filename = filename; } + static Py_uhash_t traceback_hash(traceback_t *traceback) { @@ -358,6 +439,7 @@ traceback_hash(traceback_t *traceback) return x; } + static void traceback_get_frames(traceback_t *traceback) { @@ -385,6 +467,7 @@ traceback_get_frames(traceback_t *traceback) } } + static traceback_t * traceback_new(void) { @@ -404,9 +487,9 @@ traceback_new(void) traceback->hash = traceback_hash(traceback); /* intern the traceback */ - entry = _Py_hashtable_get_entry(tracemalloc_tracebacks, traceback); + entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_tracebacks, traceback); if (entry != NULL) { - traceback = (traceback_t *)entry->key; + _Py_HASHTABLE_ENTRY_READ_KEY(tracemalloc_tracebacks, entry, traceback); } else { traceback_t *copy; @@ -423,7 +506,7 @@ traceback_new(void) } memcpy(copy, traceback, traceback_size); - if (_Py_hashtable_set(tracemalloc_tracebacks, copy, NULL, 0) < 0) { + if (_Py_HASHTABLE_SET_NODATA(tracemalloc_tracebacks, copy) < 0) { raw_free(copy); #ifdef TRACE_DEBUG tracemalloc_error("failed to intern the traceback: putdata failed"); @@ -435,53 +518,161 @@ traceback_new(void) return traceback; } + static int -tracemalloc_add_trace(void *ptr, size_t size) +tracemalloc_use_domain_cb(_Py_hashtable_t *old_traces, + _Py_hashtable_entry_t *entry, void *user_data) { - traceback_t *traceback; - trace_t trace; - int res; + uintptr_t ptr; + pointer_t key; + _Py_hashtable_t *new_traces = (_Py_hashtable_t *)user_data; + const void *pdata = _Py_HASHTABLE_ENTRY_PDATA(old_traces, entry); + + _Py_HASHTABLE_ENTRY_READ_KEY(old_traces, entry, ptr); + key.ptr = ptr; + key.domain = DEFAULT_DOMAIN; + + return _Py_hashtable_set(new_traces, + sizeof(key), &key, + old_traces->data_size, pdata); +} -#ifdef WITH_THREAD - assert(PyGILState_Check()); -#endif - traceback = traceback_new(); - if (traceback == NULL) - return -1; +/* Convert tracemalloc_traces from compact key (uintptr_t) to pointer_t key. + * Return 0 on success, -1 on error. */ +static int +tracemalloc_use_domain(void) +{ + _Py_hashtable_t *new_traces = NULL; + + assert(!tracemalloc_config.use_domain); - trace.size = size; - trace.traceback = traceback; + new_traces = hashtable_new(sizeof(pointer_t), + sizeof(trace_t), + hashtable_hash_pointer_t, + hashtable_compare_pointer_t); + if (new_traces == NULL) { + return -1; + } - res = _Py_HASHTABLE_SET(tracemalloc_traces, ptr, trace); - if (res == 0) { - assert(tracemalloc_traced_memory <= PY_SIZE_MAX - size); - tracemalloc_traced_memory += size; - if (tracemalloc_traced_memory > tracemalloc_peak_traced_memory) - tracemalloc_peak_traced_memory = tracemalloc_traced_memory; + if (_Py_hashtable_foreach(tracemalloc_traces, tracemalloc_use_domain_cb, + new_traces) < 0) + { + _Py_hashtable_destroy(new_traces); + return -1; } - return res; + _Py_hashtable_destroy(tracemalloc_traces); + tracemalloc_traces = new_traces; + + tracemalloc_config.use_domain = 1; + + return 0; } + static void -tracemalloc_remove_trace(void *ptr) +tracemalloc_remove_trace(_PyTraceMalloc_domain_t domain, uintptr_t ptr) +{ + trace_t trace; + int removed; + + assert(tracemalloc_config.tracing); + + if (tracemalloc_config.use_domain) { + pointer_t key = {ptr, domain}; + removed = _Py_HASHTABLE_POP(tracemalloc_traces, key, trace); + } + else { + removed = _Py_HASHTABLE_POP(tracemalloc_traces, ptr, trace); + } + if (!removed) { + return; + } + + assert(tracemalloc_traced_memory >= trace.size); + tracemalloc_traced_memory -= trace.size; +} + +#define REMOVE_TRACE(ptr) \ + tracemalloc_remove_trace(DEFAULT_DOMAIN, (uintptr_t)(ptr)) + + +static int +tracemalloc_add_trace(_PyTraceMalloc_domain_t domain, uintptr_t ptr, + size_t size) { + pointer_t key = {ptr, domain}; + traceback_t *traceback; trace_t trace; + _Py_hashtable_entry_t* entry; + int res; + + assert(tracemalloc_config.tracing); + + traceback = traceback_new(); + if (traceback == NULL) { + return -1; + } + + if (!tracemalloc_config.use_domain && domain != DEFAULT_DOMAIN) { + /* first trace using a non-zero domain whereas traces use compact + (uintptr_t) keys: switch to pointer_t keys. */ + if (tracemalloc_use_domain() < 0) { + return -1; + } + } - if (_Py_hashtable_pop(tracemalloc_traces, ptr, &trace, sizeof(trace))) { + if (tracemalloc_config.use_domain) { + entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_traces, key); + } + else { + entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_traces, ptr); + } + + if (entry != NULL) { + /* the memory block is already tracked */ + _Py_HASHTABLE_ENTRY_READ_DATA(tracemalloc_traces, entry, trace); assert(tracemalloc_traced_memory >= trace.size); tracemalloc_traced_memory -= trace.size; + + trace.size = size; + trace.traceback = traceback; + _Py_HASHTABLE_ENTRY_WRITE_DATA(tracemalloc_traces, entry, trace); } + else { + trace.size = size; + trace.traceback = traceback; + + if (tracemalloc_config.use_domain) { + res = _Py_HASHTABLE_SET(tracemalloc_traces, key, trace); + } + else { + res = _Py_HASHTABLE_SET(tracemalloc_traces, ptr, trace); + } + if (res != 0) { + return res; + } + } + + assert(tracemalloc_traced_memory <= SIZE_MAX - size); + tracemalloc_traced_memory += size; + if (tracemalloc_traced_memory > tracemalloc_peak_traced_memory) + tracemalloc_peak_traced_memory = tracemalloc_traced_memory; + return 0; } +#define ADD_TRACE(ptr, size) \ + tracemalloc_add_trace(DEFAULT_DOMAIN, (uintptr_t)(ptr), size) + + static void* tracemalloc_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) { PyMemAllocatorEx *alloc = (PyMemAllocatorEx *)ctx; void *ptr; - assert(elsize == 0 || nelem <= PY_SIZE_MAX / elsize); + assert(elsize == 0 || nelem <= SIZE_MAX / elsize); if (use_calloc) ptr = alloc->calloc(alloc->ctx, nelem, elsize); @@ -491,7 +682,7 @@ tracemalloc_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) return NULL; TABLES_LOCK(); - if (tracemalloc_add_trace(ptr, nelem * elsize) < 0) { + if (ADD_TRACE(ptr, nelem * elsize) < 0) { /* Failed to allocate a trace for the new memory block */ TABLES_UNLOCK(); alloc->free(alloc->ctx, ptr); @@ -501,6 +692,7 @@ tracemalloc_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) return ptr; } + static void* tracemalloc_realloc(void *ctx, void *ptr, size_t new_size) { @@ -515,9 +707,14 @@ tracemalloc_realloc(void *ctx, void *ptr, size_t new_size) /* an existing memory block has been resized */ TABLES_LOCK(); - tracemalloc_remove_trace(ptr); - if (tracemalloc_add_trace(ptr2, new_size) < 0) { + /* tracemalloc_add_trace() updates the trace if there is already + a trace at address (domain, ptr2) */ + if (ptr2 != ptr) { + REMOVE_TRACE(ptr); + } + + if (ADD_TRACE(ptr2, new_size) < 0) { /* Memory allocation failed. The error cannot be reported to the caller, because realloc() may already have shrunk the memory block and so removed bytes. @@ -535,7 +732,7 @@ tracemalloc_realloc(void *ctx, void *ptr, size_t new_size) /* new allocation */ TABLES_LOCK(); - if (tracemalloc_add_trace(ptr2, new_size) < 0) { + if (ADD_TRACE(ptr2, new_size) < 0) { /* Failed to allocate a trace for the new memory block */ TABLES_UNLOCK(); alloc->free(alloc->ctx, ptr2); @@ -546,6 +743,7 @@ tracemalloc_realloc(void *ctx, void *ptr, size_t new_size) return ptr2; } + static void tracemalloc_free(void *ctx, void *ptr) { @@ -560,10 +758,11 @@ tracemalloc_free(void *ctx, void *ptr) alloc->free(alloc->ctx, ptr); TABLES_LOCK(); - tracemalloc_remove_trace(ptr); + REMOVE_TRACE(ptr); TABLES_UNLOCK(); } + static void* tracemalloc_alloc_gil(int use_calloc, void *ctx, size_t nelem, size_t elsize) { @@ -588,18 +787,21 @@ tracemalloc_alloc_gil(int use_calloc, void *ctx, size_t nelem, size_t elsize) return ptr; } + static void* tracemalloc_malloc_gil(void *ctx, size_t size) { return tracemalloc_alloc_gil(0, ctx, 1, size); } + static void* tracemalloc_calloc_gil(void *ctx, size_t nelem, size_t elsize) { return tracemalloc_alloc_gil(1, ctx, nelem, elsize); } + static void* tracemalloc_realloc_gil(void *ctx, void *ptr, size_t new_size) { @@ -615,7 +817,7 @@ tracemalloc_realloc_gil(void *ctx, void *ptr, size_t new_size) ptr2 = alloc->realloc(alloc->ctx, ptr, new_size); if (ptr2 != NULL && ptr != NULL) { TABLES_LOCK(); - tracemalloc_remove_trace(ptr); + REMOVE_TRACE(ptr); TABLES_UNLOCK(); } return ptr2; @@ -632,6 +834,7 @@ tracemalloc_realloc_gil(void *ctx, void *ptr, size_t new_size) return ptr2; } + #ifdef TRACE_RAW_MALLOC static void* tracemalloc_raw_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) @@ -666,18 +869,21 @@ tracemalloc_raw_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) return ptr; } + static void* tracemalloc_raw_malloc(void *ctx, size_t size) { return tracemalloc_raw_alloc(0, ctx, 1, size); } + static void* tracemalloc_raw_calloc(void *ctx, size_t nelem, size_t elsize) { return tracemalloc_raw_alloc(1, ctx, nelem, elsize); } + static void* tracemalloc_raw_realloc(void *ctx, void *ptr, size_t new_size) { @@ -694,7 +900,7 @@ tracemalloc_raw_realloc(void *ctx, void *ptr, size_t new_size) if (ptr2 != NULL && ptr != NULL) { TABLES_LOCK(); - tracemalloc_remove_trace(ptr); + REMOVE_TRACE(ptr); TABLES_UNLOCK(); } return ptr2; @@ -718,22 +924,31 @@ tracemalloc_raw_realloc(void *ctx, void *ptr, size_t new_size) } #endif /* TRACE_RAW_MALLOC */ + static int -tracemalloc_clear_filename(_Py_hashtable_entry_t *entry, void *user_data) +tracemalloc_clear_filename(_Py_hashtable_t *ht, _Py_hashtable_entry_t *entry, + void *user_data) { - PyObject *filename = (PyObject *)entry->key; + PyObject *filename; + + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, filename); Py_DECREF(filename); return 0; } + static int -traceback_free_traceback(_Py_hashtable_entry_t *entry, void *user_data) +traceback_free_traceback(_Py_hashtable_t *ht, _Py_hashtable_entry_t *entry, + void *user_data) { - traceback_t *traceback = (traceback_t *)entry->key; + traceback_t *traceback; + + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, traceback); raw_free(traceback); return 0; } + /* reentrant flag must be set to call this function and GIL must be held */ static void tracemalloc_clear_traces(void) @@ -756,6 +971,7 @@ tracemalloc_clear_traces(void) _Py_hashtable_clear(tracemalloc_filenames); } + static int tracemalloc_init(void) { @@ -792,21 +1008,29 @@ tracemalloc_init(void) } #endif - tracemalloc_filenames = hashtable_new(0, - (_Py_hashtable_hash_func)PyObject_Hash, + tracemalloc_filenames = hashtable_new(sizeof(PyObject *), 0, + hashtable_hash_pyobject, hashtable_compare_unicode); - tracemalloc_tracebacks = hashtable_new(0, - (_Py_hashtable_hash_func)hashtable_hash_traceback, - (_Py_hashtable_compare_func)hashtable_compare_traceback); + tracemalloc_tracebacks = hashtable_new(sizeof(traceback_t *), 0, + hashtable_hash_traceback, + hashtable_compare_traceback); - tracemalloc_traces = hashtable_new(sizeof(trace_t), - _Py_hashtable_hash_ptr, - _Py_hashtable_compare_direct); + if (tracemalloc_config.use_domain) { + tracemalloc_traces = hashtable_new(sizeof(pointer_t), + sizeof(trace_t), + hashtable_hash_pointer_t, + hashtable_compare_pointer_t); + } + else { + tracemalloc_traces = hashtable_new(sizeof(uintptr_t), + sizeof(trace_t), + _Py_hashtable_hash_ptr, + _Py_hashtable_compare_direct); + } if (tracemalloc_filenames == NULL || tracemalloc_tracebacks == NULL - || tracemalloc_traces == NULL) - { + || tracemalloc_traces == NULL) { PyErr_NoMemory(); return -1; } @@ -826,6 +1050,7 @@ tracemalloc_init(void) return 0; } + static void tracemalloc_deinit(void) { @@ -836,9 +1061,9 @@ tracemalloc_deinit(void) tracemalloc_stop(); /* destroy hash tables */ - _Py_hashtable_destroy(tracemalloc_traces); _Py_hashtable_destroy(tracemalloc_tracebacks); _Py_hashtable_destroy(tracemalloc_filenames); + _Py_hashtable_destroy(tracemalloc_traces); #if defined(WITH_THREAD) && defined(TRACE_RAW_MALLOC) if (tables_lock != NULL) { @@ -849,11 +1074,13 @@ tracemalloc_deinit(void) #ifdef REENTRANT_THREADLOCAL PyThread_delete_key(tracemalloc_reentrant_key); + tracemalloc_reentrant_key = -1; #endif Py_XDECREF(unknown_filename); } + static int tracemalloc_start(int max_nframe) { @@ -910,6 +1137,7 @@ tracemalloc_start(int max_nframe) return 0; } + static void tracemalloc_stop(void) { @@ -926,8 +1154,9 @@ tracemalloc_stop(void) PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &allocators.mem); PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &allocators.obj); - /* release memory */ tracemalloc_clear_traces(); + + /* release memory */ raw_free(tracemalloc_traceback); tracemalloc_traceback = NULL; } @@ -938,6 +1167,7 @@ PyDoc_STRVAR(tracemalloc_is_tracing_doc, "True if the tracemalloc module is tracing Python memory allocations,\n" "False otherwise."); + static PyObject* py_tracemalloc_is_tracing(PyObject *self) { @@ -949,6 +1179,7 @@ PyDoc_STRVAR(tracemalloc_clear_traces_doc, "\n" "Clear traces of memory blocks allocated by Python."); + static PyObject* py_tracemalloc_clear_traces(PyObject *self) { @@ -962,6 +1193,7 @@ py_tracemalloc_clear_traces(PyObject *self) Py_RETURN_NONE; } + static PyObject* frame_to_pyobject(frame_t *frame) { @@ -971,8 +1203,6 @@ frame_to_pyobject(frame_t *frame) if (frame_obj == NULL) return NULL; - if (frame->filename == NULL) - frame->filename = Py_None; Py_INCREF(frame->filename); PyTuple_SET_ITEM(frame_obj, 0, frame->filename); @@ -986,6 +1216,7 @@ frame_to_pyobject(frame_t *frame) return frame_obj; } + static PyObject* traceback_to_pyobject(traceback_t *traceback, _Py_hashtable_t *intern_table) { @@ -1024,33 +1255,43 @@ traceback_to_pyobject(traceback_t *traceback, _Py_hashtable_t *intern_table) return frames; } + static PyObject* -trace_to_pyobject(trace_t *trace, _Py_hashtable_t *intern_tracebacks) +trace_to_pyobject(_PyTraceMalloc_domain_t domain, trace_t *trace, + _Py_hashtable_t *intern_tracebacks) { PyObject *trace_obj = NULL; - PyObject *size, *traceback; + PyObject *obj; - trace_obj = PyTuple_New(2); + trace_obj = PyTuple_New(3); if (trace_obj == NULL) return NULL; - size = PyLong_FromSize_t(trace->size); - if (size == NULL) { + obj = PyLong_FromSize_t(domain); + if (obj == NULL) { Py_DECREF(trace_obj); return NULL; } - PyTuple_SET_ITEM(trace_obj, 0, size); + PyTuple_SET_ITEM(trace_obj, 0, obj); - traceback = traceback_to_pyobject(trace->traceback, intern_tracebacks); - if (traceback == NULL) { + obj = PyLong_FromSize_t(trace->size); + if (obj == NULL) { Py_DECREF(trace_obj); return NULL; } - PyTuple_SET_ITEM(trace_obj, 1, traceback); + PyTuple_SET_ITEM(trace_obj, 1, obj); + + obj = traceback_to_pyobject(trace->traceback, intern_tracebacks); + if (obj == NULL) { + Py_DECREF(trace_obj); + return NULL; + } + PyTuple_SET_ITEM(trace_obj, 2, obj); return trace_obj; } + typedef struct { _Py_hashtable_t *traces; _Py_hashtable_t *tracebacks; @@ -1058,16 +1299,26 @@ typedef struct { } get_traces_t; static int -tracemalloc_get_traces_fill(_Py_hashtable_entry_t *entry, void *user_data) +tracemalloc_get_traces_fill(_Py_hashtable_t *traces, _Py_hashtable_entry_t *entry, + void *user_data) { get_traces_t *get_traces = user_data; - trace_t *trace; + _PyTraceMalloc_domain_t domain; + trace_t trace; PyObject *tracemalloc_obj; int res; - trace = (trace_t *)_Py_HASHTABLE_ENTRY_DATA(entry); + if (tracemalloc_config.use_domain) { + pointer_t key; + _Py_HASHTABLE_ENTRY_READ_KEY(traces, entry, key); + domain = key.domain; + } + else { + domain = DEFAULT_DOMAIN; + } + _Py_HASHTABLE_ENTRY_READ_DATA(traces, entry, trace); - tracemalloc_obj = trace_to_pyobject(trace, get_traces->tracebacks); + tracemalloc_obj = trace_to_pyobject(domain, &trace, get_traces->tracebacks); if (tracemalloc_obj == NULL) return 1; @@ -1079,14 +1330,19 @@ tracemalloc_get_traces_fill(_Py_hashtable_entry_t *entry, void *user_data) return 0; } + static int -tracemalloc_pyobject_decref_cb(_Py_hashtable_entry_t *entry, void *user_data) +tracemalloc_pyobject_decref_cb(_Py_hashtable_t *tracebacks, + _Py_hashtable_entry_t *entry, + void *user_data) { - PyObject *obj = (PyObject *)_Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(entry); + PyObject *obj; + _Py_HASHTABLE_ENTRY_READ_DATA(tracebacks, entry, obj); Py_DECREF(obj); return 0; } + PyDoc_STRVAR(tracemalloc_get_traces_doc, "_get_traces() -> list\n" "\n" @@ -1113,7 +1369,8 @@ py_tracemalloc_get_traces(PyObject *self, PyObject *obj) /* the traceback hash table is used temporarily to intern traceback tuple of (filename, lineno) tuples */ - get_traces.tracebacks = hashtable_new(sizeof(PyObject *), + get_traces.tracebacks = hashtable_new(sizeof(traceback_t *), + sizeof(PyObject *), _Py_hashtable_hash_ptr, _Py_hashtable_compare_direct); if (get_traces.tracebacks == NULL) { @@ -1145,15 +1402,43 @@ error: finally: if (get_traces.tracebacks != NULL) { _Py_hashtable_foreach(get_traces.tracebacks, - tracemalloc_pyobject_decref_cb, NULL); + tracemalloc_pyobject_decref_cb, NULL); _Py_hashtable_destroy(get_traces.tracebacks); } - if (get_traces.traces != NULL) + if (get_traces.traces != NULL) { _Py_hashtable_destroy(get_traces.traces); + } return get_traces.list; } + +static traceback_t* +tracemalloc_get_traceback(_PyTraceMalloc_domain_t domain, uintptr_t ptr) +{ + trace_t trace; + int found; + + if (!tracemalloc_config.tracing) + return NULL; + + TABLES_LOCK(); + if (tracemalloc_config.use_domain) { + pointer_t key = {ptr, domain}; + found = _Py_HASHTABLE_GET(tracemalloc_traces, key, trace); + } + else { + found = _Py_HASHTABLE_GET(tracemalloc_traces, ptr, trace); + } + TABLES_UNLOCK(); + + if (!found) + return NULL; + + return trace.traceback; +} + + PyDoc_STRVAR(tracemalloc_get_object_traceback_doc, "_get_object_traceback(obj)\n" "\n" @@ -1168,11 +1453,7 @@ py_tracemalloc_get_object_traceback(PyObject *self, PyObject *obj) { PyTypeObject *type; void *ptr; - trace_t trace; - int found; - - if (!tracemalloc_config.tracing) - Py_RETURN_NONE; + traceback_t *traceback; type = Py_TYPE(obj); if (PyType_IS_GC(type)) @@ -1180,16 +1461,48 @@ py_tracemalloc_get_object_traceback(PyObject *self, PyObject *obj) else ptr = (void *)obj; - TABLES_LOCK(); - found = _Py_HASHTABLE_GET(tracemalloc_traces, ptr, trace); - TABLES_UNLOCK(); - - if (!found) + traceback = tracemalloc_get_traceback(DEFAULT_DOMAIN, (uintptr_t)ptr); + if (traceback == NULL) Py_RETURN_NONE; - return traceback_to_pyobject(trace.traceback, NULL); + return traceback_to_pyobject(traceback, NULL); } + +#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str)) + +static void +_PyMem_DumpFrame(int fd, frame_t * frame) +{ + PUTS(fd, " File \""); + _Py_DumpASCII(fd, frame->filename); + PUTS(fd, "\", line "); + _Py_DumpDecimal(fd, frame->lineno); + PUTS(fd, "\n"); +} + +/* Dump the traceback where a memory block was allocated into file descriptor + fd. The function may block on TABLES_LOCK() but it is unlikely. */ +void +_PyMem_DumpTraceback(int fd, const void *ptr) +{ + traceback_t *traceback; + int i; + + traceback = tracemalloc_get_traceback(DEFAULT_DOMAIN, (uintptr_t)ptr); + if (traceback == NULL) + return; + + PUTS(fd, "Memory block allocated at (most recent call first):\n"); + for (i=0; i < traceback->nframe; i++) { + _PyMem_DumpFrame(fd, &traceback->frames[i]); + } + PUTS(fd, "\n"); +} + +#undef PUTS + + PyDoc_STRVAR(tracemalloc_start_doc, "start(nframe: int=1)\n" "\n" @@ -1225,6 +1538,7 @@ PyDoc_STRVAR(tracemalloc_stop_doc, "Stop tracing Python memory allocations and clear traces\n" "of memory blocks allocated by Python."); + static PyObject* py_tracemalloc_stop(PyObject *self) { @@ -1232,6 +1546,7 @@ py_tracemalloc_stop(PyObject *self) Py_RETURN_NONE; } + PyDoc_STRVAR(tracemalloc_get_traceback_limit_doc, "get_traceback_limit() -> int\n" "\n" @@ -1247,6 +1562,7 @@ py_tracemalloc_get_traceback_limit(PyObject *self) return PyLong_FromLong(tracemalloc_config.max_nframe); } + PyDoc_STRVAR(tracemalloc_get_tracemalloc_memory_doc, "get_tracemalloc_memory() -> int\n" "\n" @@ -1270,6 +1586,7 @@ tracemalloc_get_tracemalloc_memory(PyObject *self) return Py_BuildValue("N", size_obj); } + PyDoc_STRVAR(tracemalloc_get_traced_memory_doc, "get_traced_memory() -> (int, int)\n" "\n" @@ -1295,6 +1612,7 @@ tracemalloc_get_traced_memory(PyObject *self) return Py_BuildValue("NN", size_obj, peak_size_obj); } + static PyMethodDef module_methods[] = { {"is_tracing", (PyCFunction)py_tracemalloc_is_tracing, METH_NOARGS, tracemalloc_is_tracing_doc}, @@ -1345,6 +1663,7 @@ PyInit__tracemalloc(void) return m; } + static int parse_sys_xoptions(PyObject *value) { @@ -1373,6 +1692,7 @@ parse_sys_xoptions(PyObject *value) return Py_SAFE_DOWNCAST(nframe, long, int); } + int _PyTraceMalloc_Init(void) { @@ -1411,7 +1731,7 @@ _PyTraceMalloc_Init(void) if (key == NULL) return -1; - value = PyDict_GetItemWithError(xoptions, key); /* borrowed */ + value = PyDict_GetItemWithError(xoptions, key); Py_DECREF(key); if (value == NULL) { if (PyErr_Occurred()) @@ -1422,6 +1742,7 @@ _PyTraceMalloc_Init(void) } nframe = parse_sys_xoptions(value); + Py_DECREF(value); if (nframe < 0) { Py_FatalError("-X tracemalloc=NFRAME: invalid number of frames"); } @@ -1430,6 +1751,7 @@ _PyTraceMalloc_Init(void) return tracemalloc_start(nframe); } + void _PyTraceMalloc_Fini(void) { @@ -1439,3 +1761,59 @@ _PyTraceMalloc_Fini(void) tracemalloc_deinit(); } +int +_PyTraceMalloc_Track(_PyTraceMalloc_domain_t domain, uintptr_t ptr, + size_t size) +{ + int res; +#ifdef WITH_THREAD + PyGILState_STATE gil_state; +#endif + + if (!tracemalloc_config.tracing) { + /* tracemalloc is not tracing: do nothing */ + return -2; + } + +#ifdef WITH_THREAD + gil_state = PyGILState_Ensure(); +#endif + + TABLES_LOCK(); + res = tracemalloc_add_trace(domain, ptr, size); + TABLES_UNLOCK(); + +#ifdef WITH_THREAD + PyGILState_Release(gil_state); +#endif + return res; +} + + +int +_PyTraceMalloc_Untrack(_PyTraceMalloc_domain_t domain, uintptr_t ptr) +{ + if (!tracemalloc_config.tracing) { + /* tracemalloc is not tracing: do nothing */ + return -2; + } + + TABLES_LOCK(); + tracemalloc_remove_trace(domain, ptr); + TABLES_UNLOCK(); + + return 0; +} + + +PyObject* +_PyTraceMalloc_GetTraceback(_PyTraceMalloc_domain_t domain, uintptr_t ptr) +{ + traceback_t *traceback; + + traceback = tracemalloc_get_traceback(domain, ptr); + if (traceback == NULL) + Py_RETURN_NONE; + + return traceback_to_pyobject(traceback, NULL); +} diff --git a/Modules/_weakref.c b/Modules/_weakref.c index f9c68d6..805d6d0 100644 --- a/Modules/_weakref.c +++ b/Modules/_weakref.c @@ -35,46 +35,6 @@ _weakref_getweakrefcount_impl(PyObject *module, PyObject *object) } -static int -is_dead_weakref(PyObject *value) -{ - if (!PyWeakref_Check(value)) { - PyErr_SetString(PyExc_TypeError, "not a weakref"); - return -1; - } - return PyWeakref_GET_OBJECT(value) == Py_None; -} - -/*[clinic input] - -_weakref._remove_dead_weakref -> object - - dct: object(subclass_of='&PyDict_Type') - key: object - / - -Atomically remove key from dict if it points to a dead weakref. -[clinic start generated code]*/ - -static PyObject * -_weakref__remove_dead_weakref_impl(PyObject *module, PyObject *dct, - PyObject *key) -/*[clinic end generated code: output=d9ff53061fcb875c input=19fc91f257f96a1d]*/ -{ - if (_PyDict_DelItemIf(dct, key, is_dead_weakref) < 0) { - if (PyErr_ExceptionMatches(PyExc_KeyError)) - /* This function is meant to allow safe weak-value dicts - with GC in another thread (see issue #28427), so it's - ok if the key doesn't exist anymore. - */ - PyErr_Clear(); - else - return NULL; - } - Py_RETURN_NONE; -} - - PyDoc_STRVAR(weakref_getweakrefs__doc__, "getweakrefs(object) -- return a list of all weak reference objects\n" "that point to 'object'."); @@ -128,7 +88,6 @@ weakref_proxy(PyObject *self, PyObject *args) static PyMethodDef weakref_functions[] = { _WEAKREF_GETWEAKREFCOUNT_METHODDEF - _WEAKREF__REMOVE_DEAD_WEAKREF_METHODDEF {"getweakrefs", weakref_getweakrefs, METH_O, weakref_getweakrefs__doc__}, {"proxy", weakref_proxy, METH_VARARGS, diff --git a/Modules/_winapi.c b/Modules/_winapi.c index a911a39..91d4f01 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -175,7 +175,7 @@ class HANDLE_return_converter(CReturnConverter): self.declare(data) self.err_occurred_if("_return_value == INVALID_HANDLE_VALUE", data) data.return_conversion.append( - 'if (_return_value == NULL)\n Py_RETURN_NONE;\n') + 'if (_return_value == NULL) {\n Py_RETURN_NONE;\n}\n') data.return_conversion.append( 'return_value = HANDLE_TO_PYNUM(_return_value);\n') @@ -188,7 +188,7 @@ class DWORD_return_converter(CReturnConverter): data.return_conversion.append( 'return_value = Py_BuildValue("k", _return_value);\n') [python start generated code]*/ -/*[python end generated code: output=da39a3ee5e6b4b0d input=374076979596ebba]*/ +/*[python end generated code: output=da39a3ee5e6b4b0d input=94819e72d2c6d558]*/ #include "clinic/_winapi.c.h" @@ -486,7 +486,7 @@ _winapi_CreateJunction_impl(PyObject *module, LPWSTR src_path, const USHORT prefix_len = 4; USHORT print_len = 0; USHORT rdb_size = 0; - PREPARSE_DATA_BUFFER rdb = NULL; + _Py_PREPARSE_DATA_BUFFER rdb = NULL; /* Junction point creation */ HANDLE junction = NULL; @@ -542,18 +542,18 @@ _winapi_CreateJunction_impl(PyObject *module, LPWSTR src_path, - the size of the print name in bytes - the size of the substitute name in bytes - the size of two NUL terminators in bytes */ - rdb_size = REPARSE_DATA_BUFFER_HEADER_SIZE + + rdb_size = _Py_REPARSE_DATA_BUFFER_HEADER_SIZE + sizeof(rdb->MountPointReparseBuffer) - sizeof(rdb->MountPointReparseBuffer.PathBuffer) + /* Two +1's for NUL terminators. */ (prefix_len + print_len + 1 + print_len + 1) * sizeof(WCHAR); - rdb = (PREPARSE_DATA_BUFFER)PyMem_RawMalloc(rdb_size); + rdb = (_Py_PREPARSE_DATA_BUFFER)PyMem_RawMalloc(rdb_size); if (rdb == NULL) goto cleanup; memset(rdb, 0, rdb_size); rdb->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - rdb->ReparseDataLength = rdb_size - REPARSE_DATA_BUFFER_HEADER_SIZE; + rdb->ReparseDataLength = rdb_size - _Py_REPARSE_DATA_BUFFER_HEADER_SIZE; rdb->MountPointReparseBuffer.SubstituteNameOffset = 0; rdb->MountPointReparseBuffer.SubstituteNameLength = (prefix_len + print_len) * sizeof(WCHAR); @@ -674,7 +674,7 @@ _winapi_CreatePipe_impl(PyObject *module, PyObject *pipe_attrs, DWORD size) /* helpers for createprocess */ static unsigned long -getulong(PyObject* obj, char* name) +getulong(PyObject* obj, const char* name) { PyObject* value; unsigned long ret; @@ -690,7 +690,7 @@ getulong(PyObject* obj, char* name) } static HANDLE -gethandle(PyObject* obj, char* name) +gethandle(PyObject* obj, const char* name) { PyObject* value; HANDLE ret; @@ -722,42 +722,23 @@ getenvironment(PyObject* environment) return NULL; } + envsize = PyMapping_Length(environment); + keys = PyMapping_Keys(environment); values = PyMapping_Values(environment); if (!keys || !values) goto error; - envsize = PySequence_Fast_GET_SIZE(keys); - if (PySequence_Fast_GET_SIZE(values) != envsize) { - PyErr_SetString(PyExc_RuntimeError, - "environment changed size during iteration"); - goto error; - } - totalsize = 1; /* trailing null character */ for (i = 0; i < envsize; i++) { - PyObject* key = PySequence_Fast_GET_ITEM(keys, i); - PyObject* value = PySequence_Fast_GET_ITEM(values, i); + PyObject* key = PyList_GET_ITEM(keys, i); + PyObject* value = PyList_GET_ITEM(values, i); if (! PyUnicode_Check(key) || ! PyUnicode_Check(value)) { PyErr_SetString(PyExc_TypeError, "environment can only contain strings"); goto error; } - if (PyUnicode_FindChar(key, '\0', 0, PyUnicode_GET_LENGTH(key), 1) != -1 || - PyUnicode_FindChar(value, '\0', 0, PyUnicode_GET_LENGTH(value), 1) != -1) - { - PyErr_SetString(PyExc_ValueError, "embedded null character"); - goto error; - } - /* Search from index 1 because on Windows starting '=' is allowed for - defining hidden environment variables. */ - if (PyUnicode_GET_LENGTH(key) == 0 || - PyUnicode_FindChar(key, '=', 1, PyUnicode_GET_LENGTH(key), 1) != -1) - { - PyErr_SetString(PyExc_ValueError, "illegal environment variable name"); - goto error; - } if (totalsize > PY_SSIZE_T_MAX - PyUnicode_GET_LENGTH(key) - 1) { PyErr_SetString(PyExc_OverflowError, "environment too long"); goto error; @@ -779,8 +760,8 @@ getenvironment(PyObject* environment) end = buffer + totalsize; for (i = 0; i < envsize; i++) { - PyObject* key = PySequence_Fast_GET_ITEM(keys, i); - PyObject* value = PySequence_Fast_GET_ITEM(values, i); + PyObject* key = PyList_GET_ITEM(keys, i); + PyObject* value = PyList_GET_ITEM(values, i); if (!PyUnicode_AsUCS4(key, p, end - p, 0)) goto error; p += PyUnicode_GET_LENGTH(key); @@ -860,13 +841,12 @@ _winapi_CreateProcess_impl(PyObject *module, Py_UNICODE *application_name, if (env_mapping != Py_None) { environment = getenvironment(env_mapping); - if (environment == NULL) { + if (! environment) return NULL; - } - /* contains embedded null characters */ wenvironment = PyUnicode_AsUnicode(environment); - if (wenvironment == NULL) { - Py_DECREF(environment); + if (wenvironment == NULL) + { + Py_XDECREF(environment); return NULL; } } diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h index 1cb6f0e..c3c8624 100644 --- a/Modules/addrinfo.h +++ b/Modules/addrinfo.h @@ -141,11 +141,7 @@ struct addrinfo { * RFC 2553: protocol-independent placeholder for socket addresses */ #define _SS_MAXSIZE 128 -#ifdef HAVE_LONG_LONG -#define _SS_ALIGNSIZE (sizeof(PY_LONG_LONG)) -#else -#define _SS_ALIGNSIZE (sizeof(double)) -#endif /* HAVE_LONG_LONG */ +#define _SS_ALIGNSIZE (sizeof(long long)) #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(u_char) * 2) #define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(u_char) * 2 - \ _SS_PAD1SIZE - _SS_ALIGNSIZE) @@ -158,11 +154,7 @@ struct sockaddr_storage { unsigned short ss_family; /* address family */ #endif /* HAVE_SOCKADDR_SA_LEN */ char __ss_pad1[_SS_PAD1SIZE]; -#ifdef HAVE_LONG_LONG - PY_LONG_LONG __ss_align; /* force desired structure storage alignment */ -#else - double __ss_align; /* force desired structure storage alignment */ -#endif /* HAVE_LONG_LONG */ + long long __ss_align; /* force desired structure storage alignment */ char __ss_pad2[_SS_PAD2SIZE]; }; #endif /* !HAVE_SOCKADDR_STORAGE */ diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index f615a69..2caa8ee 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -31,7 +31,7 @@ struct arraydescr { int itemsize; PyObject * (*getitem)(struct arrayobject *, Py_ssize_t); int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *); - char *formats; + const char *formats; int is_integer_type; int is_signed; }; @@ -40,7 +40,7 @@ typedef struct arrayobject { PyObject_VAR_HEAD char *ob_item; Py_ssize_t allocated; - struct arraydescr *ob_descr; + const struct arraydescr *ob_descr; PyObject *weakreflist; /* List of weak references */ int ob_exports; /* Number of exported buffers */ } arrayobject; @@ -331,51 +331,35 @@ II_getitem(arrayobject *ap, Py_ssize_t i) (unsigned long) ((unsigned int *)ap->ob_item)[i]); } -static PyObject * -get_int_unless_float(PyObject *v) -{ - if (PyFloat_Check(v)) { - PyErr_SetString(PyExc_TypeError, - "array item must be integer"); - return NULL; - } - return (PyObject *)_PyLong_FromNbInt(v); -} - static int II_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) { unsigned long x; - int do_decref = 0; /* if nb_int was called */ - - if (!PyLong_Check(v)) { - v = get_int_unless_float(v); - if (NULL == v) { + if (PyLong_Check(v)) { + x = PyLong_AsUnsignedLong(v); + if (x == (unsigned long) -1 && PyErr_Occurred()) return -1; - } - do_decref = 1; } - x = PyLong_AsUnsignedLong(v); - if (x == (unsigned long)-1 && PyErr_Occurred()) { - if (do_decref) { - Py_DECREF(v); + else { + long y; + if (!PyArg_Parse(v, "l;array item must be integer", &y)) + return -1; + if (y < 0) { + PyErr_SetString(PyExc_OverflowError, + "unsigned int is less than minimum"); + return -1; } - return -1; + x = (unsigned long)y; + } if (x > UINT_MAX) { PyErr_SetString(PyExc_OverflowError, - "unsigned int is greater than maximum"); - if (do_decref) { - Py_DECREF(v); - } + "unsigned int is greater than maximum"); return -1; } + if (i >= 0) ((unsigned int *)ap->ob_item)[i] = (unsigned int)x; - - if (do_decref) { - Py_DECREF(v); - } return 0; } @@ -406,47 +390,48 @@ static int LL_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) { unsigned long x; - int do_decref = 0; /* if nb_int was called */ - - if (!PyLong_Check(v)) { - v = get_int_unless_float(v); - if (NULL == v) { + if (PyLong_Check(v)) { + x = PyLong_AsUnsignedLong(v); + if (x == (unsigned long) -1 && PyErr_Occurred()) return -1; - } - do_decref = 1; } - x = PyLong_AsUnsignedLong(v); - if (x == (unsigned long)-1 && PyErr_Occurred()) { - if (do_decref) { - Py_DECREF(v); + else { + long y; + if (!PyArg_Parse(v, "l;array item must be integer", &y)) + return -1; + if (y < 0) { + PyErr_SetString(PyExc_OverflowError, + "unsigned long is less than minimum"); + return -1; } + x = (unsigned long)y; + + } + if (x > ULONG_MAX) { + PyErr_SetString(PyExc_OverflowError, + "unsigned long is greater than maximum"); return -1; } + if (i >= 0) ((unsigned long *)ap->ob_item)[i] = x; - - if (do_decref) { - Py_DECREF(v); - } return 0; } -#ifdef HAVE_LONG_LONG - static PyObject * q_getitem(arrayobject *ap, Py_ssize_t i) { - return PyLong_FromLongLong(((PY_LONG_LONG *)ap->ob_item)[i]); + return PyLong_FromLongLong(((long long *)ap->ob_item)[i]); } static int q_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) { - PY_LONG_LONG x; + long long x; if (!PyArg_Parse(v, "L;array item must be integer", &x)) return -1; if (i >= 0) - ((PY_LONG_LONG *)ap->ob_item)[i] = x; + ((long long *)ap->ob_item)[i] = x; return 0; } @@ -454,38 +439,34 @@ static PyObject * QQ_getitem(arrayobject *ap, Py_ssize_t i) { return PyLong_FromUnsignedLongLong( - ((unsigned PY_LONG_LONG *)ap->ob_item)[i]); + ((unsigned long long *)ap->ob_item)[i]); } static int QQ_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) { - unsigned PY_LONG_LONG x; - int do_decref = 0; /* if nb_int was called */ - - if (!PyLong_Check(v)) { - v = get_int_unless_float(v); - if (NULL == v) { + unsigned long long x; + if (PyLong_Check(v)) { + x = PyLong_AsUnsignedLongLong(v); + if (x == (unsigned long long) -1 && PyErr_Occurred()) return -1; - } - do_decref = 1; } - x = PyLong_AsUnsignedLongLong(v); - if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) { - if (do_decref) { - Py_DECREF(v); + else { + long long y; + if (!PyArg_Parse(v, "L;array item must be integer", &y)) + return -1; + if (y < 0) { + PyErr_SetString(PyExc_OverflowError, + "unsigned long long is less than minimum"); + return -1; } - return -1; + x = (unsigned long long)y; } - if (i >= 0) - ((unsigned PY_LONG_LONG *)ap->ob_item)[i] = x; - if (do_decref) { - Py_DECREF(v); - } + if (i >= 0) + ((unsigned long long *)ap->ob_item)[i] = x; return 0; } -#endif static PyObject * f_getitem(arrayobject *ap, Py_ssize_t i) @@ -527,7 +508,7 @@ d_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v) * Don't forget to update typecode_to_mformat_code() if you add a new * typecode. */ -static struct arraydescr descriptors[] = { +static const struct arraydescr descriptors[] = { {'b', 1, b_getitem, b_setitem, "b", 1, 1}, {'B', 1, BB_getitem, BB_setitem, "B", 1, 0}, {'u', sizeof(Py_UNICODE), u_getitem, u_setitem, "u", 0, 0}, @@ -537,10 +518,8 @@ static struct arraydescr descriptors[] = { {'I', sizeof(int), II_getitem, II_setitem, "I", 1, 0}, {'l', sizeof(long), l_getitem, l_setitem, "l", 1, 1}, {'L', sizeof(long), LL_getitem, LL_setitem, "L", 1, 0}, -#ifdef HAVE_LONG_LONG - {'q', sizeof(PY_LONG_LONG), q_getitem, q_setitem, "q", 1, 1}, - {'Q', sizeof(PY_LONG_LONG), QQ_getitem, QQ_setitem, "Q", 1, 0}, -#endif + {'q', sizeof(long long), q_getitem, q_setitem, "q", 1, 1}, + {'Q', sizeof(long long), QQ_getitem, QQ_setitem, "Q", 1, 0}, {'f', sizeof(float), f_getitem, f_setitem, "f", 0, 0}, {'d', sizeof(double), d_getitem, d_setitem, "d", 0, 0}, {'\0', 0, 0, 0, 0, 0, 0} /* Sentinel */ @@ -555,7 +534,7 @@ class array.array "arrayobject *" "&Arraytype" /*[clinic end generated code: output=da39a3ee5e6b4b0d input=ad43d37e942a8854]*/ static PyObject * -newarrayobject(PyTypeObject *type, Py_ssize_t size, struct arraydescr *descr) +newarrayobject(PyTypeObject *type, Py_ssize_t size, const struct arraydescr *descr) { arrayobject *op; size_t nbytes; @@ -857,10 +836,10 @@ array_repeat(arrayobject *a, Py_ssize_t n) memset(np->ob_item, a->ob_item[0], newbytes); } else { Py_ssize_t done = oldbytes; - Py_MEMCPY(np->ob_item, a->ob_item, oldbytes); + memcpy(np->ob_item, a->ob_item, oldbytes); while (done < newbytes) { Py_ssize_t ncopy = (done <= newbytes-done) ? done : newbytes-done; - Py_MEMCPY(np->ob_item+done, np->ob_item, ncopy); + memcpy(np->ob_item+done, np->ob_item, ncopy); done += ncopy; } } @@ -868,37 +847,10 @@ array_repeat(arrayobject *a, Py_ssize_t n) } static int -array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v) +array_del_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh) { char *item; - Py_ssize_t n; /* Size of replacement array */ Py_ssize_t d; /* Change in size */ -#define b ((arrayobject *)v) - if (v == NULL) - n = 0; - else if (array_Check(v)) { - n = Py_SIZE(b); - if (a == b) { - /* Special case "a[i:j] = a" -- copy b first */ - int ret; - v = array_slice(b, 0, n); - if (!v) - return -1; - ret = array_ass_slice(a, ilow, ihigh, v); - Py_DECREF(v); - return ret; - } - if (b->ob_descr != a->ob_descr) { - PyErr_BadArgument(); - return -1; - } - } - else { - PyErr_Format(PyExc_TypeError, - "can only assign array (not \"%.200s\") to array slice", - Py_TYPE(v)->tp_name); - return -1; - } if (ilow < 0) ilow = 0; else if (ilow > Py_SIZE(a)) @@ -910,7 +862,7 @@ array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v) else if (ihigh > Py_SIZE(a)) ihigh = Py_SIZE(a); item = a->ob_item; - d = n - (ihigh-ilow); + d = ihigh-ilow; /* Issue #4509: If the array has exported buffers and the slice assignment would change the size of the array, fail early to make sure we don't modify it. */ @@ -919,25 +871,14 @@ array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v) "cannot resize an array that is exporting buffers"); return -1; } - if (d < 0) { /* Delete -d items */ - memmove(item + (ihigh+d)*a->ob_descr->itemsize, + if (d > 0) { /* Delete d items */ + memmove(item + (ihigh-d)*a->ob_descr->itemsize, item + ihigh*a->ob_descr->itemsize, (Py_SIZE(a)-ihigh)*a->ob_descr->itemsize); - if (array_resize(a, Py_SIZE(a) + d) == -1) - return -1; - } - else if (d > 0) { /* Insert d items */ - if (array_resize(a, Py_SIZE(a) + d)) + if (array_resize(a, Py_SIZE(a) - d) == -1) return -1; - memmove(item + (ihigh+d)*a->ob_descr->itemsize, - item + ihigh*a->ob_descr->itemsize, - (Py_SIZE(a)-ihigh)*a->ob_descr->itemsize); } - if (n > 0) - memcpy(item + ilow*a->ob_descr->itemsize, b->ob_item, - n*b->ob_descr->itemsize); return 0; -#undef b } static int @@ -949,7 +890,7 @@ array_ass_item(arrayobject *a, Py_ssize_t i, PyObject *v) return -1; } if (v == NULL) - return array_ass_slice(a, i, i+1, v); + return array_del_slice(a, i, i+1); return (*a->ob_descr->setitem)(a, i, v); } @@ -1179,8 +1120,7 @@ array_array_remove(arrayobject *self, PyObject *v) cmp = PyObject_RichCompareBool(selfi, v, Py_EQ); Py_DECREF(selfi); if (cmp > 0) { - if (array_ass_slice(self, i, i+1, - (PyObject *)NULL) != 0) + if (array_del_slice(self, i, i+1) != 0) return NULL; Py_INCREF(Py_None); return Py_None; @@ -1223,7 +1163,7 @@ array_array_pop_impl(arrayobject *self, Py_ssize_t i) v = getarrayitem((PyObject *)self, i); if (v == NULL) return NULL; - if (array_ass_slice(self, i, i+1, (PyObject *)NULL) != 0) { + if (array_del_slice(self, i, i+1) != 0) { Py_DECREF(v); return NULL; } @@ -1877,16 +1817,14 @@ typecode_to_mformat_code(char typecode) intsize = sizeof(long); is_signed = 0; break; -#if HAVE_LONG_LONG case 'q': - intsize = sizeof(PY_LONG_LONG); + intsize = sizeof(long long); is_signed = 1; break; case 'Q': - intsize = sizeof(PY_LONG_LONG); + intsize = sizeof(long long); is_signed = 0; break; -#endif default: return UNKNOWN_FORMAT; } @@ -1970,7 +1908,7 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype, { PyObject *converted_items; PyObject *result; - struct arraydescr *descr; + const struct arraydescr *descr; if (!PyType_Check(arraytype)) { PyErr_Format(PyExc_TypeError, @@ -2108,7 +2046,7 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype, Py_ssize_t itemcount = Py_SIZE(items) / mf_descr.size; const unsigned char *memstr = (unsigned char *)PyBytes_AS_STRING(items); - struct arraydescr *descr; + const struct arraydescr *descr; /* If possible, try to pack array's items using a data type * that fits better. This may result in an array with narrower @@ -2343,11 +2281,10 @@ array_subscr(arrayobject* self, PyObject* item) arrayobject* ar; int itemsize = self->ob_descr->itemsize; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, Py_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop, - step); if (slicelength <= 0) { return newarrayobject(&Arraytype, 0, self->ob_descr); @@ -2415,11 +2352,11 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value) return (*self->ob_descr->setitem)(self, i, value); } else if (PySlice_Check(item)) { - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + Py_SIZE(self), &start, &stop, + &step, &slicelength) < 0) { return -1; } - slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop, - step); } else { PyErr_SetString(PyExc_TypeError, @@ -2579,7 +2516,7 @@ array_buffer_getbuf(arrayobject *self, Py_buffer *view, int flags) view->format = NULL; view->internal = NULL; if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) { - view->format = self->ob_descr->formats; + view->format = (char *)self->ob_descr->formats; #ifdef Py_UNICODE_WIDE if (self->ob_descr->typecode == 'u') { view->format = "w"; @@ -2620,7 +2557,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { int c; PyObject *initial = NULL, *it = NULL; - struct arraydescr *descr; + const struct arraydescr *descr; if (type == &Arraytype && !_PyArg_NoKeywords("array.array()", kwds)) return NULL; @@ -2749,11 +2686,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } } PyErr_SetString(PyExc_ValueError, -#ifdef HAVE_LONG_LONG "bad typecode (must be b, B, u, h, H, i, I, l, L, q, Q, f or d)"); -#else - "bad typecode (must be b, B, u, h, H, i, I, l, L, f or d)"); -#endif return NULL; } @@ -2900,9 +2833,20 @@ array_iter(arrayobject *ao) static PyObject * arrayiter_next(arrayiterobject *it) { + arrayobject *ao; + + assert(it != NULL); assert(PyArrayIter_Check(it)); - if (it->index < Py_SIZE(it->ao)) - return (*it->getitem)(it->ao, it->index++); + ao = it->ao; + if (ao == NULL) { + return NULL; + } + assert(array_Check(ao)); + if (it->index < Py_SIZE(ao)) { + return (*it->getitem)(ao, it->index++); + } + it->ao = NULL; + Py_DECREF(ao); return NULL; } @@ -2931,8 +2875,11 @@ static PyObject * array_arrayiterator___reduce___impl(arrayiterobject *self) /*[clinic end generated code: output=7898a52e8e66e016 input=a062ea1e9951417a]*/ { - return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"), - self->ao, self->index); + PyObject *func = _PyObject_GetBuiltin("iter"); + if (self->ao == NULL) { + return Py_BuildValue("N(())", func); + } + return Py_BuildValue("N(O)n", func, self->ao, self->index); } /*[clinic input] @@ -3012,7 +2959,7 @@ array_modexec(PyObject *m) char buffer[Py_ARRAY_LENGTH(descriptors)], *p; PyObject *typecodes; Py_ssize_t size = 0; - struct arraydescr *descr; + const struct arraydescr *descr; if (PyType_Ready(&Arraytype) < 0) return -1; diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c index 35ebf08..3cdf2d7 100644 --- a/Modules/atexitmodule.c +++ b/Modules/atexitmodule.c @@ -97,7 +97,7 @@ atexit_callfuncs(void) Py_XDECREF(exc_tb); } PyErr_Fetch(&exc_type, &exc_value, &exc_tb); - if (!PyErr_GivenExceptionMatches(exc_type, PyExc_SystemExit)) { + if (!PyErr_ExceptionMatches(PyExc_SystemExit)) { PySys_WriteStderr("Error in atexit._run_exitfuncs:\n"); PyErr_NormalizeException(&exc_type, &exc_value, &exc_tb); PyErr_Display(exc_type, exc_value, exc_tb); diff --git a/Modules/audioop.c b/Modules/audioop.c index 1e131d2..dcd7788 100644 --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -5,8 +5,6 @@ #include "Python.h" -typedef short PyInt16; - #if defined(__CHAR_UNSIGNED__) #if defined(signed) /* This module currently does not work on systems where only unsigned @@ -51,13 +49,15 @@ fbound(double val, double minval, double maxval) #define SEG_SHIFT (4) /* Left shift for segment number. */ #define SEG_MASK (0x70) /* Segment field mask. */ -static PyInt16 seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF, - 0x1FF, 0x3FF, 0x7FF, 0xFFF}; -static PyInt16 seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF, - 0x3FF, 0x7FF, 0xFFF, 0x1FFF}; +static const int16_t seg_aend[8] = { + 0x1F, 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF +}; +static const int16_t seg_uend[8] = { + 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF +}; -static PyInt16 -search(PyInt16 val, PyInt16 *table, int size) +static int16_t +search(int16_t val, const int16_t *table, int size) { int i; @@ -70,7 +70,7 @@ search(PyInt16 val, PyInt16 *table, int size) #define st_ulaw2linear16(uc) (_st_ulaw2linear16[uc]) #define st_alaw2linear16(uc) (_st_alaw2linear16[uc]) -static PyInt16 _st_ulaw2linear16[256] = { +static const int16_t _st_ulaw2linear16[256] = { -32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956, -23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764, -15996, -15484, -14972, -14460, -13948, @@ -143,10 +143,10 @@ static PyInt16 _st_ulaw2linear16[256] = { * John Wiley & Sons, pps 98-111 and 472-476. */ static unsigned char -st_14linear2ulaw(PyInt16 pcm_val) /* 2's complement (14-bit range) */ +st_14linear2ulaw(int16_t pcm_val) /* 2's complement (14-bit range) */ { - PyInt16 mask; - PyInt16 seg; + int16_t mask; + int16_t seg; unsigned char uval; /* u-law inverts all bits */ @@ -176,7 +176,7 @@ st_14linear2ulaw(PyInt16 pcm_val) /* 2's complement (14-bit range) */ } -static PyInt16 _st_alaw2linear16[256] = { +static const int16_t _st_alaw2linear16[256] = { -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784, -2752, -2624, -3008, -2880, -2240, @@ -237,10 +237,10 @@ static PyInt16 _st_alaw2linear16[256] = { * John Wiley & Sons, pps 98-111 and 472-476. */ static unsigned char -st_linear2alaw(PyInt16 pcm_val) /* 2's complement (13-bit range) */ +st_linear2alaw(int16_t pcm_val) /* 2's complement (13-bit range) */ { - PyInt16 mask; - short seg; + int16_t mask; + int16_t seg; unsigned char aval; /* A-law using even bit inversion */ @@ -270,12 +270,12 @@ st_linear2alaw(PyInt16 pcm_val) /* 2's complement (13-bit range) */ /* End of code taken from sox */ /* Intel ADPCM step variation table */ -static int indexTable[16] = { +static const int indexTable[16] = { -1, -1, -1, -1, 2, 4, 6, 8, -1, -1, -1, -1, 2, 4, 6, 8, }; -static int stepsizeTable[89] = { +static const int stepsizeTable[89] = { 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, @@ -294,8 +294,8 @@ static int stepsizeTable[89] = { #define GETINT8(cp, i) GETINTX(signed char, (cp), (i)) -#define GETINT16(cp, i) GETINTX(short, (cp), (i)) -#define GETINT32(cp, i) GETINTX(PY_INT32_T, (cp), (i)) +#define GETINT16(cp, i) GETINTX(int16_t, (cp), (i)) +#define GETINT32(cp, i) GETINTX(int32_t, (cp), (i)) #if WORDS_BIGENDIAN #define GETINT24(cp, i) ( \ @@ -311,8 +311,8 @@ static int stepsizeTable[89] = { #define SETINT8(cp, i, val) SETINTX(signed char, (cp), (i), (val)) -#define SETINT16(cp, i, val) SETINTX(short, (cp), (i), (val)) -#define SETINT32(cp, i, val) SETINTX(PY_INT32_T, (cp), (i), (val)) +#define SETINT16(cp, i, val) SETINTX(int16_t, (cp), (i), (val)) +#define SETINT32(cp, i, val) SETINTX(int32_t, (cp), (i), (val)) #if WORDS_BIGENDIAN #define SETINT24(cp, i, val) do { \ @@ -444,7 +444,9 @@ audioop_max_impl(PyObject *module, Py_buffer *fragment, int width) return NULL; for (i = 0; i < fragment->len; i += width) { int val = GETRAWSAMPLE(width, fragment->buf, i); - if (val < 0) absval = (-val); + /* Cast to unsigned before negating. Unsigned overflow is well- + defined, but signed overflow is not. */ + if (val < 0) absval = (unsigned int)-(int64_t)val; else absval = val; if (absval > max) max = absval; } @@ -540,7 +542,7 @@ audioop_rms_impl(PyObject *module, Py_buffer *fragment, int width) return PyLong_FromUnsignedLong(res); } -static double _sum2(const short *a, const short *b, Py_ssize_t len) +static double _sum2(const int16_t *a, const int16_t *b, Py_ssize_t len) { Py_ssize_t i; double sum = 0.0; @@ -598,7 +600,7 @@ audioop_findfit_impl(PyObject *module, Py_buffer *fragment, Py_buffer *reference) /*[clinic end generated code: output=5752306d83cbbada input=62c305605e183c9a]*/ { - const short *cp1, *cp2; + const int16_t *cp1, *cp2; Py_ssize_t len1, len2; Py_ssize_t j, best_j; double aj_m1, aj_lm1; @@ -608,9 +610,9 @@ audioop_findfit_impl(PyObject *module, Py_buffer *fragment, PyErr_SetString(AudioopError, "Strings should be even-sized"); return NULL; } - cp1 = (const short *)fragment->buf; + cp1 = (const int16_t *)fragment->buf; len1 = fragment->len >> 1; - cp2 = (const short *)reference->buf; + cp2 = (const int16_t *)reference->buf; len2 = reference->len >> 1; if (len1 < len2) { @@ -667,7 +669,7 @@ audioop_findfactor_impl(PyObject *module, Py_buffer *fragment, Py_buffer *reference) /*[clinic end generated code: output=14ea95652c1afcf8 input=816680301d012b21]*/ { - const short *cp1, *cp2; + const int16_t *cp1, *cp2; Py_ssize_t len; double sum_ri_2, sum_aij_ri, result; @@ -679,8 +681,8 @@ audioop_findfactor_impl(PyObject *module, Py_buffer *fragment, PyErr_SetString(AudioopError, "Samples should be same size"); return NULL; } - cp1 = (const short *)fragment->buf; - cp2 = (const short *)reference->buf; + cp1 = (const int16_t *)fragment->buf; + cp2 = (const int16_t *)reference->buf; len = fragment->len >> 1; sum_ri_2 = _sum2(cp2, cp2, len); sum_aij_ri = _sum2(cp1, cp2, len); @@ -709,7 +711,7 @@ audioop_findmax_impl(PyObject *module, Py_buffer *fragment, Py_ssize_t length) /*[clinic end generated code: output=f008128233523040 input=2f304801ed42383c]*/ { - const short *cp1; + const int16_t *cp1; Py_ssize_t len1; Py_ssize_t j, best_j; double aj_m1, aj_lm1; @@ -719,7 +721,7 @@ audioop_findmax_impl(PyObject *module, Py_buffer *fragment, PyErr_SetString(AudioopError, "Strings should be even-sized"); return NULL; } - cp1 = (const short *)fragment->buf; + cp1 = (const int16_t *)fragment->buf; len1 = fragment->len >> 1; if (length < 0 || len1 < length) { @@ -1120,12 +1122,12 @@ audioop_bias_impl(PyObject *module, Py_buffer *fragment, int width, int bias) if (width == 1) val = GETINTX(unsigned char, fragment->buf, i); else if (width == 2) - val = GETINTX(unsigned short, fragment->buf, i); + val = GETINTX(uint16_t, fragment->buf, i); else if (width == 3) val = ((unsigned int)GETINT24(fragment->buf, i)) & 0xffffffu; else { assert(width == 4); - val = GETINTX(PY_UINT32_T, fragment->buf, i); + val = GETINTX(uint32_t, fragment->buf, i); } val += (unsigned int)bias; @@ -1135,12 +1137,12 @@ audioop_bias_impl(PyObject *module, Py_buffer *fragment, int width, int bias) if (width == 1) SETINTX(unsigned char, ncp, i, val); else if (width == 2) - SETINTX(unsigned short, ncp, i, val); + SETINTX(uint16_t, ncp, i, val); else if (width == 3) SETINT24(ncp, i, (int)val); else { assert(width == 4); - SETINTX(PY_UINT32_T, ncp, i, val); + SETINTX(uint32_t, ncp, i, val); } } return rv; @@ -1332,7 +1334,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width, weightA /= d; weightB /= d; - if ((size_t)nchannels > PY_SIZE_MAX/sizeof(int)) { + if ((size_t)nchannels > SIZE_MAX/sizeof(int)) { PyErr_SetString(PyExc_MemoryError, "not enough memory for output buffer"); return NULL; diff --git a/Modules/binascii.c b/Modules/binascii.c index 125c1cb..9b9cd7f 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -74,7 +74,7 @@ static PyObject *Incomplete; #define SKIP 0x7E #define FAIL 0x7D -static unsigned char table_a2b_hqx[256] = { +static const unsigned char table_a2b_hqx[256] = { /* ^@ ^A ^B ^C ^D ^E ^F ^G */ /* 0*/ FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, /* \b \t \n ^K ^L \r ^N ^O */ @@ -125,10 +125,10 @@ static unsigned char table_a2b_hqx[256] = { FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, FAIL, }; -static unsigned char table_b2a_hqx[] = +static const unsigned char table_b2a_hqx[] = "!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr"; -static char table_a2b_base64[] = { +static const char table_a2b_base64[] = { -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, @@ -144,12 +144,12 @@ static char table_a2b_base64[] = { /* Max binary chunk size; limited only by available memory */ #define BASE64_MAXBIN ((PY_SSIZE_T_MAX - 3) / 2) -static unsigned char table_b2a_base64[] = +static const unsigned char table_b2a_base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static unsigned short crctab_hqx[256] = { +static const unsigned short crctab_hqx[256] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, @@ -256,7 +256,8 @@ static PyObject * binascii_a2b_uu_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=e027f8e0b0598742 input=7cafeaf73df63d1c]*/ { - unsigned char *ascii_data, *bin_data; + const unsigned char *ascii_data; + unsigned char *bin_data; int leftbits = 0; unsigned char this_ch; unsigned int leftchar = 0; @@ -342,13 +343,15 @@ static PyObject * binascii_b2a_uu_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=0070670e52e4aa6b input=00fdf458ce8b465b]*/ { - unsigned char *ascii_data, *bin_data; + unsigned char *ascii_data; + const unsigned char *bin_data; int leftbits = 0; unsigned char this_ch; unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t bin_len; + Py_ssize_t bin_len, out_len; + _PyBytesWriter writer; + _PyBytesWriter_Init(&writer); bin_data = data->buf; bin_len = data->len; if ( bin_len > 45 ) { @@ -358,9 +361,10 @@ binascii_b2a_uu_impl(PyObject *module, Py_buffer *data) } /* We're lazy and allocate to much (fixed up later) */ - if ( (rv=PyBytes_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) + out_len = 2 + (bin_len + 2) / 3 * 4; + ascii_data = _PyBytesWriter_Alloc(&writer, out_len); + if (ascii_data == NULL) return NULL; - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); /* Store the length */ *ascii_data++ = ' ' + (bin_len & 077); @@ -382,17 +386,12 @@ binascii_b2a_uu_impl(PyObject *module, Py_buffer *data) } *ascii_data++ = '\n'; /* Append a courtesy newline */ - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_CLEAR(rv); - } - return rv; + return _PyBytesWriter_Finish(&writer, ascii_data); } static int -binascii_find_valid(unsigned char *s, Py_ssize_t slen, int num) +binascii_find_valid(const unsigned char *s, Py_ssize_t slen, int num) { /* Finds & returns the (num+1)th ** valid character for base64, or -1 if none. @@ -429,13 +428,14 @@ static PyObject * binascii_a2b_base64_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=0628223f19fd3f9b input=5872acf6e1cac243]*/ { - unsigned char *ascii_data, *bin_data; + const unsigned char *ascii_data; + unsigned char *bin_data; int leftbits = 0; unsigned char this_ch; unsigned int leftchar = 0; - PyObject *rv; Py_ssize_t ascii_len, bin_len; int quad_pos = 0; + _PyBytesWriter writer; ascii_data = data->buf; ascii_len = data->len; @@ -447,11 +447,12 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data) bin_len = ((ascii_len+3)/4)*3; /* Upper bound, corrected later */ + _PyBytesWriter_Init(&writer); + /* Allocate the buffer */ - if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len)) == NULL ) + bin_data = _PyBytesWriter_Alloc(&writer, bin_len); + if (bin_data == NULL) return NULL; - bin_data = (unsigned char *)PyBytes_AS_STRING(rv); - bin_len = 0; for( ; ascii_len > 0; ascii_len--, ascii_data++) { this_ch = *ascii_data; @@ -496,31 +497,17 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data) if ( leftbits >= 8 ) { leftbits -= 8; *bin_data++ = (leftchar >> leftbits) & 0xff; - bin_len++; leftchar &= ((1 << leftbits) - 1); } } if (leftbits != 0) { PyErr_SetString(Error, "Incorrect padding"); - Py_DECREF(rv); + _PyBytesWriter_Dealloc(&writer); return NULL; } - /* And set string size correctly. If the result string is empty - ** (because the input was all invalid) return the shared empty - ** string instead; _PyBytes_Resize() won't do this for us. - */ - if (bin_len > 0) { - if (_PyBytes_Resize(&rv, bin_len) < 0) { - Py_CLEAR(rv); - } - } - else { - Py_DECREF(rv); - rv = PyBytes_FromStringAndSize("", 0); - } - return rv; + return _PyBytesWriter_Finish(&writer, bin_data); } @@ -528,24 +515,27 @@ binascii_a2b_base64_impl(PyObject *module, Py_buffer *data) binascii.b2a_base64 data: Py_buffer - / + * + newline: int(c_default="1") = True Base64-code line of data. [clinic start generated code]*/ static PyObject * -binascii_b2a_base64_impl(PyObject *module, Py_buffer *data) -/*[clinic end generated code: output=4d96663170778dc3 input=14ec4e47371174a9]*/ +binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, int newline) +/*[clinic end generated code: output=4ad62c8e8485d3b3 input=7b2ea6fa38d8924c]*/ { - unsigned char *ascii_data, *bin_data; + unsigned char *ascii_data; + const unsigned char *bin_data; int leftbits = 0; unsigned char this_ch; unsigned int leftchar = 0; - PyObject *rv; - Py_ssize_t bin_len; + Py_ssize_t bin_len, out_len; + _PyBytesWriter writer; bin_data = data->buf; bin_len = data->len; + _PyBytesWriter_Init(&writer); assert(bin_len >= 0); @@ -555,11 +545,14 @@ binascii_b2a_base64_impl(PyObject *module, Py_buffer *data) } /* We're lazy and allocate too much (fixed up later). - "+3" leaves room for up to two pad characters and a trailing - newline. Note that 'b' gets encoded as 'Yg==\n' (1 in, 5 out). */ - if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len*2 + 3)) == NULL ) + "+2" leaves room for up to two pad characters. + Note that 'b' gets encoded as 'Yg==\n' (1 in, 5 out). */ + out_len = bin_len*2 + 2; + if (newline) + out_len++; + ascii_data = _PyBytesWriter_Alloc(&writer, out_len); + if (ascii_data == NULL) return NULL; - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); for( ; bin_len > 0 ; bin_len--, bin_data++ ) { /* Shift the data into our buffer */ @@ -581,14 +574,10 @@ binascii_b2a_base64_impl(PyObject *module, Py_buffer *data) *ascii_data++ = table_b2a_base64[(leftchar&0xf) << 2]; *ascii_data++ = BASE64_PAD; } - *ascii_data++ = '\n'; /* Append a courtesy newline */ + if (newline) + *ascii_data++ = '\n'; /* Append a courtesy newline */ - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_CLEAR(rv); - } - return rv; + return _PyBytesWriter_Finish(&writer, ascii_data); } /*[clinic input] @@ -604,16 +593,19 @@ static PyObject * binascii_a2b_hqx_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=4d6d8c54d54ea1c1 input=0d914c680e0eed55]*/ { - unsigned char *ascii_data, *bin_data; + const unsigned char *ascii_data; + unsigned char *bin_data; int leftbits = 0; unsigned char this_ch; unsigned int leftchar = 0; - PyObject *rv; + PyObject *res; Py_ssize_t len; int done = 0; + _PyBytesWriter writer; ascii_data = data->buf; len = data->len; + _PyBytesWriter_Init(&writer); assert(len >= 0); @@ -623,9 +615,9 @@ binascii_a2b_hqx_impl(PyObject *module, Py_buffer *data) /* Allocate a string that is too big (fixed later) Add two to the initial length to prevent interning which would preclude subsequent resizing. */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len+2)) == NULL ) + bin_data = _PyBytesWriter_Alloc(&writer, len + 2); + if (bin_data == NULL) return NULL; - bin_data = (unsigned char *)PyBytes_AS_STRING(rv); for( ; len > 0 ; len--, ascii_data++ ) { /* Get the byte and look it up */ @@ -634,7 +626,7 @@ binascii_a2b_hqx_impl(PyObject *module, Py_buffer *data) continue; if ( this_ch == FAIL ) { PyErr_SetString(Error, "Illegal char"); - Py_DECREF(rv); + _PyBytesWriter_Dealloc(&writer); return NULL; } if ( this_ch == DONE ) { @@ -656,21 +648,14 @@ binascii_a2b_hqx_impl(PyObject *module, Py_buffer *data) if ( leftbits && !done ) { PyErr_SetString(Incomplete, "String has incomplete number of bytes"); - Py_DECREF(rv); + _PyBytesWriter_Dealloc(&writer); return NULL; } - if (_PyBytes_Resize(&rv, - (bin_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_CLEAR(rv); - } - if (rv) { - PyObject *rrv = Py_BuildValue("Oi", rv, done); - Py_DECREF(rv); - return rrv; - } - return NULL; + res = _PyBytesWriter_Finish(&writer, bin_data); + if (res == NULL) + return NULL; + return Py_BuildValue("Ni", res, done); } @@ -687,11 +672,13 @@ static PyObject * binascii_rlecode_hqx_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=393d79338f5f5629 input=e1f1712447a82b09]*/ { - unsigned char *in_data, *out_data; - PyObject *rv; + const unsigned char *in_data; + unsigned char *out_data; unsigned char ch; Py_ssize_t in, inend, len; + _PyBytesWriter writer; + _PyBytesWriter_Init(&writer); in_data = data->buf; len = data->len; @@ -701,9 +688,9 @@ binascii_rlecode_hqx_impl(PyObject *module, Py_buffer *data) return PyErr_NoMemory(); /* Worst case: output is twice as big as input (fixed later) */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) + out_data = _PyBytesWriter_Alloc(&writer, len * 2 + 2); + if (out_data == NULL) return NULL; - out_data = (unsigned char *)PyBytes_AS_STRING(rv); for( in=0; inbuf; len = data->len; + _PyBytesWriter_Init(&writer); assert(len >= 0); @@ -767,9 +752,9 @@ binascii_b2a_hqx_impl(PyObject *module, Py_buffer *data) return PyErr_NoMemory(); /* Allocate a buffer that is at least large enough */ - if ( (rv=PyBytes_FromStringAndSize(NULL, len*2+2)) == NULL ) + ascii_data = _PyBytesWriter_Alloc(&writer, len * 2 + 2); + if (ascii_data == NULL) return NULL; - ascii_data = (unsigned char *)PyBytes_AS_STRING(rv); for( ; len > 0 ; len--, bin_data++ ) { /* Shift into our buffer, and output any 6bits ready */ @@ -786,12 +771,8 @@ binascii_b2a_hqx_impl(PyObject *module, Py_buffer *data) leftchar <<= (6-leftbits); *ascii_data++ = table_b2a_hqx[leftchar & 0x3f]; } - if (_PyBytes_Resize(&rv, - (ascii_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_CLEAR(rv); - } - return rv; + + return _PyBytesWriter_Finish(&writer, ascii_data); } @@ -808,13 +789,15 @@ static PyObject * binascii_rledecode_hqx_impl(PyObject *module, Py_buffer *data) /*[clinic end generated code: output=9826619565de1c6c input=54cdd49fc014402c]*/ { - unsigned char *in_data, *out_data; + const unsigned char *in_data; + unsigned char *out_data; unsigned char in_byte, in_repeat; - PyObject *rv; - Py_ssize_t in_len, out_len, out_len_left; + Py_ssize_t in_len; + _PyBytesWriter writer; in_data = data->buf; in_len = data->len; + _PyBytesWriter_Init(&writer); assert(in_len >= 0); @@ -825,59 +808,48 @@ binascii_rledecode_hqx_impl(PyObject *module, Py_buffer *data) return PyErr_NoMemory(); /* Allocate a buffer of reasonable size. Resized when needed */ - out_len = in_len*2; - if ( (rv=PyBytes_FromStringAndSize(NULL, out_len)) == NULL ) + out_data = _PyBytesWriter_Alloc(&writer, in_len); + if (out_data == NULL) return NULL; - out_len_left = out_len; - out_data = (unsigned char *)PyBytes_AS_STRING(rv); + + /* Use overallocation */ + writer.overallocate = 1; /* ** We need two macros here to get/put bytes and handle ** end-of-buffer for input and output strings. */ -#define INBYTE(b) \ - do { \ - if ( --in_len < 0 ) { \ - PyErr_SetString(Incomplete, ""); \ - Py_DECREF(rv); \ - return NULL; \ - } \ - b = *in_data++; \ +#define INBYTE(b) \ + do { \ + if ( --in_len < 0 ) { \ + PyErr_SetString(Incomplete, ""); \ + goto error; \ + } \ + b = *in_data++; \ } while(0) -#define OUTBYTE(b) \ - do { \ - if ( --out_len_left < 0 ) { \ - if ( out_len > PY_SSIZE_T_MAX / 2) return PyErr_NoMemory(); \ - if (_PyBytes_Resize(&rv, 2*out_len) < 0) \ - { Py_XDECREF(rv); return NULL; } \ - out_data = (unsigned char *)PyBytes_AS_STRING(rv) \ - + out_len; \ - out_len_left = out_len-1; \ - out_len = out_len * 2; \ - } \ - *out_data++ = b; \ - } while(0) - - /* - ** Handle first byte separately (since we have to get angry - ** in case of an orphaned RLE code). - */ - INBYTE(in_byte); + /* + ** Handle first byte separately (since we have to get angry + ** in case of an orphaned RLE code). + */ + INBYTE(in_byte); if (in_byte == RUNCHAR) { INBYTE(in_repeat); + /* only 1 byte will be written, but 2 bytes were preallocated: + subtract 1 byte to prevent overallocation */ + writer.min_size--; + if (in_repeat != 0) { /* Note Error, not Incomplete (which is at the end ** of the string only). This is a programmer error. */ PyErr_SetString(Error, "Orphaned RLE code at start"); - Py_DECREF(rv); - return NULL; + goto error; } - OUTBYTE(RUNCHAR); + *out_data++ = RUNCHAR; } else { - OUTBYTE(in_byte); + *out_data++ = in_byte; } while( in_len > 0 ) { @@ -885,26 +857,39 @@ binascii_rledecode_hqx_impl(PyObject *module, Py_buffer *data) if (in_byte == RUNCHAR) { INBYTE(in_repeat); + /* only 1 byte will be written, but 2 bytes were preallocated: + subtract 1 byte to prevent overallocation */ + writer.min_size--; + if ( in_repeat == 0 ) { /* Just an escaped RUNCHAR value */ - OUTBYTE(RUNCHAR); + *out_data++ = RUNCHAR; } else { /* Pick up value and output a sequence of it */ in_byte = out_data[-1]; + + /* enlarge the buffer if needed */ + if (in_repeat > 1) { + /* -1 because we already preallocated 1 byte */ + out_data = _PyBytesWriter_Prepare(&writer, out_data, + in_repeat - 1); + if (out_data == NULL) + goto error; + } + while ( --in_repeat > 0 ) - OUTBYTE(in_byte); + *out_data++ = in_byte; } } else { /* Normal byte */ - OUTBYTE(in_byte); + *out_data++ = in_byte; } } - if (_PyBytes_Resize(&rv, - (out_data - - (unsigned char *)PyBytes_AS_STRING(rv))) < 0) { - Py_CLEAR(rv); - } - return rv; + return _PyBytesWriter_Finish(&writer, out_data); + +error: + _PyBytesWriter_Dealloc(&writer); + return NULL; } @@ -915,14 +900,14 @@ binascii.crc_hqx -> unsigned_int crc: unsigned_int(bitwise=True) / -Compute CRC-CCITT incrementally. +Compute hqx CRC incrementally. [clinic start generated code]*/ static unsigned int binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc) -/*[clinic end generated code: output=8ec2a78590d19170 input=f18240ff8c705b79]*/ +/*[clinic end generated code: output=8ec2a78590d19170 input=add8c53712ccceda]*/ { - unsigned char *bin_data; + const unsigned char *bin_data; Py_ssize_t len; crc &= 0xffff; @@ -1000,7 +985,7 @@ binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc) using byte-swap instructions. ********************************************************************/ -static unsigned int crc_32_tab[256] = { +static const unsigned int crc_32_tab[256] = { 0x00000000U, 0x77073096U, 0xee0e612cU, 0x990951baU, 0x076dc419U, 0x706af48fU, 0xe963a535U, 0x9e6495a3U, 0x0edb8832U, 0x79dcb8a4U, 0xe0d5e91eU, 0x97d2d988U, 0x09b64c2bU, 0x7eb17cbdU, 0xe7b82d07U, @@ -1073,7 +1058,7 @@ binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc) #ifdef USE_ZLIB_CRC32 /* This was taken from zlibmodule.c PyZlib_crc32 (but is PY_SSIZE_T_CLEAN) */ { - Byte *buf; + const Byte *buf; Py_ssize_t len; int signed_val; @@ -1084,7 +1069,7 @@ binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc) } #else /* USE_ZLIB_CRC32 */ { /* By Jim Ahlstrom; All rights transferred to CNRI */ - unsigned char *bin_data; + const unsigned char *bin_data; Py_ssize_t len; unsigned int result; @@ -1167,7 +1152,7 @@ static PyObject * binascii_a2b_hex_impl(PyObject *module, Py_buffer *hexstr) /*[clinic end generated code: output=0cc1a139af0eeecb input=9e1e7f2f94db24fd]*/ { - char* argbuf; + const char* argbuf; Py_ssize_t arglen; PyObject *retval; char* retbuf; @@ -1224,7 +1209,7 @@ binascii_unhexlify_impl(PyObject *module, Py_buffer *hexstr) return binascii_a2b_hex_impl(module, hexstr); } -static int table_hex[128] = { +static const int table_hex[128] = { -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, @@ -1255,7 +1240,8 @@ binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header) { Py_ssize_t in, out; char ch; - unsigned char *ascii_data, *odata; + const unsigned char *ascii_data; + unsigned char *odata; Py_ssize_t datalen = 0; PyObject *rv; @@ -1362,13 +1348,14 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs, /*[clinic end generated code: output=e9884472ebb1a94c input=7f2a9aaa008e92b2]*/ { Py_ssize_t in, out; - unsigned char *databuf, *odata; + const unsigned char *databuf; + unsigned char *odata; Py_ssize_t datalen = 0, odatalen = 0; PyObject *rv; unsigned int linelen = 0; unsigned char ch; int crlf = 0; - unsigned char *p; + const unsigned char *p; databuf = data->buf; datalen = data->len; @@ -1377,7 +1364,7 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs, /* XXX: this function has the side effect of converting all of * the end of lines to be the same depending on this detection * here */ - p = (unsigned char *) memchr(databuf, '\n', datalen); + p = (const unsigned char *) memchr(databuf, '\n', datalen); if ((p != NULL) && (p > databuf) && (*(p-1) == '\r')) crlf = 1; diff --git a/Modules/cjkcodecs/_codecs_cn.c b/Modules/cjkcodecs/_codecs_cn.c index 1fcc220..1a070f2 100644 --- a/Modules/cjkcodecs/_codecs_cn.c +++ b/Modules/cjkcodecs/_codecs_cn.c @@ -279,9 +279,7 @@ DECODER(gb18030) REQUIRE_INBUF(4); c3 = INBYTE3; c4 = INBYTE4; - if (c < 0x81 || c > 0xFE || - c3 < 0x81 || c3 > 0xFE || - c4 < 0x30 || c4 > 0x39) + if (c < 0x81 || c3 < 0x81 || c4 < 0x30 || c4 > 0x39) return 1; c -= 0x81; c2 -= 0x30; c3 -= 0x81; c4 -= 0x30; @@ -350,16 +348,14 @@ ENCODER(hz) DBCHAR code; if (c < 0x80) { - if (state->i) { - WRITEBYTE2('~', '}'); - NEXT_OUT(2); - state->i = 0; + if (state->i == 0) { + WRITEBYTE1((unsigned char)c); + NEXT(1, 1); } - WRITEBYTE1((unsigned char)c); - NEXT(1, 1); - if (c == '~') { - WRITEBYTE1('~'); - NEXT_OUT(1); + else { + WRITEBYTE3('~', '}', (unsigned char)c); + NEXT(1, 3); + state->i = 0; } continue; } @@ -411,14 +407,17 @@ DECODER(hz) unsigned char c2 = INBYTE2; REQUIRE_INBUF(2); - if (c2 == '~' && state->i == 0) + if (c2 == '~') { OUTCHAR('~'); + NEXT_IN(2); + continue; + } else if (c2 == '{' && state->i == 0) state->i = 1; /* set GB */ - else if (c2 == '\n' && state->i == 0) - ; /* line-continuation */ else if (c2 == '}' && state->i == 1) state->i = 0; /* set ASCII */ + else if (c2 == '\n') + ; /* line-continuation */ else return 1; NEXT_IN(2); diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h index b72a3f0..2ae28ec 100644 --- a/Modules/cjkcodecs/cjkcodecs.h +++ b/Modules/cjkcodecs/cjkcodecs.h @@ -267,7 +267,7 @@ getcodec(PyObject *self, PyObject *encoding) "encoding name must be a string."); return NULL; } - enc = _PyUnicode_AsString(encoding); + enc = PyUnicode_AsUTF8(encoding); if (enc == NULL) return NULL; diff --git a/Modules/cjkcodecs/clinic/multibytecodec.c.h b/Modules/cjkcodecs/clinic/multibytecodec.c.h index 8a47ff8..84ffd12 100644 --- a/Modules/cjkcodecs/clinic/multibytecodec.c.h +++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h @@ -14,7 +14,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCodec_encode__doc__, "registered with codecs.register_error that can handle UnicodeEncodeErrors."); #define _MULTIBYTECODEC_MULTIBYTECODEC_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteCodec_encode__doc__}, + {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_FASTCALL, _multibytecodec_MultibyteCodec_encode__doc__}, static PyObject * _multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self, @@ -22,16 +22,18 @@ _multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self, const char *errors); static PyObject * -_multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject *args, PyObject *kwargs) +_multibytecodec_MultibyteCodec_encode(MultibyteCodecObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"input", "errors", NULL}; + static const char * const _keywords[] = {"input", "errors", NULL}; + static _PyArg_Parser _parser = {"O|z:encode", _keywords, 0}; PyObject *input; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|z:encode", _keywords, - &input, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &input, &errors)) { goto exit; + } return_value = _multibytecodec_MultibyteCodec_encode_impl(self, input, errors); exit: @@ -50,7 +52,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCodec_decode__doc__, "codecs.register_error that is able to handle UnicodeDecodeErrors.\""); #define _MULTIBYTECODEC_MULTIBYTECODEC_DECODE_METHODDEF \ - {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteCodec_decode__doc__}, + {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_FASTCALL, _multibytecodec_MultibyteCodec_decode__doc__}, static PyObject * _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self, @@ -58,22 +60,25 @@ _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self, const char *errors); static PyObject * -_multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject *args, PyObject *kwargs) +_multibytecodec_MultibyteCodec_decode(MultibyteCodecObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"input", "errors", NULL}; + static const char * const _keywords[] = {"input", "errors", NULL}; + static _PyArg_Parser _parser = {"y*|z:decode", _keywords, 0}; Py_buffer input = {NULL, NULL}; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|z:decode", _keywords, - &input, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &input, &errors)) { goto exit; + } return_value = _multibytecodec_MultibyteCodec_decode_impl(self, &input, errors); exit: /* Cleanup for input */ - if (input.obj) + if (input.obj) { PyBuffer_Release(&input); + } return return_value; } @@ -84,7 +89,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_encode__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__}, + {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__}, static PyObject * _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self, @@ -92,16 +97,18 @@ _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEnco int final); static PyObject * -_multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderObject *self, PyObject *args, PyObject *kwargs) +_multibytecodec_MultibyteIncrementalEncoder_encode(MultibyteIncrementalEncoderObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"input", "final", NULL}; + static const char * const _keywords[] = {"input", "final", NULL}; + static _PyArg_Parser _parser = {"O|i:encode", _keywords, 0}; PyObject *input; int final = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:encode", _keywords, - &input, &final)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &input, &final)) { goto exit; + } return_value = _multibytecodec_MultibyteIncrementalEncoder_encode_impl(self, input, final); exit: @@ -131,7 +138,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_decode__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_DECODE_METHODDEF \ - {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_VARARGS|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__}, + {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__}, static PyObject * _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self, @@ -139,22 +146,25 @@ _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDeco int final); static PyObject * -_multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderObject *self, PyObject *args, PyObject *kwargs) +_multibytecodec_MultibyteIncrementalDecoder_decode(MultibyteIncrementalDecoderObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"input", "final", NULL}; + static const char * const _keywords[] = {"input", "final", NULL}; + static _PyArg_Parser _parser = {"y*|i:decode", _keywords, 0}; Py_buffer input = {NULL, NULL}; int final = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|i:decode", _keywords, - &input, &final)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &input, &final)) { goto exit; + } return_value = _multibytecodec_MultibyteIncrementalDecoder_decode_impl(self, &input, final); exit: /* Cleanup for input */ - if (input.obj) + if (input.obj) { PyBuffer_Release(&input); + } return return_value; } @@ -196,8 +206,9 @@ _multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, Py if (!PyArg_UnpackTuple(args, "read", 0, 1, - &sizeobj)) + &sizeobj)) { goto exit; + } return_value = _multibytecodec_MultibyteStreamReader_read_impl(self, sizeobj); exit: @@ -224,8 +235,9 @@ _multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self if (!PyArg_UnpackTuple(args, "readline", 0, 1, - &sizeobj)) + &sizeobj)) { goto exit; + } return_value = _multibytecodec_MultibyteStreamReader_readline_impl(self, sizeobj); exit: @@ -252,8 +264,9 @@ _multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *sel if (!PyArg_UnpackTuple(args, "readlines", 0, 1, - &sizehintobj)) + &sizehintobj)) { goto exit; + } return_value = _multibytecodec_MultibyteStreamReader_readlines_impl(self, sizehintobj); exit: @@ -317,4 +330,4 @@ PyDoc_STRVAR(_multibytecodec___create_codec__doc__, #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF \ {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__}, -/*[clinic end generated code: output=eebb21e18c3043d1 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=134b9e36cb985939 input=a9049054013a1b77]*/ diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 61750ed..d1da189 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -85,7 +85,7 @@ call_error_callback(PyObject *errors, PyObject *exc) const char *str; assert(PyUnicode_Check(errors)); - str = _PyUnicode_AsString(errors); + str = PyUnicode_AsUTF8(errors); if (str == NULL) return NULL; cb = PyCodec_LookupError(str); @@ -138,7 +138,7 @@ codecctx_errors_set(MultibyteStatefulCodecContext *self, PyObject *value, return -1; } - str = _PyUnicode_AsString(value); + str = PyUnicode_AsUTF8(value); if (str == NULL) return -1; @@ -1670,9 +1670,6 @@ _multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *se if (r == -1) return NULL; } - /* PySequence_Length() can fail */ - if (PyErr_Occurred()) - return NULL; Py_RETURN_NONE; } diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h new file mode 100644 index 0000000..052d252 --- /dev/null +++ b/Modules/clinic/_asynciomodule.c.h @@ -0,0 +1,520 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +PyDoc_STRVAR(_asyncio_Future___init____doc__, +"Future(*, loop=None)\n" +"--\n" +"\n" +"This class is *almost* compatible with concurrent.futures.Future.\n" +"\n" +" Differences:\n" +"\n" +" - result() and exception() do not take a timeout argument and\n" +" raise an exception when the future isn\'t done yet.\n" +"\n" +" - Callbacks registered with add_done_callback() are always called\n" +" via the event loop\'s call_soon_threadsafe().\n" +"\n" +" - This class is not compatible with the wait() and as_completed()\n" +" methods in the concurrent.futures package."); + +static int +_asyncio_Future___init___impl(FutureObj *self, PyObject *loop); + +static int +_asyncio_Future___init__(PyObject *self, PyObject *args, PyObject *kwargs) +{ + int return_value = -1; + static const char * const _keywords[] = {"loop", NULL}; + static _PyArg_Parser _parser = {"|$O:Future", _keywords, 0}; + PyObject *loop = NULL; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &loop)) { + goto exit; + } + return_value = _asyncio_Future___init___impl((FutureObj *)self, loop); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Future_result__doc__, +"result($self, /)\n" +"--\n" +"\n" +"Return the result this future represents.\n" +"\n" +"If the future has been cancelled, raises CancelledError. If the\n" +"future\'s result isn\'t yet available, raises InvalidStateError. If\n" +"the future is done and has an exception set, this exception is raised."); + +#define _ASYNCIO_FUTURE_RESULT_METHODDEF \ + {"result", (PyCFunction)_asyncio_Future_result, METH_NOARGS, _asyncio_Future_result__doc__}, + +static PyObject * +_asyncio_Future_result_impl(FutureObj *self); + +static PyObject * +_asyncio_Future_result(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future_result_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future_exception__doc__, +"exception($self, /)\n" +"--\n" +"\n" +"Return the exception that was set on this future.\n" +"\n" +"The exception (or None if no exception was set) is returned only if\n" +"the future is done. If the future has been cancelled, raises\n" +"CancelledError. If the future isn\'t done yet, raises\n" +"InvalidStateError."); + +#define _ASYNCIO_FUTURE_EXCEPTION_METHODDEF \ + {"exception", (PyCFunction)_asyncio_Future_exception, METH_NOARGS, _asyncio_Future_exception__doc__}, + +static PyObject * +_asyncio_Future_exception_impl(FutureObj *self); + +static PyObject * +_asyncio_Future_exception(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future_exception_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future_set_result__doc__, +"set_result($self, res, /)\n" +"--\n" +"\n" +"Mark the future done and set its result.\n" +"\n" +"If the future is already done when this method is called, raises\n" +"InvalidStateError."); + +#define _ASYNCIO_FUTURE_SET_RESULT_METHODDEF \ + {"set_result", (PyCFunction)_asyncio_Future_set_result, METH_O, _asyncio_Future_set_result__doc__}, + +PyDoc_STRVAR(_asyncio_Future_set_exception__doc__, +"set_exception($self, exception, /)\n" +"--\n" +"\n" +"Mark the future done and set an exception.\n" +"\n" +"If the future is already done when this method is called, raises\n" +"InvalidStateError."); + +#define _ASYNCIO_FUTURE_SET_EXCEPTION_METHODDEF \ + {"set_exception", (PyCFunction)_asyncio_Future_set_exception, METH_O, _asyncio_Future_set_exception__doc__}, + +PyDoc_STRVAR(_asyncio_Future_add_done_callback__doc__, +"add_done_callback($self, fn, /)\n" +"--\n" +"\n" +"Add a callback to be run when the future becomes done.\n" +"\n" +"The callback is called with a single argument - the future object. If\n" +"the future is already done when this is called, the callback is\n" +"scheduled with call_soon."); + +#define _ASYNCIO_FUTURE_ADD_DONE_CALLBACK_METHODDEF \ + {"add_done_callback", (PyCFunction)_asyncio_Future_add_done_callback, METH_O, _asyncio_Future_add_done_callback__doc__}, + +PyDoc_STRVAR(_asyncio_Future_remove_done_callback__doc__, +"remove_done_callback($self, fn, /)\n" +"--\n" +"\n" +"Remove all instances of a callback from the \"call when done\" list.\n" +"\n" +"Returns the number of callbacks removed."); + +#define _ASYNCIO_FUTURE_REMOVE_DONE_CALLBACK_METHODDEF \ + {"remove_done_callback", (PyCFunction)_asyncio_Future_remove_done_callback, METH_O, _asyncio_Future_remove_done_callback__doc__}, + +PyDoc_STRVAR(_asyncio_Future_cancel__doc__, +"cancel($self, /)\n" +"--\n" +"\n" +"Cancel the future and schedule callbacks.\n" +"\n" +"If the future is already done or cancelled, return False. Otherwise,\n" +"change the future\'s state to cancelled, schedule the callbacks and\n" +"return True."); + +#define _ASYNCIO_FUTURE_CANCEL_METHODDEF \ + {"cancel", (PyCFunction)_asyncio_Future_cancel, METH_NOARGS, _asyncio_Future_cancel__doc__}, + +static PyObject * +_asyncio_Future_cancel_impl(FutureObj *self); + +static PyObject * +_asyncio_Future_cancel(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future_cancel_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future_cancelled__doc__, +"cancelled($self, /)\n" +"--\n" +"\n" +"Return True if the future was cancelled."); + +#define _ASYNCIO_FUTURE_CANCELLED_METHODDEF \ + {"cancelled", (PyCFunction)_asyncio_Future_cancelled, METH_NOARGS, _asyncio_Future_cancelled__doc__}, + +static PyObject * +_asyncio_Future_cancelled_impl(FutureObj *self); + +static PyObject * +_asyncio_Future_cancelled(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future_cancelled_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future_done__doc__, +"done($self, /)\n" +"--\n" +"\n" +"Return True if the future is done.\n" +"\n" +"Done means either that a result / exception are available, or that the\n" +"future was cancelled."); + +#define _ASYNCIO_FUTURE_DONE_METHODDEF \ + {"done", (PyCFunction)_asyncio_Future_done, METH_NOARGS, _asyncio_Future_done__doc__}, + +static PyObject * +_asyncio_Future_done_impl(FutureObj *self); + +static PyObject * +_asyncio_Future_done(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future_done_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future__repr_info__doc__, +"_repr_info($self, /)\n" +"--\n" +"\n"); + +#define _ASYNCIO_FUTURE__REPR_INFO_METHODDEF \ + {"_repr_info", (PyCFunction)_asyncio_Future__repr_info, METH_NOARGS, _asyncio_Future__repr_info__doc__}, + +static PyObject * +_asyncio_Future__repr_info_impl(FutureObj *self); + +static PyObject * +_asyncio_Future__repr_info(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future__repr_info_impl(self); +} + +PyDoc_STRVAR(_asyncio_Future__schedule_callbacks__doc__, +"_schedule_callbacks($self, /)\n" +"--\n" +"\n"); + +#define _ASYNCIO_FUTURE__SCHEDULE_CALLBACKS_METHODDEF \ + {"_schedule_callbacks", (PyCFunction)_asyncio_Future__schedule_callbacks, METH_NOARGS, _asyncio_Future__schedule_callbacks__doc__}, + +static PyObject * +_asyncio_Future__schedule_callbacks_impl(FutureObj *self); + +static PyObject * +_asyncio_Future__schedule_callbacks(FutureObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Future__schedule_callbacks_impl(self); +} + +PyDoc_STRVAR(_asyncio_Task___init____doc__, +"Task(coro, *, loop=None)\n" +"--\n" +"\n" +"A coroutine wrapped in a Future."); + +static int +_asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop); + +static int +_asyncio_Task___init__(PyObject *self, PyObject *args, PyObject *kwargs) +{ + int return_value = -1; + static const char * const _keywords[] = {"coro", "loop", NULL}; + static _PyArg_Parser _parser = {"O|$O:Task", _keywords, 0}; + PyObject *coro; + PyObject *loop = NULL; + + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &coro, &loop)) { + goto exit; + } + return_value = _asyncio_Task___init___impl((TaskObj *)self, coro, loop); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task_current_task__doc__, +"current_task($type, /, loop=None)\n" +"--\n" +"\n" +"Return the currently running task in an event loop or None.\n" +"\n" +"By default the current task for the current event loop is returned.\n" +"\n" +"None is returned when called not in the context of a Task."); + +#define _ASYNCIO_TASK_CURRENT_TASK_METHODDEF \ + {"current_task", (PyCFunction)_asyncio_Task_current_task, METH_FASTCALL|METH_CLASS, _asyncio_Task_current_task__doc__}, + +static PyObject * +_asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop); + +static PyObject * +_asyncio_Task_current_task(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"loop", NULL}; + static _PyArg_Parser _parser = {"|O:current_task", _keywords, 0}; + PyObject *loop = NULL; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &loop)) { + goto exit; + } + return_value = _asyncio_Task_current_task_impl(type, loop); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task_all_tasks__doc__, +"all_tasks($type, /, loop=None)\n" +"--\n" +"\n" +"Return a set of all tasks for an event loop.\n" +"\n" +"By default all tasks for the current event loop are returned."); + +#define _ASYNCIO_TASK_ALL_TASKS_METHODDEF \ + {"all_tasks", (PyCFunction)_asyncio_Task_all_tasks, METH_FASTCALL|METH_CLASS, _asyncio_Task_all_tasks__doc__}, + +static PyObject * +_asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop); + +static PyObject * +_asyncio_Task_all_tasks(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"loop", NULL}; + static _PyArg_Parser _parser = {"|O:all_tasks", _keywords, 0}; + PyObject *loop = NULL; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &loop)) { + goto exit; + } + return_value = _asyncio_Task_all_tasks_impl(type, loop); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task__repr_info__doc__, +"_repr_info($self, /)\n" +"--\n" +"\n"); + +#define _ASYNCIO_TASK__REPR_INFO_METHODDEF \ + {"_repr_info", (PyCFunction)_asyncio_Task__repr_info, METH_NOARGS, _asyncio_Task__repr_info__doc__}, + +static PyObject * +_asyncio_Task__repr_info_impl(TaskObj *self); + +static PyObject * +_asyncio_Task__repr_info(TaskObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Task__repr_info_impl(self); +} + +PyDoc_STRVAR(_asyncio_Task_cancel__doc__, +"cancel($self, /)\n" +"--\n" +"\n" +"Request that this task cancel itself.\n" +"\n" +"This arranges for a CancelledError to be thrown into the\n" +"wrapped coroutine on the next cycle through the event loop.\n" +"The coroutine then has a chance to clean up or even deny\n" +"the request using try/except/finally.\n" +"\n" +"Unlike Future.cancel, this does not guarantee that the\n" +"task will be cancelled: the exception might be caught and\n" +"acted upon, delaying cancellation of the task or preventing\n" +"cancellation completely. The task may also return a value or\n" +"raise a different exception.\n" +"\n" +"Immediately after this method is called, Task.cancelled() will\n" +"not return True (unless the task was already cancelled). A\n" +"task will be marked as cancelled when the wrapped coroutine\n" +"terminates with a CancelledError exception (even if cancel()\n" +"was not called)."); + +#define _ASYNCIO_TASK_CANCEL_METHODDEF \ + {"cancel", (PyCFunction)_asyncio_Task_cancel, METH_NOARGS, _asyncio_Task_cancel__doc__}, + +static PyObject * +_asyncio_Task_cancel_impl(TaskObj *self); + +static PyObject * +_asyncio_Task_cancel(TaskObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Task_cancel_impl(self); +} + +PyDoc_STRVAR(_asyncio_Task_get_stack__doc__, +"get_stack($self, /, *, limit=None)\n" +"--\n" +"\n" +"Return the list of stack frames for this task\'s coroutine.\n" +"\n" +"If the coroutine is not done, this returns the stack where it is\n" +"suspended. If the coroutine has completed successfully or was\n" +"cancelled, this returns an empty list. If the coroutine was\n" +"terminated by an exception, this returns the list of traceback\n" +"frames.\n" +"\n" +"The frames are always ordered from oldest to newest.\n" +"\n" +"The optional limit gives the maximum number of frames to\n" +"return; by default all available frames are returned. Its\n" +"meaning differs depending on whether a stack or a traceback is\n" +"returned: the newest frames of a stack are returned, but the\n" +"oldest frames of a traceback are returned. (This matches the\n" +"behavior of the traceback module.)\n" +"\n" +"For reasons beyond our control, only one stack frame is\n" +"returned for a suspended coroutine."); + +#define _ASYNCIO_TASK_GET_STACK_METHODDEF \ + {"get_stack", (PyCFunction)_asyncio_Task_get_stack, METH_FASTCALL, _asyncio_Task_get_stack__doc__}, + +static PyObject * +_asyncio_Task_get_stack_impl(TaskObj *self, PyObject *limit); + +static PyObject * +_asyncio_Task_get_stack(TaskObj *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"limit", NULL}; + static _PyArg_Parser _parser = {"|$O:get_stack", _keywords, 0}; + PyObject *limit = Py_None; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &limit)) { + goto exit; + } + return_value = _asyncio_Task_get_stack_impl(self, limit); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task_print_stack__doc__, +"print_stack($self, /, *, limit=None, file=None)\n" +"--\n" +"\n" +"Print the stack or traceback for this task\'s coroutine.\n" +"\n" +"This produces output similar to that of the traceback module,\n" +"for the frames retrieved by get_stack(). The limit argument\n" +"is passed to get_stack(). The file argument is an I/O stream\n" +"to which the output is written; by default output is written\n" +"to sys.stderr."); + +#define _ASYNCIO_TASK_PRINT_STACK_METHODDEF \ + {"print_stack", (PyCFunction)_asyncio_Task_print_stack, METH_FASTCALL, _asyncio_Task_print_stack__doc__}, + +static PyObject * +_asyncio_Task_print_stack_impl(TaskObj *self, PyObject *limit, + PyObject *file); + +static PyObject * +_asyncio_Task_print_stack(TaskObj *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"limit", "file", NULL}; + static _PyArg_Parser _parser = {"|$OO:print_stack", _keywords, 0}; + PyObject *limit = Py_None; + PyObject *file = Py_None; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &limit, &file)) { + goto exit; + } + return_value = _asyncio_Task_print_stack_impl(self, limit, file); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task__step__doc__, +"_step($self, /, exc=None)\n" +"--\n" +"\n"); + +#define _ASYNCIO_TASK__STEP_METHODDEF \ + {"_step", (PyCFunction)_asyncio_Task__step, METH_FASTCALL, _asyncio_Task__step__doc__}, + +static PyObject * +_asyncio_Task__step_impl(TaskObj *self, PyObject *exc); + +static PyObject * +_asyncio_Task__step(TaskObj *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"exc", NULL}; + static _PyArg_Parser _parser = {"|O:_step", _keywords, 0}; + PyObject *exc = NULL; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &exc)) { + goto exit; + } + return_value = _asyncio_Task__step_impl(self, exc); + +exit: + return return_value; +} + +PyDoc_STRVAR(_asyncio_Task__wakeup__doc__, +"_wakeup($self, /, fut)\n" +"--\n" +"\n"); + +#define _ASYNCIO_TASK__WAKEUP_METHODDEF \ + {"_wakeup", (PyCFunction)_asyncio_Task__wakeup, METH_FASTCALL, _asyncio_Task__wakeup__doc__}, + +static PyObject * +_asyncio_Task__wakeup_impl(TaskObj *self, PyObject *fut); + +static PyObject * +_asyncio_Task__wakeup(TaskObj *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"fut", NULL}; + static _PyArg_Parser _parser = {"O:_wakeup", _keywords, 0}; + PyObject *fut; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fut)) { + goto exit; + } + return_value = _asyncio_Task__wakeup_impl(self, fut); + +exit: + return return_value; +} +/*[clinic end generated code: output=8f036321bb083066 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h index 3ed8303..1ca810c 100644 --- a/Modules/clinic/_bz2module.c.h +++ b/Modules/clinic/_bz2module.c.h @@ -25,14 +25,16 @@ _bz2_BZ2Compressor_compress(BZ2Compressor *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:compress", &data)) + if (!PyArg_Parse(arg, "y*:compress", &data)) { goto exit; + } return_value = _bz2_BZ2Compressor_compress_impl(self, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -80,11 +82,13 @@ _bz2_BZ2Compressor___init__(PyObject *self, PyObject *args, PyObject *kwargs) int compresslevel = 9; if ((Py_TYPE(self) == &BZ2Compressor_Type) && - !_PyArg_NoKeywords("BZ2Compressor", kwargs)) + !_PyArg_NoKeywords("BZ2Compressor", kwargs)) { goto exit; + } if (!PyArg_ParseTuple(args, "|i:BZ2Compressor", - &compresslevel)) + &compresslevel)) { goto exit; + } return_value = _bz2_BZ2Compressor___init___impl((BZ2Compressor *)self, compresslevel); exit: @@ -111,29 +115,32 @@ PyDoc_STRVAR(_bz2_BZ2Decompressor_decompress__doc__, "the unused_data attribute."); #define _BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_VARARGS|METH_KEYWORDS, _bz2_BZ2Decompressor_decompress__doc__}, + {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL, _bz2_BZ2Decompressor_decompress__doc__}, static PyObject * _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data, Py_ssize_t max_length); static PyObject * -_bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *args, PyObject *kwargs) +_bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"data", "max_length", NULL}; + static const char * const _keywords[] = {"data", "max_length", NULL}; + static _PyArg_Parser _parser = {"y*|n:decompress", _keywords, 0}; Py_buffer data = {NULL, NULL}; Py_ssize_t max_length = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|n:decompress", _keywords, - &data, &max_length)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &max_length)) { goto exit; + } return_value = _bz2_BZ2Decompressor_decompress_impl(self, &data, max_length); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -155,14 +162,16 @@ _bz2_BZ2Decompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs) int return_value = -1; if ((Py_TYPE(self) == &BZ2Decompressor_Type) && - !_PyArg_NoPositional("BZ2Decompressor", args)) + !_PyArg_NoPositional("BZ2Decompressor", args)) { goto exit; + } if ((Py_TYPE(self) == &BZ2Decompressor_Type) && - !_PyArg_NoKeywords("BZ2Decompressor", kwargs)) + !_PyArg_NoKeywords("BZ2Decompressor", kwargs)) { goto exit; + } return_value = _bz2_BZ2Decompressor___init___impl((BZ2Decompressor *)self); exit: return return_value; } -/*[clinic end generated code: output=fef29b76b3314fc7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7e57af0b368d3e55 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h index af06c6d..056287d 100644 --- a/Modules/clinic/_codecsmodule.c.h +++ b/Modules/clinic/_codecsmodule.c.h @@ -33,8 +33,9 @@ _codecs_lookup(PyObject *module, PyObject *arg) PyObject *return_value = NULL; const char *encoding; - if (!PyArg_Parse(arg, "s:lookup", &encoding)) + if (!PyArg_Parse(arg, "s:lookup", &encoding)) { goto exit; + } return_value = _codecs_lookup_impl(module, encoding); exit: @@ -54,24 +55,26 @@ PyDoc_STRVAR(_codecs_encode__doc__, "codecs.register_error that can handle ValueErrors."); #define _CODECS_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_codecs_encode, METH_VARARGS|METH_KEYWORDS, _codecs_encode__doc__}, + {"encode", (PyCFunction)_codecs_encode, METH_FASTCALL, _codecs_encode__doc__}, static PyObject * _codecs_encode_impl(PyObject *module, PyObject *obj, const char *encoding, const char *errors); static PyObject * -_codecs_encode(PyObject *module, PyObject *args, PyObject *kwargs) +_codecs_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"obj", "encoding", "errors", NULL}; + static const char * const _keywords[] = {"obj", "encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"O|ss:encode", _keywords, 0}; PyObject *obj; const char *encoding = NULL; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|ss:encode", _keywords, - &obj, &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &obj, &encoding, &errors)) { goto exit; + } return_value = _codecs_encode_impl(module, obj, encoding, errors); exit: @@ -91,24 +94,26 @@ PyDoc_STRVAR(_codecs_decode__doc__, "codecs.register_error that can handle ValueErrors."); #define _CODECS_DECODE_METHODDEF \ - {"decode", (PyCFunction)_codecs_decode, METH_VARARGS|METH_KEYWORDS, _codecs_decode__doc__}, + {"decode", (PyCFunction)_codecs_decode, METH_FASTCALL, _codecs_decode__doc__}, static PyObject * _codecs_decode_impl(PyObject *module, PyObject *obj, const char *encoding, const char *errors); static PyObject * -_codecs_decode(PyObject *module, PyObject *args, PyObject *kwargs) +_codecs_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"obj", "encoding", "errors", NULL}; + static const char * const _keywords[] = {"obj", "encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"O|ss:decode", _keywords, 0}; PyObject *obj; const char *encoding = NULL; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|ss:decode", _keywords, - &obj, &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &obj, &encoding, &errors)) { goto exit; + } return_value = _codecs_decode_impl(module, obj, encoding, errors); exit: @@ -133,8 +138,9 @@ _codecs__forget_codec(PyObject *module, PyObject *arg) PyObject *return_value = NULL; const char *encoding; - if (!PyArg_Parse(arg, "s:_forget_codec", &encoding)) + if (!PyArg_Parse(arg, "s:_forget_codec", &encoding)) { goto exit; + } return_value = _codecs__forget_codec_impl(module, encoding); exit: @@ -161,14 +167,16 @@ _codecs_escape_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "s*|z:escape_decode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_escape_decode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -193,8 +201,9 @@ _codecs_escape_encode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "O!|z:escape_encode", - &PyBytes_Type, &data, &errors)) + &PyBytes_Type, &data, &errors)) { goto exit; + } return_value = _codecs_escape_encode_impl(module, data, errors); exit: @@ -221,8 +230,9 @@ _codecs_unicode_internal_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "O|z:unicode_internal_decode", - &obj, &errors)) + &obj, &errors)) { goto exit; + } return_value = _codecs_unicode_internal_decode_impl(module, obj, errors); exit: @@ -250,14 +260,16 @@ _codecs_utf_7_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_7_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_7_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -283,14 +295,16 @@ _codecs_utf_8_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_8_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_8_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -316,14 +330,16 @@ _codecs_utf_16_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_16_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_16_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -349,14 +365,16 @@ _codecs_utf_16_le_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_16_le_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_16_le_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -382,14 +400,16 @@ _codecs_utf_16_be_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_16_be_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_16_be_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -417,14 +437,16 @@ _codecs_utf_16_ex_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zii:utf_16_ex_decode", - &data, &errors, &byteorder, &final)) + &data, &errors, &byteorder, &final)) { goto exit; + } return_value = _codecs_utf_16_ex_decode_impl(module, &data, errors, byteorder, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -450,14 +472,16 @@ _codecs_utf_32_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_32_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_32_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -483,14 +507,16 @@ _codecs_utf_32_le_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_32_le_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_32_le_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -516,14 +542,16 @@ _codecs_utf_32_be_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:utf_32_be_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_utf_32_be_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -551,14 +579,16 @@ _codecs_utf_32_ex_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zii:utf_32_ex_decode", - &data, &errors, &byteorder, &final)) + &data, &errors, &byteorder, &final)) { goto exit; + } return_value = _codecs_utf_32_ex_decode_impl(module, &data, errors, byteorder, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -583,14 +613,16 @@ _codecs_unicode_escape_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "s*|z:unicode_escape_decode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_unicode_escape_decode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -615,14 +647,16 @@ _codecs_raw_unicode_escape_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "s*|z:raw_unicode_escape_decode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_raw_unicode_escape_decode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -647,14 +681,16 @@ _codecs_latin_1_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "y*|z:latin_1_decode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_latin_1_decode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -679,14 +715,16 @@ _codecs_ascii_decode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "y*|z:ascii_decode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_ascii_decode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -712,19 +750,21 @@ _codecs_charmap_decode(PyObject *module, PyObject *args) PyObject *mapping = NULL; if (!PyArg_ParseTuple(args, "y*|zO:charmap_decode", - &data, &errors, &mapping)) + &data, &errors, &mapping)) { goto exit; + } return_value = _codecs_charmap_decode_impl(module, &data, errors, mapping); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } -#if defined(HAVE_MBCS) +#if defined(MS_WINDOWS) PyDoc_STRVAR(_codecs_mbcs_decode__doc__, "mbcs_decode($module, data, errors=None, final=False, /)\n" @@ -747,21 +787,62 @@ _codecs_mbcs_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "y*|zi:mbcs_decode", - &data, &errors, &final)) + &data, &errors, &final)) { goto exit; + } return_value = _codecs_mbcs_decode_impl(module, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } -#endif /* defined(HAVE_MBCS) */ +#endif /* defined(MS_WINDOWS) */ -#if defined(HAVE_MBCS) +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_codecs_oem_decode__doc__, +"oem_decode($module, data, errors=None, final=False, /)\n" +"--\n" +"\n"); + +#define _CODECS_OEM_DECODE_METHODDEF \ + {"oem_decode", (PyCFunction)_codecs_oem_decode, METH_VARARGS, _codecs_oem_decode__doc__}, + +static PyObject * +_codecs_oem_decode_impl(PyObject *module, Py_buffer *data, + const char *errors, int final); + +static PyObject * +_codecs_oem_decode(PyObject *module, PyObject *args) +{ + PyObject *return_value = NULL; + Py_buffer data = {NULL, NULL}; + const char *errors = NULL; + int final = 0; + + if (!PyArg_ParseTuple(args, "y*|zi:oem_decode", + &data, &errors, &final)) { + goto exit; + } + return_value = _codecs_oem_decode_impl(module, &data, errors, final); + +exit: + /* Cleanup for data */ + if (data.obj) { + PyBuffer_Release(&data); + } + + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) PyDoc_STRVAR(_codecs_code_page_decode__doc__, "code_page_decode($module, codepage, data, errors=None, final=False, /)\n" @@ -785,19 +866,21 @@ _codecs_code_page_decode(PyObject *module, PyObject *args) int final = 0; if (!PyArg_ParseTuple(args, "iy*|zi:code_page_decode", - &codepage, &data, &errors, &final)) + &codepage, &data, &errors, &final)) { goto exit; + } return_value = _codecs_code_page_decode_impl(module, codepage, &data, errors, final); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } -#endif /* defined(HAVE_MBCS) */ +#endif /* defined(MS_WINDOWS) */ PyDoc_STRVAR(_codecs_readbuffer_encode__doc__, "readbuffer_encode($module, data, errors=None, /)\n" @@ -819,14 +902,16 @@ _codecs_readbuffer_encode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "s*|z:readbuffer_encode", - &data, &errors)) + &data, &errors)) { goto exit; + } return_value = _codecs_readbuffer_encode_impl(module, &data, errors); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -851,8 +936,9 @@ _codecs_unicode_internal_encode(PyObject *module, PyObject *args) const char *errors = NULL; if (!PyArg_ParseTuple(args, "O|z:unicode_internal_encode", - &obj, &errors)) + &obj, &errors)) { goto exit; + } return_value = _codecs_unicode_internal_encode_impl(module, obj, errors); exit: @@ -878,9 +964,10 @@ _codecs_utf_7_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_7_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_7_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_7_encode_impl(module, str, errors); exit: @@ -906,9 +993,10 @@ _codecs_utf_8_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_8_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_8_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_8_encode_impl(module, str, errors); exit: @@ -935,9 +1023,10 @@ _codecs_utf_16_encode(PyObject *module, PyObject *args) const char *errors = NULL; int byteorder = 0; - if (!PyArg_ParseTuple(args, "O|zi:utf_16_encode", - &str, &errors, &byteorder)) + if (!PyArg_ParseTuple(args, "U|zi:utf_16_encode", + &str, &errors, &byteorder)) { goto exit; + } return_value = _codecs_utf_16_encode_impl(module, str, errors, byteorder); exit: @@ -963,9 +1052,10 @@ _codecs_utf_16_le_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_16_le_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_16_le_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_16_le_encode_impl(module, str, errors); exit: @@ -991,9 +1081,10 @@ _codecs_utf_16_be_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_16_be_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_16_be_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_16_be_encode_impl(module, str, errors); exit: @@ -1020,9 +1111,10 @@ _codecs_utf_32_encode(PyObject *module, PyObject *args) const char *errors = NULL; int byteorder = 0; - if (!PyArg_ParseTuple(args, "O|zi:utf_32_encode", - &str, &errors, &byteorder)) + if (!PyArg_ParseTuple(args, "U|zi:utf_32_encode", + &str, &errors, &byteorder)) { goto exit; + } return_value = _codecs_utf_32_encode_impl(module, str, errors, byteorder); exit: @@ -1048,9 +1140,10 @@ _codecs_utf_32_le_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_32_le_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_32_le_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_32_le_encode_impl(module, str, errors); exit: @@ -1076,9 +1169,10 @@ _codecs_utf_32_be_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:utf_32_be_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:utf_32_be_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_utf_32_be_encode_impl(module, str, errors); exit: @@ -1104,9 +1198,10 @@ _codecs_unicode_escape_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:unicode_escape_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:unicode_escape_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_unicode_escape_encode_impl(module, str, errors); exit: @@ -1132,9 +1227,10 @@ _codecs_raw_unicode_escape_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:raw_unicode_escape_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:raw_unicode_escape_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_raw_unicode_escape_encode_impl(module, str, errors); exit: @@ -1160,9 +1256,10 @@ _codecs_latin_1_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:latin_1_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:latin_1_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_latin_1_encode_impl(module, str, errors); exit: @@ -1188,9 +1285,10 @@ _codecs_ascii_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:ascii_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:ascii_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_ascii_encode_impl(module, str, errors); exit: @@ -1217,9 +1315,10 @@ _codecs_charmap_encode(PyObject *module, PyObject *args) const char *errors = NULL; PyObject *mapping = NULL; - if (!PyArg_ParseTuple(args, "O|zO:charmap_encode", - &str, &errors, &mapping)) + if (!PyArg_ParseTuple(args, "U|zO:charmap_encode", + &str, &errors, &mapping)) { goto exit; + } return_value = _codecs_charmap_encode_impl(module, str, errors, mapping); exit: @@ -1243,15 +1342,16 @@ _codecs_charmap_build(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *map; - if (!PyArg_Parse(arg, "U:charmap_build", &map)) + if (!PyArg_Parse(arg, "U:charmap_build", &map)) { goto exit; + } return_value = _codecs_charmap_build_impl(module, map); exit: return return_value; } -#if defined(HAVE_MBCS) +#if defined(MS_WINDOWS) PyDoc_STRVAR(_codecs_mbcs_encode__doc__, "mbcs_encode($module, str, errors=None, /)\n" @@ -1271,18 +1371,51 @@ _codecs_mbcs_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "O|z:mbcs_encode", - &str, &errors)) + if (!PyArg_ParseTuple(args, "U|z:mbcs_encode", + &str, &errors)) { goto exit; + } return_value = _codecs_mbcs_encode_impl(module, str, errors); exit: return return_value; } -#endif /* defined(HAVE_MBCS) */ +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_codecs_oem_encode__doc__, +"oem_encode($module, str, errors=None, /)\n" +"--\n" +"\n"); + +#define _CODECS_OEM_ENCODE_METHODDEF \ + {"oem_encode", (PyCFunction)_codecs_oem_encode, METH_VARARGS, _codecs_oem_encode__doc__}, -#if defined(HAVE_MBCS) +static PyObject * +_codecs_oem_encode_impl(PyObject *module, PyObject *str, const char *errors); + +static PyObject * +_codecs_oem_encode(PyObject *module, PyObject *args) +{ + PyObject *return_value = NULL; + PyObject *str; + const char *errors = NULL; + + if (!PyArg_ParseTuple(args, "U|z:oem_encode", + &str, &errors)) { + goto exit; + } + return_value = _codecs_oem_encode_impl(module, str, errors); + +exit: + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) PyDoc_STRVAR(_codecs_code_page_encode__doc__, "code_page_encode($module, code_page, str, errors=None, /)\n" @@ -1304,16 +1437,17 @@ _codecs_code_page_encode(PyObject *module, PyObject *args) PyObject *str; const char *errors = NULL; - if (!PyArg_ParseTuple(args, "iO|z:code_page_encode", - &code_page, &str, &errors)) + if (!PyArg_ParseTuple(args, "iU|z:code_page_encode", + &code_page, &str, &errors)) { goto exit; + } return_value = _codecs_code_page_encode_impl(module, code_page, str, errors); exit: return return_value; } -#endif /* defined(HAVE_MBCS) */ +#endif /* defined(MS_WINDOWS) */ PyDoc_STRVAR(_codecs_register_error__doc__, "register_error($module, errors, handler, /)\n" @@ -1340,8 +1474,9 @@ _codecs_register_error(PyObject *module, PyObject *args) PyObject *handler; if (!PyArg_ParseTuple(args, "sO:register_error", - &errors, &handler)) + &errors, &handler)) { goto exit; + } return_value = _codecs_register_error_impl(module, errors, handler); exit: @@ -1369,8 +1504,9 @@ _codecs_lookup_error(PyObject *module, PyObject *arg) PyObject *return_value = NULL; const char *name; - if (!PyArg_Parse(arg, "s:lookup_error", &name)) + if (!PyArg_Parse(arg, "s:lookup_error", &name)) { goto exit; + } return_value = _codecs_lookup_error_impl(module, name); exit: @@ -1381,6 +1517,10 @@ exit: #define _CODECS_MBCS_DECODE_METHODDEF #endif /* !defined(_CODECS_MBCS_DECODE_METHODDEF) */ +#ifndef _CODECS_OEM_DECODE_METHODDEF + #define _CODECS_OEM_DECODE_METHODDEF +#endif /* !defined(_CODECS_OEM_DECODE_METHODDEF) */ + #ifndef _CODECS_CODE_PAGE_DECODE_METHODDEF #define _CODECS_CODE_PAGE_DECODE_METHODDEF #endif /* !defined(_CODECS_CODE_PAGE_DECODE_METHODDEF) */ @@ -1389,7 +1529,11 @@ exit: #define _CODECS_MBCS_ENCODE_METHODDEF #endif /* !defined(_CODECS_MBCS_ENCODE_METHODDEF) */ +#ifndef _CODECS_OEM_ENCODE_METHODDEF + #define _CODECS_OEM_ENCODE_METHODDEF +#endif /* !defined(_CODECS_OEM_ENCODE_METHODDEF) */ + #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF #define _CODECS_CODE_PAGE_ENCODE_METHODDEF #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */ -/*[clinic end generated code: output=42fed94e2ab765ba input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6d6afcabde10ed79 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_cryptmodule.c.h b/Modules/clinic/_cryptmodule.c.h index a3c371c..412c6fe 100644 --- a/Modules/clinic/_cryptmodule.c.h +++ b/Modules/clinic/_cryptmodule.c.h @@ -27,11 +27,12 @@ crypt_crypt(PyObject *module, PyObject *args) const char *salt; if (!PyArg_ParseTuple(args, "ss:crypt", - &word, &salt)) + &word, &salt)) { goto exit; + } return_value = crypt_crypt_impl(module, word, salt); exit: return return_value; } -/*[clinic end generated code: output=e0493a9691537690 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8dfc88264e662df4 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_cursesmodule.c.h b/Modules/clinic/_cursesmodule.c.h index 5e11742..62ff1c8 100644 --- a/Modules/clinic/_cursesmodule.c.h +++ b/Modules/clinic/_cursesmodule.c.h @@ -40,22 +40,26 @@ curses_window_addch(PyCursesWindowObject *self, PyObject *args) switch (PyTuple_GET_SIZE(args)) { case 1: - if (!PyArg_ParseTuple(args, "O:addch", &ch)) + if (!PyArg_ParseTuple(args, "O:addch", &ch)) { goto exit; + } break; case 2: - if (!PyArg_ParseTuple(args, "Ol:addch", &ch, &attr)) + if (!PyArg_ParseTuple(args, "Ol:addch", &ch, &attr)) { goto exit; + } group_right_1 = 1; break; case 3: - if (!PyArg_ParseTuple(args, "iiO:addch", &y, &x, &ch)) + if (!PyArg_ParseTuple(args, "iiO:addch", &y, &x, &ch)) { goto exit; + } group_left_1 = 1; break; case 4: - if (!PyArg_ParseTuple(args, "iiOl:addch", &y, &x, &ch, &attr)) + if (!PyArg_ParseTuple(args, "iiOl:addch", &y, &x, &ch, &attr)) { goto exit; + } group_right_1 = 1; group_left_1 = 1; break; @@ -68,4 +72,4 @@ curses_window_addch(PyCursesWindowObject *self, PyObject *args) exit: return return_value; } -/*[clinic end generated code: output=982b1e709577f3ec input=a9049054013a1b77]*/ +/*[clinic end generated code: output=13ffc5f8d79cbfbf input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_datetimemodule.c.h b/Modules/clinic/_datetimemodule.c.h index 688c903..dcb992b 100644 --- a/Modules/clinic/_datetimemodule.c.h +++ b/Modules/clinic/_datetimemodule.c.h @@ -14,24 +14,26 @@ PyDoc_STRVAR(datetime_datetime_now__doc__, "If no tz is specified, uses local timezone."); #define DATETIME_DATETIME_NOW_METHODDEF \ - {"now", (PyCFunction)datetime_datetime_now, METH_VARARGS|METH_KEYWORDS|METH_CLASS, datetime_datetime_now__doc__}, + {"now", (PyCFunction)datetime_datetime_now, METH_FASTCALL|METH_CLASS, datetime_datetime_now__doc__}, static PyObject * datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz); static PyObject * -datetime_datetime_now(PyTypeObject *type, PyObject *args, PyObject *kwargs) +datetime_datetime_now(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"tz", NULL}; + static const char * const _keywords[] = {"tz", NULL}; + static _PyArg_Parser _parser = {"|O:now", _keywords, 0}; PyObject *tz = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:now", _keywords, - &tz)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &tz)) { goto exit; + } return_value = datetime_datetime_now_impl(type, tz); exit: return return_value; } -/*[clinic end generated code: output=7f45c670d6e4953a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=8aaac0705add61ca input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h index 49cbceb..06cf7e6 100644 --- a/Modules/clinic/_dbmmodule.c.h +++ b/Modules/clinic/_dbmmodule.c.h @@ -60,8 +60,9 @@ _dbm_dbm_get(dbmobject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "s#|O:get", - &key, &key_length, &default_value)) + &key, &key_length, &default_value)) { goto exit; + } return_value = _dbm_dbm_get_impl(self, key, key_length, default_value); exit: @@ -93,8 +94,9 @@ _dbm_dbm_setdefault(dbmobject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "s#|O:setdefault", - &key, &key_length, &default_value)) + &key, &key_length, &default_value)) { goto exit; + } return_value = _dbm_dbm_setdefault_impl(self, key, key_length, default_value); exit: @@ -131,11 +133,12 @@ dbmopen(PyObject *module, PyObject *args) int mode = 438; if (!PyArg_ParseTuple(args, "s|si:open", - &filename, &flags, &mode)) + &filename, &flags, &mode)) { goto exit; + } return_value = dbmopen_impl(module, filename, flags, mode); exit: return return_value; } -/*[clinic end generated code: output=fff12f168cdf8b43 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=99adf966ef0475ff input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h index 86b4c4c..1b309cd 100644 --- a/Modules/clinic/_elementtree.c.h +++ b/Modules/clinic/_elementtree.c.h @@ -19,8 +19,9 @@ _elementtree_Element_append(ElementObject *self, PyObject *arg) PyObject *return_value = NULL; PyObject *subelement; - if (!PyArg_Parse(arg, "O!:append", &Element_Type, &subelement)) + if (!PyArg_Parse(arg, "O!:append", &Element_Type, &subelement)) { goto exit; + } return_value = _elementtree_Element_append_impl(self, subelement); exit: @@ -87,8 +88,9 @@ _elementtree_Element___sizeof__(ElementObject *self, PyObject *Py_UNUSED(ignored Py_ssize_t _return_value; _return_value = _elementtree_Element___sizeof___impl(self); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -134,23 +136,25 @@ PyDoc_STRVAR(_elementtree_Element_find__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FIND_METHODDEF \ - {"find", (PyCFunction)_elementtree_Element_find, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_find__doc__}, + {"find", (PyCFunction)_elementtree_Element_find, METH_FASTCALL, _elementtree_Element_find__doc__}, static PyObject * _elementtree_Element_find_impl(ElementObject *self, PyObject *path, PyObject *namespaces); static PyObject * -_elementtree_Element_find(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_find(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "namespaces", NULL}; + static const char * const _keywords[] = {"path", "namespaces", NULL}; + static _PyArg_Parser _parser = {"O|O:find", _keywords, 0}; PyObject *path; PyObject *namespaces = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:find", _keywords, - &path, &namespaces)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path, &namespaces)) { goto exit; + } return_value = _elementtree_Element_find_impl(self, path, namespaces); exit: @@ -163,7 +167,7 @@ PyDoc_STRVAR(_elementtree_Element_findtext__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FINDTEXT_METHODDEF \ - {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_findtext__doc__}, + {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_FASTCALL, _elementtree_Element_findtext__doc__}, static PyObject * _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path, @@ -171,17 +175,19 @@ _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path, PyObject *namespaces); static PyObject * -_elementtree_Element_findtext(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_findtext(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "default", "namespaces", NULL}; + static const char * const _keywords[] = {"path", "default", "namespaces", NULL}; + static _PyArg_Parser _parser = {"O|OO:findtext", _keywords, 0}; PyObject *path; PyObject *default_value = Py_None; PyObject *namespaces = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OO:findtext", _keywords, - &path, &default_value, &namespaces)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path, &default_value, &namespaces)) { goto exit; + } return_value = _elementtree_Element_findtext_impl(self, path, default_value, namespaces); exit: @@ -194,23 +200,25 @@ PyDoc_STRVAR(_elementtree_Element_findall__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FINDALL_METHODDEF \ - {"findall", (PyCFunction)_elementtree_Element_findall, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_findall__doc__}, + {"findall", (PyCFunction)_elementtree_Element_findall, METH_FASTCALL, _elementtree_Element_findall__doc__}, static PyObject * _elementtree_Element_findall_impl(ElementObject *self, PyObject *path, PyObject *namespaces); static PyObject * -_elementtree_Element_findall(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_findall(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "namespaces", NULL}; + static const char * const _keywords[] = {"path", "namespaces", NULL}; + static _PyArg_Parser _parser = {"O|O:findall", _keywords, 0}; PyObject *path; PyObject *namespaces = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:findall", _keywords, - &path, &namespaces)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path, &namespaces)) { goto exit; + } return_value = _elementtree_Element_findall_impl(self, path, namespaces); exit: @@ -223,23 +231,25 @@ PyDoc_STRVAR(_elementtree_Element_iterfind__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF \ - {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_iterfind__doc__}, + {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_FASTCALL, _elementtree_Element_iterfind__doc__}, static PyObject * _elementtree_Element_iterfind_impl(ElementObject *self, PyObject *path, PyObject *namespaces); static PyObject * -_elementtree_Element_iterfind(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_iterfind(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "namespaces", NULL}; + static const char * const _keywords[] = {"path", "namespaces", NULL}; + static _PyArg_Parser _parser = {"O|O:iterfind", _keywords, 0}; PyObject *path; PyObject *namespaces = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:iterfind", _keywords, - &path, &namespaces)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path, &namespaces)) { goto exit; + } return_value = _elementtree_Element_iterfind_impl(self, path, namespaces); exit: @@ -252,23 +262,25 @@ PyDoc_STRVAR(_elementtree_Element_get__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_GET_METHODDEF \ - {"get", (PyCFunction)_elementtree_Element_get, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_get__doc__}, + {"get", (PyCFunction)_elementtree_Element_get, METH_FASTCALL, _elementtree_Element_get__doc__}, static PyObject * _elementtree_Element_get_impl(ElementObject *self, PyObject *key, PyObject *default_value); static PyObject * -_elementtree_Element_get(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_get(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"key", "default", NULL}; + static const char * const _keywords[] = {"key", "default", NULL}; + static _PyArg_Parser _parser = {"O|O:get", _keywords, 0}; PyObject *key; PyObject *default_value = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get", _keywords, - &key, &default_value)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &key, &default_value)) { goto exit; + } return_value = _elementtree_Element_get_impl(self, key, default_value); exit: @@ -298,21 +310,23 @@ PyDoc_STRVAR(_elementtree_Element_iter__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_ITER_METHODDEF \ - {"iter", (PyCFunction)_elementtree_Element_iter, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_iter__doc__}, + {"iter", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__}, static PyObject * _elementtree_Element_iter_impl(ElementObject *self, PyObject *tag); static PyObject * -_elementtree_Element_iter(ElementObject *self, PyObject *args, PyObject *kwargs) +_elementtree_Element_iter(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"tag", NULL}; + static const char * const _keywords[] = {"tag", NULL}; + static _PyArg_Parser _parser = {"|O:iter", _keywords, 0}; PyObject *tag = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:iter", _keywords, - &tag)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &tag)) { goto exit; + } return_value = _elementtree_Element_iter_impl(self, tag); exit: @@ -356,8 +370,9 @@ _elementtree_Element_insert(ElementObject *self, PyObject *args) PyObject *subelement; if (!PyArg_ParseTuple(args, "nO!:insert", - &index, &Element_Type, &subelement)) + &index, &Element_Type, &subelement)) { goto exit; + } return_value = _elementtree_Element_insert_impl(self, index, subelement); exit: @@ -419,8 +434,9 @@ _elementtree_Element_makeelement(ElementObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "makeelement", 2, 2, - &tag, &attrib)) + &tag, &attrib)) { goto exit; + } return_value = _elementtree_Element_makeelement_impl(self, tag, attrib); exit: @@ -444,8 +460,9 @@ _elementtree_Element_remove(ElementObject *self, PyObject *arg) PyObject *return_value = NULL; PyObject *subelement; - if (!PyArg_Parse(arg, "O!:remove", &Element_Type, &subelement)) + if (!PyArg_Parse(arg, "O!:remove", &Element_Type, &subelement)) { goto exit; + } return_value = _elementtree_Element_remove_impl(self, subelement); exit: @@ -473,8 +490,9 @@ _elementtree_Element_set(ElementObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "set", 2, 2, - &key, &value)) + &key, &value)) { goto exit; + } return_value = _elementtree_Element_set_impl(self, key, value); exit: @@ -489,12 +507,14 @@ static int _elementtree_TreeBuilder___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"element_factory", NULL}; + static const char * const _keywords[] = {"element_factory", NULL}; + static _PyArg_Parser _parser = {"|O:TreeBuilder", _keywords, 0}; PyObject *element_factory = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:TreeBuilder", _keywords, - &element_factory)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &element_factory)) { goto exit; + } return_value = _elementtree_TreeBuilder___init___impl((TreeBuilderObject *)self, element_factory); exit: @@ -555,8 +575,9 @@ _elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "start", 1, 2, - &tag, &attrs)) + &tag, &attrs)) { goto exit; + } return_value = _elementtree_TreeBuilder_start_impl(self, tag, attrs); exit: @@ -571,14 +592,16 @@ static int _elementtree_XMLParser___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"html", "target", "encoding", NULL}; + static const char * const _keywords[] = {"html", "target", "encoding", NULL}; + static _PyArg_Parser _parser = {"|OOz:XMLParser", _keywords, 0}; PyObject *html = NULL; PyObject *target = NULL; const char *encoding = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOz:XMLParser", _keywords, - &html, &target, &encoding)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &html, &target, &encoding)) { goto exit; + } return_value = _elementtree_XMLParser___init___impl((XMLParserObject *)self, html, target, encoding); exit: @@ -640,8 +663,9 @@ _elementtree_XMLParser_doctype(XMLParserObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "doctype", 3, 3, - &name, &pubid, &system)) + &name, &pubid, &system)) { goto exit; + } return_value = _elementtree_XMLParser_doctype_impl(self, name, pubid, system); exit: @@ -668,12 +692,14 @@ _elementtree_XMLParser__setevents(XMLParserObject *self, PyObject *args) PyObject *events_queue; PyObject *events_to_report = Py_None; - if (!PyArg_ParseTuple(args, "O!|O:_setevents", - &PyList_Type, &events_queue, &events_to_report)) + if (!PyArg_UnpackTuple(args, "_setevents", + 1, 2, + &events_queue, &events_to_report)) { goto exit; + } return_value = _elementtree_XMLParser__setevents_impl(self, events_queue, events_to_report); exit: return return_value; } -/*[clinic end generated code: output=25b8bf7e7f2151ca input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b4a571a98ced3163 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h index 2d87cfc..fdd589c 100644 --- a/Modules/clinic/_gdbmmodule.c.h +++ b/Modules/clinic/_gdbmmodule.c.h @@ -23,8 +23,9 @@ _gdbm_gdbm_get(dbmobject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "get", 1, 2, - &key, &default_value)) + &key, &default_value)) { goto exit; + } return_value = _gdbm_gdbm_get_impl(self, key, default_value); exit: @@ -53,8 +54,9 @@ _gdbm_gdbm_setdefault(dbmobject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "setdefault", 1, 2, - &key, &default_value)) + &key, &default_value)) { goto exit; + } return_value = _gdbm_gdbm_setdefault_impl(self, key, default_value); exit: @@ -147,8 +149,9 @@ _gdbm_gdbm_nextkey(dbmobject *self, PyObject *arg) const char *key; Py_ssize_clean_t key_length; - if (!PyArg_Parse(arg, "s#:nextkey", &key, &key_length)) + if (!PyArg_Parse(arg, "s#:nextkey", &key, &key_length)) { goto exit; + } return_value = _gdbm_gdbm_nextkey_impl(self, key, key_length); exit: @@ -242,11 +245,12 @@ dbmopen(PyObject *module, PyObject *args) int mode = 438; if (!PyArg_ParseTuple(args, "s|si:open", - &name, &flags, &mode)) + &name, &flags, &mode)) { goto exit; + } return_value = dbmopen_impl(module, name, flags, mode); exit: return return_value; } -/*[clinic end generated code: output=9ac7a89858a9765f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ed0f5d4e3d79b80c input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h new file mode 100644 index 0000000..0445352 --- /dev/null +++ b/Modules/clinic/_hashopenssl.c.h @@ -0,0 +1,60 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +#if (OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER)) + +PyDoc_STRVAR(_hashlib_scrypt__doc__, +"scrypt($module, /, password, *, salt=None, n=None, r=None, p=None,\n" +" maxmem=0, dklen=64)\n" +"--\n" +"\n" +"scrypt password-based key derivation function."); + +#define _HASHLIB_SCRYPT_METHODDEF \ + {"scrypt", (PyCFunction)_hashlib_scrypt, METH_FASTCALL, _hashlib_scrypt__doc__}, + +static PyObject * +_hashlib_scrypt_impl(PyObject *module, Py_buffer *password, Py_buffer *salt, + PyObject *n_obj, PyObject *r_obj, PyObject *p_obj, + long maxmem, long dklen); + +static PyObject * +_hashlib_scrypt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"password", "salt", "n", "r", "p", "maxmem", "dklen", NULL}; + static _PyArg_Parser _parser = {"y*|$y*O!O!O!ll:scrypt", _keywords, 0}; + Py_buffer password = {NULL, NULL}; + Py_buffer salt = {NULL, NULL}; + PyObject *n_obj = Py_None; + PyObject *r_obj = Py_None; + PyObject *p_obj = Py_None; + long maxmem = 0; + long dklen = 64; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &password, &salt, &PyLong_Type, &n_obj, &PyLong_Type, &r_obj, &PyLong_Type, &p_obj, &maxmem, &dklen)) { + goto exit; + } + return_value = _hashlib_scrypt_impl(module, &password, &salt, n_obj, r_obj, p_obj, maxmem, dklen); + +exit: + /* Cleanup for password */ + if (password.obj) { + PyBuffer_Release(&password); + } + /* Cleanup for salt */ + if (salt.obj) { + PyBuffer_Release(&salt); + } + + return return_value; +} + +#endif /* (OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER)) */ + +#ifndef _HASHLIB_SCRYPT_METHODDEF + #define _HASHLIB_SCRYPT_METHODDEF +#endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ +/*[clinic end generated code: output=118cd7036fa0fb52 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_lzmamodule.c.h b/Modules/clinic/_lzmamodule.c.h index f8d38ea..9e60759 100644 --- a/Modules/clinic/_lzmamodule.c.h +++ b/Modules/clinic/_lzmamodule.c.h @@ -25,14 +25,16 @@ _lzma_LZMACompressor_compress(Compressor *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:compress", &data)) + if (!PyArg_Parse(arg, "y*:compress", &data)) { goto exit; + } return_value = _lzma_LZMACompressor_compress_impl(self, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -79,29 +81,32 @@ PyDoc_STRVAR(_lzma_LZMADecompressor_decompress__doc__, "the unused_data attribute."); #define _LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_VARARGS|METH_KEYWORDS, _lzma_LZMADecompressor_decompress__doc__}, + {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_FASTCALL, _lzma_LZMADecompressor_decompress__doc__}, static PyObject * _lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data, Py_ssize_t max_length); static PyObject * -_lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *args, PyObject *kwargs) +_lzma_LZMADecompressor_decompress(Decompressor *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"data", "max_length", NULL}; + static const char * const _keywords[] = {"data", "max_length", NULL}; + static _PyArg_Parser _parser = {"y*|n:decompress", _keywords, 0}; Py_buffer data = {NULL, NULL}; Py_ssize_t max_length = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|n:decompress", _keywords, - &data, &max_length)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &max_length)) { goto exit; + } return_value = _lzma_LZMADecompressor_decompress_impl(self, &data, max_length); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -137,14 +142,16 @@ static int _lzma_LZMADecompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"format", "memlimit", "filters", NULL}; + static const char * const _keywords[] = {"format", "memlimit", "filters", NULL}; + static _PyArg_Parser _parser = {"|iOO:LZMADecompressor", _keywords, 0}; int format = FORMAT_AUTO; PyObject *memlimit = Py_None; PyObject *filters = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iOO:LZMADecompressor", _keywords, - &format, &memlimit, &filters)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &format, &memlimit, &filters)) { goto exit; + } return_value = _lzma_LZMADecompressor___init___impl((Decompressor *)self, format, memlimit, filters); exit: @@ -171,8 +178,9 @@ _lzma_is_check_supported(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int check_id; - if (!PyArg_Parse(arg, "i:is_check_supported", &check_id)) + if (!PyArg_Parse(arg, "i:is_check_supported", &check_id)) { goto exit; + } return_value = _lzma_is_check_supported_impl(module, check_id); exit: @@ -199,8 +207,9 @@ _lzma__encode_filter_properties(PyObject *module, PyObject *arg) PyObject *return_value = NULL; lzma_filter filter = {LZMA_VLI_UNKNOWN, NULL}; - if (!PyArg_Parse(arg, "O&:_encode_filter_properties", lzma_filter_converter, &filter)) + if (!PyArg_Parse(arg, "O&:_encode_filter_properties", lzma_filter_converter, &filter)) { goto exit; + } return_value = _lzma__encode_filter_properties_impl(module, filter); exit: @@ -234,15 +243,17 @@ _lzma__decode_filter_properties(PyObject *module, PyObject *args) Py_buffer encoded_props = {NULL, NULL}; if (!PyArg_ParseTuple(args, "O&y*:_decode_filter_properties", - lzma_vli_converter, &filter_id, &encoded_props)) + lzma_vli_converter, &filter_id, &encoded_props)) { goto exit; + } return_value = _lzma__decode_filter_properties_impl(module, filter_id, &encoded_props); exit: /* Cleanup for encoded_props */ - if (encoded_props.obj) + if (encoded_props.obj) { PyBuffer_Release(&encoded_props); + } return return_value; } -/*[clinic end generated code: output=fada06020fd318cc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=f27abae460122706 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_opcode.c.h b/Modules/clinic/_opcode.c.h index a5f6442..513cbfd 100644 --- a/Modules/clinic/_opcode.c.h +++ b/Modules/clinic/_opcode.c.h @@ -23,14 +23,16 @@ _opcode_stack_effect(PyObject *module, PyObject *args) int _return_value; if (!PyArg_ParseTuple(args, "i|O:stack_effect", - &opcode, &oparg)) + &opcode, &oparg)) { goto exit; + } _return_value = _opcode_stack_effect_impl(module, opcode, oparg); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: return return_value; } -/*[clinic end generated code: output=984d6de140303d10 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4d91c6a765097853 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h index bd12d2a..9ad4c37 100644 --- a/Modules/clinic/_pickle.c.h +++ b/Modules/clinic/_pickle.c.h @@ -53,8 +53,9 @@ _pickle_Pickler___sizeof__(PicklerObject *self, PyObject *Py_UNUSED(ignored)) Py_ssize_t _return_value; _return_value = _pickle_Pickler___sizeof___impl(self); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -92,14 +93,16 @@ static int _pickle_Pickler___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"file", "protocol", "fix_imports", NULL}; + static const char * const _keywords[] = {"file", "protocol", "fix_imports", NULL}; + static _PyArg_Parser _parser = {"O|Op:Pickler", _keywords, 0}; PyObject *file; PyObject *protocol = NULL; int fix_imports = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Op:Pickler", _keywords, - &file, &protocol, &fix_imports)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &file, &protocol, &fix_imports)) { goto exit; + } return_value = _pickle_Pickler___init___impl((PicklerObject *)self, file, protocol, fix_imports); exit: @@ -212,8 +215,9 @@ _pickle_Unpickler_find_class(UnpicklerObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "find_class", 2, 2, - &module_name, &global_name)) + &module_name, &global_name)) { goto exit; + } return_value = _pickle_Unpickler_find_class_impl(self, module_name, global_name); exit: @@ -239,8 +243,9 @@ _pickle_Unpickler___sizeof__(UnpicklerObject *self, PyObject *Py_UNUSED(ignored) Py_ssize_t _return_value; _return_value = _pickle_Unpickler___sizeof___impl(self); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -281,15 +286,17 @@ static int _pickle_Unpickler___init__(PyObject *self, PyObject *args, PyObject *kwargs) { int return_value = -1; - static char *_keywords[] = {"file", "fix_imports", "encoding", "errors", NULL}; + static const char * const _keywords[] = {"file", "fix_imports", "encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"O|$pss:Unpickler", _keywords, 0}; PyObject *file; int fix_imports = 1; const char *encoding = "ASCII"; const char *errors = "strict"; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|$pss:Unpickler", _keywords, - &file, &fix_imports, &encoding, &errors)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &file, &fix_imports, &encoding, &errors)) { goto exit; + } return_value = _pickle_Unpickler___init___impl((UnpicklerObject *)self, file, fix_imports, encoding, errors); exit: @@ -377,25 +384,27 @@ PyDoc_STRVAR(_pickle_dump__doc__, "2, so that the pickle data stream is readable with Python 2."); #define _PICKLE_DUMP_METHODDEF \ - {"dump", (PyCFunction)_pickle_dump, METH_VARARGS|METH_KEYWORDS, _pickle_dump__doc__}, + {"dump", (PyCFunction)_pickle_dump, METH_FASTCALL, _pickle_dump__doc__}, static PyObject * _pickle_dump_impl(PyObject *module, PyObject *obj, PyObject *file, PyObject *protocol, int fix_imports); static PyObject * -_pickle_dump(PyObject *module, PyObject *args, PyObject *kwargs) +_pickle_dump(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"obj", "file", "protocol", "fix_imports", NULL}; + static const char * const _keywords[] = {"obj", "file", "protocol", "fix_imports", NULL}; + static _PyArg_Parser _parser = {"OO|O$p:dump", _keywords, 0}; PyObject *obj; PyObject *file; PyObject *protocol = NULL; int fix_imports = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|O$p:dump", _keywords, - &obj, &file, &protocol, &fix_imports)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &obj, &file, &protocol, &fix_imports)) { goto exit; + } return_value = _pickle_dump_impl(module, obj, file, protocol, fix_imports); exit: @@ -421,24 +430,26 @@ PyDoc_STRVAR(_pickle_dumps__doc__, "Python 2, so that the pickle data stream is readable with Python 2."); #define _PICKLE_DUMPS_METHODDEF \ - {"dumps", (PyCFunction)_pickle_dumps, METH_VARARGS|METH_KEYWORDS, _pickle_dumps__doc__}, + {"dumps", (PyCFunction)_pickle_dumps, METH_FASTCALL, _pickle_dumps__doc__}, static PyObject * _pickle_dumps_impl(PyObject *module, PyObject *obj, PyObject *protocol, int fix_imports); static PyObject * -_pickle_dumps(PyObject *module, PyObject *args, PyObject *kwargs) +_pickle_dumps(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"obj", "protocol", "fix_imports", NULL}; + static const char * const _keywords[] = {"obj", "protocol", "fix_imports", NULL}; + static _PyArg_Parser _parser = {"O|O$p:dumps", _keywords, 0}; PyObject *obj; PyObject *protocol = NULL; int fix_imports = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O$p:dumps", _keywords, - &obj, &protocol, &fix_imports)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &obj, &protocol, &fix_imports)) { goto exit; + } return_value = _pickle_dumps_impl(module, obj, protocol, fix_imports); exit: @@ -475,25 +486,27 @@ PyDoc_STRVAR(_pickle_load__doc__, "string instances as bytes objects."); #define _PICKLE_LOAD_METHODDEF \ - {"load", (PyCFunction)_pickle_load, METH_VARARGS|METH_KEYWORDS, _pickle_load__doc__}, + {"load", (PyCFunction)_pickle_load, METH_FASTCALL, _pickle_load__doc__}, static PyObject * _pickle_load_impl(PyObject *module, PyObject *file, int fix_imports, const char *encoding, const char *errors); static PyObject * -_pickle_load(PyObject *module, PyObject *args, PyObject *kwargs) +_pickle_load(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"file", "fix_imports", "encoding", "errors", NULL}; + static const char * const _keywords[] = {"file", "fix_imports", "encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"O|$pss:load", _keywords, 0}; PyObject *file; int fix_imports = 1; const char *encoding = "ASCII"; const char *errors = "strict"; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|$pss:load", _keywords, - &file, &fix_imports, &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &file, &fix_imports, &encoding, &errors)) { goto exit; + } return_value = _pickle_load_impl(module, file, fix_imports, encoding, errors); exit: @@ -521,28 +534,30 @@ PyDoc_STRVAR(_pickle_loads__doc__, "string instances as bytes objects."); #define _PICKLE_LOADS_METHODDEF \ - {"loads", (PyCFunction)_pickle_loads, METH_VARARGS|METH_KEYWORDS, _pickle_loads__doc__}, + {"loads", (PyCFunction)_pickle_loads, METH_FASTCALL, _pickle_loads__doc__}, static PyObject * _pickle_loads_impl(PyObject *module, PyObject *data, int fix_imports, const char *encoding, const char *errors); static PyObject * -_pickle_loads(PyObject *module, PyObject *args, PyObject *kwargs) +_pickle_loads(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"data", "fix_imports", "encoding", "errors", NULL}; + static const char * const _keywords[] = {"data", "fix_imports", "encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"O|$pss:loads", _keywords, 0}; PyObject *data; int fix_imports = 1; const char *encoding = "ASCII"; const char *errors = "strict"; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|$pss:loads", _keywords, - &data, &fix_imports, &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &fix_imports, &encoding, &errors)) { goto exit; + } return_value = _pickle_loads_impl(module, data, fix_imports, encoding, errors); exit: return return_value; } -/*[clinic end generated code: output=93657e55d6a748af input=a9049054013a1b77]*/ +/*[clinic end generated code: output=82be137b3c09cb9f input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_sre.c.h b/Modules/clinic/_sre.c.h index 3281717..0612005 100644 --- a/Modules/clinic/_sre.c.h +++ b/Modules/clinic/_sre.c.h @@ -20,8 +20,9 @@ _sre_getcodesize(PyObject *module, PyObject *Py_UNUSED(ignored)) int _return_value; _return_value = _sre_getcodesize_impl(module); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -48,11 +49,13 @@ _sre_getlower(PyObject *module, PyObject *args) int _return_value; if (!PyArg_ParseTuple(args, "ii:getlower", - &character, &flags)) + &character, &flags)) { goto exit; + } _return_value = _sre_getlower_impl(module, character, flags); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -66,7 +69,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_match__doc__, "Matches zero or more characters at the beginning of the string."); #define _SRE_SRE_PATTERN_MATCH_METHODDEF \ - {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_match__doc__}, + {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_FASTCALL, _sre_SRE_Pattern_match__doc__}, static PyObject * _sre_SRE_Pattern_match_impl(PatternObject *self, PyObject *string, @@ -74,18 +77,20 @@ _sre_SRE_Pattern_match_impl(PatternObject *self, PyObject *string, PyObject *pattern); static PyObject * -_sre_SRE_Pattern_match(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_match(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static _PyArg_Parser _parser = {"|Onn$O:match", _keywords, 0}; PyObject *string = NULL; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; PyObject *pattern = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Onn$O:match", _keywords, - &string, &pos, &endpos, &pattern)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos, &pattern)) { goto exit; + } return_value = _sre_SRE_Pattern_match_impl(self, string, pos, endpos, pattern); exit: @@ -100,7 +105,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_fullmatch__doc__, "Matches against all of the string"); #define _SRE_SRE_PATTERN_FULLMATCH_METHODDEF \ - {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_fullmatch__doc__}, + {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL, _sre_SRE_Pattern_fullmatch__doc__}, static PyObject * _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyObject *string, @@ -108,18 +113,20 @@ _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyObject *string, PyObject *pattern); static PyObject * -_sre_SRE_Pattern_fullmatch(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_fullmatch(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static _PyArg_Parser _parser = {"|Onn$O:fullmatch", _keywords, 0}; PyObject *string = NULL; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; PyObject *pattern = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Onn$O:fullmatch", _keywords, - &string, &pos, &endpos, &pattern)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos, &pattern)) { goto exit; + } return_value = _sre_SRE_Pattern_fullmatch_impl(self, string, pos, endpos, pattern); exit: @@ -136,7 +143,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_search__doc__, "Return None if no position in the string matches."); #define _SRE_SRE_PATTERN_SEARCH_METHODDEF \ - {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_search__doc__}, + {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_FASTCALL, _sre_SRE_Pattern_search__doc__}, static PyObject * _sre_SRE_Pattern_search_impl(PatternObject *self, PyObject *string, @@ -144,18 +151,20 @@ _sre_SRE_Pattern_search_impl(PatternObject *self, PyObject *string, PyObject *pattern); static PyObject * -_sre_SRE_Pattern_search(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_search(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", "pattern", NULL}; + static _PyArg_Parser _parser = {"|Onn$O:search", _keywords, 0}; PyObject *string = NULL; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; PyObject *pattern = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Onn$O:search", _keywords, - &string, &pos, &endpos, &pattern)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos, &pattern)) { goto exit; + } return_value = _sre_SRE_Pattern_search_impl(self, string, pos, endpos, pattern); exit: @@ -170,7 +179,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_findall__doc__, "Return a list of all non-overlapping matches of pattern in string."); #define _SRE_SRE_PATTERN_FINDALL_METHODDEF \ - {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_findall__doc__}, + {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_FASTCALL, _sre_SRE_Pattern_findall__doc__}, static PyObject * _sre_SRE_Pattern_findall_impl(PatternObject *self, PyObject *string, @@ -178,18 +187,20 @@ _sre_SRE_Pattern_findall_impl(PatternObject *self, PyObject *string, PyObject *source); static PyObject * -_sre_SRE_Pattern_findall(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_findall(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", "source", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", "source", NULL}; + static _PyArg_Parser _parser = {"|Onn$O:findall", _keywords, 0}; PyObject *string = NULL; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; PyObject *source = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Onn$O:findall", _keywords, - &string, &pos, &endpos, &source)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos, &source)) { goto exit; + } return_value = _sre_SRE_Pattern_findall_impl(self, string, pos, endpos, source); exit: @@ -205,24 +216,26 @@ PyDoc_STRVAR(_sre_SRE_Pattern_finditer__doc__, "For each match, the iterator returns a match object."); #define _SRE_SRE_PATTERN_FINDITER_METHODDEF \ - {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_finditer__doc__}, + {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_FASTCALL, _sre_SRE_Pattern_finditer__doc__}, static PyObject * _sre_SRE_Pattern_finditer_impl(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_t endpos); static PyObject * -_sre_SRE_Pattern_finditer(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_finditer(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", NULL}; + static _PyArg_Parser _parser = {"O|nn:finditer", _keywords, 0}; PyObject *string; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|nn:finditer", _keywords, - &string, &pos, &endpos)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos)) { goto exit; + } return_value = _sre_SRE_Pattern_finditer_impl(self, string, pos, endpos); exit: @@ -235,24 +248,26 @@ PyDoc_STRVAR(_sre_SRE_Pattern_scanner__doc__, "\n"); #define _SRE_SRE_PATTERN_SCANNER_METHODDEF \ - {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_scanner__doc__}, + {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_FASTCALL, _sre_SRE_Pattern_scanner__doc__}, static PyObject * _sre_SRE_Pattern_scanner_impl(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_t endpos); static PyObject * -_sre_SRE_Pattern_scanner(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_scanner(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "pos", "endpos", NULL}; + static const char * const _keywords[] = {"string", "pos", "endpos", NULL}; + static _PyArg_Parser _parser = {"O|nn:scanner", _keywords, 0}; PyObject *string; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|nn:scanner", _keywords, - &string, &pos, &endpos)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &pos, &endpos)) { goto exit; + } return_value = _sre_SRE_Pattern_scanner_impl(self, string, pos, endpos); exit: @@ -266,24 +281,26 @@ PyDoc_STRVAR(_sre_SRE_Pattern_split__doc__, "Split string by the occurrences of pattern."); #define _SRE_SRE_PATTERN_SPLIT_METHODDEF \ - {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_split__doc__}, + {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_FASTCALL, _sre_SRE_Pattern_split__doc__}, static PyObject * _sre_SRE_Pattern_split_impl(PatternObject *self, PyObject *string, Py_ssize_t maxsplit, PyObject *source); static PyObject * -_sre_SRE_Pattern_split(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_split(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", "maxsplit", "source", NULL}; + static const char * const _keywords[] = {"string", "maxsplit", "source", NULL}; + static _PyArg_Parser _parser = {"|On$O:split", _keywords, 0}; PyObject *string = NULL; Py_ssize_t maxsplit = 0; PyObject *source = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|On$O:split", _keywords, - &string, &maxsplit, &source)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string, &maxsplit, &source)) { goto exit; + } return_value = _sre_SRE_Pattern_split_impl(self, string, maxsplit, source); exit: @@ -297,24 +314,26 @@ PyDoc_STRVAR(_sre_SRE_Pattern_sub__doc__, "Return the string obtained by replacing the leftmost non-overlapping occurrences of pattern in string by the replacement repl."); #define _SRE_SRE_PATTERN_SUB_METHODDEF \ - {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_sub__doc__}, + {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_FASTCALL, _sre_SRE_Pattern_sub__doc__}, static PyObject * _sre_SRE_Pattern_sub_impl(PatternObject *self, PyObject *repl, PyObject *string, Py_ssize_t count); static PyObject * -_sre_SRE_Pattern_sub(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_sub(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"repl", "string", "count", NULL}; + static const char * const _keywords[] = {"repl", "string", "count", NULL}; + static _PyArg_Parser _parser = {"OO|n:sub", _keywords, 0}; PyObject *repl; PyObject *string; Py_ssize_t count = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|n:sub", _keywords, - &repl, &string, &count)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &repl, &string, &count)) { goto exit; + } return_value = _sre_SRE_Pattern_sub_impl(self, repl, string, count); exit: @@ -328,24 +347,26 @@ PyDoc_STRVAR(_sre_SRE_Pattern_subn__doc__, "Return the tuple (new_string, number_of_subs_made) found by replacing the leftmost non-overlapping occurrences of pattern with the replacement repl."); #define _SRE_SRE_PATTERN_SUBN_METHODDEF \ - {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern_subn__doc__}, + {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_FASTCALL, _sre_SRE_Pattern_subn__doc__}, static PyObject * _sre_SRE_Pattern_subn_impl(PatternObject *self, PyObject *repl, PyObject *string, Py_ssize_t count); static PyObject * -_sre_SRE_Pattern_subn(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern_subn(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"repl", "string", "count", NULL}; + static const char * const _keywords[] = {"repl", "string", "count", NULL}; + static _PyArg_Parser _parser = {"OO|n:subn", _keywords, 0}; PyObject *repl; PyObject *string; Py_ssize_t count = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|n:subn", _keywords, - &repl, &string, &count)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &repl, &string, &count)) { goto exit; + } return_value = _sre_SRE_Pattern_subn_impl(self, repl, string, count); exit: @@ -375,21 +396,23 @@ PyDoc_STRVAR(_sre_SRE_Pattern___deepcopy____doc__, "\n"); #define _SRE_SRE_PATTERN___DEEPCOPY___METHODDEF \ - {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Pattern___deepcopy____doc__}, + {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_FASTCALL, _sre_SRE_Pattern___deepcopy____doc__}, static PyObject * _sre_SRE_Pattern___deepcopy___impl(PatternObject *self, PyObject *memo); static PyObject * -_sre_SRE_Pattern___deepcopy__(PatternObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Pattern___deepcopy__(PatternObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"memo", NULL}; + static const char * const _keywords[] = {"memo", NULL}; + static _PyArg_Parser _parser = {"O:__deepcopy__", _keywords, 0}; PyObject *memo; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:__deepcopy__", _keywords, - &memo)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &memo)) { goto exit; + } return_value = _sre_SRE_Pattern___deepcopy___impl(self, memo); exit: @@ -403,7 +426,7 @@ PyDoc_STRVAR(_sre_compile__doc__, "\n"); #define _SRE_COMPILE_METHODDEF \ - {"compile", (PyCFunction)_sre_compile, METH_VARARGS|METH_KEYWORDS, _sre_compile__doc__}, + {"compile", (PyCFunction)_sre_compile, METH_FASTCALL, _sre_compile__doc__}, static PyObject * _sre_compile_impl(PyObject *module, PyObject *pattern, int flags, @@ -411,10 +434,11 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags, PyObject *indexgroup); static PyObject * -_sre_compile(PyObject *module, PyObject *args, PyObject *kwargs) +_sre_compile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"pattern", "flags", "code", "groups", "groupindex", "indexgroup", NULL}; + static const char * const _keywords[] = {"pattern", "flags", "code", "groups", "groupindex", "indexgroup", NULL}; + static _PyArg_Parser _parser = {"OiO!nOO:compile", _keywords, 0}; PyObject *pattern; int flags; PyObject *code; @@ -422,9 +446,10 @@ _sre_compile(PyObject *module, PyObject *args, PyObject *kwargs) PyObject *groupindex; PyObject *indexgroup; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OiO!nOO:compile", _keywords, - &pattern, &flags, &PyList_Type, &code, &groups, &groupindex, &indexgroup)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &pattern, &flags, &PyList_Type, &code, &groups, &groupindex, &indexgroup)) { goto exit; + } return_value = _sre_compile_impl(module, pattern, flags, code, groups, groupindex, indexgroup); exit: @@ -438,21 +463,23 @@ PyDoc_STRVAR(_sre_SRE_Match_expand__doc__, "Return the string obtained by doing backslash substitution on the string template, as done by the sub() method."); #define _SRE_SRE_MATCH_EXPAND_METHODDEF \ - {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Match_expand__doc__}, + {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_FASTCALL, _sre_SRE_Match_expand__doc__}, static PyObject * _sre_SRE_Match_expand_impl(MatchObject *self, PyObject *template); static PyObject * -_sre_SRE_Match_expand(MatchObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Match_expand(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"template", NULL}; + static const char * const _keywords[] = {"template", NULL}; + static _PyArg_Parser _parser = {"O:expand", _keywords, 0}; PyObject *template; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:expand", _keywords, - &template)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &template)) { goto exit; + } return_value = _sre_SRE_Match_expand_impl(self, template); exit: @@ -469,21 +496,23 @@ PyDoc_STRVAR(_sre_SRE_Match_groups__doc__, " Is used for groups that did not participate in the match."); #define _SRE_SRE_MATCH_GROUPS_METHODDEF \ - {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Match_groups__doc__}, + {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_FASTCALL, _sre_SRE_Match_groups__doc__}, static PyObject * _sre_SRE_Match_groups_impl(MatchObject *self, PyObject *default_value); static PyObject * -_sre_SRE_Match_groups(MatchObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Match_groups(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"default", NULL}; + static const char * const _keywords[] = {"default", NULL}; + static _PyArg_Parser _parser = {"|O:groups", _keywords, 0}; PyObject *default_value = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:groups", _keywords, - &default_value)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &default_value)) { goto exit; + } return_value = _sre_SRE_Match_groups_impl(self, default_value); exit: @@ -500,21 +529,23 @@ PyDoc_STRVAR(_sre_SRE_Match_groupdict__doc__, " Is used for groups that did not participate in the match."); #define _SRE_SRE_MATCH_GROUPDICT_METHODDEF \ - {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Match_groupdict__doc__}, + {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_FASTCALL, _sre_SRE_Match_groupdict__doc__}, static PyObject * _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value); static PyObject * -_sre_SRE_Match_groupdict(MatchObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Match_groupdict(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"default", NULL}; + static const char * const _keywords[] = {"default", NULL}; + static _PyArg_Parser _parser = {"|O:groupdict", _keywords, 0}; PyObject *default_value = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:groupdict", _keywords, - &default_value)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &default_value)) { goto exit; + } return_value = _sre_SRE_Match_groupdict_impl(self, default_value); exit: @@ -542,11 +573,13 @@ _sre_SRE_Match_start(MatchObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "start", 0, 1, - &group)) + &group)) { goto exit; + } _return_value = _sre_SRE_Match_start_impl(self, group); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -574,11 +607,13 @@ _sre_SRE_Match_end(MatchObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "end", 0, 1, - &group)) + &group)) { goto exit; + } _return_value = _sre_SRE_Match_end_impl(self, group); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -605,8 +640,9 @@ _sre_SRE_Match_span(MatchObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "span", 0, 1, - &group)) + &group)) { goto exit; + } return_value = _sre_SRE_Match_span_impl(self, group); exit: @@ -636,21 +672,23 @@ PyDoc_STRVAR(_sre_SRE_Match___deepcopy____doc__, "\n"); #define _SRE_SRE_MATCH___DEEPCOPY___METHODDEF \ - {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_VARARGS|METH_KEYWORDS, _sre_SRE_Match___deepcopy____doc__}, + {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_FASTCALL, _sre_SRE_Match___deepcopy____doc__}, static PyObject * _sre_SRE_Match___deepcopy___impl(MatchObject *self, PyObject *memo); static PyObject * -_sre_SRE_Match___deepcopy__(MatchObject *self, PyObject *args, PyObject *kwargs) +_sre_SRE_Match___deepcopy__(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"memo", NULL}; + static const char * const _keywords[] = {"memo", NULL}; + static _PyArg_Parser _parser = {"O:__deepcopy__", _keywords, 0}; PyObject *memo; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:__deepcopy__", _keywords, - &memo)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &memo)) { goto exit; + } return_value = _sre_SRE_Match___deepcopy___impl(self, memo); exit: @@ -690,4 +728,4 @@ _sre_SRE_Scanner_search(ScannerObject *self, PyObject *Py_UNUSED(ignored)) { return _sre_SRE_Scanner_search_impl(self); } -/*[clinic end generated code: output=a4ce9e5b748ce532 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a4a246bca1963bc9 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 852e365..29f5838 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -36,8 +36,9 @@ _ssl__test_decode_cert(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *path; - if (!PyArg_Parse(arg, "O&:_test_decode_cert", PyUnicode_FSConverter, &path)) + if (!PyArg_Parse(arg, "O&:_test_decode_cert", PyUnicode_FSConverter, &path)) { goto exit; + } return_value = _ssl__test_decode_cert_impl(module, path); exit: @@ -71,8 +72,9 @@ _ssl__SSLSocket_peer_certificate(PySSLSocket *self, PyObject *args) int binary_mode = 0; if (!PyArg_ParseTuple(args, "|p:peer_certificate", - &binary_mode)) + &binary_mode)) { goto exit; + } return_value = _ssl__SSLSocket_peer_certificate_impl(self, binary_mode); exit: @@ -209,14 +211,16 @@ _ssl__SSLSocket_write(PySSLSocket *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer b = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:write", &b)) + if (!PyArg_Parse(arg, "y*:write", &b)) { goto exit; + } return_value = _ssl__SSLSocket_write_impl(self, &b); exit: /* Cleanup for b */ - if (b.obj) + if (b.obj) { PyBuffer_Release(&b); + } return return_value; } @@ -260,12 +264,14 @@ _ssl__SSLSocket_read(PySSLSocket *self, PyObject *args) switch (PyTuple_GET_SIZE(args)) { case 1: - if (!PyArg_ParseTuple(args, "i:read", &len)) + if (!PyArg_ParseTuple(args, "i:read", &len)) { goto exit; + } break; case 2: - if (!PyArg_ParseTuple(args, "iw*:read", &len, &buffer)) + if (!PyArg_ParseTuple(args, "iw*:read", &len, &buffer)) { goto exit; + } group_right_1 = 1; break; default: @@ -276,8 +282,9 @@ _ssl__SSLSocket_read(PySSLSocket *self, PyObject *args) exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -332,11 +339,13 @@ _ssl__SSLContext(PyTypeObject *type, PyObject *args, PyObject *kwargs) int proto_version; if ((type == &PySSLContext_Type) && - !_PyArg_NoKeywords("_SSLContext", kwargs)) + !_PyArg_NoKeywords("_SSLContext", kwargs)) { goto exit; + } if (!PyArg_ParseTuple(args, "i:_SSLContext", - &proto_version)) + &proto_version)) { goto exit; + } return_value = _ssl__SSLContext_impl(type, proto_version); exit: @@ -360,14 +369,36 @@ _ssl__SSLContext_set_ciphers(PySSLContext *self, PyObject *arg) PyObject *return_value = NULL; const char *cipherlist; - if (!PyArg_Parse(arg, "s:set_ciphers", &cipherlist)) + if (!PyArg_Parse(arg, "s:set_ciphers", &cipherlist)) { goto exit; + } return_value = _ssl__SSLContext_set_ciphers_impl(self, cipherlist); exit: return return_value; } +#if (OPENSSL_VERSION_NUMBER >= 0x10002000UL) + +PyDoc_STRVAR(_ssl__SSLContext_get_ciphers__doc__, +"get_ciphers($self, /)\n" +"--\n" +"\n"); + +#define _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF \ + {"get_ciphers", (PyCFunction)_ssl__SSLContext_get_ciphers, METH_NOARGS, _ssl__SSLContext_get_ciphers__doc__}, + +static PyObject * +_ssl__SSLContext_get_ciphers_impl(PySSLContext *self); + +static PyObject * +_ssl__SSLContext_get_ciphers(PySSLContext *self, PyObject *Py_UNUSED(ignored)) +{ + return _ssl__SSLContext_get_ciphers_impl(self); +} + +#endif /* (OPENSSL_VERSION_NUMBER >= 0x10002000UL) */ + PyDoc_STRVAR(_ssl__SSLContext__set_npn_protocols__doc__, "_set_npn_protocols($self, protos, /)\n" "--\n" @@ -386,14 +417,16 @@ _ssl__SSLContext__set_npn_protocols(PySSLContext *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer protos = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:_set_npn_protocols", &protos)) + if (!PyArg_Parse(arg, "y*:_set_npn_protocols", &protos)) { goto exit; + } return_value = _ssl__SSLContext__set_npn_protocols_impl(self, &protos); exit: /* Cleanup for protos */ - if (protos.obj) + if (protos.obj) { PyBuffer_Release(&protos); + } return return_value; } @@ -416,14 +449,16 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer protos = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:_set_alpn_protocols", &protos)) + if (!PyArg_Parse(arg, "y*:_set_alpn_protocols", &protos)) { goto exit; + } return_value = _ssl__SSLContext__set_alpn_protocols_impl(self, &protos); exit: /* Cleanup for protos */ - if (protos.obj) + if (protos.obj) { PyBuffer_Release(&protos); + } return return_value; } @@ -434,24 +469,26 @@ PyDoc_STRVAR(_ssl__SSLContext_load_cert_chain__doc__, "\n"); #define _SSL__SSLCONTEXT_LOAD_CERT_CHAIN_METHODDEF \ - {"load_cert_chain", (PyCFunction)_ssl__SSLContext_load_cert_chain, METH_VARARGS|METH_KEYWORDS, _ssl__SSLContext_load_cert_chain__doc__}, + {"load_cert_chain", (PyCFunction)_ssl__SSLContext_load_cert_chain, METH_FASTCALL, _ssl__SSLContext_load_cert_chain__doc__}, static PyObject * _ssl__SSLContext_load_cert_chain_impl(PySSLContext *self, PyObject *certfile, PyObject *keyfile, PyObject *password); static PyObject * -_ssl__SSLContext_load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwargs) +_ssl__SSLContext_load_cert_chain(PySSLContext *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"certfile", "keyfile", "password", NULL}; + static const char * const _keywords[] = {"certfile", "keyfile", "password", NULL}; + static _PyArg_Parser _parser = {"O|OO:load_cert_chain", _keywords, 0}; PyObject *certfile; PyObject *keyfile = NULL; PyObject *password = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OO:load_cert_chain", _keywords, - &certfile, &keyfile, &password)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &certfile, &keyfile, &password)) { goto exit; + } return_value = _ssl__SSLContext_load_cert_chain_impl(self, certfile, keyfile, password); exit: @@ -464,7 +501,7 @@ PyDoc_STRVAR(_ssl__SSLContext_load_verify_locations__doc__, "\n"); #define _SSL__SSLCONTEXT_LOAD_VERIFY_LOCATIONS_METHODDEF \ - {"load_verify_locations", (PyCFunction)_ssl__SSLContext_load_verify_locations, METH_VARARGS|METH_KEYWORDS, _ssl__SSLContext_load_verify_locations__doc__}, + {"load_verify_locations", (PyCFunction)_ssl__SSLContext_load_verify_locations, METH_FASTCALL, _ssl__SSLContext_load_verify_locations__doc__}, static PyObject * _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self, @@ -473,17 +510,19 @@ _ssl__SSLContext_load_verify_locations_impl(PySSLContext *self, PyObject *cadata); static PyObject * -_ssl__SSLContext_load_verify_locations(PySSLContext *self, PyObject *args, PyObject *kwargs) +_ssl__SSLContext_load_verify_locations(PySSLContext *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"cafile", "capath", "cadata", NULL}; + static const char * const _keywords[] = {"cafile", "capath", "cadata", NULL}; + static _PyArg_Parser _parser = {"|OOO:load_verify_locations", _keywords, 0}; PyObject *cafile = NULL; PyObject *capath = NULL; PyObject *cadata = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOO:load_verify_locations", _keywords, - &cafile, &capath, &cadata)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &cafile, &capath, &cadata)) { goto exit; + } return_value = _ssl__SSLContext_load_verify_locations_impl(self, cafile, capath, cadata); exit: @@ -504,24 +543,26 @@ PyDoc_STRVAR(_ssl__SSLContext__wrap_socket__doc__, "\n"); #define _SSL__SSLCONTEXT__WRAP_SOCKET_METHODDEF \ - {"_wrap_socket", (PyCFunction)_ssl__SSLContext__wrap_socket, METH_VARARGS|METH_KEYWORDS, _ssl__SSLContext__wrap_socket__doc__}, + {"_wrap_socket", (PyCFunction)_ssl__SSLContext__wrap_socket, METH_FASTCALL, _ssl__SSLContext__wrap_socket__doc__}, static PyObject * _ssl__SSLContext__wrap_socket_impl(PySSLContext *self, PyObject *sock, int server_side, PyObject *hostname_obj); static PyObject * -_ssl__SSLContext__wrap_socket(PySSLContext *self, PyObject *args, PyObject *kwargs) +_ssl__SSLContext__wrap_socket(PySSLContext *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"sock", "server_side", "server_hostname", NULL}; + static const char * const _keywords[] = {"sock", "server_side", "server_hostname", NULL}; + static _PyArg_Parser _parser = {"O!i|O:_wrap_socket", _keywords, 0}; PyObject *sock; int server_side; PyObject *hostname_obj = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i|O:_wrap_socket", _keywords, - PySocketModule.Sock_Type, &sock, &server_side, &hostname_obj)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + PySocketModule.Sock_Type, &sock, &server_side, &hostname_obj)) { goto exit; + } return_value = _ssl__SSLContext__wrap_socket_impl(self, sock, server_side, hostname_obj); exit: @@ -535,7 +576,7 @@ PyDoc_STRVAR(_ssl__SSLContext__wrap_bio__doc__, "\n"); #define _SSL__SSLCONTEXT__WRAP_BIO_METHODDEF \ - {"_wrap_bio", (PyCFunction)_ssl__SSLContext__wrap_bio, METH_VARARGS|METH_KEYWORDS, _ssl__SSLContext__wrap_bio__doc__}, + {"_wrap_bio", (PyCFunction)_ssl__SSLContext__wrap_bio, METH_FASTCALL, _ssl__SSLContext__wrap_bio__doc__}, static PyObject * _ssl__SSLContext__wrap_bio_impl(PySSLContext *self, PySSLMemoryBIO *incoming, @@ -543,18 +584,20 @@ _ssl__SSLContext__wrap_bio_impl(PySSLContext *self, PySSLMemoryBIO *incoming, PyObject *hostname_obj); static PyObject * -_ssl__SSLContext__wrap_bio(PySSLContext *self, PyObject *args, PyObject *kwargs) +_ssl__SSLContext__wrap_bio(PySSLContext *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"incoming", "outgoing", "server_side", "server_hostname", NULL}; + static const char * const _keywords[] = {"incoming", "outgoing", "server_side", "server_hostname", NULL}; + static _PyArg_Parser _parser = {"O!O!i|O:_wrap_bio", _keywords, 0}; PySSLMemoryBIO *incoming; PySSLMemoryBIO *outgoing; int server_side; PyObject *hostname_obj = Py_None; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!i|O:_wrap_bio", _keywords, - &PySSLMemoryBIO_Type, &incoming, &PySSLMemoryBIO_Type, &outgoing, &server_side, &hostname_obj)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &PySSLMemoryBIO_Type, &incoming, &PySSLMemoryBIO_Type, &outgoing, &server_side, &hostname_obj)) { goto exit; + } return_value = _ssl__SSLContext__wrap_bio_impl(self, incoming, outgoing, server_side, hostname_obj); exit: @@ -657,21 +700,23 @@ PyDoc_STRVAR(_ssl__SSLContext_get_ca_certs__doc__, "been used at least once."); #define _SSL__SSLCONTEXT_GET_CA_CERTS_METHODDEF \ - {"get_ca_certs", (PyCFunction)_ssl__SSLContext_get_ca_certs, METH_VARARGS|METH_KEYWORDS, _ssl__SSLContext_get_ca_certs__doc__}, + {"get_ca_certs", (PyCFunction)_ssl__SSLContext_get_ca_certs, METH_FASTCALL, _ssl__SSLContext_get_ca_certs__doc__}, static PyObject * _ssl__SSLContext_get_ca_certs_impl(PySSLContext *self, int binary_form); static PyObject * -_ssl__SSLContext_get_ca_certs(PySSLContext *self, PyObject *args, PyObject *kwargs) +_ssl__SSLContext_get_ca_certs(PySSLContext *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"binary_form", NULL}; + static const char * const _keywords[] = {"binary_form", NULL}; + static _PyArg_Parser _parser = {"|p:get_ca_certs", _keywords, 0}; int binary_form = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|p:get_ca_certs", _keywords, - &binary_form)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &binary_form)) { goto exit; + } return_value = _ssl__SSLContext_get_ca_certs_impl(self, binary_form); exit: @@ -687,11 +732,13 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) PyObject *return_value = NULL; if ((type == &PySSLMemoryBIO_Type) && - !_PyArg_NoPositional("MemoryBIO", args)) + !_PyArg_NoPositional("MemoryBIO", args)) { goto exit; + } if ((type == &PySSLMemoryBIO_Type) && - !_PyArg_NoKeywords("MemoryBIO", kwargs)) + !_PyArg_NoKeywords("MemoryBIO", kwargs)) { goto exit; + } return_value = _ssl_MemoryBIO_impl(type); exit: @@ -722,8 +769,9 @@ _ssl_MemoryBIO_read(PySSLMemoryBIO *self, PyObject *args) int len = -1; if (!PyArg_ParseTuple(args, "|i:read", - &len)) + &len)) { goto exit; + } return_value = _ssl_MemoryBIO_read_impl(self, len); exit: @@ -750,14 +798,16 @@ _ssl_MemoryBIO_write(PySSLMemoryBIO *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer b = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:write", &b)) + if (!PyArg_Parse(arg, "y*:write", &b)) { goto exit; + } return_value = _ssl_MemoryBIO_write_impl(self, &b); exit: /* Cleanup for b */ - if (b.obj) + if (b.obj) { PyBuffer_Release(&b); + } return return_value; } @@ -805,14 +855,16 @@ _ssl_RAND_add(PyObject *module, PyObject *args) double entropy; if (!PyArg_ParseTuple(args, "s*d:RAND_add", - &view, &entropy)) + &view, &entropy)) { goto exit; + } return_value = _ssl_RAND_add_impl(module, &view, entropy); exit: /* Cleanup for view */ - if (view.obj) + if (view.obj) { PyBuffer_Release(&view); + } return return_value; } @@ -835,8 +887,9 @@ _ssl_RAND_bytes(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int n; - if (!PyArg_Parse(arg, "i:RAND_bytes", &n)) + if (!PyArg_Parse(arg, "i:RAND_bytes", &n)) { goto exit; + } return_value = _ssl_RAND_bytes_impl(module, n); exit: @@ -864,8 +917,9 @@ _ssl_RAND_pseudo_bytes(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int n; - if (!PyArg_Parse(arg, "i:RAND_pseudo_bytes", &n)) + if (!PyArg_Parse(arg, "i:RAND_pseudo_bytes", &n)) { goto exit; + } return_value = _ssl_RAND_pseudo_bytes_impl(module, n); exit: @@ -916,8 +970,9 @@ _ssl_RAND_egd(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *path; - if (!PyArg_Parse(arg, "O&:RAND_egd", PyUnicode_FSConverter, &path)) + if (!PyArg_Parse(arg, "O&:RAND_egd", PyUnicode_FSConverter, &path)) { goto exit; + } return_value = _ssl_RAND_egd_impl(module, path); exit: @@ -956,22 +1011,24 @@ PyDoc_STRVAR(_ssl_txt2obj__doc__, "long name are also matched."); #define _SSL_TXT2OBJ_METHODDEF \ - {"txt2obj", (PyCFunction)_ssl_txt2obj, METH_VARARGS|METH_KEYWORDS, _ssl_txt2obj__doc__}, + {"txt2obj", (PyCFunction)_ssl_txt2obj, METH_FASTCALL, _ssl_txt2obj__doc__}, static PyObject * _ssl_txt2obj_impl(PyObject *module, const char *txt, int name); static PyObject * -_ssl_txt2obj(PyObject *module, PyObject *args, PyObject *kwargs) +_ssl_txt2obj(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"txt", "name", NULL}; + static const char * const _keywords[] = {"txt", "name", NULL}; + static _PyArg_Parser _parser = {"s|p:txt2obj", _keywords, 0}; const char *txt; int name = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|p:txt2obj", _keywords, - &txt, &name)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &txt, &name)) { goto exit; + } return_value = _ssl_txt2obj_impl(module, txt, name); exit: @@ -996,8 +1053,9 @@ _ssl_nid2obj(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int nid; - if (!PyArg_Parse(arg, "i:nid2obj", &nid)) + if (!PyArg_Parse(arg, "i:nid2obj", &nid)) { goto exit; + } return_value = _ssl_nid2obj_impl(module, nid); exit: @@ -1019,21 +1077,23 @@ PyDoc_STRVAR(_ssl_enum_certificates__doc__, "a set of OIDs or the boolean True."); #define _SSL_ENUM_CERTIFICATES_METHODDEF \ - {"enum_certificates", (PyCFunction)_ssl_enum_certificates, METH_VARARGS|METH_KEYWORDS, _ssl_enum_certificates__doc__}, + {"enum_certificates", (PyCFunction)_ssl_enum_certificates, METH_FASTCALL, _ssl_enum_certificates__doc__}, static PyObject * _ssl_enum_certificates_impl(PyObject *module, const char *store_name); static PyObject * -_ssl_enum_certificates(PyObject *module, PyObject *args, PyObject *kwargs) +_ssl_enum_certificates(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"store_name", NULL}; + static const char * const _keywords[] = {"store_name", NULL}; + static _PyArg_Parser _parser = {"s:enum_certificates", _keywords, 0}; const char *store_name; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:enum_certificates", _keywords, - &store_name)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &store_name)) { goto exit; + } return_value = _ssl_enum_certificates_impl(module, store_name); exit: @@ -1056,21 +1116,23 @@ PyDoc_STRVAR(_ssl_enum_crls__doc__, "X509_ASN_ENCODING or PKCS_7_ASN_ENCODING."); #define _SSL_ENUM_CRLS_METHODDEF \ - {"enum_crls", (PyCFunction)_ssl_enum_crls, METH_VARARGS|METH_KEYWORDS, _ssl_enum_crls__doc__}, + {"enum_crls", (PyCFunction)_ssl_enum_crls, METH_FASTCALL, _ssl_enum_crls__doc__}, static PyObject * _ssl_enum_crls_impl(PyObject *module, const char *store_name); static PyObject * -_ssl_enum_crls(PyObject *module, PyObject *args, PyObject *kwargs) +_ssl_enum_crls(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"store_name", NULL}; + static const char * const _keywords[] = {"store_name", NULL}; + static _PyArg_Parser _parser = {"s:enum_crls", _keywords, 0}; const char *store_name; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:enum_crls", _keywords, - &store_name)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &store_name)) { goto exit; + } return_value = _ssl_enum_crls_impl(module, store_name); exit: @@ -1087,6 +1149,10 @@ exit: #define _SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF #endif /* !defined(_SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF) */ +#ifndef _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF + #define _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF +#endif /* !defined(_SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF) */ + #ifndef _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF #define _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF #endif /* !defined(_SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF) */ @@ -1102,4 +1168,4 @@ exit: #ifndef _SSL_ENUM_CRLS_METHODDEF #define _SSL_ENUM_CRLS_METHODDEF #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ -/*[clinic end generated code: output=6fb10594d8351dc5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a859b21fe68a6115 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_tkinter.c.h b/Modules/clinic/_tkinter.c.h index 77af083..edd5380 100644 --- a/Modules/clinic/_tkinter.c.h +++ b/Modules/clinic/_tkinter.c.h @@ -19,8 +19,9 @@ _tkinter_tkapp_eval(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *script; - if (!PyArg_Parse(arg, "s:eval", &script)) + if (!PyArg_Parse(arg, "s:eval", &script)) { goto exit; + } return_value = _tkinter_tkapp_eval_impl(self, script); exit: @@ -44,8 +45,9 @@ _tkinter_tkapp_evalfile(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *fileName; - if (!PyArg_Parse(arg, "s:evalfile", &fileName)) + if (!PyArg_Parse(arg, "s:evalfile", &fileName)) { goto exit; + } return_value = _tkinter_tkapp_evalfile_impl(self, fileName); exit: @@ -69,8 +71,9 @@ _tkinter_tkapp_record(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *script; - if (!PyArg_Parse(arg, "s:record", &script)) + if (!PyArg_Parse(arg, "s:record", &script)) { goto exit; + } return_value = _tkinter_tkapp_record_impl(self, script); exit: @@ -94,8 +97,9 @@ _tkinter_tkapp_adderrinfo(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *msg; - if (!PyArg_Parse(arg, "s:adderrinfo", &msg)) + if (!PyArg_Parse(arg, "s:adderrinfo", &msg)) { goto exit; + } return_value = _tkinter_tkapp_adderrinfo_impl(self, msg); exit: @@ -143,8 +147,9 @@ _tkinter_tkapp_exprstring(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *s; - if (!PyArg_Parse(arg, "s:exprstring", &s)) + if (!PyArg_Parse(arg, "s:exprstring", &s)) { goto exit; + } return_value = _tkinter_tkapp_exprstring_impl(self, s); exit: @@ -168,8 +173,9 @@ _tkinter_tkapp_exprlong(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *s; - if (!PyArg_Parse(arg, "s:exprlong", &s)) + if (!PyArg_Parse(arg, "s:exprlong", &s)) { goto exit; + } return_value = _tkinter_tkapp_exprlong_impl(self, s); exit: @@ -193,8 +199,9 @@ _tkinter_tkapp_exprdouble(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *s; - if (!PyArg_Parse(arg, "s:exprdouble", &s)) + if (!PyArg_Parse(arg, "s:exprdouble", &s)) { goto exit; + } return_value = _tkinter_tkapp_exprdouble_impl(self, s); exit: @@ -218,8 +225,9 @@ _tkinter_tkapp_exprboolean(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *s; - if (!PyArg_Parse(arg, "s:exprboolean", &s)) + if (!PyArg_Parse(arg, "s:exprboolean", &s)) { goto exit; + } return_value = _tkinter_tkapp_exprboolean_impl(self, s); exit: @@ -262,8 +270,9 @@ _tkinter_tkapp_createcommand(TkappObject *self, PyObject *args) PyObject *func; if (!PyArg_ParseTuple(args, "sO:createcommand", - &name, &func)) + &name, &func)) { goto exit; + } return_value = _tkinter_tkapp_createcommand_impl(self, name, func); exit: @@ -287,8 +296,9 @@ _tkinter_tkapp_deletecommand(TkappObject *self, PyObject *arg) PyObject *return_value = NULL; const char *name; - if (!PyArg_Parse(arg, "s:deletecommand", &name)) + if (!PyArg_Parse(arg, "s:deletecommand", &name)) { goto exit; + } return_value = _tkinter_tkapp_deletecommand_impl(self, name); exit: @@ -318,8 +328,9 @@ _tkinter_tkapp_createfilehandler(TkappObject *self, PyObject *args) PyObject *func; if (!PyArg_ParseTuple(args, "OiO:createfilehandler", - &file, &mask, &func)) + &file, &mask, &func)) { goto exit; + } return_value = _tkinter_tkapp_createfilehandler_impl(self, file, mask, func); exit: @@ -377,8 +388,9 @@ _tkinter_tkapp_createtimerhandler(TkappObject *self, PyObject *args) PyObject *func; if (!PyArg_ParseTuple(args, "iO:createtimerhandler", - &milliseconds, &func)) + &milliseconds, &func)) { goto exit; + } return_value = _tkinter_tkapp_createtimerhandler_impl(self, milliseconds, func); exit: @@ -403,8 +415,9 @@ _tkinter_tkapp_mainloop(TkappObject *self, PyObject *args) int threshold = 0; if (!PyArg_ParseTuple(args, "|i:mainloop", - &threshold)) + &threshold)) { goto exit; + } return_value = _tkinter_tkapp_mainloop_impl(self, threshold); exit: @@ -429,8 +442,9 @@ _tkinter_tkapp_dooneevent(TkappObject *self, PyObject *args) int flags = 0; if (!PyArg_ParseTuple(args, "|i:dooneevent", - &flags)) + &flags)) { goto exit; + } return_value = _tkinter_tkapp_dooneevent_impl(self, flags); exit: @@ -551,8 +565,9 @@ _tkinter_create(PyObject *module, PyObject *args) const char *use = NULL; if (!PyArg_ParseTuple(args, "|zssiiiiz:create", - &screenName, &baseName, &className, &interactive, &wantobjects, &wantTk, &sync, &use)) + &screenName, &baseName, &className, &interactive, &wantobjects, &wantTk, &sync, &use)) { goto exit; + } return_value = _tkinter_create_impl(module, screenName, baseName, className, interactive, wantobjects, wantTk, sync, use); exit: @@ -579,8 +594,9 @@ _tkinter_setbusywaitinterval(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int new_val; - if (!PyArg_Parse(arg, "i:setbusywaitinterval", &new_val)) + if (!PyArg_Parse(arg, "i:setbusywaitinterval", &new_val)) { goto exit; + } return_value = _tkinter_setbusywaitinterval_impl(module, new_val); exit: @@ -606,8 +622,9 @@ _tkinter_getbusywaitinterval(PyObject *module, PyObject *Py_UNUSED(ignored)) int _return_value; _return_value = _tkinter_getbusywaitinterval_impl(module); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -621,4 +638,4 @@ exit: #ifndef _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF #define _TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF #endif /* !defined(_TKINTER_TKAPP_DELETEFILEHANDLER_METHODDEF) */ -/*[clinic end generated code: output=f9057c8bf288633d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=836c578b71d69097 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_weakref.c.h b/Modules/clinic/_weakref.c.h index 2d93679..c192e72 100644 --- a/Modules/clinic/_weakref.c.h +++ b/Modules/clinic/_weakref.c.h @@ -21,40 +21,12 @@ _weakref_getweakrefcount(PyObject *module, PyObject *object) Py_ssize_t _return_value; _return_value = _weakref_getweakrefcount_impl(module, object); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: return return_value; } - -PyDoc_STRVAR(_weakref__remove_dead_weakref__doc__, -"_remove_dead_weakref($module, dct, key, /)\n" -"--\n" -"\n" -"Atomically remove key from dict if it points to a dead weakref."); - -#define _WEAKREF__REMOVE_DEAD_WEAKREF_METHODDEF \ - {"_remove_dead_weakref", (PyCFunction)_weakref__remove_dead_weakref, METH_VARARGS, _weakref__remove_dead_weakref__doc__}, - -static PyObject * -_weakref__remove_dead_weakref_impl(PyObject *module, PyObject *dct, - PyObject *key); - -static PyObject * -_weakref__remove_dead_weakref(PyObject *module, PyObject *args) -{ - PyObject *return_value = NULL; - PyObject *dct; - PyObject *key; - - if (!PyArg_ParseTuple(args, "O!O:_remove_dead_weakref", - &PyDict_Type, &dct, &key)) - goto exit; - return_value = _weakref__remove_dead_weakref_impl(module, dct, key); - -exit: - return return_value; -} -/*[clinic end generated code: output=5764cb64a6f66ffd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e1ad587147323e19 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h index ac38d37..5bfbaf0 100644 --- a/Modules/clinic/_winapi.c.h +++ b/Modules/clinic/_winapi.c.h @@ -19,8 +19,9 @@ _winapi_Overlapped_GetOverlappedResult(OverlappedObject *self, PyObject *arg) PyObject *return_value = NULL; int wait; - if (!PyArg_Parse(arg, "p:GetOverlappedResult", &wait)) + if (!PyArg_Parse(arg, "p:GetOverlappedResult", &wait)) { goto exit; + } return_value = _winapi_Overlapped_GetOverlappedResult_impl(self, wait); exit: @@ -79,8 +80,9 @@ _winapi_CloseHandle(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HANDLE handle; - if (!PyArg_Parse(arg, "" F_HANDLE ":CloseHandle", &handle)) + if (!PyArg_Parse(arg, "" F_HANDLE ":CloseHandle", &handle)) { goto exit; + } return_value = _winapi_CloseHandle_impl(module, handle); exit: @@ -93,23 +95,25 @@ PyDoc_STRVAR(_winapi_ConnectNamedPipe__doc__, "\n"); #define _WINAPI_CONNECTNAMEDPIPE_METHODDEF \ - {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_VARARGS|METH_KEYWORDS, _winapi_ConnectNamedPipe__doc__}, + {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_FASTCALL, _winapi_ConnectNamedPipe__doc__}, static PyObject * _winapi_ConnectNamedPipe_impl(PyObject *module, HANDLE handle, int use_overlapped); static PyObject * -_winapi_ConnectNamedPipe(PyObject *module, PyObject *args, PyObject *kwargs) +_winapi_ConnectNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"handle", "overlapped", NULL}; + static const char * const _keywords[] = {"handle", "overlapped", NULL}; + static _PyArg_Parser _parser = {"" F_HANDLE "|i:ConnectNamedPipe", _keywords, 0}; HANDLE handle; int use_overlapped = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "|i:ConnectNamedPipe", _keywords, - &handle, &use_overlapped)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &handle, &use_overlapped)) { goto exit; + } return_value = _winapi_ConnectNamedPipe_impl(module, handle, use_overlapped); exit: @@ -147,13 +151,16 @@ _winapi_CreateFile(PyObject *module, PyObject *args) HANDLE _return_value; if (!PyArg_ParseTuple(args, "skk" F_POINTER "kk" F_HANDLE ":CreateFile", - &file_name, &desired_access, &share_mode, &security_attributes, &creation_disposition, &flags_and_attributes, &template_file)) + &file_name, &desired_access, &share_mode, &security_attributes, &creation_disposition, &flags_and_attributes, &template_file)) { goto exit; + } _return_value = _winapi_CreateFile_impl(module, file_name, desired_access, share_mode, security_attributes, creation_disposition, flags_and_attributes, template_file); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -180,8 +187,9 @@ _winapi_CreateJunction(PyObject *module, PyObject *args) LPWSTR dst_path; if (!PyArg_ParseTuple(args, "uu:CreateJunction", - &src_path, &dst_path)) + &src_path, &dst_path)) { goto exit; + } return_value = _winapi_CreateJunction_impl(module, src_path, dst_path); exit: @@ -220,13 +228,16 @@ _winapi_CreateNamedPipe(PyObject *module, PyObject *args) HANDLE _return_value; if (!PyArg_ParseTuple(args, "skkkkkk" F_POINTER ":CreateNamedPipe", - &name, &open_mode, &pipe_mode, &max_instances, &out_buffer_size, &in_buffer_size, &default_timeout, &security_attributes)) + &name, &open_mode, &pipe_mode, &max_instances, &out_buffer_size, &in_buffer_size, &default_timeout, &security_attributes)) { goto exit; + } _return_value = _winapi_CreateNamedPipe_impl(module, name, open_mode, pipe_mode, max_instances, out_buffer_size, in_buffer_size, default_timeout, security_attributes); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -258,8 +269,9 @@ _winapi_CreatePipe(PyObject *module, PyObject *args) DWORD size; if (!PyArg_ParseTuple(args, "Ok:CreatePipe", - &pipe_attrs, &size)) + &pipe_attrs, &size)) { goto exit; + } return_value = _winapi_CreatePipe_impl(module, pipe_attrs, size); exit: @@ -308,8 +320,9 @@ _winapi_CreateProcess(PyObject *module, PyObject *args) PyObject *startup_info; if (!PyArg_ParseTuple(args, "ZZOOikOZO:CreateProcess", - &application_name, &command_line, &proc_attrs, &thread_attrs, &inherit_handles, &creation_flags, &env_mapping, ¤t_directory, &startup_info)) + &application_name, &command_line, &proc_attrs, &thread_attrs, &inherit_handles, &creation_flags, &env_mapping, ¤t_directory, &startup_info)) { goto exit; + } return_value = _winapi_CreateProcess_impl(module, application_name, command_line, proc_attrs, thread_attrs, inherit_handles, creation_flags, env_mapping, current_directory, startup_info); exit: @@ -351,13 +364,16 @@ _winapi_DuplicateHandle(PyObject *module, PyObject *args) HANDLE _return_value; if (!PyArg_ParseTuple(args, "" F_HANDLE "" F_HANDLE "" F_HANDLE "ki|k:DuplicateHandle", - &source_process_handle, &source_handle, &target_process_handle, &desired_access, &inherit_handle, &options)) + &source_process_handle, &source_handle, &target_process_handle, &desired_access, &inherit_handle, &options)) { goto exit; + } _return_value = _winapi_DuplicateHandle_impl(module, source_process_handle, source_handle, target_process_handle, desired_access, inherit_handle, options); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -381,8 +397,9 @@ _winapi_ExitProcess(PyObject *module, PyObject *arg) PyObject *return_value = NULL; UINT ExitCode; - if (!PyArg_Parse(arg, "I:ExitProcess", &ExitCode)) + if (!PyArg_Parse(arg, "I:ExitProcess", &ExitCode)) { goto exit; + } return_value = _winapi_ExitProcess_impl(module, ExitCode); exit: @@ -408,10 +425,12 @@ _winapi_GetCurrentProcess(PyObject *module, PyObject *Py_UNUSED(ignored)) HANDLE _return_value; _return_value = _winapi_GetCurrentProcess_impl(module); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -437,11 +456,13 @@ _winapi_GetExitCodeProcess(PyObject *module, PyObject *arg) HANDLE process; DWORD _return_value; - if (!PyArg_Parse(arg, "" F_HANDLE ":GetExitCodeProcess", &process)) + if (!PyArg_Parse(arg, "" F_HANDLE ":GetExitCodeProcess", &process)) { goto exit; + } _return_value = _winapi_GetExitCodeProcess_impl(module, process); - if ((_return_value == DWORD_MAX) && PyErr_Occurred()) + if ((_return_value == DWORD_MAX) && PyErr_Occurred()) { goto exit; + } return_value = Py_BuildValue("k", _return_value); exit: @@ -466,8 +487,9 @@ _winapi_GetLastError(PyObject *module, PyObject *Py_UNUSED(ignored)) DWORD _return_value; _return_value = _winapi_GetLastError_impl(module); - if ((_return_value == DWORD_MAX) && PyErr_Occurred()) + if ((_return_value == DWORD_MAX) && PyErr_Occurred()) { goto exit; + } return_value = Py_BuildValue("k", _return_value); exit: @@ -499,8 +521,9 @@ _winapi_GetModuleFileName(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HMODULE module_handle; - if (!PyArg_Parse(arg, "" F_HANDLE ":GetModuleFileName", &module_handle)) + if (!PyArg_Parse(arg, "" F_HANDLE ":GetModuleFileName", &module_handle)) { goto exit; + } return_value = _winapi_GetModuleFileName_impl(module, module_handle); exit: @@ -531,13 +554,16 @@ _winapi_GetStdHandle(PyObject *module, PyObject *arg) DWORD std_handle; HANDLE _return_value; - if (!PyArg_Parse(arg, "k:GetStdHandle", &std_handle)) + if (!PyArg_Parse(arg, "k:GetStdHandle", &std_handle)) { goto exit; + } _return_value = _winapi_GetStdHandle_impl(module, std_handle); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -563,8 +589,9 @@ _winapi_GetVersion(PyObject *module, PyObject *Py_UNUSED(ignored)) long _return_value; _return_value = _winapi_GetVersion_impl(module); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -593,13 +620,16 @@ _winapi_OpenProcess(PyObject *module, PyObject *args) HANDLE _return_value; if (!PyArg_ParseTuple(args, "kik:OpenProcess", - &desired_access, &inherit_handle, &process_id)) + &desired_access, &inherit_handle, &process_id)) { goto exit; + } _return_value = _winapi_OpenProcess_impl(module, desired_access, inherit_handle, process_id); - if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) + if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) { goto exit; - if (_return_value == NULL) + } + if (_return_value == NULL) { Py_RETURN_NONE; + } return_value = HANDLE_TO_PYNUM(_return_value); exit: @@ -625,8 +655,9 @@ _winapi_PeekNamedPipe(PyObject *module, PyObject *args) int size = 0; if (!PyArg_ParseTuple(args, "" F_HANDLE "|i:PeekNamedPipe", - &handle, &size)) + &handle, &size)) { goto exit; + } return_value = _winapi_PeekNamedPipe_impl(module, handle, size); exit: @@ -639,24 +670,26 @@ PyDoc_STRVAR(_winapi_ReadFile__doc__, "\n"); #define _WINAPI_READFILE_METHODDEF \ - {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_VARARGS|METH_KEYWORDS, _winapi_ReadFile__doc__}, + {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_FASTCALL, _winapi_ReadFile__doc__}, static PyObject * _winapi_ReadFile_impl(PyObject *module, HANDLE handle, int size, int use_overlapped); static PyObject * -_winapi_ReadFile(PyObject *module, PyObject *args, PyObject *kwargs) +_winapi_ReadFile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"handle", "size", "overlapped", NULL}; + static const char * const _keywords[] = {"handle", "size", "overlapped", NULL}; + static _PyArg_Parser _parser = {"" F_HANDLE "i|i:ReadFile", _keywords, 0}; HANDLE handle; int size; int use_overlapped = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "i|i:ReadFile", _keywords, - &handle, &size, &use_overlapped)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &handle, &size, &use_overlapped)) { goto exit; + } return_value = _winapi_ReadFile_impl(module, handle, size, use_overlapped); exit: @@ -688,8 +721,9 @@ _winapi_SetNamedPipeHandleState(PyObject *module, PyObject *args) PyObject *collect_data_timeout; if (!PyArg_ParseTuple(args, "" F_HANDLE "OOO:SetNamedPipeHandleState", - &named_pipe, &mode, &max_collection_count, &collect_data_timeout)) + &named_pipe, &mode, &max_collection_count, &collect_data_timeout)) { goto exit; + } return_value = _winapi_SetNamedPipeHandleState_impl(module, named_pipe, mode, max_collection_count, collect_data_timeout); exit: @@ -717,8 +751,9 @@ _winapi_TerminateProcess(PyObject *module, PyObject *args) UINT exit_code; if (!PyArg_ParseTuple(args, "" F_HANDLE "I:TerminateProcess", - &handle, &exit_code)) + &handle, &exit_code)) { goto exit; + } return_value = _winapi_TerminateProcess_impl(module, handle, exit_code); exit: @@ -744,8 +779,9 @@ _winapi_WaitNamedPipe(PyObject *module, PyObject *args) DWORD timeout; if (!PyArg_ParseTuple(args, "sk:WaitNamedPipe", - &name, &timeout)) + &name, &timeout)) { goto exit; + } return_value = _winapi_WaitNamedPipe_impl(module, name, timeout); exit: @@ -774,8 +810,9 @@ _winapi_WaitForMultipleObjects(PyObject *module, PyObject *args) DWORD milliseconds = INFINITE; if (!PyArg_ParseTuple(args, "Oi|k:WaitForMultipleObjects", - &handle_seq, &wait_flag, &milliseconds)) + &handle_seq, &wait_flag, &milliseconds)) { goto exit; + } return_value = _winapi_WaitForMultipleObjects_impl(module, handle_seq, wait_flag, milliseconds); exit: @@ -808,11 +845,13 @@ _winapi_WaitForSingleObject(PyObject *module, PyObject *args) long _return_value; if (!PyArg_ParseTuple(args, "" F_HANDLE "k:WaitForSingleObject", - &handle, &milliseconds)) + &handle, &milliseconds)) { goto exit; + } _return_value = _winapi_WaitForSingleObject_impl(module, handle, milliseconds); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -825,27 +864,29 @@ PyDoc_STRVAR(_winapi_WriteFile__doc__, "\n"); #define _WINAPI_WRITEFILE_METHODDEF \ - {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_VARARGS|METH_KEYWORDS, _winapi_WriteFile__doc__}, + {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_FASTCALL, _winapi_WriteFile__doc__}, static PyObject * _winapi_WriteFile_impl(PyObject *module, HANDLE handle, PyObject *buffer, int use_overlapped); static PyObject * -_winapi_WriteFile(PyObject *module, PyObject *args, PyObject *kwargs) +_winapi_WriteFile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"handle", "buffer", "overlapped", NULL}; + static const char * const _keywords[] = {"handle", "buffer", "overlapped", NULL}; + static _PyArg_Parser _parser = {"" F_HANDLE "O|i:WriteFile", _keywords, 0}; HANDLE handle; PyObject *buffer; int use_overlapped = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" F_HANDLE "O|i:WriteFile", _keywords, - &handle, &buffer, &use_overlapped)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &handle, &buffer, &use_overlapped)) { goto exit; + } return_value = _winapi_WriteFile_impl(module, handle, buffer, use_overlapped); exit: return return_value; } -/*[clinic end generated code: output=a4c4b2a9fcb0bea1 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=46d6382a6662c4a9 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/arraymodule.c.h b/Modules/clinic/arraymodule.c.h index 0c7061a..3b9fcda 100644 --- a/Modules/clinic/arraymodule.c.h +++ b/Modules/clinic/arraymodule.c.h @@ -77,8 +77,9 @@ array_array_pop(arrayobject *self, PyObject *args) Py_ssize_t i = -1; if (!PyArg_ParseTuple(args, "|n:pop", - &i)) + &i)) { goto exit; + } return_value = array_array_pop_impl(self, i); exit: @@ -114,8 +115,9 @@ array_array_insert(arrayobject *self, PyObject *args) PyObject *v; if (!PyArg_ParseTuple(args, "nO:insert", - &i, &v)) + &i, &v)) { goto exit; + } return_value = array_array_insert_impl(self, i, v); exit: @@ -211,8 +213,9 @@ array_array_fromfile(arrayobject *self, PyObject *args) Py_ssize_t n; if (!PyArg_ParseTuple(args, "On:fromfile", - &f, &n)) + &f, &n)) { goto exit; + } return_value = array_array_fromfile_impl(self, f, n); exit: @@ -275,14 +278,16 @@ array_array_fromstring(arrayobject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "s*:fromstring", &buffer)) + if (!PyArg_Parse(arg, "s*:fromstring", &buffer)) { goto exit; + } return_value = array_array_fromstring_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -305,14 +310,16 @@ array_array_frombytes(arrayobject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer buffer = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:frombytes", &buffer)) + if (!PyArg_Parse(arg, "y*:frombytes", &buffer)) { goto exit; + } return_value = array_array_frombytes_impl(self, &buffer); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -379,8 +386,9 @@ array_array_fromunicode(arrayobject *self, PyObject *arg) Py_UNICODE *ustr; Py_ssize_clean_t ustr_length; - if (!PyArg_Parse(arg, "u#:fromunicode", &ustr, &ustr_length)) + if (!PyArg_Parse(arg, "u#:fromunicode", &ustr, &ustr_length)) { goto exit; + } return_value = array_array_fromunicode_impl(self, ustr, ustr_length); exit: @@ -453,8 +461,9 @@ array__array_reconstructor(PyObject *module, PyObject *args) PyObject *items; if (!PyArg_ParseTuple(args, "OCiO:_array_reconstructor", - &arraytype, &typecode, &mformat_code, &items)) + &arraytype, &typecode, &mformat_code, &items)) { goto exit; + } return_value = array__array_reconstructor_impl(module, arraytype, typecode, mformat_code, items); exit: @@ -496,4 +505,4 @@ PyDoc_STRVAR(array_arrayiterator___setstate____doc__, #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF \ {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__}, -/*[clinic end generated code: output=305df3f5796039e4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b2054fb764c8cc64 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/audioop.c.h b/Modules/clinic/audioop.c.h index 62e313b..be4b718 100644 --- a/Modules/clinic/audioop.c.h +++ b/Modules/clinic/audioop.c.h @@ -24,14 +24,16 @@ audioop_getsample(PyObject *module, PyObject *args) Py_ssize_t index; if (!PyArg_ParseTuple(args, "y*in:getsample", - &fragment, &width, &index)) + &fragment, &width, &index)) { goto exit; + } return_value = audioop_getsample_impl(module, &fragment, width, index); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -56,14 +58,16 @@ audioop_max(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:max", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_max_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -88,14 +92,16 @@ audioop_minmax(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:minmax", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_minmax_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -120,14 +126,16 @@ audioop_avg(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:avg", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_avg_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -152,14 +160,16 @@ audioop_rms(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:rms", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_rms_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -185,17 +195,20 @@ audioop_findfit(PyObject *module, PyObject *args) Py_buffer reference = {NULL, NULL}; if (!PyArg_ParseTuple(args, "y*y*:findfit", - &fragment, &reference)) + &fragment, &reference)) { goto exit; + } return_value = audioop_findfit_impl(module, &fragment, &reference); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } /* Cleanup for reference */ - if (reference.obj) + if (reference.obj) { PyBuffer_Release(&reference); + } return return_value; } @@ -221,17 +234,20 @@ audioop_findfactor(PyObject *module, PyObject *args) Py_buffer reference = {NULL, NULL}; if (!PyArg_ParseTuple(args, "y*y*:findfactor", - &fragment, &reference)) + &fragment, &reference)) { goto exit; + } return_value = audioop_findfactor_impl(module, &fragment, &reference); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } /* Cleanup for reference */ - if (reference.obj) + if (reference.obj) { PyBuffer_Release(&reference); + } return return_value; } @@ -257,14 +273,16 @@ audioop_findmax(PyObject *module, PyObject *args) Py_ssize_t length; if (!PyArg_ParseTuple(args, "y*n:findmax", - &fragment, &length)) + &fragment, &length)) { goto exit; + } return_value = audioop_findmax_impl(module, &fragment, length); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -289,14 +307,16 @@ audioop_avgpp(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:avgpp", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_avgpp_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -321,14 +341,16 @@ audioop_maxpp(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:maxpp", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_maxpp_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -353,14 +375,16 @@ audioop_cross(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:cross", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_cross_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -387,14 +411,16 @@ audioop_mul(PyObject *module, PyObject *args) double factor; if (!PyArg_ParseTuple(args, "y*id:mul", - &fragment, &width, &factor)) + &fragment, &width, &factor)) { goto exit; + } return_value = audioop_mul_impl(module, &fragment, width, factor); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -422,14 +448,16 @@ audioop_tomono(PyObject *module, PyObject *args) double rfactor; if (!PyArg_ParseTuple(args, "y*idd:tomono", - &fragment, &width, &lfactor, &rfactor)) + &fragment, &width, &lfactor, &rfactor)) { goto exit; + } return_value = audioop_tomono_impl(module, &fragment, width, lfactor, rfactor); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -457,14 +485,16 @@ audioop_tostereo(PyObject *module, PyObject *args) double rfactor; if (!PyArg_ParseTuple(args, "y*idd:tostereo", - &fragment, &width, &lfactor, &rfactor)) + &fragment, &width, &lfactor, &rfactor)) { goto exit; + } return_value = audioop_tostereo_impl(module, &fragment, width, lfactor, rfactor); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -491,17 +521,20 @@ audioop_add(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*y*i:add", - &fragment1, &fragment2, &width)) + &fragment1, &fragment2, &width)) { goto exit; + } return_value = audioop_add_impl(module, &fragment1, &fragment2, width); exit: /* Cleanup for fragment1 */ - if (fragment1.obj) + if (fragment1.obj) { PyBuffer_Release(&fragment1); + } /* Cleanup for fragment2 */ - if (fragment2.obj) + if (fragment2.obj) { PyBuffer_Release(&fragment2); + } return return_value; } @@ -527,14 +560,16 @@ audioop_bias(PyObject *module, PyObject *args) int bias; if (!PyArg_ParseTuple(args, "y*ii:bias", - &fragment, &width, &bias)) + &fragment, &width, &bias)) { goto exit; + } return_value = audioop_bias_impl(module, &fragment, width, bias); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -559,14 +594,16 @@ audioop_reverse(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:reverse", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_reverse_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -591,14 +628,16 @@ audioop_byteswap(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:byteswap", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_byteswap_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -625,14 +664,16 @@ audioop_lin2lin(PyObject *module, PyObject *args) int newwidth; if (!PyArg_ParseTuple(args, "y*ii:lin2lin", - &fragment, &width, &newwidth)) + &fragment, &width, &newwidth)) { goto exit; + } return_value = audioop_lin2lin_impl(module, &fragment, width, newwidth); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -666,14 +707,16 @@ audioop_ratecv(PyObject *module, PyObject *args) int weightB = 0; if (!PyArg_ParseTuple(args, "y*iiiiO|ii:ratecv", - &fragment, &width, &nchannels, &inrate, &outrate, &state, &weightA, &weightB)) + &fragment, &width, &nchannels, &inrate, &outrate, &state, &weightA, &weightB)) { goto exit; + } return_value = audioop_ratecv_impl(module, &fragment, width, nchannels, inrate, outrate, state, weightA, weightB); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -698,14 +741,16 @@ audioop_lin2ulaw(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:lin2ulaw", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_lin2ulaw_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -730,14 +775,16 @@ audioop_ulaw2lin(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:ulaw2lin", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_ulaw2lin_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -762,14 +809,16 @@ audioop_lin2alaw(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:lin2alaw", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_lin2alaw_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -794,14 +843,16 @@ audioop_alaw2lin(PyObject *module, PyObject *args) int width; if (!PyArg_ParseTuple(args, "y*i:alaw2lin", - &fragment, &width)) + &fragment, &width)) { goto exit; + } return_value = audioop_alaw2lin_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -828,14 +879,16 @@ audioop_lin2adpcm(PyObject *module, PyObject *args) PyObject *state; if (!PyArg_ParseTuple(args, "y*iO:lin2adpcm", - &fragment, &width, &state)) + &fragment, &width, &state)) { goto exit; + } return_value = audioop_lin2adpcm_impl(module, &fragment, width, state); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } @@ -862,15 +915,17 @@ audioop_adpcm2lin(PyObject *module, PyObject *args) PyObject *state; if (!PyArg_ParseTuple(args, "y*iO:adpcm2lin", - &fragment, &width, &state)) + &fragment, &width, &state)) { goto exit; + } return_value = audioop_adpcm2lin_impl(module, &fragment, width, state); exit: /* Cleanup for fragment */ - if (fragment.obj) + if (fragment.obj) { PyBuffer_Release(&fragment); + } return return_value; } -/*[clinic end generated code: output=385fb09fa21a62c0 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e0ab74c3fa57c39c input=a9049054013a1b77]*/ diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h index 6ace4d5..acafcbf 100644 --- a/Modules/clinic/binascii.c.h +++ b/Modules/clinic/binascii.c.h @@ -20,8 +20,9 @@ binascii_a2b_uu(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "O&:a2b_uu", ascii_buffer_converter, &data)) + if (!PyArg_Parse(arg, "O&:a2b_uu", ascii_buffer_converter, &data)) { goto exit; + } return_value = binascii_a2b_uu_impl(module, &data); exit: @@ -50,14 +51,16 @@ binascii_b2a_uu(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:b2a_uu", &data)) + if (!PyArg_Parse(arg, "y*:b2a_uu", &data)) { goto exit; + } return_value = binascii_b2a_uu_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -80,8 +83,9 @@ binascii_a2b_base64(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "O&:a2b_base64", ascii_buffer_converter, &data)) + if (!PyArg_Parse(arg, "O&:a2b_base64", ascii_buffer_converter, &data)) { goto exit; + } return_value = binascii_a2b_base64_impl(module, &data); exit: @@ -93,31 +97,37 @@ exit: } PyDoc_STRVAR(binascii_b2a_base64__doc__, -"b2a_base64($module, data, /)\n" +"b2a_base64($module, /, data, *, newline=True)\n" "--\n" "\n" "Base64-code line of data."); #define BINASCII_B2A_BASE64_METHODDEF \ - {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_O, binascii_b2a_base64__doc__}, + {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_FASTCALL, binascii_b2a_base64__doc__}, static PyObject * -binascii_b2a_base64_impl(PyObject *module, Py_buffer *data); +binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, int newline); static PyObject * -binascii_b2a_base64(PyObject *module, PyObject *arg) +binascii_b2a_base64(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"data", "newline", NULL}; + static _PyArg_Parser _parser = {"y*|$i:b2a_base64", _keywords, 0}; Py_buffer data = {NULL, NULL}; + int newline = 1; - if (!PyArg_Parse(arg, "y*:b2a_base64", &data)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &newline)) { goto exit; - return_value = binascii_b2a_base64_impl(module, &data); + } + return_value = binascii_b2a_base64_impl(module, &data, newline); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -140,8 +150,9 @@ binascii_a2b_hqx(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "O&:a2b_hqx", ascii_buffer_converter, &data)) + if (!PyArg_Parse(arg, "O&:a2b_hqx", ascii_buffer_converter, &data)) { goto exit; + } return_value = binascii_a2b_hqx_impl(module, &data); exit: @@ -170,14 +181,16 @@ binascii_rlecode_hqx(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:rlecode_hqx", &data)) + if (!PyArg_Parse(arg, "y*:rlecode_hqx", &data)) { goto exit; + } return_value = binascii_rlecode_hqx_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -200,14 +213,16 @@ binascii_b2a_hqx(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:b2a_hqx", &data)) + if (!PyArg_Parse(arg, "y*:b2a_hqx", &data)) { goto exit; + } return_value = binascii_b2a_hqx_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -230,14 +245,16 @@ binascii_rledecode_hqx(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:rledecode_hqx", &data)) + if (!PyArg_Parse(arg, "y*:rledecode_hqx", &data)) { goto exit; + } return_value = binascii_rledecode_hqx_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -246,7 +263,7 @@ PyDoc_STRVAR(binascii_crc_hqx__doc__, "crc_hqx($module, data, crc, /)\n" "--\n" "\n" -"Compute CRC-CCITT incrementally."); +"Compute hqx CRC incrementally."); #define BINASCII_CRC_HQX_METHODDEF \ {"crc_hqx", (PyCFunction)binascii_crc_hqx, METH_VARARGS, binascii_crc_hqx__doc__}, @@ -263,17 +280,20 @@ binascii_crc_hqx(PyObject *module, PyObject *args) unsigned int _return_value; if (!PyArg_ParseTuple(args, "y*I:crc_hqx", - &data, &crc)) + &data, &crc)) { goto exit; + } _return_value = binascii_crc_hqx_impl(module, &data, crc); - if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) + if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromUnsignedLong((unsigned long)_return_value); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -299,17 +319,20 @@ binascii_crc32(PyObject *module, PyObject *args) unsigned int _return_value; if (!PyArg_ParseTuple(args, "y*|I:crc32", - &data, &crc)) + &data, &crc)) { goto exit; + } _return_value = binascii_crc32_impl(module, &data, crc); - if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) + if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromUnsignedLong((unsigned long)_return_value); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -335,14 +358,16 @@ binascii_b2a_hex(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:b2a_hex", &data)) + if (!PyArg_Parse(arg, "y*:b2a_hex", &data)) { goto exit; + } return_value = binascii_b2a_hex_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -367,14 +392,16 @@ binascii_hexlify(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:hexlify", &data)) + if (!PyArg_Parse(arg, "y*:hexlify", &data)) { goto exit; + } return_value = binascii_hexlify_impl(module, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -400,8 +427,9 @@ binascii_a2b_hex(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer hexstr = {NULL, NULL}; - if (!PyArg_Parse(arg, "O&:a2b_hex", ascii_buffer_converter, &hexstr)) + if (!PyArg_Parse(arg, "O&:a2b_hex", ascii_buffer_converter, &hexstr)) { goto exit; + } return_value = binascii_a2b_hex_impl(module, &hexstr); exit: @@ -432,8 +460,9 @@ binascii_unhexlify(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_buffer hexstr = {NULL, NULL}; - if (!PyArg_Parse(arg, "O&:unhexlify", ascii_buffer_converter, &hexstr)) + if (!PyArg_Parse(arg, "O&:unhexlify", ascii_buffer_converter, &hexstr)) { goto exit; + } return_value = binascii_unhexlify_impl(module, &hexstr); exit: @@ -451,22 +480,24 @@ PyDoc_STRVAR(binascii_a2b_qp__doc__, "Decode a string of qp-encoded data."); #define BINASCII_A2B_QP_METHODDEF \ - {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS|METH_KEYWORDS, binascii_a2b_qp__doc__}, + {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_FASTCALL, binascii_a2b_qp__doc__}, static PyObject * binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header); static PyObject * -binascii_a2b_qp(PyObject *module, PyObject *args, PyObject *kwargs) +binascii_a2b_qp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"data", "header", NULL}; + static const char * const _keywords[] = {"data", "header", NULL}; + static _PyArg_Parser _parser = {"O&|i:a2b_qp", _keywords, 0}; Py_buffer data = {NULL, NULL}; int header = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|i:a2b_qp", _keywords, - ascii_buffer_converter, &data, &header)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + ascii_buffer_converter, &data, &header)) { goto exit; + } return_value = binascii_a2b_qp_impl(module, &data, header); exit: @@ -488,32 +519,35 @@ PyDoc_STRVAR(binascii_b2a_qp__doc__, "are both encoded. When quotetabs is set, space and tabs are encoded."); #define BINASCII_B2A_QP_METHODDEF \ - {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_VARARGS|METH_KEYWORDS, binascii_b2a_qp__doc__}, + {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_FASTCALL, binascii_b2a_qp__doc__}, static PyObject * binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs, int istext, int header); static PyObject * -binascii_b2a_qp(PyObject *module, PyObject *args, PyObject *kwargs) +binascii_b2a_qp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"data", "quotetabs", "istext", "header", NULL}; + static const char * const _keywords[] = {"data", "quotetabs", "istext", "header", NULL}; + static _PyArg_Parser _parser = {"y*|iii:b2a_qp", _keywords, 0}; Py_buffer data = {NULL, NULL}; int quotetabs = 0; int istext = 1; int header = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|iii:b2a_qp", _keywords, - &data, "etabs, &istext, &header)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, "etabs, &istext, &header)) { goto exit; + } return_value = binascii_b2a_qp_impl(module, &data, quotetabs, istext, header); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } -/*[clinic end generated code: output=6d70d5edd9373d92 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1f8d6e48f75f6d1e input=a9049054013a1b77]*/ diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h index a255353..05431fa 100644 --- a/Modules/clinic/cmathmodule.c.h +++ b/Modules/clinic/cmathmodule.c.h @@ -21,8 +21,9 @@ cmath_acos(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:acos", &z)) + if (!PyArg_Parse(arg, "D:acos", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_acos_impl(module, z); @@ -62,8 +63,9 @@ cmath_acosh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:acosh", &z)) + if (!PyArg_Parse(arg, "D:acosh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_acosh_impl(module, z); @@ -103,8 +105,9 @@ cmath_asin(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:asin", &z)) + if (!PyArg_Parse(arg, "D:asin", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_asin_impl(module, z); @@ -144,8 +147,9 @@ cmath_asinh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:asinh", &z)) + if (!PyArg_Parse(arg, "D:asinh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_asinh_impl(module, z); @@ -185,8 +189,9 @@ cmath_atan(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:atan", &z)) + if (!PyArg_Parse(arg, "D:atan", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_atan_impl(module, z); @@ -226,8 +231,9 @@ cmath_atanh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:atanh", &z)) + if (!PyArg_Parse(arg, "D:atanh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_atanh_impl(module, z); @@ -267,8 +273,9 @@ cmath_cos(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:cos", &z)) + if (!PyArg_Parse(arg, "D:cos", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_cos_impl(module, z); @@ -308,8 +315,9 @@ cmath_cosh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:cosh", &z)) + if (!PyArg_Parse(arg, "D:cosh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_cosh_impl(module, z); @@ -349,8 +357,9 @@ cmath_exp(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:exp", &z)) + if (!PyArg_Parse(arg, "D:exp", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_exp_impl(module, z); @@ -390,8 +399,9 @@ cmath_log10(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:log10", &z)) + if (!PyArg_Parse(arg, "D:log10", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_log10_impl(module, z); @@ -431,8 +441,9 @@ cmath_sin(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:sin", &z)) + if (!PyArg_Parse(arg, "D:sin", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_sin_impl(module, z); @@ -472,8 +483,9 @@ cmath_sinh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:sinh", &z)) + if (!PyArg_Parse(arg, "D:sinh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_sinh_impl(module, z); @@ -513,8 +525,9 @@ cmath_sqrt(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:sqrt", &z)) + if (!PyArg_Parse(arg, "D:sqrt", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_sqrt_impl(module, z); @@ -554,8 +567,9 @@ cmath_tan(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:tan", &z)) + if (!PyArg_Parse(arg, "D:tan", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_tan_impl(module, z); @@ -595,8 +609,9 @@ cmath_tanh(PyObject *module, PyObject *arg) Py_complex z; Py_complex _return_value; - if (!PyArg_Parse(arg, "D:tanh", &z)) + if (!PyArg_Parse(arg, "D:tanh", &z)) { goto exit; + } /* modifications for z */ errno = 0; PyFPE_START_PROTECT("complex function", goto exit); _return_value = cmath_tanh_impl(module, z); @@ -639,8 +654,9 @@ cmath_log(PyObject *module, PyObject *args) PyObject *y_obj = NULL; if (!PyArg_ParseTuple(args, "D|O:log", - &x, &y_obj)) + &x, &y_obj)) { goto exit; + } return_value = cmath_log_impl(module, x, y_obj); exit: @@ -665,8 +681,9 @@ cmath_phase(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_complex z; - if (!PyArg_Parse(arg, "D:phase", &z)) + if (!PyArg_Parse(arg, "D:phase", &z)) { goto exit; + } return_value = cmath_phase_impl(module, z); exit: @@ -693,8 +710,9 @@ cmath_polar(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_complex z; - if (!PyArg_Parse(arg, "D:polar", &z)) + if (!PyArg_Parse(arg, "D:polar", &z)) { goto exit; + } return_value = cmath_polar_impl(module, z); exit: @@ -721,8 +739,9 @@ cmath_rect(PyObject *module, PyObject *args) double phi; if (!PyArg_ParseTuple(args, "dd:rect", - &r, &phi)) + &r, &phi)) { goto exit; + } return_value = cmath_rect_impl(module, r, phi); exit: @@ -747,8 +766,9 @@ cmath_isfinite(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_complex z; - if (!PyArg_Parse(arg, "D:isfinite", &z)) + if (!PyArg_Parse(arg, "D:isfinite", &z)) { goto exit; + } return_value = cmath_isfinite_impl(module, z); exit: @@ -773,8 +793,9 @@ cmath_isnan(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_complex z; - if (!PyArg_Parse(arg, "D:isnan", &z)) + if (!PyArg_Parse(arg, "D:isnan", &z)) { goto exit; + } return_value = cmath_isnan_impl(module, z); exit: @@ -799,8 +820,9 @@ cmath_isinf(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_complex z; - if (!PyArg_Parse(arg, "D:isinf", &z)) + if (!PyArg_Parse(arg, "D:isinf", &z)) { goto exit; + } return_value = cmath_isinf_impl(module, z); exit: @@ -829,32 +851,35 @@ PyDoc_STRVAR(cmath_isclose__doc__, "not close to anything, even itself. inf and -inf are only close to themselves."); #define CMATH_ISCLOSE_METHODDEF \ - {"isclose", (PyCFunction)cmath_isclose, METH_VARARGS|METH_KEYWORDS, cmath_isclose__doc__}, + {"isclose", (PyCFunction)cmath_isclose, METH_FASTCALL, cmath_isclose__doc__}, static int cmath_isclose_impl(PyObject *module, Py_complex a, Py_complex b, double rel_tol, double abs_tol); static PyObject * -cmath_isclose(PyObject *module, PyObject *args, PyObject *kwargs) +cmath_isclose(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"a", "b", "rel_tol", "abs_tol", NULL}; + static const char * const _keywords[] = {"a", "b", "rel_tol", "abs_tol", NULL}; + static _PyArg_Parser _parser = {"DD|$dd:isclose", _keywords, 0}; Py_complex a; Py_complex b; double rel_tol = 1e-09; double abs_tol = 0.0; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "DD|$dd:isclose", _keywords, - &a, &b, &rel_tol, &abs_tol)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &a, &b, &rel_tol, &abs_tol)) { goto exit; + } _return_value = cmath_isclose_impl(module, a, b, rel_tol, abs_tol); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: return return_value; } -/*[clinic end generated code: output=732194029b7fb1e7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=978f59702b41655f input=a9049054013a1b77]*/ diff --git a/Modules/clinic/fcntlmodule.c.h b/Modules/clinic/fcntlmodule.c.h index 67660eb..84a004b 100644 --- a/Modules/clinic/fcntlmodule.c.h +++ b/Modules/clinic/fcntlmodule.c.h @@ -33,8 +33,9 @@ fcntl_fcntl(PyObject *module, PyObject *args) PyObject *arg = NULL; if (!PyArg_ParseTuple(args, "O&i|O:fcntl", - conv_descriptor, &fd, &code, &arg)) + conv_descriptor, &fd, &code, &arg)) { goto exit; + } return_value = fcntl_fcntl_impl(module, fd, code, arg); exit: @@ -91,8 +92,9 @@ fcntl_ioctl(PyObject *module, PyObject *args) int mutate_arg = 1; if (!PyArg_ParseTuple(args, "O&I|Op:ioctl", - conv_descriptor, &fd, &code, &ob_arg, &mutate_arg)) + conv_descriptor, &fd, &code, &ob_arg, &mutate_arg)) { goto exit; + } return_value = fcntl_ioctl_impl(module, fd, code, ob_arg, mutate_arg); exit: @@ -122,8 +124,9 @@ fcntl_flock(PyObject *module, PyObject *args) int code; if (!PyArg_ParseTuple(args, "O&i:flock", - conv_descriptor, &fd, &code)) + conv_descriptor, &fd, &code)) { goto exit; + } return_value = fcntl_flock_impl(module, fd, code); exit: @@ -175,11 +178,12 @@ fcntl_lockf(PyObject *module, PyObject *args) int whence = 0; if (!PyArg_ParseTuple(args, "O&i|OOi:lockf", - conv_descriptor, &fd, &code, &lenobj, &startobj, &whence)) + conv_descriptor, &fd, &code, &lenobj, &startobj, &whence)) { goto exit; + } return_value = fcntl_lockf_impl(module, fd, code, lenobj, startobj, whence); exit: return return_value; } -/*[clinic end generated code: output=97b1306b864c01c8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=36cff76a8fb2c9a6 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/grpmodule.c.h b/Modules/clinic/grpmodule.c.h index 2c47a42..0282b4e 100644 --- a/Modules/clinic/grpmodule.c.h +++ b/Modules/clinic/grpmodule.c.h @@ -11,21 +11,23 @@ PyDoc_STRVAR(grp_getgrgid__doc__, "If id is not valid, raise KeyError."); #define GRP_GETGRGID_METHODDEF \ - {"getgrgid", (PyCFunction)grp_getgrgid, METH_VARARGS|METH_KEYWORDS, grp_getgrgid__doc__}, + {"getgrgid", (PyCFunction)grp_getgrgid, METH_FASTCALL, grp_getgrgid__doc__}, static PyObject * grp_getgrgid_impl(PyObject *module, PyObject *id); static PyObject * -grp_getgrgid(PyObject *module, PyObject *args, PyObject *kwargs) +grp_getgrgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"id", NULL}; + static const char * const _keywords[] = {"id", NULL}; + static _PyArg_Parser _parser = {"O:getgrgid", _keywords, 0}; PyObject *id; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:getgrgid", _keywords, - &id)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &id)) { goto exit; + } return_value = grp_getgrgid_impl(module, id); exit: @@ -41,21 +43,23 @@ PyDoc_STRVAR(grp_getgrnam__doc__, "If name is not valid, raise KeyError."); #define GRP_GETGRNAM_METHODDEF \ - {"getgrnam", (PyCFunction)grp_getgrnam, METH_VARARGS|METH_KEYWORDS, grp_getgrnam__doc__}, + {"getgrnam", (PyCFunction)grp_getgrnam, METH_FASTCALL, grp_getgrnam__doc__}, static PyObject * grp_getgrnam_impl(PyObject *module, PyObject *name); static PyObject * -grp_getgrnam(PyObject *module, PyObject *args, PyObject *kwargs) +grp_getgrnam(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"name", NULL}; + static const char * const _keywords[] = {"name", NULL}; + static _PyArg_Parser _parser = {"U:getgrnam", _keywords, 0}; PyObject *name; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "U:getgrnam", _keywords, - &name)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &name)) { goto exit; + } return_value = grp_getgrnam_impl(module, name); exit: @@ -82,4 +86,4 @@ grp_getgrall(PyObject *module, PyObject *Py_UNUSED(ignored)) { return grp_getgrall_impl(module); } -/*[clinic end generated code: output=bee09feefc54a2cb input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d6417ae0a7298e0e input=a9049054013a1b77]*/ diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h index 0bd958a..a841fe5 100644 --- a/Modules/clinic/md5module.c.h +++ b/Modules/clinic/md5module.c.h @@ -72,24 +72,26 @@ PyDoc_STRVAR(_md5_md5__doc__, "Return a new MD5 hash object; optionally initialized with a string."); #define _MD5_MD5_METHODDEF \ - {"md5", (PyCFunction)_md5_md5, METH_VARARGS|METH_KEYWORDS, _md5_md5__doc__}, + {"md5", (PyCFunction)_md5_md5, METH_FASTCALL, _md5_md5__doc__}, static PyObject * _md5_md5_impl(PyObject *module, PyObject *string); static PyObject * -_md5_md5(PyObject *module, PyObject *args, PyObject *kwargs) +_md5_md5(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:md5", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:md5", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _md5_md5_impl(module, string); exit: return return_value; } -/*[clinic end generated code: output=4cd3cc96e35563d2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=54cd50db050f2589 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index b3521d8..f63a3be 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -27,23 +27,25 @@ PyDoc_STRVAR(os_stat__doc__, " an open file descriptor."); #define OS_STAT_METHODDEF \ - {"stat", (PyCFunction)os_stat, METH_VARARGS|METH_KEYWORDS, os_stat__doc__}, + {"stat", (PyCFunction)os_stat, METH_FASTCALL, os_stat__doc__}, static PyObject * os_stat_impl(PyObject *module, path_t *path, int dir_fd, int follow_symlinks); static PyObject * -os_stat(PyObject *module, PyObject *args, PyObject *kwargs) +os_stat(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "dir_fd", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "dir_fd", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&|$O&p:stat", _keywords, 0}; path_t path = PATH_T_INITIALIZE("stat", "path", 0, 1); int dir_fd = DEFAULT_DIR_FD; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&p:stat", _keywords, - path_converter, &path, FSTATAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, FSTATAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) { goto exit; + } return_value = os_stat_impl(module, &path, dir_fd, follow_symlinks); exit: @@ -63,22 +65,24 @@ PyDoc_STRVAR(os_lstat__doc__, "Equivalent to stat(path, follow_symlinks=False)."); #define OS_LSTAT_METHODDEF \ - {"lstat", (PyCFunction)os_lstat, METH_VARARGS|METH_KEYWORDS, os_lstat__doc__}, + {"lstat", (PyCFunction)os_lstat, METH_FASTCALL, os_lstat__doc__}, static PyObject * os_lstat_impl(PyObject *module, path_t *path, int dir_fd); static PyObject * -os_lstat(PyObject *module, PyObject *args, PyObject *kwargs) +os_lstat(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|$O&:lstat", _keywords, 0}; path_t path = PATH_T_INITIALIZE("lstat", "path", 0, 0); int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:lstat", _keywords, - path_converter, &path, FSTATAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, FSTATAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_lstat_impl(module, &path, dir_fd); exit: @@ -121,17 +125,18 @@ PyDoc_STRVAR(os_access__doc__, " has the specified access to the path."); #define OS_ACCESS_METHODDEF \ - {"access", (PyCFunction)os_access, METH_VARARGS|METH_KEYWORDS, os_access__doc__}, + {"access", (PyCFunction)os_access, METH_FASTCALL, os_access__doc__}, static int os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd, int effective_ids, int follow_symlinks); static PyObject * -os_access(PyObject *module, PyObject *args, PyObject *kwargs) +os_access(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&i|$O&pp:access", _keywords, 0}; path_t path = PATH_T_INITIALIZE("access", "path", 0, 0); int mode; int dir_fd = DEFAULT_DIR_FD; @@ -139,12 +144,14 @@ os_access(PyObject *module, PyObject *args, PyObject *kwargs) int follow_symlinks = 1; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&i|$O&pp:access", _keywords, - path_converter, &path, &mode, FACCESSAT_DIR_FD_CONVERTER, &dir_fd, &effective_ids, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode, FACCESSAT_DIR_FD_CONVERTER, &dir_fd, &effective_ids, &follow_symlinks)) { goto exit; + } _return_value = os_access_impl(module, &path, mode, dir_fd, effective_ids, follow_symlinks); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -178,11 +185,13 @@ os_ttyname(PyObject *module, PyObject *arg) int fd; char *_return_value; - if (!PyArg_Parse(arg, "i:ttyname", &fd)) + if (!PyArg_Parse(arg, "i:ttyname", &fd)) { goto exit; + } _return_value = os_ttyname_impl(module, fd); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyUnicode_DecodeFSDefault(_return_value); exit: @@ -224,21 +233,23 @@ PyDoc_STRVAR(os_chdir__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_CHDIR_METHODDEF \ - {"chdir", (PyCFunction)os_chdir, METH_VARARGS|METH_KEYWORDS, os_chdir__doc__}, + {"chdir", (PyCFunction)os_chdir, METH_FASTCALL, os_chdir__doc__}, static PyObject * os_chdir_impl(PyObject *module, path_t *path); static PyObject * -os_chdir(PyObject *module, PyObject *args, PyObject *kwargs) +os_chdir(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"O&:chdir", _keywords, 0}; path_t path = PATH_T_INITIALIZE("chdir", "path", 0, PATH_HAVE_FCHDIR); - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:chdir", _keywords, - path_converter, &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path)) { goto exit; + } return_value = os_chdir_impl(module, &path); exit: @@ -260,21 +271,23 @@ PyDoc_STRVAR(os_fchdir__doc__, "Equivalent to os.chdir(fd)."); #define OS_FCHDIR_METHODDEF \ - {"fchdir", (PyCFunction)os_fchdir, METH_VARARGS|METH_KEYWORDS, os_fchdir__doc__}, + {"fchdir", (PyCFunction)os_fchdir, METH_FASTCALL, os_fchdir__doc__}, static PyObject * os_fchdir_impl(PyObject *module, int fd); static PyObject * -os_fchdir(PyObject *module, PyObject *args, PyObject *kwargs) +os_fchdir(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"O&:fchdir", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:fchdir", _keywords, - fildes_converter, &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + fildes_converter, &fd)) { goto exit; + } return_value = os_fchdir_impl(module, fd); exit: @@ -310,25 +323,27 @@ PyDoc_STRVAR(os_chmod__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_CHMOD_METHODDEF \ - {"chmod", (PyCFunction)os_chmod, METH_VARARGS|METH_KEYWORDS, os_chmod__doc__}, + {"chmod", (PyCFunction)os_chmod, METH_FASTCALL, os_chmod__doc__}, static PyObject * os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd, int follow_symlinks); static PyObject * -os_chmod(PyObject *module, PyObject *args, PyObject *kwargs) +os_chmod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", "dir_fd", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "mode", "dir_fd", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&i|$O&p:chmod", _keywords, 0}; path_t path = PATH_T_INITIALIZE("chmod", "path", 0, PATH_HAVE_FCHMOD); int mode; int dir_fd = DEFAULT_DIR_FD; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&i|$O&p:chmod", _keywords, - path_converter, &path, &mode, FCHMODAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode, FCHMODAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) { goto exit; + } return_value = os_chmod_impl(module, &path, mode, dir_fd, follow_symlinks); exit: @@ -349,22 +364,24 @@ PyDoc_STRVAR(os_fchmod__doc__, "Equivalent to os.chmod(fd, mode)."); #define OS_FCHMOD_METHODDEF \ - {"fchmod", (PyCFunction)os_fchmod, METH_VARARGS|METH_KEYWORDS, os_fchmod__doc__}, + {"fchmod", (PyCFunction)os_fchmod, METH_FASTCALL, os_fchmod__doc__}, static PyObject * os_fchmod_impl(PyObject *module, int fd, int mode); static PyObject * -os_fchmod(PyObject *module, PyObject *args, PyObject *kwargs) +os_fchmod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", "mode", NULL}; + static const char * const _keywords[] = {"fd", "mode", NULL}; + static _PyArg_Parser _parser = {"ii:fchmod", _keywords, 0}; int fd; int mode; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:fchmod", _keywords, - &fd, &mode)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd, &mode)) { goto exit; + } return_value = os_fchmod_impl(module, fd, mode); exit: @@ -385,22 +402,24 @@ PyDoc_STRVAR(os_lchmod__doc__, "Equivalent to chmod(path, mode, follow_symlinks=False).\""); #define OS_LCHMOD_METHODDEF \ - {"lchmod", (PyCFunction)os_lchmod, METH_VARARGS|METH_KEYWORDS, os_lchmod__doc__}, + {"lchmod", (PyCFunction)os_lchmod, METH_FASTCALL, os_lchmod__doc__}, static PyObject * os_lchmod_impl(PyObject *module, path_t *path, int mode); static PyObject * -os_lchmod(PyObject *module, PyObject *args, PyObject *kwargs) +os_lchmod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", NULL}; + static const char * const _keywords[] = {"path", "mode", NULL}; + static _PyArg_Parser _parser = {"O&i:lchmod", _keywords, 0}; path_t path = PATH_T_INITIALIZE("lchmod", "path", 0, 0); int mode; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&i:lchmod", _keywords, - path_converter, &path, &mode)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode)) { goto exit; + } return_value = os_lchmod_impl(module, &path, mode); exit: @@ -427,24 +446,26 @@ PyDoc_STRVAR(os_chflags__doc__, "unavailable, using it will raise a NotImplementedError."); #define OS_CHFLAGS_METHODDEF \ - {"chflags", (PyCFunction)os_chflags, METH_VARARGS|METH_KEYWORDS, os_chflags__doc__}, + {"chflags", (PyCFunction)os_chflags, METH_FASTCALL, os_chflags__doc__}, static PyObject * os_chflags_impl(PyObject *module, path_t *path, unsigned long flags, int follow_symlinks); static PyObject * -os_chflags(PyObject *module, PyObject *args, PyObject *kwargs) +os_chflags(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "flags", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "flags", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&k|p:chflags", _keywords, 0}; path_t path = PATH_T_INITIALIZE("chflags", "path", 0, 0); unsigned long flags; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&k|p:chflags", _keywords, - path_converter, &path, &flags, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &flags, &follow_symlinks)) { goto exit; + } return_value = os_chflags_impl(module, &path, flags, follow_symlinks); exit: @@ -468,22 +489,24 @@ PyDoc_STRVAR(os_lchflags__doc__, "Equivalent to chflags(path, flags, follow_symlinks=False)."); #define OS_LCHFLAGS_METHODDEF \ - {"lchflags", (PyCFunction)os_lchflags, METH_VARARGS|METH_KEYWORDS, os_lchflags__doc__}, + {"lchflags", (PyCFunction)os_lchflags, METH_FASTCALL, os_lchflags__doc__}, static PyObject * os_lchflags_impl(PyObject *module, path_t *path, unsigned long flags); static PyObject * -os_lchflags(PyObject *module, PyObject *args, PyObject *kwargs) +os_lchflags(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "flags", NULL}; + static const char * const _keywords[] = {"path", "flags", NULL}; + static _PyArg_Parser _parser = {"O&k:lchflags", _keywords, 0}; path_t path = PATH_T_INITIALIZE("lchflags", "path", 0, 0); unsigned long flags; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&k:lchflags", _keywords, - path_converter, &path, &flags)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &flags)) { goto exit; + } return_value = os_lchflags_impl(module, &path, flags); exit: @@ -504,21 +527,23 @@ PyDoc_STRVAR(os_chroot__doc__, "Change root directory to path."); #define OS_CHROOT_METHODDEF \ - {"chroot", (PyCFunction)os_chroot, METH_VARARGS|METH_KEYWORDS, os_chroot__doc__}, + {"chroot", (PyCFunction)os_chroot, METH_FASTCALL, os_chroot__doc__}, static PyObject * os_chroot_impl(PyObject *module, path_t *path); static PyObject * -os_chroot(PyObject *module, PyObject *args, PyObject *kwargs) +os_chroot(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"O&:chroot", _keywords, 0}; path_t path = PATH_T_INITIALIZE("chroot", "path", 0, 0); - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:chroot", _keywords, - path_converter, &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path)) { goto exit; + } return_value = os_chroot_impl(module, &path); exit: @@ -539,21 +564,23 @@ PyDoc_STRVAR(os_fsync__doc__, "Force write of fd to disk."); #define OS_FSYNC_METHODDEF \ - {"fsync", (PyCFunction)os_fsync, METH_VARARGS|METH_KEYWORDS, os_fsync__doc__}, + {"fsync", (PyCFunction)os_fsync, METH_FASTCALL, os_fsync__doc__}, static PyObject * os_fsync_impl(PyObject *module, int fd); static PyObject * -os_fsync(PyObject *module, PyObject *args, PyObject *kwargs) +os_fsync(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"O&:fsync", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:fsync", _keywords, - fildes_converter, &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + fildes_converter, &fd)) { goto exit; + } return_value = os_fsync_impl(module, fd); exit: @@ -593,21 +620,23 @@ PyDoc_STRVAR(os_fdatasync__doc__, "Force write of fd to disk without forcing update of metadata."); #define OS_FDATASYNC_METHODDEF \ - {"fdatasync", (PyCFunction)os_fdatasync, METH_VARARGS|METH_KEYWORDS, os_fdatasync__doc__}, + {"fdatasync", (PyCFunction)os_fdatasync, METH_FASTCALL, os_fdatasync__doc__}, static PyObject * os_fdatasync_impl(PyObject *module, int fd); static PyObject * -os_fdatasync(PyObject *module, PyObject *args, PyObject *kwargs) +os_fdatasync(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"O&:fdatasync", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:fdatasync", _keywords, - fildes_converter, &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + fildes_converter, &fd)) { goto exit; + } return_value = os_fdatasync_impl(module, fd); exit: @@ -649,26 +678,28 @@ PyDoc_STRVAR(os_chown__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_CHOWN_METHODDEF \ - {"chown", (PyCFunction)os_chown, METH_VARARGS|METH_KEYWORDS, os_chown__doc__}, + {"chown", (PyCFunction)os_chown, METH_FASTCALL, os_chown__doc__}, static PyObject * os_chown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid, int dir_fd, int follow_symlinks); static PyObject * -os_chown(PyObject *module, PyObject *args, PyObject *kwargs) +os_chown(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "uid", "gid", "dir_fd", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "uid", "gid", "dir_fd", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&O&O&|$O&p:chown", _keywords, 0}; path_t path = PATH_T_INITIALIZE("chown", "path", 0, PATH_HAVE_FCHOWN); uid_t uid; gid_t gid; int dir_fd = DEFAULT_DIR_FD; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&O&|$O&p:chown", _keywords, - path_converter, &path, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid, FCHOWNAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid, FCHOWNAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) { goto exit; + } return_value = os_chown_impl(module, &path, uid, gid, dir_fd, follow_symlinks); exit: @@ -691,23 +722,25 @@ PyDoc_STRVAR(os_fchown__doc__, "Equivalent to os.chown(fd, uid, gid)."); #define OS_FCHOWN_METHODDEF \ - {"fchown", (PyCFunction)os_fchown, METH_VARARGS|METH_KEYWORDS, os_fchown__doc__}, + {"fchown", (PyCFunction)os_fchown, METH_FASTCALL, os_fchown__doc__}, static PyObject * os_fchown_impl(PyObject *module, int fd, uid_t uid, gid_t gid); static PyObject * -os_fchown(PyObject *module, PyObject *args, PyObject *kwargs) +os_fchown(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", "uid", "gid", NULL}; + static const char * const _keywords[] = {"fd", "uid", "gid", NULL}; + static _PyArg_Parser _parser = {"iO&O&:fchown", _keywords, 0}; int fd; uid_t uid; gid_t gid; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iO&O&:fchown", _keywords, - &fd, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid)) { goto exit; + } return_value = os_fchown_impl(module, fd, uid, gid); exit: @@ -728,23 +761,25 @@ PyDoc_STRVAR(os_lchown__doc__, "Equivalent to os.chown(path, uid, gid, follow_symlinks=False)."); #define OS_LCHOWN_METHODDEF \ - {"lchown", (PyCFunction)os_lchown, METH_VARARGS|METH_KEYWORDS, os_lchown__doc__}, + {"lchown", (PyCFunction)os_lchown, METH_FASTCALL, os_lchown__doc__}, static PyObject * os_lchown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid); static PyObject * -os_lchown(PyObject *module, PyObject *args, PyObject *kwargs) +os_lchown(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "uid", "gid", NULL}; + static const char * const _keywords[] = {"path", "uid", "gid", NULL}; + static _PyArg_Parser _parser = {"O&O&O&:lchown", _keywords, 0}; path_t path = PATH_T_INITIALIZE("lchown", "path", 0, 0); uid_t uid; gid_t gid; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&O&:lchown", _keywords, - path_converter, &path, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, _Py_Uid_Converter, &uid, _Py_Gid_Converter, &gid)) { goto exit; + } return_value = os_lchown_impl(module, &path, uid, gid); exit: @@ -812,26 +847,28 @@ PyDoc_STRVAR(os_link__doc__, " NotImplementedError."); #define OS_LINK_METHODDEF \ - {"link", (PyCFunction)os_link, METH_VARARGS|METH_KEYWORDS, os_link__doc__}, + {"link", (PyCFunction)os_link, METH_FASTCALL, os_link__doc__}, static PyObject * os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int follow_symlinks); static PyObject * -os_link(PyObject *module, PyObject *args, PyObject *kwargs) +os_link(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&O&|$O&O&p:link", _keywords, 0}; path_t src = PATH_T_INITIALIZE("link", "src", 0, 0); path_t dst = PATH_T_INITIALIZE("link", "dst", 0, 0); int src_dir_fd = DEFAULT_DIR_FD; int dst_dir_fd = DEFAULT_DIR_FD; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$O&O&p:link", _keywords, - path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd, &follow_symlinks)) { goto exit; + } return_value = os_link_impl(module, &src, &dst, src_dir_fd, dst_dir_fd, follow_symlinks); exit: @@ -863,21 +900,23 @@ PyDoc_STRVAR(os_listdir__doc__, "entries \'.\' and \'..\' even if they are present in the directory."); #define OS_LISTDIR_METHODDEF \ - {"listdir", (PyCFunction)os_listdir, METH_VARARGS|METH_KEYWORDS, os_listdir__doc__}, + {"listdir", (PyCFunction)os_listdir, METH_FASTCALL, os_listdir__doc__}, static PyObject * os_listdir_impl(PyObject *module, path_t *path); static PyObject * -os_listdir(PyObject *module, PyObject *args, PyObject *kwargs) +os_listdir(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"|O&:listdir", _keywords, 0}; path_t path = PATH_T_INITIALIZE("listdir", "path", 1, PATH_HAVE_FDOPENDIR); - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O&:listdir", _keywords, - path_converter, &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path)) { goto exit; + } return_value = os_listdir_impl(module, &path); exit: @@ -906,8 +945,9 @@ os__getfullpathname(PyObject *module, PyObject *arg) PyObject *return_value = NULL; path_t path = PATH_T_INITIALIZE("_getfullpathname", "path", 0, 0); - if (!PyArg_Parse(arg, "O&:_getfullpathname", path_converter, &path)) + if (!PyArg_Parse(arg, "O&:_getfullpathname", path_converter, &path)) { goto exit; + } return_value = os__getfullpathname_impl(module, &path); exit: @@ -939,8 +979,9 @@ os__getfinalpathname(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *path; - if (!PyArg_Parse(arg, "U:_getfinalpathname", &path)) + if (!PyArg_Parse(arg, "U:_getfinalpathname", &path)) { goto exit; + } return_value = os__getfinalpathname_impl(module, path); exit: @@ -969,8 +1010,9 @@ os__isdir(PyObject *module, PyObject *arg) PyObject *return_value = NULL; path_t path = PATH_T_INITIALIZE("_isdir", "path", 0, 0); - if (!PyArg_Parse(arg, "O&:_isdir", path_converter, &path)) + if (!PyArg_Parse(arg, "O&:_isdir", path_converter, &path)) { goto exit; + } return_value = os__isdir_impl(module, &path); exit: @@ -991,21 +1033,23 @@ PyDoc_STRVAR(os__getvolumepathname__doc__, "A helper function for ismount on Win32."); #define OS__GETVOLUMEPATHNAME_METHODDEF \ - {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_VARARGS|METH_KEYWORDS, os__getvolumepathname__doc__}, + {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_FASTCALL, os__getvolumepathname__doc__}, static PyObject * os__getvolumepathname_impl(PyObject *module, PyObject *path); static PyObject * -os__getvolumepathname(PyObject *module, PyObject *args, PyObject *kwargs) +os__getvolumepathname(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"U:_getvolumepathname", _keywords, 0}; PyObject *path; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "U:_getvolumepathname", _keywords, - &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path)) { goto exit; + } return_value = os__getvolumepathname_impl(module, path); exit: @@ -1028,23 +1072,25 @@ PyDoc_STRVAR(os_mkdir__doc__, "The mode argument is ignored on Windows."); #define OS_MKDIR_METHODDEF \ - {"mkdir", (PyCFunction)os_mkdir, METH_VARARGS|METH_KEYWORDS, os_mkdir__doc__}, + {"mkdir", (PyCFunction)os_mkdir, METH_FASTCALL, os_mkdir__doc__}, static PyObject * os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd); static PyObject * -os_mkdir(PyObject *module, PyObject *args, PyObject *kwargs) +os_mkdir(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "mode", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|i$O&:mkdir", _keywords, 0}; path_t path = PATH_T_INITIALIZE("mkdir", "path", 0, 0); int mode = 511; int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|i$O&:mkdir", _keywords, - path_converter, &path, &mode, MKDIRAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode, MKDIRAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_mkdir_impl(module, &path, mode, dir_fd); exit: @@ -1074,8 +1120,9 @@ os_nice(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int increment; - if (!PyArg_Parse(arg, "i:nice", &increment)) + if (!PyArg_Parse(arg, "i:nice", &increment)) { goto exit; + } return_value = os_nice_impl(module, increment); exit: @@ -1093,22 +1140,24 @@ PyDoc_STRVAR(os_getpriority__doc__, "Return program scheduling priority."); #define OS_GETPRIORITY_METHODDEF \ - {"getpriority", (PyCFunction)os_getpriority, METH_VARARGS|METH_KEYWORDS, os_getpriority__doc__}, + {"getpriority", (PyCFunction)os_getpriority, METH_FASTCALL, os_getpriority__doc__}, static PyObject * os_getpriority_impl(PyObject *module, int which, int who); static PyObject * -os_getpriority(PyObject *module, PyObject *args, PyObject *kwargs) +os_getpriority(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"which", "who", NULL}; + static const char * const _keywords[] = {"which", "who", NULL}; + static _PyArg_Parser _parser = {"ii:getpriority", _keywords, 0}; int which; int who; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:getpriority", _keywords, - &which, &who)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &which, &who)) { goto exit; + } return_value = os_getpriority_impl(module, which, who); exit: @@ -1126,23 +1175,25 @@ PyDoc_STRVAR(os_setpriority__doc__, "Set program scheduling priority."); #define OS_SETPRIORITY_METHODDEF \ - {"setpriority", (PyCFunction)os_setpriority, METH_VARARGS|METH_KEYWORDS, os_setpriority__doc__}, + {"setpriority", (PyCFunction)os_setpriority, METH_FASTCALL, os_setpriority__doc__}, static PyObject * os_setpriority_impl(PyObject *module, int which, int who, int priority); static PyObject * -os_setpriority(PyObject *module, PyObject *args, PyObject *kwargs) +os_setpriority(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"which", "who", "priority", NULL}; + static const char * const _keywords[] = {"which", "who", "priority", NULL}; + static _PyArg_Parser _parser = {"iii:setpriority", _keywords, 0}; int which; int who; int priority; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii:setpriority", _keywords, - &which, &who, &priority)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &which, &who, &priority)) { goto exit; + } return_value = os_setpriority_impl(module, which, who, priority); exit: @@ -1164,25 +1215,27 @@ PyDoc_STRVAR(os_rename__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_RENAME_METHODDEF \ - {"rename", (PyCFunction)os_rename, METH_VARARGS|METH_KEYWORDS, os_rename__doc__}, + {"rename", (PyCFunction)os_rename, METH_FASTCALL, os_rename__doc__}, static PyObject * os_rename_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd); static PyObject * -os_rename(PyObject *module, PyObject *args, PyObject *kwargs) +os_rename(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", NULL}; + static const char * const _keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&O&|$O&O&:rename", _keywords, 0}; path_t src = PATH_T_INITIALIZE("rename", "src", 0, 0); path_t dst = PATH_T_INITIALIZE("rename", "dst", 0, 0); int src_dir_fd = DEFAULT_DIR_FD; int dst_dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$O&O&:rename", _keywords, - path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd)) { goto exit; + } return_value = os_rename_impl(module, &src, &dst, src_dir_fd, dst_dir_fd); exit: @@ -1207,25 +1260,27 @@ PyDoc_STRVAR(os_replace__doc__, " If they are unavailable, using them will raise a NotImplementedError.\""); #define OS_REPLACE_METHODDEF \ - {"replace", (PyCFunction)os_replace, METH_VARARGS|METH_KEYWORDS, os_replace__doc__}, + {"replace", (PyCFunction)os_replace, METH_FASTCALL, os_replace__doc__}, static PyObject * os_replace_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd); static PyObject * -os_replace(PyObject *module, PyObject *args, PyObject *kwargs) +os_replace(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", NULL}; + static const char * const _keywords[] = {"src", "dst", "src_dir_fd", "dst_dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&O&|$O&O&:replace", _keywords, 0}; path_t src = PATH_T_INITIALIZE("replace", "src", 0, 0); path_t dst = PATH_T_INITIALIZE("replace", "dst", 0, 0); int src_dir_fd = DEFAULT_DIR_FD; int dst_dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$O&O&:replace", _keywords, - path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &src, path_converter, &dst, dir_fd_converter, &src_dir_fd, dir_fd_converter, &dst_dir_fd)) { goto exit; + } return_value = os_replace_impl(module, &src, &dst, src_dir_fd, dst_dir_fd); exit: @@ -1249,22 +1304,24 @@ PyDoc_STRVAR(os_rmdir__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_RMDIR_METHODDEF \ - {"rmdir", (PyCFunction)os_rmdir, METH_VARARGS|METH_KEYWORDS, os_rmdir__doc__}, + {"rmdir", (PyCFunction)os_rmdir, METH_FASTCALL, os_rmdir__doc__}, static PyObject * os_rmdir_impl(PyObject *module, path_t *path, int dir_fd); static PyObject * -os_rmdir(PyObject *module, PyObject *args, PyObject *kwargs) +os_rmdir(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|$O&:rmdir", _keywords, 0}; path_t path = PATH_T_INITIALIZE("rmdir", "path", 0, 0); int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:rmdir", _keywords, - path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_rmdir_impl(module, &path, dir_fd); exit: @@ -1283,25 +1340,28 @@ PyDoc_STRVAR(os_system__doc__, "Execute the command in a subshell."); #define OS_SYSTEM_METHODDEF \ - {"system", (PyCFunction)os_system, METH_VARARGS|METH_KEYWORDS, os_system__doc__}, + {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__}, static long os_system_impl(PyObject *module, Py_UNICODE *command); static PyObject * -os_system(PyObject *module, PyObject *args, PyObject *kwargs) +os_system(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"command", NULL}; + static const char * const _keywords[] = {"command", NULL}; + static _PyArg_Parser _parser = {"u:system", _keywords, 0}; Py_UNICODE *command; long _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "u:system", _keywords, - &command)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &command)) { goto exit; + } _return_value = os_system_impl(module, command); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -1319,25 +1379,28 @@ PyDoc_STRVAR(os_system__doc__, "Execute the command in a subshell."); #define OS_SYSTEM_METHODDEF \ - {"system", (PyCFunction)os_system, METH_VARARGS|METH_KEYWORDS, os_system__doc__}, + {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__}, static long os_system_impl(PyObject *module, PyObject *command); static PyObject * -os_system(PyObject *module, PyObject *args, PyObject *kwargs) +os_system(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"command", NULL}; + static const char * const _keywords[] = {"command", NULL}; + static _PyArg_Parser _parser = {"O&:system", _keywords, 0}; PyObject *command = NULL; long _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:system", _keywords, - PyUnicode_FSConverter, &command)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + PyUnicode_FSConverter, &command)) { goto exit; + } _return_value = os_system_impl(module, command); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -1367,8 +1430,9 @@ os_umask(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int mask; - if (!PyArg_Parse(arg, "i:umask", &mask)) + if (!PyArg_Parse(arg, "i:umask", &mask)) { goto exit; + } return_value = os_umask_impl(module, mask); exit: @@ -1387,22 +1451,24 @@ PyDoc_STRVAR(os_unlink__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_UNLINK_METHODDEF \ - {"unlink", (PyCFunction)os_unlink, METH_VARARGS|METH_KEYWORDS, os_unlink__doc__}, + {"unlink", (PyCFunction)os_unlink, METH_FASTCALL, os_unlink__doc__}, static PyObject * os_unlink_impl(PyObject *module, path_t *path, int dir_fd); static PyObject * -os_unlink(PyObject *module, PyObject *args, PyObject *kwargs) +os_unlink(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|$O&:unlink", _keywords, 0}; path_t path = PATH_T_INITIALIZE("unlink", "path", 0, 0); int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:unlink", _keywords, - path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_unlink_impl(module, &path, dir_fd); exit: @@ -1424,22 +1490,24 @@ PyDoc_STRVAR(os_remove__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_REMOVE_METHODDEF \ - {"remove", (PyCFunction)os_remove, METH_VARARGS|METH_KEYWORDS, os_remove__doc__}, + {"remove", (PyCFunction)os_remove, METH_FASTCALL, os_remove__doc__}, static PyObject * os_remove_impl(PyObject *module, path_t *path, int dir_fd); static PyObject * -os_remove(PyObject *module, PyObject *args, PyObject *kwargs) +os_remove(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|$O&:remove", _keywords, 0}; path_t path = PATH_T_INITIALIZE("remove", "path", 0, 0); int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&:remove", _keywords, - path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, UNLINKAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_remove_impl(module, &path, dir_fd); exit: @@ -1504,26 +1572,28 @@ PyDoc_STRVAR(os_utime__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_UTIME_METHODDEF \ - {"utime", (PyCFunction)os_utime, METH_VARARGS|METH_KEYWORDS, os_utime__doc__}, + {"utime", (PyCFunction)os_utime, METH_FASTCALL, os_utime__doc__}, static PyObject * os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, int dir_fd, int follow_symlinks); static PyObject * -os_utime(PyObject *module, PyObject *args, PyObject *kwargs) +os_utime(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "times", "ns", "dir_fd", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "times", "ns", "dir_fd", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&|O$OO&p:utime", _keywords, 0}; path_t path = PATH_T_INITIALIZE("utime", "path", 0, PATH_UTIME_HAVE_FD); PyObject *times = NULL; PyObject *ns = NULL; int dir_fd = DEFAULT_DIR_FD; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|O$OO&p:utime", _keywords, - path_converter, &path, ×, &ns, FUTIMENSAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, ×, &ns, FUTIMENSAT_DIR_FD_CONVERTER, &dir_fd, &follow_symlinks)) { goto exit; + } return_value = os_utime_impl(module, &path, times, ns, dir_fd, follow_symlinks); exit: @@ -1540,21 +1610,23 @@ PyDoc_STRVAR(os__exit__doc__, "Exit to the system with specified status, without normal exit processing."); #define OS__EXIT_METHODDEF \ - {"_exit", (PyCFunction)os__exit, METH_VARARGS|METH_KEYWORDS, os__exit__doc__}, + {"_exit", (PyCFunction)os__exit, METH_FASTCALL, os__exit__doc__}, static PyObject * os__exit_impl(PyObject *module, int status); static PyObject * -os__exit(PyObject *module, PyObject *args, PyObject *kwargs) +os__exit(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:_exit", _keywords, 0}; int status; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:_exit", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } return_value = os__exit_impl(module, status); exit: @@ -1578,23 +1650,24 @@ PyDoc_STRVAR(os_execv__doc__, {"execv", (PyCFunction)os_execv, METH_VARARGS, os_execv__doc__}, static PyObject * -os_execv_impl(PyObject *module, PyObject *path, PyObject *argv); +os_execv_impl(PyObject *module, path_t *path, PyObject *argv); static PyObject * os_execv(PyObject *module, PyObject *args) { PyObject *return_value = NULL; - PyObject *path = NULL; + path_t path = PATH_T_INITIALIZE("execv", "path", 0, 0); PyObject *argv; if (!PyArg_ParseTuple(args, "O&O:execv", - PyUnicode_FSConverter, &path, &argv)) + path_converter, &path, &argv)) { goto exit; - return_value = os_execv_impl(module, path, argv); + } + return_value = os_execv_impl(module, &path, argv); exit: /* Cleanup for path */ - Py_XDECREF(path); + path_cleanup(&path); return return_value; } @@ -1617,23 +1690,25 @@ PyDoc_STRVAR(os_execve__doc__, " Dictionary of strings mapping to strings."); #define OS_EXECVE_METHODDEF \ - {"execve", (PyCFunction)os_execve, METH_VARARGS|METH_KEYWORDS, os_execve__doc__}, + {"execve", (PyCFunction)os_execve, METH_FASTCALL, os_execve__doc__}, static PyObject * os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env); static PyObject * -os_execve(PyObject *module, PyObject *args, PyObject *kwargs) +os_execve(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "argv", "env", NULL}; + static const char * const _keywords[] = {"path", "argv", "env", NULL}; + static _PyArg_Parser _parser = {"O&OO:execve", _keywords, 0}; path_t path = PATH_T_INITIALIZE("execve", "path", 0, PATH_HAVE_FEXECVE); PyObject *argv; PyObject *env; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&OO:execve", _keywords, - path_converter, &path, &argv, &env)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &argv, &env)) { goto exit; + } return_value = os_execve_impl(module, &path, argv, env); exit: @@ -1645,7 +1720,7 @@ exit: #endif /* defined(HAVE_EXECV) */ -#if defined(HAVE_SPAWNV) +#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) PyDoc_STRVAR(os_spawnv__doc__, "spawnv($module, mode, path, argv, /)\n" @@ -1664,31 +1739,32 @@ PyDoc_STRVAR(os_spawnv__doc__, {"spawnv", (PyCFunction)os_spawnv, METH_VARARGS, os_spawnv__doc__}, static PyObject * -os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv); +os_spawnv_impl(PyObject *module, int mode, path_t *path, PyObject *argv); static PyObject * os_spawnv(PyObject *module, PyObject *args) { PyObject *return_value = NULL; int mode; - PyObject *path = NULL; + path_t path = PATH_T_INITIALIZE("spawnv", "path", 0, 0); PyObject *argv; if (!PyArg_ParseTuple(args, "iO&O:spawnv", - &mode, PyUnicode_FSConverter, &path, &argv)) + &mode, path_converter, &path, &argv)) { goto exit; - return_value = os_spawnv_impl(module, mode, path, argv); + } + return_value = os_spawnv_impl(module, mode, &path, argv); exit: /* Cleanup for path */ - Py_XDECREF(path); + path_cleanup(&path); return return_value; } -#endif /* defined(HAVE_SPAWNV) */ +#endif /* (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) */ -#if defined(HAVE_SPAWNV) +#if (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) PyDoc_STRVAR(os_spawnve__doc__, "spawnve($module, mode, path, argv, env, /)\n" @@ -1709,7 +1785,7 @@ PyDoc_STRVAR(os_spawnve__doc__, {"spawnve", (PyCFunction)os_spawnve, METH_VARARGS, os_spawnve__doc__}, static PyObject * -os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, +os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv, PyObject *env); static PyObject * @@ -1717,23 +1793,24 @@ os_spawnve(PyObject *module, PyObject *args) { PyObject *return_value = NULL; int mode; - PyObject *path = NULL; + path_t path = PATH_T_INITIALIZE("spawnve", "path", 0, 0); PyObject *argv; PyObject *env; if (!PyArg_ParseTuple(args, "iO&OO:spawnve", - &mode, PyUnicode_FSConverter, &path, &argv, &env)) + &mode, path_converter, &path, &argv, &env)) { goto exit; - return_value = os_spawnve_impl(module, mode, path, argv, env); + } + return_value = os_spawnve_impl(module, mode, &path, argv, env); exit: /* Cleanup for path */ - Py_XDECREF(path); + path_cleanup(&path); return return_value; } -#endif /* defined(HAVE_SPAWNV) */ +#endif /* (defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV)) */ #if defined(HAVE_FORK1) @@ -1792,21 +1869,23 @@ PyDoc_STRVAR(os_sched_get_priority_max__doc__, "Get the maximum scheduling priority for policy."); #define OS_SCHED_GET_PRIORITY_MAX_METHODDEF \ - {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_VARARGS|METH_KEYWORDS, os_sched_get_priority_max__doc__}, + {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_FASTCALL, os_sched_get_priority_max__doc__}, static PyObject * os_sched_get_priority_max_impl(PyObject *module, int policy); static PyObject * -os_sched_get_priority_max(PyObject *module, PyObject *args, PyObject *kwargs) +os_sched_get_priority_max(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"policy", NULL}; + static const char * const _keywords[] = {"policy", NULL}; + static _PyArg_Parser _parser = {"i:sched_get_priority_max", _keywords, 0}; int policy; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:sched_get_priority_max", _keywords, - &policy)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &policy)) { goto exit; + } return_value = os_sched_get_priority_max_impl(module, policy); exit: @@ -1824,21 +1903,23 @@ PyDoc_STRVAR(os_sched_get_priority_min__doc__, "Get the minimum scheduling priority for policy."); #define OS_SCHED_GET_PRIORITY_MIN_METHODDEF \ - {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_VARARGS|METH_KEYWORDS, os_sched_get_priority_min__doc__}, + {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_FASTCALL, os_sched_get_priority_min__doc__}, static PyObject * os_sched_get_priority_min_impl(PyObject *module, int policy); static PyObject * -os_sched_get_priority_min(PyObject *module, PyObject *args, PyObject *kwargs) +os_sched_get_priority_min(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"policy", NULL}; + static const char * const _keywords[] = {"policy", NULL}; + static _PyArg_Parser _parser = {"i:sched_get_priority_min", _keywords, 0}; int policy; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:sched_get_priority_min", _keywords, - &policy)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &policy)) { goto exit; + } return_value = os_sched_get_priority_min_impl(module, policy); exit: @@ -1869,8 +1950,9 @@ os_sched_getscheduler(PyObject *module, PyObject *arg) PyObject *return_value = NULL; pid_t pid; - if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getscheduler", &pid)) + if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getscheduler", &pid)) { goto exit; + } return_value = os_sched_getscheduler_impl(module, pid); exit: @@ -1897,12 +1979,14 @@ static PyObject * os_sched_param(PyTypeObject *type, PyObject *args, PyObject *kwargs) { PyObject *return_value = NULL; - static char *_keywords[] = {"sched_priority", NULL}; + static const char * const _keywords[] = {"sched_priority", NULL}; + static _PyArg_Parser _parser = {"O:sched_param", _keywords, 0}; PyObject *sched_priority; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:sched_param", _keywords, - &sched_priority)) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + &sched_priority)) { goto exit; + } return_value = os_sched_param_impl(type, sched_priority); exit: @@ -1938,8 +2022,9 @@ os_sched_setscheduler(PyObject *module, PyObject *args) struct sched_param param; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "iO&:sched_setscheduler", - &pid, &policy, convert_sched_param, ¶m)) + &pid, &policy, convert_sched_param, ¶m)) { goto exit; + } return_value = os_sched_setscheduler_impl(module, pid, policy, ¶m); exit: @@ -1971,8 +2056,9 @@ os_sched_getparam(PyObject *module, PyObject *arg) PyObject *return_value = NULL; pid_t pid; - if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getparam", &pid)) + if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getparam", &pid)) { goto exit; + } return_value = os_sched_getparam_impl(module, pid); exit: @@ -2007,8 +2093,9 @@ os_sched_setparam(PyObject *module, PyObject *args) struct sched_param param; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "O&:sched_setparam", - &pid, convert_sched_param, ¶m)) + &pid, convert_sched_param, ¶m)) { goto exit; + } return_value = os_sched_setparam_impl(module, pid, ¶m); exit: @@ -2040,11 +2127,13 @@ os_sched_rr_get_interval(PyObject *module, PyObject *arg) pid_t pid; double _return_value; - if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_rr_get_interval", &pid)) + if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_rr_get_interval", &pid)) { goto exit; + } _return_value = os_sched_rr_get_interval_impl(module, pid); - if ((_return_value == -1.0) && PyErr_Occurred()) + if ((_return_value == -1.0) && PyErr_Occurred()) { goto exit; + } return_value = PyFloat_FromDouble(_return_value); exit: @@ -2099,8 +2188,9 @@ os_sched_setaffinity(PyObject *module, PyObject *args) PyObject *mask; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "O:sched_setaffinity", - &pid, &mask)) + &pid, &mask)) { goto exit; + } return_value = os_sched_setaffinity_impl(module, pid, mask); exit: @@ -2115,7 +2205,7 @@ PyDoc_STRVAR(os_sched_getaffinity__doc__, "sched_getaffinity($module, pid, /)\n" "--\n" "\n" -"Return the affinity of the process identified by pid.\n" +"Return the affinity of the process identified by pid (or the current process if zero).\n" "\n" "The affinity is returned as a set of CPU identifiers."); @@ -2131,8 +2221,9 @@ os_sched_getaffinity(PyObject *module, PyObject *arg) PyObject *return_value = NULL; pid_t pid; - if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getaffinity", &pid)) + if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":sched_getaffinity", &pid)) { goto exit; + } return_value = os_sched_getaffinity_impl(module, pid); exit: @@ -2259,6 +2350,8 @@ os_getgid(PyObject *module, PyObject *Py_UNUSED(ignored)) #endif /* defined(HAVE_GETGID) */ +#if defined(HAVE_GETPID) + PyDoc_STRVAR(os_getpid__doc__, "getpid($module, /)\n" "--\n" @@ -2277,6 +2370,8 @@ os_getpid(PyObject *module, PyObject *Py_UNUSED(ignored)) return os_getpid_impl(module); } +#endif /* defined(HAVE_GETPID) */ + #if defined(HAVE_GETGROUPS) PyDoc_STRVAR(os_getgroups__doc__, @@ -2308,21 +2403,23 @@ PyDoc_STRVAR(os_getpgid__doc__, "Call the system call getpgid(), and return the result."); #define OS_GETPGID_METHODDEF \ - {"getpgid", (PyCFunction)os_getpgid, METH_VARARGS|METH_KEYWORDS, os_getpgid__doc__}, + {"getpgid", (PyCFunction)os_getpgid, METH_FASTCALL, os_getpgid__doc__}, static PyObject * os_getpgid_impl(PyObject *module, pid_t pid); static PyObject * -os_getpgid(PyObject *module, PyObject *args, PyObject *kwargs) +os_getpgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"pid", NULL}; + static const char * const _keywords[] = {"pid", NULL}; + static _PyArg_Parser _parser = {"" _Py_PARSE_PID ":getpgid", _keywords, 0}; pid_t pid; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" _Py_PARSE_PID ":getpgid", _keywords, - &pid)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &pid)) { goto exit; + } return_value = os_getpgid_impl(module, pid); exit: @@ -2466,8 +2563,9 @@ os_kill(PyObject *module, PyObject *args) Py_ssize_t signal; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "n:kill", - &pid, &signal)) + &pid, &signal)) { goto exit; + } return_value = os_kill_impl(module, pid, signal); exit: @@ -2498,8 +2596,9 @@ os_killpg(PyObject *module, PyObject *args) int signal; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "i:killpg", - &pgid, &signal)) + &pgid, &signal)) { goto exit; + } return_value = os_killpg_impl(module, pgid, signal); exit: @@ -2528,8 +2627,9 @@ os_plock(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int op; - if (!PyArg_Parse(arg, "i:plock", &op)) + if (!PyArg_Parse(arg, "i:plock", &op)) { goto exit; + } return_value = os_plock_impl(module, op); exit: @@ -2558,8 +2658,9 @@ os_setuid(PyObject *module, PyObject *arg) PyObject *return_value = NULL; uid_t uid; - if (!PyArg_Parse(arg, "O&:setuid", _Py_Uid_Converter, &uid)) + if (!PyArg_Parse(arg, "O&:setuid", _Py_Uid_Converter, &uid)) { goto exit; + } return_value = os_setuid_impl(module, uid); exit: @@ -2588,8 +2689,9 @@ os_seteuid(PyObject *module, PyObject *arg) PyObject *return_value = NULL; uid_t euid; - if (!PyArg_Parse(arg, "O&:seteuid", _Py_Uid_Converter, &euid)) + if (!PyArg_Parse(arg, "O&:seteuid", _Py_Uid_Converter, &euid)) { goto exit; + } return_value = os_seteuid_impl(module, euid); exit: @@ -2618,8 +2720,9 @@ os_setegid(PyObject *module, PyObject *arg) PyObject *return_value = NULL; gid_t egid; - if (!PyArg_Parse(arg, "O&:setegid", _Py_Gid_Converter, &egid)) + if (!PyArg_Parse(arg, "O&:setegid", _Py_Gid_Converter, &egid)) { goto exit; + } return_value = os_setegid_impl(module, egid); exit: @@ -2650,8 +2753,9 @@ os_setreuid(PyObject *module, PyObject *args) uid_t euid; if (!PyArg_ParseTuple(args, "O&O&:setreuid", - _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid)) + _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid)) { goto exit; + } return_value = os_setreuid_impl(module, ruid, euid); exit: @@ -2682,8 +2786,9 @@ os_setregid(PyObject *module, PyObject *args) gid_t egid; if (!PyArg_ParseTuple(args, "O&O&:setregid", - _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid)) + _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid)) { goto exit; + } return_value = os_setregid_impl(module, rgid, egid); exit: @@ -2712,8 +2817,9 @@ os_setgid(PyObject *module, PyObject *arg) PyObject *return_value = NULL; gid_t gid; - if (!PyArg_Parse(arg, "O&:setgid", _Py_Gid_Converter, &gid)) + if (!PyArg_Parse(arg, "O&:setgid", _Py_Gid_Converter, &gid)) { goto exit; + } return_value = os_setgid_impl(module, gid); exit: @@ -2747,21 +2853,23 @@ PyDoc_STRVAR(os_wait3__doc__, " (pid, status, rusage)"); #define OS_WAIT3_METHODDEF \ - {"wait3", (PyCFunction)os_wait3, METH_VARARGS|METH_KEYWORDS, os_wait3__doc__}, + {"wait3", (PyCFunction)os_wait3, METH_FASTCALL, os_wait3__doc__}, static PyObject * os_wait3_impl(PyObject *module, int options); static PyObject * -os_wait3(PyObject *module, PyObject *args, PyObject *kwargs) +os_wait3(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"options", NULL}; + static const char * const _keywords[] = {"options", NULL}; + static _PyArg_Parser _parser = {"i:wait3", _keywords, 0}; int options; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:wait3", _keywords, - &options)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &options)) { goto exit; + } return_value = os_wait3_impl(module, options); exit: @@ -2782,22 +2890,24 @@ PyDoc_STRVAR(os_wait4__doc__, " (pid, status, rusage)"); #define OS_WAIT4_METHODDEF \ - {"wait4", (PyCFunction)os_wait4, METH_VARARGS|METH_KEYWORDS, os_wait4__doc__}, + {"wait4", (PyCFunction)os_wait4, METH_FASTCALL, os_wait4__doc__}, static PyObject * os_wait4_impl(PyObject *module, pid_t pid, int options); static PyObject * -os_wait4(PyObject *module, PyObject *args, PyObject *kwargs) +os_wait4(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"pid", "options", NULL}; + static const char * const _keywords[] = {"pid", "options", NULL}; + static _PyArg_Parser _parser = {"" _Py_PARSE_PID "i:wait4", _keywords, 0}; pid_t pid; int options; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "" _Py_PARSE_PID "i:wait4", _keywords, - &pid, &options)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &pid, &options)) { goto exit; + } return_value = os_wait4_impl(module, pid, options); exit: @@ -2840,8 +2950,9 @@ os_waitid(PyObject *module, PyObject *args) int options; if (!PyArg_ParseTuple(args, "i" _Py_PARSE_PID "i:waitid", - &idtype, &id, &options)) + &idtype, &id, &options)) { goto exit; + } return_value = os_waitid_impl(module, idtype, id, options); exit: @@ -2877,8 +2988,9 @@ os_waitpid(PyObject *module, PyObject *args) int options; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "i:waitpid", - &pid, &options)) + &pid, &options)) { goto exit; + } return_value = os_waitpid_impl(module, pid, options); exit: @@ -2904,18 +3016,19 @@ PyDoc_STRVAR(os_waitpid__doc__, {"waitpid", (PyCFunction)os_waitpid, METH_VARARGS, os_waitpid__doc__}, static PyObject * -os_waitpid_impl(PyObject *module, Py_intptr_t pid, int options); +os_waitpid_impl(PyObject *module, intptr_t pid, int options); static PyObject * os_waitpid(PyObject *module, PyObject *args) { PyObject *return_value = NULL; - Py_intptr_t pid; + intptr_t pid; int options; if (!PyArg_ParseTuple(args, "" _Py_PARSE_INTPTR "i:waitpid", - &pid, &options)) + &pid, &options)) { goto exit; + } return_value = os_waitpid_impl(module, pid, options); exit: @@ -2968,25 +3081,27 @@ PyDoc_STRVAR(os_symlink__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_SYMLINK_METHODDEF \ - {"symlink", (PyCFunction)os_symlink, METH_VARARGS|METH_KEYWORDS, os_symlink__doc__}, + {"symlink", (PyCFunction)os_symlink, METH_FASTCALL, os_symlink__doc__}, static PyObject * os_symlink_impl(PyObject *module, path_t *src, path_t *dst, int target_is_directory, int dir_fd); static PyObject * -os_symlink(PyObject *module, PyObject *args, PyObject *kwargs) +os_symlink(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"src", "dst", "target_is_directory", "dir_fd", NULL}; + static const char * const _keywords[] = {"src", "dst", "target_is_directory", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&O&|p$O&:symlink", _keywords, 0}; path_t src = PATH_T_INITIALIZE("symlink", "src", 0, 0); path_t dst = PATH_T_INITIALIZE("symlink", "dst", 0, 0); int target_is_directory = 0; int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|p$O&:symlink", _keywords, - path_converter, &src, path_converter, &dst, &target_is_directory, SYMLINKAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &src, path_converter, &dst, &target_is_directory, SYMLINKAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_symlink_impl(module, &src, &dst, target_is_directory, dir_fd); exit: @@ -3046,8 +3161,9 @@ os_getsid(PyObject *module, PyObject *arg) PyObject *return_value = NULL; pid_t pid; - if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":getsid", &pid)) + if (!PyArg_Parse(arg, "" _Py_PARSE_PID ":getsid", &pid)) { goto exit; + } return_value = os_getsid_impl(module, pid); exit: @@ -3100,8 +3216,9 @@ os_setpgid(PyObject *module, PyObject *args) pid_t pgrp; if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "" _Py_PARSE_PID ":setpgid", - &pid, &pgrp)) + &pid, &pgrp)) { goto exit; + } return_value = os_setpgid_impl(module, pid, pgrp); exit: @@ -3130,8 +3247,9 @@ os_tcgetpgrp(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int fd; - if (!PyArg_Parse(arg, "i:tcgetpgrp", &fd)) + if (!PyArg_Parse(arg, "i:tcgetpgrp", &fd)) { goto exit; + } return_value = os_tcgetpgrp_impl(module, fd); exit: @@ -3162,8 +3280,9 @@ os_tcsetpgrp(PyObject *module, PyObject *args) pid_t pgid; if (!PyArg_ParseTuple(args, "i" _Py_PARSE_PID ":tcsetpgrp", - &fd, &pgid)) + &fd, &pgid)) { goto exit; + } return_value = os_tcsetpgrp_impl(module, fd, pgid); exit: @@ -3184,28 +3303,31 @@ PyDoc_STRVAR(os_open__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_OPEN_METHODDEF \ - {"open", (PyCFunction)os_open, METH_VARARGS|METH_KEYWORDS, os_open__doc__}, + {"open", (PyCFunction)os_open, METH_FASTCALL, os_open__doc__}, static int os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd); static PyObject * -os_open(PyObject *module, PyObject *args, PyObject *kwargs) +os_open(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "flags", "mode", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "flags", "mode", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&i|i$O&:open", _keywords, 0}; path_t path = PATH_T_INITIALIZE("open", "path", 0, 0); int flags; int mode = 511; int dir_fd = DEFAULT_DIR_FD; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&i|i$O&:open", _keywords, - path_converter, &path, &flags, &mode, OPENAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &flags, &mode, OPENAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } _return_value = os_open_impl(module, &path, flags, mode, dir_fd); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -3222,21 +3344,23 @@ PyDoc_STRVAR(os_close__doc__, "Close a file descriptor."); #define OS_CLOSE_METHODDEF \ - {"close", (PyCFunction)os_close, METH_VARARGS|METH_KEYWORDS, os_close__doc__}, + {"close", (PyCFunction)os_close, METH_FASTCALL, os_close__doc__}, static PyObject * os_close_impl(PyObject *module, int fd); static PyObject * -os_close(PyObject *module, PyObject *args, PyObject *kwargs) +os_close(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"i:close", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:close", _keywords, - &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd)) { goto exit; + } return_value = os_close_impl(module, fd); exit: @@ -3263,8 +3387,9 @@ os_closerange(PyObject *module, PyObject *args) int fd_high; if (!PyArg_ParseTuple(args, "ii:closerange", - &fd_low, &fd_high)) + &fd_low, &fd_high)) { goto exit; + } return_value = os_closerange_impl(module, fd_low, fd_high); exit: @@ -3290,11 +3415,13 @@ os_dup(PyObject *module, PyObject *arg) int fd; int _return_value; - if (!PyArg_Parse(arg, "i:dup", &fd)) + if (!PyArg_Parse(arg, "i:dup", &fd)) { goto exit; + } _return_value = os_dup_impl(module, fd); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -3308,23 +3435,25 @@ PyDoc_STRVAR(os_dup2__doc__, "Duplicate file descriptor."); #define OS_DUP2_METHODDEF \ - {"dup2", (PyCFunction)os_dup2, METH_VARARGS|METH_KEYWORDS, os_dup2__doc__}, + {"dup2", (PyCFunction)os_dup2, METH_FASTCALL, os_dup2__doc__}, static PyObject * os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable); static PyObject * -os_dup2(PyObject *module, PyObject *args, PyObject *kwargs) +os_dup2(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", "fd2", "inheritable", NULL}; + static const char * const _keywords[] = {"fd", "fd2", "inheritable", NULL}; + static _PyArg_Parser _parser = {"ii|p:dup2", _keywords, 0}; int fd; int fd2; int inheritable = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|p:dup2", _keywords, - &fd, &fd2, &inheritable)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd, &fd2, &inheritable)) { goto exit; + } return_value = os_dup2_impl(module, fd, fd2, inheritable); exit: @@ -3361,8 +3490,9 @@ os_lockf(PyObject *module, PyObject *args) Py_off_t length; if (!PyArg_ParseTuple(args, "iiO&:lockf", - &fd, &command, Py_off_t_converter, &length)) + &fd, &command, Py_off_t_converter, &length)) { goto exit; + } return_value = os_lockf_impl(module, fd, command, length); exit: @@ -3396,11 +3526,13 @@ os_lseek(PyObject *module, PyObject *args) Py_off_t _return_value; if (!PyArg_ParseTuple(args, "iO&i:lseek", - &fd, Py_off_t_converter, &position, &how)) + &fd, Py_off_t_converter, &position, &how)) { goto exit; + } _return_value = os_lseek_impl(module, fd, position, how); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromPy_off_t(_return_value); exit: @@ -3427,8 +3559,9 @@ os_read(PyObject *module, PyObject *args) Py_ssize_t length; if (!PyArg_ParseTuple(args, "in:read", - &fd, &length)) + &fd, &length)) { goto exit; + } return_value = os_read_impl(module, fd, length); exit: @@ -3466,11 +3599,13 @@ os_readv(PyObject *module, PyObject *args) Py_ssize_t _return_value; if (!PyArg_ParseTuple(args, "iO:readv", - &fd, &buffers)) + &fd, &buffers)) { goto exit; + } _return_value = os_readv_impl(module, fd, buffers); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -3505,8 +3640,9 @@ os_pread(PyObject *module, PyObject *args) Py_off_t offset; if (!PyArg_ParseTuple(args, "iiO&:pread", - &fd, &length, Py_off_t_converter, &offset)) + &fd, &length, Py_off_t_converter, &offset)) { goto exit; + } return_value = os_pread_impl(module, fd, length, offset); exit: @@ -3536,17 +3672,20 @@ os_write(PyObject *module, PyObject *args) Py_ssize_t _return_value; if (!PyArg_ParseTuple(args, "iy*:write", - &fd, &data)) + &fd, &data)) { goto exit; + } _return_value = os_write_impl(module, fd, &data); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -3561,21 +3700,23 @@ PyDoc_STRVAR(os_fstat__doc__, "Equivalent to os.stat(fd)."); #define OS_FSTAT_METHODDEF \ - {"fstat", (PyCFunction)os_fstat, METH_VARARGS|METH_KEYWORDS, os_fstat__doc__}, + {"fstat", (PyCFunction)os_fstat, METH_FASTCALL, os_fstat__doc__}, static PyObject * os_fstat_impl(PyObject *module, int fd); static PyObject * -os_fstat(PyObject *module, PyObject *args, PyObject *kwargs) +os_fstat(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"i:fstat", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:fstat", _keywords, - &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd)) { goto exit; + } return_value = os_fstat_impl(module, fd); exit: @@ -3604,11 +3745,13 @@ os_isatty(PyObject *module, PyObject *arg) int fd; int _return_value; - if (!PyArg_Parse(arg, "i:isatty", &fd)) + if (!PyArg_Parse(arg, "i:isatty", &fd)) { goto exit; + } _return_value = os_isatty_impl(module, fd); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -3666,8 +3809,9 @@ os_pipe2(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int flags; - if (!PyArg_Parse(arg, "i:pipe2", &flags)) + if (!PyArg_Parse(arg, "i:pipe2", &flags)) { goto exit; + } return_value = os_pipe2_impl(module, flags); exit: @@ -3702,11 +3846,13 @@ os_writev(PyObject *module, PyObject *args) Py_ssize_t _return_value; if (!PyArg_ParseTuple(args, "iO:writev", - &fd, &buffers)) + &fd, &buffers)) { goto exit; + } _return_value = os_writev_impl(module, fd, buffers); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: @@ -3743,17 +3889,20 @@ os_pwrite(PyObject *module, PyObject *args) Py_ssize_t _return_value; if (!PyArg_ParseTuple(args, "iy*O&:pwrite", - &fd, &buffer, Py_off_t_converter, &offset)) + &fd, &buffer, Py_off_t_converter, &offset)) { goto exit; + } _return_value = os_pwrite_impl(module, fd, &buffer, offset); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromSsize_t(_return_value); exit: /* Cleanup for buffer */ - if (buffer.obj) + if (buffer.obj) { PyBuffer_Release(&buffer); + } return return_value; } @@ -3774,23 +3923,25 @@ PyDoc_STRVAR(os_mkfifo__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_MKFIFO_METHODDEF \ - {"mkfifo", (PyCFunction)os_mkfifo, METH_VARARGS|METH_KEYWORDS, os_mkfifo__doc__}, + {"mkfifo", (PyCFunction)os_mkfifo, METH_FASTCALL, os_mkfifo__doc__}, static PyObject * os_mkfifo_impl(PyObject *module, path_t *path, int mode, int dir_fd); static PyObject * -os_mkfifo(PyObject *module, PyObject *args, PyObject *kwargs) +os_mkfifo(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "mode", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|i$O&:mkfifo", _keywords, 0}; path_t path = PATH_T_INITIALIZE("mkfifo", "path", 0, 0); int mode = 438; int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|i$O&:mkfifo", _keywords, - path_converter, &path, &mode, MKFIFOAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode, MKFIFOAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_mkfifo_impl(module, &path, mode, dir_fd); exit: @@ -3823,25 +3974,27 @@ PyDoc_STRVAR(os_mknod__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_MKNOD_METHODDEF \ - {"mknod", (PyCFunction)os_mknod, METH_VARARGS|METH_KEYWORDS, os_mknod__doc__}, + {"mknod", (PyCFunction)os_mknod, METH_FASTCALL, os_mknod__doc__}, static PyObject * os_mknod_impl(PyObject *module, path_t *path, int mode, dev_t device, int dir_fd); static PyObject * -os_mknod(PyObject *module, PyObject *args, PyObject *kwargs) +os_mknod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "mode", "device", "dir_fd", NULL}; + static const char * const _keywords[] = {"path", "mode", "device", "dir_fd", NULL}; + static _PyArg_Parser _parser = {"O&|iO&$O&:mknod", _keywords, 0}; path_t path = PATH_T_INITIALIZE("mknod", "path", 0, 0); int mode = 384; dev_t device = 0; int dir_fd = DEFAULT_DIR_FD; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|iO&$O&:mknod", _keywords, - path_converter, &path, &mode, _Py_Dev_Converter, &device, MKNODAT_DIR_FD_CONVERTER, &dir_fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &mode, _Py_Dev_Converter, &device, MKNODAT_DIR_FD_CONVERTER, &dir_fd)) { goto exit; + } return_value = os_mknod_impl(module, &path, mode, device, dir_fd); exit: @@ -3874,11 +4027,13 @@ os_major(PyObject *module, PyObject *arg) dev_t device; unsigned int _return_value; - if (!PyArg_Parse(arg, "O&:major", _Py_Dev_Converter, &device)) + if (!PyArg_Parse(arg, "O&:major", _Py_Dev_Converter, &device)) { goto exit; + } _return_value = os_major_impl(module, device); - if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) + if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromUnsignedLong((unsigned long)_return_value); exit: @@ -3908,11 +4063,13 @@ os_minor(PyObject *module, PyObject *arg) dev_t device; unsigned int _return_value; - if (!PyArg_Parse(arg, "O&:minor", _Py_Dev_Converter, &device)) + if (!PyArg_Parse(arg, "O&:minor", _Py_Dev_Converter, &device)) { goto exit; + } _return_value = os_minor_impl(module, device); - if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) + if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromUnsignedLong((unsigned long)_return_value); exit: @@ -3944,11 +4101,13 @@ os_makedev(PyObject *module, PyObject *args) dev_t _return_value; if (!PyArg_ParseTuple(args, "ii:makedev", - &major, &minor)) + &major, &minor)) { goto exit; + } _return_value = os_makedev_impl(module, major, minor); - if ((_return_value == (dev_t)-1) && PyErr_Occurred()) + if ((_return_value == (dev_t)-1) && PyErr_Occurred()) { goto exit; + } return_value = _PyLong_FromDev(_return_value); exit: @@ -3979,8 +4138,9 @@ os_ftruncate(PyObject *module, PyObject *args) Py_off_t length; if (!PyArg_ParseTuple(args, "iO&:ftruncate", - &fd, Py_off_t_converter, &length)) + &fd, Py_off_t_converter, &length)) { goto exit; + } return_value = os_ftruncate_impl(module, fd, length); exit: @@ -4001,22 +4161,24 @@ PyDoc_STRVAR(os_truncate__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_TRUNCATE_METHODDEF \ - {"truncate", (PyCFunction)os_truncate, METH_VARARGS|METH_KEYWORDS, os_truncate__doc__}, + {"truncate", (PyCFunction)os_truncate, METH_FASTCALL, os_truncate__doc__}, static PyObject * os_truncate_impl(PyObject *module, path_t *path, Py_off_t length); static PyObject * -os_truncate(PyObject *module, PyObject *args, PyObject *kwargs) +os_truncate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "length", NULL}; + static const char * const _keywords[] = {"path", "length", NULL}; + static _PyArg_Parser _parser = {"O&O&:truncate", _keywords, 0}; path_t path = PATH_T_INITIALIZE("truncate", "path", 0, PATH_HAVE_FTRUNCATE); Py_off_t length; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&:truncate", _keywords, - path_converter, &path, Py_off_t_converter, &length)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, Py_off_t_converter, &length)) { goto exit; + } return_value = os_truncate_impl(module, &path, length); exit: @@ -4055,8 +4217,9 @@ os_posix_fallocate(PyObject *module, PyObject *args) Py_off_t length; if (!PyArg_ParseTuple(args, "iO&O&:posix_fallocate", - &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length)) + &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length)) { goto exit; + } return_value = os_posix_fallocate_impl(module, fd, offset, length); exit: @@ -4098,8 +4261,9 @@ os_posix_fadvise(PyObject *module, PyObject *args) int advice; if (!PyArg_ParseTuple(args, "iO&O&i:posix_fadvise", - &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length, &advice)) + &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length, &advice)) { goto exit; + } return_value = os_posix_fadvise_impl(module, fd, offset, length, advice); exit: @@ -4130,8 +4294,9 @@ os_putenv(PyObject *module, PyObject *args) PyObject *value; if (!PyArg_ParseTuple(args, "UU:putenv", - &name, &value)) + &name, &value)) { goto exit; + } return_value = os_putenv_impl(module, name, value); exit: @@ -4162,8 +4327,9 @@ os_putenv(PyObject *module, PyObject *args) PyObject *value = NULL; if (!PyArg_ParseTuple(args, "O&O&:putenv", - PyUnicode_FSConverter, &name, PyUnicode_FSConverter, &value)) + PyUnicode_FSConverter, &name, PyUnicode_FSConverter, &value)) { goto exit; + } return_value = os_putenv_impl(module, name, value); exit: @@ -4197,8 +4363,9 @@ os_unsetenv(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name = NULL; - if (!PyArg_Parse(arg, "O&:unsetenv", PyUnicode_FSConverter, &name)) + if (!PyArg_Parse(arg, "O&:unsetenv", PyUnicode_FSConverter, &name)) { goto exit; + } return_value = os_unsetenv_impl(module, name); exit: @@ -4228,8 +4395,9 @@ os_strerror(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int code; - if (!PyArg_Parse(arg, "i:strerror", &code)) + if (!PyArg_Parse(arg, "i:strerror", &code)) { goto exit; + } return_value = os_strerror_impl(module, code); exit: @@ -4257,11 +4425,13 @@ os_WCOREDUMP(PyObject *module, PyObject *arg) int status; int _return_value; - if (!PyArg_Parse(arg, "i:WCOREDUMP", &status)) + if (!PyArg_Parse(arg, "i:WCOREDUMP", &status)) { goto exit; + } _return_value = os_WCOREDUMP_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -4282,25 +4452,28 @@ PyDoc_STRVAR(os_WIFCONTINUED__doc__, "job control stop."); #define OS_WIFCONTINUED_METHODDEF \ - {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_VARARGS|METH_KEYWORDS, os_WIFCONTINUED__doc__}, + {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_FASTCALL, os_WIFCONTINUED__doc__}, static int os_WIFCONTINUED_impl(PyObject *module, int status); static PyObject * -os_WIFCONTINUED(PyObject *module, PyObject *args, PyObject *kwargs) +os_WIFCONTINUED(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WIFCONTINUED", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WIFCONTINUED", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WIFCONTINUED_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -4318,25 +4491,28 @@ PyDoc_STRVAR(os_WIFSTOPPED__doc__, "Return True if the process returning status was stopped."); #define OS_WIFSTOPPED_METHODDEF \ - {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_VARARGS|METH_KEYWORDS, os_WIFSTOPPED__doc__}, + {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_FASTCALL, os_WIFSTOPPED__doc__}, static int os_WIFSTOPPED_impl(PyObject *module, int status); static PyObject * -os_WIFSTOPPED(PyObject *module, PyObject *args, PyObject *kwargs) +os_WIFSTOPPED(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WIFSTOPPED", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WIFSTOPPED", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WIFSTOPPED_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -4354,25 +4530,28 @@ PyDoc_STRVAR(os_WIFSIGNALED__doc__, "Return True if the process returning status was terminated by a signal."); #define OS_WIFSIGNALED_METHODDEF \ - {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_VARARGS|METH_KEYWORDS, os_WIFSIGNALED__doc__}, + {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_FASTCALL, os_WIFSIGNALED__doc__}, static int os_WIFSIGNALED_impl(PyObject *module, int status); static PyObject * -os_WIFSIGNALED(PyObject *module, PyObject *args, PyObject *kwargs) +os_WIFSIGNALED(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WIFSIGNALED", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WIFSIGNALED", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WIFSIGNALED_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -4390,25 +4569,28 @@ PyDoc_STRVAR(os_WIFEXITED__doc__, "Return True if the process returning status exited via the exit() system call."); #define OS_WIFEXITED_METHODDEF \ - {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_VARARGS|METH_KEYWORDS, os_WIFEXITED__doc__}, + {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_FASTCALL, os_WIFEXITED__doc__}, static int os_WIFEXITED_impl(PyObject *module, int status); static PyObject * -os_WIFEXITED(PyObject *module, PyObject *args, PyObject *kwargs) +os_WIFEXITED(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WIFEXITED", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WIFEXITED", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WIFEXITED_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -4426,25 +4608,28 @@ PyDoc_STRVAR(os_WEXITSTATUS__doc__, "Return the process return code from status."); #define OS_WEXITSTATUS_METHODDEF \ - {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_VARARGS|METH_KEYWORDS, os_WEXITSTATUS__doc__}, + {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_FASTCALL, os_WEXITSTATUS__doc__}, static int os_WEXITSTATUS_impl(PyObject *module, int status); static PyObject * -os_WEXITSTATUS(PyObject *module, PyObject *args, PyObject *kwargs) +os_WEXITSTATUS(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WEXITSTATUS", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WEXITSTATUS", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WEXITSTATUS_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -4462,25 +4647,28 @@ PyDoc_STRVAR(os_WTERMSIG__doc__, "Return the signal that terminated the process that provided the status value."); #define OS_WTERMSIG_METHODDEF \ - {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_VARARGS|METH_KEYWORDS, os_WTERMSIG__doc__}, + {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_FASTCALL, os_WTERMSIG__doc__}, static int os_WTERMSIG_impl(PyObject *module, int status); static PyObject * -os_WTERMSIG(PyObject *module, PyObject *args, PyObject *kwargs) +os_WTERMSIG(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WTERMSIG", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WTERMSIG", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WTERMSIG_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -4498,25 +4686,28 @@ PyDoc_STRVAR(os_WSTOPSIG__doc__, "Return the signal that stopped the process that provided the status value."); #define OS_WSTOPSIG_METHODDEF \ - {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_VARARGS|METH_KEYWORDS, os_WSTOPSIG__doc__}, + {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_FASTCALL, os_WSTOPSIG__doc__}, static int os_WSTOPSIG_impl(PyObject *module, int status); static PyObject * -os_WSTOPSIG(PyObject *module, PyObject *args, PyObject *kwargs) +os_WSTOPSIG(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"status", NULL}; + static const char * const _keywords[] = {"status", NULL}; + static _PyArg_Parser _parser = {"i:WSTOPSIG", _keywords, 0}; int status; int _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:WSTOPSIG", _keywords, - &status)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &status)) { goto exit; + } _return_value = os_WSTOPSIG_impl(module, status); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -4547,8 +4738,9 @@ os_fstatvfs(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int fd; - if (!PyArg_Parse(arg, "i:fstatvfs", &fd)) + if (!PyArg_Parse(arg, "i:fstatvfs", &fd)) { goto exit; + } return_value = os_fstatvfs_impl(module, fd); exit: @@ -4570,21 +4762,23 @@ PyDoc_STRVAR(os_statvfs__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_STATVFS_METHODDEF \ - {"statvfs", (PyCFunction)os_statvfs, METH_VARARGS|METH_KEYWORDS, os_statvfs__doc__}, + {"statvfs", (PyCFunction)os_statvfs, METH_FASTCALL, os_statvfs__doc__}, static PyObject * os_statvfs_impl(PyObject *module, path_t *path); static PyObject * -os_statvfs(PyObject *module, PyObject *args, PyObject *kwargs) +os_statvfs(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"O&:statvfs", _keywords, 0}; path_t path = PATH_T_INITIALIZE("statvfs", "path", 0, PATH_HAVE_FSTATVFS); - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&:statvfs", _keywords, - path_converter, &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path)) { goto exit; + } return_value = os_statvfs_impl(module, &path); exit: @@ -4605,21 +4799,23 @@ PyDoc_STRVAR(os__getdiskusage__doc__, "Return disk usage statistics about the given path as a (total, free) tuple."); #define OS__GETDISKUSAGE_METHODDEF \ - {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_VARARGS|METH_KEYWORDS, os__getdiskusage__doc__}, + {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_FASTCALL, os__getdiskusage__doc__}, static PyObject * os__getdiskusage_impl(PyObject *module, Py_UNICODE *path); static PyObject * -os__getdiskusage(PyObject *module, PyObject *args, PyObject *kwargs) +os__getdiskusage(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", NULL}; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"u:_getdiskusage", _keywords, 0}; Py_UNICODE *path; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "u:_getdiskusage", _keywords, - &path)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path)) { goto exit; + } return_value = os__getdiskusage_impl(module, path); exit: @@ -4653,11 +4849,13 @@ os_fpathconf(PyObject *module, PyObject *args) long _return_value; if (!PyArg_ParseTuple(args, "iO&:fpathconf", - &fd, conv_path_confname, &name)) + &fd, conv_path_confname, &name)) { goto exit; + } _return_value = os_fpathconf_impl(module, fd, name); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -4679,26 +4877,29 @@ PyDoc_STRVAR(os_pathconf__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_PATHCONF_METHODDEF \ - {"pathconf", (PyCFunction)os_pathconf, METH_VARARGS|METH_KEYWORDS, os_pathconf__doc__}, + {"pathconf", (PyCFunction)os_pathconf, METH_FASTCALL, os_pathconf__doc__}, static long os_pathconf_impl(PyObject *module, path_t *path, int name); static PyObject * -os_pathconf(PyObject *module, PyObject *args, PyObject *kwargs) +os_pathconf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "name", NULL}; + static const char * const _keywords[] = {"path", "name", NULL}; + static _PyArg_Parser _parser = {"O&O&:pathconf", _keywords, 0}; path_t path = PATH_T_INITIALIZE("pathconf", "path", 0, PATH_HAVE_FPATHCONF); int name; long _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&:pathconf", _keywords, - path_converter, &path, conv_path_confname, &name)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, conv_path_confname, &name)) { goto exit; + } _return_value = os_pathconf_impl(module, &path, name); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -4730,8 +4931,9 @@ os_confstr(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int name; - if (!PyArg_Parse(arg, "O&:confstr", conv_confstr_confname, &name)) + if (!PyArg_Parse(arg, "O&:confstr", conv_confstr_confname, &name)) { goto exit; + } return_value = os_confstr_impl(module, name); exit: @@ -4761,11 +4963,13 @@ os_sysconf(PyObject *module, PyObject *arg) int name; long _return_value; - if (!PyArg_Parse(arg, "O&:sysconf", conv_sysconf_confname, &name)) + if (!PyArg_Parse(arg, "O&:sysconf", conv_sysconf_confname, &name)) { goto exit; + } _return_value = os_sysconf_impl(module, name); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -4795,6 +4999,61 @@ os_abort(PyObject *module, PyObject *Py_UNUSED(ignored)) return os_abort_impl(module); } +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(os_startfile__doc__, +"startfile($module, /, filepath, operation=None)\n" +"--\n" +"\n" +"startfile(filepath [, operation])\n" +"\n" +"Start a file with its associated application.\n" +"\n" +"When \"operation\" is not specified or \"open\", this acts like\n" +"double-clicking the file in Explorer, or giving the file name as an\n" +"argument to the DOS \"start\" command: the file is opened with whatever\n" +"application (if any) its extension is associated.\n" +"When another \"operation\" is given, it specifies what should be done with\n" +"the file. A typical operation is \"print\".\n" +"\n" +"startfile returns as soon as the associated application is launched.\n" +"There is no option to wait for the application to close, and no way\n" +"to retrieve the application\'s exit status.\n" +"\n" +"The filepath is relative to the current directory. If you want to use\n" +"an absolute path, make sure the first character is not a slash (\"/\");\n" +"the underlying Win32 ShellExecute function doesn\'t work if it is."); + +#define OS_STARTFILE_METHODDEF \ + {"startfile", (PyCFunction)os_startfile, METH_FASTCALL, os_startfile__doc__}, + +static PyObject * +os_startfile_impl(PyObject *module, path_t *filepath, Py_UNICODE *operation); + +static PyObject * +os_startfile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"filepath", "operation", NULL}; + static _PyArg_Parser _parser = {"O&|u:startfile", _keywords, 0}; + path_t filepath = PATH_T_INITIALIZE("startfile", "filepath", 0, 0); + Py_UNICODE *operation = NULL; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &filepath, &operation)) { + goto exit; + } + return_value = os_startfile_impl(module, &filepath, operation); + +exit: + /* Cleanup for filepath */ + path_cleanup(&filepath); + + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + #if defined(HAVE_GETLOADAVG) PyDoc_STRVAR(os_getloadavg__doc__, @@ -4831,21 +5090,23 @@ PyDoc_STRVAR(os_device_encoding__doc__, "If the device is not a terminal, return None."); #define OS_DEVICE_ENCODING_METHODDEF \ - {"device_encoding", (PyCFunction)os_device_encoding, METH_VARARGS|METH_KEYWORDS, os_device_encoding__doc__}, + {"device_encoding", (PyCFunction)os_device_encoding, METH_FASTCALL, os_device_encoding__doc__}, static PyObject * os_device_encoding_impl(PyObject *module, int fd); static PyObject * -os_device_encoding(PyObject *module, PyObject *args, PyObject *kwargs) +os_device_encoding(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"fd", NULL}; + static const char * const _keywords[] = {"fd", NULL}; + static _PyArg_Parser _parser = {"i:device_encoding", _keywords, 0}; int fd; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:device_encoding", _keywords, - &fd)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &fd)) { goto exit; + } return_value = os_device_encoding_impl(module, fd); exit: @@ -4875,8 +5136,9 @@ os_setresuid(PyObject *module, PyObject *args) uid_t suid; if (!PyArg_ParseTuple(args, "O&O&O&:setresuid", - _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid, _Py_Uid_Converter, &suid)) + _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid, _Py_Uid_Converter, &suid)) { goto exit; + } return_value = os_setresuid_impl(module, ruid, euid, suid); exit: @@ -4908,8 +5170,9 @@ os_setresgid(PyObject *module, PyObject *args) gid_t sgid; if (!PyArg_ParseTuple(args, "O&O&O&:setresgid", - _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid, _Py_Gid_Converter, &sgid)) + _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid, _Py_Gid_Converter, &sgid)) { goto exit; + } return_value = os_setresgid_impl(module, rgid, egid, sgid); exit: @@ -4976,24 +5239,26 @@ PyDoc_STRVAR(os_getxattr__doc__, " the link points to."); #define OS_GETXATTR_METHODDEF \ - {"getxattr", (PyCFunction)os_getxattr, METH_VARARGS|METH_KEYWORDS, os_getxattr__doc__}, + {"getxattr", (PyCFunction)os_getxattr, METH_FASTCALL, os_getxattr__doc__}, static PyObject * os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute, int follow_symlinks); static PyObject * -os_getxattr(PyObject *module, PyObject *args, PyObject *kwargs) +os_getxattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "attribute", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "attribute", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&O&|$p:getxattr", _keywords, 0}; path_t path = PATH_T_INITIALIZE("getxattr", "path", 0, 1); path_t attribute = PATH_T_INITIALIZE("getxattr", "attribute", 0, 0); int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$p:getxattr", _keywords, - path_converter, &path, path_converter, &attribute, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, path_converter, &attribute, &follow_symlinks)) { goto exit; + } return_value = os_getxattr_impl(module, &path, &attribute, follow_symlinks); exit: @@ -5022,26 +5287,28 @@ PyDoc_STRVAR(os_setxattr__doc__, " the link points to."); #define OS_SETXATTR_METHODDEF \ - {"setxattr", (PyCFunction)os_setxattr, METH_VARARGS|METH_KEYWORDS, os_setxattr__doc__}, + {"setxattr", (PyCFunction)os_setxattr, METH_FASTCALL, os_setxattr__doc__}, static PyObject * os_setxattr_impl(PyObject *module, path_t *path, path_t *attribute, Py_buffer *value, int flags, int follow_symlinks); static PyObject * -os_setxattr(PyObject *module, PyObject *args, PyObject *kwargs) +os_setxattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "attribute", "value", "flags", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "attribute", "value", "flags", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&O&y*|i$p:setxattr", _keywords, 0}; path_t path = PATH_T_INITIALIZE("setxattr", "path", 0, 1); path_t attribute = PATH_T_INITIALIZE("setxattr", "attribute", 0, 0); Py_buffer value = {NULL, NULL}; int flags = 0; int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&y*|i$p:setxattr", _keywords, - path_converter, &path, path_converter, &attribute, &value, &flags, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, path_converter, &attribute, &value, &flags, &follow_symlinks)) { goto exit; + } return_value = os_setxattr_impl(module, &path, &attribute, &value, flags, follow_symlinks); exit: @@ -5050,8 +5317,9 @@ exit: /* Cleanup for attribute */ path_cleanup(&attribute); /* Cleanup for value */ - if (value.obj) + if (value.obj) { PyBuffer_Release(&value); + } return return_value; } @@ -5072,24 +5340,26 @@ PyDoc_STRVAR(os_removexattr__doc__, " the link points to."); #define OS_REMOVEXATTR_METHODDEF \ - {"removexattr", (PyCFunction)os_removexattr, METH_VARARGS|METH_KEYWORDS, os_removexattr__doc__}, + {"removexattr", (PyCFunction)os_removexattr, METH_FASTCALL, os_removexattr__doc__}, static PyObject * os_removexattr_impl(PyObject *module, path_t *path, path_t *attribute, int follow_symlinks); static PyObject * -os_removexattr(PyObject *module, PyObject *args, PyObject *kwargs) +os_removexattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "attribute", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "attribute", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"O&O&|$p:removexattr", _keywords, 0}; path_t path = PATH_T_INITIALIZE("removexattr", "path", 0, 1); path_t attribute = PATH_T_INITIALIZE("removexattr", "attribute", 0, 0); int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&O&|$p:removexattr", _keywords, - path_converter, &path, path_converter, &attribute, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, path_converter, &attribute, &follow_symlinks)) { goto exit; + } return_value = os_removexattr_impl(module, &path, &attribute, follow_symlinks); exit: @@ -5118,22 +5388,24 @@ PyDoc_STRVAR(os_listxattr__doc__, " the link points to."); #define OS_LISTXATTR_METHODDEF \ - {"listxattr", (PyCFunction)os_listxattr, METH_VARARGS|METH_KEYWORDS, os_listxattr__doc__}, + {"listxattr", (PyCFunction)os_listxattr, METH_FASTCALL, os_listxattr__doc__}, static PyObject * os_listxattr_impl(PyObject *module, path_t *path, int follow_symlinks); static PyObject * -os_listxattr(PyObject *module, PyObject *args, PyObject *kwargs) +os_listxattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"path", "follow_symlinks", NULL}; + static const char * const _keywords[] = {"path", "follow_symlinks", NULL}; + static _PyArg_Parser _parser = {"|O&$p:listxattr", _keywords, 0}; path_t path = PATH_T_INITIALIZE("listxattr", "path", 1, 1); int follow_symlinks = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O&$p:listxattr", _keywords, - path_converter, &path, &follow_symlinks)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + path_converter, &path, &follow_symlinks)) { goto exit; + } return_value = os_listxattr_impl(module, &path, follow_symlinks); exit: @@ -5163,8 +5435,9 @@ os_urandom(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_ssize_t size; - if (!PyArg_Parse(arg, "n:urandom", &size)) + if (!PyArg_Parse(arg, "n:urandom", &size)) { goto exit; + } return_value = os_urandom_impl(module, size); exit: @@ -5175,7 +5448,11 @@ PyDoc_STRVAR(os_cpu_count__doc__, "cpu_count($module, /)\n" "--\n" "\n" -"Return the number of CPUs in the system; return None if indeterminable."); +"Return the number of CPUs in the system; return None if indeterminable.\n" +"\n" +"This number is not equivalent to the number of CPUs the current process can\n" +"use. The number of usable CPUs can be obtained with\n" +"``len(os.sched_getaffinity(0))``"); #define OS_CPU_COUNT_METHODDEF \ {"cpu_count", (PyCFunction)os_cpu_count, METH_NOARGS, os_cpu_count__doc__}, @@ -5208,11 +5485,13 @@ os_get_inheritable(PyObject *module, PyObject *arg) int fd; int _return_value; - if (!PyArg_Parse(arg, "i:get_inheritable", &fd)) + if (!PyArg_Parse(arg, "i:get_inheritable", &fd)) { goto exit; + } _return_value = os_get_inheritable_impl(module, fd); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -5239,8 +5518,9 @@ os_set_inheritable(PyObject *module, PyObject *args) int inheritable; if (!PyArg_ParseTuple(args, "ii:set_inheritable", - &fd, &inheritable)) + &fd, &inheritable)) { goto exit; + } return_value = os_set_inheritable_impl(module, fd, inheritable); exit: @@ -5259,20 +5539,22 @@ PyDoc_STRVAR(os_get_handle_inheritable__doc__, {"get_handle_inheritable", (PyCFunction)os_get_handle_inheritable, METH_O, os_get_handle_inheritable__doc__}, static int -os_get_handle_inheritable_impl(PyObject *module, Py_intptr_t handle); +os_get_handle_inheritable_impl(PyObject *module, intptr_t handle); static PyObject * os_get_handle_inheritable(PyObject *module, PyObject *arg) { PyObject *return_value = NULL; - Py_intptr_t handle; + intptr_t handle; int _return_value; - if (!PyArg_Parse(arg, "" _Py_PARSE_INTPTR ":get_handle_inheritable", &handle)) + if (!PyArg_Parse(arg, "" _Py_PARSE_INTPTR ":get_handle_inheritable", &handle)) { goto exit; + } _return_value = os_get_handle_inheritable_impl(module, handle); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyBool_FromLong((long)_return_value); exit: @@ -5293,19 +5575,20 @@ PyDoc_STRVAR(os_set_handle_inheritable__doc__, {"set_handle_inheritable", (PyCFunction)os_set_handle_inheritable, METH_VARARGS, os_set_handle_inheritable__doc__}, static PyObject * -os_set_handle_inheritable_impl(PyObject *module, Py_intptr_t handle, +os_set_handle_inheritable_impl(PyObject *module, intptr_t handle, int inheritable); static PyObject * os_set_handle_inheritable(PyObject *module, PyObject *args) { PyObject *return_value = NULL; - Py_intptr_t handle; + intptr_t handle; int inheritable; if (!PyArg_ParseTuple(args, "" _Py_PARSE_INTPTR "p:set_handle_inheritable", - &handle, &inheritable)) + &handle, &inheritable)) { goto exit; + } return_value = os_set_handle_inheritable_impl(module, handle, inheritable); exit: @@ -5314,6 +5597,75 @@ exit: #endif /* defined(MS_WINDOWS) */ +PyDoc_STRVAR(os_fspath__doc__, +"fspath($module, /, path)\n" +"--\n" +"\n" +"Return the file system path representation of the object.\n" +"\n" +"If the object is str or bytes, then allow it to pass through as-is. If the\n" +"object defines __fspath__(), then return the result of that method. All other\n" +"types raise a TypeError."); + +#define OS_FSPATH_METHODDEF \ + {"fspath", (PyCFunction)os_fspath, METH_FASTCALL, os_fspath__doc__}, + +static PyObject * +os_fspath_impl(PyObject *module, PyObject *path); + +static PyObject * +os_fspath(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"path", NULL}; + static _PyArg_Parser _parser = {"O:fspath", _keywords, 0}; + PyObject *path; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &path)) { + goto exit; + } + return_value = os_fspath_impl(module, path); + +exit: + return return_value; +} + +#if defined(HAVE_GETRANDOM_SYSCALL) + +PyDoc_STRVAR(os_getrandom__doc__, +"getrandom($module, /, size, flags=0)\n" +"--\n" +"\n" +"Obtain a series of random bytes."); + +#define OS_GETRANDOM_METHODDEF \ + {"getrandom", (PyCFunction)os_getrandom, METH_FASTCALL, os_getrandom__doc__}, + +static PyObject * +os_getrandom_impl(PyObject *module, Py_ssize_t size, int flags); + +static PyObject * +os_getrandom(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"size", "flags", NULL}; + static _PyArg_Parser _parser = {"n|i:getrandom", _keywords, 0}; + Py_ssize_t size; + int flags = 0; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &size, &flags)) { + goto exit; + } + return_value = os_getrandom_impl(module, size, flags); + +exit: + return return_value; +} + +#endif /* defined(HAVE_GETRANDOM_SYSCALL) */ + #ifndef OS_TTYNAME_METHODDEF #define OS_TTYNAME_METHODDEF #endif /* !defined(OS_TTYNAME_METHODDEF) */ @@ -5494,6 +5846,10 @@ exit: #define OS_GETGID_METHODDEF #endif /* !defined(OS_GETGID_METHODDEF) */ +#ifndef OS_GETPID_METHODDEF + #define OS_GETPID_METHODDEF +#endif /* !defined(OS_GETPID_METHODDEF) */ + #ifndef OS_GETGROUPS_METHODDEF #define OS_GETGROUPS_METHODDEF #endif /* !defined(OS_GETGROUPS_METHODDEF) */ @@ -5742,6 +6098,10 @@ exit: #define OS_SYSCONF_METHODDEF #endif /* !defined(OS_SYSCONF_METHODDEF) */ +#ifndef OS_STARTFILE_METHODDEF + #define OS_STARTFILE_METHODDEF +#endif /* !defined(OS_STARTFILE_METHODDEF) */ + #ifndef OS_GETLOADAVG_METHODDEF #define OS_GETLOADAVG_METHODDEF #endif /* !defined(OS_GETLOADAVG_METHODDEF) */ @@ -5785,4 +6145,8 @@ exit: #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF #define OS_SET_HANDLE_INHERITABLE_METHODDEF #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */ -/*[clinic end generated code: output=7690b72549d2524e input=a9049054013a1b77]*/ + +#ifndef OS_GETRANDOM_METHODDEF + #define OS_GETRANDOM_METHODDEF +#endif /* !defined(OS_GETRANDOM_METHODDEF) */ +/*[clinic end generated code: output=50cfb7ebc44efb67 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/pwdmodule.c.h b/Modules/clinic/pwdmodule.c.h index cb191a0..f9e0644 100644 --- a/Modules/clinic/pwdmodule.c.h +++ b/Modules/clinic/pwdmodule.c.h @@ -33,8 +33,9 @@ pwd_getpwnam(PyObject *module, PyObject *arg_) PyObject *return_value = NULL; PyObject *arg; - if (!PyArg_Parse(arg_, "U:getpwnam", &arg)) + if (!PyArg_Parse(arg_, "U:getpwnam", &arg)) { goto exit; + } return_value = pwd_getpwnam_impl(module, arg); exit: @@ -68,4 +69,4 @@ pwd_getpwall(PyObject *module, PyObject *Py_UNUSED(ignored)) #ifndef PWD_GETPWALL_METHODDEF #define PWD_GETPWALL_METHODDEF #endif /* !defined(PWD_GETPWALL_METHODDEF) */ -/*[clinic end generated code: output=d0ea1c5c832f0c1a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fc41d8d88ec206d8 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h index c5b5c71..75a096c 100644 --- a/Modules/clinic/pyexpat.c.h +++ b/Modules/clinic/pyexpat.c.h @@ -25,8 +25,9 @@ pyexpat_xmlparser_Parse(xmlparseobject *self, PyObject *args) int isfinal = 0; if (!PyArg_ParseTuple(args, "O|i:Parse", - &data, &isfinal)) + &data, &isfinal)) { goto exit; + } return_value = pyexpat_xmlparser_Parse_impl(self, data, isfinal); exit: @@ -60,8 +61,9 @@ pyexpat_xmlparser_SetBase(xmlparseobject *self, PyObject *arg) PyObject *return_value = NULL; const char *base; - if (!PyArg_Parse(arg, "s:SetBase", &base)) + if (!PyArg_Parse(arg, "s:SetBase", &base)) { goto exit; + } return_value = pyexpat_xmlparser_SetBase_impl(self, base); exit: @@ -129,8 +131,9 @@ pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyObject *arg const char *encoding = NULL; if (!PyArg_ParseTuple(args, "z|s:ExternalEntityParserCreate", - &context, &encoding)) + &context, &encoding)) { goto exit; + } return_value = pyexpat_xmlparser_ExternalEntityParserCreate_impl(self, context, encoding); exit: @@ -160,8 +163,9 @@ pyexpat_xmlparser_SetParamEntityParsing(xmlparseobject *self, PyObject *arg) PyObject *return_value = NULL; int flag; - if (!PyArg_Parse(arg, "i:SetParamEntityParsing", &flag)) + if (!PyArg_Parse(arg, "i:SetParamEntityParsing", &flag)) { goto exit; + } return_value = pyexpat_xmlparser_SetParamEntityParsing_impl(self, flag); exit: @@ -193,8 +197,9 @@ pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyObject *args) int flag = 1; if (!PyArg_ParseTuple(args, "|p:UseForeignDTD", - &flag)) + &flag)) { goto exit; + } return_value = pyexpat_xmlparser_UseForeignDTD_impl(self, flag); exit: @@ -228,24 +233,26 @@ PyDoc_STRVAR(pyexpat_ParserCreate__doc__, "Return a new XML parser object."); #define PYEXPAT_PARSERCREATE_METHODDEF \ - {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_VARARGS|METH_KEYWORDS, pyexpat_ParserCreate__doc__}, + {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_FASTCALL, pyexpat_ParserCreate__doc__}, static PyObject * pyexpat_ParserCreate_impl(PyObject *module, const char *encoding, const char *namespace_separator, PyObject *intern); static PyObject * -pyexpat_ParserCreate(PyObject *module, PyObject *args, PyObject *kwargs) +pyexpat_ParserCreate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"encoding", "namespace_separator", "intern", NULL}; + static const char * const _keywords[] = {"encoding", "namespace_separator", "intern", NULL}; + static _PyArg_Parser _parser = {"|zzO:ParserCreate", _keywords, 0}; const char *encoding = NULL; const char *namespace_separator = NULL; PyObject *intern = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|zzO:ParserCreate", _keywords, - &encoding, &namespace_separator, &intern)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &encoding, &namespace_separator, &intern)) { goto exit; + } return_value = pyexpat_ParserCreate_impl(module, encoding, namespace_separator, intern); exit: @@ -270,8 +277,9 @@ pyexpat_ErrorString(PyObject *module, PyObject *arg) PyObject *return_value = NULL; long code; - if (!PyArg_Parse(arg, "l:ErrorString", &code)) + if (!PyArg_Parse(arg, "l:ErrorString", &code)) { goto exit; + } return_value = pyexpat_ErrorString_impl(module, code); exit: @@ -281,4 +289,4 @@ exit: #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */ -/*[clinic end generated code: output=d479cfab607e9dc8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e889f7c6af6cc42f input=a9049054013a1b77]*/ diff --git a/Modules/clinic/sha1module.c.h b/Modules/clinic/sha1module.c.h index 5b8db80..b08e92d 100644 --- a/Modules/clinic/sha1module.c.h +++ b/Modules/clinic/sha1module.c.h @@ -72,24 +72,26 @@ PyDoc_STRVAR(_sha1_sha1__doc__, "Return a new SHA1 hash object; optionally initialized with a string."); #define _SHA1_SHA1_METHODDEF \ - {"sha1", (PyCFunction)_sha1_sha1, METH_VARARGS|METH_KEYWORDS, _sha1_sha1__doc__}, + {"sha1", (PyCFunction)_sha1_sha1, METH_FASTCALL, _sha1_sha1__doc__}, static PyObject * _sha1_sha1_impl(PyObject *module, PyObject *string); static PyObject * -_sha1_sha1(PyObject *module, PyObject *args, PyObject *kwargs) +_sha1_sha1(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha1", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:sha1", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _sha1_sha1_impl(module, string); exit: return return_value; } -/*[clinic end generated code: output=0b6a194fbb0b94f2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1430450f3f806895 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/sha256module.c.h b/Modules/clinic/sha256module.c.h index 661569c..115db50 100644 --- a/Modules/clinic/sha256module.c.h +++ b/Modules/clinic/sha256module.c.h @@ -72,21 +72,23 @@ PyDoc_STRVAR(_sha256_sha256__doc__, "Return a new SHA-256 hash object; optionally initialized with a string."); #define _SHA256_SHA256_METHODDEF \ - {"sha256", (PyCFunction)_sha256_sha256, METH_VARARGS|METH_KEYWORDS, _sha256_sha256__doc__}, + {"sha256", (PyCFunction)_sha256_sha256, METH_FASTCALL, _sha256_sha256__doc__}, static PyObject * _sha256_sha256_impl(PyObject *module, PyObject *string); static PyObject * -_sha256_sha256(PyObject *module, PyObject *args, PyObject *kwargs) +_sha256_sha256(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha256", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:sha256", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _sha256_sha256_impl(module, string); exit: @@ -100,24 +102,26 @@ PyDoc_STRVAR(_sha256_sha224__doc__, "Return a new SHA-224 hash object; optionally initialized with a string."); #define _SHA256_SHA224_METHODDEF \ - {"sha224", (PyCFunction)_sha256_sha224, METH_VARARGS|METH_KEYWORDS, _sha256_sha224__doc__}, + {"sha224", (PyCFunction)_sha256_sha224, METH_FASTCALL, _sha256_sha224__doc__}, static PyObject * _sha256_sha224_impl(PyObject *module, PyObject *string); static PyObject * -_sha256_sha224(PyObject *module, PyObject *args, PyObject *kwargs) +_sha256_sha224(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha224", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:sha224", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _sha256_sha224_impl(module, string); exit: return return_value; } -/*[clinic end generated code: output=5a1fc5480e399f95 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=19439d70db7ead5c input=a9049054013a1b77]*/ diff --git a/Modules/clinic/sha512module.c.h b/Modules/clinic/sha512module.c.h index d64c2a4..a2b57f7 100644 --- a/Modules/clinic/sha512module.c.h +++ b/Modules/clinic/sha512module.c.h @@ -2,8 +2,6 @@ preserve [clinic start generated code]*/ -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(SHA512Type_copy__doc__, "copy($self, /)\n" "--\n" @@ -22,10 +20,6 @@ SHA512Type_copy(SHAobject *self, PyObject *Py_UNUSED(ignored)) return SHA512Type_copy_impl(self); } -#endif /* defined(PY_LONG_LONG) */ - -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(SHA512Type_digest__doc__, "digest($self, /)\n" "--\n" @@ -44,10 +38,6 @@ SHA512Type_digest(SHAobject *self, PyObject *Py_UNUSED(ignored)) return SHA512Type_digest_impl(self); } -#endif /* defined(PY_LONG_LONG) */ - -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(SHA512Type_hexdigest__doc__, "hexdigest($self, /)\n" "--\n" @@ -66,10 +56,6 @@ SHA512Type_hexdigest(SHAobject *self, PyObject *Py_UNUSED(ignored)) return SHA512Type_hexdigest_impl(self); } -#endif /* defined(PY_LONG_LONG) */ - -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(SHA512Type_update__doc__, "update($self, obj, /)\n" "--\n" @@ -79,10 +65,6 @@ PyDoc_STRVAR(SHA512Type_update__doc__, #define SHA512TYPE_UPDATE_METHODDEF \ {"update", (PyCFunction)SHA512Type_update, METH_O, SHA512Type_update__doc__}, -#endif /* defined(PY_LONG_LONG) */ - -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(_sha512_sha512__doc__, "sha512($module, /, string=b\'\')\n" "--\n" @@ -90,31 +72,29 @@ PyDoc_STRVAR(_sha512_sha512__doc__, "Return a new SHA-512 hash object; optionally initialized with a string."); #define _SHA512_SHA512_METHODDEF \ - {"sha512", (PyCFunction)_sha512_sha512, METH_VARARGS|METH_KEYWORDS, _sha512_sha512__doc__}, + {"sha512", (PyCFunction)_sha512_sha512, METH_FASTCALL, _sha512_sha512__doc__}, static PyObject * _sha512_sha512_impl(PyObject *module, PyObject *string); static PyObject * -_sha512_sha512(PyObject *module, PyObject *args, PyObject *kwargs) +_sha512_sha512(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha512", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:sha512", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _sha512_sha512_impl(module, string); exit: return return_value; } -#endif /* defined(PY_LONG_LONG) */ - -#if defined(PY_LONG_LONG) - PyDoc_STRVAR(_sha512_sha384__doc__, "sha384($module, /, string=b\'\')\n" "--\n" @@ -122,50 +102,26 @@ PyDoc_STRVAR(_sha512_sha384__doc__, "Return a new SHA-384 hash object; optionally initialized with a string."); #define _SHA512_SHA384_METHODDEF \ - {"sha384", (PyCFunction)_sha512_sha384, METH_VARARGS|METH_KEYWORDS, _sha512_sha384__doc__}, + {"sha384", (PyCFunction)_sha512_sha384, METH_FASTCALL, _sha512_sha384__doc__}, static PyObject * _sha512_sha384_impl(PyObject *module, PyObject *string); static PyObject * -_sha512_sha384(PyObject *module, PyObject *args, PyObject *kwargs) +_sha512_sha384(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"string", NULL}; + static const char * const _keywords[] = {"string", NULL}; + static _PyArg_Parser _parser = {"|O:sha384", _keywords, 0}; PyObject *string = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O:sha384", _keywords, - &string)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &string)) { goto exit; + } return_value = _sha512_sha384_impl(module, string); exit: return return_value; } - -#endif /* defined(PY_LONG_LONG) */ - -#ifndef SHA512TYPE_COPY_METHODDEF - #define SHA512TYPE_COPY_METHODDEF -#endif /* !defined(SHA512TYPE_COPY_METHODDEF) */ - -#ifndef SHA512TYPE_DIGEST_METHODDEF - #define SHA512TYPE_DIGEST_METHODDEF -#endif /* !defined(SHA512TYPE_DIGEST_METHODDEF) */ - -#ifndef SHA512TYPE_HEXDIGEST_METHODDEF - #define SHA512TYPE_HEXDIGEST_METHODDEF -#endif /* !defined(SHA512TYPE_HEXDIGEST_METHODDEF) */ - -#ifndef SHA512TYPE_UPDATE_METHODDEF - #define SHA512TYPE_UPDATE_METHODDEF -#endif /* !defined(SHA512TYPE_UPDATE_METHODDEF) */ - -#ifndef _SHA512_SHA512_METHODDEF - #define _SHA512_SHA512_METHODDEF -#endif /* !defined(_SHA512_SHA512_METHODDEF) */ - -#ifndef _SHA512_SHA384_METHODDEF - #define _SHA512_SHA384_METHODDEF -#endif /* !defined(_SHA512_SHA384_METHODDEF) */ -/*[clinic end generated code: output=bb87f494df50ffc0 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=18f15598c3487045 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h index c8f4cd5..f8d5bd9 100644 --- a/Modules/clinic/signalmodule.c.h +++ b/Modules/clinic/signalmodule.c.h @@ -23,11 +23,13 @@ signal_alarm(PyObject *module, PyObject *arg) int seconds; long _return_value; - if (!PyArg_Parse(arg, "i:alarm", &seconds)) + if (!PyArg_Parse(arg, "i:alarm", &seconds)) { goto exit; + } _return_value = signal_alarm_impl(module, seconds); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -85,8 +87,9 @@ signal_signal(PyObject *module, PyObject *args) PyObject *handler; if (!PyArg_ParseTuple(args, "iO:signal", - &signalnum, &handler)) + &signalnum, &handler)) { goto exit; + } return_value = signal_signal_impl(module, signalnum, handler); exit: @@ -117,8 +120,9 @@ signal_getsignal(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int signalnum; - if (!PyArg_Parse(arg, "i:getsignal", &signalnum)) + if (!PyArg_Parse(arg, "i:getsignal", &signalnum)) { goto exit; + } return_value = signal_getsignal_impl(module, signalnum); exit: @@ -150,8 +154,9 @@ signal_siginterrupt(PyObject *module, PyObject *args) int flag; if (!PyArg_ParseTuple(args, "ii:siginterrupt", - &signalnum, &flag)) + &signalnum, &flag)) { goto exit; + } return_value = signal_siginterrupt_impl(module, signalnum, flag); exit: @@ -189,8 +194,9 @@ signal_setitimer(PyObject *module, PyObject *args) double interval = 0.0; if (!PyArg_ParseTuple(args, "id|d:setitimer", - &which, &seconds, &interval)) + &which, &seconds, &interval)) { goto exit; + } return_value = signal_setitimer_impl(module, which, seconds, interval); exit: @@ -219,8 +225,9 @@ signal_getitimer(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int which; - if (!PyArg_Parse(arg, "i:getitimer", &which)) + if (!PyArg_Parse(arg, "i:getitimer", &which)) { goto exit; + } return_value = signal_getitimer_impl(module, which); exit: @@ -251,8 +258,9 @@ signal_pthread_sigmask(PyObject *module, PyObject *args) PyObject *mask; if (!PyArg_ParseTuple(args, "iO:pthread_sigmask", - &how, &mask)) + &how, &mask)) { goto exit; + } return_value = signal_pthread_sigmask_impl(module, how, mask); exit: @@ -344,8 +352,9 @@ signal_sigtimedwait(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "sigtimedwait", 2, 2, - &sigset, &timeout_obj)) + &sigset, &timeout_obj)) { goto exit; + } return_value = signal_sigtimedwait_impl(module, sigset, timeout_obj); exit: @@ -376,8 +385,9 @@ signal_pthread_kill(PyObject *module, PyObject *args) int signalnum; if (!PyArg_ParseTuple(args, "li:pthread_kill", - &thread_id, &signalnum)) + &thread_id, &signalnum)) { goto exit; + } return_value = signal_pthread_kill_impl(module, thread_id, signalnum); exit: @@ -429,4 +439,4 @@ exit: #ifndef SIGNAL_PTHREAD_KILL_METHODDEF #define SIGNAL_PTHREAD_KILL_METHODDEF #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */ -/*[clinic end generated code: output=dafa598412bfb8d2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c6990ef0d0ba72b6 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/spwdmodule.c.h b/Modules/clinic/spwdmodule.c.h index e26acf1..b2479ff 100644 --- a/Modules/clinic/spwdmodule.c.h +++ b/Modules/clinic/spwdmodule.c.h @@ -24,8 +24,9 @@ spwd_getspnam(PyObject *module, PyObject *arg_) PyObject *return_value = NULL; PyObject *arg; - if (!PyArg_Parse(arg_, "U:getspnam", &arg)) + if (!PyArg_Parse(arg_, "U:getspnam", &arg)) { goto exit; + } return_value = spwd_getspnam_impl(module, arg); exit: @@ -65,4 +66,4 @@ spwd_getspall(PyObject *module, PyObject *Py_UNUSED(ignored)) #ifndef SPWD_GETSPALL_METHODDEF #define SPWD_GETSPALL_METHODDEF #endif /* !defined(SPWD_GETSPALL_METHODDEF) */ -/*[clinic end generated code: output=510f681b36f54c30 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=07cd8af0afd77fe7 input=a9049054013a1b77]*/ diff --git a/Modules/clinic/unicodedata.c.h b/Modules/clinic/unicodedata.c.h index d520c1e..d481ccb 100644 --- a/Modules/clinic/unicodedata.c.h +++ b/Modules/clinic/unicodedata.c.h @@ -27,8 +27,9 @@ unicodedata_UCD_decimal(PyObject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "C|O:decimal", - &chr, &default_value)) + &chr, &default_value)) { goto exit; + } return_value = unicodedata_UCD_decimal_impl(self, chr, default_value); exit: @@ -59,8 +60,9 @@ unicodedata_UCD_digit(PyObject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "C|O:digit", - &chr, &default_value)) + &chr, &default_value)) { goto exit; + } return_value = unicodedata_UCD_digit_impl(self, chr, default_value); exit: @@ -92,8 +94,9 @@ unicodedata_UCD_numeric(PyObject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "C|O:numeric", - &chr, &default_value)) + &chr, &default_value)) { goto exit; + } return_value = unicodedata_UCD_numeric_impl(self, chr, default_value); exit: @@ -118,8 +121,9 @@ unicodedata_UCD_category(PyObject *self, PyObject *arg) PyObject *return_value = NULL; int chr; - if (!PyArg_Parse(arg, "C:category", &chr)) + if (!PyArg_Parse(arg, "C:category", &chr)) { goto exit; + } return_value = unicodedata_UCD_category_impl(self, chr); exit: @@ -146,8 +150,9 @@ unicodedata_UCD_bidirectional(PyObject *self, PyObject *arg) PyObject *return_value = NULL; int chr; - if (!PyArg_Parse(arg, "C:bidirectional", &chr)) + if (!PyArg_Parse(arg, "C:bidirectional", &chr)) { goto exit; + } return_value = unicodedata_UCD_bidirectional_impl(self, chr); exit: @@ -175,11 +180,13 @@ unicodedata_UCD_combining(PyObject *self, PyObject *arg) int chr; int _return_value; - if (!PyArg_Parse(arg, "C:combining", &chr)) + if (!PyArg_Parse(arg, "C:combining", &chr)) { goto exit; + } _return_value = unicodedata_UCD_combining_impl(self, chr); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -208,11 +215,13 @@ unicodedata_UCD_mirrored(PyObject *self, PyObject *arg) int chr; int _return_value; - if (!PyArg_Parse(arg, "C:mirrored", &chr)) + if (!PyArg_Parse(arg, "C:mirrored", &chr)) { goto exit; + } _return_value = unicodedata_UCD_mirrored_impl(self, chr); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -237,8 +246,9 @@ unicodedata_UCD_east_asian_width(PyObject *self, PyObject *arg) PyObject *return_value = NULL; int chr; - if (!PyArg_Parse(arg, "C:east_asian_width", &chr)) + if (!PyArg_Parse(arg, "C:east_asian_width", &chr)) { goto exit; + } return_value = unicodedata_UCD_east_asian_width_impl(self, chr); exit: @@ -265,8 +275,9 @@ unicodedata_UCD_decomposition(PyObject *self, PyObject *arg) PyObject *return_value = NULL; int chr; - if (!PyArg_Parse(arg, "C:decomposition", &chr)) + if (!PyArg_Parse(arg, "C:decomposition", &chr)) { goto exit; + } return_value = unicodedata_UCD_decomposition_impl(self, chr); exit: @@ -296,8 +307,9 @@ unicodedata_UCD_normalize(PyObject *self, PyObject *args) PyObject *input; if (!PyArg_ParseTuple(args, "sO!:normalize", - &form, &PyUnicode_Type, &input)) + &form, &PyUnicode_Type, &input)) { goto exit; + } return_value = unicodedata_UCD_normalize_impl(self, form, input); exit: @@ -327,8 +339,9 @@ unicodedata_UCD_name(PyObject *self, PyObject *args) PyObject *default_value = NULL; if (!PyArg_ParseTuple(args, "C|O:name", - &chr, &default_value)) + &chr, &default_value)) { goto exit; + } return_value = unicodedata_UCD_name_impl(self, chr, default_value); exit: @@ -358,11 +371,12 @@ unicodedata_UCD_lookup(PyObject *self, PyObject *arg) const char *name; Py_ssize_clean_t name_length; - if (!PyArg_Parse(arg, "s#:lookup", &name, &name_length)) + if (!PyArg_Parse(arg, "s#:lookup", &name, &name_length)) { goto exit; + } return_value = unicodedata_UCD_lookup_impl(self, name, name_length); exit: return return_value; } -/*[clinic end generated code: output=4f8da33c6bc6efc9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5313ce129da87b2f input=a9049054013a1b77]*/ diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h index b1af7ce..fda392a 100644 --- a/Modules/clinic/zlibmodule.c.h +++ b/Modules/clinic/zlibmodule.c.h @@ -3,44 +3,48 @@ preserve [clinic start generated code]*/ PyDoc_STRVAR(zlib_compress__doc__, -"compress($module, bytes, level=Z_DEFAULT_COMPRESSION, /)\n" +"compress($module, data, /, level=Z_DEFAULT_COMPRESSION)\n" "--\n" "\n" "Returns a bytes object containing compressed data.\n" "\n" -" bytes\n" +" data\n" " Binary data to be compressed.\n" " level\n" -" Compression level, in 0-9."); +" Compression level, in 0-9 or -1."); #define ZLIB_COMPRESS_METHODDEF \ - {"compress", (PyCFunction)zlib_compress, METH_VARARGS, zlib_compress__doc__}, + {"compress", (PyCFunction)zlib_compress, METH_FASTCALL, zlib_compress__doc__}, static PyObject * -zlib_compress_impl(PyObject *module, Py_buffer *bytes, int level); +zlib_compress_impl(PyObject *module, Py_buffer *data, int level); static PyObject * -zlib_compress(PyObject *module, PyObject *args) +zlib_compress(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - Py_buffer bytes = {NULL, NULL}; + static const char * const _keywords[] = {"", "level", NULL}; + static _PyArg_Parser _parser = {"y*|i:compress", _keywords, 0}; + Py_buffer data = {NULL, NULL}; int level = Z_DEFAULT_COMPRESSION; - if (!PyArg_ParseTuple(args, "y*|i:compress", - &bytes, &level)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &level)) { goto exit; - return_value = zlib_compress_impl(module, &bytes, level); + } + return_value = zlib_compress_impl(module, &data, level); exit: - /* Cleanup for bytes */ - if (bytes.obj) - PyBuffer_Release(&bytes); + /* Cleanup for data */ + if (data.obj) { + PyBuffer_Release(&data); + } return return_value; } PyDoc_STRVAR(zlib_decompress__doc__, -"decompress($module, data, wbits=MAX_WBITS, bufsize=DEF_BUF_SIZE, /)\n" +"decompress($module, data, /, wbits=MAX_WBITS, bufsize=DEF_BUF_SIZE)\n" "--\n" "\n" "Returns a bytes object containing the uncompressed data.\n" @@ -53,29 +57,33 @@ PyDoc_STRVAR(zlib_decompress__doc__, " The initial output buffer size."); #define ZLIB_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)zlib_decompress, METH_VARARGS, zlib_decompress__doc__}, + {"decompress", (PyCFunction)zlib_decompress, METH_FASTCALL, zlib_decompress__doc__}, static PyObject * zlib_decompress_impl(PyObject *module, Py_buffer *data, int wbits, Py_ssize_t bufsize); static PyObject * -zlib_decompress(PyObject *module, PyObject *args) +zlib_decompress(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"", "wbits", "bufsize", NULL}; + static _PyArg_Parser _parser = {"y*|iO&:decompress", _keywords, 0}; Py_buffer data = {NULL, NULL}; int wbits = MAX_WBITS; Py_ssize_t bufsize = DEF_BUF_SIZE; - if (!PyArg_ParseTuple(args, "y*|iO&:decompress", - &data, &wbits, ssize_t_converter, &bufsize)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, &wbits, ssize_t_converter, &bufsize)) { goto exit; + } return_value = zlib_decompress_impl(module, &data, wbits, bufsize); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -111,17 +119,18 @@ PyDoc_STRVAR(zlib_compressobj__doc__, " containing subsequences that are likely to occur in the input data."); #define ZLIB_COMPRESSOBJ_METHODDEF \ - {"compressobj", (PyCFunction)zlib_compressobj, METH_VARARGS|METH_KEYWORDS, zlib_compressobj__doc__}, + {"compressobj", (PyCFunction)zlib_compressobj, METH_FASTCALL, zlib_compressobj__doc__}, static PyObject * zlib_compressobj_impl(PyObject *module, int level, int method, int wbits, int memLevel, int strategy, Py_buffer *zdict); static PyObject * -zlib_compressobj(PyObject *module, PyObject *args, PyObject *kwargs) +zlib_compressobj(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"level", "method", "wbits", "memLevel", "strategy", "zdict", NULL}; + static const char * const _keywords[] = {"level", "method", "wbits", "memLevel", "strategy", "zdict", NULL}; + static _PyArg_Parser _parser = {"|iiiiiy*:compressobj", _keywords, 0}; int level = Z_DEFAULT_COMPRESSION; int method = DEFLATED; int wbits = MAX_WBITS; @@ -129,15 +138,17 @@ zlib_compressobj(PyObject *module, PyObject *args, PyObject *kwargs) int strategy = Z_DEFAULT_STRATEGY; Py_buffer zdict = {NULL, NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iiiiiy*:compressobj", _keywords, - &level, &method, &wbits, &memLevel, &strategy, &zdict)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &level, &method, &wbits, &memLevel, &strategy, &zdict)) { goto exit; + } return_value = zlib_compressobj_impl(module, level, method, wbits, memLevel, strategy, &zdict); exit: /* Cleanup for zdict */ - if (zdict.obj) + if (zdict.obj) { PyBuffer_Release(&zdict); + } return return_value; } @@ -155,22 +166,24 @@ PyDoc_STRVAR(zlib_decompressobj__doc__, " dictionary as used by the compressor that produced the input data."); #define ZLIB_DECOMPRESSOBJ_METHODDEF \ - {"decompressobj", (PyCFunction)zlib_decompressobj, METH_VARARGS|METH_KEYWORDS, zlib_decompressobj__doc__}, + {"decompressobj", (PyCFunction)zlib_decompressobj, METH_FASTCALL, zlib_decompressobj__doc__}, static PyObject * zlib_decompressobj_impl(PyObject *module, int wbits, PyObject *zdict); static PyObject * -zlib_decompressobj(PyObject *module, PyObject *args, PyObject *kwargs) +zlib_decompressobj(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"wbits", "zdict", NULL}; + static const char * const _keywords[] = {"wbits", "zdict", NULL}; + static _PyArg_Parser _parser = {"|iO:decompressobj", _keywords, 0}; int wbits = MAX_WBITS; PyObject *zdict = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iO:decompressobj", _keywords, - &wbits, &zdict)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &wbits, &zdict)) { goto exit; + } return_value = zlib_decompressobj_impl(module, wbits, zdict); exit: @@ -202,20 +215,22 @@ zlib_Compress_compress(compobject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:compress", &data)) + if (!PyArg_Parse(arg, "y*:compress", &data)) { goto exit; + } return_value = zlib_Compress_compress_impl(self, &data); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } PyDoc_STRVAR(zlib_Decompress_decompress__doc__, -"decompress($self, data, max_length=0, /)\n" +"decompress($self, data, /, max_length=0)\n" "--\n" "\n" "Return a bytes object containing the decompressed version of the data.\n" @@ -232,28 +247,32 @@ PyDoc_STRVAR(zlib_Decompress_decompress__doc__, "Call the flush() method to clear these buffers."); #define ZLIB_DECOMPRESS_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_VARARGS, zlib_Decompress_decompress__doc__}, + {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_FASTCALL, zlib_Decompress_decompress__doc__}, static PyObject * zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, Py_ssize_t max_length); static PyObject * -zlib_Decompress_decompress(compobject *self, PyObject *args) +zlib_Decompress_decompress(compobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"", "max_length", NULL}; + static _PyArg_Parser _parser = {"y*|O&:decompress", _keywords, 0}; Py_buffer data = {NULL, NULL}; Py_ssize_t max_length = 0; - if (!PyArg_ParseTuple(args, "y*|O&:decompress", - &data, ssize_t_converter, &max_length)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &data, ssize_t_converter, &max_length)) { goto exit; + } return_value = zlib_Decompress_decompress_impl(self, &data, max_length); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -283,8 +302,9 @@ zlib_Compress_flush(compobject *self, PyObject *args) int mode = Z_FINISH; if (!PyArg_ParseTuple(args, "|i:flush", - &mode)) + &mode)) { goto exit; + } return_value = zlib_Compress_flush_impl(self, mode); exit: @@ -357,8 +377,9 @@ zlib_Decompress_flush(compobject *self, PyObject *args) Py_ssize_t length = DEF_BUF_SIZE; if (!PyArg_ParseTuple(args, "|O&:flush", - ssize_t_converter, &length)) + ssize_t_converter, &length)) { goto exit; + } return_value = zlib_Decompress_flush_impl(self, length); exit: @@ -390,14 +411,16 @@ zlib_adler32(PyObject *module, PyObject *args) unsigned int value = 1; if (!PyArg_ParseTuple(args, "y*|I:adler32", - &data, &value)) + &data, &value)) { goto exit; + } return_value = zlib_adler32_impl(module, &data, value); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -427,14 +450,16 @@ zlib_crc32(PyObject *module, PyObject *args) unsigned int value = 0; if (!PyArg_ParseTuple(args, "y*|I:crc32", - &data, &value)) + &data, &value)) { goto exit; + } return_value = zlib_crc32_impl(module, &data, value); exit: /* Cleanup for data */ - if (data.obj) + if (data.obj) { PyBuffer_Release(&data); + } return return_value; } @@ -442,4 +467,4 @@ exit: #ifndef ZLIB_COMPRESS_COPY_METHODDEF #define ZLIB_COMPRESS_COPY_METHODDEF #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */ -/*[clinic end generated code: output=7711ef02d1d5776c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=3a4e2bfe750423a3 input=a9049054013a1b77]*/ diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c index cba42a7..8319767 100644 --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -81,6 +81,54 @@ else { #endif #define CM_SCALE_DOWN (-(CM_SCALE_UP+1)/2) +/* Constants cmath.inf, cmath.infj, cmath.nan, cmath.nanj. + cmath.nan and cmath.nanj are defined only when either + PY_NO_SHORT_FLOAT_REPR is *not* defined (which should be + the most common situation on machines using an IEEE 754 + representation), or Py_NAN is defined. */ + +static double +m_inf(void) +{ +#ifndef PY_NO_SHORT_FLOAT_REPR + return _Py_dg_infinity(0); +#else + return Py_HUGE_VAL; +#endif +} + +static Py_complex +c_infj(void) +{ + Py_complex r; + r.real = 0.0; + r.imag = m_inf(); + return r; +} + +#if !defined(PY_NO_SHORT_FLOAT_REPR) || defined(Py_NAN) + +static double +m_nan(void) +{ +#ifndef PY_NO_SHORT_FLOAT_REPR + return _Py_dg_stdnan(0); +#else + return Py_NAN; +#endif +} + +static Py_complex +c_nanj(void) +{ + Py_complex r; + r.real = 0.0; + r.imag = m_nan(); + return r; +} + +#endif + /* forward declarations */ static Py_complex cmath_asinh_impl(PyObject *, Py_complex); static Py_complex cmath_atanh_impl(PyObject *, Py_complex); @@ -1239,6 +1287,13 @@ PyInit_cmath(void) PyModule_AddObject(m, "pi", PyFloat_FromDouble(Py_MATH_PI)); PyModule_AddObject(m, "e", PyFloat_FromDouble(Py_MATH_E)); + PyModule_AddObject(m, "tau", PyFloat_FromDouble(Py_MATH_TAU)); /* 2pi */ + PyModule_AddObject(m, "inf", PyFloat_FromDouble(m_inf())); + PyModule_AddObject(m, "infj", PyComplex_FromCComplex(c_infj())); +#if !defined(PY_NO_SHORT_FLOAT_REPR) || defined(Py_NAN) + PyModule_AddObject(m, "nan", PyFloat_FromDouble(m_nan())); + PyModule_AddObject(m, "nanj", PyComplex_FromCComplex(c_nanj())); +#endif /* initialize special value tables */ diff --git a/Modules/expat/COPYING b/Modules/expat/COPYING index 8d288f0..dcb4506 100644 --- a/Modules/expat/COPYING +++ b/Modules/expat/COPYING @@ -1,5 +1,6 @@ -Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001-2017 Expat maintainers +Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/Modules/expat/amigaconfig.h b/Modules/expat/amigaconfig.h new file mode 100644 index 0000000..86c6115 --- /dev/null +++ b/Modules/expat/amigaconfig.h @@ -0,0 +1,32 @@ +#ifndef AMIGACONFIG_H +#define AMIGACONFIG_H + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER 4321 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_CHECK_H + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* whether byteorder is bigendian */ +#define WORDS_BIGENDIAN + +/* Define to specify how much context to retain around the current parse + point. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS + +#endif /* AMIGACONFIG_H */ diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h index 28b0f95..e8eefdd 100644 --- a/Modules/expat/expat.h +++ b/Modules/expat/expat.h @@ -95,9 +95,7 @@ enum XML_Error { /* Added in 2.0. */ XML_ERROR_RESERVED_PREFIX_XML, XML_ERROR_RESERVED_PREFIX_XMLNS, - XML_ERROR_RESERVED_NAMESPACE_URI, - /* Added in 2.2.1. */ - XML_ERROR_INVALID_ARGUMENT + XML_ERROR_RESERVED_NAMESPACE_URI }; enum XML_Content_Type { @@ -344,7 +342,7 @@ XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); /* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superseded by the EntityDeclHandler above. + This handler has been superceded by the EntityDeclHandler above. It is provided here for backward compatibility. This is called for a declaration of an unparsed (NDATA) entity. @@ -708,7 +706,6 @@ XML_UseParserAsHandlerArg(XML_Parser parser); be called, despite an external subset being parsed. Note: If XML_DTD is not defined when Expat is compiled, returns XML_ERROR_FEATURE_REQUIRES_XML_DTD. - Note: If parser == NULL, returns XML_ERROR_INVALID_ARGUMENT. */ XMLPARSEAPI(enum XML_Error) XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD); @@ -732,16 +729,15 @@ XML_GetBase(XML_Parser parser); to the XML_StartElementHandler that were specified in the start-tag rather than defaulted. Each attribute/value pair counts as 2; thus this correspondds to an index into the atts array passed to the - XML_StartElementHandler. Returns -1 if parser == NULL. + XML_StartElementHandler. */ XMLPARSEAPI(int) XML_GetSpecifiedAttributeCount(XML_Parser parser); /* Returns the index of the ID attribute passed in the last call to - XML_StartElementHandler, or -1 if there is no ID attribute or - parser == NULL. Each attribute/value pair counts as 2; thus this - correspondds to an index into the atts array passed to the - XML_StartElementHandler. + XML_StartElementHandler, or -1 if there is no ID attribute. Each + attribute/value pair counts as 2; thus this correspondds to an + index into the atts array passed to the XML_StartElementHandler. */ XMLPARSEAPI(int) XML_GetIdAttributeIndex(XML_Parser parser); @@ -905,7 +901,6 @@ enum XML_ParamEntityParsing { entities is requested; otherwise it will return non-zero. Note: If XML_SetParamEntityParsing is called after XML_Parse or XML_ParseBuffer, then it has no effect and will always return 0. - Note: If parser == NULL, the function will do nothing and return 0. */ XMLPARSEAPI(int) XML_SetParamEntityParsing(XML_Parser parser, @@ -915,12 +910,13 @@ XML_SetParamEntityParsing(XML_Parser parser, Helps in preventing DoS attacks based on predicting hash function behavior. This must be called before parsing is started. Returns 1 if successful, 0 when called after parsing has started. - Note: If parser == NULL, the function will do nothing and return 0. */ XMLPARSEAPI(int) XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt); +#define XML_HAS_SET_HASH_SALT /* Python Only: Defined for pyexpat.c. */ + /* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then XML_GetErrorCode returns information about the error. */ @@ -942,10 +938,6 @@ XML_GetErrorCode(XML_Parser parser); the location is the location of the character at which the error was detected; otherwise the location is the location of the last parse event, as described above. - - Note: XML_GetCurrentLineNumber and XML_GetCurrentColumnNumber - return 0 to indicate an error. - Note: XML_GetCurrentByteIndex returns -1 to indicate an error. */ XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser); XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser); @@ -983,12 +975,9 @@ XML_FreeContentModel(XML_Parser parser, XML_Content *model); /* Exposing the memory handling functions used in Expat */ XMLPARSEAPI(void *) -XML_ATTR_MALLOC -XML_ATTR_ALLOC_SIZE(2) XML_MemMalloc(XML_Parser parser, size_t size); XMLPARSEAPI(void *) -XML_ATTR_ALLOC_SIZE(3) XML_MemRealloc(XML_Parser parser, void *ptr, size_t size); XMLPARSEAPI(void) @@ -1044,11 +1033,13 @@ XMLPARSEAPI(const XML_Feature *) XML_GetFeatureList(void); -/* Expat follows the semantic versioning convention. - See http://semver.org. +/* Expat follows the GNU/Linux convention of odd number minor version for + beta/development releases and even number minor version for stable + releases. Micro is bumped with each release, and set to 0 with each + change to major or minor version. */ #define XML_MAJOR_VERSION 2 -#define XML_MINOR_VERSION 2 +#define XML_MINOR_VERSION 1 #define XML_MICRO_VERSION 1 #ifdef __cplusplus diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h index 4c9e5ea..f337e1c 100644 --- a/Modules/expat/expat_external.h +++ b/Modules/expat/expat_external.h @@ -69,26 +69,12 @@ #endif #endif /* not defined XML_STATIC */ -#if !defined(XMLIMPORT) && defined(__GNUC__) && (__GNUC__ >= 4) -#define XMLIMPORT __attribute__ ((visibility ("default"))) -#endif /* If we didn't define it above, define it away: */ #ifndef XMLIMPORT #define XMLIMPORT #endif -#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)) -#define XML_ATTR_MALLOC __attribute__((__malloc__)) -#else -#define XML_ATTR_MALLOC -#endif - -#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) -#define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) -#else -#define XML_ATTR_ALLOC_SIZE(x) -#endif #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL @@ -97,10 +83,7 @@ extern "C" { #endif #ifdef XML_UNICODE_WCHAR_T -# define XML_UNICODE -# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2) -# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc" -# endif +#define XML_UNICODE #endif #ifdef XML_UNICODE /* Information is UTF-16 encoded. */ diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h index 94cb98e..dd54548 100644 --- a/Modules/expat/internal.h +++ b/Modules/expat/internal.h @@ -71,25 +71,3 @@ #define inline #endif #endif - -#ifndef UNUSED_P -# ifdef __GNUC__ -# define UNUSED_P(p) UNUSED_ ## p __attribute__((__unused__)) -# else -# define UNUSED_P(p) UNUSED_ ## p -# endif -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - - -void -align_limit_to_full_utf8_characters(const char * from, const char ** fromLimRef); - - -#ifdef __cplusplus -} -#endif diff --git a/Modules/expat/macconfig.h b/Modules/expat/macconfig.h new file mode 100644 index 0000000..2725caa --- /dev/null +++ b/Modules/expat/macconfig.h @@ -0,0 +1,53 @@ +/*================================================================ +** Copyright 2000, Clark Cooper +** All rights reserved. +** +** This is free software. You are permitted to copy, distribute, or modify +** it under the terms of the MIT/X license (contained in the COPYING file +** with this distribution.) +** +*/ + +#ifndef MACCONFIG_H +#define MACCONFIG_H + + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER 4321 + +/* Define to 1 if you have the `bcopy' function. */ +#undef HAVE_BCOPY + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* whether byteorder is bigendian */ +#define WORDS_BIGENDIAN + +/* Define to specify how much context to retain around the current parse + point. */ +#undef XML_CONTEXT_BYTES + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `long' if does not define. */ +#define off_t long + +/* Define to `unsigned' if does not define. */ +#undef size_t + + +#endif /* ifndef MACCONFIG_H */ diff --git a/Modules/expat/siphash.h b/Modules/expat/siphash.h deleted file mode 100644 index 23b56d2..0000000 --- a/Modules/expat/siphash.h +++ /dev/null @@ -1,344 +0,0 @@ -/* ========================================================================== - * siphash.h - SipHash-2-4 in a single header file - * -------------------------------------------------------------------------- - * Derived by William Ahern from the reference implementation[1] published[2] - * by Jean-Philippe Aumasson and Daniel J. Berstein. Licensed in kind. - * by Jean-Philippe Aumasson and Daniel J. Berstein. - * Minimal changes by Sebastian Pipping on top, details below. - * Licensed under the CC0 Public Domain Dedication license. - * - * 1. https://www.131002.net/siphash/siphash24.c - * 2. https://www.131002.net/siphash/ - * -------------------------------------------------------------------------- - * HISTORY: - * - * 2017-06-10 (Sebastian Pipping) - * - Clarify license note in the header - * - Address C89 issues: - * - Stop using inline keyword (and let compiler decide) - * - Turn integer suffix ULL to UL - * - Replace _Bool by int - * - Turn macro siphash24 into a function - * - Address invalid conversion (void pointer) by explicit cast - * - Always expose sip24_valid (for self-tests) - * - * 2012-11-04 - Born. (William Ahern) - * -------------------------------------------------------------------------- - * USAGE: - * - * SipHash-2-4 takes as input two 64-bit words as the key, some number of - * message bytes, and outputs a 64-bit word as the message digest. This - * implementation employs two data structures: a struct sipkey for - * representing the key, and a struct siphash for representing the hash - * state. - * - * For converting a 16-byte unsigned char array to a key, use either the - * macro sip_keyof or the routine sip_tokey. The former instantiates a - * compound literal key, while the latter requires a key object as a - * parameter. - * - * unsigned char secret[16]; - * arc4random_buf(secret, sizeof secret); - * struct sipkey *key = sip_keyof(secret); - * - * For hashing a message, use either the convenience macro siphash24 or the - * routines sip24_init, sip24_update, and sip24_final. - * - * struct siphash state; - * void *msg; - * size_t len; - * uint64_t hash; - * - * sip24_init(&state, key); - * sip24_update(&state, msg, len); - * hash = sip24_final(&state); - * - * or - * - * hash = siphash24(msg, len, key); - * - * To convert the 64-bit hash value to a canonical 8-byte little-endian - * binary representation, use either the macro sip_binof or the routine - * sip_tobin. The former instantiates and returns a compound literal array, - * while the latter requires an array object as a parameter. - * -------------------------------------------------------------------------- - * NOTES: - * - * o Neither sip_keyof, sip_binof, nor siphash24 will work with compilers - * lacking compound literal support. Instead, you must use the lower-level - * interfaces which take as parameters the temporary state objects. - * - * o Uppercase macros may evaluate parameters more than once. Lowercase - * macros should not exhibit any such side effects. - * ========================================================================== - */ -#ifndef SIPHASH_H -#define SIPHASH_H - -#include /* size_t */ -#include /* uint64_t uint32_t uint8_t */ - - -#define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b)))) - -#define SIP_U32TO8_LE(p, v) \ - (p)[0] = (uint8_t)((v) >> 0); (p)[1] = (uint8_t)((v) >> 8); \ - (p)[2] = (uint8_t)((v) >> 16); (p)[3] = (uint8_t)((v) >> 24); - -#define SIP_U64TO8_LE(p, v) \ - SIP_U32TO8_LE((p) + 0, (uint32_t)((v) >> 0)); \ - SIP_U32TO8_LE((p) + 4, (uint32_t)((v) >> 32)); - -#define SIP_U8TO64_LE(p) \ - (((uint64_t)((p)[0]) << 0) | \ - ((uint64_t)((p)[1]) << 8) | \ - ((uint64_t)((p)[2]) << 16) | \ - ((uint64_t)((p)[3]) << 24) | \ - ((uint64_t)((p)[4]) << 32) | \ - ((uint64_t)((p)[5]) << 40) | \ - ((uint64_t)((p)[6]) << 48) | \ - ((uint64_t)((p)[7]) << 56)) - - -#define SIPHASH_INITIALIZER { 0, 0, 0, 0, { 0 }, 0, 0 } - -struct siphash { - uint64_t v0, v1, v2, v3; - - unsigned char buf[8], *p; - uint64_t c; -}; /* struct siphash */ - - -#define SIP_KEYLEN 16 - -struct sipkey { - uint64_t k[2]; -}; /* struct sipkey */ - -#define sip_keyof(k) sip_tokey(&(struct sipkey){ { 0 } }, (k)) - -static struct sipkey *sip_tokey(struct sipkey *key, const void *src) { - key->k[0] = SIP_U8TO64_LE((const unsigned char *)src); - key->k[1] = SIP_U8TO64_LE((const unsigned char *)src + 8); - return key; -} /* sip_tokey() */ - - -#define sip_binof(v) sip_tobin((unsigned char[8]){ 0 }, (v)) - -static void *sip_tobin(void *dst, uint64_t u64) { - SIP_U64TO8_LE((unsigned char *)dst, u64); - return dst; -} /* sip_tobin() */ - - -static void sip_round(struct siphash *H, const int rounds) { - int i; - - for (i = 0; i < rounds; i++) { - H->v0 += H->v1; - H->v1 = SIP_ROTL(H->v1, 13); - H->v1 ^= H->v0; - H->v0 = SIP_ROTL(H->v0, 32); - - H->v2 += H->v3; - H->v3 = SIP_ROTL(H->v3, 16); - H->v3 ^= H->v2; - - H->v0 += H->v3; - H->v3 = SIP_ROTL(H->v3, 21); - H->v3 ^= H->v0; - - H->v2 += H->v1; - H->v1 = SIP_ROTL(H->v1, 17); - H->v1 ^= H->v2; - H->v2 = SIP_ROTL(H->v2, 32); - } -} /* sip_round() */ - - -static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) { - H->v0 = 0x736f6d6570736575UL ^ key->k[0]; - H->v1 = 0x646f72616e646f6dUL ^ key->k[1]; - H->v2 = 0x6c7967656e657261UL ^ key->k[0]; - H->v3 = 0x7465646279746573UL ^ key->k[1]; - - H->p = H->buf; - H->c = 0; - - return H; -} /* sip24_init() */ - - -#define sip_endof(a) (&(a)[sizeof (a) / sizeof *(a)]) - -static struct siphash *sip24_update(struct siphash *H, const void *src, size_t len) { - const unsigned char *p = (const unsigned char *)src, *pe = p + len; - uint64_t m; - - do { - while (p < pe && H->p < sip_endof(H->buf)) - *H->p++ = *p++; - - if (H->p < sip_endof(H->buf)) - break; - - m = SIP_U8TO64_LE(H->buf); - H->v3 ^= m; - sip_round(H, 2); - H->v0 ^= m; - - H->p = H->buf; - H->c += 8; - } while (p < pe); - - return H; -} /* sip24_update() */ - - -static uint64_t sip24_final(struct siphash *H) { - char left = H->p - H->buf; - uint64_t b = (H->c + left) << 56; - - switch (left) { - case 7: b |= (uint64_t)H->buf[6] << 48; - case 6: b |= (uint64_t)H->buf[5] << 40; - case 5: b |= (uint64_t)H->buf[4] << 32; - case 4: b |= (uint64_t)H->buf[3] << 24; - case 3: b |= (uint64_t)H->buf[2] << 16; - case 2: b |= (uint64_t)H->buf[1] << 8; - case 1: b |= (uint64_t)H->buf[0] << 0; - case 0: break; - } - - H->v3 ^= b; - sip_round(H, 2); - H->v0 ^= b; - H->v2 ^= 0xff; - sip_round(H, 4); - - return H->v0 ^ H->v1 ^ H->v2 ^ H->v3; -} /* sip24_final() */ - - -static uint64_t siphash24(const void *src, size_t len, const struct sipkey *key) { - struct siphash state = SIPHASH_INITIALIZER; - return sip24_final(sip24_update(sip24_init(&state, key), src, len)); -} /* siphash24() */ - - -/* - * SipHash-2-4 output with - * k = 00 01 02 ... - * and - * in = (empty string) - * in = 00 (1 byte) - * in = 00 01 (2 bytes) - * in = 00 01 02 (3 bytes) - * ... - * in = 00 01 02 ... 3e (63 bytes) - */ -static int sip24_valid(void) { - static const unsigned char vectors[64][8] = { - { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, }, - { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, }, - { 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, }, - { 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, }, - { 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, }, - { 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, }, - { 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, }, - { 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, }, - { 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, }, - { 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, }, - { 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, }, - { 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, }, - { 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, }, - { 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, }, - { 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, }, - { 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, }, - { 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, }, - { 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, }, - { 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, }, - { 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, }, - { 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, }, - { 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, }, - { 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, }, - { 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, }, - { 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, }, - { 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, }, - { 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, }, - { 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, }, - { 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, }, - { 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, }, - { 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, }, - { 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, }, - { 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, }, - { 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, }, - { 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, }, - { 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, }, - { 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, }, - { 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, }, - { 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, }, - { 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, }, - { 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, }, - { 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, }, - { 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, }, - { 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, }, - { 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, }, - { 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, }, - { 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, }, - { 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, }, - { 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, }, - { 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, }, - { 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, }, - { 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, }, - { 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, }, - { 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, }, - { 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, }, - { 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, }, - { 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, }, - { 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, }, - { 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, }, - { 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, }, - { 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, }, - { 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, }, - { 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, }, - { 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, } - }; - unsigned char in[64]; - struct sipkey k; - size_t i; - - sip_tokey(&k, "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"); - - for (i = 0; i < sizeof in; ++i) { - in[i] = i; - - if (siphash24(in, i, &k) != SIP_U8TO64_LE(vectors[i])) - return 0; - } - - return 1; -} /* sip24_valid() */ - - -#if SIPHASH_MAIN - -#include - -int main(void) { - int ok = sip24_valid(); - - if (ok) - puts("OK"); - else - puts("FAIL"); - - return !ok; -} /* main() */ - -#endif /* SIPHASH_MAIN */ - - -#endif /* SIPHASH_H */ diff --git a/Modules/expat/watcomconfig.h b/Modules/expat/watcomconfig.h new file mode 100644 index 0000000..2f05e3f --- /dev/null +++ b/Modules/expat/watcomconfig.h @@ -0,0 +1,47 @@ +/* expat_config.h for use with Open Watcom 1.5 and above. */ + +#ifndef WATCOMCONFIG_H +#define WATCOMCONFIG_H + +#ifdef __NT__ +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN +#endif + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER 1234 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "expat-bugs@mail.libexpat.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "expat 2.0.0" + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.0.0" + +/* Define to specify how much context to retain around the current parse + point. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +#endif + diff --git a/Modules/expat/winconfig.h b/Modules/expat/winconfig.h index 9bf014d..c1b791d 100644 --- a/Modules/expat/winconfig.h +++ b/Modules/expat/winconfig.h @@ -17,12 +17,6 @@ #include #include - -#if defined(HAVE_EXPAT_CONFIG_H) /* e.g. MinGW */ -# include -#else /* !defined(HAVE_EXPAT_CONFIG_H) */ - - #define XML_NS 1 #define XML_DTD 1 #define XML_CONTEXT_BYTES 1024 @@ -33,8 +27,4 @@ /* Windows has memmove() available. */ #define HAVE_MEMMOVE - -#endif /* !defined(HAVE_EXPAT_CONFIG_H) */ - - #endif /* ndef WINCONFIG_H */ diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c index daec151..4128387 100644 --- a/Modules/expat/xmlparse.c +++ b/Modules/expat/xmlparse.c @@ -1,37 +1,29 @@ /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd See the file COPYING for copying permission. - - 77fea421d361dca90041d0040ecf1dca651167fadf2af79e990e35168d70d933 (2.2.1+) */ -#define _GNU_SOURCE 1 /* syscall prototype */ - -#include -#include /* memset(), memcpy() */ -#include -#include /* UINT_MAX */ -#include /* fprintf */ -#include /* getenv */ - -#ifdef _WIN32 -#define getpid GetCurrentProcessId -#else -#include /* gettimeofday() */ -#include /* getpid() */ -#include /* getpid() */ -#endif - #define XML_BUILDING_EXPAT 1 -#ifdef _WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#include "macconfig.h" +#elif defined(__amigaos__) +#include "amigaconfig.h" +#elif defined(__WATCOMC__) +#include "watcomconfig.h" #elif defined(HAVE_EXPAT_CONFIG_H) #include -#endif /* ndef _WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ + +#include +#include /* memset(), memcpy() */ +#include +#include /* UINT_MAX */ +#include /* time() */ #include "ascii.h" #include "expat.h" -#include "siphash.h" #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX @@ -110,11 +102,17 @@ typedef struct { const XML_Memory_Handling_Suite *mem; } HASH_TABLE; -static size_t -keylen(KEY s); +/* Basic character hash algorithm, taken from Python's string hash: + h = h * 1000003 ^ character, the constant being a prime number. -static void -copy_salt_to_sipkey(XML_Parser parser, struct sipkey * key); +*/ +#ifdef XML_UNICODE +#define CHAR_HASH(h, c) \ + (((h) * 0xF4243) ^ (unsigned short)(c)) +#else +#define CHAR_HASH(h, c) \ + (((h) * 0xF4243) ^ (unsigned char)(c)) +#endif /* For probing (after a collision) we need a step size relative prime to the hash table size, which is a power of 2. We use double-hashing, @@ -350,8 +348,6 @@ doIgnoreSection(XML_Parser parser, const ENCODING *, const char **startPtr, const char *end, const char **nextPtr, XML_Bool haveMore); #endif /* XML_DTD */ -static void -freeBindings(XML_Parser parser, BINDING *bindings); static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *, const char *s, TAG_NAME *tagNamePtr, BINDING **bindingsPtr); @@ -436,7 +432,7 @@ static ELEMENT_TYPE * getElementType(XML_Parser parser, const ENCODING *enc, const char *ptr, const char *end); -static unsigned long generate_hash_secret_salt(XML_Parser parser); +static unsigned long generate_hash_secret_salt(void); static XML_Bool startParsing(XML_Parser parser); static XML_Parser @@ -694,155 +690,12 @@ static const XML_Char implicitContext[] = { ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0' }; - -#if defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) -# include - -# if defined(HAVE_GETRANDOM) -# include /* getrandom */ -# else -# include /* syscall */ -# include /* SYS_getrandom */ -# endif - -/* Obtain entropy on Linux 3.17+ */ -static int -writeRandomBytes_getrandom(void * target, size_t count) { - int success = 0; /* full count bytes written? */ - size_t bytesWrittenTotal = 0; - const unsigned int getrandomFlags = 0; - - do { - void * const currentTarget = (void*)((char*)target + bytesWrittenTotal); - const size_t bytesToWrite = count - bytesWrittenTotal; - - const int bytesWrittenMore = -#if defined(HAVE_GETRANDOM) - getrandom(currentTarget, bytesToWrite, getrandomFlags); -#else - syscall(SYS_getrandom, currentTarget, bytesToWrite, getrandomFlags); -#endif - - if (bytesWrittenMore > 0) { - bytesWrittenTotal += bytesWrittenMore; - if (bytesWrittenTotal >= count) - success = 1; - } - } while (! success && (errno == EINTR || errno == EAGAIN)); - - return success; -} - -#endif /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */ - - -#ifdef _WIN32 - -typedef BOOLEAN (APIENTRY *RTLGENRANDOM_FUNC)(PVOID, ULONG); - -/* Obtain entropy on Windows XP / Windows Server 2003 and later. - * Hint on RtlGenRandom and the following article from libsodioum. - * - * Michael Howard: Cryptographically Secure Random number on Windows without using CryptoAPI - * https://blogs.msdn.microsoft.com/michael_howard/2005/01/14/cryptographically-secure-random-number-on-windows-without-using-cryptoapi/ - */ -static int -writeRandomBytes_RtlGenRandom(void * target, size_t count) { - int success = 0; /* full count bytes written? */ - const HMODULE advapi32 = LoadLibrary("ADVAPI32.DLL"); - - if (advapi32) { - const RTLGENRANDOM_FUNC RtlGenRandom - = (RTLGENRANDOM_FUNC)GetProcAddress(advapi32, "SystemFunction036"); - if (RtlGenRandom) { - if (RtlGenRandom((PVOID)target, (ULONG)count) == TRUE) { - success = 1; - } - } - FreeLibrary(advapi32); - } - - return success; -} - -#endif /* _WIN32 */ - - static unsigned long -gather_time_entropy(void) +generate_hash_secret_salt(void) { -#ifdef _WIN32 - FILETIME ft; - GetSystemTimeAsFileTime(&ft); /* never fails */ - return ft.dwHighDateTime ^ ft.dwLowDateTime; -#else - struct timeval tv; - int gettimeofday_res; - - gettimeofday_res = gettimeofday(&tv, NULL); - assert (gettimeofday_res == 0); - - /* Microseconds time is <20 bits entropy */ - return tv.tv_usec; -#endif -} - -#if defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_LIBBSD) -# include -#endif - -static unsigned long -ENTROPY_DEBUG(const char * label, unsigned long entropy) { - const char * const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG"); - if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) { - fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n", - label, - (int)sizeof(entropy) * 2, entropy, - (unsigned long)sizeof(entropy)); - } - return entropy; -} - -static unsigned long -generate_hash_secret_salt(XML_Parser parser) -{ - unsigned long entropy; - (void)parser; -#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__) - (void)gather_time_entropy; - arc4random_buf(&entropy, sizeof(entropy)); - return ENTROPY_DEBUG("arc4random_buf", entropy); -#else - /* Try high quality providers first .. */ -#ifdef _WIN32 - if (writeRandomBytes_RtlGenRandom((void *)&entropy, sizeof(entropy))) { - return ENTROPY_DEBUG("RtlGenRandom", entropy); - } -#elif defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) - if (writeRandomBytes_getrandom((void *)&entropy, sizeof(entropy))) { - return ENTROPY_DEBUG("getrandom", entropy); - } -#endif - /* .. and self-made low quality for backup: */ - - /* Process ID is 0 bits entropy if attacker has local access */ - entropy = gather_time_entropy() ^ getpid(); - - /* Factors are 2^31-1 and 2^61-1 (Mersenne primes M31 and M61) */ - if (sizeof(unsigned long) == 4) { - return ENTROPY_DEBUG("fallback(4)", entropy * 2147483647); - } else { - return ENTROPY_DEBUG("fallback(8)", - entropy * (unsigned long)2305843009213693951); - } -#endif -} - -static unsigned long -get_hash_secret_salt(XML_Parser parser) { - if (parser->m_parentParser != NULL) - return get_hash_secret_salt(parser->m_parentParser); - return parser->m_hash_secret_salt; + unsigned int seed = time(NULL) % UINT_MAX; + srand(seed); + return rand(); } static XML_Bool /* only valid for root parser */ @@ -850,7 +703,7 @@ startParsing(XML_Parser parser) { /* hash functions must be initialized before setContext() is called */ if (hash_secret_salt == 0) - hash_secret_salt = generate_hash_secret_salt(parser); + hash_secret_salt = generate_hash_secret_salt(); if (ns) { /* implicit context only set for root parser, since child parsers (i.e. external entity parsers) will inherit it @@ -1073,10 +926,6 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName) { TAG *tStk; OPEN_INTERNAL_ENTITY *openEntityList; - - if (parser == NULL) - return XML_FALSE; - if (parentParser) return XML_FALSE; /* move tagStack to freeTagList */ @@ -1111,8 +960,6 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName) enum XML_Status XMLCALL XML_SetEncoding(XML_Parser parser, const XML_Char *encodingName) { - if (parser == NULL) - return XML_STATUS_ERROR; /* Block after XML_Parse()/XML_ParseBuffer() has been called. XXX There's no way for the caller to determine which of the XXX possible error cases caused the XML_STATUS_ERROR return. @@ -1136,88 +983,52 @@ XML_ExternalEntityParserCreate(XML_Parser oldParser, { XML_Parser parser = oldParser; DTD *newDtd = NULL; - DTD *oldDtd; - XML_StartElementHandler oldStartElementHandler; - XML_EndElementHandler oldEndElementHandler; - XML_CharacterDataHandler oldCharacterDataHandler; - XML_ProcessingInstructionHandler oldProcessingInstructionHandler; - XML_CommentHandler oldCommentHandler; - XML_StartCdataSectionHandler oldStartCdataSectionHandler; - XML_EndCdataSectionHandler oldEndCdataSectionHandler; - XML_DefaultHandler oldDefaultHandler; - XML_UnparsedEntityDeclHandler oldUnparsedEntityDeclHandler; - XML_NotationDeclHandler oldNotationDeclHandler; - XML_StartNamespaceDeclHandler oldStartNamespaceDeclHandler; - XML_EndNamespaceDeclHandler oldEndNamespaceDeclHandler; - XML_NotStandaloneHandler oldNotStandaloneHandler; - XML_ExternalEntityRefHandler oldExternalEntityRefHandler; - XML_SkippedEntityHandler oldSkippedEntityHandler; - XML_UnknownEncodingHandler oldUnknownEncodingHandler; - XML_ElementDeclHandler oldElementDeclHandler; - XML_AttlistDeclHandler oldAttlistDeclHandler; - XML_EntityDeclHandler oldEntityDeclHandler; - XML_XmlDeclHandler oldXmlDeclHandler; - ELEMENT_TYPE * oldDeclElementType; - - void *oldUserData; - void *oldHandlerArg; - XML_Bool oldDefaultExpandInternalEntities; - XML_Parser oldExternalEntityRefHandlerArg; -#ifdef XML_DTD - enum XML_ParamEntityParsing oldParamEntityParsing; - int oldInEntityValue; -#endif - XML_Bool oldns_triplets; - /* Note that the new parser shares the same hash secret as the old - parser, so that dtdCopy and copyEntityTable can lookup values - from hash tables associated with either parser without us having - to worry which hash secrets each table has. - */ - unsigned long oldhash_secret_salt; - - /* Validate the oldParser parameter before we pull everything out of it */ - if (oldParser == NULL) - return NULL; - - /* Stash the original parser contents on the stack */ - oldDtd = _dtd; - oldStartElementHandler = startElementHandler; - oldEndElementHandler = endElementHandler; - oldCharacterDataHandler = characterDataHandler; - oldProcessingInstructionHandler = processingInstructionHandler; - oldCommentHandler = commentHandler; - oldStartCdataSectionHandler = startCdataSectionHandler; - oldEndCdataSectionHandler = endCdataSectionHandler; - oldDefaultHandler = defaultHandler; - oldUnparsedEntityDeclHandler = unparsedEntityDeclHandler; - oldNotationDeclHandler = notationDeclHandler; - oldStartNamespaceDeclHandler = startNamespaceDeclHandler; - oldEndNamespaceDeclHandler = endNamespaceDeclHandler; - oldNotStandaloneHandler = notStandaloneHandler; - oldExternalEntityRefHandler = externalEntityRefHandler; - oldSkippedEntityHandler = skippedEntityHandler; - oldUnknownEncodingHandler = unknownEncodingHandler; - oldElementDeclHandler = elementDeclHandler; - oldAttlistDeclHandler = attlistDeclHandler; - oldEntityDeclHandler = entityDeclHandler; - oldXmlDeclHandler = xmlDeclHandler; - oldDeclElementType = declElementType; - - oldUserData = userData; - oldHandlerArg = handlerArg; - oldDefaultExpandInternalEntities = defaultExpandInternalEntities; - oldExternalEntityRefHandlerArg = externalEntityRefHandlerArg; + DTD *oldDtd = _dtd; + XML_StartElementHandler oldStartElementHandler = startElementHandler; + XML_EndElementHandler oldEndElementHandler = endElementHandler; + XML_CharacterDataHandler oldCharacterDataHandler = characterDataHandler; + XML_ProcessingInstructionHandler oldProcessingInstructionHandler + = processingInstructionHandler; + XML_CommentHandler oldCommentHandler = commentHandler; + XML_StartCdataSectionHandler oldStartCdataSectionHandler + = startCdataSectionHandler; + XML_EndCdataSectionHandler oldEndCdataSectionHandler + = endCdataSectionHandler; + XML_DefaultHandler oldDefaultHandler = defaultHandler; + XML_UnparsedEntityDeclHandler oldUnparsedEntityDeclHandler + = unparsedEntityDeclHandler; + XML_NotationDeclHandler oldNotationDeclHandler = notationDeclHandler; + XML_StartNamespaceDeclHandler oldStartNamespaceDeclHandler + = startNamespaceDeclHandler; + XML_EndNamespaceDeclHandler oldEndNamespaceDeclHandler + = endNamespaceDeclHandler; + XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler; + XML_ExternalEntityRefHandler oldExternalEntityRefHandler + = externalEntityRefHandler; + XML_SkippedEntityHandler oldSkippedEntityHandler = skippedEntityHandler; + XML_UnknownEncodingHandler oldUnknownEncodingHandler + = unknownEncodingHandler; + XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler; + XML_AttlistDeclHandler oldAttlistDeclHandler = attlistDeclHandler; + XML_EntityDeclHandler oldEntityDeclHandler = entityDeclHandler; + XML_XmlDeclHandler oldXmlDeclHandler = xmlDeclHandler; + ELEMENT_TYPE * oldDeclElementType = declElementType; + + void *oldUserData = userData; + void *oldHandlerArg = handlerArg; + XML_Bool oldDefaultExpandInternalEntities = defaultExpandInternalEntities; + XML_Parser oldExternalEntityRefHandlerArg = externalEntityRefHandlerArg; #ifdef XML_DTD - oldParamEntityParsing = paramEntityParsing; - oldInEntityValue = prologState.inEntityValue; + enum XML_ParamEntityParsing oldParamEntityParsing = paramEntityParsing; + int oldInEntityValue = prologState.inEntityValue; #endif - oldns_triplets = ns_triplets; + XML_Bool oldns_triplets = ns_triplets; /* Note that the new parser shares the same hash secret as the old parser, so that dtdCopy and copyEntityTable can lookup values from hash tables associated with either parser without us having to worry which hash secrets each table has. */ - oldhash_secret_salt = hash_secret_salt; + unsigned long oldhash_secret_salt = hash_secret_salt; #ifdef XML_DTD if (!context) @@ -1383,15 +1194,12 @@ XML_ParserFree(XML_Parser parser) void XMLCALL XML_UseParserAsHandlerArg(XML_Parser parser) { - if (parser != NULL) - handlerArg = parser; + handlerArg = parser; } enum XML_Error XMLCALL XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) { - if (parser == NULL) - return XML_ERROR_INVALID_ARGUMENT; #ifdef XML_DTD /* block after XML_Parse()/XML_ParseBuffer() has been called */ if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED) @@ -1406,8 +1214,6 @@ XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD) void XMLCALL XML_SetReturnNSTriplet(XML_Parser parser, int do_nst) { - if (parser == NULL) - return; /* block after XML_Parse()/XML_ParseBuffer() has been called */ if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED) return; @@ -1417,8 +1223,6 @@ XML_SetReturnNSTriplet(XML_Parser parser, int do_nst) void XMLCALL XML_SetUserData(XML_Parser parser, void *p) { - if (parser == NULL) - return; if (handlerArg == userData) handlerArg = userData = p; else @@ -1428,8 +1232,6 @@ XML_SetUserData(XML_Parser parser, void *p) enum XML_Status XMLCALL XML_SetBase(XML_Parser parser, const XML_Char *p) { - if (parser == NULL) - return XML_STATUS_ERROR; if (p) { p = poolCopyString(&_dtd->pool, p); if (!p) @@ -1444,24 +1246,18 @@ XML_SetBase(XML_Parser parser, const XML_Char *p) const XML_Char * XMLCALL XML_GetBase(XML_Parser parser) { - if (parser == NULL) - return NULL; return curBase; } int XMLCALL XML_GetSpecifiedAttributeCount(XML_Parser parser) { - if (parser == NULL) - return -1; return nSpecifiedAtts; } int XMLCALL XML_GetIdAttributeIndex(XML_Parser parser) { - if (parser == NULL) - return -1; return idAttIndex; } @@ -1469,8 +1265,6 @@ XML_GetIdAttributeIndex(XML_Parser parser) const XML_AttrInfo * XMLCALL XML_GetAttributeInfo(XML_Parser parser) { - if (parser == NULL) - return NULL; return attInfo; } #endif @@ -1480,8 +1274,6 @@ XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end) { - if (parser == NULL) - return; startElementHandler = start; endElementHandler = end; } @@ -1489,39 +1281,34 @@ XML_SetElementHandler(XML_Parser parser, void XMLCALL XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler start) { - if (parser != NULL) - startElementHandler = start; + startElementHandler = start; } void XMLCALL XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler end) { - if (parser != NULL) - endElementHandler = end; + endElementHandler = end; } void XMLCALL XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler handler) { - if (parser != NULL) - characterDataHandler = handler; + characterDataHandler = handler; } void XMLCALL XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler handler) { - if (parser != NULL) - processingInstructionHandler = handler; + processingInstructionHandler = handler; } void XMLCALL XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler) { - if (parser != NULL) - commentHandler = handler; + commentHandler = handler; } void XMLCALL @@ -1529,8 +1316,6 @@ XML_SetCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end) { - if (parser == NULL) - return; startCdataSectionHandler = start; endCdataSectionHandler = end; } @@ -1538,23 +1323,19 @@ XML_SetCdataSectionHandler(XML_Parser parser, void XMLCALL XML_SetStartCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start) { - if (parser != NULL) - startCdataSectionHandler = start; + startCdataSectionHandler = start; } void XMLCALL XML_SetEndCdataSectionHandler(XML_Parser parser, XML_EndCdataSectionHandler end) { - if (parser != NULL) - endCdataSectionHandler = end; + endCdataSectionHandler = end; } void XMLCALL XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler handler) { - if (parser == NULL) - return; defaultHandler = handler; defaultExpandInternalEntities = XML_FALSE; } @@ -1563,8 +1344,6 @@ void XMLCALL XML_SetDefaultHandlerExpand(XML_Parser parser, XML_DefaultHandler handler) { - if (parser == NULL) - return; defaultHandler = handler; defaultExpandInternalEntities = XML_TRUE; } @@ -1574,8 +1353,6 @@ XML_SetDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end) { - if (parser == NULL) - return; startDoctypeDeclHandler = start; endDoctypeDeclHandler = end; } @@ -1583,31 +1360,27 @@ XML_SetDoctypeDeclHandler(XML_Parser parser, void XMLCALL XML_SetStartDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start) { - if (parser != NULL) - startDoctypeDeclHandler = start; + startDoctypeDeclHandler = start; } void XMLCALL XML_SetEndDoctypeDeclHandler(XML_Parser parser, XML_EndDoctypeDeclHandler end) { - if (parser != NULL) - endDoctypeDeclHandler = end; + endDoctypeDeclHandler = end; } void XMLCALL XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler handler) { - if (parser != NULL) - unparsedEntityDeclHandler = handler; + unparsedEntityDeclHandler = handler; } void XMLCALL XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler handler) { - if (parser != NULL) - notationDeclHandler = handler; + notationDeclHandler = handler; } void XMLCALL @@ -1615,8 +1388,6 @@ XML_SetNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end) { - if (parser == NULL) - return; startNamespaceDeclHandler = start; endNamespaceDeclHandler = end; } @@ -1624,38 +1395,32 @@ XML_SetNamespaceDeclHandler(XML_Parser parser, void XMLCALL XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start) { - if (parser != NULL) - startNamespaceDeclHandler = start; + startNamespaceDeclHandler = start; } void XMLCALL XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end) { - if (parser != NULL) - endNamespaceDeclHandler = end; + endNamespaceDeclHandler = end; } void XMLCALL XML_SetNotStandaloneHandler(XML_Parser parser, XML_NotStandaloneHandler handler) { - if (parser != NULL) - notStandaloneHandler = handler; + notStandaloneHandler = handler; } void XMLCALL XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler handler) { - if (parser != NULL) - externalEntityRefHandler = handler; + externalEntityRefHandler = handler; } void XMLCALL XML_SetExternalEntityRefHandlerArg(XML_Parser parser, void *arg) { - if (parser == NULL) - return; if (arg) externalEntityRefHandlerArg = (XML_Parser)arg; else @@ -1666,8 +1431,7 @@ void XMLCALL XML_SetSkippedEntityHandler(XML_Parser parser, XML_SkippedEntityHandler handler) { - if (parser != NULL) - skippedEntityHandler = handler; + skippedEntityHandler = handler; } void XMLCALL @@ -1675,8 +1439,6 @@ XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, void *data) { - if (parser == NULL) - return; unknownEncodingHandler = handler; unknownEncodingHandlerData = data; } @@ -1685,39 +1447,33 @@ void XMLCALL XML_SetElementDeclHandler(XML_Parser parser, XML_ElementDeclHandler eldecl) { - if (parser != NULL) - elementDeclHandler = eldecl; + elementDeclHandler = eldecl; } void XMLCALL XML_SetAttlistDeclHandler(XML_Parser parser, XML_AttlistDeclHandler attdecl) { - if (parser != NULL) - attlistDeclHandler = attdecl; + attlistDeclHandler = attdecl; } void XMLCALL XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler) { - if (parser != NULL) - entityDeclHandler = handler; + entityDeclHandler = handler; } void XMLCALL XML_SetXmlDeclHandler(XML_Parser parser, XML_XmlDeclHandler handler) { - if (parser != NULL) - xmlDeclHandler = handler; + xmlDeclHandler = handler; } int XMLCALL XML_SetParamEntityParsing(XML_Parser parser, enum XML_ParamEntityParsing peParsing) { - if (parser == NULL) - return 0; /* block after XML_Parse()/XML_ParseBuffer() has been called */ if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED) return 0; @@ -1733,10 +1489,6 @@ int XMLCALL XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt) { - if (parser == NULL) - return 0; - if (parser->m_parentParser) - return XML_SetHashSalt(parser->m_parentParser, hash_salt); /* block after XML_Parse()/XML_ParseBuffer() has been called */ if (ps_parsing == XML_PARSING || ps_parsing == XML_SUSPENDED) return 0; @@ -1747,10 +1499,6 @@ XML_SetHashSalt(XML_Parser parser, enum XML_Status XMLCALL XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) { - if ((parser == NULL) || (len < 0) || ((s == NULL) && (len != 0))) { - errorCode = XML_ERROR_INVALID_ARGUMENT; - return XML_STATUS_ERROR; - } switch (ps_parsing) { case XML_SUSPENDED: errorCode = XML_ERROR_SUSPENDED; @@ -1803,13 +1551,6 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) const char *end; int nLeftOver; enum XML_Status result; - /* Detect overflow (a+b > MAX <==> b > MAX-a) */ - if (len > ((XML_Size)-1) / 2 - parseEndByteIndex) { - errorCode = XML_ERROR_NO_MEMORY; - eventPtr = eventEndPtr = NULL; - processor = errorProcessor; - return XML_STATUS_ERROR; - } parseEndByteIndex += len; positionPtr = s; ps_finalBuffer = (XML_Bool)isFinal; @@ -1842,14 +1583,11 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) nLeftOver = s + len - end; if (nLeftOver) { if (buffer == NULL || nLeftOver > bufferLim - buffer) { - /* avoid _signed_ integer overflow */ - char *temp = NULL; - const int bytesToAllocate = (int)((unsigned)len * 2U); - if (bytesToAllocate > 0) { - temp = (buffer == NULL - ? (char *)MALLOC(bytesToAllocate) - : (char *)REALLOC(buffer, bytesToAllocate)); - } + /* FIXME avoid integer overflow */ + char *temp; + temp = (buffer == NULL + ? (char *)MALLOC(len * 2) + : (char *)REALLOC(buffer, len * 2)); if (temp == NULL) { errorCode = XML_ERROR_NO_MEMORY; eventPtr = eventEndPtr = NULL; @@ -1857,7 +1595,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) return XML_STATUS_ERROR; } buffer = temp; - bufferLim = buffer + bytesToAllocate; + bufferLim = buffer + len * 2; } memcpy(buffer, end, nLeftOver); } @@ -1887,8 +1625,6 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) const char *start; enum XML_Status result = XML_STATUS_OK; - if (parser == NULL) - return XML_STATUS_ERROR; switch (ps_parsing) { case XML_SUSPENDED: errorCode = XML_ERROR_SUSPENDED; @@ -1942,8 +1678,6 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) void * XMLCALL XML_GetBuffer(XML_Parser parser, int len) { - if (parser == NULL) - return NULL; if (len < 0) { errorCode = XML_ERROR_NO_MEMORY; return NULL; @@ -1961,15 +1695,15 @@ XML_GetBuffer(XML_Parser parser, int len) if (len > bufferLim - bufferEnd) { #ifdef XML_CONTEXT_BYTES int keep; -#endif /* defined XML_CONTEXT_BYTES */ - /* Do not invoke signed arithmetic overflow: */ - int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr)); +#endif + int neededSize = len + (int)(bufferEnd - bufferPtr); if (neededSize < 0) { errorCode = XML_ERROR_NO_MEMORY; return NULL; } #ifdef XML_CONTEXT_BYTES keep = (int)(bufferPtr - buffer); + if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; neededSize += keep; @@ -1994,8 +1728,7 @@ XML_GetBuffer(XML_Parser parser, int len) if (bufferSize == 0) bufferSize = INIT_BUFFER_SIZE; do { - /* Do not invoke signed arithmetic overflow: */ - bufferSize = (int) (2U * (unsigned) bufferSize); + bufferSize *= 2; } while (bufferSize < neededSize && bufferSize > 0); if (bufferSize <= 0) { errorCode = XML_ERROR_NO_MEMORY; @@ -2040,8 +1773,6 @@ XML_GetBuffer(XML_Parser parser, int len) enum XML_Status XMLCALL XML_StopParser(XML_Parser parser, XML_Bool resumable) { - if (parser == NULL) - return XML_STATUS_ERROR; switch (ps_parsing) { case XML_SUSPENDED: if (resumable) { @@ -2074,8 +1805,6 @@ XML_ResumeParser(XML_Parser parser) { enum XML_Status result = XML_STATUS_OK; - if (parser == NULL) - return XML_STATUS_ERROR; if (ps_parsing != XML_SUSPENDED) { errorCode = XML_ERROR_NOT_SUSPENDED; return XML_STATUS_ERROR; @@ -2112,8 +1841,6 @@ XML_ResumeParser(XML_Parser parser) void XMLCALL XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status) { - if (parser == NULL) - return; assert(status != NULL); *status = parser->m_parsingStatus; } @@ -2121,26 +1848,20 @@ XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status) enum XML_Error XMLCALL XML_GetErrorCode(XML_Parser parser) { - if (parser == NULL) - return XML_ERROR_INVALID_ARGUMENT; return errorCode; } XML_Index XMLCALL XML_GetCurrentByteIndex(XML_Parser parser) { - if (parser == NULL) - return -1; if (eventPtr) - return (XML_Index)(parseEndByteIndex - (parseEndPtr - eventPtr)); + return parseEndByteIndex - (parseEndPtr - eventPtr); return -1; } int XMLCALL XML_GetCurrentByteCount(XML_Parser parser) { - if (parser == NULL) - return 0; if (eventEndPtr && eventPtr) return (int)(eventEndPtr - eventPtr); return 0; @@ -2150,19 +1871,11 @@ const char * XMLCALL XML_GetInputContext(XML_Parser parser, int *offset, int *size) { #ifdef XML_CONTEXT_BYTES - if (parser == NULL) - return NULL; if (eventPtr && buffer) { - if (offset != NULL) - *offset = (int)(eventPtr - buffer); - if (size != NULL) - *size = (int)(bufferEnd - buffer); + *offset = (int)(eventPtr - buffer); + *size = (int)(bufferEnd - buffer); return buffer; } -#else - (void)parser; - (void)offset; - (void)size; #endif /* defined XML_CONTEXT_BYTES */ return (char *) 0; } @@ -2170,8 +1883,6 @@ XML_GetInputContext(XML_Parser parser, int *offset, int *size) XML_Size XMLCALL XML_GetCurrentLineNumber(XML_Parser parser) { - if (parser == NULL) - return 0; if (eventPtr && eventPtr >= positionPtr) { XmlUpdatePosition(encoding, positionPtr, eventPtr, &position); positionPtr = eventPtr; @@ -2182,8 +1893,6 @@ XML_GetCurrentLineNumber(XML_Parser parser) XML_Size XMLCALL XML_GetCurrentColumnNumber(XML_Parser parser) { - if (parser == NULL) - return 0; if (eventPtr && eventPtr >= positionPtr) { XmlUpdatePosition(encoding, positionPtr, eventPtr, &position); positionPtr = eventPtr; @@ -2194,38 +1903,30 @@ XML_GetCurrentColumnNumber(XML_Parser parser) void XMLCALL XML_FreeContentModel(XML_Parser parser, XML_Content *model) { - if (parser != NULL) - FREE(model); + FREE(model); } void * XMLCALL XML_MemMalloc(XML_Parser parser, size_t size) { - if (parser == NULL) - return NULL; return MALLOC(size); } void * XMLCALL XML_MemRealloc(XML_Parser parser, void *ptr, size_t size) { - if (parser == NULL) - return NULL; return REALLOC(ptr, size); } void XMLCALL XML_MemFree(XML_Parser parser, void *ptr) { - if (parser != NULL) - FREE(ptr); + FREE(ptr); } void XMLCALL XML_DefaultCurrent(XML_Parser parser) { - if (parser == NULL) - return; if (defaultHandler) { if (openInternalEntities) reportDefault(parser, @@ -2728,11 +2429,11 @@ doContent(XML_Parser parser, for (;;) { int bufSize; int convLen; - const enum XML_Convert_Result convert_res = XmlConvert(enc, + XmlConvert(enc, &fromPtr, rawNameEnd, (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); convLen = (int)(toPtr - (XML_Char *)tag->buf); - if ((fromPtr >= rawNameEnd) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { + if (fromPtr == rawNameEnd) { tag->name.strLen = convLen; break; } @@ -2775,10 +2476,8 @@ doContent(XML_Parser parser, return XML_ERROR_NO_MEMORY; poolFinish(&tempPool); result = storeAtts(parser, enc, s, &name, &bindings); - if (result != XML_ERROR_NONE) { - freeBindings(parser, bindings); + if (result) return result; - } poolFinish(&tempPool); if (startElementHandler) { startElementHandler(handlerArg, name.str, (const XML_Char **)atts); @@ -2793,7 +2492,15 @@ doContent(XML_Parser parser, if (noElmHandlers && defaultHandler) reportDefault(parser, enc, s, next); poolClear(&tempPool); - freeBindings(parser, bindings); + while (bindings) { + BINDING *b = bindings; + if (endNamespaceDeclHandler) + endNamespaceDeclHandler(handlerArg, b->prefix->name); + bindings = bindings->nextTagBinding; + b->nextTagBinding = freeBindingList; + freeBindingList = b; + b->prefix->binding = b->prevPrefixBinding; + } } if (tagLevel == 0) return epilogProcessor(parser, next, end, nextPtr); @@ -2947,11 +2654,11 @@ doContent(XML_Parser parser, if (MUST_CONVERT(enc, s)) { for (;;) { ICHAR *dataPtr = (ICHAR *)dataBuf; - const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; charDataHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); - if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + if (s == next) break; *eventPP = s; } @@ -2991,29 +2698,6 @@ doContent(XML_Parser parser, /* not reached */ } -/* This function does not call free() on the allocated memory, merely - * moving it to the parser's freeBindingList where it can be freed or - * reused as appropriate. - */ -static void -freeBindings(XML_Parser parser, BINDING *bindings) -{ - while (bindings) { - BINDING *b = bindings; - - /* startNamespaceDeclHandler will have been called for this - * binding in addBindings(), so call the end handler now. - */ - if (endNamespaceDeclHandler) - endNamespaceDeclHandler(handlerArg, b->prefix->name); - - bindings = bindings->nextTagBinding; - b->nextTagBinding = freeBindingList; - freeBindingList = b; - b->prefix->binding = b->prevPrefixBinding; - } -} - /* Precondition: all arguments must be non-NULL; Purpose: - normalize attributes @@ -3238,13 +2922,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc, if (s[-1] == 2) { /* prefixed */ ATTRIBUTE_ID *id; const BINDING *b; - unsigned long uriHash; - struct siphash sip_state; - struct sipkey sip_key; - - copy_salt_to_sipkey(parser, &sip_key); - sip24_init(&sip_state, &sip_key); - + unsigned long uriHash = hash_secret_salt; ((XML_Char *)s)[-1] = 0; /* clear flag */ id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0); if (!id || !id->prefix) @@ -3253,26 +2931,22 @@ storeAtts(XML_Parser parser, const ENCODING *enc, if (!b) return XML_ERROR_UNBOUND_PREFIX; + /* as we expand the name we also calculate its hash value */ for (j = 0; j < b->uriLen; j++) { const XML_Char c = b->uri[j]; if (!poolAppendChar(&tempPool, c)) return XML_ERROR_NO_MEMORY; + uriHash = CHAR_HASH(uriHash, c); } - - sip24_update(&sip_state, b->uri, b->uriLen * sizeof(XML_Char)); - while (*s++ != XML_T(ASCII_COLON)) ; - - sip24_update(&sip_state, s, keylen(s) * sizeof(XML_Char)); - do { /* copies null terminator */ + const XML_Char c = *s; if (!poolAppendChar(&tempPool, *s)) return XML_ERROR_NO_MEMORY; + uriHash = CHAR_HASH(uriHash, c); } while (*s++); - uriHash = (unsigned long)sip24_final(&sip_state); - { /* Check hash table for duplicate of expanded name (uriName). Derived from code in lookup(parser, HASH_TABLE *table, ...). */ @@ -3590,11 +3264,11 @@ doCdataSection(XML_Parser parser, if (MUST_CONVERT(enc, s)) { for (;;) { ICHAR *dataPtr = (ICHAR *)dataBuf; - const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = next; charDataHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); - if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + if (s == next) break; *eventPP = s; } @@ -3986,14 +3660,6 @@ entityValueInitProcessor(XML_Parser parser, *nextPtr = next; return XML_ERROR_NONE; } - /* If we get this token, we have the start of what might be a - normal tag, but not a declaration (i.e. it doesn't begin with - "internalEventEndPtr = NULL; textStart = (char *)entity->textPtr; textEnd = (char *)(entity->textPtr + entity->textLen); - /* Set a safe default value in case 'next' does not get set */ - next = textStart; #ifdef XML_DTD if (entity->is_param) { @@ -5217,8 +4881,6 @@ internalEntityProcessor(XML_Parser parser, entity = openEntity->entity; textStart = ((char *)entity->textPtr) + entity->processed; textEnd = (char *)(entity->textPtr + entity->textLen); - /* Set a safe default value in case 'next' does not get set */ - next = textStart; #ifdef XML_DTD if (entity->is_param) { @@ -5265,9 +4927,9 @@ internalEntityProcessor(XML_Parser parser, static enum XML_Error PTRCALL errorProcessor(XML_Parser parser, - const char *UNUSED_P(s), - const char *UNUSED_P(end), - const char **UNUSED_P(nextPtr)) + const char *s, + const char *end, + const char **nextPtr) { return errorCode; } @@ -5683,7 +5345,6 @@ reportDefault(XML_Parser parser, const ENCODING *enc, const char *s, const char *end) { if (MUST_CONVERT(enc, s)) { - enum XML_Convert_Result convert_res; const char **eventPP; const char **eventEndPP; if (enc == encoding) { @@ -5696,11 +5357,11 @@ reportDefault(XML_Parser parser, const ENCODING *enc, } do { ICHAR *dataPtr = (ICHAR *)dataBuf; - convert_res = XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); + XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); *eventPP = s; - } while ((convert_res != XML_CONVERT_COMPLETED) && (convert_res != XML_CONVERT_INPUT_INCOMPLETE)); + } while (s != end); } else defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XML_Char *)s)); @@ -6179,6 +5840,7 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, const XML_Memory_H newE->defaultAtts = (DEFAULT_ATTRIBUTE *) ms->malloc_fcn(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE)); if (!newE->defaultAtts) { + ms->free_fcn(newE); return 0; } } @@ -6313,32 +5975,13 @@ keyeq(KEY s1, KEY s2) return XML_FALSE; } -static size_t -keylen(KEY s) -{ - size_t len = 0; - for (; *s; s++, len++); - return len; -} - -static void -copy_salt_to_sipkey(XML_Parser parser, struct sipkey * key) -{ - key->k[0] = 0; - key->k[1] = get_hash_secret_salt(parser); -} - static unsigned long FASTCALL hash(XML_Parser parser, KEY s) { - struct siphash state; - struct sipkey key; - (void)sip_tobin; - (void)sip24_valid; - copy_salt_to_sipkey(parser, &key); - sip24_init(&state, &key); - sip24_update(&state, s, keylen(s) * sizeof(XML_Char)); - return (unsigned long)sip24_final(&state); + unsigned long h = hash_secret_salt; + while (*s) + h = CHAR_HASH(h, *s++); + return h; } static NAMED * @@ -6523,8 +6166,8 @@ poolAppend(STRING_POOL *pool, const ENCODING *enc, if (!pool->ptr && !poolGrow(pool)) return NULL; for (;;) { - const enum XML_Convert_Result convert_res = XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); - if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); + if (ptr == end) break; if (!poolGrow(pool)) return NULL; @@ -6581,35 +6224,6 @@ poolStoreString(STRING_POOL *pool, const ENCODING *enc, return pool->start; } -static size_t -poolBytesToAllocateFor(int blockSize) -{ - /* Unprotected math would be: - ** return offsetof(BLOCK, s) + blockSize * sizeof(XML_Char); - ** - ** Detect overflow, avoiding _signed_ overflow undefined behavior - ** For a + b * c we check b * c in isolation first, so that addition of a - ** on top has no chance of making us accept a small non-negative number - */ - const size_t stretch = sizeof(XML_Char); /* can be 4 bytes */ - - if (blockSize <= 0) - return 0; - - if (blockSize > (int)(INT_MAX / stretch)) - return 0; - - { - const int stretchedBlockSize = blockSize * (int)stretch; - const int bytesToAllocate = (int)( - offsetof(BLOCK, s) + (unsigned)stretchedBlockSize); - if (bytesToAllocate < 0) - return 0; - - return (size_t)bytesToAllocate; - } -} - static XML_Bool FASTCALL poolGrow(STRING_POOL *pool) { @@ -6637,19 +6251,11 @@ poolGrow(STRING_POOL *pool) } } if (pool->blocks && pool->start == pool->blocks->s) { - BLOCK *temp; - int blockSize = (int)((unsigned)(pool->end - pool->start)*2U); - size_t bytesToAllocate; - - if (blockSize < 0) - return XML_FALSE; - - bytesToAllocate = poolBytesToAllocateFor(blockSize); - if (bytesToAllocate == 0) - return XML_FALSE; - - temp = (BLOCK *) - pool->mem->realloc_fcn(pool->blocks, (unsigned)bytesToAllocate); + int blockSize = (int)(pool->end - pool->start)*2; + BLOCK *temp = (BLOCK *) + pool->mem->realloc_fcn(pool->blocks, + (offsetof(BLOCK, s) + + blockSize * sizeof(XML_Char))); if (temp == NULL) return XML_FALSE; pool->blocks = temp; @@ -6661,26 +6267,12 @@ poolGrow(STRING_POOL *pool) else { BLOCK *tem; int blockSize = (int)(pool->end - pool->start); - size_t bytesToAllocate; - - if (blockSize < 0) - return XML_FALSE; - if (blockSize < INIT_BLOCK_SIZE) blockSize = INIT_BLOCK_SIZE; - else { - /* Detect overflow, avoiding _signed_ overflow undefined behavior */ - if ((int)((unsigned)blockSize * 2U) < 0) { - return XML_FALSE; - } + else blockSize *= 2; - } - - bytesToAllocate = poolBytesToAllocateFor(blockSize); - if (bytesToAllocate == 0) - return XML_FALSE; - - tem = (BLOCK *)pool->mem->malloc_fcn(bytesToAllocate); + tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s) + + blockSize * sizeof(XML_Char)); if (!tem) return XML_FALSE; tem->size = blockSize; diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c index a7c5630..44772e2 100644 --- a/Modules/expat/xmlrole.c +++ b/Modules/expat/xmlrole.c @@ -4,13 +4,19 @@ #include -#ifdef _WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#include "macconfig.h" +#elif defined(__amigaos__) +#include "amigaconfig.h" +#elif defined(__WATCOMC__) +#include "watcomconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include #endif -#endif /* ndef _WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ #include "expat_external.h" #include "internal.h" @@ -189,9 +195,9 @@ prolog1(PROLOG_STATE *state, static int PTRCALL prolog2(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -210,9 +216,9 @@ prolog2(PROLOG_STATE *state, static int PTRCALL doctype0(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -258,9 +264,9 @@ doctype1(PROLOG_STATE *state, static int PTRCALL doctype2(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -275,9 +281,9 @@ doctype2(PROLOG_STATE *state, static int PTRCALL doctype3(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -292,9 +298,9 @@ doctype3(PROLOG_STATE *state, static int PTRCALL doctype4(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -312,9 +318,9 @@ doctype4(PROLOG_STATE *state, static int PTRCALL doctype5(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -431,9 +437,9 @@ externalSubset1(PROLOG_STATE *state, static int PTRCALL entity0(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -451,9 +457,9 @@ entity0(PROLOG_STATE *state, static int PTRCALL entity1(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -496,9 +502,9 @@ entity2(PROLOG_STATE *state, static int PTRCALL entity3(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -513,9 +519,9 @@ entity3(PROLOG_STATE *state, static int PTRCALL entity4(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -553,9 +559,9 @@ entity5(PROLOG_STATE *state, static int PTRCALL entity6(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -599,9 +605,9 @@ entity7(PROLOG_STATE *state, static int PTRCALL entity8(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -616,9 +622,9 @@ entity8(PROLOG_STATE *state, static int PTRCALL entity9(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -633,9 +639,9 @@ entity9(PROLOG_STATE *state, static int PTRCALL entity10(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -650,9 +656,9 @@ entity10(PROLOG_STATE *state, static int PTRCALL notation0(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -691,9 +697,9 @@ notation1(PROLOG_STATE *state, static int PTRCALL notation2(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -708,9 +714,9 @@ notation2(PROLOG_STATE *state, static int PTRCALL notation3(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -726,9 +732,9 @@ notation3(PROLOG_STATE *state, static int PTRCALL notation4(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -747,9 +753,9 @@ notation4(PROLOG_STATE *state, static int PTRCALL attlist0(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -765,9 +771,9 @@ attlist0(PROLOG_STATE *state, static int PTRCALL attlist1(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -827,9 +833,9 @@ attlist2(PROLOG_STATE *state, static int PTRCALL attlist3(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -846,9 +852,9 @@ attlist3(PROLOG_STATE *state, static int PTRCALL attlist4(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -866,9 +872,9 @@ attlist4(PROLOG_STATE *state, static int PTRCALL attlist5(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -883,9 +889,9 @@ attlist5(PROLOG_STATE *state, static int PTRCALL attlist6(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -900,9 +906,9 @@ attlist6(PROLOG_STATE *state, static int PTRCALL attlist7(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -961,9 +967,9 @@ attlist8(PROLOG_STATE *state, static int PTRCALL attlist9(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -978,9 +984,9 @@ attlist9(PROLOG_STATE *state, static int PTRCALL element0(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1066,9 +1072,9 @@ element2(PROLOG_STATE *state, static int PTRCALL element3(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1091,9 +1097,9 @@ element3(PROLOG_STATE *state, static int PTRCALL element4(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1109,9 +1115,9 @@ element4(PROLOG_STATE *state, static int PTRCALL element5(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1130,9 +1136,9 @@ element5(PROLOG_STATE *state, static int PTRCALL element6(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1160,9 +1166,9 @@ element6(PROLOG_STATE *state, static int PTRCALL element7(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1234,9 +1240,9 @@ condSect0(PROLOG_STATE *state, static int PTRCALL condSect1(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1252,9 +1258,9 @@ condSect1(PROLOG_STATE *state, static int PTRCALL condSect2(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1271,9 +1277,9 @@ condSect2(PROLOG_STATE *state, static int PTRCALL declClose(PROLOG_STATE *state, int tok, - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) + const char *ptr, + const char *end, + const ENCODING *enc) { switch (tok) { case XML_TOK_PROLOG_S: @@ -1286,11 +1292,11 @@ declClose(PROLOG_STATE *state, } static int PTRCALL -error(PROLOG_STATE *UNUSED_P(state), - int UNUSED_P(tok), - const char *UNUSED_P(ptr), - const char *UNUSED_P(end), - const ENCODING *UNUSED_P(enc)) +error(PROLOG_STATE *state, + int tok, + const char *ptr, + const char *end, + const ENCODING *enc) { return XML_ROLE_NONE; } diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c index cdf0720..bf09dfc 100644 --- a/Modules/expat/xmltok.c +++ b/Modules/expat/xmltok.c @@ -4,13 +4,19 @@ #include -#ifdef _WIN32 +#ifdef COMPILED_FROM_DSP #include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#include "macconfig.h" +#elif defined(__amigaos__) +#include "amigaconfig.h" +#elif defined(__WATCOMC__) +#include "watcomconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include #endif -#endif /* ndef _WIN32 */ +#endif /* ndef COMPILED_FROM_DSP */ #include "expat_external.h" #include "internal.h" @@ -40,7 +46,7 @@ #define VTABLE VTABLE1, PREFIX(toUtf8), PREFIX(toUtf16) #define UCS2_GET_NAMING(pages, hi, lo) \ - (namingBitmap[(pages[hi] << 3) + ((lo) >> 5)] & (1u << ((lo) & 0x1F))) + (namingBitmap[(pages[hi] << 3) + ((lo) >> 5)] & (1 << ((lo) & 0x1F))) /* A 2 byte UTF-8 representation splits the characters 11 bits between the bottom 5 and 6 bits of the bytes. We need 8 bits to index into @@ -50,7 +56,7 @@ (namingBitmap[((pages)[(((byte)[0]) >> 2) & 7] << 3) \ + ((((byte)[0]) & 3) << 1) \ + ((((byte)[1]) >> 5) & 1)] \ - & (1u << (((byte)[1]) & 0x1F))) + & (1 << (((byte)[1]) & 0x1F))) /* A 3 byte UTF-8 representation splits the characters 16 bits between the bottom 4, 6 and 6 bits of the bytes. We need 8 bits to index @@ -63,7 +69,7 @@ << 3) \ + ((((byte)[1]) & 3) << 1) \ + ((((byte)[2]) >> 5) & 1)] \ - & (1u << (((byte)[2]) & 0x1F))) + & (1 << (((byte)[2]) & 0x1F))) #define UTF8_GET_NAMING(pages, p, n) \ ((n) == 2 \ @@ -116,19 +122,19 @@ ((*p) == 0xF4 ? (p)[1] > 0x8F : ((p)[1] & 0xC0) == 0xC0))) static int PTRFASTCALL -isNever(const ENCODING *UNUSED_P(enc), const char *UNUSED_P(p)) +isNever(const ENCODING *enc, const char *p) { return 0; } static int PTRFASTCALL -utf8_isName2(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isName2(const ENCODING *enc, const char *p) { return UTF8_GET_NAMING2(namePages, (const unsigned char *)p); } static int PTRFASTCALL -utf8_isName3(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isName3(const ENCODING *enc, const char *p) { return UTF8_GET_NAMING3(namePages, (const unsigned char *)p); } @@ -136,13 +142,13 @@ utf8_isName3(const ENCODING *UNUSED_P(enc), const char *p) #define utf8_isName4 isNever static int PTRFASTCALL -utf8_isNmstrt2(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isNmstrt2(const ENCODING *enc, const char *p) { return UTF8_GET_NAMING2(nmstrtPages, (const unsigned char *)p); } static int PTRFASTCALL -utf8_isNmstrt3(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isNmstrt3(const ENCODING *enc, const char *p) { return UTF8_GET_NAMING3(nmstrtPages, (const unsigned char *)p); } @@ -150,19 +156,19 @@ utf8_isNmstrt3(const ENCODING *UNUSED_P(enc), const char *p) #define utf8_isNmstrt4 isNever static int PTRFASTCALL -utf8_isInvalid2(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isInvalid2(const ENCODING *enc, const char *p) { return UTF8_INVALID2((const unsigned char *)p); } static int PTRFASTCALL -utf8_isInvalid3(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isInvalid3(const ENCODING *enc, const char *p) { return UTF8_INVALID3((const unsigned char *)p); } static int PTRFASTCALL -utf8_isInvalid4(const ENCODING *UNUSED_P(enc), const char *p) +utf8_isInvalid4(const ENCODING *enc, const char *p) { return UTF8_INVALID4((const unsigned char *)p); } @@ -216,17 +222,6 @@ struct normal_encoding { E ## isInvalid3, \ E ## isInvalid4 -#define NULL_VTABLE \ - /* isName2 */ NULL, \ - /* isName3 */ NULL, \ - /* isName4 */ NULL, \ - /* isNmstrt2 */ NULL, \ - /* isNmstrt3 */ NULL, \ - /* isNmstrt4 */ NULL, \ - /* isInvalid2 */ NULL, \ - /* isInvalid3 */ NULL, \ - /* isInvalid4 */ NULL - static int FASTCALL checkCharRefNumber(int); #include "xmltok_impl.h" @@ -323,89 +318,39 @@ enum { /* UTF8_cvalN is value of masked first byte of N byte sequence */ UTF8_cval4 = 0xf0 }; -void -align_limit_to_full_utf8_characters(const char * from, const char ** fromLimRef) -{ - const char * fromLim = *fromLimRef; - size_t walked = 0; - for (; fromLim > from; fromLim--, walked++) { - const unsigned char prev = (unsigned char)fromLim[-1]; - if ((prev & 0xf8u) == 0xf0u) { /* 4-byte character, lead by 0b11110xxx byte */ - if (walked + 1 >= 4) { - fromLim += 4 - 1; - break; - } else { - walked = 0; - } - } else if ((prev & 0xf0u) == 0xe0u) { /* 3-byte character, lead by 0b1110xxxx byte */ - if (walked + 1 >= 3) { - fromLim += 3 - 1; - break; - } else { - walked = 0; - } - } else if ((prev & 0xe0u) == 0xc0u) { /* 2-byte character, lead by 0b110xxxxx byte */ - if (walked + 1 >= 2) { - fromLim += 2 - 1; - break; - } else { - walked = 0; - } - } else if ((prev & 0x80u) == 0x00u) { /* 1-byte character, matching 0b0xxxxxxx */ - break; - } - } - *fromLimRef = fromLim; -} - -static enum XML_Convert_Result PTRCALL -utf8_toUtf8(const ENCODING *UNUSED_P(enc), +static void PTRCALL +utf8_toUtf8(const ENCODING *enc, const char **fromP, const char *fromLim, char **toP, const char *toLim) { char *to; const char *from; - const char *fromLimInitial = fromLim; - - /* Avoid copying partial characters. */ - align_limit_to_full_utf8_characters(*fromP, &fromLim); - - for (to = *toP, from = *fromP; (from < fromLim) && (to < toLim); from++, to++) + if (fromLim - *fromP > toLim - *toP) { + /* Avoid copying partial characters. */ + for (fromLim = *fromP + (toLim - *toP); fromLim > *fromP; fromLim--) + if (((unsigned char)fromLim[-1] & 0xc0) != 0x80) + break; + } + for (to = *toP, from = *fromP; from != fromLim; from++, to++) *to = *from; *fromP = from; *toP = to; - - if (fromLim < fromLimInitial) - return XML_CONVERT_INPUT_INCOMPLETE; - else if ((to == toLim) && (from < fromLim)) - return XML_CONVERT_OUTPUT_EXHAUSTED; - else - return XML_CONVERT_COMPLETED; } -static enum XML_Convert_Result PTRCALL +static void PTRCALL utf8_toUtf16(const ENCODING *enc, const char **fromP, const char *fromLim, unsigned short **toP, const unsigned short *toLim) { - enum XML_Convert_Result res = XML_CONVERT_COMPLETED; unsigned short *to = *toP; const char *from = *fromP; - while (from < fromLim && to < toLim) { + while (from != fromLim && to != toLim) { switch (((struct normal_encoding *)enc)->type[(unsigned char)*from]) { case BT_LEAD2: - if (fromLim - from < 2) { - res = XML_CONVERT_INPUT_INCOMPLETE; - goto after; - } *to++ = (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3f)); from += 2; break; case BT_LEAD3: - if (fromLim - from < 3) { - res = XML_CONVERT_INPUT_INCOMPLETE; - goto after; - } *to++ = (unsigned short)(((from[0] & 0xf) << 12) | ((from[1] & 0x3f) << 6) | (from[2] & 0x3f)); from += 3; @@ -413,14 +358,8 @@ utf8_toUtf16(const ENCODING *enc, case BT_LEAD4: { unsigned long n; - if (toLim - to < 2) { - res = XML_CONVERT_OUTPUT_EXHAUSTED; - goto after; - } - if (fromLim - from < 4) { - res = XML_CONVERT_INPUT_INCOMPLETE; + if (to + 1 == toLim) goto after; - } n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f); n -= 0x10000; @@ -435,12 +374,9 @@ utf8_toUtf16(const ENCODING *enc, break; } } - if (from < fromLim) - res = XML_CONVERT_OUTPUT_EXHAUSTED; after: *fromP = from; *toP = to; - return res; } #ifdef XML_NS @@ -489,43 +425,38 @@ static const struct normal_encoding internal_utf8_encoding = { STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) }; -static enum XML_Convert_Result PTRCALL -latin1_toUtf8(const ENCODING *UNUSED_P(enc), +static void PTRCALL +latin1_toUtf8(const ENCODING *enc, const char **fromP, const char *fromLim, char **toP, const char *toLim) { for (;;) { unsigned char c; if (*fromP == fromLim) - return XML_CONVERT_COMPLETED; + break; c = (unsigned char)**fromP; if (c & 0x80) { if (toLim - *toP < 2) - return XML_CONVERT_OUTPUT_EXHAUSTED; + break; *(*toP)++ = (char)((c >> 6) | UTF8_cval2); *(*toP)++ = (char)((c & 0x3f) | 0x80); (*fromP)++; } else { if (*toP == toLim) - return XML_CONVERT_OUTPUT_EXHAUSTED; + break; *(*toP)++ = *(*fromP)++; } } } -static enum XML_Convert_Result PTRCALL -latin1_toUtf16(const ENCODING *UNUSED_P(enc), +static void PTRCALL +latin1_toUtf16(const ENCODING *enc, const char **fromP, const char *fromLim, unsigned short **toP, const unsigned short *toLim) { - while (*fromP < fromLim && *toP < toLim) + while (*fromP != fromLim && *toP != toLim) *(*toP)++ = (unsigned char)*(*fromP)++; - - if ((*toP == toLim) && (*fromP < fromLim)) - return XML_CONVERT_OUTPUT_EXHAUSTED; - else - return XML_CONVERT_COMPLETED; } #ifdef XML_NS @@ -536,7 +467,7 @@ static const struct normal_encoding latin1_encoding_ns = { #include "asciitab.h" #include "latin1tab.h" }, - STANDARD_VTABLE(sb_) NULL_VTABLE + STANDARD_VTABLE(sb_) }; #endif @@ -549,21 +480,16 @@ static const struct normal_encoding latin1_encoding = { #undef BT_COLON #include "latin1tab.h" }, - STANDARD_VTABLE(sb_) NULL_VTABLE + STANDARD_VTABLE(sb_) }; -static enum XML_Convert_Result PTRCALL -ascii_toUtf8(const ENCODING *UNUSED_P(enc), +static void PTRCALL +ascii_toUtf8(const ENCODING *enc, const char **fromP, const char *fromLim, char **toP, const char *toLim) { - while (*fromP < fromLim && *toP < toLim) + while (*fromP != fromLim && *toP != toLim) *(*toP)++ = *(*fromP)++; - - if ((*toP == toLim) && (*fromP < fromLim)) - return XML_CONVERT_OUTPUT_EXHAUSTED; - else - return XML_CONVERT_COMPLETED; } #ifdef XML_NS @@ -574,7 +500,7 @@ static const struct normal_encoding ascii_encoding_ns = { #include "asciitab.h" /* BT_NONXML == 0 */ }, - STANDARD_VTABLE(sb_) NULL_VTABLE + STANDARD_VTABLE(sb_) }; #endif @@ -587,7 +513,7 @@ static const struct normal_encoding ascii_encoding = { #undef BT_COLON /* BT_NONXML == 0 */ }, - STANDARD_VTABLE(sb_) NULL_VTABLE + STANDARD_VTABLE(sb_) }; static int PTRFASTCALL @@ -610,14 +536,13 @@ unicode_byte_type(char hi, char lo) } #define DEFINE_UTF16_TO_UTF8(E) \ -static enum XML_Convert_Result PTRCALL \ -E ## toUtf8(const ENCODING *UNUSED_P(enc), \ +static void PTRCALL \ +E ## toUtf8(const ENCODING *enc, \ const char **fromP, const char *fromLim, \ char **toP, const char *toLim) \ { \ - const char *from = *fromP; \ - fromLim = from + (((fromLim - from) >> 1) << 1); /* shrink to even */ \ - for (; from < fromLim; from += 2) { \ + const char *from; \ + for (from = *fromP; from != fromLim; from += 2) { \ int plane; \ unsigned char lo2; \ unsigned char lo = GET_LO(from); \ @@ -627,7 +552,7 @@ E ## toUtf8(const ENCODING *UNUSED_P(enc), \ if (lo < 0x80) { \ if (*toP == toLim) { \ *fromP = from; \ - return XML_CONVERT_OUTPUT_EXHAUSTED; \ + return; \ } \ *(*toP)++ = lo; \ break; \ @@ -637,7 +562,7 @@ E ## toUtf8(const ENCODING *UNUSED_P(enc), \ case 0x4: case 0x5: case 0x6: case 0x7: \ if (toLim - *toP < 2) { \ *fromP = from; \ - return XML_CONVERT_OUTPUT_EXHAUSTED; \ + return; \ } \ *(*toP)++ = ((lo >> 6) | (hi << 2) | UTF8_cval2); \ *(*toP)++ = ((lo & 0x3f) | 0x80); \ @@ -645,7 +570,7 @@ E ## toUtf8(const ENCODING *UNUSED_P(enc), \ default: \ if (toLim - *toP < 3) { \ *fromP = from; \ - return XML_CONVERT_OUTPUT_EXHAUSTED; \ + return; \ } \ /* 16 bits divided 4, 6, 6 amongst 3 bytes */ \ *(*toP)++ = ((hi >> 4) | UTF8_cval3); \ @@ -655,11 +580,7 @@ E ## toUtf8(const ENCODING *UNUSED_P(enc), \ case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ if (toLim - *toP < 4) { \ *fromP = from; \ - return XML_CONVERT_OUTPUT_EXHAUSTED; \ - } \ - if (fromLim - from < 4) { \ - *fromP = from; \ - return XML_CONVERT_INPUT_INCOMPLETE; \ + return; \ } \ plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \ *(*toP)++ = ((plane >> 2) | UTF8_cval4); \ @@ -675,32 +596,20 @@ E ## toUtf8(const ENCODING *UNUSED_P(enc), \ } \ } \ *fromP = from; \ - if (from < fromLim) \ - return XML_CONVERT_INPUT_INCOMPLETE; \ - else \ - return XML_CONVERT_COMPLETED; \ } #define DEFINE_UTF16_TO_UTF16(E) \ -static enum XML_Convert_Result PTRCALL \ -E ## toUtf16(const ENCODING *UNUSED_P(enc), \ +static void PTRCALL \ +E ## toUtf16(const ENCODING *enc, \ const char **fromP, const char *fromLim, \ unsigned short **toP, const unsigned short *toLim) \ { \ - enum XML_Convert_Result res = XML_CONVERT_COMPLETED; \ - fromLim = *fromP + (((fromLim - *fromP) >> 1) << 1); /* shrink to even */ \ /* Avoid copying first half only of surrogate */ \ if (fromLim - *fromP > ((toLim - *toP) << 1) \ - && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) { \ + && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) \ fromLim -= 2; \ - res = XML_CONVERT_INPUT_INCOMPLETE; \ - } \ - for (; *fromP < fromLim && *toP < toLim; *fromP += 2) \ + for (; *fromP != fromLim && *toP != toLim; *fromP += 2) \ *(*toP)++ = (GET_HI(*fromP) << 8) | GET_LO(*fromP); \ - if ((*toP == toLim) && (*fromP < fromLim)) \ - return XML_CONVERT_OUTPUT_EXHAUSTED; \ - else \ - return res; \ } #define SET2(ptr, ch) \ @@ -817,7 +726,7 @@ static const struct normal_encoding little2_encoding_ns = { #include "asciitab.h" #include "latin1tab.h" }, - STANDARD_VTABLE(little2_) NULL_VTABLE + STANDARD_VTABLE(little2_) }; #endif @@ -836,7 +745,7 @@ static const struct normal_encoding little2_encoding = { #undef BT_COLON #include "latin1tab.h" }, - STANDARD_VTABLE(little2_) NULL_VTABLE + STANDARD_VTABLE(little2_) }; #if BYTEORDER != 4321 @@ -849,7 +758,7 @@ static const struct normal_encoding internal_little2_encoding_ns = { #include "iasciitab.h" #include "latin1tab.h" }, - STANDARD_VTABLE(little2_) NULL_VTABLE + STANDARD_VTABLE(little2_) }; #endif @@ -862,7 +771,7 @@ static const struct normal_encoding internal_little2_encoding = { #undef BT_COLON #include "latin1tab.h" }, - STANDARD_VTABLE(little2_) NULL_VTABLE + STANDARD_VTABLE(little2_) }; #endif @@ -958,7 +867,7 @@ static const struct normal_encoding big2_encoding_ns = { #include "asciitab.h" #include "latin1tab.h" }, - STANDARD_VTABLE(big2_) NULL_VTABLE + STANDARD_VTABLE(big2_) }; #endif @@ -977,7 +886,7 @@ static const struct normal_encoding big2_encoding = { #undef BT_COLON #include "latin1tab.h" }, - STANDARD_VTABLE(big2_) NULL_VTABLE + STANDARD_VTABLE(big2_) }; #if BYTEORDER != 1234 @@ -990,7 +899,7 @@ static const struct normal_encoding internal_big2_encoding_ns = { #include "iasciitab.h" #include "latin1tab.h" }, - STANDARD_VTABLE(big2_) NULL_VTABLE + STANDARD_VTABLE(big2_) }; #endif @@ -1003,7 +912,7 @@ static const struct normal_encoding internal_big2_encoding = { #undef BT_COLON #include "latin1tab.h" }, - STANDARD_VTABLE(big2_) NULL_VTABLE + STANDARD_VTABLE(big2_) }; #endif @@ -1029,7 +938,7 @@ streqci(const char *s1, const char *s2) } static void PTRCALL -initUpdatePosition(const ENCODING *UNUSED_P(enc), const char *ptr, +initUpdatePosition(const ENCODING *enc, const char *ptr, const char *end, POSITION *pos) { normal_updatePosition(&utf8_encoding.enc, ptr, end, pos); @@ -1379,7 +1288,7 @@ unknown_isInvalid(const ENCODING *enc, const char *p) return (c & ~0xFFFF) || checkCharRefNumber(c) < 0; } -static enum XML_Convert_Result PTRCALL +static void PTRCALL unknown_toUtf8(const ENCODING *enc, const char **fromP, const char *fromLim, char **toP, const char *toLim) @@ -1390,21 +1299,21 @@ unknown_toUtf8(const ENCODING *enc, const char *utf8; int n; if (*fromP == fromLim) - return XML_CONVERT_COMPLETED; + break; utf8 = uenc->utf8[(unsigned char)**fromP]; n = *utf8++; if (n == 0) { int c = uenc->convert(uenc->userData, *fromP); n = XmlUtf8Encode(c, buf); if (n > toLim - *toP) - return XML_CONVERT_OUTPUT_EXHAUSTED; + break; utf8 = buf; *fromP += (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP] - (BT_LEAD2 - 2)); } else { if (n > toLim - *toP) - return XML_CONVERT_OUTPUT_EXHAUSTED; + break; (*fromP)++; } do { @@ -1413,13 +1322,13 @@ unknown_toUtf8(const ENCODING *enc, } } -static enum XML_Convert_Result PTRCALL +static void PTRCALL unknown_toUtf16(const ENCODING *enc, const char **fromP, const char *fromLim, unsigned short **toP, const unsigned short *toLim) { const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc); - while (*fromP < fromLim && *toP < toLim) { + while (*fromP != fromLim && *toP != toLim) { unsigned short c = uenc->utf16[(unsigned char)**fromP]; if (c == 0) { c = (unsigned short) @@ -1431,11 +1340,6 @@ unknown_toUtf16(const ENCODING *enc, (*fromP)++; *(*toP)++ = c; } - - if ((*toP == toLim) && (*fromP < fromLim)) - return XML_CONVERT_OUTPUT_EXHAUSTED; - else - return XML_CONVERT_COMPLETED; } ENCODING * @@ -1599,7 +1503,7 @@ initScan(const ENCODING * const *encodingTable, { const ENCODING **encPtr; - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; encPtr = enc->encPtr; if (ptr + 1 == end) { diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h index 752007e..ca867aa 100644 --- a/Modules/expat/xmltok.h +++ b/Modules/expat/xmltok.h @@ -130,12 +130,6 @@ typedef int (PTRCALL *SCANNER)(const ENCODING *, const char *, const char **); -enum XML_Convert_Result { - XML_CONVERT_COMPLETED = 0, - XML_CONVERT_INPUT_INCOMPLETE = 1, - XML_CONVERT_OUTPUT_EXHAUSTED = 2 /* and therefore potentially input remaining as well */ -}; - struct encoding { SCANNER scanners[XML_N_STATES]; SCANNER literalScanners[XML_N_LITERAL_TYPES]; @@ -164,12 +158,12 @@ struct encoding { const char *ptr, const char *end, const char **badPtr); - enum XML_Convert_Result (PTRCALL *utf8Convert)(const ENCODING *enc, + void (PTRCALL *utf8Convert)(const ENCODING *enc, const char **fromP, const char *fromLim, char **toP, const char *toLim); - enum XML_Convert_Result (PTRCALL *utf16Convert)(const ENCODING *enc, + void (PTRCALL *utf16Convert)(const ENCODING *enc, const char **fromP, const char *fromLim, unsigned short **toP, diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c index 5f779c0..9c2895b 100644 --- a/Modules/expat/xmltok_impl.c +++ b/Modules/expat/xmltok_impl.c @@ -87,45 +87,27 @@ #define PREFIX(ident) ident #endif - -#define HAS_CHARS(enc, ptr, end, count) \ - (end - ptr >= count * MINBPC(enc)) - -#define HAS_CHAR(enc, ptr, end) \ - HAS_CHARS(enc, ptr, end, 1) - -#define REQUIRE_CHARS(enc, ptr, end, count) \ - { \ - if (! HAS_CHARS(enc, ptr, end, count)) { \ - return XML_TOK_PARTIAL; \ - } \ - } - -#define REQUIRE_CHAR(enc, ptr, end) \ - REQUIRE_CHARS(enc, ptr, end, 1) - - /* ptr points to character following " */ switch (BYTE_TYPE(enc, ptr + MINBPC(enc))) { case BT_S: case BT_CR: case BT_LF: case BT_PERCNT: @@ -191,7 +175,7 @@ PREFIX(scanDecl)(const ENCODING *enc, const char *ptr, } static int PTRCALL -PREFIX(checkPiTarget)(const ENCODING *UNUSED_P(enc), const char *ptr, +PREFIX(checkPiTarget)(const ENCODING *enc, const char *ptr, const char *end, int *tokPtr) { int upper = 0; @@ -241,14 +225,15 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, { int tok; const char *target = ptr; - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) default: *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_S: case BT_CR: case BT_LF: @@ -257,12 +242,13 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, return XML_TOK_INVALID; } ptr += MINBPC(enc); - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { INVALID_CASES(ptr, nextTokPtr) case BT_QUEST: ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_GT)) { *nextTokPtr = ptr + MINBPC(enc); return tok; @@ -280,7 +266,8 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, return XML_TOK_INVALID; } ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_GT)) { *nextTokPtr = ptr + MINBPC(enc); return tok; @@ -295,14 +282,15 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, } static int PTRCALL -PREFIX(scanCdataSection)(const ENCODING *UNUSED_P(enc), const char *ptr, +PREFIX(scanCdataSection)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { static const char CDATA_LSQB[] = { ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, ASCII_LSQB }; int i; /* CDATA[ */ - REQUIRE_CHARS(enc, ptr, end, 6); + if (end - ptr < 6 * MINBPC(enc)) + return XML_TOK_PARTIAL; for (i = 0; i < 6; i++, ptr += MINBPC(enc)) { if (!CHAR_MATCHES(enc, ptr, CDATA_LSQB[i])) { *nextTokPtr = ptr; @@ -317,7 +305,7 @@ static int PTRCALL PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; if (MINBPC(enc) > 1) { size_t n = end - ptr; @@ -331,11 +319,13 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, switch (BYTE_TYPE(enc, ptr)) { case BT_RSQB: ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (!CHAR_MATCHES(enc, ptr, ASCII_RSQB)) break; ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (!CHAR_MATCHES(enc, ptr, ASCII_GT)) { ptr -= MINBPC(enc); break; @@ -344,7 +334,8 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, return XML_TOK_CDATA_SECT_CLOSE; case BT_CR: ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); *nextTokPtr = ptr; @@ -357,7 +348,7 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, ptr += MINBPC(enc); break; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ @@ -392,18 +383,19 @@ static int PTRCALL PREFIX(scanEndTag)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) default: *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_S: case BT_CR: case BT_LF: - for (ptr += MINBPC(enc); HAS_CHAR(enc, ptr, end); ptr += MINBPC(enc)) { + for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { switch (BYTE_TYPE(enc, ptr)) { case BT_S: case BT_CR: case BT_LF: break; @@ -440,7 +432,7 @@ static int PTRCALL PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - if (HAS_CHAR(enc, ptr, end)) { + if (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { case BT_DIGIT: case BT_HEX: @@ -449,7 +441,7 @@ PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, *nextTokPtr = ptr; return XML_TOK_INVALID; } - for (ptr += MINBPC(enc); HAS_CHAR(enc, ptr, end); ptr += MINBPC(enc)) { + for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { switch (BYTE_TYPE(enc, ptr)) { case BT_DIGIT: case BT_HEX: @@ -472,7 +464,7 @@ static int PTRCALL PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - if (HAS_CHAR(enc, ptr, end)) { + if (ptr != end) { if (CHAR_MATCHES(enc, ptr, ASCII_x)) return PREFIX(scanHexCharRef)(enc, ptr + MINBPC(enc), end, nextTokPtr); switch (BYTE_TYPE(enc, ptr)) { @@ -482,7 +474,7 @@ PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, *nextTokPtr = ptr; return XML_TOK_INVALID; } - for (ptr += MINBPC(enc); HAS_CHAR(enc, ptr, end); ptr += MINBPC(enc)) { + for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { switch (BYTE_TYPE(enc, ptr)) { case BT_DIGIT: break; @@ -504,7 +496,8 @@ static int PTRCALL PREFIX(scanRef)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) case BT_NUM: @@ -513,7 +506,7 @@ PREFIX(scanRef)(const ENCODING *enc, const char *ptr, const char *end, *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_SEMI: @@ -536,7 +529,7 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, #ifdef XML_NS int hadColon = 0; #endif - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) #ifdef XML_NS @@ -547,7 +540,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, } hadColon = 1; ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) default: @@ -561,7 +555,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, int t; ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; t = BYTE_TYPE(enc, ptr); if (t == BT_EQUALS) break; @@ -584,7 +579,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, #endif for (;;) { ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; open = BYTE_TYPE(enc, ptr); if (open == BT_QUOT || open == BT_APOS) break; @@ -602,7 +598,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, /* in attribute value */ for (;;) { int t; - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; t = BYTE_TYPE(enc, ptr); if (t == open) break; @@ -627,7 +624,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, } } ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { case BT_S: case BT_CR: @@ -644,7 +642,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, /* ptr points to closing quote */ for (;;) { ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) case BT_S: case BT_CR: case BT_LF: @@ -656,7 +655,8 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, case BT_SOL: sol: ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (!CHAR_MATCHES(enc, ptr, ASCII_GT)) { *nextTokPtr = ptr; return XML_TOK_INVALID; @@ -688,12 +688,13 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, #ifdef XML_NS int hadColon; #endif - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) case BT_EXCL: - ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if ((ptr += MINBPC(enc)) == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { case BT_MINUS: return PREFIX(scanComment)(enc, ptr + MINBPC(enc), end, nextTokPtr); @@ -715,7 +716,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, hadColon = 0; #endif /* we have a start-tag */ - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) #ifdef XML_NS @@ -726,7 +727,8 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, } hadColon = 1; ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) default: @@ -738,7 +740,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, case BT_S: case BT_CR: case BT_LF: { ptr += MINBPC(enc); - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) case BT_GT: @@ -763,7 +765,8 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, case BT_SOL: sol: ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; if (!CHAR_MATCHES(enc, ptr, ASCII_GT)) { *nextTokPtr = ptr; return XML_TOK_INVALID; @@ -782,7 +785,7 @@ static int PTRCALL PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; if (MINBPC(enc) > 1) { size_t n = end - ptr; @@ -800,7 +803,7 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, return PREFIX(scanRef)(enc, ptr + MINBPC(enc), end, nextTokPtr); case BT_CR: ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return XML_TOK_TRAILING_CR; if (BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); @@ -811,12 +814,12 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, return XML_TOK_DATA_NEWLINE; case BT_RSQB: ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return XML_TOK_TRAILING_RSQB; if (!CHAR_MATCHES(enc, ptr, ASCII_RSQB)) break; ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return XML_TOK_TRAILING_RSQB; if (!CHAR_MATCHES(enc, ptr, ASCII_GT)) { ptr -= MINBPC(enc); @@ -829,7 +832,7 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, ptr += MINBPC(enc); break; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ @@ -842,12 +845,12 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4) #undef LEAD_CASE case BT_RSQB: - if (HAS_CHARS(enc, ptr, end, 2)) { + if (ptr + MINBPC(enc) != end) { if (!CHAR_MATCHES(enc, ptr + MINBPC(enc), ASCII_RSQB)) { ptr += MINBPC(enc); break; } - if (HAS_CHARS(enc, ptr, end, 3)) { + if (ptr + 2*MINBPC(enc) != end) { if (!CHAR_MATCHES(enc, ptr + 2*MINBPC(enc), ASCII_GT)) { ptr += MINBPC(enc); break; @@ -881,7 +884,8 @@ static int PTRCALL PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) case BT_S: case BT_LF: case BT_CR: case BT_PERCNT: @@ -891,7 +895,7 @@ PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end, *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_SEMI: @@ -909,14 +913,15 @@ static int PTRCALL PREFIX(scanPoundName)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) default: *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_CR: case BT_LF: case BT_S: @@ -936,7 +941,7 @@ PREFIX(scanLit)(int open, const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { int t = BYTE_TYPE(enc, ptr); switch (t) { INVALID_CASES(ptr, nextTokPtr) @@ -945,7 +950,7 @@ PREFIX(scanLit)(int open, const ENCODING *enc, ptr += MINBPC(enc); if (t != open) break; - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return -XML_TOK_LITERAL; *nextTokPtr = ptr; switch (BYTE_TYPE(enc, ptr)) { @@ -968,7 +973,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { int tok; - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; if (MINBPC(enc) > 1) { size_t n = end - ptr; @@ -987,7 +992,8 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, case BT_LT: { ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { case BT_EXCL: return PREFIX(scanDecl)(enc, ptr + MINBPC(enc), end, nextTokPtr); @@ -1015,7 +1021,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, case BT_S: case BT_LF: for (;;) { ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) break; switch (BYTE_TYPE(enc, ptr)) { case BT_S: case BT_LF: @@ -1042,10 +1048,11 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, return XML_TOK_OPEN_BRACKET; case BT_RSQB: ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return -XML_TOK_CLOSE_BRACKET; if (CHAR_MATCHES(enc, ptr, ASCII_RSQB)) { - REQUIRE_CHARS(enc, ptr, end, 2); + if (ptr + MINBPC(enc) == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr + MINBPC(enc), ASCII_GT)) { *nextTokPtr = ptr + 2*MINBPC(enc); return XML_TOK_COND_SECT_CLOSE; @@ -1058,7 +1065,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, return XML_TOK_OPEN_PAREN; case BT_RPAR: ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return -XML_TOK_CLOSE_PAREN; switch (BYTE_TYPE(enc, ptr)) { case BT_AST: @@ -1134,7 +1141,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, *nextTokPtr = ptr; return XML_TOK_INVALID; } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) case BT_GT: case BT_RPAR: case BT_COMMA: @@ -1147,7 +1154,8 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, ptr += MINBPC(enc); switch (tok) { case XML_TOK_NAME: - REQUIRE_CHAR(enc, ptr, end); + if (ptr == end) + return XML_TOK_PARTIAL; tok = XML_TOK_PREFIXED_NAME; switch (BYTE_TYPE(enc, ptr)) { CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) @@ -1196,12 +1204,10 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { const char *start; - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; - else if (! HAS_CHAR(enc, ptr, end)) - return XML_TOK_PARTIAL; start = ptr; - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: ptr += n; break; @@ -1226,7 +1232,7 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr, case BT_CR: if (ptr == start) { ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return XML_TOK_TRAILING_CR; if (BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); @@ -1256,12 +1262,10 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr, const char *end, const char **nextTokPtr) { const char *start; - if (ptr >= end) + if (ptr == end) return XML_TOK_NONE; - else if (! HAS_CHAR(enc, ptr, end)) - return XML_TOK_PARTIAL; start = ptr; - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: ptr += n; break; @@ -1290,7 +1294,7 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr, case BT_CR: if (ptr == start) { ptr += MINBPC(enc); - if (! HAS_CHAR(enc, ptr, end)) + if (ptr == end) return XML_TOK_TRAILING_CR; if (BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); @@ -1322,15 +1326,15 @@ PREFIX(ignoreSectionTok)(const ENCODING *enc, const char *ptr, end = ptr + n; } } - while (HAS_CHAR(enc, ptr, end)) { + while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { INVALID_CASES(ptr, nextTokPtr) case BT_LT: - ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if ((ptr += MINBPC(enc)) == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_EXCL)) { - ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if ((ptr += MINBPC(enc)) == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_LSQB)) { ++level; ptr += MINBPC(enc); @@ -1338,11 +1342,11 @@ PREFIX(ignoreSectionTok)(const ENCODING *enc, const char *ptr, } break; case BT_RSQB: - ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if ((ptr += MINBPC(enc)) == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_RSQB)) { - ptr += MINBPC(enc); - REQUIRE_CHAR(enc, ptr, end); + if ((ptr += MINBPC(enc)) == end) + return XML_TOK_PARTIAL; if (CHAR_MATCHES(enc, ptr, ASCII_GT)) { ptr += MINBPC(enc); if (level == 0) { @@ -1369,7 +1373,7 @@ PREFIX(isPublicId)(const ENCODING *enc, const char *ptr, const char *end, { ptr += MINBPC(enc); end -= MINBPC(enc); - for (; HAS_CHAR(enc, ptr, end); ptr += MINBPC(enc)) { + for (; ptr != end; ptr += MINBPC(enc)) { switch (BYTE_TYPE(enc, ptr)) { case BT_DIGIT: case BT_HEX: @@ -1517,7 +1521,7 @@ PREFIX(getAtts)(const ENCODING *enc, const char *ptr, } static int PTRFASTCALL -PREFIX(charRefNumber)(const ENCODING *UNUSED_P(enc), const char *ptr) +PREFIX(charRefNumber)(const ENCODING *enc, const char *ptr) { int result = 0; /* skip &# */ @@ -1561,7 +1565,7 @@ PREFIX(charRefNumber)(const ENCODING *UNUSED_P(enc), const char *ptr) } static int PTRCALL -PREFIX(predefinedEntityName)(const ENCODING *UNUSED_P(enc), const char *ptr, +PREFIX(predefinedEntityName)(const ENCODING *enc, const char *ptr, const char *end) { switch ((end - ptr)/MINBPC(enc)) { @@ -1679,11 +1683,11 @@ PREFIX(sameName)(const ENCODING *enc, const char *ptr1, const char *ptr2) } static int PTRCALL -PREFIX(nameMatchesAscii)(const ENCODING *UNUSED_P(enc), const char *ptr1, +PREFIX(nameMatchesAscii)(const ENCODING *enc, const char *ptr1, const char *end1, const char *ptr2) { for (; *ptr2; ptr1 += MINBPC(enc), ptr2++) { - if (end1 - ptr1 < MINBPC(enc)) + if (ptr1 == end1) return 0; if (!CHAR_MATCHES(enc, ptr1, *ptr2)) return 0; @@ -1740,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *end, POSITION *pos) { - while (HAS_CHAR(enc, ptr, end)) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ @@ -1756,7 +1760,7 @@ PREFIX(updatePosition)(const ENCODING *enc, case BT_CR: pos->lineNumber++; ptr += MINBPC(enc); - if (HAS_CHAR(enc, ptr, end) && BYTE_TYPE(enc, ptr) == BT_LF) + if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); pos->columnNumber = (XML_Size)-1; break; diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 56285b6..1c1e4fb 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -119,12 +119,11 @@ static fault_handler_t faulthandler_handlers[] = { handler fails in faulthandler_fatal_error() */ {SIGSEGV, 0, "Segmentation fault", } }; -static const unsigned char faulthandler_nsignals = \ +static const size_t faulthandler_nsignals = \ Py_ARRAY_LENGTH(faulthandler_handlers); #ifdef HAVE_SIGALTSTACK static stack_t stack; -static stack_t old_stack; #endif @@ -160,7 +159,7 @@ faulthandler_get_fileno(PyObject **file_ptr) fd = _PyLong_AsInt(file); if (fd == -1 && PyErr_Occurred()) return -1; - if (fd < 0 || !_PyVerify_fd(fd)) { + if (fd < 0) { PyErr_SetString(PyExc_ValueError, "file is not a valid file descripter"); return -1; @@ -169,7 +168,7 @@ faulthandler_get_fileno(PyObject **file_ptr) return fd; } - result = _PyObject_CallMethodId(file, &PyId_fileno, ""); + result = _PyObject_CallMethodId(file, &PyId_fileno, NULL); if (result == NULL) return -1; @@ -187,7 +186,7 @@ faulthandler_get_fileno(PyObject **file_ptr) return -1; } - result = _PyObject_CallMethodId(file, &PyId_flush, ""); + result = _PyObject_CallMethodId(file, &PyId_flush, NULL); if (result != NULL) Py_DECREF(result); else { @@ -203,8 +202,9 @@ faulthandler_get_fileno(PyObject **file_ptr) static PyThreadState* get_thread_state(void) { - PyThreadState *tstate = PyThreadState_Get(); + PyThreadState *tstate = _PyThreadState_UncheckedGet(); if (tstate == NULL) { + /* just in case but very unlikely... */ PyErr_SetString(PyExc_RuntimeError, "unable to get the current thread state"); return NULL; @@ -235,11 +235,12 @@ faulthandler_dump_traceback(int fd, int all_threads, PyGILState_GetThisThreadState(). */ tstate = PyGILState_GetThisThreadState(); #else - tstate = PyThreadState_Get(); + tstate = _PyThreadState_UncheckedGet(); #endif - if (all_threads) - _Py_DumpTracebackThreads(fd, interp, tstate); + if (all_threads) { + (void)_Py_DumpTracebackThreads(fd, NULL, tstate); + } else { if (tstate != NULL) _Py_DumpTraceback(fd, tstate); @@ -273,7 +274,7 @@ faulthandler_dump_traceback_py(PyObject *self, return NULL; if (all_threads) { - errmsg = _Py_DumpTracebackThreads(fd, tstate->interp, tstate); + errmsg = _Py_DumpTracebackThreads(fd, NULL, tstate); if (errmsg != NULL) { PyErr_SetString(PyExc_RuntimeError, errmsg); return NULL; @@ -289,6 +290,19 @@ faulthandler_dump_traceback_py(PyObject *self, Py_RETURN_NONE; } +static void +faulthandler_disable_fatal_handler(fault_handler_t *handler) +{ + if (!handler->enabled) + return; + handler->enabled = 0; +#ifdef HAVE_SIGACTION + (void)sigaction(handler->signum, &handler->previous, NULL); +#else + (void)signal(handler->signum, handler->previous); +#endif +} + /* Handler for SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL signals. @@ -307,7 +321,7 @@ static void faulthandler_fatal_error(int signum) { const int fd = fatal_error.fd; - unsigned int i; + size_t i; fault_handler_t *handler = NULL; int save_errno = errno; @@ -325,12 +339,7 @@ faulthandler_fatal_error(int signum) } /* restore the previous handler */ -#ifdef HAVE_SIGACTION - (void)sigaction(signum, &handler->previous, NULL); -#else - (void)signal(signum, handler->previous); -#endif - handler->enabled = 0; + faulthandler_disable_fatal_handler(handler); PUTS(fd, "Fatal Python error: "); PUTS(fd, handler->name); @@ -352,20 +361,117 @@ faulthandler_fatal_error(int signum) raise(signum); } +#ifdef MS_WINDOWS +static LONG WINAPI +faulthandler_exc_handler(struct _EXCEPTION_POINTERS *exc_info) +{ + const int fd = fatal_error.fd; + DWORD code = exc_info->ExceptionRecord->ExceptionCode; + DWORD flags = exc_info->ExceptionRecord->ExceptionFlags; + + /* only log fatal exceptions */ + if (flags & EXCEPTION_NONCONTINUABLE) { + /* call the next exception handler */ + return EXCEPTION_CONTINUE_SEARCH; + } + + PUTS(fd, "Windows fatal exception: "); + switch (code) + { + /* only format most common errors */ + case EXCEPTION_ACCESS_VIOLATION: PUTS(fd, "access violation"); break; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: PUTS(fd, "float divide by zero"); break; + case EXCEPTION_FLT_OVERFLOW: PUTS(fd, "float overflow"); break; + case EXCEPTION_INT_DIVIDE_BY_ZERO: PUTS(fd, "int divide by zero"); break; + case EXCEPTION_INT_OVERFLOW: PUTS(fd, "integer overflow"); break; + case EXCEPTION_IN_PAGE_ERROR: PUTS(fd, "page error"); break; + case EXCEPTION_STACK_OVERFLOW: PUTS(fd, "stack overflow"); break; + default: + PUTS(fd, "code "); + _Py_DumpDecimal(fd, code); + } + PUTS(fd, "\n\n"); + + if (code == EXCEPTION_ACCESS_VIOLATION) { + /* disable signal handler for SIGSEGV */ + size_t i; + for (i=0; i < faulthandler_nsignals; i++) { + fault_handler_t *handler = &faulthandler_handlers[i]; + if (handler->signum == SIGSEGV) { + faulthandler_disable_fatal_handler(handler); + break; + } + } + } + + faulthandler_dump_traceback(fd, fatal_error.all_threads, + fatal_error.interp); + + /* call the next exception handler */ + return EXCEPTION_CONTINUE_SEARCH; +} +#endif + /* Install the handler for fatal signals, faulthandler_fatal_error(). */ +static int +faulthandler_enable(void) +{ + size_t i; + + if (fatal_error.enabled) { + return 0; + } + fatal_error.enabled = 1; + + for (i=0; i < faulthandler_nsignals; i++) { + fault_handler_t *handler; +#ifdef HAVE_SIGACTION + struct sigaction action; +#endif + int err; + + handler = &faulthandler_handlers[i]; + assert(!handler->enabled); +#ifdef HAVE_SIGACTION + action.sa_handler = faulthandler_fatal_error; + sigemptyset(&action.sa_mask); + /* Do not prevent the signal from being received from within + its own signal handler */ + action.sa_flags = SA_NODEFER; +#ifdef HAVE_SIGALTSTACK + if (stack.ss_sp != NULL) { + /* Call the signal handler on an alternate signal stack + provided by sigaltstack() */ + action.sa_flags |= SA_ONSTACK; + } +#endif + err = sigaction(handler->signum, &action, &handler->previous); +#else + handler->previous = signal(handler->signum, + faulthandler_fatal_error); + err = (handler->previous == SIG_ERR); +#endif + if (err) { + PyErr_SetFromErrno(PyExc_RuntimeError); + return -1; + } + + handler->enabled = 1; + } + +#ifdef MS_WINDOWS + AddVectoredExceptionHandler(1, faulthandler_exc_handler); +#endif + return 0; +} + static PyObject* -faulthandler_enable(PyObject *self, PyObject *args, PyObject *kwargs) +faulthandler_py_enable(PyObject *self, PyObject *args, PyObject *kwargs) { static char *kwlist[] = {"file", "all_threads", NULL}; PyObject *file = NULL; int all_threads = 1; - unsigned int i; - fault_handler_t *handler; -#ifdef HAVE_SIGACTION - struct sigaction action; -#endif - int err; int fd; PyThreadState *tstate; @@ -387,37 +493,10 @@ faulthandler_enable(PyObject *self, PyObject *args, PyObject *kwargs) fatal_error.all_threads = all_threads; fatal_error.interp = tstate->interp; - if (!fatal_error.enabled) { - fatal_error.enabled = 1; - - for (i=0; i < faulthandler_nsignals; i++) { - handler = &faulthandler_handlers[i]; -#ifdef HAVE_SIGACTION - action.sa_handler = faulthandler_fatal_error; - sigemptyset(&action.sa_mask); - /* Do not prevent the signal from being received from within - its own signal handler */ - action.sa_flags = SA_NODEFER; -#ifdef HAVE_SIGALTSTACK - if (stack.ss_sp != NULL) { - /* Call the signal handler on an alternate signal stack - provided by sigaltstack() */ - action.sa_flags |= SA_ONSTACK; - } -#endif - err = sigaction(handler->signum, &action, &handler->previous); -#else - handler->previous = signal(handler->signum, - faulthandler_fatal_error); - err = (handler->previous == SIG_ERR); -#endif - if (err) { - PyErr_SetFromErrno(PyExc_RuntimeError); - return NULL; - } - handler->enabled = 1; - } + if (faulthandler_enable() < 0) { + return NULL; } + Py_RETURN_NONE; } @@ -431,14 +510,7 @@ faulthandler_disable(void) fatal_error.enabled = 0; for (i=0; i < faulthandler_nsignals; i++) { handler = &faulthandler_handlers[i]; - if (!handler->enabled) - continue; -#ifdef HAVE_SIGACTION - (void)sigaction(handler->signum, &handler->previous, NULL); -#else - (void)signal(handler->signum, handler->previous); -#endif - handler->enabled = 0; + faulthandler_disable_fatal_handler(handler); } } @@ -470,7 +542,6 @@ faulthandler_thread(void *unused) { PyLockStatus st; const char* errmsg; - PyThreadState *current; int ok; #if defined(HAVE_PTHREAD_SIGMASK) && !defined(HAVE_BROKEN_PTHREAD_SIGMASK) sigset_t set; @@ -490,12 +561,9 @@ faulthandler_thread(void *unused) /* Timeout => dump traceback */ assert(st == PY_LOCK_FAILURE); - /* get the thread holding the GIL, NULL if no thread hold the GIL */ - current = _PyThreadState_UncheckedGet(); - _Py_write_noraise(thread.fd, thread.header, (int)thread.header_len); - errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, current); + errmsg = _Py_DumpTracebackThreads(thread.fd, thread.interp, NULL); ok = (errmsg == NULL); if (thread.exit) @@ -895,7 +963,7 @@ static PyObject * faulthandler_sigsegv(PyObject *self, PyObject *args) { int release_gil = 0; - if (!PyArg_ParseTuple(args, "|i:_read_null", &release_gil)) + if (!PyArg_ParseTuple(args, "|i:_sigsegv", &release_gil)) return NULL; if (release_gil) { @@ -908,6 +976,49 @@ faulthandler_sigsegv(PyObject *self, PyObject *args) Py_RETURN_NONE; } +#ifdef WITH_THREAD +static void +faulthandler_fatal_error_thread(void *plock) +{ + PyThread_type_lock *lock = (PyThread_type_lock *)plock; + + Py_FatalError("in new thread"); + + /* notify the caller that we are done */ + PyThread_release_lock(lock); +} + +static PyObject * +faulthandler_fatal_error_c_thread(PyObject *self, PyObject *args) +{ + long thread; + PyThread_type_lock lock; + + faulthandler_suppress_crash_report(); + + lock = PyThread_allocate_lock(); + if (lock == NULL) + return PyErr_NoMemory(); + + PyThread_acquire_lock(lock, WAIT_LOCK); + + thread = PyThread_start_new_thread(faulthandler_fatal_error_thread, lock); + if (thread == -1) { + PyThread_free_lock(lock); + PyErr_SetString(PyExc_RuntimeError, "unable to start the thread"); + return NULL; + } + + /* wait until the thread completes: it will never occur, since Py_FatalError() + exits the process immedialty. */ + PyThread_acquire_lock(lock, WAIT_LOCK); + PyThread_release_lock(lock); + PyThread_free_lock(lock); + + Py_RETURN_NONE; +} +#endif + static PyObject * faulthandler_sigfpe(PyObject *self, PyObject *args) { @@ -952,6 +1063,8 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args) } #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) +#define FAULTHANDLER_STACK_OVERFLOW + #ifdef __INTEL_COMPILER /* Issue #23654: Turn off ICC's tail call optimization for the * stack_overflow generator. ICC turns the recursive tail call into @@ -959,12 +1072,12 @@ faulthandler_fatal_error_py(PyObject *self, PyObject *args) # pragma intel optimization_level 0 #endif static -Py_uintptr_t -stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth) +uintptr_t +stack_overflow(uintptr_t min_sp, uintptr_t max_sp, size_t *depth) { /* allocate 4096 bytes on the stack at each call */ unsigned char buffer[4096]; - Py_uintptr_t sp = (Py_uintptr_t)&buffer; + uintptr_t sp = (uintptr_t)&buffer; *depth += 1; if (sp < min_sp || max_sp < sp) return sp; @@ -977,8 +1090,8 @@ static PyObject * faulthandler_stack_overflow(PyObject *self) { size_t depth, size; - Py_uintptr_t sp = (Py_uintptr_t)&depth; - Py_uintptr_t stop; + uintptr_t sp = (uintptr_t)&depth; + uintptr_t stop; faulthandler_suppress_crash_report(); depth = 0; @@ -995,7 +1108,7 @@ faulthandler_stack_overflow(PyObject *self) size, depth); return NULL; } -#endif +#endif /* defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) */ static int @@ -1018,12 +1131,25 @@ faulthandler_traverse(PyObject *module, visitproc visit, void *arg) return 0; } +#ifdef MS_WINDOWS +static PyObject * +faulthandler_raise_exception(PyObject *self, PyObject *args) +{ + unsigned int code, flags = 0; + if (!PyArg_ParseTuple(args, "I|I:_raise_exception", &code, &flags)) + return NULL; + faulthandler_suppress_crash_report(); + RaiseException(code, flags, 0, NULL); + Py_RETURN_NONE; +} +#endif + PyDoc_STRVAR(module_doc, "faulthandler module."); static PyMethodDef module_methods[] = { {"enable", - (PyCFunction)faulthandler_enable, METH_VARARGS|METH_KEYWORDS, + (PyCFunction)faulthandler_py_enable, METH_VARARGS|METH_KEYWORDS, PyDoc_STR("enable(file=sys.stderr, all_threads=True): " "enable the fault handler")}, {"disable", (PyCFunction)faulthandler_disable_py, METH_NOARGS, @@ -1066,16 +1192,25 @@ static PyMethodDef module_methods[] = { "a SIGSEGV or SIGBUS signal depending on the platform")}, {"_sigsegv", faulthandler_sigsegv, METH_VARARGS, PyDoc_STR("_sigsegv(release_gil=False): raise a SIGSEGV signal")}, +#ifdef WITH_THREAD + {"_fatal_error_c_thread", faulthandler_fatal_error_c_thread, METH_NOARGS, + PyDoc_STR("fatal_error_c_thread(): " + "call Py_FatalError() in a new C thread.")}, +#endif {"_sigabrt", faulthandler_sigabrt, METH_NOARGS, PyDoc_STR("_sigabrt(): raise a SIGABRT signal")}, {"_sigfpe", (PyCFunction)faulthandler_sigfpe, METH_NOARGS, PyDoc_STR("_sigfpe(): raise a SIGFPE signal")}, {"_fatal_error", faulthandler_fatal_error_py, METH_VARARGS, PyDoc_STR("_fatal_error(message): call Py_FatalError(message)")}, -#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) +#ifdef FAULTHANDLER_STACK_OVERFLOW {"_stack_overflow", (PyCFunction)faulthandler_stack_overflow, METH_NOARGS, PyDoc_STR("_stack_overflow(): recursive call to raise a stack overflow")}, #endif +#ifdef MS_WINDOWS + {"_raise_exception", faulthandler_raise_exception, METH_VARARGS, + PyDoc_STR("raise_exception(code, flags=0): Call RaiseException(code, flags).")}, +#endif {NULL, NULL} /* sentinel */ }; @@ -1094,7 +1229,33 @@ static struct PyModuleDef module_def = { PyMODINIT_FUNC PyInit_faulthandler(void) { - return PyModule_Create(&module_def); + PyObject *m = PyModule_Create(&module_def); + if (m == NULL) + return NULL; + + /* Add constants for unit tests */ +#ifdef MS_WINDOWS + /* RaiseException() codes (prefixed by an underscore) */ + if (PyModule_AddIntConstant(m, "_EXCEPTION_ACCESS_VIOLATION", + EXCEPTION_ACCESS_VIOLATION)) + return NULL; + if (PyModule_AddIntConstant(m, "_EXCEPTION_INT_DIVIDE_BY_ZERO", + EXCEPTION_INT_DIVIDE_BY_ZERO)) + return NULL; + if (PyModule_AddIntConstant(m, "_EXCEPTION_STACK_OVERFLOW", + EXCEPTION_STACK_OVERFLOW)) + return NULL; + + /* RaiseException() flags (prefixed by an underscore) */ + if (PyModule_AddIntConstant(m, "_EXCEPTION_NONCONTINUABLE", + EXCEPTION_NONCONTINUABLE)) + return NULL; + if (PyModule_AddIntConstant(m, "_EXCEPTION_NONCONTINUABLE_EXCEPTION", + EXCEPTION_NONCONTINUABLE_EXCEPTION)) + return NULL; +#endif + + return m; } /* Call faulthandler.enable() if the PYTHONFAULTHANDLER environment variable @@ -1129,7 +1290,7 @@ faulthandler_env_options(void) if (module == NULL) { return -1; } - res = _PyObject_CallMethodId(module, &PyId_enable, ""); + res = _PyObject_CallMethodId(module, &PyId_enable, NULL); Py_DECREF(module); if (res == NULL) return -1; @@ -1149,7 +1310,7 @@ int _PyFaulthandler_Init(void) stack.ss_size = SIGSTKSZ; stack.ss_sp = PyMem_Malloc(stack.ss_size); if (stack.ss_sp != NULL) { - err = sigaltstack(&stack, &old_stack); + err = sigaltstack(&stack, NULL); if (err) { PyMem_Free(stack.ss_sp); stack.ss_sp = NULL; @@ -1205,20 +1366,6 @@ void _PyFaulthandler_Fini(void) faulthandler_disable(); #ifdef HAVE_SIGALTSTACK if (stack.ss_sp != NULL) { - /* Fetch the current alt stack */ - stack_t current_stack; - if (sigaltstack(NULL, ¤t_stack) == 0) { - if (current_stack.ss_sp == stack.ss_sp) { - /* The current alt stack is the one that we installed. - It is safe to restore the old stack that we found when - we installed ours */ - sigaltstack(&old_stack, NULL); - } else { - /* Someone switched to a different alt stack and didn't - restore ours when they were done (if they're done). - There's not much we can do in this unlikely case */ - } - } PyMem_Free(stack.ss_sp); stack.ss_sp = NULL; } diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index cb7222d..754348e 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -25,6 +25,7 @@ #include "Python.h" #include "frameobject.h" /* for PyFrame_ClearFreeList */ +#include "pydtrace.h" #include "pytime.h" /* for _PyTime_GetMonotonicClock() */ /* Get an object's GC head */ @@ -738,7 +739,7 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old) } static void -debug_cycle(char *msg, PyObject *op) +debug_cycle(const char *msg, PyObject *op) { PySys_FormatStderr("gc: %s <%s %p>\n", msg, Py_TYPE(op)->tp_name, op); @@ -892,6 +893,7 @@ clear_freelists(void) (void)PyList_ClearFreeList(); (void)PyDict_ClearFreeList(); (void)PySet_ClearFreeList(); + (void)PyAsyncGen_ClearFreeLists(); } /* This is the main function. Read this to understand how the @@ -924,6 +926,9 @@ collect(int generation, Py_ssize_t *n_collected, Py_ssize_t *n_uncollectable, PySys_WriteStderr("\n"); } + if (PyDTrace_GC_START_ENABLED()) + PyDTrace_GC_START(generation); + /* update collection and allocation counters */ if (generation+1 < NUM_GENERATIONS) generations[generation+1].count += 1; @@ -1068,6 +1073,10 @@ collect(int generation, Py_ssize_t *n_collected, Py_ssize_t *n_uncollectable, stats->collections++; stats->collected += m; stats->uncollectable += n; + + if (PyDTrace_GC_DONE_ENABLED()) + PyDTrace_GC_DONE(n+m); + return n+m; } @@ -1588,6 +1597,15 @@ PyGC_Collect(void) } Py_ssize_t +_PyGC_CollectIfEnabled(void) +{ + if (!enabled) + return 0; + + return PyGC_Collect(); +} + +Py_ssize_t _PyGC_CollectNoFail(void) { Py_ssize_t n; diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c index d8167ea..b6fb53c 100644 --- a/Modules/getaddrinfo.c +++ b/Modules/getaddrinfo.c @@ -136,7 +136,7 @@ static int get_addr(const char *, int, struct addrinfo **, struct addrinfo *, int); static int str_isnumber(const char *); -static char *ai_errlist[] = { +static const char * const ai_errlist[] = { "success.", "address family for hostname not supported.", /* EAI_ADDRFAMILY */ "temporary failure in name resolution.", /* EAI_AGAIN */ @@ -198,7 +198,7 @@ if (pai->ai_flags & AI_CANONNAME) {\ #define ERR(err) { error = (err); goto bad; } -char * +const char * gai_strerror(int ecode) { if (ecode < 0 || ecode > EAI_MAX) diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c index 5f941a2..0971a64 100644 --- a/Modules/getbuildinfo.c +++ b/Modules/getbuildinfo.c @@ -21,47 +21,47 @@ #endif /* XXX Only unix build process has been tested */ -#ifndef GITVERSION -#define GITVERSION "" +#ifndef HGVERSION +#define HGVERSION "" #endif -#ifndef GITTAG -#define GITTAG "" +#ifndef HGTAG +#define HGTAG "" #endif -#ifndef GITBRANCH -#define GITBRANCH "" +#ifndef HGBRANCH +#define HGBRANCH "" #endif const char * Py_GetBuildInfo(void) { - static char buildinfo[50 + sizeof(GITVERSION) + - ((sizeof(GITTAG) > sizeof(GITBRANCH)) ? - sizeof(GITTAG) : sizeof(GITBRANCH))]; - const char *revision = _Py_gitversion(); + static char buildinfo[50 + sizeof(HGVERSION) + + ((sizeof(HGTAG) > sizeof(HGBRANCH)) ? + sizeof(HGTAG) : sizeof(HGBRANCH))]; + const char *revision = _Py_hgversion(); const char *sep = *revision ? ":" : ""; - const char *gitid = _Py_gitidentifier(); - if (!(*gitid)) - gitid = "default"; + const char *hgid = _Py_hgidentifier(); + if (!(*hgid)) + hgid = "default"; PyOS_snprintf(buildinfo, sizeof(buildinfo), - "%s%s%s, %.20s, %.9s", gitid, sep, revision, + "%s%s%s, %.20s, %.9s", hgid, sep, revision, DATE, TIME); return buildinfo; } const char * -_Py_gitversion(void) +_Py_hgversion(void) { - return GITVERSION; + return HGVERSION; } const char * -_Py_gitidentifier(void) +_Py_hgidentifier(void) { - const char *gittag, *gitid; - gittag = GITTAG; - if ((*gittag) && strcmp(gittag, "undefined") != 0) - gitid = gittag; + const char *hgtag, *hgid; + hgtag = HGTAG; + if ((*hgtag) && strcmp(hgtag, "tip") != 0) + hgid = hgtag; else - gitid = GITBRANCH; - return gitid; + hgid = HGBRANCH; + return hgid; } diff --git a/Modules/getpath.c b/Modules/getpath.c index c438b8e..0f91643 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -460,8 +460,8 @@ calculate_path(void) { extern wchar_t *Py_GetProgramName(void); - static wchar_t delimiter[2] = {DELIM, '\0'}; - static wchar_t separator[2] = {SEP, '\0'}; + static const wchar_t delimiter[2] = {DELIM, '\0'}; + static const wchar_t separator[2] = {SEP, '\0'}; char *_rtpypath = Py_GETENV("PYTHONPATH"); /* XXX use wide version on Windows */ wchar_t *rtpypath = NULL; wchar_t *home = Py_GetPythonHome(); diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c index 277fce4..9437ae7 100644 --- a/Modules/grpmodule.c +++ b/Modules/grpmodule.c @@ -100,14 +100,25 @@ grp_getgrgid_impl(PyObject *module, PyObject *id) gid_t gid; struct group *p; - py_int_id = PyNumber_Long(id); - if (!py_int_id) + if (!_Py_Gid_Converter(id, &gid)) { + if (!PyErr_ExceptionMatches(PyExc_TypeError)) { return NULL; - if (!_Py_Gid_Converter(py_int_id, &gid)) { + } + PyErr_Clear(); + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "group id must be int, not %.200", + id->ob_type->tp_name) < 0) { + return NULL; + } + py_int_id = PyNumber_Long(id); + if (!py_int_id) + return NULL; + if (!_Py_Gid_Converter(py_int_id, &gid)) { + Py_DECREF(py_int_id); + return NULL; + } Py_DECREF(py_int_id); - return NULL; } - Py_DECREF(py_int_id); if ((p = getgrgid(gid)) == NULL) { PyObject *gid_obj = _PyLong_FromGid(gid); @@ -140,7 +151,6 @@ grp_getgrnam_impl(PyObject *module, PyObject *name) if ((bytes = PyUnicode_EncodeFSDefault(name)) == NULL) return NULL; - /* check for embedded null bytes */ if (PyBytes_AsStringAndSize(bytes, &name_chars, NULL) == -1) goto out; diff --git a/Modules/hashlib.h b/Modules/hashlib.h index 3580453..530b6b1 100644 --- a/Modules/hashlib.h +++ b/Modules/hashlib.h @@ -2,30 +2,33 @@ /* * Given a PyObject* obj, fill in the Py_buffer* viewp with the result - * of PyObject_GetBuffer. Sets an exception and issues a return NULL - * on any errors. + * of PyObject_GetBuffer. Sets an exception and issues the erraction + * on any errors, e.g. 'return NULL' or 'goto error'. */ -#define GET_BUFFER_VIEW_OR_ERROUT(obj, viewp) do { \ +#define GET_BUFFER_VIEW_OR_ERROR(obj, viewp, erraction) do { \ if (PyUnicode_Check((obj))) { \ PyErr_SetString(PyExc_TypeError, \ "Unicode-objects must be encoded before hashing");\ - return NULL; \ + erraction; \ } \ if (!PyObject_CheckBuffer((obj))) { \ PyErr_SetString(PyExc_TypeError, \ "object supporting the buffer API required"); \ - return NULL; \ + erraction; \ } \ if (PyObject_GetBuffer((obj), (viewp), PyBUF_SIMPLE) == -1) { \ - return NULL; \ + erraction; \ } \ if ((viewp)->ndim > 1) { \ PyErr_SetString(PyExc_BufferError, \ "Buffer must be single dimension"); \ PyBuffer_Release((viewp)); \ - return NULL; \ + erraction; \ } \ - } while(0); + } while(0) + +#define GET_BUFFER_VIEW_OR_ERROUT(obj, viewp) \ + GET_BUFFER_VIEW_OR_ERROR(obj, viewp, return NULL) /* * Helper code to synchronize access to the hash object when the GIL is diff --git a/Modules/hashtable.c b/Modules/hashtable.c index fdddc19..0547a6d 100644 --- a/Modules/hashtable.c +++ b/Modules/hashtable.c @@ -1,5 +1,5 @@ -/* The implementation of the hash table (_Py_hashtable_t) is based on the cfuhash - project: +/* The implementation of the hash table (_Py_hashtable_t) is based on the + cfuhash project: http://sourceforge.net/projects/libcfu/ Copyright of cfuhash: @@ -59,7 +59,21 @@ #define ENTRY_NEXT(ENTRY) \ ((_Py_hashtable_entry_t *)_Py_SLIST_ITEM_NEXT(ENTRY)) #define HASHTABLE_ITEM_SIZE(HT) \ - (sizeof(_Py_hashtable_entry_t) + (HT)->data_size) + (sizeof(_Py_hashtable_entry_t) + (HT)->key_size + (HT)->data_size) + +#define ENTRY_READ_PDATA(TABLE, ENTRY, DATA_SIZE, PDATA) \ + do { \ + assert((DATA_SIZE) == (TABLE)->data_size); \ + memcpy((PDATA), _Py_HASHTABLE_ENTRY_PDATA(TABLE, (ENTRY)), \ + (DATA_SIZE)); \ + } while (0) + +#define ENTRY_WRITE_PDATA(TABLE, ENTRY, DATA_SIZE, PDATA) \ + do { \ + assert((DATA_SIZE) == (TABLE)->data_size); \ + memcpy((void *)_Py_HASHTABLE_ENTRY_PDATA((TABLE), (ENTRY)), \ + (PDATA), (DATA_SIZE)); \ + } while (0) /* Forward declaration */ static void hashtable_rehash(_Py_hashtable_t *ht); @@ -70,6 +84,7 @@ _Py_slist_init(_Py_slist_t *list) list->head = NULL; } + static void _Py_slist_prepend(_Py_slist_t *list, _Py_slist_item_t *item) { @@ -77,6 +92,7 @@ _Py_slist_prepend(_Py_slist_t *list, _Py_slist_item_t *item) list->head = item; } + static void _Py_slist_remove(_Py_slist_t *list, _Py_slist_item_t *previous, _Py_slist_item_t *item) @@ -87,24 +103,26 @@ _Py_slist_remove(_Py_slist_t *list, _Py_slist_item_t *previous, list->head = item->next; } -Py_uhash_t -_Py_hashtable_hash_int(const void *key) -{ - return (Py_uhash_t)key; -} Py_uhash_t -_Py_hashtable_hash_ptr(const void *key) +_Py_hashtable_hash_ptr(struct _Py_hashtable_t *ht, const void *pkey) { - return (Py_uhash_t)_Py_HashPointer((void *)key); + void *key; + + _Py_HASHTABLE_READ_KEY(ht, pkey, key); + return (Py_uhash_t)_Py_HashPointer(key); } + int -_Py_hashtable_compare_direct(const void *key, const _Py_hashtable_entry_t *entry) +_Py_hashtable_compare_direct(_Py_hashtable_t *ht, const void *pkey, + const _Py_hashtable_entry_t *entry) { - return entry->key == key; + const void *pkey2 = _Py_HASHTABLE_ENTRY_PKEY(entry); + return (memcmp(pkey, pkey2, ht->key_size) == 0); } + /* makes sure the real size of the buckets array is a power of 2 */ static size_t round_size(size_t s) @@ -118,13 +136,12 @@ round_size(size_t s) return i; } + _Py_hashtable_t * -_Py_hashtable_new_full(size_t data_size, size_t init_size, +_Py_hashtable_new_full(size_t key_size, size_t data_size, + size_t init_size, _Py_hashtable_hash_func hash_func, _Py_hashtable_compare_func compare_func, - _Py_hashtable_copy_data_func copy_data_func, - _Py_hashtable_free_data_func free_data_func, - _Py_hashtable_get_data_size_func get_data_size_func, _Py_hashtable_allocator_t *allocator) { _Py_hashtable_t *ht; @@ -144,6 +161,7 @@ _Py_hashtable_new_full(size_t data_size, size_t init_size, ht->num_buckets = round_size(init_size); ht->entries = 0; + ht->key_size = key_size; ht->data_size = data_size; buckets_size = ht->num_buckets * sizeof(ht->buckets[0]); @@ -156,28 +174,27 @@ _Py_hashtable_new_full(size_t data_size, size_t init_size, ht->hash_func = hash_func; ht->compare_func = compare_func; - ht->copy_data_func = copy_data_func; - ht->free_data_func = free_data_func; - ht->get_data_size_func = get_data_size_func; ht->alloc = alloc; return ht; } + _Py_hashtable_t * -_Py_hashtable_new(size_t data_size, +_Py_hashtable_new(size_t key_size, size_t data_size, _Py_hashtable_hash_func hash_func, _Py_hashtable_compare_func compare_func) { - return _Py_hashtable_new_full(data_size, HASHTABLE_MIN_SIZE, + return _Py_hashtable_new_full(key_size, data_size, + HASHTABLE_MIN_SIZE, hash_func, compare_func, - NULL, NULL, NULL, NULL); + NULL); } + size_t _Py_hashtable_size(_Py_hashtable_t *ht) { size_t size; - size_t hv; size = sizeof(_Py_hashtable_t); @@ -187,22 +204,10 @@ _Py_hashtable_size(_Py_hashtable_t *ht) /* entries */ size += ht->entries * HASHTABLE_ITEM_SIZE(ht); - /* data linked from entries */ - if (ht->get_data_size_func) { - for (hv = 0; hv < ht->num_buckets; hv++) { - _Py_hashtable_entry_t *entry; - - for (entry = TABLE_HEAD(ht, hv); entry; entry = ENTRY_NEXT(entry)) { - void *data; - - data = _Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(entry); - size += ht->get_data_size_func(data); - } - } - } return size; } + #ifdef Py_DEBUG void _Py_hashtable_print_stats(_Py_hashtable_t *ht) @@ -243,38 +248,45 @@ _Py_hashtable_print_stats(_Py_hashtable_t *ht) } #endif -/* Get an entry. Return NULL if the key does not exist. */ + _Py_hashtable_entry_t * -_Py_hashtable_get_entry(_Py_hashtable_t *ht, const void *key) +_Py_hashtable_get_entry(_Py_hashtable_t *ht, + size_t key_size, const void *pkey) { Py_uhash_t key_hash; size_t index; _Py_hashtable_entry_t *entry; - key_hash = ht->hash_func(key); + assert(key_size == ht->key_size); + + key_hash = ht->hash_func(ht, pkey); index = key_hash & (ht->num_buckets - 1); for (entry = TABLE_HEAD(ht, index); entry != NULL; entry = ENTRY_NEXT(entry)) { - if (entry->key_hash == key_hash && ht->compare_func(key, entry)) + if (entry->key_hash == key_hash && ht->compare_func(ht, pkey, entry)) break; } return entry; } + static int -_hashtable_pop_entry(_Py_hashtable_t *ht, const void *key, void *data, size_t data_size) +_Py_hashtable_pop_entry(_Py_hashtable_t *ht, size_t key_size, const void *pkey, + void *data, size_t data_size) { Py_uhash_t key_hash; size_t index; _Py_hashtable_entry_t *entry, *previous; - key_hash = ht->hash_func(key); + assert(key_size == ht->key_size); + + key_hash = ht->hash_func(ht, pkey); index = key_hash & (ht->num_buckets - 1); previous = NULL; for (entry = TABLE_HEAD(ht, index); entry != NULL; entry = ENTRY_NEXT(entry)) { - if (entry->key_hash == key_hash && ht->compare_func(key, entry)) + if (entry->key_hash == key_hash && ht->compare_func(ht, pkey, entry)) break; previous = entry; } @@ -287,7 +299,7 @@ _hashtable_pop_entry(_Py_hashtable_t *ht, const void *key, void *data, size_t da ht->entries--; if (data != NULL) - _Py_HASHTABLE_ENTRY_READ_DATA(ht, data, data_size, entry); + ENTRY_READ_PDATA(ht, entry, data_size, data); ht->alloc.free(entry); if ((float)ht->entries / (float)ht->num_buckets < HASHTABLE_LOW) @@ -295,26 +307,27 @@ _hashtable_pop_entry(_Py_hashtable_t *ht, const void *key, void *data, size_t da return 1; } -/* Add a new entry to the hash. The key must not be present in the hash table. - Return 0 on success, -1 on memory error. */ + int -_Py_hashtable_set(_Py_hashtable_t *ht, const void *key, - void *data, size_t data_size) +_Py_hashtable_set(_Py_hashtable_t *ht, size_t key_size, const void *pkey, + size_t data_size, const void *data) { Py_uhash_t key_hash; size_t index; _Py_hashtable_entry_t *entry; + assert(key_size == ht->key_size); + assert(data != NULL || data_size == 0); #ifndef NDEBUG /* Don't write the assertion on a single line because it is interesting to know the duplicated entry if the assertion failed. The entry can be read using a debugger. */ - entry = _Py_hashtable_get_entry(ht, key); + entry = _Py_hashtable_get_entry(ht, key_size, pkey); assert(entry == NULL); #endif - key_hash = ht->hash_func(key); + key_hash = ht->hash_func(ht, pkey); index = key_hash & (ht->num_buckets - 1); entry = ht->alloc.malloc(HASHTABLE_ITEM_SIZE(ht)); @@ -323,12 +336,10 @@ _Py_hashtable_set(_Py_hashtable_t *ht, const void *key, return -1; } - entry->key = (void *)key; entry->key_hash = key_hash; - - assert(data_size == ht->data_size); + memcpy((void *)_Py_HASHTABLE_ENTRY_PKEY(entry), pkey, ht->key_size); if (data) - memcpy(_Py_HASHTABLE_ENTRY_DATA(entry), data, data_size); + ENTRY_WRITE_PDATA(ht, entry, data_size, data); _Py_slist_prepend(&ht->buckets[index], (_Py_slist_item_t*)entry); ht->entries++; @@ -338,48 +349,50 @@ _Py_hashtable_set(_Py_hashtable_t *ht, const void *key, return 0; } -/* Get data from an entry. Copy entry data into data and return 1 if the entry - exists, return 0 if the entry does not exist. */ + int -_Py_hashtable_get(_Py_hashtable_t *ht, const void *key, void *data, size_t data_size) +_Py_hashtable_get(_Py_hashtable_t *ht, size_t key_size,const void *pkey, + size_t data_size, void *data) { _Py_hashtable_entry_t *entry; assert(data != NULL); - entry = _Py_hashtable_get_entry(ht, key); + entry = _Py_hashtable_get_entry(ht, key_size, pkey); if (entry == NULL) return 0; - _Py_HASHTABLE_ENTRY_READ_DATA(ht, data, data_size, entry); + ENTRY_READ_PDATA(ht, entry, data_size, data); return 1; } + int -_Py_hashtable_pop(_Py_hashtable_t *ht, const void *key, void *data, size_t data_size) +_Py_hashtable_pop(_Py_hashtable_t *ht, size_t key_size, const void *pkey, + size_t data_size, void *data) { assert(data != NULL); - assert(ht->free_data_func == NULL); - return _hashtable_pop_entry(ht, key, data, data_size); + return _Py_hashtable_pop_entry(ht, key_size, pkey, data, data_size); } -/* Delete an entry. The entry must exist. */ + +/* Code commented since the function is not needed in Python */ +#if 0 void -_Py_hashtable_delete(_Py_hashtable_t *ht, const void *key) +_Py_hashtable_delete(_Py_hashtable_t *ht, size_t key_size, const void *pkey) { #ifndef NDEBUG - int found = _hashtable_pop_entry(ht, key, NULL, 0); + int found = _Py_hashtable_pop_entry(ht, key_size, pkey, NULL, 0); assert(found); #else - (void)_hashtable_pop_entry(ht, key, NULL, 0); + (void)_Py_hashtable_pop_entry(ht, key_size, pkey, NULL, 0); #endif } +#endif + -/* Prototype for a pointer to a function to be called foreach - key/value pair in the hash by hashtable_foreach(). Iteration - stops if a non-zero value is returned. */ int _Py_hashtable_foreach(_Py_hashtable_t *ht, - int (*func) (_Py_hashtable_entry_t *entry, void *arg), + _Py_hashtable_foreach_func func, void *arg) { _Py_hashtable_entry_t *entry; @@ -387,7 +400,7 @@ _Py_hashtable_foreach(_Py_hashtable_t *ht, for (hv = 0; hv < ht->num_buckets; hv++) { for (entry = TABLE_HEAD(ht, hv); entry; entry = ENTRY_NEXT(entry)) { - int res = func(entry, arg); + int res = func(ht, entry, arg); if (res) return res; } @@ -395,6 +408,7 @@ _Py_hashtable_foreach(_Py_hashtable_t *ht, return 0; } + static void hashtable_rehash(_Py_hashtable_t *ht) { @@ -426,7 +440,8 @@ hashtable_rehash(_Py_hashtable_t *ht) for (entry = BUCKETS_HEAD(old_buckets[bucket]); entry != NULL; entry = next) { size_t entry_index; - assert(ht->hash_func(entry->key) == entry->key_hash); + + assert(ht->hash_func(ht, _Py_HASHTABLE_ENTRY_PKEY(entry)) == entry->key_hash); next = ENTRY_NEXT(entry); entry_index = entry->key_hash & (new_size - 1); @@ -437,6 +452,7 @@ hashtable_rehash(_Py_hashtable_t *ht) ht->alloc.free(old_buckets); } + void _Py_hashtable_clear(_Py_hashtable_t *ht) { @@ -446,8 +462,6 @@ _Py_hashtable_clear(_Py_hashtable_t *ht) for (i=0; i < ht->num_buckets; i++) { for (entry = TABLE_HEAD(ht, i); entry != NULL; entry = next) { next = ENTRY_NEXT(entry); - if (ht->free_data_func) - ht->free_data_func(_Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(entry)); ht->alloc.free(entry); } _Py_slist_init(&ht->buckets[i]); @@ -456,6 +470,7 @@ _Py_hashtable_clear(_Py_hashtable_t *ht) hashtable_rehash(ht); } + void _Py_hashtable_destroy(_Py_hashtable_t *ht) { @@ -465,8 +480,6 @@ _Py_hashtable_destroy(_Py_hashtable_t *ht) _Py_slist_item_t *entry = ht->buckets[i].head; while (entry) { _Py_slist_item_t *entry_next = entry->next; - if (ht->free_data_func) - ht->free_data_func(_Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(entry)); ht->alloc.free(entry); entry = entry_next; } @@ -476,39 +489,31 @@ _Py_hashtable_destroy(_Py_hashtable_t *ht) ht->alloc.free(ht); } -/* Return a copy of the hash table */ + _Py_hashtable_t * _Py_hashtable_copy(_Py_hashtable_t *src) { + const size_t key_size = src->key_size; + const size_t data_size = src->data_size; _Py_hashtable_t *dst; _Py_hashtable_entry_t *entry; size_t bucket; int err; - void *data, *new_data; - dst = _Py_hashtable_new_full(src->data_size, src->num_buckets, - src->hash_func, src->compare_func, - src->copy_data_func, src->free_data_func, - src->get_data_size_func, &src->alloc); + dst = _Py_hashtable_new_full(key_size, data_size, + src->num_buckets, + src->hash_func, + src->compare_func, + &src->alloc); if (dst == NULL) return NULL; for (bucket=0; bucket < src->num_buckets; bucket++) { entry = TABLE_HEAD(src, bucket); for (; entry; entry = ENTRY_NEXT(entry)) { - if (src->copy_data_func) { - data = _Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(entry); - new_data = src->copy_data_func(data); - if (new_data != NULL) - err = _Py_hashtable_set(dst, entry->key, - &new_data, src->data_size); - else - err = 1; - } - else { - data = _Py_HASHTABLE_ENTRY_DATA(entry); - err = _Py_hashtable_set(dst, entry->key, data, src->data_size); - } + const void *pkey = _Py_HASHTABLE_ENTRY_PKEY(entry); + const void *pdata = _Py_HASHTABLE_ENTRY_PDATA(src, entry); + err = _Py_hashtable_set(dst, key_size, pkey, data_size, pdata); if (err) { _Py_hashtable_destroy(dst); return NULL; @@ -517,4 +522,3 @@ _Py_hashtable_copy(_Py_hashtable_t *src) } return dst; } - diff --git a/Modules/hashtable.h b/Modules/hashtable.h index a9f9993..dbec23d 100644 --- a/Modules/hashtable.h +++ b/Modules/hashtable.h @@ -1,9 +1,10 @@ #ifndef Py_HASHTABLE_H #define Py_HASHTABLE_H - /* The whole API is private */ #ifndef Py_LIMITED_API +/* Single linked list */ + typedef struct _Py_slist_item_s { struct _Py_slist_item_s *next; } _Py_slist_item_t; @@ -16,33 +17,66 @@ typedef struct { #define _Py_SLIST_HEAD(SLIST) (((_Py_slist_t *)SLIST)->head) + +/* _Py_hashtable: table entry */ + typedef struct { /* used by _Py_hashtable_t.buckets to link entries */ _Py_slist_item_t _Py_slist_item; - const void *key; Py_uhash_t key_hash; - /* data follows */ + /* key (key_size bytes) and then data (data_size bytes) follows */ } _Py_hashtable_entry_t; -#define _Py_HASHTABLE_ENTRY_DATA(ENTRY) \ - ((char *)(ENTRY) + sizeof(_Py_hashtable_entry_t)) +#define _Py_HASHTABLE_ENTRY_PKEY(ENTRY) \ + ((const void *)((char *)(ENTRY) \ + + sizeof(_Py_hashtable_entry_t))) + +#define _Py_HASHTABLE_ENTRY_PDATA(TABLE, ENTRY) \ + ((const void *)((char *)(ENTRY) \ + + sizeof(_Py_hashtable_entry_t) \ + + (TABLE)->key_size)) + +/* Get a key value from pkey: use memcpy() rather than a pointer dereference + to avoid memory alignment issues. */ +#define _Py_HASHTABLE_READ_KEY(TABLE, PKEY, DST_KEY) \ + do { \ + assert(sizeof(DST_KEY) == (TABLE)->key_size); \ + memcpy(&(DST_KEY), (PKEY), sizeof(DST_KEY)); \ + } while (0) + +#define _Py_HASHTABLE_ENTRY_READ_KEY(TABLE, ENTRY, KEY) \ + do { \ + assert(sizeof(KEY) == (TABLE)->key_size); \ + memcpy(&(KEY), _Py_HASHTABLE_ENTRY_PKEY(ENTRY), sizeof(KEY)); \ + } while (0) -#define _Py_HASHTABLE_ENTRY_DATA_AS_VOID_P(ENTRY) \ - (*(void **)_Py_HASHTABLE_ENTRY_DATA(ENTRY)) +#define _Py_HASHTABLE_ENTRY_READ_DATA(TABLE, ENTRY, DATA) \ + do { \ + assert(sizeof(DATA) == (TABLE)->data_size); \ + memcpy(&(DATA), _Py_HASHTABLE_ENTRY_PDATA(TABLE, (ENTRY)), \ + sizeof(DATA)); \ + } while (0) -#define _Py_HASHTABLE_ENTRY_READ_DATA(TABLE, DATA, DATA_SIZE, ENTRY) \ +#define _Py_HASHTABLE_ENTRY_WRITE_DATA(TABLE, ENTRY, DATA) \ do { \ - assert((DATA_SIZE) == (TABLE)->data_size); \ - memcpy(DATA, _Py_HASHTABLE_ENTRY_DATA(ENTRY), DATA_SIZE); \ + assert(sizeof(DATA) == (TABLE)->data_size); \ + memcpy((void *)_Py_HASHTABLE_ENTRY_PDATA((TABLE), (ENTRY)), \ + &(DATA), sizeof(DATA)); \ } while (0) -typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key); -typedef int (*_Py_hashtable_compare_func) (const void *key, const _Py_hashtable_entry_t *he); -typedef void* (*_Py_hashtable_copy_data_func)(void *data); -typedef void (*_Py_hashtable_free_data_func)(void *data); -typedef size_t (*_Py_hashtable_get_data_size_func)(void *data); + +/* _Py_hashtable: prototypes */ + +/* Forward declaration */ +struct _Py_hashtable_t; + +typedef Py_uhash_t (*_Py_hashtable_hash_func) (struct _Py_hashtable_t *ht, + const void *pkey); +typedef int (*_Py_hashtable_compare_func) (struct _Py_hashtable_t *ht, + const void *pkey, + const _Py_hashtable_entry_t *he); typedef struct { /* allocate a memory block */ @@ -52,77 +86,126 @@ typedef struct { void (*free) (void *ptr); } _Py_hashtable_allocator_t; -typedef struct { + +/* _Py_hashtable: table */ + +typedef struct _Py_hashtable_t { size_t num_buckets; size_t entries; /* Total number of entries in the table. */ _Py_slist_t *buckets; + size_t key_size; size_t data_size; _Py_hashtable_hash_func hash_func; _Py_hashtable_compare_func compare_func; - _Py_hashtable_copy_data_func copy_data_func; - _Py_hashtable_free_data_func free_data_func; - _Py_hashtable_get_data_size_func get_data_size_func; _Py_hashtable_allocator_t alloc; } _Py_hashtable_t; -/* hash and compare functions for integers and pointers */ -PyAPI_FUNC(Py_uhash_t) _Py_hashtable_hash_ptr(const void *key); -PyAPI_FUNC(Py_uhash_t) _Py_hashtable_hash_int(const void *key); -PyAPI_FUNC(int) _Py_hashtable_compare_direct(const void *key, const _Py_hashtable_entry_t *entry); +/* hash a pointer (void*) */ +PyAPI_FUNC(Py_uhash_t) _Py_hashtable_hash_ptr( + struct _Py_hashtable_t *ht, + const void *pkey); + +/* comparison using memcmp() */ +PyAPI_FUNC(int) _Py_hashtable_compare_direct( + _Py_hashtable_t *ht, + const void *pkey, + const _Py_hashtable_entry_t *entry); PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new( + size_t key_size, size_t data_size, _Py_hashtable_hash_func hash_func, _Py_hashtable_compare_func compare_func); + PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new_full( + size_t key_size, size_t data_size, size_t init_size, _Py_hashtable_hash_func hash_func, _Py_hashtable_compare_func compare_func, - _Py_hashtable_copy_data_func copy_data_func, - _Py_hashtable_free_data_func free_data_func, - _Py_hashtable_get_data_size_func get_data_size_func, _Py_hashtable_allocator_t *allocator); + +PyAPI_FUNC(void) _Py_hashtable_destroy(_Py_hashtable_t *ht); + +/* Return a copy of the hash table */ PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_copy(_Py_hashtable_t *src); + PyAPI_FUNC(void) _Py_hashtable_clear(_Py_hashtable_t *ht); -PyAPI_FUNC(void) _Py_hashtable_destroy(_Py_hashtable_t *ht); -typedef int (*_Py_hashtable_foreach_func) (_Py_hashtable_entry_t *entry, void *arg); +typedef int (*_Py_hashtable_foreach_func) (_Py_hashtable_t *ht, + _Py_hashtable_entry_t *entry, + void *arg); +/* Call func() on each entry of the hashtable. + Iteration stops if func() result is non-zero, in this case it's the result + of the call. Otherwise, the function returns 0. */ PyAPI_FUNC(int) _Py_hashtable_foreach( _Py_hashtable_t *ht, - _Py_hashtable_foreach_func func, void *arg); + _Py_hashtable_foreach_func func, + void *arg); + PyAPI_FUNC(size_t) _Py_hashtable_size(_Py_hashtable_t *ht); -PyAPI_FUNC(_Py_hashtable_entry_t*) _Py_hashtable_get_entry( - _Py_hashtable_t *ht, - const void *key); +/* Add a new entry to the hash. The key must not be present in the hash table. + Return 0 on success, -1 on memory error. + + Don't call directly this function, + but use _Py_HASHTABLE_SET() and _Py_HASHTABLE_SET_NODATA() macros */ PyAPI_FUNC(int) _Py_hashtable_set( _Py_hashtable_t *ht, - const void *key, - void *data, - size_t data_size); + size_t key_size, + const void *pkey, + size_t data_size, + const void *data); + +#define _Py_HASHTABLE_SET(TABLE, KEY, DATA) \ + _Py_hashtable_set(TABLE, sizeof(KEY), &(KEY), sizeof(DATA), &(DATA)) + +#define _Py_HASHTABLE_SET_NODATA(TABLE, KEY) \ + _Py_hashtable_set(TABLE, sizeof(KEY), &(KEY), 0, NULL) + + +/* Get an entry. + Return NULL if the key does not exist. + + Don't call directly this function, but use _Py_HASHTABLE_GET_ENTRY() + macro */ +PyAPI_FUNC(_Py_hashtable_entry_t*) _Py_hashtable_get_entry( + _Py_hashtable_t *ht, + size_t key_size, + const void *pkey); + +#define _Py_HASHTABLE_GET_ENTRY(TABLE, KEY) \ + _Py_hashtable_get_entry(TABLE, sizeof(KEY), &(KEY)) + + +/* Get data from an entry. Copy entry data into data and return 1 if the entry + exists, return 0 if the entry does not exist. + + Don't call directly this function, but use _Py_HASHTABLE_GET() macro */ PyAPI_FUNC(int) _Py_hashtable_get( _Py_hashtable_t *ht, - const void *key, - void *data, - size_t data_size); + size_t key_size, + const void *pkey, + size_t data_size, + void *data); + +#define _Py_HASHTABLE_GET(TABLE, KEY, DATA) \ + _Py_hashtable_get(TABLE, sizeof(KEY), &(KEY), sizeof(DATA), &(DATA)) + + +/* Don't call directly this function, but use _Py_HASHTABLE_POP() macro */ PyAPI_FUNC(int) _Py_hashtable_pop( _Py_hashtable_t *ht, - const void *key, - void *data, - size_t data_size); -PyAPI_FUNC(void) _Py_hashtable_delete( - _Py_hashtable_t *ht, - const void *key); + size_t key_size, + const void *pkey, + size_t data_size, + void *data); -#define _Py_HASHTABLE_SET(TABLE, KEY, DATA) \ - _Py_hashtable_set(TABLE, KEY, &(DATA), sizeof(DATA)) +#define _Py_HASHTABLE_POP(TABLE, KEY, DATA) \ + _Py_hashtable_pop(TABLE, sizeof(KEY), &(KEY), sizeof(DATA), &(DATA)) -#define _Py_HASHTABLE_GET(TABLE, KEY, DATA) \ - _Py_hashtable_get(TABLE, KEY, &(DATA), sizeof(DATA)) #endif /* Py_LIMITED_API */ - #endif diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 584dc6e..6bf04cb 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -1,4 +1,5 @@ +#define PY_SSIZE_T_CLEAN #include "Python.h" #include "structmember.h" @@ -7,7 +8,7 @@ */ -/* groupby object ***********************************************************/ +/* groupby object ************************************************************/ typedef struct { PyObject_HEAD @@ -74,7 +75,7 @@ groupby_traverse(groupbyobject *gbo, visitproc visit, void *arg) static PyObject * groupby_next(groupbyobject *gbo) { - PyObject *newvalue, *newkey, *r, *grouper, *tmp; + PyObject *newvalue, *newkey, *r, *grouper; /* skip to next iteration group */ for (;;) { @@ -85,8 +86,7 @@ groupby_next(groupbyobject *gbo) else { int rcmp; - rcmp = PyObject_RichCompareBool(gbo->tgtkey, - gbo->currkey, Py_EQ); + rcmp = PyObject_RichCompareBool(gbo->tgtkey, gbo->currkey, Py_EQ); if (rcmp == -1) return NULL; else if (rcmp == 0) @@ -101,27 +101,19 @@ groupby_next(groupbyobject *gbo) newkey = newvalue; Py_INCREF(newvalue); } else { - newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, - newvalue, NULL); + newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL); if (newkey == NULL) { Py_DECREF(newvalue); return NULL; } } - tmp = gbo->currkey; - gbo->currkey = newkey; - Py_XDECREF(tmp); - - tmp = gbo->currvalue; - gbo->currvalue = newvalue; - Py_XDECREF(tmp); + Py_XSETREF(gbo->currkey, newkey); + Py_XSETREF(gbo->currvalue, newvalue); } Py_INCREF(gbo->currkey); - tmp = gbo->tgtkey; - gbo->tgtkey = gbo->currkey; - Py_XDECREF(tmp); + Py_XSETREF(gbo->tgtkey, gbo->currkey); grouper = _grouper_create(gbo, gbo->tgtkey); if (grouper == NULL) @@ -178,7 +170,7 @@ static PyMethodDef groupby_methods[] = { reduce_doc}, {"__setstate__", (PyCFunction)groupby_setstate, METH_O, setstate_doc}, - {NULL, NULL} /* sentinel */ + {NULL, NULL} /* sentinel */ }; PyDoc_STRVAR(groupby_doc, @@ -301,8 +293,7 @@ _grouper_next(_grouperobject *igo) newkey = newvalue; Py_INCREF(newvalue); } else { - newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, - newvalue, NULL); + newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL); if (newkey == NULL) { Py_DECREF(newvalue); return NULL; @@ -330,8 +321,7 @@ _grouper_next(_grouperobject *igo) static PyObject * _grouper_reduce(_grouperobject *lz) { - return Py_BuildValue("O(OO)", Py_TYPE(lz), - lz->parent, lz->tgtkey); + return Py_BuildValue("O(OO)", Py_TYPE(lz), lz->parent, lz->tgtkey); } static PyMethodDef _grouper_methods[] = { @@ -364,7 +354,7 @@ static PyTypeObject _grouper_type = { 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ 0, /* tp_doc */ - (traverseproc)_grouper_traverse,/* tp_traverse */ + (traverseproc)_grouper_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ @@ -385,8 +375,7 @@ static PyTypeObject _grouper_type = { }; - -/* tee object and with supporting function and objects ***************/ +/* tee object and with supporting function and objects ***********************/ /* The teedataobject pre-allocates space for LINKCELLS number of objects. To help the object fit neatly inside cache lines (space for 16 to 32 @@ -401,7 +390,7 @@ static PyTypeObject _grouper_type = { typedef struct { PyObject_HEAD PyObject *it; - int numread; /* 0 <= numread <= LINKCELLS */ + int numread; /* 0 <= numread <= LINKCELLS */ PyObject *nextlink; PyObject *(values[LINKCELLS]); } teedataobject; @@ -409,7 +398,7 @@ typedef struct { typedef struct { PyObject_HEAD teedataobject *dataobj; - int index; /* 0 <= index <= LINKCELLS */ + int index; /* 0 <= index <= LINKCELLS */ PyObject *weakreflist; } teeobject; @@ -466,6 +455,7 @@ static int teedataobject_traverse(teedataobject *tdo, visitproc visit, void * arg) { int i; + Py_VISIT(tdo->it); for (i = 0; i < tdo->numread; i++) Py_VISIT(tdo->values[i]); @@ -515,6 +505,7 @@ teedataobject_reduce(teedataobject *tdo) int i; /* create a temporary list of already iterated values */ PyObject *values = PyList_New(tdo->numread); + if (!values) return NULL; for (i=0 ; inumread ; i++) { @@ -582,7 +573,7 @@ static PyMethodDef teedataobject_methods[] = { PyDoc_STRVAR(teedataobject_doc, "Data container common to multiple tee objects."); static PyTypeObject teedataobject_type = { - PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */ + PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */ "itertools._tee_dataobject", /* tp_name */ sizeof(teedataobject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -602,7 +593,7 @@ static PyTypeObject teedataobject_type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ teedataobject_doc, /* tp_doc */ (traverseproc)teedataobject_traverse, /* tp_traverse */ (inquiry)teedataobject_clear, /* tp_clear */ @@ -762,9 +753,9 @@ PyDoc_STRVAR(teeobject_doc, "Iterator wrapped to make it copyable"); static PyMethodDef tee_methods[] = { - {"__copy__", (PyCFunction)tee_copy, METH_NOARGS, teecopy_doc}, - {"__reduce__", (PyCFunction)tee_reduce, METH_NOARGS, reduce_doc}, - {"__setstate__", (PyCFunction)tee_setstate, METH_O, setstate_doc}, + {"__copy__", (PyCFunction)tee_copy, METH_NOARGS, teecopy_doc}, + {"__reduce__", (PyCFunction)tee_reduce, METH_NOARGS, reduce_doc}, + {"__setstate__", (PyCFunction)tee_setstate, METH_O, setstate_doc}, {NULL, NULL} /* sentinel */ }; @@ -794,7 +785,7 @@ static PyTypeObject tee_type = { (traverseproc)tee_traverse, /* tp_traverse */ (inquiry)tee_clear, /* tp_clear */ 0, /* tp_richcompare */ - offsetof(teeobject, weakreflist), /* tp_weaklistoffset */ + offsetof(teeobject, weakreflist), /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)tee_next, /* tp_iternext */ tee_methods, /* tp_methods */ @@ -860,12 +851,13 @@ PyDoc_STRVAR(tee_doc, "tee(iterable, n=2) --> tuple of n independent iterators."); -/* cycle object **********************************************************/ +/* cycle object **************************************************************/ typedef struct { PyObject_HEAD PyObject *it; PyObject *saved; + Py_ssize_t index; int firstpass; } cycleobject; @@ -905,6 +897,7 @@ cycle_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } lz->it = it; lz->saved = saved; + lz->index = 0; lz->firstpass = 0; return (PyObject *)lz; @@ -914,15 +907,16 @@ static void cycle_dealloc(cycleobject *lz) { PyObject_GC_UnTrack(lz); - Py_XDECREF(lz->saved); Py_XDECREF(lz->it); + Py_XDECREF(lz->saved); Py_TYPE(lz)->tp_free(lz); } static int cycle_traverse(cycleobject *lz, visitproc visit, void *arg) { - Py_VISIT(lz->it); + if (lz->it) + Py_VISIT(lz->it); Py_VISIT(lz->saved); return 0; } @@ -931,45 +925,56 @@ static PyObject * cycle_next(cycleobject *lz) { PyObject *item; - PyObject *it; - PyObject *tmp; - while (1) { + if (lz->it != NULL) { item = PyIter_Next(lz->it); if (item != NULL) { - if (!lz->firstpass && PyList_Append(lz->saved, item)) { + if (lz->firstpass) + return item; + if (PyList_Append(lz->saved, item)) { Py_DECREF(item); return NULL; } return item; } - if (PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_StopIteration)) - PyErr_Clear(); - else - return NULL; - } - if (PyList_Size(lz->saved) == 0) + /* Note: StopIteration is already cleared by PyIter_Next() */ + if (PyErr_Occurred()) return NULL; - it = PyObject_GetIter(lz->saved); - if (it == NULL) - return NULL; - tmp = lz->it; - lz->it = it; - lz->firstpass = 1; - Py_DECREF(tmp); + Py_CLEAR(lz->it); } + if (Py_SIZE(lz->saved) == 0) + return NULL; + item = PyList_GET_ITEM(lz->saved, lz->index); + lz->index++; + if (lz->index >= Py_SIZE(lz->saved)) + lz->index = 0; + Py_INCREF(item); + return item; } static PyObject * cycle_reduce(cycleobject *lz) { - /* Create a new cycle with the iterator tuple, then set - * the saved state on it. - */ - return Py_BuildValue("O(O)(Oi)", Py_TYPE(lz), - lz->it, lz->saved, lz->firstpass); + /* Create a new cycle with the iterator tuple, then set the saved state */ + if (lz->it == NULL) { + PyObject *it = PyObject_GetIter(lz->saved); + if (it == NULL) + return NULL; + if (lz->index != 0) { + _Py_IDENTIFIER(__setstate__); + PyObject *res = _PyObject_CallMethodId(it, &PyId___setstate__, + "n", lz->index); + if (res == NULL) { + Py_DECREF(it); + return NULL; + } + Py_DECREF(res); + } + return Py_BuildValue("O(N)(Oi)", Py_TYPE(lz), it, lz->saved, 1); } + return Py_BuildValue("O(O)(Oi)", Py_TYPE(lz), lz->it, lz->saved, + lz->firstpass); +} static PyObject * cycle_setstate(cycleobject *lz, PyObject *state) @@ -983,9 +988,10 @@ cycle_setstate(cycleobject *lz, PyObject *state) if (!PyArg_ParseTuple(state, "O!i", &PyList_Type, &saved, &firstpass)) { return NULL; } - Py_XINCREF(saved); + Py_INCREF(saved); Py_XSETREF(lz->saved, saved); lz->firstpass = firstpass != 0; + lz->index = 0; Py_RETURN_NONE; } @@ -1054,7 +1060,7 @@ typedef struct { PyObject_HEAD PyObject *func; PyObject *it; - long start; + long start; } dropwhileobject; static PyTypeObject dropwhile_type; @@ -1144,8 +1150,7 @@ dropwhile_next(dropwhileobject *lz) static PyObject * dropwhile_reduce(dropwhileobject *lz) { - return Py_BuildValue("O(OO)l", Py_TYPE(lz), - lz->func, lz->it, lz->start); + return Py_BuildValue("O(OO)l", Py_TYPE(lz), lz->func, lz->it, lz->start); } static PyObject * @@ -1196,13 +1201,13 @@ static PyTypeObject dropwhile_type = { Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ dropwhile_doc, /* tp_doc */ - (traverseproc)dropwhile_traverse, /* tp_traverse */ + (traverseproc)dropwhile_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)dropwhile_next, /* tp_iternext */ - dropwhile_methods, /* tp_methods */ + dropwhile_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ @@ -1223,7 +1228,7 @@ typedef struct { PyObject_HEAD PyObject *func; PyObject *it; - long stop; + long stop; } takewhileobject; static PyTypeObject takewhile_type; @@ -1298,7 +1303,7 @@ takewhile_next(takewhileobject *lz) } ok = PyObject_IsTrue(good); Py_DECREF(good); - if (ok == 1) + if (ok > 0) return item; Py_DECREF(item); if (ok == 0) @@ -1309,14 +1314,14 @@ takewhile_next(takewhileobject *lz) static PyObject * takewhile_reduce(takewhileobject *lz) { - return Py_BuildValue("O(OO)l", Py_TYPE(lz), - lz->func, lz->it, lz->stop); + return Py_BuildValue("O(OO)l", Py_TYPE(lz), lz->func, lz->it, lz->stop); } static PyObject * takewhile_reduce_setstate(takewhileobject *lz, PyObject *state) { int stop = PyObject_IsTrue(state); + if (stop < 0) return NULL; lz->stop = stop; @@ -1360,7 +1365,7 @@ static PyTypeObject takewhile_type = { Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ takewhile_doc, /* tp_doc */ - (traverseproc)takewhile_traverse, /* tp_traverse */ + (traverseproc)takewhile_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ @@ -1381,7 +1386,7 @@ static PyTypeObject takewhile_type = { }; -/* islice object ************************************************************/ +/* islice object *************************************************************/ typedef struct { PyObject_HEAD @@ -1417,7 +1422,8 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (PyErr_Occurred()) PyErr_Clear(); PyErr_SetString(PyExc_ValueError, - "Stop argument for islice() must be None or an integer: 0 <= x <= sys.maxsize."); + "Stop argument for islice() must be None or " + "an integer: 0 <= x <= sys.maxsize."); return NULL; } } @@ -1432,14 +1438,16 @@ islice_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (PyErr_Occurred()) PyErr_Clear(); PyErr_SetString(PyExc_ValueError, - "Stop argument for islice() must be None or an integer: 0 <= x <= sys.maxsize."); + "Stop argument for islice() must be None or " + "an integer: 0 <= x <= sys.maxsize."); return NULL; } } } if (start<0 || stop<-1) { PyErr_SetString(PyExc_ValueError, - "Indices for islice() must be None or an integer: 0 <= x <= sys.maxsize."); + "Indices for islice() must be None or " + "an integer: 0 <= x <= sys.maxsize."); return NULL; } @@ -1536,6 +1544,7 @@ islice_reduce(isliceobject *lz) * then 'setstate' with the next and count */ PyObject *stop; + if (lz->it == NULL) { PyObject *empty_list; PyObject *empty_it; @@ -1565,6 +1574,7 @@ static PyObject * islice_setstate(isliceobject *lz, PyObject *state) { Py_ssize_t cnt = PyLong_AsSsize_t(state); + if (cnt == -1 && PyErr_Occurred()) return NULL; lz->cnt = cnt; @@ -1779,7 +1789,7 @@ static PyTypeObject starmap_type = { }; -/* chain object ************************************************************/ +/* chain object **************************************************************/ typedef struct { PyObject_HEAD @@ -1854,37 +1864,33 @@ chain_next(chainobject *lz) { PyObject *item; - /* lz->source is the iterator of iterables. If it's NULL, we've already - * consumed them all. lz->active is the current iterator. If it's NULL, - * we should grab a new one from lz->source. */ - while (lz->source != NULL) { - if (lz->active == NULL) { - PyObject *iterable = PyIter_Next(lz->source); - if (iterable == NULL) { - Py_CLEAR(lz->source); - return NULL; /* no more input sources */ - } - lz->active = PyObject_GetIter(iterable); - Py_DECREF(iterable); - if (lz->active == NULL) { - Py_CLEAR(lz->source); - return NULL; /* input not iterable */ - } + if (lz->source == NULL) + return NULL; /* already stopped */ + + if (lz->active == NULL) { + PyObject *iterable = PyIter_Next(lz->source); + if (iterable == NULL) { + Py_CLEAR(lz->source); + return NULL; /* no more input sources */ } - item = (*Py_TYPE(lz->active)->tp_iternext)(lz->active); - if (item != NULL) - return item; - if (PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_StopIteration)) - PyErr_Clear(); - else - return NULL; /* input raised an exception */ + lz->active = PyObject_GetIter(iterable); + Py_DECREF(iterable); + if (lz->active == NULL) { + Py_CLEAR(lz->source); + return NULL; /* input not iterable */ } - /* lz->active is consumed, try with the next iterable. */ - Py_CLEAR(lz->active); } - /* Everything had been consumed already. */ - return NULL; + item = (*Py_TYPE(lz->active)->tp_iternext)(lz->active); + if (item != NULL) + return item; + if (PyErr_Occurred()) { + if (PyErr_ExceptionMatches(PyExc_StopIteration)) + PyErr_Clear(); + else + return NULL; /* input raised an exception */ + } + Py_CLEAR(lz->active); + return chain_next(lz); /* recurse and use next active */ } static PyObject * @@ -1944,13 +1950,13 @@ Alternate chain() constructor taking a single iterable argument\n\ that evaluates lazily."); static PyMethodDef chain_methods[] = { - {"from_iterable", (PyCFunction) chain_new_from_iterable, METH_O | METH_CLASS, - chain_from_iterable_doc}, + {"from_iterable", (PyCFunction) chain_new_from_iterable, METH_O | METH_CLASS, + chain_from_iterable_doc}, {"__reduce__", (PyCFunction)chain_reduce, METH_NOARGS, reduce_doc}, {"__setstate__", (PyCFunction)chain_setstate, METH_O, setstate_doc}, - {NULL, NULL} /* sentinel */ + {NULL, NULL} /* sentinel */ }; static PyTypeObject chain_type = { @@ -2002,10 +2008,10 @@ static PyTypeObject chain_type = { typedef struct { PyObject_HEAD - PyObject *pools; /* tuple of pool tuples */ - Py_ssize_t *indices; /* one index per pool */ - PyObject *result; /* most recently returned result tuple */ - int stopped; /* set to 1 when the product iterator is exhausted */ + PyObject *pools; /* tuple of pool tuples */ + Py_ssize_t *indices; /* one index per pool */ + PyObject *result; /* most recently returned result tuple */ + int stopped; /* set to 1 when the iterator is exhausted */ } productobject; static PyTypeObject product_type; @@ -2024,7 +2030,8 @@ product_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyObject *tmpargs = PyTuple_New(0); if (tmpargs == NULL) return NULL; - if (!PyArg_ParseTupleAndKeywords(tmpargs, kwds, "|n:product", kwlist, &repeat)) { + if (!PyArg_ParseTupleAndKeywords(tmpargs, kwds, "|n:product", + kwlist, &repeat)) { Py_DECREF(tmpargs); return NULL; } @@ -2313,7 +2320,7 @@ product((0,1), (0,1), (0,1)) --> (0,0,0) (0,0,1) (0,1,0) (0,1,1) (1,0,0) ..."); static PyTypeObject product_type = { PyVarObject_HEAD_INIT(NULL, 0) "itertools.product", /* tp_name */ - sizeof(productobject), /* tp_basicsize */ + sizeof(productobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ (destructor)product_dealloc, /* tp_dealloc */ @@ -2355,15 +2362,15 @@ static PyTypeObject product_type = { }; -/* combinations object ************************************************************/ +/* combinations object *******************************************************/ typedef struct { PyObject_HEAD - PyObject *pool; /* input converted to a tuple */ - Py_ssize_t *indices; /* one index per result element */ - PyObject *result; /* most recently returned result tuple */ - Py_ssize_t r; /* size of result tuple */ - int stopped; /* set to 1 when the combinations iterator is exhausted */ + PyObject *pool; /* input converted to a tuple */ + Py_ssize_t *indices; /* one index per result element */ + PyObject *result; /* most recently returned result tuple */ + Py_ssize_t r; /* size of result tuple */ + int stopped; /* set to 1 when the iterator is exhausted */ } combinationsobject; static PyTypeObject combinations_type; @@ -2573,17 +2580,16 @@ combinations_setstate(combinationsobject *lz, PyObject *state) Py_ssize_t i; Py_ssize_t n = PyTuple_GET_SIZE(lz->pool); - if (!PyTuple_Check(state) || PyTuple_GET_SIZE(state) != lz->r) - { + if (!PyTuple_Check(state) || PyTuple_GET_SIZE(state) != lz->r) { PyErr_SetString(PyExc_ValueError, "invalid arguments"); return NULL; } - for (i=0; ir; i++) - { + for (i=0; ir; i++) { Py_ssize_t max; PyObject* indexObject = PyTuple_GET_ITEM(state, i); Py_ssize_t index = PyLong_AsSsize_t(indexObject); + if (index == -1 && PyErr_Occurred()) return NULL; /* not an integer */ max = i + n - lz->r; @@ -2669,7 +2675,7 @@ static PyTypeObject combinations_type = { }; -/* combinations with replacement object *******************************************/ +/* combinations with replacement object **************************************/ /* Equivalent to: @@ -2699,11 +2705,11 @@ static PyTypeObject combinations_type = { */ typedef struct { PyObject_HEAD - PyObject *pool; /* input converted to a tuple */ + PyObject *pool; /* input converted to a tuple */ Py_ssize_t *indices; /* one index per result element */ PyObject *result; /* most recently returned result tuple */ - Py_ssize_t r; /* size of result tuple */ - int stopped; /* set to 1 when the cwr iterator is exhausted */ + Py_ssize_t r; /* size of result tuple */ + int stopped; /* set to 1 when the cwr iterator is exhausted */ } cwrobject; static PyTypeObject cwr_type; @@ -2720,8 +2726,9 @@ cwr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_ssize_t i; static char *kwargs[] = {"iterable", "r", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "On:combinations_with_replacement", kwargs, - &iterable, &r)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, + "On:combinations_with_replacement", + kwargs, &iterable, &r)) return NULL; pool = PySequence_Tuple(iterable); @@ -2886,8 +2893,7 @@ cwr_reduce(cwrobject *lz) indices = PyTuple_New(lz->r); if (!indices) return NULL; - for (i=0; ir; i++) - { + for (i=0; ir; i++) { PyObject* index = PyLong_FromSsize_t(lz->indices[i]); if (!index) { Py_DECREF(indices); @@ -2913,10 +2919,10 @@ cwr_setstate(cwrobject *lz, PyObject *state) } n = PyTuple_GET_SIZE(lz->pool); - for (i=0; ir; i++) - { + for (i=0; ir; i++) { PyObject* indexObject = PyTuple_GET_ITEM(state, i); Py_ssize_t index = PyLong_AsSsize_t(indexObject); + if (index < 0 && PyErr_Occurred()) return NULL; /* not an integer */ /* clamp the index */ @@ -3000,7 +3006,7 @@ static PyTypeObject cwr_type = { }; -/* permutations object ************************************************************ +/* permutations object ******************************************************** def permutations(iterable, r=None): 'permutations(range(3), 2) --> (0,1) (0,2) (1,0) (1,2) (2,0) (2,1)' @@ -3027,12 +3033,12 @@ def permutations(iterable, r=None): typedef struct { PyObject_HEAD - PyObject *pool; /* input converted to a tuple */ - Py_ssize_t *indices; /* one index per element in the pool */ - Py_ssize_t *cycles; /* one rollover counter per element in the result */ - PyObject *result; /* most recently returned result tuple */ - Py_ssize_t r; /* size of result tuple */ - int stopped; /* set to 1 when the permutations iterator is exhausted */ + PyObject *pool; /* input converted to a tuple */ + Py_ssize_t *indices; /* one index per element in the pool */ + Py_ssize_t *cycles; /* one rollover counter per element in the result */ + PyObject *result; /* most recently returned result tuple */ + Py_ssize_t r; /* size of result tuple */ + int stopped; /* set to 1 when the iterator is exhausted */ } permutationsobject; static PyTypeObject permutations_type; @@ -3247,7 +3253,7 @@ permutations_reduce(permutationsobject *po) indices = PyTuple_New(n); if (indices == NULL) goto err; - for (i=0; iindices[i]); if (!index) goto err; @@ -3257,8 +3263,7 @@ permutations_reduce(permutationsobject *po) cycles = PyTuple_New(po->r); if (cycles == NULL) goto err; - for (i=0; ir; i++) - { + for (i=0 ; ir ; i++) { PyObject* index = PyLong_FromSsize_t(po->cycles[i]); if (!index) goto err; @@ -3291,15 +3296,12 @@ permutations_setstate(permutationsobject *po, PyObject *state) } n = PyTuple_GET_SIZE(po->pool); - if (PyTuple_GET_SIZE(indices) != n || - PyTuple_GET_SIZE(cycles) != po->r) - { + if (PyTuple_GET_SIZE(indices) != n || PyTuple_GET_SIZE(cycles) != po->r) { PyErr_SetString(PyExc_ValueError, "invalid arguments"); return NULL; } - for (i=0; iindices[i] = index; } - for (i=0; ir; i++) - { + for (i=0; ir; i++) { PyObject* indexObject = PyTuple_GET_ITEM(cycles, i); Py_ssize_t index = PyLong_AsSsize_t(indexObject); if (index < 0 && PyErr_Occurred()) @@ -3354,11 +3355,11 @@ permutations(range(3), 2) --> (0,1), (0,2), (1,0), (1,2), (2,0), (2,1)"); static PyTypeObject permutations_type = { PyVarObject_HEAD_INIT(NULL, 0) - "itertools.permutations", /* tp_name */ + "itertools.permutations", /* tp_name */ sizeof(permutationsobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ - (destructor)permutations_dealloc, /* tp_dealloc */ + (destructor)permutations_dealloc, /* tp_dealloc */ 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ @@ -3375,13 +3376,13 @@ static PyTypeObject permutations_type = { 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ - permutations_doc, /* tp_doc */ - (traverseproc)permutations_traverse, /* tp_traverse */ + permutations_doc, /* tp_doc */ + (traverseproc)permutations_traverse,/* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ - (iternextfunc)permutations_next, /* tp_iternext */ + (iternextfunc)permutations_next, /* tp_iternext */ permuations_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ @@ -3392,11 +3393,11 @@ static PyTypeObject permutations_type = { 0, /* tp_dictoffset */ 0, /* tp_init */ 0, /* tp_alloc */ - permutations_new, /* tp_new */ + permutations_new, /* tp_new */ PyObject_GC_Del, /* tp_free */ }; -/* accumulate object ************************************************************/ +/* accumulate object ********************************************************/ typedef struct { PyObject_HEAD @@ -3463,9 +3464,9 @@ accumulate_traverse(accumulateobject *lz, visitproc visit, void *arg) static PyObject * accumulate_next(accumulateobject *lz) { - PyObject *val, *oldtotal, *newtotal; + PyObject *val, *newtotal; - val = PyIter_Next(lz->it); + val = (*Py_TYPE(lz->it)->tp_iternext)(lz->it); if (val == NULL) return NULL; @@ -3483,11 +3484,8 @@ accumulate_next(accumulateobject *lz) if (newtotal == NULL) return NULL; - oldtotal = lz->total; - lz->total = newtotal; - Py_DECREF(oldtotal); - Py_INCREF(newtotal); + Py_SETREF(lz->total, newtotal); return newtotal; } @@ -3514,7 +3512,7 @@ accumulate_reduce(accumulateobject *lz) return Py_BuildValue("O(OO)O", Py_TYPE(lz), lz->it, lz->binop?lz->binop:Py_None, lz->total?lz->total:Py_None); - } +} static PyObject * accumulate_setstate(accumulateobject *lz, PyObject *state) @@ -3676,7 +3674,7 @@ compress_next(compressobject *lz) ok = PyObject_IsTrue(selector); Py_DECREF(selector); - if (ok == 1) + if (ok > 0) return datum; Py_DECREF(datum); if (ok < 0) @@ -3689,7 +3687,7 @@ compress_reduce(compressobject *lz) { return Py_BuildValue("O(OO)", Py_TYPE(lz), lz->data, lz->selectors); - } +} static PyMethodDef compress_methods[] = { {"__reduce__", (PyCFunction)compress_reduce, METH_NOARGS, @@ -3708,44 +3706,44 @@ static PyTypeObject compress_type = { PyVarObject_HEAD_INIT(NULL, 0) "itertools.compress", /* tp_name */ sizeof(compressobject), /* tp_basicsize */ - 0, /* tp_itemsize */ + 0, /* tp_itemsize */ /* methods */ (destructor)compress_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | - Py_TPFLAGS_BASETYPE, /* tp_flags */ - compress_doc, /* tp_doc */ - (traverseproc)compress_traverse, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - PyObject_SelfIter, /* tp_iter */ + Py_TPFLAGS_BASETYPE, /* tp_flags */ + compress_doc, /* tp_doc */ + (traverseproc)compress_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)compress_next, /* tp_iternext */ - compress_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - compress_new, /* tp_new */ - PyObject_GC_Del, /* tp_free */ + compress_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + compress_new, /* tp_new */ + PyObject_GC_Del, /* tp_free */ }; @@ -3826,8 +3824,7 @@ filterfalse_next(filterfalseobject *lz) ok = PyObject_IsTrue(item); } else { PyObject *good; - good = PyObject_CallFunctionObjArgs(lz->func, - item, NULL); + good = PyObject_CallFunctionObjArgs(lz->func, item, NULL); if (good == NULL) { Py_DECREF(item); return NULL; @@ -3846,9 +3843,8 @@ filterfalse_next(filterfalseobject *lz) static PyObject * filterfalse_reduce(filterfalseobject *lz) { - return Py_BuildValue("O(OO)", Py_TYPE(lz), - lz->func, lz->it); - } + return Py_BuildValue("O(OO)", Py_TYPE(lz), lz->func, lz->it); +} static PyMethodDef filterfalse_methods[] = { {"__reduce__", (PyCFunction)filterfalse_reduce, METH_NOARGS, @@ -3868,7 +3864,7 @@ static PyTypeObject filterfalse_type = { sizeof(filterfalseobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ - (destructor)filterfalse_dealloc, /* tp_dealloc */ + (destructor)filterfalse_dealloc, /* tp_dealloc */ 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ @@ -3886,7 +3882,7 @@ static PyTypeObject filterfalse_type = { Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ filterfalse_doc, /* tp_doc */ - (traverseproc)filterfalse_traverse, /* tp_traverse */ + (traverseproc)filterfalse_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ @@ -4138,15 +4134,15 @@ static PyTypeObject count_type = { 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | - Py_TPFLAGS_BASETYPE, /* tp_flags */ + Py_TPFLAGS_BASETYPE, /* tp_flags */ count_doc, /* tp_doc */ - (traverseproc)count_traverse, /* tp_traverse */ + (traverseproc)count_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)count_next, /* tp_iternext */ - count_methods, /* tp_methods */ + count_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ @@ -4312,9 +4308,7 @@ static PyTypeObject repeat_type = { PyObject_GC_Del, /* tp_free */ }; -/* ziplongest object ************************************************************/ - -#include "Python.h" +/* ziplongest object *********************************************************/ typedef struct { PyObject_HEAD @@ -4353,7 +4347,7 @@ zip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ittuple = PyTuple_New(tuplesize); if (ittuple == NULL) return NULL; - for (i=0; i < tuplesize; ++i) { + for (i=0; i < tuplesize; i++) { PyObject *item = PyTuple_GET_ITEM(args, i); PyObject *it = PyObject_GetIter(item); if (it == NULL) { @@ -4494,6 +4488,7 @@ zip_longest_reduce(ziplongestobject *lz) */ int i; PyObject *args = PyTuple_New(PyTuple_GET_SIZE(lz->ittuple)); + if (args == NULL) return NULL; for (i=0; iittuple); i++) { @@ -4544,7 +4539,7 @@ static PyTypeObject ziplongest_type = { sizeof(ziplongestobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ - (destructor)zip_longest_dealloc, /* tp_dealloc */ + (destructor)zip_longest_dealloc, /* tp_dealloc */ 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ @@ -4561,8 +4556,8 @@ static PyTypeObject ziplongest_type = { 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ - zip_longest_doc, /* tp_doc */ - (traverseproc)zip_longest_traverse, /* tp_traverse */ + zip_longest_doc, /* tp_doc */ + (traverseproc)zip_longest_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ @@ -4578,7 +4573,7 @@ static PyTypeObject ziplongest_type = { 0, /* tp_dictoffset */ 0, /* tp_init */ 0, /* tp_alloc */ - zip_longest_new, /* tp_new */ + zip_longest_new, /* tp_new */ PyObject_GC_Del, /* tp_free */ }; diff --git a/Modules/main.c b/Modules/main.c index d36db6d..d75f64a 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -42,21 +42,21 @@ static int orig_argc; #define PROGRAM_OPTS BASE_OPTS /* Short usage message (with %s for argv0) */ -static char *usage_line = +static const char usage_line[] = "usage: %ls [option] ... [-c cmd | -m mod | file | -] [arg] ...\n"; /* Long usage message, split into parts < 512 bytes */ -static char *usage_1 = "\ +static const char usage_1[] = "\ Options and arguments (and corresponding environment variables):\n\ -b : issue warnings about str(bytes_instance), str(bytearray_instance)\n\ and comparing bytes/bytearray with str. (-bb: issue errors)\n\ --B : don't write .pyc files on import; also PYTHONDONTWRITEBYTECODE=x\n\ +-B : don't write .py[co] files on import; also PYTHONDONTWRITEBYTECODE=x\n\ -c cmd : program passed in as string (terminates option list)\n\ -d : debug output from parser; also PYTHONDEBUG=x\n\ -E : ignore PYTHON* environment variables (such as PYTHONPATH)\n\ -h : print this help message and exit (also --help)\n\ "; -static char *usage_2 = "\ +static const char usage_2[] = "\ -i : inspect interactively after running script; forces a prompt even\n\ if stdin does not appear to be a terminal; also PYTHONINSPECT=x\n\ -I : isolate Python from the user's environment (implies -E and -s)\n\ @@ -67,19 +67,20 @@ static char *usage_2 = "\ -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ -S : don't imply 'import site' on initialization\n\ "; -static char *usage_3 = "\ +static const char usage_3[] = "\ -u : unbuffered binary stdout and stderr, stdin always buffered;\n\ also PYTHONUNBUFFERED=x\n\ see man page for details on internal buffering relating to '-u'\n\ -v : verbose (trace import statements); also PYTHONVERBOSE=x\n\ can be supplied multiple times to increase verbosity\n\ -V : print the Python version number and exit (also --version)\n\ + when given twice, print more information about the build\n\ -W arg : warning control; arg is action:message:category:module:lineno\n\ also PYTHONWARNINGS=arg\n\ -x : skip first line of source, allowing use of non-Unix forms of #!cmd\n\ -X opt : set implementation-specific option\n\ "; -static char *usage_4 = "\ +static const char usage_4[] = "\ file : program read from script file\n\ - : program read from stdin (default; interactive mode if a tty)\n\ arg ...: arguments passed to program in sys.argv[1:]\n\n\ @@ -88,22 +89,23 @@ PYTHONSTARTUP: file executed on interactive startup (no default)\n\ PYTHONPATH : '%lc'-separated list of directories prefixed to the\n\ default module search path. The result is sys.path.\n\ "; -static char *usage_5 = +static const char usage_5[] = "PYTHONHOME : alternate directory (or %lc).\n" " The default module search path uses %s.\n" "PYTHONCASEOK : ignore case in 'import' statements (Windows).\n" "PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n" -"PYTHONFAULTHANDLER: dump the Python traceback on fatal errors.\n\ -"; -static char *usage_6 = "\ -PYTHONHASHSEED: if this variable is set to 'random', a random value is used\n\ - to seed the hashes of str, bytes and datetime objects. It can also be\n\ - set to an integer in the range [0,4294967295] to get hash values with a\n\ - predictable seed.\n\ -"; +"PYTHONFAULTHANDLER: dump the Python traceback on fatal errors.\n"; +static const char usage_6[] = +"PYTHONHASHSEED: if this variable is set to 'random', a random value is used\n" +" to seed the hashes of str, bytes and datetime objects. It can also be\n" +" set to an integer in the range [0,4294967295] to get hash values with a\n" +" predictable seed.\n" +"PYTHONMALLOC: set the Python memory allocators and/or install debug hooks\n" +" on Python memory allocators. Use PYTHONMALLOC=debug to install debug\n" +" hooks.\n"; static int -usage(int exitcode, wchar_t* program) +usage(int exitcode, const wchar_t* program) { FILE *f = exitcode ? stderr : stdout; @@ -223,7 +225,7 @@ static int RunModule(wchar_t *modname, int set_argv0) static int RunMainFromImporter(wchar_t *filename) { - PyObject *argv0 = NULL, *importer, *sys_path, *sys_path0; + PyObject *argv0 = NULL, *importer, *sys_path; int sts; argv0 = PyUnicode_FromWideChar(filename, wcslen(filename)); @@ -248,17 +250,7 @@ RunMainFromImporter(wchar_t *filename) PyErr_SetString(PyExc_RuntimeError, "unable to get sys.path"); goto error; } - sys_path0 = PyList_GetItem(sys_path, 0); - sts = 0; - if (!sys_path0) { - PyErr_Clear(); - sts = PyList_Append(sys_path, argv0); - } else if (PyObject_IsTrue(sys_path0)) { - sts = PyList_Insert(sys_path, 0, argv0); - } else { - sts = PyList_SetItem(sys_path, 0, argv0); - } - if (sts) { + if (PyList_SetItem(sys_path, 0, argv0)) { argv0 = NULL; goto error; } @@ -351,6 +343,7 @@ Py_Main(int argc, wchar_t **argv) int help = 0; int version = 0; int saw_unbuffered_flag = 0; + char *opt; PyCompilerFlags cf; PyObject *warning_option = NULL; PyObject *warning_options = NULL; @@ -375,6 +368,13 @@ Py_Main(int argc, wchar_t **argv) } } + opt = Py_GETENV("PYTHONMALLOC"); + if (_PyMem_SetupAllocators(opt) < 0) { + fprintf(stderr, + "Error in PYTHONMALLOC: unknown allocator \"%s\"!\n", opt); + exit(1); + } + Py_HashRandomizationFlag = 1; _PyRandom_Init(); @@ -483,7 +483,8 @@ Py_Main(int argc, wchar_t **argv) warning_option = PyUnicode_FromWideChar(_PyOS_optarg, -1); if (warning_option == NULL) Py_FatalError("failure in handling of -W argument"); - PyList_Append(warning_options, warning_option); + if (PyList_Append(warning_options, warning_option) == -1) + Py_FatalError("failure in handling of -W argument"); Py_DECREF(warning_option); break; @@ -512,7 +513,7 @@ Py_Main(int argc, wchar_t **argv) return usage(0, argv[0]); if (version) { - printf("Python %s\n", PY_VERSION); + printf("Python %s\n", version >= 2 ? Py_GetVersion() : PY_VERSION); return 0; } @@ -664,7 +665,7 @@ Py_Main(int argc, wchar_t **argv) Py_SetProgramName(wbuf); /* Don't free wbuf, the argument to Py_SetProgramName - * must remain valid until the Py_Finalize is called. + * must remain valid until Py_FinalizeEx is called. */ } else { Py_SetProgramName(argv[0]); @@ -703,7 +704,8 @@ Py_Main(int argc, wchar_t **argv) PySys_SetArgv(argc-_PyOS_optind, argv+_PyOS_optind); if ((Py_InspectFlag || (command == NULL && filename == NULL && module == NULL)) && - isatty(fileno(stdin))) { + isatty(fileno(stdin)) && + !Py_IsolatedFlag) { PyObject *v; v = PyImport_ImportModule("readline"); if (v == NULL) @@ -795,7 +797,11 @@ Py_Main(int argc, wchar_t **argv) sts = PyRun_AnyFileFlags(stdin, "", &cf) != 0; } - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + /* Value unlikely to be confused with a non-error exit status or + other special meaning */ + sts = 120; + } #ifdef __INSURE__ /* Insure++ is a memory analysis tool that aids in discovering diff --git a/Modules/makesetup b/Modules/makesetup index 8db8de8..e204a05 100755 --- a/Modules/makesetup +++ b/Modules/makesetup @@ -259,7 +259,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | for mod in $MODS do EXTDECLS="${EXTDECLS}extern PyObject* PyInit_$mod(void);$NL" - INITBITS="${INITBITS} {\"$mod\", PyInit_$mod},$NL" + INITBITS="${INITBITS} {\"$mod\", PyInit_$mod},$NL" done diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index b945bd6..95ea4f7 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -875,7 +875,7 @@ math_1_to_int(PyObject *arg, double (*func) (double), int can_overflow) } static PyObject * -math_2(PyObject *args, double (*func) (double, double), char *funcname) +math_2(PyObject *args, double (*func) (double, double), const char *funcname) { PyObject *ox, *oy; double x, y, r; @@ -1672,7 +1672,7 @@ PyDoc_STRVAR(math_modf_doc, in that int is larger than PY_SSIZE_T_MAX. */ static PyObject* -loghelper(PyObject* arg, double (*func)(double), char *funcname) +loghelper(PyObject* arg, double (*func)(double), const char *funcname) { /* If it is int, do it ourselves. */ if (PyLong_Check(arg)) { @@ -2144,6 +2144,7 @@ PyInit_math(void) PyModule_AddObject(m, "pi", PyFloat_FromDouble(Py_MATH_PI)); PyModule_AddObject(m, "e", PyFloat_FromDouble(Py_MATH_E)); + PyModule_AddObject(m, "tau", PyFloat_FromDouble(Py_MATH_TAU)); /* 2pi */ PyModule_AddObject(m, "inf", PyFloat_FromDouble(m_inf())); #if !defined(PY_NO_SHORT_FLOAT_REPR) || defined(Py_NAN) PyModule_AddObject(m, "nan", PyFloat_FromDouble(m_nan())); diff --git a/Modules/md5module.c b/Modules/md5module.c index f94acc7..04bc06e 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -30,7 +30,7 @@ class MD5Type "MD5object *" "&PyType_Type" #if SIZEOF_INT == 4 typedef unsigned int MD5_INT32; /* 32-bit integer */ -typedef PY_LONG_LONG MD5_INT64; /* 64-bit integer */ +typedef long long MD5_INT64; /* 64-bit integer */ #else /* not defined. compilation will die. */ #endif diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index d80b1f6..5f1615f 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -93,7 +93,7 @@ typedef struct { Py_ssize_t size; Py_ssize_t pos; /* relative to offset */ #ifdef MS_WINDOWS - PY_LONG_LONG offset; + long long offset; #else off_t offset; #endif @@ -397,8 +397,7 @@ mmap_write_method(mmap_object *self, memcpy(&self->data[self->pos], data.buf, data.len); self->pos += data.len; PyBuffer_Release(&data); - Py_INCREF(Py_None); - return Py_None; + return PyLong_FromSsize_t(data.len); } static PyObject * @@ -434,7 +433,7 @@ mmap_size_method(mmap_object *self, #ifdef MS_WINDOWS if (self->file_handle != INVALID_HANDLE_VALUE) { DWORD low,high; - PY_LONG_LONG size; + long long size; low = GetFileSize(self->file_handle, &high); if (low == INVALID_FILE_SIZE) { /* It might be that the function appears to have failed, @@ -445,7 +444,7 @@ mmap_size_method(mmap_object *self, } if (!high && low < LONG_MAX) return PyLong_FromLong((long)low); - size = (((PY_LONG_LONG)high)<<32) + low; + size = (((long long)high)<<32) + low; return PyLong_FromLongLong(size); } else { return PyLong_FromSsize_t(self->size); @@ -807,10 +806,10 @@ mmap_subscript(mmap_object *self, PyObject *item) else if (PySlice_Check(item)) { Py_ssize_t start, stop, step, slicelen; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, self->size, + &start, &stop, &step, &slicelen) < 0) { return NULL; } - slicelen = PySlice_AdjustIndices(self->size, &start, &stop, step); if (slicelen <= 0) return PyBytes_FromStringAndSize("", 0); @@ -933,10 +932,11 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value) Py_ssize_t start, stop, step, slicelen; Py_buffer vbuf; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + self->size, &start, &stop, + &step, &slicelen) < 0) { return -1; } - slicelen = PySlice_AdjustIndices(self->size, &start, &stop, step); if (value == NULL) { PyErr_SetString(PyExc_TypeError, "mmap object doesn't support slice deletion"); @@ -1226,7 +1226,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) /* A note on sizes and offsets: while the actual map size must hold in a Py_ssize_t, both the total file size and the start offset can be longer - than a Py_ssize_t, so we use PY_LONG_LONG which is always 64-bit. + than a Py_ssize_t, so we use long long which is always 64-bit. */ static PyObject * @@ -1234,7 +1234,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) { mmap_object *m_obj; Py_ssize_t map_size; - PY_LONG_LONG offset = 0, size; + long long offset = 0, size; DWORD off_hi; /* upper 32 bits of offset */ DWORD off_lo; /* lower 32 bits of offset */ DWORD size_hi; /* upper 32 bits of size */ @@ -1295,10 +1295,6 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) */ if (fileno != -1 && fileno != 0) { /* Ensure that fileno is within the CRT's valid range */ - if (!_PyVerify_fd(fileno)) { - PyErr_SetFromErrno(PyExc_OSError); - return NULL; - } _Py_BEGIN_SUPPRESS_IPH fh = (HANDLE)_get_osfhandle(fileno); _Py_END_SUPPRESS_IPH @@ -1348,7 +1344,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) return PyErr_SetFromWindowsErr(dwErr); } - size = (((PY_LONG_LONG) high) << 32) + low; + size = (((long long) high) << 32) + low; if (size == 0) { PyErr_SetString(PyExc_ValueError, "cannot mmap an empty file"); diff --git a/Modules/nismodule.c b/Modules/nismodule.c index 3942acb..b6a855c 100644 --- a/Modules/nismodule.c +++ b/Modules/nismodule.c @@ -76,11 +76,7 @@ nis_mapname (char *map, int *pfix) *pfix = 0; for (i=0; aliases[i].alias != 0L; i++) { - if (!strcmp (aliases[i].alias, map)) { - *pfix = aliases[i].fix; - return aliases[i].map; - } - if (!strcmp (aliases[i].map, map)) { + if (!strcmp (aliases[i].alias, map) || !strcmp (aliases[i].map, map)) { *pfix = aliases[i].fix; return aliases[i].map; } @@ -173,7 +169,6 @@ nis_match (PyObject *self, PyObject *args, PyObject *kwdict) return NULL; if ((bkey = PyUnicode_EncodeFSDefault(ukey)) == NULL) return NULL; - /* check for embedded null bytes */ if (PyBytes_AsStringAndSize(bkey, &key, &keylen) == -1) { Py_DECREF(bkey); return NULL; diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 5423308..5f0505c 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -31,9 +31,13 @@ #endif #include +#ifdef __ANDROID__ +#include +#else #include +#endif -#if defined(linux) +#ifdef __linux__ #ifndef HAVE_STDINT_H typedef unsigned long uint32_t; diff --git a/Modules/overlapped.c b/Modules/overlapped.c index 3b31d11..0aa8657 100644 --- a/Modules/overlapped.c +++ b/Modules/overlapped.c @@ -973,28 +973,28 @@ Overlapped_AcceptEx(OverlappedObject *self, PyObject *args) static int parse_address(PyObject *obj, SOCKADDR *Address, int Length) { - char *Host; + Py_UNICODE *Host; unsigned short Port; unsigned long FlowInfo; unsigned long ScopeId; memset(Address, 0, Length); - if (PyArg_ParseTuple(obj, "sH", &Host, &Port)) + if (PyArg_ParseTuple(obj, "uH", &Host, &Port)) { Address->sa_family = AF_INET; - if (WSAStringToAddressA(Host, AF_INET, NULL, Address, &Length) < 0) { + if (WSAStringToAddressW(Host, AF_INET, NULL, Address, &Length) < 0) { SetFromWindowsErr(WSAGetLastError()); return -1; } ((SOCKADDR_IN*)Address)->sin_port = htons(Port); return Length; } - else if (PyArg_ParseTuple(obj, "sHkk", &Host, &Port, &FlowInfo, &ScopeId)) + else if (PyArg_ParseTuple(obj, "uHkk", &Host, &Port, &FlowInfo, &ScopeId)) { PyErr_Clear(); Address->sa_family = AF_INET6; - if (WSAStringToAddressA(Host, AF_INET6, NULL, Address, &Length) < 0) { + if (WSAStringToAddressW(Host, AF_INET6, NULL, Address, &Length) < 0) { SetFromWindowsErr(WSAGetLastError()); return -1; } @@ -1151,7 +1151,7 @@ ConnectPipe(OverlappedObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "U", &AddressObj)) return NULL; - Address = _PyUnicode_AsWideCharString(AddressObj); + Address = PyUnicode_AsWideCharString(AddressObj, NULL); if (Address == NULL) return NULL; diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index fe095e5..b256695 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -53,7 +53,7 @@ extern grammar _PyParser_Grammar; /* From graminit.c */ /* String constants used to initialize module attributes. * */ -static char parser_copyright_string[] = +static const char parser_copyright_string[] = "Copyright 1995-1996 by Virginia Polytechnic Institute & State\n\ University, Blacksburg, Virginia, USA, and Fred L. Drake, Jr., Reston,\n\ Virginia, USA. Portions copyright 1991-1995 by Stichting Mathematisch\n\ @@ -63,7 +63,7 @@ Centrum, Amsterdam, The Netherlands."; PyDoc_STRVAR(parser_doc_string, "This is an interface to Python's internal parser."); -static char parser_version_string[] = "0.5"; +static const char parser_version_string[] = "0.5"; typedef PyObject* (*SeqMaker) (Py_ssize_t length); @@ -578,13 +578,13 @@ parser_issuite(PyST_Object *self, PyObject *args, PyObject *kw) } -/* err_string(char* message) +/* err_string(const char* message) * * Sets the error string for an exception of type ParserError. * */ static void -err_string(char *message) +err_string(const char *message) { PyErr_SetString(parser_error, message); } @@ -597,7 +597,7 @@ err_string(char *message) * */ static PyObject* -parser_do_parse(PyObject *args, PyObject *kw, char *argspec, int type) +parser_do_parse(PyObject *args, PyObject *kw, const char *argspec, int type) { char* string = 0; PyObject* res = 0; @@ -670,9 +670,75 @@ parser_suite(PyST_Object *self, PyObject *args, PyObject *kw) static node* build_node_tree(PyObject *tuple); -static int validate_expr_tree(node *tree); -static int validate_file_input(node *tree); -static int validate_encoding_decl(node *tree); + +static int +validate_node(node *tree) +{ + int type = TYPE(tree); + int nch = NCH(tree); + dfa *nt_dfa; + state *dfa_state; + int pos, arc; + + assert(ISNONTERMINAL(type)); + type -= NT_OFFSET; + if (type >= _PyParser_Grammar.g_ndfas) { + PyErr_Format(parser_error, "Unrecognized node type %d.", TYPE(tree)); + return 0; + } + nt_dfa = &_PyParser_Grammar.g_dfa[type]; + REQ(tree, nt_dfa->d_type); + + /* Run the DFA for this nonterminal. */ + dfa_state = &nt_dfa->d_state[nt_dfa->d_initial]; + for (pos = 0; pos < nch; ++pos) { + node *ch = CHILD(tree, pos); + int ch_type = TYPE(ch); + for (arc = 0; arc < dfa_state->s_narcs; ++arc) { + short a_label = dfa_state->s_arc[arc].a_lbl; + assert(a_label < _PyParser_Grammar.g_ll.ll_nlabels); + if (_PyParser_Grammar.g_ll.ll_label[a_label].lb_type == ch_type) { + /* The child is acceptable; if non-terminal, validate it recursively. */ + if (ISNONTERMINAL(ch_type) && !validate_node(ch)) + return 0; + + /* Update the state, and move on to the next child. */ + dfa_state = &nt_dfa->d_state[dfa_state->s_arc[arc].a_arrow]; + goto arc_found; + } + } + /* What would this state have accepted? */ + { + short a_label = dfa_state->s_arc->a_lbl; + int next_type; + if (!a_label) /* Wouldn't accept any more children */ + goto illegal_num_children; + + next_type = _PyParser_Grammar.g_ll.ll_label[a_label].lb_type; + if (ISNONTERMINAL(next_type)) + PyErr_Format(parser_error, "Expected node type %d, got %d.", + next_type, ch_type); + else + PyErr_Format(parser_error, "Illegal terminal: expected %s.", + _PyParser_TokenNames[next_type]); + return 0; + } + +arc_found: + continue; + } + /* Are we in a final state? If so, return 1 for successful validation. */ + for (arc = 0; arc < dfa_state->s_narcs; ++arc) { + if (!dfa_state->s_arc[arc].a_lbl) { + return 1; + } + } + +illegal_num_children: + PyErr_Format(parser_error, + "Illegal number of children for %s node.", nt_dfa->d_name); + return 0; +} /* PyObject* parser_tuple2st(PyObject* self, PyObject* args) * @@ -681,7 +747,7 @@ static int validate_encoding_decl(node *tree); * tuple can be validated. It does this by checking the first code of the * tuple, and, if acceptable, builds the internal representation. If this * step succeeds, the internal representation is validated as fully as - * possible with the various validate_*() routines defined below. + * possible with the recursive validate_node() routine defined above. * * This function must be changed if support is to be added for PyST_FRAGMENT * ST objects. @@ -710,33 +776,35 @@ parser_tuple2st(PyST_Object *self, PyObject *args, PyObject *kw) */ tree = build_node_tree(tuple); if (tree != 0) { - int start_sym = TYPE(tree); - if (start_sym == eval_input) { + node *validation_root = tree; + int tree_type = 0; + switch (TYPE(tree)) { + case eval_input: /* Might be an eval form. */ - if (validate_expr_tree(tree)) - st = parser_newstobject(tree, PyST_EXPR); - else - PyNode_Free(tree); - } - else if (start_sym == file_input) { - /* This looks like an exec form so far. */ - if (validate_file_input(tree)) - st = parser_newstobject(tree, PyST_SUITE); - else - PyNode_Free(tree); - } - else if (start_sym == encoding_decl) { + tree_type = PyST_EXPR; + break; + case encoding_decl: /* This looks like an encoding_decl so far. */ - if (validate_encoding_decl(tree)) - st = parser_newstobject(tree, PyST_SUITE); - else - PyNode_Free(tree); - } - else { + if (NCH(tree) != 1) + err_string("Error Parsing encoding_decl"); + validation_root = CHILD(tree, 0); + /* Fall through */ + case file_input: + /* This looks like an exec form so far. */ + + tree_type = PyST_SUITE; + break; + default: /* This is a fragment, at best. */ PyNode_Free(tree); err_string("parse tree does not use a valid start symbol"); + return (0); } + + if (validate_node(validation_root)) + st = parser_newstobject(tree, tree_type); + else + PyNode_Free(tree); } /* Make sure we raise an exception on all errors. We should never * get this, but we'd do well to be sure something is done. @@ -763,9 +831,6 @@ build_node_children(PyObject *tuple, node *root, int *line_num) Py_ssize_t i; int err; - if (len < 0) { - return NULL; - } for (i = 1; i < len; ++i) { /* elem must always be a sequence, however simple */ PyObject* elem = PySequence_GetItem(tuple, i); @@ -786,7 +851,7 @@ build_node_children(PyObject *tuple, node *root, int *line_num) if (type == -1 && PyErr_Occurred()) { Py_DECREF(temp); Py_DECREF(elem); - return NULL; + return 0; } } Py_DECREF(temp); @@ -798,7 +863,7 @@ build_node_children(PyObject *tuple, node *root, int *line_num) PyErr_SetObject(parser_error, err); Py_XDECREF(err); Py_XDECREF(elem); - return NULL; + return (0); } if (ISTERMINAL(type)) { Py_ssize_t len = PyObject_Size(elem); @@ -807,14 +872,11 @@ build_node_children(PyObject *tuple, node *root, int *line_num) if ((len != 2) && (len != 3)) { err_string("terminal nodes must have 2 or 3 entries"); - Py_DECREF(elem); - return NULL; + return 0; } temp = PySequence_GetItem(elem, 1); - if (temp == NULL) { - Py_DECREF(elem); - return NULL; - } + if (temp == NULL) + return 0; if (!PyUnicode_Check(temp)) { PyErr_Format(parser_error, "second item in terminal node must be a string," @@ -822,49 +884,46 @@ build_node_children(PyObject *tuple, node *root, int *line_num) Py_TYPE(temp)->tp_name); Py_DECREF(temp); Py_DECREF(elem); - return NULL; + return 0; } if (len == 3) { PyObject *o = PySequence_GetItem(elem, 2); - if (o == NULL) { - Py_DECREF(temp); - Py_DECREF(elem); - return NULL; - } - if (PyLong_Check(o)) { - int num = _PyLong_AsInt(o); - if (num == -1 && PyErr_Occurred()) { + if (o != NULL) { + if (PyLong_Check(o)) { + int num = _PyLong_AsInt(o); + if (num == -1 && PyErr_Occurred()) { + Py_DECREF(o); + Py_DECREF(temp); + Py_DECREF(elem); + return 0; + } + *line_num = num; + } + else { + PyErr_Format(parser_error, + "third item in terminal node must be an" + " integer, found %s", + Py_TYPE(temp)->tp_name); Py_DECREF(o); Py_DECREF(temp); Py_DECREF(elem); - return NULL; + return 0; } - *line_num = num; - } - else { - PyErr_Format(parser_error, - "third item in terminal node must be an" - " integer, found %s", - Py_TYPE(temp)->tp_name); Py_DECREF(o); - Py_DECREF(temp); - Py_DECREF(elem); - return NULL; } - Py_DECREF(o); } - temp_str = _PyUnicode_AsStringAndSize(temp, &len); + temp_str = PyUnicode_AsUTF8AndSize(temp, &len); if (temp_str == NULL) { Py_DECREF(temp); - Py_DECREF(elem); - return NULL; + Py_XDECREF(elem); + return 0; } strn = (char *)PyObject_MALLOC(len + 1); if (strn == NULL) { Py_DECREF(temp); - Py_DECREF(elem); + Py_XDECREF(elem); PyErr_NoMemory(); - return NULL; + return 0; } (void) memcpy(strn, temp_str, len + 1); Py_DECREF(temp); @@ -874,21 +933,20 @@ build_node_children(PyObject *tuple, node *root, int *line_num) * It has to be one or the other; this is an error. * Raise an exception. */ - PyObject *err = Py_BuildValue("Os", elem, "unknown node type."); + PyObject *err = Py_BuildValue("os", elem, "unknown node type."); PyErr_SetObject(parser_error, err); Py_XDECREF(err); - Py_DECREF(elem); - return NULL; + Py_XDECREF(elem); + return (0); } err = PyNode_AddChild(root, type, strn, *line_num, 0); if (err == E_NOMEM) { - Py_DECREF(elem); + Py_XDECREF(elem); PyObject_FREE(strn); - PyErr_NoMemory(); - return NULL; + return (node *) PyErr_NoMemory(); } if (err == E_OVERFLOW) { - Py_DECREF(elem); + Py_XDECREF(elem); PyObject_FREE(strn); PyErr_SetString(PyExc_ValueError, "unsupported number of child nodes"); @@ -899,14 +957,14 @@ build_node_children(PyObject *tuple, node *root, int *line_num) node* new_child = CHILD(root, i - 1); if (new_child != build_node_children(elem, new_child, line_num)) { - Py_DECREF(elem); - return NULL; + Py_XDECREF(elem); + return (0); } } else if (type == NEWLINE) { /* It's true: we increment the */ ++(*line_num); /* line number *after* the newline! */ } - Py_DECREF(elem); + Py_XDECREF(elem); } return root; } @@ -941,23 +999,10 @@ build_node_tree(PyObject *tuple) if (num == encoding_decl) { encoding = PySequence_GetItem(tuple, 2); - if (encoding == NULL) { - PyErr_SetString(parser_error, "missed encoding"); - return NULL; - } - if (!PyUnicode_Check(encoding)) { - PyErr_Format(parser_error, - "encoding must be a string, found %.200s", - Py_TYPE(encoding)->tp_name); - Py_DECREF(encoding); - return NULL; - } /* tuple isn't borrowed anymore here, need to DECREF */ tuple = PySequence_GetSlice(tuple, 0, 2); - if (tuple == NULL) { - Py_DECREF(encoding); + if (tuple == NULL) return NULL; - } } res = PyNode_New(num); if (res != NULL) { @@ -968,35 +1013,33 @@ build_node_tree(PyObject *tuple) if (res && encoding) { Py_ssize_t len; const char *temp; - temp = _PyUnicode_AsStringAndSize(encoding, &len); + temp = PyUnicode_AsUTF8AndSize(encoding, &len); if (temp == NULL) { - PyNode_Free(res); + Py_DECREF(res); Py_DECREF(encoding); Py_DECREF(tuple); return NULL; } res->n_str = (char *)PyObject_MALLOC(len + 1); if (res->n_str == NULL) { - PyNode_Free(res); + Py_DECREF(res); Py_DECREF(encoding); Py_DECREF(tuple); PyErr_NoMemory(); return NULL; } (void) memcpy(res->n_str, temp, len + 1); + Py_DECREF(encoding); + Py_DECREF(tuple); } } - if (encoding != NULL) { - Py_DECREF(encoding); - Py_DECREF(tuple); - } } else { /* The tuple is illegal -- if the number is neither TERMINAL nor * NONTERMINAL, we can't use it. Not sure the implementation * allows this condition, but the API doesn't preclude it. */ - PyObject *err = Py_BuildValue("Os", tuple, + PyObject *err = Py_BuildValue("os", tuple, "Illegal component tuple."); PyErr_SetObject(parser_error, err); Py_XDECREF(err); @@ -1006,2433 +1049,6 @@ build_node_tree(PyObject *tuple) } -/* - * Validation routines used within the validation section: - */ -static int validate_terminal(node *terminal, int type, char *string); - -#define validate_ampersand(ch) validate_terminal(ch, AMPER, "&") -#define validate_circumflex(ch) validate_terminal(ch, CIRCUMFLEX, "^") -#define validate_colon(ch) validate_terminal(ch, COLON, ":") -#define validate_comma(ch) validate_terminal(ch, COMMA, ",") -#define validate_dedent(ch) validate_terminal(ch, DEDENT, "") -#define validate_equal(ch) validate_terminal(ch, EQUAL, "=") -#define validate_indent(ch) validate_terminal(ch, INDENT, (char*)NULL) -#define validate_lparen(ch) validate_terminal(ch, LPAR, "(") -#define validate_newline(ch) validate_terminal(ch, NEWLINE, (char*)NULL) -#define validate_rparen(ch) validate_terminal(ch, RPAR, ")") -#define validate_semi(ch) validate_terminal(ch, SEMI, ";") -#define validate_star(ch) validate_terminal(ch, STAR, "*") -#define validate_vbar(ch) validate_terminal(ch, VBAR, "|") -#define validate_doublestar(ch) validate_terminal(ch, DOUBLESTAR, "**") -#define validate_dot(ch) validate_terminal(ch, DOT, ".") -#define validate_at(ch) validate_terminal(ch, AT, "@") -#define validate_rarrow(ch) validate_terminal(ch, RARROW, "->") -#define validate_name(ch, str) validate_terminal(ch, NAME, str) - -#define VALIDATER(n) static int validate_##n(node *tree) - -VALIDATER(node); VALIDATER(small_stmt); -VALIDATER(class); VALIDATER(node); -VALIDATER(parameters); VALIDATER(suite); -VALIDATER(testlist); VALIDATER(varargslist); -VALIDATER(vfpdef); -VALIDATER(stmt); VALIDATER(simple_stmt); -VALIDATER(expr_stmt); VALIDATER(power); -VALIDATER(del_stmt); -VALIDATER(return_stmt); VALIDATER(raise_stmt); -VALIDATER(import_stmt); VALIDATER(import_stmt); -VALIDATER(import_name); VALIDATER(yield_stmt); -VALIDATER(global_stmt); VALIDATER(nonlocal_stmt); -VALIDATER(assert_stmt); -VALIDATER(compound_stmt); VALIDATER(test_or_star_expr); -VALIDATER(while); VALIDATER(for); -VALIDATER(try); VALIDATER(except_clause); -VALIDATER(test); VALIDATER(and_test); -VALIDATER(not_test); VALIDATER(comparison); -VALIDATER(comp_op); -VALIDATER(star_expr); VALIDATER(expr); -VALIDATER(xor_expr); VALIDATER(and_expr); -VALIDATER(shift_expr); VALIDATER(arith_expr); -VALIDATER(term); VALIDATER(factor); -VALIDATER(atom); VALIDATER(lambdef); -VALIDATER(trailer); VALIDATER(subscript); -VALIDATER(subscriptlist); VALIDATER(sliceop); -VALIDATER(exprlist); VALIDATER(dictorsetmaker); -VALIDATER(arglist); VALIDATER(argument); -VALIDATER(comp_for); -VALIDATER(comp_iter); VALIDATER(comp_if); -VALIDATER(testlist_comp); VALIDATER(yield_expr); -VALIDATER(or_test); -VALIDATER(test_nocond); VALIDATER(lambdef_nocond); -VALIDATER(yield_arg); -VALIDATER(async_funcdef); VALIDATER(async_stmt); -VALIDATER(atom_expr); - -#undef VALIDATER - -#define is_even(n) (((n) & 1) == 0) -#define is_odd(n) (((n) & 1) == 1) - - -static int -validate_ntype(node *n, int t) -{ - if (TYPE(n) != t) { - PyErr_Format(parser_error, "Expected node type %d, got %d.", - t, TYPE(n)); - return 0; - } - return 1; -} - - -/* Verifies that the number of child nodes is exactly 'num', raising - * an exception if it isn't. The exception message does not indicate - * the exact number of nodes, allowing this to be used to raise the - * "right" exception when the wrong number of nodes is present in a - * specific variant of a statement's syntax. This is commonly used - * in that fashion. - */ -static int -validate_numnodes(node *n, int num, const char *const name) -{ - if (NCH(n) != num) { - PyErr_Format(parser_error, - "Illegal number of children for %s node.", name); - return 0; - } - return 1; -} - - -static int -validate_terminal(node *terminal, int type, char *string) -{ - int res = (validate_ntype(terminal, type) - && ((string == 0) || (strcmp(string, STR(terminal)) == 0))); - - if (!res && !PyErr_Occurred()) { - PyErr_Format(parser_error, - "Illegal terminal: expected \"%s\"", string); - } - return (res); -} - -/* X (',' X) [','] */ -static int -validate_repeating_list_variable(node *tree, - int list_node_type, - int (*validate_child_func_inc)(node *, int *), - int *pos, - const char *const list_node_type_name) -{ - int nch = NCH(tree); - int res = (nch && validate_ntype(tree, list_node_type)); - - if (!res && !PyErr_Occurred()) { - /* Unconditionally raise. */ - (void) validate_numnodes(tree, 1, list_node_type_name); - } - else { - for ( ; res && *pos < nch; ) { - res = validate_child_func_inc(tree, pos); - if (!res || *pos >= nch) - break; - res = validate_comma(CHILD(tree, (*pos)++)); - } - } - return res; -} - -/* X (',' X) [','] */ -static int -validate_repeating_list(node *tree, - int list_node_type, - int (*validate_child_func)(node *), - const char *const list_node_type_name) -{ - int nch = NCH(tree); - int res = (nch && validate_ntype(tree, list_node_type)); - int pos = 0; - - if (!res && !PyErr_Occurred()) { - /* Unconditionally raise. */ - (void) validate_numnodes(tree, 1, list_node_type_name); - } - else { - for ( ; res && pos < nch; ) { - res = validate_child_func(CHILD(tree, pos++)); - if (!res || pos >= nch) - break; - res = validate_comma(CHILD(tree, pos++)); - } - } - return res; -} - - -/* validate_class() - * - * classdef: - * 'class' NAME ['(' testlist ')'] ':' suite - */ -static int -validate_class(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, classdef) && - ((nch == 4) || (nch == 6) || (nch == 7))); - - if (res) { - res = (validate_name(CHILD(tree, 0), "class") - && validate_ntype(CHILD(tree, 1), NAME) - && validate_colon(CHILD(tree, nch - 2)) - && validate_suite(CHILD(tree, nch - 1))); - } - else { - (void) validate_numnodes(tree, 4, "class"); - } - - if (res) { - if (nch == 7) { - res = ((validate_lparen(CHILD(tree, 2)) && - validate_arglist(CHILD(tree, 3)) && - validate_rparen(CHILD(tree, 4)))); - } - else if (nch == 6) { - res = (validate_lparen(CHILD(tree,2)) && - validate_rparen(CHILD(tree,3))); - } - } - return (res); -} - - -/* if_stmt: - * 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite] - */ -static int -validate_if(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, if_stmt) - && (nch >= 4) - && validate_name(CHILD(tree, 0), "if") - && validate_test(CHILD(tree, 1)) - && validate_colon(CHILD(tree, 2)) - && validate_suite(CHILD(tree, 3))); - - if (res && ((nch % 4) == 3)) { - /* ... 'else' ':' suite */ - res = (validate_name(CHILD(tree, nch - 3), "else") - && validate_colon(CHILD(tree, nch - 2)) - && validate_suite(CHILD(tree, nch - 1))); - nch -= 3; - } - else if (!res && !PyErr_Occurred()) - (void) validate_numnodes(tree, 4, "if"); - if ((nch % 4) != 0) - /* Will catch the case for nch < 4 */ - res = validate_numnodes(tree, 0, "if"); - else if (res && (nch > 4)) { - /* ... ('elif' test ':' suite)+ ... */ - int j = 4; - while ((j < nch) && res) { - res = (validate_name(CHILD(tree, j), "elif") - && validate_colon(CHILD(tree, j + 2)) - && validate_test(CHILD(tree, j + 1)) - && validate_suite(CHILD(tree, j + 3))); - j += 4; - } - } - return (res); -} - - -/* parameters: - * '(' [varargslist] ')' - * - */ -static int -validate_parameters(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, parameters) && ((nch == 2) || (nch == 3)); - - if (res) { - res = (validate_lparen(CHILD(tree, 0)) - && validate_rparen(CHILD(tree, nch - 1))); - if (res && (nch == 3)) - res = validate_varargslist(CHILD(tree, 1)); - } - else { - (void) validate_numnodes(tree, 2, "parameters"); - } - return (res); -} - - -/* validate_suite() - * - * suite: - * simple_stmt - * | NEWLINE INDENT stmt+ DEDENT - */ -static int -validate_suite(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, suite) && ((nch == 1) || (nch >= 4))); - - if (res && (nch == 1)) - res = validate_simple_stmt(CHILD(tree, 0)); - else if (res) { - /* NEWLINE INDENT stmt+ DEDENT */ - res = (validate_newline(CHILD(tree, 0)) - && validate_indent(CHILD(tree, 1)) - && validate_stmt(CHILD(tree, 2)) - && validate_dedent(CHILD(tree, nch - 1))); - - if (res && (nch > 4)) { - int i = 3; - --nch; /* forget the DEDENT */ - for ( ; res && (i < nch); ++i) - res = validate_stmt(CHILD(tree, i)); - } - else if (nch < 4) - res = validate_numnodes(tree, 4, "suite"); - } - return (res); -} - - -static int -validate_testlist(node *tree) -{ - return (validate_repeating_list(tree, testlist, - validate_test, "testlist")); -} - -static int -validate_testlist_star_expr(node *tl) -{ - return (validate_repeating_list(tl, testlist_star_expr, validate_test_or_star_expr, - "testlist")); -} - - -/* validate either vfpdef or tfpdef. - * vfpdef: NAME - * tfpdef: NAME [':' test] - */ -static int -validate_vfpdef(node *tree) -{ - int nch = NCH(tree); - if (TYPE(tree) == vfpdef) { - return nch == 1 && validate_name(CHILD(tree, 0), NULL); - } - else if (TYPE(tree) == tfpdef) { - if (nch == 1) { - return validate_name(CHILD(tree, 0), NULL); - } - else if (nch == 3) { - return validate_name(CHILD(tree, 0), NULL) && - validate_colon(CHILD(tree, 1)) && - validate_test(CHILD(tree, 2)); - } - } - return 0; -} - -/* '*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef - * ..or tfpdef in place of vfpdef. vfpdef: NAME; tfpdef: NAME [':' test] - */ -static int -validate_varargslist_trailer(node *tree, int start) -{ - int nch = NCH(tree); - int res = 0; - - if (nch <= start) { - err_string("expected variable argument trailer for varargslist"); - return 0; - } - if (TYPE(CHILD(tree, start)) == STAR) { - /* - * '*' [vfpdef] - */ - res = validate_star(CHILD(tree, start++)); - if (res && start < nch && (TYPE(CHILD(tree, start)) == vfpdef || - TYPE(CHILD(tree, start)) == tfpdef)) - res = validate_vfpdef(CHILD(tree, start++)); - /* - * (',' vfpdef ['=' test])* - */ - while (res && start + 1 < nch && ( - TYPE(CHILD(tree, start + 1)) == vfpdef || - TYPE(CHILD(tree, start + 1)) == tfpdef)) { - res = (validate_comma(CHILD(tree, start++)) - && validate_vfpdef(CHILD(tree, start++))); - if (res && start + 1 < nch && TYPE(CHILD(tree, start)) == EQUAL) - res = (validate_equal(CHILD(tree, start++)) - && validate_test(CHILD(tree, start++))); - } - /* - * [',' '**' vfpdef] - */ - if (res && start + 2 < nch && TYPE(CHILD(tree, start+1)) == DOUBLESTAR) - res = (validate_comma(CHILD(tree, start++)) - && validate_doublestar(CHILD(tree, start++)) - && validate_vfpdef(CHILD(tree, start++))); - } - else if (TYPE(CHILD(tree, start)) == DOUBLESTAR) { - /* - * '**' vfpdef - */ - if (start + 1 < nch) - res = (validate_doublestar(CHILD(tree, start++)) - && validate_vfpdef(CHILD(tree, start++))); - else { - res = 0; - err_string("expected vfpdef after ** in varargslist trailer"); - } - } - else { - res = 0; - err_string("expected * or ** in varargslist trailer"); - } - - if (res && start != nch) { - res = 0; - err_string("unexpected extra children in varargslist trailer"); - } - return res; -} - - -/* validate_varargslist() - * - * Validate typedargslist or varargslist. - * - * typedargslist: ((tfpdef ['=' test] ',')* - * ('*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | - * '**' tfpdef) - * | tfpdef ['=' test] (',' tfpdef ['=' test])* [',']) - * tfpdef: NAME [':' test] - * varargslist: ((vfpdef ['=' test] ',')* - * ('*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | - * '**' vfpdef) - * | vfpdef ['=' test] (',' vfpdef ['=' test])* [',']) - * vfpdef: NAME - * - */ -static int -validate_varargslist(node *tree) -{ - int nch = NCH(tree); - int res = (TYPE(tree) == varargslist || - TYPE(tree) == typedargslist) && - (nch != 0); - int sym; - node *ch; - int i = 0; - - if (!res) - return 0; - if (nch < 1) { - err_string("varargslist missing child nodes"); - return 0; - } - while (i < nch) { - ch = CHILD(tree, i); - sym = TYPE(ch); - if (sym == vfpdef || sym == tfpdef) { - /* validate (vfpdef ['=' test] ',')+ */ - res = validate_vfpdef(ch); - ++i; - if (res && (i+2 <= nch) && TYPE(CHILD(tree, i)) == EQUAL) { - res = (validate_equal(CHILD(tree, i)) - && validate_test(CHILD(tree, i+1))); - if (res) - i += 2; - } - if (res && i < nch) { - res = validate_comma(CHILD(tree, i)); - ++i; - } - } else if (sym == DOUBLESTAR || sym == STAR) { - res = validate_varargslist_trailer(tree, i); - break; - } else { - res = 0; - err_string("illegal formation for varargslist"); - } - } - return res; -} - - -/* comp_iter: comp_for | comp_if - */ -static int -validate_comp_iter(node *tree) -{ - int res = (validate_ntype(tree, comp_iter) - && validate_numnodes(tree, 1, "comp_iter")); - if (res && TYPE(CHILD(tree, 0)) == comp_for) - res = validate_comp_for(CHILD(tree, 0)); - else - res = validate_comp_if(CHILD(tree, 0)); - - return res; -} - -/* comp_for: 'for' exprlist 'in' test [comp_iter] - */ -static int -validate_comp_for(node *tree) -{ - int nch = NCH(tree); - int res; - - if (nch == 5) - res = validate_comp_iter(CHILD(tree, 4)); - else - res = validate_numnodes(tree, 4, "comp_for"); - - if (res) - res = (validate_name(CHILD(tree, 0), "for") - && validate_exprlist(CHILD(tree, 1)) - && validate_name(CHILD(tree, 2), "in") - && validate_or_test(CHILD(tree, 3))); - - return res; -} - -/* comp_if: 'if' test_nocond [comp_iter] - */ -static int -validate_comp_if(node *tree) -{ - int nch = NCH(tree); - int res; - - if (nch == 3) - res = validate_comp_iter(CHILD(tree, 2)); - else - res = validate_numnodes(tree, 2, "comp_if"); - - if (res) - res = (validate_name(CHILD(tree, 0), "if") - && validate_test_nocond(CHILD(tree, 1))); - - return res; -} - - -/* simple_stmt | compound_stmt - * - */ -static int -validate_stmt(node *tree) -{ - int res = (validate_ntype(tree, stmt) - && validate_numnodes(tree, 1, "stmt")); - - if (res) { - tree = CHILD(tree, 0); - - if (TYPE(tree) == simple_stmt) - res = validate_simple_stmt(tree); - else - res = validate_compound_stmt(tree); - } - return (res); -} - - -/* small_stmt (';' small_stmt)* [';'] NEWLINE - * - */ -static int -validate_simple_stmt(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, simple_stmt) - && (nch >= 2) - && validate_small_stmt(CHILD(tree, 0)) - && validate_newline(CHILD(tree, nch - 1))); - - if (nch < 2) - res = validate_numnodes(tree, 2, "simple_stmt"); - --nch; /* forget the NEWLINE */ - if (res && is_even(nch)) - res = validate_semi(CHILD(tree, --nch)); - if (res && (nch > 2)) { - int i; - - for (i = 1; res && (i < nch); i += 2) - res = (validate_semi(CHILD(tree, i)) - && validate_small_stmt(CHILD(tree, i + 1))); - } - return (res); -} - - -static int -validate_small_stmt(node *tree) -{ - int nch = NCH(tree); - int res = validate_numnodes(tree, 1, "small_stmt"); - - if (res) { - int ntype = TYPE(CHILD(tree, 0)); - - if ( (ntype == expr_stmt) - || (ntype == del_stmt) - || (ntype == pass_stmt) - || (ntype == flow_stmt) - || (ntype == import_stmt) - || (ntype == global_stmt) - || (ntype == nonlocal_stmt) - || (ntype == assert_stmt)) - res = validate_node(CHILD(tree, 0)); - else { - res = 0; - err_string("illegal small_stmt child type"); - } - } - else if (nch == 1) { - res = 0; - PyErr_Format(parser_error, - "Unrecognized child node of small_stmt: %d.", - TYPE(CHILD(tree, 0))); - } - return (res); -} - - -/* compound_stmt: - * if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated - */ -static int -validate_compound_stmt(node *tree) -{ - int res = (validate_ntype(tree, compound_stmt) - && validate_numnodes(tree, 1, "compound_stmt")); - int ntype; - - if (!res) - return (0); - - tree = CHILD(tree, 0); - ntype = TYPE(tree); - if ( (ntype == if_stmt) - || (ntype == while_stmt) - || (ntype == for_stmt) - || (ntype == try_stmt) - || (ntype == with_stmt) - || (ntype == funcdef) - || (ntype == async_stmt) - || (ntype == classdef) - || (ntype == decorated)) - res = validate_node(tree); - else { - res = 0; - PyErr_Format(parser_error, - "Illegal compound statement type: %d.", TYPE(tree)); - } - return (res); -} - -static int -validate_yield_or_testlist(node *tree, int tse) -{ - if (TYPE(tree) == yield_expr) { - return validate_yield_expr(tree); - } - else { - if (tse) - return validate_testlist_star_expr(tree); - else - return validate_testlist(tree); - } -} - -static int -validate_expr_stmt(node *tree) -{ - int j; - int nch = NCH(tree); - int res = (validate_ntype(tree, expr_stmt) - && is_odd(nch) - && validate_testlist_star_expr(CHILD(tree, 0))); - - if (res && nch == 3 - && TYPE(CHILD(tree, 1)) == augassign) { - res = validate_numnodes(CHILD(tree, 1), 1, "augassign") - && validate_yield_or_testlist(CHILD(tree, 2), 0); - - if (res) { - char *s = STR(CHILD(CHILD(tree, 1), 0)); - - res = (strcmp(s, "+=") == 0 - || strcmp(s, "-=") == 0 - || strcmp(s, "*=") == 0 - || strcmp(s, "/=") == 0 - || strcmp(s, "//=") == 0 - || strcmp(s, "%=") == 0 - || strcmp(s, "&=") == 0 - || strcmp(s, "|=") == 0 - || strcmp(s, "^=") == 0 - || strcmp(s, "<<=") == 0 - || strcmp(s, ">>=") == 0 - || strcmp(s, "**=") == 0); - if (!res) - err_string("illegal augmented assignment operator"); - } - } - else { - for (j = 1; res && (j < nch); j += 2) - res = validate_equal(CHILD(tree, j)) - && validate_yield_or_testlist(CHILD(tree, j + 1), 1); - } - return (res); -} - - -static int -validate_del_stmt(node *tree) -{ - return (validate_numnodes(tree, 2, "del_stmt") - && validate_name(CHILD(tree, 0), "del") - && validate_exprlist(CHILD(tree, 1))); -} - - -static int -validate_return_stmt(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, return_stmt) - && ((nch == 1) || (nch == 2)) - && validate_name(CHILD(tree, 0), "return")); - - if (res && (nch == 2)) - res = validate_testlist(CHILD(tree, 1)); - - return (res); -} - - -/* - * raise_stmt: - * - * 'raise' [test ['from' test]] - */ -static int -validate_raise_stmt(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, raise_stmt) - && ((nch == 1) || (nch == 2) || (nch == 4))); - - if (!res && !PyErr_Occurred()) - (void) validate_numnodes(tree, 2, "raise"); - - if (res) { - res = validate_name(CHILD(tree, 0), "raise"); - if (res && (nch >= 2)) - res = validate_test(CHILD(tree, 1)); - if (res && (nch == 4)) { - res = (validate_name(CHILD(tree, 2), "from") - && validate_test(CHILD(tree, 3))); - } - } - return (res); -} - - -/* yield_expr: 'yield' [yield_arg] - */ -static int -validate_yield_expr(node *tree) -{ - int nch = NCH(tree); - if (nch < 1 || nch > 2) - return 0; - if (!validate_ntype(tree, yield_expr)) - return 0; - if (!validate_name(CHILD(tree, 0), "yield")) - return 0; - if (nch == 2) { - if (!validate_yield_arg(CHILD(tree, 1))) - return 0; - } - return 1; -} - -/* yield_arg: 'from' test | testlist - */ -static int -validate_yield_arg(node *tree) -{ - int nch = NCH(tree); - if (!validate_ntype(tree, yield_arg)) - return 0; - switch (nch) { - case 1: - if (!validate_testlist(CHILD(tree, nch - 1))) - return 0; - break; - case 2: - if (!validate_name(CHILD(tree, 0), "from")) - return 0; - if (!validate_test(CHILD(tree, 1))) - return 0; - break; - default: - return 0; - } - return 1; -} - -/* yield_stmt: yield_expr - */ -static int -validate_yield_stmt(node *tree) -{ - return (validate_ntype(tree, yield_stmt) - && validate_numnodes(tree, 1, "yield_stmt") - && validate_yield_expr(CHILD(tree, 0))); -} - - -static int -validate_import_as_name(node *tree) -{ - int nch = NCH(tree); - int ok = validate_ntype(tree, import_as_name); - - if (ok) { - if (nch == 1) - ok = validate_name(CHILD(tree, 0), NULL); - else if (nch == 3) - ok = (validate_name(CHILD(tree, 0), NULL) - && validate_name(CHILD(tree, 1), "as") - && validate_name(CHILD(tree, 2), NULL)); - else - ok = validate_numnodes(tree, 3, "import_as_name"); - } - return ok; -} - - -/* dotted_name: NAME ("." NAME)* - */ -static int -validate_dotted_name(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, dotted_name) - && is_odd(nch) - && validate_name(CHILD(tree, 0), NULL)); - int i; - - for (i = 1; res && (i < nch); i += 2) { - res = (validate_dot(CHILD(tree, i)) - && validate_name(CHILD(tree, i+1), NULL)); - } - return res; -} - - -/* dotted_as_name: dotted_name [NAME NAME] - */ -static int -validate_dotted_as_name(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, dotted_as_name); - - if (res) { - if (nch == 1) - res = validate_dotted_name(CHILD(tree, 0)); - else if (nch == 3) - res = (validate_dotted_name(CHILD(tree, 0)) - && validate_name(CHILD(tree, 1), "as") - && validate_name(CHILD(tree, 2), NULL)); - else { - res = 0; - err_string("illegal number of children for dotted_as_name"); - } - } - return res; -} - - -/* dotted_as_name (',' dotted_as_name)* */ -static int -validate_dotted_as_names(node *tree) -{ - int nch = NCH(tree); - int res = is_odd(nch) && validate_dotted_as_name(CHILD(tree, 0)); - int i; - - for (i = 1; res && (i < nch); i += 2) - res = (validate_comma(CHILD(tree, i)) - && validate_dotted_as_name(CHILD(tree, i + 1))); - return (res); -} - - -/* import_as_name (',' import_as_name)* [','] */ -static int -validate_import_as_names(node *tree) -{ - int nch = NCH(tree); - int res = validate_import_as_name(CHILD(tree, 0)); - int i; - - for (i = 1; res && (i + 1 < nch); i += 2) - res = (validate_comma(CHILD(tree, i)) - && validate_import_as_name(CHILD(tree, i + 1))); - return (res); -} - - -/* 'import' dotted_as_names */ -static int -validate_import_name(node *tree) -{ - return (validate_ntype(tree, import_name) - && validate_numnodes(tree, 2, "import_name") - && validate_name(CHILD(tree, 0), "import") - && validate_dotted_as_names(CHILD(tree, 1))); -} - -/* Helper function to count the number of leading dots (or ellipsis tokens) in - * 'from ...module import name' - */ -static int -count_from_dots(node *tree) -{ - int i; - for (i = 1; i < NCH(tree); i++) - if (TYPE(CHILD(tree, i)) != DOT && TYPE(CHILD(tree, i)) != ELLIPSIS) - break; - return i - 1; -} - -/* import_from: ('from' ('.'* dotted_name | '.'+) - * 'import' ('*' | '(' import_as_names ')' | import_as_names)) - */ -static int -validate_import_from(node *tree) -{ - int nch = NCH(tree); - int ndots = count_from_dots(tree); - int havename = (TYPE(CHILD(tree, ndots + 1)) == dotted_name); - int offset = ndots + havename; - int res = validate_ntype(tree, import_from) - && (offset >= 1) - && (nch >= 3 + offset) - && validate_name(CHILD(tree, 0), "from") - && (!havename || validate_dotted_name(CHILD(tree, ndots + 1))) - && validate_name(CHILD(tree, offset + 1), "import"); - - if (res && TYPE(CHILD(tree, offset + 2)) == LPAR) - res = ((nch == offset + 5) - && validate_lparen(CHILD(tree, offset + 2)) - && validate_import_as_names(CHILD(tree, offset + 3)) - && validate_rparen(CHILD(tree, offset + 4))); - else if (res && TYPE(CHILD(tree, offset + 2)) != STAR) - res = validate_import_as_names(CHILD(tree, offset + 2)); - return (res); -} - - -/* import_stmt: import_name | import_from */ -static int -validate_import_stmt(node *tree) -{ - int nch = NCH(tree); - int res = validate_numnodes(tree, 1, "import_stmt"); - - if (res) { - int ntype = TYPE(CHILD(tree, 0)); - - if (ntype == import_name || ntype == import_from) - res = validate_node(CHILD(tree, 0)); - else { - res = 0; - err_string("illegal import_stmt child type"); - } - } - else if (nch == 1) { - res = 0; - PyErr_Format(parser_error, - "Unrecognized child node of import_stmt: %d.", - TYPE(CHILD(tree, 0))); - } - return (res); -} - - -/* global_stmt: - * - * 'global' NAME (',' NAME)* - */ -static int -validate_global_stmt(node *tree) -{ - int j; - int nch = NCH(tree); - int res = (validate_ntype(tree, global_stmt) - && is_even(nch) && (nch >= 2)); - - if (!res && !PyErr_Occurred()) - err_string("illegal global statement"); - - if (res) - res = (validate_name(CHILD(tree, 0), "global") - && validate_ntype(CHILD(tree, 1), NAME)); - for (j = 2; res && (j < nch); j += 2) - res = (validate_comma(CHILD(tree, j)) - && validate_ntype(CHILD(tree, j + 1), NAME)); - - return (res); -} - -/* nonlocal_stmt: - * - * 'nonlocal' NAME (',' NAME)* - */ -static int -validate_nonlocal_stmt(node *tree) -{ - int j; - int nch = NCH(tree); - int res = (validate_ntype(tree, nonlocal_stmt) - && is_even(nch) && (nch >= 2)); - - if (!res && !PyErr_Occurred()) - err_string("illegal nonlocal statement"); - - if (res) - res = (validate_name(CHILD(tree, 0), "nonlocal") - && validate_ntype(CHILD(tree, 1), NAME)); - for (j = 2; res && (j < nch); j += 2) - res = (validate_comma(CHILD(tree, j)) - && validate_ntype(CHILD(tree, j + 1), NAME)); - - return res; -} - -/* assert_stmt: - * - * 'assert' test [',' test] - */ -static int -validate_assert_stmt(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, assert_stmt) - && ((nch == 2) || (nch == 4)) - && (validate_name(CHILD(tree, 0), "assert")) - && validate_test(CHILD(tree, 1))); - - if (!res && !PyErr_Occurred()) - err_string("illegal assert statement"); - if (res && (nch > 2)) - res = (validate_comma(CHILD(tree, 2)) - && validate_test(CHILD(tree, 3))); - - return (res); -} - - -static int -validate_while(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, while_stmt) - && ((nch == 4) || (nch == 7)) - && validate_name(CHILD(tree, 0), "while") - && validate_test(CHILD(tree, 1)) - && validate_colon(CHILD(tree, 2)) - && validate_suite(CHILD(tree, 3))); - - if (res && (nch == 7)) - res = (validate_name(CHILD(tree, 4), "else") - && validate_colon(CHILD(tree, 5)) - && validate_suite(CHILD(tree, 6))); - - return (res); -} - - -static int -validate_for(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, for_stmt) - && ((nch == 6) || (nch == 9)) - && validate_name(CHILD(tree, 0), "for") - && validate_exprlist(CHILD(tree, 1)) - && validate_name(CHILD(tree, 2), "in") - && validate_testlist(CHILD(tree, 3)) - && validate_colon(CHILD(tree, 4)) - && validate_suite(CHILD(tree, 5))); - - if (res && (nch == 9)) - res = (validate_name(CHILD(tree, 6), "else") - && validate_colon(CHILD(tree, 7)) - && validate_suite(CHILD(tree, 8))); - - return (res); -} - - -/* try_stmt: - * 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite] - ['finally' ':' suite] - * | 'try' ':' suite 'finally' ':' suite - * - */ -static int -validate_try(node *tree) -{ - int nch = NCH(tree); - int pos = 3; - int res = (validate_ntype(tree, try_stmt) - && (nch >= 6) && ((nch % 3) == 0)); - - if (res) - res = (validate_name(CHILD(tree, 0), "try") - && validate_colon(CHILD(tree, 1)) - && validate_suite(CHILD(tree, 2)) - && validate_colon(CHILD(tree, nch - 2)) - && validate_suite(CHILD(tree, nch - 1))); - else if (!PyErr_Occurred()) { - const char* name = "except"; - if (TYPE(CHILD(tree, nch - 3)) != except_clause) - name = STR(CHILD(tree, nch - 3)); - - PyErr_Format(parser_error, - "Illegal number of children for try/%s node.", name); - } - /* Handle try/finally statement */ - if (res && (TYPE(CHILD(tree, pos)) == NAME) && - (strcmp(STR(CHILD(tree, pos)), "finally") == 0)) { - res = (validate_numnodes(tree, 6, "try/finally") - && validate_colon(CHILD(tree, 4)) - && validate_suite(CHILD(tree, 5))); - return (res); - } - /* try/except statement: skip past except_clause sections */ - while (res && pos < nch && (TYPE(CHILD(tree, pos)) == except_clause)) { - res = (validate_except_clause(CHILD(tree, pos)) - && validate_colon(CHILD(tree, pos + 1)) - && validate_suite(CHILD(tree, pos + 2))); - pos += 3; - } - /* skip else clause */ - if (res && pos < nch && (TYPE(CHILD(tree, pos)) == NAME) && - (strcmp(STR(CHILD(tree, pos)), "else") == 0)) { - res = (validate_colon(CHILD(tree, pos + 1)) - && validate_suite(CHILD(tree, pos + 2))); - pos += 3; - } - if (res && pos < nch) { - /* last clause must be a finally */ - res = (validate_name(CHILD(tree, pos), "finally") - && validate_numnodes(tree, pos + 3, "try/except/finally") - && validate_colon(CHILD(tree, pos + 1)) - && validate_suite(CHILD(tree, pos + 2))); - } - return (res); -} - - -static int -validate_except_clause(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, except_clause) - && ((nch == 1) || (nch == 2) || (nch == 4)) - && validate_name(CHILD(tree, 0), "except")); - - if (res && (nch > 1)) - res = validate_test(CHILD(tree, 1)); - if (res && (nch == 4)) - res = (validate_name(CHILD(tree, 2), "as") - && validate_ntype(CHILD(tree, 3), NAME)); - - return (res); -} - - -static int -validate_test(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, test) && is_odd(nch); - - if (res && (TYPE(CHILD(tree, 0)) == lambdef)) - res = ((nch == 1) - && validate_lambdef(CHILD(tree, 0))); - else if (res) { - res = validate_or_test(CHILD(tree, 0)); - res = (res && (nch == 1 || (nch == 5 && - validate_name(CHILD(tree, 1), "if") && - validate_or_test(CHILD(tree, 2)) && - validate_name(CHILD(tree, 3), "else") && - validate_test(CHILD(tree, 4))))); - } - return (res); -} - -static int -validate_test_nocond(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, test_nocond) && (nch == 1); - - if (res && (TYPE(CHILD(tree, 0)) == lambdef_nocond)) - res = (validate_lambdef_nocond(CHILD(tree, 0))); - else if (res) { - res = (validate_or_test(CHILD(tree, 0))); - } - return (res); -} - -static int -validate_or_test(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, or_test) && is_odd(nch); - - if (res) { - int pos; - res = validate_and_test(CHILD(tree, 0)); - for (pos = 1; res && (pos < nch); pos += 2) - res = (validate_name(CHILD(tree, pos), "or") - && validate_and_test(CHILD(tree, pos + 1))); - } - return (res); -} - - -static int -validate_and_test(node *tree) -{ - int pos; - int nch = NCH(tree); - int res = (validate_ntype(tree, and_test) - && is_odd(nch) - && validate_not_test(CHILD(tree, 0))); - - for (pos = 1; res && (pos < nch); pos += 2) - res = (validate_name(CHILD(tree, pos), "and") - && validate_not_test(CHILD(tree, 0))); - - return (res); -} - - -static int -validate_not_test(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, not_test) && ((nch == 1) || (nch == 2)); - - if (res) { - if (nch == 2) - res = (validate_name(CHILD(tree, 0), "not") - && validate_not_test(CHILD(tree, 1))); - else if (nch == 1) - res = validate_comparison(CHILD(tree, 0)); - } - return (res); -} - - -static int -validate_comparison(node *tree) -{ - int pos; - int nch = NCH(tree); - int res = (validate_ntype(tree, comparison) - && is_odd(nch) - && validate_expr(CHILD(tree, 0))); - - for (pos = 1; res && (pos < nch); pos += 2) - res = (validate_comp_op(CHILD(tree, pos)) - && validate_expr(CHILD(tree, pos + 1))); - - return (res); -} - - -static int -validate_comp_op(node *tree) -{ - int res = 0; - int nch = NCH(tree); - - if (!validate_ntype(tree, comp_op)) - return (0); - if (nch == 1) { - /* - * Only child will be a terminal with a well-defined symbolic name - * or a NAME with a string of either 'is' or 'in' - */ - tree = CHILD(tree, 0); - switch (TYPE(tree)) { - case LESS: - case GREATER: - case EQEQUAL: - case EQUAL: - case LESSEQUAL: - case GREATEREQUAL: - case NOTEQUAL: - res = 1; - break; - case NAME: - res = ((strcmp(STR(tree), "in") == 0) - || (strcmp(STR(tree), "is") == 0)); - if (!res) { - PyErr_Format(parser_error, - "illegal operator '%s'", STR(tree)); - } - break; - default: - err_string("illegal comparison operator type"); - break; - } - } - else if ((res = validate_numnodes(tree, 2, "comp_op")) != 0) { - res = (validate_ntype(CHILD(tree, 0), NAME) - && validate_ntype(CHILD(tree, 1), NAME) - && (((strcmp(STR(CHILD(tree, 0)), "is") == 0) - && (strcmp(STR(CHILD(tree, 1)), "not") == 0)) - || ((strcmp(STR(CHILD(tree, 0)), "not") == 0) - && (strcmp(STR(CHILD(tree, 1)), "in") == 0)))); - if (!res && !PyErr_Occurred()) - err_string("unknown comparison operator"); - } - return (res); -} - - -static int -validate_star_expr(node *tree) -{ - int res = validate_ntype(tree, star_expr); - if (!res) return res; - if (!validate_numnodes(tree, 2, "star_expr")) - return 0; - return validate_ntype(CHILD(tree, 0), STAR) && \ - validate_expr(CHILD(tree, 1)); -} - - -static int -validate_expr(node *tree) -{ - int j; - int nch = NCH(tree); - int res = (validate_ntype(tree, expr) - && is_odd(nch) - && validate_xor_expr(CHILD(tree, 0))); - - for (j = 2; res && (j < nch); j += 2) - res = (validate_xor_expr(CHILD(tree, j)) - && validate_vbar(CHILD(tree, j - 1))); - - return (res); -} - - -static int -validate_xor_expr(node *tree) -{ - int j; - int nch = NCH(tree); - int res = (validate_ntype(tree, xor_expr) - && is_odd(nch) - && validate_and_expr(CHILD(tree, 0))); - - for (j = 2; res && (j < nch); j += 2) - res = (validate_circumflex(CHILD(tree, j - 1)) - && validate_and_expr(CHILD(tree, j))); - - return (res); -} - - -static int -validate_and_expr(node *tree) -{ - int pos; - int nch = NCH(tree); - int res = (validate_ntype(tree, and_expr) - && is_odd(nch) - && validate_shift_expr(CHILD(tree, 0))); - - for (pos = 1; res && (pos < nch); pos += 2) - res = (validate_ampersand(CHILD(tree, pos)) - && validate_shift_expr(CHILD(tree, pos + 1))); - - return (res); -} - - -static int -validate_chain_two_ops(node *tree, int (*termvalid)(node *), int op1, int op2) - { - int pos = 1; - int nch = NCH(tree); - int res = (is_odd(nch) - && (*termvalid)(CHILD(tree, 0))); - - for ( ; res && (pos < nch); pos += 2) { - if (TYPE(CHILD(tree, pos)) != op1) - res = validate_ntype(CHILD(tree, pos), op2); - if (res) - res = (*termvalid)(CHILD(tree, pos + 1)); - } - return (res); -} - - -static int -validate_shift_expr(node *tree) -{ - return (validate_ntype(tree, shift_expr) - && validate_chain_two_ops(tree, validate_arith_expr, - LEFTSHIFT, RIGHTSHIFT)); -} - - -static int -validate_arith_expr(node *tree) -{ - return (validate_ntype(tree, arith_expr) - && validate_chain_two_ops(tree, validate_term, PLUS, MINUS)); -} - - -static int -validate_term(node *tree) -{ - int pos = 1; - int nch = NCH(tree); - int res = (validate_ntype(tree, term) - && is_odd(nch) - && validate_factor(CHILD(tree, 0))); - - for ( ; res && (pos < nch); pos += 2) - res = (((TYPE(CHILD(tree, pos)) == STAR) - || (TYPE(CHILD(tree, pos)) == SLASH) - || (TYPE(CHILD(tree, pos)) == DOUBLESLASH) - || (TYPE(CHILD(tree, pos)) == PERCENT)) - && validate_factor(CHILD(tree, pos + 1))); - - return (res); -} - - -/* factor: - * - * factor: ('+'|'-'|'~') factor | power - */ -static int -validate_factor(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, factor) - && (((nch == 2) - && ((TYPE(CHILD(tree, 0)) == PLUS) - || (TYPE(CHILD(tree, 0)) == MINUS) - || (TYPE(CHILD(tree, 0)) == TILDE)) - && validate_factor(CHILD(tree, 1))) - || ((nch == 1) - && validate_power(CHILD(tree, 0))))); - return (res); -} - - -/* power: - * - * power: atom_expr trailer* ['**' factor] - */ -static int -validate_power(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, power) && (nch >= 1) - && validate_atom_expr(CHILD(tree, 0))); - - if (nch > 1) { - if (nch != 3) { - err_string("illegal number of nodes for 'power'"); - return (0); - } - res = (validate_doublestar(CHILD(tree, 1)) - && validate_factor(CHILD(tree, 2))); - } - - return (res); -} - - -/* atom_expr: - * - * atom_expr: [AWAIT] atom trailer* - */ -static int -validate_atom_expr(node *tree) -{ - int start = 0; - int nch = NCH(tree); - int res; - int pos; - - res = validate_ntype(tree, atom_expr) && (nch >= 1); - if (!res) { - return (res); - } - - if (TYPE(CHILD(tree, 0)) == AWAIT) { - start = 1; - if (nch < 2) { - err_string("illegal number of nodes for 'atom_expr'"); - return (0); - } - } - - res = validate_atom(CHILD(tree, start)); - if (res) { - pos = start + 1; - while (res && (pos < nch) && (TYPE(CHILD(tree, pos)) == trailer)) - res = validate_trailer(CHILD(tree, pos++)); - } - - return (res); -} - - -static int -validate_atom(node *tree) -{ - int pos; - int nch = NCH(tree); - int res = validate_ntype(tree, atom); - - if (res && nch < 1) - res = validate_numnodes(tree, nch+1, "atom"); - if (res) { - switch (TYPE(CHILD(tree, 0))) { - case LPAR: - res = ((nch <= 3) - && (validate_rparen(CHILD(tree, nch - 1)))); - - if (res && (nch == 3)) { - if (TYPE(CHILD(tree, 1))==yield_expr) - res = validate_yield_expr(CHILD(tree, 1)); - else - res = validate_testlist_comp(CHILD(tree, 1)); - } - break; - case LSQB: - if (nch == 2) - res = validate_ntype(CHILD(tree, 1), RSQB); - else if (nch == 3) - res = (validate_testlist_comp(CHILD(tree, 1)) - && validate_ntype(CHILD(tree, 2), RSQB)); - else { - res = 0; - err_string("illegal list display atom"); - } - break; - case LBRACE: - res = ((nch <= 3) - && validate_ntype(CHILD(tree, nch - 1), RBRACE)); - - if (res && (nch == 3)) - res = validate_dictorsetmaker(CHILD(tree, 1)); - break; - case NAME: - case NUMBER: - case ELLIPSIS: - res = (nch == 1); - break; - case STRING: - for (pos = 1; res && (pos < nch); ++pos) - res = validate_ntype(CHILD(tree, pos), STRING); - break; - default: - res = 0; - break; - } - } - return (res); -} - - -/* testlist_comp: - * (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] ) - */ -static int -validate_testlist_comp(node *tree) -{ - int nch = NCH(tree); - int ok; - - if (nch == 0) { - err_string("missing child nodes of testlist_comp"); - return 0; - } - - if (nch == 2 && TYPE(CHILD(tree, 1)) == comp_for) { - ok = (validate_test(CHILD(tree, 0)) - && validate_comp_for(CHILD(tree, 1))); - } - else { - ok = validate_repeating_list(tree, - testlist_comp, - validate_test_or_star_expr, - "testlist_comp"); - } - return ok; -} - -/* decorator: - * '@' dotted_name [ '(' [arglist] ')' ] NEWLINE - */ -static int -validate_decorator(node *tree) -{ - int ok; - int nch = NCH(tree); - ok = (validate_ntype(tree, decorator) && - (nch == 3 || nch == 5 || nch == 6) && - validate_at(CHILD(tree, 0)) && - validate_dotted_name(CHILD(tree, 1)) && - validate_newline(RCHILD(tree, -1))); - - if (ok && nch != 3) { - ok = (validate_lparen(CHILD(tree, 2)) && - validate_rparen(RCHILD(tree, -2))); - - if (ok && nch == 6) - ok = validate_arglist(CHILD(tree, 3)); - } - - return ok; -} - -/* decorators: - * decorator+ - */ -static int -validate_decorators(node *tree) -{ - int i, nch, ok; - nch = NCH(tree); - ok = validate_ntype(tree, decorators) && nch >= 1; - - for (i = 0; ok && i < nch; ++i) - ok = validate_decorator(CHILD(tree, i)); - - return ok; -} - -/* with_item: - * test ['as' expr] - */ -static int -validate_with_item(node *tree) -{ - int nch = NCH(tree); - int ok = (validate_ntype(tree, with_item) - && (nch == 1 || nch == 3) - && validate_test(CHILD(tree, 0))); - if (ok && nch == 3) - ok = (validate_name(CHILD(tree, 1), "as") - && validate_expr(CHILD(tree, 2))); - return ok; -} - -/* with_stmt: - * 0 1 ... -2 -1 - * 'with' with_item (',' with_item)* ':' suite - */ -static int -validate_with_stmt(node *tree) -{ - int i; - int nch = NCH(tree); - int ok = (validate_ntype(tree, with_stmt) - && (nch % 2 == 0) - && validate_name(CHILD(tree, 0), "with") - && validate_colon(RCHILD(tree, -2)) - && validate_suite(RCHILD(tree, -1))); - for (i = 1; ok && i < nch - 2; i += 2) - ok = validate_with_item(CHILD(tree, i)); - return ok; -} - -/* funcdef: 'def' NAME parameters ['->' test] ':' suite */ - -static int -validate_funcdef(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, funcdef); - if (res) { - if (nch == 5) { - res = (validate_name(CHILD(tree, 0), "def") - && validate_ntype(CHILD(tree, 1), NAME) - && validate_parameters(CHILD(tree, 2)) - && validate_colon(CHILD(tree, 3)) - && validate_suite(CHILD(tree, 4))); - } - else if (nch == 7) { - res = (validate_name(CHILD(tree, 0), "def") - && validate_ntype(CHILD(tree, 1), NAME) - && validate_parameters(CHILD(tree, 2)) - && validate_rarrow(CHILD(tree, 3)) - && validate_test(CHILD(tree, 4)) - && validate_colon(CHILD(tree, 5)) - && validate_suite(CHILD(tree, 6))); - } - else { - res = 0; - err_string("illegal number of children for funcdef"); - } - } - return res; -} - -/* async_funcdef: ASYNC funcdef */ - -static int -validate_async_funcdef(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, async_funcdef); - if (res) { - if (nch == 2) { - res = (validate_ntype(CHILD(tree, 0), ASYNC) - && validate_funcdef(CHILD(tree, 1))); - } - else { - res = 0; - err_string("illegal number of children for async_funcdef"); - } - } - return res; -} - - -/* async_stmt: ASYNC (funcdef | with_stmt | for_stmt) */ - -static int -validate_async_stmt(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, async_stmt) - && validate_ntype(CHILD(tree, 0), ASYNC)); - - if (nch != 2) { - res = 0; - err_string("illegal number of children for async_stmt"); - } else { - if (TYPE(CHILD(tree, 1)) == funcdef) { - res = validate_funcdef(CHILD(tree, 1)); - } - else if (TYPE(CHILD(tree, 1)) == with_stmt) { - res = validate_with_stmt(CHILD(tree, 1)); - } - else if (TYPE(CHILD(tree, 1)) == for_stmt) { - res = validate_for(CHILD(tree, 1)); - } - } - - return res; -} - - - -/* decorated - * decorators (classdef | funcdef) - */ -static int -validate_decorated(node *tree) -{ - int nch = NCH(tree); - int ok = (validate_ntype(tree, decorated) - && (nch == 2) - && validate_decorators(RCHILD(tree, -2))); - if (TYPE(RCHILD(tree, -1)) == funcdef) - ok = ok && validate_funcdef(RCHILD(tree, -1)); - else - ok = ok && validate_class(RCHILD(tree, -1)); - return ok; -} - -static int -validate_lambdef(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, lambdef) - && ((nch == 3) || (nch == 4)) - && validate_name(CHILD(tree, 0), "lambda") - && validate_colon(CHILD(tree, nch - 2)) - && validate_test(CHILD(tree, nch - 1))); - - if (res && (nch == 4)) - res = validate_varargslist(CHILD(tree, 1)); - else if (!res && !PyErr_Occurred()) - (void) validate_numnodes(tree, 3, "lambdef"); - - return (res); -} - - -static int -validate_lambdef_nocond(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, lambdef_nocond) - && ((nch == 3) || (nch == 4)) - && validate_name(CHILD(tree, 0), "lambda") - && validate_colon(CHILD(tree, nch - 2)) - && validate_test(CHILD(tree, nch - 1))); - - if (res && (nch == 4)) - res = validate_varargslist(CHILD(tree, 1)); - else if (!res && !PyErr_Occurred()) - (void) validate_numnodes(tree, 3, "lambdef_nocond"); - - return (res); -} - - -/* arglist: - * - * (argument ',')* (argument [','] | '*' test [',' '**' test] | '**' test) - */ -static int -validate_arglist(node *tree) -{ - int nch = NCH(tree); - int i = 0; - int ok = 1; - - if (nch <= 0) - /* raise the right error from having an invalid number of children */ - return validate_numnodes(tree, nch + 1, "arglist"); - - if (nch > 1) { - for (i=0; i= 2) { - /* skip leading (argument ',') */ - ok = (validate_argument(CHILD(tree, i)) - && validate_comma(CHILD(tree, i+1))); - if (ok) - i += 2; - else - PyErr_Clear(); - } - ok = 1; - if (nch-i > 0) { - int sym = TYPE(CHILD(tree, i)); - - if (sym == argument) { - ok = validate_argument(CHILD(tree, i)); - if (ok && i+1 != nch) { - err_string("illegal arglist specification" - " (extra stuff on end)"); - ok = 0; - } - } - else { - err_string("illegal arglist specification"); - ok = 0; - } - } - return (ok); -} - - - -/* argument: ( test [comp_for] | - * test '=' test | - * '**' test | - * '*' test ) - */ -static int -validate_argument(node *tree) -{ - int nch = NCH(tree); - int res = (validate_ntype(tree, argument) - && ((nch == 1) || (nch == 2) || (nch == 3))); - - if (res) { - if (TYPE(CHILD(tree, 0)) == DOUBLESTAR) { - res = validate_test(CHILD(tree, 1)); - } - else if (TYPE(CHILD(tree, 0)) == STAR) { - res = validate_test(CHILD(tree, 1)); - } - else if (nch == 1) { - res = validate_test(CHILD(tree, 0)); - } - else if (nch == 2) { - res = (validate_test(CHILD(tree, 0)) - && validate_comp_for(CHILD(tree, 1))); - } - else if (res && (nch == 3)) { - res = (validate_test(CHILD(tree, 0)) - && validate_equal(CHILD(tree, 1)) - && validate_test(CHILD(tree, 2))); - } - } - return (res); -} - - - -/* trailer: - * - * '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME - */ -static int -validate_trailer(node *tree) -{ - int nch = NCH(tree); - int res = validate_ntype(tree, trailer) && ((nch == 2) || (nch == 3)); - - if (res) { - switch (TYPE(CHILD(tree, 0))) { - case LPAR: - res = validate_rparen(CHILD(tree, nch - 1)); - if (res && (nch == 3)) - res = validate_arglist(CHILD(tree, 1)); - break; - case LSQB: - res = (validate_numnodes(tree, 3, "trailer") - && validate_subscriptlist(CHILD(tree, 1)) - && validate_ntype(CHILD(tree, 2), RSQB)); - break; - case DOT: - res = (validate_numnodes(tree, 2, "trailer") - && validate_ntype(CHILD(tree, 1), NAME)); - break; - default: - res = 0; - break; - } - } - else { - (void) validate_numnodes(tree, 2, "trailer"); - } - return (res); -} - - -/* subscriptlist: - * - * subscript (',' subscript)* [','] - */ -static int -validate_subscriptlist(node *tree) -{ - return (validate_repeating_list(tree, subscriptlist, - validate_subscript, "subscriptlist")); -} - - -/* subscript: - * - * '.' '.' '.' | test | [test] ':' [test] [sliceop] - */ -static int -validate_subscript(node *tree) -{ - int offset = 0; - int nch = NCH(tree); - int res = validate_ntype(tree, subscript) && (nch >= 1) && (nch <= 4); - - if (!res) { - if (!PyErr_Occurred()) - err_string("invalid number of arguments for subscript node"); - return (0); - } - if (TYPE(CHILD(tree, 0)) == DOT) - /* take care of ('.' '.' '.') possibility */ - return (validate_numnodes(tree, 3, "subscript") - && validate_dot(CHILD(tree, 0)) - && validate_dot(CHILD(tree, 1)) - && validate_dot(CHILD(tree, 2))); - if (nch == 1) { - if (TYPE(CHILD(tree, 0)) == test) - res = validate_test(CHILD(tree, 0)); - else - res = validate_colon(CHILD(tree, 0)); - return (res); - } - /* Must be [test] ':' [test] [sliceop], - * but at least one of the optional components will - * be present, but we don't know which yet. - */ - if ((TYPE(CHILD(tree, 0)) != COLON) || (nch == 4)) { - res = validate_test(CHILD(tree, 0)); - offset = 1; - } - if (res) - res = validate_colon(CHILD(tree, offset)); - if (res) { - int rem = nch - ++offset; - if (rem) { - if (TYPE(CHILD(tree, offset)) == test) { - res = validate_test(CHILD(tree, offset)); - ++offset; - --rem; - } - if (res && rem) - res = validate_sliceop(CHILD(tree, offset)); - } - } - return (res); -} - - -static int -validate_sliceop(node *tree) -{ - int nch = NCH(tree); - int res = ((nch == 1) || validate_numnodes(tree, 2, "sliceop")) - && validate_ntype(tree, sliceop); - if (!res && !PyErr_Occurred()) { - res = validate_numnodes(tree, 1, "sliceop"); - } - if (res) - res = validate_colon(CHILD(tree, 0)); - if (res && (nch == 2)) - res = validate_test(CHILD(tree, 1)); - - return (res); -} - - -static int -validate_test_or_star_expr(node *n) -{ - if (TYPE(n) == test) - return validate_test(n); - return validate_star_expr(n); -} - -static int -validate_expr_or_star_expr(node *n) -{ - if (TYPE(n) == expr) - return validate_expr(n); - return validate_star_expr(n); -} - - -static int -validate_exprlist(node *tree) -{ - return (validate_repeating_list(tree, exprlist, - validate_expr_or_star_expr, "exprlist")); -} - -/* Incrementing validate functions returns nonzero iff success (like other - * validate functions, and advance *i by the length of the matched pattern. */ - -/* test ':' test */ -static int -validate_test_colon_test_inc(node *tree, int *i) -{ - return (validate_test(CHILD(tree, (*i)++)) - && validate_colon(CHILD(tree, (*i)++)) - && validate_test(CHILD(tree, (*i)++))); -} - -/* test ':' test | '**' expr */ -static int -validate_dict_element_inc(node *tree, int *i) -{ - int nch = NCH(tree); - int res = 0; - if (nch - *i >= 2) { - if (TYPE(CHILD(tree, *i+1)) == COLON) { - /* test ':' test */ - res = validate_test_colon_test_inc(tree, i); - } else { - /* '**' expr */ - res = (validate_doublestar(CHILD(tree, (*i)++)) - && validate_expr(CHILD(tree, (*i)++))); - } - } - return res; -} - -/* - * dictorsetmaker: - * - * ( ((test ':' test | '**' expr) - * (comp_for | (',' (test ':' test | '**' expr))* [','])) | - * ((test | '*' test) - * (comp_for | (',' (test | '*' test))* [','])) ) - */ -static int -validate_dictorsetmaker(node *tree) -{ - int nch = NCH(tree); - int res; - int i = 0; - - res = validate_ntype(tree, dictorsetmaker); - if (!res) - return 0; - - if (nch - i < 1) { - /* Unconditionally raise. */ - (void) validate_numnodes(tree, 1, "dictorsetmaker"); - return 0; - } - - if (nch - i >= 2 - && ((TYPE(CHILD(tree, i+1)) == COLON) || - (TYPE(CHILD(tree, i)) == DOUBLESTAR))) { - /* Dictionary display or dictionary comprehension. */ - if (nch - i >= 4 && TYPE(CHILD(tree, i+3)) == comp_for) { - /* Dictionary comprehension. */ - res = (validate_test_colon_test_inc(tree, &i) - && validate_comp_for(CHILD(tree, i++))); - if (!res) - return 0; - } else { - /* Dictionary display. */ - return validate_repeating_list_variable( - tree, - dictorsetmaker, - validate_dict_element_inc, - &i, - "dictorsetmaker"); - } - } else { - /* Set display or set comprehension. */ - if (nch - i >= 2 && TYPE(CHILD(tree, i + 1)) == comp_for) { - /* Set comprehension. */ - res = (validate_test(CHILD(tree, i++)) - && validate_comp_for(CHILD(tree, i++))); - if (!res) - return 0; - } else { - /* Set display. */ - return validate_repeating_list(tree, - dictorsetmaker, - validate_test_or_star_expr, - "dictorsetmaker"); - } - } - - if (nch - i > 0) { - err_string("Illegal trailing nodes for dictorsetmaker."); - return 0; - } - - return 1; -} - - -static int -validate_eval_input(node *tree) -{ - int pos; - int nch = NCH(tree); - int res = (validate_ntype(tree, eval_input) - && (nch >= 2) - && validate_testlist(CHILD(tree, 0)) - && validate_ntype(CHILD(tree, nch - 1), ENDMARKER)); - - for (pos = 1; res && (pos < (nch - 1)); ++pos) - res = validate_ntype(CHILD(tree, pos), NEWLINE); - - return (res); -} - - -static int -validate_node(node *tree) -{ - int nch = 0; /* num. children on current node */ - int res = 1; /* result value */ - node* next = 0; /* node to process after this one */ - - while (res && (tree != 0)) { - nch = NCH(tree); - next = 0; - switch (TYPE(tree)) { - /* - * Definition nodes. - */ - case async_funcdef: - res = validate_async_funcdef(tree); - break; - case async_stmt: - res = validate_async_stmt(tree); - break; - case funcdef: - res = validate_funcdef(tree); - break; - case with_stmt: - res = validate_with_stmt(tree); - break; - case classdef: - res = validate_class(tree); - break; - case decorated: - res = validate_decorated(tree); - break; - /* - * "Trivial" parse tree nodes. - * (Why did I call these trivial?) - */ - case stmt: - res = validate_stmt(tree); - break; - case small_stmt: - /* - * expr_stmt | del_stmt | pass_stmt | flow_stmt | - * import_stmt | global_stmt | nonlocal_stmt | assert_stmt - */ - res = validate_small_stmt(tree); - break; - case flow_stmt: - res = (validate_numnodes(tree, 1, "flow_stmt") - && ((TYPE(CHILD(tree, 0)) == break_stmt) - || (TYPE(CHILD(tree, 0)) == continue_stmt) - || (TYPE(CHILD(tree, 0)) == yield_stmt) - || (TYPE(CHILD(tree, 0)) == return_stmt) - || (TYPE(CHILD(tree, 0)) == raise_stmt))); - if (res) - next = CHILD(tree, 0); - else if (nch == 1) - err_string("illegal flow_stmt type"); - break; - case yield_stmt: - res = validate_yield_stmt(tree); - break; - /* - * Compound statements. - */ - case simple_stmt: - res = validate_simple_stmt(tree); - break; - case compound_stmt: - res = validate_compound_stmt(tree); - break; - /* - * Fundamental statements. - */ - case expr_stmt: - res = validate_expr_stmt(tree); - break; - case del_stmt: - res = validate_del_stmt(tree); - break; - case pass_stmt: - res = (validate_numnodes(tree, 1, "pass") - && validate_name(CHILD(tree, 0), "pass")); - break; - case break_stmt: - res = (validate_numnodes(tree, 1, "break") - && validate_name(CHILD(tree, 0), "break")); - break; - case continue_stmt: - res = (validate_numnodes(tree, 1, "continue") - && validate_name(CHILD(tree, 0), "continue")); - break; - case return_stmt: - res = validate_return_stmt(tree); - break; - case raise_stmt: - res = validate_raise_stmt(tree); - break; - case import_stmt: - res = validate_import_stmt(tree); - break; - case import_name: - res = validate_import_name(tree); - break; - case import_from: - res = validate_import_from(tree); - break; - case global_stmt: - res = validate_global_stmt(tree); - break; - case nonlocal_stmt: - res = validate_nonlocal_stmt(tree); - break; - case assert_stmt: - res = validate_assert_stmt(tree); - break; - case if_stmt: - res = validate_if(tree); - break; - case while_stmt: - res = validate_while(tree); - break; - case for_stmt: - res = validate_for(tree); - break; - case try_stmt: - res = validate_try(tree); - break; - case suite: - res = validate_suite(tree); - break; - /* - * Expression nodes. - */ - case testlist: - res = validate_testlist(tree); - break; - case yield_expr: - res = validate_yield_expr(tree); - break; - case test: - res = validate_test(tree); - break; - case and_test: - res = validate_and_test(tree); - break; - case not_test: - res = validate_not_test(tree); - break; - case comparison: - res = validate_comparison(tree); - break; - case exprlist: - res = validate_exprlist(tree); - break; - case comp_op: - res = validate_comp_op(tree); - break; - case expr: - res = validate_expr(tree); - break; - case xor_expr: - res = validate_xor_expr(tree); - break; - case and_expr: - res = validate_and_expr(tree); - break; - case shift_expr: - res = validate_shift_expr(tree); - break; - case arith_expr: - res = validate_arith_expr(tree); - break; - case term: - res = validate_term(tree); - break; - case factor: - res = validate_factor(tree); - break; - case power: - res = validate_power(tree); - break; - case atom: - res = validate_atom(tree); - break; - - default: - /* Hopefully never reached! */ - err_string("unrecognized node type"); - res = 0; - break; - } - tree = next; - } - return (res); -} - - -static int -validate_expr_tree(node *tree) -{ - int res = validate_eval_input(tree); - - if (!res && !PyErr_Occurred()) - err_string("could not validate expression tuple"); - - return (res); -} - - -/* file_input: - * (NEWLINE | stmt)* ENDMARKER - */ -static int -validate_file_input(node *tree) -{ - int j; - int nch = NCH(tree) - 1; - int res = ((nch >= 0) - && validate_ntype(CHILD(tree, nch), ENDMARKER)); - - for (j = 0; res && (j < nch); ++j) { - if (TYPE(CHILD(tree, j)) == stmt) - res = validate_stmt(CHILD(tree, j)); - else - res = validate_newline(CHILD(tree, j)); - } - /* This stays in to prevent any internal failures from getting to the - * user. Hopefully, this won't be needed. If a user reports getting - * this, we have some debugging to do. - */ - if (!res && !PyErr_Occurred()) - err_string("VALIDATION FAILURE: report this to the maintainer!"); - - return (res); -} - -static int -validate_encoding_decl(node *tree) -{ - int nch = NCH(tree); - int res = ((nch == 1) - && validate_file_input(CHILD(tree, 0))); - - if (!res && !PyErr_Occurred()) - err_string("Error Parsing encoding_decl"); - - return res; -} - static PyObject* pickle_constructor = NULL; @@ -3458,6 +1074,7 @@ parser__pickler(PyObject *self, PyObject *args) result = Py_BuildValue("O(O)", pickle_constructor, tuple); Py_DECREF(tuple); } + Py_DECREF(empty_dict); Py_DECREF(newargs); } finally: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index d42416b..ae25102 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -32,6 +32,12 @@ #include "winreparse.h" #endif +/* On android API level 21, 'AT_EACCESS' is not declared although + * HAVE_FACCESSAT is defined. */ +#ifdef __ANDROID__ +#undef HAVE_FACCESSAT +#endif + #include /* needed for ctermid() */ #ifdef __cplusplus @@ -127,6 +133,13 @@ corresponding Unix manual entries for more information on calls."); #include #endif +#ifdef HAVE_LINUX_RANDOM_H +# include +#endif +#ifdef HAVE_GETRANDOM_SYSCALL +# include +#endif + #if defined(MS_WINDOWS) # define TERMSIZE_USE_CONIO #elif defined(HAVE_SYS_IOCTL_H) @@ -151,6 +164,8 @@ corresponding Unix manual entries for more information on calls."); #define HAVE_GETLOGIN 1 #define HAVE_SPAWNV 1 #define HAVE_EXECV 1 +#define HAVE_WSPAWNV 1 +#define HAVE_WEXECV 1 #define HAVE_PIPE 1 #define HAVE_SYSTEM 1 #define HAVE_CWAIT 1 @@ -634,22 +649,14 @@ fail: #endif /* MS_WINDOWS */ -#ifdef HAVE_LONG_LONG -# define _PyLong_FromDev PyLong_FromLongLong -#else -# define _PyLong_FromDev PyLong_FromLong -#endif +#define _PyLong_FromDev PyLong_FromLongLong #if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV) static int _Py_Dev_Converter(PyObject *obj, void *p) { -#ifdef HAVE_LONG_LONG *((dev_t *)p) = PyLong_AsUnsignedLongLong(obj); -#else - *((dev_t *)p) = PyLong_AsUnsignedLong(obj); -#endif if (PyErr_Occurred()) return 0; return 1; @@ -671,21 +678,20 @@ _Py_Dev_Converter(PyObject *obj, void *p) #endif static int -_fd_converter(PyObject *o, int *p, const char *allowed) +_fd_converter(PyObject *o, int *p) { int overflow; long long_value; PyObject *index = PyNumber_Index(o); if (index == NULL) { - PyErr_Format(PyExc_TypeError, - "argument should be %s, not %.200s", - allowed, Py_TYPE(o)->tp_name); return 0; } + assert(PyLong_Check(index)); long_value = PyLong_AsLongAndOverflow(index, &overflow); Py_DECREF(index); + assert(!PyErr_Occurred()); if (overflow > 0 || long_value > INT_MAX) { PyErr_SetString(PyExc_OverflowError, "fd is greater than maximum"); @@ -708,7 +714,15 @@ dir_fd_converter(PyObject *o, void *p) *(int *)p = DEFAULT_DIR_FD; return 1; } - return _fd_converter(o, (int *)p, "integer"); + else if (PyIndex_Check(o)) { + return _fd_converter(o, (int *)p); + } + else { + PyErr_Format(PyExc_TypeError, + "argument should be integer or None, not %.200s", + Py_TYPE(o)->tp_name); + return 0; + } } @@ -723,7 +737,7 @@ dir_fd_converter(PyObject *o, void *p) * * * On Windows, if we get a (Unicode) string we * extract the wchar_t * and return it; if we get - * bytes we extract the char * and return that. + * bytes we decode to wchar_t * and return that. * * * On all other platforms, strings are encoded * to bytes using PyUnicode_FSConverter, then we @@ -755,7 +769,9 @@ dir_fd_converter(PyObject *o, void *p) * and was not encoded. (Only used on Windows.) * path.narrow * Points to the path if it was expressed as bytes, - * or it was Unicode and was encoded to bytes. + * or it was Unicode and was encoded to bytes. (On Windows, + * is a non-zero integer if the path was expressed as bytes. + * The type is deliberately incompatible to prevent misuse.) * path.fd * Contains a file descriptor if path.accept_fd was true * and the caller provided a signed integer instead of any @@ -799,16 +815,25 @@ typedef struct { const char *argument_name; int nullable; int allow_fd; - wchar_t *wide; - char *narrow; + const wchar_t *wide; +#ifdef MS_WINDOWS + BOOL narrow; +#else + const char *narrow; +#endif int fd; Py_ssize_t length; PyObject *object; PyObject *cleanup; } path_t; +#ifdef MS_WINDOWS +#define PATH_T_INITIALIZE(function_name, argument_name, nullable, allow_fd) \ + {function_name, argument_name, nullable, allow_fd, NULL, FALSE, -1, 0, NULL, NULL} +#else #define PATH_T_INITIALIZE(function_name, argument_name, nullable, allow_fd) \ {function_name, argument_name, nullable, allow_fd, NULL, NULL, -1, 0, NULL, NULL} +#endif static void path_cleanup(path_t *path) { @@ -818,11 +843,19 @@ path_cleanup(path_t *path) { } static int -path_converter(PyObject *o, void *p) { +path_converter(PyObject *o, void *p) +{ path_t *path = (path_t *)p; - PyObject *unicode, *bytes; + PyObject *bytes, *to_cleanup = NULL; Py_ssize_t length; - char *narrow; + int is_index, is_buffer, is_bytes, is_unicode; + /* Default to failure, forcing explicit signaling of succcess. */ + int ret = 0; + const char *narrow; +#ifdef MS_WINDOWS + PyObject *wo; + const wchar_t *wide; +#endif #define FORMAT_EXCEPTION(exc, fmt) \ PyErr_Format(exc, "%s%s" fmt, \ @@ -836,122 +869,191 @@ path_converter(PyObject *o, void *p) { return 1; } - /* ensure it's always safe to call path_cleanup() */ + /* Ensure it's always safe to call path_cleanup(). */ path->cleanup = NULL; - if (o == Py_None) { - if (!path->nullable) { - FORMAT_EXCEPTION(PyExc_TypeError, - "can't specify None for %s argument"); - return 0; - } + if ((o == Py_None) && path->nullable) { path->wide = NULL; +#ifdef MS_WINDOWS + path->narrow = FALSE; +#else path->narrow = NULL; +#endif path->length = 0; path->object = o; path->fd = -1; return 1; } - unicode = PyUnicode_FromObject(o); - if (unicode) { -#ifdef MS_WINDOWS - wchar_t *wide; + /* Only call this here so that we don't treat the return value of + os.fspath() as an fd or buffer. */ + is_index = path->allow_fd && PyIndex_Check(o); + is_buffer = PyObject_CheckBuffer(o); + is_bytes = PyBytes_Check(o); + is_unicode = PyUnicode_Check(o); - wide = PyUnicode_AsUnicodeAndSize(unicode, &length); + if (!is_index && !is_buffer && !is_unicode && !is_bytes) { + /* Inline PyOS_FSPath() for better error messages. */ + _Py_IDENTIFIER(__fspath__); + PyObject *func = NULL; + + func = _PyObject_LookupSpecial(o, &PyId___fspath__); + if (NULL == func) { + goto error_exit; + } + + o = to_cleanup = PyObject_CallFunctionObjArgs(func, NULL); + Py_DECREF(func); + if (NULL == o) { + goto error_exit; + } + else if (PyUnicode_Check(o)) { + is_unicode = 1; + } + else if (PyBytes_Check(o)) { + is_bytes = 1; + } + else { + goto error_exit; + } + } + + if (is_unicode) { +#ifdef MS_WINDOWS + wide = PyUnicode_AsUnicodeAndSize(o, &length); if (!wide) { - Py_DECREF(unicode); - return 0; + goto exit; } if (length > 32767) { FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows"); - Py_DECREF(unicode); - return 0; + goto exit; } if (wcslen(wide) != length) { - FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character"); - Py_DECREF(unicode); - return 0; + FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s"); + goto exit; } path->wide = wide; - path->narrow = NULL; path->length = length; path->object = o; path->fd = -1; - path->cleanup = unicode; - return Py_CLEANUP_SUPPORTED; + ret = 1; + goto exit; #else - int converted = PyUnicode_FSConverter(unicode, &bytes); - Py_DECREF(unicode); - if (!converted) - bytes = NULL; + if (!PyUnicode_FSConverter(o, &bytes)) { + goto exit; + } #endif } - else { - PyErr_Clear(); - if (PyObject_CheckBuffer(o)) - bytes = PyBytes_FromObject(o); - else - bytes = NULL; + else if (is_bytes) { + bytes = o; + Py_INCREF(bytes); + } + else if (is_buffer) { + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "%s%s%s should be %s, not %.200s", + path->function_name ? path->function_name : "", + path->function_name ? ": " : "", + path->argument_name ? path->argument_name : "path", + path->allow_fd && path->nullable ? "string, bytes, os.PathLike, " + "integer or None" : + path->allow_fd ? "string, bytes, os.PathLike or integer" : + path->nullable ? "string, bytes, os.PathLike or None" : + "string, bytes or os.PathLike", + Py_TYPE(o)->tp_name)) { + goto exit; + } + bytes = PyBytes_FromObject(o); if (!bytes) { - PyErr_Clear(); - if (path->allow_fd) { - int fd; - int result = _fd_converter(o, &fd, - "string, bytes or integer"); - if (result) { - path->wide = NULL; - path->narrow = NULL; - path->length = 0; - path->object = o; - path->fd = fd; - return result; - } - } + goto exit; } } - - if (!bytes) { - if (!PyErr_Occurred()) - FORMAT_EXCEPTION(PyExc_TypeError, "illegal type for %s parameter"); - return 0; - } - + else if (is_index) { + if (!_fd_converter(o, &path->fd)) { + goto exit; + } + path->wide = NULL; #ifdef MS_WINDOWS - if (win32_warn_bytes_api()) { - Py_DECREF(bytes); - return 0; - } + path->narrow = FALSE; +#else + path->narrow = NULL; #endif - - length = PyBytes_GET_SIZE(bytes); -#ifdef MS_WINDOWS - if (length > MAX_PATH-1) { - FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows"); - Py_DECREF(bytes); - return 0; + path->length = 0; + path->object = o; + ret = 1; + goto exit; + } + else { + error_exit: + PyErr_Format(PyExc_TypeError, "%s%s%s should be %s, not %.200s", + path->function_name ? path->function_name : "", + path->function_name ? ": " : "", + path->argument_name ? path->argument_name : "path", + path->allow_fd && path->nullable ? "string, bytes, os.PathLike, " + "integer or None" : + path->allow_fd ? "string, bytes, os.PathLike or integer" : + path->nullable ? "string, bytes, os.PathLike or None" : + "string, bytes or os.PathLike", + Py_TYPE(o)->tp_name); + goto exit; } -#endif + length = PyBytes_GET_SIZE(bytes); narrow = PyBytes_AS_STRING(bytes); if ((size_t)length != strlen(narrow)) { FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s"); Py_DECREF(bytes); - return 0; + goto exit; + } + +#ifdef MS_WINDOWS + wo = PyUnicode_DecodeFSDefaultAndSize( + narrow, + length + ); + if (!wo) { + goto exit; } + wide = PyUnicode_AsWideCharString(wo, &length); + Py_DECREF(wo); + + if (!wide) { + goto exit; + } + if (length > 32767) { + FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows"); + goto exit; + } + if (wcslen(wide) != length) { + FORMAT_EXCEPTION(PyExc_ValueError, "embedded null character in %s"); + goto exit; + } + path->wide = wide; + path->narrow = TRUE; +#else path->wide = NULL; path->narrow = narrow; +#endif path->length = length; path->object = o; path->fd = -1; - path->cleanup = bytes; - return Py_CLEANUP_SUPPORTED; + if (bytes == o) { + Py_DECREF(bytes); + ret = 1; + } + else { + path->cleanup = bytes; + ret = Py_CLEANUP_SUPPORTED; + } + exit: + Py_XDECREF(to_cleanup); + return ret; } static void -argument_unavailable_error(char *function_name, char *argument_name) { +argument_unavailable_error(const char *function_name, const char *argument_name) +{ PyErr_Format(PyExc_NotImplementedError, "%s%s%s unavailable on this platform", (function_name != NULL) ? function_name : "", @@ -974,7 +1076,8 @@ dir_fd_unavailable(PyObject *o, void *p) } static int -fd_specified(char *function_name, int fd) { +fd_specified(const char *function_name, int fd) +{ if (fd == -1) return 0; @@ -983,7 +1086,8 @@ fd_specified(char *function_name, int fd) { } static int -follow_symlinks_specified(char *function_name, int follow_symlinks) { +follow_symlinks_specified(const char *function_name, int follow_symlinks) +{ if (follow_symlinks) return 0; @@ -992,8 +1096,13 @@ follow_symlinks_specified(char *function_name, int follow_symlinks) { } static int -path_and_dir_fd_invalid(char *function_name, path_t *path, int dir_fd) { - if (!path->narrow && !path->wide && (dir_fd != DEFAULT_DIR_FD)) { +path_and_dir_fd_invalid(const char *function_name, path_t *path, int dir_fd) +{ + if (!path->wide && (dir_fd != DEFAULT_DIR_FD) +#ifndef MS_WINDOWS + && !path->narrow +#endif + ) { PyErr_Format(PyExc_ValueError, "%s: can't specify dir_fd without matching path", function_name); @@ -1003,7 +1112,8 @@ path_and_dir_fd_invalid(char *function_name, path_t *path, int dir_fd) { } static int -dir_fd_and_fd_invalid(char *function_name, int dir_fd, int fd) { +dir_fd_and_fd_invalid(const char *function_name, int dir_fd, int fd) +{ if ((dir_fd != DEFAULT_DIR_FD) && (fd != -1)) { PyErr_Format(PyExc_ValueError, "%s: can't specify both dir_fd and fd", @@ -1014,8 +1124,9 @@ dir_fd_and_fd_invalid(char *function_name, int dir_fd, int fd) { } static int -fd_and_follow_symlinks_invalid(char *function_name, int fd, - int follow_symlinks) { +fd_and_follow_symlinks_invalid(const char *function_name, int fd, + int follow_symlinks) +{ if ((fd > 0) && (!follow_symlinks)) { PyErr_Format(PyExc_ValueError, "%s: cannot use fd and follow_symlinks together", @@ -1026,8 +1137,9 @@ fd_and_follow_symlinks_invalid(char *function_name, int fd, } static int -dir_fd_and_follow_symlinks_invalid(char *function_name, int dir_fd, - int follow_symlinks) { +dir_fd_and_follow_symlinks_invalid(const char *function_name, int dir_fd, + int follow_symlinks) +{ if ((dir_fd != DEFAULT_DIR_FD) && (!follow_symlinks)) { PyErr_Format(PyExc_ValueError, "%s: cannot use dir_fd and follow_symlinks together", @@ -1038,7 +1150,7 @@ dir_fd_and_follow_symlinks_invalid(char *function_name, int dir_fd, } #ifdef MS_WINDOWS - typedef PY_LONG_LONG Py_off_t; + typedef long long Py_off_t; #else typedef off_t Py_off_t; #endif @@ -1066,41 +1178,13 @@ PyLong_FromPy_off_t(Py_off_t offset) #endif } - -#if defined _MSC_VER && _MSC_VER >= 1400 && _MSC_VER < 1900 -/* Legacy implementation of _PyVerify_fd_dup2 while transitioning to - * MSVC 14.0. This should eventually be removed. (issue23524) - */ -#define IOINFO_L2E 5 -#define IOINFO_ARRAYS 64 -#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) -#define _NHANDLE_ (IOINFO_ARRAYS * IOINFO_ARRAY_ELTS) -#define _NO_CONSOLE_FILENO (intptr_t)-2 - -/* the special case of checking dup2. The target fd must be in a sensible range */ -static int -_PyVerify_fd_dup2(int fd1, int fd2) -{ - if (!_PyVerify_fd(fd1)) - return 0; - if (fd2 == _NO_CONSOLE_FILENO) - return 0; - if ((unsigned)fd2 < _NHANDLE_) - return 1; - else - return 0; -} -#else -#define _PyVerify_fd_dup2(fd1, fd2) (_PyVerify_fd(fd1) && (fd2) >= 0) -#endif - #ifdef MS_WINDOWS static int win32_get_reparse_tag(HANDLE reparse_point_handle, ULONG *reparse_tag) { - char target_buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; - REPARSE_DATA_BUFFER *rdb = (REPARSE_DATA_BUFFER *)target_buffer; + char target_buffer[_Py_MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; + _Py_REPARSE_DATA_BUFFER *rdb = (_Py_REPARSE_DATA_BUFFER *)target_buffer; DWORD n_bytes_returned; if (0 == DeviceIoControl( @@ -1159,7 +1243,7 @@ convertenviron(void) for (e = _wenviron; *e != NULL; e++) { PyObject *k; PyObject *v; - wchar_t *p = wcschr(*e, L'='); + const wchar_t *p = wcschr(*e, L'='); if (p == NULL) continue; k = PyUnicode_FromWideChar(*e, (Py_ssize_t)(p-*e)); @@ -1187,7 +1271,7 @@ convertenviron(void) for (e = environ; *e != NULL; e++) { PyObject *k; PyObject *v; - char *p = strchr(*e, '='); + const char *p = strchr(*e, '='); if (p == NULL) continue; k = PyBytes_FromStringAndSize(*e, (int)(p-*e)); @@ -1222,7 +1306,7 @@ posix_error(void) #ifdef MS_WINDOWS static PyObject * -win32_error(char* function, const char* filename) +win32_error(const char* function, const char* filename) { /* XXX We should pass the function name along in the future. (winreg.c also wants to pass the function name.) @@ -1237,7 +1321,7 @@ win32_error(char* function, const char* filename) } static PyObject * -win32_error_object(char* function, PyObject* filename) +win32_error_object(const char* function, PyObject* filename) { /* XXX - see win32_error for comments on 'function' */ errno = GetLastError(); @@ -1253,29 +1337,39 @@ win32_error_object(char* function, PyObject* filename) #endif /* MS_WINDOWS */ static PyObject * -path_error(path_t *path) +path_object_error(PyObject *path) { #ifdef MS_WINDOWS - return PyErr_SetExcFromWindowsErrWithFilenameObject(PyExc_OSError, - 0, path->object); + return PyErr_SetExcFromWindowsErrWithFilenameObject( + PyExc_OSError, 0, path); #else - return PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, path->object); + return PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, path); #endif } - static PyObject * -path_error2(path_t *path, path_t *path2) +path_object_error2(PyObject *path, PyObject *path2) { #ifdef MS_WINDOWS - return PyErr_SetExcFromWindowsErrWithFilenameObjects(PyExc_OSError, - 0, path->object, path2->object); + return PyErr_SetExcFromWindowsErrWithFilenameObjects( + PyExc_OSError, 0, path, path2); #else - return PyErr_SetFromErrnoWithFilenameObjects(PyExc_OSError, - path->object, path2->object); + return PyErr_SetFromErrnoWithFilenameObjects(PyExc_OSError, path, path2); #endif } +static PyObject * +path_error(path_t *path) +{ + return path_object_error(path->object); +} + +static PyObject * +path_error2(path_t *path, path_t *path2) +{ + return path_object_error2(path->object, path2->object); +} + /* POSIX generic methods */ @@ -1297,9 +1391,6 @@ posix_fildes_fd(int fd, int (*func)(int)) int res; int async_err = 0; - if (!_PyVerify_fd(fd)) - return posix_error(); - do { Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -1320,31 +1411,6 @@ posix_fildes_fd(int fd, int (*func)(int)) it also needs to set "magic" environment variables indicating the per-drive current directory, which are of the form =: */ static BOOL __stdcall -win32_chdir(LPCSTR path) -{ - char new_path[MAX_PATH]; - int result; - char env[4] = "=x:"; - - if(!SetCurrentDirectoryA(path)) - return FALSE; - result = GetCurrentDirectoryA(Py_ARRAY_LENGTH(new_path), new_path); - if (!result) - return FALSE; - /* In the ANSI API, there should not be any paths longer - than MAX_PATH-1 (not including the final null character). */ - assert(result < Py_ARRAY_LENGTH(new_path)); - if (strncmp(new_path, "\\\\", 2) == 0 || - strncmp(new_path, "//", 2) == 0) - /* UNC path, nothing to do. */ - return TRUE; - env[1] = new_path[0]; - return SetEnvironmentVariableA(env, new_path); -} - -/* The Unicode version differs from the ANSI version - since the current directory might exceed MAX_PATH characters */ -static BOOL __stdcall win32_wchdir(LPCWSTR path) { wchar_t path_buf[MAX_PATH], *new_path = path_buf; @@ -1390,33 +1456,10 @@ win32_wchdir(LPCWSTR path) #define HAVE_STAT_NSEC 1 #define HAVE_STRUCT_STAT_ST_FILE_ATTRIBUTES 1 -static BOOL -attributes_from_dir(LPCSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag) -{ - HANDLE hFindFile; - WIN32_FIND_DATAA FileData; - hFindFile = FindFirstFileA(pszFile, &FileData); - if (hFindFile == INVALID_HANDLE_VALUE) - return FALSE; - FindClose(hFindFile); - memset(info, 0, sizeof(*info)); - *reparse_tag = 0; - info->dwFileAttributes = FileData.dwFileAttributes; - info->ftCreationTime = FileData.ftCreationTime; - info->ftLastAccessTime = FileData.ftLastAccessTime; - info->ftLastWriteTime = FileData.ftLastWriteTime; - info->nFileSizeHigh = FileData.nFileSizeHigh; - info->nFileSizeLow = FileData.nFileSizeLow; -/* info->nNumberOfLinks = 1; */ - if (FileData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) - *reparse_tag = FileData.dwReserved0; - return TRUE; -} - static void -find_data_to_file_info_w(WIN32_FIND_DATAW *pFileData, - BY_HANDLE_FILE_INFORMATION *info, - ULONG *reparse_tag) +find_data_to_file_info(WIN32_FIND_DATAW *pFileData, + BY_HANDLE_FILE_INFORMATION *info, + ULONG *reparse_tag) { memset(info, 0, sizeof(*info)); info->dwFileAttributes = pFileData->dwFileAttributes; @@ -1433,7 +1476,7 @@ find_data_to_file_info_w(WIN32_FIND_DATAW *pFileData, } static BOOL -attributes_from_dir_w(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag) +attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag) { HANDLE hFindFile; WIN32_FIND_DATAW FileData; @@ -1441,7 +1484,7 @@ attributes_from_dir_w(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG * if (hFindFile == INVALID_HANDLE_VALUE) return FALSE; FindClose(hFindFile); - find_data_to_file_info_w(&FileData, info, reparse_tag); + find_data_to_file_info(&FileData, info, reparse_tag); return TRUE; } @@ -1458,7 +1501,7 @@ get_target_path(HANDLE hdl, wchar_t **target_path) if(!buf_size) return FALSE; - buf = PyMem_New(wchar_t, buf_size+1); + buf = (wchar_t *)PyMem_RawMalloc((buf_size + 1) * sizeof(wchar_t)); if (!buf) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; @@ -1468,12 +1511,12 @@ get_target_path(HANDLE hdl, wchar_t **target_path) buf, buf_size, VOLUME_NAME_DOS); if(!result_length) { - PyMem_Free(buf); + PyMem_RawFree(buf); return FALSE; } if(!CloseHandle(hdl)) { - PyMem_Free(buf); + PyMem_RawFree(buf); return FALSE; } @@ -1484,10 +1527,7 @@ get_target_path(HANDLE hdl, wchar_t **target_path) } static int -win32_xstat_impl_w(const wchar_t *path, struct _Py_stat_struct *result, - BOOL traverse); -static int -win32_xstat_impl(const char *path, struct _Py_stat_struct *result, +win32_xstat_impl(const wchar_t *path, struct _Py_stat_struct *result, BOOL traverse) { int code; @@ -1495,98 +1535,6 @@ win32_xstat_impl(const char *path, struct _Py_stat_struct *result, BY_HANDLE_FILE_INFORMATION info; ULONG reparse_tag = 0; wchar_t *target_path; - const char *dot; - - hFile = CreateFileA( - path, - FILE_READ_ATTRIBUTES, /* desired access */ - 0, /* share mode */ - NULL, /* security attributes */ - OPEN_EXISTING, - /* FILE_FLAG_BACKUP_SEMANTICS is required to open a directory */ - /* FILE_FLAG_OPEN_REPARSE_POINT does not follow the symlink. - Because of this, calls like GetFinalPathNameByHandle will return - the symlink path again and not the actual final path. */ - FILE_ATTRIBUTE_NORMAL|FILE_FLAG_BACKUP_SEMANTICS| - FILE_FLAG_OPEN_REPARSE_POINT, - NULL); - - if (hFile == INVALID_HANDLE_VALUE) { - /* Either the target doesn't exist, or we don't have access to - get a handle to it. If the former, we need to return an error. - If the latter, we can use attributes_from_dir. */ - DWORD lastError = GetLastError(); - if (lastError != ERROR_ACCESS_DENIED && - lastError != ERROR_SHARING_VIOLATION) - return -1; - /* Could not get attributes on open file. Fall back to - reading the directory. */ - if (!attributes_from_dir(path, &info, &reparse_tag)) - /* Very strange. This should not fail now */ - return -1; - if (info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { - if (traverse) { - /* Should traverse, but could not open reparse point handle */ - SetLastError(lastError); - return -1; - } - } - } else { - if (!GetFileInformationByHandle(hFile, &info)) { - CloseHandle(hFile); - return -1; - } - if (info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { - if (!win32_get_reparse_tag(hFile, &reparse_tag)) - return -1; - - /* Close the outer open file handle now that we're about to - reopen it with different flags. */ - if (!CloseHandle(hFile)) - return -1; - - if (traverse) { - /* In order to call GetFinalPathNameByHandle we need to open - the file without the reparse handling flag set. */ - hFile2 = CreateFileA( - path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, - NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL|FILE_FLAG_BACKUP_SEMANTICS, - NULL); - if (hFile2 == INVALID_HANDLE_VALUE) - return -1; - - if (!get_target_path(hFile2, &target_path)) - return -1; - - code = win32_xstat_impl_w(target_path, result, FALSE); - PyMem_Free(target_path); - return code; - } - } else - CloseHandle(hFile); - } - _Py_attribute_data_to_stat(&info, reparse_tag, result); - - /* Set S_IEXEC if it is an .exe, .bat, ... */ - dot = strrchr(path, '.'); - if (dot) { - if (stricmp(dot, ".bat") == 0 || stricmp(dot, ".cmd") == 0 || - stricmp(dot, ".exe") == 0 || stricmp(dot, ".com") == 0) - result->st_mode |= 0111; - } - return 0; -} - -static int -win32_xstat_impl_w(const wchar_t *path, struct _Py_stat_struct *result, - BOOL traverse) -{ - int code; - HANDLE hFile, hFile2; - BY_HANDLE_FILE_INFORMATION info; - ULONG reparse_tag = 0; - wchar_t *target_path; const wchar_t *dot; hFile = CreateFileW( @@ -1613,7 +1561,7 @@ win32_xstat_impl_w(const wchar_t *path, struct _Py_stat_struct *result, return -1; /* Could not get attributes on open file. Fall back to reading the directory. */ - if (!attributes_from_dir_w(path, &info, &reparse_tag)) + if (!attributes_from_dir(path, &info, &reparse_tag)) /* Very strange. This should not fail now */ return -1; if (info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { @@ -1651,8 +1599,8 @@ win32_xstat_impl_w(const wchar_t *path, struct _Py_stat_struct *result, if (!get_target_path(hFile2, &target_path)) return -1; - code = win32_xstat_impl_w(target_path, result, FALSE); - PyMem_Free(target_path); + code = win32_xstat_impl(target_path, result, FALSE); + PyMem_RawFree(target_path); return code; } } else @@ -1671,7 +1619,7 @@ win32_xstat_impl_w(const wchar_t *path, struct _Py_stat_struct *result, } static int -win32_xstat(const char *path, struct _Py_stat_struct *result, BOOL traverse) +win32_xstat(const wchar_t *path, struct _Py_stat_struct *result, BOOL traverse) { /* Protocol violation: we explicitly clear errno, instead of setting it to a POSIX error. Callers should use GetLastError. */ @@ -1679,16 +1627,6 @@ win32_xstat(const char *path, struct _Py_stat_struct *result, BOOL traverse) errno = 0; return code; } - -static int -win32_xstat_w(const wchar_t *path, struct _Py_stat_struct *result, BOOL traverse) -{ - /* Protocol violation: we explicitly clear errno, instead of - setting it to a POSIX error. Callers should use GetLastError. */ - int code = win32_xstat_impl_w(path, result, traverse); - errno = 0; - return code; -} /* About the following functions: win32_lstat_w, win32_stat, win32_stat_w In Posix, stat automatically traverses symlinks and returns the stat @@ -1698,34 +1636,20 @@ win32_xstat_w(const wchar_t *path, struct _Py_stat_struct *result, BOOL traverse Therefore, win32_lstat will get the attributes traditionally, and win32_stat will first explicitly resolve the symlink target and then will - call win32_lstat on that result. - - The _w represent Unicode equivalents of the aforementioned ANSI functions. */ + call win32_lstat on that result. */ static int -win32_lstat(const char* path, struct _Py_stat_struct *result) +win32_lstat(const wchar_t* path, struct _Py_stat_struct *result) { return win32_xstat(path, result, FALSE); } static int -win32_lstat_w(const wchar_t* path, struct _Py_stat_struct *result) -{ - return win32_xstat_w(path, result, FALSE); -} - -static int -win32_stat(const char* path, struct _Py_stat_struct *result) +win32_stat(const wchar_t* path, struct _Py_stat_struct *result) { return win32_xstat(path, result, TRUE); } -static int -win32_stat_w(const wchar_t* path, struct _Py_stat_struct *result) -{ - return win32_xstat_w(path, result, TRUE); -} - #endif /* MS_WINDOWS */ PyDoc_STRVAR(stat_result__doc__, @@ -2007,7 +1931,7 @@ _pystat_fromstructstat(STRUCT_STAT *st) PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long)st->st_mode)); #ifdef HAVE_LARGEFILE_SUPPORT PyStructSequence_SET_ITEM(v, 1, - PyLong_FromLongLong((PY_LONG_LONG)st->st_ino)); + PyLong_FromLongLong((long long)st->st_ino)); #else PyStructSequence_SET_ITEM(v, 1, PyLong_FromLong((long)st->st_ino)); #endif @@ -2026,7 +1950,7 @@ _pystat_fromstructstat(STRUCT_STAT *st) #endif #ifdef HAVE_LARGEFILE_SUPPORT PyStructSequence_SET_ITEM(v, 6, - PyLong_FromLongLong((PY_LONG_LONG)st->st_size)); + PyLong_FromLongLong((long long)st->st_size)); #else PyStructSequence_SET_ITEM(v, 6, PyLong_FromLong(st->st_size)); #endif @@ -2106,7 +2030,7 @@ _pystat_fromstructstat(STRUCT_STAT *st) static PyObject * -posix_do_stat(char *function_name, path_t *path, +posix_do_stat(const char *function_name, path_t *path, int dir_fd, int follow_symlinks) { STRUCT_STAT st; @@ -2125,28 +2049,26 @@ posix_do_stat(char *function_name, path_t *path, Py_BEGIN_ALLOW_THREADS if (path->fd != -1) result = FSTAT(path->fd, &st); - else #ifdef MS_WINDOWS - if (path->wide) { - if (follow_symlinks) - result = win32_stat_w(path->wide, &st); - else - result = win32_lstat_w(path->wide, &st); - } + else if (follow_symlinks) + result = win32_stat(path->wide, &st); else -#endif -#if defined(HAVE_LSTAT) || defined(MS_WINDOWS) + result = win32_lstat(path->wide, &st); +#else + else +#if defined(HAVE_LSTAT) if ((!follow_symlinks) && (dir_fd == DEFAULT_DIR_FD)) result = LSTAT(path->narrow, &st); else -#endif +#endif /* HAVE_LSTAT */ #ifdef HAVE_FSTATAT if ((dir_fd != DEFAULT_DIR_FD) || !follow_symlinks) result = fstatat(dir_fd, path->narrow, &st, follow_symlinks ? 0 : AT_SYMLINK_NOFOLLOW); else -#endif +#endif /* HAVE_FSTATAT */ result = STAT(path->narrow, &st); +#endif /* MS_WINDOWS */ Py_END_ALLOW_THREADS if (result != 0) { @@ -2426,8 +2348,8 @@ class id_t_converter(CConverter): type = 'id_t' format_unit = '" _Py_PARSE_PID "' -class Py_intptr_t_converter(CConverter): - type = 'Py_intptr_t' +class intptr_t_converter(CConverter): + type = 'intptr_t' format_unit = '" _Py_PARSE_INTPTR "' class Py_off_t_converter(CConverter): @@ -2454,7 +2376,7 @@ class sched_param_converter(CConverter): impl_by_reference = True; [python start generated code]*/ -/*[python end generated code: output=da39a3ee5e6b4b0d input=affe68316f160401]*/ +/*[python end generated code: output=da39a3ee5e6b4b0d input=418fce0e01144461]*/ /*[clinic input] @@ -2582,10 +2504,7 @@ os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd, #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (path->wide != NULL) - attr = GetFileAttributesW(path->wide); - else - attr = GetFileAttributesA(path->narrow); + attr = GetFileAttributesW(path->wide); Py_END_ALLOW_THREADS /* @@ -2709,11 +2628,8 @@ os_chdir_impl(PyObject *module, path_t *path) Py_BEGIN_ALLOW_THREADS #ifdef MS_WINDOWS - if (path->wide) - result = win32_wchdir(path->wide); - else - result = win32_chdir(path->narrow); - result = !result; /* on unix, success = 0, on windows, success = !0 */ + /* on unix, success = 0, on windows, success = !0 */ + result = !win32_wchdir(path->wide); #else #ifdef HAVE_FCHDIR if (path->fd != -1) @@ -2808,10 +2724,7 @@ os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd, #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (path->wide) - attr = GetFileAttributesW(path->wide); - else - attr = GetFileAttributesA(path->narrow); + attr = GetFileAttributesW(path->wide); if (attr == INVALID_FILE_ATTRIBUTES) result = 0; else { @@ -2819,10 +2732,7 @@ os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd, attr &= ~FILE_ATTRIBUTE_READONLY; else attr |= FILE_ATTRIBUTE_READONLY; - if (path->wide) - result = SetFileAttributesW(path->wide, attr); - else - result = SetFileAttributesA(path->narrow, attr); + result = SetFileAttributesW(path->wide, attr); } Py_END_ALLOW_THREADS @@ -3318,12 +3228,22 @@ posix_getcwd(int use_bytes) Py_BEGIN_ALLOW_THREADS do { buflen += chunk; +#ifdef MS_WINDOWS + if (buflen > INT_MAX) { + PyErr_NoMemory(); + break; + } +#endif tmpbuf = PyMem_RawRealloc(buf, buflen); if (tmpbuf == NULL) break; buf = tmpbuf; +#ifdef MS_WINDOWS + cwd = getcwd(buf, (int)buflen); +#else cwd = getcwd(buf, buflen); +#endif } while (cwd == NULL && errno == ERANGE); Py_END_ALLOW_THREADS @@ -3405,7 +3325,7 @@ os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, /*[clinic end generated code: output=7f00f6007fd5269a input=b0095ebbcbaa7e04]*/ { #ifdef MS_WINDOWS - BOOL result; + BOOL result = FALSE; #else int result; #endif @@ -3417,18 +3337,17 @@ os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, } #endif +#ifndef MS_WINDOWS if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) { PyErr_SetString(PyExc_NotImplementedError, "link: src and dst must be the same type"); return NULL; } +#endif #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (src->wide) - result = CreateHardLinkW(dst->wide, src->wide, NULL); - else - result = CreateHardLinkA(dst->narrow, src->narrow, NULL); + result = CreateHardLinkW(dst->wide, src->wide, NULL); Py_END_ALLOW_THREADS if (!result) @@ -3443,13 +3362,13 @@ os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, dst_dir_fd, dst->narrow, follow_symlinks ? AT_SYMLINK_FOLLOW : 0); else -#endif +#endif /* HAVE_LINKAT */ result = link(src->narrow, dst->narrow); Py_END_ALLOW_THREADS if (result) return path_error2(src, dst); -#endif +#endif /* MS_WINDOWS */ Py_RETURN_NONE; } @@ -3463,99 +3382,39 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) PyObject *v; HANDLE hFindFile = INVALID_HANDLE_VALUE; BOOL result; - WIN32_FIND_DATA FileData; - char namebuf[MAX_PATH+4]; /* Overallocate for "\*.*" */ - char *bufptr = namebuf; + wchar_t namebuf[MAX_PATH+4]; /* Overallocate for "\*.*" */ /* only claim to have space for MAX_PATH */ Py_ssize_t len = Py_ARRAY_LENGTH(namebuf)-4; - PyObject *po = NULL; wchar_t *wnamebuf = NULL; - if (!path->narrow) { - WIN32_FIND_DATAW wFileData; - wchar_t *po_wchars; - - if (!path->wide) { /* Default arg: "." */ - po_wchars = L"."; - len = 1; - } else { - po_wchars = path->wide; - len = wcslen(path->wide); - } - /* The +5 is so we can append "\\*.*\0" */ - wnamebuf = PyMem_New(wchar_t, len + 5); - if (!wnamebuf) { - PyErr_NoMemory(); - goto exit; - } - wcscpy(wnamebuf, po_wchars); - if (len > 0) { - wchar_t wch = wnamebuf[len-1]; - if (wch != SEP && wch != ALTSEP && wch != L':') - wnamebuf[len++] = SEP; - wcscpy(wnamebuf + len, L"*.*"); - } - if ((list = PyList_New(0)) == NULL) { - goto exit; - } - Py_BEGIN_ALLOW_THREADS - hFindFile = FindFirstFileW(wnamebuf, &wFileData); - Py_END_ALLOW_THREADS - if (hFindFile == INVALID_HANDLE_VALUE) { - int error = GetLastError(); - if (error == ERROR_FILE_NOT_FOUND) - goto exit; - Py_DECREF(list); - list = path_error(path); - goto exit; - } - do { - /* Skip over . and .. */ - if (wcscmp(wFileData.cFileName, L".") != 0 && - wcscmp(wFileData.cFileName, L"..") != 0) { - v = PyUnicode_FromWideChar(wFileData.cFileName, - wcslen(wFileData.cFileName)); - if (v == NULL) { - Py_DECREF(list); - list = NULL; - break; - } - if (PyList_Append(list, v) != 0) { - Py_DECREF(v); - Py_DECREF(list); - list = NULL; - break; - } - Py_DECREF(v); - } - Py_BEGIN_ALLOW_THREADS - result = FindNextFileW(hFindFile, &wFileData); - Py_END_ALLOW_THREADS - /* FindNextFile sets error to ERROR_NO_MORE_FILES if - it got to the end of the directory. */ - if (!result && GetLastError() != ERROR_NO_MORE_FILES) { - Py_DECREF(list); - list = path_error(path); - goto exit; - } - } while (result == TRUE); + WIN32_FIND_DATAW wFileData; + const wchar_t *po_wchars; + if (!path->wide) { /* Default arg: "." */ + po_wchars = L"."; + len = 1; + } else { + po_wchars = path->wide; + len = wcslen(path->wide); + } + /* The +5 is so we can append "\\*.*\0" */ + wnamebuf = PyMem_New(wchar_t, len + 5); + if (!wnamebuf) { + PyErr_NoMemory(); goto exit; } - strcpy(namebuf, path->narrow); - len = path->length; + wcscpy(wnamebuf, po_wchars); if (len > 0) { - char ch = namebuf[len-1]; - if (ch != '\\' && ch != '/' && ch != ':') - namebuf[len++] = '\\'; - strcpy(namebuf + len, "*.*"); + wchar_t wch = wnamebuf[len-1]; + if (wch != SEP && wch != ALTSEP && wch != L':') + wnamebuf[len++] = SEP; + wcscpy(wnamebuf + len, L"*.*"); + } + if ((list = PyList_New(0)) == NULL) { + goto exit; } - - if ((list = PyList_New(0)) == NULL) - return NULL; - Py_BEGIN_ALLOW_THREADS - hFindFile = FindFirstFile(namebuf, &FileData); + hFindFile = FindFirstFileW(wnamebuf, &wFileData); Py_END_ALLOW_THREADS if (hFindFile == INVALID_HANDLE_VALUE) { int error = GetLastError(); @@ -3567,9 +3426,13 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) } do { /* Skip over . and .. */ - if (strcmp(FileData.cFileName, ".") != 0 && - strcmp(FileData.cFileName, "..") != 0) { - v = PyBytes_FromString(FileData.cFileName); + if (wcscmp(wFileData.cFileName, L".") != 0 && + wcscmp(wFileData.cFileName, L"..") != 0) { + v = PyUnicode_FromWideChar(wFileData.cFileName, + wcslen(wFileData.cFileName)); + if (path->narrow && v) { + Py_SETREF(v, PyUnicode_EncodeFSDefault(v)); + } if (v == NULL) { Py_DECREF(list); list = NULL; @@ -3584,7 +3447,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) Py_DECREF(v); } Py_BEGIN_ALLOW_THREADS - result = FindNextFile(hFindFile, &FileData); + result = FindNextFileW(hFindFile, &wFileData); Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if it got to the end of the directory. */ @@ -3639,11 +3502,11 @@ _posix_listdir(path_t *path, PyObject *list) else #endif { - char *name; + const char *name; if (path->narrow) { name = path->narrow; - /* only return bytes if they specified a bytes-like object */ - return_str = !PyObject_CheckBuffer(path->object); + /* only return bytes if they specified a bytes object */ + return_str = !(PyBytes_Check(path->object)); } else { name = "."; @@ -3765,41 +3628,29 @@ static PyObject * os__getfullpathname_impl(PyObject *module, path_t *path) /*[clinic end generated code: output=bb8679d56845bc9b input=332ed537c29d0a3e]*/ { - if (!path->narrow) - { - wchar_t woutbuf[MAX_PATH], *woutbufp = woutbuf; - wchar_t *wtemp; - DWORD result; - PyObject *v; - - result = GetFullPathNameW(path->wide, - Py_ARRAY_LENGTH(woutbuf), - woutbuf, &wtemp); - if (result > Py_ARRAY_LENGTH(woutbuf)) { - woutbufp = PyMem_New(wchar_t, result); - if (!woutbufp) - return PyErr_NoMemory(); - result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp); - } - if (result) - v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp)); - else - v = win32_error_object("GetFullPathNameW", path->object); - if (woutbufp != woutbuf) - PyMem_Free(woutbufp); - return v; - } - else { - char outbuf[MAX_PATH]; - char *temp; + wchar_t woutbuf[MAX_PATH], *woutbufp = woutbuf; + wchar_t *wtemp; + DWORD result; + PyObject *v; - if (!GetFullPathName(path->narrow, Py_ARRAY_LENGTH(outbuf), - outbuf, &temp)) { - win32_error_object("GetFullPathName", path->object); - return NULL; - } - return PyBytes_FromString(outbuf); + result = GetFullPathNameW(path->wide, + Py_ARRAY_LENGTH(woutbuf), + woutbuf, &wtemp); + if (result > Py_ARRAY_LENGTH(woutbuf)) { + woutbufp = PyMem_New(wchar_t, result); + if (!woutbufp) + return PyErr_NoMemory(); + result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp); } + if (result) { + v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp)); + if (path->narrow) + Py_SETREF(v, PyUnicode_EncodeFSDefault(v)); + } else + v = win32_error_object("GetFullPathNameW", path->object); + if (woutbufp != woutbuf) + PyMem_Free(woutbufp); + return v; } @@ -3823,7 +3674,7 @@ os__getfinalpathname_impl(PyObject *module, PyObject *path) PyObject *result; const wchar_t *path_wchar; - path_wchar = _PyUnicode_AsUnicode(path); + path_wchar = PyUnicode_AsUnicode(path); if (path_wchar == NULL) return NULL; @@ -3881,10 +3732,7 @@ os__isdir_impl(PyObject *module, path_t *path) DWORD attributes; Py_BEGIN_ALLOW_THREADS - if (!path->narrow) - attributes = GetFileAttributesW(path->wide); - else - attributes = GetFileAttributesA(path->narrow); + attributes = GetFileAttributesW(path->wide); Py_END_ALLOW_THREADS if (attributes == INVALID_FILE_ATTRIBUTES) @@ -3910,7 +3758,8 @@ os__getvolumepathname_impl(PyObject *module, PyObject *path) /*[clinic end generated code: output=cbdcbd1059ceef4c input=7eacadc40acbda6b]*/ { PyObject *result; - wchar_t *path_wchar, *mountpath=NULL; + const wchar_t *path_wchar; + wchar_t *mountpath=NULL; size_t buflen; BOOL ret; @@ -3981,10 +3830,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd) #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (path->wide) - result = CreateDirectoryW(path->wide, NULL); - else - result = CreateDirectoryA(path->narrow, NULL); + result = CreateDirectoryW(path->wide, NULL); Py_END_ALLOW_THREADS if (!result) @@ -4004,7 +3850,7 @@ os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd) Py_END_ALLOW_THREADS if (result < 0) return path_error(path); -#endif +#endif /* MS_WINDOWS */ Py_RETURN_NONE; } @@ -4108,7 +3954,7 @@ os_setpriority_impl(PyObject *module, int which, int who, int priority) static PyObject * internal_rename(path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int is_replace) { - char *function_name = is_replace ? "replace" : "rename"; + const char *function_name = is_replace ? "replace" : "rename"; int dir_fd_specified; #ifdef MS_WINDOWS @@ -4127,31 +3973,28 @@ internal_rename(path_t *src, path_t *dst, int src_dir_fd, int dst_dir_fd, int is } #endif - if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) { - PyErr_Format(PyExc_ValueError, - "%s: src and dst must be the same type", function_name); - return NULL; - } - #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (src->wide) - result = MoveFileExW(src->wide, dst->wide, flags); - else - result = MoveFileExA(src->narrow, dst->narrow, flags); + result = MoveFileExW(src->wide, dst->wide, flags); Py_END_ALLOW_THREADS if (!result) return path_error2(src, dst); #else + if ((src->narrow && dst->wide) || (src->wide && dst->narrow)) { + PyErr_Format(PyExc_ValueError, + "%s: src and dst must be the same type", function_name); + return NULL; + } + Py_BEGIN_ALLOW_THREADS #ifdef HAVE_RENAMEAT if (dir_fd_specified) result = renameat(src_dir_fd, src->narrow, dst_dir_fd, dst->narrow); else #endif - result = rename(src->narrow, dst->narrow); + result = rename(src->narrow, dst->narrow); Py_END_ALLOW_THREADS if (result) @@ -4232,11 +4075,8 @@ os_rmdir_impl(PyObject *module, path_t *path, int dir_fd) Py_BEGIN_ALLOW_THREADS #ifdef MS_WINDOWS - if (path->wide) - result = RemoveDirectoryW(path->wide); - else - result = RemoveDirectoryA(path->narrow); - result = !result; /* Windows, success=1, UNIX, success=0 */ + /* Windows, success=1, UNIX, success=0 */ + result = !RemoveDirectoryW(path->wide); #else #ifdef HAVE_UNLINKAT if (dir_fd != DEFAULT_DIR_FD) @@ -4270,7 +4110,9 @@ os_system_impl(PyObject *module, Py_UNICODE *command) { long result; Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH result = _wsystem(command); + _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS return result; } @@ -4288,7 +4130,7 @@ os_system_impl(PyObject *module, PyObject *command) /*[clinic end generated code: output=290fc437dd4f33a0 input=86a58554ba6094af]*/ { long result; - char *bytes = PyBytes_AsString(command); + const char *bytes = PyBytes_AsString(command); Py_BEGIN_ALLOW_THREADS result = system(bytes); Py_END_ALLOW_THREADS @@ -4382,11 +4224,8 @@ os_unlink_impl(PyObject *module, path_t *path, int dir_fd) Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS - if (path->wide) - result = Py_DeleteFileW(path->wide); - else - result = DeleteFileA(path->narrow); - result = !result; /* Windows, success=1, UNIX, success=0 */ + /* Windows, success=1, UNIX, success=0 */ + result = !Py_DeleteFileW(path->wide); #else #ifdef HAVE_UNLINKAT if (dir_fd != DEFAULT_DIR_FD) @@ -4568,7 +4407,7 @@ typedef struct { #if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT) static int -utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks) +utime_dir_fd(utime_t *ut, int dir_fd, const char *path, int follow_symlinks) { #ifdef HAVE_UTIMENSAT int flags = follow_symlinks ? 0 : AT_SYMLINK_NOFOLLOW; @@ -4610,14 +4449,14 @@ utime_fd(utime_t *ut, int fd) #define PATH_UTIME_HAVE_FD 0 #endif +#if defined(HAVE_UTIMENSAT) || defined(HAVE_LUTIMES) +# define UTIME_HAVE_NOFOLLOW_SYMLINKS +#endif -#define UTIME_HAVE_NOFOLLOW_SYMLINKS \ - (defined(HAVE_UTIMENSAT) || defined(HAVE_LUTIMES)) - -#if UTIME_HAVE_NOFOLLOW_SYMLINKS +#ifdef UTIME_HAVE_NOFOLLOW_SYMLINKS static int -utime_nofollow_symlinks(utime_t *ut, char *path) +utime_nofollow_symlinks(utime_t *ut, const char *path) { #ifdef HAVE_UTIMENSAT UTIME_TO_TIMESPEC; @@ -4633,7 +4472,7 @@ utime_nofollow_symlinks(utime_t *ut, char *path) #ifndef MS_WINDOWS static int -utime_default(utime_t *ut, char *path) +utime_default(utime_t *ut, const char *path) { #ifdef HAVE_UTIMENSAT UTIME_TO_TIMESPEC; @@ -4776,7 +4615,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, utime.now = 1; } -#if !UTIME_HAVE_NOFOLLOW_SYMLINKS +#if !defined(UTIME_HAVE_NOFOLLOW_SYMLINKS) if (follow_symlinks_specified("utime", follow_symlinks)) goto exit; #endif @@ -4797,14 +4636,9 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (path->wide) - hFile = CreateFileW(path->wide, FILE_WRITE_ATTRIBUTES, 0, - NULL, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, NULL); - else - hFile = CreateFileA(path->narrow, FILE_WRITE_ATTRIBUTES, 0, - NULL, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS, NULL); + hFile = CreateFileW(path->wide, FILE_WRITE_ATTRIBUTES, 0, + NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL); Py_END_ALLOW_THREADS if (hFile == INVALID_HANDLE_VALUE) { path_error(path); @@ -4830,7 +4664,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, #else /* MS_WINDOWS */ Py_BEGIN_ALLOW_THREADS -#if UTIME_HAVE_NOFOLLOW_SYMLINKS +#ifdef UTIME_HAVE_NOFOLLOW_SYMLINKS if ((!follow_symlinks) && (dir_fd == DEFAULT_DIR_FD)) result = utime_nofollow_symlinks(&utime, path->narrow); else @@ -4890,9 +4724,15 @@ os__exit_impl(PyObject *module, int status) return NULL; /* Make gcc -Wall happy */ } +#if defined(HAVE_WEXECV) || defined(HAVE_WSPAWNV) +#define EXECV_CHAR wchar_t +#else +#define EXECV_CHAR char +#endif + #if defined(HAVE_EXECV) || defined(HAVE_SPAWNV) static void -free_string_array(char **array, Py_ssize_t count) +free_string_array(EXECV_CHAR **array, Py_ssize_t count) { Py_ssize_t i; for (i = 0; i < count; i++) @@ -4900,40 +4740,47 @@ free_string_array(char **array, Py_ssize_t count) PyMem_DEL(array); } -static -int fsconvert_strdup(PyObject *o, char**out) +static int +fsconvert_strdup(PyObject *o, EXECV_CHAR **out) { - PyObject *bytes; Py_ssize_t size; - if (!PyUnicode_FSConverter(o, &bytes)) + PyObject *ub; + int result = 0; +#if defined(HAVE_WEXECV) || defined(HAVE_WSPAWNV) + if (!PyUnicode_FSDecoder(o, &ub)) return 0; - size = PyBytes_GET_SIZE(bytes); - *out = PyMem_Malloc(size+1); - if (!*out) { - PyErr_NoMemory(); + *out = PyUnicode_AsWideCharString(ub, &size); + if (*out) + result = 1; +#else + if (!PyUnicode_FSConverter(o, &ub)) return 0; - } - memcpy(*out, PyBytes_AsString(bytes), size+1); - Py_DECREF(bytes); - return 1; + size = PyBytes_GET_SIZE(ub); + *out = PyMem_Malloc(size + 1); + if (*out) { + memcpy(*out, PyBytes_AS_STRING(ub), size + 1); + result = 1; + } else + PyErr_NoMemory(); +#endif + Py_DECREF(ub); + return result; } #endif #if defined(HAVE_EXECV) || defined (HAVE_FEXECVE) -static char** +static EXECV_CHAR** parse_envlist(PyObject* env, Py_ssize_t *envc_ptr) { - char **envlist; Py_ssize_t i, pos, envc; PyObject *keys=NULL, *vals=NULL; - PyObject *key, *val, *key2, *val2; - char *p, *k, *v; - size_t len; + PyObject *key, *val, *key2, *val2, *keyval; + EXECV_CHAR **envlist; i = PyMapping_Size(env); if (i < 0) return NULL; - envlist = PyMem_NEW(char *, i + 1); + envlist = PyMem_NEW(EXECV_CHAR *, i + 1); if (envlist == NULL) { PyErr_NoMemory(); return NULL; @@ -4957,36 +4804,35 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr) if (!key || !val) goto error; - if (PyUnicode_FSConverter(key, &key2) == 0) +#if defined(HAVE_WEXECV) || defined(HAVE_WSPAWNV) + if (!PyUnicode_FSDecoder(key, &key2)) goto error; - if (PyUnicode_FSConverter(val, &val2) == 0) { + if (!PyUnicode_FSDecoder(val, &val2)) { Py_DECREF(key2); goto error; } - - k = PyBytes_AS_STRING(key2); - v = PyBytes_AS_STRING(val2); - /* Search from index 1 because on Windows starting '=' is allowed for - defining hidden environment variables. */ - if (*k == '\0' || strchr(k + 1, '=') != NULL) { - Py_DECREF(key2); - Py_DECREF(val2); - PyErr_SetString(PyExc_ValueError, "illegal environment variable name"); + keyval = PyUnicode_FromFormat("%U=%U", key2, val2); +#else + if (!PyUnicode_FSConverter(key, &key2)) goto error; - } - len = PyBytes_GET_SIZE(key2) + PyBytes_GET_SIZE(val2) + 2; - - p = PyMem_NEW(char, len); - if (p == NULL) { - PyErr_NoMemory(); + if (!PyUnicode_FSConverter(val, &val2)) { Py_DECREF(key2); - Py_DECREF(val2); goto error; } - PyOS_snprintf(p, len, "%s=%s", k, v); - envlist[envc++] = p; + keyval = PyBytes_FromFormat("%s=%s", PyBytes_AS_STRING(key2), + PyBytes_AS_STRING(val2)); +#endif Py_DECREF(key2); Py_DECREF(val2); + if (!keyval) + goto error; + + if (!fsconvert_strdup(keyval, &envlist[envc++])) { + Py_DECREF(keyval); + goto error; + } + + Py_DECREF(keyval); } Py_DECREF(vals); Py_DECREF(keys); @@ -4998,17 +4844,15 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr) error: Py_XDECREF(keys); Py_XDECREF(vals); - while (--envc >= 0) - PyMem_DEL(envlist[envc]); - PyMem_DEL(envlist); + free_string_array(envlist, envc); return NULL; } -static char** +static EXECV_CHAR** parse_arglist(PyObject* argv, Py_ssize_t *argc) { int i; - char **argvlist = PyMem_NEW(char *, *argc+1); + EXECV_CHAR **argvlist = PyMem_NEW(EXECV_CHAR *, *argc+1); if (argvlist == NULL) { PyErr_NoMemory(); return NULL; @@ -5030,6 +4874,7 @@ fail: free_string_array(argvlist, *argc); return NULL; } + #endif @@ -5037,7 +4882,7 @@ fail: /*[clinic input] os.execv - path: FSConverter + path: path_t Path of executable file. argv: object Tuple or list of strings. @@ -5047,17 +4892,15 @@ Execute an executable path with arguments, replacing current process. [clinic start generated code]*/ static PyObject * -os_execv_impl(PyObject *module, PyObject *path, PyObject *argv) -/*[clinic end generated code: output=b21dc34deeb5b004 input=96041559925e5229]*/ +os_execv_impl(PyObject *module, path_t *path, PyObject *argv) +/*[clinic end generated code: output=3b52fec34cd0dafd input=9bac31efae07dac7]*/ { - char *path_char; - char **argvlist; + EXECV_CHAR **argvlist; Py_ssize_t argc; /* execv has two arguments: (path, argv), where argv is a list or tuple of strings. */ - path_char = PyBytes_AsString(path); if (!PyList_Check(argv) && !PyTuple_Check(argv)) { PyErr_SetString(PyExc_TypeError, "execv() arg 2 must be a tuple or list"); @@ -5073,8 +4916,20 @@ os_execv_impl(PyObject *module, PyObject *path, PyObject *argv) if (argvlist == NULL) { return NULL; } + if (!argvlist[0][0]) { + PyErr_SetString(PyExc_ValueError, + "execv() arg 2 first element cannot be empty"); + free_string_array(argvlist, argc); + return NULL; + } - execv(path_char, argvlist); + _Py_BEGIN_SUPPRESS_IPH +#ifdef HAVE_WEXECV + _wexecv(path->wide, argvlist); +#else + execv(path->narrow, argvlist); +#endif + _Py_END_SUPPRESS_IPH /* If we get here it's definitely an error */ @@ -5100,8 +4955,8 @@ static PyObject * os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env) /*[clinic end generated code: output=ff9fa8e4da8bde58 input=626804fa092606d9]*/ { - char **argvlist = NULL; - char **envlist; + EXECV_CHAR **argvlist = NULL; + EXECV_CHAR **envlist; Py_ssize_t argc, envc; /* execve has three arguments: (path, argv, env), where @@ -5114,6 +4969,11 @@ os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env) goto fail; } argc = PySequence_Size(argv); + if (argc < 1) { + PyErr_SetString(PyExc_ValueError, "execve: argv must not be empty"); + return NULL; + } + if (!PyMapping_Check(env)) { PyErr_SetString(PyExc_TypeError, "execve: environment must be a mapping object"); @@ -5124,40 +4984,50 @@ os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env) if (argvlist == NULL) { goto fail; } + if (!argvlist[0][0]) { + PyErr_SetString(PyExc_ValueError, + "execve: argv first element cannot be empty"); + goto fail; + } envlist = parse_envlist(env, &envc); if (envlist == NULL) goto fail; + _Py_BEGIN_SUPPRESS_IPH #ifdef HAVE_FEXECVE if (path->fd > -1) fexecve(path->fd, argvlist, envlist); else #endif +#ifdef HAVE_WEXECV + _wexecve(path->wide, argvlist, envlist); +#else execve(path->narrow, argvlist, envlist); +#endif + _Py_END_SUPPRESS_IPH /* If we get here it's definitely an error */ path_error(path); - while (--envc >= 0) - PyMem_DEL(envlist[envc]); - PyMem_DEL(envlist); + free_string_array(envlist, envc); fail: if (argvlist) free_string_array(argvlist, argc); return NULL; } + #endif /* HAVE_EXECV */ -#ifdef HAVE_SPAWNV +#if defined(HAVE_SPAWNV) || defined(HAVE_WSPAWNV) /*[clinic input] os.spawnv mode: int Mode of process creation. - path: FSConverter + path: path_t Path of executable file. argv: object Tuple or list of strings. @@ -5167,20 +5037,18 @@ Execute the program specified by path in a new process. [clinic start generated code]*/ static PyObject * -os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) -/*[clinic end generated code: output=c427c0ce40f10638 input=042c91dfc1e6debc]*/ +os_spawnv_impl(PyObject *module, int mode, path_t *path, PyObject *argv) +/*[clinic end generated code: output=71cd037a9d96b816 input=43224242303291be]*/ { - char *path_char; - char **argvlist; + EXECV_CHAR **argvlist; int i; Py_ssize_t argc; - Py_intptr_t spawnval; + intptr_t spawnval; PyObject *(*getitem)(PyObject *, Py_ssize_t); /* spawnv has three arguments: (mode, path, argv), where argv is a list or tuple of strings. */ - path_char = PyBytes_AsString(path); if (PyList_Check(argv)) { argc = PyList_Size(argv); getitem = PyList_GetItem; @@ -5194,18 +5062,13 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) "spawnv() arg 2 must be a tuple or list"); return NULL; } -#ifdef MS_WINDOWS - /* Avoid changing behavior in maintenance release, but - the previous Windows behavior was to crash, so this - is a "compatible" improvement. */ if (argc == 0) { PyErr_SetString(PyExc_ValueError, - "spawnv() arg 2 cannot be empty"); + "spawnv() arg 2 cannot be empty"); return NULL; } -#endif - argvlist = PyMem_NEW(char *, argc+1); + argvlist = PyMem_NEW(EXECV_CHAR *, argc+1); if (argvlist == NULL) { return PyErr_NoMemory(); } @@ -5218,7 +5081,6 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) "spawnv() arg 2 must contain only strings"); return NULL; } -#ifdef MS_WINDOWS if (i == 0 && !argvlist[0][0]) { free_string_array(argvlist, i); PyErr_SetString( @@ -5226,7 +5088,6 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) "spawnv() arg 2 first element cannot be empty"); return NULL; } -#endif } argvlist[argc] = NULL; @@ -5235,7 +5096,11 @@ os_spawnv_impl(PyObject *module, int mode, PyObject *path, PyObject *argv) Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - spawnval = _spawnv(mode, path_char, argvlist); +#ifdef HAVE_WSPAWNV + spawnval = _wspawnv(mode, path->wide, argvlist); +#else + spawnval = _spawnv(mode, path->narrow, argvlist); +#endif _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS @@ -5253,7 +5118,7 @@ os.spawnve mode: int Mode of process creation. - path: FSConverter + path: path_t Path of executable file. argv: object Tuple or list of strings. @@ -5265,16 +5130,15 @@ Execute the program specified by path in a new process. [clinic start generated code]*/ static PyObject * -os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, +os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv, PyObject *env) -/*[clinic end generated code: output=ebcfa5f7ba2f4219 input=02362fd937963f8f]*/ +/*[clinic end generated code: output=30fe85be56fe37ad input=3e40803ee7c4c586]*/ { - char *path_char; - char **argvlist; - char **envlist; + EXECV_CHAR **argvlist; + EXECV_CHAR **envlist; PyObject *res = NULL; Py_ssize_t argc, i, envc; - Py_intptr_t spawnval; + intptr_t spawnval; PyObject *(*getitem)(PyObject *, Py_ssize_t); Py_ssize_t lastarg = 0; @@ -5282,7 +5146,6 @@ os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, argv is a list or tuple of strings and env is a dictionary like posix.environ. */ - path_char = PyBytes_AsString(path); if (PyList_Check(argv)) { argc = PyList_Size(argv); getitem = PyList_GetItem; @@ -5296,13 +5159,18 @@ os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, "spawnve() arg 2 must be a tuple or list"); goto fail_0; } + if (argc == 0) { + PyErr_SetString(PyExc_ValueError, + "spawnve() arg 2 cannot be empty"); + goto fail_0; + } if (!PyMapping_Check(env)) { PyErr_SetString(PyExc_TypeError, "spawnve() arg 3 must be a mapping object"); goto fail_0; } - argvlist = PyMem_NEW(char *, argc+1); + argvlist = PyMem_NEW(EXECV_CHAR *, argc+1); if (argvlist == NULL) { PyErr_NoMemory(); goto fail_0; @@ -5314,6 +5182,13 @@ os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, lastarg = i; goto fail_1; } + if (i == 0 && !argvlist[0][0]) { + lastarg = i; + PyErr_SetString( + PyExc_ValueError, + "spawnv() arg 2 first element cannot be empty"); + goto fail_1; + } } lastarg = argc; argvlist[argc] = NULL; @@ -5327,7 +5202,11 @@ os_spawnve_impl(PyObject *module, int mode, PyObject *path, PyObject *argv, Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - spawnval = _spawnve(mode, path_char, argvlist, envlist); +#ifdef HAVE_WSPAWNV + spawnval = _wspawnve(mode, path->wide, argvlist, envlist); +#else + spawnval = _spawnve(mode, path->narrow, argvlist, envlist); +#endif _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS @@ -5791,14 +5670,14 @@ os.sched_getaffinity pid: pid_t / -Return the affinity of the process identified by pid. +Return the affinity of the process identified by pid (or the current process if zero). The affinity is returned as a set of CPU identifiers. [clinic start generated code]*/ static PyObject * os_sched_getaffinity_impl(PyObject *module, pid_t pid) -/*[clinic end generated code: output=f726f2c193c17a4f input=eaf161936874b8a1]*/ +/*[clinic end generated code: output=f726f2c193c17a4f input=983ce7cb4a565980]*/ { int cpu, ncpus, count; size_t setsize; @@ -5959,7 +5838,7 @@ os_openpty_impl(PyObject *module) if (_Py_set_inheritable(master_fd, 0, NULL) < 0) goto posix_error; -#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC) +#if !defined(__CYGWIN__) && !defined(__ANDROID__) && !defined(HAVE_DEV_PTC) ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */ ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */ #ifndef __hpux @@ -6071,6 +5950,7 @@ os_getgid_impl(PyObject *module) #endif /* HAVE_GETGID */ +#ifdef HAVE_GETPID /*[clinic input] os.getpid @@ -6083,6 +5963,7 @@ os_getpid_impl(PyObject *module) { return PyLong_FromPid(getpid()); } +#endif /* HAVE_GETPID */ #ifdef HAVE_GETGROUPLIST @@ -6284,7 +6165,7 @@ static PyObject * posix_initgroups(PyObject *self, PyObject *args) { PyObject *oname; - char *username; + const char *username; int res; #ifdef __APPLE__ int gid; @@ -6763,7 +6644,7 @@ static PyObject * os_setgroups(PyObject *module, PyObject *groups) /*[clinic end generated code: output=3fcb32aad58c5ecd input=fa742ca3daf85a7e]*/ { - Py_ssize_t i, len; + int i, len; gid_t grouplist[MAX_GROUPS]; if (!PySequence_Check(groups)) { @@ -6771,9 +6652,6 @@ os_setgroups(PyObject *module, PyObject *groups) return NULL; } len = PySequence_Size(groups); - if (len < 0) { - return NULL; - } if (len > MAX_GROUPS) { PyErr_SetString(PyExc_ValueError, "too many groups"); return NULL; @@ -7034,7 +6912,7 @@ os_waitpid_impl(PyObject *module, pid_t pid, int options) /* MS C has a variant of waitpid() that's usable for most purposes. */ /*[clinic input] os.waitpid - pid: Py_intptr_t + pid: intptr_t options: int / @@ -7047,11 +6925,11 @@ The options argument is ignored on Windows. [clinic start generated code]*/ static PyObject * -os_waitpid_impl(PyObject *module, Py_intptr_t pid, int options) -/*[clinic end generated code: output=15f1ce005a346b09 input=444c8f51cca5b862]*/ +os_waitpid_impl(PyObject *module, intptr_t pid, int options) +/*[clinic end generated code: output=be836b221271d538 input=40f2440c515410f8]*/ { int status; - Py_intptr_t res; + intptr_t res; int async_err = 0; do { @@ -7168,12 +7046,12 @@ win_readlink(PyObject *self, PyObject *args, PyObject *kwargs) DWORD n_bytes_returned; DWORD io_result; PyObject *po, *result; - int dir_fd; + int dir_fd; HANDLE reparse_point_handle; - char target_buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; - REPARSE_DATA_BUFFER *rdb = (REPARSE_DATA_BUFFER *)target_buffer; - wchar_t *print_name; + char target_buffer[_Py_MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; + _Py_REPARSE_DATA_BUFFER *rdb = (_Py_REPARSE_DATA_BUFFER *)target_buffer; + const wchar_t *print_name; static char *keywords[] = {"path", "dir_fd", NULL}; @@ -7183,7 +7061,7 @@ win_readlink(PyObject *self, PyObject *args, PyObject *kwargs) )) return NULL; - path = _PyUnicode_AsUnicode(po); + path = PyUnicode_AsUnicode(po); if (path == NULL) return NULL; @@ -7241,22 +7119,19 @@ win_readlink(PyObject *self, PyObject *args, PyObject *kwargs) #if defined(MS_WINDOWS) /* Grab CreateSymbolicLinkW dynamically from kernel32 */ -static DWORD (CALLBACK *Py_CreateSymbolicLinkW)(LPWSTR, LPWSTR, DWORD) = NULL; -static DWORD (CALLBACK *Py_CreateSymbolicLinkA)(LPSTR, LPSTR, DWORD) = NULL; +static DWORD (CALLBACK *Py_CreateSymbolicLinkW)(LPCWSTR, LPCWSTR, DWORD) = NULL; static int check_CreateSymbolicLink(void) { HINSTANCE hKernel32; /* only recheck */ - if (Py_CreateSymbolicLinkW && Py_CreateSymbolicLinkA) + if (Py_CreateSymbolicLinkW) return 1; hKernel32 = GetModuleHandleW(L"KERNEL32"); *(FARPROC*)&Py_CreateSymbolicLinkW = GetProcAddress(hKernel32, "CreateSymbolicLinkW"); - *(FARPROC*)&Py_CreateSymbolicLinkA = GetProcAddress(hKernel32, - "CreateSymbolicLinkA"); - return (Py_CreateSymbolicLinkW && Py_CreateSymbolicLinkA); + return Py_CreateSymbolicLinkW != NULL; } /* Remove the last portion of the path */ @@ -7273,20 +7148,6 @@ _dirnameW(WCHAR *path) *ptr = 0; } -/* Remove the last portion of the path */ -static void -_dirnameA(char *path) -{ - char *ptr; - - /* walk the path from the end until a backslash is encountered */ - for(ptr = path + strlen(path); ptr != path; ptr--) { - if (*ptr == '\\' || *ptr == '/') - break; - } - *ptr = 0; -} - /* Is this path absolute? */ static int _is_absW(const WCHAR *path) @@ -7295,14 +7156,6 @@ _is_absW(const WCHAR *path) } -/* Is this path absolute? */ -static int -_is_absA(const char *path) -{ - return path[0] == '\\' || path[0] == '/' || path[1] == ':'; - -} - /* join root and rest with a backslash */ static void _joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest) @@ -7324,30 +7177,9 @@ _joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest) wcscpy(dest_path+root_len, rest); } -/* join root and rest with a backslash */ -static void -_joinA(char *dest_path, const char *root, const char *rest) -{ - size_t root_len; - - if (_is_absA(rest)) { - strcpy(dest_path, rest); - return; - } - - root_len = strlen(root); - - strcpy(dest_path, root); - if(root_len) { - dest_path[root_len] = '\\'; - root_len++; - } - strcpy(dest_path+root_len, rest); -} - /* Return True if the path at src relative to dest is a directory */ static int -_check_dirW(WCHAR *src, WCHAR *dest) +_check_dirW(LPCWSTR src, LPCWSTR dest) { WIN32_FILE_ATTRIBUTE_DATA src_info; WCHAR dest_parent[MAX_PATH]; @@ -7363,25 +7195,6 @@ _check_dirW(WCHAR *src, WCHAR *dest) && src_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ); } - -/* Return True if the path at src relative to dest is a directory */ -static int -_check_dirA(char *src, char *dest) -{ - WIN32_FILE_ATTRIBUTE_DATA src_info; - char dest_parent[MAX_PATH]; - char src_resolved[MAX_PATH] = ""; - - /* dest_parent = os.path.dirname(dest) */ - strcpy(dest_parent, dest); - _dirnameA(dest_parent); - /* src_resolved = os.path.join(dest_parent, src) */ - _joinA(src_resolved, dest_parent, src); - return ( - GetFileAttributesExA(src_resolved, GetFileExInfoStandard, &src_info) - && src_info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY - ); -} #endif @@ -7441,18 +7254,10 @@ os_symlink_impl(PyObject *module, path_t *src, path_t *dst, #ifdef MS_WINDOWS Py_BEGIN_ALLOW_THREADS - if (dst->wide) { - /* if src is a directory, ensure target_is_directory==1 */ - target_is_directory |= _check_dirW(src->wide, dst->wide); - result = Py_CreateSymbolicLinkW(dst->wide, src->wide, - target_is_directory); - } - else { - /* if src is a directory, ensure target_is_directory==1 */ - target_is_directory |= _check_dirA(src->narrow, dst->narrow); - result = Py_CreateSymbolicLinkA(dst->narrow, src->narrow, - target_is_directory); - } + /* if src is a directory, ensure target_is_directory==1 */ + target_is_directory |= _check_dirW(src->wide, dst->wide); + result = Py_CreateSymbolicLinkW(dst->wide, src->wide, + target_is_directory); Py_END_ALLOW_THREADS if (!result) @@ -7757,16 +7562,15 @@ os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd) do { Py_BEGIN_ALLOW_THREADS #ifdef MS_WINDOWS - if (path->wide) - fd = _wopen(path->wide, flags, mode); - else -#endif + fd = _wopen(path->wide, flags, mode); +#else #ifdef HAVE_OPENAT if (dir_fd != DEFAULT_DIR_FD) fd = openat(dir_fd, path->narrow, flags, mode); else -#endif +#endif /* HAVE_OPENAT */ fd = open(path->narrow, flags, mode); +#endif /* !MS_WINDOWS */ Py_END_ALLOW_THREADS } while (fd < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); _Py_END_SUPPRESS_IPH @@ -7801,8 +7605,6 @@ os_close_impl(PyObject *module, int fd) /*[clinic end generated code: output=2fe4e93602822c14 input=2bc42451ca5c3223]*/ { int res; - if (!_PyVerify_fd(fd)) - return posix_error(); /* We do not want to retry upon EINTR: see http://lwn.net/Articles/576478/ * and http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html * for more details. @@ -7835,9 +7637,8 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high) int i; Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - for (i = fd_low; i < fd_high; i++) - if (_PyVerify_fd(i)) - close(i); + for (i = Py_MAX(fd_low, 0); i < fd_high; i++) + close(i); _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS Py_RETURN_NONE; @@ -7881,7 +7682,7 @@ os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable) int dup3_works = -1; #endif - if (!_PyVerify_fd_dup2(fd, fd2)) + if (fd < 0 || fd2 < 0) return posix_error(); /* dup2() can fail with EINTR if the target FD is already open, because it @@ -8005,10 +7806,6 @@ os_lseek_impl(PyObject *module, int fd, Py_off_t position, int how) { Py_off_t result; - if (!_PyVerify_fd(fd)) { - posix_error(); - return -1; - } #ifdef SEEK_SET /* Turn 0, 1, 2 into SEEK_{SET,CUR,END} */ switch (how) { @@ -8021,10 +7818,6 @@ os_lseek_impl(PyObject *module, int fd, Py_off_t position, int how) if (PyErr_Occurred()) return -1; - if (!_PyVerify_fd(fd)) { - posix_error(); - return -1; - } Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS @@ -8087,9 +7880,9 @@ os_read_impl(PyObject *module, int fd, Py_ssize_t length) #if (defined(HAVE_SENDFILE) && (defined(__FreeBSD__) || defined(__DragonFly__) \ || defined(__APPLE__))) || defined(HAVE_READV) || defined(HAVE_WRITEV) static Py_ssize_t -iov_setup(struct iovec **iov, Py_buffer **buf, PyObject *seq, Py_ssize_t cnt, int type) +iov_setup(struct iovec **iov, Py_buffer **buf, PyObject *seq, int cnt, int type) { - Py_ssize_t i, j; + int i, j; Py_ssize_t blen, total = 0; *iov = PyMem_New(struct iovec, cnt); @@ -8166,7 +7959,8 @@ static Py_ssize_t os_readv_impl(PyObject *module, int fd, PyObject *buffers) /*[clinic end generated code: output=792da062d3fcebdb input=e679eb5dbfa0357d]*/ { - Py_ssize_t cnt, n; + int cnt; + Py_ssize_t n; int async_err = 0; struct iovec *iov; Py_buffer *buf; @@ -8178,8 +7972,6 @@ os_readv_impl(PyObject *module, int fd, PyObject *buffers) } cnt = PySequence_Size(buffers); - if (cnt < 0) - return -1; if (iov_setup(&iov, &buf, buffers, cnt, PyBUF_WRITABLE) < 0) return -1; @@ -8233,10 +8025,6 @@ os_pread_impl(PyObject *module, int fd, int length, Py_off_t offset) buffer = PyBytes_FromStringAndSize((char *)NULL, length); if (buffer == NULL) return NULL; - if (!_PyVerify_fd(fd)) { - Py_DECREF(buffer); - return posix_error(); - } do { Py_BEGIN_ALLOW_THREADS @@ -8322,24 +8110,15 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict) "sendfile() headers must be a sequence"); return NULL; } else { - Py_ssize_t i = PySequence_Size(headers); - if (i < 0) + Py_ssize_t i = 0; /* Avoid uninitialized warning */ + sf.hdr_cnt = PySequence_Size(headers); + if (sf.hdr_cnt > 0 && + (i = iov_setup(&(sf.headers), &hbuf, + headers, sf.hdr_cnt, PyBUF_SIMPLE)) < 0) return NULL; - if (i > INT_MAX) { - PyErr_SetString(PyExc_OverflowError, - "sendfile() header is too large"); - return NULL; - } - if (i > 0) { - sf.hdr_cnt = (int)i; - i = iov_setup(&(sf.headers), &hbuf, - headers, sf.hdr_cnt, PyBUF_SIMPLE); - if (i < 0) - return NULL; #ifdef __APPLE__ - sbytes += i; + sbytes += i; #endif - } } } if (trailers != NULL) { @@ -8348,24 +8127,15 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict) "sendfile() trailers must be a sequence"); return NULL; } else { - Py_ssize_t i = PySequence_Size(trailers); - if (i < 0) - return NULL; - if (i > INT_MAX) { - PyErr_SetString(PyExc_OverflowError, - "sendfile() trailer is too large"); + Py_ssize_t i = 0; /* Avoid uninitialized warning */ + sf.trl_cnt = PySequence_Size(trailers); + if (sf.trl_cnt > 0 && + (i = iov_setup(&(sf.trailers), &tbuf, + trailers, sf.trl_cnt, PyBUF_SIMPLE)) < 0) return NULL; - } - if (i > 0) { - sf.trl_cnt = (int)i; - i = iov_setup(&(sf.trailers), &tbuf, - trailers, sf.trl_cnt, PyBUF_SIMPLE); - if (i < 0) - return NULL; #ifdef __APPLE__ - sbytes += i; + sbytes += i; #endif - } } } @@ -8417,7 +8187,7 @@ done: if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iiOn:sendfile", keywords, &out, &in, &offobj, &count)) return NULL; -#ifdef linux +#ifdef __linux__ if (offobj == Py_None) { do { Py_BEGIN_ALLOW_THREADS @@ -8497,8 +8267,6 @@ os_isatty_impl(PyObject *module, int fd) /*[clinic end generated code: output=6a48c8b4e644ca00 input=08ce94aa1eaf7b5e]*/ { int return_value; - if (!_PyVerify_fd(fd)) - return 0; _Py_BEGIN_SUPPRESS_IPH return_value = isatty(fd); _Py_END_SUPPRESS_IPH @@ -8535,16 +8303,18 @@ os_pipe_impl(PyObject *module) attr.bInheritHandle = FALSE; Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH ok = CreatePipe(&read, &write, &attr, 0); if (ok) { - fds[0] = _open_osfhandle((Py_intptr_t)read, _O_RDONLY); - fds[1] = _open_osfhandle((Py_intptr_t)write, _O_WRONLY); + fds[0] = _open_osfhandle((intptr_t)read, _O_RDONLY); + fds[1] = _open_osfhandle((intptr_t)write, _O_WRONLY); if (fds[0] == -1 || fds[1] == -1) { CloseHandle(read); CloseHandle(write); ok = 0; } } + _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS if (!ok) @@ -8635,7 +8405,7 @@ static Py_ssize_t os_writev_impl(PyObject *module, int fd, PyObject *buffers) /*[clinic end generated code: output=56565cfac3aac15b input=5b8d17fe4189d2fe]*/ { - Py_ssize_t cnt; + int cnt; Py_ssize_t result; int async_err = 0; struct iovec *iov; @@ -8647,8 +8417,6 @@ os_writev_impl(PyObject *module, int fd, PyObject *buffers) return -1; } cnt = PySequence_Size(buffers); - if (cnt < 0) - return -1; if (iov_setup(&iov, &buf, buffers, cnt, PyBUF_SIMPLE) < 0) { return -1; @@ -8692,11 +8460,6 @@ os_pwrite_impl(PyObject *module, int fd, Py_buffer *buffer, Py_off_t offset) Py_ssize_t size; int async_err = 0; - if (!_PyVerify_fd(fd)) { - posix_error(); - return -1; - } - do { Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -8879,9 +8642,6 @@ os_ftruncate_impl(PyObject *module, int fd, Py_off_t length) int result; int async_err = 0; - if (!_PyVerify_fd(fd)) - return posix_error(); - do { Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -8928,10 +8688,7 @@ os_truncate_impl(PyObject *module, path_t *path, Py_off_t length) Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS - if (path->wide) - fd = _wopen(path->wide, _O_WRONLY | _O_BINARY | _O_NOINHERIT); - else - fd = _open(path->narrow, _O_WRONLY | _O_BINARY | _O_NOINHERIT); + fd = _wopen(path->wide, _O_WRONLY | _O_BINARY | _O_NOINHERIT); if (fd < 0) result = -1; else { @@ -9076,35 +8833,22 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value) /*[clinic end generated code: output=d29a567d6b2327d2 input=ba586581c2e6105f]*/ { const wchar_t *env; - Py_ssize_t size; - /* Search from index 1 because on Windows starting '=' is allowed for - defining hidden environment variables. */ - if (PyUnicode_GET_LENGTH(name) == 0 || - PyUnicode_FindChar(name, '=', 1, PyUnicode_GET_LENGTH(name), 1) != -1) - { - PyErr_SetString(PyExc_ValueError, "illegal environment variable name"); - return NULL; - } PyObject *unicode = PyUnicode_FromFormat("%U=%U", name, value); if (unicode == NULL) { + PyErr_NoMemory(); return NULL; } - - env = PyUnicode_AsUnicodeAndSize(unicode, &size); - if (env == NULL) - goto error; - if (size > _MAX_ENV) { + if (_MAX_ENV < PyUnicode_GET_LENGTH(unicode)) { PyErr_Format(PyExc_ValueError, "the environment variable is longer than %u characters", _MAX_ENV); goto error; } - if (wcslen(env) != (size_t)size) { - PyErr_SetString(PyExc_ValueError, "embedded null character"); - goto error; - } + env = PyUnicode_AsUnicode(unicode); + if (env == NULL) + goto error; if (_wputenv(env)) { posix_error(); goto error; @@ -9134,15 +8878,12 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value) { PyObject *bytes = NULL; char *env; - const char *name_string = PyBytes_AS_STRING(name); - const char *value_string = PyBytes_AS_STRING(value); + const char *name_string = PyBytes_AsString(name); + const char *value_string = PyBytes_AsString(value); - if (strchr(name_string, '=') != NULL) { - PyErr_SetString(PyExc_ValueError, "illegal environment variable name"); - return NULL; - } bytes = PyBytes_FromFormat("%s=%s", name_string, value_string); if (bytes == NULL) { + PyErr_NoMemory(); return NULL; } @@ -9416,17 +9157,17 @@ _pystatvfs_fromstructstatvfs(struct statvfs st) { PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long) st.f_bsize)); PyStructSequence_SET_ITEM(v, 1, PyLong_FromLong((long) st.f_frsize)); PyStructSequence_SET_ITEM(v, 2, - PyLong_FromLongLong((PY_LONG_LONG) st.f_blocks)); + PyLong_FromLongLong((long long) st.f_blocks)); PyStructSequence_SET_ITEM(v, 3, - PyLong_FromLongLong((PY_LONG_LONG) st.f_bfree)); + PyLong_FromLongLong((long long) st.f_bfree)); PyStructSequence_SET_ITEM(v, 4, - PyLong_FromLongLong((PY_LONG_LONG) st.f_bavail)); + PyLong_FromLongLong((long long) st.f_bavail)); PyStructSequence_SET_ITEM(v, 5, - PyLong_FromLongLong((PY_LONG_LONG) st.f_files)); + PyLong_FromLongLong((long long) st.f_files)); PyStructSequence_SET_ITEM(v, 6, - PyLong_FromLongLong((PY_LONG_LONG) st.f_ffree)); + PyLong_FromLongLong((long long) st.f_ffree)); PyStructSequence_SET_ITEM(v, 7, - PyLong_FromLongLong((PY_LONG_LONG) st.f_favail)); + PyLong_FromLongLong((long long) st.f_favail)); PyStructSequence_SET_ITEM(v, 8, PyLong_FromLong((long) st.f_flag)); PyStructSequence_SET_ITEM(v, 9, PyLong_FromLong((long) st.f_namemax)); #endif @@ -9557,8 +9298,8 @@ os__getdiskusage_impl(PyObject *module, Py_UNICODE *path) * sufficiently pervasive that it's not worth the loss of readability. */ struct constdef { - char *name; - long value; + const char *name; + int value; }; static int @@ -9566,7 +9307,10 @@ conv_confname(PyObject *arg, int *valuep, struct constdef *table, size_t tablesize) { if (PyLong_Check(arg)) { - *valuep = PyLong_AS_LONG(arg); + int value = _PyLong_AsInt(arg); + if (value == -1 && PyErr_Occurred()) + return 0; + *valuep = value; return 1; } else { @@ -9581,7 +9325,7 @@ conv_confname(PyObject *arg, int *valuep, struct constdef *table, "configuration names must be strings or integers"); return 0; } - confname = _PyUnicode_AsString(arg); + confname = PyUnicode_AsUTF8(arg); if (confname == NULL) return 0; while (lo < hi) { @@ -10527,7 +10271,7 @@ cmp_constdefs(const void *v1, const void *v2) static int setup_confname_table(struct constdef *table, size_t tablesize, - char *tablename, PyObject *module) + const char *tablename, PyObject *module) { PyObject *d = NULL; size_t i; @@ -10598,31 +10342,8 @@ os_abort_impl(PyObject *module) } #ifdef MS_WINDOWS -/* AC 3.5: change to path_t? but that might change exceptions */ -PyDoc_STRVAR(win32_startfile__doc__, -"startfile(filepath [, operation])\n\ -\n\ -Start a file with its associated application.\n\ -\n\ -When \"operation\" is not specified or \"open\", this acts like\n\ -double-clicking the file in Explorer, or giving the file name as an\n\ -argument to the DOS \"start\" command: the file is opened with whatever\n\ -application (if any) its extension is associated.\n\ -When another \"operation\" is given, it specifies what should be done with\n\ -the file. A typical operation is \"print\".\n\ -\n\ -startfile returns as soon as the associated application is launched.\n\ -There is no option to wait for the application to close, and no way\n\ -to retrieve the application's exit status.\n\ -\n\ -The filepath is relative to the current directory. If you want to use\n\ -an absolute path, make sure the first character is not a slash (\"/\");\n\ -the underlying Win32 ShellExecute function doesn't work if it is."); - /* Grab ShellExecute dynamically from shell32 */ static int has_ShellExecute = -1; -static HINSTANCE (CALLBACK *Py_ShellExecuteA)(HWND, LPCSTR, LPCSTR, LPCSTR, - LPCSTR, INT); static HINSTANCE (CALLBACK *Py_ShellExecuteW)(HWND, LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR, INT); static int @@ -10636,12 +10357,9 @@ check_ShellExecute() hShell32 = LoadLibraryW(L"SHELL32"); Py_END_ALLOW_THREADS if (hShell32) { - *(FARPROC*)&Py_ShellExecuteA = GetProcAddress(hShell32, - "ShellExecuteA"); *(FARPROC*)&Py_ShellExecuteW = GetProcAddress(hShell32, "ShellExecuteW"); - has_ShellExecute = Py_ShellExecuteA && - Py_ShellExecuteW; + has_ShellExecute = Py_ShellExecuteW != NULL; } else { has_ShellExecute = 0; } @@ -10650,17 +10368,37 @@ check_ShellExecute() } +/*[clinic input] +os.startfile + filepath: path_t + operation: Py_UNICODE = NULL + +startfile(filepath [, operation]) + +Start a file with its associated application. + +When "operation" is not specified or "open", this acts like +double-clicking the file in Explorer, or giving the file name as an +argument to the DOS "start" command: the file is opened with whatever +application (if any) its extension is associated. +When another "operation" is given, it specifies what should be done with +the file. A typical operation is "print". + +startfile returns as soon as the associated application is launched. +There is no option to wait for the application to close, and no way +to retrieve the application's exit status. + +The filepath is relative to the current directory. If you want to use +an absolute path, make sure the first character is not a slash ("/"); +the underlying Win32 ShellExecute function doesn't work if it is. +[clinic start generated code]*/ + static PyObject * -win32_startfile(PyObject *self, PyObject *args) +os_startfile_impl(PyObject *module, path_t *filepath, Py_UNICODE *operation) +/*[clinic end generated code: output=912ceba79acfa1c9 input=63950bf2986380d0]*/ { - PyObject *ofilepath; - char *filepath; - char *operation = NULL; - wchar_t *wpath, *woperation; HINSTANCE rc; - PyObject *unipath, *uoperation = NULL; - if(!check_ShellExecute()) { /* If the OS doesn't have ShellExecute, return a NotImplementedError. */ @@ -10668,68 +10406,16 @@ win32_startfile(PyObject *self, PyObject *args) "startfile not available on this platform"); } - if (!PyArg_ParseTuple(args, "U|s:startfile", - &unipath, &operation)) { - PyErr_Clear(); - goto normal; - } - - if (operation) { - uoperation = PyUnicode_DecodeASCII(operation, - strlen(operation), NULL); - if (!uoperation) { - PyErr_Clear(); - operation = NULL; - goto normal; - } - } - - wpath = PyUnicode_AsUnicode(unipath); - if (wpath == NULL) - goto normal; - if (uoperation) { - woperation = PyUnicode_AsUnicode(uoperation); - if (woperation == NULL) - goto normal; - } - else - woperation = NULL; - Py_BEGIN_ALLOW_THREADS - rc = Py_ShellExecuteW((HWND)0, woperation, wpath, + rc = Py_ShellExecuteW((HWND)0, operation, filepath->wide, NULL, NULL, SW_SHOWNORMAL); Py_END_ALLOW_THREADS - Py_XDECREF(uoperation); if (rc <= (HINSTANCE)32) { - win32_error_object("startfile", unipath); - return NULL; - } - Py_INCREF(Py_None); - return Py_None; - -normal: - if (!PyArg_ParseTuple(args, "O&|s:startfile", - PyUnicode_FSConverter, &ofilepath, - &operation)) + win32_error_object("startfile", filepath->object); return NULL; - if (win32_warn_bytes_api()) { - Py_DECREF(ofilepath); - return NULL; - } - filepath = PyBytes_AsString(ofilepath); - Py_BEGIN_ALLOW_THREADS - rc = Py_ShellExecuteA((HWND)0, operation, filepath, - NULL, NULL, SW_SHOWNORMAL); - Py_END_ALLOW_THREADS - if (rc <= (HINSTANCE)32) { - PyObject *errval = win32_error("startfile", filepath); - Py_DECREF(ofilepath); - return errval; } - Py_DECREF(ofilepath); - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } #endif /* MS_WINDOWS */ @@ -10897,7 +10583,7 @@ os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute, for (i = 0; ; i++) { void *ptr; ssize_t result; - static Py_ssize_t buffer_sizes[] = {128, XATTR_SIZE_MAX, 0}; + static const Py_ssize_t buffer_sizes[] = {128, XATTR_SIZE_MAX, 0}; Py_ssize_t buffer_size = buffer_sizes[i]; if (!buffer_size) { path_error(path); @@ -11061,9 +10747,9 @@ os_listxattr_impl(PyObject *module, path_t *path, int follow_symlinks) name = path->narrow ? path->narrow : "."; for (i = 0; ; i++) { - char *start, *trace, *end; + const char *start, *trace, *end; ssize_t length; - static Py_ssize_t buffer_sizes[] = { 256, XATTR_LIST_MAX, 0 }; + static const Py_ssize_t buffer_sizes[] = { 256, XATTR_LIST_MAX, 0 }; Py_ssize_t buffer_size = buffer_sizes[i]; if (!buffer_size) { /* ERANGE */ @@ -11154,8 +10840,7 @@ os_urandom_impl(PyObject *module, Py_ssize_t size) if (bytes == NULL) return NULL; - result = _PyOS_URandom(PyBytes_AS_STRING(bytes), - PyBytes_GET_SIZE(bytes)); + result = _PyOS_URandom(PyBytes_AS_STRING(bytes), PyBytes_GET_SIZE(bytes)); if (result == -1) { Py_DECREF(bytes); return NULL; @@ -11275,11 +10960,15 @@ get_terminal_size(PyObject *self, PyObject *args) os.cpu_count Return the number of CPUs in the system; return None if indeterminable. + +This number is not equivalent to the number of CPUs the current process can +use. The number of usable CPUs can be obtained with +``len(os.sched_getaffinity(0))`` [clinic start generated code]*/ static PyObject * os_cpu_count_impl(PyObject *module) -/*[clinic end generated code: output=5fc29463c3936a9c input=d55e2f8f3823a628]*/ +/*[clinic end generated code: output=5fc29463c3936a9c input=e7c8f4ba6dbbadd3]*/ { int ncpu = 0; #ifdef MS_WINDOWS @@ -11323,11 +11012,6 @@ os_get_inheritable_impl(PyObject *module, int fd) /*[clinic end generated code: output=0445e20e149aa5b8 input=89ac008dc9ab6b95]*/ { int return_value; - if (!_PyVerify_fd(fd)) { - posix_error(); - return -1; - } - _Py_BEGIN_SUPPRESS_IPH return_value = _Py_get_inheritable(fd); _Py_END_SUPPRESS_IPH @@ -11349,8 +11033,6 @@ os_set_inheritable_impl(PyObject *module, int fd, int inheritable) /*[clinic end generated code: output=f1b1918a2f3c38c2 input=9ceaead87a1e2402]*/ { int result; - if (!_PyVerify_fd(fd)) - return posix_error(); _Py_BEGIN_SUPPRESS_IPH result = _Py_set_inheritable(fd, inheritable, NULL); @@ -11364,15 +11046,15 @@ os_set_inheritable_impl(PyObject *module, int fd, int inheritable) #ifdef MS_WINDOWS /*[clinic input] os.get_handle_inheritable -> bool - handle: Py_intptr_t + handle: intptr_t / Get the close-on-exe flag of the specified file descriptor. [clinic start generated code]*/ static int -os_get_handle_inheritable_impl(PyObject *module, Py_intptr_t handle) -/*[clinic end generated code: output=9e5389b0aa0916ce input=5f7759443aae3dc5]*/ +os_get_handle_inheritable_impl(PyObject *module, intptr_t handle) +/*[clinic end generated code: output=36be5afca6ea84d8 input=cfe99f9c05c70ad1]*/ { DWORD flags; @@ -11387,7 +11069,7 @@ os_get_handle_inheritable_impl(PyObject *module, Py_intptr_t handle) /*[clinic input] os.set_handle_inheritable - handle: Py_intptr_t + handle: intptr_t inheritable: bool / @@ -11395,9 +11077,9 @@ Set the inheritable flag of the specified handle. [clinic start generated code]*/ static PyObject * -os_set_handle_inheritable_impl(PyObject *module, Py_intptr_t handle, +os_set_handle_inheritable_impl(PyObject *module, intptr_t handle, int inheritable) -/*[clinic end generated code: output=b1e67bfa3213d745 input=e64b2b2730469def]*/ +/*[clinic end generated code: output=021d74fe6c96baa3 input=7a7641390d8364fc]*/ { DWORD flags = inheritable ? HANDLE_FLAG_INHERIT : 0; if (!SetHandleInformation((HANDLE)handle, HANDLE_FLAG_INHERIT, flags)) { @@ -11424,9 +11106,6 @@ posix_get_blocking(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "i:get_blocking", &fd)) return NULL; - if (!_PyVerify_fd(fd)) - return posix_error(); - _Py_BEGIN_SUPPRESS_IPH blocking = _Py_get_blocking(fd); _Py_END_SUPPRESS_IPH @@ -11450,9 +11129,6 @@ posix_set_blocking(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "ii:set_blocking", &fd, &blocking)) return NULL; - if (!_PyVerify_fd(fd)) - return posix_error(); - _Py_BEGIN_SUPPRESS_IPH result = _Py_set_blocking(fd, blocking); _Py_END_SUPPRESS_IPH @@ -11533,41 +11209,26 @@ static PyObject * DirEntry_fetch_stat(DirEntry *self, int follow_symlinks) { int result; - struct _Py_stat_struct st; + STRUCT_STAT st; + PyObject *ub; #ifdef MS_WINDOWS - wchar_t *path; - - path = PyUnicode_AsUnicode(self->path); - if (!path) - return NULL; - - if (follow_symlinks) - result = win32_stat_w(path, &st); - else - result = win32_lstat_w(path, &st); - - if (result != 0) { - return PyErr_SetExcFromWindowsErrWithFilenameObject(PyExc_OSError, - 0, self->path); - } + if (PyUnicode_FSDecoder(self->path, &ub)) { + const wchar_t *path = PyUnicode_AsUnicode(ub); #else /* POSIX */ - PyObject *bytes; - char *path; - - if (!PyUnicode_FSConverter(self->path, &bytes)) + if (PyUnicode_FSConverter(self->path, &ub)) { + const char *path = PyBytes_AS_STRING(ub); +#endif + if (follow_symlinks) + result = STAT(path, &st); + else + result = LSTAT(path, &st); + Py_DECREF(ub); + } else return NULL; - path = PyBytes_AS_STRING(bytes); - - if (follow_symlinks) - result = STAT(path, &st); - else - result = LSTAT(path, &st); - Py_DECREF(bytes); if (result != 0) - return PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, self->path); -#endif + return path_object_error(self->path); return _pystat_fromstructstat(&st); } @@ -11737,25 +11398,27 @@ DirEntry_inode(DirEntry *self) { #ifdef MS_WINDOWS if (!self->got_file_index) { - wchar_t *path; - struct _Py_stat_struct stat; + PyObject *unicode; + const wchar_t *path; + STRUCT_STAT stat; + int result; - path = PyUnicode_AsUnicode(self->path); - if (!path) + if (!PyUnicode_FSDecoder(self->path, &unicode)) return NULL; + path = PyUnicode_AsUnicode(unicode); + result = LSTAT(path, &stat); + Py_DECREF(unicode); - if (win32_lstat_w(path, &stat) != 0) { - return PyErr_SetExcFromWindowsErrWithFilenameObject(PyExc_OSError, - 0, self->path); - } + if (result != 0) + return path_object_error(self->path); self->win32_file_index = stat.st_ino; self->got_file_index = 1; } - return PyLong_FromLongLong((PY_LONG_LONG)self->win32_file_index); + return PyLong_FromLongLong((long long)self->win32_file_index); #else /* POSIX */ #ifdef HAVE_LARGEFILE_SUPPORT - return PyLong_FromLongLong((PY_LONG_LONG)self->d_ino); + return PyLong_FromLongLong((long long)self->d_ino); #else return PyLong_FromLong((long)self->d_ino); #endif @@ -11768,6 +11431,13 @@ DirEntry_repr(DirEntry *self) return PyUnicode_FromFormat("", self->name); } +static PyObject * +DirEntry_fspath(DirEntry *self) +{ + Py_INCREF(self->path); + return self->path; +} + static PyMemberDef DirEntry_members[] = { {"name", T_OBJECT_EX, offsetof(DirEntry, name), READONLY, "the entry's base filename, relative to scandir() \"path\" argument"}, @@ -11792,6 +11462,9 @@ static PyMethodDef DirEntry_methods[] = { {"inode", (PyCFunction)DirEntry_inode, METH_NOARGS, "return inode of the entry; cached per entry", }, + {"__fspath__", (PyCFunction)DirEntry_fspath, METH_NOARGS, + "returns the path for the entry", + }, {NULL} }; @@ -11831,7 +11504,7 @@ static PyTypeObject DirEntryType = { #ifdef MS_WINDOWS static wchar_t * -join_path_filenameW(wchar_t *path_wide, wchar_t* filename) +join_path_filenameW(const wchar_t *path_wide, const wchar_t *filename) { Py_ssize_t path_len; Py_ssize_t size; @@ -11883,6 +11556,11 @@ DirEntry_from_find_data(path_t *path, WIN32_FIND_DATAW *dataW) entry->name = PyUnicode_FromWideChar(dataW->cFileName, -1); if (!entry->name) goto error; + if (path->narrow) { + Py_SETREF(entry->name, PyUnicode_EncodeFSDefault(entry->name)); + if (!entry->name) + goto error; + } joined_path = join_path_filenameW(path->wide, dataW->cFileName); if (!joined_path) @@ -11892,8 +11570,13 @@ DirEntry_from_find_data(path_t *path, WIN32_FIND_DATAW *dataW) PyMem_Free(joined_path); if (!entry->path) goto error; + if (path->narrow) { + Py_SETREF(entry->path, PyUnicode_EncodeFSDefault(entry->path)); + if (!entry->path) + goto error; + } - find_data_to_file_info_w(dataW, &file_info, &reparse_tag); + find_data_to_file_info(dataW, &file_info, &reparse_tag); _Py_attribute_data_to_stat(&file_info, reparse_tag, &entry->win32_lstat); return (PyObject *)entry; @@ -11906,7 +11589,7 @@ error: #else /* POSIX */ static char * -join_path_filename(char *path_narrow, char* filename, Py_ssize_t filename_len) +join_path_filename(const char *path_narrow, const char* filename, Py_ssize_t filename_len) { Py_ssize_t path_len; Py_ssize_t size; @@ -11938,7 +11621,7 @@ join_path_filename(char *path_narrow, char* filename, Py_ssize_t filename_len) } static PyObject * -DirEntry_from_posix_info(path_t *path, char *name, Py_ssize_t name_len, +DirEntry_from_posix_info(path_t *path, const char *name, Py_ssize_t name_len, ino_t d_ino #ifdef HAVE_DIRENT_D_TYPE , unsigned char d_type @@ -11960,7 +11643,7 @@ DirEntry_from_posix_info(path_t *path, char *name, Py_ssize_t name_len, if (!joined_path) goto error; - if (!path->narrow || !PyObject_CheckBuffer(path->object)) { + if (!path->narrow || !PyBytes_Check(path->object)) { entry->name = PyUnicode_DecodeFSDefaultAndSize(name, name_len); entry->path = PyUnicode_DecodeFSDefault(joined_path); } @@ -12001,8 +11684,14 @@ typedef struct { #ifdef MS_WINDOWS +static int +ScandirIterator_is_closed(ScandirIterator *iterator) +{ + return iterator->handle == INVALID_HANDLE_VALUE; +} + static void -ScandirIterator_close(ScandirIterator *iterator) +ScandirIterator_closedir(ScandirIterator *iterator) { HANDLE handle = iterator->handle; @@ -12022,7 +11711,7 @@ ScandirIterator_iternext(ScandirIterator *iterator) BOOL success; PyObject *entry; - /* Happens if the iterator is iterated twice */ + /* Happens if the iterator is iterated twice, or closed explicitly */ if (iterator->handle == INVALID_HANDLE_VALUE) return NULL; @@ -12053,14 +11742,20 @@ ScandirIterator_iternext(ScandirIterator *iterator) } /* Error or no more files */ - ScandirIterator_close(iterator); + ScandirIterator_closedir(iterator); return NULL; } #else /* POSIX */ +static int +ScandirIterator_is_closed(ScandirIterator *iterator) +{ + return !iterator->dirp; +} + static void -ScandirIterator_close(ScandirIterator *iterator) +ScandirIterator_closedir(ScandirIterator *iterator) { DIR *dirp = iterator->dirp; @@ -12082,7 +11777,7 @@ ScandirIterator_iternext(ScandirIterator *iterator) int is_dot; PyObject *entry; - /* Happens if the iterator is iterated twice */ + /* Happens if the iterator is iterated twice, or closed explicitly */ if (!iterator->dirp) return NULL; @@ -12119,21 +11814,76 @@ ScandirIterator_iternext(ScandirIterator *iterator) } /* Error or no more files */ - ScandirIterator_close(iterator); + ScandirIterator_closedir(iterator); return NULL; } #endif +static PyObject * +ScandirIterator_close(ScandirIterator *self, PyObject *args) +{ + ScandirIterator_closedir(self); + Py_RETURN_NONE; +} + +static PyObject * +ScandirIterator_enter(PyObject *self, PyObject *args) +{ + Py_INCREF(self); + return self; +} + +static PyObject * +ScandirIterator_exit(ScandirIterator *self, PyObject *args) +{ + ScandirIterator_closedir(self); + Py_RETURN_NONE; +} + static void -ScandirIterator_dealloc(ScandirIterator *iterator) +ScandirIterator_finalize(ScandirIterator *iterator) { - ScandirIterator_close(iterator); - Py_XDECREF(iterator->path.object); + PyObject *error_type, *error_value, *error_traceback; + + /* Save the current exception, if any. */ + PyErr_Fetch(&error_type, &error_value, &error_traceback); + + if (!ScandirIterator_is_closed(iterator)) { + ScandirIterator_closedir(iterator); + + if (PyErr_ResourceWarning((PyObject *)iterator, 1, + "unclosed scandir iterator %R", iterator)) { + /* Spurious errors can appear at shutdown */ + if (PyErr_ExceptionMatches(PyExc_Warning)) { + PyErr_WriteUnraisable((PyObject *) iterator); + } + } + } + + Py_CLEAR(iterator->path.object); path_cleanup(&iterator->path); + + /* Restore the saved exception. */ + PyErr_Restore(error_type, error_value, error_traceback); +} + +static void +ScandirIterator_dealloc(ScandirIterator *iterator) +{ + if (PyObject_CallFinalizerFromDealloc((PyObject *)iterator) < 0) + return; + Py_TYPE(iterator)->tp_free((PyObject *)iterator); } +static PyMethodDef ScandirIterator_methods[] = { + {"__enter__", (PyCFunction)ScandirIterator_enter, METH_NOARGS}, + {"__exit__", (PyCFunction)ScandirIterator_exit, METH_VARARGS}, + {"close", (PyCFunction)ScandirIterator_close, METH_NOARGS}, + {NULL} +}; + static PyTypeObject ScandirIteratorType = { PyVarObject_HEAD_INIT(NULL, 0) MODNAME ".ScandirIterator", /* tp_name */ @@ -12155,7 +11905,8 @@ static PyTypeObject ScandirIteratorType = { 0, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ + Py_TPFLAGS_DEFAULT + | Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */ 0, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ @@ -12163,6 +11914,27 @@ static PyTypeObject ScandirIteratorType = { 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)ScandirIterator_iternext, /* tp_iternext */ + ScandirIterator_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ + 0, /* tp_del */ + 0, /* tp_version_tag */ + (destructor)ScandirIterator_finalize, /* tp_finalize */ }; static PyObject * @@ -12173,7 +11945,7 @@ posix_scandir(PyObject *self, PyObject *args, PyObject *kwargs) #ifdef MS_WINDOWS wchar_t *path_strW; #else - char *path; + const char *path; #endif iterator = PyObject_New(ScandirIterator, &ScandirIteratorType); @@ -12200,11 +11972,6 @@ posix_scandir(PyObject *self, PyObject *args, PyObject *kwargs) Py_XINCREF(iterator->path.object); #ifdef MS_WINDOWS - if (iterator->path.narrow) { - PyErr_SetString(PyExc_TypeError, - "os.scandir() doesn't support bytes path on Windows, use Unicode instead"); - goto error; - } iterator->first_time = 1; path_strW = join_path_filenameW(iterator->path.wide, L"*.*"); @@ -12245,6 +12012,132 @@ error: return NULL; } +/* + Return the file system path representation of the object. + + If the object is str or bytes, then allow it to pass through with + an incremented refcount. If the object defines __fspath__(), then + return the result of that method. All other types raise a TypeError. +*/ +PyObject * +PyOS_FSPath(PyObject *path) +{ + /* For error message reasons, this function is manually inlined in + path_converter(). */ + _Py_IDENTIFIER(__fspath__); + PyObject *func = NULL; + PyObject *path_repr = NULL; + + if (PyUnicode_Check(path) || PyBytes_Check(path)) { + Py_INCREF(path); + return path; + } + + func = _PyObject_LookupSpecial(path, &PyId___fspath__); + if (NULL == func) { + return PyErr_Format(PyExc_TypeError, + "expected str, bytes or os.PathLike object, " + "not %.200s", + Py_TYPE(path)->tp_name); + } + + path_repr = PyObject_CallFunctionObjArgs(func, NULL); + Py_DECREF(func); + if (NULL == path_repr) { + return NULL; + } + + if (!(PyUnicode_Check(path_repr) || PyBytes_Check(path_repr))) { + PyErr_Format(PyExc_TypeError, + "expected %.200s.__fspath__() to return str or bytes, " + "not %.200s", Py_TYPE(path)->tp_name, + Py_TYPE(path_repr)->tp_name); + Py_DECREF(path_repr); + return NULL; + } + + return path_repr; +} + +/*[clinic input] +os.fspath + + path: object + +Return the file system path representation of the object. + +If the object is str or bytes, then allow it to pass through as-is. If the +object defines __fspath__(), then return the result of that method. All other +types raise a TypeError. +[clinic start generated code]*/ + +static PyObject * +os_fspath_impl(PyObject *module, PyObject *path) +/*[clinic end generated code: output=c3c3b78ecff2914f input=e357165f7b22490f]*/ +{ + return PyOS_FSPath(path); +} + +#ifdef HAVE_GETRANDOM_SYSCALL +/*[clinic input] +os.getrandom + + size: Py_ssize_t + flags: int=0 + +Obtain a series of random bytes. +[clinic start generated code]*/ + +static PyObject * +os_getrandom_impl(PyObject *module, Py_ssize_t size, int flags) +/*[clinic end generated code: output=b3a618196a61409c input=59bafac39c594947]*/ +{ + PyObject *bytes; + Py_ssize_t n; + + if (size < 0) { + errno = EINVAL; + return posix_error(); + } + + bytes = PyBytes_FromStringAndSize(NULL, size); + if (bytes == NULL) { + PyErr_NoMemory(); + return NULL; + } + + while (1) { + n = syscall(SYS_getrandom, + PyBytes_AS_STRING(bytes), + PyBytes_GET_SIZE(bytes), + flags); + if (n < 0 && errno == EINTR) { + if (PyErr_CheckSignals() < 0) { + goto error; + } + + /* getrandom() was interrupted by a signal: retry */ + continue; + } + break; + } + + if (n < 0) { + PyErr_SetFromErrno(PyExc_OSError); + goto error; + } + + if (n != size) { + _PyBytes_Resize(&bytes, n); + } + + return bytes; + +error: + Py_DECREF(bytes); + return NULL; +} +#endif /* HAVE_GETRANDOM_SYSCALL */ #include "clinic/posixmodule.c.h" @@ -12336,7 +12229,7 @@ static PyMethodDef posix_methods[] = { OS_KILLPG_METHODDEF OS_PLOCK_METHODDEF #ifdef MS_WINDOWS - {"startfile", win32_startfile, METH_VARARGS, win32_startfile__doc__}, + OS_STARTFILE_METHODDEF #endif OS_SETUID_METHODDEF OS_SETEUID_METHODDEF @@ -12445,6 +12338,8 @@ static PyMethodDef posix_methods[] = { {"scandir", (PyCFunction)posix_scandir, METH_VARARGS | METH_KEYWORDS, posix_scandir__doc__}, + OS_FSPATH_METHODDEF + OS_GETRANDOM_METHODDEF {NULL, NULL} /* Sentinel */ }; @@ -12456,7 +12351,6 @@ enable_symlink() HANDLE tok; TOKEN_PRIVILEGES tok_priv; LUID luid; - int meth_idx = 0; if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &tok)) return 0; @@ -12559,12 +12453,14 @@ all_ins(PyObject *m) #ifdef O_LARGEFILE if (PyModule_AddIntMacro(m, O_LARGEFILE)) return -1; #endif +#ifndef __GNU__ #ifdef O_SHLOCK if (PyModule_AddIntMacro(m, O_SHLOCK)) return -1; #endif #ifdef O_EXLOCK if (PyModule_AddIntMacro(m, O_EXLOCK)) return -1; #endif +#endif #ifdef O_EXEC if (PyModule_AddIntMacro(m, O_EXEC)) return -1; #endif @@ -12836,7 +12732,7 @@ all_ins(PyObject *m) if (PyModule_AddIntMacro(m, SCHED_RR)) return -1; #endif #ifdef SCHED_SPORADIC - if (PyModule_AddIntMacro(m, SCHED_SPORADIC)) return -1; + if (PyModule_AddIntMacro(m, SCHED_SPORADIC) return -1; #endif #ifdef SCHED_BATCH if (PyModule_AddIntMacro(m, SCHED_BATCH)) return -1; @@ -12867,28 +12763,33 @@ all_ins(PyObject *m) if (PyModule_AddIntMacro(m, XATTR_SIZE_MAX)) return -1; #endif -#ifdef RTLD_LAZY +#if HAVE_DECL_RTLD_LAZY if (PyModule_AddIntMacro(m, RTLD_LAZY)) return -1; #endif -#ifdef RTLD_NOW +#if HAVE_DECL_RTLD_NOW if (PyModule_AddIntMacro(m, RTLD_NOW)) return -1; #endif -#ifdef RTLD_GLOBAL +#if HAVE_DECL_RTLD_GLOBAL if (PyModule_AddIntMacro(m, RTLD_GLOBAL)) return -1; #endif -#ifdef RTLD_LOCAL +#if HAVE_DECL_RTLD_LOCAL if (PyModule_AddIntMacro(m, RTLD_LOCAL)) return -1; #endif -#ifdef RTLD_NODELETE +#if HAVE_DECL_RTLD_NODELETE if (PyModule_AddIntMacro(m, RTLD_NODELETE)) return -1; #endif -#ifdef RTLD_NOLOAD +#if HAVE_DECL_RTLD_NOLOAD if (PyModule_AddIntMacro(m, RTLD_NOLOAD)) return -1; #endif -#ifdef RTLD_DEEPBIND +#if HAVE_DECL_RTLD_DEEPBIND if (PyModule_AddIntMacro(m, RTLD_DEEPBIND)) return -1; #endif +#ifdef HAVE_GETRANDOM_SYSCALL + if (PyModule_AddIntMacro(m, GRND_RANDOM)) return -1; + if (PyModule_AddIntMacro(m, GRND_NONBLOCK)) return -1; +#endif + return 0; } @@ -12906,7 +12807,7 @@ static struct PyModuleDef posixmodule = { }; -static char *have_functions[] = { +static const char * const have_functions[] = { #ifdef HAVE_FACCESSAT "HAVE_FACCESSAT", @@ -13041,7 +12942,7 @@ INITFUNC(void) { PyObject *m, *v; PyObject *list; - char **trace; + const char * const *trace; #if defined(HAVE_SYMLINK) && defined(MS_WINDOWS) win32_can_symlink = enable_symlink(); @@ -13217,6 +13118,9 @@ INITFUNC(void) } PyModule_AddObject(m, "_have_functions", list); + Py_INCREF((PyObject *) &DirEntryType); + PyModule_AddObject(m, "DirEntry", (PyObject *)&DirEntryType); + initialized = 1; return m; diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c index 1b0d499..784e9d0 100644 --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -75,10 +75,18 @@ mkpwent(struct passwd *p) #define SETS(i,val) sets(v, i, val) SETS(setIndex++, p->pw_name); +#if defined(HAVE_STRUCT_PASSWD_PW_PASSWD) && !defined(__ANDROID__) SETS(setIndex++, p->pw_passwd); +#else + SETS(setIndex++, ""); +#endif PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromUid(p->pw_uid)); PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromGid(p->pw_gid)); +#if defined(HAVE_STRUCT_PASSWD_PW_GECOS) SETS(setIndex++, p->pw_gecos); +#else + SETS(setIndex++, ""); +#endif SETS(setIndex++, p->pw_dir); SETS(setIndex++, p->pw_shell); @@ -150,7 +158,6 @@ pwd_getpwnam_impl(PyObject *module, PyObject *arg) if ((bytes = PyUnicode_EncodeFSDefault(arg)) == NULL) return NULL; - /* check for embedded null bytes */ if (PyBytes_AsStringAndSize(bytes, &name, NULL) == -1) goto out; if ((p = getpwnam(name)) == NULL) { diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index adc9b6c..b3259d5 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -91,7 +91,7 @@ static struct HandlerInfo handler_info[64]; * false on an exception. */ static int -set_error_attr(PyObject *err, char *name, int value) +set_error_attr(PyObject *err, const char *name, int value) { PyObject *v = PyLong_FromLong(value); @@ -218,7 +218,7 @@ flag_error(xmlparseobject *self) } static PyObject* -call_with_frame(char *funcname, int lineno, PyObject* func, PyObject* args, +call_with_frame(const char *funcname, int lineno, PyObject* func, PyObject* args, xmlparseobject *self) { PyObject *res; @@ -747,7 +747,8 @@ pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data, s += MAX_CHUNK_SIZE; slen -= MAX_CHUNK_SIZE; } - assert(MAX_CHUNK_SIZE < INT_MAX && slen < INT_MAX); + Py_BUILD_ASSERT(MAX_CHUNK_SIZE <= INT_MAX); + assert(slen <= INT_MAX); rc = XML_Parse(self->itself, s, (int)slen, isfinal); done: @@ -765,7 +766,7 @@ readinst(char *buf, int buf_size, PyObject *meth) { PyObject *str; Py_ssize_t len; - char *ptr; + const char *ptr; str = PyObject_CallFunction(meth, "n", buf_size); if (str == NULL) @@ -1190,8 +1191,10 @@ newxmlparseobject(const char *encoding, const char *namespace_separator, PyObjec Py_DECREF(self); return NULL; } -#if XML_COMBINED_VERSION >= 20100 - /* This feature was added upstream in libexpat 2.1.0. */ +#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) || defined(XML_HAS_SET_HASH_SALT) + /* This feature was added upstream in libexpat 2.1.0. Our expat copy + * has a backport of this feature where we also define XML_HAS_SET_HASH_SALT + * to indicate that we can still use it. */ XML_SetHashSalt(self->itself, (unsigned long)_Py_HashSecret.expat.hashsalt); #endif @@ -1223,12 +1226,8 @@ xmlparse_dealloc(xmlparseobject *self) self->itself = NULL; if (self->handlers != NULL) { - PyObject *temp; - for (i = 0; handler_info[i].name != NULL; i++) { - temp = self->handlers[i]; - self->handlers[i] = NULL; - Py_XDECREF(temp); - } + for (i = 0; handler_info[i].name != NULL; i++) + Py_CLEAR(self->handlers[i]); PyMem_Free(self->handlers); self->handlers = NULL; } @@ -1341,7 +1340,6 @@ sethandler(xmlparseobject *self, PyObject *name, PyObject* v) int handlernum = handlername2int(name); if (handlernum >= 0) { xmlhandler c_handler = NULL; - PyObject *temp = self->handlers[handlernum]; if (v == Py_None) { /* If this is the character data handler, and a character @@ -1363,8 +1361,7 @@ sethandler(xmlparseobject *self, PyObject *name, PyObject* v) Py_INCREF(v); c_handler = handler_info[handlernum].handler; } - self->handlers[handlernum] = v; - Py_XDECREF(temp); + Py_XSETREF(self->handlers[handlernum], v); handler_info[handlernum].setter(self->itself, c_handler); return 1; } @@ -1703,7 +1700,15 @@ MODULE_INITFUNC(void) PyModule_AddStringConstant(m, "native_encoding", "UTF-8"); sys_modules = PySys_GetObject("modules"); + if (sys_modules == NULL) { + Py_DECREF(m); + return NULL; + } d = PyModule_GetDict(m); + if (d == NULL) { + Py_DECREF(m); + return NULL; + } errors_module = PyDict_GetItem(d, errmod_name); if (errors_module == NULL) { errors_module = PyModule_New(MODULE_NAME ".errors"); @@ -1724,9 +1729,11 @@ MODULE_INITFUNC(void) } } Py_DECREF(modelmod_name); - if (errors_module == NULL || model_module == NULL) + if (errors_module == NULL || model_module == NULL) { /* Don't core dump later! */ + Py_DECREF(m); return NULL; + } #if XML_COMBINED_VERSION > 19505 { @@ -1894,15 +1901,12 @@ static void clear_handlers(xmlparseobject *self, int initial) { int i = 0; - PyObject *temp; for (; handler_info[i].name != NULL; i++) { if (initial) self->handlers[i] = NULL; else { - temp = self->handlers[i]; - self->handlers[i] = NULL; - Py_XDECREF(temp); + Py_CLEAR(self->handlers[i]); handler_info[i].setter(self->itself, NULL); } } diff --git a/Modules/readline.c b/Modules/readline.c index c6035e2..3b94d4a 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -343,10 +343,8 @@ set_hook(const char *funcname, PyObject **hook_var, PyObject *args) Py_CLEAR(*hook_var); } else if (PyCallable_Check(function)) { - PyObject *tmp = *hook_var; Py_INCREF(function); - *hook_var = function; - Py_XDECREF(tmp); + Py_XSETREF(*hook_var, function); } else { PyErr_Format(PyExc_TypeError, @@ -604,6 +602,24 @@ PyDoc_STRVAR(doc_add_history, "add_history(string) -> None\n\ add an item to the history buffer"); +static int should_auto_add_history = 1; + +/* Enable or disable automatic history */ + +static PyObject * +py_set_auto_history(PyObject *self, PyObject *args) +{ + if (!PyArg_ParseTuple(args, "p:set_auto_history", + &should_auto_add_history)) { + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(doc_set_auto_history, +"set_auto_history(enabled) -> None\n\ +Enables or disables automatic history."); + /* Get the tab-completion word-delimiters that readline uses */ @@ -822,6 +838,7 @@ static struct PyMethodDef readline_methods[] = {"set_completer_delims", set_completer_delims, METH_O, doc_set_completer_delims}, + {"set_auto_history", py_set_auto_history, METH_VARARGS, doc_set_auto_history}, {"add_history", py_add_history, METH_O, doc_add_history}, {"remove_history_item", py_remove_history, METH_VARARGS, doc_remove_history}, {"replace_history_item", py_replace_history, METH_VARARGS, doc_replace_history}, @@ -857,7 +874,7 @@ on_hook(PyObject *func) if (r == Py_None) result = 0; else { - result = PyLong_AsLong(r); + result = _PyLong_AsInt(r); if (result == -1 && PyErr_Occurred()) goto error; } @@ -1327,20 +1344,18 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt) /* we have a valid line */ n = strlen(p); - if (n > 0) { + if (should_auto_add_history && n > 0) { const char *line; int length = _py_get_history_length(); - if (length > 0) { - HIST_ENTRY *hist_ent; + if (length > 0) #ifdef __APPLE__ if (using_libedit_emulation) { /* handle older 0-based or newer 1-based indexing */ - hist_ent = history_get(length + libedit_history_start - 1); + line = (const char *)history_get(length + libedit_history_start - 1)->line; } else #endif /* __APPLE__ */ - hist_ent = history_get(length); - line = hist_ent ? hist_ent->line : ""; - } else + line = (const char *)history_get(length)->line; + else line = ""; if (strcmp(p, line)) add_history(p); diff --git a/Modules/resource.c b/Modules/resource.c index 970ee84..6702b7a 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -107,58 +107,39 @@ resource_getrusage(PyObject *self, PyObject *args) } static int -py2rlimit(PyObject *limits, struct rlimit *rl_out) +py2rlimit(PyObject *curobj, PyObject *maxobj, struct rlimit *rl_out) { - PyObject *curobj, *maxobj; - limits = PySequence_Tuple(limits); - if (!limits) - /* Here limits is a borrowed reference */ - return -1; - - if (PyTuple_GET_SIZE(limits) != 2) { - PyErr_SetString(PyExc_ValueError, - "expected a tuple of 2 integers"); - goto error; - } - curobj = PyTuple_GET_ITEM(limits, 0); - maxobj = PyTuple_GET_ITEM(limits, 1); #if !defined(HAVE_LARGEFILE_SUPPORT) rl_out->rlim_cur = PyLong_AsLong(curobj); if (rl_out->rlim_cur == (rlim_t)-1 && PyErr_Occurred()) - goto error; + return -1; rl_out->rlim_max = PyLong_AsLong(maxobj); if (rl_out->rlim_max == (rlim_t)-1 && PyErr_Occurred()) - goto error; + return -1; #else /* The limits are probably bigger than a long */ rl_out->rlim_cur = PyLong_AsLongLong(curobj); if (rl_out->rlim_cur == (rlim_t)-1 && PyErr_Occurred()) - goto error; + return -1; rl_out->rlim_max = PyLong_AsLongLong(maxobj); if (rl_out->rlim_max == (rlim_t)-1 && PyErr_Occurred()) - goto error; + return -1; #endif - Py_DECREF(limits); rl_out->rlim_cur = rl_out->rlim_cur & RLIM_INFINITY; rl_out->rlim_max = rl_out->rlim_max & RLIM_INFINITY; return 0; -error: - Py_DECREF(limits); - return -1; } static PyObject* rlimit2py(struct rlimit rl) { -#if defined(HAVE_LONG_LONG) if (sizeof(rl.rlim_cur) > sizeof(long)) { return Py_BuildValue("LL", - (PY_LONG_LONG) rl.rlim_cur, - (PY_LONG_LONG) rl.rlim_max); + (long long) rl.rlim_cur, + (long long) rl.rlim_max); } -#endif return Py_BuildValue("ll", (long) rl.rlim_cur, (long) rl.rlim_max); } @@ -189,7 +170,7 @@ resource_setrlimit(PyObject *self, PyObject *args) { struct rlimit rl; int resource; - PyObject *limits; + PyObject *limits, *curobj, *maxobj; if (!PyArg_ParseTuple(args, "iO:setrlimit", &resource, &limits)) return NULL; @@ -200,8 +181,21 @@ resource_setrlimit(PyObject *self, PyObject *args) return NULL; } - if (py2rlimit(limits, &rl) < 0) { + limits = PySequence_Tuple(limits); + if (!limits) + /* Here limits is a borrowed reference */ return NULL; + + if (PyTuple_GET_SIZE(limits) != 2) { + PyErr_SetString(PyExc_ValueError, + "expected a tuple of 2 integers"); + goto error; + } + curobj = PyTuple_GET_ITEM(limits, 0); + maxobj = PyTuple_GET_ITEM(limits, 1); + + if (py2rlimit(curobj, maxobj, &rl) < 0) { + goto error; } if (setrlimit(resource, &rl) == -1) { @@ -213,9 +207,15 @@ resource_setrlimit(PyObject *self, PyObject *args) "not allowed to raise maximum limit"); else PyErr_SetFromErrno(PyExc_OSError); - return NULL; + goto error; } - Py_RETURN_NONE; + Py_DECREF(limits); + Py_INCREF(Py_None); + return Py_None; + + error: + Py_DECREF(limits); + return NULL; } #ifdef HAVE_PRLIMIT @@ -225,10 +225,10 @@ resource_prlimit(PyObject *self, PyObject *args) struct rlimit old_limit, new_limit; int resource, retval; pid_t pid; - PyObject *limits = NULL; + PyObject *curobj=NULL, *maxobj=NULL; - if (!PyArg_ParseTuple(args, _Py_PARSE_PID "i|O:prlimit", - &pid, &resource, &limits)) + if (!PyArg_ParseTuple(args, _Py_PARSE_PID "i|(OO):prlimit", + &pid, &resource, &curobj, &maxobj)) return NULL; if (resource < 0 || resource >= RLIM_NLIMITS) { @@ -237,8 +237,8 @@ resource_prlimit(PyObject *self, PyObject *args) return NULL; } - if (limits != NULL) { - if (py2rlimit(limits, &new_limit) < 0) { + if (curobj != NULL) { + if (py2rlimit(curobj, maxobj, &new_limit) < 0) { return NULL; } retval = prlimit(pid, resource, &new_limit, &old_limit); @@ -436,11 +436,9 @@ PyInit_resource(void) PyModule_AddIntMacro(m, RLIMIT_NPTS); #endif -#if defined(HAVE_LONG_LONG) if (sizeof(RLIM_INFINITY) > sizeof(long)) { - v = PyLong_FromLongLong((PY_LONG_LONG) RLIM_INFINITY); + v = PyLong_FromLongLong((long long) RLIM_INFINITY); } else -#endif { v = PyLong_FromLong((long) RLIM_INFINITY); } diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 00324a5..47da493 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -4,6 +4,10 @@ have any value except INVALID_SOCKET. */ +#if defined(HAVE_POLL_H) && !defined(_GNU_SOURCE) +#define _GNU_SOURCE +#endif + #include "Python.h" #include @@ -1793,7 +1797,7 @@ static PyTypeObject kqueue_queue_Type; */ #if !defined(__OpenBSD__) # define IDENT_TYPE T_UINTPTRT -# define IDENT_CAST Py_intptr_t +# define IDENT_CAST intptr_t # define DATA_TYPE T_INTPTRT # define DATA_FMT_UNIT INTPTRT_FMT_UNIT # define IDENT_AsType PyLong_AsUintptr_t @@ -1842,7 +1846,7 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds) PyObject *pfd; static char *kwlist[] = {"ident", "filter", "flags", "fflags", "data", "udata", NULL}; - static char *fmt = "O|hHI" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent"; + static const char fmt[] = "O|hHI" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent"; EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */ @@ -1872,7 +1876,7 @@ static PyObject * kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o, int op) { - Py_intptr_t result = 0; + intptr_t result = 0; if (!kqueue_event_Check(o)) { if (op == Py_EQ || op == Py_NE) { @@ -2127,7 +2131,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args) if (_PyTime_FromSecondsObject(&timeout, otimeout, _PyTime_ROUND_CEILING) < 0) { PyErr_Format(PyExc_TypeError, - "timeout argument must be an number " + "timeout argument must be a number " "or None, got %.200s", Py_TYPE(otimeout)->tp_name); return NULL; @@ -2452,6 +2456,10 @@ PyInit_select(void) #ifdef POLLMSG PyModule_AddIntMacro(m, POLLMSG); #endif +#ifdef POLLRDHUP + /* Kernel 2.6.17+ */ + PyModule_AddIntMacro(m, POLLRDHUP); +#endif } #endif /* HAVE_POLL */ @@ -2473,12 +2481,18 @@ PyInit_select(void) PyModule_AddIntMacro(m, EPOLLPRI); PyModule_AddIntMacro(m, EPOLLERR); PyModule_AddIntMacro(m, EPOLLHUP); +#ifdef EPOLLRDHUP + /* Kernel 2.6.17 */ + PyModule_AddIntMacro(m, EPOLLRDHUP); +#endif PyModule_AddIntMacro(m, EPOLLET); #ifdef EPOLLONESHOT /* Kernel 2.6.2+ */ PyModule_AddIntMacro(m, EPOLLONESHOT); #endif - /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */ +#ifdef EPOLLEXCLUSIVE + PyModule_AddIntMacro(m, EPOLLEXCLUSIVE); +#endif #ifdef EPOLLRDNORM PyModule_AddIntMacro(m, EPOLLRDNORM); @@ -2519,13 +2533,21 @@ PyInit_select(void) /* event filters */ PyModule_AddIntConstant(m, "KQ_FILTER_READ", EVFILT_READ); PyModule_AddIntConstant(m, "KQ_FILTER_WRITE", EVFILT_WRITE); +#ifdef EVFILT_AIO PyModule_AddIntConstant(m, "KQ_FILTER_AIO", EVFILT_AIO); +#endif +#ifdef EVFILT_VNODE PyModule_AddIntConstant(m, "KQ_FILTER_VNODE", EVFILT_VNODE); +#endif +#ifdef EVFILT_PROC PyModule_AddIntConstant(m, "KQ_FILTER_PROC", EVFILT_PROC); +#endif #ifdef EVFILT_NETDEV PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV); #endif +#ifdef EVFILT_SIGNAL PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL); +#endif PyModule_AddIntConstant(m, "KQ_FILTER_TIMER", EVFILT_TIMER); /* event flags */ @@ -2536,16 +2558,23 @@ PyInit_select(void) PyModule_AddIntConstant(m, "KQ_EV_ONESHOT", EV_ONESHOT); PyModule_AddIntConstant(m, "KQ_EV_CLEAR", EV_CLEAR); +#ifdef EV_SYSFLAGS PyModule_AddIntConstant(m, "KQ_EV_SYSFLAGS", EV_SYSFLAGS); +#endif +#ifdef EV_FLAG1 PyModule_AddIntConstant(m, "KQ_EV_FLAG1", EV_FLAG1); +#endif PyModule_AddIntConstant(m, "KQ_EV_EOF", EV_EOF); PyModule_AddIntConstant(m, "KQ_EV_ERROR", EV_ERROR); /* READ WRITE filter flag */ +#ifdef NOTE_LOWAT PyModule_AddIntConstant(m, "KQ_NOTE_LOWAT", NOTE_LOWAT); +#endif /* VNODE filter flags */ +#ifdef EVFILT_VNODE PyModule_AddIntConstant(m, "KQ_NOTE_DELETE", NOTE_DELETE); PyModule_AddIntConstant(m, "KQ_NOTE_WRITE", NOTE_WRITE); PyModule_AddIntConstant(m, "KQ_NOTE_EXTEND", NOTE_EXTEND); @@ -2553,8 +2582,10 @@ PyInit_select(void) PyModule_AddIntConstant(m, "KQ_NOTE_LINK", NOTE_LINK); PyModule_AddIntConstant(m, "KQ_NOTE_RENAME", NOTE_RENAME); PyModule_AddIntConstant(m, "KQ_NOTE_REVOKE", NOTE_REVOKE); +#endif /* PROC filter flags */ +#ifdef EVFILT_PROC PyModule_AddIntConstant(m, "KQ_NOTE_EXIT", NOTE_EXIT); PyModule_AddIntConstant(m, "KQ_NOTE_FORK", NOTE_FORK); PyModule_AddIntConstant(m, "KQ_NOTE_EXEC", NOTE_EXEC); @@ -2564,6 +2595,7 @@ PyInit_select(void) PyModule_AddIntConstant(m, "KQ_NOTE_TRACK", NOTE_TRACK); PyModule_AddIntConstant(m, "KQ_NOTE_CHILD", NOTE_CHILD); PyModule_AddIntConstant(m, "KQ_NOTE_TRACKERR", NOTE_TRACKERR); +#endif /* NETDEV filter flags */ #ifdef EVFILT_NETDEV diff --git a/Modules/sha1module.c b/Modules/sha1module.c index 6cb32ed..d5065ce 100644 --- a/Modules/sha1module.c +++ b/Modules/sha1module.c @@ -30,7 +30,7 @@ class SHA1Type "SHA1object *" "&PyType_Type" #if SIZEOF_INT == 4 typedef unsigned int SHA1_INT32; /* 32-bit integer */ -typedef PY_LONG_LONG SHA1_INT64; /* 64-bit integer */ +typedef long long SHA1_INT64; /* 64-bit integer */ #else /* not defined. compilation will die. */ #endif diff --git a/Modules/sha512module.c b/Modules/sha512module.c index f9ff0ea..17775ae 100644 --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -27,15 +27,13 @@ class SHA512Type "SHAobject *" "&PyType_Type" [clinic start generated code]*/ /*[clinic end generated code: output=da39a3ee5e6b4b0d input=81a3ccde92bcfe8d]*/ -#ifdef PY_LONG_LONG /* If no PY_LONG_LONG, don't compile anything! */ - /* Some useful types */ typedef unsigned char SHA_BYTE; #if SIZEOF_INT == 4 typedef unsigned int SHA_INT32; /* 32-bit integer */ -typedef unsigned PY_LONG_LONG SHA_INT64; /* 64-bit integer */ +typedef unsigned long long SHA_INT64; /* 64-bit integer */ #else /* not defined. compilation will die. */ #endif @@ -121,12 +119,12 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) /* Various logical functions */ #define ROR64(x, y) \ - ( ((((x) & Py_ULL(0xFFFFFFFFFFFFFFFF))>>((unsigned PY_LONG_LONG)(y) & 63)) | \ - ((x)<<((unsigned PY_LONG_LONG)(64-((y) & 63))))) & Py_ULL(0xFFFFFFFFFFFFFFFF)) + ( ((((x) & 0xFFFFFFFFFFFFFFFFULL)>>((unsigned long long)(y) & 63)) | \ + ((x)<<((unsigned long long)(64-((y) & 63))))) & 0xFFFFFFFFFFFFFFFFULL) #define Ch(x,y,z) (z ^ (x & (y ^ z))) #define Maj(x,y,z) (((x | y) & z) | (x & y)) #define S(x, n) ROR64((x),(n)) -#define R(x, n) (((x) & Py_ULL(0xFFFFFFFFFFFFFFFF)) >> ((unsigned PY_LONG_LONG)n)) +#define R(x, n) (((x) & 0xFFFFFFFFFFFFFFFFULL) >> ((unsigned long long)n)) #define Sigma0(x) (S(x, 28) ^ S(x, 34) ^ S(x, 39)) #define Sigma1(x) (S(x, 14) ^ S(x, 18) ^ S(x, 41)) #define Gamma0(x) (S(x, 1) ^ S(x, 8) ^ R(x, 7)) @@ -158,86 +156,86 @@ sha512_transform(SHAobject *sha_info) d += t0; \ h = t0 + t1; - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],0,Py_ULL(0x428a2f98d728ae22)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],1,Py_ULL(0x7137449123ef65cd)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],2,Py_ULL(0xb5c0fbcfec4d3b2f)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],3,Py_ULL(0xe9b5dba58189dbbc)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],4,Py_ULL(0x3956c25bf348b538)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],5,Py_ULL(0x59f111f1b605d019)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],6,Py_ULL(0x923f82a4af194f9b)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],7,Py_ULL(0xab1c5ed5da6d8118)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],8,Py_ULL(0xd807aa98a3030242)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],9,Py_ULL(0x12835b0145706fbe)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],10,Py_ULL(0x243185be4ee4b28c)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],11,Py_ULL(0x550c7dc3d5ffb4e2)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],12,Py_ULL(0x72be5d74f27b896f)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],13,Py_ULL(0x80deb1fe3b1696b1)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],14,Py_ULL(0x9bdc06a725c71235)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],15,Py_ULL(0xc19bf174cf692694)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],16,Py_ULL(0xe49b69c19ef14ad2)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],17,Py_ULL(0xefbe4786384f25e3)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],18,Py_ULL(0x0fc19dc68b8cd5b5)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],19,Py_ULL(0x240ca1cc77ac9c65)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],20,Py_ULL(0x2de92c6f592b0275)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],21,Py_ULL(0x4a7484aa6ea6e483)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],22,Py_ULL(0x5cb0a9dcbd41fbd4)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],23,Py_ULL(0x76f988da831153b5)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],24,Py_ULL(0x983e5152ee66dfab)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],25,Py_ULL(0xa831c66d2db43210)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],26,Py_ULL(0xb00327c898fb213f)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],27,Py_ULL(0xbf597fc7beef0ee4)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],28,Py_ULL(0xc6e00bf33da88fc2)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],29,Py_ULL(0xd5a79147930aa725)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],30,Py_ULL(0x06ca6351e003826f)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],31,Py_ULL(0x142929670a0e6e70)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],32,Py_ULL(0x27b70a8546d22ffc)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],33,Py_ULL(0x2e1b21385c26c926)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],34,Py_ULL(0x4d2c6dfc5ac42aed)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],35,Py_ULL(0x53380d139d95b3df)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],36,Py_ULL(0x650a73548baf63de)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],37,Py_ULL(0x766a0abb3c77b2a8)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],38,Py_ULL(0x81c2c92e47edaee6)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],39,Py_ULL(0x92722c851482353b)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],40,Py_ULL(0xa2bfe8a14cf10364)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],41,Py_ULL(0xa81a664bbc423001)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],42,Py_ULL(0xc24b8b70d0f89791)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],43,Py_ULL(0xc76c51a30654be30)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],44,Py_ULL(0xd192e819d6ef5218)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],45,Py_ULL(0xd69906245565a910)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],46,Py_ULL(0xf40e35855771202a)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],47,Py_ULL(0x106aa07032bbd1b8)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],48,Py_ULL(0x19a4c116b8d2d0c8)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],49,Py_ULL(0x1e376c085141ab53)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],50,Py_ULL(0x2748774cdf8eeb99)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],51,Py_ULL(0x34b0bcb5e19b48a8)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],52,Py_ULL(0x391c0cb3c5c95a63)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],53,Py_ULL(0x4ed8aa4ae3418acb)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],54,Py_ULL(0x5b9cca4f7763e373)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],55,Py_ULL(0x682e6ff3d6b2b8a3)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],56,Py_ULL(0x748f82ee5defb2fc)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],57,Py_ULL(0x78a5636f43172f60)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],58,Py_ULL(0x84c87814a1f0ab72)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],59,Py_ULL(0x8cc702081a6439ec)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],60,Py_ULL(0x90befffa23631e28)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],61,Py_ULL(0xa4506cebde82bde9)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],62,Py_ULL(0xbef9a3f7b2c67915)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],63,Py_ULL(0xc67178f2e372532b)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],64,Py_ULL(0xca273eceea26619c)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],65,Py_ULL(0xd186b8c721c0c207)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],66,Py_ULL(0xeada7dd6cde0eb1e)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],67,Py_ULL(0xf57d4f7fee6ed178)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],68,Py_ULL(0x06f067aa72176fba)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],69,Py_ULL(0x0a637dc5a2c898a6)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],70,Py_ULL(0x113f9804bef90dae)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],71,Py_ULL(0x1b710b35131c471b)); - RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],72,Py_ULL(0x28db77f523047d84)); - RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],73,Py_ULL(0x32caab7b40c72493)); - RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],74,Py_ULL(0x3c9ebe0a15c9bebc)); - RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],75,Py_ULL(0x431d67c49c100d4c)); - RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],76,Py_ULL(0x4cc5d4becb3e42b6)); - RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],77,Py_ULL(0x597f299cfc657e2a)); - RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],78,Py_ULL(0x5fcb6fab3ad6faec)); - RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],79,Py_ULL(0x6c44198c4a475817)); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],0,0x428a2f98d728ae22ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],1,0x7137449123ef65cdULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],2,0xb5c0fbcfec4d3b2fULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],3,0xe9b5dba58189dbbcULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],4,0x3956c25bf348b538ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],5,0x59f111f1b605d019ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],6,0x923f82a4af194f9bULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],7,0xab1c5ed5da6d8118ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],8,0xd807aa98a3030242ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],9,0x12835b0145706fbeULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],10,0x243185be4ee4b28cULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],11,0x550c7dc3d5ffb4e2ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],12,0x72be5d74f27b896fULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],13,0x80deb1fe3b1696b1ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],14,0x9bdc06a725c71235ULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],15,0xc19bf174cf692694ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],16,0xe49b69c19ef14ad2ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],17,0xefbe4786384f25e3ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],18,0x0fc19dc68b8cd5b5ULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],19,0x240ca1cc77ac9c65ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],20,0x2de92c6f592b0275ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],21,0x4a7484aa6ea6e483ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],22,0x5cb0a9dcbd41fbd4ULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],23,0x76f988da831153b5ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],24,0x983e5152ee66dfabULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],25,0xa831c66d2db43210ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],26,0xb00327c898fb213fULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],27,0xbf597fc7beef0ee4ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],28,0xc6e00bf33da88fc2ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],29,0xd5a79147930aa725ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],30,0x06ca6351e003826fULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],31,0x142929670a0e6e70ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],32,0x27b70a8546d22ffcULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],33,0x2e1b21385c26c926ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],34,0x4d2c6dfc5ac42aedULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],35,0x53380d139d95b3dfULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],36,0x650a73548baf63deULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],37,0x766a0abb3c77b2a8ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],38,0x81c2c92e47edaee6ULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],39,0x92722c851482353bULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],40,0xa2bfe8a14cf10364ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],41,0xa81a664bbc423001ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],42,0xc24b8b70d0f89791ULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],43,0xc76c51a30654be30ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],44,0xd192e819d6ef5218ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],45,0xd69906245565a910ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],46,0xf40e35855771202aULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],47,0x106aa07032bbd1b8ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],48,0x19a4c116b8d2d0c8ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],49,0x1e376c085141ab53ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],50,0x2748774cdf8eeb99ULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],51,0x34b0bcb5e19b48a8ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],52,0x391c0cb3c5c95a63ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],53,0x4ed8aa4ae3418acbULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],54,0x5b9cca4f7763e373ULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],55,0x682e6ff3d6b2b8a3ULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],56,0x748f82ee5defb2fcULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],57,0x78a5636f43172f60ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],58,0x84c87814a1f0ab72ULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],59,0x8cc702081a6439ecULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],60,0x90befffa23631e28ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],61,0xa4506cebde82bde9ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],62,0xbef9a3f7b2c67915ULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],63,0xc67178f2e372532bULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],64,0xca273eceea26619cULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],65,0xd186b8c721c0c207ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],66,0xeada7dd6cde0eb1eULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],67,0xf57d4f7fee6ed178ULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],68,0x06f067aa72176fbaULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],69,0x0a637dc5a2c898a6ULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],70,0x113f9804bef90daeULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],71,0x1b710b35131c471bULL); + RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],72,0x28db77f523047d84ULL); + RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],73,0x32caab7b40c72493ULL); + RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],74,0x3c9ebe0a15c9bebcULL); + RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],75,0x431d67c49c100d4cULL); + RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],76,0x4cc5d4becb3e42b6ULL); + RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],77,0x597f299cfc657e2aULL); + RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],78,0x5fcb6fab3ad6faecULL); + RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],79,0x6c44198c4a475817ULL); #undef RND @@ -803,5 +801,3 @@ PyInit__sha512(void) PyModule_AddObject(m, "SHA512Type", (PyObject *)&SHA512type); return m; } - -#endif diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index e0d06b4..e27075b 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -139,10 +139,6 @@ timeval_from_double(double d, struct timeval *tv) { tv->tv_sec = floor(d); tv->tv_usec = fmod(d, 1.0) * 1000000.0; - /* Don't disable the timer if the computation above rounds down to zero. */ - if (d > 0.0 && tv->tv_sec == 0 && tv->tv_usec == 0) { - tv->tv_usec = 1; - } } Py_LOCAL_INLINE(double) @@ -202,7 +198,7 @@ static int report_wakeup_write_error(void *data) { int save_errno = errno; - errno = (int) (Py_intptr_t) data; + errno = (int) (intptr_t) data; PyErr_SetFromErrno(PyExc_OSError); PySys_WriteStderr("Exception ignored when trying to write to the " "signal wakeup fd:\n"); @@ -281,7 +277,7 @@ trip_signal(int sig_num) if (rc < 0) { Py_AddPendingCall(report_wakeup_write_error, - (void *)(Py_intptr_t)errno); + (void *)(intptr_t)errno); } } } @@ -583,7 +579,7 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args) } fd = (int)sockfd; - if ((SOCKET_T)fd != sockfd || !_PyVerify_fd(fd)) { + if ((SOCKET_T)fd != sockfd) { PyErr_SetString(PyExc_ValueError, "invalid fd"); return NULL; } @@ -613,11 +609,6 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args) if (fd != -1) { int blocking; - if (!_PyVerify_fd(fd)) { - PyErr_SetString(PyExc_ValueError, "invalid fd"); - return NULL; - } - if (_Py_fstat(fd, &status) != 0) return NULL; @@ -1275,210 +1266,169 @@ PyInit__signal(void) } #ifdef SIGHUP - x = PyLong_FromLong(SIGHUP); - PyDict_SetItemString(d, "SIGHUP", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGHUP)) + goto finally; #endif #ifdef SIGINT - x = PyLong_FromLong(SIGINT); - PyDict_SetItemString(d, "SIGINT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGINT)) + goto finally; #endif #ifdef SIGBREAK - x = PyLong_FromLong(SIGBREAK); - PyDict_SetItemString(d, "SIGBREAK", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGBREAK)) + goto finally; #endif #ifdef SIGQUIT - x = PyLong_FromLong(SIGQUIT); - PyDict_SetItemString(d, "SIGQUIT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGQUIT)) + goto finally; #endif #ifdef SIGILL - x = PyLong_FromLong(SIGILL); - PyDict_SetItemString(d, "SIGILL", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGILL)) + goto finally; #endif #ifdef SIGTRAP - x = PyLong_FromLong(SIGTRAP); - PyDict_SetItemString(d, "SIGTRAP", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGTRAP)) + goto finally; #endif #ifdef SIGIOT - x = PyLong_FromLong(SIGIOT); - PyDict_SetItemString(d, "SIGIOT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGIOT)) + goto finally; #endif #ifdef SIGABRT - x = PyLong_FromLong(SIGABRT); - PyDict_SetItemString(d, "SIGABRT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGABRT)) + goto finally; #endif #ifdef SIGEMT - x = PyLong_FromLong(SIGEMT); - PyDict_SetItemString(d, "SIGEMT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGEMT)) + goto finally; #endif #ifdef SIGFPE - x = PyLong_FromLong(SIGFPE); - PyDict_SetItemString(d, "SIGFPE", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGFPE)) + goto finally; #endif #ifdef SIGKILL - x = PyLong_FromLong(SIGKILL); - PyDict_SetItemString(d, "SIGKILL", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGKILL)) + goto finally; #endif #ifdef SIGBUS - x = PyLong_FromLong(SIGBUS); - PyDict_SetItemString(d, "SIGBUS", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGBUS)) + goto finally; #endif #ifdef SIGSEGV - x = PyLong_FromLong(SIGSEGV); - PyDict_SetItemString(d, "SIGSEGV", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGSEGV)) + goto finally; #endif #ifdef SIGSYS - x = PyLong_FromLong(SIGSYS); - PyDict_SetItemString(d, "SIGSYS", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGSYS)) + goto finally; #endif #ifdef SIGPIPE - x = PyLong_FromLong(SIGPIPE); - PyDict_SetItemString(d, "SIGPIPE", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGPIPE)) + goto finally; #endif #ifdef SIGALRM - x = PyLong_FromLong(SIGALRM); - PyDict_SetItemString(d, "SIGALRM", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGALRM)) + goto finally; #endif #ifdef SIGTERM - x = PyLong_FromLong(SIGTERM); - PyDict_SetItemString(d, "SIGTERM", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGTERM)) + goto finally; #endif #ifdef SIGUSR1 - x = PyLong_FromLong(SIGUSR1); - PyDict_SetItemString(d, "SIGUSR1", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGUSR1)) + goto finally; #endif #ifdef SIGUSR2 - x = PyLong_FromLong(SIGUSR2); - PyDict_SetItemString(d, "SIGUSR2", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGUSR2)) + goto finally; #endif #ifdef SIGCLD - x = PyLong_FromLong(SIGCLD); - PyDict_SetItemString(d, "SIGCLD", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGCLD)) + goto finally; #endif #ifdef SIGCHLD - x = PyLong_FromLong(SIGCHLD); - PyDict_SetItemString(d, "SIGCHLD", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGCHLD)) + goto finally; #endif #ifdef SIGPWR - x = PyLong_FromLong(SIGPWR); - PyDict_SetItemString(d, "SIGPWR", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGPWR)) + goto finally; #endif #ifdef SIGIO - x = PyLong_FromLong(SIGIO); - PyDict_SetItemString(d, "SIGIO", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGIO)) + goto finally; #endif #ifdef SIGURG - x = PyLong_FromLong(SIGURG); - PyDict_SetItemString(d, "SIGURG", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGURG)) + goto finally; #endif #ifdef SIGWINCH - x = PyLong_FromLong(SIGWINCH); - PyDict_SetItemString(d, "SIGWINCH", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGWINCH)) + goto finally; #endif #ifdef SIGPOLL - x = PyLong_FromLong(SIGPOLL); - PyDict_SetItemString(d, "SIGPOLL", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGPOLL)) + goto finally; #endif #ifdef SIGSTOP - x = PyLong_FromLong(SIGSTOP); - PyDict_SetItemString(d, "SIGSTOP", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGSTOP)) + goto finally; #endif #ifdef SIGTSTP - x = PyLong_FromLong(SIGTSTP); - PyDict_SetItemString(d, "SIGTSTP", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGTSTP)) + goto finally; #endif #ifdef SIGCONT - x = PyLong_FromLong(SIGCONT); - PyDict_SetItemString(d, "SIGCONT", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGCONT)) + goto finally; #endif #ifdef SIGTTIN - x = PyLong_FromLong(SIGTTIN); - PyDict_SetItemString(d, "SIGTTIN", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGTTIN)) + goto finally; #endif #ifdef SIGTTOU - x = PyLong_FromLong(SIGTTOU); - PyDict_SetItemString(d, "SIGTTOU", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGTTOU)) + goto finally; #endif #ifdef SIGVTALRM - x = PyLong_FromLong(SIGVTALRM); - PyDict_SetItemString(d, "SIGVTALRM", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGVTALRM)) + goto finally; #endif #ifdef SIGPROF - x = PyLong_FromLong(SIGPROF); - PyDict_SetItemString(d, "SIGPROF", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGPROF)) + goto finally; #endif #ifdef SIGXCPU - x = PyLong_FromLong(SIGXCPU); - PyDict_SetItemString(d, "SIGXCPU", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGXCPU)) + goto finally; #endif #ifdef SIGXFSZ - x = PyLong_FromLong(SIGXFSZ); - PyDict_SetItemString(d, "SIGXFSZ", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGXFSZ)) + goto finally; #endif #ifdef SIGRTMIN - x = PyLong_FromLong(SIGRTMIN); - PyDict_SetItemString(d, "SIGRTMIN", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGRTMIN)) + goto finally; #endif #ifdef SIGRTMAX - x = PyLong_FromLong(SIGRTMAX); - PyDict_SetItemString(d, "SIGRTMAX", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGRTMAX)) + goto finally; #endif #ifdef SIGINFO - x = PyLong_FromLong(SIGINFO); - PyDict_SetItemString(d, "SIGINFO", x); - Py_XDECREF(x); + if (PyModule_AddIntMacro(m, SIGINFO)) + goto finally; #endif #ifdef ITIMER_REAL - x = PyLong_FromLong(ITIMER_REAL); - PyDict_SetItemString(d, "ITIMER_REAL", x); - Py_DECREF(x); + if (PyModule_AddIntMacro(m, ITIMER_REAL)) + goto finally; #endif #ifdef ITIMER_VIRTUAL - x = PyLong_FromLong(ITIMER_VIRTUAL); - PyDict_SetItemString(d, "ITIMER_VIRTUAL", x); - Py_DECREF(x); + if (PyModule_AddIntMacro(m, ITIMER_VIRTUAL)) + goto finally; #endif #ifdef ITIMER_PROF - x = PyLong_FromLong(ITIMER_PROF); - PyDict_SetItemString(d, "ITIMER_PROF", x); - Py_DECREF(x); + if (PyModule_AddIntMacro(m, ITIMER_PROF)) + goto finally; #endif #if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER) @@ -1489,15 +1439,13 @@ PyInit__signal(void) #endif #ifdef CTRL_C_EVENT - x = PyLong_FromLong(CTRL_C_EVENT); - PyDict_SetItemString(d, "CTRL_C_EVENT", x); - Py_DECREF(x); + if (PyModule_AddIntMacro(m, CTRL_C_EVENT)) + goto finally; #endif #ifdef CTRL_BREAK_EVENT - x = PyLong_FromLong(CTRL_BREAK_EVENT); - PyDict_SetItemString(d, "CTRL_BREAK_EVENT", x); - Py_DECREF(x); + if (PyModule_AddIntMacro(m, CTRL_BREAK_EVENT)) + goto finally; #endif #ifdef MS_WINDOWS diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 47abe8d..f4edc06 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -136,7 +136,7 @@ sendall(data[, flags]) -- send all data\n\ send(data[, flags]) -- send data, may not send all of it\n\ sendto(data[, flags], addr) -- send data to a given address\n\ setblocking(0 | 1) -- set or clear the blocking I/O flag\n\ -setsockopt(level, optname, value) -- set socket options\n\ +setsockopt(level, optname, value[, optlen]) -- set socket options\n\ settimeout(None | float) -- set or clear the timeout\n\ shutdown(how) -- shut down traffic in one or both directions\n\ if_nameindex() -- return all network interface indices and names\n\ @@ -153,7 +153,7 @@ if_indextoname(index) -- return the corresponding interface name\n\ On the other hand, not all Linux versions agree, so there the settings computed by the configure script are needed! */ -#ifndef linux +#ifndef __linux__ # undef HAVE_GETHOSTBYNAME_R_3_ARG # undef HAVE_GETHOSTBYNAME_R_5_ARG # undef HAVE_GETHOSTBYNAME_R_6_ARG @@ -163,7 +163,11 @@ if_indextoname(index) -- return the corresponding interface name\n\ # include #endif -#ifndef WITH_THREAD +#if !defined(WITH_THREAD) +# undef HAVE_GETHOSTBYNAME_R +#endif + +#if defined(__ANDROID__) && __ANDROID_API__ < 23 # undef HAVE_GETHOSTBYNAME_R #endif @@ -172,7 +176,7 @@ if_indextoname(index) -- return the corresponding interface name\n\ # define HAVE_GETHOSTBYNAME_R_3_ARG # elif defined(__sun) || defined(__sgi) # define HAVE_GETHOSTBYNAME_R_5_ARG -# elif defined(linux) +# elif defined(__linux__) /* Rely on the configure script */ # elif defined(_LINUX_SOURCE_COMPAT) /* Linux compatibility on AIX */ # define HAVE_GETHOSTBYNAME_R_6_ARG @@ -284,6 +288,36 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& #include #endif +#ifdef HAVE_SOCKADDR_ALG +#include +#ifndef AF_ALG +#define AF_ALG 38 +#endif +#ifndef SOL_ALG +#define SOL_ALG 279 +#endif + +/* Linux 3.19 */ +#ifndef ALG_SET_AEAD_ASSOCLEN +#define ALG_SET_AEAD_ASSOCLEN 4 +#endif +#ifndef ALG_SET_AEAD_AUTHSIZE +#define ALG_SET_AEAD_AUTHSIZE 5 +#endif +/* Linux 4.8 */ +#ifndef ALG_SET_PUBKEY +#define ALG_SET_PUBKEY 6 +#endif + +#ifndef ALG_OP_SIGN +#define ALG_OP_SIGN 2 +#endif +#ifndef ALG_OP_VERIFY +#define ALG_OP_VERIFY 3 +#endif + +#endif /* HAVE_SOCKADDR_ALG */ + /* Generic socket object definitions and includes */ #define PySocket_BUILDING_SOCKET #include "socketmodule.h" @@ -590,6 +624,7 @@ set_gaierror(int error) static int internal_setblocking(PySocketSockObject *s, int block) { + int result = -1; #ifdef MS_WINDOWS u_long arg; #endif @@ -608,24 +643,41 @@ internal_setblocking(PySocketSockObject *s, int block) #ifndef MS_WINDOWS #if (defined(HAVE_SYS_IOCTL_H) && defined(FIONBIO)) block = !block; - ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block); + if (ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block) == -1) + goto done; #else delay_flag = fcntl(s->sock_fd, F_GETFL, 0); + if (delay_flag == -1) + goto done; if (block) new_delay_flag = delay_flag & (~O_NONBLOCK); else new_delay_flag = delay_flag | O_NONBLOCK; if (new_delay_flag != delay_flag) - fcntl(s->sock_fd, F_SETFL, new_delay_flag); + if (fcntl(s->sock_fd, F_SETFL, new_delay_flag) == -1) + goto done; #endif #else /* MS_WINDOWS */ arg = !block; - ioctlsocket(s->sock_fd, FIONBIO, &arg); + if (ioctlsocket(s->sock_fd, FIONBIO, &arg) != 0) + goto done; #endif /* MS_WINDOWS */ + + result = 0; + + done: + ; /* necessary for --without-threads flag */ Py_END_ALLOW_THREADS - /* Since these don't return anything */ - return 1; + if (result) { +#ifndef MS_WINDOWS + PyErr_SetFromErrno(PyExc_OSError); +#else + PyErr_SetExcFromWindowsErr(PyExc_OSError, WSAGetLastError()); +#endif + } + + return result; } static int @@ -873,7 +925,7 @@ sock_call(PySocketSockObject *s, /* Default timeout for new sockets */ static _PyTime_t defaulttimeout = _PYTIME_FROMSECONDS(-1); -static void +static int init_sockobject(PySocketSockObject *s, SOCKET_T fd, int family, int type, int proto) { @@ -890,10 +942,13 @@ init_sockobject(PySocketSockObject *s, #endif { s->sock_timeout = defaulttimeout; - if (defaulttimeout >= 0) - internal_setblocking(s, 0); + if (defaulttimeout >= 0) { + if (internal_setblocking(s, 0) == -1) { + return -1; + } + } } - + return 0; } @@ -908,8 +963,12 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto) PySocketSockObject *s; s = (PySocketSockObject *) PyType_GenericNew(&sock_type, NULL, NULL); - if (s != NULL) - init_sockobject(s, fd, family, type, proto); + if (s == NULL) + return NULL; + if (init_sockobject(s, fd, family, type, proto) == -1) { + Py_DECREF(s); + return NULL; + } return s; } @@ -928,7 +987,7 @@ static PyThread_type_lock netdb_lock; an error occurred; then an exception is raised. */ static int -setipaddr(char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int af) +setipaddr(const char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int af) { struct addrinfo hints, *res; int error; @@ -1109,7 +1168,7 @@ makeipaddr(struct sockaddr *addr, int addrlen) an error occurred. */ static int -setbdaddr(char *name, bdaddr_t *bdaddr) +setbdaddr(const char *name, bdaddr_t *bdaddr) { unsigned int b0, b1, b2, b3, b4, b5; char ch; @@ -1182,10 +1241,10 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto) case AF_UNIX: { struct sockaddr_un *a = (struct sockaddr_un *) addr; -#ifdef linux - size_t linuxaddrlen = addrlen - offsetof(struct sockaddr_un, sun_path); - if (linuxaddrlen > 0 && a->sun_path[0] == 0) { /* Linux abstract namespace */ - return PyBytes_FromStringAndSize(a->sun_path, linuxaddrlen); +#ifdef __linux__ + if (a->sun_path[0] == 0) { /* Linux abstract namespace */ + addrlen -= offsetof(struct sockaddr_un, sun_path); + return PyBytes_FromStringAndSize(a->sun_path, addrlen); } else #endif /* linux */ @@ -1373,6 +1432,22 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto) } #endif +#ifdef HAVE_SOCKADDR_ALG + case AF_ALG: + { + struct sockaddr_alg *a = (struct sockaddr_alg *)addr; + return Py_BuildValue("s#s#HH", + a->salg_type, + strnlen((const char*)a->salg_type, + sizeof(a->salg_type)), + a->salg_name, + strnlen((const char*)a->salg_name, + sizeof(a->salg_name)), + a->salg_feat, + a->salg_mask); + } +#endif + /* More cases here... */ default: @@ -1403,7 +1478,7 @@ static int idna_converter(PyObject *obj, struct maybe_idna *data) { size_t len; - PyObject *obj2, *obj3; + PyObject *obj2; if (obj == NULL) { idna_cleanup(data); return 1; @@ -1418,31 +1493,27 @@ idna_converter(PyObject *obj, struct maybe_idna *data) data->buf = PyByteArray_AsString(obj); len = PyByteArray_Size(obj); } - else if (PyUnicode_Check(obj) && PyUnicode_READY(obj) == 0 && PyUnicode_IS_COMPACT_ASCII(obj)) { - data->buf = PyUnicode_DATA(obj); - len = PyUnicode_GET_LENGTH(obj); - } - else { - obj2 = PyUnicode_FromObject(obj); - if (!obj2) { - PyErr_Format(PyExc_TypeError, "string or unicode text buffer expected, not %s", - obj->ob_type->tp_name); - return 0; - } - obj3 = PyUnicode_AsEncodedString(obj2, "idna", NULL); - Py_DECREF(obj2); - if (!obj3) { - PyErr_SetString(PyExc_TypeError, "encoding of hostname failed"); - return 0; + else if (PyUnicode_Check(obj)) { + if (PyUnicode_READY(obj) == 0 && PyUnicode_IS_COMPACT_ASCII(obj)) { + data->buf = PyUnicode_DATA(obj); + len = PyUnicode_GET_LENGTH(obj); } - if (!PyBytes_Check(obj3)) { - Py_DECREF(obj3); - PyErr_SetString(PyExc_TypeError, "encoding of hostname failed to return bytes"); - return 0; + else { + obj2 = PyUnicode_AsEncodedString(obj, "idna", NULL); + if (!obj2) { + PyErr_SetString(PyExc_TypeError, "encoding of hostname failed"); + return 0; + } + assert(PyBytes_Check(obj2)); + data->obj = obj2; + data->buf = PyBytes_AS_STRING(obj2); + len = PyBytes_GET_SIZE(obj2); } - data->obj = obj3; - data->buf = PyBytes_AS_STRING(obj3); - len = PyBytes_GET_SIZE(obj3); + } + else { + PyErr_Format(PyExc_TypeError, "str, bytes or bytearray expected, not %s", + obj->ob_type->tp_name); + return 0; } if (strlen(data->buf) != len) { Py_CLEAR(data->obj); @@ -1485,7 +1556,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, assert(path.len >= 0); addr = (struct sockaddr_un*)addr_ret; -#ifdef linux +#ifdef __linux__ if (path.len > 0 && *(const char *)path.buf == 0) { /* Linux abstract namespace extension */ if ((size_t)path.len > sizeof addr->sun_path) { @@ -1942,6 +2013,36 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, return 0; } #endif +#ifdef HAVE_SOCKADDR_ALG + case AF_ALG: + { + struct sockaddr_alg *sa; + char *type; + char *name; + sa = (struct sockaddr_alg *)addr_ret; + + memset(sa, 0, sizeof(*sa)); + sa->salg_family = AF_ALG; + + if (!PyArg_ParseTuple(args, "ss|HH:getsockaddrarg", + &type, &name, &sa->salg_feat, &sa->salg_mask)) + return 0; + /* sockaddr_alg has fixed-sized char arrays for type and name */ + if (strlen(type) > sizeof(sa->salg_type)) { + PyErr_SetString(PyExc_ValueError, "AF_ALG type too long."); + return 0; + } + strncpy((char *)sa->salg_type, type, sizeof(sa->salg_type)); + if (strlen(name) > sizeof(sa->salg_name)) { + PyErr_SetString(PyExc_ValueError, "AF_ALG name too long."); + return 0; + } + strncpy((char *)sa->salg_name, name, sizeof(sa->salg_name)); + + *len_ret = sizeof(*sa); + return 1; + } +#endif /* More cases here... */ @@ -2064,6 +2165,13 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) return 0; } #endif +#ifdef HAVE_SOCKADDR_ALG + case AF_ALG: + { + *len_ret = sizeof (struct sockaddr_alg); + return 1; + } +#endif /* More cases here... */ @@ -2223,10 +2331,21 @@ static int sock_accept_impl(PySocketSockObject *s, void *data) { struct sock_accept *ctx = data; + struct sockaddr *addr = SAS2SA(ctx->addrbuf); + socklen_t *paddrlen = ctx->addrlen; +#ifdef HAVE_SOCKADDR_ALG + /* AF_ALG does not support accept() with addr and raises + * ECONNABORTED instead. */ + if (s->sock_family == AF_ALG) { + addr = NULL; + paddrlen = NULL; + *ctx->addrlen = 0; + } +#endif #if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) if (accept4_works != 0) { - ctx->result = accept4(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen, + ctx->result = accept4(s->sock_fd, addr, paddrlen, SOCK_CLOEXEC); if (ctx->result == INVALID_SOCKET && accept4_works == -1) { /* On Linux older than 2.6.28, accept4() fails with ENOSYS */ @@ -2234,9 +2353,9 @@ sock_accept_impl(PySocketSockObject *s, void *data) } } if (accept4_works == 0) - ctx->result = accept(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen); + ctx->result = accept(s->sock_fd, addr, paddrlen); #else - ctx->result = accept(s->sock_fd, SAS2SA(ctx->addrbuf), ctx->addrlen); + ctx->result = accept(s->sock_fd, addr, paddrlen); #endif #ifdef MS_WINDOWS @@ -2332,10 +2451,10 @@ sock_setblocking(PySocketSockObject *s, PyObject *arg) return NULL; s->sock_timeout = _PyTime_FromSeconds(block ? -1 : 0); - internal_setblocking(s, block); - - Py_INCREF(Py_None); - return Py_None; + if (internal_setblocking(s, block) == -1) { + return NULL; + } + Py_RETURN_NONE; } PyDoc_STRVAR(setblocking_doc, @@ -2401,10 +2520,10 @@ sock_settimeout(PySocketSockObject *s, PyObject *arg) return NULL; s->sock_timeout = timeout; - internal_setblocking(s, timeout < 0); - - Py_INCREF(Py_None); - return Py_None; + if (internal_setblocking(s, timeout < 0) == -1) { + return NULL; + } + Py_RETURN_NONE; } PyDoc_STRVAR(settimeout_doc, @@ -2438,9 +2557,12 @@ operations. A timeout of None indicates that timeouts on socket \n\ operations are disabled."); /* s.setsockopt() method. - With an integer third argument, sets an integer option. + With an integer third argument, sets an integer optval with optlen=4. + With None as third argument and an integer fourth argument, set + optval=NULL with unsigned int as optlen. With a string third argument, sets an option from a buffer; - use optional built-in module 'struct' to encode the string. */ + use optional built-in module 'struct' to encode the string. +*/ static PyObject * sock_setsockopt(PySocketSockObject *s, PyObject *args) @@ -2450,31 +2572,64 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args) int res; Py_buffer optval; int flag; + unsigned int optlen; + PyObject *none; + /* setsockopt(level, opt, flag) */ if (PyArg_ParseTuple(args, "iii:setsockopt", &level, &optname, &flag)) { res = setsockopt(s->sock_fd, level, optname, (char*)&flag, sizeof flag); + goto done; } - else { - PyErr_Clear(); - if (!PyArg_ParseTuple(args, "iiy*:setsockopt", - &level, &optname, &optval)) - return NULL; - res = setsockopt(s->sock_fd, level, optname, optval.buf, optval.len); + + PyErr_Clear(); + /* setsockopt(level, opt, None, flag) */ + if (PyArg_ParseTuple(args, "iiO!I:setsockopt", + &level, &optname, Py_TYPE(Py_None), &none, &optlen)) { + assert(sizeof(socklen_t) >= sizeof(unsigned int)); + res = setsockopt(s->sock_fd, level, optname, + NULL, (socklen_t)optlen); + goto done; + } + + PyErr_Clear(); + /* setsockopt(level, opt, buffer) */ + if (!PyArg_ParseTuple(args, "iiy*:setsockopt", + &level, &optname, &optval)) + return NULL; + +#ifdef MS_WINDOWS + if (optval.len > INT_MAX) { PyBuffer_Release(&optval); + PyErr_Format(PyExc_OverflowError, + "socket option is larger than %i bytes", + INT_MAX); + return NULL; } - if (res < 0) + res = setsockopt(s->sock_fd, level, optname, + optval.buf, (int)optval.len); +#else + res = setsockopt(s->sock_fd, level, optname, optval.buf, optval.len); +#endif + PyBuffer_Release(&optval); + +done: + if (res < 0) { return s->errorhandler(); - Py_INCREF(Py_None); - return Py_None; + } + + Py_RETURN_NONE; } PyDoc_STRVAR(setsockopt_doc, -"setsockopt(level, option, value)\n\ +"setsockopt(level, option, value: int)\n\ +setsockopt(level, option, value: buffer)\n\ +setsockopt(level, option, None, optlen: int)\n\ \n\ Set a socket option. See the Unix manual for level and option.\n\ -The value argument can either be an integer or a string."); +The value argument can either be an integer, a string buffer, or \n\ +None, optlen."); /* s.getsockopt() method. @@ -2566,17 +2721,22 @@ static PyObject * sock_close(PySocketSockObject *s) { SOCKET_T fd; + int res; - /* We do not want to retry upon EINTR: see http://lwn.net/Articles/576478/ - * and http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html - * for more details. - */ fd = s->sock_fd; if (fd != INVALID_SOCKET) { s->sock_fd = INVALID_SOCKET; + + /* We do not want to retry upon EINTR: see + http://lwn.net/Articles/576478/ and + http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html + for more details. */ Py_BEGIN_ALLOW_THREADS - (void) SOCKETCLOSE(fd); + res = SOCKETCLOSE(fd); Py_END_ALLOW_THREADS + if (res < 0) { + return s->errorhandler(); + } } Py_INCREF(Py_None); return Py_None; @@ -3759,6 +3919,63 @@ struct sock_sendmsg { }; static int +sock_sendmsg_iovec(PySocketSockObject *s, PyObject *data_arg, + struct msghdr *msg, + Py_buffer **databufsout, Py_ssize_t *ndatabufsout) { + Py_ssize_t ndataparts, ndatabufs = 0; + int result = -1; + struct iovec *iovs = NULL; + PyObject *data_fast = NULL; + Py_buffer *databufs = NULL; + + /* Fill in an iovec for each message part, and save the Py_buffer + structs to release afterwards. */ + data_fast = PySequence_Fast(data_arg, + "sendmsg() argument 1 must be an " + "iterable"); + if (data_fast == NULL) { + goto finally; + } + + ndataparts = PySequence_Fast_GET_SIZE(data_fast); + if (ndataparts > INT_MAX) { + PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long"); + goto finally; + } + + msg->msg_iovlen = ndataparts; + if (ndataparts > 0) { + iovs = PyMem_New(struct iovec, ndataparts); + if (iovs == NULL) { + PyErr_NoMemory(); + goto finally; + } + msg->msg_iov = iovs; + + databufs = PyMem_New(Py_buffer, ndataparts); + if (databufs == NULL) { + PyErr_NoMemory(); + goto finally; + } + } + for (; ndatabufs < ndataparts; ndatabufs++) { + if (!PyArg_Parse(PySequence_Fast_GET_ITEM(data_fast, ndatabufs), + "y*;sendmsg() argument 1 must be an iterable of " + "bytes-like objects", + &databufs[ndatabufs])) + goto finally; + iovs[ndatabufs].iov_base = databufs[ndatabufs].buf; + iovs[ndatabufs].iov_len = databufs[ndatabufs].len; + } + result = 0; + finally: + *databufsout = databufs; + *ndatabufsout = ndatabufs; + Py_XDECREF(data_fast); + return result; +} + +static int sock_sendmsg_impl(PySocketSockObject *s, void *data) { struct sock_sendmsg *ctx = data; @@ -3772,11 +3989,10 @@ sock_sendmsg_impl(PySocketSockObject *s, void *data) static PyObject * sock_sendmsg(PySocketSockObject *s, PyObject *args) { - Py_ssize_t i, ndataparts, ndatabufs = 0, ncmsgs, ncmsgbufs = 0; + Py_ssize_t i, ndatabufs = 0, ncmsgs, ncmsgbufs = 0; Py_buffer *databufs = NULL; - struct iovec *iovs = NULL; sock_addr_t addrbuf; - struct msghdr msg = {0}; + struct msghdr msg; struct cmsginfo { int level; int type; @@ -3785,13 +4001,16 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args) void *controlbuf = NULL; size_t controllen, controllen_last; int addrlen, flags = 0; - PyObject *data_arg, *cmsg_arg = NULL, *addr_arg = NULL, *data_fast = NULL, + PyObject *data_arg, *cmsg_arg = NULL, *addr_arg = NULL, *cmsg_fast = NULL, *retval = NULL; struct sock_sendmsg ctx; if (!PyArg_ParseTuple(args, "O|OiO:sendmsg", - &data_arg, &cmsg_arg, &flags, &addr_arg)) + &data_arg, &cmsg_arg, &flags, &addr_arg)) { return NULL; + } + + memset(&msg, 0, sizeof(msg)); /* Parse destination address. */ if (addr_arg != NULL && addr_arg != Py_None) { @@ -3803,31 +4022,9 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args) /* Fill in an iovec for each message part, and save the Py_buffer structs to release afterwards. */ - if ((data_fast = PySequence_Fast(data_arg, - "sendmsg() argument 1 must be an " - "iterable")) == NULL) - goto finally; - ndataparts = PySequence_Fast_GET_SIZE(data_fast); - if (ndataparts > INT_MAX) { - PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long"); + if (sock_sendmsg_iovec(s, data_arg, &msg, &databufs, &ndatabufs) == -1) { goto finally; } - msg.msg_iovlen = ndataparts; - if (ndataparts > 0 && - ((msg.msg_iov = iovs = PyMem_New(struct iovec, ndataparts)) == NULL || - (databufs = PyMem_New(Py_buffer, ndataparts)) == NULL)) { - PyErr_NoMemory(); - goto finally; - } - for (; ndatabufs < ndataparts; ndatabufs++) { - if (!PyArg_Parse(PySequence_Fast_GET_ITEM(data_fast, ndatabufs), - "y*;sendmsg() argument 1 must be an iterable of " - "bytes-like objects", - &databufs[ndatabufs])) - goto finally; - iovs[ndatabufs].iov_base = databufs[ndatabufs].buf; - iovs[ndatabufs].iov_len = databufs[ndatabufs].len; - } if (cmsg_arg == NULL) ncmsgs = 0; @@ -3885,11 +4082,13 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args) if (ncmsgbufs > 0) { struct cmsghdr *cmsgh = NULL; - if ((msg.msg_control = controlbuf = - PyMem_Malloc(controllen)) == NULL) { + controlbuf = PyMem_Malloc(controllen); + if (controlbuf == NULL) { PyErr_NoMemory(); goto finally; } + msg.msg_control = controlbuf; + msg.msg_controllen = controllen; /* Need to zero out the buffer as a workaround for glibc's @@ -3954,11 +4153,11 @@ finally: PyBuffer_Release(&cmsgs[i].data); PyMem_Free(cmsgs); Py_XDECREF(cmsg_fast); - for (i = 0; i < ndatabufs; i++) + PyMem_Free(msg.msg_iov); + for (i = 0; i < ndatabufs; i++) { PyBuffer_Release(&databufs[i]); + } PyMem_Free(databufs); - PyMem_Free(iovs); - Py_XDECREF(data_fast); return retval; } @@ -3980,6 +4179,171 @@ the message. The return value is the number of bytes of non-ancillary\n\ data sent."); #endif /* CMSG_LEN */ +#ifdef HAVE_SOCKADDR_ALG +static PyObject* +sock_sendmsg_afalg(PySocketSockObject *self, PyObject *args, PyObject *kwds) +{ + PyObject *retval = NULL; + + Py_ssize_t i, ndatabufs = 0; + Py_buffer *databufs = NULL; + PyObject *data_arg = NULL; + + Py_buffer iv = {NULL, NULL}; + + PyObject *opobj = NULL; + int op = -1; + + PyObject *assoclenobj = NULL; + int assoclen = -1; + + unsigned int *uiptr; + int flags = 0; + + struct msghdr msg; + struct cmsghdr *header = NULL; + struct af_alg_iv *alg_iv = NULL; + struct sock_sendmsg ctx; + Py_ssize_t controllen; + void *controlbuf = NULL; + static char *keywords[] = {"msg", "op", "iv", "assoclen", "flags", 0}; + + if (self->sock_family != AF_ALG) { + PyErr_SetString(PyExc_OSError, + "algset is only supported for AF_ALG"); + return NULL; + } + + if (!PyArg_ParseTupleAndKeywords(args, kwds, + "|O$O!y*O!i:sendmsg_afalg", keywords, + &data_arg, + &PyLong_Type, &opobj, &iv, + &PyLong_Type, &assoclenobj, &flags)) { + return NULL; + } + + memset(&msg, 0, sizeof(msg)); + + /* op is a required, keyword-only argument >= 0 */ + if (opobj != NULL) { + op = _PyLong_AsInt(opobj); + } + if (op < 0) { + /* override exception from _PyLong_AsInt() */ + PyErr_SetString(PyExc_TypeError, + "Invalid or missing argument 'op'"); + goto finally; + } + /* assoclen is optional but must be >= 0 */ + if (assoclenobj != NULL) { + assoclen = _PyLong_AsInt(assoclenobj); + if (assoclen == -1 && PyErr_Occurred()) { + goto finally; + } + if (assoclen < 0) { + PyErr_SetString(PyExc_TypeError, + "assoclen must be positive"); + goto finally; + } + } + + controllen = CMSG_SPACE(4); + if (iv.buf != NULL) { + controllen += CMSG_SPACE(sizeof(*alg_iv) + iv.len); + } + if (assoclen >= 0) { + controllen += CMSG_SPACE(4); + } + + controlbuf = PyMem_Malloc(controllen); + if (controlbuf == NULL) { + PyErr_NoMemory(); + goto finally; + } + memset(controlbuf, 0, controllen); + + msg.msg_controllen = controllen; + msg.msg_control = controlbuf; + + /* Fill in an iovec for each message part, and save the Py_buffer + structs to release afterwards. */ + if (data_arg != NULL) { + if (sock_sendmsg_iovec(self, data_arg, &msg, &databufs, &ndatabufs) == -1) { + goto finally; + } + } + + /* set operation to encrypt or decrypt */ + header = CMSG_FIRSTHDR(&msg); + if (header == NULL) { + PyErr_SetString(PyExc_RuntimeError, + "unexpected NULL result from CMSG_FIRSTHDR"); + goto finally; + } + header->cmsg_level = SOL_ALG; + header->cmsg_type = ALG_SET_OP; + header->cmsg_len = CMSG_LEN(4); + uiptr = (void*)CMSG_DATA(header); + *uiptr = (unsigned int)op; + + /* set initialization vector */ + if (iv.buf != NULL) { + header = CMSG_NXTHDR(&msg, header); + if (header == NULL) { + PyErr_SetString(PyExc_RuntimeError, + "unexpected NULL result from CMSG_NXTHDR(iv)"); + goto finally; + } + header->cmsg_level = SOL_ALG; + header->cmsg_type = ALG_SET_IV; + header->cmsg_len = CMSG_SPACE(sizeof(*alg_iv) + iv.len); + alg_iv = (void*)CMSG_DATA(header); + alg_iv->ivlen = iv.len; + memcpy(alg_iv->iv, iv.buf, iv.len); + } + + /* set length of associated data for AEAD */ + if (assoclen >= 0) { + header = CMSG_NXTHDR(&msg, header); + if (header == NULL) { + PyErr_SetString(PyExc_RuntimeError, + "unexpected NULL result from CMSG_NXTHDR(assoc)"); + goto finally; + } + header->cmsg_level = SOL_ALG; + header->cmsg_type = ALG_SET_AEAD_ASSOCLEN; + header->cmsg_len = CMSG_LEN(4); + uiptr = (void*)CMSG_DATA(header); + *uiptr = (unsigned int)assoclen; + } + + ctx.msg = &msg; + ctx.flags = flags; + if (sock_call(self, 1, sock_sendmsg_impl, &ctx) < 0) { + goto finally; + } + + retval = PyLong_FromSsize_t(ctx.result); + + finally: + PyMem_Free(controlbuf); + if (iv.buf != NULL) { + PyBuffer_Release(&iv); + } + PyMem_Free(msg.msg_iov); + for (i = 0; i < ndatabufs; i++) { + PyBuffer_Release(&databufs[i]); + } + PyMem_Free(databufs); + return retval; +} + +PyDoc_STRVAR(sendmsg_afalg_doc, +"sendmsg_afalg([msg], *, op[, iv[, assoclen[, flags=MSG_MORE]]])\n\ +\n\ +Set operation mode, IV and length of associated data for an AF_ALG\n\ +operation socket."); +#endif /* s.shutdown(how) method */ @@ -4038,6 +4402,17 @@ sock_ioctl(PySocketSockObject *s, PyObject *arg) return set_error(); } return PyLong_FromUnsignedLong(recv); } +#if defined(SIO_LOOPBACK_FAST_PATH) + case SIO_LOOPBACK_FAST_PATH: { + unsigned int option; + if (!PyArg_ParseTuple(arg, "kI:ioctl", &cmd, &option)) + return NULL; + if (WSAIoctl(s->sock_fd, cmd, &option, sizeof(option), + NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) { + return set_error(); + } + return PyLong_FromUnsignedLong(recv); } +#endif default: PyErr_Format(PyExc_ValueError, "invalid ioctl command %d", cmd); return NULL; @@ -4048,7 +4423,8 @@ PyDoc_STRVAR(sock_ioctl_doc, \n\ Control the socket with WSAIoctl syscall. Currently supported 'cmd' values are\n\ SIO_RCVALL: 'option' must be one of the socket.RCVALL_* constants.\n\ -SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval)."); +SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval).\n\ +SIO_LOOPBACK_FAST_PATH: 'option' is a boolean value, and is disabled by default"); #endif #if defined(MS_WINDOWS) @@ -4147,6 +4523,10 @@ static PyMethodDef sock_methods[] = { {"sendmsg", (PyCFunction)sock_sendmsg, METH_VARARGS, sendmsg_doc}, #endif +#ifdef HAVE_SOCKADDR_ALG + {"sendmsg_afalg", (PyCFunction)sock_sendmsg_afalg, METH_VARARGS | METH_KEYWORDS, + sendmsg_afalg_doc}, +#endif {NULL, NULL} /* sentinel */ }; @@ -4167,22 +4547,45 @@ static PyGetSetDef sock_getsetlist[] = { First close the file description. */ static void -sock_dealloc(PySocketSockObject *s) +sock_finalize(PySocketSockObject *s) { + SOCKET_T fd; + PyObject *error_type, *error_value, *error_traceback; + + /* Save the current exception, if any. */ + PyErr_Fetch(&error_type, &error_value, &error_traceback); + if (s->sock_fd != INVALID_SOCKET) { - PyObject *exc, *val, *tb; - Py_ssize_t old_refcount = Py_REFCNT(s); - ++Py_REFCNT(s); - PyErr_Fetch(&exc, &val, &tb); - if (PyErr_WarnFormat(PyExc_ResourceWarning, 1, - "unclosed %R", s)) + if (PyErr_ResourceWarning((PyObject *)s, 1, "unclosed %R", s)) { /* Spurious errors can appear at shutdown */ - if (PyErr_ExceptionMatches(PyExc_Warning)) - PyErr_WriteUnraisable((PyObject *) s); - PyErr_Restore(exc, val, tb); - (void) SOCKETCLOSE(s->sock_fd); - Py_REFCNT(s) = old_refcount; + if (PyErr_ExceptionMatches(PyExc_Warning)) { + PyErr_WriteUnraisable((PyObject *)s); + } + } + + /* Only close the socket *after* logging the ResourceWarning warning + to allow the logger to call socket methods like + socket.getsockname(). If the socket is closed before, socket + methods fails with the EBADF error. */ + fd = s->sock_fd; + s->sock_fd = INVALID_SOCKET; + + /* We do not want to retry upon EINTR: see sock_close() */ + Py_BEGIN_ALLOW_THREADS + (void) SOCKETCLOSE(fd); + Py_END_ALLOW_THREADS } + + /* Restore the saved exception. */ + PyErr_Restore(error_type, error_value, error_traceback); +} + +static void +sock_dealloc(PySocketSockObject *s) +{ + if (PyObject_CallFinalizerFromDealloc((PyObject *)s) < 0) + return; + Py_TYPE(s)->tp_free((PyObject *)s); } @@ -4370,7 +4773,10 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) } #endif } - init_sockobject(s, fd, family, type, proto); + if (init_sockobject(s, fd, family, type, proto) == -1) { + SOCKETCLOSE(fd); + return -1; + } return 0; @@ -4399,7 +4805,8 @@ static PyTypeObject sock_type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE + | Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */ sock_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ @@ -4419,6 +4826,15 @@ static PyTypeObject sock_type = { PyType_GenericAlloc, /* tp_alloc */ sock_new, /* tp_new */ PyObject_Del, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ + 0, /* tp_del */ + 0, /* tp_version_tag */ + (destructor)sock_finalize, /* tp_finalize */ }; @@ -5454,10 +5870,6 @@ socket_inet_ntop(PyObject *self, PyObject *args) } else { return PyUnicode_FromString(retval); } - - /* NOTREACHED */ - PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop"); - return NULL; } #elif defined(MS_WINDOWS) @@ -5577,7 +5989,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs) PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", value); pptr = pbuf; } else if (PyUnicode_Check(pobj)) { - pptr = _PyUnicode_AsString(pobj); + pptr = PyUnicode_AsUTF8(pobj); if (pptr == NULL) goto err; } else if (PyBytes_Check(pobj)) { @@ -6191,9 +6603,6 @@ PyInit__socket(void) PyModule_AddIntMacro(m, AF_UNSPEC); #endif PyModule_AddIntMacro(m, AF_INET); -#ifdef AF_INET6 - PyModule_AddIntMacro(m, AF_INET6); -#endif /* AF_INET6 */ #if defined(AF_UNIX) PyModule_AddIntMacro(m, AF_UNIX); #endif /* AF_UNIX */ @@ -6224,6 +6633,9 @@ PyInit__socket(void) /* Reserved for Werner's ATM */ PyModule_AddIntMacro(m, AF_AAL5); #endif +#ifdef HAVE_SOCKADDR_ALG + PyModule_AddIntMacro(m, AF_ALG); /* Linux crypto */ +#endif #ifdef AF_X25 /* Reserved for X.25 project */ PyModule_AddIntMacro(m, AF_X25); @@ -6285,6 +6697,9 @@ PyInit__socket(void) #ifdef NETLINK_TAPBASE PyModule_AddIntMacro(m, NETLINK_TAPBASE); #endif +#ifdef NETLINK_CRYPTO + PyModule_AddIntMacro(m, NETLINK_CRYPTO); +#endif #endif /* AF_NETLINK */ #ifdef AF_ROUTE /* Alias to emulate 4.4BSD */ @@ -6438,11 +6853,30 @@ PyInit__socket(void) PyModule_AddIntMacro(m, TIPC_TOP_SRV); #endif +#ifdef HAVE_SOCKADDR_ALG + /* Socket options */ + PyModule_AddIntMacro(m, ALG_SET_KEY); + PyModule_AddIntMacro(m, ALG_SET_IV); + PyModule_AddIntMacro(m, ALG_SET_OP); + PyModule_AddIntMacro(m, ALG_SET_AEAD_ASSOCLEN); + PyModule_AddIntMacro(m, ALG_SET_AEAD_AUTHSIZE); + PyModule_AddIntMacro(m, ALG_SET_PUBKEY); + + /* Operations */ + PyModule_AddIntMacro(m, ALG_OP_DECRYPT); + PyModule_AddIntMacro(m, ALG_OP_ENCRYPT); + PyModule_AddIntMacro(m, ALG_OP_SIGN); + PyModule_AddIntMacro(m, ALG_OP_VERIFY); +#endif + /* Socket types */ PyModule_AddIntMacro(m, SOCK_STREAM); PyModule_AddIntMacro(m, SOCK_DGRAM); /* We have incomplete socket support. */ +#ifdef SOCK_RAW + /* SOCK_RAW is marked as optional in the POSIX specification */ PyModule_AddIntMacro(m, SOCK_RAW); +#endif PyModule_AddIntMacro(m, SOCK_SEQPACKET); #if defined(SOCK_RDM) PyModule_AddIntMacro(m, SOCK_RDM); @@ -6485,9 +6919,11 @@ PyInit__socket(void) #ifdef SO_OOBINLINE PyModule_AddIntMacro(m, SO_OOBINLINE); #endif +#ifndef __GNU__ #ifdef SO_REUSEPORT PyModule_AddIntMacro(m, SO_REUSEPORT); #endif +#endif #ifdef SO_SNDBUF PyModule_AddIntMacro(m, SO_SNDBUF); #endif @@ -6524,6 +6960,12 @@ PyInit__socket(void) #ifdef LOCAL_PEERCRED PyModule_AddIntMacro(m, LOCAL_PEERCRED); #endif +#ifdef SO_PASSSEC + PyModule_AddIntMacro(m, SO_PASSSEC); +#endif +#ifdef SO_PEERSEC + PyModule_AddIntMacro(m, SO_PEERSEC); +#endif #ifdef SO_BINDTODEVICE PyModule_AddIntMacro(m, SO_BINDTODEVICE); #endif @@ -6533,6 +6975,12 @@ PyInit__socket(void) #ifdef SO_MARK PyModule_AddIntMacro(m, SO_MARK); #endif +#ifdef SO_DOMAIN + PyModule_AddIntMacro(m, SO_DOMAIN); +#endif +#ifdef SO_PROTOCOL + PyModule_AddIntMacro(m, SO_PROTOCOL); +#endif /* Maximum number of connections for "listen" */ #ifdef SOMAXCONN @@ -6691,6 +7139,9 @@ PyInit__socket(void) #ifdef SOL_RDS PyModule_AddIntMacro(m, SOL_RDS); #endif +#ifdef HAVE_SOCKADDR_ALG + PyModule_AddIntMacro(m, SOL_ALG); +#endif #ifdef RDS_CANCEL_SENT_TO PyModule_AddIntMacro(m, RDS_CANCEL_SENT_TO); #endif @@ -7061,6 +7512,12 @@ PyInit__socket(void) #ifdef TCP_FASTOPEN PyModule_AddIntMacro(m, TCP_FASTOPEN); #endif +#ifdef TCP_CONGESTION + PyModule_AddIntMacro(m, TCP_CONGESTION); +#endif +#ifdef TCP_USER_TIMEOUT + PyModule_AddIntMacro(m, TCP_USER_TIMEOUT); +#endif /* IPX options */ #ifdef IPX_TYPE @@ -7228,8 +7685,16 @@ PyInit__socket(void) #ifdef SIO_RCVALL { - DWORD codes[] = {SIO_RCVALL, SIO_KEEPALIVE_VALS}; - const char *names[] = {"SIO_RCVALL", "SIO_KEEPALIVE_VALS"}; + DWORD codes[] = {SIO_RCVALL, SIO_KEEPALIVE_VALS, +#if defined(SIO_LOOPBACK_FAST_PATH) + SIO_LOOPBACK_FAST_PATH +#endif + }; + const char *names[] = {"SIO_RCVALL", "SIO_KEEPALIVE_VALS", +#if defined(SIO_LOOPBACK_FAST_PATH) + "SIO_LOOPBACK_FAST_PATH" +#endif + }; int i; for(i = 0; idata_stack_base; \ TRACE(("allocating %s in %" PY_FORMAT_SIZE_T "d " \ "(%" PY_FORMAT_SIZE_T "d)\n", \ - SFY(type), alloc_pos, sizeof(type))); \ + Py_STRINGIFY(type), alloc_pos, sizeof(type))); \ if (sizeof(type) > state->data_stack_size - alloc_pos) { \ int j = data_stack_grow(state, sizeof(type)); \ if (j < 0) return j; \ @@ -387,7 +385,7 @@ do { \ #define DATA_STACK_LOOKUP_AT(state, type, ptr, pos) \ do { \ - TRACE(("looking up %s at %" PY_FORMAT_SIZE_T "d\n", SFY(type), pos)); \ + TRACE(("looking up %s at %" PY_FORMAT_SIZE_T "d\n", Py_STRINGIFY(type), pos)); \ ptr = (type*)(state->data_stack+pos); \ } while (0) @@ -531,7 +529,7 @@ entrance: if (ctx->pattern[0] == SRE_OP_INFO) { /* optimization info block */ /* <1=skip> <2=flags> <3=min> ... */ - if (ctx->pattern[3] && (Py_uintptr_t)(end - ctx->ptr) < ctx->pattern[3]) { + if (ctx->pattern[3] && (uintptr_t)(end - ctx->ptr) < ctx->pattern[3]) { TRACE(("reject (got %" PY_FORMAT_SIZE_T "d chars, " "need %" PY_FORMAT_SIZE_T "d)\n", end - ctx->ptr, (Py_ssize_t) ctx->pattern[3])); @@ -1256,7 +1254,32 @@ SRE(search)(SRE_STATE* state, SRE_CODE* pattern) prefix, prefix_len, prefix_skip)); TRACE(("charset = %p\n", charset)); -#if defined(USE_FAST_SEARCH) + if (prefix_len == 1) { + /* pattern starts with a literal character */ + SRE_CHAR c = (SRE_CHAR) prefix[0]; +#if SIZEOF_SRE_CHAR < 4 + if ((SRE_CODE) c != prefix[0]) + return 0; /* literal can't match: doesn't fit in char width */ +#endif + end = (SRE_CHAR *)state->end; + while (ptr < end) { + while (*ptr != c) { + if (++ptr >= end) + return 0; + } + TRACE(("|%p|%p|SEARCH LITERAL\n", pattern, ptr)); + state->start = ptr; + state->ptr = ptr + prefix_skip; + if (flags & SRE_INFO_LITERAL) + return 1; /* we got all of it */ + status = SRE(match)(state, pattern + 2*prefix_skip, 0); + if (status != 0) + return status; + ++ptr; + } + return 0; + } + if (prefix_len > 1) { /* pattern starts with a known prefix. use the overlap table to skip forward as fast as we possibly can */ @@ -1305,32 +1328,8 @@ SRE(search)(SRE_STATE* state, SRE_CODE* pattern) } return 0; } -#endif - if (pattern[0] == SRE_OP_LITERAL) { - /* pattern starts with a literal character. this is used - for short prefixes, and if fast search is disabled */ - SRE_CHAR c = (SRE_CHAR) pattern[1]; -#if SIZEOF_SRE_CHAR < 4 - if ((SRE_CODE) c != pattern[1]) - return 0; /* literal can't match: doesn't fit in char width */ -#endif - end = (SRE_CHAR *)state->end; - while (ptr < end) { - while (*ptr != c) { - if (++ptr >= end) - return 0; - } - TRACE(("|%p|%p|SEARCH LITERAL\n", pattern, ptr)); - state->start = ptr; - state->ptr = ++ptr; - if (flags & SRE_INFO_LITERAL) - return 1; /* we got all of it */ - status = SRE(match)(state, pattern + 2, 0); - if (status != 0) - break; - } - } else if (charset) { + if (charset) { /* pattern starts with a character from a known set */ end = (SRE_CHAR *)state->end; for (;;) { diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c index f84cc78..34a6fc5 100644 --- a/Modules/symtablemodule.c +++ b/Modules/symtablemodule.c @@ -79,6 +79,7 @@ PyInit__symtable(void) PyModule_AddIntMacro(m, DEF_FREE_CLASS); PyModule_AddIntMacro(m, DEF_IMPORT); PyModule_AddIntMacro(m, DEF_BOUND); + PyModule_AddIntMacro(m, DEF_ANNOT); PyModule_AddIntConstant(m, "TYPE_FUNCTION", FunctionBlock); PyModule_AddIntConstant(m, "TYPE_CLASS", ClassBlock); diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index f2d44ff..7afca58 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -139,7 +139,7 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds) * If NULL, just let openlog figure it out (probably using C argv[0]). */ if (S_ident_o) { - ident = _PyUnicode_AsString(S_ident_o); + ident = PyUnicode_AsUTF8(S_ident_o); if (ident == NULL) return NULL; } @@ -167,7 +167,7 @@ syslog_syslog(PyObject * self, PyObject * args) return NULL; } - message = _PyUnicode_AsString(message_object); + message = PyUnicode_AsUTF8(message_object); if (message == NULL) return NULL; diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 252fdcf..db0ab58 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -160,7 +160,9 @@ PyDoc_STRVAR(clock_gettime_doc, "clock_gettime(clk_id) -> floating point number\n\ \n\ Return the time of the specified clock clk_id."); +#endif /* HAVE_CLOCK_GETTIME */ +#ifdef HAVE_CLOCK_SETTIME static PyObject * time_clock_settime(PyObject *self, PyObject *args) { @@ -191,7 +193,9 @@ PyDoc_STRVAR(clock_settime_doc, "clock_settime(clk_id, time)\n\ \n\ Set the time of the specified clock clk_id."); +#endif /* HAVE_CLOCK_SETTIME */ +#ifdef HAVE_CLOCK_GETRES static PyObject * time_clock_getres(PyObject *self, PyObject *args) { @@ -215,7 +219,7 @@ PyDoc_STRVAR(clock_getres_doc, "clock_getres(clk_id) -> floating point number\n\ \n\ Return the resolution (precision) of the specified clock clk_id."); -#endif /* HAVE_CLOCK_GETTIME */ +#endif /* HAVE_CLOCK_GETRES */ static PyObject * time_sleep(PyObject *self, PyObject *obj) @@ -250,10 +254,8 @@ static PyStructSequence_Field struct_time_type_fields[] = { {"tm_wday", "day of week, range [0, 6], Monday is 0"}, {"tm_yday", "day of year, range [1, 366]"}, {"tm_isdst", "1 if summer time is in effect, 0 if not, and -1 if unknown"}, -#ifdef HAVE_STRUCT_TM_TM_ZONE {"tm_zone", "abbreviation of timezone name"}, {"tm_gmtoff", "offset from UTC in seconds"}, -#endif /* HAVE_STRUCT_TM_TM_ZONE */ {0} }; @@ -275,7 +277,11 @@ static PyTypeObject StructTimeType; static PyObject * -tmtotuple(struct tm *p) +tmtotuple(struct tm *p +#ifndef HAVE_STRUCT_TM_TM_ZONE + , const char *zone, int gmtoff +#endif +) { PyObject *v = PyStructSequence_New(&StructTimeType); if (v == NULL) @@ -296,6 +302,10 @@ tmtotuple(struct tm *p) PyStructSequence_SET_ITEM(v, 9, PyUnicode_DecodeLocale(p->tm_zone, "surrogateescape")); SET(10, p->tm_gmtoff); +#else + PyStructSequence_SET_ITEM(v, 9, + PyUnicode_DecodeLocale(zone, "surrogateescape")); + SET(10, gmtoff); #endif /* HAVE_STRUCT_TM_TM_ZONE */ #undef SET if (PyErr_Occurred()) { @@ -311,7 +321,7 @@ tmtotuple(struct tm *p) Returns non-zero on success (parallels PyArg_ParseTuple). */ static int -parse_time_t_args(PyObject *args, char *format, time_t *pwhen) +parse_time_t_args(PyObject *args, const char *format, time_t *pwhen) { PyObject *ot = NULL; time_t whent; @@ -333,23 +343,33 @@ static PyObject * time_gmtime(PyObject *self, PyObject *args) { time_t when; - struct tm buf, *local; + struct tm buf; if (!parse_time_t_args(args, "|O:gmtime", &when)) return NULL; errno = 0; - local = gmtime(&when); - if (local == NULL) { -#ifdef EINVAL - if (errno == 0) - errno = EINVAL; -#endif - return PyErr_SetFromErrno(PyExc_OSError); - } - buf = *local; + if (_PyTime_gmtime(when, &buf) != 0) + return NULL; +#ifdef HAVE_STRUCT_TM_TM_ZONE return tmtotuple(&buf); +#else + return tmtotuple(&buf, "UTC", 0); +#endif +} + +#ifndef HAVE_TIMEGM +static time_t +timegm(struct tm *p) +{ + /* XXX: the following implementation will not work for tm_year < 1970. + but it is likely that platforms that don't have timegm do not support + negative timestamps anyways. */ + return p->tm_sec + p->tm_min*60 + p->tm_hour*3600 + p->tm_yday*86400 + + (p->tm_year-70)*31536000 + ((p->tm_year-69)/4)*86400 - + ((p->tm_year-1)/100)*86400 + ((p->tm_year+299)/400)*86400; } +#endif PyDoc_STRVAR(gmtime_doc, "gmtime([seconds]) -> (tm_year, tm_mon, tm_mday, tm_hour, tm_min,\n\ @@ -361,26 +381,6 @@ GMT). When 'seconds' is not passed in, convert the current time instead.\n\ If the platform supports the tm_gmtoff and tm_zone, they are available as\n\ attributes only."); -static int -pylocaltime(time_t *timep, struct tm *result) -{ - struct tm *local; - - assert (timep != NULL); - local = localtime(timep); - if (local == NULL) { - /* unconvertible time */ -#ifdef EINVAL - if (errno == 0) - errno = EINVAL; -#endif - PyErr_SetFromErrno(PyExc_OSError); - return -1; - } - *result = *local; - return 0; -} - static PyObject * time_localtime(PyObject *self, PyObject *args) { @@ -389,9 +389,20 @@ time_localtime(PyObject *self, PyObject *args) if (!parse_time_t_args(args, "|O:localtime", &when)) return NULL; - if (pylocaltime(&when, &buf) == -1) + if (_PyTime_localtime(when, &buf) != 0) return NULL; +#ifdef HAVE_STRUCT_TM_TM_ZONE return tmtotuple(&buf); +#else + { + struct tm local = buf; + char zone[100]; + int gmtoff; + strftime(zone, sizeof(buf), "%Z", &buf); + gmtoff = timegm(&buf) - when; + return tmtotuple(&local, zone, gmtoff); + } +#endif } PyDoc_STRVAR(localtime_doc, @@ -430,7 +441,7 @@ gettmarg(PyObject *args, struct tm *p) if (Py_TYPE(args) == &StructTimeType) { PyObject *item; item = PyTuple_GET_ITEM(args, 9); - p->tm_zone = item == Py_None ? NULL : _PyUnicode_AsString(item); + p->tm_zone = item == Py_None ? NULL : PyUnicode_AsUTF8(item); item = PyTuple_GET_ITEM(args, 10); p->tm_gmtoff = item == Py_None ? 0 : PyLong_AsLong(item); if (PyErr_Occurred()) @@ -573,7 +584,7 @@ time_strftime(PyObject *self, PyObject *args) if (tup == NULL) { time_t tt = time(NULL); - if (pylocaltime(&tt, &buf) == -1) + if (_PyTime_localtime(tt, &buf) != 0) return NULL; } else if (!gettmarg(tup, &buf) || !checktm(&buf)) @@ -596,7 +607,7 @@ time_strftime(PyObject *self, PyObject *args) buf.tm_isdst = 1; #ifdef HAVE_WCSFTIME - format = _PyUnicode_AsWideCharString(format_arg); + format = PyUnicode_AsWideCharString(format_arg, NULL); if (format == NULL) return NULL; fmt = format; @@ -732,10 +743,10 @@ _asctime(struct tm *timeptr) { /* Inspired by Open Group reference implementation available at * http://pubs.opengroup.org/onlinepubs/009695399/functions/asctime.html */ - static char wday_name[7][4] = { + static const char wday_name[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; - static char mon_name[12][4] = { + static const char mon_name[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; @@ -758,7 +769,7 @@ time_asctime(PyObject *self, PyObject *args) return NULL; if (tup == NULL) { time_t tt = time(NULL); - if (pylocaltime(&tt, &buf) == -1) + if (_PyTime_localtime(tt, &buf) != 0) return NULL; } else if (!gettmarg(tup, &buf) || !checktm(&buf)) @@ -780,7 +791,7 @@ time_ctime(PyObject *self, PyObject *args) struct tm buf; if (!parse_time_t_args(args, "|O:ctime", &tt)) return NULL; - if (pylocaltime(&tt, &buf) == -1) + if (_PyTime_localtime(tt, &buf) != 0) return NULL; return _asctime(&buf); } @@ -1034,6 +1045,7 @@ py_process_time(_Py_clock_info_t *info) } #endif + /* Currently, Python 3 requires clock() to build: see issue #22624 */ return floatclock(info); #endif } @@ -1145,6 +1157,27 @@ PyDoc_STRVAR(get_clock_info_doc, Get information of the specified clock."); static void +get_zone(char *zone, int n, struct tm *p) +{ +#ifdef HAVE_STRUCT_TM_TM_ZONE + strncpy(zone, p->tm_zone ? p->tm_zone : " ", n); +#else + tzset(); + strftime(zone, n, "%Z", p); +#endif +} + +static int +get_gmtoff(time_t t, struct tm *p) +{ +#ifdef HAVE_STRUCT_TM_TM_ZONE + return p->tm_gmtoff; +#else + return timegm(p) - t; +#endif +} + +static void PyInit_timezone(PyObject *m) { /* This code moved from PyInit_time wholesale to allow calling it from time_tzset. In the future, some parts of it can be moved back @@ -1176,22 +1209,21 @@ PyInit_timezone(PyObject *m) { otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape"); PyModule_AddObject(m, "tzname", Py_BuildValue("(NN)", otz0, otz1)); #else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/ -#ifdef HAVE_STRUCT_TM_TM_ZONE { #define YEAR ((time_t)((365 * 24 + 6) * 3600)) time_t t; - struct tm *p; + struct tm p; long janzone, julyzone; char janname[10], julyname[10]; t = (time((time_t *)0) / YEAR) * YEAR; - p = localtime(&t); - janzone = -p->tm_gmtoff; - strncpy(janname, p->tm_zone ? p->tm_zone : " ", 9); + _PyTime_localtime(t, &p); + get_zone(janname, 9, &p); + janzone = -get_gmtoff(t, &p); janname[9] = '\0'; t += YEAR/2; - p = localtime(&t); - julyzone = -p->tm_gmtoff; - strncpy(julyname, p->tm_zone ? p->tm_zone : " ", 9); + _PyTime_localtime(t, &p); + get_zone(julyname, 9, &p); + julyzone = -get_gmtoff(t, &p); julyname[9] = '\0'; if( janzone < julyzone ) { @@ -1213,8 +1245,6 @@ PyInit_timezone(PyObject *m) { janname, julyname)); } } -#else -#endif /* HAVE_STRUCT_TM_TM_ZONE */ #ifdef __CYGWIN__ tzset(); PyModule_AddIntConstant(m, "timezone", _timezone); @@ -1224,25 +1254,6 @@ PyInit_timezone(PyObject *m) { Py_BuildValue("(zz)", _tzname[0], _tzname[1])); #endif /* __CYGWIN__ */ #endif /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/ - -#if defined(HAVE_CLOCK_GETTIME) - PyModule_AddIntMacro(m, CLOCK_REALTIME); -#ifdef CLOCK_MONOTONIC - PyModule_AddIntMacro(m, CLOCK_MONOTONIC); -#endif -#ifdef CLOCK_MONOTONIC_RAW - PyModule_AddIntMacro(m, CLOCK_MONOTONIC_RAW); -#endif -#ifdef CLOCK_HIGHRES - PyModule_AddIntMacro(m, CLOCK_HIGHRES); -#endif -#ifdef CLOCK_PROCESS_CPUTIME_ID - PyModule_AddIntMacro(m, CLOCK_PROCESS_CPUTIME_ID); -#endif -#ifdef CLOCK_THREAD_CPUTIME_ID - PyModule_AddIntMacro(m, CLOCK_THREAD_CPUTIME_ID); -#endif -#endif /* HAVE_CLOCK_GETTIME */ } @@ -1253,7 +1264,11 @@ static PyMethodDef time_methods[] = { #endif #ifdef HAVE_CLOCK_GETTIME {"clock_gettime", time_clock_gettime, METH_VARARGS, clock_gettime_doc}, +#endif +#ifdef HAVE_CLOCK_SETTIME {"clock_settime", time_clock_settime, METH_VARARGS, clock_settime_doc}, +#endif +#ifdef HAVE_CLOCK_GETRES {"clock_getres", time_clock_getres, METH_VARARGS, clock_getres_doc}, #endif {"sleep", time_sleep, METH_O, sleep_doc}, @@ -1349,17 +1364,32 @@ PyInit_time(void) /* Set, or reset, module variables like time.timezone */ PyInit_timezone(m); +#ifdef CLOCK_REALTIME + PyModule_AddIntMacro(m, CLOCK_REALTIME); +#endif +#ifdef CLOCK_MONOTONIC + PyModule_AddIntMacro(m, CLOCK_MONOTONIC); +#endif +#ifdef CLOCK_MONOTONIC_RAW + PyModule_AddIntMacro(m, CLOCK_MONOTONIC_RAW); +#endif +#ifdef CLOCK_HIGHRES + PyModule_AddIntMacro(m, CLOCK_HIGHRES); +#endif +#ifdef CLOCK_PROCESS_CPUTIME_ID + PyModule_AddIntMacro(m, CLOCK_PROCESS_CPUTIME_ID); +#endif +#ifdef CLOCK_THREAD_CPUTIME_ID + PyModule_AddIntMacro(m, CLOCK_THREAD_CPUTIME_ID); +#endif + if (!initialized) { if (PyStructSequence_InitType2(&StructTimeType, &struct_time_type_desc) < 0) return NULL; } Py_INCREF(&StructTimeType); -#ifdef HAVE_STRUCT_TM_TM_ZONE PyModule_AddIntConstant(m, "_STRUCT_TM_ITEMS", 11); -#else - PyModule_AddIntConstant(m, "_STRUCT_TM_ITEMS", 9); -#endif PyModule_AddObject(m, "struct_time", (PyObject*) &StructTimeType); initialized = 1; return m; diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 1f9ba78..9e71e01 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -45,6 +45,7 @@ typedef struct change_record { const unsigned char category_changed; const unsigned char decimal_changed; const unsigned char mirrored_changed; + const unsigned char east_asian_width_changed; const double numeric_changed; } change_record; @@ -375,6 +376,8 @@ unicodedata_UCD_east_asian_width_impl(PyObject *self, int chr) const change_record *old = get_old_record(self, c); if (old->category_changed == 0) index = 0; /* unassigned */ + else if (old->east_asian_width_changed != 0xFF) + index = old->east_asian_width_changed; } return PyUnicode_FromString(_PyUnicode_EastAsianWidthNames[index]); } @@ -884,7 +887,7 @@ _gethash(const char *s, int len, int scale) return h; } -static char *hangul_syllables[][3] = { +static const char * const hangul_syllables[][3] = { { "G", "A", "" }, { "GG", "AE", "G" }, { "N", "YA", "GG" }, @@ -1057,7 +1060,7 @@ find_syllable(const char *str, int *len, int *pos, int count, int column) int i, len1; *len = -1; for (i = 0; i < count; i++) { - char *s = hangul_syllables[i][column]; + const char *s = hangul_syllables[i][column]; len1 = Py_SAFE_DOWNCAST(strlen(s), size_t, int); if (len1 <= *len) continue; diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h index 89d8768..ea40c2b 100644 --- a/Modules/unicodedata_db.h +++ b/Modules/unicodedata_db.h @@ -1,6 +1,6 @@ /* this file was generated by Tools/unicode/makeunicodedata.py 3.2 */ -#define UNIDATA_VERSION "8.0.0" +#define UNIDATA_VERSION "9.0.0" /* a list of unique database records */ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = { {0, 0, 0, 0, 0, 0}, @@ -242,12 +242,13 @@ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = { {27, 0, 11, 0, 5, 0}, {27, 0, 19, 1, 4, 136}, {27, 0, 19, 1, 4, 10}, + {30, 0, 19, 0, 2, 0}, {22, 0, 19, 1, 2, 170}, {23, 0, 19, 1, 2, 170}, {30, 0, 1, 0, 4, 136}, {9, 0, 19, 0, 4, 0}, + {27, 0, 19, 0, 2, 0}, {27, 0, 19, 1, 5, 170}, - {30, 0, 19, 0, 2, 0}, {30, 0, 19, 0, 2, 136}, {10, 0, 18, 0, 0, 136}, {26, 0, 19, 0, 2, 0}, @@ -329,6 +330,7 @@ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = { {1, 0, 4, 0, 5, 0}, {2, 0, 4, 0, 5, 0}, {9, 0, 12, 0, 5, 0}, + {4, 9, 1, 0, 5, 0}, {30, 0, 1, 0, 5, 170}, {5, 216, 1, 0, 5, 0}, {5, 226, 1, 0, 5, 0}, @@ -336,6 +338,7 @@ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = { {7, 0, 9, 0, 5, 136}, {30, 0, 1, 0, 5, 136}, {30, 0, 1, 0, 4, 0}, + {29, 0, 19, 0, 2, 0}, }; /* Reindexing of NFC first characters. */ @@ -730,39 +733,39 @@ static unsigned char index1[] = { 125, 126, 127, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 138, 41, 41, 145, 138, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 138, 138, 156, 138, 138, 138, 157, - 158, 159, 160, 161, 162, 163, 138, 138, 164, 138, 165, 166, 167, 168, - 138, 138, 169, 138, 138, 138, 170, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 41, 41, 41, 41, 41, 41, 41, 171, 172, 41, 173, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 41, 41, 41, 41, 41, 41, 41, 41, 174, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 158, 159, 160, 161, 162, 163, 138, 164, 165, 138, 166, 167, 168, 169, + 138, 138, 170, 138, 138, 138, 171, 138, 138, 172, 173, 138, 138, 138, + 138, 138, 138, 41, 41, 41, 41, 41, 41, 41, 174, 175, 41, 176, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 41, 41, 41, 41, 175, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 41, 41, 41, 41, 41, 41, 41, 41, 177, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 41, 41, 41, 41, 176, 177, 178, 179, 138, 138, 138, 138, 138, - 138, 180, 181, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 41, 41, 41, 41, 178, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 41, 41, 41, 41, 179, 180, 181, 182, 138, 138, 138, 138, 138, + 138, 183, 184, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 185, 101, 101, 101, 101, 101, + 186, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 182, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 183, 184, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 187, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 78, 185, - 186, 187, 188, 138, 189, 138, 190, 191, 192, 193, 194, 195, 196, 197, 78, - 78, 78, 78, 198, 199, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 188, 189, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 200, 201, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 202, 203, 138, 138, 204, 205, 206, 207, 208, 138, 209, 210, 209, 209, - 211, 212, 209, 213, 214, 215, 216, 217, 218, 219, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 78, 190, + 191, 192, 193, 138, 194, 138, 195, 196, 197, 198, 199, 200, 201, 202, 78, + 78, 78, 78, 203, 204, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 205, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 206, 207, 208, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 209, 210, 138, 138, 211, 212, 213, 214, 215, 138, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, @@ -787,19 +790,19 @@ static unsigned char index1[] = { 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 220, 101, 101, 101, 101, 101, 101, 101, 101, + 101, 101, 101, 101, 101, 230, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 221, 101, 222, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 231, 101, 232, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 223, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 101, 233, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 122, 122, 122, 122, 224, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 122, 122, 122, 122, 234, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, @@ -1202,7 +1205,7 @@ static unsigned char index1[] = { 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 225, 138, 226, 227, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 235, 138, 236, 237, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, @@ -1275,7 +1278,7 @@ static unsigned char index1[] = { 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 121, 121, 121, 228, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 238, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, @@ -1312,7 +1315,7 @@ static unsigned char index1[] = { 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - 121, 228, + 121, 238, }; static unsigned short index2[] = { @@ -1444,170 +1447,171 @@ static unsigned short index2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 81, 81, 86, 81, 81, 86, 81, - 81, 81, 86, 86, 86, 121, 122, 123, 81, 81, 81, 86, 81, 81, 86, 86, 81, - 81, 81, 81, 81, 135, 135, 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 48, 48, 48, 48, 48, - 140, 48, 48, 140, 48, 48, 48, 48, 48, 135, 139, 141, 48, 139, 139, 139, - 135, 135, 135, 135, 135, 135, 135, 135, 139, 139, 139, 139, 142, 139, - 139, 48, 81, 86, 81, 81, 135, 135, 135, 143, 143, 143, 143, 143, 143, - 143, 143, 48, 48, 135, 135, 83, 83, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 83, 53, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 48, - 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 0, 0, - 48, 48, 48, 48, 0, 0, 145, 48, 146, 139, 139, 135, 135, 135, 135, 0, 0, - 139, 139, 0, 0, 147, 147, 142, 48, 0, 0, 0, 0, 0, 0, 0, 0, 146, 0, 0, 0, - 0, 143, 143, 0, 143, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 48, 48, 85, 85, 148, 148, 148, 148, 148, 148, - 80, 85, 0, 0, 0, 0, 0, 135, 135, 139, 0, 48, 48, 48, 48, 48, 48, 0, 0, 0, - 0, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, - 143, 0, 48, 143, 0, 48, 48, 0, 0, 145, 0, 139, 139, 139, 135, 135, 0, 0, - 0, 0, 135, 135, 0, 0, 135, 135, 142, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, - 143, 143, 143, 48, 0, 143, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 135, 135, 48, 48, 48, 135, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 135, 135, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, - 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 0, - 48, 48, 48, 48, 48, 0, 0, 145, 48, 139, 139, 139, 135, 135, 135, 135, - 135, 0, 135, 135, 139, 0, 139, 139, 142, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 83, 85, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, - 0, 0, 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 48, 48, 0, - 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 0, 48, 48, - 48, 48, 48, 0, 0, 145, 48, 146, 135, 139, 135, 135, 135, 135, 0, 0, 139, - 147, 0, 0, 147, 147, 142, 0, 0, 0, 0, 0, 0, 0, 0, 149, 146, 0, 0, 0, 0, - 143, 143, 0, 48, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 80, 48, 148, 148, 148, 148, 148, 148, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 135, 48, 0, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, - 0, 48, 48, 140, 48, 0, 0, 0, 48, 48, 0, 48, 0, 48, 48, 0, 0, 0, 48, 48, - 0, 0, 0, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 0, 0, 0, 146, 139, 135, 139, 139, 0, 0, 0, 139, 139, 139, 0, 147, - 147, 147, 142, 0, 0, 48, 0, 0, 0, 0, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 148, - 148, 148, 26, 26, 26, 26, 26, 26, 85, 26, 0, 0, 0, 0, 0, 135, 139, 139, - 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, - 0, 0, 48, 135, 135, 135, 139, 139, 139, 139, 0, 135, 135, 150, 0, 135, - 135, 135, 142, 0, 0, 0, 0, 0, 0, 0, 151, 152, 0, 48, 48, 48, 0, 0, 0, 0, - 0, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 153, 153, 153, 153, 153, 80, 0, - 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, - 48, 48, 0, 0, 145, 48, 139, 154, 147, 139, 146, 139, 139, 0, 154, 147, - 147, 0, 147, 147, 135, 142, 0, 0, 0, 0, 0, 0, 0, 146, 146, 0, 0, 0, 0, 0, - 0, 0, 48, 0, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 0, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, - 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 0, 0, 48, 146, 139, 139, 135, 135, 135, 135, 0, 139, 139, - 139, 0, 147, 147, 147, 142, 48, 0, 0, 0, 0, 0, 0, 0, 0, 146, 0, 0, 0, 0, - 0, 0, 0, 48, 48, 48, 135, 135, 0, 0, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 148, 148, 148, 148, 148, 148, 0, 0, 0, 80, 48, 48, 48, 48, - 48, 48, 0, 0, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, - 0, 0, 155, 0, 0, 0, 0, 146, 139, 139, 135, 135, 135, 0, 135, 0, 139, 139, - 147, 139, 147, 147, 147, 146, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 0, 0, 139, 139, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 48, 156, - 135, 135, 135, 135, 157, 157, 142, 0, 0, 0, 0, 85, 48, 48, 48, 48, 48, - 48, 53, 135, 158, 158, 158, 158, 135, 135, 135, 83, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 48, 48, 0, 48, 0, 0, 48, 48, 0, 48, 0, 0, 48, 0, 0, 0, 0, 0, 0, 48, - 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, 0, 48, - 0, 0, 48, 48, 0, 48, 48, 48, 48, 135, 48, 156, 135, 135, 135, 135, 159, - 159, 0, 135, 135, 48, 0, 0, 48, 48, 48, 48, 48, 0, 53, 0, 160, 160, 160, - 160, 135, 135, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, - 0, 156, 156, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 80, 80, 80, 83, 83, 83, - 83, 83, 83, 83, 83, 161, 83, 83, 83, 83, 83, 83, 80, 83, 80, 80, 80, 86, - 86, 80, 80, 80, 80, 80, 80, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 80, 86, 80, 86, - 80, 162, 163, 164, 163, 164, 139, 139, 48, 48, 48, 143, 48, 48, 48, 48, - 0, 48, 48, 48, 48, 143, 48, 48, 48, 48, 143, 48, 48, 48, 48, 143, 48, 48, - 48, 48, 143, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 143, 48, 48, - 48, 0, 0, 0, 0, 165, 166, 167, 168, 167, 167, 169, 167, 169, 166, 166, - 166, 166, 135, 139, 166, 167, 81, 81, 142, 83, 81, 81, 48, 48, 48, 48, - 48, 135, 135, 135, 135, 135, 135, 167, 135, 135, 135, 135, 0, 135, 135, - 135, 135, 167, 135, 135, 135, 135, 167, 135, 135, 135, 135, 167, 135, - 135, 135, 135, 167, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 167, 135, 135, 135, 0, 80, 80, 80, 80, 80, 80, 80, 80, 86, 80, - 80, 80, 80, 80, 80, 0, 80, 80, 83, 83, 83, 83, 83, 80, 80, 80, 80, 83, - 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 0, 118, 118, 118, 118, + 118, 118, 118, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 108, + 86, 81, 81, 86, 81, 81, 86, 81, 81, 81, 86, 86, 86, 121, 122, 123, 81, + 81, 81, 86, 81, 81, 86, 86, 81, 81, 81, 81, 81, 135, 135, 135, 139, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 140, 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 140, 48, 48, 48, 48, 48, + 135, 139, 141, 48, 139, 139, 139, 135, 135, 135, 135, 135, 135, 135, 135, + 139, 139, 139, 139, 142, 139, 139, 48, 81, 86, 81, 81, 135, 135, 135, + 143, 143, 143, 143, 143, 143, 143, 143, 48, 48, 135, 135, 83, 83, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 83, 53, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 139, 0, 48, 48, 48, 48, + 48, 48, 48, 48, 0, 0, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, + 48, 48, 48, 0, 48, 0, 0, 0, 48, 48, 48, 48, 0, 0, 145, 48, 146, 139, 139, + 135, 135, 135, 135, 0, 0, 139, 139, 0, 0, 147, 147, 142, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 146, 0, 0, 0, 0, 143, 143, 0, 143, 48, 48, 135, 135, 0, 0, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 85, 85, 148, + 148, 148, 148, 148, 148, 80, 85, 0, 0, 0, 0, 0, 135, 135, 139, 0, 48, 48, + 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, + 48, 48, 48, 48, 0, 48, 143, 0, 48, 143, 0, 48, 48, 0, 0, 145, 0, 139, + 139, 139, 135, 135, 0, 0, 0, 0, 135, 135, 0, 0, 135, 135, 142, 0, 0, 0, + 135, 0, 0, 0, 0, 0, 0, 0, 143, 143, 143, 48, 0, 143, 0, 0, 0, 0, 0, 0, 0, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 135, 135, 48, 48, 48, + 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 139, 0, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, + 48, 48, 48, 0, 48, 48, 0, 48, 48, 48, 48, 48, 0, 0, 145, 48, 139, 139, + 139, 135, 135, 135, 135, 135, 0, 135, 135, 139, 0, 139, 139, 142, 0, 0, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 135, 135, 0, 0, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 83, 85, 0, 0, 0, 0, 0, + 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 0, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, + 48, 0, 48, 48, 0, 48, 48, 48, 48, 48, 0, 0, 145, 48, 146, 135, 139, 135, + 135, 135, 135, 0, 0, 139, 147, 0, 0, 147, 147, 142, 0, 0, 0, 0, 0, 0, 0, + 0, 149, 146, 0, 0, 0, 0, 143, 143, 0, 48, 48, 48, 135, 135, 0, 0, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 80, 48, 148, 148, 148, 148, + 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 48, 0, 48, 48, 48, 48, 48, + 48, 0, 0, 0, 48, 48, 48, 0, 48, 48, 140, 48, 0, 0, 0, 48, 48, 0, 48, 0, + 48, 48, 0, 0, 0, 48, 48, 0, 0, 0, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 146, 139, 135, 139, 139, 0, + 0, 0, 139, 139, 139, 0, 147, 147, 147, 142, 0, 0, 48, 0, 0, 0, 0, 0, 0, + 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 148, 148, 148, 26, 26, 26, 26, 26, 26, 85, 26, + 0, 0, 0, 0, 0, 135, 139, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, + 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 135, 135, 135, 139, 139, + 139, 139, 0, 135, 135, 150, 0, 135, 135, 135, 142, 0, 0, 0, 0, 0, 0, 0, + 151, 152, 0, 48, 48, 48, 0, 0, 0, 0, 0, 48, 48, 135, 135, 0, 0, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, + 153, 153, 153, 153, 153, 80, 48, 135, 139, 139, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 0, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 0, 0, 145, 48, 139, 154, 147, + 139, 146, 139, 139, 0, 154, 147, 147, 0, 147, 147, 135, 142, 0, 0, 0, 0, + 0, 0, 0, 146, 146, 0, 0, 0, 0, 0, 0, 0, 48, 0, 48, 48, 135, 135, 0, 0, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 48, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 48, 146, 139, 139, 135, + 135, 135, 135, 0, 139, 139, 139, 0, 147, 147, 147, 142, 48, 80, 0, 0, 0, + 0, 48, 48, 48, 146, 148, 148, 148, 148, 148, 148, 148, 48, 48, 48, 135, + 135, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 80, 48, 48, 48, 48, 48, 48, 0, 0, 139, + 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 155, 0, 0, 0, + 0, 146, 139, 139, 135, 135, 135, 0, 135, 0, 139, 139, 147, 139, 147, 147, + 147, 146, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 0, 0, 139, 139, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 48, 156, 135, 135, 135, 135, + 157, 157, 142, 0, 0, 0, 0, 85, 48, 48, 48, 48, 48, 48, 53, 135, 158, 158, + 158, 158, 135, 135, 135, 83, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 0, 48, 0, 0, + 48, 48, 0, 48, 0, 0, 48, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 0, 48, 48, 48, + 48, 48, 48, 48, 0, 48, 48, 48, 0, 48, 0, 48, 0, 0, 48, 48, 0, 48, 48, 48, + 48, 135, 48, 156, 135, 135, 135, 135, 159, 159, 0, 135, 135, 48, 0, 0, + 48, 48, 48, 48, 48, 0, 53, 0, 160, 160, 160, 160, 135, 135, 0, 0, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 156, 156, 48, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 80, 80, 80, 83, 83, 83, 83, 83, 83, 83, 83, 161, + 83, 83, 83, 83, 83, 83, 80, 83, 80, 80, 80, 86, 86, 80, 80, 80, 80, 80, + 80, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 80, 86, 80, 86, 80, 162, 163, 164, 163, + 164, 139, 139, 48, 48, 48, 143, 48, 48, 48, 48, 0, 48, 48, 48, 48, 143, + 48, 48, 48, 48, 143, 48, 48, 48, 48, 143, 48, 48, 48, 48, 143, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 143, 48, 48, 48, 0, 0, 0, 0, 165, + 166, 167, 168, 167, 167, 169, 167, 169, 166, 166, 166, 166, 135, 139, + 166, 167, 81, 81, 142, 83, 81, 81, 48, 48, 48, 48, 48, 135, 135, 135, + 135, 135, 135, 167, 135, 135, 135, 135, 0, 135, 135, 135, 135, 167, 135, + 135, 135, 135, 167, 135, 135, 135, 135, 167, 135, 135, 135, 135, 167, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 167, 135, + 135, 135, 0, 80, 80, 80, 80, 80, 80, 80, 80, 86, 80, 80, 80, 80, 80, 80, + 0, 80, 80, 83, 83, 83, 83, 83, 80, 80, 80, 80, 83, 83, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 48, 48, 139, - 139, 135, 149, 135, 135, 139, 135, 135, 135, 135, 135, 145, 139, 142, - 142, 139, 139, 135, 135, 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 83, 83, 83, 83, 83, 83, 48, 48, 48, 48, 48, 48, 139, 139, 135, 135, - 48, 48, 48, 48, 135, 135, 135, 48, 139, 139, 139, 48, 48, 139, 139, 139, - 139, 139, 139, 139, 48, 48, 48, 135, 135, 135, 135, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 139, 135, 135, 139, 139, 139, - 139, 139, 139, 86, 48, 139, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 139, 139, 139, 135, 80, 80, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 48, 48, 139, 139, 135, 149, 135, + 135, 139, 135, 135, 135, 135, 135, 145, 139, 142, 142, 139, 139, 135, + 135, 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 83, 83, 83, + 83, 83, 83, 48, 48, 48, 48, 48, 48, 139, 139, 135, 135, 48, 48, 48, 48, + 135, 135, 135, 48, 139, 139, 139, 48, 48, 139, 139, 139, 139, 139, 139, + 139, 48, 48, 48, 135, 135, 135, 135, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 135, 139, 139, 135, 135, 139, 139, 139, 139, 139, 139, + 86, 48, 139, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 139, 139, + 139, 135, 80, 80, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 0, 44, 0, 0, 0, 0, 0, 44, 0, 0, + 44, 44, 44, 44, 44, 44, 0, 44, 0, 0, 0, 0, 0, 44, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 83, 51, 48, 48, 48, 170, 170, 170, 170, 170, + 48, 48, 48, 83, 51, 48, 48, 48, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 48, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 48, + 170, 170, 170, 170, 48, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 171, 171, 171, 171, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, - 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, + 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, + 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, - 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, + 48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, - 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, + 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, - 81, 81, 81, 83, 83, 83, 83, 83, 83, 83, 83, 83, 148, 148, 148, 148, 148, - 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, - 148, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 44, 44, 44, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 81, 81, + 81, 83, 83, 83, 83, 83, 83, 83, 83, 83, 148, 148, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 0, + 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 0, 0, 47, 47, 47, 47, 47, 47, - 0, 0, 84, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 0, 0, 47, 47, 47, 47, 47, 47, 0, 0, + 84, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, @@ -1627,45 +1631,45 @@ static unsigned short index2[] = { 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 172, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 163, 164, - 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 172, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 163, 164, 0, + 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 83, 83, 83, 173, 173, 173, 48, 48, 48, 48, 48, 48, - 48, 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 0, 48, 48, 48, 48, 135, 135, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 135, 135, 142, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 48, 48, 48, 0, 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, + 48, 48, 48, 48, 83, 83, 83, 173, 173, 173, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 48, 48, 48, 48, 135, 135, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 135, 135, 142, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 48, 48, 48, 0, 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, - 139, 135, 135, 135, 135, 135, 135, 135, 139, 139, 139, 139, 139, 139, - 139, 139, 135, 139, 139, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 142, 135, 83, 83, 83, 53, 83, 83, 83, 85, 48, 81, 0, 0, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 0, 0, 0, 0, 0, 0, 138, 138, 138, 138, 138, - 138, 84, 138, 138, 138, 138, 135, 135, 135, 174, 0, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 139, + 135, 135, 135, 135, 135, 135, 135, 139, 139, 139, 139, 139, 139, 139, + 139, 135, 139, 139, 135, 135, 135, 135, 135, 135, 135, 135, 135, 142, + 135, 83, 83, 83, 53, 83, 83, 83, 85, 48, 81, 0, 0, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 0, 0, 0, 0, 0, 0, 138, 138, 138, 138, 138, 138, + 84, 138, 138, 138, 138, 135, 135, 135, 174, 0, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, + 48, 48, 135, 135, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 88, 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 88, 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 135, 135, 135, 139, 139, 139, 139, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 135, 135, 135, 139, 139, 139, 139, 135, 135, 139, 139, 139, 0, 0, 0, 0, 139, 139, 135, 139, 139, 139, 139, 139, 139, 87, 81, 86, 0, 0, 0, 0, 26, 0, 0, 0, 138, 138, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 48, 48, 48, 48, 48, 48, 48, @@ -1714,27 +1718,27 @@ static unsigned short index2[] = { 144, 144, 144, 144, 144, 0, 0, 0, 48, 48, 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 53, 53, 53, 53, 53, 53, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 53, 53, 53, 53, 53, 53, 83, 83, 47, 47, 47, 47, 47, 47, 47, 47, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 83, 83, 83, 83, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 81, - 83, 176, 86, 86, 86, 86, 86, 81, 81, 86, 86, 86, 86, 81, 139, 176, 176, - 176, 176, 176, 176, 176, 48, 48, 48, 48, 86, 48, 48, 48, 48, 139, 139, - 81, 48, 48, 0, 81, 81, 0, 0, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, + 0, 0, 0, 0, 0, 83, 83, 83, 83, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, + 81, 81, 81, 83, 176, 86, 86, 86, 86, 86, 81, 81, 86, 86, 86, 86, 81, 139, + 176, 176, 176, 176, 176, 176, 176, 48, 48, 48, 48, 86, 48, 48, 48, 48, + 139, 139, 81, 48, 48, 0, 81, 81, 0, 0, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 51, 51, 51, 53, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 53, 51, 51, - 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 53, 51, - 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, - 51, 51, 51, 51, 51, 51, 51, 51, 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 51, 51, 51, 53, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 53, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 53, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, + 47, 47, 47, 47, 47, 47, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, - 51, 51, 51, 51, 81, 81, 86, 81, 81, 81, 81, 81, 81, 81, 86, 81, 81, 177, - 178, 86, 179, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 51, 51, 51, 51, 51, 51, 51, 81, 81, 86, 81, 81, 81, 81, 81, 81, 81, 86, + 81, 81, 177, 178, 86, 179, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 180, 86, 81, 86, 38, 43, 38, 43, 38, + 81, 81, 81, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 81, 180, 86, 81, 86, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, @@ -1743,332 +1747,333 @@ static unsigned short index2[] = { 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, - 43, 43, 43, 43, 43, 35, 181, 47, 47, 44, 47, 38, 43, 38, 43, 38, 43, 38, + 43, 38, 43, 38, 43, 43, 43, 43, 43, 35, 181, 47, 47, 44, 47, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, - 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 44, 47, 44, 47, 44, 47, 43, - 43, 43, 43, 43, 43, 43, 43, 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, - 43, 43, 43, 0, 0, 38, 38, 38, 38, 38, 38, 0, 0, 43, 43, 43, 43, 43, 43, - 43, 43, 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, 43, 43, 43, 43, 43, - 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, 43, 43, 43, 0, 0, 38, 38, 38, - 38, 38, 38, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 0, 38, 0, 38, 0, 38, 0, - 38, 43, 43, 43, 43, 43, 43, 43, 43, 38, 38, 38, 38, 38, 38, 38, 38, 43, - 182, 43, 182, 43, 182, 43, 182, 43, 182, 43, 182, 43, 182, 0, 0, 43, 43, - 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, 183, 183, 43, 43, - 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, 183, 183, 43, 43, - 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, 183, 183, 43, 43, - 43, 43, 43, 0, 43, 43, 38, 38, 38, 184, 183, 58, 182, 58, 58, 76, 43, 43, - 43, 0, 43, 43, 38, 184, 38, 184, 183, 76, 76, 76, 43, 43, 43, 182, 0, 0, - 43, 43, 38, 38, 38, 184, 0, 76, 76, 76, 43, 43, 43, 182, 43, 43, 43, 43, - 38, 38, 38, 184, 38, 76, 185, 185, 0, 0, 43, 43, 43, 0, 43, 43, 38, 184, - 38, 184, 183, 185, 58, 0, 186, 186, 187, 187, 187, 187, 187, 187, 187, - 187, 187, 174, 174, 174, 188, 189, 190, 191, 84, 190, 190, 190, 22, 192, - 193, 194, 195, 196, 193, 194, 195, 196, 22, 22, 22, 138, 197, 197, 197, - 22, 198, 199, 200, 201, 202, 203, 204, 21, 205, 110, 205, 206, 207, 22, - 192, 192, 138, 28, 36, 22, 192, 138, 197, 208, 208, 138, 138, 138, 209, - 163, 164, 192, 192, 192, 138, 138, 138, 138, 138, 138, 138, 138, 78, 138, - 208, 138, 138, 192, 138, 138, 138, 138, 138, 138, 138, 187, 174, 174, - 174, 174, 174, 0, 210, 211, 212, 213, 174, 174, 174, 174, 174, 174, 214, - 51, 0, 0, 34, 214, 214, 214, 214, 214, 215, 215, 216, 217, 218, 219, 214, - 34, 34, 34, 34, 214, 214, 214, 214, 214, 215, 215, 216, 217, 218, 0, 51, - 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 0, 0, 0, 85, 85, 85, 85, - 85, 85, 85, 85, 220, 221, 85, 85, 23, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 81, 81, 176, 176, 81, 81, 81, 81, 176, 176, 176, 81, 81, - 82, 82, 82, 82, 81, 82, 82, 82, 176, 176, 81, 86, 81, 176, 176, 86, 86, - 86, 86, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 222, 49, - 223, 26, 223, 222, 49, 26, 223, 35, 49, 49, 49, 35, 35, 49, 49, 49, 46, - 26, 49, 223, 26, 78, 49, 49, 49, 49, 49, 26, 26, 222, 223, 223, 26, 49, - 26, 224, 26, 49, 26, 184, 224, 49, 49, 225, 35, 49, 49, 44, 49, 35, 156, - 156, 156, 156, 35, 26, 222, 35, 35, 49, 49, 226, 78, 78, 78, 78, 49, 35, - 35, 35, 35, 26, 78, 26, 26, 47, 80, 227, 227, 227, 37, 37, 227, 227, 227, - 227, 227, 227, 37, 37, 37, 37, 227, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 229, 229, 229, 229, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 229, 229, 229, 229, 229, 229, 173, 173, 173, 44, - 47, 173, 173, 173, 173, 37, 26, 26, 0, 0, 0, 0, 40, 40, 40, 40, 40, 30, - 30, 30, 30, 30, 230, 230, 26, 26, 26, 26, 78, 26, 26, 78, 26, 26, 78, 26, - 26, 26, 26, 26, 26, 26, 230, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 231, 230, 230, 26, 26, 40, 26, 40, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 40, - 232, 233, 233, 234, 78, 78, 40, 233, 234, 232, 233, 234, 232, 78, 40, 78, - 233, 235, 236, 78, 233, 232, 78, 78, 78, 233, 232, 232, 233, 40, 233, - 233, 232, 232, 40, 234, 40, 234, 40, 40, 40, 40, 233, 237, 226, 233, 226, - 226, 232, 232, 232, 40, 40, 40, 40, 78, 232, 78, 232, 233, 233, 232, 232, - 232, 234, 232, 232, 234, 232, 232, 234, 233, 234, 232, 232, 233, 78, 78, - 78, 78, 78, 233, 232, 232, 232, 78, 78, 78, 78, 78, 78, 78, 78, 78, 232, - 238, 40, 234, 78, 233, 233, 233, 233, 232, 232, 233, 233, 78, 230, 238, - 238, 234, 234, 232, 232, 234, 234, 232, 232, 234, 234, 232, 232, 232, - 232, 232, 232, 234, 234, 233, 233, 234, 234, 233, 233, 234, 234, 232, - 232, 232, 78, 78, 232, 232, 232, 232, 78, 78, 40, 78, 78, 232, 40, 78, - 78, 78, 78, 78, 78, 78, 78, 232, 232, 78, 40, 232, 232, 232, 232, 232, - 232, 234, 234, 234, 234, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, - 78, 78, 78, 78, 232, 233, 78, 78, 78, 78, 78, 78, 78, 78, 78, 232, 232, - 232, 232, 232, 78, 78, 232, 232, 78, 78, 78, 78, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 234, 234, 234, 234, 232, 232, 232, 232, 232, - 232, 234, 234, 234, 234, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 26, 26, 26, 26, 26, 26, 26, 26, - 163, 164, 163, 164, 26, 26, 26, 26, 26, 26, 30, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 232, 232, 26, 26, 26, 26, 26, 26, 26, 239, - 240, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 80, 80, 80, 80, 80, 80, + 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 38, 43, 44, 47, 44, + 47, 44, 47, 43, 43, 43, 43, 43, 43, 43, 43, 38, 38, 38, 38, 38, 38, 38, + 38, 43, 43, 43, 43, 43, 43, 0, 0, 38, 38, 38, 38, 38, 38, 0, 0, 43, 43, + 43, 43, 43, 43, 43, 43, 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, 43, + 43, 43, 43, 43, 38, 38, 38, 38, 38, 38, 38, 38, 43, 43, 43, 43, 43, 43, + 0, 0, 38, 38, 38, 38, 38, 38, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 0, + 38, 0, 38, 0, 38, 0, 38, 43, 43, 43, 43, 43, 43, 43, 43, 38, 38, 38, 38, + 38, 38, 38, 38, 43, 182, 43, 182, 43, 182, 43, 182, 43, 182, 43, 182, 43, + 182, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, + 183, 183, 43, 43, 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, + 183, 183, 43, 43, 43, 43, 43, 43, 43, 43, 183, 183, 183, 183, 183, 183, + 183, 183, 43, 43, 43, 43, 43, 0, 43, 43, 38, 38, 38, 184, 183, 58, 182, + 58, 58, 76, 43, 43, 43, 0, 43, 43, 38, 184, 38, 184, 183, 76, 76, 76, 43, + 43, 43, 182, 0, 0, 43, 43, 38, 38, 38, 184, 0, 76, 76, 76, 43, 43, 43, + 182, 43, 43, 43, 43, 38, 38, 38, 184, 38, 76, 185, 185, 0, 0, 43, 43, 43, + 0, 43, 43, 38, 184, 38, 184, 183, 185, 58, 0, 186, 186, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 174, 174, 174, 188, 189, 190, 191, 84, 190, + 190, 190, 22, 192, 193, 194, 195, 196, 193, 194, 195, 196, 22, 22, 22, + 138, 197, 197, 197, 22, 198, 199, 200, 201, 202, 203, 204, 21, 205, 110, + 205, 206, 207, 22, 192, 192, 138, 28, 36, 22, 192, 138, 197, 208, 208, + 138, 138, 138, 209, 163, 164, 192, 192, 192, 138, 138, 138, 138, 138, + 138, 138, 138, 78, 138, 208, 138, 138, 192, 138, 138, 138, 138, 138, 138, + 138, 187, 174, 174, 174, 174, 174, 0, 210, 211, 212, 213, 174, 174, 174, + 174, 174, 174, 214, 51, 0, 0, 34, 214, 214, 214, 214, 214, 215, 215, 216, + 217, 218, 219, 214, 34, 34, 34, 34, 214, 214, 214, 214, 214, 215, 215, + 216, 217, 218, 0, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 0, + 0, 0, 85, 85, 85, 85, 85, 85, 85, 85, 220, 221, 85, 85, 23, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 176, 176, 81, 81, 81, 81, + 176, 176, 176, 81, 81, 82, 82, 82, 82, 81, 82, 82, 82, 176, 176, 81, 86, + 81, 176, 176, 86, 86, 86, 86, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 222, 222, 49, 223, 26, 223, 222, 49, 26, 223, 35, 49, 49, 49, 35, + 35, 49, 49, 49, 46, 26, 49, 223, 26, 78, 49, 49, 49, 49, 49, 26, 26, 222, + 223, 223, 26, 49, 26, 224, 26, 49, 26, 184, 224, 49, 49, 225, 35, 49, 49, + 44, 49, 35, 156, 156, 156, 156, 35, 26, 222, 35, 35, 49, 49, 226, 78, 78, + 78, 78, 49, 35, 35, 35, 35, 26, 78, 26, 26, 47, 80, 227, 227, 227, 37, + 37, 227, 227, 227, 227, 227, 227, 37, 37, 37, 37, 227, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, 229, 229, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, 229, 229, 229, + 229, 173, 173, 173, 44, 47, 173, 173, 173, 173, 37, 26, 26, 0, 0, 0, 0, + 40, 40, 40, 40, 40, 30, 30, 30, 30, 30, 230, 230, 26, 26, 26, 26, 78, 26, + 26, 78, 26, 26, 78, 26, 26, 26, 26, 26, 26, 26, 230, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 231, 230, 230, 26, 26, 40, 26, 40, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 40, 232, 233, 233, 234, 78, 78, 40, 233, 234, 232, + 233, 234, 232, 78, 40, 78, 233, 235, 236, 78, 233, 232, 78, 78, 78, 233, + 232, 232, 233, 40, 233, 233, 232, 232, 40, 234, 40, 234, 40, 40, 40, 40, + 233, 237, 226, 233, 226, 226, 232, 232, 232, 40, 40, 40, 40, 78, 232, 78, + 232, 233, 233, 232, 232, 232, 234, 232, 232, 234, 232, 232, 234, 233, + 234, 232, 232, 233, 78, 78, 78, 78, 78, 233, 232, 232, 232, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 232, 238, 40, 234, 78, 233, 233, 233, 233, 232, + 232, 233, 233, 78, 230, 238, 238, 234, 234, 232, 232, 234, 234, 232, 232, + 234, 234, 232, 232, 232, 232, 232, 232, 234, 234, 233, 233, 234, 234, + 233, 233, 234, 234, 232, 232, 232, 78, 78, 232, 232, 232, 232, 78, 78, + 40, 78, 78, 232, 40, 78, 78, 78, 78, 78, 78, 78, 78, 232, 232, 78, 40, + 232, 232, 232, 232, 232, 232, 234, 234, 234, 234, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 78, 78, 78, 78, 78, 232, 233, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 232, 232, 232, 232, 232, 78, 78, 232, 232, 78, 78, + 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 234, 234, 234, + 234, 232, 232, 232, 232, 232, 232, 234, 234, 234, 234, 78, 78, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 26, + 26, 26, 26, 26, 26, 26, 26, 163, 164, 163, 164, 26, 26, 26, 26, 26, 26, + 30, 26, 26, 26, 26, 26, 26, 26, 239, 239, 26, 26, 26, 26, 232, 232, 26, + 26, 26, 26, 26, 26, 26, 240, 241, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 26, 78, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 80, - 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 26, 26, 26, 26, 26, 26, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 26, 78, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 78, 78, - 78, 78, 78, 78, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 80, 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 78, 26, 26, 26, 26, 26, 26, 26, + 239, 239, 239, 239, 26, 26, 26, 239, 26, 26, 239, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 37, 37, 37, 37, 37, 37, 37, 37, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 227, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 37, 37, 37, 37, 37, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 227, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 26, 26, 26, 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, 26, 26, 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, - 26, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, - 30, 30, 30, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, - 26, 30, 40, 26, 26, 26, 26, 30, 30, 26, 26, 30, 40, 26, 26, 26, 26, 30, - 30, 30, 26, 26, 30, 26, 26, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 30, 30, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 30, 26, 26, 26, 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, - 78, 78, 78, 26, 26, 26, 26, 26, 30, 30, 26, 26, 30, 26, 26, 26, 26, 30, - 30, 26, 26, 26, 26, 30, 30, 26, 26, 26, 26, 26, 26, 30, 26, 30, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, 30, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, 30, 30, 30, 26, 30, 30, - 30, 30, 26, 30, 30, 26, 40, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, 26, 30, 30, 30, 30, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, 30, 30, 30, 30, 30, 30, 30, 26, + 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, 26, 30, 40, 26, 26, 26, 26, 30, + 30, 26, 26, 30, 40, 26, 26, 26, 26, 30, 30, 30, 26, 26, 30, 26, 26, 30, + 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, 26, 26, + 26, 26, 26, 26, 26, 78, 78, 78, 78, 78, 244, 244, 78, 26, 26, 26, 26, 26, + 30, 30, 26, 26, 30, 26, 26, 26, 26, 30, 30, 26, 26, 26, 26, 239, 239, 26, + 26, 26, 26, 26, 26, 30, 26, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, - 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 80, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, 26, 26, - 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, 30, 26, 26, 26, - 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 30, 26, 30, 26, 26, 26, 26, 26, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 30, 30, 26, 30, 30, 30, 26, 30, 30, 30, 30, 26, 30, 30, + 26, 40, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 30, 26, 239, 26, 26, + 26, 26, 26, 26, 26, 26, 239, 239, 80, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 239, 239, 30, 26, 26, 26, 26, 239, 239, 30, + 30, 30, 30, 30, 30, 30, 30, 239, 30, 30, 30, 30, 30, 239, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 26, 30, 26, 26, 26, 26, 30, 30, 239, + 30, 30, 30, 30, 30, 30, 30, 239, 239, 30, 239, 30, 30, 30, 30, 239, 30, + 30, 239, 30, 30, 26, 26, 26, 26, 26, 239, 26, 26, 26, 26, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 30, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 26, 239, 26, 26, 26, 26, 239, + 239, 239, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 163, 164, 163, 164, 163, 164, 163, 164, 163, 164, 163, 164, - 163, 164, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 153, 153, + 163, 164, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 232, 78, 78, 232, - 232, 163, 164, 78, 232, 232, 78, 232, 232, 232, 78, 78, 78, 78, 78, 232, - 232, 232, 232, 78, 78, 78, 78, 78, 232, 232, 232, 78, 78, 78, 232, 232, - 232, 232, 9, 10, 9, 10, 9, 10, 9, 10, 163, 164, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, 80, 80, + 153, 153, 153, 153, 26, 239, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 232, 78, 78, + 232, 232, 163, 164, 78, 232, 232, 78, 232, 232, 232, 78, 78, 78, 78, 78, + 232, 232, 232, 232, 78, 78, 78, 78, 78, 232, 232, 232, 78, 78, 78, 232, + 232, 232, 232, 9, 10, 9, 10, 9, 10, 9, 10, 163, 164, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 78, 78, 78, 78, 78, 78, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 163, - 164, 9, 10, 163, 164, 163, 164, 163, 164, 163, 164, 163, 164, 163, 164, - 163, 164, 163, 164, 163, 164, 78, 78, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, - 78, 78, 78, 78, 78, 78, 78, 232, 78, 78, 78, 78, 78, 78, 78, 232, 232, - 232, 232, 232, 232, 78, 78, 78, 232, 78, 78, 78, 78, 232, 232, 232, 232, - 232, 78, 232, 232, 78, 78, 163, 164, 163, 164, 232, 78, 78, 78, 78, 232, - 78, 232, 232, 232, 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 232, 232, 232, 232, 232, 232, 78, 78, 163, 164, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 232, 232, 226, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, 232, 232, 232, 232, - 78, 78, 232, 78, 232, 78, 78, 232, 78, 232, 232, 232, 232, 78, 78, 78, - 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 232, 232, 232, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 232, 232, - 78, 78, 78, 78, 232, 232, 232, 232, 78, 232, 232, 78, 78, 232, 226, 216, - 216, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 163, 164, 9, 10, 163, 164, 163, 164, 163, 164, 163, 164, 163, 164, 163, + 164, 163, 164, 163, 164, 163, 164, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 78, 78, 78, 78, 78, 78, 78, 78, 232, 78, 78, 78, 78, 78, 78, 78, + 232, 232, 232, 232, 232, 232, 78, 78, 78, 232, 78, 78, 78, 78, 232, 232, + 232, 232, 232, 78, 232, 232, 78, 78, 163, 164, 163, 164, 232, 78, 78, 78, + 78, 232, 78, 232, 232, 232, 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 232, 232, 232, 232, 232, 232, 78, 78, 163, 164, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 232, 232, 226, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, 232, 232, + 232, 232, 78, 78, 232, 78, 232, 78, 78, 232, 78, 232, 232, 232, 232, 78, + 78, 78, 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 232, 232, 232, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 232, 232, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 232, 232, 78, 78, 78, 78, 232, 232, 232, 232, 78, 232, 232, 78, 78, 232, + 226, 216, 216, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 78, 78, 232, 232, 232, 232, 232, 232, 232, 232, + 78, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, 78, 78, 78, - 78, 243, 78, 232, 78, 78, 78, 232, 232, 232, 232, 232, 78, 78, 78, 78, - 78, 232, 232, 232, 78, 78, 78, 78, 232, 78, 78, 78, 232, 232, 232, 232, - 232, 78, 232, 78, 78, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 78, 78, 78, + 78, 78, 245, 78, 232, 78, 78, 78, 232, 232, 232, 232, 232, 78, 78, 78, + 78, 78, 232, 232, 232, 78, 78, 78, 78, 232, 78, 78, 78, 232, 232, 232, + 232, 232, 78, 232, 78, 78, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 26, 26, 78, 78, 78, 78, 78, 78, 26, 26, 26, 26, 26, 26, 26, 26, - 30, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, + 26, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 26, 26, 78, 78, 78, 78, 78, 78, 26, 26, 26, 239, 26, 26, + 26, 26, 239, 30, 30, 30, 30, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, - 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, + 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 44, 44, 44, 44, 44, 44, 44, 44, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 0, 44, 47, 44, 44, 44, 47, 47, 44, 47, 44, 47, 44, 47, 44, 44, 44, 44, - 47, 44, 47, 47, 44, 47, 47, 47, 47, 47, 47, 51, 51, 44, 44, 44, 47, 44, + 47, 47, 0, 44, 47, 44, 44, 44, 47, 47, 44, 47, 44, 47, 44, 47, 44, 44, + 44, 44, 47, 44, 47, 47, 44, 47, 47, 47, 47, 47, 47, 51, 51, 44, 44, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, - 47, 44, 47, 44, 47, 44, 47, 47, 26, 26, 26, 26, 26, 26, 44, 47, 44, 47, - 81, 81, 81, 44, 47, 0, 0, 0, 0, 0, 138, 138, 138, 138, 153, 138, 138, 47, + 47, 44, 47, 44, 47, 44, 47, 44, 47, 47, 26, 26, 26, 26, 26, 26, 44, 47, + 44, 47, 81, 81, 81, 44, 47, 0, 0, 0, 0, 0, 138, 138, 138, 138, 153, 138, + 138, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 0, 47, 0, 0, 0, 0, 0, 47, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 47, 47, 47, 0, 47, 0, 0, 0, 0, 0, 47, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 51, 83, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 142, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, - 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, - 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, - 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 81, 81, 81, 81, 81, 81, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, + 51, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 142, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, + 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, + 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, + 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 138, 138, 28, 36, 28, 36, 138, 138, 138, - 28, 36, 138, 28, 36, 138, 138, 138, 138, 138, 138, 138, 138, 138, 84, - 138, 138, 84, 138, 28, 36, 138, 138, 28, 36, 163, 164, 163, 164, 163, - 164, 163, 164, 138, 138, 138, 138, 138, 52, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 84, 84, 138, 138, 138, 138, 84, 138, 195, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 0, 244, 244, 244, 244, 245, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 0, 0, 0, 0, 246, 247, 247, 247, 244, 248, 170, 249, 250, 251, - 250, 251, 250, 251, 250, 251, 250, 251, 244, 244, 250, 251, 250, 251, - 250, 251, 250, 251, 252, 253, 254, 254, 244, 249, 249, 249, 249, 249, - 249, 249, 249, 249, 255, 256, 257, 258, 259, 259, 252, 248, 248, 248, - 248, 248, 245, 244, 260, 260, 260, 248, 170, 247, 244, 26, 0, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 261, 170, 261, 170, 261, - 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, - 170, 261, 170, 261, 170, 170, 261, 170, 261, 170, 261, 170, 170, 170, - 170, 170, 170, 261, 261, 170, 261, 261, 170, 261, 261, 170, 261, 261, - 170, 261, 261, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 261, 170, 170, 0, - 0, 262, 262, 263, 263, 248, 264, 265, 252, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, - 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, 170, 261, - 170, 170, 261, 170, 261, 170, 261, 170, 170, 170, 170, 170, 170, 261, - 261, 170, 261, 261, 170, 261, 261, 170, 261, 261, 170, 261, 261, 170, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 138, 138, 28, 36, 28, 36, 138, + 138, 138, 28, 36, 138, 28, 36, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 84, 138, 138, 84, 138, 28, 36, 138, 138, 28, 36, 163, 164, 163, 164, + 163, 164, 163, 164, 138, 138, 138, 138, 138, 52, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 84, 84, 138, 138, 138, 138, 84, 138, 195, 138, + 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 0, 239, 239, 239, 239, 246, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 246, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, + 246, 246, 246, 246, 246, 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 0, 0, 0, 0, 247, 248, 248, 248, 239, 249, 170, + 250, 251, 252, 251, 252, 251, 252, 251, 252, 251, 252, 239, 239, 251, + 252, 251, 252, 251, 252, 251, 252, 253, 254, 255, 255, 239, 250, 250, + 250, 250, 250, 250, 250, 250, 250, 256, 257, 258, 259, 260, 260, 253, + 249, 249, 249, 249, 249, 246, 239, 261, 261, 261, 249, 170, 248, 239, 26, + 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 262, 170, 262, + 170, 262, 170, 262, 170, 262, 170, 262, 170, 262, 170, 262, 170, 262, + 170, 262, 170, 262, 170, 262, 170, 170, 262, 170, 262, 170, 262, 170, + 170, 170, 170, 170, 170, 262, 262, 170, 262, 262, 170, 262, 262, 170, + 262, 262, 170, 262, 262, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 262, + 170, 170, 0, 0, 263, 263, 264, 264, 249, 265, 266, 253, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 262, 170, 262, 170, 262, 170, + 262, 170, 262, 170, 262, 170, 262, 170, 262, 170, 262, 170, 262, 170, + 262, 170, 262, 170, 170, 262, 170, 262, 170, 262, 170, 170, 170, 170, + 170, 170, 262, 262, 170, 262, 262, 170, 262, 262, 170, 262, 262, 170, + 262, 262, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 262, 170, 170, 262, + 262, 262, 262, 248, 249, 249, 265, 266, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 261, 170, 170, 261, 261, 261, 261, - 247, 248, 248, 264, 265, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 266, 0, 267, 267, 268, 268, 268, 268, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 0, 266, 266, 267, 267, 267, 267, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 245, 245, 0, - 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 269, 269, - 269, 269, 269, 269, 269, 269, 245, 270, 270, 270, 270, 270, 270, 270, - 270, 270, 270, 270, 270, 270, 270, 270, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 245, 245, 245, 266, 267, 267, - 267, 267, 267, 267, 267, 267, 267, 267, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 270, 270, 270, 270, 270, 270, 270, 270, 270, - 270, 270, 270, 270, 270, 270, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 245, 245, 245, 245, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 0, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 245, 245, 245, 245, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 245, 245, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 245, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 246, 246, 0, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 270, 270, 270, 270, 270, 270, 270, 270, 246, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 246, 246, 246, + 267, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 246, 246, 246, 246, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 0, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 246, 246, 246, 246, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 246, 246, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 246, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, @@ -2081,20 +2086,21 @@ static unsigned short index2[] = { 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, + 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 26, 26, 26, 26, 26, 26, 26, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 249, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 248, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, @@ -2102,125 +2108,115 @@ static unsigned short index2[] = { 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 0, 0, 0, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 53, 53, 53, 53, 53, - 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 138, 138, - 138, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 47, 44, 47, 44, 47, 44, 47, + 170, 170, 170, 170, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 53, + 53, 53, 53, 53, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 53, 138, 138, 138, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, - 44, 47, 48, 81, 82, 82, 82, 138, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 138, 52, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, - 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 51, 51, 81, 81, 48, 48, + 44, 47, 44, 47, 44, 47, 48, 81, 82, 82, 82, 138, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 138, 52, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, + 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 51, 51, + 81, 81, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 173, 173, 173, - 173, 173, 173, 173, 173, 173, 173, 81, 81, 83, 83, 83, 83, 83, 83, 0, 0, - 0, 0, 0, 0, 0, 0, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 54, 54, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 47, 47, - 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 81, 81, 83, 83, 83, 83, + 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 54, 54, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, + 44, 47, 47, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, - 44, 47, 44, 47, 44, 47, 44, 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, 44, - 47, 44, 47, 44, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 52, 271, 271, 44, - 47, 44, 47, 48, 44, 47, 44, 47, 47, 47, 44, 47, 44, 47, 44, 47, 44, 47, - 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 44, 44, 44, 0, 0, 44, - 44, 44, 44, 44, 47, 44, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 51, 47, 47, 47, 47, 47, + 47, 47, 47, 44, 47, 44, 47, 44, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, + 52, 272, 272, 44, 47, 44, 47, 48, 44, 47, 44, 47, 47, 47, 44, 47, 44, 47, + 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 47, 44, 44, + 44, 44, 44, 0, 44, 44, 44, 44, 44, 47, 44, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 51, 51, 47, 48, 48, 48, 48, 48, 48, 48, 135, 48, 48, 48, 142, 48, 48, - 48, 48, 135, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 135, 135, 139, 26, 26, 26, 26, - 0, 0, 0, 0, 148, 148, 148, 148, 148, 148, 80, 80, 85, 225, 0, 0, 0, 0, 0, - 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 138, - 138, 138, 138, 0, 0, 0, 0, 0, 0, 0, 0, 139, 139, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 48, 51, 51, 47, 48, 48, 48, 48, 48, 48, 48, 135, 48, + 48, 48, 142, 48, 48, 48, 48, 135, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 135, 135, + 139, 26, 26, 26, 26, 0, 0, 0, 0, 148, 148, 148, 148, 148, 148, 80, 80, + 85, 225, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 83, 83, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, - 0, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 48, 48, 48, 48, 48, 48, 83, 83, 83, 48, 83, 48, 0, 0, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 135, 135, 135, 135, 135, 86, 86, 86, 83, 83, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 139, 175, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 83, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 0, 0, 0, 135, 135, 135, 139, 48, 48, 48, + 48, 48, 48, 48, 48, 138, 138, 138, 138, 0, 0, 0, 0, 0, 0, 0, 0, 139, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 145, 139, 139, 135, 135, 135, 135, 139, - 139, 135, 139, 139, 139, 175, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 0, 53, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, - 0, 83, 83, 48, 48, 48, 48, 48, 135, 53, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 48, 48, 48, - 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 142, + 135, 0, 0, 0, 0, 0, 0, 0, 0, 83, 83, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 0, 0, 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 48, 48, 48, 48, 48, 48, 83, 83, 83, 48, + 83, 48, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 135, 135, 135, 135, 135, 135, 139, 139, 135, 135, - 139, 139, 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 135, 48, 48, - 48, 48, 48, 48, 48, 48, 135, 139, 0, 0, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 0, 0, 83, 83, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 53, 48, 48, 48, 48, 48, 48, 80, 80, 80, - 48, 139, 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 81, 48, 81, 81, 86, 48, 48, 81, 81, 48, 48, 48, 48, 48, 81, 81, 48, - 81, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 48, 48, 53, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 139, 135, 135, 139, 139, 83, 83, 48, 53, 53, 139, 142, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 0, 0, - 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, - 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 47, 47, 47, 47, 47, 47, 47, 47, + 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 135, 135, 135, 86, 86, 86, 83, + 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 139, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 135, 135, + 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 145, 139, 139, 135, + 135, 135, 135, 139, 139, 135, 139, 139, 139, 175, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 0, 53, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 0, 0, 0, 0, 83, 83, 48, 48, 48, 48, 48, 135, 53, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 135, 135, 135, + 135, 139, 139, 135, 135, 139, 139, 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 135, 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 0, 0, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 83, 83, 83, 83, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 48, 48, + 48, 48, 48, 48, 80, 80, 80, 48, 139, 135, 139, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 81, 48, 81, 81, 86, 48, 48, 81, 81, 48, + 48, 48, 48, 48, 81, 81, 48, 81, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 53, 83, 83, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 139, 135, 135, 139, 139, 83, 83, 48, 53, 53, + 139, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 0, 0, 48, + 48, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 271, - 51, 51, 51, 51, 47, 47, 47, 47, 47, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 272, 51, 51, 51, 51, 47, 47, 47, 47, 47, 47, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 139, 139, 135, 139, 139, 135, 139, 139, 83, 139, - 142, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, - 0, 0, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, - 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, 273, 273, 273, 273, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 135, 139, 139, + 135, 139, 139, 83, 139, 142, 0, 0, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 0, 0, 0, 0, 0, 0, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + 262, 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, + 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, @@ -2229,24 +2225,9 @@ static unsigned short index2[] = { 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 170, 170, 274, 170, 274, 170, 170, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 170, 274, 170, 274, 170, 170, 274, 274, 170, 170, 170, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, + 273, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 0, 0, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, @@ -2254,24 +2235,47 @@ static unsigned short index2[] = { 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 35, 35, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, - 35, 35, 35, 35, 0, 0, 0, 0, 0, 275, 276, 275, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 215, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 0, 275, 275, 275, 275, 275, 0, 275, 0, 275, 275, 0, - 275, 275, 0, 275, 275, 275, 275, 275, 275, 275, 275, 275, 277, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 170, 170, 275, 170, 275, 170, 170, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 170, 275, 170, 275, 170, 170, + 275, 275, 170, 170, 170, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 0, 0, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 276, 277, 276, + 278, 278, 278, 278, 278, 278, 278, 278, 278, 215, 276, 276, 276, 276, + 276, 276, 276, 276, 276, 276, 276, 276, 276, 0, 276, 276, 276, 276, 276, + 0, 276, 0, 276, 276, 0, 276, 276, 0, 276, 276, 276, 276, 276, 276, 276, + 276, 276, 278, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 278, 278, - 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, @@ -2286,27 +2290,28 @@ static unsigned short index2[] = { 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 279, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 280, 195, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 0, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 280, 26, 0, 0, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 281, 281, 281, 281, 281, 281, 281, 282, 283, 281, 0, 0, - 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 86, 86, 86, 86, 86, 86, 86, 81, - 81, 281, 284, 284, 285, 285, 282, 283, 282, 283, 282, 283, 282, 283, 282, - 283, 282, 283, 282, 283, 282, 283, 247, 247, 282, 283, 281, 281, 281, - 281, 285, 285, 285, 286, 281, 286, 0, 281, 286, 281, 281, 284, 287, 288, - 287, 288, 287, 288, 289, 281, 281, 290, 291, 292, 292, 293, 0, 281, 294, - 289, 281, 0, 0, 0, 0, 131, 131, 131, 118, 131, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 281, 26, 0, 0, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 282, 282, 282, 282, 282, 282, + 282, 283, 284, 282, 0, 0, 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 86, 86, + 86, 86, 86, 86, 86, 81, 81, 282, 285, 285, 286, 286, 283, 284, 283, 284, + 283, 284, 283, 284, 283, 284, 283, 284, 283, 284, 283, 284, 248, 248, + 283, 284, 282, 282, 282, 282, 286, 286, 286, 287, 282, 287, 0, 282, 287, + 282, 282, 285, 288, 289, 288, 289, 288, 289, 290, 282, 282, 291, 292, + 293, 293, 294, 0, 282, 295, 290, 282, 0, 0, 0, 0, 131, 131, 131, 118, + 131, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, @@ -2315,164 +2320,165 @@ static unsigned short index2[] = { 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 0, 0, 174, 0, 295, 295, 296, 297, 296, 295, 295, - 298, 299, 295, 300, 301, 302, 301, 301, 303, 303, 303, 303, 303, 303, - 303, 303, 303, 303, 301, 295, 304, 305, 304, 295, 295, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 298, 295, 299, 307, 308, - 307, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, - 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 298, - 305, 299, 305, 298, 299, 310, 311, 312, 310, 310, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 314, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 314, 314, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 0, 0, 0, 313, 313, 313, 313, 313, 313, 0, 0, 313, 313, 313, 313, - 313, 313, 0, 0, 313, 313, 313, 313, 313, 313, 0, 0, 313, 313, 313, 0, 0, - 0, 297, 297, 305, 307, 315, 297, 297, 0, 316, 317, 317, 317, 317, 316, - 316, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 318, 318, 318, 26, 30, 0, 0, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 0, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, 0, 174, 0, 296, 296, + 297, 298, 297, 296, 296, 299, 300, 296, 301, 302, 303, 302, 302, 304, + 304, 304, 304, 304, 304, 304, 304, 304, 304, 302, 296, 305, 306, 305, + 296, 296, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, + 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, 307, + 299, 296, 300, 308, 309, 308, 310, 310, 310, 310, 310, 310, 310, 310, + 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, + 310, 310, 310, 310, 299, 306, 300, 306, 299, 300, 311, 312, 313, 311, + 311, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 315, 314, 314, + 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, + 314, 315, 315, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 314, 314, 314, 0, 0, 0, 314, 314, 314, 314, 314, 314, 0, + 0, 314, 314, 314, 314, 314, 314, 0, 0, 314, 314, 314, 314, 314, 314, 0, + 0, 314, 314, 314, 0, 0, 0, 298, 298, 306, 308, 316, 298, 298, 0, 317, + 318, 318, 318, 318, 317, 317, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 319, 319, + 319, 26, 30, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 0, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 0, 0, 0, 0, 0, 83, 138, 83, 0, 0, 0, 0, 148, 148, 148, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 83, 138, 83, 0, 0, + 0, 0, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, - 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 0, - 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 319, 319, 319, 319, 319, 319, - 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, - 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, - 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, 319, - 319, 319, 319, 319, 319, 153, 153, 153, 153, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 153, 153, 26, 0, 0, 0, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 148, 148, 148, 148, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 153, 153, 153, 153, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 153, 153, + 26, 80, 80, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, + 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 320, 320, 320, - 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, - 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 148, 148, 148, 148, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 173, 48, 48, 48, 48, 48, 48, 48, 48, 173, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 86, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 148, 148, + 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 173, 48, 48, 48, 48, 48, 48, 48, + 48, 173, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 0, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, - 48, 48, 83, 173, 173, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, + 48, 48, 48, 48, 48, 48, 83, 173, 173, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, + 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 0, 0, 107, 0, + 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 0, + 0, 107, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 0, 107, 107, 0, 0, 0, 107, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 0, 107, 107, 0, 0, 0, 107, 0, 0, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 0, 104, 322, 322, 322, 322, 322, 322, 322, 322, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 0, 104, 321, 321, 321, 321, 321, 321, 321, 321, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 323, 323, 322, 322, 322, + 322, 322, 322, 322, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 322, 322, 321, 321, 321, 321, 321, - 321, 321, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 107, 107, 0, 0, + 0, 0, 0, 322, 322, 322, 322, 322, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 0, 107, 107, 0, 0, 0, 0, 0, 321, - 321, 321, 321, 321, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 321, 321, - 321, 321, 321, 321, 0, 0, 0, 138, 107, 107, 107, 107, 107, 107, 107, 107, + 322, 322, 322, 322, 322, 322, 0, 0, 0, 138, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 0, 0, 0, 0, 321, 321, 107, 107, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 0, 0, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 107, 135, 135, 135, 0, 135, 135, 0, 0, 0, 0, 0, 135, 86, 135, - 81, 107, 107, 107, 107, 0, 107, 107, 107, 0, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 0, 0, 0, 0, 322, 322, 107, 107, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 0, 0, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 107, 135, 135, 135, 0, 135, 135, 0, 0, 0, 0, 0, 135, 86, + 135, 81, 107, 107, 107, 107, 0, 107, 107, 107, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 81, 176, 86, 0, 0, 0, - 0, 142, 321, 321, 321, 321, 321, 321, 321, 321, 0, 0, 0, 0, 0, 0, 0, 0, - 104, 104, 104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 81, 176, 86, 0, + 0, 0, 0, 142, 322, 322, 322, 322, 322, 322, 322, 322, 0, 0, 0, 0, 0, 0, + 0, 0, 104, 104, 104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 321, 321, 104, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 322, 322, 104, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 321, 321, 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, - 107, 107, 107, 107, 107, 322, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 322, 322, 322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, + 107, 107, 107, 107, 107, 107, 323, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 81, 86, 0, 0, 0, 0, 321, 321, 321, 321, - 321, 104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, + 107, 107, 107, 107, 107, 107, 107, 81, 86, 0, 0, 0, 0, 322, 322, 322, + 322, 322, 104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 138, 138, - 138, 138, 138, 138, 138, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, - 321, 321, 321, 321, 321, 321, 321, 321, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 138, + 138, 138, 138, 138, 138, 138, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, + 0, 322, 322, 322, 322, 322, 322, 322, 322, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, - 0, 0, 321, 321, 321, 321, 321, 321, 321, 321, 107, 107, 107, 107, 107, + 0, 0, 322, 322, 322, 322, 322, 322, 322, 322, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, - 0, 0, 0, 0, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 321, - 321, 321, 321, 321, 321, 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 322, + 322, 322, 322, 322, 322, 322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, @@ -2483,21 +2489,21 @@ static unsigned short index2[] = { 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, + 0, 0, 0, 0, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 0, 0, 0, - 0, 0, 0, 0, 321, 321, 321, 321, 321, 321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 0, 0, 0, + 0, 0, 0, 0, 322, 322, 322, 322, 322, 322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 325, 325, 325, 325, 325, 325, - 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, - 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 0, 139, 135, 139, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 326, 326, 326, 326, 326, 326, + 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, + 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, 0, 139, 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, @@ -2530,15 +2536,15 @@ static unsigned short index2[] = { 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 139, 135, 135, 135, 139, - 139, 135, 175, 145, 135, 83, 83, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, + 139, 135, 175, 145, 135, 83, 83, 83, 83, 83, 83, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, - 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 83, 0, 0, 0, 0, 0, 0, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, + 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 83, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 139, 139, 135, 135, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 139, 139, 135, 135, 135, 135, 135, 135, 145, 142, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 135, 135, 139, 139, 0, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, @@ -2550,6 +2556,13 @@ static unsigned short index2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 139, 139, 139, 135, 135, 135, 135, 135, 135, 135, + 135, 139, 139, 142, 135, 135, 139, 145, 48, 48, 48, 48, 83, 83, 83, 83, + 83, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 83, 0, 83, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 146, 139, 139, 135, 135, 135, 135, 135, 135, 139, 149, 147, 147, 146, 147, 135, 135, 139, 142, 145, 48, 48, 83, 48, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2566,40 +2579,54 @@ static unsigned short index2[] = { 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 139, 135, 135, 135, 135, 135, 135, 135, 135, 139, 139, 135, 139, 142, 135, 83, 83, 83, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, + 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 135, 139, 135, 139, 139, 135, 135, 135, 135, 135, 135, - 175, 145, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 139, 135, 139, 139, 135, + 135, 135, 135, 135, 135, 175, 145, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 135, - 135, 135, 139, 139, 135, 135, 135, 135, 139, 135, 135, 135, 135, 142, 0, - 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 148, 148, 83, - 83, 83, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 0, 0, 0, 135, 135, 135, 139, 139, 135, 135, 135, 135, 139, + 135, 135, 135, 135, 142, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 148, 148, 83, 83, 83, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 47, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + 44, 44, 44, 44, 44, 44, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 148, 148, 148, 148, 148, 148, 148, 148, - 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 47, 47, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, + 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 135, 135, 135, 135, 135, + 135, 135, 0, 135, 135, 135, 135, 135, 135, 139, 327, 48, 83, 83, 83, 83, + 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 0, 0, 0, 83, 83, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 0, 0, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 0, + 139, 135, 135, 135, 135, 135, 135, 135, 139, 135, 135, 139, 135, 135, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 173, 173, 173, 173, 173, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, @@ -2607,189 +2634,213 @@ static unsigned short index2[] = { 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 0, 83, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 173, 173, 173, 173, 173, 173, 173, 173, 0, 83, 83, 83, 83, 83, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, - 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 83, 83, 0, 0, 0, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 83, + 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 176, 176, 176, 176, 176, - 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 176, 176, 176, + 176, 176, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 81, 81, 81, 81, 81, 81, 81, 83, 83, 83, 83, 83, 80, 80, 80, 80, - 53, 53, 53, 53, 83, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 0, 148, 148, 148, 148, 148, 148, 148, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 48, 48, 48, 48, 81, 81, 81, 81, 81, 81, 81, 83, 83, 83, 83, 83, 80, + 80, 80, 80, 53, 53, 53, 53, 83, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 148, 148, 148, 148, 148, + 148, 148, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 48, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 135, 135, 135, 135, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 135, 135, 53, 53, 53, 53, + 53, 53, 53, 53, 53, 53, 53, 53, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, + 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, - 0, 80, 135, 176, 83, 174, 174, 174, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 48, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, + 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 80, 135, 176, 83, 174, 174, 174, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 326, 326, 326, 326, 326, 326, 326, - 327, 327, 176, 176, 176, 80, 80, 80, 328, 327, 327, 327, 327, 327, 174, - 174, 174, 174, 174, 174, 174, 174, 86, 86, 86, 86, 86, 86, 86, 86, 80, - 80, 81, 81, 81, 81, 81, 86, 86, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 81, 81, 81, 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 326, 326, 326, 326, 326, 326, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 328, 328, 328, 328, 328, 328, 328, 329, 329, 176, 176, 176, 80, 80, 80, + 330, 329, 329, 329, 329, 329, 174, 174, 174, 174, 174, 174, 174, 174, 86, + 86, 86, 86, 86, 86, 86, 86, 80, 80, 81, 81, 81, 81, 81, 86, 86, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 328, 328, 328, 328, 328, 328, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 81, 81, 81, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 81, 81, 81, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, - 148, 148, 148, 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, + 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 148, 148, 148, 148, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, + 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 49, 0, 49, 49, 0, 0, 49, 0, 0, 49, 49, 0, 0, 49, 49, 49, 49, 0, 49, 49, + 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 0, 35, 0, 35, 35, 35, 35, 35, 35, + 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 0, 49, 49, 49, 49, 0, + 0, 49, 49, 49, 49, 49, 49, 49, 49, 0, 49, 49, 49, 49, 49, 49, 49, 0, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 49, 49, 0, 49, 49, 49, 49, 0, 49, 49, 49, 49, + 49, 0, 49, 0, 0, 0, 49, 49, 49, 49, 49, 49, 49, 0, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 0, 35, 35, 35, 35, 35, + 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 0, 49, 49, 0, 0, 49, 0, - 0, 49, 49, 0, 0, 49, 49, 49, 49, 0, 49, 49, 49, 49, 49, 49, 49, 49, 35, - 35, 35, 35, 0, 35, 0, 35, 35, 35, 35, 35, 35, 35, 0, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 49, 49, 0, 49, 49, 49, 49, 0, 0, 49, 49, 49, 49, 49, 49, - 49, 49, 0, 49, 49, 49, 49, 49, 49, 49, 0, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 49, 49, 0, 49, 49, 49, 49, 0, 49, 49, 49, 49, 49, 0, 49, 0, 0, 0, 49, 49, - 49, 49, 49, 49, 49, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, + 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 331, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 49, 49, 49, 49, 49, 331, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, + 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 331, 35, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 329, 35, 35, 35, 35, 35, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 331, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 329, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 329, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 329, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, - 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 329, 35, 35, 35, 35, 35, 35, 35, + 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 331, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 226, 35, 35, 35, 35, 35, 35, 49, 35, 0, 0, 330, 330, 330, 330, 330, 330, - 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, - 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, - 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, 330, - 330, 330, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 35, 35, 35, 35, 35, 35, 35, 226, 35, 35, 35, 35, 35, 35, 49, 35, 0, 0, + 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 332, 332, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 80, 80, 80, 80, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 80, 80, 80, 80, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 80, 80, 80, - 80, 80, 80, 80, 80, 135, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 135, 80, 80, 83, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 135, 135, 135, 135, 135, 0, 135, 135, 135, 135, 135, 135, - 135, 135, 135, 135, 135, 135, 135, 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 135, 135, 135, 135, 80, 80, 80, 80, 80, 80, 80, 80, 135, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 135, 80, 80, 83, 83, 83, 83, 83, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 135, 135, 135, 0, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 0, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 0, 0, 81, 81, 81, 81, + 81, 81, 81, 0, 81, 81, 0, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, @@ -2803,11 +2854,18 @@ static unsigned short index2[] = { 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, - 0, 321, 321, 321, 321, 321, 321, 321, 321, 321, 86, 86, 86, 86, 86, 86, - 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, - 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 107, 107, 107, 0, 0, 322, 322, 322, 322, 322, 322, 322, 322, 322, 86, 86, + 86, 86, 86, 86, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 324, + 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, + 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, + 324, 324, 324, 324, 324, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, 81, 81, 81, 81, + 81, 81, 145, 0, 0, 0, 0, 0, 136, 136, 136, 136, 136, 136, 136, 136, 136, + 136, 0, 0, 0, 0, 104, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 131, 131, 131, 0, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, 131, 131, 0, 131, 0, 0, 131, 0, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 0, 131, 131, 131, 131, 0, 131, 0, 131, 0, 0, 0, 0, 0, 0, 131, 0, 0, @@ -2821,7 +2879,7 @@ static unsigned short index2[] = { 131, 131, 131, 131, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 0, 0, 0, 0, 26, 26, 26, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, @@ -2832,123 +2890,157 @@ static unsigned short index2[] = { 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 239, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 153, 153, 0, 0, 0, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 331, 0, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 222, 222, 0, 0, 0, 0, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 241, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 268, 268, 268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 0, 0, 0, 0, 0, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 0, 0, 0, 0, 0, 0, 0, 268, - 268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 153, 153, 0, 0, 0, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 333, 0, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 222, 222, 0, 0, 0, 0, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 267, 334, 242, 267, 267, 267, + 267, 267, 267, 267, 267, 267, 267, 334, 334, 334, 334, 334, 334, 334, + 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 269, 269, 269, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 269, 269, 0, 0, 0, 0, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 0, 0, 0, 0, 0, 0, 0, 269, 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 26, 26, 26, 26, 239, 239, 239, 239, 239, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 26, 239, + 26, 26, 26, 239, 239, 239, 335, 335, 335, 335, 335, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 26, 239, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 239, 239, 239, 239, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 26, 26, 26, 26, + 26, 26, 239, 26, 26, 26, 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 239, 239, 0, 0, 0, 26, + 26, 26, 26, 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 54, 54, - 54, 54, 54, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, - 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, + 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, - 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 0, 239, 239, 239, 239, 239, 239, + 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 239, 0, 0, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 0, 0, 0, 0, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, @@ -2957,25 +3049,26 @@ static unsigned short index2[] = { 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, + 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, 174, 174, 174, 174, 174, 174, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, + 174, 174, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, @@ -2988,17 +3081,17 @@ static unsigned short index2[] = { 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - 273, 273, 273, 273, 0, 0, + 71, 71, 71, 71, 71, 71, 71, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 0, 0, }; /* decomposition data */ @@ -3970,102 +4063,102 @@ static unsigned int decomp_data[] = { 266, 28436, 266, 25237, 266, 25429, 266, 19968, 266, 19977, 266, 36938, 266, 24038, 266, 20013, 266, 21491, 266, 25351, 266, 36208, 266, 25171, 266, 31105, 266, 31354, 266, 21512, 266, 28288, 266, 26377, 266, 26376, - 266, 30003, 266, 21106, 266, 21942, 770, 12308, 26412, 12309, 770, 12308, - 19977, 12309, 770, 12308, 20108, 12309, 770, 12308, 23433, 12309, 770, - 12308, 28857, 12309, 770, 12308, 25171, 12309, 770, 12308, 30423, 12309, - 770, 12308, 21213, 12309, 770, 12308, 25943, 12309, 263, 24471, 263, - 21487, 256, 20029, 256, 20024, 256, 20033, 256, 131362, 256, 20320, 256, - 20398, 256, 20411, 256, 20482, 256, 20602, 256, 20633, 256, 20711, 256, - 20687, 256, 13470, 256, 132666, 256, 20813, 256, 20820, 256, 20836, 256, - 20855, 256, 132380, 256, 13497, 256, 20839, 256, 20877, 256, 132427, 256, - 20887, 256, 20900, 256, 20172, 256, 20908, 256, 20917, 256, 168415, 256, - 20981, 256, 20995, 256, 13535, 256, 21051, 256, 21062, 256, 21106, 256, - 21111, 256, 13589, 256, 21191, 256, 21193, 256, 21220, 256, 21242, 256, - 21253, 256, 21254, 256, 21271, 256, 21321, 256, 21329, 256, 21338, 256, - 21363, 256, 21373, 256, 21375, 256, 21375, 256, 21375, 256, 133676, 256, - 28784, 256, 21450, 256, 21471, 256, 133987, 256, 21483, 256, 21489, 256, - 21510, 256, 21662, 256, 21560, 256, 21576, 256, 21608, 256, 21666, 256, - 21750, 256, 21776, 256, 21843, 256, 21859, 256, 21892, 256, 21892, 256, - 21913, 256, 21931, 256, 21939, 256, 21954, 256, 22294, 256, 22022, 256, - 22295, 256, 22097, 256, 22132, 256, 20999, 256, 22766, 256, 22478, 256, - 22516, 256, 22541, 256, 22411, 256, 22578, 256, 22577, 256, 22700, 256, - 136420, 256, 22770, 256, 22775, 256, 22790, 256, 22810, 256, 22818, 256, - 22882, 256, 136872, 256, 136938, 256, 23020, 256, 23067, 256, 23079, 256, - 23000, 256, 23142, 256, 14062, 256, 14076, 256, 23304, 256, 23358, 256, - 23358, 256, 137672, 256, 23491, 256, 23512, 256, 23527, 256, 23539, 256, - 138008, 256, 23551, 256, 23558, 256, 24403, 256, 23586, 256, 14209, 256, - 23648, 256, 23662, 256, 23744, 256, 23693, 256, 138724, 256, 23875, 256, - 138726, 256, 23918, 256, 23915, 256, 23932, 256, 24033, 256, 24034, 256, - 14383, 256, 24061, 256, 24104, 256, 24125, 256, 24169, 256, 14434, 256, - 139651, 256, 14460, 256, 24240, 256, 24243, 256, 24246, 256, 24266, 256, - 172946, 256, 24318, 256, 140081, 256, 140081, 256, 33281, 256, 24354, - 256, 24354, 256, 14535, 256, 144056, 256, 156122, 256, 24418, 256, 24427, - 256, 14563, 256, 24474, 256, 24525, 256, 24535, 256, 24569, 256, 24705, - 256, 14650, 256, 14620, 256, 24724, 256, 141012, 256, 24775, 256, 24904, - 256, 24908, 256, 24910, 256, 24908, 256, 24954, 256, 24974, 256, 25010, - 256, 24996, 256, 25007, 256, 25054, 256, 25074, 256, 25078, 256, 25104, - 256, 25115, 256, 25181, 256, 25265, 256, 25300, 256, 25424, 256, 142092, - 256, 25405, 256, 25340, 256, 25448, 256, 25475, 256, 25572, 256, 142321, - 256, 25634, 256, 25541, 256, 25513, 256, 14894, 256, 25705, 256, 25726, - 256, 25757, 256, 25719, 256, 14956, 256, 25935, 256, 25964, 256, 143370, - 256, 26083, 256, 26360, 256, 26185, 256, 15129, 256, 26257, 256, 15112, - 256, 15076, 256, 20882, 256, 20885, 256, 26368, 256, 26268, 256, 32941, - 256, 17369, 256, 26391, 256, 26395, 256, 26401, 256, 26462, 256, 26451, - 256, 144323, 256, 15177, 256, 26618, 256, 26501, 256, 26706, 256, 26757, - 256, 144493, 256, 26766, 256, 26655, 256, 26900, 256, 15261, 256, 26946, - 256, 27043, 256, 27114, 256, 27304, 256, 145059, 256, 27355, 256, 15384, - 256, 27425, 256, 145575, 256, 27476, 256, 15438, 256, 27506, 256, 27551, - 256, 27578, 256, 27579, 256, 146061, 256, 138507, 256, 146170, 256, - 27726, 256, 146620, 256, 27839, 256, 27853, 256, 27751, 256, 27926, 256, - 27966, 256, 28023, 256, 27969, 256, 28009, 256, 28024, 256, 28037, 256, - 146718, 256, 27956, 256, 28207, 256, 28270, 256, 15667, 256, 28363, 256, - 28359, 256, 147153, 256, 28153, 256, 28526, 256, 147294, 256, 147342, - 256, 28614, 256, 28729, 256, 28702, 256, 28699, 256, 15766, 256, 28746, - 256, 28797, 256, 28791, 256, 28845, 256, 132389, 256, 28997, 256, 148067, - 256, 29084, 256, 148395, 256, 29224, 256, 29237, 256, 29264, 256, 149000, - 256, 29312, 256, 29333, 256, 149301, 256, 149524, 256, 29562, 256, 29579, - 256, 16044, 256, 29605, 256, 16056, 256, 16056, 256, 29767, 256, 29788, - 256, 29809, 256, 29829, 256, 29898, 256, 16155, 256, 29988, 256, 150582, - 256, 30014, 256, 150674, 256, 30064, 256, 139679, 256, 30224, 256, - 151457, 256, 151480, 256, 151620, 256, 16380, 256, 16392, 256, 30452, - 256, 151795, 256, 151794, 256, 151833, 256, 151859, 256, 30494, 256, - 30495, 256, 30495, 256, 30538, 256, 16441, 256, 30603, 256, 16454, 256, - 16534, 256, 152605, 256, 30798, 256, 30860, 256, 30924, 256, 16611, 256, - 153126, 256, 31062, 256, 153242, 256, 153285, 256, 31119, 256, 31211, - 256, 16687, 256, 31296, 256, 31306, 256, 31311, 256, 153980, 256, 154279, - 256, 154279, 256, 31470, 256, 16898, 256, 154539, 256, 31686, 256, 31689, - 256, 16935, 256, 154752, 256, 31954, 256, 17056, 256, 31976, 256, 31971, - 256, 32000, 256, 155526, 256, 32099, 256, 17153, 256, 32199, 256, 32258, - 256, 32325, 256, 17204, 256, 156200, 256, 156231, 256, 17241, 256, - 156377, 256, 32634, 256, 156478, 256, 32661, 256, 32762, 256, 32773, 256, - 156890, 256, 156963, 256, 32864, 256, 157096, 256, 32880, 256, 144223, - 256, 17365, 256, 32946, 256, 33027, 256, 17419, 256, 33086, 256, 23221, - 256, 157607, 256, 157621, 256, 144275, 256, 144284, 256, 33281, 256, - 33284, 256, 36766, 256, 17515, 256, 33425, 256, 33419, 256, 33437, 256, - 21171, 256, 33457, 256, 33459, 256, 33469, 256, 33510, 256, 158524, 256, - 33509, 256, 33565, 256, 33635, 256, 33709, 256, 33571, 256, 33725, 256, - 33767, 256, 33879, 256, 33619, 256, 33738, 256, 33740, 256, 33756, 256, - 158774, 256, 159083, 256, 158933, 256, 17707, 256, 34033, 256, 34035, - 256, 34070, 256, 160714, 256, 34148, 256, 159532, 256, 17757, 256, 17761, - 256, 159665, 256, 159954, 256, 17771, 256, 34384, 256, 34396, 256, 34407, - 256, 34409, 256, 34473, 256, 34440, 256, 34574, 256, 34530, 256, 34681, - 256, 34600, 256, 34667, 256, 34694, 256, 17879, 256, 34785, 256, 34817, - 256, 17913, 256, 34912, 256, 34915, 256, 161383, 256, 35031, 256, 35038, - 256, 17973, 256, 35066, 256, 13499, 256, 161966, 256, 162150, 256, 18110, - 256, 18119, 256, 35488, 256, 35565, 256, 35722, 256, 35925, 256, 162984, - 256, 36011, 256, 36033, 256, 36123, 256, 36215, 256, 163631, 256, 133124, - 256, 36299, 256, 36284, 256, 36336, 256, 133342, 256, 36564, 256, 36664, - 256, 165330, 256, 165357, 256, 37012, 256, 37105, 256, 37137, 256, - 165678, 256, 37147, 256, 37432, 256, 37591, 256, 37592, 256, 37500, 256, - 37881, 256, 37909, 256, 166906, 256, 38283, 256, 18837, 256, 38327, 256, - 167287, 256, 18918, 256, 38595, 256, 23986, 256, 38691, 256, 168261, 256, - 168474, 256, 19054, 256, 19062, 256, 38880, 256, 168970, 256, 19122, 256, - 169110, 256, 38923, 256, 38923, 256, 38953, 256, 169398, 256, 39138, 256, - 19251, 256, 39209, 256, 39335, 256, 39362, 256, 39422, 256, 19406, 256, - 170800, 256, 39698, 256, 40000, 256, 40189, 256, 19662, 256, 19693, 256, - 40295, 256, 172238, 256, 19704, 256, 172293, 256, 172558, 256, 172689, - 256, 40635, 256, 19798, 256, 40697, 256, 40702, 256, 40709, 256, 40719, - 256, 40726, 256, 40763, 256, 173568, + 266, 30003, 266, 21106, 266, 21942, 266, 37197, 770, 12308, 26412, 12309, + 770, 12308, 19977, 12309, 770, 12308, 20108, 12309, 770, 12308, 23433, + 12309, 770, 12308, 28857, 12309, 770, 12308, 25171, 12309, 770, 12308, + 30423, 12309, 770, 12308, 21213, 12309, 770, 12308, 25943, 12309, 263, + 24471, 263, 21487, 256, 20029, 256, 20024, 256, 20033, 256, 131362, 256, + 20320, 256, 20398, 256, 20411, 256, 20482, 256, 20602, 256, 20633, 256, + 20711, 256, 20687, 256, 13470, 256, 132666, 256, 20813, 256, 20820, 256, + 20836, 256, 20855, 256, 132380, 256, 13497, 256, 20839, 256, 20877, 256, + 132427, 256, 20887, 256, 20900, 256, 20172, 256, 20908, 256, 20917, 256, + 168415, 256, 20981, 256, 20995, 256, 13535, 256, 21051, 256, 21062, 256, + 21106, 256, 21111, 256, 13589, 256, 21191, 256, 21193, 256, 21220, 256, + 21242, 256, 21253, 256, 21254, 256, 21271, 256, 21321, 256, 21329, 256, + 21338, 256, 21363, 256, 21373, 256, 21375, 256, 21375, 256, 21375, 256, + 133676, 256, 28784, 256, 21450, 256, 21471, 256, 133987, 256, 21483, 256, + 21489, 256, 21510, 256, 21662, 256, 21560, 256, 21576, 256, 21608, 256, + 21666, 256, 21750, 256, 21776, 256, 21843, 256, 21859, 256, 21892, 256, + 21892, 256, 21913, 256, 21931, 256, 21939, 256, 21954, 256, 22294, 256, + 22022, 256, 22295, 256, 22097, 256, 22132, 256, 20999, 256, 22766, 256, + 22478, 256, 22516, 256, 22541, 256, 22411, 256, 22578, 256, 22577, 256, + 22700, 256, 136420, 256, 22770, 256, 22775, 256, 22790, 256, 22810, 256, + 22818, 256, 22882, 256, 136872, 256, 136938, 256, 23020, 256, 23067, 256, + 23079, 256, 23000, 256, 23142, 256, 14062, 256, 14076, 256, 23304, 256, + 23358, 256, 23358, 256, 137672, 256, 23491, 256, 23512, 256, 23527, 256, + 23539, 256, 138008, 256, 23551, 256, 23558, 256, 24403, 256, 23586, 256, + 14209, 256, 23648, 256, 23662, 256, 23744, 256, 23693, 256, 138724, 256, + 23875, 256, 138726, 256, 23918, 256, 23915, 256, 23932, 256, 24033, 256, + 24034, 256, 14383, 256, 24061, 256, 24104, 256, 24125, 256, 24169, 256, + 14434, 256, 139651, 256, 14460, 256, 24240, 256, 24243, 256, 24246, 256, + 24266, 256, 172946, 256, 24318, 256, 140081, 256, 140081, 256, 33281, + 256, 24354, 256, 24354, 256, 14535, 256, 144056, 256, 156122, 256, 24418, + 256, 24427, 256, 14563, 256, 24474, 256, 24525, 256, 24535, 256, 24569, + 256, 24705, 256, 14650, 256, 14620, 256, 24724, 256, 141012, 256, 24775, + 256, 24904, 256, 24908, 256, 24910, 256, 24908, 256, 24954, 256, 24974, + 256, 25010, 256, 24996, 256, 25007, 256, 25054, 256, 25074, 256, 25078, + 256, 25104, 256, 25115, 256, 25181, 256, 25265, 256, 25300, 256, 25424, + 256, 142092, 256, 25405, 256, 25340, 256, 25448, 256, 25475, 256, 25572, + 256, 142321, 256, 25634, 256, 25541, 256, 25513, 256, 14894, 256, 25705, + 256, 25726, 256, 25757, 256, 25719, 256, 14956, 256, 25935, 256, 25964, + 256, 143370, 256, 26083, 256, 26360, 256, 26185, 256, 15129, 256, 26257, + 256, 15112, 256, 15076, 256, 20882, 256, 20885, 256, 26368, 256, 26268, + 256, 32941, 256, 17369, 256, 26391, 256, 26395, 256, 26401, 256, 26462, + 256, 26451, 256, 144323, 256, 15177, 256, 26618, 256, 26501, 256, 26706, + 256, 26757, 256, 144493, 256, 26766, 256, 26655, 256, 26900, 256, 15261, + 256, 26946, 256, 27043, 256, 27114, 256, 27304, 256, 145059, 256, 27355, + 256, 15384, 256, 27425, 256, 145575, 256, 27476, 256, 15438, 256, 27506, + 256, 27551, 256, 27578, 256, 27579, 256, 146061, 256, 138507, 256, + 146170, 256, 27726, 256, 146620, 256, 27839, 256, 27853, 256, 27751, 256, + 27926, 256, 27966, 256, 28023, 256, 27969, 256, 28009, 256, 28024, 256, + 28037, 256, 146718, 256, 27956, 256, 28207, 256, 28270, 256, 15667, 256, + 28363, 256, 28359, 256, 147153, 256, 28153, 256, 28526, 256, 147294, 256, + 147342, 256, 28614, 256, 28729, 256, 28702, 256, 28699, 256, 15766, 256, + 28746, 256, 28797, 256, 28791, 256, 28845, 256, 132389, 256, 28997, 256, + 148067, 256, 29084, 256, 148395, 256, 29224, 256, 29237, 256, 29264, 256, + 149000, 256, 29312, 256, 29333, 256, 149301, 256, 149524, 256, 29562, + 256, 29579, 256, 16044, 256, 29605, 256, 16056, 256, 16056, 256, 29767, + 256, 29788, 256, 29809, 256, 29829, 256, 29898, 256, 16155, 256, 29988, + 256, 150582, 256, 30014, 256, 150674, 256, 30064, 256, 139679, 256, + 30224, 256, 151457, 256, 151480, 256, 151620, 256, 16380, 256, 16392, + 256, 30452, 256, 151795, 256, 151794, 256, 151833, 256, 151859, 256, + 30494, 256, 30495, 256, 30495, 256, 30538, 256, 16441, 256, 30603, 256, + 16454, 256, 16534, 256, 152605, 256, 30798, 256, 30860, 256, 30924, 256, + 16611, 256, 153126, 256, 31062, 256, 153242, 256, 153285, 256, 31119, + 256, 31211, 256, 16687, 256, 31296, 256, 31306, 256, 31311, 256, 153980, + 256, 154279, 256, 154279, 256, 31470, 256, 16898, 256, 154539, 256, + 31686, 256, 31689, 256, 16935, 256, 154752, 256, 31954, 256, 17056, 256, + 31976, 256, 31971, 256, 32000, 256, 155526, 256, 32099, 256, 17153, 256, + 32199, 256, 32258, 256, 32325, 256, 17204, 256, 156200, 256, 156231, 256, + 17241, 256, 156377, 256, 32634, 256, 156478, 256, 32661, 256, 32762, 256, + 32773, 256, 156890, 256, 156963, 256, 32864, 256, 157096, 256, 32880, + 256, 144223, 256, 17365, 256, 32946, 256, 33027, 256, 17419, 256, 33086, + 256, 23221, 256, 157607, 256, 157621, 256, 144275, 256, 144284, 256, + 33281, 256, 33284, 256, 36766, 256, 17515, 256, 33425, 256, 33419, 256, + 33437, 256, 21171, 256, 33457, 256, 33459, 256, 33469, 256, 33510, 256, + 158524, 256, 33509, 256, 33565, 256, 33635, 256, 33709, 256, 33571, 256, + 33725, 256, 33767, 256, 33879, 256, 33619, 256, 33738, 256, 33740, 256, + 33756, 256, 158774, 256, 159083, 256, 158933, 256, 17707, 256, 34033, + 256, 34035, 256, 34070, 256, 160714, 256, 34148, 256, 159532, 256, 17757, + 256, 17761, 256, 159665, 256, 159954, 256, 17771, 256, 34384, 256, 34396, + 256, 34407, 256, 34409, 256, 34473, 256, 34440, 256, 34574, 256, 34530, + 256, 34681, 256, 34600, 256, 34667, 256, 34694, 256, 17879, 256, 34785, + 256, 34817, 256, 17913, 256, 34912, 256, 34915, 256, 161383, 256, 35031, + 256, 35038, 256, 17973, 256, 35066, 256, 13499, 256, 161966, 256, 162150, + 256, 18110, 256, 18119, 256, 35488, 256, 35565, 256, 35722, 256, 35925, + 256, 162984, 256, 36011, 256, 36033, 256, 36123, 256, 36215, 256, 163631, + 256, 133124, 256, 36299, 256, 36284, 256, 36336, 256, 133342, 256, 36564, + 256, 36664, 256, 165330, 256, 165357, 256, 37012, 256, 37105, 256, 37137, + 256, 165678, 256, 37147, 256, 37432, 256, 37591, 256, 37592, 256, 37500, + 256, 37881, 256, 37909, 256, 166906, 256, 38283, 256, 18837, 256, 38327, + 256, 167287, 256, 18918, 256, 38595, 256, 23986, 256, 38691, 256, 168261, + 256, 168474, 256, 19054, 256, 19062, 256, 38880, 256, 168970, 256, 19122, + 256, 169110, 256, 38923, 256, 38923, 256, 38953, 256, 169398, 256, 39138, + 256, 19251, 256, 39209, 256, 39335, 256, 39362, 256, 39422, 256, 19406, + 256, 170800, 256, 39698, 256, 40000, 256, 40189, 256, 19662, 256, 19693, + 256, 40295, 256, 172238, 256, 19704, 256, 172293, 256, 172558, 256, + 172689, 256, 40635, 256, 19798, 256, 40697, 256, 40702, 256, 40709, 256, + 40719, 256, 40726, 256, 40763, 256, 173568, }; /* index tables for the decomposition data */ @@ -5187,11 +5280,11 @@ static unsigned short decomp_index2[] = { 13044, 13046, 13048, 13050, 13052, 13054, 13056, 13058, 13060, 13062, 13064, 13066, 13068, 13070, 13072, 13074, 13076, 13078, 13080, 13082, 13084, 13086, 13088, 13090, 13092, 13094, 13096, 13098, 13100, 13102, - 13104, 13106, 13108, 13110, 13112, 13114, 13116, 13118, 13120, 0, 0, 0, - 0, 0, 13122, 13126, 13130, 13134, 13138, 13142, 13146, 13150, 13154, 0, - 0, 0, 0, 0, 0, 0, 13158, 13160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 13104, 13106, 13108, 13110, 13112, 13114, 13116, 13118, 13120, 13122, 0, + 0, 0, 0, 13124, 13128, 13132, 13136, 13140, 13144, 13148, 13152, 13156, + 0, 0, 0, 0, 0, 0, 0, 13160, 13162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 13162, 13164, 13166, 13168, 13170, 13172, 13174, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 13164, 13166, 13168, 13170, 13172, 13174, 13176, 13178, 13180, 13182, 13184, 13186, 13188, 13190, 13192, 13194, 13196, 13198, 13200, 13202, 13204, 13206, 13208, 13210, 13212, 13214, 13216, 13218, 13220, 13222, 13224, 13226, 13228, 13230, 13232, 13234, @@ -5245,11 +5338,11 @@ static unsigned short decomp_index2[] = { 14176, 14178, 14180, 14182, 14184, 14186, 14188, 14190, 14192, 14194, 14196, 14198, 14200, 14202, 14204, 14206, 14208, 14210, 14212, 14214, 14216, 14218, 14220, 14222, 14224, 14226, 14228, 14230, 14232, 14234, - 14236, 14238, 14240, 14242, 14244, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 14236, 14238, 14240, 14242, 14244, 14246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; /* NFC pairs */ @@ -5665,133 +5758,135 @@ static unsigned int comp_data[] = { }; static const change_record change_records_3_2_0[] = { - { 255, 255, 255, 255, 0 }, - { 11, 255, 255, 255, 0 }, - { 10, 255, 255, 255, 0 }, - { 255, 30, 255, 255, 0 }, - { 255, 2, 255, 255, 0 }, - { 19, 21, 255, 255, 0 }, - { 255, 255, 2, 255, 0 }, - { 255, 255, 3, 255, 0 }, - { 255, 255, 1, 255, 0 }, - { 255, 0, 255, 255, 0 }, - { 255, 29, 255, 255, 0 }, - { 255, 26, 255, 255, 0 }, - { 5, 255, 255, 255, 0 }, - { 14, 6, 255, 255, 0 }, - { 15, 255, 255, 255, 0 }, - { 255, 255, 255, 255, 1.0 }, - { 255, 255, 255, 255, 2.0 }, - { 255, 255, 255, 255, 3.0 }, - { 255, 255, 255, 255, 4.0 }, - { 255, 255, 255, 255, -1 }, - { 14, 255, 255, 255, 0 }, - { 255, 255, 255, 0, 0 }, - { 255, 7, 1, 255, 0 }, - { 255, 7, 2, 255, 0 }, - { 255, 7, 3, 255, 0 }, - { 255, 7, 4, 255, 0 }, - { 255, 7, 5, 255, 0 }, - { 255, 7, 6, 255, 0 }, - { 255, 7, 7, 255, 0 }, - { 255, 7, 8, 255, 0 }, - { 255, 7, 9, 255, 0 }, - { 255, 19, 255, 255, 0 }, - { 1, 5, 255, 255, 0 }, - { 255, 10, 255, 255, 0 }, - { 18, 255, 255, 255, 0 }, - { 19, 255, 255, 255, 0 }, - { 255, 255, 0, 255, 0 }, - { 255, 255, 4, 255, 0 }, - { 255, 255, 5, 255, 0 }, - { 255, 255, 6, 255, 0 }, - { 255, 255, 7, 255, 0 }, - { 255, 255, 8, 255, 0 }, - { 255, 255, 9, 255, 0 }, - { 19, 30, 255, 255, 0 }, - { 255, 8, 255, 255, 0 }, - { 255, 27, 255, 255, 0 }, - { 255, 22, 255, 255, 0 }, - { 255, 23, 255, 255, 0 }, - { 9, 255, 255, 255, 0 }, - { 14, 4, 255, 255, 0 }, - { 255, 20, 255, 255, 0 }, - { 255, 255, 255, 255, 1e+16 }, - { 255, 255, 255, 255, 1e+20 }, - { 255, 19, 255, 255, -1 }, - { 1, 255, 255, 0, 0 }, + { 255, 255, 255, 255, 255, 0 }, + { 11, 255, 255, 255, 255, 0 }, + { 10, 255, 255, 255, 255, 0 }, + { 255, 30, 255, 255, 255, 0 }, + { 255, 2, 255, 255, 255, 0 }, + { 19, 21, 255, 255, 255, 0 }, + { 255, 255, 2, 255, 255, 0 }, + { 255, 255, 3, 255, 255, 0 }, + { 255, 255, 1, 255, 255, 0 }, + { 255, 0, 255, 255, 255, 0 }, + { 255, 29, 255, 255, 255, 0 }, + { 255, 26, 255, 255, 255, 0 }, + { 5, 255, 255, 255, 255, 0 }, + { 14, 6, 255, 255, 255, 0 }, + { 15, 255, 255, 255, 255, 0 }, + { 255, 255, 255, 255, 255, 1.0 }, + { 255, 255, 255, 255, 255, 2.0 }, + { 255, 255, 255, 255, 255, 3.0 }, + { 255, 255, 255, 255, 255, 4.0 }, + { 255, 255, 255, 255, 255, -1 }, + { 14, 255, 255, 255, 255, 0 }, + { 255, 255, 255, 0, 255, 0 }, + { 255, 7, 1, 255, 255, 0 }, + { 255, 7, 2, 255, 255, 0 }, + { 255, 7, 3, 255, 255, 0 }, + { 255, 7, 4, 255, 255, 0 }, + { 255, 7, 5, 255, 255, 0 }, + { 255, 7, 6, 255, 255, 0 }, + { 255, 7, 7, 255, 255, 0 }, + { 255, 7, 8, 255, 255, 0 }, + { 255, 7, 9, 255, 255, 0 }, + { 255, 19, 255, 255, 255, 0 }, + { 1, 5, 255, 255, 255, 0 }, + { 1, 19, 255, 255, 255, 0 }, + { 255, 10, 255, 255, 255, 0 }, + { 18, 255, 255, 255, 255, 0 }, + { 19, 255, 255, 255, 255, 0 }, + { 255, 255, 0, 255, 255, 0 }, + { 255, 255, 4, 255, 255, 0 }, + { 255, 255, 5, 255, 255, 0 }, + { 255, 255, 6, 255, 255, 0 }, + { 255, 255, 7, 255, 255, 0 }, + { 255, 255, 8, 255, 255, 0 }, + { 255, 255, 9, 255, 255, 0 }, + { 19, 30, 255, 255, 255, 0 }, + { 255, 8, 255, 255, 255, 0 }, + { 255, 27, 255, 255, 255, 0 }, + { 255, 255, 255, 255, 5, 0 }, + { 255, 22, 255, 255, 255, 0 }, + { 255, 23, 255, 255, 255, 0 }, + { 9, 255, 255, 255, 255, 0 }, + { 14, 4, 255, 255, 255, 0 }, + { 255, 20, 255, 255, 255, 0 }, + { 255, 255, 255, 255, 255, 1e+16 }, + { 255, 255, 255, 255, 255, 1e+20 }, + { 255, 19, 255, 255, 255, -1 }, + { 1, 255, 255, 0, 255, 0 }, }; static unsigned char changes_3_2_0_index[] = { 0, 1, 2, 2, 3, 4, 5, 6, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 2, 2, 2, 38, 39, 2, 40, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 2, 52, 2, 2, 53, 54, 55, 56, 57, 2, 58, 59, 60, 61, 2, 2, 62, 63, - 64, 65, 66, 66, 2, 2, 2, 2, 67, 68, 69, 70, 71, 72, 73, 2, 2, 2, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 2, 2, 2, 2, 2, 2, 84, 2, 2, 2, 2, 2, 85, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 86, 2, 87, 2, 2, 2, 2, 2, 2, 2, 2, - 88, 89, 2, 2, 2, 2, 2, 2, 2, 90, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 91, - 92, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 93, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 94, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 95, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 97, 2, 2, 2, 2, 2, 2, 2, 2, 98, 50, 50, - 99, 100, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 50, 51, 2, 52, 2, 2, 53, 54, 55, 56, 57, 2, 58, 59, 60, 61, 2, 62, 63, + 64, 65, 66, 67, 67, 2, 2, 2, 2, 68, 69, 70, 71, 72, 73, 74, 2, 2, 2, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 2, 2, 2, 2, 2, 2, 85, 2, 2, 2, 2, 2, + 86, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 87, 2, 88, 2, 2, 2, 2, 2, 2, 2, 2, + 89, 90, 2, 2, 2, 2, 2, 2, 2, 91, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 92, + 93, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 94, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 95, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 97, 98, 2, 2, 2, 2, 2, 2, 2, 2, 99, 50, 50, + 100, 101, 50, 102, 103, 104, 105, 106, 107, 108, 109, 110, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 110, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 111, 112, 113, 114, 115, 116, 2, 2, 117, 118, 119, 2, 120, - 121, 122, 123, 124, 125, 2, 126, 127, 128, 129, 130, 131, 2, 50, 50, 132, - 2, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 2, 2, 143, 2, 2, 2, - 144, 145, 146, 147, 148, 149, 150, 2, 2, 151, 2, 152, 153, 154, 155, 2, - 2, 156, 2, 2, 2, 157, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 50, 50, 50, 50, - 50, 50, 158, 159, 50, 160, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 50, 50, 50, 50, 50, 50, 50, 50, 161, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 111, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 50, 50, 50, 50, 162, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 112, 113, 114, 115, 116, 117, 2, 2, 118, 119, 120, 2, 121, + 122, 123, 124, 125, 126, 2, 127, 128, 129, 130, 131, 132, 2, 50, 50, 133, + 2, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 2, 2, 144, 2, 2, 2, + 145, 146, 147, 148, 149, 150, 151, 2, 152, 153, 2, 154, 155, 156, 157, 2, + 2, 158, 2, 2, 2, 159, 2, 2, 160, 161, 2, 2, 2, 2, 2, 2, 50, 50, 50, 50, + 50, 50, 50, 162, 163, 50, 164, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 50, 50, 50, 50, 50, 50, 50, 50, 165, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 50, 50, 50, 50, 163, 164, 165, 166, 2, 2, 2, 2, 2, 2, 167, 168, + 2, 2, 50, 50, 50, 50, 166, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 50, 50, 50, 50, 167, 168, 169, 170, 2, 2, 2, 2, 2, 2, 171, + 172, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 173, 50, 50, 50, 50, 50, + 174, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 175, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 176, 177, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 178, + 179, 180, 2, 181, 2, 2, 182, 2, 2, 2, 183, 184, 185, 50, 50, 50, 50, 50, + 186, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 187, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 50, 188, 189, 2, 2, 2, 2, 2, 2, 2, 2, 2, 190, 191, 2, 2, 192, + 193, 194, 195, 196, 2, 50, 50, 50, 50, 50, 50, 50, 197, 198, 199, 200, + 201, 202, 203, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 204, 205, 96, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 85, 206, 2, 207, 208, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 169, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 170, 171, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 172, 173, 174, 2, 175, 2, 2, 176, 2, 2, 2, 177, 178, 179, 50, - 50, 50, 50, 50, 180, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 181, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 182, - 183, 2, 2, 184, 185, 186, 187, 188, 2, 50, 50, 50, 50, 189, 190, 50, 191, - 192, 193, 194, 195, 196, 197, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 198, - 199, 95, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 84, 200, 2, 201, - 202, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 203, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 204, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 205, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 209, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 210, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 211, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 206, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 212, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 207, 50, 208, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 213, 50, 214, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 209, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 215, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 203, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 209, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -6026,8 +6121,8 @@ static unsigned char changes_3_2_0_index[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 50, 210, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 50, 216, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -6090,7 +6185,7 @@ static unsigned char changes_3_2_0_index[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, }; static unsigned char changes_3_2_0_data[] = { @@ -6176,9 +6271,9 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, @@ -6216,7 +6311,7 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 20, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, @@ -6225,9 +6320,9 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 9, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 9, 9, 9, 0, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6314,7 +6409,7 @@ static unsigned char changes_3_2_0_data[] = { 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6356,8 +6451,8 @@ static unsigned char changes_3_2_0_data[] = { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6372,29 +6467,29 @@ static unsigned char changes_3_2_0_data[] = { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, - 9, 9, 9, 0, 0, 0, 0, 0, 9, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 36, 4, 0, 0, - 37, 38, 39, 40, 41, 42, 1, 1, 0, 0, 0, 4, 36, 8, 6, 7, 37, 38, 39, 40, - 41, 42, 1, 1, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, + 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 0, 9, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 37, 4, 0, 0, + 38, 39, 40, 41, 42, 43, 1, 1, 0, 0, 0, 4, 37, 8, 6, 7, 38, 39, 40, 41, + 42, 43, 1, 1, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6405,180 +6500,187 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 45, 45, 45, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 46, 46, 46, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 47, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, 11, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 47, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 9, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 9, 0, 0, 0, - 0, 9, 9, 9, 0, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 9, 0, 9, 0, 0, 0, 0, 9, 9, 9, 0, 9, 0, 0, 0, 0, 0, 0, + 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 9, 0, 0, 0, 0, 0, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, - 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, - 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 0, 0, 0, 0, + 0, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 51, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, + 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6586,37 +6688,35 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6624,549 +6724,576 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, + 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, - 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 19, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 19, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 21, 21, 0, 0, 0, 1, 1, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, + 21, 21, 21, 21, 0, 0, 0, 1, 1, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 14, 14, 14, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, + 0, 0, 19, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 9, 0, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 0, 0, 9, - 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 0, 0, 0, 0, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 0, 0, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, + 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 0, 9, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 0, 9, 9, 9, 9, 0, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 0, 9, 9, 9, + 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 9, 0, 0, + 9, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, - 9, 9, 9, 9, 0, 9, 9, 0, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 9, 9, 0, 0, 9, 9, 9, 0, 0, 9, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, - 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, - 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 9, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, + 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 0, 9, 9, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 9, 9, 0, 9, 0, 0, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, - 9, 9, 9, 0, 9, 0, 9, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, 0, 9, 0, 9, 0, - 9, 9, 9, 0, 9, 9, 0, 9, 0, 0, 9, 0, 9, 0, 9, 0, 9, 0, 9, 0, 9, 9, 0, 9, - 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, - 0, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 0, 9, 9, 9, 9, 9, 0, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 9, 9, 0, 9, 0, 0, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, + 0, 9, 0, 9, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, 0, 9, 0, 9, 0, 9, 9, 9, + 0, 9, 9, 0, 9, 0, 0, 9, 0, 9, 0, 9, 0, 9, 0, 9, 0, 9, 9, 0, 9, 0, 0, 9, + 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 0, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 0, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, - 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7174,25 +7301,25 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7201,29 +7328,29 @@ static unsigned char changes_3_2_0_data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; static const change_record* get_change_3_2_0(Py_UCS4 n) diff --git a/Modules/unicodename_db.h b/Modules/unicodename_db.h index d0f9cb4..a81d8e3 100644 --- a/Modules/unicodename_db.h +++ b/Modules/unicodename_db.h @@ -4,246 +4,247 @@ /* lexicon */ static unsigned char lexicon[] = { - 76, 69, 84, 84, 69, 210, 83, 73, 71, 206, 87, 73, 84, 200, 83, 89, 76, - 76, 65, 66, 76, 197, 83, 77, 65, 76, 204, 67, 65, 80, 73, 84, 65, 204, - 72, 73, 69, 82, 79, 71, 76, 89, 80, 200, 76, 65, 84, 73, 206, 67, 85, 78, - 69, 73, 70, 79, 82, 205, 65, 82, 65, 66, 73, 195, 89, 201, 67, 74, 203, + 76, 69, 84, 84, 69, 210, 83, 73, 71, 206, 87, 73, 84, 200, 83, 77, 65, + 76, 204, 83, 89, 76, 76, 65, 66, 76, 197, 67, 65, 80, 73, 84, 65, 204, + 72, 73, 69, 82, 79, 71, 76, 89, 80, 200, 76, 65, 84, 73, 206, 65, 82, 65, + 66, 73, 195, 67, 85, 78, 69, 73, 70, 79, 82, 205, 89, 201, 67, 74, 203, 77, 65, 84, 72, 69, 77, 65, 84, 73, 67, 65, 204, 69, 71, 89, 80, 84, 73, 65, 206, 67, 79, 77, 80, 65, 84, 73, 66, 73, 76, 73, 84, 217, 83, 89, 77, - 66, 79, 204, 68, 73, 71, 73, 212, 70, 79, 82, 77, 128, 67, 65, 78, 65, - 68, 73, 65, 206, 83, 89, 76, 76, 65, 66, 73, 67, 211, 83, 73, 71, 78, 87, - 82, 73, 84, 73, 78, 199, 86, 79, 87, 69, 204, 84, 73, 77, 69, 211, 66, - 65, 77, 85, 205, 65, 78, 196, 66, 79, 76, 196, 65, 78, 65, 84, 79, 76, - 73, 65, 206, 72, 65, 78, 71, 85, 204, 76, 73, 78, 69, 65, 210, 71, 82, - 69, 69, 203, 77, 85, 83, 73, 67, 65, 204, 76, 73, 71, 65, 84, 85, 82, - 197, 69, 84, 72, 73, 79, 80, 73, 195, 193, 70, 79, 210, 67, 89, 82, 73, - 76, 76, 73, 195, 73, 84, 65, 76, 73, 195, 67, 79, 77, 66, 73, 78, 73, 78, - 199, 82, 65, 68, 73, 67, 65, 204, 83, 65, 78, 83, 45, 83, 69, 82, 73, - 198, 78, 85, 77, 66, 69, 210, 67, 73, 82, 67, 76, 69, 196, 84, 65, 77, - 73, 204, 84, 65, 201, 70, 73, 78, 65, 204, 65, 82, 82, 79, 87, 128, 86, - 65, 201, 76, 69, 70, 212, 82, 73, 71, 72, 212, 83, 81, 85, 65, 82, 197, - 68, 79, 85, 66, 76, 197, 65, 82, 82, 79, 215, 83, 73, 71, 78, 128, 65, - 66, 79, 86, 69, 128, 66, 69, 76, 79, 87, 128, 86, 65, 82, 73, 65, 84, 73, - 79, 206, 66, 82, 65, 73, 76, 76, 197, 80, 65, 84, 84, 69, 82, 206, 66, - 89, 90, 65, 78, 84, 73, 78, 197, 87, 72, 73, 84, 197, 66, 76, 65, 67, - 203, 65, 128, 73, 83, 79, 76, 65, 84, 69, 196, 77, 79, 68, 73, 70, 73, - 69, 210, 194, 75, 65, 84, 65, 75, 65, 78, 193, 85, 128, 77, 89, 65, 78, - 77, 65, 210, 68, 79, 212, 75, 65, 78, 71, 88, 201, 75, 73, 75, 65, 75, - 85, 201, 77, 69, 78, 68, 197, 73, 128, 79, 198, 84, 73, 66, 69, 84, 65, - 206, 79, 128, 72, 69, 65, 86, 217, 86, 69, 82, 84, 73, 67, 65, 204, 73, - 78, 73, 84, 73, 65, 204, 77, 65, 82, 75, 128, 77, 69, 69, 205, 67, 79, - 80, 84, 73, 195, 75, 72, 77, 69, 210, 82, 73, 71, 72, 84, 87, 65, 82, 68, - 211, 65, 66, 79, 86, 197, 67, 65, 82, 82, 73, 69, 210, 89, 69, 200, 67, - 72, 69, 82, 79, 75, 69, 197, 80, 76, 85, 211, 68, 69, 86, 65, 78, 65, 71, - 65, 82, 201, 80, 72, 65, 83, 69, 45, 197, 77, 79, 78, 71, 79, 76, 73, 65, - 206, 83, 84, 82, 79, 75, 69, 128, 76, 69, 70, 84, 87, 65, 82, 68, 211, - 83, 89, 77, 66, 79, 76, 128, 66, 79, 216, 84, 73, 76, 197, 68, 85, 80, - 76, 79, 89, 65, 206, 77, 73, 68, 68, 76, 197, 80, 65, 82, 69, 78, 84, 72, - 69, 83, 73, 90, 69, 196, 83, 81, 85, 65, 82, 69, 196, 84, 72, 65, 205, - 79, 78, 69, 128, 213, 74, 79, 78, 71, 83, 69, 79, 78, 199, 84, 87, 79, - 128, 67, 79, 78, 83, 79, 78, 65, 78, 212, 72, 69, 66, 82, 69, 215, 77, - 73, 65, 207, 85, 208, 72, 79, 79, 75, 128, 71, 69, 79, 82, 71, 73, 65, - 206, 79, 86, 69, 210, 68, 82, 65, 87, 73, 78, 71, 211, 72, 77, 79, 78, - 199, 79, 78, 197, 80, 65, 72, 65, 87, 200, 84, 87, 207, 68, 79, 87, 206, - 73, 78, 68, 69, 216, 67, 72, 79, 83, 69, 79, 78, 199, 76, 79, 215, 86, - 79, 67, 65, 76, 73, 195, 84, 72, 82, 69, 197, 72, 65, 76, 70, 87, 73, 68, - 84, 200, 72, 65, 78, 68, 45, 70, 73, 83, 212, 77, 69, 82, 79, 73, 84, 73, - 195, 66, 65, 76, 73, 78, 69, 83, 197, 77, 65, 82, 203, 83, 67, 82, 73, - 80, 212, 73, 68, 69, 79, 71, 82, 65, 205, 80, 72, 65, 83, 69, 45, 196, - 84, 79, 128, 65, 76, 67, 72, 69, 77, 73, 67, 65, 204, 65, 76, 69, 198, - 72, 73, 71, 200, 73, 68, 69, 79, 71, 82, 65, 80, 72, 73, 195, 83, 73, 78, - 72, 65, 76, 193, 78, 85, 77, 69, 82, 73, 195, 66, 65, 82, 128, 84, 79, - 78, 197, 66, 82, 65, 72, 77, 201, 72, 85, 78, 71, 65, 82, 73, 65, 206, - 84, 72, 82, 69, 69, 128, 84, 72, 85, 77, 194, 70, 79, 85, 82, 128, 66, - 65, 82, 194, 72, 65, 200, 72, 65, 128, 78, 79, 82, 84, 200, 70, 85, 76, - 76, 87, 73, 68, 84, 200, 66, 82, 65, 67, 75, 69, 84, 128, 69, 81, 85, 65, - 204, 76, 73, 71, 72, 212, 84, 65, 199, 68, 79, 77, 73, 78, 207, 72, 65, - 76, 198, 76, 79, 78, 199, 77, 65, 76, 65, 89, 65, 76, 65, 205, 65, 67, - 85, 84, 69, 128, 70, 82, 65, 75, 84, 85, 210, 67, 72, 65, 82, 65, 67, 84, - 69, 210, 80, 72, 65, 83, 69, 45, 195, 68, 79, 85, 66, 76, 69, 45, 83, 84, - 82, 85, 67, 203, 70, 73, 86, 69, 128, 79, 80, 69, 206, 72, 73, 82, 65, - 71, 65, 78, 193, 75, 65, 128, 77, 69, 68, 73, 65, 204, 84, 69, 76, 85, + 66, 79, 204, 68, 73, 71, 73, 212, 84, 65, 78, 71, 85, 212, 70, 79, 82, + 77, 128, 67, 65, 78, 65, 68, 73, 65, 206, 83, 89, 76, 76, 65, 66, 73, 67, + 211, 86, 79, 87, 69, 204, 83, 73, 71, 78, 87, 82, 73, 84, 73, 78, 199, + 84, 73, 77, 69, 211, 66, 65, 77, 85, 205, 65, 78, 196, 66, 79, 76, 196, + 65, 78, 65, 84, 79, 76, 73, 65, 206, 72, 65, 78, 71, 85, 204, 76, 73, 78, + 69, 65, 210, 71, 82, 69, 69, 203, 77, 85, 83, 73, 67, 65, 204, 76, 73, + 71, 65, 84, 85, 82, 197, 69, 84, 72, 73, 79, 80, 73, 195, 193, 70, 79, + 210, 67, 89, 82, 73, 76, 76, 73, 195, 67, 79, 77, 66, 73, 78, 73, 78, + 199, 73, 84, 65, 76, 73, 195, 78, 85, 77, 66, 69, 210, 82, 65, 68, 73, + 67, 65, 204, 83, 65, 78, 83, 45, 83, 69, 82, 73, 198, 67, 73, 82, 67, 76, + 69, 196, 84, 65, 77, 73, 204, 84, 65, 201, 70, 73, 78, 65, 204, 65, 82, + 82, 79, 87, 128, 76, 69, 70, 212, 86, 65, 201, 82, 73, 71, 72, 212, 83, + 81, 85, 65, 82, 197, 68, 79, 85, 66, 76, 197, 83, 73, 71, 78, 128, 65, + 82, 82, 79, 215, 65, 66, 79, 86, 69, 128, 66, 69, 76, 79, 87, 128, 86, + 65, 82, 73, 65, 84, 73, 79, 206, 66, 82, 65, 73, 76, 76, 197, 80, 65, 84, + 84, 69, 82, 206, 66, 89, 90, 65, 78, 84, 73, 78, 197, 65, 128, 66, 76, + 65, 67, 203, 87, 72, 73, 84, 197, 73, 83, 79, 76, 65, 84, 69, 196, 85, + 128, 77, 79, 68, 73, 70, 73, 69, 210, 194, 75, 65, 84, 65, 75, 65, 78, + 193, 73, 128, 77, 89, 65, 78, 77, 65, 210, 68, 79, 212, 79, 128, 75, 65, + 78, 71, 88, 201, 79, 198, 75, 73, 75, 65, 75, 85, 201, 77, 69, 78, 68, + 197, 84, 73, 66, 69, 84, 65, 206, 72, 69, 65, 86, 217, 77, 65, 82, 75, + 128, 73, 78, 73, 84, 73, 65, 204, 86, 69, 82, 84, 73, 67, 65, 204, 77, + 69, 69, 205, 67, 79, 80, 84, 73, 195, 75, 72, 77, 69, 210, 82, 73, 71, + 72, 84, 87, 65, 82, 68, 211, 65, 66, 79, 86, 197, 67, 65, 82, 82, 73, 69, + 210, 89, 69, 200, 67, 72, 69, 82, 79, 75, 69, 197, 77, 79, 78, 71, 79, + 76, 73, 65, 206, 80, 76, 85, 211, 68, 69, 86, 65, 78, 65, 71, 65, 82, + 201, 83, 81, 85, 65, 82, 69, 196, 80, 72, 65, 83, 69, 45, 197, 83, 84, + 82, 79, 75, 69, 128, 76, 69, 70, 84, 87, 65, 82, 68, 211, 83, 89, 77, 66, + 79, 76, 128, 66, 79, 216, 77, 73, 68, 68, 76, 197, 79, 78, 69, 128, 84, + 73, 76, 197, 68, 85, 80, 76, 79, 89, 65, 206, 84, 87, 79, 128, 80, 65, + 82, 69, 78, 84, 72, 69, 83, 73, 90, 69, 196, 84, 72, 65, 205, 213, 86, + 79, 67, 65, 76, 73, 195, 74, 79, 78, 71, 83, 69, 79, 78, 199, 67, 79, 78, + 83, 79, 78, 65, 78, 212, 79, 78, 197, 72, 69, 66, 82, 69, 215, 77, 73, + 65, 207, 85, 208, 71, 76, 65, 71, 79, 76, 73, 84, 73, 195, 72, 79, 79, + 75, 128, 71, 69, 79, 82, 71, 73, 65, 206, 79, 86, 69, 210, 84, 87, 207, + 68, 82, 65, 87, 73, 78, 71, 211, 72, 73, 71, 200, 72, 77, 79, 78, 199, + 73, 78, 68, 69, 216, 80, 65, 72, 65, 87, 200, 84, 72, 82, 69, 197, 68, + 79, 87, 206, 76, 79, 215, 67, 72, 79, 83, 69, 79, 78, 199, 72, 65, 76, + 70, 87, 73, 68, 84, 200, 72, 65, 78, 68, 45, 70, 73, 83, 212, 77, 69, 82, + 79, 73, 84, 73, 195, 66, 65, 76, 73, 78, 69, 83, 197, 77, 65, 82, 203, + 83, 67, 82, 73, 80, 212, 73, 68, 69, 79, 71, 82, 65, 205, 80, 72, 65, 83, + 69, 45, 196, 84, 79, 128, 65, 76, 67, 72, 69, 77, 73, 67, 65, 204, 65, + 76, 69, 198, 73, 68, 69, 79, 71, 82, 65, 80, 72, 73, 195, 77, 65, 76, 65, + 89, 65, 76, 65, 205, 83, 73, 78, 72, 65, 76, 193, 72, 65, 128, 78, 85, + 77, 69, 82, 73, 195, 82, 128, 84, 72, 82, 69, 69, 128, 66, 65, 82, 128, + 70, 79, 85, 82, 128, 84, 79, 78, 197, 66, 82, 65, 72, 77, 201, 72, 85, + 78, 71, 65, 82, 73, 65, 206, 84, 72, 85, 77, 194, 66, 65, 82, 194, 72, + 65, 200, 78, 79, 82, 84, 200, 70, 85, 76, 76, 87, 73, 68, 84, 200, 66, + 82, 65, 67, 75, 69, 84, 128, 69, 81, 85, 65, 204, 75, 65, 128, 76, 73, + 71, 72, 212, 70, 73, 86, 69, 128, 84, 65, 199, 68, 79, 77, 73, 78, 207, + 72, 65, 76, 198, 76, 79, 78, 199, 65, 67, 85, 84, 69, 128, 70, 82, 65, + 75, 84, 85, 210, 67, 72, 65, 82, 65, 67, 84, 69, 210, 80, 65, 128, 80, + 72, 65, 83, 69, 45, 195, 66, 72, 65, 73, 75, 83, 85, 75, 201, 68, 79, 85, + 66, 76, 69, 45, 83, 84, 82, 85, 67, 203, 79, 80, 69, 206, 72, 73, 82, 65, + 71, 65, 78, 193, 77, 65, 128, 77, 69, 68, 73, 65, 204, 84, 69, 76, 85, 71, 213, 74, 85, 78, 71, 83, 69, 79, 78, 199, 85, 80, 87, 65, 82, 68, - 211, 65, 82, 77, 69, 78, 73, 65, 206, 66, 69, 78, 71, 65, 76, 201, 71, - 76, 65, 71, 79, 76, 73, 84, 73, 195, 83, 72, 65, 82, 65, 68, 193, 78, 69, - 71, 65, 84, 73, 86, 197, 68, 79, 87, 78, 87, 65, 82, 68, 211, 74, 69, 69, - 205, 80, 65, 128, 83, 73, 68, 68, 72, 65, 205, 68, 79, 84, 211, 73, 68, - 69, 79, 71, 82, 65, 80, 200, 74, 65, 86, 65, 78, 69, 83, 197, 67, 85, 82, - 83, 73, 86, 197, 77, 65, 128, 79, 82, 73, 89, 193, 83, 128, 83, 73, 88, - 128, 87, 69, 83, 84, 45, 67, 82, 69, 197, 82, 85, 78, 73, 195, 89, 65, - 128, 69, 73, 71, 72, 84, 128, 75, 65, 78, 78, 65, 68, 193, 78, 65, 128, - 90, 90, 89, 88, 128, 90, 90, 89, 84, 128, 90, 90, 89, 82, 88, 128, 90, - 90, 89, 82, 128, 90, 90, 89, 80, 128, 90, 90, 89, 65, 128, 90, 90, 89, - 128, 90, 90, 85, 88, 128, 90, 90, 85, 82, 88, 128, 90, 90, 85, 82, 128, - 90, 90, 85, 80, 128, 90, 90, 85, 128, 90, 90, 83, 89, 65, 128, 90, 90, - 83, 65, 128, 90, 90, 79, 88, 128, 90, 90, 79, 80, 128, 90, 90, 79, 128, - 90, 90, 73, 88, 128, 90, 90, 73, 84, 128, 90, 90, 73, 80, 128, 90, 90, - 73, 69, 88, 128, 90, 90, 73, 69, 84, 128, 90, 90, 73, 69, 80, 128, 90, - 90, 73, 69, 128, 90, 90, 73, 128, 90, 90, 69, 88, 128, 90, 90, 69, 80, - 128, 90, 90, 69, 69, 128, 90, 90, 69, 128, 90, 90, 65, 88, 128, 90, 90, - 65, 84, 128, 90, 90, 65, 80, 128, 90, 90, 65, 65, 128, 90, 90, 65, 128, - 90, 89, 71, 79, 83, 128, 90, 87, 83, 80, 128, 90, 87, 78, 74, 128, 90, - 87, 78, 66, 83, 80, 128, 90, 87, 74, 128, 90, 87, 202, 90, 87, 65, 82, - 65, 75, 65, 89, 128, 90, 87, 65, 128, 90, 85, 84, 128, 90, 85, 79, 88, - 128, 90, 85, 79, 80, 128, 90, 85, 79, 128, 90, 85, 77, 128, 90, 85, 66, - 85, 82, 128, 90, 85, 53, 128, 90, 85, 181, 90, 213, 90, 83, 72, 65, 128, - 90, 82, 65, 128, 90, 81, 65, 80, 72, 193, 90, 79, 84, 128, 90, 79, 79, - 128, 90, 79, 65, 128, 90, 76, 65, 77, 193, 90, 76, 65, 128, 90, 76, 193, - 90, 74, 69, 128, 90, 73, 90, 50, 128, 90, 73, 81, 65, 65, 128, 90, 73, - 80, 80, 69, 82, 45, 77, 79, 85, 84, 200, 90, 73, 78, 79, 82, 128, 90, 73, - 76, 68, 69, 128, 90, 73, 71, 90, 65, 199, 90, 73, 71, 128, 90, 73, 68, - 193, 90, 73, 66, 128, 90, 73, 194, 90, 73, 51, 128, 90, 201, 90, 72, 89, - 88, 128, 90, 72, 89, 84, 128, 90, 72, 89, 82, 88, 128, 90, 72, 89, 82, - 128, 90, 72, 89, 80, 128, 90, 72, 89, 128, 90, 72, 87, 69, 128, 90, 72, - 87, 65, 128, 90, 72, 85, 88, 128, 90, 72, 85, 84, 128, 90, 72, 85, 82, - 88, 128, 90, 72, 85, 82, 128, 90, 72, 85, 80, 128, 90, 72, 85, 79, 88, - 128, 90, 72, 85, 79, 80, 128, 90, 72, 85, 79, 128, 90, 72, 85, 128, 90, - 72, 79, 88, 128, 90, 72, 79, 84, 128, 90, 72, 79, 80, 128, 90, 72, 79, - 79, 128, 90, 72, 79, 73, 128, 90, 72, 79, 128, 90, 72, 73, 86, 69, 84, - 69, 128, 90, 72, 73, 76, 128, 90, 72, 73, 128, 90, 72, 69, 88, 128, 90, - 72, 69, 84, 128, 90, 72, 69, 80, 128, 90, 72, 69, 69, 128, 90, 72, 69, - 128, 90, 72, 197, 90, 72, 65, 89, 73, 78, 128, 90, 72, 65, 88, 128, 90, - 72, 65, 84, 128, 90, 72, 65, 82, 128, 90, 72, 65, 80, 128, 90, 72, 65, - 73, 78, 128, 90, 72, 65, 65, 128, 90, 72, 65, 128, 90, 72, 128, 90, 69, - 84, 65, 128, 90, 69, 82, 79, 128, 90, 69, 82, 207, 90, 69, 78, 128, 90, - 69, 77, 76, 89, 65, 128, 90, 69, 77, 76, 74, 65, 128, 90, 69, 50, 128, - 90, 197, 90, 65, 89, 78, 128, 90, 65, 89, 73, 78, 128, 90, 65, 89, 73, - 206, 90, 65, 86, 73, 89, 65, 78, 73, 128, 90, 65, 84, 65, 128, 90, 65, - 82, 81, 65, 128, 90, 65, 82, 76, 128, 90, 65, 81, 69, 198, 90, 65, 77, - 88, 128, 90, 65, 204, 90, 65, 73, 78, 128, 90, 65, 73, 206, 90, 65, 73, - 128, 90, 65, 72, 128, 90, 65, 200, 90, 65, 71, 128, 90, 65, 69, 70, 128, - 90, 65, 55, 128, 90, 193, 90, 48, 49, 54, 72, 128, 90, 48, 49, 54, 71, - 128, 90, 48, 49, 54, 70, 128, 90, 48, 49, 54, 69, 128, 90, 48, 49, 54, - 68, 128, 90, 48, 49, 54, 67, 128, 90, 48, 49, 54, 66, 128, 90, 48, 49, - 54, 65, 128, 90, 48, 49, 54, 128, 90, 48, 49, 53, 73, 128, 90, 48, 49, - 53, 72, 128, 90, 48, 49, 53, 71, 128, 90, 48, 49, 53, 70, 128, 90, 48, - 49, 53, 69, 128, 90, 48, 49, 53, 68, 128, 90, 48, 49, 53, 67, 128, 90, - 48, 49, 53, 66, 128, 90, 48, 49, 53, 65, 128, 90, 48, 49, 53, 128, 90, - 48, 49, 52, 128, 90, 48, 49, 51, 128, 90, 48, 49, 50, 128, 90, 48, 49, - 49, 128, 90, 48, 49, 48, 128, 90, 48, 48, 57, 128, 90, 48, 48, 56, 128, - 90, 48, 48, 55, 128, 90, 48, 48, 54, 128, 90, 48, 48, 53, 65, 128, 90, - 48, 48, 53, 128, 90, 48, 48, 52, 65, 128, 90, 48, 48, 52, 128, 90, 48, - 48, 51, 66, 128, 90, 48, 48, 51, 65, 128, 90, 48, 48, 51, 128, 90, 48, - 48, 50, 68, 128, 90, 48, 48, 50, 67, 128, 90, 48, 48, 50, 66, 128, 90, - 48, 48, 50, 65, 128, 90, 48, 48, 50, 128, 90, 48, 48, 49, 128, 90, 128, - 218, 89, 89, 88, 128, 89, 89, 84, 128, 89, 89, 82, 88, 128, 89, 89, 82, - 128, 89, 89, 80, 128, 89, 89, 69, 128, 89, 89, 65, 65, 128, 89, 89, 65, - 128, 89, 89, 128, 89, 87, 79, 79, 128, 89, 87, 79, 128, 89, 87, 73, 73, - 128, 89, 87, 73, 128, 89, 87, 69, 128, 89, 87, 65, 65, 128, 89, 87, 65, - 128, 89, 86, 128, 89, 85, 88, 128, 89, 85, 87, 79, 81, 128, 89, 85, 85, - 75, 65, 76, 69, 65, 80, 73, 78, 84, 85, 128, 89, 85, 85, 128, 89, 85, 84, - 128, 89, 85, 83, 128, 89, 85, 211, 89, 85, 82, 88, 128, 89, 85, 82, 128, - 89, 85, 81, 128, 89, 85, 209, 89, 85, 80, 128, 89, 85, 79, 88, 128, 89, - 85, 79, 84, 128, 89, 85, 79, 80, 128, 89, 85, 79, 77, 128, 89, 85, 79, - 128, 89, 85, 78, 128, 89, 85, 77, 128, 89, 85, 74, 128, 89, 85, 69, 81, - 128, 89, 85, 69, 128, 89, 85, 68, 72, 128, 89, 85, 68, 200, 89, 85, 65, - 78, 128, 89, 85, 65, 69, 78, 128, 89, 85, 45, 89, 69, 79, 128, 89, 85, - 45, 89, 69, 128, 89, 85, 45, 85, 128, 89, 85, 45, 79, 128, 89, 85, 45, - 73, 128, 89, 85, 45, 69, 79, 128, 89, 85, 45, 69, 128, 89, 85, 45, 65, - 69, 128, 89, 85, 45, 65, 128, 89, 85, 128, 89, 213, 89, 82, 89, 128, 89, - 80, 83, 73, 76, 73, 128, 89, 80, 79, 82, 82, 79, 73, 128, 89, 80, 79, 75, - 82, 73, 83, 73, 83, 128, 89, 80, 79, 75, 82, 73, 83, 73, 211, 89, 80, 79, - 71, 69, 71, 82, 65, 77, 77, 69, 78, 73, 128, 89, 79, 89, 128, 89, 79, 88, - 128, 89, 79, 87, 68, 128, 89, 79, 85, 84, 72, 70, 85, 76, 78, 69, 83, 83, - 128, 89, 79, 85, 84, 72, 70, 85, 204, 89, 79, 84, 128, 89, 79, 82, 73, - 128, 89, 79, 81, 128, 89, 79, 209, 89, 79, 80, 128, 89, 79, 79, 128, 89, - 79, 77, 79, 128, 89, 79, 71, 72, 128, 89, 79, 68, 72, 128, 89, 79, 68, - 128, 89, 79, 196, 89, 79, 65, 128, 89, 79, 45, 89, 69, 79, 128, 89, 79, - 45, 89, 65, 69, 128, 89, 79, 45, 89, 65, 128, 89, 79, 45, 79, 128, 89, - 79, 45, 73, 128, 89, 79, 45, 69, 79, 128, 89, 79, 45, 65, 69, 128, 89, - 79, 45, 65, 128, 89, 79, 128, 89, 207, 89, 73, 90, 69, 84, 128, 89, 73, - 88, 128, 89, 73, 87, 78, 128, 89, 73, 84, 128, 89, 73, 80, 128, 89, 73, - 78, 71, 128, 89, 73, 73, 128, 89, 73, 199, 89, 73, 69, 88, 128, 89, 73, - 69, 84, 128, 89, 73, 69, 80, 128, 89, 73, 69, 69, 128, 89, 73, 69, 128, - 89, 73, 68, 68, 73, 83, 200, 89, 73, 45, 85, 128, 89, 73, 128, 89, 70, - 69, 83, 73, 83, 128, 89, 70, 69, 83, 73, 211, 89, 70, 69, 206, 89, 69, - 89, 128, 89, 69, 87, 128, 89, 69, 85, 88, 128, 89, 69, 85, 82, 65, 69, - 128, 89, 69, 85, 81, 128, 89, 69, 85, 77, 128, 89, 69, 85, 65, 69, 84, - 128, 89, 69, 85, 65, 69, 128, 89, 69, 84, 73, 86, 128, 89, 69, 83, 84, - 85, 128, 89, 69, 83, 73, 69, 85, 78, 71, 45, 83, 73, 79, 83, 128, 89, 69, - 83, 73, 69, 85, 78, 71, 45, 80, 65, 78, 83, 73, 79, 83, 128, 89, 69, 83, - 73, 69, 85, 78, 71, 45, 77, 73, 69, 85, 77, 128, 89, 69, 83, 73, 69, 85, - 78, 71, 45, 72, 73, 69, 85, 72, 128, 89, 69, 83, 73, 69, 85, 78, 71, 128, - 89, 69, 82, 85, 128, 89, 69, 82, 213, 89, 69, 82, 73, 128, 89, 69, 82, - 65, 200, 89, 69, 82, 128, 89, 69, 79, 82, 73, 78, 72, 73, 69, 85, 72, - 128, 89, 69, 79, 45, 89, 65, 128, 89, 69, 79, 45, 85, 128, 89, 69, 79, - 45, 79, 128, 89, 69, 78, 73, 83, 69, 201, 89, 69, 78, 65, 80, 128, 89, - 69, 78, 128, 89, 69, 206, 89, 69, 76, 76, 79, 87, 128, 89, 69, 76, 76, - 79, 215, 89, 69, 73, 78, 128, 89, 69, 72, 128, 89, 69, 69, 71, 128, 89, - 69, 69, 128, 89, 69, 65, 210, 89, 69, 65, 128, 89, 65, 90, 90, 128, 89, - 65, 90, 72, 128, 89, 65, 90, 128, 89, 65, 89, 68, 128, 89, 65, 89, 65, - 78, 78, 65, 128, 89, 65, 89, 128, 89, 65, 87, 78, 128, 89, 65, 87, 128, - 89, 65, 86, 128, 89, 65, 85, 128, 89, 65, 84, 84, 128, 89, 65, 84, 73, - 128, 89, 65, 84, 72, 128, 89, 65, 84, 128, 89, 65, 83, 83, 128, 89, 65, - 83, 72, 128, 89, 65, 83, 128, 89, 65, 82, 82, 128, 89, 65, 82, 128, 89, - 65, 210, 89, 65, 81, 128, 89, 65, 80, 128, 89, 65, 78, 83, 65, 89, 65, - 128, 89, 65, 78, 71, 128, 89, 65, 78, 199, 89, 65, 78, 128, 89, 65, 77, - 79, 75, 128, 89, 65, 77, 65, 75, 75, 65, 78, 128, 89, 65, 77, 128, 89, - 65, 76, 128, 89, 65, 75, 72, 72, 128, 89, 65, 75, 72, 128, 89, 65, 75, - 65, 83, 72, 128, 89, 65, 75, 128, 89, 65, 74, 85, 82, 86, 69, 68, 73, - 195, 89, 65, 74, 128, 89, 65, 73, 128, 89, 65, 72, 72, 128, 89, 65, 72, - 128, 89, 65, 71, 78, 128, 89, 65, 71, 72, 72, 128, 89, 65, 71, 72, 128, - 89, 65, 71, 128, 89, 65, 70, 213, 89, 65, 70, 128, 89, 65, 69, 77, 77, - 65, 69, 128, 89, 65, 68, 72, 128, 89, 65, 68, 68, 72, 128, 89, 65, 68, - 68, 128, 89, 65, 68, 128, 89, 65, 67, 72, 128, 89, 65, 66, 72, 128, 89, - 65, 66, 128, 89, 65, 65, 82, 85, 128, 89, 65, 65, 73, 128, 89, 65, 65, - 68, 79, 128, 89, 65, 45, 89, 79, 128, 89, 65, 45, 85, 128, 89, 65, 45, - 79, 128, 89, 48, 48, 56, 128, 89, 48, 48, 55, 128, 89, 48, 48, 54, 128, - 89, 48, 48, 53, 128, 89, 48, 48, 52, 128, 89, 48, 48, 51, 128, 89, 48, - 48, 50, 128, 89, 48, 48, 49, 65, 128, 89, 48, 48, 49, 128, 89, 45, 67, - 82, 69, 197, 88, 89, 88, 128, 88, 89, 85, 128, 88, 89, 84, 128, 88, 89, - 82, 88, 128, 88, 89, 82, 128, 88, 89, 80, 128, 88, 89, 79, 79, 74, 128, - 88, 89, 79, 79, 128, 88, 89, 79, 128, 88, 89, 73, 128, 88, 89, 69, 69, - 205, 88, 89, 69, 69, 128, 88, 89, 69, 128, 88, 89, 65, 65, 128, 88, 89, - 65, 128, 88, 89, 128, 88, 87, 73, 128, 88, 87, 69, 69, 128, 88, 87, 69, - 128, 88, 87, 65, 65, 128, 88, 87, 65, 128, 88, 87, 128, 88, 86, 69, 128, - 88, 86, 65, 128, 88, 85, 79, 88, 128, 88, 85, 79, 128, 88, 85, 128, 88, - 83, 72, 65, 65, 89, 65, 84, 72, 73, 89, 65, 128, 88, 79, 88, 128, 88, 79, - 84, 128, 88, 79, 82, 128, 88, 79, 80, 72, 128, 88, 79, 80, 128, 88, 79, - 65, 128, 88, 79, 128, 88, 73, 88, 128, 88, 73, 84, 128, 88, 73, 82, 79, - 206, 88, 73, 80, 128, 88, 73, 69, 88, 128, 88, 73, 69, 84, 128, 88, 73, - 69, 80, 128, 88, 73, 69, 128, 88, 73, 65, 66, 128, 88, 73, 128, 88, 71, - 128, 88, 69, 89, 78, 128, 88, 69, 83, 84, 69, 211, 88, 69, 72, 128, 88, - 69, 69, 128, 88, 69, 128, 88, 65, 85, 83, 128, 88, 65, 85, 128, 88, 65, - 80, 72, 128, 88, 65, 78, 128, 88, 65, 65, 128, 88, 65, 128, 88, 48, 48, - 56, 65, 128, 88, 48, 48, 56, 128, 88, 48, 48, 55, 128, 88, 48, 48, 54, - 65, 128, 88, 48, 48, 54, 128, 88, 48, 48, 53, 128, 88, 48, 48, 52, 66, - 128, 88, 48, 48, 52, 65, 128, 88, 48, 48, 52, 128, 88, 48, 48, 51, 128, - 88, 48, 48, 50, 128, 88, 48, 48, 49, 128, 88, 45, 216, 87, 90, 128, 87, - 89, 78, 78, 128, 87, 89, 78, 206, 87, 86, 73, 128, 87, 86, 69, 128, 87, - 86, 65, 128, 87, 86, 128, 87, 85, 80, 128, 87, 85, 79, 88, 128, 87, 85, - 79, 80, 128, 87, 85, 79, 128, 87, 85, 78, 74, 207, 87, 85, 78, 128, 87, - 85, 76, 85, 128, 87, 85, 76, 213, 87, 85, 73, 128, 87, 85, 69, 128, 87, - 85, 65, 69, 84, 128, 87, 85, 65, 69, 78, 128, 87, 85, 128, 87, 82, 217, - 87, 82, 79, 78, 71, 128, 87, 82, 73, 83, 212, 87, 82, 73, 78, 75, 76, 69, - 83, 128, 87, 82, 73, 78, 75, 76, 69, 211, 87, 82, 73, 78, 75, 76, 69, 68, - 128, 87, 82, 69, 78, 67, 72, 128, 87, 82, 69, 65, 84, 200, 87, 82, 65, - 80, 80, 69, 196, 87, 82, 65, 80, 128, 87, 79, 88, 128, 87, 79, 87, 128, - 87, 79, 82, 83, 72, 73, 80, 128, 87, 79, 82, 82, 73, 69, 196, 87, 79, 82, - 76, 196, 87, 79, 82, 75, 69, 82, 128, 87, 79, 82, 75, 128, 87, 79, 82, - 203, 87, 79, 82, 68, 83, 80, 65, 67, 69, 128, 87, 79, 82, 196, 87, 79, - 80, 128, 87, 79, 79, 78, 128, 87, 79, 79, 76, 128, 87, 79, 79, 68, 83, - 45, 67, 82, 69, 197, 87, 79, 79, 68, 128, 87, 79, 78, 128, 87, 79, 206, - 87, 79, 77, 69, 78, 211, 87, 79, 77, 69, 206, 87, 79, 77, 65, 78, 211, - 87, 79, 77, 65, 78, 128, 87, 79, 77, 65, 206, 87, 79, 76, 79, 83, 79, - 128, 87, 79, 76, 198, 87, 79, 69, 128, 87, 79, 65, 128, 87, 73, 84, 72, - 79, 85, 212, 87, 73, 84, 72, 73, 78, 128, 87, 73, 84, 72, 73, 206, 87, - 73, 82, 69, 196, 87, 73, 78, 84, 69, 82, 128, 87, 73, 78, 75, 73, 78, - 199, 87, 73, 78, 75, 128, 87, 73, 78, 74, 65, 128, 87, 73, 78, 71, 83, - 128, 87, 73, 78, 69, 128, 87, 73, 78, 197, 87, 73, 78, 68, 85, 128, 87, - 73, 78, 68, 79, 87, 128, 87, 73, 78, 68, 128, 87, 73, 78, 196, 87, 73, - 78, 128, 87, 73, 71, 78, 89, 65, 78, 128, 87, 73, 71, 71, 76, 217, 87, - 73, 71, 71, 76, 69, 83, 128, 87, 73, 68, 84, 72, 128, 87, 73, 68, 69, 78, - 73, 78, 199, 87, 73, 68, 69, 45, 72, 69, 65, 68, 69, 196, 87, 73, 68, - 197, 87, 73, 65, 78, 71, 87, 65, 65, 75, 128, 87, 73, 65, 78, 71, 128, - 87, 72, 79, 76, 197, 87, 72, 73, 84, 69, 45, 70, 69, 65, 84, 72, 69, 82, - 69, 196, 87, 72, 73, 84, 69, 128, 87, 72, 69, 69, 76, 69, 196, 87, 72, - 69, 69, 76, 67, 72, 65, 73, 210, 87, 72, 69, 69, 76, 128, 87, 72, 69, 69, - 204, 87, 72, 69, 65, 84, 128, 87, 72, 65, 76, 69, 128, 87, 72, 128, 87, - 71, 128, 87, 69, 88, 128, 87, 69, 85, 88, 128, 87, 69, 83, 84, 69, 82, - 206, 87, 69, 83, 84, 128, 87, 69, 83, 212, 87, 69, 80, 128, 87, 69, 79, - 128, 87, 69, 78, 128, 87, 69, 76, 76, 128, 87, 69, 73, 71, 72, 212, 87, - 69, 73, 69, 82, 83, 84, 82, 65, 83, 211, 87, 69, 73, 128, 87, 69, 69, 78, + 211, 89, 65, 128, 65, 82, 77, 69, 78, 73, 65, 206, 66, 69, 78, 71, 65, + 76, 201, 83, 72, 65, 82, 65, 68, 193, 83, 73, 88, 128, 78, 65, 128, 78, + 69, 71, 65, 84, 73, 86, 197, 68, 79, 84, 211, 68, 79, 87, 78, 87, 65, 82, + 68, 211, 69, 73, 71, 72, 84, 128, 74, 69, 69, 205, 76, 65, 128, 78, 69, + 87, 193, 83, 73, 68, 68, 72, 65, 205, 73, 68, 69, 79, 71, 82, 65, 80, + 200, 90, 90, 89, 88, 128, 90, 90, 89, 84, 128, 90, 90, 89, 82, 88, 128, + 90, 90, 89, 82, 128, 90, 90, 89, 80, 128, 90, 90, 89, 65, 128, 90, 90, + 89, 128, 90, 90, 85, 88, 128, 90, 90, 85, 82, 88, 128, 90, 90, 85, 82, + 128, 90, 90, 85, 80, 128, 90, 90, 85, 128, 90, 90, 83, 89, 65, 128, 90, + 90, 83, 65, 128, 90, 90, 79, 88, 128, 90, 90, 79, 80, 128, 90, 90, 79, + 128, 90, 90, 73, 88, 128, 90, 90, 73, 84, 128, 90, 90, 73, 80, 128, 90, + 90, 73, 69, 88, 128, 90, 90, 73, 69, 84, 128, 90, 90, 73, 69, 80, 128, + 90, 90, 73, 69, 128, 90, 90, 73, 128, 90, 90, 69, 88, 128, 90, 90, 69, + 80, 128, 90, 90, 69, 69, 128, 90, 90, 69, 128, 90, 90, 65, 88, 128, 90, + 90, 65, 84, 128, 90, 90, 65, 80, 128, 90, 90, 65, 65, 128, 90, 90, 65, + 128, 90, 89, 71, 79, 83, 128, 90, 87, 83, 80, 128, 90, 87, 78, 74, 128, + 90, 87, 78, 66, 83, 80, 128, 90, 87, 74, 128, 90, 87, 202, 90, 87, 65, + 82, 65, 75, 65, 89, 128, 90, 87, 65, 128, 90, 85, 84, 128, 90, 85, 79, + 88, 128, 90, 85, 79, 80, 128, 90, 85, 79, 128, 90, 85, 77, 128, 90, 85, + 66, 85, 82, 128, 90, 85, 53, 128, 90, 85, 181, 90, 213, 90, 83, 72, 65, + 128, 90, 82, 65, 128, 90, 81, 65, 80, 72, 193, 90, 79, 84, 128, 90, 79, + 79, 128, 90, 79, 65, 128, 90, 76, 65, 77, 193, 90, 76, 65, 128, 90, 76, + 193, 90, 74, 69, 128, 90, 73, 90, 50, 128, 90, 73, 81, 65, 65, 128, 90, + 73, 80, 80, 69, 82, 45, 77, 79, 85, 84, 200, 90, 73, 78, 79, 82, 128, 90, + 73, 76, 68, 69, 128, 90, 73, 71, 90, 65, 199, 90, 73, 71, 128, 90, 73, + 68, 193, 90, 73, 66, 128, 90, 73, 194, 90, 73, 51, 128, 90, 201, 90, 72, + 89, 88, 128, 90, 72, 89, 84, 128, 90, 72, 89, 82, 88, 128, 90, 72, 89, + 82, 128, 90, 72, 89, 80, 128, 90, 72, 89, 128, 90, 72, 87, 69, 128, 90, + 72, 87, 65, 128, 90, 72, 85, 88, 128, 90, 72, 85, 84, 128, 90, 72, 85, + 82, 88, 128, 90, 72, 85, 82, 128, 90, 72, 85, 80, 128, 90, 72, 85, 79, + 88, 128, 90, 72, 85, 79, 80, 128, 90, 72, 85, 79, 128, 90, 72, 85, 128, + 90, 72, 79, 88, 128, 90, 72, 79, 84, 128, 90, 72, 79, 80, 128, 90, 72, + 79, 79, 128, 90, 72, 79, 73, 128, 90, 72, 79, 128, 90, 72, 73, 86, 69, + 84, 69, 128, 90, 72, 73, 76, 128, 90, 72, 73, 128, 90, 72, 69, 88, 128, + 90, 72, 69, 84, 128, 90, 72, 69, 80, 128, 90, 72, 69, 69, 128, 90, 72, + 69, 128, 90, 72, 197, 90, 72, 65, 89, 73, 78, 128, 90, 72, 65, 88, 128, + 90, 72, 65, 84, 128, 90, 72, 65, 82, 128, 90, 72, 65, 80, 128, 90, 72, + 65, 73, 78, 128, 90, 72, 65, 65, 128, 90, 72, 65, 128, 90, 72, 128, 90, + 69, 84, 65, 128, 90, 69, 82, 79, 128, 90, 69, 82, 207, 90, 69, 78, 128, + 90, 69, 77, 76, 89, 65, 128, 90, 69, 77, 76, 74, 65, 128, 90, 69, 50, + 128, 90, 197, 90, 65, 89, 78, 128, 90, 65, 89, 73, 78, 128, 90, 65, 89, + 73, 206, 90, 65, 86, 73, 89, 65, 78, 73, 128, 90, 65, 84, 65, 128, 90, + 65, 82, 81, 65, 128, 90, 65, 82, 76, 128, 90, 65, 81, 69, 198, 90, 65, + 77, 88, 128, 90, 65, 76, 128, 90, 65, 204, 90, 65, 73, 78, 128, 90, 65, + 73, 206, 90, 65, 73, 128, 90, 65, 72, 128, 90, 65, 200, 90, 65, 71, 128, + 90, 65, 69, 70, 128, 90, 65, 55, 128, 90, 193, 90, 48, 49, 54, 72, 128, + 90, 48, 49, 54, 71, 128, 90, 48, 49, 54, 70, 128, 90, 48, 49, 54, 69, + 128, 90, 48, 49, 54, 68, 128, 90, 48, 49, 54, 67, 128, 90, 48, 49, 54, + 66, 128, 90, 48, 49, 54, 65, 128, 90, 48, 49, 54, 128, 90, 48, 49, 53, + 73, 128, 90, 48, 49, 53, 72, 128, 90, 48, 49, 53, 71, 128, 90, 48, 49, + 53, 70, 128, 90, 48, 49, 53, 69, 128, 90, 48, 49, 53, 68, 128, 90, 48, + 49, 53, 67, 128, 90, 48, 49, 53, 66, 128, 90, 48, 49, 53, 65, 128, 90, + 48, 49, 53, 128, 90, 48, 49, 52, 128, 90, 48, 49, 51, 128, 90, 48, 49, + 50, 128, 90, 48, 49, 49, 128, 90, 48, 49, 48, 128, 90, 48, 48, 57, 128, + 90, 48, 48, 56, 128, 90, 48, 48, 55, 128, 90, 48, 48, 54, 128, 90, 48, + 48, 53, 65, 128, 90, 48, 48, 53, 128, 90, 48, 48, 52, 65, 128, 90, 48, + 48, 52, 128, 90, 48, 48, 51, 66, 128, 90, 48, 48, 51, 65, 128, 90, 48, + 48, 51, 128, 90, 48, 48, 50, 68, 128, 90, 48, 48, 50, 67, 128, 90, 48, + 48, 50, 66, 128, 90, 48, 48, 50, 65, 128, 90, 48, 48, 50, 128, 90, 48, + 48, 49, 128, 90, 128, 218, 89, 89, 88, 128, 89, 89, 84, 128, 89, 89, 82, + 88, 128, 89, 89, 82, 128, 89, 89, 80, 128, 89, 89, 69, 128, 89, 89, 65, + 65, 128, 89, 89, 65, 128, 89, 89, 128, 89, 87, 79, 79, 128, 89, 87, 79, + 128, 89, 87, 73, 73, 128, 89, 87, 73, 128, 89, 87, 69, 128, 89, 87, 65, + 65, 128, 89, 87, 65, 128, 89, 86, 128, 89, 85, 88, 128, 89, 85, 87, 79, + 81, 128, 89, 85, 85, 75, 65, 76, 69, 65, 80, 73, 78, 84, 85, 128, 89, 85, + 85, 128, 89, 85, 84, 128, 89, 85, 83, 128, 89, 85, 211, 89, 85, 82, 88, + 128, 89, 85, 82, 128, 89, 85, 81, 128, 89, 85, 209, 89, 85, 80, 128, 89, + 85, 79, 88, 128, 89, 85, 79, 84, 128, 89, 85, 79, 80, 128, 89, 85, 79, + 77, 128, 89, 85, 79, 128, 89, 85, 78, 128, 89, 85, 77, 128, 89, 85, 74, + 128, 89, 85, 69, 81, 128, 89, 85, 69, 128, 89, 85, 68, 72, 128, 89, 85, + 68, 200, 89, 85, 65, 78, 128, 89, 85, 65, 69, 78, 128, 89, 85, 45, 89, + 69, 79, 128, 89, 85, 45, 89, 69, 128, 89, 85, 45, 85, 128, 89, 85, 45, + 79, 128, 89, 85, 45, 73, 128, 89, 85, 45, 69, 79, 128, 89, 85, 45, 69, + 128, 89, 85, 45, 65, 69, 128, 89, 85, 45, 65, 128, 89, 85, 128, 89, 213, + 89, 82, 89, 128, 89, 80, 83, 73, 76, 73, 128, 89, 80, 79, 82, 82, 79, 73, + 128, 89, 80, 79, 75, 82, 73, 83, 73, 83, 128, 89, 80, 79, 75, 82, 73, 83, + 73, 211, 89, 80, 79, 71, 69, 71, 82, 65, 77, 77, 69, 78, 73, 128, 89, 79, + 89, 128, 89, 79, 88, 128, 89, 79, 87, 68, 128, 89, 79, 85, 84, 72, 70, + 85, 76, 78, 69, 83, 83, 128, 89, 79, 85, 84, 72, 70, 85, 204, 89, 79, 84, + 128, 89, 79, 82, 73, 128, 89, 79, 81, 128, 89, 79, 209, 89, 79, 80, 128, + 89, 79, 79, 128, 89, 79, 77, 79, 128, 89, 79, 71, 72, 128, 89, 79, 68, + 72, 128, 89, 79, 68, 128, 89, 79, 196, 89, 79, 65, 128, 89, 79, 45, 89, + 69, 79, 128, 89, 79, 45, 89, 65, 69, 128, 89, 79, 45, 89, 65, 128, 89, + 79, 45, 79, 128, 89, 79, 45, 73, 128, 89, 79, 45, 69, 79, 128, 89, 79, + 45, 65, 69, 128, 89, 79, 45, 65, 128, 89, 79, 128, 89, 207, 89, 73, 90, + 69, 84, 128, 89, 73, 88, 128, 89, 73, 87, 78, 128, 89, 73, 84, 128, 89, + 73, 80, 128, 89, 73, 78, 71, 128, 89, 73, 73, 128, 89, 73, 199, 89, 73, + 69, 88, 128, 89, 73, 69, 84, 128, 89, 73, 69, 80, 128, 89, 73, 69, 69, + 128, 89, 73, 69, 128, 89, 73, 68, 68, 73, 83, 200, 89, 73, 45, 85, 128, + 89, 73, 128, 89, 72, 69, 128, 89, 70, 69, 83, 73, 83, 128, 89, 70, 69, + 83, 73, 211, 89, 70, 69, 206, 89, 69, 89, 128, 89, 69, 87, 128, 89, 69, + 85, 88, 128, 89, 69, 85, 82, 65, 69, 128, 89, 69, 85, 81, 128, 89, 69, + 85, 77, 128, 89, 69, 85, 65, 69, 84, 128, 89, 69, 85, 65, 69, 128, 89, + 69, 84, 73, 86, 128, 89, 69, 83, 84, 85, 128, 89, 69, 83, 73, 69, 85, 78, + 71, 45, 83, 73, 79, 83, 128, 89, 69, 83, 73, 69, 85, 78, 71, 45, 80, 65, + 78, 83, 73, 79, 83, 128, 89, 69, 83, 73, 69, 85, 78, 71, 45, 77, 73, 69, + 85, 77, 128, 89, 69, 83, 73, 69, 85, 78, 71, 45, 72, 73, 69, 85, 72, 128, + 89, 69, 83, 73, 69, 85, 78, 71, 128, 89, 69, 82, 85, 128, 89, 69, 82, + 213, 89, 69, 82, 73, 128, 89, 69, 82, 65, 200, 89, 69, 82, 128, 89, 69, + 79, 82, 73, 78, 72, 73, 69, 85, 72, 128, 89, 69, 79, 45, 89, 65, 128, 89, + 69, 79, 45, 85, 128, 89, 69, 79, 45, 79, 128, 89, 69, 78, 73, 83, 69, + 201, 89, 69, 78, 65, 80, 128, 89, 69, 78, 128, 89, 69, 206, 89, 69, 76, + 76, 79, 87, 128, 89, 69, 76, 76, 79, 215, 89, 69, 73, 78, 128, 89, 69, + 72, 128, 89, 69, 69, 71, 128, 89, 69, 69, 128, 89, 69, 65, 210, 89, 69, + 65, 128, 89, 65, 90, 90, 128, 89, 65, 90, 72, 128, 89, 65, 90, 128, 89, + 65, 89, 68, 128, 89, 65, 89, 65, 78, 78, 65, 128, 89, 65, 89, 128, 89, + 65, 87, 78, 128, 89, 65, 87, 128, 89, 65, 86, 128, 89, 65, 85, 128, 89, + 65, 84, 84, 128, 89, 65, 84, 73, 128, 89, 65, 84, 72, 128, 89, 65, 84, + 128, 89, 65, 83, 83, 128, 89, 65, 83, 72, 128, 89, 65, 83, 128, 89, 65, + 82, 82, 128, 89, 65, 82, 128, 89, 65, 210, 89, 65, 81, 128, 89, 65, 80, + 128, 89, 65, 78, 83, 65, 89, 65, 128, 89, 65, 78, 71, 128, 89, 65, 78, + 199, 89, 65, 78, 128, 89, 65, 77, 79, 75, 128, 89, 65, 77, 65, 75, 75, + 65, 78, 128, 89, 65, 77, 128, 89, 65, 76, 128, 89, 65, 75, 72, 72, 128, + 89, 65, 75, 72, 128, 89, 65, 75, 65, 83, 72, 128, 89, 65, 75, 128, 89, + 65, 74, 85, 82, 86, 69, 68, 73, 195, 89, 65, 74, 128, 89, 65, 73, 128, + 89, 65, 72, 72, 128, 89, 65, 72, 128, 89, 65, 71, 78, 128, 89, 65, 71, + 72, 72, 128, 89, 65, 71, 72, 128, 89, 65, 71, 128, 89, 65, 70, 213, 89, + 65, 70, 128, 89, 65, 69, 77, 77, 65, 69, 128, 89, 65, 68, 72, 128, 89, + 65, 68, 68, 72, 128, 89, 65, 68, 68, 128, 89, 65, 68, 128, 89, 65, 67, + 72, 128, 89, 65, 66, 72, 128, 89, 65, 66, 128, 89, 65, 65, 82, 85, 128, + 89, 65, 65, 73, 128, 89, 65, 65, 68, 79, 128, 89, 65, 45, 89, 79, 128, + 89, 65, 45, 85, 128, 89, 65, 45, 79, 128, 89, 48, 48, 56, 128, 89, 48, + 48, 55, 128, 89, 48, 48, 54, 128, 89, 48, 48, 53, 128, 89, 48, 48, 52, + 128, 89, 48, 48, 51, 128, 89, 48, 48, 50, 128, 89, 48, 48, 49, 65, 128, + 89, 48, 48, 49, 128, 89, 45, 67, 82, 69, 197, 88, 89, 88, 128, 88, 89, + 85, 128, 88, 89, 84, 128, 88, 89, 82, 88, 128, 88, 89, 82, 128, 88, 89, + 80, 128, 88, 89, 79, 79, 74, 128, 88, 89, 79, 79, 128, 88, 89, 79, 128, + 88, 89, 73, 128, 88, 89, 69, 69, 205, 88, 89, 69, 69, 128, 88, 89, 69, + 128, 88, 89, 65, 65, 128, 88, 89, 65, 128, 88, 89, 128, 88, 87, 73, 128, + 88, 87, 69, 69, 128, 88, 87, 69, 128, 88, 87, 65, 65, 128, 88, 87, 65, + 128, 88, 87, 128, 88, 86, 69, 128, 88, 86, 65, 128, 88, 85, 79, 88, 128, + 88, 85, 79, 128, 88, 85, 128, 88, 83, 72, 65, 65, 89, 65, 84, 72, 73, 89, + 65, 128, 88, 79, 88, 128, 88, 79, 84, 128, 88, 79, 82, 128, 88, 79, 80, + 72, 128, 88, 79, 80, 128, 88, 79, 65, 128, 88, 79, 128, 88, 73, 88, 128, + 88, 73, 84, 128, 88, 73, 82, 79, 206, 88, 73, 80, 128, 88, 73, 69, 88, + 128, 88, 73, 69, 84, 128, 88, 73, 69, 80, 128, 88, 73, 69, 128, 88, 73, + 65, 66, 128, 88, 73, 128, 88, 71, 128, 88, 69, 89, 78, 128, 88, 69, 83, + 84, 69, 211, 88, 69, 72, 128, 88, 69, 69, 128, 88, 69, 128, 88, 65, 85, + 83, 128, 88, 65, 85, 128, 88, 65, 80, 72, 128, 88, 65, 78, 128, 88, 65, + 65, 128, 88, 65, 128, 88, 48, 48, 56, 65, 128, 88, 48, 48, 56, 128, 88, + 48, 48, 55, 128, 88, 48, 48, 54, 65, 128, 88, 48, 48, 54, 128, 88, 48, + 48, 53, 128, 88, 48, 48, 52, 66, 128, 88, 48, 48, 52, 65, 128, 88, 48, + 48, 52, 128, 88, 48, 48, 51, 128, 88, 48, 48, 50, 128, 88, 48, 48, 49, + 128, 88, 45, 216, 87, 90, 128, 87, 89, 78, 78, 128, 87, 89, 78, 206, 87, + 86, 73, 128, 87, 86, 69, 128, 87, 86, 65, 128, 87, 86, 128, 87, 85, 80, + 128, 87, 85, 79, 88, 128, 87, 85, 79, 80, 128, 87, 85, 79, 128, 87, 85, + 78, 74, 207, 87, 85, 78, 128, 87, 85, 76, 85, 128, 87, 85, 76, 213, 87, + 85, 73, 128, 87, 85, 69, 128, 87, 85, 65, 69, 84, 128, 87, 85, 65, 69, + 78, 128, 87, 85, 128, 87, 82, 217, 87, 82, 79, 78, 71, 128, 87, 82, 73, + 83, 212, 87, 82, 73, 78, 75, 76, 69, 83, 128, 87, 82, 73, 78, 75, 76, 69, + 211, 87, 82, 73, 78, 75, 76, 69, 68, 128, 87, 82, 69, 83, 84, 76, 69, 82, + 83, 128, 87, 82, 69, 78, 67, 72, 128, 87, 82, 69, 65, 84, 200, 87, 82, + 65, 80, 80, 69, 196, 87, 82, 65, 80, 128, 87, 79, 88, 128, 87, 79, 87, + 128, 87, 79, 82, 83, 72, 73, 80, 128, 87, 79, 82, 82, 73, 69, 196, 87, + 79, 82, 76, 196, 87, 79, 82, 75, 69, 82, 128, 87, 79, 82, 75, 128, 87, + 79, 82, 203, 87, 79, 82, 68, 83, 80, 65, 67, 69, 128, 87, 79, 82, 196, + 87, 79, 80, 128, 87, 79, 79, 78, 128, 87, 79, 79, 76, 128, 87, 79, 79, + 68, 83, 45, 67, 82, 69, 197, 87, 79, 79, 68, 128, 87, 79, 78, 128, 87, + 79, 206, 87, 79, 77, 69, 78, 211, 87, 79, 77, 69, 206, 87, 79, 77, 65, + 78, 211, 87, 79, 77, 65, 78, 128, 87, 79, 77, 65, 206, 87, 79, 76, 79, + 83, 79, 128, 87, 79, 76, 198, 87, 79, 69, 128, 87, 79, 65, 128, 87, 73, + 84, 72, 79, 85, 212, 87, 73, 84, 72, 73, 78, 128, 87, 73, 84, 72, 73, + 206, 87, 73, 82, 69, 196, 87, 73, 78, 84, 69, 82, 128, 87, 73, 78, 75, + 73, 78, 199, 87, 73, 78, 75, 128, 87, 73, 78, 74, 65, 128, 87, 73, 78, + 71, 83, 128, 87, 73, 78, 69, 128, 87, 73, 78, 197, 87, 73, 78, 68, 85, + 128, 87, 73, 78, 68, 79, 87, 128, 87, 73, 78, 68, 128, 87, 73, 78, 196, + 87, 73, 78, 128, 87, 73, 76, 84, 69, 196, 87, 73, 71, 78, 89, 65, 78, + 128, 87, 73, 71, 71, 76, 217, 87, 73, 71, 71, 76, 69, 83, 128, 87, 73, + 68, 84, 72, 128, 87, 73, 68, 69, 78, 73, 78, 199, 87, 73, 68, 69, 45, 72, + 69, 65, 68, 69, 196, 87, 73, 68, 197, 87, 73, 65, 78, 71, 87, 65, 65, 75, + 128, 87, 73, 65, 78, 71, 128, 87, 72, 79, 76, 197, 87, 72, 73, 84, 69, + 45, 70, 69, 65, 84, 72, 69, 82, 69, 196, 87, 72, 73, 84, 69, 128, 87, 72, + 69, 69, 76, 69, 196, 87, 72, 69, 69, 76, 67, 72, 65, 73, 210, 87, 72, 69, + 69, 76, 128, 87, 72, 69, 69, 204, 87, 72, 69, 65, 84, 128, 87, 72, 65, + 76, 69, 128, 87, 72, 128, 87, 71, 128, 87, 69, 88, 128, 87, 69, 85, 88, + 128, 87, 69, 83, 84, 69, 82, 206, 87, 69, 83, 84, 45, 67, 82, 69, 197, + 87, 69, 83, 84, 128, 87, 69, 83, 212, 87, 69, 80, 128, 87, 69, 79, 128, + 87, 69, 78, 128, 87, 69, 76, 76, 128, 87, 69, 73, 71, 72, 212, 87, 69, + 73, 69, 82, 83, 84, 82, 65, 83, 211, 87, 69, 73, 128, 87, 69, 69, 78, 128, 87, 69, 68, 71, 69, 45, 84, 65, 73, 76, 69, 196, 87, 69, 68, 71, 69, 128, 87, 69, 68, 68, 73, 78, 71, 128, 87, 69, 66, 128, 87, 69, 65, 82, 217, 87, 69, 65, 80, 79, 78, 128, 87, 67, 128, 87, 66, 128, 87, 65, 89, @@ -257,251 +258,253 @@ static unsigned char lexicon[] = { 128, 87, 65, 83, 83, 65, 76, 76, 65, 77, 128, 87, 65, 83, 76, 65, 128, 87, 65, 83, 76, 193, 87, 65, 83, 65, 76, 76, 65, 77, 128, 87, 65, 83, 65, 76, 76, 65, 205, 87, 65, 82, 78, 73, 78, 199, 87, 65, 82, 65, 78, 199, - 87, 65, 80, 128, 87, 65, 78, 73, 78, 199, 87, 65, 78, 71, 75, 85, 79, 81, - 128, 87, 65, 78, 68, 69, 82, 69, 82, 128, 87, 65, 78, 128, 87, 65, 76, - 76, 80, 76, 65, 78, 197, 87, 65, 76, 76, 128, 87, 65, 76, 204, 87, 65, - 76, 75, 128, 87, 65, 76, 203, 87, 65, 73, 84, 73, 78, 71, 128, 87, 65, - 73, 83, 84, 128, 87, 65, 73, 128, 87, 65, 69, 78, 128, 87, 65, 69, 128, - 87, 65, 68, 68, 65, 128, 87, 65, 65, 86, 85, 128, 87, 48, 50, 53, 128, - 87, 48, 50, 52, 65, 128, 87, 48, 50, 52, 128, 87, 48, 50, 51, 128, 87, - 48, 50, 50, 128, 87, 48, 50, 49, 128, 87, 48, 50, 48, 128, 87, 48, 49, - 57, 128, 87, 48, 49, 56, 65, 128, 87, 48, 49, 56, 128, 87, 48, 49, 55, - 65, 128, 87, 48, 49, 55, 128, 87, 48, 49, 54, 128, 87, 48, 49, 53, 128, - 87, 48, 49, 52, 65, 128, 87, 48, 49, 52, 128, 87, 48, 49, 51, 128, 87, - 48, 49, 50, 128, 87, 48, 49, 49, 128, 87, 48, 49, 48, 65, 128, 87, 48, - 49, 48, 128, 87, 48, 48, 57, 65, 128, 87, 48, 48, 57, 128, 87, 48, 48, - 56, 128, 87, 48, 48, 55, 128, 87, 48, 48, 54, 128, 87, 48, 48, 53, 128, - 87, 48, 48, 52, 128, 87, 48, 48, 51, 65, 128, 87, 48, 48, 51, 128, 87, - 48, 48, 50, 128, 87, 48, 48, 49, 128, 86, 90, 77, 69, 84, 128, 86, 89, - 88, 128, 86, 89, 84, 128, 86, 89, 82, 88, 128, 86, 89, 82, 128, 86, 89, - 80, 128, 86, 89, 128, 86, 87, 74, 128, 86, 87, 65, 128, 86, 85, 88, 128, - 86, 85, 85, 128, 86, 85, 84, 128, 86, 85, 82, 88, 128, 86, 85, 82, 128, - 86, 85, 80, 128, 86, 85, 76, 71, 65, 210, 86, 85, 69, 81, 128, 86, 84, - 83, 128, 86, 84, 128, 86, 83, 57, 57, 128, 86, 83, 57, 56, 128, 86, 83, - 57, 55, 128, 86, 83, 57, 54, 128, 86, 83, 57, 53, 128, 86, 83, 57, 52, - 128, 86, 83, 57, 51, 128, 86, 83, 57, 50, 128, 86, 83, 57, 49, 128, 86, - 83, 57, 48, 128, 86, 83, 57, 128, 86, 83, 56, 57, 128, 86, 83, 56, 56, - 128, 86, 83, 56, 55, 128, 86, 83, 56, 54, 128, 86, 83, 56, 53, 128, 86, - 83, 56, 52, 128, 86, 83, 56, 51, 128, 86, 83, 56, 50, 128, 86, 83, 56, - 49, 128, 86, 83, 56, 48, 128, 86, 83, 56, 128, 86, 83, 55, 57, 128, 86, - 83, 55, 56, 128, 86, 83, 55, 55, 128, 86, 83, 55, 54, 128, 86, 83, 55, - 53, 128, 86, 83, 55, 52, 128, 86, 83, 55, 51, 128, 86, 83, 55, 50, 128, - 86, 83, 55, 49, 128, 86, 83, 55, 48, 128, 86, 83, 55, 128, 86, 83, 54, - 57, 128, 86, 83, 54, 56, 128, 86, 83, 54, 55, 128, 86, 83, 54, 54, 128, - 86, 83, 54, 53, 128, 86, 83, 54, 52, 128, 86, 83, 54, 51, 128, 86, 83, - 54, 50, 128, 86, 83, 54, 49, 128, 86, 83, 54, 48, 128, 86, 83, 54, 128, - 86, 83, 53, 57, 128, 86, 83, 53, 56, 128, 86, 83, 53, 55, 128, 86, 83, - 53, 54, 128, 86, 83, 53, 53, 128, 86, 83, 53, 52, 128, 86, 83, 53, 51, - 128, 86, 83, 53, 50, 128, 86, 83, 53, 49, 128, 86, 83, 53, 48, 128, 86, - 83, 53, 128, 86, 83, 52, 57, 128, 86, 83, 52, 56, 128, 86, 83, 52, 55, - 128, 86, 83, 52, 54, 128, 86, 83, 52, 53, 128, 86, 83, 52, 52, 128, 86, - 83, 52, 51, 128, 86, 83, 52, 50, 128, 86, 83, 52, 49, 128, 86, 83, 52, - 48, 128, 86, 83, 52, 128, 86, 83, 51, 57, 128, 86, 83, 51, 56, 128, 86, - 83, 51, 55, 128, 86, 83, 51, 54, 128, 86, 83, 51, 53, 128, 86, 83, 51, - 52, 128, 86, 83, 51, 51, 128, 86, 83, 51, 50, 128, 86, 83, 51, 49, 128, - 86, 83, 51, 48, 128, 86, 83, 51, 128, 86, 83, 50, 57, 128, 86, 83, 50, - 56, 128, 86, 83, 50, 55, 128, 86, 83, 50, 54, 128, 86, 83, 50, 53, 54, - 128, 86, 83, 50, 53, 53, 128, 86, 83, 50, 53, 52, 128, 86, 83, 50, 53, - 51, 128, 86, 83, 50, 53, 50, 128, 86, 83, 50, 53, 49, 128, 86, 83, 50, - 53, 48, 128, 86, 83, 50, 53, 128, 86, 83, 50, 52, 57, 128, 86, 83, 50, - 52, 56, 128, 86, 83, 50, 52, 55, 128, 86, 83, 50, 52, 54, 128, 86, 83, - 50, 52, 53, 128, 86, 83, 50, 52, 52, 128, 86, 83, 50, 52, 51, 128, 86, - 83, 50, 52, 50, 128, 86, 83, 50, 52, 49, 128, 86, 83, 50, 52, 48, 128, - 86, 83, 50, 52, 128, 86, 83, 50, 51, 57, 128, 86, 83, 50, 51, 56, 128, - 86, 83, 50, 51, 55, 128, 86, 83, 50, 51, 54, 128, 86, 83, 50, 51, 53, - 128, 86, 83, 50, 51, 52, 128, 86, 83, 50, 51, 51, 128, 86, 83, 50, 51, - 50, 128, 86, 83, 50, 51, 49, 128, 86, 83, 50, 51, 48, 128, 86, 83, 50, - 51, 128, 86, 83, 50, 50, 57, 128, 86, 83, 50, 50, 56, 128, 86, 83, 50, - 50, 55, 128, 86, 83, 50, 50, 54, 128, 86, 83, 50, 50, 53, 128, 86, 83, - 50, 50, 52, 128, 86, 83, 50, 50, 51, 128, 86, 83, 50, 50, 50, 128, 86, - 83, 50, 50, 49, 128, 86, 83, 50, 50, 48, 128, 86, 83, 50, 50, 128, 86, - 83, 50, 49, 57, 128, 86, 83, 50, 49, 56, 128, 86, 83, 50, 49, 55, 128, - 86, 83, 50, 49, 54, 128, 86, 83, 50, 49, 53, 128, 86, 83, 50, 49, 52, - 128, 86, 83, 50, 49, 51, 128, 86, 83, 50, 49, 50, 128, 86, 83, 50, 49, - 49, 128, 86, 83, 50, 49, 48, 128, 86, 83, 50, 49, 128, 86, 83, 50, 48, - 57, 128, 86, 83, 50, 48, 56, 128, 86, 83, 50, 48, 55, 128, 86, 83, 50, - 48, 54, 128, 86, 83, 50, 48, 53, 128, 86, 83, 50, 48, 52, 128, 86, 83, - 50, 48, 51, 128, 86, 83, 50, 48, 50, 128, 86, 83, 50, 48, 49, 128, 86, - 83, 50, 48, 48, 128, 86, 83, 50, 48, 128, 86, 83, 50, 128, 86, 83, 49, - 57, 57, 128, 86, 83, 49, 57, 56, 128, 86, 83, 49, 57, 55, 128, 86, 83, - 49, 57, 54, 128, 86, 83, 49, 57, 53, 128, 86, 83, 49, 57, 52, 128, 86, - 83, 49, 57, 51, 128, 86, 83, 49, 57, 50, 128, 86, 83, 49, 57, 49, 128, - 86, 83, 49, 57, 48, 128, 86, 83, 49, 57, 128, 86, 83, 49, 56, 57, 128, - 86, 83, 49, 56, 56, 128, 86, 83, 49, 56, 55, 128, 86, 83, 49, 56, 54, - 128, 86, 83, 49, 56, 53, 128, 86, 83, 49, 56, 52, 128, 86, 83, 49, 56, - 51, 128, 86, 83, 49, 56, 50, 128, 86, 83, 49, 56, 49, 128, 86, 83, 49, - 56, 48, 128, 86, 83, 49, 56, 128, 86, 83, 49, 55, 57, 128, 86, 83, 49, - 55, 56, 128, 86, 83, 49, 55, 55, 128, 86, 83, 49, 55, 54, 128, 86, 83, - 49, 55, 53, 128, 86, 83, 49, 55, 52, 128, 86, 83, 49, 55, 51, 128, 86, - 83, 49, 55, 50, 128, 86, 83, 49, 55, 49, 128, 86, 83, 49, 55, 48, 128, - 86, 83, 49, 55, 128, 86, 83, 49, 54, 57, 128, 86, 83, 49, 54, 56, 128, - 86, 83, 49, 54, 55, 128, 86, 83, 49, 54, 54, 128, 86, 83, 49, 54, 53, - 128, 86, 83, 49, 54, 52, 128, 86, 83, 49, 54, 51, 128, 86, 83, 49, 54, - 50, 128, 86, 83, 49, 54, 49, 128, 86, 83, 49, 54, 48, 128, 86, 83, 49, - 54, 128, 86, 83, 49, 53, 57, 128, 86, 83, 49, 53, 56, 128, 86, 83, 49, - 53, 55, 128, 86, 83, 49, 53, 54, 128, 86, 83, 49, 53, 53, 128, 86, 83, - 49, 53, 52, 128, 86, 83, 49, 53, 51, 128, 86, 83, 49, 53, 50, 128, 86, - 83, 49, 53, 49, 128, 86, 83, 49, 53, 48, 128, 86, 83, 49, 53, 128, 86, - 83, 49, 52, 57, 128, 86, 83, 49, 52, 56, 128, 86, 83, 49, 52, 55, 128, - 86, 83, 49, 52, 54, 128, 86, 83, 49, 52, 53, 128, 86, 83, 49, 52, 52, - 128, 86, 83, 49, 52, 51, 128, 86, 83, 49, 52, 50, 128, 86, 83, 49, 52, - 49, 128, 86, 83, 49, 52, 48, 128, 86, 83, 49, 52, 128, 86, 83, 49, 51, - 57, 128, 86, 83, 49, 51, 56, 128, 86, 83, 49, 51, 55, 128, 86, 83, 49, - 51, 54, 128, 86, 83, 49, 51, 53, 128, 86, 83, 49, 51, 52, 128, 86, 83, - 49, 51, 51, 128, 86, 83, 49, 51, 50, 128, 86, 83, 49, 51, 49, 128, 86, - 83, 49, 51, 48, 128, 86, 83, 49, 51, 128, 86, 83, 49, 50, 57, 128, 86, - 83, 49, 50, 56, 128, 86, 83, 49, 50, 55, 128, 86, 83, 49, 50, 54, 128, - 86, 83, 49, 50, 53, 128, 86, 83, 49, 50, 52, 128, 86, 83, 49, 50, 51, - 128, 86, 83, 49, 50, 50, 128, 86, 83, 49, 50, 49, 128, 86, 83, 49, 50, - 48, 128, 86, 83, 49, 50, 128, 86, 83, 49, 49, 57, 128, 86, 83, 49, 49, - 56, 128, 86, 83, 49, 49, 55, 128, 86, 83, 49, 49, 54, 128, 86, 83, 49, - 49, 53, 128, 86, 83, 49, 49, 52, 128, 86, 83, 49, 49, 51, 128, 86, 83, - 49, 49, 50, 128, 86, 83, 49, 49, 49, 128, 86, 83, 49, 49, 48, 128, 86, - 83, 49, 49, 128, 86, 83, 49, 48, 57, 128, 86, 83, 49, 48, 56, 128, 86, - 83, 49, 48, 55, 128, 86, 83, 49, 48, 54, 128, 86, 83, 49, 48, 53, 128, - 86, 83, 49, 48, 52, 128, 86, 83, 49, 48, 51, 128, 86, 83, 49, 48, 50, - 128, 86, 83, 49, 48, 49, 128, 86, 83, 49, 48, 48, 128, 86, 83, 49, 48, - 128, 86, 83, 49, 128, 86, 83, 128, 86, 82, 65, 67, 72, 89, 128, 86, 79, - 88, 128, 86, 79, 87, 69, 76, 45, 67, 65, 82, 82, 73, 69, 210, 86, 79, 87, - 128, 86, 79, 85, 128, 86, 79, 84, 128, 86, 79, 211, 86, 79, 80, 128, 86, - 79, 79, 73, 128, 86, 79, 79, 128, 86, 79, 77, 128, 86, 79, 76, 85, 77, - 197, 86, 79, 76, 84, 65, 71, 197, 86, 79, 76, 76, 69, 89, 66, 65, 76, 76, - 128, 86, 79, 76, 67, 65, 78, 79, 128, 86, 79, 76, 65, 80, 85, 203, 86, - 79, 73, 196, 86, 79, 73, 67, 73, 78, 71, 128, 86, 79, 73, 67, 69, 76, 69, - 83, 211, 86, 79, 73, 67, 69, 196, 86, 79, 67, 65, 76, 73, 90, 65, 84, 73, - 79, 206, 86, 79, 67, 65, 204, 86, 79, 128, 86, 73, 89, 79, 128, 86, 73, - 88, 128, 86, 73, 84, 82, 73, 79, 76, 45, 50, 128, 86, 73, 84, 82, 73, 79, - 76, 128, 86, 73, 84, 65, 69, 45, 50, 128, 86, 73, 84, 65, 69, 128, 86, - 73, 84, 128, 86, 73, 83, 73, 71, 79, 84, 72, 73, 195, 86, 73, 83, 65, 82, - 71, 65, 89, 65, 128, 86, 73, 83, 65, 82, 71, 65, 128, 86, 73, 83, 65, 82, - 71, 193, 86, 73, 82, 73, 65, 77, 128, 86, 73, 82, 71, 79, 128, 86, 73, - 82, 71, 65, 128, 86, 73, 82, 65, 77, 65, 128, 86, 73, 80, 128, 86, 73, - 79, 76, 73, 78, 128, 86, 73, 78, 69, 71, 65, 82, 45, 51, 128, 86, 73, 78, - 69, 71, 65, 82, 45, 50, 128, 86, 73, 78, 69, 71, 65, 82, 128, 86, 73, 78, - 69, 71, 65, 210, 86, 73, 78, 69, 128, 86, 73, 78, 197, 86, 73, 78, 128, - 86, 73, 76, 76, 65, 71, 69, 128, 86, 73, 73, 128, 86, 73, 69, 88, 128, - 86, 73, 69, 87, 73, 78, 199, 86, 73, 69, 87, 68, 65, 84, 193, 86, 73, 69, - 84, 128, 86, 73, 69, 212, 86, 73, 69, 80, 128, 86, 73, 69, 128, 86, 73, - 68, 74, 45, 50, 128, 86, 73, 68, 74, 128, 86, 73, 68, 69, 79, 67, 65, 83, - 83, 69, 84, 84, 69, 128, 86, 73, 68, 69, 207, 86, 73, 68, 65, 128, 86, - 73, 67, 84, 79, 82, 217, 86, 73, 66, 82, 65, 84, 73, 79, 206, 86, 70, 65, - 128, 86, 69, 89, 90, 128, 86, 69, 88, 128, 86, 69, 87, 128, 86, 69, 215, - 86, 69, 85, 88, 128, 86, 69, 85, 77, 128, 86, 69, 85, 65, 69, 80, 69, 78, - 128, 86, 69, 85, 65, 69, 128, 86, 69, 83, 84, 65, 128, 86, 69, 83, 83, - 69, 204, 86, 69, 82, 217, 86, 69, 82, 84, 73, 67, 65, 76, 76, 89, 128, - 86, 69, 82, 84, 73, 67, 65, 76, 76, 217, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 54, 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, - 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 52, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 51, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 50, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 54, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 54, 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, - 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 53, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 52, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 51, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 53, 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 53, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, - 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 54, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 53, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 52, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 52, 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 52, 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, - 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 48, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 54, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 53, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 51, 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 51, 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, - 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 49, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 48, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 54, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 50, 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 50, 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, - 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 50, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 49, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 48, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 49, 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 49, 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, - 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 51, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 50, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 49, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 49, 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 48, 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, - 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 52, - 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 51, 128, 86, 69, - 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 50, 128, 86, 69, 82, 84, 73, - 67, 65, 76, 45, 48, 48, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, - 45, 48, 48, 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 128, 86, 69, - 82, 83, 73, 67, 76, 69, 128, 86, 69, 82, 83, 197, 86, 69, 82, 71, 69, - 128, 86, 69, 82, 68, 73, 71, 82, 73, 83, 128, 86, 69, 82, 128, 86, 69, - 80, 128, 86, 69, 78, 68, 128, 86, 69, 73, 76, 128, 86, 69, 72, 73, 67, - 76, 69, 128, 86, 69, 72, 128, 86, 69, 200, 86, 69, 69, 128, 86, 69, 197, - 86, 69, 68, 69, 128, 86, 69, 67, 84, 79, 210, 86, 65, 89, 65, 78, 78, 65, - 128, 86, 65, 88, 128, 86, 65, 86, 128, 86, 65, 214, 86, 65, 85, 128, 86, - 65, 84, 72, 89, 128, 86, 65, 84, 128, 86, 65, 83, 84, 78, 69, 83, 211, - 86, 65, 83, 73, 83, 128, 86, 65, 82, 89, 211, 86, 65, 82, 73, 75, 65, - 128, 86, 65, 82, 73, 65, 78, 84, 128, 86, 65, 82, 73, 65, 78, 212, 86, - 65, 82, 73, 65, 128, 86, 65, 82, 73, 193, 86, 65, 82, 69, 73, 65, 201, - 86, 65, 82, 69, 73, 193, 86, 65, 80, 79, 85, 82, 83, 128, 86, 65, 80, - 128, 86, 65, 78, 69, 128, 86, 65, 77, 65, 71, 79, 77, 85, 75, 72, 65, - 128, 86, 65, 77, 65, 71, 79, 77, 85, 75, 72, 193, 86, 65, 76, 76, 69, 89, - 128, 86, 65, 74, 128, 86, 65, 73, 128, 86, 65, 72, 128, 86, 65, 200, 86, - 65, 65, 86, 85, 128, 86, 65, 65, 128, 86, 48, 52, 48, 65, 128, 86, 48, - 52, 48, 128, 86, 48, 51, 57, 128, 86, 48, 51, 56, 128, 86, 48, 51, 55, - 65, 128, 86, 48, 51, 55, 128, 86, 48, 51, 54, 128, 86, 48, 51, 53, 128, - 86, 48, 51, 52, 128, 86, 48, 51, 51, 65, 128, 86, 48, 51, 51, 128, 86, - 48, 51, 50, 128, 86, 48, 51, 49, 65, 128, 86, 48, 51, 49, 128, 86, 48, - 51, 48, 65, 128, 86, 48, 51, 48, 128, 86, 48, 50, 57, 65, 128, 86, 48, - 50, 57, 128, 86, 48, 50, 56, 65, 128, 86, 48, 50, 56, 128, 86, 48, 50, - 55, 128, 86, 48, 50, 54, 128, 86, 48, 50, 53, 128, 86, 48, 50, 52, 128, - 86, 48, 50, 51, 65, 128, 86, 48, 50, 51, 128, 86, 48, 50, 50, 128, 86, - 48, 50, 49, 128, 86, 48, 50, 48, 76, 128, 86, 48, 50, 48, 75, 128, 86, - 48, 50, 48, 74, 128, 86, 48, 50, 48, 73, 128, 86, 48, 50, 48, 72, 128, - 86, 48, 50, 48, 71, 128, 86, 48, 50, 48, 70, 128, 86, 48, 50, 48, 69, - 128, 86, 48, 50, 48, 68, 128, 86, 48, 50, 48, 67, 128, 86, 48, 50, 48, - 66, 128, 86, 48, 50, 48, 65, 128, 86, 48, 50, 48, 128, 86, 48, 49, 57, - 128, 86, 48, 49, 56, 128, 86, 48, 49, 55, 128, 86, 48, 49, 54, 128, 86, - 48, 49, 53, 128, 86, 48, 49, 52, 128, 86, 48, 49, 51, 128, 86, 48, 49, - 50, 66, 128, 86, 48, 49, 50, 65, 128, 86, 48, 49, 50, 128, 86, 48, 49, - 49, 67, 128, 86, 48, 49, 49, 66, 128, 86, 48, 49, 49, 65, 128, 86, 48, - 49, 49, 128, 86, 48, 49, 48, 128, 86, 48, 48, 57, 128, 86, 48, 48, 56, - 128, 86, 48, 48, 55, 66, 128, 86, 48, 48, 55, 65, 128, 86, 48, 48, 55, - 128, 86, 48, 48, 54, 128, 86, 48, 48, 53, 128, 86, 48, 48, 52, 128, 86, - 48, 48, 51, 128, 86, 48, 48, 50, 65, 128, 86, 48, 48, 50, 128, 86, 48, - 48, 49, 73, 128, 86, 48, 48, 49, 72, 128, 86, 48, 48, 49, 71, 128, 86, - 48, 48, 49, 70, 128, 86, 48, 48, 49, 69, 128, 86, 48, 48, 49, 68, 128, - 86, 48, 48, 49, 67, 128, 86, 48, 48, 49, 66, 128, 86, 48, 48, 49, 65, - 128, 86, 48, 48, 49, 128, 85, 90, 85, 128, 85, 90, 51, 128, 85, 90, 179, - 85, 89, 65, 78, 78, 65, 128, 85, 89, 128, 85, 87, 85, 128, 85, 85, 89, - 65, 78, 78, 65, 128, 85, 85, 85, 85, 128, 85, 85, 85, 51, 128, 85, 85, - 85, 50, 128, 85, 85, 69, 128, 85, 84, 85, 75, 73, 128, 85, 83, 83, 85, - 51, 128, 85, 83, 83, 85, 128, 85, 83, 72, 88, 128, 85, 83, 72, 85, 77, - 88, 128, 85, 83, 72, 69, 78, 78, 65, 128, 85, 83, 72, 50, 128, 85, 83, - 72, 128, 85, 83, 200, 85, 83, 69, 196, 85, 83, 69, 45, 50, 128, 85, 83, - 69, 45, 49, 128, 85, 83, 69, 128, 85, 83, 197, 85, 82, 85, 218, 85, 82, - 85, 83, 128, 85, 82, 85, 68, 65, 128, 85, 82, 85, 68, 193, 85, 82, 85, - 128, 85, 82, 213, 85, 82, 78, 128, 85, 82, 73, 78, 69, 128, 85, 82, 73, - 51, 128, 85, 82, 73, 128, 85, 82, 65, 78, 85, 83, 128, 85, 82, 65, 128, - 85, 82, 52, 128, 85, 82, 50, 128, 85, 82, 178, 85, 80, 87, 65, 82, 68, - 83, 128, 85, 80, 87, 65, 82, 68, 128, 85, 80, 87, 65, 82, 196, 85, 80, - 84, 85, 82, 78, 128, 85, 80, 83, 73, 76, 79, 78, 128, 85, 80, 83, 73, 76, - 79, 206, 85, 80, 83, 73, 68, 69, 45, 68, 79, 87, 206, 85, 80, 82, 73, 71, - 72, 212, 85, 80, 80, 69, 82, 128, 85, 80, 80, 69, 210, 85, 80, 65, 68, - 72, 77, 65, 78, 73, 89, 65, 128, 85, 80, 45, 80, 79, 73, 78, 84, 73, 78, - 199, 85, 79, 78, 128, 85, 78, 78, 128, 85, 78, 77, 65, 82, 82, 73, 69, - 196, 85, 78, 75, 78, 79, 87, 78, 128, 85, 78, 75, 128, 85, 78, 73, 86, - 69, 82, 83, 65, 204, 85, 78, 73, 84, 89, 128, 85, 78, 73, 84, 128, 85, - 78, 73, 212, 85, 78, 73, 79, 78, 128, 85, 78, 73, 79, 206, 85, 78, 73, - 70, 73, 69, 196, 85, 78, 73, 67, 79, 82, 206, 85, 78, 68, 207, 85, 78, - 68, 69, 82, 84, 73, 69, 128, 85, 78, 68, 69, 82, 76, 73, 78, 197, 85, 78, - 68, 69, 82, 68, 79, 84, 128, 85, 78, 68, 69, 82, 66, 65, 82, 128, 85, 78, - 68, 69, 82, 128, 85, 78, 68, 69, 210, 85, 78, 67, 73, 193, 85, 78, 67, - 69, 82, 84, 65, 73, 78, 84, 217, 85, 78, 65, 83, 80, 73, 82, 65, 84, 69, - 68, 128, 85, 78, 65, 80, 128, 85, 78, 65, 77, 85, 83, 69, 196, 85, 78, - 65, 128, 85, 206, 85, 77, 85, 77, 128, 85, 77, 85, 205, 85, 77, 66, 82, - 69, 76, 76, 65, 128, 85, 77, 66, 82, 69, 76, 76, 193, 85, 77, 66, 73, 78, - 128, 85, 75, 85, 128, 85, 75, 82, 65, 73, 78, 73, 65, 206, 85, 75, 65, - 82, 65, 128, 85, 75, 65, 82, 193, 85, 75, 128, 85, 73, 76, 76, 69, 65, - 78, 78, 128, 85, 73, 71, 72, 85, 210, 85, 71, 65, 82, 73, 84, 73, 195, + 87, 65, 81, 70, 65, 128, 87, 65, 80, 128, 87, 65, 78, 73, 78, 199, 87, + 65, 78, 71, 75, 85, 79, 81, 128, 87, 65, 78, 68, 69, 82, 69, 82, 128, 87, + 65, 78, 128, 87, 65, 76, 76, 80, 76, 65, 78, 197, 87, 65, 76, 76, 128, + 87, 65, 76, 204, 87, 65, 76, 75, 128, 87, 65, 76, 203, 87, 65, 73, 84, + 73, 78, 71, 128, 87, 65, 73, 83, 84, 128, 87, 65, 73, 128, 87, 65, 69, + 78, 128, 87, 65, 69, 128, 87, 65, 68, 68, 65, 128, 87, 65, 65, 86, 85, + 128, 87, 48, 50, 53, 128, 87, 48, 50, 52, 65, 128, 87, 48, 50, 52, 128, + 87, 48, 50, 51, 128, 87, 48, 50, 50, 128, 87, 48, 50, 49, 128, 87, 48, + 50, 48, 128, 87, 48, 49, 57, 128, 87, 48, 49, 56, 65, 128, 87, 48, 49, + 56, 128, 87, 48, 49, 55, 65, 128, 87, 48, 49, 55, 128, 87, 48, 49, 54, + 128, 87, 48, 49, 53, 128, 87, 48, 49, 52, 65, 128, 87, 48, 49, 52, 128, + 87, 48, 49, 51, 128, 87, 48, 49, 50, 128, 87, 48, 49, 49, 128, 87, 48, + 49, 48, 65, 128, 87, 48, 49, 48, 128, 87, 48, 48, 57, 65, 128, 87, 48, + 48, 57, 128, 87, 48, 48, 56, 128, 87, 48, 48, 55, 128, 87, 48, 48, 54, + 128, 87, 48, 48, 53, 128, 87, 48, 48, 52, 128, 87, 48, 48, 51, 65, 128, + 87, 48, 48, 51, 128, 87, 48, 48, 50, 128, 87, 48, 48, 49, 128, 86, 90, + 77, 69, 84, 128, 86, 89, 88, 128, 86, 89, 84, 128, 86, 89, 82, 88, 128, + 86, 89, 82, 128, 86, 89, 80, 128, 86, 89, 128, 86, 87, 74, 128, 86, 87, + 65, 128, 86, 85, 88, 128, 86, 85, 85, 128, 86, 85, 84, 128, 86, 85, 82, + 88, 128, 86, 85, 82, 128, 86, 85, 80, 128, 86, 85, 76, 71, 65, 210, 86, + 85, 69, 81, 128, 86, 84, 83, 128, 86, 84, 128, 86, 83, 57, 57, 128, 86, + 83, 57, 56, 128, 86, 83, 57, 55, 128, 86, 83, 57, 54, 128, 86, 83, 57, + 53, 128, 86, 83, 57, 52, 128, 86, 83, 57, 51, 128, 86, 83, 57, 50, 128, + 86, 83, 57, 49, 128, 86, 83, 57, 48, 128, 86, 83, 57, 128, 86, 83, 56, + 57, 128, 86, 83, 56, 56, 128, 86, 83, 56, 55, 128, 86, 83, 56, 54, 128, + 86, 83, 56, 53, 128, 86, 83, 56, 52, 128, 86, 83, 56, 51, 128, 86, 83, + 56, 50, 128, 86, 83, 56, 49, 128, 86, 83, 56, 48, 128, 86, 83, 56, 128, + 86, 83, 55, 57, 128, 86, 83, 55, 56, 128, 86, 83, 55, 55, 128, 86, 83, + 55, 54, 128, 86, 83, 55, 53, 128, 86, 83, 55, 52, 128, 86, 83, 55, 51, + 128, 86, 83, 55, 50, 128, 86, 83, 55, 49, 128, 86, 83, 55, 48, 128, 86, + 83, 55, 128, 86, 83, 54, 57, 128, 86, 83, 54, 56, 128, 86, 83, 54, 55, + 128, 86, 83, 54, 54, 128, 86, 83, 54, 53, 128, 86, 83, 54, 52, 128, 86, + 83, 54, 51, 128, 86, 83, 54, 50, 128, 86, 83, 54, 49, 128, 86, 83, 54, + 48, 128, 86, 83, 54, 128, 86, 83, 53, 57, 128, 86, 83, 53, 56, 128, 86, + 83, 53, 55, 128, 86, 83, 53, 54, 128, 86, 83, 53, 53, 128, 86, 83, 53, + 52, 128, 86, 83, 53, 51, 128, 86, 83, 53, 50, 128, 86, 83, 53, 49, 128, + 86, 83, 53, 48, 128, 86, 83, 53, 128, 86, 83, 52, 57, 128, 86, 83, 52, + 56, 128, 86, 83, 52, 55, 128, 86, 83, 52, 54, 128, 86, 83, 52, 53, 128, + 86, 83, 52, 52, 128, 86, 83, 52, 51, 128, 86, 83, 52, 50, 128, 86, 83, + 52, 49, 128, 86, 83, 52, 48, 128, 86, 83, 52, 128, 86, 83, 51, 57, 128, + 86, 83, 51, 56, 128, 86, 83, 51, 55, 128, 86, 83, 51, 54, 128, 86, 83, + 51, 53, 128, 86, 83, 51, 52, 128, 86, 83, 51, 51, 128, 86, 83, 51, 50, + 128, 86, 83, 51, 49, 128, 86, 83, 51, 48, 128, 86, 83, 51, 128, 86, 83, + 50, 57, 128, 86, 83, 50, 56, 128, 86, 83, 50, 55, 128, 86, 83, 50, 54, + 128, 86, 83, 50, 53, 54, 128, 86, 83, 50, 53, 53, 128, 86, 83, 50, 53, + 52, 128, 86, 83, 50, 53, 51, 128, 86, 83, 50, 53, 50, 128, 86, 83, 50, + 53, 49, 128, 86, 83, 50, 53, 48, 128, 86, 83, 50, 53, 128, 86, 83, 50, + 52, 57, 128, 86, 83, 50, 52, 56, 128, 86, 83, 50, 52, 55, 128, 86, 83, + 50, 52, 54, 128, 86, 83, 50, 52, 53, 128, 86, 83, 50, 52, 52, 128, 86, + 83, 50, 52, 51, 128, 86, 83, 50, 52, 50, 128, 86, 83, 50, 52, 49, 128, + 86, 83, 50, 52, 48, 128, 86, 83, 50, 52, 128, 86, 83, 50, 51, 57, 128, + 86, 83, 50, 51, 56, 128, 86, 83, 50, 51, 55, 128, 86, 83, 50, 51, 54, + 128, 86, 83, 50, 51, 53, 128, 86, 83, 50, 51, 52, 128, 86, 83, 50, 51, + 51, 128, 86, 83, 50, 51, 50, 128, 86, 83, 50, 51, 49, 128, 86, 83, 50, + 51, 48, 128, 86, 83, 50, 51, 128, 86, 83, 50, 50, 57, 128, 86, 83, 50, + 50, 56, 128, 86, 83, 50, 50, 55, 128, 86, 83, 50, 50, 54, 128, 86, 83, + 50, 50, 53, 128, 86, 83, 50, 50, 52, 128, 86, 83, 50, 50, 51, 128, 86, + 83, 50, 50, 50, 128, 86, 83, 50, 50, 49, 128, 86, 83, 50, 50, 48, 128, + 86, 83, 50, 50, 128, 86, 83, 50, 49, 57, 128, 86, 83, 50, 49, 56, 128, + 86, 83, 50, 49, 55, 128, 86, 83, 50, 49, 54, 128, 86, 83, 50, 49, 53, + 128, 86, 83, 50, 49, 52, 128, 86, 83, 50, 49, 51, 128, 86, 83, 50, 49, + 50, 128, 86, 83, 50, 49, 49, 128, 86, 83, 50, 49, 48, 128, 86, 83, 50, + 49, 128, 86, 83, 50, 48, 57, 128, 86, 83, 50, 48, 56, 128, 86, 83, 50, + 48, 55, 128, 86, 83, 50, 48, 54, 128, 86, 83, 50, 48, 53, 128, 86, 83, + 50, 48, 52, 128, 86, 83, 50, 48, 51, 128, 86, 83, 50, 48, 50, 128, 86, + 83, 50, 48, 49, 128, 86, 83, 50, 48, 48, 128, 86, 83, 50, 48, 128, 86, + 83, 50, 128, 86, 83, 49, 57, 57, 128, 86, 83, 49, 57, 56, 128, 86, 83, + 49, 57, 55, 128, 86, 83, 49, 57, 54, 128, 86, 83, 49, 57, 53, 128, 86, + 83, 49, 57, 52, 128, 86, 83, 49, 57, 51, 128, 86, 83, 49, 57, 50, 128, + 86, 83, 49, 57, 49, 128, 86, 83, 49, 57, 48, 128, 86, 83, 49, 57, 128, + 86, 83, 49, 56, 57, 128, 86, 83, 49, 56, 56, 128, 86, 83, 49, 56, 55, + 128, 86, 83, 49, 56, 54, 128, 86, 83, 49, 56, 53, 128, 86, 83, 49, 56, + 52, 128, 86, 83, 49, 56, 51, 128, 86, 83, 49, 56, 50, 128, 86, 83, 49, + 56, 49, 128, 86, 83, 49, 56, 48, 128, 86, 83, 49, 56, 128, 86, 83, 49, + 55, 57, 128, 86, 83, 49, 55, 56, 128, 86, 83, 49, 55, 55, 128, 86, 83, + 49, 55, 54, 128, 86, 83, 49, 55, 53, 128, 86, 83, 49, 55, 52, 128, 86, + 83, 49, 55, 51, 128, 86, 83, 49, 55, 50, 128, 86, 83, 49, 55, 49, 128, + 86, 83, 49, 55, 48, 128, 86, 83, 49, 55, 128, 86, 83, 49, 54, 57, 128, + 86, 83, 49, 54, 56, 128, 86, 83, 49, 54, 55, 128, 86, 83, 49, 54, 54, + 128, 86, 83, 49, 54, 53, 128, 86, 83, 49, 54, 52, 128, 86, 83, 49, 54, + 51, 128, 86, 83, 49, 54, 50, 128, 86, 83, 49, 54, 49, 128, 86, 83, 49, + 54, 48, 128, 86, 83, 49, 54, 128, 86, 83, 49, 53, 57, 128, 86, 83, 49, + 53, 56, 128, 86, 83, 49, 53, 55, 128, 86, 83, 49, 53, 54, 128, 86, 83, + 49, 53, 53, 128, 86, 83, 49, 53, 52, 128, 86, 83, 49, 53, 51, 128, 86, + 83, 49, 53, 50, 128, 86, 83, 49, 53, 49, 128, 86, 83, 49, 53, 48, 128, + 86, 83, 49, 53, 128, 86, 83, 49, 52, 57, 128, 86, 83, 49, 52, 56, 128, + 86, 83, 49, 52, 55, 128, 86, 83, 49, 52, 54, 128, 86, 83, 49, 52, 53, + 128, 86, 83, 49, 52, 52, 128, 86, 83, 49, 52, 51, 128, 86, 83, 49, 52, + 50, 128, 86, 83, 49, 52, 49, 128, 86, 83, 49, 52, 48, 128, 86, 83, 49, + 52, 128, 86, 83, 49, 51, 57, 128, 86, 83, 49, 51, 56, 128, 86, 83, 49, + 51, 55, 128, 86, 83, 49, 51, 54, 128, 86, 83, 49, 51, 53, 128, 86, 83, + 49, 51, 52, 128, 86, 83, 49, 51, 51, 128, 86, 83, 49, 51, 50, 128, 86, + 83, 49, 51, 49, 128, 86, 83, 49, 51, 48, 128, 86, 83, 49, 51, 128, 86, + 83, 49, 50, 57, 128, 86, 83, 49, 50, 56, 128, 86, 83, 49, 50, 55, 128, + 86, 83, 49, 50, 54, 128, 86, 83, 49, 50, 53, 128, 86, 83, 49, 50, 52, + 128, 86, 83, 49, 50, 51, 128, 86, 83, 49, 50, 50, 128, 86, 83, 49, 50, + 49, 128, 86, 83, 49, 50, 48, 128, 86, 83, 49, 50, 128, 86, 83, 49, 49, + 57, 128, 86, 83, 49, 49, 56, 128, 86, 83, 49, 49, 55, 128, 86, 83, 49, + 49, 54, 128, 86, 83, 49, 49, 53, 128, 86, 83, 49, 49, 52, 128, 86, 83, + 49, 49, 51, 128, 86, 83, 49, 49, 50, 128, 86, 83, 49, 49, 49, 128, 86, + 83, 49, 49, 48, 128, 86, 83, 49, 49, 128, 86, 83, 49, 48, 57, 128, 86, + 83, 49, 48, 56, 128, 86, 83, 49, 48, 55, 128, 86, 83, 49, 48, 54, 128, + 86, 83, 49, 48, 53, 128, 86, 83, 49, 48, 52, 128, 86, 83, 49, 48, 51, + 128, 86, 83, 49, 48, 50, 128, 86, 83, 49, 48, 49, 128, 86, 83, 49, 48, + 48, 128, 86, 83, 49, 48, 128, 86, 83, 49, 128, 86, 83, 128, 86, 82, 65, + 67, 72, 89, 128, 86, 79, 88, 128, 86, 79, 87, 69, 76, 45, 67, 65, 82, 82, + 73, 69, 210, 86, 79, 87, 128, 86, 79, 85, 128, 86, 79, 84, 128, 86, 79, + 211, 86, 79, 80, 128, 86, 79, 79, 73, 128, 86, 79, 79, 128, 86, 79, 77, + 128, 86, 79, 76, 85, 77, 197, 86, 79, 76, 84, 65, 71, 197, 86, 79, 76, + 76, 69, 89, 66, 65, 76, 76, 128, 86, 79, 76, 67, 65, 78, 79, 128, 86, 79, + 76, 65, 80, 85, 203, 86, 79, 73, 196, 86, 79, 73, 67, 73, 78, 71, 128, + 86, 79, 73, 67, 69, 76, 69, 83, 211, 86, 79, 73, 67, 69, 196, 86, 79, 68, + 128, 86, 79, 67, 65, 76, 73, 90, 65, 84, 73, 79, 206, 86, 79, 67, 65, + 204, 86, 79, 128, 86, 73, 89, 79, 128, 86, 73, 88, 128, 86, 73, 84, 82, + 73, 79, 76, 45, 50, 128, 86, 73, 84, 82, 73, 79, 76, 128, 86, 73, 84, 65, + 69, 45, 50, 128, 86, 73, 84, 65, 69, 128, 86, 73, 84, 128, 86, 73, 83, + 73, 71, 79, 84, 72, 73, 195, 86, 73, 83, 65, 82, 71, 65, 89, 65, 128, 86, + 73, 83, 65, 82, 71, 65, 128, 86, 73, 83, 65, 82, 71, 193, 86, 73, 82, 73, + 65, 77, 128, 86, 73, 82, 71, 79, 128, 86, 73, 82, 71, 65, 128, 86, 73, + 82, 65, 77, 65, 128, 86, 73, 80, 128, 86, 73, 79, 76, 73, 78, 128, 86, + 73, 78, 69, 71, 65, 82, 45, 51, 128, 86, 73, 78, 69, 71, 65, 82, 45, 50, + 128, 86, 73, 78, 69, 71, 65, 82, 128, 86, 73, 78, 69, 71, 65, 210, 86, + 73, 78, 69, 128, 86, 73, 78, 197, 86, 73, 78, 128, 86, 73, 76, 76, 65, + 71, 69, 128, 86, 73, 73, 128, 86, 73, 69, 88, 128, 86, 73, 69, 87, 73, + 78, 199, 86, 73, 69, 87, 68, 65, 84, 193, 86, 73, 69, 84, 128, 86, 73, + 69, 212, 86, 73, 69, 80, 128, 86, 73, 69, 128, 86, 73, 68, 74, 45, 50, + 128, 86, 73, 68, 74, 128, 86, 73, 68, 69, 79, 67, 65, 83, 83, 69, 84, 84, + 69, 128, 86, 73, 68, 69, 207, 86, 73, 68, 65, 128, 86, 73, 67, 84, 79, + 82, 217, 86, 73, 66, 82, 65, 84, 73, 79, 206, 86, 70, 65, 128, 86, 69, + 89, 90, 128, 86, 69, 88, 128, 86, 69, 87, 128, 86, 69, 215, 86, 69, 85, + 88, 128, 86, 69, 85, 77, 128, 86, 69, 85, 65, 69, 80, 69, 78, 128, 86, + 69, 85, 65, 69, 128, 86, 69, 83, 84, 65, 128, 86, 69, 83, 83, 69, 204, + 86, 69, 82, 217, 86, 69, 82, 84, 73, 67, 65, 76, 76, 89, 128, 86, 69, 82, + 84, 73, 67, 65, 76, 76, 217, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, + 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 53, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 52, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 54, 45, 48, 51, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 54, 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 54, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 54, + 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 54, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 53, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 52, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 53, 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 53, 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, + 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 53, 45, 48, 48, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 54, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 53, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 52, 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 52, 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, + 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 49, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 52, 45, 48, 48, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 54, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 51, 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 51, 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, + 45, 48, 51, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 50, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 49, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 51, 45, 48, 48, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 50, 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 50, 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, + 45, 48, 52, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 51, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 50, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 50, 45, 48, 49, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 50, 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 49, 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, + 45, 48, 53, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 52, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 51, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 49, 45, 48, 50, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 49, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 49, 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, + 45, 48, 54, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 53, + 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 52, 128, 86, 69, + 82, 84, 73, 67, 65, 76, 45, 48, 48, 45, 48, 51, 128, 86, 69, 82, 84, 73, + 67, 65, 76, 45, 48, 48, 45, 48, 50, 128, 86, 69, 82, 84, 73, 67, 65, 76, + 45, 48, 48, 45, 48, 49, 128, 86, 69, 82, 84, 73, 67, 65, 76, 45, 48, 48, + 45, 48, 48, 128, 86, 69, 82, 84, 73, 67, 65, 76, 128, 86, 69, 82, 83, 73, + 67, 76, 69, 128, 86, 69, 82, 83, 197, 86, 69, 82, 71, 69, 128, 86, 69, + 82, 68, 73, 71, 82, 73, 83, 128, 86, 69, 82, 128, 86, 69, 80, 128, 86, + 69, 78, 68, 128, 86, 69, 73, 76, 128, 86, 69, 72, 73, 67, 76, 69, 128, + 86, 69, 72, 128, 86, 69, 200, 86, 69, 69, 128, 86, 69, 197, 86, 69, 68, + 69, 128, 86, 69, 67, 84, 79, 210, 86, 65, 89, 65, 78, 78, 65, 128, 86, + 65, 88, 128, 86, 65, 86, 128, 86, 65, 214, 86, 65, 85, 128, 86, 65, 84, + 72, 89, 128, 86, 65, 84, 128, 86, 65, 83, 84, 78, 69, 83, 211, 86, 65, + 83, 73, 83, 128, 86, 65, 82, 89, 211, 86, 65, 82, 73, 75, 65, 128, 86, + 65, 82, 73, 65, 78, 84, 128, 86, 65, 82, 73, 65, 78, 212, 86, 65, 82, 73, + 65, 128, 86, 65, 82, 73, 193, 86, 65, 82, 69, 73, 65, 201, 86, 65, 82, + 69, 73, 193, 86, 65, 80, 79, 85, 82, 83, 128, 86, 65, 80, 128, 86, 65, + 78, 69, 128, 86, 65, 77, 65, 71, 79, 77, 85, 75, 72, 65, 128, 86, 65, 77, + 65, 71, 79, 77, 85, 75, 72, 193, 86, 65, 76, 76, 69, 89, 128, 86, 65, 74, + 128, 86, 65, 73, 128, 86, 65, 72, 128, 86, 65, 200, 86, 65, 65, 86, 85, + 128, 86, 65, 65, 128, 86, 48, 52, 48, 65, 128, 86, 48, 52, 48, 128, 86, + 48, 51, 57, 128, 86, 48, 51, 56, 128, 86, 48, 51, 55, 65, 128, 86, 48, + 51, 55, 128, 86, 48, 51, 54, 128, 86, 48, 51, 53, 128, 86, 48, 51, 52, + 128, 86, 48, 51, 51, 65, 128, 86, 48, 51, 51, 128, 86, 48, 51, 50, 128, + 86, 48, 51, 49, 65, 128, 86, 48, 51, 49, 128, 86, 48, 51, 48, 65, 128, + 86, 48, 51, 48, 128, 86, 48, 50, 57, 65, 128, 86, 48, 50, 57, 128, 86, + 48, 50, 56, 65, 128, 86, 48, 50, 56, 128, 86, 48, 50, 55, 128, 86, 48, + 50, 54, 128, 86, 48, 50, 53, 128, 86, 48, 50, 52, 128, 86, 48, 50, 51, + 65, 128, 86, 48, 50, 51, 128, 86, 48, 50, 50, 128, 86, 48, 50, 49, 128, + 86, 48, 50, 48, 76, 128, 86, 48, 50, 48, 75, 128, 86, 48, 50, 48, 74, + 128, 86, 48, 50, 48, 73, 128, 86, 48, 50, 48, 72, 128, 86, 48, 50, 48, + 71, 128, 86, 48, 50, 48, 70, 128, 86, 48, 50, 48, 69, 128, 86, 48, 50, + 48, 68, 128, 86, 48, 50, 48, 67, 128, 86, 48, 50, 48, 66, 128, 86, 48, + 50, 48, 65, 128, 86, 48, 50, 48, 128, 86, 48, 49, 57, 128, 86, 48, 49, + 56, 128, 86, 48, 49, 55, 128, 86, 48, 49, 54, 128, 86, 48, 49, 53, 128, + 86, 48, 49, 52, 128, 86, 48, 49, 51, 128, 86, 48, 49, 50, 66, 128, 86, + 48, 49, 50, 65, 128, 86, 48, 49, 50, 128, 86, 48, 49, 49, 67, 128, 86, + 48, 49, 49, 66, 128, 86, 48, 49, 49, 65, 128, 86, 48, 49, 49, 128, 86, + 48, 49, 48, 128, 86, 48, 48, 57, 128, 86, 48, 48, 56, 128, 86, 48, 48, + 55, 66, 128, 86, 48, 48, 55, 65, 128, 86, 48, 48, 55, 128, 86, 48, 48, + 54, 128, 86, 48, 48, 53, 128, 86, 48, 48, 52, 128, 86, 48, 48, 51, 128, + 86, 48, 48, 50, 65, 128, 86, 48, 48, 50, 128, 86, 48, 48, 49, 73, 128, + 86, 48, 48, 49, 72, 128, 86, 48, 48, 49, 71, 128, 86, 48, 48, 49, 70, + 128, 86, 48, 48, 49, 69, 128, 86, 48, 48, 49, 68, 128, 86, 48, 48, 49, + 67, 128, 86, 48, 48, 49, 66, 128, 86, 48, 48, 49, 65, 128, 86, 48, 48, + 49, 128, 85, 90, 85, 128, 85, 90, 51, 128, 85, 90, 179, 85, 89, 65, 78, + 78, 65, 128, 85, 89, 128, 85, 87, 85, 128, 85, 85, 89, 65, 78, 78, 65, + 128, 85, 85, 85, 85, 128, 85, 85, 85, 51, 128, 85, 85, 85, 50, 128, 85, + 85, 69, 128, 85, 84, 85, 75, 73, 128, 85, 83, 83, 85, 51, 128, 85, 83, + 83, 85, 128, 85, 83, 72, 88, 128, 85, 83, 72, 85, 77, 88, 128, 85, 83, + 72, 69, 78, 78, 65, 128, 85, 83, 72, 50, 128, 85, 83, 72, 128, 85, 83, + 200, 85, 83, 69, 196, 85, 83, 69, 45, 50, 128, 85, 83, 69, 45, 49, 128, + 85, 83, 69, 128, 85, 83, 197, 85, 82, 85, 218, 85, 82, 85, 83, 128, 85, + 82, 85, 68, 65, 128, 85, 82, 85, 68, 193, 85, 82, 85, 128, 85, 82, 213, + 85, 82, 78, 128, 85, 82, 73, 78, 69, 128, 85, 82, 73, 51, 128, 85, 82, + 73, 128, 85, 82, 65, 78, 85, 83, 128, 85, 82, 65, 128, 85, 82, 52, 128, + 85, 82, 50, 128, 85, 82, 178, 85, 80, 87, 65, 82, 68, 83, 128, 85, 80, + 87, 65, 82, 68, 128, 85, 80, 87, 65, 82, 196, 85, 80, 84, 85, 82, 78, + 128, 85, 80, 83, 73, 76, 79, 78, 128, 85, 80, 83, 73, 76, 79, 206, 85, + 80, 83, 73, 68, 69, 45, 68, 79, 87, 206, 85, 80, 82, 73, 71, 72, 212, 85, + 80, 80, 69, 82, 128, 85, 80, 80, 69, 210, 85, 80, 65, 68, 72, 77, 65, 78, + 73, 89, 65, 128, 85, 80, 45, 80, 79, 73, 78, 84, 73, 78, 199, 85, 79, 78, + 128, 85, 78, 78, 128, 85, 78, 77, 65, 82, 82, 73, 69, 196, 85, 78, 75, + 78, 79, 87, 78, 128, 85, 78, 75, 128, 85, 78, 73, 86, 69, 82, 83, 65, + 204, 85, 78, 73, 84, 89, 128, 85, 78, 73, 84, 128, 85, 78, 73, 212, 85, + 78, 73, 79, 78, 128, 85, 78, 73, 79, 206, 85, 78, 73, 70, 79, 82, 77, + 128, 85, 78, 73, 70, 73, 69, 196, 85, 78, 73, 67, 79, 82, 206, 85, 78, + 68, 207, 85, 78, 68, 69, 82, 84, 73, 69, 128, 85, 78, 68, 69, 82, 76, 73, + 78, 197, 85, 78, 68, 69, 82, 68, 79, 84, 128, 85, 78, 68, 69, 82, 66, 65, + 82, 128, 85, 78, 68, 69, 82, 128, 85, 78, 68, 69, 210, 85, 78, 67, 73, + 193, 85, 78, 67, 69, 82, 84, 65, 73, 78, 84, 217, 85, 78, 66, 76, 69, 78, + 68, 69, 196, 85, 78, 65, 83, 80, 73, 82, 65, 84, 69, 68, 128, 85, 78, 65, + 80, 128, 85, 78, 65, 77, 85, 83, 69, 196, 85, 78, 65, 128, 85, 206, 85, + 77, 85, 77, 128, 85, 77, 85, 205, 85, 77, 66, 82, 69, 76, 76, 65, 128, + 85, 77, 66, 82, 69, 76, 76, 193, 85, 77, 66, 73, 78, 128, 85, 75, 85, + 128, 85, 75, 82, 65, 73, 78, 73, 65, 206, 85, 75, 65, 82, 65, 128, 85, + 75, 65, 82, 193, 85, 75, 128, 85, 73, 76, 76, 69, 65, 78, 78, 128, 85, + 73, 71, 72, 85, 210, 85, 72, 68, 128, 85, 71, 65, 82, 73, 84, 73, 195, 85, 69, 89, 128, 85, 69, 73, 128, 85, 69, 69, 128, 85, 69, 65, 128, 85, 68, 85, 71, 128, 85, 68, 65, 84, 84, 65, 128, 85, 68, 65, 84, 84, 193, 85, 68, 65, 65, 84, 128, 85, 68, 128, 85, 196, 85, 67, 128, 85, 66, 85, @@ -538,68 +541,71 @@ static unsigned char lexicon[] = { 87, 79, 45, 69, 205, 84, 87, 79, 45, 67, 73, 82, 67, 76, 197, 84, 87, 73, 83, 84, 73, 78, 71, 128, 84, 87, 73, 83, 84, 69, 196, 84, 87, 73, 73, 128, 84, 87, 73, 128, 84, 87, 69, 78, 84, 89, 45, 84, 87, 79, 128, 84, - 87, 69, 78, 84, 89, 45, 84, 72, 82, 69, 69, 128, 84, 87, 69, 78, 84, 89, - 45, 83, 73, 88, 128, 84, 87, 69, 78, 84, 89, 45, 83, 69, 86, 69, 78, 128, - 84, 87, 69, 78, 84, 89, 45, 79, 78, 69, 128, 84, 87, 69, 78, 84, 89, 45, - 78, 73, 78, 69, 128, 84, 87, 69, 78, 84, 89, 45, 70, 79, 85, 82, 128, 84, - 87, 69, 78, 84, 89, 45, 70, 73, 86, 69, 128, 84, 87, 69, 78, 84, 89, 45, - 69, 73, 71, 72, 84, 200, 84, 87, 69, 78, 84, 89, 45, 69, 73, 71, 72, 84, - 128, 84, 87, 69, 78, 84, 89, 128, 84, 87, 69, 78, 84, 217, 84, 87, 69, - 76, 86, 69, 45, 84, 72, 73, 82, 84, 89, 128, 84, 87, 69, 76, 86, 69, 128, - 84, 87, 69, 76, 86, 197, 84, 87, 69, 76, 70, 84, 72, 83, 128, 84, 87, 69, - 76, 70, 84, 72, 128, 84, 87, 69, 128, 84, 87, 65, 65, 128, 84, 87, 65, - 128, 84, 86, 82, 73, 68, 79, 128, 84, 86, 73, 77, 65, 68, 85, 210, 84, - 85, 88, 128, 84, 85, 85, 77, 85, 128, 84, 85, 85, 128, 84, 85, 84, 84, - 89, 128, 84, 85, 84, 69, 89, 65, 83, 65, 84, 128, 84, 85, 84, 128, 84, - 85, 82, 88, 128, 84, 85, 82, 85, 128, 84, 85, 82, 84, 76, 69, 128, 84, - 85, 82, 79, 50, 128, 84, 85, 82, 78, 83, 84, 73, 76, 69, 128, 84, 85, 82, - 78, 69, 196, 84, 85, 82, 206, 84, 85, 82, 75, 73, 83, 200, 84, 85, 82, - 75, 73, 195, 84, 85, 82, 75, 69, 89, 128, 84, 85, 82, 66, 65, 78, 128, - 84, 85, 82, 128, 84, 85, 80, 128, 84, 85, 79, 88, 128, 84, 85, 79, 84, - 128, 84, 85, 79, 80, 128, 84, 85, 79, 128, 84, 85, 78, 78, 89, 128, 84, - 85, 77, 69, 84, 69, 83, 128, 84, 85, 77, 65, 69, 128, 84, 85, 77, 128, - 84, 85, 205, 84, 85, 76, 73, 80, 128, 84, 85, 75, 87, 69, 78, 84, 73, 83, - 128, 84, 85, 75, 128, 84, 85, 71, 82, 73, 203, 84, 85, 71, 50, 128, 84, - 85, 71, 178, 84, 85, 66, 128, 84, 85, 65, 82, 69, 199, 84, 85, 65, 69, - 80, 128, 84, 85, 65, 69, 128, 84, 213, 84, 84, 85, 85, 128, 84, 84, 85, - 68, 68, 65, 71, 128, 84, 84, 85, 68, 68, 65, 65, 71, 128, 84, 84, 85, - 128, 84, 84, 84, 72, 65, 128, 84, 84, 84, 65, 128, 84, 84, 83, 85, 128, - 84, 84, 83, 79, 128, 84, 84, 83, 73, 128, 84, 84, 83, 69, 69, 128, 84, - 84, 83, 69, 128, 84, 84, 83, 65, 128, 84, 84, 79, 79, 128, 84, 84, 73, - 73, 128, 84, 84, 73, 128, 84, 84, 72, 87, 69, 128, 84, 84, 72, 85, 128, - 84, 84, 72, 79, 79, 128, 84, 84, 72, 79, 128, 84, 84, 72, 73, 128, 84, - 84, 72, 69, 69, 128, 84, 84, 72, 69, 128, 84, 84, 72, 65, 65, 128, 84, - 84, 72, 128, 84, 84, 69, 72, 69, 72, 128, 84, 84, 69, 72, 69, 200, 84, - 84, 69, 72, 128, 84, 84, 69, 200, 84, 84, 69, 69, 128, 84, 84, 65, 89, - 65, 78, 78, 65, 128, 84, 84, 65, 85, 128, 84, 84, 65, 73, 128, 84, 84, - 65, 65, 128, 84, 84, 50, 128, 84, 83, 87, 69, 128, 84, 83, 87, 66, 128, - 84, 83, 87, 65, 128, 84, 83, 86, 128, 84, 83, 83, 69, 128, 84, 83, 83, - 65, 128, 84, 83, 79, 214, 84, 83, 73, 85, 128, 84, 83, 72, 85, 71, 83, - 128, 84, 83, 72, 79, 79, 75, 128, 84, 83, 72, 79, 79, 203, 84, 83, 72, - 79, 79, 74, 128, 84, 83, 72, 69, 83, 128, 84, 83, 72, 69, 71, 128, 84, - 83, 72, 69, 199, 84, 83, 72, 69, 69, 74, 128, 84, 83, 72, 69, 128, 84, - 83, 72, 65, 194, 84, 83, 72, 65, 128, 84, 83, 69, 82, 69, 128, 84, 83, - 69, 69, 66, 128, 84, 83, 65, 68, 73, 128, 84, 83, 65, 68, 201, 84, 83, - 65, 66, 128, 84, 83, 65, 65, 68, 73, 89, 128, 84, 83, 65, 65, 128, 84, - 83, 193, 84, 82, 89, 66, 76, 73, 79, 206, 84, 82, 85, 84, 72, 128, 84, - 82, 85, 78, 75, 128, 84, 82, 85, 78, 67, 65, 84, 69, 196, 84, 82, 85, 77, - 80, 69, 84, 128, 84, 82, 85, 77, 80, 45, 57, 128, 84, 82, 85, 77, 80, 45, - 56, 128, 84, 82, 85, 77, 80, 45, 55, 128, 84, 82, 85, 77, 80, 45, 54, - 128, 84, 82, 85, 77, 80, 45, 53, 128, 84, 82, 85, 77, 80, 45, 52, 128, - 84, 82, 85, 77, 80, 45, 51, 128, 84, 82, 85, 77, 80, 45, 50, 49, 128, 84, - 82, 85, 77, 80, 45, 50, 48, 128, 84, 82, 85, 77, 80, 45, 50, 128, 84, 82, - 85, 77, 80, 45, 49, 57, 128, 84, 82, 85, 77, 80, 45, 49, 56, 128, 84, 82, - 85, 77, 80, 45, 49, 55, 128, 84, 82, 85, 77, 80, 45, 49, 54, 128, 84, 82, - 85, 77, 80, 45, 49, 53, 128, 84, 82, 85, 77, 80, 45, 49, 52, 128, 84, 82, - 85, 77, 80, 45, 49, 51, 128, 84, 82, 85, 77, 80, 45, 49, 50, 128, 84, 82, - 85, 77, 80, 45, 49, 49, 128, 84, 82, 85, 77, 80, 45, 49, 48, 128, 84, 82, - 85, 77, 80, 45, 49, 128, 84, 82, 85, 69, 128, 84, 82, 85, 67, 75, 128, - 84, 82, 79, 80, 73, 67, 65, 204, 84, 82, 79, 80, 72, 89, 128, 84, 82, 79, - 77, 73, 75, 79, 83, 89, 78, 65, 71, 77, 65, 128, 84, 82, 79, 77, 73, 75, - 79, 80, 83, 73, 70, 73, 83, 84, 79, 78, 128, 84, 82, 79, 77, 73, 75, 79, - 80, 65, 82, 65, 75, 65, 76, 69, 83, 77, 65, 128, 84, 82, 79, 77, 73, 75, - 79, 78, 128, 84, 82, 79, 77, 73, 75, 79, 206, 84, 82, 79, 77, 73, 75, 79, - 76, 89, 71, 73, 83, 77, 65, 128, 84, 82, 79, 76, 76, 69, 89, 66, 85, 83, + 87, 69, 78, 84, 89, 45, 84, 87, 207, 84, 87, 69, 78, 84, 89, 45, 84, 72, + 82, 69, 69, 128, 84, 87, 69, 78, 84, 89, 45, 83, 73, 88, 128, 84, 87, 69, + 78, 84, 89, 45, 83, 69, 86, 69, 78, 128, 84, 87, 69, 78, 84, 89, 45, 79, + 78, 69, 128, 84, 87, 69, 78, 84, 89, 45, 78, 73, 78, 69, 128, 84, 87, 69, + 78, 84, 89, 45, 70, 79, 85, 82, 128, 84, 87, 69, 78, 84, 89, 45, 70, 73, + 86, 69, 128, 84, 87, 69, 78, 84, 89, 45, 69, 73, 71, 72, 84, 200, 84, 87, + 69, 78, 84, 89, 45, 69, 73, 71, 72, 84, 128, 84, 87, 69, 78, 84, 89, 128, + 84, 87, 69, 78, 84, 217, 84, 87, 69, 78, 84, 73, 69, 84, 72, 83, 128, 84, + 87, 69, 78, 84, 73, 69, 84, 72, 128, 84, 87, 69, 76, 86, 69, 45, 84, 72, + 73, 82, 84, 89, 128, 84, 87, 69, 76, 86, 69, 128, 84, 87, 69, 76, 86, + 197, 84, 87, 69, 76, 70, 84, 72, 83, 128, 84, 87, 69, 76, 70, 84, 72, + 128, 84, 87, 69, 128, 84, 87, 65, 65, 128, 84, 87, 65, 128, 84, 86, 82, + 73, 68, 79, 128, 84, 86, 73, 77, 65, 68, 85, 210, 84, 85, 88, 69, 68, 79, + 128, 84, 85, 88, 128, 84, 85, 85, 77, 85, 128, 84, 85, 85, 128, 84, 85, + 84, 84, 89, 128, 84, 85, 84, 69, 89, 65, 83, 65, 84, 128, 84, 85, 84, + 128, 84, 85, 82, 88, 128, 84, 85, 82, 85, 128, 84, 85, 82, 84, 76, 69, + 128, 84, 85, 82, 79, 50, 128, 84, 85, 82, 78, 83, 84, 73, 76, 69, 128, + 84, 85, 82, 78, 69, 196, 84, 85, 82, 206, 84, 85, 82, 75, 73, 83, 200, + 84, 85, 82, 75, 73, 195, 84, 85, 82, 75, 69, 89, 128, 84, 85, 82, 66, 65, + 78, 128, 84, 85, 82, 128, 84, 85, 80, 128, 84, 85, 79, 88, 128, 84, 85, + 79, 84, 128, 84, 85, 79, 80, 128, 84, 85, 79, 128, 84, 85, 78, 78, 89, + 128, 84, 85, 77, 69, 84, 69, 83, 128, 84, 85, 77, 66, 76, 69, 210, 84, + 85, 77, 65, 69, 128, 84, 85, 77, 128, 84, 85, 205, 84, 85, 76, 73, 80, + 128, 84, 85, 75, 87, 69, 78, 84, 73, 83, 128, 84, 85, 75, 128, 84, 85, + 71, 82, 73, 203, 84, 85, 71, 50, 128, 84, 85, 71, 178, 84, 85, 66, 128, + 84, 85, 65, 82, 69, 199, 84, 85, 65, 69, 80, 128, 84, 85, 65, 69, 128, + 84, 213, 84, 84, 85, 85, 128, 84, 84, 85, 68, 68, 65, 71, 128, 84, 84, + 85, 68, 68, 65, 65, 71, 128, 84, 84, 85, 128, 84, 84, 84, 72, 65, 128, + 84, 84, 84, 65, 128, 84, 84, 83, 85, 128, 84, 84, 83, 79, 128, 84, 84, + 83, 73, 128, 84, 84, 83, 69, 69, 128, 84, 84, 83, 69, 128, 84, 84, 83, + 65, 128, 84, 84, 79, 79, 128, 84, 84, 73, 73, 128, 84, 84, 73, 128, 84, + 84, 72, 87, 69, 128, 84, 84, 72, 85, 128, 84, 84, 72, 79, 79, 128, 84, + 84, 72, 79, 128, 84, 84, 72, 73, 128, 84, 84, 72, 69, 69, 128, 84, 84, + 72, 69, 128, 84, 84, 72, 65, 65, 128, 84, 84, 72, 128, 84, 84, 69, 72, + 69, 72, 128, 84, 84, 69, 72, 69, 200, 84, 84, 69, 72, 128, 84, 84, 69, + 200, 84, 84, 69, 69, 128, 84, 84, 65, 89, 65, 78, 78, 65, 128, 84, 84, + 65, 85, 128, 84, 84, 65, 73, 128, 84, 84, 65, 65, 128, 84, 84, 50, 128, + 84, 83, 87, 69, 128, 84, 83, 87, 66, 128, 84, 83, 87, 65, 128, 84, 83, + 86, 128, 84, 83, 83, 69, 128, 84, 83, 83, 65, 128, 84, 83, 79, 214, 84, + 83, 73, 85, 128, 84, 83, 72, 85, 71, 83, 128, 84, 83, 72, 79, 79, 75, + 128, 84, 83, 72, 79, 79, 203, 84, 83, 72, 79, 79, 74, 128, 84, 83, 72, + 69, 83, 128, 84, 83, 72, 69, 71, 128, 84, 83, 72, 69, 199, 84, 83, 72, + 69, 69, 74, 128, 84, 83, 72, 69, 128, 84, 83, 72, 65, 194, 84, 83, 72, + 65, 128, 84, 83, 69, 82, 69, 128, 84, 83, 69, 69, 66, 128, 84, 83, 65, + 68, 73, 128, 84, 83, 65, 68, 201, 84, 83, 65, 66, 128, 84, 83, 65, 65, + 68, 73, 89, 128, 84, 83, 65, 65, 128, 84, 83, 193, 84, 82, 89, 66, 76, + 73, 79, 206, 84, 82, 85, 84, 72, 128, 84, 82, 85, 78, 75, 128, 84, 82, + 85, 78, 67, 65, 84, 69, 196, 84, 82, 85, 77, 80, 69, 84, 128, 84, 82, 85, + 77, 80, 45, 57, 128, 84, 82, 85, 77, 80, 45, 56, 128, 84, 82, 85, 77, 80, + 45, 55, 128, 84, 82, 85, 77, 80, 45, 54, 128, 84, 82, 85, 77, 80, 45, 53, + 128, 84, 82, 85, 77, 80, 45, 52, 128, 84, 82, 85, 77, 80, 45, 51, 128, + 84, 82, 85, 77, 80, 45, 50, 49, 128, 84, 82, 85, 77, 80, 45, 50, 48, 128, + 84, 82, 85, 77, 80, 45, 50, 128, 84, 82, 85, 77, 80, 45, 49, 57, 128, 84, + 82, 85, 77, 80, 45, 49, 56, 128, 84, 82, 85, 77, 80, 45, 49, 55, 128, 84, + 82, 85, 77, 80, 45, 49, 54, 128, 84, 82, 85, 77, 80, 45, 49, 53, 128, 84, + 82, 85, 77, 80, 45, 49, 52, 128, 84, 82, 85, 77, 80, 45, 49, 51, 128, 84, + 82, 85, 77, 80, 45, 49, 50, 128, 84, 82, 85, 77, 80, 45, 49, 49, 128, 84, + 82, 85, 77, 80, 45, 49, 48, 128, 84, 82, 85, 77, 80, 45, 49, 128, 84, 82, + 85, 69, 128, 84, 82, 85, 67, 75, 128, 84, 82, 79, 80, 73, 67, 65, 204, + 84, 82, 79, 80, 72, 89, 128, 84, 82, 79, 77, 73, 75, 79, 83, 89, 78, 65, + 71, 77, 65, 128, 84, 82, 79, 77, 73, 75, 79, 80, 83, 73, 70, 73, 83, 84, + 79, 78, 128, 84, 82, 79, 77, 73, 75, 79, 80, 65, 82, 65, 75, 65, 76, 69, + 83, 77, 65, 128, 84, 82, 79, 77, 73, 75, 79, 78, 128, 84, 82, 79, 77, 73, + 75, 79, 206, 84, 82, 79, 77, 73, 75, 79, 76, 89, 71, 73, 83, 77, 65, 128, + 84, 82, 79, 76, 76, 69, 89, 66, 85, 83, 128, 84, 82, 79, 76, 76, 69, 89, 128, 84, 82, 79, 75, 85, 84, 65, 83, 84, 201, 84, 82, 79, 69, 90, 69, 78, 73, 65, 206, 84, 82, 73, 85, 77, 80, 72, 128, 84, 82, 73, 84, 79, 211, 84, 82, 73, 84, 73, 77, 79, 82, 73, 79, 78, 128, 84, 82, 73, 83, 73, 77, @@ -688,249 +694,250 @@ static unsigned char lexicon[] = { 200, 84, 72, 82, 69, 69, 45, 84, 72, 73, 82, 84, 89, 128, 84, 72, 82, 69, 69, 45, 81, 85, 65, 82, 84, 69, 210, 84, 72, 82, 69, 69, 45, 80, 69, 82, 45, 69, 205, 84, 72, 82, 69, 69, 45, 76, 73, 78, 197, 84, 72, 82, 69, 69, - 45, 69, 205, 84, 72, 82, 69, 69, 45, 196, 84, 72, 82, 69, 69, 45, 67, 73, - 82, 67, 76, 197, 84, 72, 82, 69, 65, 68, 128, 84, 72, 79, 85, 83, 65, 78, - 68, 83, 128, 84, 72, 79, 85, 83, 65, 78, 68, 211, 84, 72, 79, 85, 83, 65, - 78, 68, 128, 84, 72, 79, 85, 83, 65, 78, 196, 84, 72, 79, 85, 71, 72, - 212, 84, 72, 79, 85, 128, 84, 72, 79, 82, 78, 128, 84, 72, 79, 82, 206, - 84, 72, 79, 78, 71, 128, 84, 72, 79, 77, 128, 84, 72, 79, 74, 128, 84, - 72, 79, 65, 128, 84, 72, 207, 84, 72, 73, 85, 84, 72, 128, 84, 72, 73, - 84, 65, 128, 84, 72, 73, 82, 84, 89, 45, 83, 69, 67, 79, 78, 196, 84, 72, - 73, 82, 84, 89, 45, 79, 78, 69, 128, 84, 72, 73, 82, 84, 217, 84, 72, 73, - 82, 84, 69, 69, 78, 128, 84, 72, 73, 82, 84, 69, 69, 206, 84, 72, 73, 82, - 68, 83, 128, 84, 72, 73, 82, 68, 211, 84, 72, 73, 82, 68, 45, 83, 84, 65, - 71, 197, 84, 72, 73, 82, 68, 128, 84, 72, 73, 82, 196, 84, 72, 73, 78, - 75, 73, 78, 199, 84, 72, 73, 73, 128, 84, 72, 73, 71, 72, 128, 84, 72, - 73, 69, 85, 84, 200, 84, 72, 73, 67, 203, 84, 72, 73, 65, 66, 128, 84, - 72, 69, 89, 128, 84, 72, 69, 84, 72, 69, 128, 84, 72, 69, 84, 72, 128, - 84, 72, 69, 84, 65, 128, 84, 72, 69, 84, 193, 84, 72, 69, 83, 80, 73, 65, - 206, 84, 72, 69, 83, 69, 79, 83, 128, 84, 72, 69, 83, 69, 79, 211, 84, - 72, 69, 211, 84, 72, 69, 82, 77, 79, 77, 69, 84, 69, 82, 128, 84, 72, 69, - 82, 77, 79, 68, 89, 78, 65, 77, 73, 67, 128, 84, 72, 69, 82, 69, 70, 79, - 82, 69, 128, 84, 72, 69, 82, 197, 84, 72, 69, 206, 84, 72, 69, 77, 65, - 84, 73, 83, 77, 79, 211, 84, 72, 69, 77, 65, 128, 84, 72, 69, 77, 193, - 84, 72, 69, 72, 128, 84, 72, 69, 200, 84, 72, 69, 65, 128, 84, 72, 197, - 84, 72, 65, 87, 128, 84, 72, 65, 78, 84, 72, 65, 75, 72, 65, 84, 128, 84, - 72, 65, 78, 78, 65, 128, 84, 72, 65, 78, 128, 84, 72, 65, 206, 84, 72, - 65, 77, 69, 68, 72, 128, 84, 72, 65, 76, 128, 84, 72, 65, 204, 84, 72, - 65, 74, 128, 84, 72, 65, 201, 84, 72, 65, 72, 65, 78, 128, 84, 72, 65, - 65, 78, 193, 84, 72, 65, 65, 76, 85, 128, 84, 72, 45, 67, 82, 69, 197, - 84, 69, 88, 84, 128, 84, 69, 88, 212, 84, 69, 88, 128, 84, 69, 86, 73, - 82, 128, 84, 69, 85, 84, 69, 85, 88, 128, 84, 69, 85, 84, 69, 85, 87, 69, - 78, 128, 84, 69, 85, 84, 128, 84, 69, 85, 78, 128, 84, 69, 85, 65, 69, - 81, 128, 84, 69, 85, 65, 69, 78, 128, 84, 69, 85, 128, 84, 69, 84, 82, - 65, 83, 73, 77, 79, 85, 128, 84, 69, 84, 82, 65, 83, 69, 77, 69, 128, 84, - 69, 84, 82, 65, 80, 76, 73, 128, 84, 69, 84, 82, 65, 71, 82, 65, 205, 84, - 69, 84, 82, 65, 70, 79, 78, 73, 65, 83, 128, 84, 69, 84, 72, 128, 84, 69, - 84, 200, 84, 69, 84, 65, 82, 84, 79, 211, 84, 69, 84, 65, 82, 84, 73, 77, - 79, 82, 73, 79, 78, 128, 84, 69, 84, 128, 84, 69, 212, 84, 69, 83, 83, - 69, 82, 65, 128, 84, 69, 83, 83, 69, 82, 193, 84, 69, 83, 83, 65, 82, 79, - 206, 84, 69, 83, 200, 84, 69, 82, 77, 73, 78, 65, 84, 79, 82, 128, 84, - 69, 80, 128, 84, 69, 78, 85, 84, 79, 128, 84, 69, 78, 85, 128, 84, 69, - 78, 213, 84, 69, 78, 84, 72, 128, 84, 69, 78, 84, 128, 84, 69, 78, 83, - 69, 128, 84, 69, 78, 83, 197, 84, 69, 78, 83, 128, 84, 69, 78, 211, 84, - 69, 78, 78, 73, 211, 84, 69, 78, 71, 197, 84, 69, 78, 45, 84, 72, 73, 82, - 84, 89, 128, 84, 69, 78, 128, 84, 69, 206, 84, 69, 77, 80, 85, 211, 84, - 69, 76, 85, 128, 84, 69, 76, 79, 85, 211, 84, 69, 76, 76, 69, 210, 84, - 69, 76, 73, 83, 72, 193, 84, 69, 76, 69, 86, 73, 83, 73, 79, 78, 128, 84, - 69, 76, 69, 83, 67, 79, 80, 69, 128, 84, 69, 76, 69, 80, 72, 79, 78, 69, - 128, 84, 69, 76, 69, 80, 72, 79, 78, 197, 84, 69, 76, 69, 73, 65, 128, - 84, 69, 76, 69, 71, 82, 65, 80, 200, 84, 69, 75, 128, 84, 69, 73, 87, 83, - 128, 84, 69, 71, 69, 72, 128, 84, 69, 69, 84, 72, 128, 84, 69, 69, 84, - 200, 84, 69, 69, 78, 83, 128, 84, 69, 69, 69, 69, 128, 84, 69, 197, 84, - 69, 68, 85, 78, 71, 128, 84, 69, 65, 82, 211, 84, 69, 65, 82, 68, 82, 79, - 80, 45, 83, 80, 79, 75, 69, 196, 84, 69, 65, 82, 68, 82, 79, 80, 45, 83, - 72, 65, 78, 75, 69, 196, 84, 69, 65, 82, 68, 82, 79, 80, 45, 66, 65, 82, - 66, 69, 196, 84, 69, 65, 82, 45, 79, 70, 198, 84, 69, 65, 67, 85, 208, - 84, 69, 45, 85, 128, 84, 69, 45, 50, 128, 84, 67, 72, 69, 72, 69, 72, - 128, 84, 67, 72, 69, 72, 69, 200, 84, 67, 72, 69, 72, 128, 84, 67, 72, - 69, 200, 84, 67, 72, 69, 128, 84, 195, 84, 65, 89, 128, 84, 65, 88, 73, - 128, 84, 65, 88, 128, 84, 65, 87, 69, 76, 76, 69, 77, 69, 212, 84, 65, - 87, 65, 128, 84, 65, 87, 128, 84, 65, 86, 73, 89, 65, 78, 73, 128, 84, - 65, 86, 128, 84, 65, 214, 84, 65, 85, 82, 85, 83, 128, 84, 65, 85, 77, - 128, 84, 65, 213, 84, 65, 84, 87, 69, 69, 76, 128, 84, 65, 84, 87, 69, - 69, 204, 84, 65, 84, 84, 79, 79, 69, 196, 84, 65, 84, 128, 84, 65, 83, - 128, 84, 65, 82, 85, 78, 71, 128, 84, 65, 82, 84, 65, 82, 45, 50, 128, - 84, 65, 82, 84, 65, 82, 128, 84, 65, 82, 71, 69, 84, 128, 84, 65, 81, - 128, 84, 65, 80, 69, 82, 128, 84, 65, 80, 197, 84, 65, 80, 128, 84, 65, - 79, 128, 84, 65, 78, 78, 69, 196, 84, 65, 78, 71, 69, 82, 73, 78, 69, - 128, 84, 65, 78, 71, 69, 78, 84, 128, 84, 65, 78, 71, 69, 78, 212, 84, - 65, 78, 199, 84, 65, 78, 65, 66, 65, 84, 193, 84, 65, 78, 128, 84, 65, - 77, 73, 78, 71, 128, 84, 65, 77, 128, 84, 65, 76, 76, 128, 84, 65, 76, - 204, 84, 65, 76, 73, 78, 71, 128, 84, 65, 76, 73, 78, 199, 84, 65, 76, - 69, 78, 84, 83, 128, 84, 65, 76, 69, 78, 212, 84, 65, 75, 82, 201, 84, - 65, 75, 72, 65, 76, 76, 85, 83, 128, 84, 65, 75, 69, 128, 84, 65, 75, 52, - 128, 84, 65, 75, 180, 84, 65, 75, 128, 84, 65, 73, 83, 89, 79, 85, 128, - 84, 65, 73, 76, 76, 69, 83, 211, 84, 65, 73, 76, 128, 84, 65, 73, 204, - 84, 65, 72, 128, 84, 65, 200, 84, 65, 71, 66, 65, 78, 87, 193, 84, 65, - 71, 65, 76, 79, 199, 84, 65, 71, 128, 84, 65, 69, 206, 84, 65, 67, 79, - 128, 84, 65, 67, 75, 128, 84, 65, 67, 203, 84, 65, 66, 85, 76, 65, 84, - 73, 79, 78, 128, 84, 65, 66, 85, 76, 65, 84, 73, 79, 206, 84, 65, 66, 83, - 128, 84, 65, 66, 76, 69, 128, 84, 65, 66, 76, 197, 84, 65, 66, 128, 84, - 65, 194, 84, 65, 65, 83, 72, 65, 69, 128, 84, 65, 65, 81, 128, 84, 65, - 65, 77, 128, 84, 65, 65, 76, 85, 74, 193, 84, 65, 65, 73, 128, 84, 65, - 65, 70, 128, 84, 65, 50, 128, 84, 65, 45, 82, 79, 76, 128, 84, 65, 45, - 50, 128, 84, 48, 51, 54, 128, 84, 48, 51, 53, 128, 84, 48, 51, 52, 128, - 84, 48, 51, 51, 65, 128, 84, 48, 51, 51, 128, 84, 48, 51, 50, 65, 128, - 84, 48, 51, 50, 128, 84, 48, 51, 49, 128, 84, 48, 51, 48, 128, 84, 48, - 50, 57, 128, 84, 48, 50, 56, 128, 84, 48, 50, 55, 128, 84, 48, 50, 54, - 128, 84, 48, 50, 53, 128, 84, 48, 50, 52, 128, 84, 48, 50, 51, 128, 84, - 48, 50, 50, 128, 84, 48, 50, 49, 128, 84, 48, 50, 48, 128, 84, 48, 49, - 57, 128, 84, 48, 49, 56, 128, 84, 48, 49, 55, 128, 84, 48, 49, 54, 65, - 128, 84, 48, 49, 54, 128, 84, 48, 49, 53, 128, 84, 48, 49, 52, 128, 84, - 48, 49, 51, 128, 84, 48, 49, 50, 128, 84, 48, 49, 49, 65, 128, 84, 48, - 49, 49, 128, 84, 48, 49, 48, 128, 84, 48, 48, 57, 65, 128, 84, 48, 48, - 57, 128, 84, 48, 48, 56, 65, 128, 84, 48, 48, 56, 128, 84, 48, 48, 55, - 65, 128, 84, 48, 48, 55, 128, 84, 48, 48, 54, 128, 84, 48, 48, 53, 128, - 84, 48, 48, 52, 128, 84, 48, 48, 51, 65, 128, 84, 48, 48, 51, 128, 84, - 48, 48, 50, 128, 84, 48, 48, 49, 128, 84, 45, 83, 72, 73, 82, 84, 128, - 83, 90, 90, 128, 83, 90, 87, 71, 128, 83, 90, 87, 65, 128, 83, 90, 85, - 128, 83, 90, 79, 128, 83, 90, 73, 128, 83, 90, 69, 69, 128, 83, 90, 69, - 128, 83, 90, 65, 65, 128, 83, 90, 65, 128, 83, 90, 128, 83, 89, 88, 128, - 83, 89, 84, 128, 83, 89, 83, 84, 69, 205, 83, 89, 82, 88, 128, 83, 89, - 82, 77, 65, 84, 73, 75, 73, 128, 83, 89, 82, 77, 65, 128, 83, 89, 82, 73, - 78, 71, 69, 128, 83, 89, 82, 73, 65, 195, 83, 89, 82, 128, 83, 89, 80, - 128, 83, 89, 79, 85, 87, 65, 128, 83, 89, 78, 69, 86, 77, 65, 128, 83, - 89, 78, 68, 69, 83, 77, 79, 211, 83, 89, 78, 67, 72, 82, 79, 78, 79, 85, - 211, 83, 89, 78, 65, 71, 79, 71, 85, 69, 128, 83, 89, 78, 65, 71, 77, - 193, 83, 89, 78, 65, 70, 73, 128, 83, 89, 78, 128, 83, 89, 77, 77, 69, - 84, 82, 89, 128, 83, 89, 77, 77, 69, 84, 82, 73, 195, 83, 89, 77, 66, 79, - 76, 83, 128, 83, 89, 77, 66, 79, 76, 45, 57, 128, 83, 89, 77, 66, 79, 76, - 45, 56, 128, 83, 89, 77, 66, 79, 76, 45, 55, 128, 83, 89, 77, 66, 79, 76, - 45, 54, 128, 83, 89, 77, 66, 79, 76, 45, 53, 52, 128, 83, 89, 77, 66, 79, - 76, 45, 53, 51, 128, 83, 89, 77, 66, 79, 76, 45, 53, 50, 128, 83, 89, 77, - 66, 79, 76, 45, 53, 49, 128, 83, 89, 77, 66, 79, 76, 45, 53, 48, 128, 83, - 89, 77, 66, 79, 76, 45, 53, 128, 83, 89, 77, 66, 79, 76, 45, 52, 57, 128, - 83, 89, 77, 66, 79, 76, 45, 52, 56, 128, 83, 89, 77, 66, 79, 76, 45, 52, - 55, 128, 83, 89, 77, 66, 79, 76, 45, 52, 53, 128, 83, 89, 77, 66, 79, 76, - 45, 52, 51, 128, 83, 89, 77, 66, 79, 76, 45, 52, 50, 128, 83, 89, 77, 66, - 79, 76, 45, 52, 48, 128, 83, 89, 77, 66, 79, 76, 45, 52, 128, 83, 89, 77, - 66, 79, 76, 45, 51, 57, 128, 83, 89, 77, 66, 79, 76, 45, 51, 56, 128, 83, - 89, 77, 66, 79, 76, 45, 51, 55, 128, 83, 89, 77, 66, 79, 76, 45, 51, 54, - 128, 83, 89, 77, 66, 79, 76, 45, 51, 50, 128, 83, 89, 77, 66, 79, 76, 45, - 51, 48, 128, 83, 89, 77, 66, 79, 76, 45, 51, 128, 83, 89, 77, 66, 79, 76, - 45, 50, 57, 128, 83, 89, 77, 66, 79, 76, 45, 50, 55, 128, 83, 89, 77, 66, - 79, 76, 45, 50, 54, 128, 83, 89, 77, 66, 79, 76, 45, 50, 53, 128, 83, 89, - 77, 66, 79, 76, 45, 50, 52, 128, 83, 89, 77, 66, 79, 76, 45, 50, 51, 128, - 83, 89, 77, 66, 79, 76, 45, 50, 50, 128, 83, 89, 77, 66, 79, 76, 45, 50, - 49, 128, 83, 89, 77, 66, 79, 76, 45, 50, 48, 128, 83, 89, 77, 66, 79, 76, - 45, 50, 128, 83, 89, 77, 66, 79, 76, 45, 49, 57, 128, 83, 89, 77, 66, 79, - 76, 45, 49, 56, 128, 83, 89, 77, 66, 79, 76, 45, 49, 55, 128, 83, 89, 77, - 66, 79, 76, 45, 49, 54, 128, 83, 89, 77, 66, 79, 76, 45, 49, 53, 128, 83, - 89, 77, 66, 79, 76, 45, 49, 52, 128, 83, 89, 77, 66, 79, 76, 45, 49, 51, - 128, 83, 89, 77, 66, 79, 76, 45, 49, 50, 128, 83, 89, 77, 66, 79, 76, 45, - 49, 49, 128, 83, 89, 77, 66, 79, 76, 45, 49, 48, 128, 83, 89, 77, 66, 79, - 76, 45, 49, 128, 83, 89, 76, 79, 84, 201, 83, 89, 128, 83, 87, 90, 128, - 83, 87, 85, 78, 199, 83, 87, 79, 82, 68, 83, 128, 83, 87, 79, 82, 68, - 128, 83, 87, 79, 79, 128, 83, 87, 79, 128, 83, 87, 73, 82, 204, 83, 87, - 73, 77, 77, 73, 78, 71, 128, 83, 87, 73, 77, 77, 69, 82, 128, 83, 87, 73, - 73, 128, 83, 87, 73, 128, 83, 87, 71, 128, 83, 87, 69, 69, 84, 128, 83, - 87, 69, 69, 212, 83, 87, 69, 65, 84, 128, 83, 87, 69, 65, 212, 83, 87, - 65, 83, 200, 83, 87, 65, 80, 80, 73, 78, 71, 128, 83, 87, 65, 65, 128, - 83, 87, 128, 83, 86, 65, 83, 84, 201, 83, 86, 65, 82, 73, 84, 65, 128, - 83, 86, 65, 82, 73, 84, 193, 83, 85, 88, 128, 83, 85, 85, 128, 83, 85, - 84, 82, 193, 83, 85, 84, 128, 83, 85, 83, 80, 69, 78, 83, 73, 79, 206, - 83, 85, 83, 72, 73, 128, 83, 85, 82, 89, 65, 128, 83, 85, 82, 88, 128, - 83, 85, 82, 82, 79, 85, 78, 68, 128, 83, 85, 82, 82, 79, 85, 78, 196, 83, - 85, 82, 70, 69, 82, 128, 83, 85, 82, 70, 65, 67, 197, 83, 85, 82, 69, - 128, 83, 85, 82, 65, 78, 71, 128, 83, 85, 82, 57, 128, 83, 85, 82, 128, - 83, 85, 210, 83, 85, 80, 82, 65, 76, 73, 78, 69, 65, 210, 83, 85, 80, 69, - 82, 86, 73, 83, 69, 128, 83, 85, 80, 69, 82, 83, 69, 84, 128, 83, 85, 80, - 69, 82, 83, 69, 212, 83, 85, 80, 69, 82, 83, 67, 82, 73, 80, 212, 83, 85, - 80, 69, 82, 73, 77, 80, 79, 83, 69, 196, 83, 85, 80, 69, 82, 70, 73, 88, - 69, 196, 83, 85, 80, 69, 210, 83, 85, 80, 128, 83, 85, 79, 88, 128, 83, - 85, 79, 80, 128, 83, 85, 79, 128, 83, 85, 78, 83, 69, 212, 83, 85, 78, - 82, 73, 83, 69, 128, 83, 85, 78, 82, 73, 83, 197, 83, 85, 78, 71, 76, 65, - 83, 83, 69, 83, 128, 83, 85, 78, 71, 128, 83, 85, 78, 70, 76, 79, 87, 69, - 82, 128, 83, 85, 78, 68, 65, 78, 69, 83, 197, 83, 85, 78, 128, 83, 85, - 206, 83, 85, 77, 77, 69, 82, 128, 83, 85, 77, 77, 65, 84, 73, 79, 78, - 128, 83, 85, 77, 77, 65, 84, 73, 79, 206, 83, 85, 77, 65, 83, 72, 128, - 83, 85, 77, 128, 83, 85, 76, 70, 85, 82, 128, 83, 85, 75, 85, 78, 128, - 83, 85, 75, 85, 206, 83, 85, 75, 85, 128, 83, 85, 75, 213, 83, 85, 73, - 84, 65, 66, 76, 69, 128, 83, 85, 73, 84, 128, 83, 85, 73, 212, 83, 85, - 72, 85, 82, 128, 83, 85, 69, 128, 83, 85, 68, 50, 128, 83, 85, 68, 128, - 83, 85, 67, 75, 73, 78, 199, 83, 85, 67, 75, 69, 68, 128, 83, 85, 67, - 203, 83, 85, 67, 67, 69, 69, 68, 83, 128, 83, 85, 67, 67, 69, 69, 68, - 211, 83, 85, 67, 67, 69, 69, 68, 128, 83, 85, 67, 67, 69, 69, 196, 83, - 85, 66, 85, 78, 73, 84, 128, 83, 85, 66, 83, 84, 73, 84, 85, 84, 73, 79, - 206, 83, 85, 66, 83, 84, 73, 84, 85, 84, 69, 128, 83, 85, 66, 83, 84, 73, - 84, 85, 84, 197, 83, 85, 66, 83, 69, 84, 128, 83, 85, 66, 83, 69, 212, - 83, 85, 66, 83, 67, 82, 73, 80, 212, 83, 85, 66, 80, 85, 78, 67, 84, 73, - 83, 128, 83, 85, 66, 76, 73, 78, 69, 65, 210, 83, 85, 66, 76, 73, 77, 65, - 84, 73, 79, 78, 128, 83, 85, 66, 76, 73, 77, 65, 84, 69, 45, 51, 128, 83, - 85, 66, 76, 73, 77, 65, 84, 69, 45, 50, 128, 83, 85, 66, 76, 73, 77, 65, - 84, 69, 128, 83, 85, 66, 76, 73, 77, 65, 84, 197, 83, 85, 66, 74, 79, 73, - 78, 69, 196, 83, 85, 66, 74, 69, 67, 84, 128, 83, 85, 66, 73, 84, 79, - 128, 83, 85, 66, 71, 82, 79, 85, 80, 128, 83, 85, 66, 71, 82, 79, 85, - 208, 83, 85, 66, 128, 83, 85, 65, 77, 128, 83, 85, 65, 69, 84, 128, 83, - 85, 65, 69, 78, 128, 83, 85, 65, 69, 128, 83, 85, 65, 66, 128, 83, 85, - 65, 128, 83, 213, 83, 84, 88, 128, 83, 84, 87, 65, 128, 83, 84, 85, 68, - 89, 128, 83, 84, 85, 68, 73, 207, 83, 84, 85, 67, 75, 45, 79, 85, 212, - 83, 84, 83, 128, 83, 84, 82, 79, 78, 199, 83, 84, 82, 79, 75, 69, 83, - 128, 83, 84, 82, 79, 75, 69, 211, 83, 84, 82, 79, 75, 69, 45, 57, 128, - 83, 84, 82, 79, 75, 69, 45, 56, 128, 83, 84, 82, 79, 75, 69, 45, 55, 128, - 83, 84, 82, 79, 75, 69, 45, 54, 128, 83, 84, 82, 79, 75, 69, 45, 53, 128, - 83, 84, 82, 79, 75, 69, 45, 52, 128, 83, 84, 82, 79, 75, 69, 45, 51, 128, - 83, 84, 82, 79, 75, 69, 45, 50, 128, 83, 84, 82, 79, 75, 69, 45, 49, 49, - 128, 83, 84, 82, 79, 75, 69, 45, 49, 48, 128, 83, 84, 82, 79, 75, 69, 45, - 49, 128, 83, 84, 82, 79, 75, 197, 83, 84, 82, 73, 80, 69, 128, 83, 84, - 82, 73, 78, 71, 128, 83, 84, 82, 73, 78, 199, 83, 84, 82, 73, 75, 69, 84, - 72, 82, 79, 85, 71, 72, 128, 83, 84, 82, 73, 75, 197, 83, 84, 82, 73, 68, - 69, 128, 83, 84, 82, 73, 67, 84, 76, 217, 83, 84, 82, 69, 84, 67, 72, 69, - 196, 83, 84, 82, 69, 84, 67, 72, 128, 83, 84, 82, 69, 83, 211, 83, 84, - 82, 69, 78, 71, 84, 72, 128, 83, 84, 82, 69, 65, 77, 69, 82, 128, 83, 84, - 82, 65, 87, 66, 69, 82, 82, 89, 128, 83, 84, 82, 65, 84, 85, 77, 45, 50, - 128, 83, 84, 82, 65, 84, 85, 77, 128, 83, 84, 82, 65, 84, 85, 205, 83, - 84, 82, 65, 84, 73, 65, 206, 83, 84, 82, 65, 73, 78, 69, 82, 128, 83, 84, - 82, 65, 73, 71, 72, 84, 78, 69, 83, 83, 128, 83, 84, 82, 65, 73, 71, 72, - 84, 128, 83, 84, 82, 65, 73, 71, 72, 212, 83, 84, 82, 65, 73, 70, 128, - 83, 84, 82, 65, 71, 71, 73, 83, 77, 65, 84, 65, 128, 83, 84, 79, 86, 69, - 128, 83, 84, 79, 82, 69, 128, 83, 84, 79, 80, 87, 65, 84, 67, 72, 128, - 83, 84, 79, 80, 80, 73, 78, 71, 128, 83, 84, 79, 80, 80, 65, 71, 69, 128, - 83, 84, 79, 80, 128, 83, 84, 79, 208, 83, 84, 79, 78, 69, 128, 83, 84, - 79, 67, 75, 128, 83, 84, 79, 67, 203, 83, 84, 73, 82, 82, 85, 208, 83, - 84, 73, 77, 77, 69, 128, 83, 84, 73, 76, 204, 83, 84, 73, 76, 197, 83, - 84, 73, 71, 77, 65, 128, 83, 84, 73, 67, 75, 73, 78, 199, 83, 84, 73, 67, - 203, 83, 84, 69, 82, 69, 79, 128, 83, 84, 69, 80, 128, 83, 84, 69, 78, - 79, 71, 82, 65, 80, 72, 73, 195, 83, 84, 69, 77, 128, 83, 84, 69, 65, 77, - 73, 78, 199, 83, 84, 69, 65, 77, 128, 83, 84, 69, 65, 205, 83, 84, 65, - 86, 82, 79, 85, 128, 83, 84, 65, 86, 82, 79, 83, 128, 83, 84, 65, 86, 82, - 79, 211, 83, 84, 65, 85, 82, 79, 83, 128, 83, 84, 65, 84, 85, 197, 83, - 84, 65, 84, 73, 79, 78, 128, 83, 84, 65, 84, 69, 82, 83, 128, 83, 84, 65, - 84, 69, 128, 83, 84, 65, 82, 212, 83, 84, 65, 82, 83, 128, 83, 84, 65, - 82, 82, 69, 196, 83, 84, 65, 82, 75, 128, 83, 84, 65, 82, 128, 83, 84, - 65, 210, 83, 84, 65, 78, 68, 83, 84, 73, 76, 76, 128, 83, 84, 65, 78, 68, - 65, 82, 196, 83, 84, 65, 78, 68, 128, 83, 84, 65, 78, 128, 83, 84, 65, - 77, 80, 69, 196, 83, 84, 65, 76, 76, 73, 79, 78, 128, 83, 84, 65, 70, 70, - 128, 83, 84, 65, 70, 198, 83, 84, 65, 68, 73, 85, 77, 128, 83, 84, 65, - 67, 67, 65, 84, 79, 128, 83, 84, 65, 67, 67, 65, 84, 73, 83, 83, 73, 77, - 79, 128, 83, 84, 50, 128, 83, 83, 89, 88, 128, 83, 83, 89, 84, 128, 83, - 83, 89, 82, 88, 128, 83, 83, 89, 82, 128, 83, 83, 89, 80, 128, 83, 83, - 89, 128, 83, 83, 85, 88, 128, 83, 83, 85, 85, 128, 83, 83, 85, 84, 128, - 83, 83, 85, 80, 128, 83, 83, 79, 88, 128, 83, 83, 79, 84, 128, 83, 83, - 79, 80, 128, 83, 83, 79, 79, 128, 83, 83, 79, 128, 83, 83, 73, 88, 128, - 83, 83, 73, 84, 128, 83, 83, 73, 80, 128, 83, 83, 73, 73, 128, 83, 83, - 73, 69, 88, 128, 83, 83, 73, 69, 80, 128, 83, 83, 73, 69, 128, 83, 83, - 73, 128, 83, 83, 72, 73, 78, 128, 83, 83, 72, 69, 128, 83, 83, 69, 88, - 128, 83, 83, 69, 80, 128, 83, 83, 69, 69, 128, 83, 83, 65, 88, 128, 83, - 83, 65, 85, 128, 83, 83, 65, 84, 128, 83, 83, 65, 80, 128, 83, 83, 65, - 78, 71, 89, 69, 79, 82, 73, 78, 72, 73, 69, 85, 72, 128, 83, 83, 65, 78, - 71, 84, 73, 75, 69, 85, 84, 45, 80, 73, 69, 85, 80, 128, 83, 83, 65, 78, - 71, 84, 73, 75, 69, 85, 84, 128, 83, 83, 65, 78, 71, 84, 72, 73, 69, 85, - 84, 72, 128, 83, 83, 65, 78, 71, 83, 73, 79, 83, 45, 84, 73, 75, 69, 85, - 84, 128, 83, 83, 65, 78, 71, 83, 73, 79, 83, 45, 80, 73, 69, 85, 80, 128, - 83, 83, 65, 78, 71, 83, 73, 79, 83, 45, 75, 73, 89, 69, 79, 75, 128, 83, - 83, 65, 78, 71, 83, 73, 79, 83, 128, 83, 83, 65, 78, 71, 82, 73, 69, 85, - 76, 45, 75, 72, 73, 69, 85, 75, 72, 128, 83, 83, 65, 78, 71, 82, 73, 69, - 85, 76, 128, 83, 83, 65, 78, 71, 80, 73, 69, 85, 80, 128, 83, 83, 65, 78, - 71, 78, 73, 69, 85, 78, 128, 83, 83, 65, 78, 71, 77, 73, 69, 85, 77, 128, - 83, 83, 65, 78, 71, 75, 73, 89, 69, 79, 75, 128, 83, 83, 65, 78, 71, 73, - 69, 85, 78, 71, 128, 83, 83, 65, 78, 71, 72, 73, 69, 85, 72, 128, 83, 83, - 65, 78, 71, 67, 73, 69, 85, 67, 45, 72, 73, 69, 85, 72, 128, 83, 83, 65, - 78, 71, 67, 73, 69, 85, 67, 128, 83, 83, 65, 78, 71, 65, 82, 65, 69, 65, - 128, 83, 83, 65, 73, 128, 83, 83, 65, 65, 128, 83, 83, 51, 128, 83, 83, - 50, 128, 83, 82, 128, 83, 81, 85, 73, 83, 200, 83, 81, 85, 73, 82, 82, - 69, 204, 83, 81, 85, 73, 71, 71, 76, 197, 83, 81, 85, 69, 69, 90, 69, 68, + 45, 76, 69, 71, 71, 69, 196, 84, 72, 82, 69, 69, 45, 69, 205, 84, 72, 82, + 69, 69, 45, 196, 84, 72, 82, 69, 69, 45, 67, 73, 82, 67, 76, 197, 84, 72, + 82, 69, 65, 68, 128, 84, 72, 79, 85, 83, 65, 78, 68, 83, 128, 84, 72, 79, + 85, 83, 65, 78, 68, 211, 84, 72, 79, 85, 83, 65, 78, 68, 128, 84, 72, 79, + 85, 83, 65, 78, 196, 84, 72, 79, 85, 71, 72, 212, 84, 72, 79, 85, 128, + 84, 72, 79, 82, 78, 128, 84, 72, 79, 82, 206, 84, 72, 79, 78, 71, 128, + 84, 72, 79, 77, 128, 84, 72, 79, 74, 128, 84, 72, 79, 65, 128, 84, 72, + 207, 84, 72, 73, 85, 84, 72, 128, 84, 72, 73, 84, 65, 128, 84, 72, 73, + 82, 84, 89, 45, 83, 69, 67, 79, 78, 196, 84, 72, 73, 82, 84, 89, 45, 79, + 78, 69, 128, 84, 72, 73, 82, 84, 217, 84, 72, 73, 82, 84, 69, 69, 78, + 128, 84, 72, 73, 82, 84, 69, 69, 206, 84, 72, 73, 82, 68, 83, 128, 84, + 72, 73, 82, 68, 211, 84, 72, 73, 82, 68, 45, 83, 84, 65, 71, 197, 84, 72, + 73, 82, 68, 128, 84, 72, 73, 82, 196, 84, 72, 73, 78, 75, 73, 78, 199, + 84, 72, 73, 73, 128, 84, 72, 73, 71, 72, 128, 84, 72, 73, 69, 85, 84, + 200, 84, 72, 73, 67, 203, 84, 72, 73, 65, 66, 128, 84, 72, 69, 89, 128, + 84, 72, 69, 84, 72, 69, 128, 84, 72, 69, 84, 72, 128, 84, 72, 69, 84, 65, + 128, 84, 72, 69, 84, 193, 84, 72, 69, 83, 80, 73, 65, 206, 84, 72, 69, + 83, 69, 79, 83, 128, 84, 72, 69, 83, 69, 79, 211, 84, 72, 69, 211, 84, + 72, 69, 82, 77, 79, 77, 69, 84, 69, 82, 128, 84, 72, 69, 82, 77, 79, 68, + 89, 78, 65, 77, 73, 67, 128, 84, 72, 69, 82, 69, 70, 79, 82, 69, 128, 84, + 72, 69, 82, 197, 84, 72, 69, 206, 84, 72, 69, 77, 65, 84, 73, 83, 77, 79, + 211, 84, 72, 69, 77, 65, 128, 84, 72, 69, 77, 193, 84, 72, 69, 72, 128, + 84, 72, 69, 200, 84, 72, 69, 65, 128, 84, 72, 197, 84, 72, 65, 87, 128, + 84, 72, 65, 78, 84, 72, 65, 75, 72, 65, 84, 128, 84, 72, 65, 78, 78, 65, + 128, 84, 72, 65, 78, 128, 84, 72, 65, 206, 84, 72, 65, 77, 69, 68, 72, + 128, 84, 72, 65, 76, 128, 84, 72, 65, 204, 84, 72, 65, 74, 128, 84, 72, + 65, 201, 84, 72, 65, 72, 65, 78, 128, 84, 72, 65, 65, 78, 193, 84, 72, + 65, 65, 76, 85, 128, 84, 72, 45, 67, 82, 69, 197, 84, 69, 88, 84, 128, + 84, 69, 88, 212, 84, 69, 88, 128, 84, 69, 86, 73, 82, 128, 84, 69, 85, + 84, 69, 85, 88, 128, 84, 69, 85, 84, 69, 85, 87, 69, 78, 128, 84, 69, 85, + 84, 128, 84, 69, 85, 78, 128, 84, 69, 85, 65, 69, 81, 128, 84, 69, 85, + 65, 69, 78, 128, 84, 69, 85, 128, 84, 69, 84, 82, 65, 83, 73, 77, 79, 85, + 128, 84, 69, 84, 82, 65, 83, 69, 77, 69, 128, 84, 69, 84, 82, 65, 80, 76, + 73, 128, 84, 69, 84, 82, 65, 71, 82, 65, 205, 84, 69, 84, 82, 65, 70, 79, + 78, 73, 65, 83, 128, 84, 69, 84, 72, 128, 84, 69, 84, 200, 84, 69, 84, + 65, 82, 84, 79, 211, 84, 69, 84, 65, 82, 84, 73, 77, 79, 82, 73, 79, 78, + 128, 84, 69, 84, 128, 84, 69, 212, 84, 69, 83, 83, 69, 82, 65, 128, 84, + 69, 83, 83, 69, 82, 193, 84, 69, 83, 83, 65, 82, 79, 206, 84, 69, 83, + 200, 84, 69, 82, 77, 73, 78, 65, 84, 79, 82, 128, 84, 69, 80, 128, 84, + 69, 78, 85, 84, 79, 128, 84, 69, 78, 85, 128, 84, 69, 78, 213, 84, 69, + 78, 84, 72, 128, 84, 69, 78, 84, 128, 84, 69, 78, 83, 69, 128, 84, 69, + 78, 83, 197, 84, 69, 78, 83, 128, 84, 69, 78, 211, 84, 69, 78, 78, 73, + 211, 84, 69, 78, 71, 197, 84, 69, 78, 45, 84, 72, 73, 82, 84, 89, 128, + 84, 69, 78, 128, 84, 69, 206, 84, 69, 77, 80, 85, 211, 84, 69, 76, 85, + 128, 84, 69, 76, 79, 85, 211, 84, 69, 76, 76, 69, 210, 84, 69, 76, 73, + 83, 72, 193, 84, 69, 76, 69, 86, 73, 83, 73, 79, 78, 128, 84, 69, 76, 69, + 83, 67, 79, 80, 69, 128, 84, 69, 76, 69, 80, 72, 79, 78, 69, 128, 84, 69, + 76, 69, 80, 72, 79, 78, 197, 84, 69, 76, 69, 73, 65, 128, 84, 69, 76, 69, + 71, 82, 65, 80, 200, 84, 69, 75, 128, 84, 69, 73, 87, 83, 128, 84, 69, + 71, 69, 72, 128, 84, 69, 69, 84, 72, 128, 84, 69, 69, 84, 200, 84, 69, + 69, 78, 83, 128, 84, 69, 69, 69, 69, 128, 84, 69, 197, 84, 69, 68, 85, + 78, 71, 128, 84, 69, 65, 82, 211, 84, 69, 65, 82, 68, 82, 79, 80, 45, 83, + 80, 79, 75, 69, 196, 84, 69, 65, 82, 68, 82, 79, 80, 45, 83, 72, 65, 78, + 75, 69, 196, 84, 69, 65, 82, 68, 82, 79, 80, 45, 66, 65, 82, 66, 69, 196, + 84, 69, 65, 82, 45, 79, 70, 198, 84, 69, 65, 67, 85, 208, 84, 69, 45, 85, + 128, 84, 69, 45, 50, 128, 84, 67, 72, 69, 72, 69, 72, 128, 84, 67, 72, + 69, 72, 69, 200, 84, 67, 72, 69, 72, 128, 84, 67, 72, 69, 200, 84, 67, + 72, 69, 128, 84, 195, 84, 65, 89, 128, 84, 65, 88, 73, 128, 84, 65, 88, + 128, 84, 65, 87, 69, 76, 76, 69, 77, 69, 212, 84, 65, 87, 65, 128, 84, + 65, 87, 128, 84, 65, 86, 73, 89, 65, 78, 73, 128, 84, 65, 86, 128, 84, + 65, 214, 84, 65, 85, 82, 85, 83, 128, 84, 65, 85, 77, 128, 84, 65, 213, + 84, 65, 84, 87, 69, 69, 76, 128, 84, 65, 84, 87, 69, 69, 204, 84, 65, 84, + 84, 79, 79, 69, 196, 84, 65, 84, 128, 84, 65, 83, 128, 84, 65, 82, 85, + 78, 71, 128, 84, 65, 82, 84, 65, 82, 45, 50, 128, 84, 65, 82, 84, 65, 82, + 128, 84, 65, 82, 71, 69, 84, 128, 84, 65, 81, 128, 84, 65, 80, 69, 82, + 128, 84, 65, 80, 197, 84, 65, 80, 128, 84, 65, 79, 128, 84, 65, 78, 78, + 69, 196, 84, 65, 78, 71, 69, 82, 73, 78, 69, 128, 84, 65, 78, 71, 69, 78, + 84, 128, 84, 65, 78, 71, 69, 78, 212, 84, 65, 78, 199, 84, 65, 78, 65, + 66, 65, 84, 193, 84, 65, 78, 128, 84, 65, 77, 73, 78, 71, 128, 84, 65, + 77, 128, 84, 65, 76, 76, 128, 84, 65, 76, 204, 84, 65, 76, 73, 78, 71, + 128, 84, 65, 76, 73, 78, 199, 84, 65, 76, 69, 78, 84, 83, 128, 84, 65, + 76, 69, 78, 212, 84, 65, 75, 82, 201, 84, 65, 75, 72, 65, 76, 76, 85, 83, + 128, 84, 65, 75, 69, 128, 84, 65, 75, 52, 128, 84, 65, 75, 180, 84, 65, + 75, 128, 84, 65, 73, 83, 89, 79, 85, 128, 84, 65, 73, 76, 76, 69, 83, + 211, 84, 65, 73, 76, 128, 84, 65, 73, 204, 84, 65, 72, 128, 84, 65, 200, + 84, 65, 71, 66, 65, 78, 87, 193, 84, 65, 71, 65, 76, 79, 199, 84, 65, 71, + 128, 84, 65, 69, 206, 84, 65, 67, 79, 128, 84, 65, 67, 75, 128, 84, 65, + 67, 203, 84, 65, 66, 85, 76, 65, 84, 73, 79, 78, 128, 84, 65, 66, 85, 76, + 65, 84, 73, 79, 206, 84, 65, 66, 83, 128, 84, 65, 66, 76, 69, 128, 84, + 65, 66, 76, 197, 84, 65, 66, 128, 84, 65, 194, 84, 65, 65, 83, 72, 65, + 69, 128, 84, 65, 65, 81, 128, 84, 65, 65, 77, 128, 84, 65, 65, 76, 85, + 74, 193, 84, 65, 65, 73, 128, 84, 65, 65, 70, 128, 84, 65, 50, 128, 84, + 65, 45, 82, 79, 76, 128, 84, 65, 45, 50, 128, 84, 48, 51, 54, 128, 84, + 48, 51, 53, 128, 84, 48, 51, 52, 128, 84, 48, 51, 51, 65, 128, 84, 48, + 51, 51, 128, 84, 48, 51, 50, 65, 128, 84, 48, 51, 50, 128, 84, 48, 51, + 49, 128, 84, 48, 51, 48, 128, 84, 48, 50, 57, 128, 84, 48, 50, 56, 128, + 84, 48, 50, 55, 128, 84, 48, 50, 54, 128, 84, 48, 50, 53, 128, 84, 48, + 50, 52, 128, 84, 48, 50, 51, 128, 84, 48, 50, 50, 128, 84, 48, 50, 49, + 128, 84, 48, 50, 48, 128, 84, 48, 49, 57, 128, 84, 48, 49, 56, 128, 84, + 48, 49, 55, 128, 84, 48, 49, 54, 65, 128, 84, 48, 49, 54, 128, 84, 48, + 49, 53, 128, 84, 48, 49, 52, 128, 84, 48, 49, 51, 128, 84, 48, 49, 50, + 128, 84, 48, 49, 49, 65, 128, 84, 48, 49, 49, 128, 84, 48, 49, 48, 128, + 84, 48, 48, 57, 65, 128, 84, 48, 48, 57, 128, 84, 48, 48, 56, 65, 128, + 84, 48, 48, 56, 128, 84, 48, 48, 55, 65, 128, 84, 48, 48, 55, 128, 84, + 48, 48, 54, 128, 84, 48, 48, 53, 128, 84, 48, 48, 52, 128, 84, 48, 48, + 51, 65, 128, 84, 48, 48, 51, 128, 84, 48, 48, 50, 128, 84, 48, 48, 49, + 128, 84, 45, 83, 72, 73, 82, 84, 128, 83, 90, 90, 128, 83, 90, 87, 71, + 128, 83, 90, 87, 65, 128, 83, 90, 85, 128, 83, 90, 79, 128, 83, 90, 73, + 128, 83, 90, 69, 69, 128, 83, 90, 69, 128, 83, 90, 65, 65, 128, 83, 90, + 65, 128, 83, 90, 128, 83, 89, 88, 128, 83, 89, 84, 128, 83, 89, 83, 84, + 69, 205, 83, 89, 82, 88, 128, 83, 89, 82, 77, 65, 84, 73, 75, 73, 128, + 83, 89, 82, 77, 65, 128, 83, 89, 82, 73, 78, 71, 69, 128, 83, 89, 82, 73, + 65, 195, 83, 89, 82, 128, 83, 89, 80, 128, 83, 89, 79, 85, 87, 65, 128, + 83, 89, 78, 69, 86, 77, 65, 128, 83, 89, 78, 68, 69, 83, 77, 79, 211, 83, + 89, 78, 67, 72, 82, 79, 78, 79, 85, 211, 83, 89, 78, 65, 71, 79, 71, 85, + 69, 128, 83, 89, 78, 65, 71, 77, 193, 83, 89, 78, 65, 70, 73, 128, 83, + 89, 78, 128, 83, 89, 77, 77, 69, 84, 82, 89, 128, 83, 89, 77, 77, 69, 84, + 82, 73, 195, 83, 89, 77, 66, 79, 76, 83, 128, 83, 89, 77, 66, 79, 76, 45, + 57, 128, 83, 89, 77, 66, 79, 76, 45, 56, 128, 83, 89, 77, 66, 79, 76, 45, + 55, 128, 83, 89, 77, 66, 79, 76, 45, 54, 128, 83, 89, 77, 66, 79, 76, 45, + 53, 52, 128, 83, 89, 77, 66, 79, 76, 45, 53, 51, 128, 83, 89, 77, 66, 79, + 76, 45, 53, 50, 128, 83, 89, 77, 66, 79, 76, 45, 53, 49, 128, 83, 89, 77, + 66, 79, 76, 45, 53, 48, 128, 83, 89, 77, 66, 79, 76, 45, 53, 128, 83, 89, + 77, 66, 79, 76, 45, 52, 57, 128, 83, 89, 77, 66, 79, 76, 45, 52, 56, 128, + 83, 89, 77, 66, 79, 76, 45, 52, 55, 128, 83, 89, 77, 66, 79, 76, 45, 52, + 53, 128, 83, 89, 77, 66, 79, 76, 45, 52, 51, 128, 83, 89, 77, 66, 79, 76, + 45, 52, 50, 128, 83, 89, 77, 66, 79, 76, 45, 52, 48, 128, 83, 89, 77, 66, + 79, 76, 45, 52, 128, 83, 89, 77, 66, 79, 76, 45, 51, 57, 128, 83, 89, 77, + 66, 79, 76, 45, 51, 56, 128, 83, 89, 77, 66, 79, 76, 45, 51, 55, 128, 83, + 89, 77, 66, 79, 76, 45, 51, 54, 128, 83, 89, 77, 66, 79, 76, 45, 51, 50, + 128, 83, 89, 77, 66, 79, 76, 45, 51, 48, 128, 83, 89, 77, 66, 79, 76, 45, + 51, 128, 83, 89, 77, 66, 79, 76, 45, 50, 57, 128, 83, 89, 77, 66, 79, 76, + 45, 50, 55, 128, 83, 89, 77, 66, 79, 76, 45, 50, 54, 128, 83, 89, 77, 66, + 79, 76, 45, 50, 53, 128, 83, 89, 77, 66, 79, 76, 45, 50, 52, 128, 83, 89, + 77, 66, 79, 76, 45, 50, 51, 128, 83, 89, 77, 66, 79, 76, 45, 50, 50, 128, + 83, 89, 77, 66, 79, 76, 45, 50, 49, 128, 83, 89, 77, 66, 79, 76, 45, 50, + 48, 128, 83, 89, 77, 66, 79, 76, 45, 50, 128, 83, 89, 77, 66, 79, 76, 45, + 49, 57, 128, 83, 89, 77, 66, 79, 76, 45, 49, 56, 128, 83, 89, 77, 66, 79, + 76, 45, 49, 55, 128, 83, 89, 77, 66, 79, 76, 45, 49, 54, 128, 83, 89, 77, + 66, 79, 76, 45, 49, 53, 128, 83, 89, 77, 66, 79, 76, 45, 49, 52, 128, 83, + 89, 77, 66, 79, 76, 45, 49, 51, 128, 83, 89, 77, 66, 79, 76, 45, 49, 50, + 128, 83, 89, 77, 66, 79, 76, 45, 49, 49, 128, 83, 89, 77, 66, 79, 76, 45, + 49, 48, 128, 83, 89, 77, 66, 79, 76, 45, 49, 128, 83, 89, 76, 79, 84, + 201, 83, 89, 128, 83, 87, 90, 128, 83, 87, 85, 78, 199, 83, 87, 79, 82, + 68, 83, 128, 83, 87, 79, 82, 68, 128, 83, 87, 79, 79, 128, 83, 87, 79, + 128, 83, 87, 73, 82, 204, 83, 87, 73, 77, 77, 73, 78, 71, 128, 83, 87, + 73, 77, 77, 69, 82, 128, 83, 87, 73, 73, 128, 83, 87, 73, 128, 83, 87, + 71, 128, 83, 87, 69, 69, 84, 128, 83, 87, 69, 69, 212, 83, 87, 69, 65, + 84, 128, 83, 87, 69, 65, 212, 83, 87, 65, 83, 200, 83, 87, 65, 80, 80, + 73, 78, 71, 128, 83, 87, 65, 65, 128, 83, 87, 128, 83, 86, 65, 83, 84, + 201, 83, 86, 65, 82, 73, 84, 65, 128, 83, 86, 65, 82, 73, 84, 193, 83, + 85, 88, 128, 83, 85, 85, 128, 83, 85, 84, 82, 193, 83, 85, 84, 128, 83, + 85, 83, 80, 69, 78, 83, 73, 79, 206, 83, 85, 83, 72, 73, 128, 83, 85, 82, + 89, 65, 128, 83, 85, 82, 88, 128, 83, 85, 82, 82, 79, 85, 78, 68, 128, + 83, 85, 82, 82, 79, 85, 78, 196, 83, 85, 82, 70, 69, 82, 128, 83, 85, 82, + 70, 65, 67, 197, 83, 85, 82, 69, 128, 83, 85, 82, 65, 78, 71, 128, 83, + 85, 82, 57, 128, 83, 85, 82, 128, 83, 85, 210, 83, 85, 80, 82, 65, 76, + 73, 78, 69, 65, 210, 83, 85, 80, 69, 82, 86, 73, 83, 69, 128, 83, 85, 80, + 69, 82, 83, 69, 84, 128, 83, 85, 80, 69, 82, 83, 69, 212, 83, 85, 80, 69, + 82, 83, 67, 82, 73, 80, 212, 83, 85, 80, 69, 82, 73, 77, 80, 79, 83, 69, + 196, 83, 85, 80, 69, 82, 70, 73, 88, 69, 196, 83, 85, 80, 69, 210, 83, + 85, 80, 128, 83, 85, 79, 88, 128, 83, 85, 79, 80, 128, 83, 85, 79, 128, + 83, 85, 78, 83, 69, 212, 83, 85, 78, 82, 73, 83, 69, 128, 83, 85, 78, 82, + 73, 83, 197, 83, 85, 78, 71, 76, 65, 83, 83, 69, 83, 128, 83, 85, 78, 71, + 128, 83, 85, 78, 70, 76, 79, 87, 69, 82, 128, 83, 85, 78, 68, 65, 78, 69, + 83, 197, 83, 85, 78, 128, 83, 85, 206, 83, 85, 77, 77, 69, 82, 128, 83, + 85, 77, 77, 65, 84, 73, 79, 78, 128, 83, 85, 77, 77, 65, 84, 73, 79, 206, + 83, 85, 77, 65, 83, 72, 128, 83, 85, 77, 128, 83, 85, 76, 70, 85, 82, + 128, 83, 85, 75, 85, 78, 128, 83, 85, 75, 85, 206, 83, 85, 75, 85, 128, + 83, 85, 75, 213, 83, 85, 73, 84, 65, 66, 76, 69, 128, 83, 85, 73, 84, + 128, 83, 85, 73, 212, 83, 85, 72, 85, 82, 128, 83, 85, 69, 128, 83, 85, + 68, 50, 128, 83, 85, 68, 128, 83, 85, 67, 75, 73, 78, 199, 83, 85, 67, + 75, 69, 68, 128, 83, 85, 67, 203, 83, 85, 67, 67, 69, 69, 68, 83, 128, + 83, 85, 67, 67, 69, 69, 68, 211, 83, 85, 67, 67, 69, 69, 68, 128, 83, 85, + 67, 67, 69, 69, 196, 83, 85, 66, 85, 78, 73, 84, 128, 83, 85, 66, 83, 84, + 73, 84, 85, 84, 73, 79, 206, 83, 85, 66, 83, 84, 73, 84, 85, 84, 69, 128, + 83, 85, 66, 83, 84, 73, 84, 85, 84, 197, 83, 85, 66, 83, 69, 84, 128, 83, + 85, 66, 83, 69, 212, 83, 85, 66, 83, 67, 82, 73, 80, 212, 83, 85, 66, 80, + 85, 78, 67, 84, 73, 83, 128, 83, 85, 66, 76, 73, 78, 69, 65, 210, 83, 85, + 66, 76, 73, 77, 65, 84, 73, 79, 78, 128, 83, 85, 66, 76, 73, 77, 65, 84, + 69, 45, 51, 128, 83, 85, 66, 76, 73, 77, 65, 84, 69, 45, 50, 128, 83, 85, + 66, 76, 73, 77, 65, 84, 69, 128, 83, 85, 66, 76, 73, 77, 65, 84, 197, 83, + 85, 66, 74, 79, 73, 78, 69, 196, 83, 85, 66, 74, 69, 67, 84, 128, 83, 85, + 66, 73, 84, 79, 128, 83, 85, 66, 71, 82, 79, 85, 80, 128, 83, 85, 66, 71, + 82, 79, 85, 208, 83, 85, 66, 128, 83, 85, 65, 77, 128, 83, 85, 65, 69, + 84, 128, 83, 85, 65, 69, 78, 128, 83, 85, 65, 69, 128, 83, 85, 65, 66, + 128, 83, 85, 65, 128, 83, 213, 83, 84, 88, 128, 83, 84, 87, 65, 128, 83, + 84, 85, 70, 70, 69, 196, 83, 84, 85, 68, 89, 128, 83, 84, 85, 68, 73, + 207, 83, 84, 85, 67, 75, 45, 79, 85, 212, 83, 84, 83, 128, 83, 84, 82, + 79, 78, 199, 83, 84, 82, 79, 75, 69, 83, 128, 83, 84, 82, 79, 75, 69, + 211, 83, 84, 82, 79, 75, 69, 45, 57, 128, 83, 84, 82, 79, 75, 69, 45, 56, + 128, 83, 84, 82, 79, 75, 69, 45, 55, 128, 83, 84, 82, 79, 75, 69, 45, 54, + 128, 83, 84, 82, 79, 75, 69, 45, 53, 128, 83, 84, 82, 79, 75, 69, 45, 52, + 128, 83, 84, 82, 79, 75, 69, 45, 51, 128, 83, 84, 82, 79, 75, 69, 45, 50, + 128, 83, 84, 82, 79, 75, 69, 45, 49, 49, 128, 83, 84, 82, 79, 75, 69, 45, + 49, 48, 128, 83, 84, 82, 79, 75, 69, 45, 49, 128, 83, 84, 82, 79, 75, + 197, 83, 84, 82, 73, 80, 69, 128, 83, 84, 82, 73, 78, 71, 128, 83, 84, + 82, 73, 78, 199, 83, 84, 82, 73, 75, 69, 84, 72, 82, 79, 85, 71, 72, 128, + 83, 84, 82, 73, 75, 197, 83, 84, 82, 73, 68, 69, 128, 83, 84, 82, 73, 67, + 84, 76, 217, 83, 84, 82, 69, 84, 67, 72, 69, 196, 83, 84, 82, 69, 84, 67, + 72, 128, 83, 84, 82, 69, 83, 211, 83, 84, 82, 69, 78, 71, 84, 72, 128, + 83, 84, 82, 69, 65, 77, 69, 82, 128, 83, 84, 82, 65, 87, 66, 69, 82, 82, + 89, 128, 83, 84, 82, 65, 84, 85, 77, 45, 50, 128, 83, 84, 82, 65, 84, 85, + 77, 128, 83, 84, 82, 65, 84, 85, 205, 83, 84, 82, 65, 84, 73, 65, 206, + 83, 84, 82, 65, 73, 78, 69, 82, 128, 83, 84, 82, 65, 73, 71, 72, 84, 78, + 69, 83, 83, 128, 83, 84, 82, 65, 73, 71, 72, 84, 128, 83, 84, 82, 65, 73, + 71, 72, 212, 83, 84, 82, 65, 73, 70, 128, 83, 84, 82, 65, 71, 71, 73, 83, + 77, 65, 84, 65, 128, 83, 84, 79, 86, 69, 128, 83, 84, 79, 82, 69, 128, + 83, 84, 79, 80, 87, 65, 84, 67, 72, 128, 83, 84, 79, 80, 80, 73, 78, 71, + 128, 83, 84, 79, 80, 80, 65, 71, 69, 128, 83, 84, 79, 80, 128, 83, 84, + 79, 208, 83, 84, 79, 78, 69, 128, 83, 84, 79, 67, 75, 128, 83, 84, 79, + 67, 203, 83, 84, 73, 82, 82, 85, 208, 83, 84, 73, 77, 77, 69, 128, 83, + 84, 73, 76, 204, 83, 84, 73, 76, 197, 83, 84, 73, 71, 77, 65, 128, 83, + 84, 73, 67, 75, 73, 78, 199, 83, 84, 73, 67, 203, 83, 84, 69, 82, 69, 79, + 128, 83, 84, 69, 80, 128, 83, 84, 69, 78, 79, 71, 82, 65, 80, 72, 73, + 195, 83, 84, 69, 77, 128, 83, 84, 69, 65, 77, 73, 78, 199, 83, 84, 69, + 65, 77, 128, 83, 84, 69, 65, 205, 83, 84, 65, 86, 82, 79, 85, 128, 83, + 84, 65, 86, 82, 79, 83, 128, 83, 84, 65, 86, 82, 79, 211, 83, 84, 65, 85, + 82, 79, 83, 128, 83, 84, 65, 84, 85, 197, 83, 84, 65, 84, 73, 79, 78, + 128, 83, 84, 65, 84, 69, 82, 83, 128, 83, 84, 65, 84, 69, 128, 83, 84, + 65, 82, 212, 83, 84, 65, 82, 83, 128, 83, 84, 65, 82, 82, 69, 196, 83, + 84, 65, 82, 75, 128, 83, 84, 65, 82, 128, 83, 84, 65, 210, 83, 84, 65, + 78, 68, 83, 84, 73, 76, 76, 128, 83, 84, 65, 78, 68, 65, 82, 196, 83, 84, + 65, 78, 68, 128, 83, 84, 65, 78, 128, 83, 84, 65, 77, 80, 69, 196, 83, + 84, 65, 76, 76, 73, 79, 78, 128, 83, 84, 65, 70, 70, 128, 83, 84, 65, 70, + 198, 83, 84, 65, 68, 73, 85, 77, 128, 83, 84, 65, 67, 67, 65, 84, 79, + 128, 83, 84, 65, 67, 67, 65, 84, 73, 83, 83, 73, 77, 79, 128, 83, 84, 50, + 128, 83, 83, 89, 88, 128, 83, 83, 89, 84, 128, 83, 83, 89, 82, 88, 128, + 83, 83, 89, 82, 128, 83, 83, 89, 80, 128, 83, 83, 89, 128, 83, 83, 85, + 88, 128, 83, 83, 85, 85, 128, 83, 83, 85, 84, 128, 83, 83, 85, 80, 128, + 83, 83, 79, 88, 128, 83, 83, 79, 84, 128, 83, 83, 79, 80, 128, 83, 83, + 79, 79, 128, 83, 83, 79, 128, 83, 83, 73, 88, 128, 83, 83, 73, 84, 128, + 83, 83, 73, 80, 128, 83, 83, 73, 73, 128, 83, 83, 73, 69, 88, 128, 83, + 83, 73, 69, 80, 128, 83, 83, 73, 69, 128, 83, 83, 73, 128, 83, 83, 72, + 73, 78, 128, 83, 83, 72, 69, 128, 83, 83, 69, 88, 128, 83, 83, 69, 80, + 128, 83, 83, 69, 69, 128, 83, 83, 65, 88, 128, 83, 83, 65, 85, 128, 83, + 83, 65, 84, 128, 83, 83, 65, 80, 128, 83, 83, 65, 78, 71, 89, 69, 79, 82, + 73, 78, 72, 73, 69, 85, 72, 128, 83, 83, 65, 78, 71, 84, 73, 75, 69, 85, + 84, 45, 80, 73, 69, 85, 80, 128, 83, 83, 65, 78, 71, 84, 73, 75, 69, 85, + 84, 128, 83, 83, 65, 78, 71, 84, 72, 73, 69, 85, 84, 72, 128, 83, 83, 65, + 78, 71, 83, 73, 79, 83, 45, 84, 73, 75, 69, 85, 84, 128, 83, 83, 65, 78, + 71, 83, 73, 79, 83, 45, 80, 73, 69, 85, 80, 128, 83, 83, 65, 78, 71, 83, + 73, 79, 83, 45, 75, 73, 89, 69, 79, 75, 128, 83, 83, 65, 78, 71, 83, 73, + 79, 83, 128, 83, 83, 65, 78, 71, 82, 73, 69, 85, 76, 45, 75, 72, 73, 69, + 85, 75, 72, 128, 83, 83, 65, 78, 71, 82, 73, 69, 85, 76, 128, 83, 83, 65, + 78, 71, 80, 73, 69, 85, 80, 128, 83, 83, 65, 78, 71, 78, 73, 69, 85, 78, + 128, 83, 83, 65, 78, 71, 77, 73, 69, 85, 77, 128, 83, 83, 65, 78, 71, 75, + 73, 89, 69, 79, 75, 128, 83, 83, 65, 78, 71, 73, 69, 85, 78, 71, 128, 83, + 83, 65, 78, 71, 72, 73, 69, 85, 72, 128, 83, 83, 65, 78, 71, 67, 73, 69, + 85, 67, 45, 72, 73, 69, 85, 72, 128, 83, 83, 65, 78, 71, 67, 73, 69, 85, + 67, 128, 83, 83, 65, 78, 71, 65, 82, 65, 69, 65, 128, 83, 83, 65, 73, + 128, 83, 83, 65, 65, 128, 83, 83, 51, 128, 83, 83, 50, 128, 83, 82, 128, + 83, 81, 85, 73, 83, 200, 83, 81, 85, 73, 82, 82, 69, 204, 83, 81, 85, 73, + 71, 71, 76, 197, 83, 81, 85, 73, 68, 128, 83, 81, 85, 69, 69, 90, 69, 68, 128, 83, 81, 85, 69, 69, 90, 197, 83, 81, 85, 65, 212, 83, 81, 85, 65, 82, 69, 83, 128, 83, 81, 85, 65, 82, 69, 68, 128, 83, 81, 85, 65, 82, 69, 128, 83, 80, 89, 128, 83, 80, 87, 65, 128, 83, 80, 85, 78, 71, 211, 83, @@ -969,77 +976,79 @@ static unsigned char lexicon[] = { 65, 78, 128, 83, 78, 79, 87, 77, 65, 206, 83, 78, 79, 87, 70, 76, 65, 75, 69, 128, 83, 78, 79, 87, 66, 79, 65, 82, 68, 69, 82, 128, 83, 78, 79, 87, 128, 83, 78, 79, 215, 83, 78, 79, 85, 84, 128, 83, 78, 79, 85, 212, 83, - 78, 65, 208, 83, 78, 65, 75, 69, 128, 83, 78, 65, 75, 197, 83, 78, 65, - 73, 76, 128, 83, 78, 193, 83, 77, 79, 75, 73, 78, 199, 83, 77, 73, 82, - 75, 73, 78, 199, 83, 77, 73, 76, 73, 78, 199, 83, 77, 73, 76, 69, 128, - 83, 77, 73, 76, 197, 83, 77, 69, 65, 82, 128, 83, 77, 65, 83, 200, 83, - 77, 65, 76, 76, 69, 210, 83, 77, 65, 76, 76, 128, 83, 76, 85, 82, 128, - 83, 76, 79, 87, 76, 89, 128, 83, 76, 79, 87, 128, 83, 76, 79, 215, 83, - 76, 79, 86, 79, 128, 83, 76, 79, 212, 83, 76, 79, 80, 73, 78, 199, 83, - 76, 79, 80, 69, 128, 83, 76, 79, 65, 206, 83, 76, 73, 78, 71, 128, 83, - 76, 73, 71, 72, 84, 76, 217, 83, 76, 73, 68, 73, 78, 71, 128, 83, 76, 73, - 68, 69, 82, 128, 83, 76, 73, 67, 69, 128, 83, 76, 73, 67, 197, 83, 76, - 69, 85, 84, 200, 83, 76, 69, 69, 80, 217, 83, 76, 69, 69, 80, 73, 78, - 199, 83, 76, 65, 86, 79, 78, 73, 195, 83, 76, 65, 86, 69, 128, 83, 76, - 65, 83, 72, 128, 83, 76, 65, 83, 200, 83, 76, 65, 78, 84, 69, 196, 83, - 75, 87, 65, 128, 83, 75, 87, 128, 83, 75, 85, 76, 76, 128, 83, 75, 85, - 76, 204, 83, 75, 76, 73, 82, 79, 206, 83, 75, 73, 78, 128, 83, 75, 73, - 69, 82, 128, 83, 75, 201, 83, 75, 69, 87, 69, 196, 83, 75, 65, 84, 69, - 128, 83, 75, 128, 83, 74, 69, 128, 83, 73, 90, 197, 83, 73, 88, 84, 89, - 45, 70, 79, 85, 82, 84, 200, 83, 73, 88, 84, 89, 128, 83, 73, 88, 84, - 217, 83, 73, 88, 84, 72, 83, 128, 83, 73, 88, 84, 72, 211, 83, 73, 88, - 84, 72, 128, 83, 73, 88, 84, 69, 69, 78, 84, 72, 83, 128, 83, 73, 88, 84, - 69, 69, 78, 84, 72, 128, 83, 73, 88, 84, 69, 69, 78, 84, 200, 83, 73, 88, - 84, 69, 69, 78, 128, 83, 73, 88, 84, 69, 69, 206, 83, 73, 88, 45, 84, 72, - 73, 82, 84, 89, 128, 83, 73, 88, 45, 83, 84, 82, 73, 78, 199, 83, 73, 88, - 45, 80, 69, 82, 45, 69, 205, 83, 73, 88, 45, 76, 73, 78, 197, 83, 73, - 216, 83, 73, 84, 69, 128, 83, 73, 83, 65, 128, 83, 73, 82, 73, 78, 71, - 85, 128, 83, 73, 79, 83, 45, 84, 72, 73, 69, 85, 84, 72, 128, 83, 73, 79, - 83, 45, 83, 83, 65, 78, 71, 83, 73, 79, 83, 128, 83, 73, 79, 83, 45, 82, - 73, 69, 85, 76, 128, 83, 73, 79, 83, 45, 80, 73, 69, 85, 80, 45, 75, 73, - 89, 69, 79, 75, 128, 83, 73, 79, 83, 45, 80, 72, 73, 69, 85, 80, 72, 128, - 83, 73, 79, 83, 45, 80, 65, 78, 83, 73, 79, 83, 128, 83, 73, 79, 83, 45, - 78, 73, 69, 85, 78, 128, 83, 73, 79, 83, 45, 77, 73, 69, 85, 77, 128, 83, - 73, 79, 83, 45, 75, 72, 73, 69, 85, 75, 72, 128, 83, 73, 79, 83, 45, 75, - 65, 80, 89, 69, 79, 85, 78, 80, 73, 69, 85, 80, 128, 83, 73, 79, 83, 45, - 73, 69, 85, 78, 71, 128, 83, 73, 79, 83, 45, 72, 73, 69, 85, 72, 128, 83, - 73, 79, 83, 45, 67, 73, 69, 85, 67, 128, 83, 73, 79, 83, 45, 67, 72, 73, - 69, 85, 67, 72, 128, 83, 73, 79, 211, 83, 73, 78, 85, 83, 79, 73, 196, - 83, 73, 78, 79, 76, 79, 71, 73, 67, 65, 204, 83, 73, 78, 75, 73, 78, 71, - 128, 83, 73, 78, 71, 76, 69, 45, 83, 72, 73, 70, 84, 45, 51, 128, 83, 73, - 78, 71, 76, 69, 45, 83, 72, 73, 70, 84, 45, 50, 128, 83, 73, 78, 71, 76, - 69, 45, 76, 73, 78, 197, 83, 73, 78, 71, 76, 69, 128, 83, 73, 78, 71, 76, - 197, 83, 73, 78, 71, 65, 65, 84, 128, 83, 73, 78, 197, 83, 73, 78, 68, - 72, 201, 83, 73, 206, 83, 73, 77, 85, 76, 84, 65, 78, 69, 79, 85, 83, - 128, 83, 73, 77, 85, 76, 84, 65, 78, 69, 79, 85, 211, 83, 73, 77, 80, 76, - 73, 70, 73, 69, 196, 83, 73, 77, 73, 76, 65, 82, 128, 83, 73, 77, 73, 76, - 65, 210, 83, 73, 77, 65, 78, 83, 73, 211, 83, 73, 77, 65, 76, 85, 78, 71, - 85, 206, 83, 73, 77, 65, 128, 83, 73, 76, 86, 69, 82, 128, 83, 73, 76, - 75, 128, 83, 73, 76, 73, 81, 85, 193, 83, 73, 76, 72, 79, 85, 69, 84, 84, - 69, 128, 83, 73, 76, 72, 79, 85, 69, 84, 84, 197, 83, 73, 76, 65, 51, - 128, 83, 73, 75, 73, 128, 83, 73, 75, 50, 128, 83, 73, 75, 178, 83, 73, - 71, 78, 83, 128, 83, 73, 71, 77, 65, 128, 83, 73, 71, 77, 193, 83, 73, - 71, 69, 204, 83, 73, 71, 52, 128, 83, 73, 71, 180, 83, 73, 71, 128, 83, - 73, 69, 69, 128, 83, 73, 68, 69, 87, 65, 89, 211, 83, 73, 68, 69, 128, - 83, 73, 68, 197, 83, 73, 68, 68, 72, 65, 77, 128, 83, 73, 67, 75, 78, 69, - 83, 83, 128, 83, 73, 67, 75, 76, 69, 128, 83, 73, 66, 197, 83, 73, 65, - 128, 83, 201, 83, 72, 89, 88, 128, 83, 72, 89, 84, 128, 83, 72, 89, 82, - 88, 128, 83, 72, 89, 82, 128, 83, 72, 89, 80, 128, 83, 72, 89, 69, 128, - 83, 72, 89, 65, 128, 83, 72, 89, 128, 83, 72, 87, 79, 89, 128, 83, 72, - 87, 79, 79, 128, 83, 72, 87, 79, 128, 83, 72, 87, 73, 73, 128, 83, 72, - 87, 73, 128, 83, 72, 87, 69, 128, 83, 72, 87, 197, 83, 72, 87, 65, 65, - 128, 83, 72, 87, 65, 128, 83, 72, 85, 88, 128, 83, 72, 85, 85, 128, 83, - 72, 85, 84, 84, 76, 69, 67, 79, 67, 75, 128, 83, 72, 85, 84, 128, 83, 72, - 85, 82, 88, 128, 83, 72, 85, 82, 128, 83, 72, 85, 80, 128, 83, 72, 85, - 79, 88, 128, 83, 72, 85, 79, 80, 128, 83, 72, 85, 79, 128, 83, 72, 85, - 77, 128, 83, 72, 85, 76, 128, 83, 72, 85, 70, 70, 76, 197, 83, 72, 85, - 69, 81, 128, 83, 72, 85, 69, 78, 83, 72, 85, 69, 84, 128, 83, 72, 85, 66, - 85, 82, 128, 83, 72, 85, 50, 128, 83, 72, 85, 178, 83, 72, 85, 128, 83, - 72, 213, 83, 72, 84, 65, 80, 73, 67, 128, 83, 72, 84, 65, 128, 83, 72, - 82, 73, 78, 69, 128, 83, 72, 82, 73, 77, 80, 128, 83, 72, 82, 73, 73, - 128, 83, 72, 82, 73, 128, 83, 72, 79, 89, 128, 83, 72, 79, 88, 128, 83, - 72, 79, 87, 69, 82, 128, 83, 72, 79, 85, 76, 68, 69, 82, 69, 196, 83, 72, - 79, 85, 76, 68, 69, 210, 83, 72, 79, 84, 128, 83, 72, 79, 82, 84, 83, + 78, 69, 69, 90, 73, 78, 199, 83, 78, 65, 208, 83, 78, 65, 75, 69, 128, + 83, 78, 65, 75, 197, 83, 78, 65, 73, 76, 128, 83, 78, 193, 83, 77, 79, + 75, 73, 78, 199, 83, 77, 73, 82, 75, 73, 78, 199, 83, 77, 73, 76, 73, 78, + 199, 83, 77, 73, 76, 69, 128, 83, 77, 73, 76, 197, 83, 77, 69, 65, 82, + 128, 83, 77, 65, 83, 200, 83, 77, 65, 76, 76, 69, 210, 83, 77, 65, 76, + 76, 128, 83, 76, 85, 82, 128, 83, 76, 79, 87, 76, 89, 128, 83, 76, 79, + 87, 128, 83, 76, 79, 215, 83, 76, 79, 86, 79, 128, 83, 76, 79, 212, 83, + 76, 79, 80, 73, 78, 199, 83, 76, 79, 80, 69, 128, 83, 76, 79, 65, 206, + 83, 76, 73, 78, 71, 128, 83, 76, 73, 71, 72, 84, 76, 217, 83, 76, 73, 68, + 73, 78, 71, 128, 83, 76, 73, 68, 69, 82, 128, 83, 76, 73, 67, 69, 128, + 83, 76, 73, 67, 197, 83, 76, 69, 85, 84, 200, 83, 76, 69, 69, 80, 217, + 83, 76, 69, 69, 80, 73, 78, 199, 83, 76, 69, 69, 208, 83, 76, 65, 86, 79, + 78, 73, 195, 83, 76, 65, 86, 69, 128, 83, 76, 65, 83, 72, 128, 83, 76, + 65, 83, 200, 83, 76, 65, 78, 84, 69, 196, 83, 75, 87, 65, 128, 83, 75, + 87, 128, 83, 75, 85, 76, 76, 128, 83, 75, 85, 76, 204, 83, 75, 76, 73, + 82, 79, 206, 83, 75, 73, 78, 128, 83, 75, 73, 69, 82, 128, 83, 75, 201, + 83, 75, 69, 87, 69, 196, 83, 75, 65, 84, 69, 128, 83, 75, 128, 83, 74, + 69, 128, 83, 73, 90, 197, 83, 73, 88, 84, 89, 45, 70, 79, 85, 82, 84, + 200, 83, 73, 88, 84, 89, 128, 83, 73, 88, 84, 217, 83, 73, 88, 84, 72, + 83, 128, 83, 73, 88, 84, 72, 211, 83, 73, 88, 84, 72, 128, 83, 73, 88, + 84, 69, 69, 78, 84, 72, 83, 128, 83, 73, 88, 84, 69, 69, 78, 84, 72, 128, + 83, 73, 88, 84, 69, 69, 78, 84, 200, 83, 73, 88, 84, 69, 69, 78, 128, 83, + 73, 88, 84, 69, 69, 206, 83, 73, 88, 45, 84, 72, 73, 82, 84, 89, 128, 83, + 73, 88, 45, 83, 84, 82, 73, 78, 199, 83, 73, 88, 45, 80, 69, 82, 45, 69, + 205, 83, 73, 88, 45, 76, 73, 78, 197, 83, 73, 216, 83, 73, 84, 69, 128, + 83, 73, 83, 65, 128, 83, 73, 82, 73, 78, 71, 85, 128, 83, 73, 79, 83, 45, + 84, 72, 73, 69, 85, 84, 72, 128, 83, 73, 79, 83, 45, 83, 83, 65, 78, 71, + 83, 73, 79, 83, 128, 83, 73, 79, 83, 45, 82, 73, 69, 85, 76, 128, 83, 73, + 79, 83, 45, 80, 73, 69, 85, 80, 45, 75, 73, 89, 69, 79, 75, 128, 83, 73, + 79, 83, 45, 80, 72, 73, 69, 85, 80, 72, 128, 83, 73, 79, 83, 45, 80, 65, + 78, 83, 73, 79, 83, 128, 83, 73, 79, 83, 45, 78, 73, 69, 85, 78, 128, 83, + 73, 79, 83, 45, 77, 73, 69, 85, 77, 128, 83, 73, 79, 83, 45, 75, 72, 73, + 69, 85, 75, 72, 128, 83, 73, 79, 83, 45, 75, 65, 80, 89, 69, 79, 85, 78, + 80, 73, 69, 85, 80, 128, 83, 73, 79, 83, 45, 73, 69, 85, 78, 71, 128, 83, + 73, 79, 83, 45, 72, 73, 69, 85, 72, 128, 83, 73, 79, 83, 45, 67, 73, 69, + 85, 67, 128, 83, 73, 79, 83, 45, 67, 72, 73, 69, 85, 67, 72, 128, 83, 73, + 79, 211, 83, 73, 78, 85, 83, 79, 73, 196, 83, 73, 78, 79, 76, 79, 71, 73, + 67, 65, 204, 83, 73, 78, 78, 89, 73, 73, 89, 72, 69, 128, 83, 73, 78, 75, + 73, 78, 71, 128, 83, 73, 78, 71, 76, 69, 45, 83, 72, 73, 70, 84, 45, 51, + 128, 83, 73, 78, 71, 76, 69, 45, 83, 72, 73, 70, 84, 45, 50, 128, 83, 73, + 78, 71, 76, 69, 45, 76, 73, 78, 197, 83, 73, 78, 71, 76, 69, 128, 83, 73, + 78, 71, 76, 197, 83, 73, 78, 71, 65, 65, 84, 128, 83, 73, 78, 197, 83, + 73, 78, 68, 72, 201, 83, 73, 206, 83, 73, 77, 85, 76, 84, 65, 78, 69, 79, + 85, 83, 128, 83, 73, 77, 85, 76, 84, 65, 78, 69, 79, 85, 211, 83, 73, 77, + 80, 76, 73, 70, 73, 69, 196, 83, 73, 77, 73, 76, 65, 82, 128, 83, 73, 77, + 73, 76, 65, 210, 83, 73, 77, 65, 78, 83, 73, 211, 83, 73, 77, 65, 76, 85, + 78, 71, 85, 206, 83, 73, 77, 65, 128, 83, 73, 76, 86, 69, 82, 128, 83, + 73, 76, 75, 128, 83, 73, 76, 73, 81, 85, 193, 83, 73, 76, 72, 79, 85, 69, + 84, 84, 69, 128, 83, 73, 76, 72, 79, 85, 69, 84, 84, 197, 83, 73, 76, 65, + 51, 128, 83, 73, 75, 73, 128, 83, 73, 75, 50, 128, 83, 73, 75, 178, 83, + 73, 71, 78, 83, 128, 83, 73, 71, 77, 65, 128, 83, 73, 71, 77, 193, 83, + 73, 71, 69, 204, 83, 73, 71, 52, 128, 83, 73, 71, 180, 83, 73, 71, 128, + 83, 73, 69, 69, 128, 83, 73, 68, 69, 87, 65, 89, 211, 83, 73, 68, 69, + 128, 83, 73, 68, 197, 83, 73, 68, 68, 72, 73, 128, 83, 73, 68, 68, 72, + 65, 77, 128, 83, 73, 67, 75, 78, 69, 83, 83, 128, 83, 73, 67, 75, 76, 69, + 128, 83, 73, 66, 197, 83, 73, 65, 128, 83, 201, 83, 72, 89, 88, 128, 83, + 72, 89, 84, 128, 83, 72, 89, 82, 88, 128, 83, 72, 89, 82, 128, 83, 72, + 89, 80, 128, 83, 72, 89, 69, 128, 83, 72, 89, 65, 128, 83, 72, 89, 128, + 83, 72, 87, 79, 89, 128, 83, 72, 87, 79, 79, 128, 83, 72, 87, 79, 128, + 83, 72, 87, 73, 73, 128, 83, 72, 87, 73, 128, 83, 72, 87, 69, 128, 83, + 72, 87, 197, 83, 72, 87, 65, 65, 128, 83, 72, 87, 65, 128, 83, 72, 86, + 128, 83, 72, 85, 88, 128, 83, 72, 85, 85, 128, 83, 72, 85, 84, 84, 76, + 69, 67, 79, 67, 75, 128, 83, 72, 85, 84, 128, 83, 72, 85, 82, 88, 128, + 83, 72, 85, 82, 128, 83, 72, 85, 80, 128, 83, 72, 85, 79, 88, 128, 83, + 72, 85, 79, 80, 128, 83, 72, 85, 79, 128, 83, 72, 85, 77, 128, 83, 72, + 85, 76, 128, 83, 72, 85, 70, 70, 76, 197, 83, 72, 85, 69, 81, 128, 83, + 72, 85, 69, 78, 83, 72, 85, 69, 84, 128, 83, 72, 85, 66, 85, 82, 128, 83, + 72, 85, 50, 128, 83, 72, 85, 178, 83, 72, 85, 128, 83, 72, 213, 83, 72, + 84, 65, 80, 73, 67, 128, 83, 72, 84, 65, 128, 83, 72, 82, 85, 71, 128, + 83, 72, 82, 73, 78, 69, 128, 83, 72, 82, 73, 77, 80, 128, 83, 72, 82, 73, + 73, 128, 83, 72, 82, 73, 128, 83, 72, 79, 89, 128, 83, 72, 79, 88, 128, + 83, 72, 79, 87, 69, 82, 128, 83, 72, 79, 85, 76, 68, 69, 82, 69, 196, 83, + 72, 79, 85, 76, 68, 69, 210, 83, 72, 79, 84, 128, 83, 72, 79, 82, 84, 83, 128, 83, 72, 79, 82, 84, 211, 83, 72, 79, 82, 84, 72, 65, 78, 196, 83, 72, 79, 82, 84, 69, 78, 69, 82, 128, 83, 72, 79, 82, 84, 67, 65, 75, 69, 128, 83, 72, 79, 82, 84, 45, 84, 87, 73, 71, 45, 89, 82, 128, 83, 72, 79, @@ -1077,543 +1086,548 @@ static unsigned char lexicon[] = { 128, 83, 72, 65, 88, 128, 83, 72, 65, 86, 73, 89, 65, 78, 73, 128, 83, 72, 65, 86, 73, 65, 206, 83, 72, 65, 86, 69, 196, 83, 72, 65, 85, 128, 83, 72, 65, 84, 128, 83, 72, 65, 82, 85, 128, 83, 72, 65, 82, 213, 83, - 72, 65, 82, 80, 128, 83, 72, 65, 82, 208, 83, 72, 65, 82, 65, 128, 83, - 72, 65, 82, 50, 128, 83, 72, 65, 82, 178, 83, 72, 65, 80, 73, 78, 71, - 128, 83, 72, 65, 80, 69, 83, 128, 83, 72, 65, 80, 197, 83, 72, 65, 80, - 128, 83, 72, 65, 78, 71, 128, 83, 72, 65, 78, 128, 83, 72, 65, 206, 83, - 72, 65, 77, 82, 79, 67, 75, 128, 83, 72, 65, 76, 83, 72, 69, 76, 69, 84, - 128, 83, 72, 65, 75, 84, 73, 128, 83, 72, 65, 75, 73, 78, 71, 128, 83, - 72, 65, 75, 73, 78, 199, 83, 72, 65, 75, 128, 83, 72, 65, 73, 128, 83, - 72, 65, 70, 84, 128, 83, 72, 65, 70, 212, 83, 72, 65, 68, 79, 87, 69, - 196, 83, 72, 65, 68, 69, 196, 83, 72, 65, 68, 69, 128, 83, 72, 65, 68, - 68, 65, 128, 83, 72, 65, 68, 68, 193, 83, 72, 65, 68, 128, 83, 72, 65, - 196, 83, 72, 65, 66, 54, 128, 83, 72, 65, 65, 128, 83, 72, 65, 54, 128, - 83, 72, 65, 182, 83, 72, 65, 51, 128, 83, 72, 65, 179, 83, 71, 82, 193, - 83, 71, 79, 210, 83, 71, 67, 128, 83, 71, 65, 215, 83, 71, 65, 194, 83, - 71, 128, 83, 69, 89, 75, 128, 83, 69, 88, 84, 85, 76, 193, 83, 69, 88, - 84, 73, 76, 69, 128, 83, 69, 88, 84, 65, 78, 211, 83, 69, 86, 69, 82, 65, - 78, 67, 69, 128, 83, 69, 86, 69, 78, 84, 89, 128, 83, 69, 86, 69, 78, 84, - 217, 83, 69, 86, 69, 78, 84, 72, 128, 83, 69, 86, 69, 78, 84, 69, 69, 78, - 128, 83, 69, 86, 69, 78, 84, 69, 69, 206, 83, 69, 86, 69, 78, 45, 84, 72, - 73, 82, 84, 89, 128, 83, 69, 86, 69, 206, 83, 69, 85, 88, 128, 83, 69, - 85, 78, 89, 65, 77, 128, 83, 69, 85, 65, 69, 81, 128, 83, 69, 84, 70, 79, - 78, 128, 83, 69, 83, 84, 69, 82, 84, 73, 85, 211, 83, 69, 83, 81, 85, 73, - 81, 85, 65, 68, 82, 65, 84, 69, 128, 83, 69, 83, 65, 77, 197, 83, 69, 82, - 86, 73, 67, 197, 83, 69, 82, 73, 70, 83, 128, 83, 69, 82, 73, 70, 211, - 83, 69, 82, 73, 70, 128, 83, 69, 81, 85, 69, 78, 84, 73, 65, 76, 128, 83, - 69, 81, 85, 69, 78, 67, 197, 83, 69, 80, 84, 85, 80, 76, 197, 83, 69, 80, - 84, 69, 77, 66, 69, 82, 128, 83, 69, 80, 65, 82, 65, 84, 79, 82, 128, 83, - 69, 80, 65, 82, 65, 84, 79, 210, 83, 69, 78, 84, 79, 128, 83, 69, 78, 84, - 73, 128, 83, 69, 77, 85, 78, 67, 73, 193, 83, 69, 77, 75, 65, 84, 72, - 128, 83, 69, 77, 75, 128, 83, 69, 77, 73, 86, 79, 87, 69, 204, 83, 69, - 77, 73, 83, 79, 70, 212, 83, 69, 77, 73, 83, 69, 88, 84, 73, 76, 69, 128, - 83, 69, 77, 73, 77, 73, 78, 73, 77, 193, 83, 69, 77, 73, 68, 73, 82, 69, - 67, 212, 83, 69, 77, 73, 67, 79, 76, 79, 78, 128, 83, 69, 77, 73, 67, 79, - 76, 79, 206, 83, 69, 77, 73, 67, 73, 82, 67, 85, 76, 65, 210, 83, 69, 77, - 73, 67, 73, 82, 67, 76, 197, 83, 69, 77, 73, 66, 82, 69, 86, 73, 211, 83, - 69, 77, 73, 45, 86, 79, 73, 67, 69, 196, 83, 69, 76, 70, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 57, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 57, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 55, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 57, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 57, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 52, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 57, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 57, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 49, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 57, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 57, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 56, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, - 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 54, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 56, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, - 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 51, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 56, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, - 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 48, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 57, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 56, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 55, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 54, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 53, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 55, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 51, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 50, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 55, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 48, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 54, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 56, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 55, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 54, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 53, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 52, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 54, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 50, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 49, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 54, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 53, 57, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 53, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 55, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 53, 54, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 53, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 52, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 53, 51, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 53, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 49, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 53, 48, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 57, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 52, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 52, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 54, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 52, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 52, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 51, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 52, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 52, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 48, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 51, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 56, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 51, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 51, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 53, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 51, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 51, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 50, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 51, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 51, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, - 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 55, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, - 53, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 53, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 50, 53, 52, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 50, 53, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 50, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 49, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 53, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 50, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 57, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 50, 52, 56, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 50, 52, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 54, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 53, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 52, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 50, 52, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 50, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 49, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 50, 52, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 57, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 51, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 50, 51, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 54, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 53, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 50, 51, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, - 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 50, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 50, 51, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 50, 51, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 57, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 50, 50, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, - 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 54, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 50, 50, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 50, 50, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 51, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 50, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 50, 50, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, - 50, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 50, 49, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 50, 49, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 55, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 54, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 50, 49, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, - 49, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 51, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 50, 49, 50, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 50, 49, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 48, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 50, 48, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, - 48, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 55, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 50, 48, 54, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 50, 48, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 52, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 51, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 50, 48, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 50, 48, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 48, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 57, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 56, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 57, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, - 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 53, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 57, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 57, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 50, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 49, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 57, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 57, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 56, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 56, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 54, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 53, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 56, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 56, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 50, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 56, 49, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 49, 56, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 57, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 55, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 55, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 54, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 55, 53, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 49, 55, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 51, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 50, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 55, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 49, 55, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 54, 57, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 49, 54, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 55, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 54, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 54, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 49, 54, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 51, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 50, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 54, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, - 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 53, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 49, 53, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 55, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 54, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 53, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, - 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 51, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 53, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 53, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 48, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 52, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, - 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 55, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 52, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 52, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 52, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 51, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 52, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 52, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 48, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 51, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 56, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 55, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 51, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 51, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 52, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 51, 51, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 49, 51, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 49, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 48, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 50, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 56, 128, 83, 69, - 76, 69, 67, 84, 79, 82, 45, 49, 50, 55, 128, 83, 69, 76, 69, 67, 84, 79, - 82, 45, 49, 50, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 53, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 52, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 50, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 49, 50, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 49, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 48, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 57, - 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 56, 128, 83, 69, 76, 69, - 67, 84, 79, 82, 45, 49, 49, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, - 49, 49, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 53, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 52, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 49, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, - 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 49, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 49, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 57, 128, 83, - 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 56, 128, 83, 69, 76, 69, 67, 84, - 79, 82, 45, 49, 48, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, - 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 53, 128, 83, 69, 76, - 69, 67, 84, 79, 82, 45, 49, 48, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, - 45, 49, 48, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 50, 128, - 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 49, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 45, 49, 48, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, - 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 128, 83, 69, 76, 69, 67, - 84, 79, 82, 128, 83, 69, 76, 69, 67, 84, 79, 210, 83, 69, 76, 69, 67, 84, - 69, 196, 83, 69, 73, 83, 77, 65, 128, 83, 69, 73, 83, 77, 193, 83, 69, - 72, 128, 83, 69, 71, 79, 76, 128, 83, 69, 71, 78, 79, 128, 83, 69, 71, - 77, 69, 78, 84, 128, 83, 69, 69, 86, 128, 83, 69, 69, 78, 85, 128, 83, - 69, 69, 78, 128, 83, 69, 69, 206, 83, 69, 69, 68, 76, 73, 78, 71, 128, - 83, 69, 69, 45, 78, 79, 45, 69, 86, 73, 204, 83, 69, 67, 84, 79, 82, 128, - 83, 69, 67, 84, 73, 79, 78, 128, 83, 69, 67, 84, 73, 79, 206, 83, 69, 67, - 82, 69, 84, 128, 83, 69, 67, 79, 78, 68, 128, 83, 69, 67, 65, 78, 84, - 128, 83, 69, 66, 65, 84, 66, 69, 73, 212, 83, 69, 65, 84, 128, 83, 69, - 65, 76, 128, 83, 69, 65, 71, 85, 76, 204, 83, 68, 79, 78, 199, 83, 68, - 128, 83, 67, 87, 65, 128, 83, 67, 82, 85, 80, 76, 69, 128, 83, 67, 82, - 79, 76, 76, 128, 83, 67, 82, 73, 80, 84, 128, 83, 67, 82, 69, 69, 78, - 128, 83, 67, 82, 69, 69, 206, 83, 67, 82, 69, 65, 77, 73, 78, 199, 83, - 67, 79, 82, 80, 73, 85, 83, 128, 83, 67, 79, 82, 80, 73, 79, 78, 128, 83, - 67, 79, 82, 69, 128, 83, 67, 73, 83, 83, 79, 82, 83, 128, 83, 67, 73, - 128, 83, 67, 72, 87, 65, 128, 83, 67, 72, 87, 193, 83, 67, 72, 82, 79, - 69, 68, 69, 82, 128, 83, 67, 72, 79, 79, 76, 128, 83, 67, 72, 79, 79, - 204, 83, 67, 72, 79, 76, 65, 82, 128, 83, 67, 72, 69, 77, 193, 83, 67, - 69, 80, 84, 69, 210, 83, 67, 65, 78, 68, 73, 67, 85, 83, 128, 83, 67, 65, - 78, 68, 73, 67, 85, 211, 83, 67, 65, 206, 83, 67, 65, 76, 69, 83, 128, - 83, 66, 85, 194, 83, 66, 82, 85, 204, 83, 65, 89, 73, 83, 201, 83, 65, - 89, 65, 78, 78, 65, 128, 83, 65, 89, 128, 83, 65, 88, 79, 80, 72, 79, 78, - 69, 128, 83, 65, 88, 73, 77, 65, 84, 65, 128, 83, 65, 87, 65, 78, 128, - 83, 65, 87, 128, 83, 65, 86, 79, 85, 82, 73, 78, 199, 83, 65, 85, 82, 65, - 83, 72, 84, 82, 193, 83, 65, 85, 73, 76, 128, 83, 65, 84, 85, 82, 78, - 128, 83, 65, 84, 75, 65, 65, 78, 75, 85, 85, 128, 83, 65, 84, 75, 65, 65, - 78, 128, 83, 65, 84, 69, 76, 76, 73, 84, 69, 128, 83, 65, 84, 69, 76, 76, - 73, 84, 197, 83, 65, 84, 67, 72, 69, 76, 128, 83, 65, 84, 65, 78, 71, 65, - 128, 83, 65, 83, 72, 128, 83, 65, 83, 65, 75, 128, 83, 65, 82, 73, 128, - 83, 65, 82, 193, 83, 65, 82, 128, 83, 65, 81, 128, 83, 65, 80, 65, 128, - 83, 65, 78, 89, 79, 79, 71, 193, 83, 65, 78, 89, 65, 75, 193, 83, 65, 78, - 84, 73, 73, 77, 85, 128, 83, 65, 78, 78, 89, 65, 128, 83, 65, 78, 71, 65, - 50, 128, 83, 65, 78, 68, 72, 201, 83, 65, 78, 68, 65, 76, 128, 83, 65, - 78, 65, 72, 128, 83, 65, 78, 128, 83, 65, 77, 89, 79, 203, 83, 65, 77, - 86, 65, 84, 128, 83, 65, 77, 80, 73, 128, 83, 65, 77, 80, 72, 65, 79, - 128, 83, 65, 77, 75, 65, 128, 83, 65, 77, 69, 75, 72, 128, 83, 65, 77, - 69, 75, 200, 83, 65, 77, 66, 65, 128, 83, 65, 77, 65, 82, 73, 84, 65, - 206, 83, 65, 77, 128, 83, 65, 76, 84, 73, 82, 69, 128, 83, 65, 76, 84, - 73, 76, 76, 79, 128, 83, 65, 76, 84, 45, 50, 128, 83, 65, 76, 84, 128, - 83, 65, 76, 212, 83, 65, 76, 76, 65, 76, 76, 65, 72, 79, 213, 83, 65, 76, - 76, 193, 83, 65, 76, 65, 205, 83, 65, 76, 65, 128, 83, 65, 76, 45, 65, - 77, 77, 79, 78, 73, 65, 67, 128, 83, 65, 76, 128, 83, 65, 75, 79, 84, - 128, 83, 65, 75, 72, 193, 83, 65, 75, 69, 85, 65, 69, 128, 83, 65, 75, - 197, 83, 65, 74, 68, 65, 72, 128, 83, 65, 73, 76, 66, 79, 65, 84, 128, - 83, 65, 73, 76, 128, 83, 65, 73, 75, 85, 82, 85, 128, 83, 65, 72, 128, - 83, 65, 71, 73, 84, 84, 65, 82, 73, 85, 83, 128, 83, 65, 71, 65, 128, 83, - 65, 71, 128, 83, 65, 199, 83, 65, 70, 72, 65, 128, 83, 65, 70, 69, 84, - 217, 83, 65, 68, 72, 69, 128, 83, 65, 68, 69, 128, 83, 65, 68, 128, 83, - 65, 196, 83, 65, 67, 82, 73, 70, 73, 67, 73, 65, 204, 83, 65, 65, 73, - 128, 83, 65, 65, 68, 72, 85, 128, 83, 65, 45, 73, 128, 83, 65, 45, 50, - 128, 83, 48, 52, 54, 128, 83, 48, 52, 53, 128, 83, 48, 52, 52, 128, 83, - 48, 52, 51, 128, 83, 48, 52, 50, 128, 83, 48, 52, 49, 128, 83, 48, 52, - 48, 128, 83, 48, 51, 57, 128, 83, 48, 51, 56, 128, 83, 48, 51, 55, 128, - 83, 48, 51, 54, 128, 83, 48, 51, 53, 65, 128, 83, 48, 51, 53, 128, 83, - 48, 51, 52, 128, 83, 48, 51, 51, 128, 83, 48, 51, 50, 128, 83, 48, 51, - 49, 128, 83, 48, 51, 48, 128, 83, 48, 50, 57, 128, 83, 48, 50, 56, 128, - 83, 48, 50, 55, 128, 83, 48, 50, 54, 66, 128, 83, 48, 50, 54, 65, 128, - 83, 48, 50, 54, 128, 83, 48, 50, 53, 128, 83, 48, 50, 52, 128, 83, 48, - 50, 51, 128, 83, 48, 50, 50, 128, 83, 48, 50, 49, 128, 83, 48, 50, 48, - 128, 83, 48, 49, 57, 128, 83, 48, 49, 56, 128, 83, 48, 49, 55, 65, 128, - 83, 48, 49, 55, 128, 83, 48, 49, 54, 128, 83, 48, 49, 53, 128, 83, 48, - 49, 52, 66, 128, 83, 48, 49, 52, 65, 128, 83, 48, 49, 52, 128, 83, 48, - 49, 51, 128, 83, 48, 49, 50, 128, 83, 48, 49, 49, 128, 83, 48, 49, 48, - 128, 83, 48, 48, 57, 128, 83, 48, 48, 56, 128, 83, 48, 48, 55, 128, 83, - 48, 48, 54, 65, 128, 83, 48, 48, 54, 128, 83, 48, 48, 53, 128, 83, 48, - 48, 52, 128, 83, 48, 48, 51, 128, 83, 48, 48, 50, 65, 128, 83, 48, 48, - 50, 128, 83, 48, 48, 49, 128, 83, 45, 87, 128, 83, 45, 83, 72, 65, 80, - 69, 196, 82, 89, 89, 128, 82, 89, 88, 128, 82, 89, 84, 128, 82, 89, 82, - 88, 128, 82, 89, 82, 128, 82, 89, 80, 128, 82, 87, 79, 79, 128, 82, 87, - 79, 128, 82, 87, 73, 73, 128, 82, 87, 73, 128, 82, 87, 69, 69, 128, 82, - 87, 69, 128, 82, 87, 65, 72, 65, 128, 82, 87, 65, 65, 128, 82, 87, 65, - 128, 82, 85, 88, 128, 82, 85, 85, 66, 85, 82, 85, 128, 82, 85, 85, 128, - 82, 85, 84, 128, 82, 85, 83, 73, 128, 82, 85, 82, 88, 128, 82, 85, 82, - 128, 82, 85, 80, 73, 73, 128, 82, 85, 80, 69, 197, 82, 85, 80, 128, 82, - 85, 79, 88, 128, 82, 85, 79, 80, 128, 82, 85, 79, 128, 82, 85, 78, 79, - 85, 84, 128, 82, 85, 78, 78, 73, 78, 199, 82, 85, 78, 78, 69, 82, 128, - 82, 85, 78, 128, 82, 85, 77, 201, 82, 85, 77, 65, 201, 82, 85, 77, 128, - 82, 85, 205, 82, 85, 76, 69, 82, 128, 82, 85, 76, 69, 45, 68, 69, 76, 65, - 89, 69, 68, 128, 82, 85, 76, 69, 128, 82, 85, 76, 65, 73, 128, 82, 85, - 75, 75, 65, 75, 72, 65, 128, 82, 85, 73, 83, 128, 82, 85, 71, 66, 217, - 82, 85, 68, 73, 77, 69, 78, 84, 193, 82, 85, 66, 76, 197, 82, 85, 194, - 82, 85, 65, 128, 82, 84, 72, 65, 78, 199, 82, 84, 65, 71, 83, 128, 82, - 84, 65, 71, 211, 82, 82, 89, 88, 128, 82, 82, 89, 84, 128, 82, 82, 89, - 82, 88, 128, 82, 82, 89, 82, 128, 82, 82, 89, 80, 128, 82, 82, 85, 88, - 128, 82, 82, 85, 85, 128, 82, 82, 85, 84, 128, 82, 82, 85, 82, 88, 128, - 82, 82, 85, 82, 128, 82, 82, 85, 80, 128, 82, 82, 85, 79, 88, 128, 82, - 82, 85, 79, 128, 82, 82, 85, 128, 82, 82, 82, 65, 128, 82, 82, 79, 88, - 128, 82, 82, 79, 84, 128, 82, 82, 79, 80, 128, 82, 82, 79, 79, 128, 82, - 82, 79, 128, 82, 82, 73, 73, 128, 82, 82, 73, 128, 82, 82, 69, 88, 128, - 82, 82, 69, 84, 128, 82, 82, 69, 80, 128, 82, 82, 69, 72, 128, 82, 82, - 69, 200, 82, 82, 69, 69, 128, 82, 82, 69, 128, 82, 82, 65, 88, 128, 82, - 82, 65, 85, 128, 82, 82, 65, 73, 128, 82, 82, 65, 65, 128, 82, 79, 87, - 66, 79, 65, 84, 128, 82, 79, 85, 78, 68, 69, 196, 82, 79, 85, 78, 68, 45, - 84, 73, 80, 80, 69, 196, 82, 79, 84, 85, 78, 68, 65, 128, 82, 79, 84, 65, - 84, 73, 79, 78, 83, 128, 82, 79, 84, 65, 84, 73, 79, 78, 45, 87, 65, 76, - 76, 80, 76, 65, 78, 197, 82, 79, 84, 65, 84, 73, 79, 78, 45, 70, 76, 79, - 79, 82, 80, 76, 65, 78, 197, 82, 79, 84, 65, 84, 73, 79, 78, 128, 82, 79, - 84, 65, 84, 73, 79, 206, 82, 79, 84, 65, 84, 69, 196, 82, 79, 83, 72, - 128, 82, 79, 83, 69, 84, 84, 69, 128, 82, 79, 83, 69, 128, 82, 79, 79, - 84, 128, 82, 79, 79, 83, 84, 69, 82, 128, 82, 79, 79, 75, 128, 82, 79, - 79, 70, 128, 82, 79, 77, 65, 78, 73, 65, 206, 82, 79, 77, 65, 206, 82, - 79, 77, 128, 82, 79, 76, 76, 73, 78, 199, 82, 79, 76, 76, 69, 210, 82, - 79, 76, 76, 69, 68, 45, 85, 208, 82, 79, 72, 73, 78, 71, 89, 193, 82, 79, - 71, 128, 82, 79, 196, 82, 79, 67, 75, 69, 84, 128, 82, 79, 67, 203, 82, - 79, 67, 128, 82, 79, 66, 79, 212, 82, 79, 66, 65, 84, 128, 82, 79, 65, - 83, 84, 69, 196, 82, 79, 65, 82, 128, 82, 79, 65, 128, 82, 78, 89, 73, - 78, 199, 82, 78, 79, 79, 78, 128, 82, 78, 79, 79, 206, 82, 78, 65, 205, - 82, 77, 84, 128, 82, 76, 79, 128, 82, 76, 77, 128, 82, 76, 73, 128, 82, - 76, 69, 128, 82, 74, 69, 211, 82, 74, 69, 128, 82, 74, 197, 82, 73, 86, - 69, 82, 128, 82, 73, 84, 85, 65, 76, 128, 82, 73, 84, 84, 79, 82, 85, - 128, 82, 73, 84, 83, 73, 128, 82, 73, 83, 73, 78, 199, 82, 73, 83, 72, - 128, 82, 73, 82, 65, 128, 82, 73, 80, 80, 76, 197, 82, 73, 80, 128, 82, - 73, 78, 71, 211, 82, 73, 78, 71, 73, 78, 199, 82, 73, 78, 70, 79, 82, 90, - 65, 78, 68, 79, 128, 82, 73, 206, 82, 73, 77, 71, 66, 65, 128, 82, 73, - 77, 128, 82, 73, 75, 82, 73, 75, 128, 82, 73, 71, 86, 69, 68, 73, 195, - 82, 73, 71, 72, 84, 87, 65, 82, 68, 83, 128, 82, 73, 71, 72, 84, 72, 65, - 78, 196, 82, 73, 71, 72, 84, 45, 84, 79, 45, 76, 69, 70, 212, 82, 73, 71, - 72, 84, 45, 83, 73, 68, 197, 82, 73, 71, 72, 84, 45, 83, 72, 65, 68, 79, - 87, 69, 196, 82, 73, 71, 72, 84, 45, 83, 72, 65, 68, 69, 196, 82, 73, 71, - 72, 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, 82, 73, 71, 72, 84, 45, 76, - 73, 71, 72, 84, 69, 196, 82, 73, 71, 72, 84, 45, 72, 65, 78, 68, 69, 196, - 82, 73, 71, 72, 84, 45, 72, 65, 78, 196, 82, 73, 71, 72, 84, 45, 70, 65, - 67, 73, 78, 199, 82, 73, 71, 72, 84, 128, 82, 73, 69, 85, 76, 45, 89, 69, - 83, 73, 69, 85, 78, 71, 128, 82, 73, 69, 85, 76, 45, 89, 69, 79, 82, 73, - 78, 72, 73, 69, 85, 72, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, - 45, 89, 69, 79, 82, 73, 78, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, - 45, 84, 73, 75, 69, 85, 84, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, - 76, 45, 84, 73, 75, 69, 85, 84, 128, 82, 73, 69, 85, 76, 45, 84, 72, 73, - 69, 85, 84, 72, 128, 82, 73, 69, 85, 76, 45, 83, 83, 65, 78, 71, 84, 73, - 75, 69, 85, 84, 128, 82, 73, 69, 85, 76, 45, 83, 83, 65, 78, 71, 83, 73, - 79, 83, 128, 82, 73, 69, 85, 76, 45, 83, 83, 65, 78, 71, 80, 73, 69, 85, - 80, 128, 82, 73, 69, 85, 76, 45, 83, 83, 65, 78, 71, 75, 73, 89, 69, 79, - 75, 128, 82, 73, 69, 85, 76, 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, - 45, 80, 73, 69, 85, 80, 45, 84, 73, 75, 69, 85, 84, 128, 82, 73, 69, 85, - 76, 45, 80, 73, 69, 85, 80, 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, - 45, 80, 73, 69, 85, 80, 45, 80, 72, 73, 69, 85, 80, 72, 128, 82, 73, 69, - 85, 76, 45, 80, 73, 69, 85, 80, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, - 85, 76, 45, 80, 73, 69, 85, 80, 128, 82, 73, 69, 85, 76, 45, 80, 72, 73, - 69, 85, 80, 72, 128, 82, 73, 69, 85, 76, 45, 80, 65, 78, 83, 73, 79, 83, - 128, 82, 73, 69, 85, 76, 45, 78, 73, 69, 85, 78, 128, 82, 73, 69, 85, 76, - 45, 77, 73, 69, 85, 77, 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, - 77, 73, 69, 85, 77, 45, 75, 73, 89, 69, 79, 75, 128, 82, 73, 69, 85, 76, - 45, 77, 73, 69, 85, 77, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, - 45, 77, 73, 69, 85, 77, 128, 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, 79, - 75, 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, 79, - 75, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, - 79, 75, 128, 82, 73, 69, 85, 76, 45, 75, 65, 80, 89, 69, 79, 85, 78, 80, - 73, 69, 85, 80, 128, 82, 73, 69, 85, 76, 45, 72, 73, 69, 85, 72, 128, 82, - 73, 69, 85, 76, 45, 67, 73, 69, 85, 67, 128, 82, 73, 69, 85, 204, 82, 73, - 69, 76, 128, 82, 73, 69, 69, 128, 82, 73, 67, 69, 77, 128, 82, 73, 67, - 69, 128, 82, 73, 67, 197, 82, 73, 66, 66, 79, 78, 128, 82, 73, 66, 66, - 79, 206, 82, 73, 65, 204, 82, 72, 79, 84, 73, 195, 82, 72, 79, 128, 82, - 72, 207, 82, 72, 65, 128, 82, 72, 128, 82, 71, 89, 73, 78, 71, 83, 128, - 82, 71, 89, 65, 78, 128, 82, 71, 89, 193, 82, 69, 86, 79, 76, 86, 73, 78, - 199, 82, 69, 86, 79, 76, 85, 84, 73, 79, 78, 128, 82, 69, 86, 77, 65, - 128, 82, 69, 86, 73, 65, 128, 82, 69, 86, 69, 82, 83, 69, 68, 45, 83, 67, - 72, 87, 65, 128, 82, 69, 86, 69, 82, 83, 69, 68, 128, 82, 69, 86, 69, 82, - 83, 69, 196, 82, 69, 86, 69, 82, 83, 197, 82, 69, 85, 88, 128, 82, 69, - 85, 128, 82, 69, 84, 85, 82, 78, 128, 82, 69, 84, 85, 82, 206, 82, 69, - 84, 82, 79, 70, 76, 69, 216, 82, 69, 84, 82, 69, 65, 84, 128, 82, 69, 84, - 79, 82, 84, 128, 82, 69, 83, 85, 80, 73, 78, 85, 83, 128, 82, 69, 83, 84, - 82, 79, 79, 77, 128, 82, 69, 83, 84, 82, 73, 67, 84, 69, 196, 82, 69, 83, - 84, 128, 82, 69, 83, 80, 79, 78, 83, 69, 128, 82, 69, 83, 79, 85, 82, 67, - 69, 128, 82, 69, 83, 79, 76, 85, 84, 73, 79, 78, 128, 82, 69, 83, 73, 83, - 84, 65, 78, 67, 69, 128, 82, 69, 83, 73, 68, 69, 78, 67, 69, 128, 82, 69, - 83, 200, 82, 69, 82, 69, 78, 71, 71, 65, 78, 128, 82, 69, 82, 69, 75, 65, - 78, 128, 82, 69, 80, 82, 69, 83, 69, 78, 84, 128, 82, 69, 80, 76, 65, 67, - 69, 77, 69, 78, 212, 82, 69, 80, 72, 128, 82, 69, 80, 69, 84, 73, 84, 73, - 79, 206, 82, 69, 80, 69, 65, 84, 69, 196, 82, 69, 80, 69, 65, 84, 128, - 82, 69, 80, 69, 65, 212, 82, 69, 80, 65, 89, 65, 128, 82, 69, 80, 65, - 128, 82, 69, 80, 193, 82, 69, 78, 84, 79, 71, 69, 78, 128, 82, 69, 78, - 128, 82, 69, 206, 82, 69, 77, 85, 128, 82, 69, 77, 73, 78, 68, 69, 210, - 82, 69, 77, 69, 68, 89, 128, 82, 69, 76, 73, 71, 73, 79, 78, 128, 82, 69, - 76, 73, 69, 86, 69, 196, 82, 69, 76, 69, 65, 83, 69, 128, 82, 69, 76, 65, - 88, 69, 68, 128, 82, 69, 76, 65, 84, 73, 79, 78, 65, 204, 82, 69, 76, 65, - 84, 73, 79, 78, 128, 82, 69, 76, 65, 65, 128, 82, 69, 74, 65, 78, 199, - 82, 69, 73, 196, 82, 69, 73, 128, 82, 69, 71, 85, 76, 85, 83, 45, 52, - 128, 82, 69, 71, 85, 76, 85, 83, 45, 51, 128, 82, 69, 71, 85, 76, 85, 83, - 45, 50, 128, 82, 69, 71, 85, 76, 85, 83, 128, 82, 69, 71, 85, 76, 85, - 211, 82, 69, 71, 73, 83, 84, 69, 82, 69, 196, 82, 69, 71, 73, 79, 78, 65, - 204, 82, 69, 71, 73, 65, 45, 50, 128, 82, 69, 71, 73, 65, 128, 82, 69, - 70, 79, 82, 77, 69, 196, 82, 69, 70, 69, 82, 69, 78, 67, 197, 82, 69, 68, - 85, 80, 76, 73, 67, 65, 84, 73, 79, 78, 128, 82, 69, 67, 89, 67, 76, 73, - 78, 199, 82, 69, 67, 89, 67, 76, 69, 196, 82, 69, 67, 84, 73, 76, 73, 78, - 69, 65, 210, 82, 69, 67, 84, 65, 78, 71, 85, 76, 65, 210, 82, 69, 67, 84, - 65, 78, 71, 76, 69, 128, 82, 69, 67, 84, 65, 78, 71, 76, 197, 82, 69, 67, - 82, 69, 65, 84, 73, 79, 78, 65, 204, 82, 69, 67, 79, 82, 68, 73, 78, 199, - 82, 69, 67, 79, 82, 68, 69, 82, 128, 82, 69, 67, 79, 82, 68, 128, 82, 69, - 67, 79, 82, 196, 82, 69, 67, 73, 84, 65, 84, 73, 86, 197, 82, 69, 67, 69, - 80, 84, 73, 86, 197, 82, 69, 67, 69, 73, 86, 69, 82, 128, 82, 69, 67, 69, - 73, 86, 69, 210, 82, 69, 65, 76, 71, 65, 82, 45, 50, 128, 82, 69, 65, 76, - 71, 65, 82, 128, 82, 69, 65, 72, 77, 85, 75, 128, 82, 69, 65, 67, 72, - 128, 82, 68, 207, 82, 68, 69, 204, 82, 66, 65, 83, 193, 82, 65, 89, 83, - 128, 82, 65, 89, 211, 82, 65, 89, 65, 78, 78, 65, 128, 82, 65, 84, 73, - 79, 128, 82, 65, 84, 72, 65, 128, 82, 65, 84, 72, 193, 82, 65, 84, 65, - 128, 82, 65, 84, 128, 82, 65, 83, 87, 65, 68, 73, 128, 82, 65, 83, 79, - 85, 204, 82, 65, 83, 72, 65, 128, 82, 65, 81, 128, 82, 65, 80, 73, 83, - 77, 65, 128, 82, 65, 78, 71, 197, 82, 65, 78, 65, 128, 82, 65, 78, 128, - 82, 65, 77, 211, 82, 65, 77, 66, 65, 84, 128, 82, 65, 75, 72, 65, 78, 71, - 128, 82, 65, 75, 65, 65, 82, 65, 65, 78, 83, 65, 89, 65, 128, 82, 65, 73, - 83, 73, 78, 199, 82, 65, 73, 83, 69, 196, 82, 65, 73, 78, 66, 79, 87, - 128, 82, 65, 73, 76, 87, 65, 89, 128, 82, 65, 73, 76, 87, 65, 217, 82, - 65, 73, 76, 128, 82, 65, 73, 68, 207, 82, 65, 73, 68, 65, 128, 82, 65, - 72, 77, 65, 84, 85, 76, 76, 65, 200, 82, 65, 72, 128, 82, 65, 70, 69, - 128, 82, 65, 69, 77, 128, 82, 65, 68, 73, 79, 65, 67, 84, 73, 86, 197, - 82, 65, 68, 73, 79, 128, 82, 65, 68, 73, 207, 82, 65, 68, 201, 82, 65, - 68, 128, 82, 65, 196, 82, 65, 67, 81, 85, 69, 212, 82, 65, 67, 73, 78, - 71, 128, 82, 65, 67, 73, 78, 199, 82, 65, 66, 66, 73, 84, 128, 82, 65, - 66, 66, 73, 212, 82, 65, 66, 128, 82, 65, 65, 73, 128, 82, 65, 51, 128, - 82, 65, 50, 128, 82, 65, 45, 50, 128, 82, 48, 50, 57, 128, 82, 48, 50, - 56, 128, 82, 48, 50, 55, 128, 82, 48, 50, 54, 128, 82, 48, 50, 53, 128, - 82, 48, 50, 52, 128, 82, 48, 50, 51, 128, 82, 48, 50, 50, 128, 82, 48, - 50, 49, 128, 82, 48, 50, 48, 128, 82, 48, 49, 57, 128, 82, 48, 49, 56, - 128, 82, 48, 49, 55, 128, 82, 48, 49, 54, 65, 128, 82, 48, 49, 54, 128, - 82, 48, 49, 53, 128, 82, 48, 49, 52, 128, 82, 48, 49, 51, 128, 82, 48, - 49, 50, 128, 82, 48, 49, 49, 128, 82, 48, 49, 48, 65, 128, 82, 48, 49, - 48, 128, 82, 48, 48, 57, 128, 82, 48, 48, 56, 128, 82, 48, 48, 55, 128, - 82, 48, 48, 54, 128, 82, 48, 48, 53, 128, 82, 48, 48, 52, 128, 82, 48, - 48, 51, 66, 128, 82, 48, 48, 51, 65, 128, 82, 48, 48, 51, 128, 82, 48, - 48, 50, 65, 128, 82, 48, 48, 50, 128, 82, 48, 48, 49, 128, 82, 45, 67, - 82, 69, 197, 81, 89, 88, 128, 81, 89, 85, 128, 81, 89, 84, 128, 81, 89, - 82, 88, 128, 81, 89, 82, 128, 81, 89, 80, 128, 81, 89, 79, 128, 81, 89, - 73, 128, 81, 89, 69, 69, 128, 81, 89, 69, 128, 81, 89, 65, 65, 128, 81, - 89, 65, 128, 81, 89, 128, 81, 87, 73, 128, 81, 87, 69, 69, 128, 81, 87, - 69, 128, 81, 87, 65, 65, 128, 81, 87, 65, 128, 81, 85, 88, 128, 81, 85, - 86, 128, 81, 85, 85, 86, 128, 81, 85, 85, 128, 81, 85, 84, 128, 81, 85, - 83, 72, 83, 72, 65, 89, 65, 128, 81, 85, 82, 88, 128, 81, 85, 82, 128, - 81, 85, 80, 128, 81, 85, 79, 88, 128, 81, 85, 79, 84, 197, 81, 85, 79, - 84, 65, 84, 73, 79, 206, 81, 85, 79, 84, 128, 81, 85, 79, 80, 128, 81, - 85, 79, 128, 81, 85, 75, 128, 81, 85, 73, 78, 84, 69, 83, 83, 69, 78, 67, - 69, 128, 81, 85, 73, 78, 68, 73, 67, 69, 83, 73, 77, 193, 81, 85, 73, 78, - 67, 85, 78, 88, 128, 81, 85, 73, 78, 65, 82, 73, 85, 211, 81, 85, 73, 76, - 212, 81, 85, 73, 76, 76, 128, 81, 85, 73, 67, 203, 81, 85, 73, 128, 81, - 85, 70, 128, 81, 85, 69, 83, 84, 73, 79, 78, 69, 196, 81, 85, 69, 83, 84, - 73, 79, 78, 128, 81, 85, 69, 83, 84, 73, 79, 206, 81, 85, 69, 69, 78, - 128, 81, 85, 69, 69, 206, 81, 85, 69, 128, 81, 85, 66, 85, 84, 83, 128, - 81, 85, 65, 84, 69, 82, 78, 73, 79, 206, 81, 85, 65, 82, 84, 69, 82, 83, - 128, 81, 85, 65, 82, 84, 69, 82, 211, 81, 85, 65, 82, 84, 69, 82, 128, - 81, 85, 65, 78, 84, 73, 84, 217, 81, 85, 65, 68, 82, 85, 80, 76, 197, 81, - 85, 65, 68, 82, 65, 78, 84, 128, 81, 85, 65, 68, 82, 65, 78, 212, 81, 85, - 65, 68, 67, 79, 76, 79, 78, 128, 81, 85, 65, 68, 128, 81, 85, 65, 196, - 81, 85, 65, 128, 81, 85, 128, 81, 208, 81, 79, 88, 128, 81, 79, 84, 128, - 81, 79, 80, 72, 128, 81, 79, 80, 65, 128, 81, 79, 80, 128, 81, 79, 79, - 128, 81, 79, 207, 81, 79, 70, 128, 81, 79, 198, 81, 79, 65, 128, 81, 79, - 128, 81, 78, 128, 81, 73, 88, 128, 81, 73, 84, 83, 65, 128, 81, 73, 84, - 128, 81, 73, 80, 128, 81, 73, 73, 128, 81, 73, 69, 88, 128, 81, 73, 69, - 84, 128, 81, 73, 69, 80, 128, 81, 73, 69, 128, 81, 73, 128, 81, 72, 87, - 73, 128, 81, 72, 87, 69, 69, 128, 81, 72, 87, 69, 128, 81, 72, 87, 65, - 65, 128, 81, 72, 87, 65, 128, 81, 72, 85, 128, 81, 72, 79, 80, 72, 128, - 81, 72, 79, 128, 81, 72, 73, 128, 81, 72, 69, 69, 128, 81, 72, 69, 128, - 81, 72, 65, 85, 128, 81, 72, 65, 65, 128, 81, 72, 65, 128, 81, 71, 65, - 128, 81, 69, 84, 65, 78, 65, 128, 81, 69, 69, 128, 81, 69, 128, 81, 65, - 89, 128, 81, 65, 85, 128, 81, 65, 84, 65, 78, 128, 81, 65, 82, 78, 69, - 217, 81, 65, 82, 128, 81, 65, 81, 128, 81, 65, 80, 72, 128, 81, 65, 77, - 65, 84, 83, 128, 81, 65, 77, 65, 84, 211, 81, 65, 76, 193, 81, 65, 73, - 82, 84, 72, 82, 65, 128, 81, 65, 73, 128, 81, 65, 70, 128, 81, 65, 198, - 81, 65, 68, 77, 65, 128, 81, 65, 65, 73, 128, 81, 65, 65, 70, 85, 128, - 81, 65, 65, 70, 128, 81, 48, 48, 55, 128, 81, 48, 48, 54, 128, 81, 48, - 48, 53, 128, 81, 48, 48, 52, 128, 81, 48, 48, 51, 128, 81, 48, 48, 50, - 128, 81, 48, 48, 49, 128, 80, 90, 128, 80, 89, 88, 128, 80, 89, 84, 128, - 80, 89, 82, 88, 128, 80, 89, 82, 128, 80, 89, 80, 128, 80, 87, 79, 89, - 128, 80, 87, 79, 79, 128, 80, 87, 79, 128, 80, 87, 207, 80, 87, 73, 73, - 128, 80, 87, 73, 128, 80, 87, 69, 69, 128, 80, 87, 69, 128, 80, 87, 65, - 65, 128, 80, 87, 128, 80, 86, 128, 80, 85, 88, 128, 80, 85, 85, 84, 128, - 80, 85, 85, 128, 80, 85, 84, 82, 69, 70, 65, 67, 84, 73, 79, 78, 128, 80, - 85, 84, 128, 80, 85, 212, 80, 85, 83, 72, 80, 73, 78, 128, 80, 85, 83, - 72, 80, 73, 75, 65, 128, 80, 85, 83, 72, 73, 78, 199, 80, 85, 82, 88, - 128, 80, 85, 82, 83, 69, 128, 80, 85, 82, 80, 76, 197, 80, 85, 82, 78, - 65, 77, 65, 128, 80, 85, 82, 73, 84, 89, 128, 80, 85, 82, 73, 70, 89, - 128, 80, 85, 82, 128, 80, 85, 81, 128, 80, 85, 80, 128, 80, 85, 79, 88, - 128, 80, 85, 79, 80, 128, 80, 85, 79, 128, 80, 85, 78, 71, 65, 65, 77, - 128, 80, 85, 78, 71, 128, 80, 85, 78, 67, 84, 85, 65, 84, 73, 79, 78, - 128, 80, 85, 78, 67, 84, 85, 65, 84, 73, 79, 206, 80, 85, 77, 80, 128, - 80, 85, 77, 128, 80, 85, 70, 70, 69, 68, 128, 80, 85, 69, 128, 80, 85, - 67, 75, 128, 80, 85, 66, 76, 73, 195, 80, 85, 194, 80, 85, 65, 81, 128, - 80, 85, 65, 69, 128, 80, 85, 50, 128, 80, 85, 49, 128, 80, 85, 128, 80, - 84, 72, 65, 72, 193, 80, 84, 69, 128, 80, 83, 73, 76, 201, 80, 83, 73, - 70, 73, 83, 84, 79, 83, 89, 78, 65, 71, 77, 65, 128, 80, 83, 73, 70, 73, - 83, 84, 79, 80, 65, 82, 65, 75, 65, 76, 69, 83, 77, 65, 128, 80, 83, 73, - 70, 73, 83, 84, 79, 206, 80, 83, 73, 70, 73, 83, 84, 79, 76, 89, 71, 73, - 83, 77, 65, 128, 80, 83, 73, 128, 80, 83, 65, 76, 84, 69, 210, 80, 83, - 128, 80, 82, 79, 86, 69, 128, 80, 82, 79, 84, 79, 86, 65, 82, 89, 211, - 80, 82, 79, 84, 79, 211, 80, 82, 79, 84, 69, 67, 84, 69, 196, 80, 82, 79, - 83, 71, 69, 71, 82, 65, 77, 77, 69, 78, 73, 128, 80, 82, 79, 80, 79, 82, - 84, 73, 79, 78, 65, 204, 80, 82, 79, 80, 79, 82, 84, 73, 79, 78, 128, 80, - 82, 79, 80, 69, 82, 84, 217, 80, 82, 79, 80, 69, 76, 76, 69, 210, 80, 82, - 79, 79, 70, 128, 80, 82, 79, 76, 79, 78, 71, 69, 196, 80, 82, 79, 76, 65, - 84, 73, 79, 78, 197, 80, 82, 79, 74, 69, 67, 84, 79, 82, 128, 80, 82, 79, - 74, 69, 67, 84, 73, 86, 69, 128, 80, 82, 79, 74, 69, 67, 84, 73, 79, 78, - 128, 80, 82, 79, 72, 73, 66, 73, 84, 69, 196, 80, 82, 79, 71, 82, 69, 83, - 83, 128, 80, 82, 79, 71, 82, 65, 205, 80, 82, 79, 70, 79, 85, 78, 68, - 128, 80, 82, 79, 68, 85, 67, 84, 128, 80, 82, 79, 68, 85, 67, 212, 80, - 82, 73, 86, 65, 84, 69, 128, 80, 82, 73, 86, 65, 84, 197, 80, 82, 73, 86, - 65, 67, 217, 80, 82, 73, 83, 72, 84, 72, 65, 77, 65, 84, 82, 193, 80, 82, - 73, 78, 84, 83, 128, 80, 82, 73, 78, 84, 69, 82, 128, 80, 82, 73, 78, 84, - 69, 210, 80, 82, 73, 78, 84, 128, 80, 82, 73, 78, 212, 80, 82, 73, 78, - 67, 69, 83, 83, 128, 80, 82, 73, 77, 69, 128, 80, 82, 73, 77, 197, 80, - 82, 69, 86, 73, 79, 85, 211, 80, 82, 69, 83, 83, 69, 196, 80, 82, 69, 83, - 69, 84, 128, 80, 82, 69, 83, 69, 78, 84, 65, 84, 73, 79, 206, 80, 82, 69, - 83, 67, 82, 73, 80, 84, 73, 79, 206, 80, 82, 69, 80, 79, 78, 68, 69, 82, - 65, 78, 67, 69, 128, 80, 82, 69, 78, 75, 72, 65, 128, 80, 82, 69, 70, 65, - 67, 197, 80, 82, 69, 67, 73, 80, 73, 84, 65, 84, 69, 128, 80, 82, 69, 67, - 69, 68, 73, 78, 199, 80, 82, 69, 67, 69, 68, 69, 83, 128, 80, 82, 69, 67, - 69, 68, 69, 211, 80, 82, 69, 67, 69, 68, 69, 196, 80, 82, 69, 67, 69, 68, - 69, 128, 80, 82, 69, 67, 69, 68, 197, 80, 82, 65, 89, 69, 210, 80, 82, - 65, 77, 45, 80, 73, 73, 128, 80, 82, 65, 77, 45, 80, 73, 201, 80, 82, 65, - 77, 45, 77, 85, 79, 89, 128, 80, 82, 65, 77, 45, 77, 85, 79, 217, 80, 82, - 65, 77, 45, 66, 85, 79, 78, 128, 80, 82, 65, 77, 45, 66, 85, 79, 206, 80, - 82, 65, 77, 45, 66, 69, 73, 128, 80, 82, 65, 77, 45, 66, 69, 201, 80, 82, - 65, 77, 128, 80, 82, 65, 205, 80, 82, 128, 80, 80, 86, 128, 80, 80, 77, - 128, 80, 80, 65, 128, 80, 79, 89, 128, 80, 79, 88, 128, 80, 79, 87, 69, - 82, 211, 80, 79, 87, 69, 82, 128, 80, 79, 87, 68, 69, 82, 69, 196, 80, - 79, 87, 68, 69, 82, 128, 80, 79, 85, 78, 196, 80, 79, 85, 76, 84, 82, - 217, 80, 79, 85, 67, 72, 128, 80, 79, 84, 65, 84, 79, 128, 80, 79, 84, - 65, 66, 76, 197, 80, 79, 212, 80, 79, 83, 84, 80, 79, 83, 73, 84, 73, 79, - 206, 80, 79, 83, 84, 66, 79, 88, 128, 80, 79, 83, 84, 65, 204, 80, 79, - 83, 84, 128, 80, 79, 83, 212, 80, 79, 83, 83, 69, 83, 83, 73, 79, 78, - 128, 80, 79, 83, 73, 84, 73, 79, 78, 83, 128, 80, 79, 82, 84, 65, 66, 76, - 197, 80, 79, 82, 82, 69, 67, 84, 85, 83, 128, 80, 79, 82, 82, 69, 67, 84, - 85, 211, 80, 79, 80, 80, 73, 78, 199, 80, 79, 80, 80, 69, 82, 128, 80, - 79, 80, 67, 79, 82, 78, 128, 80, 79, 80, 128, 80, 79, 208, 80, 79, 79, - 68, 76, 69, 128, 80, 79, 79, 128, 80, 79, 78, 68, 79, 128, 80, 79, 206, - 80, 79, 77, 77, 69, 69, 128, 80, 79, 77, 77, 69, 197, 80, 79, 76, 73, 83, + 72, 65, 82, 80, 128, 83, 72, 65, 82, 208, 83, 72, 65, 82, 75, 128, 83, + 72, 65, 82, 65, 128, 83, 72, 65, 82, 50, 128, 83, 72, 65, 82, 178, 83, + 72, 65, 80, 73, 78, 71, 128, 83, 72, 65, 80, 69, 83, 128, 83, 72, 65, 80, + 197, 83, 72, 65, 80, 128, 83, 72, 65, 78, 71, 128, 83, 72, 65, 78, 128, + 83, 72, 65, 206, 83, 72, 65, 77, 82, 79, 67, 75, 128, 83, 72, 65, 76, 83, + 72, 69, 76, 69, 84, 128, 83, 72, 65, 76, 76, 79, 215, 83, 72, 65, 75, 84, + 73, 128, 83, 72, 65, 75, 73, 78, 71, 128, 83, 72, 65, 75, 73, 78, 199, + 83, 72, 65, 75, 128, 83, 72, 65, 73, 128, 83, 72, 65, 70, 84, 128, 83, + 72, 65, 70, 212, 83, 72, 65, 68, 79, 87, 69, 196, 83, 72, 65, 68, 69, + 196, 83, 72, 65, 68, 69, 128, 83, 72, 65, 68, 68, 65, 128, 83, 72, 65, + 68, 68, 193, 83, 72, 65, 68, 128, 83, 72, 65, 196, 83, 72, 65, 66, 54, + 128, 83, 72, 65, 65, 128, 83, 72, 65, 54, 128, 83, 72, 65, 182, 83, 72, + 65, 51, 128, 83, 72, 65, 179, 83, 71, 82, 193, 83, 71, 79, 210, 83, 71, + 67, 128, 83, 71, 65, 215, 83, 71, 65, 194, 83, 71, 128, 83, 69, 89, 75, + 128, 83, 69, 88, 84, 85, 76, 193, 83, 69, 88, 84, 73, 76, 69, 128, 83, + 69, 88, 84, 65, 78, 211, 83, 69, 86, 69, 82, 65, 78, 67, 69, 128, 83, 69, + 86, 69, 78, 84, 89, 128, 83, 69, 86, 69, 78, 84, 217, 83, 69, 86, 69, 78, + 84, 72, 128, 83, 69, 86, 69, 78, 84, 69, 69, 78, 128, 83, 69, 86, 69, 78, + 84, 69, 69, 206, 83, 69, 86, 69, 78, 45, 84, 72, 73, 82, 84, 89, 128, 83, + 69, 86, 69, 206, 83, 69, 85, 88, 128, 83, 69, 85, 78, 89, 65, 77, 128, + 83, 69, 85, 65, 69, 81, 128, 83, 69, 84, 70, 79, 78, 128, 83, 69, 83, 84, + 69, 82, 84, 73, 85, 211, 83, 69, 83, 81, 85, 73, 81, 85, 65, 68, 82, 65, + 84, 69, 128, 83, 69, 83, 65, 77, 197, 83, 69, 82, 86, 73, 67, 197, 83, + 69, 82, 73, 70, 83, 128, 83, 69, 82, 73, 70, 211, 83, 69, 82, 73, 70, + 128, 83, 69, 81, 85, 69, 78, 84, 73, 65, 76, 128, 83, 69, 81, 85, 69, 78, + 67, 197, 83, 69, 80, 84, 85, 80, 76, 197, 83, 69, 80, 84, 69, 77, 66, 69, + 82, 128, 83, 69, 80, 65, 82, 65, 84, 79, 82, 128, 83, 69, 80, 65, 82, 65, + 84, 79, 210, 83, 69, 78, 84, 79, 128, 83, 69, 78, 84, 73, 128, 83, 69, + 77, 85, 78, 67, 73, 193, 83, 69, 77, 75, 65, 84, 72, 128, 83, 69, 77, 75, + 128, 83, 69, 77, 73, 86, 79, 87, 69, 204, 83, 69, 77, 73, 83, 79, 70, + 212, 83, 69, 77, 73, 83, 69, 88, 84, 73, 76, 69, 128, 83, 69, 77, 73, 77, + 73, 78, 73, 77, 193, 83, 69, 77, 73, 68, 73, 82, 69, 67, 212, 83, 69, 77, + 73, 67, 79, 76, 79, 78, 128, 83, 69, 77, 73, 67, 79, 76, 79, 206, 83, 69, + 77, 73, 67, 73, 82, 67, 85, 76, 65, 210, 83, 69, 77, 73, 67, 73, 82, 67, + 76, 197, 83, 69, 77, 73, 66, 82, 69, 86, 73, 211, 83, 69, 77, 73, 45, 86, + 79, 73, 67, 69, 196, 83, 69, 76, 70, 73, 69, 128, 83, 69, 76, 70, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 57, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 57, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 55, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 54, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 57, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 52, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 51, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 57, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 49, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 57, 48, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 57, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 56, 56, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 56, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 54, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 56, 53, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 56, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 51, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 56, 50, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 56, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 56, 48, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 55, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 56, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 55, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 55, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 53, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 55, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 55, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 50, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 55, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 55, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 55, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 54, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 54, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 55, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 54, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 54, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 52, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 54, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 54, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 54, 49, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 54, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 57, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 53, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, + 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 54, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 53, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, + 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 51, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 53, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, + 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 53, 48, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 57, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 56, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 52, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 54, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 53, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 52, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 51, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 50, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 52, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 48, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 52, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 51, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 56, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 55, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 51, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 53, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 52, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 51, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 50, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 49, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 51, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 51, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 57, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 50, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 55, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 54, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 50, 53, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 53, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 52, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 50, 53, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 50, 53, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 49, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 53, 48, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 50, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 57, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 56, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 50, 52, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 50, 52, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 53, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 52, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 50, 52, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, + 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 52, 49, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 50, 52, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 50, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 57, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 56, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 50, 51, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, + 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 53, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 50, 51, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 50, 51, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 50, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 51, 49, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 50, 51, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, + 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 57, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 50, 50, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 50, 50, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 54, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 53, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 50, 50, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, + 50, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 50, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 50, 50, 49, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 50, 50, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 50, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 57, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 50, 49, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, + 49, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 54, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 50, 49, 53, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 50, 49, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 51, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 50, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 50, 49, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 50, 49, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 49, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 50, 48, 57, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 50, 48, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 55, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 54, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 50, 48, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 50, 48, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 51, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 50, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 50, 48, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, + 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 50, 48, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, + 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 56, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 57, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 57, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 53, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 52, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 57, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 57, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 57, 49, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 57, 48, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 57, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 56, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 56, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 56, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 53, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 56, 52, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 56, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 50, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 56, 49, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 49, 56, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 57, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 55, 56, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 55, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 54, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 53, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 49, 55, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 55, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 50, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, 49, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 49, 55, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 55, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 57, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 49, 54, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 54, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 54, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 53, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 49, 54, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, + 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 50, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 54, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 54, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 54, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 57, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 49, 53, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, + 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 54, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 53, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 53, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 51, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 50, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 53, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 53, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 53, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 52, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 52, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 55, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 54, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 52, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 52, 52, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 51, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 52, 50, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 52, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 48, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 52, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 51, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 51, 56, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 55, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 51, 54, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 51, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 52, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 51, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 49, 51, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 51, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 48, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 51, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 50, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 56, + 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 55, 128, 83, 69, 76, 69, + 67, 84, 79, 82, 45, 49, 50, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 50, 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 52, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 51, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 49, 50, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, + 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 50, 48, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, + 49, 49, 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 56, 128, 83, + 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 55, 128, 83, 69, 76, 69, 67, 84, + 79, 82, 45, 49, 49, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, + 53, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 52, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 49, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 49, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 49, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 49, 48, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 49, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, + 57, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 56, 128, 83, 69, 76, + 69, 67, 84, 79, 82, 45, 49, 48, 55, 128, 83, 69, 76, 69, 67, 84, 79, 82, + 45, 49, 48, 54, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 53, 128, + 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 52, 128, 83, 69, 76, 69, 67, + 84, 79, 82, 45, 49, 48, 51, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, + 48, 50, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 48, 49, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 45, 49, 48, 48, 128, 83, 69, 76, 69, 67, 84, 79, + 82, 45, 49, 48, 128, 83, 69, 76, 69, 67, 84, 79, 82, 45, 49, 128, 83, 69, + 76, 69, 67, 84, 79, 82, 128, 83, 69, 76, 69, 67, 84, 79, 210, 83, 69, 76, + 69, 67, 84, 69, 196, 83, 69, 73, 83, 77, 65, 128, 83, 69, 73, 83, 77, + 193, 83, 69, 72, 128, 83, 69, 71, 79, 76, 128, 83, 69, 71, 78, 79, 128, + 83, 69, 71, 77, 69, 78, 84, 128, 83, 69, 69, 86, 128, 83, 69, 69, 78, 85, + 128, 83, 69, 69, 78, 128, 83, 69, 69, 206, 83, 69, 69, 68, 76, 73, 78, + 71, 128, 83, 69, 69, 45, 78, 79, 45, 69, 86, 73, 204, 83, 69, 67, 84, 79, + 82, 128, 83, 69, 67, 84, 73, 79, 78, 128, 83, 69, 67, 84, 73, 79, 206, + 83, 69, 67, 82, 69, 84, 128, 83, 69, 67, 79, 78, 68, 128, 83, 69, 67, 65, + 78, 84, 128, 83, 69, 66, 65, 84, 66, 69, 73, 212, 83, 69, 65, 84, 128, + 83, 69, 65, 76, 128, 83, 69, 65, 71, 85, 76, 204, 83, 68, 79, 78, 199, + 83, 68, 128, 83, 67, 87, 65, 128, 83, 67, 82, 85, 80, 76, 69, 128, 83, + 67, 82, 79, 76, 76, 128, 83, 67, 82, 73, 80, 84, 128, 83, 67, 82, 69, 69, + 78, 128, 83, 67, 82, 69, 69, 206, 83, 67, 82, 69, 65, 77, 73, 78, 199, + 83, 67, 79, 82, 80, 73, 85, 83, 128, 83, 67, 79, 82, 80, 73, 79, 78, 128, + 83, 67, 79, 82, 69, 128, 83, 67, 79, 79, 84, 69, 82, 128, 83, 67, 73, 83, + 83, 79, 82, 83, 128, 83, 67, 73, 128, 83, 67, 72, 87, 65, 128, 83, 67, + 72, 87, 193, 83, 67, 72, 82, 79, 69, 68, 69, 82, 128, 83, 67, 72, 79, 79, + 76, 128, 83, 67, 72, 79, 79, 204, 83, 67, 72, 79, 76, 65, 82, 128, 83, + 67, 72, 69, 77, 193, 83, 67, 69, 80, 84, 69, 210, 83, 67, 65, 78, 68, 73, + 67, 85, 83, 128, 83, 67, 65, 78, 68, 73, 67, 85, 211, 83, 67, 65, 206, + 83, 67, 65, 76, 69, 83, 128, 83, 66, 85, 194, 83, 66, 82, 85, 204, 83, + 65, 89, 73, 83, 201, 83, 65, 89, 65, 78, 78, 65, 128, 83, 65, 89, 128, + 83, 65, 88, 79, 80, 72, 79, 78, 69, 128, 83, 65, 88, 73, 77, 65, 84, 65, + 128, 83, 65, 87, 65, 78, 128, 83, 65, 87, 128, 83, 65, 86, 79, 85, 82, + 73, 78, 199, 83, 65, 85, 82, 65, 83, 72, 84, 82, 193, 83, 65, 85, 73, 76, + 128, 83, 65, 84, 85, 82, 78, 128, 83, 65, 84, 75, 65, 65, 78, 75, 85, 85, + 128, 83, 65, 84, 75, 65, 65, 78, 128, 83, 65, 84, 69, 76, 76, 73, 84, 69, + 128, 83, 65, 84, 69, 76, 76, 73, 84, 197, 83, 65, 84, 67, 72, 69, 76, + 128, 83, 65, 84, 65, 78, 71, 65, 128, 83, 65, 83, 72, 128, 83, 65, 83, + 65, 75, 128, 83, 65, 82, 73, 128, 83, 65, 82, 193, 83, 65, 82, 128, 83, + 65, 81, 128, 83, 65, 80, 65, 128, 83, 65, 78, 89, 79, 79, 71, 193, 83, + 65, 78, 89, 65, 75, 193, 83, 65, 78, 84, 73, 73, 77, 85, 128, 83, 65, 78, + 78, 89, 65, 128, 83, 65, 78, 71, 65, 50, 128, 83, 65, 78, 68, 72, 201, + 83, 65, 78, 68, 65, 76, 128, 83, 65, 78, 65, 72, 128, 83, 65, 78, 128, + 83, 65, 77, 89, 79, 203, 83, 65, 77, 86, 65, 84, 128, 83, 65, 77, 80, 73, + 128, 83, 65, 77, 80, 72, 65, 79, 128, 83, 65, 77, 75, 65, 128, 83, 65, + 77, 69, 75, 72, 128, 83, 65, 77, 69, 75, 200, 83, 65, 77, 66, 65, 128, + 83, 65, 77, 65, 82, 73, 84, 65, 206, 83, 65, 77, 128, 83, 65, 76, 84, 73, + 82, 69, 128, 83, 65, 76, 84, 73, 76, 76, 79, 128, 83, 65, 76, 84, 45, 50, + 128, 83, 65, 76, 84, 128, 83, 65, 76, 212, 83, 65, 76, 76, 65, 76, 76, + 65, 72, 79, 213, 83, 65, 76, 76, 193, 83, 65, 76, 65, 205, 83, 65, 76, + 65, 68, 128, 83, 65, 76, 65, 128, 83, 65, 76, 45, 65, 77, 77, 79, 78, 73, + 65, 67, 128, 83, 65, 76, 128, 83, 65, 75, 84, 65, 128, 83, 65, 75, 79, + 84, 128, 83, 65, 75, 72, 193, 83, 65, 75, 69, 85, 65, 69, 128, 83, 65, + 75, 197, 83, 65, 74, 68, 65, 72, 128, 83, 65, 73, 76, 66, 79, 65, 84, + 128, 83, 65, 73, 76, 128, 83, 65, 73, 75, 85, 82, 85, 128, 83, 65, 72, + 128, 83, 65, 71, 73, 84, 84, 65, 82, 73, 85, 83, 128, 83, 65, 71, 65, + 128, 83, 65, 71, 128, 83, 65, 199, 83, 65, 70, 72, 65, 128, 83, 65, 70, + 69, 84, 217, 83, 65, 68, 72, 69, 128, 83, 65, 68, 69, 128, 83, 65, 68, + 128, 83, 65, 196, 83, 65, 67, 82, 73, 70, 73, 67, 73, 65, 204, 83, 65, + 65, 73, 128, 83, 65, 65, 68, 72, 85, 128, 83, 65, 45, 73, 128, 83, 65, + 45, 50, 128, 83, 48, 52, 54, 128, 83, 48, 52, 53, 128, 83, 48, 52, 52, + 128, 83, 48, 52, 51, 128, 83, 48, 52, 50, 128, 83, 48, 52, 49, 128, 83, + 48, 52, 48, 128, 83, 48, 51, 57, 128, 83, 48, 51, 56, 128, 83, 48, 51, + 55, 128, 83, 48, 51, 54, 128, 83, 48, 51, 53, 65, 128, 83, 48, 51, 53, + 128, 83, 48, 51, 52, 128, 83, 48, 51, 51, 128, 83, 48, 51, 50, 128, 83, + 48, 51, 49, 128, 83, 48, 51, 48, 128, 83, 48, 50, 57, 128, 83, 48, 50, + 56, 128, 83, 48, 50, 55, 128, 83, 48, 50, 54, 66, 128, 83, 48, 50, 54, + 65, 128, 83, 48, 50, 54, 128, 83, 48, 50, 53, 128, 83, 48, 50, 52, 128, + 83, 48, 50, 51, 128, 83, 48, 50, 50, 128, 83, 48, 50, 49, 128, 83, 48, + 50, 48, 128, 83, 48, 49, 57, 128, 83, 48, 49, 56, 128, 83, 48, 49, 55, + 65, 128, 83, 48, 49, 55, 128, 83, 48, 49, 54, 128, 83, 48, 49, 53, 128, + 83, 48, 49, 52, 66, 128, 83, 48, 49, 52, 65, 128, 83, 48, 49, 52, 128, + 83, 48, 49, 51, 128, 83, 48, 49, 50, 128, 83, 48, 49, 49, 128, 83, 48, + 49, 48, 128, 83, 48, 48, 57, 128, 83, 48, 48, 56, 128, 83, 48, 48, 55, + 128, 83, 48, 48, 54, 65, 128, 83, 48, 48, 54, 128, 83, 48, 48, 53, 128, + 83, 48, 48, 52, 128, 83, 48, 48, 51, 128, 83, 48, 48, 50, 65, 128, 83, + 48, 48, 50, 128, 83, 48, 48, 49, 128, 83, 45, 87, 128, 83, 45, 83, 72, + 65, 80, 69, 196, 82, 89, 89, 128, 82, 89, 88, 128, 82, 89, 84, 128, 82, + 89, 82, 88, 128, 82, 89, 82, 128, 82, 89, 80, 128, 82, 87, 79, 79, 128, + 82, 87, 79, 128, 82, 87, 73, 73, 128, 82, 87, 73, 128, 82, 87, 69, 69, + 128, 82, 87, 69, 128, 82, 87, 65, 72, 65, 128, 82, 87, 65, 65, 128, 82, + 87, 65, 128, 82, 85, 88, 128, 82, 85, 85, 66, 85, 82, 85, 128, 82, 85, + 85, 128, 82, 85, 84, 128, 82, 85, 83, 73, 128, 82, 85, 82, 88, 128, 82, + 85, 82, 128, 82, 85, 80, 73, 73, 128, 82, 85, 80, 69, 197, 82, 85, 80, + 128, 82, 85, 79, 88, 128, 82, 85, 79, 80, 128, 82, 85, 79, 128, 82, 85, + 78, 79, 85, 84, 128, 82, 85, 78, 78, 73, 78, 199, 82, 85, 78, 78, 69, 82, + 128, 82, 85, 78, 73, 195, 82, 85, 78, 128, 82, 85, 77, 201, 82, 85, 77, + 65, 201, 82, 85, 77, 128, 82, 85, 205, 82, 85, 76, 69, 82, 128, 82, 85, + 76, 69, 45, 68, 69, 76, 65, 89, 69, 68, 128, 82, 85, 76, 69, 128, 82, 85, + 76, 65, 73, 128, 82, 85, 75, 75, 65, 75, 72, 65, 128, 82, 85, 73, 83, + 128, 82, 85, 71, 66, 217, 82, 85, 68, 73, 77, 69, 78, 84, 193, 82, 85, + 66, 76, 197, 82, 85, 194, 82, 85, 65, 128, 82, 84, 72, 65, 78, 199, 82, + 84, 65, 71, 83, 128, 82, 84, 65, 71, 211, 82, 82, 89, 88, 128, 82, 82, + 89, 84, 128, 82, 82, 89, 82, 88, 128, 82, 82, 89, 82, 128, 82, 82, 89, + 80, 128, 82, 82, 85, 88, 128, 82, 82, 85, 85, 128, 82, 82, 85, 84, 128, + 82, 82, 85, 82, 88, 128, 82, 82, 85, 82, 128, 82, 82, 85, 80, 128, 82, + 82, 85, 79, 88, 128, 82, 82, 85, 79, 128, 82, 82, 85, 128, 82, 82, 82, + 65, 128, 82, 82, 79, 88, 128, 82, 82, 79, 84, 128, 82, 82, 79, 80, 128, + 82, 82, 79, 79, 128, 82, 82, 79, 128, 82, 82, 73, 73, 128, 82, 82, 73, + 128, 82, 82, 69, 88, 128, 82, 82, 69, 84, 128, 82, 82, 69, 80, 128, 82, + 82, 69, 72, 128, 82, 82, 69, 200, 82, 82, 69, 69, 128, 82, 82, 69, 128, + 82, 82, 65, 88, 128, 82, 82, 65, 85, 128, 82, 82, 65, 73, 128, 82, 82, + 65, 65, 128, 82, 79, 87, 66, 79, 65, 84, 128, 82, 79, 85, 78, 68, 69, + 196, 82, 79, 85, 78, 68, 45, 84, 73, 80, 80, 69, 196, 82, 79, 84, 85, 78, + 68, 65, 128, 82, 79, 84, 65, 84, 73, 79, 78, 83, 128, 82, 79, 84, 65, 84, + 73, 79, 78, 45, 87, 65, 76, 76, 80, 76, 65, 78, 197, 82, 79, 84, 65, 84, + 73, 79, 78, 45, 70, 76, 79, 79, 82, 80, 76, 65, 78, 197, 82, 79, 84, 65, + 84, 73, 79, 78, 128, 82, 79, 84, 65, 84, 73, 79, 206, 82, 79, 84, 65, 84, + 69, 196, 82, 79, 83, 72, 128, 82, 79, 83, 69, 84, 84, 69, 128, 82, 79, + 83, 69, 128, 82, 79, 79, 84, 128, 82, 79, 79, 83, 84, 69, 82, 128, 82, + 79, 79, 75, 128, 82, 79, 79, 70, 128, 82, 79, 77, 65, 78, 73, 65, 206, + 82, 79, 77, 65, 206, 82, 79, 77, 128, 82, 79, 76, 76, 73, 78, 199, 82, + 79, 76, 76, 69, 210, 82, 79, 76, 76, 69, 68, 45, 85, 208, 82, 79, 72, 73, + 78, 71, 89, 193, 82, 79, 71, 128, 82, 79, 196, 82, 79, 67, 75, 69, 84, + 128, 82, 79, 67, 203, 82, 79, 67, 128, 82, 79, 66, 79, 212, 82, 79, 66, + 65, 84, 128, 82, 79, 65, 83, 84, 69, 196, 82, 79, 65, 82, 128, 82, 79, + 65, 128, 82, 78, 89, 73, 78, 199, 82, 78, 79, 79, 78, 128, 82, 78, 79, + 79, 206, 82, 78, 65, 205, 82, 77, 84, 128, 82, 76, 79, 128, 82, 76, 77, + 128, 82, 76, 73, 128, 82, 76, 69, 128, 82, 74, 69, 211, 82, 74, 69, 128, + 82, 74, 197, 82, 73, 86, 69, 82, 128, 82, 73, 84, 85, 65, 76, 128, 82, + 73, 84, 84, 79, 82, 85, 128, 82, 73, 84, 83, 73, 128, 82, 73, 83, 73, 78, + 199, 82, 73, 83, 72, 128, 82, 73, 82, 65, 128, 82, 73, 80, 80, 76, 197, + 82, 73, 80, 128, 82, 73, 78, 71, 211, 82, 73, 78, 71, 73, 78, 199, 82, + 73, 78, 70, 79, 82, 90, 65, 78, 68, 79, 128, 82, 73, 206, 82, 73, 77, 71, + 66, 65, 128, 82, 73, 77, 128, 82, 73, 75, 82, 73, 75, 128, 82, 73, 71, + 86, 69, 68, 73, 195, 82, 73, 71, 72, 84, 87, 65, 82, 68, 83, 128, 82, 73, + 71, 72, 84, 72, 65, 78, 196, 82, 73, 71, 72, 84, 45, 84, 79, 45, 76, 69, + 70, 212, 82, 73, 71, 72, 84, 45, 83, 73, 68, 197, 82, 73, 71, 72, 84, 45, + 83, 72, 65, 68, 79, 87, 69, 196, 82, 73, 71, 72, 84, 45, 83, 72, 65, 68, + 69, 196, 82, 73, 71, 72, 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, 82, 73, + 71, 72, 84, 45, 76, 73, 71, 72, 84, 69, 196, 82, 73, 71, 72, 84, 45, 72, + 65, 78, 68, 69, 196, 82, 73, 71, 72, 84, 45, 72, 65, 78, 196, 82, 73, 71, + 72, 84, 45, 70, 65, 67, 73, 78, 199, 82, 73, 71, 72, 84, 128, 82, 73, 70, + 76, 69, 128, 82, 73, 69, 85, 76, 45, 89, 69, 83, 73, 69, 85, 78, 71, 128, + 82, 73, 69, 85, 76, 45, 89, 69, 79, 82, 73, 78, 72, 73, 69, 85, 72, 45, + 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 89, 69, 79, 82, 73, 78, + 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 84, 73, 75, 69, 85, 84, + 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 84, 73, 75, 69, 85, + 84, 128, 82, 73, 69, 85, 76, 45, 84, 72, 73, 69, 85, 84, 72, 128, 82, 73, + 69, 85, 76, 45, 83, 83, 65, 78, 71, 84, 73, 75, 69, 85, 84, 128, 82, 73, + 69, 85, 76, 45, 83, 83, 65, 78, 71, 83, 73, 79, 83, 128, 82, 73, 69, 85, + 76, 45, 83, 83, 65, 78, 71, 80, 73, 69, 85, 80, 128, 82, 73, 69, 85, 76, + 45, 83, 83, 65, 78, 71, 75, 73, 89, 69, 79, 75, 128, 82, 73, 69, 85, 76, + 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, 80, 73, 69, 85, 80, 45, + 84, 73, 75, 69, 85, 84, 128, 82, 73, 69, 85, 76, 45, 80, 73, 69, 85, 80, + 45, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, 80, 73, 69, 85, 80, 45, + 80, 72, 73, 69, 85, 80, 72, 128, 82, 73, 69, 85, 76, 45, 80, 73, 69, 85, + 80, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 80, 73, 69, 85, + 80, 128, 82, 73, 69, 85, 76, 45, 80, 72, 73, 69, 85, 80, 72, 128, 82, 73, + 69, 85, 76, 45, 80, 65, 78, 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, + 78, 73, 69, 85, 78, 128, 82, 73, 69, 85, 76, 45, 77, 73, 69, 85, 77, 45, + 83, 73, 79, 83, 128, 82, 73, 69, 85, 76, 45, 77, 73, 69, 85, 77, 45, 75, + 73, 89, 69, 79, 75, 128, 82, 73, 69, 85, 76, 45, 77, 73, 69, 85, 77, 45, + 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 77, 73, 69, 85, 77, 128, + 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, 79, 75, 45, 83, 73, 79, 83, 128, + 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, 79, 75, 45, 72, 73, 69, 85, 72, + 128, 82, 73, 69, 85, 76, 45, 75, 73, 89, 69, 79, 75, 128, 82, 73, 69, 85, + 76, 45, 75, 65, 80, 89, 69, 79, 85, 78, 80, 73, 69, 85, 80, 128, 82, 73, + 69, 85, 76, 45, 72, 73, 69, 85, 72, 128, 82, 73, 69, 85, 76, 45, 67, 73, + 69, 85, 67, 128, 82, 73, 69, 85, 204, 82, 73, 69, 76, 128, 82, 73, 69, + 69, 128, 82, 73, 67, 69, 77, 128, 82, 73, 67, 69, 128, 82, 73, 67, 197, + 82, 73, 66, 66, 79, 78, 128, 82, 73, 66, 66, 79, 206, 82, 73, 65, 204, + 82, 72, 79, 84, 73, 195, 82, 72, 79, 128, 82, 72, 207, 82, 72, 73, 78, + 79, 67, 69, 82, 79, 83, 128, 82, 72, 65, 128, 82, 72, 128, 82, 71, 89, + 73, 78, 71, 83, 128, 82, 71, 89, 65, 78, 128, 82, 71, 89, 193, 82, 69, + 86, 79, 76, 86, 73, 78, 199, 82, 69, 86, 79, 76, 85, 84, 73, 79, 78, 128, + 82, 69, 86, 77, 65, 128, 82, 69, 86, 73, 65, 128, 82, 69, 86, 69, 82, 83, + 69, 68, 45, 83, 67, 72, 87, 65, 128, 82, 69, 86, 69, 82, 83, 69, 68, 128, + 82, 69, 86, 69, 82, 83, 69, 196, 82, 69, 86, 69, 82, 83, 197, 82, 69, 85, + 88, 128, 82, 69, 85, 128, 82, 69, 84, 85, 82, 78, 128, 82, 69, 84, 85, + 82, 206, 82, 69, 84, 82, 79, 70, 76, 69, 216, 82, 69, 84, 82, 69, 65, 84, + 128, 82, 69, 84, 79, 82, 84, 128, 82, 69, 83, 85, 80, 73, 78, 85, 83, + 128, 82, 69, 83, 84, 82, 79, 79, 77, 128, 82, 69, 83, 84, 82, 73, 67, 84, + 69, 196, 82, 69, 83, 84, 128, 82, 69, 83, 80, 79, 78, 83, 69, 128, 82, + 69, 83, 79, 85, 82, 67, 69, 128, 82, 69, 83, 79, 76, 85, 84, 73, 79, 78, + 128, 82, 69, 83, 73, 83, 84, 65, 78, 67, 69, 128, 82, 69, 83, 73, 68, 69, + 78, 67, 69, 128, 82, 69, 83, 200, 82, 69, 82, 69, 78, 71, 71, 65, 78, + 128, 82, 69, 82, 69, 75, 65, 78, 128, 82, 69, 80, 82, 69, 83, 69, 78, 84, + 128, 82, 69, 80, 76, 65, 67, 69, 77, 69, 78, 212, 82, 69, 80, 72, 128, + 82, 69, 80, 69, 84, 73, 84, 73, 79, 206, 82, 69, 80, 69, 65, 84, 69, 196, + 82, 69, 80, 69, 65, 84, 128, 82, 69, 80, 69, 65, 212, 82, 69, 80, 65, 89, + 65, 128, 82, 69, 80, 65, 128, 82, 69, 80, 193, 82, 69, 78, 84, 79, 71, + 69, 78, 128, 82, 69, 78, 128, 82, 69, 206, 82, 69, 77, 85, 128, 82, 69, + 77, 73, 78, 68, 69, 210, 82, 69, 77, 69, 68, 89, 128, 82, 69, 76, 73, 71, + 73, 79, 78, 128, 82, 69, 76, 73, 69, 86, 69, 196, 82, 69, 76, 69, 65, 83, + 69, 128, 82, 69, 76, 65, 88, 69, 68, 128, 82, 69, 76, 65, 84, 73, 79, 78, + 65, 204, 82, 69, 76, 65, 84, 73, 79, 78, 128, 82, 69, 76, 65, 65, 128, + 82, 69, 74, 65, 78, 199, 82, 69, 73, 196, 82, 69, 73, 128, 82, 69, 71, + 85, 76, 85, 83, 45, 52, 128, 82, 69, 71, 85, 76, 85, 83, 45, 51, 128, 82, + 69, 71, 85, 76, 85, 83, 45, 50, 128, 82, 69, 71, 85, 76, 85, 83, 128, 82, + 69, 71, 85, 76, 85, 211, 82, 69, 71, 73, 83, 84, 69, 82, 69, 196, 82, 69, + 71, 73, 79, 78, 65, 204, 82, 69, 71, 73, 65, 45, 50, 128, 82, 69, 71, 73, + 65, 128, 82, 69, 70, 79, 82, 77, 69, 196, 82, 69, 70, 69, 82, 69, 78, 67, + 197, 82, 69, 68, 85, 80, 76, 73, 67, 65, 84, 73, 79, 78, 128, 82, 69, 67, + 89, 67, 76, 73, 78, 199, 82, 69, 67, 89, 67, 76, 69, 196, 82, 69, 67, 84, + 73, 76, 73, 78, 69, 65, 210, 82, 69, 67, 84, 65, 78, 71, 85, 76, 65, 210, + 82, 69, 67, 84, 65, 78, 71, 76, 69, 128, 82, 69, 67, 84, 65, 78, 71, 76, + 197, 82, 69, 67, 82, 69, 65, 84, 73, 79, 78, 65, 204, 82, 69, 67, 79, 82, + 68, 73, 78, 199, 82, 69, 67, 79, 82, 68, 69, 82, 128, 82, 69, 67, 79, 82, + 68, 128, 82, 69, 67, 79, 82, 196, 82, 69, 67, 73, 84, 65, 84, 73, 86, + 197, 82, 69, 67, 69, 80, 84, 73, 86, 197, 82, 69, 67, 69, 73, 86, 69, 82, + 128, 82, 69, 67, 69, 73, 86, 69, 210, 82, 69, 65, 76, 71, 65, 82, 45, 50, + 128, 82, 69, 65, 76, 71, 65, 82, 128, 82, 69, 65, 72, 77, 85, 75, 128, + 82, 69, 65, 67, 72, 128, 82, 68, 207, 82, 68, 69, 204, 82, 66, 65, 83, + 193, 82, 65, 89, 83, 128, 82, 65, 89, 211, 82, 65, 89, 65, 78, 78, 65, + 128, 82, 65, 84, 73, 79, 128, 82, 65, 84, 72, 65, 128, 82, 65, 84, 72, + 193, 82, 65, 84, 65, 128, 82, 65, 84, 128, 82, 65, 83, 87, 65, 68, 73, + 128, 82, 65, 83, 79, 85, 204, 82, 65, 83, 72, 65, 128, 82, 65, 81, 128, + 82, 65, 80, 73, 83, 77, 65, 128, 82, 65, 78, 71, 197, 82, 65, 78, 65, + 128, 82, 65, 78, 128, 82, 65, 77, 211, 82, 65, 77, 66, 65, 84, 128, 82, + 65, 75, 72, 65, 78, 71, 128, 82, 65, 75, 65, 65, 82, 65, 65, 78, 83, 65, + 89, 65, 128, 82, 65, 73, 83, 73, 78, 199, 82, 65, 73, 83, 69, 196, 82, + 65, 73, 78, 66, 79, 87, 128, 82, 65, 73, 76, 87, 65, 89, 128, 82, 65, 73, + 76, 87, 65, 217, 82, 65, 73, 76, 128, 82, 65, 73, 68, 207, 82, 65, 73, + 68, 65, 128, 82, 65, 72, 77, 65, 84, 85, 76, 76, 65, 200, 82, 65, 72, + 128, 82, 65, 70, 69, 128, 82, 65, 69, 77, 128, 82, 65, 68, 73, 79, 65, + 67, 84, 73, 86, 197, 82, 65, 68, 73, 79, 128, 82, 65, 68, 73, 207, 82, + 65, 68, 201, 82, 65, 68, 128, 82, 65, 196, 82, 65, 67, 81, 85, 69, 212, + 82, 65, 67, 73, 78, 71, 128, 82, 65, 67, 73, 78, 199, 82, 65, 66, 66, 73, + 84, 128, 82, 65, 66, 66, 73, 212, 82, 65, 66, 128, 82, 65, 65, 73, 128, + 82, 65, 51, 128, 82, 65, 50, 128, 82, 65, 45, 50, 128, 82, 48, 50, 57, + 128, 82, 48, 50, 56, 128, 82, 48, 50, 55, 128, 82, 48, 50, 54, 128, 82, + 48, 50, 53, 128, 82, 48, 50, 52, 128, 82, 48, 50, 51, 128, 82, 48, 50, + 50, 128, 82, 48, 50, 49, 128, 82, 48, 50, 48, 128, 82, 48, 49, 57, 128, + 82, 48, 49, 56, 128, 82, 48, 49, 55, 128, 82, 48, 49, 54, 65, 128, 82, + 48, 49, 54, 128, 82, 48, 49, 53, 128, 82, 48, 49, 52, 128, 82, 48, 49, + 51, 128, 82, 48, 49, 50, 128, 82, 48, 49, 49, 128, 82, 48, 49, 48, 65, + 128, 82, 48, 49, 48, 128, 82, 48, 48, 57, 128, 82, 48, 48, 56, 128, 82, + 48, 48, 55, 128, 82, 48, 48, 54, 128, 82, 48, 48, 53, 128, 82, 48, 48, + 52, 128, 82, 48, 48, 51, 66, 128, 82, 48, 48, 51, 65, 128, 82, 48, 48, + 51, 128, 82, 48, 48, 50, 65, 128, 82, 48, 48, 50, 128, 82, 48, 48, 49, + 128, 82, 45, 67, 82, 69, 197, 81, 89, 88, 128, 81, 89, 85, 128, 81, 89, + 84, 128, 81, 89, 82, 88, 128, 81, 89, 82, 128, 81, 89, 80, 128, 81, 89, + 79, 128, 81, 89, 73, 128, 81, 89, 69, 69, 128, 81, 89, 69, 128, 81, 89, + 65, 65, 128, 81, 89, 65, 128, 81, 89, 128, 81, 87, 73, 128, 81, 87, 69, + 69, 128, 81, 87, 69, 128, 81, 87, 65, 65, 128, 81, 87, 65, 128, 81, 85, + 88, 128, 81, 85, 86, 128, 81, 85, 85, 86, 128, 81, 85, 85, 128, 81, 85, + 84, 128, 81, 85, 83, 72, 83, 72, 65, 89, 65, 128, 81, 85, 82, 88, 128, + 81, 85, 82, 128, 81, 85, 80, 128, 81, 85, 79, 88, 128, 81, 85, 79, 84, + 197, 81, 85, 79, 84, 65, 84, 73, 79, 206, 81, 85, 79, 84, 128, 81, 85, + 79, 80, 128, 81, 85, 79, 128, 81, 85, 75, 128, 81, 85, 73, 78, 84, 69, + 83, 83, 69, 78, 67, 69, 128, 81, 85, 73, 78, 68, 73, 67, 69, 83, 73, 77, + 193, 81, 85, 73, 78, 67, 85, 78, 88, 128, 81, 85, 73, 78, 65, 82, 73, 85, + 211, 81, 85, 73, 76, 212, 81, 85, 73, 76, 76, 128, 81, 85, 73, 67, 203, + 81, 85, 73, 128, 81, 85, 70, 128, 81, 85, 69, 83, 84, 73, 79, 78, 69, + 196, 81, 85, 69, 83, 84, 73, 79, 78, 128, 81, 85, 69, 83, 84, 73, 79, + 206, 81, 85, 69, 69, 78, 128, 81, 85, 69, 69, 206, 81, 85, 69, 128, 81, + 85, 66, 85, 84, 83, 128, 81, 85, 65, 84, 69, 82, 78, 73, 79, 206, 81, 85, + 65, 82, 84, 69, 82, 83, 128, 81, 85, 65, 82, 84, 69, 82, 211, 81, 85, 65, + 82, 84, 69, 82, 128, 81, 85, 65, 78, 84, 73, 84, 217, 81, 85, 65, 68, 82, + 85, 80, 76, 197, 81, 85, 65, 68, 82, 65, 78, 84, 128, 81, 85, 65, 68, 82, + 65, 78, 212, 81, 85, 65, 68, 67, 79, 76, 79, 78, 128, 81, 85, 65, 68, + 128, 81, 85, 65, 196, 81, 85, 65, 128, 81, 85, 128, 81, 208, 81, 79, 88, + 128, 81, 79, 84, 128, 81, 79, 80, 72, 128, 81, 79, 80, 65, 128, 81, 79, + 80, 128, 81, 79, 79, 128, 81, 79, 207, 81, 79, 70, 128, 81, 79, 198, 81, + 79, 65, 128, 81, 79, 128, 81, 78, 128, 81, 73, 88, 128, 81, 73, 84, 83, + 65, 128, 81, 73, 84, 128, 81, 73, 80, 128, 81, 73, 73, 128, 81, 73, 70, + 128, 81, 73, 69, 88, 128, 81, 73, 69, 84, 128, 81, 73, 69, 80, 128, 81, + 73, 69, 128, 81, 73, 128, 81, 72, 87, 73, 128, 81, 72, 87, 69, 69, 128, + 81, 72, 87, 69, 128, 81, 72, 87, 65, 65, 128, 81, 72, 87, 65, 128, 81, + 72, 85, 128, 81, 72, 79, 80, 72, 128, 81, 72, 79, 128, 81, 72, 73, 128, + 81, 72, 69, 69, 128, 81, 72, 69, 128, 81, 72, 65, 85, 128, 81, 72, 65, + 65, 128, 81, 72, 65, 128, 81, 71, 65, 128, 81, 69, 84, 65, 78, 65, 128, + 81, 69, 69, 128, 81, 69, 128, 81, 65, 89, 128, 81, 65, 85, 128, 81, 65, + 84, 65, 78, 128, 81, 65, 82, 78, 69, 217, 81, 65, 82, 128, 81, 65, 81, + 128, 81, 65, 80, 72, 128, 81, 65, 77, 65, 84, 83, 128, 81, 65, 77, 65, + 84, 211, 81, 65, 76, 193, 81, 65, 73, 82, 84, 72, 82, 65, 128, 81, 65, + 73, 128, 81, 65, 70, 128, 81, 65, 198, 81, 65, 68, 77, 65, 128, 81, 65, + 65, 73, 128, 81, 65, 65, 70, 85, 128, 81, 65, 65, 70, 128, 81, 48, 48, + 55, 128, 81, 48, 48, 54, 128, 81, 48, 48, 53, 128, 81, 48, 48, 52, 128, + 81, 48, 48, 51, 128, 81, 48, 48, 50, 128, 81, 48, 48, 49, 128, 80, 90, + 128, 80, 89, 88, 128, 80, 89, 84, 128, 80, 89, 82, 88, 128, 80, 89, 82, + 128, 80, 89, 80, 128, 80, 87, 79, 89, 128, 80, 87, 79, 79, 128, 80, 87, + 79, 128, 80, 87, 207, 80, 87, 73, 73, 128, 80, 87, 73, 128, 80, 87, 69, + 69, 128, 80, 87, 69, 128, 80, 87, 65, 65, 128, 80, 87, 128, 80, 86, 128, + 80, 85, 88, 128, 80, 85, 85, 84, 128, 80, 85, 85, 128, 80, 85, 84, 82, + 69, 70, 65, 67, 84, 73, 79, 78, 128, 80, 85, 84, 128, 80, 85, 212, 80, + 85, 83, 72, 80, 73, 78, 128, 80, 85, 83, 72, 80, 73, 75, 65, 128, 80, 85, + 83, 72, 73, 78, 199, 80, 85, 82, 88, 128, 80, 85, 82, 83, 69, 128, 80, + 85, 82, 80, 76, 197, 80, 85, 82, 78, 65, 77, 65, 128, 80, 85, 82, 73, 84, + 89, 128, 80, 85, 82, 73, 70, 89, 128, 80, 85, 82, 128, 80, 85, 81, 128, + 80, 85, 80, 128, 80, 85, 79, 88, 128, 80, 85, 79, 80, 128, 80, 85, 79, + 128, 80, 85, 78, 71, 65, 65, 77, 128, 80, 85, 78, 71, 128, 80, 85, 78, + 67, 84, 85, 65, 84, 73, 79, 78, 128, 80, 85, 78, 67, 84, 85, 65, 84, 73, + 79, 206, 80, 85, 77, 80, 128, 80, 85, 77, 128, 80, 85, 70, 70, 69, 68, + 128, 80, 85, 69, 128, 80, 85, 67, 75, 128, 80, 85, 66, 76, 73, 195, 80, + 85, 194, 80, 85, 65, 81, 128, 80, 85, 65, 69, 128, 80, 85, 50, 128, 80, + 85, 49, 128, 80, 85, 128, 80, 84, 72, 65, 72, 193, 80, 84, 69, 128, 80, + 83, 73, 76, 201, 80, 83, 73, 70, 73, 83, 84, 79, 83, 89, 78, 65, 71, 77, + 65, 128, 80, 83, 73, 70, 73, 83, 84, 79, 80, 65, 82, 65, 75, 65, 76, 69, + 83, 77, 65, 128, 80, 83, 73, 70, 73, 83, 84, 79, 206, 80, 83, 73, 70, 73, + 83, 84, 79, 76, 89, 71, 73, 83, 77, 65, 128, 80, 83, 73, 128, 80, 83, 65, + 76, 84, 69, 210, 80, 83, 128, 80, 82, 79, 86, 69, 128, 80, 82, 79, 84, + 79, 86, 65, 82, 89, 211, 80, 82, 79, 84, 79, 211, 80, 82, 79, 84, 69, 67, + 84, 69, 196, 80, 82, 79, 83, 71, 69, 71, 82, 65, 77, 77, 69, 78, 73, 128, + 80, 82, 79, 80, 79, 82, 84, 73, 79, 78, 65, 204, 80, 82, 79, 80, 79, 82, + 84, 73, 79, 78, 128, 80, 82, 79, 80, 69, 82, 84, 217, 80, 82, 79, 80, 69, + 76, 76, 69, 210, 80, 82, 79, 79, 70, 128, 80, 82, 79, 76, 79, 78, 71, 69, + 196, 80, 82, 79, 76, 65, 84, 73, 79, 78, 197, 80, 82, 79, 74, 69, 67, 84, + 79, 82, 128, 80, 82, 79, 74, 69, 67, 84, 73, 86, 69, 128, 80, 82, 79, 74, + 69, 67, 84, 73, 79, 78, 128, 80, 82, 79, 72, 73, 66, 73, 84, 69, 196, 80, + 82, 79, 71, 82, 69, 83, 83, 128, 80, 82, 79, 71, 82, 65, 205, 80, 82, 79, + 70, 79, 85, 78, 68, 128, 80, 82, 79, 68, 85, 67, 84, 128, 80, 82, 79, 68, + 85, 67, 212, 80, 82, 73, 86, 65, 84, 69, 128, 80, 82, 73, 86, 65, 84, + 197, 80, 82, 73, 86, 65, 67, 217, 80, 82, 73, 83, 72, 84, 72, 65, 77, 65, + 84, 82, 193, 80, 82, 73, 78, 84, 83, 128, 80, 82, 73, 78, 84, 69, 82, + 128, 80, 82, 73, 78, 84, 69, 210, 80, 82, 73, 78, 84, 128, 80, 82, 73, + 78, 212, 80, 82, 73, 78, 67, 69, 83, 83, 128, 80, 82, 73, 78, 67, 69, + 128, 80, 82, 73, 77, 69, 128, 80, 82, 73, 77, 197, 80, 82, 69, 86, 73, + 79, 85, 211, 80, 82, 69, 83, 83, 69, 196, 80, 82, 69, 83, 69, 84, 128, + 80, 82, 69, 83, 69, 78, 84, 65, 84, 73, 79, 206, 80, 82, 69, 83, 67, 82, + 73, 80, 84, 73, 79, 206, 80, 82, 69, 80, 79, 78, 68, 69, 82, 65, 78, 67, + 69, 128, 80, 82, 69, 78, 75, 72, 65, 128, 80, 82, 69, 71, 78, 65, 78, + 212, 80, 82, 69, 70, 65, 67, 197, 80, 82, 69, 67, 73, 80, 73, 84, 65, 84, + 69, 128, 80, 82, 69, 67, 69, 68, 73, 78, 199, 80, 82, 69, 67, 69, 68, 69, + 83, 128, 80, 82, 69, 67, 69, 68, 69, 211, 80, 82, 69, 67, 69, 68, 69, + 196, 80, 82, 69, 67, 69, 68, 69, 128, 80, 82, 69, 67, 69, 68, 197, 80, + 82, 65, 89, 69, 210, 80, 82, 65, 77, 45, 80, 73, 73, 128, 80, 82, 65, 77, + 45, 80, 73, 201, 80, 82, 65, 77, 45, 77, 85, 79, 89, 128, 80, 82, 65, 77, + 45, 77, 85, 79, 217, 80, 82, 65, 77, 45, 66, 85, 79, 78, 128, 80, 82, 65, + 77, 45, 66, 85, 79, 206, 80, 82, 65, 77, 45, 66, 69, 73, 128, 80, 82, 65, + 77, 45, 66, 69, 201, 80, 82, 65, 77, 128, 80, 82, 65, 205, 80, 82, 128, + 80, 80, 86, 128, 80, 80, 77, 128, 80, 80, 65, 128, 80, 79, 89, 128, 80, + 79, 88, 128, 80, 79, 87, 69, 82, 211, 80, 79, 87, 69, 82, 128, 80, 79, + 87, 69, 210, 80, 79, 87, 68, 69, 82, 69, 196, 80, 79, 87, 68, 69, 82, + 128, 80, 79, 85, 78, 196, 80, 79, 85, 76, 84, 82, 217, 80, 79, 85, 67, + 72, 128, 80, 79, 84, 65, 84, 79, 128, 80, 79, 84, 65, 66, 76, 197, 80, + 79, 212, 80, 79, 83, 84, 80, 79, 83, 73, 84, 73, 79, 206, 80, 79, 83, 84, + 66, 79, 88, 128, 80, 79, 83, 84, 65, 204, 80, 79, 83, 84, 128, 80, 79, + 83, 212, 80, 79, 83, 83, 69, 83, 83, 73, 79, 78, 128, 80, 79, 83, 73, 84, + 73, 79, 78, 83, 128, 80, 79, 82, 84, 65, 66, 76, 197, 80, 79, 82, 82, 69, + 67, 84, 85, 83, 128, 80, 79, 82, 82, 69, 67, 84, 85, 211, 80, 79, 80, 80, + 73, 78, 199, 80, 79, 80, 80, 69, 82, 128, 80, 79, 80, 67, 79, 82, 78, + 128, 80, 79, 80, 128, 80, 79, 208, 80, 79, 79, 68, 76, 69, 128, 80, 79, + 79, 128, 80, 79, 78, 68, 79, 128, 80, 79, 206, 80, 79, 77, 77, 69, 69, + 128, 80, 79, 77, 77, 69, 197, 80, 79, 76, 79, 128, 80, 79, 76, 73, 83, 72, 128, 80, 79, 76, 73, 67, 197, 80, 79, 76, 201, 80, 79, 76, 69, 128, 80, 79, 76, 197, 80, 79, 75, 82, 89, 84, 73, 69, 128, 80, 79, 75, 79, 74, 73, 128, 80, 79, 73, 78, 84, 211, 80, 79, 73, 78, 84, 79, 128, 80, 79, @@ -1691,76 +1705,78 @@ static unsigned char lexicon[] = { 80, 69, 82, 70, 69, 67, 84, 193, 80, 69, 82, 67, 85, 83, 83, 73, 86, 69, 128, 80, 69, 82, 67, 69, 78, 212, 80, 69, 80, 80, 69, 82, 128, 80, 69, 80, 69, 84, 128, 80, 69, 80, 69, 212, 80, 69, 79, 82, 84, 200, 80, 69, - 79, 80, 76, 69, 128, 80, 69, 78, 84, 65, 83, 69, 77, 69, 128, 80, 69, 78, - 84, 65, 71, 82, 65, 77, 128, 80, 69, 78, 84, 65, 71, 79, 78, 128, 80, 69, - 78, 83, 85, 128, 80, 69, 78, 83, 73, 86, 197, 80, 69, 78, 78, 217, 80, - 69, 78, 78, 65, 78, 84, 128, 80, 69, 78, 73, 72, 73, 128, 80, 69, 78, 71, - 85, 73, 78, 128, 80, 69, 78, 71, 75, 65, 76, 128, 80, 69, 78, 69, 84, 82, - 65, 84, 73, 79, 78, 128, 80, 69, 78, 67, 73, 76, 128, 80, 69, 76, 65, 83, - 84, 79, 78, 128, 80, 69, 76, 65, 83, 84, 79, 206, 80, 69, 73, 84, 72, - 128, 80, 69, 72, 69, 72, 128, 80, 69, 72, 69, 200, 80, 69, 72, 128, 80, - 69, 200, 80, 69, 69, 90, 73, 128, 80, 69, 69, 83, 72, 73, 128, 80, 69, - 69, 80, 128, 80, 69, 69, 77, 128, 80, 69, 69, 73, 128, 80, 69, 69, 128, - 80, 69, 68, 69, 83, 84, 82, 73, 65, 78, 83, 128, 80, 69, 68, 69, 83, 84, - 82, 73, 65, 78, 128, 80, 69, 68, 69, 83, 84, 65, 76, 128, 80, 69, 68, 69, - 83, 84, 65, 204, 80, 69, 68, 65, 204, 80, 69, 65, 75, 211, 80, 69, 65, - 67, 72, 128, 80, 69, 65, 67, 69, 128, 80, 69, 65, 67, 197, 80, 68, 73, - 128, 80, 68, 70, 128, 80, 68, 128, 80, 67, 128, 80, 65, 90, 69, 82, 128, - 80, 65, 89, 69, 82, 79, 75, 128, 80, 65, 89, 65, 78, 78, 65, 128, 80, 65, - 89, 128, 80, 65, 88, 128, 80, 65, 87, 78, 128, 80, 65, 215, 80, 65, 86, - 73, 89, 65, 78, 73, 128, 80, 65, 85, 128, 80, 65, 213, 80, 65, 84, 84, - 69, 82, 78, 128, 80, 65, 84, 72, 65, 77, 65, 83, 65, 84, 128, 80, 65, 84, - 200, 80, 65, 84, 65, 75, 128, 80, 65, 84, 65, 72, 128, 80, 65, 84, 128, - 80, 65, 83, 85, 81, 128, 80, 65, 83, 83, 80, 79, 82, 212, 80, 65, 83, 83, - 73, 86, 69, 45, 80, 85, 76, 76, 45, 85, 80, 45, 79, 85, 84, 80, 85, 212, - 80, 65, 83, 83, 73, 86, 69, 45, 80, 85, 76, 76, 45, 68, 79, 87, 78, 45, - 79, 85, 84, 80, 85, 212, 80, 65, 83, 83, 69, 78, 71, 69, 210, 80, 65, 83, - 72, 84, 65, 128, 80, 65, 83, 72, 65, 69, 128, 80, 65, 83, 69, 81, 128, - 80, 65, 83, 65, 78, 71, 65, 206, 80, 65, 82, 85, 77, 128, 80, 65, 82, 84, - 217, 80, 65, 82, 84, 78, 69, 82, 83, 72, 73, 208, 80, 65, 82, 84, 73, 65, - 76, 76, 89, 45, 82, 69, 67, 89, 67, 76, 69, 196, 80, 65, 82, 84, 73, 65, - 204, 80, 65, 82, 84, 72, 73, 65, 206, 80, 65, 82, 212, 80, 65, 82, 75, - 128, 80, 65, 82, 73, 67, 72, 79, 78, 128, 80, 65, 82, 69, 83, 84, 73, 71, - 77, 69, 78, 79, 206, 80, 65, 82, 69, 82, 69, 78, 128, 80, 65, 82, 69, 78, - 84, 72, 69, 83, 73, 83, 128, 80, 65, 82, 69, 78, 84, 72, 69, 83, 73, 211, - 80, 65, 82, 69, 78, 84, 72, 69, 83, 69, 211, 80, 65, 82, 65, 80, 72, 82, - 65, 83, 197, 80, 65, 82, 65, 76, 76, 69, 76, 79, 71, 82, 65, 77, 128, 80, - 65, 82, 65, 76, 76, 69, 76, 128, 80, 65, 82, 65, 76, 76, 69, 204, 80, 65, - 82, 65, 75, 76, 73, 84, 73, 75, 73, 128, 80, 65, 82, 65, 75, 76, 73, 84, - 73, 75, 201, 80, 65, 82, 65, 75, 65, 76, 69, 83, 77, 193, 80, 65, 82, 65, - 71, 82, 65, 80, 72, 79, 83, 128, 80, 65, 82, 65, 71, 82, 65, 80, 72, 128, - 80, 65, 82, 65, 71, 82, 65, 80, 200, 80, 65, 82, 65, 128, 80, 65, 82, - 128, 80, 65, 80, 89, 82, 85, 83, 128, 80, 65, 80, 69, 82, 67, 76, 73, 80, - 83, 128, 80, 65, 80, 69, 82, 67, 76, 73, 80, 128, 80, 65, 80, 69, 210, - 80, 65, 80, 128, 80, 65, 208, 80, 65, 207, 80, 65, 78, 89, 85, 75, 85, - 128, 80, 65, 78, 89, 73, 75, 85, 128, 80, 65, 78, 89, 69, 67, 69, 75, - 128, 80, 65, 78, 89, 65, 78, 71, 71, 65, 128, 80, 65, 78, 89, 65, 75, 82, - 65, 128, 80, 65, 78, 84, 73, 128, 80, 65, 78, 83, 73, 79, 83, 45, 80, 73, - 69, 85, 80, 128, 80, 65, 78, 83, 73, 79, 83, 45, 75, 65, 80, 89, 69, 79, - 85, 78, 80, 73, 69, 85, 80, 128, 80, 65, 78, 79, 78, 71, 79, 78, 65, 78, - 128, 80, 65, 78, 79, 76, 79, 78, 71, 128, 80, 65, 78, 71, 87, 73, 83, 65, - 68, 128, 80, 65, 78, 71, 82, 65, 78, 71, 75, 69, 80, 128, 80, 65, 78, 71, - 79, 76, 65, 84, 128, 80, 65, 78, 71, 76, 79, 78, 71, 128, 80, 65, 78, 71, - 76, 65, 89, 65, 82, 128, 80, 65, 78, 71, 75, 79, 78, 128, 80, 65, 78, 71, - 75, 65, 84, 128, 80, 65, 78, 71, 72, 85, 76, 85, 128, 80, 65, 78, 71, + 79, 80, 76, 69, 128, 80, 69, 78, 84, 65, 84, 72, 76, 79, 78, 128, 80, 69, + 78, 84, 65, 83, 69, 77, 69, 128, 80, 69, 78, 84, 65, 71, 82, 65, 77, 128, + 80, 69, 78, 84, 65, 71, 79, 78, 128, 80, 69, 78, 83, 85, 128, 80, 69, 78, + 83, 73, 86, 197, 80, 69, 78, 78, 217, 80, 69, 78, 78, 65, 78, 84, 128, + 80, 69, 78, 73, 72, 73, 128, 80, 69, 78, 71, 85, 73, 78, 128, 80, 69, 78, + 71, 75, 65, 76, 128, 80, 69, 78, 69, 84, 82, 65, 84, 73, 79, 78, 128, 80, + 69, 78, 67, 73, 76, 128, 80, 69, 76, 65, 83, 84, 79, 78, 128, 80, 69, 76, + 65, 83, 84, 79, 206, 80, 69, 73, 84, 72, 128, 80, 69, 72, 69, 72, 128, + 80, 69, 72, 69, 200, 80, 69, 72, 128, 80, 69, 200, 80, 69, 69, 90, 73, + 128, 80, 69, 69, 83, 72, 73, 128, 80, 69, 69, 80, 128, 80, 69, 69, 77, + 128, 80, 69, 69, 73, 128, 80, 69, 69, 128, 80, 69, 68, 69, 83, 84, 82, + 73, 65, 78, 83, 128, 80, 69, 68, 69, 83, 84, 82, 73, 65, 78, 128, 80, 69, + 68, 69, 83, 84, 65, 76, 128, 80, 69, 68, 69, 83, 84, 65, 204, 80, 69, 68, + 65, 204, 80, 69, 65, 78, 85, 84, 83, 128, 80, 69, 65, 75, 211, 80, 69, + 65, 67, 72, 128, 80, 69, 65, 67, 69, 128, 80, 69, 65, 67, 197, 80, 68, + 73, 128, 80, 68, 70, 128, 80, 68, 128, 80, 67, 128, 80, 65, 90, 69, 82, + 128, 80, 65, 89, 69, 82, 79, 75, 128, 80, 65, 89, 65, 78, 78, 65, 128, + 80, 65, 89, 128, 80, 65, 88, 128, 80, 65, 87, 78, 128, 80, 65, 215, 80, + 65, 86, 73, 89, 65, 78, 73, 128, 80, 65, 85, 128, 80, 65, 213, 80, 65, + 84, 84, 69, 82, 78, 128, 80, 65, 84, 72, 65, 77, 65, 83, 65, 84, 128, 80, + 65, 84, 200, 80, 65, 84, 65, 75, 128, 80, 65, 84, 65, 72, 128, 80, 65, + 84, 128, 80, 65, 83, 85, 81, 128, 80, 65, 83, 83, 80, 79, 82, 212, 80, + 65, 83, 83, 73, 86, 69, 45, 80, 85, 76, 76, 45, 85, 80, 45, 79, 85, 84, + 80, 85, 212, 80, 65, 83, 83, 73, 86, 69, 45, 80, 85, 76, 76, 45, 68, 79, + 87, 78, 45, 79, 85, 84, 80, 85, 212, 80, 65, 83, 83, 69, 78, 71, 69, 210, + 80, 65, 83, 72, 84, 65, 128, 80, 65, 83, 72, 65, 69, 128, 80, 65, 83, 69, + 81, 128, 80, 65, 83, 65, 78, 71, 65, 206, 80, 65, 82, 85, 77, 128, 80, + 65, 82, 84, 217, 80, 65, 82, 84, 78, 69, 82, 83, 72, 73, 208, 80, 65, 82, + 84, 73, 65, 76, 76, 89, 45, 82, 69, 67, 89, 67, 76, 69, 196, 80, 65, 82, + 84, 73, 65, 204, 80, 65, 82, 84, 72, 73, 65, 206, 80, 65, 82, 212, 80, + 65, 82, 75, 128, 80, 65, 82, 73, 67, 72, 79, 78, 128, 80, 65, 82, 69, 83, + 84, 73, 71, 77, 69, 78, 79, 206, 80, 65, 82, 69, 82, 69, 78, 128, 80, 65, + 82, 69, 78, 84, 72, 69, 83, 73, 83, 128, 80, 65, 82, 69, 78, 84, 72, 69, + 83, 73, 211, 80, 65, 82, 69, 78, 84, 72, 69, 83, 69, 211, 80, 65, 82, 65, + 80, 72, 82, 65, 83, 197, 80, 65, 82, 65, 76, 76, 69, 76, 79, 71, 82, 65, + 77, 128, 80, 65, 82, 65, 76, 76, 69, 76, 128, 80, 65, 82, 65, 76, 76, 69, + 204, 80, 65, 82, 65, 75, 76, 73, 84, 73, 75, 73, 128, 80, 65, 82, 65, 75, + 76, 73, 84, 73, 75, 201, 80, 65, 82, 65, 75, 65, 76, 69, 83, 77, 193, 80, + 65, 82, 65, 71, 82, 65, 80, 72, 79, 83, 128, 80, 65, 82, 65, 71, 82, 65, + 80, 72, 128, 80, 65, 82, 65, 71, 82, 65, 80, 200, 80, 65, 82, 65, 128, + 80, 65, 82, 128, 80, 65, 80, 89, 82, 85, 83, 128, 80, 65, 80, 69, 82, 67, + 76, 73, 80, 83, 128, 80, 65, 80, 69, 82, 67, 76, 73, 80, 128, 80, 65, 80, + 69, 210, 80, 65, 80, 128, 80, 65, 208, 80, 65, 207, 80, 65, 78, 89, 85, + 75, 85, 128, 80, 65, 78, 89, 73, 75, 85, 128, 80, 65, 78, 89, 69, 67, 69, + 75, 128, 80, 65, 78, 89, 65, 78, 71, 71, 65, 128, 80, 65, 78, 89, 65, 75, + 82, 65, 128, 80, 65, 78, 84, 73, 128, 80, 65, 78, 83, 73, 79, 83, 45, 80, + 73, 69, 85, 80, 128, 80, 65, 78, 83, 73, 79, 83, 45, 75, 65, 80, 89, 69, + 79, 85, 78, 80, 73, 69, 85, 80, 128, 80, 65, 78, 79, 78, 71, 79, 78, 65, + 78, 128, 80, 65, 78, 79, 76, 79, 78, 71, 128, 80, 65, 78, 71, 87, 73, 83, + 65, 68, 128, 80, 65, 78, 71, 82, 65, 78, 71, 75, 69, 80, 128, 80, 65, 78, + 71, 79, 76, 65, 84, 128, 80, 65, 78, 71, 76, 79, 78, 71, 128, 80, 65, 78, + 71, 76, 65, 89, 65, 82, 128, 80, 65, 78, 71, 75, 79, 78, 128, 80, 65, 78, + 71, 75, 65, 84, 128, 80, 65, 78, 71, 72, 85, 76, 85, 128, 80, 65, 78, 71, 128, 80, 65, 78, 69, 85, 76, 69, 85, 78, 71, 128, 80, 65, 78, 68, 193, - 80, 65, 78, 65, 69, 76, 65, 69, 78, 71, 128, 80, 65, 78, 128, 80, 65, 77, - 85, 78, 71, 75, 65, 72, 128, 80, 65, 77, 85, 68, 80, 79, 68, 128, 80, 65, - 77, 83, 72, 65, 69, 128, 80, 65, 77, 80, 72, 89, 76, 73, 65, 206, 80, 65, - 77, 73, 78, 71, 75, 65, 76, 128, 80, 65, 77, 69, 80, 69, 84, 128, 80, 65, - 77, 69, 78, 69, 78, 71, 128, 80, 65, 77, 65, 68, 65, 128, 80, 65, 77, 65, - 65, 69, 72, 128, 80, 65, 76, 85, 84, 65, 128, 80, 65, 76, 79, 67, 72, 75, - 65, 128, 80, 65, 76, 77, 89, 82, 69, 78, 197, 80, 65, 76, 205, 80, 65, - 76, 76, 65, 87, 65, 128, 80, 65, 76, 76, 65, 83, 128, 80, 65, 76, 69, 84, - 84, 69, 128, 80, 65, 76, 65, 85, 78, 199, 80, 65, 76, 65, 84, 65, 76, 73, - 90, 69, 196, 80, 65, 76, 65, 84, 65, 76, 73, 90, 65, 84, 73, 79, 78, 128, - 80, 65, 76, 65, 84, 65, 204, 80, 65, 75, 80, 65, 203, 80, 65, 73, 89, 65, - 78, 78, 79, 73, 128, 80, 65, 73, 82, 84, 72, 82, 65, 128, 80, 65, 73, 82, - 69, 196, 80, 65, 73, 78, 84, 66, 82, 85, 83, 72, 128, 80, 65, 73, 128, - 80, 65, 72, 76, 65, 86, 201, 80, 65, 72, 128, 80, 65, 71, 69, 83, 128, - 80, 65, 71, 69, 82, 128, 80, 65, 71, 197, 80, 65, 68, 77, 193, 80, 65, - 68, 68, 76, 197, 80, 65, 68, 68, 73, 78, 199, 80, 65, 68, 193, 80, 65, - 68, 128, 80, 65, 67, 75, 73, 78, 71, 128, 80, 65, 67, 75, 65, 71, 69, + 80, 65, 78, 67, 65, 75, 69, 83, 128, 80, 65, 78, 65, 69, 76, 65, 69, 78, + 71, 128, 80, 65, 78, 128, 80, 65, 206, 80, 65, 77, 85, 78, 71, 75, 65, + 72, 128, 80, 65, 77, 85, 68, 80, 79, 68, 128, 80, 65, 77, 83, 72, 65, 69, + 128, 80, 65, 77, 80, 72, 89, 76, 73, 65, 206, 80, 65, 77, 73, 78, 71, 75, + 65, 76, 128, 80, 65, 77, 69, 80, 69, 84, 128, 80, 65, 77, 69, 78, 69, 78, + 71, 128, 80, 65, 77, 65, 68, 65, 128, 80, 65, 77, 65, 65, 69, 72, 128, + 80, 65, 76, 85, 84, 65, 128, 80, 65, 76, 79, 67, 72, 75, 65, 128, 80, 65, + 76, 77, 89, 82, 69, 78, 197, 80, 65, 76, 77, 128, 80, 65, 76, 205, 80, + 65, 76, 76, 65, 87, 65, 128, 80, 65, 76, 76, 65, 83, 128, 80, 65, 76, 69, + 84, 84, 69, 128, 80, 65, 76, 65, 85, 78, 199, 80, 65, 76, 65, 84, 65, 76, + 73, 90, 69, 196, 80, 65, 76, 65, 84, 65, 76, 73, 90, 65, 84, 73, 79, 78, + 128, 80, 65, 76, 65, 84, 65, 204, 80, 65, 75, 80, 65, 203, 80, 65, 73, + 89, 65, 78, 78, 79, 73, 128, 80, 65, 73, 82, 84, 72, 82, 65, 128, 80, 65, + 73, 82, 69, 196, 80, 65, 73, 78, 84, 66, 82, 85, 83, 72, 128, 80, 65, 73, + 128, 80, 65, 72, 76, 65, 86, 201, 80, 65, 72, 128, 80, 65, 71, 69, 83, + 128, 80, 65, 71, 69, 82, 128, 80, 65, 71, 197, 80, 65, 68, 77, 193, 80, + 65, 68, 68, 76, 197, 80, 65, 68, 68, 73, 78, 199, 80, 65, 68, 193, 80, + 65, 68, 128, 80, 65, 67, 75, 73, 78, 71, 128, 80, 65, 67, 75, 65, 71, 69, 128, 80, 65, 65, 84, 85, 128, 80, 65, 65, 83, 69, 78, 84, 79, 128, 80, 65, 65, 82, 65, 69, 128, 80, 65, 65, 77, 128, 80, 65, 65, 73, 128, 80, 65, 65, 45, 80, 73, 76, 76, 65, 128, 80, 65, 65, 128, 80, 50, 128, 80, @@ -1770,464 +1786,471 @@ static unsigned char lexicon[] = { 48, 48, 50, 128, 80, 48, 48, 49, 65, 128, 80, 48, 48, 49, 128, 79, 89, 82, 65, 78, 73, 83, 77, 193, 79, 89, 65, 78, 78, 65, 128, 79, 88, 73, 65, 128, 79, 88, 73, 193, 79, 88, 69, 73, 65, 201, 79, 88, 69, 73, 193, 79, - 86, 69, 82, 82, 73, 68, 69, 128, 79, 86, 69, 82, 76, 79, 78, 199, 79, 86, - 69, 82, 76, 73, 78, 69, 128, 79, 86, 69, 82, 76, 65, 89, 128, 79, 86, 69, - 82, 76, 65, 80, 80, 73, 78, 199, 79, 86, 69, 82, 76, 65, 80, 128, 79, 86, - 69, 82, 76, 65, 73, 68, 128, 79, 86, 69, 82, 66, 65, 82, 128, 79, 86, 65, - 76, 128, 79, 86, 65, 204, 79, 85, 84, 76, 73, 78, 69, 196, 79, 85, 84, - 76, 73, 78, 69, 128, 79, 85, 84, 69, 210, 79, 85, 84, 66, 79, 216, 79, - 85, 78, 75, 73, 193, 79, 85, 78, 67, 69, 128, 79, 85, 78, 67, 197, 79, - 84, 85, 128, 79, 84, 84, 65, 86, 193, 79, 84, 84, 128, 79, 84, 72, 69, - 82, 211, 79, 84, 72, 69, 210, 79, 84, 72, 65, 76, 65, 206, 79, 84, 72, - 65, 76, 128, 79, 83, 77, 65, 78, 89, 193, 79, 83, 67, 128, 79, 82, 84, - 72, 79, 71, 79, 78, 65, 204, 79, 82, 84, 72, 79, 68, 79, 216, 79, 82, 78, - 65, 84, 197, 79, 82, 78, 65, 77, 69, 78, 84, 83, 128, 79, 82, 78, 65, 77, - 69, 78, 84, 128, 79, 82, 78, 65, 77, 69, 78, 212, 79, 82, 75, 72, 79, - 206, 79, 82, 73, 71, 73, 78, 65, 204, 79, 82, 73, 71, 73, 78, 128, 79, - 82, 69, 45, 50, 128, 79, 82, 68, 73, 78, 65, 204, 79, 82, 68, 69, 210, - 79, 82, 67, 72, 73, 68, 128, 79, 82, 65, 78, 71, 197, 79, 80, 84, 73, 79, - 206, 79, 80, 84, 73, 67, 65, 204, 79, 80, 80, 82, 69, 83, 83, 73, 79, 78, - 128, 79, 80, 80, 79, 83, 73, 84, 73, 79, 78, 128, 79, 80, 80, 79, 83, 73, - 78, 199, 79, 80, 80, 79, 83, 69, 128, 79, 80, 72, 73, 85, 67, 72, 85, 83, - 128, 79, 80, 69, 82, 65, 84, 79, 82, 128, 79, 80, 69, 82, 65, 84, 79, - 210, 79, 80, 69, 82, 65, 84, 73, 78, 199, 79, 80, 69, 78, 73, 78, 199, - 79, 80, 69, 78, 45, 80, 128, 79, 80, 69, 78, 45, 79, 85, 84, 76, 73, 78, - 69, 196, 79, 80, 69, 78, 45, 79, 128, 79, 80, 69, 78, 45, 207, 79, 80, - 69, 78, 45, 72, 69, 65, 68, 69, 196, 79, 80, 69, 78, 45, 67, 73, 82, 67, - 85, 73, 84, 45, 79, 85, 84, 80, 85, 212, 79, 80, 69, 78, 128, 79, 79, 90, - 69, 128, 79, 79, 89, 65, 78, 78, 65, 128, 79, 79, 85, 128, 79, 79, 77, - 85, 128, 79, 79, 72, 128, 79, 79, 69, 128, 79, 79, 66, 79, 79, 70, 73, - 76, 73, 128, 79, 78, 85, 128, 79, 78, 83, 85, 128, 79, 78, 78, 128, 79, - 78, 75, 65, 82, 128, 79, 78, 69, 83, 69, 76, 70, 128, 79, 78, 69, 45, 87, - 65, 217, 79, 78, 69, 45, 84, 72, 73, 82, 84, 89, 128, 79, 78, 69, 45, 76, - 73, 78, 197, 79, 78, 67, 79, 77, 73, 78, 199, 79, 78, 65, 80, 128, 79, - 77, 73, 83, 83, 73, 79, 206, 79, 77, 73, 67, 82, 79, 78, 128, 79, 77, 73, - 67, 82, 79, 206, 79, 77, 69, 71, 65, 128, 79, 77, 69, 71, 193, 79, 77, - 65, 76, 79, 78, 128, 79, 76, 73, 86, 69, 128, 79, 76, 73, 71, 79, 206, - 79, 76, 68, 128, 79, 75, 84, 207, 79, 75, 65, 82, 65, 128, 79, 75, 65, - 82, 193, 79, 74, 73, 66, 87, 65, 217, 79, 74, 69, 79, 78, 128, 79, 73, - 76, 128, 79, 73, 204, 79, 72, 77, 128, 79, 72, 205, 79, 71, 82, 69, 128, - 79, 71, 79, 78, 69, 75, 128, 79, 71, 79, 78, 69, 203, 79, 71, 72, 65, - 205, 79, 70, 70, 73, 67, 69, 82, 128, 79, 70, 70, 73, 67, 69, 128, 79, - 70, 70, 73, 67, 197, 79, 70, 70, 128, 79, 69, 89, 128, 79, 69, 75, 128, - 79, 69, 69, 128, 79, 68, 69, 78, 128, 79, 68, 68, 128, 79, 68, 196, 79, - 67, 84, 79, 80, 85, 83, 128, 79, 67, 84, 79, 66, 69, 82, 128, 79, 67, 84, - 69, 212, 79, 67, 84, 65, 71, 79, 78, 128, 79, 67, 210, 79, 67, 76, 79, - 67, 75, 128, 79, 67, 67, 76, 85, 83, 73, 79, 78, 128, 79, 66, 83, 84, 82, - 85, 67, 84, 73, 79, 78, 128, 79, 66, 79, 76, 211, 79, 66, 79, 204, 79, - 66, 79, 70, 73, 76, 73, 128, 79, 66, 76, 73, 81, 85, 197, 79, 66, 74, 69, - 67, 212, 79, 66, 69, 76, 85, 83, 128, 79, 66, 69, 76, 79, 83, 128, 79, - 66, 128, 79, 65, 89, 128, 79, 65, 75, 128, 79, 65, 66, 79, 65, 70, 73, - 76, 73, 128, 79, 193, 79, 48, 53, 49, 128, 79, 48, 53, 48, 66, 128, 79, - 48, 53, 48, 65, 128, 79, 48, 53, 48, 128, 79, 48, 52, 57, 128, 79, 48, - 52, 56, 128, 79, 48, 52, 55, 128, 79, 48, 52, 54, 128, 79, 48, 52, 53, - 128, 79, 48, 52, 52, 128, 79, 48, 52, 51, 128, 79, 48, 52, 50, 128, 79, - 48, 52, 49, 128, 79, 48, 52, 48, 128, 79, 48, 51, 57, 128, 79, 48, 51, - 56, 128, 79, 48, 51, 55, 128, 79, 48, 51, 54, 68, 128, 79, 48, 51, 54, - 67, 128, 79, 48, 51, 54, 66, 128, 79, 48, 51, 54, 65, 128, 79, 48, 51, - 54, 128, 79, 48, 51, 53, 128, 79, 48, 51, 52, 128, 79, 48, 51, 51, 65, - 128, 79, 48, 51, 51, 128, 79, 48, 51, 50, 128, 79, 48, 51, 49, 128, 79, - 48, 51, 48, 65, 128, 79, 48, 51, 48, 128, 79, 48, 50, 57, 65, 128, 79, - 48, 50, 57, 128, 79, 48, 50, 56, 128, 79, 48, 50, 55, 128, 79, 48, 50, - 54, 128, 79, 48, 50, 53, 65, 128, 79, 48, 50, 53, 128, 79, 48, 50, 52, - 65, 128, 79, 48, 50, 52, 128, 79, 48, 50, 51, 128, 79, 48, 50, 50, 128, - 79, 48, 50, 49, 128, 79, 48, 50, 48, 65, 128, 79, 48, 50, 48, 128, 79, - 48, 49, 57, 65, 128, 79, 48, 49, 57, 128, 79, 48, 49, 56, 128, 79, 48, - 49, 55, 128, 79, 48, 49, 54, 128, 79, 48, 49, 53, 128, 79, 48, 49, 52, - 128, 79, 48, 49, 51, 128, 79, 48, 49, 50, 128, 79, 48, 49, 49, 128, 79, - 48, 49, 48, 67, 128, 79, 48, 49, 48, 66, 128, 79, 48, 49, 48, 65, 128, - 79, 48, 49, 48, 128, 79, 48, 48, 57, 128, 79, 48, 48, 56, 128, 79, 48, - 48, 55, 128, 79, 48, 48, 54, 70, 128, 79, 48, 48, 54, 69, 128, 79, 48, - 48, 54, 68, 128, 79, 48, 48, 54, 67, 128, 79, 48, 48, 54, 66, 128, 79, - 48, 48, 54, 65, 128, 79, 48, 48, 54, 128, 79, 48, 48, 53, 65, 128, 79, - 48, 48, 53, 128, 79, 48, 48, 52, 128, 79, 48, 48, 51, 128, 79, 48, 48, - 50, 128, 79, 48, 48, 49, 65, 128, 79, 48, 48, 49, 128, 79, 45, 89, 69, - 128, 79, 45, 79, 45, 73, 128, 79, 45, 69, 128, 78, 90, 89, 88, 128, 78, - 90, 89, 84, 128, 78, 90, 89, 82, 88, 128, 78, 90, 89, 82, 128, 78, 90, - 89, 80, 128, 78, 90, 89, 128, 78, 90, 85, 88, 128, 78, 90, 85, 82, 88, - 128, 78, 90, 85, 82, 128, 78, 90, 85, 81, 128, 78, 90, 85, 80, 128, 78, - 90, 85, 79, 88, 128, 78, 90, 85, 79, 128, 78, 90, 85, 206, 78, 90, 85, - 128, 78, 90, 79, 88, 128, 78, 90, 79, 80, 128, 78, 90, 73, 88, 128, 78, - 90, 73, 84, 128, 78, 90, 73, 80, 128, 78, 90, 73, 69, 88, 128, 78, 90, - 73, 69, 80, 128, 78, 90, 73, 69, 128, 78, 90, 73, 128, 78, 90, 69, 88, - 128, 78, 90, 69, 85, 77, 128, 78, 90, 69, 128, 78, 90, 65, 88, 128, 78, - 90, 65, 84, 128, 78, 90, 65, 81, 128, 78, 90, 65, 80, 128, 78, 90, 65, - 128, 78, 90, 193, 78, 89, 87, 65, 128, 78, 89, 85, 88, 128, 78, 89, 85, - 85, 128, 78, 89, 85, 84, 128, 78, 89, 85, 80, 128, 78, 89, 85, 79, 88, - 128, 78, 89, 85, 79, 80, 128, 78, 89, 85, 79, 128, 78, 89, 85, 78, 128, - 78, 89, 85, 69, 128, 78, 89, 85, 128, 78, 89, 79, 88, 128, 78, 89, 79, - 84, 128, 78, 89, 79, 80, 128, 78, 89, 79, 79, 128, 78, 89, 79, 78, 128, - 78, 89, 79, 65, 128, 78, 89, 79, 128, 78, 89, 74, 65, 128, 78, 89, 73, - 88, 128, 78, 89, 73, 84, 128, 78, 89, 73, 212, 78, 89, 73, 211, 78, 89, - 73, 210, 78, 89, 73, 80, 128, 78, 89, 73, 78, 45, 68, 79, 128, 78, 89, - 73, 78, 128, 78, 89, 73, 73, 128, 78, 89, 73, 69, 88, 128, 78, 89, 73, - 69, 84, 128, 78, 89, 73, 69, 80, 128, 78, 89, 73, 69, 128, 78, 89, 73, - 128, 78, 89, 201, 78, 89, 72, 65, 128, 78, 89, 69, 84, 128, 78, 89, 69, - 212, 78, 89, 69, 78, 128, 78, 89, 69, 72, 128, 78, 89, 69, 200, 78, 89, - 69, 69, 128, 78, 89, 69, 128, 78, 89, 196, 78, 89, 67, 65, 128, 78, 89, - 65, 85, 128, 78, 89, 65, 73, 128, 78, 89, 65, 72, 128, 78, 89, 65, 69, - 77, 65, 69, 128, 78, 89, 65, 65, 128, 78, 87, 79, 79, 128, 78, 87, 79, - 128, 78, 87, 73, 73, 128, 78, 87, 73, 128, 78, 87, 69, 128, 78, 87, 65, - 65, 128, 78, 87, 65, 128, 78, 87, 128, 78, 86, 128, 78, 85, 88, 128, 78, - 85, 85, 78, 128, 78, 85, 85, 128, 78, 85, 84, 73, 76, 76, 85, 128, 78, - 85, 84, 128, 78, 85, 212, 78, 85, 82, 88, 128, 78, 85, 82, 128, 78, 85, - 80, 128, 78, 85, 79, 88, 128, 78, 85, 79, 80, 128, 78, 85, 79, 128, 78, - 85, 78, 85, 90, 128, 78, 85, 78, 85, 218, 78, 85, 78, 71, 128, 78, 85, - 78, 65, 86, 85, 212, 78, 85, 78, 65, 86, 73, 203, 78, 85, 78, 128, 78, - 85, 206, 78, 85, 77, 69, 82, 207, 78, 85, 77, 69, 82, 65, 84, 79, 210, - 78, 85, 77, 69, 82, 65, 204, 78, 85, 77, 66, 69, 82, 83, 128, 78, 85, 77, - 66, 69, 82, 128, 78, 85, 77, 128, 78, 85, 76, 76, 128, 78, 85, 76, 204, - 78, 85, 76, 128, 78, 85, 75, 84, 65, 128, 78, 85, 69, 78, 71, 128, 78, - 85, 69, 128, 78, 85, 66, 73, 65, 206, 78, 85, 65, 69, 128, 78, 85, 49, - 49, 128, 78, 85, 49, 177, 78, 85, 48, 50, 50, 65, 128, 78, 85, 48, 50, - 50, 128, 78, 85, 48, 50, 49, 128, 78, 85, 48, 50, 48, 128, 78, 85, 48, - 49, 57, 128, 78, 85, 48, 49, 56, 65, 128, 78, 85, 48, 49, 56, 128, 78, - 85, 48, 49, 55, 128, 78, 85, 48, 49, 54, 128, 78, 85, 48, 49, 53, 128, - 78, 85, 48, 49, 52, 128, 78, 85, 48, 49, 51, 128, 78, 85, 48, 49, 50, - 128, 78, 85, 48, 49, 49, 65, 128, 78, 85, 48, 49, 49, 128, 78, 85, 48, - 49, 48, 65, 128, 78, 85, 48, 49, 48, 128, 78, 85, 48, 48, 57, 128, 78, - 85, 48, 48, 56, 128, 78, 85, 48, 48, 55, 128, 78, 85, 48, 48, 54, 128, - 78, 85, 48, 48, 53, 128, 78, 85, 48, 48, 52, 128, 78, 85, 48, 48, 51, - 128, 78, 85, 48, 48, 50, 128, 78, 85, 48, 48, 49, 128, 78, 84, 88, 73, - 86, 128, 78, 84, 85, 85, 128, 78, 84, 85, 77, 128, 78, 84, 85, 74, 128, - 78, 84, 213, 78, 84, 83, 65, 85, 128, 78, 84, 79, 81, 80, 69, 78, 128, - 78, 84, 79, 71, 128, 78, 84, 79, 199, 78, 84, 73, 69, 197, 78, 84, 72, - 65, 85, 128, 78, 84, 69, 85, 78, 71, 66, 65, 128, 78, 84, 69, 85, 77, - 128, 78, 84, 69, 78, 128, 78, 84, 69, 69, 128, 78, 84, 65, 80, 128, 78, - 84, 65, 208, 78, 84, 65, 65, 128, 78, 83, 85, 79, 212, 78, 83, 85, 78, - 128, 78, 83, 85, 77, 128, 78, 83, 79, 77, 128, 78, 83, 73, 69, 69, 84, - 128, 78, 83, 73, 69, 69, 80, 128, 78, 83, 73, 69, 69, 128, 78, 83, 72, - 85, 84, 128, 78, 83, 72, 85, 212, 78, 83, 72, 85, 79, 80, 128, 78, 83, - 72, 85, 69, 128, 78, 83, 72, 73, 69, 69, 128, 78, 83, 72, 69, 69, 128, - 78, 83, 72, 65, 81, 128, 78, 83, 72, 65, 128, 78, 83, 69, 85, 65, 69, 78, - 128, 78, 83, 69, 78, 128, 78, 83, 65, 128, 78, 82, 89, 88, 128, 78, 82, - 89, 84, 128, 78, 82, 89, 82, 88, 128, 78, 82, 89, 82, 128, 78, 82, 89, - 80, 128, 78, 82, 89, 128, 78, 82, 85, 88, 128, 78, 82, 85, 84, 128, 78, - 82, 85, 82, 88, 128, 78, 82, 85, 82, 128, 78, 82, 85, 80, 128, 78, 82, - 85, 65, 128, 78, 82, 85, 128, 78, 82, 79, 88, 128, 78, 82, 79, 80, 128, - 78, 82, 79, 128, 78, 82, 69, 88, 128, 78, 82, 69, 84, 128, 78, 82, 69, - 211, 78, 82, 69, 80, 128, 78, 82, 69, 128, 78, 82, 65, 88, 128, 78, 82, - 65, 84, 128, 78, 82, 65, 80, 128, 78, 82, 65, 128, 78, 81, 73, 71, 128, - 78, 79, 89, 128, 78, 79, 88, 128, 78, 79, 87, 67, 128, 78, 79, 86, 69, - 77, 66, 69, 82, 128, 78, 79, 84, 84, 79, 128, 78, 79, 84, 69, 83, 128, - 78, 79, 84, 69, 72, 69, 65, 68, 128, 78, 79, 84, 69, 72, 69, 65, 196, 78, - 79, 84, 69, 66, 79, 79, 75, 128, 78, 79, 84, 69, 66, 79, 79, 203, 78, 79, - 84, 69, 128, 78, 79, 84, 197, 78, 79, 84, 67, 72, 69, 196, 78, 79, 84, - 67, 72, 128, 78, 79, 84, 65, 84, 73, 79, 206, 78, 79, 84, 128, 78, 79, - 212, 78, 79, 83, 69, 128, 78, 79, 83, 197, 78, 79, 82, 84, 72, 87, 69, - 83, 212, 78, 79, 82, 84, 72, 69, 82, 206, 78, 79, 82, 84, 72, 69, 65, 83, - 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, 78, 79, 82, 77, 65, 204, 78, 79, - 82, 68, 73, 195, 78, 79, 210, 78, 79, 80, 128, 78, 79, 79, 78, 85, 128, - 78, 79, 79, 128, 78, 79, 78, 70, 79, 82, 75, 73, 78, 71, 128, 78, 79, 78, - 45, 80, 79, 84, 65, 66, 76, 197, 78, 79, 78, 45, 74, 79, 73, 78, 69, 82, - 128, 78, 79, 78, 45, 66, 82, 69, 65, 75, 73, 78, 199, 78, 79, 78, 128, - 78, 79, 77, 73, 78, 65, 204, 78, 79, 75, 72, 85, 75, 128, 78, 79, 68, 69, - 128, 78, 79, 65, 128, 78, 79, 45, 66, 82, 69, 65, 203, 78, 78, 85, 85, - 128, 78, 78, 85, 128, 78, 78, 79, 79, 128, 78, 78, 79, 128, 78, 78, 78, - 85, 85, 128, 78, 78, 78, 85, 128, 78, 78, 78, 79, 79, 128, 78, 78, 78, - 79, 128, 78, 78, 78, 73, 73, 128, 78, 78, 78, 73, 128, 78, 78, 78, 69, - 69, 128, 78, 78, 78, 69, 128, 78, 78, 78, 65, 85, 128, 78, 78, 78, 65, - 73, 128, 78, 78, 78, 65, 65, 128, 78, 78, 78, 65, 128, 78, 78, 78, 128, - 78, 78, 72, 65, 128, 78, 78, 71, 79, 79, 128, 78, 78, 71, 79, 128, 78, - 78, 71, 73, 73, 128, 78, 78, 71, 73, 128, 78, 78, 71, 65, 65, 128, 78, - 78, 71, 65, 128, 78, 78, 71, 128, 78, 78, 66, 83, 80, 128, 78, 77, 128, - 78, 76, 65, 85, 128, 78, 76, 48, 50, 48, 128, 78, 76, 48, 49, 57, 128, - 78, 76, 48, 49, 56, 128, 78, 76, 48, 49, 55, 65, 128, 78, 76, 48, 49, 55, - 128, 78, 76, 48, 49, 54, 128, 78, 76, 48, 49, 53, 128, 78, 76, 48, 49, - 52, 128, 78, 76, 48, 49, 51, 128, 78, 76, 48, 49, 50, 128, 78, 76, 48, - 49, 49, 128, 78, 76, 48, 49, 48, 128, 78, 76, 48, 48, 57, 128, 78, 76, - 48, 48, 56, 128, 78, 76, 48, 48, 55, 128, 78, 76, 48, 48, 54, 128, 78, - 76, 48, 48, 53, 65, 128, 78, 76, 48, 48, 53, 128, 78, 76, 48, 48, 52, - 128, 78, 76, 48, 48, 51, 128, 78, 76, 48, 48, 50, 128, 78, 76, 48, 48, - 49, 128, 78, 76, 128, 78, 75, 79, 77, 128, 78, 75, 207, 78, 75, 73, 78, - 68, 73, 128, 78, 75, 65, 85, 128, 78, 75, 65, 65, 82, 65, 69, 128, 78, - 74, 89, 88, 128, 78, 74, 89, 84, 128, 78, 74, 89, 82, 88, 128, 78, 74, - 89, 82, 128, 78, 74, 89, 80, 128, 78, 74, 89, 128, 78, 74, 85, 88, 128, - 78, 74, 85, 82, 88, 128, 78, 74, 85, 82, 128, 78, 74, 85, 81, 65, 128, - 78, 74, 85, 80, 128, 78, 74, 85, 79, 88, 128, 78, 74, 85, 79, 128, 78, - 74, 85, 69, 81, 128, 78, 74, 85, 65, 69, 128, 78, 74, 85, 128, 78, 74, - 79, 88, 128, 78, 74, 79, 84, 128, 78, 74, 79, 80, 128, 78, 74, 79, 79, - 128, 78, 74, 79, 128, 78, 74, 73, 88, 128, 78, 74, 73, 84, 128, 78, 74, - 73, 80, 128, 78, 74, 73, 69, 88, 128, 78, 74, 73, 69, 84, 128, 78, 74, - 73, 69, 80, 128, 78, 74, 73, 69, 69, 128, 78, 74, 73, 69, 128, 78, 74, - 73, 128, 78, 74, 201, 78, 74, 69, 85, 88, 128, 78, 74, 69, 85, 84, 128, - 78, 74, 69, 85, 65, 69, 78, 65, 128, 78, 74, 69, 85, 65, 69, 77, 128, 78, - 74, 69, 69, 69, 69, 128, 78, 74, 69, 69, 128, 78, 74, 69, 197, 78, 74, - 69, 128, 78, 74, 65, 81, 128, 78, 74, 65, 80, 128, 78, 74, 65, 69, 77, - 76, 73, 128, 78, 74, 65, 69, 77, 128, 78, 74, 65, 65, 128, 78, 73, 88, - 128, 78, 73, 84, 82, 69, 128, 78, 73, 83, 65, 71, 128, 78, 73, 82, 85, - 71, 85, 128, 78, 73, 80, 128, 78, 73, 78, 84, 72, 128, 78, 73, 78, 69, - 84, 89, 128, 78, 73, 78, 69, 84, 217, 78, 73, 78, 69, 84, 69, 69, 78, - 128, 78, 73, 78, 69, 84, 69, 69, 206, 78, 73, 78, 69, 45, 84, 72, 73, 82, - 84, 89, 128, 78, 73, 78, 197, 78, 73, 78, 68, 65, 50, 128, 78, 73, 78, - 68, 65, 178, 78, 73, 78, 57, 128, 78, 73, 78, 128, 78, 73, 77, 128, 78, - 73, 205, 78, 73, 75, 79, 76, 83, 66, 85, 82, 199, 78, 73, 75, 72, 65, 72, - 73, 84, 128, 78, 73, 75, 65, 72, 73, 84, 128, 78, 73, 75, 65, 128, 78, - 73, 72, 83, 72, 86, 65, 83, 65, 128, 78, 73, 71, 73, 68, 65, 77, 73, 78, - 128, 78, 73, 71, 73, 68, 65, 69, 83, 72, 128, 78, 73, 71, 72, 84, 128, - 78, 73, 71, 72, 212, 78, 73, 71, 71, 65, 72, 73, 84, 65, 128, 78, 73, 69, - 88, 128, 78, 73, 69, 85, 78, 45, 84, 73, 75, 69, 85, 84, 128, 78, 73, 69, - 85, 78, 45, 84, 72, 73, 69, 85, 84, 72, 128, 78, 73, 69, 85, 78, 45, 83, - 73, 79, 83, 128, 78, 73, 69, 85, 78, 45, 82, 73, 69, 85, 76, 128, 78, 73, - 69, 85, 78, 45, 80, 73, 69, 85, 80, 128, 78, 73, 69, 85, 78, 45, 80, 65, - 78, 83, 73, 79, 83, 128, 78, 73, 69, 85, 78, 45, 75, 73, 89, 69, 79, 75, - 128, 78, 73, 69, 85, 78, 45, 72, 73, 69, 85, 72, 128, 78, 73, 69, 85, 78, - 45, 67, 73, 69, 85, 67, 128, 78, 73, 69, 85, 78, 45, 67, 72, 73, 69, 85, - 67, 72, 128, 78, 73, 69, 85, 206, 78, 73, 69, 80, 128, 78, 73, 69, 128, - 78, 73, 66, 128, 78, 73, 65, 128, 78, 73, 50, 128, 78, 72, 85, 69, 128, - 78, 72, 74, 65, 128, 78, 72, 128, 78, 71, 89, 69, 128, 78, 71, 86, 69, - 128, 78, 71, 85, 85, 128, 78, 71, 85, 79, 88, 128, 78, 71, 85, 79, 84, - 128, 78, 71, 85, 79, 128, 78, 71, 85, 65, 78, 128, 78, 71, 85, 65, 69, - 84, 128, 78, 71, 85, 65, 69, 128, 78, 71, 79, 88, 128, 78, 71, 79, 85, - 128, 78, 71, 79, 213, 78, 71, 79, 84, 128, 78, 71, 79, 81, 128, 78, 71, - 79, 80, 128, 78, 71, 79, 78, 128, 78, 71, 79, 77, 128, 78, 71, 79, 69, - 72, 128, 78, 71, 79, 69, 200, 78, 71, 207, 78, 71, 75, 89, 69, 69, 128, - 78, 71, 75, 87, 65, 69, 78, 128, 78, 71, 75, 85, 80, 128, 78, 71, 75, 85, - 78, 128, 78, 71, 75, 85, 77, 128, 78, 71, 75, 85, 69, 78, 90, 69, 85, 77, - 128, 78, 71, 75, 85, 197, 78, 71, 75, 73, 78, 68, 201, 78, 71, 75, 73, - 69, 69, 128, 78, 71, 75, 69, 85, 88, 128, 78, 71, 75, 69, 85, 82, 73, - 128, 78, 71, 75, 69, 85, 65, 69, 81, 128, 78, 71, 75, 69, 85, 65, 69, 77, - 128, 78, 71, 75, 65, 81, 128, 78, 71, 75, 65, 80, 128, 78, 71, 75, 65, - 65, 77, 73, 128, 78, 71, 75, 65, 128, 78, 71, 73, 69, 88, 128, 78, 71, - 73, 69, 80, 128, 78, 71, 73, 69, 128, 78, 71, 72, 65, 128, 78, 71, 71, - 87, 65, 69, 78, 128, 78, 71, 71, 85, 82, 65, 69, 128, 78, 71, 71, 85, 80, - 128, 78, 71, 71, 85, 79, 81, 128, 78, 71, 71, 85, 79, 209, 78, 71, 71, - 85, 79, 78, 128, 78, 71, 71, 85, 79, 77, 128, 78, 71, 71, 85, 77, 128, - 78, 71, 71, 85, 69, 69, 84, 128, 78, 71, 71, 85, 65, 69, 83, 72, 65, 197, - 78, 71, 71, 85, 65, 69, 206, 78, 71, 71, 85, 65, 128, 78, 71, 71, 85, - 128, 78, 71, 71, 79, 79, 128, 78, 71, 71, 79, 128, 78, 71, 71, 73, 128, - 78, 71, 71, 69, 85, 88, 128, 78, 71, 71, 69, 85, 65, 69, 84, 128, 78, 71, - 71, 69, 85, 65, 69, 128, 78, 71, 71, 69, 213, 78, 71, 71, 69, 78, 128, - 78, 71, 71, 69, 69, 84, 128, 78, 71, 71, 69, 69, 69, 69, 128, 78, 71, 71, - 69, 69, 128, 78, 71, 71, 69, 128, 78, 71, 71, 65, 80, 128, 78, 71, 71, - 65, 65, 77, 65, 69, 128, 78, 71, 71, 65, 65, 77, 128, 78, 71, 71, 65, 65, - 128, 78, 71, 71, 128, 78, 71, 69, 88, 128, 78, 71, 69, 85, 82, 69, 85, - 84, 128, 78, 71, 69, 80, 128, 78, 71, 69, 78, 128, 78, 71, 69, 69, 128, - 78, 71, 69, 65, 68, 65, 76, 128, 78, 71, 65, 88, 128, 78, 71, 65, 85, - 128, 78, 71, 65, 84, 128, 78, 71, 65, 211, 78, 71, 65, 81, 128, 78, 71, - 65, 80, 128, 78, 71, 65, 78, 71, 85, 128, 78, 71, 65, 78, 128, 78, 71, - 65, 73, 128, 78, 71, 65, 72, 128, 78, 71, 65, 65, 73, 128, 78, 71, 193, - 78, 70, 128, 78, 69, 88, 212, 78, 69, 88, 128, 78, 69, 87, 83, 80, 65, - 80, 69, 82, 128, 78, 69, 87, 76, 73, 78, 69, 128, 78, 69, 87, 76, 73, 78, - 197, 78, 69, 87, 128, 78, 69, 215, 78, 69, 85, 84, 82, 65, 76, 128, 78, - 69, 85, 84, 82, 65, 204, 78, 69, 85, 84, 69, 82, 128, 78, 69, 84, 87, 79, - 82, 75, 69, 196, 78, 69, 84, 128, 78, 69, 212, 78, 69, 83, 84, 69, 196, - 78, 69, 82, 196, 78, 69, 81, 85, 68, 65, 65, 128, 78, 69, 80, 84, 85, 78, - 69, 128, 78, 69, 80, 128, 78, 69, 79, 128, 78, 69, 207, 78, 69, 78, 79, - 69, 128, 78, 69, 78, 65, 78, 79, 128, 78, 69, 78, 128, 78, 69, 76, 128, - 78, 69, 73, 84, 72, 69, 210, 78, 69, 71, 65, 84, 73, 79, 206, 78, 69, 71, - 65, 84, 69, 196, 78, 69, 67, 75, 84, 73, 69, 128, 78, 69, 67, 75, 128, - 78, 69, 66, 69, 78, 83, 84, 73, 77, 77, 69, 128, 78, 68, 85, 88, 128, 78, - 68, 85, 84, 128, 78, 68, 85, 82, 88, 128, 78, 68, 85, 82, 128, 78, 68, - 85, 80, 128, 78, 68, 85, 78, 128, 78, 68, 213, 78, 68, 79, 88, 128, 78, - 68, 79, 84, 128, 78, 68, 79, 80, 128, 78, 68, 79, 79, 128, 78, 68, 79, - 78, 128, 78, 68, 79, 77, 66, 85, 128, 78, 68, 79, 76, 197, 78, 68, 73, - 88, 128, 78, 68, 73, 84, 128, 78, 68, 73, 81, 128, 78, 68, 73, 80, 128, - 78, 68, 73, 69, 88, 128, 78, 68, 73, 69, 128, 78, 68, 73, 68, 65, 128, - 78, 68, 73, 65, 81, 128, 78, 68, 69, 88, 128, 78, 68, 69, 85, 88, 128, - 78, 68, 69, 85, 84, 128, 78, 68, 69, 85, 65, 69, 82, 69, 69, 128, 78, 68, - 69, 80, 128, 78, 68, 69, 69, 128, 78, 68, 69, 128, 78, 68, 65, 88, 128, - 78, 68, 65, 84, 128, 78, 68, 65, 80, 128, 78, 68, 65, 77, 128, 78, 68, - 65, 65, 78, 71, 71, 69, 85, 65, 69, 84, 128, 78, 68, 65, 65, 128, 78, 68, - 65, 193, 78, 67, 72, 65, 85, 128, 78, 66, 89, 88, 128, 78, 66, 89, 84, - 128, 78, 66, 89, 82, 88, 128, 78, 66, 89, 82, 128, 78, 66, 89, 80, 128, - 78, 66, 89, 128, 78, 66, 85, 88, 128, 78, 66, 85, 84, 128, 78, 66, 85, - 82, 88, 128, 78, 66, 85, 82, 128, 78, 66, 85, 80, 128, 78, 66, 85, 128, - 78, 66, 79, 88, 128, 78, 66, 79, 84, 128, 78, 66, 79, 80, 128, 78, 66, - 79, 128, 78, 66, 73, 88, 128, 78, 66, 73, 84, 128, 78, 66, 73, 80, 128, - 78, 66, 73, 69, 88, 128, 78, 66, 73, 69, 80, 128, 78, 66, 73, 69, 128, - 78, 66, 73, 128, 78, 66, 72, 128, 78, 66, 65, 88, 128, 78, 66, 65, 84, - 128, 78, 66, 65, 80, 128, 78, 66, 65, 128, 78, 65, 89, 65, 78, 78, 65, - 128, 78, 65, 89, 128, 78, 65, 88, 73, 65, 206, 78, 65, 88, 128, 78, 65, - 85, 84, 72, 83, 128, 78, 65, 85, 68, 73, 218, 78, 65, 84, 85, 82, 65, - 204, 78, 65, 84, 73, 79, 78, 65, 204, 78, 65, 83, 75, 65, 80, 201, 78, - 65, 83, 72, 73, 128, 78, 65, 83, 65, 76, 73, 90, 65, 84, 73, 79, 78, 128, - 78, 65, 83, 65, 76, 73, 90, 65, 84, 73, 79, 206, 78, 65, 83, 65, 204, 78, - 65, 82, 82, 79, 215, 78, 65, 82, 128, 78, 65, 81, 128, 78, 65, 79, 211, - 78, 65, 78, 83, 65, 78, 65, 81, 128, 78, 65, 78, 71, 77, 79, 78, 84, 72, - 79, 128, 78, 65, 78, 68, 128, 78, 65, 78, 65, 128, 78, 65, 77, 69, 128, - 78, 65, 77, 197, 78, 65, 77, 50, 128, 78, 65, 77, 128, 78, 65, 75, 128, - 78, 65, 73, 82, 193, 78, 65, 73, 204, 78, 65, 71, 82, 201, 78, 65, 71, - 65, 82, 128, 78, 65, 71, 65, 128, 78, 65, 71, 193, 78, 65, 71, 128, 78, - 65, 199, 78, 65, 69, 128, 78, 65, 66, 76, 65, 128, 78, 65, 66, 65, 84, - 65, 69, 65, 206, 78, 65, 65, 83, 73, 75, 89, 65, 89, 65, 128, 78, 65, 65, - 75, 83, 73, 75, 89, 65, 89, 65, 128, 78, 65, 65, 73, 128, 78, 65, 193, - 78, 65, 52, 128, 78, 65, 50, 128, 78, 65, 45, 50, 128, 78, 48, 52, 50, - 128, 78, 48, 52, 49, 128, 78, 48, 52, 48, 128, 78, 48, 51, 57, 128, 78, - 48, 51, 56, 128, 78, 48, 51, 55, 65, 128, 78, 48, 51, 55, 128, 78, 48, - 51, 54, 128, 78, 48, 51, 53, 65, 128, 78, 48, 51, 53, 128, 78, 48, 51, - 52, 65, 128, 78, 48, 51, 52, 128, 78, 48, 51, 51, 65, 128, 78, 48, 51, - 51, 128, 78, 48, 51, 50, 128, 78, 48, 51, 49, 128, 78, 48, 51, 48, 128, - 78, 48, 50, 57, 128, 78, 48, 50, 56, 128, 78, 48, 50, 55, 128, 78, 48, - 50, 54, 128, 78, 48, 50, 53, 65, 128, 78, 48, 50, 53, 128, 78, 48, 50, - 52, 128, 78, 48, 50, 51, 128, 78, 48, 50, 50, 128, 78, 48, 50, 49, 128, - 78, 48, 50, 48, 128, 78, 48, 49, 57, 128, 78, 48, 49, 56, 66, 128, 78, - 48, 49, 56, 65, 128, 78, 48, 49, 56, 128, 78, 48, 49, 55, 128, 78, 48, - 49, 54, 128, 78, 48, 49, 53, 128, 78, 48, 49, 52, 128, 78, 48, 49, 51, - 128, 78, 48, 49, 50, 128, 78, 48, 49, 49, 128, 78, 48, 49, 48, 128, 78, - 48, 48, 57, 128, 78, 48, 48, 56, 128, 78, 48, 48, 55, 128, 78, 48, 48, - 54, 128, 78, 48, 48, 53, 128, 78, 48, 48, 52, 128, 78, 48, 48, 51, 128, - 78, 48, 48, 50, 128, 78, 48, 48, 49, 128, 78, 45, 67, 82, 69, 197, 78, - 45, 65, 82, 217, 77, 89, 88, 128, 77, 89, 84, 128, 77, 89, 83, 76, 73, - 84, 69, 128, 77, 89, 80, 128, 77, 89, 65, 128, 77, 89, 193, 77, 89, 128, - 77, 217, 77, 87, 79, 79, 128, 77, 87, 79, 128, 77, 87, 73, 73, 128, 77, - 87, 73, 128, 77, 87, 69, 69, 128, 77, 87, 69, 128, 77, 87, 65, 65, 128, - 77, 87, 65, 128, 77, 87, 128, 77, 215, 77, 86, 83, 128, 77, 86, 79, 80, - 128, 77, 86, 73, 128, 77, 86, 69, 85, 65, 69, 78, 71, 65, 77, 128, 77, - 86, 128, 77, 214, 77, 85, 88, 128, 77, 85, 85, 83, 73, 75, 65, 84, 79, - 65, 78, 128, 77, 85, 85, 82, 68, 72, 65, 74, 193, 77, 85, 85, 128, 77, - 85, 84, 128, 77, 85, 83, 73, 67, 128, 77, 85, 83, 73, 195, 77, 85, 83, - 72, 82, 79, 79, 77, 128, 77, 85, 83, 72, 51, 128, 77, 85, 83, 72, 179, - 77, 85, 83, 72, 128, 77, 85, 83, 200, 77, 85, 83, 128, 77, 85, 82, 88, - 128, 77, 85, 82, 71, 85, 50, 128, 77, 85, 82, 69, 128, 77, 85, 82, 68, - 65, 128, 77, 85, 82, 68, 193, 77, 85, 82, 128, 77, 85, 81, 68, 65, 77, - 128, 77, 85, 80, 128, 77, 85, 79, 88, 128, 77, 85, 79, 84, 128, 77, 85, - 79, 80, 128, 77, 85, 79, 77, 65, 69, 128, 77, 85, 79, 128, 77, 85, 78, - 83, 85, 66, 128, 77, 85, 78, 65, 72, 128, 77, 85, 78, 128, 77, 85, 76, - 84, 73, 83, 69, 84, 128, 77, 85, 76, 84, 73, 83, 69, 212, 77, 85, 76, 84, - 73, 80, 76, 73, 67, 65, 84, 73, 79, 78, 128, 77, 85, 76, 84, 73, 80, 76, - 73, 67, 65, 84, 73, 79, 206, 77, 85, 76, 84, 73, 80, 76, 69, 128, 77, 85, - 76, 84, 73, 80, 76, 197, 77, 85, 76, 84, 73, 79, 67, 85, 76, 65, 210, 77, - 85, 76, 84, 73, 77, 65, 80, 128, 77, 85, 76, 84, 201, 77, 85, 76, 84, 65, - 78, 201, 77, 85, 75, 80, 72, 82, 69, 78, 71, 128, 77, 85, 73, 78, 128, - 77, 85, 71, 83, 128, 77, 85, 71, 128, 77, 85, 199, 77, 85, 69, 78, 128, - 77, 85, 69, 128, 77, 85, 67, 72, 128, 77, 85, 67, 200, 77, 85, 67, 65, - 65, 68, 128, 77, 85, 65, 83, 128, 77, 85, 65, 78, 128, 77, 85, 65, 69, - 128, 77, 85, 45, 71, 65, 65, 72, 76, 65, 193, 77, 213, 77, 83, 128, 77, - 82, 207, 77, 80, 65, 128, 77, 79, 89, 65, 73, 128, 77, 79, 88, 128, 77, - 79, 86, 73, 197, 77, 79, 86, 69, 211, 77, 79, 86, 69, 77, 69, 78, 84, 45, - 87, 65, 76, 76, 80, 76, 65, 78, 197, 77, 79, 86, 69, 77, 69, 78, 84, 45, - 72, 73, 78, 71, 197, 77, 79, 86, 69, 77, 69, 78, 84, 45, 70, 76, 79, 79, - 82, 80, 76, 65, 78, 197, 77, 79, 86, 69, 77, 69, 78, 84, 45, 68, 73, 65, - 71, 79, 78, 65, 204, 77, 79, 86, 69, 77, 69, 78, 84, 128, 77, 79, 86, 69, - 77, 69, 78, 212, 77, 79, 86, 69, 196, 77, 79, 86, 69, 128, 77, 79, 85, - 84, 72, 128, 77, 79, 85, 83, 69, 128, 77, 79, 85, 83, 197, 77, 79, 85, - 78, 84, 65, 73, 78, 83, 128, 77, 79, 85, 78, 84, 65, 73, 78, 128, 77, 79, - 85, 78, 84, 65, 73, 206, 77, 79, 85, 78, 212, 77, 79, 85, 78, 68, 128, - 77, 79, 85, 78, 196, 77, 79, 84, 79, 82, 87, 65, 89, 128, 77, 79, 84, 79, - 82, 67, 89, 67, 76, 69, 128, 77, 79, 84, 79, 210, 77, 79, 84, 72, 69, 82, - 128, 77, 79, 84, 128, 77, 79, 83, 81, 85, 69, 128, 77, 79, 82, 84, 85, - 85, 77, 128, 77, 79, 82, 84, 65, 82, 128, 77, 79, 82, 80, 72, 79, 76, 79, - 71, 73, 67, 65, 204, 77, 79, 82, 78, 73, 78, 71, 128, 77, 79, 80, 128, - 77, 79, 79, 83, 69, 45, 67, 82, 69, 197, 77, 79, 79, 78, 128, 77, 79, 79, - 206, 77, 79, 79, 77, 80, 85, 81, 128, 77, 79, 79, 77, 69, 85, 84, 128, - 77, 79, 79, 68, 128, 77, 79, 79, 196, 77, 79, 79, 128, 77, 79, 78, 84, - 73, 69, 69, 78, 128, 77, 79, 78, 84, 72, 128, 77, 79, 78, 84, 200, 77, - 79, 78, 83, 84, 69, 82, 128, 77, 79, 78, 79, 83, 84, 65, 66, 76, 197, 77, - 79, 78, 79, 83, 80, 65, 67, 197, 77, 79, 78, 79, 82, 65, 73, 76, 128, 77, - 79, 78, 79, 71, 82, 65, 80, 200, 77, 79, 78, 79, 71, 82, 65, 77, 77, 79, - 211, 77, 79, 78, 79, 71, 82, 65, 205, 77, 79, 78, 79, 70, 79, 78, 73, 65, - 83, 128, 77, 79, 78, 79, 67, 85, 76, 65, 210, 77, 79, 78, 75, 69, 89, - 128, 77, 79, 78, 75, 69, 217, 77, 79, 78, 73, 128, 77, 79, 78, 71, 75, - 69, 85, 65, 69, 81, 128, 77, 79, 78, 69, 89, 45, 77, 79, 85, 84, 200, 77, - 79, 78, 69, 217, 77, 79, 78, 128, 77, 79, 206, 77, 79, 76, 128, 77, 79, - 72, 65, 77, 77, 65, 196, 77, 79, 68, 85, 76, 207, 77, 79, 68, 73, 70, 73, - 69, 82, 45, 57, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 56, 128, 77, 79, - 68, 73, 70, 73, 69, 82, 45, 55, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, - 54, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 53, 128, 77, 79, 68, 73, 70, - 73, 69, 82, 45, 52, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 51, 128, 77, - 79, 68, 73, 70, 73, 69, 82, 45, 50, 128, 77, 79, 68, 73, 70, 73, 69, 82, - 45, 49, 54, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 53, 128, 77, 79, - 68, 73, 70, 73, 69, 82, 45, 49, 52, 128, 77, 79, 68, 73, 70, 73, 69, 82, - 45, 49, 51, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 50, 128, 77, 79, - 68, 73, 70, 73, 69, 82, 45, 49, 49, 128, 77, 79, 68, 73, 70, 73, 69, 82, - 45, 49, 48, 128, 77, 79, 68, 201, 77, 79, 68, 69, 83, 84, 89, 128, 77, - 79, 68, 69, 77, 128, 77, 79, 68, 69, 76, 83, 128, 77, 79, 68, 69, 76, - 128, 77, 79, 68, 69, 128, 77, 79, 66, 73, 76, 197, 77, 79, 65, 128, 77, - 207, 77, 78, 89, 65, 205, 77, 78, 65, 83, 128, 77, 77, 83, 80, 128, 77, - 77, 128, 77, 205, 77, 76, 65, 128, 77, 76, 128, 77, 75, 80, 65, 82, 65, - 209, 77, 73, 88, 128, 77, 73, 84, 128, 77, 73, 83, 82, 65, 128, 77, 73, - 82, 73, 66, 65, 65, 82, 85, 128, 77, 73, 82, 73, 128, 77, 73, 82, 69, 68, - 128, 77, 73, 80, 128, 77, 73, 78, 89, 128, 77, 73, 78, 85, 83, 45, 79, - 82, 45, 80, 76, 85, 211, 77, 73, 78, 85, 83, 128, 77, 73, 78, 73, 83, 84, - 69, 82, 128, 77, 73, 78, 73, 77, 73, 90, 69, 128, 77, 73, 78, 73, 77, 65, - 128, 77, 73, 78, 73, 68, 73, 83, 67, 128, 77, 73, 78, 73, 66, 85, 83, - 128, 77, 73, 77, 69, 128, 77, 73, 77, 128, 77, 73, 76, 76, 73, 79, 78, - 83, 128, 77, 73, 76, 76, 73, 79, 78, 211, 77, 73, 76, 76, 69, 84, 128, - 77, 73, 76, 76, 197, 77, 73, 76, 204, 77, 73, 76, 75, 217, 77, 73, 76, - 73, 84, 65, 82, 217, 77, 73, 76, 128, 77, 73, 75, 85, 82, 79, 78, 128, - 77, 73, 75, 82, 79, 206, 77, 73, 75, 82, 73, 128, 77, 73, 73, 78, 128, - 77, 73, 73, 128, 77, 73, 199, 77, 73, 69, 88, 128, 77, 73, 69, 85, 77, - 45, 84, 73, 75, 69, 85, 84, 128, 77, 73, 69, 85, 77, 45, 83, 83, 65, 78, - 71, 83, 73, 79, 83, 128, 77, 73, 69, 85, 77, 45, 83, 83, 65, 78, 71, 78, - 73, 69, 85, 78, 128, 77, 73, 69, 85, 77, 45, 82, 73, 69, 85, 76, 128, 77, - 73, 69, 85, 77, 45, 80, 73, 69, 85, 80, 45, 83, 73, 79, 83, 128, 77, 73, - 69, 85, 77, 45, 80, 73, 69, 85, 80, 128, 77, 73, 69, 85, 77, 45, 80, 65, - 78, 83, 73, 79, 83, 128, 77, 73, 69, 85, 77, 45, 78, 73, 69, 85, 78, 128, - 77, 73, 69, 85, 77, 45, 67, 73, 69, 85, 67, 128, 77, 73, 69, 85, 77, 45, - 67, 72, 73, 69, 85, 67, 72, 128, 77, 73, 69, 85, 205, 77, 73, 69, 80, - 128, 77, 73, 69, 69, 128, 77, 73, 69, 128, 77, 73, 68, 76, 73, 78, 197, - 77, 73, 68, 68, 76, 69, 45, 87, 69, 76, 83, 200, 77, 73, 68, 68, 76, 69, - 128, 77, 73, 68, 45, 76, 69, 86, 69, 204, 77, 73, 196, 77, 73, 67, 82, - 79, 83, 67, 79, 80, 69, 128, 77, 73, 67, 82, 79, 80, 72, 79, 78, 69, 128, - 77, 73, 67, 82, 207, 77, 73, 67, 210, 77, 72, 90, 128, 77, 72, 65, 128, - 77, 72, 128, 77, 71, 85, 88, 128, 77, 71, 85, 84, 128, 77, 71, 85, 82, - 88, 128, 77, 71, 85, 82, 128, 77, 71, 85, 80, 128, 77, 71, 85, 79, 88, - 128, 77, 71, 85, 79, 80, 128, 77, 71, 85, 79, 128, 77, 71, 85, 128, 77, - 71, 79, 88, 128, 77, 71, 79, 84, 128, 77, 71, 79, 80, 128, 77, 71, 79, - 128, 77, 71, 207, 77, 71, 73, 69, 88, 128, 77, 71, 73, 69, 128, 77, 71, - 69, 88, 128, 77, 71, 69, 80, 128, 77, 71, 69, 128, 77, 71, 66, 85, 128, - 77, 71, 66, 79, 79, 128, 77, 71, 66, 79, 70, 85, 77, 128, 77, 71, 66, 79, - 128, 77, 71, 66, 73, 128, 77, 71, 66, 69, 85, 78, 128, 77, 71, 66, 69, - 78, 128, 77, 71, 66, 69, 69, 128, 77, 71, 66, 69, 128, 77, 71, 66, 65, - 83, 65, 81, 128, 77, 71, 66, 65, 83, 65, 128, 77, 71, 65, 88, 128, 77, - 71, 65, 84, 128, 77, 71, 65, 80, 128, 77, 71, 65, 128, 77, 71, 128, 77, - 70, 79, 78, 128, 77, 70, 79, 206, 77, 70, 79, 128, 77, 70, 73, 89, 65, - 81, 128, 77, 70, 73, 69, 69, 128, 77, 70, 69, 85, 84, 128, 77, 70, 69, - 85, 81, 128, 77, 70, 69, 85, 65, 69, 128, 77, 70, 65, 65, 128, 77, 69, - 90, 90, 79, 128, 77, 69, 88, 128, 77, 69, 85, 212, 77, 69, 85, 81, 128, - 77, 69, 85, 78, 74, 79, 77, 78, 68, 69, 85, 81, 128, 77, 69, 85, 78, 128, - 77, 69, 84, 82, 79, 128, 77, 69, 84, 82, 73, 67, 65, 204, 77, 69, 84, 82, - 73, 65, 128, 77, 69, 84, 82, 69, 84, 69, 211, 77, 69, 84, 79, 66, 69, 76, - 85, 83, 128, 77, 69, 84, 69, 75, 128, 77, 69, 84, 69, 71, 128, 77, 69, - 84, 65, 76, 128, 77, 69, 84, 193, 77, 69, 83, 83, 69, 78, 73, 65, 206, - 77, 69, 83, 83, 65, 71, 69, 128, 77, 69, 83, 83, 65, 71, 197, 77, 69, 83, - 79, 128, 77, 69, 83, 73, 128, 77, 69, 83, 72, 128, 77, 69, 82, 75, 72, - 65, 128, 77, 69, 82, 75, 72, 193, 77, 69, 82, 73, 68, 73, 65, 78, 83, - 128, 77, 69, 82, 73, 128, 77, 69, 82, 71, 69, 128, 77, 69, 82, 67, 85, - 82, 89, 128, 77, 69, 82, 67, 85, 82, 217, 77, 69, 78, 79, 82, 65, 200, - 77, 69, 78, 79, 69, 128, 77, 69, 78, 68, 85, 84, 128, 77, 69, 78, 128, - 77, 69, 77, 79, 128, 77, 69, 77, 66, 69, 82, 83, 72, 73, 80, 128, 77, 69, - 77, 66, 69, 82, 128, 77, 69, 77, 66, 69, 210, 77, 69, 77, 45, 81, 79, 80, - 72, 128, 77, 69, 77, 128, 77, 69, 205, 77, 69, 76, 79, 68, 73, 195, 77, - 69, 76, 73, 75, 128, 77, 69, 73, 90, 73, 128, 77, 69, 71, 65, 84, 79, 78, - 128, 77, 69, 71, 65, 80, 72, 79, 78, 69, 128, 77, 69, 71, 65, 76, 73, - 128, 77, 69, 69, 84, 79, 82, 85, 128, 77, 69, 69, 84, 69, 201, 77, 69, - 69, 84, 128, 77, 69, 69, 77, 85, 128, 77, 69, 69, 77, 128, 77, 69, 69, - 202, 77, 69, 69, 69, 69, 128, 77, 69, 68, 73, 85, 77, 128, 77, 69, 68, - 73, 85, 205, 77, 69, 68, 73, 67, 73, 78, 69, 128, 77, 69, 68, 73, 67, 65, - 204, 77, 69, 68, 65, 76, 128, 77, 69, 65, 84, 128, 77, 69, 65, 212, 77, - 69, 65, 83, 85, 82, 69, 196, 77, 69, 65, 83, 85, 82, 69, 128, 77, 69, 65, - 83, 85, 82, 197, 77, 68, 85, 206, 77, 196, 77, 67, 72, 213, 77, 67, 72, - 65, 206, 77, 195, 77, 66, 85, 85, 128, 77, 66, 85, 79, 81, 128, 77, 66, - 85, 79, 128, 77, 66, 85, 69, 128, 77, 66, 85, 65, 69, 77, 128, 77, 66, - 85, 65, 69, 128, 77, 66, 79, 79, 128, 77, 66, 79, 128, 77, 66, 73, 84, - 128, 77, 66, 73, 212, 77, 66, 73, 82, 73, 69, 69, 78, 128, 77, 66, 73, - 128, 77, 66, 69, 85, 88, 128, 77, 66, 69, 85, 82, 73, 128, 77, 66, 69, - 85, 77, 128, 77, 66, 69, 82, 65, 69, 128, 77, 66, 69, 78, 128, 77, 66, - 69, 69, 75, 69, 69, 84, 128, 77, 66, 69, 69, 128, 77, 66, 69, 128, 77, - 66, 65, 81, 128, 77, 66, 65, 78, 89, 73, 128, 77, 66, 65, 65, 82, 65, 69, - 128, 77, 66, 65, 65, 75, 69, 84, 128, 77, 66, 65, 65, 128, 77, 66, 65, - 193, 77, 66, 193, 77, 66, 52, 128, 77, 66, 51, 128, 77, 66, 50, 128, 77, - 65, 89, 69, 203, 77, 65, 89, 65, 78, 78, 65, 128, 77, 65, 89, 128, 77, - 65, 88, 73, 77, 73, 90, 69, 128, 77, 65, 88, 73, 77, 65, 128, 77, 65, 88, - 128, 77, 65, 85, 128, 77, 65, 84, 84, 79, 67, 75, 128, 77, 65, 84, 82, - 73, 88, 128, 77, 65, 84, 69, 82, 73, 65, 76, 83, 128, 77, 65, 84, 128, - 77, 65, 83, 213, 77, 65, 83, 83, 73, 78, 71, 128, 77, 65, 83, 83, 65, 71, - 69, 128, 77, 65, 83, 79, 82, 193, 77, 65, 83, 75, 128, 77, 65, 83, 72, - 70, 65, 65, 84, 128, 77, 65, 83, 72, 50, 128, 77, 65, 83, 67, 85, 76, 73, - 78, 197, 77, 65, 82, 89, 128, 77, 65, 82, 87, 65, 82, 201, 77, 65, 82, - 85, 75, 85, 128, 77, 65, 82, 84, 89, 82, 73, 193, 77, 65, 82, 82, 89, 73, - 78, 199, 77, 65, 82, 82, 73, 65, 71, 197, 77, 65, 82, 75, 211, 77, 65, - 82, 75, 69, 82, 128, 77, 65, 82, 75, 45, 52, 128, 77, 65, 82, 75, 45, 51, - 128, 77, 65, 82, 75, 45, 50, 128, 77, 65, 82, 75, 45, 49, 128, 77, 65, - 82, 69, 128, 77, 65, 82, 67, 72, 128, 77, 65, 82, 67, 65, 84, 79, 45, 83, - 84, 65, 67, 67, 65, 84, 79, 128, 77, 65, 82, 67, 65, 84, 79, 128, 77, 65, - 82, 67, 65, 83, 73, 84, 69, 128, 77, 65, 82, 66, 85, 84, 65, 128, 77, 65, - 82, 66, 85, 84, 193, 77, 65, 82, 128, 77, 65, 81, 65, 70, 128, 77, 65, - 81, 128, 77, 65, 80, 76, 197, 77, 65, 80, 73, 81, 128, 77, 65, 208, 77, - 65, 79, 128, 77, 65, 78, 84, 69, 76, 80, 73, 69, 67, 197, 77, 65, 78, 83, - 89, 79, 78, 128, 77, 65, 78, 83, 85, 65, 69, 128, 77, 65, 78, 78, 65, + 87, 76, 128, 79, 86, 69, 82, 82, 73, 68, 69, 128, 79, 86, 69, 82, 76, 79, + 78, 199, 79, 86, 69, 82, 76, 73, 78, 69, 128, 79, 86, 69, 82, 76, 65, 89, + 128, 79, 86, 69, 82, 76, 65, 80, 80, 73, 78, 199, 79, 86, 69, 82, 76, 65, + 80, 128, 79, 86, 69, 82, 76, 65, 73, 68, 128, 79, 86, 69, 82, 66, 65, 82, + 128, 79, 86, 65, 76, 128, 79, 86, 65, 204, 79, 85, 84, 76, 73, 78, 69, + 196, 79, 85, 84, 76, 73, 78, 69, 128, 79, 85, 84, 69, 210, 79, 85, 84, + 66, 79, 216, 79, 85, 78, 75, 73, 193, 79, 85, 78, 67, 69, 128, 79, 85, + 78, 67, 197, 79, 84, 85, 128, 79, 84, 84, 65, 86, 193, 79, 84, 84, 128, + 79, 84, 72, 69, 82, 211, 79, 84, 72, 69, 210, 79, 84, 72, 65, 76, 65, + 206, 79, 84, 72, 65, 76, 128, 79, 83, 77, 65, 78, 89, 193, 79, 83, 67, + 128, 79, 83, 65, 71, 197, 79, 82, 84, 72, 79, 71, 79, 78, 65, 204, 79, + 82, 84, 72, 79, 68, 79, 216, 79, 82, 78, 65, 84, 197, 79, 82, 78, 65, 77, + 69, 78, 84, 83, 128, 79, 82, 78, 65, 77, 69, 78, 84, 128, 79, 82, 78, 65, + 77, 69, 78, 212, 79, 82, 75, 72, 79, 206, 79, 82, 73, 89, 193, 79, 82, + 73, 71, 73, 78, 65, 204, 79, 82, 73, 71, 73, 78, 128, 79, 82, 69, 45, 50, + 128, 79, 82, 68, 73, 78, 65, 204, 79, 82, 68, 69, 210, 79, 82, 67, 72, + 73, 68, 128, 79, 82, 65, 78, 71, 197, 79, 80, 84, 73, 79, 206, 79, 80, + 84, 73, 67, 65, 204, 79, 80, 80, 82, 69, 83, 83, 73, 79, 78, 128, 79, 80, + 80, 79, 83, 73, 84, 73, 79, 78, 128, 79, 80, 80, 79, 83, 73, 78, 199, 79, + 80, 80, 79, 83, 69, 128, 79, 80, 72, 73, 85, 67, 72, 85, 83, 128, 79, 80, + 69, 82, 65, 84, 79, 82, 128, 79, 80, 69, 82, 65, 84, 79, 210, 79, 80, 69, + 82, 65, 84, 73, 78, 199, 79, 80, 69, 78, 73, 78, 199, 79, 80, 69, 78, 45, + 80, 128, 79, 80, 69, 78, 45, 79, 85, 84, 76, 73, 78, 69, 196, 79, 80, 69, + 78, 45, 79, 128, 79, 80, 69, 78, 45, 207, 79, 80, 69, 78, 45, 72, 69, 65, + 68, 69, 196, 79, 80, 69, 78, 45, 67, 73, 82, 67, 85, 73, 84, 45, 79, 85, + 84, 80, 85, 212, 79, 80, 69, 78, 128, 79, 79, 90, 69, 128, 79, 79, 89, + 65, 78, 78, 65, 128, 79, 79, 85, 128, 79, 79, 77, 85, 128, 79, 79, 72, + 128, 79, 79, 69, 128, 79, 79, 66, 79, 79, 70, 73, 76, 73, 128, 79, 78, + 85, 128, 79, 78, 83, 85, 128, 79, 78, 78, 128, 79, 78, 75, 65, 82, 128, + 79, 78, 69, 83, 69, 76, 70, 128, 79, 78, 69, 45, 87, 65, 217, 79, 78, 69, + 45, 84, 72, 73, 82, 84, 89, 128, 79, 78, 69, 45, 76, 73, 78, 197, 79, 78, + 69, 45, 72, 85, 78, 68, 82, 69, 68, 45, 65, 78, 68, 45, 83, 73, 88, 84, + 73, 69, 84, 72, 128, 79, 78, 67, 79, 77, 73, 78, 199, 79, 78, 65, 80, + 128, 79, 78, 45, 79, 70, 198, 79, 77, 73, 83, 83, 73, 79, 206, 79, 77, + 73, 67, 82, 79, 78, 128, 79, 77, 73, 67, 82, 79, 206, 79, 77, 69, 71, 65, + 128, 79, 77, 69, 71, 193, 79, 77, 65, 76, 79, 78, 128, 79, 76, 73, 86, + 69, 128, 79, 76, 73, 71, 79, 206, 79, 76, 68, 128, 79, 75, 84, 207, 79, + 75, 65, 82, 65, 128, 79, 75, 65, 82, 193, 79, 74, 73, 66, 87, 65, 217, + 79, 74, 69, 79, 78, 128, 79, 73, 78, 128, 79, 73, 76, 128, 79, 73, 204, + 79, 72, 77, 128, 79, 72, 205, 79, 71, 82, 69, 128, 79, 71, 79, 78, 69, + 75, 128, 79, 71, 79, 78, 69, 203, 79, 71, 72, 65, 205, 79, 70, 70, 73, + 67, 69, 82, 128, 79, 70, 70, 73, 67, 69, 128, 79, 70, 70, 73, 67, 197, + 79, 70, 70, 128, 79, 69, 89, 128, 79, 69, 75, 128, 79, 69, 69, 128, 79, + 68, 69, 78, 128, 79, 68, 68, 128, 79, 68, 196, 79, 67, 84, 79, 80, 85, + 83, 128, 79, 67, 84, 79, 66, 69, 82, 128, 79, 67, 84, 69, 212, 79, 67, + 84, 65, 71, 79, 78, 65, 204, 79, 67, 84, 65, 71, 79, 78, 128, 79, 67, + 210, 79, 67, 76, 79, 67, 75, 128, 79, 67, 67, 76, 85, 83, 73, 79, 78, + 128, 79, 66, 83, 84, 82, 85, 67, 84, 73, 79, 78, 128, 79, 66, 79, 76, + 211, 79, 66, 79, 204, 79, 66, 79, 70, 73, 76, 73, 128, 79, 66, 76, 73, + 81, 85, 197, 79, 66, 74, 69, 67, 212, 79, 66, 69, 76, 85, 83, 128, 79, + 66, 69, 76, 79, 83, 128, 79, 66, 128, 79, 65, 89, 128, 79, 65, 75, 128, + 79, 65, 66, 79, 65, 70, 73, 76, 73, 128, 79, 193, 79, 48, 53, 49, 128, + 79, 48, 53, 48, 66, 128, 79, 48, 53, 48, 65, 128, 79, 48, 53, 48, 128, + 79, 48, 52, 57, 128, 79, 48, 52, 56, 128, 79, 48, 52, 55, 128, 79, 48, + 52, 54, 128, 79, 48, 52, 53, 128, 79, 48, 52, 52, 128, 79, 48, 52, 51, + 128, 79, 48, 52, 50, 128, 79, 48, 52, 49, 128, 79, 48, 52, 48, 128, 79, + 48, 51, 57, 128, 79, 48, 51, 56, 128, 79, 48, 51, 55, 128, 79, 48, 51, + 54, 68, 128, 79, 48, 51, 54, 67, 128, 79, 48, 51, 54, 66, 128, 79, 48, + 51, 54, 65, 128, 79, 48, 51, 54, 128, 79, 48, 51, 53, 128, 79, 48, 51, + 52, 128, 79, 48, 51, 51, 65, 128, 79, 48, 51, 51, 128, 79, 48, 51, 50, + 128, 79, 48, 51, 49, 128, 79, 48, 51, 48, 65, 128, 79, 48, 51, 48, 128, + 79, 48, 50, 57, 65, 128, 79, 48, 50, 57, 128, 79, 48, 50, 56, 128, 79, + 48, 50, 55, 128, 79, 48, 50, 54, 128, 79, 48, 50, 53, 65, 128, 79, 48, + 50, 53, 128, 79, 48, 50, 52, 65, 128, 79, 48, 50, 52, 128, 79, 48, 50, + 51, 128, 79, 48, 50, 50, 128, 79, 48, 50, 49, 128, 79, 48, 50, 48, 65, + 128, 79, 48, 50, 48, 128, 79, 48, 49, 57, 65, 128, 79, 48, 49, 57, 128, + 79, 48, 49, 56, 128, 79, 48, 49, 55, 128, 79, 48, 49, 54, 128, 79, 48, + 49, 53, 128, 79, 48, 49, 52, 128, 79, 48, 49, 51, 128, 79, 48, 49, 50, + 128, 79, 48, 49, 49, 128, 79, 48, 49, 48, 67, 128, 79, 48, 49, 48, 66, + 128, 79, 48, 49, 48, 65, 128, 79, 48, 49, 48, 128, 79, 48, 48, 57, 128, + 79, 48, 48, 56, 128, 79, 48, 48, 55, 128, 79, 48, 48, 54, 70, 128, 79, + 48, 48, 54, 69, 128, 79, 48, 48, 54, 68, 128, 79, 48, 48, 54, 67, 128, + 79, 48, 48, 54, 66, 128, 79, 48, 48, 54, 65, 128, 79, 48, 48, 54, 128, + 79, 48, 48, 53, 65, 128, 79, 48, 48, 53, 128, 79, 48, 48, 52, 128, 79, + 48, 48, 51, 128, 79, 48, 48, 50, 128, 79, 48, 48, 49, 65, 128, 79, 48, + 48, 49, 128, 79, 45, 89, 69, 128, 79, 45, 79, 45, 73, 128, 79, 45, 69, + 128, 78, 90, 89, 88, 128, 78, 90, 89, 84, 128, 78, 90, 89, 82, 88, 128, + 78, 90, 89, 82, 128, 78, 90, 89, 80, 128, 78, 90, 89, 128, 78, 90, 85, + 88, 128, 78, 90, 85, 82, 88, 128, 78, 90, 85, 82, 128, 78, 90, 85, 81, + 128, 78, 90, 85, 80, 128, 78, 90, 85, 79, 88, 128, 78, 90, 85, 79, 128, + 78, 90, 85, 206, 78, 90, 85, 128, 78, 90, 79, 88, 128, 78, 90, 79, 80, + 128, 78, 90, 73, 88, 128, 78, 90, 73, 84, 128, 78, 90, 73, 80, 128, 78, + 90, 73, 69, 88, 128, 78, 90, 73, 69, 80, 128, 78, 90, 73, 69, 128, 78, + 90, 73, 128, 78, 90, 69, 88, 128, 78, 90, 69, 85, 77, 128, 78, 90, 69, + 128, 78, 90, 65, 88, 128, 78, 90, 65, 84, 128, 78, 90, 65, 81, 128, 78, + 90, 65, 80, 128, 78, 90, 65, 128, 78, 90, 193, 78, 89, 87, 65, 128, 78, + 89, 85, 88, 128, 78, 89, 85, 85, 128, 78, 89, 85, 84, 128, 78, 89, 85, + 80, 128, 78, 89, 85, 79, 88, 128, 78, 89, 85, 79, 80, 128, 78, 89, 85, + 79, 128, 78, 89, 85, 78, 128, 78, 89, 85, 69, 128, 78, 89, 85, 128, 78, + 89, 79, 88, 128, 78, 89, 79, 84, 128, 78, 89, 79, 80, 128, 78, 89, 79, + 79, 128, 78, 89, 79, 78, 128, 78, 89, 79, 65, 128, 78, 89, 79, 128, 78, + 89, 74, 65, 128, 78, 89, 73, 88, 128, 78, 89, 73, 84, 128, 78, 89, 73, + 212, 78, 89, 73, 211, 78, 89, 73, 210, 78, 89, 73, 80, 128, 78, 89, 73, + 78, 45, 68, 79, 128, 78, 89, 73, 78, 128, 78, 89, 73, 73, 128, 78, 89, + 73, 69, 88, 128, 78, 89, 73, 69, 84, 128, 78, 89, 73, 69, 80, 128, 78, + 89, 73, 69, 128, 78, 89, 73, 128, 78, 89, 201, 78, 89, 72, 65, 128, 78, + 89, 69, 84, 128, 78, 89, 69, 212, 78, 89, 69, 78, 128, 78, 89, 69, 72, + 128, 78, 89, 69, 200, 78, 89, 69, 69, 128, 78, 89, 69, 128, 78, 89, 196, + 78, 89, 67, 65, 128, 78, 89, 65, 85, 128, 78, 89, 65, 73, 128, 78, 89, + 65, 72, 128, 78, 89, 65, 69, 77, 65, 69, 128, 78, 89, 65, 65, 128, 78, + 87, 79, 79, 128, 78, 87, 79, 128, 78, 87, 73, 73, 128, 78, 87, 73, 128, + 78, 87, 69, 128, 78, 87, 65, 65, 128, 78, 87, 65, 128, 78, 87, 128, 78, + 86, 128, 78, 85, 88, 128, 78, 85, 85, 78, 128, 78, 85, 85, 128, 78, 85, + 84, 73, 76, 76, 85, 128, 78, 85, 84, 128, 78, 85, 212, 78, 85, 82, 88, + 128, 78, 85, 82, 128, 78, 85, 80, 128, 78, 85, 79, 88, 128, 78, 85, 79, + 80, 128, 78, 85, 79, 128, 78, 85, 78, 85, 90, 128, 78, 85, 78, 85, 218, + 78, 85, 78, 71, 128, 78, 85, 78, 65, 86, 85, 212, 78, 85, 78, 65, 86, 73, + 203, 78, 85, 78, 128, 78, 85, 206, 78, 85, 77, 69, 82, 207, 78, 85, 77, + 69, 82, 65, 84, 79, 210, 78, 85, 77, 69, 82, 65, 204, 78, 85, 77, 66, 69, + 82, 83, 128, 78, 85, 77, 66, 69, 82, 128, 78, 85, 77, 128, 78, 85, 76, + 76, 128, 78, 85, 76, 204, 78, 85, 76, 128, 78, 85, 75, 84, 65, 128, 78, + 85, 69, 78, 71, 128, 78, 85, 69, 128, 78, 85, 66, 73, 65, 206, 78, 85, + 65, 69, 128, 78, 85, 49, 49, 128, 78, 85, 49, 177, 78, 85, 48, 50, 50, + 65, 128, 78, 85, 48, 50, 50, 128, 78, 85, 48, 50, 49, 128, 78, 85, 48, + 50, 48, 128, 78, 85, 48, 49, 57, 128, 78, 85, 48, 49, 56, 65, 128, 78, + 85, 48, 49, 56, 128, 78, 85, 48, 49, 55, 128, 78, 85, 48, 49, 54, 128, + 78, 85, 48, 49, 53, 128, 78, 85, 48, 49, 52, 128, 78, 85, 48, 49, 51, + 128, 78, 85, 48, 49, 50, 128, 78, 85, 48, 49, 49, 65, 128, 78, 85, 48, + 49, 49, 128, 78, 85, 48, 49, 48, 65, 128, 78, 85, 48, 49, 48, 128, 78, + 85, 48, 48, 57, 128, 78, 85, 48, 48, 56, 128, 78, 85, 48, 48, 55, 128, + 78, 85, 48, 48, 54, 128, 78, 85, 48, 48, 53, 128, 78, 85, 48, 48, 52, + 128, 78, 85, 48, 48, 51, 128, 78, 85, 48, 48, 50, 128, 78, 85, 48, 48, + 49, 128, 78, 84, 88, 73, 86, 128, 78, 84, 85, 85, 128, 78, 84, 85, 77, + 128, 78, 84, 85, 74, 128, 78, 84, 213, 78, 84, 83, 65, 85, 128, 78, 84, + 79, 81, 80, 69, 78, 128, 78, 84, 79, 71, 128, 78, 84, 79, 199, 78, 84, + 73, 69, 197, 78, 84, 72, 65, 85, 128, 78, 84, 69, 85, 78, 71, 66, 65, + 128, 78, 84, 69, 85, 77, 128, 78, 84, 69, 78, 128, 78, 84, 69, 69, 128, + 78, 84, 65, 80, 128, 78, 84, 65, 208, 78, 84, 65, 65, 128, 78, 83, 85, + 79, 212, 78, 83, 85, 78, 128, 78, 83, 85, 77, 128, 78, 83, 79, 77, 128, + 78, 83, 73, 69, 69, 84, 128, 78, 83, 73, 69, 69, 80, 128, 78, 83, 73, 69, + 69, 128, 78, 83, 72, 85, 84, 128, 78, 83, 72, 85, 212, 78, 83, 72, 85, + 79, 80, 128, 78, 83, 72, 85, 69, 128, 78, 83, 72, 73, 69, 69, 128, 78, + 83, 72, 69, 69, 128, 78, 83, 72, 65, 81, 128, 78, 83, 72, 65, 128, 78, + 83, 69, 85, 65, 69, 78, 128, 78, 83, 69, 78, 128, 78, 83, 65, 128, 78, + 82, 89, 88, 128, 78, 82, 89, 84, 128, 78, 82, 89, 82, 88, 128, 78, 82, + 89, 82, 128, 78, 82, 89, 80, 128, 78, 82, 89, 128, 78, 82, 85, 88, 128, + 78, 82, 85, 84, 128, 78, 82, 85, 82, 88, 128, 78, 82, 85, 82, 128, 78, + 82, 85, 80, 128, 78, 82, 85, 65, 128, 78, 82, 85, 128, 78, 82, 79, 88, + 128, 78, 82, 79, 80, 128, 78, 82, 79, 128, 78, 82, 69, 88, 128, 78, 82, + 69, 84, 128, 78, 82, 69, 211, 78, 82, 69, 80, 128, 78, 82, 69, 128, 78, + 82, 65, 88, 128, 78, 82, 65, 84, 128, 78, 82, 65, 80, 128, 78, 82, 65, + 128, 78, 81, 73, 71, 128, 78, 79, 89, 128, 78, 79, 88, 128, 78, 79, 87, + 67, 128, 78, 79, 86, 69, 77, 66, 69, 82, 128, 78, 79, 84, 84, 79, 128, + 78, 79, 84, 69, 83, 128, 78, 79, 84, 69, 72, 69, 65, 68, 128, 78, 79, 84, + 69, 72, 69, 65, 196, 78, 79, 84, 69, 66, 79, 79, 75, 128, 78, 79, 84, 69, + 66, 79, 79, 203, 78, 79, 84, 69, 128, 78, 79, 84, 197, 78, 79, 84, 67, + 72, 69, 196, 78, 79, 84, 67, 72, 128, 78, 79, 84, 65, 84, 73, 79, 206, + 78, 79, 84, 128, 78, 79, 212, 78, 79, 83, 69, 128, 78, 79, 83, 197, 78, + 79, 82, 84, 72, 87, 69, 83, 212, 78, 79, 82, 84, 72, 69, 82, 206, 78, 79, + 82, 84, 72, 69, 65, 83, 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, 78, 79, + 82, 77, 65, 204, 78, 79, 82, 68, 73, 195, 78, 79, 210, 78, 79, 80, 128, + 78, 79, 79, 78, 85, 128, 78, 79, 79, 128, 78, 79, 78, 70, 79, 82, 75, 73, + 78, 71, 128, 78, 79, 78, 45, 80, 79, 84, 65, 66, 76, 197, 78, 79, 78, 45, + 74, 79, 73, 78, 69, 82, 128, 78, 79, 78, 45, 66, 82, 69, 65, 75, 73, 78, + 199, 78, 79, 78, 128, 78, 79, 77, 73, 83, 77, 193, 78, 79, 77, 73, 78, + 65, 204, 78, 79, 75, 72, 85, 75, 128, 78, 79, 68, 69, 128, 78, 79, 65, + 128, 78, 79, 45, 66, 82, 69, 65, 203, 78, 78, 85, 85, 128, 78, 78, 85, + 128, 78, 78, 79, 79, 128, 78, 78, 79, 128, 78, 78, 78, 85, 85, 128, 78, + 78, 78, 85, 128, 78, 78, 78, 79, 79, 128, 78, 78, 78, 79, 128, 78, 78, + 78, 73, 73, 128, 78, 78, 78, 73, 128, 78, 78, 78, 69, 69, 128, 78, 78, + 78, 69, 128, 78, 78, 78, 65, 85, 128, 78, 78, 78, 65, 73, 128, 78, 78, + 78, 65, 65, 128, 78, 78, 78, 65, 128, 78, 78, 78, 128, 78, 78, 72, 65, + 128, 78, 78, 71, 79, 79, 128, 78, 78, 71, 79, 128, 78, 78, 71, 73, 73, + 128, 78, 78, 71, 73, 128, 78, 78, 71, 65, 65, 128, 78, 78, 71, 65, 128, + 78, 78, 71, 128, 78, 78, 66, 83, 80, 128, 78, 77, 128, 78, 76, 65, 85, + 128, 78, 76, 48, 50, 48, 128, 78, 76, 48, 49, 57, 128, 78, 76, 48, 49, + 56, 128, 78, 76, 48, 49, 55, 65, 128, 78, 76, 48, 49, 55, 128, 78, 76, + 48, 49, 54, 128, 78, 76, 48, 49, 53, 128, 78, 76, 48, 49, 52, 128, 78, + 76, 48, 49, 51, 128, 78, 76, 48, 49, 50, 128, 78, 76, 48, 49, 49, 128, + 78, 76, 48, 49, 48, 128, 78, 76, 48, 48, 57, 128, 78, 76, 48, 48, 56, + 128, 78, 76, 48, 48, 55, 128, 78, 76, 48, 48, 54, 128, 78, 76, 48, 48, + 53, 65, 128, 78, 76, 48, 48, 53, 128, 78, 76, 48, 48, 52, 128, 78, 76, + 48, 48, 51, 128, 78, 76, 48, 48, 50, 128, 78, 76, 48, 48, 49, 128, 78, + 76, 128, 78, 75, 79, 77, 128, 78, 75, 207, 78, 75, 73, 78, 68, 73, 128, + 78, 75, 65, 85, 128, 78, 75, 65, 65, 82, 65, 69, 128, 78, 74, 89, 88, + 128, 78, 74, 89, 84, 128, 78, 74, 89, 82, 88, 128, 78, 74, 89, 82, 128, + 78, 74, 89, 80, 128, 78, 74, 89, 128, 78, 74, 85, 88, 128, 78, 74, 85, + 82, 88, 128, 78, 74, 85, 82, 128, 78, 74, 85, 81, 65, 128, 78, 74, 85, + 80, 128, 78, 74, 85, 79, 88, 128, 78, 74, 85, 79, 128, 78, 74, 85, 69, + 81, 128, 78, 74, 85, 65, 69, 128, 78, 74, 85, 128, 78, 74, 79, 88, 128, + 78, 74, 79, 84, 128, 78, 74, 79, 80, 128, 78, 74, 79, 79, 128, 78, 74, + 79, 128, 78, 74, 73, 88, 128, 78, 74, 73, 84, 128, 78, 74, 73, 80, 128, + 78, 74, 73, 69, 88, 128, 78, 74, 73, 69, 84, 128, 78, 74, 73, 69, 80, + 128, 78, 74, 73, 69, 69, 128, 78, 74, 73, 69, 128, 78, 74, 73, 128, 78, + 74, 201, 78, 74, 69, 85, 88, 128, 78, 74, 69, 85, 84, 128, 78, 74, 69, + 85, 65, 69, 78, 65, 128, 78, 74, 69, 85, 65, 69, 77, 128, 78, 74, 69, 69, + 69, 69, 128, 78, 74, 69, 69, 128, 78, 74, 69, 197, 78, 74, 69, 128, 78, + 74, 65, 81, 128, 78, 74, 65, 80, 128, 78, 74, 65, 69, 77, 76, 73, 128, + 78, 74, 65, 69, 77, 128, 78, 74, 65, 65, 128, 78, 73, 88, 128, 78, 73, + 84, 82, 69, 128, 78, 73, 83, 65, 71, 128, 78, 73, 82, 85, 71, 85, 128, + 78, 73, 80, 128, 78, 73, 78, 84, 72, 128, 78, 73, 78, 69, 84, 89, 128, + 78, 73, 78, 69, 84, 217, 78, 73, 78, 69, 84, 69, 69, 78, 128, 78, 73, 78, + 69, 84, 69, 69, 206, 78, 73, 78, 69, 45, 84, 72, 73, 82, 84, 89, 128, 78, + 73, 78, 197, 78, 73, 78, 68, 65, 50, 128, 78, 73, 78, 68, 65, 178, 78, + 73, 78, 57, 128, 78, 73, 78, 128, 78, 73, 77, 128, 78, 73, 205, 78, 73, + 75, 79, 76, 83, 66, 85, 82, 199, 78, 73, 75, 72, 65, 72, 73, 84, 128, 78, + 73, 75, 65, 72, 73, 84, 128, 78, 73, 75, 65, 128, 78, 73, 72, 83, 72, 86, + 65, 83, 65, 128, 78, 73, 71, 73, 68, 65, 77, 73, 78, 128, 78, 73, 71, 73, + 68, 65, 69, 83, 72, 128, 78, 73, 71, 72, 84, 128, 78, 73, 71, 72, 212, + 78, 73, 71, 71, 65, 72, 73, 84, 65, 128, 78, 73, 69, 88, 128, 78, 73, 69, + 85, 78, 45, 84, 73, 75, 69, 85, 84, 128, 78, 73, 69, 85, 78, 45, 84, 72, + 73, 69, 85, 84, 72, 128, 78, 73, 69, 85, 78, 45, 83, 73, 79, 83, 128, 78, + 73, 69, 85, 78, 45, 82, 73, 69, 85, 76, 128, 78, 73, 69, 85, 78, 45, 80, + 73, 69, 85, 80, 128, 78, 73, 69, 85, 78, 45, 80, 65, 78, 83, 73, 79, 83, + 128, 78, 73, 69, 85, 78, 45, 75, 73, 89, 69, 79, 75, 128, 78, 73, 69, 85, + 78, 45, 72, 73, 69, 85, 72, 128, 78, 73, 69, 85, 78, 45, 67, 73, 69, 85, + 67, 128, 78, 73, 69, 85, 78, 45, 67, 72, 73, 69, 85, 67, 72, 128, 78, 73, + 69, 85, 206, 78, 73, 69, 80, 128, 78, 73, 69, 128, 78, 73, 66, 128, 78, + 73, 65, 128, 78, 73, 50, 128, 78, 72, 85, 69, 128, 78, 72, 74, 65, 128, + 78, 72, 128, 78, 71, 89, 69, 128, 78, 71, 86, 69, 128, 78, 71, 85, 85, + 128, 78, 71, 85, 79, 88, 128, 78, 71, 85, 79, 84, 128, 78, 71, 85, 79, + 128, 78, 71, 85, 65, 78, 128, 78, 71, 85, 65, 69, 84, 128, 78, 71, 85, + 65, 69, 128, 78, 71, 79, 88, 128, 78, 71, 79, 85, 128, 78, 71, 79, 213, + 78, 71, 79, 84, 128, 78, 71, 79, 81, 128, 78, 71, 79, 80, 128, 78, 71, + 79, 78, 128, 78, 71, 79, 77, 128, 78, 71, 79, 69, 72, 128, 78, 71, 79, + 69, 200, 78, 71, 207, 78, 71, 75, 89, 69, 69, 128, 78, 71, 75, 87, 65, + 69, 78, 128, 78, 71, 75, 85, 80, 128, 78, 71, 75, 85, 78, 128, 78, 71, + 75, 85, 77, 128, 78, 71, 75, 85, 69, 78, 90, 69, 85, 77, 128, 78, 71, 75, + 85, 197, 78, 71, 75, 73, 78, 68, 201, 78, 71, 75, 73, 69, 69, 128, 78, + 71, 75, 69, 85, 88, 128, 78, 71, 75, 69, 85, 82, 73, 128, 78, 71, 75, 69, + 85, 65, 69, 81, 128, 78, 71, 75, 69, 85, 65, 69, 77, 128, 78, 71, 75, 65, + 81, 128, 78, 71, 75, 65, 80, 128, 78, 71, 75, 65, 65, 77, 73, 128, 78, + 71, 75, 65, 128, 78, 71, 73, 69, 88, 128, 78, 71, 73, 69, 80, 128, 78, + 71, 73, 69, 128, 78, 71, 72, 65, 128, 78, 71, 71, 87, 65, 69, 78, 128, + 78, 71, 71, 85, 82, 65, 69, 128, 78, 71, 71, 85, 80, 128, 78, 71, 71, 85, + 79, 81, 128, 78, 71, 71, 85, 79, 209, 78, 71, 71, 85, 79, 78, 128, 78, + 71, 71, 85, 79, 77, 128, 78, 71, 71, 85, 77, 128, 78, 71, 71, 85, 69, 69, + 84, 128, 78, 71, 71, 85, 65, 69, 83, 72, 65, 197, 78, 71, 71, 85, 65, 69, + 206, 78, 71, 71, 85, 65, 128, 78, 71, 71, 85, 128, 78, 71, 71, 79, 79, + 128, 78, 71, 71, 79, 128, 78, 71, 71, 73, 128, 78, 71, 71, 69, 85, 88, + 128, 78, 71, 71, 69, 85, 65, 69, 84, 128, 78, 71, 71, 69, 85, 65, 69, + 128, 78, 71, 71, 69, 213, 78, 71, 71, 69, 78, 128, 78, 71, 71, 69, 69, + 84, 128, 78, 71, 71, 69, 69, 69, 69, 128, 78, 71, 71, 69, 69, 128, 78, + 71, 71, 69, 128, 78, 71, 71, 65, 80, 128, 78, 71, 71, 65, 65, 77, 65, 69, + 128, 78, 71, 71, 65, 65, 77, 128, 78, 71, 71, 65, 65, 128, 78, 71, 71, + 128, 78, 71, 69, 88, 128, 78, 71, 69, 85, 82, 69, 85, 84, 128, 78, 71, + 69, 80, 128, 78, 71, 69, 78, 128, 78, 71, 69, 69, 128, 78, 71, 69, 65, + 68, 65, 76, 128, 78, 71, 65, 88, 128, 78, 71, 65, 85, 128, 78, 71, 65, + 84, 128, 78, 71, 65, 211, 78, 71, 65, 81, 128, 78, 71, 65, 80, 128, 78, + 71, 65, 78, 71, 85, 128, 78, 71, 65, 78, 128, 78, 71, 65, 73, 128, 78, + 71, 65, 72, 128, 78, 71, 65, 65, 73, 128, 78, 71, 193, 78, 70, 128, 78, + 69, 88, 212, 78, 69, 88, 128, 78, 69, 87, 83, 80, 65, 80, 69, 82, 128, + 78, 69, 87, 76, 73, 78, 69, 128, 78, 69, 87, 76, 73, 78, 197, 78, 69, 87, + 128, 78, 69, 215, 78, 69, 85, 84, 82, 65, 76, 128, 78, 69, 85, 84, 82, + 65, 204, 78, 69, 85, 84, 69, 82, 128, 78, 69, 84, 87, 79, 82, 75, 69, + 196, 78, 69, 84, 128, 78, 69, 212, 78, 69, 83, 84, 69, 196, 78, 69, 82, + 196, 78, 69, 81, 85, 68, 65, 65, 128, 78, 69, 80, 84, 85, 78, 69, 128, + 78, 69, 80, 128, 78, 69, 79, 128, 78, 69, 207, 78, 69, 78, 79, 69, 128, + 78, 69, 78, 65, 78, 79, 128, 78, 69, 78, 128, 78, 69, 76, 128, 78, 69, + 73, 84, 72, 69, 210, 78, 69, 71, 65, 84, 73, 79, 206, 78, 69, 71, 65, 84, + 69, 196, 78, 69, 67, 75, 84, 73, 69, 128, 78, 69, 67, 75, 128, 78, 69, + 66, 69, 78, 83, 84, 73, 77, 77, 69, 128, 78, 68, 85, 88, 128, 78, 68, 85, + 84, 128, 78, 68, 85, 82, 88, 128, 78, 68, 85, 82, 128, 78, 68, 85, 80, + 128, 78, 68, 85, 78, 128, 78, 68, 213, 78, 68, 79, 88, 128, 78, 68, 79, + 84, 128, 78, 68, 79, 80, 128, 78, 68, 79, 79, 128, 78, 68, 79, 78, 128, + 78, 68, 79, 77, 66, 85, 128, 78, 68, 79, 76, 197, 78, 68, 73, 88, 128, + 78, 68, 73, 84, 128, 78, 68, 73, 81, 128, 78, 68, 73, 80, 128, 78, 68, + 73, 69, 88, 128, 78, 68, 73, 69, 128, 78, 68, 73, 68, 65, 128, 78, 68, + 73, 65, 81, 128, 78, 68, 69, 88, 128, 78, 68, 69, 85, 88, 128, 78, 68, + 69, 85, 84, 128, 78, 68, 69, 85, 65, 69, 82, 69, 69, 128, 78, 68, 69, 80, + 128, 78, 68, 69, 69, 128, 78, 68, 69, 128, 78, 68, 65, 88, 128, 78, 68, + 65, 84, 128, 78, 68, 65, 80, 128, 78, 68, 65, 77, 128, 78, 68, 65, 65, + 78, 71, 71, 69, 85, 65, 69, 84, 128, 78, 68, 65, 65, 128, 78, 68, 65, + 193, 78, 67, 72, 65, 85, 128, 78, 66, 89, 88, 128, 78, 66, 89, 84, 128, + 78, 66, 89, 82, 88, 128, 78, 66, 89, 82, 128, 78, 66, 89, 80, 128, 78, + 66, 89, 128, 78, 66, 85, 88, 128, 78, 66, 85, 84, 128, 78, 66, 85, 82, + 88, 128, 78, 66, 85, 82, 128, 78, 66, 85, 80, 128, 78, 66, 85, 128, 78, + 66, 79, 88, 128, 78, 66, 79, 84, 128, 78, 66, 79, 80, 128, 78, 66, 79, + 128, 78, 66, 73, 88, 128, 78, 66, 73, 84, 128, 78, 66, 73, 80, 128, 78, + 66, 73, 69, 88, 128, 78, 66, 73, 69, 80, 128, 78, 66, 73, 69, 128, 78, + 66, 73, 128, 78, 66, 72, 128, 78, 66, 65, 88, 128, 78, 66, 65, 84, 128, + 78, 66, 65, 80, 128, 78, 66, 65, 128, 78, 65, 89, 65, 78, 78, 65, 128, + 78, 65, 89, 128, 78, 65, 88, 73, 65, 206, 78, 65, 88, 128, 78, 65, 85, + 84, 72, 83, 128, 78, 65, 85, 83, 69, 65, 84, 69, 196, 78, 65, 85, 68, 73, + 218, 78, 65, 84, 85, 82, 65, 204, 78, 65, 84, 73, 79, 78, 65, 204, 78, + 65, 83, 75, 65, 80, 201, 78, 65, 83, 72, 73, 128, 78, 65, 83, 65, 76, 73, + 90, 65, 84, 73, 79, 78, 128, 78, 65, 83, 65, 76, 73, 90, 65, 84, 73, 79, + 206, 78, 65, 83, 65, 204, 78, 65, 82, 82, 79, 215, 78, 65, 82, 128, 78, + 65, 81, 128, 78, 65, 79, 211, 78, 65, 78, 83, 65, 78, 65, 81, 128, 78, + 65, 78, 71, 77, 79, 78, 84, 72, 79, 128, 78, 65, 78, 68, 128, 78, 65, 78, + 65, 128, 78, 65, 77, 69, 128, 78, 65, 77, 197, 78, 65, 77, 50, 128, 78, + 65, 77, 128, 78, 65, 75, 128, 78, 65, 73, 82, 193, 78, 65, 73, 204, 78, + 65, 71, 82, 201, 78, 65, 71, 65, 82, 128, 78, 65, 71, 65, 128, 78, 65, + 71, 193, 78, 65, 71, 128, 78, 65, 199, 78, 65, 69, 128, 78, 65, 66, 76, + 65, 128, 78, 65, 66, 65, 84, 65, 69, 65, 206, 78, 65, 65, 83, 73, 75, 89, + 65, 89, 65, 128, 78, 65, 65, 75, 83, 73, 75, 89, 65, 89, 65, 128, 78, 65, + 65, 73, 128, 78, 65, 193, 78, 65, 52, 128, 78, 65, 50, 128, 78, 65, 45, + 50, 128, 78, 48, 52, 50, 128, 78, 48, 52, 49, 128, 78, 48, 52, 48, 128, + 78, 48, 51, 57, 128, 78, 48, 51, 56, 128, 78, 48, 51, 55, 65, 128, 78, + 48, 51, 55, 128, 78, 48, 51, 54, 128, 78, 48, 51, 53, 65, 128, 78, 48, + 51, 53, 128, 78, 48, 51, 52, 65, 128, 78, 48, 51, 52, 128, 78, 48, 51, + 51, 65, 128, 78, 48, 51, 51, 128, 78, 48, 51, 50, 128, 78, 48, 51, 49, + 128, 78, 48, 51, 48, 128, 78, 48, 50, 57, 128, 78, 48, 50, 56, 128, 78, + 48, 50, 55, 128, 78, 48, 50, 54, 128, 78, 48, 50, 53, 65, 128, 78, 48, + 50, 53, 128, 78, 48, 50, 52, 128, 78, 48, 50, 51, 128, 78, 48, 50, 50, + 128, 78, 48, 50, 49, 128, 78, 48, 50, 48, 128, 78, 48, 49, 57, 128, 78, + 48, 49, 56, 66, 128, 78, 48, 49, 56, 65, 128, 78, 48, 49, 56, 128, 78, + 48, 49, 55, 128, 78, 48, 49, 54, 128, 78, 48, 49, 53, 128, 78, 48, 49, + 52, 128, 78, 48, 49, 51, 128, 78, 48, 49, 50, 128, 78, 48, 49, 49, 128, + 78, 48, 49, 48, 128, 78, 48, 48, 57, 128, 78, 48, 48, 56, 128, 78, 48, + 48, 55, 128, 78, 48, 48, 54, 128, 78, 48, 48, 53, 128, 78, 48, 48, 52, + 128, 78, 48, 48, 51, 128, 78, 48, 48, 50, 128, 78, 48, 48, 49, 128, 78, + 45, 67, 82, 69, 197, 78, 45, 65, 82, 217, 77, 89, 88, 128, 77, 89, 84, + 128, 77, 89, 83, 76, 73, 84, 69, 128, 77, 89, 80, 128, 77, 89, 65, 128, + 77, 89, 193, 77, 89, 128, 77, 217, 77, 87, 79, 79, 128, 77, 87, 79, 128, + 77, 87, 73, 73, 128, 77, 87, 73, 128, 77, 87, 69, 69, 128, 77, 87, 69, + 128, 77, 87, 65, 65, 128, 77, 87, 65, 128, 77, 87, 128, 77, 215, 77, 86, + 83, 128, 77, 86, 79, 80, 128, 77, 86, 73, 128, 77, 86, 69, 85, 65, 69, + 78, 71, 65, 77, 128, 77, 86, 128, 77, 214, 77, 85, 88, 128, 77, 85, 85, + 83, 73, 75, 65, 84, 79, 65, 78, 128, 77, 85, 85, 82, 68, 72, 65, 74, 193, + 77, 85, 85, 128, 77, 85, 84, 128, 77, 85, 83, 73, 67, 128, 77, 85, 83, + 73, 195, 77, 85, 83, 72, 82, 79, 79, 77, 128, 77, 85, 83, 72, 51, 128, + 77, 85, 83, 72, 179, 77, 85, 83, 72, 128, 77, 85, 83, 200, 77, 85, 83, + 128, 77, 85, 82, 88, 128, 77, 85, 82, 71, 85, 50, 128, 77, 85, 82, 69, + 128, 77, 85, 82, 68, 65, 128, 77, 85, 82, 68, 193, 77, 85, 82, 128, 77, + 85, 81, 68, 65, 77, 128, 77, 85, 80, 128, 77, 85, 79, 88, 128, 77, 85, + 79, 84, 128, 77, 85, 79, 80, 128, 77, 85, 79, 77, 65, 69, 128, 77, 85, + 79, 128, 77, 85, 78, 83, 85, 66, 128, 77, 85, 78, 65, 72, 128, 77, 85, + 78, 128, 77, 85, 76, 84, 73, 83, 69, 84, 128, 77, 85, 76, 84, 73, 83, 69, + 212, 77, 85, 76, 84, 73, 80, 76, 73, 67, 65, 84, 73, 79, 78, 128, 77, 85, + 76, 84, 73, 80, 76, 73, 67, 65, 84, 73, 79, 206, 77, 85, 76, 84, 73, 80, + 76, 69, 128, 77, 85, 76, 84, 73, 80, 76, 197, 77, 85, 76, 84, 73, 79, 67, + 85, 76, 65, 210, 77, 85, 76, 84, 73, 77, 65, 80, 128, 77, 85, 76, 84, + 201, 77, 85, 76, 84, 65, 78, 201, 77, 85, 75, 80, 72, 82, 69, 78, 71, + 128, 77, 85, 73, 78, 128, 77, 85, 71, 83, 128, 77, 85, 71, 128, 77, 85, + 199, 77, 85, 69, 78, 128, 77, 85, 69, 128, 77, 85, 67, 72, 128, 77, 85, + 67, 200, 77, 85, 67, 65, 65, 68, 128, 77, 85, 65, 83, 128, 77, 85, 65, + 78, 128, 77, 85, 65, 69, 128, 77, 85, 45, 71, 65, 65, 72, 76, 65, 193, + 77, 213, 77, 83, 128, 77, 82, 207, 77, 80, 65, 128, 77, 79, 89, 65, 73, + 128, 77, 79, 88, 128, 77, 79, 86, 73, 197, 77, 79, 86, 69, 211, 77, 79, + 86, 69, 77, 69, 78, 84, 45, 87, 65, 76, 76, 80, 76, 65, 78, 197, 77, 79, + 86, 69, 77, 69, 78, 84, 45, 72, 73, 78, 71, 197, 77, 79, 86, 69, 77, 69, + 78, 84, 45, 70, 76, 79, 79, 82, 80, 76, 65, 78, 197, 77, 79, 86, 69, 77, + 69, 78, 84, 45, 68, 73, 65, 71, 79, 78, 65, 204, 77, 79, 86, 69, 77, 69, + 78, 84, 128, 77, 79, 86, 69, 77, 69, 78, 212, 77, 79, 86, 69, 196, 77, + 79, 86, 69, 128, 77, 79, 85, 84, 72, 128, 77, 79, 85, 83, 69, 128, 77, + 79, 85, 83, 197, 77, 79, 85, 78, 84, 65, 73, 78, 83, 128, 77, 79, 85, 78, + 84, 65, 73, 78, 128, 77, 79, 85, 78, 84, 65, 73, 206, 77, 79, 85, 78, + 212, 77, 79, 85, 78, 68, 128, 77, 79, 85, 78, 196, 77, 79, 84, 79, 82, + 87, 65, 89, 128, 77, 79, 84, 79, 82, 67, 89, 67, 76, 69, 128, 77, 79, 84, + 79, 210, 77, 79, 84, 72, 69, 82, 128, 77, 79, 84, 72, 69, 210, 77, 79, + 84, 128, 77, 79, 83, 81, 85, 69, 128, 77, 79, 82, 84, 85, 85, 77, 128, + 77, 79, 82, 84, 65, 82, 128, 77, 79, 82, 80, 72, 79, 76, 79, 71, 73, 67, + 65, 204, 77, 79, 82, 78, 73, 78, 71, 128, 77, 79, 80, 128, 77, 79, 79, + 83, 69, 45, 67, 82, 69, 197, 77, 79, 79, 78, 128, 77, 79, 79, 206, 77, + 79, 79, 77, 80, 85, 81, 128, 77, 79, 79, 77, 69, 85, 84, 128, 77, 79, 79, + 68, 128, 77, 79, 79, 196, 77, 79, 79, 128, 77, 79, 78, 84, 73, 69, 69, + 78, 128, 77, 79, 78, 84, 72, 128, 77, 79, 78, 84, 200, 77, 79, 78, 83, + 84, 69, 82, 128, 77, 79, 78, 79, 83, 84, 65, 66, 76, 197, 77, 79, 78, 79, + 83, 80, 65, 67, 197, 77, 79, 78, 79, 82, 65, 73, 76, 128, 77, 79, 78, 79, + 71, 82, 65, 80, 200, 77, 79, 78, 79, 71, 82, 65, 77, 77, 79, 211, 77, 79, + 78, 79, 71, 82, 65, 205, 77, 79, 78, 79, 70, 79, 78, 73, 65, 83, 128, 77, + 79, 78, 79, 67, 85, 76, 65, 210, 77, 79, 78, 75, 69, 89, 128, 77, 79, 78, + 75, 69, 217, 77, 79, 78, 73, 128, 77, 79, 78, 71, 75, 69, 85, 65, 69, 81, + 128, 77, 79, 78, 69, 89, 45, 77, 79, 85, 84, 200, 77, 79, 78, 69, 217, + 77, 79, 78, 128, 77, 79, 206, 77, 79, 76, 128, 77, 79, 72, 65, 77, 77, + 65, 196, 77, 79, 68, 85, 76, 207, 77, 79, 68, 73, 70, 73, 69, 82, 45, 57, + 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 56, 128, 77, 79, 68, 73, 70, 73, + 69, 82, 45, 55, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 54, 128, 77, 79, + 68, 73, 70, 73, 69, 82, 45, 53, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, + 52, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 51, 128, 77, 79, 68, 73, 70, + 73, 69, 82, 45, 50, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 54, 128, + 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 53, 128, 77, 79, 68, 73, 70, 73, + 69, 82, 45, 49, 52, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 51, 128, + 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 50, 128, 77, 79, 68, 73, 70, 73, + 69, 82, 45, 49, 49, 128, 77, 79, 68, 73, 70, 73, 69, 82, 45, 49, 48, 128, + 77, 79, 68, 73, 70, 73, 69, 82, 128, 77, 79, 68, 201, 77, 79, 68, 69, 83, + 84, 89, 128, 77, 79, 68, 69, 82, 206, 77, 79, 68, 69, 77, 128, 77, 79, + 68, 69, 76, 83, 128, 77, 79, 68, 69, 76, 128, 77, 79, 68, 69, 128, 77, + 79, 66, 73, 76, 197, 77, 79, 65, 128, 77, 207, 77, 78, 89, 65, 205, 77, + 78, 65, 83, 128, 77, 77, 83, 80, 128, 77, 77, 128, 77, 205, 77, 76, 65, + 128, 77, 76, 128, 77, 75, 80, 65, 82, 65, 209, 77, 73, 88, 128, 77, 73, + 84, 128, 77, 73, 83, 82, 65, 128, 77, 73, 82, 73, 66, 65, 65, 82, 85, + 128, 77, 73, 82, 73, 128, 77, 73, 82, 69, 68, 128, 77, 73, 80, 128, 77, + 73, 78, 89, 128, 77, 73, 78, 85, 83, 45, 79, 82, 45, 80, 76, 85, 211, 77, + 73, 78, 85, 83, 128, 77, 73, 78, 73, 83, 84, 69, 82, 128, 77, 73, 78, 73, + 77, 73, 90, 69, 128, 77, 73, 78, 73, 77, 65, 128, 77, 73, 78, 73, 68, 73, + 83, 67, 128, 77, 73, 78, 73, 66, 85, 83, 128, 77, 73, 77, 69, 128, 77, + 73, 77, 128, 77, 73, 76, 76, 73, 79, 78, 83, 128, 77, 73, 76, 76, 73, 79, + 78, 211, 77, 73, 76, 76, 69, 84, 128, 77, 73, 76, 76, 197, 77, 73, 76, + 204, 77, 73, 76, 75, 217, 77, 73, 76, 75, 128, 77, 73, 76, 73, 84, 65, + 82, 217, 77, 73, 76, 128, 77, 73, 75, 85, 82, 79, 78, 128, 77, 73, 75, + 82, 79, 206, 77, 73, 75, 82, 73, 128, 77, 73, 73, 78, 128, 77, 73, 73, + 77, 128, 77, 73, 73, 128, 77, 73, 199, 77, 73, 69, 88, 128, 77, 73, 69, + 85, 77, 45, 84, 73, 75, 69, 85, 84, 128, 77, 73, 69, 85, 77, 45, 83, 83, + 65, 78, 71, 83, 73, 79, 83, 128, 77, 73, 69, 85, 77, 45, 83, 83, 65, 78, + 71, 78, 73, 69, 85, 78, 128, 77, 73, 69, 85, 77, 45, 82, 73, 69, 85, 76, + 128, 77, 73, 69, 85, 77, 45, 80, 73, 69, 85, 80, 45, 83, 73, 79, 83, 128, + 77, 73, 69, 85, 77, 45, 80, 73, 69, 85, 80, 128, 77, 73, 69, 85, 77, 45, + 80, 65, 78, 83, 73, 79, 83, 128, 77, 73, 69, 85, 77, 45, 78, 73, 69, 85, + 78, 128, 77, 73, 69, 85, 77, 45, 67, 73, 69, 85, 67, 128, 77, 73, 69, 85, + 77, 45, 67, 72, 73, 69, 85, 67, 72, 128, 77, 73, 69, 85, 205, 77, 73, 69, + 80, 128, 77, 73, 69, 69, 128, 77, 73, 69, 128, 77, 73, 68, 76, 73, 78, + 197, 77, 73, 68, 68, 76, 69, 45, 87, 69, 76, 83, 200, 77, 73, 68, 68, 76, + 69, 128, 77, 73, 68, 45, 76, 69, 86, 69, 204, 77, 73, 196, 77, 73, 67, + 82, 79, 83, 67, 79, 80, 69, 128, 77, 73, 67, 82, 79, 80, 72, 79, 78, 69, + 128, 77, 73, 67, 82, 207, 77, 73, 67, 210, 77, 72, 90, 128, 77, 72, 65, + 128, 77, 72, 128, 77, 71, 85, 88, 128, 77, 71, 85, 84, 128, 77, 71, 85, + 82, 88, 128, 77, 71, 85, 82, 128, 77, 71, 85, 80, 128, 77, 71, 85, 79, + 88, 128, 77, 71, 85, 79, 80, 128, 77, 71, 85, 79, 128, 77, 71, 85, 128, + 77, 71, 79, 88, 128, 77, 71, 79, 84, 128, 77, 71, 79, 80, 128, 77, 71, + 79, 128, 77, 71, 207, 77, 71, 73, 69, 88, 128, 77, 71, 73, 69, 128, 77, + 71, 69, 88, 128, 77, 71, 69, 80, 128, 77, 71, 69, 128, 77, 71, 66, 85, + 128, 77, 71, 66, 79, 79, 128, 77, 71, 66, 79, 70, 85, 77, 128, 77, 71, + 66, 79, 128, 77, 71, 66, 73, 128, 77, 71, 66, 69, 85, 78, 128, 77, 71, + 66, 69, 78, 128, 77, 71, 66, 69, 69, 128, 77, 71, 66, 69, 128, 77, 71, + 66, 65, 83, 65, 81, 128, 77, 71, 66, 65, 83, 65, 128, 77, 71, 65, 88, + 128, 77, 71, 65, 84, 128, 77, 71, 65, 80, 128, 77, 71, 65, 128, 77, 71, + 128, 77, 70, 79, 78, 128, 77, 70, 79, 206, 77, 70, 79, 128, 77, 70, 73, + 89, 65, 81, 128, 77, 70, 73, 69, 69, 128, 77, 70, 69, 85, 84, 128, 77, + 70, 69, 85, 81, 128, 77, 70, 69, 85, 65, 69, 128, 77, 70, 65, 65, 128, + 77, 69, 90, 90, 79, 128, 77, 69, 88, 128, 77, 69, 85, 212, 77, 69, 85, + 81, 128, 77, 69, 85, 78, 74, 79, 77, 78, 68, 69, 85, 81, 128, 77, 69, 85, + 78, 128, 77, 69, 84, 82, 79, 128, 77, 69, 84, 82, 73, 67, 65, 204, 77, + 69, 84, 82, 73, 65, 128, 77, 69, 84, 82, 69, 84, 69, 211, 77, 69, 84, 79, + 66, 69, 76, 85, 83, 128, 77, 69, 84, 69, 75, 128, 77, 69, 84, 69, 71, + 128, 77, 69, 84, 65, 76, 128, 77, 69, 84, 193, 77, 69, 83, 83, 69, 78, + 73, 65, 206, 77, 69, 83, 83, 65, 71, 69, 128, 77, 69, 83, 83, 65, 71, + 197, 77, 69, 83, 79, 128, 77, 69, 83, 73, 128, 77, 69, 83, 72, 128, 77, + 69, 82, 75, 72, 65, 128, 77, 69, 82, 75, 72, 193, 77, 69, 82, 73, 68, 73, + 65, 78, 83, 128, 77, 69, 82, 73, 128, 77, 69, 82, 71, 69, 128, 77, 69, + 82, 67, 85, 82, 89, 128, 77, 69, 82, 67, 85, 82, 217, 77, 69, 78, 79, 82, + 65, 200, 77, 69, 78, 79, 69, 128, 77, 69, 78, 68, 85, 84, 128, 77, 69, + 78, 128, 77, 69, 77, 79, 128, 77, 69, 77, 66, 69, 82, 83, 72, 73, 80, + 128, 77, 69, 77, 66, 69, 82, 128, 77, 69, 77, 66, 69, 210, 77, 69, 77, + 45, 81, 79, 80, 72, 128, 77, 69, 77, 128, 77, 69, 205, 77, 69, 76, 79, + 68, 73, 195, 77, 69, 76, 73, 75, 128, 77, 69, 73, 90, 73, 128, 77, 69, + 71, 65, 84, 79, 78, 128, 77, 69, 71, 65, 80, 72, 79, 78, 69, 128, 77, 69, + 71, 65, 76, 73, 128, 77, 69, 69, 84, 79, 82, 85, 128, 77, 69, 69, 84, 69, + 201, 77, 69, 69, 84, 128, 77, 69, 69, 77, 85, 128, 77, 69, 69, 77, 128, + 77, 69, 69, 202, 77, 69, 69, 69, 69, 128, 77, 69, 68, 73, 85, 77, 128, + 77, 69, 68, 73, 85, 205, 77, 69, 68, 73, 67, 73, 78, 69, 128, 77, 69, 68, + 73, 67, 65, 204, 77, 69, 68, 65, 76, 128, 77, 69, 65, 84, 128, 77, 69, + 65, 212, 77, 69, 65, 83, 85, 82, 69, 196, 77, 69, 65, 83, 85, 82, 69, + 128, 77, 69, 65, 83, 85, 82, 197, 77, 68, 85, 206, 77, 196, 77, 67, 72, + 213, 77, 67, 72, 65, 206, 77, 195, 77, 66, 85, 85, 128, 77, 66, 85, 79, + 81, 128, 77, 66, 85, 79, 128, 77, 66, 85, 69, 128, 77, 66, 85, 65, 69, + 77, 128, 77, 66, 85, 65, 69, 128, 77, 66, 79, 79, 128, 77, 66, 79, 128, + 77, 66, 73, 84, 128, 77, 66, 73, 212, 77, 66, 73, 82, 73, 69, 69, 78, + 128, 77, 66, 73, 128, 77, 66, 69, 85, 88, 128, 77, 66, 69, 85, 82, 73, + 128, 77, 66, 69, 85, 77, 128, 77, 66, 69, 82, 65, 69, 128, 77, 66, 69, + 78, 128, 77, 66, 69, 69, 75, 69, 69, 84, 128, 77, 66, 69, 69, 128, 77, + 66, 69, 128, 77, 66, 65, 81, 128, 77, 66, 65, 78, 89, 73, 128, 77, 66, + 65, 65, 82, 65, 69, 128, 77, 66, 65, 65, 75, 69, 84, 128, 77, 66, 65, 65, + 128, 77, 66, 65, 193, 77, 66, 193, 77, 66, 52, 128, 77, 66, 51, 128, 77, + 66, 50, 128, 77, 65, 89, 69, 203, 77, 65, 89, 65, 78, 78, 65, 128, 77, + 65, 89, 128, 77, 65, 88, 73, 77, 73, 90, 69, 128, 77, 65, 88, 73, 77, 65, + 128, 77, 65, 88, 128, 77, 65, 85, 128, 77, 65, 84, 84, 79, 67, 75, 128, + 77, 65, 84, 82, 73, 88, 128, 77, 65, 84, 69, 82, 73, 65, 76, 83, 128, 77, + 65, 84, 128, 77, 65, 83, 213, 77, 65, 83, 83, 73, 78, 71, 128, 77, 65, + 83, 83, 65, 71, 69, 128, 77, 65, 83, 79, 82, 193, 77, 65, 83, 75, 128, + 77, 65, 83, 72, 70, 65, 65, 84, 128, 77, 65, 83, 72, 50, 128, 77, 65, 83, + 67, 85, 76, 73, 78, 197, 77, 65, 82, 89, 128, 77, 65, 82, 87, 65, 82, + 201, 77, 65, 82, 85, 75, 85, 128, 77, 65, 82, 84, 89, 82, 73, 193, 77, + 65, 82, 84, 73, 65, 204, 77, 65, 82, 82, 89, 73, 78, 199, 77, 65, 82, 82, + 73, 65, 71, 197, 77, 65, 82, 75, 211, 77, 65, 82, 75, 69, 82, 128, 77, + 65, 82, 75, 45, 52, 128, 77, 65, 82, 75, 45, 51, 128, 77, 65, 82, 75, 45, + 50, 128, 77, 65, 82, 75, 45, 49, 128, 77, 65, 82, 69, 128, 77, 65, 82, + 67, 72, 69, 206, 77, 65, 82, 67, 72, 128, 77, 65, 82, 67, 65, 84, 79, 45, + 83, 84, 65, 67, 67, 65, 84, 79, 128, 77, 65, 82, 67, 65, 84, 79, 128, 77, + 65, 82, 67, 65, 83, 73, 84, 69, 128, 77, 65, 82, 66, 85, 84, 65, 128, 77, + 65, 82, 66, 85, 84, 193, 77, 65, 82, 128, 77, 65, 81, 65, 70, 128, 77, + 65, 81, 128, 77, 65, 80, 76, 197, 77, 65, 80, 73, 81, 128, 77, 65, 208, + 77, 65, 79, 128, 77, 65, 78, 84, 69, 76, 80, 73, 69, 67, 197, 77, 65, 78, + 83, 89, 79, 78, 128, 77, 65, 78, 83, 85, 65, 69, 128, 77, 65, 78, 78, 65, 218, 77, 65, 78, 78, 65, 128, 77, 65, 78, 73, 67, 72, 65, 69, 65, 206, 77, 65, 78, 71, 65, 76, 65, 77, 128, 77, 65, 78, 68, 65, 73, 76, 73, 78, 199, 77, 65, 78, 68, 65, 73, 195, 77, 65, 78, 67, 72, 213, 77, 65, 78, @@ -2322,1420 +2345,1426 @@ static unsigned char lexicon[] = { 48, 48, 178, 77, 48, 48, 49, 66, 128, 77, 48, 48, 49, 65, 128, 77, 48, 48, 49, 128, 77, 48, 48, 177, 76, 218, 76, 89, 89, 128, 76, 89, 88, 128, 76, 89, 84, 128, 76, 89, 82, 88, 128, 76, 89, 82, 128, 76, 89, 80, 128, - 76, 89, 73, 84, 128, 76, 89, 68, 73, 65, 206, 76, 89, 67, 73, 65, 206, - 76, 88, 128, 76, 87, 79, 79, 128, 76, 87, 79, 128, 76, 87, 73, 73, 128, - 76, 87, 73, 128, 76, 87, 69, 128, 76, 87, 65, 65, 128, 76, 87, 65, 128, - 76, 85, 88, 128, 76, 85, 85, 128, 76, 85, 84, 128, 76, 85, 82, 88, 128, - 76, 85, 80, 128, 76, 85, 79, 88, 128, 76, 85, 79, 84, 128, 76, 85, 79, - 80, 128, 76, 85, 79, 128, 76, 85, 78, 71, 83, 73, 128, 76, 85, 78, 65, - 84, 197, 76, 85, 205, 76, 85, 76, 128, 76, 85, 73, 83, 128, 76, 85, 72, - 85, 82, 128, 76, 85, 72, 128, 76, 85, 200, 76, 85, 71, 71, 65, 71, 69, - 128, 76, 85, 71, 65, 76, 128, 76, 85, 71, 65, 204, 76, 85, 69, 128, 76, - 85, 197, 76, 85, 66, 128, 76, 85, 65, 69, 80, 128, 76, 85, 51, 128, 76, - 85, 50, 128, 76, 85, 178, 76, 82, 79, 128, 76, 82, 77, 128, 76, 82, 73, - 128, 76, 82, 69, 128, 76, 79, 90, 69, 78, 71, 69, 128, 76, 79, 90, 69, - 78, 71, 197, 76, 79, 88, 128, 76, 79, 87, 69, 82, 69, 196, 76, 79, 87, - 69, 210, 76, 79, 87, 45, 82, 69, 86, 69, 82, 83, 69, 68, 45, 185, 76, 79, - 87, 45, 77, 73, 196, 76, 79, 87, 45, 70, 65, 76, 76, 73, 78, 199, 76, 79, - 87, 45, 185, 76, 79, 86, 197, 76, 79, 85, 82, 69, 128, 76, 79, 85, 68, - 83, 80, 69, 65, 75, 69, 82, 128, 76, 79, 85, 68, 76, 217, 76, 79, 84, 85, - 83, 128, 76, 79, 84, 128, 76, 79, 82, 82, 89, 128, 76, 79, 82, 82, 65, - 73, 78, 69, 128, 76, 79, 81, 128, 76, 79, 80, 128, 76, 79, 79, 84, 128, - 76, 79, 79, 80, 69, 196, 76, 79, 79, 80, 128, 76, 79, 79, 208, 76, 79, - 79, 78, 128, 76, 79, 79, 203, 76, 79, 79, 128, 76, 79, 78, 83, 85, 77, - 128, 76, 79, 78, 71, 65, 128, 76, 79, 78, 71, 193, 76, 79, 78, 71, 45, - 66, 82, 65, 78, 67, 72, 45, 89, 82, 128, 76, 79, 78, 71, 45, 66, 82, 65, - 78, 67, 72, 45, 83, 79, 204, 76, 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, - 45, 79, 83, 211, 76, 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, 45, 77, 65, - 68, 210, 76, 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, 45, 72, 65, 71, 65, - 76, 204, 76, 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, 45, 65, 210, 76, 79, - 77, 77, 65, 69, 128, 76, 79, 77, 128, 76, 79, 205, 76, 79, 76, 76, 73, - 80, 79, 80, 128, 76, 79, 76, 76, 128, 76, 79, 71, 210, 76, 79, 71, 79, - 84, 89, 80, 197, 76, 79, 71, 79, 71, 82, 65, 205, 76, 79, 71, 128, 76, - 79, 68, 69, 83, 84, 79, 78, 69, 128, 76, 79, 67, 79, 77, 79, 84, 73, 86, - 69, 128, 76, 79, 67, 75, 73, 78, 71, 45, 83, 72, 73, 70, 212, 76, 79, 67, - 203, 76, 79, 67, 65, 84, 73, 86, 69, 128, 76, 79, 67, 65, 84, 73, 79, 78, - 45, 87, 65, 76, 76, 80, 76, 65, 78, 197, 76, 79, 67, 65, 84, 73, 79, 78, - 45, 70, 76, 79, 79, 82, 80, 76, 65, 78, 197, 76, 79, 67, 65, 84, 73, 79, - 206, 76, 79, 65, 128, 76, 78, 128, 76, 76, 85, 85, 128, 76, 76, 79, 79, - 128, 76, 76, 76, 85, 85, 128, 76, 76, 76, 85, 128, 76, 76, 76, 79, 79, - 128, 76, 76, 76, 79, 128, 76, 76, 76, 73, 73, 128, 76, 76, 76, 73, 128, - 76, 76, 76, 69, 69, 128, 76, 76, 76, 69, 128, 76, 76, 76, 65, 85, 128, - 76, 76, 76, 65, 73, 128, 76, 76, 76, 65, 65, 128, 76, 76, 76, 65, 128, - 76, 76, 76, 128, 76, 74, 85, 68, 73, 74, 69, 128, 76, 74, 69, 128, 76, - 74, 128, 76, 73, 88, 128, 76, 73, 87, 78, 128, 76, 73, 86, 82, 197, 76, - 73, 84, 84, 76, 69, 128, 76, 73, 84, 84, 76, 197, 76, 73, 84, 84, 69, - 210, 76, 73, 84, 82, 193, 76, 73, 84, 200, 76, 73, 83, 213, 76, 73, 83, - 128, 76, 73, 82, 193, 76, 73, 81, 85, 73, 196, 76, 73, 81, 128, 76, 73, - 80, 83, 84, 73, 67, 75, 128, 76, 73, 80, 211, 76, 73, 208, 76, 73, 78, - 75, 73, 78, 199, 76, 73, 78, 75, 69, 196, 76, 73, 78, 203, 76, 73, 78, - 71, 83, 65, 128, 76, 73, 78, 69, 83, 128, 76, 73, 78, 69, 211, 76, 73, - 78, 69, 45, 57, 128, 76, 73, 78, 69, 45, 55, 128, 76, 73, 78, 69, 45, 51, - 128, 76, 73, 78, 69, 45, 49, 128, 76, 73, 77, 77, 85, 52, 128, 76, 73, - 77, 77, 85, 50, 128, 76, 73, 77, 77, 85, 128, 76, 73, 77, 77, 213, 76, - 73, 77, 73, 84, 69, 196, 76, 73, 77, 73, 84, 65, 84, 73, 79, 78, 128, 76, - 73, 77, 73, 84, 128, 76, 73, 77, 69, 128, 76, 73, 77, 66, 213, 76, 73, - 77, 66, 211, 76, 73, 77, 194, 76, 73, 76, 89, 128, 76, 73, 76, 73, 84, - 72, 128, 76, 73, 76, 128, 76, 73, 71, 72, 84, 78, 73, 78, 71, 128, 76, - 73, 71, 72, 84, 78, 73, 78, 199, 76, 73, 71, 72, 84, 72, 79, 85, 83, 69, - 128, 76, 73, 71, 72, 84, 128, 76, 73, 71, 65, 84, 73, 78, 199, 76, 73, - 70, 84, 69, 82, 128, 76, 73, 70, 69, 128, 76, 73, 69, 88, 128, 76, 73, - 69, 84, 128, 76, 73, 69, 80, 128, 76, 73, 69, 69, 128, 76, 73, 69, 128, - 76, 73, 68, 128, 76, 73, 67, 75, 73, 78, 199, 76, 73, 66, 82, 65, 128, - 76, 73, 66, 69, 82, 84, 89, 128, 76, 73, 65, 66, 73, 76, 73, 84, 217, 76, - 72, 73, 73, 128, 76, 72, 65, 86, 73, 89, 65, 78, 73, 128, 76, 72, 65, - 199, 76, 72, 65, 65, 128, 76, 72, 128, 76, 69, 90, 72, 128, 76, 69, 88, - 128, 76, 69, 86, 73, 84, 65, 84, 73, 78, 71, 128, 76, 69, 85, 77, 128, - 76, 69, 85, 65, 69, 80, 128, 76, 69, 85, 65, 69, 77, 128, 76, 69, 85, - 128, 76, 69, 213, 76, 69, 84, 84, 69, 82, 83, 128, 76, 69, 84, 84, 69, - 82, 128, 76, 69, 212, 76, 69, 83, 83, 69, 210, 76, 69, 83, 83, 45, 84, - 72, 65, 78, 128, 76, 69, 83, 83, 45, 84, 72, 65, 206, 76, 69, 80, 67, 72, - 193, 76, 69, 80, 128, 76, 69, 79, 80, 65, 82, 68, 128, 76, 69, 79, 128, - 76, 69, 78, 84, 73, 67, 85, 76, 65, 210, 76, 69, 78, 73, 83, 128, 76, 69, - 78, 73, 211, 76, 69, 78, 71, 84, 72, 69, 78, 69, 82, 128, 76, 69, 78, 71, - 84, 72, 45, 55, 128, 76, 69, 78, 71, 84, 72, 45, 54, 128, 76, 69, 78, 71, - 84, 72, 45, 53, 128, 76, 69, 78, 71, 84, 72, 45, 52, 128, 76, 69, 78, 71, - 84, 72, 45, 51, 128, 76, 69, 78, 71, 84, 72, 45, 50, 128, 76, 69, 78, 71, - 84, 72, 45, 49, 128, 76, 69, 78, 71, 84, 200, 76, 69, 78, 71, 65, 128, - 76, 69, 78, 71, 193, 76, 69, 77, 79, 78, 128, 76, 69, 77, 79, 73, 128, - 76, 69, 76, 69, 84, 128, 76, 69, 76, 69, 212, 76, 69, 203, 76, 69, 73, - 77, 77, 65, 128, 76, 69, 73, 77, 77, 193, 76, 69, 73, 128, 76, 69, 71, - 83, 128, 76, 69, 71, 73, 79, 78, 128, 76, 69, 71, 69, 84, 79, 211, 76, - 69, 71, 128, 76, 69, 199, 76, 69, 70, 84, 87, 65, 82, 68, 83, 128, 76, - 69, 70, 84, 45, 84, 79, 45, 82, 73, 71, 72, 212, 76, 69, 70, 84, 45, 83, - 84, 69, 205, 76, 69, 70, 84, 45, 83, 73, 68, 197, 76, 69, 70, 84, 45, 83, - 72, 65, 68, 69, 196, 76, 69, 70, 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, - 76, 69, 70, 84, 45, 76, 73, 71, 72, 84, 69, 196, 76, 69, 70, 84, 45, 72, - 65, 78, 68, 69, 196, 76, 69, 70, 84, 45, 72, 65, 78, 196, 76, 69, 70, 84, - 45, 70, 65, 67, 73, 78, 199, 76, 69, 70, 84, 128, 76, 69, 69, 82, 65, 69, - 87, 65, 128, 76, 69, 69, 75, 128, 76, 69, 69, 69, 69, 128, 76, 69, 68, - 71, 69, 82, 128, 76, 69, 65, 84, 72, 69, 82, 128, 76, 69, 65, 70, 128, - 76, 69, 65, 198, 76, 69, 65, 68, 73, 78, 199, 76, 69, 65, 68, 69, 82, - 128, 76, 69, 65, 196, 76, 68, 65, 78, 128, 76, 68, 50, 128, 76, 67, 201, - 76, 67, 197, 76, 65, 90, 217, 76, 65, 89, 65, 78, 78, 65, 128, 76, 65, - 88, 128, 76, 65, 87, 128, 76, 65, 215, 76, 65, 85, 76, 65, 128, 76, 65, - 85, 75, 65, 218, 76, 65, 85, 74, 128, 76, 65, 84, 73, 78, 65, 84, 197, - 76, 65, 84, 73, 75, 128, 76, 65, 84, 69, 82, 65, 204, 76, 65, 84, 197, - 76, 65, 83, 212, 76, 65, 82, 89, 78, 71, 69, 65, 204, 76, 65, 82, 201, - 76, 65, 82, 71, 69, 83, 84, 128, 76, 65, 82, 71, 69, 210, 76, 65, 82, 71, - 69, 128, 76, 65, 82, 71, 197, 76, 65, 81, 128, 76, 65, 80, 65, 81, 128, - 76, 65, 207, 76, 65, 78, 84, 69, 82, 78, 128, 76, 65, 78, 71, 85, 65, 71, - 197, 76, 65, 78, 69, 83, 128, 76, 65, 78, 128, 76, 65, 77, 80, 128, 76, - 65, 77, 69, 68, 72, 128, 76, 65, 77, 69, 68, 128, 76, 65, 77, 69, 196, - 76, 65, 77, 69, 128, 76, 65, 77, 197, 76, 65, 77, 68, 65, 128, 76, 65, - 77, 68, 128, 76, 65, 77, 66, 68, 193, 76, 65, 77, 65, 68, 72, 128, 76, - 65, 76, 128, 76, 65, 204, 76, 65, 75, 75, 72, 65, 78, 71, 89, 65, 79, - 128, 76, 65, 75, 45, 55, 52, 57, 128, 76, 65, 75, 45, 55, 50, 52, 128, - 76, 65, 75, 45, 54, 54, 56, 128, 76, 65, 75, 45, 54, 52, 56, 128, 76, 65, - 75, 45, 54, 52, 184, 76, 65, 75, 45, 54, 51, 54, 128, 76, 65, 75, 45, 54, - 49, 55, 128, 76, 65, 75, 45, 54, 49, 183, 76, 65, 75, 45, 54, 48, 56, - 128, 76, 65, 75, 45, 53, 53, 48, 128, 76, 65, 75, 45, 52, 57, 53, 128, - 76, 65, 75, 45, 52, 57, 51, 128, 76, 65, 75, 45, 52, 57, 50, 128, 76, 65, - 75, 45, 52, 57, 48, 128, 76, 65, 75, 45, 52, 56, 51, 128, 76, 65, 75, 45, - 52, 55, 48, 128, 76, 65, 75, 45, 52, 53, 55, 128, 76, 65, 75, 45, 52, 53, - 48, 128, 76, 65, 75, 45, 52, 52, 57, 128, 76, 65, 75, 45, 52, 52, 185, - 76, 65, 75, 45, 52, 52, 49, 128, 76, 65, 75, 45, 51, 57, 48, 128, 76, 65, - 75, 45, 51, 56, 52, 128, 76, 65, 75, 45, 51, 56, 51, 128, 76, 65, 75, 45, - 51, 52, 56, 128, 76, 65, 75, 45, 51, 52, 55, 128, 76, 65, 75, 45, 51, 52, - 51, 128, 76, 65, 75, 45, 50, 54, 54, 128, 76, 65, 75, 45, 50, 54, 53, - 128, 76, 65, 75, 45, 50, 51, 56, 128, 76, 65, 75, 45, 50, 50, 56, 128, - 76, 65, 75, 45, 50, 50, 53, 128, 76, 65, 75, 45, 50, 50, 48, 128, 76, 65, - 75, 45, 50, 49, 57, 128, 76, 65, 75, 45, 50, 49, 48, 128, 76, 65, 75, 45, - 49, 52, 50, 128, 76, 65, 75, 45, 49, 51, 48, 128, 76, 65, 75, 45, 48, 57, - 50, 128, 76, 65, 75, 45, 48, 56, 49, 128, 76, 65, 75, 45, 48, 56, 177, - 76, 65, 75, 45, 48, 56, 48, 128, 76, 65, 75, 45, 48, 55, 185, 76, 65, 75, - 45, 48, 54, 50, 128, 76, 65, 75, 45, 48, 53, 49, 128, 76, 65, 75, 45, 48, - 53, 48, 128, 76, 65, 75, 45, 48, 51, 48, 128, 76, 65, 75, 45, 48, 50, 53, - 128, 76, 65, 75, 45, 48, 50, 49, 128, 76, 65, 75, 45, 48, 50, 48, 128, - 76, 65, 75, 45, 48, 48, 51, 128, 76, 65, 74, 65, 78, 89, 65, 76, 65, 78, - 128, 76, 65, 73, 78, 199, 76, 65, 201, 76, 65, 72, 83, 72, 85, 128, 76, - 65, 72, 128, 76, 65, 71, 85, 83, 128, 76, 65, 71, 213, 76, 65, 71, 65, - 82, 128, 76, 65, 71, 65, 210, 76, 65, 71, 65, 66, 128, 76, 65, 71, 65, - 194, 76, 65, 69, 86, 128, 76, 65, 69, 128, 76, 65, 68, 217, 76, 65, 67, - 75, 128, 76, 65, 67, 65, 128, 76, 65, 66, 79, 85, 82, 73, 78, 71, 128, - 76, 65, 66, 79, 82, 128, 76, 65, 66, 73, 65, 76, 73, 90, 65, 84, 73, 79, - 206, 76, 65, 66, 73, 65, 204, 76, 65, 66, 69, 76, 128, 76, 65, 66, 65, - 84, 128, 76, 65, 65, 78, 65, 69, 128, 76, 65, 65, 78, 128, 76, 65, 65, - 77, 85, 128, 76, 65, 65, 77, 128, 76, 65, 65, 73, 128, 76, 54, 128, 76, - 52, 128, 76, 51, 128, 76, 50, 128, 76, 48, 48, 54, 65, 128, 76, 48, 48, - 50, 65, 128, 76, 45, 84, 89, 80, 197, 76, 45, 83, 72, 65, 80, 69, 196, - 75, 89, 85, 82, 73, 73, 128, 75, 89, 85, 128, 75, 89, 79, 128, 75, 89, - 76, 73, 83, 77, 65, 128, 75, 89, 73, 128, 75, 89, 69, 128, 75, 89, 65, - 84, 72, 79, 211, 75, 89, 65, 65, 128, 75, 89, 65, 128, 75, 88, 87, 73, - 128, 75, 88, 87, 69, 69, 128, 75, 88, 87, 69, 128, 75, 88, 87, 65, 65, - 128, 75, 88, 87, 65, 128, 75, 88, 85, 128, 75, 88, 79, 128, 75, 88, 73, - 128, 75, 88, 69, 69, 128, 75, 88, 69, 128, 75, 88, 65, 65, 128, 75, 88, - 65, 128, 75, 87, 86, 128, 75, 87, 85, 51, 49, 56, 128, 75, 87, 79, 79, - 128, 75, 87, 79, 128, 75, 87, 77, 128, 75, 87, 73, 73, 128, 75, 87, 73, - 128, 75, 87, 69, 69, 128, 75, 87, 69, 128, 75, 87, 66, 128, 75, 87, 65, - 89, 128, 75, 87, 65, 69, 84, 128, 75, 87, 65, 65, 128, 75, 86, 65, 128, - 75, 86, 128, 75, 85, 88, 128, 75, 85, 86, 128, 75, 85, 85, 72, 128, 75, - 85, 84, 128, 75, 85, 83, 77, 65, 128, 75, 85, 83, 72, 85, 50, 128, 75, - 85, 83, 72, 85, 178, 75, 85, 82, 88, 128, 75, 85, 82, 85, 90, 69, 73, 82, - 79, 128, 75, 85, 82, 84, 128, 75, 85, 82, 79, 79, 78, 69, 128, 75, 85, - 82, 128, 75, 85, 210, 75, 85, 81, 128, 75, 85, 79, 88, 128, 75, 85, 79, - 80, 128, 75, 85, 79, 208, 75, 85, 79, 77, 128, 75, 85, 79, 128, 75, 85, - 78, 71, 128, 75, 85, 78, 68, 68, 65, 76, 73, 89, 65, 128, 75, 85, 76, - 128, 75, 85, 204, 75, 85, 71, 128, 75, 85, 69, 84, 128, 75, 85, 66, 128, - 75, 85, 65, 86, 128, 75, 85, 65, 66, 128, 75, 85, 65, 128, 75, 85, 55, - 128, 75, 85, 52, 128, 75, 85, 180, 75, 85, 51, 128, 75, 85, 179, 75, 84, - 128, 75, 83, 83, 85, 85, 128, 75, 83, 83, 85, 128, 75, 83, 83, 79, 79, - 128, 75, 83, 83, 79, 128, 75, 83, 83, 73, 73, 128, 75, 83, 83, 73, 128, - 75, 83, 83, 69, 69, 128, 75, 83, 83, 69, 128, 75, 83, 83, 65, 85, 128, - 75, 83, 83, 65, 73, 128, 75, 83, 83, 65, 65, 128, 75, 83, 83, 65, 128, - 75, 83, 83, 128, 75, 83, 73, 128, 75, 82, 69, 77, 65, 83, 84, 73, 128, - 75, 82, 65, 84, 73, 77, 79, 89, 80, 79, 82, 82, 79, 79, 78, 128, 75, 82, - 65, 84, 73, 77, 79, 75, 79, 85, 70, 73, 83, 77, 65, 128, 75, 82, 65, 84, - 73, 77, 65, 84, 65, 128, 75, 82, 65, 84, 73, 77, 193, 75, 80, 85, 128, - 75, 80, 79, 81, 128, 75, 80, 79, 79, 128, 75, 80, 79, 128, 75, 80, 73, - 128, 75, 80, 69, 85, 88, 128, 75, 80, 69, 69, 128, 75, 80, 69, 128, 75, - 80, 65, 82, 65, 81, 128, 75, 80, 65, 78, 128, 75, 80, 65, 72, 128, 75, - 80, 65, 128, 75, 79, 88, 128, 75, 79, 86, 85, 85, 128, 75, 79, 86, 128, - 75, 79, 84, 79, 128, 75, 79, 82, 85, 78, 65, 128, 75, 79, 82, 79, 78, 73, - 83, 128, 75, 79, 82, 69, 65, 206, 75, 79, 82, 65, 78, 73, 195, 75, 79, - 81, 78, 68, 79, 78, 128, 75, 79, 80, 80, 65, 128, 75, 79, 80, 128, 75, - 79, 79, 86, 128, 75, 79, 79, 80, 79, 128, 75, 79, 79, 77, 85, 85, 84, - 128, 75, 79, 79, 66, 128, 75, 79, 79, 128, 75, 79, 78, 84, 69, 86, 77, - 65, 128, 75, 79, 78, 84, 69, 86, 77, 193, 75, 79, 77, 201, 75, 79, 77, - 66, 85, 86, 65, 128, 75, 79, 77, 66, 85, 86, 193, 75, 79, 77, 66, 213, - 75, 79, 75, 79, 128, 75, 79, 75, 69, 128, 75, 79, 75, 128, 75, 79, 203, - 75, 79, 73, 128, 75, 79, 201, 75, 79, 72, 128, 75, 79, 71, 72, 79, 77, - 128, 75, 79, 69, 84, 128, 75, 79, 66, 128, 75, 79, 65, 76, 65, 128, 75, - 79, 65, 128, 75, 78, 85, 67, 75, 76, 69, 83, 128, 75, 78, 85, 67, 75, 76, - 69, 128, 75, 78, 79, 66, 83, 128, 75, 78, 73, 71, 72, 84, 128, 75, 78, - 73, 71, 72, 212, 75, 78, 73, 70, 69, 128, 75, 78, 73, 70, 197, 75, 77, - 128, 75, 205, 75, 76, 73, 84, 79, 78, 128, 75, 76, 65, 83, 77, 65, 128, - 75, 76, 65, 83, 77, 193, 75, 76, 65, 128, 75, 76, 128, 75, 75, 85, 128, - 75, 75, 79, 128, 75, 75, 73, 128, 75, 75, 69, 69, 128, 75, 75, 69, 128, - 75, 75, 65, 128, 75, 75, 128, 75, 74, 69, 128, 75, 73, 89, 69, 79, 75, - 45, 84, 73, 75, 69, 85, 84, 128, 75, 73, 89, 69, 79, 75, 45, 83, 73, 79, - 83, 45, 75, 73, 89, 69, 79, 75, 128, 75, 73, 89, 69, 79, 75, 45, 82, 73, - 69, 85, 76, 128, 75, 73, 89, 69, 79, 75, 45, 80, 73, 69, 85, 80, 128, 75, - 73, 89, 69, 79, 75, 45, 78, 73, 69, 85, 78, 128, 75, 73, 89, 69, 79, 75, - 45, 75, 72, 73, 69, 85, 75, 72, 128, 75, 73, 89, 69, 79, 75, 45, 67, 72, - 73, 69, 85, 67, 72, 128, 75, 73, 89, 69, 79, 203, 75, 73, 88, 128, 75, - 73, 87, 128, 75, 73, 86, 128, 75, 73, 84, 128, 75, 73, 83, 83, 73, 78, - 199, 75, 73, 83, 83, 128, 75, 73, 83, 211, 75, 73, 83, 73, 77, 53, 128, - 75, 73, 83, 73, 77, 181, 75, 73, 83, 72, 128, 75, 73, 83, 65, 76, 128, - 75, 73, 82, 79, 87, 65, 84, 84, 79, 128, 75, 73, 82, 79, 77, 69, 69, 84, - 79, 82, 85, 128, 75, 73, 82, 79, 71, 85, 82, 65, 77, 85, 128, 75, 73, 82, - 79, 128, 75, 73, 82, 71, 72, 73, 218, 75, 73, 81, 128, 75, 73, 80, 128, - 75, 73, 208, 75, 73, 78, 83, 72, 73, 80, 128, 75, 73, 78, 68, 69, 82, 71, - 65, 82, 84, 69, 78, 128, 75, 73, 77, 79, 78, 79, 128, 75, 73, 76, 76, 69, - 82, 128, 75, 73, 73, 128, 75, 73, 72, 128, 75, 73, 69, 88, 128, 75, 73, - 69, 86, 65, 206, 75, 73, 69, 80, 128, 75, 73, 69, 69, 77, 128, 75, 73, - 69, 128, 75, 73, 68, 128, 75, 73, 196, 75, 73, 67, 75, 128, 75, 73, 66, - 128, 75, 73, 65, 86, 128, 75, 73, 65, 66, 128, 75, 72, 90, 128, 75, 72, - 87, 65, 73, 128, 75, 72, 85, 69, 78, 45, 76, 85, 197, 75, 72, 85, 69, - 206, 75, 72, 85, 68, 65, 87, 65, 68, 201, 75, 72, 85, 68, 65, 77, 128, - 75, 72, 85, 65, 84, 128, 75, 72, 79, 85, 128, 75, 72, 79, 212, 75, 72, - 79, 78, 128, 75, 72, 79, 77, 85, 84, 128, 75, 72, 79, 74, 75, 201, 75, - 72, 79, 128, 75, 72, 207, 75, 72, 77, 213, 75, 72, 73, 84, 128, 75, 72, - 73, 78, 89, 65, 128, 75, 72, 73, 69, 85, 75, 200, 75, 72, 73, 128, 75, - 72, 201, 75, 72, 72, 79, 128, 75, 72, 72, 65, 128, 75, 72, 69, 84, 72, - 128, 75, 72, 69, 73, 128, 75, 72, 69, 69, 128, 75, 72, 69, 128, 75, 72, - 65, 86, 128, 75, 72, 65, 82, 79, 83, 72, 84, 72, 201, 75, 72, 65, 82, - 128, 75, 72, 65, 80, 72, 128, 75, 72, 65, 78, 199, 75, 72, 65, 78, 68, - 193, 75, 72, 65, 78, 128, 75, 72, 65, 77, 84, 201, 75, 72, 65, 75, 65, - 83, 83, 73, 65, 206, 75, 72, 65, 73, 128, 75, 72, 65, 72, 128, 75, 72, - 65, 200, 75, 72, 65, 66, 128, 75, 72, 65, 65, 128, 75, 71, 128, 75, 69, - 89, 67, 65, 80, 128, 75, 69, 89, 67, 65, 208, 75, 69, 89, 66, 79, 65, 82, - 68, 128, 75, 69, 89, 66, 79, 65, 82, 196, 75, 69, 88, 128, 75, 69, 86, - 128, 75, 69, 85, 89, 69, 85, 88, 128, 75, 69, 85, 83, 72, 69, 85, 65, 69, - 80, 128, 75, 69, 85, 83, 69, 85, 88, 128, 75, 69, 85, 80, 85, 81, 128, - 75, 69, 85, 79, 212, 75, 69, 85, 77, 128, 75, 69, 85, 75, 69, 85, 84, 78, - 68, 65, 128, 75, 69, 85, 75, 65, 81, 128, 75, 69, 85, 65, 69, 84, 77, 69, - 85, 78, 128, 75, 69, 85, 65, 69, 82, 73, 128, 75, 69, 84, 84, 201, 75, - 69, 83, 72, 50, 128, 75, 69, 82, 69, 84, 128, 75, 69, 79, 87, 128, 75, - 69, 78, 84, 73, 77, 65, 84, 65, 128, 75, 69, 78, 84, 73, 77, 65, 84, 193, - 75, 69, 78, 84, 73, 77, 193, 75, 69, 78, 65, 84, 128, 75, 69, 78, 128, - 75, 69, 206, 75, 69, 77, 80, 85, 76, 128, 75, 69, 77, 80, 85, 204, 75, - 69, 77, 80, 76, 73, 128, 75, 69, 77, 80, 76, 201, 75, 69, 77, 80, 72, 82, - 69, 78, 71, 128, 75, 69, 77, 66, 65, 78, 71, 128, 75, 69, 76, 86, 73, - 206, 75, 69, 72, 69, 72, 128, 75, 69, 72, 69, 200, 75, 69, 72, 128, 75, - 69, 70, 85, 76, 65, 128, 75, 69, 69, 86, 128, 75, 69, 69, 83, 85, 128, - 75, 69, 69, 80, 73, 78, 199, 75, 69, 69, 78, 71, 128, 75, 69, 69, 66, - 128, 75, 69, 66, 128, 75, 69, 65, 65, 69, 128, 75, 67, 65, 76, 128, 75, - 66, 128, 75, 65, 90, 65, 75, 200, 75, 65, 89, 65, 78, 78, 65, 128, 75, - 65, 89, 65, 200, 75, 65, 88, 128, 75, 65, 87, 86, 128, 75, 65, 87, 73, - 128, 75, 65, 87, 66, 128, 75, 65, 86, 89, 75, 65, 128, 75, 65, 86, 128, - 75, 65, 85, 86, 128, 75, 65, 85, 78, 65, 128, 75, 65, 85, 206, 75, 65, - 85, 66, 128, 75, 65, 84, 79, 128, 75, 65, 84, 72, 73, 83, 84, 73, 128, - 75, 65, 84, 72, 65, 75, 193, 75, 65, 84, 65, 86, 65, 83, 77, 65, 128, 75, - 65, 84, 65, 86, 193, 75, 65, 84, 65, 75, 65, 78, 65, 45, 72, 73, 82, 65, - 71, 65, 78, 193, 75, 65, 83, 82, 65, 84, 65, 78, 128, 75, 65, 83, 82, 65, - 84, 65, 206, 75, 65, 83, 82, 65, 128, 75, 65, 83, 82, 193, 75, 65, 83, - 75, 65, 76, 128, 75, 65, 83, 75, 65, 204, 75, 65, 83, 72, 77, 73, 82, - 201, 75, 65, 82, 83, 72, 65, 78, 65, 128, 75, 65, 82, 79, 82, 73, 73, - 128, 75, 65, 82, 207, 75, 65, 82, 69, 206, 75, 65, 82, 65, 84, 84, 79, - 128, 75, 65, 82, 65, 78, 128, 75, 65, 80, 89, 69, 79, 85, 78, 83, 83, 65, - 78, 71, 80, 73, 69, 85, 80, 128, 75, 65, 80, 89, 69, 79, 85, 78, 82, 73, - 69, 85, 76, 128, 75, 65, 80, 89, 69, 79, 85, 78, 80, 72, 73, 69, 85, 80, - 72, 128, 75, 65, 80, 89, 69, 79, 85, 78, 77, 73, 69, 85, 77, 128, 75, 65, - 80, 80, 65, 128, 75, 65, 80, 80, 193, 75, 65, 80, 79, 128, 75, 65, 80, - 72, 128, 75, 65, 80, 65, 76, 128, 75, 65, 80, 65, 128, 75, 65, 208, 75, - 65, 78, 84, 65, 74, 193, 75, 65, 78, 71, 128, 75, 65, 78, 199, 75, 65, - 78, 65, 75, 79, 128, 75, 65, 77, 52, 128, 75, 65, 77, 50, 128, 75, 65, - 77, 128, 75, 65, 75, 79, 128, 75, 65, 75, 65, 66, 65, 84, 128, 75, 65, - 75, 128, 75, 65, 203, 75, 65, 73, 86, 128, 75, 65, 73, 84, 72, 201, 75, - 65, 73, 82, 73, 128, 75, 65, 73, 66, 128, 75, 65, 73, 128, 75, 65, 201, - 75, 65, 70, 65, 128, 75, 65, 70, 128, 75, 65, 198, 75, 65, 68, 53, 128, - 75, 65, 68, 181, 75, 65, 68, 52, 128, 75, 65, 68, 51, 128, 75, 65, 68, - 179, 75, 65, 68, 50, 128, 75, 65, 68, 128, 75, 65, 66, 193, 75, 65, 66, - 128, 75, 65, 65, 86, 128, 75, 65, 65, 73, 128, 75, 65, 65, 70, 85, 128, - 75, 65, 65, 70, 128, 75, 65, 65, 66, 65, 128, 75, 65, 65, 66, 128, 75, - 65, 50, 128, 75, 65, 178, 75, 48, 48, 56, 128, 75, 48, 48, 55, 128, 75, - 48, 48, 54, 128, 75, 48, 48, 53, 128, 75, 48, 48, 52, 128, 75, 48, 48, - 51, 128, 75, 48, 48, 50, 128, 75, 48, 48, 49, 128, 74, 87, 65, 128, 74, - 85, 85, 128, 74, 85, 84, 128, 74, 85, 83, 84, 73, 70, 73, 67, 65, 84, 73, - 79, 78, 128, 74, 85, 80, 73, 84, 69, 82, 128, 74, 85, 79, 84, 128, 74, - 85, 79, 80, 128, 74, 85, 78, 79, 128, 74, 85, 78, 69, 128, 74, 85, 76, - 89, 128, 74, 85, 69, 85, 73, 128, 74, 85, 68, 85, 76, 128, 74, 85, 68, - 71, 69, 128, 74, 85, 68, 69, 79, 45, 83, 80, 65, 78, 73, 83, 200, 74, 79, - 89, 83, 84, 73, 67, 75, 128, 74, 79, 89, 79, 85, 211, 74, 79, 89, 128, - 74, 79, 86, 69, 128, 74, 79, 212, 74, 79, 78, 71, 128, 74, 79, 78, 193, - 74, 79, 75, 69, 82, 128, 74, 79, 73, 78, 84, 83, 128, 74, 79, 73, 78, 69, - 68, 128, 74, 79, 73, 78, 128, 74, 79, 65, 128, 74, 74, 89, 88, 128, 74, - 74, 89, 84, 128, 74, 74, 89, 80, 128, 74, 74, 89, 128, 74, 74, 85, 88, - 128, 74, 74, 85, 84, 128, 74, 74, 85, 82, 88, 128, 74, 74, 85, 82, 128, - 74, 74, 85, 80, 128, 74, 74, 85, 79, 88, 128, 74, 74, 85, 79, 80, 128, - 74, 74, 85, 79, 128, 74, 74, 85, 128, 74, 74, 79, 88, 128, 74, 74, 79, - 84, 128, 74, 74, 79, 80, 128, 74, 74, 79, 128, 74, 74, 73, 88, 128, 74, - 74, 73, 84, 128, 74, 74, 73, 80, 128, 74, 74, 73, 69, 88, 128, 74, 74, - 73, 69, 84, 128, 74, 74, 73, 69, 80, 128, 74, 74, 73, 69, 128, 74, 74, - 73, 128, 74, 74, 69, 69, 128, 74, 74, 69, 128, 74, 74, 65, 128, 74, 73, - 76, 128, 74, 73, 73, 128, 74, 73, 72, 86, 65, 77, 85, 76, 73, 89, 65, - 128, 74, 73, 65, 128, 74, 72, 79, 88, 128, 74, 72, 79, 128, 74, 72, 69, - 72, 128, 74, 72, 65, 89, 73, 78, 128, 74, 72, 65, 78, 128, 74, 72, 65, - 77, 128, 74, 72, 65, 65, 128, 74, 72, 65, 128, 74, 69, 85, 128, 74, 69, - 82, 85, 83, 65, 76, 69, 77, 128, 74, 69, 82, 65, 206, 74, 69, 82, 65, - 128, 74, 69, 82, 128, 74, 69, 72, 128, 74, 69, 200, 74, 69, 71, 79, 71, - 65, 78, 128, 74, 69, 69, 77, 128, 74, 69, 65, 78, 83, 128, 74, 65, 89, - 78, 128, 74, 65, 89, 73, 78, 128, 74, 65, 89, 65, 78, 78, 65, 128, 74, - 65, 87, 128, 74, 65, 86, 73, 89, 65, 78, 73, 128, 74, 65, 85, 128, 74, - 65, 82, 128, 74, 65, 80, 65, 78, 69, 83, 197, 74, 65, 80, 65, 78, 128, - 74, 65, 78, 85, 65, 82, 89, 128, 74, 65, 76, 76, 65, 74, 65, 76, 65, 76, - 79, 85, 72, 79, 85, 128, 74, 65, 73, 206, 74, 65, 73, 128, 74, 65, 72, - 128, 74, 65, 68, 69, 128, 74, 65, 67, 75, 83, 128, 74, 65, 67, 75, 45, - 79, 45, 76, 65, 78, 84, 69, 82, 78, 128, 74, 65, 67, 203, 74, 45, 83, 73, - 77, 80, 76, 73, 70, 73, 69, 196, 73, 90, 72, 73, 84, 83, 65, 128, 73, 90, - 72, 73, 84, 83, 193, 73, 90, 72, 69, 128, 73, 90, 65, 75, 65, 89, 193, - 73, 89, 69, 75, 128, 73, 89, 65, 78, 78, 65, 128, 73, 85, 74, 65, 128, - 73, 84, 211, 73, 84, 69, 82, 65, 84, 73, 79, 206, 73, 84, 69, 77, 128, - 73, 83, 83, 72, 65, 82, 128, 73, 83, 79, 83, 67, 69, 76, 69, 211, 73, 83, - 79, 78, 128, 73, 83, 79, 206, 73, 83, 79, 76, 65, 84, 69, 128, 73, 83, - 76, 65, 78, 68, 128, 73, 83, 69, 78, 45, 73, 83, 69, 78, 128, 73, 83, 65, - 75, 73, 193, 73, 83, 45, 80, 73, 76, 76, 65, 128, 73, 82, 85, 89, 65, 78, - 78, 65, 128, 73, 82, 85, 85, 89, 65, 78, 78, 65, 128, 73, 82, 79, 78, 45, - 67, 79, 80, 80, 69, 210, 73, 82, 79, 78, 128, 73, 82, 66, 128, 73, 79, - 84, 73, 70, 73, 69, 196, 73, 79, 84, 65, 84, 69, 196, 73, 79, 84, 65, - 128, 73, 79, 84, 193, 73, 79, 82, 128, 73, 79, 68, 72, 65, 68, 72, 128, - 73, 78, 86, 73, 83, 73, 66, 76, 197, 73, 78, 86, 69, 82, 84, 69, 68, 128, - 73, 78, 86, 69, 82, 84, 69, 196, 73, 78, 86, 69, 82, 83, 197, 73, 78, 84, - 82, 79, 68, 85, 67, 69, 82, 128, 73, 78, 84, 73, 128, 73, 78, 84, 69, 82, - 83, 89, 76, 76, 65, 66, 73, 195, 73, 78, 84, 69, 82, 83, 69, 67, 84, 73, - 79, 78, 128, 73, 78, 84, 69, 82, 83, 69, 67, 84, 73, 79, 206, 73, 78, 84, - 69, 82, 83, 69, 67, 84, 73, 78, 199, 73, 78, 84, 69, 82, 82, 79, 66, 65, - 78, 71, 128, 73, 78, 84, 69, 82, 82, 79, 66, 65, 78, 199, 73, 78, 84, 69, - 82, 80, 79, 76, 65, 84, 73, 79, 206, 73, 78, 84, 69, 82, 76, 79, 67, 75, - 69, 196, 73, 78, 84, 69, 82, 76, 73, 78, 69, 65, 210, 73, 78, 84, 69, 82, - 76, 65, 67, 69, 196, 73, 78, 84, 69, 82, 73, 79, 210, 73, 78, 84, 69, 82, - 69, 83, 212, 73, 78, 84, 69, 82, 67, 65, 76, 65, 84, 69, 128, 73, 78, 84, - 69, 71, 82, 65, 84, 73, 79, 78, 128, 73, 78, 84, 69, 71, 82, 65, 84, 73, - 79, 206, 73, 78, 84, 69, 71, 82, 65, 76, 128, 73, 78, 84, 69, 71, 82, 65, - 204, 73, 78, 83, 85, 76, 65, 210, 73, 78, 83, 84, 82, 85, 77, 69, 78, 84, - 65, 204, 73, 78, 83, 73, 68, 69, 128, 73, 78, 83, 73, 68, 197, 73, 78, - 83, 69, 82, 84, 73, 79, 206, 73, 78, 83, 69, 67, 84, 128, 73, 78, 83, 67, - 82, 73, 80, 84, 73, 79, 78, 65, 204, 73, 78, 80, 85, 212, 73, 78, 78, 79, - 67, 69, 78, 67, 69, 128, 73, 78, 78, 78, 128, 73, 78, 78, 69, 82, 128, - 73, 78, 78, 69, 210, 73, 78, 78, 128, 73, 78, 73, 78, 71, 85, 128, 73, - 78, 73, 128, 73, 78, 72, 73, 66, 73, 212, 73, 78, 72, 69, 82, 69, 78, - 212, 73, 78, 72, 65, 76, 69, 128, 73, 78, 71, 87, 65, 90, 128, 73, 78, - 70, 79, 82, 77, 65, 84, 73, 79, 206, 73, 78, 70, 76, 85, 69, 78, 67, 69, - 128, 73, 78, 70, 73, 78, 73, 84, 89, 128, 73, 78, 70, 73, 78, 73, 84, - 217, 73, 78, 68, 85, 83, 84, 82, 73, 65, 204, 73, 78, 68, 73, 82, 69, 67, - 212, 73, 78, 68, 73, 67, 65, 84, 79, 82, 128, 73, 78, 68, 73, 67, 65, 84, - 79, 210, 73, 78, 68, 73, 195, 73, 78, 68, 73, 65, 206, 73, 78, 68, 69, - 88, 128, 73, 78, 68, 69, 80, 69, 78, 68, 69, 78, 212, 73, 78, 67, 82, 69, - 77, 69, 78, 84, 128, 73, 78, 67, 82, 69, 65, 83, 69, 211, 73, 78, 67, 82, - 69, 65, 83, 69, 128, 73, 78, 67, 82, 69, 65, 83, 197, 73, 78, 67, 79, 77, - 80, 76, 69, 84, 197, 73, 78, 67, 79, 77, 73, 78, 199, 73, 78, 67, 76, 85, - 68, 73, 78, 199, 73, 78, 67, 72, 128, 73, 78, 66, 79, 216, 73, 78, 65, - 80, 128, 73, 78, 45, 65, 76, 65, 70, 128, 73, 77, 80, 69, 82, 73, 65, - 204, 73, 77, 80, 69, 82, 70, 69, 67, 84, 85, 205, 73, 77, 80, 69, 82, 70, - 69, 67, 84, 65, 128, 73, 77, 80, 69, 82, 70, 69, 67, 84, 193, 73, 77, 78, - 128, 73, 77, 73, 83, 69, 79, 211, 73, 77, 73, 78, 51, 128, 73, 77, 73, - 78, 128, 73, 77, 73, 206, 73, 77, 73, 70, 84, 72, 79, 82, 79, 78, 128, - 73, 77, 73, 70, 84, 72, 79, 82, 65, 128, 73, 77, 73, 70, 79, 78, 79, 78, - 128, 73, 77, 73, 68, 73, 65, 82, 71, 79, 78, 128, 73, 77, 65, 71, 197, - 73, 76, 85, 89, 65, 78, 78, 65, 128, 73, 76, 85, 89, 128, 73, 76, 85, 85, - 89, 65, 78, 78, 65, 128, 73, 76, 85, 84, 128, 73, 76, 73, 77, 77, 85, 52, - 128, 73, 76, 73, 77, 77, 85, 51, 128, 73, 76, 73, 77, 77, 85, 128, 73, - 76, 73, 77, 77, 213, 73, 76, 50, 128, 73, 75, 65, 82, 65, 128, 73, 75, - 65, 82, 193, 73, 74, 128, 73, 73, 89, 65, 78, 78, 65, 128, 73, 71, 73, - 128, 73, 71, 201, 73, 71, 71, 87, 83, 128, 73, 70, 73, 78, 128, 73, 69, - 85, 78, 71, 45, 84, 73, 75, 69, 85, 84, 128, 73, 69, 85, 78, 71, 45, 84, - 72, 73, 69, 85, 84, 72, 128, 73, 69, 85, 78, 71, 45, 83, 83, 65, 78, 71, - 75, 73, 89, 69, 79, 75, 128, 73, 69, 85, 78, 71, 45, 82, 73, 69, 85, 76, - 128, 73, 69, 85, 78, 71, 45, 80, 73, 69, 85, 80, 128, 73, 69, 85, 78, 71, - 45, 80, 72, 73, 69, 85, 80, 72, 128, 73, 69, 85, 78, 71, 45, 75, 73, 89, - 69, 79, 75, 128, 73, 69, 85, 78, 71, 45, 75, 72, 73, 69, 85, 75, 72, 128, - 73, 69, 85, 78, 71, 45, 67, 73, 69, 85, 67, 128, 73, 69, 85, 78, 71, 45, - 67, 72, 73, 69, 85, 67, 72, 128, 73, 69, 85, 78, 199, 73, 68, 76, 69, - 128, 73, 68, 73, 77, 128, 73, 68, 73, 205, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 68, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 68, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 68, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 68, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 68, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 67, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 67, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 67, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 67, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 67, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 67, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 67, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 67, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 67, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 66, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 66, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 66, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 66, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 66, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 66, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 65, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 65, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 65, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 65, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 65, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 65, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 65, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 65, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 57, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 57, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 57, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 57, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 57, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 57, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 57, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 57, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 57, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 56, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 56, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 56, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 56, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 56, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 56, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 55, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 55, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 55, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 55, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 55, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 55, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 55, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 54, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 54, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 54, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 54, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 54, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 54, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 54, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 53, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 53, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 53, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 53, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 53, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 53, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 53, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 53, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 52, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 52, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 52, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 52, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 52, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 52, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 52, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 52, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 51, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 51, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 51, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 51, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 51, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 51, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 51, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 50, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 50, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 50, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 50, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 50, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 50, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 50, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 50, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 49, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 49, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 49, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 49, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 49, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 48, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 48, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 48, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 65, 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 65, 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 65, 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 70, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 70, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 70, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 70, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 70, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 70, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 70, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 70, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 69, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 69, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 69, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 69, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 69, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 69, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 69, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 69, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 69, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 68, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 68, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 68, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 68, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 68, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 68, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 68, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 67, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 67, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 67, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 67, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 67, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 67, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 67, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 67, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 66, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 66, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 66, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 66, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 66, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 66, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 66, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 66, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 65, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 65, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 65, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 65, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 65, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 65, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 65, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 57, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 57, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 57, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 57, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 57, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 57, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 57, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 57, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 56, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 56, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 56, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 56, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 56, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 56, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 56, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 56, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 55, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 55, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 55, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 55, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 55, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 55, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 54, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 54, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 54, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 54, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 54, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 54, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 54, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 54, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 53, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 53, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 53, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 53, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 53, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 53, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 53, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 53, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 52, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 52, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 52, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 52, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 52, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 52, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 52, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 51, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 51, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 51, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 51, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 51, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 51, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 51, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 51, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 70, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 50, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 50, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, - 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 50, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 50, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 50, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, - 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 50, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 50, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 50, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, - 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 49, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 49, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 55, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 49, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 49, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, - 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 49, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 66, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 48, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 53, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 70, 57, 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 70, 57, 48, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 70, 57, 48, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 57, 48, 52, 65, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 56, 68, 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 56, 67, 65, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 56, 57, 69, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 68, 52, - 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 65, 55, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 57, 56, 49, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 55, 54, 68, 55, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 55, 53, 51, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 55, 53, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 49, 50, - 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 48, 66, 57, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 70, 49, 52, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 54, 69, 56, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 54, 55, 50, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 54, 55, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 55, 48, - 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 54, 50, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 53, 66, 48, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 54, 53, 57, 57, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 54, 53, 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 54, 51, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 51, 48, - 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 50, 57, 53, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 50, 53, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 54, 50, 52, 66, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 53, 70, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 53, 68, 69, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 66, 56, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 66, 53, 55, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 57, 50, 57, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 53, 57, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 53, 56, 70, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 53, 53, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 52, 51, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 52, 48, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 51, 70, 51, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 53, 51, 67, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 53, 50, 68, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 53, 50, 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 50, 52, - 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 50, 49, 68, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 49, 56, 68, 128, 73, 68, 69, 79, - 71, 82, 65, 80, 72, 45, 52, 69, 65, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 52, 69, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, - 52, 69, 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 52, 69, 48, - 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 52, 69, 48, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 68, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 67, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 65, 49, 66, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 65, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 65, 49, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 65, 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, - 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 54, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 53, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 52, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 51, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 65, 49, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 65, 49, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 65, 49, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 65, 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, - 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 68, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 66, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 65, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 65, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 65, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 65, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 65, 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, - 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 52, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 51, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 50, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 49, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 65, 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 70, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 70, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 70, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 70, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 66, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 57, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 56, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 70, 55, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 70, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 70, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 70, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 70, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 50, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 49, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 48, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 70, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 69, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 69, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 69, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 69, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 69, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 57, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 55, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 54, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 69, 53, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 69, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 69, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 69, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 69, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 48, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 70, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 69, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 68, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 68, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 68, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 68, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 68, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 68, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 55, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 53, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 52, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 68, 51, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 68, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 68, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 68, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 67, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 69, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 68, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 67, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 66, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 67, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 67, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 67, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 67, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 67, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 53, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 51, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 50, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 67, 49, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 67, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 66, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 66, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 66, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 67, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 66, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 65, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 57, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 66, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 66, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 66, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 66, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 51, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 49, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 48, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 65, 70, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 65, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 65, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 65, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 65, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 65, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 57, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 56, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 55, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 65, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 65, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 65, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 65, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 65, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 49, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 70, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 69, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 57, 68, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 57, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 57, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 57, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 57, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 56, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 55, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 54, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 53, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 57, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 57, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 57, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 57, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 57, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 70, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 68, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 67, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 56, 66, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 56, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 56, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 56, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 56, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 54, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 53, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 52, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 51, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 56, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 56, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 56, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 55, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 55, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 68, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 66, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 65, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 55, 57, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 55, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 55, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 55, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 55, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 52, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 51, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 50, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 49, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 54, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 54, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 54, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 54, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 66, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 57, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 56, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 54, 55, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 54, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 54, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 54, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 54, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 50, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 49, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 48, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 70, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 53, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 53, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 53, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 53, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 53, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 57, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 55, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 54, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 53, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 53, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 53, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 53, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 48, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 70, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 69, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 68, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 52, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 52, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 52, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 52, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 52, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 55, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 53, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 52, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 52, 51, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 52, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 52, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 52, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 51, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 69, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 68, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 67, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 66, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 51, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 51, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 51, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 51, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 51, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 53, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 51, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 50, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 51, 49, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 51, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 50, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 50, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 67, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 66, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 65, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 57, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 50, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 50, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 50, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 50, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 50, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 51, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 49, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 48, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 49, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 49, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 49, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 65, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 57, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 56, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 55, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 49, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 49, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 49, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 49, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 49, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 70, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 69, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 48, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 48, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 48, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 56, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 55, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 54, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 53, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 57, 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 57, 48, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 57, 48, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 57, 48, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, - 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 70, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 68, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 67, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 70, 66, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 70, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 70, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 70, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 70, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 54, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 53, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 52, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 51, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 70, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 70, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 70, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 69, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 69, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 68, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 66, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 65, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 69, 57, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 69, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 69, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 69, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 69, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 52, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 51, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 50, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 49, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 69, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 68, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 68, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 68, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 68, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 66, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 57, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 56, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 68, 55, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 68, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 68, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 68, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 68, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 50, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 49, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 48, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 70, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 67, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 67, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 67, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 67, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 67, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 57, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 55, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 54, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 67, 53, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 67, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 67, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 67, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 67, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 48, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 70, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 69, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 68, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 66, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 66, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 66, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 66, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 66, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 55, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 53, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 52, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 66, 51, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 66, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 66, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 66, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 65, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 69, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 68, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 67, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 66, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 65, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 65, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 65, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 65, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 65, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 53, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 51, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 50, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 65, 49, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 65, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 57, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 57, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 57, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 67, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 66, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 65, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 57, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 57, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 57, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 57, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 57, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 57, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 51, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 49, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 48, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 56, 70, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 56, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 56, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 56, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 65, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 57, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 56, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 55, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 56, 54, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 56, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 56, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 56, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 56, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 49, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 48, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 70, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 69, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 55, 68, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 55, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 55, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 55, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 55, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 56, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 55, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 54, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 53, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 55, 52, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 55, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 55, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 70, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 69, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 68, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 67, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 54, 66, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 54, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 54, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 54, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 54, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 54, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 53, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 52, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 51, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 54, 50, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 54, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 54, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 53, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 53, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 68, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 67, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 66, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 65, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 53, 57, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 53, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 53, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 52, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 51, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 50, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 49, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 53, 48, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 52, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 52, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 52, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 66, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 65, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 57, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 56, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 52, 55, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 52, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 52, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 52, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 52, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 50, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 49, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 48, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 70, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 51, 69, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 51, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 51, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 51, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 51, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 57, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 56, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 55, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 54, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 51, 53, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 51, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 51, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 51, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 51, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 48, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 70, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 69, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 68, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 50, 67, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 50, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 50, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 50, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 50, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 55, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 54, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 53, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 52, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 50, 51, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 50, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 50, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 50, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 69, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 68, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 67, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 66, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 49, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 53, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 52, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 51, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 50, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 49, 49, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 49, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 67, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 66, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 65, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 57, 128, 73, 68, 69, 79, 71, - 82, 65, 80, 72, 45, 50, 70, 56, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, - 80, 72, 45, 50, 70, 56, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, - 45, 50, 70, 56, 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, - 70, 56, 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, - 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 51, - 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 50, 128, 73, - 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 49, 128, 73, 68, 69, - 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 48, 128, 73, 68, 69, 78, 84, - 73, 70, 73, 67, 65, 84, 73, 79, 78, 128, 73, 68, 69, 78, 84, 73, 67, 65, - 204, 73, 67, 79, 78, 128, 73, 67, 72, 79, 85, 128, 73, 67, 72, 79, 83, - 128, 73, 67, 72, 73, 77, 65, 84, 79, 83, 128, 73, 67, 72, 65, 68, 73, 78, - 128, 73, 67, 69, 76, 65, 78, 68, 73, 67, 45, 89, 82, 128, 73, 66, 73, 70, - 73, 76, 73, 128, 73, 65, 85, 68, 65, 128, 73, 48, 49, 53, 128, 73, 48, - 49, 52, 128, 73, 48, 49, 51, 128, 73, 48, 49, 50, 128, 73, 48, 49, 49, - 65, 128, 73, 48, 49, 49, 128, 73, 48, 49, 48, 65, 128, 73, 48, 49, 48, - 128, 73, 48, 48, 57, 65, 128, 73, 48, 48, 57, 128, 73, 48, 48, 56, 128, - 73, 48, 48, 55, 128, 73, 48, 48, 54, 128, 73, 48, 48, 53, 65, 128, 73, - 48, 48, 53, 128, 73, 48, 48, 52, 128, 73, 48, 48, 51, 128, 73, 48, 48, - 50, 128, 73, 48, 48, 49, 128, 73, 45, 89, 85, 128, 73, 45, 89, 79, 128, - 73, 45, 89, 69, 79, 128, 73, 45, 89, 69, 128, 73, 45, 89, 65, 69, 128, - 73, 45, 89, 65, 45, 79, 128, 73, 45, 89, 65, 128, 73, 45, 79, 45, 73, - 128, 73, 45, 79, 128, 73, 45, 69, 85, 128, 73, 45, 66, 69, 65, 77, 128, - 73, 45, 65, 82, 65, 69, 65, 128, 73, 45, 65, 128, 72, 90, 90, 90, 71, - 128, 72, 90, 90, 90, 128, 72, 90, 90, 80, 128, 72, 90, 90, 128, 72, 90, - 87, 71, 128, 72, 90, 87, 128, 72, 90, 84, 128, 72, 90, 71, 128, 72, 89, - 83, 84, 69, 82, 69, 83, 73, 211, 72, 89, 80, 79, 68, 73, 65, 83, 84, 79, - 76, 69, 128, 72, 89, 80, 72, 69, 78, 65, 84, 73, 79, 206, 72, 89, 80, 72, - 69, 78, 45, 77, 73, 78, 85, 83, 128, 72, 89, 80, 72, 69, 78, 128, 72, 89, - 80, 72, 69, 206, 72, 89, 71, 73, 69, 73, 65, 128, 72, 88, 87, 71, 128, - 72, 88, 85, 79, 88, 128, 72, 88, 85, 79, 84, 128, 72, 88, 85, 79, 80, - 128, 72, 88, 85, 79, 128, 72, 88, 79, 88, 128, 72, 88, 79, 84, 128, 72, - 88, 79, 80, 128, 72, 88, 79, 128, 72, 88, 73, 88, 128, 72, 88, 73, 84, - 128, 72, 88, 73, 80, 128, 72, 88, 73, 69, 88, 128, 72, 88, 73, 69, 84, - 128, 72, 88, 73, 69, 80, 128, 72, 88, 73, 69, 128, 72, 88, 73, 128, 72, - 88, 69, 88, 128, 72, 88, 69, 80, 128, 72, 88, 69, 128, 72, 88, 65, 88, - 128, 72, 88, 65, 84, 128, 72, 88, 65, 80, 128, 72, 88, 65, 128, 72, 87, - 85, 128, 72, 87, 65, 73, 82, 128, 72, 87, 65, 72, 128, 72, 86, 128, 72, - 85, 86, 65, 128, 72, 85, 83, 72, 69, 196, 72, 85, 83, 72, 128, 72, 85, - 82, 65, 78, 128, 72, 85, 79, 84, 128, 72, 85, 78, 68, 82, 69, 68, 83, - 128, 72, 85, 78, 68, 82, 69, 68, 128, 72, 85, 78, 68, 82, 69, 196, 72, - 85, 78, 128, 72, 85, 77, 208, 72, 85, 77, 65, 78, 128, 72, 85, 77, 65, - 206, 72, 85, 76, 50, 128, 72, 85, 73, 73, 84, 79, 128, 72, 85, 71, 71, - 73, 78, 199, 72, 85, 66, 50, 128, 72, 85, 66, 178, 72, 85, 66, 128, 72, - 85, 65, 82, 65, 68, 68, 79, 128, 72, 85, 65, 78, 128, 72, 84, 83, 128, - 72, 84, 74, 128, 72, 82, 89, 86, 78, 73, 193, 72, 80, 87, 71, 128, 72, - 80, 65, 128, 72, 80, 128, 72, 79, 85, 83, 197, 72, 79, 85, 82, 71, 76, - 65, 83, 83, 128, 72, 79, 85, 82, 71, 76, 65, 83, 211, 72, 79, 85, 82, - 128, 72, 79, 85, 210, 72, 79, 84, 69, 76, 128, 72, 79, 84, 65, 128, 72, - 79, 83, 80, 73, 84, 65, 76, 128, 72, 79, 82, 83, 69, 128, 72, 79, 82, 83, - 197, 72, 79, 82, 82, 128, 72, 79, 82, 78, 83, 128, 72, 79, 82, 73, 90, - 79, 78, 84, 65, 76, 76, 217, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, - 48, 54, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, - 54, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, - 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, - 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, - 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 49, - 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 48, 128, - 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 54, 128, 72, - 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 53, 128, 72, 79, - 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 52, 128, 72, 79, 82, - 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 51, 128, 72, 79, 82, 73, - 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 50, 128, 72, 79, 82, 73, 90, - 79, 78, 84, 65, 76, 45, 48, 53, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, - 78, 84, 65, 76, 45, 48, 53, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, - 84, 65, 76, 45, 48, 52, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, - 65, 76, 45, 48, 52, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, - 76, 45, 48, 52, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, - 45, 48, 52, 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, - 48, 52, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, - 52, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, - 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, - 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, - 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 52, - 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 51, 128, - 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 50, 128, 72, - 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 49, 128, 72, 79, - 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 48, 128, 72, 79, 82, - 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, 54, 128, 72, 79, 82, 73, - 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, 53, 128, 72, 79, 82, 73, 90, - 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, - 78, 84, 65, 76, 45, 48, 50, 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, - 84, 65, 76, 45, 48, 50, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, - 65, 76, 45, 48, 50, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, - 76, 45, 48, 50, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, - 45, 48, 49, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, - 48, 49, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, - 49, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, - 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, - 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, - 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 48, - 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 54, 128, - 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 53, 128, 72, - 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 52, 128, 72, 79, - 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 51, 128, 72, 79, 82, - 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 50, 128, 72, 79, 82, 73, - 90, 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 49, 128, 72, 79, 82, 73, 90, - 79, 78, 84, 65, 76, 45, 48, 48, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, - 78, 84, 65, 76, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 204, 72, 79, 82, - 73, 128, 72, 79, 82, 193, 72, 79, 79, 85, 128, 72, 79, 79, 82, 85, 128, - 72, 79, 79, 80, 128, 72, 79, 79, 78, 128, 72, 79, 79, 75, 69, 68, 128, - 72, 79, 79, 75, 69, 196, 72, 79, 78, 69, 89, 66, 69, 69, 128, 72, 79, 78, - 69, 217, 72, 79, 77, 79, 84, 72, 69, 84, 73, 67, 128, 72, 79, 77, 79, 84, - 72, 69, 84, 73, 195, 72, 79, 76, 79, 128, 72, 79, 76, 76, 79, 215, 72, - 79, 76, 69, 128, 72, 79, 76, 68, 73, 78, 199, 72, 79, 76, 65, 77, 128, - 72, 79, 76, 65, 205, 72, 79, 75, 65, 128, 72, 79, 67, 75, 69, 217, 72, - 79, 67, 72, 79, 128, 72, 78, 85, 84, 128, 72, 78, 85, 79, 88, 128, 72, - 78, 85, 79, 128, 72, 78, 85, 66, 128, 72, 78, 79, 88, 128, 72, 78, 79, - 84, 128, 72, 78, 79, 80, 128, 72, 78, 73, 88, 128, 72, 78, 73, 84, 128, - 72, 78, 73, 80, 128, 72, 78, 73, 69, 88, 128, 72, 78, 73, 69, 84, 128, - 72, 78, 73, 69, 80, 128, 72, 78, 73, 69, 128, 72, 78, 73, 128, 72, 78, - 69, 88, 128, 72, 78, 69, 80, 128, 72, 78, 69, 128, 72, 78, 65, 88, 128, - 72, 78, 65, 85, 128, 72, 78, 65, 84, 128, 72, 78, 65, 80, 128, 72, 78, - 65, 128, 72, 77, 89, 88, 128, 72, 77, 89, 82, 88, 128, 72, 77, 89, 82, - 128, 72, 77, 89, 80, 128, 72, 77, 89, 128, 72, 77, 85, 88, 128, 72, 77, - 85, 84, 128, 72, 77, 85, 82, 88, 128, 72, 77, 85, 82, 128, 72, 77, 85, - 80, 128, 72, 77, 85, 79, 88, 128, 72, 77, 85, 79, 80, 128, 72, 77, 85, - 79, 128, 72, 77, 85, 128, 72, 77, 79, 88, 128, 72, 77, 79, 84, 128, 72, - 77, 79, 80, 128, 72, 77, 79, 128, 72, 77, 73, 88, 128, 72, 77, 73, 84, - 128, 72, 77, 73, 80, 128, 72, 77, 73, 69, 88, 128, 72, 77, 73, 69, 80, - 128, 72, 77, 73, 69, 128, 72, 77, 73, 128, 72, 77, 69, 128, 72, 77, 65, - 88, 128, 72, 77, 65, 84, 128, 72, 77, 65, 80, 128, 72, 77, 65, 128, 72, - 76, 89, 88, 128, 72, 76, 89, 84, 128, 72, 76, 89, 82, 88, 128, 72, 76, - 89, 82, 128, 72, 76, 89, 80, 128, 72, 76, 89, 128, 72, 76, 85, 88, 128, - 72, 76, 85, 84, 128, 72, 76, 85, 82, 88, 128, 72, 76, 85, 82, 128, 72, - 76, 85, 80, 128, 72, 76, 85, 79, 88, 128, 72, 76, 85, 79, 80, 128, 72, - 76, 85, 79, 128, 72, 76, 85, 128, 72, 76, 79, 88, 128, 72, 76, 79, 80, - 128, 72, 76, 79, 128, 72, 76, 73, 88, 128, 72, 76, 73, 84, 128, 72, 76, - 73, 80, 128, 72, 76, 73, 69, 88, 128, 72, 76, 73, 69, 80, 128, 72, 76, - 73, 69, 128, 72, 76, 73, 128, 72, 76, 69, 88, 128, 72, 76, 69, 80, 128, - 72, 76, 69, 128, 72, 76, 65, 88, 128, 72, 76, 65, 85, 128, 72, 76, 65, - 84, 128, 72, 76, 65, 80, 128, 72, 76, 65, 128, 72, 76, 128, 72, 75, 128, - 72, 73, 90, 66, 128, 72, 73, 89, 79, 128, 72, 73, 84, 84, 73, 78, 199, - 72, 73, 83, 84, 79, 82, 73, 195, 72, 73, 82, 73, 81, 128, 72, 73, 78, 71, - 69, 68, 128, 72, 73, 78, 71, 69, 196, 72, 73, 78, 71, 69, 128, 72, 73, - 71, 72, 45, 83, 80, 69, 69, 196, 72, 73, 71, 72, 45, 82, 69, 86, 69, 82, - 83, 69, 68, 45, 185, 72, 73, 71, 72, 45, 76, 79, 215, 72, 73, 71, 72, 45, - 72, 69, 69, 76, 69, 196, 72, 73, 69, 88, 128, 72, 73, 69, 85, 72, 45, 83, - 73, 79, 83, 128, 72, 73, 69, 85, 72, 45, 82, 73, 69, 85, 76, 128, 72, 73, - 69, 85, 72, 45, 80, 73, 69, 85, 80, 128, 72, 73, 69, 85, 72, 45, 78, 73, - 69, 85, 78, 128, 72, 73, 69, 85, 72, 45, 77, 73, 69, 85, 77, 128, 72, 73, - 69, 85, 200, 72, 73, 69, 82, 79, 71, 76, 89, 80, 72, 73, 195, 72, 73, 69, - 128, 72, 73, 68, 73, 78, 199, 72, 73, 68, 69, 84, 128, 72, 73, 68, 69, - 128, 72, 73, 66, 73, 83, 67, 85, 83, 128, 72, 72, 87, 65, 128, 72, 72, - 85, 128, 72, 72, 73, 128, 72, 72, 69, 69, 128, 72, 72, 69, 128, 72, 72, - 65, 65, 128, 72, 71, 128, 72, 69, 89, 84, 128, 72, 69, 88, 73, 70, 79, - 82, 205, 72, 69, 88, 65, 71, 82, 65, 205, 72, 69, 88, 65, 71, 79, 78, + 76, 89, 73, 84, 128, 76, 89, 73, 78, 199, 76, 89, 68, 73, 65, 206, 76, + 89, 67, 73, 65, 206, 76, 88, 128, 76, 87, 79, 79, 128, 76, 87, 79, 128, + 76, 87, 73, 73, 128, 76, 87, 73, 128, 76, 87, 69, 128, 76, 87, 65, 65, + 128, 76, 87, 65, 128, 76, 85, 88, 128, 76, 85, 85, 128, 76, 85, 84, 128, + 76, 85, 82, 88, 128, 76, 85, 80, 128, 76, 85, 79, 88, 128, 76, 85, 79, + 84, 128, 76, 85, 79, 80, 128, 76, 85, 79, 128, 76, 85, 78, 71, 83, 73, + 128, 76, 85, 78, 65, 84, 197, 76, 85, 205, 76, 85, 76, 128, 76, 85, 73, + 83, 128, 76, 85, 72, 85, 82, 128, 76, 85, 72, 128, 76, 85, 200, 76, 85, + 71, 71, 65, 71, 69, 128, 76, 85, 71, 65, 76, 128, 76, 85, 71, 65, 204, + 76, 85, 69, 128, 76, 85, 197, 76, 85, 66, 128, 76, 85, 65, 69, 80, 128, + 76, 85, 51, 128, 76, 85, 50, 128, 76, 85, 178, 76, 82, 79, 128, 76, 82, + 77, 128, 76, 82, 73, 128, 76, 82, 69, 128, 76, 79, 90, 69, 78, 71, 69, + 128, 76, 79, 90, 69, 78, 71, 197, 76, 79, 88, 128, 76, 79, 87, 69, 82, + 69, 196, 76, 79, 87, 69, 210, 76, 79, 87, 45, 82, 69, 86, 69, 82, 83, 69, + 68, 45, 185, 76, 79, 87, 45, 77, 73, 196, 76, 79, 87, 45, 70, 65, 76, 76, + 73, 78, 199, 76, 79, 87, 45, 185, 76, 79, 86, 197, 76, 79, 85, 82, 69, + 128, 76, 79, 85, 68, 83, 80, 69, 65, 75, 69, 82, 128, 76, 79, 85, 68, 76, + 217, 76, 79, 84, 85, 83, 128, 76, 79, 84, 128, 76, 79, 83, 83, 76, 69, + 83, 83, 128, 76, 79, 82, 82, 89, 128, 76, 79, 82, 82, 65, 73, 78, 69, + 128, 76, 79, 81, 128, 76, 79, 80, 128, 76, 79, 79, 84, 128, 76, 79, 79, + 80, 69, 196, 76, 79, 79, 80, 128, 76, 79, 79, 208, 76, 79, 79, 78, 128, + 76, 79, 79, 203, 76, 79, 79, 128, 76, 79, 78, 83, 85, 77, 128, 76, 79, + 78, 71, 65, 128, 76, 79, 78, 71, 193, 76, 79, 78, 71, 45, 76, 69, 71, 71, + 69, 196, 76, 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, 45, 89, 82, 128, 76, + 79, 78, 71, 45, 66, 82, 65, 78, 67, 72, 45, 83, 79, 204, 76, 79, 78, 71, + 45, 66, 82, 65, 78, 67, 72, 45, 79, 83, 211, 76, 79, 78, 71, 45, 66, 82, + 65, 78, 67, 72, 45, 77, 65, 68, 210, 76, 79, 78, 71, 45, 66, 82, 65, 78, + 67, 72, 45, 72, 65, 71, 65, 76, 204, 76, 79, 78, 71, 45, 66, 82, 65, 78, + 67, 72, 45, 65, 210, 76, 79, 77, 77, 65, 69, 128, 76, 79, 77, 128, 76, + 79, 205, 76, 79, 76, 76, 73, 80, 79, 80, 128, 76, 79, 76, 76, 128, 76, + 79, 71, 210, 76, 79, 71, 79, 84, 89, 80, 197, 76, 79, 71, 79, 71, 82, 65, + 205, 76, 79, 71, 128, 76, 79, 68, 69, 83, 84, 79, 78, 69, 128, 76, 79, + 67, 79, 77, 79, 84, 73, 86, 69, 128, 76, 79, 67, 75, 73, 78, 71, 45, 83, + 72, 73, 70, 212, 76, 79, 67, 203, 76, 79, 67, 65, 84, 73, 86, 69, 128, + 76, 79, 67, 65, 84, 73, 79, 78, 45, 87, 65, 76, 76, 80, 76, 65, 78, 197, + 76, 79, 67, 65, 84, 73, 79, 78, 45, 70, 76, 79, 79, 82, 80, 76, 65, 78, + 197, 76, 79, 67, 65, 84, 73, 79, 206, 76, 79, 65, 128, 76, 78, 128, 76, + 76, 85, 85, 128, 76, 76, 79, 79, 128, 76, 76, 76, 85, 85, 128, 76, 76, + 76, 85, 128, 76, 76, 76, 79, 79, 128, 76, 76, 76, 79, 128, 76, 76, 76, + 73, 73, 128, 76, 76, 76, 73, 128, 76, 76, 76, 69, 69, 128, 76, 76, 76, + 69, 128, 76, 76, 76, 65, 85, 128, 76, 76, 76, 65, 73, 128, 76, 76, 76, + 65, 65, 128, 76, 76, 76, 65, 128, 76, 76, 76, 128, 76, 74, 85, 68, 73, + 74, 69, 128, 76, 74, 69, 128, 76, 74, 128, 76, 73, 90, 65, 82, 68, 128, + 76, 73, 88, 128, 76, 73, 87, 78, 128, 76, 73, 86, 82, 197, 76, 73, 84, + 84, 76, 69, 128, 76, 73, 84, 84, 76, 197, 76, 73, 84, 84, 69, 210, 76, + 73, 84, 82, 193, 76, 73, 84, 200, 76, 73, 83, 213, 76, 73, 83, 128, 76, + 73, 82, 193, 76, 73, 81, 85, 73, 196, 76, 73, 81, 128, 76, 73, 80, 83, + 84, 73, 67, 75, 128, 76, 73, 80, 211, 76, 73, 208, 76, 73, 78, 75, 73, + 78, 199, 76, 73, 78, 75, 69, 196, 76, 73, 78, 203, 76, 73, 78, 71, 83, + 65, 128, 76, 73, 78, 69, 83, 128, 76, 73, 78, 69, 211, 76, 73, 78, 69, + 45, 57, 128, 76, 73, 78, 69, 45, 55, 128, 76, 73, 78, 69, 45, 51, 128, + 76, 73, 78, 69, 45, 49, 128, 76, 73, 77, 77, 85, 52, 128, 76, 73, 77, 77, + 85, 50, 128, 76, 73, 77, 77, 85, 128, 76, 73, 77, 77, 213, 76, 73, 77, + 73, 84, 69, 196, 76, 73, 77, 73, 84, 65, 84, 73, 79, 78, 128, 76, 73, 77, + 73, 84, 128, 76, 73, 77, 69, 128, 76, 73, 77, 66, 213, 76, 73, 77, 66, + 211, 76, 73, 77, 194, 76, 73, 76, 89, 128, 76, 73, 76, 73, 84, 72, 128, + 76, 73, 76, 128, 76, 73, 71, 72, 84, 78, 73, 78, 71, 128, 76, 73, 71, 72, + 84, 78, 73, 78, 199, 76, 73, 71, 72, 84, 72, 79, 85, 83, 69, 128, 76, 73, + 71, 72, 84, 128, 76, 73, 71, 65, 84, 73, 78, 199, 76, 73, 70, 84, 69, 82, + 128, 76, 73, 70, 69, 128, 76, 73, 69, 88, 128, 76, 73, 69, 84, 128, 76, + 73, 69, 80, 128, 76, 73, 69, 69, 128, 76, 73, 69, 128, 76, 73, 68, 128, + 76, 73, 67, 75, 73, 78, 199, 76, 73, 66, 82, 65, 128, 76, 73, 66, 69, 82, + 84, 89, 128, 76, 73, 65, 66, 73, 76, 73, 84, 217, 76, 72, 73, 73, 128, + 76, 72, 65, 86, 73, 89, 65, 78, 73, 128, 76, 72, 65, 199, 76, 72, 65, 65, + 128, 76, 72, 128, 76, 69, 90, 72, 128, 76, 69, 88, 128, 76, 69, 86, 73, + 84, 65, 84, 73, 78, 71, 128, 76, 69, 85, 77, 128, 76, 69, 85, 65, 69, 80, + 128, 76, 69, 85, 65, 69, 77, 128, 76, 69, 85, 128, 76, 69, 213, 76, 69, + 84, 84, 69, 82, 83, 128, 76, 69, 84, 84, 69, 82, 128, 76, 69, 212, 76, + 69, 83, 83, 69, 210, 76, 69, 83, 83, 45, 84, 72, 65, 78, 128, 76, 69, 83, + 83, 45, 84, 72, 65, 206, 76, 69, 80, 67, 72, 193, 76, 69, 80, 128, 76, + 69, 79, 80, 65, 82, 68, 128, 76, 69, 79, 128, 76, 69, 78, 84, 73, 67, 85, + 76, 65, 210, 76, 69, 78, 73, 83, 128, 76, 69, 78, 73, 211, 76, 69, 78, + 71, 84, 72, 69, 78, 69, 82, 128, 76, 69, 78, 71, 84, 72, 45, 55, 128, 76, + 69, 78, 71, 84, 72, 45, 54, 128, 76, 69, 78, 71, 84, 72, 45, 53, 128, 76, + 69, 78, 71, 84, 72, 45, 52, 128, 76, 69, 78, 71, 84, 72, 45, 51, 128, 76, + 69, 78, 71, 84, 72, 45, 50, 128, 76, 69, 78, 71, 84, 72, 45, 49, 128, 76, + 69, 78, 71, 84, 200, 76, 69, 78, 71, 65, 128, 76, 69, 78, 71, 193, 76, + 69, 77, 79, 78, 128, 76, 69, 77, 79, 73, 128, 76, 69, 76, 69, 84, 128, + 76, 69, 76, 69, 212, 76, 69, 203, 76, 69, 73, 77, 77, 65, 128, 76, 69, + 73, 77, 77, 193, 76, 69, 73, 128, 76, 69, 71, 83, 128, 76, 69, 71, 73, + 79, 78, 128, 76, 69, 71, 69, 84, 79, 211, 76, 69, 71, 128, 76, 69, 199, + 76, 69, 70, 84, 87, 65, 82, 68, 83, 128, 76, 69, 70, 84, 45, 84, 79, 45, + 82, 73, 71, 72, 212, 76, 69, 70, 84, 45, 83, 84, 69, 205, 76, 69, 70, 84, + 45, 83, 73, 68, 197, 76, 69, 70, 84, 45, 83, 72, 65, 68, 69, 196, 76, 69, + 70, 84, 45, 80, 79, 73, 78, 84, 73, 78, 199, 76, 69, 70, 84, 45, 76, 73, + 71, 72, 84, 69, 196, 76, 69, 70, 84, 45, 72, 65, 78, 68, 69, 196, 76, 69, + 70, 84, 45, 72, 65, 78, 196, 76, 69, 70, 84, 45, 70, 65, 67, 73, 78, 199, + 76, 69, 70, 84, 128, 76, 69, 69, 82, 65, 69, 87, 65, 128, 76, 69, 69, 75, + 128, 76, 69, 69, 69, 69, 128, 76, 69, 68, 71, 69, 82, 128, 76, 69, 65, + 84, 72, 69, 82, 128, 76, 69, 65, 70, 128, 76, 69, 65, 198, 76, 69, 65, + 68, 73, 78, 199, 76, 69, 65, 68, 69, 82, 128, 76, 69, 65, 196, 76, 68, + 65, 78, 128, 76, 68, 50, 128, 76, 67, 201, 76, 67, 197, 76, 65, 90, 217, + 76, 65, 89, 65, 78, 78, 65, 128, 76, 65, 88, 128, 76, 65, 87, 128, 76, + 65, 215, 76, 65, 85, 76, 65, 128, 76, 65, 85, 75, 65, 218, 76, 65, 85, + 74, 128, 76, 65, 85, 71, 72, 73, 78, 71, 128, 76, 65, 84, 73, 78, 65, 84, + 197, 76, 65, 84, 73, 75, 128, 76, 65, 84, 69, 82, 65, 204, 76, 65, 84, + 197, 76, 65, 83, 212, 76, 65, 82, 89, 78, 71, 69, 65, 204, 76, 65, 82, + 201, 76, 65, 82, 71, 69, 83, 84, 128, 76, 65, 82, 71, 69, 210, 76, 65, + 82, 71, 69, 128, 76, 65, 82, 71, 197, 76, 65, 81, 128, 76, 65, 80, 65, + 81, 128, 76, 65, 207, 76, 65, 78, 84, 69, 82, 78, 128, 76, 65, 78, 71, + 85, 65, 71, 197, 76, 65, 78, 69, 83, 128, 76, 65, 78, 128, 76, 65, 77, + 80, 128, 76, 65, 77, 69, 68, 72, 128, 76, 65, 77, 69, 68, 128, 76, 65, + 77, 69, 196, 76, 65, 77, 69, 128, 76, 65, 77, 197, 76, 65, 77, 68, 65, + 128, 76, 65, 77, 68, 128, 76, 65, 77, 66, 68, 193, 76, 65, 77, 65, 68, + 72, 128, 76, 65, 76, 128, 76, 65, 204, 76, 65, 75, 75, 72, 65, 78, 71, + 89, 65, 79, 128, 76, 65, 75, 45, 55, 52, 57, 128, 76, 65, 75, 45, 55, 50, + 52, 128, 76, 65, 75, 45, 54, 54, 56, 128, 76, 65, 75, 45, 54, 52, 56, + 128, 76, 65, 75, 45, 54, 52, 184, 76, 65, 75, 45, 54, 51, 54, 128, 76, + 65, 75, 45, 54, 49, 55, 128, 76, 65, 75, 45, 54, 49, 183, 76, 65, 75, 45, + 54, 48, 56, 128, 76, 65, 75, 45, 53, 53, 48, 128, 76, 65, 75, 45, 52, 57, + 53, 128, 76, 65, 75, 45, 52, 57, 51, 128, 76, 65, 75, 45, 52, 57, 50, + 128, 76, 65, 75, 45, 52, 57, 48, 128, 76, 65, 75, 45, 52, 56, 51, 128, + 76, 65, 75, 45, 52, 55, 48, 128, 76, 65, 75, 45, 52, 53, 55, 128, 76, 65, + 75, 45, 52, 53, 48, 128, 76, 65, 75, 45, 52, 52, 57, 128, 76, 65, 75, 45, + 52, 52, 185, 76, 65, 75, 45, 52, 52, 49, 128, 76, 65, 75, 45, 51, 57, 48, + 128, 76, 65, 75, 45, 51, 56, 52, 128, 76, 65, 75, 45, 51, 56, 51, 128, + 76, 65, 75, 45, 51, 52, 56, 128, 76, 65, 75, 45, 51, 52, 55, 128, 76, 65, + 75, 45, 51, 52, 51, 128, 76, 65, 75, 45, 50, 54, 54, 128, 76, 65, 75, 45, + 50, 54, 53, 128, 76, 65, 75, 45, 50, 51, 56, 128, 76, 65, 75, 45, 50, 50, + 56, 128, 76, 65, 75, 45, 50, 50, 53, 128, 76, 65, 75, 45, 50, 50, 48, + 128, 76, 65, 75, 45, 50, 49, 57, 128, 76, 65, 75, 45, 50, 49, 48, 128, + 76, 65, 75, 45, 49, 52, 50, 128, 76, 65, 75, 45, 49, 51, 48, 128, 76, 65, + 75, 45, 48, 57, 50, 128, 76, 65, 75, 45, 48, 56, 49, 128, 76, 65, 75, 45, + 48, 56, 177, 76, 65, 75, 45, 48, 56, 48, 128, 76, 65, 75, 45, 48, 55, + 185, 76, 65, 75, 45, 48, 54, 50, 128, 76, 65, 75, 45, 48, 53, 49, 128, + 76, 65, 75, 45, 48, 53, 48, 128, 76, 65, 75, 45, 48, 51, 48, 128, 76, 65, + 75, 45, 48, 50, 53, 128, 76, 65, 75, 45, 48, 50, 49, 128, 76, 65, 75, 45, + 48, 50, 48, 128, 76, 65, 75, 45, 48, 48, 51, 128, 76, 65, 74, 65, 78, 89, + 65, 76, 65, 78, 128, 76, 65, 73, 78, 199, 76, 65, 201, 76, 65, 72, 83, + 72, 85, 128, 76, 65, 72, 128, 76, 65, 71, 85, 83, 128, 76, 65, 71, 213, + 76, 65, 71, 65, 82, 128, 76, 65, 71, 65, 210, 76, 65, 71, 65, 66, 128, + 76, 65, 71, 65, 194, 76, 65, 69, 86, 128, 76, 65, 69, 128, 76, 65, 68, + 217, 76, 65, 67, 75, 128, 76, 65, 67, 65, 128, 76, 65, 66, 79, 85, 82, + 73, 78, 71, 128, 76, 65, 66, 79, 82, 128, 76, 65, 66, 73, 65, 76, 73, 90, + 65, 84, 73, 79, 206, 76, 65, 66, 73, 65, 204, 76, 65, 66, 69, 76, 128, + 76, 65, 66, 65, 84, 128, 76, 65, 65, 78, 65, 69, 128, 76, 65, 65, 78, + 128, 76, 65, 65, 77, 85, 128, 76, 65, 65, 77, 128, 76, 65, 65, 73, 128, + 76, 54, 128, 76, 52, 128, 76, 51, 128, 76, 50, 128, 76, 48, 48, 54, 65, + 128, 76, 48, 48, 50, 65, 128, 76, 45, 84, 89, 80, 197, 76, 45, 83, 72, + 65, 80, 69, 196, 75, 89, 85, 82, 73, 73, 128, 75, 89, 85, 128, 75, 89, + 79, 128, 75, 89, 76, 73, 83, 77, 65, 128, 75, 89, 73, 128, 75, 89, 69, + 128, 75, 89, 65, 84, 72, 79, 211, 75, 89, 65, 65, 128, 75, 89, 65, 128, + 75, 88, 87, 73, 128, 75, 88, 87, 69, 69, 128, 75, 88, 87, 69, 128, 75, + 88, 87, 65, 65, 128, 75, 88, 87, 65, 128, 75, 88, 85, 128, 75, 88, 79, + 128, 75, 88, 73, 128, 75, 88, 69, 69, 128, 75, 88, 69, 128, 75, 88, 65, + 65, 128, 75, 88, 65, 128, 75, 87, 86, 128, 75, 87, 85, 51, 49, 56, 128, + 75, 87, 79, 79, 128, 75, 87, 79, 128, 75, 87, 77, 128, 75, 87, 73, 73, + 128, 75, 87, 73, 128, 75, 87, 69, 69, 128, 75, 87, 69, 128, 75, 87, 66, + 128, 75, 87, 65, 89, 128, 75, 87, 65, 69, 84, 128, 75, 87, 65, 65, 128, + 75, 86, 65, 128, 75, 86, 128, 75, 85, 88, 128, 75, 85, 86, 128, 75, 85, + 85, 72, 128, 75, 85, 84, 128, 75, 85, 83, 77, 65, 128, 75, 85, 83, 72, + 85, 50, 128, 75, 85, 83, 72, 85, 178, 75, 85, 82, 88, 128, 75, 85, 82, + 85, 90, 69, 73, 82, 79, 128, 75, 85, 82, 84, 128, 75, 85, 82, 79, 79, 78, + 69, 128, 75, 85, 82, 128, 75, 85, 210, 75, 85, 81, 128, 75, 85, 79, 88, + 128, 75, 85, 79, 80, 128, 75, 85, 79, 208, 75, 85, 79, 77, 128, 75, 85, + 79, 128, 75, 85, 78, 71, 128, 75, 85, 78, 68, 68, 65, 76, 73, 89, 65, + 128, 75, 85, 76, 128, 75, 85, 204, 75, 85, 71, 128, 75, 85, 69, 84, 128, + 75, 85, 66, 128, 75, 85, 65, 86, 128, 75, 85, 65, 66, 128, 75, 85, 65, + 128, 75, 85, 55, 128, 75, 85, 52, 128, 75, 85, 180, 75, 85, 51, 128, 75, + 85, 179, 75, 84, 128, 75, 83, 83, 85, 85, 128, 75, 83, 83, 85, 128, 75, + 83, 83, 79, 79, 128, 75, 83, 83, 79, 128, 75, 83, 83, 73, 73, 128, 75, + 83, 83, 73, 128, 75, 83, 83, 69, 69, 128, 75, 83, 83, 69, 128, 75, 83, + 83, 65, 85, 128, 75, 83, 83, 65, 73, 128, 75, 83, 83, 65, 65, 128, 75, + 83, 83, 65, 128, 75, 83, 83, 128, 75, 83, 73, 128, 75, 82, 69, 77, 65, + 83, 84, 73, 128, 75, 82, 65, 84, 73, 77, 79, 89, 80, 79, 82, 82, 79, 79, + 78, 128, 75, 82, 65, 84, 73, 77, 79, 75, 79, 85, 70, 73, 83, 77, 65, 128, + 75, 82, 65, 84, 73, 77, 65, 84, 65, 128, 75, 82, 65, 84, 73, 77, 193, 75, + 80, 85, 128, 75, 80, 79, 81, 128, 75, 80, 79, 79, 128, 75, 80, 79, 128, + 75, 80, 73, 128, 75, 80, 69, 85, 88, 128, 75, 80, 69, 69, 128, 75, 80, + 69, 128, 75, 80, 65, 82, 65, 81, 128, 75, 80, 65, 78, 128, 75, 80, 65, + 72, 128, 75, 80, 65, 128, 75, 79, 88, 128, 75, 79, 86, 85, 85, 128, 75, + 79, 86, 128, 75, 79, 84, 79, 128, 75, 79, 82, 85, 78, 65, 128, 75, 79, + 82, 79, 78, 73, 83, 128, 75, 79, 82, 69, 65, 206, 75, 79, 82, 65, 78, 73, + 195, 75, 79, 81, 78, 68, 79, 78, 128, 75, 79, 80, 80, 65, 128, 75, 79, + 80, 128, 75, 79, 79, 86, 128, 75, 79, 79, 80, 79, 128, 75, 79, 79, 77, + 85, 85, 84, 128, 75, 79, 79, 66, 128, 75, 79, 79, 128, 75, 79, 78, 84, + 69, 86, 77, 65, 128, 75, 79, 78, 84, 69, 86, 77, 193, 75, 79, 77, 201, + 75, 79, 77, 66, 85, 86, 65, 128, 75, 79, 77, 66, 85, 86, 193, 75, 79, 77, + 66, 213, 75, 79, 75, 79, 128, 75, 79, 75, 69, 128, 75, 79, 75, 128, 75, + 79, 203, 75, 79, 73, 128, 75, 79, 201, 75, 79, 72, 128, 75, 79, 71, 72, + 79, 77, 128, 75, 79, 69, 84, 128, 75, 79, 66, 128, 75, 79, 65, 76, 65, + 128, 75, 79, 65, 128, 75, 78, 85, 67, 75, 76, 69, 83, 128, 75, 78, 85, + 67, 75, 76, 69, 128, 75, 78, 79, 66, 83, 128, 75, 78, 73, 71, 72, 84, + 128, 75, 78, 73, 71, 72, 212, 75, 78, 73, 70, 69, 128, 75, 78, 73, 70, + 197, 75, 77, 128, 75, 205, 75, 76, 73, 84, 79, 78, 128, 75, 76, 65, 83, + 77, 65, 128, 75, 76, 65, 83, 77, 193, 75, 76, 65, 128, 75, 76, 128, 75, + 75, 85, 128, 75, 75, 79, 128, 75, 75, 73, 128, 75, 75, 69, 69, 128, 75, + 75, 69, 128, 75, 75, 65, 128, 75, 75, 128, 75, 74, 69, 128, 75, 73, 89, + 69, 79, 75, 45, 84, 73, 75, 69, 85, 84, 128, 75, 73, 89, 69, 79, 75, 45, + 83, 73, 79, 83, 45, 75, 73, 89, 69, 79, 75, 128, 75, 73, 89, 69, 79, 75, + 45, 82, 73, 69, 85, 76, 128, 75, 73, 89, 69, 79, 75, 45, 80, 73, 69, 85, + 80, 128, 75, 73, 89, 69, 79, 75, 45, 78, 73, 69, 85, 78, 128, 75, 73, 89, + 69, 79, 75, 45, 75, 72, 73, 69, 85, 75, 72, 128, 75, 73, 89, 69, 79, 75, + 45, 67, 72, 73, 69, 85, 67, 72, 128, 75, 73, 89, 69, 79, 203, 75, 73, 88, + 128, 75, 73, 87, 73, 70, 82, 85, 73, 84, 128, 75, 73, 87, 128, 75, 73, + 86, 128, 75, 73, 84, 128, 75, 73, 83, 83, 73, 78, 199, 75, 73, 83, 83, + 128, 75, 73, 83, 211, 75, 73, 83, 73, 77, 53, 128, 75, 73, 83, 73, 77, + 181, 75, 73, 83, 72, 128, 75, 73, 83, 65, 76, 128, 75, 73, 82, 79, 87, + 65, 84, 84, 79, 128, 75, 73, 82, 79, 77, 69, 69, 84, 79, 82, 85, 128, 75, + 73, 82, 79, 71, 85, 82, 65, 77, 85, 128, 75, 73, 82, 79, 128, 75, 73, 82, + 71, 72, 73, 218, 75, 73, 81, 128, 75, 73, 80, 128, 75, 73, 208, 75, 73, + 78, 83, 72, 73, 80, 128, 75, 73, 78, 68, 69, 82, 71, 65, 82, 84, 69, 78, + 128, 75, 73, 77, 79, 78, 79, 128, 75, 73, 76, 76, 69, 82, 128, 75, 73, + 73, 128, 75, 73, 72, 128, 75, 73, 69, 88, 128, 75, 73, 69, 86, 65, 206, + 75, 73, 69, 80, 128, 75, 73, 69, 69, 77, 128, 75, 73, 69, 128, 75, 73, + 68, 128, 75, 73, 196, 75, 73, 67, 75, 128, 75, 73, 66, 128, 75, 73, 65, + 86, 128, 75, 73, 65, 66, 128, 75, 72, 90, 128, 75, 72, 87, 65, 73, 128, + 75, 72, 85, 69, 78, 45, 76, 85, 197, 75, 72, 85, 69, 206, 75, 72, 85, 68, + 65, 87, 65, 68, 201, 75, 72, 85, 68, 65, 77, 128, 75, 72, 85, 65, 84, + 128, 75, 72, 79, 85, 128, 75, 72, 79, 212, 75, 72, 79, 78, 128, 75, 72, + 79, 77, 85, 84, 128, 75, 72, 79, 74, 75, 201, 75, 72, 79, 128, 75, 72, + 207, 75, 72, 77, 213, 75, 72, 73, 84, 128, 75, 72, 73, 78, 89, 65, 128, + 75, 72, 73, 69, 85, 75, 200, 75, 72, 73, 128, 75, 72, 201, 75, 72, 72, + 79, 128, 75, 72, 72, 65, 128, 75, 72, 69, 84, 72, 128, 75, 72, 69, 73, + 128, 75, 72, 69, 69, 128, 75, 72, 69, 128, 75, 72, 65, 86, 128, 75, 72, + 65, 82, 79, 83, 72, 84, 72, 201, 75, 72, 65, 82, 128, 75, 72, 65, 80, 72, + 128, 75, 72, 65, 78, 199, 75, 72, 65, 78, 68, 193, 75, 72, 65, 78, 128, + 75, 72, 65, 77, 84, 201, 75, 72, 65, 75, 65, 83, 83, 73, 65, 206, 75, 72, + 65, 73, 128, 75, 72, 65, 72, 128, 75, 72, 65, 200, 75, 72, 65, 66, 128, + 75, 72, 65, 65, 128, 75, 71, 128, 75, 69, 89, 67, 65, 80, 128, 75, 69, + 89, 67, 65, 208, 75, 69, 89, 66, 79, 65, 82, 68, 128, 75, 69, 89, 66, 79, + 65, 82, 196, 75, 69, 88, 128, 75, 69, 86, 128, 75, 69, 85, 89, 69, 85, + 88, 128, 75, 69, 85, 83, 72, 69, 85, 65, 69, 80, 128, 75, 69, 85, 83, 69, + 85, 88, 128, 75, 69, 85, 80, 85, 81, 128, 75, 69, 85, 79, 212, 75, 69, + 85, 77, 128, 75, 69, 85, 75, 69, 85, 84, 78, 68, 65, 128, 75, 69, 85, 75, + 65, 81, 128, 75, 69, 85, 65, 69, 84, 77, 69, 85, 78, 128, 75, 69, 85, 65, + 69, 82, 73, 128, 75, 69, 84, 84, 201, 75, 69, 83, 72, 50, 128, 75, 69, + 82, 69, 84, 128, 75, 69, 79, 87, 128, 75, 69, 78, 84, 73, 77, 65, 84, 65, + 128, 75, 69, 78, 84, 73, 77, 65, 84, 193, 75, 69, 78, 84, 73, 77, 193, + 75, 69, 78, 65, 84, 128, 75, 69, 78, 128, 75, 69, 206, 75, 69, 77, 80, + 85, 76, 128, 75, 69, 77, 80, 85, 204, 75, 69, 77, 80, 76, 73, 128, 75, + 69, 77, 80, 76, 201, 75, 69, 77, 80, 72, 82, 69, 78, 71, 128, 75, 69, 77, + 66, 65, 78, 71, 128, 75, 69, 76, 86, 73, 206, 75, 69, 72, 69, 72, 128, + 75, 69, 72, 69, 200, 75, 69, 72, 128, 75, 69, 70, 85, 76, 65, 128, 75, + 69, 69, 86, 128, 75, 69, 69, 83, 85, 128, 75, 69, 69, 80, 73, 78, 199, + 75, 69, 69, 78, 71, 128, 75, 69, 69, 66, 128, 75, 69, 66, 128, 75, 69, + 65, 65, 69, 128, 75, 67, 65, 76, 128, 75, 66, 128, 75, 65, 90, 65, 75, + 200, 75, 65, 89, 65, 78, 78, 65, 128, 75, 65, 89, 65, 200, 75, 65, 88, + 128, 75, 65, 87, 86, 128, 75, 65, 87, 73, 128, 75, 65, 87, 66, 128, 75, + 65, 86, 89, 75, 65, 128, 75, 65, 86, 128, 75, 65, 85, 86, 128, 75, 65, + 85, 78, 65, 128, 75, 65, 85, 206, 75, 65, 85, 66, 128, 75, 65, 84, 79, + 128, 75, 65, 84, 72, 73, 83, 84, 73, 128, 75, 65, 84, 72, 65, 75, 193, + 75, 65, 84, 65, 86, 65, 83, 77, 65, 128, 75, 65, 84, 65, 86, 193, 75, 65, + 84, 65, 75, 65, 78, 65, 45, 72, 73, 82, 65, 71, 65, 78, 193, 75, 65, 83, + 82, 65, 84, 65, 78, 128, 75, 65, 83, 82, 65, 84, 65, 206, 75, 65, 83, 82, + 65, 128, 75, 65, 83, 82, 193, 75, 65, 83, 75, 65, 76, 128, 75, 65, 83, + 75, 65, 204, 75, 65, 83, 72, 77, 73, 82, 201, 75, 65, 82, 83, 72, 65, 78, + 65, 128, 75, 65, 82, 79, 82, 73, 73, 128, 75, 65, 82, 207, 75, 65, 82, + 69, 206, 75, 65, 82, 65, 84, 84, 79, 128, 75, 65, 82, 65, 78, 128, 75, + 65, 80, 89, 69, 79, 85, 78, 83, 83, 65, 78, 71, 80, 73, 69, 85, 80, 128, + 75, 65, 80, 89, 69, 79, 85, 78, 82, 73, 69, 85, 76, 128, 75, 65, 80, 89, + 69, 79, 85, 78, 80, 72, 73, 69, 85, 80, 72, 128, 75, 65, 80, 89, 69, 79, + 85, 78, 77, 73, 69, 85, 77, 128, 75, 65, 80, 80, 65, 128, 75, 65, 80, 80, + 193, 75, 65, 80, 79, 128, 75, 65, 80, 72, 128, 75, 65, 80, 65, 76, 128, + 75, 65, 80, 65, 128, 75, 65, 208, 75, 65, 78, 84, 65, 74, 193, 75, 65, + 78, 78, 65, 68, 193, 75, 65, 78, 71, 128, 75, 65, 78, 199, 75, 65, 78, + 65, 75, 79, 128, 75, 65, 77, 52, 128, 75, 65, 77, 50, 128, 75, 65, 77, + 128, 75, 65, 75, 79, 128, 75, 65, 75, 65, 66, 65, 84, 128, 75, 65, 75, + 128, 75, 65, 203, 75, 65, 73, 86, 128, 75, 65, 73, 84, 72, 201, 75, 65, + 73, 82, 73, 128, 75, 65, 73, 66, 128, 75, 65, 73, 128, 75, 65, 201, 75, + 65, 70, 65, 128, 75, 65, 70, 128, 75, 65, 198, 75, 65, 68, 53, 128, 75, + 65, 68, 181, 75, 65, 68, 52, 128, 75, 65, 68, 51, 128, 75, 65, 68, 179, + 75, 65, 68, 50, 128, 75, 65, 68, 128, 75, 65, 66, 193, 75, 65, 66, 128, + 75, 65, 65, 86, 128, 75, 65, 65, 73, 128, 75, 65, 65, 70, 85, 128, 75, + 65, 65, 70, 128, 75, 65, 65, 66, 65, 128, 75, 65, 65, 66, 128, 75, 65, + 50, 128, 75, 65, 178, 75, 48, 48, 56, 128, 75, 48, 48, 55, 128, 75, 48, + 48, 54, 128, 75, 48, 48, 53, 128, 75, 48, 48, 52, 128, 75, 48, 48, 51, + 128, 75, 48, 48, 50, 128, 75, 48, 48, 49, 128, 74, 87, 65, 128, 74, 85, + 85, 128, 74, 85, 84, 128, 74, 85, 83, 84, 73, 70, 73, 67, 65, 84, 73, 79, + 78, 128, 74, 85, 80, 73, 84, 69, 82, 128, 74, 85, 79, 84, 128, 74, 85, + 79, 80, 128, 74, 85, 78, 79, 128, 74, 85, 78, 69, 128, 74, 85, 76, 89, + 128, 74, 85, 71, 71, 76, 73, 78, 71, 128, 74, 85, 69, 85, 73, 128, 74, + 85, 68, 85, 76, 128, 74, 85, 68, 71, 69, 128, 74, 85, 68, 69, 79, 45, 83, + 80, 65, 78, 73, 83, 200, 74, 79, 89, 83, 84, 73, 67, 75, 128, 74, 79, 89, + 79, 85, 211, 74, 79, 89, 128, 74, 79, 86, 69, 128, 74, 79, 212, 74, 79, + 78, 71, 128, 74, 79, 78, 193, 74, 79, 75, 69, 82, 128, 74, 79, 73, 78, + 84, 83, 128, 74, 79, 73, 78, 69, 68, 128, 74, 79, 73, 78, 128, 74, 79, + 65, 128, 74, 74, 89, 88, 128, 74, 74, 89, 84, 128, 74, 74, 89, 80, 128, + 74, 74, 89, 128, 74, 74, 85, 88, 128, 74, 74, 85, 84, 128, 74, 74, 85, + 82, 88, 128, 74, 74, 85, 82, 128, 74, 74, 85, 80, 128, 74, 74, 85, 79, + 88, 128, 74, 74, 85, 79, 80, 128, 74, 74, 85, 79, 128, 74, 74, 85, 128, + 74, 74, 79, 88, 128, 74, 74, 79, 84, 128, 74, 74, 79, 80, 128, 74, 74, + 79, 128, 74, 74, 73, 88, 128, 74, 74, 73, 84, 128, 74, 74, 73, 80, 128, + 74, 74, 73, 69, 88, 128, 74, 74, 73, 69, 84, 128, 74, 74, 73, 69, 80, + 128, 74, 74, 73, 69, 128, 74, 74, 73, 128, 74, 74, 69, 69, 128, 74, 74, + 69, 128, 74, 74, 65, 128, 74, 73, 76, 128, 74, 73, 73, 77, 128, 74, 73, + 73, 128, 74, 73, 72, 86, 65, 77, 85, 76, 73, 89, 65, 128, 74, 73, 65, + 128, 74, 72, 79, 88, 128, 74, 72, 79, 128, 74, 72, 69, 72, 128, 74, 72, + 65, 89, 73, 78, 128, 74, 72, 65, 78, 128, 74, 72, 65, 77, 128, 74, 72, + 65, 65, 128, 74, 72, 65, 128, 74, 69, 85, 128, 74, 69, 82, 85, 83, 65, + 76, 69, 77, 128, 74, 69, 82, 65, 206, 74, 69, 82, 65, 128, 74, 69, 82, + 128, 74, 69, 72, 128, 74, 69, 200, 74, 69, 71, 79, 71, 65, 78, 128, 74, + 69, 69, 77, 128, 74, 69, 65, 78, 83, 128, 74, 65, 89, 78, 128, 74, 65, + 89, 73, 78, 128, 74, 65, 89, 65, 78, 78, 65, 128, 74, 65, 87, 128, 74, + 65, 86, 73, 89, 65, 78, 73, 128, 74, 65, 86, 65, 78, 69, 83, 197, 74, 65, + 85, 128, 74, 65, 82, 128, 74, 65, 80, 65, 78, 69, 83, 197, 74, 65, 80, + 65, 78, 128, 74, 65, 78, 85, 65, 82, 89, 128, 74, 65, 76, 76, 65, 74, 65, + 76, 65, 76, 79, 85, 72, 79, 85, 128, 74, 65, 73, 206, 74, 65, 73, 128, + 74, 65, 72, 128, 74, 65, 68, 69, 128, 74, 65, 67, 75, 83, 128, 74, 65, + 67, 75, 45, 79, 45, 76, 65, 78, 84, 69, 82, 78, 128, 74, 65, 67, 203, 74, + 45, 83, 73, 77, 80, 76, 73, 70, 73, 69, 196, 73, 90, 72, 73, 84, 83, 65, + 128, 73, 90, 72, 73, 84, 83, 193, 73, 90, 72, 69, 128, 73, 90, 65, 75, + 65, 89, 193, 73, 89, 69, 75, 128, 73, 89, 65, 78, 78, 65, 128, 73, 85, + 74, 65, 128, 73, 84, 211, 73, 84, 69, 82, 65, 84, 73, 79, 206, 73, 84, + 69, 77, 128, 73, 83, 83, 72, 65, 82, 128, 73, 83, 79, 83, 67, 69, 76, 69, + 211, 73, 83, 79, 78, 128, 73, 83, 79, 206, 73, 83, 79, 76, 65, 84, 69, + 128, 73, 83, 76, 65, 78, 68, 128, 73, 83, 69, 78, 45, 73, 83, 69, 78, + 128, 73, 83, 65, 75, 73, 193, 73, 83, 45, 80, 73, 76, 76, 65, 128, 73, + 82, 85, 89, 65, 78, 78, 65, 128, 73, 82, 85, 85, 89, 65, 78, 78, 65, 128, + 73, 82, 79, 78, 45, 67, 79, 80, 80, 69, 210, 73, 82, 79, 78, 128, 73, 82, + 66, 128, 73, 79, 84, 73, 70, 73, 69, 196, 73, 79, 84, 65, 84, 69, 196, + 73, 79, 84, 65, 128, 73, 79, 84, 193, 73, 79, 82, 128, 73, 79, 68, 72, + 65, 68, 72, 128, 73, 78, 86, 73, 83, 73, 66, 76, 197, 73, 78, 86, 69, 82, + 84, 69, 68, 128, 73, 78, 86, 69, 82, 84, 69, 196, 73, 78, 86, 69, 82, 83, + 197, 73, 78, 84, 82, 79, 68, 85, 67, 69, 82, 128, 73, 78, 84, 73, 128, + 73, 78, 84, 69, 82, 83, 89, 76, 76, 65, 66, 73, 195, 73, 78, 84, 69, 82, + 83, 69, 67, 84, 73, 79, 78, 128, 73, 78, 84, 69, 82, 83, 69, 67, 84, 73, + 79, 206, 73, 78, 84, 69, 82, 83, 69, 67, 84, 73, 78, 199, 73, 78, 84, 69, + 82, 82, 79, 66, 65, 78, 71, 128, 73, 78, 84, 69, 82, 82, 79, 66, 65, 78, + 199, 73, 78, 84, 69, 82, 80, 79, 76, 65, 84, 73, 79, 206, 73, 78, 84, 69, + 82, 76, 79, 67, 75, 69, 196, 73, 78, 84, 69, 82, 76, 73, 78, 69, 65, 210, + 73, 78, 84, 69, 82, 76, 65, 67, 69, 196, 73, 78, 84, 69, 82, 73, 79, 210, + 73, 78, 84, 69, 82, 69, 83, 212, 73, 78, 84, 69, 82, 67, 65, 76, 65, 84, + 69, 128, 73, 78, 84, 69, 71, 82, 65, 84, 73, 79, 78, 128, 73, 78, 84, 69, + 71, 82, 65, 84, 73, 79, 206, 73, 78, 84, 69, 71, 82, 65, 76, 128, 73, 78, + 84, 69, 71, 82, 65, 204, 73, 78, 83, 85, 76, 65, 210, 73, 78, 83, 84, 82, + 85, 77, 69, 78, 84, 65, 204, 73, 78, 83, 73, 68, 69, 128, 73, 78, 83, 73, + 68, 197, 73, 78, 83, 69, 82, 84, 73, 79, 206, 73, 78, 83, 69, 67, 84, + 128, 73, 78, 83, 67, 82, 73, 80, 84, 73, 79, 78, 65, 204, 73, 78, 80, 85, + 212, 73, 78, 78, 79, 67, 69, 78, 67, 69, 128, 73, 78, 78, 78, 128, 73, + 78, 78, 69, 82, 128, 73, 78, 78, 69, 210, 73, 78, 78, 128, 73, 78, 73, + 78, 71, 85, 128, 73, 78, 73, 128, 73, 78, 72, 73, 66, 73, 212, 73, 78, + 72, 69, 82, 69, 78, 212, 73, 78, 72, 65, 76, 69, 128, 73, 78, 71, 87, 65, + 90, 128, 73, 78, 70, 79, 82, 77, 65, 84, 73, 79, 206, 73, 78, 70, 76, 85, + 69, 78, 67, 69, 128, 73, 78, 70, 73, 78, 73, 84, 89, 128, 73, 78, 70, 73, + 78, 73, 84, 217, 73, 78, 68, 85, 83, 84, 82, 73, 65, 204, 73, 78, 68, 73, + 82, 69, 67, 212, 73, 78, 68, 73, 67, 84, 73, 79, 206, 73, 78, 68, 73, 67, + 65, 84, 79, 82, 128, 73, 78, 68, 73, 67, 65, 84, 79, 210, 73, 78, 68, 73, + 195, 73, 78, 68, 73, 65, 206, 73, 78, 68, 69, 88, 128, 73, 78, 68, 69, + 80, 69, 78, 68, 69, 78, 212, 73, 78, 67, 82, 69, 77, 69, 78, 84, 128, 73, + 78, 67, 82, 69, 65, 83, 69, 211, 73, 78, 67, 82, 69, 65, 83, 69, 128, 73, + 78, 67, 82, 69, 65, 83, 197, 73, 78, 67, 79, 77, 80, 76, 69, 84, 197, 73, + 78, 67, 79, 77, 73, 78, 199, 73, 78, 67, 76, 85, 68, 73, 78, 199, 73, 78, + 67, 72, 128, 73, 78, 66, 79, 216, 73, 78, 65, 80, 128, 73, 78, 45, 65, + 76, 65, 70, 128, 73, 77, 80, 69, 82, 73, 65, 204, 73, 77, 80, 69, 82, 70, + 69, 67, 84, 85, 205, 73, 77, 80, 69, 82, 70, 69, 67, 84, 65, 128, 73, 77, + 80, 69, 82, 70, 69, 67, 84, 193, 73, 77, 78, 128, 73, 77, 73, 83, 69, 79, + 211, 73, 77, 73, 78, 51, 128, 73, 77, 73, 78, 128, 73, 77, 73, 206, 73, + 77, 73, 70, 84, 72, 79, 82, 79, 78, 128, 73, 77, 73, 70, 84, 72, 79, 82, + 65, 128, 73, 77, 73, 70, 79, 78, 79, 78, 128, 73, 77, 73, 68, 73, 65, 82, + 71, 79, 78, 128, 73, 77, 65, 71, 197, 73, 76, 85, 89, 65, 78, 78, 65, + 128, 73, 76, 85, 89, 128, 73, 76, 85, 85, 89, 65, 78, 78, 65, 128, 73, + 76, 85, 84, 128, 73, 76, 73, 77, 77, 85, 52, 128, 73, 76, 73, 77, 77, 85, + 51, 128, 73, 76, 73, 77, 77, 85, 128, 73, 76, 73, 77, 77, 213, 73, 76, + 50, 128, 73, 75, 65, 82, 65, 128, 73, 75, 65, 82, 193, 73, 74, 128, 73, + 73, 89, 65, 78, 78, 65, 128, 73, 71, 73, 128, 73, 71, 201, 73, 71, 71, + 87, 83, 128, 73, 70, 73, 78, 128, 73, 69, 85, 78, 71, 45, 84, 73, 75, 69, + 85, 84, 128, 73, 69, 85, 78, 71, 45, 84, 72, 73, 69, 85, 84, 72, 128, 73, + 69, 85, 78, 71, 45, 83, 83, 65, 78, 71, 75, 73, 89, 69, 79, 75, 128, 73, + 69, 85, 78, 71, 45, 82, 73, 69, 85, 76, 128, 73, 69, 85, 78, 71, 45, 80, + 73, 69, 85, 80, 128, 73, 69, 85, 78, 71, 45, 80, 72, 73, 69, 85, 80, 72, + 128, 73, 69, 85, 78, 71, 45, 75, 73, 89, 69, 79, 75, 128, 73, 69, 85, 78, + 71, 45, 75, 72, 73, 69, 85, 75, 72, 128, 73, 69, 85, 78, 71, 45, 67, 73, + 69, 85, 67, 128, 73, 69, 85, 78, 71, 45, 67, 72, 73, 69, 85, 67, 72, 128, + 73, 69, 85, 78, 199, 73, 68, 76, 69, 128, 73, 68, 73, 77, 128, 73, 68, + 73, 205, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 68, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 68, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 68, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 68, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 68, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 68, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 67, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 67, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 67, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 67, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 67, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 67, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 67, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 67, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 66, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 66, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 66, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 66, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 66, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 66, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 66, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 66, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 66, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 66, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 65, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 65, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 65, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 65, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 65, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 65, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 65, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 65, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 65, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 57, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 57, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 57, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 57, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 57, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 57, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 57, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 57, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 56, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 56, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 56, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 56, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 56, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 56, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 56, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 56, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 56, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 56, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 55, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 55, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 55, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 55, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 55, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 55, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 55, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 55, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 54, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 54, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 54, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 54, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 54, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 54, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 54, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 54, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 53, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 53, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 53, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 53, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 53, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 53, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 53, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 52, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 52, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 52, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 52, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 52, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 52, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 52, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 52, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 51, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 51, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 51, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 51, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 51, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 51, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 51, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 51, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 51, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 51, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 50, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 50, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 50, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 50, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 50, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 50, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 50, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 50, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 49, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 49, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 49, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 49, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 49, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 49, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 65, 48, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 65, 48, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 65, 48, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 65, 48, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 70, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 70, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 70, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 70, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 70, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 70, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 70, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 70, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 70, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 69, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 69, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 69, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 69, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 69, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 69, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 69, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 69, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 68, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 68, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 68, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 68, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 68, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 68, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 68, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 68, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 68, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 68, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 67, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 67, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 67, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 67, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 67, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 67, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 67, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 67, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 67, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 66, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 66, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 66, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 66, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 66, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 66, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 66, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 66, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 65, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 65, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 65, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 65, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 65, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 65, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 65, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 65, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 65, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 65, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 57, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 57, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 57, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 57, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 57, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 57, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 57, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 57, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 57, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 56, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 56, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 56, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 56, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 56, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 56, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 56, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 56, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 55, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 55, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 55, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 55, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 55, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 55, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 55, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 55, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 55, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 54, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 54, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 54, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 54, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 54, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 54, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 54, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 54, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 54, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 53, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 53, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 53, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 53, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 53, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 53, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 53, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 52, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 52, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 52, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 52, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 52, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 52, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 52, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 52, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 52, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 51, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 51, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 51, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 51, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 51, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 51, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 51, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 51, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 51, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 50, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, + 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 50, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 50, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 50, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, + 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 54, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 50, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 50, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 50, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, + 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 50, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 49, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, + 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 65, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 49, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, + 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, 52, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 49, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 49, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 49, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 49, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 69, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 48, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 48, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 56, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 70, 57, 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 70, 57, 48, 50, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 70, 57, 48, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 70, 57, 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 57, 49, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 57, 48, 52, + 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 56, 68, 55, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 56, 67, 65, 57, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 56, 57, 69, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 55, 68, 52, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 55, 65, 55, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 57, 56, + 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 54, 68, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 55, 53, 51, 51, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 55, 53, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 55, 49, 50, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 55, 48, 66, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 70, 49, + 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 69, 56, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 55, 50, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 54, 55, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 54, 55, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 54, 54, 50, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 53, 66, + 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 53, 57, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 53, 53, 55, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 54, 51, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 54, 51, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 54, 50, 57, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 50, 53, + 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 54, 50, 52, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 70, 56, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 53, 68, 69, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 53, 66, 56, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 53, 66, 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 57, 50, + 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 57, 49, 65, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 56, 70, 48, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 53, 53, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 53, 52, 51, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 53, 52, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 51, 70, + 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 51, 67, 67, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 50, 68, 68, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 53, 50, 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 53, 50, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 53, 50, 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 53, 49, 56, + 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 52, 69, 65, 52, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 52, 69, 56, 67, 128, 73, 68, 69, 79, + 71, 82, 65, 80, 72, 45, 52, 69, 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 52, 69, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, + 52, 69, 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, + 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 67, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 65, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 57, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 65, 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 65, 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 65, 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 65, 49, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, + 49, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 51, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 50, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 49, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 49, 48, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 65, 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 65, 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 65, 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 65, 48, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, + 48, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 65, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 56, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 55, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 65, 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 65, 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 65, 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 65, 48, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, + 48, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 49, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 65, 48, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 70, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 69, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 70, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 70, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 70, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 70, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 70, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 56, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 54, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 70, 53, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 70, 52, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 70, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 70, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 70, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 70, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 70, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 69, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 68, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 67, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 69, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 69, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 69, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 69, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 69, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 54, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 52, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 69, 51, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 69, 50, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 69, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 69, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 68, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 68, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 68, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 67, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 66, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 65, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 68, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 68, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 68, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 68, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 68, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 52, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 50, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 68, 49, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 68, 48, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 67, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 67, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 67, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 67, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 66, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 65, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 57, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 56, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 67, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 67, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 67, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 67, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 67, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 50, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 67, 48, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 70, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 66, 69, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 66, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 66, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 66, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 66, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 57, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 56, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 55, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 54, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 66, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 66, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 66, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 66, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 66, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 66, 48, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 69, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 68, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 65, 67, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 65, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 65, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 65, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 65, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 55, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 54, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 53, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 65, 52, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 65, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 65, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 65, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 65, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 57, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 69, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 67, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 66, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 57, 65, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 57, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 57, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 57, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 57, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 53, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 52, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 51, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 57, 50, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 57, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 57, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 56, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 56, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 56, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 67, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 65, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 57, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 56, 56, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 56, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 56, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 56, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 56, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 51, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 50, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 49, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 56, 48, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 55, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 55, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 55, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 55, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 55, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 65, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 56, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 55, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 55, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 55, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 55, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 55, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 55, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 49, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 55, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 70, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 69, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 54, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 54, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 54, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 54, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 54, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 56, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 54, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 54, 53, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 54, 52, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 54, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 54, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 54, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 54, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 70, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 69, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 68, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 67, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 53, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 53, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 53, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 53, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 53, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 54, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 52, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 53, 51, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 53, 50, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 53, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 53, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 52, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 52, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 68, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 67, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 66, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 65, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 52, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 52, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 52, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 52, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 52, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 52, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 50, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 52, 49, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 52, 48, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 51, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 51, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 51, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 51, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 66, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 65, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 57, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 56, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 51, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 51, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 51, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 51, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 51, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 50, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 51, 48, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 70, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 50, 69, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 50, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 50, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 50, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 50, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 57, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 56, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 55, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 54, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 50, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 50, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 50, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 50, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 50, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 50, 48, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 69, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 68, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 49, 67, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 49, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 49, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 49, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 49, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 55, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 54, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 53, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 49, 52, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 49, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 49, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 49, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 49, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 48, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 69, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 67, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 66, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 48, 65, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 48, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 57, 48, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 57, 48, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, + 48, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 53, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 52, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 51, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 57, 48, 50, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 57, 48, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 57, 48, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 70, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 70, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 70, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 67, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 65, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 57, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 70, 56, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 70, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 70, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 70, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 70, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 51, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 50, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 49, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 70, 48, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 69, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 69, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 69, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 69, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 69, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 65, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 56, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 55, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 69, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 69, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 69, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 69, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 69, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 49, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 69, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 70, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 69, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 68, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 68, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 68, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 68, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 68, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 56, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 54, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 68, 53, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 68, 52, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 68, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 68, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 68, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 68, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 70, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 69, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 68, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 67, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 67, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 67, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 67, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 67, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 67, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 54, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 52, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 67, 51, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 67, 50, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 67, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 67, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 66, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 66, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 68, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 67, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 66, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 65, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 66, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 66, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 66, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 66, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 66, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 52, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 50, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 66, 49, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 66, 48, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 65, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 65, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 65, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 65, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 66, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 65, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 57, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 56, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 65, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 65, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 65, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 65, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 65, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 50, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 65, 48, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 70, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 57, 69, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 57, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 57, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 57, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 57, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 57, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 56, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 55, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 54, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 57, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 57, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 57, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 57, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 57, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 57, 48, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 70, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 69, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 68, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 56, 67, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 56, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 56, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 56, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 56, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 55, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 54, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 53, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 56, 52, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 56, 51, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 56, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 56, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 56, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 55, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 69, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 68, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 67, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 66, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 55, 65, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 55, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 55, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 55, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 55, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 53, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 52, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 51, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 55, 50, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 55, 49, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 55, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 54, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 54, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 54, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 67, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 66, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 65, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 57, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 54, 56, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 54, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 54, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 54, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 54, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 51, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 50, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 49, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 54, 48, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 53, 70, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 53, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 53, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 53, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 53, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 65, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 57, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 56, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 55, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 53, 54, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 53, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 53, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 53, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 53, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 49, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 53, 48, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 70, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 69, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 52, 68, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 52, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 52, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 52, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 52, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 56, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 55, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 54, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 52, 53, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 52, 52, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 52, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 52, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 52, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 52, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 70, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 69, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 68, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 67, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 51, 66, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 51, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 51, 57, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 51, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 51, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 54, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 53, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 52, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 51, 51, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 51, 50, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 51, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 51, 48, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 50, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 50, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 68, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 67, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 66, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 65, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 50, 57, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 50, 56, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 50, 55, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 50, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 50, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 52, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 51, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 50, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 50, 49, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 50, 48, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 49, 70, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 49, 69, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 49, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 49, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 66, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 65, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 57, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 56, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 49, 55, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 49, 54, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 49, 53, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 49, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 49, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 50, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 49, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 49, 48, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 70, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 48, 69, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 48, 68, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 48, 67, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 48, 66, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 48, 65, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 57, + 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 56, 128, 73, + 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 55, 128, 73, 68, 69, + 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 54, 128, 73, 68, 69, 79, 71, + 82, 65, 80, 72, 45, 50, 70, 56, 48, 53, 128, 73, 68, 69, 79, 71, 82, 65, + 80, 72, 45, 50, 70, 56, 48, 52, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, + 45, 50, 70, 56, 48, 51, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, + 70, 56, 48, 50, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, + 48, 49, 128, 73, 68, 69, 79, 71, 82, 65, 80, 72, 45, 50, 70, 56, 48, 48, + 128, 73, 68, 69, 78, 84, 73, 70, 73, 67, 65, 84, 73, 79, 78, 128, 73, 68, + 69, 78, 84, 73, 67, 65, 204, 73, 67, 79, 78, 128, 73, 67, 72, 79, 85, + 128, 73, 67, 72, 79, 83, 128, 73, 67, 72, 73, 77, 65, 84, 79, 83, 128, + 73, 67, 72, 65, 68, 73, 78, 128, 73, 67, 69, 76, 65, 78, 68, 73, 67, 45, + 89, 82, 128, 73, 66, 73, 70, 73, 76, 73, 128, 73, 65, 85, 68, 65, 128, + 73, 48, 49, 53, 128, 73, 48, 49, 52, 128, 73, 48, 49, 51, 128, 73, 48, + 49, 50, 128, 73, 48, 49, 49, 65, 128, 73, 48, 49, 49, 128, 73, 48, 49, + 48, 65, 128, 73, 48, 49, 48, 128, 73, 48, 48, 57, 65, 128, 73, 48, 48, + 57, 128, 73, 48, 48, 56, 128, 73, 48, 48, 55, 128, 73, 48, 48, 54, 128, + 73, 48, 48, 53, 65, 128, 73, 48, 48, 53, 128, 73, 48, 48, 52, 128, 73, + 48, 48, 51, 128, 73, 48, 48, 50, 128, 73, 48, 48, 49, 128, 73, 45, 89, + 85, 128, 73, 45, 89, 79, 128, 73, 45, 89, 69, 79, 128, 73, 45, 89, 69, + 128, 73, 45, 89, 65, 69, 128, 73, 45, 89, 65, 45, 79, 128, 73, 45, 89, + 65, 128, 73, 45, 79, 45, 73, 128, 73, 45, 79, 128, 73, 45, 69, 85, 128, + 73, 45, 66, 69, 65, 77, 128, 73, 45, 65, 82, 65, 69, 65, 128, 73, 45, 65, + 128, 72, 90, 90, 90, 71, 128, 72, 90, 90, 90, 128, 72, 90, 90, 80, 128, + 72, 90, 90, 128, 72, 90, 87, 71, 128, 72, 90, 87, 128, 72, 90, 84, 128, + 72, 90, 71, 128, 72, 89, 83, 84, 69, 82, 69, 83, 73, 211, 72, 89, 80, 79, + 68, 73, 65, 83, 84, 79, 76, 69, 128, 72, 89, 80, 72, 69, 78, 65, 84, 73, + 79, 206, 72, 89, 80, 72, 69, 78, 45, 77, 73, 78, 85, 83, 128, 72, 89, 80, + 72, 69, 78, 128, 72, 89, 80, 72, 69, 206, 72, 89, 71, 73, 69, 73, 65, + 128, 72, 88, 87, 71, 128, 72, 88, 85, 79, 88, 128, 72, 88, 85, 79, 84, + 128, 72, 88, 85, 79, 80, 128, 72, 88, 85, 79, 128, 72, 88, 79, 88, 128, + 72, 88, 79, 84, 128, 72, 88, 79, 80, 128, 72, 88, 79, 128, 72, 88, 73, + 88, 128, 72, 88, 73, 84, 128, 72, 88, 73, 80, 128, 72, 88, 73, 69, 88, + 128, 72, 88, 73, 69, 84, 128, 72, 88, 73, 69, 80, 128, 72, 88, 73, 69, + 128, 72, 88, 73, 128, 72, 88, 69, 88, 128, 72, 88, 69, 80, 128, 72, 88, + 69, 128, 72, 88, 65, 88, 128, 72, 88, 65, 84, 128, 72, 88, 65, 80, 128, + 72, 88, 65, 128, 72, 87, 85, 128, 72, 87, 65, 73, 82, 128, 72, 87, 65, + 72, 128, 72, 85, 86, 65, 128, 72, 85, 83, 72, 69, 196, 72, 85, 83, 72, + 128, 72, 85, 82, 65, 78, 128, 72, 85, 79, 84, 128, 72, 85, 78, 68, 82, + 69, 68, 83, 128, 72, 85, 78, 68, 82, 69, 68, 211, 72, 85, 78, 68, 82, 69, + 68, 128, 72, 85, 78, 68, 82, 69, 196, 72, 85, 78, 128, 72, 85, 77, 208, + 72, 85, 77, 65, 78, 128, 72, 85, 77, 65, 206, 72, 85, 76, 50, 128, 72, + 85, 73, 73, 84, 79, 128, 72, 85, 71, 71, 73, 78, 199, 72, 85, 66, 50, + 128, 72, 85, 66, 178, 72, 85, 66, 128, 72, 85, 65, 82, 65, 68, 68, 79, + 128, 72, 85, 65, 78, 128, 72, 84, 83, 128, 72, 84, 74, 128, 72, 82, 89, + 86, 78, 73, 193, 72, 80, 87, 71, 128, 72, 80, 65, 128, 72, 80, 128, 72, + 79, 85, 83, 197, 72, 79, 85, 82, 71, 76, 65, 83, 83, 128, 72, 79, 85, 82, + 71, 76, 65, 83, 211, 72, 79, 85, 82, 128, 72, 79, 85, 210, 72, 79, 84, + 69, 76, 128, 72, 79, 84, 65, 128, 72, 79, 83, 80, 73, 84, 65, 76, 128, + 72, 79, 82, 83, 69, 128, 72, 79, 82, 83, 197, 72, 79, 82, 82, 128, 72, + 79, 82, 78, 83, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 76, 217, 72, + 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 54, 128, 72, 79, + 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 53, 128, 72, 79, 82, + 73, 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 52, 128, 72, 79, 82, 73, + 90, 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 51, 128, 72, 79, 82, 73, 90, + 79, 78, 84, 65, 76, 45, 48, 54, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, + 78, 84, 65, 76, 45, 48, 54, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, + 84, 65, 76, 45, 48, 54, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, + 65, 76, 45, 48, 53, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, + 76, 45, 48, 53, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, + 45, 48, 53, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, + 48, 53, 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, + 53, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, + 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 53, 45, + 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, + 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 53, + 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 52, 128, + 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 51, 128, 72, + 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 50, 128, 72, 79, + 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 49, 128, 72, 79, 82, + 73, 90, 79, 78, 84, 65, 76, 45, 48, 52, 45, 48, 48, 128, 72, 79, 82, 73, + 90, 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 54, 128, 72, 79, 82, 73, 90, + 79, 78, 84, 65, 76, 45, 48, 51, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, + 78, 84, 65, 76, 45, 48, 51, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, + 84, 65, 76, 45, 48, 51, 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, + 65, 76, 45, 48, 51, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, + 76, 45, 48, 51, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, + 45, 48, 51, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, + 48, 50, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, + 50, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, + 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, + 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, + 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, 49, + 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 50, 45, 48, 48, 128, + 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 54, 128, 72, + 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 53, 128, 72, 79, + 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 52, 128, 72, 79, 82, + 73, 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 51, 128, 72, 79, 82, 73, + 90, 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 50, 128, 72, 79, 82, 73, 90, + 79, 78, 84, 65, 76, 45, 48, 49, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, + 78, 84, 65, 76, 45, 48, 49, 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, + 84, 65, 76, 45, 48, 48, 45, 48, 54, 128, 72, 79, 82, 73, 90, 79, 78, 84, + 65, 76, 45, 48, 48, 45, 48, 53, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, + 76, 45, 48, 48, 45, 48, 52, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, + 45, 48, 48, 45, 48, 51, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, + 48, 48, 45, 48, 50, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, + 48, 45, 48, 49, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 45, 48, 48, + 45, 48, 48, 128, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 128, 72, 79, 82, + 73, 90, 79, 78, 84, 65, 204, 72, 79, 82, 73, 128, 72, 79, 82, 193, 72, + 79, 79, 85, 128, 72, 79, 79, 82, 85, 128, 72, 79, 79, 80, 128, 72, 79, + 79, 78, 128, 72, 79, 79, 75, 69, 68, 128, 72, 79, 79, 75, 69, 196, 72, + 79, 78, 69, 89, 66, 69, 69, 128, 72, 79, 78, 69, 217, 72, 79, 77, 79, 84, + 72, 69, 84, 73, 67, 128, 72, 79, 77, 79, 84, 72, 69, 84, 73, 195, 72, 79, + 76, 79, 128, 72, 79, 76, 76, 79, 215, 72, 79, 76, 69, 128, 72, 79, 76, + 68, 73, 78, 199, 72, 79, 76, 65, 77, 128, 72, 79, 76, 65, 205, 72, 79, + 75, 65, 128, 72, 79, 67, 75, 69, 217, 72, 79, 67, 72, 79, 128, 72, 78, + 85, 84, 128, 72, 78, 85, 79, 88, 128, 72, 78, 85, 79, 128, 72, 78, 85, + 66, 128, 72, 78, 79, 88, 128, 72, 78, 79, 84, 128, 72, 78, 79, 80, 128, + 72, 78, 73, 88, 128, 72, 78, 73, 84, 128, 72, 78, 73, 80, 128, 72, 78, + 73, 69, 88, 128, 72, 78, 73, 69, 84, 128, 72, 78, 73, 69, 80, 128, 72, + 78, 73, 69, 128, 72, 78, 73, 128, 72, 78, 69, 88, 128, 72, 78, 69, 80, + 128, 72, 78, 69, 128, 72, 78, 65, 88, 128, 72, 78, 65, 85, 128, 72, 78, + 65, 84, 128, 72, 78, 65, 80, 128, 72, 78, 65, 128, 72, 77, 89, 88, 128, + 72, 77, 89, 82, 88, 128, 72, 77, 89, 82, 128, 72, 77, 89, 80, 128, 72, + 77, 89, 128, 72, 77, 85, 88, 128, 72, 77, 85, 84, 128, 72, 77, 85, 82, + 88, 128, 72, 77, 85, 82, 128, 72, 77, 85, 80, 128, 72, 77, 85, 79, 88, + 128, 72, 77, 85, 79, 80, 128, 72, 77, 85, 79, 128, 72, 77, 85, 128, 72, + 77, 79, 88, 128, 72, 77, 79, 84, 128, 72, 77, 79, 80, 128, 72, 77, 79, + 128, 72, 77, 73, 88, 128, 72, 77, 73, 84, 128, 72, 77, 73, 80, 128, 72, + 77, 73, 69, 88, 128, 72, 77, 73, 69, 80, 128, 72, 77, 73, 69, 128, 72, + 77, 73, 128, 72, 77, 69, 128, 72, 77, 65, 88, 128, 72, 77, 65, 84, 128, + 72, 77, 65, 80, 128, 72, 77, 65, 128, 72, 76, 89, 88, 128, 72, 76, 89, + 84, 128, 72, 76, 89, 82, 88, 128, 72, 76, 89, 82, 128, 72, 76, 89, 80, + 128, 72, 76, 89, 128, 72, 76, 85, 88, 128, 72, 76, 85, 84, 128, 72, 76, + 85, 82, 88, 128, 72, 76, 85, 82, 128, 72, 76, 85, 80, 128, 72, 76, 85, + 79, 88, 128, 72, 76, 85, 79, 80, 128, 72, 76, 85, 79, 128, 72, 76, 85, + 128, 72, 76, 79, 88, 128, 72, 76, 79, 80, 128, 72, 76, 79, 128, 72, 76, + 73, 88, 128, 72, 76, 73, 84, 128, 72, 76, 73, 80, 128, 72, 76, 73, 69, + 88, 128, 72, 76, 73, 69, 80, 128, 72, 76, 73, 69, 128, 72, 76, 73, 128, + 72, 76, 69, 88, 128, 72, 76, 69, 80, 128, 72, 76, 69, 128, 72, 76, 65, + 88, 128, 72, 76, 65, 85, 128, 72, 76, 65, 84, 128, 72, 76, 65, 80, 128, + 72, 76, 65, 128, 72, 76, 128, 72, 75, 128, 72, 73, 90, 66, 128, 72, 73, + 89, 79, 128, 72, 73, 84, 84, 73, 78, 199, 72, 73, 83, 84, 79, 82, 73, + 195, 72, 73, 82, 73, 81, 128, 72, 73, 78, 71, 69, 68, 128, 72, 73, 78, + 71, 69, 196, 72, 73, 78, 71, 69, 128, 72, 73, 71, 72, 45, 83, 80, 69, 69, + 196, 72, 73, 71, 72, 45, 82, 69, 86, 69, 82, 83, 69, 68, 45, 185, 72, 73, + 71, 72, 45, 76, 79, 215, 72, 73, 71, 72, 45, 72, 69, 69, 76, 69, 196, 72, + 73, 69, 88, 128, 72, 73, 69, 85, 72, 45, 83, 73, 79, 83, 128, 72, 73, 69, + 85, 72, 45, 82, 73, 69, 85, 76, 128, 72, 73, 69, 85, 72, 45, 80, 73, 69, + 85, 80, 128, 72, 73, 69, 85, 72, 45, 78, 73, 69, 85, 78, 128, 72, 73, 69, + 85, 72, 45, 77, 73, 69, 85, 77, 128, 72, 73, 69, 85, 200, 72, 73, 69, 82, + 79, 71, 76, 89, 80, 72, 73, 195, 72, 73, 69, 128, 72, 73, 68, 73, 78, + 199, 72, 73, 68, 69, 84, 128, 72, 73, 68, 69, 128, 72, 73, 66, 73, 83, + 67, 85, 83, 128, 72, 73, 45, 82, 69, 83, 128, 72, 72, 87, 65, 128, 72, + 72, 85, 128, 72, 72, 73, 128, 72, 72, 69, 69, 128, 72, 72, 69, 128, 72, + 72, 65, 65, 128, 72, 71, 128, 72, 69, 89, 84, 128, 72, 69, 88, 73, 70, + 79, 82, 205, 72, 69, 88, 65, 71, 82, 65, 205, 72, 69, 88, 65, 71, 79, 78, 128, 72, 69, 82, 85, 84, 85, 128, 72, 69, 82, 85, 128, 72, 69, 82, 77, 73, 84, 73, 65, 206, 72, 69, 82, 77, 73, 79, 78, 73, 65, 206, 72, 69, 82, 77, 69, 83, 128, 72, 69, 82, 69, 128, 72, 69, 82, 66, 128, 72, 69, 82, @@ -3750,429 +3779,438 @@ static unsigned char lexicon[] = { 45, 69, 86, 73, 204, 72, 69, 65, 68, 83, 84, 82, 79, 75, 69, 128, 72, 69, 65, 68, 83, 84, 79, 78, 197, 72, 69, 65, 68, 80, 72, 79, 78, 69, 128, 72, 69, 65, 68, 73, 78, 71, 128, 72, 69, 65, 68, 45, 66, 65, 78, 68, 65, 71, - 69, 128, 72, 66, 65, 83, 65, 45, 69, 83, 65, 83, 193, 72, 66, 65, 83, - 193, 72, 65, 89, 65, 78, 78, 65, 128, 72, 65, 87, 74, 128, 72, 65, 86, - 69, 128, 72, 65, 85, 80, 84, 83, 84, 73, 77, 77, 69, 128, 72, 65, 213, - 72, 65, 84, 82, 65, 206, 72, 65, 84, 72, 73, 128, 72, 65, 84, 69, 128, - 72, 65, 84, 67, 72, 73, 78, 199, 72, 65, 84, 65, 198, 72, 65, 83, 69, - 210, 72, 65, 83, 65, 78, 84, 65, 128, 72, 65, 82, 80, 79, 79, 78, 128, - 72, 65, 82, 80, 79, 79, 206, 72, 65, 82, 77, 79, 78, 73, 67, 128, 72, 65, - 82, 75, 76, 69, 65, 206, 72, 65, 82, 68, 78, 69, 83, 83, 128, 72, 65, 82, - 196, 72, 65, 80, 80, 217, 72, 65, 78, 85, 78, 79, 207, 72, 65, 78, 71, - 90, 72, 79, 213, 72, 65, 78, 68, 83, 128, 72, 65, 78, 68, 211, 72, 65, - 78, 68, 76, 69, 83, 128, 72, 65, 78, 68, 76, 69, 128, 72, 65, 78, 68, 66, - 65, 71, 128, 72, 65, 78, 68, 45, 79, 86, 65, 76, 128, 72, 65, 78, 68, 45, - 79, 86, 65, 204, 72, 65, 78, 68, 45, 72, 79, 79, 75, 128, 72, 65, 78, 68, - 45, 72, 79, 79, 203, 72, 65, 78, 68, 45, 72, 73, 78, 71, 69, 128, 72, 65, - 78, 68, 45, 72, 73, 78, 71, 197, 72, 65, 78, 68, 45, 70, 76, 65, 84, 128, - 72, 65, 78, 68, 45, 70, 76, 65, 212, 72, 65, 78, 68, 45, 70, 73, 83, 84, - 128, 72, 65, 78, 68, 45, 67, 85, 82, 76, 73, 67, 85, 69, 128, 72, 65, 78, - 68, 45, 67, 85, 82, 76, 73, 67, 85, 197, 72, 65, 78, 68, 45, 67, 85, 80, - 128, 72, 65, 78, 68, 45, 67, 85, 208, 72, 65, 78, 68, 45, 67, 76, 65, 87, - 128, 72, 65, 78, 68, 45, 67, 76, 65, 215, 72, 65, 78, 68, 45, 67, 73, 82, - 67, 76, 69, 128, 72, 65, 78, 68, 45, 67, 73, 82, 67, 76, 197, 72, 65, 78, - 68, 45, 65, 78, 71, 76, 69, 128, 72, 65, 78, 68, 45, 65, 78, 71, 76, 197, - 72, 65, 78, 68, 128, 72, 65, 78, 45, 65, 75, 65, 84, 128, 72, 65, 77, 90, - 65, 128, 72, 65, 77, 90, 193, 72, 65, 77, 83, 84, 69, 210, 72, 65, 77, - 77, 69, 82, 128, 72, 65, 77, 77, 69, 210, 72, 65, 77, 66, 85, 82, 71, 69, - 82, 128, 72, 65, 76, 81, 65, 128, 72, 65, 76, 79, 128, 72, 65, 76, 70, - 45, 67, 73, 82, 67, 76, 197, 72, 65, 76, 70, 128, 72, 65, 76, 66, 69, 82, - 68, 128, 72, 65, 76, 65, 78, 84, 65, 128, 72, 65, 73, 84, 85, 128, 72, - 65, 73, 211, 72, 65, 73, 82, 67, 85, 84, 128, 72, 65, 73, 82, 128, 72, - 65, 71, 76, 65, 218, 72, 65, 71, 76, 128, 72, 65, 70, 85, 75, 72, 65, - 128, 72, 65, 70, 85, 75, 72, 128, 72, 65, 69, 71, 204, 72, 65, 65, 82, - 85, 128, 72, 65, 65, 77, 128, 72, 65, 193, 72, 65, 45, 72, 65, 128, 72, - 48, 48, 56, 128, 72, 48, 48, 55, 128, 72, 48, 48, 54, 65, 128, 72, 48, - 48, 54, 128, 72, 48, 48, 53, 128, 72, 48, 48, 52, 128, 72, 48, 48, 51, - 128, 72, 48, 48, 50, 128, 72, 48, 48, 49, 128, 72, 45, 84, 89, 80, 197, - 71, 89, 85, 128, 71, 89, 79, 78, 128, 71, 89, 79, 128, 71, 89, 73, 128, - 71, 89, 70, 213, 71, 89, 69, 69, 128, 71, 89, 65, 83, 128, 71, 89, 65, - 65, 128, 71, 89, 65, 128, 71, 89, 128, 71, 87, 85, 128, 71, 87, 73, 128, - 71, 87, 69, 69, 128, 71, 87, 69, 128, 71, 87, 65, 65, 128, 71, 87, 65, - 128, 71, 86, 65, 78, 71, 128, 71, 86, 128, 71, 85, 82, 85, 83, 72, 128, - 71, 85, 82, 85, 78, 128, 71, 85, 82, 77, 85, 75, 72, 201, 71, 85, 82, 65, - 77, 85, 84, 79, 78, 128, 71, 85, 82, 55, 128, 71, 85, 78, 85, 128, 71, - 85, 78, 213, 71, 85, 205, 71, 85, 76, 128, 71, 85, 74, 65, 82, 65, 84, - 201, 71, 85, 73, 84, 65, 82, 128, 71, 85, 199, 71, 85, 69, 73, 128, 71, - 85, 69, 72, 128, 71, 85, 69, 200, 71, 85, 68, 128, 71, 85, 196, 71, 85, - 65, 82, 68, 83, 77, 65, 78, 128, 71, 85, 65, 82, 68, 69, 68, 78, 69, 83, - 83, 128, 71, 85, 65, 82, 68, 69, 196, 71, 85, 65, 82, 68, 128, 71, 85, - 65, 82, 65, 78, 201, 71, 85, 193, 71, 85, 178, 71, 84, 69, 210, 71, 83, - 85, 77, 128, 71, 83, 85, 205, 71, 82, 213, 71, 82, 79, 87, 73, 78, 199, - 71, 82, 79, 85, 78, 68, 128, 71, 82, 79, 78, 84, 72, 73, 83, 77, 65, 84, - 65, 128, 71, 82, 73, 78, 78, 73, 78, 199, 71, 82, 73, 77, 65, 67, 73, 78, - 199, 71, 82, 69, 71, 79, 82, 73, 65, 206, 71, 82, 69, 69, 206, 71, 82, - 69, 65, 84, 78, 69, 83, 83, 128, 71, 82, 69, 65, 84, 69, 82, 45, 84, 72, - 65, 78, 128, 71, 82, 69, 65, 84, 69, 82, 45, 84, 72, 65, 206, 71, 82, 69, - 65, 84, 69, 210, 71, 82, 69, 65, 212, 71, 82, 65, 86, 69, 89, 65, 82, - 196, 71, 82, 65, 86, 69, 45, 77, 65, 67, 82, 79, 78, 128, 71, 82, 65, 86, - 69, 45, 65, 67, 85, 84, 69, 45, 71, 82, 65, 86, 69, 128, 71, 82, 65, 86, - 197, 71, 82, 65, 84, 69, 82, 128, 71, 82, 65, 83, 83, 128, 71, 82, 65, - 83, 211, 71, 82, 65, 83, 208, 71, 82, 65, 80, 72, 69, 77, 197, 71, 82, - 65, 80, 69, 83, 128, 71, 82, 65, 78, 84, 72, 193, 71, 82, 65, 77, 77, - 193, 71, 82, 65, 73, 78, 128, 71, 82, 65, 68, 85, 65, 84, 73, 79, 206, - 71, 82, 65, 68, 85, 65, 76, 128, 71, 82, 65, 67, 69, 128, 71, 82, 65, 67, - 197, 71, 80, 65, 128, 71, 79, 82, 84, 72, 77, 73, 75, 79, 206, 71, 79, - 82, 84, 128, 71, 79, 82, 71, 79, 84, 69, 82, 73, 128, 71, 79, 82, 71, 79, - 83, 89, 78, 84, 72, 69, 84, 79, 78, 128, 71, 79, 82, 71, 79, 206, 71, 79, - 82, 71, 73, 128, 71, 79, 82, 65, 128, 71, 79, 79, 196, 71, 79, 78, 71, - 128, 71, 79, 76, 70, 69, 82, 128, 71, 79, 76, 68, 128, 71, 79, 75, 128, - 71, 79, 73, 78, 199, 71, 79, 66, 76, 73, 78, 128, 71, 79, 65, 76, 128, - 71, 79, 65, 204, 71, 79, 65, 128, 71, 78, 89, 73, 83, 128, 71, 78, 65, - 86, 73, 89, 65, 78, 73, 128, 71, 76, 79, 87, 73, 78, 199, 71, 76, 79, 84, - 84, 65, 204, 71, 76, 79, 66, 197, 71, 76, 73, 83, 83, 65, 78, 68, 207, - 71, 76, 69, 73, 67, 200, 71, 76, 65, 71, 79, 76, 73, 128, 71, 76, 65, - 128, 71, 74, 69, 128, 71, 73, 88, 128, 71, 73, 84, 128, 71, 73, 83, 72, - 128, 71, 73, 83, 200, 71, 73, 83, 65, 76, 128, 71, 73, 82, 85, 68, 65, - 65, 128, 71, 73, 82, 76, 211, 71, 73, 82, 76, 128, 71, 73, 82, 51, 128, - 71, 73, 82, 179, 71, 73, 82, 50, 128, 71, 73, 82, 178, 71, 73, 80, 128, - 71, 73, 78, 73, 73, 128, 71, 73, 77, 69, 76, 128, 71, 73, 77, 69, 204, - 71, 73, 77, 128, 71, 73, 71, 65, 128, 71, 73, 71, 128, 71, 73, 69, 84, - 128, 71, 73, 68, 73, 77, 128, 71, 73, 66, 66, 79, 85, 211, 71, 73, 66, - 65, 128, 71, 73, 52, 128, 71, 73, 180, 71, 72, 90, 128, 71, 72, 87, 65, - 128, 71, 72, 85, 78, 78, 65, 128, 71, 72, 85, 78, 78, 193, 71, 72, 85, - 128, 71, 72, 79, 85, 128, 71, 72, 79, 83, 84, 128, 71, 72, 79, 128, 71, - 72, 73, 77, 69, 76, 128, 71, 72, 73, 128, 71, 72, 72, 65, 128, 71, 72, - 69, 89, 83, 128, 71, 72, 69, 85, 88, 128, 71, 72, 69, 85, 78, 128, 71, - 72, 69, 85, 71, 72, 69, 85, 65, 69, 77, 128, 71, 72, 69, 85, 71, 72, 69, - 78, 128, 71, 72, 69, 85, 65, 69, 82, 65, 69, 128, 71, 72, 69, 85, 65, 69, - 71, 72, 69, 85, 65, 69, 128, 71, 72, 69, 84, 128, 71, 72, 69, 69, 128, - 71, 72, 69, 128, 71, 72, 197, 71, 72, 65, 89, 78, 128, 71, 72, 65, 82, - 65, 69, 128, 71, 72, 65, 80, 128, 71, 72, 65, 78, 128, 71, 72, 65, 77, - 77, 65, 128, 71, 72, 65, 77, 65, 76, 128, 71, 72, 65, 73, 78, 85, 128, - 71, 72, 65, 73, 78, 128, 71, 72, 65, 73, 206, 71, 72, 65, 68, 128, 71, - 72, 65, 65, 77, 65, 69, 128, 71, 72, 65, 65, 128, 71, 71, 87, 73, 128, - 71, 71, 87, 69, 69, 128, 71, 71, 87, 69, 128, 71, 71, 87, 65, 65, 128, - 71, 71, 87, 65, 128, 71, 71, 85, 88, 128, 71, 71, 85, 84, 128, 71, 71, - 85, 82, 88, 128, 71, 71, 85, 82, 128, 71, 71, 85, 79, 88, 128, 71, 71, - 85, 79, 84, 128, 71, 71, 85, 79, 80, 128, 71, 71, 85, 79, 128, 71, 71, - 79, 88, 128, 71, 71, 79, 84, 128, 71, 71, 79, 80, 128, 71, 71, 73, 88, - 128, 71, 71, 73, 84, 128, 71, 71, 73, 69, 88, 128, 71, 71, 73, 69, 80, - 128, 71, 71, 73, 69, 128, 71, 71, 69, 88, 128, 71, 71, 69, 84, 128, 71, - 71, 69, 80, 128, 71, 71, 65, 88, 128, 71, 71, 65, 84, 128, 71, 69, 84, - 193, 71, 69, 83, 84, 85, 82, 69, 128, 71, 69, 83, 72, 85, 128, 71, 69, - 83, 72, 84, 73, 78, 128, 71, 69, 83, 72, 84, 73, 206, 71, 69, 83, 72, 50, - 128, 71, 69, 82, 83, 72, 65, 89, 73, 77, 128, 71, 69, 82, 77, 65, 206, - 71, 69, 82, 69, 83, 72, 128, 71, 69, 82, 69, 83, 200, 71, 69, 79, 77, 69, - 84, 82, 73, 67, 65, 76, 76, 217, 71, 69, 79, 77, 69, 84, 82, 73, 195, 71, - 69, 78, 84, 76, 197, 71, 69, 78, 73, 84, 73, 86, 69, 128, 71, 69, 78, 73, - 75, 201, 71, 69, 78, 69, 82, 73, 195, 71, 69, 77, 73, 78, 73, 128, 71, - 69, 77, 73, 78, 65, 84, 73, 79, 206, 71, 69, 205, 71, 69, 69, 77, 128, - 71, 69, 68, 79, 76, 65, 128, 71, 69, 68, 69, 128, 71, 69, 66, 207, 71, - 69, 66, 193, 71, 69, 65, 82, 128, 71, 69, 65, 210, 71, 69, 50, 50, 128, - 71, 68, 65, 78, 128, 71, 67, 73, 71, 128, 71, 67, 65, 206, 71, 66, 79, - 78, 128, 71, 66, 73, 69, 197, 71, 66, 69, 85, 88, 128, 71, 66, 69, 84, - 128, 71, 66, 65, 89, 73, 128, 71, 66, 65, 75, 85, 82, 85, 78, 69, 78, - 128, 71, 66, 128, 71, 65, 89, 65, 78, 85, 75, 73, 84, 84, 65, 128, 71, - 65, 89, 65, 78, 78, 65, 128, 71, 65, 89, 128, 71, 65, 85, 78, 84, 76, 69, - 84, 128, 71, 65, 84, 72, 69, 82, 73, 78, 71, 128, 71, 65, 84, 72, 69, 82, - 73, 78, 199, 71, 65, 84, 69, 128, 71, 65, 83, 72, 65, 78, 128, 71, 65, - 82, 83, 72, 85, 78, 73, 128, 71, 65, 82, 79, 78, 128, 71, 65, 82, 77, 69, - 78, 84, 128, 71, 65, 82, 68, 69, 78, 128, 71, 65, 82, 51, 128, 71, 65, - 80, 80, 69, 196, 71, 65, 208, 71, 65, 78, 77, 65, 128, 71, 65, 78, 71, - 73, 65, 128, 71, 65, 78, 68, 193, 71, 65, 78, 50, 128, 71, 65, 78, 178, - 71, 65, 77, 77, 65, 128, 71, 65, 77, 76, 65, 128, 71, 65, 77, 76, 128, - 71, 65, 77, 69, 128, 71, 65, 77, 197, 71, 65, 77, 65, 78, 128, 71, 65, - 77, 65, 76, 128, 71, 65, 77, 65, 204, 71, 65, 71, 128, 71, 65, 70, 128, - 71, 65, 198, 71, 65, 69, 84, 84, 65, 45, 80, 73, 76, 76, 65, 128, 71, 65, - 68, 79, 76, 128, 71, 65, 68, 128, 71, 65, 196, 71, 65, 66, 65, 128, 71, - 65, 66, 193, 71, 65, 65, 70, 85, 128, 71, 65, 178, 71, 48, 53, 52, 128, - 71, 48, 53, 51, 128, 71, 48, 53, 50, 128, 71, 48, 53, 49, 128, 71, 48, - 53, 48, 128, 71, 48, 52, 57, 128, 71, 48, 52, 56, 128, 71, 48, 52, 55, - 128, 71, 48, 52, 54, 128, 71, 48, 52, 53, 65, 128, 71, 48, 52, 53, 128, - 71, 48, 52, 52, 128, 71, 48, 52, 51, 65, 128, 71, 48, 52, 51, 128, 71, - 48, 52, 50, 128, 71, 48, 52, 49, 128, 71, 48, 52, 48, 128, 71, 48, 51, - 57, 128, 71, 48, 51, 56, 128, 71, 48, 51, 55, 65, 128, 71, 48, 51, 55, - 128, 71, 48, 51, 54, 65, 128, 71, 48, 51, 54, 128, 71, 48, 51, 53, 128, - 71, 48, 51, 52, 128, 71, 48, 51, 51, 128, 71, 48, 51, 50, 128, 71, 48, - 51, 49, 128, 71, 48, 51, 48, 128, 71, 48, 50, 57, 128, 71, 48, 50, 56, - 128, 71, 48, 50, 55, 128, 71, 48, 50, 54, 65, 128, 71, 48, 50, 54, 128, - 71, 48, 50, 53, 128, 71, 48, 50, 52, 128, 71, 48, 50, 51, 128, 71, 48, - 50, 50, 128, 71, 48, 50, 49, 128, 71, 48, 50, 48, 65, 128, 71, 48, 50, - 48, 128, 71, 48, 49, 57, 128, 71, 48, 49, 56, 128, 71, 48, 49, 55, 128, - 71, 48, 49, 54, 128, 71, 48, 49, 53, 128, 71, 48, 49, 52, 128, 71, 48, - 49, 51, 128, 71, 48, 49, 50, 128, 71, 48, 49, 49, 65, 128, 71, 48, 49, - 49, 128, 71, 48, 49, 48, 128, 71, 48, 48, 57, 128, 71, 48, 48, 56, 128, - 71, 48, 48, 55, 66, 128, 71, 48, 48, 55, 65, 128, 71, 48, 48, 55, 128, - 71, 48, 48, 54, 65, 128, 71, 48, 48, 54, 128, 71, 48, 48, 53, 128, 71, - 48, 48, 52, 128, 71, 48, 48, 51, 128, 71, 48, 48, 50, 128, 71, 48, 48, - 49, 128, 70, 89, 88, 128, 70, 89, 84, 128, 70, 89, 80, 128, 70, 89, 65, - 128, 70, 87, 73, 128, 70, 87, 69, 69, 128, 70, 87, 69, 128, 70, 87, 65, - 65, 128, 70, 87, 65, 128, 70, 86, 83, 51, 128, 70, 86, 83, 50, 128, 70, - 86, 83, 49, 128, 70, 85, 88, 128, 70, 85, 84, 128, 70, 85, 83, 69, 128, - 70, 85, 83, 193, 70, 85, 82, 88, 128, 70, 85, 80, 128, 70, 85, 78, 69, - 82, 65, 204, 70, 85, 78, 67, 84, 73, 79, 78, 65, 204, 70, 85, 78, 67, 84, - 73, 79, 78, 128, 70, 85, 76, 76, 78, 69, 83, 83, 128, 70, 85, 76, 204, - 70, 85, 74, 73, 128, 70, 85, 69, 84, 128, 70, 85, 69, 204, 70, 85, 69, - 128, 70, 85, 65, 128, 70, 84, 72, 79, 82, 193, 70, 83, 73, 128, 70, 82, - 79, 87, 78, 73, 78, 71, 128, 70, 82, 79, 87, 78, 73, 78, 199, 70, 82, 79, - 87, 78, 128, 70, 82, 79, 87, 206, 70, 82, 79, 78, 84, 45, 84, 73, 76, 84, - 69, 196, 70, 82, 79, 78, 84, 45, 70, 65, 67, 73, 78, 199, 70, 82, 79, 78, - 212, 70, 82, 79, 205, 70, 82, 79, 71, 128, 70, 82, 79, 199, 70, 82, 73, - 84, 85, 128, 70, 82, 73, 69, 83, 128, 70, 82, 73, 69, 196, 70, 82, 73, - 67, 65, 84, 73, 86, 69, 128, 70, 82, 69, 84, 66, 79, 65, 82, 68, 128, 70, - 82, 69, 78, 67, 200, 70, 82, 69, 69, 128, 70, 82, 69, 197, 70, 82, 65, - 78, 75, 211, 70, 82, 65, 78, 195, 70, 82, 65, 77, 69, 83, 128, 70, 82, - 65, 77, 69, 128, 70, 82, 65, 77, 197, 70, 82, 65, 71, 82, 65, 78, 84, - 128, 70, 82, 65, 71, 77, 69, 78, 84, 128, 70, 82, 65, 67, 84, 73, 79, - 206, 70, 79, 88, 128, 70, 79, 85, 82, 84, 69, 69, 78, 128, 70, 79, 85, - 82, 84, 69, 69, 206, 70, 79, 85, 82, 45, 84, 72, 73, 82, 84, 89, 128, 70, - 79, 85, 82, 45, 83, 84, 82, 73, 78, 199, 70, 79, 85, 82, 45, 80, 69, 82, - 45, 69, 205, 70, 79, 85, 82, 45, 76, 73, 78, 197, 70, 79, 85, 210, 70, - 79, 85, 78, 84, 65, 73, 78, 128, 70, 79, 85, 78, 84, 65, 73, 206, 70, 79, - 83, 84, 69, 82, 73, 78, 71, 128, 70, 79, 82, 87, 65, 82, 68, 128, 70, 79, - 82, 87, 65, 82, 196, 70, 79, 82, 84, 89, 128, 70, 79, 82, 84, 217, 70, - 79, 82, 84, 69, 128, 70, 79, 82, 77, 211, 70, 79, 82, 77, 65, 84, 84, 73, - 78, 71, 128, 70, 79, 82, 77, 65, 212, 70, 79, 82, 75, 69, 196, 70, 79, - 82, 69, 72, 69, 65, 196, 70, 79, 82, 67, 69, 83, 128, 70, 79, 82, 67, 69, - 128, 70, 79, 80, 128, 70, 79, 79, 84, 83, 84, 79, 79, 76, 128, 70, 79, - 79, 84, 80, 82, 73, 78, 84, 83, 128, 70, 79, 79, 84, 78, 79, 84, 197, 70, - 79, 79, 84, 66, 65, 76, 76, 128, 70, 79, 79, 84, 128, 70, 79, 79, 76, - 128, 70, 79, 79, 68, 128, 70, 79, 79, 128, 70, 79, 78, 212, 70, 79, 78, - 71, 77, 65, 78, 128, 70, 79, 77, 128, 70, 79, 76, 76, 89, 128, 70, 79, - 76, 76, 79, 87, 73, 78, 71, 128, 70, 79, 76, 68, 69, 82, 128, 70, 79, 76, - 68, 69, 196, 70, 79, 71, 71, 89, 128, 70, 79, 71, 128, 70, 207, 70, 77, - 128, 70, 76, 89, 73, 78, 199, 70, 76, 89, 128, 70, 76, 85, 84, 84, 69, - 82, 73, 78, 71, 128, 70, 76, 85, 84, 84, 69, 82, 73, 78, 199, 70, 76, 85, - 84, 69, 128, 70, 76, 85, 83, 72, 69, 196, 70, 76, 79, 87, 73, 78, 199, - 70, 76, 79, 87, 69, 82, 83, 128, 70, 76, 79, 87, 69, 210, 70, 76, 79, 85, - 82, 73, 83, 72, 128, 70, 76, 79, 82, 69, 84, 84, 69, 128, 70, 76, 79, 82, - 65, 204, 70, 76, 79, 80, 80, 217, 70, 76, 79, 79, 82, 128, 70, 76, 79, - 79, 210, 70, 76, 73, 80, 128, 70, 76, 73, 71, 72, 84, 128, 70, 76, 73, - 67, 203, 70, 76, 69, 88, 85, 83, 128, 70, 76, 69, 88, 69, 196, 70, 76, - 69, 88, 128, 70, 76, 69, 85, 82, 79, 78, 128, 70, 76, 69, 85, 82, 45, 68, - 69, 45, 76, 73, 83, 128, 70, 76, 65, 84, 84, 69, 78, 69, 196, 70, 76, 65, - 84, 78, 69, 83, 83, 128, 70, 76, 65, 83, 72, 128, 70, 76, 65, 71, 83, - 128, 70, 76, 65, 71, 45, 53, 128, 70, 76, 65, 71, 45, 52, 128, 70, 76, - 65, 71, 45, 51, 128, 70, 76, 65, 71, 45, 50, 128, 70, 76, 65, 71, 45, 49, - 128, 70, 76, 65, 71, 128, 70, 76, 65, 199, 70, 76, 65, 128, 70, 76, 128, - 70, 73, 88, 69, 68, 45, 70, 79, 82, 205, 70, 73, 88, 128, 70, 73, 86, 69, - 45, 84, 72, 73, 82, 84, 89, 128, 70, 73, 86, 69, 45, 76, 73, 78, 197, 70, - 73, 86, 197, 70, 73, 84, 90, 80, 65, 84, 82, 73, 67, 203, 70, 73, 84, 65, - 128, 70, 73, 84, 128, 70, 73, 83, 84, 69, 196, 70, 73, 83, 72, 73, 78, - 199, 70, 73, 83, 72, 72, 79, 79, 75, 128, 70, 73, 83, 72, 72, 79, 79, - 203, 70, 73, 83, 72, 69, 89, 69, 128, 70, 73, 83, 72, 128, 70, 73, 83, - 200, 70, 73, 82, 83, 212, 70, 73, 82, 73, 128, 70, 73, 82, 69, 87, 79, - 82, 75, 83, 128, 70, 73, 82, 69, 87, 79, 82, 203, 70, 73, 82, 69, 128, - 70, 73, 82, 197, 70, 73, 80, 128, 70, 73, 78, 73, 84, 197, 70, 73, 78, - 71, 69, 82, 83, 128, 70, 73, 78, 71, 69, 82, 211, 70, 73, 78, 71, 69, 82, - 78, 65, 73, 76, 83, 128, 70, 73, 78, 71, 69, 82, 69, 196, 70, 73, 78, 71, - 69, 82, 45, 80, 79, 83, 212, 70, 73, 78, 71, 69, 82, 128, 70, 73, 78, 71, - 69, 210, 70, 73, 78, 65, 78, 67, 73, 65, 76, 128, 70, 73, 78, 65, 76, - 128, 70, 73, 76, 205, 70, 73, 76, 76, 69, 82, 128, 70, 73, 76, 76, 69, - 196, 70, 73, 76, 76, 128, 70, 73, 76, 204, 70, 73, 76, 197, 70, 73, 73, - 128, 70, 73, 71, 85, 82, 69, 45, 51, 128, 70, 73, 71, 85, 82, 69, 45, 50, - 128, 70, 73, 71, 85, 82, 69, 45, 49, 128, 70, 73, 71, 85, 82, 197, 70, - 73, 71, 72, 84, 128, 70, 73, 70, 84, 89, 128, 70, 73, 70, 84, 217, 70, - 73, 70, 84, 72, 83, 128, 70, 73, 70, 84, 72, 128, 70, 73, 70, 84, 69, 69, - 78, 128, 70, 73, 70, 84, 69, 69, 206, 70, 73, 69, 76, 68, 128, 70, 73, - 69, 76, 196, 70, 72, 84, 79, 82, 193, 70, 70, 76, 128, 70, 70, 73, 128, - 70, 69, 85, 88, 128, 70, 69, 85, 70, 69, 85, 65, 69, 84, 128, 70, 69, 83, - 84, 73, 86, 65, 76, 128, 70, 69, 82, 82, 89, 128, 70, 69, 82, 82, 73, - 211, 70, 69, 82, 77, 65, 84, 65, 128, 70, 69, 82, 77, 65, 84, 193, 70, - 69, 79, 200, 70, 69, 78, 199, 70, 69, 78, 67, 69, 128, 70, 69, 77, 73, - 78, 73, 78, 197, 70, 69, 77, 65, 76, 69, 128, 70, 69, 77, 65, 76, 197, - 70, 69, 76, 76, 79, 87, 83, 72, 73, 80, 128, 70, 69, 73, 128, 70, 69, 72, - 213, 70, 69, 72, 128, 70, 69, 200, 70, 69, 69, 78, 71, 128, 70, 69, 69, - 77, 128, 70, 69, 69, 68, 128, 70, 69, 69, 196, 70, 69, 69, 128, 70, 69, - 66, 82, 85, 65, 82, 89, 128, 70, 69, 65, 84, 72, 69, 82, 128, 70, 69, 65, - 84, 72, 69, 210, 70, 69, 65, 82, 78, 128, 70, 69, 65, 82, 70, 85, 204, - 70, 69, 65, 82, 128, 70, 65, 89, 65, 78, 78, 65, 128, 70, 65, 89, 128, - 70, 65, 88, 128, 70, 65, 216, 70, 65, 84, 73, 71, 85, 69, 128, 70, 65, - 84, 72, 69, 82, 128, 70, 65, 84, 72, 69, 210, 70, 65, 84, 72, 65, 84, 65, - 78, 128, 70, 65, 84, 72, 65, 84, 65, 206, 70, 65, 84, 72, 65, 128, 70, - 65, 84, 72, 193, 70, 65, 84, 128, 70, 65, 83, 84, 128, 70, 65, 82, 83, - 201, 70, 65, 82, 128, 70, 65, 81, 128, 70, 65, 80, 128, 70, 65, 78, 71, - 128, 70, 65, 78, 69, 82, 79, 83, 73, 211, 70, 65, 78, 128, 70, 65, 77, - 73, 76, 89, 128, 70, 65, 77, 128, 70, 65, 76, 76, 69, 206, 70, 65, 74, - 128, 70, 65, 73, 76, 85, 82, 69, 128, 70, 65, 73, 72, 85, 128, 70, 65, - 73, 66, 128, 70, 65, 72, 82, 69, 78, 72, 69, 73, 84, 128, 70, 65, 67, 84, - 79, 82, 89, 128, 70, 65, 67, 84, 79, 210, 70, 65, 67, 83, 73, 77, 73, 76, - 197, 70, 65, 67, 73, 78, 71, 83, 128, 70, 65, 67, 69, 45, 54, 128, 70, - 65, 67, 69, 45, 53, 128, 70, 65, 67, 69, 45, 52, 128, 70, 65, 67, 69, 45, - 51, 128, 70, 65, 67, 69, 45, 50, 128, 70, 65, 67, 69, 45, 49, 128, 70, - 65, 65, 77, 65, 69, 128, 70, 65, 65, 73, 128, 70, 65, 65, 70, 85, 128, - 70, 48, 53, 51, 128, 70, 48, 53, 50, 128, 70, 48, 53, 49, 67, 128, 70, - 48, 53, 49, 66, 128, 70, 48, 53, 49, 65, 128, 70, 48, 53, 49, 128, 70, - 48, 53, 48, 128, 70, 48, 52, 57, 128, 70, 48, 52, 56, 128, 70, 48, 52, - 55, 65, 128, 70, 48, 52, 55, 128, 70, 48, 52, 54, 65, 128, 70, 48, 52, - 54, 128, 70, 48, 52, 53, 65, 128, 70, 48, 52, 53, 128, 70, 48, 52, 52, - 128, 70, 48, 52, 51, 128, 70, 48, 52, 50, 128, 70, 48, 52, 49, 128, 70, - 48, 52, 48, 128, 70, 48, 51, 57, 128, 70, 48, 51, 56, 65, 128, 70, 48, - 51, 56, 128, 70, 48, 51, 55, 65, 128, 70, 48, 51, 55, 128, 70, 48, 51, - 54, 128, 70, 48, 51, 53, 128, 70, 48, 51, 52, 128, 70, 48, 51, 51, 128, - 70, 48, 51, 50, 128, 70, 48, 51, 49, 65, 128, 70, 48, 51, 49, 128, 70, - 48, 51, 48, 128, 70, 48, 50, 57, 128, 70, 48, 50, 56, 128, 70, 48, 50, - 55, 128, 70, 48, 50, 54, 128, 70, 48, 50, 53, 128, 70, 48, 50, 52, 128, - 70, 48, 50, 51, 128, 70, 48, 50, 50, 128, 70, 48, 50, 49, 65, 128, 70, - 48, 50, 49, 128, 70, 48, 50, 48, 128, 70, 48, 49, 57, 128, 70, 48, 49, - 56, 128, 70, 48, 49, 55, 128, 70, 48, 49, 54, 128, 70, 48, 49, 53, 128, - 70, 48, 49, 52, 128, 70, 48, 49, 51, 65, 128, 70, 48, 49, 51, 128, 70, - 48, 49, 50, 128, 70, 48, 49, 49, 128, 70, 48, 49, 48, 128, 70, 48, 48, - 57, 128, 70, 48, 48, 56, 128, 70, 48, 48, 55, 128, 70, 48, 48, 54, 128, - 70, 48, 48, 53, 128, 70, 48, 48, 52, 128, 70, 48, 48, 51, 128, 70, 48, - 48, 50, 128, 70, 48, 48, 49, 65, 128, 70, 48, 48, 49, 128, 69, 90, 83, - 128, 69, 90, 200, 69, 90, 69, 78, 128, 69, 90, 69, 206, 69, 90, 128, 69, - 89, 89, 89, 128, 69, 89, 69, 83, 128, 69, 89, 69, 211, 69, 89, 69, 76, - 65, 83, 72, 69, 211, 69, 89, 69, 71, 76, 65, 83, 83, 69, 83, 128, 69, 89, - 69, 71, 65, 90, 69, 45, 87, 65, 76, 76, 80, 76, 65, 78, 197, 69, 89, 69, - 71, 65, 90, 69, 45, 70, 76, 79, 79, 82, 80, 76, 65, 78, 197, 69, 89, 69, - 66, 82, 79, 87, 211, 69, 89, 197, 69, 89, 66, 69, 89, 70, 73, 76, 73, - 128, 69, 89, 65, 78, 78, 65, 128, 69, 88, 84, 82, 69, 77, 69, 76, 217, - 69, 88, 84, 82, 65, 84, 69, 82, 82, 69, 83, 84, 82, 73, 65, 204, 69, 88, - 84, 82, 65, 45, 76, 79, 215, 69, 88, 84, 82, 65, 45, 72, 73, 71, 200, 69, - 88, 84, 82, 193, 69, 88, 84, 69, 78, 83, 73, 79, 78, 128, 69, 88, 84, 69, - 78, 68, 69, 68, 128, 69, 88, 84, 69, 78, 68, 69, 196, 69, 88, 80, 82, 69, - 83, 83, 73, 79, 78, 76, 69, 83, 211, 69, 88, 80, 79, 78, 69, 78, 212, 69, - 88, 79, 128, 69, 88, 207, 69, 88, 73, 83, 84, 83, 128, 69, 88, 73, 83, - 84, 128, 69, 88, 72, 65, 85, 83, 84, 73, 79, 78, 128, 69, 88, 72, 65, 76, - 69, 128, 69, 88, 67, 76, 65, 77, 65, 84, 73, 79, 78, 128, 69, 88, 67, 76, - 65, 77, 65, 84, 73, 79, 206, 69, 88, 67, 73, 84, 69, 77, 69, 78, 84, 128, - 69, 88, 67, 72, 65, 78, 71, 69, 128, 69, 88, 67, 69, 83, 83, 128, 69, 88, - 67, 69, 76, 76, 69, 78, 84, 128, 69, 87, 69, 128, 69, 86, 69, 82, 217, - 69, 86, 69, 82, 71, 82, 69, 69, 206, 69, 86, 69, 78, 73, 78, 71, 128, 69, - 85, 82, 79, 80, 69, 65, 206, 69, 85, 82, 79, 80, 69, 45, 65, 70, 82, 73, - 67, 65, 128, 69, 85, 82, 79, 45, 67, 85, 82, 82, 69, 78, 67, 217, 69, 85, - 82, 207, 69, 85, 76, 69, 210, 69, 85, 45, 85, 128, 69, 85, 45, 79, 128, - 69, 85, 45, 69, 85, 128, 69, 85, 45, 69, 79, 128, 69, 85, 45, 69, 128, - 69, 85, 45, 65, 128, 69, 84, 88, 128, 69, 84, 78, 65, 72, 84, 65, 128, - 69, 84, 72, 69, 204, 69, 84, 69, 82, 79, 206, 69, 84, 69, 82, 78, 73, 84, - 89, 128, 69, 84, 69, 82, 78, 73, 84, 217, 69, 84, 66, 128, 69, 83, 90, - 128, 69, 83, 85, 75, 85, 85, 68, 79, 128, 69, 83, 84, 73, 77, 65, 84, 69, - 83, 128, 69, 83, 84, 73, 77, 65, 84, 69, 196, 69, 83, 72, 69, 51, 128, - 69, 83, 72, 50, 49, 128, 69, 83, 72, 49, 54, 128, 69, 83, 67, 65, 80, 69, - 128, 69, 83, 67, 128, 69, 83, 65, 128, 69, 83, 45, 84, 69, 128, 69, 83, - 45, 51, 128, 69, 83, 45, 50, 128, 69, 83, 45, 49, 128, 69, 82, 82, 79, - 82, 45, 66, 65, 82, 82, 69, 196, 69, 82, 82, 128, 69, 82, 73, 78, 50, - 128, 69, 82, 73, 78, 178, 69, 82, 71, 128, 69, 82, 65, 83, 197, 69, 81, - 85, 73, 86, 65, 76, 69, 78, 212, 69, 81, 85, 73, 76, 65, 84, 69, 82, 65, - 204, 69, 81, 85, 73, 68, 128, 69, 81, 85, 73, 65, 78, 71, 85, 76, 65, - 210, 69, 81, 85, 65, 76, 83, 128, 69, 81, 85, 65, 76, 211, 69, 81, 85, - 65, 76, 128, 69, 80, 83, 73, 76, 79, 78, 128, 69, 80, 83, 73, 76, 79, - 206, 69, 80, 79, 67, 72, 128, 69, 80, 73, 71, 82, 65, 80, 72, 73, 195, - 69, 80, 73, 68, 65, 85, 82, 69, 65, 206, 69, 80, 69, 78, 84, 72, 69, 84, - 73, 195, 69, 80, 69, 71, 69, 82, 77, 65, 128, 69, 80, 65, 67, 212, 69, - 79, 84, 128, 69, 79, 77, 128, 69, 79, 76, 72, 88, 128, 69, 79, 76, 128, - 69, 79, 72, 128, 69, 78, 89, 128, 69, 78, 86, 69, 76, 79, 80, 69, 128, - 69, 78, 86, 69, 76, 79, 80, 197, 69, 78, 85, 77, 69, 82, 65, 84, 73, 79, - 206, 69, 78, 84, 82, 89, 45, 50, 128, 69, 78, 84, 82, 89, 45, 49, 128, - 69, 78, 84, 82, 89, 128, 69, 78, 84, 82, 217, 69, 78, 84, 72, 85, 83, 73, - 65, 83, 77, 128, 69, 78, 84, 69, 82, 80, 82, 73, 83, 69, 128, 69, 78, 84, - 69, 82, 73, 78, 199, 69, 78, 84, 69, 82, 128, 69, 78, 84, 69, 210, 69, - 78, 84, 45, 83, 72, 65, 80, 69, 196, 69, 78, 81, 85, 73, 82, 89, 128, 69, - 78, 81, 128, 69, 78, 79, 211, 69, 78, 78, 73, 128, 69, 78, 78, 128, 69, - 78, 76, 65, 82, 71, 69, 77, 69, 78, 84, 128, 69, 78, 71, 73, 78, 69, 128, - 69, 78, 68, 79, 70, 79, 78, 79, 78, 128, 69, 78, 68, 73, 78, 199, 69, 78, - 68, 69, 80, 128, 69, 78, 68, 69, 65, 86, 79, 85, 82, 128, 69, 78, 67, 79, - 85, 78, 84, 69, 82, 83, 128, 69, 78, 67, 76, 79, 83, 85, 82, 69, 83, 128, - 69, 78, 67, 76, 79, 83, 85, 82, 69, 128, 69, 78, 67, 76, 79, 83, 73, 78, - 199, 69, 78, 67, 128, 69, 78, 65, 82, 88, 73, 211, 69, 78, 65, 82, 77, - 79, 78, 73, 79, 211, 69, 77, 80, 84, 217, 69, 77, 80, 72, 65, 84, 73, - 195, 69, 77, 80, 72, 65, 83, 73, 211, 69, 77, 79, 74, 201, 69, 77, 66, - 82, 79, 73, 68, 69, 82, 89, 128, 69, 77, 66, 76, 69, 77, 128, 69, 77, 66, - 69, 76, 76, 73, 83, 72, 77, 69, 78, 84, 128, 69, 77, 66, 69, 68, 68, 73, - 78, 71, 128, 69, 76, 89, 128, 69, 76, 84, 128, 69, 76, 76, 73, 80, 84, - 73, 195, 69, 76, 76, 73, 80, 83, 73, 83, 128, 69, 76, 76, 73, 80, 83, 69, - 128, 69, 76, 73, 70, 73, 128, 69, 76, 69, 86, 69, 78, 45, 84, 72, 73, 82, - 84, 89, 128, 69, 76, 69, 86, 69, 78, 128, 69, 76, 69, 86, 69, 206, 69, - 76, 69, 80, 72, 65, 78, 84, 128, 69, 76, 69, 77, 69, 78, 212, 69, 76, 69, - 67, 84, 82, 73, 67, 65, 204, 69, 76, 69, 67, 84, 82, 73, 195, 69, 76, 66, - 65, 83, 65, 206, 69, 76, 65, 77, 73, 84, 69, 128, 69, 76, 65, 77, 73, 84, - 197, 69, 76, 65, 70, 82, 79, 78, 128, 69, 75, 83, 84, 82, 69, 80, 84, 79, - 78, 128, 69, 75, 83, 128, 69, 75, 70, 79, 78, 73, 84, 73, 75, 79, 78, - 128, 69, 75, 65, 82, 65, 128, 69, 75, 65, 77, 128, 69, 74, 69, 67, 212, - 69, 73, 83, 128, 69, 73, 71, 72, 84, 89, 128, 69, 73, 71, 72, 84, 217, - 69, 73, 71, 72, 84, 72, 83, 128, 69, 73, 71, 72, 84, 72, 211, 69, 73, 71, - 72, 84, 72, 128, 69, 73, 71, 72, 84, 69, 69, 78, 128, 69, 73, 71, 72, 84, - 69, 69, 206, 69, 73, 71, 72, 84, 45, 84, 72, 73, 82, 84, 89, 128, 69, 73, - 69, 128, 69, 72, 87, 65, 218, 69, 71, 89, 80, 84, 79, 76, 79, 71, 73, 67, - 65, 204, 69, 71, 89, 128, 69, 71, 73, 82, 128, 69, 71, 71, 128, 69, 69, - 89, 65, 78, 78, 65, 128, 69, 69, 75, 65, 65, 128, 69, 69, 72, 128, 69, - 69, 66, 69, 69, 70, 73, 76, 73, 128, 69, 68, 73, 84, 79, 82, 73, 65, 204, - 69, 68, 73, 78, 128, 69, 68, 68, 128, 69, 67, 83, 128, 69, 66, 69, 70, - 73, 76, 73, 128, 69, 65, 83, 84, 69, 82, 206, 69, 65, 83, 84, 128, 69, - 65, 83, 212, 69, 65, 82, 84, 72, 76, 217, 69, 65, 82, 84, 72, 128, 69, - 65, 82, 84, 200, 69, 65, 82, 83, 128, 69, 65, 82, 76, 217, 69, 65, 77, - 72, 65, 78, 67, 72, 79, 76, 76, 128, 69, 65, 71, 76, 69, 128, 69, 65, 68, - 72, 65, 68, 72, 128, 69, 65, 66, 72, 65, 68, 72, 128, 69, 178, 69, 48, - 51, 56, 128, 69, 48, 51, 55, 128, 69, 48, 51, 54, 128, 69, 48, 51, 52, - 65, 128, 69, 48, 51, 52, 128, 69, 48, 51, 51, 128, 69, 48, 51, 50, 128, - 69, 48, 51, 49, 128, 69, 48, 51, 48, 128, 69, 48, 50, 57, 128, 69, 48, - 50, 56, 65, 128, 69, 48, 50, 56, 128, 69, 48, 50, 55, 128, 69, 48, 50, - 54, 128, 69, 48, 50, 53, 128, 69, 48, 50, 52, 128, 69, 48, 50, 51, 128, - 69, 48, 50, 50, 128, 69, 48, 50, 49, 128, 69, 48, 50, 48, 65, 128, 69, - 48, 50, 48, 128, 69, 48, 49, 57, 128, 69, 48, 49, 56, 128, 69, 48, 49, - 55, 65, 128, 69, 48, 49, 55, 128, 69, 48, 49, 54, 65, 128, 69, 48, 49, - 54, 128, 69, 48, 49, 53, 128, 69, 48, 49, 52, 128, 69, 48, 49, 51, 128, - 69, 48, 49, 50, 128, 69, 48, 49, 49, 128, 69, 48, 49, 48, 128, 69, 48, - 48, 57, 65, 128, 69, 48, 48, 57, 128, 69, 48, 48, 56, 65, 128, 69, 48, - 48, 56, 128, 69, 48, 48, 55, 128, 69, 48, 48, 54, 128, 69, 48, 48, 53, - 128, 69, 48, 48, 52, 128, 69, 48, 48, 51, 128, 69, 48, 48, 50, 128, 69, - 48, 48, 49, 128, 69, 45, 77, 65, 73, 204, 68, 90, 90, 72, 69, 128, 68, - 90, 90, 69, 128, 68, 90, 90, 65, 128, 68, 90, 89, 65, 89, 128, 68, 90, - 87, 69, 128, 68, 90, 85, 128, 68, 90, 79, 128, 68, 90, 74, 69, 128, 68, - 90, 73, 84, 65, 128, 68, 90, 73, 128, 68, 90, 72, 79, 73, 128, 68, 90, - 72, 69, 128, 68, 90, 72, 65, 128, 68, 90, 69, 76, 79, 128, 68, 90, 69, - 69, 128, 68, 90, 69, 128, 68, 90, 65, 89, 128, 68, 90, 65, 65, 128, 68, - 90, 65, 128, 68, 90, 128, 68, 218, 68, 89, 79, 128, 68, 89, 207, 68, 89, - 78, 65, 77, 73, 195, 68, 89, 69, 72, 128, 68, 89, 69, 200, 68, 89, 65, - 78, 128, 68, 87, 79, 128, 68, 87, 69, 128, 68, 87, 65, 128, 68, 86, 73, - 83, 86, 65, 82, 65, 128, 68, 86, 68, 128, 68, 86, 128, 68, 85, 84, 73, - 69, 83, 128, 68, 85, 83, 75, 128, 68, 85, 83, 72, 69, 78, 78, 65, 128, - 68, 85, 82, 65, 84, 73, 79, 78, 128, 68, 85, 82, 50, 128, 68, 85, 80, 79, - 78, 68, 73, 85, 211, 68, 85, 79, 88, 128, 68, 85, 79, 128, 68, 85, 78, - 52, 128, 68, 85, 78, 51, 128, 68, 85, 78, 179, 68, 85, 77, 128, 68, 85, - 204, 68, 85, 72, 128, 68, 85, 71, 85, 68, 128, 68, 85, 199, 68, 85, 66, - 50, 128, 68, 85, 66, 128, 68, 85, 194, 68, 82, 89, 128, 68, 82, 217, 68, - 82, 85, 77, 128, 68, 82, 85, 205, 68, 82, 79, 80, 83, 128, 68, 82, 79, - 80, 76, 69, 84, 128, 68, 82, 79, 80, 45, 83, 72, 65, 68, 79, 87, 69, 196, - 68, 82, 79, 77, 69, 68, 65, 82, 217, 68, 82, 73, 86, 69, 128, 68, 82, 73, - 86, 197, 68, 82, 73, 78, 75, 128, 68, 82, 73, 204, 68, 82, 69, 83, 83, - 128, 68, 82, 69, 65, 77, 217, 68, 82, 65, 85, 71, 72, 84, 211, 68, 82, - 65, 77, 128, 68, 82, 65, 205, 68, 82, 65, 71, 79, 78, 128, 68, 82, 65, - 71, 79, 206, 68, 82, 65, 70, 84, 73, 78, 199, 68, 82, 65, 67, 72, 77, 65, - 83, 128, 68, 82, 65, 67, 72, 77, 65, 128, 68, 82, 65, 67, 72, 77, 193, - 68, 79, 87, 78, 87, 65, 82, 68, 83, 128, 68, 79, 87, 78, 45, 80, 79, 73, - 78, 84, 73, 78, 199, 68, 79, 87, 78, 128, 68, 79, 86, 69, 128, 68, 79, - 86, 197, 68, 79, 85, 71, 72, 78, 85, 84, 128, 68, 79, 85, 66, 84, 128, - 68, 79, 85, 66, 76, 69, 196, 68, 79, 85, 66, 76, 69, 45, 76, 73, 78, 197, - 68, 79, 85, 66, 76, 69, 45, 69, 78, 68, 69, 196, 68, 79, 85, 66, 76, 69, - 128, 68, 79, 84, 84, 69, 68, 45, 80, 128, 68, 79, 84, 84, 69, 68, 45, 78, - 128, 68, 79, 84, 84, 69, 68, 45, 76, 128, 68, 79, 84, 84, 69, 68, 128, - 68, 79, 84, 84, 69, 196, 68, 79, 84, 83, 45, 56, 128, 68, 79, 84, 83, 45, - 55, 56, 128, 68, 79, 84, 83, 45, 55, 128, 68, 79, 84, 83, 45, 54, 56, - 128, 68, 79, 84, 83, 45, 54, 55, 56, 128, 68, 79, 84, 83, 45, 54, 55, - 128, 68, 79, 84, 83, 45, 54, 128, 68, 79, 84, 83, 45, 53, 56, 128, 68, - 79, 84, 83, 45, 53, 55, 56, 128, 68, 79, 84, 83, 45, 53, 55, 128, 68, 79, - 84, 83, 45, 53, 54, 56, 128, 68, 79, 84, 83, 45, 53, 54, 55, 56, 128, 68, - 79, 84, 83, 45, 53, 54, 55, 128, 68, 79, 84, 83, 45, 53, 54, 128, 68, 79, - 84, 83, 45, 53, 128, 68, 79, 84, 83, 45, 52, 56, 128, 68, 79, 84, 83, 45, - 52, 55, 56, 128, 68, 79, 84, 83, 45, 52, 55, 128, 68, 79, 84, 83, 45, 52, - 54, 56, 128, 68, 79, 84, 83, 45, 52, 54, 55, 56, 128, 68, 79, 84, 83, 45, - 52, 54, 55, 128, 68, 79, 84, 83, 45, 52, 54, 128, 68, 79, 84, 83, 45, 52, - 53, 56, 128, 68, 79, 84, 83, 45, 52, 53, 55, 56, 128, 68, 79, 84, 83, 45, - 52, 53, 55, 128, 68, 79, 84, 83, 45, 52, 53, 54, 56, 128, 68, 79, 84, 83, - 45, 52, 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 52, 53, 54, 55, 128, 68, - 79, 84, 83, 45, 52, 53, 54, 128, 68, 79, 84, 83, 45, 52, 53, 128, 68, 79, - 84, 83, 45, 52, 128, 68, 79, 84, 83, 45, 51, 56, 128, 68, 79, 84, 83, 45, - 51, 55, 56, 128, 68, 79, 84, 83, 45, 51, 55, 128, 68, 79, 84, 83, 45, 51, - 54, 56, 128, 68, 79, 84, 83, 45, 51, 54, 55, 56, 128, 68, 79, 84, 83, 45, - 51, 54, 55, 128, 68, 79, 84, 83, 45, 51, 54, 128, 68, 79, 84, 83, 45, 51, - 53, 56, 128, 68, 79, 84, 83, 45, 51, 53, 55, 56, 128, 68, 79, 84, 83, 45, - 51, 53, 55, 128, 68, 79, 84, 83, 45, 51, 53, 54, 56, 128, 68, 79, 84, 83, - 45, 51, 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 53, 54, 55, 128, 68, - 79, 84, 83, 45, 51, 53, 54, 128, 68, 79, 84, 83, 45, 51, 53, 128, 68, 79, - 84, 83, 45, 51, 52, 56, 128, 68, 79, 84, 83, 45, 51, 52, 55, 56, 128, 68, - 79, 84, 83, 45, 51, 52, 55, 128, 68, 79, 84, 83, 45, 51, 52, 54, 56, 128, - 68, 79, 84, 83, 45, 51, 52, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 52, - 54, 55, 128, 68, 79, 84, 83, 45, 51, 52, 54, 128, 68, 79, 84, 83, 45, 51, - 52, 53, 56, 128, 68, 79, 84, 83, 45, 51, 52, 53, 55, 56, 128, 68, 79, 84, - 83, 45, 51, 52, 53, 55, 128, 68, 79, 84, 83, 45, 51, 52, 53, 54, 56, 128, - 68, 79, 84, 83, 45, 51, 52, 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, - 52, 53, 54, 55, 128, 68, 79, 84, 83, 45, 51, 52, 53, 54, 128, 68, 79, 84, - 83, 45, 51, 52, 53, 128, 68, 79, 84, 83, 45, 51, 52, 128, 68, 79, 84, 83, - 45, 51, 128, 68, 79, 84, 83, 45, 50, 56, 128, 68, 79, 84, 83, 45, 50, 55, - 56, 128, 68, 79, 84, 83, 45, 50, 55, 128, 68, 79, 84, 83, 45, 50, 54, 56, + 69, 128, 72, 68, 82, 128, 72, 67, 128, 72, 66, 65, 83, 65, 45, 69, 83, + 65, 83, 193, 72, 66, 65, 83, 193, 72, 65, 89, 65, 78, 78, 65, 128, 72, + 65, 87, 74, 128, 72, 65, 86, 69, 128, 72, 65, 85, 80, 84, 83, 84, 73, 77, + 77, 69, 128, 72, 65, 213, 72, 65, 84, 82, 65, 206, 72, 65, 84, 72, 73, + 128, 72, 65, 84, 69, 128, 72, 65, 84, 67, 72, 73, 78, 199, 72, 65, 84, + 65, 198, 72, 65, 83, 69, 210, 72, 65, 83, 65, 78, 84, 65, 128, 72, 65, + 82, 80, 79, 79, 78, 128, 72, 65, 82, 80, 79, 79, 206, 72, 65, 82, 77, 79, + 78, 73, 67, 128, 72, 65, 82, 75, 76, 69, 65, 206, 72, 65, 82, 68, 78, 69, + 83, 83, 128, 72, 65, 82, 196, 72, 65, 80, 80, 217, 72, 65, 78, 85, 78, + 79, 207, 72, 65, 78, 71, 90, 72, 79, 213, 72, 65, 78, 68, 83, 72, 65, 75, + 69, 128, 72, 65, 78, 68, 83, 128, 72, 65, 78, 68, 211, 72, 65, 78, 68, + 76, 69, 83, 128, 72, 65, 78, 68, 76, 69, 128, 72, 65, 78, 68, 66, 65, 76, + 76, 128, 72, 65, 78, 68, 66, 65, 71, 128, 72, 65, 78, 68, 45, 79, 86, 65, + 76, 128, 72, 65, 78, 68, 45, 79, 86, 65, 204, 72, 65, 78, 68, 45, 72, 79, + 79, 75, 128, 72, 65, 78, 68, 45, 72, 79, 79, 203, 72, 65, 78, 68, 45, 72, + 73, 78, 71, 69, 128, 72, 65, 78, 68, 45, 72, 73, 78, 71, 197, 72, 65, 78, + 68, 45, 70, 76, 65, 84, 128, 72, 65, 78, 68, 45, 70, 76, 65, 212, 72, 65, + 78, 68, 45, 70, 73, 83, 84, 128, 72, 65, 78, 68, 45, 67, 85, 82, 76, 73, + 67, 85, 69, 128, 72, 65, 78, 68, 45, 67, 85, 82, 76, 73, 67, 85, 197, 72, + 65, 78, 68, 45, 67, 85, 80, 128, 72, 65, 78, 68, 45, 67, 85, 208, 72, 65, + 78, 68, 45, 67, 76, 65, 87, 128, 72, 65, 78, 68, 45, 67, 76, 65, 215, 72, + 65, 78, 68, 45, 67, 73, 82, 67, 76, 69, 128, 72, 65, 78, 68, 45, 67, 73, + 82, 67, 76, 197, 72, 65, 78, 68, 45, 65, 78, 71, 76, 69, 128, 72, 65, 78, + 68, 45, 65, 78, 71, 76, 197, 72, 65, 78, 68, 128, 72, 65, 78, 45, 65, 75, + 65, 84, 128, 72, 65, 77, 90, 65, 128, 72, 65, 77, 90, 193, 72, 65, 77, + 83, 84, 69, 210, 72, 65, 77, 77, 69, 82, 128, 72, 65, 77, 77, 69, 210, + 72, 65, 77, 66, 85, 82, 71, 69, 82, 128, 72, 65, 76, 81, 65, 128, 72, 65, + 76, 79, 128, 72, 65, 76, 70, 45, 67, 73, 82, 67, 76, 197, 72, 65, 76, 70, + 128, 72, 65, 76, 66, 69, 82, 68, 128, 72, 65, 76, 65, 78, 84, 65, 128, + 72, 65, 73, 84, 85, 128, 72, 65, 73, 211, 72, 65, 73, 82, 67, 85, 84, + 128, 72, 65, 73, 82, 128, 72, 65, 71, 76, 65, 218, 72, 65, 71, 76, 128, + 72, 65, 70, 85, 75, 72, 65, 128, 72, 65, 70, 85, 75, 72, 128, 72, 65, 69, + 71, 204, 72, 65, 65, 82, 85, 128, 72, 65, 65, 77, 128, 72, 65, 193, 72, + 65, 45, 72, 65, 128, 72, 48, 48, 56, 128, 72, 48, 48, 55, 128, 72, 48, + 48, 54, 65, 128, 72, 48, 48, 54, 128, 72, 48, 48, 53, 128, 72, 48, 48, + 52, 128, 72, 48, 48, 51, 128, 72, 48, 48, 50, 128, 72, 48, 48, 49, 128, + 72, 45, 84, 89, 80, 197, 71, 89, 85, 128, 71, 89, 79, 78, 128, 71, 89, + 79, 128, 71, 89, 73, 128, 71, 89, 70, 213, 71, 89, 69, 69, 128, 71, 89, + 65, 83, 128, 71, 89, 65, 65, 128, 71, 89, 65, 128, 71, 89, 128, 71, 87, + 85, 128, 71, 87, 73, 128, 71, 87, 69, 69, 128, 71, 87, 69, 128, 71, 87, + 65, 65, 128, 71, 87, 65, 128, 71, 86, 65, 78, 71, 128, 71, 86, 128, 71, + 85, 82, 85, 83, 72, 128, 71, 85, 82, 85, 78, 128, 71, 85, 82, 77, 85, 75, + 72, 201, 71, 85, 82, 65, 77, 85, 84, 79, 78, 128, 71, 85, 82, 55, 128, + 71, 85, 78, 85, 128, 71, 85, 78, 213, 71, 85, 205, 71, 85, 76, 128, 71, + 85, 74, 65, 82, 65, 84, 201, 71, 85, 73, 84, 65, 82, 128, 71, 85, 199, + 71, 85, 69, 73, 128, 71, 85, 69, 72, 128, 71, 85, 69, 200, 71, 85, 68, + 128, 71, 85, 196, 71, 85, 65, 82, 68, 83, 77, 65, 78, 128, 71, 85, 65, + 82, 68, 69, 68, 78, 69, 83, 83, 128, 71, 85, 65, 82, 68, 69, 196, 71, 85, + 65, 82, 68, 128, 71, 85, 65, 82, 65, 78, 201, 71, 85, 193, 71, 85, 178, + 71, 84, 69, 210, 71, 83, 85, 77, 128, 71, 83, 85, 205, 71, 82, 213, 71, + 82, 79, 87, 73, 78, 199, 71, 82, 79, 85, 78, 68, 128, 71, 82, 79, 78, 84, + 72, 73, 83, 77, 65, 84, 65, 128, 71, 82, 73, 78, 78, 73, 78, 199, 71, 82, + 73, 77, 65, 67, 73, 78, 199, 71, 82, 69, 71, 79, 82, 73, 65, 206, 71, 82, + 69, 69, 206, 71, 82, 69, 65, 84, 78, 69, 83, 83, 128, 71, 82, 69, 65, 84, + 69, 82, 45, 84, 72, 65, 78, 128, 71, 82, 69, 65, 84, 69, 82, 45, 84, 72, + 65, 206, 71, 82, 69, 65, 84, 69, 210, 71, 82, 69, 65, 212, 71, 82, 65, + 86, 69, 89, 65, 82, 196, 71, 82, 65, 86, 69, 45, 77, 65, 67, 82, 79, 78, + 128, 71, 82, 65, 86, 69, 45, 65, 67, 85, 84, 69, 45, 71, 82, 65, 86, 69, + 128, 71, 82, 65, 86, 197, 71, 82, 65, 84, 69, 82, 128, 71, 82, 65, 83, + 83, 128, 71, 82, 65, 83, 211, 71, 82, 65, 83, 208, 71, 82, 65, 80, 72, + 69, 77, 197, 71, 82, 65, 80, 69, 83, 128, 71, 82, 65, 78, 84, 72, 193, + 71, 82, 65, 77, 77, 193, 71, 82, 65, 73, 78, 128, 71, 82, 65, 68, 85, 65, + 84, 73, 79, 206, 71, 82, 65, 68, 85, 65, 76, 128, 71, 82, 65, 67, 69, + 128, 71, 82, 65, 67, 197, 71, 80, 65, 128, 71, 79, 82, 84, 72, 77, 73, + 75, 79, 206, 71, 79, 82, 84, 128, 71, 79, 82, 73, 76, 76, 65, 128, 71, + 79, 82, 71, 79, 84, 69, 82, 73, 128, 71, 79, 82, 71, 79, 83, 89, 78, 84, + 72, 69, 84, 79, 78, 128, 71, 79, 82, 71, 79, 206, 71, 79, 82, 71, 73, + 128, 71, 79, 82, 65, 128, 71, 79, 79, 196, 71, 79, 78, 71, 128, 71, 79, + 76, 70, 69, 82, 128, 71, 79, 76, 68, 128, 71, 79, 75, 128, 71, 79, 73, + 78, 199, 71, 79, 66, 76, 73, 78, 128, 71, 79, 65, 76, 128, 71, 79, 65, + 204, 71, 79, 65, 128, 71, 78, 89, 73, 83, 128, 71, 78, 65, 86, 73, 89, + 65, 78, 73, 128, 71, 76, 79, 87, 73, 78, 199, 71, 76, 79, 86, 69, 128, + 71, 76, 79, 84, 84, 65, 204, 71, 76, 79, 66, 197, 71, 76, 73, 83, 83, 65, + 78, 68, 207, 71, 76, 69, 73, 67, 200, 71, 76, 65, 71, 79, 76, 73, 128, + 71, 76, 65, 128, 71, 74, 69, 128, 71, 73, 88, 128, 71, 73, 84, 128, 71, + 73, 83, 72, 128, 71, 73, 83, 200, 71, 73, 83, 65, 76, 128, 71, 73, 82, + 85, 68, 65, 65, 128, 71, 73, 82, 76, 211, 71, 73, 82, 76, 128, 71, 73, + 82, 51, 128, 71, 73, 82, 179, 71, 73, 82, 50, 128, 71, 73, 82, 178, 71, + 73, 80, 128, 71, 73, 78, 73, 73, 128, 71, 73, 77, 69, 76, 128, 71, 73, + 77, 69, 204, 71, 73, 77, 128, 71, 73, 71, 65, 128, 71, 73, 71, 128, 71, + 73, 69, 84, 128, 71, 73, 68, 73, 77, 128, 71, 73, 66, 66, 79, 85, 211, + 71, 73, 66, 65, 128, 71, 73, 52, 128, 71, 73, 180, 71, 72, 90, 128, 71, + 72, 87, 65, 128, 71, 72, 85, 78, 78, 65, 128, 71, 72, 85, 78, 78, 193, + 71, 72, 85, 128, 71, 72, 79, 85, 128, 71, 72, 79, 83, 84, 128, 71, 72, + 79, 128, 71, 72, 73, 77, 69, 76, 128, 71, 72, 73, 128, 71, 72, 72, 65, + 128, 71, 72, 69, 89, 83, 128, 71, 72, 69, 85, 88, 128, 71, 72, 69, 85, + 78, 128, 71, 72, 69, 85, 71, 72, 69, 85, 65, 69, 77, 128, 71, 72, 69, 85, + 71, 72, 69, 78, 128, 71, 72, 69, 85, 65, 69, 82, 65, 69, 128, 71, 72, 69, + 85, 65, 69, 71, 72, 69, 85, 65, 69, 128, 71, 72, 69, 84, 128, 71, 72, 69, + 69, 128, 71, 72, 69, 128, 71, 72, 197, 71, 72, 65, 89, 78, 128, 71, 72, + 65, 82, 65, 69, 128, 71, 72, 65, 80, 128, 71, 72, 65, 78, 128, 71, 72, + 65, 77, 77, 65, 128, 71, 72, 65, 77, 65, 76, 128, 71, 72, 65, 73, 78, 85, + 128, 71, 72, 65, 73, 78, 128, 71, 72, 65, 73, 206, 71, 72, 65, 68, 128, + 71, 72, 65, 65, 77, 65, 69, 128, 71, 72, 65, 65, 128, 71, 71, 87, 73, + 128, 71, 71, 87, 69, 69, 128, 71, 71, 87, 69, 128, 71, 71, 87, 65, 65, + 128, 71, 71, 87, 65, 128, 71, 71, 85, 88, 128, 71, 71, 85, 84, 128, 71, + 71, 85, 82, 88, 128, 71, 71, 85, 82, 128, 71, 71, 85, 79, 88, 128, 71, + 71, 85, 79, 84, 128, 71, 71, 85, 79, 80, 128, 71, 71, 85, 79, 128, 71, + 71, 79, 88, 128, 71, 71, 79, 84, 128, 71, 71, 79, 80, 128, 71, 71, 73, + 88, 128, 71, 71, 73, 84, 128, 71, 71, 73, 69, 88, 128, 71, 71, 73, 69, + 80, 128, 71, 71, 73, 69, 128, 71, 71, 69, 88, 128, 71, 71, 69, 84, 128, + 71, 71, 69, 80, 128, 71, 71, 65, 88, 128, 71, 71, 65, 84, 128, 71, 69, + 84, 193, 71, 69, 83, 84, 85, 82, 69, 128, 71, 69, 83, 72, 85, 128, 71, + 69, 83, 72, 84, 73, 78, 128, 71, 69, 83, 72, 84, 73, 206, 71, 69, 83, 72, + 50, 128, 71, 69, 82, 83, 72, 65, 89, 73, 77, 128, 71, 69, 82, 77, 65, + 206, 71, 69, 82, 69, 83, 72, 128, 71, 69, 82, 69, 83, 200, 71, 69, 79, + 77, 69, 84, 82, 73, 67, 65, 76, 76, 217, 71, 69, 79, 77, 69, 84, 82, 73, + 195, 71, 69, 78, 84, 76, 197, 71, 69, 78, 73, 84, 73, 86, 69, 128, 71, + 69, 78, 73, 75, 201, 71, 69, 78, 69, 82, 73, 195, 71, 69, 77, 73, 78, 73, + 128, 71, 69, 77, 73, 78, 65, 84, 73, 79, 206, 71, 69, 77, 73, 78, 65, 84, + 197, 71, 69, 205, 71, 69, 69, 77, 128, 71, 69, 68, 79, 76, 65, 128, 71, + 69, 68, 69, 128, 71, 69, 66, 207, 71, 69, 66, 193, 71, 69, 65, 82, 128, + 71, 69, 65, 210, 71, 69, 50, 50, 128, 71, 68, 65, 78, 128, 71, 67, 73, + 71, 128, 71, 67, 65, 206, 71, 66, 79, 78, 128, 71, 66, 73, 69, 197, 71, + 66, 69, 85, 88, 128, 71, 66, 69, 84, 128, 71, 66, 65, 89, 73, 128, 71, + 66, 65, 75, 85, 82, 85, 78, 69, 78, 128, 71, 66, 128, 71, 65, 89, 65, 78, + 85, 75, 73, 84, 84, 65, 128, 71, 65, 89, 65, 78, 78, 65, 128, 71, 65, 89, + 128, 71, 65, 85, 78, 84, 76, 69, 84, 128, 71, 65, 84, 72, 69, 82, 73, 78, + 71, 128, 71, 65, 84, 72, 69, 82, 73, 78, 199, 71, 65, 84, 69, 128, 71, + 65, 83, 72, 65, 78, 128, 71, 65, 82, 83, 72, 85, 78, 73, 128, 71, 65, 82, + 79, 78, 128, 71, 65, 82, 77, 69, 78, 84, 128, 71, 65, 82, 68, 69, 78, + 128, 71, 65, 82, 51, 128, 71, 65, 80, 80, 69, 196, 71, 65, 208, 71, 65, + 78, 77, 65, 128, 71, 65, 78, 71, 73, 65, 128, 71, 65, 78, 68, 193, 71, + 65, 78, 50, 128, 71, 65, 78, 178, 71, 65, 77, 77, 65, 128, 71, 65, 77, + 76, 65, 128, 71, 65, 77, 76, 128, 71, 65, 77, 69, 128, 71, 65, 77, 197, + 71, 65, 77, 65, 78, 128, 71, 65, 77, 65, 76, 128, 71, 65, 77, 65, 204, + 71, 65, 71, 128, 71, 65, 70, 128, 71, 65, 198, 71, 65, 69, 84, 84, 65, + 45, 80, 73, 76, 76, 65, 128, 71, 65, 68, 79, 76, 128, 71, 65, 68, 128, + 71, 65, 196, 71, 65, 66, 65, 128, 71, 65, 66, 193, 71, 65, 65, 70, 85, + 128, 71, 65, 178, 71, 48, 53, 52, 128, 71, 48, 53, 51, 128, 71, 48, 53, + 50, 128, 71, 48, 53, 49, 128, 71, 48, 53, 48, 128, 71, 48, 52, 57, 128, + 71, 48, 52, 56, 128, 71, 48, 52, 55, 128, 71, 48, 52, 54, 128, 71, 48, + 52, 53, 65, 128, 71, 48, 52, 53, 128, 71, 48, 52, 52, 128, 71, 48, 52, + 51, 65, 128, 71, 48, 52, 51, 128, 71, 48, 52, 50, 128, 71, 48, 52, 49, + 128, 71, 48, 52, 48, 128, 71, 48, 51, 57, 128, 71, 48, 51, 56, 128, 71, + 48, 51, 55, 65, 128, 71, 48, 51, 55, 128, 71, 48, 51, 54, 65, 128, 71, + 48, 51, 54, 128, 71, 48, 51, 53, 128, 71, 48, 51, 52, 128, 71, 48, 51, + 51, 128, 71, 48, 51, 50, 128, 71, 48, 51, 49, 128, 71, 48, 51, 48, 128, + 71, 48, 50, 57, 128, 71, 48, 50, 56, 128, 71, 48, 50, 55, 128, 71, 48, + 50, 54, 65, 128, 71, 48, 50, 54, 128, 71, 48, 50, 53, 128, 71, 48, 50, + 52, 128, 71, 48, 50, 51, 128, 71, 48, 50, 50, 128, 71, 48, 50, 49, 128, + 71, 48, 50, 48, 65, 128, 71, 48, 50, 48, 128, 71, 48, 49, 57, 128, 71, + 48, 49, 56, 128, 71, 48, 49, 55, 128, 71, 48, 49, 54, 128, 71, 48, 49, + 53, 128, 71, 48, 49, 52, 128, 71, 48, 49, 51, 128, 71, 48, 49, 50, 128, + 71, 48, 49, 49, 65, 128, 71, 48, 49, 49, 128, 71, 48, 49, 48, 128, 71, + 48, 48, 57, 128, 71, 48, 48, 56, 128, 71, 48, 48, 55, 66, 128, 71, 48, + 48, 55, 65, 128, 71, 48, 48, 55, 128, 71, 48, 48, 54, 65, 128, 71, 48, + 48, 54, 128, 71, 48, 48, 53, 128, 71, 48, 48, 52, 128, 71, 48, 48, 51, + 128, 71, 48, 48, 50, 128, 71, 48, 48, 49, 128, 70, 89, 88, 128, 70, 89, + 84, 128, 70, 89, 80, 128, 70, 89, 65, 128, 70, 87, 73, 128, 70, 87, 69, + 69, 128, 70, 87, 69, 128, 70, 87, 65, 65, 128, 70, 87, 65, 128, 70, 86, + 83, 51, 128, 70, 86, 83, 50, 128, 70, 86, 83, 49, 128, 70, 85, 88, 128, + 70, 85, 84, 128, 70, 85, 83, 69, 128, 70, 85, 83, 193, 70, 85, 82, 88, + 128, 70, 85, 80, 128, 70, 85, 78, 69, 82, 65, 204, 70, 85, 78, 67, 84, + 73, 79, 78, 65, 204, 70, 85, 78, 67, 84, 73, 79, 78, 128, 70, 85, 76, 76, + 78, 69, 83, 83, 128, 70, 85, 76, 204, 70, 85, 74, 73, 128, 70, 85, 69, + 84, 128, 70, 85, 69, 204, 70, 85, 69, 128, 70, 85, 65, 128, 70, 84, 72, + 79, 82, 193, 70, 83, 73, 128, 70, 82, 79, 87, 78, 73, 78, 71, 128, 70, + 82, 79, 87, 78, 73, 78, 199, 70, 82, 79, 87, 78, 128, 70, 82, 79, 87, + 206, 70, 82, 79, 78, 84, 45, 84, 73, 76, 84, 69, 196, 70, 82, 79, 78, 84, + 45, 70, 65, 67, 73, 78, 199, 70, 82, 79, 78, 212, 70, 82, 79, 205, 70, + 82, 79, 71, 128, 70, 82, 79, 199, 70, 82, 73, 84, 85, 128, 70, 82, 73, + 69, 83, 128, 70, 82, 73, 69, 196, 70, 82, 73, 67, 65, 84, 73, 86, 69, + 128, 70, 82, 69, 84, 66, 79, 65, 82, 68, 128, 70, 82, 69, 78, 67, 200, + 70, 82, 69, 69, 128, 70, 82, 69, 197, 70, 82, 65, 78, 75, 211, 70, 82, + 65, 78, 195, 70, 82, 65, 77, 69, 83, 128, 70, 82, 65, 77, 69, 128, 70, + 82, 65, 77, 197, 70, 82, 65, 71, 82, 65, 78, 84, 128, 70, 82, 65, 71, 77, + 69, 78, 84, 128, 70, 82, 65, 67, 84, 73, 79, 206, 70, 79, 88, 128, 70, + 79, 216, 70, 79, 85, 82, 84, 69, 69, 78, 128, 70, 79, 85, 82, 84, 69, 69, + 206, 70, 79, 85, 82, 45, 84, 72, 73, 82, 84, 89, 128, 70, 79, 85, 82, 45, + 83, 84, 82, 73, 78, 199, 70, 79, 85, 82, 45, 80, 69, 82, 45, 69, 205, 70, + 79, 85, 82, 45, 76, 73, 78, 197, 70, 79, 85, 210, 70, 79, 85, 78, 84, 65, + 73, 78, 128, 70, 79, 85, 78, 84, 65, 73, 206, 70, 79, 83, 84, 69, 82, 73, + 78, 71, 128, 70, 79, 82, 87, 65, 82, 68, 128, 70, 79, 82, 87, 65, 82, + 196, 70, 79, 82, 84, 89, 128, 70, 79, 82, 84, 217, 70, 79, 82, 84, 73, + 69, 84, 72, 128, 70, 79, 82, 84, 69, 128, 70, 79, 82, 77, 211, 70, 79, + 82, 77, 65, 84, 84, 73, 78, 71, 128, 70, 79, 82, 77, 65, 212, 70, 79, 82, + 75, 69, 196, 70, 79, 82, 69, 72, 69, 65, 196, 70, 79, 82, 67, 69, 83, + 128, 70, 79, 82, 67, 69, 128, 70, 79, 80, 128, 70, 79, 79, 84, 83, 84, + 79, 79, 76, 128, 70, 79, 79, 84, 80, 82, 73, 78, 84, 83, 128, 70, 79, 79, + 84, 78, 79, 84, 197, 70, 79, 79, 84, 66, 65, 76, 76, 128, 70, 79, 79, 84, + 128, 70, 79, 79, 76, 128, 70, 79, 79, 68, 128, 70, 79, 79, 128, 70, 79, + 78, 212, 70, 79, 78, 71, 77, 65, 78, 128, 70, 79, 77, 128, 70, 79, 76, + 76, 89, 128, 70, 79, 76, 76, 79, 87, 73, 78, 71, 128, 70, 79, 76, 68, 69, + 82, 128, 70, 79, 76, 68, 69, 196, 70, 79, 71, 71, 89, 128, 70, 79, 71, + 128, 70, 207, 70, 77, 128, 70, 76, 89, 73, 78, 199, 70, 76, 89, 128, 70, + 76, 85, 84, 84, 69, 82, 73, 78, 71, 128, 70, 76, 85, 84, 84, 69, 82, 73, + 78, 199, 70, 76, 85, 84, 69, 128, 70, 76, 85, 83, 72, 69, 196, 70, 76, + 79, 87, 73, 78, 199, 70, 76, 79, 87, 69, 82, 83, 128, 70, 76, 79, 87, 69, + 210, 70, 76, 79, 85, 82, 73, 83, 72, 128, 70, 76, 79, 82, 69, 84, 84, 69, + 128, 70, 76, 79, 82, 65, 204, 70, 76, 79, 80, 80, 217, 70, 76, 79, 79, + 82, 128, 70, 76, 79, 79, 210, 70, 76, 73, 80, 128, 70, 76, 73, 71, 72, + 84, 128, 70, 76, 73, 67, 203, 70, 76, 69, 88, 85, 83, 128, 70, 76, 69, + 88, 69, 196, 70, 76, 69, 88, 128, 70, 76, 69, 85, 82, 79, 78, 128, 70, + 76, 69, 85, 82, 45, 68, 69, 45, 76, 73, 83, 128, 70, 76, 65, 84, 84, 69, + 78, 69, 196, 70, 76, 65, 84, 78, 69, 83, 83, 128, 70, 76, 65, 84, 66, 82, + 69, 65, 68, 128, 70, 76, 65, 83, 72, 128, 70, 76, 65, 71, 83, 128, 70, + 76, 65, 71, 45, 53, 128, 70, 76, 65, 71, 45, 52, 128, 70, 76, 65, 71, 45, + 51, 128, 70, 76, 65, 71, 45, 50, 128, 70, 76, 65, 71, 45, 49, 128, 70, + 76, 65, 71, 128, 70, 76, 65, 199, 70, 76, 65, 128, 70, 76, 128, 70, 73, + 88, 69, 68, 45, 70, 79, 82, 205, 70, 73, 88, 128, 70, 73, 86, 69, 45, 84, + 72, 73, 82, 84, 89, 128, 70, 73, 86, 69, 45, 76, 73, 78, 197, 70, 73, 86, + 197, 70, 73, 84, 90, 80, 65, 84, 82, 73, 67, 203, 70, 73, 84, 65, 128, + 70, 73, 84, 128, 70, 73, 83, 84, 69, 196, 70, 73, 83, 72, 73, 78, 199, + 70, 73, 83, 72, 72, 79, 79, 75, 128, 70, 73, 83, 72, 72, 79, 79, 203, 70, + 73, 83, 72, 69, 89, 69, 128, 70, 73, 83, 72, 128, 70, 73, 83, 200, 70, + 73, 82, 83, 212, 70, 73, 82, 73, 128, 70, 73, 82, 69, 87, 79, 82, 75, 83, + 128, 70, 73, 82, 69, 87, 79, 82, 203, 70, 73, 82, 69, 128, 70, 73, 82, + 197, 70, 73, 80, 128, 70, 73, 78, 73, 84, 197, 70, 73, 78, 71, 69, 82, + 83, 128, 70, 73, 78, 71, 69, 82, 211, 70, 73, 78, 71, 69, 82, 78, 65, 73, + 76, 83, 128, 70, 73, 78, 71, 69, 82, 69, 196, 70, 73, 78, 71, 69, 82, 45, + 80, 79, 83, 212, 70, 73, 78, 71, 69, 82, 128, 70, 73, 78, 71, 69, 210, + 70, 73, 78, 65, 78, 67, 73, 65, 76, 128, 70, 73, 78, 65, 76, 128, 70, 73, + 76, 205, 70, 73, 76, 76, 69, 82, 45, 50, 128, 70, 73, 76, 76, 69, 82, 45, + 49, 128, 70, 73, 76, 76, 69, 82, 128, 70, 73, 76, 76, 69, 196, 70, 73, + 76, 76, 128, 70, 73, 76, 204, 70, 73, 76, 197, 70, 73, 73, 128, 70, 73, + 71, 85, 82, 69, 45, 51, 128, 70, 73, 71, 85, 82, 69, 45, 50, 128, 70, 73, + 71, 85, 82, 69, 45, 49, 128, 70, 73, 71, 85, 82, 197, 70, 73, 71, 72, 84, + 128, 70, 73, 70, 84, 89, 128, 70, 73, 70, 84, 217, 70, 73, 70, 84, 72, + 83, 128, 70, 73, 70, 84, 72, 128, 70, 73, 70, 84, 69, 69, 78, 128, 70, + 73, 70, 84, 69, 69, 206, 70, 73, 69, 76, 68, 128, 70, 73, 69, 76, 196, + 70, 72, 84, 79, 82, 193, 70, 70, 76, 128, 70, 70, 73, 128, 70, 69, 85, + 88, 128, 70, 69, 85, 70, 69, 85, 65, 69, 84, 128, 70, 69, 83, 84, 73, 86, + 65, 76, 128, 70, 69, 82, 82, 89, 128, 70, 69, 82, 82, 73, 211, 70, 69, + 82, 77, 65, 84, 65, 128, 70, 69, 82, 77, 65, 84, 193, 70, 69, 79, 200, + 70, 69, 78, 199, 70, 69, 78, 67, 69, 82, 128, 70, 69, 78, 67, 69, 128, + 70, 69, 77, 73, 78, 73, 78, 197, 70, 69, 77, 65, 76, 69, 128, 70, 69, 77, + 65, 76, 197, 70, 69, 76, 76, 79, 87, 83, 72, 73, 80, 128, 70, 69, 73, + 128, 70, 69, 72, 213, 70, 69, 72, 128, 70, 69, 200, 70, 69, 69, 78, 71, + 128, 70, 69, 69, 77, 128, 70, 69, 69, 68, 128, 70, 69, 69, 196, 70, 69, + 69, 128, 70, 69, 66, 82, 85, 65, 82, 89, 128, 70, 69, 65, 84, 72, 69, 82, + 128, 70, 69, 65, 84, 72, 69, 210, 70, 69, 65, 82, 78, 128, 70, 69, 65, + 82, 70, 85, 204, 70, 69, 65, 82, 128, 70, 65, 89, 65, 78, 78, 65, 128, + 70, 65, 89, 128, 70, 65, 88, 128, 70, 65, 216, 70, 65, 84, 73, 71, 85, + 69, 128, 70, 65, 84, 72, 69, 82, 128, 70, 65, 84, 72, 69, 210, 70, 65, + 84, 72, 65, 84, 65, 78, 128, 70, 65, 84, 72, 65, 84, 65, 206, 70, 65, 84, + 72, 65, 128, 70, 65, 84, 72, 193, 70, 65, 84, 128, 70, 65, 83, 84, 128, + 70, 65, 82, 83, 201, 70, 65, 82, 128, 70, 65, 81, 128, 70, 65, 80, 128, + 70, 65, 78, 71, 128, 70, 65, 78, 69, 82, 79, 83, 73, 211, 70, 65, 78, + 128, 70, 65, 77, 73, 76, 89, 128, 70, 65, 77, 128, 70, 65, 76, 76, 69, + 206, 70, 65, 74, 128, 70, 65, 73, 76, 85, 82, 69, 128, 70, 65, 73, 72, + 85, 128, 70, 65, 73, 66, 128, 70, 65, 72, 82, 69, 78, 72, 69, 73, 84, + 128, 70, 65, 67, 84, 79, 82, 89, 128, 70, 65, 67, 84, 79, 210, 70, 65, + 67, 83, 73, 77, 73, 76, 197, 70, 65, 67, 73, 78, 71, 83, 128, 70, 65, 67, + 69, 45, 54, 128, 70, 65, 67, 69, 45, 53, 128, 70, 65, 67, 69, 45, 52, + 128, 70, 65, 67, 69, 45, 51, 128, 70, 65, 67, 69, 45, 50, 128, 70, 65, + 67, 69, 45, 49, 128, 70, 65, 65, 77, 65, 69, 128, 70, 65, 65, 73, 128, + 70, 65, 65, 70, 85, 128, 70, 48, 53, 51, 128, 70, 48, 53, 50, 128, 70, + 48, 53, 49, 67, 128, 70, 48, 53, 49, 66, 128, 70, 48, 53, 49, 65, 128, + 70, 48, 53, 49, 128, 70, 48, 53, 48, 128, 70, 48, 52, 57, 128, 70, 48, + 52, 56, 128, 70, 48, 52, 55, 65, 128, 70, 48, 52, 55, 128, 70, 48, 52, + 54, 65, 128, 70, 48, 52, 54, 128, 70, 48, 52, 53, 65, 128, 70, 48, 52, + 53, 128, 70, 48, 52, 52, 128, 70, 48, 52, 51, 128, 70, 48, 52, 50, 128, + 70, 48, 52, 49, 128, 70, 48, 52, 48, 128, 70, 48, 51, 57, 128, 70, 48, + 51, 56, 65, 128, 70, 48, 51, 56, 128, 70, 48, 51, 55, 65, 128, 70, 48, + 51, 55, 128, 70, 48, 51, 54, 128, 70, 48, 51, 53, 128, 70, 48, 51, 52, + 128, 70, 48, 51, 51, 128, 70, 48, 51, 50, 128, 70, 48, 51, 49, 65, 128, + 70, 48, 51, 49, 128, 70, 48, 51, 48, 128, 70, 48, 50, 57, 128, 70, 48, + 50, 56, 128, 70, 48, 50, 55, 128, 70, 48, 50, 54, 128, 70, 48, 50, 53, + 128, 70, 48, 50, 52, 128, 70, 48, 50, 51, 128, 70, 48, 50, 50, 128, 70, + 48, 50, 49, 65, 128, 70, 48, 50, 49, 128, 70, 48, 50, 48, 128, 70, 48, + 49, 57, 128, 70, 48, 49, 56, 128, 70, 48, 49, 55, 128, 70, 48, 49, 54, + 128, 70, 48, 49, 53, 128, 70, 48, 49, 52, 128, 70, 48, 49, 51, 65, 128, + 70, 48, 49, 51, 128, 70, 48, 49, 50, 128, 70, 48, 49, 49, 128, 70, 48, + 49, 48, 128, 70, 48, 48, 57, 128, 70, 48, 48, 56, 128, 70, 48, 48, 55, + 128, 70, 48, 48, 54, 128, 70, 48, 48, 53, 128, 70, 48, 48, 52, 128, 70, + 48, 48, 51, 128, 70, 48, 48, 50, 128, 70, 48, 48, 49, 65, 128, 70, 48, + 48, 49, 128, 69, 90, 83, 128, 69, 90, 200, 69, 90, 69, 78, 128, 69, 90, + 69, 206, 69, 90, 128, 69, 89, 89, 89, 128, 69, 89, 69, 83, 128, 69, 89, + 69, 211, 69, 89, 69, 76, 65, 83, 72, 69, 211, 69, 89, 69, 71, 76, 65, 83, + 83, 69, 83, 128, 69, 89, 69, 71, 65, 90, 69, 45, 87, 65, 76, 76, 80, 76, + 65, 78, 197, 69, 89, 69, 71, 65, 90, 69, 45, 70, 76, 79, 79, 82, 80, 76, + 65, 78, 197, 69, 89, 69, 66, 82, 79, 87, 211, 69, 89, 197, 69, 89, 66, + 69, 89, 70, 73, 76, 73, 128, 69, 89, 65, 78, 78, 65, 128, 69, 88, 84, 82, + 69, 77, 69, 76, 217, 69, 88, 84, 82, 65, 84, 69, 82, 82, 69, 83, 84, 82, + 73, 65, 204, 69, 88, 84, 82, 65, 45, 76, 79, 215, 69, 88, 84, 82, 65, 45, + 72, 73, 71, 200, 69, 88, 84, 82, 193, 69, 88, 84, 69, 78, 83, 73, 79, 78, + 128, 69, 88, 84, 69, 78, 68, 69, 68, 128, 69, 88, 84, 69, 78, 68, 69, + 196, 69, 88, 80, 82, 69, 83, 83, 73, 79, 78, 76, 69, 83, 211, 69, 88, 80, + 79, 78, 69, 78, 212, 69, 88, 79, 128, 69, 88, 207, 69, 88, 73, 83, 84, + 83, 128, 69, 88, 73, 83, 84, 128, 69, 88, 72, 65, 85, 83, 84, 73, 79, 78, + 128, 69, 88, 72, 65, 76, 69, 128, 69, 88, 67, 76, 65, 77, 65, 84, 73, 79, + 78, 128, 69, 88, 67, 76, 65, 77, 65, 84, 73, 79, 206, 69, 88, 67, 73, 84, + 69, 77, 69, 78, 84, 128, 69, 88, 67, 72, 65, 78, 71, 69, 128, 69, 88, 67, + 69, 83, 83, 128, 69, 88, 67, 69, 76, 76, 69, 78, 84, 128, 69, 87, 69, + 128, 69, 86, 69, 82, 217, 69, 86, 69, 82, 71, 82, 69, 69, 206, 69, 86, + 69, 78, 73, 78, 71, 128, 69, 85, 82, 79, 80, 69, 65, 206, 69, 85, 82, 79, + 80, 69, 45, 65, 70, 82, 73, 67, 65, 128, 69, 85, 82, 79, 45, 67, 85, 82, + 82, 69, 78, 67, 217, 69, 85, 82, 207, 69, 85, 76, 69, 210, 69, 85, 45, + 85, 128, 69, 85, 45, 79, 128, 69, 85, 45, 69, 85, 128, 69, 85, 45, 69, + 79, 128, 69, 85, 45, 69, 128, 69, 85, 45, 65, 128, 69, 84, 88, 128, 69, + 84, 78, 65, 72, 84, 65, 128, 69, 84, 72, 69, 204, 69, 84, 69, 82, 79, + 206, 69, 84, 69, 82, 78, 73, 84, 89, 128, 69, 84, 69, 82, 78, 73, 84, + 217, 69, 84, 66, 128, 69, 83, 90, 128, 69, 83, 85, 75, 85, 85, 68, 79, + 128, 69, 83, 84, 73, 77, 65, 84, 69, 83, 128, 69, 83, 84, 73, 77, 65, 84, + 69, 196, 69, 83, 72, 69, 51, 128, 69, 83, 72, 50, 49, 128, 69, 83, 72, + 49, 54, 128, 69, 83, 67, 65, 80, 69, 128, 69, 83, 67, 128, 69, 83, 65, + 128, 69, 83, 45, 84, 69, 128, 69, 83, 45, 51, 128, 69, 83, 45, 50, 128, + 69, 83, 45, 49, 128, 69, 82, 82, 79, 82, 45, 66, 65, 82, 82, 69, 196, 69, + 82, 82, 128, 69, 82, 73, 78, 50, 128, 69, 82, 73, 78, 178, 69, 82, 71, + 128, 69, 82, 65, 83, 197, 69, 81, 85, 73, 86, 65, 76, 69, 78, 212, 69, + 81, 85, 73, 76, 65, 84, 69, 82, 65, 204, 69, 81, 85, 73, 68, 128, 69, 81, + 85, 73, 65, 78, 71, 85, 76, 65, 210, 69, 81, 85, 65, 76, 83, 128, 69, 81, + 85, 65, 76, 211, 69, 81, 85, 65, 76, 128, 69, 80, 83, 73, 76, 79, 78, + 128, 69, 80, 83, 73, 76, 79, 206, 69, 80, 79, 67, 72, 128, 69, 80, 73, + 71, 82, 65, 80, 72, 73, 195, 69, 80, 73, 68, 65, 85, 82, 69, 65, 206, 69, + 80, 69, 78, 84, 72, 69, 84, 73, 195, 69, 80, 69, 71, 69, 82, 77, 65, 128, + 69, 80, 65, 67, 212, 69, 79, 84, 128, 69, 79, 77, 128, 69, 79, 76, 72, + 88, 128, 69, 79, 76, 128, 69, 79, 72, 128, 69, 78, 89, 128, 69, 78, 86, + 69, 76, 79, 80, 69, 128, 69, 78, 86, 69, 76, 79, 80, 197, 69, 78, 85, 77, + 69, 82, 65, 84, 73, 79, 206, 69, 78, 84, 82, 89, 45, 50, 128, 69, 78, 84, + 82, 89, 45, 49, 128, 69, 78, 84, 82, 89, 128, 69, 78, 84, 82, 217, 69, + 78, 84, 72, 85, 83, 73, 65, 83, 77, 128, 69, 78, 84, 69, 82, 80, 82, 73, + 83, 69, 128, 69, 78, 84, 69, 82, 73, 78, 199, 69, 78, 84, 69, 82, 128, + 69, 78, 84, 69, 210, 69, 78, 84, 45, 83, 72, 65, 80, 69, 196, 69, 78, 81, + 85, 73, 82, 89, 128, 69, 78, 81, 128, 69, 78, 79, 211, 69, 78, 78, 73, + 128, 69, 78, 78, 128, 69, 78, 76, 65, 82, 71, 69, 77, 69, 78, 84, 128, + 69, 78, 71, 73, 78, 69, 128, 69, 78, 68, 79, 70, 79, 78, 79, 78, 128, 69, + 78, 68, 73, 78, 199, 69, 78, 68, 69, 80, 128, 69, 78, 68, 69, 65, 86, 79, + 85, 82, 128, 69, 78, 67, 79, 85, 78, 84, 69, 82, 83, 128, 69, 78, 67, 76, + 79, 83, 85, 82, 69, 83, 128, 69, 78, 67, 76, 79, 83, 85, 82, 69, 128, 69, + 78, 67, 76, 79, 83, 73, 78, 199, 69, 78, 67, 128, 69, 78, 65, 82, 88, 73, + 211, 69, 78, 65, 82, 77, 79, 78, 73, 79, 211, 69, 77, 80, 84, 217, 69, + 77, 80, 72, 65, 84, 73, 195, 69, 77, 80, 72, 65, 83, 73, 211, 69, 77, 79, + 74, 201, 69, 77, 66, 82, 79, 73, 68, 69, 82, 89, 128, 69, 77, 66, 76, 69, + 77, 128, 69, 77, 66, 69, 76, 76, 73, 83, 72, 77, 69, 78, 84, 128, 69, 77, + 66, 69, 68, 68, 73, 78, 71, 128, 69, 76, 89, 128, 69, 76, 84, 128, 69, + 76, 76, 73, 80, 84, 73, 195, 69, 76, 76, 73, 80, 83, 73, 83, 128, 69, 76, + 76, 73, 80, 83, 69, 128, 69, 76, 73, 70, 73, 128, 69, 76, 69, 86, 69, 78, + 45, 84, 72, 73, 82, 84, 89, 128, 69, 76, 69, 86, 69, 78, 128, 69, 76, 69, + 86, 69, 206, 69, 76, 69, 80, 72, 65, 78, 84, 128, 69, 76, 69, 77, 69, 78, + 212, 69, 76, 69, 67, 84, 82, 73, 67, 65, 204, 69, 76, 69, 67, 84, 82, 73, + 195, 69, 76, 66, 65, 83, 65, 206, 69, 76, 65, 77, 73, 84, 69, 128, 69, + 76, 65, 77, 73, 84, 197, 69, 76, 65, 70, 82, 79, 78, 128, 69, 75, 83, 84, + 82, 69, 80, 84, 79, 78, 128, 69, 75, 83, 128, 69, 75, 70, 79, 78, 73, 84, + 73, 75, 79, 78, 128, 69, 75, 65, 82, 65, 128, 69, 75, 65, 77, 128, 69, + 74, 69, 67, 212, 69, 73, 83, 128, 69, 73, 71, 72, 84, 89, 128, 69, 73, + 71, 72, 84, 217, 69, 73, 71, 72, 84, 73, 69, 84, 72, 83, 128, 69, 73, 71, + 72, 84, 72, 83, 128, 69, 73, 71, 72, 84, 72, 211, 69, 73, 71, 72, 84, 72, + 128, 69, 73, 71, 72, 84, 69, 69, 78, 128, 69, 73, 71, 72, 84, 69, 69, + 206, 69, 73, 71, 72, 84, 45, 84, 72, 73, 82, 84, 89, 128, 69, 73, 69, + 128, 69, 72, 87, 65, 218, 69, 72, 84, 83, 65, 128, 69, 72, 84, 65, 128, + 69, 72, 80, 65, 128, 69, 72, 75, 65, 128, 69, 72, 67, 72, 65, 128, 69, + 71, 89, 80, 84, 79, 76, 79, 71, 73, 67, 65, 204, 69, 71, 89, 128, 69, 71, + 73, 82, 128, 69, 71, 71, 128, 69, 69, 89, 65, 78, 78, 65, 128, 69, 69, + 75, 65, 65, 128, 69, 69, 72, 128, 69, 69, 66, 69, 69, 70, 73, 76, 73, + 128, 69, 68, 73, 84, 79, 82, 73, 65, 204, 69, 68, 73, 78, 128, 69, 68, + 68, 128, 69, 67, 83, 128, 69, 66, 69, 70, 73, 76, 73, 128, 69, 65, 83, + 84, 69, 82, 206, 69, 65, 83, 84, 128, 69, 65, 83, 212, 69, 65, 82, 84, + 72, 76, 217, 69, 65, 82, 84, 72, 128, 69, 65, 82, 84, 200, 69, 65, 82, + 83, 128, 69, 65, 82, 76, 217, 69, 65, 77, 72, 65, 78, 67, 72, 79, 76, 76, + 128, 69, 65, 71, 76, 69, 128, 69, 65, 68, 72, 65, 68, 72, 128, 69, 65, + 66, 72, 65, 68, 72, 128, 69, 178, 69, 48, 51, 56, 128, 69, 48, 51, 55, + 128, 69, 48, 51, 54, 128, 69, 48, 51, 52, 65, 128, 69, 48, 51, 52, 128, + 69, 48, 51, 51, 128, 69, 48, 51, 50, 128, 69, 48, 51, 49, 128, 69, 48, + 51, 48, 128, 69, 48, 50, 57, 128, 69, 48, 50, 56, 65, 128, 69, 48, 50, + 56, 128, 69, 48, 50, 55, 128, 69, 48, 50, 54, 128, 69, 48, 50, 53, 128, + 69, 48, 50, 52, 128, 69, 48, 50, 51, 128, 69, 48, 50, 50, 128, 69, 48, + 50, 49, 128, 69, 48, 50, 48, 65, 128, 69, 48, 50, 48, 128, 69, 48, 49, + 57, 128, 69, 48, 49, 56, 128, 69, 48, 49, 55, 65, 128, 69, 48, 49, 55, + 128, 69, 48, 49, 54, 65, 128, 69, 48, 49, 54, 128, 69, 48, 49, 53, 128, + 69, 48, 49, 52, 128, 69, 48, 49, 51, 128, 69, 48, 49, 50, 128, 69, 48, + 49, 49, 128, 69, 48, 49, 48, 128, 69, 48, 48, 57, 65, 128, 69, 48, 48, + 57, 128, 69, 48, 48, 56, 65, 128, 69, 48, 48, 56, 128, 69, 48, 48, 55, + 128, 69, 48, 48, 54, 128, 69, 48, 48, 53, 128, 69, 48, 48, 52, 128, 69, + 48, 48, 51, 128, 69, 48, 48, 50, 128, 69, 48, 48, 49, 128, 69, 45, 77, + 65, 73, 204, 68, 90, 90, 72, 69, 128, 68, 90, 90, 69, 128, 68, 90, 90, + 65, 128, 68, 90, 89, 65, 89, 128, 68, 90, 87, 69, 128, 68, 90, 85, 128, + 68, 90, 79, 128, 68, 90, 74, 69, 128, 68, 90, 73, 84, 65, 128, 68, 90, + 73, 128, 68, 90, 72, 79, 73, 128, 68, 90, 72, 69, 128, 68, 90, 72, 65, + 128, 68, 90, 69, 76, 79, 128, 68, 90, 69, 69, 128, 68, 90, 69, 128, 68, + 90, 65, 89, 128, 68, 90, 65, 65, 128, 68, 90, 65, 128, 68, 90, 128, 68, + 218, 68, 89, 79, 128, 68, 89, 207, 68, 89, 78, 65, 77, 73, 195, 68, 89, + 69, 72, 128, 68, 89, 69, 200, 68, 89, 65, 78, 128, 68, 87, 79, 128, 68, + 87, 69, 128, 68, 87, 65, 128, 68, 86, 73, 83, 86, 65, 82, 65, 128, 68, + 86, 68, 128, 68, 86, 128, 68, 85, 84, 73, 69, 83, 128, 68, 85, 83, 75, + 128, 68, 85, 83, 72, 69, 78, 78, 65, 128, 68, 85, 82, 65, 84, 73, 79, 78, + 128, 68, 85, 82, 50, 128, 68, 85, 80, 79, 78, 68, 73, 85, 211, 68, 85, + 79, 88, 128, 68, 85, 79, 128, 68, 85, 78, 52, 128, 68, 85, 78, 51, 128, + 68, 85, 78, 179, 68, 85, 77, 128, 68, 85, 204, 68, 85, 72, 128, 68, 85, + 71, 85, 68, 128, 68, 85, 199, 68, 85, 67, 75, 128, 68, 85, 66, 50, 128, + 68, 85, 66, 128, 68, 85, 194, 68, 82, 89, 128, 68, 82, 217, 68, 82, 85, + 77, 83, 84, 73, 67, 75, 83, 128, 68, 82, 85, 77, 128, 68, 82, 85, 205, + 68, 82, 79, 80, 83, 128, 68, 82, 79, 80, 76, 69, 84, 128, 68, 82, 79, 80, + 45, 83, 72, 65, 68, 79, 87, 69, 196, 68, 82, 79, 79, 76, 73, 78, 199, 68, + 82, 79, 77, 69, 68, 65, 82, 217, 68, 82, 73, 86, 69, 128, 68, 82, 73, 86, + 197, 68, 82, 73, 78, 75, 128, 68, 82, 73, 204, 68, 82, 69, 83, 83, 128, + 68, 82, 69, 65, 77, 217, 68, 82, 65, 85, 71, 72, 84, 211, 68, 82, 65, 77, + 128, 68, 82, 65, 205, 68, 82, 65, 71, 79, 78, 128, 68, 82, 65, 71, 79, + 206, 68, 82, 65, 70, 84, 73, 78, 199, 68, 82, 65, 67, 72, 77, 65, 83, + 128, 68, 82, 65, 67, 72, 77, 65, 128, 68, 82, 65, 67, 72, 77, 193, 68, + 79, 87, 78, 87, 65, 82, 68, 83, 128, 68, 79, 87, 78, 45, 80, 79, 73, 78, + 84, 73, 78, 199, 68, 79, 87, 78, 128, 68, 79, 86, 69, 128, 68, 79, 86, + 197, 68, 79, 85, 71, 72, 78, 85, 84, 128, 68, 79, 85, 66, 84, 128, 68, + 79, 85, 66, 76, 69, 196, 68, 79, 85, 66, 76, 69, 45, 76, 73, 78, 197, 68, + 79, 85, 66, 76, 69, 45, 69, 78, 68, 69, 196, 68, 79, 85, 66, 76, 69, 128, + 68, 79, 84, 84, 69, 68, 45, 80, 128, 68, 79, 84, 84, 69, 68, 45, 78, 128, + 68, 79, 84, 84, 69, 68, 45, 76, 128, 68, 79, 84, 84, 69, 68, 128, 68, 79, + 84, 84, 69, 196, 68, 79, 84, 83, 45, 56, 128, 68, 79, 84, 83, 45, 55, 56, + 128, 68, 79, 84, 83, 45, 55, 128, 68, 79, 84, 83, 45, 54, 56, 128, 68, + 79, 84, 83, 45, 54, 55, 56, 128, 68, 79, 84, 83, 45, 54, 55, 128, 68, 79, + 84, 83, 45, 54, 128, 68, 79, 84, 83, 45, 53, 56, 128, 68, 79, 84, 83, 45, + 53, 55, 56, 128, 68, 79, 84, 83, 45, 53, 55, 128, 68, 79, 84, 83, 45, 53, + 54, 56, 128, 68, 79, 84, 83, 45, 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, + 53, 54, 55, 128, 68, 79, 84, 83, 45, 53, 54, 128, 68, 79, 84, 83, 45, 53, + 128, 68, 79, 84, 83, 45, 52, 56, 128, 68, 79, 84, 83, 45, 52, 55, 56, + 128, 68, 79, 84, 83, 45, 52, 55, 128, 68, 79, 84, 83, 45, 52, 54, 56, + 128, 68, 79, 84, 83, 45, 52, 54, 55, 56, 128, 68, 79, 84, 83, 45, 52, 54, + 55, 128, 68, 79, 84, 83, 45, 52, 54, 128, 68, 79, 84, 83, 45, 52, 53, 56, + 128, 68, 79, 84, 83, 45, 52, 53, 55, 56, 128, 68, 79, 84, 83, 45, 52, 53, + 55, 128, 68, 79, 84, 83, 45, 52, 53, 54, 56, 128, 68, 79, 84, 83, 45, 52, + 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 52, 53, 54, 55, 128, 68, 79, 84, + 83, 45, 52, 53, 54, 128, 68, 79, 84, 83, 45, 52, 53, 128, 68, 79, 84, 83, + 45, 52, 128, 68, 79, 84, 83, 45, 51, 56, 128, 68, 79, 84, 83, 45, 51, 55, + 56, 128, 68, 79, 84, 83, 45, 51, 55, 128, 68, 79, 84, 83, 45, 51, 54, 56, + 128, 68, 79, 84, 83, 45, 51, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 54, + 55, 128, 68, 79, 84, 83, 45, 51, 54, 128, 68, 79, 84, 83, 45, 51, 53, 56, + 128, 68, 79, 84, 83, 45, 51, 53, 55, 56, 128, 68, 79, 84, 83, 45, 51, 53, + 55, 128, 68, 79, 84, 83, 45, 51, 53, 54, 56, 128, 68, 79, 84, 83, 45, 51, + 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 53, 54, 55, 128, 68, 79, 84, + 83, 45, 51, 53, 54, 128, 68, 79, 84, 83, 45, 51, 53, 128, 68, 79, 84, 83, + 45, 51, 52, 56, 128, 68, 79, 84, 83, 45, 51, 52, 55, 56, 128, 68, 79, 84, + 83, 45, 51, 52, 55, 128, 68, 79, 84, 83, 45, 51, 52, 54, 56, 128, 68, 79, + 84, 83, 45, 51, 52, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 52, 54, 55, + 128, 68, 79, 84, 83, 45, 51, 52, 54, 128, 68, 79, 84, 83, 45, 51, 52, 53, + 56, 128, 68, 79, 84, 83, 45, 51, 52, 53, 55, 56, 128, 68, 79, 84, 83, 45, + 51, 52, 53, 55, 128, 68, 79, 84, 83, 45, 51, 52, 53, 54, 56, 128, 68, 79, + 84, 83, 45, 51, 52, 53, 54, 55, 56, 128, 68, 79, 84, 83, 45, 51, 52, 53, + 54, 55, 128, 68, 79, 84, 83, 45, 51, 52, 53, 54, 128, 68, 79, 84, 83, 45, + 51, 52, 53, 128, 68, 79, 84, 83, 45, 51, 52, 128, 68, 79, 84, 83, 45, 51, + 128, 68, 79, 84, 83, 45, 50, 56, 128, 68, 79, 84, 83, 45, 50, 55, 56, + 128, 68, 79, 84, 83, 45, 50, 55, 128, 68, 79, 84, 83, 45, 50, 54, 56, 128, 68, 79, 84, 83, 45, 50, 54, 55, 56, 128, 68, 79, 84, 83, 45, 50, 54, 55, 128, 68, 79, 84, 83, 45, 50, 54, 128, 68, 79, 84, 83, 45, 50, 53, 56, 128, 68, 79, 84, 83, 45, 50, 53, 55, 56, 128, 68, 79, 84, 83, 45, 50, 53, @@ -4286,263 +4324,854 @@ static unsigned char lexicon[] = { 71, 128, 68, 79, 78, 71, 128, 68, 79, 77, 65, 73, 206, 68, 79, 76, 80, 72, 73, 78, 128, 68, 79, 76, 76, 83, 128, 68, 79, 76, 76, 65, 210, 68, 79, 76, 73, 85, 77, 128, 68, 79, 75, 77, 65, 73, 128, 68, 79, 73, 84, - 128, 68, 79, 73, 128, 68, 79, 71, 128, 68, 79, 199, 68, 79, 69, 211, 68, - 79, 68, 69, 75, 65, 84, 65, 128, 68, 79, 67, 85, 77, 69, 78, 84, 128, 68, - 79, 67, 85, 77, 69, 78, 212, 68, 79, 66, 82, 79, 128, 68, 79, 65, 67, 72, - 65, 83, 72, 77, 69, 69, 128, 68, 79, 65, 67, 72, 65, 83, 72, 77, 69, 197, - 68, 79, 65, 128, 68, 79, 45, 79, 128, 68, 77, 128, 68, 205, 68, 76, 85, - 128, 68, 76, 79, 128, 68, 76, 73, 128, 68, 76, 72, 89, 65, 128, 68, 76, - 72, 65, 128, 68, 76, 69, 69, 128, 68, 76, 65, 128, 68, 76, 128, 68, 75, - 65, 82, 128, 68, 75, 65, 210, 68, 74, 69, 82, 86, 73, 128, 68, 74, 69, - 82, 86, 128, 68, 74, 69, 128, 68, 74, 65, 128, 68, 73, 90, 90, 217, 68, - 73, 86, 79, 82, 67, 197, 68, 73, 86, 73, 83, 73, 79, 78, 128, 68, 73, 86, - 73, 83, 73, 79, 206, 68, 73, 86, 73, 78, 65, 84, 73, 79, 78, 128, 68, 73, - 86, 73, 68, 69, 83, 128, 68, 73, 86, 73, 68, 69, 82, 83, 128, 68, 73, 86, - 73, 68, 69, 82, 128, 68, 73, 86, 73, 68, 69, 196, 68, 73, 86, 73, 68, 69, - 128, 68, 73, 86, 73, 68, 197, 68, 73, 86, 69, 82, 71, 69, 78, 67, 69, - 128, 68, 73, 84, 84, 207, 68, 73, 83, 84, 79, 82, 84, 73, 79, 78, 128, - 68, 73, 83, 84, 73, 78, 71, 85, 73, 83, 72, 128, 68, 73, 83, 84, 73, 76, - 76, 128, 68, 73, 83, 83, 79, 76, 86, 69, 45, 50, 128, 68, 73, 83, 83, 79, - 76, 86, 69, 128, 68, 73, 83, 80, 69, 82, 83, 73, 79, 78, 128, 68, 73, 83, - 75, 128, 68, 73, 83, 73, 77, 79, 85, 128, 68, 73, 83, 72, 128, 68, 73, - 83, 67, 79, 78, 84, 73, 78, 85, 79, 85, 211, 68, 73, 83, 195, 68, 73, 83, - 65, 80, 80, 79, 73, 78, 84, 69, 196, 68, 73, 83, 65, 66, 76, 69, 196, 68, - 73, 82, 71, 193, 68, 73, 82, 69, 67, 84, 76, 217, 68, 73, 82, 69, 67, 84, - 73, 79, 78, 65, 204, 68, 73, 82, 69, 67, 84, 73, 79, 206, 68, 73, 80, 84, - 69, 128, 68, 73, 80, 80, 69, 82, 128, 68, 73, 80, 76, 79, 85, 78, 128, - 68, 73, 80, 76, 73, 128, 68, 73, 80, 76, 201, 68, 73, 78, 71, 66, 65, - 212, 68, 73, 206, 68, 73, 77, 77, 73, 78, 71, 128, 68, 73, 77, 73, 78, - 85, 84, 73, 79, 78, 45, 51, 128, 68, 73, 77, 73, 78, 85, 84, 73, 79, 78, - 45, 50, 128, 68, 73, 77, 73, 78, 85, 84, 73, 79, 78, 45, 49, 128, 68, 73, - 77, 73, 78, 73, 83, 72, 77, 69, 78, 84, 128, 68, 73, 77, 73, 68, 73, 193, - 68, 73, 77, 69, 78, 83, 73, 79, 78, 65, 204, 68, 73, 77, 69, 78, 83, 73, - 79, 206, 68, 73, 77, 50, 128, 68, 73, 77, 178, 68, 73, 76, 128, 68, 73, - 71, 82, 65, 80, 72, 128, 68, 73, 71, 82, 65, 80, 200, 68, 73, 71, 82, 65, - 77, 77, 79, 211, 68, 73, 71, 82, 65, 77, 77, 193, 68, 73, 71, 82, 65, - 205, 68, 73, 71, 79, 82, 71, 79, 78, 128, 68, 73, 71, 79, 82, 71, 79, - 206, 68, 73, 71, 73, 84, 83, 128, 68, 73, 71, 65, 77, 77, 65, 128, 68, - 73, 71, 193, 68, 73, 70, 84, 79, 71, 71, 79, 211, 68, 73, 70, 79, 78, 73, - 65, 83, 128, 68, 73, 70, 70, 73, 67, 85, 76, 84, 217, 68, 73, 70, 70, 73, - 67, 85, 76, 84, 73, 69, 83, 128, 68, 73, 70, 70, 69, 82, 69, 78, 84, 73, - 65, 76, 128, 68, 73, 70, 70, 69, 82, 69, 78, 67, 197, 68, 73, 70, 65, 84, - 128, 68, 73, 69, 83, 73, 83, 128, 68, 73, 69, 83, 73, 211, 68, 73, 69, - 83, 69, 204, 68, 73, 69, 80, 128, 68, 73, 197, 68, 73, 66, 128, 68, 73, - 65, 84, 79, 78, 79, 206, 68, 73, 65, 84, 79, 78, 73, 75, 201, 68, 73, 65, - 83, 84, 79, 76, 201, 68, 73, 65, 77, 79, 78, 68, 83, 128, 68, 73, 65, 77, - 79, 78, 68, 128, 68, 73, 65, 77, 79, 78, 196, 68, 73, 65, 77, 69, 84, 69, - 210, 68, 73, 65, 76, 89, 84, 73, 75, 65, 128, 68, 73, 65, 76, 89, 84, 73, - 75, 193, 68, 73, 65, 76, 69, 67, 84, 45, 208, 68, 73, 65, 71, 79, 78, 65, - 76, 128, 68, 73, 65, 69, 82, 69, 83, 73, 90, 69, 196, 68, 73, 65, 69, 82, - 69, 83, 73, 83, 45, 82, 73, 78, 71, 128, 68, 73, 65, 69, 82, 69, 83, 73, - 83, 128, 68, 73, 65, 69, 82, 69, 83, 73, 211, 68, 72, 79, 85, 128, 68, - 72, 79, 79, 128, 68, 72, 79, 128, 68, 72, 73, 73, 128, 68, 72, 73, 128, - 68, 72, 72, 85, 128, 68, 72, 72, 79, 79, 128, 68, 72, 72, 79, 128, 68, - 72, 72, 73, 128, 68, 72, 72, 69, 69, 128, 68, 72, 72, 69, 128, 68, 72, - 72, 65, 128, 68, 72, 69, 69, 128, 68, 72, 65, 82, 77, 65, 128, 68, 72, - 65, 77, 69, 68, 72, 128, 68, 72, 65, 76, 69, 84, 72, 128, 68, 72, 65, 76, - 65, 84, 72, 128, 68, 72, 65, 76, 128, 68, 72, 65, 68, 72, 69, 128, 68, - 72, 65, 65, 76, 85, 128, 68, 72, 65, 65, 128, 68, 72, 65, 128, 68, 69, - 90, 200, 68, 69, 89, 84, 69, 82, 79, 213, 68, 69, 89, 84, 69, 82, 79, - 211, 68, 69, 88, 73, 65, 128, 68, 69, 86, 73, 67, 197, 68, 69, 86, 69, - 76, 79, 80, 77, 69, 78, 84, 128, 68, 69, 85, 78, 71, 128, 68, 69, 83, 75, - 84, 79, 208, 68, 69, 83, 203, 68, 69, 83, 73, 71, 78, 128, 68, 69, 83, - 73, 128, 68, 69, 83, 69, 82, 84, 128, 68, 69, 83, 69, 82, 212, 68, 69, - 83, 69, 82, 69, 212, 68, 69, 83, 67, 82, 73, 80, 84, 73, 79, 206, 68, 69, - 83, 67, 69, 78, 68, 73, 78, 199, 68, 69, 83, 67, 69, 78, 68, 69, 82, 128, - 68, 69, 82, 69, 84, 45, 72, 73, 68, 69, 84, 128, 68, 69, 82, 69, 84, 128, - 68, 69, 82, 69, 76, 73, 67, 212, 68, 69, 80, 84, 72, 128, 68, 69, 80, 65, - 82, 84, 85, 82, 69, 128, 68, 69, 80, 65, 82, 84, 77, 69, 78, 212, 68, 69, - 80, 65, 82, 84, 73, 78, 199, 68, 69, 78, 84, 73, 83, 84, 82, 217, 68, 69, - 78, 84, 65, 204, 68, 69, 78, 79, 77, 73, 78, 65, 84, 79, 82, 128, 68, 69, - 78, 79, 77, 73, 78, 65, 84, 79, 210, 68, 69, 78, 78, 69, 78, 128, 68, 69, - 78, 71, 128, 68, 69, 78, 197, 68, 69, 78, 65, 82, 73, 85, 211, 68, 69, - 76, 84, 65, 128, 68, 69, 76, 84, 193, 68, 69, 76, 84, 128, 68, 69, 76, - 80, 72, 73, 195, 68, 69, 76, 73, 86, 69, 82, 217, 68, 69, 76, 73, 86, 69, - 82, 65, 78, 67, 69, 128, 68, 69, 76, 73, 77, 73, 84, 69, 82, 128, 68, 69, - 76, 73, 77, 73, 84, 69, 210, 68, 69, 76, 73, 67, 73, 79, 85, 211, 68, 69, - 76, 69, 84, 69, 128, 68, 69, 76, 69, 84, 197, 68, 69, 75, 65, 128, 68, - 69, 75, 128, 68, 69, 73, 128, 68, 69, 72, 73, 128, 68, 69, 71, 82, 69, - 69, 83, 128, 68, 69, 71, 82, 69, 197, 68, 69, 70, 73, 78, 73, 84, 73, 79, - 78, 128, 68, 69, 70, 69, 67, 84, 73, 86, 69, 78, 69, 83, 211, 68, 69, 69, - 82, 128, 68, 69, 69, 80, 76, 89, 128, 68, 69, 69, 76, 128, 68, 69, 67, - 82, 69, 83, 67, 69, 78, 68, 79, 128, 68, 69, 67, 82, 69, 65, 83, 69, 128, - 68, 69, 67, 82, 69, 65, 83, 197, 68, 69, 67, 79, 82, 65, 84, 73, 86, 197, - 68, 69, 67, 79, 82, 65, 84, 73, 79, 78, 128, 68, 69, 67, 73, 83, 73, 86, - 69, 78, 69, 83, 83, 128, 68, 69, 67, 73, 77, 65, 204, 68, 69, 67, 73, 68, - 85, 79, 85, 211, 68, 69, 67, 69, 77, 66, 69, 82, 128, 68, 69, 67, 65, 89, - 69, 68, 128, 68, 69, 66, 73, 212, 68, 69, 65, 84, 72, 128, 68, 69, 65, - 68, 128, 68, 68, 87, 65, 128, 68, 68, 85, 88, 128, 68, 68, 85, 84, 128, - 68, 68, 85, 82, 88, 128, 68, 68, 85, 82, 128, 68, 68, 85, 80, 128, 68, - 68, 85, 79, 88, 128, 68, 68, 85, 79, 80, 128, 68, 68, 85, 79, 128, 68, - 68, 85, 128, 68, 68, 79, 88, 128, 68, 68, 79, 84, 128, 68, 68, 79, 80, - 128, 68, 68, 79, 65, 128, 68, 68, 73, 88, 128, 68, 68, 73, 84, 128, 68, - 68, 73, 80, 128, 68, 68, 73, 69, 88, 128, 68, 68, 73, 69, 80, 128, 68, - 68, 73, 69, 128, 68, 68, 73, 128, 68, 68, 72, 85, 128, 68, 68, 72, 79, - 128, 68, 68, 72, 73, 128, 68, 68, 72, 69, 69, 128, 68, 68, 72, 69, 128, - 68, 68, 72, 65, 65, 128, 68, 68, 72, 65, 128, 68, 68, 69, 88, 128, 68, - 68, 69, 80, 128, 68, 68, 69, 69, 128, 68, 68, 69, 128, 68, 68, 68, 72, - 65, 128, 68, 68, 68, 65, 128, 68, 68, 65, 89, 65, 78, 78, 65, 128, 68, - 68, 65, 88, 128, 68, 68, 65, 84, 128, 68, 68, 65, 80, 128, 68, 68, 65, - 76, 128, 68, 68, 65, 204, 68, 68, 65, 72, 65, 76, 128, 68, 68, 65, 72, - 65, 204, 68, 68, 65, 65, 128, 68, 67, 83, 128, 68, 67, 72, 69, 128, 68, - 67, 52, 128, 68, 67, 51, 128, 68, 67, 50, 128, 68, 67, 49, 128, 68, 194, - 68, 65, 89, 45, 78, 73, 71, 72, 84, 128, 68, 65, 217, 68, 65, 87, 66, - 128, 68, 65, 86, 73, 89, 65, 78, 73, 128, 68, 65, 86, 73, 68, 128, 68, - 65, 84, 197, 68, 65, 83, 73, 65, 128, 68, 65, 83, 73, 193, 68, 65, 83, - 72, 69, 196, 68, 65, 83, 72, 128, 68, 65, 83, 200, 68, 65, 83, 69, 73, - 65, 128, 68, 65, 82, 84, 128, 68, 65, 82, 75, 69, 78, 73, 78, 71, 128, - 68, 65, 82, 75, 69, 78, 73, 78, 199, 68, 65, 82, 203, 68, 65, 82, 71, 65, - 128, 68, 65, 82, 65, 52, 128, 68, 65, 82, 65, 51, 128, 68, 65, 82, 128, - 68, 65, 80, 45, 80, 82, 65, 205, 68, 65, 80, 45, 80, 73, 201, 68, 65, 80, - 45, 77, 85, 79, 217, 68, 65, 80, 45, 66, 85, 79, 206, 68, 65, 80, 45, 66, - 69, 201, 68, 65, 208, 68, 65, 78, 84, 65, 74, 193, 68, 65, 78, 71, 79, - 128, 68, 65, 78, 71, 128, 68, 65, 78, 199, 68, 65, 78, 68, 65, 128, 68, - 65, 78, 67, 69, 82, 128, 68, 65, 77, 80, 128, 68, 65, 77, 208, 68, 65, - 77, 77, 65, 84, 65, 78, 128, 68, 65, 77, 77, 65, 84, 65, 206, 68, 65, 77, - 77, 65, 128, 68, 65, 77, 77, 193, 68, 65, 77, 65, 82, 85, 128, 68, 65, - 76, 69, 84, 72, 45, 82, 69, 83, 72, 128, 68, 65, 76, 69, 84, 72, 128, 68, - 65, 76, 69, 84, 128, 68, 65, 76, 69, 212, 68, 65, 76, 68, 65, 128, 68, - 65, 76, 65, 84, 72, 128, 68, 65, 76, 65, 84, 200, 68, 65, 76, 65, 84, - 128, 68, 65, 73, 82, 128, 68, 65, 73, 78, 71, 128, 68, 65, 73, 128, 68, - 65, 72, 89, 65, 65, 85, 83, 72, 45, 50, 128, 68, 65, 72, 89, 65, 65, 85, - 83, 72, 128, 68, 65, 71, 83, 128, 68, 65, 71, 71, 69, 82, 128, 68, 65, - 71, 71, 69, 210, 68, 65, 71, 69, 83, 72, 128, 68, 65, 71, 69, 83, 200, - 68, 65, 71, 66, 65, 83, 73, 78, 78, 65, 128, 68, 65, 71, 65, 218, 68, 65, - 71, 65, 76, 71, 65, 128, 68, 65, 71, 51, 128, 68, 65, 199, 68, 65, 69, - 78, 71, 128, 68, 65, 69, 199, 68, 65, 68, 128, 68, 65, 196, 68, 65, 65, - 83, 85, 128, 68, 65, 65, 68, 72, 85, 128, 68, 48, 54, 55, 72, 128, 68, - 48, 54, 55, 71, 128, 68, 48, 54, 55, 70, 128, 68, 48, 54, 55, 69, 128, - 68, 48, 54, 55, 68, 128, 68, 48, 54, 55, 67, 128, 68, 48, 54, 55, 66, - 128, 68, 48, 54, 55, 65, 128, 68, 48, 54, 55, 128, 68, 48, 54, 54, 128, - 68, 48, 54, 53, 128, 68, 48, 54, 52, 128, 68, 48, 54, 51, 128, 68, 48, - 54, 50, 128, 68, 48, 54, 49, 128, 68, 48, 54, 48, 128, 68, 48, 53, 57, - 128, 68, 48, 53, 56, 128, 68, 48, 53, 55, 128, 68, 48, 53, 54, 128, 68, - 48, 53, 53, 128, 68, 48, 53, 52, 65, 128, 68, 48, 53, 52, 128, 68, 48, - 53, 51, 128, 68, 48, 53, 50, 65, 128, 68, 48, 53, 50, 128, 68, 48, 53, - 49, 128, 68, 48, 53, 48, 73, 128, 68, 48, 53, 48, 72, 128, 68, 48, 53, - 48, 71, 128, 68, 48, 53, 48, 70, 128, 68, 48, 53, 48, 69, 128, 68, 48, - 53, 48, 68, 128, 68, 48, 53, 48, 67, 128, 68, 48, 53, 48, 66, 128, 68, - 48, 53, 48, 65, 128, 68, 48, 53, 48, 128, 68, 48, 52, 57, 128, 68, 48, - 52, 56, 65, 128, 68, 48, 52, 56, 128, 68, 48, 52, 55, 128, 68, 48, 52, - 54, 65, 128, 68, 48, 52, 54, 128, 68, 48, 52, 53, 128, 68, 48, 52, 52, - 128, 68, 48, 52, 51, 128, 68, 48, 52, 50, 128, 68, 48, 52, 49, 128, 68, - 48, 52, 48, 128, 68, 48, 51, 57, 128, 68, 48, 51, 56, 128, 68, 48, 51, - 55, 128, 68, 48, 51, 54, 128, 68, 48, 51, 53, 128, 68, 48, 51, 52, 65, - 128, 68, 48, 51, 52, 128, 68, 48, 51, 51, 128, 68, 48, 51, 50, 128, 68, - 48, 51, 49, 65, 128, 68, 48, 51, 49, 128, 68, 48, 51, 48, 128, 68, 48, - 50, 57, 128, 68, 48, 50, 56, 128, 68, 48, 50, 55, 65, 128, 68, 48, 50, - 55, 128, 68, 48, 50, 54, 128, 68, 48, 50, 53, 128, 68, 48, 50, 52, 128, - 68, 48, 50, 51, 128, 68, 48, 50, 50, 128, 68, 48, 50, 49, 128, 68, 48, - 50, 48, 128, 68, 48, 49, 57, 128, 68, 48, 49, 56, 128, 68, 48, 49, 55, - 128, 68, 48, 49, 54, 128, 68, 48, 49, 53, 128, 68, 48, 49, 52, 128, 68, - 48, 49, 51, 128, 68, 48, 49, 50, 128, 68, 48, 49, 49, 128, 68, 48, 49, - 48, 128, 68, 48, 48, 57, 128, 68, 48, 48, 56, 65, 128, 68, 48, 48, 56, - 128, 68, 48, 48, 55, 128, 68, 48, 48, 54, 128, 68, 48, 48, 53, 128, 68, - 48, 48, 52, 128, 68, 48, 48, 51, 128, 68, 48, 48, 50, 128, 68, 48, 48, - 49, 128, 67, 89, 88, 128, 67, 89, 84, 128, 67, 89, 82, 88, 128, 67, 89, - 82, 69, 78, 65, 73, 195, 67, 89, 82, 128, 67, 89, 80, 82, 73, 79, 212, - 67, 89, 80, 69, 82, 85, 83, 128, 67, 89, 80, 128, 67, 89, 76, 73, 78, 68, - 82, 73, 67, 73, 84, 89, 128, 67, 89, 67, 76, 79, 78, 69, 128, 67, 89, 65, - 89, 128, 67, 89, 65, 87, 128, 67, 89, 65, 128, 67, 87, 79, 79, 128, 67, - 87, 79, 128, 67, 87, 73, 73, 128, 67, 87, 73, 128, 67, 87, 69, 79, 82, - 84, 72, 128, 67, 87, 69, 128, 67, 87, 65, 65, 128, 67, 85, 88, 128, 67, - 85, 85, 128, 67, 85, 212, 67, 85, 83, 84, 79, 77, 83, 128, 67, 85, 83, - 84, 79, 77, 69, 210, 67, 85, 83, 84, 65, 82, 68, 128, 67, 85, 83, 80, - 128, 67, 85, 82, 88, 128, 67, 85, 82, 86, 73, 78, 199, 67, 85, 82, 86, - 69, 68, 128, 67, 85, 82, 86, 69, 196, 67, 85, 82, 86, 69, 128, 67, 85, - 82, 86, 197, 67, 85, 82, 82, 217, 67, 85, 82, 82, 69, 78, 84, 128, 67, - 85, 82, 82, 69, 78, 212, 67, 85, 82, 76, 217, 67, 85, 82, 76, 128, 67, - 85, 82, 128, 67, 85, 80, 80, 69, 68, 128, 67, 85, 80, 80, 69, 196, 67, - 85, 79, 88, 128, 67, 85, 79, 80, 128, 67, 85, 79, 128, 67, 85, 205, 67, - 85, 66, 69, 68, 128, 67, 85, 66, 197, 67, 85, 65, 84, 82, 73, 76, 76, 79, - 128, 67, 85, 65, 84, 82, 73, 76, 76, 207, 67, 85, 65, 205, 67, 85, 128, - 67, 83, 73, 128, 67, 82, 89, 83, 84, 65, 204, 67, 82, 89, 80, 84, 79, 71, - 82, 65, 77, 77, 73, 195, 67, 82, 89, 73, 78, 199, 67, 82, 85, 90, 69, 73, - 82, 207, 67, 82, 85, 67, 73, 70, 79, 82, 205, 67, 82, 85, 67, 73, 66, 76, - 69, 45, 53, 128, 67, 82, 85, 67, 73, 66, 76, 69, 45, 52, 128, 67, 82, 85, - 67, 73, 66, 76, 69, 45, 51, 128, 67, 82, 85, 67, 73, 66, 76, 69, 45, 50, - 128, 67, 82, 85, 67, 73, 66, 76, 69, 128, 67, 82, 79, 87, 78, 128, 67, - 82, 79, 83, 83, 73, 78, 71, 128, 67, 82, 79, 83, 83, 73, 78, 199, 67, 82, - 79, 83, 83, 72, 65, 84, 67, 200, 67, 82, 79, 83, 83, 69, 68, 45, 84, 65, - 73, 76, 128, 67, 82, 79, 83, 83, 69, 68, 128, 67, 82, 79, 83, 83, 69, - 196, 67, 82, 79, 83, 83, 66, 79, 78, 69, 83, 128, 67, 82, 79, 83, 83, - 128, 67, 82, 79, 83, 211, 67, 82, 79, 80, 128, 67, 82, 79, 73, 88, 128, - 67, 82, 79, 67, 85, 211, 67, 82, 79, 67, 79, 68, 73, 76, 69, 128, 67, 82, - 73, 67, 75, 69, 212, 67, 82, 69, 83, 67, 69, 78, 84, 83, 128, 67, 82, 69, - 83, 67, 69, 78, 84, 128, 67, 82, 69, 83, 67, 69, 78, 212, 67, 82, 69, 68, - 73, 212, 67, 82, 69, 65, 84, 73, 86, 197, 67, 82, 69, 65, 77, 128, 67, - 82, 65, 89, 79, 78, 128, 67, 82, 65, 67, 75, 69, 82, 128, 67, 82, 65, 66, - 128, 67, 82, 128, 67, 79, 88, 128, 67, 79, 87, 128, 67, 79, 215, 67, 79, - 86, 69, 82, 128, 67, 79, 85, 80, 76, 197, 67, 79, 85, 78, 84, 73, 78, - 199, 67, 79, 85, 78, 84, 69, 82, 83, 73, 78, 75, 128, 67, 79, 85, 78, 84, - 69, 82, 66, 79, 82, 69, 128, 67, 79, 85, 78, 67, 73, 204, 67, 79, 85, 67, - 200, 67, 79, 84, 128, 67, 79, 82, 82, 69, 83, 80, 79, 78, 68, 211, 67, - 79, 82, 82, 69, 67, 84, 128, 67, 79, 82, 80, 83, 69, 128, 67, 79, 82, 80, - 79, 82, 65, 84, 73, 79, 78, 128, 67, 79, 82, 79, 78, 73, 83, 128, 67, 79, - 82, 78, 69, 82, 83, 128, 67, 79, 82, 78, 69, 82, 128, 67, 79, 82, 78, 69, - 210, 67, 79, 82, 75, 128, 67, 79, 80, 89, 82, 73, 71, 72, 84, 128, 67, - 79, 80, 89, 82, 73, 71, 72, 212, 67, 79, 80, 89, 128, 67, 79, 80, 82, 79, - 68, 85, 67, 84, 128, 67, 79, 80, 80, 69, 82, 45, 50, 128, 67, 79, 80, 80, - 69, 82, 128, 67, 79, 80, 128, 67, 79, 79, 76, 128, 67, 79, 79, 75, 73, - 78, 71, 128, 67, 79, 79, 75, 73, 69, 128, 67, 79, 79, 75, 69, 196, 67, - 79, 79, 128, 67, 79, 78, 86, 69, 82, 71, 73, 78, 199, 67, 79, 78, 86, 69, - 78, 73, 69, 78, 67, 197, 67, 79, 78, 84, 82, 79, 76, 128, 67, 79, 78, 84, - 82, 79, 204, 67, 79, 78, 84, 82, 65, 82, 73, 69, 84, 89, 128, 67, 79, 78, - 84, 82, 65, 67, 84, 73, 79, 78, 128, 67, 79, 78, 84, 79, 85, 82, 69, 196, - 67, 79, 78, 84, 79, 85, 210, 67, 79, 78, 84, 73, 78, 85, 73, 78, 199, 67, - 79, 78, 84, 73, 78, 85, 65, 84, 73, 79, 206, 67, 79, 78, 84, 69, 78, 84, - 73, 79, 78, 128, 67, 79, 78, 84, 69, 77, 80, 76, 65, 84, 73, 79, 78, 128, - 67, 79, 78, 84, 65, 73, 78, 211, 67, 79, 78, 84, 65, 73, 78, 73, 78, 199, - 67, 79, 78, 84, 65, 73, 206, 67, 79, 78, 84, 65, 67, 84, 128, 67, 79, 78, - 83, 84, 82, 85, 67, 84, 73, 79, 78, 128, 67, 79, 78, 83, 84, 82, 85, 67, - 84, 73, 79, 206, 67, 79, 78, 83, 84, 65, 78, 84, 128, 67, 79, 78, 83, 84, - 65, 78, 212, 67, 79, 78, 83, 84, 65, 78, 67, 89, 128, 67, 79, 78, 83, 69, - 67, 85, 84, 73, 86, 197, 67, 79, 78, 74, 85, 78, 67, 84, 73, 79, 78, 128, - 67, 79, 78, 74, 85, 71, 65, 84, 197, 67, 79, 78, 74, 79, 73, 78, 73, 78, - 199, 67, 79, 78, 74, 79, 73, 78, 69, 68, 128, 67, 79, 78, 74, 79, 73, 78, - 69, 196, 67, 79, 78, 73, 67, 65, 204, 67, 79, 78, 71, 82, 85, 69, 78, - 212, 67, 79, 78, 71, 82, 65, 84, 85, 76, 65, 84, 73, 79, 78, 128, 67, 79, - 78, 70, 85, 83, 69, 196, 67, 79, 78, 70, 79, 85, 78, 68, 69, 196, 67, 79, - 78, 70, 76, 73, 67, 84, 128, 67, 79, 78, 70, 69, 84, 84, 201, 67, 79, 78, - 67, 65, 86, 69, 45, 83, 73, 68, 69, 196, 67, 79, 78, 67, 65, 86, 69, 45, - 80, 79, 73, 78, 84, 69, 196, 67, 79, 77, 80, 85, 84, 69, 82, 83, 128, 67, - 79, 77, 80, 85, 84, 69, 82, 128, 67, 79, 77, 80, 82, 69, 83, 83, 73, 79, - 78, 128, 67, 79, 77, 80, 82, 69, 83, 83, 69, 196, 67, 79, 77, 80, 79, 83, - 73, 84, 73, 79, 78, 128, 67, 79, 77, 80, 79, 83, 73, 84, 73, 79, 206, 67, - 79, 77, 80, 76, 73, 65, 78, 67, 69, 128, 67, 79, 77, 80, 76, 69, 84, 73, - 79, 78, 128, 67, 79, 77, 80, 76, 69, 84, 69, 68, 128, 67, 79, 77, 80, 76, - 69, 77, 69, 78, 84, 128, 67, 79, 77, 80, 65, 82, 69, 128, 67, 79, 77, 77, - 79, 206, 67, 79, 77, 77, 69, 82, 67, 73, 65, 204, 67, 79, 77, 77, 65, 78, - 68, 128, 67, 79, 77, 77, 65, 128, 67, 79, 77, 77, 193, 67, 79, 77, 69, - 84, 128, 67, 79, 77, 66, 73, 78, 69, 68, 128, 67, 79, 77, 66, 73, 78, 65, - 84, 73, 79, 78, 128, 67, 79, 77, 66, 128, 67, 79, 76, 85, 77, 78, 128, - 67, 79, 76, 79, 82, 128, 67, 79, 76, 76, 73, 83, 73, 79, 206, 67, 79, 76, - 76, 128, 67, 79, 76, 196, 67, 79, 70, 70, 73, 78, 128, 67, 79, 69, 78, - 71, 128, 67, 79, 69, 78, 199, 67, 79, 68, 65, 128, 67, 79, 67, 75, 84, - 65, 73, 204, 67, 79, 65, 83, 84, 69, 82, 128, 67, 79, 65, 128, 67, 77, - 128, 67, 205, 67, 76, 85, 83, 84, 69, 210, 67, 76, 85, 66, 83, 128, 67, - 76, 85, 66, 45, 83, 80, 79, 75, 69, 196, 67, 76, 85, 66, 128, 67, 76, 85, - 194, 67, 76, 79, 86, 69, 82, 128, 67, 76, 79, 85, 68, 128, 67, 76, 79, - 85, 196, 67, 76, 79, 84, 72, 69, 83, 128, 67, 76, 79, 84, 72, 128, 67, - 76, 79, 83, 69, 84, 128, 67, 76, 79, 83, 69, 78, 69, 83, 83, 128, 67, 76, - 79, 83, 69, 68, 128, 67, 76, 79, 83, 197, 67, 76, 79, 67, 75, 87, 73, 83, - 197, 67, 76, 79, 67, 203, 67, 76, 73, 86, 73, 83, 128, 67, 76, 73, 80, - 66, 79, 65, 82, 68, 128, 67, 76, 73, 78, 75, 73, 78, 199, 67, 76, 73, 78, - 71, 73, 78, 199, 67, 76, 73, 77, 65, 67, 85, 83, 128, 67, 76, 73, 70, 70, - 128, 67, 76, 73, 67, 75, 128, 67, 76, 69, 70, 45, 50, 128, 67, 76, 69, - 70, 45, 49, 128, 67, 76, 69, 70, 128, 67, 76, 69, 198, 67, 76, 69, 65, - 86, 69, 82, 128, 67, 76, 69, 65, 210, 67, 76, 65, 83, 83, 73, 67, 65, - 204, 67, 76, 65, 80, 80, 73, 78, 199, 67, 76, 65, 80, 80, 69, 210, 67, - 76, 65, 78, 128, 67, 76, 65, 206, 67, 76, 65, 77, 83, 72, 69, 76, 204, - 67, 76, 65, 73, 77, 128, 67, 76, 128, 67, 73, 88, 128, 67, 73, 86, 73, - 76, 73, 65, 78, 128, 67, 73, 84, 89, 83, 67, 65, 80, 69, 128, 67, 73, 84, - 89, 83, 67, 65, 80, 197, 67, 73, 84, 201, 67, 73, 84, 65, 84, 73, 79, - 206, 67, 73, 84, 128, 67, 73, 82, 67, 85, 211, 67, 73, 82, 67, 85, 77, - 70, 76, 69, 88, 128, 67, 73, 82, 67, 85, 77, 70, 76, 69, 216, 67, 73, 82, - 67, 85, 76, 65, 84, 73, 79, 206, 67, 73, 82, 67, 76, 73, 78, 71, 128, 67, - 73, 82, 67, 76, 73, 78, 199, 67, 73, 82, 67, 76, 69, 83, 128, 67, 73, 82, - 67, 76, 69, 211, 67, 73, 82, 67, 76, 69, 68, 128, 67, 73, 80, 128, 67, - 73, 78, 78, 65, 66, 65, 82, 128, 67, 73, 78, 69, 77, 65, 128, 67, 73, + 128, 68, 79, 73, 78, 199, 68, 79, 73, 128, 68, 79, 71, 128, 68, 79, 199, + 68, 79, 69, 211, 68, 79, 68, 69, 75, 65, 84, 65, 128, 68, 79, 67, 85, 77, + 69, 78, 84, 128, 68, 79, 67, 85, 77, 69, 78, 212, 68, 79, 66, 82, 79, + 128, 68, 79, 65, 67, 72, 65, 83, 72, 77, 69, 69, 128, 68, 79, 65, 67, 72, + 65, 83, 72, 77, 69, 197, 68, 79, 65, 128, 68, 79, 45, 79, 128, 68, 77, + 128, 68, 205, 68, 76, 85, 128, 68, 76, 79, 128, 68, 76, 73, 128, 68, 76, + 72, 89, 65, 128, 68, 76, 72, 65, 128, 68, 76, 69, 69, 128, 68, 76, 65, + 128, 68, 76, 128, 68, 75, 65, 82, 128, 68, 75, 65, 210, 68, 74, 69, 82, + 86, 73, 128, 68, 74, 69, 82, 86, 128, 68, 74, 69, 128, 68, 74, 65, 128, + 68, 73, 90, 90, 217, 68, 73, 86, 79, 82, 67, 197, 68, 73, 86, 73, 83, 73, + 79, 78, 128, 68, 73, 86, 73, 83, 73, 79, 206, 68, 73, 86, 73, 78, 65, 84, + 73, 79, 78, 128, 68, 73, 86, 73, 68, 69, 83, 128, 68, 73, 86, 73, 68, 69, + 82, 83, 128, 68, 73, 86, 73, 68, 69, 82, 128, 68, 73, 86, 73, 68, 69, + 196, 68, 73, 86, 73, 68, 69, 128, 68, 73, 86, 73, 68, 197, 68, 73, 86, + 69, 82, 71, 69, 78, 67, 69, 128, 68, 73, 84, 84, 207, 68, 73, 83, 84, 79, + 82, 84, 73, 79, 78, 128, 68, 73, 83, 84, 73, 78, 71, 85, 73, 83, 72, 128, + 68, 73, 83, 84, 73, 76, 76, 128, 68, 73, 83, 83, 79, 76, 86, 69, 45, 50, + 128, 68, 73, 83, 83, 79, 76, 86, 69, 128, 68, 73, 83, 80, 85, 84, 69, + 196, 68, 73, 83, 80, 69, 82, 83, 73, 79, 78, 128, 68, 73, 83, 75, 128, + 68, 73, 83, 73, 77, 79, 85, 128, 68, 73, 83, 72, 128, 68, 73, 83, 67, 79, + 78, 84, 73, 78, 85, 79, 85, 211, 68, 73, 83, 195, 68, 73, 83, 65, 80, 80, + 79, 73, 78, 84, 69, 196, 68, 73, 83, 65, 66, 76, 69, 196, 68, 73, 82, 71, + 193, 68, 73, 82, 69, 67, 84, 76, 217, 68, 73, 82, 69, 67, 84, 73, 79, 78, + 65, 204, 68, 73, 82, 69, 67, 84, 73, 79, 206, 68, 73, 80, 84, 69, 128, + 68, 73, 80, 80, 69, 82, 128, 68, 73, 80, 76, 79, 85, 78, 128, 68, 73, 80, + 76, 73, 128, 68, 73, 80, 76, 201, 68, 73, 78, 71, 66, 65, 212, 68, 73, + 206, 68, 73, 77, 77, 73, 78, 71, 128, 68, 73, 77, 73, 78, 85, 84, 73, 79, + 78, 45, 51, 128, 68, 73, 77, 73, 78, 85, 84, 73, 79, 78, 45, 50, 128, 68, + 73, 77, 73, 78, 85, 84, 73, 79, 78, 45, 49, 128, 68, 73, 77, 73, 78, 73, + 83, 72, 77, 69, 78, 84, 128, 68, 73, 77, 73, 68, 73, 193, 68, 73, 77, 69, + 78, 83, 73, 79, 78, 65, 204, 68, 73, 77, 69, 78, 83, 73, 79, 206, 68, 73, + 77, 50, 128, 68, 73, 77, 178, 68, 73, 76, 128, 68, 73, 71, 82, 65, 80, + 72, 128, 68, 73, 71, 82, 65, 80, 200, 68, 73, 71, 82, 65, 77, 77, 79, + 211, 68, 73, 71, 82, 65, 77, 77, 193, 68, 73, 71, 82, 65, 205, 68, 73, + 71, 79, 82, 71, 79, 78, 128, 68, 73, 71, 79, 82, 71, 79, 206, 68, 73, 71, + 73, 84, 83, 128, 68, 73, 71, 65, 77, 77, 65, 128, 68, 73, 71, 193, 68, + 73, 70, 84, 79, 71, 71, 79, 211, 68, 73, 70, 79, 78, 73, 65, 83, 128, 68, + 73, 70, 70, 73, 67, 85, 76, 84, 217, 68, 73, 70, 70, 73, 67, 85, 76, 84, + 73, 69, 83, 128, 68, 73, 70, 70, 69, 82, 69, 78, 84, 73, 65, 76, 128, 68, + 73, 70, 70, 69, 82, 69, 78, 67, 197, 68, 73, 70, 65, 84, 128, 68, 73, 69, + 83, 73, 83, 128, 68, 73, 69, 83, 73, 211, 68, 73, 69, 83, 69, 204, 68, + 73, 69, 80, 128, 68, 73, 197, 68, 73, 66, 128, 68, 73, 65, 84, 79, 78, + 79, 206, 68, 73, 65, 84, 79, 78, 73, 75, 201, 68, 73, 65, 83, 84, 79, 76, + 201, 68, 73, 65, 77, 79, 78, 68, 83, 128, 68, 73, 65, 77, 79, 78, 68, + 128, 68, 73, 65, 77, 79, 78, 196, 68, 73, 65, 77, 69, 84, 69, 210, 68, + 73, 65, 76, 89, 84, 73, 75, 65, 128, 68, 73, 65, 76, 89, 84, 73, 75, 193, + 68, 73, 65, 76, 69, 67, 84, 45, 208, 68, 73, 65, 71, 79, 78, 65, 76, 128, + 68, 73, 65, 69, 82, 69, 83, 73, 90, 69, 196, 68, 73, 65, 69, 82, 69, 83, + 73, 83, 45, 82, 73, 78, 71, 128, 68, 73, 65, 69, 82, 69, 83, 73, 83, 128, + 68, 73, 65, 69, 82, 69, 83, 73, 211, 68, 72, 79, 85, 128, 68, 72, 79, 79, + 128, 68, 72, 79, 128, 68, 72, 73, 73, 128, 68, 72, 72, 85, 128, 68, 72, + 72, 79, 79, 128, 68, 72, 72, 79, 128, 68, 72, 72, 73, 128, 68, 72, 72, + 69, 69, 128, 68, 72, 72, 69, 128, 68, 72, 72, 65, 128, 68, 72, 69, 69, + 128, 68, 72, 65, 82, 77, 65, 128, 68, 72, 65, 77, 69, 68, 72, 128, 68, + 72, 65, 76, 69, 84, 72, 128, 68, 72, 65, 76, 65, 84, 72, 128, 68, 72, 65, + 76, 128, 68, 72, 65, 68, 72, 69, 128, 68, 72, 65, 65, 76, 85, 128, 68, + 72, 65, 65, 128, 68, 72, 65, 128, 68, 69, 90, 200, 68, 69, 89, 84, 69, + 82, 79, 213, 68, 69, 89, 84, 69, 82, 79, 211, 68, 69, 88, 73, 65, 128, + 68, 69, 86, 73, 67, 197, 68, 69, 86, 69, 76, 79, 80, 77, 69, 78, 84, 128, + 68, 69, 85, 78, 71, 128, 68, 69, 83, 75, 84, 79, 208, 68, 69, 83, 203, + 68, 69, 83, 73, 71, 78, 128, 68, 69, 83, 73, 128, 68, 69, 83, 69, 82, 84, + 128, 68, 69, 83, 69, 82, 212, 68, 69, 83, 69, 82, 69, 212, 68, 69, 83, + 67, 82, 73, 80, 84, 73, 79, 206, 68, 69, 83, 67, 69, 78, 68, 73, 78, 199, + 68, 69, 83, 67, 69, 78, 68, 69, 82, 128, 68, 69, 82, 69, 84, 45, 72, 73, + 68, 69, 84, 128, 68, 69, 82, 69, 84, 128, 68, 69, 82, 69, 76, 73, 67, + 212, 68, 69, 80, 84, 72, 128, 68, 69, 80, 65, 82, 84, 85, 82, 69, 128, + 68, 69, 80, 65, 82, 84, 77, 69, 78, 212, 68, 69, 80, 65, 82, 84, 73, 78, + 199, 68, 69, 78, 84, 73, 83, 84, 82, 217, 68, 69, 78, 84, 65, 204, 68, + 69, 78, 79, 77, 73, 78, 65, 84, 79, 82, 128, 68, 69, 78, 79, 77, 73, 78, + 65, 84, 79, 210, 68, 69, 78, 78, 69, 78, 128, 68, 69, 78, 71, 128, 68, + 69, 78, 197, 68, 69, 78, 65, 82, 73, 85, 211, 68, 69, 76, 84, 65, 128, + 68, 69, 76, 84, 193, 68, 69, 76, 84, 128, 68, 69, 76, 80, 72, 73, 195, + 68, 69, 76, 73, 86, 69, 82, 217, 68, 69, 76, 73, 86, 69, 82, 65, 78, 67, + 69, 128, 68, 69, 76, 73, 77, 73, 84, 69, 82, 128, 68, 69, 76, 73, 77, 73, + 84, 69, 210, 68, 69, 76, 73, 67, 73, 79, 85, 211, 68, 69, 76, 69, 84, 73, + 79, 206, 68, 69, 76, 69, 84, 69, 128, 68, 69, 76, 69, 84, 197, 68, 69, + 75, 65, 128, 68, 69, 75, 128, 68, 69, 73, 128, 68, 69, 72, 73, 128, 68, + 69, 71, 82, 69, 69, 83, 128, 68, 69, 71, 82, 69, 197, 68, 69, 70, 73, 78, + 73, 84, 73, 79, 78, 128, 68, 69, 70, 69, 67, 84, 73, 86, 69, 78, 69, 83, + 211, 68, 69, 69, 82, 128, 68, 69, 69, 80, 76, 89, 128, 68, 69, 69, 76, + 128, 68, 69, 67, 82, 69, 83, 67, 69, 78, 68, 79, 128, 68, 69, 67, 82, 69, + 65, 83, 69, 128, 68, 69, 67, 82, 69, 65, 83, 197, 68, 69, 67, 79, 82, 65, + 84, 73, 86, 197, 68, 69, 67, 79, 82, 65, 84, 73, 79, 78, 128, 68, 69, 67, + 73, 83, 73, 86, 69, 78, 69, 83, 83, 128, 68, 69, 67, 73, 77, 65, 204, 68, + 69, 67, 73, 68, 85, 79, 85, 211, 68, 69, 67, 69, 77, 66, 69, 82, 128, 68, + 69, 67, 65, 89, 69, 68, 128, 68, 69, 66, 73, 212, 68, 69, 65, 84, 72, + 128, 68, 69, 65, 68, 128, 68, 68, 87, 65, 128, 68, 68, 85, 88, 128, 68, + 68, 85, 84, 128, 68, 68, 85, 82, 88, 128, 68, 68, 85, 82, 128, 68, 68, + 85, 80, 128, 68, 68, 85, 79, 88, 128, 68, 68, 85, 79, 80, 128, 68, 68, + 85, 79, 128, 68, 68, 85, 128, 68, 68, 79, 88, 128, 68, 68, 79, 84, 128, + 68, 68, 79, 80, 128, 68, 68, 79, 65, 128, 68, 68, 73, 88, 128, 68, 68, + 73, 84, 128, 68, 68, 73, 80, 128, 68, 68, 73, 69, 88, 128, 68, 68, 73, + 69, 80, 128, 68, 68, 73, 69, 128, 68, 68, 73, 128, 68, 68, 72, 85, 128, + 68, 68, 72, 79, 128, 68, 68, 72, 69, 69, 128, 68, 68, 72, 69, 128, 68, + 68, 72, 65, 65, 128, 68, 68, 72, 65, 128, 68, 68, 69, 88, 128, 68, 68, + 69, 80, 128, 68, 68, 69, 69, 128, 68, 68, 69, 128, 68, 68, 68, 72, 65, + 128, 68, 68, 68, 65, 128, 68, 68, 65, 89, 65, 78, 78, 65, 128, 68, 68, + 65, 88, 128, 68, 68, 65, 84, 128, 68, 68, 65, 80, 128, 68, 68, 65, 76, + 128, 68, 68, 65, 204, 68, 68, 65, 72, 65, 76, 128, 68, 68, 65, 72, 65, + 204, 68, 68, 65, 65, 128, 68, 67, 83, 128, 68, 67, 72, 69, 128, 68, 67, + 52, 128, 68, 67, 51, 128, 68, 67, 50, 128, 68, 67, 49, 128, 68, 194, 68, + 65, 89, 45, 78, 73, 71, 72, 84, 128, 68, 65, 217, 68, 65, 87, 66, 128, + 68, 65, 86, 73, 89, 65, 78, 73, 128, 68, 65, 86, 73, 68, 128, 68, 65, 84, + 197, 68, 65, 83, 73, 65, 128, 68, 65, 83, 73, 193, 68, 65, 83, 72, 69, + 196, 68, 65, 83, 72, 128, 68, 65, 83, 200, 68, 65, 83, 69, 73, 65, 128, + 68, 65, 82, 84, 128, 68, 65, 82, 75, 69, 78, 73, 78, 71, 128, 68, 65, 82, + 75, 69, 78, 73, 78, 199, 68, 65, 82, 203, 68, 65, 82, 71, 65, 128, 68, + 65, 82, 65, 52, 128, 68, 65, 82, 65, 51, 128, 68, 65, 82, 128, 68, 65, + 80, 45, 80, 82, 65, 205, 68, 65, 80, 45, 80, 73, 201, 68, 65, 80, 45, 77, + 85, 79, 217, 68, 65, 80, 45, 66, 85, 79, 206, 68, 65, 80, 45, 66, 69, + 201, 68, 65, 208, 68, 65, 78, 84, 65, 74, 193, 68, 65, 78, 71, 79, 128, + 68, 65, 78, 71, 128, 68, 65, 78, 199, 68, 65, 78, 68, 65, 128, 68, 65, + 78, 67, 73, 78, 71, 128, 68, 65, 78, 67, 69, 82, 128, 68, 65, 77, 80, + 128, 68, 65, 77, 208, 68, 65, 77, 77, 65, 84, 65, 78, 128, 68, 65, 77, + 77, 65, 84, 65, 206, 68, 65, 77, 77, 65, 128, 68, 65, 77, 77, 193, 68, + 65, 77, 65, 82, 85, 128, 68, 65, 76, 69, 84, 72, 45, 82, 69, 83, 72, 128, + 68, 65, 76, 69, 84, 72, 128, 68, 65, 76, 69, 84, 128, 68, 65, 76, 69, + 212, 68, 65, 76, 68, 65, 128, 68, 65, 76, 65, 84, 72, 128, 68, 65, 76, + 65, 84, 200, 68, 65, 76, 65, 84, 128, 68, 65, 73, 82, 128, 68, 65, 73, + 78, 71, 128, 68, 65, 73, 128, 68, 65, 72, 89, 65, 65, 85, 83, 72, 45, 50, + 128, 68, 65, 72, 89, 65, 65, 85, 83, 72, 128, 68, 65, 71, 83, 128, 68, + 65, 71, 71, 69, 82, 128, 68, 65, 71, 71, 69, 210, 68, 65, 71, 69, 83, 72, + 128, 68, 65, 71, 69, 83, 200, 68, 65, 71, 66, 65, 83, 73, 78, 78, 65, + 128, 68, 65, 71, 65, 218, 68, 65, 71, 65, 76, 71, 65, 128, 68, 65, 71, + 51, 128, 68, 65, 199, 68, 65, 69, 78, 71, 128, 68, 65, 69, 199, 68, 65, + 68, 128, 68, 65, 196, 68, 65, 65, 83, 85, 128, 68, 65, 65, 76, 73, 128, + 68, 65, 65, 68, 72, 85, 128, 68, 48, 54, 55, 72, 128, 68, 48, 54, 55, 71, + 128, 68, 48, 54, 55, 70, 128, 68, 48, 54, 55, 69, 128, 68, 48, 54, 55, + 68, 128, 68, 48, 54, 55, 67, 128, 68, 48, 54, 55, 66, 128, 68, 48, 54, + 55, 65, 128, 68, 48, 54, 55, 128, 68, 48, 54, 54, 128, 68, 48, 54, 53, + 128, 68, 48, 54, 52, 128, 68, 48, 54, 51, 128, 68, 48, 54, 50, 128, 68, + 48, 54, 49, 128, 68, 48, 54, 48, 128, 68, 48, 53, 57, 128, 68, 48, 53, + 56, 128, 68, 48, 53, 55, 128, 68, 48, 53, 54, 128, 68, 48, 53, 53, 128, + 68, 48, 53, 52, 65, 128, 68, 48, 53, 52, 128, 68, 48, 53, 51, 128, 68, + 48, 53, 50, 65, 128, 68, 48, 53, 50, 128, 68, 48, 53, 49, 128, 68, 48, + 53, 48, 73, 128, 68, 48, 53, 48, 72, 128, 68, 48, 53, 48, 71, 128, 68, + 48, 53, 48, 70, 128, 68, 48, 53, 48, 69, 128, 68, 48, 53, 48, 68, 128, + 68, 48, 53, 48, 67, 128, 68, 48, 53, 48, 66, 128, 68, 48, 53, 48, 65, + 128, 68, 48, 53, 48, 128, 68, 48, 52, 57, 128, 68, 48, 52, 56, 65, 128, + 68, 48, 52, 56, 128, 68, 48, 52, 55, 128, 68, 48, 52, 54, 65, 128, 68, + 48, 52, 54, 128, 68, 48, 52, 53, 128, 68, 48, 52, 52, 128, 68, 48, 52, + 51, 128, 68, 48, 52, 50, 128, 68, 48, 52, 49, 128, 68, 48, 52, 48, 128, + 68, 48, 51, 57, 128, 68, 48, 51, 56, 128, 68, 48, 51, 55, 128, 68, 48, + 51, 54, 128, 68, 48, 51, 53, 128, 68, 48, 51, 52, 65, 128, 68, 48, 51, + 52, 128, 68, 48, 51, 51, 128, 68, 48, 51, 50, 128, 68, 48, 51, 49, 65, + 128, 68, 48, 51, 49, 128, 68, 48, 51, 48, 128, 68, 48, 50, 57, 128, 68, + 48, 50, 56, 128, 68, 48, 50, 55, 65, 128, 68, 48, 50, 55, 128, 68, 48, + 50, 54, 128, 68, 48, 50, 53, 128, 68, 48, 50, 52, 128, 68, 48, 50, 51, + 128, 68, 48, 50, 50, 128, 68, 48, 50, 49, 128, 68, 48, 50, 48, 128, 68, + 48, 49, 57, 128, 68, 48, 49, 56, 128, 68, 48, 49, 55, 128, 68, 48, 49, + 54, 128, 68, 48, 49, 53, 128, 68, 48, 49, 52, 128, 68, 48, 49, 51, 128, + 68, 48, 49, 50, 128, 68, 48, 49, 49, 128, 68, 48, 49, 48, 128, 68, 48, + 48, 57, 128, 68, 48, 48, 56, 65, 128, 68, 48, 48, 56, 128, 68, 48, 48, + 55, 128, 68, 48, 48, 54, 128, 68, 48, 48, 53, 128, 68, 48, 48, 52, 128, + 68, 48, 48, 51, 128, 68, 48, 48, 50, 128, 68, 48, 48, 49, 128, 67, 89, + 88, 128, 67, 89, 84, 128, 67, 89, 82, 88, 128, 67, 89, 82, 69, 78, 65, + 73, 195, 67, 89, 82, 128, 67, 89, 80, 82, 73, 79, 212, 67, 89, 80, 69, + 82, 85, 83, 128, 67, 89, 80, 128, 67, 89, 76, 73, 78, 68, 82, 73, 67, 73, + 84, 89, 128, 67, 89, 67, 76, 79, 78, 69, 128, 67, 89, 65, 89, 128, 67, + 89, 65, 87, 128, 67, 89, 65, 128, 67, 87, 79, 79, 128, 67, 87, 79, 128, + 67, 87, 73, 73, 128, 67, 87, 73, 128, 67, 87, 69, 79, 82, 84, 72, 128, + 67, 87, 69, 128, 67, 87, 65, 65, 128, 67, 85, 88, 128, 67, 85, 85, 128, + 67, 85, 212, 67, 85, 83, 84, 79, 77, 83, 128, 67, 85, 83, 84, 79, 77, 69, + 210, 67, 85, 83, 84, 65, 82, 68, 128, 67, 85, 83, 80, 128, 67, 85, 82, + 88, 128, 67, 85, 82, 86, 73, 78, 199, 67, 85, 82, 86, 69, 68, 128, 67, + 85, 82, 86, 69, 196, 67, 85, 82, 86, 69, 128, 67, 85, 82, 86, 197, 67, + 85, 82, 83, 73, 86, 197, 67, 85, 82, 82, 217, 67, 85, 82, 82, 69, 78, 84, + 128, 67, 85, 82, 82, 69, 78, 212, 67, 85, 82, 76, 217, 67, 85, 82, 76, + 128, 67, 85, 82, 128, 67, 85, 80, 80, 69, 68, 128, 67, 85, 80, 80, 69, + 196, 67, 85, 79, 88, 128, 67, 85, 79, 80, 128, 67, 85, 79, 128, 67, 85, + 205, 67, 85, 67, 85, 77, 66, 69, 82, 128, 67, 85, 66, 69, 68, 128, 67, + 85, 66, 197, 67, 85, 65, 84, 82, 73, 76, 76, 79, 128, 67, 85, 65, 84, 82, + 73, 76, 76, 207, 67, 85, 65, 205, 67, 85, 128, 67, 83, 73, 128, 67, 82, + 89, 83, 84, 65, 204, 67, 82, 89, 80, 84, 79, 71, 82, 65, 77, 77, 73, 195, + 67, 82, 89, 73, 78, 199, 67, 82, 85, 90, 69, 73, 82, 207, 67, 82, 85, 67, + 73, 70, 79, 82, 205, 67, 82, 85, 67, 73, 66, 76, 69, 45, 53, 128, 67, 82, + 85, 67, 73, 66, 76, 69, 45, 52, 128, 67, 82, 85, 67, 73, 66, 76, 69, 45, + 51, 128, 67, 82, 85, 67, 73, 66, 76, 69, 45, 50, 128, 67, 82, 85, 67, 73, + 66, 76, 69, 128, 67, 82, 79, 87, 78, 128, 67, 82, 79, 83, 83, 73, 78, 71, + 128, 67, 82, 79, 83, 83, 73, 78, 199, 67, 82, 79, 83, 83, 72, 65, 84, 67, + 200, 67, 82, 79, 83, 83, 69, 68, 45, 84, 65, 73, 76, 128, 67, 82, 79, 83, + 83, 69, 68, 128, 67, 82, 79, 83, 83, 69, 196, 67, 82, 79, 83, 83, 66, 79, + 78, 69, 83, 128, 67, 82, 79, 83, 83, 128, 67, 82, 79, 83, 211, 67, 82, + 79, 80, 128, 67, 82, 79, 73, 88, 128, 67, 82, 79, 73, 83, 83, 65, 78, 84, + 128, 67, 82, 79, 67, 85, 211, 67, 82, 79, 67, 79, 68, 73, 76, 69, 128, + 67, 82, 73, 67, 75, 69, 212, 67, 82, 69, 83, 67, 69, 78, 84, 83, 128, 67, + 82, 69, 83, 67, 69, 78, 84, 128, 67, 82, 69, 83, 67, 69, 78, 212, 67, 82, + 69, 68, 73, 212, 67, 82, 69, 65, 84, 73, 86, 197, 67, 82, 69, 65, 77, + 128, 67, 82, 65, 89, 79, 78, 128, 67, 82, 65, 67, 75, 69, 82, 128, 67, + 82, 65, 66, 128, 67, 82, 128, 67, 79, 88, 128, 67, 79, 87, 66, 79, 217, + 67, 79, 87, 128, 67, 79, 215, 67, 79, 86, 69, 82, 128, 67, 79, 85, 80, + 76, 197, 67, 79, 85, 78, 84, 73, 78, 199, 67, 79, 85, 78, 84, 69, 82, 83, + 73, 78, 75, 128, 67, 79, 85, 78, 84, 69, 82, 66, 79, 82, 69, 128, 67, 79, + 85, 78, 67, 73, 204, 67, 79, 85, 67, 200, 67, 79, 84, 128, 67, 79, 82, + 82, 69, 83, 80, 79, 78, 68, 211, 67, 79, 82, 82, 69, 67, 84, 128, 67, 79, + 82, 80, 83, 69, 128, 67, 79, 82, 80, 79, 82, 65, 84, 73, 79, 78, 128, 67, + 79, 82, 79, 78, 73, 83, 128, 67, 79, 82, 78, 69, 82, 83, 128, 67, 79, 82, + 78, 69, 82, 128, 67, 79, 82, 78, 69, 210, 67, 79, 82, 75, 128, 67, 79, + 80, 89, 82, 73, 71, 72, 84, 128, 67, 79, 80, 89, 82, 73, 71, 72, 212, 67, + 79, 80, 89, 128, 67, 79, 80, 82, 79, 68, 85, 67, 84, 128, 67, 79, 80, 80, + 69, 82, 45, 50, 128, 67, 79, 80, 80, 69, 82, 128, 67, 79, 80, 128, 67, + 79, 79, 76, 128, 67, 79, 79, 75, 73, 78, 71, 128, 67, 79, 79, 75, 73, 69, + 128, 67, 79, 79, 75, 69, 196, 67, 79, 79, 128, 67, 79, 78, 86, 69, 82, + 71, 73, 78, 199, 67, 79, 78, 86, 69, 78, 73, 69, 78, 67, 197, 67, 79, 78, + 84, 82, 79, 76, 128, 67, 79, 78, 84, 82, 79, 204, 67, 79, 78, 84, 82, 65, + 82, 73, 69, 84, 89, 128, 67, 79, 78, 84, 82, 65, 67, 84, 73, 79, 78, 128, + 67, 79, 78, 84, 79, 85, 82, 69, 196, 67, 79, 78, 84, 79, 85, 210, 67, 79, + 78, 84, 73, 78, 85, 73, 78, 199, 67, 79, 78, 84, 73, 78, 85, 65, 84, 73, + 79, 206, 67, 79, 78, 84, 69, 78, 84, 73, 79, 78, 128, 67, 79, 78, 84, 69, + 77, 80, 76, 65, 84, 73, 79, 78, 128, 67, 79, 78, 84, 65, 73, 78, 211, 67, + 79, 78, 84, 65, 73, 78, 73, 78, 199, 67, 79, 78, 84, 65, 73, 206, 67, 79, + 78, 84, 65, 67, 84, 128, 67, 79, 78, 83, 84, 82, 85, 67, 84, 73, 79, 78, + 128, 67, 79, 78, 83, 84, 82, 85, 67, 84, 73, 79, 206, 67, 79, 78, 83, 84, + 65, 78, 84, 128, 67, 79, 78, 83, 84, 65, 78, 212, 67, 79, 78, 83, 84, 65, + 78, 67, 89, 128, 67, 79, 78, 83, 69, 67, 85, 84, 73, 86, 197, 67, 79, 78, + 74, 85, 78, 67, 84, 73, 79, 78, 128, 67, 79, 78, 74, 85, 71, 65, 84, 197, + 67, 79, 78, 74, 79, 73, 78, 73, 78, 199, 67, 79, 78, 74, 79, 73, 78, 69, + 68, 128, 67, 79, 78, 74, 79, 73, 78, 69, 196, 67, 79, 78, 73, 67, 65, + 204, 67, 79, 78, 71, 82, 85, 69, 78, 212, 67, 79, 78, 71, 82, 65, 84, 85, + 76, 65, 84, 73, 79, 78, 128, 67, 79, 78, 70, 85, 83, 69, 196, 67, 79, 78, + 70, 79, 85, 78, 68, 69, 196, 67, 79, 78, 70, 76, 73, 67, 84, 128, 67, 79, + 78, 70, 69, 84, 84, 201, 67, 79, 78, 67, 65, 86, 69, 45, 83, 73, 68, 69, + 196, 67, 79, 78, 67, 65, 86, 69, 45, 80, 79, 73, 78, 84, 69, 196, 67, 79, + 77, 80, 85, 84, 69, 82, 83, 128, 67, 79, 77, 80, 85, 84, 69, 82, 128, 67, + 79, 77, 80, 82, 69, 83, 83, 73, 79, 78, 128, 67, 79, 77, 80, 82, 69, 83, + 83, 69, 196, 67, 79, 77, 80, 79, 83, 73, 84, 73, 79, 78, 128, 67, 79, 77, + 80, 79, 83, 73, 84, 73, 79, 206, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 53, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 53, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 53, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 53, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 53, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 53, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 52, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 52, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 52, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 52, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 52, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 51, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 51, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 51, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 51, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 51, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 50, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 50, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 50, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 50, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 50, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 50, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 50, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 50, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 50, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 50, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 49, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 49, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 49, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 49, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 49, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 49, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 49, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 49, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 49, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 49, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 55, 48, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 55, 48, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 55, 48, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 55, 48, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 55, 48, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 57, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 57, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 57, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 57, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 57, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 56, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 56, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 56, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 56, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 56, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 56, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 56, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 56, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 56, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 56, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 55, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 55, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 55, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 55, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 55, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 55, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 55, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 55, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 55, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 55, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 54, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 54, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 54, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 54, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 54, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 53, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 53, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 53, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 53, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 53, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 52, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 52, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 52, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 52, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 52, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 51, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 51, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 51, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 51, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 51, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 51, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 51, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 51, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 51, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 51, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 50, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 50, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 50, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 50, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 50, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 50, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 50, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 50, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 50, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 50, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 49, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 49, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 49, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 49, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 49, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 54, 48, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 54, 48, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 54, 48, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 54, 48, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 54, 48, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 57, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 57, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 57, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 57, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 57, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 57, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 57, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 57, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 57, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 57, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 56, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 56, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 56, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 56, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 56, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 56, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 56, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 56, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 56, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 56, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 55, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 55, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 55, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 55, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 55, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 54, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 54, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 54, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 54, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 54, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 53, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 53, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 53, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 53, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 53, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 52, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 52, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 52, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 52, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 52, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 52, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 52, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 52, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 52, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 52, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 51, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 51, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 51, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 51, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 51, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 51, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 51, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 51, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 51, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 51, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 50, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 50, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 50, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 50, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 50, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 49, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 49, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 49, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 49, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 49, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 48, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 53, 48, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 48, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 48, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 53, 48, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 53, 48, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 53, 48, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 48, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 53, 48, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 53, 48, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 57, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 57, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 57, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 57, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 57, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 57, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 57, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 57, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 57, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 57, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 56, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 56, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 56, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 56, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 56, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 55, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 55, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 55, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 55, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 55, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 54, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 54, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 54, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 54, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 54, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 53, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 53, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 53, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 53, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 53, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 53, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 53, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 53, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 53, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 53, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 52, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 52, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 52, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 52, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 52, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 52, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 52, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 52, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 52, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 52, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 51, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 51, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 51, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 51, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 51, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 50, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 50, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 50, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 50, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 50, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 49, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 49, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 49, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 49, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 49, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 49, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 49, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 49, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 49, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 49, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 48, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 48, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 48, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 52, 48, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 52, 48, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 52, 48, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 48, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 52, 48, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 52, 48, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 52, 48, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 57, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 57, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 57, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 57, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 57, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 56, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 56, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 56, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 56, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 56, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 55, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 55, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 55, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 55, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 55, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 54, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 54, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 54, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 54, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 54, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 54, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 54, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 54, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 54, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 54, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 53, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 53, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 53, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 53, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 53, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 53, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 53, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 53, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 53, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 53, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 52, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 52, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 52, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 52, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 52, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 51, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 51, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 51, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 51, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 51, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 50, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 50, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 50, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 50, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 50, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 50, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 50, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 50, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 50, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 50, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 49, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 49, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 49, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 49, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 49, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 49, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 49, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 49, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 49, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 49, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 51, 48, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 51, 48, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 51, 48, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 51, 48, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 51, 48, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 57, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 57, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 57, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 57, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 57, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 56, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 56, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 56, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 56, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 56, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 55, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 55, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 55, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 55, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 55, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 55, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 55, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 55, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 55, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 55, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 54, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 54, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 54, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 54, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 54, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 54, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 54, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 54, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 54, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 54, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 53, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 53, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 53, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 53, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 53, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 52, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 52, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 52, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 52, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 52, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 51, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 51, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 51, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 51, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 51, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 51, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 51, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 51, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 51, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 51, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 50, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 50, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 50, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 50, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 50, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 50, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 50, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 50, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 50, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 50, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 49, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 49, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 49, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 49, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 49, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 50, 48, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 50, 48, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 50, 48, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 50, 48, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 50, 48, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 57, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 57, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 57, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 57, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 57, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 56, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 56, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 56, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 56, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 56, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 56, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 56, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 56, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 56, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 56, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 55, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 55, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 55, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 55, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 55, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 55, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 55, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 55, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 55, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 55, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 54, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 54, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 54, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 54, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 54, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 53, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 53, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 53, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 53, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 53, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 52, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 52, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 52, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 52, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 52, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 52, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 52, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 52, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 52, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 52, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 51, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 51, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 51, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 51, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 51, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 51, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 51, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 51, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 51, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 51, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 50, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 50, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 50, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 50, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 50, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 49, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 49, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 49, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 49, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 49, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 49, 48, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 49, 48, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 49, 48, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 49, 48, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 49, 48, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 57, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 57, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 57, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 57, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 57, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 57, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 57, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 57, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 57, 49, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 57, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 56, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 56, 56, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 56, 55, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 56, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 56, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 56, + 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 56, 51, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 56, 50, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 56, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 56, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, 57, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, 56, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 55, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 55, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, + 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, 52, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, 51, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 55, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 55, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 55, 48, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, 57, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 54, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 54, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, + 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, 53, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, 52, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 54, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 54, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, 49, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 54, 48, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 53, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 53, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 53, + 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 53, 54, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 53, 53, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 53, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 53, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 53, 50, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 53, 49, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 53, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 52, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 52, + 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 52, 55, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 52, 54, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 52, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 52, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 52, 51, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 52, 50, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 52, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 52, 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, + 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, 56, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, 55, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 51, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 51, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, 52, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, 51, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 51, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 51, 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 51, + 48, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, 57, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, 56, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 50, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 50, 54, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, 53, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, 52, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 50, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 50, 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, + 49, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 50, 48, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, 57, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 49, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 49, 55, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, 54, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, 53, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 49, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 49, 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, + 50, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, 49, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 49, 48, 128, 67, 79, 77, 80, 79, 78, + 69, 78, 84, 45, 48, 48, 57, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, + 48, 48, 56, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 48, 55, 128, + 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 48, 54, 128, 67, 79, 77, 80, + 79, 78, 69, 78, 84, 45, 48, 48, 53, 128, 67, 79, 77, 80, 79, 78, 69, 78, + 84, 45, 48, 48, 52, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 48, + 51, 128, 67, 79, 77, 80, 79, 78, 69, 78, 84, 45, 48, 48, 50, 128, 67, 79, + 77, 80, 79, 78, 69, 78, 84, 45, 48, 48, 49, 128, 67, 79, 77, 80, 76, 73, + 65, 78, 67, 69, 128, 67, 79, 77, 80, 76, 69, 84, 73, 79, 78, 128, 67, 79, + 77, 80, 76, 69, 84, 69, 68, 128, 67, 79, 77, 80, 76, 69, 77, 69, 78, 84, + 128, 67, 79, 77, 80, 65, 82, 69, 128, 67, 79, 77, 77, 79, 206, 67, 79, + 77, 77, 69, 82, 67, 73, 65, 204, 67, 79, 77, 77, 65, 78, 68, 128, 67, 79, + 77, 77, 65, 128, 67, 79, 77, 77, 193, 67, 79, 77, 69, 84, 128, 67, 79, + 77, 66, 73, 78, 69, 68, 128, 67, 79, 77, 66, 73, 78, 65, 84, 73, 79, 78, + 128, 67, 79, 77, 66, 128, 67, 79, 76, 85, 77, 78, 128, 67, 79, 76, 79, + 82, 128, 67, 79, 76, 76, 73, 83, 73, 79, 206, 67, 79, 76, 76, 128, 67, + 79, 76, 196, 67, 79, 70, 70, 73, 78, 128, 67, 79, 69, 78, 71, 128, 67, + 79, 69, 78, 199, 67, 79, 68, 65, 128, 67, 79, 67, 75, 84, 65, 73, 204, + 67, 79, 65, 83, 84, 69, 82, 128, 67, 79, 65, 128, 67, 77, 128, 67, 205, + 67, 76, 85, 83, 84, 69, 210, 67, 76, 85, 66, 83, 128, 67, 76, 85, 66, 45, + 83, 80, 79, 75, 69, 196, 67, 76, 85, 66, 128, 67, 76, 85, 194, 67, 76, + 79, 87, 206, 67, 76, 79, 86, 69, 82, 128, 67, 76, 79, 85, 68, 128, 67, + 76, 79, 85, 196, 67, 76, 79, 84, 72, 69, 83, 128, 67, 76, 79, 84, 72, + 128, 67, 76, 79, 83, 69, 84, 128, 67, 76, 79, 83, 69, 78, 69, 83, 83, + 128, 67, 76, 79, 83, 69, 68, 128, 67, 76, 79, 83, 197, 67, 76, 79, 67, + 75, 87, 73, 83, 197, 67, 76, 79, 67, 203, 67, 76, 73, 86, 73, 83, 128, + 67, 76, 73, 80, 66, 79, 65, 82, 68, 128, 67, 76, 73, 78, 75, 73, 78, 199, + 67, 76, 73, 78, 71, 73, 78, 199, 67, 76, 73, 77, 65, 67, 85, 83, 128, 67, + 76, 73, 70, 70, 128, 67, 76, 73, 67, 75, 128, 67, 76, 69, 70, 45, 50, + 128, 67, 76, 69, 70, 45, 49, 128, 67, 76, 69, 70, 128, 67, 76, 69, 198, + 67, 76, 69, 65, 86, 69, 82, 128, 67, 76, 69, 65, 210, 67, 76, 65, 83, 83, + 73, 67, 65, 204, 67, 76, 65, 80, 80, 73, 78, 199, 67, 76, 65, 80, 80, 69, + 210, 67, 76, 65, 78, 128, 67, 76, 65, 206, 67, 76, 65, 77, 83, 72, 69, + 76, 204, 67, 76, 65, 73, 77, 128, 67, 76, 128, 67, 73, 88, 128, 67, 73, + 86, 73, 76, 73, 65, 78, 128, 67, 73, 84, 89, 83, 67, 65, 80, 69, 128, 67, + 73, 84, 89, 83, 67, 65, 80, 197, 67, 73, 84, 201, 67, 73, 84, 65, 84, 73, + 79, 206, 67, 73, 84, 128, 67, 73, 82, 67, 85, 211, 67, 73, 82, 67, 85, + 77, 70, 76, 69, 88, 128, 67, 73, 82, 67, 85, 77, 70, 76, 69, 216, 67, 73, + 82, 67, 85, 76, 65, 84, 73, 79, 206, 67, 73, 82, 67, 76, 73, 78, 71, 128, + 67, 73, 82, 67, 76, 73, 78, 199, 67, 73, 82, 67, 76, 69, 83, 128, 67, 73, + 82, 67, 76, 69, 211, 67, 73, 82, 67, 76, 69, 68, 128, 67, 73, 80, 128, + 67, 73, 78, 78, 65, 66, 65, 82, 128, 67, 73, 78, 69, 77, 65, 128, 67, 73, 206, 67, 73, 205, 67, 73, 73, 128, 67, 73, 69, 88, 128, 67, 73, 69, 85, 67, 45, 83, 83, 65, 78, 71, 80, 73, 69, 85, 80, 128, 67, 73, 69, 85, 67, 45, 80, 73, 69, 85, 80, 128, 67, 73, 69, 85, 67, 45, 73, 69, 85, 78, 71, @@ -4576,300 +5205,304 @@ static unsigned char lexicon[] = { 86, 82, 79, 206, 67, 72, 69, 84, 128, 67, 72, 69, 83, 84, 78, 85, 84, 128, 67, 72, 69, 83, 84, 128, 67, 72, 69, 83, 211, 67, 72, 69, 82, 89, 128, 67, 72, 69, 82, 82, 217, 67, 72, 69, 82, 82, 73, 69, 83, 128, 67, - 72, 69, 81, 85, 69, 82, 69, 196, 67, 72, 69, 80, 128, 67, 72, 69, 206, - 67, 72, 69, 73, 78, 65, 80, 128, 67, 72, 69, 73, 75, 72, 69, 73, 128, 67, - 72, 69, 73, 75, 72, 65, 78, 128, 67, 72, 69, 69, 83, 197, 67, 72, 69, 69, - 82, 73, 78, 199, 67, 72, 69, 69, 77, 128, 67, 72, 69, 69, 75, 211, 67, - 72, 69, 69, 75, 128, 67, 72, 69, 69, 128, 67, 72, 69, 67, 75, 69, 210, - 67, 72, 69, 67, 75, 128, 67, 72, 69, 67, 203, 67, 72, 197, 67, 72, 65, - 88, 128, 67, 72, 65, 86, 73, 89, 65, 78, 73, 128, 67, 72, 65, 84, 84, 65, - 87, 65, 128, 67, 72, 65, 84, 128, 67, 72, 65, 82, 84, 128, 67, 72, 65, - 82, 212, 67, 72, 65, 82, 73, 79, 84, 128, 67, 72, 65, 82, 73, 79, 212, - 67, 72, 65, 82, 65, 67, 84, 69, 82, 83, 128, 67, 72, 65, 82, 65, 67, 84, - 69, 82, 128, 67, 72, 65, 82, 128, 67, 72, 65, 80, 84, 69, 82, 128, 67, - 72, 65, 80, 128, 67, 72, 65, 78, 71, 128, 67, 72, 65, 78, 128, 67, 72, - 65, 77, 75, 79, 128, 67, 72, 65, 77, 73, 76, 79, 78, 128, 67, 72, 65, 77, - 73, 76, 73, 128, 67, 72, 65, 205, 67, 72, 65, 75, 77, 193, 67, 72, 65, - 73, 82, 128, 67, 72, 65, 73, 78, 83, 128, 67, 72, 65, 68, 65, 128, 67, - 72, 65, 196, 67, 72, 65, 65, 128, 67, 71, 74, 128, 67, 69, 88, 128, 67, - 69, 82, 69, 83, 128, 67, 69, 82, 69, 77, 79, 78, 89, 128, 67, 69, 82, 69, - 75, 128, 67, 69, 82, 45, 87, 65, 128, 67, 69, 80, 128, 67, 69, 79, 78, - 71, 67, 72, 73, 69, 85, 77, 83, 83, 65, 78, 71, 83, 73, 79, 83, 128, 67, - 69, 79, 78, 71, 67, 72, 73, 69, 85, 77, 83, 83, 65, 78, 71, 67, 73, 69, - 85, 67, 128, 67, 69, 79, 78, 71, 67, 72, 73, 69, 85, 77, 83, 73, 79, 83, - 128, 67, 69, 79, 78, 71, 67, 72, 73, 69, 85, 77, 67, 73, 69, 85, 67, 128, - 67, 69, 79, 78, 71, 67, 72, 73, 69, 85, 77, 67, 72, 73, 69, 85, 67, 72, - 128, 67, 69, 78, 84, 85, 82, 73, 65, 204, 67, 69, 78, 84, 82, 69, 76, 73, - 78, 197, 67, 69, 78, 84, 82, 69, 68, 128, 67, 69, 78, 84, 82, 69, 196, - 67, 69, 78, 84, 82, 69, 128, 67, 69, 78, 84, 82, 197, 67, 69, 78, 84, 82, - 65, 76, 73, 90, 65, 84, 73, 79, 206, 67, 69, 78, 128, 67, 69, 76, 84, 73, - 195, 67, 69, 76, 83, 73, 85, 83, 128, 67, 69, 76, 69, 66, 82, 65, 84, 73, - 79, 78, 128, 67, 69, 73, 82, 84, 128, 67, 69, 73, 76, 73, 78, 71, 128, - 67, 69, 73, 76, 73, 78, 199, 67, 69, 69, 86, 128, 67, 69, 69, 66, 128, - 67, 69, 69, 128, 67, 69, 68, 73, 76, 76, 65, 128, 67, 69, 68, 73, 76, 76, - 193, 67, 69, 68, 201, 67, 69, 67, 69, 75, 128, 67, 69, 67, 65, 75, 128, - 67, 69, 67, 65, 203, 67, 69, 65, 76, 67, 128, 67, 67, 85, 128, 67, 67, - 79, 128, 67, 67, 73, 128, 67, 67, 72, 85, 128, 67, 67, 72, 79, 128, 67, - 67, 72, 73, 128, 67, 67, 72, 72, 85, 128, 67, 67, 72, 72, 79, 128, 67, - 67, 72, 72, 73, 128, 67, 67, 72, 72, 69, 69, 128, 67, 67, 72, 72, 69, - 128, 67, 67, 72, 72, 65, 65, 128, 67, 67, 72, 72, 65, 128, 67, 67, 72, - 69, 69, 128, 67, 67, 72, 69, 128, 67, 67, 72, 65, 65, 128, 67, 67, 72, - 65, 128, 67, 67, 72, 128, 67, 67, 69, 69, 128, 67, 67, 69, 128, 67, 67, - 65, 65, 128, 67, 67, 65, 128, 67, 65, 89, 78, 128, 67, 65, 89, 65, 78, - 78, 65, 128, 67, 65, 88, 128, 67, 65, 86, 69, 128, 67, 65, 85, 84, 73, - 79, 206, 67, 65, 85, 76, 68, 82, 79, 78, 128, 67, 65, 85, 68, 65, 128, - 67, 65, 85, 67, 65, 83, 73, 65, 206, 67, 65, 85, 128, 67, 65, 84, 65, 87, - 65, 128, 67, 65, 84, 128, 67, 65, 212, 67, 65, 83, 84, 76, 69, 128, 67, - 65, 83, 75, 69, 212, 67, 65, 82, 89, 83, 84, 73, 65, 206, 67, 65, 82, 84, - 82, 73, 68, 71, 69, 128, 67, 65, 82, 84, 128, 67, 65, 82, 211, 67, 65, - 82, 82, 73, 65, 71, 197, 67, 65, 82, 80, 69, 78, 84, 82, 217, 67, 65, 82, - 208, 67, 65, 82, 79, 85, 83, 69, 204, 67, 65, 82, 79, 78, 128, 67, 65, - 82, 79, 206, 67, 65, 82, 73, 203, 67, 65, 82, 73, 65, 206, 67, 65, 82, - 69, 84, 128, 67, 65, 82, 69, 212, 67, 65, 82, 197, 67, 65, 82, 68, 83, - 128, 67, 65, 82, 68, 128, 67, 65, 82, 196, 67, 65, 82, 128, 67, 65, 210, - 67, 65, 80, 85, 212, 67, 65, 80, 84, 73, 86, 69, 128, 67, 65, 80, 82, 73, - 67, 79, 82, 78, 128, 67, 65, 80, 80, 69, 196, 67, 65, 80, 79, 128, 67, - 65, 80, 73, 84, 85, 76, 85, 77, 128, 67, 65, 80, 73, 84, 65, 76, 128, 67, - 65, 78, 84, 73, 76, 76, 65, 84, 73, 79, 206, 67, 65, 78, 199, 67, 65, 78, - 68, 89, 128, 67, 65, 78, 68, 82, 65, 66, 73, 78, 68, 85, 128, 67, 65, 78, - 68, 82, 65, 66, 73, 78, 68, 213, 67, 65, 78, 68, 82, 65, 128, 67, 65, 78, - 68, 82, 193, 67, 65, 78, 68, 76, 69, 128, 67, 65, 78, 67, 69, 82, 128, - 67, 65, 78, 67, 69, 76, 76, 65, 84, 73, 79, 206, 67, 65, 78, 67, 69, 76, - 128, 67, 65, 78, 67, 69, 204, 67, 65, 78, 128, 67, 65, 77, 80, 73, 78, - 71, 128, 67, 65, 77, 78, 85, 195, 67, 65, 77, 69, 82, 65, 128, 67, 65, - 77, 69, 82, 193, 67, 65, 77, 69, 76, 128, 67, 65, 76, 89, 65, 128, 67, - 65, 76, 89, 193, 67, 65, 76, 88, 128, 67, 65, 76, 76, 128, 67, 65, 76, - 69, 78, 68, 65, 82, 128, 67, 65, 76, 69, 78, 68, 65, 210, 67, 65, 76, 67, - 85, 76, 65, 84, 79, 82, 128, 67, 65, 76, 67, 128, 67, 65, 75, 82, 65, - 128, 67, 65, 75, 197, 67, 65, 73, 128, 67, 65, 72, 128, 67, 65, 69, 83, - 85, 82, 65, 128, 67, 65, 68, 85, 67, 69, 85, 83, 128, 67, 65, 68, 193, - 67, 65, 67, 84, 85, 83, 128, 67, 65, 66, 76, 69, 87, 65, 89, 128, 67, 65, - 66, 73, 78, 69, 84, 128, 67, 65, 66, 66, 65, 71, 69, 45, 84, 82, 69, 69, - 128, 67, 65, 65, 78, 71, 128, 67, 65, 65, 73, 128, 67, 193, 67, 48, 50, - 52, 128, 67, 48, 50, 51, 128, 67, 48, 50, 50, 128, 67, 48, 50, 49, 128, - 67, 48, 50, 48, 128, 67, 48, 49, 57, 128, 67, 48, 49, 56, 128, 67, 48, - 49, 55, 128, 67, 48, 49, 54, 128, 67, 48, 49, 53, 128, 67, 48, 49, 52, - 128, 67, 48, 49, 51, 128, 67, 48, 49, 50, 128, 67, 48, 49, 49, 128, 67, - 48, 49, 48, 65, 128, 67, 48, 49, 48, 128, 67, 48, 48, 57, 128, 67, 48, - 48, 56, 128, 67, 48, 48, 55, 128, 67, 48, 48, 54, 128, 67, 48, 48, 53, - 128, 67, 48, 48, 52, 128, 67, 48, 48, 51, 128, 67, 48, 48, 50, 67, 128, - 67, 48, 48, 50, 66, 128, 67, 48, 48, 50, 65, 128, 67, 48, 48, 50, 128, - 67, 48, 48, 49, 128, 67, 45, 83, 73, 77, 80, 76, 73, 70, 73, 69, 196, 67, - 45, 51, 57, 128, 67, 45, 49, 56, 128, 66, 90, 85, 78, 199, 66, 90, 72, - 201, 66, 89, 84, 197, 66, 89, 69, 76, 79, 82, 85, 83, 83, 73, 65, 78, 45, - 85, 75, 82, 65, 73, 78, 73, 65, 206, 66, 88, 71, 128, 66, 87, 73, 128, - 66, 87, 69, 69, 128, 66, 87, 69, 128, 66, 87, 65, 128, 66, 85, 85, 77, - 73, 83, 72, 128, 66, 85, 84, 84, 79, 78, 128, 66, 85, 84, 84, 79, 206, - 66, 85, 212, 66, 85, 83, 84, 211, 66, 85, 83, 212, 66, 85, 83, 83, 89, - 69, 82, 85, 128, 66, 85, 83, 73, 78, 69, 83, 211, 66, 85, 211, 66, 85, - 82, 213, 66, 85, 82, 82, 73, 84, 79, 128, 66, 85, 82, 50, 128, 66, 85, - 210, 66, 85, 79, 88, 128, 66, 85, 79, 80, 128, 66, 85, 78, 78, 217, 66, - 85, 78, 71, 128, 66, 85, 77, 80, 217, 66, 85, 76, 85, 71, 128, 66, 85, - 76, 85, 199, 66, 85, 76, 76, 83, 69, 89, 69, 128, 66, 85, 76, 76, 211, - 66, 85, 76, 76, 72, 79, 82, 78, 128, 66, 85, 76, 76, 72, 79, 82, 206, 66, - 85, 76, 76, 69, 84, 128, 66, 85, 76, 76, 69, 212, 66, 85, 76, 76, 128, - 66, 85, 76, 66, 128, 66, 85, 75, 89, 128, 66, 85, 73, 76, 68, 73, 78, 71, - 83, 128, 66, 85, 73, 76, 68, 73, 78, 71, 128, 66, 85, 73, 76, 68, 73, 78, - 199, 66, 85, 72, 73, 196, 66, 85, 71, 73, 78, 69, 83, 197, 66, 85, 71, - 128, 66, 85, 70, 70, 65, 76, 79, 128, 66, 85, 68, 128, 66, 85, 67, 75, - 76, 69, 128, 66, 85, 66, 66, 76, 69, 83, 128, 66, 85, 66, 66, 76, 69, - 128, 66, 83, 84, 65, 82, 128, 66, 83, 75, 85, 210, 66, 83, 75, 65, 173, - 66, 83, 68, 85, 211, 66, 82, 85, 83, 200, 66, 82, 79, 78, 90, 69, 128, - 66, 82, 79, 75, 69, 206, 66, 82, 79, 65, 196, 66, 82, 73, 83, 84, 76, 69, - 128, 66, 82, 73, 71, 72, 84, 78, 69, 83, 211, 66, 82, 73, 69, 70, 67, 65, - 83, 69, 128, 66, 82, 73, 68, 71, 197, 66, 82, 73, 68, 197, 66, 82, 73, - 67, 75, 128, 66, 82, 69, 86, 73, 83, 128, 66, 82, 69, 86, 69, 45, 77, 65, - 67, 82, 79, 78, 128, 66, 82, 69, 86, 197, 66, 82, 69, 65, 84, 200, 66, - 82, 69, 65, 75, 84, 72, 82, 79, 85, 71, 72, 128, 66, 82, 69, 65, 68, 128, - 66, 82, 68, 193, 66, 82, 65, 78, 67, 72, 73, 78, 199, 66, 82, 65, 78, 67, - 72, 69, 83, 128, 66, 82, 65, 78, 67, 72, 128, 66, 82, 65, 78, 67, 200, - 66, 82, 65, 75, 67, 69, 84, 128, 66, 82, 65, 67, 75, 69, 84, 69, 196, 66, - 82, 65, 67, 75, 69, 212, 66, 82, 65, 67, 69, 128, 66, 81, 128, 66, 80, - 72, 128, 66, 79, 89, 211, 66, 79, 89, 128, 66, 79, 87, 84, 73, 69, 128, - 66, 79, 87, 84, 73, 197, 66, 79, 87, 76, 73, 78, 71, 128, 66, 79, 87, 76, - 128, 66, 79, 87, 204, 66, 79, 87, 73, 78, 199, 66, 79, 215, 66, 79, 85, - 81, 85, 69, 84, 128, 66, 79, 85, 81, 85, 69, 212, 66, 79, 85, 78, 68, 65, - 82, 217, 66, 79, 84, 84, 79, 77, 45, 83, 72, 65, 68, 69, 196, 66, 79, 84, - 84, 79, 77, 45, 76, 73, 71, 72, 84, 69, 196, 66, 79, 84, 84, 79, 77, 128, - 66, 79, 84, 84, 79, 205, 66, 79, 84, 84, 76, 69, 128, 66, 79, 84, 84, 76, - 197, 66, 79, 84, 200, 66, 79, 82, 85, 84, 79, 128, 66, 79, 82, 65, 88, - 45, 51, 128, 66, 79, 82, 65, 88, 45, 50, 128, 66, 79, 82, 65, 88, 128, - 66, 79, 80, 79, 77, 79, 70, 207, 66, 79, 79, 84, 83, 128, 66, 79, 79, 84, - 128, 66, 79, 79, 77, 69, 82, 65, 78, 71, 128, 66, 79, 79, 75, 83, 128, - 66, 79, 79, 75, 77, 65, 82, 75, 128, 66, 79, 79, 75, 77, 65, 82, 203, 66, - 79, 78, 69, 128, 66, 79, 77, 66, 128, 66, 79, 77, 128, 66, 79, 76, 84, - 128, 66, 79, 76, 212, 66, 79, 72, 65, 73, 82, 73, 195, 66, 79, 68, 89, - 128, 66, 79, 68, 217, 66, 79, 65, 82, 128, 66, 79, 65, 128, 66, 76, 85, - 69, 128, 66, 76, 85, 197, 66, 76, 79, 87, 73, 78, 199, 66, 76, 79, 87, - 70, 73, 83, 72, 128, 66, 76, 79, 215, 66, 76, 79, 83, 83, 79, 77, 128, - 66, 76, 79, 79, 68, 128, 66, 76, 79, 78, 196, 66, 76, 79, 67, 75, 128, - 66, 76, 73, 78, 203, 66, 76, 69, 78, 68, 69, 196, 66, 76, 65, 78, 75, - 128, 66, 76, 65, 78, 203, 66, 76, 65, 68, 197, 66, 76, 65, 67, 75, 76, - 69, 84, 84, 69, 210, 66, 76, 65, 67, 75, 70, 79, 79, 212, 66, 76, 65, 67, - 75, 45, 76, 69, 84, 84, 69, 210, 66, 76, 65, 67, 75, 45, 70, 69, 65, 84, - 72, 69, 82, 69, 196, 66, 76, 65, 67, 75, 128, 66, 75, 65, 173, 66, 73, - 84, 84, 69, 82, 128, 66, 73, 84, 73, 78, 199, 66, 73, 84, 197, 66, 73, - 83, 77, 85, 84, 200, 66, 73, 83, 77, 73, 76, 76, 65, 200, 66, 73, 83, 72, - 79, 80, 128, 66, 73, 83, 69, 67, 84, 73, 78, 199, 66, 73, 83, 65, 72, - 128, 66, 73, 82, 85, 128, 66, 73, 82, 84, 72, 68, 65, 217, 66, 73, 82, - 71, 65, 128, 66, 73, 82, 68, 128, 66, 73, 79, 72, 65, 90, 65, 82, 196, - 66, 73, 78, 79, 67, 85, 76, 65, 210, 66, 73, 78, 68, 73, 78, 199, 66, 73, - 78, 68, 73, 128, 66, 73, 78, 65, 82, 217, 66, 73, 76, 76, 73, 79, 78, 83, - 128, 66, 73, 76, 76, 73, 65, 82, 68, 83, 128, 66, 73, 76, 65, 66, 73, 65, - 204, 66, 73, 75, 73, 78, 73, 128, 66, 73, 71, 128, 66, 73, 199, 66, 73, - 69, 84, 128, 66, 73, 68, 69, 78, 84, 65, 204, 66, 73, 68, 65, 75, 85, 79, - 206, 66, 73, 67, 89, 67, 76, 73, 83, 84, 128, 66, 73, 67, 89, 67, 76, 69, - 83, 128, 66, 73, 67, 89, 67, 76, 69, 128, 66, 73, 67, 69, 80, 83, 128, - 66, 73, 66, 76, 69, 45, 67, 82, 69, 197, 66, 73, 66, 128, 66, 201, 66, - 72, 85, 128, 66, 72, 79, 79, 128, 66, 72, 79, 128, 66, 72, 73, 128, 66, - 72, 69, 84, 72, 128, 66, 72, 69, 69, 128, 66, 72, 69, 128, 66, 72, 65, - 84, 84, 73, 80, 82, 79, 76, 213, 66, 72, 65, 77, 128, 66, 72, 65, 65, - 128, 66, 72, 65, 128, 66, 69, 89, 89, 65, 76, 128, 66, 69, 88, 128, 66, - 69, 86, 69, 82, 65, 71, 69, 128, 66, 69, 84, 87, 69, 69, 78, 128, 66, 69, - 84, 87, 69, 69, 206, 66, 69, 84, 72, 128, 66, 69, 84, 65, 128, 66, 69, - 84, 193, 66, 69, 212, 66, 69, 83, 73, 68, 197, 66, 69, 82, 75, 65, 78, - 65, 206, 66, 69, 82, 66, 69, 210, 66, 69, 80, 128, 66, 69, 79, 82, 195, - 66, 69, 78, 90, 69, 78, 197, 66, 69, 78, 84, 207, 66, 69, 78, 84, 128, - 66, 69, 78, 212, 66, 69, 78, 68, 69, 128, 66, 69, 78, 68, 128, 66, 69, - 78, 196, 66, 69, 206, 66, 69, 76, 84, 128, 66, 69, 76, 212, 66, 69, 76, - 79, 215, 66, 69, 76, 76, 72, 79, 208, 66, 69, 76, 76, 128, 66, 69, 76, - 204, 66, 69, 76, 71, 84, 72, 79, 210, 66, 69, 73, 84, 72, 128, 66, 69, - 72, 73, 78, 196, 66, 69, 72, 69, 72, 128, 66, 69, 72, 69, 200, 66, 69, - 72, 128, 66, 69, 200, 66, 69, 71, 73, 78, 78, 73, 78, 71, 128, 66, 69, - 71, 73, 78, 78, 69, 82, 128, 66, 69, 71, 73, 206, 66, 69, 70, 79, 82, - 197, 66, 69, 69, 84, 76, 69, 128, 66, 69, 69, 84, 65, 128, 66, 69, 69, - 210, 66, 69, 69, 72, 73, 86, 69, 128, 66, 69, 69, 72, 128, 66, 69, 69, - 200, 66, 69, 67, 65, 85, 83, 69, 128, 66, 69, 65, 86, 69, 210, 66, 69, - 65, 84, 73, 78, 199, 66, 69, 65, 84, 128, 66, 69, 65, 210, 66, 69, 65, - 78, 128, 66, 69, 65, 77, 69, 196, 66, 69, 65, 68, 83, 128, 66, 69, 65, - 67, 200, 66, 67, 65, 68, 128, 66, 67, 65, 196, 66, 66, 89, 88, 128, 66, - 66, 89, 84, 128, 66, 66, 89, 80, 128, 66, 66, 89, 128, 66, 66, 85, 88, - 128, 66, 66, 85, 84, 128, 66, 66, 85, 82, 88, 128, 66, 66, 85, 82, 128, - 66, 66, 85, 80, 128, 66, 66, 85, 79, 88, 128, 66, 66, 85, 79, 80, 128, - 66, 66, 85, 79, 128, 66, 66, 85, 128, 66, 66, 79, 88, 128, 66, 66, 79, - 84, 128, 66, 66, 79, 80, 128, 66, 66, 79, 128, 66, 66, 73, 88, 128, 66, - 66, 73, 80, 128, 66, 66, 73, 69, 88, 128, 66, 66, 73, 69, 84, 128, 66, - 66, 73, 69, 80, 128, 66, 66, 73, 69, 128, 66, 66, 73, 128, 66, 66, 69, - 88, 128, 66, 66, 69, 80, 128, 66, 66, 69, 69, 128, 66, 66, 69, 128, 66, - 66, 65, 88, 128, 66, 66, 65, 84, 128, 66, 66, 65, 80, 128, 66, 66, 65, - 65, 128, 66, 66, 65, 128, 66, 65, 89, 65, 78, 78, 65, 128, 66, 65, 85, - 128, 66, 65, 84, 84, 69, 82, 89, 128, 66, 65, 84, 72, 84, 85, 66, 128, - 66, 65, 84, 72, 65, 77, 65, 83, 65, 84, 128, 66, 65, 84, 72, 128, 66, 65, - 84, 200, 66, 65, 84, 65, 203, 66, 65, 83, 83, 65, 128, 66, 65, 83, 83, - 193, 66, 65, 83, 75, 69, 84, 66, 65, 76, 204, 66, 65, 83, 72, 75, 73, - 210, 66, 65, 83, 72, 128, 66, 65, 83, 69, 76, 73, 78, 197, 66, 65, 83, - 69, 66, 65, 76, 76, 128, 66, 65, 83, 69, 128, 66, 65, 83, 197, 66, 65, - 82, 83, 128, 66, 65, 82, 82, 73, 69, 82, 128, 66, 65, 82, 82, 69, 75, 72, - 128, 66, 65, 82, 82, 69, 69, 128, 66, 65, 82, 82, 69, 197, 66, 65, 82, - 76, 73, 78, 69, 128, 66, 65, 82, 76, 69, 89, 128, 66, 65, 82, 73, 89, 79, - 79, 83, 65, 78, 128, 66, 65, 82, 66, 69, 210, 66, 65, 82, 65, 50, 128, - 66, 65, 210, 66, 65, 78, 84, 79, 67, 128, 66, 65, 78, 75, 78, 79, 84, - 197, 66, 65, 78, 75, 128, 66, 65, 78, 203, 66, 65, 78, 68, 128, 66, 65, - 78, 65, 78, 65, 128, 66, 65, 78, 50, 128, 66, 65, 78, 178, 66, 65, 77, - 66, 79, 79, 83, 128, 66, 65, 77, 66, 79, 79, 128, 66, 65, 76, 85, 68, 65, - 128, 66, 65, 76, 76, 80, 79, 73, 78, 212, 66, 65, 76, 76, 79, 84, 128, - 66, 65, 76, 76, 79, 212, 66, 65, 76, 76, 79, 79, 78, 45, 83, 80, 79, 75, - 69, 196, 66, 65, 76, 76, 79, 79, 78, 128, 66, 65, 76, 65, 71, 128, 66, - 65, 76, 128, 66, 65, 204, 66, 65, 73, 82, 75, 65, 78, 128, 66, 65, 73, - 77, 65, 73, 128, 66, 65, 72, 84, 128, 66, 65, 72, 73, 82, 71, 79, 77, 85, - 75, 72, 65, 128, 66, 65, 72, 65, 82, 50, 128, 66, 65, 72, 65, 82, 178, - 66, 65, 72, 128, 66, 65, 71, 83, 128, 66, 65, 71, 71, 65, 71, 197, 66, - 65, 71, 65, 128, 66, 65, 71, 51, 128, 66, 65, 199, 66, 65, 68, 77, 73, - 78, 84, 79, 206, 66, 65, 68, 71, 69, 82, 128, 66, 65, 68, 71, 69, 128, - 66, 65, 68, 128, 66, 65, 196, 66, 65, 67, 84, 82, 73, 65, 206, 66, 65, - 67, 75, 87, 65, 82, 68, 128, 66, 65, 67, 75, 83, 80, 65, 67, 69, 128, 66, - 65, 67, 75, 83, 76, 65, 83, 72, 128, 66, 65, 67, 75, 83, 76, 65, 83, 200, - 66, 65, 67, 75, 83, 76, 65, 78, 84, 69, 196, 66, 65, 67, 75, 72, 65, 78, - 196, 66, 65, 67, 75, 45, 84, 73, 76, 84, 69, 196, 66, 65, 67, 75, 128, - 66, 65, 67, 203, 66, 65, 66, 89, 128, 66, 65, 66, 217, 66, 65, 65, 82, - 69, 82, 85, 128, 66, 65, 45, 50, 128, 66, 51, 48, 53, 128, 66, 50, 53, - 57, 128, 66, 50, 53, 56, 128, 66, 50, 53, 55, 128, 66, 50, 53, 54, 128, - 66, 50, 53, 53, 128, 66, 50, 53, 180, 66, 50, 53, 51, 128, 66, 50, 53, - 50, 128, 66, 50, 53, 49, 128, 66, 50, 53, 48, 128, 66, 50, 52, 57, 128, - 66, 50, 52, 56, 128, 66, 50, 52, 183, 66, 50, 52, 54, 128, 66, 50, 52, - 53, 128, 66, 50, 52, 179, 66, 50, 52, 178, 66, 50, 52, 177, 66, 50, 52, - 176, 66, 50, 51, 54, 128, 66, 50, 51, 52, 128, 66, 50, 51, 179, 66, 50, - 51, 50, 128, 66, 50, 51, 177, 66, 50, 51, 176, 66, 50, 50, 57, 128, 66, - 50, 50, 56, 128, 66, 50, 50, 55, 128, 66, 50, 50, 54, 128, 66, 50, 50, - 181, 66, 50, 50, 50, 128, 66, 50, 50, 49, 128, 66, 50, 50, 176, 66, 50, - 49, 57, 128, 66, 50, 49, 56, 128, 66, 50, 49, 55, 128, 66, 50, 49, 54, - 128, 66, 50, 49, 53, 128, 66, 50, 49, 52, 128, 66, 50, 49, 51, 128, 66, - 50, 49, 50, 128, 66, 50, 49, 49, 128, 66, 50, 49, 48, 128, 66, 50, 48, - 57, 128, 66, 50, 48, 56, 128, 66, 50, 48, 55, 128, 66, 50, 48, 54, 128, - 66, 50, 48, 53, 128, 66, 50, 48, 52, 128, 66, 50, 48, 51, 128, 66, 50, - 48, 50, 128, 66, 50, 48, 49, 128, 66, 50, 48, 48, 128, 66, 49, 57, 177, - 66, 49, 57, 48, 128, 66, 49, 56, 57, 128, 66, 49, 56, 53, 128, 66, 49, - 56, 52, 128, 66, 49, 56, 51, 128, 66, 49, 56, 50, 128, 66, 49, 56, 49, - 128, 66, 49, 56, 48, 128, 66, 49, 55, 57, 128, 66, 49, 55, 56, 128, 66, - 49, 55, 55, 128, 66, 49, 55, 182, 66, 49, 55, 52, 128, 66, 49, 55, 179, - 66, 49, 55, 50, 128, 66, 49, 55, 49, 128, 66, 49, 55, 48, 128, 66, 49, - 54, 57, 128, 66, 49, 54, 56, 128, 66, 49, 54, 55, 128, 66, 49, 54, 54, - 128, 66, 49, 54, 53, 128, 66, 49, 54, 52, 128, 66, 49, 54, 179, 66, 49, - 54, 178, 66, 49, 54, 49, 128, 66, 49, 54, 48, 128, 66, 49, 53, 185, 66, - 49, 53, 56, 128, 66, 49, 53, 55, 128, 66, 49, 53, 182, 66, 49, 53, 53, - 128, 66, 49, 53, 52, 128, 66, 49, 53, 51, 128, 66, 49, 53, 50, 128, 66, - 49, 53, 177, 66, 49, 53, 48, 128, 66, 49, 52, 54, 128, 66, 49, 52, 181, - 66, 49, 52, 50, 128, 66, 49, 52, 177, 66, 49, 52, 176, 66, 49, 51, 181, - 66, 49, 51, 179, 66, 49, 51, 50, 128, 66, 49, 51, 177, 66, 49, 51, 176, - 66, 49, 50, 184, 66, 49, 50, 183, 66, 49, 50, 181, 66, 49, 50, 179, 66, - 49, 50, 178, 66, 49, 50, 177, 66, 49, 50, 176, 66, 49, 48, 57, 205, 66, - 49, 48, 57, 198, 66, 49, 48, 56, 205, 66, 49, 48, 56, 198, 66, 49, 48, - 55, 205, 66, 49, 48, 55, 198, 66, 49, 48, 54, 205, 66, 49, 48, 54, 198, - 66, 49, 48, 53, 205, 66, 49, 48, 53, 198, 66, 49, 48, 181, 66, 49, 48, - 180, 66, 49, 48, 178, 66, 49, 48, 176, 66, 48, 57, 177, 66, 48, 57, 176, - 66, 48, 56, 57, 128, 66, 48, 56, 183, 66, 48, 56, 54, 128, 66, 48, 56, - 181, 66, 48, 56, 51, 128, 66, 48, 56, 50, 128, 66, 48, 56, 177, 66, 48, - 56, 176, 66, 48, 55, 57, 128, 66, 48, 55, 184, 66, 48, 55, 183, 66, 48, - 55, 182, 66, 48, 55, 181, 66, 48, 55, 180, 66, 48, 55, 179, 66, 48, 55, - 178, 66, 48, 55, 177, 66, 48, 55, 176, 66, 48, 54, 185, 66, 48, 54, 184, - 66, 48, 54, 183, 66, 48, 54, 182, 66, 48, 54, 181, 66, 48, 54, 52, 128, - 66, 48, 54, 51, 128, 66, 48, 54, 178, 66, 48, 54, 177, 66, 48, 54, 176, - 66, 48, 53, 185, 66, 48, 53, 184, 66, 48, 53, 183, 66, 48, 53, 54, 128, - 66, 48, 53, 181, 66, 48, 53, 180, 66, 48, 53, 179, 66, 48, 53, 178, 66, - 48, 53, 177, 66, 48, 53, 176, 66, 48, 52, 57, 128, 66, 48, 52, 184, 66, - 48, 52, 55, 128, 66, 48, 52, 182, 66, 48, 52, 181, 66, 48, 52, 180, 66, - 48, 52, 179, 66, 48, 52, 178, 66, 48, 52, 177, 66, 48, 52, 176, 66, 48, - 51, 185, 66, 48, 51, 184, 66, 48, 51, 183, 66, 48, 51, 182, 66, 48, 51, - 52, 128, 66, 48, 51, 179, 66, 48, 51, 178, 66, 48, 51, 177, 66, 48, 51, - 176, 66, 48, 50, 185, 66, 48, 50, 184, 66, 48, 50, 183, 66, 48, 50, 182, - 66, 48, 50, 181, 66, 48, 50, 180, 66, 48, 50, 179, 66, 48, 50, 50, 128, - 66, 48, 50, 177, 66, 48, 50, 176, 66, 48, 49, 57, 128, 66, 48, 49, 56, - 128, 66, 48, 49, 183, 66, 48, 49, 182, 66, 48, 49, 181, 66, 48, 49, 180, - 66, 48, 49, 179, 66, 48, 49, 178, 66, 48, 49, 177, 66, 48, 49, 176, 66, - 48, 48, 57, 128, 66, 48, 48, 185, 66, 48, 48, 56, 128, 66, 48, 48, 184, - 66, 48, 48, 55, 128, 66, 48, 48, 183, 66, 48, 48, 54, 128, 66, 48, 48, - 182, 66, 48, 48, 53, 65, 128, 66, 48, 48, 53, 128, 66, 48, 48, 181, 66, - 48, 48, 52, 128, 66, 48, 48, 180, 66, 48, 48, 51, 128, 66, 48, 48, 179, - 66, 48, 48, 50, 128, 66, 48, 48, 178, 66, 48, 48, 49, 128, 66, 48, 48, - 177, 65, 90, 85, 128, 65, 89, 66, 128, 65, 89, 65, 72, 128, 65, 88, 69, - 128, 65, 87, 69, 128, 65, 87, 65, 217, 65, 86, 69, 83, 84, 65, 206, 65, - 86, 69, 82, 65, 71, 197, 65, 86, 65, 75, 82, 65, 72, 65, 83, 65, 78, 89, - 65, 128, 65, 86, 65, 71, 82, 65, 72, 65, 128, 65, 85, 89, 65, 78, 78, 65, - 128, 65, 85, 84, 85, 77, 78, 128, 65, 85, 84, 79, 77, 79, 66, 73, 76, 69, - 128, 65, 85, 84, 79, 77, 65, 84, 69, 196, 65, 85, 83, 84, 82, 65, 204, - 65, 85, 82, 73, 80, 73, 71, 77, 69, 78, 84, 128, 65, 85, 82, 65, 77, 65, - 90, 68, 65, 65, 72, 65, 128, 65, 85, 82, 65, 77, 65, 90, 68, 65, 65, 45, - 50, 128, 65, 85, 82, 65, 77, 65, 90, 68, 65, 65, 128, 65, 85, 78, 78, - 128, 65, 85, 71, 85, 83, 84, 128, 65, 85, 71, 77, 69, 78, 84, 65, 84, 73, - 79, 206, 65, 85, 69, 128, 65, 85, 66, 69, 82, 71, 73, 78, 69, 128, 65, - 84, 84, 73, 195, 65, 84, 84, 72, 65, 67, 65, 78, 128, 65, 84, 84, 69, 78, - 84, 73, 79, 78, 128, 65, 84, 84, 65, 203, 65, 84, 84, 65, 67, 72, 69, - 196, 65, 84, 79, 205, 65, 84, 78, 65, 200, 65, 84, 77, 65, 65, 85, 128, - 65, 84, 73, 89, 65, 128, 65, 84, 72, 76, 69, 84, 73, 195, 65, 84, 72, 65, - 82, 86, 65, 86, 69, 68, 73, 195, 65, 84, 72, 65, 80, 65, 83, 67, 65, 206, - 65, 83, 90, 128, 65, 83, 89, 85, 82, 193, 65, 83, 89, 77, 80, 84, 79, 84, - 73, 67, 65, 76, 76, 217, 65, 83, 84, 82, 79, 78, 79, 77, 73, 67, 65, 204, - 65, 83, 84, 82, 79, 76, 79, 71, 73, 67, 65, 204, 65, 83, 84, 79, 78, 73, - 83, 72, 69, 196, 65, 83, 84, 69, 82, 73, 83, 77, 128, 65, 83, 84, 69, 82, - 73, 83, 75, 211, 65, 83, 84, 69, 82, 73, 83, 75, 128, 65, 83, 84, 69, 82, - 73, 83, 203, 65, 83, 84, 69, 82, 73, 83, 67, 85, 83, 128, 65, 83, 83, 89, - 82, 73, 65, 206, 65, 83, 83, 69, 82, 84, 73, 79, 78, 128, 65, 83, 80, 73, - 82, 65, 84, 73, 79, 78, 128, 65, 83, 80, 73, 82, 65, 84, 69, 196, 65, 83, - 80, 69, 82, 128, 65, 83, 73, 65, 45, 65, 85, 83, 84, 82, 65, 76, 73, 65, - 128, 65, 83, 72, 71, 65, 66, 128, 65, 83, 72, 69, 83, 128, 65, 83, 72, - 57, 128, 65, 83, 72, 51, 128, 65, 83, 72, 178, 65, 83, 67, 69, 78, 84, - 128, 65, 83, 67, 69, 78, 68, 73, 78, 199, 65, 83, 65, 76, 50, 128, 65, - 82, 85, 72, 85, 65, 128, 65, 82, 84, 73, 83, 212, 65, 82, 84, 73, 67, 85, + 72, 69, 81, 85, 69, 82, 69, 196, 67, 72, 69, 80, 128, 67, 72, 69, 73, 78, + 65, 80, 128, 67, 72, 69, 73, 75, 72, 69, 73, 128, 67, 72, 69, 73, 75, 72, + 65, 78, 128, 67, 72, 69, 69, 83, 197, 67, 72, 69, 69, 82, 73, 78, 199, + 67, 72, 69, 69, 77, 128, 67, 72, 69, 69, 75, 211, 67, 72, 69, 69, 75, + 128, 67, 72, 69, 69, 128, 67, 72, 69, 67, 75, 69, 210, 67, 72, 69, 67, + 75, 128, 67, 72, 69, 67, 203, 67, 72, 197, 67, 72, 65, 88, 128, 67, 72, + 65, 86, 73, 89, 65, 78, 73, 128, 67, 72, 65, 84, 84, 65, 87, 65, 128, 67, + 72, 65, 84, 128, 67, 72, 65, 82, 84, 128, 67, 72, 65, 82, 212, 67, 72, + 65, 82, 73, 79, 84, 128, 67, 72, 65, 82, 73, 79, 212, 67, 72, 65, 82, 65, + 67, 84, 69, 82, 83, 128, 67, 72, 65, 82, 65, 67, 84, 69, 82, 128, 67, 72, + 65, 82, 128, 67, 72, 65, 80, 84, 69, 82, 128, 67, 72, 65, 80, 128, 67, + 72, 65, 78, 71, 128, 67, 72, 65, 78, 128, 67, 72, 65, 77, 75, 79, 128, + 67, 72, 65, 77, 73, 76, 79, 78, 128, 67, 72, 65, 77, 73, 76, 73, 128, 67, + 72, 65, 205, 67, 72, 65, 75, 77, 193, 67, 72, 65, 73, 82, 128, 67, 72, + 65, 73, 78, 83, 128, 67, 72, 65, 68, 65, 128, 67, 72, 65, 196, 67, 72, + 65, 65, 128, 67, 71, 74, 128, 67, 69, 88, 128, 67, 69, 82, 69, 83, 128, + 67, 69, 82, 69, 77, 79, 78, 89, 128, 67, 69, 82, 69, 75, 128, 67, 69, 82, + 45, 87, 65, 128, 67, 69, 80, 128, 67, 69, 79, 78, 71, 67, 72, 73, 69, 85, + 77, 83, 83, 65, 78, 71, 83, 73, 79, 83, 128, 67, 69, 79, 78, 71, 67, 72, + 73, 69, 85, 77, 83, 83, 65, 78, 71, 67, 73, 69, 85, 67, 128, 67, 69, 79, + 78, 71, 67, 72, 73, 69, 85, 77, 83, 73, 79, 83, 128, 67, 69, 79, 78, 71, + 67, 72, 73, 69, 85, 77, 67, 73, 69, 85, 67, 128, 67, 69, 79, 78, 71, 67, + 72, 73, 69, 85, 77, 67, 72, 73, 69, 85, 67, 72, 128, 67, 69, 78, 84, 85, + 82, 73, 65, 204, 67, 69, 78, 84, 82, 69, 76, 73, 78, 197, 67, 69, 78, 84, + 82, 69, 68, 128, 67, 69, 78, 84, 82, 69, 196, 67, 69, 78, 84, 82, 69, + 128, 67, 69, 78, 84, 82, 197, 67, 69, 78, 84, 82, 65, 76, 73, 90, 65, 84, + 73, 79, 206, 67, 69, 78, 128, 67, 69, 76, 84, 73, 195, 67, 69, 76, 83, + 73, 85, 83, 128, 67, 69, 76, 69, 66, 82, 65, 84, 73, 79, 78, 128, 67, 69, + 73, 82, 84, 128, 67, 69, 73, 76, 73, 78, 71, 128, 67, 69, 73, 76, 73, 78, + 199, 67, 69, 69, 86, 128, 67, 69, 69, 66, 128, 67, 69, 69, 128, 67, 69, + 68, 73, 76, 76, 65, 128, 67, 69, 68, 73, 76, 76, 193, 67, 69, 68, 201, + 67, 69, 67, 69, 75, 128, 67, 69, 67, 65, 75, 128, 67, 69, 67, 65, 203, + 67, 69, 65, 76, 67, 128, 67, 67, 85, 128, 67, 67, 79, 128, 67, 67, 73, + 128, 67, 67, 72, 85, 128, 67, 67, 72, 79, 128, 67, 67, 72, 73, 128, 67, + 67, 72, 72, 85, 128, 67, 67, 72, 72, 79, 128, 67, 67, 72, 72, 73, 128, + 67, 67, 72, 72, 69, 69, 128, 67, 67, 72, 72, 69, 128, 67, 67, 72, 72, 65, + 65, 128, 67, 67, 72, 72, 65, 128, 67, 67, 72, 69, 69, 128, 67, 67, 72, + 69, 128, 67, 67, 72, 65, 65, 128, 67, 67, 72, 65, 128, 67, 67, 72, 128, + 67, 67, 69, 69, 128, 67, 67, 69, 128, 67, 67, 65, 65, 128, 67, 67, 65, + 128, 67, 65, 89, 78, 128, 67, 65, 89, 65, 78, 78, 65, 128, 67, 65, 88, + 128, 67, 65, 86, 69, 128, 67, 65, 85, 84, 73, 79, 206, 67, 65, 85, 76, + 68, 82, 79, 78, 128, 67, 65, 85, 68, 65, 128, 67, 65, 85, 67, 65, 83, 73, + 65, 206, 67, 65, 85, 128, 67, 65, 84, 65, 87, 65, 128, 67, 65, 84, 128, + 67, 65, 212, 67, 65, 83, 84, 76, 69, 128, 67, 65, 83, 75, 69, 212, 67, + 65, 82, 89, 83, 84, 73, 65, 206, 67, 65, 82, 84, 87, 72, 69, 69, 76, 128, + 67, 65, 82, 84, 82, 73, 68, 71, 69, 128, 67, 65, 82, 84, 128, 67, 65, 82, + 211, 67, 65, 82, 82, 79, 84, 128, 67, 65, 82, 82, 73, 65, 71, 197, 67, + 65, 82, 80, 69, 78, 84, 82, 217, 67, 65, 82, 208, 67, 65, 82, 79, 85, 83, + 69, 204, 67, 65, 82, 79, 78, 128, 67, 65, 82, 79, 206, 67, 65, 82, 73, + 203, 67, 65, 82, 73, 65, 206, 67, 65, 82, 69, 84, 128, 67, 65, 82, 69, + 212, 67, 65, 82, 197, 67, 65, 82, 68, 83, 128, 67, 65, 82, 68, 128, 67, + 65, 82, 196, 67, 65, 82, 128, 67, 65, 210, 67, 65, 80, 85, 212, 67, 65, + 80, 84, 73, 86, 69, 128, 67, 65, 80, 82, 73, 67, 79, 82, 78, 128, 67, 65, + 80, 80, 69, 196, 67, 65, 80, 79, 128, 67, 65, 80, 73, 84, 85, 76, 85, 77, + 128, 67, 65, 80, 73, 84, 65, 76, 128, 67, 65, 78, 84, 73, 76, 76, 65, 84, + 73, 79, 206, 67, 65, 78, 79, 69, 128, 67, 65, 78, 199, 67, 65, 78, 68, + 89, 128, 67, 65, 78, 68, 82, 65, 66, 73, 78, 68, 85, 128, 67, 65, 78, 68, + 82, 65, 66, 73, 78, 68, 213, 67, 65, 78, 68, 82, 65, 128, 67, 65, 78, 68, + 82, 193, 67, 65, 78, 68, 76, 69, 128, 67, 65, 78, 67, 69, 82, 128, 67, + 65, 78, 67, 69, 76, 76, 65, 84, 73, 79, 206, 67, 65, 78, 67, 69, 76, 128, + 67, 65, 78, 67, 69, 204, 67, 65, 78, 128, 67, 65, 77, 80, 73, 78, 71, + 128, 67, 65, 77, 78, 85, 195, 67, 65, 77, 69, 82, 65, 128, 67, 65, 77, + 69, 82, 193, 67, 65, 77, 69, 76, 128, 67, 65, 76, 89, 65, 128, 67, 65, + 76, 89, 193, 67, 65, 76, 88, 128, 67, 65, 76, 76, 128, 67, 65, 76, 204, + 67, 65, 76, 69, 78, 68, 65, 82, 128, 67, 65, 76, 69, 78, 68, 65, 210, 67, + 65, 76, 67, 85, 76, 65, 84, 79, 82, 128, 67, 65, 76, 67, 128, 67, 65, 75, + 82, 65, 128, 67, 65, 75, 197, 67, 65, 73, 128, 67, 65, 72, 128, 67, 65, + 69, 83, 85, 82, 65, 128, 67, 65, 68, 85, 67, 69, 85, 83, 128, 67, 65, 68, + 193, 67, 65, 67, 84, 85, 83, 128, 67, 65, 66, 76, 69, 87, 65, 89, 128, + 67, 65, 66, 73, 78, 69, 84, 128, 67, 65, 66, 66, 65, 71, 69, 45, 84, 82, + 69, 69, 128, 67, 65, 65, 78, 71, 128, 67, 65, 65, 73, 128, 67, 193, 67, + 48, 50, 52, 128, 67, 48, 50, 51, 128, 67, 48, 50, 50, 128, 67, 48, 50, + 49, 128, 67, 48, 50, 48, 128, 67, 48, 49, 57, 128, 67, 48, 49, 56, 128, + 67, 48, 49, 55, 128, 67, 48, 49, 54, 128, 67, 48, 49, 53, 128, 67, 48, + 49, 52, 128, 67, 48, 49, 51, 128, 67, 48, 49, 50, 128, 67, 48, 49, 49, + 128, 67, 48, 49, 48, 65, 128, 67, 48, 49, 48, 128, 67, 48, 48, 57, 128, + 67, 48, 48, 56, 128, 67, 48, 48, 55, 128, 67, 48, 48, 54, 128, 67, 48, + 48, 53, 128, 67, 48, 48, 52, 128, 67, 48, 48, 51, 128, 67, 48, 48, 50, + 67, 128, 67, 48, 48, 50, 66, 128, 67, 48, 48, 50, 65, 128, 67, 48, 48, + 50, 128, 67, 48, 48, 49, 128, 67, 45, 83, 73, 77, 80, 76, 73, 70, 73, 69, + 196, 67, 45, 51, 57, 128, 67, 45, 49, 56, 128, 66, 90, 85, 78, 199, 66, + 90, 72, 201, 66, 89, 84, 197, 66, 89, 69, 76, 79, 82, 85, 83, 83, 73, 65, + 78, 45, 85, 75, 82, 65, 73, 78, 73, 65, 206, 66, 88, 71, 128, 66, 87, 73, + 128, 66, 87, 69, 69, 128, 66, 87, 69, 128, 66, 87, 65, 128, 66, 85, 85, + 77, 73, 83, 72, 128, 66, 85, 84, 84, 79, 78, 128, 66, 85, 84, 84, 79, + 206, 66, 85, 84, 84, 69, 82, 70, 76, 89, 128, 66, 85, 212, 66, 85, 83, + 84, 211, 66, 85, 83, 212, 66, 85, 83, 83, 89, 69, 82, 85, 128, 66, 85, + 83, 73, 78, 69, 83, 211, 66, 85, 211, 66, 85, 82, 213, 66, 85, 82, 82, + 73, 84, 79, 128, 66, 85, 82, 50, 128, 66, 85, 210, 66, 85, 79, 88, 128, + 66, 85, 79, 80, 128, 66, 85, 78, 78, 217, 66, 85, 78, 71, 128, 66, 85, + 77, 80, 217, 66, 85, 76, 85, 71, 128, 66, 85, 76, 85, 199, 66, 85, 76, + 76, 83, 69, 89, 69, 128, 66, 85, 76, 76, 211, 66, 85, 76, 76, 72, 79, 82, + 78, 128, 66, 85, 76, 76, 72, 79, 82, 206, 66, 85, 76, 76, 69, 84, 128, + 66, 85, 76, 76, 69, 212, 66, 85, 76, 76, 128, 66, 85, 76, 66, 128, 66, + 85, 75, 89, 128, 66, 85, 73, 76, 68, 73, 78, 71, 83, 128, 66, 85, 73, 76, + 68, 73, 78, 71, 128, 66, 85, 73, 76, 68, 73, 78, 199, 66, 85, 72, 73, + 196, 66, 85, 71, 73, 78, 69, 83, 197, 66, 85, 71, 128, 66, 85, 70, 70, + 65, 76, 79, 128, 66, 85, 68, 128, 66, 85, 67, 75, 76, 69, 128, 66, 85, + 66, 66, 76, 69, 83, 128, 66, 85, 66, 66, 76, 69, 128, 66, 83, 84, 65, 82, + 128, 66, 83, 75, 85, 210, 66, 83, 75, 65, 173, 66, 83, 68, 85, 211, 66, + 82, 85, 83, 200, 66, 82, 79, 78, 90, 69, 128, 66, 82, 79, 75, 69, 206, + 66, 82, 79, 65, 196, 66, 82, 73, 83, 84, 76, 69, 128, 66, 82, 73, 71, 72, + 84, 78, 69, 83, 211, 66, 82, 73, 69, 70, 67, 65, 83, 69, 128, 66, 82, 73, + 68, 71, 197, 66, 82, 73, 68, 197, 66, 82, 73, 67, 75, 128, 66, 82, 69, + 86, 73, 83, 128, 66, 82, 69, 86, 69, 45, 77, 65, 67, 82, 79, 78, 128, 66, + 82, 69, 86, 197, 66, 82, 69, 65, 84, 200, 66, 82, 69, 65, 75, 84, 72, 82, + 79, 85, 71, 72, 128, 66, 82, 68, 193, 66, 82, 65, 78, 67, 72, 73, 78, + 199, 66, 82, 65, 78, 67, 72, 69, 83, 128, 66, 82, 65, 78, 67, 72, 128, + 66, 82, 65, 78, 67, 200, 66, 82, 65, 75, 67, 69, 84, 128, 66, 82, 65, 67, + 75, 69, 84, 69, 196, 66, 82, 65, 67, 75, 69, 212, 66, 82, 65, 67, 69, + 128, 66, 81, 128, 66, 80, 72, 128, 66, 79, 89, 211, 66, 79, 89, 128, 66, + 79, 88, 73, 78, 199, 66, 79, 87, 84, 73, 69, 128, 66, 79, 87, 84, 73, + 197, 66, 79, 87, 76, 73, 78, 71, 128, 66, 79, 87, 76, 128, 66, 79, 87, + 204, 66, 79, 87, 73, 78, 199, 66, 79, 215, 66, 79, 85, 81, 85, 69, 84, + 128, 66, 79, 85, 81, 85, 69, 212, 66, 79, 85, 78, 68, 65, 82, 217, 66, + 79, 84, 84, 79, 77, 45, 83, 72, 65, 68, 69, 196, 66, 79, 84, 84, 79, 77, + 45, 76, 73, 71, 72, 84, 69, 196, 66, 79, 84, 84, 79, 77, 128, 66, 79, 84, + 84, 79, 205, 66, 79, 84, 84, 76, 69, 128, 66, 79, 84, 84, 76, 197, 66, + 79, 84, 200, 66, 79, 82, 85, 84, 79, 128, 66, 79, 82, 65, 88, 45, 51, + 128, 66, 79, 82, 65, 88, 45, 50, 128, 66, 79, 82, 65, 88, 128, 66, 79, + 80, 79, 77, 79, 70, 207, 66, 79, 79, 84, 83, 128, 66, 79, 79, 84, 128, + 66, 79, 79, 77, 69, 82, 65, 78, 71, 128, 66, 79, 79, 75, 83, 128, 66, 79, + 79, 75, 77, 65, 82, 75, 128, 66, 79, 79, 75, 77, 65, 82, 203, 66, 79, 78, + 69, 128, 66, 79, 77, 66, 128, 66, 79, 77, 128, 66, 79, 76, 84, 128, 66, + 79, 76, 212, 66, 79, 72, 65, 73, 82, 73, 195, 66, 79, 68, 89, 128, 66, + 79, 68, 217, 66, 79, 65, 82, 128, 66, 79, 65, 128, 66, 76, 85, 69, 128, + 66, 76, 85, 197, 66, 76, 79, 87, 73, 78, 199, 66, 76, 79, 87, 70, 73, 83, + 72, 128, 66, 76, 79, 215, 66, 76, 79, 83, 83, 79, 77, 128, 66, 76, 79, + 79, 68, 128, 66, 76, 79, 78, 196, 66, 76, 79, 67, 75, 128, 66, 76, 73, + 78, 203, 66, 76, 65, 78, 75, 128, 66, 76, 65, 78, 203, 66, 76, 65, 68, + 197, 66, 76, 65, 67, 75, 76, 69, 84, 84, 69, 210, 66, 76, 65, 67, 75, 70, + 79, 79, 212, 66, 76, 65, 67, 75, 45, 76, 69, 84, 84, 69, 210, 66, 76, 65, + 67, 75, 45, 70, 69, 65, 84, 72, 69, 82, 69, 196, 66, 76, 65, 67, 75, 128, + 66, 75, 65, 173, 66, 73, 84, 84, 69, 82, 128, 66, 73, 84, 73, 78, 199, + 66, 73, 84, 197, 66, 73, 83, 77, 85, 84, 200, 66, 73, 83, 77, 73, 76, 76, + 65, 200, 66, 73, 83, 72, 79, 80, 128, 66, 73, 83, 69, 67, 84, 73, 78, + 199, 66, 73, 83, 65, 72, 128, 66, 73, 82, 85, 128, 66, 73, 82, 84, 72, + 68, 65, 217, 66, 73, 82, 71, 65, 128, 66, 73, 82, 71, 193, 66, 73, 82, + 68, 128, 66, 73, 79, 72, 65, 90, 65, 82, 196, 66, 73, 78, 79, 67, 85, 76, + 65, 210, 66, 73, 78, 68, 73, 78, 199, 66, 73, 78, 68, 73, 128, 66, 73, + 78, 65, 82, 217, 66, 73, 76, 76, 73, 79, 78, 83, 128, 66, 73, 76, 76, 73, + 65, 82, 68, 83, 128, 66, 73, 76, 65, 66, 73, 65, 204, 66, 73, 75, 73, 78, + 73, 128, 66, 73, 71, 128, 66, 73, 199, 66, 73, 69, 84, 128, 66, 73, 68, + 69, 78, 84, 65, 204, 66, 73, 68, 65, 75, 85, 79, 206, 66, 73, 67, 89, 67, + 76, 73, 83, 84, 128, 66, 73, 67, 89, 67, 76, 69, 83, 128, 66, 73, 67, 89, + 67, 76, 69, 128, 66, 73, 67, 69, 80, 83, 128, 66, 73, 66, 76, 69, 45, 67, + 82, 69, 197, 66, 73, 66, 128, 66, 201, 66, 72, 85, 128, 66, 72, 79, 79, + 128, 66, 72, 79, 128, 66, 72, 73, 128, 66, 72, 69, 84, 72, 128, 66, 72, + 69, 69, 128, 66, 72, 69, 128, 66, 72, 65, 84, 84, 73, 80, 82, 79, 76, + 213, 66, 72, 65, 77, 128, 66, 72, 65, 65, 128, 66, 72, 65, 128, 66, 69, + 89, 89, 65, 76, 128, 66, 69, 88, 128, 66, 69, 86, 69, 82, 65, 71, 69, + 128, 66, 69, 84, 87, 69, 69, 78, 128, 66, 69, 84, 87, 69, 69, 206, 66, + 69, 84, 72, 128, 66, 69, 84, 65, 128, 66, 69, 84, 193, 66, 69, 212, 66, + 69, 83, 73, 68, 197, 66, 69, 82, 75, 65, 78, 65, 206, 66, 69, 82, 66, 69, + 210, 66, 69, 80, 128, 66, 69, 79, 82, 195, 66, 69, 78, 90, 69, 78, 197, + 66, 69, 78, 84, 207, 66, 69, 78, 84, 128, 66, 69, 78, 212, 66, 69, 78, + 68, 69, 128, 66, 69, 78, 68, 128, 66, 69, 78, 196, 66, 69, 206, 66, 69, + 76, 84, 128, 66, 69, 76, 212, 66, 69, 76, 79, 215, 66, 69, 76, 76, 72, + 79, 208, 66, 69, 76, 76, 128, 66, 69, 76, 204, 66, 69, 76, 71, 84, 72, + 79, 210, 66, 69, 73, 84, 72, 128, 66, 69, 72, 73, 78, 196, 66, 69, 72, + 69, 72, 128, 66, 69, 72, 69, 200, 66, 69, 72, 128, 66, 69, 200, 66, 69, + 71, 73, 78, 78, 73, 78, 71, 128, 66, 69, 71, 73, 78, 78, 69, 82, 128, 66, + 69, 71, 73, 206, 66, 69, 70, 79, 82, 197, 66, 69, 69, 84, 76, 69, 128, + 66, 69, 69, 84, 65, 128, 66, 69, 69, 210, 66, 69, 69, 72, 73, 86, 69, + 128, 66, 69, 69, 72, 128, 66, 69, 69, 200, 66, 69, 67, 65, 85, 83, 69, + 128, 66, 69, 65, 86, 69, 210, 66, 69, 65, 84, 73, 78, 199, 66, 69, 65, + 84, 128, 66, 69, 65, 210, 66, 69, 65, 78, 128, 66, 69, 65, 77, 69, 196, + 66, 69, 65, 68, 83, 128, 66, 69, 65, 67, 200, 66, 67, 65, 68, 128, 66, + 67, 65, 196, 66, 66, 89, 88, 128, 66, 66, 89, 84, 128, 66, 66, 89, 80, + 128, 66, 66, 89, 128, 66, 66, 85, 88, 128, 66, 66, 85, 84, 128, 66, 66, + 85, 82, 88, 128, 66, 66, 85, 82, 128, 66, 66, 85, 80, 128, 66, 66, 85, + 79, 88, 128, 66, 66, 85, 79, 80, 128, 66, 66, 85, 79, 128, 66, 66, 85, + 128, 66, 66, 79, 88, 128, 66, 66, 79, 84, 128, 66, 66, 79, 80, 128, 66, + 66, 79, 128, 66, 66, 73, 88, 128, 66, 66, 73, 80, 128, 66, 66, 73, 69, + 88, 128, 66, 66, 73, 69, 84, 128, 66, 66, 73, 69, 80, 128, 66, 66, 73, + 69, 128, 66, 66, 73, 128, 66, 66, 69, 88, 128, 66, 66, 69, 80, 128, 66, + 66, 69, 69, 128, 66, 66, 69, 128, 66, 66, 65, 88, 128, 66, 66, 65, 84, + 128, 66, 66, 65, 80, 128, 66, 66, 65, 65, 128, 66, 66, 65, 128, 66, 65, + 89, 65, 78, 78, 65, 128, 66, 65, 85, 128, 66, 65, 84, 84, 69, 82, 89, + 128, 66, 65, 84, 72, 84, 85, 66, 128, 66, 65, 84, 72, 65, 77, 65, 83, 65, + 84, 128, 66, 65, 84, 72, 128, 66, 65, 84, 200, 66, 65, 84, 65, 203, 66, + 65, 83, 83, 65, 128, 66, 65, 83, 83, 193, 66, 65, 83, 75, 69, 84, 66, 65, + 76, 204, 66, 65, 83, 72, 75, 73, 210, 66, 65, 83, 72, 128, 66, 65, 83, + 69, 76, 73, 78, 197, 66, 65, 83, 69, 66, 65, 76, 76, 128, 66, 65, 83, 69, + 128, 66, 65, 83, 197, 66, 65, 82, 83, 128, 66, 65, 82, 82, 73, 69, 82, + 128, 66, 65, 82, 82, 69, 75, 72, 128, 66, 65, 82, 82, 69, 69, 128, 66, + 65, 82, 82, 69, 197, 66, 65, 82, 76, 73, 78, 69, 128, 66, 65, 82, 76, 69, + 89, 128, 66, 65, 82, 73, 89, 79, 79, 83, 65, 78, 128, 66, 65, 82, 66, 69, + 210, 66, 65, 82, 65, 50, 128, 66, 65, 210, 66, 65, 78, 84, 79, 67, 128, + 66, 65, 78, 75, 78, 79, 84, 197, 66, 65, 78, 75, 128, 66, 65, 78, 203, + 66, 65, 78, 68, 128, 66, 65, 78, 65, 78, 65, 128, 66, 65, 78, 50, 128, + 66, 65, 78, 178, 66, 65, 77, 66, 79, 79, 83, 128, 66, 65, 77, 66, 79, 79, + 128, 66, 65, 76, 85, 68, 65, 128, 66, 65, 76, 76, 80, 79, 73, 78, 212, + 66, 65, 76, 76, 79, 84, 128, 66, 65, 76, 76, 79, 212, 66, 65, 76, 76, 79, + 79, 78, 45, 83, 80, 79, 75, 69, 196, 66, 65, 76, 76, 79, 79, 78, 128, 66, + 65, 76, 65, 71, 128, 66, 65, 76, 128, 66, 65, 204, 66, 65, 73, 82, 75, + 65, 78, 128, 66, 65, 73, 77, 65, 73, 128, 66, 65, 72, 84, 128, 66, 65, + 72, 73, 82, 71, 79, 77, 85, 75, 72, 65, 128, 66, 65, 72, 65, 82, 50, 128, + 66, 65, 72, 65, 82, 178, 66, 65, 72, 128, 66, 65, 71, 85, 69, 84, 84, + 197, 66, 65, 71, 83, 128, 66, 65, 71, 71, 65, 71, 197, 66, 65, 71, 65, + 128, 66, 65, 71, 51, 128, 66, 65, 199, 66, 65, 68, 77, 73, 78, 84, 79, + 206, 66, 65, 68, 71, 69, 82, 128, 66, 65, 68, 71, 69, 128, 66, 65, 68, + 128, 66, 65, 196, 66, 65, 67, 84, 82, 73, 65, 206, 66, 65, 67, 79, 78, + 128, 66, 65, 67, 75, 87, 65, 82, 68, 128, 66, 65, 67, 75, 83, 80, 65, 67, + 69, 128, 66, 65, 67, 75, 83, 76, 65, 83, 72, 128, 66, 65, 67, 75, 83, 76, + 65, 83, 200, 66, 65, 67, 75, 83, 76, 65, 78, 84, 69, 196, 66, 65, 67, 75, + 72, 65, 78, 196, 66, 65, 67, 75, 45, 84, 73, 76, 84, 69, 196, 66, 65, 67, + 75, 128, 66, 65, 67, 203, 66, 65, 66, 89, 128, 66, 65, 66, 217, 66, 65, + 65, 82, 69, 82, 85, 128, 66, 65, 45, 50, 128, 66, 51, 48, 53, 128, 66, + 50, 53, 57, 128, 66, 50, 53, 56, 128, 66, 50, 53, 55, 128, 66, 50, 53, + 54, 128, 66, 50, 53, 53, 128, 66, 50, 53, 180, 66, 50, 53, 51, 128, 66, + 50, 53, 50, 128, 66, 50, 53, 49, 128, 66, 50, 53, 48, 128, 66, 50, 52, + 57, 128, 66, 50, 52, 56, 128, 66, 50, 52, 183, 66, 50, 52, 54, 128, 66, + 50, 52, 53, 128, 66, 50, 52, 179, 66, 50, 52, 178, 66, 50, 52, 177, 66, + 50, 52, 176, 66, 50, 51, 54, 128, 66, 50, 51, 52, 128, 66, 50, 51, 179, + 66, 50, 51, 50, 128, 66, 50, 51, 177, 66, 50, 51, 176, 66, 50, 50, 57, + 128, 66, 50, 50, 56, 128, 66, 50, 50, 55, 128, 66, 50, 50, 54, 128, 66, + 50, 50, 181, 66, 50, 50, 50, 128, 66, 50, 50, 49, 128, 66, 50, 50, 176, + 66, 50, 49, 57, 128, 66, 50, 49, 56, 128, 66, 50, 49, 55, 128, 66, 50, + 49, 54, 128, 66, 50, 49, 53, 128, 66, 50, 49, 52, 128, 66, 50, 49, 51, + 128, 66, 50, 49, 50, 128, 66, 50, 49, 49, 128, 66, 50, 49, 48, 128, 66, + 50, 48, 57, 128, 66, 50, 48, 56, 128, 66, 50, 48, 55, 128, 66, 50, 48, + 54, 128, 66, 50, 48, 53, 128, 66, 50, 48, 52, 128, 66, 50, 48, 51, 128, + 66, 50, 48, 50, 128, 66, 50, 48, 49, 128, 66, 50, 48, 48, 128, 66, 49, + 57, 177, 66, 49, 57, 48, 128, 66, 49, 56, 57, 128, 66, 49, 56, 53, 128, + 66, 49, 56, 52, 128, 66, 49, 56, 51, 128, 66, 49, 56, 50, 128, 66, 49, + 56, 49, 128, 66, 49, 56, 48, 128, 66, 49, 55, 57, 128, 66, 49, 55, 56, + 128, 66, 49, 55, 55, 128, 66, 49, 55, 182, 66, 49, 55, 52, 128, 66, 49, + 55, 179, 66, 49, 55, 50, 128, 66, 49, 55, 49, 128, 66, 49, 55, 48, 128, + 66, 49, 54, 57, 128, 66, 49, 54, 56, 128, 66, 49, 54, 55, 128, 66, 49, + 54, 54, 128, 66, 49, 54, 53, 128, 66, 49, 54, 52, 128, 66, 49, 54, 179, + 66, 49, 54, 178, 66, 49, 54, 49, 128, 66, 49, 54, 48, 128, 66, 49, 53, + 185, 66, 49, 53, 56, 128, 66, 49, 53, 55, 128, 66, 49, 53, 182, 66, 49, + 53, 53, 128, 66, 49, 53, 52, 128, 66, 49, 53, 51, 128, 66, 49, 53, 50, + 128, 66, 49, 53, 177, 66, 49, 53, 48, 128, 66, 49, 52, 54, 128, 66, 49, + 52, 181, 66, 49, 52, 50, 128, 66, 49, 52, 177, 66, 49, 52, 176, 66, 49, + 51, 181, 66, 49, 51, 179, 66, 49, 51, 50, 128, 66, 49, 51, 177, 66, 49, + 51, 176, 66, 49, 50, 184, 66, 49, 50, 183, 66, 49, 50, 181, 66, 49, 50, + 179, 66, 49, 50, 178, 66, 49, 50, 177, 66, 49, 50, 176, 66, 49, 48, 57, + 205, 66, 49, 48, 57, 198, 66, 49, 48, 56, 205, 66, 49, 48, 56, 198, 66, + 49, 48, 55, 205, 66, 49, 48, 55, 198, 66, 49, 48, 54, 205, 66, 49, 48, + 54, 198, 66, 49, 48, 53, 205, 66, 49, 48, 53, 198, 66, 49, 48, 181, 66, + 49, 48, 180, 66, 49, 48, 178, 66, 49, 48, 176, 66, 48, 57, 177, 66, 48, + 57, 176, 66, 48, 56, 57, 128, 66, 48, 56, 183, 66, 48, 56, 54, 128, 66, + 48, 56, 181, 66, 48, 56, 51, 128, 66, 48, 56, 50, 128, 66, 48, 56, 177, + 66, 48, 56, 176, 66, 48, 55, 57, 128, 66, 48, 55, 184, 66, 48, 55, 183, + 66, 48, 55, 182, 66, 48, 55, 181, 66, 48, 55, 180, 66, 48, 55, 179, 66, + 48, 55, 178, 66, 48, 55, 177, 66, 48, 55, 176, 66, 48, 54, 185, 66, 48, + 54, 184, 66, 48, 54, 183, 66, 48, 54, 182, 66, 48, 54, 181, 66, 48, 54, + 52, 128, 66, 48, 54, 51, 128, 66, 48, 54, 178, 66, 48, 54, 177, 66, 48, + 54, 176, 66, 48, 53, 185, 66, 48, 53, 184, 66, 48, 53, 183, 66, 48, 53, + 54, 128, 66, 48, 53, 181, 66, 48, 53, 180, 66, 48, 53, 179, 66, 48, 53, + 178, 66, 48, 53, 177, 66, 48, 53, 176, 66, 48, 52, 57, 128, 66, 48, 52, + 184, 66, 48, 52, 55, 128, 66, 48, 52, 182, 66, 48, 52, 181, 66, 48, 52, + 180, 66, 48, 52, 179, 66, 48, 52, 178, 66, 48, 52, 177, 66, 48, 52, 176, + 66, 48, 51, 185, 66, 48, 51, 184, 66, 48, 51, 183, 66, 48, 51, 182, 66, + 48, 51, 52, 128, 66, 48, 51, 179, 66, 48, 51, 178, 66, 48, 51, 177, 66, + 48, 51, 176, 66, 48, 50, 185, 66, 48, 50, 184, 66, 48, 50, 183, 66, 48, + 50, 182, 66, 48, 50, 181, 66, 48, 50, 180, 66, 48, 50, 179, 66, 48, 50, + 50, 128, 66, 48, 50, 177, 66, 48, 50, 176, 66, 48, 49, 57, 128, 66, 48, + 49, 56, 128, 66, 48, 49, 183, 66, 48, 49, 182, 66, 48, 49, 181, 66, 48, + 49, 180, 66, 48, 49, 179, 66, 48, 49, 178, 66, 48, 49, 177, 66, 48, 49, + 176, 66, 48, 48, 57, 128, 66, 48, 48, 185, 66, 48, 48, 56, 128, 66, 48, + 48, 184, 66, 48, 48, 55, 128, 66, 48, 48, 183, 66, 48, 48, 54, 128, 66, + 48, 48, 182, 66, 48, 48, 53, 65, 128, 66, 48, 48, 53, 128, 66, 48, 48, + 181, 66, 48, 48, 52, 128, 66, 48, 48, 180, 66, 48, 48, 51, 128, 66, 48, + 48, 179, 66, 48, 48, 50, 128, 66, 48, 48, 178, 66, 48, 48, 49, 128, 66, + 48, 48, 177, 65, 90, 85, 128, 65, 89, 66, 128, 65, 89, 65, 72, 128, 65, + 88, 69, 128, 65, 87, 69, 128, 65, 87, 65, 217, 65, 86, 79, 67, 65, 68, + 79, 128, 65, 86, 69, 83, 84, 65, 206, 65, 86, 69, 82, 65, 71, 197, 65, + 86, 65, 75, 82, 65, 72, 65, 83, 65, 78, 89, 65, 128, 65, 86, 65, 71, 82, + 65, 72, 65, 128, 65, 85, 89, 65, 78, 78, 65, 128, 65, 85, 84, 85, 77, 78, + 128, 65, 85, 84, 79, 77, 79, 66, 73, 76, 69, 128, 65, 85, 84, 79, 77, 65, + 84, 69, 196, 65, 85, 83, 84, 82, 65, 204, 65, 85, 82, 73, 80, 73, 71, 77, + 69, 78, 84, 128, 65, 85, 82, 65, 77, 65, 90, 68, 65, 65, 72, 65, 128, 65, + 85, 82, 65, 77, 65, 90, 68, 65, 65, 45, 50, 128, 65, 85, 82, 65, 77, 65, + 90, 68, 65, 65, 128, 65, 85, 78, 78, 128, 65, 85, 71, 85, 83, 84, 128, + 65, 85, 71, 77, 69, 78, 84, 65, 84, 73, 79, 206, 65, 85, 69, 128, 65, 85, + 66, 69, 82, 71, 73, 78, 69, 128, 65, 84, 84, 73, 195, 65, 84, 84, 72, 65, + 67, 65, 78, 128, 65, 84, 84, 69, 78, 84, 73, 79, 78, 128, 65, 84, 84, 65, + 203, 65, 84, 84, 65, 67, 72, 69, 196, 65, 84, 79, 205, 65, 84, 78, 65, + 200, 65, 84, 77, 65, 65, 85, 128, 65, 84, 73, 89, 65, 128, 65, 84, 72, + 76, 69, 84, 73, 195, 65, 84, 72, 65, 82, 86, 65, 86, 69, 68, 73, 195, 65, + 84, 72, 65, 80, 65, 83, 67, 65, 206, 65, 84, 72, 45, 84, 72, 65, 76, 65, + 84, 72, 65, 128, 65, 83, 90, 128, 65, 83, 89, 85, 82, 193, 65, 83, 89, + 77, 80, 84, 79, 84, 73, 67, 65, 76, 76, 217, 65, 83, 84, 82, 79, 78, 79, + 77, 73, 67, 65, 204, 65, 83, 84, 82, 79, 76, 79, 71, 73, 67, 65, 204, 65, + 83, 84, 79, 78, 73, 83, 72, 69, 196, 65, 83, 84, 69, 82, 73, 83, 77, 128, + 65, 83, 84, 69, 82, 73, 83, 75, 211, 65, 83, 84, 69, 82, 73, 83, 75, 128, + 65, 83, 84, 69, 82, 73, 83, 203, 65, 83, 84, 69, 82, 73, 83, 67, 85, 83, + 128, 65, 83, 83, 89, 82, 73, 65, 206, 65, 83, 83, 69, 82, 84, 73, 79, 78, + 128, 65, 83, 80, 73, 82, 65, 84, 73, 79, 78, 128, 65, 83, 80, 73, 82, 65, + 84, 69, 196, 65, 83, 80, 69, 82, 128, 65, 83, 73, 65, 45, 65, 85, 83, 84, + 82, 65, 76, 73, 65, 128, 65, 83, 72, 71, 65, 66, 128, 65, 83, 72, 69, 83, + 128, 65, 83, 72, 57, 128, 65, 83, 72, 51, 128, 65, 83, 72, 178, 65, 83, + 67, 69, 78, 84, 128, 65, 83, 67, 69, 78, 68, 73, 78, 199, 65, 83, 65, 76, + 50, 128, 65, 83, 45, 83, 65, 74, 68, 65, 128, 65, 82, 85, 72, 85, 65, + 128, 65, 82, 84, 211, 65, 82, 84, 73, 83, 212, 65, 82, 84, 73, 67, 85, 76, 65, 84, 69, 196, 65, 82, 84, 65, 66, 197, 65, 82, 83, 69, 79, 83, 128, 65, 82, 83, 69, 79, 211, 65, 82, 83, 69, 78, 73, 67, 128, 65, 82, 82, 79, 87, 83, 128, 65, 82, 82, 79, 87, 211, 65, 82, 82, 79, 87, 72, 69, @@ -4892,42 +5525,43 @@ static unsigned char lexicon[] = { 65, 45, 85, 128, 65, 82, 65, 69, 65, 45, 73, 128, 65, 82, 65, 69, 65, 45, 69, 79, 128, 65, 82, 65, 69, 65, 45, 69, 128, 65, 82, 65, 69, 65, 45, 65, 128, 65, 82, 65, 68, 128, 65, 82, 65, 196, 65, 82, 65, 66, 73, 67, 45, - 73, 78, 68, 73, 195, 65, 82, 65, 66, 73, 65, 206, 65, 82, 45, 82, 65, 72, - 77, 65, 206, 65, 82, 45, 82, 65, 72, 69, 69, 77, 128, 65, 81, 85, 65, 82, - 73, 85, 83, 128, 65, 81, 85, 65, 70, 79, 82, 84, 73, 83, 128, 65, 81, 85, - 193, 65, 80, 85, 206, 65, 80, 82, 73, 76, 128, 65, 80, 80, 82, 79, 88, - 73, 77, 65, 84, 69, 76, 217, 65, 80, 80, 82, 79, 88, 73, 77, 65, 84, 69, - 128, 65, 80, 80, 82, 79, 65, 67, 72, 69, 211, 65, 80, 80, 82, 79, 65, 67, - 72, 128, 65, 80, 80, 76, 73, 67, 65, 84, 73, 79, 78, 128, 65, 80, 80, 76, - 73, 67, 65, 84, 73, 79, 206, 65, 80, 79, 84, 72, 69, 83, 128, 65, 80, 79, - 84, 72, 69, 77, 65, 128, 65, 80, 79, 83, 84, 82, 79, 80, 72, 69, 128, 65, - 80, 79, 83, 84, 82, 79, 70, 79, 83, 128, 65, 80, 79, 83, 84, 82, 79, 70, - 79, 211, 65, 80, 79, 83, 84, 82, 79, 70, 79, 201, 65, 80, 79, 68, 69, 88, - 73, 65, 128, 65, 80, 79, 68, 69, 82, 77, 193, 65, 80, 76, 79, 85, 78, - 128, 65, 80, 76, 201, 65, 80, 204, 65, 80, 73, 78, 128, 65, 80, 69, 83, - 207, 65, 80, 67, 128, 65, 80, 65, 82, 84, 128, 65, 80, 65, 65, 84, 79, - 128, 65, 79, 85, 128, 65, 79, 82, 128, 65, 78, 85, 83, 86, 65, 82, 65, - 89, 65, 128, 65, 78, 85, 83, 86, 65, 82, 65, 128, 65, 78, 85, 83, 86, 65, - 82, 193, 65, 78, 85, 68, 65, 84, 84, 65, 128, 65, 78, 85, 68, 65, 84, 84, - 193, 65, 78, 84, 73, 82, 69, 83, 84, 82, 73, 67, 84, 73, 79, 78, 128, 65, - 78, 84, 73, 77, 79, 78, 89, 45, 50, 128, 65, 78, 84, 73, 77, 79, 78, 89, - 128, 65, 78, 84, 73, 77, 79, 78, 217, 65, 78, 84, 73, 77, 79, 78, 73, 65, - 84, 69, 128, 65, 78, 84, 73, 75, 69, 78, 79, 77, 65, 128, 65, 78, 84, 73, - 75, 69, 78, 79, 75, 89, 76, 73, 83, 77, 65, 128, 65, 78, 84, 73, 70, 79, - 78, 73, 65, 128, 65, 78, 84, 73, 67, 76, 79, 67, 75, 87, 73, 83, 69, 45, - 82, 79, 84, 65, 84, 69, 196, 65, 78, 84, 73, 67, 76, 79, 67, 75, 87, 73, - 83, 69, 128, 65, 78, 84, 73, 67, 76, 79, 67, 75, 87, 73, 83, 197, 65, 78, - 84, 69, 78, 78, 65, 128, 65, 78, 84, 69, 78, 78, 193, 65, 78, 84, 65, 82, - 71, 79, 77, 85, 75, 72, 65, 128, 65, 78, 83, 85, 218, 65, 78, 83, 72, 69, - 128, 65, 78, 80, 69, 65, 128, 65, 78, 207, 65, 78, 78, 85, 73, 84, 217, - 65, 78, 78, 79, 84, 65, 84, 73, 79, 206, 65, 78, 78, 65, 65, 85, 128, 65, - 78, 75, 72, 128, 65, 78, 74, 73, 128, 65, 78, 72, 85, 128, 65, 78, 71, - 85, 76, 65, 82, 128, 65, 78, 71, 85, 73, 83, 72, 69, 196, 65, 78, 71, 83, - 84, 82, 79, 205, 65, 78, 71, 82, 217, 65, 78, 71, 76, 69, 68, 128, 65, - 78, 71, 76, 69, 196, 65, 78, 71, 75, 72, 65, 78, 75, 72, 85, 128, 65, 78, - 71, 69, 210, 65, 78, 71, 69, 76, 128, 65, 78, 71, 69, 68, 128, 65, 78, - 68, 65, 80, 128, 65, 78, 67, 79, 82, 65, 128, 65, 78, 67, 72, 79, 82, - 128, 65, 78, 65, 84, 82, 73, 67, 72, 73, 83, 77, 65, 128, 65, 78, 65, 80, + 73, 78, 68, 73, 195, 65, 82, 65, 66, 73, 65, 206, 65, 82, 45, 82, 85, 66, + 128, 65, 82, 45, 82, 65, 72, 77, 65, 206, 65, 82, 45, 82, 65, 72, 69, 69, + 77, 128, 65, 81, 85, 65, 82, 73, 85, 83, 128, 65, 81, 85, 65, 70, 79, 82, + 84, 73, 83, 128, 65, 81, 85, 193, 65, 80, 85, 206, 65, 80, 82, 73, 76, + 128, 65, 80, 80, 82, 79, 88, 73, 77, 65, 84, 69, 76, 217, 65, 80, 80, 82, + 79, 88, 73, 77, 65, 84, 69, 128, 65, 80, 80, 82, 79, 65, 67, 72, 69, 211, + 65, 80, 80, 82, 79, 65, 67, 72, 128, 65, 80, 80, 76, 73, 67, 65, 84, 73, + 79, 78, 128, 65, 80, 80, 76, 73, 67, 65, 84, 73, 79, 206, 65, 80, 79, 84, + 72, 69, 83, 128, 65, 80, 79, 84, 72, 69, 77, 65, 128, 65, 80, 79, 83, 84, + 82, 79, 80, 72, 69, 128, 65, 80, 79, 83, 84, 82, 79, 70, 79, 83, 128, 65, + 80, 79, 83, 84, 82, 79, 70, 79, 211, 65, 80, 79, 83, 84, 82, 79, 70, 79, + 201, 65, 80, 79, 68, 69, 88, 73, 65, 128, 65, 80, 79, 68, 69, 82, 77, + 193, 65, 80, 76, 79, 85, 78, 128, 65, 80, 76, 201, 65, 80, 204, 65, 80, + 73, 78, 128, 65, 80, 69, 83, 207, 65, 80, 67, 128, 65, 80, 65, 82, 84, + 128, 65, 80, 65, 65, 84, 79, 128, 65, 79, 85, 128, 65, 79, 82, 128, 65, + 78, 85, 83, 86, 65, 82, 65, 89, 65, 128, 65, 78, 85, 83, 86, 65, 82, 65, + 128, 65, 78, 85, 83, 86, 65, 82, 193, 65, 78, 85, 68, 65, 84, 84, 65, + 128, 65, 78, 85, 68, 65, 84, 84, 193, 65, 78, 84, 73, 82, 69, 83, 84, 82, + 73, 67, 84, 73, 79, 78, 128, 65, 78, 84, 73, 77, 79, 78, 89, 45, 50, 128, + 65, 78, 84, 73, 77, 79, 78, 89, 128, 65, 78, 84, 73, 77, 79, 78, 217, 65, + 78, 84, 73, 77, 79, 78, 73, 65, 84, 69, 128, 65, 78, 84, 73, 75, 69, 78, + 79, 77, 65, 128, 65, 78, 84, 73, 75, 69, 78, 79, 75, 89, 76, 73, 83, 77, + 65, 128, 65, 78, 84, 73, 70, 79, 78, 73, 65, 128, 65, 78, 84, 73, 67, 76, + 79, 67, 75, 87, 73, 83, 69, 45, 82, 79, 84, 65, 84, 69, 196, 65, 78, 84, + 73, 67, 76, 79, 67, 75, 87, 73, 83, 69, 128, 65, 78, 84, 73, 67, 76, 79, + 67, 75, 87, 73, 83, 197, 65, 78, 84, 69, 78, 78, 65, 128, 65, 78, 84, 69, + 78, 78, 193, 65, 78, 84, 65, 82, 71, 79, 77, 85, 75, 72, 65, 128, 65, 78, + 83, 85, 218, 65, 78, 83, 72, 69, 128, 65, 78, 80, 69, 65, 128, 65, 78, + 207, 65, 78, 78, 85, 73, 84, 217, 65, 78, 78, 79, 84, 65, 84, 73, 79, + 206, 65, 78, 78, 65, 65, 85, 128, 65, 78, 75, 72, 128, 65, 78, 74, 73, + 128, 65, 78, 72, 85, 128, 65, 78, 71, 85, 76, 65, 82, 128, 65, 78, 71, + 85, 73, 83, 72, 69, 196, 65, 78, 71, 83, 84, 82, 79, 205, 65, 78, 71, 82, + 217, 65, 78, 71, 76, 69, 68, 128, 65, 78, 71, 76, 69, 196, 65, 78, 71, + 75, 72, 65, 78, 75, 72, 85, 128, 65, 78, 71, 69, 210, 65, 78, 71, 69, 76, + 128, 65, 78, 71, 69, 68, 128, 65, 78, 68, 65, 80, 128, 65, 78, 67, 79, + 82, 65, 128, 65, 78, 67, 72, 79, 82, 128, 65, 78, 65, 84, 82, 73, 67, 72, + 73, 83, 77, 65, 128, 65, 78, 65, 80, 128, 65, 78, 45, 78, 73, 83, 70, 128, 65, 77, 80, 83, 128, 65, 77, 80, 72, 79, 82, 65, 128, 65, 77, 80, 69, 82, 83, 65, 78, 68, 128, 65, 77, 80, 69, 82, 83, 65, 78, 196, 65, 77, 79, 85, 78, 212, 65, 77, 69, 82, 73, 67, 65, 83, 128, 65, 77, 69, 82, 73, @@ -4941,11580 +5575,12062 @@ static unsigned char lexicon[] = { 65, 84, 197, 65, 76, 84, 65, 128, 65, 76, 80, 72, 65, 128, 65, 76, 80, 72, 193, 65, 76, 80, 65, 80, 82, 65, 78, 65, 128, 65, 76, 80, 65, 80, 82, 65, 65, 78, 193, 65, 76, 80, 65, 128, 65, 76, 77, 79, 83, 212, 65, 76, - 77, 128, 65, 76, 76, 79, 128, 65, 76, 76, 73, 65, 78, 67, 69, 128, 65, - 76, 76, 201, 65, 76, 76, 65, 200, 65, 76, 75, 65, 76, 73, 45, 50, 128, - 65, 76, 75, 65, 76, 73, 128, 65, 76, 73, 71, 78, 69, 196, 65, 76, 73, 70, - 85, 128, 65, 76, 73, 69, 78, 128, 65, 76, 73, 69, 206, 65, 76, 71, 73, - 218, 65, 76, 70, 65, 128, 65, 76, 69, 85, 212, 65, 76, 69, 82, 84, 128, - 65, 76, 69, 80, 72, 128, 65, 76, 69, 77, 66, 73, 67, 128, 65, 76, 69, 70, - 128, 65, 76, 66, 65, 78, 73, 65, 206, 65, 76, 65, 89, 72, 69, 128, 65, - 76, 65, 89, 72, 197, 65, 76, 65, 82, 205, 65, 76, 65, 80, 72, 128, 65, - 76, 45, 76, 65, 75, 85, 78, 65, 128, 65, 75, 84, 73, 69, 83, 69, 76, 83, - 75, 65, 66, 128, 65, 75, 83, 65, 128, 65, 75, 72, 77, 73, 77, 73, 195, - 65, 75, 66, 65, 210, 65, 75, 65, 82, 65, 128, 65, 75, 65, 82, 193, 65, - 73, 89, 65, 78, 78, 65, 128, 65, 73, 86, 73, 76, 73, 203, 65, 73, 84, 79, - 206, 65, 73, 82, 80, 76, 65, 78, 69, 128, 65, 73, 82, 80, 76, 65, 78, - 197, 65, 73, 78, 213, 65, 73, 78, 78, 128, 65, 73, 76, 77, 128, 65, 73, - 75, 65, 82, 65, 128, 65, 73, 72, 86, 85, 83, 128, 65, 72, 83, 68, 65, - 128, 65, 72, 83, 65, 128, 65, 72, 79, 205, 65, 72, 65, 78, 199, 65, 72, - 65, 71, 71, 65, 210, 65, 72, 65, 68, 128, 65, 71, 85, 78, 71, 128, 65, - 71, 79, 71, 201, 65, 71, 71, 82, 65, 86, 65, 84, 73, 79, 78, 128, 65, 71, - 71, 82, 65, 86, 65, 84, 69, 196, 65, 71, 65, 73, 78, 83, 212, 65, 71, 65, - 73, 78, 128, 65, 70, 84, 69, 210, 65, 70, 83, 65, 65, 81, 128, 65, 70, - 82, 73, 67, 65, 206, 65, 70, 79, 82, 69, 77, 69, 78, 84, 73, 79, 78, 69, - 68, 128, 65, 70, 71, 72, 65, 78, 201, 65, 70, 70, 82, 73, 67, 65, 84, 73, - 79, 206, 65, 70, 70, 73, 216, 65, 69, 89, 65, 78, 78, 65, 128, 65, 69, - 89, 128, 65, 69, 83, 67, 85, 76, 65, 80, 73, 85, 83, 128, 65, 69, 83, 67, - 128, 65, 69, 83, 128, 65, 69, 82, 73, 65, 204, 65, 69, 82, 128, 65, 69, - 76, 65, 45, 80, 73, 76, 76, 65, 128, 65, 69, 76, 128, 65, 69, 75, 128, - 65, 69, 71, 69, 65, 206, 65, 69, 71, 128, 65, 69, 69, 89, 65, 78, 78, 65, - 128, 65, 69, 69, 128, 65, 69, 68, 65, 45, 80, 73, 76, 76, 65, 128, 65, - 69, 68, 128, 65, 69, 66, 128, 65, 68, 86, 65, 78, 84, 65, 71, 69, 128, - 65, 68, 86, 65, 78, 67, 69, 128, 65, 68, 77, 73, 83, 83, 73, 79, 206, 65, - 68, 69, 71, 128, 65, 68, 69, 199, 65, 68, 68, 82, 69, 83, 83, 69, 196, - 65, 68, 68, 82, 69, 83, 211, 65, 68, 68, 65, 75, 128, 65, 68, 65, 203, - 65, 67, 85, 84, 69, 45, 77, 65, 67, 82, 79, 78, 128, 65, 67, 85, 84, 69, - 45, 71, 82, 65, 86, 69, 45, 65, 67, 85, 84, 69, 128, 65, 67, 85, 84, 197, - 65, 67, 84, 85, 65, 76, 76, 217, 65, 67, 84, 73, 86, 65, 84, 197, 65, 67, - 82, 79, 80, 72, 79, 78, 73, 195, 65, 67, 75, 78, 79, 87, 76, 69, 68, 71, - 69, 128, 65, 67, 67, 85, 77, 85, 76, 65, 84, 73, 79, 78, 128, 65, 67, 67, - 79, 85, 78, 212, 65, 67, 67, 79, 77, 77, 79, 68, 65, 84, 73, 79, 78, 128, - 65, 67, 67, 69, 80, 84, 128, 65, 67, 67, 69, 78, 84, 45, 83, 84, 65, 67, - 67, 65, 84, 79, 128, 65, 67, 67, 69, 78, 84, 128, 65, 67, 67, 69, 78, - 212, 65, 67, 65, 68, 69, 77, 217, 65, 66, 89, 83, 77, 65, 204, 65, 66, - 85, 78, 68, 65, 78, 67, 69, 128, 65, 66, 75, 72, 65, 83, 73, 65, 206, 65, - 66, 66, 82, 69, 86, 73, 65, 84, 73, 79, 206, 65, 66, 65, 70, 73, 76, 73, - 128, 65, 66, 178, 65, 66, 49, 57, 49, 128, 65, 66, 49, 56, 56, 128, 65, - 66, 49, 56, 48, 128, 65, 66, 49, 55, 49, 128, 65, 66, 49, 54, 52, 128, - 65, 66, 49, 51, 49, 66, 128, 65, 66, 49, 51, 49, 65, 128, 65, 66, 49, 50, - 51, 128, 65, 66, 49, 50, 50, 128, 65, 66, 49, 50, 48, 128, 65, 66, 49, - 49, 56, 128, 65, 66, 48, 56, 55, 128, 65, 66, 48, 56, 54, 128, 65, 66, - 48, 56, 53, 128, 65, 66, 48, 56, 50, 128, 65, 66, 48, 56, 49, 128, 65, - 66, 48, 56, 48, 128, 65, 66, 48, 55, 57, 128, 65, 66, 48, 55, 56, 128, - 65, 66, 48, 55, 55, 128, 65, 66, 48, 55, 54, 128, 65, 66, 48, 55, 52, - 128, 65, 66, 48, 55, 51, 128, 65, 66, 48, 55, 48, 128, 65, 66, 48, 54, - 57, 128, 65, 66, 48, 54, 55, 128, 65, 66, 48, 54, 54, 128, 65, 66, 48, - 54, 53, 128, 65, 66, 48, 54, 49, 128, 65, 66, 48, 54, 48, 128, 65, 66, - 48, 53, 57, 128, 65, 66, 48, 53, 56, 128, 65, 66, 48, 53, 55, 128, 65, - 66, 48, 53, 54, 128, 65, 66, 48, 53, 53, 128, 65, 66, 48, 53, 52, 128, - 65, 66, 48, 53, 51, 128, 65, 66, 48, 53, 49, 128, 65, 66, 48, 53, 48, - 128, 65, 66, 48, 52, 57, 128, 65, 66, 48, 52, 56, 128, 65, 66, 48, 52, - 55, 128, 65, 66, 48, 52, 54, 128, 65, 66, 48, 52, 53, 128, 65, 66, 48, - 52, 52, 128, 65, 66, 48, 52, 49, 128, 65, 66, 48, 52, 48, 128, 65, 66, - 48, 51, 57, 128, 65, 66, 48, 51, 56, 128, 65, 66, 48, 51, 55, 128, 65, - 66, 48, 51, 52, 128, 65, 66, 48, 51, 49, 128, 65, 66, 48, 51, 48, 128, - 65, 66, 48, 50, 57, 128, 65, 66, 48, 50, 56, 128, 65, 66, 48, 50, 55, - 128, 65, 66, 48, 50, 54, 128, 65, 66, 48, 50, 52, 128, 65, 66, 48, 50, - 51, 77, 128, 65, 66, 48, 50, 51, 128, 65, 66, 48, 50, 50, 77, 128, 65, - 66, 48, 50, 50, 70, 128, 65, 66, 48, 50, 50, 128, 65, 66, 48, 50, 49, 77, - 128, 65, 66, 48, 50, 49, 70, 128, 65, 66, 48, 50, 49, 128, 65, 66, 48, - 50, 48, 128, 65, 66, 48, 49, 55, 128, 65, 66, 48, 49, 54, 128, 65, 66, - 48, 49, 51, 128, 65, 66, 48, 49, 49, 128, 65, 66, 48, 49, 48, 128, 65, - 66, 48, 48, 57, 128, 65, 66, 48, 48, 56, 128, 65, 66, 48, 48, 55, 128, - 65, 66, 48, 48, 54, 128, 65, 66, 48, 48, 53, 128, 65, 66, 48, 48, 52, - 128, 65, 66, 48, 48, 51, 128, 65, 66, 48, 48, 50, 128, 65, 66, 48, 48, - 49, 128, 65, 65, 89, 73, 78, 128, 65, 65, 89, 65, 78, 78, 65, 128, 65, - 65, 89, 128, 65, 65, 87, 128, 65, 65, 79, 128, 65, 65, 74, 128, 65, 65, - 66, 65, 65, 70, 73, 76, 73, 128, 65, 65, 48, 51, 50, 128, 65, 65, 48, 51, - 49, 128, 65, 65, 48, 51, 48, 128, 65, 65, 48, 50, 57, 128, 65, 65, 48, - 50, 56, 128, 65, 65, 48, 50, 55, 128, 65, 65, 48, 50, 54, 128, 65, 65, - 48, 50, 53, 128, 65, 65, 48, 50, 52, 128, 65, 65, 48, 50, 51, 128, 65, - 65, 48, 50, 50, 128, 65, 65, 48, 50, 49, 128, 65, 65, 48, 50, 48, 128, - 65, 65, 48, 49, 57, 128, 65, 65, 48, 49, 56, 128, 65, 65, 48, 49, 55, - 128, 65, 65, 48, 49, 54, 128, 65, 65, 48, 49, 53, 128, 65, 65, 48, 49, - 52, 128, 65, 65, 48, 49, 51, 128, 65, 65, 48, 49, 50, 128, 65, 65, 48, - 49, 49, 128, 65, 65, 48, 49, 48, 128, 65, 65, 48, 48, 57, 128, 65, 65, - 48, 48, 56, 128, 65, 65, 48, 48, 55, 66, 128, 65, 65, 48, 48, 55, 65, - 128, 65, 65, 48, 48, 55, 128, 65, 65, 48, 48, 54, 128, 65, 65, 48, 48, - 53, 128, 65, 65, 48, 48, 52, 128, 65, 65, 48, 48, 51, 128, 65, 65, 48, - 48, 50, 128, 65, 65, 48, 48, 49, 128, 65, 56, 48, 55, 128, 65, 56, 48, - 54, 128, 65, 56, 48, 53, 128, 65, 56, 48, 52, 128, 65, 56, 48, 51, 128, - 65, 56, 48, 50, 128, 65, 56, 48, 49, 128, 65, 56, 48, 48, 128, 65, 55, - 51, 178, 65, 55, 50, 182, 65, 55, 49, 183, 65, 55, 49, 181, 65, 55, 49, - 180, 65, 55, 49, 179, 65, 55, 49, 178, 65, 55, 49, 177, 65, 55, 49, 176, - 65, 55, 48, 57, 45, 182, 65, 55, 48, 57, 45, 180, 65, 55, 48, 57, 45, - 179, 65, 55, 48, 57, 45, 178, 65, 55, 48, 185, 65, 55, 48, 184, 65, 55, - 48, 183, 65, 55, 48, 182, 65, 55, 48, 181, 65, 55, 48, 180, 65, 55, 48, - 179, 65, 55, 48, 178, 65, 55, 48, 177, 65, 54, 54, 52, 128, 65, 54, 54, - 51, 128, 65, 54, 54, 50, 128, 65, 54, 54, 49, 128, 65, 54, 54, 48, 128, - 65, 54, 53, 57, 128, 65, 54, 53, 56, 128, 65, 54, 53, 55, 128, 65, 54, - 53, 54, 128, 65, 54, 53, 53, 128, 65, 54, 53, 52, 128, 65, 54, 53, 51, - 128, 65, 54, 53, 50, 128, 65, 54, 53, 49, 128, 65, 54, 52, 57, 128, 65, - 54, 52, 56, 128, 65, 54, 52, 54, 128, 65, 54, 52, 53, 128, 65, 54, 52, - 52, 128, 65, 54, 52, 51, 128, 65, 54, 52, 50, 128, 65, 54, 52, 48, 128, - 65, 54, 51, 56, 128, 65, 54, 51, 55, 128, 65, 54, 51, 52, 128, 65, 54, - 50, 57, 128, 65, 54, 50, 56, 128, 65, 54, 50, 55, 128, 65, 54, 50, 54, - 128, 65, 54, 50, 52, 128, 65, 54, 50, 51, 128, 65, 54, 50, 50, 128, 65, - 54, 50, 49, 128, 65, 54, 50, 48, 128, 65, 54, 49, 57, 128, 65, 54, 49, - 56, 128, 65, 54, 49, 55, 128, 65, 54, 49, 54, 128, 65, 54, 49, 53, 128, - 65, 54, 49, 52, 128, 65, 54, 49, 51, 128, 65, 54, 49, 50, 128, 65, 54, - 49, 49, 128, 65, 54, 49, 48, 128, 65, 54, 48, 57, 128, 65, 54, 48, 56, - 128, 65, 54, 48, 54, 128, 65, 54, 48, 52, 128, 65, 54, 48, 51, 128, 65, - 54, 48, 50, 128, 65, 54, 48, 49, 128, 65, 54, 48, 48, 128, 65, 53, 57, - 56, 128, 65, 53, 57, 54, 128, 65, 53, 57, 53, 128, 65, 53, 57, 52, 128, - 65, 53, 57, 50, 128, 65, 53, 57, 49, 128, 65, 53, 56, 57, 128, 65, 53, - 56, 56, 128, 65, 53, 56, 55, 128, 65, 53, 56, 54, 128, 65, 53, 56, 53, - 128, 65, 53, 56, 52, 128, 65, 53, 56, 51, 128, 65, 53, 56, 50, 128, 65, - 53, 56, 49, 128, 65, 53, 56, 48, 128, 65, 53, 55, 57, 128, 65, 53, 55, - 56, 128, 65, 53, 55, 55, 128, 65, 53, 55, 54, 128, 65, 53, 55, 53, 128, - 65, 53, 55, 52, 128, 65, 53, 55, 51, 128, 65, 53, 55, 50, 128, 65, 53, - 55, 49, 128, 65, 53, 55, 48, 128, 65, 53, 54, 57, 128, 65, 53, 54, 56, - 128, 65, 53, 54, 54, 128, 65, 53, 54, 53, 128, 65, 53, 54, 52, 128, 65, - 53, 54, 51, 128, 65, 53, 53, 57, 128, 65, 53, 53, 55, 128, 65, 53, 53, - 54, 128, 65, 53, 53, 53, 128, 65, 53, 53, 52, 128, 65, 53, 53, 51, 128, - 65, 53, 53, 50, 128, 65, 53, 53, 49, 128, 65, 53, 53, 48, 128, 65, 53, - 52, 57, 128, 65, 53, 52, 56, 128, 65, 53, 52, 55, 128, 65, 53, 52, 53, - 128, 65, 53, 52, 50, 128, 65, 53, 52, 49, 128, 65, 53, 52, 48, 128, 65, - 53, 51, 57, 128, 65, 53, 51, 56, 128, 65, 53, 51, 55, 128, 65, 53, 51, - 54, 128, 65, 53, 51, 53, 128, 65, 53, 51, 52, 128, 65, 53, 51, 50, 128, - 65, 53, 51, 49, 128, 65, 53, 51, 48, 128, 65, 53, 50, 57, 128, 65, 53, - 50, 56, 128, 65, 53, 50, 55, 128, 65, 53, 50, 54, 128, 65, 53, 50, 53, - 128, 65, 53, 50, 52, 128, 65, 53, 50, 51, 128, 65, 53, 50, 50, 128, 65, - 53, 50, 49, 128, 65, 53, 50, 48, 128, 65, 53, 49, 57, 128, 65, 53, 49, - 56, 128, 65, 53, 49, 55, 128, 65, 53, 49, 54, 128, 65, 53, 49, 53, 128, - 65, 53, 49, 52, 128, 65, 53, 49, 51, 128, 65, 53, 49, 50, 128, 65, 53, - 49, 49, 128, 65, 53, 49, 48, 128, 65, 53, 48, 57, 128, 65, 53, 48, 56, - 128, 65, 53, 48, 55, 128, 65, 53, 48, 54, 128, 65, 53, 48, 53, 128, 65, - 53, 48, 52, 128, 65, 53, 48, 51, 128, 65, 53, 48, 50, 128, 65, 53, 48, - 49, 128, 65, 52, 57, 55, 128, 65, 52, 57, 54, 128, 65, 52, 57, 53, 128, - 65, 52, 57, 52, 128, 65, 52, 57, 51, 128, 65, 52, 57, 50, 128, 65, 52, - 57, 49, 128, 65, 52, 57, 48, 128, 65, 52, 56, 57, 128, 65, 52, 56, 56, - 128, 65, 52, 56, 55, 128, 65, 52, 56, 54, 128, 65, 52, 56, 53, 128, 65, - 52, 56, 52, 128, 65, 52, 56, 51, 128, 65, 52, 56, 50, 128, 65, 52, 56, - 49, 128, 65, 52, 56, 48, 128, 65, 52, 55, 57, 128, 65, 52, 55, 56, 128, - 65, 52, 55, 55, 128, 65, 52, 55, 54, 128, 65, 52, 55, 53, 128, 65, 52, - 55, 52, 128, 65, 52, 55, 51, 128, 65, 52, 55, 50, 128, 65, 52, 55, 49, - 128, 65, 52, 55, 48, 128, 65, 52, 54, 57, 128, 65, 52, 54, 56, 128, 65, - 52, 54, 55, 128, 65, 52, 54, 54, 128, 65, 52, 54, 53, 128, 65, 52, 54, - 52, 128, 65, 52, 54, 51, 128, 65, 52, 54, 50, 128, 65, 52, 54, 49, 128, - 65, 52, 54, 48, 128, 65, 52, 53, 57, 128, 65, 52, 53, 56, 128, 65, 52, - 53, 55, 65, 128, 65, 52, 53, 55, 128, 65, 52, 53, 54, 128, 65, 52, 53, - 53, 128, 65, 52, 53, 52, 128, 65, 52, 53, 51, 128, 65, 52, 53, 50, 128, - 65, 52, 53, 49, 128, 65, 52, 53, 48, 65, 128, 65, 52, 53, 48, 128, 65, - 52, 52, 57, 128, 65, 52, 52, 56, 128, 65, 52, 52, 55, 128, 65, 52, 52, - 54, 128, 65, 52, 52, 53, 128, 65, 52, 52, 52, 128, 65, 52, 52, 51, 128, - 65, 52, 52, 50, 128, 65, 52, 52, 49, 128, 65, 52, 52, 48, 128, 65, 52, - 51, 57, 128, 65, 52, 51, 56, 128, 65, 52, 51, 55, 128, 65, 52, 51, 54, - 128, 65, 52, 51, 53, 128, 65, 52, 51, 52, 128, 65, 52, 51, 51, 128, 65, - 52, 51, 50, 128, 65, 52, 51, 49, 128, 65, 52, 51, 48, 128, 65, 52, 50, - 57, 128, 65, 52, 50, 56, 128, 65, 52, 50, 55, 128, 65, 52, 50, 54, 128, - 65, 52, 50, 53, 128, 65, 52, 50, 52, 128, 65, 52, 50, 51, 128, 65, 52, - 50, 50, 128, 65, 52, 50, 49, 128, 65, 52, 50, 48, 128, 65, 52, 49, 57, - 128, 65, 52, 49, 56, 45, 86, 65, 83, 128, 65, 52, 49, 56, 128, 65, 52, - 49, 55, 45, 86, 65, 83, 128, 65, 52, 49, 55, 128, 65, 52, 49, 54, 45, 86, - 65, 83, 128, 65, 52, 49, 54, 128, 65, 52, 49, 53, 45, 86, 65, 83, 128, - 65, 52, 49, 53, 128, 65, 52, 49, 52, 45, 86, 65, 83, 128, 65, 52, 49, 52, - 128, 65, 52, 49, 51, 45, 86, 65, 83, 128, 65, 52, 49, 51, 128, 65, 52, - 49, 50, 45, 86, 65, 83, 128, 65, 52, 49, 50, 128, 65, 52, 49, 49, 45, 86, - 65, 83, 128, 65, 52, 49, 49, 128, 65, 52, 49, 48, 193, 65, 52, 49, 48, - 45, 86, 65, 83, 128, 65, 52, 49, 176, 65, 52, 48, 57, 45, 86, 65, 83, - 128, 65, 52, 48, 57, 128, 65, 52, 48, 56, 45, 86, 65, 83, 128, 65, 52, - 48, 56, 128, 65, 52, 48, 55, 45, 86, 65, 83, 128, 65, 52, 48, 55, 128, - 65, 52, 48, 54, 45, 86, 65, 83, 128, 65, 52, 48, 54, 128, 65, 52, 48, 53, - 45, 86, 65, 83, 128, 65, 52, 48, 53, 128, 65, 52, 48, 52, 45, 86, 65, 83, - 128, 65, 52, 48, 52, 128, 65, 52, 48, 51, 45, 86, 65, 83, 128, 65, 52, - 48, 51, 128, 65, 52, 48, 50, 45, 86, 65, 83, 128, 65, 52, 48, 50, 128, - 65, 52, 48, 49, 45, 86, 65, 83, 128, 65, 52, 48, 49, 128, 65, 52, 48, 48, - 45, 86, 65, 83, 128, 65, 52, 48, 48, 128, 65, 51, 57, 57, 128, 65, 51, - 57, 56, 128, 65, 51, 57, 55, 128, 65, 51, 57, 54, 128, 65, 51, 57, 53, - 128, 65, 51, 57, 52, 128, 65, 51, 57, 179, 65, 51, 57, 50, 128, 65, 51, - 57, 49, 128, 65, 51, 57, 48, 128, 65, 51, 56, 57, 128, 65, 51, 56, 56, - 128, 65, 51, 56, 55, 128, 65, 51, 56, 54, 65, 128, 65, 51, 56, 54, 128, - 65, 51, 56, 53, 128, 65, 51, 56, 52, 128, 65, 51, 56, 51, 65, 128, 65, - 51, 56, 179, 65, 51, 56, 50, 128, 65, 51, 56, 49, 65, 128, 65, 51, 56, - 49, 128, 65, 51, 56, 48, 128, 65, 51, 55, 57, 128, 65, 51, 55, 56, 128, - 65, 51, 55, 55, 128, 65, 51, 55, 54, 128, 65, 51, 55, 53, 128, 65, 51, - 55, 52, 128, 65, 51, 55, 51, 128, 65, 51, 55, 50, 128, 65, 51, 55, 49, - 65, 128, 65, 51, 55, 49, 128, 65, 51, 55, 48, 128, 65, 51, 54, 57, 128, - 65, 51, 54, 56, 65, 128, 65, 51, 54, 56, 128, 65, 51, 54, 55, 128, 65, - 51, 54, 54, 128, 65, 51, 54, 53, 128, 65, 51, 54, 52, 65, 128, 65, 51, - 54, 52, 128, 65, 51, 54, 51, 128, 65, 51, 54, 50, 128, 65, 51, 54, 49, - 128, 65, 51, 54, 48, 128, 65, 51, 53, 57, 65, 128, 65, 51, 53, 57, 128, - 65, 51, 53, 56, 128, 65, 51, 53, 55, 128, 65, 51, 53, 54, 128, 65, 51, - 53, 53, 128, 65, 51, 53, 52, 128, 65, 51, 53, 51, 128, 65, 51, 53, 50, - 128, 65, 51, 53, 49, 128, 65, 51, 53, 48, 128, 65, 51, 52, 57, 128, 65, - 51, 52, 56, 128, 65, 51, 52, 55, 128, 65, 51, 52, 54, 128, 65, 51, 52, - 53, 128, 65, 51, 52, 52, 128, 65, 51, 52, 51, 128, 65, 51, 52, 50, 128, - 65, 51, 52, 49, 128, 65, 51, 52, 48, 128, 65, 51, 51, 57, 128, 65, 51, - 51, 56, 128, 65, 51, 51, 55, 128, 65, 51, 51, 54, 67, 128, 65, 51, 51, - 54, 66, 128, 65, 51, 51, 54, 65, 128, 65, 51, 51, 54, 128, 65, 51, 51, - 53, 128, 65, 51, 51, 52, 128, 65, 51, 51, 51, 128, 65, 51, 51, 50, 67, - 128, 65, 51, 51, 50, 66, 128, 65, 51, 51, 50, 65, 128, 65, 51, 51, 50, - 128, 65, 51, 51, 49, 128, 65, 51, 51, 48, 128, 65, 51, 50, 57, 65, 128, - 65, 51, 50, 57, 128, 65, 51, 50, 56, 128, 65, 51, 50, 55, 128, 65, 51, - 50, 54, 128, 65, 51, 50, 53, 128, 65, 51, 50, 52, 128, 65, 51, 50, 51, - 128, 65, 51, 50, 50, 128, 65, 51, 50, 49, 128, 65, 51, 50, 48, 128, 65, - 51, 49, 57, 128, 65, 51, 49, 56, 128, 65, 51, 49, 55, 128, 65, 51, 49, - 54, 128, 65, 51, 49, 53, 128, 65, 51, 49, 52, 128, 65, 51, 49, 51, 67, - 128, 65, 51, 49, 51, 66, 128, 65, 51, 49, 51, 65, 128, 65, 51, 49, 51, - 128, 65, 51, 49, 50, 128, 65, 51, 49, 49, 128, 65, 51, 49, 48, 128, 65, - 51, 48, 57, 67, 128, 65, 51, 48, 57, 66, 128, 65, 51, 48, 57, 65, 128, - 65, 51, 48, 57, 128, 65, 51, 48, 56, 128, 65, 51, 48, 55, 128, 65, 51, - 48, 54, 128, 65, 51, 48, 53, 128, 65, 51, 48, 52, 128, 65, 51, 48, 51, - 128, 65, 51, 48, 50, 128, 65, 51, 48, 49, 128, 65, 51, 48, 48, 128, 65, - 50, 57, 57, 65, 128, 65, 50, 57, 57, 128, 65, 50, 57, 56, 128, 65, 50, - 57, 55, 128, 65, 50, 57, 54, 128, 65, 50, 57, 53, 128, 65, 50, 57, 52, - 65, 128, 65, 50, 57, 52, 128, 65, 50, 57, 51, 128, 65, 50, 57, 50, 128, - 65, 50, 57, 49, 128, 65, 50, 57, 48, 128, 65, 50, 56, 57, 65, 128, 65, - 50, 56, 57, 128, 65, 50, 56, 56, 128, 65, 50, 56, 55, 128, 65, 50, 56, - 54, 128, 65, 50, 56, 53, 128, 65, 50, 56, 52, 128, 65, 50, 56, 51, 128, - 65, 50, 56, 50, 128, 65, 50, 56, 49, 128, 65, 50, 56, 48, 128, 65, 50, - 55, 57, 128, 65, 50, 55, 56, 128, 65, 50, 55, 55, 128, 65, 50, 55, 54, - 128, 65, 50, 55, 53, 128, 65, 50, 55, 52, 128, 65, 50, 55, 51, 128, 65, - 50, 55, 50, 128, 65, 50, 55, 49, 128, 65, 50, 55, 48, 128, 65, 50, 54, - 57, 128, 65, 50, 54, 56, 128, 65, 50, 54, 55, 65, 128, 65, 50, 54, 55, - 128, 65, 50, 54, 54, 128, 65, 50, 54, 53, 128, 65, 50, 54, 52, 128, 65, - 50, 54, 51, 128, 65, 50, 54, 50, 128, 65, 50, 54, 49, 128, 65, 50, 54, - 48, 128, 65, 50, 53, 57, 128, 65, 50, 53, 56, 128, 65, 50, 53, 55, 128, - 65, 50, 53, 54, 128, 65, 50, 53, 53, 128, 65, 50, 53, 52, 128, 65, 50, - 53, 51, 128, 65, 50, 53, 50, 128, 65, 50, 53, 49, 128, 65, 50, 53, 48, - 128, 65, 50, 52, 57, 128, 65, 50, 52, 56, 128, 65, 50, 52, 55, 128, 65, - 50, 52, 54, 128, 65, 50, 52, 53, 128, 65, 50, 52, 52, 128, 65, 50, 52, - 51, 128, 65, 50, 52, 50, 128, 65, 50, 52, 49, 128, 65, 50, 52, 48, 128, - 65, 50, 51, 57, 128, 65, 50, 51, 56, 128, 65, 50, 51, 55, 128, 65, 50, - 51, 54, 128, 65, 50, 51, 53, 128, 65, 50, 51, 52, 128, 65, 50, 51, 51, - 128, 65, 50, 51, 50, 128, 65, 50, 51, 49, 128, 65, 50, 51, 48, 128, 65, - 50, 50, 57, 128, 65, 50, 50, 56, 128, 65, 50, 50, 55, 65, 128, 65, 50, - 50, 55, 128, 65, 50, 50, 54, 128, 65, 50, 50, 53, 128, 65, 50, 50, 52, - 128, 65, 50, 50, 51, 128, 65, 50, 50, 50, 128, 65, 50, 50, 49, 128, 65, - 50, 50, 48, 128, 65, 50, 49, 57, 128, 65, 50, 49, 56, 128, 65, 50, 49, - 55, 128, 65, 50, 49, 54, 65, 128, 65, 50, 49, 54, 128, 65, 50, 49, 53, - 65, 128, 65, 50, 49, 53, 128, 65, 50, 49, 52, 128, 65, 50, 49, 51, 128, - 65, 50, 49, 50, 128, 65, 50, 49, 49, 128, 65, 50, 49, 48, 128, 65, 50, - 48, 57, 65, 128, 65, 50, 48, 57, 128, 65, 50, 48, 56, 128, 65, 50, 48, - 55, 65, 128, 65, 50, 48, 55, 128, 65, 50, 48, 54, 128, 65, 50, 48, 53, - 128, 65, 50, 48, 52, 128, 65, 50, 48, 51, 128, 65, 50, 48, 50, 66, 128, - 65, 50, 48, 50, 65, 128, 65, 50, 48, 50, 128, 65, 50, 48, 49, 128, 65, - 50, 48, 48, 128, 65, 49, 57, 57, 128, 65, 49, 57, 56, 128, 65, 49, 57, - 55, 128, 65, 49, 57, 54, 128, 65, 49, 57, 53, 128, 65, 49, 57, 52, 128, - 65, 49, 57, 51, 128, 65, 49, 57, 50, 128, 65, 49, 57, 49, 128, 65, 49, - 57, 48, 128, 65, 49, 56, 57, 128, 65, 49, 56, 56, 128, 65, 49, 56, 55, - 128, 65, 49, 56, 54, 128, 65, 49, 56, 53, 128, 65, 49, 56, 52, 128, 65, - 49, 56, 51, 128, 65, 49, 56, 50, 128, 65, 49, 56, 49, 128, 65, 49, 56, - 48, 128, 65, 49, 55, 57, 128, 65, 49, 55, 56, 128, 65, 49, 55, 55, 128, - 65, 49, 55, 54, 128, 65, 49, 55, 53, 128, 65, 49, 55, 52, 128, 65, 49, - 55, 51, 128, 65, 49, 55, 50, 128, 65, 49, 55, 49, 128, 65, 49, 55, 48, - 128, 65, 49, 54, 57, 128, 65, 49, 54, 56, 128, 65, 49, 54, 55, 128, 65, - 49, 54, 54, 128, 65, 49, 54, 53, 128, 65, 49, 54, 52, 128, 65, 49, 54, - 51, 128, 65, 49, 54, 50, 128, 65, 49, 54, 49, 128, 65, 49, 54, 48, 128, - 65, 49, 53, 57, 128, 65, 49, 53, 56, 128, 65, 49, 53, 55, 128, 65, 49, - 53, 54, 128, 65, 49, 53, 53, 128, 65, 49, 53, 52, 128, 65, 49, 53, 51, - 128, 65, 49, 53, 50, 128, 65, 49, 53, 49, 128, 65, 49, 53, 48, 128, 65, - 49, 52, 57, 128, 65, 49, 52, 56, 128, 65, 49, 52, 55, 128, 65, 49, 52, - 54, 128, 65, 49, 52, 53, 128, 65, 49, 52, 52, 128, 65, 49, 52, 51, 128, - 65, 49, 52, 50, 128, 65, 49, 52, 49, 128, 65, 49, 52, 48, 128, 65, 49, - 51, 57, 128, 65, 49, 51, 56, 128, 65, 49, 51, 55, 128, 65, 49, 51, 54, - 128, 65, 49, 51, 53, 65, 128, 65, 49, 51, 53, 128, 65, 49, 51, 52, 128, - 65, 49, 51, 51, 128, 65, 49, 51, 50, 128, 65, 49, 51, 49, 67, 128, 65, - 49, 51, 49, 128, 65, 49, 51, 48, 128, 65, 49, 50, 57, 128, 65, 49, 50, - 56, 128, 65, 49, 50, 55, 128, 65, 49, 50, 54, 128, 65, 49, 50, 53, 65, - 128, 65, 49, 50, 53, 128, 65, 49, 50, 52, 128, 65, 49, 50, 51, 128, 65, - 49, 50, 50, 128, 65, 49, 50, 49, 128, 65, 49, 50, 48, 66, 128, 65, 49, - 50, 48, 128, 65, 49, 49, 57, 128, 65, 49, 49, 56, 128, 65, 49, 49, 55, - 128, 65, 49, 49, 54, 128, 65, 49, 49, 53, 65, 128, 65, 49, 49, 53, 128, - 65, 49, 49, 52, 128, 65, 49, 49, 51, 128, 65, 49, 49, 50, 128, 65, 49, - 49, 49, 128, 65, 49, 49, 48, 66, 128, 65, 49, 49, 48, 65, 128, 65, 49, - 49, 48, 128, 65, 49, 48, 57, 128, 65, 49, 48, 56, 128, 65, 49, 48, 55, - 67, 128, 65, 49, 48, 55, 66, 128, 65, 49, 48, 55, 65, 128, 65, 49, 48, - 55, 128, 65, 49, 48, 54, 128, 65, 49, 48, 53, 66, 128, 65, 49, 48, 53, - 65, 128, 65, 49, 48, 53, 128, 65, 49, 48, 52, 67, 128, 65, 49, 48, 52, - 66, 128, 65, 49, 48, 52, 65, 128, 65, 49, 48, 52, 128, 65, 49, 48, 51, - 128, 65, 49, 48, 50, 65, 128, 65, 49, 48, 50, 128, 65, 49, 48, 49, 65, - 128, 65, 49, 48, 49, 128, 65, 49, 48, 48, 65, 128, 65, 49, 48, 48, 45, - 49, 48, 50, 128, 65, 49, 48, 48, 128, 65, 48, 57, 57, 128, 65, 48, 57, - 56, 65, 128, 65, 48, 57, 56, 128, 65, 48, 57, 55, 65, 128, 65, 48, 57, - 55, 128, 65, 48, 57, 54, 128, 65, 48, 57, 53, 128, 65, 48, 57, 52, 128, - 65, 48, 57, 51, 128, 65, 48, 57, 50, 128, 65, 48, 57, 49, 128, 65, 48, - 57, 48, 128, 65, 48, 56, 57, 128, 65, 48, 56, 56, 128, 65, 48, 56, 55, - 128, 65, 48, 56, 54, 128, 65, 48, 56, 53, 128, 65, 48, 56, 52, 128, 65, - 48, 56, 51, 128, 65, 48, 56, 50, 128, 65, 48, 56, 49, 128, 65, 48, 56, - 48, 128, 65, 48, 55, 57, 128, 65, 48, 55, 56, 128, 65, 48, 55, 55, 128, - 65, 48, 55, 54, 128, 65, 48, 55, 53, 128, 65, 48, 55, 52, 128, 65, 48, - 55, 51, 128, 65, 48, 55, 50, 128, 65, 48, 55, 49, 128, 65, 48, 55, 48, - 128, 65, 48, 54, 57, 128, 65, 48, 54, 56, 128, 65, 48, 54, 55, 128, 65, - 48, 54, 54, 67, 128, 65, 48, 54, 54, 66, 128, 65, 48, 54, 54, 65, 128, - 65, 48, 54, 54, 128, 65, 48, 54, 53, 128, 65, 48, 54, 52, 128, 65, 48, - 54, 51, 128, 65, 48, 54, 50, 128, 65, 48, 54, 49, 128, 65, 48, 54, 48, - 128, 65, 48, 53, 57, 128, 65, 48, 53, 56, 128, 65, 48, 53, 55, 128, 65, - 48, 53, 54, 128, 65, 48, 53, 53, 128, 65, 48, 53, 52, 128, 65, 48, 53, - 51, 128, 65, 48, 53, 50, 128, 65, 48, 53, 49, 128, 65, 48, 53, 48, 128, - 65, 48, 52, 57, 128, 65, 48, 52, 56, 128, 65, 48, 52, 55, 128, 65, 48, - 52, 54, 66, 128, 65, 48, 52, 54, 65, 128, 65, 48, 52, 54, 128, 65, 48, - 52, 53, 65, 128, 65, 48, 52, 53, 128, 65, 48, 52, 52, 128, 65, 48, 52, - 51, 65, 128, 65, 48, 52, 51, 128, 65, 48, 52, 50, 65, 128, 65, 48, 52, - 50, 128, 65, 48, 52, 49, 65, 128, 65, 48, 52, 49, 128, 65, 48, 52, 48, - 65, 128, 65, 48, 52, 48, 128, 65, 48, 51, 57, 65, 128, 65, 48, 51, 57, - 128, 65, 48, 51, 56, 128, 65, 48, 51, 55, 128, 65, 48, 51, 54, 128, 65, - 48, 51, 53, 128, 65, 48, 51, 52, 128, 65, 48, 51, 51, 128, 65, 48, 51, - 50, 65, 128, 65, 48, 50, 56, 66, 128, 65, 48, 50, 54, 65, 128, 65, 48, - 49, 55, 65, 128, 65, 48, 49, 52, 65, 128, 65, 48, 49, 48, 65, 128, 65, - 48, 48, 54, 66, 128, 65, 48, 48, 54, 65, 128, 65, 48, 48, 53, 65, 128, - 65, 45, 69, 85, 128, 45, 85, 205, 45, 80, 72, 82, 85, 128, 45, 75, 72, - 89, 85, 196, 45, 75, 72, 89, 73, 76, 128, 45, 68, 90, 85, 196, 45, 67, - 72, 65, 210, 45, 67, 72, 65, 76, 128, + 76, 79, 128, 65, 76, 76, 73, 65, 78, 67, 69, 128, 65, 76, 76, 201, 65, + 76, 76, 65, 200, 65, 76, 75, 65, 76, 73, 45, 50, 128, 65, 76, 75, 65, 76, + 73, 128, 65, 76, 73, 71, 78, 69, 196, 65, 76, 73, 70, 85, 128, 65, 76, + 73, 70, 128, 65, 76, 73, 198, 65, 76, 73, 69, 78, 128, 65, 76, 73, 69, + 206, 65, 76, 71, 73, 218, 65, 76, 70, 65, 128, 65, 76, 69, 85, 212, 65, + 76, 69, 82, 84, 128, 65, 76, 69, 80, 72, 128, 65, 76, 69, 77, 66, 73, 67, + 128, 65, 76, 69, 70, 128, 65, 76, 66, 65, 78, 73, 65, 206, 65, 76, 65, + 89, 72, 69, 128, 65, 76, 65, 89, 72, 197, 65, 76, 65, 82, 205, 65, 76, + 65, 80, 72, 128, 65, 76, 45, 76, 65, 75, 85, 78, 65, 128, 65, 75, 84, 73, + 69, 83, 69, 76, 83, 75, 65, 66, 128, 65, 75, 83, 65, 128, 65, 75, 72, 77, + 73, 77, 73, 195, 65, 75, 66, 65, 210, 65, 75, 65, 82, 65, 128, 65, 75, + 65, 82, 193, 65, 73, 89, 65, 78, 78, 65, 128, 65, 73, 86, 73, 76, 73, + 203, 65, 73, 84, 79, 206, 65, 73, 82, 80, 76, 65, 78, 69, 128, 65, 73, + 82, 80, 76, 65, 78, 197, 65, 73, 78, 213, 65, 73, 78, 78, 128, 65, 73, + 76, 77, 128, 65, 73, 75, 65, 82, 65, 128, 65, 73, 72, 86, 85, 83, 128, + 65, 72, 83, 68, 65, 128, 65, 72, 83, 65, 128, 65, 72, 79, 205, 65, 72, + 65, 78, 199, 65, 72, 65, 71, 71, 65, 210, 65, 72, 65, 68, 128, 65, 71, + 85, 78, 71, 128, 65, 71, 79, 71, 201, 65, 71, 71, 82, 65, 86, 65, 84, 73, + 79, 78, 128, 65, 71, 71, 82, 65, 86, 65, 84, 69, 196, 65, 71, 65, 73, 78, + 83, 212, 65, 71, 65, 73, 78, 128, 65, 70, 84, 69, 210, 65, 70, 83, 65, + 65, 81, 128, 65, 70, 82, 73, 67, 65, 206, 65, 70, 79, 82, 69, 77, 69, 78, + 84, 73, 79, 78, 69, 68, 128, 65, 70, 71, 72, 65, 78, 201, 65, 70, 70, 82, + 73, 67, 65, 84, 73, 79, 206, 65, 70, 70, 73, 216, 65, 69, 89, 65, 78, 78, + 65, 128, 65, 69, 89, 128, 65, 69, 83, 67, 85, 76, 65, 80, 73, 85, 83, + 128, 65, 69, 83, 67, 128, 65, 69, 83, 128, 65, 69, 82, 73, 65, 204, 65, + 69, 82, 128, 65, 69, 76, 65, 45, 80, 73, 76, 76, 65, 128, 65, 69, 76, + 128, 65, 69, 75, 128, 65, 69, 71, 69, 65, 206, 65, 69, 71, 128, 65, 69, + 69, 89, 65, 78, 78, 65, 128, 65, 69, 69, 128, 65, 69, 68, 65, 45, 80, 73, + 76, 76, 65, 128, 65, 69, 68, 128, 65, 69, 66, 128, 65, 68, 86, 65, 78, + 84, 65, 71, 69, 128, 65, 68, 86, 65, 78, 67, 69, 128, 65, 68, 77, 73, 83, + 83, 73, 79, 206, 65, 68, 76, 65, 205, 65, 68, 69, 71, 128, 65, 68, 69, + 199, 65, 68, 68, 82, 69, 83, 83, 69, 196, 65, 68, 68, 82, 69, 83, 211, + 65, 68, 68, 65, 75, 128, 65, 68, 65, 203, 65, 67, 85, 84, 69, 45, 77, 65, + 67, 82, 79, 78, 128, 65, 67, 85, 84, 69, 45, 71, 82, 65, 86, 69, 45, 65, + 67, 85, 84, 69, 128, 65, 67, 85, 84, 197, 65, 67, 84, 85, 65, 76, 76, + 217, 65, 67, 84, 73, 86, 65, 84, 197, 65, 67, 82, 79, 80, 72, 79, 78, 73, + 195, 65, 67, 75, 78, 79, 87, 76, 69, 68, 71, 69, 128, 65, 67, 67, 85, 77, + 85, 76, 65, 84, 73, 79, 78, 128, 65, 67, 67, 79, 85, 78, 212, 65, 67, 67, + 79, 77, 77, 79, 68, 65, 84, 73, 79, 78, 128, 65, 67, 67, 69, 80, 84, 128, + 65, 67, 67, 69, 78, 84, 45, 83, 84, 65, 67, 67, 65, 84, 79, 128, 65, 67, + 67, 69, 78, 84, 128, 65, 67, 67, 69, 78, 212, 65, 67, 65, 68, 69, 77, + 217, 65, 66, 89, 83, 77, 65, 204, 65, 66, 85, 78, 68, 65, 78, 67, 69, + 128, 65, 66, 75, 72, 65, 83, 73, 65, 206, 65, 66, 66, 82, 69, 86, 73, 65, + 84, 73, 79, 206, 65, 66, 65, 70, 73, 76, 73, 128, 65, 66, 178, 65, 66, + 49, 57, 49, 128, 65, 66, 49, 56, 56, 128, 65, 66, 49, 56, 48, 128, 65, + 66, 49, 55, 49, 128, 65, 66, 49, 54, 52, 128, 65, 66, 49, 51, 49, 66, + 128, 65, 66, 49, 51, 49, 65, 128, 65, 66, 49, 50, 51, 128, 65, 66, 49, + 50, 50, 128, 65, 66, 49, 50, 48, 128, 65, 66, 49, 49, 56, 128, 65, 66, + 48, 56, 55, 128, 65, 66, 48, 56, 54, 128, 65, 66, 48, 56, 53, 128, 65, + 66, 48, 56, 50, 128, 65, 66, 48, 56, 49, 128, 65, 66, 48, 56, 48, 128, + 65, 66, 48, 55, 57, 128, 65, 66, 48, 55, 56, 128, 65, 66, 48, 55, 55, + 128, 65, 66, 48, 55, 54, 128, 65, 66, 48, 55, 52, 128, 65, 66, 48, 55, + 51, 128, 65, 66, 48, 55, 48, 128, 65, 66, 48, 54, 57, 128, 65, 66, 48, + 54, 55, 128, 65, 66, 48, 54, 54, 128, 65, 66, 48, 54, 53, 128, 65, 66, + 48, 54, 49, 128, 65, 66, 48, 54, 48, 128, 65, 66, 48, 53, 57, 128, 65, + 66, 48, 53, 56, 128, 65, 66, 48, 53, 55, 128, 65, 66, 48, 53, 54, 128, + 65, 66, 48, 53, 53, 128, 65, 66, 48, 53, 52, 128, 65, 66, 48, 53, 51, + 128, 65, 66, 48, 53, 49, 128, 65, 66, 48, 53, 48, 128, 65, 66, 48, 52, + 57, 128, 65, 66, 48, 52, 56, 128, 65, 66, 48, 52, 55, 128, 65, 66, 48, + 52, 54, 128, 65, 66, 48, 52, 53, 128, 65, 66, 48, 52, 52, 128, 65, 66, + 48, 52, 49, 128, 65, 66, 48, 52, 48, 128, 65, 66, 48, 51, 57, 128, 65, + 66, 48, 51, 56, 128, 65, 66, 48, 51, 55, 128, 65, 66, 48, 51, 52, 128, + 65, 66, 48, 51, 49, 128, 65, 66, 48, 51, 48, 128, 65, 66, 48, 50, 57, + 128, 65, 66, 48, 50, 56, 128, 65, 66, 48, 50, 55, 128, 65, 66, 48, 50, + 54, 128, 65, 66, 48, 50, 52, 128, 65, 66, 48, 50, 51, 77, 128, 65, 66, + 48, 50, 51, 128, 65, 66, 48, 50, 50, 77, 128, 65, 66, 48, 50, 50, 70, + 128, 65, 66, 48, 50, 50, 128, 65, 66, 48, 50, 49, 77, 128, 65, 66, 48, + 50, 49, 70, 128, 65, 66, 48, 50, 49, 128, 65, 66, 48, 50, 48, 128, 65, + 66, 48, 49, 55, 128, 65, 66, 48, 49, 54, 128, 65, 66, 48, 49, 51, 128, + 65, 66, 48, 49, 49, 128, 65, 66, 48, 49, 48, 128, 65, 66, 48, 48, 57, + 128, 65, 66, 48, 48, 56, 128, 65, 66, 48, 48, 55, 128, 65, 66, 48, 48, + 54, 128, 65, 66, 48, 48, 53, 128, 65, 66, 48, 48, 52, 128, 65, 66, 48, + 48, 51, 128, 65, 66, 48, 48, 50, 128, 65, 66, 48, 48, 49, 128, 65, 65, + 89, 73, 78, 128, 65, 65, 89, 65, 78, 78, 65, 128, 65, 65, 89, 128, 65, + 65, 87, 128, 65, 65, 79, 128, 65, 65, 74, 128, 65, 65, 66, 65, 65, 70, + 73, 76, 73, 128, 65, 65, 48, 51, 50, 128, 65, 65, 48, 51, 49, 128, 65, + 65, 48, 51, 48, 128, 65, 65, 48, 50, 57, 128, 65, 65, 48, 50, 56, 128, + 65, 65, 48, 50, 55, 128, 65, 65, 48, 50, 54, 128, 65, 65, 48, 50, 53, + 128, 65, 65, 48, 50, 52, 128, 65, 65, 48, 50, 51, 128, 65, 65, 48, 50, + 50, 128, 65, 65, 48, 50, 49, 128, 65, 65, 48, 50, 48, 128, 65, 65, 48, + 49, 57, 128, 65, 65, 48, 49, 56, 128, 65, 65, 48, 49, 55, 128, 65, 65, + 48, 49, 54, 128, 65, 65, 48, 49, 53, 128, 65, 65, 48, 49, 52, 128, 65, + 65, 48, 49, 51, 128, 65, 65, 48, 49, 50, 128, 65, 65, 48, 49, 49, 128, + 65, 65, 48, 49, 48, 128, 65, 65, 48, 48, 57, 128, 65, 65, 48, 48, 56, + 128, 65, 65, 48, 48, 55, 66, 128, 65, 65, 48, 48, 55, 65, 128, 65, 65, + 48, 48, 55, 128, 65, 65, 48, 48, 54, 128, 65, 65, 48, 48, 53, 128, 65, + 65, 48, 48, 52, 128, 65, 65, 48, 48, 51, 128, 65, 65, 48, 48, 50, 128, + 65, 65, 48, 48, 49, 128, 65, 56, 48, 55, 128, 65, 56, 48, 54, 128, 65, + 56, 48, 53, 128, 65, 56, 48, 52, 128, 65, 56, 48, 51, 128, 65, 56, 48, + 50, 128, 65, 56, 48, 49, 128, 65, 56, 48, 48, 128, 65, 55, 51, 178, 65, + 55, 50, 182, 65, 55, 49, 183, 65, 55, 49, 181, 65, 55, 49, 180, 65, 55, + 49, 179, 65, 55, 49, 178, 65, 55, 49, 177, 65, 55, 49, 176, 65, 55, 48, + 57, 45, 182, 65, 55, 48, 57, 45, 180, 65, 55, 48, 57, 45, 179, 65, 55, + 48, 57, 45, 178, 65, 55, 48, 185, 65, 55, 48, 184, 65, 55, 48, 183, 65, + 55, 48, 182, 65, 55, 48, 181, 65, 55, 48, 180, 65, 55, 48, 179, 65, 55, + 48, 178, 65, 55, 48, 177, 65, 54, 54, 52, 128, 65, 54, 54, 51, 128, 65, + 54, 54, 50, 128, 65, 54, 54, 49, 128, 65, 54, 54, 48, 128, 65, 54, 53, + 57, 128, 65, 54, 53, 56, 128, 65, 54, 53, 55, 128, 65, 54, 53, 54, 128, + 65, 54, 53, 53, 128, 65, 54, 53, 52, 128, 65, 54, 53, 51, 128, 65, 54, + 53, 50, 128, 65, 54, 53, 49, 128, 65, 54, 52, 57, 128, 65, 54, 52, 56, + 128, 65, 54, 52, 54, 128, 65, 54, 52, 53, 128, 65, 54, 52, 52, 128, 65, + 54, 52, 51, 128, 65, 54, 52, 50, 128, 65, 54, 52, 48, 128, 65, 54, 51, + 56, 128, 65, 54, 51, 55, 128, 65, 54, 51, 52, 128, 65, 54, 50, 57, 128, + 65, 54, 50, 56, 128, 65, 54, 50, 55, 128, 65, 54, 50, 54, 128, 65, 54, + 50, 52, 128, 65, 54, 50, 51, 128, 65, 54, 50, 50, 128, 65, 54, 50, 49, + 128, 65, 54, 50, 48, 128, 65, 54, 49, 57, 128, 65, 54, 49, 56, 128, 65, + 54, 49, 55, 128, 65, 54, 49, 54, 128, 65, 54, 49, 53, 128, 65, 54, 49, + 52, 128, 65, 54, 49, 51, 128, 65, 54, 49, 50, 128, 65, 54, 49, 49, 128, + 65, 54, 49, 48, 128, 65, 54, 48, 57, 128, 65, 54, 48, 56, 128, 65, 54, + 48, 54, 128, 65, 54, 48, 52, 128, 65, 54, 48, 51, 128, 65, 54, 48, 50, + 128, 65, 54, 48, 49, 128, 65, 54, 48, 48, 128, 65, 53, 57, 56, 128, 65, + 53, 57, 54, 128, 65, 53, 57, 53, 128, 65, 53, 57, 52, 128, 65, 53, 57, + 50, 128, 65, 53, 57, 49, 128, 65, 53, 56, 57, 128, 65, 53, 56, 56, 128, + 65, 53, 56, 55, 128, 65, 53, 56, 54, 128, 65, 53, 56, 53, 128, 65, 53, + 56, 52, 128, 65, 53, 56, 51, 128, 65, 53, 56, 50, 128, 65, 53, 56, 49, + 128, 65, 53, 56, 48, 128, 65, 53, 55, 57, 128, 65, 53, 55, 56, 128, 65, + 53, 55, 55, 128, 65, 53, 55, 54, 128, 65, 53, 55, 53, 128, 65, 53, 55, + 52, 128, 65, 53, 55, 51, 128, 65, 53, 55, 50, 128, 65, 53, 55, 49, 128, + 65, 53, 55, 48, 128, 65, 53, 54, 57, 128, 65, 53, 54, 56, 128, 65, 53, + 54, 54, 128, 65, 53, 54, 53, 128, 65, 53, 54, 52, 128, 65, 53, 54, 51, + 128, 65, 53, 53, 57, 128, 65, 53, 53, 55, 128, 65, 53, 53, 54, 128, 65, + 53, 53, 53, 128, 65, 53, 53, 52, 128, 65, 53, 53, 51, 128, 65, 53, 53, + 50, 128, 65, 53, 53, 49, 128, 65, 53, 53, 48, 128, 65, 53, 52, 57, 128, + 65, 53, 52, 56, 128, 65, 53, 52, 55, 128, 65, 53, 52, 53, 128, 65, 53, + 52, 50, 128, 65, 53, 52, 49, 128, 65, 53, 52, 48, 128, 65, 53, 51, 57, + 128, 65, 53, 51, 56, 128, 65, 53, 51, 55, 128, 65, 53, 51, 54, 128, 65, + 53, 51, 53, 128, 65, 53, 51, 52, 128, 65, 53, 51, 50, 128, 65, 53, 51, + 49, 128, 65, 53, 51, 48, 128, 65, 53, 50, 57, 128, 65, 53, 50, 56, 128, + 65, 53, 50, 55, 128, 65, 53, 50, 54, 128, 65, 53, 50, 53, 128, 65, 53, + 50, 52, 128, 65, 53, 50, 51, 128, 65, 53, 50, 50, 128, 65, 53, 50, 49, + 128, 65, 53, 50, 48, 128, 65, 53, 49, 57, 128, 65, 53, 49, 56, 128, 65, + 53, 49, 55, 128, 65, 53, 49, 54, 128, 65, 53, 49, 53, 128, 65, 53, 49, + 52, 128, 65, 53, 49, 51, 128, 65, 53, 49, 50, 128, 65, 53, 49, 49, 128, + 65, 53, 49, 48, 128, 65, 53, 48, 57, 128, 65, 53, 48, 56, 128, 65, 53, + 48, 55, 128, 65, 53, 48, 54, 128, 65, 53, 48, 53, 128, 65, 53, 48, 52, + 128, 65, 53, 48, 51, 128, 65, 53, 48, 50, 128, 65, 53, 48, 49, 128, 65, + 52, 57, 55, 128, 65, 52, 57, 54, 128, 65, 52, 57, 53, 128, 65, 52, 57, + 52, 128, 65, 52, 57, 51, 128, 65, 52, 57, 50, 128, 65, 52, 57, 49, 128, + 65, 52, 57, 48, 128, 65, 52, 56, 57, 128, 65, 52, 56, 56, 128, 65, 52, + 56, 55, 128, 65, 52, 56, 54, 128, 65, 52, 56, 53, 128, 65, 52, 56, 52, + 128, 65, 52, 56, 51, 128, 65, 52, 56, 50, 128, 65, 52, 56, 49, 128, 65, + 52, 56, 48, 128, 65, 52, 55, 57, 128, 65, 52, 55, 56, 128, 65, 52, 55, + 55, 128, 65, 52, 55, 54, 128, 65, 52, 55, 53, 128, 65, 52, 55, 52, 128, + 65, 52, 55, 51, 128, 65, 52, 55, 50, 128, 65, 52, 55, 49, 128, 65, 52, + 55, 48, 128, 65, 52, 54, 57, 128, 65, 52, 54, 56, 128, 65, 52, 54, 55, + 128, 65, 52, 54, 54, 128, 65, 52, 54, 53, 128, 65, 52, 54, 52, 128, 65, + 52, 54, 51, 128, 65, 52, 54, 50, 128, 65, 52, 54, 49, 128, 65, 52, 54, + 48, 128, 65, 52, 53, 57, 128, 65, 52, 53, 56, 128, 65, 52, 53, 55, 65, + 128, 65, 52, 53, 55, 128, 65, 52, 53, 54, 128, 65, 52, 53, 53, 128, 65, + 52, 53, 52, 128, 65, 52, 53, 51, 128, 65, 52, 53, 50, 128, 65, 52, 53, + 49, 128, 65, 52, 53, 48, 65, 128, 65, 52, 53, 48, 128, 65, 52, 52, 57, + 128, 65, 52, 52, 56, 128, 65, 52, 52, 55, 128, 65, 52, 52, 54, 128, 65, + 52, 52, 53, 128, 65, 52, 52, 52, 128, 65, 52, 52, 51, 128, 65, 52, 52, + 50, 128, 65, 52, 52, 49, 128, 65, 52, 52, 48, 128, 65, 52, 51, 57, 128, + 65, 52, 51, 56, 128, 65, 52, 51, 55, 128, 65, 52, 51, 54, 128, 65, 52, + 51, 53, 128, 65, 52, 51, 52, 128, 65, 52, 51, 51, 128, 65, 52, 51, 50, + 128, 65, 52, 51, 49, 128, 65, 52, 51, 48, 128, 65, 52, 50, 57, 128, 65, + 52, 50, 56, 128, 65, 52, 50, 55, 128, 65, 52, 50, 54, 128, 65, 52, 50, + 53, 128, 65, 52, 50, 52, 128, 65, 52, 50, 51, 128, 65, 52, 50, 50, 128, + 65, 52, 50, 49, 128, 65, 52, 50, 48, 128, 65, 52, 49, 57, 128, 65, 52, + 49, 56, 45, 86, 65, 83, 128, 65, 52, 49, 56, 128, 65, 52, 49, 55, 45, 86, + 65, 83, 128, 65, 52, 49, 55, 128, 65, 52, 49, 54, 45, 86, 65, 83, 128, + 65, 52, 49, 54, 128, 65, 52, 49, 53, 45, 86, 65, 83, 128, 65, 52, 49, 53, + 128, 65, 52, 49, 52, 45, 86, 65, 83, 128, 65, 52, 49, 52, 128, 65, 52, + 49, 51, 45, 86, 65, 83, 128, 65, 52, 49, 51, 128, 65, 52, 49, 50, 45, 86, + 65, 83, 128, 65, 52, 49, 50, 128, 65, 52, 49, 49, 45, 86, 65, 83, 128, + 65, 52, 49, 49, 128, 65, 52, 49, 48, 193, 65, 52, 49, 48, 45, 86, 65, 83, + 128, 65, 52, 49, 176, 65, 52, 48, 57, 45, 86, 65, 83, 128, 65, 52, 48, + 57, 128, 65, 52, 48, 56, 45, 86, 65, 83, 128, 65, 52, 48, 56, 128, 65, + 52, 48, 55, 45, 86, 65, 83, 128, 65, 52, 48, 55, 128, 65, 52, 48, 54, 45, + 86, 65, 83, 128, 65, 52, 48, 54, 128, 65, 52, 48, 53, 45, 86, 65, 83, + 128, 65, 52, 48, 53, 128, 65, 52, 48, 52, 45, 86, 65, 83, 128, 65, 52, + 48, 52, 128, 65, 52, 48, 51, 45, 86, 65, 83, 128, 65, 52, 48, 51, 128, + 65, 52, 48, 50, 45, 86, 65, 83, 128, 65, 52, 48, 50, 128, 65, 52, 48, 49, + 45, 86, 65, 83, 128, 65, 52, 48, 49, 128, 65, 52, 48, 48, 45, 86, 65, 83, + 128, 65, 52, 48, 48, 128, 65, 51, 57, 57, 128, 65, 51, 57, 56, 128, 65, + 51, 57, 55, 128, 65, 51, 57, 54, 128, 65, 51, 57, 53, 128, 65, 51, 57, + 52, 128, 65, 51, 57, 179, 65, 51, 57, 50, 128, 65, 51, 57, 49, 128, 65, + 51, 57, 48, 128, 65, 51, 56, 57, 128, 65, 51, 56, 56, 128, 65, 51, 56, + 55, 128, 65, 51, 56, 54, 65, 128, 65, 51, 56, 54, 128, 65, 51, 56, 53, + 128, 65, 51, 56, 52, 128, 65, 51, 56, 51, 65, 128, 65, 51, 56, 179, 65, + 51, 56, 50, 128, 65, 51, 56, 49, 65, 128, 65, 51, 56, 49, 128, 65, 51, + 56, 48, 128, 65, 51, 55, 57, 128, 65, 51, 55, 56, 128, 65, 51, 55, 55, + 128, 65, 51, 55, 54, 128, 65, 51, 55, 53, 128, 65, 51, 55, 52, 128, 65, + 51, 55, 51, 128, 65, 51, 55, 50, 128, 65, 51, 55, 49, 65, 128, 65, 51, + 55, 49, 128, 65, 51, 55, 48, 128, 65, 51, 54, 57, 128, 65, 51, 54, 56, + 65, 128, 65, 51, 54, 56, 128, 65, 51, 54, 55, 128, 65, 51, 54, 54, 128, + 65, 51, 54, 53, 128, 65, 51, 54, 52, 65, 128, 65, 51, 54, 52, 128, 65, + 51, 54, 51, 128, 65, 51, 54, 50, 128, 65, 51, 54, 49, 128, 65, 51, 54, + 48, 128, 65, 51, 53, 57, 65, 128, 65, 51, 53, 57, 128, 65, 51, 53, 56, + 128, 65, 51, 53, 55, 128, 65, 51, 53, 54, 128, 65, 51, 53, 53, 128, 65, + 51, 53, 52, 128, 65, 51, 53, 51, 128, 65, 51, 53, 50, 128, 65, 51, 53, + 49, 128, 65, 51, 53, 48, 128, 65, 51, 52, 57, 128, 65, 51, 52, 56, 128, + 65, 51, 52, 55, 128, 65, 51, 52, 54, 128, 65, 51, 52, 53, 128, 65, 51, + 52, 52, 128, 65, 51, 52, 51, 128, 65, 51, 52, 50, 128, 65, 51, 52, 49, + 128, 65, 51, 52, 48, 128, 65, 51, 51, 57, 128, 65, 51, 51, 56, 128, 65, + 51, 51, 55, 128, 65, 51, 51, 54, 67, 128, 65, 51, 51, 54, 66, 128, 65, + 51, 51, 54, 65, 128, 65, 51, 51, 54, 128, 65, 51, 51, 53, 128, 65, 51, + 51, 52, 128, 65, 51, 51, 51, 128, 65, 51, 51, 50, 67, 128, 65, 51, 51, + 50, 66, 128, 65, 51, 51, 50, 65, 128, 65, 51, 51, 50, 128, 65, 51, 51, + 49, 128, 65, 51, 51, 48, 128, 65, 51, 50, 57, 65, 128, 65, 51, 50, 57, + 128, 65, 51, 50, 56, 128, 65, 51, 50, 55, 128, 65, 51, 50, 54, 128, 65, + 51, 50, 53, 128, 65, 51, 50, 52, 128, 65, 51, 50, 51, 128, 65, 51, 50, + 50, 128, 65, 51, 50, 49, 128, 65, 51, 50, 48, 128, 65, 51, 49, 57, 128, + 65, 51, 49, 56, 128, 65, 51, 49, 55, 128, 65, 51, 49, 54, 128, 65, 51, + 49, 53, 128, 65, 51, 49, 52, 128, 65, 51, 49, 51, 67, 128, 65, 51, 49, + 51, 66, 128, 65, 51, 49, 51, 65, 128, 65, 51, 49, 51, 128, 65, 51, 49, + 50, 128, 65, 51, 49, 49, 128, 65, 51, 49, 48, 128, 65, 51, 48, 57, 67, + 128, 65, 51, 48, 57, 66, 128, 65, 51, 48, 57, 65, 128, 65, 51, 48, 57, + 128, 65, 51, 48, 56, 128, 65, 51, 48, 55, 128, 65, 51, 48, 54, 128, 65, + 51, 48, 53, 128, 65, 51, 48, 52, 128, 65, 51, 48, 51, 128, 65, 51, 48, + 50, 128, 65, 51, 48, 49, 128, 65, 51, 48, 48, 128, 65, 50, 57, 57, 65, + 128, 65, 50, 57, 57, 128, 65, 50, 57, 56, 128, 65, 50, 57, 55, 128, 65, + 50, 57, 54, 128, 65, 50, 57, 53, 128, 65, 50, 57, 52, 65, 128, 65, 50, + 57, 52, 128, 65, 50, 57, 51, 128, 65, 50, 57, 50, 128, 65, 50, 57, 49, + 128, 65, 50, 57, 48, 128, 65, 50, 56, 57, 65, 128, 65, 50, 56, 57, 128, + 65, 50, 56, 56, 128, 65, 50, 56, 55, 128, 65, 50, 56, 54, 128, 65, 50, + 56, 53, 128, 65, 50, 56, 52, 128, 65, 50, 56, 51, 128, 65, 50, 56, 50, + 128, 65, 50, 56, 49, 128, 65, 50, 56, 48, 128, 65, 50, 55, 57, 128, 65, + 50, 55, 56, 128, 65, 50, 55, 55, 128, 65, 50, 55, 54, 128, 65, 50, 55, + 53, 128, 65, 50, 55, 52, 128, 65, 50, 55, 51, 128, 65, 50, 55, 50, 128, + 65, 50, 55, 49, 128, 65, 50, 55, 48, 128, 65, 50, 54, 57, 128, 65, 50, + 54, 56, 128, 65, 50, 54, 55, 65, 128, 65, 50, 54, 55, 128, 65, 50, 54, + 54, 128, 65, 50, 54, 53, 128, 65, 50, 54, 52, 128, 65, 50, 54, 51, 128, + 65, 50, 54, 50, 128, 65, 50, 54, 49, 128, 65, 50, 54, 48, 128, 65, 50, + 53, 57, 128, 65, 50, 53, 56, 128, 65, 50, 53, 55, 128, 65, 50, 53, 54, + 128, 65, 50, 53, 53, 128, 65, 50, 53, 52, 128, 65, 50, 53, 51, 128, 65, + 50, 53, 50, 128, 65, 50, 53, 49, 128, 65, 50, 53, 48, 128, 65, 50, 52, + 57, 128, 65, 50, 52, 56, 128, 65, 50, 52, 55, 128, 65, 50, 52, 54, 128, + 65, 50, 52, 53, 128, 65, 50, 52, 52, 128, 65, 50, 52, 51, 128, 65, 50, + 52, 50, 128, 65, 50, 52, 49, 128, 65, 50, 52, 48, 128, 65, 50, 51, 57, + 128, 65, 50, 51, 56, 128, 65, 50, 51, 55, 128, 65, 50, 51, 54, 128, 65, + 50, 51, 53, 128, 65, 50, 51, 52, 128, 65, 50, 51, 51, 128, 65, 50, 51, + 50, 128, 65, 50, 51, 49, 128, 65, 50, 51, 48, 128, 65, 50, 50, 57, 128, + 65, 50, 50, 56, 128, 65, 50, 50, 55, 65, 128, 65, 50, 50, 55, 128, 65, + 50, 50, 54, 128, 65, 50, 50, 53, 128, 65, 50, 50, 52, 128, 65, 50, 50, + 51, 128, 65, 50, 50, 50, 128, 65, 50, 50, 49, 128, 65, 50, 50, 48, 128, + 65, 50, 49, 57, 128, 65, 50, 49, 56, 128, 65, 50, 49, 55, 128, 65, 50, + 49, 54, 65, 128, 65, 50, 49, 54, 128, 65, 50, 49, 53, 65, 128, 65, 50, + 49, 53, 128, 65, 50, 49, 52, 128, 65, 50, 49, 51, 128, 65, 50, 49, 50, + 128, 65, 50, 49, 49, 128, 65, 50, 49, 48, 128, 65, 50, 48, 57, 65, 128, + 65, 50, 48, 57, 128, 65, 50, 48, 56, 128, 65, 50, 48, 55, 65, 128, 65, + 50, 48, 55, 128, 65, 50, 48, 54, 128, 65, 50, 48, 53, 128, 65, 50, 48, + 52, 128, 65, 50, 48, 51, 128, 65, 50, 48, 50, 66, 128, 65, 50, 48, 50, + 65, 128, 65, 50, 48, 50, 128, 65, 50, 48, 49, 128, 65, 50, 48, 48, 128, + 65, 49, 57, 57, 128, 65, 49, 57, 56, 128, 65, 49, 57, 55, 128, 65, 49, + 57, 54, 128, 65, 49, 57, 53, 128, 65, 49, 57, 52, 128, 65, 49, 57, 51, + 128, 65, 49, 57, 50, 128, 65, 49, 57, 49, 128, 65, 49, 57, 48, 128, 65, + 49, 56, 57, 128, 65, 49, 56, 56, 128, 65, 49, 56, 55, 128, 65, 49, 56, + 54, 128, 65, 49, 56, 53, 128, 65, 49, 56, 52, 128, 65, 49, 56, 51, 128, + 65, 49, 56, 50, 128, 65, 49, 56, 49, 128, 65, 49, 56, 48, 128, 65, 49, + 55, 57, 128, 65, 49, 55, 56, 128, 65, 49, 55, 55, 128, 65, 49, 55, 54, + 128, 65, 49, 55, 53, 128, 65, 49, 55, 52, 128, 65, 49, 55, 51, 128, 65, + 49, 55, 50, 128, 65, 49, 55, 49, 128, 65, 49, 55, 48, 128, 65, 49, 54, + 57, 128, 65, 49, 54, 56, 128, 65, 49, 54, 55, 128, 65, 49, 54, 54, 128, + 65, 49, 54, 53, 128, 65, 49, 54, 52, 128, 65, 49, 54, 51, 128, 65, 49, + 54, 50, 128, 65, 49, 54, 49, 128, 65, 49, 54, 48, 128, 65, 49, 53, 57, + 128, 65, 49, 53, 56, 128, 65, 49, 53, 55, 128, 65, 49, 53, 54, 128, 65, + 49, 53, 53, 128, 65, 49, 53, 52, 128, 65, 49, 53, 51, 128, 65, 49, 53, + 50, 128, 65, 49, 53, 49, 128, 65, 49, 53, 48, 128, 65, 49, 52, 57, 128, + 65, 49, 52, 56, 128, 65, 49, 52, 55, 128, 65, 49, 52, 54, 128, 65, 49, + 52, 53, 128, 65, 49, 52, 52, 128, 65, 49, 52, 51, 128, 65, 49, 52, 50, + 128, 65, 49, 52, 49, 128, 65, 49, 52, 48, 128, 65, 49, 51, 57, 128, 65, + 49, 51, 56, 128, 65, 49, 51, 55, 128, 65, 49, 51, 54, 128, 65, 49, 51, + 53, 65, 128, 65, 49, 51, 53, 128, 65, 49, 51, 52, 128, 65, 49, 51, 51, + 128, 65, 49, 51, 50, 128, 65, 49, 51, 49, 67, 128, 65, 49, 51, 49, 128, + 65, 49, 51, 48, 128, 65, 49, 50, 57, 128, 65, 49, 50, 56, 128, 65, 49, + 50, 55, 128, 65, 49, 50, 54, 128, 65, 49, 50, 53, 65, 128, 65, 49, 50, + 53, 128, 65, 49, 50, 52, 128, 65, 49, 50, 51, 128, 65, 49, 50, 50, 128, + 65, 49, 50, 49, 128, 65, 49, 50, 48, 66, 128, 65, 49, 50, 48, 128, 65, + 49, 49, 57, 128, 65, 49, 49, 56, 128, 65, 49, 49, 55, 128, 65, 49, 49, + 54, 128, 65, 49, 49, 53, 65, 128, 65, 49, 49, 53, 128, 65, 49, 49, 52, + 128, 65, 49, 49, 51, 128, 65, 49, 49, 50, 128, 65, 49, 49, 49, 128, 65, + 49, 49, 48, 66, 128, 65, 49, 49, 48, 65, 128, 65, 49, 49, 48, 128, 65, + 49, 48, 57, 128, 65, 49, 48, 56, 128, 65, 49, 48, 55, 67, 128, 65, 49, + 48, 55, 66, 128, 65, 49, 48, 55, 65, 128, 65, 49, 48, 55, 128, 65, 49, + 48, 54, 128, 65, 49, 48, 53, 66, 128, 65, 49, 48, 53, 65, 128, 65, 49, + 48, 53, 128, 65, 49, 48, 52, 67, 128, 65, 49, 48, 52, 66, 128, 65, 49, + 48, 52, 65, 128, 65, 49, 48, 52, 128, 65, 49, 48, 51, 128, 65, 49, 48, + 50, 65, 128, 65, 49, 48, 50, 128, 65, 49, 48, 49, 65, 128, 65, 49, 48, + 49, 128, 65, 49, 48, 48, 65, 128, 65, 49, 48, 48, 45, 49, 48, 50, 128, + 65, 49, 48, 48, 128, 65, 48, 57, 57, 128, 65, 48, 57, 56, 65, 128, 65, + 48, 57, 56, 128, 65, 48, 57, 55, 65, 128, 65, 48, 57, 55, 128, 65, 48, + 57, 54, 128, 65, 48, 57, 53, 128, 65, 48, 57, 52, 128, 65, 48, 57, 51, + 128, 65, 48, 57, 50, 128, 65, 48, 57, 49, 128, 65, 48, 57, 48, 128, 65, + 48, 56, 57, 128, 65, 48, 56, 56, 128, 65, 48, 56, 55, 128, 65, 48, 56, + 54, 128, 65, 48, 56, 53, 128, 65, 48, 56, 52, 128, 65, 48, 56, 51, 128, + 65, 48, 56, 50, 128, 65, 48, 56, 49, 128, 65, 48, 56, 48, 128, 65, 48, + 55, 57, 128, 65, 48, 55, 56, 128, 65, 48, 55, 55, 128, 65, 48, 55, 54, + 128, 65, 48, 55, 53, 128, 65, 48, 55, 52, 128, 65, 48, 55, 51, 128, 65, + 48, 55, 50, 128, 65, 48, 55, 49, 128, 65, 48, 55, 48, 128, 65, 48, 54, + 57, 128, 65, 48, 54, 56, 128, 65, 48, 54, 55, 128, 65, 48, 54, 54, 67, + 128, 65, 48, 54, 54, 66, 128, 65, 48, 54, 54, 65, 128, 65, 48, 54, 54, + 128, 65, 48, 54, 53, 128, 65, 48, 54, 52, 128, 65, 48, 54, 51, 128, 65, + 48, 54, 50, 128, 65, 48, 54, 49, 128, 65, 48, 54, 48, 128, 65, 48, 53, + 57, 128, 65, 48, 53, 56, 128, 65, 48, 53, 55, 128, 65, 48, 53, 54, 128, + 65, 48, 53, 53, 128, 65, 48, 53, 52, 128, 65, 48, 53, 51, 128, 65, 48, + 53, 50, 128, 65, 48, 53, 49, 128, 65, 48, 53, 48, 128, 65, 48, 52, 57, + 128, 65, 48, 52, 56, 128, 65, 48, 52, 55, 128, 65, 48, 52, 54, 66, 128, + 65, 48, 52, 54, 65, 128, 65, 48, 52, 54, 128, 65, 48, 52, 53, 65, 128, + 65, 48, 52, 53, 128, 65, 48, 52, 52, 128, 65, 48, 52, 51, 65, 128, 65, + 48, 52, 51, 128, 65, 48, 52, 50, 65, 128, 65, 48, 52, 50, 128, 65, 48, + 52, 49, 65, 128, 65, 48, 52, 49, 128, 65, 48, 52, 48, 65, 128, 65, 48, + 52, 48, 128, 65, 48, 51, 57, 65, 128, 65, 48, 51, 57, 128, 65, 48, 51, + 56, 128, 65, 48, 51, 55, 128, 65, 48, 51, 54, 128, 65, 48, 51, 53, 128, + 65, 48, 51, 52, 128, 65, 48, 51, 51, 128, 65, 48, 51, 50, 65, 128, 65, + 48, 50, 56, 66, 128, 65, 48, 50, 54, 65, 128, 65, 48, 49, 55, 65, 128, + 65, 48, 49, 52, 65, 128, 65, 48, 49, 48, 65, 128, 65, 48, 48, 54, 66, + 128, 65, 48, 48, 54, 65, 128, 65, 48, 48, 53, 65, 128, 65, 45, 69, 85, + 128, 45, 85, 205, 45, 80, 72, 82, 85, 128, 45, 75, 72, 89, 85, 196, 45, + 75, 72, 89, 73, 76, 128, 45, 68, 90, 85, 196, 45, 67, 72, 65, 210, 45, + 67, 72, 65, 76, 128, }; static unsigned int lexicon_offset[] = { - 0, 0, 6, 10, 14, 22, 27, 34, 44, 49, 58, 64, 66, 69, 81, 89, 102, 108, - 113, 118, 126, 135, 146, 151, 156, 161, 164, 168, 177, 183, 189, 194, - 201, 209, 217, 218, 221, 229, 165, 235, 244, 251, 261, 267, 274, 279, - 282, 287, 293, 296, 300, 305, 311, 317, 322, 327, 333, 339, 348, 355, - 362, 371, 376, 381, 383, 391, 399, 400, 408, 410, 417, 420, 426, 433, - 331, 438, 440, 442, 449, 451, 456, 464, 471, 476, 480, 486, 491, 501, - 506, 513, 516, 524, 528, 538, 545, 554, 561, 570, 577, 580, 584, 592, - 598, 611, 618, 622, 626, 627, 636, 640, 649, 655, 659, 661, 666, 674, - 678, 686, 691, 694, 700, 703, 707, 712, 720, 723, 730, 735, 744, 753, - 761, 769, 773, 779, 787, 794, 797, 807, 811, 815, 826, 833, 840, 844, - 848, 854, 842, 863, 869, 874, 879, 883, 886, 889, 894, 903, 911, 916, - 658, 575, 921, 924, 930, 934, 938, 947, 953, 960, 969, 976, 989, 994, - 998, 1006, 1009, 1015, 1021, 1030, 1037, 1045, 1052, 1062, 1069, 1077, - 1086, 1090, 1093, 1100, 21, 1104, 1113, 1121, 1128, 1131, 1136, 1138, - 1142, 1151, 1156, 1159, 1165, 1172, 1175, 1180, 1185, 1191, 1196, 1201, - 1206, 1210, 1215, 1221, 1226, 1231, 1235, 1241, 1246, 1251, 1256, 1260, - 1265, 1270, 1275, 1281, 1287, 1293, 1298, 1302, 1307, 1312, 1317, 1321, - 1326, 1331, 1336, 1341, 1176, 1181, 1186, 1192, 1197, 1345, 1207, 1351, - 1356, 1361, 1368, 1372, 1375, 1384, 1211, 1388, 1216, 1222, 1227, 1392, - 1397, 1402, 1406, 1410, 1416, 1420, 1232, 1423, 1425, 1242, 1430, 1434, - 1247, 1440, 1252, 1444, 1448, 1257, 1452, 1457, 1461, 1464, 1468, 1261, - 1266, 1473, 1479, 1271, 1491, 1497, 1503, 1509, 1276, 1288, 1294, 1513, - 1517, 1521, 1524, 1299, 1528, 1530, 1535, 1540, 1546, 1551, 1556, 1560, - 1565, 1570, 1575, 1580, 1586, 1591, 1596, 1602, 1608, 1613, 1617, 1622, - 1627, 1632, 1637, 1642, 1646, 1654, 1659, 1663, 1668, 1673, 1678, 1683, - 1687, 1690, 1697, 1702, 1707, 1712, 1717, 1723, 1728, 1732, 1303, 1735, - 1740, 1745, 1308, 1749, 1753, 1760, 1313, 1767, 1318, 1771, 1773, 1778, - 1784, 1322, 1789, 1798, 1327, 1803, 1809, 1814, 1332, 1819, 1824, 1827, - 1832, 1836, 1840, 1844, 1847, 1851, 1337, 1856, 1342, 1860, 1862, 1868, - 1874, 1880, 1886, 1892, 1898, 1904, 1910, 1915, 1921, 1927, 1933, 1939, - 1945, 1951, 1957, 1963, 1969, 1974, 1979, 1984, 1989, 1994, 1999, 2004, - 2009, 2014, 2019, 2025, 2030, 2036, 2041, 2047, 2053, 2058, 2064, 2070, - 2076, 2082, 2087, 2092, 2094, 2095, 2099, 2103, 2108, 2112, 2116, 2120, - 2125, 2129, 2132, 2137, 2141, 2146, 2150, 2154, 2159, 2163, 2166, 2170, - 2176, 2190, 2194, 2198, 2202, 2205, 2210, 2214, 2218, 2221, 2225, 2230, - 2235, 2240, 2245, 2249, 2253, 2257, 2261, 2266, 2270, 2275, 2279, 2284, - 2290, 2297, 2303, 2308, 2313, 2318, 2324, 2329, 2335, 2340, 2343, 2345, - 1193, 2349, 2356, 2364, 2374, 2383, 2397, 2401, 2405, 2410, 2423, 2431, - 2435, 2440, 2444, 2447, 2451, 2455, 2460, 2465, 2470, 2474, 2477, 2481, - 2488, 2495, 2501, 2506, 2511, 2517, 2523, 2528, 2531, 1775, 2533, 2539, - 2543, 2548, 2552, 2556, 1693, 1786, 2561, 2565, 2568, 2573, 2578, 2583, - 2588, 2592, 2599, 2604, 2607, 2614, 2620, 2624, 2628, 2632, 2637, 2644, - 2649, 2654, 2661, 2667, 2673, 2679, 2693, 2710, 2725, 2740, 2749, 2754, - 2758, 2763, 2768, 2772, 2784, 2791, 2797, 2293, 2803, 2810, 2816, 2820, - 2823, 2830, 2836, 2841, 2845, 2850, 2854, 2858, 2117, 2862, 2867, 2872, - 2876, 2881, 2889, 2893, 2898, 2902, 2906, 2910, 2915, 2920, 2925, 2929, - 2934, 2939, 2943, 2948, 2952, 2955, 2959, 2963, 2971, 2976, 2980, 2984, - 2990, 2999, 3003, 3007, 3013, 3018, 3025, 3029, 3039, 3043, 3047, 3052, - 3056, 3061, 3067, 3072, 3076, 3080, 3084, 2491, 3092, 3097, 3103, 3108, - 3112, 3117, 3122, 3126, 3132, 3137, 2121, 3143, 3149, 3154, 3159, 3164, - 3169, 3174, 3179, 3184, 3189, 3194, 3200, 3205, 1208, 101, 3211, 3215, - 3219, 3223, 3228, 3232, 3236, 3242, 3247, 3251, 3255, 3260, 3265, 3269, - 3274, 3278, 3281, 3285, 3290, 3294, 3299, 3303, 3306, 3310, 3314, 3319, - 3323, 3326, 3339, 3343, 3347, 3351, 3356, 3360, 3364, 3367, 3371, 3375, - 3380, 3384, 3389, 3394, 3399, 3403, 3408, 3411, 3414, 3419, 3425, 3429, - 3433, 3436, 3441, 3445, 3450, 3454, 3458, 3461, 3467, 3472, 3477, 3483, - 3488, 3493, 3499, 3505, 3510, 3515, 3520, 3525, 1140, 579, 3528, 3531, - 3536, 3540, 3544, 3548, 3552, 3555, 3559, 3564, 3569, 3573, 3578, 3582, - 3587, 3591, 3595, 3599, 3605, 3611, 3614, 3617, 139, 3623, 3628, 3637, - 3645, 3654, 3661, 3667, 3674, 3679, 3683, 3687, 3695, 3702, 3707, 3714, - 3719, 3723, 3733, 3737, 3741, 3746, 3751, 3761, 2133, 3766, 3770, 3773, - 3779, 3784, 3790, 3796, 3801, 3808, 3812, 3816, 637, 701, 1369, 3820, - 3827, 3834, 3840, 3845, 3852, 3859, 3864, 3870, 3876, 3881, 3885, 3891, - 3898, 3903, 3907, 2142, 3911, 3919, 3925, 3933, 739, 3939, 3947, 3958, - 3962, 3972, 2147, 3978, 3983, 3998, 4004, 4011, 4021, 4027, 4032, 4038, - 4044, 4047, 4050, 4054, 4059, 4066, 4071, 4075, 4079, 4083, 4087, 4092, - 4098, 4109, 4113, 3286, 4118, 4130, 4136, 4144, 4148, 4153, 1562, 4160, - 4163, 4166, 4170, 4173, 4179, 4183, 4197, 4201, 4204, 4208, 4214, 4220, - 4225, 4229, 4233, 4239, 4250, 4256, 4261, 4267, 4271, 4279, 4291, 4301, - 4307, 4312, 4321, 4329, 4336, 4342, 4346, 4352, 4361, 4370, 4374, 4383, - 4388, 4392, 4397, 4401, 4409, 4415, 4419, 4424, 4428, 4434, 2155, 1385, - 4440, 4445, 4451, 4456, 4461, 4466, 4471, 4476, 4481, 4487, 4492, 4498, - 4503, 4508, 4513, 4519, 4524, 4529, 4534, 4539, 4545, 4550, 4556, 4561, - 4566, 4571, 4576, 4581, 4586, 4592, 4597, 4602, 291, 321, 4607, 4613, - 4617, 4621, 4626, 4630, 4634, 4637, 4641, 4645, 4649, 4653, 4657, 4662, - 4666, 4670, 4676, 4437, 4681, 4685, 4688, 4693, 4698, 4703, 4708, 4713, - 4718, 4723, 4728, 4733, 4738, 4742, 4747, 4752, 4757, 4762, 4767, 4772, - 4777, 4782, 4787, 4792, 4796, 4801, 4806, 4811, 4816, 4821, 4826, 4831, - 4836, 4841, 4846, 4850, 4855, 4860, 4865, 4870, 4875, 4880, 4885, 4890, - 4895, 4900, 4904, 4909, 4914, 4919, 4924, 4929, 4934, 4939, 4944, 4949, - 4954, 4958, 4963, 4968, 4973, 4978, 4983, 4988, 4993, 4998, 5003, 5008, - 5012, 5017, 5022, 5027, 5032, 5037, 5042, 5047, 5052, 5057, 5062, 5066, - 5071, 5076, 5081, 5086, 5092, 5098, 5104, 5110, 5116, 5122, 5128, 5133, - 5139, 5145, 5151, 5157, 5163, 5169, 5175, 5181, 5187, 5193, 5198, 5204, - 5210, 5216, 5222, 5228, 5234, 5240, 5246, 5252, 5258, 5263, 5269, 5275, - 5281, 5287, 5293, 5299, 5305, 5311, 5317, 5323, 5328, 5334, 5340, 5346, - 5352, 5358, 5364, 5370, 5376, 5382, 5388, 5393, 5399, 5405, 5411, 5417, - 5423, 5429, 5435, 5441, 5447, 5453, 5458, 5462, 5468, 5474, 5480, 5486, - 5492, 5498, 5504, 5510, 5516, 5522, 5527, 5533, 5539, 5545, 5551, 5557, - 5563, 5569, 5575, 5581, 5587, 5592, 5598, 5604, 5610, 5616, 5622, 5628, - 5634, 5640, 5646, 5652, 5657, 5663, 5669, 5675, 5681, 5687, 5693, 5699, - 5705, 5711, 5717, 5722, 5728, 5734, 5740, 5746, 5752, 5758, 5764, 5770, - 5776, 5782, 5787, 5793, 5799, 5805, 5811, 5817, 5823, 5829, 5835, 5841, - 5847, 5852, 5858, 5864, 5870, 5876, 5882, 5888, 5894, 5900, 5906, 5912, - 5917, 5923, 5929, 5935, 5941, 5947, 5953, 5959, 5965, 5971, 5977, 5982, - 5988, 5994, 6000, 6006, 6012, 6018, 6024, 6030, 6036, 6042, 6047, 6053, - 6059, 6065, 6071, 6077, 6083, 6089, 6095, 6101, 6107, 6112, 6116, 6119, - 6126, 6130, 6143, 6147, 6151, 6155, 6158, 6162, 6167, 6171, 6175, 6181, - 6188, 6199, 6207, 6214, 6218, 6226, 6235, 6241, 6253, 6258, 6261, 6266, - 6270, 6280, 6288, 6296, 6302, 6306, 6316, 6326, 6334, 6341, 6348, 6354, - 6360, 6367, 6371, 6378, 6388, 6398, 6406, 6413, 6418, 6422, 6426, 6434, - 6438, 6443, 6450, 6458, 6463, 6467, 6472, 6476, 6483, 6488, 6502, 6507, - 6512, 6519, 3541, 6528, 6532, 6537, 6541, 6545, 6548, 6553, 6558, 6567, - 6573, 6579, 6585, 6589, 6600, 6610, 6625, 6640, 6655, 6670, 6685, 6700, - 6715, 6730, 6745, 6760, 6775, 6790, 6805, 6820, 6835, 6850, 6865, 6880, - 6895, 6910, 6925, 6940, 6955, 6970, 6985, 7000, 7015, 7030, 7045, 7060, - 7075, 7090, 7105, 7120, 7135, 7150, 7165, 7180, 7195, 7210, 7225, 7240, - 7255, 7270, 7285, 7300, 7315, 7330, 7345, 7354, 7363, 7368, 7374, 7384, - 7388, 7392, 7397, 7402, 7410, 7414, 7417, 7421, 3034, 7424, 7429, 330, - 504, 7435, 7443, 7447, 7451, 7454, 7458, 7464, 7468, 7476, 7482, 7487, - 7494, 7502, 7509, 7515, 7520, 7527, 7533, 7541, 7545, 7550, 7562, 7573, - 7580, 7584, 7588, 7592, 7595, 7601, 3311, 7605, 7611, 7616, 7621, 7626, - 7632, 7637, 7642, 7647, 7652, 7658, 7663, 7668, 7674, 7679, 7685, 7690, - 7696, 7701, 7707, 7712, 7717, 7722, 7727, 7732, 7738, 7743, 7748, 7753, - 7759, 7765, 7771, 7777, 7783, 7789, 7795, 7801, 7807, 7813, 7819, 7825, - 7830, 7835, 7840, 7845, 7850, 7855, 7860, 7865, 7871, 7877, 7882, 7888, - 7894, 7900, 7905, 7910, 7915, 7920, 7926, 7932, 7937, 7942, 7947, 7952, - 7957, 7963, 7968, 7974, 7980, 7986, 7992, 7998, 8004, 8010, 8016, 8022, - 2164, 7453, 8027, 8031, 8035, 8038, 8045, 8048, 8052, 8060, 8065, 8070, - 8061, 8075, 2191, 8079, 8085, 8091, 8096, 8101, 8108, 8116, 8121, 8125, - 8128, 8132, 8138, 8144, 8148, 2199, 526, 8151, 8155, 8160, 8166, 8171, - 8175, 8178, 8182, 8188, 8193, 8197, 8204, 8208, 8212, 8216, 876, 958, - 8219, 8227, 8234, 8240, 8247, 8255, 8262, 8273, 8280, 8286, 8291, 8303, - 1228, 1393, 1398, 8314, 1403, 8318, 8322, 8331, 8339, 8343, 8352, 8358, - 8363, 8367, 8373, 8378, 8385, 2745, 8392, 8396, 8405, 8414, 8423, 8432, - 8438, 8443, 8448, 8459, 8471, 8476, 8484, 2250, 8488, 8490, 8495, 8499, - 8508, 8516, 1407, 159, 3583, 3588, 8522, 8526, 8535, 8541, 8546, 8549, - 8558, 3592, 2737, 8564, 8572, 8576, 8580, 8584, 2267, 8588, 8593, 8600, - 8606, 8612, 8615, 8617, 8620, 8628, 8636, 8644, 8647, 8652, 2280, 8657, - 8072, 8660, 8662, 8667, 8672, 8677, 8682, 8687, 8692, 8697, 8702, 8707, - 8712, 8718, 8723, 8728, 8733, 8739, 8744, 8749, 8754, 8759, 8764, 8769, - 8775, 8780, 8785, 8790, 8795, 8800, 8805, 8810, 8815, 8820, 8825, 8830, - 8835, 8840, 8845, 8850, 8855, 8860, 8866, 8872, 8877, 8882, 8887, 8892, - 8897, 2291, 2298, 2304, 8902, 8910, 8916, 8924, 2330, 2336, 8932, 8936, - 8941, 8945, 8949, 8953, 8958, 8962, 8967, 8971, 8974, 8977, 8983, 8990, - 8996, 9003, 9009, 9016, 9022, 9029, 9035, 9041, 9050, 9056, 9060, 9064, - 9068, 9072, 9077, 9081, 9086, 9090, 9096, 9101, 9108, 9119, 9127, 9137, - 9143, 9153, 9162, 9169, 9174, 9178, 9189, 9202, 9213, 9226, 9237, 9249, - 9261, 9273, 9286, 9299, 9306, 9312, 9326, 9333, 9339, 9348, 9356, 9360, - 9365, 9369, 9376, 9384, 9388, 9394, 9398, 9404, 9414, 9418, 9423, 9428, - 9435, 9441, 9451, 8242, 9457, 9461, 9468, 9474, 9481, 9488, 957, 9492, - 9496, 9501, 9506, 9511, 9515, 9521, 9529, 9535, 9539, 9542, 9548, 9558, - 9562, 9568, 9573, 9577, 9581, 9587, 9593, 2187, 9598, 9600, 9605, 9613, - 9622, 9626, 9632, 9637, 9642, 9647, 9652, 9658, 9663, 9668, 4235, 9673, - 9678, 9682, 9688, 9693, 9699, 9704, 9709, 9715, 9720, 9627, 9726, 9730, - 9737, 9743, 9748, 9752, 6498, 9757, 9766, 9771, 9776, 8596, 8603, 9781, - 2912, 9785, 9790, 9795, 9800, 9638, 9804, 9809, 9814, 9643, 9818, 9648, - 9823, 9830, 9837, 9843, 9850, 9856, 9862, 9867, 9874, 9879, 9884, 9889, - 9895, 9653, 9659, 9901, 9907, 9912, 9917, 9925, 9664, 9930, 1102, 9933, - 9941, 9947, 9953, 9962, 9970, 9978, 9986, 9994, 10002, 10010, 10018, - 10026, 10035, 10044, 10052, 10061, 10070, 10079, 10088, 10097, 10106, - 10115, 10124, 10133, 10142, 10150, 10155, 10161, 10169, 10176, 10191, - 10208, 10227, 10236, 10244, 10259, 10270, 10280, 10290, 10298, 10304, - 10316, 10325, 10333, 10340, 10347, 10354, 10360, 10365, 10375, 10383, - 10393, 10400, 10410, 10420, 10430, 10438, 10445, 10454, 10464, 10478, - 10493, 10502, 10510, 10515, 10519, 10528, 10534, 10539, 10549, 10559, - 10569, 10574, 10578, 10587, 10592, 10608, 10625, 10635, 10646, 10659, - 10667, 10680, 10692, 10700, 10705, 10709, 10715, 10720, 10728, 10736, - 10743, 10748, 10756, 10766, 10772, 10776, 10779, 10783, 10789, 10796, - 10800, 10808, 10817, 10825, 10832, 10837, 10842, 10846, 10850, 10858, - 10873, 10889, 10895, 10903, 10912, 10920, 10926, 10930, 10937, 10948, - 10952, 10955, 10961, 9669, 10966, 10972, 10979, 10985, 10990, 10997, - 11004, 11011, 11018, 11025, 11032, 11039, 11046, 11051, 10204, 11056, - 11062, 11069, 11076, 11081, 11088, 11097, 11101, 11113, 8634, 11117, - 11120, 11124, 11128, 11132, 11136, 11142, 11148, 11153, 11159, 11164, - 11169, 11175, 11180, 11185, 9431, 11190, 11194, 11198, 11202, 11207, - 11212, 11217, 11225, 11231, 11236, 11240, 11244, 11251, 11256, 11264, - 11271, 11276, 11280, 11283, 11289, 11296, 11300, 11303, 11308, 11312, - 4274, 11318, 11327, 46, 11335, 11341, 11346, 11351, 11359, 11366, 11371, - 9446, 11377, 11383, 11388, 11392, 11395, 11410, 11429, 11441, 11454, - 11467, 11480, 11494, 11507, 11522, 11529, 9674, 11535, 11549, 11554, - 11560, 11565, 11573, 11578, 8401, 11583, 11586, 11594, 11601, 11606, - 11610, 11616, 2917, 10278, 11620, 11624, 11630, 11636, 11641, 11647, - 11652, 9683, 11658, 11664, 11669, 11674, 11682, 11688, 11701, 11709, - 11716, 11722, 9689, 11728, 11736, 11744, 11751, 11764, 11777, 11789, - 11799, 11807, 11814, 11826, 11833, 11843, 11852, 11861, 11869, 11876, - 11881, 11887, 9694, 11892, 11898, 11903, 11908, 9700, 11913, 11916, - 11923, 11929, 11942, 9112, 11953, 11959, 11968, 11976, 11983, 11989, - 12000, 12006, 12011, 3836, 12019, 12024, 11402, 12030, 12037, 12042, - 9705, 12048, 12053, 12060, 12066, 12072, 12077, 12085, 12093, 12100, - 12104, 12116, 12130, 12140, 12145, 12149, 12160, 12166, 12171, 12176, - 9710, 12180, 9716, 12185, 12188, 12193, 12205, 12212, 12217, 12221, - 12229, 12234, 12238, 12243, 12247, 12254, 12260, 9721, 9628, 12267, 2922, - 12, 12274, 12279, 12283, 12287, 12293, 12301, 12311, 12316, 12321, 12328, - 12335, 12339, 12350, 12360, 12369, 12378, 12390, 12395, 12399, 12407, - 12421, 12425, 12428, 12436, 12443, 12451, 12455, 12466, 12470, 12477, - 12482, 12486, 12492, 12497, 12503, 12508, 12513, 12517, 12523, 12528, - 12539, 12543, 12546, 12552, 12557, 12563, 12569, 12576, 12587, 12597, - 12607, 12616, 12623, 12632, 12636, 9731, 9738, 9744, 9749, 12642, 12648, - 12654, 12659, 12665, 9753, 12671, 12674, 12681, 12686, 12701, 12717, - 12732, 12740, 12746, 12751, 950, 374, 12756, 12764, 12771, 12777, 12782, - 12787, 9758, 12789, 12793, 12798, 12802, 12812, 12817, 12821, 12830, - 12834, 12837, 12844, 9767, 12849, 12852, 12860, 12867, 12875, 12879, - 12883, 12890, 12899, 12906, 12902, 12913, 12917, 12923, 12927, 12931, - 12935, 12941, 12951, 12959, 12966, 12970, 12978, 12982, 12989, 12993, - 12998, 13002, 13009, 13015, 13023, 13029, 13034, 13044, 13049, 13054, - 13058, 13062, 13070, 4124, 13078, 13083, 9772, 13087, 13091, 13094, - 13102, 13109, 13113, 6298, 13117, 13122, 13127, 13131, 13142, 13152, - 13157, 13163, 13168, 13172, 13175, 13183, 13188, 13193, 13200, 13205, - 9777, 13210, 13214, 13221, 1737, 6456, 13226, 13231, 13236, 13241, 13247, - 13252, 13258, 13263, 13268, 13273, 13278, 13283, 13288, 13293, 13298, - 13303, 13308, 13313, 13318, 13323, 13328, 13333, 13338, 13344, 13349, - 13354, 13359, 13364, 13369, 13375, 13380, 13385, 13391, 13396, 13402, - 13407, 13413, 13418, 13423, 13428, 13433, 13439, 13444, 13449, 13454, - 909, 112, 13462, 13466, 13471, 13476, 13480, 13484, 13488, 13493, 13497, - 13502, 13506, 13509, 13513, 13517, 13523, 13528, 13538, 13544, 13552, - 13558, 13562, 13566, 13573, 13581, 13590, 13601, 13611, 13618, 13625, - 13629, 13638, 13647, 13655, 13664, 13673, 13682, 13691, 13701, 13711, - 13721, 13731, 13741, 13750, 13760, 13770, 13780, 13790, 13800, 13810, - 13820, 13829, 13839, 13849, 13859, 13869, 13879, 13889, 13898, 13908, - 13918, 13928, 13938, 13948, 13958, 13968, 13978, 13988, 13997, 14007, - 14017, 14027, 14037, 14047, 14057, 14067, 14077, 14087, 14097, 14106, - 1237, 14112, 14115, 14119, 14124, 14131, 14137, 14142, 14146, 14151, - 14160, 14168, 14173, 14177, 14181, 14187, 14192, 14198, 9786, 14203, - 14208, 14217, 9796, 14222, 14225, 14231, 14239, 9801, 14246, 14250, - 14254, 14259, 14263, 14273, 14279, 14285, 14290, 14299, 14307, 14314, - 14321, 14326, 14333, 14338, 14342, 14345, 14356, 14366, 14375, 14383, - 14394, 14406, 14416, 14421, 14425, 14430, 14435, 14439, 14445, 14453, - 14460, 14471, 14476, 14486, 14495, 14499, 14502, 14509, 14519, 14528, - 14535, 14539, 14546, 14552, 14557, 14562, 14566, 14575, 14580, 14584, - 14590, 14594, 14599, 14603, 14610, 14617, 14621, 14630, 14638, 14646, - 14653, 14661, 14673, 14684, 14694, 14701, 14707, 14716, 14727, 14736, - 14748, 14760, 14772, 14782, 14791, 14800, 14808, 14815, 14824, 14832, - 14836, 14841, 14847, 14853, 14858, 14863, 8093, 14867, 14869, 14873, - 14878, 14884, 14890, 14899, 14903, 14909, 14917, 14924, 14933, 14942, - 14951, 14960, 14969, 14978, 14987, 14996, 15006, 15016, 15025, 15031, - 15038, 15045, 15051, 15065, 15071, 15078, 15086, 15095, 15103, 15109, - 15118, 15127, 15138, 15148, 15156, 15163, 15171, 15180, 15193, 15202, - 15210, 15217, 15230, 15236, 15242, 15252, 15261, 15270, 15275, 15279, - 15285, 15291, 15296, 15303, 15310, 9445, 15315, 15320, 15327, 15335, - 15340, 15347, 15352, 15364, 13519, 15369, 15377, 15383, 15388, 15396, - 15404, 15411, 15419, 15425, 15433, 15441, 15447, 15452, 15458, 15465, - 15471, 15476, 15480, 15491, 15499, 15505, 15510, 15517, 15526, 15532, - 15537, 15545, 15554, 15568, 4068, 15572, 15577, 15582, 15588, 15593, - 15598, 15602, 15607, 15612, 15617, 8092, 15622, 15627, 15632, 15637, - 15642, 15646, 15651, 15656, 15661, 15666, 15672, 15678, 15683, 15687, - 15693, 15698, 15703, 15708, 9805, 15713, 15718, 15723, 15728, 15733, - 15750, 15768, 15780, 15793, 15810, 15826, 15843, 15853, 15872, 15883, - 15894, 15905, 15916, 15928, 15939, 15950, 15967, 15978, 15989, 15994, - 9810, 15999, 16003, 2420, 16007, 16010, 16016, 16024, 16032, 16041, - 16048, 16053, 16061, 16069, 16076, 16080, 16085, 16091, 16098, 16106, - 16113, 16125, 16132, 16138, 16146, 16151, 16157, 12695, 16163, 16172, - 16178, 16183, 16191, 16200, 16208, 16215, 16221, 16229, 16236, 16242, - 16248, 16255, 16262, 16268, 16274, 16283, 16291, 16301, 16308, 16314, - 16322, 16328, 16336, 16344, 16351, 16364, 16371, 16380, 16389, 16398, - 16406, 16416, 16423, 16428, 3727, 16435, 16440, 1353, 16444, 15623, - 16448, 16454, 16458, 16466, 16478, 16483, 16490, 16496, 16501, 16508, - 15628, 16512, 16516, 16520, 15633, 16524, 15638, 16528, 16535, 16540, - 16544, 16551, 16555, 16563, 16570, 16575, 16579, 16586, 16603, 16612, - 16616, 16619, 16627, 16633, 16638, 3805, 16642, 16644, 16652, 16659, - 16669, 16681, 16686, 16690, 16696, 16701, 16705, 16711, 16716, 16722, - 16725, 16732, 16740, 16747, 16753, 16758, 16764, 16769, 16776, 16782, - 16787, 16794, 16799, 16803, 16809, 16813, 16820, 16826, 16831, 16837, - 16845, 16853, 16860, 16866, 16871, 16877, 16883, 16891, 16899, 16905, - 16911, 16916, 16923, 16928, 16932, 16938, 16943, 16950, 16955, 16961, - 16964, 16970, 16976, 16979, 16983, 16987, 16999, 17005, 17010, 17017, - 17023, 17029, 17040, 17050, 17059, 17067, 17074, 17085, 17095, 17105, - 17113, 17116, 15652, 17121, 17126, 15657, 15798, 17134, 17147, 17162, - 17173, 15815, 17191, 17204, 17217, 17228, 11417, 17239, 17252, 17271, - 17282, 17293, 17304, 2688, 17317, 17321, 17329, 17340, 17348, 17363, - 17378, 17389, 17396, 17402, 17410, 17414, 17420, 17423, 17436, 17448, - 17458, 17466, 17473, 17481, 17491, 17496, 17503, 17508, 17515, 17526, - 17536, 17542, 17547, 17552, 15662, 17556, 17562, 17568, 17573, 17578, - 17583, 17587, 15667, 15673, 17591, 15679, 17596, 17604, 17609, 17613, - 17621, 17630, 17637, 17641, 9649, 17645, 17647, 17652, 17657, 17663, - 17668, 17673, 17678, 17683, 17687, 17693, 17699, 17704, 17710, 17715, - 17720, 17724, 17730, 17735, 17740, 17745, 17757, 17762, 17768, 17773, - 17778, 17784, 17790, 17795, 17800, 17805, 17812, 17818, 17829, 17836, - 17841, 17845, 17849, 17852, 17860, 17865, 17872, 17879, 17885, 17890, - 17895, 17900, 17907, 17917, 17925, 17930, 17937, 17943, 17952, 17962, - 17972, 17986, 18000, 18014, 18028, 18043, 18058, 18075, 18093, 18106, - 18112, 18117, 18122, 18126, 18134, 18139, 18147, 18153, 18159, 18164, - 18169, 18173, 18178, 18182, 18187, 18191, 18202, 18208, 18213, 18218, - 18225, 18230, 18234, 3690, 18239, 18245, 18252, 15688, 18258, 18262, - 18268, 18273, 18278, 18282, 18288, 18293, 18298, 18305, 18310, 14275, - 18314, 18319, 18323, 18328, 18334, 18340, 18347, 18357, 18365, 18372, - 18377, 18381, 18390, 18398, 18405, 18412, 18418, 18423, 18429, 18434, - 18439, 18445, 18450, 18456, 18461, 18467, 18473, 18480, 18486, 18491, - 18496, 9875, 18505, 18508, 18516, 18522, 18527, 18532, 18542, 18549, - 18555, 18560, 18565, 18571, 18576, 18582, 18587, 18593, 18599, 18604, - 18612, 18619, 18624, 18629, 18635, 18640, 18644, 18653, 18664, 18671, - 18679, 18686, 18691, 18696, 18702, 18707, 18715, 18721, 18727, 18734, - 18740, 18745, 18749, 18755, 18760, 18765, 18769, 18774, 1426, 8117, 2936, - 18778, 18782, 18786, 18790, 18794, 18798, 18801, 18806, 18813, 18821, - 15699, 18828, 18838, 18846, 18853, 18861, 18871, 18880, 9220, 18893, - 18898, 18903, 18911, 18918, 14371, 14380, 18925, 18935, 18950, 18956, - 18963, 18970, 18976, 18982, 18993, 19001, 19009, 19019, 19029, 15704, - 19038, 19044, 19050, 19058, 19066, 19071, 19080, 19088, 19100, 19110, - 19120, 19130, 19139, 19151, 19161, 19171, 19182, 19187, 19199, 19211, - 19223, 19235, 19247, 19259, 19271, 19283, 19295, 19307, 19318, 19330, - 19342, 19354, 19366, 19378, 19390, 19402, 19414, 19426, 19438, 19449, - 19461, 19473, 19485, 19497, 19509, 19521, 19533, 19545, 19557, 19569, - 19580, 19592, 19604, 19616, 19628, 19640, 19652, 19664, 19676, 19688, - 19700, 19711, 19723, 19735, 19747, 19759, 19771, 19783, 19795, 19807, - 19819, 19831, 19842, 19854, 19866, 19878, 19890, 19902, 19914, 19926, - 19938, 19950, 19962, 19973, 19985, 19997, 20009, 20021, 20033, 20045, - 20057, 20069, 20081, 20093, 20104, 20116, 20128, 20140, 20152, 20165, - 20178, 20191, 20204, 20217, 20230, 20243, 20255, 20268, 20281, 20294, - 20307, 20320, 20333, 20346, 20359, 20372, 20385, 20397, 20410, 20423, - 20436, 20449, 20462, 20475, 20488, 20501, 20514, 20527, 20539, 20552, - 20565, 20578, 20591, 20604, 20617, 20630, 20643, 20656, 20669, 20681, - 20694, 20707, 20720, 20733, 20746, 20759, 20772, 20785, 20798, 20811, - 20823, 20836, 20849, 20862, 20875, 20888, 20901, 20914, 20927, 20940, - 20953, 20965, 20976, 20989, 21002, 21015, 21028, 21041, 21054, 21067, - 21080, 21093, 21106, 21118, 21131, 21144, 21157, 21170, 21183, 21196, - 21209, 21222, 21235, 21248, 21260, 21273, 21286, 21299, 21312, 21325, - 21338, 21351, 21364, 21377, 21390, 21402, 21415, 21428, 21441, 21454, - 21467, 21480, 21493, 21506, 21519, 21532, 21544, 21557, 21570, 21583, - 21596, 21609, 21622, 21635, 21648, 21661, 21674, 21686, 21699, 21712, - 21725, 21738, 21751, 21764, 21777, 21790, 21803, 21816, 21828, 21841, - 21854, 21867, 21880, 21893, 21906, 21919, 21932, 21945, 21958, 21970, - 21983, 21996, 22009, 22022, 22035, 22048, 22061, 22074, 22087, 22100, - 22112, 22125, 22138, 22151, 22164, 22177, 22190, 22203, 22216, 22229, - 22242, 22254, 22267, 22280, 22293, 22306, 22319, 22332, 22345, 22358, - 22371, 22384, 22396, 22407, 22416, 22424, 22432, 22439, 22445, 22449, - 22455, 22461, 22469, 22474, 22480, 22485, 22489, 22498, 9654, 22509, - 22516, 22524, 22531, 22538, 11936, 22545, 22552, 22561, 22566, 22571, - 8145, 22578, 22583, 22586, 22591, 22599, 22606, 22613, 22620, 22626, - 22635, 22644, 22653, 22659, 22668, 22672, 22678, 22683, 22693, 22700, - 22706, 22714, 22720, 22727, 22737, 22746, 22750, 22757, 22761, 22766, - 22772, 22780, 22784, 22794, 15714, 22803, 22809, 22813, 22822, 22832, - 15719, 22838, 22845, 22856, 22864, 22874, 22883, 22891, 9410, 22899, - 22904, 22910, 22915, 22919, 22923, 22927, 10379, 22932, 22940, 22947, - 22956, 22963, 22970, 22976, 11856, 22983, 22989, 22993, 22999, 23006, - 23012, 23020, 23026, 23033, 23039, 23045, 23054, 23058, 23066, 23075, - 23082, 23087, 23091, 23102, 23107, 23112, 23117, 23130, 8349, 23134, - 23140, 23145, 23153, 23157, 23164, 23173, 23178, 15990, 23186, 23190, - 23202, 23207, 23211, 23214, 23220, 23226, 23232, 23237, 23241, 23244, - 23255, 23260, 9926, 23267, 23272, 1243, 9931, 23277, 23282, 23287, 23292, - 23297, 23302, 23307, 23312, 23317, 23322, 23327, 23332, 23338, 23343, - 23348, 23353, 23358, 23363, 23368, 23373, 23378, 23383, 23389, 23395, - 23400, 23405, 23410, 23415, 23420, 23425, 23430, 23435, 23440, 23446, - 23451, 23456, 23461, 23467, 23473, 23478, 23483, 23488, 23493, 23498, - 23503, 23508, 23513, 23519, 23524, 23529, 23534, 23539, 23545, 23550, - 23555, 23559, 134, 23567, 23571, 23575, 23579, 23584, 23588, 14281, 2346, - 23592, 23597, 23601, 23606, 23610, 23615, 23619, 23625, 23630, 23634, - 23638, 23646, 23650, 23654, 23659, 23664, 23668, 23674, 23679, 23683, - 23688, 23693, 23697, 23704, 23711, 23718, 23722, 23726, 23731, 23735, - 23738, 23744, 23757, 23762, 23768, 23777, 23782, 10151, 23787, 23796, - 23801, 23804, 2751, 2756, 23808, 23814, 23820, 7538, 23825, 23830, 23835, - 23841, 23846, 15134, 23851, 23856, 23861, 23866, 23872, 23877, 23882, - 23888, 23893, 23897, 23902, 23907, 23912, 23917, 23922, 23926, 23931, - 23935, 23940, 23945, 23950, 23955, 23959, 23964, 23968, 23973, 23978, - 23983, 23898, 2945, 23903, 23988, 23996, 24003, 10473, 24015, 24023, - 24033, 24051, 24070, 24079, 24087, 23908, 24094, 24099, 24107, 23913, - 24112, 24117, 24125, 24130, 23918, 24135, 24143, 24148, 24152, 24159, - 24165, 24174, 24182, 24186, 24189, 24196, 24200, 24204, 24209, 24215, - 24222, 24227, 9437, 1742, 1747, 24231, 24237, 24243, 24248, 24252, 24256, - 24260, 24264, 24268, 24272, 24276, 24280, 24283, 24289, 24296, 24304, - 24310, 24316, 24321, 24326, 24332, 24336, 24341, 15040, 15047, 24348, - 24360, 24363, 24370, 24374, 17881, 24381, 24389, 24400, 24409, 24422, - 24432, 24446, 24458, 24472, 24485, 24497, 24507, 24519, 24525, 24540, - 24564, 24582, 24601, 24614, 24628, 24646, 24662, 24679, 24697, 24708, - 24727, 24744, 24764, 24782, 24794, 24808, 24822, 24834, 24851, 24870, - 24888, 24900, 24918, 24937, 15858, 24950, 24970, 24982, 11448, 24994, - 24999, 25004, 25009, 25015, 25020, 25024, 25031, 25037, 2437, 25041, - 25047, 25051, 25054, 25058, 25061, 25069, 25075, 23936, 25079, 25088, - 25099, 25105, 25111, 25126, 25135, 25143, 25150, 25155, 25159, 25166, - 25172, 25181, 25189, 25196, 25206, 25215, 25225, 25230, 25239, 25248, - 25259, 25270, 4192, 25280, 25284, 25294, 25302, 25312, 25323, 25328, - 25338, 25346, 25353, 25359, 25366, 25371, 23946, 25375, 25384, 25388, - 25391, 25396, 25404, 25411, 25420, 25428, 25436, 25444, 25454, 25463, - 25469, 25475, 25479, 23951, 23956, 25483, 25493, 25503, 25513, 25521, - 25528, 25538, 25546, 25554, 25560, 25568, 865, 25577, 16065, 615, 25591, - 25600, 25608, 25619, 25630, 25640, 25649, 25661, 25670, 25679, 25686, - 25692, 25702, 25711, 25720, 25728, 25738, 25746, 25754, 9892, 25760, - 25763, 25767, 25772, 25777, 25781, 10588, 23969, 23974, 25789, 25795, - 25801, 25806, 25811, 25815, 25823, 25829, 25835, 25839, 3675, 25847, - 25852, 25857, 25861, 25865, 10701, 25872, 25880, 25894, 25901, 25907, - 10710, 10716, 25915, 25923, 25930, 25935, 25940, 23979, 25946, 25957, - 25961, 25966, 2640, 25971, 25982, 25988, 25993, 25997, 26001, 26004, - 26011, 26018, 26024, 26031, 26037, 26041, 23984, 26046, 26050, 26054, - 1431, 8544, 26059, 26064, 26069, 26074, 26079, 26084, 26089, 26094, - 26099, 26104, 26109, 26114, 26119, 26124, 26130, 26135, 26140, 26145, - 26150, 26155, 26160, 26166, 26171, 26176, 26181, 26186, 26191, 26196, - 26201, 26207, 26213, 26218, 26224, 26229, 26234, 5, 26240, 26244, 26248, - 26252, 26257, 26261, 26265, 26269, 26273, 26278, 26282, 26287, 26291, - 26294, 26298, 26303, 26307, 26312, 26316, 26320, 26324, 26329, 26333, - 26337, 26347, 26352, 26356, 26360, 26365, 26370, 26379, 26384, 26389, - 26393, 26397, 26410, 26422, 26431, 26440, 26445, 26451, 26456, 26460, - 26464, 26474, 26483, 26491, 26497, 26502, 26506, 26513, 26523, 26532, - 26540, 11770, 26548, 26556, 26565, 26574, 26582, 26592, 26597, 26601, - 26605, 26608, 26610, 26614, 26618, 26623, 26628, 26632, 26636, 26639, - 26643, 26646, 26650, 26653, 26656, 26660, 26666, 26670, 26674, 26678, - 26683, 26688, 26693, 26697, 26700, 26705, 26711, 26716, 26722, 26727, - 26731, 26737, 26741, 26745, 26750, 26754, 26759, 26764, 26768, 26772, - 26779, 26783, 26786, 26790, 26794, 26800, 26806, 26810, 26814, 26819, - 26826, 26832, 26836, 26845, 26849, 26853, 26856, 26862, 26867, 26873, - 1475, 1806, 26878, 26883, 26888, 26893, 26898, 26903, 26908, 2174, 2220, - 26913, 26916, 26920, 26924, 26929, 26933, 16077, 26937, 26942, 26947, - 26951, 26954, 26959, 26963, 26968, 26972, 16081, 26977, 26980, 26983, - 26987, 26992, 26996, 27009, 27013, 27016, 27024, 27033, 27040, 27045, - 27051, 27057, 27065, 27072, 27079, 27083, 27087, 27091, 27096, 27101, - 27105, 27113, 27118, 27130, 27141, 27146, 27150, 27157, 27161, 27166, - 27172, 27175, 27180, 27185, 27189, 27193, 27196, 27202, 8248, 2350, - 27206, 27211, 27227, 10198, 27247, 27256, 27272, 27276, 27283, 27286, - 27292, 27302, 27308, 27317, 27332, 27344, 27355, 27363, 27372, 27378, - 27387, 27397, 27407, 27418, 27429, 27439, 27448, 27455, 27464, 27472, - 27479, 27487, 27494, 27501, 27514, 27521, 27529, 27536, 27542, 27547, - 27556, 27562, 27567, 27575, 27582, 27589, 25304, 27601, 27613, 27627, - 27635, 27642, 27654, 27663, 27672, 27680, 27688, 27696, 27703, 27709, - 27718, 27726, 27736, 27745, 27755, 27764, 27773, 27781, 27786, 27790, - 27793, 27797, 27801, 27805, 27809, 27813, 27819, 27825, 27833, 16139, - 27840, 27845, 27852, 27858, 27865, 16147, 27872, 27875, 27887, 27895, - 27901, 27906, 27910, 27921, 10651, 27931, 27939, 27949, 27958, 27965, - 27972, 27980, 27984, 16158, 27987, 27994, 27998, 28004, 28007, 28014, - 28020, 28027, 28033, 28037, 28042, 28046, 28055, 28062, 28068, 8306, - 28075, 28083, 28090, 28096, 28101, 28107, 28113, 28121, 28127, 28131, - 28134, 28136, 27798, 28145, 28151, 28157, 28167, 28172, 28179, 28185, - 28190, 28195, 28200, 28204, 28209, 28216, 28222, 28231, 28235, 28242, - 28248, 28257, 4378, 28263, 28269, 28274, 28281, 28292, 28297, 28301, - 28311, 28317, 28321, 28326, 28336, 28345, 28349, 28356, 28364, 28371, - 28377, 28382, 28390, 28397, 28402, 28409, 28421, 28430, 28434, 14212, - 28442, 28452, 28456, 27020, 28467, 28472, 28476, 28483, 28490, 23670, - 27723, 28495, 28499, 28502, 24714, 28507, 28521, 28537, 28555, 28574, - 28591, 28609, 24733, 28626, 28646, 24750, 28658, 28670, 17178, 28682, - 24770, 28696, 28708, 11461, 28722, 28727, 28732, 28737, 28743, 28749, - 28755, 28759, 28767, 28774, 28779, 28789, 28795, 11059, 28801, 28803, - 28808, 28816, 28820, 28212, 28826, 28833, 12601, 12611, 28840, 28850, - 28855, 28859, 28862, 28868, 28876, 28888, 28898, 28914, 28927, 28941, - 17196, 28955, 28962, 28966, 28969, 28974, 28978, 28985, 28992, 28999, - 29009, 29014, 29019, 29024, 29032, 29040, 29045, 29054, 29059, 3353, - 29063, 29066, 29069, 29074, 29081, 29086, 29102, 29110, 29118, 9966, - 29126, 29131, 29135, 29141, 29146, 29152, 29155, 29161, 29173, 29181, - 29188, 29194, 29201, 29212, 29226, 29239, 29245, 29254, 29260, 29269, - 29281, 29292, 29302, 29311, 29320, 29328, 29339, 8288, 29346, 29353, - 29359, 29364, 29370, 29377, 29387, 29397, 29406, 29412, 29419, 29424, - 29432, 29439, 29447, 29455, 29467, 6563, 995, 29474, 29483, 29491, 29497, - 29503, 29508, 29512, 29515, 29521, 29528, 29533, 29538, 29543, 29547, - 29559, 29570, 29579, 29587, 16323, 29592, 29597, 29603, 29609, 12594, - 9058, 29614, 29618, 29622, 29625, 29628, 29634, 29642, 29650, 29654, - 29658, 29663, 29666, 29675, 29679, 29682, 29690, 29701, 29705, 29711, - 29717, 29721, 29727, 29735, 29757, 29781, 29790, 29797, 29804, 29810, - 29818, 29824, 29829, 29840, 29858, 29865, 29873, 29877, 29882, 29891, - 29904, 29912, 29924, 29935, 29946, 29956, 29970, 29979, 29987, 29999, - 10215, 30010, 30021, 30033, 30043, 30052, 30057, 30061, 30069, 30080, - 30090, 30095, 30099, 30102, 30105, 30113, 30121, 30130, 30140, 30149, - 30155, 30169, 2702, 30191, 30202, 30211, 30221, 30233, 30242, 30251, - 30261, 30269, 30277, 30286, 30291, 30302, 30307, 30318, 30322, 30332, - 30341, 30349, 30359, 30369, 30377, 30386, 30393, 30401, 30408, 30417, - 30426, 30430, 30438, 30445, 30453, 30460, 30471, 30486, 30493, 30499, - 30509, 30518, 30524, 30535, 30539, 30546, 30550, 30556, 15265, 30562, - 30566, 30571, 30577, 30584, 30588, 30592, 30600, 30608, 30614, 30623, - 30630, 30635, 30640, 30650, 25373, 30654, 30657, 30662, 30667, 30672, - 30677, 30682, 30687, 30692, 30697, 30703, 30708, 30713, 30719, 1199, 660, - 30724, 30733, 2398, 30740, 30745, 30749, 30755, 1248, 578, 290, 30760, - 30769, 30777, 30786, 30794, 30805, 30813, 30822, 30830, 30835, 10797, - 30839, 30847, 30855, 30860, 16094, 3824, 30866, 30872, 30878, 6148, - 30883, 30887, 30893, 30897, 30903, 30908, 30915, 1441, 30921, 30928, - 1348, 6156, 30932, 30942, 30950, 30956, 30966, 30975, 30983, 30989, - 30997, 31004, 12136, 31010, 31017, 31022, 31029, 1494, 219, 2173, 31035, - 31041, 31048, 31059, 31070, 31078, 31085, 31095, 31104, 31112, 31121, - 31128, 31135, 31148, 31155, 31161, 31172, 31191, 1253, 31196, 31201, - 31209, 3742, 31213, 31218, 31222, 31226, 1445, 26637, 31236, 31240, - 31245, 31249, 3619, 31255, 31263, 31270, 31281, 31289, 31297, 3743, 346, - 31302, 31310, 31318, 31325, 31331, 31336, 2242, 11628, 31343, 31349, - 28038, 28287, 31355, 574, 106, 31359, 31363, 31369, 663, 9841, 31374, - 31381, 31387, 31391, 1639, 31394, 31398, 16576, 31401, 31406, 31413, - 31419, 31424, 31432, 31439, 31445, 24132, 31449, 31453, 31457, 3813, - 18180, 31461, 31466, 31470, 31473, 31481, 31489, 31494, 31502, 31505, - 31512, 31522, 31534, 31539, 31543, 31551, 31558, 31564, 31571, 31578, - 31581, 31585, 31589, 1449, 31599, 31601, 31606, 31612, 31618, 31623, - 31628, 31633, 31638, 31643, 31648, 31653, 31658, 31663, 31668, 31673, - 31678, 31683, 31688, 31694, 31700, 31706, 31712, 31717, 31722, 31727, - 31733, 31738, 31743, 31748, 31754, 31759, 31765, 31770, 31775, 31780, - 31785, 31791, 31796, 31802, 31807, 31812, 31817, 31822, 31828, 31833, - 31839, 31844, 31849, 31854, 31859, 31864, 31869, 31874, 31879, 31884, - 31890, 31896, 31902, 31907, 31912, 31917, 31922, 31928, 31934, 31940, - 31946, 31952, 31958, 31963, 31969, 31974, 31979, 31984, 31989, 31995, - 2482, 32000, 2489, 2496, 2793, 32005, 2502, 2512, 32011, 32015, 32020, - 32025, 32031, 32036, 32041, 32045, 32050, 32056, 32061, 32066, 32071, - 32077, 32082, 32086, 32090, 32095, 32100, 32105, 32110, 32115, 32121, - 32127, 32132, 32136, 32141, 32147, 32151, 32156, 32161, 32166, 32171, - 32175, 32178, 32183, 32188, 32193, 32198, 32203, 32209, 32215, 32220, - 32225, 32230, 32234, 32239, 32244, 32249, 32254, 32259, 32264, 32268, - 32273, 32278, 32283, 32287, 32291, 32295, 32300, 32308, 32313, 32318, - 32324, 32330, 32336, 32341, 32345, 32348, 32353, 32358, 32362, 32367, - 32372, 32376, 32381, 32385, 32388, 32393, 3914, 18906, 32398, 32403, - 32408, 32416, 22959, 30925, 9518, 32421, 32426, 32430, 32435, 32439, - 32443, 32448, 32452, 32455, 32458, 32462, 32467, 32471, 32479, 32483, - 32486, 32491, 32495, 32499, 32504, 32509, 32513, 32519, 32524, 32529, - 32536, 32543, 32547, 32550, 32556, 32565, 32572, 32580, 32587, 32591, - 32596, 32600, 32604, 32610, 32616, 32620, 32626, 32631, 32636, 32640, - 32647, 32653, 32659, 32665, 32671, 32678, 32684, 32690, 32696, 32702, - 32708, 32714, 32720, 32727, 32733, 32740, 32746, 32752, 32758, 32764, - 32770, 32776, 32782, 32788, 32794, 12479, 32800, 32806, 32811, 32816, - 32821, 32824, 32830, 32838, 32843, 32847, 32852, 32858, 32867, 32873, - 32878, 32883, 32888, 32892, 32897, 32902, 32907, 32912, 32917, 32924, - 32931, 32937, 32943, 32948, 17822, 32955, 32961, 32968, 32974, 32980, - 32985, 32993, 32998, 10372, 33002, 33007, 33012, 33018, 33023, 33028, - 33032, 33037, 33042, 33048, 33053, 33058, 33063, 33067, 33072, 33077, - 33081, 33086, 33091, 33095, 33100, 33104, 33109, 33114, 33119, 33123, - 33128, 33132, 33136, 16682, 33141, 33150, 33156, 33162, 33171, 33179, - 33188, 33196, 33201, 33205, 33212, 33218, 33226, 33230, 33233, 33238, - 33242, 33251, 33259, 33277, 33283, 1493, 33289, 33292, 33296, 24238, - 24244, 33302, 33306, 33317, 33328, 33339, 33351, 33355, 33362, 33369, - 33374, 33378, 6204, 928, 22958, 33386, 33391, 33395, 33400, 33404, 33410, - 33415, 33421, 33426, 33432, 33437, 33443, 33448, 33454, 33460, 33466, - 33471, 33427, 33433, 33475, 33480, 33486, 33491, 33497, 33502, 33508, - 33513, 33438, 11314, 33517, 33449, 33455, 33461, 2885, 3533, 33523, - 33526, 33531, 33537, 33543, 33549, 33556, 33562, 33568, 33574, 33580, - 33586, 33592, 33598, 33604, 33610, 33616, 33622, 33628, 33635, 33641, - 33647, 33653, 33659, 33665, 33668, 33673, 33676, 33683, 33688, 33696, - 33701, 33706, 33712, 33717, 33722, 33726, 33731, 33737, 33742, 33748, - 33753, 33759, 33764, 33770, 33776, 33780, 33785, 33790, 33795, 33800, - 33804, 33809, 33814, 33819, 33825, 33831, 33837, 33843, 33848, 33852, - 33855, 33861, 33867, 33876, 33884, 33891, 33896, 33900, 33904, 33909, - 16530, 33914, 33922, 33928, 3866, 1358, 33933, 33937, 8359, 33943, 33949, - 33956, 8368, 33960, 33966, 33973, 33979, 33988, 33996, 9244, 34008, - 34012, 34019, 34025, 34030, 34034, 34038, 34041, 34051, 34060, 34068, - 33428, 34073, 34083, 34093, 34103, 34109, 34114, 34124, 34129, 34142, - 34156, 34167, 34179, 34191, 34205, 34218, 34230, 34242, 15899, 34256, - 34261, 34266, 34270, 34274, 34278, 1795, 29290, 34282, 34287, 33476, - 34292, 34295, 34300, 34305, 34310, 34316, 34322, 10974, 34327, 34333, - 34340, 17130, 34346, 34351, 34356, 34360, 34365, 34370, 33481, 34375, - 34380, 34385, 34391, 33487, 34396, 34399, 34406, 34414, 34420, 34426, - 34432, 34443, 34448, 34455, 34462, 34469, 34477, 34486, 34495, 34501, - 34507, 34515, 33492, 34520, 34526, 34532, 33498, 34537, 34542, 34550, - 34558, 34564, 34571, 34577, 34584, 34591, 34597, 34605, 34615, 34622, - 34628, 34633, 34639, 34644, 34649, 34656, 34665, 34673, 34678, 34684, - 34691, 34699, 34705, 34710, 34716, 34725, 34732, 30135, 34738, 34742, - 34747, 34756, 34761, 34766, 34771, 13548, 34779, 34784, 34789, 34794, - 34798, 34803, 34808, 34815, 34820, 34825, 34830, 33503, 22895, 34836, - 2558, 144, 34839, 34842, 34846, 34850, 34860, 34868, 34875, 34879, 34882, - 34890, 34897, 34904, 34913, 34917, 34920, 34926, 34930, 34938, 34946, - 34950, 34954, 34957, 34963, 34970, 34974, 34978, 34985, 34993, 33439, - 35000, 35008, 35013, 11034, 623, 369, 35025, 35030, 35035, 35041, 35046, - 35051, 3887, 35056, 35059, 35064, 35069, 35074, 35079, 35084, 35091, - 24356, 35096, 35101, 35106, 35111, 35116, 35122, 35127, 35133, 33679, - 35139, 35144, 35150, 35156, 35166, 35171, 35176, 35180, 35185, 35190, - 35195, 35200, 35213, 35218, 24019, 18255, 3900, 35222, 35228, 35233, - 35238, 35244, 35249, 35254, 35258, 35263, 35268, 35274, 35279, 35284, - 1363, 35288, 35293, 35298, 35303, 35307, 35312, 35317, 35322, 35328, - 35334, 35339, 35343, 35347, 35352, 35357, 35362, 35366, 35374, 35378, - 35384, 35388, 35395, 18039, 33450, 35401, 35408, 35416, 35423, 35429, - 35442, 35454, 35459, 35465, 35469, 2812, 35473, 35477, 34965, 35486, - 35497, 35502, 30198, 35507, 35512, 35516, 35521, 24249, 35525, 35529, - 35534, 33456, 22985, 35538, 35543, 35549, 35554, 35558, 35562, 35565, - 35569, 35575, 35584, 35595, 35607, 33462, 35612, 35615, 35619, 35623, - 406, 35628, 35633, 35638, 35643, 35648, 35653, 35659, 35664, 35669, - 35675, 35680, 35686, 35691, 35697, 35702, 35707, 35712, 35717, 35722, - 35727, 35732, 35737, 35743, 35748, 35753, 35758, 35763, 35768, 35773, - 35778, 35784, 35790, 35795, 35800, 35805, 35810, 35815, 35820, 35825, - 35830, 35835, 35840, 35845, 35850, 35855, 35860, 35865, 35870, 35875, - 35880, 35886, 325, 9, 35891, 35895, 35899, 35907, 35911, 35915, 35918, - 35921, 35923, 35928, 35932, 35937, 35941, 35946, 35950, 35955, 35959, - 35962, 35964, 35968, 35973, 35977, 35988, 35991, 35993, 35997, 36009, - 36018, 36022, 36026, 36032, 36037, 36046, 36052, 36057, 36062, 36066, - 36070, 36075, 36082, 36087, 36093, 36098, 36102, 36109, 27731, 27741, - 36113, 36118, 36123, 36128, 36135, 36139, 36146, 36152, 8491, 36156, - 36165, 36173, 36188, 36202, 36211, 36219, 36230, 36239, 36244, 36251, - 7556, 36261, 36266, 36271, 36275, 36278, 36283, 36287, 36292, 36296, - 36303, 36308, 36313, 36318, 9391, 36328, 36330, 36333, 36336, 36340, - 36346, 36350, 36355, 36360, 36378, 36392, 36411, 36428, 36437, 36445, - 36450, 36455, 1486, 36461, 36467, 36472, 36482, 36491, 36499, 36504, - 36510, 36515, 36524, 36535, 36540, 36547, 36551, 36558, 36566, 36573, - 36586, 36594, 36598, 36608, 36613, 36617, 36625, 36633, 36638, 36642, - 36646, 36655, 36661, 36666, 36674, 36684, 36693, 36702, 36711, 36722, - 36730, 36741, 36750, 36757, 36763, 36768, 36779, 36790, 36795, 36799, - 36802, 36806, 36814, 36820, 36831, 36842, 36853, 36864, 36875, 36886, - 36897, 36908, 36920, 36932, 36944, 36956, 36968, 36980, 36992, 36996, - 37004, 37010, 37017, 37023, 37028, 37034, 2457, 37038, 37040, 37045, - 37050, 37055, 37058, 37060, 37064, 37067, 37074, 37078, 10664, 37082, - 37088, 37098, 37103, 37109, 37113, 37118, 37131, 28162, 37137, 37146, - 37155, 19104, 37162, 37171, 34089, 37179, 37184, 37188, 37197, 37205, - 37212, 37217, 37221, 37226, 37234, 37238, 37246, 37252, 37258, 37263, - 37267, 37270, 37275, 37288, 37304, 24840, 37321, 37333, 37350, 37362, - 37376, 24857, 24876, 37388, 37400, 2719, 37414, 37419, 37424, 37429, - 37433, 37440, 37452, 37459, 37468, 37471, 37482, 37493, 37498, 34512, - 852, 37502, 37506, 37510, 37513, 37518, 37523, 37529, 37534, 37539, - 37545, 37551, 37556, 37560, 37565, 37570, 37575, 37579, 37582, 37588, - 37593, 37598, 37603, 37607, 37612, 37618, 37626, 28414, 37631, 37636, - 37643, 37649, 37655, 37660, 37668, 24365, 37675, 37680, 37685, 37690, - 37694, 37697, 37702, 37706, 37710, 37717, 37723, 37729, 37735, 37742, - 37747, 37753, 36628, 37757, 37761, 37766, 37779, 37784, 37790, 37798, - 37805, 37813, 37823, 37829, 37835, 37841, 37845, 37854, 37862, 37869, - 37874, 37879, 11337, 37884, 37891, 37897, 37907, 37912, 37918, 37926, - 3775, 37933, 37940, 37946, 37953, 3781, 37957, 37962, 37973, 37980, - 37986, 37995, 37999, 4244, 38002, 38009, 38015, 38021, 38029, 38039, - 31326, 38046, 38054, 38060, 38065, 38071, 38076, 38080, 28010, 38086, - 38093, 38099, 38108, 38115, 25565, 38121, 38126, 38130, 38138, 38146, - 10330, 6179, 38153, 38157, 38159, 38163, 38168, 38170, 38175, 38181, - 38186, 38191, 38198, 35087, 38204, 38209, 38213, 38218, 38222, 38231, - 38235, 38241, 38248, 38254, 38261, 38266, 38275, 38280, 38284, 38289, - 38296, 38304, 38312, 38317, 23041, 38321, 38324, 38328, 38332, 11725, - 872, 38336, 38341, 38349, 38353, 38362, 38369, 38373, 38377, 38385, - 38392, 38402, 38406, 38410, 38418, 38426, 38432, 38437, 38446, 14530, - 38452, 38461, 38466, 38473, 38480, 38488, 38496, 38504, 38509, 38516, - 38523, 38530, 38537, 38544, 38549, 38555, 38572, 38580, 38590, 38598, - 38605, 414, 38609, 38615, 38619, 38624, 36235, 38630, 38633, 38637, - 38648, 38656, 3786, 38664, 38670, 38676, 38686, 38695, 38705, 38712, - 38718, 38723, 3792, 3798, 38732, 38739, 38747, 38752, 38756, 38763, - 38771, 38778, 38784, 38793, 38803, 38809, 38817, 38826, 38833, 38841, - 38848, 23728, 38852, 38859, 38865, 38875, 38884, 38892, 38903, 38907, - 38917, 38923, 38930, 38938, 38947, 38956, 38966, 38977, 38984, 38989, - 38996, 3088, 39004, 39010, 39015, 39021, 39027, 39032, 39045, 39058, - 39071, 39078, 39084, 39092, 39100, 39105, 39109, 1455, 39113, 39117, - 39121, 39125, 39129, 39133, 39137, 39141, 39145, 39149, 39153, 39157, - 39161, 39165, 39169, 39173, 39177, 39181, 39185, 39189, 39193, 39197, - 39201, 39205, 39209, 39213, 39217, 39221, 39225, 39229, 39233, 39237, - 39241, 39245, 39249, 39253, 39257, 39261, 39265, 39269, 39273, 39277, - 39281, 39285, 39289, 39293, 39297, 39301, 39305, 39309, 39313, 39317, - 39321, 39325, 39329, 39333, 39337, 39341, 39345, 39349, 39353, 39357, - 39361, 39365, 39369, 39373, 39377, 39381, 39385, 39389, 39393, 39397, - 39401, 39405, 39409, 39413, 39417, 39421, 39425, 39429, 39433, 39437, - 39441, 39445, 39449, 39453, 39457, 39461, 39465, 39469, 39473, 39477, - 39481, 39485, 39489, 39493, 39497, 39501, 39505, 39509, 39513, 39517, - 39521, 39525, 39529, 39533, 39537, 39541, 39545, 39549, 39553, 39557, - 39561, 39565, 39569, 39573, 39577, 39581, 39585, 39589, 39593, 39597, - 39601, 39605, 39609, 39613, 39617, 39621, 39625, 39629, 39633, 39637, - 39641, 39645, 39649, 39653, 39657, 39661, 39665, 39669, 39673, 39677, - 39681, 39685, 39689, 39693, 39697, 39701, 39705, 39709, 39713, 39717, - 39721, 39725, 39730, 39734, 39739, 39743, 39748, 39752, 39757, 39761, - 39767, 39772, 39776, 39781, 39785, 39790, 39794, 39799, 39803, 39808, - 39812, 39817, 39821, 39826, 39830, 39836, 39842, 39847, 39851, 39856, - 39860, 39866, 39871, 39875, 39880, 39884, 39889, 39893, 39899, 39904, - 39908, 39913, 39917, 39922, 39926, 39931, 39935, 39941, 39946, 39950, - 39955, 39959, 39965, 39970, 39974, 39979, 39983, 39988, 39992, 39997, - 40001, 40006, 40010, 40016, 40021, 40025, 40031, 40036, 40040, 40046, - 40051, 40055, 40060, 40064, 40069, 40073, 40079, 40085, 40091, 40097, - 40103, 40109, 40115, 40121, 40126, 40130, 40135, 40139, 40145, 40150, - 40154, 40159, 40163, 40168, 40172, 40177, 40181, 40186, 40190, 40195, - 40199, 40204, 40208, 40214, 40219, 40223, 40228, 40232, 40238, 40244, - 40249, 116, 57, 40253, 40255, 40259, 40263, 40267, 40272, 40276, 40280, - 10251, 40285, 40291, 1756, 6597, 40297, 40300, 40305, 40309, 40314, - 40318, 40322, 40327, 11121, 40331, 40335, 40339, 525, 40343, 16783, - 40348, 40352, 40357, 40362, 40367, 40371, 40378, 28186, 40384, 40387, - 40391, 40396, 40402, 40406, 40409, 40417, 40423, 40428, 40432, 40435, - 40439, 40445, 40449, 40453, 3584, 3589, 31537, 40456, 40460, 40464, - 40468, 40472, 40480, 40487, 40491, 14480, 40498, 40503, 40517, 40524, - 40535, 335, 40540, 40544, 40550, 40562, 40568, 40574, 31574, 40578, - 40584, 40593, 40597, 40601, 40606, 40612, 40617, 40621, 40626, 40630, - 40634, 40641, 40647, 40652, 40667, 40682, 40697, 40713, 40731, 11071, - 40745, 40752, 40756, 40759, 40768, 40773, 40777, 40785, 17333, 40793, - 40797, 40807, 40818, 31507, 40831, 40835, 40844, 40862, 40881, 40889, - 10525, 11234, 40893, 24261, 40896, 32475, 40901, 10524, 40906, 40912, - 40917, 40923, 40928, 40934, 40939, 40945, 40950, 40956, 40962, 40968, - 40973, 40929, 40935, 40940, 40946, 40951, 40957, 40963, 8504, 4089, - 40977, 40985, 40989, 40992, 40996, 41001, 41006, 41013, 41019, 41025, - 41030, 16174, 41034, 28022, 41038, 41042, 41046, 41052, 41056, 30075, - 41065, 9544, 41069, 9937, 41072, 41079, 41085, 41089, 13004, 41096, - 41102, 41107, 41114, 41121, 41128, 30781, 8410, 41135, 41142, 41149, - 41155, 41160, 41167, 41178, 41184, 41189, 41194, 41199, 41203, 41208, - 41215, 40930, 41219, 41229, 41238, 41249, 41255, 41263, 41270, 41275, - 41280, 41285, 41290, 41295, 41299, 41303, 41310, 41316, 41324, 2353, - 1050, 11137, 11149, 11154, 11160, 41333, 11165, 11170, 11176, 41338, - 41348, 41352, 11181, 41357, 18453, 41360, 41365, 41369, 37463, 41380, - 41385, 41392, 41399, 41403, 41406, 41414, 11084, 41421, 41424, 41430, - 41440, 6231, 41449, 41455, 41459, 41467, 41471, 41481, 41487, 41492, - 41503, 41512, 41521, 41530, 41539, 41548, 41557, 41566, 41572, 41578, - 41583, 41589, 41595, 41601, 41606, 41609, 41616, 41622, 41626, 41631, - 41638, 41645, 41649, 41652, 41662, 41675, 41684, 41693, 41704, 41717, - 41729, 41740, 41749, 41760, 41765, 41774, 41779, 11186, 41785, 41792, - 41800, 41805, 41809, 41816, 41823, 4041, 20, 41827, 41832, 18302, 41836, - 41839, 41842, 30255, 41846, 30790, 41854, 41858, 41862, 41865, 41871, - 41877, 33527, 41882, 41890, 41896, 41903, 30238, 41907, 30441, 41911, - 41920, 41924, 41932, 41938, 41944, 41949, 41953, 30809, 41959, 41962, - 41970, 41978, 4379, 41984, 41988, 41993, 42000, 42006, 42011, 42016, - 42020, 42026, 42031, 42037, 4297, 944, 42044, 42048, 42051, 16664, 42063, - 42071, 42079, 42087, 42095, 42102, 42110, 42118, 42125, 42133, 42141, - 42149, 42157, 42165, 42173, 42181, 42189, 42197, 42205, 42213, 42220, - 42228, 42236, 42244, 42252, 42260, 42268, 42276, 42284, 42292, 42300, - 42308, 42316, 42324, 42332, 42340, 42348, 42356, 42364, 42372, 42379, - 42387, 42394, 42402, 42410, 42418, 42426, 42434, 42442, 42450, 42458, - 42469, 23764, 42474, 42477, 42484, 42488, 42494, 42498, 42504, 42509, - 42515, 42520, 42525, 42529, 42533, 42538, 42543, 42553, 42559, 42572, - 42578, 42584, 42590, 42597, 42602, 42608, 42613, 18198, 1458, 831, 42618, - 42621, 42624, 42627, 33611, 33617, 42630, 33623, 33636, 33642, 33648, - 42636, 33654, 33660, 42642, 42648, 26, 42656, 42663, 42667, 42671, 42679, - 34401, 42683, 42687, 42694, 42699, 42703, 42708, 42714, 42719, 42725, - 42730, 42734, 42738, 42742, 42747, 42751, 42756, 42760, 42764, 42771, - 42776, 42780, 42784, 42789, 42793, 42798, 42802, 42806, 42811, 42817, - 16924, 16929, 42822, 42826, 42829, 42833, 42837, 22852, 42842, 42846, - 42852, 42859, 42865, 42870, 42880, 42885, 42893, 42897, 42900, 34416, - 42904, 4356, 42909, 42914, 42918, 42923, 42927, 42932, 14548, 42943, - 42947, 42950, 42954, 42959, 42963, 42968, 42973, 42977, 42981, 42985, - 42988, 42992, 8523, 14564, 42995, 42998, 43004, 43009, 43015, 43020, - 43026, 43031, 43037, 43042, 43048, 43054, 43060, 43065, 43069, 43073, - 43082, 43098, 43114, 43124, 30145, 43131, 43135, 43140, 43145, 43149, - 43153, 38951, 43159, 43164, 43168, 43175, 43180, 43185, 43189, 43193, - 43199, 29093, 43203, 23136, 43208, 43215, 43223, 43229, 43236, 43244, - 43250, 43254, 43259, 43265, 43273, 43278, 43282, 43291, 10232, 43299, - 43303, 43311, 43318, 43323, 43328, 43333, 43337, 43340, 43344, 43347, - 43351, 43358, 43363, 43367, 43373, 28492, 33674, 43377, 43386, 43394, - 43400, 43407, 43413, 43419, 43424, 43427, 43429, 43436, 43443, 43449, - 43453, 43456, 43460, 43464, 43468, 43473, 43477, 43481, 43484, 43488, - 43502, 24906, 43521, 43534, 43547, 43560, 24924, 43575, 11422, 43590, - 43596, 43600, 43604, 43608, 43612, 43619, 43624, 43628, 43635, 43641, - 43646, 43652, 43662, 43674, 43685, 43690, 43697, 43701, 43705, 43708, - 17343, 3855, 43716, 16951, 43729, 43736, 43743, 43747, 43751, 43756, - 43762, 43767, 43773, 43777, 43781, 43784, 43789, 43793, 43798, 8082, - 16962, 43803, 43807, 43813, 43822, 43827, 43836, 43843, 38799, 43849, - 43854, 43858, 43863, 43870, 43876, 43880, 43883, 43887, 43892, 15864, - 43899, 43906, 43910, 43913, 43918, 43923, 43929, 43934, 43939, 43943, - 43948, 43958, 43963, 43969, 43974, 43980, 43985, 43991, 44001, 44006, - 44011, 44015, 44020, 7558, 7570, 44025, 44028, 44035, 44041, 44050, 9477, - 36760, 44058, 44062, 44066, 34464, 44074, 44085, 44093, 38999, 44100, - 44105, 44110, 44121, 44128, 44139, 34488, 23147, 44147, 907, 44152, - 14913, 44158, 30229, 44164, 44169, 44179, 44188, 44195, 44201, 44205, - 44208, 44215, 44221, 44228, 44234, 44244, 44252, 44258, 44264, 44269, - 44273, 44280, 44285, 44291, 44298, 44304, 43469, 44309, 44313, 558, - 15029, 44319, 44324, 44327, 44333, 44341, 1380, 44346, 44350, 44355, - 44360, 44365, 44372, 44376, 44381, 44387, 44391, 33684, 44396, 44401, - 44410, 44417, 44427, 44433, 30273, 44450, 44459, 44467, 44473, 44478, - 44485, 44491, 44499, 44508, 44516, 44520, 44525, 44533, 31251, 34497, - 44539, 44558, 17257, 44572, 44588, 44602, 44608, 44613, 44618, 44623, - 44629, 34503, 44634, 44637, 44644, 44649, 44653, 404, 2995, 44660, 44665, - 44670, 29451, 44488, 44674, 44679, 44687, 44691, 44694, 44699, 44705, - 44711, 44716, 44720, 30328, 44723, 44728, 44732, 44735, 44740, 44744, - 44749, 44754, 44758, 44763, 44767, 44771, 44775, 22848, 22859, 44780, - 44785, 44791, 44796, 44802, 29050, 44807, 44811, 22945, 17549, 44814, - 44819, 44824, 44829, 44834, 44839, 44844, 44849, 474, 68, 33697, 33702, - 33707, 33713, 33718, 33723, 44854, 33727, 44858, 44862, 44866, 33732, - 33738, 44880, 33749, 33754, 44888, 44893, 33760, 44898, 44903, 44908, - 44913, 44919, 44925, 44931, 33777, 44944, 44953, 44959, 33781, 44963, - 33786, 44968, 33791, 33796, 44971, 44976, 44980, 44986, 33332, 44993, - 14794, 45000, 45005, 33801, 45009, 45014, 45019, 45024, 45028, 45033, - 45038, 45044, 45049, 45054, 45060, 45066, 45071, 45075, 45080, 45085, - 45090, 45094, 45099, 45104, 45109, 45115, 45121, 45127, 45132, 45136, - 45141, 45145, 33805, 33810, 33815, 45149, 45153, 45157, 33820, 33826, - 33832, 33844, 45169, 28059, 45173, 45178, 45182, 45187, 45194, 45199, - 45204, 45209, 45213, 45217, 45227, 45232, 45237, 45241, 45245, 45248, - 45256, 33892, 45261, 1465, 45267, 45272, 45278, 45286, 45290, 45299, - 45303, 45307, 45315, 45321, 45329, 45345, 45349, 45353, 45357, 45362, - 45368, 45383, 33929, 1764, 13198, 45387, 1359, 1374, 45399, 45407, 45414, - 45419, 45426, 45431, 9922, 1139, 2544, 11213, 45438, 9820, 45443, 45446, - 45455, 1267, 45460, 43625, 45467, 45476, 45481, 45485, 45493, 24317, - 2596, 45500, 11678, 45510, 45516, 2371, 2381, 45525, 45534, 45544, 45555, - 3376, 37099, 45560, 11277, 4019, 18236, 1272, 45564, 45572, 45579, 45584, - 45588, 45592, 25792, 43894, 11304, 45600, 45609, 45618, 45626, 45633, - 45644, 45649, 45662, 45675, 45687, 45699, 45711, 45722, 45735, 45746, - 45757, 45767, 45775, 45783, 45795, 45807, 45818, 45827, 45835, 45842, - 45854, 45861, 45867, 45876, 45883, 45896, 45901, 45911, 45916, 45922, - 45927, 41086, 45931, 45938, 45942, 45949, 45957, 45964, 2557, 45971, - 45982, 45992, 46001, 46009, 46019, 46027, 46037, 46046, 46051, 46057, - 46063, 3899, 46074, 46084, 46093, 46102, 46110, 46120, 46128, 46137, - 46142, 46147, 46152, 1694, 47, 46160, 46168, 46179, 46190, 17875, 46200, - 46204, 46211, 46217, 46222, 46226, 46237, 46247, 46256, 46267, 18275, - 18280, 46272, 46281, 46286, 46296, 46301, 46309, 46317, 46324, 46330, - 1656, 277, 46334, 46340, 46345, 46348, 2143, 43748, 46356, 46360, 46363, - 1510, 46369, 15214, 1277, 46374, 46387, 46401, 2682, 46419, 46431, 46443, - 2696, 2713, 46457, 46470, 2728, 46484, 46496, 2743, 46510, 1283, 1289, - 1295, 11584, 46515, 46520, 46525, 46529, 46544, 46559, 46574, 46589, - 46604, 46619, 46634, 46649, 46664, 46679, 46694, 46709, 46724, 46739, - 46754, 46769, 46784, 46799, 46814, 46829, 46844, 46859, 46874, 46889, - 46904, 46919, 46934, 46949, 46964, 46979, 46994, 47009, 47024, 47039, - 47054, 47069, 47084, 47099, 47114, 47129, 47144, 47159, 47174, 47189, - 47204, 47219, 47234, 47249, 47264, 47279, 47294, 47309, 47324, 47339, - 47354, 47369, 47384, 47399, 47414, 47429, 47444, 47459, 47474, 47489, - 47504, 47519, 47534, 47549, 47564, 47579, 47594, 47609, 47624, 47639, - 47654, 47669, 47684, 47699, 47714, 47729, 47744, 47759, 47774, 47789, - 47804, 47819, 47834, 47849, 47864, 47879, 47894, 47909, 47924, 47939, - 47954, 47969, 47984, 47999, 48014, 48029, 48044, 48059, 48074, 48089, - 48104, 48119, 48134, 48149, 48164, 48179, 48194, 48209, 48224, 48239, - 48254, 48269, 48284, 48299, 48314, 48329, 48344, 48359, 48374, 48389, - 48404, 48419, 48434, 48449, 48464, 48479, 48494, 48509, 48524, 48539, - 48554, 48569, 48584, 48599, 48614, 48629, 48644, 48659, 48674, 48689, - 48704, 48719, 48734, 48749, 48764, 48779, 48794, 48809, 48824, 48839, - 48854, 48869, 48884, 48899, 48914, 48929, 48944, 48959, 48974, 48989, - 49004, 49019, 49034, 49049, 49064, 49079, 49094, 49109, 49124, 49139, - 49154, 49169, 49184, 49199, 49214, 49229, 49244, 49259, 49274, 49289, - 49304, 49319, 49334, 49349, 49364, 49379, 49394, 49409, 49424, 49439, - 49454, 49469, 49484, 49499, 49514, 49529, 49544, 49559, 49574, 49589, - 49604, 49619, 49634, 49649, 49664, 49679, 49694, 49709, 49724, 49739, - 49754, 49769, 49784, 49799, 49814, 49829, 49844, 49859, 49874, 49889, - 49904, 49919, 49934, 49949, 49964, 49979, 49994, 50009, 50024, 50039, - 50054, 50069, 50084, 50099, 50114, 50129, 50144, 50159, 50174, 50189, - 50204, 50219, 50234, 50249, 50264, 50279, 50294, 50309, 50324, 50339, - 50354, 50369, 50384, 50399, 50414, 50429, 50444, 50459, 50474, 50489, - 50504, 50519, 50534, 50549, 50564, 50579, 50594, 50609, 50624, 50639, - 50654, 50669, 50684, 50699, 50714, 50729, 50744, 50759, 50774, 50789, - 50804, 50819, 50834, 50849, 50864, 50879, 50894, 50909, 50924, 50939, - 50954, 50969, 50984, 50999, 51014, 51029, 51044, 51059, 51074, 51089, - 51104, 51119, 51134, 51149, 51164, 51179, 51194, 51209, 51224, 51239, - 51254, 51269, 51284, 51299, 51314, 51329, 51344, 51359, 51374, 51389, - 51404, 51419, 51434, 51449, 51464, 51479, 51494, 51509, 51524, 51539, - 51554, 51569, 51584, 51599, 51614, 51629, 51644, 51659, 51674, 51689, - 51704, 51719, 51734, 51749, 51764, 51779, 51794, 51809, 51824, 51839, - 51854, 51869, 51884, 51899, 51914, 51929, 51944, 51959, 51974, 51989, - 52004, 52019, 52034, 52049, 52064, 52079, 52094, 52109, 52124, 52139, - 52154, 52169, 52184, 52199, 52214, 52229, 52244, 52259, 52274, 52289, - 52304, 52319, 52334, 52349, 52364, 52379, 52394, 52409, 52424, 52439, - 52454, 52469, 52484, 52499, 52514, 52529, 52544, 52559, 52574, 52589, - 52604, 52619, 52634, 52649, 52664, 52679, 52694, 52709, 52724, 52739, - 52754, 52769, 52784, 52799, 52814, 52829, 52844, 52859, 52874, 52889, - 52904, 52919, 52934, 52949, 52964, 52979, 52994, 53009, 53024, 53039, - 53054, 53069, 53084, 53099, 53114, 53129, 53144, 53159, 53174, 53189, - 53204, 53219, 53234, 53249, 53264, 53279, 53294, 53309, 53324, 53339, - 53354, 53369, 53384, 53399, 53414, 53429, 53444, 53459, 53474, 53489, - 53504, 53519, 53534, 53549, 53564, 53579, 53594, 53609, 53624, 53639, - 53654, 53669, 53684, 53699, 53714, 53729, 53744, 53759, 53774, 53789, - 53804, 53819, 53834, 53849, 53864, 53879, 53894, 53909, 53924, 53939, - 53954, 53969, 53984, 53999, 54014, 54029, 54044, 54059, 54074, 54089, - 54104, 54119, 54134, 54149, 54164, 54179, 54194, 54209, 54224, 54239, - 54254, 54269, 54284, 54299, 54314, 54329, 54345, 54361, 54377, 54393, - 54409, 54425, 54441, 54457, 54473, 54489, 54505, 54521, 54537, 54553, - 54569, 54585, 54601, 54617, 54633, 54649, 54665, 54681, 54697, 54713, - 54729, 54745, 54761, 54777, 54793, 54809, 54825, 54841, 54857, 54873, - 54889, 54905, 54921, 54937, 54953, 54969, 54985, 55001, 55017, 55033, - 55049, 55065, 55081, 55097, 55113, 55129, 55145, 55161, 55177, 55193, - 55209, 55225, 55241, 55257, 55273, 55289, 55305, 55321, 55337, 55353, - 55369, 55385, 55401, 55417, 55433, 55449, 55465, 55481, 55497, 55513, - 55529, 55545, 55561, 55577, 55593, 55609, 55625, 55641, 55657, 55673, - 55689, 55705, 55721, 55737, 55753, 55769, 55785, 55801, 55817, 55833, - 55849, 55865, 55881, 55897, 55913, 55929, 55945, 55961, 55977, 55993, - 56009, 56025, 56041, 56057, 56073, 56089, 56105, 56121, 56137, 56153, - 56169, 56185, 56201, 56217, 56233, 56249, 56265, 56281, 56297, 56313, - 56329, 56345, 56361, 56377, 56393, 56409, 56425, 56441, 56457, 56473, - 56489, 56505, 56521, 56537, 56553, 56569, 56585, 56601, 56617, 56633, - 56649, 56665, 56681, 56697, 56713, 56729, 56745, 56761, 56777, 56793, - 56809, 56825, 56841, 56857, 56873, 56889, 56905, 56921, 56937, 56953, - 56969, 56985, 57001, 57017, 57033, 57049, 57065, 57081, 57097, 57113, - 57129, 57145, 57161, 57177, 57193, 57209, 57225, 57241, 57257, 57273, - 57289, 57305, 57321, 57337, 57353, 57369, 57385, 57401, 57417, 57433, - 57449, 57465, 57481, 57497, 57513, 57529, 57545, 57561, 57577, 57593, - 57609, 57625, 57641, 57657, 57673, 57689, 57705, 57721, 57737, 57753, - 57769, 57785, 57801, 57817, 57833, 57849, 57865, 57881, 57897, 57913, - 57929, 57945, 57961, 57977, 57993, 58009, 58025, 58041, 58057, 58073, - 58089, 58105, 58121, 58137, 58153, 58169, 58185, 58201, 58217, 58233, - 58249, 58265, 58281, 58297, 58313, 58329, 58345, 58361, 58377, 58393, - 58409, 58425, 58441, 58457, 58473, 58489, 58505, 58521, 58537, 58553, - 58569, 58585, 58601, 58617, 58633, 58649, 58665, 58681, 58697, 58713, - 58729, 58745, 58761, 58777, 58793, 58809, 58825, 58841, 58857, 58873, - 58889, 58905, 58921, 58937, 58953, 58969, 58985, 59001, 59017, 59033, - 59049, 59065, 59081, 59097, 59113, 59129, 59145, 59161, 59177, 59193, - 59209, 59225, 59241, 59257, 59273, 59289, 59305, 59321, 59337, 59353, - 59369, 59385, 59401, 59417, 59433, 59449, 59465, 59481, 59497, 59513, - 59529, 59545, 59561, 59577, 59593, 59609, 59625, 59641, 59657, 59673, - 59689, 59705, 59721, 59737, 59753, 59769, 59785, 59801, 59817, 59833, - 59849, 59865, 59881, 59897, 59913, 59929, 59945, 59961, 59977, 59993, - 60009, 60025, 60041, 60057, 60073, 60089, 60105, 60121, 60137, 60153, - 60169, 60185, 60201, 60217, 60233, 60249, 60265, 60281, 60297, 60313, - 60329, 60345, 60361, 60377, 60393, 60409, 60425, 60441, 60457, 60473, - 60489, 60505, 60521, 60537, 60553, 60569, 60585, 60601, 60617, 60633, - 60649, 60665, 60681, 60697, 60713, 60729, 60745, 60761, 60777, 60793, - 60809, 60825, 60841, 60857, 60873, 60889, 60905, 60921, 60937, 60953, - 60969, 60985, 61001, 61017, 61033, 61049, 61065, 61081, 61097, 61113, - 61129, 61145, 61161, 61177, 61193, 61209, 61225, 61241, 61257, 61273, - 61289, 61305, 61321, 61337, 61353, 61369, 61385, 61401, 61417, 61433, - 61449, 61465, 61481, 61497, 61513, 61529, 61545, 61561, 61577, 61593, - 61609, 61625, 61641, 61657, 61673, 61689, 61705, 61721, 61737, 61753, - 61769, 61785, 61801, 61817, 61833, 61849, 61865, 61881, 61897, 61913, - 61929, 61945, 61961, 61977, 61993, 62009, 62025, 62041, 62057, 62073, - 62089, 62105, 62121, 62137, 62153, 62169, 62185, 62201, 62217, 62233, - 62249, 62265, 62281, 62297, 62313, 62329, 62345, 62361, 62377, 62393, - 62409, 62425, 62441, 62457, 62473, 62489, 62505, 62521, 62537, 62553, - 62569, 62585, 62601, 62617, 62633, 62649, 62665, 62681, 62697, 62713, - 62729, 62745, 62761, 62777, 62793, 62809, 62825, 62841, 62857, 62873, - 62889, 62905, 62921, 62937, 62953, 62969, 62985, 63001, 63016, 18307, - 63025, 63030, 63036, 63042, 63052, 63060, 16270, 16868, 10733, 63073, - 1518, 1522, 63081, 3973, 29566, 7512, 63087, 63092, 63097, 63102, 63107, - 63113, 63118, 63124, 63129, 63135, 63140, 63145, 63150, 63155, 63161, - 63166, 63171, 63176, 63181, 63186, 63191, 63196, 63202, 63207, 63213, - 63220, 2600, 63225, 63231, 8912, 63235, 63240, 63247, 63255, 65, 63259, - 63265, 63270, 63275, 63279, 63284, 63288, 63292, 11621, 63296, 63306, - 63319, 63330, 63343, 63350, 63356, 63364, 63369, 63375, 63381, 63387, - 63392, 63397, 63402, 63407, 63411, 63416, 63421, 63426, 63432, 63438, - 63444, 63449, 63453, 63458, 63463, 63467, 63472, 63477, 63482, 63486, - 11637, 11648, 11653, 1561, 63490, 63496, 1566, 63501, 63504, 17741, - 63509, 63515, 63520, 1597, 63526, 1603, 1609, 11683, 63531, 63540, 63548, - 63555, 63559, 63563, 63569, 63574, 33365, 63579, 63586, 63593, 63598, - 63602, 63606, 63615, 1614, 17850, 63620, 63624, 17861, 1162, 63628, - 63635, 63640, 63644, 17891, 1618, 41243, 63647, 63652, 63662, 63671, - 63676, 63680, 63686, 1623, 43855, 63691, 63700, 63706, 63711, 63716, - 11882, 11888, 63722, 63734, 63751, 63768, 63785, 63802, 63819, 63836, - 63853, 63870, 63887, 63904, 63921, 63938, 63955, 63972, 63989, 64006, - 64023, 64040, 64057, 64074, 64091, 64108, 64125, 64142, 64159, 64176, - 64193, 64210, 64227, 64244, 64261, 64278, 64295, 64312, 64329, 64346, - 64363, 64380, 64397, 64414, 64431, 64448, 64465, 64482, 64499, 64516, - 64533, 64550, 64567, 64578, 64588, 64593, 1628, 64597, 64602, 64608, - 64613, 64618, 64625, 9839, 1633, 64631, 64640, 29887, 64645, 64656, - 11899, 64666, 64671, 64677, 64682, 64689, 64695, 64700, 1638, 18174, - 64705, 64711, 11909, 1643, 11914, 64717, 64722, 64728, 64733, 64738, - 64743, 64748, 64753, 64758, 64763, 64768, 64774, 64780, 64786, 64791, - 64795, 64800, 64805, 64809, 64814, 64819, 64824, 64829, 64833, 64838, - 64844, 64849, 64854, 64858, 64863, 64868, 64874, 64879, 64884, 64890, - 64896, 64901, 64905, 64910, 64915, 64920, 64924, 64929, 64934, 64939, - 64945, 64951, 64956, 64960, 64964, 64969, 64974, 64979, 31395, 64983, - 64988, 64993, 64999, 65004, 65009, 65013, 65018, 65023, 65029, 65034, - 65039, 65045, 65051, 65056, 65060, 65065, 65070, 65074, 65079, 65084, - 65089, 65095, 65101, 65106, 65110, 65115, 65120, 65124, 65129, 65134, - 65139, 65144, 65148, 65151, 65154, 65159, 65164, 34056, 65171, 65179, - 3691, 29837, 65185, 65192, 65198, 3830, 12020, 65204, 65214, 65229, - 65237, 12025, 65248, 65253, 65264, 65276, 65288, 65300, 2734, 65312, - 65317, 65329, 65333, 65339, 65345, 65350, 1660, 17418, 65359, 65364, - 43914, 65368, 65372, 65377, 65381, 18315, 65386, 65389, 65394, 65402, - 65410, 1664, 12061, 12067, 1669, 65418, 65425, 65430, 65439, 65449, - 65456, 65461, 65466, 1674, 65473, 65478, 18435, 65482, 65487, 65494, - 65500, 65504, 65515, 65525, 65532, 18457, 9733, 9740, 4022, 4028, 65539, - 1679, 65544, 65550, 65558, 65565, 65571, 65578, 65590, 65596, 65601, - 65613, 65624, 65633, 65643, 3952, 65651, 33166, 33175, 18497, 1684, 1688, - 65664, 65675, 65680, 1698, 65688, 65693, 65698, 18556, 65710, 65713, - 65719, 65725, 65730, 65738, 1703, 65743, 65748, 65756, 65764, 65771, - 65780, 65788, 65797, 1708, 65801, 1713, 23016, 65806, 65813, 18630, - 65821, 65827, 65832, 65840, 65847, 65855, 65865, 65874, 65884, 65893, - 65904, 65914, 65924, 65933, 65943, 65957, 65970, 65979, 65987, 65997, - 66006, 66018, 66029, 66040, 66050, 17948, 66055, 12213, 66064, 66070, - 66075, 66082, 66089, 66095, 17617, 66105, 66111, 66116, 66127, 66132, - 66140, 12230, 12235, 66148, 66154, 66158, 66166, 4017, 18692, 44007, - 66171, 66177, 66182, 66190, 66197, 13179, 66202, 66208, 1724, 66213, - 66216, 1438, 66222, 66227, 66232, 66238, 66243, 66248, 66253, 66258, - 66263, 66268, 1733, 13, 66274, 66278, 66283, 66287, 66291, 66295, 34296, - 66300, 25070, 66305, 66310, 66314, 66317, 66321, 66325, 66330, 66334, - 66339, 66343, 66349, 37514, 37519, 37524, 66352, 66359, 66365, 66373, - 43678, 66383, 37530, 34560, 34311, 34317, 37546, 34323, 66388, 66393, - 34593, 66397, 66400, 66404, 66412, 66419, 66422, 66427, 66432, 66436, - 66440, 66443, 66453, 66465, 66472, 66478, 34328, 66485, 36078, 66488, - 8929, 1019, 66491, 66495, 66500, 3873, 66504, 66507, 14827, 66514, 66521, - 66534, 66542, 66551, 66560, 66565, 66575, 66588, 66600, 66607, 66612, - 66621, 66634, 39039, 66652, 66657, 66664, 66670, 66675, 819, 66680, - 66688, 66695, 66702, 29392, 783, 66708, 66714, 66724, 66732, 66738, - 66743, 34347, 6310, 34361, 66747, 66757, 66762, 66772, 66787, 66793, - 66799, 34371, 66804, 33482, 66808, 66813, 66820, 66825, 66829, 66834, - 18500, 66841, 66846, 66850, 6351, 34397, 66854, 66860, 324, 66870, 66877, - 66884, 66889, 66898, 63656, 66904, 66912, 66916, 66920, 66924, 66928, - 66933, 66937, 66943, 66951, 66956, 66961, 66966, 66970, 66975, 66979, - 66983, 66989, 66995, 67000, 67004, 67009, 34521, 67013, 34527, 34533, - 67018, 67024, 67031, 67036, 67040, 33499, 18167, 67043, 67047, 67052, - 67059, 67065, 67069, 67074, 43353, 67080, 67084, 67091, 67095, 67100, - 67106, 67112, 67118, 67130, 67139, 67149, 67155, 67162, 67167, 67172, - 67176, 67179, 67185, 67192, 67197, 67202, 67209, 67216, 67223, 67229, - 67234, 67239, 67247, 34538, 2462, 67252, 67257, 67263, 67268, 67274, - 67279, 67284, 67289, 67295, 34559, 67300, 67306, 67312, 67318, 34629, - 67323, 67328, 67333, 34640, 67338, 67343, 67348, 67354, 67360, 34645, - 67365, 67370, 67375, 34700, 34706, 67380, 67385, 34711, 34733, 30136, - 34739, 34743, 67390, 12909, 67394, 67402, 67408, 67416, 67423, 67429, - 67439, 67445, 67452, 11556, 34757, 67458, 67471, 67480, 67486, 67495, - 67501, 25380, 67508, 67515, 67525, 67528, 34701, 67533, 67540, 67545, - 67549, 67553, 67558, 67562, 4133, 67567, 67572, 67577, 37608, 37613, - 67581, 37627, 67586, 37632, 67591, 67597, 37644, 37650, 37656, 67602, - 67608, 24366, 67619, 67622, 67634, 67642, 34780, 67646, 67655, 67665, - 67674, 34790, 67679, 67686, 67695, 67701, 67709, 67716, 6402, 4673, - 67721, 34712, 67727, 67730, 67736, 67743, 67748, 67753, 25290, 67757, - 67763, 67769, 67774, 67779, 67783, 67789, 67795, 35984, 1048, 38689, - 40419, 40425, 34821, 34826, 67800, 67804, 67808, 67811, 67824, 67830, - 67834, 67837, 67842, 36321, 67846, 33504, 22966, 67852, 6331, 6339, 9570, - 67855, 67860, 67865, 67870, 67875, 67880, 67885, 67890, 67895, 67900, - 67906, 67911, 67916, 67922, 67927, 67932, 67937, 67942, 67947, 67952, - 67958, 67963, 67969, 67974, 67979, 67984, 67989, 67994, 67999, 68004, - 68009, 68014, 68019, 68025, 68030, 68035, 68040, 68045, 68050, 68055, - 68061, 68066, 68071, 68076, 68081, 68086, 68091, 68096, 68101, 68106, - 68112, 68117, 68122, 68127, 68132, 68138, 68144, 68149, 68155, 68160, - 68165, 68170, 68175, 68180, 1511, 145, 68185, 68189, 68193, 68197, 27076, - 68201, 68205, 68210, 68214, 68219, 68223, 68228, 68233, 68238, 68242, - 68246, 68251, 68255, 14542, 68260, 68264, 68271, 68281, 16595, 68290, - 68299, 68303, 68308, 68313, 68317, 68321, 26870, 3078, 68325, 68331, - 18967, 68335, 68344, 68352, 68358, 68363, 68375, 68387, 68392, 68396, - 68401, 68405, 68411, 68417, 68422, 68432, 68442, 68448, 68453, 68457, - 68463, 68468, 68475, 68481, 68486, 68495, 68504, 68512, 16993, 68516, - 68525, 68533, 68545, 68556, 68567, 68576, 68580, 68589, 68597, 68607, - 68615, 68622, 68628, 68633, 68639, 68644, 68655, 54, 33309, 68661, 28331, - 28341, 68667, 68675, 68682, 68688, 68692, 68702, 68713, 68721, 68730, - 68735, 68740, 68745, 68749, 68753, 18921, 68761, 68765, 68771, 68781, - 68788, 68794, 68800, 37707, 68804, 68806, 68809, 68815, 68819, 68830, - 68840, 68846, 68853, 68860, 14479, 68868, 68874, 68883, 68892, 68898, - 10615, 68904, 68910, 68915, 68920, 68927, 68932, 68939, 68945, 68950, - 68958, 68971, 68980, 65919, 65929, 68989, 68995, 69001, 69008, 69015, - 69022, 69029, 69036, 69041, 69045, 69049, 69052, 69062, 69066, 69078, - 69087, 69091, 69102, 69107, 69111, 65938, 69117, 69124, 69133, 69141, - 69149, 69154, 69158, 69163, 69168, 69178, 69186, 69191, 69195, 69199, - 69205, 69213, 69220, 69232, 69240, 69251, 69258, 69264, 69274, 69280, - 69284, 69291, 69297, 69302, 69306, 69310, 69314, 69323, 69332, 69341, - 69347, 69353, 69359, 69364, 69371, 69377, 69385, 69392, 69398, 13622, - 69403, 69409, 69413, 15529, 69417, 69422, 69432, 69441, 69447, 69453, - 69461, 69468, 69472, 69476, 69482, 69490, 69497, 69503, 69514, 69518, - 69522, 69526, 69529, 69535, 69540, 69545, 69549, 69553, 69562, 69570, - 69577, 69583, 69590, 25963, 43422, 69595, 69603, 69607, 69611, 69614, - 69622, 69629, 69635, 69644, 69652, 69658, 69663, 69667, 69672, 69677, - 69681, 69685, 69689, 69694, 69703, 69707, 69714, 40528, 69718, 69724, - 69728, 69736, 69742, 69747, 69758, 69766, 69772, 69781, 24513, 69789, - 69796, 69803, 69810, 69817, 69824, 46704, 14317, 69831, 69838, 69843, - 37743, 6529, 69849, 69854, 69859, 69865, 69871, 69877, 69882, 69887, - 69892, 69897, 69903, 69908, 69914, 69919, 69925, 69930, 69935, 69940, - 69945, 69950, 69955, 69960, 69966, 69971, 69977, 69982, 69987, 69992, - 69997, 70002, 70007, 70013, 70018, 70023, 70028, 70033, 70038, 70043, - 70048, 70053, 70058, 70063, 70069, 70074, 70079, 70084, 70089, 70094, - 70099, 70104, 70109, 70115, 70120, 70125, 70130, 70135, 70140, 70145, - 70150, 70155, 70160, 70165, 70170, 70175, 70181, 1854, 260, 70186, 41361, - 70190, 70193, 70198, 70202, 70205, 3415, 70210, 70215, 70219, 70228, - 70239, 70256, 70274, 69145, 70282, 70285, 70295, 70302, 70311, 70327, - 70336, 70346, 70351, 70361, 70370, 70378, 70392, 70400, 70404, 70407, - 70414, 70420, 70431, 70438, 70450, 70461, 70472, 70481, 70488, 1278, 710, - 70498, 2629, 70502, 70507, 70516, 9221, 18894, 22471, 70524, 70532, - 70546, 70559, 70563, 70568, 70573, 70578, 70584, 70590, 70595, 8921, - 16623, 70600, 70604, 70612, 12062, 70617, 70623, 70632, 70640, 1736, - 12074, 908, 6465, 70644, 70648, 70657, 70667, 2419, 29127, 70676, 70682, - 18407, 29142, 70688, 4193, 12452, 70694, 70701, 65670, 70705, 70709, - 70715, 70720, 70725, 3634, 154, 15437, 70730, 70742, 70746, 70752, 70757, - 29907, 70761, 12440, 2769, 4, 70766, 70776, 70787, 70793, 70804, 70811, - 70817, 70823, 70831, 70838, 70844, 70854, 70864, 70874, 70883, 25367, - 1290, 70888, 70892, 70896, 70902, 70906, 2792, 2798, 8918, 2294, 70910, - 70914, 70923, 70931, 70942, 70950, 70958, 70964, 70969, 70980, 70991, - 70999, 71005, 71010, 10434, 71020, 71028, 71032, 71036, 71041, 71045, - 71057, 30314, 16548, 71064, 71074, 71080, 71086, 10536, 71096, 71107, - 71118, 71128, 71137, 71141, 71148, 1750, 996, 71158, 71163, 71171, 65483, - 71179, 71184, 71195, 71202, 71216, 15366, 478, 71226, 71230, 71234, - 71242, 71251, 71259, 71265, 71279, 71286, 71292, 71301, 71308, 71318, - 71326, 71333, 71341, 71348, 4024, 149, 71356, 71367, 71371, 71383, 71389, - 12633, 192, 71394, 9871, 71399, 71403, 71410, 71416, 71424, 71431, 9280, - 71438, 71447, 71455, 4093, 71468, 4110, 71472, 2842, 514, 71477, 71490, - 71494, 71499, 2847, 1853, 809, 71503, 4114, 71511, 71517, 71521, 866, - 71531, 71540, 71545, 3651, 71549, 16304, 16311, 50066, 71553, 4145, 4034, - 14200, 71561, 71568, 71573, 25431, 71577, 71584, 71590, 71595, 71600, - 16324, 186, 71605, 71617, 71623, 71631, 2859, 1768, 71639, 71641, 71646, - 71651, 71656, 71662, 71667, 71672, 71677, 71682, 71687, 71692, 71698, - 71703, 71708, 71713, 71718, 71723, 71728, 71733, 71738, 71744, 71749, - 71754, 71759, 71765, 71770, 71776, 71781, 71786, 71791, 71796, 71801, - 71806, 71811, 71817, 71822, 71828, 71833, 71838, 71843, 71848, 71853, - 71858, 71863, 71868, 71874, 71880, 71885, 71890, 71896, 71901, 71905, - 71909, 71914, 71920, 71924, 71930, 71935, 71940, 71946, 71951, 71955, - 71960, 71965, 71969, 71972, 71974, 71978, 71981, 71988, 71993, 71997, - 72002, 72006, 72010, 72014, 72023, 72027, 35026, 72030, 35031, 72037, - 72042, 35036, 72051, 72060, 35042, 72065, 35047, 72074, 72079, 12676, - 72083, 72088, 72093, 35052, 72097, 44921, 72101, 72104, 72108, 8589, - 72114, 72117, 72122, 72126, 3888, 35057, 72129, 72133, 72136, 72141, - 72145, 72151, 72159, 72172, 72181, 72187, 72192, 72198, 72202, 72208, - 72214, 72222, 72227, 72231, 72238, 72244, 72252, 72261, 72269, 35060, - 72276, 72286, 72299, 72304, 72309, 72313, 72322, 72328, 72335, 72346, - 72358, 72365, 72374, 72383, 72392, 72399, 72405, 72412, 72420, 72427, - 72435, 72444, 72452, 72459, 72467, 72476, 72484, 72493, 72503, 72512, - 72520, 72527, 72535, 72544, 72552, 72561, 72571, 72580, 72588, 72597, - 72607, 72616, 72626, 72637, 72647, 72656, 72664, 72671, 72679, 72688, - 72696, 72705, 72715, 72724, 72732, 72741, 72751, 72760, 72770, 72781, - 72791, 72800, 72808, 72817, 72827, 72836, 72846, 72857, 72867, 72876, - 72886, 72897, 72907, 72918, 72930, 72941, 72951, 72960, 72968, 72975, - 72983, 72992, 73000, 73009, 73019, 73028, 73036, 73045, 73055, 73064, - 73074, 73085, 73095, 73104, 73112, 73121, 73131, 73140, 73150, 73161, - 73171, 73180, 73190, 73201, 73211, 73222, 73234, 73245, 73255, 73264, - 73272, 73281, 73291, 73300, 73310, 73321, 73331, 73340, 73350, 73361, - 73371, 73382, 73394, 73405, 73415, 73424, 73434, 73445, 73455, 73466, - 73478, 73489, 73499, 73510, 73522, 73533, 73545, 73558, 73570, 73581, - 73591, 73600, 73608, 73615, 73623, 73632, 73640, 73649, 73659, 73668, - 73676, 73685, 73695, 73704, 73714, 73725, 73735, 73744, 73752, 73761, - 73771, 73780, 73790, 73801, 73811, 73820, 73830, 73841, 73851, 73862, - 73874, 73885, 73895, 73904, 73912, 73921, 73931, 73940, 73950, 73961, - 73971, 73980, 73990, 74001, 74011, 74022, 74034, 74045, 74055, 74064, - 74074, 74085, 74095, 74106, 74118, 74129, 74139, 74150, 74162, 74173, - 74185, 74198, 74210, 74221, 74231, 74240, 74248, 74257, 74267, 74276, - 74286, 74297, 74307, 74316, 74326, 74337, 74347, 74358, 74370, 74381, - 74391, 74400, 74410, 74421, 74431, 74442, 74454, 74465, 74475, 74486, - 74498, 74509, 74521, 74534, 74546, 74557, 74567, 74576, 74586, 74597, - 74607, 74618, 74630, 74641, 74651, 74662, 74674, 74685, 74697, 74710, - 74722, 74733, 74743, 74754, 74766, 74777, 74789, 74802, 74814, 74825, - 74837, 74850, 74862, 74875, 74889, 74902, 74914, 74925, 74935, 74944, - 74952, 74959, 74964, 8419, 74971, 35070, 74976, 74981, 35075, 74987, - 22579, 35080, 74992, 74998, 75006, 75012, 75018, 75025, 75032, 75037, - 75041, 75045, 75048, 75052, 75061, 75070, 75078, 75084, 75096, 75107, - 75111, 3140, 8394, 75116, 75119, 75121, 75125, 75129, 75133, 75139, - 75144, 27990, 75149, 75153, 75156, 75161, 75165, 75172, 75178, 75182, - 6485, 75186, 35097, 75191, 75198, 75207, 75215, 75226, 75234, 75243, - 75251, 75258, 75265, 75271, 75282, 35102, 75287, 75298, 75310, 75318, - 75329, 75338, 75349, 75354, 75362, 2595, 75367, 37166, 75380, 75384, - 75396, 75404, 75409, 75417, 75428, 19114, 75437, 75443, 75450, 75458, - 75464, 35112, 75469, 4139, 63056, 75476, 75479, 75487, 75500, 75513, - 75526, 75539, 75546, 75557, 75566, 75571, 46521, 46526, 75575, 75579, - 75587, 75594, 75603, 75611, 75617, 75626, 75634, 75641, 75649, 75653, - 75662, 75671, 75681, 75694, 75707, 75717, 35117, 75723, 75730, 75736, - 75742, 35123, 75747, 75750, 75754, 75762, 75771, 46259, 75779, 75788, - 75796, 75803, 75811, 75821, 75830, 75839, 36420, 75848, 75859, 75874, - 75884, 9904, 23263, 75893, 75898, 75903, 75907, 75912, 75916, 75921, - 75927, 75932, 75937, 75943, 75948, 75953, 23228, 75958, 75965, 75973, - 75981, 75989, 75994, 76001, 76008, 76013, 2272, 76017, 76021, 76029, - 76037, 35140, 76043, 76049, 76061, 76067, 76074, 76078, 76085, 76090, - 76097, 76103, 76110, 76121, 76131, 76141, 76153, 76159, 76167, 76173, - 76183, 76193, 35167, 76202, 76211, 76217, 76229, 76240, 76247, 76252, - 76256, 76264, 76270, 76275, 76280, 76287, 76295, 76307, 76317, 76326, - 76335, 76342, 37019, 25764, 76348, 76353, 76357, 76361, 76366, 76374, - 76380, 76391, 76404, 76409, 76416, 35172, 76421, 76433, 76442, 76450, - 76460, 76471, 76484, 76491, 76500, 76509, 76517, 76522, 76528, 1500, - 76533, 76538, 76543, 76548, 76554, 76559, 76564, 76570, 76576, 76581, - 76585, 76590, 76595, 76600, 63611, 76605, 76610, 76615, 76620, 76626, - 76632, 76637, 76641, 76646, 76651, 76656, 76662, 76667, 76673, 76678, - 76683, 76688, 76693, 76697, 76703, 76708, 76717, 76722, 76727, 76732, - 76737, 76741, 76748, 76754, 4430, 18737, 3105, 76759, 76763, 76768, - 76772, 76776, 76780, 50321, 76784, 76709, 76786, 76796, 35181, 76799, - 76804, 76813, 76819, 6454, 35186, 76823, 76829, 76834, 76840, 76845, - 76849, 76856, 76861, 76871, 76880, 76884, 76890, 76896, 76902, 76906, - 76914, 76921, 76929, 76937, 35191, 76944, 76947, 76954, 76960, 76965, - 76969, 76975, 76982, 76987, 76991, 77000, 77008, 77014, 77019, 35196, - 77026, 77038, 77045, 77051, 77056, 77062, 77069, 77075, 22979, 29589, - 77081, 77086, 77092, 77096, 77108, 76742, 76749, 23160, 77118, 77123, - 77130, 77136, 77143, 77149, 77160, 77165, 77173, 9609, 77178, 77181, - 77187, 77191, 77195, 77198, 77204, 34934, 4431, 1067, 14596, 77211, - 77217, 77223, 77229, 77235, 77241, 77247, 77253, 77259, 77264, 77269, - 77274, 77279, 77284, 77289, 77294, 77299, 77304, 77309, 77314, 77319, - 77324, 77330, 77335, 77340, 77346, 77351, 77356, 77362, 77368, 77374, - 77380, 77386, 77392, 77398, 77404, 77410, 77415, 77420, 77426, 77431, - 77436, 77442, 77447, 77452, 77457, 77462, 77467, 77472, 77477, 77482, - 77487, 77492, 77497, 77502, 77508, 77513, 77518, 77523, 77529, 77534, - 77539, 77544, 77549, 77555, 77560, 77565, 77570, 77575, 77580, 77585, - 77590, 77595, 77600, 77605, 77610, 77615, 77620, 77625, 77630, 77635, - 77640, 77645, 77650, 77656, 77661, 77666, 77671, 77676, 77681, 77686, - 77691, 1890, 163, 77696, 77700, 77704, 77709, 77717, 77721, 77728, 77736, - 77740, 77753, 77761, 77766, 77771, 28394, 77775, 77780, 77784, 77789, - 77793, 77801, 77805, 22587, 77810, 77814, 66162, 77818, 77821, 77829, - 77837, 77845, 77850, 77855, 77862, 77869, 77875, 77881, 77886, 77891, - 77899, 70551, 77906, 65948, 77911, 77916, 77920, 77927, 65975, 12743, - 77933, 77938, 77943, 77947, 77950, 77956, 77960, 77970, 77979, 77983, - 77986, 77990, 77997, 78010, 78016, 78024, 78033, 78044, 78055, 78066, - 78077, 78086, 78092, 78101, 78109, 78119, 78132, 78140, 78147, 78158, - 78164, 78169, 78174, 78180, 78186, 78196, 78203, 78213, 78222, 76423, - 78230, 78236, 78244, 78250, 78257, 78265, 78270, 78273, 78277, 78281, - 78284, 78290, 78296, 78304, 78316, 78328, 78335, 78340, 78344, 78355, - 78363, 78370, 78382, 78390, 78398, 78405, 78411, 78416, 78426, 78435, - 78440, 78450, 78459, 45549, 78466, 78470, 78475, 78483, 78490, 78496, - 78500, 78510, 78521, 78529, 78536, 78548, 78560, 78569, 75370, 78576, - 78586, 78598, 78609, 78623, 78631, 78641, 78648, 78656, 78669, 78681, - 78690, 78698, 78708, 78719, 78731, 78740, 78750, 78760, 78769, 78776, - 78785, 78800, 78808, 78818, 78827, 78835, 78848, 63026, 78863, 78873, - 78882, 78894, 78904, 78916, 78927, 78938, 78949, 78959, 78970, 78978, - 78984, 78994, 79002, 79008, 31291, 79013, 79019, 79028, 79040, 79045, - 79052, 10448, 19134, 79058, 79067, 79072, 79076, 79083, 79089, 79094, - 79099, 79107, 79115, 13119, 79119, 79122, 79124, 79131, 79137, 79148, - 79153, 79157, 79164, 79170, 79175, 79183, 71120, 71130, 79189, 79196, - 79206, 11543, 79213, 79218, 31506, 79227, 79232, 79239, 79249, 79257, - 79265, 79274, 79280, 79286, 79293, 79300, 79305, 79309, 79317, 65992, - 79322, 79331, 79339, 79346, 79351, 79355, 79364, 79370, 79373, 79377, - 79386, 79396, 77748, 79405, 79409, 79417, 79421, 79427, 79438, 79448, - 19143, 79459, 79468, 79476, 79484, 79491, 66011, 9147, 79499, 79503, - 79512, 79519, 79522, 29470, 79525, 79529, 79534, 79551, 79563, 11501, - 79575, 79580, 79585, 79590, 22669, 79594, 79599, 79604, 79610, 79615, - 6122, 79620, 22673, 79625, 79630, 79636, 79643, 79648, 79653, 79659, - 79665, 79671, 79676, 79682, 79686, 79700, 79708, 79716, 79722, 79727, - 79734, 79744, 79753, 79758, 79763, 79768, 79776, 79781, 79787, 79792, - 79801, 64713, 79806, 79809, 79827, 79846, 79859, 79873, 79889, 79896, - 79903, 79912, 79919, 79925, 79932, 79937, 79943, 79949, 79957, 79963, - 79968, 79973, 79989, 11514, 80003, 80010, 80018, 80024, 80028, 80031, - 80036, 80041, 80048, 80053, 80062, 80068, 80073, 80079, 80085, 80094, - 80103, 80108, 80112, 80120, 80129, 12772, 80138, 80144, 80152, 80158, - 80164, 80170, 80175, 80182, 80188, 12783, 80193, 80196, 80201, 35223, - 80211, 80220, 80225, 80231, 80236, 80244, 80251, 80262, 80272, 80277, - 80285, 70474, 80290, 80296, 80301, 80308, 80317, 80325, 80329, 80335, - 80341, 80348, 80354, 80358, 18518, 3114, 80363, 80367, 80371, 80377, - 80386, 80392, 80399, 80403, 80424, 80446, 80462, 80479, 80498, 80507, - 80517, 80525, 80532, 80539, 80545, 29342, 80559, 80563, 80569, 80577, - 80589, 80595, 80603, 80610, 80615, 80620, 80624, 80632, 80639, 80643, - 80649, 80655, 80660, 3730, 46721, 80666, 80670, 80674, 80678, 80683, - 80688, 80693, 80699, 80705, 80711, 80718, 80724, 80731, 80737, 80743, - 80748, 80754, 80759, 80763, 80768, 80772, 80777, 46736, 80781, 80786, - 80794, 80798, 80803, 80810, 80819, 80825, 80834, 80838, 80845, 80849, - 80852, 80859, 80865, 80874, 80884, 80889, 80893, 80901, 80910, 80914, - 80922, 80928, 80933, 80938, 80944, 80950, 80955, 80959, 80965, 80970, - 80974, 80978, 80981, 80986, 80994, 81004, 81010, 81015, 81025, 44031, - 81033, 81045, 81049, 81055, 81067, 81078, 81085, 81091, 81098, 81105, - 81117, 81124, 81130, 22747, 81134, 81142, 81148, 81155, 81161, 81167, - 81173, 81178, 81183, 81188, 81197, 81205, 81216, 7350, 81221, 17967, - 81227, 81231, 81235, 81239, 81247, 81256, 81260, 81267, 81276, 81284, - 81297, 81303, 80773, 32390, 81308, 81310, 81315, 81320, 81325, 81330, - 81335, 81340, 81345, 81350, 81355, 81360, 81365, 81370, 81375, 81380, - 81386, 81391, 81396, 81401, 81406, 81411, 81416, 81421, 81426, 81432, - 81438, 81444, 81449, 81454, 81466, 81471, 1896, 63, 81476, 81481, 35229, - 81485, 35234, 35239, 35245, 35250, 81489, 35255, 23785, 81511, 81515, - 81519, 81524, 81528, 35259, 81532, 81540, 81547, 35264, 81553, 81556, - 81561, 81565, 81574, 10266, 81582, 35269, 23641, 81585, 81589, 81597, - 1412, 81602, 35280, 81605, 81610, 27750, 27760, 38182, 81615, 81620, - 81625, 81630, 81636, 81641, 81650, 81655, 81664, 81672, 81679, 81685, - 81690, 81695, 81700, 81710, 81719, 81727, 81732, 81740, 81744, 81752, - 81756, 81763, 81771, 35088, 41192, 81778, 81784, 81789, 81794, 13154, - 30529, 81799, 81804, 81811, 81817, 81822, 81830, 81840, 81850, 81856, - 81861, 81867, 19165, 81874, 39052, 81887, 81892, 81898, 33381, 81911, - 81917, 81921, 81930, 81939, 81946, 81952, 81960, 81969, 81976, 81982, - 81985, 81989, 81993, 27891, 81997, 82004, 82010, 82018, 82023, 82027, - 25911, 82033, 82036, 82044, 82051, 82059, 82072, 82086, 82093, 82099, - 82106, 82112, 35294, 82116, 82123, 82131, 82139, 82145, 35299, 82153, - 82159, 82164, 82174, 82180, 82189, 33183, 37614, 82197, 82202, 82207, - 82211, 82216, 82220, 82228, 82233, 16296, 44044, 82237, 82242, 35304, - 67547, 82246, 82251, 82255, 82262, 82271, 82275, 82283, 82289, 82294, - 82300, 82305, 82312, 82318, 82323, 82328, 82339, 82348, 82360, 82375, - 35571, 82381, 18086, 35308, 82385, 82392, 82398, 26027, 82402, 82409, - 82418, 82425, 82434, 82440, 82445, 82453, 82459, 35318, 82464, 82473, - 81073, 82482, 82489, 82495, 82501, 82510, 82520, 82528, 82535, 82539, - 35323, 82542, 35329, 35335, 82547, 82555, 82563, 82573, 82582, 82590, - 82597, 82607, 35340, 82611, 82613, 82617, 82622, 82626, 82630, 82636, - 82641, 82645, 82656, 82661, 82666, 3119, 82670, 82677, 82681, 82690, - 82698, 82705, 82710, 82715, 67598, 82719, 82722, 82728, 82736, 82742, - 82746, 82751, 82758, 82763, 82768, 82772, 82778, 82783, 37645, 82787, - 82790, 82795, 82799, 82804, 82811, 82816, 82820, 42580, 82828, 27769, - 27778, 82834, 82840, 82846, 82851, 82855, 82858, 82868, 82877, 82882, - 82888, 82895, 82901, 82905, 82913, 82918, 37651, 77952, 82922, 82930, - 82936, 82943, 82948, 82952, 82957, 63242, 82963, 82969, 37657, 82974, - 82979, 82983, 82988, 82993, 82998, 83002, 83007, 83012, 83018, 83023, - 83028, 83034, 83040, 83045, 83049, 83054, 83059, 83064, 83068, 26026, - 83073, 83078, 83084, 83090, 83096, 83101, 83105, 83110, 83115, 83120, - 83124, 83129, 83134, 83139, 83144, 46991, 83148, 35348, 83156, 83160, - 83168, 83176, 83187, 83192, 83196, 24211, 75473, 83201, 83207, 83212, - 83222, 83229, 83234, 83242, 83251, 83256, 83260, 83265, 83273, 83281, - 83288, 70736, 83294, 83302, 83309, 83320, 83326, 83332, 35358, 83335, - 83342, 83350, 83355, 44247, 83359, 83364, 83371, 83376, 9484, 83380, - 83388, 83395, 83402, 83411, 83418, 83424, 83438, 6194, 83446, 83452, - 83456, 83459, 83467, 83474, 83479, 83492, 83499, 83505, 83509, 83514, - 83521, 83526, 65851, 83531, 83534, 83543, 83550, 83556, 83560, 83563, - 83571, 83580, 83590, 83600, 83609, 83620, 83628, 83639, 83644, 83648, - 83653, 83657, 38313, 83665, 23042, 38322, 83670, 83675, 83680, 83685, - 83690, 83695, 83700, 83704, 83709, 83714, 83719, 83724, 83729, 83734, - 83738, 83743, 83748, 83752, 83756, 83760, 83764, 83769, 83774, 83778, - 83783, 83787, 83791, 83796, 83801, 83806, 83811, 83815, 83820, 83825, - 83829, 83834, 83839, 83844, 83849, 83854, 83859, 83864, 83869, 83874, - 83879, 83884, 83889, 83894, 83899, 83904, 83909, 83914, 83919, 83924, - 83929, 83933, 83938, 83943, 83948, 83953, 83958, 83963, 83968, 83973, - 83978, 83983, 83988, 83992, 83997, 84001, 84006, 84011, 84016, 84021, - 84026, 84031, 84036, 84041, 84046, 84050, 84054, 84059, 84064, 84068, - 84073, 84078, 84082, 84087, 84092, 84097, 84102, 84106, 84111, 84116, - 84120, 84125, 84129, 84133, 84137, 84141, 84146, 84150, 84154, 84158, - 84162, 84166, 84170, 84174, 84178, 84182, 84187, 84192, 84197, 84202, - 84207, 84212, 84217, 84222, 84227, 84232, 84236, 84240, 84244, 84248, - 84252, 84256, 84261, 84265, 84270, 84274, 84279, 84284, 84288, 84292, - 84297, 84301, 84305, 84309, 84313, 84317, 84321, 84325, 84329, 84333, - 84337, 84341, 84345, 84349, 84353, 84358, 84363, 84367, 84371, 84375, - 84379, 84383, 84387, 84392, 84396, 84400, 84404, 84408, 84412, 84416, - 84421, 84425, 84430, 84434, 84438, 84442, 84446, 84450, 84454, 84458, - 84462, 84466, 84470, 84474, 84479, 84483, 84487, 84491, 84495, 84499, - 84503, 84507, 84511, 84515, 84519, 84523, 84528, 84532, 84536, 84541, - 84546, 84550, 84554, 84558, 84562, 84566, 84570, 84574, 84578, 84583, - 84587, 84592, 84596, 84601, 84605, 84610, 84614, 84620, 84625, 84629, - 84634, 84638, 84643, 84647, 84652, 84656, 84661, 1519, 84665, 2873, 1774, - 1692, 27705, 84669, 2882, 84673, 1381, 84678, 1323, 84682, 84686, 2899, - 84690, 84697, 84704, 84718, 2903, 7452, 84727, 84735, 84742, 84753, - 84762, 84769, 84781, 84794, 84807, 84818, 84823, 84830, 84842, 84846, - 2907, 12850, 84856, 84861, 84870, 84880, 84885, 2911, 84893, 84897, - 84902, 84909, 84915, 84923, 84935, 1328, 14201, 84945, 84949, 84955, - 84969, 84981, 84993, 85003, 85012, 85021, 85030, 85038, 85049, 85057, - 4292, 85067, 85078, 85087, 85093, 85108, 85115, 85121, 85126, 38447, - 85131, 2935, 14205, 85135, 85142, 9409, 85151, 2940, 34796, 85157, 65573, - 85164, 85170, 85181, 85187, 85194, 85200, 85208, 85215, 85221, 85232, - 85242, 85251, 85262, 85271, 85278, 85284, 85294, 85302, 85308, 85323, - 85329, 85334, 85341, 85344, 85350, 85357, 85363, 85371, 85380, 85388, - 85394, 85403, 46261, 85417, 85422, 85428, 16072, 85433, 85446, 85458, - 85467, 85475, 85482, 85486, 85490, 85493, 85500, 85507, 85515, 85523, - 85532, 85540, 15983, 85548, 85553, 85557, 85569, 85576, 85585, 841, - 85595, 85604, 85615, 2956, 85619, 85623, 85629, 85642, 85654, 85664, - 85673, 85685, 28446, 85696, 85704, 85713, 85724, 85735, 85745, 85755, - 85764, 85772, 12364, 85779, 85783, 85786, 85791, 85796, 85800, 85806, - 1333, 85813, 85817, 12932, 85821, 85832, 85841, 85849, 85858, 85866, - 85882, 85893, 85902, 85910, 85922, 85933, 85949, 85959, 85980, 85994, - 86007, 86015, 86022, 7498, 86035, 86040, 86046, 6203, 86052, 86055, - 86062, 86072, 8554, 86079, 86084, 86089, 86094, 86102, 86111, 86119, - 86124, 86131, 10496, 10505, 86137, 86148, 86153, 86159, 2972, 2977, - 86165, 11857, 86171, 86178, 86185, 86198, 2281, 87, 86203, 86208, 86216, - 86226, 86235, 86241, 86250, 86258, 86268, 86272, 86276, 86281, 86285, - 86297, 3000, 86305, 86313, 86318, 86329, 86340, 86352, 86363, 86373, - 86382, 23083, 86387, 86393, 86398, 86408, 86418, 86423, 86429, 86433, - 86438, 86447, 23095, 86451, 4384, 24, 86456, 86465, 86472, 86479, 86485, - 86491, 1049, 86496, 86501, 66128, 86506, 86511, 86517, 86523, 86531, - 86536, 86544, 86551, 86557, 86562, 42464, 46155, 86568, 3004, 32, 86578, - 86591, 86596, 86604, 86609, 86615, 3026, 30497, 86620, 86628, 86635, - 86640, 86649, 63492, 4018, 67218, 86657, 86661, 1719, 1833, 86666, 86671, - 86678, 1837, 280, 86685, 86691, 86696, 3048, 86700, 86705, 86712, 1841, - 86717, 86723, 86728, 86740, 6430, 86750, 86757, 1848, 86763, 86768, - 86775, 86782, 86797, 86804, 86815, 86820, 86828, 2657, 86832, 86844, - 86849, 86853, 86859, 30313, 2286, 86863, 86874, 86878, 86882, 86888, - 86892, 86901, 86905, 86916, 86920, 2332, 34613, 86924, 86934, 3139, - 86942, 9909, 86951, 86956, 86960, 86969, 86976, 86982, 3109, 16136, - 86986, 86999, 87017, 87022, 87030, 87038, 87048, 10768, 14318, 87060, - 87073, 87080, 87094, 87101, 87117, 87124, 87130, 23127, 13556, 87137, - 87144, 87154, 87163, 46990, 87175, 47125, 87183, 87186, 87192, 87198, - 87204, 87210, 87216, 87223, 87230, 87236, 87242, 87248, 87254, 87260, - 87266, 87272, 87278, 87284, 87290, 87296, 87302, 87308, 87314, 87320, - 87326, 87332, 87338, 87344, 87350, 87356, 87362, 87368, 87374, 87380, - 87386, 87392, 87398, 87404, 87410, 87416, 87422, 87428, 87434, 87440, - 87446, 87452, 87458, 87464, 87470, 87476, 87482, 87488, 87494, 87500, - 87506, 87512, 87518, 87524, 87530, 87536, 87543, 87549, 87556, 87563, - 87569, 87576, 87583, 87589, 87595, 87601, 87607, 87613, 87619, 87625, - 87631, 87637, 87643, 87649, 87655, 87661, 87667, 87673, 3123, 9882, - 87679, 87685, 87693, 87697, 84905, 3127, 87701, 22860, 13189, 3968, - 87705, 3133, 87709, 87719, 87725, 87731, 87737, 87743, 87749, 87755, - 87761, 87767, 87773, 87779, 87785, 87791, 87797, 87803, 87809, 87815, - 87821, 87827, 87833, 87839, 87845, 87851, 87857, 87863, 87869, 87876, - 87883, 87889, 87895, 87901, 87907, 87913, 87919, 1338, 87925, 87930, - 87935, 87940, 87945, 87950, 87955, 87960, 87965, 87969, 87973, 87977, - 87981, 87985, 87989, 87993, 87997, 88001, 88007, 88013, 88019, 88025, - 88029, 88033, 88037, 88041, 88045, 88049, 88053, 88057, 88061, 88066, - 88071, 88076, 88081, 88086, 88091, 88096, 88101, 88106, 88111, 88116, - 88121, 88126, 88131, 88136, 88141, 88146, 88151, 88156, 88161, 88166, - 88171, 88176, 88181, 88186, 88191, 88196, 88201, 88206, 88211, 88216, - 88221, 88226, 88231, 88236, 88241, 88246, 88251, 88256, 88261, 88266, - 88271, 88276, 88281, 88286, 88291, 88296, 88301, 88306, 88311, 88316, - 88321, 88326, 88331, 88336, 88341, 88346, 88351, 88356, 88361, 88366, - 88371, 88376, 88381, 88386, 88391, 88396, 88401, 88406, 88411, 88416, - 88421, 88426, 88431, 88436, 88441, 88446, 88451, 88456, 88461, 88466, - 88471, 88476, 88481, 88486, 88491, 88496, 88501, 88506, 88511, 88516, - 88521, 88526, 88531, 88536, 88541, 88546, 88551, 88556, 88561, 88566, - 88571, 88576, 88581, 88586, 88591, 88596, 88601, 88606, 88611, 88616, - 88621, 88626, 88631, 88636, 88641, 88646, 88651, 88656, 88661, 88666, - 88671, 88676, 88681, 88686, 88691, 88696, 88701, 88706, 88711, 88716, - 88721, 88726, 88731, 88736, 88741, 88746, 88751, 88756, 88761, 88766, - 88771, 88776, 88781, 88786, 88791, 88796, 88801, 88806, 88811, 88816, - 88821, 88826, 88831, 88836, 88841, 88846, 88851, 88856, 88861, 88866, - 88871, 88876, 88881, 88886, 88891, 88896, 88901, 88906, 88911, 88916, - 88921, 88926, 88931, 88936, 88941, 88946, 88951, 88957, 88962, 88967, - 88972, 88977, 88982, 88987, 88992, 88998, 89003, 89008, 89013, 89018, - 89023, 89028, 89033, 89038, 89043, 89048, 89053, 89058, 89063, 89068, - 89073, 89078, 89083, 89088, 89093, 89098, 89103, 89108, 89113, 89118, - 89123, 89128, 89133, 89138, 89143, 89148, 89153, 89158, 89167, 89172, - 89181, 89186, 89195, 89200, 89209, 89214, 89223, 89228, 89237, 89242, - 89251, 89256, 89265, 89270, 89275, 89284, 89288, 89297, 89302, 89311, - 89316, 89325, 89330, 89339, 89344, 89353, 89358, 89367, 89372, 89381, - 89386, 89395, 89400, 89409, 89414, 89423, 89428, 89433, 89438, 89443, - 89448, 89453, 89458, 89462, 89467, 89472, 89477, 89482, 89487, 89492, - 89498, 89503, 89508, 89513, 89519, 89523, 89528, 89534, 89539, 89544, - 89549, 89554, 89559, 89564, 89569, 89574, 89579, 89584, 89590, 89595, - 89600, 89605, 89611, 89616, 89621, 89626, 89631, 89637, 89642, 89647, - 89652, 89657, 89662, 89668, 89673, 89678, 89683, 89688, 89693, 89698, - 89703, 89708, 89713, 89718, 89723, 89728, 89733, 89738, 89743, 89748, - 89753, 89758, 89763, 89768, 89773, 89778, 89783, 89789, 89795, 89801, - 89806, 89811, 89816, 89821, 89827, 89833, 89839, 89844, 89849, 89854, - 89860, 89865, 89870, 89875, 89880, 89885, 89890, 89895, 89900, 89905, - 89910, 89915, 89920, 89925, 89930, 89935, 89940, 89946, 89952, 89958, - 89963, 89968, 89973, 89978, 89984, 89990, 89996, 90001, 90006, 90011, - 90016, 90021, 90026, 90031, 90036, 90041, 17539, 90046, 90052, 90057, - 90062, 90067, 90072, 90077, 90083, 90088, 90093, 90098, 90103, 90108, - 90114, 90119, 90124, 90129, 90134, 90139, 90144, 90149, 90154, 90159, - 90164, 90169, 90174, 90179, 90184, 90189, 90194, 90199, 90204, 90209, - 90214, 90219, 90224, 90230, 90235, 90240, 90245, 90250, 90255, 90260, - 90265, 90270, 90275, 90280, 90285, 90290, 90295, 90300, 90305, 90310, - 90315, 90320, 90325, 90330, 90335, 90340, 90345, 90350, 90355, 90360, - 90365, 90370, 90375, 90380, 90385, 90390, 90395, 90400, 90405, 90410, - 90415, 90420, 90425, 90430, 90436, 90441, 90446, 90451, 90456, 90461, - 90466, 90471, 90476, 90481, 90486, 90491, 90497, 90502, 90508, 90513, - 90518, 90523, 90528, 90533, 90538, 90544, 90549, 90554, 90560, 90565, - 90570, 90575, 90580, 90585, 90591, 90597, 90602, 90607, 13211, 90612, - 90617, 90622, 90627, 90632, 90637, 90642, 90647, 90652, 90657, 90662, - 90667, 90672, 90677, 90682, 90687, 90692, 90697, 90702, 90707, 90712, - 90717, 90722, 90727, 90732, 90737, 90742, 90747, 90752, 90757, 90762, - 90767, 90772, 90777, 90782, 90787, 90792, 90797, 90802, 90807, 90812, - 90817, 90822, 90827, 90832, 90837, 90842, 90847, 90852, 90857, 90862, - 90867, 90872, 90877, 90882, 90887, 90892, 90897, 90902, 90907, 90912, - 90917, 90922, 90927, 90932, 90938, 90943, 90948, 90953, 90958, 90964, - 90969, 90974, 90979, 90984, 90989, 90994, 91000, 91005, 91010, 91015, - 91020, 91025, 91031, 91036, 91041, 91046, 91051, 91056, 91062, 91067, - 91072, 91077, 91082, 91087, 91093, 91099, 91104, 91109, 91114, 91120, - 91126, 91132, 91137, 91142, 91148, 91154, 91159, 91165, 91171, 91177, - 91182, 91187, 91193, 91198, 91204, 91209, 91215, 91224, 91229, 91234, - 91240, 91245, 91251, 91256, 91261, 91266, 91271, 91276, 91281, 91286, - 91291, 91296, 91301, 91306, 91311, 91316, 91321, 91326, 91331, 91336, - 91341, 91346, 91351, 91356, 91361, 91366, 91371, 91376, 91381, 91386, - 91391, 91396, 91401, 91406, 91412, 91418, 91424, 91429, 91434, 91439, - 91444, 91449, 91454, 91459, 91464, 91469, 91474, 91479, 91484, 91489, - 91494, 91499, 91504, 91509, 91514, 91519, 91524, 91530, 91536, 91541, - 91547, 91552, 91557, 91563, 91568, 91574, 91579, 91585, 91590, 91596, - 91601, 91607, 91612, 91617, 91622, 91627, 91632, 91637, 91642, 87720, - 87726, 87732, 87738, 91648, 87744, 87750, 91654, 87756, 87762, 87768, - 87774, 87780, 87786, 87792, 87798, 87804, 91660, 87810, 87816, 87822, - 91666, 87828, 87834, 87840, 87846, 91672, 87852, 87858, 87864, 87884, - 91678, 91684, 87890, 91690, 87896, 87902, 87908, 87914, 87920, 3150, - 3155, 91696, 91701, 91704, 91710, 91716, 91723, 91728, 91733, 2337, + 0, 0, 6, 10, 14, 19, 27, 34, 44, 49, 55, 64, 66, 69, 81, 89, 102, 108, + 113, 119, 124, 132, 141, 146, 157, 162, 167, 170, 174, 183, 189, 195, + 200, 207, 215, 223, 224, 227, 235, 244, 171, 250, 256, 263, 273, 280, + 285, 288, 293, 299, 303, 306, 311, 317, 323, 328, 333, 339, 345, 354, + 361, 368, 377, 379, 384, 389, 397, 399, 407, 408, 416, 418, 337, 425, + 428, 430, 436, 438, 445, 450, 457, 462, 467, 474, 482, 486, 492, 497, + 507, 512, 519, 522, 530, 539, 543, 553, 560, 567, 574, 583, 590, 593, + 599, 603, 607, 615, 619, 632, 636, 637, 644, 653, 662, 665, 671, 675, + 677, 687, 692, 700, 704, 707, 715, 719, 724, 729, 735, 740, 744, 747, + 755, 764, 773, 781, 789, 793, 799, 807, 814, 817, 827, 831, 842, 851, + 858, 861, 868, 870, 876, 880, 885, 889, 895, 904, 909, 913, 588, 916, + 921, 930, 938, 943, 946, 674, 951, 956, 959, 965, 969, 973, 979, 986, + 995, 998, 1005, 1014, 1027, 1031, 1039, 1042, 1048, 1054, 1063, 1070, + 1073, 1081, 1088, 1095, 1099, 1102, 1110, 1114, 1123, 1129, 1133, 1136, + 1140, 26, 1147, 1156, 1161, 1166, 1172, 1177, 1182, 1187, 1191, 1196, + 1202, 1207, 1212, 1216, 1222, 1227, 1232, 1237, 1241, 1246, 1251, 1256, + 1262, 1268, 1274, 1279, 1283, 1288, 1293, 1298, 1302, 1307, 1312, 1317, + 1322, 1157, 1162, 1167, 1173, 1178, 1326, 1188, 1332, 1337, 1342, 1349, + 1353, 1356, 1365, 1192, 1369, 1197, 1203, 1208, 1373, 1378, 1383, 1387, + 1391, 1397, 1401, 1213, 1404, 1406, 1223, 1411, 1415, 1228, 1421, 1233, + 1425, 1429, 1238, 1433, 1438, 1442, 1445, 1449, 1242, 1247, 1454, 1460, + 1252, 1472, 1478, 1484, 1490, 1257, 1269, 1275, 1494, 1498, 1502, 1505, + 1280, 1509, 1511, 1516, 1521, 1527, 1532, 1537, 1541, 1546, 1551, 1556, + 1561, 1567, 1572, 1577, 1583, 1589, 1594, 1598, 1603, 1608, 1613, 1618, + 1623, 1627, 1635, 1640, 1644, 1649, 1654, 1659, 1664, 1668, 1671, 1678, + 1683, 1688, 1693, 1698, 1704, 1709, 1713, 1284, 1716, 1721, 1726, 1289, + 1730, 1734, 1741, 1294, 1748, 1299, 1752, 1754, 1759, 1765, 1303, 1770, + 1779, 1308, 1784, 1790, 1795, 1313, 1800, 1805, 1809, 1812, 1817, 1821, + 1825, 1829, 1832, 1836, 1318, 1841, 1323, 1845, 1847, 1853, 1859, 1865, + 1871, 1877, 1883, 1889, 1895, 1900, 1906, 1912, 1918, 1924, 1930, 1936, + 1942, 1948, 1954, 1959, 1964, 1969, 1974, 1979, 1984, 1989, 1994, 1999, + 2004, 2010, 2015, 2021, 2026, 2032, 2038, 2043, 2049, 2055, 2061, 2067, + 2072, 2077, 2079, 2080, 2084, 2088, 2093, 2097, 2101, 2105, 2110, 2114, + 2117, 2122, 2126, 2131, 2135, 2139, 2144, 2148, 2151, 2155, 2161, 2175, + 2179, 2183, 2187, 2190, 2195, 2199, 2203, 2206, 2210, 2215, 2220, 2225, + 2230, 2234, 2238, 2242, 2246, 2251, 2255, 2260, 2264, 2269, 2275, 2282, + 2288, 2293, 2298, 2303, 2309, 2314, 2320, 2325, 2328, 2330, 1174, 2334, + 2341, 2349, 2359, 2368, 2382, 2386, 2390, 2395, 2408, 2416, 2420, 2425, + 2429, 2432, 2436, 2440, 2445, 2450, 2455, 2459, 2462, 2466, 2473, 2480, + 2486, 2491, 2496, 2502, 2508, 2513, 2516, 1756, 2518, 2524, 2528, 2533, + 2537, 2541, 1674, 1767, 2546, 2550, 2553, 2558, 2563, 2568, 2573, 2577, + 2584, 2589, 2592, 2596, 2603, 2609, 2613, 2617, 2621, 2626, 2633, 2638, + 2643, 2650, 2656, 2662, 2668, 2682, 2699, 2714, 2729, 2738, 2743, 2747, + 2752, 2757, 2761, 2773, 2780, 2786, 2278, 2792, 2799, 2805, 2809, 2812, + 2819, 2825, 2830, 2834, 2839, 2843, 2847, 2102, 2851, 2856, 2861, 2865, + 2870, 2878, 2882, 2887, 2891, 2895, 2899, 2904, 2909, 2914, 2918, 2923, + 2928, 2932, 2937, 2941, 2944, 2948, 2952, 2960, 2965, 2969, 2973, 2979, + 2988, 2992, 2996, 3002, 3007, 3014, 3018, 3028, 3032, 3036, 3041, 3045, + 3050, 3056, 3061, 3065, 3069, 3073, 2476, 3081, 3086, 3092, 3097, 3101, + 3106, 3111, 3115, 3121, 3126, 2106, 3132, 3138, 3143, 3148, 3153, 3158, + 3163, 3168, 3173, 3178, 3183, 3189, 3194, 1189, 101, 3200, 3204, 3208, + 3212, 3217, 3221, 3225, 3231, 3236, 3240, 3244, 3249, 3254, 3258, 3263, + 3267, 3270, 3274, 3279, 3283, 3288, 3292, 3295, 3299, 3303, 3308, 3312, + 3315, 3328, 3332, 3336, 3340, 3345, 3349, 3353, 3356, 3360, 3364, 3369, + 3373, 3378, 3383, 3388, 3392, 3397, 3400, 3403, 3408, 3414, 3418, 3422, + 3425, 3430, 3434, 3439, 3443, 3447, 3450, 3456, 3461, 3466, 3472, 3477, + 3482, 3488, 3494, 3499, 3504, 3509, 3514, 1097, 592, 3517, 3520, 3525, + 3529, 3533, 3537, 3541, 3544, 3548, 3553, 3558, 3562, 3567, 3571, 3576, + 3580, 3584, 3588, 3594, 3600, 3603, 3606, 150, 3612, 3617, 3626, 3634, + 3643, 3653, 3660, 3666, 3673, 3678, 3682, 3686, 3694, 3701, 3706, 3713, + 3718, 3722, 3732, 3736, 3740, 3745, 3750, 3760, 2118, 3765, 3769, 3772, + 3778, 3783, 3789, 3795, 3800, 3807, 3811, 3815, 616, 705, 1350, 3819, + 3826, 3833, 3839, 3844, 3851, 3858, 3863, 3869, 3875, 3880, 3884, 3890, + 3897, 3902, 3906, 3910, 2127, 3916, 3924, 3930, 3938, 759, 3944, 3952, + 3963, 3967, 3977, 2132, 3983, 3988, 4003, 4009, 4016, 4026, 4032, 4037, + 4043, 4049, 4052, 4055, 4059, 4064, 4071, 4080, 4085, 4089, 4093, 4097, + 4101, 4106, 4112, 4123, 4127, 3275, 4132, 4144, 4150, 4158, 4162, 4167, + 1543, 4174, 4177, 4180, 4184, 4187, 4193, 4197, 4211, 4215, 4218, 4222, + 4228, 4234, 4239, 4243, 4247, 4253, 4264, 4270, 4275, 4281, 4285, 4293, + 4305, 4315, 4321, 4326, 4335, 4343, 4350, 4356, 4362, 4366, 4372, 4381, + 4390, 4394, 4403, 4408, 4412, 4417, 4421, 4429, 4435, 4439, 4444, 4448, + 4454, 2140, 1366, 4460, 4465, 4471, 4476, 4481, 4486, 4491, 4496, 4501, + 4507, 4512, 4518, 4523, 4528, 4533, 4539, 4544, 4549, 4554, 4559, 4565, + 4570, 4576, 4581, 4586, 4591, 4596, 4601, 4606, 4612, 4617, 4622, 297, + 332, 4627, 4633, 4637, 4641, 4646, 4650, 4654, 4657, 4661, 4665, 4669, + 4673, 4677, 4682, 4686, 4690, 4696, 4457, 4701, 4705, 4708, 4713, 4718, + 4723, 4728, 4733, 4738, 4743, 4748, 4753, 4758, 4762, 4767, 4772, 4777, + 4782, 4787, 4792, 4797, 4802, 4807, 4812, 4816, 4821, 4826, 4831, 4836, + 4841, 4846, 4851, 4856, 4861, 4866, 4870, 4875, 4880, 4885, 4890, 4895, + 4900, 4905, 4910, 4915, 4920, 4924, 4929, 4934, 4939, 4944, 4949, 4954, + 4959, 4964, 4969, 4974, 4978, 4983, 4988, 4993, 4998, 5003, 5008, 5013, + 5018, 5023, 5028, 5032, 5037, 5042, 5047, 5052, 5057, 5062, 5067, 5072, + 5077, 5082, 5086, 5091, 5096, 5101, 5106, 5112, 5118, 5124, 5130, 5136, + 5142, 5148, 5153, 5159, 5165, 5171, 5177, 5183, 5189, 5195, 5201, 5207, + 5213, 5218, 5224, 5230, 5236, 5242, 5248, 5254, 5260, 5266, 5272, 5278, + 5283, 5289, 5295, 5301, 5307, 5313, 5319, 5325, 5331, 5337, 5343, 5348, + 5354, 5360, 5366, 5372, 5378, 5384, 5390, 5396, 5402, 5408, 5413, 5419, + 5425, 5431, 5437, 5443, 5449, 5455, 5461, 5467, 5473, 5478, 5482, 5488, + 5494, 5500, 5506, 5512, 5518, 5524, 5530, 5536, 5542, 5547, 5553, 5559, + 5565, 5571, 5577, 5583, 5589, 5595, 5601, 5607, 5612, 5618, 5624, 5630, + 5636, 5642, 5648, 5654, 5660, 5666, 5672, 5677, 5683, 5689, 5695, 5701, + 5707, 5713, 5719, 5725, 5731, 5737, 5742, 5748, 5754, 5760, 5766, 5772, + 5778, 5784, 5790, 5796, 5802, 5807, 5813, 5819, 5825, 5831, 5837, 5843, + 5849, 5855, 5861, 5867, 5872, 5878, 5884, 5890, 5896, 5902, 5908, 5914, + 5920, 5926, 5932, 5937, 5943, 5949, 5955, 5961, 5967, 5973, 5979, 5985, + 5991, 5997, 6002, 6008, 6014, 6020, 6026, 6032, 6038, 6044, 6050, 6056, + 6062, 6067, 6073, 6079, 6085, 6091, 6097, 6103, 6109, 6115, 6121, 6127, + 6132, 6136, 6139, 6146, 6150, 6163, 6167, 6171, 6175, 6178, 6182, 6187, + 6191, 6195, 6201, 6208, 6219, 6227, 6234, 6238, 6246, 6255, 6261, 6265, + 6277, 6282, 6285, 6290, 6294, 6304, 6312, 6320, 6326, 6330, 6340, 6350, + 6358, 6365, 6372, 6378, 6384, 6391, 6395, 6402, 6412, 6422, 6430, 6437, + 6442, 6446, 6450, 6458, 6462, 6467, 6474, 6482, 6487, 6491, 6496, 6500, + 6507, 6512, 6526, 6531, 6536, 6543, 3530, 6552, 6556, 6561, 6565, 6569, + 6572, 6577, 6582, 6591, 6597, 6603, 6609, 6613, 6624, 6634, 6649, 6664, + 6679, 6694, 6709, 6724, 6739, 6754, 6769, 6784, 6799, 6814, 6829, 6844, + 6859, 6874, 6889, 6904, 6919, 6934, 6949, 6964, 6979, 6994, 7009, 7024, + 7039, 7054, 7069, 7084, 7099, 7114, 7129, 7144, 7159, 7174, 7189, 7204, + 7219, 7234, 7249, 7264, 7279, 7294, 7309, 7324, 7339, 7354, 7369, 7378, + 7387, 7392, 7398, 7408, 7412, 7416, 7421, 7426, 7434, 7438, 7441, 7445, + 3023, 7448, 7453, 336, 510, 7459, 7467, 7471, 7475, 7478, 7482, 7488, + 7492, 7500, 7506, 7511, 7518, 7526, 7533, 7539, 7544, 7551, 7557, 7565, + 7569, 7574, 7586, 7597, 7604, 7608, 7612, 7616, 7619, 7625, 3300, 7629, + 7635, 7640, 7645, 7650, 7656, 7661, 7666, 7671, 7676, 7682, 7687, 7692, + 7698, 7703, 7709, 7714, 7720, 7725, 7731, 7736, 7741, 7746, 7751, 7756, + 7762, 7767, 7772, 7777, 7783, 7789, 7795, 7801, 7807, 7813, 7819, 7825, + 7831, 7837, 7843, 7849, 7854, 7859, 7864, 7869, 7874, 7879, 7884, 7889, + 7895, 7901, 7906, 7912, 7918, 7924, 7929, 7934, 7939, 7944, 7950, 7956, + 7961, 7966, 7971, 7976, 7981, 7987, 7992, 7998, 8004, 8010, 8016, 8022, + 8028, 8034, 8040, 8046, 2149, 7477, 8051, 8055, 8059, 8062, 8069, 8072, + 8076, 8084, 8089, 8094, 8085, 8099, 2176, 8103, 8109, 8115, 8120, 8125, + 8132, 8140, 8145, 8149, 8152, 8156, 8162, 8168, 8172, 2184, 541, 8175, + 8179, 8184, 8190, 8195, 8199, 8202, 8206, 8212, 8217, 8221, 8228, 8232, + 8236, 8240, 882, 984, 8243, 8251, 8258, 8264, 8271, 8279, 8286, 8297, + 8304, 8310, 8315, 8327, 1209, 1374, 1379, 8338, 1384, 8342, 8346, 8355, + 8363, 8367, 8376, 8382, 8387, 8391, 8397, 8402, 8410, 8417, 2734, 8424, + 8428, 8437, 8446, 8455, 8464, 8470, 8475, 8480, 8491, 8500, 8512, 8517, + 8525, 2235, 8529, 8531, 8536, 8540, 8549, 8557, 1388, 165, 3572, 3577, + 8563, 8567, 8576, 8582, 8587, 8590, 8599, 3581, 8605, 2726, 8609, 8617, + 8621, 8625, 8629, 2252, 8633, 8638, 8645, 8651, 8657, 8660, 8662, 8665, + 8673, 8681, 8689, 8692, 8697, 2265, 8702, 8096, 8705, 8707, 8712, 8717, + 8722, 8727, 8732, 8737, 8742, 8747, 8752, 8757, 8763, 8768, 8773, 8778, + 8784, 8789, 8794, 8799, 8804, 8809, 8814, 8820, 8825, 8830, 8835, 8840, + 8845, 8850, 8855, 8860, 8865, 8870, 8875, 8880, 8885, 8890, 8895, 8900, + 8905, 8911, 8917, 8922, 8927, 8932, 8937, 8942, 2276, 2283, 2289, 8947, + 8955, 8961, 8969, 2315, 2321, 8977, 8981, 8986, 8990, 8994, 8998, 9003, + 9007, 9012, 9016, 9019, 9022, 9028, 9035, 9041, 9048, 9054, 9061, 9067, + 9074, 9080, 9086, 9095, 9101, 9105, 9109, 9113, 9117, 9122, 9126, 9131, + 9135, 9141, 9146, 9153, 9164, 9172, 9182, 9188, 9198, 9207, 9214, 9219, + 9223, 9234, 9244, 9257, 9268, 9281, 9292, 9304, 9316, 9328, 9341, 9354, + 9361, 9367, 9378, 9388, 9402, 9409, 9415, 9424, 9432, 9436, 9441, 9445, + 9452, 9460, 9467, 9471, 9477, 9481, 9487, 9497, 9501, 9506, 9511, 9518, + 9524, 9534, 8266, 9540, 9544, 9551, 9557, 9564, 9571, 983, 9575, 9579, + 9584, 9589, 9594, 9598, 9604, 9612, 9619, 9625, 9629, 9632, 9638, 9648, + 9652, 9658, 9663, 9667, 9671, 9677, 9683, 2172, 9688, 9690, 9695, 9703, + 9712, 9716, 9722, 9727, 9732, 9737, 9742, 9748, 9753, 9758, 4249, 9763, + 9768, 9772, 9778, 9783, 9789, 9794, 9799, 9805, 9810, 9717, 9816, 9820, + 9827, 9833, 9838, 9842, 6522, 9847, 9856, 9861, 9866, 8641, 8648, 9871, + 2901, 9875, 9880, 9885, 9890, 9728, 9894, 9899, 9904, 9733, 9908, 9738, + 9913, 9920, 9927, 9933, 9940, 9946, 9952, 9957, 9964, 9969, 9974, 9979, + 9985, 9743, 9749, 9991, 9997, 10002, 10007, 10015, 9754, 10020, 1112, + 10023, 10031, 10037, 10043, 10052, 10060, 10068, 10076, 10084, 10092, + 10100, 10108, 10116, 10125, 10134, 10142, 10151, 10160, 10169, 10178, + 10187, 10196, 10205, 10214, 10223, 10232, 10240, 10245, 10251, 10259, + 10266, 10281, 10298, 10317, 10326, 10334, 10349, 10360, 10368, 10378, + 10388, 10396, 10402, 10414, 10423, 10431, 10438, 10445, 10452, 10458, + 10463, 10473, 10481, 10491, 10498, 10508, 10518, 10528, 10536, 10543, + 10552, 10562, 10576, 10591, 10600, 10608, 10613, 10617, 10626, 10632, + 10637, 10647, 10657, 10667, 10672, 10676, 10685, 10690, 10706, 10723, + 10733, 10744, 10757, 10765, 10778, 10790, 10798, 10803, 10807, 10813, + 10818, 10826, 10834, 10841, 10846, 10854, 10864, 10870, 10874, 10877, + 10881, 10887, 10894, 10898, 10906, 10915, 10923, 10930, 10935, 10940, + 10944, 10948, 10956, 10971, 10987, 10993, 11001, 11010, 11018, 11024, + 11028, 11035, 11046, 11050, 11053, 11059, 9759, 11064, 11070, 11077, + 11083, 11088, 11095, 11102, 11109, 11116, 11123, 11130, 11137, 11144, + 11149, 10294, 11154, 11160, 11167, 11174, 11179, 11186, 11195, 11199, + 11211, 8679, 11215, 11218, 11222, 11226, 11230, 11234, 11240, 11246, + 11251, 11257, 11262, 11267, 11273, 11278, 11283, 9514, 11288, 11292, + 11296, 11300, 11305, 11310, 11315, 11323, 11329, 11334, 11338, 11342, + 11349, 11354, 11362, 11369, 11374, 11378, 11381, 11387, 11394, 11398, + 11401, 11406, 11410, 4288, 11416, 11425, 46, 11433, 11439, 11444, 11449, + 11457, 11464, 11469, 9529, 11475, 11481, 11486, 11490, 11493, 11508, + 11527, 11539, 11552, 11565, 11578, 11592, 11605, 11620, 11627, 9764, + 11633, 11647, 11652, 11658, 11663, 11671, 11676, 8433, 11681, 11684, + 11692, 11699, 11704, 11708, 11714, 2906, 10376, 11718, 11722, 11728, + 11734, 11739, 11745, 11750, 9773, 11756, 11762, 11767, 11772, 11780, + 11786, 11799, 11807, 11814, 11820, 9779, 11826, 11834, 11842, 11849, + 11862, 11875, 11887, 11897, 11909, 11917, 11924, 11936, 11943, 11953, + 11962, 11971, 11979, 11986, 11991, 11997, 9784, 12002, 12008, 12013, + 12018, 9790, 12023, 12026, 12033, 12039, 12052, 9157, 12063, 12069, + 12078, 12086, 12093, 12099, 12110, 12116, 12121, 3835, 12129, 12134, + 11500, 12140, 12147, 12152, 9795, 12158, 12163, 12170, 12176, 12182, + 12187, 12195, 12203, 12210, 12214, 12226, 12240, 12250, 12255, 12259, + 12270, 12276, 12281, 12286, 9800, 12290, 9806, 12295, 12298, 12303, + 12315, 12322, 12327, 12331, 12339, 12344, 12348, 12353, 12357, 12364, + 12370, 9811, 9718, 12377, 2911, 12, 12384, 12389, 12393, 12397, 12403, + 12411, 12421, 12426, 12431, 12438, 12445, 12449, 12460, 12470, 12479, + 12488, 12500, 12505, 12509, 12517, 12531, 12535, 12538, 12546, 12553, + 12561, 12565, 12576, 12580, 12587, 12592, 12596, 12602, 12607, 12613, + 12618, 12623, 12627, 12633, 12638, 12649, 12653, 12656, 12662, 12667, + 12673, 12679, 12686, 12697, 12707, 12717, 12726, 12733, 12742, 12746, + 9821, 9828, 9834, 9839, 12752, 12758, 12764, 12769, 12775, 9843, 12781, + 12784, 12791, 12796, 12811, 12827, 12842, 12850, 12856, 12861, 976, 387, + 12866, 12874, 12881, 12887, 12892, 12897, 9848, 12899, 12903, 12908, + 12912, 12922, 12927, 12931, 12940, 12944, 12947, 12954, 9857, 12959, + 12962, 12970, 12977, 12985, 12989, 12993, 13000, 13009, 13016, 13012, + 13023, 13027, 13033, 13037, 13041, 13045, 13051, 13061, 13069, 13076, + 13080, 13088, 13092, 13099, 13103, 13108, 13112, 13119, 13125, 13133, + 13139, 13144, 13154, 13159, 13164, 13168, 13172, 13180, 4138, 13188, + 13193, 9862, 13197, 13201, 13204, 13212, 13219, 13223, 6322, 13227, + 13232, 13237, 13241, 13252, 13262, 13267, 13273, 13278, 13282, 13285, + 13293, 13298, 13303, 13310, 13315, 9867, 13320, 13324, 13331, 1718, 6480, + 13336, 13341, 13346, 13351, 13357, 13362, 13368, 13373, 13378, 13383, + 13388, 13393, 13398, 13403, 13408, 13413, 13418, 13423, 13428, 13433, + 13438, 13443, 13448, 13454, 13459, 13464, 13469, 13474, 13479, 13485, + 13490, 13495, 13501, 13506, 13512, 13517, 13523, 13528, 13533, 13538, + 13543, 13549, 13554, 13559, 13564, 936, 112, 13572, 13576, 13581, 13586, + 13590, 13594, 13598, 13603, 13607, 13612, 13616, 13619, 13623, 13627, + 13633, 13638, 13648, 13654, 13662, 13668, 13672, 13676, 13683, 13691, + 13700, 13711, 13721, 13728, 13735, 13739, 13748, 13757, 13765, 13774, + 13783, 13792, 13801, 13811, 13821, 13831, 13841, 13851, 13860, 13870, + 13880, 13890, 13900, 13910, 13920, 13930, 13939, 13949, 13959, 13969, + 13979, 13989, 13999, 14008, 14018, 14028, 14038, 14048, 14058, 14068, + 14078, 14088, 14098, 14107, 14117, 14127, 14137, 14147, 14157, 14167, + 14177, 14187, 14197, 14207, 14216, 1218, 14222, 14225, 14229, 14234, + 14241, 14247, 14252, 14256, 14261, 14270, 14278, 14283, 14287, 14291, + 14297, 14302, 14308, 9876, 14313, 14318, 14327, 9886, 14332, 14335, + 14341, 14349, 9891, 14356, 14360, 14364, 14369, 14373, 14383, 14389, + 14395, 14400, 14409, 14417, 14424, 14431, 14436, 14443, 14448, 14452, + 14455, 14466, 14476, 14485, 14493, 14504, 14516, 14526, 14531, 14535, + 14540, 14545, 14549, 14555, 14563, 14570, 14581, 14586, 14596, 14605, + 14609, 14612, 14619, 14629, 14638, 14645, 14649, 14656, 14662, 14667, + 14672, 14676, 14685, 14690, 14694, 14700, 14704, 14709, 14713, 14720, + 14727, 14731, 14740, 14748, 14756, 14763, 14771, 14783, 14794, 14804, + 14811, 14817, 14826, 14837, 14846, 14858, 14870, 14882, 14892, 14901, + 14910, 14918, 14925, 14934, 14942, 14946, 14951, 14957, 14963, 14968, + 14973, 8117, 14977, 14979, 14983, 14988, 14995, 15001, 15007, 15016, + 15020, 15026, 15034, 15041, 15050, 15059, 15068, 15077, 15086, 15095, + 15104, 15113, 15123, 15133, 15142, 15148, 15155, 15162, 15168, 15182, + 15188, 15195, 15203, 15212, 15220, 15226, 15235, 15244, 15255, 15265, + 15273, 15280, 15288, 15297, 15310, 15319, 15327, 15334, 15347, 15353, + 15359, 15369, 15378, 15387, 15392, 15396, 15402, 15408, 15413, 15420, + 15427, 9528, 15432, 15437, 15444, 15452, 15457, 15464, 15469, 15481, + 13629, 15486, 15494, 15500, 15505, 15513, 15521, 15528, 15536, 15542, + 15550, 15558, 15564, 15569, 15575, 15582, 15588, 15593, 15597, 15608, + 15616, 15622, 15627, 15634, 15643, 15649, 15654, 15662, 15671, 15685, + 4082, 15689, 15694, 15699, 15705, 15710, 15715, 15719, 15724, 15729, + 15734, 8116, 15739, 15744, 15749, 15754, 15759, 15763, 15768, 15773, + 15778, 15783, 15789, 15795, 15800, 15804, 15810, 15815, 15820, 15825, + 9895, 15830, 15835, 15840, 15845, 15850, 15867, 15885, 15897, 15910, + 15927, 15943, 15960, 15970, 15989, 16000, 16011, 16022, 16033, 16045, + 16056, 16067, 16084, 16095, 16106, 16111, 9900, 16116, 16120, 2405, + 16124, 16127, 16133, 16141, 16149, 16155, 16164, 16171, 16176, 16184, + 16192, 16199, 16203, 16208, 16214, 16221, 16229, 16236, 16248, 16255, + 16261, 16269, 16274, 16280, 12805, 16286, 16295, 16301, 16306, 16314, + 16323, 16331, 16338, 16344, 16352, 16359, 16365, 16371, 16378, 16385, + 16391, 16397, 16406, 16414, 16424, 16431, 16437, 16445, 16451, 16459, + 16467, 16474, 16487, 16494, 16503, 16512, 16521, 16529, 16539, 16546, + 16551, 3726, 16558, 16563, 1334, 16567, 15740, 16571, 16577, 16581, + 16589, 16601, 16606, 16613, 16619, 16624, 16631, 15745, 16635, 16639, + 16643, 15750, 16647, 15755, 16651, 16658, 16663, 16667, 16674, 16678, + 16686, 16693, 16698, 16702, 16709, 16726, 16735, 16739, 16742, 16750, + 16756, 16761, 3804, 16765, 16767, 16775, 16782, 16792, 16804, 16809, + 16813, 16819, 16824, 16832, 16836, 16842, 16847, 16853, 16856, 16863, + 16871, 16878, 16884, 16889, 16895, 16900, 16907, 16913, 16918, 16925, + 16930, 16934, 16940, 16944, 16951, 16957, 16962, 16968, 16976, 16984, + 16991, 16997, 17002, 17008, 17014, 17022, 17027, 17035, 17041, 17047, + 17052, 17059, 17064, 17068, 17074, 17079, 17086, 17091, 17097, 17100, + 17106, 17112, 17115, 17119, 17123, 17135, 17141, 17146, 17153, 17159, + 17165, 17176, 17186, 17195, 17203, 17210, 17221, 17231, 17241, 17249, + 17252, 15769, 17257, 17262, 15774, 15915, 17270, 17283, 17298, 17309, + 15932, 17327, 17340, 17353, 17364, 11515, 17375, 17388, 17407, 17418, + 17429, 17440, 2677, 17453, 17457, 17465, 17476, 17487, 17495, 17510, + 17525, 17536, 17543, 17549, 17557, 17561, 17567, 17570, 17583, 17595, + 17605, 17613, 17620, 17628, 17638, 17643, 17650, 17655, 17662, 17673, + 17683, 17689, 17694, 17699, 15779, 17703, 17709, 17715, 17720, 17725, + 17730, 17734, 15784, 15790, 17738, 15796, 17743, 17751, 17756, 17760, + 17767, 17775, 17784, 17791, 17795, 9739, 17799, 17801, 17806, 17811, + 17817, 17822, 17827, 17832, 17837, 17841, 17847, 17853, 17858, 17864, + 17869, 17874, 17878, 17884, 17889, 17893, 17898, 17903, 17915, 17920, + 17926, 17931, 17936, 17942, 17948, 17953, 17958, 17963, 17970, 17976, + 17987, 17994, 17999, 18003, 18007, 18010, 18018, 18023, 18029, 18036, + 18043, 18049, 18054, 18059, 18064, 18071, 18081, 18089, 18094, 18101, + 18107, 18116, 18126, 18136, 18150, 18164, 18178, 18192, 18207, 18222, + 18239, 18257, 18270, 18276, 18281, 18286, 18290, 18298, 18303, 18311, + 18317, 18323, 18328, 18333, 18337, 18342, 18346, 18351, 18355, 18366, + 18372, 18377, 18382, 18389, 18394, 18398, 3689, 18403, 18409, 18416, + 15805, 18422, 18426, 18432, 18437, 18442, 18446, 18452, 18457, 18462, + 18469, 18474, 14385, 18478, 18483, 18487, 18492, 18498, 18504, 18511, + 18521, 18529, 18536, 18541, 18545, 18554, 18562, 18569, 18576, 18582, + 18587, 18593, 18598, 18603, 18609, 18614, 18620, 18625, 18631, 18637, + 18644, 18650, 18655, 18660, 9965, 18669, 18672, 18680, 18686, 18691, + 18696, 18706, 18713, 18719, 18724, 18729, 18735, 18740, 18746, 18751, + 18757, 18763, 18769, 18774, 18782, 18789, 18794, 18799, 18805, 18810, + 18814, 18823, 18834, 18841, 18848, 18856, 18863, 18868, 18873, 18879, + 18884, 18892, 18898, 18904, 18911, 18917, 18922, 18926, 18932, 18937, + 18942, 18946, 18951, 1407, 8141, 2925, 18955, 18959, 18963, 18967, 18971, + 18975, 18978, 18983, 18990, 18998, 15816, 19005, 19015, 19023, 19030, + 19038, 19048, 19057, 9275, 19070, 19075, 19080, 19088, 19095, 14481, + 14490, 19102, 19112, 19127, 19133, 19140, 19147, 19153, 19159, 19170, + 19178, 19186, 19196, 19206, 15821, 19215, 19221, 19227, 19235, 19243, + 19248, 19257, 19265, 19277, 19287, 19297, 19307, 19316, 19328, 19338, + 19348, 19359, 19366, 19371, 19383, 19395, 19407, 19419, 19431, 19443, + 19455, 19467, 19479, 19491, 19502, 19514, 19526, 19538, 19550, 19562, + 19574, 19586, 19598, 19610, 19622, 19633, 19645, 19657, 19669, 19681, + 19693, 19705, 19717, 19729, 19741, 19753, 19764, 19776, 19788, 19800, + 19812, 19824, 19836, 19848, 19860, 19872, 19884, 19895, 19907, 19919, + 19931, 19943, 19955, 19967, 19979, 19991, 20003, 20015, 20026, 20038, + 20050, 20062, 20074, 20086, 20098, 20110, 20122, 20134, 20146, 20157, + 20169, 20181, 20193, 20205, 20217, 20229, 20241, 20253, 20265, 20277, + 20288, 20300, 20312, 20324, 20336, 20349, 20362, 20375, 20388, 20401, + 20414, 20427, 20439, 20452, 20465, 20478, 20491, 20504, 20517, 20530, + 20543, 20556, 20569, 20581, 20594, 20607, 20620, 20633, 20646, 20659, + 20672, 20685, 20698, 20711, 20723, 20736, 20749, 20762, 20775, 20788, + 20801, 20814, 20827, 20840, 20853, 20865, 20878, 20891, 20904, 20917, + 20930, 20943, 20956, 20969, 20982, 20995, 21007, 21020, 21033, 21046, + 21059, 21072, 21085, 21098, 21111, 21124, 21137, 21149, 21160, 21173, + 21186, 21199, 21212, 21225, 21238, 21251, 21264, 21277, 21290, 21302, + 21315, 21328, 21341, 21354, 21367, 21380, 21393, 21406, 21419, 21432, + 21444, 21457, 21470, 21483, 21496, 21509, 21522, 21535, 21548, 21561, + 21574, 21586, 21599, 21612, 21625, 21638, 21651, 21664, 21677, 21690, + 21703, 21716, 21728, 21741, 21754, 21767, 21780, 21793, 21806, 21819, + 21832, 21845, 21858, 21870, 21883, 21896, 21909, 21922, 21935, 21948, + 21961, 21974, 21987, 22000, 22012, 22025, 22038, 22051, 22064, 22077, + 22090, 22103, 22116, 22129, 22142, 22154, 22167, 22180, 22193, 22206, + 22219, 22232, 22245, 22258, 22271, 22284, 22296, 22309, 22322, 22335, + 22348, 22361, 22374, 22387, 22400, 22413, 22426, 22438, 22451, 22464, + 22477, 22490, 22503, 22516, 22529, 22542, 22555, 22568, 22580, 22591, + 22600, 22608, 22616, 22623, 22629, 22633, 22639, 22645, 22653, 22658, + 22664, 22669, 22673, 22682, 9744, 22693, 22700, 22708, 22715, 22722, + 12046, 22729, 22736, 22745, 22750, 22755, 8169, 22762, 22767, 22770, + 22775, 22783, 22790, 22797, 22804, 22810, 22819, 22828, 22837, 22843, + 22851, 22860, 22864, 22870, 22875, 22885, 22892, 22898, 22906, 22912, + 22919, 22929, 22938, 22942, 22949, 22953, 22958, 22964, 22972, 22976, + 22986, 15831, 22995, 23001, 23005, 23014, 23024, 15836, 23030, 23037, + 23048, 23056, 23066, 23075, 23083, 9493, 23091, 23096, 23102, 23107, + 23111, 23115, 23119, 10477, 23124, 23132, 23139, 23148, 23155, 23162, + 23168, 11966, 23175, 23181, 23185, 23191, 23198, 23204, 23212, 23218, + 23225, 23231, 23237, 23246, 23250, 23258, 23267, 23274, 23279, 23283, + 23294, 23299, 23304, 23310, 23315, 23328, 8373, 23332, 23338, 23344, + 23349, 23357, 23361, 23368, 23377, 23382, 16107, 23390, 23394, 23406, + 23411, 23415, 23418, 23424, 23430, 23436, 23441, 23445, 23448, 23459, + 23464, 10016, 23471, 23476, 1224, 10021, 23481, 23486, 23491, 23496, + 23501, 23506, 23511, 23516, 23521, 23526, 23531, 23536, 23542, 23547, + 23552, 23557, 23562, 23567, 23572, 23577, 23582, 23587, 23593, 23599, + 23604, 23609, 23614, 23619, 23624, 23629, 23634, 23639, 23644, 23650, + 23655, 23660, 23665, 23671, 23677, 23682, 23687, 23692, 23697, 23702, + 23707, 23712, 23717, 23723, 23728, 23733, 23738, 23743, 23749, 23754, + 23759, 23763, 1330, 140, 23771, 23775, 23779, 23783, 23788, 23792, 14391, + 2331, 23796, 23801, 23805, 23810, 23814, 23819, 23823, 23829, 23834, + 23838, 23842, 23850, 23854, 23858, 23863, 23868, 23872, 23878, 23883, + 23887, 23892, 23897, 23901, 23908, 23915, 23922, 23927, 23931, 23935, + 23940, 23944, 23947, 23953, 23966, 23971, 23977, 23986, 23991, 10241, + 23996, 24005, 24010, 24013, 2740, 2745, 24017, 24023, 24029, 3650, 24034, + 24039, 24044, 24050, 24055, 15251, 24060, 24065, 24070, 24075, 24081, + 24086, 24091, 24097, 24102, 24106, 24111, 24116, 24121, 24126, 24131, + 24135, 24140, 24144, 24149, 24154, 24159, 24164, 24168, 24173, 24177, + 24182, 24187, 24192, 24107, 2934, 24112, 24197, 24205, 24212, 10571, + 24224, 24232, 24242, 24260, 24279, 24288, 24296, 24117, 24303, 24308, + 24316, 24122, 24321, 24326, 24334, 24339, 24127, 24344, 24352, 24357, + 24361, 24368, 24374, 24383, 24391, 24395, 24398, 24405, 24409, 24413, + 24418, 24424, 24431, 24436, 9520, 1723, 1728, 24440, 24446, 24452, 24457, + 24461, 24465, 24469, 24473, 24477, 24481, 24485, 24489, 24492, 24498, + 24505, 24513, 24519, 24525, 24530, 24535, 24541, 24545, 24550, 15157, + 15164, 24557, 24569, 24572, 24579, 24583, 18045, 24590, 24598, 24609, + 24618, 24631, 24641, 24655, 24667, 24681, 24694, 24706, 24716, 24728, + 24734, 24740, 24755, 24779, 24797, 24816, 24829, 24843, 24861, 24877, + 24894, 24912, 24923, 24942, 24959, 24979, 24997, 25009, 25023, 25037, + 25049, 25066, 25085, 25103, 25115, 25133, 25152, 15975, 25165, 25185, + 25197, 11546, 25209, 25214, 25219, 25224, 25230, 25235, 25239, 25246, + 25252, 2422, 25256, 25262, 25266, 25269, 25280, 25284, 25287, 25295, + 25301, 24145, 25305, 25314, 25325, 25331, 25337, 25352, 25361, 25369, + 25376, 25381, 25385, 25392, 25398, 25407, 25415, 25422, 25432, 25441, + 25451, 25456, 25465, 25474, 25485, 25496, 4206, 25506, 25510, 25520, + 25528, 25538, 25549, 25554, 25564, 25572, 25579, 25585, 25592, 25597, + 24155, 25601, 25610, 25614, 25617, 25622, 25630, 25637, 25646, 25654, + 25662, 25670, 25680, 25689, 25695, 25701, 25705, 24160, 24165, 25709, + 25719, 25729, 25739, 25747, 25754, 25764, 25772, 25780, 25786, 25794, + 872, 25803, 16188, 557, 25817, 25826, 25834, 25845, 25856, 25866, 25875, + 25887, 25896, 25905, 25912, 25918, 25928, 25937, 25946, 25954, 25964, + 25972, 25980, 9982, 25986, 25989, 25993, 25998, 26003, 26007, 10686, + 24178, 24183, 26015, 26021, 26027, 26032, 26037, 26041, 26049, 26055, + 26061, 26065, 3674, 26073, 26078, 26083, 26087, 26091, 10799, 26098, + 26106, 26120, 26127, 26133, 10808, 10814, 26141, 26149, 26156, 26161, + 26166, 24188, 26172, 26183, 26187, 26192, 2629, 26197, 26208, 26214, + 26219, 26223, 26227, 26230, 26237, 26244, 26250, 26257, 26263, 26267, + 24193, 26272, 26276, 26280, 1412, 8585, 26285, 26290, 26295, 26300, + 26305, 26310, 26315, 26320, 26325, 26330, 26335, 26340, 26345, 26350, + 26356, 26361, 26366, 26371, 26376, 26381, 26386, 26392, 26397, 26402, + 26407, 26412, 26417, 26422, 26427, 26433, 26439, 26444, 26450, 26455, + 26460, 5, 26466, 26470, 26474, 26478, 26483, 26487, 26491, 26495, 26499, + 26504, 26508, 26513, 26517, 26520, 26524, 26529, 26533, 26538, 26542, + 26546, 26550, 26555, 26559, 26563, 26573, 26578, 26582, 26586, 26591, + 26596, 26605, 26610, 26615, 26619, 26623, 26636, 26648, 26657, 26666, + 26671, 26677, 26682, 26686, 26690, 26700, 26709, 26717, 26723, 26728, + 26732, 26739, 26749, 26758, 26766, 11868, 26774, 26782, 26791, 26800, + 26808, 26818, 26823, 26827, 26831, 26834, 26836, 26840, 26844, 26849, + 26854, 26858, 26862, 26865, 26869, 26872, 26876, 26879, 26882, 26886, + 26892, 26896, 26900, 26904, 26908, 26913, 26918, 26923, 26927, 26930, + 26935, 26941, 26946, 26952, 26957, 26961, 26967, 26971, 26975, 26980, + 26984, 26989, 26994, 26998, 27002, 27009, 27013, 27016, 27020, 27024, + 27030, 27036, 27040, 27044, 27049, 27056, 27062, 27066, 27075, 27079, + 27083, 27086, 27092, 27097, 27103, 1456, 1787, 27108, 27113, 27118, + 27123, 27128, 27133, 27138, 2159, 2205, 27143, 27146, 27150, 27154, + 27159, 27163, 16200, 27167, 27172, 27177, 27181, 27184, 27189, 27193, + 27198, 27202, 16204, 27207, 27210, 27213, 27217, 27222, 27226, 27239, + 27243, 27246, 27254, 27263, 27270, 27275, 27281, 27287, 27295, 27302, + 27309, 27313, 27317, 27321, 27326, 27331, 27335, 27343, 27348, 27360, + 27371, 27376, 27380, 27387, 27391, 27396, 27402, 27405, 27410, 27415, + 27419, 27423, 27426, 27432, 8272, 2335, 27436, 27441, 27457, 10288, + 27477, 27486, 27502, 27506, 27513, 27516, 27522, 27532, 27538, 27547, + 27562, 27574, 27585, 27593, 27602, 27608, 27617, 27627, 27637, 27648, + 27659, 27669, 27678, 27685, 27694, 27702, 27709, 27717, 27724, 27731, + 27744, 27751, 27759, 27766, 27772, 27777, 27786, 27793, 27799, 27804, + 27812, 27819, 27826, 25530, 27838, 27850, 27864, 27872, 27880, 27887, + 27899, 27908, 27917, 27925, 27933, 27941, 27948, 27954, 27963, 27971, + 27981, 27990, 28000, 28009, 28018, 28026, 28031, 28035, 28038, 28042, + 28046, 28050, 28054, 28058, 28064, 28070, 28075, 28083, 16262, 28090, + 28095, 28102, 28108, 28115, 16270, 28122, 28125, 28137, 28145, 28151, + 28156, 28160, 28171, 10749, 28181, 28189, 28199, 28208, 28215, 28222, + 28230, 28234, 16281, 28237, 28244, 28248, 28254, 28257, 28264, 28270, + 28275, 28282, 28288, 28292, 28297, 28301, 28310, 28317, 28323, 8330, + 28330, 28338, 28345, 28351, 28356, 28362, 28368, 28376, 28382, 28386, + 28389, 28391, 28043, 28400, 28406, 28412, 28422, 28427, 28434, 28440, + 28445, 28450, 28455, 28459, 28464, 28471, 28477, 28486, 28490, 28497, + 28503, 28512, 4398, 28518, 28524, 28529, 28536, 28547, 28552, 28556, + 28566, 28572, 28576, 28581, 28591, 28600, 28604, 28611, 28619, 28626, + 28632, 28637, 28645, 28652, 28657, 28664, 28676, 28685, 28689, 14322, + 28697, 28707, 28711, 27250, 28722, 28727, 28731, 28738, 28745, 23874, + 27968, 28750, 28754, 28757, 24929, 28762, 28776, 28792, 28810, 28829, + 28846, 28864, 24948, 28881, 28901, 24965, 28913, 28925, 17314, 28937, + 24985, 28951, 28963, 11559, 28977, 28982, 28987, 28992, 28998, 29004, + 29010, 29014, 29022, 29029, 29034, 29044, 29050, 11157, 29056, 29058, + 29063, 29071, 29075, 28467, 29081, 29088, 12711, 12721, 29095, 29105, + 29110, 29114, 29117, 29123, 29131, 29143, 29153, 29169, 29182, 29196, + 17332, 29210, 29217, 29221, 29224, 29229, 29233, 29240, 29247, 29254, + 29264, 29269, 29274, 29279, 29287, 29295, 29300, 29309, 29314, 3342, + 29318, 29321, 29324, 29329, 29336, 29341, 29357, 29365, 29373, 10056, + 29381, 29386, 29390, 29396, 29401, 29407, 29410, 29416, 29428, 29436, + 29443, 29449, 29456, 29467, 29481, 29494, 29500, 29509, 29515, 29524, + 29536, 29547, 29557, 29566, 29575, 29583, 29594, 8312, 29601, 29608, + 29614, 29619, 29625, 29632, 29643, 29653, 29663, 29672, 29678, 29685, + 29690, 29698, 29705, 29713, 29721, 29733, 6587, 1028, 29740, 29749, + 29757, 29763, 29769, 29774, 29778, 29781, 29787, 29794, 29799, 29804, + 29809, 29813, 29825, 29836, 29845, 29853, 16446, 29858, 29866, 29871, + 29877, 29883, 12704, 9103, 29888, 29892, 29896, 29899, 29902, 29908, + 29916, 29924, 29928, 29932, 29937, 29940, 29949, 29953, 29956, 29964, + 29975, 29979, 29985, 29991, 29995, 30001, 30009, 30031, 30055, 30064, + 30071, 30078, 30084, 30092, 30098, 30103, 30114, 30132, 30139, 30147, + 30151, 30156, 30165, 30178, 30186, 30198, 30209, 30220, 30230, 30244, + 30253, 30261, 30273, 10305, 30284, 30295, 30307, 30317, 30326, 30331, + 30335, 30343, 30354, 30364, 30369, 30373, 30376, 30379, 30387, 30395, + 30404, 30414, 30423, 30429, 30443, 2691, 30465, 30476, 30485, 30495, + 30507, 30516, 30525, 30535, 30543, 30551, 30560, 30565, 30576, 30581, + 30590, 30601, 30605, 30608, 30618, 30627, 30635, 30645, 30655, 30663, + 30672, 30679, 30687, 30694, 30703, 30712, 30717, 30721, 30729, 30736, + 30744, 30751, 30762, 30777, 30784, 30790, 30800, 30809, 30815, 30826, + 30830, 30837, 30841, 30847, 15382, 30853, 30857, 30862, 30868, 30875, + 30879, 30883, 30891, 30899, 30905, 30914, 30921, 30926, 30931, 30941, + 25599, 30945, 30948, 30953, 30958, 30963, 30968, 30973, 30978, 30983, + 30988, 30994, 30999, 31004, 31010, 1180, 676, 31015, 31024, 2383, 31031, + 31036, 31040, 31046, 1229, 591, 31051, 296, 31055, 31064, 31072, 31081, + 31089, 31100, 31108, 31117, 31125, 31130, 10895, 31134, 31142, 31150, + 31155, 16217, 3823, 31161, 31167, 31173, 6168, 31178, 31182, 31188, + 31192, 31198, 31203, 31210, 1422, 31216, 31223, 31227, 1329, 6176, 31232, + 31242, 31250, 31256, 31266, 31275, 31283, 31289, 31294, 31302, 31309, + 12246, 31315, 31322, 31327, 31334, 1475, 225, 2158, 31340, 31346, 31353, + 31364, 31375, 31383, 31390, 31400, 31409, 31417, 31426, 31433, 31440, + 31453, 31460, 31466, 31477, 31496, 1234, 31501, 31506, 31514, 3741, + 31518, 31523, 31527, 31531, 1426, 26863, 31541, 31545, 31550, 31554, + 3608, 31560, 31568, 31575, 31586, 31594, 31619, 31627, 31632, 3742, 352, + 31638, 31646, 31654, 31661, 31667, 31672, 2227, 11726, 31679, 31685, + 28293, 28542, 31691, 587, 106, 31695, 31699, 31705, 689, 9931, 31710, + 31717, 31723, 31727, 31731, 1620, 31734, 31738, 16699, 31741, 31746, + 31753, 31759, 31764, 31772, 31779, 31785, 24341, 31789, 31793, 31797, + 3812, 18344, 31801, 31806, 31810, 31813, 31821, 31829, 31834, 31843, + 31851, 31854, 31861, 31871, 31883, 31888, 31892, 31900, 31907, 31913, + 31920, 31927, 31930, 31934, 31938, 1430, 31948, 31950, 31955, 31961, + 31967, 31972, 31977, 31982, 31987, 31992, 31997, 32002, 32007, 32012, + 32017, 32022, 32027, 32032, 32037, 32043, 32049, 32055, 32061, 32066, + 32071, 32076, 32082, 32087, 32092, 32097, 32103, 32108, 32114, 32119, + 32124, 32129, 32134, 32140, 32145, 32151, 32156, 32161, 32166, 32171, + 32177, 32182, 32188, 32193, 32198, 32203, 32208, 32213, 32218, 32223, + 32228, 32233, 32239, 32245, 32251, 32256, 32261, 32266, 32271, 32277, + 32283, 32289, 32295, 32301, 32307, 32312, 32318, 32323, 32328, 32333, + 32338, 32344, 2467, 32349, 2474, 2481, 2782, 32354, 2487, 2497, 32360, + 32364, 32369, 32374, 32380, 32385, 32390, 32394, 32399, 32405, 32410, + 32415, 32420, 32426, 32431, 32435, 32439, 32444, 32449, 32454, 32459, + 32464, 32470, 32476, 32481, 32485, 32490, 32496, 32500, 32505, 32510, + 32515, 32520, 32524, 32527, 32532, 32537, 32542, 32547, 32552, 32558, + 32564, 32569, 32574, 32579, 32583, 32588, 32593, 32598, 32603, 32608, + 32613, 32617, 32622, 32627, 32632, 32636, 32640, 32644, 32649, 32657, + 32662, 32667, 32673, 32679, 32685, 32690, 32694, 32697, 32702, 32707, + 32711, 32716, 32721, 32725, 32730, 32734, 32737, 32742, 3919, 19083, + 32747, 32752, 32757, 32765, 23151, 31220, 9601, 32770, 32775, 32779, + 32784, 32788, 32792, 32797, 32801, 32804, 32807, 32811, 32816, 32820, + 32828, 32832, 32835, 32840, 32844, 32848, 32853, 32858, 32862, 32868, + 32873, 32878, 32885, 32892, 32896, 32899, 32905, 32914, 32921, 32929, + 32936, 32940, 32945, 32949, 32953, 32959, 32965, 32969, 32975, 32980, + 32985, 32989, 32996, 33002, 33008, 33014, 33020, 33027, 33033, 33039, + 33045, 33051, 33057, 33063, 33069, 33076, 33082, 33089, 33095, 33101, + 33107, 33113, 33119, 33125, 33131, 33137, 33143, 12589, 33149, 33155, + 33160, 33165, 33170, 33173, 33179, 33187, 33192, 33196, 33201, 33207, + 33216, 33222, 33227, 33232, 33237, 33241, 33246, 33251, 33256, 33261, + 33266, 33273, 33280, 33286, 33292, 33297, 17980, 33304, 33310, 33317, + 33323, 33329, 33334, 33342, 33347, 10470, 33351, 33356, 33361, 33367, + 33372, 33377, 33381, 33386, 33391, 33397, 33402, 33407, 33412, 33416, + 33421, 33426, 33430, 33435, 33440, 33444, 33449, 33453, 33458, 33463, + 33468, 33472, 33477, 33481, 33485, 16805, 33490, 33499, 33505, 33511, + 33520, 33528, 33537, 33545, 33550, 33554, 33561, 33567, 33575, 33579, + 33582, 33587, 33591, 33600, 33608, 33626, 33632, 1474, 33638, 33641, + 33645, 24447, 24453, 33651, 33655, 33666, 33677, 33688, 33700, 33704, + 33711, 33718, 33725, 33730, 33734, 6224, 963, 23150, 33742, 33747, 33751, + 33756, 33760, 33766, 33771, 33777, 33782, 33788, 33793, 33799, 33804, + 33810, 33816, 33822, 33827, 33783, 33789, 33831, 33836, 33842, 33847, + 33853, 33858, 33864, 33869, 33794, 11412, 33873, 33805, 33811, 33817, + 2874, 3522, 33879, 33882, 33887, 33893, 33899, 33905, 33912, 33918, + 33924, 33930, 33936, 33942, 33948, 33954, 33960, 33966, 33972, 33978, + 33984, 33991, 33997, 34003, 34009, 34015, 34021, 34024, 34029, 34032, + 34039, 34044, 34052, 34057, 34062, 34068, 34073, 34078, 34082, 34087, + 34093, 34098, 34104, 34109, 34115, 34120, 34126, 34132, 34136, 34141, + 34146, 34151, 34156, 34160, 34165, 34170, 34175, 34181, 34187, 34193, + 34199, 34204, 34208, 34211, 34217, 34223, 34232, 34240, 34247, 34252, + 34256, 34260, 34265, 16653, 34270, 34278, 34284, 3865, 1339, 34289, + 34293, 8383, 34299, 34305, 34312, 8392, 34316, 34322, 34329, 34335, + 34344, 34352, 9299, 34364, 34368, 34375, 34381, 34386, 34390, 34394, + 34397, 34407, 34416, 34424, 33784, 34429, 34439, 34449, 34459, 34465, + 34470, 34480, 34485, 34498, 34512, 34523, 34535, 34547, 34561, 34574, + 34586, 34598, 16016, 34612, 34617, 34622, 34626, 34630, 34634, 1776, + 29545, 34638, 34643, 33832, 34648, 34651, 34656, 34661, 34666, 34672, + 34678, 11072, 34683, 34689, 34696, 17266, 34702, 34707, 34712, 34716, + 34721, 34726, 33837, 34731, 34736, 34741, 34747, 33843, 34752, 34755, + 34762, 34770, 34776, 34782, 34788, 34799, 34804, 34811, 34818, 34825, + 34833, 34842, 34851, 34857, 34863, 34871, 33848, 34876, 34882, 34888, + 33854, 34893, 34898, 34906, 34914, 34920, 34927, 34933, 34940, 34947, + 34953, 34961, 34971, 34978, 34984, 34989, 34995, 35000, 35005, 35012, + 35021, 35029, 35034, 35040, 35047, 35055, 35061, 35066, 35072, 35081, + 35088, 30409, 35094, 35098, 35103, 35112, 35117, 35122, 35127, 13658, + 35135, 35140, 35145, 35150, 35154, 35159, 35164, 35171, 35176, 35181, + 35186, 33859, 23087, 35192, 2543, 155, 35195, 35198, 35202, 35206, 35216, + 35224, 35231, 35235, 35238, 35246, 35253, 35260, 35269, 35273, 35276, + 35282, 35286, 35294, 35302, 35306, 35310, 35313, 35319, 35326, 35330, + 35334, 35341, 35349, 33795, 35356, 35364, 35369, 11132, 600, 375, 35381, + 35386, 35391, 35397, 35402, 35407, 3886, 35412, 35415, 35420, 35425, + 35430, 35435, 35440, 35447, 24565, 35452, 35457, 35462, 35467, 35472, + 35478, 35483, 35489, 34035, 35495, 35500, 35506, 35512, 35522, 35527, + 35532, 35536, 35541, 35546, 35551, 35556, 35569, 35574, 24228, 18419, + 3899, 35578, 35584, 35589, 35594, 35600, 35605, 35610, 35614, 35619, + 35624, 35630, 35635, 35640, 1344, 35644, 35649, 35654, 35659, 35663, + 35668, 35673, 35678, 35684, 35690, 35695, 35699, 35703, 35708, 35713, + 35718, 35722, 35730, 35734, 35740, 35744, 35751, 35760, 18203, 33806, + 35766, 35773, 35781, 35788, 35794, 35807, 35819, 35824, 35830, 35834, + 2801, 35838, 35842, 35321, 35851, 35862, 35867, 30472, 35872, 35877, + 35881, 35886, 24458, 35890, 35894, 35899, 33812, 23177, 35903, 35908, + 35914, 35919, 35923, 35927, 35930, 35934, 35940, 35949, 35960, 35972, + 33818, 35977, 35980, 35984, 35988, 414, 35993, 35998, 36003, 36008, + 36013, 36018, 36024, 36029, 36034, 36040, 36045, 36051, 36056, 36062, + 36067, 36072, 36077, 36082, 36087, 36092, 36097, 36102, 36108, 36113, + 36118, 36123, 36128, 36133, 36138, 36143, 36149, 36155, 36160, 36165, + 36170, 36175, 36180, 36185, 36190, 36195, 36200, 36205, 36210, 36215, + 36220, 36225, 36230, 36235, 36240, 36245, 36251, 326, 9, 36256, 36260, + 36264, 36272, 36276, 36280, 36283, 36286, 36288, 36293, 36297, 36302, + 36306, 36311, 36315, 36320, 36324, 36327, 36329, 36333, 36338, 36342, + 36353, 36356, 36358, 36362, 36374, 36383, 36387, 36391, 36397, 36402, + 36411, 36417, 36422, 36427, 36431, 36435, 36440, 36447, 36452, 36458, + 36463, 36467, 36474, 27976, 27986, 36478, 36483, 36488, 36493, 36500, + 36504, 36511, 36517, 8532, 36521, 36530, 36538, 36553, 36567, 36576, + 36584, 36595, 36604, 36609, 36616, 7580, 36626, 36631, 36636, 36640, + 36643, 36648, 36652, 36657, 36661, 36668, 36673, 36678, 36683, 9474, + 36693, 36695, 36698, 36701, 36705, 36711, 36715, 36720, 36725, 36743, + 36757, 36776, 36793, 36802, 36810, 36815, 36820, 1467, 36826, 36832, + 36837, 36847, 36856, 36864, 36869, 36875, 36880, 36889, 36900, 36905, + 36912, 36918, 36922, 36929, 36937, 36944, 36957, 36965, 36969, 36979, + 36984, 36988, 36996, 37004, 37009, 37013, 37017, 37026, 37032, 37037, + 37045, 37055, 37064, 37073, 37082, 37093, 37101, 37112, 37121, 37128, + 37134, 37139, 37150, 37161, 37166, 37170, 37173, 37177, 37185, 37191, + 37202, 37213, 37224, 37235, 37246, 37257, 37268, 37279, 37291, 37303, + 37315, 37327, 37339, 37351, 37363, 37372, 37376, 37384, 37390, 37396, + 37403, 37409, 37414, 37420, 2442, 37424, 37426, 37431, 37436, 37441, + 37444, 37446, 37450, 37453, 37460, 37464, 10762, 37468, 37474, 37484, + 37489, 37495, 37499, 37504, 37517, 28417, 37523, 37532, 37541, 19281, + 37548, 37557, 34445, 37565, 37570, 37574, 37583, 37591, 37598, 37603, + 37607, 37612, 37617, 37625, 37629, 37637, 37643, 37649, 37654, 37659, + 37663, 37666, 37671, 37684, 37700, 25055, 37717, 37729, 37746, 37758, + 37772, 25072, 25091, 37784, 37796, 2708, 37810, 37815, 37820, 37825, + 37829, 37836, 37848, 37855, 37864, 37867, 37878, 37889, 37894, 34868, + 893, 37898, 37902, 37906, 37909, 37914, 37919, 37925, 37930, 37935, + 37941, 37947, 37952, 37956, 37961, 37966, 37971, 37975, 37978, 37984, + 37989, 37994, 37999, 38003, 38008, 38014, 38022, 28669, 38027, 38032, + 38039, 38045, 38051, 38056, 38064, 24574, 38071, 38076, 38081, 38086, + 38090, 38093, 38098, 38102, 38106, 38113, 38119, 38125, 38131, 38138, + 38143, 38149, 36999, 38153, 38157, 38162, 38175, 38180, 38186, 38194, + 38201, 38209, 38219, 38225, 38231, 38237, 38241, 38250, 38258, 38265, + 38270, 38275, 11435, 38280, 38287, 38293, 38303, 38308, 38314, 38322, + 3774, 38329, 38336, 38342, 38349, 3780, 38353, 38358, 38369, 38376, + 38382, 38391, 38395, 4258, 38398, 38405, 38411, 38417, 38425, 38435, + 31662, 38442, 38450, 38456, 38461, 38467, 38472, 38476, 28260, 38482, + 38489, 38495, 38504, 38511, 25791, 38517, 38522, 38526, 38534, 38542, + 10428, 6199, 38549, 38553, 38555, 38559, 38564, 38566, 38571, 38577, + 38582, 38587, 38594, 35443, 38600, 38605, 38609, 38614, 38618, 38627, + 38631, 38637, 38644, 38650, 38657, 38662, 38671, 38676, 38680, 38685, + 38692, 38700, 38708, 38713, 23233, 38717, 38720, 38724, 38728, 11823, + 907, 38732, 38737, 38745, 38749, 38758, 38765, 38769, 38773, 38781, + 38788, 38798, 38802, 38806, 38814, 38822, 38828, 38833, 38842, 14640, + 38848, 38857, 38862, 38869, 38876, 38884, 38891, 38899, 38907, 38912, + 38919, 38926, 38933, 38940, 38947, 38952, 38959, 38965, 38982, 38990, + 39000, 39008, 39015, 422, 39019, 39025, 39029, 39034, 36600, 39040, + 39043, 39047, 39058, 39066, 3785, 39074, 39080, 39086, 39096, 39105, + 39115, 39122, 39128, 39133, 3791, 3797, 39142, 39149, 39157, 39162, + 39166, 39173, 39181, 39188, 39194, 39203, 39213, 39219, 39227, 39236, + 39243, 39251, 39258, 23937, 39262, 39269, 39275, 39285, 39294, 39302, + 39313, 39317, 39327, 39333, 39340, 39348, 39357, 39366, 39376, 39387, + 39394, 39399, 39406, 3077, 39414, 39420, 39425, 39431, 39437, 39442, + 39455, 39468, 39481, 39488, 39494, 39502, 39510, 39515, 39519, 1436, + 39523, 39527, 39531, 39535, 39539, 39543, 39547, 39551, 39555, 39559, + 39563, 39567, 39571, 39575, 39579, 39583, 39587, 39591, 39595, 39599, + 39603, 39607, 39611, 39615, 39619, 39623, 39627, 39631, 39635, 39639, + 39643, 39647, 39651, 39655, 39659, 39663, 39667, 39671, 39675, 39679, + 39683, 39687, 39691, 39695, 39699, 39703, 39707, 39711, 39715, 39719, + 39723, 39727, 39731, 39735, 39739, 39743, 39747, 39751, 39755, 39759, + 39763, 39767, 39771, 39775, 39779, 39783, 39787, 39791, 39795, 39799, + 39803, 39807, 39811, 39815, 39819, 39823, 39827, 39831, 39835, 39839, + 39843, 39847, 39851, 39855, 39859, 39863, 39867, 39871, 39875, 39879, + 39883, 39887, 39891, 39895, 39899, 39903, 39907, 39911, 39915, 39919, + 39923, 39927, 39931, 39935, 39939, 39943, 39947, 39951, 39955, 39959, + 39963, 39967, 39971, 39975, 39979, 39983, 39987, 39991, 39995, 39999, + 40003, 40007, 40011, 40015, 40019, 40023, 40027, 40031, 40035, 40039, + 40043, 40047, 40051, 40055, 40059, 40063, 40067, 40071, 40075, 40079, + 40083, 40087, 40091, 40095, 40099, 40103, 40107, 40111, 40115, 40119, + 40123, 40127, 40131, 40135, 40140, 40144, 40149, 40153, 40158, 40162, + 40167, 40171, 40177, 40182, 40186, 40191, 40195, 40200, 40204, 40209, + 40213, 40218, 40222, 40227, 40231, 40236, 40240, 40246, 40252, 40257, + 40261, 40266, 40270, 40276, 40281, 40285, 40290, 40294, 40299, 40303, + 40309, 40314, 40318, 40323, 40327, 40332, 40336, 40341, 40345, 40351, + 40356, 40360, 40365, 40369, 40375, 40380, 40384, 40389, 40393, 40398, + 40402, 40407, 40411, 40416, 40420, 40426, 40431, 40435, 40441, 40446, + 40450, 40456, 40461, 40465, 40470, 40474, 40479, 40483, 40489, 40495, + 40501, 40507, 40513, 40519, 40525, 40531, 40536, 40540, 40545, 40549, + 40555, 40560, 40564, 40569, 40573, 40578, 40582, 40587, 40591, 40596, + 40600, 40605, 40609, 40614, 40618, 40624, 40629, 40633, 40638, 40642, + 40648, 40654, 40659, 122, 63, 40663, 40665, 40669, 40673, 40677, 40682, + 40686, 40690, 40695, 10341, 40700, 40706, 1737, 6621, 40712, 40715, + 40720, 40724, 40729, 40733, 40737, 40742, 11219, 40746, 40750, 40754, + 540, 40758, 16914, 40763, 40767, 40772, 40777, 40782, 40786, 40793, + 28441, 40799, 40802, 40806, 40811, 40817, 40821, 40824, 40832, 40838, + 40843, 40847, 40850, 40854, 40860, 40864, 40868, 3573, 3578, 31886, + 40871, 40875, 40879, 40883, 40887, 40895, 40902, 40906, 14590, 40913, + 40918, 40932, 40939, 40950, 341, 40955, 40959, 40965, 40977, 40983, + 40989, 40993, 31923, 41002, 41008, 41017, 41021, 41025, 41030, 41036, + 41041, 41045, 41050, 41054, 41058, 41065, 41071, 41076, 41087, 41102, + 41117, 41132, 41148, 41166, 11169, 41180, 41187, 41191, 41194, 41203, + 41208, 41212, 41220, 17469, 41228, 41232, 41242, 41253, 31856, 41266, + 41270, 41279, 41297, 41316, 41324, 10623, 11332, 41328, 24470, 41331, + 32824, 41336, 10622, 41341, 41347, 41352, 41358, 41363, 41369, 41374, + 41380, 41385, 41391, 41397, 41403, 41408, 41364, 41370, 41375, 41381, + 41386, 41392, 41398, 8545, 4103, 41412, 41420, 41424, 41427, 41434, + 41438, 41443, 41448, 41455, 41461, 41467, 41472, 16297, 41476, 28277, + 41480, 41484, 41488, 41494, 41498, 30349, 41507, 9634, 41511, 10027, + 41514, 41521, 41527, 41531, 13114, 41538, 41544, 41549, 41556, 41563, + 41570, 31076, 8442, 41577, 41584, 41591, 41597, 41602, 41609, 41620, + 41626, 41631, 41636, 41641, 41645, 41650, 41657, 41365, 41661, 41671, + 41680, 41691, 41697, 41705, 41712, 41717, 41722, 41727, 41732, 41737, + 41741, 41745, 41752, 41758, 41766, 2338, 1086, 11235, 11247, 11252, + 11258, 41775, 11263, 11268, 11274, 41780, 41790, 41794, 11279, 41799, + 18617, 41802, 41807, 41811, 37859, 41822, 41827, 41834, 41841, 41845, + 41848, 41856, 11182, 41863, 41866, 41872, 41882, 6251, 41891, 41897, + 41901, 41909, 41913, 41923, 41929, 41934, 41945, 41954, 41963, 41972, + 41981, 41990, 41999, 42008, 42014, 42020, 42025, 42031, 42037, 42043, + 42048, 42051, 42058, 42064, 42068, 42073, 42080, 42087, 42091, 42094, + 42104, 42117, 42126, 42135, 42146, 42159, 42171, 42182, 42191, 42202, + 42207, 42216, 42221, 11284, 42227, 42234, 42242, 42247, 42251, 42258, + 42265, 4046, 25, 42269, 42274, 18466, 42278, 42281, 42284, 30529, 42288, + 31085, 42296, 42300, 42304, 42307, 42313, 42319, 42324, 33883, 42333, + 42341, 42347, 42354, 30512, 42358, 30732, 42362, 42371, 42375, 42383, + 42389, 42395, 42400, 42404, 31104, 42410, 42413, 42421, 42429, 4399, + 42435, 42439, 42444, 42451, 42457, 42462, 42467, 42471, 42477, 42482, + 42488, 4311, 848, 42495, 42499, 42502, 16787, 42514, 42522, 42530, 42538, + 42546, 42553, 42561, 42569, 42576, 42584, 42592, 42600, 42608, 42616, + 42624, 42632, 42640, 42648, 42656, 42664, 42671, 42679, 42687, 42695, + 42703, 42711, 42719, 42727, 42735, 42743, 42751, 42759, 42767, 42775, + 42783, 42791, 42799, 42807, 42815, 42823, 42830, 42838, 42845, 42853, + 42861, 42869, 42877, 42885, 42893, 42901, 42909, 42920, 23973, 42925, + 42928, 42935, 42939, 42945, 42949, 42955, 42960, 42966, 42971, 42976, + 42980, 42984, 42989, 42994, 43004, 43010, 43023, 43029, 43035, 43041, + 43048, 43053, 43059, 43064, 18362, 856, 43069, 43072, 43075, 43078, + 33967, 33973, 43081, 33979, 33992, 33998, 34004, 43087, 34010, 34016, + 43093, 43099, 18, 43107, 43114, 43118, 43122, 43130, 34757, 43134, 43138, + 43145, 43150, 43154, 43159, 43165, 43170, 43176, 43181, 43185, 43189, + 43193, 43198, 43202, 43207, 43211, 43215, 43222, 43227, 43231, 43235, + 43240, 43244, 43249, 43253, 43257, 43262, 43268, 17060, 17065, 43273, + 43277, 43280, 43284, 43288, 23044, 43293, 43297, 43303, 43310, 43316, + 43321, 43331, 43336, 43344, 43348, 43351, 34772, 43355, 4376, 43360, + 43365, 43369, 43374, 43378, 43383, 14658, 43394, 43398, 43401, 43405, + 43410, 43414, 43419, 43424, 43428, 43432, 43436, 43439, 43443, 8564, + 14674, 43446, 43449, 43455, 43460, 43466, 43471, 43477, 43482, 43488, + 43493, 43499, 43505, 43511, 43516, 43520, 43524, 43533, 43549, 43565, + 43575, 30419, 43582, 43586, 43591, 43596, 43600, 43604, 39361, 43610, + 43615, 43619, 43626, 43631, 43636, 43640, 43644, 43650, 29348, 43654, + 23340, 43659, 43666, 43674, 43680, 43687, 43695, 43701, 43705, 43710, + 43716, 43724, 43729, 43733, 43742, 10322, 43750, 43754, 43762, 43769, + 43774, 43779, 43784, 43788, 43791, 43795, 43798, 43802, 43809, 43814, + 43818, 43824, 28747, 34030, 43828, 43837, 43845, 43851, 43858, 43864, + 43870, 43875, 43878, 43880, 43887, 43894, 43900, 43904, 43907, 43911, + 43915, 43919, 43924, 43928, 43932, 43935, 43939, 43953, 25121, 43972, + 43985, 43998, 44011, 25139, 44026, 11520, 44041, 44047, 44051, 44061, + 44065, 44069, 44073, 44080, 44085, 44089, 44096, 44102, 44107, 44113, + 44123, 44135, 44146, 44151, 44158, 44162, 44166, 44169, 17490, 3854, + 44177, 17087, 44190, 44197, 44204, 44208, 44212, 44217, 44223, 44228, + 44234, 44238, 44242, 44245, 44250, 44254, 44259, 8106, 1012, 44264, + 44268, 44274, 44283, 44288, 44297, 44304, 39209, 44310, 44315, 44319, + 44324, 44331, 44337, 44341, 44344, 44348, 44353, 15981, 44360, 44367, + 44371, 44374, 44379, 44384, 44390, 44395, 44400, 44404, 44409, 44419, + 44424, 44430, 44435, 44441, 44446, 44452, 44462, 44467, 44472, 44476, + 44481, 7582, 7594, 44486, 44489, 44496, 44502, 44511, 9560, 37131, 44519, + 44523, 44527, 34820, 44535, 44546, 44554, 39409, 44561, 44566, 44571, + 44582, 44589, 44600, 34844, 23351, 44608, 934, 44613, 15030, 44619, + 30503, 44625, 44630, 44640, 44649, 44656, 44662, 44666, 44669, 44676, + 44682, 44689, 44695, 44705, 44713, 44719, 44725, 44730, 44734, 44741, + 44746, 44752, 44759, 44765, 43920, 44770, 44774, 571, 15146, 44780, + 44785, 44788, 44794, 44802, 1361, 44807, 44811, 44816, 44821, 44826, + 44833, 44837, 44842, 44848, 44852, 34040, 44857, 44862, 44871, 44878, + 44888, 44894, 30547, 44911, 44920, 44928, 44934, 44939, 44946, 44952, + 44960, 44969, 44977, 44981, 44986, 44994, 31556, 34853, 45000, 45019, + 17393, 45033, 45049, 45063, 45069, 45074, 45079, 45084, 45090, 34859, + 45095, 45098, 45105, 45112, 45117, 45121, 412, 2984, 45128, 45133, 45138, + 29717, 44949, 45142, 45147, 45155, 45159, 45162, 45167, 45173, 45179, + 45184, 45188, 30614, 45191, 45196, 45200, 45203, 45208, 45212, 45217, + 45222, 45226, 45231, 45235, 45239, 45243, 23040, 23051, 45248, 45253, + 45259, 45264, 45270, 29305, 45275, 45279, 23137, 17696, 45282, 45287, + 45292, 45297, 45302, 45307, 45312, 45317, 465, 68, 34053, 34058, 34063, + 34069, 34074, 34079, 45322, 34083, 45326, 45330, 45334, 34088, 34094, + 45348, 34105, 34110, 45356, 45361, 34116, 45366, 45371, 45376, 45381, + 45390, 45396, 45402, 45408, 34133, 45421, 45430, 45436, 34137, 45440, + 34142, 45445, 34147, 34152, 45448, 45453, 45457, 45463, 33681, 45470, + 14904, 45477, 45482, 34157, 45486, 45491, 45496, 45501, 45505, 45510, + 45515, 45521, 45526, 45531, 45537, 45543, 45548, 45552, 45557, 45562, + 45567, 45571, 45576, 45581, 45586, 45592, 45598, 45604, 45609, 45613, + 45618, 45622, 34161, 34166, 34171, 45626, 45630, 45635, 45639, 34176, + 34182, 34188, 34200, 45651, 28314, 45655, 45660, 45664, 45669, 45676, + 45681, 45686, 45691, 45695, 45699, 45709, 45714, 45719, 45723, 45727, + 45730, 45738, 34248, 45743, 1446, 45749, 45754, 45760, 45768, 45772, + 45781, 45789, 45793, 45797, 45805, 45811, 45819, 45835, 45839, 45843, + 45847, 45852, 45858, 45873, 34285, 1745, 13308, 45877, 1340, 1355, 45889, + 45897, 45904, 45909, 45916, 45921, 10012, 1096, 2529, 11311, 45928, 9910, + 45933, 45936, 45945, 1248, 45950, 44086, 45957, 45966, 45971, 45975, + 45983, 24526, 2581, 45990, 11776, 46000, 46006, 2356, 2366, 46015, 46024, + 46034, 46045, 3365, 37485, 46050, 11375, 4024, 18400, 1253, 46054, 46062, + 46069, 46074, 46078, 46082, 26018, 44355, 11402, 46090, 46099, 46108, + 46116, 46123, 46134, 46139, 46152, 46165, 46177, 46189, 46201, 46212, + 46225, 46236, 46247, 46257, 46265, 46273, 46285, 46297, 46308, 46317, + 46325, 46332, 46344, 46351, 46357, 46366, 46373, 46386, 46391, 46401, + 46406, 46412, 46417, 41528, 46421, 46428, 46432, 46439, 46447, 46454, + 2542, 46461, 46472, 46482, 46491, 46499, 46509, 46517, 46526, 46536, + 46545, 46550, 46556, 46562, 3898, 46573, 46583, 46592, 46601, 46609, + 46619, 46627, 46636, 46641, 46646, 46651, 1675, 47, 46659, 46667, 46678, + 46689, 18039, 46699, 46703, 46710, 46716, 46721, 46725, 46736, 46746, + 46755, 46766, 18439, 18444, 46771, 46780, 46785, 46795, 46800, 46808, + 46816, 46823, 46829, 1637, 283, 46833, 46839, 46844, 46847, 2128, 44209, + 46855, 46859, 46862, 1491, 46868, 15331, 1258, 46873, 46886, 46900, 2671, + 46918, 46930, 46942, 2685, 2702, 46956, 46969, 2717, 46983, 46995, 2732, + 47009, 1264, 1270, 1276, 11682, 47014, 47019, 47024, 47028, 47043, 47058, + 47073, 47088, 47103, 47118, 47133, 47148, 47163, 47178, 47193, 47208, + 47223, 47238, 47253, 47268, 47283, 47298, 47313, 47328, 47343, 47358, + 47373, 47388, 47403, 47418, 47433, 47448, 47463, 47478, 47493, 47508, + 47523, 47538, 47553, 47568, 47583, 47598, 47613, 47628, 47643, 47658, + 47673, 47688, 47703, 47718, 47733, 47748, 47763, 47778, 47793, 47808, + 47823, 47838, 47853, 47868, 47883, 47898, 47913, 47928, 47943, 47958, + 47973, 47988, 48003, 48018, 48033, 48048, 48063, 48078, 48093, 48108, + 48123, 48138, 48153, 48168, 48183, 48198, 48213, 48228, 48243, 48258, + 48273, 48288, 48303, 48318, 48333, 48348, 48363, 48378, 48393, 48408, + 48423, 48438, 48453, 48468, 48483, 48498, 48513, 48528, 48543, 48558, + 48573, 48588, 48603, 48618, 48633, 48648, 48663, 48678, 48693, 48708, + 48723, 48738, 48753, 48768, 48783, 48798, 48813, 48828, 48843, 48858, + 48873, 48888, 48903, 48918, 48933, 48948, 48963, 48978, 48993, 49008, + 49023, 49038, 49053, 49068, 49083, 49098, 49113, 49128, 49143, 49158, + 49173, 49188, 49203, 49218, 49233, 49248, 49263, 49278, 49293, 49308, + 49323, 49338, 49353, 49368, 49383, 49398, 49413, 49428, 49443, 49458, + 49473, 49488, 49503, 49518, 49533, 49548, 49563, 49578, 49593, 49608, + 49623, 49638, 49653, 49668, 49683, 49698, 49713, 49728, 49743, 49758, + 49773, 49788, 49803, 49818, 49833, 49848, 49863, 49878, 49893, 49908, + 49923, 49938, 49953, 49968, 49983, 49998, 50013, 50028, 50043, 50058, + 50073, 50088, 50103, 50118, 50133, 50148, 50163, 50178, 50193, 50208, + 50223, 50238, 50253, 50268, 50283, 50298, 50313, 50328, 50343, 50358, + 50373, 50388, 50403, 50418, 50433, 50448, 50463, 50478, 50493, 50508, + 50523, 50538, 50553, 50568, 50583, 50598, 50613, 50628, 50643, 50658, + 50673, 50688, 50703, 50718, 50733, 50748, 50763, 50778, 50793, 50808, + 50823, 50838, 50853, 50868, 50883, 50898, 50913, 50928, 50943, 50958, + 50973, 50988, 51003, 51018, 51033, 51048, 51063, 51078, 51093, 51108, + 51123, 51138, 51153, 51168, 51183, 51198, 51213, 51228, 51243, 51258, + 51273, 51288, 51303, 51318, 51333, 51348, 51363, 51378, 51393, 51408, + 51423, 51438, 51453, 51468, 51483, 51498, 51513, 51528, 51543, 51558, + 51573, 51588, 51603, 51618, 51633, 51648, 51663, 51678, 51693, 51708, + 51723, 51738, 51753, 51768, 51783, 51798, 51813, 51828, 51843, 51858, + 51873, 51888, 51903, 51918, 51933, 51948, 51963, 51978, 51993, 52008, + 52023, 52038, 52053, 52068, 52083, 52098, 52113, 52128, 52143, 52158, + 52173, 52188, 52203, 52218, 52233, 52248, 52263, 52278, 52293, 52308, + 52323, 52338, 52353, 52368, 52383, 52398, 52413, 52428, 52443, 52458, + 52473, 52488, 52503, 52518, 52533, 52548, 52563, 52578, 52593, 52608, + 52623, 52638, 52653, 52668, 52683, 52698, 52713, 52728, 52743, 52758, + 52773, 52788, 52803, 52818, 52833, 52848, 52863, 52878, 52893, 52908, + 52923, 52938, 52953, 52968, 52983, 52998, 53013, 53028, 53043, 53058, + 53073, 53088, 53103, 53118, 53133, 53148, 53163, 53178, 53193, 53208, + 53223, 53238, 53253, 53268, 53283, 53298, 53313, 53328, 53343, 53358, + 53373, 53388, 53403, 53418, 53433, 53448, 53463, 53478, 53493, 53508, + 53523, 53538, 53553, 53568, 53583, 53598, 53613, 53628, 53643, 53658, + 53673, 53688, 53703, 53718, 53733, 53748, 53763, 53778, 53793, 53808, + 53823, 53838, 53853, 53868, 53883, 53898, 53913, 53928, 53943, 53958, + 53973, 53988, 54003, 54018, 54033, 54048, 54063, 54078, 54093, 54108, + 54123, 54138, 54153, 54168, 54183, 54198, 54213, 54228, 54243, 54258, + 54273, 54288, 54303, 54318, 54333, 54348, 54363, 54378, 54393, 54408, + 54423, 54438, 54453, 54468, 54483, 54498, 54513, 54528, 54543, 54558, + 54573, 54588, 54603, 54618, 54633, 54648, 54663, 54678, 54693, 54708, + 54723, 54738, 54753, 54768, 54783, 54798, 54813, 54828, 54843, 54859, + 54875, 54891, 54907, 54923, 54939, 54955, 54971, 54987, 55003, 55019, + 55035, 55051, 55067, 55083, 55099, 55115, 55131, 55147, 55163, 55179, + 55195, 55211, 55227, 55243, 55259, 55275, 55291, 55307, 55323, 55339, + 55355, 55371, 55387, 55403, 55419, 55435, 55451, 55467, 55483, 55499, + 55515, 55531, 55547, 55563, 55579, 55595, 55611, 55627, 55643, 55659, + 55675, 55691, 55707, 55723, 55739, 55755, 55771, 55787, 55803, 55819, + 55835, 55851, 55867, 55883, 55899, 55915, 55931, 55947, 55963, 55979, + 55995, 56011, 56027, 56043, 56059, 56075, 56091, 56107, 56123, 56139, + 56155, 56171, 56187, 56203, 56219, 56235, 56251, 56267, 56283, 56299, + 56315, 56331, 56347, 56363, 56379, 56395, 56411, 56427, 56443, 56459, + 56475, 56491, 56507, 56523, 56539, 56555, 56571, 56587, 56603, 56619, + 56635, 56651, 56667, 56683, 56699, 56715, 56731, 56747, 56763, 56779, + 56795, 56811, 56827, 56843, 56859, 56875, 56891, 56907, 56923, 56939, + 56955, 56971, 56987, 57003, 57019, 57035, 57051, 57067, 57083, 57099, + 57115, 57131, 57147, 57163, 57179, 57195, 57211, 57227, 57243, 57259, + 57275, 57291, 57307, 57323, 57339, 57355, 57371, 57387, 57403, 57419, + 57435, 57451, 57467, 57483, 57499, 57515, 57531, 57547, 57563, 57579, + 57595, 57611, 57627, 57643, 57659, 57675, 57691, 57707, 57723, 57739, + 57755, 57771, 57787, 57803, 57819, 57835, 57851, 57867, 57883, 57899, + 57915, 57931, 57947, 57963, 57979, 57995, 58011, 58027, 58043, 58059, + 58075, 58091, 58107, 58123, 58139, 58155, 58171, 58187, 58203, 58219, + 58235, 58251, 58267, 58283, 58299, 58315, 58331, 58347, 58363, 58379, + 58395, 58411, 58427, 58443, 58459, 58475, 58491, 58507, 58523, 58539, + 58555, 58571, 58587, 58603, 58619, 58635, 58651, 58667, 58683, 58699, + 58715, 58731, 58747, 58763, 58779, 58795, 58811, 58827, 58843, 58859, + 58875, 58891, 58907, 58923, 58939, 58955, 58971, 58987, 59003, 59019, + 59035, 59051, 59067, 59083, 59099, 59115, 59131, 59147, 59163, 59179, + 59195, 59211, 59227, 59243, 59259, 59275, 59291, 59307, 59323, 59339, + 59355, 59371, 59387, 59403, 59419, 59435, 59451, 59467, 59483, 59499, + 59515, 59531, 59547, 59563, 59579, 59595, 59611, 59627, 59643, 59659, + 59675, 59691, 59707, 59723, 59739, 59755, 59771, 59787, 59803, 59819, + 59835, 59851, 59867, 59883, 59899, 59915, 59931, 59947, 59963, 59979, + 59995, 60011, 60027, 60043, 60059, 60075, 60091, 60107, 60123, 60139, + 60155, 60171, 60187, 60203, 60219, 60235, 60251, 60267, 60283, 60299, + 60315, 60331, 60347, 60363, 60379, 60395, 60411, 60427, 60443, 60459, + 60475, 60491, 60507, 60523, 60539, 60555, 60571, 60587, 60603, 60619, + 60635, 60651, 60667, 60683, 60699, 60715, 60731, 60747, 60763, 60779, + 60795, 60811, 60827, 60843, 60859, 60875, 60891, 60907, 60923, 60939, + 60955, 60971, 60987, 61003, 61019, 61035, 61051, 61067, 61083, 61099, + 61115, 61131, 61147, 61163, 61179, 61195, 61211, 61227, 61243, 61259, + 61275, 61291, 61307, 61323, 61339, 61355, 61371, 61387, 61403, 61419, + 61435, 61451, 61467, 61483, 61499, 61515, 61531, 61547, 61563, 61579, + 61595, 61611, 61627, 61643, 61659, 61675, 61691, 61707, 61723, 61739, + 61755, 61771, 61787, 61803, 61819, 61835, 61851, 61867, 61883, 61899, + 61915, 61931, 61947, 61963, 61979, 61995, 62011, 62027, 62043, 62059, + 62075, 62091, 62107, 62123, 62139, 62155, 62171, 62187, 62203, 62219, + 62235, 62251, 62267, 62283, 62299, 62315, 62331, 62347, 62363, 62379, + 62395, 62411, 62427, 62443, 62459, 62475, 62491, 62507, 62523, 62539, + 62555, 62571, 62587, 62603, 62619, 62635, 62651, 62667, 62683, 62699, + 62715, 62731, 62747, 62763, 62779, 62795, 62811, 62827, 62843, 62859, + 62875, 62891, 62907, 62923, 62939, 62955, 62971, 62987, 63003, 63019, + 63035, 63051, 63067, 63083, 63099, 63115, 63131, 63147, 63163, 63179, + 63195, 63211, 63227, 63243, 63259, 63275, 63291, 63307, 63323, 63339, + 63355, 63371, 63387, 63403, 63419, 63435, 63451, 63467, 63483, 63499, + 63515, 63530, 16152, 63539, 63544, 63550, 63556, 63566, 63574, 16393, + 16999, 10831, 63587, 1499, 1503, 63595, 3978, 29832, 7536, 63601, 63606, + 63611, 63616, 63621, 63627, 63632, 63638, 63643, 63649, 63654, 63659, + 63664, 63669, 63675, 63680, 63685, 63690, 63695, 63700, 63705, 63710, + 63716, 63721, 63727, 63734, 2585, 63739, 63745, 8957, 63749, 63754, + 63761, 63769, 65, 63773, 63779, 63784, 63789, 63793, 63798, 63802, 63806, + 11719, 63810, 63820, 63833, 63844, 63857, 63864, 63870, 11236, 63878, + 63883, 63889, 63895, 63901, 63906, 63911, 63916, 63921, 63925, 63930, + 63935, 63940, 63946, 63952, 63958, 63963, 63967, 63972, 63977, 63981, + 63986, 63991, 63996, 64000, 11735, 11746, 11751, 1542, 64004, 64010, + 1547, 17890, 64015, 17899, 64020, 64026, 64031, 1578, 64037, 1584, 1590, + 11781, 64042, 64051, 64059, 64067, 64074, 64078, 64082, 64088, 64093, + 33721, 64098, 64105, 64112, 64117, 64121, 64125, 64134, 1595, 18008, + 64139, 64143, 18019, 1126, 64147, 64154, 64159, 64163, 18055, 1599, + 41685, 64166, 64171, 64181, 64190, 64195, 64199, 64205, 1604, 44316, + 64210, 64219, 64225, 64230, 64235, 11992, 11998, 64241, 64253, 64270, + 64287, 64304, 64321, 64338, 64355, 64372, 64389, 64406, 64423, 64440, + 64457, 64474, 64491, 64508, 64525, 64542, 64559, 64576, 64593, 64610, + 64627, 64644, 64661, 64678, 64695, 64712, 64729, 64746, 64763, 64780, + 64797, 64814, 64831, 64848, 64865, 64882, 64899, 64916, 64933, 64950, + 64967, 64984, 65001, 65018, 65035, 65052, 65069, 65086, 65097, 65107, + 65112, 1609, 65116, 65121, 65127, 65132, 65137, 65144, 9929, 1614, 65150, + 65159, 30161, 65164, 65175, 12009, 65185, 65190, 65196, 65201, 65208, + 65214, 65219, 1619, 18338, 65224, 65230, 12019, 1624, 12024, 65236, + 65241, 65247, 65252, 65257, 65262, 65267, 65272, 65277, 65282, 65287, + 65293, 65299, 65305, 65310, 65314, 65319, 65324, 65328, 65333, 65338, + 65343, 65348, 65352, 65357, 65363, 65368, 65373, 65377, 65382, 65387, + 65393, 65398, 65403, 65409, 65415, 65420, 65424, 65429, 65434, 65439, + 65443, 65448, 65453, 65458, 65464, 65470, 65475, 65479, 65483, 65488, + 65493, 65498, 31735, 65502, 65507, 65512, 65518, 65523, 65528, 65532, + 65537, 65542, 65548, 65553, 65558, 65564, 65570, 65575, 65579, 65584, + 65589, 65593, 65598, 65603, 65608, 65614, 65620, 65625, 65629, 65634, + 65639, 65643, 65648, 65653, 65658, 65663, 65667, 65670, 65673, 65678, + 65683, 34412, 65690, 65698, 3690, 30111, 65704, 65711, 65717, 3829, + 12130, 65723, 65733, 65748, 65756, 12135, 65767, 65772, 65783, 65795, + 65807, 65819, 2723, 65831, 65836, 65848, 65852, 65858, 65864, 65869, + 65878, 1641, 17565, 65885, 65890, 44375, 65894, 65898, 65903, 65907, + 18479, 65912, 65915, 65920, 65928, 65936, 1645, 12171, 12177, 1650, + 65944, 65951, 65956, 65965, 65975, 65982, 65987, 65992, 1655, 65999, + 66004, 18599, 66008, 66013, 66020, 66026, 66030, 66041, 66051, 66058, + 18621, 9823, 9830, 4027, 4033, 66065, 1660, 66070, 66076, 66084, 66091, + 66097, 66104, 66116, 66122, 66127, 66139, 66150, 66159, 66169, 3957, + 66177, 33515, 33524, 18661, 1665, 1669, 66190, 66194, 66197, 66208, + 66213, 1679, 66221, 66226, 66231, 18720, 66243, 66246, 66252, 66258, + 66263, 66271, 1684, 66276, 66281, 66289, 66297, 66304, 66313, 66321, + 66330, 1689, 66334, 1694, 23208, 66339, 66346, 18800, 66354, 66364, + 66370, 66375, 66383, 66390, 66399, 66407, 66417, 66426, 66436, 66445, + 66456, 66466, 66476, 66485, 66495, 66509, 66522, 66531, 66539, 66549, + 66558, 66570, 66581, 66592, 66602, 18112, 66607, 12323, 66616, 66622, + 66627, 66634, 66641, 66647, 17771, 66657, 66663, 66668, 66679, 66684, + 66692, 12340, 12345, 66700, 66706, 66710, 66718, 4022, 18869, 44468, + 66723, 66729, 66734, 66742, 66749, 13289, 66754, 66760, 1705, 66765, + 66768, 1419, 66774, 66779, 66784, 66790, 66795, 66800, 66805, 66810, + 66815, 66820, 1714, 13, 66826, 66830, 66835, 66839, 66843, 66847, 34652, + 66852, 25296, 66857, 66862, 66866, 66869, 66873, 66877, 66882, 66886, + 66891, 66895, 66901, 37910, 37915, 37920, 66904, 66911, 66917, 66925, + 44139, 66935, 37926, 34916, 34667, 34673, 37942, 34679, 66940, 66945, + 34949, 66949, 66952, 66956, 66964, 66971, 66974, 66979, 66984, 66988, + 66992, 66995, 67005, 67017, 67024, 67030, 34684, 67037, 36443, 67040, + 8974, 1052, 67043, 67047, 67052, 3872, 67056, 67059, 14937, 67066, 67073, + 67086, 67094, 67103, 67112, 67117, 67127, 67140, 67152, 67159, 67164, + 67173, 67186, 39449, 67204, 67209, 67216, 67222, 67227, 835, 67232, + 67240, 67247, 67254, 29658, 803, 67260, 67266, 67276, 67284, 67290, + 67295, 34703, 6334, 34717, 67299, 67309, 67314, 67322, 67332, 67347, + 67353, 67359, 34727, 67364, 33838, 67368, 67373, 67380, 67385, 67389, + 67394, 18664, 67401, 67406, 67410, 6375, 34753, 67414, 67420, 325, 67430, + 67437, 67443, 67450, 67455, 67464, 14573, 64175, 64185, 67470, 67478, + 67482, 67486, 67490, 67494, 67499, 67503, 67509, 67517, 67522, 67527, + 67532, 67536, 67541, 67545, 67549, 67555, 67561, 67566, 67570, 67575, + 34877, 67579, 34883, 34889, 67584, 67590, 67597, 67602, 67606, 33855, + 18331, 67609, 67613, 67618, 67625, 67631, 67635, 67640, 43804, 67646, + 67650, 67657, 67661, 67666, 67672, 67678, 67684, 67696, 67705, 67715, + 67721, 67728, 67733, 67738, 67742, 67745, 67751, 67758, 67763, 67768, + 67775, 67782, 67789, 67795, 67800, 67805, 67813, 34894, 2447, 67818, + 67823, 67829, 67834, 67840, 67845, 67850, 67855, 67861, 34915, 67866, + 67872, 67878, 67884, 34985, 67889, 67894, 67899, 34996, 67904, 67909, + 67914, 67920, 67926, 35001, 67931, 67936, 67941, 35056, 35062, 67946, + 67951, 35067, 35089, 30410, 35095, 35099, 67956, 13019, 67960, 67968, + 67974, 67982, 67989, 67995, 68005, 68011, 68018, 11654, 35113, 68024, + 68037, 68046, 68052, 68061, 68067, 25606, 68074, 68081, 68091, 68099, + 68102, 35057, 68107, 68114, 68119, 68123, 68127, 68132, 68136, 4147, + 68141, 68146, 68151, 38004, 38009, 68155, 38023, 68160, 38028, 68165, + 68171, 38040, 38046, 38052, 68176, 68182, 24575, 68193, 68196, 68208, + 68216, 35136, 68220, 68229, 68239, 68248, 35146, 68253, 68260, 68269, + 68275, 68283, 68290, 6426, 4693, 68295, 35068, 68301, 68304, 68310, + 68317, 68322, 68327, 25516, 68331, 68337, 68343, 68348, 68353, 68357, + 68363, 68369, 36349, 1084, 39099, 40834, 40840, 35177, 35182, 68374, + 68378, 68382, 68385, 68398, 68404, 68408, 68411, 68416, 36686, 68420, + 33860, 23158, 68426, 6355, 6363, 9660, 68429, 68434, 68439, 68444, 68449, + 68454, 68459, 68464, 68469, 68474, 68480, 68485, 68490, 68496, 68501, + 68506, 68511, 68516, 68521, 68526, 68532, 68537, 68543, 68548, 68553, + 68558, 68563, 68568, 68573, 68578, 68583, 68588, 68593, 68599, 68604, + 68609, 68614, 68619, 68624, 68629, 68635, 68640, 68645, 68650, 68655, + 68660, 68665, 68670, 68675, 68680, 68686, 68691, 68696, 68701, 68706, + 68712, 68718, 68723, 68729, 68734, 68739, 68744, 68749, 68754, 1492, 156, + 68759, 68763, 68767, 68771, 27306, 68775, 68779, 68784, 68788, 68793, + 68797, 68802, 68807, 68812, 68816, 68820, 68825, 68829, 14652, 68834, + 68838, 68845, 68855, 16718, 68864, 68873, 68877, 68882, 68887, 68891, + 68895, 27100, 3067, 68899, 68905, 19144, 68909, 68918, 68926, 68932, + 68937, 68949, 68961, 68966, 68970, 68975, 68979, 68985, 68991, 68996, + 69006, 69016, 69022, 69027, 69031, 69037, 69042, 69049, 69055, 69060, + 69069, 69078, 69086, 69090, 17129, 69093, 69102, 69110, 69122, 69133, + 69144, 69153, 69157, 69166, 69174, 69184, 69192, 69199, 69205, 69210, + 69219, 69225, 69230, 69241, 60, 33658, 69247, 28586, 28596, 69253, 69261, + 69268, 69274, 69278, 69288, 69299, 69307, 69316, 69321, 69326, 69331, + 69335, 69339, 19098, 69347, 69351, 69357, 69367, 69374, 69380, 69386, + 38103, 69390, 69392, 69395, 69401, 69405, 69416, 69426, 69432, 69439, + 69446, 14589, 69454, 69460, 69469, 69478, 69484, 10713, 69490, 69496, + 69501, 69506, 69513, 69518, 69525, 69531, 69536, 69544, 69557, 69566, + 69575, 66471, 66481, 69585, 69591, 69597, 69604, 69611, 69618, 69625, + 69632, 69637, 69641, 69645, 69648, 69658, 69662, 69674, 69683, 69687, + 69698, 69703, 69707, 66490, 69713, 69720, 69729, 69737, 69745, 69750, + 69754, 69759, 69764, 69774, 69782, 69787, 69791, 69795, 69801, 69809, + 69816, 69828, 69836, 69847, 69854, 69860, 69870, 69876, 69880, 69889, + 69898, 69905, 69911, 69916, 69920, 69924, 69928, 69937, 69946, 69955, + 69961, 69967, 69973, 69978, 69985, 69991, 69999, 70006, 70012, 13732, + 70017, 70023, 70027, 15646, 70031, 70036, 70046, 70055, 70061, 70067, + 70075, 70082, 70086, 70090, 70097, 70103, 70111, 70118, 70124, 70135, + 70139, 70143, 70147, 70150, 70156, 70161, 70166, 70170, 70174, 70183, + 70191, 70198, 70204, 70211, 26189, 43873, 70216, 70224, 70228, 70232, + 70235, 70243, 70250, 70256, 70265, 70273, 70279, 70284, 70288, 70293, + 70298, 70302, 70306, 70310, 70315, 70324, 70328, 70335, 40943, 70339, + 70345, 70349, 70357, 70363, 70368, 70379, 70387, 70393, 70402, 24722, + 70410, 70417, 70424, 70431, 70438, 70445, 47203, 14427, 70452, 70459, + 70464, 38139, 4359, 70470, 70475, 70480, 70486, 70492, 70498, 70503, + 70508, 70513, 70518, 70524, 70529, 70535, 70540, 70546, 70551, 70556, + 70561, 70566, 70571, 70576, 70581, 70587, 70592, 70598, 70603, 70608, + 70613, 70618, 70623, 70628, 70634, 70639, 70644, 70649, 70654, 70659, + 70664, 70669, 70674, 70679, 70684, 70690, 70695, 70700, 70705, 70710, + 70715, 70720, 70725, 70730, 70736, 70741, 70746, 70751, 70756, 70761, + 70766, 70771, 70776, 70781, 70786, 70791, 70796, 70802, 1839, 272, 70807, + 41803, 70811, 70814, 70819, 70823, 70826, 3404, 70831, 70836, 70840, + 70849, 70860, 70877, 70895, 69741, 70903, 70906, 70916, 70923, 70932, + 70948, 70957, 70967, 70972, 70982, 70991, 70999, 71013, 71021, 71025, + 71028, 71035, 71041, 71052, 71059, 71071, 71082, 71093, 71102, 71109, + 1259, 727, 71119, 2618, 71123, 71128, 71137, 9276, 19071, 22655, 71145, + 71153, 71167, 71180, 71184, 71189, 71194, 71199, 71205, 71211, 71216, + 8966, 16746, 71221, 71225, 71233, 9384, 71238, 71244, 71253, 71261, 1717, + 12184, 935, 6489, 71265, 71269, 71278, 71288, 2404, 29382, 71297, 71303, + 18571, 29397, 71309, 4207, 12562, 71315, 71322, 66203, 71326, 71330, + 71336, 71341, 71346, 3623, 160, 3649, 71351, 71363, 71367, 71373, 71378, + 30181, 71382, 12550, 2758, 4, 71387, 71397, 71408, 71414, 71425, 71432, + 71438, 71444, 71452, 71459, 71465, 71475, 71485, 71495, 71504, 25593, + 1271, 71509, 71513, 71517, 71523, 71527, 2781, 2787, 8963, 2279, 71531, + 71535, 71544, 71552, 71563, 71571, 71579, 71585, 71590, 71601, 71612, + 71620, 71626, 71631, 10532, 71641, 71649, 71653, 71657, 71662, 71666, + 71678, 30597, 16671, 71685, 71695, 71701, 71707, 10634, 71717, 71728, + 71739, 71749, 71758, 71762, 71769, 1731, 1029, 71779, 71784, 71792, + 66009, 71800, 71805, 71816, 71823, 71837, 15483, 484, 71847, 71851, + 71855, 71863, 71872, 71880, 71886, 71900, 71907, 71913, 71922, 71929, + 71939, 71947, 71954, 71962, 71969, 4029, 144, 71977, 71988, 71992, 72004, + 72010, 12743, 198, 72015, 9961, 72020, 2826, 72024, 72031, 72037, 72048, + 72056, 72063, 9335, 72070, 72079, 72087, 4107, 72100, 4124, 72104, 72109, + 72115, 72120, 72125, 72130, 2831, 520, 72136, 72149, 72153, 72158, 2836, + 1838, 829, 72162, 4128, 72170, 72176, 72180, 873, 72190, 72199, 72204, + 3640, 72208, 16427, 16434, 50565, 72212, 4159, 4039, 14310, 72220, 72227, + 72232, 25657, 72236, 72243, 72249, 72254, 72259, 16447, 192, 72264, + 72276, 72282, 72290, 2848, 1749, 72298, 72300, 72305, 72310, 72315, + 72321, 72326, 72331, 72336, 72341, 72346, 72351, 72357, 72362, 72367, + 72372, 72377, 72382, 72387, 72392, 72397, 72403, 72408, 72413, 72418, + 72424, 72429, 72435, 72440, 72445, 72450, 72455, 72460, 72465, 72470, + 72476, 72481, 72487, 72492, 72497, 72502, 72507, 72512, 72517, 72522, + 72527, 72533, 72539, 72544, 72549, 72555, 72560, 72564, 72568, 72573, + 72579, 72583, 72589, 72594, 72599, 72605, 72610, 72614, 72619, 72624, + 72628, 72631, 72633, 72637, 72640, 72647, 72652, 72656, 72661, 72665, + 72669, 72673, 72682, 72686, 35382, 72689, 35387, 72696, 72701, 35392, + 72710, 72719, 35398, 72724, 35403, 72733, 72738, 12786, 72742, 72747, + 72752, 35408, 72756, 45398, 72760, 72763, 72767, 8634, 72773, 72776, + 72781, 72786, 72790, 3887, 35413, 72793, 72797, 72800, 72811, 72816, + 72820, 72826, 72834, 72847, 72855, 72864, 72870, 72875, 72881, 72885, + 72891, 72897, 72905, 72910, 72914, 72921, 72927, 72935, 72944, 72952, + 35416, 72959, 72969, 72982, 72987, 72992, 72996, 73005, 73011, 73018, + 73029, 73041, 73048, 73057, 73066, 73075, 73082, 73088, 73095, 73103, + 73110, 73118, 73127, 73135, 73142, 73150, 73159, 73167, 73176, 73186, + 73195, 73203, 73210, 73218, 73227, 73235, 73244, 73254, 73263, 73271, + 73280, 73290, 73299, 73309, 73320, 73330, 73339, 73347, 73354, 73362, + 73371, 73379, 73388, 73398, 73407, 73415, 73424, 73434, 73443, 73453, + 73464, 73474, 73483, 73491, 73500, 73510, 73519, 73529, 73540, 73550, + 73559, 73569, 73580, 73590, 73601, 73613, 73624, 73634, 73643, 73651, + 73658, 73666, 73675, 73683, 73692, 73702, 73711, 73719, 73728, 73738, + 73747, 73757, 73768, 73778, 73787, 73795, 73804, 73814, 73823, 73833, + 73844, 73854, 73863, 73873, 73884, 73894, 73905, 73917, 73928, 73938, + 73947, 73955, 73964, 73974, 73983, 73993, 74004, 74014, 74023, 74033, + 74044, 74054, 74065, 74077, 74088, 74098, 74107, 74117, 74128, 74138, + 74149, 74161, 74172, 74182, 74193, 74205, 74216, 74228, 74241, 74253, + 74264, 74274, 74283, 74291, 74298, 74306, 74315, 74323, 74332, 74342, + 74351, 74359, 74368, 74378, 74387, 74397, 74408, 74418, 74427, 74435, + 74444, 74454, 74463, 74473, 74484, 74494, 74503, 74513, 74524, 74534, + 74545, 74557, 74568, 74578, 74587, 74595, 74604, 74614, 74623, 74633, + 74644, 74654, 74663, 74673, 74684, 74694, 74705, 74717, 74728, 74738, + 74747, 74757, 74768, 74778, 74789, 74801, 74812, 74822, 74833, 74845, + 74856, 74868, 74881, 74893, 74904, 74914, 74923, 74931, 74940, 74950, + 74959, 74969, 74980, 74990, 74999, 75009, 75020, 75030, 75041, 75053, + 75064, 75074, 75083, 75093, 75104, 75114, 75125, 75137, 75148, 75158, + 75169, 75181, 75192, 75204, 75217, 75229, 75240, 75250, 75259, 75269, + 75280, 75290, 75301, 75313, 75324, 75334, 75345, 75357, 75368, 75380, + 75393, 75405, 75416, 75426, 75437, 75449, 75460, 75472, 75485, 75497, + 75508, 75520, 75533, 75545, 75558, 75572, 75585, 75597, 75608, 75618, + 75627, 75635, 75642, 75647, 8451, 75654, 35426, 75659, 75664, 35431, + 75670, 22763, 35436, 75675, 75681, 75689, 75695, 75701, 75708, 75715, + 75720, 75725, 75729, 75733, 75736, 75740, 75749, 75758, 75766, 75772, + 75784, 75795, 75799, 3129, 8426, 75804, 75807, 75809, 75813, 75817, + 75821, 75827, 75832, 28240, 75837, 75841, 75844, 75849, 75853, 75860, + 75866, 75870, 6509, 75874, 35453, 75879, 75886, 75895, 75903, 75914, + 75922, 75931, 75939, 75946, 75953, 75959, 75970, 35458, 75975, 75986, + 75998, 76006, 76017, 76026, 76034, 76045, 76050, 76058, 2580, 76063, + 37552, 76076, 76080, 76092, 76100, 76105, 76113, 76124, 19291, 76133, + 76139, 76146, 76154, 76160, 35468, 76165, 4153, 63570, 76172, 76175, + 76183, 76196, 76209, 76222, 76235, 76242, 76253, 76262, 76267, 47020, + 47025, 76271, 76275, 76283, 76290, 76299, 76307, 76313, 76322, 76330, + 76337, 76345, 76349, 76358, 76367, 76377, 76390, 76403, 76413, 35473, + 76419, 76426, 76432, 76438, 35479, 76443, 76446, 76450, 76458, 76467, + 46758, 76475, 76484, 76492, 76499, 76507, 76517, 76526, 76535, 36785, + 76544, 76555, 76570, 76580, 9994, 23467, 76589, 76594, 76599, 76603, + 17763, 76608, 76613, 76619, 76624, 76629, 76635, 76640, 76645, 23432, + 76650, 76657, 76665, 76673, 76681, 76686, 76693, 76700, 76705, 2257, + 76709, 76713, 76721, 76729, 35496, 76735, 76741, 76753, 76759, 76766, + 76770, 76777, 76782, 76789, 76795, 76802, 76813, 76823, 76833, 76845, + 76851, 76859, 76865, 76875, 76885, 35523, 76894, 76903, 76909, 76921, + 76932, 76939, 76944, 76948, 76956, 76962, 76967, 76972, 76979, 76987, + 76999, 77009, 77018, 77027, 77035, 77042, 37405, 25990, 77048, 77053, + 77057, 77061, 77066, 77074, 77080, 77091, 77104, 77109, 77116, 35528, + 77121, 77133, 77142, 77150, 77160, 77171, 77184, 77191, 77200, 77209, + 77217, 77222, 77228, 1481, 77233, 77238, 77243, 77248, 77254, 77259, + 77264, 77270, 77276, 77281, 77285, 77290, 77295, 77300, 64130, 77305, + 77310, 77315, 77320, 77326, 77332, 77337, 77341, 77346, 17762, 77351, + 77357, 77362, 77368, 77373, 77378, 77383, 77388, 77392, 77398, 77403, + 77412, 77417, 77422, 77427, 77432, 77436, 77443, 77449, 4450, 18914, + 3094, 77454, 77458, 77463, 77467, 77471, 77475, 50820, 77479, 77404, + 77481, 77491, 35537, 77494, 77499, 77508, 77514, 6478, 35542, 77518, + 77524, 77529, 77535, 77540, 77544, 77551, 77556, 77566, 77575, 77579, + 77585, 77591, 77597, 77601, 77609, 77616, 77624, 77632, 35547, 77639, + 77642, 77649, 77655, 77660, 77664, 77670, 77678, 77685, 77690, 77694, + 77703, 77711, 77717, 77722, 35552, 77729, 77741, 77748, 77754, 77759, + 77765, 77772, 77778, 23171, 29855, 77784, 77789, 77795, 77799, 77811, + 77437, 77444, 23364, 77821, 77826, 77833, 77839, 77846, 77852, 77863, + 77868, 77876, 9699, 77881, 77884, 77890, 77894, 77898, 77901, 77907, + 77913, 35290, 4451, 1093, 14706, 77920, 77926, 77932, 77938, 77944, + 77950, 77956, 77962, 77968, 77973, 77978, 77983, 77988, 77993, 77998, + 78003, 78008, 78013, 78018, 78023, 78028, 78033, 78039, 78044, 78049, + 78055, 78060, 78065, 78071, 78077, 78083, 78089, 78095, 78101, 78107, + 78113, 78119, 78124, 78129, 78135, 78140, 78145, 78151, 78156, 78161, + 78166, 78171, 78176, 78181, 78186, 78191, 78196, 78201, 78206, 78211, + 78217, 78222, 78227, 78232, 78238, 78243, 78248, 78253, 78258, 78264, + 78269, 78274, 78279, 78284, 78289, 78294, 78299, 78304, 78309, 78314, + 78319, 78324, 78329, 78334, 78339, 78344, 78349, 78354, 78359, 78365, + 78370, 78375, 78380, 78385, 78390, 78395, 78400, 1875, 169, 78405, 78409, + 78413, 78418, 78426, 78430, 78437, 78445, 78449, 78462, 78470, 78475, + 78480, 28649, 78484, 78489, 78493, 78498, 78502, 78510, 78514, 22771, + 78519, 78523, 66714, 78527, 78530, 78538, 78546, 78554, 78559, 78564, + 78571, 78578, 78584, 78590, 78595, 78602, 78607, 78615, 71172, 78622, + 66500, 78627, 78632, 78636, 78643, 66527, 12853, 78649, 78654, 78659, + 78663, 78666, 78675, 78681, 78685, 78695, 78704, 78708, 78711, 78715, + 78722, 78735, 78741, 78749, 78758, 78769, 78780, 78791, 78802, 78811, + 78817, 78826, 78834, 78844, 78857, 78865, 78872, 78883, 78889, 78894, + 78899, 78905, 78915, 78921, 78931, 78938, 78948, 78957, 77123, 78965, + 78971, 78979, 78985, 78992, 79000, 79005, 79008, 79012, 79018, 79022, + 79025, 79031, 79037, 79045, 79057, 79069, 79076, 79081, 79085, 79096, + 79104, 79111, 79123, 79131, 79139, 79146, 79152, 79157, 79167, 79176, + 79181, 79191, 79200, 46039, 79207, 79211, 79216, 79224, 79231, 79237, + 79241, 79251, 79262, 79270, 79277, 79289, 79301, 79310, 76066, 79317, + 79327, 79339, 79350, 79364, 79372, 79382, 79389, 79397, 79410, 79422, + 79431, 79439, 79449, 79460, 79472, 79481, 79491, 79501, 79510, 79517, + 79526, 79541, 79549, 79559, 79568, 79576, 79589, 63540, 79604, 79614, + 79623, 79635, 79645, 79657, 79668, 79682, 79696, 79710, 79724, 79738, + 79752, 79766, 79780, 79794, 79808, 79822, 79836, 79850, 79864, 79878, + 79892, 79906, 79920, 79934, 79948, 79962, 79976, 79990, 80004, 80018, + 80032, 80046, 80060, 80074, 80088, 80102, 80116, 80130, 80144, 80158, + 80172, 80186, 80200, 80214, 80228, 80242, 80256, 80270, 80284, 80298, + 80312, 80326, 80340, 80354, 80368, 80382, 80396, 80410, 80424, 80438, + 80452, 80466, 80480, 80494, 80508, 80522, 80536, 80550, 80564, 80578, + 80592, 80606, 80620, 80634, 80648, 80662, 80676, 80690, 80704, 80718, + 80732, 80746, 80760, 80774, 80788, 80802, 80816, 80830, 80844, 80858, + 80872, 80886, 80900, 80914, 80928, 80942, 80956, 80970, 80984, 80998, + 81012, 81026, 81040, 81054, 81068, 81082, 81096, 81110, 81124, 81138, + 81152, 81166, 81180, 81194, 81208, 81222, 81236, 81250, 81264, 81278, + 81292, 81306, 81320, 81334, 81348, 81362, 81376, 81390, 81404, 81418, + 81432, 81446, 81460, 81474, 81488, 81502, 81516, 81530, 81544, 81558, + 81572, 81586, 81600, 81614, 81628, 81642, 81656, 81670, 81684, 81698, + 81712, 81726, 81740, 81754, 81768, 81782, 81796, 81810, 81824, 81838, + 81852, 81866, 81880, 81894, 81908, 81922, 81936, 81950, 81964, 81978, + 81992, 82006, 82020, 82034, 82048, 82062, 82076, 82090, 82104, 82118, + 82132, 82146, 82160, 82174, 82188, 82202, 82216, 82230, 82244, 82258, + 82272, 82286, 82300, 82314, 82328, 82342, 82356, 82370, 82384, 82398, + 82412, 82426, 82440, 82454, 82468, 82482, 82496, 82510, 82524, 82538, + 82552, 82566, 82580, 82594, 82608, 82622, 82636, 82650, 82664, 82678, + 82692, 82706, 82720, 82734, 82748, 82762, 82776, 82790, 82804, 82818, + 82832, 82846, 82860, 82874, 82888, 82902, 82916, 82930, 82944, 82958, + 82972, 82986, 83000, 83014, 83028, 83042, 83056, 83070, 83084, 83098, + 83112, 83126, 83140, 83154, 83168, 83182, 83196, 83210, 83224, 83238, + 83252, 83266, 83280, 83294, 83308, 83322, 83336, 83350, 83364, 83378, + 83392, 83406, 83420, 83434, 83448, 83462, 83476, 83490, 83504, 83518, + 83532, 83546, 83560, 83574, 83588, 83602, 83616, 83630, 83644, 83658, + 83672, 83686, 83700, 83714, 83728, 83742, 83756, 83770, 83784, 83798, + 83812, 83826, 83840, 83854, 83868, 83882, 83896, 83910, 83924, 83938, + 83952, 83966, 83980, 83994, 84008, 84022, 84036, 84050, 84064, 84078, + 84092, 84106, 84120, 84134, 84148, 84162, 84176, 84190, 84204, 84218, + 84232, 84246, 84260, 84274, 84288, 84302, 84316, 84330, 84344, 84358, + 84372, 84386, 84400, 84414, 84428, 84442, 84456, 84470, 84484, 84498, + 84512, 84526, 84540, 84554, 84568, 84582, 84596, 84610, 84624, 84638, + 84652, 84666, 84680, 84694, 84708, 84722, 84736, 84750, 84764, 84778, + 84792, 84806, 84820, 84834, 84848, 84862, 84876, 84890, 84904, 84918, + 84932, 84946, 84960, 84974, 84988, 85002, 85016, 85030, 85044, 85058, + 85072, 85086, 85100, 85114, 85128, 85142, 85156, 85170, 85184, 85198, + 85212, 85226, 85240, 85254, 85268, 85282, 85296, 85310, 85324, 85338, + 85352, 85366, 85380, 85394, 85408, 85422, 85436, 85450, 85464, 85478, + 85492, 85506, 85520, 85534, 85548, 85562, 85576, 85590, 85604, 85618, + 85632, 85646, 85660, 85674, 85688, 85702, 85716, 85730, 85744, 85758, + 85772, 85786, 85800, 85814, 85828, 85842, 85856, 85870, 85884, 85898, + 85912, 85926, 85940, 85954, 85968, 85982, 85996, 86010, 86024, 86038, + 86052, 86066, 86080, 86094, 86108, 86122, 86136, 86150, 86164, 86178, + 86192, 86206, 86220, 86234, 86248, 86262, 86276, 86290, 86304, 86318, + 86332, 86346, 86360, 86374, 86388, 86402, 86416, 86430, 86444, 86458, + 86472, 86486, 86500, 86514, 86528, 86542, 86556, 86570, 86584, 86598, + 86612, 86626, 86640, 86654, 86668, 86682, 86696, 86710, 86724, 86738, + 86752, 86766, 86780, 86794, 86808, 86822, 86836, 86850, 86864, 86878, + 86892, 86906, 86920, 86934, 86948, 86962, 86976, 86990, 87004, 87018, + 87032, 87046, 87060, 87074, 87088, 87102, 87116, 87130, 87144, 87158, + 87172, 87186, 87200, 87214, 87228, 87242, 87256, 87270, 87284, 87298, + 87312, 87326, 87340, 87354, 87368, 87382, 87396, 87410, 87424, 87438, + 87452, 87466, 87480, 87494, 87508, 87522, 87536, 87550, 87564, 87578, + 87592, 87606, 87620, 87634, 87648, 87662, 87676, 87690, 87704, 87718, + 87732, 87746, 87760, 87774, 87788, 87802, 87816, 87830, 87844, 87858, + 87872, 87886, 87900, 87914, 87928, 87942, 87956, 87970, 87984, 87998, + 88012, 88026, 88040, 88054, 88068, 88082, 88096, 88110, 88124, 88138, + 88152, 88166, 88180, 88194, 88208, 88222, 88236, 88250, 88264, 88278, + 88292, 88306, 88320, 88334, 88348, 88362, 88376, 88390, 88404, 88418, + 88432, 88446, 88460, 88474, 88488, 88502, 88516, 88530, 88544, 88558, + 88572, 88586, 88600, 88614, 88628, 88642, 88656, 88670, 88684, 88698, + 88712, 88726, 88740, 88754, 88768, 88782, 88796, 88810, 88824, 88838, + 88852, 88866, 88880, 88894, 88908, 88922, 88936, 88950, 88964, 88978, + 88992, 89006, 89020, 89034, 89048, 89062, 89076, 89090, 89104, 89118, + 89132, 89146, 89160, 89174, 89188, 89202, 89216, 89230, 89244, 89258, + 89272, 89286, 89300, 89314, 89328, 89342, 89356, 89370, 89384, 89398, + 89412, 89426, 89440, 89454, 89468, 89482, 89496, 89510, 89524, 89538, + 89552, 89566, 89580, 89594, 89608, 89622, 89636, 89650, 89664, 89678, + 89692, 89706, 89720, 89734, 89748, 89762, 89776, 89790, 89804, 89818, + 89832, 89846, 89860, 89874, 89888, 89902, 89916, 89930, 89944, 89958, + 89972, 89986, 90000, 90014, 90028, 90042, 90056, 90070, 90084, 90098, + 90112, 90126, 90140, 90154, 90168, 90182, 90196, 90210, 90224, 90238, + 90249, 90260, 90270, 90281, 90289, 90295, 90305, 90313, 90319, 31621, + 90324, 90330, 90339, 90351, 90356, 90363, 10546, 19311, 90369, 90378, + 90383, 90387, 90394, 90400, 90405, 90410, 90418, 90426, 13229, 90430, + 90433, 90435, 90442, 90448, 90459, 90464, 90468, 90473, 90480, 90486, + 90491, 90499, 71741, 71751, 90505, 90512, 90522, 11641, 90529, 90534, + 31855, 90543, 90548, 90555, 90565, 90573, 90581, 90590, 90596, 90602, + 90609, 90616, 90621, 90625, 90633, 66544, 90638, 90647, 90655, 90662, + 90667, 90671, 90680, 90686, 90689, 90693, 90702, 90712, 78457, 90721, + 90725, 90733, 90737, 90743, 90754, 90764, 19320, 90775, 90784, 90792, + 90800, 90807, 66563, 9192, 90815, 90819, 90828, 90835, 90838, 29736, + 90841, 90845, 90850, 90867, 90879, 11599, 90891, 90896, 90901, 90906, + 22861, 90910, 90915, 90920, 90926, 90931, 6142, 90936, 22865, 90941, + 90946, 90952, 90959, 90964, 90969, 90975, 90981, 90987, 90992, 90998, + 91002, 91016, 91024, 91032, 91038, 91043, 91050, 91060, 91069, 91074, + 91079, 91084, 91092, 91097, 91103, 91108, 91117, 65232, 91122, 91125, + 91143, 91162, 91175, 91189, 91205, 91212, 91219, 91228, 91235, 91241, + 91248, 91253, 91259, 91265, 91273, 91279, 91284, 91289, 91305, 11612, + 91319, 91326, 91334, 91340, 91344, 91347, 91352, 91357, 91364, 91369, + 91378, 91384, 91389, 91395, 91401, 91410, 91419, 38955, 91424, 91432, + 91441, 12882, 91450, 91456, 91464, 91470, 91476, 91482, 91487, 91494, + 91500, 12893, 91505, 91508, 91513, 35579, 91523, 91532, 91537, 91543, + 91548, 91556, 91563, 91574, 91584, 91589, 91597, 71095, 91602, 91608, + 91613, 91620, 91629, 91637, 91641, 91647, 91653, 91660, 91666, 91670, + 18682, 3103, 91675, 91679, 91683, 91689, 91698, 91704, 91711, 91715, + 91736, 91758, 91774, 91791, 91810, 91819, 91829, 91837, 91844, 91851, + 91857, 29597, 91871, 91875, 91881, 91889, 91901, 91907, 91915, 91922, + 91927, 91932, 91936, 91944, 91951, 91955, 91961, 91967, 91972, 3729, + 47220, 91978, 91982, 91986, 91990, 91995, 92000, 92005, 92011, 92017, + 92023, 92030, 92036, 92043, 92049, 92055, 92060, 92066, 92071, 92075, + 92080, 92084, 92089, 47235, 92093, 92098, 92106, 92110, 92115, 92122, + 92131, 92137, 92146, 92150, 92157, 92161, 92164, 92171, 92177, 92186, + 92196, 92206, 92211, 92215, 92222, 92230, 92239, 92243, 92251, 92257, + 92262, 92267, 92273, 92279, 92284, 92288, 92294, 92299, 92303, 92307, + 92310, 92315, 92323, 92333, 92339, 92344, 92354, 44492, 92362, 92374, + 92380, 92384, 92390, 92402, 92413, 92420, 92426, 92433, 92440, 92452, + 92459, 92465, 22939, 92469, 92477, 92483, 92490, 92496, 92502, 92508, + 92513, 92518, 92523, 92527, 92536, 92544, 92555, 7374, 92560, 18131, + 92566, 92570, 92574, 92578, 92586, 92595, 92599, 92606, 92615, 92623, + 92636, 92642, 92085, 32739, 92647, 92649, 92654, 92659, 92664, 92669, + 92674, 92679, 92684, 92689, 92694, 92699, 92704, 92709, 92714, 92719, + 92725, 92730, 92735, 92740, 92745, 92750, 92755, 92760, 92765, 92771, + 92777, 92783, 92788, 92793, 92805, 92810, 1881, 54, 92815, 92820, 35585, + 92824, 35590, 35595, 35601, 35606, 92828, 35611, 23994, 92850, 92854, + 92858, 92863, 92867, 35615, 92871, 92879, 92886, 92892, 35620, 92902, + 92905, 92910, 92914, 92923, 10356, 92931, 35625, 23845, 92934, 92938, + 92946, 1393, 92951, 35636, 92954, 92959, 27995, 28005, 38578, 92964, + 92969, 92974, 92979, 92985, 92990, 92999, 93004, 93013, 93021, 93028, + 93034, 93039, 93044, 93049, 93059, 93068, 93076, 93081, 93089, 93093, + 93101, 93105, 93112, 93120, 35444, 41634, 93127, 93133, 93138, 93143, + 13264, 30820, 93148, 93153, 93160, 93166, 93171, 93179, 93189, 93199, + 93205, 93210, 93216, 19342, 93223, 39462, 93236, 93241, 93247, 33737, + 69579, 93260, 93264, 93273, 93282, 93289, 93295, 93303, 93312, 93319, + 41754, 93325, 93328, 93332, 93336, 93340, 28141, 93346, 93353, 93359, + 93367, 93372, 93376, 26137, 93382, 93385, 93393, 93400, 93408, 93421, + 93435, 93442, 93448, 93455, 93461, 35650, 93465, 93472, 93480, 93488, + 93494, 35655, 93502, 93508, 93513, 93523, 93529, 93538, 33532, 38010, + 93546, 93551, 93556, 93560, 93565, 93569, 93577, 93582, 16419, 44505, + 93586, 93591, 35660, 68121, 93595, 93600, 93604, 93611, 93620, 93624, + 93632, 93638, 93643, 93649, 8493, 93654, 93660, 93665, 93670, 93681, + 93690, 93702, 93717, 35936, 93723, 18250, 35664, 93727, 93734, 93740, + 26253, 93744, 93751, 93760, 93767, 93776, 93782, 93787, 93795, 93801, + 93806, 35674, 93811, 93820, 92408, 93829, 93836, 93842, 93848, 93857, + 93867, 93875, 93882, 93886, 35679, 93889, 35685, 35691, 93894, 93902, + 93910, 93920, 93929, 93937, 93944, 93954, 35696, 93958, 93960, 93964, + 93969, 93973, 93977, 93983, 93988, 93992, 94003, 94008, 94013, 3108, + 94017, 94024, 94028, 94037, 94045, 94052, 94057, 94062, 68172, 94066, + 94069, 94075, 94083, 94089, 94093, 94098, 94105, 94110, 94115, 94119, + 94125, 94130, 38041, 94134, 94137, 94142, 94146, 94151, 94158, 94163, + 94167, 43031, 94175, 28014, 28023, 94181, 94187, 94193, 94198, 94202, + 94205, 94215, 94224, 94229, 94235, 94242, 94248, 94252, 94260, 94265, + 38047, 78677, 94269, 94277, 94283, 94290, 94295, 94299, 94304, 63756, + 94310, 94316, 38053, 94321, 94326, 94330, 94335, 94340, 94345, 94349, + 94354, 94359, 94365, 94370, 94375, 94381, 94387, 94392, 94396, 94401, + 94406, 94411, 94415, 26252, 94420, 94425, 94431, 94437, 94443, 94448, + 94452, 94457, 94462, 94467, 94471, 94476, 94481, 94486, 94491, 47490, + 94495, 35704, 94503, 94507, 94515, 94523, 94534, 94539, 94543, 24420, + 76169, 94548, 94554, 94559, 94569, 94576, 94581, 94589, 94598, 94603, + 94607, 94612, 94620, 94628, 94635, 71357, 94641, 94649, 94656, 94667, + 94673, 94679, 35714, 94682, 94689, 94697, 94702, 44708, 94706, 94711, + 94718, 94723, 9567, 94727, 94735, 94742, 94749, 94758, 94765, 94771, + 94785, 6214, 94793, 94799, 94803, 94806, 94814, 94821, 94826, 94839, + 94846, 94852, 94856, 94864, 94869, 94876, 94881, 66403, 94886, 94889, + 94898, 94905, 94911, 94915, 94918, 94926, 94932, 94941, 94951, 94961, + 94970, 94981, 94989, 95000, 95005, 95009, 95014, 95018, 38709, 95026, + 23234, 38718, 95031, 95036, 95041, 95046, 95051, 95056, 95061, 95065, + 95070, 95075, 95080, 95085, 95090, 95095, 95099, 95104, 95109, 95113, + 95117, 95121, 95125, 95130, 95135, 95139, 95144, 95148, 95152, 95157, + 95162, 95167, 95172, 95176, 95181, 95186, 95190, 95195, 95200, 95205, + 95210, 95215, 95220, 95225, 95230, 95235, 95240, 95245, 95250, 95255, + 95260, 95265, 95270, 95275, 95280, 95285, 95290, 95294, 95299, 95304, + 95309, 95314, 95319, 95324, 95329, 95334, 95339, 95344, 95349, 95353, + 95358, 95362, 95367, 95372, 95377, 95382, 95387, 95392, 95397, 95402, + 95407, 95411, 95415, 95420, 95425, 95429, 95434, 95439, 95443, 95448, + 95453, 95458, 95463, 95467, 95472, 95477, 95481, 95486, 95490, 95494, + 95498, 95502, 95507, 95511, 95515, 95519, 95523, 95527, 95531, 95535, + 95539, 95543, 95548, 95553, 95558, 95563, 95568, 95573, 95578, 95583, + 95588, 95593, 95597, 95601, 95605, 95609, 95613, 95617, 95622, 95626, + 95631, 95635, 95640, 95645, 95649, 95653, 95658, 95662, 95666, 95670, + 95674, 95678, 95682, 95686, 95690, 95694, 95698, 95702, 95706, 95710, + 95714, 95719, 95724, 95728, 95732, 95736, 95740, 95744, 95748, 95753, + 95757, 95761, 95765, 95769, 95773, 95777, 95782, 95786, 95791, 95795, + 95799, 95803, 95807, 95811, 95815, 95819, 95823, 95827, 95831, 95835, + 95840, 95844, 95848, 95852, 95856, 95860, 95864, 95868, 95872, 95876, + 95880, 95884, 95889, 95893, 95897, 95902, 95907, 95911, 95915, 95919, + 95923, 95927, 95931, 95935, 95939, 95944, 95948, 95953, 95957, 95962, + 95966, 95971, 95975, 95981, 95986, 95990, 95995, 95999, 96004, 96008, + 96013, 96017, 96022, 1500, 96026, 2862, 1755, 1673, 27950, 96030, 2871, + 96034, 1362, 96039, 1304, 96043, 96047, 2888, 96051, 96059, 96066, 96073, + 96087, 2892, 7476, 96096, 96104, 96111, 96122, 96131, 96138, 96150, + 96163, 96176, 96187, 96192, 96199, 96211, 96215, 2896, 12960, 96225, + 96230, 96239, 96249, 96254, 2900, 96262, 96266, 96271, 96278, 96284, + 96292, 96304, 96314, 1309, 14311, 96327, 96331, 96337, 96351, 96363, + 96375, 96385, 96394, 96403, 96412, 96420, 96431, 96439, 4306, 96449, + 96460, 96469, 96475, 96490, 96497, 96503, 96508, 38843, 96513, 2924, + 14315, 96517, 96524, 9492, 96533, 96539, 2929, 35152, 96548, 66099, + 96555, 96559, 96565, 96576, 96582, 96589, 96595, 96603, 96610, 96616, + 96627, 96637, 96646, 96657, 96666, 96673, 96679, 96689, 96697, 96703, + 96718, 96724, 96729, 96736, 96739, 96745, 96752, 96758, 96766, 96775, + 96783, 96789, 96798, 46760, 96812, 96817, 96823, 16195, 96828, 96841, + 96853, 96862, 96870, 96877, 96881, 96885, 96888, 96895, 96902, 96910, + 96918, 96927, 96935, 16100, 96943, 96948, 96952, 96964, 96971, 96978, + 96987, 877, 96997, 97006, 97017, 2945, 97021, 97025, 97031, 97044, 97056, + 97066, 97075, 97087, 28701, 97098, 97106, 97115, 97126, 97137, 97147, + 97157, 97166, 97174, 12474, 97181, 97185, 97188, 97193, 97198, 97202, + 97208, 1314, 97215, 97219, 13042, 97223, 97234, 97243, 97251, 97260, + 97268, 97284, 97295, 97304, 97312, 97324, 97335, 97351, 97361, 97382, + 97396, 97409, 97417, 97424, 7522, 97437, 97442, 97448, 6223, 97454, + 97457, 97464, 97474, 8595, 97481, 97486, 97491, 97496, 97504, 97513, + 97521, 97526, 97533, 10594, 10603, 97539, 97550, 97555, 97561, 2961, + 2966, 97567, 11967, 97573, 97580, 97587, 97600, 97605, 2266, 87, 97613, + 97618, 97626, 97636, 97645, 97651, 97660, 97668, 97678, 97682, 97686, + 97691, 97695, 97707, 2989, 97715, 97723, 97728, 97739, 97750, 97762, + 97773, 97783, 97792, 23275, 97797, 97803, 97808, 97818, 97828, 97833, + 30713, 97839, 97844, 97853, 23287, 97857, 4404, 16, 97862, 97871, 97878, + 97885, 97891, 97896, 97900, 97906, 1085, 97911, 97916, 66680, 97921, + 97926, 97932, 97938, 97946, 97951, 97959, 97966, 97972, 97977, 42915, + 46654, 97983, 1806, 32, 97993, 98006, 98011, 98019, 98024, 98030, 3015, + 30788, 98035, 98043, 98050, 98055, 98064, 64006, 4023, 67784, 98072, + 98076, 1700, 1818, 98081, 98086, 98093, 1822, 286, 98100, 98106, 98111, + 3037, 98115, 98120, 98127, 1826, 98132, 98138, 98143, 98155, 6454, 98165, + 98172, 1833, 98178, 98183, 98190, 98197, 98212, 98219, 98230, 98235, + 98243, 2646, 98247, 98259, 98264, 98268, 98274, 30596, 2271, 98278, + 98289, 98293, 98297, 98303, 98307, 98316, 98320, 98331, 98335, 2317, + 34969, 98339, 98349, 3128, 98357, 98366, 9999, 98371, 98376, 98380, + 98389, 98396, 98402, 3098, 16259, 98406, 98419, 98437, 98442, 98450, + 98458, 98468, 10866, 14428, 98480, 98493, 98500, 98514, 98521, 98537, + 98544, 98550, 23325, 13666, 98557, 98564, 98574, 98583, 47489, 98595, + 47624, 98603, 98606, 98612, 98618, 98624, 98630, 98636, 98643, 98650, + 98656, 98662, 98668, 98674, 98680, 98686, 98692, 98698, 98704, 98710, + 98716, 98722, 98728, 98734, 98740, 98746, 98752, 98758, 98764, 98770, + 98776, 98782, 98788, 98794, 98800, 98806, 98812, 98818, 98824, 98830, + 98836, 98842, 98848, 98854, 98860, 98866, 98872, 98878, 98884, 98890, + 98896, 98902, 98908, 98914, 98920, 98926, 98932, 98938, 98944, 98950, + 98956, 98963, 98969, 98976, 98983, 98989, 98996, 99003, 99009, 99015, + 99021, 99027, 99033, 99039, 99045, 99051, 99057, 99063, 99069, 99075, + 99081, 99087, 99093, 3112, 9972, 99099, 99105, 99113, 99117, 96274, 3116, + 99121, 23052, 13299, 3973, 99125, 3122, 99129, 99139, 99145, 99151, + 99157, 99163, 99169, 99175, 99181, 99187, 99193, 99199, 99205, 99211, + 99217, 99223, 99229, 99235, 99241, 99247, 99253, 99259, 99265, 99271, + 99277, 99283, 99289, 99296, 99303, 99309, 99315, 99321, 99327, 99333, + 99339, 1319, 99345, 99350, 99355, 99360, 99365, 99370, 99375, 99380, + 99385, 99389, 99393, 99397, 99401, 99405, 99409, 99413, 99417, 99421, + 99427, 99433, 99439, 99445, 99449, 99453, 99457, 99461, 99465, 99469, + 99473, 99477, 99481, 99486, 99491, 99496, 99501, 99506, 99511, 99516, + 99521, 99526, 99531, 99536, 99541, 99546, 99551, 99556, 99561, 99566, + 99571, 99576, 99581, 99586, 99591, 99596, 99601, 99606, 99611, 99616, + 99621, 99626, 99631, 99636, 99641, 99646, 99651, 99656, 99661, 99666, + 99671, 99676, 99681, 99686, 99691, 99696, 99701, 99706, 99711, 99716, + 99721, 99726, 99731, 99736, 99741, 99746, 99751, 99756, 99761, 99766, + 99771, 99776, 99781, 99786, 99791, 99796, 99801, 99806, 99811, 99816, + 99821, 99826, 99831, 99836, 99841, 99846, 99851, 99856, 99861, 99866, + 99871, 99876, 99881, 99886, 99891, 99896, 99901, 99906, 99911, 99916, + 99921, 99926, 99931, 99936, 99941, 99946, 99951, 99956, 99961, 99966, + 99971, 99976, 99981, 99986, 99991, 99996, 100001, 100006, 100011, 100016, + 100021, 100026, 100031, 100036, 100041, 100046, 100051, 100056, 100061, + 100066, 100071, 100076, 100081, 100086, 100091, 100096, 100101, 100106, + 100111, 100116, 100121, 100126, 100131, 100136, 100141, 100146, 100151, + 100156, 100161, 100166, 100171, 100176, 100181, 100186, 100191, 100196, + 100201, 100206, 100211, 100216, 100221, 100226, 100231, 100236, 100241, + 100246, 100251, 100256, 100261, 100266, 100271, 100276, 100281, 100286, + 100291, 100296, 100301, 100306, 100311, 100316, 100321, 100326, 100331, + 100336, 100341, 100346, 100351, 100356, 100361, 100366, 100371, 100377, + 100382, 100387, 100392, 100397, 100402, 100407, 100412, 100418, 100423, + 100428, 100433, 100438, 100443, 100448, 100453, 100458, 100463, 100468, + 100473, 100478, 100483, 100488, 100493, 100498, 100503, 100508, 100513, + 100518, 100523, 100528, 100533, 100538, 100543, 100548, 100553, 100558, + 100563, 100568, 100573, 100578, 100587, 100592, 100601, 100606, 100615, + 100620, 100629, 100634, 100643, 100648, 100657, 100662, 100671, 100676, + 100685, 100690, 100695, 100704, 100708, 100717, 100722, 100731, 100736, + 100745, 100750, 100759, 100764, 100773, 100778, 100787, 100792, 100801, + 100806, 100815, 100820, 100829, 100834, 100843, 100848, 100853, 100858, + 100863, 100868, 100873, 100878, 100882, 100887, 100892, 100897, 100902, + 100907, 100912, 100918, 100923, 100928, 100933, 100939, 100943, 100948, + 100954, 100959, 100964, 100969, 100974, 100979, 100984, 100989, 100994, + 100999, 101004, 101010, 101015, 101020, 101025, 101031, 101036, 101041, + 101046, 101051, 101057, 101062, 101067, 101072, 101077, 101082, 101088, + 101093, 101098, 101103, 101108, 101113, 101118, 101123, 101128, 101133, + 101138, 101143, 101148, 101153, 101158, 101163, 101168, 101173, 101178, + 101183, 101188, 101193, 101198, 101203, 101209, 101215, 101221, 101226, + 101231, 101236, 101241, 101247, 101253, 101259, 101264, 101269, 101274, + 101280, 101285, 101290, 101295, 101300, 101305, 101310, 101315, 101320, + 101325, 101330, 101335, 101340, 101345, 101350, 101355, 101360, 101366, + 101372, 101378, 101383, 101388, 101393, 101398, 101404, 101410, 101416, + 101421, 101426, 101431, 101436, 101441, 101446, 101451, 101456, 101461, + 17686, 101466, 101472, 101477, 101482, 101487, 101492, 101497, 101503, + 101508, 101513, 101518, 101523, 101528, 101534, 101539, 101544, 101549, + 101554, 101559, 101564, 101569, 101574, 101579, 101584, 101589, 101594, + 101599, 101604, 101609, 101614, 101619, 101624, 101629, 101634, 101639, + 101644, 101650, 101655, 101660, 101665, 101670, 101675, 101680, 101685, + 101690, 101695, 101700, 101705, 101710, 101715, 101720, 101725, 101730, + 101735, 101740, 101745, 101750, 101755, 101760, 101765, 101770, 101775, + 101780, 101785, 101790, 101795, 101800, 101805, 101810, 101815, 101820, + 101825, 101830, 101835, 101840, 101845, 101850, 101856, 101861, 101866, + 101871, 101876, 101881, 101886, 101891, 101896, 101901, 101906, 101911, + 101917, 101922, 101928, 101933, 101938, 101943, 101948, 101953, 101958, + 101964, 101969, 101974, 101980, 101985, 101990, 101995, 102000, 102005, + 102011, 102017, 102022, 102027, 13321, 102032, 102037, 102042, 102047, + 102052, 102057, 102062, 102067, 102072, 102077, 102082, 102087, 102092, + 102097, 102102, 102107, 102112, 102117, 102122, 102127, 102132, 102137, + 102142, 102147, 102152, 102157, 102162, 102167, 102172, 102177, 102182, + 102187, 102192, 102197, 102202, 102207, 102212, 102217, 102222, 102227, + 102232, 102237, 102242, 102247, 102252, 102257, 102262, 102267, 102272, + 102277, 102282, 102287, 102292, 102297, 102302, 102307, 102312, 102317, + 102322, 102327, 102332, 102337, 102342, 102347, 102352, 102358, 102363, + 102368, 102373, 102378, 102384, 102389, 102394, 102399, 102404, 102409, + 102414, 102420, 102425, 102430, 102435, 102440, 102445, 102451, 102456, + 102461, 102466, 102471, 102476, 102482, 102487, 102492, 102497, 102502, + 102507, 102513, 102519, 102524, 102529, 102534, 102540, 102546, 102552, + 102557, 102562, 102568, 102574, 102579, 102585, 102591, 102597, 102602, + 102607, 102613, 102618, 102624, 102629, 102635, 102644, 102649, 102654, + 102660, 102665, 102671, 102676, 102681, 102686, 102691, 102696, 102701, + 102706, 102711, 102716, 102721, 102726, 102731, 102736, 102741, 102746, + 102751, 102756, 102761, 102766, 102771, 102776, 102781, 102786, 102791, + 102796, 102801, 102806, 102811, 102816, 102821, 102826, 102832, 102838, + 102844, 102849, 102854, 102859, 102864, 102869, 102874, 102879, 102884, + 102889, 102894, 102899, 102904, 102909, 102914, 102919, 102924, 102929, + 102934, 102939, 102944, 102950, 102956, 102961, 102967, 102972, 102977, + 102983, 102988, 102994, 102999, 103005, 103010, 103016, 103021, 103027, + 103032, 103037, 103042, 103047, 103052, 103057, 103062, 99140, 99146, + 99152, 99158, 103068, 99164, 99170, 103074, 99176, 99182, 99188, 99194, + 99200, 99206, 99212, 99218, 99224, 103080, 99230, 99236, 99242, 103086, + 99248, 99254, 99260, 99266, 103092, 99272, 99278, 99284, 99304, 103098, + 103104, 99310, 103110, 99316, 99322, 99328, 99334, 99340, 3139, 3144, + 103116, 103121, 103124, 103130, 103136, 103143, 103148, 103153, 2322, }; /* code->name phrasebook */ #define phrasebook_shift 8 -#define phrasebook_short 201 +#define phrasebook_short 198 static unsigned char phrasebook[] = { - 0, 211, 228, 240, 212, 82, 217, 31, 82, 42, 54, 243, 97, 54, 218, 246, - 54, 250, 235, 250, 160, 49, 219, 76, 50, 219, 76, 250, 59, 91, 54, 245, - 233, 235, 219, 239, 102, 211, 61, 212, 0, 17, 202, 84, 17, 105, 17, 108, - 17, 147, 17, 149, 17, 170, 17, 195, 17, 213, 111, 17, 199, 17, 222, 63, - 245, 242, 213, 143, 227, 179, 54, 241, 35, 54, 237, 247, 54, 217, 47, 82, - 245, 231, 250, 49, 8, 6, 1, 63, 8, 6, 1, 249, 255, 8, 6, 1, 247, 125, 8, - 6, 1, 245, 51, 8, 6, 1, 74, 8, 6, 1, 240, 174, 8, 6, 1, 239, 75, 8, 6, 1, - 237, 171, 8, 6, 1, 75, 8, 6, 1, 230, 184, 8, 6, 1, 230, 54, 8, 6, 1, 159, - 8, 6, 1, 226, 185, 8, 6, 1, 223, 163, 8, 6, 1, 78, 8, 6, 1, 219, 184, 8, - 6, 1, 217, 134, 8, 6, 1, 146, 8, 6, 1, 194, 8, 6, 1, 210, 69, 8, 6, 1, - 68, 8, 6, 1, 206, 164, 8, 6, 1, 204, 144, 8, 6, 1, 203, 196, 8, 6, 1, - 203, 124, 8, 6, 1, 202, 159, 49, 51, 155, 216, 74, 212, 0, 50, 51, 155, - 246, 53, 251, 138, 124, 227, 114, 237, 254, 251, 138, 8, 5, 1, 63, 8, 5, - 1, 249, 255, 8, 5, 1, 247, 125, 8, 5, 1, 245, 51, 8, 5, 1, 74, 8, 5, 1, - 240, 174, 8, 5, 1, 239, 75, 8, 5, 1, 237, 171, 8, 5, 1, 75, 8, 5, 1, 230, - 184, 8, 5, 1, 230, 54, 8, 5, 1, 159, 8, 5, 1, 226, 185, 8, 5, 1, 223, - 163, 8, 5, 1, 78, 8, 5, 1, 219, 184, 8, 5, 1, 217, 134, 8, 5, 1, 146, 8, - 5, 1, 194, 8, 5, 1, 210, 69, 8, 5, 1, 68, 8, 5, 1, 206, 164, 8, 5, 1, - 204, 144, 8, 5, 1, 203, 196, 8, 5, 1, 203, 124, 8, 5, 1, 202, 159, 49, - 245, 93, 155, 80, 227, 114, 50, 245, 93, 155, 208, 227, 221, 190, 211, - 228, 230, 239, 240, 212, 82, 246, 220, 54, 218, 20, 54, 245, 92, 54, 203, - 43, 54, 247, 203, 142, 214, 168, 54, 243, 231, 245, 169, 54, 240, 41, - 219, 240, 231, 31, 227, 217, 52, 250, 218, 217, 31, 82, 221, 166, 54, - 212, 7, 235, 220, 216, 129, 54, 225, 170, 244, 55, 54, 218, 75, 54, 210, - 199, 108, 210, 199, 147, 251, 126, 251, 138, 224, 153, 54, 218, 126, 54, - 101, 243, 85, 246, 231, 210, 199, 105, 225, 80, 219, 240, 231, 31, 216, - 11, 52, 250, 218, 217, 31, 82, 204, 161, 239, 138, 118, 217, 55, 204, - 161, 239, 138, 118, 237, 137, 204, 161, 239, 138, 126, 217, 53, 230, 239, - 217, 47, 82, 8, 6, 1, 34, 3, 237, 253, 8, 6, 1, 34, 3, 165, 8, 6, 1, 34, - 3, 246, 52, 8, 6, 1, 34, 3, 208, 227, 8, 6, 1, 34, 3, 243, 231, 8, 6, 1, - 34, 3, 215, 253, 55, 8, 6, 1, 251, 109, 8, 6, 1, 247, 126, 3, 246, 231, - 8, 6, 1, 188, 3, 237, 253, 8, 6, 1, 188, 3, 165, 8, 6, 1, 188, 3, 246, - 52, 8, 6, 1, 188, 3, 243, 231, 8, 6, 1, 235, 206, 3, 237, 253, 8, 6, 1, - 235, 206, 3, 165, 8, 6, 1, 235, 206, 3, 246, 52, 8, 6, 1, 235, 206, 3, - 243, 231, 8, 6, 1, 240, 243, 8, 6, 1, 223, 164, 3, 208, 227, 8, 6, 1, - 158, 3, 237, 253, 8, 6, 1, 158, 3, 165, 8, 6, 1, 158, 3, 246, 52, 8, 6, - 1, 158, 3, 208, 227, 8, 6, 1, 158, 3, 243, 231, 223, 224, 54, 8, 6, 1, - 158, 3, 95, 8, 6, 1, 106, 3, 237, 253, 8, 6, 1, 106, 3, 165, 8, 6, 1, - 106, 3, 246, 52, 8, 6, 1, 106, 3, 243, 231, 8, 6, 1, 203, 125, 3, 165, 8, - 6, 1, 209, 40, 8, 5, 1, 213, 57, 194, 8, 5, 1, 34, 3, 237, 253, 8, 5, 1, - 34, 3, 165, 8, 5, 1, 34, 3, 246, 52, 8, 5, 1, 34, 3, 208, 227, 8, 5, 1, - 34, 3, 243, 231, 8, 5, 1, 34, 3, 215, 253, 55, 8, 5, 1, 251, 109, 8, 5, - 1, 247, 126, 3, 246, 231, 8, 5, 1, 188, 3, 237, 253, 8, 5, 1, 188, 3, - 165, 8, 5, 1, 188, 3, 246, 52, 8, 5, 1, 188, 3, 243, 231, 8, 5, 1, 235, - 206, 3, 237, 253, 8, 5, 1, 235, 206, 3, 165, 8, 5, 1, 235, 206, 3, 246, - 52, 8, 5, 1, 235, 206, 3, 243, 231, 8, 5, 1, 240, 243, 8, 5, 1, 223, 164, - 3, 208, 227, 8, 5, 1, 158, 3, 237, 253, 8, 5, 1, 158, 3, 165, 8, 5, 1, - 158, 3, 246, 52, 8, 5, 1, 158, 3, 208, 227, 8, 5, 1, 158, 3, 243, 231, - 243, 137, 54, 8, 5, 1, 158, 3, 95, 8, 5, 1, 106, 3, 237, 253, 8, 5, 1, - 106, 3, 165, 8, 5, 1, 106, 3, 246, 52, 8, 5, 1, 106, 3, 243, 231, 8, 5, - 1, 203, 125, 3, 165, 8, 5, 1, 209, 40, 8, 5, 1, 203, 125, 3, 243, 231, 8, - 6, 1, 34, 3, 225, 170, 8, 5, 1, 34, 3, 225, 170, 8, 6, 1, 34, 3, 247, - 214, 8, 5, 1, 34, 3, 247, 214, 8, 6, 1, 34, 3, 220, 62, 8, 5, 1, 34, 3, - 220, 62, 8, 6, 1, 247, 126, 3, 165, 8, 5, 1, 247, 126, 3, 165, 8, 6, 1, - 247, 126, 3, 246, 52, 8, 5, 1, 247, 126, 3, 246, 52, 8, 6, 1, 247, 126, - 3, 70, 55, 8, 5, 1, 247, 126, 3, 70, 55, 8, 6, 1, 247, 126, 3, 247, 29, - 8, 5, 1, 247, 126, 3, 247, 29, 8, 6, 1, 245, 52, 3, 247, 29, 8, 5, 1, - 245, 52, 3, 247, 29, 8, 6, 1, 245, 52, 3, 95, 8, 5, 1, 245, 52, 3, 95, 8, - 6, 1, 188, 3, 225, 170, 8, 5, 1, 188, 3, 225, 170, 8, 6, 1, 188, 3, 247, - 214, 8, 5, 1, 188, 3, 247, 214, 8, 6, 1, 188, 3, 70, 55, 8, 5, 1, 188, 3, - 70, 55, 8, 6, 1, 188, 3, 220, 62, 8, 5, 1, 188, 3, 220, 62, 8, 6, 1, 188, - 3, 247, 29, 8, 5, 1, 188, 3, 247, 29, 8, 6, 1, 239, 76, 3, 246, 52, 8, 5, - 1, 239, 76, 3, 246, 52, 8, 6, 1, 239, 76, 3, 247, 214, 8, 5, 1, 239, 76, - 3, 247, 214, 8, 6, 1, 239, 76, 3, 70, 55, 8, 5, 1, 239, 76, 3, 70, 55, 8, - 6, 1, 239, 76, 3, 246, 231, 8, 5, 1, 239, 76, 3, 246, 231, 8, 6, 1, 237, - 172, 3, 246, 52, 8, 5, 1, 237, 172, 3, 246, 52, 8, 6, 1, 237, 172, 3, 95, - 8, 5, 1, 237, 172, 3, 95, 8, 6, 1, 235, 206, 3, 208, 227, 8, 5, 1, 235, - 206, 3, 208, 227, 8, 6, 1, 235, 206, 3, 225, 170, 8, 5, 1, 235, 206, 3, - 225, 170, 8, 6, 1, 235, 206, 3, 247, 214, 8, 5, 1, 235, 206, 3, 247, 214, - 8, 6, 1, 235, 206, 3, 220, 62, 8, 5, 1, 235, 206, 3, 220, 62, 8, 6, 1, - 235, 206, 3, 70, 55, 8, 5, 1, 243, 84, 75, 8, 6, 32, 231, 81, 8, 5, 32, - 231, 81, 8, 6, 1, 230, 185, 3, 246, 52, 8, 5, 1, 230, 185, 3, 246, 52, 8, - 6, 1, 230, 55, 3, 246, 231, 8, 5, 1, 230, 55, 3, 246, 231, 8, 5, 1, 228, - 231, 8, 6, 1, 228, 131, 3, 165, 8, 5, 1, 228, 131, 3, 165, 8, 6, 1, 228, - 131, 3, 246, 231, 8, 5, 1, 228, 131, 3, 246, 231, 8, 6, 1, 228, 131, 3, - 247, 29, 8, 5, 1, 228, 131, 3, 247, 29, 8, 6, 1, 228, 131, 3, 101, 243, - 85, 8, 5, 1, 228, 131, 3, 101, 243, 85, 8, 6, 1, 228, 131, 3, 95, 8, 5, - 1, 228, 131, 3, 95, 8, 6, 1, 223, 164, 3, 165, 8, 5, 1, 223, 164, 3, 165, - 8, 6, 1, 223, 164, 3, 246, 231, 8, 5, 1, 223, 164, 3, 246, 231, 8, 6, 1, - 223, 164, 3, 247, 29, 8, 5, 1, 223, 164, 3, 247, 29, 8, 5, 1, 223, 164, - 217, 251, 247, 137, 250, 160, 8, 6, 1, 241, 78, 8, 5, 1, 241, 78, 8, 6, - 1, 158, 3, 225, 170, 8, 5, 1, 158, 3, 225, 170, 8, 6, 1, 158, 3, 247, - 214, 8, 5, 1, 158, 3, 247, 214, 8, 6, 1, 158, 3, 52, 165, 8, 5, 1, 158, - 3, 52, 165, 8, 6, 32, 220, 73, 8, 5, 32, 220, 73, 8, 6, 1, 217, 1, 3, - 165, 8, 5, 1, 217, 1, 3, 165, 8, 6, 1, 217, 1, 3, 246, 231, 8, 5, 1, 217, - 1, 3, 246, 231, 8, 6, 1, 217, 1, 3, 247, 29, 8, 5, 1, 217, 1, 3, 247, 29, - 8, 6, 1, 215, 94, 3, 165, 8, 5, 1, 215, 94, 3, 165, 8, 6, 1, 215, 94, 3, - 246, 52, 8, 5, 1, 215, 94, 3, 246, 52, 8, 6, 1, 215, 94, 3, 246, 231, 8, - 5, 1, 215, 94, 3, 246, 231, 8, 6, 1, 215, 94, 3, 247, 29, 8, 5, 1, 215, - 94, 3, 247, 29, 8, 6, 1, 210, 70, 3, 246, 231, 8, 5, 1, 210, 70, 3, 246, - 231, 8, 6, 1, 210, 70, 3, 247, 29, 8, 5, 1, 210, 70, 3, 247, 29, 8, 6, 1, - 210, 70, 3, 95, 8, 5, 1, 210, 70, 3, 95, 8, 6, 1, 106, 3, 208, 227, 8, 5, - 1, 106, 3, 208, 227, 8, 6, 1, 106, 3, 225, 170, 8, 5, 1, 106, 3, 225, - 170, 8, 6, 1, 106, 3, 247, 214, 8, 5, 1, 106, 3, 247, 214, 8, 6, 1, 106, - 3, 215, 253, 55, 8, 5, 1, 106, 3, 215, 253, 55, 8, 6, 1, 106, 3, 52, 165, - 8, 5, 1, 106, 3, 52, 165, 8, 6, 1, 106, 3, 220, 62, 8, 5, 1, 106, 3, 220, - 62, 8, 6, 1, 204, 145, 3, 246, 52, 8, 5, 1, 204, 145, 3, 246, 52, 8, 6, - 1, 203, 125, 3, 246, 52, 8, 5, 1, 203, 125, 3, 246, 52, 8, 6, 1, 203, - 125, 3, 243, 231, 8, 6, 1, 202, 160, 3, 165, 8, 5, 1, 202, 160, 3, 165, - 8, 6, 1, 202, 160, 3, 70, 55, 8, 5, 1, 202, 160, 3, 70, 55, 8, 6, 1, 202, - 160, 3, 247, 29, 8, 5, 1, 202, 160, 3, 247, 29, 8, 5, 1, 163, 194, 8, 5, - 1, 66, 3, 95, 8, 6, 1, 66, 3, 113, 8, 6, 1, 66, 3, 208, 142, 8, 5, 1, 66, - 3, 208, 142, 8, 6, 1, 143, 195, 8, 5, 1, 143, 195, 8, 6, 1, 171, 78, 8, - 6, 1, 247, 126, 3, 113, 8, 5, 1, 247, 126, 3, 113, 8, 6, 1, 251, 84, 245, - 51, 8, 6, 1, 245, 52, 3, 113, 8, 6, 1, 245, 52, 3, 208, 142, 8, 5, 1, - 245, 52, 3, 208, 142, 8, 5, 1, 207, 174, 244, 37, 8, 6, 1, 216, 73, 74, - 8, 6, 1, 214, 192, 8, 6, 1, 171, 74, 8, 6, 1, 240, 175, 3, 113, 8, 5, 1, - 240, 175, 3, 113, 8, 6, 1, 239, 76, 3, 113, 8, 6, 1, 238, 235, 8, 5, 1, - 235, 255, 8, 6, 1, 230, 230, 8, 6, 1, 235, 206, 3, 95, 8, 6, 1, 230, 55, - 3, 113, 8, 5, 1, 230, 55, 3, 113, 8, 5, 1, 228, 131, 3, 142, 8, 5, 1, - 228, 26, 3, 95, 8, 6, 1, 207, 174, 226, 185, 8, 6, 1, 223, 164, 3, 49, - 113, 8, 5, 1, 223, 164, 3, 163, 50, 227, 210, 8, 6, 1, 158, 3, 101, 208, - 227, 8, 6, 1, 158, 3, 236, 53, 8, 5, 1, 158, 3, 236, 53, 8, 6, 1, 220, - 57, 8, 5, 1, 220, 57, 8, 6, 1, 219, 185, 3, 113, 8, 5, 1, 219, 185, 3, - 113, 8, 1, 202, 216, 8, 6, 1, 143, 108, 8, 5, 1, 143, 108, 8, 6, 1, 241, - 7, 8, 1, 216, 73, 241, 8, 227, 14, 8, 5, 1, 210, 70, 3, 219, 142, 113, 8, - 6, 1, 210, 70, 3, 113, 8, 5, 1, 210, 70, 3, 113, 8, 6, 1, 210, 70, 3, - 216, 79, 113, 8, 6, 1, 106, 3, 236, 53, 8, 5, 1, 106, 3, 236, 53, 8, 6, - 1, 206, 216, 8, 6, 1, 206, 165, 3, 113, 8, 6, 1, 203, 125, 3, 113, 8, 5, - 1, 203, 125, 3, 113, 8, 6, 1, 202, 160, 3, 95, 8, 5, 1, 202, 160, 3, 95, - 8, 6, 1, 240, 177, 8, 6, 1, 240, 178, 216, 72, 8, 5, 1, 240, 178, 216, - 72, 8, 5, 1, 240, 178, 3, 209, 248, 8, 1, 120, 3, 95, 8, 6, 1, 143, 170, - 8, 5, 1, 143, 170, 8, 1, 230, 239, 238, 45, 211, 62, 3, 95, 8, 1, 203, - 199, 8, 1, 244, 30, 246, 27, 8, 1, 227, 254, 246, 27, 8, 1, 250, 248, - 246, 27, 8, 1, 216, 79, 246, 27, 8, 6, 1, 242, 1, 3, 247, 29, 8, 6, 1, - 245, 52, 3, 5, 1, 202, 160, 3, 247, 29, 8, 5, 1, 242, 1, 3, 247, 29, 8, - 6, 1, 227, 81, 8, 6, 1, 228, 131, 3, 5, 1, 230, 184, 8, 5, 1, 227, 81, 8, - 6, 1, 222, 49, 8, 6, 1, 223, 164, 3, 5, 1, 230, 184, 8, 5, 1, 222, 49, 8, - 6, 1, 34, 3, 247, 29, 8, 5, 1, 34, 3, 247, 29, 8, 6, 1, 235, 206, 3, 247, - 29, 8, 5, 1, 235, 206, 3, 247, 29, 8, 6, 1, 158, 3, 247, 29, 8, 5, 1, - 158, 3, 247, 29, 8, 6, 1, 106, 3, 247, 29, 8, 5, 1, 106, 3, 247, 29, 8, - 6, 1, 106, 3, 243, 232, 25, 225, 170, 8, 5, 1, 106, 3, 243, 232, 25, 225, - 170, 8, 6, 1, 106, 3, 243, 232, 25, 165, 8, 5, 1, 106, 3, 243, 232, 25, - 165, 8, 6, 1, 106, 3, 243, 232, 25, 247, 29, 8, 5, 1, 106, 3, 243, 232, - 25, 247, 29, 8, 6, 1, 106, 3, 243, 232, 25, 237, 253, 8, 5, 1, 106, 3, - 243, 232, 25, 237, 253, 8, 5, 1, 207, 174, 74, 8, 6, 1, 34, 3, 243, 232, - 25, 225, 170, 8, 5, 1, 34, 3, 243, 232, 25, 225, 170, 8, 6, 1, 34, 3, 70, - 87, 25, 225, 170, 8, 5, 1, 34, 3, 70, 87, 25, 225, 170, 8, 6, 1, 251, - 110, 3, 225, 170, 8, 5, 1, 251, 110, 3, 225, 170, 8, 6, 1, 239, 76, 3, - 95, 8, 5, 1, 239, 76, 3, 95, 8, 6, 1, 239, 76, 3, 247, 29, 8, 5, 1, 239, - 76, 3, 247, 29, 8, 6, 1, 230, 55, 3, 247, 29, 8, 5, 1, 230, 55, 3, 247, - 29, 8, 6, 1, 158, 3, 220, 62, 8, 5, 1, 158, 3, 220, 62, 8, 6, 1, 158, 3, - 220, 63, 25, 225, 170, 8, 5, 1, 158, 3, 220, 63, 25, 225, 170, 8, 6, 1, - 240, 178, 3, 247, 29, 8, 5, 1, 240, 178, 3, 247, 29, 8, 5, 1, 230, 185, - 3, 247, 29, 8, 6, 1, 242, 0, 8, 6, 1, 245, 52, 3, 5, 1, 202, 159, 8, 5, - 1, 242, 0, 8, 6, 1, 239, 76, 3, 165, 8, 5, 1, 239, 76, 3, 165, 8, 6, 1, - 235, 252, 8, 6, 1, 203, 199, 8, 6, 1, 223, 164, 3, 237, 253, 8, 5, 1, - 223, 164, 3, 237, 253, 8, 6, 1, 34, 3, 215, 253, 87, 25, 165, 8, 5, 1, - 34, 3, 215, 253, 87, 25, 165, 8, 6, 1, 251, 110, 3, 165, 8, 5, 1, 251, - 110, 3, 165, 8, 6, 1, 158, 3, 211, 32, 25, 165, 8, 5, 1, 158, 3, 211, 32, - 25, 165, 8, 6, 1, 34, 3, 52, 237, 253, 8, 5, 1, 34, 3, 52, 237, 253, 8, - 6, 1, 34, 3, 230, 239, 247, 214, 8, 5, 1, 34, 3, 230, 239, 247, 214, 8, - 6, 1, 188, 3, 52, 237, 253, 8, 5, 1, 188, 3, 52, 237, 253, 8, 6, 1, 188, - 3, 230, 239, 247, 214, 8, 5, 1, 188, 3, 230, 239, 247, 214, 8, 6, 1, 235, - 206, 3, 52, 237, 253, 8, 5, 1, 235, 206, 3, 52, 237, 253, 8, 6, 1, 235, - 206, 3, 230, 239, 247, 214, 8, 5, 1, 235, 206, 3, 230, 239, 247, 214, 8, - 6, 1, 158, 3, 52, 237, 253, 8, 5, 1, 158, 3, 52, 237, 253, 8, 6, 1, 158, - 3, 230, 239, 247, 214, 8, 5, 1, 158, 3, 230, 239, 247, 214, 8, 6, 1, 217, - 1, 3, 52, 237, 253, 8, 5, 1, 217, 1, 3, 52, 237, 253, 8, 6, 1, 217, 1, 3, - 230, 239, 247, 214, 8, 5, 1, 217, 1, 3, 230, 239, 247, 214, 8, 6, 1, 106, - 3, 52, 237, 253, 8, 5, 1, 106, 3, 52, 237, 253, 8, 6, 1, 106, 3, 230, - 239, 247, 214, 8, 5, 1, 106, 3, 230, 239, 247, 214, 8, 6, 1, 215, 94, 3, - 245, 234, 56, 8, 5, 1, 215, 94, 3, 245, 234, 56, 8, 6, 1, 210, 70, 3, - 245, 234, 56, 8, 5, 1, 210, 70, 3, 245, 234, 56, 8, 6, 1, 202, 234, 8, 5, - 1, 202, 234, 8, 6, 1, 237, 172, 3, 247, 29, 8, 5, 1, 237, 172, 3, 247, - 29, 8, 6, 1, 223, 164, 3, 163, 50, 227, 210, 8, 5, 1, 245, 52, 3, 245, - 95, 8, 6, 1, 219, 216, 8, 5, 1, 219, 216, 8, 6, 1, 202, 160, 3, 113, 8, - 5, 1, 202, 160, 3, 113, 8, 6, 1, 34, 3, 70, 55, 8, 5, 1, 34, 3, 70, 55, - 8, 6, 1, 188, 3, 246, 231, 8, 5, 1, 188, 3, 246, 231, 8, 6, 1, 158, 3, - 243, 232, 25, 225, 170, 8, 5, 1, 158, 3, 243, 232, 25, 225, 170, 8, 6, 1, - 158, 3, 208, 228, 25, 225, 170, 8, 5, 1, 158, 3, 208, 228, 25, 225, 170, - 8, 6, 1, 158, 3, 70, 55, 8, 5, 1, 158, 3, 70, 55, 8, 6, 1, 158, 3, 70, - 87, 25, 225, 170, 8, 5, 1, 158, 3, 70, 87, 25, 225, 170, 8, 6, 1, 203, - 125, 3, 225, 170, 8, 5, 1, 203, 125, 3, 225, 170, 8, 5, 1, 228, 131, 3, - 245, 95, 8, 5, 1, 223, 164, 3, 245, 95, 8, 5, 1, 210, 70, 3, 245, 95, 8, - 5, 1, 243, 84, 230, 184, 8, 5, 1, 244, 130, 243, 191, 8, 5, 1, 217, 66, - 243, 191, 8, 6, 1, 34, 3, 95, 8, 6, 1, 247, 126, 3, 95, 8, 5, 1, 247, - 126, 3, 95, 8, 6, 1, 228, 131, 3, 142, 8, 6, 1, 210, 70, 3, 243, 228, 95, - 8, 5, 1, 215, 94, 3, 210, 169, 209, 248, 8, 5, 1, 202, 160, 3, 210, 169, - 209, 248, 8, 6, 1, 238, 45, 211, 61, 8, 5, 1, 238, 45, 211, 61, 8, 6, 1, - 66, 3, 95, 8, 6, 1, 106, 142, 8, 6, 1, 207, 174, 206, 164, 8, 6, 1, 188, - 3, 95, 8, 5, 1, 188, 3, 95, 8, 6, 1, 230, 185, 3, 95, 8, 5, 1, 230, 185, - 3, 95, 8, 6, 1, 5, 217, 135, 3, 236, 116, 209, 248, 8, 5, 1, 217, 135, 3, - 236, 116, 209, 248, 8, 6, 1, 217, 1, 3, 95, 8, 5, 1, 217, 1, 3, 95, 8, 6, - 1, 203, 125, 3, 95, 8, 5, 1, 203, 125, 3, 95, 8, 5, 1, 207, 174, 63, 8, - 5, 1, 251, 2, 8, 5, 1, 207, 174, 251, 2, 8, 5, 1, 66, 3, 113, 8, 5, 1, - 171, 78, 8, 5, 1, 247, 126, 3, 245, 95, 8, 5, 1, 245, 52, 3, 209, 248, 8, - 5, 1, 245, 52, 3, 113, 8, 5, 1, 216, 73, 74, 8, 5, 1, 214, 192, 8, 5, 1, - 214, 193, 3, 113, 8, 5, 1, 171, 74, 8, 5, 1, 216, 73, 171, 74, 8, 5, 1, - 216, 73, 171, 188, 3, 113, 8, 5, 1, 246, 16, 216, 73, 171, 74, 8, 5, 1, - 243, 84, 230, 185, 3, 95, 8, 5, 1, 239, 76, 3, 113, 8, 5, 1, 132, 239, - 75, 8, 1, 5, 6, 239, 75, 8, 5, 1, 238, 235, 8, 5, 1, 216, 182, 236, 53, - 8, 5, 1, 207, 174, 237, 171, 8, 5, 1, 237, 172, 3, 113, 8, 5, 1, 237, 32, - 3, 113, 8, 5, 1, 235, 206, 3, 95, 8, 5, 1, 230, 230, 8, 1, 5, 6, 75, 8, - 5, 1, 228, 131, 3, 101, 208, 227, 8, 5, 1, 228, 131, 3, 248, 124, 8, 5, - 1, 228, 131, 3, 216, 79, 113, 8, 5, 1, 227, 164, 8, 5, 1, 207, 174, 226, - 185, 8, 5, 1, 207, 174, 226, 186, 3, 163, 227, 210, 8, 5, 1, 226, 186, 3, - 113, 8, 5, 1, 223, 164, 3, 49, 113, 8, 5, 1, 223, 164, 3, 216, 79, 113, - 8, 1, 5, 6, 223, 163, 8, 5, 1, 248, 225, 78, 8, 1, 5, 6, 220, 73, 8, 5, - 1, 246, 16, 220, 36, 8, 5, 1, 218, 192, 8, 5, 1, 207, 174, 146, 8, 5, 1, - 207, 174, 217, 1, 3, 163, 227, 210, 8, 5, 1, 207, 174, 217, 1, 3, 113, 8, - 5, 1, 217, 1, 3, 163, 227, 210, 8, 5, 1, 217, 1, 3, 209, 248, 8, 5, 1, - 217, 1, 3, 239, 240, 8, 5, 1, 216, 73, 217, 1, 3, 239, 240, 8, 1, 5, 6, - 146, 8, 1, 5, 6, 230, 239, 146, 8, 5, 1, 215, 94, 3, 113, 8, 5, 1, 241, - 7, 8, 5, 1, 243, 84, 230, 185, 3, 211, 32, 25, 113, 8, 5, 1, 211, 174, - 216, 73, 241, 7, 8, 5, 1, 241, 8, 3, 245, 95, 8, 5, 1, 207, 174, 210, 69, - 8, 5, 1, 210, 70, 3, 216, 79, 113, 8, 5, 1, 106, 142, 8, 5, 1, 206, 216, - 8, 5, 1, 206, 165, 3, 113, 8, 5, 1, 207, 174, 206, 164, 8, 5, 1, 207, - 174, 204, 144, 8, 5, 1, 207, 174, 203, 124, 8, 1, 5, 6, 203, 124, 8, 5, - 1, 202, 160, 3, 216, 79, 113, 8, 5, 1, 202, 160, 3, 245, 95, 8, 5, 1, - 240, 177, 8, 5, 1, 240, 178, 3, 245, 95, 8, 1, 238, 45, 211, 61, 8, 1, - 218, 199, 205, 186, 239, 126, 8, 1, 230, 239, 238, 45, 211, 61, 8, 1, - 211, 40, 247, 125, 8, 1, 248, 70, 246, 27, 8, 1, 5, 6, 249, 255, 8, 5, 1, - 246, 16, 171, 74, 8, 1, 5, 6, 239, 76, 3, 113, 8, 1, 5, 6, 237, 171, 8, - 5, 1, 230, 185, 3, 245, 126, 8, 5, 1, 207, 174, 230, 54, 8, 1, 5, 6, 159, - 8, 5, 1, 217, 135, 3, 113, 8, 1, 238, 45, 211, 62, 3, 95, 8, 1, 216, 73, - 238, 45, 211, 62, 3, 95, 8, 5, 1, 242, 1, 243, 191, 8, 5, 1, 244, 3, 243, - 191, 8, 5, 1, 242, 1, 243, 192, 3, 245, 95, 8, 5, 1, 208, 22, 243, 191, - 8, 5, 1, 209, 137, 243, 191, 8, 5, 1, 209, 194, 243, 192, 3, 245, 95, 8, - 5, 1, 240, 39, 243, 191, 8, 5, 1, 226, 241, 243, 191, 8, 5, 1, 226, 187, - 243, 191, 8, 1, 248, 70, 218, 245, 8, 1, 248, 78, 218, 245, 8, 5, 1, 207, - 174, 237, 172, 3, 239, 240, 8, 5, 1, 207, 174, 237, 172, 3, 239, 241, 25, - 209, 248, 65, 1, 5, 237, 171, 65, 1, 5, 237, 172, 3, 113, 65, 1, 5, 230, - 184, 65, 1, 5, 146, 65, 1, 5, 207, 174, 146, 65, 1, 5, 207, 174, 217, 1, - 3, 113, 65, 1, 5, 6, 230, 239, 146, 65, 1, 5, 204, 144, 65, 1, 5, 203, - 124, 65, 1, 217, 236, 65, 1, 52, 217, 236, 65, 1, 207, 174, 245, 233, 65, - 1, 250, 160, 65, 1, 216, 73, 245, 233, 65, 1, 50, 162, 215, 252, 65, 1, - 49, 162, 215, 252, 65, 1, 238, 45, 211, 61, 65, 1, 216, 73, 238, 45, 211, - 61, 65, 1, 49, 250, 94, 65, 1, 50, 250, 94, 65, 1, 112, 250, 94, 65, 1, - 121, 250, 94, 65, 1, 246, 53, 251, 138, 247, 29, 65, 1, 80, 227, 114, 65, - 1, 225, 170, 65, 1, 251, 126, 251, 138, 65, 1, 237, 254, 251, 138, 65, 1, - 124, 80, 227, 114, 65, 1, 124, 225, 170, 65, 1, 124, 237, 254, 251, 138, - 65, 1, 124, 251, 126, 251, 138, 65, 1, 208, 82, 245, 242, 65, 1, 162, - 208, 82, 245, 242, 65, 1, 246, 216, 50, 162, 215, 252, 65, 1, 246, 216, - 49, 162, 215, 252, 65, 1, 112, 210, 3, 65, 1, 121, 210, 3, 65, 1, 91, 54, - 65, 1, 224, 103, 54, 247, 214, 70, 55, 215, 253, 55, 220, 62, 5, 208, - 227, 52, 251, 126, 251, 138, 65, 1, 216, 58, 113, 65, 1, 245, 131, 251, - 138, 65, 1, 5, 238, 235, 65, 1, 5, 159, 65, 1, 5, 194, 65, 1, 5, 203, - 196, 65, 1, 5, 216, 73, 238, 45, 211, 61, 65, 1, 240, 198, 143, 142, 65, - 1, 138, 143, 142, 65, 1, 224, 150, 143, 142, 65, 1, 124, 143, 142, 65, 1, - 240, 197, 143, 142, 65, 1, 203, 1, 244, 27, 143, 82, 65, 1, 203, 77, 244, - 27, 143, 82, 65, 1, 205, 184, 65, 1, 206, 251, 65, 1, 52, 250, 160, 65, - 1, 124, 121, 250, 94, 65, 1, 124, 112, 250, 94, 65, 1, 124, 49, 250, 94, - 65, 1, 124, 50, 250, 94, 65, 1, 124, 215, 252, 65, 1, 101, 237, 254, 251, - 138, 65, 1, 101, 52, 237, 254, 251, 138, 65, 1, 101, 52, 251, 126, 251, - 138, 65, 1, 124, 208, 227, 65, 1, 216, 188, 245, 242, 65, 1, 248, 142, - 138, 208, 161, 65, 1, 241, 84, 138, 208, 161, 65, 1, 248, 142, 124, 208, - 161, 65, 1, 241, 84, 124, 208, 161, 65, 1, 213, 34, 65, 1, 171, 213, 34, - 65, 1, 124, 49, 47, 39, 237, 254, 251, 138, 39, 251, 126, 251, 138, 39, - 246, 53, 251, 138, 39, 208, 227, 39, 225, 170, 39, 219, 198, 39, 247, - 214, 39, 70, 55, 39, 243, 231, 39, 236, 116, 55, 39, 215, 253, 55, 39, - 52, 251, 126, 251, 138, 39, 247, 29, 39, 80, 227, 115, 55, 39, 52, 80, - 227, 115, 55, 39, 52, 237, 254, 251, 138, 39, 247, 52, 39, 230, 239, 247, - 214, 39, 207, 174, 245, 234, 55, 39, 245, 234, 55, 39, 216, 73, 245, 234, - 55, 39, 245, 234, 87, 216, 16, 39, 237, 254, 251, 139, 56, 39, 251, 126, - 251, 139, 56, 39, 49, 210, 4, 56, 39, 50, 210, 4, 56, 39, 49, 250, 218, - 55, 39, 236, 53, 39, 49, 162, 215, 253, 56, 39, 112, 210, 4, 56, 39, 121, - 210, 4, 56, 39, 91, 2, 56, 39, 224, 103, 2, 56, 39, 219, 140, 236, 116, - 56, 39, 216, 79, 236, 116, 56, 39, 70, 56, 39, 243, 232, 56, 39, 215, - 253, 56, 39, 245, 234, 56, 39, 246, 231, 39, 220, 62, 39, 80, 227, 115, - 56, 39, 247, 208, 56, 39, 230, 239, 52, 250, 127, 56, 39, 247, 30, 56, - 39, 246, 53, 251, 139, 56, 39, 247, 215, 56, 39, 230, 239, 247, 215, 56, - 39, 208, 228, 56, 39, 225, 171, 56, 39, 124, 227, 114, 39, 52, 124, 227, - 114, 39, 208, 228, 219, 199, 39, 212, 228, 211, 32, 219, 199, 39, 163, - 211, 32, 219, 199, 39, 212, 228, 212, 1, 219, 199, 39, 163, 212, 1, 219, - 199, 39, 50, 162, 215, 253, 56, 39, 230, 239, 247, 208, 56, 39, 51, 56, - 39, 214, 176, 56, 39, 203, 197, 55, 39, 80, 208, 227, 39, 52, 219, 198, - 39, 237, 254, 143, 82, 39, 251, 126, 143, 82, 39, 30, 218, 239, 39, 30, - 228, 252, 39, 30, 243, 225, 208, 149, 39, 30, 202, 221, 39, 247, 208, 55, - 39, 241, 35, 2, 56, 39, 52, 80, 227, 115, 56, 39, 49, 250, 218, 56, 39, - 221, 166, 208, 228, 55, 39, 236, 122, 55, 39, 251, 7, 156, 208, 173, 55, - 39, 49, 50, 53, 56, 39, 177, 53, 56, 39, 238, 4, 230, 96, 39, 50, 250, - 95, 55, 39, 49, 162, 215, 253, 55, 39, 240, 36, 39, 203, 197, 56, 39, 49, - 250, 95, 56, 39, 50, 250, 95, 56, 39, 50, 250, 95, 25, 112, 250, 95, 56, - 39, 50, 162, 215, 253, 55, 39, 70, 87, 216, 16, 39, 250, 60, 56, 39, 52, - 215, 253, 56, 39, 202, 30, 55, 39, 52, 247, 215, 56, 39, 52, 247, 214, - 39, 52, 225, 170, 39, 52, 225, 171, 56, 39, 52, 208, 227, 39, 52, 230, - 239, 247, 214, 39, 52, 86, 53, 56, 39, 8, 5, 1, 63, 39, 8, 5, 1, 74, 39, - 8, 5, 1, 75, 39, 8, 5, 1, 78, 39, 8, 5, 1, 68, 39, 8, 5, 1, 247, 125, 39, - 8, 5, 1, 245, 51, 39, 8, 5, 1, 237, 171, 39, 8, 5, 1, 226, 185, 39, 8, 5, - 1, 146, 39, 8, 5, 1, 210, 69, 39, 8, 5, 1, 206, 164, 39, 8, 5, 1, 203, - 196, 30, 6, 1, 237, 20, 30, 5, 1, 237, 20, 30, 6, 1, 250, 126, 214, 246, - 30, 5, 1, 250, 126, 214, 246, 30, 221, 44, 54, 30, 226, 251, 221, 44, 54, - 30, 6, 1, 219, 126, 243, 199, 30, 5, 1, 219, 126, 243, 199, 30, 202, 221, - 30, 5, 216, 73, 226, 221, 212, 145, 97, 30, 5, 242, 83, 226, 221, 212, - 145, 97, 30, 5, 216, 73, 242, 83, 226, 221, 212, 145, 97, 30, 217, 47, - 82, 30, 6, 1, 202, 227, 30, 208, 149, 30, 243, 225, 208, 149, 30, 6, 1, - 251, 3, 3, 208, 149, 30, 250, 203, 209, 163, 30, 6, 1, 241, 38, 3, 208, - 149, 30, 6, 1, 240, 249, 3, 208, 149, 30, 6, 1, 230, 231, 3, 208, 149, - 30, 6, 1, 220, 35, 3, 208, 149, 30, 6, 1, 206, 217, 3, 208, 149, 30, 6, - 1, 220, 37, 3, 208, 149, 30, 5, 1, 230, 231, 3, 243, 225, 25, 208, 149, - 30, 6, 1, 251, 2, 30, 6, 1, 248, 106, 30, 6, 1, 238, 235, 30, 6, 1, 244, - 37, 30, 6, 1, 241, 37, 30, 6, 1, 202, 83, 30, 6, 1, 240, 248, 30, 6, 1, - 209, 74, 30, 6, 1, 230, 230, 30, 6, 1, 229, 247, 30, 6, 1, 228, 24, 30, - 6, 1, 223, 246, 30, 6, 1, 221, 84, 30, 6, 1, 203, 170, 30, 6, 1, 220, 34, - 30, 6, 1, 218, 167, 30, 6, 1, 216, 59, 30, 6, 1, 212, 144, 30, 6, 1, 209, - 207, 30, 6, 1, 206, 216, 30, 6, 1, 218, 192, 30, 6, 1, 246, 142, 30, 6, - 1, 217, 202, 30, 6, 1, 220, 36, 30, 6, 1, 230, 231, 3, 243, 224, 30, 6, - 1, 206, 217, 3, 243, 224, 30, 5, 1, 251, 3, 3, 208, 149, 30, 5, 1, 241, - 38, 3, 208, 149, 30, 5, 1, 240, 249, 3, 208, 149, 30, 5, 1, 230, 231, 3, - 208, 149, 30, 5, 1, 206, 217, 3, 243, 225, 25, 208, 149, 30, 5, 1, 251, - 2, 30, 5, 1, 248, 106, 30, 5, 1, 238, 235, 30, 5, 1, 244, 37, 30, 5, 1, - 241, 37, 30, 5, 1, 202, 83, 30, 5, 1, 240, 248, 30, 5, 1, 209, 74, 30, 5, - 1, 230, 230, 30, 5, 1, 229, 247, 30, 5, 1, 228, 24, 30, 5, 1, 223, 246, - 30, 5, 1, 221, 84, 30, 5, 1, 203, 170, 30, 5, 1, 220, 34, 30, 5, 1, 218, - 167, 30, 5, 1, 216, 59, 30, 5, 1, 46, 212, 144, 30, 5, 1, 212, 144, 30, - 5, 1, 209, 207, 30, 5, 1, 206, 216, 30, 5, 1, 218, 192, 30, 5, 1, 246, - 142, 30, 5, 1, 217, 202, 30, 5, 1, 220, 36, 30, 5, 1, 230, 231, 3, 243, - 224, 30, 5, 1, 206, 217, 3, 243, 224, 30, 5, 1, 220, 35, 3, 208, 149, 30, - 5, 1, 206, 217, 3, 208, 149, 30, 5, 1, 220, 37, 3, 208, 149, 30, 6, 230, - 19, 97, 30, 248, 107, 97, 30, 209, 75, 97, 30, 206, 217, 3, 236, 116, 97, - 30, 206, 217, 3, 251, 126, 25, 236, 116, 97, 30, 206, 217, 3, 243, 232, - 25, 236, 116, 97, 30, 218, 193, 97, 30, 218, 168, 97, 30, 230, 19, 97, - 30, 1, 250, 126, 229, 0, 30, 5, 1, 250, 126, 229, 0, 30, 1, 211, 71, 30, - 5, 1, 211, 71, 30, 1, 243, 199, 30, 5, 1, 243, 199, 30, 1, 229, 0, 30, 5, - 1, 229, 0, 30, 1, 214, 246, 30, 5, 1, 214, 246, 84, 6, 1, 213, 35, 84, 5, - 1, 213, 35, 84, 6, 1, 240, 45, 84, 5, 1, 240, 45, 84, 6, 1, 229, 127, 84, - 5, 1, 229, 127, 84, 6, 1, 236, 107, 84, 5, 1, 236, 107, 84, 6, 1, 238, - 230, 84, 5, 1, 238, 230, 84, 6, 1, 213, 1, 84, 5, 1, 213, 1, 84, 6, 1, - 244, 52, 84, 5, 1, 244, 52, 30, 229, 248, 97, 30, 216, 60, 97, 30, 226, - 221, 212, 145, 97, 30, 1, 202, 227, 30, 6, 209, 75, 97, 30, 226, 221, - 241, 38, 97, 30, 216, 73, 226, 221, 241, 38, 97, 30, 6, 1, 212, 242, 30, - 5, 1, 212, 242, 30, 6, 226, 221, 212, 145, 97, 30, 6, 1, 214, 243, 30, 5, - 1, 214, 243, 30, 216, 60, 3, 211, 32, 97, 30, 6, 216, 73, 226, 221, 212, - 145, 97, 30, 6, 242, 83, 226, 221, 212, 145, 97, 30, 6, 216, 73, 242, 83, - 226, 221, 212, 145, 97, 36, 6, 1, 231, 111, 3, 237, 253, 36, 6, 1, 230, - 234, 36, 6, 1, 243, 130, 36, 6, 1, 238, 52, 36, 6, 1, 207, 11, 231, 110, - 36, 6, 1, 241, 252, 36, 6, 1, 247, 135, 75, 36, 6, 1, 203, 11, 36, 6, 1, - 230, 161, 36, 6, 1, 227, 80, 36, 6, 1, 222, 41, 36, 6, 1, 208, 8, 36, 6, - 1, 229, 49, 36, 6, 1, 235, 206, 3, 237, 253, 36, 6, 1, 212, 228, 68, 36, - 6, 1, 241, 248, 36, 6, 1, 63, 36, 6, 1, 248, 162, 36, 6, 1, 206, 55, 36, - 6, 1, 238, 105, 36, 6, 1, 244, 75, 36, 6, 1, 231, 110, 36, 6, 1, 202, 71, - 36, 6, 1, 202, 92, 36, 6, 1, 75, 36, 6, 1, 212, 228, 75, 36, 6, 1, 173, - 36, 6, 1, 241, 122, 36, 6, 1, 241, 103, 36, 6, 1, 241, 92, 36, 6, 1, 78, - 36, 6, 1, 219, 34, 36, 6, 1, 241, 28, 36, 6, 1, 241, 17, 36, 6, 1, 209, - 187, 36, 6, 1, 68, 36, 6, 1, 241, 154, 36, 6, 1, 152, 36, 6, 1, 208, 14, - 36, 6, 1, 246, 170, 36, 6, 1, 213, 90, 36, 6, 1, 213, 46, 36, 6, 1, 237, - 91, 54, 36, 6, 1, 203, 30, 36, 6, 1, 212, 7, 54, 36, 6, 1, 74, 36, 6, 1, - 202, 213, 36, 6, 1, 198, 36, 5, 1, 63, 36, 5, 1, 248, 162, 36, 5, 1, 206, - 55, 36, 5, 1, 238, 105, 36, 5, 1, 244, 75, 36, 5, 1, 231, 110, 36, 5, 1, - 202, 71, 36, 5, 1, 202, 92, 36, 5, 1, 75, 36, 5, 1, 212, 228, 75, 36, 5, - 1, 173, 36, 5, 1, 241, 122, 36, 5, 1, 241, 103, 36, 5, 1, 241, 92, 36, 5, - 1, 78, 36, 5, 1, 219, 34, 36, 5, 1, 241, 28, 36, 5, 1, 241, 17, 36, 5, 1, - 209, 187, 36, 5, 1, 68, 36, 5, 1, 241, 154, 36, 5, 1, 152, 36, 5, 1, 208, - 14, 36, 5, 1, 246, 170, 36, 5, 1, 213, 90, 36, 5, 1, 213, 46, 36, 5, 1, - 237, 91, 54, 36, 5, 1, 203, 30, 36, 5, 1, 212, 7, 54, 36, 5, 1, 74, 36, - 5, 1, 202, 213, 36, 5, 1, 198, 36, 5, 1, 231, 111, 3, 237, 253, 36, 5, 1, - 230, 234, 36, 5, 1, 243, 130, 36, 5, 1, 238, 52, 36, 5, 1, 207, 11, 231, - 110, 36, 5, 1, 241, 252, 36, 5, 1, 247, 135, 75, 36, 5, 1, 203, 11, 36, - 5, 1, 230, 161, 36, 5, 1, 227, 80, 36, 5, 1, 222, 41, 36, 5, 1, 208, 8, - 36, 5, 1, 229, 49, 36, 5, 1, 235, 206, 3, 237, 253, 36, 5, 1, 212, 228, - 68, 36, 5, 1, 241, 248, 36, 6, 1, 220, 36, 36, 5, 1, 220, 36, 36, 6, 1, - 203, 66, 36, 5, 1, 203, 66, 36, 6, 1, 230, 228, 74, 36, 5, 1, 230, 228, - 74, 36, 6, 1, 227, 86, 202, 183, 36, 5, 1, 227, 86, 202, 183, 36, 6, 1, - 230, 228, 227, 86, 202, 183, 36, 5, 1, 230, 228, 227, 86, 202, 183, 36, - 6, 1, 248, 73, 202, 183, 36, 5, 1, 248, 73, 202, 183, 36, 6, 1, 230, 228, - 248, 73, 202, 183, 36, 5, 1, 230, 228, 248, 73, 202, 183, 36, 6, 1, 228, - 225, 36, 5, 1, 228, 225, 36, 6, 1, 217, 202, 36, 5, 1, 217, 202, 36, 6, - 1, 239, 235, 36, 5, 1, 239, 235, 36, 6, 1, 230, 186, 36, 5, 1, 230, 186, - 36, 6, 1, 230, 187, 3, 52, 237, 254, 251, 138, 36, 5, 1, 230, 187, 3, 52, - 237, 254, 251, 138, 36, 6, 1, 207, 14, 36, 5, 1, 207, 14, 36, 6, 1, 215, - 191, 220, 36, 36, 5, 1, 215, 191, 220, 36, 36, 6, 1, 220, 37, 3, 208, - 197, 36, 5, 1, 220, 37, 3, 208, 197, 36, 6, 1, 219, 224, 36, 5, 1, 219, - 224, 36, 6, 1, 229, 0, 36, 5, 1, 229, 0, 36, 209, 35, 54, 39, 36, 208, - 197, 39, 36, 219, 141, 39, 36, 244, 142, 218, 71, 39, 36, 217, 196, 218, - 71, 39, 36, 218, 55, 39, 36, 236, 12, 209, 35, 54, 39, 36, 224, 114, 54, - 36, 6, 1, 212, 228, 235, 206, 3, 209, 248, 36, 5, 1, 212, 228, 235, 206, - 3, 209, 248, 36, 6, 1, 213, 139, 54, 36, 5, 1, 213, 139, 54, 36, 6, 1, - 241, 29, 3, 208, 254, 36, 5, 1, 241, 29, 3, 208, 254, 36, 6, 1, 238, 106, - 3, 206, 215, 36, 5, 1, 238, 106, 3, 206, 215, 36, 6, 1, 238, 106, 3, 95, - 36, 5, 1, 238, 106, 3, 95, 36, 6, 1, 238, 106, 3, 101, 113, 36, 5, 1, - 238, 106, 3, 101, 113, 36, 6, 1, 202, 72, 3, 244, 20, 36, 5, 1, 202, 72, - 3, 244, 20, 36, 6, 1, 202, 93, 3, 244, 20, 36, 5, 1, 202, 93, 3, 244, 20, - 36, 6, 1, 230, 44, 3, 244, 20, 36, 5, 1, 230, 44, 3, 244, 20, 36, 6, 1, - 230, 44, 3, 80, 95, 36, 5, 1, 230, 44, 3, 80, 95, 36, 6, 1, 230, 44, 3, - 95, 36, 5, 1, 230, 44, 3, 95, 36, 6, 1, 248, 214, 173, 36, 5, 1, 248, - 214, 173, 36, 6, 1, 241, 93, 3, 244, 20, 36, 5, 1, 241, 93, 3, 244, 20, - 36, 6, 32, 241, 93, 238, 105, 36, 5, 32, 241, 93, 238, 105, 36, 6, 1, - 219, 35, 3, 101, 113, 36, 5, 1, 219, 35, 3, 101, 113, 36, 6, 1, 251, 145, - 152, 36, 5, 1, 251, 145, 152, 36, 6, 1, 241, 18, 3, 244, 20, 36, 5, 1, - 241, 18, 3, 244, 20, 36, 6, 1, 209, 188, 3, 244, 20, 36, 5, 1, 209, 188, - 3, 244, 20, 36, 6, 1, 211, 53, 68, 36, 5, 1, 211, 53, 68, 36, 6, 1, 211, - 53, 106, 3, 95, 36, 5, 1, 211, 53, 106, 3, 95, 36, 6, 1, 237, 160, 3, - 244, 20, 36, 5, 1, 237, 160, 3, 244, 20, 36, 6, 32, 209, 188, 208, 14, - 36, 5, 32, 209, 188, 208, 14, 36, 6, 1, 246, 171, 3, 244, 20, 36, 5, 1, - 246, 171, 3, 244, 20, 36, 6, 1, 246, 171, 3, 80, 95, 36, 5, 1, 246, 171, - 3, 80, 95, 36, 6, 1, 213, 12, 36, 5, 1, 213, 12, 36, 6, 1, 251, 145, 246, - 170, 36, 5, 1, 251, 145, 246, 170, 36, 6, 1, 251, 145, 246, 171, 3, 244, - 20, 36, 5, 1, 251, 145, 246, 171, 3, 244, 20, 36, 1, 219, 133, 36, 6, 1, - 202, 72, 3, 247, 214, 36, 5, 1, 202, 72, 3, 247, 214, 36, 6, 1, 230, 44, - 3, 113, 36, 5, 1, 230, 44, 3, 113, 36, 6, 1, 241, 123, 3, 209, 248, 36, - 5, 1, 241, 123, 3, 209, 248, 36, 6, 1, 241, 93, 3, 113, 36, 5, 1, 241, - 93, 3, 113, 36, 6, 1, 241, 93, 3, 209, 248, 36, 5, 1, 241, 93, 3, 209, - 248, 36, 6, 1, 229, 138, 246, 170, 36, 5, 1, 229, 138, 246, 170, 36, 6, - 1, 241, 104, 3, 209, 248, 36, 5, 1, 241, 104, 3, 209, 248, 36, 5, 1, 219, - 133, 36, 6, 1, 34, 3, 247, 214, 36, 5, 1, 34, 3, 247, 214, 36, 6, 1, 34, - 3, 243, 231, 36, 5, 1, 34, 3, 243, 231, 36, 6, 32, 34, 231, 110, 36, 5, - 32, 34, 231, 110, 36, 6, 1, 231, 111, 3, 247, 214, 36, 5, 1, 231, 111, 3, - 247, 214, 36, 6, 1, 214, 192, 36, 5, 1, 214, 192, 36, 6, 1, 214, 193, 3, - 243, 231, 36, 5, 1, 214, 193, 3, 243, 231, 36, 6, 1, 202, 72, 3, 243, - 231, 36, 5, 1, 202, 72, 3, 243, 231, 36, 6, 1, 202, 93, 3, 243, 231, 36, - 5, 1, 202, 93, 3, 243, 231, 36, 6, 1, 251, 145, 241, 252, 36, 5, 1, 251, - 145, 241, 252, 36, 6, 1, 235, 206, 3, 225, 170, 36, 5, 1, 235, 206, 3, - 225, 170, 36, 6, 1, 235, 206, 3, 243, 231, 36, 5, 1, 235, 206, 3, 243, - 231, 36, 6, 1, 158, 3, 243, 231, 36, 5, 1, 158, 3, 243, 231, 36, 6, 1, - 248, 225, 78, 36, 5, 1, 248, 225, 78, 36, 6, 1, 248, 225, 158, 3, 243, - 231, 36, 5, 1, 248, 225, 158, 3, 243, 231, 36, 6, 1, 188, 3, 243, 231, - 36, 5, 1, 188, 3, 243, 231, 36, 6, 1, 106, 3, 225, 170, 36, 5, 1, 106, 3, - 225, 170, 36, 6, 1, 106, 3, 243, 231, 36, 5, 1, 106, 3, 243, 231, 36, 6, - 1, 106, 3, 52, 165, 36, 5, 1, 106, 3, 52, 165, 36, 6, 1, 246, 171, 3, - 243, 231, 36, 5, 1, 246, 171, 3, 243, 231, 36, 6, 1, 238, 106, 3, 244, - 20, 36, 5, 1, 238, 106, 3, 244, 20, 36, 6, 1, 203, 31, 3, 243, 231, 36, - 5, 1, 203, 31, 3, 243, 231, 36, 6, 1, 238, 106, 3, 211, 32, 25, 113, 36, - 5, 1, 238, 106, 3, 211, 32, 25, 113, 36, 6, 1, 237, 160, 3, 113, 36, 5, - 1, 237, 160, 3, 113, 36, 6, 1, 237, 160, 3, 95, 36, 5, 1, 237, 160, 3, - 95, 36, 6, 1, 229, 10, 244, 75, 36, 5, 1, 229, 10, 244, 75, 36, 6, 1, - 229, 10, 243, 130, 36, 5, 1, 229, 10, 243, 130, 36, 6, 1, 229, 10, 202, - 21, 36, 5, 1, 229, 10, 202, 21, 36, 6, 1, 229, 10, 241, 244, 36, 5, 1, - 229, 10, 241, 244, 36, 6, 1, 229, 10, 227, 80, 36, 5, 1, 229, 10, 227, - 80, 36, 6, 1, 229, 10, 222, 41, 36, 5, 1, 229, 10, 222, 41, 36, 6, 1, - 229, 10, 212, 71, 36, 5, 1, 229, 10, 212, 71, 36, 6, 1, 229, 10, 208, - 191, 36, 5, 1, 229, 10, 208, 191, 36, 6, 1, 216, 73, 202, 92, 36, 5, 1, - 216, 73, 202, 92, 36, 6, 1, 241, 123, 3, 113, 36, 5, 1, 241, 123, 3, 113, - 36, 6, 1, 227, 161, 36, 5, 1, 227, 161, 36, 6, 1, 216, 61, 36, 5, 1, 216, - 61, 36, 6, 1, 203, 99, 36, 5, 1, 203, 99, 36, 6, 1, 217, 126, 36, 5, 1, - 217, 126, 36, 6, 1, 204, 62, 36, 5, 1, 204, 62, 36, 6, 1, 251, 26, 173, - 36, 5, 1, 251, 26, 173, 36, 6, 1, 241, 123, 3, 101, 113, 36, 5, 1, 241, - 123, 3, 101, 113, 36, 6, 1, 241, 93, 3, 101, 113, 36, 5, 1, 241, 93, 3, - 101, 113, 36, 6, 1, 219, 35, 3, 244, 20, 36, 5, 1, 219, 35, 3, 244, 20, - 36, 6, 1, 213, 13, 3, 244, 20, 36, 5, 1, 213, 13, 3, 244, 20, 36, 6, 1, - 241, 93, 3, 49, 113, 36, 5, 1, 241, 93, 3, 49, 113, 36, 6, 1, 241, 237, - 36, 5, 1, 241, 237, 36, 6, 1, 244, 124, 36, 5, 1, 244, 124, 36, 6, 1, - 241, 123, 3, 244, 20, 36, 5, 1, 241, 123, 3, 244, 20, 178, 6, 1, 250, 5, - 178, 6, 1, 248, 122, 178, 6, 1, 238, 69, 178, 6, 1, 244, 212, 178, 6, 1, - 241, 167, 178, 6, 1, 202, 116, 178, 6, 1, 241, 147, 178, 6, 1, 240, 250, - 178, 6, 1, 135, 178, 6, 1, 202, 71, 178, 6, 1, 231, 19, 178, 6, 1, 227, - 83, 178, 6, 1, 203, 174, 178, 6, 1, 247, 92, 178, 6, 1, 229, 180, 178, 6, - 1, 236, 136, 178, 6, 1, 230, 181, 178, 6, 1, 238, 116, 178, 6, 1, 246, - 160, 178, 6, 1, 224, 240, 178, 6, 1, 203, 11, 178, 6, 1, 221, 152, 178, - 6, 1, 213, 90, 178, 6, 1, 205, 189, 178, 6, 1, 246, 199, 178, 6, 1, 219, - 16, 178, 6, 1, 230, 144, 178, 6, 1, 216, 220, 178, 6, 1, 214, 155, 178, - 6, 1, 205, 234, 178, 6, 1, 208, 194, 178, 6, 1, 216, 122, 178, 6, 1, 245, - 254, 178, 6, 1, 202, 252, 178, 6, 1, 218, 102, 178, 6, 1, 229, 191, 178, - 6, 1, 220, 60, 178, 6, 1, 240, 47, 178, 65, 1, 49, 162, 215, 252, 178, - 250, 160, 178, 241, 96, 82, 178, 240, 212, 82, 178, 245, 233, 178, 217, - 47, 82, 178, 251, 146, 82, 178, 5, 1, 250, 5, 178, 5, 1, 248, 122, 178, - 5, 1, 238, 69, 178, 5, 1, 244, 212, 178, 5, 1, 241, 167, 178, 5, 1, 202, - 116, 178, 5, 1, 241, 147, 178, 5, 1, 240, 250, 178, 5, 1, 135, 178, 5, 1, - 202, 71, 178, 5, 1, 231, 19, 178, 5, 1, 227, 83, 178, 5, 1, 203, 174, - 178, 5, 1, 247, 92, 178, 5, 1, 229, 180, 178, 5, 1, 236, 136, 178, 5, 1, - 230, 181, 178, 5, 1, 238, 116, 178, 5, 1, 246, 160, 178, 5, 1, 224, 240, - 178, 5, 1, 203, 11, 178, 5, 1, 221, 152, 178, 5, 1, 213, 90, 178, 5, 1, - 205, 189, 178, 5, 1, 246, 199, 178, 5, 1, 219, 16, 178, 5, 1, 230, 144, - 178, 5, 1, 216, 220, 178, 5, 1, 214, 155, 178, 5, 1, 205, 234, 178, 5, 1, - 208, 194, 178, 5, 1, 216, 122, 178, 5, 1, 245, 254, 178, 5, 1, 202, 252, - 178, 5, 1, 218, 102, 178, 5, 1, 229, 191, 178, 5, 1, 220, 60, 178, 5, 1, - 240, 47, 178, 5, 32, 241, 168, 202, 252, 178, 239, 102, 211, 61, 178, - 235, 220, 216, 15, 178, 240, 246, 54, 227, 221, 178, 240, 246, 54, 178, - 242, 60, 54, 110, 251, 139, 240, 241, 110, 251, 139, 214, 156, 110, 251, - 139, 213, 69, 110, 251, 139, 202, 103, 217, 109, 110, 251, 139, 202, 103, - 238, 254, 110, 251, 139, 208, 209, 110, 251, 139, 216, 70, 110, 251, 139, - 202, 101, 110, 251, 139, 219, 61, 110, 251, 139, 203, 23, 110, 251, 139, - 209, 115, 110, 251, 139, 238, 167, 110, 251, 139, 238, 168, 223, 208, - 110, 251, 139, 238, 165, 110, 251, 139, 217, 110, 219, 90, 110, 251, 139, - 209, 158, 238, 183, 110, 251, 139, 219, 40, 110, 251, 139, 250, 43, 237, - 152, 110, 251, 139, 223, 218, 110, 251, 139, 225, 145, 110, 251, 139, - 224, 229, 110, 251, 139, 224, 230, 229, 192, 110, 251, 139, 244, 151, - 110, 251, 139, 217, 121, 110, 251, 139, 209, 158, 217, 104, 110, 251, - 139, 203, 33, 248, 123, 202, 233, 110, 251, 139, 220, 43, 110, 251, 139, - 231, 69, 110, 251, 139, 244, 53, 110, 251, 139, 202, 28, 110, 131, 225, - 75, 246, 61, 110, 218, 63, 213, 15, 110, 218, 63, 237, 82, 214, 156, 110, - 218, 63, 237, 82, 219, 54, 110, 218, 63, 237, 82, 217, 114, 110, 218, 63, - 236, 232, 110, 218, 63, 208, 11, 110, 218, 63, 214, 156, 110, 218, 63, - 219, 54, 110, 218, 63, 217, 114, 110, 218, 63, 236, 128, 110, 218, 63, - 236, 129, 237, 84, 35, 206, 59, 110, 218, 63, 217, 51, 110, 218, 63, 244, - 198, 219, 245, 225, 105, 110, 218, 63, 224, 219, 110, 217, 179, 225, 102, - 110, 218, 63, 216, 200, 110, 217, 179, 219, 63, 110, 218, 63, 213, 0, - 243, 85, 110, 218, 63, 212, 124, 243, 85, 110, 217, 179, 212, 8, 219, 56, - 110, 131, 206, 221, 243, 85, 110, 131, 226, 251, 243, 85, 110, 217, 179, - 221, 41, 237, 151, 110, 218, 63, 217, 115, 217, 109, 110, 1, 251, 30, - 110, 1, 248, 108, 110, 1, 238, 67, 110, 1, 244, 178, 110, 1, 237, 67, - 110, 1, 206, 59, 110, 1, 202, 95, 110, 1, 237, 21, 110, 1, 209, 132, 110, - 1, 202, 236, 110, 1, 46, 230, 22, 110, 1, 230, 22, 110, 1, 228, 20, 110, - 1, 46, 224, 247, 110, 1, 224, 247, 110, 1, 46, 221, 40, 110, 1, 221, 40, - 110, 1, 214, 249, 110, 1, 250, 3, 110, 1, 46, 219, 34, 110, 1, 219, 34, - 110, 1, 46, 208, 15, 110, 1, 208, 15, 110, 1, 217, 74, 110, 1, 216, 91, - 110, 1, 212, 255, 110, 1, 209, 203, 110, 32, 203, 9, 52, 206, 59, 110, - 32, 203, 9, 206, 60, 202, 236, 110, 32, 203, 9, 52, 202, 236, 110, 217, - 179, 238, 167, 110, 217, 179, 238, 165, 10, 42, 54, 10, 2, 214, 242, 10, - 239, 170, 225, 88, 10, 2, 215, 24, 10, 2, 214, 245, 10, 42, 131, 55, 250, - 140, 245, 106, 215, 204, 250, 140, 239, 140, 215, 204, 10, 216, 165, 250, - 140, 218, 247, 224, 116, 54, 250, 140, 218, 247, 209, 153, 209, 37, 54, - 251, 86, 54, 10, 245, 233, 10, 244, 138, 213, 130, 10, 218, 65, 206, 40, - 54, 10, 2, 224, 95, 10, 2, 215, 3, 251, 33, 204, 86, 10, 2, 251, 33, 250, - 64, 10, 2, 216, 198, 251, 32, 10, 2, 216, 206, 251, 12, 250, 210, 10, 2, - 209, 240, 10, 5, 138, 209, 251, 10, 5, 138, 32, 137, 3, 228, 29, 3, 203, - 47, 10, 5, 138, 202, 107, 10, 5, 240, 71, 10, 5, 244, 172, 10, 5, 229, - 229, 10, 213, 143, 10, 1, 82, 10, 208, 70, 70, 217, 179, 82, 10, 217, 47, - 82, 10, 1, 229, 233, 203, 47, 10, 1, 237, 127, 10, 1, 137, 3, 225, 166, - 55, 10, 1, 137, 3, 237, 128, 55, 10, 1, 204, 71, 3, 237, 128, 55, 10, 1, - 137, 3, 237, 128, 56, 10, 1, 89, 3, 237, 128, 55, 10, 1, 251, 30, 10, 1, - 248, 138, 10, 1, 209, 170, 225, 98, 10, 1, 209, 169, 10, 1, 209, 88, 10, - 1, 230, 158, 10, 1, 237, 148, 10, 1, 229, 140, 10, 1, 244, 184, 10, 1, - 209, 100, 10, 1, 216, 122, 10, 1, 202, 107, 10, 1, 214, 161, 10, 1, 213, - 39, 10, 1, 215, 28, 10, 1, 244, 207, 10, 1, 209, 251, 10, 1, 202, 110, - 10, 1, 251, 59, 10, 1, 238, 114, 10, 1, 229, 190, 3, 120, 187, 55, 10, 1, - 229, 190, 3, 126, 187, 56, 10, 1, 240, 75, 89, 3, 230, 239, 206, 164, 10, - 1, 240, 75, 89, 3, 120, 187, 55, 10, 1, 240, 75, 89, 3, 126, 187, 55, 10, - 209, 209, 10, 1, 240, 47, 10, 1, 217, 119, 10, 1, 230, 22, 10, 1, 228, - 28, 10, 1, 225, 5, 10, 1, 221, 178, 10, 1, 237, 43, 10, 1, 204, 70, 10, - 1, 137, 225, 129, 10, 1, 203, 47, 10, 240, 69, 10, 244, 170, 10, 229, - 227, 10, 240, 71, 10, 244, 172, 10, 229, 229, 10, 213, 80, 10, 210, 222, - 10, 225, 164, 55, 10, 237, 128, 55, 10, 237, 128, 56, 10, 210, 246, 251, - 30, 10, 230, 239, 244, 172, 10, 131, 221, 179, 238, 85, 10, 201, 248, 10, - 22, 2, 5, 206, 165, 55, 10, 22, 2, 230, 239, 5, 206, 165, 55, 10, 22, 2, - 70, 56, 10, 216, 73, 244, 172, 10, 240, 72, 3, 120, 243, 83, 10, 204, 72, - 237, 128, 56, 250, 140, 17, 202, 84, 250, 140, 17, 105, 250, 140, 17, - 108, 250, 140, 17, 147, 250, 140, 17, 149, 250, 140, 17, 170, 250, 140, - 17, 195, 250, 140, 17, 213, 111, 250, 140, 17, 199, 250, 140, 17, 222, - 63, 10, 218, 246, 54, 10, 244, 68, 213, 130, 10, 209, 35, 213, 130, 10, - 239, 233, 218, 61, 211, 94, 10, 1, 243, 84, 248, 138, 10, 1, 243, 84, - 217, 119, 10, 1, 210, 199, 251, 30, 10, 1, 137, 204, 87, 10, 1, 137, 3, - 204, 72, 237, 128, 55, 10, 1, 137, 3, 204, 72, 237, 128, 56, 10, 1, 138, - 237, 127, 10, 1, 138, 237, 128, 251, 30, 10, 1, 138, 237, 128, 204, 70, - 10, 1, 106, 3, 237, 128, 55, 10, 1, 138, 237, 128, 203, 47, 10, 1, 207, - 233, 10, 1, 207, 231, 10, 1, 248, 148, 10, 1, 209, 170, 3, 215, 252, 10, - 1, 209, 170, 3, 126, 187, 87, 242, 68, 10, 1, 219, 16, 10, 1, 209, 167, - 10, 1, 248, 136, 10, 1, 151, 3, 237, 128, 55, 10, 1, 151, 3, 120, 187, - 80, 55, 10, 1, 220, 254, 10, 1, 242, 5, 10, 1, 151, 3, 126, 187, 55, 10, - 1, 209, 191, 10, 1, 209, 189, 10, 1, 244, 115, 10, 1, 244, 185, 3, 215, - 252, 10, 1, 244, 185, 3, 70, 56, 10, 1, 244, 185, 3, 70, 248, 126, 25, 5, - 209, 251, 10, 1, 244, 191, 10, 1, 244, 117, 10, 1, 242, 33, 10, 1, 244, - 185, 3, 126, 187, 87, 242, 68, 10, 1, 244, 185, 3, 239, 147, 187, 55, 10, - 1, 215, 177, 10, 1, 216, 123, 3, 5, 206, 164, 10, 1, 216, 123, 3, 215, - 252, 10, 1, 216, 123, 3, 70, 56, 10, 1, 216, 123, 3, 5, 206, 165, 56, 10, - 1, 216, 123, 3, 70, 248, 126, 25, 70, 55, 10, 1, 216, 123, 3, 120, 187, - 55, 10, 1, 230, 155, 10, 1, 216, 123, 3, 239, 147, 187, 55, 10, 1, 214, - 162, 3, 70, 248, 126, 25, 70, 55, 10, 1, 214, 162, 3, 126, 187, 56, 10, - 1, 214, 162, 3, 126, 187, 248, 126, 25, 126, 187, 55, 10, 1, 215, 29, 3, - 120, 187, 56, 10, 1, 215, 29, 3, 126, 187, 55, 10, 1, 209, 252, 3, 126, - 187, 55, 10, 1, 251, 60, 3, 126, 187, 55, 10, 1, 243, 84, 240, 47, 10, 1, - 240, 48, 3, 70, 224, 5, 56, 10, 1, 240, 48, 3, 70, 56, 10, 1, 206, 48, - 10, 1, 240, 48, 3, 126, 187, 56, 10, 1, 219, 14, 10, 1, 217, 120, 3, 70, - 55, 10, 1, 217, 120, 3, 126, 187, 55, 10, 1, 229, 189, 10, 1, 210, 169, - 230, 22, 10, 1, 230, 23, 3, 215, 252, 10, 1, 230, 23, 3, 70, 55, 10, 1, - 222, 205, 10, 1, 230, 23, 3, 126, 187, 56, 10, 1, 238, 251, 10, 1, 238, - 252, 3, 215, 252, 10, 1, 222, 126, 10, 1, 238, 252, 3, 120, 187, 56, 10, - 1, 237, 217, 10, 1, 238, 252, 3, 126, 187, 55, 10, 1, 228, 29, 3, 5, 206, - 164, 10, 1, 228, 29, 3, 70, 55, 10, 1, 228, 29, 3, 126, 187, 55, 10, 1, - 228, 29, 3, 126, 187, 56, 10, 1, 221, 179, 3, 70, 56, 10, 1, 221, 179, - 238, 85, 10, 1, 215, 230, 10, 1, 221, 179, 3, 215, 252, 10, 1, 221, 179, - 3, 126, 187, 55, 10, 1, 237, 44, 243, 109, 10, 1, 209, 192, 3, 70, 55, - 10, 1, 237, 44, 3, 89, 55, 10, 1, 237, 44, 238, 36, 10, 1, 237, 44, 238, - 37, 3, 237, 128, 55, 10, 1, 209, 170, 225, 99, 238, 36, 10, 1, 204, 71, - 3, 215, 252, 10, 1, 229, 76, 220, 73, 10, 1, 220, 73, 10, 1, 68, 10, 1, - 202, 213, 10, 1, 229, 76, 202, 213, 10, 1, 204, 71, 3, 120, 187, 55, 10, - 1, 206, 55, 10, 1, 240, 75, 203, 47, 10, 1, 89, 3, 209, 248, 10, 1, 89, - 3, 5, 206, 164, 10, 1, 204, 71, 3, 70, 55, 10, 1, 74, 10, 1, 89, 3, 126, - 187, 56, 10, 1, 89, 248, 223, 10, 1, 89, 248, 224, 3, 237, 128, 55, 10, - 239, 102, 211, 61, 10, 1, 251, 109, 10, 5, 138, 32, 215, 29, 3, 228, 29, - 3, 137, 225, 129, 10, 5, 138, 32, 217, 120, 3, 228, 29, 3, 137, 225, 129, - 10, 5, 138, 83, 81, 18, 10, 5, 138, 228, 29, 251, 30, 10, 5, 138, 230, - 158, 10, 5, 138, 126, 243, 83, 10, 5, 138, 214, 161, 10, 241, 84, 76, - 250, 7, 10, 211, 90, 76, 215, 143, 241, 123, 236, 227, 10, 5, 138, 215, - 189, 202, 84, 10, 5, 138, 206, 219, 216, 142, 202, 84, 10, 5, 138, 243, - 84, 237, 65, 76, 229, 140, 10, 5, 138, 83, 64, 18, 10, 5, 124, 214, 161, - 10, 5, 138, 225, 165, 10, 5, 204, 70, 10, 5, 203, 47, 10, 5, 138, 203, - 47, 10, 5, 138, 221, 178, 10, 218, 97, 76, 215, 14, 10, 241, 94, 246, - 218, 124, 211, 61, 10, 241, 94, 246, 218, 138, 211, 61, 10, 215, 189, - 138, 211, 62, 3, 240, 8, 246, 217, 10, 5, 124, 225, 5, 10, 1, 244, 185, - 3, 230, 239, 206, 164, 10, 1, 216, 123, 3, 230, 239, 206, 164, 240, 202, - 250, 140, 17, 202, 84, 240, 202, 250, 140, 17, 105, 240, 202, 250, 140, - 17, 108, 240, 202, 250, 140, 17, 147, 240, 202, 250, 140, 17, 149, 240, - 202, 250, 140, 17, 170, 240, 202, 250, 140, 17, 195, 240, 202, 250, 140, - 17, 213, 111, 240, 202, 250, 140, 17, 199, 240, 202, 250, 140, 17, 222, - 63, 10, 1, 213, 40, 3, 70, 56, 10, 1, 244, 208, 3, 70, 56, 10, 1, 238, - 115, 3, 70, 56, 10, 2, 212, 123, 250, 235, 10, 2, 212, 123, 218, 27, 224, - 240, 10, 1, 237, 44, 3, 230, 239, 206, 164, 210, 89, 241, 84, 76, 219, - 88, 210, 89, 210, 195, 239, 102, 211, 61, 210, 89, 210, 248, 239, 102, - 211, 61, 210, 89, 210, 195, 245, 242, 210, 89, 210, 248, 245, 242, 210, - 89, 236, 106, 245, 242, 210, 89, 245, 243, 212, 68, 227, 222, 210, 89, - 245, 243, 212, 68, 216, 16, 210, 89, 210, 195, 245, 243, 212, 68, 227, - 222, 210, 89, 210, 248, 245, 243, 212, 68, 216, 16, 210, 89, 245, 186, - 210, 89, 237, 89, 220, 91, 210, 89, 237, 89, 224, 217, 210, 89, 237, 89, - 250, 61, 210, 89, 251, 146, 82, 210, 89, 1, 251, 35, 210, 89, 1, 210, - 199, 251, 35, 210, 89, 1, 248, 105, 210, 89, 1, 238, 241, 210, 89, 1, - 238, 242, 238, 219, 210, 89, 1, 244, 181, 210, 89, 1, 243, 84, 244, 182, - 215, 246, 210, 89, 1, 237, 67, 210, 89, 1, 204, 70, 210, 89, 1, 202, 107, - 210, 89, 1, 237, 19, 210, 89, 1, 209, 128, 210, 89, 1, 209, 129, 238, - 219, 210, 89, 1, 202, 200, 210, 89, 1, 202, 201, 237, 67, 210, 89, 1, - 229, 250, 210, 89, 1, 228, 27, 210, 89, 1, 224, 112, 210, 89, 1, 221, 40, - 210, 89, 1, 213, 136, 210, 89, 1, 46, 213, 136, 210, 89, 1, 74, 210, 89, - 1, 219, 34, 210, 89, 1, 216, 73, 219, 34, 210, 89, 1, 215, 26, 210, 89, - 1, 217, 113, 210, 89, 1, 215, 246, 210, 89, 1, 212, 255, 210, 89, 1, 209, - 201, 210, 89, 1, 218, 231, 248, 92, 210, 89, 1, 218, 231, 238, 112, 210, - 89, 1, 218, 231, 243, 252, 210, 89, 217, 192, 55, 210, 89, 217, 192, 56, - 210, 89, 217, 192, 242, 82, 210, 89, 202, 11, 55, 210, 89, 202, 11, 56, - 210, 89, 202, 11, 242, 82, 210, 89, 216, 161, 55, 210, 89, 216, 161, 56, - 210, 89, 242, 83, 202, 18, 236, 105, 210, 89, 242, 83, 202, 18, 250, 211, - 210, 89, 237, 70, 55, 210, 89, 237, 70, 56, 210, 89, 237, 69, 242, 82, - 210, 89, 241, 11, 55, 210, 89, 241, 11, 56, 210, 89, 215, 109, 210, 89, - 240, 41, 243, 85, 210, 89, 217, 25, 210, 89, 215, 137, 210, 89, 120, 80, - 187, 55, 210, 89, 120, 80, 187, 56, 210, 89, 126, 187, 55, 210, 89, 126, - 187, 56, 210, 89, 220, 89, 227, 115, 55, 210, 89, 220, 89, 227, 115, 56, - 210, 89, 223, 194, 210, 89, 248, 222, 210, 89, 1, 212, 4, 202, 78, 210, - 89, 1, 212, 4, 229, 133, 210, 89, 1, 212, 4, 240, 60, 10, 1, 248, 139, 3, - 126, 187, 236, 55, 56, 10, 1, 248, 139, 3, 70, 248, 126, 25, 126, 187, - 55, 10, 1, 248, 139, 3, 126, 187, 218, 59, 177, 56, 10, 1, 248, 139, 3, - 126, 187, 218, 59, 177, 248, 126, 25, 120, 187, 55, 10, 1, 248, 139, 3, - 120, 187, 248, 126, 25, 70, 55, 10, 1, 248, 139, 3, 230, 239, 5, 206, - 165, 56, 10, 1, 248, 139, 3, 5, 206, 164, 10, 1, 151, 3, 120, 187, 55, - 10, 1, 151, 3, 126, 187, 218, 59, 177, 56, 10, 1, 244, 185, 3, 120, 187, - 205, 244, 248, 126, 25, 5, 209, 251, 10, 1, 244, 185, 3, 230, 239, 5, - 206, 165, 56, 10, 1, 216, 123, 3, 95, 10, 1, 214, 162, 3, 239, 147, 187, - 55, 10, 1, 251, 60, 3, 120, 187, 55, 10, 1, 251, 60, 3, 126, 187, 218, - 59, 183, 55, 10, 1, 251, 60, 3, 120, 187, 205, 244, 55, 10, 1, 240, 48, - 3, 120, 187, 56, 10, 1, 240, 48, 3, 126, 187, 218, 59, 177, 56, 10, 1, - 229, 190, 3, 70, 55, 10, 1, 229, 190, 3, 126, 187, 55, 10, 1, 229, 190, - 3, 126, 187, 218, 59, 177, 56, 10, 1, 83, 3, 70, 55, 10, 1, 83, 3, 70, - 56, 10, 1, 221, 179, 3, 120, 187, 56, 10, 1, 221, 179, 3, 5, 209, 251, - 10, 1, 221, 179, 3, 5, 206, 164, 10, 1, 228, 29, 3, 142, 10, 1, 216, 123, - 3, 120, 187, 205, 244, 55, 10, 1, 216, 123, 3, 237, 128, 55, 10, 1, 214, - 162, 3, 120, 187, 205, 244, 55, 10, 1, 151, 3, 5, 10, 1, 209, 252, 56, - 10, 1, 151, 3, 5, 10, 1, 209, 252, 25, 120, 243, 83, 10, 1, 214, 162, 3, - 5, 10, 1, 209, 252, 25, 120, 243, 83, 10, 1, 216, 123, 3, 5, 10, 1, 209, - 252, 25, 120, 243, 83, 10, 1, 151, 3, 5, 10, 1, 209, 252, 55, 10, 1, 137, - 3, 240, 202, 250, 140, 17, 120, 55, 10, 1, 137, 3, 240, 202, 250, 140, - 17, 126, 55, 10, 1, 240, 75, 89, 3, 240, 202, 250, 140, 17, 120, 55, 10, - 1, 240, 75, 89, 3, 240, 202, 250, 140, 17, 126, 55, 10, 1, 240, 75, 89, - 3, 240, 202, 250, 140, 17, 239, 147, 56, 10, 1, 204, 71, 3, 240, 202, - 250, 140, 17, 120, 55, 10, 1, 204, 71, 3, 240, 202, 250, 140, 17, 126, - 55, 10, 1, 89, 248, 224, 3, 240, 202, 250, 140, 17, 120, 55, 10, 1, 89, - 248, 224, 3, 240, 202, 250, 140, 17, 126, 55, 10, 1, 151, 3, 240, 202, - 250, 140, 17, 239, 147, 56, 10, 1, 214, 162, 3, 240, 202, 250, 140, 17, - 239, 147, 55, 10, 1, 214, 162, 3, 230, 239, 206, 164, 10, 1, 230, 23, 3, - 120, 187, 55, 209, 105, 1, 237, 157, 209, 105, 1, 213, 49, 209, 105, 1, - 221, 177, 209, 105, 1, 216, 216, 209, 105, 1, 249, 30, 209, 105, 1, 227, - 158, 209, 105, 1, 230, 37, 209, 105, 1, 251, 19, 209, 105, 1, 206, 84, - 209, 105, 1, 225, 4, 209, 105, 1, 240, 106, 209, 105, 1, 243, 255, 209, - 105, 1, 209, 107, 209, 105, 1, 228, 109, 209, 105, 1, 239, 4, 209, 105, - 1, 238, 42, 209, 105, 1, 214, 160, 209, 105, 1, 244, 136, 209, 105, 1, - 202, 98, 209, 105, 1, 209, 202, 209, 105, 1, 203, 110, 209, 105, 1, 219, - 47, 209, 105, 1, 230, 166, 209, 105, 1, 246, 173, 209, 105, 1, 207, 240, - 209, 105, 1, 237, 11, 209, 105, 1, 229, 143, 209, 105, 1, 209, 106, 209, - 105, 1, 202, 114, 209, 105, 1, 213, 38, 209, 105, 1, 215, 32, 209, 105, - 1, 244, 210, 209, 105, 1, 135, 209, 105, 1, 202, 17, 209, 105, 1, 251, - 56, 209, 105, 1, 238, 113, 209, 105, 1, 217, 123, 209, 105, 1, 204, 109, - 209, 105, 251, 148, 209, 105, 251, 246, 209, 105, 235, 165, 209, 105, - 241, 160, 209, 105, 207, 32, 209, 105, 220, 17, 209, 105, 241, 170, 209, - 105, 240, 193, 209, 105, 220, 88, 209, 105, 220, 96, 209, 105, 210, 222, - 209, 105, 1, 223, 106, 221, 255, 17, 202, 84, 221, 255, 17, 105, 221, - 255, 17, 108, 221, 255, 17, 147, 221, 255, 17, 149, 221, 255, 17, 170, - 221, 255, 17, 195, 221, 255, 17, 213, 111, 221, 255, 17, 199, 221, 255, - 17, 222, 63, 221, 255, 1, 63, 221, 255, 1, 241, 161, 221, 255, 1, 75, - 221, 255, 1, 74, 221, 255, 1, 68, 221, 255, 1, 220, 18, 221, 255, 1, 78, - 221, 255, 1, 244, 199, 221, 255, 1, 223, 163, 221, 255, 1, 249, 32, 221, - 255, 1, 185, 221, 255, 1, 210, 22, 221, 255, 1, 230, 181, 221, 255, 1, - 246, 199, 221, 255, 1, 244, 212, 221, 255, 1, 216, 220, 221, 255, 1, 215, - 185, 221, 255, 1, 215, 36, 221, 255, 1, 238, 207, 221, 255, 1, 240, 108, - 221, 255, 1, 173, 221, 255, 1, 228, 113, 221, 255, 1, 223, 111, 203, 252, - 221, 255, 1, 192, 221, 255, 1, 221, 11, 221, 255, 1, 201, 201, 221, 255, - 1, 152, 221, 255, 1, 204, 111, 221, 255, 1, 198, 221, 255, 1, 221, 12, - 203, 252, 221, 255, 1, 230, 93, 230, 181, 221, 255, 1, 230, 93, 246, 199, - 221, 255, 1, 230, 93, 216, 220, 221, 255, 39, 212, 228, 138, 208, 161, - 221, 255, 39, 212, 228, 124, 208, 161, 221, 255, 39, 212, 228, 215, 245, - 208, 161, 221, 255, 39, 163, 244, 19, 208, 161, 221, 255, 39, 163, 138, - 208, 161, 221, 255, 39, 163, 124, 208, 161, 221, 255, 39, 163, 215, 245, - 208, 161, 221, 255, 39, 223, 71, 82, 221, 255, 39, 52, 70, 55, 221, 255, - 138, 143, 250, 160, 221, 255, 124, 143, 250, 160, 221, 255, 16, 220, 19, - 244, 33, 221, 255, 16, 238, 206, 221, 255, 245, 233, 221, 255, 240, 212, - 82, 221, 255, 228, 84, 214, 252, 1, 251, 37, 214, 252, 1, 248, 51, 214, - 252, 1, 238, 240, 214, 252, 1, 244, 183, 214, 252, 1, 230, 192, 214, 252, - 1, 249, 30, 214, 252, 1, 202, 87, 214, 252, 1, 230, 201, 214, 252, 1, - 208, 200, 214, 252, 1, 202, 182, 214, 252, 1, 230, 38, 214, 252, 1, 228, - 106, 214, 252, 1, 224, 112, 214, 252, 1, 221, 40, 214, 252, 1, 212, 121, - 214, 252, 1, 231, 49, 214, 252, 1, 240, 26, 214, 252, 1, 208, 18, 214, - 252, 1, 217, 44, 214, 252, 1, 215, 246, 214, 252, 1, 213, 66, 214, 252, - 1, 210, 17, 214, 252, 131, 231, 49, 214, 252, 131, 231, 48, 214, 252, - 131, 220, 84, 214, 252, 131, 244, 197, 214, 252, 65, 1, 241, 42, 202, - 182, 214, 252, 131, 241, 42, 202, 182, 214, 252, 22, 2, 163, 74, 214, - 252, 22, 2, 74, 214, 252, 22, 2, 219, 197, 252, 25, 214, 252, 22, 2, 163, - 252, 25, 214, 252, 22, 2, 252, 25, 214, 252, 22, 2, 219, 197, 63, 214, - 252, 22, 2, 163, 63, 214, 252, 22, 2, 63, 214, 252, 65, 1, 212, 228, 63, - 214, 252, 22, 2, 212, 228, 63, 214, 252, 22, 2, 163, 68, 214, 252, 22, 2, - 68, 214, 252, 65, 1, 75, 214, 252, 22, 2, 163, 75, 214, 252, 22, 2, 75, - 214, 252, 22, 2, 78, 214, 252, 22, 2, 210, 222, 214, 252, 131, 222, 223, - 214, 252, 217, 179, 222, 223, 214, 252, 217, 179, 251, 83, 214, 252, 217, - 179, 250, 222, 214, 252, 217, 179, 248, 202, 214, 252, 217, 179, 250, 44, - 214, 252, 217, 179, 212, 243, 214, 252, 251, 146, 82, 214, 252, 217, 179, - 224, 250, 217, 80, 214, 252, 217, 179, 202, 25, 214, 252, 217, 179, 217, - 80, 214, 252, 217, 179, 202, 113, 214, 252, 217, 179, 207, 170, 214, 252, - 217, 179, 250, 111, 214, 252, 217, 179, 212, 8, 225, 77, 214, 252, 217, - 179, 250, 206, 225, 118, 1, 237, 134, 225, 118, 1, 251, 232, 225, 118, 1, - 251, 81, 225, 118, 1, 251, 122, 225, 118, 1, 251, 73, 225, 118, 1, 206, - 184, 225, 118, 1, 250, 1, 225, 118, 1, 230, 201, 225, 118, 1, 250, 41, - 225, 118, 1, 251, 42, 225, 118, 1, 251, 47, 225, 118, 1, 251, 39, 225, - 118, 1, 250, 247, 225, 118, 1, 250, 231, 225, 118, 1, 250, 81, 225, 118, - 1, 231, 49, 225, 118, 1, 250, 175, 225, 118, 1, 250, 51, 225, 118, 1, - 250, 148, 225, 118, 1, 250, 144, 225, 118, 1, 250, 75, 225, 118, 1, 250, - 49, 225, 118, 1, 242, 18, 225, 118, 1, 230, 30, 225, 118, 1, 251, 59, - 225, 118, 251, 87, 82, 225, 118, 205, 187, 82, 225, 118, 238, 179, 82, - 225, 118, 217, 178, 10, 1, 248, 139, 3, 5, 206, 165, 56, 10, 1, 248, 139, - 3, 237, 128, 55, 10, 1, 184, 3, 120, 187, 55, 10, 1, 209, 252, 3, 120, - 187, 55, 10, 1, 240, 48, 3, 70, 248, 126, 25, 126, 187, 55, 10, 1, 217, - 120, 3, 70, 56, 10, 1, 228, 29, 3, 52, 142, 10, 1, 83, 3, 126, 187, 55, - 10, 1, 89, 3, 120, 187, 248, 126, 25, 237, 128, 55, 10, 1, 89, 3, 120, - 187, 248, 126, 25, 70, 55, 10, 1, 216, 123, 3, 227, 14, 10, 1, 204, 71, - 3, 70, 204, 4, 10, 1, 215, 215, 203, 47, 10, 1, 124, 251, 30, 10, 1, 244, - 185, 3, 126, 187, 56, 10, 1, 215, 29, 3, 126, 187, 56, 10, 1, 238, 252, - 3, 230, 239, 95, 10, 1, 211, 53, 204, 70, 10, 1, 202, 108, 3, 230, 239, - 206, 165, 55, 10, 1, 251, 60, 3, 126, 187, 56, 10, 1, 230, 23, 3, 70, 56, - 10, 207, 174, 244, 173, 56, 10, 245, 93, 240, 71, 10, 245, 93, 244, 172, - 10, 245, 93, 229, 229, 10, 245, 93, 240, 69, 10, 245, 93, 244, 170, 10, - 245, 93, 229, 227, 10, 143, 118, 70, 55, 10, 143, 120, 187, 55, 10, 143, - 227, 15, 55, 10, 143, 118, 70, 56, 10, 143, 120, 187, 56, 10, 143, 227, - 15, 56, 10, 171, 240, 69, 10, 171, 244, 170, 10, 171, 229, 227, 10, 5, - 138, 204, 70, 10, 240, 72, 3, 215, 252, 10, 240, 72, 3, 70, 55, 10, 229, - 230, 3, 70, 56, 10, 49, 250, 95, 55, 10, 50, 250, 95, 55, 10, 49, 250, - 95, 56, 10, 50, 250, 95, 56, 10, 52, 50, 250, 95, 55, 10, 52, 50, 250, - 95, 87, 3, 243, 85, 10, 50, 250, 95, 87, 3, 243, 85, 10, 244, 173, 3, - 243, 85, 10, 131, 212, 154, 221, 179, 238, 85, 92, 2, 230, 239, 247, 52, - 92, 2, 247, 52, 92, 2, 250, 180, 92, 2, 205, 199, 92, 1, 212, 228, 63, - 92, 1, 63, 92, 1, 252, 25, 92, 1, 75, 92, 1, 231, 83, 92, 1, 68, 92, 1, - 206, 178, 92, 1, 125, 146, 92, 1, 125, 159, 92, 1, 247, 55, 74, 92, 1, - 212, 228, 74, 92, 1, 74, 92, 1, 251, 64, 92, 1, 247, 55, 78, 92, 1, 212, - 228, 78, 92, 1, 78, 92, 1, 250, 34, 92, 1, 173, 92, 1, 229, 144, 92, 1, - 239, 8, 92, 1, 238, 119, 92, 1, 222, 203, 92, 1, 247, 92, 92, 1, 246, - 199, 92, 1, 230, 181, 92, 1, 230, 149, 92, 1, 221, 11, 92, 1, 207, 241, - 92, 1, 207, 229, 92, 1, 244, 120, 92, 1, 244, 104, 92, 1, 221, 227, 92, - 1, 210, 22, 92, 1, 209, 108, 92, 1, 244, 212, 92, 1, 244, 1, 92, 1, 201, - 201, 92, 1, 221, 209, 92, 1, 185, 92, 1, 218, 208, 92, 1, 249, 32, 92, 1, - 248, 98, 92, 1, 192, 92, 1, 198, 92, 1, 216, 220, 92, 1, 215, 185, 92, 1, - 228, 113, 92, 1, 227, 77, 92, 1, 227, 68, 92, 1, 206, 86, 92, 1, 213, 90, - 92, 1, 211, 164, 92, 1, 215, 36, 92, 1, 152, 92, 22, 2, 220, 73, 92, 22, - 2, 220, 16, 92, 2, 221, 51, 92, 2, 250, 17, 92, 22, 2, 252, 25, 92, 22, - 2, 75, 92, 22, 2, 231, 83, 92, 22, 2, 68, 92, 22, 2, 206, 178, 92, 22, 2, - 125, 146, 92, 22, 2, 125, 215, 186, 92, 22, 2, 247, 55, 74, 92, 22, 2, - 212, 228, 74, 92, 22, 2, 74, 92, 22, 2, 251, 64, 92, 22, 2, 247, 55, 78, - 92, 22, 2, 212, 228, 78, 92, 22, 2, 78, 92, 22, 2, 250, 34, 92, 2, 205, - 204, 92, 22, 2, 217, 229, 74, 92, 22, 2, 250, 13, 92, 220, 39, 92, 211, - 42, 2, 207, 26, 92, 211, 42, 2, 250, 182, 92, 237, 254, 251, 138, 92, - 251, 126, 251, 138, 92, 22, 2, 247, 55, 163, 74, 92, 22, 2, 207, 24, 92, - 22, 2, 206, 177, 92, 1, 217, 126, 92, 1, 229, 125, 92, 1, 238, 94, 92, 1, - 202, 116, 92, 1, 244, 109, 92, 1, 216, 61, 92, 1, 240, 108, 92, 1, 202, - 168, 92, 1, 125, 215, 186, 92, 1, 125, 227, 78, 92, 22, 2, 125, 159, 92, - 22, 2, 125, 227, 78, 92, 244, 166, 92, 52, 244, 166, 92, 17, 202, 84, 92, - 17, 105, 92, 17, 108, 92, 17, 147, 92, 17, 149, 92, 17, 170, 92, 17, 195, - 92, 17, 213, 111, 92, 17, 199, 92, 17, 222, 63, 92, 251, 146, 54, 92, 2, - 138, 211, 227, 243, 85, 92, 1, 247, 55, 63, 92, 1, 220, 73, 92, 1, 220, - 16, 92, 1, 250, 13, 92, 1, 207, 24, 92, 1, 206, 177, 92, 1, 225, 82, 244, - 120, 92, 1, 202, 80, 92, 1, 79, 198, 92, 1, 238, 155, 92, 1, 230, 129, - 92, 1, 238, 45, 211, 61, 92, 1, 244, 110, 92, 1, 248, 198, 179, 250, 209, - 179, 2, 247, 52, 179, 2, 250, 180, 179, 2, 205, 199, 179, 1, 63, 179, 1, - 252, 25, 179, 1, 75, 179, 1, 231, 83, 179, 1, 68, 179, 1, 206, 178, 179, - 1, 125, 146, 179, 1, 125, 159, 179, 1, 74, 179, 1, 251, 64, 179, 1, 78, - 179, 1, 250, 34, 179, 1, 173, 179, 1, 229, 144, 179, 1, 239, 8, 179, 1, - 238, 119, 179, 1, 222, 203, 179, 1, 247, 92, 179, 1, 246, 199, 179, 1, - 230, 181, 179, 1, 230, 149, 179, 1, 221, 11, 179, 1, 207, 241, 179, 1, - 207, 229, 179, 1, 244, 120, 179, 1, 244, 104, 179, 1, 221, 227, 179, 1, - 210, 22, 179, 1, 209, 108, 179, 1, 244, 212, 179, 1, 244, 1, 179, 1, 201, - 201, 179, 1, 185, 179, 1, 218, 208, 179, 1, 249, 32, 179, 1, 248, 98, - 179, 1, 192, 179, 1, 198, 179, 1, 216, 220, 179, 1, 228, 113, 179, 1, - 213, 90, 179, 1, 211, 164, 179, 1, 215, 36, 179, 1, 152, 179, 2, 221, 51, - 179, 2, 250, 17, 179, 22, 2, 252, 25, 179, 22, 2, 75, 179, 22, 2, 231, - 83, 179, 22, 2, 68, 179, 22, 2, 206, 178, 179, 22, 2, 125, 146, 179, 22, - 2, 125, 215, 186, 179, 22, 2, 74, 179, 22, 2, 251, 64, 179, 22, 2, 78, - 179, 22, 2, 250, 34, 179, 2, 205, 204, 179, 1, 229, 135, 210, 22, 179, - 250, 35, 227, 196, 82, 179, 1, 215, 185, 179, 1, 216, 61, 179, 1, 202, - 168, 179, 1, 125, 215, 186, 179, 1, 125, 227, 78, 179, 22, 2, 125, 159, - 179, 22, 2, 125, 227, 78, 179, 17, 202, 84, 179, 17, 105, 179, 17, 108, - 179, 17, 147, 179, 17, 149, 179, 17, 170, 179, 17, 195, 179, 17, 213, - 111, 179, 17, 199, 179, 17, 222, 63, 179, 1, 216, 221, 3, 101, 243, 227, - 179, 1, 216, 221, 3, 226, 251, 243, 227, 179, 215, 120, 82, 179, 215, - 120, 54, 179, 245, 92, 221, 43, 105, 179, 245, 92, 221, 43, 108, 179, - 245, 92, 221, 43, 147, 179, 245, 92, 221, 43, 149, 179, 245, 92, 221, 43, - 118, 227, 180, 209, 98, 209, 93, 244, 31, 179, 245, 92, 244, 32, 212, 82, - 179, 230, 202, 179, 238, 231, 82, 237, 198, 2, 251, 121, 248, 66, 237, - 198, 2, 248, 66, 237, 198, 2, 205, 199, 237, 198, 1, 63, 237, 198, 1, - 252, 25, 237, 198, 1, 75, 237, 198, 1, 231, 83, 237, 198, 1, 68, 237, - 198, 1, 206, 178, 237, 198, 1, 241, 161, 237, 198, 1, 251, 64, 237, 198, - 1, 220, 18, 237, 198, 1, 250, 34, 237, 198, 1, 173, 237, 198, 1, 229, - 144, 237, 198, 1, 239, 8, 237, 198, 1, 238, 119, 237, 198, 1, 222, 203, - 237, 198, 1, 247, 92, 237, 198, 1, 246, 199, 237, 198, 1, 230, 181, 237, - 198, 1, 230, 149, 237, 198, 1, 221, 11, 237, 198, 1, 207, 241, 237, 198, - 1, 207, 229, 237, 198, 1, 244, 120, 237, 198, 1, 244, 104, 237, 198, 1, - 221, 227, 237, 198, 1, 210, 22, 237, 198, 1, 209, 108, 237, 198, 1, 244, - 212, 237, 198, 1, 244, 1, 237, 198, 1, 201, 201, 237, 198, 1, 185, 237, - 198, 1, 218, 208, 237, 198, 1, 249, 32, 237, 198, 1, 248, 98, 237, 198, - 1, 192, 237, 198, 1, 198, 237, 198, 1, 216, 220, 237, 198, 1, 228, 113, - 237, 198, 1, 227, 77, 237, 198, 1, 206, 86, 237, 198, 1, 213, 90, 237, - 198, 1, 215, 36, 237, 198, 1, 152, 237, 198, 2, 221, 51, 237, 198, 22, 2, - 252, 25, 237, 198, 22, 2, 75, 237, 198, 22, 2, 231, 83, 237, 198, 22, 2, - 68, 237, 198, 22, 2, 206, 178, 237, 198, 22, 2, 241, 161, 237, 198, 22, - 2, 251, 64, 237, 198, 22, 2, 220, 18, 237, 198, 22, 2, 250, 34, 237, 198, - 2, 205, 204, 237, 198, 2, 207, 28, 237, 198, 1, 229, 125, 237, 198, 1, - 238, 94, 237, 198, 1, 202, 116, 237, 198, 1, 215, 185, 237, 198, 1, 240, - 108, 237, 198, 17, 202, 84, 237, 198, 17, 105, 237, 198, 17, 108, 237, - 198, 17, 147, 237, 198, 17, 149, 237, 198, 17, 170, 237, 198, 17, 195, - 237, 198, 17, 213, 111, 237, 198, 17, 199, 237, 198, 17, 222, 63, 237, - 198, 208, 208, 237, 198, 251, 120, 237, 198, 230, 222, 237, 198, 206, - 206, 237, 198, 241, 130, 220, 23, 237, 198, 2, 203, 85, 237, 213, 2, 247, - 52, 237, 213, 2, 250, 180, 237, 213, 2, 205, 199, 237, 213, 1, 63, 237, - 213, 1, 252, 25, 237, 213, 1, 75, 237, 213, 1, 231, 83, 237, 213, 1, 68, - 237, 213, 1, 206, 178, 237, 213, 1, 125, 146, 237, 213, 1, 125, 159, 237, - 213, 22, 247, 55, 74, 237, 213, 1, 74, 237, 213, 1, 251, 64, 237, 213, - 22, 247, 55, 78, 237, 213, 1, 78, 237, 213, 1, 250, 34, 237, 213, 1, 173, - 237, 213, 1, 229, 144, 237, 213, 1, 239, 8, 237, 213, 1, 238, 119, 237, - 213, 1, 222, 203, 237, 213, 1, 247, 92, 237, 213, 1, 246, 199, 237, 213, - 1, 230, 181, 237, 213, 1, 230, 149, 237, 213, 1, 221, 11, 237, 213, 1, - 207, 241, 237, 213, 1, 207, 229, 237, 213, 1, 244, 120, 237, 213, 1, 244, - 104, 237, 213, 1, 221, 227, 237, 213, 1, 210, 22, 237, 213, 1, 209, 108, - 237, 213, 1, 244, 212, 237, 213, 1, 244, 1, 237, 213, 1, 201, 201, 237, - 213, 1, 185, 237, 213, 1, 218, 208, 237, 213, 1, 249, 32, 237, 213, 1, - 248, 98, 237, 213, 1, 192, 237, 213, 1, 198, 237, 213, 1, 216, 220, 237, - 213, 1, 228, 113, 237, 213, 1, 227, 77, 237, 213, 1, 206, 86, 237, 213, - 1, 213, 90, 237, 213, 1, 211, 164, 237, 213, 1, 215, 36, 237, 213, 1, - 152, 237, 213, 2, 221, 51, 237, 213, 2, 250, 17, 237, 213, 22, 2, 252, - 25, 237, 213, 22, 2, 75, 237, 213, 22, 2, 231, 83, 237, 213, 22, 2, 68, - 237, 213, 22, 2, 206, 178, 237, 213, 22, 2, 125, 146, 237, 213, 22, 2, - 125, 215, 186, 237, 213, 22, 2, 247, 55, 74, 237, 213, 22, 2, 74, 237, - 213, 22, 2, 251, 64, 237, 213, 22, 2, 247, 55, 78, 237, 213, 22, 2, 78, - 237, 213, 22, 2, 250, 34, 237, 213, 2, 205, 204, 237, 213, 220, 39, 237, - 213, 1, 125, 215, 186, 237, 213, 1, 125, 227, 78, 237, 213, 22, 2, 125, - 159, 237, 213, 22, 2, 125, 227, 78, 237, 213, 17, 202, 84, 237, 213, 17, - 105, 237, 213, 17, 108, 237, 213, 17, 147, 237, 213, 17, 149, 237, 213, - 17, 170, 237, 213, 17, 195, 237, 213, 17, 213, 111, 237, 213, 17, 199, - 237, 213, 17, 222, 63, 237, 213, 251, 146, 54, 237, 213, 215, 120, 54, - 237, 213, 1, 202, 80, 193, 2, 247, 52, 193, 2, 250, 180, 193, 2, 205, - 199, 193, 1, 63, 193, 1, 252, 25, 193, 1, 75, 193, 1, 231, 83, 193, 1, - 68, 193, 1, 206, 178, 193, 1, 125, 146, 193, 1, 125, 159, 193, 1, 74, - 193, 1, 251, 64, 193, 1, 78, 193, 1, 250, 34, 193, 1, 173, 193, 1, 229, - 144, 193, 1, 239, 8, 193, 1, 238, 119, 193, 1, 222, 203, 193, 1, 247, 92, - 193, 1, 246, 199, 193, 1, 230, 181, 193, 1, 230, 149, 193, 1, 221, 11, - 193, 1, 207, 241, 193, 1, 207, 229, 193, 1, 244, 120, 193, 1, 244, 104, - 193, 1, 221, 227, 193, 1, 210, 22, 193, 1, 209, 108, 193, 1, 244, 212, - 193, 1, 244, 1, 193, 1, 201, 201, 193, 1, 185, 193, 1, 218, 208, 193, 1, - 249, 32, 193, 1, 248, 98, 193, 1, 192, 193, 1, 198, 193, 1, 216, 220, - 193, 1, 228, 113, 193, 1, 227, 77, 193, 1, 206, 86, 193, 1, 213, 90, 193, - 1, 211, 164, 193, 1, 215, 36, 193, 1, 152, 193, 2, 221, 51, 193, 2, 250, - 17, 193, 22, 2, 252, 25, 193, 22, 2, 75, 193, 22, 2, 231, 83, 193, 22, 2, - 68, 193, 22, 2, 206, 178, 193, 22, 2, 125, 146, 193, 22, 2, 125, 215, - 186, 193, 22, 2, 74, 193, 22, 2, 251, 64, 193, 22, 2, 78, 193, 22, 2, - 250, 34, 193, 2, 205, 204, 193, 251, 65, 227, 196, 82, 193, 250, 35, 227, - 196, 82, 193, 1, 215, 185, 193, 1, 216, 61, 193, 1, 202, 168, 193, 1, - 125, 215, 186, 193, 1, 125, 227, 78, 193, 22, 2, 125, 159, 193, 22, 2, - 125, 227, 78, 193, 17, 202, 84, 193, 17, 105, 193, 17, 108, 193, 17, 147, - 193, 17, 149, 193, 17, 170, 193, 17, 195, 193, 17, 213, 111, 193, 17, - 199, 193, 17, 222, 63, 193, 230, 202, 193, 1, 204, 111, 193, 239, 138, - 118, 217, 55, 193, 239, 138, 118, 237, 137, 193, 239, 138, 126, 217, 53, - 193, 239, 138, 118, 212, 80, 193, 239, 138, 118, 241, 138, 193, 239, 138, - 126, 212, 79, 44, 2, 250, 180, 44, 2, 205, 199, 44, 1, 63, 44, 1, 252, - 25, 44, 1, 75, 44, 1, 231, 83, 44, 1, 68, 44, 1, 206, 178, 44, 1, 74, 44, - 1, 241, 161, 44, 1, 251, 64, 44, 1, 78, 44, 1, 220, 18, 44, 1, 250, 34, - 44, 1, 173, 44, 1, 222, 203, 44, 1, 247, 92, 44, 1, 230, 181, 44, 1, 221, - 11, 44, 1, 207, 241, 44, 1, 221, 227, 44, 1, 210, 22, 44, 1, 201, 201, - 44, 1, 221, 209, 44, 1, 185, 44, 1, 192, 44, 1, 198, 44, 1, 216, 220, 44, - 1, 215, 185, 44, 1, 228, 113, 44, 1, 227, 77, 44, 1, 227, 68, 44, 1, 206, - 86, 44, 1, 213, 90, 44, 1, 211, 164, 44, 1, 215, 36, 44, 1, 152, 44, 22, - 2, 252, 25, 44, 22, 2, 75, 44, 22, 2, 231, 83, 44, 22, 2, 68, 44, 22, 2, - 206, 178, 44, 22, 2, 74, 44, 22, 2, 241, 161, 44, 22, 2, 251, 64, 44, 22, - 2, 78, 44, 22, 2, 220, 18, 44, 22, 2, 250, 34, 44, 2, 205, 204, 44, 220, - 39, 44, 250, 35, 227, 196, 82, 44, 17, 202, 84, 44, 17, 105, 44, 17, 108, - 44, 17, 147, 44, 17, 149, 44, 17, 170, 44, 17, 195, 44, 17, 213, 111, 44, - 17, 199, 44, 17, 222, 63, 44, 42, 209, 152, 44, 42, 118, 236, 11, 44, 42, - 118, 209, 36, 44, 244, 133, 54, 44, 224, 38, 54, 44, 203, 50, 54, 44, - 244, 72, 54, 44, 245, 141, 54, 44, 250, 82, 87, 54, 44, 215, 120, 54, 44, - 42, 54, 175, 2, 39, 247, 53, 55, 175, 2, 247, 52, 175, 2, 250, 180, 175, - 2, 205, 199, 175, 1, 63, 175, 1, 252, 25, 175, 1, 75, 175, 1, 231, 83, - 175, 1, 68, 175, 1, 206, 178, 175, 1, 125, 146, 175, 1, 125, 159, 175, 1, - 74, 175, 1, 241, 161, 175, 1, 251, 64, 175, 1, 78, 175, 1, 220, 18, 175, - 1, 250, 34, 175, 1, 173, 175, 1, 229, 144, 175, 1, 239, 8, 175, 1, 238, - 119, 175, 1, 222, 203, 175, 1, 247, 92, 175, 1, 246, 199, 175, 1, 230, - 181, 175, 1, 230, 149, 175, 1, 221, 11, 175, 1, 207, 241, 175, 1, 207, - 229, 175, 1, 244, 120, 175, 1, 244, 104, 175, 1, 221, 227, 175, 1, 210, - 22, 175, 1, 209, 108, 175, 1, 244, 212, 175, 1, 244, 1, 175, 1, 201, 201, - 175, 1, 185, 175, 1, 218, 208, 175, 1, 249, 32, 175, 1, 248, 98, 175, 1, - 192, 175, 1, 198, 175, 1, 216, 220, 175, 1, 215, 185, 175, 1, 228, 113, - 175, 1, 227, 77, 175, 1, 227, 68, 175, 1, 206, 86, 175, 1, 213, 90, 175, - 1, 211, 164, 175, 1, 215, 36, 175, 1, 152, 175, 2, 250, 17, 175, 22, 2, - 252, 25, 175, 22, 2, 75, 175, 22, 2, 231, 83, 175, 22, 2, 68, 175, 22, 2, - 206, 178, 175, 22, 2, 125, 146, 175, 22, 2, 125, 215, 186, 175, 22, 2, - 74, 175, 22, 2, 241, 161, 175, 22, 2, 251, 64, 175, 22, 2, 78, 175, 22, - 2, 220, 18, 175, 22, 2, 250, 34, 175, 2, 205, 204, 175, 227, 196, 82, - 175, 251, 65, 227, 196, 82, 175, 1, 208, 20, 175, 1, 241, 255, 175, 1, - 215, 166, 175, 1, 125, 215, 186, 175, 1, 125, 227, 78, 175, 22, 2, 125, - 159, 175, 22, 2, 125, 227, 78, 175, 17, 202, 84, 175, 17, 105, 175, 17, - 108, 175, 17, 147, 175, 17, 149, 175, 17, 170, 175, 17, 195, 175, 17, - 213, 111, 175, 17, 199, 175, 17, 222, 63, 175, 239, 138, 17, 202, 85, 35, - 220, 77, 218, 15, 76, 149, 175, 239, 138, 17, 118, 35, 220, 77, 218, 15, - 76, 149, 175, 239, 138, 17, 120, 35, 220, 77, 218, 15, 76, 149, 175, 239, - 138, 17, 126, 35, 220, 77, 218, 15, 76, 149, 175, 239, 138, 17, 118, 35, - 240, 225, 218, 15, 76, 149, 175, 239, 138, 17, 120, 35, 240, 225, 218, - 15, 76, 149, 175, 239, 138, 17, 126, 35, 240, 225, 218, 15, 76, 149, 175, - 2, 207, 164, 200, 2, 247, 52, 200, 2, 250, 180, 200, 2, 205, 199, 200, 1, - 63, 200, 1, 252, 25, 200, 1, 75, 200, 1, 231, 83, 200, 1, 68, 200, 1, - 206, 178, 200, 1, 125, 146, 200, 1, 125, 159, 200, 1, 74, 200, 1, 241, - 161, 200, 1, 251, 64, 200, 1, 78, 200, 1, 220, 18, 200, 1, 250, 34, 200, - 1, 173, 200, 1, 229, 144, 200, 1, 239, 8, 200, 1, 238, 119, 200, 1, 222, - 203, 200, 1, 247, 92, 200, 1, 246, 199, 200, 1, 230, 181, 200, 1, 230, - 149, 200, 1, 221, 11, 200, 1, 207, 241, 200, 1, 207, 229, 200, 1, 244, - 120, 200, 1, 244, 104, 200, 1, 221, 227, 200, 1, 210, 22, 200, 1, 209, - 108, 200, 1, 244, 212, 200, 1, 244, 1, 200, 1, 201, 201, 200, 1, 185, - 200, 1, 218, 208, 200, 1, 249, 32, 200, 1, 248, 98, 200, 1, 192, 200, 1, - 198, 200, 1, 216, 220, 200, 1, 215, 185, 200, 1, 228, 113, 200, 1, 227, - 77, 200, 1, 206, 86, 200, 1, 213, 90, 200, 1, 211, 164, 200, 1, 215, 36, - 200, 1, 152, 200, 2, 221, 51, 200, 2, 250, 17, 200, 22, 2, 252, 25, 200, - 22, 2, 75, 200, 22, 2, 231, 83, 200, 22, 2, 68, 200, 22, 2, 206, 178, - 200, 22, 2, 125, 146, 200, 22, 2, 125, 215, 186, 200, 22, 2, 74, 200, 22, - 2, 241, 161, 200, 22, 2, 251, 64, 200, 22, 2, 78, 200, 22, 2, 220, 18, - 200, 22, 2, 250, 34, 200, 2, 205, 204, 200, 227, 196, 82, 200, 251, 65, - 227, 196, 82, 200, 1, 240, 108, 200, 1, 125, 215, 186, 200, 1, 125, 227, - 78, 200, 22, 2, 125, 159, 200, 22, 2, 125, 227, 78, 200, 17, 202, 84, - 200, 17, 105, 200, 17, 108, 200, 17, 147, 200, 17, 149, 200, 17, 170, - 200, 17, 195, 200, 17, 213, 111, 200, 17, 199, 200, 17, 222, 63, 200, 2, - 230, 135, 200, 2, 206, 222, 164, 2, 247, 52, 164, 2, 250, 180, 164, 2, - 205, 199, 164, 1, 63, 164, 1, 252, 25, 164, 1, 75, 164, 1, 231, 83, 164, - 1, 68, 164, 1, 206, 178, 164, 1, 125, 146, 164, 1, 125, 159, 164, 1, 74, - 164, 1, 241, 161, 164, 1, 251, 64, 164, 1, 78, 164, 1, 220, 18, 164, 1, - 250, 34, 164, 1, 173, 164, 1, 229, 144, 164, 1, 239, 8, 164, 1, 238, 119, - 164, 1, 222, 203, 164, 1, 247, 92, 164, 1, 246, 199, 164, 1, 230, 181, - 164, 1, 230, 149, 164, 1, 221, 11, 164, 1, 207, 241, 164, 1, 207, 229, - 164, 1, 244, 120, 164, 1, 244, 104, 164, 1, 221, 227, 164, 1, 210, 22, - 164, 1, 209, 108, 164, 1, 244, 212, 164, 1, 244, 1, 164, 1, 201, 201, - 164, 1, 221, 209, 164, 1, 185, 164, 1, 218, 208, 164, 1, 249, 32, 164, 1, - 248, 98, 164, 1, 192, 164, 1, 198, 164, 1, 216, 220, 164, 1, 215, 185, - 164, 1, 228, 113, 164, 1, 227, 77, 164, 1, 227, 68, 164, 1, 206, 86, 164, - 1, 213, 90, 164, 1, 211, 164, 164, 1, 215, 36, 164, 1, 152, 164, 1, 207, - 210, 164, 2, 250, 17, 164, 22, 2, 252, 25, 164, 22, 2, 75, 164, 22, 2, - 231, 83, 164, 22, 2, 68, 164, 22, 2, 206, 178, 164, 22, 2, 125, 146, 164, - 22, 2, 125, 215, 186, 164, 22, 2, 74, 164, 22, 2, 241, 161, 164, 22, 2, - 251, 64, 164, 22, 2, 78, 164, 22, 2, 220, 18, 164, 22, 2, 250, 34, 164, - 2, 205, 204, 164, 1, 70, 216, 97, 164, 250, 35, 227, 196, 82, 164, 1, - 250, 126, 231, 83, 164, 1, 125, 215, 186, 164, 1, 125, 227, 78, 164, 22, - 2, 125, 159, 164, 22, 2, 125, 227, 78, 164, 17, 202, 84, 164, 17, 105, - 164, 17, 108, 164, 17, 147, 164, 17, 149, 164, 17, 170, 164, 17, 195, - 164, 17, 213, 111, 164, 17, 199, 164, 17, 222, 63, 164, 42, 209, 152, - 164, 42, 118, 236, 11, 164, 42, 118, 209, 36, 164, 239, 138, 118, 217, - 55, 164, 239, 138, 118, 237, 137, 164, 239, 138, 126, 217, 53, 164, 244, - 138, 82, 164, 1, 246, 131, 221, 228, 164, 1, 246, 131, 223, 163, 164, 1, - 246, 131, 215, 186, 164, 1, 246, 131, 159, 164, 1, 246, 131, 227, 78, - 164, 1, 246, 131, 230, 54, 140, 2, 250, 179, 140, 2, 205, 198, 140, 1, - 250, 6, 140, 1, 251, 235, 140, 1, 251, 89, 140, 1, 251, 104, 140, 1, 230, - 191, 140, 1, 231, 82, 140, 1, 206, 169, 140, 1, 206, 172, 140, 1, 230, - 217, 140, 1, 230, 218, 140, 1, 231, 68, 140, 1, 231, 70, 140, 1, 240, - 194, 140, 1, 241, 156, 140, 1, 251, 49, 140, 1, 219, 187, 140, 1, 220, - 11, 140, 1, 250, 20, 140, 1, 251, 5, 229, 206, 140, 1, 225, 147, 229, - 206, 140, 1, 251, 5, 238, 210, 140, 1, 225, 147, 238, 210, 140, 1, 229, - 255, 223, 103, 140, 1, 214, 235, 238, 210, 140, 1, 251, 5, 247, 8, 140, - 1, 225, 147, 247, 8, 140, 1, 251, 5, 230, 164, 140, 1, 225, 147, 230, - 164, 140, 1, 210, 15, 223, 103, 140, 1, 210, 15, 214, 234, 223, 104, 140, - 1, 214, 235, 230, 164, 140, 1, 251, 5, 207, 237, 140, 1, 225, 147, 207, - 237, 140, 1, 251, 5, 244, 111, 140, 1, 225, 147, 244, 111, 140, 1, 223, - 191, 223, 58, 140, 1, 214, 235, 244, 111, 140, 1, 251, 5, 209, 195, 140, - 1, 225, 147, 209, 195, 140, 1, 251, 5, 244, 131, 140, 1, 225, 147, 244, - 131, 140, 1, 244, 162, 223, 58, 140, 1, 214, 235, 244, 131, 140, 1, 251, - 5, 219, 42, 140, 1, 225, 147, 219, 42, 140, 1, 251, 5, 248, 200, 140, 1, - 225, 147, 248, 200, 140, 1, 225, 62, 140, 1, 250, 241, 248, 200, 140, 1, - 203, 57, 140, 1, 216, 164, 140, 1, 244, 162, 227, 243, 140, 1, 206, 57, - 140, 1, 210, 15, 214, 207, 140, 1, 223, 191, 214, 207, 140, 1, 244, 162, - 214, 207, 140, 1, 237, 71, 140, 1, 223, 191, 227, 243, 140, 1, 240, 62, - 140, 2, 251, 38, 140, 22, 2, 251, 99, 140, 22, 2, 229, 169, 251, 106, - 140, 22, 2, 243, 200, 251, 106, 140, 22, 2, 229, 169, 230, 214, 140, 22, - 2, 243, 200, 230, 214, 140, 22, 2, 229, 169, 219, 167, 140, 22, 2, 243, - 200, 219, 167, 140, 22, 2, 238, 253, 140, 22, 2, 229, 11, 140, 22, 2, - 243, 200, 229, 11, 140, 22, 2, 229, 13, 244, 50, 140, 22, 2, 229, 12, - 237, 158, 251, 99, 140, 22, 2, 229, 12, 237, 158, 243, 200, 251, 99, 140, - 22, 2, 229, 12, 237, 158, 238, 209, 140, 22, 2, 238, 209, 140, 227, 89, - 17, 202, 84, 140, 227, 89, 17, 105, 140, 227, 89, 17, 108, 140, 227, 89, - 17, 147, 140, 227, 89, 17, 149, 140, 227, 89, 17, 170, 140, 227, 89, 17, - 195, 140, 227, 89, 17, 213, 111, 140, 227, 89, 17, 199, 140, 227, 89, 17, - 222, 63, 140, 22, 2, 243, 200, 238, 253, 140, 22, 2, 243, 200, 238, 209, - 140, 217, 179, 228, 194, 209, 103, 167, 229, 27, 230, 18, 209, 103, 167, - 229, 116, 229, 139, 209, 103, 167, 229, 116, 229, 108, 209, 103, 167, - 229, 116, 229, 103, 209, 103, 167, 229, 116, 229, 112, 209, 103, 167, - 229, 116, 216, 185, 209, 103, 167, 222, 129, 222, 116, 209, 103, 167, - 246, 117, 246, 188, 209, 103, 167, 246, 117, 246, 127, 209, 103, 167, - 246, 117, 246, 187, 209, 103, 167, 212, 14, 212, 13, 209, 103, 167, 246, - 117, 246, 113, 209, 103, 167, 202, 248, 202, 255, 209, 103, 167, 243, - 114, 246, 196, 209, 103, 167, 208, 173, 219, 53, 209, 103, 167, 209, 48, - 209, 97, 209, 103, 167, 209, 48, 223, 80, 209, 103, 167, 209, 48, 218, - 170, 209, 103, 167, 221, 192, 222, 230, 209, 103, 167, 243, 114, 244, 51, - 209, 103, 167, 208, 173, 209, 223, 209, 103, 167, 209, 48, 209, 16, 209, - 103, 167, 209, 48, 209, 104, 209, 103, 167, 209, 48, 209, 43, 209, 103, - 167, 221, 192, 221, 84, 209, 103, 167, 248, 24, 249, 0, 209, 103, 167, - 218, 70, 218, 98, 209, 103, 167, 218, 181, 218, 172, 209, 103, 167, 239, - 187, 240, 108, 209, 103, 167, 218, 181, 218, 201, 209, 103, 167, 239, - 187, 240, 81, 209, 103, 167, 218, 181, 214, 247, 209, 103, 167, 224, 83, - 192, 209, 103, 167, 202, 248, 203, 86, 209, 103, 167, 215, 228, 215, 144, - 209, 103, 167, 215, 145, 209, 103, 167, 227, 50, 227, 107, 209, 103, 167, - 226, 239, 209, 103, 167, 204, 1, 204, 106, 209, 103, 167, 212, 14, 215, - 6, 209, 103, 167, 212, 14, 215, 116, 209, 103, 167, 212, 14, 211, 9, 209, - 103, 167, 236, 137, 236, 233, 209, 103, 167, 227, 50, 246, 97, 209, 103, - 167, 158, 250, 223, 209, 103, 167, 236, 137, 221, 187, 209, 103, 167, - 219, 144, 209, 103, 167, 214, 229, 63, 209, 103, 167, 225, 141, 237, 125, - 209, 103, 167, 214, 229, 252, 25, 209, 103, 167, 214, 229, 250, 247, 209, - 103, 167, 214, 229, 75, 209, 103, 167, 214, 229, 231, 83, 209, 103, 167, - 214, 229, 207, 24, 209, 103, 167, 214, 229, 207, 22, 209, 103, 167, 214, - 229, 68, 209, 103, 167, 214, 229, 206, 178, 209, 103, 167, 218, 183, 209, - 103, 245, 92, 16, 249, 1, 209, 103, 167, 214, 229, 74, 209, 103, 167, - 214, 229, 251, 109, 209, 103, 167, 214, 229, 78, 209, 103, 167, 214, 229, - 251, 65, 225, 135, 209, 103, 167, 214, 229, 251, 65, 225, 136, 209, 103, - 167, 228, 32, 209, 103, 167, 225, 132, 209, 103, 167, 225, 133, 209, 103, - 167, 225, 141, 241, 129, 209, 103, 167, 225, 141, 209, 47, 209, 103, 167, - 225, 141, 208, 88, 209, 103, 167, 225, 141, 246, 175, 209, 103, 167, 209, - 95, 209, 103, 167, 222, 72, 209, 103, 167, 203, 80, 209, 103, 167, 239, - 177, 209, 103, 17, 202, 84, 209, 103, 17, 105, 209, 103, 17, 108, 209, - 103, 17, 147, 209, 103, 17, 149, 209, 103, 17, 170, 209, 103, 17, 195, - 209, 103, 17, 213, 111, 209, 103, 17, 199, 209, 103, 17, 222, 63, 209, - 103, 167, 250, 219, 209, 103, 167, 229, 113, 228, 12, 1, 229, 26, 228, - 12, 1, 229, 116, 210, 211, 228, 12, 1, 229, 116, 209, 232, 228, 12, 1, - 222, 128, 228, 12, 1, 245, 254, 228, 12, 1, 212, 14, 209, 232, 228, 12, - 1, 220, 233, 228, 12, 1, 243, 113, 228, 12, 1, 135, 228, 12, 1, 209, 48, - 210, 211, 228, 12, 1, 209, 48, 209, 232, 228, 12, 1, 221, 191, 228, 12, - 1, 248, 23, 228, 12, 1, 218, 69, 228, 12, 1, 218, 181, 210, 211, 228, 12, - 1, 239, 187, 209, 232, 228, 12, 1, 218, 181, 209, 232, 228, 12, 1, 239, - 187, 210, 211, 228, 12, 1, 224, 82, 228, 12, 1, 202, 247, 228, 12, 1, - 227, 50, 227, 107, 228, 12, 1, 227, 50, 227, 12, 228, 12, 1, 204, 0, 228, - 12, 1, 212, 14, 210, 211, 228, 12, 1, 236, 137, 210, 211, 228, 12, 1, 78, - 228, 12, 1, 236, 137, 209, 232, 228, 12, 241, 108, 228, 12, 22, 2, 63, - 228, 12, 22, 2, 225, 141, 230, 4, 228, 12, 22, 2, 252, 25, 228, 12, 22, - 2, 250, 247, 228, 12, 22, 2, 75, 228, 12, 22, 2, 231, 83, 228, 12, 22, 2, - 203, 124, 228, 12, 22, 2, 202, 169, 228, 12, 22, 2, 68, 228, 12, 22, 2, - 206, 178, 228, 12, 22, 2, 225, 141, 229, 9, 228, 12, 213, 138, 2, 227, - 49, 228, 12, 213, 138, 2, 220, 233, 228, 12, 22, 2, 74, 228, 12, 22, 2, - 241, 145, 228, 12, 22, 2, 78, 228, 12, 22, 2, 250, 8, 228, 12, 22, 2, - 251, 64, 228, 12, 229, 27, 228, 113, 228, 12, 143, 225, 141, 241, 129, - 228, 12, 143, 225, 141, 209, 47, 228, 12, 143, 225, 141, 209, 2, 228, 12, - 143, 225, 141, 247, 16, 228, 12, 247, 58, 82, 228, 12, 222, 81, 228, 12, - 17, 202, 84, 228, 12, 17, 105, 228, 12, 17, 108, 228, 12, 17, 147, 228, - 12, 17, 149, 228, 12, 17, 170, 228, 12, 17, 195, 228, 12, 17, 213, 111, - 228, 12, 17, 199, 228, 12, 17, 222, 63, 228, 12, 236, 137, 221, 191, 228, - 12, 236, 137, 224, 82, 228, 12, 1, 229, 117, 238, 39, 228, 12, 1, 229, - 117, 220, 233, 77, 4, 220, 39, 77, 131, 237, 232, 203, 3, 224, 173, 208, - 26, 63, 77, 131, 237, 232, 203, 3, 224, 173, 255, 22, 215, 232, 248, 164, - 192, 77, 131, 237, 232, 203, 3, 224, 173, 255, 22, 237, 232, 208, 6, 192, - 77, 131, 81, 203, 3, 224, 173, 225, 22, 192, 77, 131, 246, 12, 203, 3, - 224, 173, 213, 97, 192, 77, 131, 247, 34, 203, 3, 224, 173, 218, 171, - 213, 83, 192, 77, 131, 203, 3, 224, 173, 208, 6, 213, 83, 192, 77, 131, - 214, 205, 213, 82, 77, 131, 247, 196, 203, 3, 224, 172, 77, 131, 248, 45, - 212, 238, 203, 3, 224, 172, 77, 131, 230, 243, 208, 5, 77, 131, 244, 44, - 208, 6, 247, 195, 77, 131, 213, 82, 77, 131, 220, 238, 213, 82, 77, 131, - 208, 6, 213, 82, 77, 131, 220, 238, 208, 6, 213, 82, 77, 131, 215, 255, - 246, 156, 211, 180, 213, 82, 77, 131, 216, 65, 238, 9, 213, 82, 77, 131, - 247, 34, 255, 26, 215, 149, 225, 21, 163, 247, 61, 77, 131, 237, 232, - 208, 5, 77, 227, 35, 2, 246, 197, 215, 148, 77, 227, 35, 2, 227, 159, - 215, 148, 77, 250, 55, 2, 213, 93, 238, 193, 255, 27, 215, 148, 77, 250, - 55, 2, 255, 24, 185, 77, 250, 55, 2, 214, 178, 208, 0, 77, 2, 216, 160, - 243, 127, 238, 192, 77, 2, 216, 160, 243, 127, 238, 41, 77, 2, 216, 160, - 243, 127, 237, 233, 77, 2, 216, 160, 223, 99, 238, 192, 77, 2, 216, 160, - 223, 99, 238, 41, 77, 2, 216, 160, 243, 127, 216, 160, 223, 98, 77, 17, - 202, 84, 77, 17, 105, 77, 17, 108, 77, 17, 147, 77, 17, 149, 77, 17, 170, - 77, 17, 195, 77, 17, 213, 111, 77, 17, 199, 77, 17, 222, 63, 77, 17, 162, - 105, 77, 17, 162, 108, 77, 17, 162, 147, 77, 17, 162, 149, 77, 17, 162, - 170, 77, 17, 162, 195, 77, 17, 162, 213, 111, 77, 17, 162, 199, 77, 17, - 162, 222, 63, 77, 17, 162, 202, 84, 77, 131, 247, 198, 215, 148, 77, 131, - 222, 194, 247, 127, 220, 249, 202, 19, 77, 131, 247, 34, 255, 26, 215, - 149, 247, 128, 224, 126, 247, 61, 77, 131, 222, 194, 247, 127, 213, 94, - 215, 148, 77, 131, 246, 171, 224, 172, 77, 131, 208, 21, 255, 23, 77, - 131, 237, 215, 215, 149, 237, 174, 77, 131, 237, 215, 215, 149, 237, 180, - 77, 131, 250, 224, 229, 134, 237, 174, 77, 131, 250, 224, 229, 134, 237, - 180, 77, 2, 203, 72, 208, 4, 77, 2, 225, 101, 208, 4, 77, 1, 173, 77, 1, - 229, 144, 77, 1, 239, 8, 77, 1, 238, 119, 77, 1, 222, 203, 77, 1, 247, - 92, 77, 1, 246, 199, 77, 1, 230, 181, 77, 1, 221, 11, 77, 1, 207, 241, - 77, 1, 207, 229, 77, 1, 244, 120, 77, 1, 244, 104, 77, 1, 221, 227, 77, - 1, 210, 22, 77, 1, 209, 108, 77, 1, 244, 212, 77, 1, 244, 1, 77, 1, 201, - 201, 77, 1, 185, 77, 1, 218, 208, 77, 1, 249, 32, 77, 1, 248, 98, 77, 1, - 192, 77, 1, 208, 20, 77, 1, 208, 10, 77, 1, 241, 255, 77, 1, 241, 249, - 77, 1, 204, 111, 77, 1, 202, 80, 77, 1, 202, 116, 77, 1, 255, 29, 77, 1, - 198, 77, 1, 216, 220, 77, 1, 228, 113, 77, 1, 213, 90, 77, 1, 211, 164, - 77, 1, 215, 36, 77, 1, 152, 77, 1, 63, 77, 1, 228, 223, 77, 1, 239, 229, - 216, 220, 77, 1, 229, 47, 77, 1, 215, 185, 77, 22, 2, 252, 25, 77, 22, 2, - 75, 77, 22, 2, 231, 83, 77, 22, 2, 68, 77, 22, 2, 206, 178, 77, 22, 2, - 125, 146, 77, 22, 2, 125, 215, 186, 77, 22, 2, 125, 159, 77, 22, 2, 125, - 227, 78, 77, 22, 2, 74, 77, 22, 2, 241, 161, 77, 22, 2, 78, 77, 22, 2, - 220, 18, 77, 2, 215, 238, 211, 11, 222, 204, 215, 227, 77, 2, 215, 232, - 248, 163, 77, 22, 2, 216, 73, 75, 77, 22, 2, 216, 73, 231, 83, 77, 2, - 220, 249, 202, 20, 223, 107, 244, 212, 77, 2, 212, 27, 227, 236, 77, 131, - 237, 139, 77, 131, 219, 132, 77, 2, 227, 239, 215, 148, 77, 2, 203, 77, - 215, 148, 77, 2, 227, 240, 208, 21, 247, 61, 77, 2, 225, 24, 247, 61, 77, - 2, 237, 236, 247, 62, 216, 63, 77, 2, 237, 236, 225, 14, 216, 63, 77, 2, - 230, 239, 225, 24, 247, 61, 77, 210, 254, 2, 227, 240, 208, 21, 247, 61, - 77, 210, 254, 2, 225, 24, 247, 61, 77, 210, 254, 2, 230, 239, 225, 24, - 247, 61, 77, 210, 254, 1, 173, 77, 210, 254, 1, 229, 144, 77, 210, 254, - 1, 239, 8, 77, 210, 254, 1, 238, 119, 77, 210, 254, 1, 222, 203, 77, 210, - 254, 1, 247, 92, 77, 210, 254, 1, 246, 199, 77, 210, 254, 1, 230, 181, - 77, 210, 254, 1, 221, 11, 77, 210, 254, 1, 207, 241, 77, 210, 254, 1, - 207, 229, 77, 210, 254, 1, 244, 120, 77, 210, 254, 1, 244, 104, 77, 210, - 254, 1, 221, 227, 77, 210, 254, 1, 210, 22, 77, 210, 254, 1, 209, 108, - 77, 210, 254, 1, 244, 212, 77, 210, 254, 1, 244, 1, 77, 210, 254, 1, 201, - 201, 77, 210, 254, 1, 185, 77, 210, 254, 1, 218, 208, 77, 210, 254, 1, - 249, 32, 77, 210, 254, 1, 248, 98, 77, 210, 254, 1, 192, 77, 210, 254, 1, - 208, 20, 77, 210, 254, 1, 208, 10, 77, 210, 254, 1, 241, 255, 77, 210, - 254, 1, 241, 249, 77, 210, 254, 1, 204, 111, 77, 210, 254, 1, 202, 80, - 77, 210, 254, 1, 202, 116, 77, 210, 254, 1, 255, 29, 77, 210, 254, 1, - 198, 77, 210, 254, 1, 216, 220, 77, 210, 254, 1, 228, 113, 77, 210, 254, - 1, 213, 90, 77, 210, 254, 1, 211, 164, 77, 210, 254, 1, 215, 36, 77, 210, - 254, 1, 152, 77, 210, 254, 1, 63, 77, 210, 254, 1, 228, 223, 77, 210, - 254, 1, 239, 229, 204, 111, 77, 210, 254, 1, 239, 229, 198, 77, 210, 254, - 1, 239, 229, 216, 220, 77, 228, 210, 215, 146, 229, 144, 77, 228, 210, - 215, 146, 229, 145, 247, 128, 224, 126, 247, 61, 77, 247, 49, 2, 79, 248, - 155, 77, 247, 49, 2, 157, 248, 155, 77, 247, 49, 2, 247, 50, 209, 185, - 77, 247, 49, 2, 214, 204, 255, 28, 77, 16, 242, 55, 247, 193, 77, 16, - 216, 159, 215, 239, 77, 16, 219, 155, 238, 191, 77, 16, 216, 159, 215, - 240, 216, 65, 238, 8, 77, 16, 218, 171, 185, 77, 16, 221, 175, 247, 193, - 77, 16, 221, 175, 247, 194, 220, 238, 255, 25, 77, 16, 221, 175, 247, - 194, 237, 234, 255, 25, 77, 16, 221, 175, 247, 194, 247, 128, 255, 25, - 77, 2, 216, 160, 223, 99, 216, 160, 243, 126, 77, 2, 216, 160, 223, 99, - 237, 233, 77, 131, 247, 197, 212, 238, 238, 82, 224, 173, 216, 64, 77, - 131, 224, 84, 203, 3, 238, 82, 224, 173, 216, 64, 77, 131, 220, 238, 208, - 5, 77, 131, 81, 247, 220, 215, 229, 203, 3, 224, 173, 225, 22, 192, 77, - 131, 246, 12, 247, 220, 215, 229, 203, 3, 224, 173, 213, 97, 192, 216, - 15, 210, 174, 54, 227, 221, 210, 174, 54, 216, 15, 210, 174, 2, 3, 243, - 83, 227, 221, 210, 174, 2, 3, 243, 83, 77, 131, 227, 231, 225, 25, 215, - 148, 77, 131, 208, 112, 225, 25, 215, 148, 69, 1, 173, 69, 1, 229, 144, - 69, 1, 239, 8, 69, 1, 238, 119, 69, 1, 222, 203, 69, 1, 247, 92, 69, 1, - 246, 199, 69, 1, 230, 181, 69, 1, 230, 149, 69, 1, 221, 11, 69, 1, 221, - 193, 69, 1, 207, 241, 69, 1, 207, 229, 69, 1, 244, 120, 69, 1, 244, 104, - 69, 1, 221, 227, 69, 1, 210, 22, 69, 1, 209, 108, 69, 1, 244, 212, 69, 1, - 244, 1, 69, 1, 201, 201, 69, 1, 185, 69, 1, 218, 208, 69, 1, 249, 32, 69, - 1, 248, 98, 69, 1, 192, 69, 1, 198, 69, 1, 216, 220, 69, 1, 228, 113, 69, - 1, 204, 111, 69, 1, 215, 36, 69, 1, 152, 69, 1, 227, 77, 69, 1, 63, 69, - 1, 213, 67, 63, 69, 1, 75, 69, 1, 231, 83, 69, 1, 68, 69, 1, 206, 178, - 69, 1, 74, 69, 1, 224, 55, 74, 69, 1, 78, 69, 1, 250, 34, 69, 22, 2, 209, - 234, 252, 25, 69, 22, 2, 252, 25, 69, 22, 2, 75, 69, 22, 2, 231, 83, 69, - 22, 2, 68, 69, 22, 2, 206, 178, 69, 22, 2, 74, 69, 22, 2, 251, 64, 69, - 22, 2, 224, 55, 231, 83, 69, 22, 2, 224, 55, 78, 69, 22, 2, 188, 55, 69, - 2, 250, 180, 69, 2, 70, 56, 69, 2, 205, 199, 69, 2, 205, 204, 69, 2, 250, - 79, 69, 109, 2, 174, 198, 69, 109, 2, 174, 216, 220, 69, 109, 2, 174, - 204, 111, 69, 109, 2, 174, 152, 69, 1, 237, 249, 215, 36, 69, 17, 202, - 84, 69, 17, 105, 69, 17, 108, 69, 17, 147, 69, 17, 149, 69, 17, 170, 69, - 17, 195, 69, 17, 213, 111, 69, 17, 199, 69, 17, 222, 63, 69, 2, 227, 86, - 214, 167, 69, 2, 214, 167, 69, 16, 227, 44, 69, 16, 245, 227, 69, 16, - 251, 85, 69, 16, 238, 174, 69, 1, 213, 90, 69, 1, 211, 164, 69, 1, 125, - 146, 69, 1, 125, 215, 186, 69, 1, 125, 159, 69, 1, 125, 227, 78, 69, 22, - 2, 125, 146, 69, 22, 2, 125, 215, 186, 69, 22, 2, 125, 159, 69, 22, 2, - 125, 227, 78, 69, 1, 224, 55, 222, 203, 69, 1, 224, 55, 230, 149, 69, 1, - 224, 55, 248, 198, 69, 1, 224, 55, 248, 193, 69, 109, 2, 224, 55, 174, - 201, 201, 69, 109, 2, 224, 55, 174, 192, 69, 109, 2, 224, 55, 174, 228, - 113, 69, 1, 213, 96, 229, 237, 213, 90, 69, 22, 2, 213, 96, 229, 237, - 240, 238, 69, 143, 131, 213, 96, 229, 237, 237, 79, 69, 143, 131, 213, - 96, 229, 237, 229, 202, 218, 180, 69, 1, 204, 44, 217, 146, 229, 237, - 209, 108, 69, 1, 204, 44, 217, 146, 229, 237, 217, 152, 69, 22, 2, 204, - 44, 217, 146, 229, 237, 240, 238, 69, 22, 2, 204, 44, 217, 146, 229, 237, - 207, 24, 69, 2, 204, 44, 217, 146, 229, 237, 208, 160, 69, 2, 204, 44, - 217, 146, 229, 237, 208, 159, 69, 2, 204, 44, 217, 146, 229, 237, 208, - 158, 69, 2, 204, 44, 217, 146, 229, 237, 208, 157, 69, 2, 204, 44, 217, - 146, 229, 237, 208, 156, 69, 1, 241, 174, 217, 146, 229, 237, 221, 227, - 69, 1, 241, 174, 217, 146, 229, 237, 202, 176, 69, 1, 241, 174, 217, 146, - 229, 237, 238, 84, 69, 22, 2, 238, 186, 229, 237, 75, 69, 22, 2, 229, - 207, 220, 73, 69, 22, 2, 229, 207, 68, 69, 22, 2, 229, 207, 241, 161, 69, - 1, 213, 67, 173, 69, 1, 213, 67, 229, 144, 69, 1, 213, 67, 239, 8, 69, 1, - 213, 67, 247, 92, 69, 1, 213, 67, 202, 116, 69, 1, 213, 67, 221, 11, 69, - 1, 213, 67, 244, 212, 69, 1, 213, 67, 201, 201, 69, 1, 213, 67, 218, 208, - 69, 1, 213, 67, 240, 108, 69, 1, 213, 67, 249, 32, 69, 1, 213, 67, 209, - 108, 69, 1, 213, 67, 152, 69, 109, 2, 213, 67, 174, 204, 111, 69, 22, 2, - 213, 67, 252, 25, 69, 22, 2, 213, 67, 74, 69, 22, 2, 213, 67, 188, 55, - 69, 22, 2, 213, 67, 46, 203, 124, 69, 2, 213, 67, 208, 159, 69, 2, 213, - 67, 208, 158, 69, 2, 213, 67, 208, 156, 69, 2, 213, 67, 208, 155, 69, 2, - 213, 67, 245, 156, 208, 159, 69, 2, 213, 67, 245, 156, 208, 158, 69, 2, - 213, 67, 245, 156, 241, 95, 208, 161, 69, 1, 215, 130, 219, 139, 240, - 108, 69, 2, 215, 130, 219, 139, 208, 156, 69, 213, 67, 17, 202, 84, 69, - 213, 67, 17, 105, 69, 213, 67, 17, 108, 69, 213, 67, 17, 147, 69, 213, - 67, 17, 149, 69, 213, 67, 17, 170, 69, 213, 67, 17, 195, 69, 213, 67, 17, - 213, 111, 69, 213, 67, 17, 199, 69, 213, 67, 17, 222, 63, 69, 2, 229, - 137, 208, 160, 69, 2, 229, 137, 208, 158, 69, 22, 2, 251, 51, 63, 69, 22, - 2, 251, 51, 251, 64, 69, 16, 213, 67, 105, 69, 16, 213, 67, 240, 211, - 114, 6, 1, 250, 231, 114, 6, 1, 248, 242, 114, 6, 1, 238, 234, 114, 6, 1, - 243, 93, 114, 6, 1, 241, 92, 114, 6, 1, 205, 213, 114, 6, 1, 202, 87, - 114, 6, 1, 209, 230, 114, 6, 1, 231, 49, 114, 6, 1, 230, 4, 114, 6, 1, - 228, 2, 114, 6, 1, 225, 122, 114, 6, 1, 223, 74, 114, 6, 1, 220, 31, 114, - 6, 1, 219, 91, 114, 6, 1, 202, 76, 114, 6, 1, 216, 202, 114, 6, 1, 214, - 243, 114, 6, 1, 209, 218, 114, 6, 1, 206, 255, 114, 6, 1, 218, 200, 114, - 6, 1, 229, 132, 114, 6, 1, 238, 110, 114, 6, 1, 217, 111, 114, 6, 1, 212, - 255, 114, 6, 1, 246, 129, 114, 6, 1, 247, 61, 114, 6, 1, 230, 133, 114, - 6, 1, 246, 68, 114, 6, 1, 246, 183, 114, 6, 1, 203, 180, 114, 6, 1, 230, - 146, 114, 6, 1, 237, 154, 114, 6, 1, 237, 67, 114, 6, 1, 236, 254, 114, - 6, 1, 204, 62, 114, 6, 1, 237, 92, 114, 6, 1, 236, 132, 114, 6, 1, 202, - 249, 114, 6, 1, 251, 98, 114, 1, 250, 231, 114, 1, 248, 242, 114, 1, 238, - 234, 114, 1, 243, 93, 114, 1, 241, 92, 114, 1, 205, 213, 114, 1, 202, 87, - 114, 1, 209, 230, 114, 1, 231, 49, 114, 1, 230, 4, 114, 1, 228, 2, 114, - 1, 225, 122, 114, 1, 223, 74, 114, 1, 220, 31, 114, 1, 219, 91, 114, 1, - 202, 76, 114, 1, 216, 202, 114, 1, 214, 243, 114, 1, 209, 218, 114, 1, - 206, 255, 114, 1, 218, 200, 114, 1, 229, 132, 114, 1, 238, 110, 114, 1, - 217, 111, 114, 1, 212, 255, 114, 1, 246, 129, 114, 1, 247, 61, 114, 1, - 230, 133, 114, 1, 246, 68, 114, 1, 246, 183, 114, 1, 203, 180, 114, 1, - 230, 146, 114, 1, 237, 154, 114, 1, 237, 67, 114, 1, 236, 254, 114, 1, - 204, 62, 114, 1, 237, 92, 114, 1, 236, 132, 114, 1, 240, 26, 114, 1, 202, - 249, 114, 1, 241, 110, 114, 1, 207, 174, 238, 234, 114, 1, 251, 59, 114, - 219, 89, 213, 130, 65, 1, 114, 223, 74, 114, 1, 251, 98, 114, 1, 237, 91, - 54, 114, 1, 228, 104, 54, 28, 123, 229, 59, 28, 123, 211, 156, 28, 123, - 222, 93, 28, 123, 208, 240, 28, 123, 211, 145, 28, 123, 216, 47, 28, 123, - 224, 141, 28, 123, 218, 153, 28, 123, 211, 153, 28, 123, 212, 111, 28, - 123, 211, 150, 28, 123, 231, 106, 28, 123, 246, 74, 28, 123, 211, 160, - 28, 123, 246, 138, 28, 123, 229, 120, 28, 123, 209, 66, 28, 123, 218, - 190, 28, 123, 236, 251, 28, 123, 222, 89, 28, 123, 211, 154, 28, 123, - 222, 83, 28, 123, 222, 87, 28, 123, 208, 237, 28, 123, 216, 35, 28, 123, - 211, 152, 28, 123, 216, 45, 28, 123, 229, 243, 28, 123, 224, 134, 28, - 123, 229, 246, 28, 123, 218, 148, 28, 123, 218, 146, 28, 123, 218, 134, - 28, 123, 218, 142, 28, 123, 218, 140, 28, 123, 218, 137, 28, 123, 218, - 139, 28, 123, 218, 136, 28, 123, 218, 141, 28, 123, 218, 151, 28, 123, - 218, 152, 28, 123, 218, 135, 28, 123, 218, 145, 28, 123, 229, 244, 28, - 123, 229, 242, 28, 123, 212, 104, 28, 123, 212, 102, 28, 123, 212, 94, - 28, 123, 212, 97, 28, 123, 212, 103, 28, 123, 212, 99, 28, 123, 212, 98, - 28, 123, 212, 96, 28, 123, 212, 107, 28, 123, 212, 109, 28, 123, 212, - 110, 28, 123, 212, 105, 28, 123, 212, 95, 28, 123, 212, 100, 28, 123, - 212, 108, 28, 123, 246, 120, 28, 123, 246, 118, 28, 123, 246, 210, 28, - 123, 246, 208, 28, 123, 219, 107, 28, 123, 231, 101, 28, 123, 231, 92, - 28, 123, 231, 100, 28, 123, 231, 97, 28, 123, 231, 95, 28, 123, 231, 99, - 28, 123, 211, 157, 28, 123, 231, 104, 28, 123, 231, 105, 28, 123, 231, - 93, 28, 123, 231, 98, 28, 123, 203, 29, 28, 123, 246, 73, 28, 123, 246, - 121, 28, 123, 246, 119, 28, 123, 246, 211, 28, 123, 246, 209, 28, 123, - 246, 136, 28, 123, 246, 137, 28, 123, 246, 122, 28, 123, 246, 212, 28, - 123, 218, 188, 28, 123, 229, 245, 28, 123, 211, 158, 28, 123, 203, 35, - 28, 123, 229, 50, 28, 123, 222, 85, 28, 123, 222, 91, 28, 123, 222, 90, - 28, 123, 208, 234, 28, 123, 240, 7, 28, 176, 240, 7, 28, 176, 63, 28, - 176, 251, 109, 28, 176, 198, 28, 176, 203, 99, 28, 176, 241, 55, 28, 176, - 74, 28, 176, 203, 39, 28, 176, 203, 52, 28, 176, 78, 28, 176, 204, 111, - 28, 176, 204, 107, 28, 176, 220, 73, 28, 176, 202, 247, 28, 176, 68, 28, - 176, 204, 48, 28, 176, 204, 62, 28, 176, 204, 30, 28, 176, 202, 213, 28, - 176, 240, 238, 28, 176, 203, 11, 28, 176, 75, 28, 176, 255, 20, 28, 176, - 255, 19, 28, 176, 203, 113, 28, 176, 203, 111, 28, 176, 241, 53, 28, 176, - 241, 52, 28, 176, 241, 54, 28, 176, 203, 38, 28, 176, 203, 37, 28, 176, - 220, 181, 28, 176, 220, 182, 28, 176, 220, 175, 28, 176, 220, 180, 28, - 176, 220, 178, 28, 176, 202, 241, 28, 176, 202, 240, 28, 176, 202, 239, - 28, 176, 202, 242, 28, 176, 202, 243, 28, 176, 207, 97, 28, 176, 207, 96, - 28, 176, 207, 94, 28, 176, 207, 90, 28, 176, 207, 91, 28, 176, 202, 212, - 28, 176, 202, 209, 28, 176, 202, 210, 28, 176, 202, 204, 28, 176, 202, - 205, 28, 176, 202, 206, 28, 176, 202, 208, 28, 176, 240, 232, 28, 176, - 240, 234, 28, 176, 203, 10, 28, 176, 235, 205, 28, 176, 235, 197, 28, - 176, 235, 200, 28, 176, 235, 198, 28, 176, 235, 202, 28, 176, 235, 204, - 28, 176, 250, 137, 28, 176, 250, 134, 28, 176, 250, 132, 28, 176, 250, - 133, 28, 176, 211, 161, 28, 176, 255, 21, 28, 176, 203, 112, 28, 176, - 203, 36, 28, 176, 220, 177, 28, 176, 220, 176, 28, 107, 229, 59, 28, 107, - 211, 156, 28, 107, 229, 52, 28, 107, 222, 93, 28, 107, 222, 91, 28, 107, - 222, 90, 28, 107, 208, 240, 28, 107, 216, 47, 28, 107, 216, 42, 28, 107, - 216, 39, 28, 107, 216, 32, 28, 107, 216, 27, 28, 107, 216, 22, 28, 107, - 216, 33, 28, 107, 216, 45, 28, 107, 224, 141, 28, 107, 218, 153, 28, 107, - 218, 142, 28, 107, 212, 111, 28, 107, 211, 150, 28, 107, 231, 106, 28, - 107, 246, 74, 28, 107, 246, 138, 28, 107, 229, 120, 28, 107, 209, 66, 28, - 107, 218, 190, 28, 107, 236, 251, 28, 107, 229, 53, 28, 107, 229, 51, 28, - 107, 222, 89, 28, 107, 222, 83, 28, 107, 222, 85, 28, 107, 222, 88, 28, - 107, 222, 84, 28, 107, 208, 237, 28, 107, 208, 234, 28, 107, 216, 40, 28, - 107, 216, 35, 28, 107, 216, 21, 28, 107, 216, 20, 28, 107, 211, 152, 28, - 107, 216, 37, 28, 107, 216, 36, 28, 107, 216, 29, 28, 107, 216, 31, 28, - 107, 216, 44, 28, 107, 216, 24, 28, 107, 216, 34, 28, 107, 216, 43, 28, - 107, 216, 19, 28, 107, 224, 137, 28, 107, 224, 132, 28, 107, 224, 134, - 28, 107, 224, 131, 28, 107, 224, 129, 28, 107, 224, 135, 28, 107, 224, - 140, 28, 107, 224, 138, 28, 107, 229, 246, 28, 107, 218, 144, 28, 107, - 218, 145, 28, 107, 218, 150, 28, 107, 229, 244, 28, 107, 212, 104, 28, - 107, 212, 94, 28, 107, 212, 97, 28, 107, 212, 99, 28, 107, 219, 107, 28, - 107, 231, 101, 28, 107, 231, 94, 28, 107, 211, 157, 28, 107, 231, 102, - 28, 107, 203, 29, 28, 107, 203, 25, 28, 107, 203, 26, 28, 107, 218, 188, - 28, 107, 229, 245, 28, 107, 236, 249, 28, 107, 236, 247, 28, 107, 236, - 250, 28, 107, 236, 248, 28, 107, 203, 35, 28, 107, 229, 55, 28, 107, 229, - 54, 28, 107, 229, 58, 28, 107, 229, 56, 28, 107, 229, 57, 28, 107, 211, - 154, 33, 4, 152, 33, 4, 236, 26, 33, 4, 237, 3, 33, 4, 237, 157, 33, 4, - 237, 48, 33, 4, 237, 67, 33, 4, 236, 136, 33, 4, 236, 135, 33, 4, 228, - 113, 33, 4, 226, 239, 33, 4, 227, 148, 33, 4, 228, 112, 33, 4, 227, 226, - 33, 4, 227, 234, 33, 4, 227, 49, 33, 4, 226, 207, 33, 4, 237, 12, 33, 4, - 237, 6, 33, 4, 237, 8, 33, 4, 237, 11, 33, 4, 237, 9, 33, 4, 237, 10, 33, - 4, 237, 7, 33, 4, 237, 5, 33, 4, 192, 33, 4, 223, 246, 33, 4, 224, 155, - 33, 4, 225, 175, 33, 4, 225, 8, 33, 4, 225, 20, 33, 4, 224, 82, 33, 4, - 223, 180, 33, 4, 210, 80, 33, 4, 210, 74, 33, 4, 210, 76, 33, 4, 210, 79, - 33, 4, 210, 77, 33, 4, 210, 78, 33, 4, 210, 75, 33, 4, 210, 73, 33, 4, - 216, 220, 33, 4, 215, 145, 33, 4, 216, 57, 33, 4, 216, 216, 33, 4, 216, - 135, 33, 4, 216, 158, 33, 4, 215, 227, 33, 4, 215, 111, 33, 4, 215, 36, - 33, 4, 211, 10, 33, 4, 212, 162, 33, 4, 215, 33, 33, 4, 214, 165, 33, 4, - 214, 177, 33, 4, 212, 13, 33, 4, 210, 172, 33, 4, 213, 90, 33, 4, 212, - 199, 33, 4, 213, 11, 33, 4, 213, 85, 33, 4, 213, 41, 33, 4, 213, 43, 33, - 4, 212, 242, 33, 4, 212, 180, 33, 4, 217, 126, 33, 4, 217, 65, 33, 4, - 217, 88, 33, 4, 217, 125, 33, 4, 217, 105, 33, 4, 217, 106, 33, 4, 217, - 77, 33, 4, 217, 76, 33, 4, 217, 19, 33, 4, 217, 15, 33, 4, 217, 18, 33, - 4, 217, 16, 33, 4, 217, 17, 33, 4, 217, 102, 33, 4, 217, 94, 33, 4, 217, - 97, 33, 4, 217, 101, 33, 4, 217, 98, 33, 4, 217, 99, 33, 4, 217, 96, 33, - 4, 217, 93, 33, 4, 217, 89, 33, 4, 217, 92, 33, 4, 217, 90, 33, 4, 217, - 91, 33, 4, 249, 32, 33, 4, 247, 193, 33, 4, 248, 86, 33, 4, 249, 30, 33, - 4, 248, 150, 33, 4, 248, 162, 33, 4, 248, 23, 33, 4, 247, 142, 33, 4, - 206, 86, 33, 4, 204, 163, 33, 4, 205, 230, 33, 4, 206, 85, 33, 4, 206, - 50, 33, 4, 206, 55, 33, 4, 205, 189, 33, 4, 204, 154, 33, 4, 210, 22, 33, - 4, 207, 203, 33, 4, 209, 2, 33, 4, 210, 18, 33, 4, 209, 176, 33, 4, 209, - 187, 33, 4, 135, 33, 4, 207, 160, 33, 4, 247, 92, 33, 4, 245, 110, 33, 4, - 246, 79, 33, 4, 247, 91, 33, 4, 246, 230, 33, 4, 246, 238, 33, 4, 245, - 254, 33, 4, 245, 74, 33, 4, 203, 182, 33, 4, 203, 152, 33, 4, 203, 170, - 33, 4, 203, 181, 33, 4, 203, 175, 33, 4, 203, 176, 33, 4, 203, 160, 33, - 4, 203, 159, 33, 4, 203, 146, 33, 4, 203, 142, 33, 4, 203, 145, 33, 4, - 203, 143, 33, 4, 203, 144, 33, 4, 201, 201, 33, 4, 221, 84, 33, 4, 222, - 100, 33, 4, 223, 106, 33, 4, 222, 235, 33, 4, 222, 240, 33, 4, 221, 191, - 33, 4, 221, 20, 33, 4, 221, 11, 33, 4, 220, 226, 33, 4, 220, 248, 33, 4, - 221, 10, 33, 4, 221, 0, 33, 4, 221, 1, 33, 4, 220, 233, 33, 4, 220, 216, - 33, 4, 238, 45, 63, 33, 4, 238, 45, 68, 33, 4, 238, 45, 75, 33, 4, 238, - 45, 252, 25, 33, 4, 238, 45, 241, 161, 33, 4, 238, 45, 74, 33, 4, 238, - 45, 78, 33, 4, 238, 45, 204, 111, 33, 4, 173, 33, 4, 228, 209, 33, 4, - 229, 100, 33, 4, 230, 41, 33, 4, 229, 198, 33, 4, 229, 201, 33, 4, 229, - 26, 33, 4, 229, 25, 33, 4, 228, 167, 33, 4, 228, 160, 33, 4, 228, 166, - 33, 4, 228, 161, 33, 4, 228, 162, 33, 4, 228, 153, 33, 4, 228, 147, 33, - 4, 228, 149, 33, 4, 228, 152, 33, 4, 228, 150, 33, 4, 228, 151, 33, 4, - 228, 148, 33, 4, 228, 146, 33, 4, 228, 142, 33, 4, 228, 145, 33, 4, 228, - 143, 33, 4, 228, 144, 33, 4, 204, 111, 33, 4, 203, 217, 33, 4, 204, 30, - 33, 4, 204, 110, 33, 4, 204, 55, 33, 4, 204, 62, 33, 4, 204, 0, 33, 4, - 203, 255, 33, 4, 218, 199, 63, 33, 4, 218, 199, 68, 33, 4, 218, 199, 75, - 33, 4, 218, 199, 252, 25, 33, 4, 218, 199, 241, 161, 33, 4, 218, 199, 74, - 33, 4, 218, 199, 78, 33, 4, 202, 116, 33, 4, 202, 6, 33, 4, 202, 39, 33, - 4, 202, 114, 33, 4, 202, 90, 33, 4, 202, 92, 33, 4, 202, 17, 33, 4, 201, - 249, 33, 4, 202, 80, 33, 4, 202, 57, 33, 4, 202, 66, 33, 4, 202, 79, 33, - 4, 202, 70, 33, 4, 202, 71, 33, 4, 202, 63, 33, 4, 202, 48, 33, 4, 198, - 33, 4, 202, 213, 33, 4, 203, 11, 33, 4, 203, 110, 33, 4, 203, 49, 33, 4, - 203, 52, 33, 4, 202, 247, 33, 4, 202, 238, 33, 4, 244, 212, 33, 4, 242, - 42, 33, 4, 243, 233, 33, 4, 244, 211, 33, 4, 244, 61, 33, 4, 244, 75, 33, - 4, 243, 113, 33, 4, 242, 10, 33, 4, 244, 120, 33, 4, 244, 85, 33, 4, 244, - 97, 33, 4, 244, 119, 33, 4, 244, 107, 33, 4, 244, 108, 33, 4, 244, 90, - 33, 4, 244, 76, 33, 4, 230, 181, 33, 4, 230, 82, 33, 4, 230, 141, 33, 4, - 230, 180, 33, 4, 230, 159, 33, 4, 230, 161, 33, 4, 230, 101, 33, 4, 230, - 62, 33, 4, 239, 8, 33, 4, 237, 230, 33, 4, 238, 81, 33, 4, 239, 5, 33, 4, - 238, 182, 33, 4, 238, 190, 33, 4, 238, 39, 33, 4, 238, 38, 33, 4, 237, - 190, 33, 4, 237, 186, 33, 4, 237, 189, 33, 4, 237, 187, 33, 4, 237, 188, - 33, 4, 238, 155, 33, 4, 238, 135, 33, 4, 238, 145, 33, 4, 238, 154, 33, - 4, 238, 149, 33, 4, 238, 150, 33, 4, 238, 139, 33, 4, 238, 124, 33, 4, - 209, 108, 33, 4, 209, 22, 33, 4, 209, 70, 33, 4, 209, 107, 33, 4, 209, - 90, 33, 4, 209, 92, 33, 4, 209, 47, 33, 4, 209, 13, 33, 4, 246, 199, 33, - 4, 246, 98, 33, 4, 246, 142, 33, 4, 246, 198, 33, 4, 246, 166, 33, 4, - 246, 170, 33, 4, 246, 116, 33, 4, 246, 87, 33, 4, 218, 208, 33, 4, 218, - 173, 33, 4, 218, 192, 33, 4, 218, 207, 33, 4, 218, 194, 33, 4, 218, 195, - 33, 4, 218, 180, 33, 4, 218, 169, 33, 4, 208, 20, 33, 4, 207, 249, 33, 4, - 207, 255, 33, 4, 208, 19, 33, 4, 208, 13, 33, 4, 208, 14, 33, 4, 207, - 253, 33, 4, 207, 247, 33, 4, 207, 106, 33, 4, 207, 98, 33, 4, 207, 102, - 33, 4, 207, 105, 33, 4, 207, 103, 33, 4, 207, 104, 33, 4, 207, 100, 33, - 4, 207, 99, 33, 4, 240, 108, 33, 4, 239, 108, 33, 4, 240, 26, 33, 4, 240, - 107, 33, 4, 240, 53, 33, 4, 240, 60, 33, 4, 239, 186, 33, 4, 239, 86, 33, - 4, 185, 33, 4, 217, 191, 33, 4, 218, 167, 33, 4, 219, 168, 33, 4, 219, - 23, 33, 4, 219, 34, 33, 4, 218, 69, 33, 4, 217, 152, 33, 4, 215, 101, 33, - 4, 223, 169, 33, 4, 239, 80, 33, 39, 238, 179, 25, 22, 227, 196, 82, 33, - 39, 22, 227, 196, 82, 33, 39, 238, 179, 82, 33, 214, 168, 82, 33, 203, - 237, 33, 239, 102, 211, 61, 33, 245, 233, 33, 213, 143, 33, 245, 242, 33, - 217, 246, 245, 242, 33, 217, 47, 82, 33, 219, 89, 213, 130, 33, 17, 105, - 33, 17, 108, 33, 17, 147, 33, 17, 149, 33, 17, 170, 33, 17, 195, 33, 17, - 213, 111, 33, 17, 199, 33, 17, 222, 63, 33, 42, 209, 152, 33, 42, 207, - 151, 33, 42, 209, 53, 33, 42, 239, 153, 33, 42, 240, 18, 33, 42, 212, 74, - 33, 42, 213, 105, 33, 42, 241, 134, 33, 42, 222, 58, 33, 42, 236, 11, 33, - 42, 209, 153, 209, 36, 33, 4, 214, 173, 223, 180, 33, 4, 223, 176, 33, 4, - 223, 177, 33, 4, 223, 178, 33, 4, 214, 173, 247, 142, 33, 4, 247, 139, - 33, 4, 247, 140, 33, 4, 247, 141, 33, 4, 214, 173, 239, 86, 33, 4, 239, - 82, 33, 4, 239, 83, 33, 4, 239, 84, 33, 4, 214, 173, 217, 152, 33, 4, - 217, 148, 33, 4, 217, 149, 33, 4, 217, 150, 33, 208, 162, 131, 202, 250, - 33, 208, 162, 131, 244, 22, 33, 208, 162, 131, 216, 2, 33, 208, 162, 131, - 212, 228, 216, 2, 33, 208, 162, 131, 243, 207, 33, 208, 162, 131, 229, - 179, 33, 208, 162, 131, 246, 124, 33, 208, 162, 131, 237, 0, 33, 208, - 162, 131, 244, 21, 33, 208, 162, 131, 228, 181, 90, 1, 63, 90, 1, 74, 90, - 1, 75, 90, 1, 78, 90, 1, 68, 90, 1, 206, 164, 90, 1, 239, 8, 90, 1, 173, - 90, 1, 238, 190, 90, 1, 238, 81, 90, 1, 238, 39, 90, 1, 237, 230, 90, 1, - 237, 192, 90, 1, 152, 90, 1, 237, 67, 90, 1, 237, 3, 90, 1, 236, 136, 90, - 1, 236, 26, 90, 1, 235, 255, 90, 1, 228, 113, 90, 1, 227, 234, 90, 1, - 227, 148, 90, 1, 227, 49, 90, 1, 226, 239, 90, 1, 226, 208, 90, 1, 192, - 90, 1, 225, 20, 90, 1, 224, 155, 90, 1, 224, 82, 90, 1, 223, 246, 90, 1, - 201, 201, 90, 1, 236, 160, 90, 1, 223, 93, 90, 1, 222, 240, 90, 1, 222, - 100, 90, 1, 221, 191, 90, 1, 221, 84, 90, 1, 221, 22, 90, 1, 217, 64, 90, - 1, 217, 50, 90, 1, 217, 43, 90, 1, 217, 34, 90, 1, 217, 23, 90, 1, 217, - 21, 90, 1, 215, 36, 90, 1, 194, 90, 1, 214, 177, 90, 1, 212, 162, 90, 1, - 212, 13, 90, 1, 211, 10, 90, 1, 210, 177, 90, 1, 244, 212, 90, 1, 210, - 22, 90, 1, 244, 75, 90, 1, 209, 187, 90, 1, 243, 233, 90, 1, 209, 2, 90, - 1, 243, 113, 90, 1, 242, 42, 90, 1, 242, 13, 90, 1, 243, 124, 90, 1, 208, - 190, 90, 1, 208, 189, 90, 1, 208, 178, 90, 1, 208, 177, 90, 1, 208, 176, - 90, 1, 208, 175, 90, 1, 208, 20, 90, 1, 208, 14, 90, 1, 207, 255, 90, 1, - 207, 253, 90, 1, 207, 249, 90, 1, 207, 248, 90, 1, 204, 111, 90, 1, 204, - 62, 90, 1, 204, 30, 90, 1, 204, 0, 90, 1, 203, 217, 90, 1, 203, 204, 90, - 1, 198, 90, 1, 203, 52, 90, 1, 203, 11, 90, 1, 202, 247, 90, 1, 202, 213, - 90, 1, 202, 177, 90, 1, 223, 187, 90, 5, 1, 203, 52, 90, 5, 1, 203, 11, - 90, 5, 1, 202, 247, 90, 5, 1, 202, 213, 90, 5, 1, 202, 177, 90, 5, 1, - 223, 187, 19, 20, 235, 220, 19, 20, 74, 19, 20, 251, 245, 19, 20, 75, 19, - 20, 231, 83, 19, 20, 78, 19, 20, 220, 18, 19, 20, 203, 123, 220, 18, 19, - 20, 88, 241, 161, 19, 20, 88, 75, 19, 20, 63, 19, 20, 252, 25, 19, 20, - 204, 62, 19, 20, 196, 204, 62, 19, 20, 204, 30, 19, 20, 196, 204, 30, 19, - 20, 204, 19, 19, 20, 196, 204, 19, 19, 20, 204, 0, 19, 20, 196, 204, 0, - 19, 20, 203, 244, 19, 20, 196, 203, 244, 19, 20, 223, 68, 203, 244, 19, - 20, 204, 111, 19, 20, 196, 204, 111, 19, 20, 204, 110, 19, 20, 196, 204, - 110, 19, 20, 223, 68, 204, 110, 19, 20, 251, 64, 19, 20, 203, 123, 204, - 144, 19, 20, 238, 45, 211, 61, 19, 20, 46, 165, 19, 20, 46, 237, 253, 19, - 20, 46, 247, 248, 162, 215, 252, 19, 20, 46, 208, 145, 162, 215, 252, 19, - 20, 46, 50, 162, 215, 252, 19, 20, 46, 215, 252, 19, 20, 46, 52, 165, 19, - 20, 46, 52, 212, 228, 80, 211, 19, 19, 20, 46, 101, 243, 85, 19, 20, 46, - 212, 228, 236, 106, 95, 19, 20, 46, 218, 76, 19, 20, 46, 121, 210, 3, 19, - 20, 241, 92, 19, 20, 231, 49, 19, 20, 220, 31, 19, 20, 250, 231, 19, 20, - 219, 34, 19, 20, 219, 166, 19, 20, 218, 167, 19, 20, 218, 129, 19, 20, - 218, 69, 19, 20, 218, 45, 19, 20, 203, 123, 218, 45, 19, 20, 88, 237, 48, - 19, 20, 88, 237, 3, 19, 20, 185, 19, 20, 219, 168, 19, 20, 217, 150, 19, - 20, 196, 217, 150, 19, 20, 217, 148, 19, 20, 196, 217, 148, 19, 20, 217, - 147, 19, 20, 196, 217, 147, 19, 20, 217, 145, 19, 20, 196, 217, 145, 19, - 20, 217, 144, 19, 20, 196, 217, 144, 19, 20, 217, 152, 19, 20, 196, 217, - 152, 19, 20, 217, 151, 19, 20, 196, 217, 151, 19, 20, 203, 123, 217, 151, - 19, 20, 219, 184, 19, 20, 196, 219, 184, 19, 20, 88, 237, 171, 19, 20, - 209, 187, 19, 20, 210, 16, 19, 20, 209, 2, 19, 20, 208, 242, 19, 20, 135, - 19, 20, 208, 148, 19, 20, 203, 123, 208, 148, 19, 20, 88, 244, 61, 19, - 20, 88, 243, 233, 19, 20, 210, 22, 19, 20, 210, 18, 19, 20, 207, 158, 19, - 20, 196, 207, 158, 19, 20, 207, 140, 19, 20, 196, 207, 140, 19, 20, 207, - 139, 19, 20, 196, 207, 139, 19, 20, 108, 19, 20, 196, 108, 19, 20, 207, - 130, 19, 20, 196, 207, 130, 19, 20, 207, 160, 19, 20, 196, 207, 160, 19, - 20, 207, 159, 19, 20, 196, 207, 159, 19, 20, 223, 68, 207, 159, 19, 20, - 210, 69, 19, 20, 207, 236, 19, 20, 207, 220, 19, 20, 207, 218, 19, 20, - 207, 241, 19, 20, 229, 201, 19, 20, 230, 36, 19, 20, 229, 100, 19, 20, - 229, 87, 19, 20, 229, 26, 19, 20, 229, 6, 19, 20, 203, 123, 229, 6, 19, - 20, 173, 19, 20, 230, 41, 19, 20, 228, 162, 19, 20, 196, 228, 162, 19, - 20, 228, 160, 19, 20, 196, 228, 160, 19, 20, 228, 159, 19, 20, 196, 228, - 159, 19, 20, 228, 157, 19, 20, 196, 228, 157, 19, 20, 228, 156, 19, 20, - 196, 228, 156, 19, 20, 228, 167, 19, 20, 196, 228, 167, 19, 20, 228, 166, - 19, 20, 196, 228, 166, 19, 20, 223, 68, 228, 166, 19, 20, 230, 54, 19, - 20, 228, 168, 19, 20, 211, 237, 229, 191, 19, 20, 211, 237, 229, 88, 19, - 20, 211, 237, 229, 20, 19, 20, 211, 237, 230, 20, 19, 20, 246, 238, 19, - 20, 247, 90, 19, 20, 246, 79, 19, 20, 246, 69, 19, 20, 245, 254, 19, 20, - 245, 180, 19, 20, 203, 123, 245, 180, 19, 20, 247, 92, 19, 20, 247, 91, - 19, 20, 245, 72, 19, 20, 196, 245, 72, 19, 20, 245, 70, 19, 20, 196, 245, - 70, 19, 20, 245, 69, 19, 20, 196, 245, 69, 19, 20, 245, 68, 19, 20, 196, - 245, 68, 19, 20, 245, 67, 19, 20, 196, 245, 67, 19, 20, 245, 74, 19, 20, - 196, 245, 74, 19, 20, 245, 73, 19, 20, 196, 245, 73, 19, 20, 223, 68, - 245, 73, 19, 20, 247, 125, 19, 20, 214, 206, 209, 110, 19, 20, 225, 20, - 19, 20, 225, 174, 19, 20, 224, 155, 19, 20, 224, 125, 19, 20, 224, 82, - 19, 20, 224, 35, 19, 20, 203, 123, 224, 35, 19, 20, 192, 19, 20, 225, - 175, 19, 20, 223, 178, 19, 20, 196, 223, 178, 19, 20, 223, 176, 19, 20, - 196, 223, 176, 19, 20, 223, 175, 19, 20, 196, 223, 175, 19, 20, 223, 174, - 19, 20, 196, 223, 174, 19, 20, 223, 173, 19, 20, 196, 223, 173, 19, 20, - 223, 180, 19, 20, 196, 223, 180, 19, 20, 223, 179, 19, 20, 196, 223, 179, - 19, 20, 223, 68, 223, 179, 19, 20, 226, 185, 19, 20, 196, 226, 185, 19, - 20, 224, 159, 19, 20, 250, 48, 226, 185, 19, 20, 214, 206, 226, 185, 19, - 20, 222, 240, 19, 20, 223, 105, 19, 20, 222, 100, 19, 20, 222, 75, 19, - 20, 221, 191, 19, 20, 221, 180, 19, 20, 203, 123, 221, 180, 19, 20, 201, - 201, 19, 20, 223, 106, 19, 20, 221, 18, 19, 20, 196, 221, 18, 19, 20, - 221, 20, 19, 20, 196, 221, 20, 19, 20, 221, 19, 19, 20, 196, 221, 19, 19, - 20, 223, 68, 221, 19, 19, 20, 223, 163, 19, 20, 88, 222, 205, 19, 20, - 222, 105, 19, 20, 227, 234, 19, 20, 228, 111, 19, 20, 227, 148, 19, 20, - 227, 130, 19, 20, 227, 49, 19, 20, 227, 18, 19, 20, 203, 123, 227, 18, - 19, 20, 228, 113, 19, 20, 228, 112, 19, 20, 226, 205, 19, 20, 196, 226, - 205, 19, 20, 226, 204, 19, 20, 196, 226, 204, 19, 20, 226, 203, 19, 20, - 196, 226, 203, 19, 20, 226, 202, 19, 20, 196, 226, 202, 19, 20, 226, 201, - 19, 20, 196, 226, 201, 19, 20, 226, 207, 19, 20, 196, 226, 207, 19, 20, - 226, 206, 19, 20, 196, 226, 206, 19, 20, 159, 19, 20, 196, 159, 19, 20, - 174, 159, 19, 20, 214, 177, 19, 20, 215, 31, 19, 20, 212, 162, 19, 20, - 212, 142, 19, 20, 212, 13, 19, 20, 211, 250, 19, 20, 203, 123, 211, 250, - 19, 20, 215, 36, 19, 20, 215, 33, 19, 20, 210, 168, 19, 20, 196, 210, - 168, 19, 20, 210, 162, 19, 20, 196, 210, 162, 19, 20, 210, 161, 19, 20, - 196, 210, 161, 19, 20, 210, 157, 19, 20, 196, 210, 157, 19, 20, 210, 156, - 19, 20, 196, 210, 156, 19, 20, 210, 172, 19, 20, 196, 210, 172, 19, 20, - 210, 171, 19, 20, 196, 210, 171, 19, 20, 223, 68, 210, 171, 19, 20, 194, - 19, 20, 250, 48, 194, 19, 20, 210, 173, 19, 20, 248, 40, 194, 19, 20, - 224, 28, 212, 70, 19, 20, 223, 68, 212, 61, 19, 20, 223, 68, 215, 92, 19, - 20, 223, 68, 211, 179, 19, 20, 223, 68, 211, 13, 19, 20, 223, 68, 212, - 60, 19, 20, 223, 68, 214, 180, 19, 20, 213, 43, 19, 20, 213, 11, 19, 20, - 213, 6, 19, 20, 212, 242, 19, 20, 212, 236, 19, 20, 213, 90, 19, 20, 213, - 85, 19, 20, 212, 177, 19, 20, 196, 212, 177, 19, 20, 212, 176, 19, 20, - 196, 212, 176, 19, 20, 212, 175, 19, 20, 196, 212, 175, 19, 20, 212, 174, - 19, 20, 196, 212, 174, 19, 20, 212, 173, 19, 20, 196, 212, 173, 19, 20, - 212, 180, 19, 20, 196, 212, 180, 19, 20, 212, 179, 19, 20, 196, 212, 179, - 19, 20, 213, 92, 19, 20, 203, 52, 19, 20, 203, 108, 19, 20, 203, 11, 19, - 20, 203, 2, 19, 20, 202, 247, 19, 20, 202, 232, 19, 20, 203, 123, 202, - 232, 19, 20, 198, 19, 20, 203, 110, 19, 20, 202, 174, 19, 20, 196, 202, - 174, 19, 20, 202, 173, 19, 20, 196, 202, 173, 19, 20, 202, 172, 19, 20, - 196, 202, 172, 19, 20, 202, 171, 19, 20, 196, 202, 171, 19, 20, 202, 170, - 19, 20, 196, 202, 170, 19, 20, 202, 176, 19, 20, 196, 202, 176, 19, 20, - 202, 175, 19, 20, 196, 202, 175, 19, 20, 223, 68, 202, 175, 19, 20, 203, - 124, 19, 20, 248, 84, 203, 124, 19, 20, 196, 203, 124, 19, 20, 214, 206, - 203, 11, 19, 20, 216, 158, 19, 20, 217, 0, 216, 158, 19, 20, 196, 227, - 234, 19, 20, 216, 215, 19, 20, 216, 57, 19, 20, 216, 3, 19, 20, 215, 227, - 19, 20, 215, 208, 19, 20, 196, 227, 49, 19, 20, 216, 220, 19, 20, 216, - 216, 19, 20, 196, 228, 113, 19, 20, 215, 110, 19, 20, 196, 215, 110, 19, - 20, 146, 19, 20, 196, 146, 19, 20, 174, 146, 19, 20, 240, 60, 19, 20, - 240, 105, 19, 20, 240, 26, 19, 20, 240, 12, 19, 20, 239, 186, 19, 20, - 239, 175, 19, 20, 240, 108, 19, 20, 240, 107, 19, 20, 239, 85, 19, 20, - 196, 239, 85, 19, 20, 240, 174, 19, 20, 209, 92, 19, 20, 223, 161, 209, - 92, 19, 20, 209, 70, 19, 20, 223, 161, 209, 70, 19, 20, 209, 64, 19, 20, - 223, 161, 209, 64, 19, 20, 209, 47, 19, 20, 209, 42, 19, 20, 209, 108, - 19, 20, 209, 107, 19, 20, 209, 12, 19, 20, 196, 209, 12, 19, 20, 209, - 110, 19, 20, 207, 227, 19, 20, 207, 225, 19, 20, 207, 224, 19, 20, 207, - 229, 19, 20, 207, 230, 19, 20, 207, 124, 19, 20, 207, 123, 19, 20, 207, - 122, 19, 20, 207, 126, 19, 20, 221, 39, 237, 67, 19, 20, 221, 39, 237, 3, - 19, 20, 221, 39, 236, 239, 19, 20, 221, 39, 236, 136, 19, 20, 221, 39, - 236, 117, 19, 20, 221, 39, 152, 19, 20, 221, 39, 237, 157, 19, 20, 221, - 39, 237, 171, 19, 20, 221, 38, 237, 171, 19, 20, 236, 226, 19, 20, 217, - 122, 19, 20, 217, 88, 19, 20, 217, 83, 19, 20, 217, 77, 19, 20, 217, 72, - 19, 20, 217, 126, 19, 20, 217, 125, 19, 20, 217, 134, 19, 20, 208, 186, - 19, 20, 208, 184, 19, 20, 208, 183, 19, 20, 208, 187, 19, 20, 196, 216, - 158, 19, 20, 196, 216, 57, 19, 20, 196, 215, 227, 19, 20, 196, 216, 220, - 19, 20, 222, 201, 19, 20, 222, 151, 19, 20, 222, 147, 19, 20, 222, 128, - 19, 20, 222, 123, 19, 20, 222, 203, 19, 20, 222, 202, 19, 20, 222, 205, - 19, 20, 221, 220, 19, 20, 214, 206, 213, 43, 19, 20, 214, 206, 213, 11, - 19, 20, 214, 206, 212, 242, 19, 20, 214, 206, 213, 90, 19, 20, 203, 242, - 209, 92, 19, 20, 203, 242, 209, 70, 19, 20, 203, 242, 209, 47, 19, 20, - 203, 242, 209, 108, 19, 20, 203, 242, 209, 110, 19, 20, 227, 155, 19, 20, - 227, 154, 19, 20, 227, 153, 19, 20, 227, 152, 19, 20, 227, 161, 19, 20, - 227, 160, 19, 20, 227, 162, 19, 20, 209, 109, 209, 92, 19, 20, 209, 109, - 209, 70, 19, 20, 209, 109, 209, 64, 19, 20, 209, 109, 209, 47, 19, 20, - 209, 109, 209, 42, 19, 20, 209, 109, 209, 108, 19, 20, 209, 109, 209, - 107, 19, 20, 209, 109, 209, 110, 19, 20, 251, 50, 249, 255, 19, 20, 248, - 40, 74, 19, 20, 248, 40, 75, 19, 20, 248, 40, 78, 19, 20, 248, 40, 63, - 19, 20, 248, 40, 204, 62, 19, 20, 248, 40, 204, 30, 19, 20, 248, 40, 204, - 0, 19, 20, 248, 40, 204, 111, 19, 20, 248, 40, 222, 240, 19, 20, 248, 40, - 222, 100, 19, 20, 248, 40, 221, 191, 19, 20, 248, 40, 201, 201, 19, 20, - 248, 40, 229, 201, 19, 20, 248, 40, 229, 100, 19, 20, 248, 40, 229, 26, - 19, 20, 248, 40, 173, 19, 20, 214, 206, 237, 67, 19, 20, 214, 206, 237, - 3, 19, 20, 214, 206, 236, 136, 19, 20, 214, 206, 152, 19, 20, 88, 238, - 87, 19, 20, 88, 238, 91, 19, 20, 88, 238, 105, 19, 20, 88, 238, 104, 19, - 20, 88, 238, 93, 19, 20, 88, 238, 119, 19, 20, 88, 215, 145, 19, 20, 88, - 215, 227, 19, 20, 88, 216, 158, 19, 20, 88, 216, 135, 19, 20, 88, 216, - 57, 19, 20, 88, 216, 220, 19, 20, 88, 203, 217, 19, 20, 88, 204, 0, 19, - 20, 88, 204, 62, 19, 20, 88, 204, 55, 19, 20, 88, 204, 30, 19, 20, 88, - 204, 111, 19, 20, 88, 235, 247, 19, 20, 88, 235, 248, 19, 20, 88, 235, - 251, 19, 20, 88, 235, 250, 19, 20, 88, 235, 249, 19, 20, 88, 235, 254, - 19, 20, 88, 209, 22, 19, 20, 88, 209, 47, 19, 20, 88, 209, 92, 19, 20, - 88, 209, 90, 19, 20, 88, 209, 70, 19, 20, 88, 209, 108, 19, 20, 88, 207, - 208, 19, 20, 88, 207, 218, 19, 20, 88, 207, 236, 19, 20, 88, 207, 235, - 19, 20, 88, 207, 220, 19, 20, 88, 207, 241, 19, 20, 88, 217, 191, 19, 20, - 88, 218, 69, 19, 20, 88, 219, 34, 19, 20, 88, 219, 23, 19, 20, 88, 218, - 167, 19, 20, 88, 185, 19, 20, 88, 219, 184, 19, 20, 88, 237, 230, 19, 20, - 88, 238, 39, 19, 20, 88, 238, 190, 19, 20, 88, 238, 182, 19, 20, 88, 238, - 81, 19, 20, 88, 239, 8, 19, 20, 88, 229, 109, 19, 20, 88, 229, 115, 19, - 20, 88, 229, 129, 19, 20, 88, 229, 128, 19, 20, 88, 229, 122, 19, 20, 88, - 229, 144, 19, 20, 88, 229, 42, 19, 20, 88, 229, 43, 19, 20, 88, 229, 46, - 19, 20, 88, 229, 45, 19, 20, 88, 229, 44, 19, 20, 88, 229, 47, 19, 20, - 88, 229, 48, 19, 20, 88, 221, 84, 19, 20, 88, 221, 191, 19, 20, 88, 222, - 240, 19, 20, 88, 222, 235, 19, 20, 88, 222, 100, 19, 20, 88, 201, 201, - 19, 20, 88, 223, 246, 19, 20, 88, 224, 82, 19, 20, 88, 225, 20, 19, 20, - 88, 225, 8, 19, 20, 88, 224, 155, 19, 20, 88, 192, 19, 20, 88, 202, 213, - 19, 20, 88, 202, 247, 19, 20, 88, 203, 52, 19, 20, 88, 203, 49, 19, 20, - 88, 203, 11, 19, 20, 88, 198, 19, 20, 88, 230, 82, 19, 20, 214, 206, 230, - 82, 19, 20, 88, 230, 101, 19, 20, 88, 230, 161, 19, 20, 88, 230, 159, 19, - 20, 88, 230, 141, 19, 20, 214, 206, 230, 141, 19, 20, 88, 230, 181, 19, - 20, 88, 230, 114, 19, 20, 88, 230, 118, 19, 20, 88, 230, 128, 19, 20, 88, - 230, 127, 19, 20, 88, 230, 126, 19, 20, 88, 230, 129, 19, 20, 88, 226, - 239, 19, 20, 88, 227, 49, 19, 20, 88, 227, 234, 19, 20, 88, 227, 226, 19, - 20, 88, 227, 148, 19, 20, 88, 228, 113, 19, 20, 88, 243, 117, 19, 20, 88, - 243, 118, 19, 20, 88, 243, 123, 19, 20, 88, 243, 122, 19, 20, 88, 243, - 119, 19, 20, 88, 243, 124, 19, 20, 88, 227, 151, 19, 20, 88, 227, 153, - 19, 20, 88, 227, 157, 19, 20, 88, 227, 156, 19, 20, 88, 227, 155, 19, 20, - 88, 227, 161, 19, 20, 88, 208, 181, 19, 20, 88, 208, 183, 19, 20, 88, - 208, 186, 19, 20, 88, 208, 185, 19, 20, 88, 208, 184, 19, 20, 88, 208, - 187, 19, 20, 88, 208, 176, 19, 20, 88, 208, 177, 19, 20, 88, 208, 189, - 19, 20, 88, 208, 188, 19, 20, 88, 208, 178, 19, 20, 88, 208, 190, 19, 20, - 88, 202, 6, 19, 20, 88, 202, 17, 19, 20, 88, 202, 92, 19, 20, 88, 202, - 90, 19, 20, 88, 202, 39, 19, 20, 88, 202, 116, 19, 20, 88, 202, 159, 19, - 20, 88, 81, 202, 159, 19, 20, 88, 241, 242, 19, 20, 88, 241, 243, 19, 20, - 88, 241, 252, 19, 20, 88, 241, 251, 19, 20, 88, 241, 246, 19, 20, 88, - 241, 255, 19, 20, 88, 211, 10, 19, 20, 88, 212, 13, 19, 20, 88, 214, 177, - 19, 20, 88, 214, 165, 19, 20, 88, 212, 162, 19, 20, 88, 215, 36, 19, 20, - 88, 212, 199, 19, 20, 88, 212, 242, 19, 20, 88, 213, 43, 19, 20, 88, 213, - 41, 19, 20, 88, 213, 11, 19, 20, 88, 213, 90, 19, 20, 88, 213, 92, 19, - 20, 88, 207, 249, 19, 20, 88, 207, 253, 19, 20, 88, 208, 14, 19, 20, 88, - 208, 13, 19, 20, 88, 207, 255, 19, 20, 88, 208, 20, 19, 20, 88, 246, 98, - 19, 20, 88, 246, 116, 19, 20, 88, 246, 170, 19, 20, 88, 246, 166, 19, 20, - 88, 246, 142, 19, 20, 88, 246, 199, 19, 20, 88, 207, 211, 19, 20, 88, - 207, 212, 19, 20, 88, 207, 215, 19, 20, 88, 207, 214, 19, 20, 88, 207, - 213, 19, 20, 88, 207, 216, 19, 20, 246, 143, 54, 19, 20, 239, 102, 211, - 61, 19, 20, 217, 118, 19, 20, 222, 199, 19, 20, 221, 217, 19, 20, 221, - 216, 19, 20, 221, 215, 19, 20, 221, 214, 19, 20, 221, 219, 19, 20, 221, - 218, 19, 20, 203, 242, 209, 10, 19, 20, 203, 242, 209, 9, 19, 20, 203, - 242, 209, 8, 19, 20, 203, 242, 209, 7, 19, 20, 203, 242, 209, 6, 19, 20, - 203, 242, 209, 13, 19, 20, 203, 242, 209, 12, 19, 20, 203, 242, 46, 209, - 110, 19, 20, 248, 40, 204, 144, 220, 64, 211, 229, 82, 220, 64, 1, 248, - 132, 220, 64, 1, 226, 225, 220, 64, 1, 240, 57, 220, 64, 1, 215, 16, 220, - 64, 1, 222, 56, 220, 64, 1, 207, 36, 220, 64, 1, 244, 186, 220, 64, 1, - 208, 214, 220, 64, 1, 245, 245, 220, 64, 1, 246, 225, 220, 64, 1, 223, - 233, 220, 64, 1, 238, 20, 220, 64, 1, 222, 189, 220, 64, 1, 211, 54, 220, - 64, 1, 215, 138, 220, 64, 1, 251, 61, 220, 64, 1, 220, 22, 220, 64, 1, - 206, 210, 220, 64, 1, 241, 187, 220, 64, 1, 230, 233, 220, 64, 1, 241, - 188, 220, 64, 1, 219, 244, 220, 64, 1, 207, 15, 220, 64, 1, 231, 89, 220, - 64, 1, 241, 185, 220, 64, 1, 219, 13, 220, 64, 240, 56, 82, 220, 64, 216, - 73, 240, 56, 82, 197, 1, 240, 46, 240, 38, 240, 61, 240, 174, 197, 1, - 206, 164, 197, 1, 206, 195, 206, 211, 68, 197, 1, 202, 216, 197, 1, 203, - 124, 197, 1, 204, 144, 197, 1, 209, 15, 209, 14, 209, 40, 197, 1, 240, - 243, 197, 1, 250, 199, 63, 197, 1, 219, 228, 78, 197, 1, 251, 142, 63, - 197, 1, 251, 93, 197, 1, 227, 24, 78, 197, 1, 212, 221, 78, 197, 1, 78, - 197, 1, 220, 73, 197, 1, 220, 31, 197, 1, 216, 195, 216, 208, 216, 120, - 146, 197, 1, 229, 216, 197, 1, 246, 221, 197, 1, 229, 217, 230, 54, 197, - 1, 239, 75, 197, 1, 241, 78, 197, 1, 238, 185, 237, 177, 239, 75, 197, 1, - 238, 224, 197, 1, 203, 209, 203, 200, 204, 144, 197, 1, 237, 149, 237, - 171, 197, 1, 237, 153, 237, 171, 197, 1, 227, 26, 237, 171, 197, 1, 212, - 224, 237, 171, 197, 1, 223, 63, 221, 2, 223, 64, 223, 163, 197, 1, 212, - 222, 223, 163, 197, 1, 242, 80, 197, 1, 230, 212, 230, 216, 230, 203, 75, - 197, 1, 74, 197, 1, 230, 152, 230, 184, 197, 1, 238, 169, 197, 1, 227, - 27, 251, 109, 197, 1, 212, 226, 63, 197, 1, 230, 195, 241, 51, 197, 1, - 218, 226, 218, 251, 219, 184, 197, 1, 251, 23, 241, 49, 197, 1, 211, 234, - 194, 197, 1, 212, 146, 227, 23, 194, 197, 1, 212, 220, 194, 197, 1, 247, - 125, 197, 1, 202, 159, 197, 1, 208, 195, 208, 207, 207, 108, 210, 69, - 197, 1, 212, 219, 210, 69, 197, 1, 245, 51, 197, 1, 248, 111, 248, 114, - 248, 46, 249, 255, 197, 1, 212, 225, 249, 255, 197, 1, 242, 79, 197, 1, - 220, 2, 197, 1, 241, 146, 241, 148, 74, 197, 1, 225, 113, 225, 123, 226, - 185, 197, 1, 227, 25, 226, 185, 197, 1, 212, 223, 226, 185, 197, 1, 227, - 249, 228, 91, 227, 34, 159, 197, 1, 242, 81, 197, 1, 231, 23, 197, 1, - 231, 24, 197, 1, 244, 200, 244, 206, 245, 51, 197, 1, 219, 222, 240, 242, - 78, 197, 1, 241, 183, 197, 1, 230, 232, 197, 1, 245, 71, 197, 1, 247, 75, - 197, 1, 246, 237, 197, 1, 211, 99, 197, 1, 227, 22, 197, 1, 212, 218, - 197, 1, 235, 161, 197, 1, 217, 134, 197, 1, 203, 196, 197, 212, 120, 217, - 178, 197, 223, 226, 217, 178, 197, 245, 131, 217, 178, 197, 250, 108, 97, - 197, 207, 162, 97, 197, 248, 130, 97, 197, 1, 230, 54, 197, 1, 213, 92, - 197, 1, 220, 18, 197, 1, 239, 131, 247, 20, 219, 227, 197, 1, 239, 131, - 247, 20, 230, 215, 197, 1, 239, 131, 247, 20, 241, 147, 197, 1, 239, 131, - 247, 20, 251, 141, 197, 1, 239, 131, 247, 20, 251, 93, 209, 254, 1, 63, - 209, 254, 1, 75, 209, 254, 1, 68, 209, 254, 1, 173, 209, 254, 1, 239, 8, - 209, 254, 1, 222, 203, 209, 254, 1, 210, 22, 209, 254, 1, 244, 212, 209, - 254, 1, 201, 201, 209, 254, 1, 185, 209, 254, 1, 249, 32, 209, 254, 1, - 192, 209, 254, 1, 198, 209, 254, 1, 228, 113, 209, 254, 1, 204, 111, 209, - 254, 1, 215, 36, 209, 254, 1, 152, 209, 254, 22, 2, 75, 209, 254, 22, 2, - 68, 209, 254, 2, 205, 204, 237, 96, 1, 63, 237, 96, 1, 75, 237, 96, 1, - 68, 237, 96, 1, 173, 237, 96, 1, 239, 8, 237, 96, 1, 222, 203, 237, 96, - 1, 210, 22, 237, 96, 1, 244, 212, 237, 96, 1, 201, 201, 237, 96, 1, 185, - 237, 96, 1, 249, 32, 237, 96, 1, 192, 237, 96, 1, 198, 237, 96, 1, 216, - 220, 237, 96, 1, 228, 113, 237, 96, 1, 204, 111, 237, 96, 1, 215, 36, - 237, 96, 1, 152, 237, 96, 22, 2, 75, 237, 96, 22, 2, 68, 237, 96, 2, 219, - 124, 218, 185, 212, 120, 217, 178, 218, 185, 52, 217, 178, 247, 185, 1, - 63, 247, 185, 1, 75, 247, 185, 1, 68, 247, 185, 1, 173, 247, 185, 1, 239, - 8, 247, 185, 1, 222, 203, 247, 185, 1, 210, 22, 247, 185, 1, 244, 212, - 247, 185, 1, 201, 201, 247, 185, 1, 185, 247, 185, 1, 249, 32, 247, 185, - 1, 192, 247, 185, 1, 198, 247, 185, 1, 216, 220, 247, 185, 1, 228, 113, - 247, 185, 1, 204, 111, 247, 185, 1, 215, 36, 247, 185, 1, 152, 247, 185, - 22, 2, 75, 247, 185, 22, 2, 68, 209, 253, 1, 63, 209, 253, 1, 75, 209, - 253, 1, 68, 209, 253, 1, 173, 209, 253, 1, 239, 8, 209, 253, 1, 222, 203, - 209, 253, 1, 210, 22, 209, 253, 1, 244, 212, 209, 253, 1, 201, 201, 209, - 253, 1, 185, 209, 253, 1, 249, 32, 209, 253, 1, 192, 209, 253, 1, 198, - 209, 253, 1, 228, 113, 209, 253, 1, 204, 111, 209, 253, 1, 215, 36, 209, - 253, 22, 2, 75, 209, 253, 22, 2, 68, 85, 1, 173, 85, 1, 229, 144, 85, 1, - 229, 26, 85, 1, 229, 115, 85, 1, 222, 128, 85, 1, 247, 92, 85, 1, 246, - 199, 85, 1, 245, 254, 85, 1, 246, 116, 85, 1, 220, 233, 85, 1, 244, 212, - 85, 1, 207, 229, 85, 1, 243, 113, 85, 1, 207, 224, 85, 1, 221, 197, 85, - 1, 210, 22, 85, 1, 209, 108, 85, 1, 135, 85, 1, 209, 47, 85, 1, 221, 191, - 85, 1, 249, 32, 85, 1, 218, 208, 85, 1, 218, 69, 85, 1, 218, 180, 85, 1, - 224, 82, 85, 1, 202, 247, 85, 1, 215, 227, 85, 1, 227, 49, 85, 1, 205, - 189, 85, 1, 213, 90, 85, 1, 211, 124, 85, 1, 215, 36, 85, 1, 152, 85, 1, - 228, 113, 85, 1, 217, 126, 85, 231, 36, 22, 217, 112, 85, 231, 36, 22, - 217, 125, 85, 231, 36, 22, 217, 88, 85, 231, 36, 22, 217, 83, 85, 231, - 36, 22, 217, 65, 85, 231, 36, 22, 217, 35, 85, 231, 36, 22, 217, 23, 85, - 231, 36, 22, 217, 22, 85, 231, 36, 22, 215, 102, 85, 231, 36, 22, 215, - 95, 85, 231, 36, 22, 226, 199, 85, 231, 36, 22, 226, 188, 85, 231, 36, - 22, 217, 106, 85, 231, 36, 22, 217, 118, 85, 231, 36, 22, 217, 73, 207, - 121, 105, 85, 231, 36, 22, 217, 73, 207, 121, 108, 85, 231, 36, 22, 217, - 108, 85, 22, 231, 21, 250, 148, 85, 22, 231, 21, 252, 25, 85, 22, 2, 252, - 25, 85, 22, 2, 75, 85, 22, 2, 231, 83, 85, 22, 2, 203, 124, 85, 22, 2, - 202, 169, 85, 22, 2, 68, 85, 22, 2, 206, 178, 85, 22, 2, 207, 39, 85, 22, - 2, 220, 73, 85, 22, 2, 198, 85, 22, 2, 231, 110, 85, 22, 2, 74, 85, 22, - 2, 251, 109, 85, 22, 2, 251, 64, 85, 22, 2, 220, 18, 85, 22, 2, 250, 34, - 85, 2, 222, 73, 85, 2, 216, 156, 85, 2, 202, 180, 85, 2, 223, 190, 85, 2, - 208, 73, 85, 2, 248, 233, 85, 2, 215, 222, 85, 2, 208, 171, 85, 2, 230, - 11, 85, 2, 251, 66, 85, 2, 214, 244, 214, 237, 85, 2, 205, 201, 85, 2, - 245, 248, 85, 2, 248, 205, 85, 2, 229, 136, 85, 2, 248, 228, 85, 2, 247, - 64, 218, 130, 228, 173, 85, 2, 227, 203, 208, 148, 85, 2, 248, 100, 85, - 2, 218, 182, 223, 243, 85, 2, 229, 4, 85, 245, 92, 16, 216, 49, 85, 2, - 250, 16, 85, 2, 250, 37, 85, 17, 202, 84, 85, 17, 105, 85, 17, 108, 85, - 17, 147, 85, 17, 149, 85, 17, 170, 85, 17, 195, 85, 17, 213, 111, 85, 17, - 199, 85, 17, 222, 63, 85, 16, 227, 203, 250, 39, 211, 253, 85, 16, 227, - 203, 250, 39, 223, 210, 85, 16, 227, 203, 250, 39, 218, 129, 85, 16, 227, - 203, 250, 39, 248, 133, 85, 16, 227, 203, 250, 39, 247, 165, 85, 16, 227, - 203, 250, 39, 218, 7, 85, 16, 227, 203, 250, 39, 218, 1, 85, 16, 227, - 203, 250, 39, 217, 255, 85, 16, 227, 203, 250, 39, 218, 5, 85, 16, 227, - 203, 250, 39, 218, 3, 94, 248, 59, 94, 241, 108, 94, 245, 233, 94, 239, - 102, 211, 61, 94, 245, 242, 94, 239, 147, 243, 83, 94, 208, 170, 212, 7, - 235, 220, 94, 212, 160, 4, 247, 244, 225, 88, 94, 225, 119, 245, 233, 94, - 225, 119, 239, 102, 211, 61, 94, 222, 54, 94, 239, 130, 57, 214, 151, - 105, 94, 239, 130, 57, 214, 151, 108, 94, 239, 130, 57, 214, 151, 147, - 94, 22, 213, 130, 94, 17, 202, 84, 94, 17, 105, 94, 17, 108, 94, 17, 147, - 94, 17, 149, 94, 17, 170, 94, 17, 195, 94, 17, 213, 111, 94, 17, 199, 94, - 17, 222, 63, 94, 1, 63, 94, 1, 74, 94, 1, 75, 94, 1, 78, 94, 1, 68, 94, - 1, 220, 73, 94, 1, 207, 24, 94, 1, 241, 161, 94, 1, 201, 201, 94, 1, 250, - 223, 94, 1, 249, 32, 94, 1, 185, 94, 1, 217, 126, 94, 1, 239, 8, 94, 1, - 192, 94, 1, 228, 113, 94, 1, 215, 36, 94, 1, 213, 90, 94, 1, 210, 22, 94, - 1, 244, 212, 94, 1, 246, 199, 94, 1, 230, 181, 94, 1, 198, 94, 1, 216, - 220, 94, 1, 204, 111, 94, 1, 240, 108, 94, 1, 173, 94, 1, 229, 144, 94, - 1, 208, 20, 94, 1, 202, 116, 94, 1, 237, 157, 94, 1, 202, 10, 94, 1, 227, - 161, 94, 1, 202, 66, 94, 1, 246, 142, 94, 1, 208, 170, 163, 22, 54, 94, - 1, 208, 170, 74, 94, 1, 208, 170, 75, 94, 1, 208, 170, 78, 94, 1, 208, - 170, 68, 94, 1, 208, 170, 220, 73, 94, 1, 208, 170, 207, 24, 94, 1, 208, - 170, 250, 223, 94, 1, 208, 170, 249, 32, 94, 1, 208, 170, 185, 94, 1, - 208, 170, 217, 126, 94, 1, 208, 170, 239, 8, 94, 1, 208, 170, 192, 94, 1, - 208, 170, 210, 22, 94, 1, 208, 170, 244, 212, 94, 1, 208, 170, 246, 199, - 94, 1, 208, 170, 230, 181, 94, 1, 208, 170, 208, 20, 94, 1, 208, 170, - 198, 94, 1, 208, 170, 204, 111, 94, 1, 208, 170, 173, 94, 1, 208, 170, - 239, 5, 94, 1, 208, 170, 237, 157, 94, 1, 208, 170, 230, 140, 94, 1, 208, - 170, 222, 98, 94, 1, 208, 170, 241, 255, 94, 1, 212, 160, 74, 94, 1, 212, - 160, 75, 94, 1, 212, 160, 230, 192, 94, 1, 212, 160, 207, 24, 94, 1, 212, - 160, 68, 94, 1, 212, 160, 250, 223, 94, 1, 212, 160, 173, 94, 1, 212, - 160, 239, 8, 94, 1, 212, 160, 152, 94, 1, 212, 160, 185, 94, 1, 212, 160, - 213, 90, 94, 1, 212, 160, 210, 22, 94, 1, 212, 160, 244, 212, 94, 1, 212, - 160, 230, 181, 94, 1, 212, 160, 240, 108, 94, 1, 212, 160, 239, 5, 94, 1, - 212, 160, 237, 157, 94, 1, 212, 160, 208, 20, 94, 1, 212, 160, 202, 116, - 94, 1, 212, 160, 216, 216, 94, 1, 212, 160, 246, 199, 94, 1, 212, 160, - 202, 80, 94, 1, 225, 119, 75, 94, 1, 225, 119, 173, 94, 1, 225, 119, 216, - 220, 94, 1, 225, 119, 240, 108, 94, 1, 225, 119, 202, 80, 94, 1, 251, 22, - 238, 244, 250, 181, 105, 94, 1, 251, 22, 238, 244, 205, 200, 105, 94, 1, - 251, 22, 238, 244, 244, 174, 94, 1, 251, 22, 238, 244, 207, 34, 94, 1, - 251, 22, 238, 244, 230, 239, 207, 34, 94, 1, 251, 22, 238, 244, 248, 245, - 94, 1, 251, 22, 238, 244, 126, 248, 245, 94, 1, 251, 22, 238, 244, 63, - 94, 1, 251, 22, 238, 244, 75, 94, 1, 251, 22, 238, 244, 173, 94, 1, 251, - 22, 238, 244, 222, 203, 94, 1, 251, 22, 238, 244, 247, 92, 94, 1, 251, - 22, 238, 244, 207, 241, 94, 1, 251, 22, 238, 244, 207, 229, 94, 1, 251, - 22, 238, 244, 244, 120, 94, 1, 251, 22, 238, 244, 221, 227, 94, 1, 251, - 22, 238, 244, 210, 22, 94, 1, 251, 22, 238, 244, 244, 212, 94, 1, 251, - 22, 238, 244, 185, 94, 1, 251, 22, 238, 244, 218, 208, 94, 1, 251, 22, - 238, 244, 211, 164, 94, 1, 251, 22, 238, 244, 202, 80, 94, 1, 251, 22, - 238, 244, 202, 116, 94, 1, 251, 22, 238, 244, 251, 73, 94, 1, 208, 170, - 251, 22, 238, 244, 210, 22, 94, 1, 208, 170, 251, 22, 238, 244, 202, 80, - 94, 1, 225, 119, 251, 22, 238, 244, 238, 119, 94, 1, 225, 119, 251, 22, - 238, 244, 222, 203, 94, 1, 225, 119, 251, 22, 238, 244, 247, 92, 94, 1, - 225, 119, 251, 22, 238, 244, 230, 149, 94, 1, 225, 119, 251, 22, 238, - 244, 207, 241, 94, 1, 225, 119, 251, 22, 238, 244, 244, 104, 94, 1, 225, - 119, 251, 22, 238, 244, 210, 22, 94, 1, 225, 119, 251, 22, 238, 244, 244, - 1, 94, 1, 225, 119, 251, 22, 238, 244, 211, 164, 94, 1, 225, 119, 251, - 22, 238, 244, 245, 65, 94, 1, 225, 119, 251, 22, 238, 244, 202, 80, 94, - 1, 225, 119, 251, 22, 238, 244, 202, 116, 94, 1, 251, 22, 238, 244, 162, - 68, 94, 1, 251, 22, 238, 244, 162, 198, 94, 1, 225, 119, 251, 22, 238, - 244, 248, 98, 94, 1, 251, 22, 238, 244, 244, 201, 94, 1, 225, 119, 251, - 22, 238, 244, 227, 161, 19, 20, 219, 188, 19, 20, 250, 8, 19, 20, 251, - 236, 19, 20, 204, 65, 19, 20, 218, 13, 19, 20, 219, 43, 19, 20, 217, 143, - 19, 20, 209, 196, 19, 20, 229, 208, 19, 20, 228, 164, 19, 20, 225, 63, - 19, 20, 221, 149, 19, 20, 223, 59, 19, 20, 227, 244, 19, 20, 211, 232, - 19, 20, 214, 208, 19, 20, 212, 207, 19, 20, 213, 47, 19, 20, 212, 172, - 19, 20, 202, 222, 19, 20, 203, 58, 19, 20, 216, 165, 19, 20, 221, 17, 19, - 20, 220, 53, 221, 17, 19, 20, 221, 16, 19, 20, 220, 53, 221, 16, 19, 20, - 221, 15, 19, 20, 220, 53, 221, 15, 19, 20, 221, 14, 19, 20, 220, 53, 221, - 14, 19, 20, 215, 107, 19, 20, 215, 106, 19, 20, 215, 105, 19, 20, 215, - 104, 19, 20, 215, 103, 19, 20, 215, 111, 19, 20, 220, 53, 219, 184, 19, - 20, 220, 53, 210, 69, 19, 20, 220, 53, 230, 54, 19, 20, 220, 53, 247, - 125, 19, 20, 220, 53, 226, 185, 19, 20, 220, 53, 223, 163, 19, 20, 220, - 53, 194, 19, 20, 220, 53, 213, 92, 19, 20, 241, 174, 204, 144, 19, 20, - 204, 44, 204, 144, 19, 20, 46, 5, 215, 252, 19, 20, 46, 216, 188, 243, - 85, 19, 20, 217, 0, 215, 108, 19, 20, 196, 227, 18, 19, 20, 196, 228, - 112, 19, 20, 209, 11, 19, 20, 209, 13, 19, 20, 207, 221, 19, 20, 207, - 223, 19, 20, 207, 228, 19, 20, 208, 180, 19, 20, 208, 182, 19, 20, 214, - 206, 212, 177, 19, 20, 214, 206, 212, 236, 19, 20, 214, 206, 236, 117, - 19, 20, 88, 237, 185, 19, 20, 88, 244, 35, 238, 182, 19, 20, 88, 239, 5, - 19, 20, 88, 237, 190, 19, 20, 214, 206, 230, 64, 19, 20, 88, 230, 62, 19, - 20, 248, 153, 244, 35, 159, 19, 20, 248, 153, 244, 35, 146, 19, 20, 88, - 244, 30, 194, 227, 124, 205, 169, 227, 174, 227, 124, 1, 173, 227, 124, - 1, 229, 144, 227, 124, 1, 239, 8, 227, 124, 1, 238, 119, 227, 124, 1, - 222, 203, 227, 124, 1, 247, 92, 227, 124, 1, 246, 199, 227, 124, 1, 230, - 181, 227, 124, 1, 230, 149, 227, 124, 1, 203, 78, 227, 124, 1, 210, 22, - 227, 124, 1, 209, 108, 227, 124, 1, 244, 212, 227, 124, 1, 244, 1, 227, - 124, 1, 201, 201, 227, 124, 1, 185, 227, 124, 1, 218, 208, 227, 124, 1, - 249, 32, 227, 124, 1, 248, 98, 227, 124, 1, 192, 227, 124, 1, 198, 227, - 124, 1, 216, 220, 227, 124, 1, 228, 113, 227, 124, 1, 204, 111, 227, 124, - 1, 213, 90, 227, 124, 1, 211, 164, 227, 124, 1, 215, 36, 227, 124, 1, - 152, 227, 124, 1, 237, 181, 227, 124, 1, 208, 119, 227, 124, 22, 2, 63, - 227, 124, 22, 2, 75, 227, 124, 22, 2, 68, 227, 124, 22, 2, 241, 161, 227, - 124, 22, 2, 251, 64, 227, 124, 22, 2, 220, 18, 227, 124, 22, 2, 250, 34, - 227, 124, 22, 2, 74, 227, 124, 22, 2, 78, 227, 124, 210, 254, 1, 198, - 227, 124, 210, 254, 1, 216, 220, 227, 124, 210, 254, 1, 204, 111, 227, - 124, 5, 1, 173, 227, 124, 5, 1, 222, 203, 227, 124, 5, 1, 250, 180, 227, - 124, 5, 1, 210, 22, 227, 124, 5, 1, 201, 201, 227, 124, 5, 1, 185, 227, - 124, 5, 1, 192, 227, 124, 5, 1, 216, 220, 227, 124, 5, 1, 228, 113, 227, - 124, 2, 223, 231, 227, 124, 2, 229, 186, 227, 124, 2, 215, 34, 227, 124, - 2, 227, 18, 227, 124, 240, 212, 82, 227, 124, 217, 47, 82, 227, 124, 17, - 202, 84, 227, 124, 17, 105, 227, 124, 17, 108, 227, 124, 17, 147, 227, - 124, 17, 149, 227, 124, 17, 170, 227, 124, 17, 195, 227, 124, 17, 213, - 111, 227, 124, 17, 199, 227, 124, 17, 222, 63, 45, 227, 235, 1, 173, 45, - 227, 235, 1, 203, 182, 45, 227, 235, 1, 222, 203, 45, 227, 235, 1, 208, - 20, 45, 227, 235, 1, 215, 36, 45, 227, 235, 1, 198, 45, 227, 235, 1, 210, - 22, 45, 227, 235, 1, 209, 108, 45, 227, 235, 1, 228, 113, 45, 227, 235, - 1, 185, 45, 227, 235, 1, 218, 208, 45, 227, 235, 1, 192, 45, 227, 235, 1, - 240, 108, 45, 227, 235, 1, 206, 86, 45, 227, 235, 1, 152, 45, 227, 235, - 1, 217, 126, 45, 227, 235, 1, 229, 144, 45, 227, 235, 1, 208, 10, 45, - 227, 235, 1, 201, 201, 45, 227, 235, 1, 63, 45, 227, 235, 1, 75, 45, 227, - 235, 1, 241, 161, 45, 227, 235, 1, 241, 147, 45, 227, 235, 1, 68, 45, - 227, 235, 1, 220, 18, 45, 227, 235, 1, 78, 45, 227, 235, 1, 207, 24, 45, - 227, 235, 1, 74, 45, 227, 235, 1, 250, 32, 45, 227, 235, 1, 251, 64, 45, - 227, 235, 1, 208, 159, 45, 227, 235, 1, 208, 158, 45, 227, 235, 1, 208, - 157, 45, 227, 235, 1, 208, 156, 45, 227, 235, 1, 208, 155, 222, 214, 45, - 226, 233, 1, 138, 217, 126, 222, 214, 45, 226, 233, 1, 124, 217, 126, - 222, 214, 45, 226, 233, 1, 138, 173, 222, 214, 45, 226, 233, 1, 138, 203, - 182, 222, 214, 45, 226, 233, 1, 138, 222, 203, 222, 214, 45, 226, 233, 1, - 124, 173, 222, 214, 45, 226, 233, 1, 124, 203, 182, 222, 214, 45, 226, - 233, 1, 124, 222, 203, 222, 214, 45, 226, 233, 1, 138, 208, 20, 222, 214, - 45, 226, 233, 1, 138, 215, 36, 222, 214, 45, 226, 233, 1, 138, 198, 222, - 214, 45, 226, 233, 1, 124, 208, 20, 222, 214, 45, 226, 233, 1, 124, 215, - 36, 222, 214, 45, 226, 233, 1, 124, 198, 222, 214, 45, 226, 233, 1, 138, - 210, 22, 222, 214, 45, 226, 233, 1, 138, 209, 108, 222, 214, 45, 226, - 233, 1, 138, 201, 201, 222, 214, 45, 226, 233, 1, 124, 210, 22, 222, 214, - 45, 226, 233, 1, 124, 209, 108, 222, 214, 45, 226, 233, 1, 124, 201, 201, - 222, 214, 45, 226, 233, 1, 138, 185, 222, 214, 45, 226, 233, 1, 138, 218, - 208, 222, 214, 45, 226, 233, 1, 138, 192, 222, 214, 45, 226, 233, 1, 124, - 185, 222, 214, 45, 226, 233, 1, 124, 218, 208, 222, 214, 45, 226, 233, 1, - 124, 192, 222, 214, 45, 226, 233, 1, 138, 240, 108, 222, 214, 45, 226, - 233, 1, 138, 206, 86, 222, 214, 45, 226, 233, 1, 138, 228, 113, 222, 214, - 45, 226, 233, 1, 124, 240, 108, 222, 214, 45, 226, 233, 1, 124, 206, 86, - 222, 214, 45, 226, 233, 1, 124, 228, 113, 222, 214, 45, 226, 233, 1, 138, - 152, 222, 214, 45, 226, 233, 1, 138, 244, 212, 222, 214, 45, 226, 233, 1, - 138, 249, 32, 222, 214, 45, 226, 233, 1, 124, 152, 222, 214, 45, 226, - 233, 1, 124, 244, 212, 222, 214, 45, 226, 233, 1, 124, 249, 32, 222, 214, - 45, 226, 233, 1, 138, 228, 169, 222, 214, 45, 226, 233, 1, 138, 203, 149, - 222, 214, 45, 226, 233, 1, 124, 228, 169, 222, 214, 45, 226, 233, 1, 124, - 203, 149, 222, 214, 45, 226, 233, 1, 138, 211, 9, 222, 214, 45, 226, 233, - 1, 124, 211, 9, 222, 214, 45, 226, 233, 22, 2, 22, 212, 216, 222, 214, - 45, 226, 233, 22, 2, 252, 25, 222, 214, 45, 226, 233, 22, 2, 231, 83, - 222, 214, 45, 226, 233, 22, 2, 68, 222, 214, 45, 226, 233, 22, 2, 206, - 178, 222, 214, 45, 226, 233, 22, 2, 74, 222, 214, 45, 226, 233, 22, 2, - 251, 109, 222, 214, 45, 226, 233, 22, 2, 78, 222, 214, 45, 226, 233, 22, - 2, 220, 97, 222, 214, 45, 226, 233, 22, 2, 207, 24, 222, 214, 45, 226, - 233, 22, 2, 250, 8, 222, 214, 45, 226, 233, 22, 2, 251, 236, 222, 214, - 45, 226, 233, 22, 2, 206, 170, 222, 214, 45, 226, 233, 22, 2, 219, 188, - 222, 214, 45, 226, 233, 22, 2, 220, 94, 222, 214, 45, 226, 233, 22, 2, - 207, 20, 222, 214, 45, 226, 233, 22, 2, 230, 192, 222, 214, 45, 226, 233, - 1, 46, 206, 164, 222, 214, 45, 226, 233, 1, 46, 222, 205, 222, 214, 45, - 226, 233, 1, 46, 223, 163, 222, 214, 45, 226, 233, 1, 46, 226, 185, 222, - 214, 45, 226, 233, 1, 46, 230, 54, 222, 214, 45, 226, 233, 1, 46, 245, - 51, 222, 214, 45, 226, 233, 1, 46, 249, 255, 222, 214, 45, 226, 233, 143, - 225, 92, 222, 214, 45, 226, 233, 143, 225, 91, 222, 214, 45, 226, 233, - 17, 202, 84, 222, 214, 45, 226, 233, 17, 105, 222, 214, 45, 226, 233, 17, - 108, 222, 214, 45, 226, 233, 17, 147, 222, 214, 45, 226, 233, 17, 149, - 222, 214, 45, 226, 233, 17, 170, 222, 214, 45, 226, 233, 17, 195, 222, - 214, 45, 226, 233, 17, 213, 111, 222, 214, 45, 226, 233, 17, 199, 222, - 214, 45, 226, 233, 17, 222, 63, 222, 214, 45, 226, 233, 104, 17, 105, - 222, 214, 45, 226, 233, 2, 228, 97, 222, 214, 45, 226, 233, 2, 228, 96, - 85, 16, 219, 51, 85, 16, 223, 211, 229, 22, 85, 16, 218, 130, 229, 22, - 85, 16, 248, 134, 229, 22, 85, 16, 247, 166, 229, 22, 85, 16, 218, 8, - 229, 22, 85, 16, 218, 2, 229, 22, 85, 16, 218, 0, 229, 22, 85, 16, 218, - 6, 229, 22, 85, 16, 218, 4, 229, 22, 85, 16, 244, 161, 229, 22, 85, 16, - 244, 157, 229, 22, 85, 16, 244, 156, 229, 22, 85, 16, 244, 159, 229, 22, - 85, 16, 244, 158, 229, 22, 85, 16, 244, 155, 229, 22, 85, 16, 207, 167, - 85, 16, 223, 211, 215, 220, 85, 16, 218, 130, 215, 220, 85, 16, 248, 134, - 215, 220, 85, 16, 247, 166, 215, 220, 85, 16, 218, 8, 215, 220, 85, 16, - 218, 2, 215, 220, 85, 16, 218, 0, 215, 220, 85, 16, 218, 6, 215, 220, 85, - 16, 218, 4, 215, 220, 85, 16, 244, 161, 215, 220, 85, 16, 244, 157, 215, - 220, 85, 16, 244, 156, 215, 220, 85, 16, 244, 159, 215, 220, 85, 16, 244, - 158, 215, 220, 85, 16, 244, 155, 215, 220, 247, 186, 1, 173, 247, 186, 1, - 239, 8, 247, 186, 1, 222, 203, 247, 186, 1, 222, 146, 247, 186, 1, 185, - 247, 186, 1, 249, 32, 247, 186, 1, 192, 247, 186, 1, 223, 250, 247, 186, - 1, 210, 22, 247, 186, 1, 244, 212, 247, 186, 1, 201, 201, 247, 186, 1, - 221, 147, 247, 186, 1, 247, 92, 247, 186, 1, 230, 181, 247, 186, 1, 221, - 11, 247, 186, 1, 221, 3, 247, 186, 1, 198, 247, 186, 1, 216, 220, 247, - 186, 1, 228, 113, 247, 186, 1, 206, 86, 247, 186, 1, 215, 36, 247, 186, - 1, 63, 247, 186, 1, 152, 247, 186, 22, 2, 75, 247, 186, 22, 2, 68, 247, - 186, 22, 2, 74, 247, 186, 22, 2, 78, 247, 186, 22, 2, 251, 109, 247, 186, - 219, 136, 247, 186, 241, 84, 76, 214, 167, 45, 104, 1, 138, 173, 45, 104, - 1, 138, 229, 144, 45, 104, 1, 138, 228, 153, 45, 104, 1, 124, 173, 45, - 104, 1, 124, 228, 153, 45, 104, 1, 124, 229, 144, 45, 104, 1, 222, 203, - 45, 104, 1, 138, 247, 92, 45, 104, 1, 138, 246, 199, 45, 104, 1, 124, - 247, 92, 45, 104, 1, 124, 215, 36, 45, 104, 1, 124, 246, 199, 45, 104, 1, - 221, 11, 45, 104, 1, 216, 171, 45, 104, 1, 138, 216, 169, 45, 104, 1, - 244, 212, 45, 104, 1, 124, 216, 169, 45, 104, 1, 216, 180, 45, 104, 1, - 138, 210, 22, 45, 104, 1, 138, 209, 108, 45, 104, 1, 124, 210, 22, 45, - 104, 1, 124, 209, 108, 45, 104, 1, 201, 201, 45, 104, 1, 249, 32, 45, - 104, 1, 138, 185, 45, 104, 1, 138, 218, 208, 45, 104, 1, 138, 240, 108, - 45, 104, 1, 124, 185, 45, 104, 1, 124, 240, 108, 45, 104, 1, 124, 218, - 208, 45, 104, 1, 192, 45, 104, 1, 124, 198, 45, 104, 1, 138, 198, 45, - 104, 1, 216, 220, 45, 104, 1, 215, 140, 45, 104, 1, 228, 113, 45, 104, 1, - 226, 232, 45, 104, 1, 204, 111, 45, 104, 1, 138, 213, 90, 45, 104, 1, - 138, 211, 164, 45, 104, 1, 138, 215, 36, 45, 104, 1, 138, 152, 45, 104, - 1, 227, 77, 45, 104, 1, 63, 45, 104, 1, 124, 152, 45, 104, 1, 75, 45, - 104, 1, 231, 83, 45, 104, 1, 68, 45, 104, 1, 206, 178, 45, 104, 1, 241, - 161, 45, 104, 1, 220, 18, 45, 104, 1, 228, 97, 45, 104, 1, 237, 249, 215, - 36, 45, 104, 109, 2, 174, 216, 220, 45, 104, 109, 2, 174, 228, 113, 45, - 104, 109, 2, 228, 114, 209, 228, 228, 86, 45, 104, 2, 225, 141, 230, 1, - 228, 86, 45, 104, 109, 2, 46, 222, 203, 45, 104, 109, 2, 124, 185, 45, - 104, 109, 2, 138, 216, 170, 219, 245, 124, 185, 45, 104, 109, 2, 192, 45, - 104, 109, 2, 249, 32, 45, 104, 109, 2, 215, 36, 45, 104, 2, 215, 10, 45, - 104, 22, 2, 63, 45, 104, 22, 2, 225, 141, 214, 225, 45, 104, 22, 2, 252, - 25, 45, 104, 22, 2, 209, 234, 252, 25, 45, 104, 22, 2, 75, 45, 104, 22, - 2, 231, 83, 45, 104, 22, 2, 207, 24, 45, 104, 22, 2, 206, 177, 45, 104, - 22, 2, 68, 45, 104, 22, 2, 206, 178, 45, 104, 22, 2, 78, 45, 104, 22, 2, - 220, 98, 56, 45, 104, 22, 2, 219, 188, 45, 104, 22, 2, 74, 45, 104, 22, - 2, 251, 109, 45, 104, 22, 2, 220, 18, 45, 104, 22, 2, 251, 64, 45, 104, - 22, 2, 104, 251, 64, 45, 104, 22, 2, 220, 98, 55, 45, 104, 2, 225, 141, - 230, 0, 45, 104, 2, 208, 160, 45, 104, 2, 208, 159, 45, 104, 2, 229, 105, - 208, 158, 45, 104, 2, 229, 105, 208, 157, 45, 104, 2, 229, 105, 208, 156, - 45, 104, 2, 216, 221, 237, 156, 45, 104, 2, 225, 141, 214, 253, 45, 104, - 2, 229, 104, 229, 239, 45, 104, 39, 245, 113, 243, 85, 45, 104, 236, 108, - 17, 202, 84, 45, 104, 236, 108, 17, 105, 45, 104, 236, 108, 17, 108, 45, - 104, 236, 108, 17, 147, 45, 104, 236, 108, 17, 149, 45, 104, 236, 108, - 17, 170, 45, 104, 236, 108, 17, 195, 45, 104, 236, 108, 17, 213, 111, 45, - 104, 236, 108, 17, 199, 45, 104, 236, 108, 17, 222, 63, 45, 104, 104, 17, - 202, 84, 45, 104, 104, 17, 105, 45, 104, 104, 17, 108, 45, 104, 104, 17, - 147, 45, 104, 104, 17, 149, 45, 104, 104, 17, 170, 45, 104, 104, 17, 195, - 45, 104, 104, 17, 213, 111, 45, 104, 104, 17, 199, 45, 104, 104, 17, 222, - 63, 45, 104, 2, 204, 29, 45, 104, 2, 204, 28, 45, 104, 2, 214, 212, 45, - 104, 2, 229, 175, 45, 104, 2, 236, 36, 45, 104, 2, 243, 99, 45, 104, 2, - 216, 73, 215, 198, 216, 180, 45, 104, 2, 225, 141, 203, 79, 45, 104, 2, - 230, 35, 45, 104, 2, 230, 34, 45, 104, 2, 214, 220, 45, 104, 2, 214, 219, - 45, 104, 2, 237, 98, 45, 104, 2, 247, 89, 39, 242, 75, 246, 53, 251, 138, - 39, 243, 230, 39, 231, 27, 39, 183, 47, 39, 208, 70, 243, 85, 39, 203, - 195, 56, 39, 204, 21, 227, 115, 56, 39, 171, 131, 56, 39, 52, 171, 131, - 56, 39, 157, 246, 219, 211, 32, 56, 39, 211, 18, 246, 219, 211, 32, 56, - 39, 219, 78, 55, 39, 52, 219, 78, 55, 39, 219, 78, 56, 39, 219, 78, 219, - 199, 130, 2, 207, 9, 216, 51, 130, 2, 207, 9, 247, 54, 130, 2, 246, 234, - 130, 2, 210, 191, 130, 2, 248, 56, 130, 1, 251, 45, 130, 1, 251, 46, 209, - 178, 130, 1, 231, 79, 130, 1, 231, 80, 209, 178, 130, 1, 207, 12, 130, 1, - 207, 13, 209, 178, 130, 1, 216, 221, 216, 103, 130, 1, 216, 221, 216, - 104, 209, 178, 130, 1, 228, 114, 227, 197, 130, 1, 228, 114, 227, 198, - 209, 178, 130, 1, 241, 127, 130, 1, 251, 62, 130, 1, 220, 49, 130, 1, - 220, 50, 209, 178, 130, 1, 173, 130, 1, 230, 44, 225, 144, 130, 1, 239, - 8, 130, 1, 239, 9, 238, 25, 130, 1, 222, 203, 130, 1, 247, 92, 130, 1, - 247, 93, 228, 100, 130, 1, 230, 181, 130, 1, 230, 182, 230, 153, 130, 1, - 221, 11, 130, 1, 210, 23, 227, 253, 130, 1, 210, 23, 223, 206, 225, 144, - 130, 1, 244, 213, 223, 206, 251, 4, 130, 1, 244, 213, 223, 206, 225, 144, - 130, 1, 223, 111, 216, 183, 130, 1, 210, 22, 130, 1, 210, 23, 209, 200, - 130, 1, 244, 212, 130, 1, 244, 213, 225, 163, 130, 1, 201, 201, 130, 1, - 185, 130, 1, 219, 169, 229, 251, 130, 1, 249, 32, 130, 1, 249, 33, 229, - 187, 130, 1, 192, 130, 1, 198, 130, 1, 216, 220, 130, 1, 228, 113, 130, - 1, 204, 111, 130, 1, 215, 37, 215, 21, 130, 1, 215, 37, 214, 232, 130, 1, - 215, 36, 130, 1, 152, 130, 2, 216, 94, 130, 22, 2, 209, 178, 130, 22, 2, - 207, 8, 130, 22, 2, 207, 9, 214, 228, 130, 22, 2, 210, 224, 130, 22, 2, - 210, 225, 231, 71, 130, 22, 2, 216, 221, 216, 103, 130, 22, 2, 216, 221, - 216, 104, 209, 178, 130, 22, 2, 228, 114, 227, 197, 130, 22, 2, 228, 114, - 227, 198, 209, 178, 130, 22, 2, 209, 235, 130, 22, 2, 209, 236, 216, 103, - 130, 22, 2, 209, 236, 209, 178, 130, 22, 2, 209, 236, 216, 104, 209, 178, - 130, 22, 2, 218, 249, 130, 22, 2, 218, 250, 209, 178, 130, 251, 117, 251, - 116, 130, 1, 230, 23, 214, 227, 130, 1, 229, 111, 214, 227, 130, 1, 207, - 101, 214, 227, 130, 1, 241, 155, 214, 227, 130, 1, 206, 56, 214, 227, - 130, 1, 202, 106, 214, 227, 130, 1, 250, 52, 214, 227, 130, 17, 202, 84, - 130, 17, 105, 130, 17, 108, 130, 17, 147, 130, 17, 149, 130, 17, 170, - 130, 17, 195, 130, 17, 213, 111, 130, 17, 199, 130, 17, 222, 63, 130, - 219, 104, 130, 219, 130, 130, 204, 14, 130, 247, 31, 219, 123, 130, 247, - 31, 212, 139, 130, 247, 31, 219, 75, 130, 219, 129, 130, 31, 16, 243, 91, - 130, 31, 16, 244, 34, 130, 31, 16, 242, 27, 130, 31, 16, 244, 164, 130, - 31, 16, 244, 165, 210, 191, 130, 31, 16, 243, 175, 130, 31, 16, 244, 205, - 130, 31, 16, 244, 10, 130, 31, 16, 244, 187, 130, 31, 16, 244, 165, 238, - 184, 130, 31, 16, 39, 209, 171, 130, 31, 16, 39, 241, 82, 130, 31, 16, - 39, 229, 182, 130, 31, 16, 39, 229, 184, 130, 31, 16, 39, 230, 157, 130, - 31, 16, 39, 229, 183, 3, 230, 157, 130, 31, 16, 39, 229, 185, 3, 230, - 157, 130, 31, 16, 39, 248, 119, 130, 31, 16, 39, 238, 29, 130, 31, 16, - 216, 14, 171, 242, 37, 130, 31, 16, 216, 14, 171, 244, 203, 130, 31, 16, - 216, 14, 246, 16, 207, 195, 130, 31, 16, 216, 14, 246, 16, 209, 244, 130, - 31, 16, 227, 220, 171, 219, 118, 130, 31, 16, 227, 220, 171, 217, 177, - 130, 31, 16, 227, 220, 246, 16, 218, 94, 130, 31, 16, 227, 220, 246, 16, - 218, 80, 130, 31, 16, 227, 220, 171, 218, 119, 210, 213, 2, 219, 101, - 210, 213, 2, 219, 114, 210, 213, 2, 219, 110, 210, 213, 1, 63, 210, 213, - 1, 75, 210, 213, 1, 68, 210, 213, 1, 251, 109, 210, 213, 1, 78, 210, 213, - 1, 74, 210, 213, 1, 240, 238, 210, 213, 1, 173, 210, 213, 1, 217, 126, - 210, 213, 1, 239, 8, 210, 213, 1, 222, 203, 210, 213, 1, 247, 92, 210, - 213, 1, 230, 181, 210, 213, 1, 202, 116, 210, 213, 1, 221, 11, 210, 213, - 1, 210, 22, 210, 213, 1, 244, 212, 210, 213, 1, 201, 201, 210, 213, 1, - 185, 210, 213, 1, 240, 108, 210, 213, 1, 206, 86, 210, 213, 1, 249, 32, - 210, 213, 1, 192, 210, 213, 1, 198, 210, 213, 1, 216, 220, 210, 213, 1, - 228, 113, 210, 213, 1, 204, 111, 210, 213, 1, 215, 36, 210, 213, 1, 203, - 182, 210, 213, 1, 152, 210, 213, 109, 2, 219, 127, 210, 213, 109, 2, 219, - 103, 210, 213, 109, 2, 219, 100, 210, 213, 22, 2, 219, 117, 210, 213, 22, - 2, 219, 99, 210, 213, 22, 2, 219, 121, 210, 213, 22, 2, 219, 109, 210, - 213, 22, 2, 219, 128, 210, 213, 22, 2, 219, 119, 210, 213, 2, 219, 131, - 210, 213, 2, 205, 204, 210, 213, 109, 2, 219, 64, 192, 210, 213, 109, 2, - 219, 64, 204, 111, 210, 213, 1, 229, 144, 210, 213, 1, 210, 150, 210, - 213, 17, 202, 84, 210, 213, 17, 105, 210, 213, 17, 108, 210, 213, 17, - 147, 210, 213, 17, 149, 210, 213, 17, 170, 210, 213, 17, 195, 210, 213, - 17, 213, 111, 210, 213, 17, 199, 210, 213, 17, 222, 63, 210, 213, 250, - 17, 210, 213, 1, 216, 76, 210, 213, 1, 227, 171, 210, 213, 1, 248, 98, - 210, 213, 1, 46, 230, 54, 210, 213, 1, 46, 226, 185, 248, 208, 1, 63, - 248, 208, 1, 212, 131, 63, 248, 208, 1, 152, 248, 208, 1, 212, 131, 152, - 248, 208, 1, 225, 117, 152, 248, 208, 1, 249, 32, 248, 208, 1, 229, 236, - 249, 32, 248, 208, 1, 185, 248, 208, 1, 212, 131, 185, 248, 208, 1, 201, - 201, 248, 208, 1, 225, 117, 201, 201, 248, 208, 1, 204, 111, 248, 208, 1, - 212, 131, 204, 111, 248, 208, 1, 219, 143, 204, 111, 248, 208, 1, 239, 8, - 248, 208, 1, 212, 131, 239, 8, 248, 208, 1, 230, 181, 248, 208, 1, 244, - 212, 248, 208, 1, 216, 220, 248, 208, 1, 212, 131, 216, 220, 248, 208, 1, - 192, 248, 208, 1, 212, 131, 192, 248, 208, 1, 211, 236, 210, 22, 248, - 208, 1, 221, 170, 210, 22, 248, 208, 1, 215, 36, 248, 208, 1, 212, 131, - 215, 36, 248, 208, 1, 225, 117, 215, 36, 248, 208, 1, 198, 248, 208, 1, - 212, 131, 198, 248, 208, 1, 222, 203, 248, 208, 1, 228, 113, 248, 208, 1, - 212, 131, 228, 113, 248, 208, 1, 221, 11, 248, 208, 1, 247, 92, 248, 208, - 1, 223, 25, 248, 208, 1, 225, 54, 248, 208, 1, 75, 248, 208, 1, 68, 248, - 208, 2, 208, 164, 248, 208, 22, 2, 74, 248, 208, 22, 2, 219, 143, 74, - 248, 208, 22, 2, 241, 161, 248, 208, 22, 2, 75, 248, 208, 22, 2, 229, - 236, 75, 248, 208, 22, 2, 78, 248, 208, 22, 2, 229, 236, 78, 248, 208, - 22, 2, 68, 248, 208, 22, 2, 106, 35, 212, 131, 215, 36, 248, 208, 109, 2, - 222, 205, 248, 208, 109, 2, 237, 171, 248, 208, 219, 112, 248, 208, 219, - 108, 248, 208, 16, 248, 64, 223, 111, 224, 218, 248, 208, 16, 248, 64, - 218, 122, 248, 208, 16, 248, 64, 230, 79, 248, 208, 16, 248, 64, 219, - 112, 227, 181, 1, 173, 227, 181, 1, 229, 40, 227, 181, 1, 229, 144, 227, - 181, 1, 239, 8, 227, 181, 1, 238, 51, 227, 181, 1, 222, 203, 227, 181, 1, - 247, 92, 227, 181, 1, 246, 199, 227, 181, 1, 230, 181, 227, 181, 1, 221, - 11, 227, 181, 1, 210, 22, 227, 181, 1, 209, 108, 227, 181, 1, 244, 212, - 227, 181, 1, 201, 201, 227, 181, 1, 185, 227, 181, 1, 218, 98, 227, 181, - 1, 218, 208, 227, 181, 1, 240, 108, 227, 181, 1, 239, 227, 227, 181, 1, - 249, 32, 227, 181, 1, 248, 44, 227, 181, 1, 192, 227, 181, 1, 224, 89, - 227, 181, 1, 208, 20, 227, 181, 1, 208, 10, 227, 181, 1, 241, 255, 227, - 181, 1, 198, 227, 181, 1, 216, 220, 227, 181, 1, 228, 113, 227, 181, 1, - 152, 227, 181, 1, 236, 224, 227, 181, 1, 206, 86, 227, 181, 1, 215, 36, - 227, 181, 1, 213, 90, 227, 181, 1, 204, 111, 227, 181, 1, 63, 227, 181, - 210, 254, 1, 198, 227, 181, 210, 254, 1, 216, 220, 227, 181, 22, 2, 252, - 25, 227, 181, 22, 2, 75, 227, 181, 22, 2, 78, 227, 181, 22, 2, 220, 18, - 227, 181, 22, 2, 68, 227, 181, 22, 2, 206, 178, 227, 181, 22, 2, 74, 227, - 181, 109, 2, 230, 54, 227, 181, 109, 2, 226, 185, 227, 181, 109, 2, 159, - 227, 181, 109, 2, 223, 163, 227, 181, 109, 2, 219, 184, 227, 181, 109, 2, - 146, 227, 181, 109, 2, 210, 69, 227, 181, 109, 2, 220, 241, 227, 181, - 109, 2, 230, 0, 227, 181, 2, 216, 181, 227, 181, 2, 221, 51, 227, 181, - 217, 179, 210, 20, 227, 181, 217, 179, 220, 252, 209, 5, 210, 20, 227, - 181, 217, 179, 246, 206, 227, 181, 217, 179, 208, 2, 246, 206, 227, 181, - 217, 179, 208, 1, 227, 181, 17, 202, 84, 227, 181, 17, 105, 227, 181, 17, - 108, 227, 181, 17, 147, 227, 181, 17, 149, 227, 181, 17, 170, 227, 181, - 17, 195, 227, 181, 17, 213, 111, 227, 181, 17, 199, 227, 181, 17, 222, - 63, 227, 181, 1, 207, 241, 227, 181, 1, 207, 229, 227, 181, 1, 244, 120, - 220, 47, 246, 135, 17, 202, 84, 220, 47, 246, 135, 17, 105, 220, 47, 246, - 135, 17, 108, 220, 47, 246, 135, 17, 147, 220, 47, 246, 135, 17, 149, - 220, 47, 246, 135, 17, 170, 220, 47, 246, 135, 17, 195, 220, 47, 246, - 135, 17, 213, 111, 220, 47, 246, 135, 17, 199, 220, 47, 246, 135, 17, - 222, 63, 220, 47, 246, 135, 1, 228, 113, 220, 47, 246, 135, 1, 250, 49, - 220, 47, 246, 135, 1, 251, 81, 220, 47, 246, 135, 1, 250, 223, 220, 47, - 246, 135, 1, 251, 39, 220, 47, 246, 135, 1, 228, 112, 220, 47, 246, 135, - 1, 251, 243, 220, 47, 246, 135, 1, 251, 244, 220, 47, 246, 135, 1, 251, - 242, 220, 47, 246, 135, 1, 251, 237, 220, 47, 246, 135, 1, 227, 148, 220, - 47, 246, 135, 1, 230, 215, 220, 47, 246, 135, 1, 231, 84, 220, 47, 246, - 135, 1, 230, 236, 220, 47, 246, 135, 1, 230, 224, 220, 47, 246, 135, 1, - 226, 239, 220, 47, 246, 135, 1, 207, 31, 220, 47, 246, 135, 1, 207, 29, - 220, 47, 246, 135, 1, 206, 229, 220, 47, 246, 135, 1, 206, 170, 220, 47, - 246, 135, 1, 227, 234, 220, 47, 246, 135, 1, 241, 46, 220, 47, 246, 135, - 1, 241, 164, 220, 47, 246, 135, 1, 241, 92, 220, 47, 246, 135, 1, 241, - 21, 220, 47, 246, 135, 1, 227, 49, 220, 47, 246, 135, 1, 219, 219, 220, - 47, 246, 135, 1, 220, 93, 220, 47, 246, 135, 1, 219, 206, 220, 47, 246, - 135, 1, 220, 60, 220, 47, 246, 135, 223, 247, 207, 206, 220, 47, 246, - 135, 239, 3, 207, 207, 220, 47, 246, 135, 223, 245, 207, 207, 220, 47, - 246, 135, 216, 118, 220, 47, 246, 135, 218, 206, 220, 47, 246, 135, 251, - 72, 220, 47, 246, 135, 217, 179, 223, 241, 220, 47, 246, 135, 217, 179, - 52, 223, 241, 210, 213, 217, 179, 248, 64, 210, 184, 210, 213, 217, 179, - 248, 64, 219, 113, 210, 213, 217, 179, 248, 64, 217, 167, 210, 213, 217, - 179, 248, 64, 247, 77, 210, 213, 217, 179, 248, 64, 227, 172, 214, 224, - 210, 213, 217, 179, 248, 64, 230, 44, 214, 224, 210, 213, 217, 179, 248, - 64, 244, 213, 214, 224, 210, 213, 217, 179, 248, 64, 249, 33, 214, 224, - 206, 52, 143, 229, 234, 206, 52, 143, 213, 58, 206, 52, 143, 217, 245, - 206, 52, 2, 222, 76, 206, 52, 2, 203, 87, 224, 146, 210, 175, 206, 52, - 143, 203, 87, 251, 77, 231, 36, 210, 175, 206, 52, 143, 203, 87, 231, 36, - 210, 175, 206, 52, 143, 203, 87, 229, 222, 231, 36, 210, 175, 206, 52, - 143, 247, 55, 56, 206, 52, 143, 203, 87, 229, 222, 231, 36, 210, 176, - 214, 194, 206, 52, 143, 52, 210, 175, 206, 52, 143, 208, 70, 210, 175, - 206, 52, 143, 229, 222, 250, 182, 206, 52, 143, 70, 56, 206, 52, 143, - 120, 187, 56, 206, 52, 143, 126, 187, 56, 206, 52, 143, 216, 4, 229, 233, - 231, 36, 210, 175, 206, 52, 143, 250, 47, 231, 36, 210, 175, 206, 52, 2, - 205, 200, 210, 175, 206, 52, 2, 205, 200, 207, 26, 206, 52, 2, 216, 73, - 205, 200, 207, 26, 206, 52, 2, 205, 200, 250, 182, 206, 52, 2, 216, 73, - 205, 200, 250, 182, 206, 52, 2, 205, 200, 207, 27, 3, 209, 248, 206, 52, - 2, 205, 200, 250, 183, 3, 209, 248, 206, 52, 2, 250, 181, 250, 197, 206, - 52, 2, 250, 181, 249, 2, 206, 52, 2, 250, 181, 206, 77, 206, 52, 2, 250, - 181, 206, 78, 3, 209, 248, 206, 52, 2, 208, 201, 206, 52, 2, 237, 15, - 163, 250, 180, 206, 52, 2, 163, 250, 180, 206, 52, 2, 215, 147, 163, 250, - 180, 206, 52, 2, 250, 181, 207, 33, 223, 232, 206, 52, 2, 250, 122, 206, - 52, 2, 215, 198, 250, 122, 206, 52, 143, 247, 55, 55, 206, 52, 2, 230, - 135, 206, 52, 2, 206, 222, 206, 52, 143, 215, 253, 55, 206, 52, 143, 52, - 215, 253, 55, 8, 1, 5, 6, 63, 8, 1, 5, 6, 251, 109, 8, 5, 1, 207, 174, - 251, 109, 8, 1, 5, 6, 248, 225, 249, 255, 8, 1, 5, 6, 247, 125, 8, 1, 5, - 6, 245, 51, 8, 1, 5, 6, 240, 243, 8, 1, 5, 6, 74, 8, 5, 1, 207, 174, 171, - 74, 8, 5, 1, 207, 174, 75, 8, 1, 5, 6, 230, 184, 8, 1, 5, 6, 230, 54, 8, - 1, 5, 6, 228, 131, 3, 95, 8, 1, 5, 6, 226, 185, 8, 1, 5, 6, 216, 73, 223, - 163, 8, 1, 5, 6, 78, 8, 1, 5, 6, 171, 78, 8, 5, 1, 212, 154, 78, 8, 5, 1, - 212, 154, 171, 78, 8, 5, 1, 212, 154, 158, 3, 95, 8, 5, 1, 207, 174, 220, - 73, 8, 1, 5, 6, 219, 216, 8, 5, 1, 208, 145, 162, 78, 8, 5, 1, 247, 248, - 162, 78, 8, 1, 5, 6, 219, 184, 8, 1, 5, 6, 216, 73, 146, 8, 1, 5, 6, 207, - 174, 146, 8, 1, 5, 6, 210, 69, 8, 1, 5, 6, 68, 8, 5, 1, 212, 154, 68, 8, - 5, 1, 212, 154, 243, 229, 68, 8, 5, 1, 212, 154, 207, 174, 226, 185, 8, - 1, 5, 6, 206, 164, 8, 1, 5, 6, 204, 144, 8, 1, 5, 6, 202, 159, 8, 1, 5, - 6, 240, 177, 8, 1, 205, 186, 228, 3, 211, 200, 8, 1, 251, 59, 30, 1, 5, - 6, 238, 235, 30, 1, 5, 6, 228, 24, 30, 1, 5, 6, 218, 167, 30, 1, 5, 6, - 216, 59, 30, 1, 5, 6, 217, 202, 36, 1, 5, 6, 241, 122, 65, 1, 6, 63, 65, - 1, 6, 251, 109, 65, 1, 6, 249, 255, 65, 1, 6, 248, 225, 249, 255, 65, 1, - 6, 245, 51, 65, 1, 6, 74, 65, 1, 6, 216, 73, 74, 65, 1, 6, 239, 75, 65, - 1, 6, 237, 171, 65, 1, 6, 75, 65, 1, 6, 230, 184, 65, 1, 6, 230, 54, 65, - 1, 6, 159, 65, 1, 6, 226, 185, 65, 1, 6, 223, 163, 65, 1, 6, 216, 73, - 223, 163, 65, 1, 6, 78, 65, 1, 6, 219, 216, 65, 1, 6, 219, 184, 65, 1, 6, - 146, 65, 1, 6, 210, 69, 65, 1, 6, 68, 65, 1, 6, 204, 144, 65, 1, 5, 63, - 65, 1, 5, 207, 174, 63, 65, 1, 5, 251, 2, 65, 1, 5, 207, 174, 251, 109, - 65, 1, 5, 249, 255, 65, 1, 5, 245, 51, 65, 1, 5, 74, 65, 1, 5, 214, 192, - 65, 1, 5, 171, 74, 65, 1, 5, 207, 174, 171, 74, 65, 1, 5, 239, 75, 65, 1, - 5, 207, 174, 75, 65, 1, 5, 230, 54, 65, 1, 5, 226, 185, 65, 1, 5, 241, - 78, 65, 1, 5, 78, 65, 1, 5, 171, 78, 65, 1, 5, 208, 145, 162, 78, 65, 1, - 5, 247, 248, 162, 78, 65, 1, 5, 219, 184, 65, 1, 5, 210, 69, 65, 1, 5, - 68, 65, 1, 5, 212, 154, 68, 65, 1, 5, 207, 174, 226, 185, 65, 1, 5, 206, - 164, 65, 1, 5, 251, 59, 65, 1, 5, 248, 106, 65, 1, 5, 30, 238, 235, 65, - 1, 5, 244, 37, 65, 1, 5, 30, 218, 192, 65, 1, 5, 246, 142, 8, 210, 246, - 5, 1, 75, 8, 210, 246, 5, 1, 146, 8, 210, 246, 5, 1, 68, 8, 210, 246, 5, - 1, 206, 164, 30, 210, 246, 5, 1, 248, 106, 30, 210, 246, 5, 1, 238, 235, - 30, 210, 246, 5, 1, 216, 59, 30, 210, 246, 5, 1, 218, 192, 30, 210, 246, - 5, 1, 246, 142, 8, 5, 1, 207, 24, 8, 5, 1, 66, 3, 101, 208, 227, 8, 5, 1, - 245, 52, 3, 101, 208, 227, 8, 5, 1, 240, 175, 3, 101, 208, 227, 8, 5, 1, - 226, 186, 3, 101, 208, 227, 8, 5, 1, 223, 164, 3, 101, 208, 227, 8, 5, 1, - 219, 185, 3, 101, 208, 227, 8, 5, 1, 217, 1, 3, 101, 208, 227, 8, 5, 1, - 217, 1, 3, 239, 241, 25, 101, 208, 227, 8, 5, 1, 215, 94, 3, 101, 208, - 227, 8, 5, 1, 210, 70, 3, 101, 208, 227, 8, 5, 1, 202, 160, 3, 101, 208, - 227, 8, 5, 1, 207, 174, 239, 75, 65, 1, 36, 241, 92, 8, 5, 1, 231, 4, - 239, 75, 8, 5, 1, 209, 111, 3, 211, 36, 8, 5, 6, 1, 235, 206, 3, 95, 8, - 5, 1, 230, 231, 3, 95, 8, 5, 1, 219, 185, 3, 95, 8, 5, 6, 1, 106, 3, 95, - 8, 5, 1, 206, 217, 3, 95, 8, 5, 1, 66, 3, 219, 142, 113, 8, 5, 1, 245, - 52, 3, 219, 142, 113, 8, 5, 1, 240, 175, 3, 219, 142, 113, 8, 5, 1, 239, - 76, 3, 219, 142, 113, 8, 5, 1, 230, 55, 3, 219, 142, 113, 8, 5, 1, 228, - 131, 3, 219, 142, 113, 8, 5, 1, 226, 186, 3, 219, 142, 113, 8, 5, 1, 223, - 164, 3, 219, 142, 113, 8, 5, 1, 219, 185, 3, 219, 142, 113, 8, 5, 1, 217, - 1, 3, 219, 142, 113, 8, 5, 1, 215, 94, 3, 219, 142, 113, 8, 5, 1, 241, 8, - 3, 219, 142, 113, 8, 5, 1, 206, 165, 3, 219, 142, 113, 8, 5, 1, 203, 197, - 3, 219, 142, 113, 8, 5, 1, 202, 160, 3, 219, 142, 113, 8, 5, 1, 34, 3, - 216, 79, 113, 8, 5, 1, 251, 3, 3, 216, 79, 113, 8, 5, 1, 245, 52, 3, 236, - 116, 25, 209, 248, 8, 5, 1, 188, 3, 216, 79, 113, 8, 5, 1, 171, 188, 3, - 216, 79, 113, 8, 5, 1, 216, 73, 171, 188, 3, 216, 79, 113, 8, 5, 1, 214, - 193, 3, 216, 79, 113, 8, 5, 1, 235, 206, 3, 216, 79, 113, 8, 5, 1, 171, - 158, 3, 216, 79, 113, 8, 5, 1, 241, 8, 3, 216, 79, 113, 8, 5, 1, 106, 3, - 216, 79, 113, 8, 5, 1, 240, 178, 3, 216, 79, 113, 65, 1, 5, 207, 174, - 251, 2, 65, 1, 5, 247, 125, 65, 1, 5, 247, 126, 3, 245, 95, 65, 1, 5, - 240, 243, 65, 1, 5, 216, 73, 171, 74, 65, 1, 5, 240, 174, 65, 1, 5, 243, - 84, 230, 185, 3, 95, 65, 1, 5, 132, 239, 75, 65, 1, 5, 207, 174, 237, - 171, 65, 1, 5, 235, 206, 3, 95, 65, 1, 5, 230, 230, 65, 1, 5, 6, 75, 65, - 1, 5, 6, 235, 206, 3, 95, 65, 1, 5, 230, 185, 3, 245, 126, 65, 1, 5, 228, - 131, 3, 216, 79, 113, 65, 1, 5, 228, 131, 3, 219, 142, 113, 65, 1, 5, 6, - 159, 65, 1, 5, 226, 186, 3, 113, 65, 1, 5, 207, 174, 226, 186, 3, 163, - 227, 210, 65, 1, 5, 223, 164, 3, 49, 113, 65, 1, 5, 223, 164, 3, 216, 79, - 113, 65, 1, 5, 6, 223, 163, 65, 1, 5, 248, 225, 78, 65, 1, 5, 218, 192, - 65, 1, 5, 215, 94, 3, 113, 65, 1, 5, 241, 7, 65, 1, 5, 210, 70, 3, 219, - 142, 113, 65, 1, 5, 106, 142, 65, 1, 5, 206, 216, 65, 1, 5, 6, 68, 65, 1, - 5, 206, 165, 3, 113, 65, 1, 5, 207, 174, 206, 164, 65, 1, 5, 202, 159, - 65, 1, 5, 202, 160, 3, 216, 79, 113, 65, 1, 5, 202, 160, 3, 245, 95, 65, - 1, 5, 240, 177, 65, 1, 5, 209, 74, 39, 242, 83, 237, 254, 251, 138, 39, - 242, 83, 251, 126, 251, 138, 39, 212, 25, 56, 39, 210, 182, 82, 39, 225, - 169, 39, 237, 251, 39, 225, 167, 39, 251, 124, 39, 237, 252, 39, 251, - 125, 39, 8, 5, 1, 217, 1, 56, 39, 247, 213, 39, 225, 168, 39, 52, 246, - 53, 55, 39, 220, 63, 55, 39, 202, 30, 56, 39, 230, 216, 56, 39, 206, 211, - 55, 39, 206, 194, 55, 39, 8, 5, 1, 239, 214, 171, 34, 55, 39, 8, 5, 1, - 251, 109, 39, 8, 5, 1, 250, 178, 39, 8, 5, 1, 250, 18, 39, 8, 5, 1, 247, - 126, 246, 231, 39, 8, 5, 1, 231, 4, 245, 51, 39, 8, 5, 1, 240, 243, 39, - 8, 5, 1, 239, 75, 39, 8, 1, 5, 6, 239, 75, 39, 8, 5, 1, 230, 54, 39, 8, - 5, 1, 159, 39, 8, 1, 5, 6, 159, 39, 8, 1, 5, 6, 226, 185, 39, 8, 5, 1, - 223, 163, 39, 8, 1, 5, 6, 223, 163, 39, 8, 1, 5, 6, 146, 39, 8, 5, 1, - 217, 1, 215, 192, 39, 8, 5, 1, 194, 39, 8, 5, 1, 163, 194, 39, 8, 5, 1, - 202, 159, 39, 8, 5, 1, 251, 2, 39, 8, 5, 1, 249, 255, 39, 8, 5, 1, 248, - 106, 39, 8, 5, 1, 214, 192, 39, 8, 5, 1, 240, 174, 39, 8, 5, 1, 228, 131, - 3, 52, 101, 208, 227, 39, 8, 5, 1, 158, 3, 157, 246, 219, 95, 39, 8, 5, - 1, 219, 184, 39, 8, 5, 1, 241, 7, 39, 8, 5, 1, 106, 3, 157, 246, 219, 95, - 39, 8, 5, 1, 204, 144, 39, 8, 5, 1, 34, 3, 243, 231, 39, 8, 5, 1, 158, 3, - 243, 231, 39, 8, 5, 1, 106, 3, 243, 231, 39, 112, 210, 4, 55, 39, 52, - 230, 239, 247, 215, 56, 39, 251, 7, 156, 208, 173, 56, 39, 49, 250, 95, - 55, 39, 50, 250, 95, 25, 121, 250, 95, 56, 8, 6, 1, 34, 3, 215, 253, 56, - 8, 5, 1, 34, 3, 215, 253, 56, 8, 6, 1, 66, 3, 70, 55, 8, 5, 1, 66, 3, 70, - 55, 8, 6, 1, 66, 3, 70, 56, 8, 5, 1, 66, 3, 70, 56, 8, 6, 1, 66, 3, 227, - 115, 56, 8, 5, 1, 66, 3, 227, 115, 56, 8, 6, 1, 247, 126, 3, 246, 232, - 25, 165, 8, 5, 1, 247, 126, 3, 246, 232, 25, 165, 8, 6, 1, 245, 52, 3, - 70, 55, 8, 5, 1, 245, 52, 3, 70, 55, 8, 6, 1, 245, 52, 3, 70, 56, 8, 5, - 1, 245, 52, 3, 70, 56, 8, 6, 1, 245, 52, 3, 227, 115, 56, 8, 5, 1, 245, - 52, 3, 227, 115, 56, 8, 6, 1, 245, 52, 3, 246, 231, 8, 5, 1, 245, 52, 3, - 246, 231, 8, 6, 1, 245, 52, 3, 246, 53, 56, 8, 5, 1, 245, 52, 3, 246, 53, - 56, 8, 6, 1, 188, 3, 225, 171, 25, 237, 253, 8, 5, 1, 188, 3, 225, 171, - 25, 237, 253, 8, 6, 1, 188, 3, 225, 171, 25, 165, 8, 5, 1, 188, 3, 225, - 171, 25, 165, 8, 6, 1, 188, 3, 246, 53, 56, 8, 5, 1, 188, 3, 246, 53, 56, - 8, 6, 1, 188, 3, 208, 228, 56, 8, 5, 1, 188, 3, 208, 228, 56, 8, 6, 1, - 188, 3, 246, 232, 25, 247, 214, 8, 5, 1, 188, 3, 246, 232, 25, 247, 214, - 8, 6, 1, 240, 175, 3, 70, 55, 8, 5, 1, 240, 175, 3, 70, 55, 8, 6, 1, 239, - 76, 3, 225, 170, 8, 5, 1, 239, 76, 3, 225, 170, 8, 6, 1, 237, 172, 3, 70, - 55, 8, 5, 1, 237, 172, 3, 70, 55, 8, 6, 1, 237, 172, 3, 70, 56, 8, 5, 1, - 237, 172, 3, 70, 56, 8, 6, 1, 237, 172, 3, 243, 231, 8, 5, 1, 237, 172, - 3, 243, 231, 8, 6, 1, 237, 172, 3, 246, 231, 8, 5, 1, 237, 172, 3, 246, - 231, 8, 6, 1, 237, 172, 3, 247, 215, 56, 8, 5, 1, 237, 172, 3, 247, 215, - 56, 8, 6, 1, 235, 206, 3, 208, 228, 56, 8, 5, 1, 235, 206, 3, 208, 228, - 56, 8, 6, 1, 235, 206, 3, 243, 232, 25, 165, 8, 5, 1, 235, 206, 3, 243, - 232, 25, 165, 8, 6, 1, 230, 55, 3, 165, 8, 5, 1, 230, 55, 3, 165, 8, 6, - 1, 230, 55, 3, 70, 56, 8, 5, 1, 230, 55, 3, 70, 56, 8, 6, 1, 230, 55, 3, - 227, 115, 56, 8, 5, 1, 230, 55, 3, 227, 115, 56, 8, 6, 1, 228, 131, 3, - 70, 56, 8, 5, 1, 228, 131, 3, 70, 56, 8, 6, 1, 228, 131, 3, 70, 248, 126, - 25, 225, 170, 8, 5, 1, 228, 131, 3, 70, 248, 126, 25, 225, 170, 8, 6, 1, - 228, 131, 3, 227, 115, 56, 8, 5, 1, 228, 131, 3, 227, 115, 56, 8, 6, 1, - 228, 131, 3, 246, 53, 56, 8, 5, 1, 228, 131, 3, 246, 53, 56, 8, 6, 1, - 226, 186, 3, 165, 8, 5, 1, 226, 186, 3, 165, 8, 6, 1, 226, 186, 3, 70, - 55, 8, 5, 1, 226, 186, 3, 70, 55, 8, 6, 1, 226, 186, 3, 70, 56, 8, 5, 1, - 226, 186, 3, 70, 56, 8, 6, 1, 223, 164, 3, 70, 55, 8, 5, 1, 223, 164, 3, - 70, 55, 8, 6, 1, 223, 164, 3, 70, 56, 8, 5, 1, 223, 164, 3, 70, 56, 8, 6, - 1, 223, 164, 3, 227, 115, 56, 8, 5, 1, 223, 164, 3, 227, 115, 56, 8, 6, - 1, 223, 164, 3, 246, 53, 56, 8, 5, 1, 223, 164, 3, 246, 53, 56, 8, 6, 1, - 158, 3, 208, 228, 25, 165, 8, 5, 1, 158, 3, 208, 228, 25, 165, 8, 6, 1, - 158, 3, 208, 228, 25, 243, 231, 8, 5, 1, 158, 3, 208, 228, 25, 243, 231, - 8, 6, 1, 158, 3, 225, 171, 25, 237, 253, 8, 5, 1, 158, 3, 225, 171, 25, - 237, 253, 8, 6, 1, 158, 3, 225, 171, 25, 165, 8, 5, 1, 158, 3, 225, 171, - 25, 165, 8, 6, 1, 219, 185, 3, 165, 8, 5, 1, 219, 185, 3, 165, 8, 6, 1, - 219, 185, 3, 70, 55, 8, 5, 1, 219, 185, 3, 70, 55, 8, 6, 1, 217, 1, 3, - 70, 55, 8, 5, 1, 217, 1, 3, 70, 55, 8, 6, 1, 217, 1, 3, 70, 56, 8, 5, 1, - 217, 1, 3, 70, 56, 8, 6, 1, 217, 1, 3, 70, 248, 126, 25, 225, 170, 8, 5, - 1, 217, 1, 3, 70, 248, 126, 25, 225, 170, 8, 6, 1, 217, 1, 3, 227, 115, - 56, 8, 5, 1, 217, 1, 3, 227, 115, 56, 8, 6, 1, 215, 94, 3, 70, 55, 8, 5, - 1, 215, 94, 3, 70, 55, 8, 6, 1, 215, 94, 3, 70, 56, 8, 5, 1, 215, 94, 3, - 70, 56, 8, 6, 1, 215, 94, 3, 251, 126, 25, 70, 55, 8, 5, 1, 215, 94, 3, - 251, 126, 25, 70, 55, 8, 6, 1, 215, 94, 3, 247, 30, 25, 70, 55, 8, 5, 1, - 215, 94, 3, 247, 30, 25, 70, 55, 8, 6, 1, 215, 94, 3, 70, 248, 126, 25, - 70, 55, 8, 5, 1, 215, 94, 3, 70, 248, 126, 25, 70, 55, 8, 6, 1, 210, 70, - 3, 70, 55, 8, 5, 1, 210, 70, 3, 70, 55, 8, 6, 1, 210, 70, 3, 70, 56, 8, - 5, 1, 210, 70, 3, 70, 56, 8, 6, 1, 210, 70, 3, 227, 115, 56, 8, 5, 1, - 210, 70, 3, 227, 115, 56, 8, 6, 1, 210, 70, 3, 246, 53, 56, 8, 5, 1, 210, - 70, 3, 246, 53, 56, 8, 6, 1, 106, 3, 243, 232, 56, 8, 5, 1, 106, 3, 243, - 232, 56, 8, 6, 1, 106, 3, 208, 228, 56, 8, 5, 1, 106, 3, 208, 228, 56, 8, - 6, 1, 106, 3, 246, 53, 56, 8, 5, 1, 106, 3, 246, 53, 56, 8, 6, 1, 106, 3, - 208, 228, 25, 165, 8, 5, 1, 106, 3, 208, 228, 25, 165, 8, 6, 1, 106, 3, - 225, 171, 25, 243, 231, 8, 5, 1, 106, 3, 225, 171, 25, 243, 231, 8, 6, 1, - 206, 165, 3, 208, 227, 8, 5, 1, 206, 165, 3, 208, 227, 8, 6, 1, 206, 165, - 3, 70, 56, 8, 5, 1, 206, 165, 3, 70, 56, 8, 6, 1, 204, 145, 3, 237, 253, - 8, 5, 1, 204, 145, 3, 237, 253, 8, 6, 1, 204, 145, 3, 165, 8, 5, 1, 204, - 145, 3, 165, 8, 6, 1, 204, 145, 3, 243, 231, 8, 5, 1, 204, 145, 3, 243, - 231, 8, 6, 1, 204, 145, 3, 70, 55, 8, 5, 1, 204, 145, 3, 70, 55, 8, 6, 1, - 204, 145, 3, 70, 56, 8, 5, 1, 204, 145, 3, 70, 56, 8, 6, 1, 203, 197, 3, - 70, 55, 8, 5, 1, 203, 197, 3, 70, 55, 8, 6, 1, 203, 197, 3, 243, 231, 8, - 5, 1, 203, 197, 3, 243, 231, 8, 6, 1, 203, 125, 3, 70, 55, 8, 5, 1, 203, - 125, 3, 70, 55, 8, 6, 1, 202, 160, 3, 246, 52, 8, 5, 1, 202, 160, 3, 246, - 52, 8, 6, 1, 202, 160, 3, 70, 56, 8, 5, 1, 202, 160, 3, 70, 56, 8, 6, 1, - 202, 160, 3, 227, 115, 56, 8, 5, 1, 202, 160, 3, 227, 115, 56, 8, 5, 1, - 237, 172, 3, 227, 115, 56, 8, 5, 1, 210, 70, 3, 243, 231, 8, 5, 1, 204, - 145, 3, 215, 253, 55, 8, 5, 1, 203, 125, 3, 215, 253, 55, 8, 5, 1, 34, 3, - 50, 162, 215, 252, 8, 5, 1, 163, 215, 94, 3, 70, 55, 8, 5, 1, 163, 215, - 94, 3, 243, 228, 95, 8, 5, 1, 163, 215, 94, 3, 138, 95, 8, 6, 1, 213, 57, - 194, 8, 5, 1, 244, 37, 8, 6, 1, 34, 3, 70, 56, 8, 5, 1, 34, 3, 70, 56, 8, - 6, 1, 34, 3, 236, 116, 55, 8, 5, 1, 34, 3, 236, 116, 55, 8, 6, 1, 34, 3, - 246, 53, 25, 165, 8, 5, 1, 34, 3, 246, 53, 25, 165, 8, 6, 1, 34, 3, 246, - 53, 25, 237, 253, 8, 5, 1, 34, 3, 246, 53, 25, 237, 253, 8, 6, 1, 34, 3, - 246, 53, 25, 236, 116, 55, 8, 5, 1, 34, 3, 246, 53, 25, 236, 116, 55, 8, - 6, 1, 34, 3, 246, 53, 25, 208, 227, 8, 5, 1, 34, 3, 246, 53, 25, 208, - 227, 8, 6, 1, 34, 3, 246, 53, 25, 70, 56, 8, 5, 1, 34, 3, 246, 53, 25, - 70, 56, 8, 6, 1, 34, 3, 247, 215, 25, 165, 8, 5, 1, 34, 3, 247, 215, 25, - 165, 8, 6, 1, 34, 3, 247, 215, 25, 237, 253, 8, 5, 1, 34, 3, 247, 215, - 25, 237, 253, 8, 6, 1, 34, 3, 247, 215, 25, 236, 116, 55, 8, 5, 1, 34, 3, - 247, 215, 25, 236, 116, 55, 8, 6, 1, 34, 3, 247, 215, 25, 208, 227, 8, 5, - 1, 34, 3, 247, 215, 25, 208, 227, 8, 6, 1, 34, 3, 247, 215, 25, 70, 56, - 8, 5, 1, 34, 3, 247, 215, 25, 70, 56, 8, 6, 1, 188, 3, 70, 56, 8, 5, 1, - 188, 3, 70, 56, 8, 6, 1, 188, 3, 236, 116, 55, 8, 5, 1, 188, 3, 236, 116, - 55, 8, 6, 1, 188, 3, 208, 227, 8, 5, 1, 188, 3, 208, 227, 8, 6, 1, 188, - 3, 246, 53, 25, 165, 8, 5, 1, 188, 3, 246, 53, 25, 165, 8, 6, 1, 188, 3, - 246, 53, 25, 237, 253, 8, 5, 1, 188, 3, 246, 53, 25, 237, 253, 8, 6, 1, - 188, 3, 246, 53, 25, 236, 116, 55, 8, 5, 1, 188, 3, 246, 53, 25, 236, - 116, 55, 8, 6, 1, 188, 3, 246, 53, 25, 208, 227, 8, 5, 1, 188, 3, 246, - 53, 25, 208, 227, 8, 6, 1, 188, 3, 246, 53, 25, 70, 56, 8, 5, 1, 188, 3, - 246, 53, 25, 70, 56, 8, 6, 1, 235, 206, 3, 236, 116, 55, 8, 5, 1, 235, - 206, 3, 236, 116, 55, 8, 6, 1, 235, 206, 3, 70, 56, 8, 5, 1, 235, 206, 3, - 70, 56, 8, 6, 1, 158, 3, 70, 56, 8, 5, 1, 158, 3, 70, 56, 8, 6, 1, 158, - 3, 236, 116, 55, 8, 5, 1, 158, 3, 236, 116, 55, 8, 6, 1, 158, 3, 246, 53, - 25, 165, 8, 5, 1, 158, 3, 246, 53, 25, 165, 8, 6, 1, 158, 3, 246, 53, 25, - 237, 253, 8, 5, 1, 158, 3, 246, 53, 25, 237, 253, 8, 6, 1, 158, 3, 246, - 53, 25, 236, 116, 55, 8, 5, 1, 158, 3, 246, 53, 25, 236, 116, 55, 8, 6, - 1, 158, 3, 246, 53, 25, 208, 227, 8, 5, 1, 158, 3, 246, 53, 25, 208, 227, - 8, 6, 1, 158, 3, 246, 53, 25, 70, 56, 8, 5, 1, 158, 3, 246, 53, 25, 70, - 56, 8, 6, 1, 158, 3, 236, 54, 25, 165, 8, 5, 1, 158, 3, 236, 54, 25, 165, - 8, 6, 1, 158, 3, 236, 54, 25, 237, 253, 8, 5, 1, 158, 3, 236, 54, 25, - 237, 253, 8, 6, 1, 158, 3, 236, 54, 25, 236, 116, 55, 8, 5, 1, 158, 3, - 236, 54, 25, 236, 116, 55, 8, 6, 1, 158, 3, 236, 54, 25, 208, 227, 8, 5, - 1, 158, 3, 236, 54, 25, 208, 227, 8, 6, 1, 158, 3, 236, 54, 25, 70, 56, - 8, 5, 1, 158, 3, 236, 54, 25, 70, 56, 8, 6, 1, 106, 3, 70, 56, 8, 5, 1, - 106, 3, 70, 56, 8, 6, 1, 106, 3, 236, 116, 55, 8, 5, 1, 106, 3, 236, 116, - 55, 8, 6, 1, 106, 3, 236, 54, 25, 165, 8, 5, 1, 106, 3, 236, 54, 25, 165, - 8, 6, 1, 106, 3, 236, 54, 25, 237, 253, 8, 5, 1, 106, 3, 236, 54, 25, - 237, 253, 8, 6, 1, 106, 3, 236, 54, 25, 236, 116, 55, 8, 5, 1, 106, 3, - 236, 54, 25, 236, 116, 55, 8, 6, 1, 106, 3, 236, 54, 25, 208, 227, 8, 5, - 1, 106, 3, 236, 54, 25, 208, 227, 8, 6, 1, 106, 3, 236, 54, 25, 70, 56, - 8, 5, 1, 106, 3, 236, 54, 25, 70, 56, 8, 6, 1, 203, 125, 3, 237, 253, 8, - 5, 1, 203, 125, 3, 237, 253, 8, 6, 1, 203, 125, 3, 70, 56, 8, 5, 1, 203, - 125, 3, 70, 56, 8, 6, 1, 203, 125, 3, 236, 116, 55, 8, 5, 1, 203, 125, 3, - 236, 116, 55, 8, 6, 1, 203, 125, 3, 208, 227, 8, 5, 1, 203, 125, 3, 208, - 227, 8, 6, 1, 224, 147, 227, 78, 8, 5, 1, 224, 147, 227, 78, 8, 6, 1, - 224, 147, 206, 164, 8, 5, 1, 224, 147, 206, 164, 8, 6, 1, 203, 125, 3, - 227, 14, 8, 5, 1, 203, 125, 3, 227, 14, 30, 5, 1, 251, 3, 3, 217, 195, - 30, 5, 1, 251, 3, 3, 244, 141, 30, 5, 1, 251, 3, 3, 217, 196, 25, 206, - 70, 30, 5, 1, 251, 3, 3, 244, 142, 25, 206, 70, 30, 5, 1, 251, 3, 3, 217, - 196, 25, 219, 189, 30, 5, 1, 251, 3, 3, 244, 142, 25, 219, 189, 30, 5, 1, - 251, 3, 3, 217, 196, 25, 218, 239, 30, 5, 1, 251, 3, 3, 244, 142, 25, - 218, 239, 30, 6, 1, 251, 3, 3, 217, 195, 30, 6, 1, 251, 3, 3, 244, 141, - 30, 6, 1, 251, 3, 3, 217, 196, 25, 206, 70, 30, 6, 1, 251, 3, 3, 244, - 142, 25, 206, 70, 30, 6, 1, 251, 3, 3, 217, 196, 25, 219, 189, 30, 6, 1, - 251, 3, 3, 244, 142, 25, 219, 189, 30, 6, 1, 251, 3, 3, 217, 196, 25, - 218, 239, 30, 6, 1, 251, 3, 3, 244, 142, 25, 218, 239, 30, 5, 1, 241, 38, - 3, 217, 195, 30, 5, 1, 241, 38, 3, 244, 141, 30, 5, 1, 241, 38, 3, 217, - 196, 25, 206, 70, 30, 5, 1, 241, 38, 3, 244, 142, 25, 206, 70, 30, 5, 1, - 241, 38, 3, 217, 196, 25, 219, 189, 30, 5, 1, 241, 38, 3, 244, 142, 25, - 219, 189, 30, 6, 1, 241, 38, 3, 217, 195, 30, 6, 1, 241, 38, 3, 244, 141, - 30, 6, 1, 241, 38, 3, 217, 196, 25, 206, 70, 30, 6, 1, 241, 38, 3, 244, - 142, 25, 206, 70, 30, 6, 1, 241, 38, 3, 217, 196, 25, 219, 189, 30, 6, 1, - 241, 38, 3, 244, 142, 25, 219, 189, 30, 5, 1, 240, 249, 3, 217, 195, 30, - 5, 1, 240, 249, 3, 244, 141, 30, 5, 1, 240, 249, 3, 217, 196, 25, 206, - 70, 30, 5, 1, 240, 249, 3, 244, 142, 25, 206, 70, 30, 5, 1, 240, 249, 3, - 217, 196, 25, 219, 189, 30, 5, 1, 240, 249, 3, 244, 142, 25, 219, 189, - 30, 5, 1, 240, 249, 3, 217, 196, 25, 218, 239, 30, 5, 1, 240, 249, 3, - 244, 142, 25, 218, 239, 30, 6, 1, 240, 249, 3, 217, 195, 30, 6, 1, 240, - 249, 3, 244, 141, 30, 6, 1, 240, 249, 3, 217, 196, 25, 206, 70, 30, 6, 1, - 240, 249, 3, 244, 142, 25, 206, 70, 30, 6, 1, 240, 249, 3, 217, 196, 25, - 219, 189, 30, 6, 1, 240, 249, 3, 244, 142, 25, 219, 189, 30, 6, 1, 240, - 249, 3, 217, 196, 25, 218, 239, 30, 6, 1, 240, 249, 3, 244, 142, 25, 218, - 239, 30, 5, 1, 230, 231, 3, 217, 195, 30, 5, 1, 230, 231, 3, 244, 141, - 30, 5, 1, 230, 231, 3, 217, 196, 25, 206, 70, 30, 5, 1, 230, 231, 3, 244, - 142, 25, 206, 70, 30, 5, 1, 230, 231, 3, 217, 196, 25, 219, 189, 30, 5, - 1, 230, 231, 3, 244, 142, 25, 219, 189, 30, 5, 1, 230, 231, 3, 217, 196, - 25, 218, 239, 30, 5, 1, 230, 231, 3, 244, 142, 25, 218, 239, 30, 6, 1, - 230, 231, 3, 217, 195, 30, 6, 1, 230, 231, 3, 244, 141, 30, 6, 1, 230, - 231, 3, 217, 196, 25, 206, 70, 30, 6, 1, 230, 231, 3, 244, 142, 25, 206, - 70, 30, 6, 1, 230, 231, 3, 217, 196, 25, 219, 189, 30, 6, 1, 230, 231, 3, - 244, 142, 25, 219, 189, 30, 6, 1, 230, 231, 3, 217, 196, 25, 218, 239, - 30, 6, 1, 230, 231, 3, 244, 142, 25, 218, 239, 30, 5, 1, 220, 35, 3, 217, - 195, 30, 5, 1, 220, 35, 3, 244, 141, 30, 5, 1, 220, 35, 3, 217, 196, 25, - 206, 70, 30, 5, 1, 220, 35, 3, 244, 142, 25, 206, 70, 30, 5, 1, 220, 35, - 3, 217, 196, 25, 219, 189, 30, 5, 1, 220, 35, 3, 244, 142, 25, 219, 189, - 30, 6, 1, 220, 35, 3, 217, 195, 30, 6, 1, 220, 35, 3, 244, 141, 30, 6, 1, - 220, 35, 3, 217, 196, 25, 206, 70, 30, 6, 1, 220, 35, 3, 244, 142, 25, - 206, 70, 30, 6, 1, 220, 35, 3, 217, 196, 25, 219, 189, 30, 6, 1, 220, 35, - 3, 244, 142, 25, 219, 189, 30, 5, 1, 206, 217, 3, 217, 195, 30, 5, 1, - 206, 217, 3, 244, 141, 30, 5, 1, 206, 217, 3, 217, 196, 25, 206, 70, 30, - 5, 1, 206, 217, 3, 244, 142, 25, 206, 70, 30, 5, 1, 206, 217, 3, 217, - 196, 25, 219, 189, 30, 5, 1, 206, 217, 3, 244, 142, 25, 219, 189, 30, 5, - 1, 206, 217, 3, 217, 196, 25, 218, 239, 30, 5, 1, 206, 217, 3, 244, 142, - 25, 218, 239, 30, 6, 1, 206, 217, 3, 244, 141, 30, 6, 1, 206, 217, 3, - 244, 142, 25, 206, 70, 30, 6, 1, 206, 217, 3, 244, 142, 25, 219, 189, 30, - 6, 1, 206, 217, 3, 244, 142, 25, 218, 239, 30, 5, 1, 220, 37, 3, 217, - 195, 30, 5, 1, 220, 37, 3, 244, 141, 30, 5, 1, 220, 37, 3, 217, 196, 25, - 206, 70, 30, 5, 1, 220, 37, 3, 244, 142, 25, 206, 70, 30, 5, 1, 220, 37, - 3, 217, 196, 25, 219, 189, 30, 5, 1, 220, 37, 3, 244, 142, 25, 219, 189, - 30, 5, 1, 220, 37, 3, 217, 196, 25, 218, 239, 30, 5, 1, 220, 37, 3, 244, - 142, 25, 218, 239, 30, 6, 1, 220, 37, 3, 217, 195, 30, 6, 1, 220, 37, 3, - 244, 141, 30, 6, 1, 220, 37, 3, 217, 196, 25, 206, 70, 30, 6, 1, 220, 37, - 3, 244, 142, 25, 206, 70, 30, 6, 1, 220, 37, 3, 217, 196, 25, 219, 189, - 30, 6, 1, 220, 37, 3, 244, 142, 25, 219, 189, 30, 6, 1, 220, 37, 3, 217, - 196, 25, 218, 239, 30, 6, 1, 220, 37, 3, 244, 142, 25, 218, 239, 30, 5, - 1, 251, 3, 3, 206, 70, 30, 5, 1, 251, 3, 3, 219, 189, 30, 5, 1, 241, 38, - 3, 206, 70, 30, 5, 1, 241, 38, 3, 219, 189, 30, 5, 1, 240, 249, 3, 206, - 70, 30, 5, 1, 240, 249, 3, 219, 189, 30, 5, 1, 230, 231, 3, 206, 70, 30, - 5, 1, 230, 231, 3, 219, 189, 30, 5, 1, 220, 35, 3, 206, 70, 30, 5, 1, - 220, 35, 3, 219, 189, 30, 5, 1, 206, 217, 3, 206, 70, 30, 5, 1, 206, 217, - 3, 219, 189, 30, 5, 1, 220, 37, 3, 206, 70, 30, 5, 1, 220, 37, 3, 219, - 189, 30, 5, 1, 251, 3, 3, 217, 196, 25, 202, 221, 30, 5, 1, 251, 3, 3, - 244, 142, 25, 202, 221, 30, 5, 1, 251, 3, 3, 217, 196, 25, 206, 71, 25, - 202, 221, 30, 5, 1, 251, 3, 3, 244, 142, 25, 206, 71, 25, 202, 221, 30, - 5, 1, 251, 3, 3, 217, 196, 25, 219, 190, 25, 202, 221, 30, 5, 1, 251, 3, - 3, 244, 142, 25, 219, 190, 25, 202, 221, 30, 5, 1, 251, 3, 3, 217, 196, - 25, 218, 240, 25, 202, 221, 30, 5, 1, 251, 3, 3, 244, 142, 25, 218, 240, - 25, 202, 221, 30, 6, 1, 251, 3, 3, 217, 196, 25, 217, 209, 30, 6, 1, 251, - 3, 3, 244, 142, 25, 217, 209, 30, 6, 1, 251, 3, 3, 217, 196, 25, 206, 71, - 25, 217, 209, 30, 6, 1, 251, 3, 3, 244, 142, 25, 206, 71, 25, 217, 209, - 30, 6, 1, 251, 3, 3, 217, 196, 25, 219, 190, 25, 217, 209, 30, 6, 1, 251, - 3, 3, 244, 142, 25, 219, 190, 25, 217, 209, 30, 6, 1, 251, 3, 3, 217, - 196, 25, 218, 240, 25, 217, 209, 30, 6, 1, 251, 3, 3, 244, 142, 25, 218, - 240, 25, 217, 209, 30, 5, 1, 240, 249, 3, 217, 196, 25, 202, 221, 30, 5, - 1, 240, 249, 3, 244, 142, 25, 202, 221, 30, 5, 1, 240, 249, 3, 217, 196, - 25, 206, 71, 25, 202, 221, 30, 5, 1, 240, 249, 3, 244, 142, 25, 206, 71, - 25, 202, 221, 30, 5, 1, 240, 249, 3, 217, 196, 25, 219, 190, 25, 202, - 221, 30, 5, 1, 240, 249, 3, 244, 142, 25, 219, 190, 25, 202, 221, 30, 5, - 1, 240, 249, 3, 217, 196, 25, 218, 240, 25, 202, 221, 30, 5, 1, 240, 249, - 3, 244, 142, 25, 218, 240, 25, 202, 221, 30, 6, 1, 240, 249, 3, 217, 196, - 25, 217, 209, 30, 6, 1, 240, 249, 3, 244, 142, 25, 217, 209, 30, 6, 1, - 240, 249, 3, 217, 196, 25, 206, 71, 25, 217, 209, 30, 6, 1, 240, 249, 3, - 244, 142, 25, 206, 71, 25, 217, 209, 30, 6, 1, 240, 249, 3, 217, 196, 25, - 219, 190, 25, 217, 209, 30, 6, 1, 240, 249, 3, 244, 142, 25, 219, 190, - 25, 217, 209, 30, 6, 1, 240, 249, 3, 217, 196, 25, 218, 240, 25, 217, - 209, 30, 6, 1, 240, 249, 3, 244, 142, 25, 218, 240, 25, 217, 209, 30, 5, - 1, 220, 37, 3, 217, 196, 25, 202, 221, 30, 5, 1, 220, 37, 3, 244, 142, - 25, 202, 221, 30, 5, 1, 220, 37, 3, 217, 196, 25, 206, 71, 25, 202, 221, - 30, 5, 1, 220, 37, 3, 244, 142, 25, 206, 71, 25, 202, 221, 30, 5, 1, 220, - 37, 3, 217, 196, 25, 219, 190, 25, 202, 221, 30, 5, 1, 220, 37, 3, 244, - 142, 25, 219, 190, 25, 202, 221, 30, 5, 1, 220, 37, 3, 217, 196, 25, 218, - 240, 25, 202, 221, 30, 5, 1, 220, 37, 3, 244, 142, 25, 218, 240, 25, 202, - 221, 30, 6, 1, 220, 37, 3, 217, 196, 25, 217, 209, 30, 6, 1, 220, 37, 3, - 244, 142, 25, 217, 209, 30, 6, 1, 220, 37, 3, 217, 196, 25, 206, 71, 25, - 217, 209, 30, 6, 1, 220, 37, 3, 244, 142, 25, 206, 71, 25, 217, 209, 30, - 6, 1, 220, 37, 3, 217, 196, 25, 219, 190, 25, 217, 209, 30, 6, 1, 220, - 37, 3, 244, 142, 25, 219, 190, 25, 217, 209, 30, 6, 1, 220, 37, 3, 217, - 196, 25, 218, 240, 25, 217, 209, 30, 6, 1, 220, 37, 3, 244, 142, 25, 218, - 240, 25, 217, 209, 30, 5, 1, 251, 3, 3, 205, 167, 30, 5, 1, 251, 3, 3, - 225, 170, 30, 5, 1, 251, 3, 3, 206, 71, 25, 202, 221, 30, 5, 1, 251, 3, - 3, 202, 221, 30, 5, 1, 251, 3, 3, 219, 190, 25, 202, 221, 30, 5, 1, 251, - 3, 3, 218, 239, 30, 5, 1, 251, 3, 3, 218, 240, 25, 202, 221, 30, 6, 1, - 251, 3, 3, 205, 167, 30, 6, 1, 251, 3, 3, 225, 170, 30, 6, 1, 251, 3, 3, - 206, 70, 30, 6, 1, 251, 3, 3, 219, 189, 30, 6, 1, 251, 3, 3, 217, 209, - 30, 228, 252, 30, 217, 209, 30, 217, 195, 30, 218, 239, 30, 243, 225, 25, - 218, 239, 30, 5, 1, 240, 249, 3, 206, 71, 25, 202, 221, 30, 5, 1, 240, - 249, 3, 202, 221, 30, 5, 1, 240, 249, 3, 219, 190, 25, 202, 221, 30, 5, - 1, 240, 249, 3, 218, 239, 30, 5, 1, 240, 249, 3, 218, 240, 25, 202, 221, - 30, 6, 1, 241, 38, 3, 206, 70, 30, 6, 1, 241, 38, 3, 219, 189, 30, 6, 1, - 240, 249, 3, 206, 70, 30, 6, 1, 240, 249, 3, 219, 189, 30, 6, 1, 240, - 249, 3, 217, 209, 30, 217, 196, 25, 206, 70, 30, 217, 196, 25, 219, 189, - 30, 217, 196, 25, 218, 239, 30, 5, 1, 230, 231, 3, 205, 167, 30, 5, 1, - 230, 231, 3, 225, 170, 30, 5, 1, 230, 231, 3, 243, 225, 25, 206, 70, 30, - 5, 1, 230, 231, 3, 243, 225, 25, 219, 189, 30, 5, 1, 230, 231, 3, 218, - 239, 30, 5, 1, 230, 231, 3, 243, 225, 25, 218, 239, 30, 6, 1, 230, 231, - 3, 205, 167, 30, 6, 1, 230, 231, 3, 225, 170, 30, 6, 1, 230, 231, 3, 206, - 70, 30, 6, 1, 230, 231, 3, 219, 189, 30, 244, 142, 25, 206, 70, 30, 244, - 142, 25, 219, 189, 30, 244, 142, 25, 218, 239, 30, 5, 1, 206, 217, 3, - 205, 167, 30, 5, 1, 206, 217, 3, 225, 170, 30, 5, 1, 206, 217, 3, 243, - 225, 25, 206, 70, 30, 5, 1, 206, 217, 3, 243, 225, 25, 219, 189, 30, 5, - 1, 216, 60, 3, 217, 195, 30, 5, 1, 216, 60, 3, 244, 141, 30, 5, 1, 206, - 217, 3, 218, 239, 30, 5, 1, 206, 217, 3, 243, 225, 25, 218, 239, 30, 6, - 1, 206, 217, 3, 205, 167, 30, 6, 1, 206, 217, 3, 225, 170, 30, 6, 1, 206, - 217, 3, 206, 70, 30, 6, 1, 206, 217, 3, 219, 189, 30, 6, 1, 216, 60, 3, - 244, 141, 30, 243, 225, 25, 206, 70, 30, 243, 225, 25, 219, 189, 30, 206, - 70, 30, 5, 1, 220, 37, 3, 206, 71, 25, 202, 221, 30, 5, 1, 220, 37, 3, - 202, 221, 30, 5, 1, 220, 37, 3, 219, 190, 25, 202, 221, 30, 5, 1, 220, - 37, 3, 218, 239, 30, 5, 1, 220, 37, 3, 218, 240, 25, 202, 221, 30, 6, 1, - 220, 35, 3, 206, 70, 30, 6, 1, 220, 35, 3, 219, 189, 30, 6, 1, 220, 37, - 3, 206, 70, 30, 6, 1, 220, 37, 3, 219, 189, 30, 6, 1, 220, 37, 3, 217, - 209, 30, 219, 189, 30, 244, 141, 241, 93, 217, 62, 241, 104, 217, 62, - 241, 93, 211, 228, 241, 104, 211, 228, 209, 28, 211, 228, 239, 145, 211, - 228, 212, 86, 211, 228, 240, 16, 211, 228, 217, 179, 211, 228, 209, 63, - 211, 228, 237, 146, 211, 228, 202, 85, 204, 24, 211, 228, 202, 85, 204, - 24, 221, 183, 202, 85, 204, 24, 230, 96, 227, 213, 82, 216, 7, 82, 235, - 220, 221, 184, 235, 220, 240, 16, 244, 144, 241, 93, 244, 144, 241, 104, - 244, 144, 236, 106, 142, 52, 80, 227, 114, 52, 124, 227, 114, 49, 212, - 120, 217, 31, 82, 50, 212, 120, 217, 31, 82, 212, 120, 226, 255, 217, 31, - 82, 212, 120, 236, 241, 217, 31, 82, 49, 52, 217, 31, 82, 50, 52, 217, - 31, 82, 52, 226, 255, 217, 31, 82, 52, 236, 241, 217, 31, 82, 244, 195, - 52, 244, 195, 247, 177, 208, 82, 247, 177, 118, 70, 227, 232, 120, 70, - 227, 232, 236, 106, 241, 108, 235, 218, 218, 62, 227, 115, 213, 130, 219, - 89, 213, 130, 227, 213, 241, 102, 216, 7, 241, 102, 218, 42, 243, 165, - 239, 157, 227, 213, 219, 196, 216, 7, 219, 196, 223, 73, 221, 190, 211, - 228, 218, 247, 224, 116, 54, 218, 247, 209, 153, 209, 37, 54, 217, 236, - 52, 217, 236, 208, 70, 217, 236, 216, 73, 217, 236, 216, 73, 52, 217, - 236, 216, 73, 208, 70, 217, 236, 247, 33, 212, 120, 227, 217, 250, 218, - 217, 31, 82, 212, 120, 216, 11, 250, 218, 217, 31, 82, 216, 134, 82, 52, - 240, 212, 82, 230, 247, 219, 198, 206, 243, 167, 208, 250, 247, 34, 231, - 8, 218, 62, 250, 57, 235, 221, 247, 177, 239, 138, 212, 57, 49, 51, 247, - 227, 3, 217, 41, 50, 51, 247, 227, 3, 217, 41, 52, 217, 47, 82, 217, 47, - 240, 212, 82, 240, 212, 217, 47, 82, 208, 203, 2, 240, 250, 216, 73, 218, - 126, 54, 62, 96, 247, 177, 62, 86, 247, 177, 124, 250, 59, 216, 73, 213, - 143, 246, 17, 206, 224, 120, 250, 58, 251, 18, 205, 243, 245, 231, 224, - 103, 54, 210, 153, 244, 144, 230, 239, 206, 243, 239, 198, 217, 179, 82, - 126, 70, 217, 178, 217, 58, 217, 236, 239, 147, 70, 217, 178, 239, 233, - 70, 217, 178, 120, 70, 217, 178, 239, 147, 70, 82, 242, 83, 245, 130, - 208, 81, 80, 239, 147, 243, 83, 225, 10, 13, 211, 228, 203, 238, 230, 96, - 239, 100, 250, 155, 230, 237, 208, 219, 230, 237, 213, 130, 230, 237, - 218, 76, 227, 213, 230, 207, 216, 7, 230, 207, 239, 245, 211, 18, 230, - 207, 218, 42, 243, 165, 230, 207, 231, 20, 210, 101, 210, 170, 251, 128, - 210, 101, 210, 170, 231, 20, 10, 239, 159, 213, 61, 251, 128, 10, 239, - 159, 213, 61, 223, 67, 17, 213, 62, 221, 186, 17, 213, 62, 210, 199, 202, - 84, 210, 199, 8, 5, 1, 75, 210, 199, 149, 210, 199, 170, 210, 199, 195, - 210, 199, 213, 111, 210, 199, 199, 210, 199, 222, 63, 210, 199, 91, 54, - 210, 199, 224, 102, 210, 199, 241, 35, 54, 210, 199, 49, 219, 76, 210, - 199, 50, 219, 76, 210, 199, 8, 5, 1, 223, 163, 210, 246, 202, 84, 210, - 246, 105, 210, 246, 108, 210, 246, 147, 210, 246, 149, 210, 246, 170, - 210, 246, 195, 210, 246, 213, 111, 210, 246, 199, 210, 246, 222, 63, 210, - 246, 91, 54, 210, 246, 224, 102, 210, 246, 241, 35, 54, 210, 246, 49, - 219, 76, 210, 246, 50, 219, 76, 8, 210, 246, 5, 1, 63, 8, 210, 246, 5, 1, - 74, 8, 210, 246, 5, 1, 78, 8, 210, 246, 5, 1, 203, 196, 8, 210, 246, 5, - 1, 214, 192, 8, 210, 246, 5, 1, 237, 171, 8, 210, 246, 5, 1, 230, 54, 8, - 210, 246, 5, 1, 159, 8, 210, 246, 5, 1, 226, 185, 8, 210, 246, 5, 1, 223, - 163, 8, 210, 246, 5, 1, 219, 184, 8, 210, 246, 5, 1, 194, 8, 210, 246, 5, - 1, 210, 69, 240, 229, 54, 245, 243, 54, 245, 115, 54, 239, 128, 239, 132, - 54, 227, 94, 54, 224, 117, 54, 223, 90, 54, 218, 224, 54, 215, 120, 54, - 203, 246, 54, 222, 214, 213, 29, 54, 243, 92, 54, 240, 230, 54, 229, 79, - 54, 207, 196, 54, 242, 66, 54, 238, 166, 219, 2, 54, 218, 221, 54, 237, - 225, 54, 250, 24, 54, 236, 32, 54, 246, 233, 54, 227, 84, 208, 125, 54, - 211, 209, 54, 209, 150, 54, 231, 34, 215, 120, 54, 207, 177, 227, 94, 54, - 221, 173, 131, 54, 225, 120, 54, 215, 142, 54, 228, 4, 54, 39, 49, 237, - 87, 55, 39, 50, 237, 87, 55, 39, 163, 80, 227, 115, 219, 199, 39, 212, - 228, 80, 227, 115, 219, 199, 39, 250, 194, 53, 55, 39, 246, 18, 53, 55, - 39, 49, 53, 55, 39, 50, 53, 55, 39, 215, 253, 219, 199, 39, 246, 18, 215, - 253, 219, 199, 39, 250, 194, 215, 253, 219, 199, 39, 126, 187, 55, 39, - 239, 147, 187, 55, 39, 241, 88, 246, 61, 39, 241, 88, 211, 177, 39, 241, - 88, 243, 221, 39, 241, 88, 246, 62, 249, 20, 39, 49, 50, 53, 55, 39, 241, - 88, 214, 184, 39, 241, 88, 229, 147, 39, 241, 88, 206, 214, 218, 59, 208, - 85, 39, 216, 74, 212, 1, 219, 199, 39, 52, 80, 211, 32, 219, 199, 39, - 250, 204, 97, 39, 208, 70, 206, 245, 39, 204, 27, 247, 208, 55, 39, 96, - 53, 219, 199, 39, 163, 52, 212, 1, 219, 199, 39, 86, 237, 87, 3, 150, - 242, 68, 39, 96, 237, 87, 3, 150, 242, 68, 39, 49, 53, 56, 39, 50, 53, - 56, 39, 250, 60, 55, 251, 134, 220, 69, 251, 118, 208, 173, 209, 93, 210, - 255, 169, 6, 247, 125, 244, 55, 246, 223, 246, 218, 227, 115, 97, 247, - 35, 220, 69, 247, 84, 206, 254, 240, 231, 245, 200, 214, 181, 244, 55, - 240, 90, 132, 5, 239, 75, 132, 6, 237, 171, 248, 41, 6, 237, 171, 169, 6, - 237, 171, 218, 93, 245, 200, 218, 93, 245, 201, 115, 120, 218, 167, 132, - 6, 75, 248, 41, 6, 75, 132, 6, 159, 132, 5, 159, 228, 131, 66, 248, 231, - 97, 169, 6, 223, 163, 221, 42, 54, 211, 241, 216, 146, 245, 168, 132, 6, - 219, 184, 169, 6, 219, 184, 169, 6, 217, 134, 132, 6, 146, 248, 41, 6, - 146, 169, 6, 146, 217, 243, 209, 241, 216, 86, 213, 122, 82, 209, 162, - 54, 208, 115, 131, 54, 206, 39, 169, 6, 202, 159, 219, 215, 54, 220, 59, - 54, 230, 239, 220, 59, 54, 248, 41, 6, 202, 159, 207, 174, 30, 5, 1, 230, - 230, 229, 188, 54, 250, 213, 54, 132, 6, 249, 255, 248, 41, 6, 247, 125, - 240, 255, 97, 132, 5, 74, 132, 6, 74, 132, 6, 240, 174, 207, 174, 6, 240, - 174, 132, 6, 226, 185, 132, 5, 78, 137, 97, 248, 109, 97, 238, 68, 97, - 244, 179, 97, 231, 25, 211, 239, 215, 198, 6, 217, 134, 240, 93, 54, 169, - 5, 218, 167, 169, 5, 238, 235, 169, 6, 238, 235, 169, 6, 218, 167, 169, - 223, 162, 210, 217, 207, 174, 41, 6, 239, 75, 207, 174, 41, 6, 159, 216, - 73, 41, 6, 159, 207, 174, 41, 6, 203, 124, 169, 37, 6, 245, 51, 169, 37, - 5, 245, 51, 169, 37, 5, 74, 169, 37, 5, 75, 169, 37, 5, 230, 184, 217, - 212, 227, 114, 207, 174, 250, 235, 218, 247, 54, 251, 41, 207, 174, 5, - 240, 174, 16, 35, 214, 252, 211, 239, 204, 161, 239, 138, 118, 213, 107, - 204, 161, 239, 138, 118, 222, 57, 204, 161, 239, 138, 118, 209, 143, 204, - 161, 239, 138, 118, 209, 60, 204, 161, 239, 138, 120, 209, 57, 204, 161, - 239, 138, 118, 240, 21, 204, 161, 239, 138, 120, 240, 20, 204, 161, 239, - 138, 126, 240, 20, 204, 161, 239, 138, 239, 147, 240, 20, 204, 161, 239, - 138, 118, 212, 78, 204, 161, 239, 138, 239, 233, 212, 76, 204, 161, 239, - 138, 118, 241, 138, 204, 161, 239, 138, 126, 241, 136, 204, 161, 239, - 138, 239, 233, 241, 136, 204, 161, 239, 138, 213, 112, 241, 136, 239, - 138, 221, 43, 105, 215, 210, 221, 44, 105, 215, 210, 221, 44, 108, 215, - 210, 221, 44, 147, 215, 210, 221, 44, 149, 215, 210, 221, 44, 170, 215, - 210, 221, 44, 195, 215, 210, 221, 44, 213, 111, 215, 210, 221, 44, 199, - 215, 210, 221, 44, 222, 63, 215, 210, 221, 44, 209, 152, 215, 210, 221, - 44, 241, 112, 215, 210, 221, 44, 207, 154, 215, 210, 221, 44, 240, 18, - 215, 210, 221, 44, 118, 236, 11, 215, 210, 221, 44, 239, 233, 236, 11, - 215, 210, 221, 44, 118, 209, 36, 5, 215, 210, 221, 44, 105, 5, 215, 210, - 221, 44, 108, 5, 215, 210, 221, 44, 147, 5, 215, 210, 221, 44, 149, 5, - 215, 210, 221, 44, 170, 5, 215, 210, 221, 44, 195, 5, 215, 210, 221, 44, - 213, 111, 5, 215, 210, 221, 44, 199, 5, 215, 210, 221, 44, 222, 63, 5, - 215, 210, 221, 44, 209, 152, 5, 215, 210, 221, 44, 241, 112, 5, 215, 210, - 221, 44, 207, 154, 5, 215, 210, 221, 44, 240, 18, 5, 215, 210, 221, 44, - 118, 236, 11, 5, 215, 210, 221, 44, 239, 233, 236, 11, 5, 215, 210, 221, - 44, 118, 209, 36, 215, 210, 221, 44, 118, 209, 37, 247, 126, 245, 51, - 215, 210, 221, 44, 239, 233, 209, 36, 215, 210, 221, 44, 209, 153, 209, - 36, 215, 210, 221, 44, 216, 73, 118, 236, 11, 8, 5, 1, 216, 73, 247, 125, - 215, 210, 221, 44, 212, 88, 227, 255, 18, 215, 210, 221, 44, 240, 19, - 241, 182, 18, 215, 210, 221, 44, 240, 19, 209, 36, 215, 210, 221, 44, - 118, 236, 12, 209, 36, 204, 161, 239, 138, 202, 85, 209, 57, 207, 174, - 17, 108, 207, 174, 17, 147, 96, 47, 177, 47, 86, 47, 183, 47, 49, 50, 47, - 112, 121, 47, 153, 204, 46, 47, 153, 241, 176, 47, 211, 238, 241, 176, - 47, 211, 238, 204, 46, 47, 96, 53, 3, 95, 86, 53, 3, 95, 96, 204, 76, 47, - 86, 204, 76, 47, 96, 120, 237, 62, 47, 177, 120, 237, 62, 47, 86, 120, - 237, 62, 47, 183, 120, 237, 62, 47, 96, 53, 3, 209, 248, 86, 53, 3, 209, - 248, 96, 53, 239, 120, 142, 177, 53, 239, 120, 142, 86, 53, 239, 120, - 142, 183, 53, 239, 120, 142, 112, 121, 53, 3, 248, 218, 96, 53, 3, 113, - 86, 53, 3, 113, 96, 53, 3, 227, 14, 86, 53, 3, 227, 14, 49, 50, 204, 76, - 47, 49, 50, 53, 3, 95, 183, 202, 30, 47, 177, 53, 3, 208, 211, 227, 212, - 177, 53, 3, 208, 211, 216, 5, 183, 53, 3, 208, 211, 227, 212, 183, 53, 3, - 208, 211, 216, 5, 86, 53, 3, 245, 166, 242, 68, 183, 53, 3, 245, 166, - 227, 212, 250, 194, 208, 145, 213, 146, 47, 246, 18, 208, 145, 213, 146, - 47, 153, 204, 46, 53, 208, 173, 163, 142, 96, 53, 208, 173, 248, 231, - 115, 86, 53, 208, 173, 142, 250, 194, 171, 246, 62, 47, 246, 18, 171, - 246, 62, 47, 96, 237, 87, 3, 150, 206, 212, 96, 237, 87, 3, 150, 242, 68, - 177, 237, 87, 3, 150, 216, 5, 177, 237, 87, 3, 150, 227, 212, 86, 237, - 87, 3, 150, 206, 212, 86, 237, 87, 3, 150, 242, 68, 183, 237, 87, 3, 150, - 216, 5, 183, 237, 87, 3, 150, 227, 212, 86, 53, 115, 96, 47, 177, 53, 96, - 76, 183, 47, 96, 53, 115, 86, 47, 96, 219, 146, 250, 91, 177, 219, 146, - 250, 91, 86, 219, 146, 250, 91, 183, 219, 146, 250, 91, 96, 237, 87, 115, - 86, 237, 86, 86, 237, 87, 115, 96, 237, 86, 96, 52, 53, 3, 95, 49, 50, - 52, 53, 3, 95, 86, 52, 53, 3, 95, 96, 52, 47, 177, 52, 47, 86, 52, 47, - 183, 52, 47, 49, 50, 52, 47, 112, 121, 52, 47, 153, 204, 46, 52, 47, 153, - 241, 176, 52, 47, 211, 238, 241, 176, 52, 47, 211, 238, 204, 46, 52, 47, - 96, 208, 70, 47, 86, 208, 70, 47, 96, 211, 171, 47, 86, 211, 171, 47, - 177, 53, 3, 52, 95, 183, 53, 3, 52, 95, 96, 244, 143, 47, 177, 244, 143, - 47, 86, 244, 143, 47, 183, 244, 143, 47, 96, 53, 208, 173, 142, 86, 53, - 208, 173, 142, 96, 61, 47, 177, 61, 47, 86, 61, 47, 183, 61, 47, 177, 61, - 53, 239, 120, 142, 177, 61, 53, 220, 32, 219, 26, 177, 61, 53, 220, 32, - 219, 27, 3, 236, 106, 142, 177, 61, 53, 220, 32, 219, 27, 3, 80, 142, - 177, 61, 52, 47, 177, 61, 52, 53, 220, 32, 219, 26, 86, 61, 53, 239, 120, - 204, 99, 153, 204, 46, 53, 208, 173, 245, 165, 211, 238, 241, 176, 53, - 208, 173, 245, 165, 112, 121, 61, 47, 50, 53, 3, 5, 246, 61, 183, 53, 96, - 76, 177, 47, 126, 86, 250, 91, 96, 53, 3, 80, 95, 86, 53, 3, 80, 95, 49, - 50, 53, 3, 80, 95, 96, 53, 3, 52, 80, 95, 86, 53, 3, 52, 80, 95, 49, 50, - 53, 3, 52, 80, 95, 96, 220, 6, 47, 86, 220, 6, 47, 49, 50, 220, 6, 47, - 35, 251, 14, 245, 228, 219, 69, 243, 205, 209, 83, 240, 207, 209, 83, - 243, 104, 221, 166, 240, 208, 241, 94, 213, 117, 231, 38, 223, 101, 241, - 115, 220, 69, 221, 166, 250, 232, 241, 115, 220, 69, 5, 241, 115, 220, - 69, 245, 194, 250, 82, 224, 244, 243, 104, 221, 166, 245, 196, 250, 82, - 224, 244, 5, 245, 194, 250, 82, 224, 244, 241, 84, 76, 217, 214, 223, - 162, 217, 224, 223, 162, 245, 171, 223, 162, 210, 217, 224, 103, 54, 224, - 101, 54, 70, 218, 76, 243, 137, 212, 57, 213, 118, 224, 102, 250, 60, - 219, 254, 215, 253, 219, 254, 247, 178, 219, 254, 51, 215, 204, 245, 106, - 215, 204, 239, 140, 215, 204, 217, 210, 135, 231, 27, 50, 250, 217, 250, - 217, 225, 17, 250, 217, 211, 208, 250, 217, 243, 139, 243, 104, 221, 166, - 243, 143, 219, 82, 135, 221, 166, 219, 82, 135, 227, 37, 250, 226, 227, - 37, 219, 244, 230, 244, 206, 237, 231, 2, 52, 231, 2, 208, 70, 231, 2, - 245, 188, 231, 2, 210, 189, 231, 2, 205, 178, 231, 2, 246, 18, 231, 2, - 246, 18, 245, 188, 231, 2, 250, 194, 245, 188, 231, 2, 209, 82, 248, 152, - 216, 168, 217, 211, 70, 224, 102, 240, 215, 238, 172, 217, 211, 236, 121, - 208, 228, 219, 254, 216, 73, 208, 227, 230, 239, 227, 241, 194, 212, 122, - 204, 75, 203, 226, 217, 224, 221, 166, 208, 227, 224, 103, 208, 227, 250, - 53, 156, 135, 221, 166, 250, 53, 156, 135, 250, 151, 156, 135, 250, 151, - 247, 148, 221, 166, 251, 127, 156, 135, 222, 232, 250, 151, 221, 175, - 251, 127, 156, 135, 251, 7, 156, 135, 221, 166, 251, 7, 156, 135, 251, 7, - 156, 219, 245, 156, 135, 208, 70, 208, 227, 251, 15, 156, 135, 241, 30, - 135, 238, 171, 241, 30, 135, 243, 206, 248, 103, 250, 153, 209, 93, 227, - 122, 238, 171, 156, 135, 250, 151, 156, 208, 173, 219, 245, 209, 93, 231, - 65, 220, 69, 231, 65, 76, 219, 245, 250, 151, 156, 135, 245, 243, 241, - 34, 241, 35, 245, 242, 215, 253, 231, 50, 156, 135, 215, 253, 156, 135, - 245, 159, 135, 240, 254, 241, 33, 135, 211, 95, 241, 34, 244, 38, 156, - 135, 156, 208, 173, 247, 137, 244, 56, 225, 17, 247, 136, 217, 45, 156, - 135, 221, 166, 156, 135, 235, 154, 135, 221, 166, 235, 154, 135, 211, 39, - 241, 30, 135, 227, 179, 219, 245, 156, 135, 237, 247, 219, 245, 156, 135, - 227, 179, 115, 156, 135, 237, 247, 115, 156, 135, 227, 179, 247, 148, - 221, 166, 156, 135, 237, 247, 247, 148, 221, 166, 156, 135, 223, 240, - 227, 178, 223, 240, 237, 246, 248, 103, 221, 166, 241, 30, 135, 221, 166, - 227, 178, 221, 166, 237, 246, 222, 232, 227, 179, 221, 175, 156, 135, - 222, 232, 237, 247, 221, 175, 156, 135, 227, 179, 219, 245, 241, 30, 135, - 237, 247, 219, 245, 241, 30, 135, 222, 232, 227, 179, 221, 175, 241, 30, - 135, 222, 232, 237, 247, 221, 175, 241, 30, 135, 227, 179, 219, 245, 237, - 246, 237, 247, 219, 245, 227, 178, 222, 232, 227, 179, 221, 175, 237, - 246, 222, 232, 237, 247, 221, 175, 227, 178, 217, 249, 210, 236, 217, - 250, 219, 245, 156, 135, 210, 237, 219, 245, 156, 135, 217, 250, 219, - 245, 241, 30, 135, 210, 237, 219, 245, 241, 30, 135, 243, 104, 221, 166, - 217, 252, 243, 104, 221, 166, 210, 238, 210, 245, 220, 69, 210, 198, 220, - 69, 221, 166, 34, 210, 245, 220, 69, 221, 166, 34, 210, 198, 220, 69, - 210, 245, 76, 219, 245, 156, 135, 210, 198, 76, 219, 245, 156, 135, 222, - 232, 34, 210, 245, 76, 221, 175, 156, 135, 222, 232, 34, 210, 198, 76, - 221, 175, 156, 135, 210, 245, 76, 3, 221, 166, 156, 135, 210, 198, 76, 3, - 221, 166, 156, 135, 223, 221, 223, 222, 223, 223, 223, 222, 206, 237, 51, - 231, 65, 220, 69, 51, 219, 236, 220, 69, 51, 231, 65, 76, 219, 245, 156, - 135, 51, 219, 236, 76, 219, 245, 156, 135, 51, 247, 48, 51, 245, 99, 43, - 218, 76, 43, 224, 102, 43, 208, 219, 43, 243, 137, 212, 57, 43, 70, 219, - 254, 43, 215, 253, 219, 254, 43, 250, 60, 219, 254, 43, 241, 34, 43, 244, - 144, 103, 218, 76, 103, 224, 102, 103, 208, 219, 103, 70, 219, 254, 50, - 210, 3, 49, 210, 3, 121, 210, 3, 112, 210, 3, 250, 63, 224, 77, 208, 49, - 239, 165, 208, 70, 80, 248, 231, 50, 207, 173, 52, 80, 248, 231, 52, 50, - 207, 173, 243, 104, 221, 166, 217, 205, 221, 166, 208, 49, 243, 104, 221, - 166, 239, 166, 222, 234, 52, 80, 248, 231, 52, 50, 207, 173, 217, 250, - 206, 248, 216, 117, 210, 237, 206, 248, 216, 117, 221, 172, 211, 2, 220, - 69, 245, 194, 250, 82, 221, 172, 211, 1, 221, 172, 211, 2, 76, 219, 245, - 156, 135, 245, 194, 250, 82, 221, 172, 211, 2, 219, 245, 156, 135, 219, - 236, 220, 69, 231, 65, 220, 69, 223, 228, 237, 24, 245, 205, 225, 69, - 230, 255, 203, 156, 223, 81, 221, 174, 50, 250, 218, 3, 250, 128, 50, - 208, 85, 223, 162, 227, 37, 250, 226, 223, 162, 227, 37, 219, 244, 223, - 162, 230, 244, 223, 162, 206, 237, 243, 222, 219, 254, 70, 219, 254, 211, - 95, 219, 254, 243, 137, 208, 219, 247, 234, 49, 221, 172, 240, 92, 213, - 142, 217, 224, 50, 221, 172, 240, 92, 213, 142, 217, 224, 49, 213, 142, - 217, 224, 50, 213, 142, 217, 224, 216, 73, 208, 228, 241, 34, 245, 93, - 227, 37, 219, 244, 245, 93, 227, 37, 250, 226, 52, 210, 244, 52, 210, - 197, 52, 230, 244, 52, 206, 237, 218, 103, 156, 25, 219, 82, 135, 227, - 179, 3, 243, 85, 237, 247, 3, 243, 85, 205, 242, 223, 240, 227, 178, 205, - 242, 223, 240, 237, 246, 227, 179, 156, 208, 173, 219, 245, 237, 246, - 237, 247, 156, 208, 173, 219, 245, 227, 178, 156, 208, 173, 219, 245, - 227, 178, 156, 208, 173, 219, 245, 237, 246, 156, 208, 173, 219, 245, - 217, 249, 156, 208, 173, 219, 245, 210, 236, 243, 104, 221, 166, 217, - 253, 219, 245, 241, 36, 243, 104, 221, 166, 210, 239, 219, 245, 241, 36, - 221, 166, 51, 231, 65, 76, 219, 245, 156, 135, 221, 166, 51, 219, 236, - 76, 219, 245, 156, 135, 51, 231, 65, 76, 219, 245, 221, 166, 156, 135, - 51, 219, 236, 76, 219, 245, 221, 166, 156, 135, 227, 179, 247, 148, 221, - 166, 241, 30, 135, 237, 247, 247, 148, 221, 166, 241, 30, 135, 217, 250, - 247, 148, 221, 166, 241, 30, 135, 210, 237, 247, 148, 221, 166, 241, 30, - 135, 221, 166, 221, 172, 211, 2, 220, 69, 243, 104, 221, 166, 245, 196, - 250, 82, 221, 172, 211, 1, 221, 166, 221, 172, 211, 2, 76, 219, 245, 156, - 135, 243, 104, 221, 166, 245, 196, 250, 82, 221, 172, 211, 2, 219, 245, - 241, 36, 80, 241, 108, 224, 146, 236, 106, 241, 108, 112, 50, 243, 228, - 241, 108, 121, 50, 243, 228, 241, 108, 241, 115, 76, 3, 163, 236, 106, - 95, 241, 115, 76, 3, 80, 248, 231, 250, 50, 241, 84, 76, 236, 106, 95, 5, - 241, 115, 76, 3, 80, 248, 231, 250, 50, 241, 84, 76, 236, 106, 95, 241, - 115, 76, 3, 70, 55, 241, 115, 76, 3, 219, 203, 5, 241, 115, 76, 3, 219, - 203, 241, 115, 76, 3, 206, 246, 241, 115, 76, 3, 120, 236, 106, 211, 19, - 245, 194, 3, 163, 236, 106, 95, 245, 194, 3, 80, 248, 231, 250, 50, 241, - 84, 76, 236, 106, 95, 5, 245, 194, 3, 80, 248, 231, 250, 50, 241, 84, 76, - 236, 106, 95, 245, 194, 3, 219, 203, 5, 245, 194, 3, 219, 203, 202, 160, - 221, 164, 249, 11, 224, 243, 243, 223, 54, 241, 117, 47, 236, 38, 112, - 250, 94, 121, 250, 94, 217, 218, 218, 227, 204, 72, 227, 114, 49, 246, - 226, 50, 246, 226, 49, 239, 204, 50, 239, 204, 247, 248, 50, 245, 132, - 247, 248, 49, 245, 132, 208, 145, 50, 245, 132, 208, 145, 49, 245, 132, - 216, 73, 221, 166, 54, 51, 226, 246, 250, 128, 214, 158, 214, 166, 209, - 162, 216, 147, 218, 34, 231, 31, 205, 218, 211, 177, 218, 97, 76, 230, - 254, 54, 207, 174, 221, 166, 54, 204, 82, 236, 40, 208, 145, 49, 245, - 165, 208, 145, 50, 245, 165, 247, 248, 49, 245, 165, 247, 248, 50, 245, - 165, 208, 145, 162, 231, 2, 247, 248, 162, 231, 2, 239, 115, 212, 31, - 112, 250, 95, 248, 104, 120, 236, 106, 248, 220, 219, 247, 229, 151, 241, - 26, 208, 173, 209, 93, 216, 16, 203, 197, 231, 50, 34, 216, 144, 247, - 233, 229, 149, 227, 217, 250, 218, 155, 216, 11, 250, 218, 155, 241, 26, - 208, 173, 209, 93, 227, 222, 248, 115, 215, 252, 245, 61, 251, 15, 250, - 103, 210, 100, 208, 130, 215, 125, 243, 185, 219, 237, 245, 209, 209, - 220, 212, 44, 245, 155, 245, 154, 250, 169, 239, 98, 16, 235, 203, 250, - 169, 239, 98, 16, 211, 169, 217, 62, 250, 169, 239, 98, 16, 217, 63, 241, - 36, 250, 169, 239, 98, 16, 217, 63, 243, 143, 250, 169, 239, 98, 16, 217, - 63, 243, 221, 250, 169, 239, 98, 16, 217, 63, 230, 88, 250, 169, 239, 98, - 16, 217, 63, 246, 61, 250, 169, 239, 98, 16, 246, 62, 211, 69, 250, 169, - 239, 98, 16, 246, 62, 230, 88, 250, 169, 239, 98, 16, 212, 58, 142, 250, - 169, 239, 98, 16, 249, 21, 142, 250, 169, 239, 98, 16, 217, 63, 212, 57, - 250, 169, 239, 98, 16, 217, 63, 249, 20, 250, 169, 239, 98, 16, 217, 63, - 227, 178, 250, 169, 239, 98, 16, 217, 63, 237, 246, 250, 169, 239, 98, - 16, 96, 206, 76, 250, 169, 239, 98, 16, 86, 206, 76, 250, 169, 239, 98, - 16, 217, 63, 96, 47, 250, 169, 239, 98, 16, 217, 63, 86, 47, 250, 169, - 239, 98, 16, 246, 62, 249, 20, 250, 169, 239, 98, 16, 121, 210, 4, 206, - 246, 250, 169, 239, 98, 16, 244, 38, 211, 69, 250, 169, 239, 98, 16, 217, - 63, 121, 247, 33, 250, 169, 239, 98, 16, 217, 63, 244, 37, 250, 169, 239, - 98, 16, 121, 210, 4, 230, 88, 250, 169, 239, 98, 16, 177, 206, 76, 250, - 169, 239, 98, 16, 217, 63, 177, 47, 250, 169, 239, 98, 16, 112, 210, 4, - 219, 203, 250, 169, 239, 98, 16, 244, 49, 211, 69, 250, 169, 239, 98, 16, - 217, 63, 112, 247, 33, 250, 169, 239, 98, 16, 217, 63, 244, 48, 250, 169, - 239, 98, 16, 112, 210, 4, 230, 88, 250, 169, 239, 98, 16, 183, 206, 76, - 250, 169, 239, 98, 16, 217, 63, 183, 47, 250, 169, 239, 98, 16, 217, 30, - 206, 246, 250, 169, 239, 98, 16, 244, 38, 206, 246, 250, 169, 239, 98, - 16, 243, 222, 206, 246, 250, 169, 239, 98, 16, 230, 89, 206, 246, 250, - 169, 239, 98, 16, 246, 62, 206, 246, 250, 169, 239, 98, 16, 112, 212, - 240, 230, 88, 250, 169, 239, 98, 16, 217, 30, 217, 62, 250, 169, 239, 98, - 16, 246, 62, 211, 94, 250, 169, 239, 98, 16, 217, 63, 245, 242, 250, 169, - 239, 98, 16, 112, 210, 4, 243, 231, 250, 169, 239, 98, 16, 244, 49, 243, - 231, 250, 169, 239, 98, 16, 211, 95, 243, 231, 250, 169, 239, 98, 16, - 230, 89, 243, 231, 250, 169, 239, 98, 16, 246, 62, 243, 231, 250, 169, - 239, 98, 16, 121, 212, 240, 211, 69, 250, 169, 239, 98, 16, 49, 212, 240, - 211, 69, 250, 169, 239, 98, 16, 208, 228, 243, 231, 250, 169, 239, 98, - 16, 237, 247, 243, 231, 250, 169, 239, 98, 16, 245, 234, 142, 250, 169, - 239, 98, 16, 244, 49, 208, 227, 250, 169, 239, 98, 16, 202, 29, 250, 169, - 239, 98, 16, 211, 70, 208, 227, 250, 169, 239, 98, 16, 213, 144, 206, - 246, 250, 169, 239, 98, 16, 217, 63, 221, 166, 241, 36, 250, 169, 239, - 98, 16, 217, 63, 217, 46, 250, 169, 239, 98, 16, 121, 247, 34, 208, 227, - 250, 169, 239, 98, 16, 112, 247, 34, 208, 227, 250, 169, 239, 98, 16, - 230, 230, 250, 169, 239, 98, 16, 216, 59, 250, 169, 239, 98, 16, 220, 36, - 250, 169, 239, 98, 16, 251, 3, 206, 246, 250, 169, 239, 98, 16, 241, 38, - 206, 246, 250, 169, 239, 98, 16, 230, 231, 206, 246, 250, 169, 239, 98, - 16, 220, 37, 206, 246, 250, 169, 239, 98, 16, 251, 2, 221, 166, 246, 169, - 82, 50, 250, 218, 3, 183, 202, 30, 47, 212, 210, 171, 247, 233, 248, 129, - 97, 80, 227, 115, 3, 101, 243, 85, 231, 8, 97, 245, 189, 206, 244, 97, - 243, 158, 206, 244, 97, 241, 96, 97, 245, 224, 97, 61, 51, 3, 246, 218, - 80, 227, 114, 241, 68, 97, 250, 250, 229, 152, 97, 237, 37, 97, 43, 236, - 106, 248, 231, 3, 221, 163, 43, 208, 86, 242, 70, 247, 203, 246, 62, 3, - 221, 169, 47, 206, 242, 97, 224, 40, 97, 235, 216, 97, 220, 7, 237, 170, - 97, 220, 7, 228, 129, 97, 219, 59, 97, 219, 58, 97, 243, 167, 245, 91, - 16, 239, 159, 108, 212, 5, 97, 250, 169, 239, 98, 16, 217, 62, 244, 68, - 213, 131, 229, 152, 97, 217, 238, 219, 153, 222, 208, 219, 153, 217, 234, - 214, 185, 97, 246, 33, 214, 185, 97, 49, 219, 77, 206, 221, 113, 49, 219, - 77, 240, 200, 49, 219, 77, 226, 251, 113, 50, 219, 77, 206, 221, 113, 50, - 219, 77, 240, 200, 50, 219, 77, 226, 251, 113, 49, 51, 247, 227, 206, - 221, 245, 165, 49, 51, 247, 227, 240, 200, 49, 51, 247, 227, 226, 251, - 245, 165, 50, 51, 247, 227, 206, 221, 245, 165, 50, 51, 247, 227, 240, - 200, 50, 51, 247, 227, 226, 251, 245, 165, 49, 245, 93, 247, 227, 206, - 221, 113, 49, 245, 93, 247, 227, 101, 218, 159, 49, 245, 93, 247, 227, - 226, 251, 113, 245, 93, 247, 227, 240, 200, 50, 245, 93, 247, 227, 206, - 221, 113, 50, 245, 93, 247, 227, 101, 218, 159, 50, 245, 93, 247, 227, - 226, 251, 113, 231, 3, 240, 200, 236, 106, 227, 115, 240, 200, 206, 221, - 49, 219, 245, 226, 251, 50, 245, 93, 247, 227, 214, 167, 206, 221, 50, - 219, 245, 226, 251, 49, 245, 93, 247, 227, 214, 167, 210, 218, 208, 144, - 210, 218, 247, 247, 208, 145, 51, 155, 247, 248, 51, 155, 247, 248, 51, - 247, 227, 115, 208, 145, 51, 155, 40, 16, 247, 247, 49, 80, 98, 227, 114, - 50, 80, 98, 227, 114, 236, 106, 214, 202, 227, 113, 236, 106, 214, 202, - 227, 112, 236, 106, 214, 202, 227, 111, 236, 106, 214, 202, 227, 110, - 244, 29, 16, 157, 80, 25, 208, 145, 216, 16, 244, 29, 16, 157, 80, 25, - 247, 248, 216, 16, 244, 29, 16, 157, 80, 3, 246, 61, 244, 29, 16, 157, - 121, 25, 236, 106, 3, 246, 61, 244, 29, 16, 157, 112, 25, 236, 106, 3, - 246, 61, 244, 29, 16, 157, 80, 3, 208, 85, 244, 29, 16, 157, 121, 25, - 236, 106, 3, 208, 85, 244, 29, 16, 157, 112, 25, 236, 106, 3, 208, 85, - 244, 29, 16, 157, 80, 25, 204, 75, 244, 29, 16, 157, 121, 25, 236, 106, - 3, 204, 75, 244, 29, 16, 157, 112, 25, 236, 106, 3, 204, 75, 244, 29, 16, - 157, 121, 25, 236, 105, 244, 29, 16, 157, 112, 25, 236, 105, 244, 29, 16, - 157, 80, 25, 208, 145, 227, 222, 244, 29, 16, 157, 80, 25, 247, 248, 227, - 222, 51, 239, 172, 216, 78, 97, 241, 131, 97, 80, 227, 115, 240, 200, - 224, 214, 247, 214, 224, 214, 163, 115, 212, 227, 224, 214, 212, 228, - 115, 227, 28, 224, 214, 163, 115, 120, 212, 213, 224, 214, 120, 212, 214, - 115, 227, 28, 224, 214, 120, 212, 214, 230, 97, 224, 214, 208, 66, 224, - 214, 209, 124, 224, 214, 218, 253, 241, 180, 237, 239, 239, 92, 208, 145, - 219, 76, 247, 248, 219, 76, 208, 145, 245, 93, 155, 247, 248, 245, 93, - 155, 208, 145, 208, 133, 213, 33, 155, 247, 248, 208, 133, 213, 33, 155, - 61, 208, 101, 248, 115, 215, 253, 3, 246, 61, 211, 51, 239, 215, 251, - 142, 245, 90, 241, 116, 230, 244, 244, 68, 240, 204, 97, 62, 216, 11, 52, - 208, 85, 62, 227, 217, 52, 208, 85, 62, 206, 223, 52, 208, 85, 62, 242, - 69, 52, 208, 85, 62, 216, 11, 52, 208, 86, 3, 80, 142, 62, 227, 217, 52, - 208, 86, 3, 80, 142, 62, 216, 11, 208, 86, 3, 52, 80, 142, 251, 34, 246, - 19, 211, 58, 208, 220, 246, 19, 236, 41, 3, 239, 195, 214, 241, 62, 225, - 10, 227, 217, 208, 85, 62, 225, 10, 216, 11, 208, 85, 62, 225, 10, 206, - 223, 208, 85, 62, 225, 10, 242, 69, 208, 85, 52, 80, 142, 62, 51, 35, - 211, 61, 62, 246, 62, 35, 216, 148, 16, 35, 221, 48, 16, 35, 211, 90, 76, - 237, 61, 16, 35, 211, 90, 76, 209, 112, 16, 35, 241, 84, 76, 209, 112, - 16, 35, 241, 84, 76, 208, 105, 16, 35, 241, 71, 16, 35, 251, 130, 16, 35, - 248, 128, 16, 35, 249, 19, 16, 35, 236, 106, 210, 5, 16, 35, 227, 115, - 240, 51, 16, 35, 80, 210, 5, 16, 35, 239, 159, 240, 51, 16, 35, 247, 25, - 216, 77, 16, 35, 213, 7, 219, 211, 16, 35, 213, 7, 231, 49, 16, 35, 244, - 139, 227, 105, 241, 9, 16, 35, 244, 8, 245, 184, 105, 16, 35, 244, 8, - 245, 184, 108, 16, 35, 244, 8, 245, 184, 147, 16, 35, 244, 8, 245, 184, - 149, 16, 35, 182, 251, 130, 16, 35, 210, 95, 231, 112, 16, 35, 241, 84, - 76, 208, 106, 248, 33, 16, 35, 247, 59, 16, 35, 241, 84, 76, 225, 9, 16, - 35, 210, 242, 16, 35, 241, 9, 16, 35, 240, 11, 213, 130, 16, 35, 237, - 238, 213, 130, 16, 35, 216, 149, 213, 130, 16, 35, 206, 236, 213, 130, - 16, 35, 211, 228, 16, 35, 244, 46, 248, 37, 97, 171, 247, 233, 16, 35, - 222, 211, 16, 35, 244, 47, 239, 159, 108, 16, 35, 210, 243, 239, 159, - 108, 220, 82, 113, 220, 82, 246, 194, 220, 82, 239, 162, 220, 82, 230, - 239, 239, 162, 220, 82, 248, 125, 247, 190, 220, 82, 247, 241, 208, 250, - 220, 82, 247, 224, 248, 236, 235, 153, 220, 82, 250, 237, 76, 246, 168, - 220, 82, 244, 144, 220, 82, 245, 80, 251, 134, 221, 46, 220, 82, 52, 249, - 20, 43, 17, 105, 43, 17, 108, 43, 17, 147, 43, 17, 149, 43, 17, 170, 43, - 17, 195, 43, 17, 213, 111, 43, 17, 199, 43, 17, 222, 63, 43, 42, 209, - 152, 43, 42, 241, 112, 43, 42, 207, 154, 43, 42, 209, 55, 43, 42, 239, - 141, 43, 42, 240, 22, 43, 42, 212, 82, 43, 42, 213, 108, 43, 42, 241, - 140, 43, 42, 222, 60, 43, 42, 207, 151, 102, 17, 105, 102, 17, 108, 102, - 17, 147, 102, 17, 149, 102, 17, 170, 102, 17, 195, 102, 17, 213, 111, - 102, 17, 199, 102, 17, 222, 63, 102, 42, 209, 152, 102, 42, 241, 112, - 102, 42, 207, 154, 102, 42, 209, 55, 102, 42, 239, 141, 102, 42, 240, 22, - 102, 42, 212, 82, 102, 42, 213, 108, 102, 42, 241, 140, 102, 42, 222, 60, - 102, 42, 207, 151, 17, 118, 239, 102, 211, 61, 17, 120, 239, 102, 211, - 61, 17, 126, 239, 102, 211, 61, 17, 239, 147, 239, 102, 211, 61, 17, 239, - 233, 239, 102, 211, 61, 17, 212, 88, 239, 102, 211, 61, 17, 213, 112, - 239, 102, 211, 61, 17, 241, 143, 239, 102, 211, 61, 17, 222, 64, 239, - 102, 211, 61, 42, 209, 153, 239, 102, 211, 61, 42, 241, 113, 239, 102, - 211, 61, 42, 207, 155, 239, 102, 211, 61, 42, 209, 56, 239, 102, 211, 61, - 42, 239, 142, 239, 102, 211, 61, 42, 240, 23, 239, 102, 211, 61, 42, 212, - 83, 239, 102, 211, 61, 42, 213, 109, 239, 102, 211, 61, 42, 241, 141, - 239, 102, 211, 61, 42, 222, 61, 239, 102, 211, 61, 42, 207, 152, 239, - 102, 211, 61, 102, 8, 5, 1, 63, 102, 8, 5, 1, 249, 255, 102, 8, 5, 1, - 247, 125, 102, 8, 5, 1, 245, 51, 102, 8, 5, 1, 74, 102, 8, 5, 1, 240, - 174, 102, 8, 5, 1, 239, 75, 102, 8, 5, 1, 237, 171, 102, 8, 5, 1, 75, - 102, 8, 5, 1, 230, 184, 102, 8, 5, 1, 230, 54, 102, 8, 5, 1, 159, 102, 8, - 5, 1, 226, 185, 102, 8, 5, 1, 223, 163, 102, 8, 5, 1, 78, 102, 8, 5, 1, - 219, 184, 102, 8, 5, 1, 217, 134, 102, 8, 5, 1, 146, 102, 8, 5, 1, 194, - 102, 8, 5, 1, 210, 69, 102, 8, 5, 1, 68, 102, 8, 5, 1, 206, 164, 102, 8, - 5, 1, 204, 144, 102, 8, 5, 1, 203, 196, 102, 8, 5, 1, 203, 124, 102, 8, - 5, 1, 202, 159, 43, 8, 6, 1, 63, 43, 8, 6, 1, 249, 255, 43, 8, 6, 1, 247, - 125, 43, 8, 6, 1, 245, 51, 43, 8, 6, 1, 74, 43, 8, 6, 1, 240, 174, 43, 8, - 6, 1, 239, 75, 43, 8, 6, 1, 237, 171, 43, 8, 6, 1, 75, 43, 8, 6, 1, 230, - 184, 43, 8, 6, 1, 230, 54, 43, 8, 6, 1, 159, 43, 8, 6, 1, 226, 185, 43, - 8, 6, 1, 223, 163, 43, 8, 6, 1, 78, 43, 8, 6, 1, 219, 184, 43, 8, 6, 1, - 217, 134, 43, 8, 6, 1, 146, 43, 8, 6, 1, 194, 43, 8, 6, 1, 210, 69, 43, - 8, 6, 1, 68, 43, 8, 6, 1, 206, 164, 43, 8, 6, 1, 204, 144, 43, 8, 6, 1, - 203, 196, 43, 8, 6, 1, 203, 124, 43, 8, 6, 1, 202, 159, 43, 8, 5, 1, 63, - 43, 8, 5, 1, 249, 255, 43, 8, 5, 1, 247, 125, 43, 8, 5, 1, 245, 51, 43, - 8, 5, 1, 74, 43, 8, 5, 1, 240, 174, 43, 8, 5, 1, 239, 75, 43, 8, 5, 1, - 237, 171, 43, 8, 5, 1, 75, 43, 8, 5, 1, 230, 184, 43, 8, 5, 1, 230, 54, - 43, 8, 5, 1, 159, 43, 8, 5, 1, 226, 185, 43, 8, 5, 1, 223, 163, 43, 8, 5, - 1, 78, 43, 8, 5, 1, 219, 184, 43, 8, 5, 1, 217, 134, 43, 8, 5, 1, 146, - 43, 8, 5, 1, 194, 43, 8, 5, 1, 210, 69, 43, 8, 5, 1, 68, 43, 8, 5, 1, - 206, 164, 43, 8, 5, 1, 204, 144, 43, 8, 5, 1, 203, 196, 43, 8, 5, 1, 203, - 124, 43, 8, 5, 1, 202, 159, 43, 17, 202, 84, 182, 43, 42, 241, 112, 182, - 43, 42, 207, 154, 182, 43, 42, 209, 55, 182, 43, 42, 239, 141, 182, 43, - 42, 240, 22, 182, 43, 42, 212, 82, 182, 43, 42, 213, 108, 182, 43, 42, - 241, 140, 182, 43, 42, 222, 60, 182, 43, 42, 207, 151, 52, 43, 17, 105, - 52, 43, 17, 108, 52, 43, 17, 147, 52, 43, 17, 149, 52, 43, 17, 170, 52, - 43, 17, 195, 52, 43, 17, 213, 111, 52, 43, 17, 199, 52, 43, 17, 222, 63, - 52, 43, 42, 209, 152, 182, 43, 17, 202, 84, 98, 116, 157, 236, 105, 98, - 116, 79, 236, 105, 98, 116, 157, 206, 38, 98, 116, 79, 206, 38, 98, 116, - 157, 208, 70, 244, 145, 236, 105, 98, 116, 79, 208, 70, 244, 145, 236, - 105, 98, 116, 157, 208, 70, 244, 145, 206, 38, 98, 116, 79, 208, 70, 244, - 145, 206, 38, 98, 116, 157, 217, 58, 244, 145, 236, 105, 98, 116, 79, - 217, 58, 244, 145, 236, 105, 98, 116, 157, 217, 58, 244, 145, 206, 38, - 98, 116, 79, 217, 58, 244, 145, 206, 38, 98, 116, 157, 121, 25, 216, 16, - 98, 116, 121, 157, 25, 50, 237, 49, 98, 116, 121, 79, 25, 50, 227, 134, - 98, 116, 79, 121, 25, 216, 16, 98, 116, 157, 121, 25, 227, 222, 98, 116, - 121, 157, 25, 49, 237, 49, 98, 116, 121, 79, 25, 49, 227, 134, 98, 116, - 79, 121, 25, 227, 222, 98, 116, 157, 112, 25, 216, 16, 98, 116, 112, 157, - 25, 50, 237, 49, 98, 116, 112, 79, 25, 50, 227, 134, 98, 116, 79, 112, - 25, 216, 16, 98, 116, 157, 112, 25, 227, 222, 98, 116, 112, 157, 25, 49, - 237, 49, 98, 116, 112, 79, 25, 49, 227, 134, 98, 116, 79, 112, 25, 227, - 222, 98, 116, 157, 80, 25, 216, 16, 98, 116, 80, 157, 25, 50, 237, 49, - 98, 116, 112, 79, 25, 50, 121, 227, 134, 98, 116, 121, 79, 25, 50, 112, - 227, 134, 98, 116, 80, 79, 25, 50, 227, 134, 98, 116, 121, 157, 25, 50, - 112, 237, 49, 98, 116, 112, 157, 25, 50, 121, 237, 49, 98, 116, 79, 80, - 25, 216, 16, 98, 116, 157, 80, 25, 227, 222, 98, 116, 80, 157, 25, 49, - 237, 49, 98, 116, 112, 79, 25, 49, 121, 227, 134, 98, 116, 121, 79, 25, - 49, 112, 227, 134, 98, 116, 80, 79, 25, 49, 227, 134, 98, 116, 121, 157, - 25, 49, 112, 237, 49, 98, 116, 112, 157, 25, 49, 121, 237, 49, 98, 116, - 79, 80, 25, 227, 222, 98, 116, 157, 121, 25, 236, 105, 98, 116, 49, 79, - 25, 50, 121, 227, 134, 98, 116, 50, 79, 25, 49, 121, 227, 134, 98, 116, - 121, 157, 25, 236, 106, 237, 49, 98, 116, 121, 79, 25, 236, 106, 227, - 134, 98, 116, 50, 157, 25, 49, 121, 237, 49, 98, 116, 49, 157, 25, 50, - 121, 237, 49, 98, 116, 79, 121, 25, 236, 105, 98, 116, 157, 112, 25, 236, - 105, 98, 116, 49, 79, 25, 50, 112, 227, 134, 98, 116, 50, 79, 25, 49, - 112, 227, 134, 98, 116, 112, 157, 25, 236, 106, 237, 49, 98, 116, 112, - 79, 25, 236, 106, 227, 134, 98, 116, 50, 157, 25, 49, 112, 237, 49, 98, - 116, 49, 157, 25, 50, 112, 237, 49, 98, 116, 79, 112, 25, 236, 105, 98, - 116, 157, 80, 25, 236, 105, 98, 116, 49, 79, 25, 50, 80, 227, 134, 98, - 116, 50, 79, 25, 49, 80, 227, 134, 98, 116, 80, 157, 25, 236, 106, 237, - 49, 98, 116, 112, 79, 25, 121, 236, 106, 227, 134, 98, 116, 121, 79, 25, - 112, 236, 106, 227, 134, 98, 116, 80, 79, 25, 236, 106, 227, 134, 98, - 116, 49, 112, 79, 25, 50, 121, 227, 134, 98, 116, 50, 112, 79, 25, 49, - 121, 227, 134, 98, 116, 49, 121, 79, 25, 50, 112, 227, 134, 98, 116, 50, - 121, 79, 25, 49, 112, 227, 134, 98, 116, 121, 157, 25, 112, 236, 106, - 237, 49, 98, 116, 112, 157, 25, 121, 236, 106, 237, 49, 98, 116, 50, 157, - 25, 49, 80, 237, 49, 98, 116, 49, 157, 25, 50, 80, 237, 49, 98, 116, 79, - 80, 25, 236, 105, 98, 116, 157, 52, 244, 145, 236, 105, 98, 116, 79, 52, - 244, 145, 236, 105, 98, 116, 157, 52, 244, 145, 206, 38, 98, 116, 79, 52, - 244, 145, 206, 38, 98, 116, 52, 236, 105, 98, 116, 52, 206, 38, 98, 116, - 121, 212, 120, 25, 50, 242, 78, 98, 116, 121, 52, 25, 50, 212, 119, 98, - 116, 52, 121, 25, 216, 16, 98, 116, 121, 212, 120, 25, 49, 242, 78, 98, - 116, 121, 52, 25, 49, 212, 119, 98, 116, 52, 121, 25, 227, 222, 98, 116, - 112, 212, 120, 25, 50, 242, 78, 98, 116, 112, 52, 25, 50, 212, 119, 98, - 116, 52, 112, 25, 216, 16, 98, 116, 112, 212, 120, 25, 49, 242, 78, 98, - 116, 112, 52, 25, 49, 212, 119, 98, 116, 52, 112, 25, 227, 222, 98, 116, - 80, 212, 120, 25, 50, 242, 78, 98, 116, 80, 52, 25, 50, 212, 119, 98, - 116, 52, 80, 25, 216, 16, 98, 116, 80, 212, 120, 25, 49, 242, 78, 98, - 116, 80, 52, 25, 49, 212, 119, 98, 116, 52, 80, 25, 227, 222, 98, 116, - 121, 212, 120, 25, 236, 106, 242, 78, 98, 116, 121, 52, 25, 236, 106, - 212, 119, 98, 116, 52, 121, 25, 236, 105, 98, 116, 112, 212, 120, 25, - 236, 106, 242, 78, 98, 116, 112, 52, 25, 236, 106, 212, 119, 98, 116, 52, - 112, 25, 236, 105, 98, 116, 80, 212, 120, 25, 236, 106, 242, 78, 98, 116, - 80, 52, 25, 236, 106, 212, 119, 98, 116, 52, 80, 25, 236, 105, 98, 116, - 157, 250, 129, 121, 25, 216, 16, 98, 116, 157, 250, 129, 121, 25, 227, - 222, 98, 116, 157, 250, 129, 112, 25, 227, 222, 98, 116, 157, 250, 129, - 112, 25, 216, 16, 98, 116, 157, 243, 228, 206, 221, 50, 208, 173, 226, - 251, 227, 222, 98, 116, 157, 243, 228, 206, 221, 49, 208, 173, 226, 251, - 216, 16, 98, 116, 157, 243, 228, 245, 130, 98, 116, 157, 227, 222, 98, - 116, 157, 206, 224, 98, 116, 157, 216, 16, 98, 116, 157, 242, 70, 98, - 116, 79, 227, 222, 98, 116, 79, 206, 224, 98, 116, 79, 216, 16, 98, 116, - 79, 242, 70, 98, 116, 157, 49, 25, 79, 216, 16, 98, 116, 157, 112, 25, - 79, 242, 70, 98, 116, 79, 49, 25, 157, 216, 16, 98, 116, 79, 112, 25, - 157, 242, 70, 206, 221, 162, 248, 33, 226, 251, 118, 241, 139, 248, 33, - 226, 251, 118, 217, 56, 248, 33, 226, 251, 126, 241, 137, 248, 33, 226, - 251, 162, 248, 33, 226, 251, 239, 233, 241, 137, 248, 33, 226, 251, 126, - 217, 54, 248, 33, 226, 251, 213, 112, 241, 137, 248, 33, 239, 102, 248, - 33, 49, 213, 112, 241, 137, 248, 33, 49, 126, 217, 54, 248, 33, 49, 239, - 233, 241, 137, 248, 33, 49, 162, 248, 33, 49, 126, 241, 137, 248, 33, 49, - 118, 217, 56, 248, 33, 49, 118, 241, 139, 248, 33, 50, 162, 248, 33, 157, - 213, 79, 225, 10, 213, 79, 244, 150, 213, 79, 206, 221, 118, 241, 139, - 248, 33, 50, 118, 241, 139, 248, 33, 217, 60, 226, 251, 227, 222, 217, - 60, 226, 251, 216, 16, 217, 60, 206, 221, 227, 222, 217, 60, 206, 221, - 49, 25, 226, 251, 49, 25, 226, 251, 216, 16, 217, 60, 206, 221, 49, 25, - 226, 251, 216, 16, 217, 60, 206, 221, 49, 25, 206, 221, 50, 25, 226, 251, - 227, 222, 217, 60, 206, 221, 49, 25, 206, 221, 50, 25, 226, 251, 216, 16, - 217, 60, 206, 221, 216, 16, 217, 60, 206, 221, 50, 25, 226, 251, 227, - 222, 217, 60, 206, 221, 50, 25, 226, 251, 49, 25, 226, 251, 216, 16, 62, - 211, 177, 61, 211, 177, 61, 51, 3, 215, 189, 245, 164, 61, 51, 245, 195, - 62, 5, 211, 177, 51, 3, 236, 106, 240, 9, 51, 3, 80, 240, 9, 51, 3, 219, - 229, 245, 125, 240, 9, 51, 3, 206, 221, 49, 208, 173, 226, 251, 50, 240, - 9, 51, 3, 206, 221, 50, 208, 173, 226, 251, 49, 240, 9, 51, 3, 243, 228, - 245, 125, 240, 9, 62, 5, 211, 177, 61, 5, 211, 177, 62, 216, 143, 61, - 216, 143, 62, 80, 216, 143, 61, 80, 216, 143, 62, 219, 80, 61, 219, 80, - 62, 206, 223, 208, 85, 61, 206, 223, 208, 85, 62, 206, 223, 5, 208, 85, - 61, 206, 223, 5, 208, 85, 62, 216, 11, 208, 85, 61, 216, 11, 208, 85, 62, - 216, 11, 5, 208, 85, 61, 216, 11, 5, 208, 85, 62, 216, 11, 218, 60, 61, - 216, 11, 218, 60, 62, 242, 69, 208, 85, 61, 242, 69, 208, 85, 62, 242, - 69, 5, 208, 85, 61, 242, 69, 5, 208, 85, 62, 227, 217, 208, 85, 61, 227, - 217, 208, 85, 62, 227, 217, 5, 208, 85, 61, 227, 217, 5, 208, 85, 62, - 227, 217, 218, 60, 61, 227, 217, 218, 60, 62, 243, 221, 61, 243, 221, 61, - 243, 222, 245, 195, 62, 5, 243, 221, 239, 242, 226, 246, 61, 246, 61, - 242, 83, 246, 61, 246, 62, 3, 80, 240, 9, 247, 173, 62, 246, 61, 246, 62, - 3, 49, 162, 248, 43, 246, 62, 3, 50, 162, 248, 43, 246, 62, 3, 226, 251, - 162, 248, 43, 246, 62, 3, 206, 221, 162, 248, 43, 246, 62, 3, 206, 221, - 50, 217, 60, 248, 43, 246, 62, 3, 251, 15, 247, 148, 206, 221, 49, 217, - 60, 248, 43, 49, 162, 62, 246, 61, 50, 162, 62, 246, 61, 230, 240, 247, - 177, 230, 240, 61, 246, 61, 206, 221, 162, 230, 240, 61, 246, 61, 226, - 251, 162, 230, 240, 61, 246, 61, 206, 221, 49, 217, 60, 246, 55, 250, - 128, 206, 221, 50, 217, 60, 246, 55, 250, 128, 226, 251, 50, 217, 60, - 246, 55, 250, 128, 226, 251, 49, 217, 60, 246, 55, 250, 128, 206, 221, - 162, 246, 61, 226, 251, 162, 246, 61, 62, 226, 251, 50, 208, 85, 62, 226, - 251, 49, 208, 85, 62, 206, 221, 49, 208, 85, 62, 206, 221, 50, 208, 85, - 61, 247, 177, 51, 3, 49, 162, 248, 43, 51, 3, 50, 162, 248, 43, 51, 3, - 206, 221, 49, 243, 228, 162, 248, 43, 51, 3, 226, 251, 50, 243, 228, 162, - 248, 43, 61, 51, 3, 80, 248, 55, 227, 114, 61, 206, 223, 208, 86, 3, 243, - 85, 206, 223, 208, 86, 3, 49, 162, 248, 43, 206, 223, 208, 86, 3, 50, - 162, 248, 43, 228, 8, 246, 61, 61, 51, 3, 206, 221, 49, 217, 59, 61, 51, - 3, 226, 251, 49, 217, 59, 61, 51, 3, 226, 251, 50, 217, 59, 61, 51, 3, - 206, 221, 50, 217, 59, 61, 246, 62, 3, 206, 221, 49, 217, 59, 61, 246, - 62, 3, 226, 251, 49, 217, 59, 61, 246, 62, 3, 226, 251, 50, 217, 59, 61, - 246, 62, 3, 206, 221, 50, 217, 59, 206, 221, 49, 208, 85, 206, 221, 50, - 208, 85, 226, 251, 49, 208, 85, 61, 225, 10, 211, 177, 62, 225, 10, 211, - 177, 61, 225, 10, 5, 211, 177, 62, 225, 10, 5, 211, 177, 226, 251, 50, - 208, 85, 62, 210, 215, 3, 216, 162, 246, 7, 207, 3, 212, 15, 245, 236, - 62, 211, 94, 61, 211, 94, 227, 131, 209, 17, 210, 214, 250, 78, 221, 188, - 244, 19, 221, 188, 245, 204, 219, 250, 62, 209, 161, 61, 209, 161, 248, - 248, 247, 233, 248, 248, 98, 3, 246, 168, 248, 248, 98, 3, 203, 196, 214, - 254, 207, 4, 3, 216, 191, 242, 48, 236, 47, 248, 102, 61, 212, 237, 218, - 159, 62, 212, 237, 218, 159, 213, 68, 216, 73, 215, 198, 239, 201, 237, - 56, 247, 177, 62, 49, 218, 59, 231, 35, 62, 50, 218, 59, 231, 35, 61, 49, - 218, 59, 231, 35, 61, 112, 218, 59, 231, 35, 61, 50, 218, 59, 231, 35, - 61, 121, 218, 59, 231, 35, 212, 63, 25, 245, 129, 247, 11, 54, 216, 203, - 54, 248, 62, 54, 247, 83, 250, 208, 219, 230, 245, 130, 246, 143, 216, - 59, 245, 131, 76, 227, 9, 245, 131, 76, 230, 151, 211, 95, 25, 245, 138, - 240, 75, 97, 251, 115, 213, 70, 237, 131, 25, 212, 159, 219, 33, 97, 203, - 1, 203, 76, 208, 75, 35, 237, 51, 208, 75, 35, 228, 33, 208, 75, 35, 239, - 249, 208, 75, 35, 209, 18, 208, 75, 35, 204, 16, 208, 75, 35, 204, 80, - 208, 75, 35, 224, 12, 208, 75, 35, 241, 179, 204, 37, 76, 243, 249, 61, - 239, 114, 240, 102, 61, 212, 30, 240, 102, 62, 212, 30, 240, 102, 61, - 210, 215, 3, 216, 162, 239, 245, 217, 56, 224, 29, 228, 1, 217, 56, 224, - 29, 224, 234, 240, 43, 54, 241, 179, 225, 127, 54, 230, 69, 214, 218, - 206, 205, 222, 224, 218, 73, 250, 114, 209, 205, 238, 178, 247, 57, 227, - 184, 205, 202, 227, 145, 214, 187, 215, 20, 247, 43, 250, 145, 218, 108, - 61, 246, 150, 229, 81, 61, 246, 150, 217, 48, 61, 246, 150, 215, 206, 61, - 246, 150, 248, 54, 61, 246, 150, 229, 31, 61, 246, 150, 219, 45, 62, 246, - 150, 229, 81, 62, 246, 150, 217, 48, 62, 246, 150, 215, 206, 62, 246, - 150, 248, 54, 62, 246, 150, 229, 31, 62, 246, 150, 219, 45, 62, 211, 226, - 210, 227, 61, 237, 56, 210, 227, 61, 243, 222, 210, 227, 62, 246, 5, 210, - 227, 61, 211, 226, 210, 227, 62, 237, 56, 210, 227, 62, 243, 222, 210, - 227, 61, 246, 5, 210, 227, 236, 47, 211, 182, 217, 56, 221, 160, 241, - 139, 221, 160, 248, 158, 241, 139, 221, 155, 248, 158, 212, 81, 221, 155, - 223, 195, 239, 217, 54, 223, 195, 223, 66, 54, 223, 195, 213, 57, 54, - 204, 46, 210, 89, 245, 130, 241, 176, 210, 89, 245, 130, 206, 233, 216, - 139, 97, 216, 139, 16, 35, 207, 120, 218, 90, 216, 139, 16, 35, 207, 118, - 218, 90, 216, 139, 16, 35, 207, 117, 218, 90, 216, 139, 16, 35, 207, 115, - 218, 90, 216, 139, 16, 35, 207, 113, 218, 90, 216, 139, 16, 35, 207, 111, - 218, 90, 216, 139, 16, 35, 207, 109, 218, 90, 216, 139, 16, 35, 238, 176, - 225, 70, 62, 206, 233, 216, 139, 97, 216, 140, 219, 95, 97, 219, 68, 219, - 95, 97, 218, 238, 219, 95, 54, 204, 35, 97, 243, 214, 240, 101, 243, 214, - 240, 100, 243, 214, 240, 99, 243, 214, 240, 98, 243, 214, 240, 97, 243, - 214, 240, 96, 61, 246, 62, 3, 70, 216, 16, 61, 246, 62, 3, 120, 243, 83, - 62, 246, 62, 3, 61, 70, 216, 16, 62, 246, 62, 3, 120, 61, 243, 83, 224, - 45, 35, 203, 76, 224, 45, 35, 203, 0, 243, 195, 35, 237, 248, 203, 76, - 243, 195, 35, 227, 177, 203, 0, 243, 195, 35, 227, 177, 203, 76, 243, - 195, 35, 237, 248, 203, 0, 61, 239, 225, 62, 239, 225, 237, 131, 25, 218, - 163, 250, 228, 245, 128, 210, 154, 211, 103, 76, 251, 92, 214, 203, 251, - 29, 239, 197, 238, 187, 211, 103, 76, 237, 26, 250, 42, 97, 239, 213, - 219, 207, 61, 211, 94, 126, 227, 109, 245, 181, 216, 16, 126, 227, 109, - 245, 181, 227, 222, 204, 91, 54, 138, 205, 179, 54, 242, 75, 240, 43, 54, - 242, 75, 225, 127, 54, 230, 250, 240, 43, 25, 225, 127, 54, 225, 127, 25, - 240, 43, 54, 225, 127, 3, 211, 32, 54, 225, 127, 3, 211, 32, 25, 225, - 127, 25, 240, 43, 54, 80, 225, 127, 3, 211, 32, 54, 236, 106, 225, 127, - 3, 211, 32, 54, 225, 10, 61, 246, 61, 225, 10, 62, 246, 61, 225, 10, 5, - 61, 246, 61, 225, 86, 97, 243, 135, 97, 206, 230, 219, 67, 97, 245, 247, - 239, 97, 206, 201, 222, 217, 246, 203, 219, 137, 230, 75, 205, 240, 246, - 123, 62, 224, 30, 227, 128, 213, 101, 213, 140, 217, 38, 213, 120, 212, - 10, 248, 251, 248, 217, 103, 229, 151, 61, 242, 58, 225, 122, 61, 242, - 58, 229, 81, 62, 242, 58, 225, 122, 62, 242, 58, 229, 81, 212, 16, 204, - 3, 212, 19, 210, 215, 248, 135, 246, 7, 216, 190, 62, 212, 15, 209, 19, - 246, 8, 25, 216, 190, 207, 174, 61, 212, 237, 218, 159, 207, 174, 62, - 212, 237, 218, 159, 61, 243, 222, 231, 50, 211, 177, 245, 124, 228, 15, - 243, 162, 247, 39, 219, 253, 218, 163, 247, 40, 212, 48, 237, 36, 3, 61, - 245, 130, 43, 245, 124, 228, 15, 246, 195, 221, 192, 241, 62, 250, 255, - 220, 26, 49, 204, 66, 208, 113, 62, 207, 131, 49, 204, 66, 208, 113, 61, - 207, 131, 49, 204, 66, 208, 113, 62, 49, 228, 16, 224, 233, 61, 49, 228, - 16, 224, 233, 242, 53, 212, 40, 54, 79, 61, 242, 69, 208, 85, 49, 246, - 16, 241, 62, 103, 214, 254, 240, 84, 243, 228, 231, 50, 61, 246, 62, 231, - 50, 62, 211, 177, 62, 208, 50, 216, 84, 49, 241, 61, 216, 84, 49, 241, - 60, 250, 54, 16, 35, 206, 205, 79, 246, 62, 3, 211, 32, 25, 120, 187, 55, - 218, 254, 216, 13, 230, 252, 218, 254, 227, 219, 230, 252, 218, 254, 230, - 239, 218, 254, 62, 245, 131, 220, 32, 213, 8, 212, 252, 212, 203, 246, - 90, 247, 19, 236, 231, 212, 89, 238, 188, 204, 3, 236, 23, 238, 188, 3, - 237, 101, 225, 107, 16, 35, 227, 133, 224, 12, 207, 4, 220, 32, 237, 239, - 239, 148, 239, 226, 231, 50, 236, 126, 240, 34, 215, 15, 51, 239, 147, - 245, 164, 212, 66, 235, 163, 212, 69, 218, 230, 3, 248, 251, 209, 144, - 230, 169, 248, 236, 97, 237, 59, 237, 250, 97, 239, 105, 217, 180, 245, - 100, 220, 32, 62, 211, 177, 61, 239, 226, 3, 236, 106, 101, 62, 211, 33, - 62, 215, 25, 214, 190, 206, 221, 248, 38, 214, 190, 62, 214, 190, 226, - 251, 248, 38, 214, 190, 61, 214, 190, 61, 79, 246, 169, 82, 209, 162, - 227, 47, 54, 209, 221, 242, 52, 251, 52, 241, 57, 216, 188, 239, 238, - 216, 188, 237, 123, 205, 228, 237, 123, 203, 220, 237, 123, 226, 251, 50, - 219, 8, 219, 8, 206, 221, 50, 219, 8, 61, 222, 97, 62, 222, 97, 246, 169, - 82, 79, 246, 169, 82, 223, 224, 203, 196, 79, 223, 224, 203, 196, 248, - 248, 203, 196, 79, 248, 248, 203, 196, 219, 207, 30, 245, 130, 79, 30, - 245, 130, 171, 246, 218, 245, 130, 79, 171, 246, 218, 245, 130, 8, 245, - 130, 213, 77, 61, 8, 245, 130, 219, 207, 8, 245, 130, 225, 124, 245, 130, - 211, 95, 76, 244, 137, 239, 147, 209, 180, 250, 59, 239, 147, 248, 249, - 250, 59, 79, 239, 147, 248, 249, 250, 59, 239, 147, 246, 3, 250, 59, 62, - 239, 147, 218, 61, 211, 94, 61, 239, 147, 218, 61, 211, 94, 211, 221, - 211, 42, 219, 207, 61, 211, 94, 43, 61, 211, 94, 171, 246, 218, 62, 211, - 94, 62, 246, 218, 61, 211, 94, 219, 207, 62, 211, 94, 79, 219, 207, 62, - 211, 94, 218, 118, 211, 94, 213, 77, 61, 211, 94, 79, 250, 59, 171, 246, - 218, 250, 59, 241, 143, 211, 191, 250, 59, 241, 143, 218, 61, 62, 211, - 94, 241, 143, 218, 61, 218, 118, 211, 94, 212, 88, 218, 61, 62, 211, 94, - 241, 143, 218, 61, 216, 141, 62, 211, 94, 79, 241, 143, 218, 61, 216, - 141, 62, 211, 94, 207, 155, 218, 61, 62, 211, 94, 212, 83, 218, 61, 250, - 59, 209, 180, 250, 59, 171, 246, 218, 209, 180, 250, 59, 79, 209, 180, - 250, 59, 212, 88, 218, 218, 62, 25, 61, 239, 200, 62, 239, 200, 61, 239, - 200, 241, 143, 218, 218, 219, 207, 62, 239, 200, 43, 171, 246, 218, 241, - 143, 218, 61, 211, 94, 79, 209, 180, 218, 118, 250, 59, 212, 17, 208, - 244, 208, 78, 212, 17, 79, 246, 146, 212, 17, 211, 223, 79, 211, 223, - 248, 249, 250, 59, 241, 143, 209, 180, 217, 213, 250, 59, 79, 241, 143, - 209, 180, 217, 213, 250, 59, 245, 131, 82, 213, 77, 61, 246, 61, 182, - 103, 245, 131, 82, 226, 251, 50, 242, 50, 61, 211, 177, 206, 221, 50, - 242, 50, 61, 211, 177, 226, 251, 50, 213, 77, 61, 211, 177, 206, 221, 50, - 213, 77, 61, 211, 177, 62, 217, 47, 131, 219, 233, 61, 217, 47, 131, 219, - 233, 61, 240, 212, 131, 219, 233, 62, 243, 222, 224, 103, 61, 203, 196, - 79, 240, 212, 131, 97, 157, 80, 142, 225, 10, 80, 142, 79, 80, 142, 79, - 212, 120, 207, 174, 245, 234, 217, 31, 131, 219, 233, 79, 212, 120, 245, - 234, 217, 31, 131, 219, 233, 79, 52, 207, 174, 245, 234, 217, 31, 131, - 219, 233, 79, 52, 245, 234, 217, 31, 131, 219, 233, 79, 124, 212, 120, - 245, 234, 217, 31, 131, 219, 233, 79, 124, 52, 245, 234, 217, 31, 131, - 219, 233, 245, 86, 211, 78, 219, 89, 2, 219, 233, 79, 240, 212, 131, 219, - 233, 79, 237, 56, 240, 212, 131, 219, 233, 79, 62, 237, 55, 215, 198, 79, - 62, 237, 56, 247, 177, 239, 201, 237, 55, 215, 198, 239, 201, 237, 56, - 247, 177, 225, 10, 49, 219, 77, 219, 233, 225, 10, 50, 219, 77, 219, 233, - 225, 10, 239, 214, 49, 219, 77, 219, 233, 225, 10, 239, 214, 50, 219, 77, - 219, 233, 225, 10, 227, 217, 250, 218, 247, 227, 219, 233, 225, 10, 216, - 11, 250, 218, 247, 227, 219, 233, 79, 227, 217, 250, 218, 217, 31, 131, - 219, 233, 79, 216, 11, 250, 218, 217, 31, 131, 219, 233, 79, 227, 217, - 250, 218, 247, 227, 219, 233, 79, 216, 11, 250, 218, 247, 227, 219, 233, - 157, 49, 208, 133, 213, 33, 247, 227, 219, 233, 157, 50, 208, 133, 213, - 33, 247, 227, 219, 233, 225, 10, 49, 245, 93, 247, 227, 219, 233, 225, - 10, 50, 245, 93, 247, 227, 219, 233, 243, 174, 182, 43, 17, 105, 243, - 174, 182, 43, 17, 108, 243, 174, 182, 43, 17, 147, 243, 174, 182, 43, 17, - 149, 243, 174, 182, 43, 17, 170, 243, 174, 182, 43, 17, 195, 243, 174, - 182, 43, 17, 213, 111, 243, 174, 182, 43, 17, 199, 243, 174, 182, 43, 17, - 222, 63, 243, 174, 182, 43, 42, 209, 152, 243, 174, 43, 41, 17, 105, 243, - 174, 43, 41, 17, 108, 243, 174, 43, 41, 17, 147, 243, 174, 43, 41, 17, - 149, 243, 174, 43, 41, 17, 170, 243, 174, 43, 41, 17, 195, 243, 174, 43, - 41, 17, 213, 111, 243, 174, 43, 41, 17, 199, 243, 174, 43, 41, 17, 222, - 63, 243, 174, 43, 41, 42, 209, 152, 243, 174, 182, 43, 41, 17, 105, 243, - 174, 182, 43, 41, 17, 108, 243, 174, 182, 43, 41, 17, 147, 243, 174, 182, - 43, 41, 17, 149, 243, 174, 182, 43, 41, 17, 170, 243, 174, 182, 43, 41, - 17, 195, 243, 174, 182, 43, 41, 17, 213, 111, 243, 174, 182, 43, 41, 17, - 199, 243, 174, 182, 43, 41, 17, 222, 63, 243, 174, 182, 43, 41, 42, 209, - 152, 79, 204, 26, 86, 47, 79, 91, 54, 79, 224, 103, 54, 79, 243, 137, 54, - 79, 211, 238, 241, 176, 47, 79, 86, 47, 79, 153, 241, 176, 47, 242, 63, - 218, 63, 86, 47, 79, 215, 190, 86, 47, 208, 84, 86, 47, 79, 208, 84, 86, - 47, 244, 143, 208, 84, 86, 47, 79, 244, 143, 208, 84, 86, 47, 62, 86, 47, - 209, 31, 208, 143, 86, 250, 94, 209, 31, 247, 246, 86, 250, 94, 62, 86, - 250, 94, 79, 62, 245, 86, 183, 25, 86, 47, 79, 62, 245, 86, 177, 25, 86, - 47, 211, 174, 62, 86, 47, 79, 245, 217, 62, 86, 47, 216, 10, 61, 86, 47, - 227, 216, 61, 86, 47, 249, 24, 213, 77, 61, 86, 47, 239, 117, 213, 77, - 61, 86, 47, 79, 226, 251, 216, 9, 61, 86, 47, 79, 206, 221, 216, 9, 61, - 86, 47, 221, 162, 226, 251, 216, 9, 61, 86, 47, 245, 93, 227, 14, 221, - 162, 206, 221, 216, 9, 61, 86, 47, 43, 79, 61, 86, 47, 204, 32, 86, 47, - 248, 42, 211, 238, 241, 176, 47, 248, 42, 86, 47, 248, 42, 153, 241, 176, - 47, 79, 248, 42, 211, 238, 241, 176, 47, 79, 248, 42, 86, 47, 79, 248, - 42, 153, 241, 176, 47, 209, 182, 86, 47, 79, 209, 181, 86, 47, 204, 56, - 86, 47, 79, 204, 56, 86, 47, 220, 3, 86, 47, 52, 245, 93, 227, 14, 126, - 243, 184, 250, 217, 61, 208, 86, 245, 195, 5, 61, 208, 85, 218, 233, 171, - 210, 244, 171, 210, 197, 49, 215, 93, 249, 11, 244, 43, 50, 215, 93, 249, - 11, 244, 43, 219, 245, 3, 70, 231, 6, 216, 74, 212, 1, 217, 248, 210, - 244, 210, 198, 217, 248, 212, 0, 80, 248, 231, 3, 236, 106, 95, 13, 215, - 245, 243, 227, 163, 243, 136, 13, 240, 84, 243, 227, 103, 227, 37, 250, - 226, 103, 227, 37, 219, 244, 61, 243, 222, 3, 246, 216, 243, 85, 25, 3, - 243, 85, 241, 115, 76, 220, 1, 206, 212, 226, 251, 50, 245, 166, 3, 243, - 85, 206, 221, 49, 245, 166, 3, 243, 85, 49, 219, 209, 230, 99, 50, 219, - 209, 230, 99, 239, 102, 219, 209, 230, 99, 228, 8, 112, 210, 3, 228, 8, - 121, 210, 3, 49, 25, 50, 52, 207, 173, 49, 25, 50, 210, 3, 49, 223, 228, - 163, 50, 210, 3, 163, 49, 210, 3, 112, 210, 4, 3, 246, 62, 55, 226, 247, - 243, 142, 247, 137, 236, 106, 215, 135, 61, 245, 216, 243, 221, 61, 245, - 216, 243, 222, 3, 96, 208, 254, 61, 245, 216, 243, 222, 3, 86, 208, 254, - 61, 51, 3, 96, 208, 254, 61, 51, 3, 86, 208, 254, 13, 49, 61, 51, 155, - 13, 50, 61, 51, 155, 13, 49, 250, 218, 155, 13, 50, 250, 218, 155, 13, - 49, 52, 250, 218, 155, 13, 50, 52, 250, 218, 155, 13, 49, 61, 208, 133, - 213, 33, 155, 13, 50, 61, 208, 133, 213, 33, 155, 13, 49, 239, 214, 219, - 76, 13, 50, 239, 214, 219, 76, 177, 217, 58, 47, 183, 217, 58, 47, 250, - 194, 238, 226, 246, 62, 47, 246, 18, 238, 226, 246, 62, 47, 50, 53, 3, - 43, 218, 76, 163, 96, 47, 163, 86, 47, 163, 49, 50, 47, 163, 96, 52, 47, - 163, 86, 52, 47, 163, 49, 50, 52, 47, 163, 96, 53, 239, 120, 142, 163, - 86, 53, 239, 120, 142, 163, 96, 52, 53, 239, 120, 142, 163, 86, 52, 53, - 239, 120, 142, 163, 86, 211, 171, 47, 58, 59, 248, 36, 58, 59, 243, 82, - 58, 59, 242, 210, 58, 59, 243, 81, 58, 59, 242, 146, 58, 59, 243, 17, 58, - 59, 242, 209, 58, 59, 243, 80, 58, 59, 242, 114, 58, 59, 242, 241, 58, - 59, 242, 177, 58, 59, 243, 48, 58, 59, 242, 145, 58, 59, 243, 16, 58, 59, - 242, 208, 58, 59, 243, 79, 58, 59, 242, 98, 58, 59, 242, 225, 58, 59, - 242, 161, 58, 59, 243, 32, 58, 59, 242, 129, 58, 59, 243, 0, 58, 59, 242, - 192, 58, 59, 243, 63, 58, 59, 242, 113, 58, 59, 242, 240, 58, 59, 242, - 176, 58, 59, 243, 47, 58, 59, 242, 144, 58, 59, 243, 15, 58, 59, 242, - 207, 58, 59, 243, 78, 58, 59, 242, 90, 58, 59, 242, 217, 58, 59, 242, - 153, 58, 59, 243, 24, 58, 59, 242, 121, 58, 59, 242, 248, 58, 59, 242, - 184, 58, 59, 243, 55, 58, 59, 242, 105, 58, 59, 242, 232, 58, 59, 242, - 168, 58, 59, 243, 39, 58, 59, 242, 136, 58, 59, 243, 7, 58, 59, 242, 199, - 58, 59, 243, 70, 58, 59, 242, 97, 58, 59, 242, 224, 58, 59, 242, 160, 58, - 59, 243, 31, 58, 59, 242, 128, 58, 59, 242, 255, 58, 59, 242, 191, 58, - 59, 243, 62, 58, 59, 242, 112, 58, 59, 242, 239, 58, 59, 242, 175, 58, - 59, 243, 46, 58, 59, 242, 143, 58, 59, 243, 14, 58, 59, 242, 206, 58, 59, - 243, 77, 58, 59, 242, 86, 58, 59, 242, 213, 58, 59, 242, 149, 58, 59, - 243, 20, 58, 59, 242, 117, 58, 59, 242, 244, 58, 59, 242, 180, 58, 59, - 243, 51, 58, 59, 242, 101, 58, 59, 242, 228, 58, 59, 242, 164, 58, 59, - 243, 35, 58, 59, 242, 132, 58, 59, 243, 3, 58, 59, 242, 195, 58, 59, 243, - 66, 58, 59, 242, 93, 58, 59, 242, 220, 58, 59, 242, 156, 58, 59, 243, 27, - 58, 59, 242, 124, 58, 59, 242, 251, 58, 59, 242, 187, 58, 59, 243, 58, - 58, 59, 242, 108, 58, 59, 242, 235, 58, 59, 242, 171, 58, 59, 243, 42, - 58, 59, 242, 139, 58, 59, 243, 10, 58, 59, 242, 202, 58, 59, 243, 73, 58, - 59, 242, 89, 58, 59, 242, 216, 58, 59, 242, 152, 58, 59, 243, 23, 58, 59, - 242, 120, 58, 59, 242, 247, 58, 59, 242, 183, 58, 59, 243, 54, 58, 59, - 242, 104, 58, 59, 242, 231, 58, 59, 242, 167, 58, 59, 243, 38, 58, 59, - 242, 135, 58, 59, 243, 6, 58, 59, 242, 198, 58, 59, 243, 69, 58, 59, 242, - 96, 58, 59, 242, 223, 58, 59, 242, 159, 58, 59, 243, 30, 58, 59, 242, - 127, 58, 59, 242, 254, 58, 59, 242, 190, 58, 59, 243, 61, 58, 59, 242, - 111, 58, 59, 242, 238, 58, 59, 242, 174, 58, 59, 243, 45, 58, 59, 242, - 142, 58, 59, 243, 13, 58, 59, 242, 205, 58, 59, 243, 76, 58, 59, 242, 84, - 58, 59, 242, 211, 58, 59, 242, 147, 58, 59, 243, 18, 58, 59, 242, 115, - 58, 59, 242, 242, 58, 59, 242, 178, 58, 59, 243, 49, 58, 59, 242, 99, 58, - 59, 242, 226, 58, 59, 242, 162, 58, 59, 243, 33, 58, 59, 242, 130, 58, - 59, 243, 1, 58, 59, 242, 193, 58, 59, 243, 64, 58, 59, 242, 91, 58, 59, - 242, 218, 58, 59, 242, 154, 58, 59, 243, 25, 58, 59, 242, 122, 58, 59, - 242, 249, 58, 59, 242, 185, 58, 59, 243, 56, 58, 59, 242, 106, 58, 59, - 242, 233, 58, 59, 242, 169, 58, 59, 243, 40, 58, 59, 242, 137, 58, 59, - 243, 8, 58, 59, 242, 200, 58, 59, 243, 71, 58, 59, 242, 87, 58, 59, 242, - 214, 58, 59, 242, 150, 58, 59, 243, 21, 58, 59, 242, 118, 58, 59, 242, - 245, 58, 59, 242, 181, 58, 59, 243, 52, 58, 59, 242, 102, 58, 59, 242, - 229, 58, 59, 242, 165, 58, 59, 243, 36, 58, 59, 242, 133, 58, 59, 243, 4, - 58, 59, 242, 196, 58, 59, 243, 67, 58, 59, 242, 94, 58, 59, 242, 221, 58, - 59, 242, 157, 58, 59, 243, 28, 58, 59, 242, 125, 58, 59, 242, 252, 58, - 59, 242, 188, 58, 59, 243, 59, 58, 59, 242, 109, 58, 59, 242, 236, 58, - 59, 242, 172, 58, 59, 243, 43, 58, 59, 242, 140, 58, 59, 243, 11, 58, 59, - 242, 203, 58, 59, 243, 74, 58, 59, 242, 85, 58, 59, 242, 212, 58, 59, - 242, 148, 58, 59, 243, 19, 58, 59, 242, 116, 58, 59, 242, 243, 58, 59, - 242, 179, 58, 59, 243, 50, 58, 59, 242, 100, 58, 59, 242, 227, 58, 59, - 242, 163, 58, 59, 243, 34, 58, 59, 242, 131, 58, 59, 243, 2, 58, 59, 242, - 194, 58, 59, 243, 65, 58, 59, 242, 92, 58, 59, 242, 219, 58, 59, 242, - 155, 58, 59, 243, 26, 58, 59, 242, 123, 58, 59, 242, 250, 58, 59, 242, - 186, 58, 59, 243, 57, 58, 59, 242, 107, 58, 59, 242, 234, 58, 59, 242, - 170, 58, 59, 243, 41, 58, 59, 242, 138, 58, 59, 243, 9, 58, 59, 242, 201, - 58, 59, 243, 72, 58, 59, 242, 88, 58, 59, 242, 215, 58, 59, 242, 151, 58, - 59, 243, 22, 58, 59, 242, 119, 58, 59, 242, 246, 58, 59, 242, 182, 58, - 59, 243, 53, 58, 59, 242, 103, 58, 59, 242, 230, 58, 59, 242, 166, 58, - 59, 243, 37, 58, 59, 242, 134, 58, 59, 243, 5, 58, 59, 242, 197, 58, 59, - 243, 68, 58, 59, 242, 95, 58, 59, 242, 222, 58, 59, 242, 158, 58, 59, - 243, 29, 58, 59, 242, 126, 58, 59, 242, 253, 58, 59, 242, 189, 58, 59, - 243, 60, 58, 59, 242, 110, 58, 59, 242, 237, 58, 59, 242, 173, 58, 59, - 243, 44, 58, 59, 242, 141, 58, 59, 243, 12, 58, 59, 242, 204, 58, 59, - 243, 75, 86, 207, 134, 53, 3, 80, 95, 86, 207, 134, 53, 3, 52, 80, 95, - 96, 52, 53, 3, 80, 95, 86, 52, 53, 3, 80, 95, 49, 50, 52, 53, 3, 80, 95, - 86, 207, 134, 53, 239, 120, 142, 96, 52, 53, 239, 120, 142, 86, 52, 53, - 239, 120, 142, 183, 53, 3, 236, 106, 95, 177, 53, 3, 236, 106, 95, 177, - 208, 70, 47, 183, 208, 70, 47, 96, 52, 244, 145, 47, 86, 52, 244, 145, - 47, 96, 208, 70, 244, 145, 47, 86, 208, 70, 244, 145, 47, 86, 207, 134, - 208, 70, 244, 145, 47, 86, 53, 3, 242, 83, 211, 77, 177, 53, 208, 173, - 142, 183, 53, 208, 173, 142, 86, 53, 3, 209, 249, 3, 80, 95, 86, 53, 3, - 209, 249, 3, 52, 80, 95, 86, 207, 134, 53, 3, 209, 248, 86, 207, 134, 53, - 3, 209, 249, 3, 80, 95, 86, 207, 134, 53, 3, 209, 249, 3, 52, 80, 95, 96, - 250, 96, 86, 250, 96, 96, 52, 250, 96, 86, 52, 250, 96, 96, 53, 208, 173, - 62, 243, 221, 86, 53, 208, 173, 62, 243, 221, 96, 53, 239, 120, 248, 231, - 208, 173, 62, 243, 221, 86, 53, 239, 120, 248, 231, 208, 173, 62, 243, - 221, 153, 204, 46, 25, 211, 238, 241, 176, 47, 153, 241, 176, 25, 211, - 238, 204, 46, 47, 153, 204, 46, 53, 3, 113, 153, 241, 176, 53, 3, 113, - 211, 238, 241, 176, 53, 3, 113, 211, 238, 204, 46, 53, 3, 113, 153, 204, - 46, 53, 25, 153, 241, 176, 47, 153, 241, 176, 53, 25, 211, 238, 241, 176, - 47, 211, 238, 241, 176, 53, 25, 211, 238, 204, 46, 47, 211, 238, 204, 46, - 53, 25, 153, 204, 46, 47, 215, 245, 243, 228, 245, 124, 240, 84, 243, - 227, 240, 84, 243, 228, 245, 124, 215, 245, 243, 227, 211, 238, 241, 176, - 53, 245, 124, 153, 241, 176, 47, 153, 241, 176, 53, 245, 124, 211, 238, - 241, 176, 47, 240, 84, 243, 228, 245, 124, 153, 241, 176, 47, 215, 245, - 243, 228, 245, 124, 211, 238, 241, 176, 47, 153, 241, 176, 53, 245, 124, - 153, 204, 46, 47, 153, 204, 46, 53, 245, 124, 153, 241, 176, 47, 204, 76, - 53, 218, 59, 243, 164, 216, 16, 53, 218, 59, 86, 209, 84, 245, 84, 206, - 212, 53, 218, 59, 86, 209, 84, 245, 84, 242, 68, 53, 218, 59, 183, 209, - 84, 245, 84, 227, 212, 53, 218, 59, 183, 209, 84, 245, 84, 216, 5, 216, - 8, 250, 129, 246, 18, 47, 227, 215, 250, 129, 250, 194, 47, 208, 145, - 250, 129, 250, 194, 47, 247, 248, 250, 129, 250, 194, 47, 208, 145, 250, - 129, 246, 18, 53, 3, 224, 102, 208, 145, 250, 129, 250, 194, 53, 3, 218, - 76, 226, 251, 50, 213, 145, 246, 18, 47, 226, 251, 49, 213, 145, 250, - 194, 47, 250, 194, 246, 16, 246, 62, 47, 246, 18, 246, 16, 246, 62, 47, - 86, 53, 87, 212, 228, 96, 47, 96, 53, 87, 212, 228, 86, 47, 212, 228, 86, - 53, 87, 96, 47, 86, 53, 3, 91, 56, 96, 53, 3, 91, 56, 86, 53, 209, 25, - 203, 196, 49, 50, 53, 209, 25, 5, 246, 61, 177, 207, 134, 53, 239, 120, - 5, 246, 61, 49, 150, 112, 50, 150, 121, 237, 86, 49, 150, 121, 50, 150, - 112, 237, 86, 112, 150, 50, 121, 150, 49, 237, 86, 112, 150, 49, 121, - 150, 50, 237, 86, 49, 150, 112, 50, 150, 112, 237, 86, 112, 150, 50, 121, - 150, 50, 237, 86, 49, 150, 121, 50, 150, 121, 237, 86, 112, 150, 49, 121, - 150, 49, 237, 86, 96, 237, 87, 3, 150, 112, 208, 173, 142, 86, 237, 87, - 3, 150, 112, 208, 173, 142, 177, 237, 87, 3, 150, 50, 208, 173, 142, 183, - 237, 87, 3, 150, 50, 208, 173, 142, 96, 237, 87, 3, 150, 121, 208, 173, - 142, 86, 237, 87, 3, 150, 121, 208, 173, 142, 177, 237, 87, 3, 150, 49, - 208, 173, 142, 183, 237, 87, 3, 150, 49, 208, 173, 142, 96, 237, 87, 3, - 150, 112, 239, 120, 142, 86, 237, 87, 3, 150, 112, 239, 120, 142, 177, - 237, 87, 3, 150, 50, 239, 120, 142, 183, 237, 87, 3, 150, 50, 239, 120, - 142, 96, 237, 87, 3, 150, 121, 239, 120, 142, 86, 237, 87, 3, 150, 121, - 239, 120, 142, 177, 237, 87, 3, 150, 49, 239, 120, 142, 183, 237, 87, 3, - 150, 49, 239, 120, 142, 96, 237, 87, 3, 150, 112, 87, 96, 237, 87, 3, - 150, 242, 70, 177, 237, 87, 3, 150, 49, 248, 110, 177, 237, 87, 3, 150, - 216, 16, 86, 237, 87, 3, 150, 112, 87, 86, 237, 87, 3, 150, 242, 70, 183, - 237, 87, 3, 150, 49, 248, 110, 183, 237, 87, 3, 150, 216, 16, 96, 237, - 87, 3, 150, 112, 87, 86, 237, 87, 3, 150, 206, 224, 96, 237, 87, 3, 150, - 121, 87, 86, 237, 87, 3, 150, 242, 70, 86, 237, 87, 3, 150, 112, 87, 96, - 237, 87, 3, 150, 206, 224, 86, 237, 87, 3, 150, 121, 87, 96, 237, 87, 3, - 150, 242, 70, 96, 237, 87, 3, 150, 112, 87, 163, 244, 144, 96, 237, 87, - 3, 150, 121, 248, 126, 163, 244, 144, 86, 237, 87, 3, 150, 112, 87, 163, - 244, 144, 86, 237, 87, 3, 150, 121, 248, 126, 163, 244, 144, 177, 237, - 87, 3, 150, 49, 248, 110, 183, 237, 87, 3, 150, 216, 16, 183, 237, 87, 3, - 150, 49, 248, 110, 177, 237, 87, 3, 150, 216, 16, 50, 52, 53, 3, 215, - 189, 237, 64, 241, 35, 2, 87, 86, 47, 208, 228, 219, 255, 87, 86, 47, 96, - 53, 87, 208, 228, 219, 254, 86, 53, 87, 208, 228, 219, 254, 86, 53, 87, - 251, 7, 156, 135, 227, 179, 87, 96, 47, 96, 53, 209, 25, 227, 178, 237, - 247, 87, 86, 47, 210, 245, 87, 86, 47, 96, 53, 209, 25, 210, 244, 210, - 198, 87, 96, 47, 49, 239, 244, 209, 248, 50, 239, 244, 209, 248, 112, - 239, 244, 209, 248, 121, 239, 244, 209, 248, 208, 70, 80, 248, 231, 244, - 43, 202, 160, 221, 164, 211, 188, 202, 160, 221, 164, 207, 121, 245, 242, - 49, 61, 245, 93, 155, 50, 61, 245, 93, 155, 49, 61, 219, 76, 50, 61, 219, - 76, 202, 160, 221, 164, 49, 231, 65, 155, 202, 160, 221, 164, 50, 231, - 65, 155, 202, 160, 221, 164, 49, 248, 65, 155, 202, 160, 221, 164, 50, - 248, 65, 155, 49, 51, 247, 227, 3, 206, 246, 50, 51, 247, 227, 3, 206, - 246, 49, 51, 247, 227, 3, 208, 255, 231, 50, 208, 145, 245, 165, 50, 51, - 247, 227, 3, 208, 255, 231, 50, 247, 248, 245, 165, 49, 51, 247, 227, 3, - 208, 255, 231, 50, 247, 248, 245, 165, 50, 51, 247, 227, 3, 208, 255, - 231, 50, 208, 145, 245, 165, 49, 250, 218, 247, 227, 3, 243, 85, 50, 250, - 218, 247, 227, 3, 243, 85, 49, 250, 129, 227, 179, 155, 50, 250, 129, - 237, 247, 155, 52, 49, 250, 129, 237, 247, 155, 52, 50, 250, 129, 227, - 179, 155, 49, 62, 208, 133, 213, 33, 155, 50, 62, 208, 133, 213, 33, 155, - 242, 83, 240, 40, 80, 202, 30, 227, 114, 225, 17, 250, 218, 220, 1, 227, - 222, 50, 250, 218, 206, 69, 3, 211, 177, 225, 17, 50, 250, 218, 3, 243, - 85, 250, 218, 3, 215, 94, 231, 6, 251, 126, 250, 217, 211, 208, 250, 218, - 220, 1, 227, 222, 211, 208, 250, 218, 220, 1, 206, 224, 207, 174, 250, - 217, 216, 73, 250, 217, 250, 218, 3, 206, 246, 216, 73, 250, 218, 3, 206, - 246, 220, 89, 250, 218, 220, 1, 206, 224, 220, 89, 250, 218, 220, 1, 242, - 70, 225, 17, 250, 218, 3, 171, 250, 107, 241, 81, 231, 50, 53, 218, 59, - 112, 25, 216, 16, 225, 17, 250, 218, 3, 171, 250, 107, 241, 81, 231, 50, - 53, 218, 59, 112, 25, 227, 222, 225, 17, 250, 218, 3, 171, 250, 107, 241, - 81, 231, 50, 53, 218, 59, 121, 25, 216, 16, 225, 17, 250, 218, 3, 171, - 250, 107, 241, 81, 231, 50, 53, 218, 59, 121, 25, 227, 222, 225, 17, 250, - 218, 3, 171, 250, 107, 241, 81, 231, 50, 53, 218, 59, 50, 25, 206, 224, - 225, 17, 250, 218, 3, 171, 250, 107, 241, 81, 231, 50, 53, 218, 59, 49, - 25, 206, 224, 225, 17, 250, 218, 3, 171, 250, 107, 241, 81, 231, 50, 53, - 218, 59, 50, 25, 242, 70, 225, 17, 250, 218, 3, 171, 250, 107, 241, 81, - 231, 50, 53, 218, 59, 49, 25, 242, 70, 216, 73, 241, 94, 213, 117, 241, - 94, 213, 118, 3, 219, 203, 241, 94, 213, 118, 3, 5, 246, 62, 55, 241, 94, - 213, 118, 3, 50, 53, 55, 241, 94, 213, 118, 3, 49, 53, 55, 246, 62, 3, - 236, 106, 142, 43, 80, 142, 43, 219, 81, 43, 216, 74, 212, 0, 43, 218, - 233, 246, 62, 243, 142, 247, 137, 236, 106, 248, 231, 25, 208, 145, 162, - 243, 142, 247, 137, 80, 142, 246, 62, 3, 210, 200, 203, 196, 43, 250, - 192, 243, 137, 54, 112, 53, 209, 25, 246, 61, 43, 61, 247, 177, 43, 247, - 177, 43, 227, 178, 43, 237, 246, 246, 62, 3, 5, 246, 62, 208, 173, 209, - 93, 216, 16, 246, 62, 3, 120, 236, 106, 211, 20, 208, 173, 209, 93, 216, - 16, 103, 215, 245, 243, 228, 212, 57, 103, 240, 84, 243, 228, 212, 57, - 103, 250, 59, 103, 5, 246, 61, 103, 211, 177, 120, 230, 98, 211, 175, - 208, 86, 3, 70, 55, 208, 86, 3, 206, 246, 215, 94, 231, 50, 208, 85, 208, - 86, 3, 213, 124, 250, 50, 247, 247, 50, 208, 86, 87, 49, 208, 85, 49, - 208, 86, 248, 110, 80, 142, 80, 248, 231, 248, 110, 50, 208, 85, 247, - 235, 3, 49, 162, 248, 43, 247, 235, 3, 50, 162, 248, 43, 62, 247, 234, - 23, 3, 49, 162, 248, 43, 23, 3, 50, 162, 248, 43, 61, 236, 40, 62, 236, - 40, 49, 204, 21, 240, 40, 50, 204, 21, 240, 40, 49, 52, 204, 21, 240, 40, - 50, 52, 204, 21, 240, 40, 231, 42, 231, 27, 208, 251, 115, 231, 27, 231, - 28, 222, 234, 3, 80, 142, 242, 77, 223, 228, 51, 3, 245, 187, 219, 208, - 231, 39, 250, 81, 212, 193, 217, 224, 241, 35, 2, 25, 212, 59, 219, 81, - 241, 35, 2, 25, 212, 59, 219, 82, 3, 208, 228, 55, 235, 154, 208, 173, - 25, 212, 59, 219, 81, 238, 48, 211, 93, 209, 81, 242, 69, 208, 86, 3, 49, - 162, 248, 43, 242, 69, 208, 86, 3, 50, 162, 248, 43, 62, 243, 222, 3, - 121, 47, 62, 226, 246, 61, 246, 62, 3, 121, 47, 62, 246, 62, 3, 121, 47, - 241, 20, 61, 211, 177, 241, 20, 62, 211, 177, 241, 20, 61, 243, 221, 241, - 20, 62, 243, 221, 241, 20, 61, 246, 61, 241, 20, 62, 246, 61, 215, 134, - 216, 74, 212, 1, 219, 254, 212, 1, 3, 219, 203, 216, 74, 212, 1, 3, 236, - 106, 95, 248, 73, 212, 0, 248, 73, 216, 74, 212, 0, 52, 218, 76, 208, 70, - 218, 76, 227, 217, 245, 86, 250, 218, 155, 216, 11, 245, 86, 250, 218, - 155, 208, 212, 224, 100, 223, 162, 43, 70, 219, 254, 223, 162, 43, 91, - 219, 254, 223, 162, 43, 23, 219, 254, 223, 162, 206, 238, 219, 255, 3, - 243, 85, 223, 162, 206, 238, 219, 255, 3, 218, 76, 223, 162, 51, 230, - 245, 219, 254, 223, 162, 51, 206, 238, 219, 254, 120, 227, 37, 25, 219, - 254, 120, 227, 37, 219, 245, 219, 254, 223, 162, 23, 219, 254, 224, 58, - 120, 210, 220, 210, 218, 3, 231, 2, 217, 58, 231, 3, 219, 254, 239, 252, - 219, 71, 231, 2, 231, 3, 3, 52, 95, 231, 3, 250, 15, 3, 212, 57, 246, 54, - 239, 99, 250, 194, 231, 0, 227, 115, 231, 1, 3, 216, 142, 219, 52, 250, - 104, 218, 53, 227, 115, 231, 1, 3, 213, 145, 219, 52, 250, 104, 218, 53, - 227, 115, 231, 1, 221, 166, 231, 44, 209, 93, 218, 53, 231, 3, 250, 104, - 34, 218, 63, 219, 254, 217, 52, 231, 3, 219, 254, 231, 3, 3, 96, 53, 3, - 113, 231, 3, 3, 23, 54, 231, 3, 3, 230, 244, 231, 3, 3, 206, 237, 231, 3, - 3, 219, 203, 231, 3, 3, 206, 246, 230, 99, 228, 8, 49, 208, 86, 219, 254, - 202, 160, 221, 164, 214, 198, 245, 223, 202, 160, 221, 164, 214, 198, - 218, 114, 202, 160, 221, 164, 214, 198, 217, 219, 91, 2, 3, 5, 246, 62, - 55, 91, 2, 3, 246, 53, 251, 139, 55, 91, 2, 3, 208, 228, 55, 91, 2, 3, - 70, 56, 91, 2, 3, 208, 228, 56, 91, 2, 3, 210, 246, 108, 91, 2, 3, 62, - 208, 85, 224, 103, 2, 3, 245, 234, 55, 224, 103, 2, 3, 70, 56, 224, 103, - 2, 3, 240, 84, 243, 83, 224, 103, 2, 3, 215, 245, 243, 83, 91, 2, 231, - 50, 49, 162, 246, 61, 91, 2, 231, 50, 50, 162, 246, 61, 206, 54, 219, - 245, 245, 131, 217, 224, 223, 224, 2, 3, 70, 55, 223, 224, 2, 3, 206, - 246, 213, 142, 217, 225, 3, 247, 248, 246, 15, 212, 34, 217, 224, 223, - 224, 2, 231, 50, 49, 162, 246, 61, 223, 224, 2, 231, 50, 50, 162, 246, - 61, 43, 223, 224, 2, 3, 246, 53, 251, 138, 223, 224, 2, 231, 50, 52, 246, - 61, 43, 243, 137, 54, 91, 2, 231, 50, 208, 85, 224, 103, 2, 231, 50, 208, - 85, 223, 224, 2, 231, 50, 208, 85, 230, 253, 217, 224, 216, 6, 230, 253, - 217, 224, 202, 160, 221, 164, 216, 116, 245, 223, 250, 245, 219, 245, - 245, 171, 230, 245, 3, 243, 85, 206, 238, 3, 224, 103, 54, 206, 238, 3, - 219, 203, 230, 245, 3, 219, 203, 230, 245, 3, 227, 37, 250, 226, 206, - 238, 3, 227, 37, 219, 244, 206, 238, 87, 230, 244, 230, 245, 87, 206, - 237, 206, 238, 87, 248, 231, 87, 230, 244, 230, 245, 87, 248, 231, 87, - 206, 237, 206, 238, 248, 110, 25, 230, 98, 3, 206, 237, 230, 245, 248, - 110, 25, 230, 98, 3, 230, 244, 246, 16, 206, 238, 3, 213, 123, 246, 16, - 230, 245, 3, 213, 123, 52, 51, 230, 244, 52, 51, 206, 237, 246, 16, 206, - 238, 3, 213, 124, 25, 212, 34, 217, 224, 227, 37, 25, 3, 70, 55, 227, 37, - 219, 245, 3, 70, 55, 52, 227, 37, 250, 226, 52, 227, 37, 219, 244, 120, - 230, 246, 227, 37, 250, 226, 120, 230, 246, 227, 37, 219, 244, 212, 43, - 228, 8, 219, 244, 212, 43, 228, 8, 250, 226, 227, 37, 219, 245, 219, 200, - 227, 37, 250, 226, 227, 37, 25, 3, 101, 211, 77, 227, 37, 219, 245, 3, - 101, 211, 77, 227, 37, 25, 3, 236, 106, 244, 144, 227, 37, 219, 245, 3, - 236, 106, 244, 144, 227, 37, 25, 3, 52, 219, 203, 227, 37, 25, 3, 206, - 246, 227, 37, 25, 3, 52, 206, 246, 5, 206, 51, 3, 206, 246, 227, 37, 219, - 245, 3, 52, 219, 203, 227, 37, 219, 245, 3, 52, 206, 246, 202, 160, 221, - 164, 243, 94, 250, 184, 202, 160, 221, 164, 216, 179, 250, 184, 241, 35, - 2, 3, 70, 56, 235, 154, 3, 70, 55, 208, 70, 236, 106, 248, 231, 3, 52, - 80, 95, 208, 70, 236, 106, 248, 231, 3, 208, 70, 80, 95, 208, 228, 219, - 255, 3, 70, 55, 208, 228, 219, 255, 3, 215, 245, 243, 83, 212, 129, 224, - 103, 212, 128, 245, 210, 3, 70, 55, 241, 35, 3, 250, 59, 251, 7, 156, - 208, 173, 3, 246, 53, 251, 138, 250, 151, 156, 219, 245, 156, 135, 241, - 35, 2, 87, 91, 54, 91, 2, 87, 241, 35, 54, 241, 35, 2, 87, 208, 228, 219, - 254, 52, 245, 243, 241, 36, 120, 245, 203, 241, 35, 212, 143, 126, 245, - 203, 241, 35, 212, 143, 241, 35, 2, 3, 120, 187, 87, 25, 120, 187, 56, - 241, 30, 3, 239, 147, 187, 55, 227, 179, 3, 246, 62, 231, 6, 237, 247, 3, - 246, 62, 231, 6, 227, 179, 3, 217, 47, 131, 55, 237, 247, 3, 217, 47, - 131, 55, 227, 179, 219, 245, 212, 59, 156, 135, 237, 247, 219, 245, 212, - 59, 156, 135, 227, 179, 219, 245, 212, 59, 156, 208, 173, 3, 70, 231, 6, - 237, 247, 219, 245, 212, 59, 156, 208, 173, 3, 70, 231, 6, 227, 179, 219, - 245, 212, 59, 156, 208, 173, 3, 70, 55, 237, 247, 219, 245, 212, 59, 156, - 208, 173, 3, 70, 55, 227, 179, 219, 245, 212, 59, 156, 208, 173, 3, 70, - 87, 216, 16, 237, 247, 219, 245, 212, 59, 156, 208, 173, 3, 70, 87, 227, - 222, 227, 179, 219, 245, 250, 152, 237, 247, 219, 245, 250, 152, 227, - 179, 25, 212, 118, 221, 166, 156, 135, 237, 247, 25, 212, 118, 221, 166, - 156, 135, 227, 179, 25, 221, 166, 250, 152, 237, 247, 25, 221, 166, 250, - 152, 227, 179, 87, 242, 76, 156, 87, 237, 246, 237, 247, 87, 242, 76, - 156, 87, 227, 178, 227, 179, 87, 212, 129, 219, 245, 241, 36, 237, 247, - 87, 212, 129, 219, 245, 241, 36, 227, 179, 87, 212, 129, 87, 237, 246, - 237, 247, 87, 212, 129, 87, 227, 178, 227, 179, 87, 237, 247, 87, 242, - 76, 241, 36, 237, 247, 87, 227, 179, 87, 242, 76, 241, 36, 227, 179, 87, - 212, 59, 156, 87, 237, 247, 87, 212, 59, 241, 36, 237, 247, 87, 212, 59, - 156, 87, 227, 179, 87, 212, 59, 241, 36, 212, 59, 156, 208, 173, 219, - 245, 227, 178, 212, 59, 156, 208, 173, 219, 245, 237, 246, 212, 59, 156, - 208, 173, 219, 245, 227, 179, 3, 70, 231, 6, 212, 59, 156, 208, 173, 219, - 245, 237, 247, 3, 70, 231, 6, 242, 76, 156, 208, 173, 219, 245, 227, 178, - 242, 76, 156, 208, 173, 219, 245, 237, 246, 242, 76, 212, 59, 156, 208, - 173, 219, 245, 227, 178, 242, 76, 212, 59, 156, 208, 173, 219, 245, 237, - 246, 212, 129, 219, 245, 227, 178, 212, 129, 219, 245, 237, 246, 212, - 129, 87, 227, 179, 87, 241, 35, 54, 212, 129, 87, 237, 247, 87, 241, 35, - 54, 52, 222, 221, 227, 178, 52, 222, 221, 237, 246, 52, 222, 221, 227, - 179, 3, 206, 246, 237, 247, 219, 200, 227, 178, 237, 247, 248, 110, 227, - 178, 227, 179, 246, 16, 247, 137, 245, 87, 237, 247, 246, 16, 247, 137, - 245, 87, 227, 179, 246, 16, 247, 137, 245, 88, 87, 212, 59, 241, 36, 237, - 247, 246, 16, 247, 137, 245, 88, 87, 212, 59, 241, 36, 212, 35, 209, 97, - 228, 6, 209, 97, 212, 35, 209, 98, 219, 245, 156, 135, 228, 6, 209, 98, - 219, 245, 156, 135, 241, 35, 2, 3, 247, 170, 55, 217, 250, 87, 212, 118, - 241, 35, 54, 210, 237, 87, 212, 118, 241, 35, 54, 217, 250, 87, 212, 118, - 221, 166, 156, 135, 210, 237, 87, 212, 118, 221, 166, 156, 135, 217, 250, - 87, 241, 35, 54, 210, 237, 87, 241, 35, 54, 217, 250, 87, 221, 166, 156, - 135, 210, 237, 87, 221, 166, 156, 135, 217, 250, 87, 251, 7, 156, 135, - 210, 237, 87, 251, 7, 156, 135, 217, 250, 87, 221, 166, 251, 7, 156, 135, - 210, 237, 87, 221, 166, 251, 7, 156, 135, 52, 217, 249, 52, 210, 236, - 210, 245, 3, 243, 85, 210, 198, 3, 243, 85, 210, 245, 3, 91, 2, 56, 210, - 198, 3, 91, 2, 56, 210, 245, 3, 223, 224, 2, 56, 210, 198, 3, 223, 224, - 2, 56, 210, 245, 76, 219, 245, 156, 208, 173, 3, 70, 55, 210, 198, 76, - 219, 245, 156, 208, 173, 3, 70, 55, 210, 245, 76, 87, 241, 35, 54, 210, - 198, 76, 87, 241, 35, 54, 210, 245, 76, 87, 208, 228, 219, 254, 210, 198, - 76, 87, 208, 228, 219, 254, 210, 245, 76, 87, 251, 7, 156, 135, 210, 198, - 76, 87, 251, 7, 156, 135, 210, 245, 76, 87, 221, 166, 156, 135, 210, 198, - 76, 87, 221, 166, 156, 135, 51, 49, 171, 98, 219, 254, 51, 50, 171, 98, - 219, 254, 246, 16, 210, 244, 246, 16, 210, 197, 246, 16, 210, 245, 219, - 245, 156, 135, 246, 16, 210, 198, 219, 245, 156, 135, 210, 245, 87, 210, - 197, 210, 198, 87, 210, 244, 210, 245, 87, 210, 244, 210, 198, 87, 210, - 197, 210, 198, 248, 110, 210, 244, 210, 198, 248, 110, 25, 230, 98, 247, - 137, 244, 145, 3, 210, 244, 241, 115, 76, 220, 1, 242, 68, 218, 104, 3, - 209, 177, 208, 144, 208, 102, 230, 244, 239, 160, 221, 181, 212, 228, 49, - 210, 3, 212, 228, 121, 210, 3, 212, 228, 112, 210, 3, 218, 234, 3, 194, - 80, 248, 231, 208, 70, 50, 207, 173, 52, 80, 248, 231, 49, 207, 173, 80, - 248, 231, 52, 49, 207, 173, 52, 80, 248, 231, 52, 49, 207, 173, 163, 244, - 145, 239, 120, 49, 224, 245, 76, 52, 206, 38, 212, 228, 121, 210, 4, 3, - 219, 203, 212, 228, 112, 210, 4, 3, 206, 246, 212, 228, 112, 210, 4, 87, - 212, 228, 121, 210, 3, 52, 121, 210, 3, 52, 112, 210, 3, 52, 211, 32, - 221, 166, 54, 216, 73, 52, 211, 32, 221, 166, 54, 243, 104, 221, 166, - 243, 144, 3, 216, 73, 222, 233, 212, 57, 80, 227, 115, 3, 246, 62, 55, - 80, 227, 115, 3, 246, 62, 56, 121, 210, 4, 3, 246, 62, 56, 219, 82, 3, - 236, 106, 95, 219, 82, 3, 208, 228, 219, 254, 208, 70, 80, 248, 231, 248, - 67, 216, 117, 208, 70, 80, 248, 231, 3, 236, 106, 95, 208, 70, 245, 243, - 219, 254, 208, 70, 222, 221, 227, 178, 208, 70, 222, 221, 237, 246, 242, - 76, 212, 59, 227, 179, 219, 245, 156, 135, 242, 76, 212, 59, 237, 247, - 219, 245, 156, 135, 208, 70, 212, 1, 248, 67, 216, 117, 228, 8, 208, 70, - 80, 248, 231, 219, 254, 52, 212, 1, 219, 254, 61, 80, 142, 223, 162, 61, - 80, 142, 153, 241, 176, 61, 47, 153, 204, 46, 61, 47, 211, 238, 241, 176, - 61, 47, 211, 238, 204, 46, 61, 47, 49, 50, 61, 47, 96, 62, 47, 177, 62, - 47, 183, 62, 47, 153, 241, 176, 62, 47, 153, 204, 46, 62, 47, 211, 238, - 241, 176, 62, 47, 211, 238, 204, 46, 62, 47, 49, 50, 62, 47, 112, 121, - 62, 47, 86, 53, 3, 208, 211, 242, 68, 86, 53, 3, 208, 211, 206, 212, 96, - 53, 3, 208, 211, 242, 68, 96, 53, 3, 208, 211, 206, 212, 51, 3, 208, 145, - 162, 248, 43, 51, 3, 247, 248, 162, 248, 43, 51, 3, 206, 221, 50, 243, - 228, 162, 248, 43, 51, 3, 226, 251, 49, 243, 228, 162, 248, 43, 243, 222, - 3, 49, 162, 248, 43, 243, 222, 3, 50, 162, 248, 43, 243, 222, 3, 208, - 145, 162, 248, 43, 243, 222, 3, 247, 248, 162, 248, 43, 242, 83, 211, - 177, 62, 228, 8, 211, 177, 61, 228, 8, 211, 177, 62, 205, 242, 5, 211, - 177, 61, 205, 242, 5, 211, 177, 62, 218, 255, 61, 218, 255, 61, 237, 17, - 62, 237, 17, 236, 106, 62, 237, 17, 62, 228, 8, 246, 61, 62, 225, 10, - 243, 221, 61, 225, 10, 243, 221, 62, 225, 10, 226, 246, 61, 225, 10, 226, - 246, 62, 5, 243, 221, 62, 5, 226, 246, 61, 5, 226, 246, 62, 236, 106, - 241, 109, 61, 236, 106, 241, 109, 62, 80, 241, 109, 61, 80, 241, 109, 49, - 53, 3, 5, 246, 61, 126, 96, 250, 91, 49, 53, 3, 43, 218, 76, 163, 96, - 211, 171, 47, 96, 207, 134, 53, 3, 80, 95, 96, 207, 134, 53, 3, 52, 80, - 95, 96, 207, 134, 53, 239, 120, 142, 96, 207, 134, 208, 70, 244, 145, 47, - 96, 53, 3, 242, 83, 211, 77, 96, 53, 3, 209, 249, 3, 80, 95, 96, 53, 3, - 209, 249, 3, 52, 80, 95, 96, 207, 134, 53, 3, 209, 248, 96, 207, 134, 53, - 3, 209, 249, 3, 80, 95, 96, 207, 134, 53, 3, 209, 249, 3, 52, 80, 95, 96, - 53, 209, 25, 203, 196, 204, 76, 53, 218, 59, 243, 164, 227, 222, 241, 35, - 2, 87, 96, 47, 216, 74, 208, 228, 219, 255, 87, 96, 47, 96, 53, 87, 216, - 74, 251, 7, 156, 135, 86, 53, 209, 25, 237, 246, 86, 53, 209, 25, 210, - 197, 96, 217, 58, 47, 86, 217, 58, 47, 216, 74, 208, 228, 219, 255, 87, - 86, 47, 86, 53, 87, 216, 74, 251, 7, 156, 135, 208, 228, 219, 255, 87, - 96, 47, 96, 53, 87, 251, 7, 156, 135, 96, 53, 87, 216, 74, 208, 228, 219, - 254, 86, 53, 87, 216, 74, 208, 228, 219, 254, 183, 208, 84, 202, 30, 47, - 212, 228, 212, 59, 153, 47, 212, 228, 249, 22, 211, 238, 47, 61, 225, 10, - 211, 94, 62, 5, 211, 94, 61, 5, 211, 94, 62, 216, 11, 218, 255, 61, 216, - 11, 218, 255, 79, 228, 8, 246, 61, 79, 219, 205, 3, 219, 205, 231, 6, 79, - 246, 62, 3, 246, 62, 231, 6, 79, 246, 61, 79, 43, 214, 254, 212, 59, 153, - 53, 3, 236, 115, 237, 64, 249, 22, 211, 238, 53, 3, 236, 115, 209, 248, - 212, 59, 153, 53, 3, 236, 106, 209, 248, 249, 22, 211, 238, 53, 3, 236, - 106, 209, 248, 248, 118, 53, 218, 59, 183, 209, 84, 153, 241, 175, 212, - 228, 248, 118, 53, 218, 59, 183, 209, 84, 153, 241, 175, 96, 208, 84, 47, - 177, 208, 84, 47, 86, 208, 84, 47, 183, 208, 84, 47, 49, 50, 208, 84, 47, - 112, 121, 208, 84, 47, 153, 204, 46, 208, 84, 47, 153, 241, 176, 208, 84, - 47, 211, 238, 241, 176, 208, 84, 47, 211, 238, 204, 46, 208, 84, 47, 96, - 208, 84, 244, 143, 47, 177, 208, 84, 244, 143, 47, 86, 208, 84, 244, 143, - 47, 183, 208, 84, 244, 143, 47, 246, 18, 208, 84, 171, 246, 62, 47, 250, - 194, 208, 84, 171, 246, 62, 47, 96, 208, 84, 53, 208, 173, 142, 177, 208, - 84, 53, 208, 173, 142, 86, 208, 84, 53, 208, 173, 142, 183, 208, 84, 53, - 208, 173, 142, 153, 204, 46, 208, 84, 53, 208, 173, 142, 153, 241, 176, - 208, 84, 53, 208, 173, 142, 211, 238, 241, 176, 208, 84, 53, 208, 173, - 142, 211, 238, 204, 46, 208, 84, 53, 208, 173, 142, 96, 208, 84, 53, 3, - 52, 236, 106, 95, 177, 208, 84, 53, 3, 52, 236, 106, 95, 86, 208, 84, 53, - 3, 52, 236, 106, 95, 183, 208, 84, 53, 3, 52, 236, 106, 95, 236, 106, - 210, 11, 229, 151, 80, 210, 11, 229, 151, 96, 208, 84, 53, 115, 86, 208, - 84, 47, 177, 208, 84, 53, 96, 76, 183, 208, 84, 47, 86, 208, 84, 53, 115, - 96, 208, 84, 47, 183, 208, 84, 53, 96, 76, 177, 208, 84, 47, 96, 208, 84, - 219, 146, 250, 91, 177, 208, 84, 219, 146, 250, 91, 86, 208, 84, 219, - 146, 250, 91, 183, 208, 84, 219, 146, 250, 91, 96, 62, 43, 61, 47, 177, - 62, 43, 61, 47, 86, 62, 43, 61, 47, 183, 62, 43, 61, 47, 250, 194, 208, - 84, 50, 207, 92, 47, 250, 194, 208, 84, 247, 248, 207, 92, 47, 250, 194, - 208, 84, 49, 207, 92, 47, 250, 194, 208, 84, 208, 145, 207, 92, 47, 216, - 78, 227, 222, 216, 78, 216, 16, 222, 212, 227, 222, 222, 212, 216, 16, - 239, 147, 245, 166, 250, 92, 246, 57, 250, 193, 86, 62, 47, 209, 31, 208, - 143, 96, 241, 31, 250, 94, 209, 31, 216, 12, 177, 241, 31, 250, 94, 209, - 31, 208, 143, 86, 241, 31, 250, 94, 209, 31, 227, 218, 183, 241, 31, 250, - 94, 62, 96, 241, 31, 250, 94, 62, 177, 241, 31, 250, 94, 62, 86, 241, 31, - 250, 94, 62, 183, 241, 31, 250, 94, 183, 208, 84, 53, 3, 163, 208, 211, - 227, 212, 183, 208, 84, 53, 3, 163, 208, 211, 216, 5, 177, 208, 84, 53, - 3, 163, 208, 211, 227, 212, 177, 208, 84, 53, 3, 163, 208, 211, 216, 5, - 96, 208, 84, 53, 3, 163, 208, 211, 206, 212, 86, 208, 84, 53, 3, 163, - 208, 211, 206, 212, 96, 208, 84, 53, 3, 163, 208, 211, 242, 68, 86, 208, - 84, 53, 3, 163, 208, 211, 242, 68, 62, 245, 86, 183, 25, 96, 47, 62, 245, - 86, 183, 25, 86, 47, 62, 245, 86, 177, 25, 96, 47, 62, 245, 86, 177, 25, - 86, 47, 62, 245, 86, 96, 25, 177, 47, 62, 245, 86, 86, 25, 177, 47, 62, - 245, 86, 96, 25, 183, 47, 62, 245, 86, 86, 25, 183, 47, 216, 55, 53, 121, - 227, 222, 216, 55, 53, 121, 216, 16, 216, 55, 53, 112, 227, 222, 216, 55, - 53, 112, 216, 16, 216, 55, 53, 49, 206, 224, 216, 55, 53, 50, 206, 224, - 216, 55, 53, 49, 242, 70, 216, 55, 53, 50, 242, 70, 177, 61, 53, 239, - 120, 248, 231, 3, 236, 106, 142, 112, 250, 95, 231, 50, 34, 216, 144, - 247, 233, 248, 248, 98, 3, 157, 203, 196, 43, 203, 196, 43, 26, 203, 196, - 62, 51, 246, 215, 62, 243, 222, 246, 215, 207, 174, 62, 218, 255, 236, - 106, 62, 220, 81, 62, 220, 81, 62, 225, 10, 206, 223, 208, 86, 246, 215, - 62, 225, 10, 242, 69, 208, 86, 246, 215, 62, 225, 10, 227, 217, 208, 86, - 246, 215, 62, 225, 10, 216, 11, 208, 86, 246, 215, 208, 145, 162, 62, - 246, 61, 247, 248, 162, 62, 246, 61, 157, 239, 147, 218, 61, 62, 245, 82, - 215, 198, 157, 239, 147, 218, 61, 62, 245, 82, 61, 239, 147, 218, 61, - 245, 82, 215, 198, 61, 239, 147, 218, 61, 245, 82, 51, 218, 34, 231, 31, - 206, 250, 54, 96, 207, 134, 53, 3, 208, 86, 250, 93, 177, 207, 134, 53, - 3, 208, 86, 250, 93, 86, 207, 134, 53, 3, 208, 86, 250, 93, 183, 207, - 134, 53, 3, 208, 86, 250, 93, 180, 6, 1, 250, 0, 180, 6, 1, 247, 181, - 180, 6, 1, 206, 53, 180, 6, 1, 238, 50, 180, 6, 1, 243, 108, 180, 6, 1, - 203, 24, 180, 6, 1, 202, 64, 180, 6, 1, 241, 250, 180, 6, 1, 202, 89, - 180, 6, 1, 230, 188, 180, 6, 1, 81, 230, 188, 180, 6, 1, 75, 180, 6, 1, - 243, 128, 180, 6, 1, 230, 10, 180, 6, 1, 227, 79, 180, 6, 1, 223, 167, - 180, 6, 1, 223, 69, 180, 6, 1, 220, 20, 180, 6, 1, 218, 56, 180, 6, 1, - 215, 244, 180, 6, 1, 212, 41, 180, 6, 1, 207, 161, 180, 6, 1, 207, 10, - 180, 6, 1, 239, 123, 180, 6, 1, 237, 23, 180, 6, 1, 219, 217, 180, 6, 1, - 219, 34, 180, 6, 1, 212, 202, 180, 6, 1, 207, 255, 180, 6, 1, 246, 104, - 180, 6, 1, 213, 90, 180, 6, 1, 203, 30, 180, 6, 1, 203, 32, 180, 6, 1, - 203, 64, 180, 6, 1, 211, 204, 152, 180, 6, 1, 202, 213, 180, 6, 1, 5, - 202, 183, 180, 6, 1, 5, 202, 184, 3, 209, 248, 180, 6, 1, 202, 247, 180, - 6, 1, 230, 229, 5, 202, 183, 180, 6, 1, 248, 73, 202, 183, 180, 6, 1, - 230, 229, 248, 73, 202, 183, 180, 6, 1, 239, 235, 180, 6, 1, 230, 186, - 180, 6, 1, 212, 201, 180, 6, 1, 208, 60, 63, 180, 6, 1, 227, 252, 223, - 167, 180, 5, 1, 250, 0, 180, 5, 1, 247, 181, 180, 5, 1, 206, 53, 180, 5, - 1, 238, 50, 180, 5, 1, 243, 108, 180, 5, 1, 203, 24, 180, 5, 1, 202, 64, - 180, 5, 1, 241, 250, 180, 5, 1, 202, 89, 180, 5, 1, 230, 188, 180, 5, 1, - 81, 230, 188, 180, 5, 1, 75, 180, 5, 1, 243, 128, 180, 5, 1, 230, 10, - 180, 5, 1, 227, 79, 180, 5, 1, 223, 167, 180, 5, 1, 223, 69, 180, 5, 1, - 220, 20, 180, 5, 1, 218, 56, 180, 5, 1, 215, 244, 180, 5, 1, 212, 41, - 180, 5, 1, 207, 161, 180, 5, 1, 207, 10, 180, 5, 1, 239, 123, 180, 5, 1, - 237, 23, 180, 5, 1, 219, 217, 180, 5, 1, 219, 34, 180, 5, 1, 212, 202, - 180, 5, 1, 207, 255, 180, 5, 1, 246, 104, 180, 5, 1, 213, 90, 180, 5, 1, - 203, 30, 180, 5, 1, 203, 32, 180, 5, 1, 203, 64, 180, 5, 1, 211, 204, - 152, 180, 5, 1, 202, 213, 180, 5, 1, 5, 202, 183, 180, 5, 1, 5, 202, 184, - 3, 209, 248, 180, 5, 1, 202, 247, 180, 5, 1, 230, 229, 5, 202, 183, 180, - 5, 1, 248, 73, 202, 183, 180, 5, 1, 230, 229, 248, 73, 202, 183, 180, 5, - 1, 239, 235, 180, 5, 1, 230, 186, 180, 5, 1, 212, 201, 180, 5, 1, 208, - 60, 63, 180, 5, 1, 227, 252, 223, 167, 8, 6, 1, 228, 131, 3, 52, 142, 8, - 5, 1, 228, 131, 3, 52, 142, 8, 6, 1, 228, 131, 3, 101, 208, 227, 8, 6, 1, - 219, 185, 3, 95, 8, 6, 1, 217, 1, 3, 209, 248, 8, 5, 1, 34, 3, 95, 8, 5, - 1, 210, 70, 3, 243, 228, 95, 8, 6, 1, 237, 172, 3, 244, 20, 8, 5, 1, 237, - 172, 3, 244, 20, 8, 6, 1, 230, 55, 3, 244, 20, 8, 5, 1, 230, 55, 3, 244, - 20, 8, 6, 1, 202, 160, 3, 244, 20, 8, 5, 1, 202, 160, 3, 244, 20, 8, 6, - 1, 251, 2, 8, 6, 1, 226, 186, 3, 113, 8, 6, 1, 207, 174, 63, 8, 6, 1, - 207, 174, 251, 2, 8, 5, 1, 206, 165, 3, 50, 113, 8, 6, 1, 204, 145, 3, - 113, 8, 5, 1, 204, 145, 3, 113, 8, 5, 1, 206, 165, 3, 245, 95, 8, 6, 1, - 162, 237, 171, 8, 5, 1, 162, 237, 171, 8, 5, 1, 209, 246, 218, 192, 8, 5, - 1, 188, 3, 221, 163, 8, 5, 1, 207, 174, 217, 1, 3, 209, 248, 8, 5, 1, - 158, 3, 124, 215, 253, 231, 6, 8, 1, 5, 6, 207, 174, 74, 8, 210, 246, 5, - 1, 230, 184, 65, 1, 6, 206, 164, 8, 6, 1, 215, 94, 3, 210, 169, 209, 248, - 8, 6, 1, 202, 160, 3, 210, 169, 209, 248, 84, 6, 1, 251, 24, 84, 5, 1, - 251, 24, 84, 6, 1, 205, 227, 84, 5, 1, 205, 227, 84, 6, 1, 238, 235, 84, - 5, 1, 238, 235, 84, 6, 1, 244, 180, 84, 5, 1, 244, 180, 84, 6, 1, 241, - 144, 84, 5, 1, 241, 144, 84, 6, 1, 211, 243, 84, 5, 1, 211, 243, 84, 6, - 1, 202, 99, 84, 5, 1, 202, 99, 84, 6, 1, 237, 80, 84, 5, 1, 237, 80, 84, - 6, 1, 209, 72, 84, 5, 1, 209, 72, 84, 6, 1, 235, 168, 84, 5, 1, 235, 168, - 84, 6, 1, 229, 252, 84, 5, 1, 229, 252, 84, 6, 1, 227, 248, 84, 5, 1, - 227, 248, 84, 6, 1, 224, 155, 84, 5, 1, 224, 155, 84, 6, 1, 222, 100, 84, - 5, 1, 222, 100, 84, 6, 1, 228, 225, 84, 5, 1, 228, 225, 84, 6, 1, 78, 84, - 5, 1, 78, 84, 6, 1, 218, 167, 84, 5, 1, 218, 167, 84, 6, 1, 215, 227, 84, - 5, 1, 215, 227, 84, 6, 1, 212, 132, 84, 5, 1, 212, 132, 84, 6, 1, 209, - 207, 84, 5, 1, 209, 207, 84, 6, 1, 207, 39, 84, 5, 1, 207, 39, 84, 6, 1, - 240, 26, 84, 5, 1, 240, 26, 84, 6, 1, 229, 122, 84, 5, 1, 229, 122, 84, - 6, 1, 217, 202, 84, 5, 1, 217, 202, 84, 6, 1, 220, 12, 84, 5, 1, 220, 12, - 84, 6, 1, 243, 226, 251, 30, 84, 5, 1, 243, 226, 251, 30, 84, 6, 1, 38, - 84, 251, 59, 84, 5, 1, 38, 84, 251, 59, 84, 6, 1, 245, 113, 241, 144, 84, - 5, 1, 245, 113, 241, 144, 84, 6, 1, 243, 226, 229, 252, 84, 5, 1, 243, - 226, 229, 252, 84, 6, 1, 243, 226, 222, 100, 84, 5, 1, 243, 226, 222, - 100, 84, 6, 1, 245, 113, 222, 100, 84, 5, 1, 245, 113, 222, 100, 84, 6, - 1, 38, 84, 220, 12, 84, 5, 1, 38, 84, 220, 12, 84, 6, 1, 214, 246, 84, 5, - 1, 214, 246, 84, 6, 1, 245, 128, 213, 35, 84, 5, 1, 245, 128, 213, 35, - 84, 6, 1, 38, 84, 213, 35, 84, 5, 1, 38, 84, 213, 35, 84, 6, 1, 38, 84, - 241, 7, 84, 5, 1, 38, 84, 241, 7, 84, 6, 1, 251, 43, 229, 127, 84, 5, 1, - 251, 43, 229, 127, 84, 6, 1, 243, 226, 236, 107, 84, 5, 1, 243, 226, 236, - 107, 84, 6, 1, 38, 84, 236, 107, 84, 5, 1, 38, 84, 236, 107, 84, 6, 1, - 38, 84, 152, 84, 5, 1, 38, 84, 152, 84, 6, 1, 228, 130, 152, 84, 5, 1, - 228, 130, 152, 84, 6, 1, 38, 84, 237, 42, 84, 5, 1, 38, 84, 237, 42, 84, - 6, 1, 38, 84, 237, 83, 84, 5, 1, 38, 84, 237, 83, 84, 6, 1, 38, 84, 238, - 230, 84, 5, 1, 38, 84, 238, 230, 84, 6, 1, 38, 84, 243, 131, 84, 5, 1, - 38, 84, 243, 131, 84, 6, 1, 38, 84, 213, 1, 84, 5, 1, 38, 84, 213, 1, 84, - 6, 1, 38, 221, 54, 213, 1, 84, 5, 1, 38, 221, 54, 213, 1, 84, 6, 1, 38, - 221, 54, 222, 151, 84, 5, 1, 38, 221, 54, 222, 151, 84, 6, 1, 38, 221, - 54, 220, 248, 84, 5, 1, 38, 221, 54, 220, 248, 84, 6, 1, 38, 221, 54, - 204, 77, 84, 5, 1, 38, 221, 54, 204, 77, 84, 16, 230, 18, 84, 16, 224, - 156, 215, 227, 84, 16, 218, 168, 215, 227, 84, 16, 211, 85, 84, 16, 209, - 208, 215, 227, 84, 16, 229, 123, 215, 227, 84, 16, 213, 2, 212, 132, 84, - 6, 1, 245, 113, 213, 35, 84, 5, 1, 245, 113, 213, 35, 84, 6, 1, 245, 113, - 238, 230, 84, 5, 1, 245, 113, 238, 230, 84, 39, 222, 101, 55, 84, 39, - 211, 197, 250, 67, 84, 39, 211, 197, 227, 186, 84, 6, 1, 248, 16, 229, - 127, 84, 5, 1, 248, 16, 229, 127, 84, 38, 221, 54, 239, 102, 211, 61, 84, - 38, 221, 54, 243, 167, 217, 47, 82, 84, 38, 221, 54, 231, 30, 217, 47, - 82, 84, 38, 221, 54, 206, 40, 243, 141, 84, 239, 138, 118, 237, 137, 84, - 239, 102, 211, 61, 84, 224, 25, 243, 141, 114, 5, 1, 250, 231, 114, 5, 1, - 248, 242, 114, 5, 1, 238, 234, 114, 5, 1, 243, 93, 114, 5, 1, 241, 92, - 114, 5, 1, 205, 213, 114, 5, 1, 202, 87, 114, 5, 1, 209, 230, 114, 5, 1, - 231, 49, 114, 5, 1, 230, 4, 114, 5, 1, 228, 2, 114, 5, 1, 225, 122, 114, - 5, 1, 223, 74, 114, 5, 1, 220, 31, 114, 5, 1, 219, 91, 114, 5, 1, 202, - 76, 114, 5, 1, 216, 202, 114, 5, 1, 214, 243, 114, 5, 1, 209, 218, 114, - 5, 1, 206, 255, 114, 5, 1, 218, 200, 114, 5, 1, 229, 132, 114, 5, 1, 238, - 110, 114, 5, 1, 217, 111, 114, 5, 1, 212, 255, 114, 5, 1, 246, 129, 114, - 5, 1, 247, 61, 114, 5, 1, 230, 133, 114, 5, 1, 246, 68, 114, 5, 1, 246, - 183, 114, 5, 1, 203, 180, 114, 5, 1, 230, 146, 114, 5, 1, 237, 154, 114, - 5, 1, 237, 67, 114, 5, 1, 236, 254, 114, 5, 1, 204, 62, 114, 5, 1, 237, - 92, 114, 5, 1, 236, 132, 114, 5, 1, 202, 249, 114, 5, 1, 251, 98, 208, - 247, 1, 198, 208, 247, 1, 203, 106, 208, 247, 1, 203, 105, 208, 247, 1, - 203, 95, 208, 247, 1, 203, 93, 208, 247, 1, 248, 112, 251, 140, 203, 88, - 208, 247, 1, 203, 88, 208, 247, 1, 203, 103, 208, 247, 1, 203, 100, 208, - 247, 1, 203, 102, 208, 247, 1, 203, 101, 208, 247, 1, 203, 15, 208, 247, - 1, 203, 97, 208, 247, 1, 203, 86, 208, 247, 1, 207, 200, 203, 86, 208, - 247, 1, 203, 83, 208, 247, 1, 203, 91, 208, 247, 1, 248, 112, 251, 140, - 203, 91, 208, 247, 1, 207, 200, 203, 91, 208, 247, 1, 203, 90, 208, 247, - 1, 203, 110, 208, 247, 1, 203, 84, 208, 247, 1, 207, 200, 203, 84, 208, - 247, 1, 203, 73, 208, 247, 1, 207, 200, 203, 73, 208, 247, 1, 203, 11, - 208, 247, 1, 203, 54, 208, 247, 1, 251, 71, 203, 54, 208, 247, 1, 207, - 200, 203, 54, 208, 247, 1, 203, 82, 208, 247, 1, 203, 81, 208, 247, 1, - 203, 78, 208, 247, 1, 207, 200, 203, 92, 208, 247, 1, 207, 200, 203, 76, - 208, 247, 1, 203, 74, 208, 247, 1, 202, 213, 208, 247, 1, 203, 71, 208, - 247, 1, 203, 70, 208, 247, 1, 203, 94, 208, 247, 1, 207, 200, 203, 94, - 208, 247, 1, 250, 4, 203, 94, 208, 247, 1, 203, 69, 208, 247, 1, 203, 67, - 208, 247, 1, 203, 68, 208, 247, 1, 203, 66, 208, 247, 1, 203, 65, 208, - 247, 1, 203, 104, 208, 247, 1, 203, 63, 208, 247, 1, 203, 61, 208, 247, - 1, 203, 60, 208, 247, 1, 203, 58, 208, 247, 1, 203, 55, 208, 247, 1, 209, - 199, 203, 55, 208, 247, 1, 203, 53, 208, 247, 1, 203, 52, 208, 247, 1, - 202, 247, 208, 247, 65, 1, 228, 103, 82, 208, 247, 213, 131, 82, 208, - 247, 109, 230, 96, 33, 4, 227, 48, 33, 4, 224, 81, 33, 4, 215, 225, 33, - 4, 212, 12, 33, 4, 212, 241, 33, 4, 248, 22, 33, 4, 208, 172, 33, 4, 245, - 253, 33, 4, 221, 189, 33, 4, 220, 232, 33, 4, 238, 45, 220, 97, 33, 4, - 202, 16, 33, 4, 243, 111, 33, 4, 244, 89, 33, 4, 230, 100, 33, 4, 209, - 46, 33, 4, 246, 115, 33, 4, 218, 179, 33, 4, 218, 68, 33, 4, 238, 125, - 33, 4, 238, 121, 33, 4, 238, 122, 33, 4, 238, 123, 33, 4, 211, 164, 33, - 4, 211, 119, 33, 4, 211, 132, 33, 4, 211, 163, 33, 4, 211, 137, 33, 4, - 211, 138, 33, 4, 211, 124, 33, 4, 247, 5, 33, 4, 246, 240, 33, 4, 246, - 242, 33, 4, 247, 4, 33, 4, 247, 2, 33, 4, 247, 3, 33, 4, 246, 241, 33, 4, - 201, 235, 33, 4, 201, 213, 33, 4, 201, 226, 33, 4, 201, 234, 33, 4, 201, - 229, 33, 4, 201, 230, 33, 4, 201, 218, 33, 4, 247, 0, 33, 4, 246, 243, - 33, 4, 246, 245, 33, 4, 246, 255, 33, 4, 246, 253, 33, 4, 246, 254, 33, - 4, 246, 244, 33, 4, 217, 13, 33, 4, 217, 3, 33, 4, 217, 9, 33, 4, 217, - 12, 33, 4, 217, 10, 33, 4, 217, 11, 33, 4, 217, 8, 33, 4, 228, 141, 33, - 4, 228, 133, 33, 4, 228, 136, 33, 4, 228, 140, 33, 4, 228, 137, 33, 4, - 228, 138, 33, 4, 228, 134, 33, 4, 203, 140, 33, 4, 203, 127, 33, 4, 203, - 135, 33, 4, 203, 139, 33, 4, 203, 137, 33, 4, 203, 138, 33, 4, 203, 134, - 33, 4, 237, 183, 33, 4, 237, 173, 33, 4, 237, 176, 33, 4, 237, 182, 33, - 4, 237, 178, 33, 4, 237, 179, 33, 4, 237, 175, 39, 36, 1, 248, 162, 39, - 36, 1, 206, 55, 39, 36, 1, 238, 105, 39, 36, 1, 244, 75, 39, 36, 1, 202, - 71, 39, 36, 1, 202, 92, 39, 36, 1, 173, 39, 36, 1, 241, 122, 39, 36, 1, - 241, 103, 39, 36, 1, 241, 92, 39, 36, 1, 78, 39, 36, 1, 219, 34, 39, 36, - 1, 241, 28, 39, 36, 1, 241, 17, 39, 36, 1, 209, 187, 39, 36, 1, 152, 39, - 36, 1, 208, 14, 39, 36, 1, 246, 170, 39, 36, 1, 213, 90, 39, 36, 1, 213, - 46, 39, 36, 1, 239, 235, 39, 36, 1, 241, 13, 39, 36, 1, 63, 39, 36, 1, - 231, 110, 39, 36, 1, 243, 129, 39, 36, 1, 224, 43, 207, 14, 39, 36, 1, - 203, 66, 39, 36, 1, 202, 213, 39, 36, 1, 230, 228, 63, 39, 36, 1, 227, - 86, 202, 183, 39, 36, 1, 248, 73, 202, 183, 39, 36, 1, 230, 228, 248, 73, - 202, 183, 50, 250, 218, 210, 241, 225, 88, 50, 250, 218, 242, 83, 210, - 241, 225, 88, 49, 210, 241, 155, 50, 210, 241, 155, 49, 242, 83, 210, - 241, 155, 50, 242, 83, 210, 241, 155, 216, 188, 230, 249, 225, 88, 216, - 188, 242, 83, 230, 249, 225, 88, 242, 83, 208, 103, 225, 88, 49, 208, - 103, 155, 50, 208, 103, 155, 216, 188, 211, 177, 49, 216, 188, 220, 33, - 155, 50, 216, 188, 220, 33, 155, 241, 162, 245, 163, 219, 87, 239, 161, - 219, 87, 216, 73, 239, 161, 219, 87, 235, 217, 242, 83, 220, 92, 183, - 250, 227, 177, 250, 227, 242, 83, 216, 11, 250, 217, 52, 220, 89, 235, - 220, 230, 239, 230, 247, 219, 135, 247, 223, 235, 221, 3, 243, 231, 208, - 228, 3, 215, 253, 55, 49, 124, 219, 79, 155, 50, 124, 219, 79, 155, 208, - 228, 3, 70, 55, 208, 228, 3, 70, 56, 49, 80, 248, 231, 3, 217, 41, 50, - 80, 248, 231, 3, 217, 41, 208, 145, 49, 162, 155, 208, 145, 50, 162, 155, - 247, 248, 49, 162, 155, 247, 248, 50, 162, 155, 49, 212, 154, 106, 155, - 50, 212, 154, 106, 155, 49, 52, 219, 76, 50, 52, 219, 76, 120, 187, 115, - 118, 70, 217, 178, 118, 70, 115, 120, 187, 217, 178, 103, 239, 147, 70, - 217, 178, 239, 233, 70, 82, 216, 73, 217, 47, 82, 80, 208, 227, 215, 253, - 218, 62, 203, 238, 213, 131, 101, 243, 85, 207, 174, 245, 233, 216, 188, - 243, 85, 216, 188, 245, 233, 207, 174, 213, 143, 244, 196, 3, 49, 237, - 224, 244, 196, 3, 50, 237, 224, 207, 174, 244, 195, 208, 145, 162, 214, - 168, 54, 207, 135, 244, 144, 209, 30, 244, 144, 211, 76, 239, 102, 211, - 61, 80, 212, 88, 243, 83, 204, 21, 80, 227, 114, 247, 46, 52, 235, 220, - 216, 73, 245, 233, 52, 226, 252, 217, 31, 82, 12, 40, 216, 100, 12, 40, - 246, 26, 12, 40, 214, 171, 105, 12, 40, 214, 171, 108, 12, 40, 214, 171, - 147, 12, 40, 218, 229, 12, 40, 247, 233, 12, 40, 210, 8, 12, 40, 229, 34, - 105, 12, 40, 229, 34, 108, 12, 40, 243, 138, 12, 40, 214, 175, 12, 40, 5, - 105, 12, 40, 5, 108, 12, 40, 228, 23, 105, 12, 40, 228, 23, 108, 12, 40, - 228, 23, 147, 12, 40, 228, 23, 149, 12, 40, 212, 24, 12, 40, 209, 33, 12, - 40, 212, 22, 105, 12, 40, 212, 22, 108, 12, 40, 237, 56, 105, 12, 40, - 237, 56, 108, 12, 40, 237, 123, 12, 40, 216, 178, 12, 40, 246, 112, 12, - 40, 210, 214, 12, 40, 224, 29, 12, 40, 244, 73, 12, 40, 224, 20, 12, 40, - 246, 44, 12, 40, 204, 81, 105, 12, 40, 204, 81, 108, 12, 40, 239, 249, - 12, 40, 219, 46, 105, 12, 40, 219, 46, 108, 12, 40, 212, 127, 162, 208, - 96, 208, 25, 12, 40, 245, 149, 12, 40, 243, 102, 12, 40, 230, 176, 12, - 40, 248, 15, 76, 246, 10, 12, 40, 240, 191, 12, 40, 211, 199, 105, 12, - 40, 211, 199, 108, 12, 40, 248, 244, 12, 40, 212, 134, 12, 40, 247, 122, - 212, 134, 12, 40, 222, 220, 105, 12, 40, 222, 220, 108, 12, 40, 222, 220, - 147, 12, 40, 222, 220, 149, 12, 40, 224, 227, 12, 40, 213, 37, 12, 40, - 216, 184, 12, 40, 240, 219, 12, 40, 220, 45, 12, 40, 247, 201, 105, 12, - 40, 247, 201, 108, 12, 40, 225, 15, 12, 40, 224, 24, 12, 40, 238, 1, 105, - 12, 40, 238, 1, 108, 12, 40, 238, 1, 147, 12, 40, 208, 245, 12, 40, 246, - 9, 12, 40, 204, 46, 105, 12, 40, 204, 46, 108, 12, 40, 247, 122, 214, - 165, 12, 40, 212, 127, 236, 53, 12, 40, 236, 53, 12, 40, 247, 122, 211, - 211, 12, 40, 247, 122, 213, 32, 12, 40, 239, 172, 12, 40, 247, 122, 247, - 23, 12, 40, 212, 127, 204, 101, 12, 40, 204, 102, 105, 12, 40, 204, 102, - 108, 12, 40, 246, 47, 12, 40, 247, 122, 238, 31, 12, 40, 163, 105, 12, - 40, 163, 108, 12, 40, 247, 122, 227, 28, 12, 40, 247, 122, 238, 216, 12, - 40, 224, 16, 105, 12, 40, 224, 16, 108, 12, 40, 216, 190, 12, 40, 248, - 25, 12, 40, 247, 122, 209, 224, 227, 228, 12, 40, 247, 122, 227, 229, 12, - 40, 247, 122, 204, 16, 12, 40, 247, 122, 239, 190, 12, 40, 241, 173, 105, - 12, 40, 241, 173, 108, 12, 40, 241, 173, 147, 12, 40, 247, 122, 241, 172, - 12, 40, 237, 64, 12, 40, 247, 122, 236, 49, 12, 40, 248, 11, 12, 40, 238, - 89, 12, 40, 247, 122, 239, 243, 12, 40, 247, 122, 248, 60, 12, 40, 247, - 122, 215, 1, 12, 40, 212, 127, 204, 38, 12, 40, 212, 127, 203, 44, 12, - 40, 247, 122, 239, 121, 12, 40, 230, 183, 240, 224, 12, 40, 247, 122, - 240, 224, 12, 40, 230, 183, 208, 146, 12, 40, 247, 122, 208, 146, 12, 40, - 230, 183, 242, 61, 12, 40, 247, 122, 242, 61, 12, 40, 207, 171, 12, 40, - 230, 183, 207, 171, 12, 40, 247, 122, 207, 171, 71, 40, 105, 71, 40, 227, - 114, 71, 40, 243, 85, 71, 40, 212, 57, 71, 40, 214, 170, 71, 40, 113, 71, - 40, 108, 71, 40, 227, 143, 71, 40, 225, 122, 71, 40, 227, 207, 71, 40, - 241, 67, 71, 40, 199, 71, 40, 121, 247, 233, 71, 40, 245, 151, 71, 40, - 235, 162, 71, 40, 210, 8, 71, 40, 171, 247, 233, 71, 40, 229, 33, 71, 40, - 218, 16, 71, 40, 203, 228, 71, 40, 211, 190, 71, 40, 50, 171, 247, 233, - 71, 40, 236, 255, 241, 87, 71, 40, 209, 152, 71, 40, 243, 138, 71, 40, - 214, 175, 71, 40, 246, 26, 71, 40, 217, 226, 71, 40, 251, 80, 71, 40, - 224, 7, 71, 40, 241, 87, 71, 40, 241, 179, 71, 40, 214, 197, 71, 40, 238, - 39, 71, 40, 238, 40, 212, 38, 71, 40, 240, 223, 71, 40, 248, 72, 71, 40, - 203, 250, 71, 40, 246, 133, 71, 40, 215, 207, 71, 40, 231, 45, 71, 40, - 212, 36, 71, 40, 228, 22, 71, 40, 245, 161, 71, 40, 211, 181, 71, 40, - 224, 12, 71, 40, 215, 241, 71, 40, 203, 235, 71, 40, 220, 25, 71, 40, - 207, 180, 71, 40, 242, 44, 71, 40, 212, 228, 209, 33, 71, 40, 242, 83, - 246, 26, 71, 40, 163, 211, 38, 71, 40, 120, 237, 99, 71, 40, 212, 234, - 71, 40, 247, 240, 71, 40, 212, 21, 71, 40, 247, 205, 71, 40, 211, 75, 71, - 40, 237, 55, 71, 40, 237, 138, 71, 40, 243, 88, 71, 40, 237, 123, 71, 40, - 247, 223, 71, 40, 216, 178, 71, 40, 214, 183, 71, 40, 243, 169, 71, 40, - 250, 9, 71, 40, 211, 177, 71, 40, 221, 165, 71, 40, 210, 214, 71, 40, - 214, 208, 71, 40, 224, 29, 71, 40, 208, 95, 71, 40, 228, 99, 71, 40, 211, - 61, 71, 40, 244, 73, 71, 40, 204, 61, 71, 40, 243, 114, 221, 165, 71, 40, - 245, 229, 71, 40, 239, 95, 71, 40, 246, 38, 71, 40, 211, 80, 71, 40, 204, - 80, 71, 40, 239, 249, 71, 40, 246, 34, 71, 40, 240, 67, 71, 40, 52, 203, - 196, 71, 40, 162, 208, 96, 208, 25, 71, 40, 212, 50, 71, 40, 240, 79, 71, - 40, 245, 149, 71, 40, 243, 102, 71, 40, 217, 223, 71, 40, 230, 176, 71, - 40, 224, 249, 71, 40, 208, 226, 71, 40, 210, 164, 71, 40, 227, 137, 71, - 40, 206, 191, 71, 40, 240, 24, 71, 40, 248, 15, 76, 246, 10, 71, 40, 212, - 158, 71, 40, 242, 83, 209, 144, 71, 40, 204, 33, 71, 40, 212, 65, 71, 40, - 243, 156, 71, 40, 240, 191, 71, 40, 211, 214, 71, 40, 47, 71, 40, 211, - 63, 71, 40, 211, 198, 71, 40, 208, 118, 71, 40, 238, 10, 71, 40, 247, 10, - 71, 40, 211, 98, 71, 40, 248, 244, 71, 40, 216, 52, 71, 40, 212, 134, 71, - 40, 230, 168, 71, 40, 222, 219, 71, 40, 213, 37, 71, 40, 240, 55, 71, 40, - 220, 45, 71, 40, 250, 226, 71, 40, 218, 83, 71, 40, 241, 183, 71, 40, - 247, 200, 71, 40, 225, 15, 71, 40, 224, 104, 71, 40, 213, 149, 71, 40, - 250, 98, 71, 40, 224, 24, 71, 40, 208, 150, 71, 40, 219, 252, 71, 40, - 248, 19, 71, 40, 211, 59, 71, 40, 245, 241, 71, 40, 238, 0, 71, 40, 208, - 245, 71, 40, 231, 9, 71, 40, 248, 31, 71, 40, 204, 102, 241, 87, 71, 40, - 246, 9, 71, 40, 204, 45, 71, 40, 214, 165, 71, 40, 236, 53, 71, 40, 211, - 211, 71, 40, 206, 79, 71, 40, 248, 157, 71, 40, 218, 131, 71, 40, 249, - 13, 71, 40, 213, 32, 71, 40, 216, 137, 71, 40, 215, 128, 71, 40, 239, - 172, 71, 40, 248, 17, 71, 40, 247, 23, 71, 40, 248, 48, 71, 40, 224, 26, - 71, 40, 204, 101, 71, 40, 246, 47, 71, 40, 204, 12, 71, 40, 243, 149, 71, - 40, 205, 214, 71, 40, 238, 31, 71, 40, 227, 28, 71, 40, 238, 216, 71, 40, - 224, 15, 71, 40, 212, 56, 71, 40, 212, 228, 209, 247, 248, 60, 71, 40, - 216, 190, 71, 40, 248, 25, 71, 40, 203, 219, 71, 40, 240, 102, 71, 40, - 227, 228, 71, 40, 209, 224, 227, 228, 71, 40, 227, 224, 71, 40, 211, 240, - 71, 40, 227, 229, 71, 40, 204, 16, 71, 40, 239, 190, 71, 40, 241, 172, - 71, 40, 237, 64, 71, 40, 239, 136, 71, 40, 236, 49, 71, 40, 248, 11, 71, - 40, 209, 233, 71, 40, 237, 145, 71, 40, 240, 17, 71, 40, 215, 30, 204, - 12, 71, 40, 247, 12, 71, 40, 238, 89, 71, 40, 239, 243, 71, 40, 248, 60, - 71, 40, 215, 1, 71, 40, 244, 58, 71, 40, 204, 38, 71, 40, 237, 34, 71, - 40, 203, 44, 71, 40, 224, 115, 71, 40, 248, 43, 71, 40, 241, 99, 71, 40, - 239, 121, 71, 40, 208, 67, 71, 40, 242, 46, 71, 40, 216, 172, 71, 40, - 221, 167, 71, 40, 240, 224, 71, 40, 208, 146, 71, 40, 242, 61, 71, 40, - 207, 171, 71, 40, 239, 193, 139, 244, 18, 167, 49, 208, 173, 216, 16, - 139, 244, 18, 167, 87, 208, 173, 56, 139, 244, 18, 167, 49, 208, 173, - 101, 25, 216, 16, 139, 244, 18, 167, 87, 208, 173, 101, 25, 56, 139, 244, - 18, 167, 239, 102, 210, 186, 139, 244, 18, 167, 210, 187, 239, 120, 55, - 139, 244, 18, 167, 210, 187, 239, 120, 56, 139, 244, 18, 167, 210, 187, - 239, 120, 227, 222, 139, 244, 18, 167, 210, 187, 239, 120, 206, 221, 227, - 222, 139, 244, 18, 167, 210, 187, 239, 120, 206, 221, 216, 16, 139, 244, - 18, 167, 210, 187, 239, 120, 226, 251, 227, 222, 139, 244, 18, 167, 219, - 202, 139, 211, 228, 139, 245, 233, 139, 239, 102, 211, 61, 243, 146, 82, - 230, 169, 231, 29, 211, 97, 97, 139, 230, 199, 82, 139, 246, 12, 82, 139, - 42, 202, 84, 49, 250, 218, 155, 50, 250, 218, 155, 49, 52, 250, 218, 155, - 50, 52, 250, 218, 155, 49, 245, 166, 155, 50, 245, 166, 155, 49, 61, 245, - 166, 155, 50, 61, 245, 166, 155, 49, 62, 227, 185, 155, 50, 62, 227, 185, - 155, 218, 29, 82, 238, 158, 82, 49, 208, 133, 213, 33, 155, 50, 208, 133, - 213, 33, 155, 49, 61, 227, 185, 155, 50, 61, 227, 185, 155, 49, 61, 208, - 133, 213, 33, 155, 50, 61, 208, 133, 213, 33, 155, 49, 61, 51, 155, 50, - 61, 51, 155, 204, 76, 244, 144, 216, 73, 52, 217, 237, 217, 31, 82, 52, - 217, 237, 217, 31, 82, 124, 52, 217, 237, 217, 31, 82, 218, 29, 131, 240, - 102, 237, 97, 221, 44, 105, 237, 97, 221, 44, 108, 237, 97, 221, 44, 147, - 237, 97, 221, 44, 149, 237, 97, 221, 44, 170, 237, 97, 221, 44, 195, 237, - 97, 221, 44, 213, 111, 237, 97, 221, 44, 199, 237, 97, 221, 44, 222, 63, - 139, 227, 167, 143, 82, 139, 215, 245, 143, 82, 139, 244, 27, 143, 82, - 139, 241, 66, 143, 82, 28, 212, 120, 70, 143, 82, 28, 52, 70, 143, 82, - 204, 72, 244, 144, 80, 230, 3, 216, 101, 82, 80, 230, 3, 216, 101, 3, - 205, 186, 211, 241, 82, 80, 230, 3, 216, 101, 131, 206, 221, 237, 137, - 80, 230, 3, 216, 101, 3, 205, 186, 211, 241, 131, 206, 221, 237, 137, 80, - 230, 3, 216, 101, 131, 226, 251, 237, 137, 43, 218, 29, 82, 139, 209, - 164, 227, 115, 240, 52, 213, 131, 97, 237, 97, 221, 44, 209, 152, 237, - 97, 221, 44, 207, 151, 237, 97, 221, 44, 209, 53, 80, 139, 230, 199, 82, - 225, 72, 82, 219, 71, 250, 251, 82, 139, 57, 231, 31, 139, 162, 240, 10, - 211, 228, 172, 1, 5, 63, 172, 1, 63, 172, 1, 5, 75, 172, 1, 75, 172, 1, - 5, 68, 172, 1, 68, 172, 1, 5, 74, 172, 1, 74, 172, 1, 5, 78, 172, 1, 78, - 172, 1, 173, 172, 1, 239, 8, 172, 1, 229, 100, 172, 1, 238, 81, 172, 1, - 228, 209, 172, 1, 237, 230, 172, 1, 229, 201, 172, 1, 238, 190, 172, 1, - 229, 26, 172, 1, 238, 39, 172, 1, 215, 36, 172, 1, 202, 116, 172, 1, 212, - 162, 172, 1, 202, 39, 172, 1, 211, 10, 172, 1, 202, 6, 172, 1, 214, 177, - 172, 1, 202, 92, 172, 1, 212, 13, 172, 1, 202, 17, 172, 1, 210, 22, 172, - 1, 244, 212, 172, 1, 209, 2, 172, 1, 243, 233, 172, 1, 5, 207, 203, 172, - 1, 207, 203, 172, 1, 242, 42, 172, 1, 209, 187, 172, 1, 244, 75, 172, 1, - 135, 172, 1, 243, 113, 172, 1, 201, 201, 172, 1, 222, 100, 172, 1, 221, - 84, 172, 1, 222, 240, 172, 1, 221, 191, 172, 1, 152, 172, 1, 249, 32, - 172, 1, 185, 172, 1, 237, 3, 172, 1, 248, 86, 172, 1, 218, 167, 172, 1, - 236, 26, 172, 1, 247, 193, 172, 1, 217, 191, 172, 1, 237, 67, 172, 1, - 248, 162, 172, 1, 219, 34, 172, 1, 236, 136, 172, 1, 248, 23, 172, 1, - 218, 69, 172, 1, 192, 172, 1, 224, 155, 172, 1, 223, 246, 172, 1, 225, - 20, 172, 1, 224, 82, 172, 1, 5, 198, 172, 1, 198, 172, 1, 5, 202, 213, - 172, 1, 202, 213, 172, 1, 5, 202, 247, 172, 1, 202, 247, 172, 1, 216, - 220, 172, 1, 216, 57, 172, 1, 215, 145, 172, 1, 216, 158, 172, 1, 215, - 227, 172, 1, 5, 204, 111, 172, 1, 204, 111, 172, 1, 204, 30, 172, 1, 204, - 62, 172, 1, 204, 0, 172, 1, 223, 163, 172, 1, 204, 163, 172, 1, 5, 173, - 172, 1, 5, 229, 201, 39, 229, 225, 205, 186, 211, 241, 82, 39, 229, 225, - 213, 148, 211, 241, 82, 229, 225, 205, 186, 211, 241, 82, 229, 225, 213, - 148, 211, 241, 82, 172, 230, 199, 82, 172, 205, 186, 230, 199, 82, 172, - 243, 192, 202, 228, 229, 225, 52, 235, 220, 67, 1, 5, 63, 67, 1, 63, 67, - 1, 5, 75, 67, 1, 75, 67, 1, 5, 68, 67, 1, 68, 67, 1, 5, 74, 67, 1, 74, - 67, 1, 5, 78, 67, 1, 78, 67, 1, 173, 67, 1, 239, 8, 67, 1, 229, 100, 67, - 1, 238, 81, 67, 1, 228, 209, 67, 1, 237, 230, 67, 1, 229, 201, 67, 1, - 238, 190, 67, 1, 229, 26, 67, 1, 238, 39, 67, 1, 215, 36, 67, 1, 202, - 116, 67, 1, 212, 162, 67, 1, 202, 39, 67, 1, 211, 10, 67, 1, 202, 6, 67, - 1, 214, 177, 67, 1, 202, 92, 67, 1, 212, 13, 67, 1, 202, 17, 67, 1, 210, - 22, 67, 1, 244, 212, 67, 1, 209, 2, 67, 1, 243, 233, 67, 1, 5, 207, 203, - 67, 1, 207, 203, 67, 1, 242, 42, 67, 1, 209, 187, 67, 1, 244, 75, 67, 1, - 135, 67, 1, 243, 113, 67, 1, 201, 201, 67, 1, 222, 100, 67, 1, 221, 84, - 67, 1, 222, 240, 67, 1, 221, 191, 67, 1, 152, 67, 1, 249, 32, 67, 1, 185, - 67, 1, 237, 3, 67, 1, 248, 86, 67, 1, 218, 167, 67, 1, 236, 26, 67, 1, - 247, 193, 67, 1, 217, 191, 67, 1, 237, 67, 67, 1, 248, 162, 67, 1, 219, - 34, 67, 1, 236, 136, 67, 1, 248, 23, 67, 1, 218, 69, 67, 1, 192, 67, 1, - 224, 155, 67, 1, 223, 246, 67, 1, 225, 20, 67, 1, 224, 82, 67, 1, 5, 198, - 67, 1, 198, 67, 1, 5, 202, 213, 67, 1, 202, 213, 67, 1, 5, 202, 247, 67, - 1, 202, 247, 67, 1, 216, 220, 67, 1, 216, 57, 67, 1, 215, 145, 67, 1, - 216, 158, 67, 1, 215, 227, 67, 1, 5, 204, 111, 67, 1, 204, 111, 67, 1, - 204, 30, 67, 1, 204, 62, 67, 1, 204, 0, 67, 1, 223, 163, 67, 1, 204, 163, - 67, 1, 5, 173, 67, 1, 5, 229, 201, 67, 1, 206, 86, 67, 1, 205, 230, 67, - 1, 206, 55, 67, 1, 205, 189, 67, 101, 243, 85, 229, 225, 217, 215, 211, - 241, 82, 67, 230, 199, 82, 67, 205, 186, 230, 199, 82, 67, 243, 192, 228, - 249, 248, 1, 1, 249, 255, 248, 1, 1, 219, 184, 248, 1, 1, 226, 185, 248, - 1, 1, 240, 174, 248, 1, 1, 245, 51, 248, 1, 1, 210, 69, 248, 1, 1, 223, - 163, 248, 1, 1, 159, 248, 1, 1, 239, 75, 248, 1, 1, 230, 54, 248, 1, 1, - 237, 171, 248, 1, 1, 230, 184, 248, 1, 1, 217, 134, 248, 1, 1, 203, 196, - 248, 1, 1, 202, 81, 248, 1, 1, 246, 200, 248, 1, 1, 213, 92, 248, 1, 1, - 146, 248, 1, 1, 202, 159, 248, 1, 1, 247, 125, 248, 1, 1, 194, 248, 1, 1, - 63, 248, 1, 1, 78, 248, 1, 1, 74, 248, 1, 1, 241, 147, 248, 1, 1, 251, - 64, 248, 1, 1, 241, 145, 248, 1, 1, 250, 34, 248, 1, 1, 219, 216, 248, 1, - 1, 250, 231, 248, 1, 1, 241, 92, 248, 1, 1, 250, 223, 248, 1, 1, 241, 78, - 248, 1, 1, 241, 28, 248, 1, 1, 75, 248, 1, 1, 68, 248, 1, 1, 230, 197, - 248, 1, 1, 206, 164, 248, 1, 1, 222, 205, 248, 1, 1, 238, 43, 248, 1, 1, - 231, 84, 28, 1, 229, 59, 28, 1, 211, 156, 28, 1, 229, 52, 28, 1, 222, 93, - 28, 1, 222, 91, 28, 1, 222, 90, 28, 1, 208, 240, 28, 1, 211, 145, 28, 1, - 216, 47, 28, 1, 216, 42, 28, 1, 216, 39, 28, 1, 216, 32, 28, 1, 216, 27, - 28, 1, 216, 22, 28, 1, 216, 33, 28, 1, 216, 45, 28, 1, 224, 141, 28, 1, - 218, 153, 28, 1, 211, 153, 28, 1, 218, 142, 28, 1, 212, 111, 28, 1, 211, - 150, 28, 1, 231, 106, 28, 1, 246, 74, 28, 1, 211, 160, 28, 1, 246, 138, - 28, 1, 229, 120, 28, 1, 209, 66, 28, 1, 218, 190, 28, 1, 236, 251, 28, 1, - 63, 28, 1, 251, 109, 28, 1, 198, 28, 1, 203, 99, 28, 1, 241, 55, 28, 1, - 74, 28, 1, 203, 39, 28, 1, 203, 52, 28, 1, 78, 28, 1, 204, 111, 28, 1, - 204, 107, 28, 1, 220, 73, 28, 1, 202, 247, 28, 1, 68, 28, 1, 204, 48, 28, - 1, 204, 62, 28, 1, 204, 30, 28, 1, 202, 213, 28, 1, 240, 238, 28, 1, 203, - 11, 28, 1, 75, 28, 240, 7, 28, 1, 211, 154, 28, 1, 222, 83, 28, 1, 222, - 85, 28, 1, 222, 88, 28, 1, 216, 40, 28, 1, 216, 21, 28, 1, 216, 29, 28, - 1, 216, 34, 28, 1, 216, 19, 28, 1, 224, 134, 28, 1, 224, 131, 28, 1, 224, - 135, 28, 1, 229, 246, 28, 1, 218, 148, 28, 1, 218, 134, 28, 1, 218, 140, - 28, 1, 218, 137, 28, 1, 218, 151, 28, 1, 218, 135, 28, 1, 229, 244, 28, - 1, 229, 242, 28, 1, 212, 104, 28, 1, 212, 102, 28, 1, 212, 94, 28, 1, - 212, 99, 28, 1, 212, 109, 28, 1, 219, 107, 28, 1, 211, 157, 28, 1, 203, - 29, 28, 1, 203, 25, 28, 1, 203, 26, 28, 1, 229, 245, 28, 1, 211, 158, 28, - 1, 203, 35, 28, 1, 202, 241, 28, 1, 202, 240, 28, 1, 202, 243, 28, 1, - 202, 204, 28, 1, 202, 205, 28, 1, 202, 208, 28, 1, 250, 137, 28, 1, 250, - 131, 139, 250, 205, 227, 103, 82, 139, 250, 205, 216, 74, 82, 139, 250, - 205, 118, 82, 139, 250, 205, 120, 82, 139, 250, 205, 126, 82, 139, 250, - 205, 239, 147, 82, 139, 250, 205, 208, 145, 82, 139, 250, 205, 101, 82, - 139, 250, 205, 247, 248, 82, 139, 250, 205, 239, 245, 82, 139, 250, 205, - 214, 171, 82, 139, 250, 205, 209, 61, 82, 139, 250, 205, 239, 140, 82, - 139, 250, 205, 237, 52, 82, 139, 250, 205, 241, 180, 82, 139, 250, 205, - 225, 123, 82, 248, 1, 1, 247, 193, 248, 1, 1, 202, 39, 248, 1, 1, 230, - 141, 248, 1, 1, 237, 230, 248, 1, 1, 241, 161, 248, 1, 1, 241, 75, 248, - 1, 1, 220, 18, 248, 1, 1, 220, 22, 248, 1, 1, 230, 224, 248, 1, 1, 250, - 207, 248, 1, 1, 231, 16, 248, 1, 1, 206, 229, 248, 1, 1, 231, 66, 248, 1, - 1, 222, 183, 248, 1, 1, 251, 58, 248, 1, 1, 250, 29, 248, 1, 1, 250, 247, - 248, 1, 1, 220, 39, 248, 1, 1, 220, 24, 248, 1, 1, 231, 13, 248, 1, 46, - 1, 219, 184, 248, 1, 46, 1, 210, 69, 248, 1, 46, 1, 230, 54, 248, 1, 46, - 1, 237, 171, 248, 1, 1, 238, 120, 248, 1, 1, 227, 162, 248, 1, 1, 201, - 242, 12, 211, 32, 210, 69, 12, 211, 32, 204, 41, 12, 211, 32, 203, 171, - 12, 211, 32, 247, 138, 12, 211, 32, 210, 173, 12, 211, 32, 235, 210, 12, - 211, 32, 235, 214, 12, 211, 32, 236, 35, 12, 211, 32, 235, 211, 12, 211, - 32, 210, 72, 12, 211, 32, 235, 213, 12, 211, 32, 235, 209, 12, 211, 32, - 236, 33, 12, 211, 32, 235, 212, 12, 211, 32, 235, 208, 12, 211, 32, 223, - 163, 12, 211, 32, 237, 171, 12, 211, 32, 194, 12, 211, 32, 219, 184, 12, - 211, 32, 211, 231, 12, 211, 32, 245, 51, 12, 211, 32, 235, 215, 12, 211, - 32, 237, 13, 12, 211, 32, 210, 81, 12, 211, 32, 210, 152, 12, 211, 32, - 211, 108, 12, 211, 32, 213, 98, 12, 211, 32, 219, 38, 12, 211, 32, 217, - 136, 12, 211, 32, 208, 174, 12, 211, 32, 210, 71, 12, 211, 32, 210, 163, - 12, 211, 32, 235, 223, 12, 211, 32, 235, 207, 12, 211, 32, 218, 210, 12, - 211, 32, 217, 134, 67, 1, 5, 228, 209, 67, 1, 5, 212, 162, 67, 1, 5, 211, - 10, 67, 1, 5, 135, 67, 1, 5, 221, 84, 67, 1, 5, 152, 67, 1, 5, 237, 3, - 67, 1, 5, 236, 26, 67, 1, 5, 237, 67, 67, 1, 5, 236, 136, 67, 1, 5, 223, - 246, 67, 1, 5, 216, 220, 67, 1, 5, 216, 57, 67, 1, 5, 215, 145, 67, 1, 5, - 216, 158, 67, 1, 5, 215, 227, 102, 28, 229, 59, 102, 28, 222, 93, 102, - 28, 208, 240, 102, 28, 216, 47, 102, 28, 224, 141, 102, 28, 218, 153, - 102, 28, 212, 111, 102, 28, 231, 106, 102, 28, 246, 74, 102, 28, 246, - 138, 102, 28, 229, 120, 102, 28, 209, 66, 102, 28, 218, 190, 102, 28, - 236, 251, 102, 28, 229, 60, 63, 102, 28, 222, 94, 63, 102, 28, 208, 241, - 63, 102, 28, 216, 48, 63, 102, 28, 224, 142, 63, 102, 28, 218, 154, 63, - 102, 28, 212, 112, 63, 102, 28, 231, 107, 63, 102, 28, 246, 75, 63, 102, - 28, 246, 139, 63, 102, 28, 229, 121, 63, 102, 28, 209, 67, 63, 102, 28, - 218, 191, 63, 102, 28, 236, 252, 63, 102, 28, 246, 75, 68, 102, 228, 253, - 167, 220, 54, 102, 228, 253, 167, 158, 236, 26, 102, 189, 105, 102, 189, - 108, 102, 189, 147, 102, 189, 149, 102, 189, 170, 102, 189, 195, 102, - 189, 213, 111, 102, 189, 199, 102, 189, 222, 63, 102, 189, 209, 152, 102, - 189, 224, 29, 102, 189, 239, 249, 102, 189, 204, 80, 102, 189, 203, 243, - 102, 189, 224, 220, 102, 189, 241, 179, 102, 189, 210, 214, 102, 189, - 211, 64, 102, 189, 237, 74, 102, 189, 212, 9, 102, 189, 223, 84, 102, - 189, 211, 213, 102, 189, 240, 4, 102, 189, 245, 211, 102, 189, 228, 102, - 102, 189, 216, 95, 102, 189, 247, 71, 102, 189, 211, 14, 102, 189, 210, - 196, 102, 189, 241, 65, 102, 189, 216, 87, 102, 189, 251, 10, 102, 189, - 240, 33, 102, 189, 216, 85, 102, 189, 213, 149, 102, 189, 216, 157, 43, - 189, 217, 46, 43, 189, 229, 83, 43, 189, 214, 195, 43, 189, 228, 249, 43, - 42, 209, 153, 220, 32, 62, 211, 177, 43, 42, 207, 152, 220, 32, 62, 211, - 177, 43, 42, 209, 54, 220, 32, 62, 211, 177, 43, 42, 239, 154, 220, 32, - 62, 211, 177, 43, 42, 240, 19, 220, 32, 62, 211, 177, 43, 42, 212, 75, - 220, 32, 62, 211, 177, 43, 42, 213, 106, 220, 32, 62, 211, 177, 43, 42, - 241, 135, 220, 32, 62, 211, 177, 219, 67, 54, 43, 42, 207, 152, 105, 43, - 42, 207, 152, 108, 43, 42, 207, 152, 147, 43, 42, 207, 152, 149, 43, 42, - 207, 152, 170, 43, 42, 207, 152, 195, 43, 42, 207, 152, 213, 111, 43, 42, - 207, 152, 199, 43, 42, 207, 152, 222, 63, 43, 42, 209, 53, 43, 42, 209, - 54, 105, 43, 42, 209, 54, 108, 43, 42, 209, 54, 147, 43, 42, 209, 54, - 149, 43, 42, 209, 54, 170, 43, 28, 229, 59, 43, 28, 222, 93, 43, 28, 208, - 240, 43, 28, 216, 47, 43, 28, 224, 141, 43, 28, 218, 153, 43, 28, 212, - 111, 43, 28, 231, 106, 43, 28, 246, 74, 43, 28, 246, 138, 43, 28, 229, - 120, 43, 28, 209, 66, 43, 28, 218, 190, 43, 28, 236, 251, 43, 28, 229, - 60, 63, 43, 28, 222, 94, 63, 43, 28, 208, 241, 63, 43, 28, 216, 48, 63, - 43, 28, 224, 142, 63, 43, 28, 218, 154, 63, 43, 28, 212, 112, 63, 43, 28, - 231, 107, 63, 43, 28, 246, 75, 63, 43, 28, 246, 139, 63, 43, 28, 229, - 121, 63, 43, 28, 209, 67, 63, 43, 28, 218, 191, 63, 43, 28, 236, 252, 63, - 43, 228, 253, 167, 246, 189, 43, 228, 253, 167, 230, 78, 43, 28, 231, - 107, 68, 228, 253, 211, 97, 97, 43, 189, 105, 43, 189, 108, 43, 189, 147, - 43, 189, 149, 43, 189, 170, 43, 189, 195, 43, 189, 213, 111, 43, 189, - 199, 43, 189, 222, 63, 43, 189, 209, 152, 43, 189, 224, 29, 43, 189, 239, - 249, 43, 189, 204, 80, 43, 189, 203, 243, 43, 189, 224, 220, 43, 189, - 241, 179, 43, 189, 210, 214, 43, 189, 211, 64, 43, 189, 237, 74, 43, 189, - 212, 9, 43, 189, 223, 84, 43, 189, 211, 213, 43, 189, 240, 4, 43, 189, - 245, 211, 43, 189, 228, 102, 43, 189, 214, 169, 43, 189, 225, 126, 43, - 189, 240, 42, 43, 189, 210, 226, 43, 189, 240, 216, 43, 189, 217, 233, - 43, 189, 250, 38, 43, 189, 230, 200, 43, 189, 216, 85, 43, 189, 245, 170, - 43, 189, 245, 160, 43, 189, 236, 244, 43, 189, 246, 217, 43, 189, 227, 0, - 43, 189, 227, 222, 43, 189, 216, 16, 43, 189, 225, 11, 43, 189, 216, 112, - 43, 189, 211, 14, 43, 189, 210, 196, 43, 189, 241, 65, 43, 189, 216, 87, - 43, 189, 251, 10, 43, 189, 222, 79, 43, 42, 209, 54, 195, 43, 42, 209, - 54, 213, 111, 43, 42, 209, 54, 199, 43, 42, 209, 54, 222, 63, 43, 42, - 239, 153, 43, 42, 239, 154, 105, 43, 42, 239, 154, 108, 43, 42, 239, 154, - 147, 43, 42, 239, 154, 149, 43, 42, 239, 154, 170, 43, 42, 239, 154, 195, - 43, 42, 239, 154, 213, 111, 43, 42, 239, 154, 199, 43, 42, 239, 154, 222, - 63, 43, 42, 240, 18, 139, 209, 164, 16, 35, 230, 171, 139, 209, 164, 16, - 35, 240, 54, 139, 209, 164, 16, 35, 225, 94, 139, 209, 164, 16, 35, 250, - 150, 139, 209, 164, 16, 35, 225, 63, 139, 209, 164, 16, 35, 230, 76, 139, - 209, 164, 16, 35, 230, 77, 139, 209, 164, 16, 35, 250, 30, 139, 209, 164, - 16, 35, 213, 129, 139, 209, 164, 16, 35, 220, 79, 139, 209, 164, 16, 35, - 221, 153, 139, 209, 164, 16, 35, 244, 70, 51, 237, 13, 51, 241, 24, 51, - 240, 226, 227, 120, 227, 147, 54, 43, 67, 63, 43, 67, 75, 43, 67, 68, 43, - 67, 74, 43, 67, 78, 43, 67, 173, 43, 67, 229, 100, 43, 67, 228, 209, 43, - 67, 229, 201, 43, 67, 229, 26, 43, 67, 215, 36, 43, 67, 212, 162, 43, 67, - 211, 10, 43, 67, 214, 177, 43, 67, 212, 13, 43, 67, 210, 22, 43, 67, 209, - 2, 43, 67, 207, 203, 43, 67, 209, 187, 43, 67, 135, 43, 67, 201, 201, 43, - 67, 222, 100, 43, 67, 221, 84, 43, 67, 222, 240, 43, 67, 221, 191, 43, - 67, 152, 43, 67, 237, 3, 43, 67, 236, 26, 43, 67, 237, 67, 43, 67, 236, - 136, 43, 67, 192, 43, 67, 224, 155, 43, 67, 223, 246, 43, 67, 225, 20, - 43, 67, 224, 82, 43, 67, 198, 43, 67, 202, 213, 43, 67, 202, 247, 43, 67, - 216, 220, 43, 67, 216, 57, 43, 67, 215, 145, 43, 67, 216, 158, 43, 67, - 215, 227, 43, 67, 204, 111, 43, 67, 204, 30, 43, 67, 204, 62, 43, 67, - 204, 0, 51, 250, 174, 51, 250, 83, 51, 250, 201, 51, 251, 239, 51, 231, - 18, 51, 230, 242, 51, 206, 227, 51, 240, 253, 51, 241, 158, 51, 220, 21, - 51, 220, 14, 51, 230, 16, 51, 229, 238, 51, 229, 235, 51, 238, 220, 51, - 238, 229, 51, 238, 70, 51, 238, 66, 51, 228, 132, 51, 238, 58, 51, 229, - 75, 51, 229, 74, 51, 229, 73, 51, 229, 72, 51, 237, 200, 51, 237, 199, - 51, 228, 180, 51, 228, 182, 51, 229, 194, 51, 228, 251, 51, 229, 3, 51, - 215, 17, 51, 214, 236, 51, 212, 92, 51, 213, 134, 51, 213, 133, 51, 244, - 209, 51, 244, 14, 51, 243, 86, 51, 208, 163, 51, 223, 79, 51, 221, 154, - 51, 237, 142, 51, 219, 163, 51, 219, 162, 51, 249, 29, 51, 218, 164, 51, - 218, 127, 51, 218, 128, 51, 248, 57, 51, 236, 24, 51, 236, 19, 51, 247, - 151, 51, 236, 4, 51, 237, 39, 51, 218, 220, 51, 219, 4, 51, 237, 22, 51, - 219, 0, 51, 219, 18, 51, 248, 145, 51, 218, 58, 51, 247, 253, 51, 236, - 120, 51, 218, 46, 51, 236, 111, 51, 236, 113, 51, 225, 138, 51, 225, 134, - 51, 225, 143, 51, 225, 83, 51, 225, 110, 51, 224, 121, 51, 224, 97, 51, - 224, 96, 51, 225, 0, 51, 224, 253, 51, 225, 1, 51, 203, 109, 51, 203, - 107, 51, 202, 202, 51, 215, 243, 51, 215, 247, 51, 215, 119, 51, 215, - 113, 51, 216, 109, 51, 216, 106, 51, 204, 78, 139, 209, 164, 16, 35, 236, - 43, 202, 84, 139, 209, 164, 16, 35, 236, 43, 105, 139, 209, 164, 16, 35, - 236, 43, 108, 139, 209, 164, 16, 35, 236, 43, 147, 139, 209, 164, 16, 35, - 236, 43, 149, 139, 209, 164, 16, 35, 236, 43, 170, 139, 209, 164, 16, 35, - 236, 43, 195, 139, 209, 164, 16, 35, 236, 43, 213, 111, 139, 209, 164, - 16, 35, 236, 43, 199, 139, 209, 164, 16, 35, 236, 43, 222, 63, 139, 209, - 164, 16, 35, 236, 43, 209, 152, 139, 209, 164, 16, 35, 236, 43, 241, 112, - 139, 209, 164, 16, 35, 236, 43, 207, 154, 139, 209, 164, 16, 35, 236, 43, - 209, 55, 139, 209, 164, 16, 35, 236, 43, 239, 141, 139, 209, 164, 16, 35, - 236, 43, 240, 22, 139, 209, 164, 16, 35, 236, 43, 212, 82, 139, 209, 164, - 16, 35, 236, 43, 213, 108, 139, 209, 164, 16, 35, 236, 43, 241, 140, 139, - 209, 164, 16, 35, 236, 43, 222, 60, 139, 209, 164, 16, 35, 236, 43, 207, - 151, 139, 209, 164, 16, 35, 236, 43, 207, 145, 139, 209, 164, 16, 35, - 236, 43, 207, 141, 139, 209, 164, 16, 35, 236, 43, 207, 142, 139, 209, - 164, 16, 35, 236, 43, 207, 147, 51, 236, 34, 51, 244, 212, 51, 250, 34, - 51, 142, 51, 219, 206, 51, 219, 39, 51, 243, 115, 51, 243, 116, 211, 176, - 51, 243, 116, 245, 105, 51, 230, 197, 51, 241, 27, 223, 85, 237, 40, 51, - 241, 27, 223, 85, 210, 92, 51, 241, 27, 223, 85, 209, 245, 51, 241, 27, - 223, 85, 224, 252, 51, 245, 162, 51, 219, 169, 250, 233, 51, 201, 201, - 51, 223, 247, 63, 51, 192, 51, 173, 51, 229, 204, 51, 225, 59, 51, 238, - 208, 51, 247, 76, 51, 229, 203, 51, 218, 211, 51, 222, 207, 51, 223, 247, - 240, 174, 51, 223, 247, 239, 75, 51, 224, 196, 51, 229, 146, 51, 235, - 215, 51, 229, 102, 51, 224, 157, 51, 238, 83, 51, 209, 4, 51, 223, 247, - 159, 51, 224, 90, 51, 243, 125, 51, 229, 41, 51, 239, 188, 51, 221, 229, - 51, 223, 247, 226, 185, 51, 224, 87, 51, 245, 255, 51, 229, 35, 51, 224, - 88, 211, 176, 51, 246, 0, 211, 176, 51, 226, 186, 211, 176, 51, 229, 36, - 211, 176, 51, 224, 88, 245, 105, 51, 246, 0, 245, 105, 51, 226, 186, 245, - 105, 51, 229, 36, 245, 105, 51, 226, 186, 115, 194, 51, 226, 186, 115, - 215, 94, 211, 176, 51, 185, 51, 228, 244, 51, 223, 250, 51, 238, 15, 51, - 216, 207, 51, 216, 208, 115, 194, 51, 216, 208, 115, 215, 94, 211, 176, - 51, 217, 204, 51, 221, 122, 51, 223, 247, 194, 51, 223, 248, 51, 217, - 154, 51, 221, 22, 51, 223, 247, 206, 164, 51, 223, 187, 51, 228, 170, 51, - 223, 188, 225, 0, 51, 217, 153, 51, 221, 21, 51, 223, 247, 204, 144, 51, - 223, 181, 51, 228, 168, 51, 223, 182, 225, 0, 51, 230, 55, 220, 58, 51, - 226, 186, 220, 58, 51, 250, 247, 51, 247, 229, 51, 247, 6, 51, 246, 239, - 51, 247, 126, 115, 229, 146, 51, 245, 254, 51, 244, 129, 51, 237, 184, - 51, 152, 51, 236, 35, 51, 231, 49, 51, 229, 48, 51, 229, 36, 247, 47, 51, - 228, 211, 51, 227, 52, 51, 227, 51, 51, 227, 38, 51, 226, 200, 51, 225, - 60, 212, 36, 51, 224, 120, 51, 224, 56, 51, 218, 209, 51, 218, 72, 51, - 218, 11, 51, 218, 9, 51, 211, 168, 51, 210, 177, 51, 204, 64, 51, 206, - 165, 115, 226, 185, 51, 34, 115, 226, 185, 139, 209, 164, 16, 35, 244, - 133, 105, 139, 209, 164, 16, 35, 244, 133, 108, 139, 209, 164, 16, 35, - 244, 133, 147, 139, 209, 164, 16, 35, 244, 133, 149, 139, 209, 164, 16, - 35, 244, 133, 170, 139, 209, 164, 16, 35, 244, 133, 195, 139, 209, 164, - 16, 35, 244, 133, 213, 111, 139, 209, 164, 16, 35, 244, 133, 199, 139, - 209, 164, 16, 35, 244, 133, 222, 63, 139, 209, 164, 16, 35, 244, 133, - 209, 152, 139, 209, 164, 16, 35, 244, 133, 241, 112, 139, 209, 164, 16, - 35, 244, 133, 207, 154, 139, 209, 164, 16, 35, 244, 133, 209, 55, 139, - 209, 164, 16, 35, 244, 133, 239, 141, 139, 209, 164, 16, 35, 244, 133, - 240, 22, 139, 209, 164, 16, 35, 244, 133, 212, 82, 139, 209, 164, 16, 35, - 244, 133, 213, 108, 139, 209, 164, 16, 35, 244, 133, 241, 140, 139, 209, - 164, 16, 35, 244, 133, 222, 60, 139, 209, 164, 16, 35, 244, 133, 207, - 151, 139, 209, 164, 16, 35, 244, 133, 207, 145, 139, 209, 164, 16, 35, - 244, 133, 207, 141, 139, 209, 164, 16, 35, 244, 133, 207, 142, 139, 209, - 164, 16, 35, 244, 133, 207, 147, 139, 209, 164, 16, 35, 244, 133, 207, - 148, 139, 209, 164, 16, 35, 244, 133, 207, 143, 139, 209, 164, 16, 35, - 244, 133, 207, 144, 139, 209, 164, 16, 35, 244, 133, 207, 150, 139, 209, - 164, 16, 35, 244, 133, 207, 146, 139, 209, 164, 16, 35, 244, 133, 209, - 53, 139, 209, 164, 16, 35, 244, 133, 209, 52, 51, 238, 246, 237, 16, 35, - 209, 93, 245, 142, 237, 51, 237, 16, 35, 209, 93, 216, 151, 241, 179, - 237, 16, 35, 243, 203, 250, 50, 209, 93, 248, 140, 237, 16, 35, 202, 226, - 239, 180, 237, 16, 35, 204, 103, 237, 16, 35, 245, 214, 237, 16, 35, 209, - 93, 250, 105, 237, 16, 35, 236, 127, 208, 169, 237, 16, 35, 5, 209, 231, - 237, 16, 35, 208, 97, 237, 16, 35, 219, 32, 237, 16, 35, 211, 96, 237, - 16, 35, 240, 44, 237, 16, 35, 237, 249, 218, 32, 237, 16, 35, 224, 75, - 237, 16, 35, 241, 64, 237, 16, 35, 239, 181, 237, 16, 35, 203, 236, 220, - 32, 209, 93, 244, 71, 237, 16, 35, 250, 154, 237, 16, 35, 245, 193, 237, - 16, 35, 248, 49, 209, 24, 237, 16, 35, 238, 13, 237, 16, 35, 211, 192, - 250, 173, 237, 16, 35, 216, 77, 237, 16, 35, 231, 12, 237, 16, 35, 237, - 249, 209, 231, 237, 16, 35, 224, 8, 245, 164, 237, 16, 35, 237, 249, 217, - 244, 237, 16, 35, 209, 93, 251, 143, 204, 80, 237, 16, 35, 209, 93, 246, - 24, 239, 249, 237, 16, 35, 231, 26, 237, 16, 35, 242, 20, 237, 16, 35, - 216, 80, 237, 16, 35, 237, 249, 218, 16, 237, 16, 35, 217, 221, 237, 16, - 35, 244, 149, 76, 209, 93, 227, 134, 237, 16, 35, 209, 93, 240, 82, 237, - 16, 35, 219, 250, 237, 16, 35, 220, 85, 237, 16, 35, 244, 42, 237, 16, - 35, 244, 63, 237, 16, 35, 231, 40, 237, 16, 35, 247, 217, 237, 16, 35, - 245, 235, 208, 173, 225, 3, 237, 16, 35, 238, 215, 208, 169, 237, 16, 35, - 217, 163, 206, 213, 237, 16, 35, 219, 249, 237, 16, 35, 209, 93, 204, 50, - 237, 16, 35, 216, 68, 237, 16, 35, 209, 93, 247, 12, 237, 16, 35, 209, - 93, 250, 101, 209, 18, 237, 16, 35, 209, 93, 229, 195, 211, 68, 224, 12, - 237, 16, 35, 244, 9, 237, 16, 35, 209, 93, 225, 85, 225, 139, 237, 16, - 35, 251, 144, 237, 16, 35, 209, 93, 204, 96, 237, 16, 35, 209, 93, 238, - 173, 204, 16, 237, 16, 35, 209, 93, 230, 84, 228, 33, 237, 16, 35, 243, - 153, 237, 16, 35, 227, 121, 237, 16, 35, 231, 15, 208, 24, 237, 16, 35, - 5, 217, 244, 237, 16, 35, 251, 82, 245, 226, 237, 16, 35, 248, 143, 245, - 226, 11, 4, 230, 201, 11, 4, 230, 193, 11, 4, 75, 11, 4, 230, 227, 11, 4, - 231, 108, 11, 4, 231, 91, 11, 4, 231, 110, 11, 4, 231, 109, 11, 4, 250, - 49, 11, 4, 250, 10, 11, 4, 63, 11, 4, 250, 175, 11, 4, 206, 225, 11, 4, - 206, 228, 11, 4, 206, 226, 11, 4, 219, 224, 11, 4, 219, 193, 11, 4, 78, - 11, 4, 220, 9, 11, 4, 240, 217, 11, 4, 74, 11, 4, 203, 217, 11, 4, 248, - 51, 11, 4, 248, 47, 11, 4, 248, 86, 11, 4, 248, 61, 11, 4, 248, 75, 11, - 4, 248, 74, 11, 4, 248, 77, 11, 4, 248, 76, 11, 4, 248, 209, 11, 4, 248, - 201, 11, 4, 249, 32, 11, 4, 248, 232, 11, 4, 247, 163, 11, 4, 247, 167, - 11, 4, 247, 164, 11, 4, 247, 252, 11, 4, 247, 233, 11, 4, 248, 23, 11, 4, - 248, 2, 11, 4, 248, 101, 11, 4, 248, 162, 11, 4, 248, 113, 11, 4, 247, - 147, 11, 4, 247, 143, 11, 4, 247, 193, 11, 4, 247, 162, 11, 4, 247, 155, - 11, 4, 247, 160, 11, 4, 247, 131, 11, 4, 247, 129, 11, 4, 247, 136, 11, - 4, 247, 134, 11, 4, 247, 132, 11, 4, 247, 133, 11, 4, 218, 105, 11, 4, - 218, 101, 11, 4, 218, 167, 11, 4, 218, 117, 11, 4, 218, 133, 11, 4, 218, - 160, 11, 4, 218, 156, 11, 4, 219, 55, 11, 4, 219, 44, 11, 4, 185, 11, 4, - 219, 96, 11, 4, 217, 173, 11, 4, 217, 175, 11, 4, 217, 174, 11, 4, 218, - 25, 11, 4, 218, 14, 11, 4, 218, 69, 11, 4, 218, 41, 11, 4, 217, 159, 11, - 4, 217, 155, 11, 4, 217, 191, 11, 4, 217, 172, 11, 4, 217, 164, 11, 4, - 217, 170, 11, 4, 217, 138, 11, 4, 217, 137, 11, 4, 217, 142, 11, 4, 217, - 141, 11, 4, 217, 139, 11, 4, 217, 140, 11, 4, 248, 183, 11, 4, 248, 182, - 11, 4, 248, 189, 11, 4, 248, 184, 11, 4, 248, 186, 11, 4, 248, 185, 11, - 4, 248, 188, 11, 4, 248, 187, 11, 4, 248, 195, 11, 4, 248, 194, 11, 4, - 248, 198, 11, 4, 248, 196, 11, 4, 248, 174, 11, 4, 248, 176, 11, 4, 248, - 175, 11, 4, 248, 179, 11, 4, 248, 178, 11, 4, 248, 181, 11, 4, 248, 180, - 11, 4, 248, 190, 11, 4, 248, 193, 11, 4, 248, 191, 11, 4, 248, 170, 11, - 4, 248, 169, 11, 4, 248, 177, 11, 4, 248, 173, 11, 4, 248, 171, 11, 4, - 248, 172, 11, 4, 248, 166, 11, 4, 248, 165, 11, 4, 248, 168, 11, 4, 248, - 167, 11, 4, 223, 47, 11, 4, 223, 46, 11, 4, 223, 52, 11, 4, 223, 48, 11, - 4, 223, 49, 11, 4, 223, 51, 11, 4, 223, 50, 11, 4, 223, 55, 11, 4, 223, - 54, 11, 4, 223, 57, 11, 4, 223, 56, 11, 4, 223, 43, 11, 4, 223, 42, 11, - 4, 223, 45, 11, 4, 223, 44, 11, 4, 223, 36, 11, 4, 223, 35, 11, 4, 223, - 40, 11, 4, 223, 39, 11, 4, 223, 37, 11, 4, 223, 38, 11, 4, 223, 30, 11, - 4, 223, 29, 11, 4, 223, 34, 11, 4, 223, 33, 11, 4, 223, 31, 11, 4, 223, - 32, 11, 4, 236, 180, 11, 4, 236, 179, 11, 4, 236, 185, 11, 4, 236, 181, - 11, 4, 236, 182, 11, 4, 236, 184, 11, 4, 236, 183, 11, 4, 236, 188, 11, - 4, 236, 187, 11, 4, 236, 190, 11, 4, 236, 189, 11, 4, 236, 171, 11, 4, - 236, 173, 11, 4, 236, 172, 11, 4, 236, 176, 11, 4, 236, 175, 11, 4, 236, - 178, 11, 4, 236, 177, 11, 4, 236, 167, 11, 4, 236, 166, 11, 4, 236, 174, - 11, 4, 236, 170, 11, 4, 236, 168, 11, 4, 236, 169, 11, 4, 236, 161, 11, - 4, 236, 165, 11, 4, 236, 164, 11, 4, 236, 162, 11, 4, 236, 163, 11, 4, - 224, 93, 11, 4, 224, 92, 11, 4, 224, 155, 11, 4, 224, 99, 11, 4, 224, - 127, 11, 4, 224, 145, 11, 4, 224, 143, 11, 4, 225, 71, 11, 4, 225, 66, - 11, 4, 192, 11, 4, 225, 106, 11, 4, 223, 213, 11, 4, 223, 212, 11, 4, - 223, 216, 11, 4, 223, 214, 11, 4, 224, 21, 11, 4, 223, 252, 11, 4, 224, - 82, 11, 4, 224, 27, 11, 4, 224, 207, 11, 4, 225, 20, 11, 4, 223, 193, 11, - 4, 223, 189, 11, 4, 223, 246, 11, 4, 223, 209, 11, 4, 223, 202, 11, 4, - 223, 207, 11, 4, 223, 166, 11, 4, 223, 165, 11, 4, 223, 171, 11, 4, 223, - 168, 11, 4, 239, 236, 11, 4, 239, 230, 11, 4, 240, 26, 11, 4, 239, 251, - 11, 4, 240, 73, 11, 4, 240, 64, 11, 4, 240, 108, 11, 4, 240, 78, 11, 4, - 239, 139, 11, 4, 239, 186, 11, 4, 239, 167, 11, 4, 239, 91, 11, 4, 239, - 90, 11, 4, 239, 108, 11, 4, 239, 96, 11, 4, 239, 94, 11, 4, 239, 95, 11, - 4, 239, 78, 11, 4, 239, 77, 11, 4, 239, 81, 11, 4, 239, 79, 11, 4, 205, - 196, 11, 4, 205, 191, 11, 4, 205, 230, 11, 4, 205, 205, 11, 4, 205, 219, - 11, 4, 205, 216, 11, 4, 205, 222, 11, 4, 205, 221, 11, 4, 206, 63, 11, 4, - 206, 58, 11, 4, 206, 86, 11, 4, 206, 75, 11, 4, 205, 172, 11, 4, 205, - 168, 11, 4, 205, 189, 11, 4, 205, 174, 11, 4, 205, 233, 11, 4, 206, 44, - 11, 4, 204, 157, 11, 4, 204, 155, 11, 4, 204, 163, 11, 4, 204, 160, 11, - 4, 204, 158, 11, 4, 204, 159, 11, 4, 204, 148, 11, 4, 204, 147, 11, 4, - 204, 152, 11, 4, 204, 151, 11, 4, 204, 149, 11, 4, 204, 150, 11, 4, 243, - 147, 11, 4, 243, 134, 11, 4, 243, 233, 11, 4, 243, 173, 11, 4, 243, 208, - 11, 4, 243, 213, 11, 4, 243, 212, 11, 4, 244, 140, 11, 4, 244, 134, 11, - 4, 244, 212, 11, 4, 244, 160, 11, 4, 242, 25, 11, 4, 242, 26, 11, 4, 243, - 85, 11, 4, 242, 67, 11, 4, 243, 113, 11, 4, 243, 87, 11, 4, 244, 7, 11, - 4, 244, 75, 11, 4, 244, 28, 11, 4, 242, 16, 11, 4, 242, 14, 11, 4, 242, - 42, 11, 4, 242, 24, 11, 4, 242, 19, 11, 4, 242, 22, 11, 4, 208, 200, 11, - 4, 208, 192, 11, 4, 209, 2, 11, 4, 208, 210, 11, 4, 208, 248, 11, 4, 208, - 250, 11, 4, 208, 249, 11, 4, 209, 212, 11, 4, 209, 198, 11, 4, 210, 22, - 11, 4, 209, 222, 11, 4, 207, 185, 11, 4, 207, 184, 11, 4, 207, 187, 11, - 4, 207, 186, 11, 4, 208, 131, 11, 4, 208, 121, 11, 4, 135, 11, 4, 208, - 144, 11, 4, 209, 114, 11, 4, 209, 187, 11, 4, 209, 139, 11, 4, 207, 168, - 11, 4, 207, 163, 11, 4, 207, 203, 11, 4, 207, 183, 11, 4, 207, 169, 11, - 4, 207, 181, 11, 4, 244, 92, 11, 4, 244, 91, 11, 4, 244, 97, 11, 4, 244, - 93, 11, 4, 244, 94, 11, 4, 244, 96, 11, 4, 244, 95, 11, 4, 244, 113, 11, - 4, 244, 112, 11, 4, 244, 120, 11, 4, 244, 114, 11, 4, 244, 82, 11, 4, - 244, 84, 11, 4, 244, 83, 11, 4, 244, 87, 11, 4, 244, 86, 11, 4, 244, 90, - 11, 4, 244, 88, 11, 4, 244, 105, 11, 4, 244, 108, 11, 4, 244, 106, 11, 4, - 244, 78, 11, 4, 244, 77, 11, 4, 244, 85, 11, 4, 244, 81, 11, 4, 244, 79, - 11, 4, 244, 80, 11, 4, 223, 3, 11, 4, 223, 2, 11, 4, 223, 10, 11, 4, 223, - 5, 11, 4, 223, 6, 11, 4, 223, 7, 11, 4, 223, 19, 11, 4, 223, 18, 11, 4, - 223, 25, 11, 4, 223, 20, 11, 4, 222, 251, 11, 4, 222, 250, 11, 4, 223, 1, - 11, 4, 222, 252, 11, 4, 223, 11, 11, 4, 223, 17, 11, 4, 223, 15, 11, 4, - 222, 243, 11, 4, 222, 242, 11, 4, 222, 248, 11, 4, 222, 246, 11, 4, 222, - 244, 11, 4, 222, 245, 11, 4, 236, 146, 11, 4, 236, 145, 11, 4, 236, 152, - 11, 4, 236, 147, 11, 4, 236, 149, 11, 4, 236, 148, 11, 4, 236, 151, 11, - 4, 236, 150, 11, 4, 236, 158, 11, 4, 236, 156, 11, 4, 236, 160, 11, 4, - 236, 159, 11, 4, 236, 139, 11, 4, 236, 140, 11, 4, 236, 143, 11, 4, 236, - 142, 11, 4, 236, 144, 11, 4, 236, 153, 11, 4, 236, 155, 11, 4, 236, 154, - 11, 4, 236, 138, 11, 4, 222, 52, 11, 4, 222, 50, 11, 4, 222, 100, 11, 4, - 222, 55, 11, 4, 222, 82, 11, 4, 222, 96, 11, 4, 222, 95, 11, 4, 223, 61, - 11, 4, 201, 201, 11, 4, 223, 76, 11, 4, 221, 32, 11, 4, 221, 34, 11, 4, - 221, 33, 11, 4, 221, 165, 11, 4, 221, 150, 11, 4, 221, 191, 11, 4, 221, - 176, 11, 4, 222, 209, 11, 4, 222, 240, 11, 4, 222, 225, 11, 4, 221, 27, - 11, 4, 221, 23, 11, 4, 221, 84, 11, 4, 221, 31, 11, 4, 221, 29, 11, 4, - 221, 30, 11, 4, 236, 211, 11, 4, 236, 210, 11, 4, 236, 216, 11, 4, 236, - 212, 11, 4, 236, 213, 11, 4, 236, 215, 11, 4, 236, 214, 11, 4, 236, 222, - 11, 4, 236, 220, 11, 4, 236, 224, 11, 4, 236, 223, 11, 4, 236, 203, 11, - 4, 236, 205, 11, 4, 236, 204, 11, 4, 236, 207, 11, 4, 236, 209, 11, 4, - 236, 208, 11, 4, 236, 217, 11, 4, 236, 219, 11, 4, 236, 218, 11, 4, 236, - 199, 11, 4, 236, 198, 11, 4, 236, 206, 11, 4, 236, 202, 11, 4, 236, 200, - 11, 4, 236, 201, 11, 4, 236, 193, 11, 4, 236, 192, 11, 4, 236, 197, 11, - 4, 236, 196, 11, 4, 236, 194, 11, 4, 236, 195, 11, 4, 227, 90, 11, 4, - 227, 82, 11, 4, 227, 148, 11, 4, 227, 100, 11, 4, 227, 139, 11, 4, 227, - 138, 11, 4, 227, 142, 11, 4, 227, 140, 11, 4, 228, 0, 11, 4, 227, 245, - 11, 4, 228, 113, 11, 4, 228, 11, 11, 4, 226, 217, 11, 4, 226, 216, 11, 4, - 226, 219, 11, 4, 226, 218, 11, 4, 227, 6, 11, 4, 226, 248, 11, 4, 227, - 49, 11, 4, 227, 11, 11, 4, 227, 165, 11, 4, 227, 234, 11, 4, 227, 182, - 11, 4, 226, 211, 11, 4, 226, 209, 11, 4, 226, 239, 11, 4, 226, 215, 11, - 4, 226, 213, 11, 4, 226, 214, 11, 4, 226, 190, 11, 4, 226, 189, 11, 4, - 226, 199, 11, 4, 226, 193, 11, 4, 226, 191, 11, 4, 226, 192, 11, 4, 238, - 54, 11, 4, 238, 53, 11, 4, 238, 81, 11, 4, 238, 65, 11, 4, 238, 73, 11, - 4, 238, 72, 11, 4, 238, 75, 11, 4, 238, 74, 11, 4, 238, 217, 11, 4, 238, - 212, 11, 4, 239, 8, 11, 4, 238, 227, 11, 4, 237, 205, 11, 4, 237, 204, - 11, 4, 237, 207, 11, 4, 237, 206, 11, 4, 238, 18, 11, 4, 238, 16, 11, 4, - 238, 39, 11, 4, 238, 26, 11, 4, 238, 159, 11, 4, 238, 157, 11, 4, 238, - 190, 11, 4, 238, 170, 11, 4, 237, 194, 11, 4, 237, 193, 11, 4, 237, 230, - 11, 4, 237, 203, 11, 4, 237, 195, 11, 4, 237, 202, 11, 4, 229, 64, 11, 4, - 229, 61, 11, 4, 229, 100, 11, 4, 229, 78, 11, 4, 229, 89, 11, 4, 229, 93, - 11, 4, 229, 91, 11, 4, 229, 226, 11, 4, 229, 209, 11, 4, 173, 11, 4, 229, - 253, 11, 4, 228, 187, 11, 4, 228, 192, 11, 4, 228, 189, 11, 4, 228, 250, - 11, 4, 228, 245, 11, 4, 229, 26, 11, 4, 229, 1, 11, 4, 229, 170, 11, 4, - 229, 153, 11, 4, 229, 201, 11, 4, 229, 174, 11, 4, 228, 175, 11, 4, 228, - 171, 11, 4, 228, 209, 11, 4, 228, 186, 11, 4, 228, 179, 11, 4, 228, 183, - 11, 4, 238, 141, 11, 4, 238, 140, 11, 4, 238, 145, 11, 4, 238, 142, 11, - 4, 238, 144, 11, 4, 238, 143, 11, 4, 238, 152, 11, 4, 238, 151, 11, 4, - 238, 155, 11, 4, 238, 153, 11, 4, 238, 132, 11, 4, 238, 131, 11, 4, 238, - 134, 11, 4, 238, 133, 11, 4, 238, 137, 11, 4, 238, 136, 11, 4, 238, 139, - 11, 4, 238, 138, 11, 4, 238, 147, 11, 4, 238, 146, 11, 4, 238, 150, 11, - 4, 238, 148, 11, 4, 238, 127, 11, 4, 238, 126, 11, 4, 238, 135, 11, 4, - 238, 130, 11, 4, 238, 128, 11, 4, 238, 129, 11, 4, 224, 174, 11, 4, 224, - 175, 11, 4, 224, 193, 11, 4, 224, 192, 11, 4, 224, 195, 11, 4, 224, 194, - 11, 4, 224, 165, 11, 4, 224, 167, 11, 4, 224, 166, 11, 4, 224, 170, 11, - 4, 224, 169, 11, 4, 224, 172, 11, 4, 224, 171, 11, 4, 224, 176, 11, 4, - 224, 178, 11, 4, 224, 177, 11, 4, 224, 161, 11, 4, 224, 160, 11, 4, 224, - 168, 11, 4, 224, 164, 11, 4, 224, 162, 11, 4, 224, 163, 11, 4, 235, 233, - 11, 4, 235, 232, 11, 4, 235, 239, 11, 4, 235, 234, 11, 4, 235, 236, 11, - 4, 235, 235, 11, 4, 235, 238, 11, 4, 235, 237, 11, 4, 235, 244, 11, 4, - 235, 243, 11, 4, 235, 246, 11, 4, 235, 245, 11, 4, 235, 225, 11, 4, 235, - 224, 11, 4, 235, 227, 11, 4, 235, 226, 11, 4, 235, 229, 11, 4, 235, 228, - 11, 4, 235, 231, 11, 4, 235, 230, 11, 4, 235, 240, 11, 4, 235, 242, 11, - 4, 235, 241, 11, 4, 222, 148, 11, 4, 222, 150, 11, 4, 222, 149, 11, 4, - 222, 193, 11, 4, 222, 191, 11, 4, 222, 203, 11, 4, 222, 196, 11, 4, 222, - 110, 11, 4, 222, 109, 11, 4, 222, 111, 11, 4, 222, 120, 11, 4, 222, 117, - 11, 4, 222, 128, 11, 4, 222, 122, 11, 4, 222, 184, 11, 4, 222, 190, 11, - 4, 222, 186, 11, 4, 236, 230, 11, 4, 236, 245, 11, 4, 236, 254, 11, 4, - 237, 83, 11, 4, 237, 72, 11, 4, 152, 11, 4, 237, 94, 11, 4, 236, 6, 11, - 4, 236, 5, 11, 4, 236, 8, 11, 4, 236, 7, 11, 4, 236, 46, 11, 4, 236, 37, - 11, 4, 236, 136, 11, 4, 236, 109, 11, 4, 237, 18, 11, 4, 237, 67, 11, 4, - 237, 30, 11, 4, 204, 83, 11, 4, 204, 68, 11, 4, 204, 111, 11, 4, 204, 93, - 11, 4, 203, 206, 11, 4, 203, 208, 11, 4, 203, 207, 11, 4, 203, 229, 11, - 4, 204, 0, 11, 4, 203, 239, 11, 4, 204, 42, 11, 4, 204, 62, 11, 4, 204, - 47, 11, 4, 202, 24, 11, 4, 202, 23, 11, 4, 202, 39, 11, 4, 202, 27, 11, - 4, 202, 32, 11, 4, 202, 34, 11, 4, 202, 33, 11, 4, 202, 100, 11, 4, 202, - 97, 11, 4, 202, 116, 11, 4, 202, 104, 11, 4, 201, 255, 11, 4, 202, 1, 11, - 4, 202, 0, 11, 4, 202, 13, 11, 4, 202, 12, 11, 4, 202, 17, 11, 4, 202, - 14, 11, 4, 202, 82, 11, 4, 202, 92, 11, 4, 202, 86, 11, 4, 201, 251, 11, - 4, 201, 250, 11, 4, 202, 6, 11, 4, 201, 254, 11, 4, 201, 252, 11, 4, 201, - 253, 11, 4, 201, 237, 11, 4, 201, 236, 11, 4, 201, 242, 11, 4, 201, 240, - 11, 4, 201, 238, 11, 4, 201, 239, 11, 4, 246, 50, 11, 4, 246, 43, 11, 4, - 246, 79, 11, 4, 246, 63, 11, 4, 246, 76, 11, 4, 246, 70, 11, 4, 246, 78, - 11, 4, 246, 77, 11, 4, 247, 17, 11, 4, 247, 9, 11, 4, 247, 92, 11, 4, - 247, 48, 11, 4, 245, 101, 11, 4, 245, 103, 11, 4, 245, 102, 11, 4, 245, - 158, 11, 4, 245, 148, 11, 4, 245, 254, 11, 4, 245, 175, 11, 4, 246, 202, - 11, 4, 246, 238, 11, 4, 246, 207, 11, 4, 245, 77, 11, 4, 245, 75, 11, 4, - 245, 110, 11, 4, 245, 99, 11, 4, 245, 83, 11, 4, 245, 96, 11, 4, 245, 54, - 11, 4, 245, 53, 11, 4, 245, 66, 11, 4, 245, 60, 11, 4, 245, 55, 11, 4, - 245, 57, 11, 4, 201, 220, 11, 4, 201, 219, 11, 4, 201, 226, 11, 4, 201, - 221, 11, 4, 201, 223, 11, 4, 201, 222, 11, 4, 201, 225, 11, 4, 201, 224, - 11, 4, 201, 232, 11, 4, 201, 231, 11, 4, 201, 235, 11, 4, 201, 233, 11, - 4, 201, 216, 11, 4, 201, 218, 11, 4, 201, 217, 11, 4, 201, 227, 11, 4, - 201, 230, 11, 4, 201, 228, 11, 4, 201, 209, 11, 4, 201, 213, 11, 4, 201, - 212, 11, 4, 201, 210, 11, 4, 201, 211, 11, 4, 201, 203, 11, 4, 201, 202, - 11, 4, 201, 208, 11, 4, 201, 206, 11, 4, 201, 204, 11, 4, 201, 205, 11, - 4, 220, 201, 11, 4, 220, 200, 11, 4, 220, 206, 11, 4, 220, 202, 11, 4, - 220, 203, 11, 4, 220, 205, 11, 4, 220, 204, 11, 4, 220, 211, 11, 4, 220, - 210, 11, 4, 220, 214, 11, 4, 220, 213, 11, 4, 220, 194, 11, 4, 220, 195, - 11, 4, 220, 198, 11, 4, 220, 199, 11, 4, 220, 207, 11, 4, 220, 209, 11, - 4, 220, 189, 11, 4, 220, 197, 11, 4, 220, 193, 11, 4, 220, 190, 11, 4, - 220, 191, 11, 4, 220, 184, 11, 4, 220, 183, 11, 4, 220, 188, 11, 4, 220, - 187, 11, 4, 220, 185, 11, 4, 220, 186, 11, 4, 212, 90, 11, 4, 195, 11, 4, - 212, 162, 11, 4, 212, 93, 11, 4, 212, 150, 11, 4, 212, 153, 11, 4, 212, - 151, 11, 4, 214, 225, 11, 4, 214, 211, 11, 4, 215, 36, 11, 4, 214, 233, - 11, 4, 210, 204, 11, 4, 210, 206, 11, 4, 210, 205, 11, 4, 211, 244, 11, - 4, 211, 233, 11, 4, 212, 13, 11, 4, 211, 248, 11, 4, 213, 103, 11, 4, - 214, 177, 11, 4, 213, 132, 11, 4, 210, 181, 11, 4, 210, 178, 11, 4, 211, - 10, 11, 4, 210, 203, 11, 4, 210, 185, 11, 4, 210, 193, 11, 4, 210, 83, - 11, 4, 210, 82, 11, 4, 210, 151, 11, 4, 210, 91, 11, 4, 210, 85, 11, 4, - 210, 90, 11, 4, 211, 126, 11, 4, 211, 125, 11, 4, 211, 132, 11, 4, 211, - 127, 11, 4, 211, 129, 11, 4, 211, 131, 11, 4, 211, 130, 11, 4, 211, 141, - 11, 4, 211, 139, 11, 4, 211, 164, 11, 4, 211, 142, 11, 4, 211, 121, 11, - 4, 211, 120, 11, 4, 211, 124, 11, 4, 211, 122, 11, 4, 211, 135, 11, 4, - 211, 138, 11, 4, 211, 136, 11, 4, 211, 117, 11, 4, 211, 115, 11, 4, 211, - 119, 11, 4, 211, 118, 11, 4, 211, 110, 11, 4, 211, 109, 11, 4, 211, 114, - 11, 4, 211, 113, 11, 4, 211, 111, 11, 4, 211, 112, 11, 4, 202, 75, 11, 4, - 202, 74, 11, 4, 202, 80, 11, 4, 202, 77, 11, 4, 202, 54, 11, 4, 202, 56, - 11, 4, 202, 55, 11, 4, 202, 59, 11, 4, 202, 58, 11, 4, 202, 63, 11, 4, - 202, 60, 11, 4, 202, 68, 11, 4, 202, 67, 11, 4, 202, 71, 11, 4, 202, 69, - 11, 4, 202, 50, 11, 4, 202, 49, 11, 4, 202, 57, 11, 4, 202, 53, 11, 4, - 202, 51, 11, 4, 202, 52, 11, 4, 202, 42, 11, 4, 202, 41, 11, 4, 202, 46, - 11, 4, 202, 45, 11, 4, 202, 43, 11, 4, 202, 44, 11, 4, 246, 176, 11, 4, - 246, 172, 11, 4, 246, 199, 11, 4, 246, 185, 11, 4, 246, 94, 11, 4, 246, - 93, 11, 4, 246, 96, 11, 4, 246, 95, 11, 4, 246, 109, 11, 4, 246, 108, 11, - 4, 246, 116, 11, 4, 246, 111, 11, 4, 246, 147, 11, 4, 246, 145, 11, 4, - 246, 170, 11, 4, 246, 155, 11, 4, 246, 88, 11, 4, 246, 98, 11, 4, 246, - 92, 11, 4, 246, 89, 11, 4, 246, 91, 11, 4, 246, 81, 11, 4, 246, 80, 11, - 4, 246, 85, 11, 4, 246, 84, 11, 4, 246, 82, 11, 4, 246, 83, 11, 4, 215, - 181, 11, 4, 215, 185, 11, 4, 215, 163, 11, 4, 215, 164, 11, 4, 215, 168, - 11, 4, 215, 167, 11, 4, 215, 171, 11, 4, 215, 169, 11, 4, 215, 175, 11, - 4, 215, 174, 11, 4, 215, 180, 11, 4, 215, 176, 11, 4, 215, 159, 11, 4, - 215, 157, 11, 4, 215, 165, 11, 4, 215, 162, 11, 4, 215, 160, 11, 4, 215, - 161, 11, 4, 215, 152, 11, 4, 215, 151, 11, 4, 215, 156, 11, 4, 215, 155, - 11, 4, 215, 153, 11, 4, 215, 154, 11, 4, 221, 145, 11, 4, 221, 144, 11, - 4, 221, 147, 11, 4, 221, 146, 11, 4, 221, 136, 11, 4, 221, 138, 11, 4, - 221, 137, 11, 4, 221, 140, 11, 4, 221, 139, 11, 4, 221, 143, 11, 4, 221, - 142, 11, 4, 221, 130, 11, 4, 221, 129, 11, 4, 221, 135, 11, 4, 221, 133, - 11, 4, 221, 131, 11, 4, 221, 132, 11, 4, 221, 124, 11, 4, 221, 123, 11, - 4, 221, 128, 11, 4, 221, 127, 11, 4, 221, 125, 11, 4, 221, 126, 11, 4, - 213, 53, 11, 4, 213, 48, 11, 4, 213, 90, 11, 4, 213, 64, 11, 4, 212, 188, - 11, 4, 212, 190, 11, 4, 212, 189, 11, 4, 212, 212, 11, 4, 212, 208, 11, - 4, 212, 242, 11, 4, 212, 232, 11, 4, 213, 21, 11, 4, 213, 14, 11, 4, 213, - 43, 11, 4, 213, 30, 11, 4, 212, 184, 11, 4, 212, 181, 11, 4, 212, 199, - 11, 4, 212, 187, 11, 4, 212, 185, 11, 4, 212, 186, 11, 4, 212, 165, 11, - 4, 212, 164, 11, 4, 212, 171, 11, 4, 212, 168, 11, 4, 212, 166, 11, 4, - 212, 167, 11, 4, 216, 172, 11, 4, 216, 166, 11, 4, 216, 220, 11, 4, 216, - 178, 11, 4, 215, 122, 11, 4, 215, 124, 11, 4, 215, 123, 11, 4, 215, 199, - 11, 4, 215, 187, 11, 4, 215, 227, 11, 4, 215, 203, 11, 4, 216, 66, 11, 4, - 216, 158, 11, 4, 216, 105, 11, 4, 215, 115, 11, 4, 215, 112, 11, 4, 215, - 145, 11, 4, 215, 121, 11, 4, 215, 117, 11, 4, 215, 118, 11, 4, 215, 97, - 11, 4, 215, 96, 11, 4, 215, 102, 11, 4, 215, 100, 11, 4, 215, 98, 11, 4, - 215, 99, 11, 4, 230, 131, 11, 4, 230, 130, 11, 4, 230, 141, 11, 4, 230, - 132, 11, 4, 230, 137, 11, 4, 230, 136, 11, 4, 230, 139, 11, 4, 230, 138, - 11, 4, 230, 72, 11, 4, 230, 71, 11, 4, 230, 74, 11, 4, 230, 73, 11, 4, - 230, 88, 11, 4, 230, 86, 11, 4, 230, 101, 11, 4, 230, 90, 11, 4, 230, 65, - 11, 4, 230, 63, 11, 4, 230, 82, 11, 4, 230, 70, 11, 4, 230, 67, 11, 4, - 230, 68, 11, 4, 230, 57, 11, 4, 230, 56, 11, 4, 230, 61, 11, 4, 230, 60, - 11, 4, 230, 58, 11, 4, 230, 59, 11, 4, 217, 81, 11, 4, 217, 79, 11, 4, - 217, 88, 11, 4, 217, 82, 11, 4, 217, 85, 11, 4, 217, 84, 11, 4, 217, 87, - 11, 4, 217, 86, 11, 4, 217, 32, 11, 4, 217, 29, 11, 4, 217, 34, 11, 4, - 217, 33, 11, 4, 217, 68, 11, 4, 217, 67, 11, 4, 217, 77, 11, 4, 217, 71, - 11, 4, 217, 24, 11, 4, 217, 20, 11, 4, 217, 65, 11, 4, 217, 28, 11, 4, - 217, 26, 11, 4, 217, 27, 11, 4, 217, 4, 11, 4, 217, 2, 11, 4, 217, 14, - 11, 4, 217, 7, 11, 4, 217, 5, 11, 4, 217, 6, 11, 4, 230, 120, 11, 4, 230, - 119, 11, 4, 230, 126, 11, 4, 230, 121, 11, 4, 230, 123, 11, 4, 230, 122, - 11, 4, 230, 125, 11, 4, 230, 124, 11, 4, 230, 111, 11, 4, 230, 113, 11, - 4, 230, 112, 11, 4, 230, 116, 11, 4, 230, 115, 11, 4, 230, 118, 11, 4, - 230, 117, 11, 4, 230, 107, 11, 4, 230, 106, 11, 4, 230, 114, 11, 4, 230, - 110, 11, 4, 230, 108, 11, 4, 230, 109, 11, 4, 230, 103, 11, 4, 230, 102, - 11, 4, 230, 105, 11, 4, 230, 104, 11, 4, 222, 25, 11, 4, 222, 24, 11, 4, - 222, 32, 11, 4, 222, 26, 11, 4, 222, 28, 11, 4, 222, 27, 11, 4, 222, 31, - 11, 4, 222, 29, 11, 4, 222, 14, 11, 4, 222, 15, 11, 4, 222, 20, 11, 4, - 222, 19, 11, 4, 222, 23, 11, 4, 222, 21, 11, 4, 222, 9, 11, 4, 222, 18, - 11, 4, 222, 13, 11, 4, 222, 10, 11, 4, 222, 11, 11, 4, 222, 4, 11, 4, - 222, 3, 11, 4, 222, 8, 11, 4, 222, 7, 11, 4, 222, 5, 11, 4, 222, 6, 11, - 4, 220, 236, 11, 4, 220, 235, 11, 4, 220, 248, 11, 4, 220, 240, 11, 4, - 220, 245, 11, 4, 220, 244, 11, 4, 220, 247, 11, 4, 220, 246, 11, 4, 220, - 221, 11, 4, 220, 223, 11, 4, 220, 222, 11, 4, 220, 228, 11, 4, 220, 227, - 11, 4, 220, 233, 11, 4, 220, 229, 11, 4, 220, 219, 11, 4, 220, 217, 11, - 4, 220, 226, 11, 4, 220, 220, 11, 4, 203, 162, 11, 4, 203, 161, 11, 4, - 203, 170, 11, 4, 203, 164, 11, 4, 203, 166, 11, 4, 203, 165, 11, 4, 203, - 168, 11, 4, 203, 167, 11, 4, 203, 150, 11, 4, 203, 151, 11, 4, 203, 155, - 11, 4, 203, 154, 11, 4, 203, 160, 11, 4, 203, 158, 11, 4, 203, 128, 11, - 4, 203, 126, 11, 4, 203, 141, 11, 4, 203, 131, 11, 4, 203, 129, 11, 4, - 203, 130, 11, 4, 202, 253, 11, 4, 202, 251, 11, 4, 203, 11, 11, 4, 202, - 254, 11, 4, 203, 5, 11, 4, 203, 4, 11, 4, 203, 8, 11, 4, 203, 6, 11, 4, - 202, 191, 11, 4, 202, 190, 11, 4, 202, 194, 11, 4, 202, 192, 11, 4, 202, - 227, 11, 4, 202, 223, 11, 4, 202, 247, 11, 4, 202, 231, 11, 4, 202, 182, - 11, 4, 202, 178, 11, 4, 202, 213, 11, 4, 202, 189, 11, 4, 202, 185, 11, - 4, 202, 186, 11, 4, 202, 162, 11, 4, 202, 161, 11, 4, 202, 169, 11, 4, - 202, 165, 11, 4, 202, 163, 11, 4, 202, 164, 11, 40, 217, 68, 11, 40, 227, - 148, 11, 40, 229, 64, 11, 40, 220, 240, 11, 40, 245, 60, 11, 40, 211, - 132, 11, 40, 238, 138, 11, 40, 238, 170, 11, 40, 224, 155, 11, 40, 235, - 233, 11, 40, 226, 192, 11, 40, 248, 170, 11, 40, 224, 27, 11, 40, 202, - 247, 11, 40, 217, 159, 11, 40, 235, 227, 11, 40, 209, 212, 11, 40, 239, - 8, 11, 40, 201, 254, 11, 40, 245, 54, 11, 40, 244, 80, 11, 40, 247, 160, - 11, 40, 238, 134, 11, 40, 220, 229, 11, 40, 207, 203, 11, 40, 220, 9, 11, - 40, 230, 107, 11, 40, 202, 13, 11, 40, 217, 138, 11, 40, 236, 178, 11, - 40, 202, 253, 11, 40, 204, 159, 11, 40, 212, 171, 11, 40, 206, 44, 11, - 40, 202, 116, 11, 40, 230, 101, 11, 40, 220, 193, 11, 40, 230, 105, 11, - 40, 238, 18, 11, 40, 230, 125, 11, 40, 204, 0, 11, 40, 242, 42, 11, 40, - 212, 186, 11, 40, 227, 142, 11, 40, 245, 66, 11, 40, 245, 102, 11, 40, - 246, 63, 11, 40, 235, 230, 11, 40, 213, 53, 11, 40, 201, 253, 11, 40, - 212, 232, 11, 40, 246, 170, 11, 40, 201, 223, 11, 40, 223, 51, 11, 40, - 229, 201, 227, 91, 1, 249, 32, 227, 91, 1, 185, 227, 91, 1, 218, 208, - 227, 91, 1, 244, 212, 227, 91, 1, 210, 22, 227, 91, 1, 209, 108, 227, 91, - 1, 239, 8, 227, 91, 1, 173, 227, 91, 1, 229, 144, 227, 91, 1, 230, 181, - 227, 91, 1, 247, 92, 227, 91, 1, 246, 199, 227, 91, 1, 241, 255, 227, 91, - 1, 208, 20, 227, 91, 1, 208, 10, 227, 91, 1, 192, 227, 91, 1, 201, 201, - 227, 91, 1, 228, 113, 227, 91, 1, 215, 36, 227, 91, 1, 202, 80, 227, 91, - 1, 202, 116, 227, 91, 1, 222, 203, 227, 91, 1, 152, 227, 91, 1, 203, 182, - 227, 91, 1, 237, 12, 227, 91, 1, 240, 108, 227, 91, 1, 204, 111, 227, 91, - 1, 213, 90, 227, 91, 1, 198, 227, 91, 1, 238, 119, 227, 91, 1, 63, 227, - 91, 1, 251, 109, 227, 91, 1, 74, 227, 91, 1, 240, 238, 227, 91, 1, 75, - 227, 91, 1, 78, 227, 91, 1, 68, 227, 91, 1, 207, 24, 227, 91, 1, 207, 18, - 227, 91, 1, 220, 73, 227, 91, 1, 143, 223, 170, 209, 2, 227, 91, 1, 143, - 223, 111, 218, 69, 227, 91, 1, 143, 223, 170, 245, 65, 227, 91, 1, 143, - 223, 170, 248, 23, 227, 91, 1, 143, 223, 170, 201, 201, 227, 91, 1, 143, - 223, 170, 230, 150, 227, 91, 217, 179, 245, 233, 227, 91, 217, 179, 239, - 102, 211, 61, 48, 4, 241, 161, 48, 4, 241, 157, 48, 4, 237, 48, 48, 4, - 204, 55, 48, 4, 204, 54, 48, 4, 219, 23, 48, 4, 248, 93, 48, 4, 248, 150, - 48, 4, 225, 46, 48, 4, 228, 239, 48, 4, 224, 187, 48, 4, 238, 203, 48, 4, - 240, 53, 48, 4, 206, 50, 48, 4, 209, 176, 48, 4, 209, 90, 48, 4, 243, - 247, 48, 4, 243, 244, 48, 4, 227, 226, 48, 4, 216, 135, 48, 4, 244, 61, - 48, 4, 223, 16, 48, 4, 214, 165, 48, 4, 213, 41, 48, 4, 202, 90, 48, 4, - 202, 70, 48, 4, 246, 230, 48, 4, 230, 159, 48, 4, 222, 39, 48, 4, 203, - 49, 48, 4, 229, 198, 48, 4, 222, 176, 48, 4, 238, 182, 48, 4, 225, 8, 48, - 4, 222, 235, 48, 4, 221, 0, 48, 4, 75, 48, 4, 231, 49, 48, 4, 237, 3, 48, - 4, 236, 238, 48, 4, 204, 30, 48, 4, 204, 18, 48, 4, 218, 167, 48, 4, 248, - 91, 48, 4, 248, 86, 48, 4, 225, 39, 48, 4, 228, 236, 48, 4, 224, 184, 48, - 4, 238, 199, 48, 4, 240, 26, 48, 4, 205, 230, 48, 4, 209, 2, 48, 4, 209, - 70, 48, 4, 243, 239, 48, 4, 243, 243, 48, 4, 227, 148, 48, 4, 216, 57, - 48, 4, 243, 233, 48, 4, 223, 10, 48, 4, 212, 162, 48, 4, 213, 11, 48, 4, - 202, 39, 48, 4, 202, 66, 48, 4, 246, 79, 48, 4, 230, 141, 48, 4, 222, 32, - 48, 4, 203, 11, 48, 4, 229, 100, 48, 4, 222, 168, 48, 4, 238, 81, 48, 4, - 224, 155, 48, 4, 222, 100, 48, 4, 220, 248, 48, 4, 63, 48, 4, 250, 231, - 48, 4, 222, 198, 48, 4, 152, 48, 4, 237, 126, 48, 4, 204, 111, 48, 4, - 204, 97, 48, 4, 185, 48, 4, 248, 98, 48, 4, 249, 32, 48, 4, 225, 54, 48, - 4, 228, 244, 48, 4, 228, 242, 48, 4, 224, 191, 48, 4, 238, 207, 48, 4, - 240, 108, 48, 4, 206, 86, 48, 4, 210, 22, 48, 4, 209, 108, 48, 4, 244, 1, - 48, 4, 243, 246, 48, 4, 228, 113, 48, 4, 216, 220, 48, 4, 244, 212, 48, - 4, 223, 25, 48, 4, 215, 36, 48, 4, 213, 90, 48, 4, 202, 116, 48, 4, 202, - 80, 48, 4, 247, 92, 48, 4, 230, 181, 48, 4, 222, 48, 48, 4, 198, 48, 4, - 173, 48, 4, 230, 4, 48, 4, 222, 182, 48, 4, 239, 8, 48, 4, 192, 48, 4, - 201, 201, 48, 4, 221, 11, 48, 4, 220, 18, 48, 4, 220, 13, 48, 4, 236, - 117, 48, 4, 203, 244, 48, 4, 203, 240, 48, 4, 218, 45, 48, 4, 248, 89, - 48, 4, 248, 10, 48, 4, 225, 34, 48, 4, 228, 234, 48, 4, 224, 180, 48, 4, - 238, 195, 48, 4, 239, 175, 48, 4, 205, 176, 48, 4, 208, 148, 48, 4, 209, - 42, 48, 4, 243, 236, 48, 4, 243, 241, 48, 4, 227, 18, 48, 4, 215, 208, - 48, 4, 243, 90, 48, 4, 222, 253, 48, 4, 211, 250, 48, 4, 212, 236, 48, 4, - 202, 15, 48, 4, 202, 61, 48, 4, 245, 180, 48, 4, 230, 91, 48, 4, 222, 22, - 48, 4, 202, 232, 48, 4, 229, 6, 48, 4, 222, 166, 48, 4, 238, 28, 48, 4, - 224, 35, 48, 4, 221, 180, 48, 4, 220, 230, 48, 4, 68, 48, 4, 206, 255, - 48, 4, 236, 26, 48, 4, 236, 13, 48, 4, 203, 217, 48, 4, 203, 210, 48, 4, - 217, 191, 48, 4, 248, 88, 48, 4, 247, 193, 48, 4, 225, 33, 48, 4, 228, - 232, 48, 4, 224, 179, 48, 4, 238, 194, 48, 4, 239, 108, 48, 4, 204, 163, - 48, 4, 207, 203, 48, 4, 209, 22, 48, 4, 243, 234, 48, 4, 243, 240, 48, 4, - 226, 239, 48, 4, 215, 145, 48, 4, 242, 42, 48, 4, 222, 248, 48, 4, 211, - 10, 48, 4, 212, 199, 48, 4, 202, 6, 48, 4, 202, 57, 48, 4, 245, 110, 48, - 4, 230, 82, 48, 4, 222, 18, 48, 4, 202, 213, 48, 4, 228, 209, 48, 4, 222, - 165, 48, 4, 237, 230, 48, 4, 223, 246, 48, 4, 221, 84, 48, 4, 220, 226, - 48, 4, 78, 48, 4, 220, 31, 48, 4, 222, 124, 48, 4, 236, 136, 48, 4, 236, - 120, 48, 4, 204, 0, 48, 4, 203, 245, 48, 4, 218, 69, 48, 4, 248, 90, 48, - 4, 248, 23, 48, 4, 225, 35, 48, 4, 228, 235, 48, 4, 224, 182, 48, 4, 238, - 197, 48, 4, 238, 196, 48, 4, 239, 186, 48, 4, 205, 189, 48, 4, 135, 48, - 4, 209, 47, 48, 4, 243, 237, 48, 4, 243, 242, 48, 4, 227, 49, 48, 4, 215, - 227, 48, 4, 243, 113, 48, 4, 223, 1, 48, 4, 212, 13, 48, 4, 212, 242, 48, - 4, 202, 17, 48, 4, 202, 63, 48, 4, 245, 254, 48, 4, 230, 101, 48, 4, 222, - 23, 48, 4, 202, 247, 48, 4, 229, 26, 48, 4, 222, 167, 48, 4, 238, 39, 48, - 4, 224, 82, 48, 4, 221, 191, 48, 4, 220, 233, 48, 4, 74, 48, 4, 241, 92, - 48, 4, 222, 187, 48, 4, 237, 67, 48, 4, 237, 33, 48, 4, 204, 62, 48, 4, - 204, 49, 48, 4, 219, 34, 48, 4, 248, 94, 48, 4, 248, 162, 48, 4, 225, 47, - 48, 4, 228, 240, 48, 4, 228, 238, 48, 4, 224, 188, 48, 4, 238, 204, 48, - 4, 238, 202, 48, 4, 240, 60, 48, 4, 206, 55, 48, 4, 209, 187, 48, 4, 209, - 92, 48, 4, 243, 248, 48, 4, 243, 245, 48, 4, 227, 234, 48, 4, 216, 158, - 48, 4, 244, 75, 48, 4, 223, 17, 48, 4, 214, 177, 48, 4, 213, 43, 48, 4, - 202, 92, 48, 4, 202, 71, 48, 4, 246, 238, 48, 4, 230, 161, 48, 4, 222, - 41, 48, 4, 203, 52, 48, 4, 229, 201, 48, 4, 222, 177, 48, 4, 222, 173, - 48, 4, 238, 190, 48, 4, 238, 177, 48, 4, 225, 20, 48, 4, 222, 240, 48, 4, - 221, 1, 48, 4, 222, 205, 48, 4, 227, 188, 48, 245, 233, 48, 239, 102, - 211, 61, 48, 217, 47, 82, 48, 4, 223, 0, 240, 108, 48, 4, 223, 0, 173, - 48, 4, 223, 0, 211, 250, 48, 16, 240, 49, 48, 16, 229, 196, 48, 16, 208, - 215, 48, 16, 222, 75, 48, 16, 248, 237, 48, 16, 240, 107, 48, 16, 210, - 18, 48, 16, 244, 164, 48, 16, 243, 89, 48, 16, 228, 193, 48, 16, 208, - 152, 48, 16, 243, 112, 48, 16, 230, 92, 48, 17, 202, 84, 48, 17, 105, 48, - 17, 108, 48, 17, 147, 48, 17, 149, 48, 17, 170, 48, 17, 195, 48, 17, 213, - 111, 48, 17, 199, 48, 17, 222, 63, 48, 4, 223, 0, 192, 48, 4, 223, 0, - 243, 113, 36, 6, 1, 202, 88, 36, 5, 1, 202, 88, 36, 6, 1, 241, 250, 36, - 5, 1, 241, 250, 36, 6, 1, 216, 73, 241, 252, 36, 5, 1, 216, 73, 241, 252, - 36, 6, 1, 230, 230, 36, 5, 1, 230, 230, 36, 6, 1, 243, 129, 36, 5, 1, - 243, 129, 36, 6, 1, 224, 43, 207, 14, 36, 5, 1, 224, 43, 207, 14, 36, 6, - 1, 247, 204, 220, 36, 36, 5, 1, 247, 204, 220, 36, 36, 6, 1, 222, 216, - 203, 34, 36, 5, 1, 222, 216, 203, 34, 36, 6, 1, 203, 31, 3, 249, 26, 203, - 34, 36, 5, 1, 203, 31, 3, 249, 26, 203, 34, 36, 6, 1, 230, 228, 203, 66, - 36, 5, 1, 230, 228, 203, 66, 36, 6, 1, 216, 73, 202, 213, 36, 5, 1, 216, - 73, 202, 213, 36, 6, 1, 230, 228, 63, 36, 5, 1, 230, 228, 63, 36, 6, 1, - 246, 16, 227, 86, 202, 183, 36, 5, 1, 246, 16, 227, 86, 202, 183, 36, 6, - 1, 248, 35, 202, 183, 36, 5, 1, 248, 35, 202, 183, 36, 6, 1, 230, 228, - 246, 16, 227, 86, 202, 183, 36, 5, 1, 230, 228, 246, 16, 227, 86, 202, - 183, 36, 6, 1, 202, 249, 36, 5, 1, 202, 249, 36, 6, 1, 216, 73, 208, 14, - 36, 5, 1, 216, 73, 208, 14, 36, 6, 1, 212, 7, 244, 75, 36, 5, 1, 212, 7, - 244, 75, 36, 6, 1, 212, 7, 241, 122, 36, 5, 1, 212, 7, 241, 122, 36, 6, - 1, 212, 7, 241, 103, 36, 5, 1, 212, 7, 241, 103, 36, 6, 1, 224, 47, 78, - 36, 5, 1, 224, 47, 78, 36, 6, 1, 248, 63, 78, 36, 5, 1, 248, 63, 78, 36, - 6, 1, 52, 224, 47, 78, 36, 5, 1, 52, 224, 47, 78, 36, 1, 223, 227, 78, - 39, 36, 204, 146, 39, 36, 209, 153, 224, 114, 54, 39, 36, 236, 12, 224, - 114, 54, 39, 36, 209, 37, 224, 114, 54, 212, 55, 250, 59, 39, 36, 1, 207, - 11, 231, 110, 39, 36, 1, 75, 39, 36, 1, 203, 11, 39, 36, 1, 68, 39, 36, - 1, 237, 91, 54, 39, 36, 1, 203, 30, 39, 36, 1, 212, 7, 54, 39, 36, 1, - 220, 36, 39, 36, 229, 213, 39, 36, 219, 41, 36, 229, 213, 36, 219, 41, - 36, 6, 1, 242, 9, 36, 5, 1, 242, 9, 36, 6, 1, 241, 241, 36, 5, 1, 241, - 241, 36, 6, 1, 202, 47, 36, 5, 1, 202, 47, 36, 6, 1, 246, 254, 36, 5, 1, - 246, 254, 36, 6, 1, 241, 238, 36, 5, 1, 241, 238, 36, 6, 1, 209, 188, 3, - 101, 113, 36, 5, 1, 209, 188, 3, 101, 113, 36, 6, 1, 207, 158, 36, 5, 1, - 207, 158, 36, 6, 1, 207, 245, 36, 5, 1, 207, 245, 36, 6, 1, 207, 250, 36, - 5, 1, 207, 250, 36, 6, 1, 209, 193, 36, 5, 1, 209, 193, 36, 6, 1, 235, - 251, 36, 5, 1, 235, 251, 36, 6, 1, 212, 177, 36, 5, 1, 212, 177, 36, 6, - 1, 52, 78, 36, 5, 1, 52, 78, 36, 6, 1, 245, 128, 78, 36, 5, 1, 245, 128, - 78, 65, 1, 36, 237, 91, 54, 65, 1, 36, 212, 7, 54, 39, 36, 1, 241, 154, - 39, 36, 1, 230, 228, 74, 24, 1, 63, 24, 1, 173, 24, 1, 68, 24, 1, 228, - 209, 24, 1, 241, 161, 24, 1, 216, 135, 24, 1, 210, 1, 24, 1, 78, 24, 1, - 220, 248, 24, 1, 75, 24, 1, 228, 113, 24, 1, 185, 24, 1, 216, 3, 24, 1, - 216, 50, 24, 1, 227, 225, 24, 1, 225, 7, 24, 1, 210, 18, 24, 1, 223, 23, - 24, 1, 222, 46, 24, 1, 226, 185, 24, 1, 210, 179, 24, 1, 223, 246, 24, 1, - 213, 6, 24, 1, 212, 162, 24, 1, 213, 16, 24, 1, 213, 113, 24, 1, 228, - 137, 24, 1, 229, 170, 24, 1, 221, 55, 24, 1, 221, 84, 24, 1, 222, 17, 24, - 1, 202, 229, 24, 1, 212, 199, 24, 1, 202, 187, 24, 1, 198, 24, 1, 221, - 118, 24, 1, 229, 156, 24, 1, 218, 212, 24, 1, 222, 39, 24, 1, 221, 99, - 24, 1, 217, 183, 24, 1, 203, 214, 24, 1, 219, 23, 24, 1, 240, 53, 24, 1, - 215, 145, 24, 1, 226, 239, 24, 1, 224, 155, 24, 1, 222, 100, 24, 1, 216, - 75, 24, 1, 216, 202, 24, 1, 229, 180, 24, 1, 222, 131, 24, 1, 222, 182, - 24, 1, 222, 203, 24, 1, 212, 242, 24, 1, 217, 188, 24, 1, 239, 108, 24, - 1, 239, 179, 24, 1, 204, 111, 24, 1, 201, 201, 24, 1, 227, 148, 24, 1, - 218, 167, 24, 1, 227, 10, 24, 1, 229, 26, 24, 1, 225, 44, 24, 1, 216, - 107, 24, 1, 224, 240, 24, 1, 192, 24, 1, 209, 2, 24, 1, 229, 100, 24, 1, - 224, 82, 24, 1, 225, 52, 24, 1, 209, 132, 24, 1, 228, 244, 24, 1, 209, - 152, 24, 1, 221, 86, 24, 1, 214, 251, 24, 1, 240, 104, 24, 1, 228, 246, - 24, 1, 229, 21, 24, 39, 131, 228, 255, 24, 39, 131, 207, 194, 24, 222, - 45, 24, 239, 102, 211, 61, 24, 245, 242, 24, 245, 233, 24, 213, 143, 24, - 217, 47, 82, 65, 1, 246, 128, 143, 203, 1, 218, 119, 65, 1, 246, 128, - 143, 203, 77, 218, 119, 65, 1, 246, 128, 143, 203, 1, 213, 65, 65, 1, - 246, 128, 143, 203, 77, 213, 65, 65, 1, 246, 128, 143, 203, 1, 217, 65, - 65, 1, 246, 128, 143, 203, 77, 217, 65, 65, 1, 246, 128, 143, 203, 1, - 215, 145, 65, 1, 246, 128, 143, 203, 77, 215, 145, 65, 1, 240, 198, 242, - 83, 143, 142, 65, 1, 138, 242, 83, 143, 142, 65, 1, 224, 150, 242, 83, - 143, 142, 65, 1, 124, 242, 83, 143, 142, 65, 1, 240, 197, 242, 83, 143, - 142, 65, 1, 240, 198, 242, 83, 227, 214, 143, 142, 65, 1, 138, 242, 83, - 227, 214, 143, 142, 65, 1, 224, 150, 242, 83, 227, 214, 143, 142, 65, 1, - 124, 242, 83, 227, 214, 143, 142, 65, 1, 240, 197, 242, 83, 227, 214, - 143, 142, 65, 1, 240, 198, 227, 214, 143, 142, 65, 1, 138, 227, 214, 143, - 142, 65, 1, 224, 150, 227, 214, 143, 142, 65, 1, 124, 227, 214, 143, 142, - 65, 1, 240, 197, 227, 214, 143, 142, 65, 1, 70, 80, 142, 65, 1, 70, 212, - 57, 65, 1, 70, 236, 106, 142, 65, 1, 226, 251, 50, 245, 166, 250, 217, - 65, 1, 216, 188, 112, 47, 65, 1, 216, 188, 121, 47, 65, 1, 216, 188, 240, - 212, 82, 65, 1, 216, 188, 230, 239, 240, 212, 82, 65, 1, 124, 230, 239, - 240, 212, 82, 65, 1, 211, 42, 25, 138, 208, 161, 65, 1, 211, 42, 25, 124, - 208, 161, 8, 6, 1, 241, 149, 251, 30, 8, 5, 1, 241, 149, 251, 30, 8, 6, - 1, 241, 149, 251, 59, 8, 5, 1, 241, 149, 251, 59, 8, 6, 1, 237, 31, 8, 5, - 1, 237, 31, 8, 6, 1, 207, 107, 8, 5, 1, 207, 107, 8, 6, 1, 208, 89, 8, 5, - 1, 208, 89, 8, 6, 1, 245, 107, 8, 5, 1, 245, 107, 8, 6, 1, 245, 108, 3, - 245, 233, 8, 5, 1, 245, 108, 3, 245, 233, 8, 1, 5, 6, 240, 174, 8, 1, 5, - 6, 194, 8, 6, 1, 252, 25, 8, 5, 1, 252, 25, 8, 6, 1, 250, 178, 8, 5, 1, - 250, 178, 8, 6, 1, 250, 34, 8, 5, 1, 250, 34, 8, 6, 1, 250, 18, 8, 5, 1, - 250, 18, 8, 6, 1, 250, 19, 3, 236, 106, 142, 8, 5, 1, 250, 19, 3, 236, - 106, 142, 8, 6, 1, 250, 8, 8, 5, 1, 250, 8, 8, 6, 1, 216, 73, 247, 126, - 3, 243, 85, 8, 5, 1, 216, 73, 247, 126, 3, 243, 85, 8, 6, 1, 230, 55, 3, - 95, 8, 5, 1, 230, 55, 3, 95, 8, 6, 1, 230, 55, 3, 243, 228, 95, 8, 5, 1, - 230, 55, 3, 243, 228, 95, 8, 6, 1, 230, 55, 3, 211, 32, 25, 243, 228, 95, - 8, 5, 1, 230, 55, 3, 211, 32, 25, 243, 228, 95, 8, 6, 1, 247, 203, 159, - 8, 5, 1, 247, 203, 159, 8, 6, 1, 228, 131, 3, 138, 95, 8, 5, 1, 228, 131, - 3, 138, 95, 8, 6, 1, 158, 3, 163, 211, 32, 219, 199, 8, 5, 1, 158, 3, - 163, 211, 32, 219, 199, 8, 6, 1, 158, 3, 227, 14, 8, 5, 1, 158, 3, 227, - 14, 8, 6, 1, 220, 18, 8, 5, 1, 220, 18, 8, 6, 1, 219, 185, 3, 211, 32, - 209, 25, 244, 20, 8, 5, 1, 219, 185, 3, 211, 32, 209, 25, 244, 20, 8, 6, - 1, 219, 185, 3, 239, 199, 8, 5, 1, 219, 185, 3, 239, 199, 8, 6, 1, 219, - 185, 3, 211, 170, 209, 248, 8, 5, 1, 219, 185, 3, 211, 170, 209, 248, 8, - 6, 1, 217, 135, 3, 211, 32, 209, 25, 244, 20, 8, 5, 1, 217, 135, 3, 211, - 32, 209, 25, 244, 20, 8, 6, 1, 217, 135, 3, 243, 228, 95, 8, 5, 1, 217, - 135, 3, 243, 228, 95, 8, 6, 1, 217, 1, 215, 192, 8, 5, 1, 217, 1, 215, - 192, 8, 6, 1, 215, 132, 215, 192, 8, 5, 1, 215, 132, 215, 192, 8, 6, 1, - 206, 165, 3, 243, 228, 95, 8, 5, 1, 206, 165, 3, 243, 228, 95, 8, 6, 1, - 204, 152, 8, 5, 1, 204, 152, 8, 6, 1, 205, 197, 202, 159, 8, 5, 1, 205, - 197, 202, 159, 8, 6, 1, 209, 41, 3, 95, 8, 5, 1, 209, 41, 3, 95, 8, 6, 1, - 209, 41, 3, 211, 32, 209, 25, 244, 20, 8, 5, 1, 209, 41, 3, 211, 32, 209, - 25, 244, 20, 8, 6, 1, 206, 45, 8, 5, 1, 206, 45, 8, 6, 1, 240, 250, 8, 5, - 1, 240, 250, 8, 6, 1, 230, 215, 8, 5, 1, 230, 215, 8, 6, 1, 245, 218, 8, - 5, 1, 245, 218, 65, 1, 206, 193, 8, 5, 1, 242, 32, 8, 5, 1, 226, 222, 8, - 5, 1, 223, 220, 8, 5, 1, 221, 47, 8, 5, 1, 215, 131, 8, 1, 5, 6, 215, - 131, 8, 5, 1, 207, 191, 8, 5, 1, 207, 6, 8, 6, 1, 231, 4, 245, 51, 8, 5, - 1, 231, 4, 245, 51, 8, 6, 1, 231, 4, 240, 174, 8, 5, 1, 231, 4, 240, 174, - 8, 6, 1, 231, 4, 239, 75, 8, 6, 1, 207, 174, 231, 4, 239, 75, 8, 5, 1, - 207, 174, 231, 4, 239, 75, 8, 6, 1, 207, 174, 159, 8, 5, 1, 207, 174, - 159, 8, 6, 1, 231, 4, 146, 8, 5, 1, 231, 4, 146, 8, 6, 1, 231, 4, 194, 8, - 5, 1, 231, 4, 194, 8, 6, 1, 231, 4, 210, 69, 8, 5, 1, 231, 4, 210, 69, - 65, 1, 124, 246, 53, 251, 138, 65, 1, 245, 242, 65, 1, 212, 228, 241, 35, - 54, 8, 6, 1, 214, 255, 8, 5, 1, 214, 255, 8, 6, 1, 207, 174, 237, 171, 8, - 5, 1, 228, 131, 3, 216, 79, 236, 116, 25, 248, 124, 8, 1, 212, 114, 243, - 85, 8, 6, 1, 223, 164, 3, 244, 20, 8, 5, 1, 223, 164, 3, 244, 20, 8, 6, - 1, 247, 126, 3, 142, 8, 5, 1, 247, 126, 3, 142, 8, 5, 1, 247, 126, 3, - 219, 142, 113, 8, 5, 1, 237, 172, 3, 219, 142, 113, 8, 6, 1, 66, 3, 239, - 199, 8, 5, 1, 66, 3, 239, 199, 8, 6, 1, 240, 175, 3, 95, 8, 5, 1, 240, - 175, 3, 95, 8, 6, 1, 205, 182, 251, 109, 8, 5, 1, 205, 182, 251, 109, 8, - 6, 1, 205, 182, 220, 73, 8, 5, 1, 205, 182, 220, 73, 8, 6, 1, 205, 182, - 207, 24, 8, 5, 1, 205, 182, 207, 24, 8, 6, 1, 239, 76, 3, 220, 89, 95, 8, - 5, 1, 239, 76, 3, 220, 89, 95, 8, 6, 1, 230, 55, 3, 220, 89, 95, 8, 5, 1, - 230, 55, 3, 220, 89, 95, 8, 6, 1, 223, 164, 3, 220, 89, 95, 8, 5, 1, 223, - 164, 3, 220, 89, 95, 8, 6, 1, 217, 1, 3, 220, 89, 95, 8, 5, 1, 217, 1, 3, - 220, 89, 95, 8, 6, 1, 215, 94, 3, 220, 89, 95, 8, 5, 1, 215, 94, 3, 220, - 89, 95, 8, 6, 1, 237, 172, 3, 113, 8, 6, 1, 216, 73, 171, 74, 8, 6, 1, - 132, 239, 75, 8, 6, 1, 228, 131, 3, 248, 124, 8, 6, 1, 207, 174, 230, 54, - 8, 6, 1, 207, 174, 210, 69, 8, 6, 1, 230, 185, 3, 245, 126, 8, 6, 1, 246, - 142, 8, 6, 1, 248, 106, 8, 5, 1, 248, 106, 8, 6, 1, 220, 36, 8, 5, 1, - 220, 36, 8, 241, 40, 1, 212, 154, 75, 65, 1, 6, 237, 172, 3, 95, 65, 1, - 5, 32, 220, 73, 8, 1, 5, 6, 207, 174, 226, 185, 8, 241, 40, 1, 216, 73, - 240, 174, 8, 241, 40, 1, 216, 73, 219, 184, 8, 241, 40, 1, 230, 239, 226, - 185, 8, 241, 40, 1, 235, 206, 227, 20, 8, 241, 40, 1, 250, 126, 226, 185, - 210, 149, 223, 94, 1, 63, 210, 149, 223, 94, 1, 75, 210, 149, 223, 94, 2, - 242, 11, 210, 149, 223, 94, 1, 68, 210, 149, 223, 94, 1, 74, 210, 149, - 223, 94, 1, 78, 210, 149, 223, 94, 2, 237, 85, 210, 149, 223, 94, 1, 229, - 26, 210, 149, 223, 94, 1, 229, 115, 210, 149, 223, 94, 1, 238, 39, 210, - 149, 223, 94, 1, 238, 91, 210, 149, 223, 94, 2, 250, 180, 210, 149, 223, - 94, 1, 245, 254, 210, 149, 223, 94, 1, 246, 116, 210, 149, 223, 94, 1, - 230, 101, 210, 149, 223, 94, 1, 230, 143, 210, 149, 223, 94, 1, 207, 218, - 210, 149, 223, 94, 1, 207, 224, 210, 149, 223, 94, 1, 244, 90, 210, 149, - 223, 94, 1, 244, 99, 210, 149, 223, 94, 1, 135, 210, 149, 223, 94, 1, - 209, 47, 210, 149, 223, 94, 1, 243, 113, 210, 149, 223, 94, 1, 243, 237, - 210, 149, 223, 94, 1, 221, 191, 210, 149, 223, 94, 1, 218, 69, 210, 149, - 223, 94, 1, 218, 180, 210, 149, 223, 94, 1, 248, 23, 210, 149, 223, 94, - 1, 248, 90, 210, 149, 223, 94, 1, 224, 82, 210, 149, 223, 94, 1, 215, - 227, 210, 149, 223, 94, 1, 227, 49, 210, 149, 223, 94, 1, 215, 171, 210, - 149, 223, 94, 1, 212, 13, 210, 149, 223, 94, 1, 236, 136, 210, 149, 223, - 94, 22, 2, 63, 210, 149, 223, 94, 22, 2, 75, 210, 149, 223, 94, 22, 2, - 68, 210, 149, 223, 94, 22, 2, 74, 210, 149, 223, 94, 22, 2, 220, 18, 210, - 149, 223, 94, 218, 64, 225, 92, 210, 149, 223, 94, 218, 64, 225, 91, 210, - 149, 223, 94, 218, 64, 225, 90, 210, 149, 223, 94, 218, 64, 225, 89, 153, - 231, 33, 239, 138, 118, 217, 55, 153, 231, 33, 239, 138, 118, 237, 137, - 153, 231, 33, 239, 138, 126, 217, 53, 153, 231, 33, 239, 138, 118, 212, - 80, 153, 231, 33, 239, 138, 118, 241, 138, 153, 231, 33, 239, 138, 126, - 212, 79, 153, 231, 33, 217, 56, 82, 153, 231, 33, 218, 96, 82, 153, 231, - 33, 215, 120, 82, 153, 231, 33, 217, 57, 82, 218, 204, 1, 173, 218, 204, - 1, 229, 144, 218, 204, 1, 239, 8, 218, 204, 1, 222, 203, 218, 204, 1, - 247, 92, 218, 204, 1, 246, 199, 218, 204, 1, 230, 181, 218, 204, 1, 221, - 11, 218, 204, 1, 210, 22, 218, 204, 1, 209, 108, 218, 204, 1, 244, 212, - 218, 204, 1, 201, 201, 218, 204, 1, 185, 218, 204, 1, 218, 208, 218, 204, - 1, 249, 32, 218, 204, 1, 192, 218, 204, 1, 208, 20, 218, 204, 1, 208, 10, - 218, 204, 1, 241, 255, 218, 204, 1, 204, 111, 218, 204, 1, 202, 80, 218, - 204, 1, 202, 116, 218, 204, 1, 5, 63, 218, 204, 1, 198, 218, 204, 1, 216, - 220, 218, 204, 1, 228, 113, 218, 204, 1, 213, 90, 218, 204, 1, 215, 36, - 218, 204, 1, 152, 218, 204, 1, 63, 218, 204, 1, 75, 218, 204, 1, 68, 218, - 204, 1, 74, 218, 204, 1, 78, 218, 204, 1, 217, 126, 218, 204, 1, 203, - 182, 218, 204, 1, 240, 108, 218, 204, 1, 238, 155, 218, 204, 1, 241, 161, - 218, 204, 210, 254, 1, 204, 111, 218, 204, 210, 254, 1, 198, 218, 204, 1, - 207, 241, 218, 204, 1, 207, 229, 218, 204, 1, 244, 120, 218, 204, 1, 221, - 227, 218, 204, 1, 250, 255, 198, 218, 204, 1, 205, 185, 213, 90, 218, - 204, 1, 205, 186, 152, 218, 204, 1, 250, 66, 240, 108, 218, 204, 210, - 254, 1, 216, 220, 218, 204, 210, 201, 1, 216, 220, 218, 204, 1, 247, 52, - 218, 204, 212, 120, 237, 65, 82, 218, 204, 52, 237, 65, 82, 218, 204, - 131, 213, 82, 218, 204, 131, 52, 213, 82, 214, 215, 2, 250, 180, 214, - 215, 2, 205, 199, 214, 215, 1, 63, 214, 215, 1, 252, 25, 214, 215, 1, 75, - 214, 215, 1, 231, 83, 214, 215, 1, 68, 214, 215, 1, 206, 178, 214, 215, - 1, 125, 146, 214, 215, 1, 125, 215, 186, 214, 215, 1, 125, 159, 214, 215, - 1, 125, 227, 78, 214, 215, 1, 74, 214, 215, 1, 241, 161, 214, 215, 1, - 251, 64, 214, 215, 1, 78, 214, 215, 1, 220, 18, 214, 215, 1, 250, 34, - 214, 215, 1, 173, 214, 215, 1, 229, 144, 214, 215, 1, 239, 8, 214, 215, - 1, 238, 119, 214, 215, 1, 222, 203, 214, 215, 1, 247, 92, 214, 215, 1, - 246, 199, 214, 215, 1, 230, 181, 214, 215, 1, 230, 149, 214, 215, 1, 221, - 11, 214, 215, 1, 207, 241, 214, 215, 1, 207, 229, 214, 215, 1, 244, 120, - 214, 215, 1, 244, 104, 214, 215, 1, 221, 227, 214, 215, 1, 210, 22, 214, - 215, 1, 209, 108, 214, 215, 1, 244, 212, 214, 215, 1, 244, 1, 214, 215, - 1, 201, 201, 214, 215, 1, 185, 214, 215, 1, 218, 208, 214, 215, 1, 249, - 32, 214, 215, 1, 248, 98, 214, 215, 1, 192, 214, 215, 1, 198, 214, 215, - 1, 216, 220, 214, 215, 1, 228, 113, 214, 215, 1, 206, 86, 214, 215, 1, - 213, 90, 214, 215, 1, 211, 164, 214, 215, 1, 215, 36, 214, 215, 1, 152, - 214, 215, 1, 227, 77, 214, 215, 109, 2, 237, 155, 214, 215, 22, 2, 252, - 25, 214, 215, 22, 2, 75, 214, 215, 22, 2, 231, 83, 214, 215, 22, 2, 68, - 214, 215, 22, 2, 206, 178, 214, 215, 22, 2, 125, 146, 214, 215, 22, 2, - 125, 215, 186, 214, 215, 22, 2, 125, 159, 214, 215, 22, 2, 125, 227, 78, - 214, 215, 22, 2, 74, 214, 215, 22, 2, 241, 161, 214, 215, 22, 2, 251, 64, - 214, 215, 22, 2, 78, 214, 215, 22, 2, 220, 18, 214, 215, 22, 2, 250, 34, - 214, 215, 2, 205, 204, 214, 215, 244, 166, 214, 215, 52, 244, 166, 214, - 215, 17, 202, 84, 214, 215, 17, 105, 214, 215, 17, 108, 214, 215, 17, - 147, 214, 215, 17, 149, 214, 215, 17, 170, 214, 215, 17, 195, 214, 215, - 17, 213, 111, 214, 215, 17, 199, 214, 215, 17, 222, 63, 39, 92, 17, 202, - 84, 39, 92, 17, 105, 39, 92, 17, 108, 39, 92, 17, 147, 39, 92, 17, 149, - 39, 92, 17, 170, 39, 92, 17, 195, 39, 92, 17, 213, 111, 39, 92, 17, 199, - 39, 92, 17, 222, 63, 39, 92, 1, 63, 39, 92, 1, 68, 39, 92, 1, 173, 39, - 92, 1, 201, 201, 39, 92, 1, 185, 39, 92, 1, 216, 220, 39, 92, 1, 205, - 230, 39, 92, 2, 250, 17, 92, 2, 211, 227, 247, 52, 92, 2, 247, 53, 205, - 204, 92, 2, 52, 247, 53, 205, 204, 92, 2, 247, 53, 108, 92, 2, 247, 53, - 147, 92, 2, 247, 53, 250, 17, 92, 2, 217, 162, 92, 238, 228, 240, 7, 92, - 247, 33, 92, 237, 58, 92, 2, 212, 157, 92, 230, 173, 220, 39, 229, 207, - 227, 149, 17, 202, 84, 229, 207, 227, 149, 17, 105, 229, 207, 227, 149, - 17, 108, 229, 207, 227, 149, 17, 147, 229, 207, 227, 149, 17, 149, 229, - 207, 227, 149, 17, 170, 229, 207, 227, 149, 17, 195, 229, 207, 227, 149, - 17, 213, 111, 229, 207, 227, 149, 17, 199, 229, 207, 227, 149, 17, 222, - 63, 229, 207, 227, 149, 1, 173, 229, 207, 227, 149, 1, 229, 144, 229, - 207, 227, 149, 1, 239, 8, 229, 207, 227, 149, 1, 222, 203, 229, 207, 227, - 149, 1, 215, 36, 229, 207, 227, 149, 1, 213, 90, 229, 207, 227, 149, 1, - 202, 116, 229, 207, 227, 149, 1, 221, 11, 229, 207, 227, 149, 1, 210, 22, - 229, 207, 227, 149, 1, 236, 30, 229, 207, 227, 149, 1, 201, 201, 229, - 207, 227, 149, 1, 185, 229, 207, 227, 149, 1, 218, 208, 229, 207, 227, - 149, 1, 192, 229, 207, 227, 149, 1, 244, 212, 229, 207, 227, 149, 1, 249, - 32, 229, 207, 227, 149, 1, 216, 220, 229, 207, 227, 149, 1, 198, 229, - 207, 227, 149, 1, 228, 113, 229, 207, 227, 149, 1, 204, 111, 229, 207, - 227, 149, 1, 209, 108, 229, 207, 227, 149, 1, 152, 229, 207, 227, 149, 1, - 206, 86, 229, 207, 227, 149, 1, 247, 92, 229, 207, 227, 149, 1, 63, 229, - 207, 227, 149, 1, 220, 73, 229, 207, 227, 149, 1, 75, 229, 207, 227, 149, - 1, 220, 18, 229, 207, 227, 149, 22, 207, 24, 229, 207, 227, 149, 22, 74, - 229, 207, 227, 149, 22, 68, 229, 207, 227, 149, 22, 241, 161, 229, 207, - 227, 149, 22, 78, 229, 207, 227, 149, 143, 218, 84, 229, 207, 227, 149, - 143, 247, 68, 229, 207, 227, 149, 143, 247, 69, 218, 84, 229, 207, 227, - 149, 2, 245, 70, 229, 207, 227, 149, 2, 212, 170, 216, 119, 1, 173, 216, - 119, 1, 239, 8, 216, 119, 1, 222, 203, 216, 119, 1, 210, 22, 216, 119, 1, - 244, 212, 216, 119, 1, 201, 201, 216, 119, 1, 185, 216, 119, 1, 249, 32, - 216, 119, 1, 192, 216, 119, 1, 247, 92, 216, 119, 1, 230, 181, 216, 119, - 1, 221, 11, 216, 119, 1, 215, 36, 216, 119, 1, 216, 220, 216, 119, 1, - 228, 113, 216, 119, 1, 198, 216, 119, 1, 204, 111, 216, 119, 1, 152, 216, - 119, 1, 225, 54, 216, 119, 1, 222, 182, 216, 119, 1, 223, 25, 216, 119, - 1, 220, 234, 216, 119, 1, 63, 216, 119, 22, 2, 75, 216, 119, 22, 2, 68, - 216, 119, 22, 2, 74, 216, 119, 22, 2, 251, 64, 216, 119, 22, 2, 78, 216, - 119, 22, 2, 250, 34, 216, 119, 22, 2, 240, 238, 216, 119, 22, 2, 241, - 189, 216, 119, 109, 2, 222, 205, 216, 119, 109, 2, 223, 163, 216, 119, - 109, 2, 146, 216, 119, 109, 2, 237, 171, 216, 119, 205, 204, 216, 119, - 214, 168, 82, 28, 123, 208, 236, 28, 123, 208, 235, 28, 123, 208, 233, - 28, 123, 208, 238, 28, 123, 216, 42, 28, 123, 216, 26, 28, 123, 216, 21, - 28, 123, 216, 23, 28, 123, 216, 39, 28, 123, 216, 32, 28, 123, 216, 25, - 28, 123, 216, 44, 28, 123, 216, 27, 28, 123, 216, 46, 28, 123, 216, 43, - 28, 123, 224, 137, 28, 123, 224, 128, 28, 123, 224, 131, 28, 123, 218, - 138, 28, 123, 218, 149, 28, 123, 218, 150, 28, 123, 211, 148, 28, 123, - 231, 96, 28, 123, 231, 103, 28, 123, 211, 159, 28, 123, 211, 146, 28, - 123, 218, 189, 28, 123, 236, 246, 28, 123, 211, 143, 190, 2, 219, 102, - 190, 2, 246, 235, 190, 2, 227, 242, 190, 2, 204, 20, 190, 1, 63, 190, 1, - 235, 206, 229, 211, 190, 1, 75, 190, 1, 231, 83, 190, 1, 68, 190, 1, 219, - 169, 246, 205, 190, 1, 222, 204, 227, 201, 190, 1, 222, 204, 227, 202, - 216, 173, 190, 1, 74, 190, 1, 251, 64, 190, 1, 78, 190, 1, 173, 190, 1, - 230, 44, 214, 227, 190, 1, 230, 44, 223, 205, 190, 1, 239, 8, 190, 1, - 239, 9, 223, 205, 190, 1, 222, 203, 190, 1, 247, 92, 190, 1, 247, 93, - 223, 205, 190, 1, 230, 181, 190, 1, 221, 12, 223, 205, 190, 1, 230, 182, - 225, 144, 190, 1, 221, 11, 190, 1, 207, 241, 190, 1, 207, 242, 225, 144, - 190, 1, 244, 120, 190, 1, 244, 121, 225, 144, 190, 1, 223, 111, 223, 205, - 190, 1, 210, 22, 190, 1, 210, 23, 223, 205, 190, 1, 244, 212, 190, 1, - 244, 213, 225, 144, 190, 1, 201, 201, 190, 1, 185, 190, 1, 219, 169, 223, - 205, 190, 1, 249, 32, 190, 1, 249, 33, 223, 205, 190, 1, 192, 190, 1, - 198, 190, 1, 216, 220, 190, 1, 216, 221, 251, 74, 190, 1, 228, 113, 190, - 1, 204, 111, 190, 1, 215, 37, 223, 205, 190, 1, 215, 37, 225, 144, 190, - 1, 215, 36, 190, 1, 152, 190, 2, 246, 236, 209, 155, 190, 22, 2, 209, - 214, 190, 22, 2, 208, 166, 190, 22, 2, 203, 211, 190, 22, 2, 203, 212, - 224, 251, 190, 22, 2, 210, 224, 190, 22, 2, 210, 225, 224, 239, 190, 22, - 2, 209, 235, 190, 22, 2, 243, 163, 223, 204, 190, 22, 2, 218, 249, 190, - 109, 2, 229, 173, 190, 109, 2, 219, 6, 190, 109, 2, 247, 77, 190, 219, - 115, 190, 49, 216, 93, 190, 50, 216, 93, 190, 219, 158, 250, 225, 190, - 219, 158, 225, 162, 190, 219, 158, 226, 226, 190, 219, 158, 204, 14, 190, - 219, 158, 219, 116, 190, 219, 158, 227, 106, 190, 219, 158, 226, 220, - 190, 219, 158, 251, 116, 190, 219, 158, 251, 117, 251, 116, 190, 219, - 158, 218, 107, 190, 207, 174, 219, 158, 218, 107, 190, 219, 111, 190, 17, - 202, 84, 190, 17, 105, 190, 17, 108, 190, 17, 147, 190, 17, 149, 190, 17, - 170, 190, 17, 195, 190, 17, 213, 111, 190, 17, 199, 190, 17, 222, 63, - 190, 219, 158, 208, 202, 207, 189, 190, 219, 158, 230, 211, 69, 1, 213, - 67, 238, 119, 69, 1, 213, 67, 246, 199, 69, 1, 213, 67, 230, 149, 69, 1, - 213, 67, 221, 227, 69, 1, 213, 67, 248, 98, 69, 2, 213, 67, 214, 213, 69, - 65, 1, 213, 67, 216, 136, 69, 1, 45, 228, 85, 221, 11, 69, 1, 45, 228, - 85, 240, 108, 69, 1, 45, 228, 85, 239, 8, 69, 1, 45, 228, 85, 238, 119, - 69, 1, 45, 228, 85, 230, 181, 69, 1, 45, 228, 85, 230, 149, 69, 1, 45, - 228, 85, 244, 120, 69, 1, 45, 228, 85, 244, 104, 69, 1, 45, 228, 85, 221, - 227, 69, 45, 228, 85, 17, 202, 84, 69, 45, 228, 85, 17, 105, 69, 45, 228, - 85, 17, 108, 69, 45, 228, 85, 17, 147, 69, 45, 228, 85, 17, 149, 69, 45, - 228, 85, 17, 170, 69, 45, 228, 85, 17, 195, 69, 45, 228, 85, 17, 213, - 111, 69, 45, 228, 85, 17, 199, 69, 45, 228, 85, 17, 222, 63, 69, 1, 45, - 228, 85, 227, 77, 69, 1, 45, 228, 85, 244, 212, 69, 1, 45, 228, 85, 244, - 1, 69, 1, 45, 228, 85, 249, 32, 69, 1, 45, 228, 85, 248, 98, 246, 192, 1, - 63, 246, 192, 1, 75, 246, 192, 1, 68, 246, 192, 1, 74, 246, 192, 1, 251, - 64, 246, 192, 1, 78, 246, 192, 1, 173, 246, 192, 1, 229, 144, 246, 192, - 1, 239, 8, 246, 192, 1, 238, 119, 246, 192, 1, 222, 112, 246, 192, 1, - 222, 203, 246, 192, 1, 246, 199, 246, 192, 1, 246, 144, 246, 192, 1, 230, - 181, 246, 192, 1, 230, 149, 246, 192, 1, 222, 102, 246, 192, 1, 222, 104, - 246, 192, 1, 222, 103, 246, 192, 1, 210, 22, 246, 192, 1, 209, 108, 246, - 192, 1, 244, 212, 246, 192, 1, 244, 1, 246, 192, 1, 221, 53, 246, 192, 1, - 201, 201, 246, 192, 1, 244, 120, 246, 192, 1, 185, 246, 192, 1, 218, 12, - 246, 192, 1, 218, 208, 246, 192, 1, 249, 32, 246, 192, 1, 248, 98, 246, - 192, 1, 223, 238, 246, 192, 1, 192, 246, 192, 1, 248, 198, 246, 192, 1, - 198, 246, 192, 1, 216, 220, 246, 192, 1, 228, 113, 246, 192, 1, 206, 86, - 246, 192, 1, 211, 164, 246, 192, 1, 215, 36, 246, 192, 1, 152, 246, 192, - 22, 2, 252, 25, 246, 192, 22, 2, 75, 246, 192, 22, 2, 231, 83, 246, 192, - 22, 2, 241, 145, 246, 192, 22, 2, 68, 246, 192, 22, 2, 220, 73, 246, 192, - 22, 2, 78, 246, 192, 22, 2, 251, 64, 246, 192, 22, 2, 250, 34, 246, 192, - 22, 2, 207, 24, 246, 192, 109, 2, 198, 246, 192, 109, 2, 216, 220, 246, - 192, 109, 2, 228, 113, 246, 192, 109, 2, 204, 111, 246, 192, 1, 46, 230, - 54, 246, 192, 1, 46, 239, 75, 246, 192, 1, 46, 222, 205, 246, 192, 109, - 2, 46, 222, 205, 246, 192, 1, 46, 246, 200, 246, 192, 1, 46, 210, 69, - 246, 192, 1, 46, 223, 163, 246, 192, 1, 46, 219, 184, 246, 192, 1, 46, - 203, 124, 246, 192, 1, 46, 146, 246, 192, 1, 46, 159, 246, 192, 1, 46, - 211, 167, 246, 192, 109, 2, 46, 226, 185, 246, 192, 109, 2, 46, 237, 171, - 246, 192, 17, 202, 84, 246, 192, 17, 105, 246, 192, 17, 108, 246, 192, - 17, 147, 246, 192, 17, 149, 246, 192, 17, 170, 246, 192, 17, 195, 246, - 192, 17, 213, 111, 246, 192, 17, 199, 246, 192, 17, 222, 63, 246, 192, - 217, 179, 211, 201, 246, 192, 217, 179, 244, 166, 246, 192, 217, 179, 52, - 244, 166, 246, 192, 217, 179, 208, 70, 244, 166, 69, 1, 229, 137, 239, 8, - 69, 1, 229, 137, 247, 92, 69, 1, 229, 137, 246, 199, 69, 1, 229, 137, - 230, 181, 69, 1, 229, 137, 230, 149, 69, 1, 229, 137, 221, 11, 69, 1, - 229, 137, 207, 241, 69, 1, 229, 137, 207, 229, 69, 1, 229, 137, 244, 120, - 69, 1, 229, 137, 244, 104, 69, 1, 229, 137, 244, 1, 69, 1, 229, 137, 201, - 201, 69, 1, 229, 137, 215, 36, 69, 1, 229, 137, 152, 69, 1, 229, 137, - 237, 12, 69, 1, 229, 137, 240, 108, 69, 65, 1, 229, 137, 216, 136, 69, 1, - 229, 137, 203, 182, 69, 1, 229, 137, 202, 116, 69, 1, 229, 137, 216, 220, - 69, 227, 36, 229, 137, 220, 94, 69, 227, 36, 229, 137, 217, 78, 69, 227, - 36, 229, 137, 236, 191, 69, 16, 251, 51, 240, 211, 69, 16, 251, 51, 105, - 69, 16, 251, 51, 108, 69, 1, 251, 51, 216, 220, 69, 2, 219, 98, 229, 237, - 208, 161, 69, 2, 45, 228, 85, 208, 159, 69, 2, 45, 228, 85, 208, 156, 69, - 1, 212, 178, 219, 139, 246, 199, 69, 1, 212, 178, 219, 139, 213, 90, 45, - 205, 220, 1, 124, 229, 26, 45, 205, 220, 1, 138, 229, 26, 45, 205, 220, - 1, 124, 229, 115, 45, 205, 220, 1, 138, 229, 115, 45, 205, 220, 1, 124, - 229, 124, 45, 205, 220, 1, 138, 229, 124, 45, 205, 220, 1, 124, 238, 39, - 45, 205, 220, 1, 138, 238, 39, 45, 205, 220, 1, 124, 222, 128, 45, 205, - 220, 1, 138, 222, 128, 45, 205, 220, 1, 124, 245, 254, 45, 205, 220, 1, - 138, 245, 254, 45, 205, 220, 1, 124, 246, 116, 45, 205, 220, 1, 138, 246, - 116, 45, 205, 220, 1, 124, 212, 13, 45, 205, 220, 1, 138, 212, 13, 45, - 205, 220, 1, 124, 220, 233, 45, 205, 220, 1, 138, 220, 233, 45, 205, 220, - 1, 124, 243, 113, 45, 205, 220, 1, 138, 243, 113, 45, 205, 220, 1, 124, - 135, 45, 205, 220, 1, 138, 135, 45, 205, 220, 1, 124, 209, 47, 45, 205, - 220, 1, 138, 209, 47, 45, 205, 220, 1, 124, 221, 191, 45, 205, 220, 1, - 138, 221, 191, 45, 205, 220, 1, 124, 248, 23, 45, 205, 220, 1, 138, 248, - 23, 45, 205, 220, 1, 124, 218, 69, 45, 205, 220, 1, 138, 218, 69, 45, - 205, 220, 1, 124, 218, 180, 45, 205, 220, 1, 138, 218, 180, 45, 205, 220, - 1, 124, 239, 186, 45, 205, 220, 1, 138, 239, 186, 45, 205, 220, 1, 124, - 224, 82, 45, 205, 220, 1, 138, 224, 82, 45, 205, 220, 1, 124, 202, 247, - 45, 205, 220, 1, 138, 202, 247, 45, 205, 220, 1, 124, 215, 227, 45, 205, - 220, 1, 138, 215, 227, 45, 205, 220, 1, 124, 227, 49, 45, 205, 220, 1, - 138, 227, 49, 45, 205, 220, 1, 124, 205, 189, 45, 205, 220, 1, 138, 205, - 189, 45, 205, 220, 1, 124, 236, 136, 45, 205, 220, 1, 138, 236, 136, 45, - 205, 220, 1, 124, 78, 45, 205, 220, 1, 138, 78, 45, 205, 220, 225, 141, - 230, 0, 45, 205, 220, 22, 252, 25, 45, 205, 220, 22, 75, 45, 205, 220, - 22, 207, 24, 45, 205, 220, 22, 68, 45, 205, 220, 22, 74, 45, 205, 220, - 22, 78, 45, 205, 220, 225, 141, 229, 118, 45, 205, 220, 22, 235, 171, 45, - 205, 220, 22, 207, 23, 45, 205, 220, 22, 207, 39, 45, 205, 220, 22, 250, - 32, 45, 205, 220, 22, 250, 8, 45, 205, 220, 22, 250, 231, 45, 205, 220, - 22, 250, 247, 45, 205, 220, 143, 225, 141, 241, 129, 45, 205, 220, 143, - 225, 141, 221, 52, 45, 205, 220, 143, 225, 141, 209, 47, 45, 205, 220, - 143, 225, 141, 211, 252, 45, 205, 220, 16, 229, 9, 45, 205, 220, 16, 221, - 52, 45, 205, 220, 16, 214, 253, 45, 205, 220, 16, 236, 137, 236, 131, 45, - 205, 220, 16, 229, 19, 229, 18, 225, 2, 225, 61, 1, 74, 225, 2, 225, 61, - 1, 78, 225, 2, 225, 61, 1, 246, 199, 225, 2, 225, 61, 1, 221, 11, 225, 2, - 225, 61, 1, 207, 241, 225, 2, 225, 61, 1, 207, 229, 225, 2, 225, 61, 1, - 244, 120, 225, 2, 225, 61, 1, 244, 104, 225, 2, 225, 61, 1, 221, 227, - 225, 2, 225, 61, 1, 213, 90, 225, 2, 225, 61, 1, 211, 164, 225, 2, 225, - 61, 22, 2, 231, 83, 225, 2, 225, 61, 22, 2, 206, 178, 225, 2, 225, 61, - 22, 2, 251, 245, 225, 2, 225, 61, 22, 2, 250, 34, 225, 2, 225, 61, 22, 2, - 251, 238, 225, 2, 225, 61, 246, 159, 225, 2, 225, 61, 251, 70, 229, 107, - 225, 2, 225, 61, 250, 209, 225, 2, 225, 61, 4, 216, 98, 82, 225, 2, 225, - 61, 203, 238, 216, 98, 82, 225, 2, 225, 61, 22, 2, 205, 199, 225, 2, 225, - 61, 205, 204, 33, 4, 207, 222, 33, 4, 207, 225, 33, 4, 207, 228, 33, 4, - 207, 226, 33, 4, 207, 227, 33, 4, 207, 224, 33, 4, 244, 98, 33, 4, 244, - 100, 33, 4, 244, 103, 33, 4, 244, 101, 33, 4, 244, 102, 33, 4, 244, 99, - 33, 4, 241, 242, 33, 4, 241, 246, 33, 4, 241, 254, 33, 4, 241, 251, 33, - 4, 241, 252, 33, 4, 241, 243, 33, 4, 246, 252, 33, 4, 246, 246, 33, 4, - 246, 248, 33, 4, 246, 251, 33, 4, 246, 249, 33, 4, 246, 250, 33, 4, 246, - 247, 33, 4, 248, 198, 33, 4, 248, 177, 33, 4, 248, 189, 33, 4, 248, 197, - 33, 4, 248, 192, 33, 4, 248, 193, 33, 4, 248, 181, 8, 5, 1, 248, 225, - 251, 2, 8, 5, 1, 34, 216, 71, 8, 5, 1, 248, 39, 74, 8, 5, 1, 248, 225, - 74, 8, 5, 1, 188, 3, 239, 199, 8, 5, 1, 227, 187, 240, 174, 8, 5, 1, 132, - 239, 76, 3, 245, 126, 8, 5, 1, 228, 131, 3, 230, 239, 227, 241, 194, 8, - 5, 1, 228, 131, 3, 52, 101, 208, 227, 8, 5, 1, 228, 131, 3, 101, 215, - 252, 8, 5, 1, 226, 186, 3, 245, 126, 8, 5, 1, 223, 164, 3, 245, 126, 8, - 5, 1, 241, 79, 3, 245, 126, 8, 5, 1, 248, 39, 78, 8, 5, 1, 248, 39, 158, - 3, 95, 8, 5, 1, 171, 158, 3, 95, 8, 5, 1, 230, 239, 220, 73, 8, 5, 1, - 207, 174, 220, 74, 3, 95, 8, 5, 1, 207, 174, 220, 74, 3, 236, 106, 95, 8, - 5, 1, 207, 174, 158, 220, 4, 8, 5, 1, 207, 174, 158, 220, 5, 3, 95, 8, 5, - 1, 211, 66, 146, 8, 1, 5, 6, 217, 1, 3, 50, 227, 210, 8, 5, 1, 217, 1, - 204, 3, 237, 102, 8, 5, 1, 52, 146, 8, 5, 1, 217, 1, 3, 245, 126, 8, 5, - 1, 52, 217, 1, 3, 245, 126, 8, 5, 1, 132, 146, 8, 5, 1, 132, 217, 1, 3, - 215, 252, 8, 5, 1, 248, 216, 241, 7, 8, 5, 1, 106, 3, 212, 228, 50, 227, - 210, 8, 5, 1, 106, 248, 231, 3, 212, 228, 50, 227, 210, 8, 5, 1, 207, 17, - 8, 5, 1, 207, 174, 207, 17, 8, 5, 1, 106, 3, 49, 113, 8, 5, 1, 246, 142, - 8, 5, 1, 246, 143, 3, 124, 50, 215, 252, 8, 5, 1, 246, 143, 3, 124, 49, - 213, 125, 8, 5, 1, 203, 197, 3, 124, 50, 215, 252, 8, 5, 1, 203, 197, 3, - 163, 49, 227, 210, 8, 5, 1, 203, 197, 3, 163, 49, 227, 211, 25, 124, 50, - 215, 252, 8, 5, 1, 203, 197, 3, 163, 49, 227, 211, 3, 213, 125, 8, 5, 1, - 203, 125, 3, 212, 228, 50, 227, 210, 65, 247, 215, 3, 230, 239, 247, 214, - 65, 1, 5, 237, 31, 65, 1, 5, 228, 131, 3, 230, 239, 227, 241, 194, 65, 1, - 5, 228, 131, 3, 101, 208, 227, 65, 1, 5, 106, 3, 49, 113, 8, 5, 1, 215, - 11, 203, 66, 8, 5, 1, 230, 228, 74, 8, 5, 1, 171, 220, 73, 8, 5, 1, 206, - 228, 8, 5, 1, 230, 239, 251, 2, 30, 1, 5, 6, 220, 36, 90, 5, 1, 63, 90, - 5, 1, 74, 90, 5, 1, 75, 90, 5, 1, 78, 90, 5, 1, 68, 90, 5, 1, 206, 164, - 90, 5, 1, 239, 8, 90, 5, 1, 173, 90, 5, 1, 238, 190, 90, 5, 1, 238, 81, - 90, 5, 1, 238, 39, 90, 5, 1, 237, 230, 90, 5, 1, 237, 192, 90, 5, 1, 152, - 90, 5, 1, 237, 67, 90, 5, 1, 237, 3, 90, 5, 1, 236, 136, 90, 5, 1, 236, - 26, 90, 5, 1, 235, 255, 90, 5, 1, 228, 113, 90, 5, 1, 227, 234, 90, 5, 1, - 227, 148, 90, 5, 1, 227, 49, 90, 5, 1, 226, 239, 90, 5, 1, 226, 208, 90, - 5, 1, 192, 90, 5, 1, 225, 20, 90, 5, 1, 224, 155, 90, 5, 1, 224, 82, 90, - 5, 1, 223, 246, 90, 5, 1, 201, 201, 90, 5, 1, 236, 160, 90, 5, 1, 223, - 93, 90, 5, 1, 222, 240, 90, 5, 1, 222, 100, 90, 5, 1, 221, 191, 90, 5, 1, - 221, 84, 90, 5, 1, 221, 22, 90, 5, 1, 217, 64, 90, 5, 1, 217, 50, 90, 5, - 1, 217, 43, 90, 5, 1, 217, 34, 90, 5, 1, 217, 23, 90, 5, 1, 217, 21, 90, - 5, 1, 215, 36, 90, 5, 1, 194, 90, 5, 1, 214, 177, 90, 5, 1, 212, 162, 90, - 5, 1, 212, 13, 90, 5, 1, 211, 10, 90, 5, 1, 210, 177, 90, 5, 1, 244, 212, - 90, 5, 1, 210, 22, 90, 5, 1, 244, 75, 90, 5, 1, 209, 187, 90, 5, 1, 243, - 233, 90, 5, 1, 209, 2, 90, 5, 1, 243, 113, 90, 5, 1, 242, 42, 90, 5, 1, - 242, 13, 90, 5, 1, 243, 124, 90, 5, 1, 208, 190, 90, 5, 1, 208, 189, 90, - 5, 1, 208, 178, 90, 5, 1, 208, 177, 90, 5, 1, 208, 176, 90, 5, 1, 208, - 175, 90, 5, 1, 208, 20, 90, 5, 1, 208, 14, 90, 5, 1, 207, 255, 90, 5, 1, - 207, 253, 90, 5, 1, 207, 249, 90, 5, 1, 207, 248, 90, 5, 1, 204, 111, 90, - 5, 1, 204, 62, 90, 5, 1, 204, 30, 90, 5, 1, 204, 0, 90, 5, 1, 203, 217, - 90, 5, 1, 203, 204, 90, 5, 1, 198, 225, 2, 225, 61, 1, 229, 16, 225, 2, - 225, 61, 1, 214, 253, 225, 2, 225, 61, 1, 228, 86, 225, 2, 225, 61, 1, - 224, 93, 225, 2, 225, 61, 1, 185, 225, 2, 225, 61, 1, 201, 201, 225, 2, - 225, 61, 1, 246, 134, 225, 2, 225, 61, 1, 208, 229, 225, 2, 225, 61, 1, - 229, 110, 225, 2, 225, 61, 1, 222, 118, 225, 2, 225, 61, 1, 209, 39, 225, - 2, 225, 61, 1, 204, 105, 225, 2, 225, 61, 1, 203, 76, 225, 2, 225, 61, 1, - 236, 18, 225, 2, 225, 61, 1, 206, 255, 225, 2, 225, 61, 1, 75, 225, 2, - 225, 61, 1, 218, 202, 225, 2, 225, 61, 1, 250, 45, 225, 2, 225, 61, 1, - 238, 32, 225, 2, 225, 61, 1, 230, 147, 225, 2, 225, 61, 1, 216, 197, 225, - 2, 225, 61, 1, 249, 32, 225, 2, 225, 61, 1, 230, 133, 225, 2, 225, 61, 1, - 243, 190, 225, 2, 225, 61, 1, 238, 88, 225, 2, 225, 61, 1, 243, 235, 225, - 2, 225, 61, 1, 248, 96, 225, 2, 225, 61, 1, 229, 17, 227, 19, 225, 2, - 225, 61, 1, 228, 87, 227, 19, 225, 2, 225, 61, 1, 224, 94, 227, 19, 225, - 2, 225, 61, 1, 219, 169, 227, 19, 225, 2, 225, 61, 1, 223, 111, 227, 19, - 225, 2, 225, 61, 1, 208, 230, 227, 19, 225, 2, 225, 61, 1, 222, 119, 227, - 19, 225, 2, 225, 61, 1, 235, 206, 227, 19, 225, 2, 225, 61, 22, 2, 220, - 30, 225, 2, 225, 61, 22, 2, 231, 47, 225, 2, 225, 61, 22, 2, 250, 230, - 225, 2, 225, 61, 22, 2, 203, 41, 225, 2, 225, 61, 22, 2, 211, 242, 225, - 2, 225, 61, 22, 2, 206, 252, 225, 2, 225, 61, 22, 2, 246, 157, 225, 2, - 225, 61, 22, 2, 221, 37, 225, 2, 225, 61, 246, 158, 225, 2, 225, 61, 226, - 223, 230, 190, 225, 2, 225, 61, 250, 149, 230, 190, 225, 2, 225, 61, 17, - 202, 84, 225, 2, 225, 61, 17, 105, 225, 2, 225, 61, 17, 108, 225, 2, 225, - 61, 17, 147, 225, 2, 225, 61, 17, 149, 225, 2, 225, 61, 17, 170, 225, 2, - 225, 61, 17, 195, 225, 2, 225, 61, 17, 213, 111, 225, 2, 225, 61, 17, - 199, 225, 2, 225, 61, 17, 222, 63, 28, 176, 220, 174, 28, 176, 220, 179, - 28, 176, 202, 246, 28, 176, 202, 245, 28, 176, 202, 244, 28, 176, 207, - 89, 28, 176, 207, 93, 28, 176, 202, 211, 28, 176, 202, 207, 28, 176, 240, - 237, 28, 176, 240, 235, 28, 176, 240, 236, 28, 176, 240, 233, 28, 176, - 235, 196, 28, 176, 235, 195, 28, 176, 235, 193, 28, 176, 235, 194, 28, - 176, 235, 199, 28, 176, 235, 192, 28, 176, 235, 191, 28, 176, 235, 201, - 28, 176, 250, 136, 28, 176, 250, 135, 28, 107, 222, 86, 28, 107, 222, 92, - 28, 107, 211, 145, 28, 107, 211, 144, 28, 107, 208, 235, 28, 107, 208, - 233, 28, 107, 208, 232, 28, 107, 208, 238, 28, 107, 208, 239, 28, 107, - 208, 231, 28, 107, 216, 26, 28, 107, 216, 41, 28, 107, 211, 151, 28, 107, - 216, 38, 28, 107, 216, 28, 28, 107, 216, 30, 28, 107, 216, 17, 28, 107, - 216, 18, 28, 107, 229, 243, 28, 107, 224, 136, 28, 107, 224, 130, 28, - 107, 211, 155, 28, 107, 224, 133, 28, 107, 224, 139, 28, 107, 218, 134, - 28, 107, 218, 143, 28, 107, 218, 147, 28, 107, 211, 153, 28, 107, 218, - 137, 28, 107, 218, 151, 28, 107, 218, 152, 28, 107, 212, 103, 28, 107, - 212, 106, 28, 107, 211, 149, 28, 107, 211, 147, 28, 107, 212, 101, 28, - 107, 212, 109, 28, 107, 212, 110, 28, 107, 212, 95, 28, 107, 212, 108, - 28, 107, 219, 105, 28, 107, 219, 106, 28, 107, 203, 27, 28, 107, 203, 28, - 28, 107, 246, 72, 28, 107, 246, 71, 28, 107, 211, 160, 28, 107, 218, 187, - 28, 107, 218, 186, 12, 15, 233, 74, 12, 15, 233, 73, 12, 15, 233, 72, 12, - 15, 233, 71, 12, 15, 233, 70, 12, 15, 233, 69, 12, 15, 233, 68, 12, 15, - 233, 67, 12, 15, 233, 66, 12, 15, 233, 65, 12, 15, 233, 64, 12, 15, 233, - 63, 12, 15, 233, 62, 12, 15, 233, 61, 12, 15, 233, 60, 12, 15, 233, 59, - 12, 15, 233, 58, 12, 15, 233, 57, 12, 15, 233, 56, 12, 15, 233, 55, 12, - 15, 233, 54, 12, 15, 233, 53, 12, 15, 233, 52, 12, 15, 233, 51, 12, 15, - 233, 50, 12, 15, 233, 49, 12, 15, 233, 48, 12, 15, 233, 47, 12, 15, 233, - 46, 12, 15, 233, 45, 12, 15, 233, 44, 12, 15, 233, 43, 12, 15, 233, 42, - 12, 15, 233, 41, 12, 15, 233, 40, 12, 15, 233, 39, 12, 15, 233, 38, 12, - 15, 233, 37, 12, 15, 233, 36, 12, 15, 233, 35, 12, 15, 233, 34, 12, 15, - 233, 33, 12, 15, 233, 32, 12, 15, 233, 31, 12, 15, 233, 30, 12, 15, 233, - 29, 12, 15, 233, 28, 12, 15, 233, 27, 12, 15, 233, 26, 12, 15, 233, 25, - 12, 15, 233, 24, 12, 15, 233, 23, 12, 15, 233, 22, 12, 15, 233, 21, 12, - 15, 233, 20, 12, 15, 233, 19, 12, 15, 233, 18, 12, 15, 233, 17, 12, 15, - 233, 16, 12, 15, 233, 15, 12, 15, 233, 14, 12, 15, 233, 13, 12, 15, 233, - 12, 12, 15, 233, 11, 12, 15, 233, 10, 12, 15, 233, 9, 12, 15, 233, 8, 12, - 15, 233, 7, 12, 15, 233, 6, 12, 15, 233, 5, 12, 15, 233, 4, 12, 15, 233, - 3, 12, 15, 233, 2, 12, 15, 233, 1, 12, 15, 233, 0, 12, 15, 232, 255, 12, - 15, 232, 254, 12, 15, 232, 253, 12, 15, 232, 252, 12, 15, 232, 251, 12, - 15, 232, 250, 12, 15, 232, 249, 12, 15, 232, 248, 12, 15, 232, 247, 12, - 15, 232, 246, 12, 15, 232, 245, 12, 15, 232, 244, 12, 15, 232, 243, 12, - 15, 232, 242, 12, 15, 232, 241, 12, 15, 232, 240, 12, 15, 232, 239, 12, - 15, 232, 238, 12, 15, 232, 237, 12, 15, 232, 236, 12, 15, 232, 235, 12, - 15, 232, 234, 12, 15, 232, 233, 12, 15, 232, 232, 12, 15, 232, 231, 12, - 15, 232, 230, 12, 15, 232, 229, 12, 15, 232, 228, 12, 15, 232, 227, 12, - 15, 232, 226, 12, 15, 232, 225, 12, 15, 232, 224, 12, 15, 232, 223, 12, - 15, 232, 222, 12, 15, 232, 221, 12, 15, 232, 220, 12, 15, 232, 219, 12, - 15, 232, 218, 12, 15, 232, 217, 12, 15, 232, 216, 12, 15, 232, 215, 12, - 15, 232, 214, 12, 15, 232, 213, 12, 15, 232, 212, 12, 15, 232, 211, 12, - 15, 232, 210, 12, 15, 232, 209, 12, 15, 232, 208, 12, 15, 232, 207, 12, - 15, 232, 206, 12, 15, 232, 205, 12, 15, 232, 204, 12, 15, 232, 203, 12, - 15, 232, 202, 12, 15, 232, 201, 12, 15, 232, 200, 12, 15, 232, 199, 12, - 15, 232, 198, 12, 15, 232, 197, 12, 15, 232, 196, 12, 15, 232, 195, 12, - 15, 232, 194, 12, 15, 232, 193, 12, 15, 232, 192, 12, 15, 232, 191, 12, - 15, 232, 190, 12, 15, 232, 189, 12, 15, 232, 188, 12, 15, 232, 187, 12, - 15, 232, 186, 12, 15, 232, 185, 12, 15, 232, 184, 12, 15, 232, 183, 12, - 15, 232, 182, 12, 15, 232, 181, 12, 15, 232, 180, 12, 15, 232, 179, 12, - 15, 232, 178, 12, 15, 232, 177, 12, 15, 232, 176, 12, 15, 232, 175, 12, - 15, 232, 174, 12, 15, 232, 173, 12, 15, 232, 172, 12, 15, 232, 171, 12, - 15, 232, 170, 12, 15, 232, 169, 12, 15, 232, 168, 12, 15, 232, 167, 12, - 15, 232, 166, 12, 15, 232, 165, 12, 15, 232, 164, 12, 15, 232, 163, 12, - 15, 232, 162, 12, 15, 232, 161, 12, 15, 232, 160, 12, 15, 232, 159, 12, - 15, 232, 158, 12, 15, 232, 157, 12, 15, 232, 156, 12, 15, 232, 155, 12, - 15, 232, 154, 12, 15, 232, 153, 12, 15, 232, 152, 12, 15, 232, 151, 12, - 15, 232, 150, 12, 15, 232, 149, 12, 15, 232, 148, 12, 15, 232, 147, 12, - 15, 232, 146, 12, 15, 232, 145, 12, 15, 232, 144, 12, 15, 232, 143, 12, - 15, 232, 142, 12, 15, 232, 141, 12, 15, 232, 140, 12, 15, 232, 139, 12, - 15, 232, 138, 12, 15, 232, 137, 12, 15, 232, 136, 12, 15, 232, 135, 12, - 15, 232, 134, 12, 15, 232, 133, 12, 15, 232, 132, 12, 15, 232, 131, 12, - 15, 232, 130, 12, 15, 232, 129, 12, 15, 232, 128, 12, 15, 232, 127, 12, - 15, 232, 126, 12, 15, 232, 125, 12, 15, 232, 124, 12, 15, 232, 123, 12, - 15, 232, 122, 12, 15, 232, 121, 12, 15, 232, 120, 12, 15, 232, 119, 12, - 15, 232, 118, 12, 15, 232, 117, 12, 15, 232, 116, 12, 15, 232, 115, 12, - 15, 232, 114, 12, 15, 232, 113, 12, 15, 232, 112, 12, 15, 232, 111, 12, - 15, 232, 110, 12, 15, 232, 109, 12, 15, 232, 108, 12, 15, 232, 107, 12, - 15, 232, 106, 12, 15, 232, 105, 12, 15, 232, 104, 12, 15, 232, 103, 12, - 15, 232, 102, 12, 15, 232, 101, 12, 15, 232, 100, 12, 15, 232, 99, 12, - 15, 232, 98, 12, 15, 232, 97, 12, 15, 232, 96, 12, 15, 232, 95, 12, 15, - 232, 94, 12, 15, 232, 93, 12, 15, 232, 92, 12, 15, 232, 91, 12, 15, 232, - 90, 12, 15, 232, 89, 12, 15, 232, 88, 12, 15, 232, 87, 12, 15, 232, 86, - 12, 15, 232, 85, 12, 15, 232, 84, 12, 15, 232, 83, 12, 15, 232, 82, 12, - 15, 232, 81, 12, 15, 232, 80, 12, 15, 232, 79, 12, 15, 232, 78, 12, 15, - 232, 77, 12, 15, 232, 76, 12, 15, 232, 75, 12, 15, 232, 74, 12, 15, 232, - 73, 12, 15, 232, 72, 12, 15, 232, 71, 12, 15, 232, 70, 12, 15, 232, 69, - 12, 15, 232, 68, 12, 15, 232, 67, 12, 15, 232, 66, 12, 15, 232, 65, 12, - 15, 232, 64, 12, 15, 232, 63, 12, 15, 232, 62, 12, 15, 232, 61, 12, 15, - 232, 60, 12, 15, 232, 59, 12, 15, 232, 58, 12, 15, 232, 57, 12, 15, 232, - 56, 12, 15, 232, 55, 12, 15, 232, 54, 12, 15, 232, 53, 12, 15, 232, 52, - 12, 15, 232, 51, 12, 15, 232, 50, 12, 15, 232, 49, 12, 15, 232, 48, 12, - 15, 232, 47, 12, 15, 232, 46, 12, 15, 232, 45, 12, 15, 232, 44, 12, 15, - 232, 43, 12, 15, 232, 42, 12, 15, 232, 41, 12, 15, 232, 40, 12, 15, 232, - 39, 12, 15, 232, 38, 12, 15, 232, 37, 12, 15, 232, 36, 12, 15, 232, 35, - 12, 15, 232, 34, 12, 15, 232, 33, 12, 15, 232, 32, 12, 15, 232, 31, 12, - 15, 232, 30, 12, 15, 232, 29, 12, 15, 232, 28, 12, 15, 232, 27, 12, 15, - 232, 26, 12, 15, 232, 25, 12, 15, 232, 24, 12, 15, 232, 23, 12, 15, 232, - 22, 12, 15, 232, 21, 12, 15, 232, 20, 12, 15, 232, 19, 12, 15, 232, 18, - 12, 15, 232, 17, 12, 15, 232, 16, 12, 15, 232, 15, 12, 15, 232, 14, 12, - 15, 232, 13, 12, 15, 232, 12, 12, 15, 232, 11, 12, 15, 232, 10, 12, 15, - 232, 9, 12, 15, 232, 8, 12, 15, 232, 7, 12, 15, 232, 6, 12, 15, 232, 5, - 12, 15, 232, 4, 12, 15, 232, 3, 12, 15, 232, 2, 12, 15, 232, 1, 12, 15, - 232, 0, 12, 15, 231, 255, 12, 15, 231, 254, 12, 15, 231, 253, 12, 15, - 231, 252, 12, 15, 231, 251, 12, 15, 231, 250, 12, 15, 231, 249, 12, 15, - 231, 248, 12, 15, 231, 247, 12, 15, 231, 246, 12, 15, 231, 245, 12, 15, - 231, 244, 12, 15, 231, 243, 12, 15, 231, 242, 12, 15, 231, 241, 12, 15, - 231, 240, 12, 15, 231, 239, 12, 15, 231, 238, 12, 15, 231, 237, 12, 15, - 231, 236, 12, 15, 231, 235, 12, 15, 231, 234, 12, 15, 231, 233, 12, 15, - 231, 232, 12, 15, 231, 231, 12, 15, 231, 230, 12, 15, 231, 229, 12, 15, - 231, 228, 12, 15, 231, 227, 12, 15, 231, 226, 12, 15, 231, 225, 12, 15, - 231, 224, 12, 15, 231, 223, 12, 15, 231, 222, 12, 15, 231, 221, 12, 15, - 231, 220, 12, 15, 231, 219, 12, 15, 231, 218, 12, 15, 231, 217, 12, 15, - 231, 216, 12, 15, 231, 215, 12, 15, 231, 214, 12, 15, 231, 213, 12, 15, - 231, 212, 12, 15, 231, 211, 12, 15, 231, 210, 12, 15, 231, 209, 12, 15, - 231, 208, 12, 15, 231, 207, 12, 15, 231, 206, 12, 15, 231, 205, 12, 15, - 231, 204, 12, 15, 231, 203, 12, 15, 231, 202, 12, 15, 231, 201, 12, 15, - 231, 200, 12, 15, 231, 199, 12, 15, 231, 198, 12, 15, 231, 197, 12, 15, - 231, 196, 12, 15, 231, 195, 12, 15, 231, 194, 12, 15, 231, 193, 12, 15, - 231, 192, 12, 15, 231, 191, 12, 15, 231, 190, 12, 15, 231, 189, 12, 15, - 231, 188, 12, 15, 231, 187, 12, 15, 231, 186, 12, 15, 231, 185, 12, 15, - 231, 184, 12, 15, 231, 183, 12, 15, 231, 182, 12, 15, 231, 181, 12, 15, - 231, 180, 12, 15, 231, 179, 12, 15, 231, 178, 12, 15, 231, 177, 12, 15, - 231, 176, 12, 15, 231, 175, 12, 15, 231, 174, 12, 15, 231, 173, 12, 15, - 231, 172, 12, 15, 231, 171, 12, 15, 231, 170, 12, 15, 231, 169, 12, 15, - 231, 168, 12, 15, 231, 167, 12, 15, 231, 166, 12, 15, 231, 165, 12, 15, - 231, 164, 12, 15, 231, 163, 12, 15, 231, 162, 12, 15, 231, 161, 12, 15, - 231, 160, 12, 15, 231, 159, 12, 15, 231, 158, 12, 15, 231, 157, 12, 15, - 231, 156, 12, 15, 231, 155, 12, 15, 231, 154, 12, 15, 231, 153, 12, 15, - 231, 152, 12, 15, 231, 151, 12, 15, 231, 150, 12, 15, 231, 149, 12, 15, - 231, 148, 12, 15, 231, 147, 12, 15, 231, 146, 12, 15, 231, 145, 12, 15, - 231, 144, 12, 15, 231, 143, 12, 15, 231, 142, 12, 15, 231, 141, 12, 15, - 231, 140, 12, 15, 231, 139, 12, 15, 231, 138, 12, 15, 231, 137, 12, 15, - 231, 136, 12, 15, 231, 135, 12, 15, 231, 134, 12, 15, 231, 133, 12, 15, - 231, 132, 12, 15, 231, 131, 12, 15, 231, 130, 12, 15, 231, 129, 12, 15, - 231, 128, 12, 15, 231, 127, 12, 15, 231, 126, 12, 15, 231, 125, 12, 15, - 231, 124, 12, 15, 231, 123, 12, 15, 231, 122, 12, 15, 231, 121, 12, 15, - 231, 120, 12, 15, 231, 119, 12, 15, 231, 118, 12, 15, 231, 117, 12, 15, - 231, 116, 12, 15, 231, 115, 8, 5, 32, 240, 30, 8, 5, 32, 240, 26, 8, 5, - 32, 239, 228, 8, 5, 32, 240, 29, 8, 5, 32, 240, 28, 8, 5, 32, 163, 215, - 94, 210, 69, 8, 5, 32, 211, 108, 178, 5, 32, 224, 241, 221, 152, 178, 5, - 32, 224, 241, 241, 167, 178, 5, 32, 224, 241, 231, 19, 178, 5, 32, 205, - 235, 221, 152, 178, 5, 32, 224, 241, 203, 174, 110, 1, 202, 237, 3, 236, - 232, 110, 218, 63, 230, 81, 206, 67, 110, 32, 203, 9, 202, 237, 202, 237, - 219, 54, 110, 1, 250, 250, 250, 3, 110, 1, 204, 27, 251, 30, 110, 1, 204, - 27, 244, 178, 110, 1, 204, 27, 237, 67, 110, 1, 204, 27, 230, 22, 110, 1, - 204, 27, 228, 20, 110, 1, 204, 27, 46, 224, 247, 110, 1, 204, 27, 216, - 91, 110, 1, 204, 27, 209, 203, 110, 1, 250, 250, 91, 54, 110, 1, 213, 0, - 3, 213, 0, 243, 85, 110, 1, 213, 0, 3, 212, 124, 243, 85, 110, 1, 213, 0, - 3, 244, 198, 25, 213, 0, 243, 85, 110, 1, 213, 0, 3, 244, 198, 25, 212, - 124, 243, 85, 110, 1, 137, 3, 219, 54, 110, 1, 137, 3, 217, 114, 110, 1, - 137, 3, 225, 105, 110, 1, 248, 109, 3, 244, 197, 110, 1, 238, 68, 3, 244, - 197, 110, 1, 244, 179, 3, 244, 197, 110, 1, 237, 68, 3, 225, 105, 110, 1, - 206, 60, 3, 244, 197, 110, 1, 202, 96, 3, 244, 197, 110, 1, 209, 133, 3, - 244, 197, 110, 1, 202, 237, 3, 244, 197, 110, 1, 46, 230, 23, 3, 244, - 197, 110, 1, 230, 23, 3, 244, 197, 110, 1, 228, 21, 3, 244, 197, 110, 1, - 224, 248, 3, 244, 197, 110, 1, 221, 41, 3, 244, 197, 110, 1, 214, 250, 3, - 244, 197, 110, 1, 46, 219, 35, 3, 244, 197, 110, 1, 219, 35, 3, 244, 197, - 110, 1, 208, 16, 3, 244, 197, 110, 1, 217, 75, 3, 244, 197, 110, 1, 216, - 92, 3, 244, 197, 110, 1, 213, 0, 3, 244, 197, 110, 1, 209, 204, 3, 244, - 197, 110, 1, 206, 60, 3, 236, 128, 110, 1, 248, 109, 3, 216, 200, 110, 1, - 230, 23, 3, 216, 200, 110, 1, 219, 35, 3, 216, 200, 110, 32, 137, 228, - 20, 10, 1, 137, 204, 88, 64, 18, 10, 1, 137, 204, 88, 46, 18, 10, 1, 248, - 149, 64, 18, 10, 1, 248, 149, 46, 18, 10, 1, 248, 149, 81, 18, 10, 1, - 248, 149, 174, 18, 10, 1, 219, 17, 64, 18, 10, 1, 219, 17, 46, 18, 10, 1, - 219, 17, 81, 18, 10, 1, 219, 17, 174, 18, 10, 1, 248, 137, 64, 18, 10, 1, - 248, 137, 46, 18, 10, 1, 248, 137, 81, 18, 10, 1, 248, 137, 174, 18, 10, - 1, 207, 232, 64, 18, 10, 1, 207, 232, 46, 18, 10, 1, 207, 232, 81, 18, - 10, 1, 207, 232, 174, 18, 10, 1, 209, 168, 64, 18, 10, 1, 209, 168, 46, - 18, 10, 1, 209, 168, 81, 18, 10, 1, 209, 168, 174, 18, 10, 1, 207, 234, - 64, 18, 10, 1, 207, 234, 46, 18, 10, 1, 207, 234, 81, 18, 10, 1, 207, - 234, 174, 18, 10, 1, 206, 49, 64, 18, 10, 1, 206, 49, 46, 18, 10, 1, 206, - 49, 81, 18, 10, 1, 206, 49, 174, 18, 10, 1, 219, 15, 64, 18, 10, 1, 219, - 15, 46, 18, 10, 1, 219, 15, 81, 18, 10, 1, 219, 15, 174, 18, 10, 1, 242, - 6, 64, 18, 10, 1, 242, 6, 46, 18, 10, 1, 242, 6, 81, 18, 10, 1, 242, 6, - 174, 18, 10, 1, 220, 255, 64, 18, 10, 1, 220, 255, 46, 18, 10, 1, 220, - 255, 81, 18, 10, 1, 220, 255, 174, 18, 10, 1, 209, 192, 64, 18, 10, 1, - 209, 192, 46, 18, 10, 1, 209, 192, 81, 18, 10, 1, 209, 192, 174, 18, 10, - 1, 209, 190, 64, 18, 10, 1, 209, 190, 46, 18, 10, 1, 209, 190, 81, 18, - 10, 1, 209, 190, 174, 18, 10, 1, 244, 118, 64, 18, 10, 1, 244, 118, 46, - 18, 10, 1, 244, 192, 64, 18, 10, 1, 244, 192, 46, 18, 10, 1, 242, 34, 64, - 18, 10, 1, 242, 34, 46, 18, 10, 1, 244, 116, 64, 18, 10, 1, 244, 116, 46, - 18, 10, 1, 230, 156, 64, 18, 10, 1, 230, 156, 46, 18, 10, 1, 215, 178, - 64, 18, 10, 1, 215, 178, 46, 18, 10, 1, 229, 190, 64, 18, 10, 1, 229, - 190, 46, 18, 10, 1, 229, 190, 81, 18, 10, 1, 229, 190, 174, 18, 10, 1, - 238, 252, 64, 18, 10, 1, 238, 252, 46, 18, 10, 1, 238, 252, 81, 18, 10, - 1, 238, 252, 174, 18, 10, 1, 237, 218, 64, 18, 10, 1, 237, 218, 46, 18, - 10, 1, 237, 218, 81, 18, 10, 1, 237, 218, 174, 18, 10, 1, 222, 127, 64, - 18, 10, 1, 222, 127, 46, 18, 10, 1, 222, 127, 81, 18, 10, 1, 222, 127, - 174, 18, 10, 1, 221, 179, 238, 86, 64, 18, 10, 1, 221, 179, 238, 86, 46, - 18, 10, 1, 215, 231, 64, 18, 10, 1, 215, 231, 46, 18, 10, 1, 215, 231, - 81, 18, 10, 1, 215, 231, 174, 18, 10, 1, 237, 44, 3, 89, 87, 64, 18, 10, - 1, 237, 44, 3, 89, 87, 46, 18, 10, 1, 237, 44, 238, 37, 64, 18, 10, 1, - 237, 44, 238, 37, 46, 18, 10, 1, 237, 44, 238, 37, 81, 18, 10, 1, 237, - 44, 238, 37, 174, 18, 10, 1, 237, 44, 243, 110, 64, 18, 10, 1, 237, 44, - 243, 110, 46, 18, 10, 1, 237, 44, 243, 110, 81, 18, 10, 1, 237, 44, 243, - 110, 174, 18, 10, 1, 89, 248, 224, 64, 18, 10, 1, 89, 248, 224, 46, 18, - 10, 1, 89, 248, 224, 3, 237, 128, 87, 64, 18, 10, 1, 89, 248, 224, 3, - 237, 128, 87, 46, 18, 10, 16, 70, 55, 10, 16, 70, 56, 10, 16, 120, 187, - 55, 10, 16, 120, 187, 56, 10, 16, 126, 187, 55, 10, 16, 126, 187, 56, 10, - 16, 126, 187, 218, 59, 183, 55, 10, 16, 126, 187, 218, 59, 183, 56, 10, - 16, 239, 147, 187, 55, 10, 16, 239, 147, 187, 56, 10, 16, 52, 80, 248, - 231, 56, 10, 16, 120, 187, 205, 244, 55, 10, 16, 120, 187, 205, 244, 56, - 10, 16, 215, 252, 10, 16, 5, 209, 252, 55, 10, 16, 5, 209, 252, 56, 10, - 1, 222, 206, 64, 18, 10, 1, 222, 206, 46, 18, 10, 1, 222, 206, 81, 18, - 10, 1, 222, 206, 174, 18, 10, 1, 106, 64, 18, 10, 1, 106, 46, 18, 10, 1, - 220, 74, 64, 18, 10, 1, 220, 74, 46, 18, 10, 1, 202, 214, 64, 18, 10, 1, - 202, 214, 46, 18, 10, 1, 106, 3, 237, 128, 87, 64, 18, 10, 1, 206, 56, - 64, 18, 10, 1, 206, 56, 46, 18, 10, 1, 229, 76, 220, 74, 64, 18, 10, 1, - 229, 76, 220, 74, 46, 18, 10, 1, 229, 76, 202, 214, 64, 18, 10, 1, 229, - 76, 202, 214, 46, 18, 10, 1, 188, 64, 18, 10, 1, 188, 46, 18, 10, 1, 188, - 81, 18, 10, 1, 188, 174, 18, 10, 1, 207, 16, 229, 205, 229, 76, 137, 225, - 130, 81, 18, 10, 1, 207, 16, 229, 205, 229, 76, 137, 225, 130, 174, 18, - 10, 32, 89, 3, 237, 128, 87, 3, 137, 64, 18, 10, 32, 89, 3, 237, 128, 87, - 3, 137, 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, 251, 110, 64, 18, 10, 32, - 89, 3, 237, 128, 87, 3, 251, 110, 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, - 204, 71, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 204, 71, 46, 18, 10, 32, - 89, 3, 237, 128, 87, 3, 106, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 106, - 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, 220, 74, 64, 18, 10, 32, 89, 3, - 237, 128, 87, 3, 220, 74, 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, 202, - 214, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 202, 214, 46, 18, 10, 32, - 89, 3, 237, 128, 87, 3, 188, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 188, - 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, 188, 81, 18, 10, 32, 207, 16, - 229, 76, 89, 3, 237, 128, 87, 3, 137, 225, 130, 64, 18, 10, 32, 207, 16, - 229, 76, 89, 3, 237, 128, 87, 3, 137, 225, 130, 46, 18, 10, 32, 207, 16, - 229, 76, 89, 3, 237, 128, 87, 3, 137, 225, 130, 81, 18, 10, 1, 240, 75, - 89, 64, 18, 10, 1, 240, 75, 89, 46, 18, 10, 1, 240, 75, 89, 81, 18, 10, - 1, 240, 75, 89, 174, 18, 10, 32, 89, 3, 237, 128, 87, 3, 184, 64, 18, 10, - 32, 89, 3, 237, 128, 87, 3, 151, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, - 83, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 137, 225, 130, 64, 18, 10, - 32, 89, 3, 237, 128, 87, 3, 89, 64, 18, 10, 32, 248, 139, 3, 184, 64, 18, - 10, 32, 248, 139, 3, 151, 64, 18, 10, 32, 248, 139, 3, 229, 141, 64, 18, - 10, 32, 248, 139, 3, 83, 64, 18, 10, 32, 248, 139, 3, 137, 225, 130, 64, - 18, 10, 32, 248, 139, 3, 89, 64, 18, 10, 32, 209, 170, 3, 184, 64, 18, - 10, 32, 209, 170, 3, 151, 64, 18, 10, 32, 209, 170, 3, 229, 141, 64, 18, - 10, 32, 209, 170, 3, 83, 64, 18, 10, 32, 209, 170, 3, 137, 225, 130, 64, - 18, 10, 32, 209, 170, 3, 89, 64, 18, 10, 32, 209, 89, 3, 184, 64, 18, 10, - 32, 209, 89, 3, 83, 64, 18, 10, 32, 209, 89, 3, 137, 225, 130, 64, 18, - 10, 32, 209, 89, 3, 89, 64, 18, 10, 32, 184, 3, 151, 64, 18, 10, 32, 184, - 3, 83, 64, 18, 10, 32, 151, 3, 184, 64, 18, 10, 32, 151, 3, 83, 64, 18, - 10, 32, 229, 141, 3, 184, 64, 18, 10, 32, 229, 141, 3, 151, 64, 18, 10, - 32, 229, 141, 3, 83, 64, 18, 10, 32, 214, 162, 3, 184, 64, 18, 10, 32, - 214, 162, 3, 151, 64, 18, 10, 32, 214, 162, 3, 229, 141, 64, 18, 10, 32, - 214, 162, 3, 83, 64, 18, 10, 32, 215, 29, 3, 151, 64, 18, 10, 32, 215, - 29, 3, 83, 64, 18, 10, 32, 244, 208, 3, 184, 64, 18, 10, 32, 244, 208, 3, - 151, 64, 18, 10, 32, 244, 208, 3, 229, 141, 64, 18, 10, 32, 244, 208, 3, - 83, 64, 18, 10, 32, 209, 252, 3, 151, 64, 18, 10, 32, 209, 252, 3, 83, - 64, 18, 10, 32, 202, 111, 3, 83, 64, 18, 10, 32, 251, 60, 3, 184, 64, 18, - 10, 32, 251, 60, 3, 83, 64, 18, 10, 32, 238, 115, 3, 184, 64, 18, 10, 32, - 238, 115, 3, 83, 64, 18, 10, 32, 240, 48, 3, 184, 64, 18, 10, 32, 240, - 48, 3, 151, 64, 18, 10, 32, 240, 48, 3, 229, 141, 64, 18, 10, 32, 240, - 48, 3, 83, 64, 18, 10, 32, 240, 48, 3, 137, 225, 130, 64, 18, 10, 32, - 240, 48, 3, 89, 64, 18, 10, 32, 217, 120, 3, 151, 64, 18, 10, 32, 217, - 120, 3, 83, 64, 18, 10, 32, 217, 120, 3, 137, 225, 130, 64, 18, 10, 32, - 217, 120, 3, 89, 64, 18, 10, 32, 230, 23, 3, 137, 64, 18, 10, 32, 230, - 23, 3, 184, 64, 18, 10, 32, 230, 23, 3, 151, 64, 18, 10, 32, 230, 23, 3, - 229, 141, 64, 18, 10, 32, 230, 23, 3, 228, 29, 64, 18, 10, 32, 230, 23, - 3, 83, 64, 18, 10, 32, 230, 23, 3, 137, 225, 130, 64, 18, 10, 32, 230, - 23, 3, 89, 64, 18, 10, 32, 228, 29, 3, 184, 64, 18, 10, 32, 228, 29, 3, - 151, 64, 18, 10, 32, 228, 29, 3, 229, 141, 64, 18, 10, 32, 228, 29, 3, - 83, 64, 18, 10, 32, 228, 29, 3, 137, 225, 130, 64, 18, 10, 32, 228, 29, - 3, 89, 64, 18, 10, 32, 83, 3, 184, 64, 18, 10, 32, 83, 3, 151, 64, 18, - 10, 32, 83, 3, 229, 141, 64, 18, 10, 32, 83, 3, 83, 64, 18, 10, 32, 83, - 3, 137, 225, 130, 64, 18, 10, 32, 83, 3, 89, 64, 18, 10, 32, 221, 179, 3, - 184, 64, 18, 10, 32, 221, 179, 3, 151, 64, 18, 10, 32, 221, 179, 3, 229, - 141, 64, 18, 10, 32, 221, 179, 3, 83, 64, 18, 10, 32, 221, 179, 3, 137, - 225, 130, 64, 18, 10, 32, 221, 179, 3, 89, 64, 18, 10, 32, 237, 44, 3, - 184, 64, 18, 10, 32, 237, 44, 3, 83, 64, 18, 10, 32, 237, 44, 3, 137, - 225, 130, 64, 18, 10, 32, 237, 44, 3, 89, 64, 18, 10, 32, 89, 3, 184, 64, - 18, 10, 32, 89, 3, 151, 64, 18, 10, 32, 89, 3, 229, 141, 64, 18, 10, 32, - 89, 3, 83, 64, 18, 10, 32, 89, 3, 137, 225, 130, 64, 18, 10, 32, 89, 3, - 89, 64, 18, 10, 32, 209, 101, 3, 210, 199, 137, 64, 18, 10, 32, 216, 123, - 3, 210, 199, 137, 64, 18, 10, 32, 137, 225, 130, 3, 210, 199, 137, 64, - 18, 10, 32, 213, 81, 3, 244, 171, 64, 18, 10, 32, 213, 81, 3, 229, 228, - 64, 18, 10, 32, 213, 81, 3, 240, 72, 64, 18, 10, 32, 213, 81, 3, 244, - 173, 64, 18, 10, 32, 213, 81, 3, 229, 230, 64, 18, 10, 32, 213, 81, 3, - 210, 199, 137, 64, 18, 10, 32, 89, 3, 237, 128, 87, 3, 216, 123, 46, 18, - 10, 32, 89, 3, 237, 128, 87, 3, 202, 108, 46, 18, 10, 32, 89, 3, 237, - 128, 87, 3, 83, 46, 18, 10, 32, 89, 3, 237, 128, 87, 3, 221, 179, 46, 18, - 10, 32, 89, 3, 237, 128, 87, 3, 137, 225, 130, 46, 18, 10, 32, 89, 3, - 237, 128, 87, 3, 89, 46, 18, 10, 32, 248, 139, 3, 216, 123, 46, 18, 10, - 32, 248, 139, 3, 202, 108, 46, 18, 10, 32, 248, 139, 3, 83, 46, 18, 10, - 32, 248, 139, 3, 221, 179, 46, 18, 10, 32, 248, 139, 3, 137, 225, 130, - 46, 18, 10, 32, 248, 139, 3, 89, 46, 18, 10, 32, 209, 170, 3, 216, 123, - 46, 18, 10, 32, 209, 170, 3, 202, 108, 46, 18, 10, 32, 209, 170, 3, 83, - 46, 18, 10, 32, 209, 170, 3, 221, 179, 46, 18, 10, 32, 209, 170, 3, 137, - 225, 130, 46, 18, 10, 32, 209, 170, 3, 89, 46, 18, 10, 32, 209, 89, 3, - 216, 123, 46, 18, 10, 32, 209, 89, 3, 202, 108, 46, 18, 10, 32, 209, 89, - 3, 83, 46, 18, 10, 32, 209, 89, 3, 221, 179, 46, 18, 10, 32, 209, 89, 3, - 137, 225, 130, 46, 18, 10, 32, 209, 89, 3, 89, 46, 18, 10, 32, 240, 48, - 3, 137, 225, 130, 46, 18, 10, 32, 240, 48, 3, 89, 46, 18, 10, 32, 217, - 120, 3, 137, 225, 130, 46, 18, 10, 32, 217, 120, 3, 89, 46, 18, 10, 32, - 230, 23, 3, 137, 46, 18, 10, 32, 230, 23, 3, 228, 29, 46, 18, 10, 32, - 230, 23, 3, 83, 46, 18, 10, 32, 230, 23, 3, 137, 225, 130, 46, 18, 10, - 32, 230, 23, 3, 89, 46, 18, 10, 32, 228, 29, 3, 83, 46, 18, 10, 32, 228, - 29, 3, 137, 225, 130, 46, 18, 10, 32, 228, 29, 3, 89, 46, 18, 10, 32, 83, - 3, 137, 46, 18, 10, 32, 83, 3, 83, 46, 18, 10, 32, 221, 179, 3, 216, 123, - 46, 18, 10, 32, 221, 179, 3, 202, 108, 46, 18, 10, 32, 221, 179, 3, 83, - 46, 18, 10, 32, 221, 179, 3, 221, 179, 46, 18, 10, 32, 221, 179, 3, 137, - 225, 130, 46, 18, 10, 32, 221, 179, 3, 89, 46, 18, 10, 32, 137, 225, 130, - 3, 210, 199, 137, 46, 18, 10, 32, 89, 3, 216, 123, 46, 18, 10, 32, 89, 3, - 202, 108, 46, 18, 10, 32, 89, 3, 83, 46, 18, 10, 32, 89, 3, 221, 179, 46, - 18, 10, 32, 89, 3, 137, 225, 130, 46, 18, 10, 32, 89, 3, 89, 46, 18, 10, - 32, 89, 3, 237, 128, 87, 3, 184, 81, 18, 10, 32, 89, 3, 237, 128, 87, 3, - 151, 81, 18, 10, 32, 89, 3, 237, 128, 87, 3, 229, 141, 81, 18, 10, 32, - 89, 3, 237, 128, 87, 3, 83, 81, 18, 10, 32, 89, 3, 237, 128, 87, 3, 237, - 44, 81, 18, 10, 32, 248, 139, 3, 184, 81, 18, 10, 32, 248, 139, 3, 151, - 81, 18, 10, 32, 248, 139, 3, 229, 141, 81, 18, 10, 32, 248, 139, 3, 83, - 81, 18, 10, 32, 248, 139, 3, 237, 44, 81, 18, 10, 32, 209, 170, 3, 184, - 81, 18, 10, 32, 209, 170, 3, 151, 81, 18, 10, 32, 209, 170, 3, 229, 141, - 81, 18, 10, 32, 209, 170, 3, 83, 81, 18, 10, 32, 209, 170, 3, 237, 44, - 81, 18, 10, 32, 209, 89, 3, 83, 81, 18, 10, 32, 184, 3, 151, 81, 18, 10, - 32, 184, 3, 83, 81, 18, 10, 32, 151, 3, 184, 81, 18, 10, 32, 151, 3, 83, - 81, 18, 10, 32, 229, 141, 3, 184, 81, 18, 10, 32, 229, 141, 3, 83, 81, - 18, 10, 32, 214, 162, 3, 184, 81, 18, 10, 32, 214, 162, 3, 151, 81, 18, - 10, 32, 214, 162, 3, 229, 141, 81, 18, 10, 32, 214, 162, 3, 83, 81, 18, - 10, 32, 215, 29, 3, 151, 81, 18, 10, 32, 215, 29, 3, 229, 141, 81, 18, - 10, 32, 215, 29, 3, 83, 81, 18, 10, 32, 244, 208, 3, 184, 81, 18, 10, 32, - 244, 208, 3, 151, 81, 18, 10, 32, 244, 208, 3, 229, 141, 81, 18, 10, 32, - 244, 208, 3, 83, 81, 18, 10, 32, 209, 252, 3, 151, 81, 18, 10, 32, 202, - 111, 3, 83, 81, 18, 10, 32, 251, 60, 3, 184, 81, 18, 10, 32, 251, 60, 3, - 83, 81, 18, 10, 32, 238, 115, 3, 184, 81, 18, 10, 32, 238, 115, 3, 83, - 81, 18, 10, 32, 240, 48, 3, 184, 81, 18, 10, 32, 240, 48, 3, 151, 81, 18, - 10, 32, 240, 48, 3, 229, 141, 81, 18, 10, 32, 240, 48, 3, 83, 81, 18, 10, - 32, 217, 120, 3, 151, 81, 18, 10, 32, 217, 120, 3, 83, 81, 18, 10, 32, - 230, 23, 3, 184, 81, 18, 10, 32, 230, 23, 3, 151, 81, 18, 10, 32, 230, - 23, 3, 229, 141, 81, 18, 10, 32, 230, 23, 3, 228, 29, 81, 18, 10, 32, - 230, 23, 3, 83, 81, 18, 10, 32, 228, 29, 3, 184, 81, 18, 10, 32, 228, 29, - 3, 151, 81, 18, 10, 32, 228, 29, 3, 229, 141, 81, 18, 10, 32, 228, 29, 3, - 83, 81, 18, 10, 32, 228, 29, 3, 237, 44, 81, 18, 10, 32, 83, 3, 184, 81, - 18, 10, 32, 83, 3, 151, 81, 18, 10, 32, 83, 3, 229, 141, 81, 18, 10, 32, - 83, 3, 83, 81, 18, 10, 32, 221, 179, 3, 184, 81, 18, 10, 32, 221, 179, 3, - 151, 81, 18, 10, 32, 221, 179, 3, 229, 141, 81, 18, 10, 32, 221, 179, 3, - 83, 81, 18, 10, 32, 221, 179, 3, 237, 44, 81, 18, 10, 32, 237, 44, 3, - 184, 81, 18, 10, 32, 237, 44, 3, 83, 81, 18, 10, 32, 237, 44, 3, 210, - 199, 137, 81, 18, 10, 32, 89, 3, 184, 81, 18, 10, 32, 89, 3, 151, 81, 18, - 10, 32, 89, 3, 229, 141, 81, 18, 10, 32, 89, 3, 83, 81, 18, 10, 32, 89, - 3, 237, 44, 81, 18, 10, 32, 89, 3, 237, 128, 87, 3, 83, 174, 18, 10, 32, - 89, 3, 237, 128, 87, 3, 237, 44, 174, 18, 10, 32, 248, 139, 3, 83, 174, - 18, 10, 32, 248, 139, 3, 237, 44, 174, 18, 10, 32, 209, 170, 3, 83, 174, - 18, 10, 32, 209, 170, 3, 237, 44, 174, 18, 10, 32, 209, 89, 3, 83, 174, - 18, 10, 32, 209, 89, 3, 237, 44, 174, 18, 10, 32, 214, 162, 3, 83, 174, - 18, 10, 32, 214, 162, 3, 237, 44, 174, 18, 10, 32, 213, 40, 3, 83, 174, - 18, 10, 32, 213, 40, 3, 237, 44, 174, 18, 10, 32, 230, 23, 3, 228, 29, - 174, 18, 10, 32, 230, 23, 3, 83, 174, 18, 10, 32, 228, 29, 3, 83, 174, - 18, 10, 32, 221, 179, 3, 83, 174, 18, 10, 32, 221, 179, 3, 237, 44, 174, - 18, 10, 32, 89, 3, 83, 174, 18, 10, 32, 89, 3, 237, 44, 174, 18, 10, 32, - 213, 81, 3, 240, 72, 174, 18, 10, 32, 213, 81, 3, 244, 173, 174, 18, 10, - 32, 213, 81, 3, 229, 230, 174, 18, 10, 32, 209, 252, 3, 137, 225, 130, - 64, 18, 10, 32, 209, 252, 3, 89, 64, 18, 10, 32, 251, 60, 3, 137, 225, - 130, 64, 18, 10, 32, 251, 60, 3, 89, 64, 18, 10, 32, 238, 115, 3, 137, - 225, 130, 64, 18, 10, 32, 238, 115, 3, 89, 64, 18, 10, 32, 214, 162, 3, - 137, 225, 130, 64, 18, 10, 32, 214, 162, 3, 89, 64, 18, 10, 32, 213, 40, - 3, 137, 225, 130, 64, 18, 10, 32, 213, 40, 3, 89, 64, 18, 10, 32, 151, 3, - 137, 225, 130, 64, 18, 10, 32, 151, 3, 89, 64, 18, 10, 32, 184, 3, 137, - 225, 130, 64, 18, 10, 32, 184, 3, 89, 64, 18, 10, 32, 229, 141, 3, 137, - 225, 130, 64, 18, 10, 32, 229, 141, 3, 89, 64, 18, 10, 32, 215, 29, 3, - 137, 225, 130, 64, 18, 10, 32, 215, 29, 3, 89, 64, 18, 10, 32, 244, 208, - 3, 137, 225, 130, 64, 18, 10, 32, 244, 208, 3, 89, 64, 18, 10, 32, 213, - 40, 3, 184, 64, 18, 10, 32, 213, 40, 3, 151, 64, 18, 10, 32, 213, 40, 3, - 229, 141, 64, 18, 10, 32, 213, 40, 3, 83, 64, 18, 10, 32, 213, 40, 3, - 216, 123, 64, 18, 10, 32, 214, 162, 3, 216, 123, 64, 18, 10, 32, 215, 29, - 3, 216, 123, 64, 18, 10, 32, 244, 208, 3, 216, 123, 64, 18, 10, 32, 209, - 252, 3, 137, 225, 130, 46, 18, 10, 32, 209, 252, 3, 89, 46, 18, 10, 32, - 251, 60, 3, 137, 225, 130, 46, 18, 10, 32, 251, 60, 3, 89, 46, 18, 10, - 32, 238, 115, 3, 137, 225, 130, 46, 18, 10, 32, 238, 115, 3, 89, 46, 18, - 10, 32, 214, 162, 3, 137, 225, 130, 46, 18, 10, 32, 214, 162, 3, 89, 46, - 18, 10, 32, 213, 40, 3, 137, 225, 130, 46, 18, 10, 32, 213, 40, 3, 89, - 46, 18, 10, 32, 151, 3, 137, 225, 130, 46, 18, 10, 32, 151, 3, 89, 46, - 18, 10, 32, 184, 3, 137, 225, 130, 46, 18, 10, 32, 184, 3, 89, 46, 18, - 10, 32, 229, 141, 3, 137, 225, 130, 46, 18, 10, 32, 229, 141, 3, 89, 46, - 18, 10, 32, 215, 29, 3, 137, 225, 130, 46, 18, 10, 32, 215, 29, 3, 89, - 46, 18, 10, 32, 244, 208, 3, 137, 225, 130, 46, 18, 10, 32, 244, 208, 3, - 89, 46, 18, 10, 32, 213, 40, 3, 184, 46, 18, 10, 32, 213, 40, 3, 151, 46, - 18, 10, 32, 213, 40, 3, 229, 141, 46, 18, 10, 32, 213, 40, 3, 83, 46, 18, - 10, 32, 213, 40, 3, 216, 123, 46, 18, 10, 32, 214, 162, 3, 216, 123, 46, - 18, 10, 32, 215, 29, 3, 216, 123, 46, 18, 10, 32, 244, 208, 3, 216, 123, - 46, 18, 10, 32, 213, 40, 3, 184, 81, 18, 10, 32, 213, 40, 3, 151, 81, 18, - 10, 32, 213, 40, 3, 229, 141, 81, 18, 10, 32, 213, 40, 3, 83, 81, 18, 10, - 32, 214, 162, 3, 237, 44, 81, 18, 10, 32, 213, 40, 3, 237, 44, 81, 18, - 10, 32, 209, 252, 3, 83, 81, 18, 10, 32, 214, 162, 3, 184, 174, 18, 10, - 32, 214, 162, 3, 151, 174, 18, 10, 32, 214, 162, 3, 229, 141, 174, 18, - 10, 32, 213, 40, 3, 184, 174, 18, 10, 32, 213, 40, 3, 151, 174, 18, 10, - 32, 213, 40, 3, 229, 141, 174, 18, 10, 32, 209, 252, 3, 83, 174, 18, 10, - 32, 202, 111, 3, 83, 174, 18, 10, 32, 137, 3, 240, 70, 46, 18, 10, 32, - 137, 3, 240, 70, 64, 18, 219, 231, 49, 219, 76, 219, 231, 50, 219, 76, - 10, 32, 209, 170, 3, 184, 3, 83, 81, 18, 10, 32, 209, 170, 3, 151, 3, - 184, 46, 18, 10, 32, 209, 170, 3, 151, 3, 184, 81, 18, 10, 32, 209, 170, - 3, 151, 3, 83, 81, 18, 10, 32, 209, 170, 3, 229, 141, 3, 83, 81, 18, 10, - 32, 209, 170, 3, 83, 3, 184, 81, 18, 10, 32, 209, 170, 3, 83, 3, 151, 81, - 18, 10, 32, 209, 170, 3, 83, 3, 229, 141, 81, 18, 10, 32, 184, 3, 83, 3, - 151, 46, 18, 10, 32, 184, 3, 83, 3, 151, 81, 18, 10, 32, 151, 3, 83, 3, - 89, 46, 18, 10, 32, 151, 3, 83, 3, 137, 225, 130, 46, 18, 10, 32, 214, - 162, 3, 151, 3, 184, 81, 18, 10, 32, 214, 162, 3, 184, 3, 151, 81, 18, - 10, 32, 214, 162, 3, 184, 3, 137, 225, 130, 46, 18, 10, 32, 214, 162, 3, - 83, 3, 151, 46, 18, 10, 32, 214, 162, 3, 83, 3, 151, 81, 18, 10, 32, 214, - 162, 3, 83, 3, 184, 81, 18, 10, 32, 214, 162, 3, 83, 3, 83, 46, 18, 10, - 32, 214, 162, 3, 83, 3, 83, 81, 18, 10, 32, 215, 29, 3, 151, 3, 151, 46, - 18, 10, 32, 215, 29, 3, 151, 3, 151, 81, 18, 10, 32, 215, 29, 3, 83, 3, - 83, 46, 18, 10, 32, 213, 40, 3, 151, 3, 83, 46, 18, 10, 32, 213, 40, 3, - 151, 3, 83, 81, 18, 10, 32, 213, 40, 3, 184, 3, 89, 46, 18, 10, 32, 213, - 40, 3, 83, 3, 229, 141, 46, 18, 10, 32, 213, 40, 3, 83, 3, 229, 141, 81, - 18, 10, 32, 213, 40, 3, 83, 3, 83, 46, 18, 10, 32, 213, 40, 3, 83, 3, 83, - 81, 18, 10, 32, 244, 208, 3, 151, 3, 137, 225, 130, 46, 18, 10, 32, 244, - 208, 3, 229, 141, 3, 83, 46, 18, 10, 32, 244, 208, 3, 229, 141, 3, 83, - 81, 18, 10, 32, 209, 252, 3, 83, 3, 151, 46, 18, 10, 32, 209, 252, 3, 83, - 3, 151, 81, 18, 10, 32, 209, 252, 3, 83, 3, 83, 81, 18, 10, 32, 209, 252, - 3, 83, 3, 89, 46, 18, 10, 32, 251, 60, 3, 184, 3, 83, 46, 18, 10, 32, - 251, 60, 3, 83, 3, 83, 46, 18, 10, 32, 251, 60, 3, 83, 3, 83, 81, 18, 10, - 32, 251, 60, 3, 83, 3, 137, 225, 130, 46, 18, 10, 32, 238, 115, 3, 83, 3, - 83, 46, 18, 10, 32, 238, 115, 3, 83, 3, 89, 46, 18, 10, 32, 238, 115, 3, - 83, 3, 137, 225, 130, 46, 18, 10, 32, 240, 48, 3, 229, 141, 3, 83, 46, - 18, 10, 32, 240, 48, 3, 229, 141, 3, 83, 81, 18, 10, 32, 217, 120, 3, 83, - 3, 151, 46, 18, 10, 32, 217, 120, 3, 83, 3, 83, 46, 18, 10, 32, 228, 29, - 3, 151, 3, 83, 46, 18, 10, 32, 228, 29, 3, 151, 3, 89, 46, 18, 10, 32, - 228, 29, 3, 151, 3, 137, 225, 130, 46, 18, 10, 32, 228, 29, 3, 184, 3, - 184, 81, 18, 10, 32, 228, 29, 3, 184, 3, 184, 46, 18, 10, 32, 228, 29, 3, - 229, 141, 3, 83, 46, 18, 10, 32, 228, 29, 3, 229, 141, 3, 83, 81, 18, 10, - 32, 228, 29, 3, 83, 3, 151, 46, 18, 10, 32, 228, 29, 3, 83, 3, 151, 81, - 18, 10, 32, 83, 3, 151, 3, 184, 81, 18, 10, 32, 83, 3, 151, 3, 83, 81, - 18, 10, 32, 83, 3, 151, 3, 89, 46, 18, 10, 32, 83, 3, 184, 3, 151, 81, - 18, 10, 32, 83, 3, 184, 3, 83, 81, 18, 10, 32, 83, 3, 229, 141, 3, 184, - 81, 18, 10, 32, 83, 3, 229, 141, 3, 83, 81, 18, 10, 32, 83, 3, 184, 3, - 229, 141, 81, 18, 10, 32, 237, 44, 3, 83, 3, 184, 81, 18, 10, 32, 237, - 44, 3, 83, 3, 83, 81, 18, 10, 32, 221, 179, 3, 151, 3, 83, 81, 18, 10, - 32, 221, 179, 3, 151, 3, 137, 225, 130, 46, 18, 10, 32, 221, 179, 3, 184, - 3, 83, 46, 18, 10, 32, 221, 179, 3, 184, 3, 83, 81, 18, 10, 32, 221, 179, - 3, 184, 3, 137, 225, 130, 46, 18, 10, 32, 221, 179, 3, 83, 3, 89, 46, 18, - 10, 32, 221, 179, 3, 83, 3, 137, 225, 130, 46, 18, 10, 32, 89, 3, 83, 3, - 83, 46, 18, 10, 32, 89, 3, 83, 3, 83, 81, 18, 10, 32, 248, 139, 3, 229, - 141, 3, 89, 46, 18, 10, 32, 209, 170, 3, 184, 3, 89, 46, 18, 10, 32, 209, - 170, 3, 184, 3, 137, 225, 130, 46, 18, 10, 32, 209, 170, 3, 229, 141, 3, - 89, 46, 18, 10, 32, 209, 170, 3, 229, 141, 3, 137, 225, 130, 46, 18, 10, - 32, 209, 170, 3, 83, 3, 89, 46, 18, 10, 32, 209, 170, 3, 83, 3, 137, 225, - 130, 46, 18, 10, 32, 184, 3, 83, 3, 89, 46, 18, 10, 32, 184, 3, 151, 3, - 137, 225, 130, 46, 18, 10, 32, 184, 3, 83, 3, 137, 225, 130, 46, 18, 10, - 32, 214, 162, 3, 229, 141, 3, 137, 225, 130, 46, 18, 10, 32, 215, 29, 3, - 151, 3, 89, 46, 18, 10, 32, 213, 40, 3, 151, 3, 89, 46, 18, 10, 32, 244, - 208, 3, 151, 3, 89, 46, 18, 10, 32, 228, 29, 3, 184, 3, 89, 46, 18, 10, - 32, 228, 29, 3, 83, 3, 89, 46, 18, 10, 32, 89, 3, 151, 3, 89, 46, 18, 10, - 32, 89, 3, 184, 3, 89, 46, 18, 10, 32, 89, 3, 83, 3, 89, 46, 18, 10, 32, - 83, 3, 83, 3, 89, 46, 18, 10, 32, 217, 120, 3, 83, 3, 89, 46, 18, 10, 32, - 221, 179, 3, 151, 3, 89, 46, 18, 10, 32, 217, 120, 3, 83, 3, 151, 81, 18, - 10, 32, 228, 29, 3, 151, 3, 83, 81, 18, 10, 32, 251, 60, 3, 83, 3, 89, - 46, 18, 10, 32, 230, 23, 3, 83, 3, 89, 46, 18, 10, 32, 221, 179, 3, 184, - 3, 151, 81, 18, 10, 32, 83, 3, 229, 141, 3, 89, 46, 18, 10, 32, 228, 29, - 3, 184, 3, 83, 81, 18, 10, 32, 230, 23, 3, 83, 3, 83, 46, 18, 10, 32, - 228, 29, 3, 184, 3, 83, 46, 18, 10, 32, 221, 179, 3, 184, 3, 151, 46, 18, - 10, 32, 184, 3, 151, 3, 89, 46, 18, 10, 32, 151, 3, 184, 3, 89, 46, 18, - 10, 32, 83, 3, 184, 3, 89, 46, 18, 10, 32, 240, 48, 3, 83, 3, 89, 46, 18, - 10, 32, 248, 139, 3, 151, 3, 89, 46, 18, 10, 32, 230, 23, 3, 83, 3, 83, - 81, 18, 10, 32, 251, 60, 3, 184, 3, 83, 81, 18, 10, 32, 215, 29, 3, 83, - 3, 83, 81, 18, 10, 32, 214, 162, 3, 229, 141, 3, 89, 46, 18, 10, 32, 221, - 179, 3, 184, 3, 89, 46, 18, 10, 32, 215, 4, 206, 188, 250, 82, 228, 254, - 211, 62, 2, 64, 18, 10, 32, 217, 116, 206, 188, 250, 82, 228, 254, 211, - 62, 2, 64, 18, 10, 32, 251, 13, 64, 18, 10, 32, 251, 44, 64, 18, 10, 32, - 224, 57, 64, 18, 10, 32, 215, 5, 64, 18, 10, 32, 216, 174, 64, 18, 10, - 32, 251, 33, 64, 18, 10, 32, 204, 90, 64, 18, 10, 32, 215, 4, 64, 18, 10, - 32, 215, 3, 251, 33, 204, 89, 10, 32, 230, 172, 216, 56, 54, 10, 32, 248, - 53, 250, 142, 250, 143, 57, 214, 149, 57, 214, 38, 57, 213, 226, 57, 213, - 215, 57, 213, 204, 57, 213, 193, 57, 213, 182, 57, 213, 171, 57, 213, - 160, 57, 214, 148, 57, 214, 137, 57, 214, 126, 57, 214, 115, 57, 214, - 104, 57, 214, 93, 57, 214, 82, 217, 241, 239, 159, 35, 80, 245, 233, 217, - 241, 239, 159, 35, 80, 139, 245, 233, 217, 241, 239, 159, 35, 80, 139, - 239, 102, 211, 61, 217, 241, 239, 159, 35, 80, 245, 242, 217, 241, 239, - 159, 35, 80, 213, 143, 217, 241, 239, 159, 35, 80, 240, 212, 82, 217, - 241, 239, 159, 35, 80, 217, 47, 82, 217, 241, 239, 159, 35, 80, 49, 61, - 227, 185, 155, 217, 241, 239, 159, 35, 80, 50, 61, 227, 185, 247, 225, - 217, 241, 239, 159, 35, 80, 236, 106, 241, 108, 39, 32, 49, 237, 137, 39, - 32, 50, 237, 137, 39, 52, 208, 228, 49, 237, 137, 39, 52, 208, 228, 50, - 237, 137, 39, 225, 171, 49, 237, 137, 39, 225, 171, 50, 237, 137, 39, - 245, 206, 225, 170, 39, 32, 49, 162, 56, 39, 32, 50, 162, 56, 39, 208, - 228, 49, 162, 56, 39, 208, 228, 50, 162, 56, 39, 225, 171, 49, 162, 56, - 39, 225, 171, 50, 162, 56, 39, 245, 206, 225, 171, 56, 39, 36, 208, 198, - 49, 237, 137, 39, 36, 208, 198, 50, 237, 137, 217, 241, 239, 159, 35, 80, - 120, 70, 227, 232, 217, 241, 239, 159, 35, 80, 241, 104, 244, 144, 217, - 241, 239, 159, 35, 80, 241, 93, 244, 144, 217, 241, 239, 159, 35, 80, - 124, 227, 114, 217, 241, 239, 159, 35, 80, 204, 72, 124, 227, 114, 217, - 241, 239, 159, 35, 80, 49, 219, 76, 217, 241, 239, 159, 35, 80, 50, 219, - 76, 217, 241, 239, 159, 35, 80, 49, 245, 93, 155, 217, 241, 239, 159, 35, - 80, 50, 245, 93, 155, 217, 241, 239, 159, 35, 80, 49, 208, 133, 213, 33, - 155, 217, 241, 239, 159, 35, 80, 50, 208, 133, 213, 33, 155, 217, 241, - 239, 159, 35, 80, 49, 62, 227, 185, 155, 217, 241, 239, 159, 35, 80, 50, - 62, 227, 185, 155, 217, 241, 239, 159, 35, 80, 49, 52, 250, 218, 155, - 217, 241, 239, 159, 35, 80, 50, 52, 250, 218, 155, 217, 241, 239, 159, - 35, 80, 49, 250, 218, 155, 217, 241, 239, 159, 35, 80, 50, 250, 218, 155, - 217, 241, 239, 159, 35, 80, 49, 245, 166, 155, 217, 241, 239, 159, 35, - 80, 50, 245, 166, 155, 217, 241, 239, 159, 35, 80, 49, 61, 245, 166, 155, - 217, 241, 239, 159, 35, 80, 50, 61, 245, 166, 155, 213, 121, 243, 85, 61, - 213, 121, 243, 85, 217, 241, 239, 159, 35, 80, 49, 51, 155, 217, 241, - 239, 159, 35, 80, 50, 51, 155, 244, 143, 219, 198, 246, 214, 219, 198, - 204, 72, 219, 198, 52, 204, 72, 219, 198, 244, 143, 124, 227, 114, 246, - 214, 124, 227, 114, 204, 72, 124, 227, 114, 5, 245, 233, 5, 139, 245, - 233, 5, 239, 102, 211, 61, 5, 213, 143, 5, 245, 242, 5, 217, 47, 82, 5, - 240, 212, 82, 5, 241, 104, 244, 144, 5, 49, 219, 76, 5, 50, 219, 76, 5, - 49, 245, 93, 155, 5, 50, 245, 93, 155, 5, 49, 208, 133, 213, 33, 155, 5, - 50, 208, 133, 213, 33, 155, 5, 42, 54, 5, 250, 235, 5, 250, 59, 5, 91, - 54, 5, 235, 219, 5, 227, 179, 54, 5, 237, 247, 54, 5, 241, 35, 54, 5, - 216, 74, 212, 0, 5, 243, 97, 54, 5, 218, 246, 54, 5, 245, 231, 250, 49, - 10, 240, 70, 64, 18, 10, 209, 210, 3, 240, 70, 55, 10, 244, 171, 64, 18, - 10, 209, 249, 239, 137, 10, 229, 228, 64, 18, 10, 240, 72, 64, 18, 10, - 240, 72, 174, 18, 10, 244, 173, 64, 18, 10, 244, 173, 174, 18, 10, 229, - 230, 64, 18, 10, 229, 230, 174, 18, 10, 213, 81, 64, 18, 10, 213, 81, - 174, 18, 10, 210, 223, 64, 18, 10, 210, 223, 174, 18, 10, 1, 237, 128, - 64, 18, 10, 1, 137, 3, 225, 166, 87, 64, 18, 10, 1, 137, 3, 225, 166, 87, - 46, 18, 10, 1, 137, 3, 237, 128, 87, 64, 18, 10, 1, 137, 3, 237, 128, 87, - 46, 18, 10, 1, 204, 71, 3, 237, 128, 87, 64, 18, 10, 1, 204, 71, 3, 237, - 128, 87, 46, 18, 10, 1, 137, 3, 237, 128, 248, 126, 64, 18, 10, 1, 137, - 3, 237, 128, 248, 126, 46, 18, 10, 1, 89, 3, 237, 128, 87, 64, 18, 10, 1, - 89, 3, 237, 128, 87, 46, 18, 10, 1, 89, 3, 237, 128, 87, 81, 18, 10, 1, - 89, 3, 237, 128, 87, 174, 18, 10, 1, 137, 64, 18, 10, 1, 137, 46, 18, 10, - 1, 248, 139, 64, 18, 10, 1, 248, 139, 46, 18, 10, 1, 248, 139, 81, 18, - 10, 1, 248, 139, 174, 18, 10, 1, 209, 170, 225, 99, 64, 18, 10, 1, 209, - 170, 225, 99, 46, 18, 10, 1, 209, 170, 64, 18, 10, 1, 209, 170, 46, 18, - 10, 1, 209, 170, 81, 18, 10, 1, 209, 170, 174, 18, 10, 1, 209, 89, 64, - 18, 10, 1, 209, 89, 46, 18, 10, 1, 209, 89, 81, 18, 10, 1, 209, 89, 174, - 18, 10, 1, 184, 64, 18, 10, 1, 184, 46, 18, 10, 1, 184, 81, 18, 10, 1, - 184, 174, 18, 10, 1, 151, 64, 18, 10, 1, 151, 46, 18, 10, 1, 151, 81, 18, - 10, 1, 151, 174, 18, 10, 1, 229, 141, 64, 18, 10, 1, 229, 141, 46, 18, - 10, 1, 229, 141, 81, 18, 10, 1, 229, 141, 174, 18, 10, 1, 244, 185, 64, - 18, 10, 1, 244, 185, 46, 18, 10, 1, 209, 101, 64, 18, 10, 1, 209, 101, - 46, 18, 10, 1, 216, 123, 64, 18, 10, 1, 216, 123, 46, 18, 10, 1, 202, - 108, 64, 18, 10, 1, 202, 108, 46, 18, 10, 1, 214, 162, 64, 18, 10, 1, - 214, 162, 46, 18, 10, 1, 214, 162, 81, 18, 10, 1, 214, 162, 174, 18, 10, - 1, 213, 40, 64, 18, 10, 1, 213, 40, 46, 18, 10, 1, 213, 40, 81, 18, 10, - 1, 213, 40, 174, 18, 10, 1, 215, 29, 64, 18, 10, 1, 215, 29, 46, 18, 10, - 1, 215, 29, 81, 18, 10, 1, 215, 29, 174, 18, 10, 1, 244, 208, 64, 18, 10, - 1, 244, 208, 46, 18, 10, 1, 244, 208, 81, 18, 10, 1, 244, 208, 174, 18, - 10, 1, 209, 252, 64, 18, 10, 1, 209, 252, 46, 18, 10, 1, 209, 252, 81, - 18, 10, 1, 209, 252, 174, 18, 10, 1, 202, 111, 64, 18, 10, 1, 202, 111, - 46, 18, 10, 1, 202, 111, 81, 18, 10, 1, 202, 111, 174, 18, 10, 1, 251, - 60, 64, 18, 10, 1, 251, 60, 46, 18, 10, 1, 251, 60, 81, 18, 10, 1, 251, - 60, 174, 18, 10, 1, 238, 115, 64, 18, 10, 1, 238, 115, 46, 18, 10, 1, - 238, 115, 81, 18, 10, 1, 238, 115, 174, 18, 10, 1, 240, 48, 64, 18, 10, - 1, 240, 48, 46, 18, 10, 1, 240, 48, 81, 18, 10, 1, 240, 48, 174, 18, 10, - 1, 217, 120, 64, 18, 10, 1, 217, 120, 46, 18, 10, 1, 217, 120, 81, 18, - 10, 1, 217, 120, 174, 18, 10, 1, 230, 23, 64, 18, 10, 1, 230, 23, 46, 18, - 10, 1, 230, 23, 81, 18, 10, 1, 230, 23, 174, 18, 10, 1, 228, 29, 64, 18, - 10, 1, 228, 29, 46, 18, 10, 1, 228, 29, 81, 18, 10, 1, 228, 29, 174, 18, - 10, 1, 83, 64, 18, 10, 1, 83, 46, 18, 10, 1, 83, 81, 18, 10, 1, 83, 174, - 18, 10, 1, 221, 179, 64, 18, 10, 1, 221, 179, 46, 18, 10, 1, 221, 179, - 81, 18, 10, 1, 221, 179, 174, 18, 10, 1, 237, 44, 64, 18, 10, 1, 237, 44, - 46, 18, 10, 1, 237, 44, 81, 18, 10, 1, 237, 44, 174, 18, 10, 1, 204, 71, - 64, 18, 10, 1, 204, 71, 46, 18, 10, 1, 137, 225, 130, 64, 18, 10, 1, 137, - 225, 130, 46, 18, 10, 1, 89, 64, 18, 10, 1, 89, 46, 18, 10, 1, 89, 81, - 18, 10, 1, 89, 174, 18, 10, 32, 228, 29, 3, 137, 3, 225, 166, 87, 64, 18, - 10, 32, 228, 29, 3, 137, 3, 225, 166, 87, 46, 18, 10, 32, 228, 29, 3, - 137, 3, 237, 128, 87, 64, 18, 10, 32, 228, 29, 3, 137, 3, 237, 128, 87, - 46, 18, 10, 32, 228, 29, 3, 137, 3, 237, 128, 248, 126, 64, 18, 10, 32, - 228, 29, 3, 137, 3, 237, 128, 248, 126, 46, 18, 10, 32, 228, 29, 3, 137, - 64, 18, 10, 32, 228, 29, 3, 137, 46, 18, 202, 85, 204, 24, 221, 190, 211, - 228, 154, 240, 212, 82, 154, 217, 31, 82, 154, 42, 54, 154, 243, 97, 54, - 154, 218, 246, 54, 154, 250, 235, 154, 250, 160, 154, 49, 219, 76, 154, - 50, 219, 76, 154, 250, 59, 154, 91, 54, 154, 245, 233, 154, 235, 219, - 154, 239, 102, 211, 61, 154, 212, 0, 154, 17, 202, 84, 154, 17, 105, 154, - 17, 108, 154, 17, 147, 154, 17, 149, 154, 17, 170, 154, 17, 195, 154, 17, - 213, 111, 154, 17, 199, 154, 17, 222, 63, 154, 245, 242, 154, 213, 143, - 154, 227, 179, 54, 154, 241, 35, 54, 154, 237, 247, 54, 154, 217, 47, 82, - 154, 245, 231, 250, 49, 154, 8, 6, 1, 63, 154, 8, 6, 1, 249, 255, 154, 8, - 6, 1, 247, 125, 154, 8, 6, 1, 245, 51, 154, 8, 6, 1, 74, 154, 8, 6, 1, - 240, 174, 154, 8, 6, 1, 239, 75, 154, 8, 6, 1, 237, 171, 154, 8, 6, 1, - 75, 154, 8, 6, 1, 230, 184, 154, 8, 6, 1, 230, 54, 154, 8, 6, 1, 159, - 154, 8, 6, 1, 226, 185, 154, 8, 6, 1, 223, 163, 154, 8, 6, 1, 78, 154, 8, - 6, 1, 219, 184, 154, 8, 6, 1, 217, 134, 154, 8, 6, 1, 146, 154, 8, 6, 1, - 194, 154, 8, 6, 1, 210, 69, 154, 8, 6, 1, 68, 154, 8, 6, 1, 206, 164, - 154, 8, 6, 1, 204, 144, 154, 8, 6, 1, 203, 196, 154, 8, 6, 1, 203, 124, - 154, 8, 6, 1, 202, 159, 154, 49, 51, 155, 154, 216, 74, 212, 0, 154, 50, - 51, 155, 154, 246, 53, 251, 138, 154, 124, 227, 114, 154, 237, 254, 251, - 138, 154, 8, 5, 1, 63, 154, 8, 5, 1, 249, 255, 154, 8, 5, 1, 247, 125, - 154, 8, 5, 1, 245, 51, 154, 8, 5, 1, 74, 154, 8, 5, 1, 240, 174, 154, 8, - 5, 1, 239, 75, 154, 8, 5, 1, 237, 171, 154, 8, 5, 1, 75, 154, 8, 5, 1, - 230, 184, 154, 8, 5, 1, 230, 54, 154, 8, 5, 1, 159, 154, 8, 5, 1, 226, - 185, 154, 8, 5, 1, 223, 163, 154, 8, 5, 1, 78, 154, 8, 5, 1, 219, 184, - 154, 8, 5, 1, 217, 134, 154, 8, 5, 1, 146, 154, 8, 5, 1, 194, 154, 8, 5, - 1, 210, 69, 154, 8, 5, 1, 68, 154, 8, 5, 1, 206, 164, 154, 8, 5, 1, 204, - 144, 154, 8, 5, 1, 203, 196, 154, 8, 5, 1, 203, 124, 154, 8, 5, 1, 202, - 159, 154, 49, 245, 93, 155, 154, 80, 227, 114, 154, 50, 245, 93, 155, - 154, 208, 227, 154, 49, 61, 219, 76, 154, 50, 61, 219, 76, 127, 139, 239, - 102, 211, 61, 127, 49, 245, 166, 155, 127, 50, 245, 166, 155, 127, 139, - 245, 233, 127, 67, 101, 243, 85, 127, 67, 1, 204, 0, 127, 67, 1, 5, 63, - 127, 67, 1, 5, 75, 127, 67, 1, 5, 68, 127, 67, 1, 5, 74, 127, 67, 1, 5, - 78, 127, 67, 1, 5, 198, 127, 67, 1, 5, 202, 213, 127, 67, 1, 5, 202, 247, - 127, 67, 1, 5, 207, 203, 127, 229, 225, 217, 215, 211, 241, 82, 127, 67, - 1, 63, 127, 67, 1, 75, 127, 67, 1, 68, 127, 67, 1, 74, 127, 67, 1, 78, - 127, 67, 1, 173, 127, 67, 1, 229, 100, 127, 67, 1, 228, 209, 127, 67, 1, - 229, 201, 127, 67, 1, 229, 26, 127, 67, 1, 215, 36, 127, 67, 1, 212, 162, - 127, 67, 1, 211, 10, 127, 67, 1, 214, 177, 127, 67, 1, 212, 13, 127, 67, - 1, 210, 22, 127, 67, 1, 209, 2, 127, 67, 1, 207, 203, 127, 67, 1, 209, - 187, 127, 67, 1, 135, 127, 67, 1, 201, 201, 127, 67, 1, 222, 100, 127, - 67, 1, 221, 84, 127, 67, 1, 222, 240, 127, 67, 1, 221, 191, 127, 67, 1, - 152, 127, 67, 1, 237, 3, 127, 67, 1, 236, 26, 127, 67, 1, 237, 67, 127, - 67, 1, 236, 136, 127, 67, 1, 192, 127, 67, 1, 224, 155, 127, 67, 1, 223, - 246, 127, 67, 1, 225, 20, 127, 67, 1, 224, 82, 127, 67, 1, 198, 127, 67, - 1, 202, 213, 127, 67, 1, 202, 247, 127, 67, 1, 216, 220, 127, 67, 1, 216, - 57, 127, 67, 1, 215, 145, 127, 67, 1, 216, 158, 127, 67, 1, 215, 227, - 127, 67, 1, 204, 111, 127, 67, 1, 223, 163, 127, 67, 205, 186, 211, 241, - 82, 127, 67, 213, 148, 211, 241, 82, 127, 28, 240, 7, 127, 28, 1, 229, - 59, 127, 28, 1, 211, 156, 127, 28, 1, 229, 52, 127, 28, 1, 222, 93, 127, - 28, 1, 222, 91, 127, 28, 1, 222, 90, 127, 28, 1, 208, 240, 127, 28, 1, - 211, 145, 127, 28, 1, 216, 47, 127, 28, 1, 216, 42, 127, 28, 1, 216, 39, - 127, 28, 1, 216, 32, 127, 28, 1, 216, 27, 127, 28, 1, 216, 22, 127, 28, - 1, 216, 33, 127, 28, 1, 216, 45, 127, 28, 1, 224, 141, 127, 28, 1, 218, - 153, 127, 28, 1, 211, 153, 127, 28, 1, 218, 142, 127, 28, 1, 212, 111, - 127, 28, 1, 211, 150, 127, 28, 1, 231, 106, 127, 28, 1, 246, 74, 127, 28, - 1, 211, 160, 127, 28, 1, 246, 138, 127, 28, 1, 229, 120, 127, 28, 1, 209, - 66, 127, 28, 1, 218, 190, 127, 28, 1, 236, 251, 127, 28, 1, 63, 127, 28, - 1, 251, 109, 127, 28, 1, 198, 127, 28, 1, 203, 99, 127, 28, 1, 241, 55, - 127, 28, 1, 74, 127, 28, 1, 203, 39, 127, 28, 1, 203, 52, 127, 28, 1, 78, - 127, 28, 1, 204, 111, 127, 28, 1, 204, 107, 127, 28, 1, 220, 73, 127, 28, - 1, 202, 247, 127, 28, 1, 68, 127, 28, 1, 204, 48, 127, 28, 1, 204, 62, - 127, 28, 1, 204, 30, 127, 28, 1, 202, 213, 127, 28, 1, 240, 238, 127, 28, - 1, 203, 11, 127, 28, 1, 75, 154, 246, 220, 54, 154, 218, 20, 54, 154, - 221, 166, 54, 154, 225, 170, 154, 247, 203, 142, 154, 203, 43, 54, 154, - 203, 246, 54, 127, 239, 156, 157, 206, 38, 127, 96, 47, 127, 177, 47, - 127, 86, 47, 127, 183, 47, 127, 62, 211, 177, 127, 61, 246, 61, 230, 251, - 250, 205, 250, 228, 230, 251, 250, 205, 213, 130, 230, 251, 250, 205, - 209, 138, 220, 90, 216, 96, 246, 182, 216, 96, 246, 182, 29, 66, 4, 249, - 239, 63, 29, 66, 4, 249, 208, 74, 29, 66, 4, 249, 217, 75, 29, 66, 4, - 249, 185, 78, 29, 66, 4, 249, 235, 68, 29, 66, 4, 249, 254, 244, 212, 29, - 66, 4, 249, 201, 244, 75, 29, 66, 4, 249, 241, 243, 233, 29, 66, 4, 249, - 231, 243, 113, 29, 66, 4, 249, 195, 242, 42, 29, 66, 4, 249, 189, 230, - 181, 29, 66, 4, 249, 200, 230, 161, 29, 66, 4, 249, 210, 230, 101, 29, - 66, 4, 249, 181, 230, 82, 29, 66, 4, 249, 169, 173, 29, 66, 4, 249, 202, - 229, 201, 29, 66, 4, 249, 179, 229, 100, 29, 66, 4, 249, 176, 229, 26, - 29, 66, 4, 249, 165, 228, 209, 29, 66, 4, 249, 166, 192, 29, 66, 4, 249, - 232, 225, 20, 29, 66, 4, 249, 173, 224, 155, 29, 66, 4, 249, 230, 224, - 82, 29, 66, 4, 249, 222, 223, 246, 29, 66, 4, 249, 243, 201, 201, 29, 66, - 4, 249, 221, 222, 240, 29, 66, 4, 249, 215, 222, 100, 29, 66, 4, 249, - 194, 221, 191, 29, 66, 4, 249, 191, 221, 84, 29, 66, 4, 249, 250, 185, - 29, 66, 4, 249, 174, 219, 34, 29, 66, 4, 249, 207, 218, 167, 29, 66, 4, - 249, 234, 218, 69, 29, 66, 4, 249, 196, 217, 191, 29, 66, 4, 249, 229, - 217, 126, 29, 66, 4, 249, 168, 217, 106, 29, 66, 4, 249, 224, 217, 88, - 29, 66, 4, 249, 213, 217, 77, 29, 66, 4, 249, 186, 216, 220, 29, 66, 4, - 249, 218, 216, 158, 29, 66, 4, 249, 193, 216, 57, 29, 66, 4, 249, 252, - 215, 227, 29, 66, 4, 249, 219, 215, 145, 29, 66, 4, 249, 214, 215, 36, - 29, 66, 4, 249, 237, 214, 177, 29, 66, 4, 249, 205, 212, 162, 29, 66, 4, - 249, 233, 212, 13, 29, 66, 4, 249, 188, 211, 10, 29, 66, 4, 249, 187, - 210, 22, 29, 66, 4, 249, 248, 209, 187, 29, 66, 4, 249, 209, 209, 2, 29, - 66, 4, 249, 246, 135, 29, 66, 4, 249, 177, 207, 203, 29, 66, 4, 249, 192, - 204, 111, 29, 66, 4, 249, 171, 204, 62, 29, 66, 4, 249, 206, 204, 30, 29, - 66, 4, 249, 204, 204, 0, 29, 66, 4, 249, 228, 202, 116, 29, 66, 4, 249, - 172, 202, 92, 29, 66, 4, 249, 225, 202, 17, 29, 66, 4, 249, 220, 254, 34, - 29, 66, 4, 249, 203, 253, 178, 29, 66, 4, 249, 162, 250, 34, 29, 66, 4, - 249, 175, 242, 9, 29, 66, 4, 249, 158, 242, 8, 29, 66, 4, 249, 198, 221, - 20, 29, 66, 4, 249, 216, 217, 189, 29, 66, 4, 249, 184, 217, 193, 29, 66, - 4, 249, 170, 216, 218, 29, 66, 4, 249, 212, 216, 217, 29, 66, 4, 249, - 178, 215, 226, 29, 66, 4, 249, 180, 210, 19, 29, 66, 4, 249, 160, 207, - 158, 29, 66, 4, 249, 157, 108, 29, 66, 16, 249, 227, 29, 66, 16, 249, - 226, 29, 66, 16, 249, 223, 29, 66, 16, 249, 211, 29, 66, 16, 249, 199, - 29, 66, 16, 249, 197, 29, 66, 16, 249, 190, 29, 66, 16, 249, 183, 29, 66, - 16, 249, 182, 29, 66, 16, 249, 167, 29, 66, 16, 249, 164, 29, 66, 16, - 249, 163, 29, 66, 16, 249, 161, 29, 66, 16, 249, 159, 29, 66, 133, 249, - 156, 225, 122, 29, 66, 133, 249, 155, 203, 250, 29, 66, 133, 249, 154, - 244, 58, 29, 66, 133, 249, 153, 241, 32, 29, 66, 133, 249, 152, 225, 93, - 29, 66, 133, 249, 151, 211, 101, 29, 66, 133, 249, 150, 240, 219, 29, 66, - 133, 249, 149, 216, 184, 29, 66, 133, 249, 148, 213, 42, 29, 66, 133, - 249, 147, 237, 66, 29, 66, 133, 249, 146, 211, 235, 29, 66, 133, 249, - 145, 248, 21, 29, 66, 133, 249, 144, 245, 149, 29, 66, 133, 249, 143, - 247, 179, 29, 66, 133, 249, 142, 204, 38, 29, 66, 133, 249, 141, 248, - 227, 29, 66, 133, 249, 140, 220, 41, 29, 66, 133, 249, 139, 211, 207, 29, - 66, 133, 249, 138, 245, 59, 29, 66, 224, 45, 249, 137, 229, 249, 29, 66, - 224, 45, 249, 136, 230, 2, 29, 66, 133, 249, 135, 220, 55, 29, 66, 133, - 249, 134, 204, 12, 29, 66, 133, 249, 133, 29, 66, 224, 45, 249, 132, 250, - 119, 29, 66, 224, 45, 249, 131, 224, 232, 29, 66, 133, 249, 130, 247, - 202, 29, 66, 133, 249, 129, 238, 31, 29, 66, 133, 249, 128, 29, 66, 133, - 249, 127, 203, 241, 29, 66, 133, 249, 126, 29, 66, 133, 249, 125, 29, 66, - 133, 249, 124, 236, 53, 29, 66, 133, 249, 123, 29, 66, 133, 249, 122, 29, - 66, 133, 249, 121, 29, 66, 224, 45, 249, 119, 207, 172, 29, 66, 133, 249, - 118, 29, 66, 133, 249, 117, 29, 66, 133, 249, 116, 246, 10, 29, 66, 133, - 249, 115, 29, 66, 133, 249, 114, 29, 66, 133, 249, 113, 238, 221, 29, 66, - 133, 249, 112, 250, 106, 29, 66, 133, 249, 111, 29, 66, 133, 249, 110, - 29, 66, 133, 249, 109, 29, 66, 133, 249, 108, 29, 66, 133, 249, 107, 29, - 66, 133, 249, 106, 29, 66, 133, 249, 105, 29, 66, 133, 249, 104, 29, 66, - 133, 249, 103, 29, 66, 133, 249, 102, 224, 37, 29, 66, 133, 249, 101, 29, - 66, 133, 249, 100, 208, 95, 29, 66, 133, 249, 99, 29, 66, 133, 249, 98, - 29, 66, 133, 249, 97, 29, 66, 133, 249, 96, 29, 66, 133, 249, 95, 29, 66, - 133, 249, 94, 29, 66, 133, 249, 93, 29, 66, 133, 249, 92, 29, 66, 133, - 249, 91, 29, 66, 133, 249, 90, 29, 66, 133, 249, 89, 29, 66, 133, 249, - 88, 237, 35, 29, 66, 133, 249, 67, 239, 168, 29, 66, 133, 249, 64, 248, - 204, 29, 66, 133, 249, 59, 211, 214, 29, 66, 133, 249, 58, 47, 29, 66, - 133, 249, 57, 29, 66, 133, 249, 56, 210, 155, 29, 66, 133, 249, 55, 29, - 66, 133, 249, 54, 29, 66, 133, 249, 53, 204, 34, 246, 179, 29, 66, 133, - 249, 52, 246, 179, 29, 66, 133, 249, 51, 246, 180, 239, 134, 29, 66, 133, - 249, 50, 204, 36, 29, 66, 133, 249, 49, 29, 66, 133, 249, 48, 29, 66, - 224, 45, 249, 47, 243, 168, 29, 66, 133, 249, 46, 29, 66, 133, 249, 45, - 29, 66, 133, 249, 43, 29, 66, 133, 249, 42, 29, 66, 133, 249, 41, 29, 66, - 133, 249, 40, 244, 147, 29, 66, 133, 249, 39, 29, 66, 133, 249, 38, 29, - 66, 133, 249, 37, 29, 66, 133, 249, 36, 29, 66, 133, 249, 35, 29, 66, - 133, 205, 241, 249, 120, 29, 66, 133, 205, 241, 249, 87, 29, 66, 133, - 205, 241, 249, 86, 29, 66, 133, 205, 241, 249, 85, 29, 66, 133, 205, 241, - 249, 84, 29, 66, 133, 205, 241, 249, 83, 29, 66, 133, 205, 241, 249, 82, - 29, 66, 133, 205, 241, 249, 81, 29, 66, 133, 205, 241, 249, 80, 29, 66, - 133, 205, 241, 249, 79, 29, 66, 133, 205, 241, 249, 78, 29, 66, 133, 205, - 241, 249, 77, 29, 66, 133, 205, 241, 249, 76, 29, 66, 133, 205, 241, 249, - 75, 29, 66, 133, 205, 241, 249, 74, 29, 66, 133, 205, 241, 249, 73, 29, - 66, 133, 205, 241, 249, 72, 29, 66, 133, 205, 241, 249, 71, 29, 66, 133, - 205, 241, 249, 70, 29, 66, 133, 205, 241, 249, 69, 29, 66, 133, 205, 241, - 249, 68, 29, 66, 133, 205, 241, 249, 66, 29, 66, 133, 205, 241, 249, 65, - 29, 66, 133, 205, 241, 249, 63, 29, 66, 133, 205, 241, 249, 62, 29, 66, - 133, 205, 241, 249, 61, 29, 66, 133, 205, 241, 249, 60, 29, 66, 133, 205, - 241, 249, 44, 29, 66, 133, 205, 241, 249, 34, 251, 102, 203, 238, 213, - 131, 227, 114, 251, 102, 203, 238, 213, 131, 243, 85, 251, 102, 246, 169, - 82, 251, 102, 42, 105, 251, 102, 42, 108, 251, 102, 42, 147, 251, 102, - 42, 149, 251, 102, 42, 170, 251, 102, 42, 195, 251, 102, 42, 213, 111, - 251, 102, 42, 199, 251, 102, 42, 222, 63, 251, 102, 42, 209, 152, 251, - 102, 42, 207, 151, 251, 102, 42, 209, 53, 251, 102, 42, 239, 153, 251, - 102, 42, 240, 18, 251, 102, 42, 212, 74, 251, 102, 42, 213, 105, 251, - 102, 42, 241, 134, 251, 102, 42, 222, 58, 251, 102, 42, 118, 236, 11, - 251, 102, 42, 120, 236, 11, 251, 102, 42, 126, 236, 11, 251, 102, 42, - 239, 147, 236, 11, 251, 102, 42, 239, 233, 236, 11, 251, 102, 42, 212, - 88, 236, 11, 251, 102, 42, 213, 112, 236, 11, 251, 102, 42, 241, 143, - 236, 11, 251, 102, 42, 222, 64, 236, 11, 251, 102, 42, 118, 209, 36, 251, - 102, 42, 120, 209, 36, 251, 102, 42, 126, 209, 36, 251, 102, 42, 239, - 147, 209, 36, 251, 102, 42, 239, 233, 209, 36, 251, 102, 42, 212, 88, - 209, 36, 251, 102, 42, 213, 112, 209, 36, 251, 102, 42, 241, 143, 209, - 36, 251, 102, 42, 222, 64, 209, 36, 251, 102, 42, 209, 153, 209, 36, 251, - 102, 42, 207, 152, 209, 36, 251, 102, 42, 209, 54, 209, 36, 251, 102, 42, - 239, 154, 209, 36, 251, 102, 42, 240, 19, 209, 36, 251, 102, 42, 212, 75, - 209, 36, 251, 102, 42, 213, 106, 209, 36, 251, 102, 42, 241, 135, 209, - 36, 251, 102, 42, 222, 59, 209, 36, 251, 102, 204, 51, 248, 219, 206, - 235, 251, 102, 204, 51, 239, 245, 210, 240, 251, 102, 204, 51, 214, 171, - 210, 240, 251, 102, 204, 51, 209, 61, 210, 240, 251, 102, 204, 51, 239, - 140, 210, 240, 251, 102, 242, 45, 225, 19, 239, 245, 210, 240, 251, 102, - 227, 95, 225, 19, 239, 245, 210, 240, 251, 102, 225, 19, 214, 171, 210, - 240, 251, 102, 225, 19, 209, 61, 210, 240, 30, 251, 129, 250, 36, 118, - 217, 55, 30, 251, 129, 250, 36, 118, 237, 137, 30, 251, 129, 250, 36, - 118, 242, 65, 30, 251, 129, 250, 36, 170, 30, 251, 129, 250, 36, 240, 18, - 30, 251, 129, 250, 36, 239, 233, 236, 11, 30, 251, 129, 250, 36, 239, - 233, 209, 36, 30, 251, 129, 250, 36, 240, 19, 209, 36, 30, 251, 129, 250, - 36, 239, 233, 209, 237, 30, 251, 129, 250, 36, 209, 153, 209, 237, 30, - 251, 129, 250, 36, 240, 19, 209, 237, 30, 251, 129, 250, 36, 118, 236, - 12, 209, 237, 30, 251, 129, 250, 36, 239, 233, 236, 12, 209, 237, 30, - 251, 129, 250, 36, 118, 209, 37, 209, 237, 30, 251, 129, 250, 36, 239, - 233, 209, 37, 209, 237, 30, 251, 129, 250, 36, 239, 233, 211, 88, 30, - 251, 129, 250, 36, 209, 153, 211, 88, 30, 251, 129, 250, 36, 240, 19, - 211, 88, 30, 251, 129, 250, 36, 118, 236, 12, 211, 88, 30, 251, 129, 250, - 36, 239, 233, 236, 12, 211, 88, 30, 251, 129, 250, 36, 118, 209, 37, 211, - 88, 30, 251, 129, 250, 36, 209, 153, 209, 37, 211, 88, 30, 251, 129, 250, - 36, 240, 19, 209, 37, 211, 88, 30, 251, 129, 250, 36, 209, 153, 224, 85, - 30, 251, 129, 237, 29, 118, 218, 86, 30, 251, 129, 209, 76, 105, 30, 251, - 129, 237, 25, 105, 30, 251, 129, 241, 41, 108, 30, 251, 129, 209, 76, - 108, 30, 251, 129, 245, 56, 120, 242, 64, 30, 251, 129, 241, 41, 120, - 242, 64, 30, 251, 129, 208, 61, 170, 30, 251, 129, 208, 61, 209, 152, 30, - 251, 129, 208, 61, 209, 153, 250, 255, 18, 30, 251, 129, 237, 25, 209, - 152, 30, 251, 129, 224, 222, 209, 152, 30, 251, 129, 209, 76, 209, 152, - 30, 251, 129, 209, 76, 209, 53, 30, 251, 129, 208, 61, 240, 18, 30, 251, - 129, 208, 61, 240, 19, 250, 255, 18, 30, 251, 129, 237, 25, 240, 18, 30, - 251, 129, 209, 76, 240, 18, 30, 251, 129, 209, 76, 118, 236, 11, 30, 251, - 129, 209, 76, 126, 236, 11, 30, 251, 129, 241, 41, 239, 233, 236, 11, 30, - 251, 129, 208, 61, 239, 233, 236, 11, 30, 251, 129, 209, 76, 239, 233, - 236, 11, 30, 251, 129, 247, 21, 239, 233, 236, 11, 30, 251, 129, 223, 60, - 239, 233, 236, 11, 30, 251, 129, 209, 76, 118, 209, 36, 30, 251, 129, - 209, 76, 239, 233, 209, 36, 30, 251, 129, 244, 40, 239, 233, 224, 85, 30, - 251, 129, 211, 49, 240, 19, 224, 85, 30, 118, 162, 54, 30, 118, 162, 2, - 250, 255, 18, 30, 120, 209, 58, 54, 30, 126, 217, 54, 54, 30, 203, 50, - 54, 30, 209, 238, 54, 30, 242, 66, 54, 30, 220, 87, 54, 30, 120, 220, 86, - 54, 30, 126, 220, 86, 54, 30, 239, 147, 220, 86, 54, 30, 239, 233, 220, - 86, 54, 30, 224, 216, 54, 30, 228, 139, 248, 219, 54, 30, 227, 88, 54, - 30, 219, 213, 54, 30, 203, 173, 54, 30, 250, 87, 54, 30, 250, 102, 54, - 30, 238, 7, 54, 30, 208, 23, 248, 219, 54, 30, 202, 85, 54, 30, 118, 217, - 56, 54, 30, 212, 113, 54, 215, 210, 213, 102, 54, 215, 210, 206, 249, 54, - 215, 210, 213, 135, 54, 215, 210, 213, 100, 54, 215, 210, 243, 183, 213, - 100, 54, 215, 210, 212, 135, 54, 215, 210, 244, 36, 54, 215, 210, 217, - 39, 54, 215, 210, 213, 119, 54, 215, 210, 242, 23, 54, 215, 210, 250, 82, - 54, 215, 210, 246, 213, 54, 30, 16, 209, 208, 216, 59, 218, 203, 243, - 160, 2, 219, 25, 218, 203, 243, 160, 2, 218, 78, 237, 64, 218, 203, 243, - 160, 2, 209, 211, 237, 64, 218, 203, 243, 160, 2, 247, 42, 218, 203, 243, - 160, 2, 246, 133, 218, 203, 243, 160, 2, 203, 250, 218, 203, 243, 160, 2, - 237, 35, 218, 203, 243, 160, 2, 238, 213, 218, 203, 243, 160, 2, 209, 0, - 218, 203, 243, 160, 2, 47, 218, 203, 243, 160, 2, 247, 240, 218, 203, - 243, 160, 2, 213, 8, 218, 203, 243, 160, 2, 246, 4, 218, 203, 243, 160, - 2, 225, 121, 218, 203, 243, 160, 2, 225, 68, 218, 203, 243, 160, 2, 214, - 213, 218, 203, 243, 160, 2, 227, 143, 218, 203, 243, 160, 2, 248, 5, 218, - 203, 243, 160, 2, 247, 26, 218, 91, 218, 203, 243, 160, 2, 243, 98, 218, - 203, 243, 160, 2, 245, 239, 218, 203, 243, 160, 2, 212, 46, 218, 203, - 243, 160, 2, 245, 240, 218, 203, 243, 160, 2, 248, 147, 218, 203, 243, - 160, 2, 212, 251, 218, 203, 243, 160, 2, 236, 53, 218, 203, 243, 160, 2, - 237, 1, 218, 203, 243, 160, 2, 247, 174, 227, 210, 218, 203, 243, 160, 2, - 247, 17, 218, 203, 243, 160, 2, 216, 184, 218, 203, 243, 160, 2, 241, - 186, 218, 203, 243, 160, 2, 242, 71, 218, 203, 243, 160, 2, 207, 188, - 218, 203, 243, 160, 2, 248, 150, 218, 203, 243, 160, 2, 218, 92, 208, 95, - 218, 203, 243, 160, 2, 205, 211, 218, 203, 243, 160, 2, 219, 92, 218, - 203, 243, 160, 2, 215, 201, 218, 203, 243, 160, 2, 227, 127, 218, 203, - 243, 160, 2, 219, 194, 249, 25, 218, 203, 243, 160, 2, 239, 193, 218, - 203, 243, 160, 2, 237, 255, 218, 203, 243, 160, 2, 211, 50, 218, 203, - 243, 160, 2, 5, 250, 9, 218, 203, 243, 160, 2, 204, 72, 248, 238, 218, - 203, 243, 160, 2, 39, 220, 89, 95, 226, 197, 1, 63, 226, 197, 1, 74, 226, - 197, 1, 249, 255, 226, 197, 1, 248, 99, 226, 197, 1, 239, 75, 226, 197, - 1, 245, 51, 226, 197, 1, 75, 226, 197, 1, 204, 144, 226, 197, 1, 202, - 159, 226, 197, 1, 209, 110, 226, 197, 1, 230, 184, 226, 197, 1, 230, 54, - 226, 197, 1, 217, 134, 226, 197, 1, 159, 226, 197, 1, 226, 185, 226, 197, - 1, 223, 163, 226, 197, 1, 224, 87, 226, 197, 1, 221, 228, 226, 197, 1, - 68, 226, 197, 1, 219, 184, 226, 197, 1, 229, 48, 226, 197, 1, 146, 226, - 197, 1, 194, 226, 197, 1, 210, 69, 226, 197, 1, 207, 244, 226, 197, 1, - 250, 231, 226, 197, 1, 241, 92, 226, 197, 1, 237, 171, 226, 197, 1, 203, - 196, 247, 32, 1, 63, 247, 32, 1, 219, 170, 247, 32, 1, 245, 51, 247, 32, - 1, 159, 247, 32, 1, 206, 176, 247, 32, 1, 146, 247, 32, 1, 227, 238, 247, - 32, 1, 254, 34, 247, 32, 1, 217, 134, 247, 32, 1, 249, 255, 247, 32, 1, - 226, 185, 247, 32, 1, 78, 247, 32, 1, 244, 214, 247, 32, 1, 210, 69, 247, - 32, 1, 213, 92, 247, 32, 1, 213, 91, 247, 32, 1, 194, 247, 32, 1, 247, - 124, 247, 32, 1, 68, 247, 32, 1, 221, 228, 247, 32, 1, 203, 196, 247, 32, - 1, 223, 163, 247, 32, 1, 207, 243, 247, 32, 1, 219, 184, 247, 32, 1, 211, - 167, 247, 32, 1, 75, 247, 32, 1, 74, 247, 32, 1, 206, 173, 247, 32, 1, - 230, 54, 247, 32, 1, 230, 45, 247, 32, 1, 223, 27, 247, 32, 1, 206, 178, - 247, 32, 1, 239, 75, 247, 32, 1, 239, 10, 247, 32, 1, 211, 108, 247, 32, - 1, 211, 107, 247, 32, 1, 222, 205, 247, 32, 1, 231, 83, 247, 32, 1, 247, - 123, 247, 32, 1, 207, 244, 247, 32, 1, 206, 175, 247, 32, 1, 215, 186, - 247, 32, 1, 225, 59, 247, 32, 1, 225, 58, 247, 32, 1, 225, 57, 247, 32, - 1, 225, 56, 247, 32, 1, 227, 237, 247, 32, 1, 241, 190, 247, 32, 1, 206, - 174, 84, 241, 44, 209, 35, 82, 84, 241, 44, 17, 105, 84, 241, 44, 17, - 108, 84, 241, 44, 17, 147, 84, 241, 44, 17, 149, 84, 241, 44, 17, 170, - 84, 241, 44, 17, 195, 84, 241, 44, 17, 213, 111, 84, 241, 44, 17, 199, - 84, 241, 44, 17, 222, 63, 84, 241, 44, 42, 209, 152, 84, 241, 44, 42, - 207, 151, 84, 241, 44, 42, 209, 53, 84, 241, 44, 42, 239, 153, 84, 241, - 44, 42, 240, 18, 84, 241, 44, 42, 212, 74, 84, 241, 44, 42, 213, 105, 84, - 241, 44, 42, 241, 134, 84, 241, 44, 42, 222, 58, 84, 241, 44, 42, 118, - 236, 11, 84, 241, 44, 42, 120, 236, 11, 84, 241, 44, 42, 126, 236, 11, - 84, 241, 44, 42, 239, 147, 236, 11, 84, 241, 44, 42, 239, 233, 236, 11, - 84, 241, 44, 42, 212, 88, 236, 11, 84, 241, 44, 42, 213, 112, 236, 11, - 84, 241, 44, 42, 241, 143, 236, 11, 84, 241, 44, 42, 222, 64, 236, 11, - 38, 37, 1, 63, 38, 37, 1, 248, 162, 38, 37, 1, 229, 201, 38, 37, 1, 244, - 75, 38, 37, 1, 74, 38, 37, 1, 206, 55, 38, 37, 1, 202, 92, 38, 37, 1, - 237, 67, 38, 37, 1, 209, 92, 38, 37, 1, 75, 38, 37, 1, 173, 38, 37, 1, - 241, 122, 38, 37, 1, 241, 103, 38, 37, 1, 241, 92, 38, 37, 1, 241, 7, 38, - 37, 1, 78, 38, 37, 1, 219, 34, 38, 37, 1, 213, 43, 38, 37, 1, 228, 209, - 38, 37, 1, 241, 28, 38, 37, 1, 241, 17, 38, 37, 1, 209, 187, 38, 37, 1, - 68, 38, 37, 1, 241, 125, 38, 37, 1, 218, 195, 38, 37, 1, 229, 129, 38, - 37, 1, 241, 154, 38, 37, 1, 241, 19, 38, 37, 1, 246, 170, 38, 37, 1, 231, - 83, 38, 37, 1, 206, 178, 38, 37, 1, 241, 0, 38, 37, 221, 44, 105, 38, 37, - 221, 44, 170, 38, 37, 221, 44, 209, 152, 38, 37, 221, 44, 240, 18, 238, - 17, 1, 251, 67, 238, 17, 1, 248, 255, 238, 17, 1, 238, 78, 238, 17, 1, - 244, 194, 238, 17, 1, 251, 63, 238, 17, 1, 217, 117, 238, 17, 1, 230, - 196, 238, 17, 1, 237, 150, 238, 17, 1, 209, 49, 238, 17, 1, 241, 133, - 238, 17, 1, 228, 176, 238, 17, 1, 228, 90, 238, 17, 1, 225, 114, 238, 17, - 1, 223, 62, 238, 17, 1, 230, 154, 238, 17, 1, 206, 196, 238, 17, 1, 219, - 145, 238, 17, 1, 222, 58, 238, 17, 1, 216, 196, 238, 17, 1, 214, 216, - 238, 17, 1, 209, 166, 238, 17, 1, 204, 10, 238, 17, 1, 240, 88, 238, 17, - 1, 231, 87, 238, 17, 1, 235, 252, 238, 17, 1, 219, 223, 238, 17, 1, 222, - 64, 236, 11, 38, 218, 237, 1, 250, 231, 38, 218, 237, 1, 247, 160, 38, - 218, 237, 1, 238, 248, 38, 218, 237, 1, 243, 101, 38, 218, 237, 1, 74, - 38, 218, 237, 1, 202, 62, 38, 218, 237, 1, 241, 247, 38, 218, 237, 1, - 202, 99, 38, 218, 237, 1, 241, 245, 38, 218, 237, 1, 75, 38, 218, 237, 1, - 229, 15, 38, 218, 237, 1, 227, 206, 38, 218, 237, 1, 224, 238, 38, 218, - 237, 1, 222, 228, 38, 218, 237, 1, 205, 175, 38, 218, 237, 1, 219, 22, - 38, 218, 237, 1, 216, 121, 38, 218, 237, 1, 212, 142, 38, 218, 237, 1, - 209, 250, 38, 218, 237, 1, 68, 38, 218, 237, 1, 246, 151, 38, 218, 237, - 1, 212, 235, 38, 218, 237, 1, 213, 45, 38, 218, 237, 1, 202, 215, 38, - 218, 237, 1, 203, 30, 38, 218, 237, 1, 78, 38, 218, 237, 1, 220, 18, 38, - 218, 237, 1, 241, 154, 38, 218, 237, 1, 152, 38, 218, 237, 1, 207, 254, - 38, 218, 237, 1, 206, 43, 38, 218, 237, 1, 203, 34, 38, 218, 237, 1, 203, - 32, 38, 218, 237, 1, 203, 66, 38, 218, 237, 1, 231, 110, 38, 218, 237, 1, - 202, 213, 38, 218, 237, 1, 198, 38, 218, 237, 1, 235, 171, 39, 38, 218, - 237, 1, 250, 231, 39, 38, 218, 237, 1, 243, 101, 39, 38, 218, 237, 1, - 202, 99, 39, 38, 218, 237, 1, 222, 228, 39, 38, 218, 237, 1, 212, 142, - 207, 19, 1, 251, 6, 207, 19, 1, 248, 106, 207, 19, 1, 238, 236, 207, 19, - 1, 229, 144, 207, 19, 1, 244, 37, 207, 19, 1, 236, 136, 207, 19, 1, 204, - 0, 207, 19, 1, 202, 83, 207, 19, 1, 236, 45, 207, 19, 1, 209, 132, 207, - 19, 1, 202, 236, 207, 19, 1, 230, 22, 207, 19, 1, 212, 255, 207, 19, 1, - 228, 24, 207, 19, 1, 224, 247, 207, 19, 1, 243, 253, 207, 19, 1, 221, 40, - 207, 19, 1, 202, 6, 207, 19, 1, 214, 248, 207, 19, 1, 251, 59, 207, 19, - 1, 217, 191, 207, 19, 1, 215, 27, 207, 19, 1, 217, 70, 207, 19, 1, 216, - 175, 207, 19, 1, 209, 96, 207, 19, 1, 238, 114, 207, 19, 1, 135, 207, 19, - 1, 75, 207, 19, 1, 68, 207, 19, 1, 211, 119, 207, 19, 203, 238, 243, 141, - 38, 218, 231, 2, 63, 38, 218, 231, 2, 75, 38, 218, 231, 2, 68, 38, 218, - 231, 2, 173, 38, 218, 231, 2, 228, 209, 38, 218, 231, 2, 239, 8, 38, 218, - 231, 2, 237, 230, 38, 218, 231, 2, 203, 182, 38, 218, 231, 2, 247, 92, - 38, 218, 231, 2, 230, 181, 38, 218, 231, 2, 230, 141, 38, 218, 231, 2, - 210, 22, 38, 218, 231, 2, 207, 203, 38, 218, 231, 2, 244, 212, 38, 218, - 231, 2, 243, 233, 38, 218, 231, 2, 242, 42, 38, 218, 231, 2, 209, 108, - 38, 218, 231, 2, 185, 38, 218, 231, 2, 249, 32, 38, 218, 231, 2, 240, - 108, 38, 218, 231, 2, 201, 201, 38, 218, 231, 2, 221, 84, 38, 218, 231, - 2, 192, 38, 218, 231, 2, 224, 155, 38, 218, 231, 2, 223, 246, 38, 218, - 231, 2, 198, 38, 218, 231, 2, 206, 86, 38, 218, 231, 2, 205, 230, 38, - 218, 231, 2, 216, 220, 38, 218, 231, 2, 215, 145, 38, 218, 231, 2, 228, - 113, 38, 218, 231, 2, 215, 36, 38, 218, 231, 2, 202, 116, 38, 218, 231, - 2, 213, 90, 38, 218, 231, 2, 211, 164, 38, 218, 231, 2, 152, 38, 218, - 231, 2, 250, 28, 38, 218, 231, 2, 250, 27, 38, 218, 231, 2, 250, 26, 38, - 218, 231, 2, 203, 153, 38, 218, 231, 2, 244, 190, 38, 218, 231, 2, 244, - 189, 38, 218, 231, 2, 249, 8, 38, 218, 231, 2, 247, 144, 38, 218, 231, - 203, 238, 243, 141, 38, 218, 231, 42, 105, 38, 218, 231, 42, 108, 38, - 218, 231, 42, 209, 152, 38, 218, 231, 42, 207, 151, 38, 218, 231, 42, - 236, 11, 244, 17, 6, 1, 163, 75, 244, 17, 6, 1, 163, 74, 244, 17, 6, 1, - 163, 63, 244, 17, 6, 1, 163, 251, 73, 244, 17, 6, 1, 163, 78, 244, 17, 6, - 1, 163, 220, 18, 244, 17, 6, 1, 212, 228, 75, 244, 17, 6, 1, 212, 228, - 74, 244, 17, 6, 1, 212, 228, 63, 244, 17, 6, 1, 212, 228, 251, 73, 244, - 17, 6, 1, 212, 228, 78, 244, 17, 6, 1, 212, 228, 220, 18, 244, 17, 6, 1, - 250, 8, 244, 17, 6, 1, 219, 195, 244, 17, 6, 1, 203, 217, 244, 17, 6, 1, - 203, 49, 244, 17, 6, 1, 237, 171, 244, 17, 6, 1, 219, 23, 244, 17, 6, 1, - 248, 150, 244, 17, 6, 1, 209, 176, 244, 17, 6, 1, 244, 61, 244, 17, 6, 1, - 246, 166, 244, 17, 6, 1, 230, 159, 244, 17, 6, 1, 229, 208, 244, 17, 6, - 1, 238, 211, 244, 17, 6, 1, 241, 154, 244, 17, 6, 1, 206, 50, 244, 17, 6, - 1, 240, 243, 244, 17, 6, 1, 209, 90, 244, 17, 6, 1, 241, 17, 244, 17, 6, - 1, 202, 90, 244, 17, 6, 1, 241, 7, 244, 17, 6, 1, 202, 70, 244, 17, 6, 1, - 241, 28, 244, 17, 6, 1, 241, 122, 244, 17, 6, 1, 241, 103, 244, 17, 6, 1, - 241, 92, 244, 17, 6, 1, 241, 78, 244, 17, 6, 1, 220, 57, 244, 17, 6, 1, - 240, 220, 244, 17, 5, 1, 163, 75, 244, 17, 5, 1, 163, 74, 244, 17, 5, 1, - 163, 63, 244, 17, 5, 1, 163, 251, 73, 244, 17, 5, 1, 163, 78, 244, 17, 5, - 1, 163, 220, 18, 244, 17, 5, 1, 212, 228, 75, 244, 17, 5, 1, 212, 228, - 74, 244, 17, 5, 1, 212, 228, 63, 244, 17, 5, 1, 212, 228, 251, 73, 244, - 17, 5, 1, 212, 228, 78, 244, 17, 5, 1, 212, 228, 220, 18, 244, 17, 5, 1, - 250, 8, 244, 17, 5, 1, 219, 195, 244, 17, 5, 1, 203, 217, 244, 17, 5, 1, - 203, 49, 244, 17, 5, 1, 237, 171, 244, 17, 5, 1, 219, 23, 244, 17, 5, 1, - 248, 150, 244, 17, 5, 1, 209, 176, 244, 17, 5, 1, 244, 61, 244, 17, 5, 1, - 246, 166, 244, 17, 5, 1, 230, 159, 244, 17, 5, 1, 229, 208, 244, 17, 5, - 1, 238, 211, 244, 17, 5, 1, 241, 154, 244, 17, 5, 1, 206, 50, 244, 17, 5, - 1, 240, 243, 244, 17, 5, 1, 209, 90, 244, 17, 5, 1, 241, 17, 244, 17, 5, - 1, 202, 90, 244, 17, 5, 1, 241, 7, 244, 17, 5, 1, 202, 70, 244, 17, 5, 1, - 241, 28, 244, 17, 5, 1, 241, 122, 244, 17, 5, 1, 241, 103, 244, 17, 5, 1, - 241, 92, 244, 17, 5, 1, 241, 78, 244, 17, 5, 1, 220, 57, 244, 17, 5, 1, - 240, 220, 213, 50, 1, 219, 20, 213, 50, 1, 208, 131, 213, 50, 1, 229, 96, - 213, 50, 1, 240, 53, 213, 50, 1, 209, 65, 213, 50, 1, 212, 13, 213, 50, - 1, 210, 190, 213, 50, 1, 246, 90, 213, 50, 1, 203, 51, 213, 50, 1, 236, - 9, 213, 50, 1, 248, 85, 213, 50, 1, 244, 74, 213, 50, 1, 238, 250, 213, - 50, 1, 205, 170, 213, 50, 1, 209, 71, 213, 50, 1, 202, 15, 213, 50, 1, - 225, 18, 213, 50, 1, 230, 80, 213, 50, 1, 203, 254, 213, 50, 1, 237, 159, - 213, 50, 1, 227, 33, 213, 50, 1, 224, 111, 213, 50, 1, 231, 90, 213, 50, - 1, 241, 152, 213, 50, 1, 250, 75, 213, 50, 1, 251, 113, 213, 50, 1, 220, - 31, 213, 50, 1, 203, 241, 213, 50, 1, 219, 211, 213, 50, 1, 251, 73, 213, - 50, 1, 215, 224, 213, 50, 1, 221, 40, 213, 50, 1, 241, 172, 213, 50, 1, - 251, 78, 213, 50, 1, 235, 162, 213, 50, 1, 206, 224, 213, 50, 1, 220, 95, - 213, 50, 1, 220, 10, 213, 50, 1, 220, 55, 213, 50, 1, 250, 11, 213, 50, - 1, 250, 121, 213, 50, 1, 219, 244, 213, 50, 1, 251, 54, 213, 50, 1, 241, - 21, 213, 50, 1, 250, 99, 213, 50, 1, 241, 183, 213, 50, 1, 235, 170, 213, - 50, 1, 203, 16, 219, 225, 1, 251, 30, 219, 225, 1, 249, 32, 219, 225, 1, - 210, 22, 219, 225, 1, 230, 181, 219, 225, 1, 203, 182, 219, 225, 1, 229, - 144, 219, 225, 1, 244, 60, 219, 225, 1, 216, 220, 219, 225, 1, 215, 36, - 219, 225, 1, 213, 5, 219, 225, 1, 244, 1, 219, 225, 1, 247, 7, 219, 225, - 1, 239, 8, 219, 225, 1, 240, 108, 219, 225, 1, 217, 124, 219, 225, 1, - 230, 38, 219, 225, 1, 228, 108, 219, 225, 1, 224, 124, 219, 225, 1, 221, - 24, 219, 225, 1, 204, 70, 219, 225, 1, 152, 219, 225, 1, 198, 219, 225, - 1, 63, 219, 225, 1, 74, 219, 225, 1, 75, 219, 225, 1, 78, 219, 225, 1, - 68, 219, 225, 1, 252, 25, 219, 225, 1, 241, 161, 219, 225, 1, 220, 18, - 219, 225, 17, 202, 84, 219, 225, 17, 105, 219, 225, 17, 108, 219, 225, - 17, 147, 219, 225, 17, 149, 219, 225, 17, 170, 219, 225, 17, 195, 219, - 225, 17, 213, 111, 219, 225, 17, 199, 219, 225, 17, 222, 63, 241, 118, 1, - 63, 241, 118, 1, 248, 162, 241, 118, 1, 246, 238, 241, 118, 1, 246, 170, - 241, 118, 1, 244, 75, 241, 118, 1, 223, 17, 241, 118, 1, 243, 248, 241, - 118, 1, 241, 145, 241, 118, 1, 74, 241, 118, 1, 240, 60, 241, 118, 1, - 238, 190, 241, 118, 1, 238, 52, 241, 118, 1, 237, 67, 241, 118, 1, 75, - 241, 118, 1, 230, 161, 241, 118, 1, 229, 201, 241, 118, 1, 227, 234, 241, - 118, 1, 227, 73, 241, 118, 1, 225, 20, 241, 118, 1, 222, 240, 241, 118, - 1, 201, 201, 241, 118, 1, 222, 41, 241, 118, 1, 78, 241, 118, 1, 219, 34, - 241, 118, 1, 217, 106, 241, 118, 1, 216, 158, 241, 118, 1, 215, 180, 241, - 118, 1, 214, 177, 241, 118, 1, 213, 43, 241, 118, 1, 209, 187, 241, 118, - 1, 209, 92, 241, 118, 1, 68, 241, 118, 1, 206, 55, 241, 118, 1, 203, 176, - 241, 118, 1, 203, 124, 241, 118, 1, 202, 92, 241, 118, 1, 202, 71, 241, - 118, 1, 238, 105, 241, 118, 1, 238, 111, 241, 118, 1, 229, 129, 247, 14, - 251, 31, 1, 251, 1, 247, 14, 251, 31, 1, 248, 108, 247, 14, 251, 31, 1, - 238, 69, 247, 14, 251, 31, 1, 244, 140, 247, 14, 251, 31, 1, 241, 171, - 247, 14, 251, 31, 1, 202, 102, 247, 14, 251, 31, 1, 240, 183, 247, 14, - 251, 31, 1, 202, 65, 247, 14, 251, 31, 1, 209, 213, 247, 14, 251, 31, 1, - 246, 199, 247, 14, 251, 31, 1, 202, 224, 247, 14, 251, 31, 1, 202, 80, - 247, 14, 251, 31, 1, 230, 223, 247, 14, 251, 31, 1, 213, 90, 247, 14, - 251, 31, 1, 228, 17, 247, 14, 251, 31, 1, 230, 235, 247, 14, 251, 31, 1, - 203, 172, 247, 14, 251, 31, 1, 242, 7, 247, 14, 251, 31, 1, 247, 39, 247, - 14, 251, 31, 1, 230, 142, 247, 14, 251, 31, 1, 229, 240, 247, 14, 251, - 31, 1, 226, 194, 247, 14, 251, 31, 1, 237, 14, 247, 14, 251, 31, 1, 217, - 107, 247, 14, 251, 31, 1, 250, 177, 247, 14, 251, 31, 1, 246, 107, 247, - 14, 251, 31, 1, 246, 142, 247, 14, 251, 31, 1, 245, 63, 247, 14, 251, 31, - 1, 225, 103, 247, 14, 251, 31, 1, 217, 111, 247, 14, 251, 31, 1, 221, - 151, 247, 14, 251, 31, 1, 241, 240, 247, 14, 251, 31, 1, 213, 73, 247, - 14, 251, 31, 1, 230, 162, 247, 14, 251, 31, 1, 220, 31, 247, 14, 251, 31, - 1, 207, 125, 247, 14, 251, 31, 1, 240, 83, 247, 14, 251, 31, 1, 241, 253, - 247, 14, 251, 31, 1, 246, 176, 247, 14, 251, 31, 1, 219, 9, 247, 14, 251, - 31, 1, 238, 95, 247, 14, 251, 31, 1, 216, 172, 247, 14, 251, 31, 1, 213, - 99, 247, 14, 251, 31, 1, 205, 232, 247, 14, 251, 31, 1, 208, 193, 247, - 14, 251, 31, 1, 212, 207, 247, 14, 251, 31, 1, 230, 194, 247, 14, 251, - 31, 1, 245, 64, 247, 14, 251, 31, 1, 247, 7, 247, 14, 251, 31, 1, 203, - 56, 247, 14, 251, 31, 1, 218, 102, 247, 14, 251, 31, 1, 229, 62, 247, 14, - 251, 31, 246, 49, 82, 29, 34, 2, 251, 231, 29, 34, 2, 251, 230, 29, 34, - 2, 251, 229, 29, 34, 2, 251, 228, 29, 34, 2, 251, 227, 29, 34, 2, 251, - 226, 29, 34, 2, 251, 225, 29, 34, 2, 251, 224, 29, 34, 2, 251, 223, 29, - 34, 2, 251, 222, 29, 34, 2, 251, 221, 29, 34, 2, 251, 220, 29, 34, 2, - 251, 219, 29, 34, 2, 251, 218, 29, 34, 2, 251, 217, 29, 34, 2, 251, 216, - 29, 34, 2, 251, 215, 29, 34, 2, 251, 214, 29, 34, 2, 251, 213, 29, 34, 2, - 251, 212, 29, 34, 2, 251, 211, 29, 34, 2, 251, 210, 29, 34, 2, 251, 209, - 29, 34, 2, 251, 208, 29, 34, 2, 251, 207, 29, 34, 2, 251, 206, 29, 34, 2, - 251, 205, 29, 34, 2, 254, 239, 29, 34, 2, 251, 204, 29, 34, 2, 251, 203, - 29, 34, 2, 251, 202, 29, 34, 2, 251, 201, 29, 34, 2, 251, 200, 29, 34, 2, - 251, 199, 29, 34, 2, 251, 198, 29, 34, 2, 251, 197, 29, 34, 2, 251, 196, - 29, 34, 2, 251, 195, 29, 34, 2, 251, 194, 29, 34, 2, 251, 193, 29, 34, 2, - 251, 192, 29, 34, 2, 251, 191, 29, 34, 2, 251, 190, 29, 34, 2, 251, 189, - 29, 34, 2, 251, 188, 29, 34, 2, 251, 187, 29, 34, 2, 251, 186, 29, 34, 2, - 251, 185, 29, 34, 2, 251, 184, 29, 34, 2, 251, 183, 29, 34, 2, 251, 182, - 29, 34, 2, 251, 181, 29, 34, 2, 251, 180, 29, 34, 2, 251, 179, 29, 34, 2, - 251, 178, 29, 34, 2, 251, 177, 29, 34, 2, 251, 176, 29, 34, 2, 251, 175, - 29, 34, 2, 251, 174, 29, 34, 2, 251, 173, 29, 34, 2, 251, 172, 29, 34, 2, - 251, 171, 29, 34, 2, 251, 170, 29, 34, 2, 251, 169, 29, 34, 2, 251, 168, - 29, 34, 2, 251, 167, 29, 34, 2, 251, 166, 29, 34, 2, 251, 165, 29, 34, 2, - 251, 164, 29, 34, 2, 251, 163, 29, 34, 2, 251, 162, 29, 34, 2, 254, 152, - 29, 34, 2, 251, 161, 29, 34, 2, 251, 160, 29, 34, 2, 254, 117, 29, 34, 2, - 251, 159, 29, 34, 2, 251, 158, 29, 34, 2, 251, 157, 29, 34, 2, 251, 156, - 29, 34, 2, 254, 104, 29, 34, 2, 251, 155, 29, 34, 2, 251, 154, 29, 34, 2, - 251, 153, 29, 34, 2, 251, 152, 29, 34, 2, 251, 151, 29, 34, 2, 253, 176, - 29, 34, 2, 253, 175, 29, 34, 2, 253, 174, 29, 34, 2, 253, 173, 29, 34, 2, - 253, 172, 29, 34, 2, 253, 171, 29, 34, 2, 253, 170, 29, 34, 2, 253, 169, - 29, 34, 2, 253, 167, 29, 34, 2, 253, 166, 29, 34, 2, 253, 165, 29, 34, 2, - 253, 164, 29, 34, 2, 253, 163, 29, 34, 2, 253, 162, 29, 34, 2, 253, 160, - 29, 34, 2, 253, 159, 29, 34, 2, 253, 158, 29, 34, 2, 253, 157, 29, 34, 2, - 253, 156, 29, 34, 2, 253, 155, 29, 34, 2, 253, 154, 29, 34, 2, 253, 153, - 29, 34, 2, 253, 152, 29, 34, 2, 253, 151, 29, 34, 2, 253, 150, 29, 34, 2, - 253, 149, 29, 34, 2, 253, 148, 29, 34, 2, 253, 147, 29, 34, 2, 253, 146, - 29, 34, 2, 253, 145, 29, 34, 2, 253, 144, 29, 34, 2, 253, 143, 29, 34, 2, - 253, 142, 29, 34, 2, 253, 140, 29, 34, 2, 253, 139, 29, 34, 2, 253, 138, - 29, 34, 2, 253, 134, 29, 34, 2, 253, 133, 29, 34, 2, 253, 132, 29, 34, 2, - 253, 131, 29, 34, 2, 253, 127, 29, 34, 2, 253, 126, 29, 34, 2, 253, 125, - 29, 34, 2, 253, 124, 29, 34, 2, 253, 123, 29, 34, 2, 253, 122, 29, 34, 2, - 253, 121, 29, 34, 2, 253, 120, 29, 34, 2, 253, 119, 29, 34, 2, 253, 118, - 29, 34, 2, 253, 117, 29, 34, 2, 253, 116, 29, 34, 2, 253, 115, 29, 34, 2, - 253, 114, 29, 34, 2, 253, 113, 29, 34, 2, 253, 112, 29, 34, 2, 253, 111, - 29, 34, 2, 253, 110, 29, 34, 2, 253, 109, 29, 34, 2, 253, 108, 29, 34, 2, - 253, 107, 29, 34, 2, 253, 106, 29, 34, 2, 253, 105, 29, 34, 2, 253, 103, - 29, 34, 2, 253, 102, 29, 34, 2, 253, 101, 29, 34, 2, 253, 100, 29, 34, 2, - 253, 99, 29, 34, 2, 253, 97, 29, 34, 2, 253, 96, 29, 34, 2, 253, 95, 29, - 34, 2, 253, 94, 29, 34, 2, 253, 92, 29, 34, 2, 253, 91, 29, 34, 2, 253, - 90, 29, 34, 2, 253, 56, 29, 34, 2, 253, 54, 29, 34, 2, 253, 52, 29, 34, - 2, 253, 50, 29, 34, 2, 253, 48, 29, 34, 2, 253, 46, 29, 34, 2, 253, 44, - 29, 34, 2, 253, 42, 29, 34, 2, 253, 40, 29, 34, 2, 253, 38, 29, 34, 2, - 253, 36, 29, 34, 2, 253, 33, 29, 34, 2, 253, 31, 29, 34, 2, 253, 29, 29, - 34, 2, 253, 27, 29, 34, 2, 253, 25, 29, 34, 2, 253, 23, 29, 34, 2, 253, - 21, 29, 34, 2, 253, 19, 29, 34, 2, 252, 193, 29, 34, 2, 252, 192, 29, 34, - 2, 252, 191, 29, 34, 2, 252, 190, 29, 34, 2, 252, 189, 29, 34, 2, 252, - 188, 29, 34, 2, 252, 186, 29, 34, 2, 252, 185, 29, 34, 2, 252, 184, 29, - 34, 2, 252, 183, 29, 34, 2, 252, 182, 29, 34, 2, 252, 181, 29, 34, 2, - 252, 179, 29, 34, 2, 252, 178, 29, 34, 2, 252, 174, 29, 34, 2, 252, 173, - 29, 34, 2, 252, 171, 29, 34, 2, 252, 170, 29, 34, 2, 252, 169, 29, 34, 2, - 252, 168, 29, 34, 2, 252, 167, 29, 34, 2, 252, 166, 29, 34, 2, 252, 165, - 29, 34, 2, 252, 164, 29, 34, 2, 252, 163, 29, 34, 2, 252, 162, 29, 34, 2, - 252, 161, 29, 34, 2, 252, 160, 29, 34, 2, 252, 159, 29, 34, 2, 252, 158, - 29, 34, 2, 252, 157, 29, 34, 2, 252, 156, 29, 34, 2, 252, 155, 29, 34, 2, - 252, 154, 29, 34, 2, 252, 153, 29, 34, 2, 252, 152, 29, 34, 2, 252, 151, - 29, 34, 2, 252, 150, 29, 34, 2, 252, 149, 29, 34, 2, 252, 148, 29, 34, 2, - 252, 147, 29, 34, 2, 252, 146, 29, 34, 2, 252, 145, 29, 34, 2, 252, 144, - 29, 34, 2, 252, 143, 29, 34, 2, 252, 142, 29, 34, 2, 252, 141, 29, 34, 2, - 252, 140, 29, 34, 2, 252, 139, 29, 34, 2, 252, 138, 29, 34, 2, 252, 137, - 29, 34, 2, 252, 136, 29, 34, 2, 252, 135, 29, 34, 2, 252, 134, 29, 34, 2, - 252, 133, 29, 34, 2, 252, 132, 29, 34, 2, 252, 131, 29, 34, 2, 252, 130, - 29, 34, 2, 252, 129, 29, 34, 2, 252, 128, 29, 34, 2, 252, 127, 29, 34, 2, - 252, 126, 29, 34, 2, 252, 125, 29, 34, 2, 252, 124, 29, 34, 2, 252, 123, - 29, 34, 2, 252, 122, 29, 34, 2, 252, 121, 29, 34, 2, 252, 120, 29, 34, 2, - 252, 119, 29, 34, 2, 252, 118, 29, 34, 2, 252, 117, 29, 34, 2, 252, 116, - 29, 34, 2, 252, 115, 29, 34, 2, 252, 114, 29, 34, 2, 252, 113, 29, 34, 2, - 252, 112, 29, 34, 2, 252, 111, 29, 34, 2, 252, 110, 29, 34, 2, 252, 109, - 29, 34, 2, 252, 108, 29, 34, 2, 252, 107, 29, 34, 2, 252, 106, 29, 34, 2, - 252, 105, 29, 34, 2, 252, 104, 29, 34, 2, 252, 103, 29, 34, 2, 252, 102, - 29, 34, 2, 252, 101, 29, 34, 2, 252, 100, 29, 34, 2, 252, 99, 29, 34, 2, - 252, 98, 29, 34, 2, 252, 97, 29, 34, 2, 252, 96, 29, 34, 2, 252, 95, 29, - 34, 2, 252, 94, 29, 34, 2, 252, 93, 29, 34, 2, 252, 92, 29, 34, 2, 252, - 91, 29, 34, 2, 252, 90, 29, 34, 2, 252, 89, 29, 34, 2, 252, 88, 29, 34, - 2, 252, 87, 29, 34, 2, 252, 86, 29, 34, 2, 252, 85, 29, 34, 2, 252, 84, - 29, 34, 2, 252, 83, 29, 34, 2, 252, 82, 29, 34, 2, 252, 81, 29, 34, 2, - 252, 80, 29, 34, 2, 252, 79, 29, 34, 2, 252, 78, 29, 34, 2, 252, 77, 29, - 34, 2, 252, 76, 29, 34, 2, 252, 75, 29, 34, 2, 252, 74, 29, 34, 2, 252, - 73, 29, 34, 2, 252, 72, 29, 34, 2, 252, 71, 29, 34, 2, 252, 70, 29, 34, - 2, 252, 69, 29, 34, 2, 252, 68, 29, 34, 2, 252, 67, 29, 34, 2, 252, 66, - 29, 34, 2, 252, 65, 29, 34, 2, 252, 64, 29, 34, 2, 252, 63, 29, 34, 2, - 252, 62, 29, 34, 2, 252, 61, 29, 34, 2, 252, 60, 29, 34, 2, 252, 59, 29, - 34, 2, 252, 58, 29, 34, 2, 252, 57, 29, 34, 2, 252, 56, 29, 34, 2, 252, - 55, 63, 29, 34, 2, 252, 54, 249, 255, 29, 34, 2, 252, 53, 245, 51, 29, - 34, 2, 252, 52, 74, 29, 34, 2, 252, 51, 240, 174, 29, 34, 2, 252, 50, - 237, 171, 29, 34, 2, 252, 49, 230, 184, 29, 34, 2, 252, 48, 230, 54, 29, - 34, 2, 252, 47, 159, 29, 34, 2, 252, 46, 228, 118, 29, 34, 2, 252, 45, - 228, 117, 29, 34, 2, 252, 44, 228, 116, 29, 34, 2, 252, 43, 228, 115, 29, - 34, 2, 252, 42, 204, 144, 29, 34, 2, 252, 41, 203, 196, 29, 34, 2, 252, - 40, 203, 124, 29, 34, 2, 252, 39, 220, 36, 29, 34, 2, 252, 38, 251, 147, - 29, 34, 2, 252, 37, 248, 199, 29, 34, 2, 252, 36, 244, 122, 29, 34, 2, - 252, 35, 240, 182, 29, 34, 2, 252, 34, 230, 161, 29, 34, 2, 252, 33, 29, - 34, 2, 252, 32, 29, 34, 2, 252, 31, 29, 34, 2, 252, 30, 29, 34, 2, 252, - 29, 29, 34, 2, 252, 28, 29, 34, 2, 252, 27, 29, 34, 2, 252, 26, 245, 58, - 4, 63, 245, 58, 4, 74, 245, 58, 4, 75, 245, 58, 4, 78, 245, 58, 4, 68, - 245, 58, 4, 230, 181, 245, 58, 4, 230, 101, 245, 58, 4, 173, 245, 58, 4, - 229, 201, 245, 58, 4, 229, 100, 245, 58, 4, 229, 26, 245, 58, 4, 228, - 209, 245, 58, 4, 228, 113, 245, 58, 4, 227, 234, 245, 58, 4, 227, 148, - 245, 58, 4, 227, 49, 245, 58, 4, 226, 239, 245, 58, 4, 192, 245, 58, 4, - 225, 20, 245, 58, 4, 224, 155, 245, 58, 4, 224, 82, 245, 58, 4, 223, 246, - 245, 58, 4, 201, 201, 245, 58, 4, 222, 240, 245, 58, 4, 222, 100, 245, - 58, 4, 221, 191, 245, 58, 4, 221, 84, 245, 58, 4, 185, 245, 58, 4, 219, - 34, 245, 58, 4, 218, 167, 245, 58, 4, 218, 69, 245, 58, 4, 217, 191, 245, - 58, 4, 216, 220, 245, 58, 4, 216, 158, 245, 58, 4, 216, 57, 245, 58, 4, - 215, 227, 245, 58, 4, 215, 145, 245, 58, 4, 215, 36, 245, 58, 4, 214, - 177, 245, 58, 4, 212, 162, 245, 58, 4, 212, 13, 245, 58, 4, 211, 10, 245, - 58, 4, 210, 22, 245, 58, 4, 209, 187, 245, 58, 4, 209, 2, 245, 58, 4, - 135, 245, 58, 4, 207, 203, 245, 58, 4, 204, 111, 245, 58, 4, 204, 62, - 245, 58, 4, 204, 30, 245, 58, 4, 204, 0, 245, 58, 4, 203, 182, 245, 58, - 4, 203, 176, 245, 58, 4, 202, 116, 245, 58, 4, 202, 17, 231, 51, 250, - 130, 1, 251, 28, 231, 51, 250, 130, 1, 248, 105, 231, 51, 250, 130, 1, - 238, 67, 231, 51, 250, 130, 1, 244, 177, 231, 51, 250, 130, 1, 237, 67, - 231, 51, 250, 130, 1, 204, 70, 231, 51, 250, 130, 1, 202, 95, 231, 51, - 250, 130, 1, 237, 19, 231, 51, 250, 130, 1, 209, 128, 231, 51, 250, 130, - 1, 202, 235, 231, 51, 250, 130, 1, 229, 250, 231, 51, 250, 130, 1, 228, - 19, 231, 51, 250, 130, 1, 224, 247, 231, 51, 250, 130, 1, 221, 40, 231, - 51, 250, 130, 1, 214, 249, 231, 51, 250, 130, 1, 250, 3, 231, 51, 250, - 130, 1, 219, 34, 231, 51, 250, 130, 1, 215, 26, 231, 51, 250, 130, 1, - 217, 69, 231, 51, 250, 130, 1, 216, 91, 231, 51, 250, 130, 1, 212, 255, - 231, 51, 250, 130, 1, 209, 201, 231, 51, 250, 130, 214, 168, 54, 231, 51, - 250, 130, 42, 105, 231, 51, 250, 130, 42, 108, 231, 51, 250, 130, 42, - 147, 231, 51, 250, 130, 42, 209, 152, 231, 51, 250, 130, 42, 207, 151, - 231, 51, 250, 130, 42, 118, 236, 11, 231, 51, 250, 130, 42, 118, 209, 36, - 231, 51, 250, 130, 42, 209, 153, 209, 36, 219, 134, 1, 251, 28, 219, 134, - 1, 248, 105, 219, 134, 1, 238, 67, 219, 134, 1, 244, 177, 219, 134, 1, - 237, 67, 219, 134, 1, 204, 70, 219, 134, 1, 202, 95, 219, 134, 1, 237, - 19, 219, 134, 1, 209, 128, 219, 134, 1, 202, 235, 219, 134, 1, 229, 250, - 219, 134, 1, 228, 19, 219, 134, 1, 224, 247, 219, 134, 1, 46, 221, 40, - 219, 134, 1, 221, 40, 219, 134, 1, 214, 249, 219, 134, 1, 250, 3, 219, - 134, 1, 219, 34, 219, 134, 1, 215, 26, 219, 134, 1, 217, 69, 219, 134, 1, - 216, 91, 219, 134, 1, 212, 255, 219, 134, 1, 209, 201, 219, 134, 227, - 217, 239, 212, 219, 134, 216, 11, 239, 212, 219, 134, 42, 105, 219, 134, - 42, 108, 219, 134, 42, 147, 219, 134, 42, 149, 219, 134, 42, 170, 219, - 134, 42, 209, 152, 219, 134, 42, 207, 151, 223, 102, 1, 46, 251, 28, 223, - 102, 1, 251, 28, 223, 102, 1, 46, 248, 105, 223, 102, 1, 248, 105, 223, - 102, 1, 238, 67, 223, 102, 1, 244, 177, 223, 102, 1, 46, 237, 67, 223, - 102, 1, 237, 67, 223, 102, 1, 204, 70, 223, 102, 1, 202, 95, 223, 102, 1, - 237, 19, 223, 102, 1, 209, 128, 223, 102, 1, 46, 202, 235, 223, 102, 1, - 202, 235, 223, 102, 1, 46, 229, 250, 223, 102, 1, 229, 250, 223, 102, 1, - 46, 228, 19, 223, 102, 1, 228, 19, 223, 102, 1, 46, 224, 247, 223, 102, - 1, 224, 247, 223, 102, 1, 46, 221, 40, 223, 102, 1, 221, 40, 223, 102, 1, - 214, 249, 223, 102, 1, 250, 3, 223, 102, 1, 219, 34, 223, 102, 1, 215, - 26, 223, 102, 1, 217, 69, 223, 102, 1, 216, 91, 223, 102, 1, 46, 212, - 255, 223, 102, 1, 212, 255, 223, 102, 1, 209, 201, 223, 102, 42, 105, - 223, 102, 42, 108, 223, 102, 42, 147, 223, 102, 42, 149, 223, 102, 245, - 116, 42, 149, 223, 102, 42, 170, 223, 102, 42, 209, 152, 223, 102, 42, - 207, 151, 223, 102, 42, 118, 236, 11, 237, 78, 1, 251, 28, 237, 78, 1, - 248, 105, 237, 78, 1, 238, 67, 237, 78, 1, 244, 176, 237, 78, 1, 237, 67, - 237, 78, 1, 204, 70, 237, 78, 1, 202, 94, 237, 78, 1, 237, 19, 237, 78, - 1, 209, 128, 237, 78, 1, 202, 235, 237, 78, 1, 229, 250, 237, 78, 1, 228, - 19, 237, 78, 1, 224, 247, 237, 78, 1, 221, 40, 237, 78, 1, 214, 249, 237, - 78, 1, 250, 2, 237, 78, 1, 219, 34, 237, 78, 1, 215, 26, 237, 78, 1, 217, - 69, 237, 78, 1, 212, 255, 237, 78, 1, 209, 201, 237, 78, 42, 105, 237, - 78, 42, 170, 237, 78, 42, 209, 152, 237, 78, 42, 207, 151, 237, 78, 42, - 118, 236, 11, 218, 178, 1, 251, 25, 218, 178, 1, 248, 108, 218, 178, 1, - 238, 237, 218, 178, 1, 244, 39, 218, 178, 1, 237, 67, 218, 178, 1, 204, - 77, 218, 178, 1, 202, 109, 218, 178, 1, 237, 21, 218, 178, 1, 209, 132, - 218, 178, 1, 202, 236, 218, 178, 1, 230, 22, 218, 178, 1, 228, 25, 218, - 178, 1, 224, 247, 218, 178, 1, 221, 40, 218, 178, 1, 213, 137, 218, 178, - 1, 251, 59, 218, 178, 1, 219, 34, 218, 178, 1, 215, 27, 218, 178, 1, 217, - 74, 218, 178, 1, 215, 200, 218, 178, 1, 212, 255, 218, 178, 1, 209, 207, - 218, 178, 42, 105, 218, 178, 42, 209, 152, 218, 178, 42, 207, 151, 218, - 178, 42, 118, 236, 11, 218, 178, 42, 108, 218, 178, 42, 147, 218, 178, - 203, 238, 213, 130, 226, 196, 1, 63, 226, 196, 1, 249, 255, 226, 196, 1, - 239, 75, 226, 196, 1, 245, 51, 226, 196, 1, 74, 226, 196, 1, 206, 164, - 226, 196, 1, 75, 226, 196, 1, 203, 124, 226, 196, 1, 230, 54, 226, 196, - 1, 159, 226, 196, 1, 226, 185, 226, 196, 1, 223, 163, 226, 196, 1, 78, - 226, 196, 1, 146, 226, 196, 1, 211, 167, 226, 196, 1, 210, 69, 226, 196, - 1, 68, 226, 196, 1, 240, 174, 226, 196, 1, 217, 134, 226, 196, 1, 194, - 226, 196, 1, 207, 244, 226, 196, 1, 250, 231, 226, 196, 1, 241, 92, 226, - 196, 1, 226, 199, 226, 196, 1, 221, 228, 226, 196, 1, 247, 125, 226, 196, - 208, 82, 82, 129, 236, 253, 1, 63, 129, 236, 253, 1, 74, 129, 236, 253, - 1, 75, 129, 236, 253, 1, 78, 129, 236, 253, 1, 198, 129, 236, 253, 1, - 204, 111, 129, 236, 253, 1, 249, 32, 129, 236, 253, 1, 249, 31, 129, 236, - 253, 1, 185, 129, 236, 253, 1, 192, 129, 236, 253, 1, 201, 201, 129, 236, - 253, 1, 223, 110, 129, 236, 253, 1, 222, 240, 129, 236, 253, 1, 222, 239, - 129, 236, 253, 1, 216, 220, 129, 236, 253, 1, 216, 219, 129, 236, 253, 1, - 228, 113, 129, 236, 253, 1, 229, 144, 129, 236, 253, 1, 237, 12, 129, - 236, 253, 1, 215, 36, 129, 236, 253, 1, 215, 35, 129, 236, 253, 1, 214, - 177, 129, 236, 253, 1, 173, 129, 236, 253, 1, 217, 126, 129, 236, 253, 1, - 210, 22, 129, 236, 253, 1, 210, 21, 129, 236, 253, 1, 209, 187, 129, 236, - 253, 1, 209, 186, 129, 236, 253, 1, 135, 129, 236, 253, 1, 244, 212, 129, - 236, 253, 16, 205, 224, 129, 236, 253, 16, 205, 223, 129, 191, 1, 63, - 129, 191, 1, 74, 129, 191, 1, 75, 129, 191, 1, 78, 129, 191, 1, 198, 129, - 191, 1, 204, 111, 129, 191, 1, 249, 32, 129, 191, 1, 185, 129, 191, 1, - 192, 129, 191, 1, 201, 201, 129, 191, 1, 222, 240, 129, 191, 1, 216, 220, - 129, 191, 1, 228, 113, 129, 191, 1, 229, 144, 129, 191, 1, 237, 12, 129, - 191, 1, 215, 36, 129, 191, 1, 250, 126, 215, 36, 129, 191, 1, 214, 177, - 129, 191, 1, 173, 129, 191, 1, 217, 126, 129, 191, 1, 210, 22, 129, 191, - 1, 209, 187, 129, 191, 1, 135, 129, 191, 1, 244, 212, 129, 191, 239, 138, - 241, 113, 207, 156, 129, 191, 239, 138, 118, 237, 137, 129, 191, 227, 36, - 215, 233, 129, 191, 227, 36, 231, 56, 129, 191, 42, 105, 129, 191, 42, - 108, 129, 191, 42, 147, 129, 191, 42, 149, 129, 191, 42, 170, 129, 191, - 42, 195, 129, 191, 42, 213, 111, 129, 191, 42, 199, 129, 191, 42, 222, - 63, 129, 191, 42, 209, 152, 129, 191, 42, 207, 151, 129, 191, 42, 209, - 53, 129, 191, 42, 239, 153, 129, 191, 42, 240, 18, 129, 191, 42, 212, 74, - 129, 191, 42, 213, 105, 129, 191, 42, 118, 236, 11, 129, 191, 42, 120, - 236, 11, 129, 191, 42, 126, 236, 11, 129, 191, 42, 239, 147, 236, 11, - 129, 191, 42, 239, 233, 236, 11, 129, 191, 42, 212, 88, 236, 11, 129, - 191, 42, 213, 112, 236, 11, 129, 191, 42, 241, 143, 236, 11, 129, 191, - 42, 222, 64, 236, 11, 129, 191, 42, 118, 209, 36, 129, 191, 42, 120, 209, - 36, 129, 191, 42, 126, 209, 36, 129, 191, 42, 239, 147, 209, 36, 129, - 191, 42, 239, 233, 209, 36, 129, 191, 42, 212, 88, 209, 36, 129, 191, 42, - 213, 112, 209, 36, 129, 191, 42, 241, 143, 209, 36, 129, 191, 42, 222, - 64, 209, 36, 129, 191, 42, 209, 153, 209, 36, 129, 191, 42, 207, 152, - 209, 36, 129, 191, 42, 209, 54, 209, 36, 129, 191, 42, 239, 154, 209, 36, - 129, 191, 42, 240, 19, 209, 36, 129, 191, 42, 212, 75, 209, 36, 129, 191, - 42, 213, 106, 209, 36, 129, 191, 42, 241, 135, 209, 36, 129, 191, 42, - 222, 59, 209, 36, 129, 191, 42, 118, 236, 12, 209, 36, 129, 191, 42, 120, - 236, 12, 209, 36, 129, 191, 42, 126, 236, 12, 209, 36, 129, 191, 42, 239, - 147, 236, 12, 209, 36, 129, 191, 42, 239, 233, 236, 12, 209, 36, 129, - 191, 42, 212, 88, 236, 12, 209, 36, 129, 191, 42, 213, 112, 236, 12, 209, - 36, 129, 191, 42, 241, 143, 236, 12, 209, 36, 129, 191, 42, 222, 64, 236, - 12, 209, 36, 129, 191, 239, 138, 118, 207, 157, 129, 191, 239, 138, 120, - 207, 156, 129, 191, 239, 138, 126, 207, 156, 129, 191, 239, 138, 239, - 147, 207, 156, 129, 191, 239, 138, 239, 233, 207, 156, 129, 191, 239, - 138, 212, 88, 207, 156, 129, 191, 239, 138, 213, 112, 207, 156, 129, 191, - 239, 138, 241, 143, 207, 156, 129, 191, 239, 138, 222, 64, 207, 156, 129, - 191, 239, 138, 209, 153, 207, 156, 229, 131, 1, 63, 229, 131, 22, 2, 75, - 229, 131, 22, 2, 68, 229, 131, 22, 2, 125, 146, 229, 131, 22, 2, 74, 229, - 131, 22, 2, 78, 229, 131, 22, 227, 196, 82, 229, 131, 2, 52, 215, 253, - 56, 229, 131, 2, 250, 180, 229, 131, 2, 205, 199, 229, 131, 1, 173, 229, - 131, 1, 229, 144, 229, 131, 1, 239, 8, 229, 131, 1, 238, 119, 229, 131, - 1, 247, 92, 229, 131, 1, 246, 199, 229, 131, 1, 230, 181, 229, 131, 1, - 221, 11, 229, 131, 1, 207, 241, 229, 131, 1, 207, 229, 229, 131, 1, 244, - 120, 229, 131, 1, 244, 104, 229, 131, 1, 221, 227, 229, 131, 1, 210, 22, - 229, 131, 1, 209, 108, 229, 131, 1, 244, 212, 229, 131, 1, 244, 1, 229, - 131, 1, 201, 201, 229, 131, 1, 185, 229, 131, 1, 218, 208, 229, 131, 1, - 249, 32, 229, 131, 1, 248, 98, 229, 131, 1, 192, 229, 131, 1, 198, 229, - 131, 1, 216, 220, 229, 131, 1, 228, 113, 229, 131, 1, 206, 86, 229, 131, - 1, 213, 90, 229, 131, 1, 211, 164, 229, 131, 1, 215, 36, 229, 131, 1, - 202, 116, 229, 131, 1, 152, 229, 131, 1, 229, 47, 229, 131, 1, 207, 209, - 229, 131, 2, 248, 231, 55, 229, 131, 2, 247, 13, 229, 131, 2, 70, 56, - 229, 131, 205, 204, 229, 131, 17, 105, 229, 131, 17, 108, 229, 131, 17, - 147, 229, 131, 17, 149, 229, 131, 42, 209, 152, 229, 131, 42, 207, 151, - 229, 131, 42, 118, 236, 11, 229, 131, 42, 118, 209, 36, 229, 131, 217, - 179, 243, 85, 229, 131, 217, 179, 5, 246, 61, 229, 131, 217, 179, 246, - 61, 229, 131, 217, 179, 245, 139, 142, 229, 131, 217, 179, 225, 116, 229, - 131, 217, 179, 227, 5, 229, 131, 217, 179, 244, 166, 229, 131, 217, 179, - 52, 244, 166, 229, 131, 217, 179, 227, 108, 38, 211, 238, 250, 141, 1, - 237, 67, 38, 211, 238, 250, 141, 1, 228, 19, 38, 211, 238, 250, 141, 1, - 237, 19, 38, 211, 238, 250, 141, 1, 224, 247, 38, 211, 238, 250, 141, 1, - 217, 69, 38, 211, 238, 250, 141, 1, 204, 70, 38, 211, 238, 250, 141, 1, - 212, 255, 38, 211, 238, 250, 141, 1, 216, 91, 38, 211, 238, 250, 141, 1, - 248, 105, 38, 211, 238, 250, 141, 1, 209, 201, 38, 211, 238, 250, 141, 1, - 214, 225, 38, 211, 238, 250, 141, 1, 229, 250, 38, 211, 238, 250, 141, 1, - 221, 40, 38, 211, 238, 250, 141, 1, 229, 126, 38, 211, 238, 250, 141, 1, - 215, 26, 38, 211, 238, 250, 141, 1, 214, 249, 38, 211, 238, 250, 141, 1, - 240, 60, 38, 211, 238, 250, 141, 1, 251, 30, 38, 211, 238, 250, 141, 1, - 250, 2, 38, 211, 238, 250, 141, 1, 243, 254, 38, 211, 238, 250, 141, 1, - 238, 67, 38, 211, 238, 250, 141, 1, 244, 177, 38, 211, 238, 250, 141, 1, - 238, 107, 38, 211, 238, 250, 141, 1, 209, 128, 38, 211, 238, 250, 141, 1, - 202, 94, 38, 211, 238, 250, 141, 1, 243, 251, 38, 211, 238, 250, 141, 1, - 202, 235, 38, 211, 238, 250, 141, 1, 209, 94, 38, 211, 238, 250, 141, 1, - 209, 73, 38, 211, 238, 250, 141, 42, 105, 38, 211, 238, 250, 141, 42, - 240, 18, 38, 211, 238, 250, 141, 141, 231, 31, 38, 153, 250, 141, 1, 237, - 43, 38, 153, 250, 141, 1, 228, 28, 38, 153, 250, 141, 1, 237, 148, 38, - 153, 250, 141, 1, 225, 5, 38, 153, 250, 141, 1, 217, 119, 38, 153, 250, - 141, 1, 204, 70, 38, 153, 250, 141, 1, 241, 15, 38, 153, 250, 141, 1, - 216, 122, 38, 153, 250, 141, 1, 248, 138, 38, 153, 250, 141, 1, 209, 169, - 38, 153, 250, 141, 1, 241, 16, 38, 153, 250, 141, 1, 230, 22, 38, 153, - 250, 141, 1, 221, 178, 38, 153, 250, 141, 1, 229, 140, 38, 153, 250, 141, - 1, 215, 28, 38, 153, 250, 141, 1, 241, 14, 38, 153, 250, 141, 1, 240, 47, - 38, 153, 250, 141, 1, 251, 30, 38, 153, 250, 141, 1, 251, 59, 38, 153, - 250, 141, 1, 244, 207, 38, 153, 250, 141, 1, 238, 181, 38, 153, 250, 141, - 1, 244, 184, 38, 153, 250, 141, 1, 238, 114, 38, 153, 250, 141, 1, 209, - 251, 38, 153, 250, 141, 1, 202, 107, 38, 153, 250, 141, 1, 209, 100, 38, - 153, 250, 141, 1, 203, 47, 38, 153, 250, 141, 1, 209, 88, 38, 153, 250, - 141, 1, 202, 110, 38, 153, 250, 141, 42, 105, 38, 153, 250, 141, 42, 209, - 152, 38, 153, 250, 141, 42, 207, 151, 225, 115, 1, 251, 28, 225, 115, 1, - 248, 105, 225, 115, 1, 248, 92, 225, 115, 1, 238, 67, 225, 115, 1, 238, - 92, 225, 115, 1, 244, 177, 225, 115, 1, 237, 67, 225, 115, 1, 204, 70, - 225, 115, 2, 207, 29, 225, 115, 1, 202, 95, 225, 115, 1, 202, 73, 225, - 115, 1, 230, 163, 225, 115, 1, 230, 145, 225, 115, 1, 237, 19, 225, 115, - 1, 209, 128, 225, 115, 1, 202, 235, 225, 115, 1, 229, 250, 225, 115, 1, - 203, 179, 225, 115, 1, 229, 133, 225, 115, 1, 228, 19, 225, 115, 1, 243, - 250, 225, 115, 1, 209, 99, 225, 115, 1, 224, 247, 225, 115, 1, 221, 40, - 225, 115, 1, 214, 249, 225, 115, 1, 250, 3, 225, 115, 1, 251, 234, 225, - 115, 1, 219, 34, 225, 115, 1, 240, 60, 225, 115, 1, 215, 26, 225, 115, 1, - 217, 69, 225, 115, 1, 203, 157, 225, 115, 1, 217, 95, 225, 115, 1, 216, - 91, 225, 115, 1, 212, 255, 225, 115, 1, 211, 133, 225, 115, 1, 209, 201, - 225, 115, 251, 146, 131, 55, 225, 115, 251, 146, 131, 56, 225, 115, 42, - 105, 225, 115, 42, 170, 225, 115, 42, 209, 152, 225, 115, 42, 207, 151, - 225, 115, 42, 118, 236, 11, 225, 115, 217, 179, 211, 94, 225, 115, 217, - 179, 239, 212, 225, 115, 217, 179, 52, 70, 204, 5, 243, 85, 225, 115, - 217, 179, 70, 204, 5, 243, 85, 225, 115, 217, 179, 243, 85, 225, 115, - 217, 179, 120, 243, 83, 225, 115, 217, 179, 227, 115, 240, 7, 250, 14, 1, - 63, 250, 14, 1, 252, 25, 250, 14, 1, 250, 178, 250, 14, 1, 251, 240, 250, - 14, 1, 250, 231, 250, 14, 1, 251, 241, 250, 14, 1, 251, 109, 250, 14, 1, - 251, 105, 250, 14, 1, 74, 250, 14, 1, 241, 161, 250, 14, 1, 78, 250, 14, - 1, 220, 18, 250, 14, 1, 75, 250, 14, 1, 231, 83, 250, 14, 1, 68, 250, 14, - 1, 206, 178, 250, 14, 1, 229, 201, 250, 14, 1, 203, 176, 250, 14, 1, 203, - 138, 250, 14, 1, 203, 148, 250, 14, 1, 238, 190, 250, 14, 1, 238, 150, - 250, 14, 1, 238, 105, 250, 14, 1, 246, 238, 250, 14, 1, 230, 161, 250, - 14, 1, 209, 187, 250, 14, 1, 209, 92, 250, 14, 1, 244, 75, 250, 14, 1, - 243, 248, 250, 14, 1, 207, 236, 250, 14, 1, 219, 34, 250, 14, 1, 240, 60, - 250, 14, 1, 248, 162, 250, 14, 1, 248, 94, 250, 14, 1, 222, 190, 250, 14, - 1, 222, 106, 250, 14, 1, 222, 107, 250, 14, 1, 222, 240, 250, 14, 1, 221, - 1, 250, 14, 1, 221, 222, 250, 14, 1, 225, 20, 250, 14, 1, 236, 186, 250, - 14, 1, 202, 166, 250, 14, 1, 203, 52, 250, 14, 1, 206, 55, 250, 14, 1, - 216, 158, 250, 14, 1, 227, 234, 250, 14, 1, 214, 177, 250, 14, 1, 202, - 92, 250, 14, 1, 213, 43, 250, 14, 1, 202, 71, 250, 14, 1, 212, 169, 250, - 14, 1, 211, 134, 250, 14, 1, 237, 67, 250, 14, 251, 146, 82, 208, 213, - 120, 187, 115, 118, 70, 217, 178, 5, 120, 187, 115, 118, 70, 217, 178, - 228, 8, 120, 187, 115, 118, 70, 217, 178, 228, 8, 118, 70, 115, 120, 187, - 217, 178, 228, 8, 120, 215, 250, 115, 118, 215, 253, 217, 178, 228, 8, - 118, 215, 253, 115, 120, 215, 250, 217, 178, 231, 10, 219, 70, 1, 251, - 28, 231, 10, 219, 70, 1, 248, 105, 231, 10, 219, 70, 1, 238, 67, 231, 10, - 219, 70, 1, 244, 177, 231, 10, 219, 70, 1, 237, 67, 231, 10, 219, 70, 1, - 204, 70, 231, 10, 219, 70, 1, 202, 95, 231, 10, 219, 70, 1, 237, 19, 231, - 10, 219, 70, 1, 209, 128, 231, 10, 219, 70, 1, 202, 235, 231, 10, 219, - 70, 1, 229, 250, 231, 10, 219, 70, 1, 228, 19, 231, 10, 219, 70, 1, 224, - 247, 231, 10, 219, 70, 1, 221, 40, 231, 10, 219, 70, 1, 214, 249, 231, - 10, 219, 70, 1, 250, 3, 231, 10, 219, 70, 1, 219, 34, 231, 10, 219, 70, - 1, 215, 26, 231, 10, 219, 70, 1, 217, 69, 231, 10, 219, 70, 1, 216, 91, - 231, 10, 219, 70, 1, 212, 255, 231, 10, 219, 70, 1, 209, 201, 231, 10, - 219, 70, 42, 105, 231, 10, 219, 70, 42, 108, 231, 10, 219, 70, 42, 147, - 231, 10, 219, 70, 42, 149, 231, 10, 219, 70, 42, 209, 152, 231, 10, 219, - 70, 42, 207, 151, 231, 10, 219, 70, 42, 118, 236, 11, 231, 10, 219, 70, - 42, 118, 209, 36, 231, 10, 219, 149, 1, 251, 28, 231, 10, 219, 149, 1, - 248, 105, 231, 10, 219, 149, 1, 238, 67, 231, 10, 219, 149, 1, 244, 177, - 231, 10, 219, 149, 1, 237, 67, 231, 10, 219, 149, 1, 204, 69, 231, 10, - 219, 149, 1, 202, 95, 231, 10, 219, 149, 1, 237, 19, 231, 10, 219, 149, - 1, 209, 128, 231, 10, 219, 149, 1, 202, 235, 231, 10, 219, 149, 1, 229, - 250, 231, 10, 219, 149, 1, 228, 19, 231, 10, 219, 149, 1, 224, 246, 231, - 10, 219, 149, 1, 221, 40, 231, 10, 219, 149, 1, 214, 249, 231, 10, 219, - 149, 1, 219, 34, 231, 10, 219, 149, 1, 215, 26, 231, 10, 219, 149, 1, - 212, 255, 231, 10, 219, 149, 1, 209, 201, 231, 10, 219, 149, 42, 105, - 231, 10, 219, 149, 42, 108, 231, 10, 219, 149, 42, 147, 231, 10, 219, - 149, 42, 149, 231, 10, 219, 149, 42, 209, 152, 231, 10, 219, 149, 42, - 207, 151, 231, 10, 219, 149, 42, 118, 236, 11, 231, 10, 219, 149, 42, - 118, 209, 36, 217, 203, 219, 149, 1, 251, 28, 217, 203, 219, 149, 1, 248, - 105, 217, 203, 219, 149, 1, 238, 67, 217, 203, 219, 149, 1, 244, 177, - 217, 203, 219, 149, 1, 237, 67, 217, 203, 219, 149, 1, 204, 69, 217, 203, - 219, 149, 1, 202, 95, 217, 203, 219, 149, 1, 237, 19, 217, 203, 219, 149, - 1, 202, 235, 217, 203, 219, 149, 1, 229, 250, 217, 203, 219, 149, 1, 228, - 19, 217, 203, 219, 149, 1, 224, 246, 217, 203, 219, 149, 1, 221, 40, 217, - 203, 219, 149, 1, 214, 249, 217, 203, 219, 149, 1, 219, 34, 217, 203, - 219, 149, 1, 215, 26, 217, 203, 219, 149, 1, 212, 255, 217, 203, 219, - 149, 1, 209, 201, 217, 203, 219, 149, 214, 168, 82, 217, 203, 219, 149, - 207, 174, 214, 168, 82, 217, 203, 219, 149, 239, 147, 187, 3, 245, 130, - 217, 203, 219, 149, 239, 147, 187, 3, 243, 85, 217, 203, 219, 149, 42, - 105, 217, 203, 219, 149, 42, 108, 217, 203, 219, 149, 42, 147, 217, 203, - 219, 149, 42, 149, 217, 203, 219, 149, 42, 209, 152, 217, 203, 219, 149, - 42, 207, 151, 217, 203, 219, 149, 42, 118, 236, 11, 38, 207, 178, 1, 219, - 235, 63, 38, 207, 178, 1, 203, 40, 63, 38, 207, 178, 1, 203, 40, 251, - 109, 38, 207, 178, 1, 219, 235, 75, 38, 207, 178, 1, 203, 40, 75, 38, - 207, 178, 1, 203, 40, 74, 38, 207, 178, 1, 219, 235, 78, 38, 207, 178, 1, - 219, 235, 220, 73, 38, 207, 178, 1, 203, 40, 220, 73, 38, 207, 178, 1, - 219, 235, 251, 232, 38, 207, 178, 1, 203, 40, 251, 232, 38, 207, 178, 1, - 219, 235, 251, 108, 38, 207, 178, 1, 203, 40, 251, 108, 38, 207, 178, 1, - 219, 235, 251, 81, 38, 207, 178, 1, 203, 40, 251, 81, 38, 207, 178, 1, - 219, 235, 251, 103, 38, 207, 178, 1, 203, 40, 251, 103, 38, 207, 178, 1, - 219, 235, 251, 122, 38, 207, 178, 1, 203, 40, 251, 122, 38, 207, 178, 1, - 219, 235, 251, 107, 38, 207, 178, 1, 219, 235, 240, 181, 38, 207, 178, 1, - 203, 40, 240, 181, 38, 207, 178, 1, 219, 235, 250, 8, 38, 207, 178, 1, - 203, 40, 250, 8, 38, 207, 178, 1, 219, 235, 251, 90, 38, 207, 178, 1, - 203, 40, 251, 90, 38, 207, 178, 1, 219, 235, 251, 101, 38, 207, 178, 1, - 203, 40, 251, 101, 38, 207, 178, 1, 219, 235, 220, 71, 38, 207, 178, 1, - 203, 40, 220, 71, 38, 207, 178, 1, 219, 235, 251, 39, 38, 207, 178, 1, - 203, 40, 251, 39, 38, 207, 178, 1, 219, 235, 251, 100, 38, 207, 178, 1, - 219, 235, 241, 106, 38, 207, 178, 1, 219, 235, 241, 103, 38, 207, 178, 1, - 219, 235, 250, 231, 38, 207, 178, 1, 219, 235, 251, 98, 38, 207, 178, 1, - 203, 40, 251, 98, 38, 207, 178, 1, 219, 235, 241, 70, 38, 207, 178, 1, - 203, 40, 241, 70, 38, 207, 178, 1, 219, 235, 241, 89, 38, 207, 178, 1, - 203, 40, 241, 89, 38, 207, 178, 1, 219, 235, 241, 56, 38, 207, 178, 1, - 203, 40, 241, 56, 38, 207, 178, 1, 203, 40, 250, 223, 38, 207, 178, 1, - 219, 235, 241, 78, 38, 207, 178, 1, 203, 40, 251, 97, 38, 207, 178, 1, - 219, 235, 241, 46, 38, 207, 178, 1, 219, 235, 220, 9, 38, 207, 178, 1, - 219, 235, 235, 164, 38, 207, 178, 1, 219, 235, 241, 169, 38, 207, 178, 1, - 203, 40, 241, 169, 38, 207, 178, 1, 219, 235, 250, 148, 38, 207, 178, 1, - 203, 40, 250, 148, 38, 207, 178, 1, 219, 235, 230, 226, 38, 207, 178, 1, - 203, 40, 230, 226, 38, 207, 178, 1, 219, 235, 219, 246, 38, 207, 178, 1, - 203, 40, 219, 246, 38, 207, 178, 1, 219, 235, 250, 144, 38, 207, 178, 1, - 203, 40, 250, 144, 38, 207, 178, 1, 219, 235, 251, 96, 38, 207, 178, 1, - 219, 235, 250, 81, 38, 207, 178, 1, 219, 235, 251, 94, 38, 207, 178, 1, - 219, 235, 250, 75, 38, 207, 178, 1, 203, 40, 250, 75, 38, 207, 178, 1, - 219, 235, 241, 7, 38, 207, 178, 1, 203, 40, 241, 7, 38, 207, 178, 1, 219, - 235, 250, 49, 38, 207, 178, 1, 203, 40, 250, 49, 38, 207, 178, 1, 219, - 235, 251, 91, 38, 207, 178, 1, 203, 40, 251, 91, 38, 207, 178, 1, 219, - 235, 219, 224, 38, 207, 178, 1, 219, 235, 248, 215, 38, 145, 6, 1, 63, - 38, 145, 6, 1, 252, 25, 38, 145, 6, 1, 241, 171, 38, 145, 6, 1, 250, 242, - 38, 145, 6, 1, 241, 169, 38, 145, 6, 1, 241, 89, 38, 145, 6, 1, 241, 166, - 38, 145, 6, 1, 241, 165, 38, 145, 6, 1, 250, 226, 38, 145, 6, 1, 74, 38, - 145, 6, 1, 246, 17, 74, 38, 145, 6, 1, 241, 161, 38, 145, 6, 1, 241, 154, - 38, 145, 6, 1, 241, 153, 38, 145, 6, 1, 241, 150, 38, 145, 6, 1, 241, - 147, 38, 145, 6, 1, 75, 38, 145, 6, 1, 231, 83, 38, 145, 6, 1, 241, 132, - 38, 145, 6, 1, 241, 129, 38, 145, 6, 1, 251, 47, 38, 145, 6, 1, 206, 232, - 38, 145, 6, 1, 241, 122, 38, 145, 6, 1, 241, 105, 38, 145, 6, 1, 241, - 103, 38, 145, 6, 1, 241, 92, 38, 145, 6, 1, 241, 56, 38, 145, 6, 1, 78, - 38, 145, 6, 1, 220, 18, 38, 145, 6, 1, 222, 71, 220, 73, 38, 145, 6, 1, - 215, 141, 220, 73, 38, 145, 6, 1, 220, 72, 38, 145, 6, 1, 241, 46, 38, - 145, 6, 1, 241, 97, 38, 145, 6, 1, 241, 28, 38, 145, 6, 1, 212, 228, 241, - 28, 38, 145, 6, 1, 241, 17, 38, 145, 6, 1, 240, 252, 38, 145, 6, 1, 240, - 250, 38, 145, 6, 1, 241, 70, 38, 145, 6, 1, 240, 239, 38, 145, 6, 1, 241, - 167, 38, 145, 6, 1, 68, 38, 145, 6, 1, 206, 178, 38, 145, 6, 1, 222, 71, - 207, 24, 38, 145, 6, 1, 215, 141, 207, 24, 38, 145, 6, 1, 240, 226, 38, - 145, 6, 1, 240, 181, 38, 145, 6, 1, 240, 176, 38, 145, 6, 1, 241, 69, 54, - 38, 145, 6, 1, 206, 193, 38, 145, 5, 1, 63, 38, 145, 5, 1, 252, 25, 38, - 145, 5, 1, 241, 171, 38, 145, 5, 1, 250, 242, 38, 145, 5, 1, 241, 169, - 38, 145, 5, 1, 241, 89, 38, 145, 5, 1, 241, 166, 38, 145, 5, 1, 241, 165, - 38, 145, 5, 1, 250, 226, 38, 145, 5, 1, 74, 38, 145, 5, 1, 246, 17, 74, - 38, 145, 5, 1, 241, 161, 38, 145, 5, 1, 241, 154, 38, 145, 5, 1, 241, - 153, 38, 145, 5, 1, 241, 150, 38, 145, 5, 1, 241, 147, 38, 145, 5, 1, 75, - 38, 145, 5, 1, 231, 83, 38, 145, 5, 1, 241, 132, 38, 145, 5, 1, 241, 129, - 38, 145, 5, 1, 251, 47, 38, 145, 5, 1, 206, 232, 38, 145, 5, 1, 241, 122, - 38, 145, 5, 1, 241, 105, 38, 145, 5, 1, 241, 103, 38, 145, 5, 1, 241, 92, - 38, 145, 5, 1, 241, 56, 38, 145, 5, 1, 78, 38, 145, 5, 1, 220, 18, 38, - 145, 5, 1, 222, 71, 220, 73, 38, 145, 5, 1, 215, 141, 220, 73, 38, 145, - 5, 1, 220, 72, 38, 145, 5, 1, 241, 46, 38, 145, 5, 1, 241, 97, 38, 145, - 5, 1, 241, 28, 38, 145, 5, 1, 212, 228, 241, 28, 38, 145, 5, 1, 241, 17, - 38, 145, 5, 1, 240, 252, 38, 145, 5, 1, 240, 250, 38, 145, 5, 1, 241, 70, - 38, 145, 5, 1, 240, 239, 38, 145, 5, 1, 241, 167, 38, 145, 5, 1, 68, 38, - 145, 5, 1, 206, 178, 38, 145, 5, 1, 222, 71, 207, 24, 38, 145, 5, 1, 215, - 141, 207, 24, 38, 145, 5, 1, 240, 226, 38, 145, 5, 1, 240, 181, 38, 145, - 5, 1, 240, 176, 38, 145, 5, 1, 241, 69, 54, 38, 145, 5, 1, 206, 193, 38, - 145, 42, 105, 38, 145, 42, 170, 38, 145, 42, 209, 152, 38, 145, 42, 240, - 18, 38, 145, 42, 118, 236, 11, 38, 145, 42, 118, 209, 36, 215, 129, 17, - 105, 215, 129, 17, 108, 215, 129, 17, 147, 215, 129, 17, 149, 215, 129, - 17, 170, 215, 129, 17, 195, 215, 129, 17, 213, 111, 215, 129, 17, 199, - 215, 129, 17, 222, 63, 215, 129, 42, 209, 152, 215, 129, 42, 207, 151, - 215, 129, 42, 209, 53, 215, 129, 42, 239, 153, 215, 129, 42, 240, 18, - 215, 129, 42, 212, 74, 215, 129, 42, 213, 105, 215, 129, 42, 241, 134, - 215, 129, 42, 222, 58, 215, 129, 42, 118, 236, 11, 215, 129, 42, 120, - 236, 11, 215, 129, 42, 126, 236, 11, 215, 129, 42, 239, 147, 236, 11, - 215, 129, 42, 239, 233, 236, 11, 215, 129, 42, 212, 88, 236, 11, 215, - 129, 42, 213, 112, 236, 11, 215, 129, 42, 241, 143, 236, 11, 215, 129, - 42, 222, 64, 236, 11, 215, 129, 239, 138, 118, 237, 137, 215, 129, 239, - 138, 118, 217, 55, 215, 129, 239, 138, 118, 209, 60, 215, 129, 239, 138, - 120, 209, 57, 144, 2, 247, 52, 144, 2, 250, 180, 144, 2, 205, 199, 144, - 2, 230, 135, 144, 2, 206, 222, 144, 1, 63, 144, 1, 252, 25, 144, 1, 75, - 144, 1, 231, 83, 144, 1, 68, 144, 1, 206, 178, 144, 1, 125, 146, 144, 1, - 125, 215, 186, 144, 1, 125, 159, 144, 1, 125, 227, 78, 144, 1, 74, 144, - 1, 251, 64, 144, 1, 78, 144, 1, 250, 34, 144, 1, 173, 144, 1, 229, 144, - 144, 1, 239, 8, 144, 1, 238, 119, 144, 1, 222, 203, 144, 1, 247, 92, 144, - 1, 246, 199, 144, 1, 230, 181, 144, 1, 230, 149, 144, 1, 221, 11, 144, 1, - 207, 241, 144, 1, 207, 229, 144, 1, 244, 120, 144, 1, 244, 104, 144, 1, - 221, 227, 144, 1, 210, 22, 144, 1, 209, 108, 144, 1, 244, 212, 144, 1, - 244, 1, 144, 1, 201, 201, 144, 1, 185, 144, 1, 218, 208, 144, 1, 249, 32, - 144, 1, 248, 98, 144, 1, 192, 144, 1, 198, 144, 1, 216, 220, 144, 1, 228, - 113, 144, 1, 206, 86, 144, 1, 213, 90, 144, 1, 211, 164, 144, 1, 215, 36, - 144, 1, 152, 144, 1, 227, 77, 144, 1, 38, 44, 227, 68, 144, 1, 38, 44, - 215, 185, 144, 1, 38, 44, 221, 209, 144, 22, 2, 252, 25, 144, 22, 2, 248, - 95, 252, 25, 144, 22, 2, 75, 144, 22, 2, 231, 83, 144, 22, 2, 68, 144, - 22, 2, 206, 178, 144, 22, 2, 125, 146, 144, 22, 2, 125, 215, 186, 144, - 22, 2, 125, 159, 144, 22, 2, 125, 227, 78, 144, 22, 2, 74, 144, 22, 2, - 251, 64, 144, 22, 2, 78, 144, 22, 2, 250, 34, 144, 205, 204, 144, 244, - 166, 144, 52, 244, 166, 144, 217, 179, 243, 85, 144, 217, 179, 52, 243, - 85, 144, 217, 179, 227, 114, 144, 217, 179, 245, 139, 142, 144, 217, 179, - 227, 5, 144, 42, 105, 144, 42, 108, 144, 42, 147, 144, 42, 149, 144, 42, - 170, 144, 42, 195, 144, 42, 213, 111, 144, 42, 199, 144, 42, 222, 63, - 144, 42, 209, 152, 144, 42, 207, 151, 144, 42, 209, 53, 144, 42, 239, - 153, 144, 42, 240, 18, 144, 42, 212, 74, 144, 42, 213, 105, 144, 42, 241, - 134, 144, 42, 222, 58, 144, 42, 118, 236, 11, 144, 42, 118, 209, 36, 144, - 17, 202, 84, 144, 17, 105, 144, 17, 108, 144, 17, 147, 144, 17, 149, 144, - 17, 170, 144, 17, 195, 144, 17, 213, 111, 144, 17, 199, 144, 17, 222, 63, - 144, 42, 230, 96, 230, 15, 2, 247, 52, 230, 15, 2, 250, 180, 230, 15, 2, - 205, 199, 230, 15, 1, 63, 230, 15, 1, 252, 25, 230, 15, 1, 75, 230, 15, - 1, 231, 83, 230, 15, 1, 68, 230, 15, 1, 206, 178, 230, 15, 1, 74, 230, - 15, 1, 251, 64, 230, 15, 1, 78, 230, 15, 1, 250, 34, 230, 15, 1, 173, - 230, 15, 1, 229, 144, 230, 15, 1, 239, 8, 230, 15, 1, 238, 119, 230, 15, - 1, 222, 203, 230, 15, 1, 247, 92, 230, 15, 1, 246, 199, 230, 15, 1, 230, - 181, 230, 15, 1, 230, 149, 230, 15, 1, 221, 11, 230, 15, 1, 207, 241, - 230, 15, 1, 207, 229, 230, 15, 1, 244, 120, 230, 15, 1, 244, 109, 230, - 15, 1, 244, 104, 230, 15, 1, 216, 61, 230, 15, 1, 221, 227, 230, 15, 1, - 210, 22, 230, 15, 1, 209, 108, 230, 15, 1, 244, 212, 230, 15, 1, 244, 1, - 230, 15, 1, 201, 201, 230, 15, 1, 185, 230, 15, 1, 218, 208, 230, 15, 1, - 249, 32, 230, 15, 1, 248, 98, 230, 15, 1, 192, 230, 15, 1, 198, 230, 15, - 1, 216, 220, 230, 15, 1, 228, 113, 230, 15, 1, 206, 86, 230, 15, 1, 213, - 90, 230, 15, 1, 211, 164, 230, 15, 1, 215, 36, 230, 15, 1, 152, 230, 15, - 22, 2, 252, 25, 230, 15, 22, 2, 75, 230, 15, 22, 2, 231, 83, 230, 15, 22, - 2, 68, 230, 15, 22, 2, 206, 178, 230, 15, 22, 2, 74, 230, 15, 22, 2, 251, - 64, 230, 15, 22, 2, 78, 230, 15, 22, 2, 250, 34, 230, 15, 2, 205, 204, - 230, 15, 2, 221, 51, 230, 15, 251, 146, 54, 230, 15, 241, 59, 54, 230, - 15, 42, 54, 230, 15, 214, 168, 82, 230, 15, 52, 214, 168, 82, 230, 15, - 244, 166, 230, 15, 52, 244, 166, 211, 246, 211, 254, 1, 215, 19, 211, - 246, 211, 254, 1, 209, 251, 211, 246, 211, 254, 1, 249, 5, 211, 246, 211, - 254, 1, 247, 81, 211, 246, 211, 254, 1, 244, 193, 211, 246, 211, 254, 1, - 238, 249, 211, 246, 211, 254, 1, 225, 148, 211, 246, 211, 254, 1, 222, - 200, 211, 246, 211, 254, 1, 228, 89, 211, 246, 211, 254, 1, 223, 93, 211, - 246, 211, 254, 1, 206, 82, 211, 246, 211, 254, 1, 219, 150, 211, 246, - 211, 254, 1, 203, 91, 211, 246, 211, 254, 1, 216, 199, 211, 246, 211, - 254, 1, 237, 148, 211, 246, 211, 254, 1, 230, 20, 211, 246, 211, 254, 1, - 230, 175, 211, 246, 211, 254, 1, 221, 8, 211, 246, 211, 254, 1, 251, 73, - 211, 246, 211, 254, 1, 241, 159, 211, 246, 211, 254, 1, 231, 84, 211, - 246, 211, 254, 1, 207, 18, 211, 246, 211, 254, 1, 220, 60, 211, 246, 211, - 254, 1, 241, 147, 211, 246, 211, 254, 1, 225, 161, 211, 246, 211, 254, - 17, 202, 84, 211, 246, 211, 254, 17, 105, 211, 246, 211, 254, 17, 108, - 211, 246, 211, 254, 17, 147, 211, 246, 211, 254, 17, 149, 211, 246, 211, - 254, 17, 170, 211, 246, 211, 254, 17, 195, 211, 246, 211, 254, 17, 213, - 111, 211, 246, 211, 254, 17, 199, 211, 246, 211, 254, 17, 222, 63, 246, - 193, 2, 247, 52, 246, 193, 2, 250, 180, 246, 193, 2, 205, 199, 246, 193, - 1, 252, 25, 246, 193, 1, 75, 246, 193, 1, 68, 246, 193, 1, 74, 246, 193, - 1, 230, 41, 246, 193, 1, 229, 143, 246, 193, 1, 239, 5, 246, 193, 1, 238, - 118, 246, 193, 1, 222, 202, 246, 193, 1, 247, 91, 246, 193, 1, 246, 198, - 246, 193, 1, 230, 180, 246, 193, 1, 230, 148, 246, 193, 1, 221, 10, 246, - 193, 1, 207, 240, 246, 193, 1, 207, 228, 246, 193, 1, 244, 119, 246, 193, - 1, 244, 103, 246, 193, 1, 221, 226, 246, 193, 1, 210, 18, 246, 193, 1, - 209, 107, 246, 193, 1, 244, 211, 246, 193, 1, 244, 0, 246, 193, 1, 223, - 106, 246, 193, 1, 219, 168, 246, 193, 1, 218, 207, 246, 193, 1, 249, 30, - 246, 193, 1, 248, 97, 246, 193, 1, 225, 175, 246, 193, 1, 202, 167, 246, - 193, 1, 203, 110, 246, 193, 1, 216, 216, 246, 193, 1, 228, 112, 246, 193, - 1, 204, 110, 246, 193, 1, 215, 33, 246, 193, 1, 237, 157, 246, 193, 22, - 2, 63, 246, 193, 22, 2, 75, 246, 193, 22, 2, 231, 83, 246, 193, 22, 2, - 68, 246, 193, 22, 2, 206, 178, 246, 193, 22, 2, 74, 246, 193, 22, 2, 251, - 64, 246, 193, 22, 2, 78, 246, 193, 22, 2, 250, 34, 246, 193, 22, 2, 220, - 57, 246, 193, 158, 82, 246, 193, 250, 35, 82, 246, 193, 205, 204, 246, - 193, 225, 173, 246, 193, 17, 202, 84, 246, 193, 17, 105, 246, 193, 17, - 108, 246, 193, 17, 147, 246, 193, 17, 149, 246, 193, 17, 170, 246, 193, - 17, 195, 246, 193, 17, 213, 111, 246, 193, 17, 199, 246, 193, 17, 222, - 63, 246, 193, 214, 168, 82, 246, 193, 244, 166, 246, 193, 52, 244, 166, - 246, 193, 217, 47, 82, 225, 146, 1, 63, 225, 146, 1, 75, 225, 146, 1, 68, - 225, 146, 1, 74, 225, 146, 1, 78, 225, 146, 1, 173, 225, 146, 1, 229, - 144, 225, 146, 1, 239, 8, 225, 146, 1, 238, 119, 225, 146, 1, 247, 92, - 225, 146, 1, 246, 199, 225, 146, 1, 230, 181, 225, 146, 1, 230, 149, 225, - 146, 1, 221, 11, 225, 146, 1, 207, 241, 225, 146, 1, 207, 229, 225, 146, - 1, 244, 120, 225, 146, 1, 244, 104, 225, 146, 1, 221, 227, 225, 146, 1, - 210, 22, 225, 146, 1, 209, 108, 225, 146, 1, 244, 212, 225, 146, 1, 244, - 1, 225, 146, 1, 201, 201, 225, 146, 1, 185, 225, 146, 1, 218, 208, 225, - 146, 1, 249, 32, 225, 146, 1, 248, 98, 225, 146, 1, 192, 225, 146, 1, - 216, 220, 225, 146, 1, 228, 113, 225, 146, 1, 206, 86, 225, 146, 1, 215, - 36, 225, 146, 1, 152, 225, 146, 1, 215, 185, 225, 146, 2, 221, 51, 225, - 146, 251, 146, 54, 225, 146, 214, 168, 82, 225, 146, 32, 212, 206, 181, - 2, 247, 52, 181, 2, 250, 180, 181, 2, 205, 199, 181, 1, 63, 181, 1, 252, - 25, 181, 1, 75, 181, 1, 231, 83, 181, 1, 68, 181, 1, 206, 178, 181, 1, - 125, 146, 181, 1, 125, 215, 186, 181, 1, 125, 159, 181, 1, 125, 227, 78, - 181, 1, 74, 181, 1, 251, 64, 181, 1, 78, 181, 1, 250, 34, 181, 1, 173, - 181, 1, 229, 144, 181, 1, 239, 8, 181, 1, 238, 119, 181, 1, 222, 203, - 181, 1, 247, 92, 181, 1, 246, 199, 181, 1, 230, 181, 181, 1, 230, 149, - 181, 1, 221, 11, 181, 1, 207, 241, 181, 1, 207, 229, 181, 1, 244, 120, - 181, 1, 244, 104, 181, 1, 221, 227, 181, 1, 210, 22, 181, 1, 209, 108, - 181, 1, 244, 212, 181, 1, 244, 1, 181, 1, 201, 201, 181, 1, 185, 181, 1, - 218, 208, 181, 1, 249, 32, 181, 1, 248, 98, 181, 1, 192, 181, 1, 198, - 181, 1, 216, 220, 181, 1, 228, 113, 181, 1, 227, 77, 181, 1, 206, 86, - 181, 1, 213, 90, 181, 1, 211, 164, 181, 1, 215, 36, 181, 1, 152, 181, 22, - 2, 252, 25, 181, 22, 2, 75, 181, 22, 2, 231, 83, 181, 22, 2, 68, 181, 22, - 2, 206, 178, 181, 22, 2, 125, 146, 181, 22, 2, 125, 215, 186, 181, 22, 2, - 125, 159, 181, 22, 2, 125, 227, 78, 181, 22, 2, 74, 181, 22, 2, 251, 64, - 181, 22, 2, 78, 181, 22, 2, 250, 34, 181, 2, 205, 204, 181, 2, 250, 17, - 181, 2, 230, 135, 181, 2, 206, 222, 181, 220, 39, 181, 244, 166, 181, 52, - 244, 166, 181, 251, 146, 54, 181, 213, 130, 181, 214, 239, 82, 181, 2, - 221, 51, 181, 22, 65, 82, 181, 240, 199, 212, 228, 22, 82, 181, 210, 180, - 82, 181, 17, 202, 84, 181, 17, 105, 181, 17, 108, 181, 17, 147, 181, 17, - 149, 181, 17, 170, 181, 17, 195, 181, 17, 213, 111, 181, 17, 199, 181, - 17, 222, 63, 181, 241, 128, 181, 2, 212, 157, 181, 237, 58, 181, 245, - 191, 54, 181, 214, 168, 225, 92, 181, 214, 168, 225, 91, 140, 250, 126, - 17, 105, 140, 250, 126, 17, 108, 140, 250, 126, 17, 147, 140, 250, 126, - 17, 149, 140, 250, 126, 17, 170, 140, 250, 126, 17, 195, 140, 250, 126, - 17, 213, 111, 140, 250, 126, 17, 199, 140, 250, 126, 17, 222, 63, 140, - 250, 126, 42, 209, 152, 140, 250, 126, 42, 207, 151, 140, 250, 126, 42, - 209, 53, 140, 250, 126, 42, 239, 153, 140, 250, 126, 42, 240, 18, 140, - 250, 126, 42, 212, 74, 140, 250, 126, 42, 213, 105, 140, 250, 126, 42, - 241, 134, 140, 250, 126, 42, 222, 58, 140, 250, 126, 42, 118, 236, 11, - 140, 250, 126, 42, 118, 209, 36, 229, 114, 1, 63, 229, 114, 1, 252, 25, - 229, 114, 1, 75, 229, 114, 1, 68, 229, 114, 1, 74, 229, 114, 1, 251, 64, - 229, 114, 1, 78, 229, 114, 1, 250, 34, 229, 114, 1, 173, 229, 114, 1, - 229, 144, 229, 114, 1, 239, 8, 229, 114, 1, 238, 155, 229, 114, 1, 238, - 119, 229, 114, 1, 222, 203, 229, 114, 1, 247, 92, 229, 114, 1, 246, 199, - 229, 114, 1, 230, 181, 229, 114, 1, 230, 129, 229, 114, 1, 221, 11, 229, - 114, 1, 207, 241, 229, 114, 1, 207, 229, 229, 114, 1, 244, 120, 229, 114, - 1, 244, 104, 229, 114, 1, 221, 227, 229, 114, 1, 210, 22, 229, 114, 1, - 209, 108, 229, 114, 1, 244, 212, 229, 114, 1, 244, 110, 229, 114, 1, 244, - 1, 229, 114, 1, 201, 201, 229, 114, 1, 185, 229, 114, 1, 218, 208, 229, - 114, 1, 249, 32, 229, 114, 1, 248, 198, 229, 114, 1, 248, 98, 229, 114, - 1, 192, 229, 114, 1, 198, 229, 114, 1, 216, 220, 229, 114, 1, 228, 113, - 229, 114, 1, 206, 86, 229, 114, 1, 215, 36, 229, 114, 1, 152, 229, 114, - 1, 227, 77, 229, 114, 22, 2, 252, 25, 229, 114, 22, 2, 75, 229, 114, 22, - 2, 231, 83, 229, 114, 22, 2, 68, 229, 114, 22, 2, 74, 229, 114, 22, 2, - 251, 64, 229, 114, 22, 2, 78, 229, 114, 22, 2, 250, 34, 229, 114, 2, 250, - 180, 229, 114, 2, 205, 204, 229, 114, 2, 221, 51, 229, 114, 2, 213, 80, - 229, 114, 244, 166, 229, 114, 52, 244, 166, 229, 114, 203, 238, 213, 130, - 229, 114, 214, 168, 82, 229, 114, 52, 214, 168, 82, 229, 114, 251, 146, - 54, 223, 230, 1, 63, 223, 230, 1, 75, 223, 230, 1, 68, 223, 230, 1, 74, - 223, 230, 1, 173, 223, 230, 1, 229, 144, 223, 230, 1, 239, 8, 223, 230, - 1, 238, 119, 223, 230, 1, 247, 92, 223, 230, 1, 246, 199, 223, 230, 1, - 230, 181, 223, 230, 1, 230, 129, 223, 230, 1, 221, 11, 223, 230, 1, 207, - 241, 223, 230, 1, 207, 229, 223, 230, 1, 244, 120, 223, 230, 1, 244, 110, - 223, 230, 1, 244, 104, 223, 230, 1, 221, 227, 223, 230, 1, 210, 22, 223, - 230, 1, 209, 108, 223, 230, 1, 244, 212, 223, 230, 1, 244, 1, 223, 230, - 1, 201, 201, 223, 230, 1, 185, 223, 230, 1, 218, 208, 223, 230, 1, 249, - 32, 223, 230, 1, 248, 98, 223, 230, 1, 192, 223, 230, 1, 198, 223, 230, - 1, 216, 220, 223, 230, 1, 228, 113, 223, 230, 1, 206, 86, 223, 230, 1, - 215, 36, 223, 230, 1, 152, 223, 230, 1, 215, 185, 223, 230, 1, 216, 61, - 223, 230, 214, 168, 82, 229, 106, 1, 63, 229, 106, 1, 252, 25, 229, 106, - 1, 75, 229, 106, 1, 231, 83, 229, 106, 1, 68, 229, 106, 1, 206, 178, 229, - 106, 1, 74, 229, 106, 1, 251, 64, 229, 106, 1, 78, 229, 106, 1, 250, 34, - 229, 106, 1, 173, 229, 106, 1, 229, 144, 229, 106, 1, 239, 8, 229, 106, - 1, 238, 155, 229, 106, 1, 238, 119, 229, 106, 1, 222, 203, 229, 106, 1, - 247, 92, 229, 106, 1, 246, 199, 229, 106, 1, 230, 181, 229, 106, 1, 230, - 129, 229, 106, 1, 230, 149, 229, 106, 1, 221, 11, 229, 106, 1, 207, 241, - 229, 106, 1, 207, 229, 229, 106, 1, 244, 120, 229, 106, 1, 244, 110, 229, - 106, 1, 215, 185, 229, 106, 1, 244, 104, 229, 106, 1, 221, 227, 229, 106, - 1, 210, 22, 229, 106, 1, 209, 108, 229, 106, 1, 244, 212, 229, 106, 1, - 244, 1, 229, 106, 1, 201, 201, 229, 106, 1, 185, 229, 106, 1, 218, 208, - 229, 106, 1, 249, 32, 229, 106, 1, 248, 198, 229, 106, 1, 248, 98, 229, - 106, 1, 192, 229, 106, 1, 198, 229, 106, 1, 216, 220, 229, 106, 1, 228, - 113, 229, 106, 1, 206, 86, 229, 106, 1, 213, 90, 229, 106, 1, 215, 36, - 229, 106, 1, 152, 229, 106, 2, 250, 180, 229, 106, 22, 2, 252, 25, 229, - 106, 22, 2, 75, 229, 106, 22, 2, 231, 83, 229, 106, 22, 2, 68, 229, 106, - 22, 2, 206, 178, 229, 106, 22, 2, 74, 229, 106, 22, 2, 251, 64, 229, 106, - 22, 2, 78, 229, 106, 22, 2, 250, 34, 229, 106, 2, 221, 51, 229, 106, 2, - 205, 204, 229, 106, 17, 202, 84, 229, 106, 17, 105, 229, 106, 17, 108, - 229, 106, 17, 147, 229, 106, 17, 149, 229, 106, 17, 170, 229, 106, 17, - 195, 229, 106, 17, 213, 111, 229, 106, 17, 199, 229, 106, 17, 222, 63, - 238, 6, 2, 39, 250, 181, 55, 238, 6, 2, 247, 52, 238, 6, 2, 250, 180, - 238, 6, 2, 205, 199, 238, 6, 1, 63, 238, 6, 1, 252, 25, 238, 6, 1, 75, - 238, 6, 1, 231, 83, 238, 6, 1, 68, 238, 6, 1, 206, 178, 238, 6, 1, 125, - 146, 238, 6, 1, 125, 159, 238, 6, 1, 241, 161, 238, 6, 1, 251, 64, 238, - 6, 1, 220, 18, 238, 6, 1, 250, 34, 238, 6, 1, 173, 238, 6, 1, 229, 144, - 238, 6, 1, 239, 8, 238, 6, 1, 238, 119, 238, 6, 1, 222, 203, 238, 6, 1, - 247, 92, 238, 6, 1, 246, 199, 238, 6, 1, 230, 181, 238, 6, 1, 230, 149, - 238, 6, 1, 221, 11, 238, 6, 1, 207, 241, 238, 6, 1, 207, 229, 238, 6, 1, - 244, 120, 238, 6, 1, 244, 104, 238, 6, 1, 221, 227, 238, 6, 1, 210, 22, - 238, 6, 1, 209, 108, 238, 6, 1, 244, 212, 238, 6, 1, 244, 1, 238, 6, 1, - 201, 201, 238, 6, 1, 185, 238, 6, 1, 218, 208, 238, 6, 1, 249, 32, 238, - 6, 1, 248, 98, 238, 6, 1, 192, 238, 6, 1, 198, 238, 6, 1, 216, 220, 238, - 6, 1, 228, 113, 238, 6, 1, 227, 77, 238, 6, 1, 206, 86, 238, 6, 1, 213, - 90, 238, 6, 1, 211, 164, 238, 6, 1, 215, 36, 238, 6, 1, 152, 238, 6, 2, - 221, 51, 238, 6, 2, 250, 17, 238, 6, 22, 2, 252, 25, 238, 6, 22, 2, 75, - 238, 6, 22, 2, 231, 83, 238, 6, 22, 2, 68, 238, 6, 22, 2, 206, 178, 238, - 6, 22, 2, 125, 146, 238, 6, 22, 2, 125, 215, 186, 238, 6, 22, 2, 241, - 161, 238, 6, 22, 2, 251, 64, 238, 6, 22, 2, 220, 18, 238, 6, 22, 2, 250, - 34, 238, 6, 2, 205, 204, 238, 6, 220, 39, 238, 6, 250, 35, 227, 196, 82, - 238, 6, 2, 218, 74, 238, 6, 1, 206, 52, 250, 180, 238, 6, 1, 206, 52, 52, - 250, 180, 238, 6, 1, 125, 215, 186, 238, 6, 1, 125, 227, 78, 238, 6, 22, - 2, 125, 159, 238, 6, 22, 2, 125, 227, 78, 39, 238, 6, 17, 202, 84, 39, - 238, 6, 17, 105, 39, 238, 6, 17, 108, 39, 238, 6, 17, 147, 39, 238, 6, - 17, 149, 39, 238, 6, 17, 170, 39, 238, 6, 17, 195, 39, 238, 6, 1, 63, 39, - 238, 6, 1, 173, 39, 238, 6, 1, 201, 201, 39, 238, 6, 1, 205, 230, 39, - 238, 6, 1, 185, 208, 204, 250, 209, 208, 204, 1, 63, 208, 204, 1, 252, - 25, 208, 204, 1, 75, 208, 204, 1, 231, 83, 208, 204, 1, 68, 208, 204, 1, - 206, 178, 208, 204, 1, 125, 146, 208, 204, 1, 125, 215, 186, 208, 204, 1, - 125, 159, 208, 204, 1, 125, 227, 78, 208, 204, 1, 74, 208, 204, 1, 251, - 64, 208, 204, 1, 78, 208, 204, 1, 250, 34, 208, 204, 1, 173, 208, 204, 1, - 229, 144, 208, 204, 1, 239, 8, 208, 204, 1, 238, 119, 208, 204, 1, 222, - 203, 208, 204, 1, 247, 92, 208, 204, 1, 246, 199, 208, 204, 1, 230, 181, - 208, 204, 1, 230, 149, 208, 204, 1, 221, 11, 208, 204, 1, 207, 241, 208, - 204, 1, 207, 229, 208, 204, 1, 244, 120, 208, 204, 1, 244, 104, 208, 204, - 1, 221, 227, 208, 204, 1, 210, 22, 208, 204, 1, 209, 108, 208, 204, 1, - 244, 212, 208, 204, 1, 244, 1, 208, 204, 1, 201, 201, 208, 204, 1, 185, - 208, 204, 1, 218, 208, 208, 204, 1, 249, 32, 208, 204, 1, 248, 98, 208, - 204, 1, 192, 208, 204, 1, 198, 208, 204, 1, 216, 220, 208, 204, 1, 228, - 113, 208, 204, 1, 206, 86, 208, 204, 1, 213, 90, 208, 204, 1, 211, 164, - 208, 204, 1, 215, 36, 208, 204, 1, 152, 208, 204, 22, 2, 252, 25, 208, - 204, 22, 2, 75, 208, 204, 22, 2, 231, 83, 208, 204, 22, 2, 68, 208, 204, - 22, 2, 206, 178, 208, 204, 22, 2, 125, 146, 208, 204, 22, 2, 125, 215, - 186, 208, 204, 22, 2, 125, 159, 208, 204, 22, 2, 125, 227, 78, 208, 204, - 22, 2, 74, 208, 204, 22, 2, 212, 228, 74, 208, 204, 22, 2, 251, 64, 208, - 204, 22, 2, 78, 208, 204, 22, 2, 212, 228, 78, 208, 204, 22, 2, 250, 34, - 208, 204, 2, 247, 52, 208, 204, 2, 250, 180, 208, 204, 2, 205, 199, 208, - 204, 2, 205, 204, 208, 204, 2, 221, 51, 208, 204, 2, 250, 17, 208, 204, - 237, 191, 208, 204, 251, 146, 54, 208, 204, 220, 39, 208, 204, 17, 202, - 84, 208, 204, 17, 105, 208, 204, 17, 108, 208, 204, 17, 147, 208, 204, - 17, 149, 208, 204, 17, 170, 208, 204, 17, 195, 208, 204, 17, 213, 111, - 208, 204, 17, 199, 208, 204, 17, 222, 63, 186, 1, 63, 186, 1, 252, 25, - 186, 1, 75, 186, 1, 231, 83, 186, 1, 68, 186, 1, 206, 178, 186, 1, 125, - 146, 186, 1, 125, 215, 186, 186, 1, 125, 159, 186, 1, 125, 227, 78, 186, - 1, 74, 186, 1, 251, 64, 186, 1, 78, 186, 1, 250, 34, 186, 1, 173, 186, 1, - 229, 144, 186, 1, 239, 8, 186, 1, 238, 119, 186, 1, 222, 203, 186, 1, - 247, 92, 186, 1, 246, 199, 186, 1, 230, 181, 186, 1, 230, 149, 186, 1, - 221, 11, 186, 1, 207, 241, 186, 1, 207, 229, 186, 1, 244, 120, 186, 1, - 244, 104, 186, 1, 221, 227, 186, 1, 210, 22, 186, 1, 209, 108, 186, 1, - 244, 212, 186, 1, 244, 1, 186, 1, 201, 201, 186, 1, 185, 186, 1, 218, - 208, 186, 1, 249, 32, 186, 1, 248, 98, 186, 1, 192, 186, 1, 198, 186, 1, - 216, 220, 186, 1, 228, 113, 186, 1, 206, 86, 186, 1, 213, 90, 186, 1, - 211, 164, 186, 1, 215, 36, 186, 1, 152, 186, 22, 2, 252, 25, 186, 22, 2, - 75, 186, 22, 2, 231, 83, 186, 22, 2, 68, 186, 22, 2, 206, 178, 186, 22, - 2, 125, 146, 186, 22, 2, 125, 215, 186, 186, 22, 2, 74, 186, 22, 2, 251, - 64, 186, 22, 2, 78, 186, 22, 2, 250, 34, 186, 2, 247, 52, 186, 2, 250, - 180, 186, 2, 205, 199, 186, 2, 205, 204, 186, 2, 221, 51, 186, 2, 212, - 157, 186, 244, 166, 186, 52, 244, 166, 186, 213, 131, 243, 85, 186, 213, - 131, 142, 186, 216, 98, 225, 92, 186, 216, 98, 225, 91, 186, 216, 98, - 225, 90, 186, 241, 84, 76, 209, 113, 82, 186, 214, 168, 131, 3, 208, 80, - 25, 207, 92, 219, 232, 186, 214, 168, 131, 3, 208, 80, 25, 242, 83, 245, - 137, 186, 214, 168, 131, 3, 216, 163, 25, 242, 83, 245, 137, 186, 214, - 168, 131, 3, 216, 163, 25, 242, 83, 52, 245, 137, 186, 214, 168, 131, 3, - 216, 163, 25, 242, 83, 208, 70, 245, 137, 186, 214, 168, 131, 52, 215, - 252, 186, 214, 168, 131, 52, 215, 253, 3, 216, 162, 186, 214, 168, 131, - 3, 52, 245, 137, 186, 214, 168, 131, 3, 208, 70, 245, 137, 186, 214, 168, - 131, 3, 217, 58, 245, 137, 186, 214, 168, 131, 3, 213, 128, 245, 137, - 186, 214, 168, 131, 3, 246, 59, 25, 216, 162, 186, 214, 168, 131, 3, 246, - 59, 25, 120, 241, 86, 186, 214, 168, 131, 3, 246, 59, 25, 239, 147, 241, - 86, 186, 1, 209, 32, 250, 255, 75, 186, 1, 207, 136, 250, 255, 75, 186, - 1, 207, 136, 250, 255, 231, 83, 186, 1, 250, 255, 68, 186, 22, 2, 250, - 255, 68, 186, 22, 2, 250, 255, 206, 178, 224, 74, 1, 63, 224, 74, 1, 252, - 25, 224, 74, 1, 75, 224, 74, 1, 231, 83, 224, 74, 1, 68, 224, 74, 1, 206, - 178, 224, 74, 1, 125, 146, 224, 74, 1, 125, 215, 186, 224, 74, 1, 125, - 159, 224, 74, 1, 125, 227, 78, 224, 74, 1, 74, 224, 74, 1, 251, 64, 224, - 74, 1, 78, 224, 74, 1, 250, 34, 224, 74, 1, 173, 224, 74, 1, 229, 144, - 224, 74, 1, 239, 8, 224, 74, 1, 238, 119, 224, 74, 1, 222, 203, 224, 74, - 1, 247, 92, 224, 74, 1, 246, 199, 224, 74, 1, 230, 181, 224, 74, 1, 230, - 149, 224, 74, 1, 221, 11, 224, 74, 1, 207, 241, 224, 74, 1, 207, 229, - 224, 74, 1, 244, 120, 224, 74, 1, 244, 104, 224, 74, 1, 221, 227, 224, - 74, 1, 210, 22, 224, 74, 1, 209, 108, 224, 74, 1, 244, 212, 224, 74, 1, - 244, 1, 224, 74, 1, 201, 201, 224, 74, 1, 185, 224, 74, 1, 218, 208, 224, - 74, 1, 249, 32, 224, 74, 1, 248, 98, 224, 74, 1, 192, 224, 74, 1, 198, - 224, 74, 1, 216, 220, 224, 74, 1, 228, 113, 224, 74, 1, 206, 86, 224, 74, - 1, 213, 90, 224, 74, 1, 211, 164, 224, 74, 1, 215, 36, 224, 74, 1, 152, - 224, 74, 1, 227, 77, 224, 74, 22, 2, 252, 25, 224, 74, 22, 2, 75, 224, - 74, 22, 2, 231, 83, 224, 74, 22, 2, 68, 224, 74, 22, 2, 206, 178, 224, - 74, 22, 2, 125, 146, 224, 74, 22, 2, 125, 215, 186, 224, 74, 22, 2, 125, - 159, 224, 74, 22, 2, 125, 227, 78, 224, 74, 22, 2, 74, 224, 74, 22, 2, - 251, 64, 224, 74, 22, 2, 78, 224, 74, 22, 2, 250, 34, 224, 74, 2, 250, - 180, 224, 74, 2, 205, 199, 224, 74, 2, 205, 204, 224, 74, 2, 250, 123, - 224, 74, 244, 166, 224, 74, 52, 244, 166, 224, 74, 251, 146, 54, 224, 74, - 2, 236, 0, 224, 74, 17, 202, 84, 224, 74, 17, 105, 224, 74, 17, 108, 224, - 74, 17, 147, 224, 74, 17, 149, 224, 74, 17, 170, 224, 74, 17, 195, 224, - 74, 17, 213, 111, 224, 74, 17, 199, 224, 74, 17, 222, 63, 209, 239, 1, - 63, 209, 239, 1, 252, 25, 209, 239, 1, 75, 209, 239, 1, 231, 83, 209, - 239, 1, 68, 209, 239, 1, 206, 178, 209, 239, 1, 74, 209, 239, 1, 251, 64, - 209, 239, 1, 78, 209, 239, 1, 250, 34, 209, 239, 1, 173, 209, 239, 1, - 229, 144, 209, 239, 1, 239, 8, 209, 239, 1, 238, 119, 209, 239, 1, 222, - 203, 209, 239, 1, 247, 92, 209, 239, 1, 246, 199, 209, 239, 1, 230, 181, - 209, 239, 1, 230, 149, 209, 239, 1, 221, 11, 209, 239, 1, 207, 241, 209, - 239, 1, 207, 229, 209, 239, 1, 244, 120, 209, 239, 1, 244, 104, 209, 239, - 1, 221, 227, 209, 239, 1, 210, 22, 209, 239, 1, 209, 108, 209, 239, 1, - 244, 212, 209, 239, 1, 244, 1, 209, 239, 1, 201, 201, 209, 239, 1, 185, - 209, 239, 1, 218, 208, 209, 239, 1, 249, 32, 209, 239, 1, 248, 98, 209, - 239, 1, 192, 209, 239, 1, 198, 209, 239, 1, 216, 220, 209, 239, 1, 228, - 113, 209, 239, 1, 206, 86, 209, 239, 1, 213, 90, 209, 239, 1, 215, 36, - 209, 239, 1, 152, 209, 239, 1, 215, 185, 209, 239, 2, 250, 180, 209, 239, - 2, 205, 199, 209, 239, 22, 2, 252, 25, 209, 239, 22, 2, 75, 209, 239, 22, - 2, 231, 83, 209, 239, 22, 2, 68, 209, 239, 22, 2, 206, 178, 209, 239, 22, - 2, 74, 209, 239, 22, 2, 251, 64, 209, 239, 22, 2, 78, 209, 239, 22, 2, - 250, 34, 209, 239, 2, 205, 204, 209, 239, 2, 221, 51, 209, 239, 17, 202, - 84, 209, 239, 17, 105, 209, 239, 17, 108, 209, 239, 17, 147, 209, 239, - 17, 149, 209, 239, 17, 170, 209, 239, 17, 195, 209, 239, 17, 213, 111, - 209, 239, 17, 199, 209, 239, 17, 222, 63, 251, 68, 1, 173, 251, 68, 1, - 229, 144, 251, 68, 1, 222, 203, 251, 68, 1, 201, 201, 251, 68, 1, 210, - 22, 251, 68, 1, 250, 255, 210, 22, 251, 68, 1, 185, 251, 68, 1, 218, 208, - 251, 68, 1, 249, 32, 251, 68, 1, 192, 251, 68, 1, 230, 181, 251, 68, 1, - 246, 199, 251, 68, 1, 209, 108, 251, 68, 1, 216, 220, 251, 68, 1, 228, - 113, 251, 68, 1, 215, 36, 251, 68, 1, 221, 11, 251, 68, 1, 152, 251, 68, - 1, 63, 251, 68, 1, 244, 212, 251, 68, 1, 244, 1, 251, 68, 1, 239, 8, 251, - 68, 1, 250, 255, 239, 8, 251, 68, 1, 238, 119, 251, 68, 1, 248, 98, 251, - 68, 1, 230, 149, 251, 68, 109, 2, 174, 228, 113, 251, 68, 109, 2, 174, - 216, 220, 251, 68, 109, 2, 174, 227, 135, 216, 220, 251, 68, 22, 2, 63, - 251, 68, 22, 2, 252, 25, 251, 68, 22, 2, 75, 251, 68, 22, 2, 231, 83, - 251, 68, 22, 2, 68, 251, 68, 22, 2, 206, 178, 251, 68, 22, 2, 74, 251, - 68, 22, 2, 250, 13, 251, 68, 22, 2, 78, 251, 68, 22, 2, 251, 64, 251, 68, - 22, 2, 250, 247, 251, 68, 2, 229, 86, 251, 68, 17, 202, 84, 251, 68, 17, - 105, 251, 68, 17, 108, 251, 68, 17, 147, 251, 68, 17, 149, 251, 68, 17, - 170, 251, 68, 17, 195, 251, 68, 17, 213, 111, 251, 68, 17, 199, 251, 68, - 17, 222, 63, 251, 68, 42, 209, 152, 251, 68, 42, 207, 151, 251, 68, 2, 5, - 214, 167, 251, 68, 2, 214, 167, 251, 68, 2, 215, 136, 251, 68, 16, 205, - 230, 204, 92, 246, 48, 6, 1, 222, 202, 204, 92, 246, 48, 6, 1, 63, 204, - 92, 246, 48, 6, 1, 204, 30, 204, 92, 246, 48, 6, 1, 202, 213, 204, 92, - 246, 48, 6, 1, 198, 204, 92, 246, 48, 6, 1, 202, 247, 204, 92, 246, 48, - 6, 1, 231, 83, 204, 92, 246, 48, 6, 1, 206, 178, 204, 92, 246, 48, 6, 1, - 74, 204, 92, 246, 48, 6, 1, 78, 204, 92, 246, 48, 6, 1, 250, 223, 204, - 92, 246, 48, 6, 1, 239, 8, 204, 92, 246, 48, 6, 1, 229, 26, 204, 92, 246, - 48, 6, 1, 241, 56, 204, 92, 246, 48, 6, 1, 202, 197, 204, 92, 246, 48, 6, - 1, 207, 31, 204, 92, 246, 48, 6, 1, 241, 75, 204, 92, 246, 48, 6, 1, 220, - 76, 204, 92, 246, 48, 6, 1, 207, 236, 204, 92, 246, 48, 6, 1, 221, 37, - 204, 92, 246, 48, 6, 1, 244, 212, 204, 92, 246, 48, 6, 1, 250, 49, 204, - 92, 246, 48, 6, 1, 250, 247, 204, 92, 246, 48, 6, 1, 247, 193, 204, 92, - 246, 48, 6, 1, 217, 191, 204, 92, 246, 48, 6, 1, 236, 228, 204, 92, 246, - 48, 6, 1, 236, 124, 204, 92, 246, 48, 6, 1, 236, 51, 204, 92, 246, 48, 6, - 1, 237, 92, 204, 92, 246, 48, 6, 1, 211, 116, 204, 92, 246, 48, 6, 1, - 212, 142, 204, 92, 246, 48, 6, 1, 205, 190, 204, 92, 246, 48, 5, 1, 222, - 202, 204, 92, 246, 48, 5, 1, 63, 204, 92, 246, 48, 5, 1, 204, 30, 204, - 92, 246, 48, 5, 1, 202, 213, 204, 92, 246, 48, 5, 1, 198, 204, 92, 246, - 48, 5, 1, 202, 247, 204, 92, 246, 48, 5, 1, 231, 83, 204, 92, 246, 48, 5, - 1, 206, 178, 204, 92, 246, 48, 5, 1, 74, 204, 92, 246, 48, 5, 1, 78, 204, - 92, 246, 48, 5, 1, 250, 223, 204, 92, 246, 48, 5, 1, 239, 8, 204, 92, - 246, 48, 5, 1, 229, 26, 204, 92, 246, 48, 5, 1, 241, 56, 204, 92, 246, - 48, 5, 1, 202, 197, 204, 92, 246, 48, 5, 1, 207, 31, 204, 92, 246, 48, 5, - 1, 241, 75, 204, 92, 246, 48, 5, 1, 220, 76, 204, 92, 246, 48, 5, 1, 207, - 236, 204, 92, 246, 48, 5, 1, 221, 37, 204, 92, 246, 48, 5, 1, 244, 212, - 204, 92, 246, 48, 5, 1, 250, 49, 204, 92, 246, 48, 5, 1, 250, 247, 204, - 92, 246, 48, 5, 1, 247, 193, 204, 92, 246, 48, 5, 1, 217, 191, 204, 92, - 246, 48, 5, 1, 236, 228, 204, 92, 246, 48, 5, 1, 236, 124, 204, 92, 246, - 48, 5, 1, 236, 51, 204, 92, 246, 48, 5, 1, 237, 92, 204, 92, 246, 48, 5, - 1, 211, 116, 204, 92, 246, 48, 5, 1, 212, 142, 204, 92, 246, 48, 5, 1, - 205, 190, 204, 92, 246, 48, 17, 202, 84, 204, 92, 246, 48, 17, 105, 204, - 92, 246, 48, 17, 108, 204, 92, 246, 48, 17, 147, 204, 92, 246, 48, 17, - 149, 204, 92, 246, 48, 17, 170, 204, 92, 246, 48, 17, 195, 204, 92, 246, - 48, 17, 213, 111, 204, 92, 246, 48, 17, 199, 204, 92, 246, 48, 17, 222, - 63, 204, 92, 246, 48, 42, 209, 152, 204, 92, 246, 48, 42, 207, 151, 204, - 92, 246, 48, 42, 209, 53, 204, 92, 246, 48, 42, 239, 153, 204, 92, 246, - 48, 42, 240, 18, 204, 92, 246, 48, 42, 212, 74, 204, 92, 246, 48, 42, - 213, 105, 204, 92, 246, 48, 42, 241, 134, 204, 92, 246, 48, 42, 222, 58, - 204, 92, 246, 48, 220, 39, 219, 49, 246, 66, 237, 77, 1, 185, 219, 49, - 246, 66, 237, 77, 1, 173, 219, 49, 246, 66, 237, 77, 1, 228, 113, 219, - 49, 246, 66, 237, 77, 1, 192, 219, 49, 246, 66, 237, 77, 1, 244, 212, - 219, 49, 246, 66, 237, 77, 1, 202, 116, 219, 49, 246, 66, 237, 77, 1, - 206, 86, 219, 49, 246, 66, 237, 77, 1, 222, 203, 219, 49, 246, 66, 237, - 77, 1, 152, 219, 49, 246, 66, 237, 77, 1, 239, 8, 219, 49, 246, 66, 237, - 77, 1, 229, 144, 219, 49, 246, 66, 237, 77, 1, 215, 36, 219, 49, 246, 66, - 237, 77, 1, 249, 32, 219, 49, 246, 66, 237, 77, 1, 247, 92, 219, 49, 246, - 66, 237, 77, 1, 210, 22, 219, 49, 246, 66, 237, 77, 1, 209, 108, 219, 49, - 246, 66, 237, 77, 1, 201, 201, 219, 49, 246, 66, 237, 77, 1, 218, 208, - 219, 49, 246, 66, 237, 77, 1, 216, 220, 219, 49, 246, 66, 237, 77, 1, - 240, 108, 219, 49, 246, 66, 237, 77, 1, 246, 199, 219, 49, 246, 66, 237, - 77, 1, 63, 219, 49, 246, 66, 237, 77, 1, 74, 219, 49, 246, 66, 237, 77, - 1, 75, 219, 49, 246, 66, 237, 77, 1, 78, 219, 49, 246, 66, 237, 77, 1, - 68, 219, 49, 246, 66, 237, 77, 1, 207, 39, 219, 49, 246, 66, 237, 77, 1, - 235, 171, 219, 49, 246, 66, 237, 77, 1, 46, 219, 184, 219, 49, 246, 66, - 237, 77, 1, 46, 230, 54, 219, 49, 246, 66, 237, 77, 1, 46, 210, 69, 219, - 49, 246, 66, 237, 77, 1, 46, 226, 185, 219, 49, 246, 66, 237, 77, 1, 46, - 223, 163, 219, 49, 246, 66, 237, 77, 1, 46, 159, 219, 49, 246, 66, 237, - 77, 1, 46, 204, 144, 219, 49, 246, 66, 237, 77, 1, 46, 222, 205, 219, 49, - 246, 66, 237, 77, 1, 46, 203, 124, 219, 49, 246, 66, 237, 77, 215, 245, - 143, 227, 28, 219, 49, 246, 66, 237, 77, 215, 245, 208, 161, 219, 49, - 246, 66, 237, 77, 214, 239, 238, 45, 211, 61, 219, 49, 246, 66, 237, 77, - 215, 245, 143, 163, 240, 5, 219, 49, 246, 66, 237, 77, 215, 245, 143, - 240, 5, 219, 49, 246, 66, 237, 77, 214, 239, 238, 45, 211, 62, 240, 5, - 219, 49, 246, 66, 237, 77, 214, 239, 143, 227, 28, 219, 49, 246, 66, 237, - 77, 214, 239, 208, 161, 219, 49, 246, 66, 237, 77, 214, 239, 143, 163, - 240, 5, 219, 49, 246, 66, 237, 77, 214, 239, 143, 240, 5, 219, 49, 246, - 66, 237, 77, 224, 149, 208, 161, 219, 49, 246, 66, 237, 77, 238, 45, 211, - 62, 206, 68, 219, 49, 246, 66, 237, 77, 224, 149, 143, 163, 240, 5, 219, - 49, 246, 66, 237, 77, 224, 149, 143, 240, 5, 219, 49, 246, 66, 237, 77, - 226, 254, 143, 227, 28, 219, 49, 246, 66, 237, 77, 226, 254, 208, 161, - 219, 49, 246, 66, 237, 77, 238, 45, 211, 61, 219, 49, 246, 66, 237, 77, - 226, 254, 143, 163, 240, 5, 219, 49, 246, 66, 237, 77, 226, 254, 143, - 240, 5, 219, 49, 246, 66, 237, 77, 238, 45, 211, 62, 240, 5, 9, 2, 63, 9, - 2, 34, 23, 63, 9, 2, 34, 23, 249, 15, 9, 2, 34, 23, 238, 233, 209, 141, - 9, 2, 34, 23, 152, 9, 2, 34, 23, 231, 85, 9, 2, 34, 23, 228, 93, 237, - 208, 9, 2, 34, 23, 223, 199, 9, 2, 34, 23, 215, 22, 9, 2, 254, 34, 9, 2, - 251, 232, 9, 2, 251, 233, 23, 250, 73, 9, 2, 251, 233, 23, 242, 30, 237, - 208, 9, 2, 251, 233, 23, 238, 246, 9, 2, 251, 233, 23, 238, 233, 209, - 141, 9, 2, 251, 233, 23, 152, 9, 2, 251, 233, 23, 231, 86, 237, 208, 9, - 2, 251, 233, 23, 231, 59, 9, 2, 251, 233, 23, 228, 94, 9, 2, 251, 233, - 23, 213, 27, 9, 2, 251, 233, 23, 106, 91, 106, 91, 68, 9, 2, 251, 233, - 237, 208, 9, 2, 251, 149, 9, 2, 251, 150, 23, 248, 252, 9, 2, 251, 150, - 23, 238, 233, 209, 141, 9, 2, 251, 150, 23, 225, 21, 91, 241, 92, 9, 2, - 251, 150, 23, 213, 88, 9, 2, 251, 150, 23, 209, 242, 9, 2, 251, 122, 9, - 2, 251, 47, 9, 2, 251, 48, 23, 241, 22, 9, 2, 251, 48, 23, 212, 245, 91, - 238, 55, 9, 2, 251, 39, 9, 2, 251, 40, 23, 251, 39, 9, 2, 251, 40, 23, - 243, 186, 9, 2, 251, 40, 23, 238, 55, 9, 2, 251, 40, 23, 152, 9, 2, 251, - 40, 23, 230, 27, 9, 2, 251, 40, 23, 229, 100, 9, 2, 251, 40, 23, 213, 43, - 9, 2, 251, 40, 23, 206, 186, 9, 2, 251, 36, 9, 2, 251, 28, 9, 2, 250, - 243, 9, 2, 250, 244, 23, 213, 43, 9, 2, 250, 231, 9, 2, 250, 232, 115, - 250, 231, 9, 2, 250, 232, 126, 208, 219, 9, 2, 250, 232, 91, 223, 97, - 219, 251, 250, 232, 91, 223, 96, 9, 2, 250, 232, 91, 223, 97, 211, 176, - 9, 2, 250, 200, 9, 2, 250, 170, 9, 2, 250, 138, 9, 2, 250, 139, 23, 228, - 183, 9, 2, 250, 110, 9, 2, 250, 80, 9, 2, 250, 75, 9, 2, 250, 76, 202, - 35, 209, 141, 9, 2, 250, 76, 230, 31, 209, 141, 9, 2, 250, 76, 115, 250, - 76, 207, 198, 115, 207, 198, 207, 198, 115, 207, 198, 219, 96, 9, 2, 250, - 76, 115, 250, 76, 115, 250, 75, 9, 2, 250, 76, 115, 250, 76, 115, 250, - 76, 245, 124, 250, 76, 115, 250, 76, 115, 250, 75, 9, 2, 250, 73, 9, 2, - 250, 69, 9, 2, 249, 32, 9, 2, 249, 15, 9, 2, 249, 9, 9, 2, 249, 3, 9, 2, - 248, 253, 9, 2, 248, 254, 115, 248, 253, 9, 2, 248, 252, 9, 2, 142, 9, 2, - 248, 230, 9, 2, 248, 86, 9, 2, 248, 87, 23, 63, 9, 2, 248, 87, 23, 238, - 224, 9, 2, 248, 87, 23, 231, 86, 237, 208, 9, 2, 247, 193, 9, 2, 247, - 194, 115, 247, 194, 251, 232, 9, 2, 247, 194, 115, 247, 194, 206, 255, 9, - 2, 247, 194, 245, 124, 247, 193, 9, 2, 247, 171, 9, 2, 247, 172, 115, - 247, 171, 9, 2, 247, 160, 9, 2, 247, 159, 9, 2, 244, 212, 9, 2, 244, 203, - 9, 2, 244, 204, 229, 69, 23, 34, 91, 225, 79, 9, 2, 244, 204, 229, 69, - 23, 250, 243, 9, 2, 244, 204, 229, 69, 23, 248, 252, 9, 2, 244, 204, 229, - 69, 23, 248, 86, 9, 2, 244, 204, 229, 69, 23, 239, 8, 9, 2, 244, 204, - 229, 69, 23, 239, 9, 91, 225, 79, 9, 2, 244, 204, 229, 69, 23, 238, 81, - 9, 2, 244, 204, 229, 69, 23, 238, 63, 9, 2, 244, 204, 229, 69, 23, 237, - 219, 9, 2, 244, 204, 229, 69, 23, 152, 9, 2, 244, 204, 229, 69, 23, 230, - 224, 9, 2, 244, 204, 229, 69, 23, 230, 225, 91, 226, 239, 9, 2, 244, 204, - 229, 69, 23, 230, 12, 9, 2, 244, 204, 229, 69, 23, 228, 113, 9, 2, 244, - 204, 229, 69, 23, 226, 239, 9, 2, 244, 204, 229, 69, 23, 226, 240, 91, - 225, 78, 9, 2, 244, 204, 229, 69, 23, 226, 222, 9, 2, 244, 204, 229, 69, - 23, 222, 240, 9, 2, 244, 204, 229, 69, 23, 219, 97, 91, 219, 96, 9, 2, - 244, 204, 229, 69, 23, 212, 162, 9, 2, 244, 204, 229, 69, 23, 209, 242, - 9, 2, 244, 204, 229, 69, 23, 207, 41, 91, 238, 63, 9, 2, 244, 204, 229, - 69, 23, 206, 186, 9, 2, 244, 175, 9, 2, 244, 154, 9, 2, 244, 153, 9, 2, - 244, 152, 9, 2, 243, 233, 9, 2, 243, 215, 9, 2, 243, 188, 9, 2, 243, 189, - 23, 213, 43, 9, 2, 243, 186, 9, 2, 243, 176, 9, 2, 243, 177, 229, 232, - 106, 237, 209, 243, 156, 9, 2, 243, 156, 9, 2, 242, 42, 9, 2, 242, 43, - 115, 242, 42, 9, 2, 242, 43, 237, 208, 9, 2, 242, 43, 213, 24, 9, 2, 242, - 40, 9, 2, 242, 41, 23, 241, 4, 9, 2, 242, 39, 9, 2, 242, 37, 9, 2, 242, - 36, 9, 2, 242, 35, 9, 2, 242, 31, 9, 2, 242, 29, 9, 2, 242, 30, 237, 208, - 9, 2, 242, 30, 237, 209, 237, 208, 9, 2, 242, 28, 9, 2, 242, 21, 9, 2, - 74, 9, 2, 188, 23, 219, 96, 9, 2, 188, 115, 188, 221, 41, 115, 221, 40, - 9, 2, 241, 190, 9, 2, 241, 191, 23, 34, 91, 237, 160, 91, 244, 212, 9, 2, - 241, 191, 23, 238, 224, 9, 2, 241, 191, 23, 224, 155, 9, 2, 241, 191, 23, - 215, 8, 9, 2, 241, 191, 23, 213, 43, 9, 2, 241, 191, 23, 68, 9, 2, 241, - 163, 9, 2, 241, 151, 9, 2, 241, 122, 9, 2, 241, 92, 9, 2, 241, 93, 23, - 238, 232, 9, 2, 241, 93, 23, 238, 233, 209, 141, 9, 2, 241, 93, 23, 225, - 20, 9, 2, 241, 93, 245, 124, 241, 92, 9, 2, 241, 93, 219, 251, 241, 92, - 9, 2, 241, 93, 211, 176, 9, 2, 241, 25, 9, 2, 241, 22, 9, 2, 241, 4, 9, - 2, 240, 179, 9, 2, 240, 180, 23, 63, 9, 2, 240, 180, 23, 34, 91, 228, 30, - 9, 2, 240, 180, 23, 34, 91, 228, 31, 23, 228, 30, 9, 2, 240, 180, 23, - 250, 231, 9, 2, 240, 180, 23, 249, 15, 9, 2, 240, 180, 23, 242, 30, 237, - 208, 9, 2, 240, 180, 23, 242, 30, 237, 209, 237, 208, 9, 2, 240, 180, 23, - 152, 9, 2, 240, 180, 23, 237, 160, 237, 208, 9, 2, 240, 180, 23, 231, 86, - 237, 208, 9, 2, 240, 180, 23, 229, 231, 9, 2, 240, 180, 23, 229, 232, - 211, 176, 9, 2, 240, 180, 23, 228, 207, 9, 2, 240, 180, 23, 228, 113, 9, - 2, 240, 180, 23, 228, 31, 23, 228, 30, 9, 2, 240, 180, 23, 227, 148, 9, - 2, 240, 180, 23, 226, 239, 9, 2, 240, 180, 23, 207, 40, 9, 2, 240, 180, - 23, 207, 29, 9, 2, 239, 8, 9, 2, 239, 9, 237, 208, 9, 2, 239, 6, 9, 2, - 239, 7, 23, 34, 91, 244, 213, 91, 152, 9, 2, 239, 7, 23, 34, 91, 152, 9, - 2, 239, 7, 23, 34, 91, 231, 85, 9, 2, 239, 7, 23, 251, 150, 209, 142, 91, - 210, 10, 9, 2, 239, 7, 23, 250, 231, 9, 2, 239, 7, 23, 250, 75, 9, 2, - 239, 7, 23, 250, 74, 91, 238, 246, 9, 2, 239, 7, 23, 249, 15, 9, 2, 239, - 7, 23, 248, 231, 91, 216, 220, 9, 2, 239, 7, 23, 247, 160, 9, 2, 239, 7, - 23, 247, 161, 91, 216, 220, 9, 2, 239, 7, 23, 244, 212, 9, 2, 239, 7, 23, - 243, 233, 9, 2, 239, 7, 23, 243, 189, 23, 213, 43, 9, 2, 239, 7, 23, 242, - 40, 9, 2, 239, 7, 23, 241, 122, 9, 2, 239, 7, 23, 241, 123, 91, 228, 113, - 9, 2, 239, 7, 23, 241, 92, 9, 2, 239, 7, 23, 241, 93, 23, 238, 233, 209, - 141, 9, 2, 239, 7, 23, 238, 233, 209, 141, 9, 2, 239, 7, 23, 238, 224, 9, - 2, 239, 7, 23, 238, 81, 9, 2, 239, 7, 23, 238, 79, 9, 2, 239, 7, 23, 238, - 80, 91, 63, 9, 2, 239, 7, 23, 238, 64, 91, 211, 10, 9, 2, 239, 7, 23, - 237, 160, 91, 226, 240, 91, 241, 4, 9, 2, 239, 7, 23, 237, 140, 9, 2, - 239, 7, 23, 237, 141, 91, 228, 113, 9, 2, 239, 7, 23, 237, 4, 91, 227, - 148, 9, 2, 239, 7, 23, 236, 21, 9, 2, 239, 7, 23, 231, 86, 237, 208, 9, - 2, 239, 7, 23, 230, 210, 91, 236, 27, 91, 250, 75, 9, 2, 239, 7, 23, 230, - 12, 9, 2, 239, 7, 23, 229, 231, 9, 2, 239, 7, 23, 229, 94, 9, 2, 239, 7, - 23, 229, 95, 91, 228, 30, 9, 2, 239, 7, 23, 228, 208, 91, 250, 231, 9, 2, - 239, 7, 23, 228, 113, 9, 2, 239, 7, 23, 225, 21, 91, 241, 92, 9, 2, 239, - 7, 23, 224, 155, 9, 2, 239, 7, 23, 221, 40, 9, 2, 239, 7, 23, 221, 41, - 115, 221, 40, 9, 2, 239, 7, 23, 185, 9, 2, 239, 7, 23, 215, 8, 9, 2, 239, - 7, 23, 214, 230, 9, 2, 239, 7, 23, 213, 43, 9, 2, 239, 7, 23, 213, 44, - 91, 207, 181, 9, 2, 239, 7, 23, 213, 9, 9, 2, 239, 7, 23, 210, 220, 9, 2, - 239, 7, 23, 209, 242, 9, 2, 239, 7, 23, 68, 9, 2, 239, 7, 23, 207, 29, 9, - 2, 239, 7, 23, 207, 30, 91, 242, 42, 9, 2, 239, 7, 115, 239, 6, 9, 2, - 239, 1, 9, 2, 239, 2, 245, 124, 239, 1, 9, 2, 238, 255, 9, 2, 239, 0, - 115, 239, 0, 238, 225, 115, 238, 224, 9, 2, 238, 246, 9, 2, 238, 247, - 239, 0, 115, 239, 0, 238, 225, 115, 238, 224, 9, 2, 238, 245, 9, 2, 238, - 243, 9, 2, 238, 234, 9, 2, 238, 232, 9, 2, 238, 233, 209, 141, 9, 2, 238, - 233, 115, 238, 232, 9, 2, 238, 233, 245, 124, 238, 232, 9, 2, 238, 224, - 9, 2, 238, 223, 9, 2, 238, 218, 9, 2, 238, 162, 9, 2, 238, 163, 23, 228, - 183, 9, 2, 238, 81, 9, 2, 238, 82, 23, 74, 9, 2, 238, 82, 23, 68, 9, 2, - 238, 82, 245, 124, 238, 81, 9, 2, 238, 79, 9, 2, 238, 80, 115, 238, 79, - 9, 2, 238, 80, 245, 124, 238, 79, 9, 2, 238, 76, 9, 2, 238, 63, 9, 2, - 238, 64, 237, 208, 9, 2, 238, 61, 9, 2, 238, 62, 23, 34, 91, 231, 85, 9, - 2, 238, 62, 23, 238, 233, 209, 141, 9, 2, 238, 62, 23, 231, 85, 9, 2, - 238, 62, 23, 226, 240, 91, 231, 85, 9, 2, 238, 62, 23, 185, 9, 2, 238, - 57, 9, 2, 238, 55, 9, 2, 238, 56, 245, 124, 238, 55, 9, 2, 238, 56, 23, - 249, 15, 9, 2, 238, 56, 23, 209, 242, 9, 2, 238, 56, 209, 141, 9, 2, 237, - 230, 9, 2, 237, 231, 245, 124, 237, 230, 9, 2, 237, 228, 9, 2, 237, 229, - 23, 230, 12, 9, 2, 237, 229, 23, 230, 13, 23, 231, 86, 237, 208, 9, 2, - 237, 229, 23, 221, 40, 9, 2, 237, 229, 23, 215, 9, 91, 207, 197, 9, 2, - 237, 229, 237, 208, 9, 2, 237, 219, 9, 2, 237, 220, 23, 34, 91, 228, 183, - 9, 2, 237, 220, 23, 228, 183, 9, 2, 237, 220, 115, 237, 220, 226, 230, 9, - 2, 237, 212, 9, 2, 237, 210, 9, 2, 237, 211, 23, 213, 43, 9, 2, 237, 202, - 9, 2, 237, 201, 9, 2, 237, 197, 9, 2, 237, 196, 9, 2, 152, 9, 2, 237, - 160, 209, 141, 9, 2, 237, 160, 237, 208, 9, 2, 237, 140, 9, 2, 237, 3, 9, - 2, 237, 4, 23, 250, 75, 9, 2, 237, 4, 23, 250, 73, 9, 2, 237, 4, 23, 249, - 15, 9, 2, 237, 4, 23, 243, 156, 9, 2, 237, 4, 23, 238, 255, 9, 2, 237, 4, - 23, 229, 84, 9, 2, 237, 4, 23, 221, 40, 9, 2, 237, 4, 23, 213, 43, 9, 2, - 237, 4, 23, 68, 9, 2, 236, 26, 9, 2, 236, 21, 9, 2, 236, 22, 23, 250, - 231, 9, 2, 236, 22, 23, 237, 140, 9, 2, 236, 22, 23, 229, 231, 9, 2, 236, - 22, 23, 227, 92, 9, 2, 236, 22, 23, 207, 29, 9, 2, 236, 17, 9, 2, 75, 9, - 2, 235, 206, 63, 9, 2, 235, 166, 9, 2, 231, 113, 9, 2, 231, 114, 115, - 231, 114, 247, 160, 9, 2, 231, 114, 115, 231, 114, 211, 176, 9, 2, 231, - 88, 9, 2, 231, 85, 9, 2, 231, 86, 243, 215, 9, 2, 231, 86, 216, 57, 9, 2, - 231, 86, 115, 231, 86, 212, 249, 115, 212, 249, 207, 30, 115, 207, 29, 9, - 2, 231, 86, 237, 208, 9, 2, 231, 77, 9, 2, 231, 78, 23, 238, 233, 209, - 141, 9, 2, 231, 76, 9, 2, 231, 66, 9, 2, 231, 67, 23, 209, 242, 9, 2, - 231, 67, 245, 124, 231, 66, 9, 2, 231, 67, 219, 251, 231, 66, 9, 2, 231, - 67, 211, 176, 9, 2, 231, 59, 9, 2, 231, 49, 9, 2, 230, 224, 9, 2, 230, - 209, 9, 2, 173, 9, 2, 230, 44, 23, 63, 9, 2, 230, 44, 23, 251, 122, 9, 2, - 230, 44, 23, 251, 123, 91, 228, 207, 9, 2, 230, 44, 23, 250, 73, 9, 2, - 230, 44, 23, 249, 15, 9, 2, 230, 44, 23, 248, 252, 9, 2, 230, 44, 23, - 142, 9, 2, 230, 44, 23, 248, 86, 9, 2, 230, 44, 23, 241, 22, 9, 2, 230, - 44, 23, 241, 4, 9, 2, 230, 44, 23, 239, 8, 9, 2, 230, 44, 23, 238, 246, - 9, 2, 230, 44, 23, 238, 233, 209, 141, 9, 2, 230, 44, 23, 238, 224, 9, 2, - 230, 44, 23, 238, 225, 91, 213, 89, 91, 63, 9, 2, 230, 44, 23, 238, 81, - 9, 2, 230, 44, 23, 238, 63, 9, 2, 230, 44, 23, 238, 56, 91, 214, 230, 9, - 2, 230, 44, 23, 238, 56, 245, 124, 238, 55, 9, 2, 230, 44, 23, 237, 230, - 9, 2, 230, 44, 23, 237, 201, 9, 2, 230, 44, 23, 231, 85, 9, 2, 230, 44, - 23, 231, 66, 9, 2, 230, 44, 23, 230, 12, 9, 2, 230, 44, 23, 229, 100, 9, - 2, 230, 44, 23, 229, 94, 9, 2, 230, 44, 23, 227, 148, 9, 2, 230, 44, 23, - 226, 239, 9, 2, 230, 44, 23, 225, 20, 9, 2, 230, 44, 23, 225, 21, 91, - 242, 42, 9, 2, 230, 44, 23, 225, 21, 91, 238, 81, 9, 2, 230, 44, 23, 225, - 21, 91, 209, 187, 9, 2, 230, 44, 23, 224, 155, 9, 2, 230, 44, 23, 224, - 156, 91, 221, 35, 9, 2, 230, 44, 23, 222, 240, 9, 2, 230, 44, 23, 221, - 40, 9, 2, 230, 44, 23, 218, 167, 9, 2, 230, 44, 23, 215, 145, 9, 2, 230, - 44, 23, 215, 36, 9, 2, 230, 44, 23, 214, 230, 9, 2, 230, 44, 23, 213, 90, - 9, 2, 230, 44, 23, 213, 43, 9, 2, 230, 44, 23, 213, 9, 9, 2, 230, 44, 23, - 212, 199, 9, 2, 230, 44, 23, 212, 149, 9, 2, 230, 44, 23, 210, 229, 9, 2, - 230, 44, 23, 209, 218, 9, 2, 230, 44, 23, 68, 9, 2, 230, 44, 23, 207, 40, - 9, 2, 230, 44, 23, 207, 29, 9, 2, 230, 44, 23, 207, 2, 23, 185, 9, 2, - 230, 44, 23, 206, 186, 9, 2, 230, 44, 23, 202, 39, 9, 2, 230, 42, 9, 2, - 230, 43, 245, 124, 230, 42, 9, 2, 230, 32, 9, 2, 230, 29, 9, 2, 230, 27, - 9, 2, 230, 26, 9, 2, 230, 24, 9, 2, 230, 25, 115, 230, 24, 9, 2, 230, 12, - 9, 2, 230, 13, 23, 231, 86, 237, 208, 9, 2, 230, 8, 9, 2, 230, 9, 23, - 249, 15, 9, 2, 230, 9, 245, 124, 230, 8, 9, 2, 230, 6, 9, 2, 230, 5, 9, - 2, 229, 231, 9, 2, 229, 232, 228, 95, 23, 106, 115, 228, 95, 23, 68, 9, - 2, 229, 232, 115, 229, 232, 228, 95, 23, 106, 115, 228, 95, 23, 68, 9, 2, - 229, 171, 9, 2, 229, 100, 9, 2, 229, 101, 23, 249, 15, 9, 2, 229, 101, - 23, 68, 9, 2, 229, 101, 23, 207, 29, 9, 2, 229, 94, 9, 2, 229, 84, 9, 2, - 229, 71, 9, 2, 229, 70, 9, 2, 229, 68, 9, 2, 229, 69, 115, 229, 68, 9, 2, - 228, 209, 9, 2, 228, 210, 115, 237, 4, 23, 250, 74, 228, 210, 115, 237, - 4, 23, 250, 73, 9, 2, 228, 207, 9, 2, 228, 205, 9, 2, 228, 206, 206, 69, - 18, 9, 2, 228, 204, 9, 2, 228, 196, 9, 2, 228, 197, 237, 208, 9, 2, 228, - 195, 9, 2, 228, 183, 9, 2, 228, 184, 219, 251, 228, 183, 9, 2, 228, 177, - 9, 2, 228, 155, 9, 2, 228, 113, 9, 2, 228, 94, 9, 2, 228, 95, 23, 63, 9, - 2, 228, 95, 23, 34, 91, 244, 213, 91, 152, 9, 2, 228, 95, 23, 34, 91, - 238, 224, 9, 2, 228, 95, 23, 34, 91, 228, 30, 9, 2, 228, 95, 23, 251, 39, - 9, 2, 228, 95, 23, 250, 231, 9, 2, 228, 95, 23, 250, 76, 202, 35, 209, - 141, 9, 2, 228, 95, 23, 249, 15, 9, 2, 228, 95, 23, 248, 86, 9, 2, 228, - 95, 23, 244, 154, 9, 2, 228, 95, 23, 241, 92, 9, 2, 228, 95, 23, 239, 8, - 9, 2, 228, 95, 23, 238, 224, 9, 2, 228, 95, 23, 237, 219, 9, 2, 228, 95, - 23, 237, 220, 91, 237, 219, 9, 2, 228, 95, 23, 152, 9, 2, 228, 95, 23, - 237, 140, 9, 2, 228, 95, 23, 237, 4, 23, 221, 40, 9, 2, 228, 95, 23, 231, - 86, 237, 208, 9, 2, 228, 95, 23, 231, 66, 9, 2, 228, 95, 23, 231, 67, 91, - 152, 9, 2, 228, 95, 23, 231, 67, 91, 226, 239, 9, 2, 228, 95, 23, 229, - 100, 9, 2, 228, 95, 23, 229, 84, 9, 2, 228, 95, 23, 228, 207, 9, 2, 228, - 95, 23, 228, 196, 9, 2, 228, 95, 23, 228, 197, 91, 237, 4, 91, 63, 9, 2, - 228, 95, 23, 228, 94, 9, 2, 228, 95, 23, 227, 92, 9, 2, 228, 95, 23, 226, - 239, 9, 2, 228, 95, 23, 226, 224, 9, 2, 228, 95, 23, 225, 20, 9, 2, 228, - 95, 23, 225, 21, 91, 241, 92, 9, 2, 228, 95, 23, 223, 199, 9, 2, 228, 95, - 23, 222, 240, 9, 2, 228, 95, 23, 213, 44, 91, 210, 220, 9, 2, 228, 95, - 23, 212, 245, 91, 238, 56, 91, 241, 22, 9, 2, 228, 95, 23, 212, 245, 91, - 238, 56, 209, 141, 9, 2, 228, 95, 23, 212, 197, 9, 2, 228, 95, 23, 212, - 198, 91, 212, 197, 9, 2, 228, 95, 23, 210, 220, 9, 2, 228, 95, 23, 209, - 255, 9, 2, 228, 95, 23, 209, 242, 9, 2, 228, 95, 23, 209, 188, 91, 34, - 91, 211, 11, 91, 201, 201, 9, 2, 228, 95, 23, 68, 9, 2, 228, 95, 23, 106, - 91, 63, 9, 2, 228, 95, 23, 106, 91, 106, 91, 68, 9, 2, 228, 95, 23, 207, - 41, 91, 250, 75, 9, 2, 228, 95, 23, 207, 29, 9, 2, 228, 95, 23, 206, 186, - 9, 2, 228, 95, 211, 176, 9, 2, 228, 92, 9, 2, 228, 93, 23, 213, 43, 9, 2, - 228, 93, 23, 213, 44, 91, 210, 220, 9, 2, 228, 93, 237, 208, 9, 2, 228, - 93, 237, 209, 115, 228, 93, 237, 209, 213, 43, 9, 2, 228, 88, 9, 2, 228, - 30, 9, 2, 228, 31, 23, 228, 30, 9, 2, 228, 28, 9, 2, 228, 29, 23, 228, - 183, 9, 2, 228, 29, 23, 228, 184, 91, 215, 145, 9, 2, 227, 148, 9, 2, - 227, 129, 9, 2, 227, 117, 9, 2, 227, 92, 9, 2, 226, 239, 9, 2, 226, 240, - 23, 249, 15, 9, 2, 226, 237, 9, 2, 226, 238, 23, 251, 39, 9, 2, 226, 238, - 23, 249, 15, 9, 2, 226, 238, 23, 241, 4, 9, 2, 226, 238, 23, 241, 5, 209, - 141, 9, 2, 226, 238, 23, 238, 233, 209, 141, 9, 2, 226, 238, 23, 237, 4, - 23, 249, 15, 9, 2, 226, 238, 23, 231, 66, 9, 2, 226, 238, 23, 230, 29, 9, - 2, 226, 238, 23, 230, 27, 9, 2, 226, 238, 23, 230, 28, 91, 250, 75, 9, 2, - 226, 238, 23, 229, 100, 9, 2, 226, 238, 23, 228, 114, 91, 250, 75, 9, 2, - 226, 238, 23, 228, 94, 9, 2, 226, 238, 23, 225, 21, 91, 241, 92, 9, 2, - 226, 238, 23, 222, 240, 9, 2, 226, 238, 23, 221, 84, 9, 2, 226, 238, 23, - 212, 163, 91, 250, 75, 9, 2, 226, 238, 23, 212, 141, 91, 247, 193, 9, 2, - 226, 238, 23, 207, 197, 9, 2, 226, 238, 209, 141, 9, 2, 226, 238, 245, - 124, 226, 237, 9, 2, 226, 238, 219, 251, 226, 237, 9, 2, 226, 238, 211, - 176, 9, 2, 226, 238, 213, 24, 9, 2, 226, 236, 9, 2, 226, 230, 9, 2, 226, - 231, 115, 226, 230, 9, 2, 226, 231, 219, 251, 226, 230, 9, 2, 226, 231, - 213, 24, 9, 2, 226, 227, 9, 2, 226, 224, 9, 2, 226, 222, 9, 2, 226, 223, - 115, 226, 222, 9, 2, 226, 223, 115, 226, 223, 238, 225, 115, 238, 224, 9, - 2, 192, 9, 2, 225, 177, 23, 209, 242, 9, 2, 225, 177, 237, 208, 9, 2, - 225, 176, 9, 2, 225, 148, 9, 2, 225, 100, 9, 2, 225, 79, 9, 2, 225, 78, - 9, 2, 225, 20, 9, 2, 224, 228, 9, 2, 224, 155, 9, 2, 224, 110, 9, 2, 223, - 246, 9, 2, 223, 247, 115, 223, 246, 9, 2, 223, 235, 9, 2, 223, 236, 237, - 208, 9, 2, 223, 217, 9, 2, 223, 203, 9, 2, 223, 199, 9, 2, 223, 200, 23, - 63, 9, 2, 223, 200, 23, 228, 183, 9, 2, 223, 200, 23, 202, 116, 9, 2, - 223, 200, 115, 223, 199, 9, 2, 223, 200, 115, 223, 200, 23, 34, 91, 201, - 201, 9, 2, 223, 200, 245, 124, 223, 199, 9, 2, 223, 197, 9, 2, 223, 198, - 23, 63, 9, 2, 223, 198, 23, 34, 91, 243, 233, 9, 2, 223, 198, 23, 243, - 233, 9, 2, 223, 198, 237, 208, 9, 2, 201, 201, 9, 2, 223, 109, 9, 2, 223, - 96, 9, 2, 223, 97, 230, 238, 9, 2, 223, 97, 23, 212, 200, 209, 141, 9, 2, - 223, 97, 219, 251, 223, 96, 9, 2, 223, 95, 9, 2, 223, 88, 221, 26, 9, 2, - 223, 87, 9, 2, 223, 86, 9, 2, 222, 240, 9, 2, 222, 241, 23, 63, 9, 2, - 222, 241, 23, 207, 29, 9, 2, 222, 241, 213, 24, 9, 2, 222, 100, 9, 2, - 222, 101, 23, 74, 9, 2, 222, 99, 9, 2, 222, 69, 9, 2, 222, 70, 23, 238, - 233, 209, 141, 9, 2, 222, 70, 23, 238, 225, 91, 238, 233, 209, 141, 9, 2, - 222, 65, 9, 2, 222, 66, 23, 250, 231, 9, 2, 222, 66, 23, 250, 75, 9, 2, - 222, 66, 23, 250, 76, 91, 250, 75, 9, 2, 222, 66, 23, 237, 219, 9, 2, - 222, 66, 23, 225, 21, 91, 238, 233, 209, 141, 9, 2, 222, 66, 23, 222, - 240, 9, 2, 222, 66, 23, 221, 40, 9, 2, 222, 66, 23, 213, 43, 9, 2, 222, - 66, 23, 213, 44, 91, 34, 250, 231, 9, 2, 222, 66, 23, 213, 44, 91, 250, - 75, 9, 2, 222, 66, 23, 213, 44, 91, 250, 76, 91, 250, 75, 9, 2, 222, 66, - 23, 207, 41, 91, 250, 75, 9, 2, 222, 66, 23, 206, 186, 9, 2, 222, 53, 9, - 2, 221, 84, 9, 2, 221, 56, 9, 2, 221, 40, 9, 2, 221, 41, 228, 93, 23, - 238, 224, 9, 2, 221, 41, 228, 93, 23, 225, 79, 9, 2, 221, 41, 228, 93, - 23, 215, 8, 9, 2, 221, 41, 228, 93, 23, 215, 9, 115, 221, 41, 228, 93, - 23, 215, 8, 9, 2, 221, 41, 228, 93, 23, 206, 186, 9, 2, 221, 41, 209, - 141, 9, 2, 221, 41, 115, 221, 40, 9, 2, 221, 41, 245, 124, 221, 40, 9, 2, - 221, 41, 245, 124, 221, 41, 228, 93, 115, 228, 92, 9, 2, 221, 35, 9, 2, - 221, 36, 251, 150, 23, 250, 69, 9, 2, 221, 36, 251, 150, 23, 248, 86, 9, - 2, 221, 36, 251, 150, 23, 242, 37, 9, 2, 221, 36, 251, 150, 23, 237, 219, - 9, 2, 221, 36, 251, 150, 23, 231, 86, 237, 208, 9, 2, 221, 36, 251, 150, - 23, 230, 27, 9, 2, 221, 36, 251, 150, 23, 228, 113, 9, 2, 221, 36, 251, - 150, 23, 222, 240, 9, 2, 221, 36, 251, 150, 23, 212, 138, 9, 2, 221, 36, - 251, 150, 23, 207, 40, 9, 2, 221, 36, 229, 69, 23, 248, 86, 9, 2, 221, - 36, 229, 69, 23, 248, 87, 68, 9, 2, 185, 9, 2, 219, 159, 9, 2, 219, 122, - 9, 2, 219, 96, 9, 2, 218, 222, 9, 2, 218, 167, 9, 2, 218, 168, 23, 63, 9, - 2, 218, 168, 23, 251, 232, 9, 2, 218, 168, 23, 248, 86, 9, 2, 218, 168, - 23, 247, 193, 9, 2, 218, 168, 23, 74, 9, 2, 218, 168, 23, 75, 9, 2, 218, - 168, 23, 235, 166, 9, 2, 218, 168, 23, 68, 9, 2, 218, 168, 23, 207, 40, - 9, 2, 218, 168, 245, 124, 218, 167, 9, 2, 218, 109, 9, 2, 218, 110, 23, - 230, 8, 9, 2, 218, 110, 23, 207, 29, 9, 2, 218, 110, 23, 202, 116, 9, 2, - 218, 110, 219, 251, 218, 109, 9, 2, 216, 220, 9, 2, 216, 214, 9, 2, 216, - 57, 9, 2, 215, 145, 9, 2, 215, 36, 9, 2, 215, 23, 221, 26, 9, 2, 215, 22, - 9, 2, 215, 23, 23, 63, 9, 2, 215, 23, 23, 242, 42, 9, 2, 215, 23, 23, - 242, 40, 9, 2, 215, 23, 23, 152, 9, 2, 215, 23, 23, 230, 12, 9, 2, 215, - 23, 23, 228, 183, 9, 2, 215, 23, 23, 226, 222, 9, 2, 215, 23, 23, 224, - 155, 9, 2, 215, 23, 23, 221, 40, 9, 2, 215, 23, 23, 215, 8, 9, 2, 215, - 23, 23, 213, 9, 9, 2, 215, 23, 23, 210, 10, 9, 2, 215, 23, 23, 207, 40, - 9, 2, 215, 23, 23, 207, 35, 9, 2, 215, 23, 23, 207, 6, 9, 2, 215, 23, 23, - 206, 210, 9, 2, 215, 23, 23, 206, 186, 9, 2, 215, 23, 115, 215, 22, 9, 2, - 215, 23, 237, 208, 9, 2, 215, 8, 9, 2, 215, 9, 228, 95, 23, 250, 73, 9, - 2, 214, 238, 9, 2, 214, 230, 9, 2, 213, 90, 9, 2, 213, 88, 9, 2, 213, 89, - 23, 63, 9, 2, 213, 89, 23, 249, 15, 9, 2, 213, 89, 23, 238, 55, 9, 2, - 213, 89, 23, 222, 240, 9, 2, 213, 89, 23, 212, 197, 9, 2, 213, 89, 23, - 207, 181, 9, 2, 213, 89, 23, 68, 9, 2, 213, 89, 23, 106, 91, 63, 9, 2, - 213, 86, 9, 2, 213, 84, 9, 2, 213, 59, 9, 2, 213, 43, 9, 2, 213, 44, 236, - 26, 9, 2, 213, 44, 115, 213, 44, 239, 0, 115, 239, 0, 238, 225, 115, 238, - 224, 9, 2, 213, 44, 115, 213, 44, 210, 11, 115, 210, 11, 238, 225, 115, - 238, 224, 9, 2, 213, 36, 9, 2, 213, 31, 9, 2, 213, 27, 9, 2, 213, 26, 9, - 2, 213, 23, 9, 2, 213, 9, 9, 2, 213, 10, 23, 63, 9, 2, 213, 10, 23, 231, - 66, 9, 2, 213, 3, 9, 2, 213, 4, 23, 63, 9, 2, 213, 4, 23, 248, 253, 9, 2, - 213, 4, 23, 247, 171, 9, 2, 213, 4, 23, 243, 176, 9, 2, 213, 4, 23, 238, - 224, 9, 2, 213, 4, 23, 231, 85, 9, 2, 213, 4, 23, 231, 86, 237, 208, 9, - 2, 213, 4, 23, 228, 177, 9, 2, 213, 4, 23, 226, 224, 9, 2, 213, 4, 23, - 223, 235, 9, 2, 213, 4, 23, 215, 8, 9, 2, 212, 253, 9, 2, 212, 248, 9, 2, - 212, 249, 209, 141, 9, 2, 212, 249, 115, 212, 249, 247, 161, 115, 247, - 160, 9, 2, 212, 244, 9, 2, 212, 199, 9, 2, 212, 200, 115, 230, 239, 212, - 199, 9, 2, 212, 197, 9, 2, 212, 196, 9, 2, 212, 162, 9, 2, 212, 163, 237, - 208, 9, 2, 212, 149, 9, 2, 212, 147, 9, 2, 212, 148, 115, 212, 148, 212, - 197, 9, 2, 212, 140, 9, 2, 212, 138, 9, 2, 211, 10, 9, 2, 211, 11, 115, - 211, 10, 9, 2, 210, 232, 9, 2, 210, 231, 9, 2, 210, 229, 9, 2, 210, 220, - 9, 2, 210, 219, 9, 2, 210, 193, 9, 2, 210, 192, 9, 2, 210, 22, 9, 2, 210, - 23, 250, 59, 9, 2, 210, 23, 23, 237, 3, 9, 2, 210, 23, 23, 224, 155, 9, - 2, 210, 23, 237, 208, 9, 2, 210, 10, 9, 2, 210, 11, 115, 210, 11, 222, - 101, 115, 222, 101, 243, 157, 115, 243, 156, 9, 2, 210, 11, 211, 176, 9, - 2, 209, 255, 9, 2, 160, 23, 248, 86, 9, 2, 160, 23, 237, 219, 9, 2, 160, - 23, 213, 43, 9, 2, 160, 23, 212, 199, 9, 2, 160, 23, 207, 197, 9, 2, 160, - 23, 207, 29, 9, 2, 209, 242, 9, 2, 209, 218, 9, 2, 209, 187, 9, 2, 209, - 188, 237, 208, 9, 2, 209, 2, 9, 2, 209, 3, 209, 141, 9, 2, 208, 229, 9, - 2, 208, 206, 9, 2, 208, 207, 23, 209, 242, 9, 2, 208, 207, 115, 208, 206, - 9, 2, 208, 207, 115, 208, 207, 239, 0, 115, 239, 0, 238, 225, 115, 238, - 224, 9, 2, 207, 203, 9, 2, 207, 197, 9, 2, 207, 195, 9, 2, 207, 191, 9, - 2, 207, 181, 9, 2, 207, 182, 115, 207, 182, 202, 117, 115, 202, 116, 9, - 2, 68, 9, 2, 106, 237, 219, 9, 2, 106, 106, 68, 9, 2, 106, 115, 106, 219, - 169, 115, 219, 169, 238, 225, 115, 238, 224, 9, 2, 106, 115, 106, 210, - 194, 115, 210, 193, 9, 2, 106, 115, 106, 106, 216, 73, 115, 106, 216, 72, - 9, 2, 207, 40, 9, 2, 207, 35, 9, 2, 207, 29, 9, 2, 207, 30, 228, 177, 9, - 2, 207, 30, 23, 249, 15, 9, 2, 207, 30, 23, 224, 155, 9, 2, 207, 30, 23, - 106, 91, 106, 91, 68, 9, 2, 207, 30, 23, 106, 91, 106, 91, 106, 237, 208, - 9, 2, 207, 30, 237, 208, 9, 2, 207, 30, 213, 24, 9, 2, 207, 30, 213, 25, - 23, 249, 15, 9, 2, 207, 25, 9, 2, 207, 6, 9, 2, 207, 7, 23, 228, 94, 9, - 2, 207, 7, 23, 225, 21, 91, 244, 212, 9, 2, 207, 7, 23, 213, 88, 9, 2, - 207, 7, 23, 68, 9, 2, 207, 5, 9, 2, 207, 1, 9, 2, 207, 2, 23, 229, 231, - 9, 2, 207, 2, 23, 185, 9, 2, 206, 255, 9, 2, 207, 0, 237, 208, 9, 2, 206, - 210, 9, 2, 206, 211, 245, 124, 206, 210, 9, 2, 206, 211, 213, 24, 9, 2, - 206, 208, 9, 2, 206, 209, 23, 34, 91, 152, 9, 2, 206, 209, 23, 34, 91, - 201, 201, 9, 2, 206, 209, 23, 251, 39, 9, 2, 206, 209, 23, 152, 9, 2, - 206, 209, 23, 221, 40, 9, 2, 206, 209, 23, 207, 40, 9, 2, 206, 209, 23, - 207, 41, 91, 250, 75, 9, 2, 206, 209, 23, 207, 41, 91, 248, 86, 9, 2, - 206, 207, 9, 2, 206, 204, 9, 2, 206, 203, 9, 2, 206, 199, 9, 2, 206, 200, - 23, 63, 9, 2, 206, 200, 23, 250, 69, 9, 2, 206, 200, 23, 142, 9, 2, 206, - 200, 23, 242, 31, 9, 2, 206, 200, 23, 239, 8, 9, 2, 206, 200, 23, 238, - 246, 9, 2, 206, 200, 23, 238, 233, 209, 141, 9, 2, 206, 200, 23, 238, - 224, 9, 2, 206, 200, 23, 237, 230, 9, 2, 206, 200, 23, 152, 9, 2, 206, - 200, 23, 231, 85, 9, 2, 206, 200, 23, 231, 66, 9, 2, 206, 200, 23, 230, - 209, 9, 2, 206, 200, 23, 229, 100, 9, 2, 206, 200, 23, 226, 222, 9, 2, - 206, 200, 23, 224, 110, 9, 2, 206, 200, 23, 185, 9, 2, 206, 200, 23, 213, - 43, 9, 2, 206, 200, 23, 212, 147, 9, 2, 206, 200, 23, 207, 203, 9, 2, - 206, 200, 23, 106, 91, 237, 219, 9, 2, 206, 200, 23, 207, 29, 9, 2, 206, - 200, 23, 206, 197, 9, 2, 206, 197, 9, 2, 206, 198, 23, 68, 9, 2, 206, - 186, 9, 2, 206, 187, 23, 63, 9, 2, 206, 187, 23, 228, 209, 9, 2, 206, - 187, 23, 228, 183, 9, 2, 206, 187, 23, 209, 242, 9, 2, 206, 182, 9, 2, - 206, 185, 9, 2, 206, 183, 9, 2, 206, 179, 9, 2, 206, 167, 9, 2, 206, 168, - 23, 229, 231, 9, 2, 206, 166, 9, 2, 202, 116, 9, 2, 202, 117, 209, 141, - 9, 2, 202, 117, 103, 23, 228, 183, 9, 2, 202, 112, 9, 2, 202, 105, 9, 2, - 202, 91, 9, 2, 202, 39, 9, 2, 202, 40, 115, 202, 39, 9, 2, 202, 38, 9, 2, - 202, 36, 9, 2, 202, 37, 230, 31, 209, 141, 9, 2, 202, 31, 9, 2, 202, 22, - 9, 2, 202, 6, 9, 2, 202, 4, 9, 2, 202, 5, 23, 63, 9, 2, 202, 3, 9, 2, - 202, 2, 9, 2, 229, 254, 241, 119, 9, 2, 251, 233, 23, 221, 40, 9, 2, 251, - 150, 23, 63, 9, 2, 250, 244, 23, 228, 198, 9, 2, 244, 204, 229, 69, 23, - 207, 41, 91, 225, 79, 9, 2, 244, 202, 9, 2, 243, 157, 91, 212, 199, 9, 2, - 242, 41, 23, 213, 43, 9, 2, 240, 180, 23, 237, 219, 9, 2, 240, 180, 23, - 213, 43, 9, 2, 239, 7, 23, 250, 232, 91, 230, 13, 91, 63, 9, 2, 239, 7, - 23, 250, 73, 9, 2, 238, 189, 9, 2, 238, 71, 9, 2, 236, 3, 9, 2, 230, 44, - 23, 250, 200, 9, 2, 230, 44, 23, 250, 72, 9, 2, 230, 44, 23, 238, 55, 9, - 2, 230, 44, 23, 237, 219, 9, 2, 230, 44, 23, 237, 4, 23, 250, 73, 9, 2, - 230, 44, 23, 226, 222, 9, 2, 230, 44, 23, 185, 9, 2, 230, 44, 23, 212, - 192, 9, 2, 230, 44, 23, 207, 203, 9, 2, 230, 44, 23, 206, 208, 9, 2, 228, - 95, 23, 238, 81, 9, 2, 226, 238, 213, 25, 23, 249, 15, 9, 2, 226, 238, - 23, 241, 5, 91, 228, 30, 9, 2, 226, 238, 23, 212, 199, 9, 2, 224, 227, 9, - 2, 223, 198, 23, 202, 116, 9, 2, 223, 108, 9, 2, 222, 68, 9, 2, 222, 67, - 9, 2, 222, 66, 23, 248, 253, 9, 2, 222, 66, 23, 238, 81, 9, 2, 221, 57, - 215, 198, 222, 59, 244, 54, 9, 2, 218, 223, 250, 59, 9, 2, 218, 113, 9, - 2, 215, 23, 23, 231, 86, 237, 208, 9, 2, 209, 1, 9, 2, 207, 7, 23, 225, - 20, 9, 2, 106, 68, 9, 141, 2, 120, 250, 75, 9, 141, 2, 126, 250, 75, 9, - 141, 2, 239, 147, 250, 75, 9, 141, 2, 239, 233, 250, 75, 9, 141, 2, 212, - 88, 250, 75, 9, 141, 2, 213, 112, 250, 75, 9, 141, 2, 241, 143, 250, 75, - 9, 141, 2, 222, 64, 250, 75, 9, 141, 2, 126, 243, 156, 9, 141, 2, 239, - 147, 243, 156, 9, 141, 2, 239, 233, 243, 156, 9, 141, 2, 212, 88, 243, - 156, 9, 141, 2, 213, 112, 243, 156, 9, 141, 2, 241, 143, 243, 156, 9, - 141, 2, 222, 64, 243, 156, 9, 141, 2, 239, 147, 68, 9, 141, 2, 239, 233, - 68, 9, 141, 2, 212, 88, 68, 9, 141, 2, 213, 112, 68, 9, 141, 2, 241, 143, - 68, 9, 141, 2, 222, 64, 68, 9, 141, 2, 118, 238, 164, 9, 141, 2, 120, - 238, 164, 9, 141, 2, 126, 238, 164, 9, 141, 2, 239, 147, 238, 164, 9, - 141, 2, 239, 233, 238, 164, 9, 141, 2, 212, 88, 238, 164, 9, 141, 2, 213, - 112, 238, 164, 9, 141, 2, 241, 143, 238, 164, 9, 141, 2, 222, 64, 238, - 164, 9, 141, 2, 118, 238, 161, 9, 141, 2, 120, 238, 161, 9, 141, 2, 126, - 238, 161, 9, 141, 2, 239, 147, 238, 161, 9, 141, 2, 239, 233, 238, 161, - 9, 141, 2, 120, 213, 59, 9, 141, 2, 126, 213, 59, 9, 141, 2, 126, 213, - 60, 206, 69, 18, 9, 141, 2, 239, 147, 213, 59, 9, 141, 2, 239, 233, 213, - 59, 9, 141, 2, 212, 88, 213, 59, 9, 141, 2, 213, 112, 213, 59, 9, 141, 2, - 241, 143, 213, 59, 9, 141, 2, 222, 64, 213, 59, 9, 141, 2, 118, 213, 54, - 9, 141, 2, 120, 213, 54, 9, 141, 2, 126, 213, 54, 9, 141, 2, 126, 213, - 55, 206, 69, 18, 9, 141, 2, 239, 147, 213, 54, 9, 141, 2, 239, 233, 213, - 54, 9, 141, 2, 213, 60, 23, 238, 247, 91, 243, 156, 9, 141, 2, 213, 60, - 23, 238, 247, 91, 224, 110, 9, 141, 2, 118, 247, 156, 9, 141, 2, 120, - 247, 156, 9, 141, 2, 126, 247, 156, 9, 141, 2, 126, 247, 157, 206, 69, - 18, 9, 141, 2, 239, 147, 247, 156, 9, 141, 2, 239, 233, 247, 156, 9, 141, - 2, 126, 206, 69, 239, 159, 241, 6, 9, 141, 2, 126, 206, 69, 239, 159, - 241, 3, 9, 141, 2, 239, 147, 206, 69, 239, 159, 227, 118, 9, 141, 2, 239, - 147, 206, 69, 239, 159, 227, 116, 9, 141, 2, 239, 147, 206, 69, 239, 159, - 227, 119, 63, 9, 141, 2, 239, 147, 206, 69, 239, 159, 227, 119, 249, 255, - 9, 141, 2, 212, 88, 206, 69, 239, 159, 250, 71, 9, 141, 2, 213, 112, 206, - 69, 239, 159, 231, 58, 9, 141, 2, 213, 112, 206, 69, 239, 159, 231, 60, - 63, 9, 141, 2, 213, 112, 206, 69, 239, 159, 231, 60, 249, 255, 9, 141, 2, - 241, 143, 206, 69, 239, 159, 206, 181, 9, 141, 2, 241, 143, 206, 69, 239, - 159, 206, 180, 9, 141, 2, 222, 64, 206, 69, 239, 159, 231, 74, 9, 141, 2, - 222, 64, 206, 69, 239, 159, 231, 73, 9, 141, 2, 222, 64, 206, 69, 239, - 159, 231, 72, 9, 141, 2, 222, 64, 206, 69, 239, 159, 231, 75, 63, 9, 141, - 2, 120, 250, 76, 209, 141, 9, 141, 2, 126, 250, 76, 209, 141, 9, 141, 2, - 239, 147, 250, 76, 209, 141, 9, 141, 2, 239, 233, 250, 76, 209, 141, 9, - 141, 2, 212, 88, 250, 76, 209, 141, 9, 141, 2, 118, 248, 240, 9, 141, 2, - 120, 248, 240, 9, 141, 2, 126, 248, 240, 9, 141, 2, 239, 147, 248, 240, - 9, 141, 2, 239, 147, 248, 241, 206, 69, 18, 9, 141, 2, 239, 233, 248, - 240, 9, 141, 2, 239, 233, 248, 241, 206, 69, 18, 9, 141, 2, 222, 77, 9, - 141, 2, 222, 78, 9, 141, 2, 118, 241, 2, 9, 141, 2, 120, 241, 2, 9, 141, - 2, 118, 209, 61, 243, 156, 9, 141, 2, 120, 209, 58, 243, 156, 9, 141, 2, - 239, 233, 212, 77, 243, 156, 9, 141, 2, 118, 209, 61, 206, 69, 239, 159, - 63, 9, 141, 2, 120, 209, 58, 206, 69, 239, 159, 63, 9, 141, 2, 118, 241, - 139, 250, 75, 9, 141, 2, 118, 217, 56, 250, 75, 9, 141, 2, 38, 250, 62, - 118, 212, 78, 9, 141, 2, 38, 250, 62, 118, 217, 55, 9, 141, 2, 118, 217, - 56, 237, 202, 9, 141, 2, 118, 162, 237, 202, 9, 141, 2, 241, 120, 118, - 209, 60, 9, 141, 2, 241, 120, 120, 209, 57, 9, 141, 2, 241, 120, 239, - 153, 9, 141, 2, 241, 120, 240, 18, 9, 141, 2, 239, 147, 106, 206, 69, 18, - 9, 141, 2, 239, 233, 106, 206, 69, 18, 9, 141, 2, 212, 88, 106, 206, 69, - 18, 9, 141, 2, 213, 112, 106, 206, 69, 18, 9, 141, 2, 241, 143, 106, 206, - 69, 18, 9, 141, 2, 222, 64, 106, 206, 69, 18, 9, 217, 179, 2, 38, 250, - 62, 203, 238, 243, 141, 9, 217, 179, 2, 80, 245, 242, 9, 217, 179, 2, - 243, 228, 245, 242, 9, 217, 179, 2, 243, 228, 208, 81, 9, 217, 179, 2, - 243, 228, 217, 61, 9, 2, 251, 233, 23, 221, 41, 209, 141, 9, 2, 251, 233, - 23, 212, 197, 9, 2, 251, 123, 23, 241, 4, 9, 2, 249, 16, 23, 243, 157, - 209, 141, 9, 2, 249, 4, 23, 251, 149, 9, 2, 249, 4, 23, 222, 100, 9, 2, - 249, 4, 23, 202, 116, 9, 2, 247, 194, 115, 247, 194, 23, 223, 109, 9, 2, - 244, 213, 23, 209, 242, 9, 2, 244, 204, 23, 228, 183, 9, 2, 243, 189, 23, - 231, 85, 9, 2, 243, 189, 23, 106, 106, 68, 9, 2, 243, 187, 23, 207, 29, - 9, 2, 242, 38, 23, 250, 200, 9, 2, 242, 38, 23, 250, 75, 9, 2, 242, 38, - 23, 250, 76, 250, 50, 227, 222, 9, 2, 242, 38, 23, 243, 176, 9, 2, 242, - 38, 23, 242, 31, 9, 2, 242, 38, 23, 241, 22, 9, 2, 242, 38, 23, 239, 8, - 9, 2, 242, 38, 23, 238, 81, 9, 2, 242, 38, 23, 238, 64, 237, 208, 9, 2, - 242, 38, 23, 238, 55, 9, 2, 242, 38, 23, 152, 9, 2, 242, 38, 23, 237, 3, - 9, 2, 242, 38, 23, 231, 86, 237, 208, 9, 2, 242, 38, 23, 229, 231, 9, 2, - 242, 38, 23, 228, 183, 9, 2, 242, 38, 23, 228, 177, 9, 2, 242, 38, 23, - 228, 178, 91, 229, 231, 9, 2, 242, 38, 23, 228, 82, 9, 2, 242, 38, 23, - 228, 28, 9, 2, 242, 38, 23, 228, 29, 23, 228, 183, 9, 2, 242, 38, 23, - 226, 228, 91, 238, 55, 9, 2, 242, 38, 23, 225, 79, 9, 2, 242, 38, 23, - 224, 228, 9, 2, 242, 38, 23, 224, 155, 9, 2, 242, 38, 23, 222, 100, 9, 2, - 242, 38, 23, 218, 167, 9, 2, 242, 38, 23, 213, 43, 9, 2, 242, 38, 23, - 212, 163, 237, 208, 9, 2, 241, 191, 23, 228, 183, 9, 2, 241, 191, 23, - 219, 96, 9, 2, 241, 23, 203, 196, 9, 2, 241, 5, 245, 124, 241, 4, 9, 2, - 240, 180, 213, 25, 23, 250, 75, 9, 2, 240, 180, 213, 25, 23, 237, 3, 9, - 2, 240, 180, 213, 25, 23, 231, 86, 237, 208, 9, 2, 240, 180, 213, 25, 23, - 228, 113, 9, 2, 240, 180, 213, 25, 23, 228, 30, 9, 2, 240, 180, 213, 25, - 23, 225, 20, 9, 2, 240, 180, 213, 25, 23, 224, 228, 9, 2, 240, 180, 213, - 25, 23, 211, 10, 9, 2, 240, 180, 23, 211, 10, 9, 2, 239, 7, 23, 249, 3, - 9, 2, 239, 7, 23, 243, 189, 237, 208, 9, 2, 239, 7, 23, 242, 38, 23, 231, - 86, 237, 208, 9, 2, 239, 7, 23, 242, 38, 23, 229, 231, 9, 2, 239, 7, 23, - 241, 25, 9, 2, 239, 7, 23, 239, 8, 9, 2, 239, 7, 23, 238, 225, 91, 243, - 233, 9, 2, 239, 7, 23, 238, 225, 91, 222, 240, 9, 2, 239, 7, 23, 237, - 160, 91, 63, 9, 2, 239, 7, 23, 228, 178, 91, 229, 231, 9, 2, 239, 7, 23, - 228, 28, 9, 2, 239, 7, 23, 228, 29, 23, 228, 183, 9, 2, 239, 7, 23, 226, - 227, 9, 2, 239, 7, 23, 223, 199, 9, 2, 239, 7, 23, 222, 240, 9, 2, 239, - 7, 23, 222, 241, 91, 241, 190, 9, 2, 239, 7, 23, 222, 241, 91, 238, 81, - 9, 2, 239, 7, 23, 213, 3, 9, 2, 239, 7, 23, 202, 22, 9, 2, 239, 2, 215, - 198, 222, 59, 244, 54, 9, 2, 238, 163, 23, 68, 9, 2, 238, 56, 23, 238, - 56, 245, 124, 238, 55, 9, 2, 237, 229, 23, 231, 86, 237, 208, 9, 2, 237, - 220, 91, 238, 56, 23, 209, 242, 9, 2, 237, 160, 209, 142, 237, 208, 9, 2, - 237, 4, 23, 250, 76, 115, 237, 4, 23, 250, 75, 9, 2, 230, 44, 23, 247, - 193, 9, 2, 230, 44, 23, 173, 9, 2, 230, 44, 23, 106, 106, 68, 9, 2, 230, - 44, 23, 206, 210, 9, 2, 228, 95, 23, 202, 7, 115, 202, 6, 9, 2, 228, 83, - 9, 2, 228, 81, 9, 2, 228, 80, 9, 2, 228, 79, 9, 2, 228, 78, 9, 2, 228, - 77, 9, 2, 228, 76, 9, 2, 228, 75, 115, 228, 75, 237, 208, 9, 2, 228, 74, - 9, 2, 228, 73, 115, 228, 72, 9, 2, 228, 71, 9, 2, 228, 70, 9, 2, 228, 69, - 9, 2, 228, 68, 9, 2, 228, 67, 9, 2, 228, 66, 9, 2, 228, 65, 9, 2, 228, - 64, 9, 2, 228, 63, 9, 2, 228, 62, 9, 2, 228, 61, 9, 2, 228, 60, 9, 2, - 228, 59, 9, 2, 228, 58, 9, 2, 228, 57, 9, 2, 228, 56, 9, 2, 228, 55, 9, - 2, 228, 54, 9, 2, 228, 52, 9, 2, 228, 53, 23, 237, 230, 9, 2, 228, 53, - 23, 231, 85, 9, 2, 228, 53, 23, 219, 97, 91, 226, 236, 9, 2, 228, 53, 23, - 219, 97, 91, 219, 97, 91, 226, 236, 9, 2, 228, 53, 23, 207, 41, 91, 249, - 32, 9, 2, 228, 51, 9, 2, 228, 50, 9, 2, 228, 49, 9, 2, 228, 48, 9, 2, - 228, 47, 9, 2, 228, 46, 9, 2, 228, 45, 9, 2, 228, 44, 9, 2, 228, 43, 9, - 2, 228, 42, 9, 2, 228, 40, 9, 2, 228, 41, 23, 250, 75, 9, 2, 228, 41, 23, - 249, 15, 9, 2, 228, 41, 23, 242, 30, 237, 209, 237, 208, 9, 2, 228, 41, - 23, 228, 207, 9, 2, 228, 41, 23, 228, 113, 9, 2, 228, 41, 23, 209, 218, - 9, 2, 228, 41, 23, 209, 187, 9, 2, 228, 41, 23, 207, 40, 9, 2, 228, 41, - 23, 207, 29, 9, 2, 228, 41, 23, 206, 197, 9, 2, 228, 39, 9, 2, 228, 37, - 9, 2, 228, 38, 23, 242, 40, 9, 2, 228, 38, 23, 239, 8, 9, 2, 228, 38, 23, - 231, 85, 9, 2, 228, 38, 23, 231, 86, 237, 208, 9, 2, 228, 38, 23, 222, - 100, 9, 2, 228, 38, 23, 219, 97, 91, 219, 97, 91, 226, 236, 9, 2, 228, - 38, 23, 213, 28, 91, 229, 100, 9, 2, 228, 38, 23, 207, 29, 9, 2, 228, 38, - 23, 206, 197, 9, 2, 228, 35, 9, 2, 228, 34, 9, 2, 226, 238, 237, 209, 23, - 250, 75, 9, 2, 226, 238, 23, 243, 156, 9, 2, 226, 238, 23, 237, 140, 9, - 2, 226, 238, 23, 219, 96, 9, 2, 226, 238, 23, 219, 97, 91, 219, 97, 91, - 226, 236, 9, 2, 226, 238, 23, 209, 242, 9, 2, 224, 156, 91, 202, 115, 9, - 2, 223, 200, 115, 223, 200, 23, 239, 8, 9, 2, 223, 200, 115, 223, 200, - 23, 230, 12, 9, 2, 222, 66, 23, 243, 189, 237, 208, 9, 2, 222, 66, 23, - 238, 55, 9, 2, 222, 66, 23, 237, 212, 9, 2, 222, 66, 23, 237, 3, 9, 2, - 222, 66, 23, 229, 171, 9, 2, 222, 66, 23, 228, 78, 9, 2, 222, 66, 23, - 225, 79, 9, 2, 222, 66, 23, 219, 97, 91, 219, 96, 9, 2, 222, 66, 23, 68, - 9, 2, 222, 66, 23, 106, 91, 68, 9, 2, 222, 66, 23, 206, 197, 9, 2, 215, - 23, 237, 209, 23, 152, 9, 2, 215, 23, 23, 241, 92, 9, 2, 215, 23, 23, - 213, 44, 250, 50, 227, 222, 9, 2, 215, 23, 23, 209, 242, 9, 2, 213, 87, - 209, 141, 9, 2, 213, 44, 115, 213, 43, 9, 2, 213, 44, 91, 236, 21, 9, 2, - 213, 44, 91, 223, 86, 9, 2, 213, 44, 91, 214, 230, 9, 2, 212, 198, 91, - 242, 38, 23, 222, 100, 9, 2, 212, 198, 91, 241, 191, 23, 250, 231, 9, 2, - 212, 163, 23, 209, 242, 9, 2, 209, 243, 91, 215, 22, 9, 2, 207, 192, 23, - 238, 233, 209, 141, 9, 2, 207, 192, 23, 126, 243, 156, 9, 2, 206, 209, - 230, 238, 9, 2, 206, 209, 23, 207, 29, 9, 2, 206, 200, 23, 244, 153, 9, - 2, 206, 200, 23, 228, 36, 9, 2, 206, 200, 23, 226, 236, 9, 2, 202, 115, - 9, 2, 202, 7, 115, 202, 7, 91, 214, 230, 9, 2, 202, 5, 23, 126, 243, 157, - 209, 141, 14, 7, 255, 18, 14, 7, 255, 17, 14, 7, 255, 16, 14, 7, 255, 15, - 14, 7, 255, 14, 14, 7, 255, 13, 14, 7, 255, 12, 14, 7, 255, 11, 14, 7, - 255, 10, 14, 7, 255, 9, 14, 7, 255, 8, 14, 7, 255, 7, 14, 7, 255, 6, 14, - 7, 255, 4, 14, 7, 255, 3, 14, 7, 255, 2, 14, 7, 255, 1, 14, 7, 255, 0, - 14, 7, 254, 255, 14, 7, 254, 254, 14, 7, 254, 253, 14, 7, 254, 252, 14, - 7, 254, 251, 14, 7, 254, 250, 14, 7, 254, 249, 14, 7, 254, 248, 14, 7, - 254, 247, 14, 7, 254, 246, 14, 7, 254, 245, 14, 7, 254, 244, 14, 7, 254, - 243, 14, 7, 254, 241, 14, 7, 254, 240, 14, 7, 254, 238, 14, 7, 254, 237, - 14, 7, 254, 236, 14, 7, 254, 235, 14, 7, 254, 234, 14, 7, 254, 233, 14, - 7, 254, 232, 14, 7, 254, 231, 14, 7, 254, 230, 14, 7, 254, 229, 14, 7, - 254, 228, 14, 7, 254, 227, 14, 7, 254, 225, 14, 7, 254, 224, 14, 7, 254, - 223, 14, 7, 254, 221, 14, 7, 254, 220, 14, 7, 254, 219, 14, 7, 254, 218, - 14, 7, 254, 217, 14, 7, 254, 216, 14, 7, 254, 215, 14, 7, 254, 214, 14, - 7, 254, 211, 14, 7, 254, 210, 14, 7, 254, 209, 14, 7, 254, 208, 14, 7, - 254, 207, 14, 7, 254, 206, 14, 7, 254, 205, 14, 7, 254, 204, 14, 7, 254, - 203, 14, 7, 254, 202, 14, 7, 254, 201, 14, 7, 254, 200, 14, 7, 254, 199, - 14, 7, 254, 198, 14, 7, 254, 197, 14, 7, 254, 196, 14, 7, 254, 195, 14, - 7, 254, 194, 14, 7, 254, 193, 14, 7, 254, 192, 14, 7, 254, 188, 14, 7, - 254, 187, 14, 7, 254, 186, 14, 7, 254, 185, 14, 7, 249, 253, 14, 7, 249, - 251, 14, 7, 249, 249, 14, 7, 249, 247, 14, 7, 249, 245, 14, 7, 249, 244, - 14, 7, 249, 242, 14, 7, 249, 240, 14, 7, 249, 238, 14, 7, 249, 236, 14, - 7, 247, 121, 14, 7, 247, 120, 14, 7, 247, 119, 14, 7, 247, 118, 14, 7, - 247, 117, 14, 7, 247, 116, 14, 7, 247, 115, 14, 7, 247, 114, 14, 7, 247, - 113, 14, 7, 247, 112, 14, 7, 247, 111, 14, 7, 247, 110, 14, 7, 247, 109, - 14, 7, 247, 108, 14, 7, 247, 107, 14, 7, 247, 106, 14, 7, 247, 105, 14, - 7, 247, 104, 14, 7, 247, 103, 14, 7, 247, 102, 14, 7, 247, 101, 14, 7, - 247, 100, 14, 7, 247, 99, 14, 7, 247, 98, 14, 7, 247, 97, 14, 7, 247, 96, - 14, 7, 247, 95, 14, 7, 247, 94, 14, 7, 245, 50, 14, 7, 245, 49, 14, 7, - 245, 48, 14, 7, 245, 47, 14, 7, 245, 46, 14, 7, 245, 45, 14, 7, 245, 44, - 14, 7, 245, 43, 14, 7, 245, 42, 14, 7, 245, 41, 14, 7, 245, 40, 14, 7, - 245, 39, 14, 7, 245, 38, 14, 7, 245, 37, 14, 7, 245, 36, 14, 7, 245, 35, - 14, 7, 245, 34, 14, 7, 245, 33, 14, 7, 245, 32, 14, 7, 245, 31, 14, 7, - 245, 30, 14, 7, 245, 29, 14, 7, 245, 28, 14, 7, 245, 27, 14, 7, 245, 26, - 14, 7, 245, 25, 14, 7, 245, 24, 14, 7, 245, 23, 14, 7, 245, 22, 14, 7, - 245, 21, 14, 7, 245, 20, 14, 7, 245, 19, 14, 7, 245, 18, 14, 7, 245, 17, - 14, 7, 245, 16, 14, 7, 245, 15, 14, 7, 245, 14, 14, 7, 245, 13, 14, 7, - 245, 12, 14, 7, 245, 11, 14, 7, 245, 10, 14, 7, 245, 9, 14, 7, 245, 8, - 14, 7, 245, 7, 14, 7, 245, 6, 14, 7, 245, 5, 14, 7, 245, 4, 14, 7, 245, - 3, 14, 7, 245, 2, 14, 7, 245, 1, 14, 7, 245, 0, 14, 7, 244, 255, 14, 7, - 244, 254, 14, 7, 244, 253, 14, 7, 244, 252, 14, 7, 244, 251, 14, 7, 244, - 250, 14, 7, 244, 249, 14, 7, 244, 248, 14, 7, 244, 247, 14, 7, 244, 246, - 14, 7, 244, 245, 14, 7, 244, 244, 14, 7, 244, 243, 14, 7, 244, 242, 14, - 7, 244, 241, 14, 7, 244, 240, 14, 7, 244, 239, 14, 7, 244, 238, 14, 7, - 244, 237, 14, 7, 244, 236, 14, 7, 244, 235, 14, 7, 244, 234, 14, 7, 244, - 233, 14, 7, 244, 232, 14, 7, 244, 231, 14, 7, 244, 230, 14, 7, 244, 229, - 14, 7, 244, 228, 14, 7, 244, 227, 14, 7, 244, 226, 14, 7, 244, 225, 14, - 7, 244, 224, 14, 7, 244, 223, 14, 7, 244, 222, 14, 7, 244, 221, 14, 7, - 244, 220, 14, 7, 244, 219, 14, 7, 244, 218, 14, 7, 244, 217, 14, 7, 244, - 216, 14, 7, 244, 215, 14, 7, 241, 235, 14, 7, 241, 234, 14, 7, 241, 233, - 14, 7, 241, 232, 14, 7, 241, 231, 14, 7, 241, 230, 14, 7, 241, 229, 14, - 7, 241, 228, 14, 7, 241, 227, 14, 7, 241, 226, 14, 7, 241, 225, 14, 7, - 241, 224, 14, 7, 241, 223, 14, 7, 241, 222, 14, 7, 241, 221, 14, 7, 241, - 220, 14, 7, 241, 219, 14, 7, 241, 218, 14, 7, 241, 217, 14, 7, 241, 216, - 14, 7, 241, 215, 14, 7, 241, 214, 14, 7, 241, 213, 14, 7, 241, 212, 14, - 7, 241, 211, 14, 7, 241, 210, 14, 7, 241, 209, 14, 7, 241, 208, 14, 7, - 241, 207, 14, 7, 241, 206, 14, 7, 241, 205, 14, 7, 241, 204, 14, 7, 241, - 203, 14, 7, 241, 202, 14, 7, 241, 201, 14, 7, 241, 200, 14, 7, 241, 199, - 14, 7, 241, 198, 14, 7, 241, 197, 14, 7, 241, 196, 14, 7, 241, 195, 14, - 7, 241, 194, 14, 7, 241, 193, 14, 7, 241, 192, 14, 7, 240, 173, 14, 7, - 240, 172, 14, 7, 240, 171, 14, 7, 240, 170, 14, 7, 240, 169, 14, 7, 240, - 168, 14, 7, 240, 167, 14, 7, 240, 166, 14, 7, 240, 165, 14, 7, 240, 164, - 14, 7, 240, 163, 14, 7, 240, 162, 14, 7, 240, 161, 14, 7, 240, 160, 14, - 7, 240, 159, 14, 7, 240, 158, 14, 7, 240, 157, 14, 7, 240, 156, 14, 7, - 240, 155, 14, 7, 240, 154, 14, 7, 240, 153, 14, 7, 240, 152, 14, 7, 240, - 151, 14, 7, 240, 150, 14, 7, 240, 149, 14, 7, 240, 148, 14, 7, 240, 147, - 14, 7, 240, 146, 14, 7, 240, 145, 14, 7, 240, 144, 14, 7, 240, 143, 14, - 7, 240, 142, 14, 7, 240, 141, 14, 7, 240, 140, 14, 7, 240, 139, 14, 7, - 240, 138, 14, 7, 240, 137, 14, 7, 240, 136, 14, 7, 240, 135, 14, 7, 240, - 134, 14, 7, 240, 133, 14, 7, 240, 132, 14, 7, 240, 131, 14, 7, 240, 130, - 14, 7, 240, 129, 14, 7, 240, 128, 14, 7, 240, 127, 14, 7, 240, 126, 14, - 7, 240, 125, 14, 7, 240, 124, 14, 7, 240, 123, 14, 7, 240, 122, 14, 7, - 240, 121, 14, 7, 240, 120, 14, 7, 240, 119, 14, 7, 240, 118, 14, 7, 240, - 117, 14, 7, 240, 116, 14, 7, 240, 115, 14, 7, 240, 114, 14, 7, 240, 113, - 14, 7, 240, 112, 14, 7, 240, 111, 14, 7, 240, 110, 14, 7, 240, 109, 14, - 7, 239, 74, 14, 7, 239, 73, 14, 7, 239, 72, 14, 7, 239, 71, 14, 7, 239, - 70, 14, 7, 239, 69, 14, 7, 239, 68, 14, 7, 239, 67, 14, 7, 239, 66, 14, - 7, 239, 65, 14, 7, 239, 64, 14, 7, 239, 63, 14, 7, 239, 62, 14, 7, 239, - 61, 14, 7, 239, 60, 14, 7, 239, 59, 14, 7, 239, 58, 14, 7, 239, 57, 14, - 7, 239, 56, 14, 7, 239, 55, 14, 7, 239, 54, 14, 7, 239, 53, 14, 7, 239, - 52, 14, 7, 239, 51, 14, 7, 239, 50, 14, 7, 239, 49, 14, 7, 239, 48, 14, - 7, 239, 47, 14, 7, 239, 46, 14, 7, 239, 45, 14, 7, 239, 44, 14, 7, 239, - 43, 14, 7, 239, 42, 14, 7, 239, 41, 14, 7, 239, 40, 14, 7, 239, 39, 14, - 7, 239, 38, 14, 7, 239, 37, 14, 7, 239, 36, 14, 7, 239, 35, 14, 7, 239, - 34, 14, 7, 239, 33, 14, 7, 239, 32, 14, 7, 239, 31, 14, 7, 239, 30, 14, - 7, 239, 29, 14, 7, 239, 28, 14, 7, 239, 27, 14, 7, 239, 26, 14, 7, 239, - 25, 14, 7, 239, 24, 14, 7, 239, 23, 14, 7, 239, 22, 14, 7, 239, 21, 14, - 7, 239, 20, 14, 7, 239, 19, 14, 7, 239, 18, 14, 7, 239, 17, 14, 7, 239, - 16, 14, 7, 239, 15, 14, 7, 239, 14, 14, 7, 239, 13, 14, 7, 239, 12, 14, - 7, 239, 11, 14, 7, 237, 169, 14, 7, 237, 168, 14, 7, 237, 167, 14, 7, - 237, 166, 14, 7, 237, 165, 14, 7, 237, 164, 14, 7, 237, 163, 14, 7, 237, - 162, 14, 7, 237, 161, 14, 7, 235, 190, 14, 7, 235, 189, 14, 7, 235, 188, - 14, 7, 235, 187, 14, 7, 235, 186, 14, 7, 235, 185, 14, 7, 235, 184, 14, - 7, 235, 183, 14, 7, 235, 182, 14, 7, 235, 181, 14, 7, 235, 180, 14, 7, - 235, 179, 14, 7, 235, 178, 14, 7, 235, 177, 14, 7, 235, 176, 14, 7, 235, - 175, 14, 7, 235, 174, 14, 7, 235, 173, 14, 7, 235, 172, 14, 7, 230, 53, - 14, 7, 230, 52, 14, 7, 230, 51, 14, 7, 230, 50, 14, 7, 230, 49, 14, 7, - 230, 48, 14, 7, 230, 47, 14, 7, 230, 46, 14, 7, 228, 128, 14, 7, 228, - 127, 14, 7, 228, 126, 14, 7, 228, 125, 14, 7, 228, 124, 14, 7, 228, 123, - 14, 7, 228, 122, 14, 7, 228, 121, 14, 7, 228, 120, 14, 7, 228, 119, 14, - 7, 226, 183, 14, 7, 226, 182, 14, 7, 226, 181, 14, 7, 226, 179, 14, 7, - 226, 177, 14, 7, 226, 176, 14, 7, 226, 174, 14, 7, 226, 172, 14, 7, 226, - 170, 14, 7, 226, 168, 14, 7, 226, 166, 14, 7, 226, 164, 14, 7, 226, 162, - 14, 7, 226, 161, 14, 7, 226, 159, 14, 7, 226, 157, 14, 7, 226, 156, 14, - 7, 226, 155, 14, 7, 226, 154, 14, 7, 226, 153, 14, 7, 226, 152, 14, 7, - 226, 151, 14, 7, 226, 150, 14, 7, 226, 149, 14, 7, 226, 147, 14, 7, 226, - 145, 14, 7, 226, 143, 14, 7, 226, 142, 14, 7, 226, 140, 14, 7, 226, 139, - 14, 7, 226, 137, 14, 7, 226, 136, 14, 7, 226, 134, 14, 7, 226, 132, 14, - 7, 226, 130, 14, 7, 226, 128, 14, 7, 226, 126, 14, 7, 226, 125, 14, 7, - 226, 123, 14, 7, 226, 121, 14, 7, 226, 120, 14, 7, 226, 118, 14, 7, 226, - 116, 14, 7, 226, 114, 14, 7, 226, 112, 14, 7, 226, 111, 14, 7, 226, 109, - 14, 7, 226, 107, 14, 7, 226, 105, 14, 7, 226, 104, 14, 7, 226, 102, 14, - 7, 226, 100, 14, 7, 226, 99, 14, 7, 226, 98, 14, 7, 226, 96, 14, 7, 226, - 94, 14, 7, 226, 92, 14, 7, 226, 90, 14, 7, 226, 88, 14, 7, 226, 86, 14, - 7, 226, 84, 14, 7, 226, 83, 14, 7, 226, 81, 14, 7, 226, 79, 14, 7, 226, - 77, 14, 7, 226, 75, 14, 7, 223, 160, 14, 7, 223, 159, 14, 7, 223, 158, - 14, 7, 223, 157, 14, 7, 223, 156, 14, 7, 223, 155, 14, 7, 223, 154, 14, - 7, 223, 153, 14, 7, 223, 152, 14, 7, 223, 151, 14, 7, 223, 150, 14, 7, - 223, 149, 14, 7, 223, 148, 14, 7, 223, 147, 14, 7, 223, 146, 14, 7, 223, - 145, 14, 7, 223, 144, 14, 7, 223, 143, 14, 7, 223, 142, 14, 7, 223, 141, - 14, 7, 223, 140, 14, 7, 223, 139, 14, 7, 223, 138, 14, 7, 223, 137, 14, - 7, 223, 136, 14, 7, 223, 135, 14, 7, 223, 134, 14, 7, 223, 133, 14, 7, - 223, 132, 14, 7, 223, 131, 14, 7, 223, 130, 14, 7, 223, 129, 14, 7, 223, - 128, 14, 7, 223, 127, 14, 7, 223, 126, 14, 7, 223, 125, 14, 7, 223, 124, - 14, 7, 223, 123, 14, 7, 223, 122, 14, 7, 223, 121, 14, 7, 223, 120, 14, - 7, 223, 119, 14, 7, 223, 118, 14, 7, 223, 117, 14, 7, 223, 116, 14, 7, - 223, 115, 14, 7, 223, 114, 14, 7, 223, 113, 14, 7, 223, 112, 14, 7, 221, - 252, 14, 7, 221, 251, 14, 7, 221, 250, 14, 7, 221, 249, 14, 7, 221, 248, - 14, 7, 221, 247, 14, 7, 221, 246, 14, 7, 221, 245, 14, 7, 221, 244, 14, - 7, 221, 243, 14, 7, 221, 242, 14, 7, 221, 241, 14, 7, 221, 240, 14, 7, - 221, 239, 14, 7, 221, 238, 14, 7, 221, 237, 14, 7, 221, 236, 14, 7, 221, - 235, 14, 7, 221, 234, 14, 7, 221, 233, 14, 7, 221, 232, 14, 7, 221, 231, - 14, 7, 221, 83, 14, 7, 221, 82, 14, 7, 221, 81, 14, 7, 221, 80, 14, 7, - 221, 79, 14, 7, 221, 78, 14, 7, 221, 77, 14, 7, 221, 76, 14, 7, 221, 75, - 14, 7, 221, 74, 14, 7, 221, 73, 14, 7, 221, 72, 14, 7, 221, 71, 14, 7, - 221, 70, 14, 7, 221, 69, 14, 7, 221, 68, 14, 7, 221, 67, 14, 7, 221, 66, - 14, 7, 221, 65, 14, 7, 221, 64, 14, 7, 221, 63, 14, 7, 221, 62, 14, 7, - 221, 61, 14, 7, 221, 60, 14, 7, 221, 59, 14, 7, 221, 58, 14, 7, 220, 173, - 14, 7, 220, 172, 14, 7, 220, 171, 14, 7, 220, 170, 14, 7, 220, 169, 14, - 7, 220, 168, 14, 7, 220, 167, 14, 7, 220, 166, 14, 7, 220, 165, 14, 7, - 220, 164, 14, 7, 220, 163, 14, 7, 220, 162, 14, 7, 220, 161, 14, 7, 220, - 160, 14, 7, 220, 159, 14, 7, 220, 158, 14, 7, 220, 157, 14, 7, 220, 156, - 14, 7, 220, 155, 14, 7, 220, 154, 14, 7, 220, 153, 14, 7, 220, 152, 14, - 7, 220, 151, 14, 7, 220, 150, 14, 7, 220, 149, 14, 7, 220, 148, 14, 7, - 220, 147, 14, 7, 220, 146, 14, 7, 220, 145, 14, 7, 220, 144, 14, 7, 220, - 143, 14, 7, 220, 142, 14, 7, 220, 141, 14, 7, 220, 140, 14, 7, 220, 139, - 14, 7, 220, 138, 14, 7, 220, 137, 14, 7, 220, 136, 14, 7, 220, 135, 14, - 7, 220, 134, 14, 7, 220, 133, 14, 7, 220, 132, 14, 7, 220, 131, 14, 7, - 220, 130, 14, 7, 220, 129, 14, 7, 220, 128, 14, 7, 220, 127, 14, 7, 220, - 126, 14, 7, 220, 125, 14, 7, 220, 124, 14, 7, 220, 123, 14, 7, 220, 122, - 14, 7, 220, 121, 14, 7, 220, 120, 14, 7, 220, 119, 14, 7, 220, 118, 14, - 7, 220, 117, 14, 7, 220, 116, 14, 7, 220, 115, 14, 7, 220, 114, 14, 7, - 220, 113, 14, 7, 220, 112, 14, 7, 220, 111, 14, 7, 220, 110, 14, 7, 220, - 109, 14, 7, 220, 108, 14, 7, 220, 107, 14, 7, 220, 106, 14, 7, 220, 105, - 14, 7, 220, 104, 14, 7, 220, 103, 14, 7, 220, 102, 14, 7, 220, 101, 14, - 7, 220, 100, 14, 7, 220, 99, 14, 7, 219, 183, 14, 7, 219, 182, 14, 7, - 219, 181, 14, 7, 219, 180, 14, 7, 219, 179, 14, 7, 219, 178, 14, 7, 219, - 177, 14, 7, 219, 176, 14, 7, 219, 175, 14, 7, 219, 174, 14, 7, 219, 173, - 14, 7, 219, 172, 14, 7, 219, 171, 14, 7, 217, 133, 14, 7, 217, 132, 14, - 7, 217, 131, 14, 7, 217, 130, 14, 7, 217, 129, 14, 7, 217, 128, 14, 7, - 217, 127, 14, 7, 216, 255, 14, 7, 216, 254, 14, 7, 216, 253, 14, 7, 216, - 252, 14, 7, 216, 251, 14, 7, 216, 250, 14, 7, 216, 249, 14, 7, 216, 248, - 14, 7, 216, 247, 14, 7, 216, 246, 14, 7, 216, 245, 14, 7, 216, 244, 14, - 7, 216, 243, 14, 7, 216, 242, 14, 7, 216, 241, 14, 7, 216, 240, 14, 7, - 216, 239, 14, 7, 216, 238, 14, 7, 216, 237, 14, 7, 216, 236, 14, 7, 216, - 235, 14, 7, 216, 234, 14, 7, 216, 233, 14, 7, 216, 232, 14, 7, 216, 231, - 14, 7, 216, 230, 14, 7, 216, 229, 14, 7, 216, 228, 14, 7, 216, 227, 14, - 7, 216, 226, 14, 7, 216, 225, 14, 7, 216, 224, 14, 7, 216, 223, 14, 7, - 216, 222, 14, 7, 215, 91, 14, 7, 215, 90, 14, 7, 215, 89, 14, 7, 215, 88, - 14, 7, 215, 87, 14, 7, 215, 86, 14, 7, 215, 85, 14, 7, 215, 84, 14, 7, - 215, 83, 14, 7, 215, 82, 14, 7, 215, 81, 14, 7, 215, 80, 14, 7, 215, 79, - 14, 7, 215, 78, 14, 7, 215, 77, 14, 7, 215, 76, 14, 7, 215, 75, 14, 7, - 215, 74, 14, 7, 215, 73, 14, 7, 215, 72, 14, 7, 215, 71, 14, 7, 215, 70, - 14, 7, 215, 69, 14, 7, 215, 68, 14, 7, 215, 67, 14, 7, 215, 66, 14, 7, - 215, 65, 14, 7, 215, 64, 14, 7, 215, 63, 14, 7, 215, 62, 14, 7, 215, 61, - 14, 7, 215, 60, 14, 7, 215, 59, 14, 7, 215, 58, 14, 7, 215, 57, 14, 7, - 215, 56, 14, 7, 215, 55, 14, 7, 215, 54, 14, 7, 215, 53, 14, 7, 215, 52, - 14, 7, 215, 51, 14, 7, 215, 50, 14, 7, 215, 49, 14, 7, 215, 48, 14, 7, - 215, 47, 14, 7, 215, 46, 14, 7, 215, 45, 14, 7, 215, 44, 14, 7, 215, 43, - 14, 7, 215, 42, 14, 7, 215, 41, 14, 7, 215, 40, 14, 7, 215, 39, 14, 7, - 215, 38, 14, 7, 210, 67, 14, 7, 210, 66, 14, 7, 210, 65, 14, 7, 210, 64, - 14, 7, 210, 63, 14, 7, 210, 62, 14, 7, 210, 61, 14, 7, 210, 60, 14, 7, - 210, 59, 14, 7, 210, 58, 14, 7, 210, 57, 14, 7, 210, 56, 14, 7, 210, 55, - 14, 7, 210, 54, 14, 7, 210, 53, 14, 7, 210, 52, 14, 7, 210, 51, 14, 7, - 210, 50, 14, 7, 210, 49, 14, 7, 210, 48, 14, 7, 210, 47, 14, 7, 210, 46, - 14, 7, 210, 45, 14, 7, 210, 44, 14, 7, 210, 43, 14, 7, 210, 42, 14, 7, - 210, 41, 14, 7, 210, 40, 14, 7, 210, 39, 14, 7, 210, 38, 14, 7, 210, 37, - 14, 7, 210, 36, 14, 7, 210, 35, 14, 7, 210, 34, 14, 7, 210, 33, 14, 7, - 210, 32, 14, 7, 210, 31, 14, 7, 210, 30, 14, 7, 210, 29, 14, 7, 210, 28, - 14, 7, 210, 27, 14, 7, 210, 26, 14, 7, 210, 25, 14, 7, 210, 24, 14, 7, - 207, 88, 14, 7, 207, 87, 14, 7, 207, 86, 14, 7, 207, 85, 14, 7, 207, 84, - 14, 7, 207, 83, 14, 7, 207, 82, 14, 7, 207, 81, 14, 7, 207, 80, 14, 7, - 207, 79, 14, 7, 207, 78, 14, 7, 207, 77, 14, 7, 207, 76, 14, 7, 207, 75, - 14, 7, 207, 74, 14, 7, 207, 73, 14, 7, 207, 72, 14, 7, 207, 71, 14, 7, - 207, 70, 14, 7, 207, 69, 14, 7, 207, 68, 14, 7, 207, 67, 14, 7, 207, 66, - 14, 7, 207, 65, 14, 7, 207, 64, 14, 7, 207, 63, 14, 7, 207, 62, 14, 7, - 207, 61, 14, 7, 207, 60, 14, 7, 207, 59, 14, 7, 207, 58, 14, 7, 207, 57, - 14, 7, 207, 56, 14, 7, 207, 55, 14, 7, 207, 54, 14, 7, 207, 53, 14, 7, - 207, 52, 14, 7, 207, 51, 14, 7, 207, 50, 14, 7, 207, 49, 14, 7, 207, 48, - 14, 7, 207, 47, 14, 7, 207, 46, 14, 7, 207, 45, 14, 7, 207, 44, 14, 7, - 207, 43, 14, 7, 207, 42, 14, 7, 206, 163, 14, 7, 206, 162, 14, 7, 206, - 161, 14, 7, 206, 160, 14, 7, 206, 159, 14, 7, 206, 158, 14, 7, 206, 157, - 14, 7, 206, 156, 14, 7, 206, 155, 14, 7, 206, 154, 14, 7, 206, 153, 14, - 7, 206, 152, 14, 7, 206, 151, 14, 7, 206, 150, 14, 7, 206, 149, 14, 7, - 206, 148, 14, 7, 206, 147, 14, 7, 206, 146, 14, 7, 206, 145, 14, 7, 206, - 144, 14, 7, 206, 143, 14, 7, 206, 142, 14, 7, 206, 141, 14, 7, 206, 140, - 14, 7, 206, 139, 14, 7, 206, 138, 14, 7, 206, 137, 14, 7, 206, 136, 14, - 7, 206, 135, 14, 7, 206, 134, 14, 7, 206, 133, 14, 7, 206, 132, 14, 7, - 206, 131, 14, 7, 206, 130, 14, 7, 206, 129, 14, 7, 206, 128, 14, 7, 206, - 127, 14, 7, 206, 126, 14, 7, 206, 125, 14, 7, 206, 124, 14, 7, 206, 123, - 14, 7, 206, 122, 14, 7, 206, 121, 14, 7, 206, 120, 14, 7, 206, 119, 14, - 7, 206, 118, 14, 7, 206, 117, 14, 7, 206, 116, 14, 7, 206, 115, 14, 7, - 206, 114, 14, 7, 206, 113, 14, 7, 206, 112, 14, 7, 206, 111, 14, 7, 206, - 110, 14, 7, 206, 109, 14, 7, 206, 108, 14, 7, 206, 107, 14, 7, 206, 106, - 14, 7, 206, 105, 14, 7, 206, 104, 14, 7, 206, 103, 14, 7, 206, 102, 14, - 7, 206, 101, 14, 7, 206, 100, 14, 7, 206, 99, 14, 7, 206, 98, 14, 7, 206, - 97, 14, 7, 206, 96, 14, 7, 206, 95, 14, 7, 206, 94, 14, 7, 206, 93, 14, - 7, 206, 92, 14, 7, 206, 91, 14, 7, 206, 90, 14, 7, 206, 89, 14, 7, 206, - 88, 14, 7, 206, 87, 14, 7, 204, 143, 14, 7, 204, 142, 14, 7, 204, 141, - 14, 7, 204, 140, 14, 7, 204, 139, 14, 7, 204, 138, 14, 7, 204, 137, 14, - 7, 204, 136, 14, 7, 204, 135, 14, 7, 204, 134, 14, 7, 204, 133, 14, 7, - 204, 132, 14, 7, 204, 131, 14, 7, 204, 130, 14, 7, 204, 129, 14, 7, 204, - 128, 14, 7, 204, 127, 14, 7, 204, 126, 14, 7, 204, 125, 14, 7, 204, 124, - 14, 7, 204, 123, 14, 7, 204, 122, 14, 7, 204, 121, 14, 7, 204, 120, 14, - 7, 204, 119, 14, 7, 204, 118, 14, 7, 204, 117, 14, 7, 204, 116, 14, 7, - 204, 115, 14, 7, 204, 114, 14, 7, 204, 113, 14, 7, 204, 112, 14, 7, 203, - 194, 14, 7, 203, 193, 14, 7, 203, 192, 14, 7, 203, 191, 14, 7, 203, 190, - 14, 7, 203, 189, 14, 7, 203, 188, 14, 7, 203, 187, 14, 7, 203, 186, 14, - 7, 203, 185, 14, 7, 203, 184, 14, 7, 203, 183, 14, 7, 203, 122, 14, 7, - 203, 121, 14, 7, 203, 120, 14, 7, 203, 119, 14, 7, 203, 118, 14, 7, 203, - 117, 14, 7, 203, 116, 14, 7, 203, 115, 14, 7, 203, 114, 14, 7, 202, 158, - 14, 7, 202, 157, 14, 7, 202, 156, 14, 7, 202, 155, 14, 7, 202, 154, 14, - 7, 202, 153, 14, 7, 202, 152, 14, 7, 202, 151, 14, 7, 202, 150, 14, 7, - 202, 149, 14, 7, 202, 148, 14, 7, 202, 147, 14, 7, 202, 146, 14, 7, 202, - 145, 14, 7, 202, 144, 14, 7, 202, 143, 14, 7, 202, 142, 14, 7, 202, 141, - 14, 7, 202, 140, 14, 7, 202, 139, 14, 7, 202, 138, 14, 7, 202, 137, 14, - 7, 202, 136, 14, 7, 202, 135, 14, 7, 202, 134, 14, 7, 202, 133, 14, 7, - 202, 132, 14, 7, 202, 131, 14, 7, 202, 130, 14, 7, 202, 129, 14, 7, 202, - 128, 14, 7, 202, 127, 14, 7, 202, 126, 14, 7, 202, 125, 14, 7, 202, 124, - 14, 7, 202, 123, 14, 7, 202, 122, 14, 7, 202, 121, 14, 7, 202, 120, 14, - 7, 202, 119, 14, 7, 202, 118, 14, 7, 252, 24, 14, 7, 252, 23, 14, 7, 252, - 22, 14, 7, 252, 21, 14, 7, 252, 20, 14, 7, 252, 19, 14, 7, 252, 18, 14, - 7, 252, 17, 14, 7, 252, 16, 14, 7, 252, 15, 14, 7, 252, 14, 14, 7, 252, - 13, 14, 7, 252, 12, 14, 7, 252, 11, 14, 7, 252, 10, 14, 7, 252, 9, 14, 7, - 252, 8, 14, 7, 252, 7, 14, 7, 252, 6, 14, 7, 252, 5, 14, 7, 252, 4, 14, - 7, 252, 3, 14, 7, 252, 2, 14, 7, 252, 1, 14, 7, 252, 0, 14, 7, 251, 255, - 14, 7, 251, 254, 14, 7, 251, 253, 14, 7, 251, 252, 14, 7, 251, 251, 14, - 7, 251, 250, 14, 7, 251, 249, 14, 7, 251, 248, 14, 7, 251, 247, 27, 7, - 255, 18, 27, 7, 255, 17, 27, 7, 255, 16, 27, 7, 255, 15, 27, 7, 255, 14, - 27, 7, 255, 12, 27, 7, 255, 9, 27, 7, 255, 8, 27, 7, 255, 7, 27, 7, 255, - 6, 27, 7, 255, 5, 27, 7, 255, 4, 27, 7, 255, 3, 27, 7, 255, 2, 27, 7, - 255, 1, 27, 7, 254, 255, 27, 7, 254, 254, 27, 7, 254, 253, 27, 7, 254, - 251, 27, 7, 254, 250, 27, 7, 254, 249, 27, 7, 254, 248, 27, 7, 254, 247, - 27, 7, 254, 246, 27, 7, 254, 245, 27, 7, 254, 244, 27, 7, 254, 243, 27, - 7, 254, 242, 27, 7, 254, 241, 27, 7, 254, 240, 27, 7, 254, 238, 27, 7, - 254, 237, 27, 7, 254, 236, 27, 7, 254, 235, 27, 7, 254, 233, 27, 7, 254, - 232, 27, 7, 254, 231, 27, 7, 254, 230, 27, 7, 254, 229, 27, 7, 254, 228, - 27, 7, 254, 227, 27, 7, 254, 226, 27, 7, 254, 225, 27, 7, 254, 223, 27, - 7, 254, 222, 27, 7, 254, 221, 27, 7, 254, 219, 27, 7, 254, 217, 27, 7, - 254, 216, 27, 7, 254, 215, 27, 7, 254, 214, 27, 7, 254, 213, 27, 7, 254, - 212, 27, 7, 254, 211, 27, 7, 254, 210, 27, 7, 254, 209, 27, 7, 254, 208, - 27, 7, 254, 207, 27, 7, 254, 206, 27, 7, 254, 205, 27, 7, 254, 204, 27, - 7, 254, 203, 27, 7, 254, 202, 27, 7, 254, 201, 27, 7, 254, 200, 27, 7, - 254, 199, 27, 7, 254, 198, 27, 7, 254, 197, 27, 7, 254, 196, 27, 7, 254, - 195, 27, 7, 254, 194, 27, 7, 254, 193, 27, 7, 254, 192, 27, 7, 254, 191, - 27, 7, 254, 190, 27, 7, 254, 189, 27, 7, 254, 188, 27, 7, 254, 187, 27, - 7, 254, 186, 27, 7, 254, 185, 27, 7, 254, 184, 27, 7, 254, 183, 27, 7, - 254, 182, 27, 7, 254, 181, 27, 7, 254, 180, 27, 7, 254, 179, 27, 7, 254, - 178, 27, 7, 254, 177, 27, 7, 254, 176, 27, 7, 254, 175, 27, 7, 254, 174, - 27, 7, 254, 173, 27, 7, 254, 172, 27, 7, 254, 171, 27, 7, 254, 170, 27, - 7, 254, 169, 27, 7, 254, 168, 27, 7, 254, 167, 27, 7, 254, 166, 27, 7, - 254, 165, 27, 7, 254, 164, 27, 7, 254, 163, 27, 7, 254, 162, 27, 7, 254, - 161, 27, 7, 254, 160, 27, 7, 254, 159, 27, 7, 254, 158, 27, 7, 254, 157, - 27, 7, 254, 156, 27, 7, 254, 155, 27, 7, 254, 154, 27, 7, 254, 153, 27, - 7, 254, 151, 27, 7, 254, 150, 27, 7, 254, 149, 27, 7, 254, 148, 27, 7, - 254, 147, 27, 7, 254, 146, 27, 7, 254, 145, 27, 7, 254, 144, 27, 7, 254, - 143, 27, 7, 254, 142, 27, 7, 254, 141, 27, 7, 254, 140, 27, 7, 254, 139, - 27, 7, 254, 138, 27, 7, 254, 137, 27, 7, 254, 136, 27, 7, 254, 135, 27, - 7, 254, 134, 27, 7, 254, 133, 27, 7, 254, 132, 27, 7, 254, 131, 27, 7, - 254, 130, 27, 7, 254, 129, 27, 7, 254, 128, 27, 7, 254, 127, 27, 7, 254, - 126, 27, 7, 254, 125, 27, 7, 254, 124, 27, 7, 254, 123, 27, 7, 254, 122, - 27, 7, 254, 121, 27, 7, 254, 120, 27, 7, 254, 119, 27, 7, 254, 118, 27, - 7, 254, 116, 27, 7, 254, 115, 27, 7, 254, 114, 27, 7, 254, 113, 27, 7, - 254, 112, 27, 7, 254, 111, 27, 7, 254, 110, 27, 7, 254, 109, 27, 7, 254, - 108, 27, 7, 254, 107, 27, 7, 254, 106, 27, 7, 254, 105, 27, 7, 254, 103, - 27, 7, 254, 102, 27, 7, 254, 101, 27, 7, 254, 100, 27, 7, 254, 99, 27, 7, - 254, 98, 27, 7, 254, 97, 27, 7, 254, 96, 27, 7, 254, 95, 27, 7, 254, 94, - 27, 7, 254, 93, 27, 7, 254, 92, 27, 7, 254, 91, 27, 7, 254, 90, 27, 7, - 254, 89, 27, 7, 254, 88, 27, 7, 254, 87, 27, 7, 254, 86, 27, 7, 254, 85, - 27, 7, 254, 84, 27, 7, 254, 83, 27, 7, 254, 82, 27, 7, 254, 81, 27, 7, - 254, 80, 27, 7, 254, 79, 27, 7, 254, 78, 27, 7, 254, 77, 27, 7, 254, 76, - 27, 7, 254, 75, 27, 7, 254, 74, 27, 7, 254, 73, 27, 7, 254, 72, 27, 7, - 254, 71, 27, 7, 254, 70, 27, 7, 254, 69, 27, 7, 254, 68, 27, 7, 254, 67, - 27, 7, 254, 66, 27, 7, 254, 65, 27, 7, 254, 64, 27, 7, 254, 63, 27, 7, - 254, 62, 27, 7, 254, 61, 27, 7, 254, 60, 27, 7, 254, 59, 27, 7, 254, 58, - 27, 7, 254, 57, 27, 7, 254, 56, 27, 7, 254, 55, 27, 7, 254, 54, 27, 7, - 254, 53, 27, 7, 254, 52, 27, 7, 254, 51, 27, 7, 254, 50, 27, 7, 254, 49, - 27, 7, 254, 48, 27, 7, 254, 47, 27, 7, 254, 46, 27, 7, 254, 45, 27, 7, - 254, 44, 27, 7, 254, 43, 27, 7, 254, 42, 27, 7, 254, 41, 27, 7, 254, 40, - 27, 7, 254, 39, 27, 7, 254, 38, 27, 7, 254, 37, 27, 7, 254, 36, 27, 7, - 254, 35, 27, 7, 254, 33, 27, 7, 254, 32, 27, 7, 254, 31, 27, 7, 254, 30, - 27, 7, 254, 29, 27, 7, 254, 28, 27, 7, 254, 27, 27, 7, 254, 26, 27, 7, - 254, 25, 27, 7, 254, 24, 27, 7, 254, 23, 27, 7, 254, 22, 27, 7, 254, 21, - 27, 7, 254, 20, 27, 7, 254, 19, 27, 7, 254, 18, 27, 7, 254, 17, 27, 7, - 254, 16, 27, 7, 254, 15, 27, 7, 254, 14, 27, 7, 254, 13, 27, 7, 254, 12, - 27, 7, 254, 11, 27, 7, 254, 10, 27, 7, 254, 9, 27, 7, 254, 8, 27, 7, 254, - 7, 27, 7, 254, 6, 27, 7, 254, 5, 27, 7, 254, 4, 27, 7, 254, 3, 27, 7, - 254, 2, 27, 7, 254, 1, 27, 7, 254, 0, 27, 7, 253, 255, 27, 7, 253, 254, - 27, 7, 253, 253, 27, 7, 253, 252, 27, 7, 253, 251, 27, 7, 253, 250, 27, - 7, 253, 249, 27, 7, 253, 248, 27, 7, 253, 247, 27, 7, 253, 246, 27, 7, - 253, 245, 27, 7, 253, 244, 27, 7, 253, 243, 27, 7, 253, 242, 27, 7, 253, - 241, 27, 7, 253, 240, 27, 7, 253, 239, 27, 7, 253, 238, 27, 7, 253, 237, - 27, 7, 253, 236, 27, 7, 253, 235, 27, 7, 253, 234, 27, 7, 253, 233, 27, - 7, 253, 232, 27, 7, 253, 231, 27, 7, 253, 230, 27, 7, 253, 229, 27, 7, - 253, 228, 27, 7, 253, 227, 27, 7, 253, 226, 27, 7, 253, 225, 27, 7, 253, - 224, 27, 7, 253, 223, 27, 7, 253, 222, 27, 7, 253, 221, 27, 7, 253, 220, - 27, 7, 253, 219, 27, 7, 253, 218, 27, 7, 253, 217, 27, 7, 253, 216, 27, - 7, 253, 215, 27, 7, 253, 214, 27, 7, 253, 213, 27, 7, 253, 212, 27, 7, - 253, 211, 27, 7, 253, 210, 27, 7, 253, 209, 27, 7, 253, 208, 27, 7, 253, - 207, 27, 7, 253, 206, 27, 7, 253, 205, 27, 7, 253, 204, 27, 7, 253, 203, - 27, 7, 253, 202, 27, 7, 253, 201, 27, 7, 253, 200, 27, 7, 253, 199, 27, - 7, 253, 198, 27, 7, 253, 197, 27, 7, 253, 196, 27, 7, 253, 195, 27, 7, - 253, 194, 27, 7, 253, 193, 27, 7, 253, 192, 27, 7, 253, 191, 27, 7, 253, - 190, 27, 7, 253, 189, 27, 7, 253, 188, 27, 7, 253, 187, 27, 7, 253, 186, - 27, 7, 253, 185, 27, 7, 253, 184, 27, 7, 253, 183, 27, 7, 253, 182, 27, - 7, 253, 181, 27, 7, 253, 180, 27, 7, 253, 179, 27, 7, 253, 177, 27, 7, - 253, 176, 27, 7, 253, 175, 27, 7, 253, 174, 27, 7, 253, 173, 27, 7, 253, - 172, 27, 7, 253, 171, 27, 7, 253, 170, 27, 7, 253, 169, 27, 7, 253, 168, - 27, 7, 253, 167, 27, 7, 253, 164, 27, 7, 253, 163, 27, 7, 253, 162, 27, - 7, 253, 161, 27, 7, 253, 157, 27, 7, 253, 156, 27, 7, 253, 155, 27, 7, - 253, 154, 27, 7, 253, 153, 27, 7, 253, 152, 27, 7, 253, 151, 27, 7, 253, - 150, 27, 7, 253, 149, 27, 7, 253, 148, 27, 7, 253, 147, 27, 7, 253, 146, - 27, 7, 253, 145, 27, 7, 253, 144, 27, 7, 253, 143, 27, 7, 253, 142, 27, - 7, 253, 141, 27, 7, 253, 140, 27, 7, 253, 139, 27, 7, 253, 137, 27, 7, - 253, 136, 27, 7, 253, 135, 27, 7, 253, 134, 27, 7, 253, 133, 27, 7, 253, - 132, 27, 7, 253, 131, 27, 7, 253, 130, 27, 7, 253, 129, 27, 7, 253, 128, - 27, 7, 253, 127, 27, 7, 253, 126, 27, 7, 253, 125, 27, 7, 253, 124, 27, - 7, 253, 123, 27, 7, 253, 122, 27, 7, 253, 121, 27, 7, 253, 120, 27, 7, - 253, 119, 27, 7, 253, 118, 27, 7, 253, 117, 27, 7, 253, 116, 27, 7, 253, - 115, 27, 7, 253, 114, 27, 7, 253, 113, 27, 7, 253, 112, 27, 7, 253, 111, - 27, 7, 253, 110, 27, 7, 253, 109, 27, 7, 253, 108, 27, 7, 253, 107, 27, - 7, 253, 106, 27, 7, 253, 105, 27, 7, 253, 104, 27, 7, 253, 103, 27, 7, - 253, 102, 27, 7, 253, 101, 27, 7, 253, 100, 27, 7, 253, 99, 27, 7, 253, - 98, 27, 7, 253, 97, 27, 7, 253, 96, 27, 7, 253, 95, 27, 7, 253, 94, 27, - 7, 253, 93, 27, 7, 253, 92, 27, 7, 253, 91, 27, 7, 253, 90, 27, 7, 253, - 89, 27, 7, 253, 88, 27, 7, 253, 87, 27, 7, 253, 86, 27, 7, 253, 85, 27, - 7, 253, 84, 27, 7, 253, 83, 27, 7, 253, 82, 27, 7, 253, 81, 27, 7, 253, - 80, 27, 7, 253, 79, 27, 7, 253, 78, 27, 7, 253, 77, 27, 7, 253, 76, 216, - 221, 219, 245, 216, 57, 27, 7, 253, 75, 27, 7, 253, 74, 27, 7, 253, 73, - 27, 7, 253, 72, 27, 7, 253, 71, 27, 7, 253, 70, 27, 7, 253, 69, 27, 7, - 253, 68, 27, 7, 253, 67, 27, 7, 253, 66, 27, 7, 253, 65, 27, 7, 253, 64, - 199, 27, 7, 253, 63, 27, 7, 253, 62, 27, 7, 253, 61, 27, 7, 253, 60, 27, - 7, 253, 59, 27, 7, 253, 58, 27, 7, 253, 57, 27, 7, 253, 55, 27, 7, 253, - 53, 27, 7, 253, 51, 27, 7, 253, 49, 27, 7, 253, 47, 27, 7, 253, 45, 27, - 7, 253, 43, 27, 7, 253, 41, 27, 7, 253, 39, 27, 7, 253, 37, 248, 142, - 227, 36, 82, 27, 7, 253, 35, 241, 84, 227, 36, 82, 27, 7, 253, 34, 27, 7, - 253, 32, 27, 7, 253, 30, 27, 7, 253, 28, 27, 7, 253, 26, 27, 7, 253, 24, - 27, 7, 253, 22, 27, 7, 253, 20, 27, 7, 253, 18, 27, 7, 253, 17, 27, 7, - 253, 16, 27, 7, 253, 15, 27, 7, 253, 14, 27, 7, 253, 13, 27, 7, 253, 12, - 27, 7, 253, 11, 27, 7, 253, 10, 27, 7, 253, 9, 27, 7, 253, 8, 27, 7, 253, - 7, 27, 7, 253, 6, 27, 7, 253, 5, 27, 7, 253, 4, 27, 7, 253, 3, 27, 7, - 253, 2, 27, 7, 253, 1, 27, 7, 253, 0, 27, 7, 252, 255, 27, 7, 252, 254, - 27, 7, 252, 253, 27, 7, 252, 252, 27, 7, 252, 251, 27, 7, 252, 250, 27, - 7, 252, 249, 27, 7, 252, 248, 27, 7, 252, 247, 27, 7, 252, 246, 27, 7, - 252, 245, 27, 7, 252, 244, 27, 7, 252, 243, 27, 7, 252, 242, 27, 7, 252, - 241, 27, 7, 252, 240, 27, 7, 252, 239, 27, 7, 252, 238, 27, 7, 252, 237, - 27, 7, 252, 236, 27, 7, 252, 235, 27, 7, 252, 234, 27, 7, 252, 233, 27, - 7, 252, 232, 27, 7, 252, 231, 27, 7, 252, 230, 27, 7, 252, 229, 27, 7, - 252, 228, 27, 7, 252, 227, 27, 7, 252, 226, 27, 7, 252, 225, 27, 7, 252, - 224, 27, 7, 252, 223, 27, 7, 252, 222, 27, 7, 252, 221, 27, 7, 252, 220, - 27, 7, 252, 219, 27, 7, 252, 218, 27, 7, 252, 217, 27, 7, 252, 216, 27, - 7, 252, 215, 27, 7, 252, 214, 27, 7, 252, 213, 27, 7, 252, 212, 27, 7, - 252, 211, 27, 7, 252, 210, 27, 7, 252, 209, 27, 7, 252, 208, 27, 7, 252, - 207, 27, 7, 252, 206, 27, 7, 252, 205, 27, 7, 252, 204, 27, 7, 252, 203, - 27, 7, 252, 202, 27, 7, 252, 201, 27, 7, 252, 200, 27, 7, 252, 199, 27, - 7, 252, 198, 27, 7, 252, 197, 27, 7, 252, 196, 27, 7, 252, 195, 27, 7, - 252, 194, 27, 7, 252, 193, 27, 7, 252, 192, 27, 7, 252, 191, 27, 7, 252, - 190, 27, 7, 252, 189, 27, 7, 252, 188, 27, 7, 252, 187, 27, 7, 252, 186, - 27, 7, 252, 185, 27, 7, 252, 184, 27, 7, 252, 183, 27, 7, 252, 182, 27, - 7, 252, 181, 27, 7, 252, 180, 27, 7, 252, 179, 27, 7, 252, 178, 27, 7, - 252, 177, 27, 7, 252, 176, 27, 7, 252, 175, 27, 7, 252, 174, 27, 7, 252, - 173, 27, 7, 252, 172, 27, 7, 252, 171, 27, 7, 252, 170, 27, 7, 252, 169, - 27, 7, 252, 168, 27, 7, 252, 167, 27, 7, 252, 166, 27, 7, 252, 165, 27, - 7, 252, 164, 24, 1, 218, 198, 222, 136, 224, 197, 24, 1, 218, 198, 238, - 198, 239, 178, 24, 1, 218, 198, 218, 47, 224, 198, 218, 115, 24, 1, 218, - 198, 218, 47, 224, 198, 218, 116, 24, 1, 218, 198, 223, 107, 224, 197, - 24, 1, 218, 198, 212, 195, 24, 1, 218, 198, 208, 199, 224, 197, 24, 1, - 218, 198, 220, 215, 224, 197, 24, 1, 218, 198, 212, 254, 219, 169, 222, - 32, 24, 1, 218, 198, 218, 47, 219, 169, 222, 33, 218, 115, 24, 1, 218, - 198, 218, 47, 219, 169, 222, 33, 218, 116, 24, 1, 218, 198, 225, 156, 24, - 1, 218, 198, 207, 204, 225, 157, 24, 1, 218, 198, 222, 197, 24, 1, 218, - 198, 225, 153, 24, 1, 218, 198, 225, 111, 24, 1, 218, 198, 223, 186, 24, - 1, 218, 198, 213, 114, 24, 1, 218, 198, 221, 91, 24, 1, 218, 198, 229, - 163, 24, 1, 218, 198, 222, 0, 24, 1, 218, 198, 210, 179, 24, 1, 218, 198, - 222, 135, 24, 1, 218, 198, 228, 10, 24, 1, 218, 198, 227, 176, 228, 175, - 24, 1, 218, 198, 221, 101, 224, 205, 24, 1, 218, 198, 225, 160, 24, 1, - 218, 198, 219, 62, 24, 1, 218, 198, 238, 100, 24, 1, 218, 198, 219, 125, - 24, 1, 218, 198, 224, 55, 222, 170, 24, 1, 218, 198, 220, 196, 224, 208, - 24, 1, 218, 198, 106, 202, 188, 223, 100, 24, 1, 218, 198, 238, 101, 24, - 1, 218, 198, 221, 101, 221, 102, 24, 1, 218, 198, 212, 91, 24, 1, 218, - 198, 224, 190, 24, 1, 218, 198, 224, 211, 24, 1, 218, 198, 224, 31, 24, - 1, 218, 198, 230, 21, 24, 1, 218, 198, 219, 169, 227, 223, 24, 1, 218, - 198, 223, 26, 227, 223, 24, 1, 218, 198, 218, 219, 24, 1, 218, 198, 225, - 154, 24, 1, 218, 198, 222, 74, 24, 1, 218, 198, 217, 172, 24, 1, 218, - 198, 207, 201, 24, 1, 218, 198, 226, 235, 24, 1, 218, 198, 211, 251, 24, - 1, 218, 198, 209, 117, 24, 1, 218, 198, 225, 151, 24, 1, 218, 198, 229, - 170, 24, 1, 218, 198, 223, 22, 24, 1, 218, 198, 228, 188, 24, 1, 218, - 198, 224, 32, 24, 1, 218, 198, 212, 191, 24, 1, 218, 198, 227, 29, 24, 1, - 218, 198, 239, 246, 24, 1, 218, 198, 215, 211, 24, 1, 218, 198, 228, 233, - 24, 1, 218, 198, 211, 247, 24, 1, 218, 198, 225, 107, 218, 157, 24, 1, - 218, 198, 212, 247, 24, 1, 218, 198, 221, 100, 24, 1, 218, 198, 212, 230, - 221, 111, 202, 196, 24, 1, 218, 198, 220, 237, 224, 51, 24, 1, 218, 198, - 219, 164, 24, 1, 218, 198, 222, 2, 24, 1, 218, 198, 206, 231, 24, 1, 218, - 198, 222, 173, 24, 1, 218, 198, 225, 150, 24, 1, 218, 198, 222, 44, 24, - 1, 218, 198, 225, 49, 24, 1, 218, 198, 220, 251, 24, 1, 218, 198, 209, - 121, 24, 1, 218, 198, 211, 244, 24, 1, 218, 198, 219, 165, 24, 1, 218, - 198, 221, 115, 24, 1, 218, 198, 225, 158, 24, 1, 218, 198, 220, 248, 24, - 1, 218, 198, 229, 241, 24, 1, 218, 198, 221, 118, 24, 1, 218, 198, 206, - 50, 24, 1, 218, 198, 226, 239, 24, 1, 218, 198, 222, 230, 24, 1, 218, - 198, 223, 75, 24, 1, 218, 198, 225, 48, 24, 1, 218, 197, 221, 113, 24, 1, - 218, 197, 207, 204, 225, 155, 24, 1, 218, 197, 212, 152, 24, 1, 218, 197, - 213, 118, 207, 203, 24, 1, 218, 197, 227, 31, 221, 97, 24, 1, 218, 197, - 225, 55, 225, 159, 24, 1, 218, 197, 229, 92, 24, 1, 218, 197, 203, 18, - 24, 1, 218, 197, 225, 50, 24, 1, 218, 197, 230, 7, 24, 1, 218, 197, 219, - 19, 24, 1, 218, 197, 203, 96, 227, 223, 24, 1, 218, 197, 228, 29, 221, - 111, 221, 6, 24, 1, 218, 197, 221, 94, 213, 17, 24, 1, 218, 197, 222, - 249, 222, 47, 24, 1, 218, 197, 238, 98, 24, 1, 218, 197, 218, 105, 24, 1, - 218, 197, 207, 204, 221, 109, 24, 1, 218, 197, 213, 22, 222, 42, 24, 1, - 218, 197, 213, 18, 24, 1, 218, 197, 224, 198, 209, 120, 24, 1, 218, 197, - 225, 37, 225, 51, 24, 1, 218, 197, 220, 249, 221, 97, 24, 1, 218, 197, - 229, 159, 24, 1, 218, 197, 238, 99, 24, 1, 218, 197, 229, 155, 24, 1, - 218, 197, 228, 107, 24, 1, 218, 197, 219, 65, 24, 1, 218, 197, 205, 237, - 24, 1, 218, 197, 222, 137, 223, 184, 24, 1, 218, 197, 222, 172, 225, 33, - 24, 1, 218, 197, 203, 215, 24, 1, 218, 197, 215, 12, 24, 1, 218, 197, - 210, 14, 24, 1, 218, 197, 224, 210, 24, 1, 218, 197, 222, 156, 24, 1, - 218, 197, 222, 157, 228, 7, 24, 1, 218, 197, 224, 200, 24, 1, 218, 197, - 210, 230, 24, 1, 218, 197, 225, 41, 24, 1, 218, 197, 224, 36, 24, 1, 218, - 197, 221, 9, 24, 1, 218, 197, 217, 176, 24, 1, 218, 197, 224, 209, 222, - 174, 24, 1, 218, 197, 240, 31, 24, 1, 218, 197, 225, 28, 24, 1, 218, 197, - 240, 53, 24, 1, 218, 197, 229, 167, 24, 1, 218, 197, 225, 177, 222, 36, - 24, 1, 218, 197, 225, 177, 222, 12, 24, 1, 218, 197, 227, 175, 24, 1, - 218, 197, 222, 180, 24, 1, 218, 197, 221, 120, 24, 1, 218, 197, 192, 24, - 1, 218, 197, 229, 77, 24, 1, 218, 197, 222, 125, 24, 1, 168, 222, 136, - 225, 157, 24, 1, 168, 220, 214, 24, 1, 168, 202, 196, 24, 1, 168, 204, - 95, 24, 1, 168, 222, 173, 24, 1, 168, 223, 14, 24, 1, 168, 222, 143, 24, - 1, 168, 238, 108, 24, 1, 168, 225, 45, 24, 1, 168, 238, 205, 24, 1, 168, - 220, 239, 224, 91, 224, 212, 24, 1, 168, 221, 89, 225, 36, 24, 1, 168, - 225, 42, 24, 1, 168, 218, 111, 24, 1, 168, 222, 255, 24, 1, 168, 225, 53, - 247, 88, 24, 1, 168, 229, 157, 24, 1, 168, 238, 109, 24, 1, 168, 229, - 164, 24, 1, 168, 202, 214, 223, 215, 24, 1, 168, 220, 208, 24, 1, 168, - 225, 30, 24, 1, 168, 221, 119, 24, 1, 168, 225, 36, 24, 1, 168, 203, 19, - 24, 1, 168, 228, 241, 24, 1, 168, 230, 41, 24, 1, 168, 213, 113, 24, 1, - 168, 223, 8, 24, 1, 168, 210, 12, 24, 1, 168, 222, 16, 24, 1, 168, 208, - 199, 202, 199, 24, 1, 168, 211, 5, 24, 1, 168, 222, 163, 221, 6, 24, 1, - 168, 205, 236, 24, 1, 168, 223, 78, 24, 1, 168, 225, 177, 229, 166, 24, - 1, 168, 221, 102, 24, 1, 168, 222, 158, 24, 1, 168, 228, 11, 24, 1, 168, - 225, 38, 24, 1, 168, 224, 189, 24, 1, 168, 221, 96, 24, 1, 168, 209, 116, - 24, 1, 168, 222, 160, 24, 1, 168, 239, 106, 24, 1, 168, 223, 13, 24, 1, - 168, 221, 121, 24, 1, 168, 221, 117, 24, 1, 168, 247, 169, 24, 1, 168, - 205, 238, 24, 1, 168, 225, 43, 24, 1, 168, 215, 145, 24, 1, 168, 222, 46, - 24, 1, 168, 228, 28, 24, 1, 168, 208, 196, 24, 1, 168, 221, 103, 222, - 125, 24, 1, 168, 222, 38, 24, 1, 168, 229, 170, 24, 1, 168, 222, 165, 24, - 1, 168, 225, 150, 24, 1, 168, 225, 31, 24, 1, 168, 226, 239, 24, 1, 168, - 228, 175, 24, 1, 168, 222, 44, 24, 1, 168, 222, 125, 24, 1, 168, 203, - 205, 24, 1, 168, 222, 161, 24, 1, 168, 221, 106, 24, 1, 168, 221, 98, 24, - 1, 168, 228, 190, 222, 2, 24, 1, 168, 221, 104, 24, 1, 168, 223, 21, 24, - 1, 168, 225, 177, 221, 109, 24, 1, 168, 203, 110, 24, 1, 168, 223, 20, - 24, 1, 168, 212, 194, 24, 1, 168, 213, 116, 24, 1, 168, 225, 39, 24, 1, - 168, 225, 157, 24, 1, 168, 225, 49, 24, 1, 168, 229, 158, 24, 1, 168, - 225, 40, 24, 1, 168, 229, 162, 24, 1, 168, 225, 53, 218, 162, 24, 1, 168, - 202, 179, 24, 1, 168, 222, 34, 24, 1, 168, 224, 144, 24, 1, 168, 223, - 244, 24, 1, 168, 212, 250, 24, 1, 168, 229, 181, 227, 246, 24, 1, 168, - 229, 181, 240, 66, 24, 1, 168, 222, 195, 24, 1, 168, 223, 75, 24, 1, 168, - 227, 96, 24, 1, 168, 218, 123, 24, 1, 168, 219, 9, 24, 1, 168, 209, 132, - 24, 1, 134, 225, 29, 24, 1, 134, 204, 93, 24, 1, 134, 222, 32, 24, 1, - 134, 224, 197, 24, 1, 134, 222, 30, 24, 1, 134, 227, 141, 24, 1, 134, - 222, 35, 24, 1, 134, 221, 116, 24, 1, 134, 222, 179, 24, 1, 134, 221, 6, - 24, 1, 134, 203, 216, 24, 1, 134, 222, 133, 24, 1, 134, 213, 41, 24, 1, - 134, 222, 144, 24, 1, 134, 229, 165, 24, 1, 134, 209, 118, 24, 1, 134, - 213, 20, 24, 1, 134, 222, 43, 24, 1, 134, 210, 230, 24, 1, 134, 229, 170, - 24, 1, 134, 203, 98, 24, 1, 134, 228, 191, 24, 1, 134, 214, 233, 24, 1, - 134, 224, 202, 24, 1, 134, 223, 12, 24, 1, 134, 225, 125, 24, 1, 134, - 224, 208, 24, 1, 134, 213, 115, 24, 1, 134, 203, 42, 24, 1, 134, 222, 37, - 24, 1, 134, 229, 161, 225, 32, 24, 1, 134, 222, 140, 24, 1, 134, 207, - 203, 24, 1, 134, 238, 118, 24, 1, 134, 222, 130, 24, 1, 134, 240, 32, 24, - 1, 134, 223, 16, 24, 1, 134, 224, 181, 24, 1, 134, 227, 169, 24, 1, 134, - 222, 254, 24, 1, 134, 224, 50, 24, 1, 134, 224, 185, 24, 1, 134, 217, - 156, 24, 1, 134, 224, 183, 24, 1, 134, 224, 199, 24, 1, 134, 226, 222, - 24, 1, 134, 221, 108, 24, 1, 134, 225, 52, 24, 1, 134, 228, 165, 24, 1, - 134, 220, 251, 24, 1, 134, 209, 121, 24, 1, 134, 211, 244, 24, 1, 134, - 202, 179, 24, 1, 134, 229, 162, 24, 1, 134, 216, 201, 24, 1, 134, 209, - 175, 24, 1, 134, 222, 141, 24, 1, 134, 224, 204, 24, 1, 134, 221, 107, - 24, 1, 134, 229, 160, 24, 1, 134, 218, 117, 24, 1, 134, 218, 213, 24, 1, - 134, 220, 225, 24, 1, 134, 227, 175, 24, 1, 134, 222, 180, 24, 1, 134, - 224, 201, 24, 1, 134, 222, 153, 24, 1, 134, 202, 193, 24, 1, 134, 219, - 96, 24, 1, 134, 202, 192, 24, 1, 134, 223, 21, 24, 1, 134, 221, 97, 24, - 1, 134, 211, 7, 24, 1, 134, 228, 195, 24, 1, 134, 222, 169, 24, 1, 134, - 222, 138, 24, 1, 134, 207, 185, 24, 1, 134, 224, 212, 24, 1, 134, 228, - 185, 24, 1, 134, 221, 105, 24, 1, 134, 209, 119, 24, 1, 134, 225, 152, - 24, 1, 134, 222, 178, 24, 1, 134, 227, 168, 24, 1, 134, 222, 159, 24, 1, - 134, 221, 110, 24, 1, 134, 222, 16, 24, 1, 134, 238, 102, 24, 1, 134, - 228, 209, 24, 1, 134, 216, 108, 220, 45, 24, 1, 134, 210, 1, 24, 1, 134, - 208, 141, 24, 1, 134, 220, 248, 24, 1, 134, 216, 3, 24, 1, 134, 227, 225, - 24, 1, 134, 225, 7, 24, 1, 134, 226, 185, 24, 1, 134, 210, 179, 24, 1, - 134, 223, 246, 24, 1, 134, 213, 6, 24, 1, 134, 213, 16, 24, 1, 134, 228, - 137, 24, 1, 134, 221, 84, 24, 1, 134, 212, 199, 24, 1, 134, 221, 99, 24, - 1, 134, 219, 23, 24, 1, 134, 222, 100, 24, 1, 134, 212, 229, 24, 1, 134, - 217, 171, 24, 1, 134, 223, 184, 24, 1, 134, 227, 10, 24, 1, 134, 216, - 108, 223, 239, 24, 1, 134, 209, 2, 24, 1, 134, 221, 86, 24, 1, 134, 225, - 53, 213, 111, 24, 1, 134, 214, 231, 24, 1, 134, 240, 107, 24, 1, 93, 223, - 20, 24, 1, 93, 208, 147, 24, 1, 93, 225, 42, 24, 1, 93, 228, 11, 24, 1, - 93, 205, 177, 24, 1, 93, 227, 16, 24, 1, 93, 219, 168, 24, 1, 93, 211, - 255, 24, 1, 93, 216, 176, 24, 1, 93, 221, 112, 24, 1, 93, 222, 247, 24, - 1, 93, 217, 188, 24, 1, 93, 209, 232, 24, 1, 93, 222, 146, 24, 1, 93, - 228, 237, 24, 1, 93, 203, 208, 24, 1, 93, 214, 165, 24, 1, 93, 222, 170, - 24, 1, 93, 219, 165, 24, 1, 93, 208, 148, 24, 1, 93, 228, 189, 24, 1, 93, - 227, 30, 24, 1, 93, 221, 115, 24, 1, 93, 222, 122, 24, 1, 93, 225, 158, - 24, 1, 93, 222, 139, 24, 1, 93, 222, 121, 24, 1, 93, 221, 114, 24, 1, 93, - 216, 0, 24, 1, 93, 222, 34, 24, 1, 93, 219, 21, 24, 1, 93, 215, 33, 24, - 1, 93, 222, 154, 24, 1, 93, 224, 191, 24, 1, 93, 238, 96, 24, 1, 93, 222, - 142, 24, 1, 93, 222, 45, 24, 1, 93, 225, 106, 24, 1, 93, 227, 12, 24, 1, - 93, 222, 175, 24, 1, 93, 223, 4, 24, 1, 93, 210, 0, 221, 97, 24, 1, 93, - 213, 117, 24, 1, 93, 217, 181, 24, 1, 93, 223, 24, 212, 6, 24, 1, 93, - 222, 162, 221, 6, 24, 1, 93, 203, 7, 24, 1, 93, 238, 97, 24, 1, 93, 207, - 202, 24, 1, 93, 203, 22, 24, 1, 93, 218, 69, 24, 1, 93, 207, 190, 24, 1, - 93, 229, 168, 24, 1, 93, 211, 6, 24, 1, 93, 209, 120, 24, 1, 93, 205, - 239, 24, 1, 93, 204, 43, 24, 1, 93, 228, 110, 24, 1, 93, 217, 191, 24, 1, - 93, 210, 13, 24, 1, 93, 238, 117, 24, 1, 93, 222, 185, 24, 1, 93, 213, - 19, 24, 1, 93, 224, 186, 24, 1, 93, 225, 46, 24, 1, 93, 220, 212, 24, 1, - 93, 221, 254, 24, 1, 93, 238, 201, 24, 1, 93, 207, 191, 24, 1, 93, 228, - 199, 24, 1, 93, 203, 74, 24, 1, 93, 220, 249, 246, 32, 24, 1, 93, 202, - 253, 24, 1, 93, 224, 203, 24, 1, 93, 223, 9, 24, 1, 93, 218, 158, 24, 1, - 93, 202, 198, 24, 1, 93, 227, 170, 24, 1, 93, 239, 106, 24, 1, 93, 238, - 200, 24, 1, 93, 222, 132, 24, 1, 93, 229, 170, 24, 1, 93, 225, 161, 24, - 1, 93, 222, 145, 24, 1, 93, 238, 103, 24, 1, 93, 240, 108, 24, 1, 93, - 221, 87, 24, 1, 93, 218, 214, 24, 1, 93, 203, 20, 24, 1, 93, 222, 171, - 24, 1, 93, 220, 249, 248, 103, 24, 1, 93, 220, 192, 24, 1, 93, 218, 43, - 24, 1, 93, 224, 144, 24, 1, 93, 239, 104, 24, 1, 93, 223, 100, 24, 1, 93, - 223, 244, 24, 1, 93, 238, 102, 24, 1, 93, 239, 109, 75, 24, 1, 93, 223, - 185, 24, 1, 93, 217, 187, 24, 1, 93, 222, 134, 24, 1, 93, 228, 175, 24, - 1, 93, 218, 155, 24, 1, 93, 221, 100, 24, 1, 93, 203, 21, 24, 1, 93, 222, - 155, 24, 1, 93, 219, 169, 218, 252, 24, 1, 93, 239, 109, 247, 71, 24, 1, - 93, 239, 179, 24, 1, 93, 222, 39, 24, 1, 93, 63, 24, 1, 93, 208, 141, 24, - 1, 93, 78, 24, 1, 93, 75, 24, 1, 93, 228, 9, 24, 1, 93, 219, 169, 218, - 77, 24, 1, 93, 210, 18, 24, 1, 93, 209, 219, 24, 1, 93, 223, 24, 223, - 172, 236, 38, 24, 1, 93, 212, 250, 24, 1, 93, 203, 17, 24, 1, 93, 222, - 115, 24, 1, 93, 202, 203, 24, 1, 93, 202, 230, 210, 159, 24, 1, 93, 202, - 230, 245, 151, 24, 1, 93, 202, 187, 24, 1, 93, 202, 195, 24, 1, 93, 229, - 156, 24, 1, 93, 218, 212, 24, 1, 93, 222, 40, 241, 39, 24, 1, 93, 217, - 183, 24, 1, 93, 203, 214, 24, 1, 93, 240, 53, 24, 1, 93, 206, 50, 24, 1, - 93, 226, 239, 24, 1, 93, 224, 155, 24, 1, 93, 216, 75, 24, 1, 93, 216, - 202, 24, 1, 93, 222, 114, 24, 1, 93, 222, 203, 24, 1, 93, 212, 242, 24, - 1, 93, 212, 229, 24, 1, 93, 239, 109, 216, 111, 24, 1, 93, 201, 201, 24, - 1, 93, 218, 167, 24, 1, 93, 227, 10, 24, 1, 93, 229, 26, 24, 1, 93, 224, - 240, 24, 1, 93, 192, 24, 1, 93, 225, 103, 24, 1, 93, 209, 122, 24, 1, 93, - 229, 100, 24, 1, 93, 224, 54, 24, 1, 93, 209, 152, 24, 1, 93, 240, 77, - 24, 1, 93, 238, 90, 24, 1, 218, 196, 173, 24, 1, 218, 196, 68, 24, 1, - 218, 196, 228, 209, 24, 1, 218, 196, 241, 161, 24, 1, 218, 196, 216, 135, - 24, 1, 218, 196, 210, 1, 24, 1, 218, 196, 220, 248, 24, 1, 218, 196, 228, - 113, 24, 1, 218, 196, 216, 3, 24, 1, 218, 196, 216, 50, 24, 1, 218, 196, - 225, 7, 24, 1, 218, 196, 210, 18, 24, 1, 218, 196, 223, 23, 24, 1, 218, - 196, 222, 46, 24, 1, 218, 196, 226, 185, 24, 1, 218, 196, 210, 179, 24, - 1, 218, 196, 213, 6, 24, 1, 218, 196, 212, 162, 24, 1, 218, 196, 213, - 113, 24, 1, 218, 196, 228, 137, 24, 1, 218, 196, 229, 170, 24, 1, 218, - 196, 221, 55, 24, 1, 218, 196, 221, 84, 24, 1, 218, 196, 222, 17, 24, 1, - 218, 196, 202, 229, 24, 1, 218, 196, 212, 199, 24, 1, 218, 196, 198, 24, - 1, 218, 196, 221, 118, 24, 1, 218, 196, 218, 212, 24, 1, 218, 196, 221, - 99, 24, 1, 218, 196, 203, 214, 24, 1, 218, 196, 219, 23, 24, 1, 218, 196, - 215, 145, 24, 1, 218, 196, 222, 100, 24, 1, 218, 196, 216, 75, 24, 1, - 218, 196, 229, 180, 24, 1, 218, 196, 222, 131, 24, 1, 218, 196, 222, 182, - 24, 1, 218, 196, 212, 242, 24, 1, 218, 196, 217, 188, 24, 1, 218, 196, - 239, 179, 24, 1, 218, 196, 204, 111, 24, 1, 218, 196, 227, 148, 24, 1, - 218, 196, 227, 10, 24, 1, 218, 196, 229, 26, 24, 1, 218, 196, 225, 44, - 24, 1, 218, 196, 216, 107, 24, 1, 218, 196, 192, 24, 1, 218, 196, 224, - 82, 24, 1, 218, 196, 225, 52, 24, 1, 218, 196, 209, 132, 24, 1, 218, 196, - 228, 244, 24, 1, 218, 196, 214, 251, 24, 1, 218, 196, 204, 162, 223, 249, - 1, 210, 22, 223, 249, 1, 222, 151, 223, 249, 1, 202, 247, 223, 249, 1, - 224, 112, 223, 249, 1, 249, 32, 223, 249, 1, 244, 212, 223, 249, 1, 63, - 223, 249, 1, 218, 192, 223, 249, 1, 229, 139, 223, 249, 1, 237, 95, 223, - 249, 1, 244, 188, 223, 249, 1, 246, 98, 223, 249, 1, 229, 200, 223, 249, - 1, 220, 46, 223, 249, 1, 225, 158, 223, 249, 1, 222, 68, 223, 249, 1, - 185, 223, 249, 1, 220, 18, 223, 249, 1, 78, 223, 249, 1, 215, 227, 223, - 249, 1, 213, 11, 223, 249, 1, 209, 91, 223, 249, 1, 241, 189, 223, 249, - 1, 204, 111, 223, 249, 1, 74, 223, 249, 1, 229, 26, 223, 249, 1, 228, 17, - 223, 249, 1, 228, 113, 223, 249, 1, 237, 147, 223, 249, 1, 216, 57, 223, - 249, 1, 209, 165, 223, 249, 17, 202, 84, 223, 249, 17, 105, 223, 249, 17, - 108, 223, 249, 17, 147, 223, 249, 17, 149, 223, 249, 17, 170, 223, 249, - 17, 195, 223, 249, 17, 213, 111, 223, 249, 17, 199, 223, 249, 17, 222, - 63, 223, 249, 244, 166, 223, 249, 52, 244, 166, 248, 212, 206, 83, 1, - 241, 74, 248, 212, 206, 83, 1, 173, 248, 212, 206, 83, 1, 214, 177, 248, - 212, 206, 83, 1, 240, 108, 248, 212, 206, 83, 1, 225, 47, 248, 212, 206, - 83, 1, 203, 8, 248, 212, 206, 83, 1, 238, 249, 248, 212, 206, 83, 1, 243, - 238, 248, 212, 206, 83, 1, 228, 243, 248, 212, 206, 83, 1, 230, 101, 248, - 212, 206, 83, 1, 235, 253, 248, 212, 206, 83, 1, 204, 111, 248, 212, 206, - 83, 1, 202, 17, 248, 212, 206, 83, 1, 238, 194, 248, 212, 206, 83, 1, - 243, 113, 248, 212, 206, 83, 1, 246, 238, 248, 212, 206, 83, 1, 206, 171, - 248, 212, 206, 83, 1, 135, 248, 212, 206, 83, 1, 249, 32, 248, 212, 206, - 83, 1, 204, 163, 248, 212, 206, 83, 1, 203, 46, 248, 212, 206, 83, 1, - 185, 248, 212, 206, 83, 1, 204, 108, 248, 212, 206, 83, 1, 63, 248, 212, - 206, 83, 1, 78, 248, 212, 206, 83, 1, 220, 18, 248, 212, 206, 83, 1, 68, - 248, 212, 206, 83, 1, 241, 161, 248, 212, 206, 83, 1, 74, 248, 212, 206, - 83, 1, 75, 248, 212, 206, 83, 39, 138, 208, 161, 248, 212, 206, 83, 39, - 124, 208, 161, 248, 212, 206, 83, 39, 224, 150, 208, 161, 248, 212, 206, - 83, 39, 226, 253, 208, 161, 248, 212, 206, 83, 39, 236, 242, 208, 161, - 248, 212, 206, 83, 239, 102, 211, 61, 119, 117, 22, 229, 197, 119, 117, - 22, 229, 193, 119, 117, 22, 229, 97, 119, 117, 22, 229, 63, 119, 117, 22, - 229, 218, 119, 117, 22, 229, 215, 119, 117, 22, 228, 200, 119, 117, 22, - 228, 172, 119, 117, 22, 229, 199, 119, 117, 22, 229, 154, 119, 117, 22, - 230, 17, 119, 117, 22, 230, 14, 119, 117, 22, 229, 5, 119, 117, 22, 229, - 2, 119, 117, 22, 229, 212, 119, 117, 22, 229, 210, 119, 117, 22, 228, - 202, 119, 117, 22, 228, 201, 119, 117, 22, 229, 23, 119, 117, 22, 228, - 247, 119, 117, 22, 229, 99, 119, 117, 22, 229, 98, 119, 117, 22, 230, 32, - 119, 117, 22, 229, 214, 119, 117, 22, 228, 163, 119, 117, 22, 228, 154, - 119, 117, 22, 230, 40, 119, 117, 22, 230, 33, 119, 117, 109, 206, 61, - 119, 117, 109, 221, 90, 119, 117, 109, 227, 251, 119, 117, 109, 237, 76, - 119, 117, 109, 221, 230, 119, 117, 109, 216, 167, 119, 117, 109, 222, 1, - 119, 117, 109, 217, 100, 119, 117, 109, 203, 62, 119, 117, 109, 236, 221, - 119, 117, 109, 225, 67, 119, 117, 109, 246, 174, 119, 117, 109, 223, 28, - 119, 117, 109, 236, 157, 119, 117, 109, 218, 85, 119, 117, 109, 221, 95, - 119, 117, 109, 223, 65, 119, 117, 109, 250, 34, 119, 117, 109, 203, 178, - 119, 117, 109, 247, 15, 119, 117, 131, 246, 67, 207, 199, 119, 117, 131, - 246, 67, 212, 13, 119, 117, 131, 246, 67, 229, 172, 119, 117, 131, 246, - 67, 229, 130, 119, 117, 131, 246, 67, 211, 4, 119, 117, 131, 246, 67, - 236, 123, 119, 117, 131, 246, 67, 209, 206, 119, 117, 2, 205, 173, 209, - 44, 119, 117, 2, 205, 173, 208, 9, 246, 229, 119, 117, 2, 246, 67, 246, - 163, 119, 117, 2, 205, 173, 209, 69, 119, 117, 2, 205, 173, 240, 50, 119, - 117, 2, 203, 136, 221, 85, 119, 117, 2, 203, 136, 216, 59, 119, 117, 2, - 203, 136, 208, 124, 119, 117, 2, 203, 136, 240, 89, 119, 117, 2, 205, - 173, 214, 159, 119, 117, 2, 225, 6, 211, 8, 119, 117, 2, 205, 173, 221, - 134, 119, 117, 2, 235, 167, 203, 81, 119, 117, 2, 203, 177, 119, 117, 2, - 246, 67, 207, 252, 215, 216, 119, 117, 17, 202, 84, 119, 117, 17, 105, - 119, 117, 17, 108, 119, 117, 17, 147, 119, 117, 17, 149, 119, 117, 17, - 170, 119, 117, 17, 195, 119, 117, 17, 213, 111, 119, 117, 17, 199, 119, - 117, 17, 222, 63, 119, 117, 42, 209, 147, 119, 117, 42, 236, 10, 119, - 117, 42, 209, 153, 209, 34, 119, 117, 42, 224, 113, 119, 117, 42, 236, - 12, 224, 113, 119, 117, 42, 209, 153, 248, 68, 119, 117, 42, 208, 72, - 119, 117, 2, 205, 173, 226, 234, 119, 117, 2, 203, 133, 119, 117, 2, 236, - 216, 119, 117, 2, 209, 59, 236, 216, 119, 117, 2, 201, 247, 209, 102, - 119, 117, 2, 236, 141, 119, 117, 2, 221, 148, 119, 117, 2, 203, 169, 119, - 117, 2, 221, 88, 119, 117, 2, 250, 18, 119, 117, 2, 207, 129, 246, 228, - 119, 117, 2, 225, 6, 208, 12, 119, 117, 2, 209, 207, 119, 117, 2, 227, 7, - 119, 117, 2, 223, 201, 119, 117, 2, 246, 67, 237, 143, 226, 212, 221, 93, - 221, 92, 119, 117, 2, 246, 67, 245, 109, 208, 3, 119, 117, 2, 246, 67, - 207, 127, 119, 117, 2, 246, 67, 207, 128, 246, 86, 119, 117, 2, 246, 67, - 217, 186, 244, 135, 119, 117, 2, 246, 67, 221, 141, 208, 132, 119, 117, - 246, 39, 2, 208, 7, 119, 117, 246, 39, 2, 203, 48, 119, 117, 246, 39, 2, - 227, 93, 119, 117, 246, 39, 2, 227, 250, 119, 117, 246, 39, 2, 203, 132, - 119, 117, 246, 39, 2, 229, 6, 119, 117, 246, 39, 2, 237, 73, 119, 117, - 246, 39, 2, 223, 242, 119, 117, 246, 39, 2, 209, 45, 119, 117, 246, 39, - 2, 208, 17, 119, 117, 246, 39, 2, 218, 205, 119, 117, 246, 39, 2, 229, - 142, 119, 117, 246, 39, 2, 237, 133, 119, 117, 246, 39, 2, 206, 80, 119, - 117, 246, 39, 2, 240, 86, 119, 117, 246, 39, 2, 203, 88, 119, 117, 246, - 39, 2, 207, 246, 119, 117, 246, 39, 2, 228, 158, 119, 117, 246, 39, 2, - 204, 153, 111, 1, 185, 111, 1, 249, 32, 111, 1, 11, 185, 111, 1, 218, 98, - 111, 1, 192, 111, 1, 224, 158, 111, 1, 250, 126, 192, 111, 1, 240, 108, - 111, 1, 206, 86, 111, 1, 205, 231, 111, 1, 210, 22, 111, 1, 244, 212, - 111, 1, 11, 207, 241, 111, 1, 11, 210, 22, 111, 1, 207, 241, 111, 1, 244, - 120, 111, 1, 201, 201, 111, 1, 222, 104, 111, 1, 11, 221, 227, 111, 1, - 250, 126, 201, 201, 111, 1, 221, 227, 111, 1, 221, 213, 111, 1, 228, 113, - 111, 1, 226, 198, 111, 1, 227, 161, 111, 1, 227, 150, 111, 1, 208, 187, - 111, 1, 243, 121, 111, 1, 208, 179, 111, 1, 243, 120, 111, 1, 173, 111, - 1, 239, 8, 111, 1, 11, 173, 111, 1, 217, 126, 111, 1, 217, 103, 111, 1, - 222, 203, 111, 1, 222, 152, 111, 1, 250, 126, 222, 203, 111, 1, 152, 111, - 1, 203, 182, 111, 1, 238, 119, 111, 1, 238, 94, 111, 1, 207, 251, 111, 1, - 241, 239, 111, 1, 221, 11, 111, 1, 220, 250, 111, 1, 208, 10, 111, 1, - 241, 249, 111, 1, 11, 208, 10, 111, 1, 11, 241, 249, 111, 1, 216, 133, - 208, 10, 111, 1, 213, 90, 111, 1, 211, 164, 111, 1, 202, 80, 111, 1, 202, - 8, 111, 1, 208, 20, 111, 1, 241, 255, 111, 1, 11, 208, 20, 111, 1, 215, - 36, 111, 1, 202, 116, 111, 1, 202, 9, 111, 1, 201, 235, 111, 1, 201, 215, - 111, 1, 250, 126, 201, 235, 111, 1, 201, 207, 111, 1, 201, 214, 111, 1, - 204, 111, 111, 1, 251, 73, 111, 1, 237, 12, 111, 1, 223, 70, 111, 2, 250, - 65, 111, 2, 216, 133, 205, 184, 111, 2, 216, 133, 250, 65, 111, 22, 2, - 63, 111, 22, 2, 252, 25, 111, 22, 2, 251, 69, 111, 22, 2, 250, 231, 111, - 22, 2, 250, 223, 111, 22, 2, 78, 111, 22, 2, 220, 18, 111, 22, 2, 204, 0, - 111, 22, 2, 204, 144, 111, 22, 2, 74, 111, 22, 2, 241, 92, 111, 22, 2, - 241, 78, 111, 22, 2, 220, 70, 111, 22, 2, 75, 111, 22, 2, 235, 171, 111, - 22, 2, 235, 170, 111, 22, 2, 235, 169, 111, 22, 2, 230, 234, 111, 22, 2, - 231, 110, 111, 22, 2, 231, 83, 111, 22, 2, 230, 197, 111, 22, 2, 231, 24, - 111, 22, 2, 68, 111, 22, 2, 207, 39, 111, 22, 2, 207, 38, 111, 22, 2, - 207, 37, 111, 22, 2, 206, 178, 111, 22, 2, 207, 21, 111, 22, 2, 206, 241, - 111, 22, 2, 203, 124, 111, 22, 2, 203, 11, 111, 22, 2, 251, 109, 111, 22, - 2, 251, 105, 111, 22, 2, 241, 21, 111, 22, 2, 215, 189, 241, 21, 111, 22, - 2, 241, 28, 111, 22, 2, 215, 189, 241, 28, 111, 22, 2, 251, 64, 111, 22, - 2, 241, 145, 111, 22, 2, 250, 34, 111, 22, 2, 219, 216, 111, 22, 2, 223, - 163, 111, 22, 2, 222, 205, 111, 143, 216, 16, 111, 143, 208, 145, 216, - 16, 111, 143, 55, 111, 143, 56, 111, 1, 208, 159, 111, 1, 208, 158, 111, - 1, 208, 157, 111, 1, 208, 156, 111, 1, 208, 155, 111, 1, 208, 154, 111, - 1, 208, 153, 111, 1, 216, 133, 208, 160, 111, 1, 216, 133, 208, 159, 111, - 1, 216, 133, 208, 157, 111, 1, 216, 133, 208, 156, 111, 1, 216, 133, 208, - 155, 111, 1, 216, 133, 208, 153, 67, 1, 250, 126, 74, 172, 1, 250, 126, - 203, 52, 100, 1, 237, 171, 100, 1, 203, 196, 100, 1, 219, 184, 100, 1, - 210, 69, 100, 1, 240, 174, 100, 1, 230, 54, 100, 1, 159, 100, 1, 249, - 255, 100, 1, 245, 51, 100, 1, 206, 164, 100, 1, 239, 75, 100, 1, 146, - 100, 1, 219, 185, 223, 163, 100, 1, 245, 52, 194, 100, 1, 240, 175, 223, - 163, 100, 1, 230, 55, 226, 185, 100, 1, 217, 1, 194, 100, 1, 209, 110, - 100, 1, 212, 45, 244, 2, 100, 1, 244, 2, 100, 1, 229, 48, 100, 1, 212, - 45, 230, 184, 100, 1, 236, 225, 100, 1, 227, 162, 100, 1, 216, 62, 100, - 1, 226, 185, 100, 1, 223, 163, 100, 1, 230, 184, 100, 1, 194, 100, 1, - 226, 186, 223, 163, 100, 1, 223, 164, 226, 185, 100, 1, 230, 185, 226, - 185, 100, 1, 215, 94, 230, 184, 100, 1, 226, 186, 3, 243, 85, 100, 1, - 223, 164, 3, 243, 85, 100, 1, 230, 185, 3, 243, 85, 100, 1, 230, 185, 3, - 187, 231, 7, 25, 55, 100, 1, 215, 94, 3, 243, 85, 100, 1, 215, 94, 3, 70, - 56, 100, 1, 226, 186, 194, 100, 1, 223, 164, 194, 100, 1, 230, 185, 194, - 100, 1, 215, 94, 194, 100, 1, 226, 186, 223, 164, 194, 100, 1, 223, 164, - 226, 186, 194, 100, 1, 230, 185, 226, 186, 194, 100, 1, 215, 94, 230, - 185, 194, 100, 1, 230, 185, 215, 94, 3, 243, 85, 100, 1, 230, 185, 223, - 163, 100, 1, 230, 185, 223, 164, 194, 100, 1, 215, 94, 210, 69, 100, 1, - 215, 94, 210, 70, 146, 100, 1, 215, 94, 219, 184, 100, 1, 215, 94, 219, - 185, 146, 100, 1, 210, 70, 194, 100, 1, 210, 70, 217, 1, 194, 100, 1, - 204, 144, 100, 1, 204, 40, 100, 1, 204, 145, 146, 100, 1, 215, 94, 223, - 163, 100, 1, 215, 94, 226, 185, 100, 1, 230, 55, 217, 1, 194, 100, 1, - 239, 76, 217, 1, 194, 100, 1, 215, 94, 230, 54, 100, 1, 215, 94, 230, 55, - 146, 100, 1, 63, 100, 1, 212, 45, 219, 195, 100, 1, 220, 97, 100, 1, 78, - 100, 1, 250, 176, 100, 1, 75, 100, 1, 74, 100, 1, 231, 110, 100, 1, 212, - 228, 75, 100, 1, 207, 17, 100, 1, 241, 161, 100, 1, 212, 45, 241, 147, - 100, 1, 215, 209, 75, 100, 1, 212, 45, 241, 161, 100, 1, 163, 75, 100, 1, - 203, 52, 100, 1, 68, 100, 1, 240, 238, 100, 1, 203, 147, 100, 1, 106, - 223, 163, 100, 1, 163, 68, 100, 1, 215, 209, 68, 100, 1, 207, 18, 100, 1, - 212, 45, 68, 100, 1, 220, 15, 100, 1, 219, 195, 100, 1, 219, 216, 100, 1, - 204, 111, 100, 1, 204, 0, 100, 1, 204, 30, 100, 1, 204, 53, 100, 1, 203, - 230, 100, 1, 223, 72, 68, 100, 1, 223, 72, 78, 100, 1, 223, 72, 75, 100, - 1, 223, 72, 63, 100, 1, 218, 235, 250, 231, 100, 1, 218, 235, 250, 247, - 100, 1, 212, 45, 241, 92, 100, 1, 212, 45, 250, 231, 100, 1, 212, 45, - 220, 31, 100, 1, 125, 226, 185, 100, 251, 88, 49, 236, 106, 214, 172, - 100, 251, 88, 224, 150, 236, 106, 214, 172, 100, 251, 88, 50, 236, 106, - 214, 172, 100, 251, 88, 124, 80, 214, 172, 100, 251, 88, 224, 150, 80, - 214, 172, 100, 251, 88, 138, 80, 214, 172, 100, 251, 88, 250, 40, 214, - 172, 100, 251, 88, 250, 40, 227, 213, 214, 172, 100, 251, 88, 250, 40, - 209, 226, 100, 251, 88, 250, 40, 209, 248, 100, 251, 88, 250, 40, 188, - 113, 100, 251, 88, 250, 40, 235, 206, 113, 100, 251, 88, 250, 40, 209, - 227, 113, 100, 251, 88, 138, 165, 100, 251, 88, 138, 208, 244, 165, 100, - 251, 88, 138, 237, 253, 100, 251, 88, 138, 163, 237, 253, 100, 251, 88, - 138, 243, 85, 100, 251, 88, 138, 246, 61, 100, 251, 88, 138, 227, 114, - 100, 251, 88, 138, 204, 75, 100, 251, 88, 138, 206, 38, 100, 251, 88, - 124, 165, 100, 251, 88, 124, 208, 244, 165, 100, 251, 88, 124, 237, 253, - 100, 251, 88, 124, 163, 237, 253, 100, 251, 88, 124, 243, 85, 100, 251, - 88, 124, 246, 61, 100, 251, 88, 124, 227, 114, 100, 251, 88, 124, 204, - 75, 100, 251, 88, 124, 206, 38, 100, 251, 88, 124, 47, 100, 2, 158, 3, - 245, 130, 100, 209, 68, 1, 214, 150, 100, 52, 82, 100, 217, 179, 246, - 126, 239, 102, 211, 61, 212, 215, 239, 158, 1, 219, 201, 212, 215, 239, - 158, 245, 190, 219, 201, 212, 215, 239, 158, 121, 211, 75, 212, 215, 239, - 158, 112, 211, 75, 60, 31, 16, 217, 195, 60, 31, 16, 244, 146, 60, 31, - 16, 218, 239, 60, 31, 16, 219, 192, 241, 126, 60, 31, 16, 219, 192, 243, - 171, 60, 31, 16, 206, 73, 241, 126, 60, 31, 16, 206, 73, 243, 171, 60, - 31, 16, 229, 221, 60, 31, 16, 210, 86, 60, 31, 16, 219, 83, 60, 31, 16, - 202, 219, 60, 31, 16, 202, 220, 243, 171, 60, 31, 16, 228, 226, 60, 31, - 16, 250, 171, 241, 126, 60, 31, 16, 240, 206, 241, 126, 60, 31, 16, 209, - 163, 60, 31, 16, 229, 176, 60, 31, 16, 250, 161, 60, 31, 16, 250, 162, - 243, 171, 60, 31, 16, 210, 93, 60, 31, 16, 209, 50, 60, 31, 16, 220, 42, - 250, 124, 60, 31, 16, 238, 23, 250, 124, 60, 31, 16, 217, 194, 60, 31, - 16, 246, 190, 60, 31, 16, 206, 62, 60, 31, 16, 230, 206, 250, 124, 60, - 31, 16, 229, 178, 250, 124, 60, 31, 16, 229, 177, 250, 124, 60, 31, 16, - 214, 210, 60, 31, 16, 219, 73, 60, 31, 16, 211, 84, 250, 164, 60, 31, 16, - 219, 191, 250, 124, 60, 31, 16, 206, 72, 250, 124, 60, 31, 16, 250, 165, - 250, 124, 60, 31, 16, 250, 159, 60, 31, 16, 229, 38, 60, 31, 16, 216, 69, - 60, 31, 16, 218, 165, 250, 124, 60, 31, 16, 208, 217, 60, 31, 16, 250, - 229, 60, 31, 16, 214, 153, 60, 31, 16, 210, 97, 250, 124, 60, 31, 16, - 210, 97, 224, 221, 211, 82, 60, 31, 16, 219, 186, 250, 124, 60, 31, 16, - 209, 86, 60, 31, 16, 227, 200, 60, 31, 16, 242, 2, 60, 31, 16, 208, 87, - 60, 31, 16, 209, 134, 60, 31, 16, 228, 229, 60, 31, 16, 250, 171, 240, - 206, 222, 226, 60, 31, 16, 239, 110, 250, 124, 60, 31, 16, 231, 62, 60, - 31, 16, 208, 57, 250, 124, 60, 31, 16, 229, 224, 208, 56, 60, 31, 16, - 219, 11, 60, 31, 16, 217, 199, 60, 31, 16, 229, 7, 60, 31, 16, 246, 110, - 250, 124, 60, 31, 16, 216, 177, 60, 31, 16, 219, 86, 250, 124, 60, 31, - 16, 219, 84, 250, 124, 60, 31, 16, 235, 160, 60, 31, 16, 223, 82, 60, 31, - 16, 218, 217, 60, 31, 16, 229, 8, 251, 9, 60, 31, 16, 208, 57, 251, 9, - 60, 31, 16, 211, 55, 60, 31, 16, 237, 240, 60, 31, 16, 230, 206, 222, - 226, 60, 31, 16, 220, 42, 222, 226, 60, 31, 16, 219, 192, 222, 226, 60, - 31, 16, 218, 216, 60, 31, 16, 228, 248, 60, 31, 16, 218, 215, 60, 31, 16, - 228, 228, 60, 31, 16, 219, 12, 222, 226, 60, 31, 16, 229, 177, 222, 227, - 250, 202, 60, 31, 16, 229, 178, 222, 227, 250, 202, 60, 31, 16, 202, 217, - 60, 31, 16, 250, 162, 222, 226, 60, 31, 16, 250, 163, 210, 94, 222, 226, - 60, 31, 16, 202, 218, 60, 31, 16, 228, 227, 60, 31, 16, 241, 121, 60, 31, - 16, 246, 191, 60, 31, 16, 224, 122, 230, 205, 60, 31, 16, 206, 73, 222, - 226, 60, 31, 16, 218, 165, 222, 226, 60, 31, 16, 217, 200, 222, 226, 60, - 31, 16, 220, 38, 60, 31, 16, 250, 189, 60, 31, 16, 226, 195, 60, 31, 16, - 219, 84, 222, 226, 60, 31, 16, 219, 86, 222, 226, 60, 31, 16, 240, 244, - 219, 85, 60, 31, 16, 228, 135, 60, 31, 16, 250, 190, 60, 31, 16, 208, 57, - 222, 226, 60, 31, 16, 241, 124, 60, 31, 16, 210, 97, 222, 226, 60, 31, - 16, 210, 87, 60, 31, 16, 246, 110, 222, 226, 60, 31, 16, 241, 43, 60, 31, - 16, 214, 154, 222, 226, 60, 31, 16, 203, 163, 229, 38, 60, 31, 16, 208, - 54, 60, 31, 16, 217, 201, 60, 31, 16, 208, 58, 60, 31, 16, 208, 55, 60, - 31, 16, 217, 198, 60, 31, 16, 208, 53, 60, 31, 16, 217, 197, 60, 31, 16, - 238, 22, 60, 31, 16, 250, 116, 60, 31, 16, 240, 244, 250, 116, 60, 31, - 16, 219, 186, 222, 226, 60, 31, 16, 209, 85, 241, 1, 60, 31, 16, 209, 85, - 240, 205, 60, 31, 16, 209, 87, 250, 166, 60, 31, 16, 209, 79, 230, 19, - 250, 158, 60, 31, 16, 229, 223, 60, 31, 16, 241, 80, 60, 31, 16, 203, 14, - 229, 220, 60, 31, 16, 203, 14, 250, 202, 60, 31, 16, 211, 83, 60, 31, 16, - 229, 39, 250, 202, 60, 31, 16, 243, 172, 250, 124, 60, 31, 16, 228, 230, - 250, 124, 60, 31, 16, 228, 230, 251, 9, 60, 31, 16, 228, 230, 222, 226, - 60, 31, 16, 250, 165, 222, 226, 60, 31, 16, 250, 167, 60, 31, 16, 243, - 171, 60, 31, 16, 208, 68, 60, 31, 16, 209, 125, 60, 31, 16, 228, 252, 60, - 31, 16, 227, 205, 241, 73, 246, 100, 60, 31, 16, 227, 205, 242, 3, 246, - 101, 60, 31, 16, 227, 205, 208, 71, 246, 101, 60, 31, 16, 227, 205, 209, - 136, 246, 101, 60, 31, 16, 227, 205, 231, 57, 246, 100, 60, 31, 16, 238, - 23, 222, 227, 250, 202, 60, 31, 16, 238, 23, 219, 74, 250, 112, 60, 31, - 16, 238, 23, 219, 74, 244, 6, 60, 31, 16, 243, 196, 60, 31, 16, 243, 197, - 219, 74, 250, 113, 229, 220, 60, 31, 16, 243, 197, 219, 74, 250, 113, - 250, 202, 60, 31, 16, 243, 197, 219, 74, 244, 6, 60, 31, 16, 208, 76, 60, - 31, 16, 250, 117, 60, 31, 16, 231, 64, 60, 31, 16, 243, 219, 60, 31, 16, - 251, 75, 218, 52, 250, 118, 60, 31, 16, 251, 75, 250, 115, 60, 31, 16, - 251, 75, 250, 118, 60, 31, 16, 251, 75, 224, 215, 60, 31, 16, 251, 75, - 224, 226, 60, 31, 16, 251, 75, 238, 24, 60, 31, 16, 251, 75, 238, 21, 60, - 31, 16, 251, 75, 218, 52, 238, 24, 60, 31, 16, 225, 84, 217, 207, 235, - 158, 60, 31, 16, 225, 84, 251, 11, 217, 207, 235, 158, 60, 31, 16, 225, - 84, 244, 5, 235, 158, 60, 31, 16, 225, 84, 251, 11, 244, 5, 235, 158, 60, - 31, 16, 225, 84, 208, 63, 235, 158, 60, 31, 16, 225, 84, 208, 77, 60, 31, - 16, 225, 84, 209, 130, 235, 158, 60, 31, 16, 225, 84, 209, 130, 227, 209, - 235, 158, 60, 31, 16, 225, 84, 227, 209, 235, 158, 60, 31, 16, 225, 84, - 218, 95, 235, 158, 60, 31, 16, 230, 213, 209, 156, 235, 159, 60, 31, 16, - 250, 163, 209, 156, 235, 159, 60, 31, 16, 240, 80, 209, 127, 60, 31, 16, - 240, 80, 224, 46, 60, 31, 16, 240, 80, 243, 202, 60, 31, 16, 225, 84, - 206, 66, 235, 158, 60, 31, 16, 225, 84, 217, 206, 235, 158, 60, 31, 16, - 225, 84, 218, 95, 209, 130, 235, 158, 60, 31, 16, 238, 19, 223, 164, 250, - 166, 60, 31, 16, 238, 19, 223, 164, 243, 170, 60, 31, 16, 241, 90, 230, - 19, 239, 110, 205, 171, 60, 31, 16, 231, 63, 60, 31, 16, 231, 61, 60, 31, - 16, 239, 110, 250, 125, 244, 4, 235, 157, 60, 31, 16, 239, 110, 243, 217, - 185, 60, 31, 16, 239, 110, 243, 217, 223, 82, 60, 31, 16, 239, 110, 223, - 77, 235, 158, 60, 31, 16, 239, 110, 243, 217, 243, 233, 60, 31, 16, 239, - 110, 212, 64, 243, 216, 243, 233, 60, 31, 16, 239, 110, 243, 217, 229, - 201, 60, 31, 16, 239, 110, 243, 217, 202, 17, 60, 31, 16, 239, 110, 243, - 217, 222, 101, 229, 220, 60, 31, 16, 239, 110, 243, 217, 222, 101, 250, - 202, 60, 31, 16, 239, 110, 225, 128, 246, 102, 243, 202, 60, 31, 16, 239, - 110, 225, 128, 246, 102, 224, 46, 60, 31, 16, 240, 27, 212, 64, 246, 102, - 206, 65, 60, 31, 16, 239, 110, 212, 64, 246, 102, 210, 98, 60, 31, 16, - 239, 110, 222, 229, 60, 31, 16, 246, 103, 201, 241, 60, 31, 16, 246, 103, - 229, 37, 60, 31, 16, 246, 103, 211, 219, 60, 31, 16, 239, 110, 235, 206, - 203, 13, 209, 131, 60, 31, 16, 239, 110, 241, 91, 250, 191, 60, 31, 16, - 203, 13, 208, 64, 60, 31, 16, 243, 210, 208, 64, 60, 31, 16, 243, 210, - 209, 131, 60, 31, 16, 243, 210, 250, 168, 242, 3, 243, 105, 60, 31, 16, - 243, 210, 224, 44, 209, 135, 243, 105, 60, 31, 16, 243, 210, 243, 193, - 240, 218, 243, 105, 60, 31, 16, 243, 210, 208, 74, 220, 48, 243, 105, 60, - 31, 16, 203, 13, 250, 168, 242, 3, 243, 105, 60, 31, 16, 203, 13, 224, - 44, 209, 135, 243, 105, 60, 31, 16, 203, 13, 243, 193, 240, 218, 243, - 105, 60, 31, 16, 203, 13, 208, 74, 220, 48, 243, 105, 60, 31, 16, 238, - 175, 243, 209, 60, 31, 16, 238, 175, 203, 12, 60, 31, 16, 243, 218, 250, - 168, 224, 123, 60, 31, 16, 243, 218, 250, 168, 224, 255, 60, 31, 16, 243, - 218, 243, 171, 60, 31, 16, 243, 218, 209, 77, 60, 31, 16, 212, 130, 209, - 77, 60, 31, 16, 212, 130, 209, 78, 243, 155, 60, 31, 16, 212, 130, 209, - 78, 208, 65, 60, 31, 16, 212, 130, 209, 78, 209, 123, 60, 31, 16, 212, - 130, 250, 88, 60, 31, 16, 212, 130, 250, 89, 243, 155, 60, 31, 16, 212, - 130, 250, 89, 208, 65, 60, 31, 16, 212, 130, 250, 89, 209, 123, 60, 31, - 16, 243, 194, 238, 156, 60, 31, 16, 243, 201, 219, 216, 60, 31, 16, 211, - 71, 60, 31, 16, 250, 109, 185, 60, 31, 16, 250, 109, 205, 171, 60, 31, - 16, 250, 109, 239, 8, 60, 31, 16, 250, 109, 243, 233, 60, 31, 16, 250, - 109, 229, 201, 60, 31, 16, 250, 109, 202, 17, 60, 31, 16, 250, 109, 222, - 100, 60, 31, 16, 229, 177, 222, 227, 224, 225, 60, 31, 16, 229, 178, 222, - 227, 224, 225, 60, 31, 16, 229, 177, 222, 227, 229, 220, 60, 31, 16, 229, - 178, 222, 227, 229, 220, 60, 31, 16, 229, 39, 229, 220, 60, 31, 16, 238, - 23, 222, 227, 229, 220, 31, 16, 212, 120, 248, 226, 31, 16, 52, 248, 226, - 31, 16, 46, 248, 226, 31, 16, 216, 74, 46, 248, 226, 31, 16, 244, 143, - 248, 226, 31, 16, 212, 228, 248, 226, 31, 16, 49, 216, 101, 54, 31, 16, - 50, 216, 101, 54, 31, 16, 216, 101, 243, 83, 31, 16, 244, 185, 214, 157, - 31, 16, 244, 213, 247, 45, 31, 16, 214, 157, 31, 16, 245, 250, 31, 16, - 216, 99, 240, 15, 31, 16, 216, 99, 240, 14, 31, 16, 216, 99, 240, 13, 31, - 16, 240, 36, 31, 16, 240, 37, 56, 31, 16, 247, 216, 82, 31, 16, 247, 82, - 31, 16, 247, 228, 31, 16, 155, 31, 16, 220, 28, 211, 102, 31, 16, 207, - 133, 211, 102, 31, 16, 209, 29, 211, 102, 31, 16, 239, 146, 211, 102, 31, - 16, 239, 232, 211, 102, 31, 16, 212, 87, 211, 102, 31, 16, 212, 85, 239, - 127, 31, 16, 239, 144, 239, 127, 31, 16, 239, 76, 246, 30, 31, 16, 239, - 76, 246, 31, 219, 218, 251, 0, 31, 16, 239, 76, 246, 31, 219, 218, 248, - 211, 31, 16, 247, 126, 246, 30, 31, 16, 240, 175, 246, 30, 31, 16, 240, - 175, 246, 31, 219, 218, 251, 0, 31, 16, 240, 175, 246, 31, 219, 218, 248, - 211, 31, 16, 242, 47, 246, 29, 31, 16, 242, 47, 246, 28, 31, 16, 223, - 226, 225, 19, 216, 85, 31, 16, 52, 213, 56, 31, 16, 52, 239, 216, 31, 16, - 239, 217, 206, 224, 31, 16, 239, 217, 242, 70, 31, 16, 223, 66, 206, 224, - 31, 16, 223, 66, 242, 70, 31, 16, 213, 57, 206, 224, 31, 16, 213, 57, - 242, 70, 31, 16, 217, 56, 143, 213, 56, 31, 16, 217, 56, 143, 239, 216, - 31, 16, 245, 230, 208, 221, 31, 16, 245, 78, 208, 221, 31, 16, 219, 218, - 251, 0, 31, 16, 219, 218, 248, 211, 31, 16, 217, 37, 251, 0, 31, 16, 217, - 37, 248, 211, 31, 16, 223, 229, 216, 85, 31, 16, 204, 31, 216, 85, 31, - 16, 162, 216, 85, 31, 16, 217, 56, 216, 85, 31, 16, 241, 139, 216, 85, - 31, 16, 212, 81, 216, 85, 31, 16, 209, 51, 216, 85, 31, 16, 212, 73, 216, - 85, 31, 16, 118, 236, 12, 207, 149, 216, 85, 31, 16, 203, 197, 221, 156, - 31, 16, 91, 221, 156, 31, 16, 246, 62, 203, 197, 221, 156, 31, 16, 51, - 221, 157, 204, 33, 31, 16, 51, 221, 157, 248, 43, 31, 16, 208, 86, 221, - 157, 112, 204, 33, 31, 16, 208, 86, 221, 157, 112, 248, 43, 31, 16, 208, - 86, 221, 157, 49, 204, 33, 31, 16, 208, 86, 221, 157, 49, 248, 43, 31, - 16, 208, 86, 221, 157, 50, 204, 33, 31, 16, 208, 86, 221, 157, 50, 248, - 43, 31, 16, 208, 86, 221, 157, 121, 204, 33, 31, 16, 208, 86, 221, 157, - 121, 248, 43, 31, 16, 208, 86, 221, 157, 112, 50, 204, 33, 31, 16, 208, - 86, 221, 157, 112, 50, 248, 43, 31, 16, 224, 30, 221, 157, 204, 33, 31, - 16, 224, 30, 221, 157, 248, 43, 31, 16, 208, 83, 221, 157, 121, 204, 33, - 31, 16, 208, 83, 221, 157, 121, 248, 43, 31, 16, 219, 77, 221, 156, 31, - 16, 205, 183, 221, 156, 31, 16, 221, 157, 248, 43, 31, 16, 221, 49, 221, - 156, 31, 16, 246, 1, 221, 157, 204, 33, 31, 16, 246, 1, 221, 157, 248, - 43, 31, 16, 247, 214, 31, 16, 204, 31, 221, 160, 31, 16, 162, 221, 160, - 31, 16, 217, 56, 221, 160, 31, 16, 241, 139, 221, 160, 31, 16, 212, 81, - 221, 160, 31, 16, 209, 51, 221, 160, 31, 16, 212, 73, 221, 160, 31, 16, - 118, 236, 12, 207, 149, 221, 160, 31, 16, 39, 211, 77, 31, 16, 39, 211, - 184, 211, 77, 31, 16, 39, 208, 94, 31, 16, 39, 208, 93, 31, 16, 39, 208, - 92, 31, 16, 240, 0, 208, 94, 31, 16, 240, 0, 208, 93, 31, 16, 240, 0, - 208, 92, 31, 16, 39, 250, 31, 243, 85, 31, 16, 39, 239, 224, 31, 16, 39, - 239, 223, 31, 16, 39, 239, 222, 31, 16, 39, 239, 221, 31, 16, 39, 239, - 220, 31, 16, 248, 142, 248, 159, 31, 16, 241, 84, 248, 159, 31, 16, 248, - 142, 208, 250, 31, 16, 241, 84, 208, 250, 31, 16, 248, 142, 212, 37, 31, - 16, 241, 84, 212, 37, 31, 16, 248, 142, 218, 174, 31, 16, 241, 84, 218, - 174, 31, 16, 39, 251, 138, 31, 16, 39, 211, 105, 31, 16, 39, 209, 140, - 31, 16, 39, 211, 106, 31, 16, 39, 225, 96, 31, 16, 39, 225, 95, 31, 16, - 39, 251, 137, 31, 16, 39, 227, 2, 31, 16, 250, 100, 206, 224, 31, 16, - 250, 100, 242, 70, 31, 16, 39, 243, 100, 31, 16, 39, 215, 249, 31, 16, - 39, 239, 206, 31, 16, 39, 212, 33, 31, 16, 39, 248, 120, 31, 16, 39, 52, - 208, 150, 31, 16, 39, 208, 70, 208, 150, 31, 16, 215, 254, 31, 16, 211, - 0, 31, 16, 202, 159, 31, 16, 218, 166, 31, 16, 224, 206, 31, 16, 239, - 155, 31, 16, 245, 140, 31, 16, 244, 62, 31, 16, 238, 14, 221, 161, 212, - 57, 31, 16, 238, 14, 221, 161, 221, 192, 212, 57, 31, 16, 208, 120, 31, - 16, 207, 175, 31, 16, 230, 239, 207, 175, 31, 16, 207, 176, 212, 57, 31, - 16, 207, 176, 206, 224, 31, 16, 219, 234, 211, 31, 31, 16, 219, 234, 211, - 28, 31, 16, 219, 234, 211, 27, 31, 16, 219, 234, 211, 26, 31, 16, 219, - 234, 211, 25, 31, 16, 219, 234, 211, 24, 31, 16, 219, 234, 211, 23, 31, - 16, 219, 234, 211, 22, 31, 16, 219, 234, 211, 21, 31, 16, 219, 234, 211, - 30, 31, 16, 219, 234, 211, 29, 31, 16, 237, 75, 31, 16, 222, 238, 31, 16, - 241, 84, 76, 211, 67, 31, 16, 244, 55, 212, 57, 31, 16, 39, 121, 247, - 240, 31, 16, 39, 112, 247, 240, 31, 16, 39, 237, 88, 31, 16, 39, 212, 23, - 218, 99, 31, 16, 219, 28, 82, 31, 16, 219, 28, 112, 82, 31, 16, 162, 219, - 28, 82, 31, 16, 238, 47, 206, 224, 31, 16, 238, 47, 242, 70, 31, 16, 3, - 239, 255, 31, 16, 244, 168, 31, 16, 244, 169, 251, 14, 31, 16, 225, 65, - 31, 16, 227, 20, 31, 16, 247, 211, 31, 16, 213, 147, 204, 33, 31, 16, - 213, 147, 248, 43, 31, 16, 224, 106, 31, 16, 224, 107, 248, 43, 31, 16, - 213, 141, 204, 33, 31, 16, 213, 141, 248, 43, 31, 16, 239, 93, 204, 33, - 31, 16, 239, 93, 248, 43, 31, 16, 227, 21, 218, 244, 216, 85, 31, 16, - 227, 21, 231, 54, 216, 85, 31, 16, 247, 212, 216, 85, 31, 16, 213, 147, - 216, 85, 31, 16, 224, 107, 216, 85, 31, 16, 213, 141, 216, 85, 31, 16, - 209, 154, 218, 242, 245, 104, 217, 216, 218, 243, 31, 16, 209, 154, 218, - 242, 245, 104, 217, 216, 231, 53, 31, 16, 209, 154, 218, 242, 245, 104, - 217, 216, 218, 244, 243, 181, 31, 16, 209, 154, 231, 52, 245, 104, 217, - 216, 218, 243, 31, 16, 209, 154, 231, 52, 245, 104, 217, 216, 231, 53, - 31, 16, 209, 154, 231, 52, 245, 104, 217, 216, 231, 54, 243, 181, 31, 16, - 209, 154, 231, 52, 245, 104, 217, 216, 231, 54, 243, 180, 31, 16, 209, - 154, 231, 52, 245, 104, 217, 216, 231, 54, 243, 179, 31, 16, 245, 133, - 31, 16, 237, 243, 247, 126, 246, 30, 31, 16, 237, 243, 240, 175, 246, 30, - 31, 16, 51, 249, 255, 31, 16, 205, 203, 31, 16, 218, 66, 31, 16, 246, 21, - 31, 16, 214, 200, 31, 16, 246, 25, 31, 16, 208, 138, 31, 16, 218, 36, 31, - 16, 218, 37, 239, 209, 31, 16, 214, 201, 239, 209, 31, 16, 208, 139, 216, - 82, 31, 16, 218, 225, 210, 247, 31, 16, 229, 90, 247, 126, 246, 30, 31, - 16, 229, 90, 241, 84, 76, 218, 159, 31, 16, 229, 90, 46, 221, 160, 31, - 16, 229, 90, 216, 150, 82, 31, 16, 229, 90, 204, 31, 221, 160, 31, 16, - 229, 90, 162, 221, 160, 31, 16, 229, 90, 217, 56, 221, 161, 211, 78, 242, - 70, 31, 16, 229, 90, 217, 56, 221, 161, 211, 78, 206, 224, 31, 16, 229, - 90, 241, 139, 221, 161, 211, 78, 242, 70, 31, 16, 229, 90, 241, 139, 221, - 161, 211, 78, 206, 224, 31, 16, 229, 90, 239, 217, 54, 30, 205, 188, 221, - 164, 210, 148, 30, 205, 188, 221, 164, 210, 137, 30, 205, 188, 221, 164, - 210, 127, 30, 205, 188, 221, 164, 210, 120, 30, 205, 188, 221, 164, 210, - 112, 30, 205, 188, 221, 164, 210, 106, 30, 205, 188, 221, 164, 210, 105, - 30, 205, 188, 221, 164, 210, 104, 30, 205, 188, 221, 164, 210, 103, 30, - 205, 188, 221, 164, 210, 147, 30, 205, 188, 221, 164, 210, 146, 30, 205, - 188, 221, 164, 210, 145, 30, 205, 188, 221, 164, 210, 144, 30, 205, 188, - 221, 164, 210, 143, 30, 205, 188, 221, 164, 210, 142, 30, 205, 188, 221, - 164, 210, 141, 30, 205, 188, 221, 164, 210, 140, 30, 205, 188, 221, 164, - 210, 139, 30, 205, 188, 221, 164, 210, 138, 30, 205, 188, 221, 164, 210, - 136, 30, 205, 188, 221, 164, 210, 135, 30, 205, 188, 221, 164, 210, 134, - 30, 205, 188, 221, 164, 210, 133, 30, 205, 188, 221, 164, 210, 132, 30, - 205, 188, 221, 164, 210, 111, 30, 205, 188, 221, 164, 210, 110, 30, 205, - 188, 221, 164, 210, 109, 30, 205, 188, 221, 164, 210, 108, 30, 205, 188, - 221, 164, 210, 107, 30, 231, 5, 221, 164, 210, 148, 30, 231, 5, 221, 164, - 210, 137, 30, 231, 5, 221, 164, 210, 120, 30, 231, 5, 221, 164, 210, 112, - 30, 231, 5, 221, 164, 210, 105, 30, 231, 5, 221, 164, 210, 104, 30, 231, - 5, 221, 164, 210, 146, 30, 231, 5, 221, 164, 210, 145, 30, 231, 5, 221, - 164, 210, 144, 30, 231, 5, 221, 164, 210, 143, 30, 231, 5, 221, 164, 210, - 140, 30, 231, 5, 221, 164, 210, 139, 30, 231, 5, 221, 164, 210, 138, 30, - 231, 5, 221, 164, 210, 133, 30, 231, 5, 221, 164, 210, 132, 30, 231, 5, - 221, 164, 210, 131, 30, 231, 5, 221, 164, 210, 130, 30, 231, 5, 221, 164, - 210, 129, 30, 231, 5, 221, 164, 210, 128, 30, 231, 5, 221, 164, 210, 126, - 30, 231, 5, 221, 164, 210, 125, 30, 231, 5, 221, 164, 210, 124, 30, 231, - 5, 221, 164, 210, 123, 30, 231, 5, 221, 164, 210, 122, 30, 231, 5, 221, - 164, 210, 121, 30, 231, 5, 221, 164, 210, 119, 30, 231, 5, 221, 164, 210, - 118, 30, 231, 5, 221, 164, 210, 117, 30, 231, 5, 221, 164, 210, 116, 30, - 231, 5, 221, 164, 210, 115, 30, 231, 5, 221, 164, 210, 114, 30, 231, 5, - 221, 164, 210, 113, 30, 231, 5, 221, 164, 210, 111, 30, 231, 5, 221, 164, - 210, 110, 30, 231, 5, 221, 164, 210, 109, 30, 231, 5, 221, 164, 210, 108, - 30, 231, 5, 221, 164, 210, 107, 39, 30, 31, 208, 66, 39, 30, 31, 209, - 124, 39, 30, 31, 218, 253, 30, 31, 227, 204, 224, 45, 35, 241, 179, 243, - 195, 35, 237, 50, 241, 179, 243, 195, 35, 236, 16, 241, 179, 243, 195, - 35, 241, 178, 237, 51, 243, 195, 35, 241, 178, 236, 15, 243, 195, 35, - 241, 179, 209, 126, 35, 246, 217, 209, 126, 35, 239, 102, 246, 61, 209, - 126, 35, 224, 98, 209, 126, 35, 248, 221, 209, 126, 35, 229, 195, 212, - 36, 209, 126, 35, 245, 185, 209, 126, 35, 250, 77, 209, 126, 35, 219, - 250, 209, 126, 35, 247, 221, 219, 211, 209, 126, 35, 244, 57, 219, 245, - 243, 148, 209, 126, 35, 243, 145, 209, 126, 35, 202, 225, 209, 126, 35, - 231, 40, 209, 126, 35, 219, 7, 209, 126, 35, 216, 157, 209, 126, 35, 245, - 197, 209, 126, 35, 236, 127, 249, 25, 209, 126, 35, 204, 103, 209, 126, - 35, 239, 181, 209, 126, 35, 251, 112, 209, 126, 35, 216, 114, 209, 126, - 35, 216, 89, 209, 126, 35, 241, 177, 209, 126, 35, 230, 85, 209, 126, 35, - 245, 192, 209, 126, 35, 241, 83, 209, 126, 35, 242, 15, 209, 126, 35, - 246, 186, 209, 126, 35, 244, 67, 209, 126, 35, 26, 216, 88, 209, 126, 35, - 219, 160, 209, 126, 35, 227, 208, 209, 126, 35, 246, 14, 209, 126, 35, - 229, 80, 209, 126, 35, 238, 214, 209, 126, 35, 211, 43, 209, 126, 35, - 217, 168, 209, 126, 35, 239, 101, 209, 126, 35, 216, 90, 209, 126, 35, - 227, 247, 219, 245, 224, 78, 209, 126, 35, 216, 86, 209, 126, 35, 238, - 33, 208, 173, 225, 3, 209, 126, 35, 241, 85, 209, 126, 35, 211, 56, 209, - 126, 35, 237, 245, 209, 126, 35, 241, 76, 209, 126, 35, 219, 50, 209, - 126, 35, 215, 242, 209, 126, 35, 239, 207, 209, 126, 35, 206, 64, 219, - 245, 204, 84, 209, 126, 35, 245, 202, 209, 126, 35, 225, 18, 209, 126, - 35, 240, 245, 209, 126, 35, 206, 234, 209, 126, 35, 243, 182, 209, 126, - 35, 246, 16, 224, 7, 209, 126, 35, 237, 222, 209, 126, 35, 238, 215, 231, - 49, 209, 126, 35, 225, 73, 209, 126, 35, 251, 133, 209, 126, 35, 241, - 101, 209, 126, 35, 242, 74, 209, 126, 35, 204, 82, 209, 126, 35, 212, - 115, 209, 126, 35, 231, 14, 209, 126, 35, 244, 25, 209, 126, 35, 244, - 148, 209, 126, 35, 243, 178, 209, 126, 35, 240, 209, 209, 126, 35, 213, - 104, 209, 126, 35, 211, 60, 209, 126, 35, 237, 90, 209, 126, 35, 245, - 226, 209, 126, 35, 246, 11, 209, 126, 35, 240, 87, 209, 126, 35, 251, 76, - 209, 126, 35, 245, 225, 209, 126, 35, 220, 32, 209, 93, 206, 41, 209, - 126, 35, 243, 204, 209, 126, 35, 228, 101, 209, 126, 35, 239, 150, 245, - 153, 215, 217, 206, 236, 17, 105, 245, 153, 215, 217, 206, 236, 17, 108, - 245, 153, 215, 217, 206, 236, 17, 147, 245, 153, 215, 217, 206, 236, 17, - 149, 245, 153, 215, 217, 206, 236, 17, 170, 245, 153, 215, 217, 206, 236, - 17, 195, 245, 153, 215, 217, 206, 236, 17, 213, 111, 245, 153, 215, 217, - 206, 236, 17, 199, 245, 153, 215, 217, 206, 236, 17, 222, 63, 245, 153, - 215, 217, 209, 148, 17, 105, 245, 153, 215, 217, 209, 148, 17, 108, 245, - 153, 215, 217, 209, 148, 17, 147, 245, 153, 215, 217, 209, 148, 17, 149, - 245, 153, 215, 217, 209, 148, 17, 170, 245, 153, 215, 217, 209, 148, 17, - 195, 245, 153, 215, 217, 209, 148, 17, 213, 111, 245, 153, 215, 217, 209, - 148, 17, 199, 245, 153, 215, 217, 209, 148, 17, 222, 63, 13, 26, 6, 63, - 13, 26, 6, 249, 255, 13, 26, 6, 247, 125, 13, 26, 6, 245, 51, 13, 26, 6, - 74, 13, 26, 6, 240, 174, 13, 26, 6, 239, 75, 13, 26, 6, 237, 171, 13, 26, - 6, 75, 13, 26, 6, 230, 184, 13, 26, 6, 230, 54, 13, 26, 6, 159, 13, 26, - 6, 226, 185, 13, 26, 6, 223, 163, 13, 26, 6, 78, 13, 26, 6, 219, 184, 13, - 26, 6, 217, 134, 13, 26, 6, 146, 13, 26, 6, 194, 13, 26, 6, 210, 69, 13, - 26, 6, 68, 13, 26, 6, 206, 164, 13, 26, 6, 204, 144, 13, 26, 6, 203, 196, - 13, 26, 6, 203, 124, 13, 26, 6, 202, 159, 13, 26, 5, 63, 13, 26, 5, 249, - 255, 13, 26, 5, 247, 125, 13, 26, 5, 245, 51, 13, 26, 5, 74, 13, 26, 5, - 240, 174, 13, 26, 5, 239, 75, 13, 26, 5, 237, 171, 13, 26, 5, 75, 13, 26, - 5, 230, 184, 13, 26, 5, 230, 54, 13, 26, 5, 159, 13, 26, 5, 226, 185, 13, - 26, 5, 223, 163, 13, 26, 5, 78, 13, 26, 5, 219, 184, 13, 26, 5, 217, 134, - 13, 26, 5, 146, 13, 26, 5, 194, 13, 26, 5, 210, 69, 13, 26, 5, 68, 13, - 26, 5, 206, 164, 13, 26, 5, 204, 144, 13, 26, 5, 203, 196, 13, 26, 5, - 203, 124, 13, 26, 5, 202, 159, 13, 37, 6, 63, 13, 37, 6, 249, 255, 13, - 37, 6, 247, 125, 13, 37, 6, 245, 51, 13, 37, 6, 74, 13, 37, 6, 240, 174, - 13, 37, 6, 239, 75, 13, 37, 6, 237, 171, 13, 37, 6, 75, 13, 37, 6, 230, - 184, 13, 37, 6, 230, 54, 13, 37, 6, 159, 13, 37, 6, 226, 185, 13, 37, 6, - 223, 163, 13, 37, 6, 78, 13, 37, 6, 219, 184, 13, 37, 6, 217, 134, 13, - 37, 6, 146, 13, 37, 6, 194, 13, 37, 6, 210, 69, 13, 37, 6, 68, 13, 37, 6, - 206, 164, 13, 37, 6, 204, 144, 13, 37, 6, 203, 196, 13, 37, 6, 203, 124, - 13, 37, 6, 202, 159, 13, 37, 5, 63, 13, 37, 5, 249, 255, 13, 37, 5, 247, - 125, 13, 37, 5, 245, 51, 13, 37, 5, 74, 13, 37, 5, 240, 174, 13, 37, 5, - 239, 75, 13, 37, 5, 75, 13, 37, 5, 230, 184, 13, 37, 5, 230, 54, 13, 37, - 5, 159, 13, 37, 5, 226, 185, 13, 37, 5, 223, 163, 13, 37, 5, 78, 13, 37, - 5, 219, 184, 13, 37, 5, 217, 134, 13, 37, 5, 146, 13, 37, 5, 194, 13, 37, - 5, 210, 69, 13, 37, 5, 68, 13, 37, 5, 206, 164, 13, 37, 5, 204, 144, 13, - 37, 5, 203, 196, 13, 37, 5, 203, 124, 13, 37, 5, 202, 159, 13, 26, 37, 6, - 63, 13, 26, 37, 6, 249, 255, 13, 26, 37, 6, 247, 125, 13, 26, 37, 6, 245, - 51, 13, 26, 37, 6, 74, 13, 26, 37, 6, 240, 174, 13, 26, 37, 6, 239, 75, - 13, 26, 37, 6, 237, 171, 13, 26, 37, 6, 75, 13, 26, 37, 6, 230, 184, 13, - 26, 37, 6, 230, 54, 13, 26, 37, 6, 159, 13, 26, 37, 6, 226, 185, 13, 26, - 37, 6, 223, 163, 13, 26, 37, 6, 78, 13, 26, 37, 6, 219, 184, 13, 26, 37, - 6, 217, 134, 13, 26, 37, 6, 146, 13, 26, 37, 6, 194, 13, 26, 37, 6, 210, - 69, 13, 26, 37, 6, 68, 13, 26, 37, 6, 206, 164, 13, 26, 37, 6, 204, 144, - 13, 26, 37, 6, 203, 196, 13, 26, 37, 6, 203, 124, 13, 26, 37, 6, 202, - 159, 13, 26, 37, 5, 63, 13, 26, 37, 5, 249, 255, 13, 26, 37, 5, 247, 125, - 13, 26, 37, 5, 245, 51, 13, 26, 37, 5, 74, 13, 26, 37, 5, 240, 174, 13, - 26, 37, 5, 239, 75, 13, 26, 37, 5, 237, 171, 13, 26, 37, 5, 75, 13, 26, - 37, 5, 230, 184, 13, 26, 37, 5, 230, 54, 13, 26, 37, 5, 159, 13, 26, 37, - 5, 226, 185, 13, 26, 37, 5, 223, 163, 13, 26, 37, 5, 78, 13, 26, 37, 5, - 219, 184, 13, 26, 37, 5, 217, 134, 13, 26, 37, 5, 146, 13, 26, 37, 5, - 194, 13, 26, 37, 5, 210, 69, 13, 26, 37, 5, 68, 13, 26, 37, 5, 206, 164, - 13, 26, 37, 5, 204, 144, 13, 26, 37, 5, 203, 196, 13, 26, 37, 5, 203, - 124, 13, 26, 37, 5, 202, 159, 13, 132, 6, 63, 13, 132, 6, 247, 125, 13, - 132, 6, 245, 51, 13, 132, 6, 239, 75, 13, 132, 6, 230, 184, 13, 132, 6, - 230, 54, 13, 132, 6, 223, 163, 13, 132, 6, 78, 13, 132, 6, 219, 184, 13, - 132, 6, 217, 134, 13, 132, 6, 194, 13, 132, 6, 210, 69, 13, 132, 6, 68, - 13, 132, 6, 206, 164, 13, 132, 6, 204, 144, 13, 132, 6, 203, 196, 13, - 132, 6, 203, 124, 13, 132, 6, 202, 159, 13, 132, 5, 63, 13, 132, 5, 249, - 255, 13, 132, 5, 247, 125, 13, 132, 5, 245, 51, 13, 132, 5, 240, 174, 13, - 132, 5, 237, 171, 13, 132, 5, 75, 13, 132, 5, 230, 184, 13, 132, 5, 230, - 54, 13, 132, 5, 159, 13, 132, 5, 226, 185, 13, 132, 5, 223, 163, 13, 132, - 5, 219, 184, 13, 132, 5, 217, 134, 13, 132, 5, 146, 13, 132, 5, 194, 13, - 132, 5, 210, 69, 13, 132, 5, 68, 13, 132, 5, 206, 164, 13, 132, 5, 204, - 144, 13, 132, 5, 203, 196, 13, 132, 5, 203, 124, 13, 132, 5, 202, 159, - 13, 26, 132, 6, 63, 13, 26, 132, 6, 249, 255, 13, 26, 132, 6, 247, 125, - 13, 26, 132, 6, 245, 51, 13, 26, 132, 6, 74, 13, 26, 132, 6, 240, 174, - 13, 26, 132, 6, 239, 75, 13, 26, 132, 6, 237, 171, 13, 26, 132, 6, 75, - 13, 26, 132, 6, 230, 184, 13, 26, 132, 6, 230, 54, 13, 26, 132, 6, 159, - 13, 26, 132, 6, 226, 185, 13, 26, 132, 6, 223, 163, 13, 26, 132, 6, 78, - 13, 26, 132, 6, 219, 184, 13, 26, 132, 6, 217, 134, 13, 26, 132, 6, 146, - 13, 26, 132, 6, 194, 13, 26, 132, 6, 210, 69, 13, 26, 132, 6, 68, 13, 26, - 132, 6, 206, 164, 13, 26, 132, 6, 204, 144, 13, 26, 132, 6, 203, 196, 13, - 26, 132, 6, 203, 124, 13, 26, 132, 6, 202, 159, 13, 26, 132, 5, 63, 13, - 26, 132, 5, 249, 255, 13, 26, 132, 5, 247, 125, 13, 26, 132, 5, 245, 51, - 13, 26, 132, 5, 74, 13, 26, 132, 5, 240, 174, 13, 26, 132, 5, 239, 75, - 13, 26, 132, 5, 237, 171, 13, 26, 132, 5, 75, 13, 26, 132, 5, 230, 184, - 13, 26, 132, 5, 230, 54, 13, 26, 132, 5, 159, 13, 26, 132, 5, 226, 185, - 13, 26, 132, 5, 223, 163, 13, 26, 132, 5, 78, 13, 26, 132, 5, 219, 184, - 13, 26, 132, 5, 217, 134, 13, 26, 132, 5, 146, 13, 26, 132, 5, 194, 13, - 26, 132, 5, 210, 69, 13, 26, 132, 5, 68, 13, 26, 132, 5, 206, 164, 13, - 26, 132, 5, 204, 144, 13, 26, 132, 5, 203, 196, 13, 26, 132, 5, 203, 124, - 13, 26, 132, 5, 202, 159, 13, 166, 6, 63, 13, 166, 6, 249, 255, 13, 166, - 6, 245, 51, 13, 166, 6, 74, 13, 166, 6, 240, 174, 13, 166, 6, 239, 75, - 13, 166, 6, 230, 184, 13, 166, 6, 230, 54, 13, 166, 6, 159, 13, 166, 6, - 226, 185, 13, 166, 6, 223, 163, 13, 166, 6, 78, 13, 166, 6, 219, 184, 13, - 166, 6, 217, 134, 13, 166, 6, 194, 13, 166, 6, 210, 69, 13, 166, 6, 68, - 13, 166, 6, 206, 164, 13, 166, 6, 204, 144, 13, 166, 6, 203, 196, 13, - 166, 6, 203, 124, 13, 166, 5, 63, 13, 166, 5, 249, 255, 13, 166, 5, 247, - 125, 13, 166, 5, 245, 51, 13, 166, 5, 74, 13, 166, 5, 240, 174, 13, 166, - 5, 239, 75, 13, 166, 5, 237, 171, 13, 166, 5, 75, 13, 166, 5, 230, 184, - 13, 166, 5, 230, 54, 13, 166, 5, 159, 13, 166, 5, 226, 185, 13, 166, 5, - 223, 163, 13, 166, 5, 78, 13, 166, 5, 219, 184, 13, 166, 5, 217, 134, 13, - 166, 5, 146, 13, 166, 5, 194, 13, 166, 5, 210, 69, 13, 166, 5, 68, 13, - 166, 5, 206, 164, 13, 166, 5, 204, 144, 13, 166, 5, 203, 196, 13, 166, 5, - 203, 124, 13, 166, 5, 202, 159, 13, 169, 6, 63, 13, 169, 6, 249, 255, 13, - 169, 6, 245, 51, 13, 169, 6, 74, 13, 169, 6, 240, 174, 13, 169, 6, 239, - 75, 13, 169, 6, 75, 13, 169, 6, 230, 184, 13, 169, 6, 230, 54, 13, 169, - 6, 159, 13, 169, 6, 226, 185, 13, 169, 6, 78, 13, 169, 6, 194, 13, 169, - 6, 210, 69, 13, 169, 6, 68, 13, 169, 6, 206, 164, 13, 169, 6, 204, 144, - 13, 169, 6, 203, 196, 13, 169, 6, 203, 124, 13, 169, 5, 63, 13, 169, 5, - 249, 255, 13, 169, 5, 247, 125, 13, 169, 5, 245, 51, 13, 169, 5, 74, 13, - 169, 5, 240, 174, 13, 169, 5, 239, 75, 13, 169, 5, 237, 171, 13, 169, 5, - 75, 13, 169, 5, 230, 184, 13, 169, 5, 230, 54, 13, 169, 5, 159, 13, 169, - 5, 226, 185, 13, 169, 5, 223, 163, 13, 169, 5, 78, 13, 169, 5, 219, 184, - 13, 169, 5, 217, 134, 13, 169, 5, 146, 13, 169, 5, 194, 13, 169, 5, 210, - 69, 13, 169, 5, 68, 13, 169, 5, 206, 164, 13, 169, 5, 204, 144, 13, 169, - 5, 203, 196, 13, 169, 5, 203, 124, 13, 169, 5, 202, 159, 13, 26, 166, 6, - 63, 13, 26, 166, 6, 249, 255, 13, 26, 166, 6, 247, 125, 13, 26, 166, 6, - 245, 51, 13, 26, 166, 6, 74, 13, 26, 166, 6, 240, 174, 13, 26, 166, 6, - 239, 75, 13, 26, 166, 6, 237, 171, 13, 26, 166, 6, 75, 13, 26, 166, 6, - 230, 184, 13, 26, 166, 6, 230, 54, 13, 26, 166, 6, 159, 13, 26, 166, 6, - 226, 185, 13, 26, 166, 6, 223, 163, 13, 26, 166, 6, 78, 13, 26, 166, 6, - 219, 184, 13, 26, 166, 6, 217, 134, 13, 26, 166, 6, 146, 13, 26, 166, 6, - 194, 13, 26, 166, 6, 210, 69, 13, 26, 166, 6, 68, 13, 26, 166, 6, 206, - 164, 13, 26, 166, 6, 204, 144, 13, 26, 166, 6, 203, 196, 13, 26, 166, 6, - 203, 124, 13, 26, 166, 6, 202, 159, 13, 26, 166, 5, 63, 13, 26, 166, 5, - 249, 255, 13, 26, 166, 5, 247, 125, 13, 26, 166, 5, 245, 51, 13, 26, 166, - 5, 74, 13, 26, 166, 5, 240, 174, 13, 26, 166, 5, 239, 75, 13, 26, 166, 5, - 237, 171, 13, 26, 166, 5, 75, 13, 26, 166, 5, 230, 184, 13, 26, 166, 5, - 230, 54, 13, 26, 166, 5, 159, 13, 26, 166, 5, 226, 185, 13, 26, 166, 5, - 223, 163, 13, 26, 166, 5, 78, 13, 26, 166, 5, 219, 184, 13, 26, 166, 5, - 217, 134, 13, 26, 166, 5, 146, 13, 26, 166, 5, 194, 13, 26, 166, 5, 210, - 69, 13, 26, 166, 5, 68, 13, 26, 166, 5, 206, 164, 13, 26, 166, 5, 204, - 144, 13, 26, 166, 5, 203, 196, 13, 26, 166, 5, 203, 124, 13, 26, 166, 5, - 202, 159, 13, 41, 6, 63, 13, 41, 6, 249, 255, 13, 41, 6, 247, 125, 13, - 41, 6, 245, 51, 13, 41, 6, 74, 13, 41, 6, 240, 174, 13, 41, 6, 239, 75, - 13, 41, 6, 237, 171, 13, 41, 6, 75, 13, 41, 6, 230, 184, 13, 41, 6, 230, - 54, 13, 41, 6, 159, 13, 41, 6, 226, 185, 13, 41, 6, 223, 163, 13, 41, 6, - 78, 13, 41, 6, 219, 184, 13, 41, 6, 217, 134, 13, 41, 6, 146, 13, 41, 6, - 194, 13, 41, 6, 210, 69, 13, 41, 6, 68, 13, 41, 6, 206, 164, 13, 41, 6, - 204, 144, 13, 41, 6, 203, 196, 13, 41, 6, 203, 124, 13, 41, 6, 202, 159, - 13, 41, 5, 63, 13, 41, 5, 249, 255, 13, 41, 5, 247, 125, 13, 41, 5, 245, - 51, 13, 41, 5, 74, 13, 41, 5, 240, 174, 13, 41, 5, 239, 75, 13, 41, 5, - 237, 171, 13, 41, 5, 75, 13, 41, 5, 230, 184, 13, 41, 5, 230, 54, 13, 41, - 5, 159, 13, 41, 5, 226, 185, 13, 41, 5, 223, 163, 13, 41, 5, 78, 13, 41, - 5, 219, 184, 13, 41, 5, 217, 134, 13, 41, 5, 146, 13, 41, 5, 194, 13, 41, - 5, 210, 69, 13, 41, 5, 68, 13, 41, 5, 206, 164, 13, 41, 5, 204, 144, 13, - 41, 5, 203, 196, 13, 41, 5, 203, 124, 13, 41, 5, 202, 159, 13, 41, 26, 6, - 63, 13, 41, 26, 6, 249, 255, 13, 41, 26, 6, 247, 125, 13, 41, 26, 6, 245, - 51, 13, 41, 26, 6, 74, 13, 41, 26, 6, 240, 174, 13, 41, 26, 6, 239, 75, - 13, 41, 26, 6, 237, 171, 13, 41, 26, 6, 75, 13, 41, 26, 6, 230, 184, 13, - 41, 26, 6, 230, 54, 13, 41, 26, 6, 159, 13, 41, 26, 6, 226, 185, 13, 41, - 26, 6, 223, 163, 13, 41, 26, 6, 78, 13, 41, 26, 6, 219, 184, 13, 41, 26, - 6, 217, 134, 13, 41, 26, 6, 146, 13, 41, 26, 6, 194, 13, 41, 26, 6, 210, - 69, 13, 41, 26, 6, 68, 13, 41, 26, 6, 206, 164, 13, 41, 26, 6, 204, 144, - 13, 41, 26, 6, 203, 196, 13, 41, 26, 6, 203, 124, 13, 41, 26, 6, 202, - 159, 13, 41, 26, 5, 63, 13, 41, 26, 5, 249, 255, 13, 41, 26, 5, 247, 125, - 13, 41, 26, 5, 245, 51, 13, 41, 26, 5, 74, 13, 41, 26, 5, 240, 174, 13, - 41, 26, 5, 239, 75, 13, 41, 26, 5, 237, 171, 13, 41, 26, 5, 75, 13, 41, - 26, 5, 230, 184, 13, 41, 26, 5, 230, 54, 13, 41, 26, 5, 159, 13, 41, 26, - 5, 226, 185, 13, 41, 26, 5, 223, 163, 13, 41, 26, 5, 78, 13, 41, 26, 5, - 219, 184, 13, 41, 26, 5, 217, 134, 13, 41, 26, 5, 146, 13, 41, 26, 5, - 194, 13, 41, 26, 5, 210, 69, 13, 41, 26, 5, 68, 13, 41, 26, 5, 206, 164, - 13, 41, 26, 5, 204, 144, 13, 41, 26, 5, 203, 196, 13, 41, 26, 5, 203, - 124, 13, 41, 26, 5, 202, 159, 13, 41, 37, 6, 63, 13, 41, 37, 6, 249, 255, - 13, 41, 37, 6, 247, 125, 13, 41, 37, 6, 245, 51, 13, 41, 37, 6, 74, 13, - 41, 37, 6, 240, 174, 13, 41, 37, 6, 239, 75, 13, 41, 37, 6, 237, 171, 13, - 41, 37, 6, 75, 13, 41, 37, 6, 230, 184, 13, 41, 37, 6, 230, 54, 13, 41, - 37, 6, 159, 13, 41, 37, 6, 226, 185, 13, 41, 37, 6, 223, 163, 13, 41, 37, - 6, 78, 13, 41, 37, 6, 219, 184, 13, 41, 37, 6, 217, 134, 13, 41, 37, 6, - 146, 13, 41, 37, 6, 194, 13, 41, 37, 6, 210, 69, 13, 41, 37, 6, 68, 13, - 41, 37, 6, 206, 164, 13, 41, 37, 6, 204, 144, 13, 41, 37, 6, 203, 196, - 13, 41, 37, 6, 203, 124, 13, 41, 37, 6, 202, 159, 13, 41, 37, 5, 63, 13, - 41, 37, 5, 249, 255, 13, 41, 37, 5, 247, 125, 13, 41, 37, 5, 245, 51, 13, - 41, 37, 5, 74, 13, 41, 37, 5, 240, 174, 13, 41, 37, 5, 239, 75, 13, 41, - 37, 5, 237, 171, 13, 41, 37, 5, 75, 13, 41, 37, 5, 230, 184, 13, 41, 37, - 5, 230, 54, 13, 41, 37, 5, 159, 13, 41, 37, 5, 226, 185, 13, 41, 37, 5, - 223, 163, 13, 41, 37, 5, 78, 13, 41, 37, 5, 219, 184, 13, 41, 37, 5, 217, - 134, 13, 41, 37, 5, 146, 13, 41, 37, 5, 194, 13, 41, 37, 5, 210, 69, 13, - 41, 37, 5, 68, 13, 41, 37, 5, 206, 164, 13, 41, 37, 5, 204, 144, 13, 41, - 37, 5, 203, 196, 13, 41, 37, 5, 203, 124, 13, 41, 37, 5, 202, 159, 13, - 41, 26, 37, 6, 63, 13, 41, 26, 37, 6, 249, 255, 13, 41, 26, 37, 6, 247, - 125, 13, 41, 26, 37, 6, 245, 51, 13, 41, 26, 37, 6, 74, 13, 41, 26, 37, - 6, 240, 174, 13, 41, 26, 37, 6, 239, 75, 13, 41, 26, 37, 6, 237, 171, 13, - 41, 26, 37, 6, 75, 13, 41, 26, 37, 6, 230, 184, 13, 41, 26, 37, 6, 230, - 54, 13, 41, 26, 37, 6, 159, 13, 41, 26, 37, 6, 226, 185, 13, 41, 26, 37, - 6, 223, 163, 13, 41, 26, 37, 6, 78, 13, 41, 26, 37, 6, 219, 184, 13, 41, - 26, 37, 6, 217, 134, 13, 41, 26, 37, 6, 146, 13, 41, 26, 37, 6, 194, 13, - 41, 26, 37, 6, 210, 69, 13, 41, 26, 37, 6, 68, 13, 41, 26, 37, 6, 206, - 164, 13, 41, 26, 37, 6, 204, 144, 13, 41, 26, 37, 6, 203, 196, 13, 41, - 26, 37, 6, 203, 124, 13, 41, 26, 37, 6, 202, 159, 13, 41, 26, 37, 5, 63, - 13, 41, 26, 37, 5, 249, 255, 13, 41, 26, 37, 5, 247, 125, 13, 41, 26, 37, - 5, 245, 51, 13, 41, 26, 37, 5, 74, 13, 41, 26, 37, 5, 240, 174, 13, 41, - 26, 37, 5, 239, 75, 13, 41, 26, 37, 5, 237, 171, 13, 41, 26, 37, 5, 75, - 13, 41, 26, 37, 5, 230, 184, 13, 41, 26, 37, 5, 230, 54, 13, 41, 26, 37, - 5, 159, 13, 41, 26, 37, 5, 226, 185, 13, 41, 26, 37, 5, 223, 163, 13, 41, - 26, 37, 5, 78, 13, 41, 26, 37, 5, 219, 184, 13, 41, 26, 37, 5, 217, 134, - 13, 41, 26, 37, 5, 146, 13, 41, 26, 37, 5, 194, 13, 41, 26, 37, 5, 210, - 69, 13, 41, 26, 37, 5, 68, 13, 41, 26, 37, 5, 206, 164, 13, 41, 26, 37, - 5, 204, 144, 13, 41, 26, 37, 5, 203, 196, 13, 41, 26, 37, 5, 203, 124, - 13, 41, 26, 37, 5, 202, 159, 13, 224, 41, 6, 63, 13, 224, 41, 6, 249, - 255, 13, 224, 41, 6, 247, 125, 13, 224, 41, 6, 245, 51, 13, 224, 41, 6, - 74, 13, 224, 41, 6, 240, 174, 13, 224, 41, 6, 239, 75, 13, 224, 41, 6, - 237, 171, 13, 224, 41, 6, 75, 13, 224, 41, 6, 230, 184, 13, 224, 41, 6, - 230, 54, 13, 224, 41, 6, 159, 13, 224, 41, 6, 226, 185, 13, 224, 41, 6, - 223, 163, 13, 224, 41, 6, 78, 13, 224, 41, 6, 219, 184, 13, 224, 41, 6, - 217, 134, 13, 224, 41, 6, 146, 13, 224, 41, 6, 194, 13, 224, 41, 6, 210, - 69, 13, 224, 41, 6, 68, 13, 224, 41, 6, 206, 164, 13, 224, 41, 6, 204, - 144, 13, 224, 41, 6, 203, 196, 13, 224, 41, 6, 203, 124, 13, 224, 41, 6, - 202, 159, 13, 224, 41, 5, 63, 13, 224, 41, 5, 249, 255, 13, 224, 41, 5, - 247, 125, 13, 224, 41, 5, 245, 51, 13, 224, 41, 5, 74, 13, 224, 41, 5, - 240, 174, 13, 224, 41, 5, 239, 75, 13, 224, 41, 5, 237, 171, 13, 224, 41, - 5, 75, 13, 224, 41, 5, 230, 184, 13, 224, 41, 5, 230, 54, 13, 224, 41, 5, - 159, 13, 224, 41, 5, 226, 185, 13, 224, 41, 5, 223, 163, 13, 224, 41, 5, - 78, 13, 224, 41, 5, 219, 184, 13, 224, 41, 5, 217, 134, 13, 224, 41, 5, - 146, 13, 224, 41, 5, 194, 13, 224, 41, 5, 210, 69, 13, 224, 41, 5, 68, - 13, 224, 41, 5, 206, 164, 13, 224, 41, 5, 204, 144, 13, 224, 41, 5, 203, - 196, 13, 224, 41, 5, 203, 124, 13, 224, 41, 5, 202, 159, 13, 37, 5, 243, - 84, 75, 13, 37, 5, 243, 84, 230, 184, 13, 26, 6, 251, 2, 13, 26, 6, 248, - 106, 13, 26, 6, 238, 235, 13, 26, 6, 244, 37, 13, 26, 6, 241, 37, 13, 26, - 6, 202, 83, 13, 26, 6, 240, 248, 13, 26, 6, 209, 74, 13, 26, 6, 230, 230, - 13, 26, 6, 229, 247, 13, 26, 6, 228, 24, 13, 26, 6, 223, 246, 13, 26, 6, - 221, 84, 13, 26, 6, 203, 170, 13, 26, 6, 220, 34, 13, 26, 6, 218, 167, - 13, 26, 6, 216, 59, 13, 26, 6, 209, 75, 97, 13, 26, 6, 212, 144, 13, 26, - 6, 209, 207, 13, 26, 6, 206, 216, 13, 26, 6, 218, 192, 13, 26, 6, 246, - 142, 13, 26, 6, 217, 202, 13, 26, 6, 220, 36, 13, 26, 223, 101, 13, 26, - 5, 251, 2, 13, 26, 5, 248, 106, 13, 26, 5, 238, 235, 13, 26, 5, 244, 37, - 13, 26, 5, 241, 37, 13, 26, 5, 202, 83, 13, 26, 5, 240, 248, 13, 26, 5, - 209, 74, 13, 26, 5, 230, 230, 13, 26, 5, 229, 247, 13, 26, 5, 228, 24, - 13, 26, 5, 223, 246, 13, 26, 5, 221, 84, 13, 26, 5, 203, 170, 13, 26, 5, - 220, 34, 13, 26, 5, 218, 167, 13, 26, 5, 216, 59, 13, 26, 5, 46, 212, - 144, 13, 26, 5, 212, 144, 13, 26, 5, 209, 207, 13, 26, 5, 206, 216, 13, - 26, 5, 218, 192, 13, 26, 5, 246, 142, 13, 26, 5, 217, 202, 13, 26, 5, - 220, 36, 13, 26, 219, 69, 243, 205, 13, 26, 241, 38, 97, 13, 26, 209, 75, - 97, 13, 26, 229, 248, 97, 13, 26, 218, 193, 97, 13, 26, 216, 60, 97, 13, - 26, 218, 168, 97, 13, 37, 6, 251, 2, 13, 37, 6, 248, 106, 13, 37, 6, 238, - 235, 13, 37, 6, 244, 37, 13, 37, 6, 241, 37, 13, 37, 6, 202, 83, 13, 37, - 6, 240, 248, 13, 37, 6, 209, 74, 13, 37, 6, 230, 230, 13, 37, 6, 229, - 247, 13, 37, 6, 228, 24, 13, 37, 6, 223, 246, 13, 37, 6, 221, 84, 13, 37, - 6, 203, 170, 13, 37, 6, 220, 34, 13, 37, 6, 218, 167, 13, 37, 6, 216, 59, - 13, 37, 6, 209, 75, 97, 13, 37, 6, 212, 144, 13, 37, 6, 209, 207, 13, 37, - 6, 206, 216, 13, 37, 6, 218, 192, 13, 37, 6, 246, 142, 13, 37, 6, 217, - 202, 13, 37, 6, 220, 36, 13, 37, 223, 101, 13, 37, 5, 251, 2, 13, 37, 5, - 248, 106, 13, 37, 5, 238, 235, 13, 37, 5, 244, 37, 13, 37, 5, 241, 37, - 13, 37, 5, 202, 83, 13, 37, 5, 240, 248, 13, 37, 5, 209, 74, 13, 37, 5, - 230, 230, 13, 37, 5, 229, 247, 13, 37, 5, 228, 24, 13, 37, 5, 223, 246, - 13, 37, 5, 221, 84, 13, 37, 5, 203, 170, 13, 37, 5, 220, 34, 13, 37, 5, - 218, 167, 13, 37, 5, 216, 59, 13, 37, 5, 46, 212, 144, 13, 37, 5, 212, - 144, 13, 37, 5, 209, 207, 13, 37, 5, 206, 216, 13, 37, 5, 218, 192, 13, - 37, 5, 246, 142, 13, 37, 5, 217, 202, 13, 37, 5, 220, 36, 13, 37, 219, - 69, 243, 205, 13, 37, 241, 38, 97, 13, 37, 209, 75, 97, 13, 37, 229, 248, - 97, 13, 37, 218, 193, 97, 13, 37, 216, 60, 97, 13, 37, 218, 168, 97, 13, - 26, 37, 6, 251, 2, 13, 26, 37, 6, 248, 106, 13, 26, 37, 6, 238, 235, 13, - 26, 37, 6, 244, 37, 13, 26, 37, 6, 241, 37, 13, 26, 37, 6, 202, 83, 13, - 26, 37, 6, 240, 248, 13, 26, 37, 6, 209, 74, 13, 26, 37, 6, 230, 230, 13, - 26, 37, 6, 229, 247, 13, 26, 37, 6, 228, 24, 13, 26, 37, 6, 223, 246, 13, - 26, 37, 6, 221, 84, 13, 26, 37, 6, 203, 170, 13, 26, 37, 6, 220, 34, 13, - 26, 37, 6, 218, 167, 13, 26, 37, 6, 216, 59, 13, 26, 37, 6, 209, 75, 97, - 13, 26, 37, 6, 212, 144, 13, 26, 37, 6, 209, 207, 13, 26, 37, 6, 206, - 216, 13, 26, 37, 6, 218, 192, 13, 26, 37, 6, 246, 142, 13, 26, 37, 6, - 217, 202, 13, 26, 37, 6, 220, 36, 13, 26, 37, 223, 101, 13, 26, 37, 5, - 251, 2, 13, 26, 37, 5, 248, 106, 13, 26, 37, 5, 238, 235, 13, 26, 37, 5, - 244, 37, 13, 26, 37, 5, 241, 37, 13, 26, 37, 5, 202, 83, 13, 26, 37, 5, - 240, 248, 13, 26, 37, 5, 209, 74, 13, 26, 37, 5, 230, 230, 13, 26, 37, 5, - 229, 247, 13, 26, 37, 5, 228, 24, 13, 26, 37, 5, 223, 246, 13, 26, 37, 5, - 221, 84, 13, 26, 37, 5, 203, 170, 13, 26, 37, 5, 220, 34, 13, 26, 37, 5, - 218, 167, 13, 26, 37, 5, 216, 59, 13, 26, 37, 5, 46, 212, 144, 13, 26, - 37, 5, 212, 144, 13, 26, 37, 5, 209, 207, 13, 26, 37, 5, 206, 216, 13, - 26, 37, 5, 218, 192, 13, 26, 37, 5, 246, 142, 13, 26, 37, 5, 217, 202, - 13, 26, 37, 5, 220, 36, 13, 26, 37, 219, 69, 243, 205, 13, 26, 37, 241, - 38, 97, 13, 26, 37, 209, 75, 97, 13, 26, 37, 229, 248, 97, 13, 26, 37, - 218, 193, 97, 13, 26, 37, 216, 60, 97, 13, 26, 37, 218, 168, 97, 13, 41, - 26, 6, 251, 2, 13, 41, 26, 6, 248, 106, 13, 41, 26, 6, 238, 235, 13, 41, - 26, 6, 244, 37, 13, 41, 26, 6, 241, 37, 13, 41, 26, 6, 202, 83, 13, 41, - 26, 6, 240, 248, 13, 41, 26, 6, 209, 74, 13, 41, 26, 6, 230, 230, 13, 41, - 26, 6, 229, 247, 13, 41, 26, 6, 228, 24, 13, 41, 26, 6, 223, 246, 13, 41, - 26, 6, 221, 84, 13, 41, 26, 6, 203, 170, 13, 41, 26, 6, 220, 34, 13, 41, - 26, 6, 218, 167, 13, 41, 26, 6, 216, 59, 13, 41, 26, 6, 209, 75, 97, 13, - 41, 26, 6, 212, 144, 13, 41, 26, 6, 209, 207, 13, 41, 26, 6, 206, 216, - 13, 41, 26, 6, 218, 192, 13, 41, 26, 6, 246, 142, 13, 41, 26, 6, 217, - 202, 13, 41, 26, 6, 220, 36, 13, 41, 26, 223, 101, 13, 41, 26, 5, 251, 2, - 13, 41, 26, 5, 248, 106, 13, 41, 26, 5, 238, 235, 13, 41, 26, 5, 244, 37, - 13, 41, 26, 5, 241, 37, 13, 41, 26, 5, 202, 83, 13, 41, 26, 5, 240, 248, - 13, 41, 26, 5, 209, 74, 13, 41, 26, 5, 230, 230, 13, 41, 26, 5, 229, 247, - 13, 41, 26, 5, 228, 24, 13, 41, 26, 5, 223, 246, 13, 41, 26, 5, 221, 84, - 13, 41, 26, 5, 203, 170, 13, 41, 26, 5, 220, 34, 13, 41, 26, 5, 218, 167, - 13, 41, 26, 5, 216, 59, 13, 41, 26, 5, 46, 212, 144, 13, 41, 26, 5, 212, - 144, 13, 41, 26, 5, 209, 207, 13, 41, 26, 5, 206, 216, 13, 41, 26, 5, - 218, 192, 13, 41, 26, 5, 246, 142, 13, 41, 26, 5, 217, 202, 13, 41, 26, - 5, 220, 36, 13, 41, 26, 219, 69, 243, 205, 13, 41, 26, 241, 38, 97, 13, - 41, 26, 209, 75, 97, 13, 41, 26, 229, 248, 97, 13, 41, 26, 218, 193, 97, - 13, 41, 26, 216, 60, 97, 13, 41, 26, 218, 168, 97, 13, 41, 26, 37, 6, - 251, 2, 13, 41, 26, 37, 6, 248, 106, 13, 41, 26, 37, 6, 238, 235, 13, 41, - 26, 37, 6, 244, 37, 13, 41, 26, 37, 6, 241, 37, 13, 41, 26, 37, 6, 202, - 83, 13, 41, 26, 37, 6, 240, 248, 13, 41, 26, 37, 6, 209, 74, 13, 41, 26, - 37, 6, 230, 230, 13, 41, 26, 37, 6, 229, 247, 13, 41, 26, 37, 6, 228, 24, - 13, 41, 26, 37, 6, 223, 246, 13, 41, 26, 37, 6, 221, 84, 13, 41, 26, 37, - 6, 203, 170, 13, 41, 26, 37, 6, 220, 34, 13, 41, 26, 37, 6, 218, 167, 13, - 41, 26, 37, 6, 216, 59, 13, 41, 26, 37, 6, 209, 75, 97, 13, 41, 26, 37, - 6, 212, 144, 13, 41, 26, 37, 6, 209, 207, 13, 41, 26, 37, 6, 206, 216, - 13, 41, 26, 37, 6, 218, 192, 13, 41, 26, 37, 6, 246, 142, 13, 41, 26, 37, - 6, 217, 202, 13, 41, 26, 37, 6, 220, 36, 13, 41, 26, 37, 223, 101, 13, - 41, 26, 37, 5, 251, 2, 13, 41, 26, 37, 5, 248, 106, 13, 41, 26, 37, 5, - 238, 235, 13, 41, 26, 37, 5, 244, 37, 13, 41, 26, 37, 5, 241, 37, 13, 41, - 26, 37, 5, 202, 83, 13, 41, 26, 37, 5, 240, 248, 13, 41, 26, 37, 5, 209, - 74, 13, 41, 26, 37, 5, 230, 230, 13, 41, 26, 37, 5, 229, 247, 13, 41, 26, - 37, 5, 228, 24, 13, 41, 26, 37, 5, 223, 246, 13, 41, 26, 37, 5, 221, 84, - 13, 41, 26, 37, 5, 203, 170, 13, 41, 26, 37, 5, 220, 34, 13, 41, 26, 37, - 5, 218, 167, 13, 41, 26, 37, 5, 216, 59, 13, 41, 26, 37, 5, 46, 212, 144, - 13, 41, 26, 37, 5, 212, 144, 13, 41, 26, 37, 5, 209, 207, 13, 41, 26, 37, - 5, 206, 216, 13, 41, 26, 37, 5, 218, 192, 13, 41, 26, 37, 5, 246, 142, - 13, 41, 26, 37, 5, 217, 202, 13, 41, 26, 37, 5, 220, 36, 13, 41, 26, 37, - 219, 69, 243, 205, 13, 41, 26, 37, 241, 38, 97, 13, 41, 26, 37, 209, 75, - 97, 13, 41, 26, 37, 229, 248, 97, 13, 41, 26, 37, 218, 193, 97, 13, 41, - 26, 37, 216, 60, 97, 13, 41, 26, 37, 218, 168, 97, 13, 26, 6, 243, 199, - 13, 26, 5, 243, 199, 13, 26, 17, 202, 84, 13, 26, 17, 105, 13, 26, 17, - 108, 13, 26, 17, 147, 13, 26, 17, 149, 13, 26, 17, 170, 13, 26, 17, 195, - 13, 26, 17, 213, 111, 13, 26, 17, 199, 13, 26, 17, 222, 63, 13, 169, 17, - 202, 84, 13, 169, 17, 105, 13, 169, 17, 108, 13, 169, 17, 147, 13, 169, - 17, 149, 13, 169, 17, 170, 13, 169, 17, 195, 13, 169, 17, 213, 111, 13, - 169, 17, 199, 13, 169, 17, 222, 63, 13, 41, 17, 202, 84, 13, 41, 17, 105, - 13, 41, 17, 108, 13, 41, 17, 147, 13, 41, 17, 149, 13, 41, 17, 170, 13, - 41, 17, 195, 13, 41, 17, 213, 111, 13, 41, 17, 199, 13, 41, 17, 222, 63, - 13, 41, 26, 17, 202, 84, 13, 41, 26, 17, 105, 13, 41, 26, 17, 108, 13, - 41, 26, 17, 147, 13, 41, 26, 17, 149, 13, 41, 26, 17, 170, 13, 41, 26, - 17, 195, 13, 41, 26, 17, 213, 111, 13, 41, 26, 17, 199, 13, 41, 26, 17, - 222, 63, 13, 224, 41, 17, 202, 84, 13, 224, 41, 17, 105, 13, 224, 41, 17, - 108, 13, 224, 41, 17, 147, 13, 224, 41, 17, 149, 13, 224, 41, 17, 170, - 13, 224, 41, 17, 195, 13, 224, 41, 17, 213, 111, 13, 224, 41, 17, 199, - 13, 224, 41, 17, 222, 63, 21, 128, 231, 35, 21, 237, 120, 231, 35, 21, - 237, 116, 231, 35, 21, 237, 105, 231, 35, 21, 237, 109, 231, 35, 21, 237, - 122, 231, 35, 21, 128, 122, 248, 117, 21, 237, 120, 122, 248, 117, 21, - 128, 148, 206, 248, 122, 248, 117, 21, 128, 122, 216, 188, 229, 29, 21, - 128, 122, 245, 97, 21, 128, 122, 236, 235, 21, 128, 122, 236, 236, 227, - 0, 21, 237, 120, 122, 236, 237, 21, 128, 122, 224, 148, 21, 237, 120, - 122, 224, 148, 21, 128, 122, 101, 248, 117, 21, 128, 122, 101, 216, 188, - 229, 28, 21, 128, 122, 101, 236, 235, 21, 128, 122, 112, 101, 236, 235, - 21, 128, 122, 236, 236, 101, 206, 224, 21, 128, 122, 101, 245, 207, 21, - 128, 122, 101, 245, 208, 122, 248, 117, 21, 128, 122, 101, 245, 208, 101, - 248, 117, 21, 128, 122, 101, 245, 208, 245, 97, 21, 128, 122, 101, 245, - 208, 236, 235, 21, 128, 122, 101, 245, 127, 21, 237, 120, 122, 101, 245, - 127, 21, 128, 101, 248, 118, 115, 231, 35, 21, 128, 122, 248, 118, 115, - 224, 148, 21, 128, 122, 101, 209, 21, 21, 237, 120, 122, 101, 209, 21, - 21, 128, 122, 101, 211, 53, 148, 248, 117, 21, 128, 122, 101, 248, 118, - 148, 211, 52, 21, 128, 122, 101, 148, 248, 117, 21, 128, 122, 101, 236, - 236, 211, 186, 148, 212, 155, 21, 128, 122, 112, 101, 236, 236, 148, 212, - 155, 21, 128, 122, 112, 101, 236, 236, 148, 245, 207, 21, 128, 122, 236, - 236, 101, 112, 148, 212, 155, 21, 128, 122, 101, 112, 211, 186, 148, 239, - 151, 21, 128, 122, 101, 148, 245, 97, 21, 128, 122, 101, 148, 246, 60, - 21, 128, 122, 101, 148, 236, 114, 21, 128, 122, 101, 148, 236, 235, 21, - 128, 148, 248, 104, 122, 101, 211, 52, 21, 128, 122, 101, 245, 208, 148, - 212, 155, 21, 128, 122, 101, 245, 208, 148, 212, 156, 245, 207, 21, 128, - 122, 101, 245, 208, 148, 212, 156, 248, 117, 21, 128, 101, 148, 236, 115, - 122, 206, 224, 21, 128, 122, 148, 236, 115, 101, 206, 224, 21, 128, 122, - 101, 245, 208, 236, 236, 148, 212, 155, 21, 128, 122, 101, 245, 128, 148, - 212, 155, 21, 128, 122, 101, 245, 208, 148, 239, 151, 21, 128, 122, 101, - 245, 208, 245, 98, 148, 239, 151, 21, 128, 101, 148, 245, 98, 122, 206, - 224, 21, 128, 122, 148, 245, 98, 101, 206, 224, 21, 128, 101, 148, 43, - 122, 206, 224, 21, 128, 101, 148, 43, 122, 236, 235, 21, 128, 122, 148, - 250, 216, 219, 212, 101, 206, 224, 21, 128, 122, 148, 250, 216, 231, 50, - 101, 206, 224, 21, 128, 122, 148, 43, 101, 206, 224, 21, 128, 122, 101, - 148, 245, 208, 236, 235, 21, 128, 122, 101, 148, 250, 216, 219, 211, 21, - 128, 122, 101, 148, 250, 215, 21, 128, 101, 148, 250, 216, 219, 212, 122, - 206, 224, 21, 128, 101, 148, 250, 216, 219, 212, 122, 245, 127, 21, 128, - 101, 148, 250, 216, 122, 206, 224, 21, 128, 122, 148, 236, 115, 101, 236, - 235, 21, 237, 111, 239, 147, 239, 253, 21, 237, 111, 239, 147, 239, 254, - 248, 117, 21, 237, 111, 239, 147, 239, 254, 236, 235, 21, 237, 111, 239, - 147, 239, 254, 245, 207, 21, 237, 111, 239, 147, 239, 254, 245, 208, 211, - 193, 21, 237, 118, 239, 147, 239, 254, 245, 207, 21, 128, 239, 147, 239, - 254, 245, 208, 248, 117, 21, 237, 109, 239, 147, 239, 254, 245, 207, 21, - 237, 111, 239, 233, 239, 254, 211, 185, 21, 237, 111, 237, 46, 239, 233, - 239, 254, 211, 185, 21, 237, 111, 239, 233, 239, 254, 211, 186, 239, 147, - 248, 117, 21, 237, 111, 237, 46, 239, 233, 239, 254, 211, 186, 239, 147, - 248, 117, 21, 237, 111, 239, 233, 239, 254, 211, 186, 248, 117, 21, 237, - 111, 237, 46, 239, 233, 239, 254, 211, 186, 248, 117, 21, 237, 111, 239, - 233, 239, 254, 211, 186, 148, 239, 151, 21, 237, 116, 239, 233, 239, 254, - 211, 185, 21, 237, 116, 239, 233, 239, 254, 211, 186, 220, 8, 21, 237, - 109, 239, 233, 239, 254, 211, 186, 220, 8, 21, 237, 105, 239, 233, 239, - 254, 211, 185, 21, 237, 111, 239, 233, 239, 254, 211, 186, 236, 235, 21, - 237, 111, 239, 233, 239, 254, 211, 186, 236, 236, 148, 212, 155, 21, 237, - 111, 239, 233, 239, 254, 211, 186, 236, 236, 221, 192, 209, 21, 21, 237, - 110, 21, 237, 111, 248, 104, 219, 135, 240, 94, 21, 237, 111, 237, 45, - 21, 237, 111, 148, 212, 155, 21, 237, 111, 237, 46, 148, 212, 155, 21, - 237, 111, 148, 248, 117, 21, 237, 111, 148, 239, 151, 21, 237, 111, 211, - 194, 122, 148, 212, 155, 21, 237, 111, 211, 194, 246, 217, 21, 237, 111, - 211, 194, 246, 218, 148, 212, 155, 21, 237, 111, 211, 194, 246, 218, 148, - 212, 156, 248, 117, 21, 237, 111, 211, 194, 227, 85, 21, 237, 117, 21, - 237, 118, 148, 212, 155, 21, 237, 118, 221, 192, 209, 21, 21, 237, 118, - 148, 239, 151, 21, 237, 107, 245, 94, 21, 237, 106, 21, 237, 116, 220, 8, - 21, 237, 115, 21, 237, 116, 171, 148, 212, 155, 21, 237, 116, 148, 212, - 155, 21, 237, 116, 171, 221, 192, 209, 21, 21, 237, 116, 221, 192, 209, - 21, 21, 237, 116, 171, 148, 239, 151, 21, 237, 116, 148, 239, 151, 21, - 237, 114, 220, 8, 21, 237, 113, 21, 237, 119, 21, 237, 104, 21, 237, 105, - 148, 212, 155, 21, 237, 105, 221, 192, 209, 21, 21, 237, 105, 148, 239, - 151, 21, 237, 109, 220, 8, 21, 237, 109, 171, 148, 239, 151, 21, 237, - 108, 21, 237, 109, 212, 36, 21, 237, 109, 171, 148, 212, 155, 21, 237, - 109, 148, 212, 155, 21, 237, 109, 171, 221, 192, 209, 21, 21, 237, 109, - 221, 192, 209, 21, 21, 237, 109, 148, 212, 156, 208, 127, 231, 35, 21, - 237, 109, 148, 248, 104, 101, 215, 252, 21, 237, 121, 21, 128, 122, 101, - 215, 252, 21, 237, 120, 122, 101, 215, 252, 21, 237, 109, 122, 101, 215, - 252, 21, 237, 122, 122, 101, 215, 252, 21, 237, 109, 227, 85, 21, 128, - 122, 101, 215, 253, 248, 117, 21, 128, 122, 101, 215, 253, 245, 207, 21, - 237, 109, 122, 101, 215, 253, 245, 207, 21, 128, 227, 86, 242, 70, 21, - 128, 227, 86, 121, 215, 248, 211, 52, 21, 128, 227, 86, 121, 215, 248, - 245, 85, 21, 128, 227, 86, 121, 219, 220, 246, 60, 21, 128, 227, 86, 206, - 224, 21, 128, 148, 206, 248, 227, 86, 206, 224, 21, 237, 120, 227, 86, - 206, 224, 21, 237, 105, 227, 86, 206, 224, 21, 237, 122, 227, 86, 206, - 224, 21, 128, 227, 86, 216, 188, 229, 29, 21, 128, 227, 86, 248, 117, 21, - 128, 227, 86, 208, 128, 209, 21, 21, 128, 227, 86, 209, 21, 21, 237, 109, - 227, 86, 209, 21, 21, 128, 227, 86, 122, 209, 21, 21, 237, 109, 227, 86, - 122, 209, 21, 21, 237, 122, 227, 86, 122, 148, 122, 148, 219, 211, 21, - 237, 122, 227, 86, 122, 148, 122, 209, 21, 21, 128, 227, 86, 231, 35, 21, - 237, 120, 227, 86, 231, 35, 21, 237, 109, 227, 86, 231, 35, 21, 237, 122, - 227, 86, 231, 35, 21, 128, 122, 101, 227, 85, 21, 237, 120, 122, 101, - 227, 85, 21, 237, 109, 122, 101, 227, 85, 21, 237, 109, 215, 252, 21, - 237, 122, 122, 101, 227, 85, 21, 128, 122, 101, 245, 131, 227, 85, 21, - 237, 120, 122, 101, 245, 131, 227, 85, 21, 128, 215, 253, 242, 70, 21, - 237, 109, 215, 253, 121, 122, 148, 236, 116, 224, 148, 21, 237, 122, 215, - 253, 121, 101, 148, 122, 245, 130, 21, 128, 215, 253, 206, 224, 21, 128, - 215, 253, 216, 188, 229, 29, 21, 128, 215, 253, 227, 85, 21, 237, 120, - 215, 253, 227, 85, 21, 237, 105, 215, 253, 227, 85, 21, 237, 122, 215, - 253, 227, 85, 21, 128, 215, 253, 224, 148, 21, 128, 215, 253, 101, 245, - 207, 21, 128, 215, 253, 101, 216, 188, 229, 28, 21, 128, 215, 253, 231, - 35, 21, 128, 215, 253, 209, 21, 21, 237, 107, 215, 253, 209, 21, 21, 128, - 122, 215, 253, 227, 85, 21, 237, 120, 122, 215, 253, 227, 85, 21, 237, - 114, 122, 215, 253, 227, 86, 220, 31, 21, 237, 107, 122, 215, 253, 227, - 86, 219, 211, 21, 237, 107, 122, 215, 253, 227, 86, 231, 49, 21, 237, - 107, 122, 215, 253, 227, 86, 206, 247, 21, 237, 116, 122, 215, 253, 227, - 85, 21, 237, 109, 122, 215, 253, 227, 85, 21, 237, 122, 122, 215, 253, - 227, 86, 219, 211, 21, 237, 122, 122, 215, 253, 227, 85, 21, 128, 101, - 242, 70, 21, 237, 109, 224, 148, 21, 128, 101, 206, 224, 21, 237, 120, - 101, 206, 224, 21, 128, 101, 216, 188, 229, 29, 21, 128, 101, 112, 148, - 212, 155, 21, 237, 107, 101, 209, 21, 21, 128, 101, 148, 227, 85, 21, - 128, 101, 227, 85, 21, 128, 101, 215, 253, 227, 85, 21, 237, 120, 101, - 215, 253, 227, 85, 21, 237, 114, 101, 215, 253, 227, 86, 220, 31, 21, - 237, 116, 101, 215, 253, 227, 85, 21, 237, 109, 101, 215, 253, 227, 85, - 21, 237, 122, 101, 215, 253, 227, 86, 219, 211, 21, 237, 122, 101, 215, - 253, 227, 86, 231, 49, 21, 237, 122, 101, 215, 253, 227, 85, 21, 237, - 120, 101, 215, 253, 227, 86, 248, 117, 21, 237, 118, 101, 215, 253, 227, - 86, 245, 207, 21, 237, 118, 101, 215, 253, 227, 86, 245, 208, 212, 155, - 21, 237, 107, 101, 215, 253, 227, 86, 245, 208, 219, 211, 21, 237, 107, - 101, 215, 253, 227, 86, 245, 208, 231, 49, 21, 237, 107, 101, 215, 253, - 227, 86, 245, 207, 21, 237, 109, 122, 236, 235, 21, 128, 122, 148, 212, - 155, 21, 237, 109, 122, 148, 212, 155, 21, 128, 122, 148, 212, 156, 148, - 243, 227, 21, 128, 122, 148, 212, 156, 148, 245, 207, 21, 128, 122, 148, - 212, 156, 148, 248, 117, 21, 128, 122, 148, 212, 156, 122, 248, 117, 21, - 128, 122, 148, 212, 156, 247, 251, 248, 117, 21, 128, 122, 148, 212, 156, - 122, 236, 237, 21, 128, 122, 148, 239, 152, 122, 211, 52, 21, 128, 122, - 148, 239, 152, 122, 248, 117, 21, 128, 122, 148, 113, 21, 128, 122, 148, - 245, 94, 21, 128, 122, 148, 245, 88, 148, 231, 6, 21, 237, 118, 122, 148, - 245, 88, 148, 231, 6, 21, 128, 122, 148, 245, 88, 148, 206, 247, 21, 128, - 122, 148, 246, 61, 21, 237, 116, 122, 209, 21, 21, 237, 116, 122, 148, - 220, 8, 21, 237, 109, 122, 148, 220, 8, 21, 237, 109, 122, 148, 228, 7, - 21, 237, 109, 122, 209, 21, 21, 237, 109, 122, 148, 212, 36, 21, 237, - 122, 122, 148, 219, 211, 21, 237, 122, 122, 148, 231, 49, 21, 237, 122, - 122, 209, 21, 21, 128, 209, 21, 21, 128, 148, 237, 45, 21, 128, 148, 212, - 156, 243, 227, 21, 128, 148, 212, 156, 245, 207, 21, 128, 148, 212, 156, - 248, 117, 21, 128, 148, 239, 151, 21, 128, 148, 248, 104, 122, 224, 148, - 21, 128, 148, 248, 104, 101, 215, 252, 21, 128, 148, 248, 104, 215, 253, - 227, 85, 21, 128, 148, 206, 248, 120, 239, 253, 21, 128, 148, 115, 120, - 239, 253, 21, 128, 148, 206, 248, 126, 239, 253, 21, 128, 148, 206, 248, - 239, 147, 239, 253, 21, 128, 148, 115, 239, 147, 216, 188, 229, 28, 21, - 237, 112, 21, 128, 237, 45, 21, 208, 129, 212, 119, 21, 208, 129, 223, - 225, 21, 208, 129, 248, 103, 21, 238, 2, 212, 119, 21, 238, 2, 223, 225, - 21, 238, 2, 248, 103, 21, 211, 37, 212, 119, 21, 211, 37, 223, 225, 21, - 211, 37, 248, 103, 21, 247, 201, 212, 119, 21, 247, 201, 223, 225, 21, - 247, 201, 248, 103, 21, 215, 143, 212, 119, 21, 215, 143, 223, 225, 21, - 215, 143, 248, 103, 21, 210, 189, 210, 102, 21, 210, 189, 248, 103, 21, - 211, 173, 228, 8, 212, 119, 21, 211, 173, 5, 212, 119, 21, 211, 173, 228, - 8, 223, 225, 21, 211, 173, 5, 223, 225, 21, 211, 173, 213, 126, 21, 239, - 208, 228, 8, 212, 119, 21, 239, 208, 5, 212, 119, 21, 239, 208, 228, 8, - 223, 225, 21, 239, 208, 5, 223, 225, 21, 239, 208, 213, 126, 21, 211, - 173, 239, 208, 250, 252, 21, 224, 0, 112, 121, 228, 7, 21, 224, 0, 112, - 121, 212, 36, 21, 224, 0, 112, 213, 126, 21, 224, 0, 121, 213, 126, 21, - 224, 0, 112, 121, 250, 253, 228, 7, 21, 224, 0, 112, 121, 250, 253, 212, - 36, 21, 224, 0, 212, 156, 208, 173, 212, 156, 214, 190, 21, 223, 255, - 240, 3, 245, 197, 21, 224, 1, 240, 3, 245, 197, 21, 223, 255, 212, 120, - 211, 53, 212, 36, 21, 223, 255, 212, 120, 211, 53, 225, 9, 21, 223, 255, - 212, 120, 211, 53, 228, 7, 21, 223, 255, 212, 120, 211, 53, 228, 5, 21, - 223, 255, 212, 120, 203, 221, 239, 211, 21, 223, 255, 52, 211, 52, 21, - 223, 255, 52, 203, 221, 239, 211, 21, 223, 255, 52, 250, 252, 21, 223, - 255, 52, 250, 253, 203, 221, 239, 211, 21, 223, 255, 245, 130, 21, 223, - 255, 208, 70, 211, 53, 224, 3, 21, 223, 255, 208, 70, 203, 221, 239, 211, - 21, 223, 255, 208, 70, 250, 252, 21, 223, 255, 208, 70, 250, 253, 203, - 221, 239, 211, 21, 223, 255, 248, 121, 212, 36, 21, 223, 255, 248, 121, - 225, 9, 21, 223, 255, 248, 121, 228, 7, 21, 223, 255, 245, 166, 212, 36, - 21, 223, 255, 245, 166, 225, 9, 21, 223, 255, 245, 166, 228, 7, 21, 223, - 255, 245, 166, 215, 196, 21, 223, 255, 246, 169, 212, 36, 21, 223, 255, - 246, 169, 225, 9, 21, 223, 255, 246, 169, 228, 7, 21, 223, 255, 98, 212, - 36, 21, 223, 255, 98, 225, 9, 21, 223, 255, 98, 228, 7, 21, 223, 255, - 202, 30, 212, 36, 21, 223, 255, 202, 30, 225, 9, 21, 223, 255, 202, 30, - 228, 7, 21, 223, 255, 219, 30, 212, 36, 21, 223, 255, 219, 30, 225, 9, - 21, 223, 255, 219, 30, 228, 7, 21, 208, 99, 215, 194, 212, 119, 21, 208, - 99, 215, 194, 242, 78, 21, 208, 99, 215, 194, 250, 252, 21, 208, 99, 215, - 195, 212, 119, 21, 208, 99, 215, 195, 242, 78, 21, 208, 99, 215, 195, - 250, 252, 21, 208, 99, 213, 71, 21, 208, 99, 250, 107, 211, 202, 212, - 119, 21, 208, 99, 250, 107, 211, 202, 242, 78, 21, 208, 99, 250, 107, - 211, 202, 208, 69, 21, 224, 2, 250, 12, 212, 36, 21, 224, 2, 250, 12, - 225, 9, 21, 224, 2, 250, 12, 228, 7, 21, 224, 2, 250, 12, 228, 5, 21, - 224, 2, 208, 123, 212, 36, 21, 224, 2, 208, 123, 225, 9, 21, 224, 2, 208, - 123, 228, 7, 21, 224, 2, 208, 123, 228, 5, 21, 224, 2, 248, 104, 250, 12, - 212, 36, 21, 224, 2, 248, 104, 250, 12, 225, 9, 21, 224, 2, 248, 104, - 250, 12, 228, 7, 21, 224, 2, 248, 104, 250, 12, 228, 5, 21, 224, 2, 248, - 104, 208, 123, 212, 36, 21, 224, 2, 248, 104, 208, 123, 225, 9, 21, 224, - 2, 248, 104, 208, 123, 228, 7, 21, 224, 2, 248, 104, 208, 123, 228, 5, - 21, 224, 1, 212, 120, 211, 53, 212, 36, 21, 224, 1, 212, 120, 211, 53, - 225, 9, 21, 224, 1, 212, 120, 211, 53, 228, 7, 21, 224, 1, 212, 120, 211, - 53, 228, 5, 21, 224, 1, 212, 120, 203, 221, 239, 211, 21, 224, 1, 52, - 211, 52, 21, 224, 1, 52, 203, 221, 239, 211, 21, 224, 1, 52, 250, 252, - 21, 224, 1, 52, 250, 253, 203, 221, 239, 211, 21, 224, 1, 245, 130, 21, - 224, 1, 208, 70, 211, 53, 224, 3, 21, 224, 1, 208, 70, 203, 221, 239, - 211, 21, 224, 1, 208, 70, 250, 253, 224, 3, 21, 224, 1, 208, 70, 250, - 253, 203, 221, 239, 211, 21, 224, 1, 248, 120, 21, 224, 1, 245, 166, 212, - 36, 21, 224, 1, 245, 166, 225, 9, 21, 224, 1, 245, 166, 228, 7, 21, 224, - 1, 246, 168, 21, 224, 1, 98, 212, 36, 21, 224, 1, 98, 225, 9, 21, 224, 1, - 98, 228, 7, 21, 224, 1, 202, 30, 212, 36, 21, 224, 1, 202, 30, 225, 9, - 21, 224, 1, 202, 30, 228, 7, 21, 224, 1, 219, 30, 212, 36, 21, 224, 1, - 219, 30, 225, 9, 21, 224, 1, 219, 30, 228, 7, 21, 208, 100, 215, 195, - 212, 119, 21, 208, 100, 215, 195, 242, 78, 21, 208, 100, 215, 195, 250, - 252, 21, 208, 100, 215, 194, 212, 119, 21, 208, 100, 215, 194, 242, 78, - 21, 208, 100, 215, 194, 250, 252, 21, 208, 100, 213, 71, 21, 223, 255, - 245, 88, 217, 56, 212, 36, 21, 223, 255, 245, 88, 217, 56, 225, 9, 21, - 223, 255, 245, 88, 217, 56, 228, 7, 21, 223, 255, 245, 88, 217, 56, 228, - 5, 21, 223, 255, 245, 88, 237, 136, 212, 36, 21, 223, 255, 245, 88, 237, - 136, 225, 9, 21, 223, 255, 245, 88, 237, 136, 228, 7, 21, 223, 255, 245, - 88, 237, 136, 228, 5, 21, 223, 255, 245, 88, 209, 27, 246, 62, 212, 36, - 21, 223, 255, 245, 88, 209, 27, 246, 62, 225, 9, 21, 223, 255, 236, 14, - 212, 36, 21, 223, 255, 236, 14, 225, 9, 21, 223, 255, 236, 14, 228, 7, - 21, 223, 255, 227, 15, 212, 36, 21, 223, 255, 227, 15, 225, 9, 21, 223, - 255, 227, 15, 228, 7, 21, 223, 255, 227, 15, 5, 242, 78, 21, 223, 255, - 204, 76, 245, 88, 52, 212, 36, 21, 223, 255, 204, 76, 245, 88, 52, 225, - 9, 21, 223, 255, 204, 76, 245, 88, 52, 228, 7, 21, 223, 255, 204, 76, - 245, 88, 208, 70, 212, 36, 21, 223, 255, 204, 76, 245, 88, 208, 70, 225, - 9, 21, 223, 255, 204, 76, 245, 88, 208, 70, 228, 7, 21, 223, 255, 245, - 88, 209, 84, 211, 52, 21, 223, 255, 245, 86, 245, 131, 212, 36, 21, 223, - 255, 245, 86, 245, 131, 225, 9, 21, 215, 194, 212, 119, 21, 215, 194, - 242, 78, 21, 215, 194, 250, 254, 21, 223, 255, 213, 71, 21, 223, 255, - 245, 88, 236, 229, 239, 119, 204, 99, 21, 223, 255, 236, 14, 236, 229, - 239, 119, 204, 99, 21, 223, 255, 227, 15, 236, 229, 239, 119, 204, 99, - 21, 223, 255, 204, 76, 236, 229, 239, 119, 204, 99, 21, 215, 194, 212, - 120, 236, 229, 239, 119, 204, 99, 21, 215, 194, 52, 236, 229, 239, 119, - 204, 99, 21, 215, 194, 250, 253, 236, 229, 239, 119, 204, 99, 21, 223, - 255, 245, 88, 236, 229, 246, 149, 21, 223, 255, 236, 14, 236, 229, 246, - 149, 21, 223, 255, 227, 15, 236, 229, 246, 149, 21, 223, 255, 204, 76, - 236, 229, 246, 149, 21, 215, 194, 212, 120, 236, 229, 246, 149, 21, 215, - 194, 52, 236, 229, 246, 149, 21, 215, 194, 250, 253, 236, 229, 246, 149, - 21, 223, 255, 204, 76, 243, 228, 219, 52, 212, 36, 21, 223, 255, 204, 76, - 243, 228, 219, 52, 225, 9, 21, 223, 255, 204, 76, 243, 228, 219, 52, 228, - 7, 21, 224, 1, 245, 88, 236, 229, 246, 227, 212, 36, 21, 224, 1, 245, 88, - 236, 229, 246, 227, 228, 7, 21, 224, 1, 236, 14, 236, 229, 246, 227, 5, - 242, 78, 21, 224, 1, 236, 14, 236, 229, 246, 227, 228, 8, 242, 78, 21, - 224, 1, 236, 14, 236, 229, 246, 227, 5, 208, 69, 21, 224, 1, 236, 14, - 236, 229, 246, 227, 228, 8, 208, 69, 21, 224, 1, 227, 15, 236, 229, 246, - 227, 5, 212, 119, 21, 224, 1, 227, 15, 236, 229, 246, 227, 228, 8, 212, - 119, 21, 224, 1, 227, 15, 236, 229, 246, 227, 5, 242, 78, 21, 224, 1, - 227, 15, 236, 229, 246, 227, 228, 8, 242, 78, 21, 224, 1, 204, 76, 236, - 229, 246, 227, 212, 36, 21, 224, 1, 204, 76, 236, 229, 246, 227, 228, 7, - 21, 215, 195, 212, 120, 236, 229, 246, 226, 21, 215, 195, 52, 236, 229, - 246, 226, 21, 215, 195, 250, 253, 236, 229, 246, 226, 21, 224, 1, 245, - 88, 236, 229, 239, 205, 212, 36, 21, 224, 1, 245, 88, 236, 229, 239, 205, - 228, 7, 21, 224, 1, 236, 14, 236, 229, 239, 205, 5, 242, 78, 21, 224, 1, - 236, 14, 236, 229, 239, 205, 228, 8, 242, 78, 21, 224, 1, 236, 14, 236, - 229, 239, 205, 208, 70, 5, 208, 69, 21, 224, 1, 236, 14, 236, 229, 239, - 205, 208, 70, 228, 8, 208, 69, 21, 224, 1, 227, 15, 236, 229, 239, 205, - 5, 212, 119, 21, 224, 1, 227, 15, 236, 229, 239, 205, 228, 8, 212, 119, - 21, 224, 1, 227, 15, 236, 229, 239, 205, 5, 242, 78, 21, 224, 1, 227, 15, - 236, 229, 239, 205, 228, 8, 242, 78, 21, 224, 1, 204, 76, 236, 229, 239, - 205, 212, 36, 21, 224, 1, 204, 76, 236, 229, 239, 205, 228, 7, 21, 215, - 195, 212, 120, 236, 229, 239, 204, 21, 215, 195, 52, 236, 229, 239, 204, - 21, 215, 195, 250, 253, 236, 229, 239, 204, 21, 224, 1, 245, 88, 212, 36, - 21, 224, 1, 245, 88, 225, 9, 21, 224, 1, 245, 88, 228, 7, 21, 224, 1, - 245, 88, 228, 5, 21, 224, 1, 245, 88, 245, 237, 21, 224, 1, 236, 14, 212, - 36, 21, 224, 1, 227, 15, 212, 36, 21, 224, 1, 204, 76, 212, 24, 21, 224, - 1, 204, 76, 212, 36, 21, 224, 1, 204, 76, 228, 7, 21, 215, 195, 212, 119, - 21, 215, 195, 242, 78, 21, 215, 195, 250, 252, 21, 224, 1, 213, 72, 219, - 81, 21, 223, 255, 250, 107, 246, 62, 5, 212, 119, 21, 223, 255, 250, 107, - 246, 62, 225, 10, 212, 119, 21, 223, 255, 250, 107, 246, 62, 5, 242, 78, - 21, 223, 255, 250, 107, 246, 62, 225, 10, 242, 78, 21, 224, 1, 250, 107, - 246, 62, 236, 229, 204, 100, 5, 212, 119, 21, 224, 1, 250, 107, 246, 62, - 236, 229, 204, 100, 225, 10, 212, 119, 21, 224, 1, 250, 107, 246, 62, - 236, 229, 204, 100, 228, 8, 212, 119, 21, 224, 1, 250, 107, 246, 62, 236, - 229, 204, 100, 5, 242, 78, 21, 224, 1, 250, 107, 246, 62, 236, 229, 204, - 100, 225, 10, 242, 78, 21, 224, 1, 250, 107, 246, 62, 236, 229, 204, 100, - 228, 8, 242, 78, 21, 223, 255, 203, 221, 246, 62, 239, 119, 212, 119, 21, - 223, 255, 203, 221, 246, 62, 239, 119, 242, 78, 21, 224, 1, 203, 221, - 246, 62, 236, 229, 204, 100, 212, 119, 21, 224, 1, 203, 221, 246, 62, - 236, 229, 204, 100, 242, 78, 21, 223, 255, 240, 3, 246, 59, 212, 119, 21, - 223, 255, 240, 3, 246, 59, 242, 78, 21, 224, 1, 240, 3, 246, 59, 236, - 229, 204, 100, 212, 119, 21, 224, 1, 240, 3, 246, 59, 236, 229, 204, 100, - 242, 78, 21, 242, 4, 250, 95, 212, 36, 21, 242, 4, 250, 95, 228, 7, 21, - 242, 4, 240, 74, 21, 242, 4, 212, 39, 21, 242, 4, 209, 145, 21, 242, 4, - 216, 115, 21, 242, 4, 212, 125, 21, 242, 4, 212, 126, 250, 252, 21, 242, - 4, 240, 221, 219, 221, 208, 221, 21, 242, 4, 238, 12, 21, 237, 64, 21, - 237, 65, 216, 1, 21, 237, 65, 223, 255, 211, 52, 21, 237, 65, 223, 255, - 208, 224, 21, 237, 65, 224, 1, 211, 52, 21, 237, 65, 223, 255, 245, 87, - 21, 237, 65, 224, 1, 245, 87, 21, 237, 65, 224, 4, 246, 61, 21, 240, 103, - 243, 166, 218, 34, 221, 168, 239, 152, 208, 222, 21, 240, 103, 243, 166, - 218, 34, 221, 168, 112, 219, 245, 242, 70, 21, 240, 103, 243, 166, 218, - 34, 221, 168, 112, 219, 245, 121, 208, 222, 21, 240, 190, 211, 53, 206, - 224, 21, 240, 190, 211, 53, 222, 215, 21, 240, 190, 211, 53, 242, 70, 21, - 242, 57, 240, 190, 222, 216, 242, 70, 21, 242, 57, 240, 190, 121, 222, - 215, 21, 242, 57, 240, 190, 112, 222, 215, 21, 242, 57, 240, 190, 222, - 216, 206, 224, 21, 239, 164, 222, 215, 21, 239, 164, 245, 197, 21, 239, - 164, 203, 224, 21, 240, 185, 220, 8, 21, 240, 185, 211, 172, 21, 240, - 185, 246, 15, 21, 240, 192, 248, 34, 212, 119, 21, 240, 192, 248, 34, - 223, 225, 21, 240, 185, 162, 220, 8, 21, 240, 185, 204, 27, 220, 8, 21, - 240, 185, 162, 246, 15, 21, 240, 185, 204, 25, 224, 3, 21, 240, 192, 204, - 9, 21, 240, 186, 206, 224, 21, 240, 186, 242, 70, 21, 240, 186, 239, 191, - 21, 240, 188, 211, 52, 21, 240, 188, 211, 53, 242, 78, 21, 240, 188, 211, - 53, 250, 252, 21, 240, 189, 211, 52, 21, 240, 189, 211, 53, 242, 78, 21, - 240, 189, 211, 53, 250, 252, 21, 240, 188, 245, 85, 21, 240, 189, 245, - 85, 21, 240, 188, 246, 56, 21, 246, 164, 217, 182, 21, 246, 164, 222, - 215, 21, 246, 164, 210, 234, 21, 209, 146, 246, 164, 236, 244, 21, 209, - 146, 246, 164, 224, 148, 21, 209, 146, 246, 164, 227, 0, 21, 241, 181, - 21, 221, 168, 222, 215, 21, 221, 168, 245, 197, 21, 221, 168, 203, 222, - 21, 221, 168, 204, 22, 21, 251, 55, 248, 27, 219, 211, 21, 251, 55, 210, - 233, 231, 49, 21, 251, 55, 248, 29, 5, 215, 193, 21, 251, 55, 210, 235, - 5, 215, 193, 21, 247, 216, 231, 22, 21, 247, 216, 240, 210, 21, 224, 8, - 246, 16, 222, 215, 21, 224, 8, 246, 16, 239, 151, 21, 224, 8, 246, 16, - 245, 197, 21, 224, 8, 212, 31, 21, 224, 8, 212, 32, 203, 224, 21, 224, 8, - 212, 32, 220, 8, 21, 224, 8, 239, 115, 21, 224, 8, 239, 116, 203, 224, - 21, 224, 8, 239, 116, 220, 8, 21, 224, 8, 171, 246, 61, 21, 224, 8, 171, - 239, 151, 21, 224, 8, 171, 203, 224, 21, 224, 8, 171, 219, 204, 21, 224, - 8, 171, 219, 205, 203, 224, 21, 224, 8, 171, 219, 205, 203, 59, 21, 224, - 8, 171, 216, 143, 21, 224, 8, 171, 216, 144, 203, 224, 21, 224, 8, 171, - 216, 144, 203, 59, 21, 224, 8, 229, 66, 21, 224, 8, 229, 67, 239, 151, - 21, 224, 8, 229, 67, 203, 224, 21, 224, 8, 209, 145, 21, 224, 8, 209, - 146, 239, 151, 21, 224, 8, 209, 146, 210, 234, 21, 227, 99, 217, 239, - 208, 169, 21, 227, 101, 226, 251, 115, 206, 220, 21, 227, 101, 206, 221, - 115, 226, 250, 21, 224, 8, 245, 164, 21, 224, 8, 203, 223, 212, 119, 21, - 224, 8, 203, 223, 242, 78, 21, 208, 151, 211, 72, 219, 212, 240, 76, 21, - 208, 151, 227, 144, 227, 98, 21, 208, 151, 208, 211, 248, 104, 227, 98, - 21, 208, 151, 208, 211, 208, 127, 231, 7, 224, 7, 21, 208, 151, 231, 7, - 224, 8, 216, 115, 21, 208, 151, 223, 254, 251, 79, 246, 165, 21, 208, - 151, 246, 218, 211, 72, 219, 211, 21, 208, 151, 246, 218, 231, 7, 224, 7, - 21, 209, 172, 21, 209, 173, 224, 3, 21, 209, 173, 220, 32, 208, 150, 21, - 209, 173, 220, 32, 208, 151, 224, 3, 21, 209, 173, 220, 32, 227, 98, 21, - 209, 173, 220, 32, 227, 99, 224, 3, 21, 209, 173, 248, 50, 227, 98, 21, - 223, 255, 230, 165, 21, 224, 1, 230, 165, 21, 222, 237, 21, 237, 145, 21, - 240, 213, 21, 212, 211, 236, 234, 211, 203, 21, 212, 211, 236, 234, 218, - 33, 21, 204, 98, 212, 211, 236, 234, 224, 6, 21, 239, 203, 212, 211, 236, - 234, 224, 6, 21, 212, 211, 208, 223, 239, 120, 204, 104, 21, 208, 134, - 211, 53, 211, 41, 21, 208, 134, 245, 86, 248, 120, 21, 208, 135, 207, - 137, 21, 206, 221, 248, 18, 208, 223, 239, 120, 236, 234, 230, 95, 21, - 227, 126, 245, 238, 21, 227, 126, 227, 195, 21, 227, 126, 227, 194, 21, - 227, 126, 227, 193, 21, 227, 126, 227, 192, 21, 227, 126, 227, 191, 21, - 227, 126, 227, 190, 21, 227, 126, 227, 189, 21, 240, 2, 21, 227, 45, 211, - 228, 21, 227, 46, 211, 228, 21, 227, 47, 237, 41, 21, 227, 47, 204, 23, - 21, 227, 47, 244, 24, 21, 227, 47, 237, 65, 222, 237, 21, 227, 47, 208, - 136, 21, 227, 47, 227, 125, 243, 198, 21, 245, 233, 21, 239, 102, 211, - 61, 21, 213, 143, 21, 245, 242, 21, 219, 76, 21, 240, 10, 224, 66, 21, - 240, 10, 224, 65, 21, 240, 10, 224, 64, 21, 240, 10, 224, 63, 21, 240, - 10, 224, 62, 21, 215, 197, 224, 66, 21, 215, 197, 224, 65, 21, 215, 197, - 224, 64, 21, 215, 197, 224, 63, 21, 215, 197, 224, 62, 21, 215, 197, 224, - 61, 21, 215, 197, 224, 60, 21, 215, 197, 224, 59, 21, 215, 197, 224, 73, - 21, 215, 197, 224, 72, 21, 215, 197, 224, 71, 21, 215, 197, 224, 70, 21, - 215, 197, 224, 69, 21, 215, 197, 224, 68, 21, 215, 197, 224, 67, 73, 72, - 4, 226, 184, 229, 100, 73, 72, 4, 226, 180, 173, 73, 72, 4, 226, 178, - 228, 209, 73, 72, 4, 226, 54, 229, 198, 73, 72, 4, 226, 24, 229, 201, 73, - 72, 4, 226, 43, 229, 6, 73, 72, 4, 226, 71, 229, 26, 73, 72, 4, 225, 196, - 228, 203, 73, 72, 4, 226, 175, 204, 30, 73, 72, 4, 226, 173, 204, 111, - 73, 72, 4, 226, 171, 203, 217, 73, 72, 4, 225, 249, 204, 55, 73, 72, 4, - 226, 1, 204, 62, 73, 72, 4, 226, 5, 203, 244, 73, 72, 4, 226, 74, 204, 0, - 73, 72, 4, 225, 181, 203, 213, 73, 72, 4, 225, 232, 204, 53, 73, 72, 4, - 226, 58, 203, 201, 73, 72, 4, 226, 70, 203, 203, 73, 72, 4, 225, 236, - 203, 202, 73, 72, 4, 226, 169, 224, 110, 73, 72, 4, 226, 167, 225, 122, - 73, 72, 4, 226, 165, 223, 219, 73, 72, 4, 226, 60, 224, 240, 73, 72, 4, - 226, 25, 224, 54, 73, 72, 4, 225, 221, 223, 243, 73, 72, 4, 225, 186, - 223, 237, 73, 72, 4, 226, 163, 248, 86, 73, 72, 4, 226, 160, 249, 32, 73, - 72, 4, 226, 158, 247, 193, 73, 72, 4, 225, 225, 248, 150, 73, 72, 4, 226, - 22, 248, 162, 73, 72, 4, 226, 16, 248, 10, 73, 72, 4, 225, 237, 248, 23, - 73, 72, 4, 226, 148, 75, 73, 72, 4, 226, 146, 63, 73, 72, 4, 226, 144, - 68, 73, 72, 4, 225, 212, 241, 161, 73, 72, 4, 226, 19, 74, 73, 72, 4, - 225, 210, 220, 18, 73, 72, 4, 225, 228, 78, 73, 72, 4, 225, 238, 241, - 145, 73, 72, 4, 225, 244, 231, 49, 73, 72, 4, 225, 240, 231, 49, 73, 72, - 4, 225, 180, 250, 231, 73, 72, 4, 225, 197, 241, 92, 73, 72, 4, 226, 133, - 212, 162, 73, 72, 4, 226, 131, 215, 36, 73, 72, 4, 226, 129, 211, 10, 73, - 72, 4, 225, 213, 214, 165, 73, 72, 4, 226, 3, 214, 177, 73, 72, 4, 225, - 239, 211, 250, 73, 72, 4, 226, 40, 212, 13, 73, 72, 4, 225, 179, 212, - 161, 73, 72, 4, 226, 119, 227, 148, 73, 72, 4, 226, 117, 228, 113, 73, - 72, 4, 226, 115, 226, 239, 73, 72, 4, 226, 35, 227, 226, 73, 72, 4, 226, - 46, 227, 234, 73, 72, 4, 226, 65, 227, 18, 73, 72, 4, 225, 222, 227, 49, - 73, 72, 4, 226, 9, 163, 227, 234, 73, 72, 4, 226, 141, 243, 233, 73, 72, - 4, 226, 138, 244, 212, 73, 72, 4, 226, 135, 242, 42, 73, 72, 4, 226, 30, - 244, 61, 73, 72, 4, 225, 195, 243, 90, 73, 72, 4, 225, 194, 243, 113, 73, - 72, 4, 226, 127, 209, 2, 73, 72, 4, 226, 124, 210, 22, 73, 72, 4, 226, - 122, 207, 203, 73, 72, 4, 226, 28, 209, 176, 73, 72, 4, 226, 64, 209, - 187, 73, 72, 4, 226, 15, 208, 148, 73, 72, 4, 226, 50, 135, 73, 72, 4, - 226, 113, 230, 141, 73, 72, 4, 226, 110, 230, 181, 73, 72, 4, 226, 108, - 230, 82, 73, 72, 4, 225, 218, 230, 159, 73, 72, 4, 226, 6, 230, 161, 73, - 72, 4, 225, 215, 230, 91, 73, 72, 4, 226, 56, 230, 101, 73, 72, 4, 225, - 200, 163, 230, 101, 73, 72, 4, 226, 106, 203, 11, 73, 72, 4, 226, 103, - 198, 73, 72, 4, 226, 101, 202, 213, 73, 72, 4, 226, 10, 203, 49, 73, 72, - 4, 226, 39, 203, 52, 73, 72, 4, 225, 234, 202, 232, 73, 72, 4, 225, 254, - 202, 247, 73, 72, 4, 226, 97, 240, 26, 73, 72, 4, 226, 95, 240, 108, 73, - 72, 4, 226, 93, 239, 108, 73, 72, 4, 226, 41, 240, 53, 73, 72, 4, 226, - 44, 240, 60, 73, 72, 4, 225, 242, 239, 175, 73, 72, 4, 226, 31, 239, 186, - 73, 72, 4, 225, 178, 239, 107, 73, 72, 4, 226, 18, 240, 81, 73, 72, 4, - 226, 91, 222, 68, 73, 72, 4, 226, 89, 223, 83, 73, 72, 4, 226, 87, 221, - 40, 73, 72, 4, 226, 2, 222, 230, 73, 72, 4, 225, 206, 221, 185, 73, 72, - 4, 225, 199, 237, 3, 73, 72, 4, 226, 82, 152, 73, 72, 4, 225, 189, 236, - 26, 73, 72, 4, 226, 85, 237, 48, 73, 72, 4, 226, 23, 237, 67, 73, 72, 4, - 226, 80, 236, 117, 73, 72, 4, 225, 235, 236, 136, 73, 72, 4, 226, 36, - 237, 47, 73, 72, 4, 225, 247, 236, 110, 73, 72, 4, 226, 66, 236, 238, 73, - 72, 4, 225, 245, 237, 126, 73, 72, 4, 226, 32, 236, 13, 73, 72, 4, 226, - 67, 237, 33, 73, 72, 4, 225, 182, 236, 120, 73, 72, 4, 226, 73, 236, 25, - 73, 72, 4, 226, 29, 222, 168, 73, 72, 4, 226, 78, 222, 182, 73, 72, 4, - 226, 37, 222, 165, 73, 72, 4, 226, 4, 222, 176, 73, 72, 4, 225, 229, 222, - 177, 73, 72, 4, 225, 219, 222, 166, 73, 72, 4, 225, 255, 222, 167, 73, - 72, 4, 225, 216, 222, 181, 73, 72, 4, 225, 248, 222, 164, 73, 72, 4, 226, - 33, 163, 222, 177, 73, 72, 4, 226, 13, 163, 222, 166, 73, 72, 4, 225, - 192, 163, 222, 167, 73, 72, 4, 225, 220, 238, 81, 73, 72, 4, 226, 8, 239, - 8, 73, 72, 4, 225, 207, 237, 230, 73, 72, 4, 225, 185, 238, 182, 73, 72, - 4, 225, 209, 237, 216, 73, 72, 4, 225, 208, 237, 226, 73, 72, 4, 225, - 191, 222, 187, 73, 72, 4, 226, 62, 222, 124, 73, 72, 4, 225, 198, 222, - 113, 73, 72, 4, 226, 51, 218, 167, 73, 72, 4, 226, 20, 185, 73, 72, 4, - 226, 69, 217, 191, 73, 72, 4, 226, 38, 219, 23, 73, 72, 4, 226, 68, 219, - 34, 73, 72, 4, 226, 17, 218, 45, 73, 72, 4, 226, 53, 218, 69, 73, 72, 4, - 225, 230, 225, 39, 73, 72, 4, 226, 57, 225, 54, 73, 72, 4, 225, 253, 225, - 33, 73, 72, 4, 226, 72, 225, 46, 73, 72, 4, 225, 187, 225, 46, 73, 72, 4, - 226, 47, 225, 47, 73, 72, 4, 225, 203, 225, 34, 73, 72, 4, 225, 201, 225, - 35, 73, 72, 4, 225, 188, 225, 27, 73, 72, 4, 225, 214, 163, 225, 47, 73, - 72, 4, 226, 14, 163, 225, 34, 73, 72, 4, 225, 233, 163, 225, 35, 73, 72, - 4, 225, 243, 228, 236, 73, 72, 4, 226, 27, 228, 244, 73, 72, 4, 226, 45, - 228, 232, 73, 72, 4, 226, 76, 228, 239, 73, 72, 4, 226, 11, 228, 240, 73, - 72, 4, 226, 7, 228, 234, 73, 72, 4, 225, 217, 228, 235, 73, 72, 4, 225, - 251, 238, 199, 73, 72, 4, 226, 63, 238, 207, 73, 72, 4, 225, 227, 238, - 194, 73, 72, 4, 226, 26, 238, 203, 73, 72, 4, 226, 12, 238, 204, 73, 72, - 4, 226, 48, 238, 195, 73, 72, 4, 226, 49, 238, 197, 73, 72, 4, 225, 204, - 216, 220, 73, 72, 4, 225, 252, 223, 10, 73, 72, 4, 225, 246, 223, 25, 73, - 72, 4, 225, 250, 222, 248, 73, 72, 4, 225, 184, 223, 16, 73, 72, 4, 226, - 0, 223, 17, 73, 72, 4, 226, 52, 222, 253, 73, 72, 4, 226, 55, 223, 1, 73, - 72, 4, 225, 223, 222, 48, 73, 72, 4, 225, 183, 222, 18, 73, 72, 4, 225, - 226, 222, 39, 73, 72, 4, 225, 241, 222, 22, 73, 72, 4, 225, 193, 205, - 230, 73, 72, 4, 225, 190, 206, 86, 73, 72, 4, 225, 224, 204, 163, 73, 72, - 4, 225, 202, 206, 50, 73, 72, 4, 226, 34, 206, 55, 73, 72, 4, 225, 231, - 205, 176, 73, 72, 4, 226, 42, 205, 189, 73, 72, 4, 225, 211, 220, 242, - 73, 72, 4, 226, 61, 221, 5, 73, 72, 4, 225, 205, 220, 224, 73, 72, 4, - 226, 21, 220, 253, 73, 72, 4, 226, 59, 220, 231, 73, 72, 17, 105, 73, 72, - 17, 108, 73, 72, 17, 147, 73, 72, 17, 149, 73, 72, 17, 170, 73, 72, 17, - 195, 73, 72, 17, 213, 111, 73, 72, 17, 199, 73, 72, 17, 222, 63, 73, 72, - 39, 42, 209, 174, 73, 72, 39, 42, 209, 147, 73, 72, 39, 42, 236, 10, 73, - 72, 39, 42, 209, 34, 73, 72, 39, 42, 209, 153, 209, 34, 73, 72, 39, 42, - 236, 12, 209, 34, 73, 72, 39, 42, 224, 113, 10, 13, 251, 30, 10, 13, 248, - 138, 10, 13, 230, 158, 10, 13, 244, 184, 10, 13, 204, 70, 10, 13, 202, - 107, 10, 13, 237, 148, 10, 13, 209, 251, 10, 13, 203, 47, 10, 13, 230, - 22, 10, 13, 228, 28, 10, 13, 225, 5, 10, 13, 221, 178, 10, 13, 214, 161, - 10, 13, 251, 59, 10, 13, 240, 47, 10, 13, 215, 28, 10, 13, 217, 119, 10, - 13, 216, 122, 10, 13, 213, 39, 10, 13, 209, 169, 10, 13, 209, 88, 10, 13, - 229, 140, 10, 13, 209, 100, 10, 13, 244, 207, 10, 13, 202, 110, 10, 13, - 238, 114, 10, 13, 243, 84, 248, 138, 10, 13, 243, 84, 221, 178, 10, 13, - 243, 84, 240, 47, 10, 13, 243, 84, 217, 119, 10, 13, 81, 248, 138, 10, - 13, 81, 230, 158, 10, 13, 81, 237, 43, 10, 13, 81, 237, 148, 10, 13, 81, - 203, 47, 10, 13, 81, 230, 22, 10, 13, 81, 228, 28, 10, 13, 81, 225, 5, - 10, 13, 81, 221, 178, 10, 13, 81, 214, 161, 10, 13, 81, 251, 59, 10, 13, - 81, 240, 47, 10, 13, 81, 215, 28, 10, 13, 81, 217, 119, 10, 13, 81, 213, - 39, 10, 13, 81, 209, 169, 10, 13, 81, 209, 88, 10, 13, 81, 229, 140, 10, - 13, 81, 244, 207, 10, 13, 81, 238, 114, 10, 13, 209, 247, 230, 158, 10, - 13, 209, 247, 237, 148, 10, 13, 209, 247, 203, 47, 10, 13, 209, 247, 228, - 28, 10, 13, 209, 247, 221, 178, 10, 13, 209, 247, 214, 161, 10, 13, 209, - 247, 251, 59, 10, 13, 209, 247, 215, 28, 10, 13, 209, 247, 217, 119, 10, - 13, 209, 247, 213, 39, 10, 13, 209, 247, 229, 140, 10, 13, 209, 247, 244, - 207, 10, 13, 209, 247, 238, 114, 10, 13, 209, 247, 243, 84, 221, 178, 10, - 13, 209, 247, 243, 84, 217, 119, 10, 13, 211, 40, 248, 138, 10, 13, 211, - 40, 230, 158, 10, 13, 211, 40, 237, 43, 10, 13, 211, 40, 237, 148, 10, - 13, 211, 40, 209, 251, 10, 13, 211, 40, 203, 47, 10, 13, 211, 40, 230, - 22, 10, 13, 211, 40, 225, 5, 10, 13, 211, 40, 221, 178, 10, 13, 211, 40, - 214, 161, 10, 13, 211, 40, 251, 59, 10, 13, 211, 40, 240, 47, 10, 13, - 211, 40, 215, 28, 10, 13, 211, 40, 217, 119, 10, 13, 211, 40, 213, 39, - 10, 13, 211, 40, 209, 169, 10, 13, 211, 40, 209, 88, 10, 13, 211, 40, - 229, 140, 10, 13, 211, 40, 244, 207, 10, 13, 211, 40, 202, 110, 10, 13, - 211, 40, 238, 114, 10, 13, 211, 40, 243, 84, 248, 138, 10, 13, 211, 40, - 243, 84, 240, 47, 10, 13, 227, 13, 251, 30, 10, 13, 227, 13, 248, 138, - 10, 13, 227, 13, 230, 158, 10, 13, 227, 13, 244, 184, 10, 13, 227, 13, - 237, 43, 10, 13, 227, 13, 204, 70, 10, 13, 227, 13, 202, 107, 10, 13, - 227, 13, 237, 148, 10, 13, 227, 13, 209, 251, 10, 13, 227, 13, 203, 47, - 10, 13, 227, 13, 228, 28, 10, 13, 227, 13, 225, 5, 10, 13, 227, 13, 221, - 178, 10, 13, 227, 13, 214, 161, 10, 13, 227, 13, 251, 59, 10, 13, 227, - 13, 240, 47, 10, 13, 227, 13, 215, 28, 10, 13, 227, 13, 217, 119, 10, 13, - 227, 13, 216, 122, 10, 13, 227, 13, 213, 39, 10, 13, 227, 13, 209, 169, - 10, 13, 227, 13, 209, 88, 10, 13, 227, 13, 229, 140, 10, 13, 227, 13, - 209, 100, 10, 13, 227, 13, 244, 207, 10, 13, 227, 13, 202, 110, 10, 13, - 227, 13, 238, 114, 10, 13, 169, 248, 138, 10, 13, 169, 230, 158, 10, 13, - 169, 244, 184, 10, 13, 169, 204, 70, 10, 13, 169, 202, 107, 10, 13, 169, - 237, 148, 10, 13, 169, 209, 251, 10, 13, 169, 203, 47, 10, 13, 169, 228, - 28, 10, 13, 169, 225, 5, 10, 13, 169, 221, 178, 10, 13, 169, 214, 161, - 10, 13, 169, 251, 59, 10, 13, 169, 240, 47, 10, 13, 169, 215, 28, 10, 13, - 169, 217, 119, 10, 13, 169, 216, 122, 10, 13, 169, 213, 39, 10, 13, 169, - 209, 169, 10, 13, 169, 209, 88, 10, 13, 169, 229, 140, 10, 13, 169, 209, - 100, 10, 13, 169, 244, 207, 10, 13, 169, 202, 110, 10, 13, 169, 238, 114, - 10, 13, 219, 255, 83, 3, 151, 3, 209, 209, 10, 13, 219, 255, 151, 3, 244, - 184, 225, 142, 99, 241, 176, 204, 16, 225, 142, 99, 211, 238, 204, 16, - 225, 142, 99, 204, 46, 204, 16, 225, 142, 99, 153, 204, 16, 225, 142, 99, - 216, 138, 242, 61, 225, 142, 99, 237, 244, 242, 61, 225, 142, 99, 61, - 242, 61, 225, 142, 99, 118, 76, 246, 181, 225, 142, 99, 120, 76, 246, - 181, 225, 142, 99, 126, 76, 246, 181, 225, 142, 99, 239, 147, 76, 246, - 181, 225, 142, 99, 239, 233, 76, 246, 181, 225, 142, 99, 212, 88, 76, - 246, 181, 225, 142, 99, 213, 112, 76, 246, 181, 225, 142, 99, 241, 143, - 76, 246, 181, 225, 142, 99, 222, 64, 76, 246, 181, 225, 142, 99, 118, 76, - 248, 243, 225, 142, 99, 120, 76, 248, 243, 225, 142, 99, 126, 76, 248, - 243, 225, 142, 99, 239, 147, 76, 248, 243, 225, 142, 99, 239, 233, 76, - 248, 243, 225, 142, 99, 212, 88, 76, 248, 243, 225, 142, 99, 213, 112, - 76, 248, 243, 225, 142, 99, 241, 143, 76, 248, 243, 225, 142, 99, 222, - 64, 76, 248, 243, 225, 142, 99, 118, 76, 246, 58, 225, 142, 99, 120, 76, - 246, 58, 225, 142, 99, 126, 76, 246, 58, 225, 142, 99, 239, 147, 76, 246, - 58, 225, 142, 99, 239, 233, 76, 246, 58, 225, 142, 99, 212, 88, 76, 246, - 58, 225, 142, 99, 213, 112, 76, 246, 58, 225, 142, 99, 241, 143, 76, 246, - 58, 225, 142, 99, 222, 64, 76, 246, 58, 225, 142, 99, 218, 79, 225, 142, - 99, 219, 242, 225, 142, 99, 248, 244, 225, 142, 99, 246, 99, 225, 142, - 99, 211, 183, 225, 142, 99, 210, 216, 225, 142, 99, 250, 21, 225, 142, - 99, 204, 7, 225, 142, 99, 230, 94, 225, 142, 99, 249, 25, 161, 99, 236, - 106, 249, 25, 161, 99, 236, 104, 161, 99, 236, 103, 161, 99, 236, 102, - 161, 99, 236, 101, 161, 99, 236, 100, 161, 99, 236, 99, 161, 99, 236, 98, - 161, 99, 236, 97, 161, 99, 236, 96, 161, 99, 236, 95, 161, 99, 236, 94, - 161, 99, 236, 93, 161, 99, 236, 92, 161, 99, 236, 91, 161, 99, 236, 90, - 161, 99, 236, 89, 161, 99, 236, 88, 161, 99, 236, 87, 161, 99, 236, 86, - 161, 99, 236, 85, 161, 99, 236, 84, 161, 99, 236, 83, 161, 99, 236, 82, - 161, 99, 236, 81, 161, 99, 236, 80, 161, 99, 236, 79, 161, 99, 236, 78, - 161, 99, 236, 77, 161, 99, 236, 76, 161, 99, 236, 75, 161, 99, 236, 74, - 161, 99, 236, 73, 161, 99, 236, 72, 161, 99, 236, 71, 161, 99, 236, 70, - 161, 99, 236, 69, 161, 99, 236, 68, 161, 99, 236, 67, 161, 99, 236, 66, - 161, 99, 236, 65, 161, 99, 236, 64, 161, 99, 236, 63, 161, 99, 236, 62, - 161, 99, 236, 61, 161, 99, 236, 60, 161, 99, 236, 59, 161, 99, 236, 58, - 161, 99, 236, 57, 161, 99, 236, 56, 161, 99, 80, 249, 25, 161, 99, 206, - 37, 161, 99, 206, 36, 161, 99, 206, 35, 161, 99, 206, 34, 161, 99, 206, - 33, 161, 99, 206, 32, 161, 99, 206, 31, 161, 99, 206, 30, 161, 99, 206, - 29, 161, 99, 206, 28, 161, 99, 206, 27, 161, 99, 206, 26, 161, 99, 206, - 25, 161, 99, 206, 24, 161, 99, 206, 23, 161, 99, 206, 22, 161, 99, 206, - 21, 161, 99, 206, 20, 161, 99, 206, 19, 161, 99, 206, 18, 161, 99, 206, - 17, 161, 99, 206, 16, 161, 99, 206, 15, 161, 99, 206, 14, 161, 99, 206, - 13, 161, 99, 206, 12, 161, 99, 206, 11, 161, 99, 206, 10, 161, 99, 206, - 9, 161, 99, 206, 8, 161, 99, 206, 7, 161, 99, 206, 6, 161, 99, 206, 5, - 161, 99, 206, 4, 161, 99, 206, 3, 161, 99, 206, 2, 161, 99, 206, 1, 161, - 99, 206, 0, 161, 99, 205, 255, 161, 99, 205, 254, 161, 99, 205, 253, 161, - 99, 205, 252, 161, 99, 205, 251, 161, 99, 205, 250, 161, 99, 205, 249, - 161, 99, 205, 248, 161, 99, 205, 247, 161, 99, 205, 246, 161, 99, 205, - 245, 218, 88, 247, 38, 249, 25, 218, 88, 247, 38, 251, 132, 76, 211, 225, - 218, 88, 247, 38, 120, 76, 211, 225, 218, 88, 247, 38, 126, 76, 211, 225, - 218, 88, 247, 38, 239, 147, 76, 211, 225, 218, 88, 247, 38, 239, 233, 76, - 211, 225, 218, 88, 247, 38, 212, 88, 76, 211, 225, 218, 88, 247, 38, 213, - 112, 76, 211, 225, 218, 88, 247, 38, 241, 143, 76, 211, 225, 218, 88, - 247, 38, 222, 64, 76, 211, 225, 218, 88, 247, 38, 209, 153, 76, 211, 225, - 218, 88, 247, 38, 230, 179, 76, 211, 225, 218, 88, 247, 38, 229, 32, 76, - 211, 225, 218, 88, 247, 38, 217, 49, 76, 211, 225, 218, 88, 247, 38, 229, - 82, 76, 211, 225, 218, 88, 247, 38, 251, 132, 76, 237, 53, 218, 88, 247, - 38, 120, 76, 237, 53, 218, 88, 247, 38, 126, 76, 237, 53, 218, 88, 247, - 38, 239, 147, 76, 237, 53, 218, 88, 247, 38, 239, 233, 76, 237, 53, 218, - 88, 247, 38, 212, 88, 76, 237, 53, 218, 88, 247, 38, 213, 112, 76, 237, - 53, 218, 88, 247, 38, 241, 143, 76, 237, 53, 218, 88, 247, 38, 222, 64, - 76, 237, 53, 218, 88, 247, 38, 209, 153, 76, 237, 53, 218, 88, 247, 38, - 230, 179, 76, 237, 53, 218, 88, 247, 38, 229, 32, 76, 237, 53, 218, 88, - 247, 38, 217, 49, 76, 237, 53, 218, 88, 247, 38, 229, 82, 76, 237, 53, - 218, 88, 247, 38, 216, 138, 230, 94, 218, 88, 247, 38, 251, 132, 76, 243, - 220, 218, 88, 247, 38, 120, 76, 243, 220, 218, 88, 247, 38, 126, 76, 243, - 220, 218, 88, 247, 38, 239, 147, 76, 243, 220, 218, 88, 247, 38, 239, - 233, 76, 243, 220, 218, 88, 247, 38, 212, 88, 76, 243, 220, 218, 88, 247, - 38, 213, 112, 76, 243, 220, 218, 88, 247, 38, 241, 143, 76, 243, 220, - 218, 88, 247, 38, 222, 64, 76, 243, 220, 218, 88, 247, 38, 209, 153, 76, - 243, 220, 218, 88, 247, 38, 230, 179, 76, 243, 220, 218, 88, 247, 38, - 229, 32, 76, 243, 220, 218, 88, 247, 38, 217, 49, 76, 243, 220, 218, 88, - 247, 38, 229, 82, 76, 243, 220, 218, 88, 247, 38, 62, 230, 94, 218, 88, - 247, 38, 251, 132, 76, 246, 2, 218, 88, 247, 38, 120, 76, 246, 2, 218, - 88, 247, 38, 126, 76, 246, 2, 218, 88, 247, 38, 239, 147, 76, 246, 2, - 218, 88, 247, 38, 239, 233, 76, 246, 2, 218, 88, 247, 38, 212, 88, 76, - 246, 2, 218, 88, 247, 38, 213, 112, 76, 246, 2, 218, 88, 247, 38, 241, - 143, 76, 246, 2, 218, 88, 247, 38, 222, 64, 76, 246, 2, 218, 88, 247, 38, - 209, 153, 76, 246, 2, 218, 88, 247, 38, 230, 179, 76, 246, 2, 218, 88, - 247, 38, 229, 32, 76, 246, 2, 218, 88, 247, 38, 217, 49, 76, 246, 2, 218, - 88, 247, 38, 229, 82, 76, 246, 2, 218, 88, 247, 38, 61, 230, 94, 218, 88, - 247, 38, 239, 173, 218, 88, 247, 38, 208, 48, 218, 88, 247, 38, 208, 37, - 218, 88, 247, 38, 208, 34, 218, 88, 247, 38, 208, 33, 218, 88, 247, 38, - 208, 32, 218, 88, 247, 38, 208, 31, 218, 88, 247, 38, 208, 30, 218, 88, - 247, 38, 208, 29, 218, 88, 247, 38, 208, 28, 218, 88, 247, 38, 208, 47, - 218, 88, 247, 38, 208, 46, 218, 88, 247, 38, 208, 45, 218, 88, 247, 38, - 208, 44, 218, 88, 247, 38, 208, 43, 218, 88, 247, 38, 208, 42, 218, 88, - 247, 38, 208, 41, 218, 88, 247, 38, 208, 40, 218, 88, 247, 38, 208, 39, - 218, 88, 247, 38, 208, 38, 218, 88, 247, 38, 208, 36, 218, 88, 247, 38, - 208, 35, 17, 202, 85, 239, 102, 211, 61, 17, 202, 85, 245, 233, 17, 118, - 245, 233, 17, 120, 245, 233, 17, 126, 245, 233, 17, 239, 147, 245, 233, - 17, 239, 233, 245, 233, 17, 212, 88, 245, 233, 17, 213, 112, 245, 233, - 17, 241, 143, 245, 233, 17, 222, 64, 245, 233, 243, 174, 43, 41, 17, 202, - 84, 243, 174, 182, 43, 41, 17, 202, 84, 102, 8, 6, 1, 63, 102, 8, 6, 1, - 249, 255, 102, 8, 6, 1, 247, 125, 102, 8, 6, 1, 245, 51, 102, 8, 6, 1, - 74, 102, 8, 6, 1, 240, 174, 102, 8, 6, 1, 239, 75, 102, 8, 6, 1, 237, - 171, 102, 8, 6, 1, 75, 102, 8, 6, 1, 230, 184, 102, 8, 6, 1, 230, 54, - 102, 8, 6, 1, 159, 102, 8, 6, 1, 226, 185, 102, 8, 6, 1, 223, 163, 102, - 8, 6, 1, 78, 102, 8, 6, 1, 219, 184, 102, 8, 6, 1, 217, 134, 102, 8, 6, - 1, 146, 102, 8, 6, 1, 194, 102, 8, 6, 1, 210, 69, 102, 8, 6, 1, 68, 102, - 8, 6, 1, 206, 164, 102, 8, 6, 1, 204, 144, 102, 8, 6, 1, 203, 196, 102, - 8, 6, 1, 203, 124, 102, 8, 6, 1, 202, 159, 208, 133, 213, 33, 247, 226, - 8, 6, 1, 194, 43, 37, 8, 6, 1, 247, 125, 43, 37, 8, 6, 1, 146, 43, 246, - 239, 43, 203, 198, 103, 8, 6, 1, 63, 103, 8, 6, 1, 249, 255, 103, 8, 6, - 1, 247, 125, 103, 8, 6, 1, 245, 51, 103, 8, 6, 1, 74, 103, 8, 6, 1, 240, - 174, 103, 8, 6, 1, 239, 75, 103, 8, 6, 1, 237, 171, 103, 8, 6, 1, 75, - 103, 8, 6, 1, 230, 184, 103, 8, 6, 1, 230, 54, 103, 8, 6, 1, 159, 103, 8, - 6, 1, 226, 185, 103, 8, 6, 1, 223, 163, 103, 8, 6, 1, 78, 103, 8, 6, 1, - 219, 184, 103, 8, 6, 1, 217, 134, 103, 8, 6, 1, 146, 103, 8, 6, 1, 194, - 103, 8, 6, 1, 210, 69, 103, 8, 6, 1, 68, 103, 8, 6, 1, 206, 164, 103, 8, - 6, 1, 204, 144, 103, 8, 6, 1, 203, 196, 103, 8, 6, 1, 203, 124, 103, 8, - 6, 1, 202, 159, 103, 235, 255, 103, 223, 187, 103, 214, 179, 103, 211, - 167, 103, 218, 10, 103, 204, 63, 182, 43, 8, 6, 1, 63, 182, 43, 8, 6, 1, - 249, 255, 182, 43, 8, 6, 1, 247, 125, 182, 43, 8, 6, 1, 245, 51, 182, 43, - 8, 6, 1, 74, 182, 43, 8, 6, 1, 240, 174, 182, 43, 8, 6, 1, 239, 75, 182, - 43, 8, 6, 1, 237, 171, 182, 43, 8, 6, 1, 75, 182, 43, 8, 6, 1, 230, 184, - 182, 43, 8, 6, 1, 230, 54, 182, 43, 8, 6, 1, 159, 182, 43, 8, 6, 1, 226, - 185, 182, 43, 8, 6, 1, 223, 163, 182, 43, 8, 6, 1, 78, 182, 43, 8, 6, 1, - 219, 184, 182, 43, 8, 6, 1, 217, 134, 182, 43, 8, 6, 1, 146, 182, 43, 8, - 6, 1, 194, 182, 43, 8, 6, 1, 210, 69, 182, 43, 8, 6, 1, 68, 182, 43, 8, - 6, 1, 206, 164, 182, 43, 8, 6, 1, 204, 144, 182, 43, 8, 6, 1, 203, 196, - 182, 43, 8, 6, 1, 203, 124, 182, 43, 8, 6, 1, 202, 159, 216, 188, 225, - 26, 54, 216, 188, 225, 23, 54, 182, 103, 8, 6, 1, 63, 182, 103, 8, 6, 1, - 249, 255, 182, 103, 8, 6, 1, 247, 125, 182, 103, 8, 6, 1, 245, 51, 182, - 103, 8, 6, 1, 74, 182, 103, 8, 6, 1, 240, 174, 182, 103, 8, 6, 1, 239, - 75, 182, 103, 8, 6, 1, 237, 171, 182, 103, 8, 6, 1, 75, 182, 103, 8, 6, - 1, 230, 184, 182, 103, 8, 6, 1, 230, 54, 182, 103, 8, 6, 1, 159, 182, - 103, 8, 6, 1, 226, 185, 182, 103, 8, 6, 1, 223, 163, 182, 103, 8, 6, 1, - 78, 182, 103, 8, 6, 1, 219, 184, 182, 103, 8, 6, 1, 217, 134, 182, 103, - 8, 6, 1, 146, 182, 103, 8, 6, 1, 194, 182, 103, 8, 6, 1, 210, 69, 182, - 103, 8, 6, 1, 68, 182, 103, 8, 6, 1, 206, 164, 182, 103, 8, 6, 1, 204, - 144, 182, 103, 8, 6, 1, 203, 196, 182, 103, 8, 6, 1, 203, 124, 182, 103, - 8, 6, 1, 202, 159, 245, 128, 182, 103, 8, 6, 1, 219, 184, 182, 103, 235, - 164, 182, 103, 185, 182, 103, 215, 36, 182, 103, 251, 232, 182, 103, 204, - 63, 51, 243, 132, 103, 246, 42, 103, 245, 176, 103, 239, 129, 103, 235, - 155, 103, 222, 213, 103, 222, 205, 103, 220, 51, 103, 211, 245, 103, 112, - 3, 240, 212, 82, 103, 205, 166, 216, 130, 231, 32, 16, 1, 63, 216, 130, - 231, 32, 16, 1, 249, 255, 216, 130, 231, 32, 16, 1, 247, 125, 216, 130, - 231, 32, 16, 1, 245, 51, 216, 130, 231, 32, 16, 1, 74, 216, 130, 231, 32, - 16, 1, 240, 174, 216, 130, 231, 32, 16, 1, 239, 75, 216, 130, 231, 32, - 16, 1, 237, 171, 216, 130, 231, 32, 16, 1, 75, 216, 130, 231, 32, 16, 1, - 230, 184, 216, 130, 231, 32, 16, 1, 230, 54, 216, 130, 231, 32, 16, 1, - 159, 216, 130, 231, 32, 16, 1, 226, 185, 216, 130, 231, 32, 16, 1, 223, - 163, 216, 130, 231, 32, 16, 1, 78, 216, 130, 231, 32, 16, 1, 219, 184, - 216, 130, 231, 32, 16, 1, 217, 134, 216, 130, 231, 32, 16, 1, 146, 216, - 130, 231, 32, 16, 1, 194, 216, 130, 231, 32, 16, 1, 210, 69, 216, 130, - 231, 32, 16, 1, 68, 216, 130, 231, 32, 16, 1, 206, 164, 216, 130, 231, - 32, 16, 1, 204, 144, 216, 130, 231, 32, 16, 1, 203, 196, 216, 130, 231, - 32, 16, 1, 203, 124, 216, 130, 231, 32, 16, 1, 202, 159, 51, 172, 236, - 130, 103, 67, 229, 14, 103, 67, 215, 36, 103, 12, 206, 239, 233, 100, - 103, 12, 206, 239, 233, 104, 103, 12, 206, 239, 233, 112, 103, 67, 244, - 75, 103, 12, 206, 239, 233, 119, 103, 12, 206, 239, 233, 106, 103, 12, - 206, 239, 233, 78, 103, 12, 206, 239, 233, 105, 103, 12, 206, 239, 233, - 118, 103, 12, 206, 239, 233, 92, 103, 12, 206, 239, 233, 85, 103, 12, - 206, 239, 233, 94, 103, 12, 206, 239, 233, 115, 103, 12, 206, 239, 233, - 101, 103, 12, 206, 239, 233, 117, 103, 12, 206, 239, 233, 93, 103, 12, - 206, 239, 233, 116, 103, 12, 206, 239, 233, 79, 103, 12, 206, 239, 233, - 84, 103, 12, 206, 239, 233, 77, 103, 12, 206, 239, 233, 107, 103, 12, - 206, 239, 233, 109, 103, 12, 206, 239, 233, 87, 103, 12, 206, 239, 233, - 98, 103, 12, 206, 239, 233, 96, 103, 12, 206, 239, 233, 122, 103, 12, - 206, 239, 233, 121, 103, 12, 206, 239, 233, 75, 103, 12, 206, 239, 233, - 102, 103, 12, 206, 239, 233, 120, 103, 12, 206, 239, 233, 111, 103, 12, - 206, 239, 233, 97, 103, 12, 206, 239, 233, 76, 103, 12, 206, 239, 233, - 99, 103, 12, 206, 239, 233, 81, 103, 12, 206, 239, 233, 80, 103, 12, 206, - 239, 233, 110, 103, 12, 206, 239, 233, 88, 103, 12, 206, 239, 233, 90, - 103, 12, 206, 239, 233, 91, 103, 12, 206, 239, 233, 83, 103, 12, 206, - 239, 233, 114, 103, 12, 206, 239, 233, 108, 208, 133, 213, 33, 247, 226, - 12, 206, 239, 233, 89, 208, 133, 213, 33, 247, 226, 12, 206, 239, 233, - 121, 208, 133, 213, 33, 247, 226, 12, 206, 239, 233, 119, 208, 133, 213, - 33, 247, 226, 12, 206, 239, 233, 103, 208, 133, 213, 33, 247, 226, 12, - 206, 239, 233, 86, 208, 133, 213, 33, 247, 226, 12, 206, 239, 233, 99, - 208, 133, 213, 33, 247, 226, 12, 206, 239, 233, 82, 208, 133, 213, 33, - 247, 226, 12, 206, 239, 233, 113, 208, 133, 213, 33, 247, 226, 12, 206, - 239, 233, 95, 43, 189, 251, 111, 43, 189, 251, 136, 245, 62, 239, 184, - 246, 16, 207, 3, 222, 80, 3, 211, 91, 210, 209, 115, 224, 11, 210, 208, - 246, 46, 250, 50, 242, 17, 210, 207, 115, 247, 182, 216, 189, 247, 208, - 250, 50, 222, 79, 204, 81, 204, 75, 205, 181, 224, 118, 204, 65, 241, - 180, 238, 46, 240, 228, 241, 180, 238, 46, 250, 238, 241, 180, 238, 46, - 250, 68, 238, 46, 3, 224, 231, 222, 214, 224, 30, 97, 204, 67, 245, 139, - 224, 30, 97, 239, 245, 217, 56, 224, 30, 97, 204, 67, 238, 77, 224, 30, - 97, 239, 102, 224, 30, 97, 204, 94, 238, 77, 224, 30, 97, 228, 1, 217, - 56, 224, 30, 97, 204, 94, 245, 139, 224, 30, 97, 245, 139, 224, 29, 222, - 214, 224, 30, 3, 240, 102, 239, 245, 217, 56, 224, 30, 3, 240, 102, 228, - 1, 217, 56, 224, 30, 3, 240, 102, 239, 102, 224, 30, 3, 240, 102, 210, - 215, 3, 240, 102, 238, 44, 211, 94, 212, 233, 211, 94, 209, 80, 62, 242, - 49, 61, 210, 214, 61, 210, 215, 3, 5, 246, 7, 61, 210, 215, 248, 135, - 246, 7, 61, 210, 215, 248, 135, 246, 8, 3, 216, 190, 246, 8, 3, 216, 190, - 246, 8, 3, 212, 19, 246, 8, 3, 227, 131, 246, 8, 3, 208, 137, 239, 185, - 204, 17, 248, 27, 240, 102, 236, 47, 243, 102, 210, 2, 247, 158, 246, - 148, 214, 163, 240, 222, 208, 95, 244, 69, 208, 95, 219, 135, 208, 95, - 247, 85, 236, 47, 218, 248, 207, 193, 246, 152, 248, 30, 215, 202, 237, - 2, 210, 212, 248, 30, 241, 184, 76, 225, 131, 241, 184, 76, 216, 52, 237, - 28, 239, 147, 227, 230, 246, 6, 225, 104, 227, 229, 240, 85, 227, 229, - 227, 230, 239, 192, 231, 50, 204, 16, 223, 196, 208, 165, 250, 33, 238, - 5, 224, 249, 204, 79, 209, 225, 227, 199, 248, 239, 218, 120, 216, 138, - 250, 157, 237, 244, 250, 157, 219, 29, 219, 31, 246, 153, 211, 45, 237, - 132, 212, 51, 76, 218, 100, 225, 16, 220, 32, 248, 11, 218, 21, 227, 210, - 216, 53, 245, 145, 216, 53, 248, 251, 245, 179, 216, 52, 245, 89, 25, - 216, 52, 211, 79, 247, 237, 211, 224, 247, 219, 239, 128, 239, 124, 215, - 223, 210, 165, 218, 23, 244, 163, 220, 75, 210, 183, 239, 125, 212, 204, - 239, 244, 247, 79, 3, 210, 158, 244, 13, 212, 7, 235, 163, 245, 143, 213, - 51, 235, 162, 235, 163, 245, 143, 242, 73, 245, 178, 246, 114, 142, 247, - 51, 227, 32, 245, 81, 236, 119, 218, 25, 212, 217, 248, 116, 247, 233, - 218, 26, 76, 239, 174, 245, 177, 239, 163, 25, 229, 33, 209, 184, 204, 3, - 237, 102, 215, 13, 247, 250, 25, 245, 99, 204, 13, 238, 49, 245, 251, - 238, 49, 208, 51, 242, 54, 248, 146, 223, 235, 246, 23, 248, 146, 223, - 234, 249, 28, 247, 249, 239, 163, 25, 229, 34, 3, 218, 89, 247, 250, 3, - 218, 38, 245, 167, 218, 40, 216, 54, 203, 227, 217, 242, 248, 58, 247, - 78, 230, 178, 246, 106, 208, 95, 240, 68, 246, 105, 239, 247, 239, 248, - 211, 222, 248, 250, 219, 66, 218, 39, 245, 215, 248, 251, 209, 229, 208, - 95, 245, 128, 239, 219, 218, 121, 244, 66, 230, 169, 243, 96, 247, 27, - 211, 44, 204, 17, 246, 130, 224, 30, 205, 217, 246, 204, 214, 196, 214, - 223, 238, 11, 247, 48, 237, 56, 3, 208, 211, 220, 32, 209, 93, 227, 222, - 247, 243, 76, 239, 196, 224, 119, 225, 13, 216, 110, 216, 54, 31, 229, - 150, 3, 230, 177, 211, 15, 224, 152, 227, 167, 212, 49, 245, 184, 229, - 30, 248, 158, 250, 78, 31, 221, 155, 248, 158, 244, 19, 31, 221, 155, - 240, 6, 239, 133, 251, 114, 208, 252, 247, 28, 236, 49, 240, 35, 204, 36, - 215, 213, 245, 252, 239, 239, 218, 54, 25, 239, 243, 224, 152, 223, 253, - 247, 65, 246, 65, 237, 60, 250, 85, 219, 138, 208, 145, 237, 83, 246, 51, - 209, 144, 208, 253, 246, 37, 248, 20, 218, 241, 250, 84, 205, 226, 238, - 238, 243, 167, 236, 230, 212, 42, 225, 172, 248, 69, 238, 239, 243, 213, - 247, 236, 239, 198, 218, 88, 247, 36, 31, 221, 160, 223, 226, 31, 221, - 155, 214, 209, 237, 214, 31, 229, 149, 208, 27, 205, 206, 31, 214, 189, - 215, 126, 212, 246, 3, 214, 226, 209, 149, 216, 209, 25, 248, 251, 212, - 67, 25, 212, 67, 248, 4, 248, 213, 25, 236, 112, 246, 154, 239, 225, 212, - 18, 215, 127, 210, 188, 211, 189, 225, 13, 208, 52, 236, 50, 216, 210, - 250, 239, 239, 171, 215, 139, 239, 171, 210, 160, 204, 51, 227, 136, 238, - 30, 216, 211, 224, 18, 216, 211, 247, 39, 245, 136, 248, 210, 25, 248, - 251, 205, 180, 240, 25, 236, 133, 211, 73, 25, 248, 251, 235, 163, 236, - 133, 211, 73, 25, 217, 184, 210, 9, 209, 149, 219, 156, 25, 248, 251, - 212, 20, 247, 44, 224, 12, 247, 63, 248, 161, 3, 207, 3, 247, 184, 245, - 198, 236, 39, 247, 182, 246, 45, 244, 23, 236, 39, 247, 183, 246, 35, - 247, 183, 244, 15, 244, 16, 230, 208, 223, 67, 219, 72, 211, 104, 236, - 39, 247, 183, 236, 39, 3, 238, 222, 220, 67, 247, 183, 230, 169, 218, 31, - 220, 66, 240, 227, 218, 31, 220, 66, 236, 48, 248, 235, 250, 23, 209, - 157, 225, 172, 236, 44, 227, 1, 236, 44, 245, 182, 211, 57, 214, 195, - 244, 26, 211, 57, 240, 91, 230, 189, 228, 13, 230, 169, 247, 19, 240, - 227, 247, 19, 61, 219, 3, 62, 219, 3, 204, 73, 61, 239, 225, 204, 73, 62, - 239, 225, 215, 201, 62, 215, 201, 228, 105, 249, 12, 216, 209, 25, 212, - 183, 247, 241, 25, 47, 250, 234, 241, 98, 65, 239, 234, 207, 119, 241, - 98, 65, 239, 234, 207, 116, 241, 98, 65, 239, 234, 207, 114, 241, 98, 65, - 239, 234, 207, 112, 241, 98, 65, 239, 234, 207, 110, 216, 172, 224, 9, - 219, 193, 204, 81, 247, 188, 245, 149, 208, 245, 227, 183, 216, 212, 247, - 17, 242, 61, 245, 135, 204, 39, 212, 26, 212, 24, 236, 49, 216, 184, 238, - 35, 213, 37, 224, 48, 215, 205, 246, 140, 243, 102, 218, 131, 248, 21, - 241, 114, 220, 78, 211, 202, 213, 32, 247, 187, 250, 198, 236, 118, 228, - 98, 248, 144, 239, 243, 208, 51, 239, 243, 248, 28, 207, 171, 237, 81, - 246, 141, 249, 28, 246, 141, 239, 118, 249, 28, 246, 141, 248, 60, 219, - 5, 229, 24, 218, 44, 242, 51, 247, 67, 249, 17, 247, 67, 243, 95, 224, - 10, 240, 102, 245, 150, 240, 102, 208, 246, 240, 102, 216, 213, 240, 102, - 247, 18, 240, 102, 242, 62, 240, 102, 211, 187, 204, 39, 236, 50, 240, - 102, 224, 49, 240, 102, 243, 103, 240, 102, 218, 132, 240, 102, 239, 122, - 240, 102, 237, 129, 240, 102, 203, 253, 240, 102, 248, 156, 240, 102, - 219, 120, 240, 102, 218, 132, 221, 167, 219, 46, 217, 230, 246, 125, 240, - 184, 240, 191, 241, 183, 221, 167, 224, 7, 208, 150, 61, 112, 218, 59, - 249, 23, 231, 35, 61, 121, 218, 59, 249, 23, 231, 35, 61, 49, 218, 59, - 249, 23, 231, 35, 61, 50, 218, 59, 249, 23, 231, 35, 239, 237, 237, 124, - 54, 204, 73, 237, 124, 54, 220, 52, 237, 124, 54, 209, 20, 112, 54, 209, - 20, 121, 54, 246, 36, 237, 100, 54, 171, 237, 100, 54, 245, 122, 203, - 249, 237, 83, 240, 187, 222, 236, 210, 68, 230, 160, 242, 56, 229, 85, - 248, 71, 203, 249, 246, 9, 217, 165, 237, 103, 218, 22, 225, 112, 212, - 239, 250, 46, 212, 239, 236, 243, 212, 239, 203, 249, 214, 240, 203, 249, - 248, 3, 239, 169, 247, 150, 231, 50, 212, 136, 247, 149, 231, 50, 212, - 136, 247, 232, 238, 60, 225, 122, 203, 250, 240, 82, 225, 123, 25, 203, - 251, 236, 127, 237, 99, 120, 224, 241, 236, 127, 237, 99, 120, 203, 248, - 236, 127, 237, 99, 218, 51, 220, 65, 203, 251, 3, 247, 168, 241, 181, - 247, 209, 3, 206, 46, 218, 230, 3, 248, 32, 237, 145, 225, 123, 3, 237, - 227, 218, 168, 225, 108, 225, 123, 3, 207, 180, 220, 44, 225, 122, 220, - 44, 203, 250, 249, 27, 245, 199, 203, 234, 217, 235, 230, 169, 220, 61, - 230, 169, 238, 34, 238, 89, 249, 28, 250, 221, 240, 196, 251, 20, 251, - 21, 224, 39, 231, 55, 212, 62, 231, 25, 244, 12, 218, 229, 237, 221, 244, - 167, 227, 97, 223, 91, 218, 50, 240, 103, 225, 74, 237, 144, 248, 229, - 218, 53, 210, 88, 218, 124, 229, 67, 82, 227, 1, 227, 174, 215, 252, 238, - 180, 211, 63, 229, 66, 247, 242, 245, 152, 3, 237, 55, 204, 58, 248, 154, - 237, 55, 247, 203, 237, 55, 120, 237, 53, 211, 220, 237, 55, 237, 237, - 237, 55, 237, 56, 3, 47, 248, 26, 237, 55, 237, 244, 237, 55, 203, 45, - 237, 55, 217, 166, 237, 55, 237, 56, 3, 216, 54, 216, 67, 237, 53, 237, - 56, 244, 66, 243, 222, 213, 63, 3, 34, 70, 231, 6, 241, 117, 157, 247, - 180, 250, 220, 97, 248, 12, 212, 54, 97, 245, 244, 97, 211, 196, 210, - 167, 97, 242, 49, 244, 145, 97, 218, 125, 76, 218, 45, 239, 210, 248, 83, - 243, 133, 97, 211, 212, 248, 250, 209, 38, 248, 250, 61, 239, 197, 236, - 12, 218, 57, 97, 224, 53, 249, 10, 245, 92, 240, 214, 79, 243, 97, 54, - 245, 141, 247, 37, 248, 234, 3, 203, 43, 54, 248, 234, 3, 243, 97, 54, - 248, 234, 3, 240, 230, 54, 248, 234, 3, 218, 20, 54, 224, 53, 3, 204, 11, - 246, 178, 3, 177, 208, 91, 25, 203, 43, 54, 214, 174, 218, 228, 245, 220, - 247, 207, 224, 108, 239, 202, 243, 154, 219, 248, 243, 159, 242, 12, 240, - 11, 239, 182, 171, 240, 11, 239, 182, 219, 154, 3, 245, 95, 219, 154, - 240, 95, 206, 224, 247, 72, 209, 183, 247, 72, 247, 38, 231, 35, 246, - 178, 3, 177, 208, 90, 246, 178, 3, 183, 208, 90, 248, 231, 246, 177, 246, - 22, 217, 161, 215, 191, 217, 161, 219, 94, 211, 53, 215, 133, 208, 82, - 215, 133, 248, 8, 210, 7, 227, 227, 221, 158, 221, 159, 3, 244, 65, 245, - 151, 246, 16, 248, 9, 171, 248, 9, 237, 244, 248, 9, 248, 26, 248, 9, - 219, 243, 248, 9, 248, 6, 223, 85, 249, 14, 214, 182, 224, 242, 209, 162, - 216, 152, 219, 152, 240, 65, 225, 172, 214, 222, 250, 195, 217, 185, 251, - 119, 227, 3, 246, 162, 224, 254, 219, 210, 208, 98, 231, 46, 208, 98, - 219, 161, 241, 236, 97, 231, 43, 241, 57, 241, 58, 3, 183, 53, 55, 246, - 16, 225, 137, 3, 226, 249, 239, 225, 246, 16, 225, 137, 3, 216, 188, 239, - 225, 171, 225, 137, 3, 216, 188, 239, 225, 171, 225, 137, 3, 226, 249, - 239, 225, 218, 28, 218, 29, 236, 53, 222, 210, 224, 80, 218, 176, 224, - 80, 218, 177, 3, 86, 53, 250, 50, 227, 222, 205, 229, 224, 79, 224, 80, - 218, 177, 220, 68, 221, 192, 224, 80, 218, 175, 250, 196, 3, 248, 220, - 247, 65, 247, 66, 3, 239, 218, 205, 226, 247, 65, 209, 159, 216, 204, - 205, 225, 240, 6, 217, 217, 218, 35, 211, 74, 217, 254, 248, 160, 207, - 138, 86, 250, 91, 246, 18, 86, 25, 96, 171, 246, 62, 250, 91, 246, 18, - 86, 25, 96, 171, 246, 62, 250, 92, 3, 43, 118, 219, 199, 246, 18, 183, - 25, 177, 171, 246, 62, 250, 91, 250, 194, 183, 25, 177, 171, 246, 62, - 250, 91, 124, 247, 206, 97, 138, 247, 206, 97, 211, 217, 3, 247, 58, 95, - 211, 216, 211, 217, 3, 118, 211, 241, 204, 75, 211, 217, 3, 126, 211, - 241, 204, 74, 248, 203, 241, 117, 218, 81, 227, 217, 225, 149, 238, 49, - 216, 11, 225, 149, 238, 49, 227, 43, 3, 231, 17, 219, 9, 246, 16, 227, - 43, 3, 229, 151, 229, 151, 227, 42, 171, 227, 42, 248, 128, 248, 129, 3, - 247, 58, 95, 248, 7, 227, 105, 97, 216, 205, 247, 145, 249, 26, 3, 96, - 53, 55, 241, 84, 3, 96, 53, 55, 220, 32, 3, 240, 212, 131, 3, 49, 50, 53, - 55, 211, 249, 3, 86, 53, 55, 208, 145, 3, 177, 53, 55, 221, 192, 118, - 206, 248, 241, 141, 97, 229, 148, 209, 152, 231, 11, 16, 35, 8, 6, 227, - 173, 231, 11, 16, 35, 8, 5, 227, 173, 231, 11, 16, 35, 221, 45, 231, 11, - 16, 35, 210, 102, 231, 11, 16, 35, 8, 227, 173, 239, 249, 241, 117, 208, - 140, 203, 225, 237, 130, 221, 28, 25, 248, 14, 236, 134, 218, 106, 224, - 151, 209, 160, 245, 112, 248, 251, 212, 88, 218, 61, 211, 95, 3, 101, - 243, 85, 230, 169, 16, 35, 248, 141, 208, 80, 241, 100, 62, 51, 247, 145, - 61, 51, 247, 145, 228, 8, 216, 138, 246, 61, 228, 8, 248, 26, 246, 61, - 228, 8, 219, 243, 243, 221, 228, 8, 248, 26, 243, 221, 5, 219, 243, 243, - 221, 5, 248, 26, 243, 221, 206, 223, 216, 138, 208, 85, 242, 69, 216, - 138, 208, 85, 206, 223, 5, 216, 138, 208, 85, 242, 69, 5, 216, 138, 208, - 85, 226, 251, 50, 213, 77, 61, 246, 61, 206, 221, 50, 213, 77, 61, 246, - 61, 43, 245, 131, 218, 48, 245, 131, 218, 49, 3, 237, 136, 56, 245, 131, - 218, 48, 221, 162, 49, 213, 146, 3, 126, 243, 83, 221, 162, 50, 213, 146, - 3, 126, 243, 83, 16, 35, 225, 87, 246, 184, 61, 8, 245, 130, 79, 8, 245, - 130, 246, 222, 245, 130, 220, 40, 97, 242, 72, 76, 219, 32, 230, 39, 224, - 22, 210, 96, 224, 237, 3, 222, 64, 247, 222, 247, 238, 76, 235, 222, 246, - 20, 240, 103, 118, 220, 83, 246, 20, 240, 103, 120, 220, 83, 246, 20, - 240, 103, 126, 220, 83, 246, 20, 240, 103, 239, 147, 220, 83, 246, 20, - 240, 103, 239, 233, 220, 83, 246, 20, 240, 103, 212, 88, 220, 83, 246, - 20, 240, 103, 213, 112, 220, 83, 246, 20, 240, 103, 241, 143, 220, 83, - 246, 20, 240, 103, 222, 64, 220, 83, 246, 20, 240, 103, 209, 153, 220, - 83, 246, 20, 240, 103, 241, 113, 220, 83, 246, 20, 240, 103, 207, 155, - 220, 83, 246, 20, 240, 103, 220, 27, 246, 20, 240, 103, 207, 132, 246, - 20, 240, 103, 209, 26, 246, 20, 240, 103, 239, 143, 246, 20, 240, 103, - 239, 231, 246, 20, 240, 103, 212, 84, 246, 20, 240, 103, 213, 110, 246, - 20, 240, 103, 241, 142, 246, 20, 240, 103, 222, 62, 246, 20, 240, 103, - 209, 151, 246, 20, 240, 103, 241, 111, 246, 20, 240, 103, 207, 153, 50, - 211, 216, 50, 211, 217, 3, 118, 211, 241, 204, 75, 50, 211, 217, 3, 126, - 211, 241, 204, 74, 247, 175, 247, 176, 3, 211, 241, 204, 74, 215, 251, - 248, 128, 248, 9, 247, 56, 225, 109, 246, 19, 62, 212, 63, 25, 245, 129, - 221, 192, 218, 112, 236, 126, 225, 123, 231, 50, 247, 152, 210, 228, 227, - 166, 212, 52, 219, 245, 211, 178, 244, 150, 210, 210, 211, 205, 211, 206, - 204, 59, 230, 83, 49, 237, 124, 209, 162, 216, 152, 209, 162, 216, 153, - 3, 219, 153, 50, 237, 124, 209, 162, 216, 152, 61, 208, 126, 209, 161, - 62, 208, 126, 209, 161, 209, 162, 220, 32, 208, 145, 76, 224, 76, 246, - 40, 224, 80, 218, 176, 249, 26, 76, 241, 57, 211, 100, 241, 57, 241, 58, - 3, 227, 131, 239, 189, 241, 57, 219, 10, 115, 211, 100, 241, 57, 227, - 104, 219, 93, 62, 217, 161, 226, 251, 49, 219, 8, 226, 251, 49, 248, 246, - 219, 9, 226, 251, 49, 239, 149, 219, 9, 226, 251, 49, 219, 147, 226, 251, - 49, 245, 144, 49, 203, 220, 237, 123, 207, 174, 220, 52, 237, 124, 54, - 216, 188, 237, 124, 3, 239, 254, 211, 195, 216, 73, 216, 188, 237, 124, - 3, 239, 254, 211, 195, 216, 73, 209, 20, 112, 54, 216, 73, 209, 20, 121, - 54, 216, 73, 205, 228, 237, 123, 216, 73, 237, 124, 3, 101, 240, 3, 240, - 201, 216, 188, 237, 124, 3, 219, 71, 248, 104, 101, 25, 215, 253, 239, - 253, 61, 121, 218, 59, 49, 237, 124, 231, 35, 212, 154, 61, 49, 218, 59, - 231, 35, 212, 154, 61, 50, 218, 59, 231, 35, 212, 154, 62, 49, 218, 59, - 231, 35, 212, 154, 62, 50, 218, 59, 231, 35, 62, 49, 218, 59, 249, 23, - 231, 35, 62, 50, 218, 59, 249, 23, 231, 35, 212, 154, 61, 112, 218, 59, - 231, 35, 212, 154, 61, 121, 218, 59, 231, 35, 212, 154, 62, 112, 218, 59, - 231, 35, 212, 154, 62, 121, 218, 59, 231, 35, 62, 112, 218, 59, 249, 23, - 231, 35, 62, 121, 218, 59, 249, 23, 231, 35, 244, 11, 245, 220, 229, 150, - 25, 224, 9, 126, 222, 218, 245, 219, 217, 231, 218, 67, 247, 74, 62, 237, - 91, 213, 33, 239, 202, 243, 154, 61, 237, 91, 213, 33, 239, 202, 243, - 154, 212, 7, 213, 33, 239, 202, 243, 154, 209, 221, 247, 22, 204, 6, 229, - 149, 118, 247, 146, 224, 9, 120, 247, 146, 224, 9, 126, 247, 146, 224, 9, - 208, 117, 38, 218, 228, 245, 220, 237, 91, 243, 154, 214, 184, 217, 232, - 235, 156, 240, 65, 235, 156, 219, 248, 243, 160, 235, 156, 243, 107, 3, - 209, 112, 243, 107, 3, 209, 113, 25, 218, 161, 243, 107, 3, 218, 161, - 239, 135, 3, 218, 161, 239, 135, 3, 208, 225, 239, 135, 3, 250, 232, 203, - 196, 62, 239, 182, 239, 182, 171, 239, 182, 247, 38, 122, 243, 140, 247, - 38, 240, 11, 247, 233, 240, 11, 247, 87, 241, 94, 221, 160, 241, 94, 221, - 161, 219, 153, 241, 94, 221, 161, 219, 159, 221, 160, 221, 161, 219, 153, - 221, 161, 219, 159, 241, 94, 243, 106, 241, 94, 219, 153, 241, 94, 219, - 151, 243, 106, 219, 153, 219, 151, 204, 85, 211, 202, 221, 161, 219, 159, - 211, 202, 247, 73, 219, 159, 244, 11, 204, 15, 224, 105, 225, 64, 219, - 201, 246, 18, 50, 25, 49, 213, 146, 250, 91, 247, 58, 203, 196, 231, 41, - 239, 176, 212, 72, 97, 244, 64, 239, 176, 212, 72, 97, 245, 221, 38, 229, - 151, 215, 214, 222, 210, 219, 154, 3, 43, 209, 112, 211, 65, 246, 177, - 244, 196, 229, 33, 227, 98, 211, 215, 237, 65, 231, 50, 212, 136, 126, - 216, 163, 55, 126, 216, 163, 56, 126, 216, 163, 227, 222, 126, 216, 163, - 216, 16, 49, 211, 212, 247, 192, 50, 211, 212, 247, 192, 120, 211, 212, - 247, 191, 126, 211, 212, 247, 191, 49, 209, 38, 247, 192, 50, 209, 38, - 247, 192, 49, 250, 220, 247, 192, 50, 250, 220, 247, 192, 224, 34, 247, - 192, 227, 132, 224, 34, 247, 192, 227, 132, 224, 33, 248, 248, 98, 3, - 248, 247, 248, 248, 132, 203, 196, 248, 248, 98, 3, 132, 203, 196, 248, - 248, 26, 132, 203, 196, 248, 248, 98, 3, 26, 132, 203, 196, 157, 246, - 169, 82, 248, 248, 98, 3, 26, 246, 168, 203, 233, 225, 106, 224, 14, 239, - 103, 208, 167, 208, 122, 211, 86, 76, 227, 146, 212, 137, 76, 230, 170, - 223, 251, 237, 241, 240, 102, 237, 241, 240, 103, 3, 212, 30, 240, 184, - 240, 103, 3, 209, 179, 76, 230, 85, 212, 30, 240, 103, 3, 171, 224, 7, - 212, 30, 240, 103, 3, 171, 224, 8, 25, 212, 30, 240, 184, 212, 30, 240, - 103, 3, 171, 224, 8, 25, 245, 246, 210, 166, 212, 30, 240, 103, 3, 171, - 224, 8, 25, 208, 243, 240, 184, 212, 30, 240, 103, 3, 237, 135, 212, 30, - 240, 103, 3, 236, 52, 204, 8, 240, 102, 212, 30, 240, 103, 3, 212, 30, - 240, 184, 240, 103, 214, 214, 244, 45, 239, 174, 216, 113, 240, 102, 212, - 30, 240, 103, 3, 237, 54, 240, 184, 212, 30, 240, 103, 3, 210, 210, 212, - 29, 240, 102, 222, 216, 240, 102, 240, 203, 240, 102, 206, 253, 240, 102, - 240, 103, 3, 245, 246, 210, 166, 219, 1, 240, 102, 245, 212, 240, 102, - 245, 213, 240, 102, 229, 65, 240, 102, 240, 103, 209, 23, 34, 229, 66, - 229, 65, 240, 103, 3, 212, 30, 240, 184, 229, 65, 240, 103, 3, 246, 16, - 240, 184, 240, 103, 3, 211, 16, 208, 150, 240, 103, 3, 211, 16, 208, 151, - 25, 204, 8, 240, 191, 240, 103, 3, 211, 16, 208, 151, 25, 208, 243, 240, - 184, 243, 161, 240, 102, 203, 232, 240, 102, 250, 214, 240, 102, 218, 19, - 240, 102, 245, 114, 240, 102, 218, 232, 240, 102, 240, 103, 3, 227, 17, - 76, 208, 62, 243, 161, 247, 148, 216, 113, 240, 102, 239, 114, 240, 103, - 3, 171, 224, 7, 250, 212, 240, 102, 240, 58, 240, 102, 204, 60, 240, 102, - 212, 53, 240, 102, 208, 205, 240, 102, 237, 242, 240, 102, 227, 4, 245, - 114, 240, 102, 240, 103, 3, 171, 224, 7, 236, 2, 240, 102, 240, 103, 3, - 171, 224, 8, 25, 245, 246, 210, 166, 240, 103, 214, 186, 231, 50, 240, - 59, 250, 56, 240, 102, 239, 194, 240, 102, 212, 54, 240, 102, 243, 133, - 240, 102, 240, 103, 204, 3, 224, 7, 240, 103, 3, 225, 12, 225, 76, 237, - 241, 247, 18, 240, 103, 3, 212, 30, 240, 184, 247, 18, 240, 103, 3, 209, - 179, 76, 230, 85, 212, 30, 247, 18, 240, 103, 3, 171, 224, 7, 212, 30, - 247, 18, 240, 103, 3, 237, 54, 240, 184, 247, 18, 240, 103, 3, 203, 218, - 212, 31, 229, 65, 247, 18, 240, 103, 3, 246, 16, 240, 184, 218, 19, 247, - 18, 240, 102, 245, 114, 247, 18, 240, 102, 204, 60, 247, 18, 240, 102, - 212, 47, 239, 114, 240, 102, 212, 47, 212, 30, 240, 102, 206, 218, 240, - 102, 240, 103, 3, 215, 212, 240, 184, 240, 103, 3, 221, 192, 238, 27, - 238, 160, 240, 103, 3, 220, 52, 238, 160, 218, 230, 247, 239, 244, 59, - 214, 164, 224, 48, 237, 57, 224, 48, 211, 218, 224, 48, 237, 93, 218, - 230, 216, 187, 118, 237, 123, 218, 230, 216, 187, 247, 251, 237, 100, - 231, 50, 246, 224, 218, 230, 239, 113, 218, 230, 3, 218, 19, 240, 102, - 218, 230, 3, 239, 183, 237, 99, 153, 204, 46, 218, 59, 227, 229, 211, - 238, 204, 46, 218, 59, 227, 229, 153, 241, 176, 218, 59, 227, 229, 211, - 238, 241, 176, 218, 59, 227, 229, 207, 174, 153, 204, 46, 218, 59, 227, - 229, 207, 174, 211, 238, 204, 46, 218, 59, 227, 229, 207, 174, 153, 241, - 176, 218, 59, 227, 229, 207, 174, 211, 238, 241, 176, 218, 59, 227, 229, - 153, 204, 46, 218, 59, 205, 212, 227, 229, 211, 238, 204, 46, 218, 59, - 205, 212, 227, 229, 153, 241, 176, 218, 59, 205, 212, 227, 229, 211, 238, - 241, 176, 218, 59, 205, 212, 227, 229, 79, 153, 204, 46, 218, 59, 205, - 212, 227, 229, 79, 211, 238, 204, 46, 218, 59, 205, 212, 227, 229, 79, - 153, 241, 176, 218, 59, 205, 212, 227, 229, 79, 211, 238, 241, 176, 218, - 59, 205, 212, 227, 229, 153, 204, 46, 218, 59, 247, 189, 211, 238, 204, - 46, 218, 59, 247, 189, 153, 241, 176, 218, 59, 247, 189, 211, 238, 241, - 176, 218, 59, 247, 189, 79, 153, 204, 46, 218, 59, 247, 189, 79, 211, - 238, 204, 46, 218, 59, 247, 189, 79, 153, 241, 176, 218, 59, 247, 189, - 79, 211, 238, 241, 176, 218, 59, 247, 189, 236, 125, 217, 40, 51, 219, - 233, 236, 125, 217, 40, 51, 219, 234, 231, 50, 62, 211, 177, 212, 2, 217, - 40, 51, 219, 233, 212, 2, 217, 40, 51, 219, 234, 231, 50, 62, 211, 177, - 96, 215, 218, 177, 215, 218, 86, 215, 218, 183, 215, 218, 132, 32, 240, - 251, 219, 233, 79, 132, 32, 240, 251, 219, 233, 32, 171, 240, 251, 219, - 233, 79, 32, 171, 240, 251, 219, 233, 79, 250, 236, 219, 233, 210, 169, - 250, 236, 219, 233, 41, 79, 52, 207, 174, 245, 234, 217, 31, 131, 219, - 233, 41, 79, 52, 245, 234, 217, 31, 131, 219, 233, 41, 79, 124, 52, 245, - 234, 217, 31, 131, 219, 233, 79, 230, 248, 219, 233, 41, 230, 248, 219, - 233, 79, 41, 230, 248, 219, 233, 205, 242, 79, 212, 0, 205, 242, 79, 216, - 74, 212, 0, 246, 167, 248, 20, 216, 74, 246, 167, 248, 20, 215, 218, 237, - 38, 211, 81, 227, 40, 216, 193, 247, 39, 236, 240, 208, 110, 236, 240, - 208, 111, 3, 247, 178, 221, 167, 208, 110, 224, 213, 157, 216, 194, 211, - 87, 208, 108, 208, 109, 247, 39, 247, 153, 220, 29, 247, 153, 208, 59, - 247, 154, 211, 61, 224, 109, 250, 240, 239, 250, 241, 77, 218, 51, 247, - 39, 220, 29, 218, 51, 247, 39, 209, 197, 220, 29, 209, 197, 250, 22, 220, - 29, 250, 22, 216, 145, 206, 47, 244, 41, 208, 50, 250, 86, 227, 8, 208, - 116, 224, 42, 224, 13, 216, 192, 210, 182, 216, 192, 224, 13, 247, 86, - 251, 95, 208, 107, 212, 251, 215, 188, 211, 210, 236, 106, 208, 114, 227, - 134, 80, 208, 114, 227, 134, 245, 199, 54, 218, 51, 247, 24, 216, 67, - 227, 134, 208, 82, 239, 226, 220, 32, 218, 30, 243, 88, 221, 192, 241, - 63, 54, 212, 28, 97, 221, 192, 212, 28, 97, 217, 160, 227, 87, 231, 50, - 230, 198, 218, 97, 97, 243, 114, 221, 166, 227, 87, 97, 218, 24, 204, 81, - 97, 221, 182, 204, 81, 97, 248, 82, 221, 192, 248, 81, 248, 80, 224, 13, - 248, 80, 219, 25, 221, 192, 219, 24, 246, 132, 245, 123, 224, 236, 97, - 203, 247, 97, 216, 83, 249, 28, 97, 208, 168, 204, 81, 246, 13, 212, 209, - 248, 206, 248, 204, 219, 57, 245, 183, 245, 79, 249, 7, 246, 41, 49, 226, - 229, 208, 86, 3, 215, 189, 245, 164, 217, 220, 54, 43, 231, 25, 211, 239, - 247, 231, 97, 238, 59, 97, 245, 157, 25, 228, 18, 212, 54, 251, 135, 212, - 231, 249, 6, 248, 127, 248, 128, 248, 151, 218, 97, 76, 203, 231, 237, - 131, 25, 203, 225, 213, 8, 220, 56, 242, 46, 224, 17, 216, 193, 208, 118, - 224, 19, 248, 19, 206, 223, 224, 119, 251, 52, 206, 223, 251, 52, 206, - 223, 5, 251, 52, 5, 251, 52, 221, 171, 251, 52, 251, 53, 244, 25, 251, - 53, 250, 97, 214, 221, 220, 29, 239, 250, 241, 77, 243, 211, 227, 40, - 219, 60, 212, 251, 136, 16, 35, 217, 36, 136, 16, 35, 251, 54, 136, 16, - 35, 239, 249, 136, 16, 35, 241, 179, 136, 16, 35, 204, 80, 136, 16, 35, - 250, 146, 136, 16, 35, 250, 147, 216, 132, 136, 16, 35, 250, 147, 216, - 131, 136, 16, 35, 250, 147, 205, 195, 136, 16, 35, 250, 147, 205, 194, - 136, 16, 35, 205, 209, 136, 16, 35, 205, 208, 136, 16, 35, 205, 207, 136, - 16, 35, 210, 221, 136, 16, 35, 218, 184, 210, 221, 136, 16, 35, 62, 210, - 221, 136, 16, 35, 224, 235, 210, 252, 136, 16, 35, 224, 235, 210, 251, - 136, 16, 35, 224, 235, 210, 250, 136, 16, 35, 246, 64, 136, 16, 35, 215, - 1, 136, 16, 35, 222, 51, 136, 16, 35, 205, 193, 136, 16, 35, 205, 192, - 136, 16, 35, 215, 219, 215, 1, 136, 16, 35, 215, 219, 215, 0, 136, 16, - 35, 238, 31, 136, 16, 35, 212, 133, 136, 16, 35, 230, 221, 219, 239, 136, - 16, 35, 230, 221, 219, 238, 136, 16, 35, 245, 134, 76, 230, 220, 136, 16, - 35, 216, 128, 76, 230, 220, 136, 16, 35, 245, 174, 219, 239, 136, 16, 35, - 230, 219, 219, 239, 136, 16, 35, 210, 253, 76, 245, 173, 136, 16, 35, - 245, 134, 76, 245, 173, 136, 16, 35, 245, 134, 76, 245, 172, 136, 16, 35, - 245, 174, 250, 188, 136, 16, 35, 215, 2, 76, 245, 174, 250, 188, 136, 16, - 35, 210, 253, 76, 215, 2, 76, 245, 173, 136, 16, 35, 206, 42, 136, 16, - 35, 208, 218, 219, 239, 136, 16, 35, 227, 233, 219, 239, 136, 16, 35, - 250, 187, 219, 239, 136, 16, 35, 210, 253, 76, 250, 186, 136, 16, 35, - 215, 2, 76, 250, 186, 136, 16, 35, 210, 253, 76, 215, 2, 76, 250, 186, - 136, 16, 35, 205, 210, 76, 250, 186, 136, 16, 35, 216, 128, 76, 250, 186, - 136, 16, 35, 216, 128, 76, 250, 185, 136, 16, 35, 216, 127, 136, 16, 35, - 216, 126, 136, 16, 35, 216, 125, 136, 16, 35, 216, 124, 136, 16, 35, 251, - 17, 136, 16, 35, 251, 16, 136, 16, 35, 225, 97, 136, 16, 35, 215, 7, 136, - 16, 35, 250, 90, 136, 16, 35, 216, 155, 136, 16, 35, 216, 154, 136, 16, - 35, 250, 25, 136, 16, 35, 248, 52, 219, 239, 136, 16, 35, 209, 216, 136, - 16, 35, 209, 215, 136, 16, 35, 217, 42, 227, 123, 136, 16, 35, 248, 0, - 136, 16, 35, 247, 255, 136, 16, 35, 247, 254, 136, 16, 35, 250, 249, 136, - 16, 35, 220, 55, 136, 16, 35, 211, 198, 136, 16, 35, 208, 216, 136, 16, - 35, 237, 210, 136, 16, 35, 204, 68, 136, 16, 35, 218, 18, 136, 16, 35, - 247, 70, 136, 16, 35, 207, 166, 136, 16, 35, 247, 41, 224, 23, 136, 16, - 35, 214, 199, 76, 230, 87, 136, 16, 35, 247, 83, 136, 16, 35, 208, 79, - 136, 16, 35, 211, 92, 208, 79, 136, 16, 35, 227, 39, 136, 16, 35, 212, - 11, 136, 16, 35, 206, 202, 136, 16, 35, 236, 50, 242, 27, 136, 16, 35, - 250, 70, 136, 16, 35, 218, 26, 250, 70, 136, 16, 35, 247, 210, 136, 16, - 35, 218, 17, 247, 210, 136, 16, 35, 250, 246, 136, 16, 35, 211, 48, 210, - 202, 211, 47, 136, 16, 35, 211, 48, 210, 202, 211, 46, 136, 16, 35, 210, - 249, 136, 16, 35, 217, 247, 136, 16, 35, 243, 150, 136, 16, 35, 243, 152, - 136, 16, 35, 243, 151, 136, 16, 35, 217, 169, 136, 16, 35, 217, 158, 136, - 16, 35, 245, 121, 136, 16, 35, 245, 120, 136, 16, 35, 245, 119, 136, 16, - 35, 245, 118, 136, 16, 35, 245, 117, 136, 16, 35, 251, 29, 136, 16, 35, - 248, 207, 76, 225, 81, 136, 16, 35, 248, 207, 76, 206, 74, 136, 16, 35, - 216, 81, 136, 16, 35, 236, 42, 136, 16, 35, 222, 79, 136, 16, 35, 244, - 132, 136, 16, 35, 224, 37, 136, 16, 35, 162, 242, 59, 136, 16, 35, 162, - 219, 214, 62, 227, 217, 230, 204, 50, 208, 85, 62, 206, 223, 230, 204, - 50, 208, 85, 62, 216, 11, 230, 204, 50, 208, 85, 62, 242, 69, 230, 204, - 50, 208, 85, 62, 212, 47, 5, 246, 61, 225, 10, 26, 61, 246, 61, 26, 61, - 246, 61, 79, 61, 246, 61, 205, 242, 79, 61, 246, 61, 240, 195, 79, 61, - 246, 61, 61, 246, 62, 245, 195, 62, 5, 246, 61, 215, 191, 209, 217, 62, - 208, 213, 211, 177, 62, 212, 47, 5, 211, 177, 157, 61, 211, 177, 225, 10, - 61, 211, 177, 26, 61, 211, 177, 79, 61, 211, 177, 205, 242, 79, 61, 211, - 177, 240, 195, 79, 61, 211, 177, 61, 51, 245, 195, 62, 205, 242, 5, 211, - 177, 61, 51, 245, 195, 62, 225, 10, 211, 177, 51, 209, 217, 62, 208, 213, - 243, 221, 62, 205, 242, 5, 243, 221, 62, 225, 10, 5, 243, 221, 61, 243, - 222, 245, 195, 62, 205, 242, 5, 243, 221, 61, 243, 222, 245, 195, 62, - 225, 10, 243, 221, 243, 222, 209, 217, 62, 208, 213, 226, 246, 62, 205, - 242, 5, 226, 246, 62, 225, 10, 5, 226, 246, 61, 226, 247, 245, 195, 62, - 5, 226, 246, 209, 63, 30, 245, 130, 157, 30, 245, 130, 225, 10, 30, 245, - 130, 26, 30, 245, 130, 205, 242, 26, 30, 245, 130, 205, 242, 79, 30, 245, - 130, 240, 195, 79, 30, 245, 130, 209, 63, 214, 254, 157, 214, 254, 225, - 10, 214, 254, 26, 214, 254, 79, 214, 254, 205, 242, 79, 214, 254, 240, - 195, 79, 214, 254, 157, 239, 233, 211, 191, 250, 59, 225, 10, 239, 233, - 211, 191, 250, 59, 26, 239, 233, 211, 191, 250, 59, 79, 239, 233, 211, - 191, 250, 59, 205, 242, 79, 239, 233, 211, 191, 250, 59, 240, 195, 79, - 239, 233, 211, 191, 250, 59, 157, 212, 88, 211, 191, 250, 59, 225, 10, - 212, 88, 211, 191, 250, 59, 26, 212, 88, 211, 191, 250, 59, 79, 212, 88, - 211, 191, 250, 59, 205, 242, 79, 212, 88, 211, 191, 250, 59, 240, 195, - 79, 212, 88, 211, 191, 250, 59, 157, 241, 143, 211, 191, 250, 59, 225, - 10, 241, 143, 211, 191, 250, 59, 26, 241, 143, 211, 191, 250, 59, 79, - 241, 143, 211, 191, 250, 59, 205, 242, 79, 241, 143, 211, 191, 250, 59, - 157, 126, 218, 61, 62, 211, 94, 225, 10, 126, 218, 61, 62, 211, 94, 126, - 218, 61, 62, 211, 94, 225, 10, 126, 218, 61, 218, 118, 211, 94, 157, 239, - 147, 218, 61, 62, 211, 94, 225, 10, 239, 147, 218, 61, 62, 211, 94, 239, - 147, 218, 61, 62, 211, 94, 225, 10, 239, 147, 218, 61, 218, 118, 211, 94, - 216, 74, 157, 239, 147, 218, 61, 218, 118, 211, 94, 157, 239, 233, 218, - 61, 62, 211, 94, 79, 239, 233, 218, 61, 62, 211, 94, 225, 10, 212, 88, - 218, 61, 62, 211, 94, 79, 212, 88, 218, 61, 62, 211, 94, 212, 88, 218, - 61, 218, 118, 211, 94, 225, 10, 241, 143, 218, 61, 62, 211, 94, 79, 241, - 143, 218, 61, 62, 211, 94, 205, 242, 79, 241, 143, 218, 61, 62, 211, 94, - 79, 241, 143, 218, 61, 218, 118, 211, 94, 157, 207, 155, 218, 61, 62, - 211, 94, 79, 207, 155, 218, 61, 62, 211, 94, 79, 207, 155, 218, 61, 218, - 118, 211, 94, 96, 53, 3, 5, 208, 86, 250, 94, 177, 53, 3, 5, 208, 86, - 250, 94, 86, 53, 3, 5, 208, 86, 250, 94, 183, 53, 3, 5, 208, 86, 250, 94, - 96, 53, 3, 225, 10, 208, 86, 250, 94, 177, 53, 3, 225, 10, 208, 86, 250, - 94, 86, 53, 3, 225, 10, 208, 86, 250, 94, 183, 53, 3, 225, 10, 208, 86, - 250, 94, 96, 53, 3, 228, 8, 208, 86, 250, 94, 177, 53, 3, 228, 8, 208, - 86, 250, 94, 86, 53, 3, 228, 8, 208, 86, 250, 94, 183, 53, 3, 228, 8, - 208, 86, 250, 94, 96, 53, 3, 5, 241, 31, 250, 94, 177, 53, 3, 5, 241, 31, - 250, 94, 86, 53, 3, 5, 241, 31, 250, 94, 183, 53, 3, 5, 241, 31, 250, 94, - 96, 53, 3, 241, 31, 250, 94, 177, 53, 3, 241, 31, 250, 94, 86, 53, 3, - 241, 31, 250, 94, 183, 53, 3, 241, 31, 250, 94, 79, 96, 53, 3, 241, 31, - 250, 94, 79, 177, 53, 3, 241, 31, 250, 94, 79, 86, 53, 3, 241, 31, 250, - 94, 79, 183, 53, 3, 241, 31, 250, 94, 79, 96, 53, 3, 228, 8, 241, 31, - 250, 94, 79, 177, 53, 3, 228, 8, 241, 31, 250, 94, 79, 86, 53, 3, 228, 8, - 241, 31, 250, 94, 79, 183, 53, 3, 228, 8, 241, 31, 250, 94, 96, 208, 84, - 53, 3, 223, 73, 213, 75, 177, 208, 84, 53, 3, 223, 73, 213, 75, 86, 208, - 84, 53, 3, 223, 73, 213, 75, 183, 208, 84, 53, 3, 223, 73, 213, 75, 96, - 208, 84, 53, 3, 225, 10, 213, 75, 177, 208, 84, 53, 3, 225, 10, 213, 75, - 86, 208, 84, 53, 3, 225, 10, 213, 75, 183, 208, 84, 53, 3, 225, 10, 213, - 75, 96, 208, 84, 53, 3, 26, 213, 75, 177, 208, 84, 53, 3, 26, 213, 75, - 86, 208, 84, 53, 3, 26, 213, 75, 183, 208, 84, 53, 3, 26, 213, 75, 96, - 208, 84, 53, 3, 79, 213, 75, 177, 208, 84, 53, 3, 79, 213, 75, 86, 208, - 84, 53, 3, 79, 213, 75, 183, 208, 84, 53, 3, 79, 213, 75, 96, 208, 84, - 53, 3, 205, 242, 79, 213, 75, 177, 208, 84, 53, 3, 205, 242, 79, 213, 75, - 86, 208, 84, 53, 3, 205, 242, 79, 213, 75, 183, 208, 84, 53, 3, 205, 242, - 79, 213, 75, 96, 240, 1, 47, 177, 240, 1, 47, 86, 240, 1, 47, 183, 240, - 1, 47, 96, 103, 47, 177, 103, 47, 86, 103, 47, 183, 103, 47, 96, 245, - 222, 47, 177, 245, 222, 47, 86, 245, 222, 47, 183, 245, 222, 47, 96, 79, - 245, 222, 47, 177, 79, 245, 222, 47, 86, 79, 245, 222, 47, 183, 79, 245, - 222, 47, 96, 79, 47, 177, 79, 47, 86, 79, 47, 183, 79, 47, 96, 41, 47, - 177, 41, 47, 86, 41, 47, 183, 41, 47, 153, 204, 46, 41, 47, 153, 241, - 176, 41, 47, 211, 238, 241, 176, 41, 47, 211, 238, 204, 46, 41, 47, 49, - 50, 41, 47, 112, 121, 41, 47, 204, 26, 96, 157, 150, 47, 204, 26, 177, - 157, 150, 47, 204, 26, 86, 157, 150, 47, 204, 26, 183, 157, 150, 47, 204, - 26, 153, 204, 46, 157, 150, 47, 204, 26, 153, 241, 176, 157, 150, 47, - 204, 26, 211, 238, 241, 176, 157, 150, 47, 204, 26, 211, 238, 204, 46, - 157, 150, 47, 204, 26, 96, 150, 47, 204, 26, 177, 150, 47, 204, 26, 86, - 150, 47, 204, 26, 183, 150, 47, 204, 26, 153, 204, 46, 150, 47, 204, 26, - 153, 241, 176, 150, 47, 204, 26, 211, 238, 241, 176, 150, 47, 204, 26, - 211, 238, 204, 46, 150, 47, 204, 26, 96, 225, 10, 150, 47, 204, 26, 177, - 225, 10, 150, 47, 204, 26, 86, 225, 10, 150, 47, 204, 26, 183, 225, 10, - 150, 47, 204, 26, 153, 204, 46, 225, 10, 150, 47, 204, 26, 153, 241, 176, - 225, 10, 150, 47, 204, 26, 211, 238, 241, 176, 225, 10, 150, 47, 204, 26, - 211, 238, 204, 46, 225, 10, 150, 47, 204, 26, 96, 79, 150, 47, 204, 26, - 177, 79, 150, 47, 204, 26, 86, 79, 150, 47, 204, 26, 183, 79, 150, 47, - 204, 26, 153, 204, 46, 79, 150, 47, 204, 26, 153, 241, 176, 79, 150, 47, - 204, 26, 211, 238, 241, 176, 79, 150, 47, 204, 26, 211, 238, 204, 46, 79, - 150, 47, 204, 26, 96, 205, 242, 79, 150, 47, 204, 26, 177, 205, 242, 79, - 150, 47, 204, 26, 86, 205, 242, 79, 150, 47, 204, 26, 183, 205, 242, 79, - 150, 47, 204, 26, 153, 204, 46, 205, 242, 79, 150, 47, 204, 26, 153, 241, - 176, 205, 242, 79, 150, 47, 204, 26, 211, 238, 241, 176, 205, 242, 79, - 150, 47, 204, 26, 211, 238, 204, 46, 205, 242, 79, 150, 47, 96, 208, 86, - 250, 94, 177, 208, 86, 250, 94, 86, 208, 86, 250, 94, 183, 208, 86, 250, - 94, 96, 61, 53, 204, 5, 208, 86, 250, 94, 177, 61, 53, 204, 5, 208, 86, - 250, 94, 86, 61, 53, 204, 5, 208, 86, 250, 94, 183, 61, 53, 204, 5, 208, - 86, 250, 94, 96, 53, 3, 221, 162, 209, 248, 177, 53, 3, 221, 162, 209, - 248, 86, 53, 3, 221, 162, 209, 248, 183, 53, 3, 221, 162, 209, 248, 79, - 53, 213, 76, 204, 24, 105, 79, 53, 213, 76, 204, 24, 120, 209, 57, 79, - 53, 213, 76, 204, 24, 118, 237, 137, 79, 53, 213, 76, 204, 24, 118, 209, - 60, 96, 247, 245, 61, 47, 86, 247, 248, 213, 78, 61, 47, 96, 208, 145, - 213, 78, 61, 47, 86, 208, 145, 213, 78, 61, 47, 96, 227, 216, 61, 47, 86, - 216, 10, 61, 47, 96, 216, 10, 61, 47, 86, 227, 216, 61, 47, 96, 249, 24, - 213, 77, 61, 47, 86, 249, 24, 213, 77, 61, 47, 96, 239, 117, 213, 77, 61, - 47, 86, 239, 117, 213, 77, 61, 47, 61, 53, 213, 76, 204, 24, 105, 61, 53, - 213, 76, 204, 24, 120, 209, 57, 202, 26, 240, 102, 224, 52, 240, 102, - 240, 103, 3, 209, 80, 222, 222, 240, 102, 209, 62, 240, 102, 240, 103, 3, - 237, 63, 215, 221, 240, 102, 236, 20, 240, 102, 2, 76, 209, 93, 236, 52, - 245, 146, 227, 102, 240, 102, 214, 188, 207, 179, 206, 240, 240, 102, - 246, 161, 204, 57, 12, 15, 235, 152, 12, 15, 235, 151, 12, 15, 235, 150, - 12, 15, 235, 149, 12, 15, 235, 148, 12, 15, 235, 147, 12, 15, 235, 146, - 12, 15, 235, 145, 12, 15, 235, 144, 12, 15, 235, 143, 12, 15, 235, 142, - 12, 15, 235, 141, 12, 15, 235, 140, 12, 15, 235, 139, 12, 15, 235, 138, - 12, 15, 235, 137, 12, 15, 235, 136, 12, 15, 235, 135, 12, 15, 235, 134, - 12, 15, 235, 133, 12, 15, 235, 132, 12, 15, 235, 131, 12, 15, 235, 130, - 12, 15, 235, 129, 12, 15, 235, 128, 12, 15, 235, 127, 12, 15, 235, 126, - 12, 15, 235, 125, 12, 15, 235, 124, 12, 15, 235, 123, 12, 15, 235, 122, - 12, 15, 235, 121, 12, 15, 235, 120, 12, 15, 235, 119, 12, 15, 235, 118, - 12, 15, 235, 117, 12, 15, 235, 116, 12, 15, 235, 115, 12, 15, 235, 114, - 12, 15, 235, 113, 12, 15, 235, 112, 12, 15, 235, 111, 12, 15, 235, 110, - 12, 15, 235, 109, 12, 15, 235, 108, 12, 15, 235, 107, 12, 15, 235, 106, - 12, 15, 235, 105, 12, 15, 235, 104, 12, 15, 235, 103, 12, 15, 235, 102, - 12, 15, 235, 101, 12, 15, 235, 100, 12, 15, 235, 99, 12, 15, 235, 98, 12, - 15, 235, 97, 12, 15, 235, 96, 12, 15, 235, 95, 12, 15, 235, 94, 12, 15, - 235, 93, 12, 15, 235, 92, 12, 15, 235, 91, 12, 15, 235, 90, 12, 15, 235, - 89, 12, 15, 235, 88, 12, 15, 235, 87, 12, 15, 235, 86, 12, 15, 235, 85, - 12, 15, 235, 84, 12, 15, 235, 83, 12, 15, 235, 82, 12, 15, 235, 81, 12, - 15, 235, 80, 12, 15, 235, 79, 12, 15, 235, 78, 12, 15, 235, 77, 12, 15, - 235, 76, 12, 15, 235, 75, 12, 15, 235, 74, 12, 15, 235, 73, 12, 15, 235, - 72, 12, 15, 235, 71, 12, 15, 235, 70, 12, 15, 235, 69, 12, 15, 235, 68, - 12, 15, 235, 67, 12, 15, 235, 66, 12, 15, 235, 65, 12, 15, 235, 64, 12, - 15, 235, 63, 12, 15, 235, 62, 12, 15, 235, 61, 12, 15, 235, 60, 12, 15, - 235, 59, 12, 15, 235, 58, 12, 15, 235, 57, 12, 15, 235, 56, 12, 15, 235, - 55, 12, 15, 235, 54, 12, 15, 235, 53, 12, 15, 235, 52, 12, 15, 235, 51, - 12, 15, 235, 50, 12, 15, 235, 49, 12, 15, 235, 48, 12, 15, 235, 47, 12, - 15, 235, 46, 12, 15, 235, 45, 12, 15, 235, 44, 12, 15, 235, 43, 12, 15, - 235, 42, 12, 15, 235, 41, 12, 15, 235, 40, 12, 15, 235, 39, 12, 15, 235, - 38, 12, 15, 235, 37, 12, 15, 235, 36, 12, 15, 235, 35, 12, 15, 235, 34, - 12, 15, 235, 33, 12, 15, 235, 32, 12, 15, 235, 31, 12, 15, 235, 30, 12, - 15, 235, 29, 12, 15, 235, 28, 12, 15, 235, 27, 12, 15, 235, 26, 12, 15, - 235, 25, 12, 15, 235, 24, 12, 15, 235, 23, 12, 15, 235, 22, 12, 15, 235, - 21, 12, 15, 235, 20, 12, 15, 235, 19, 12, 15, 235, 18, 12, 15, 235, 17, - 12, 15, 235, 16, 12, 15, 235, 15, 12, 15, 235, 14, 12, 15, 235, 13, 12, - 15, 235, 12, 12, 15, 235, 11, 12, 15, 235, 10, 12, 15, 235, 9, 12, 15, - 235, 8, 12, 15, 235, 7, 12, 15, 235, 6, 12, 15, 235, 5, 12, 15, 235, 4, - 12, 15, 235, 3, 12, 15, 235, 2, 12, 15, 235, 1, 12, 15, 235, 0, 12, 15, - 234, 255, 12, 15, 234, 254, 12, 15, 234, 253, 12, 15, 234, 252, 12, 15, - 234, 251, 12, 15, 234, 250, 12, 15, 234, 249, 12, 15, 234, 248, 12, 15, - 234, 247, 12, 15, 234, 246, 12, 15, 234, 245, 12, 15, 234, 244, 12, 15, - 234, 243, 12, 15, 234, 242, 12, 15, 234, 241, 12, 15, 234, 240, 12, 15, - 234, 239, 12, 15, 234, 238, 12, 15, 234, 237, 12, 15, 234, 236, 12, 15, - 234, 235, 12, 15, 234, 234, 12, 15, 234, 233, 12, 15, 234, 232, 12, 15, - 234, 231, 12, 15, 234, 230, 12, 15, 234, 229, 12, 15, 234, 228, 12, 15, - 234, 227, 12, 15, 234, 226, 12, 15, 234, 225, 12, 15, 234, 224, 12, 15, - 234, 223, 12, 15, 234, 222, 12, 15, 234, 221, 12, 15, 234, 220, 12, 15, - 234, 219, 12, 15, 234, 218, 12, 15, 234, 217, 12, 15, 234, 216, 12, 15, - 234, 215, 12, 15, 234, 214, 12, 15, 234, 213, 12, 15, 234, 212, 12, 15, - 234, 211, 12, 15, 234, 210, 12, 15, 234, 209, 12, 15, 234, 208, 12, 15, - 234, 207, 12, 15, 234, 206, 12, 15, 234, 205, 12, 15, 234, 204, 12, 15, - 234, 203, 12, 15, 234, 202, 12, 15, 234, 201, 12, 15, 234, 200, 12, 15, - 234, 199, 12, 15, 234, 198, 12, 15, 234, 197, 12, 15, 234, 196, 12, 15, - 234, 195, 12, 15, 234, 194, 12, 15, 234, 193, 12, 15, 234, 192, 12, 15, - 234, 191, 12, 15, 234, 190, 12, 15, 234, 189, 12, 15, 234, 188, 12, 15, - 234, 187, 12, 15, 234, 186, 12, 15, 234, 185, 12, 15, 234, 184, 12, 15, - 234, 183, 12, 15, 234, 182, 12, 15, 234, 181, 12, 15, 234, 180, 12, 15, - 234, 179, 12, 15, 234, 178, 12, 15, 234, 177, 12, 15, 234, 176, 12, 15, - 234, 175, 12, 15, 234, 174, 12, 15, 234, 173, 12, 15, 234, 172, 12, 15, - 234, 171, 12, 15, 234, 170, 12, 15, 234, 169, 12, 15, 234, 168, 12, 15, - 234, 167, 12, 15, 234, 166, 12, 15, 234, 165, 12, 15, 234, 164, 12, 15, - 234, 163, 12, 15, 234, 162, 12, 15, 234, 161, 12, 15, 234, 160, 12, 15, - 234, 159, 12, 15, 234, 158, 12, 15, 234, 157, 12, 15, 234, 156, 12, 15, - 234, 155, 12, 15, 234, 154, 12, 15, 234, 153, 12, 15, 234, 152, 12, 15, - 234, 151, 12, 15, 234, 150, 12, 15, 234, 149, 12, 15, 234, 148, 12, 15, - 234, 147, 12, 15, 234, 146, 12, 15, 234, 145, 12, 15, 234, 144, 12, 15, - 234, 143, 12, 15, 234, 142, 12, 15, 234, 141, 12, 15, 234, 140, 12, 15, - 234, 139, 12, 15, 234, 138, 12, 15, 234, 137, 12, 15, 234, 136, 12, 15, - 234, 135, 12, 15, 234, 134, 12, 15, 234, 133, 12, 15, 234, 132, 12, 15, - 234, 131, 12, 15, 234, 130, 12, 15, 234, 129, 12, 15, 234, 128, 12, 15, - 234, 127, 12, 15, 234, 126, 12, 15, 234, 125, 12, 15, 234, 124, 12, 15, - 234, 123, 12, 15, 234, 122, 12, 15, 234, 121, 12, 15, 234, 120, 12, 15, - 234, 119, 12, 15, 234, 118, 12, 15, 234, 117, 12, 15, 234, 116, 12, 15, - 234, 115, 12, 15, 234, 114, 12, 15, 234, 113, 12, 15, 234, 112, 12, 15, - 234, 111, 12, 15, 234, 110, 12, 15, 234, 109, 12, 15, 234, 108, 12, 15, - 234, 107, 12, 15, 234, 106, 12, 15, 234, 105, 12, 15, 234, 104, 12, 15, - 234, 103, 12, 15, 234, 102, 12, 15, 234, 101, 12, 15, 234, 100, 12, 15, - 234, 99, 12, 15, 234, 98, 12, 15, 234, 97, 12, 15, 234, 96, 12, 15, 234, - 95, 12, 15, 234, 94, 12, 15, 234, 93, 12, 15, 234, 92, 12, 15, 234, 91, - 12, 15, 234, 90, 12, 15, 234, 89, 12, 15, 234, 88, 12, 15, 234, 87, 12, - 15, 234, 86, 12, 15, 234, 85, 12, 15, 234, 84, 12, 15, 234, 83, 12, 15, - 234, 82, 12, 15, 234, 81, 12, 15, 234, 80, 12, 15, 234, 79, 12, 15, 234, - 78, 12, 15, 234, 77, 12, 15, 234, 76, 12, 15, 234, 75, 12, 15, 234, 74, - 12, 15, 234, 73, 12, 15, 234, 72, 12, 15, 234, 71, 12, 15, 234, 70, 12, - 15, 234, 69, 12, 15, 234, 68, 12, 15, 234, 67, 12, 15, 234, 66, 12, 15, - 234, 65, 12, 15, 234, 64, 12, 15, 234, 63, 12, 15, 234, 62, 12, 15, 234, - 61, 12, 15, 234, 60, 12, 15, 234, 59, 12, 15, 234, 58, 12, 15, 234, 57, - 12, 15, 234, 56, 12, 15, 234, 55, 12, 15, 234, 54, 12, 15, 234, 53, 12, - 15, 234, 52, 12, 15, 234, 51, 12, 15, 234, 50, 12, 15, 234, 49, 12, 15, - 234, 48, 12, 15, 234, 47, 12, 15, 234, 46, 12, 15, 234, 45, 12, 15, 234, - 44, 12, 15, 234, 43, 12, 15, 234, 42, 12, 15, 234, 41, 12, 15, 234, 40, - 12, 15, 234, 39, 12, 15, 234, 38, 12, 15, 234, 37, 12, 15, 234, 36, 12, - 15, 234, 35, 12, 15, 234, 34, 12, 15, 234, 33, 12, 15, 234, 32, 12, 15, - 234, 31, 12, 15, 234, 30, 12, 15, 234, 29, 12, 15, 234, 28, 12, 15, 234, - 27, 12, 15, 234, 26, 12, 15, 234, 25, 12, 15, 234, 24, 12, 15, 234, 23, - 12, 15, 234, 22, 12, 15, 234, 21, 12, 15, 234, 20, 12, 15, 234, 19, 12, - 15, 234, 18, 12, 15, 234, 17, 12, 15, 234, 16, 12, 15, 234, 15, 12, 15, - 234, 14, 12, 15, 234, 13, 12, 15, 234, 12, 12, 15, 234, 11, 12, 15, 234, - 10, 12, 15, 234, 9, 12, 15, 234, 8, 12, 15, 234, 7, 12, 15, 234, 6, 12, - 15, 234, 5, 12, 15, 234, 4, 12, 15, 234, 3, 12, 15, 234, 2, 12, 15, 234, - 1, 12, 15, 234, 0, 12, 15, 233, 255, 12, 15, 233, 254, 12, 15, 233, 253, - 12, 15, 233, 252, 12, 15, 233, 251, 12, 15, 233, 250, 12, 15, 233, 249, - 12, 15, 233, 248, 12, 15, 233, 247, 12, 15, 233, 246, 12, 15, 233, 245, - 12, 15, 233, 244, 12, 15, 233, 243, 12, 15, 233, 242, 12, 15, 233, 241, - 12, 15, 233, 240, 12, 15, 233, 239, 12, 15, 233, 238, 12, 15, 233, 237, - 12, 15, 233, 236, 12, 15, 233, 235, 12, 15, 233, 234, 12, 15, 233, 233, - 12, 15, 233, 232, 12, 15, 233, 231, 12, 15, 233, 230, 12, 15, 233, 229, - 12, 15, 233, 228, 12, 15, 233, 227, 12, 15, 233, 226, 12, 15, 233, 225, - 12, 15, 233, 224, 12, 15, 233, 223, 12, 15, 233, 222, 12, 15, 233, 221, - 12, 15, 233, 220, 12, 15, 233, 219, 12, 15, 233, 218, 12, 15, 233, 217, - 12, 15, 233, 216, 12, 15, 233, 215, 12, 15, 233, 214, 12, 15, 233, 213, - 12, 15, 233, 212, 12, 15, 233, 211, 12, 15, 233, 210, 12, 15, 233, 209, - 12, 15, 233, 208, 12, 15, 233, 207, 12, 15, 233, 206, 12, 15, 233, 205, - 12, 15, 233, 204, 12, 15, 233, 203, 12, 15, 233, 202, 12, 15, 233, 201, - 12, 15, 233, 200, 12, 15, 233, 199, 12, 15, 233, 198, 12, 15, 233, 197, - 12, 15, 233, 196, 12, 15, 233, 195, 12, 15, 233, 194, 12, 15, 233, 193, - 12, 15, 233, 192, 12, 15, 233, 191, 12, 15, 233, 190, 12, 15, 233, 189, - 12, 15, 233, 188, 12, 15, 233, 187, 12, 15, 233, 186, 12, 15, 233, 185, - 12, 15, 233, 184, 12, 15, 233, 183, 12, 15, 233, 182, 12, 15, 233, 181, - 12, 15, 233, 180, 12, 15, 233, 179, 12, 15, 233, 178, 12, 15, 233, 177, - 12, 15, 233, 176, 12, 15, 233, 175, 12, 15, 233, 174, 12, 15, 233, 173, - 12, 15, 233, 172, 12, 15, 233, 171, 12, 15, 233, 170, 12, 15, 233, 169, - 12, 15, 233, 168, 12, 15, 233, 167, 12, 15, 233, 166, 12, 15, 233, 165, - 12, 15, 233, 164, 12, 15, 233, 163, 12, 15, 233, 162, 12, 15, 233, 161, - 12, 15, 233, 160, 12, 15, 233, 159, 12, 15, 233, 158, 12, 15, 233, 157, - 12, 15, 233, 156, 12, 15, 233, 155, 12, 15, 233, 154, 12, 15, 233, 153, - 12, 15, 233, 152, 12, 15, 233, 151, 12, 15, 233, 150, 12, 15, 233, 149, - 12, 15, 233, 148, 12, 15, 233, 147, 12, 15, 233, 146, 12, 15, 233, 145, - 12, 15, 233, 144, 12, 15, 233, 143, 12, 15, 233, 142, 12, 15, 233, 141, - 12, 15, 233, 140, 12, 15, 233, 139, 12, 15, 233, 138, 12, 15, 233, 137, - 12, 15, 233, 136, 12, 15, 233, 135, 12, 15, 233, 134, 12, 15, 233, 133, - 12, 15, 233, 132, 12, 15, 233, 131, 12, 15, 233, 130, 12, 15, 233, 129, - 12, 15, 233, 128, 12, 15, 233, 127, 12, 15, 233, 126, 12, 15, 233, 125, - 12, 15, 233, 124, 12, 15, 233, 123, 228, 14, 209, 255, 160, 211, 228, - 160, 240, 212, 82, 160, 217, 31, 82, 160, 42, 54, 160, 243, 97, 54, 160, - 218, 246, 54, 160, 250, 235, 160, 250, 160, 160, 49, 219, 76, 160, 50, - 219, 76, 160, 250, 59, 160, 91, 54, 160, 245, 233, 160, 235, 219, 160, - 239, 102, 211, 61, 160, 212, 0, 160, 17, 202, 84, 160, 17, 105, 160, 17, - 108, 160, 17, 147, 160, 17, 149, 160, 17, 170, 160, 17, 195, 160, 17, - 213, 111, 160, 17, 199, 160, 17, 222, 63, 160, 245, 242, 160, 213, 143, - 160, 227, 179, 54, 160, 241, 35, 54, 160, 237, 247, 54, 160, 217, 47, 82, - 160, 245, 231, 250, 49, 160, 8, 6, 1, 63, 160, 8, 6, 1, 249, 255, 160, 8, - 6, 1, 247, 125, 160, 8, 6, 1, 245, 51, 160, 8, 6, 1, 74, 160, 8, 6, 1, - 240, 174, 160, 8, 6, 1, 239, 75, 160, 8, 6, 1, 237, 171, 160, 8, 6, 1, - 75, 160, 8, 6, 1, 230, 184, 160, 8, 6, 1, 230, 54, 160, 8, 6, 1, 159, - 160, 8, 6, 1, 226, 185, 160, 8, 6, 1, 223, 163, 160, 8, 6, 1, 78, 160, 8, - 6, 1, 219, 184, 160, 8, 6, 1, 217, 134, 160, 8, 6, 1, 146, 160, 8, 6, 1, - 194, 160, 8, 6, 1, 210, 69, 160, 8, 6, 1, 68, 160, 8, 6, 1, 206, 164, - 160, 8, 6, 1, 204, 144, 160, 8, 6, 1, 203, 196, 160, 8, 6, 1, 203, 124, - 160, 8, 6, 1, 202, 159, 160, 49, 51, 155, 160, 216, 74, 212, 0, 160, 50, - 51, 155, 160, 246, 53, 251, 138, 160, 124, 227, 114, 160, 237, 254, 251, - 138, 160, 8, 5, 1, 63, 160, 8, 5, 1, 249, 255, 160, 8, 5, 1, 247, 125, - 160, 8, 5, 1, 245, 51, 160, 8, 5, 1, 74, 160, 8, 5, 1, 240, 174, 160, 8, - 5, 1, 239, 75, 160, 8, 5, 1, 237, 171, 160, 8, 5, 1, 75, 160, 8, 5, 1, - 230, 184, 160, 8, 5, 1, 230, 54, 160, 8, 5, 1, 159, 160, 8, 5, 1, 226, - 185, 160, 8, 5, 1, 223, 163, 160, 8, 5, 1, 78, 160, 8, 5, 1, 219, 184, - 160, 8, 5, 1, 217, 134, 160, 8, 5, 1, 146, 160, 8, 5, 1, 194, 160, 8, 5, - 1, 210, 69, 160, 8, 5, 1, 68, 160, 8, 5, 1, 206, 164, 160, 8, 5, 1, 204, - 144, 160, 8, 5, 1, 203, 196, 160, 8, 5, 1, 203, 124, 160, 8, 5, 1, 202, - 159, 160, 49, 245, 93, 155, 160, 80, 227, 114, 160, 50, 245, 93, 155, - 160, 208, 227, 247, 60, 209, 255, 57, 214, 71, 57, 214, 60, 57, 214, 49, - 57, 214, 37, 57, 214, 26, 57, 214, 15, 57, 214, 4, 57, 213, 249, 57, 213, - 238, 57, 213, 230, 57, 213, 229, 57, 213, 228, 57, 213, 227, 57, 213, - 225, 57, 213, 224, 57, 213, 223, 57, 213, 222, 57, 213, 221, 57, 213, - 220, 57, 213, 219, 57, 213, 218, 57, 213, 217, 57, 213, 216, 57, 213, - 214, 57, 213, 213, 57, 213, 212, 57, 213, 211, 57, 213, 210, 57, 213, - 209, 57, 213, 208, 57, 213, 207, 57, 213, 206, 57, 213, 205, 57, 213, - 203, 57, 213, 202, 57, 213, 201, 57, 213, 200, 57, 213, 199, 57, 213, - 198, 57, 213, 197, 57, 213, 196, 57, 213, 195, 57, 213, 194, 57, 213, - 192, 57, 213, 191, 57, 213, 190, 57, 213, 189, 57, 213, 188, 57, 213, - 187, 57, 213, 186, 57, 213, 185, 57, 213, 184, 57, 213, 183, 57, 213, - 181, 57, 213, 180, 57, 213, 179, 57, 213, 178, 57, 213, 177, 57, 213, - 176, 57, 213, 175, 57, 213, 174, 57, 213, 173, 57, 213, 172, 57, 213, - 170, 57, 213, 169, 57, 213, 168, 57, 213, 167, 57, 213, 166, 57, 213, - 165, 57, 213, 164, 57, 213, 163, 57, 213, 162, 57, 213, 161, 57, 213, - 159, 57, 213, 158, 57, 213, 157, 57, 213, 156, 57, 213, 155, 57, 213, - 154, 57, 213, 153, 57, 213, 152, 57, 213, 151, 57, 213, 150, 57, 214, - 147, 57, 214, 146, 57, 214, 145, 57, 214, 144, 57, 214, 143, 57, 214, - 142, 57, 214, 141, 57, 214, 140, 57, 214, 139, 57, 214, 138, 57, 214, - 136, 57, 214, 135, 57, 214, 134, 57, 214, 133, 57, 214, 132, 57, 214, - 131, 57, 214, 130, 57, 214, 129, 57, 214, 128, 57, 214, 127, 57, 214, - 125, 57, 214, 124, 57, 214, 123, 57, 214, 122, 57, 214, 121, 57, 214, - 120, 57, 214, 119, 57, 214, 118, 57, 214, 117, 57, 214, 116, 57, 214, - 114, 57, 214, 113, 57, 214, 112, 57, 214, 111, 57, 214, 110, 57, 214, - 109, 57, 214, 108, 57, 214, 107, 57, 214, 106, 57, 214, 105, 57, 214, - 103, 57, 214, 102, 57, 214, 101, 57, 214, 100, 57, 214, 99, 57, 214, 98, - 57, 214, 97, 57, 214, 96, 57, 214, 95, 57, 214, 94, 57, 214, 92, 57, 214, - 91, 57, 214, 90, 57, 214, 89, 57, 214, 88, 57, 214, 87, 57, 214, 86, 57, - 214, 85, 57, 214, 84, 57, 214, 83, 57, 214, 81, 57, 214, 80, 57, 214, 79, - 57, 214, 78, 57, 214, 77, 57, 214, 76, 57, 214, 75, 57, 214, 74, 57, 214, - 73, 57, 214, 72, 57, 214, 70, 57, 214, 69, 57, 214, 68, 57, 214, 67, 57, - 214, 66, 57, 214, 65, 57, 214, 64, 57, 214, 63, 57, 214, 62, 57, 214, 61, - 57, 214, 59, 57, 214, 58, 57, 214, 57, 57, 214, 56, 57, 214, 55, 57, 214, - 54, 57, 214, 53, 57, 214, 52, 57, 214, 51, 57, 214, 50, 57, 214, 48, 57, - 214, 47, 57, 214, 46, 57, 214, 45, 57, 214, 44, 57, 214, 43, 57, 214, 42, - 57, 214, 41, 57, 214, 40, 57, 214, 39, 57, 214, 36, 57, 214, 35, 57, 214, - 34, 57, 214, 33, 57, 214, 32, 57, 214, 31, 57, 214, 30, 57, 214, 29, 57, - 214, 28, 57, 214, 27, 57, 214, 25, 57, 214, 24, 57, 214, 23, 57, 214, 22, - 57, 214, 21, 57, 214, 20, 57, 214, 19, 57, 214, 18, 57, 214, 17, 57, 214, - 16, 57, 214, 14, 57, 214, 13, 57, 214, 12, 57, 214, 11, 57, 214, 10, 57, - 214, 9, 57, 214, 8, 57, 214, 7, 57, 214, 6, 57, 214, 5, 57, 214, 3, 57, - 214, 2, 57, 214, 1, 57, 214, 0, 57, 213, 255, 57, 213, 254, 57, 213, 253, - 57, 213, 252, 57, 213, 251, 57, 213, 250, 57, 213, 248, 57, 213, 247, 57, - 213, 246, 57, 213, 245, 57, 213, 244, 57, 213, 243, 57, 213, 242, 57, - 213, 241, 57, 213, 240, 57, 213, 239, 57, 213, 237, 57, 213, 236, 57, - 213, 235, 57, 213, 234, 57, 213, 233, 57, 213, 232, 57, 213, 231, 221, - 48, 221, 50, 211, 90, 76, 237, 61, 212, 3, 211, 90, 76, 209, 112, 211, - 12, 241, 84, 76, 209, 112, 240, 240, 241, 84, 76, 208, 105, 241, 47, 241, - 71, 241, 72, 251, 130, 251, 131, 251, 27, 248, 131, 249, 19, 247, 199, - 167, 210, 5, 236, 106, 210, 5, 236, 31, 210, 10, 227, 115, 240, 51, 222, - 214, 227, 114, 241, 84, 76, 227, 114, 227, 163, 221, 253, 241, 50, 227, - 115, 210, 5, 80, 210, 5, 204, 165, 239, 159, 240, 51, 240, 30, 247, 25, - 216, 77, 245, 147, 213, 7, 219, 211, 227, 41, 105, 212, 13, 213, 7, 231, - 49, 227, 41, 202, 84, 212, 162, 244, 139, 227, 105, 241, 9, 243, 123, - 244, 8, 245, 184, 105, 244, 128, 244, 8, 245, 184, 108, 244, 127, 244, 8, - 245, 184, 147, 244, 126, 244, 8, 245, 184, 149, 244, 125, 182, 251, 130, - 223, 89, 210, 95, 231, 112, 210, 99, 241, 84, 76, 208, 106, 248, 33, 240, - 247, 247, 59, 247, 61, 241, 84, 76, 225, 9, 241, 48, 210, 242, 211, 3, - 241, 9, 241, 10, 231, 25, 213, 131, 149, 240, 11, 213, 130, 239, 112, - 231, 25, 213, 131, 147, 237, 238, 213, 130, 237, 235, 231, 25, 213, 131, - 108, 216, 149, 213, 130, 215, 150, 231, 25, 213, 131, 105, 206, 236, 213, - 130, 206, 193, 211, 231, 244, 46, 244, 48, 219, 157, 246, 182, 219, 159, - 138, 220, 80, 217, 240, 236, 109, 247, 218, 218, 236, 237, 27, 247, 230, - 221, 192, 247, 218, 237, 27, 223, 53, 231, 35, 231, 37, 222, 208, 227, - 114, 222, 231, 211, 90, 76, 214, 152, 250, 120, 211, 164, 241, 84, 76, - 214, 152, 250, 120, 241, 12, 167, 210, 6, 213, 117, 236, 106, 210, 6, - 213, 117, 236, 28, 167, 210, 6, 3, 230, 66, 236, 106, 210, 6, 3, 230, 66, - 236, 29, 227, 115, 210, 6, 213, 117, 80, 210, 6, 213, 117, 204, 164, 219, - 69, 227, 115, 239, 151, 219, 69, 227, 115, 242, 70, 218, 87, 219, 69, - 227, 115, 249, 18, 219, 69, 227, 115, 206, 224, 218, 82, 216, 74, 227, - 115, 240, 51, 216, 74, 231, 35, 216, 57, 212, 120, 213, 7, 108, 212, 117, - 211, 166, 212, 120, 213, 7, 147, 212, 116, 211, 165, 244, 8, 245, 184, - 211, 34, 244, 123, 217, 227, 206, 192, 105, 217, 227, 206, 190, 217, 190, - 217, 227, 206, 192, 108, 217, 227, 206, 189, 217, 189, 213, 118, 208, - 104, 211, 89, 211, 17, 247, 60, 246, 182, 247, 1, 224, 224, 204, 103, - 223, 181, 211, 90, 76, 237, 223, 250, 120, 211, 90, 76, 217, 208, 250, - 120, 211, 230, 241, 84, 76, 237, 223, 250, 120, 241, 84, 76, 217, 208, - 250, 120, 241, 45, 211, 90, 76, 211, 34, 211, 245, 212, 120, 238, 3, 167, - 230, 241, 213, 95, 212, 120, 167, 230, 241, 214, 191, 245, 184, 213, 127, - 230, 241, 245, 111, 211, 35, 209, 138, 211, 108, 220, 0, 210, 84, 245, - 232, 219, 226, 217, 228, 224, 223, 218, 72, 250, 156, 217, 222, 245, 232, - 250, 172, 223, 41, 212, 171, 8, 6, 1, 238, 119, 8, 5, 1, 238, 119, 246, - 201, 251, 8, 210, 89, 210, 248, 245, 243, 212, 68, 227, 222, 200, 1, 227, - 68, 228, 12, 1, 239, 187, 239, 178, 228, 12, 1, 239, 187, 240, 63, 228, - 12, 1, 215, 227, 228, 12, 1, 227, 49, 77, 131, 248, 45, 212, 238, 238, - 82, 224, 173, 216, 64, 239, 89, 239, 88, 239, 87, 223, 183, 201, 243, - 201, 244, 201, 246, 226, 243, 215, 235, 226, 245, 215, 237, 219, 37, 226, - 242, 215, 234, 221, 223, 224, 86, 204, 2, 226, 244, 215, 236, 239, 111, - 219, 36, 204, 52, 241, 107, 239, 99, 224, 154, 220, 32, 206, 194, 97, - 224, 154, 244, 145, 97, 96, 208, 84, 53, 3, 52, 80, 95, 86, 208, 84, 53, - 3, 52, 80, 95, 11, 4, 230, 199, 82, 217, 241, 239, 159, 35, 80, 50, 61, - 227, 185, 155, 205, 165, 205, 54, 204, 242, 204, 231, 204, 220, 204, 209, - 204, 198, 204, 187, 204, 176, 205, 164, 205, 153, 205, 142, 205, 131, - 205, 120, 205, 109, 205, 98, 247, 130, 219, 241, 82, 248, 13, 201, 245, - 9, 2, 221, 57, 209, 141, 9, 2, 221, 57, 115, 221, 57, 247, 161, 115, 247, - 160, 60, 31, 16, 239, 110, 212, 64, 246, 102, 206, 65, 205, 87, 205, 76, - 205, 65, 205, 53, 205, 42, 205, 31, 205, 20, 205, 9, 204, 254, 204, 246, - 204, 245, 204, 244, 204, 243, 204, 241, 204, 240, 204, 239, 204, 238, - 204, 237, 204, 236, 204, 235, 204, 234, 204, 233, 204, 232, 204, 230, - 204, 229, 204, 228, 204, 227, 204, 226, 204, 225, 204, 224, 204, 223, - 204, 222, 204, 221, 204, 219, 204, 218, 204, 217, 204, 216, 204, 215, - 204, 214, 204, 213, 204, 212, 204, 211, 204, 210, 204, 208, 204, 207, - 204, 206, 204, 205, 204, 204, 204, 203, 204, 202, 204, 201, 204, 200, - 204, 199, 204, 197, 204, 196, 204, 195, 204, 194, 204, 193, 204, 192, - 204, 191, 204, 190, 204, 189, 204, 188, 204, 186, 204, 185, 204, 184, - 204, 183, 204, 182, 204, 181, 204, 180, 204, 179, 204, 178, 204, 177, - 204, 175, 204, 174, 204, 173, 204, 172, 204, 171, 204, 170, 204, 169, - 204, 168, 204, 167, 204, 166, 205, 163, 205, 162, 205, 161, 205, 160, - 205, 159, 205, 158, 205, 157, 205, 156, 205, 155, 205, 154, 205, 152, - 205, 151, 205, 150, 205, 149, 205, 148, 205, 147, 205, 146, 205, 145, - 205, 144, 205, 143, 205, 141, 205, 140, 205, 139, 205, 138, 205, 137, - 205, 136, 205, 135, 205, 134, 205, 133, 205, 132, 205, 130, 205, 129, - 205, 128, 205, 127, 205, 126, 205, 125, 205, 124, 205, 123, 205, 122, - 205, 121, 205, 119, 205, 118, 205, 117, 205, 116, 205, 115, 205, 114, - 205, 113, 205, 112, 205, 111, 205, 110, 205, 108, 205, 107, 205, 106, - 205, 105, 205, 104, 205, 103, 205, 102, 205, 101, 205, 100, 205, 99, 205, - 97, 205, 96, 205, 95, 205, 94, 205, 93, 205, 92, 205, 91, 205, 90, 205, - 89, 205, 88, 205, 86, 205, 85, 205, 84, 205, 83, 205, 82, 205, 81, 205, - 80, 205, 79, 205, 78, 205, 77, 205, 75, 205, 74, 205, 73, 205, 72, 205, - 71, 205, 70, 205, 69, 205, 68, 205, 67, 205, 66, 205, 64, 205, 63, 205, - 62, 205, 61, 205, 60, 205, 59, 205, 58, 205, 57, 205, 56, 205, 55, 205, - 52, 205, 51, 205, 50, 205, 49, 205, 48, 205, 47, 205, 46, 205, 45, 205, - 44, 205, 43, 205, 41, 205, 40, 205, 39, 205, 38, 205, 37, 205, 36, 205, - 35, 205, 34, 205, 33, 205, 32, 205, 30, 205, 29, 205, 28, 205, 27, 205, - 26, 205, 25, 205, 24, 205, 23, 205, 22, 205, 21, 205, 19, 205, 18, 205, - 17, 205, 16, 205, 15, 205, 14, 205, 13, 205, 12, 205, 11, 205, 10, 205, - 8, 205, 7, 205, 6, 205, 5, 205, 4, 205, 3, 205, 2, 205, 1, 205, 0, 204, - 255, 204, 253, 204, 252, 204, 251, 204, 250, 204, 249, 204, 248, 204, - 247, 8, 6, 1, 34, 3, 225, 171, 25, 237, 253, 8, 5, 1, 34, 3, 225, 171, - 25, 237, 253, 8, 6, 1, 188, 3, 80, 227, 115, 56, 8, 5, 1, 188, 3, 80, - 227, 115, 56, 8, 6, 1, 188, 3, 80, 227, 115, 248, 126, 25, 237, 253, 8, - 5, 1, 188, 3, 80, 227, 115, 248, 126, 25, 237, 253, 8, 6, 1, 188, 3, 80, - 227, 115, 248, 126, 25, 165, 8, 5, 1, 188, 3, 80, 227, 115, 248, 126, 25, - 165, 8, 6, 1, 188, 3, 246, 53, 25, 225, 170, 8, 5, 1, 188, 3, 246, 53, - 25, 225, 170, 8, 6, 1, 188, 3, 246, 53, 25, 247, 29, 8, 5, 1, 188, 3, - 246, 53, 25, 247, 29, 8, 6, 1, 235, 206, 3, 225, 171, 25, 237, 253, 8, 5, - 1, 235, 206, 3, 225, 171, 25, 237, 253, 8, 5, 1, 235, 206, 3, 70, 87, 25, - 165, 8, 5, 1, 222, 206, 3, 208, 228, 55, 8, 6, 1, 158, 3, 80, 227, 115, - 56, 8, 5, 1, 158, 3, 80, 227, 115, 56, 8, 6, 1, 158, 3, 80, 227, 115, - 248, 126, 25, 237, 253, 8, 5, 1, 158, 3, 80, 227, 115, 248, 126, 25, 237, - 253, 8, 6, 1, 158, 3, 80, 227, 115, 248, 126, 25, 165, 8, 5, 1, 158, 3, - 80, 227, 115, 248, 126, 25, 165, 8, 6, 1, 215, 94, 3, 80, 227, 115, 56, - 8, 5, 1, 215, 94, 3, 80, 227, 115, 56, 8, 6, 1, 106, 3, 225, 171, 25, - 237, 253, 8, 5, 1, 106, 3, 225, 171, 25, 237, 253, 8, 6, 1, 34, 3, 220, - 63, 25, 165, 8, 5, 1, 34, 3, 220, 63, 25, 165, 8, 6, 1, 34, 3, 220, 63, - 25, 208, 227, 8, 5, 1, 34, 3, 220, 63, 25, 208, 227, 8, 6, 1, 188, 3, - 220, 63, 25, 165, 8, 5, 1, 188, 3, 220, 63, 25, 165, 8, 6, 1, 188, 3, - 220, 63, 25, 208, 227, 8, 5, 1, 188, 3, 220, 63, 25, 208, 227, 8, 6, 1, - 188, 3, 70, 87, 25, 165, 8, 5, 1, 188, 3, 70, 87, 25, 165, 8, 6, 1, 188, - 3, 70, 87, 25, 208, 227, 8, 5, 1, 188, 3, 70, 87, 25, 208, 227, 8, 5, 1, - 235, 206, 3, 70, 87, 25, 237, 253, 8, 5, 1, 235, 206, 3, 70, 87, 25, 208, - 227, 8, 6, 1, 235, 206, 3, 220, 63, 25, 165, 8, 5, 1, 235, 206, 3, 220, - 63, 25, 70, 87, 25, 165, 8, 6, 1, 235, 206, 3, 220, 63, 25, 208, 227, 8, - 5, 1, 235, 206, 3, 220, 63, 25, 70, 87, 25, 208, 227, 8, 6, 1, 230, 185, - 3, 208, 227, 8, 5, 1, 230, 185, 3, 70, 87, 25, 208, 227, 8, 6, 1, 228, - 131, 3, 208, 227, 8, 5, 1, 228, 131, 3, 208, 227, 8, 6, 1, 226, 186, 3, - 208, 227, 8, 5, 1, 226, 186, 3, 208, 227, 8, 6, 1, 217, 1, 3, 208, 227, - 8, 5, 1, 217, 1, 3, 208, 227, 8, 6, 1, 106, 3, 220, 63, 25, 165, 8, 5, 1, - 106, 3, 220, 63, 25, 165, 8, 6, 1, 106, 3, 220, 63, 25, 208, 227, 8, 5, - 1, 106, 3, 220, 63, 25, 208, 227, 8, 6, 1, 106, 3, 225, 171, 25, 165, 8, - 5, 1, 106, 3, 225, 171, 25, 165, 8, 6, 1, 106, 3, 225, 171, 25, 208, 227, - 8, 5, 1, 106, 3, 225, 171, 25, 208, 227, 8, 5, 1, 251, 110, 3, 237, 253, - 8, 5, 1, 171, 158, 3, 237, 253, 8, 5, 1, 171, 158, 3, 165, 8, 5, 1, 207, - 174, 206, 165, 3, 237, 253, 8, 5, 1, 207, 174, 206, 165, 3, 165, 8, 5, 1, - 214, 193, 3, 237, 253, 8, 5, 1, 214, 193, 3, 165, 8, 5, 1, 236, 115, 214, - 193, 3, 237, 253, 8, 5, 1, 236, 115, 214, 193, 3, 165, 10, 213, 127, 89, - 3, 237, 128, 87, 3, 251, 30, 10, 213, 127, 89, 3, 237, 128, 87, 3, 204, - 70, 10, 213, 127, 89, 3, 237, 128, 87, 3, 137, 225, 129, 10, 213, 127, - 89, 3, 237, 128, 87, 3, 220, 73, 10, 213, 127, 89, 3, 237, 128, 87, 3, - 68, 10, 213, 127, 89, 3, 237, 128, 87, 3, 202, 213, 10, 213, 127, 89, 3, - 237, 128, 87, 3, 74, 10, 213, 127, 89, 3, 237, 128, 87, 3, 251, 109, 10, - 213, 127, 221, 179, 3, 229, 189, 179, 1, 229, 119, 44, 109, 230, 54, 44, - 109, 222, 205, 44, 109, 247, 125, 44, 109, 221, 13, 44, 109, 207, 244, - 44, 109, 221, 228, 44, 109, 210, 69, 44, 109, 223, 163, 44, 109, 219, - 184, 44, 109, 226, 185, 44, 109, 203, 124, 44, 109, 146, 44, 109, 159, - 44, 109, 206, 164, 44, 109, 227, 69, 44, 109, 227, 78, 44, 109, 215, 186, - 44, 109, 221, 210, 44, 109, 230, 184, 44, 109, 213, 92, 44, 109, 211, - 167, 44, 109, 194, 44, 109, 237, 171, 44, 109, 228, 224, 44, 4, 230, 41, - 44, 4, 229, 100, 44, 4, 229, 87, 44, 4, 228, 209, 44, 4, 228, 174, 44, 4, - 229, 201, 44, 4, 229, 198, 44, 4, 230, 18, 44, 4, 229, 26, 44, 4, 229, 6, - 44, 4, 229, 219, 44, 4, 222, 202, 44, 4, 222, 151, 44, 4, 222, 147, 44, - 4, 222, 116, 44, 4, 222, 108, 44, 4, 222, 190, 44, 4, 222, 188, 44, 4, - 222, 199, 44, 4, 222, 128, 44, 4, 222, 123, 44, 4, 222, 192, 44, 4, 247, - 91, 44, 4, 246, 79, 44, 4, 246, 69, 44, 4, 245, 110, 44, 4, 245, 76, 44, - 4, 246, 238, 44, 4, 246, 230, 44, 4, 247, 80, 44, 4, 245, 254, 44, 4, - 245, 180, 44, 4, 247, 15, 44, 4, 221, 10, 44, 4, 220, 248, 44, 4, 220, - 243, 44, 4, 220, 226, 44, 4, 220, 218, 44, 4, 221, 1, 44, 4, 221, 0, 44, - 4, 221, 7, 44, 4, 220, 233, 44, 4, 220, 230, 44, 4, 221, 4, 44, 4, 207, - 240, 44, 4, 207, 220, 44, 4, 207, 219, 44, 4, 207, 208, 44, 4, 207, 205, - 44, 4, 207, 236, 44, 4, 207, 235, 44, 4, 207, 239, 44, 4, 207, 218, 44, - 4, 207, 217, 44, 4, 207, 238, 44, 4, 221, 226, 44, 4, 221, 212, 44, 4, - 221, 211, 44, 4, 221, 195, 44, 4, 221, 194, 44, 4, 221, 222, 44, 4, 221, - 221, 44, 4, 221, 225, 44, 4, 221, 197, 44, 4, 221, 196, 44, 4, 221, 224, - 44, 4, 210, 18, 44, 4, 209, 2, 44, 4, 208, 242, 44, 4, 207, 203, 44, 4, - 207, 165, 44, 4, 209, 187, 44, 4, 209, 176, 44, 4, 209, 250, 44, 4, 135, - 44, 4, 208, 148, 44, 4, 209, 207, 44, 4, 223, 106, 44, 4, 222, 100, 44, - 4, 222, 75, 44, 4, 221, 84, 44, 4, 221, 25, 44, 4, 222, 240, 44, 4, 222, - 235, 44, 4, 223, 92, 44, 4, 221, 191, 44, 4, 221, 180, 44, 4, 223, 65, - 44, 4, 219, 168, 44, 4, 218, 167, 44, 4, 218, 129, 44, 4, 217, 191, 44, - 4, 217, 157, 44, 4, 219, 34, 44, 4, 219, 23, 44, 4, 219, 148, 44, 4, 218, - 69, 44, 4, 218, 45, 44, 4, 219, 48, 44, 4, 225, 175, 44, 4, 224, 155, 44, - 4, 224, 125, 44, 4, 223, 246, 44, 4, 223, 192, 44, 4, 225, 20, 44, 4, - 225, 8, 44, 4, 225, 140, 44, 4, 224, 82, 44, 4, 224, 35, 44, 4, 225, 67, - 44, 4, 203, 110, 44, 4, 203, 11, 44, 4, 203, 2, 44, 4, 202, 213, 44, 4, - 202, 181, 44, 4, 203, 52, 44, 4, 203, 49, 44, 4, 203, 89, 44, 4, 202, - 247, 44, 4, 202, 232, 44, 4, 203, 62, 44, 4, 216, 216, 44, 4, 216, 57, - 44, 4, 216, 3, 44, 4, 215, 145, 44, 4, 215, 114, 44, 4, 216, 158, 44, 4, - 216, 135, 44, 4, 216, 197, 44, 4, 215, 227, 44, 4, 215, 208, 44, 4, 216, - 167, 44, 4, 228, 112, 44, 4, 227, 148, 44, 4, 227, 130, 44, 4, 226, 239, - 44, 4, 226, 210, 44, 4, 227, 234, 44, 4, 227, 226, 44, 4, 228, 86, 44, 4, - 227, 49, 44, 4, 227, 18, 44, 4, 227, 251, 44, 4, 206, 85, 44, 4, 205, - 230, 44, 4, 205, 215, 44, 4, 204, 163, 44, 4, 204, 156, 44, 4, 206, 55, - 44, 4, 206, 50, 44, 4, 206, 81, 44, 4, 205, 189, 44, 4, 205, 176, 44, 4, - 206, 61, 44, 4, 227, 67, 44, 4, 227, 62, 44, 4, 227, 61, 44, 4, 227, 58, - 44, 4, 227, 57, 44, 4, 227, 64, 44, 4, 227, 63, 44, 4, 227, 66, 44, 4, - 227, 60, 44, 4, 227, 59, 44, 4, 227, 65, 44, 4, 227, 76, 44, 4, 227, 71, - 44, 4, 227, 70, 44, 4, 227, 54, 44, 4, 227, 53, 44, 4, 227, 73, 44, 4, - 227, 72, 44, 4, 227, 75, 44, 4, 227, 56, 44, 4, 227, 55, 44, 4, 227, 74, - 44, 4, 215, 184, 44, 4, 215, 173, 44, 4, 215, 172, 44, 4, 215, 165, 44, - 4, 215, 158, 44, 4, 215, 180, 44, 4, 215, 179, 44, 4, 215, 183, 44, 4, - 215, 171, 44, 4, 215, 170, 44, 4, 215, 182, 44, 4, 221, 208, 44, 4, 221, - 203, 44, 4, 221, 202, 44, 4, 221, 199, 44, 4, 221, 198, 44, 4, 221, 205, - 44, 4, 221, 204, 44, 4, 221, 207, 44, 4, 221, 201, 44, 4, 221, 200, 44, - 4, 221, 206, 44, 4, 230, 180, 44, 4, 230, 141, 44, 4, 230, 134, 44, 4, - 230, 82, 44, 4, 230, 64, 44, 4, 230, 161, 44, 4, 230, 159, 44, 4, 230, - 174, 44, 4, 230, 101, 44, 4, 230, 91, 44, 4, 230, 167, 44, 4, 213, 85, - 44, 4, 213, 11, 44, 4, 213, 6, 44, 4, 212, 199, 44, 4, 212, 182, 44, 4, - 213, 43, 44, 4, 213, 41, 44, 4, 213, 74, 44, 4, 212, 242, 44, 4, 212, - 236, 44, 4, 213, 52, 44, 4, 211, 163, 44, 4, 211, 132, 44, 4, 211, 128, - 44, 4, 211, 119, 44, 4, 211, 116, 44, 4, 211, 138, 44, 4, 211, 137, 44, - 4, 211, 162, 44, 4, 211, 124, 44, 4, 211, 123, 44, 4, 211, 140, 44, 4, - 215, 33, 44, 4, 212, 162, 44, 4, 212, 142, 44, 4, 211, 10, 44, 4, 210, - 179, 44, 4, 214, 177, 44, 4, 214, 165, 44, 4, 215, 18, 44, 4, 212, 13, - 44, 4, 211, 250, 44, 4, 214, 217, 44, 4, 237, 157, 44, 4, 237, 3, 44, 4, - 236, 239, 44, 4, 236, 26, 44, 4, 236, 1, 44, 4, 237, 67, 44, 4, 237, 48, - 44, 4, 237, 147, 44, 4, 236, 136, 44, 4, 236, 117, 44, 4, 237, 76, 44, 4, - 228, 223, 44, 4, 228, 222, 44, 4, 228, 217, 44, 4, 228, 216, 44, 4, 228, - 213, 44, 4, 228, 212, 44, 4, 228, 219, 44, 4, 228, 218, 44, 4, 228, 221, - 44, 4, 228, 215, 44, 4, 228, 214, 44, 4, 228, 220, 44, 4, 212, 205, 140, - 109, 2, 203, 75, 140, 109, 2, 216, 186, 140, 109, 2, 216, 102, 114, 1, - 207, 95, 85, 109, 2, 245, 249, 173, 85, 109, 2, 245, 249, 229, 144, 85, - 109, 2, 245, 249, 229, 26, 85, 109, 2, 245, 249, 229, 115, 85, 109, 2, - 245, 249, 222, 128, 85, 109, 2, 245, 249, 247, 92, 85, 109, 2, 245, 249, - 246, 199, 85, 109, 2, 245, 249, 245, 254, 85, 109, 2, 245, 249, 246, 116, - 85, 109, 2, 245, 249, 220, 233, 85, 109, 2, 245, 249, 244, 212, 85, 109, - 2, 245, 249, 207, 229, 85, 109, 2, 245, 249, 243, 113, 85, 109, 2, 245, - 249, 207, 224, 85, 109, 2, 245, 249, 201, 201, 85, 109, 2, 245, 249, 210, - 22, 85, 109, 2, 245, 249, 209, 108, 85, 109, 2, 245, 249, 135, 85, 109, - 2, 245, 249, 209, 47, 85, 109, 2, 245, 249, 221, 191, 85, 109, 2, 245, - 249, 249, 32, 85, 109, 2, 245, 249, 218, 208, 85, 109, 2, 245, 249, 218, - 69, 85, 109, 2, 245, 249, 218, 180, 85, 109, 2, 245, 249, 224, 82, 85, - 109, 2, 245, 249, 202, 247, 85, 109, 2, 245, 249, 215, 227, 85, 109, 2, - 245, 249, 227, 49, 85, 109, 2, 245, 249, 205, 189, 85, 109, 2, 245, 249, - 213, 90, 85, 109, 2, 245, 249, 211, 164, 85, 109, 2, 245, 249, 215, 36, - 85, 109, 2, 245, 249, 152, 85, 109, 2, 245, 249, 228, 113, 85, 22, 2, - 245, 249, 217, 126, 85, 231, 36, 22, 2, 245, 249, 217, 65, 85, 231, 36, - 22, 2, 245, 249, 215, 102, 85, 231, 36, 22, 2, 245, 249, 215, 95, 85, - 231, 36, 22, 2, 245, 249, 217, 106, 85, 22, 2, 220, 39, 85, 22, 2, 251, - 242, 172, 1, 248, 79, 222, 203, 172, 1, 248, 79, 222, 151, 172, 1, 248, - 79, 222, 116, 172, 1, 248, 79, 222, 190, 172, 1, 248, 79, 222, 128, 67, - 1, 248, 79, 222, 203, 67, 1, 248, 79, 222, 151, 67, 1, 248, 79, 222, 116, - 67, 1, 248, 79, 222, 190, 67, 1, 248, 79, 222, 128, 67, 1, 251, 57, 246, - 238, 67, 1, 251, 57, 207, 203, 67, 1, 251, 57, 135, 67, 1, 251, 57, 219, - 184, 65, 1, 240, 198, 240, 197, 245, 188, 143, 142, 65, 1, 240, 197, 240, - 198, 245, 188, 143, 142, + 0, 208, 244, 238, 43, 81, 214, 63, 81, 41, 54, 240, 194, 54, 216, 27, 54, + 251, 89, 251, 13, 49, 216, 115, 51, 216, 115, 250, 165, 93, 54, 246, 70, + 233, 32, 236, 183, 208, 76, 209, 16, 17, 199, 81, 17, 102, 17, 105, 17, + 147, 17, 149, 17, 164, 17, 187, 17, 210, 135, 17, 192, 17, 219, 113, 246, + 79, 210, 167, 224, 241, 54, 238, 122, 54, 235, 67, 54, 214, 79, 81, 246, + 68, 250, 155, 8, 6, 1, 62, 8, 6, 1, 250, 103, 8, 6, 1, 247, 223, 8, 6, 1, + 242, 153, 8, 6, 1, 72, 8, 6, 1, 238, 5, 8, 6, 1, 236, 156, 8, 6, 1, 234, + 247, 8, 6, 1, 70, 8, 6, 1, 227, 251, 8, 6, 1, 227, 118, 8, 6, 1, 156, 8, + 6, 1, 223, 243, 8, 6, 1, 220, 214, 8, 6, 1, 74, 8, 6, 1, 216, 226, 8, 6, + 1, 214, 167, 8, 6, 1, 146, 8, 6, 1, 212, 122, 8, 6, 1, 207, 83, 8, 6, 1, + 66, 8, 6, 1, 203, 168, 8, 6, 1, 201, 147, 8, 6, 1, 200, 195, 8, 6, 1, + 200, 123, 8, 6, 1, 199, 157, 49, 52, 159, 213, 106, 209, 16, 51, 52, 159, + 246, 147, 251, 251, 128, 224, 176, 235, 74, 251, 251, 8, 4, 1, 62, 8, 4, + 1, 250, 103, 8, 4, 1, 247, 223, 8, 4, 1, 242, 153, 8, 4, 1, 72, 8, 4, 1, + 238, 5, 8, 4, 1, 236, 156, 8, 4, 1, 234, 247, 8, 4, 1, 70, 8, 4, 1, 227, + 251, 8, 4, 1, 227, 118, 8, 4, 1, 156, 8, 4, 1, 223, 243, 8, 4, 1, 220, + 214, 8, 4, 1, 74, 8, 4, 1, 216, 226, 8, 4, 1, 214, 167, 8, 4, 1, 146, 8, + 4, 1, 212, 122, 8, 4, 1, 207, 83, 8, 4, 1, 66, 8, 4, 1, 203, 168, 8, 4, + 1, 201, 147, 8, 4, 1, 200, 195, 8, 4, 1, 200, 123, 8, 4, 1, 199, 157, 49, + 242, 196, 159, 83, 224, 176, 51, 242, 196, 159, 205, 240, 218, 240, 208, + 244, 228, 50, 238, 43, 81, 247, 58, 54, 215, 56, 54, 242, 195, 54, 200, + 42, 54, 248, 46, 148, 211, 193, 54, 241, 74, 243, 19, 54, 237, 128, 217, + 29, 228, 99, 225, 23, 53, 251, 71, 214, 63, 81, 218, 215, 54, 209, 23, + 233, 33, 213, 161, 54, 222, 228, 241, 155, 54, 215, 112, 54, 207, 213, + 105, 207, 213, 147, 251, 239, 251, 251, 221, 209, 54, 215, 163, 54, 101, + 240, 182, 247, 69, 207, 213, 102, 222, 136, 217, 29, 228, 99, 213, 41, + 53, 251, 71, 214, 63, 81, 201, 164, 236, 219, 112, 214, 87, 201, 164, + 236, 219, 112, 234, 213, 201, 164, 236, 219, 126, 214, 85, 228, 50, 214, + 79, 81, 8, 6, 1, 35, 3, 235, 73, 8, 6, 1, 35, 3, 169, 8, 6, 1, 35, 3, + 246, 146, 8, 6, 1, 35, 3, 205, 240, 8, 6, 1, 35, 3, 241, 74, 8, 6, 1, 35, + 3, 213, 27, 56, 8, 6, 1, 251, 221, 8, 6, 1, 247, 224, 3, 247, 69, 8, 6, + 1, 197, 3, 235, 73, 8, 6, 1, 197, 3, 169, 8, 6, 1, 197, 3, 246, 146, 8, + 6, 1, 197, 3, 241, 74, 8, 6, 1, 233, 19, 3, 235, 73, 8, 6, 1, 233, 19, 3, + 169, 8, 6, 1, 233, 19, 3, 246, 146, 8, 6, 1, 233, 19, 3, 241, 74, 8, 6, + 1, 238, 74, 8, 6, 1, 220, 215, 3, 205, 240, 8, 6, 1, 163, 3, 235, 73, 8, + 6, 1, 163, 3, 169, 8, 6, 1, 163, 3, 246, 146, 8, 6, 1, 163, 3, 205, 240, + 8, 6, 1, 163, 3, 241, 74, 221, 19, 54, 8, 6, 1, 163, 3, 97, 8, 6, 1, 108, + 3, 235, 73, 8, 6, 1, 108, 3, 169, 8, 6, 1, 108, 3, 246, 146, 8, 6, 1, + 108, 3, 241, 74, 8, 6, 1, 200, 124, 3, 169, 8, 6, 1, 206, 54, 8, 4, 1, + 210, 79, 212, 122, 8, 4, 1, 35, 3, 235, 73, 8, 4, 1, 35, 3, 169, 8, 4, 1, + 35, 3, 246, 146, 8, 4, 1, 35, 3, 205, 240, 8, 4, 1, 35, 3, 241, 74, 8, 4, + 1, 35, 3, 213, 27, 56, 8, 4, 1, 251, 221, 8, 4, 1, 247, 224, 3, 247, 69, + 8, 4, 1, 197, 3, 235, 73, 8, 4, 1, 197, 3, 169, 8, 4, 1, 197, 3, 246, + 146, 8, 4, 1, 197, 3, 241, 74, 8, 4, 1, 233, 19, 3, 235, 73, 8, 4, 1, + 233, 19, 3, 169, 8, 4, 1, 233, 19, 3, 246, 146, 8, 4, 1, 233, 19, 3, 241, + 74, 8, 4, 1, 238, 74, 8, 4, 1, 220, 215, 3, 205, 240, 8, 4, 1, 163, 3, + 235, 73, 8, 4, 1, 163, 3, 169, 8, 4, 1, 163, 3, 246, 146, 8, 4, 1, 163, + 3, 205, 240, 8, 4, 1, 163, 3, 241, 74, 240, 235, 54, 8, 4, 1, 163, 3, 97, + 8, 4, 1, 108, 3, 235, 73, 8, 4, 1, 108, 3, 169, 8, 4, 1, 108, 3, 246, + 146, 8, 4, 1, 108, 3, 241, 74, 8, 4, 1, 200, 124, 3, 169, 8, 4, 1, 206, + 54, 8, 4, 1, 200, 124, 3, 241, 74, 8, 6, 1, 35, 3, 222, 228, 8, 4, 1, 35, + 3, 222, 228, 8, 6, 1, 35, 3, 248, 57, 8, 4, 1, 35, 3, 248, 57, 8, 6, 1, + 35, 3, 217, 110, 8, 4, 1, 35, 3, 217, 110, 8, 6, 1, 247, 224, 3, 169, 8, + 4, 1, 247, 224, 3, 169, 8, 6, 1, 247, 224, 3, 246, 146, 8, 4, 1, 247, + 224, 3, 246, 146, 8, 6, 1, 247, 224, 3, 73, 56, 8, 4, 1, 247, 224, 3, 73, + 56, 8, 6, 1, 247, 224, 3, 247, 125, 8, 4, 1, 247, 224, 3, 247, 125, 8, 6, + 1, 242, 154, 3, 247, 125, 8, 4, 1, 242, 154, 3, 247, 125, 8, 6, 1, 242, + 154, 3, 97, 8, 4, 1, 242, 154, 3, 97, 8, 6, 1, 197, 3, 222, 228, 8, 4, 1, + 197, 3, 222, 228, 8, 6, 1, 197, 3, 248, 57, 8, 4, 1, 197, 3, 248, 57, 8, + 6, 1, 197, 3, 73, 56, 8, 4, 1, 197, 3, 73, 56, 8, 6, 1, 197, 3, 217, 110, + 8, 4, 1, 197, 3, 217, 110, 8, 6, 1, 197, 3, 247, 125, 8, 4, 1, 197, 3, + 247, 125, 8, 6, 1, 236, 157, 3, 246, 146, 8, 4, 1, 236, 157, 3, 246, 146, + 8, 6, 1, 236, 157, 3, 248, 57, 8, 4, 1, 236, 157, 3, 248, 57, 8, 6, 1, + 236, 157, 3, 73, 56, 8, 4, 1, 236, 157, 3, 73, 56, 8, 6, 1, 236, 157, 3, + 247, 69, 8, 4, 1, 236, 157, 3, 247, 69, 8, 6, 1, 234, 248, 3, 246, 146, + 8, 4, 1, 234, 248, 3, 246, 146, 8, 6, 1, 234, 248, 3, 97, 8, 4, 1, 234, + 248, 3, 97, 8, 6, 1, 233, 19, 3, 205, 240, 8, 4, 1, 233, 19, 3, 205, 240, + 8, 6, 1, 233, 19, 3, 222, 228, 8, 4, 1, 233, 19, 3, 222, 228, 8, 6, 1, + 233, 19, 3, 248, 57, 8, 4, 1, 233, 19, 3, 248, 57, 8, 6, 1, 233, 19, 3, + 217, 110, 8, 4, 1, 233, 19, 3, 217, 110, 8, 6, 1, 233, 19, 3, 73, 56, 8, + 4, 1, 240, 181, 70, 8, 6, 33, 228, 149, 8, 4, 33, 228, 149, 8, 6, 1, 227, + 252, 3, 246, 146, 8, 4, 1, 227, 252, 3, 246, 146, 8, 6, 1, 227, 119, 3, + 247, 69, 8, 4, 1, 227, 119, 3, 247, 69, 8, 4, 1, 226, 37, 8, 6, 1, 225, + 193, 3, 169, 8, 4, 1, 225, 193, 3, 169, 8, 6, 1, 225, 193, 3, 247, 69, 8, + 4, 1, 225, 193, 3, 247, 69, 8, 6, 1, 225, 193, 3, 247, 125, 8, 4, 1, 225, + 193, 3, 247, 125, 8, 6, 1, 225, 193, 3, 101, 240, 182, 8, 4, 1, 225, 193, + 3, 101, 240, 182, 8, 6, 1, 225, 193, 3, 97, 8, 4, 1, 225, 193, 3, 97, 8, + 6, 1, 220, 215, 3, 169, 8, 4, 1, 220, 215, 3, 169, 8, 6, 1, 220, 215, 3, + 247, 69, 8, 4, 1, 220, 215, 3, 247, 69, 8, 6, 1, 220, 215, 3, 247, 125, + 8, 4, 1, 220, 215, 3, 247, 125, 8, 4, 1, 220, 215, 215, 30, 247, 235, + 251, 13, 8, 6, 1, 238, 165, 8, 4, 1, 238, 165, 8, 6, 1, 163, 3, 222, 228, + 8, 4, 1, 163, 3, 222, 228, 8, 6, 1, 163, 3, 248, 57, 8, 4, 1, 163, 3, + 248, 57, 8, 6, 1, 163, 3, 53, 169, 8, 4, 1, 163, 3, 53, 169, 8, 6, 33, + 217, 121, 8, 4, 33, 217, 121, 8, 6, 1, 214, 33, 3, 169, 8, 4, 1, 214, 33, + 3, 169, 8, 6, 1, 214, 33, 3, 247, 69, 8, 4, 1, 214, 33, 3, 247, 69, 8, 6, + 1, 214, 33, 3, 247, 125, 8, 4, 1, 214, 33, 3, 247, 125, 8, 6, 1, 212, + 123, 3, 169, 8, 4, 1, 212, 123, 3, 169, 8, 6, 1, 212, 123, 3, 246, 146, + 8, 4, 1, 212, 123, 3, 246, 146, 8, 6, 1, 212, 123, 3, 247, 69, 8, 4, 1, + 212, 123, 3, 247, 69, 8, 6, 1, 212, 123, 3, 247, 125, 8, 4, 1, 212, 123, + 3, 247, 125, 8, 6, 1, 207, 84, 3, 247, 69, 8, 4, 1, 207, 84, 3, 247, 69, + 8, 6, 1, 207, 84, 3, 247, 125, 8, 4, 1, 207, 84, 3, 247, 125, 8, 6, 1, + 207, 84, 3, 97, 8, 4, 1, 207, 84, 3, 97, 8, 6, 1, 108, 3, 205, 240, 8, 4, + 1, 108, 3, 205, 240, 8, 6, 1, 108, 3, 222, 228, 8, 4, 1, 108, 3, 222, + 228, 8, 6, 1, 108, 3, 248, 57, 8, 4, 1, 108, 3, 248, 57, 8, 6, 1, 108, 3, + 213, 27, 56, 8, 4, 1, 108, 3, 213, 27, 56, 8, 6, 1, 108, 3, 53, 169, 8, + 4, 1, 108, 3, 53, 169, 8, 6, 1, 108, 3, 217, 110, 8, 4, 1, 108, 3, 217, + 110, 8, 6, 1, 201, 148, 3, 246, 146, 8, 4, 1, 201, 148, 3, 246, 146, 8, + 6, 1, 200, 124, 3, 246, 146, 8, 4, 1, 200, 124, 3, 246, 146, 8, 6, 1, + 200, 124, 3, 241, 74, 8, 6, 1, 199, 158, 3, 169, 8, 4, 1, 199, 158, 3, + 169, 8, 6, 1, 199, 158, 3, 73, 56, 8, 4, 1, 199, 158, 3, 73, 56, 8, 6, 1, + 199, 158, 3, 247, 125, 8, 4, 1, 199, 158, 3, 247, 125, 8, 4, 1, 168, 212, + 122, 8, 4, 1, 68, 3, 97, 8, 6, 1, 68, 3, 117, 8, 6, 1, 68, 3, 205, 155, + 8, 4, 1, 68, 3, 205, 155, 8, 6, 1, 150, 187, 8, 4, 1, 150, 187, 8, 6, 1, + 176, 74, 8, 6, 1, 247, 224, 3, 117, 8, 4, 1, 247, 224, 3, 117, 8, 6, 1, + 251, 196, 242, 153, 8, 6, 1, 242, 154, 3, 117, 8, 6, 1, 242, 154, 3, 205, + 155, 8, 4, 1, 242, 154, 3, 205, 155, 8, 4, 1, 204, 185, 241, 136, 8, 6, + 1, 213, 105, 72, 8, 6, 1, 211, 218, 8, 6, 1, 176, 72, 8, 6, 1, 238, 6, 3, + 117, 8, 4, 1, 238, 6, 3, 117, 8, 6, 1, 236, 157, 3, 117, 8, 6, 1, 236, + 60, 8, 4, 1, 233, 69, 8, 6, 1, 228, 41, 8, 6, 1, 233, 19, 3, 97, 8, 6, 1, + 227, 119, 3, 117, 8, 4, 1, 227, 119, 3, 117, 8, 4, 1, 225, 193, 3, 148, + 8, 4, 1, 225, 89, 3, 97, 8, 6, 1, 204, 185, 223, 243, 8, 6, 1, 220, 215, + 3, 49, 117, 8, 4, 1, 220, 215, 3, 168, 51, 225, 16, 8, 6, 1, 163, 3, 101, + 205, 240, 8, 6, 1, 163, 3, 233, 124, 8, 4, 1, 163, 3, 233, 124, 8, 6, 1, + 217, 105, 8, 4, 1, 217, 105, 8, 6, 1, 216, 227, 3, 117, 8, 4, 1, 216, + 227, 3, 117, 8, 1, 199, 214, 8, 6, 1, 150, 105, 8, 4, 1, 150, 105, 8, 6, + 1, 238, 94, 8, 1, 213, 105, 238, 95, 224, 74, 8, 4, 1, 207, 84, 3, 216, + 184, 117, 8, 6, 1, 207, 84, 3, 117, 8, 4, 1, 207, 84, 3, 117, 8, 6, 1, + 207, 84, 3, 213, 111, 117, 8, 6, 1, 108, 3, 233, 124, 8, 4, 1, 108, 3, + 233, 124, 8, 6, 1, 203, 220, 8, 6, 1, 203, 169, 3, 117, 8, 6, 1, 200, + 124, 3, 117, 8, 4, 1, 200, 124, 3, 117, 8, 6, 1, 199, 158, 3, 97, 8, 4, + 1, 199, 158, 3, 97, 8, 6, 1, 238, 8, 8, 6, 1, 238, 9, 213, 104, 8, 4, 1, + 238, 9, 213, 104, 8, 4, 1, 238, 9, 3, 207, 6, 8, 1, 120, 3, 97, 8, 6, 1, + 150, 164, 8, 4, 1, 150, 164, 8, 1, 228, 50, 235, 123, 208, 77, 3, 97, 8, + 1, 200, 198, 8, 1, 241, 129, 246, 121, 8, 1, 225, 61, 246, 121, 8, 1, + 251, 102, 246, 121, 8, 1, 213, 111, 246, 121, 8, 6, 1, 239, 95, 3, 247, + 125, 8, 6, 1, 242, 154, 3, 4, 1, 199, 158, 3, 247, 125, 8, 4, 1, 239, 95, + 3, 247, 125, 8, 6, 1, 224, 142, 8, 6, 1, 225, 193, 3, 4, 1, 227, 251, 8, + 4, 1, 224, 142, 8, 6, 1, 219, 99, 8, 6, 1, 220, 215, 3, 4, 1, 227, 251, + 8, 4, 1, 219, 99, 8, 6, 1, 35, 3, 247, 125, 8, 4, 1, 35, 3, 247, 125, 8, + 6, 1, 233, 19, 3, 247, 125, 8, 4, 1, 233, 19, 3, 247, 125, 8, 6, 1, 163, + 3, 247, 125, 8, 4, 1, 163, 3, 247, 125, 8, 6, 1, 108, 3, 247, 125, 8, 4, + 1, 108, 3, 247, 125, 8, 6, 1, 108, 3, 241, 75, 26, 222, 228, 8, 4, 1, + 108, 3, 241, 75, 26, 222, 228, 8, 6, 1, 108, 3, 241, 75, 26, 169, 8, 4, + 1, 108, 3, 241, 75, 26, 169, 8, 6, 1, 108, 3, 241, 75, 26, 247, 125, 8, + 4, 1, 108, 3, 241, 75, 26, 247, 125, 8, 6, 1, 108, 3, 241, 75, 26, 235, + 73, 8, 4, 1, 108, 3, 241, 75, 26, 235, 73, 8, 4, 1, 204, 185, 72, 8, 6, + 1, 35, 3, 241, 75, 26, 222, 228, 8, 4, 1, 35, 3, 241, 75, 26, 222, 228, + 8, 6, 1, 35, 3, 73, 88, 26, 222, 228, 8, 4, 1, 35, 3, 73, 88, 26, 222, + 228, 8, 6, 1, 251, 222, 3, 222, 228, 8, 4, 1, 251, 222, 3, 222, 228, 8, + 6, 1, 236, 157, 3, 97, 8, 4, 1, 236, 157, 3, 97, 8, 6, 1, 236, 157, 3, + 247, 125, 8, 4, 1, 236, 157, 3, 247, 125, 8, 6, 1, 227, 119, 3, 247, 125, + 8, 4, 1, 227, 119, 3, 247, 125, 8, 6, 1, 163, 3, 217, 110, 8, 4, 1, 163, + 3, 217, 110, 8, 6, 1, 163, 3, 217, 111, 26, 222, 228, 8, 4, 1, 163, 3, + 217, 111, 26, 222, 228, 8, 6, 1, 238, 9, 3, 247, 125, 8, 4, 1, 238, 9, 3, + 247, 125, 8, 4, 1, 227, 252, 3, 247, 125, 8, 6, 1, 239, 94, 8, 6, 1, 242, + 154, 3, 4, 1, 199, 157, 8, 4, 1, 239, 94, 8, 6, 1, 236, 157, 3, 169, 8, + 4, 1, 236, 157, 3, 169, 8, 6, 1, 233, 66, 8, 6, 1, 200, 198, 8, 6, 1, + 220, 215, 3, 235, 73, 8, 4, 1, 220, 215, 3, 235, 73, 8, 6, 1, 35, 3, 213, + 27, 88, 26, 169, 8, 4, 1, 35, 3, 213, 27, 88, 26, 169, 8, 6, 1, 251, 222, + 3, 169, 8, 4, 1, 251, 222, 3, 169, 8, 6, 1, 163, 3, 208, 47, 26, 169, 8, + 4, 1, 163, 3, 208, 47, 26, 169, 8, 6, 1, 35, 3, 53, 235, 73, 8, 4, 1, 35, + 3, 53, 235, 73, 8, 6, 1, 35, 3, 228, 50, 248, 57, 8, 4, 1, 35, 3, 228, + 50, 248, 57, 8, 6, 1, 197, 3, 53, 235, 73, 8, 4, 1, 197, 3, 53, 235, 73, + 8, 6, 1, 197, 3, 228, 50, 248, 57, 8, 4, 1, 197, 3, 228, 50, 248, 57, 8, + 6, 1, 233, 19, 3, 53, 235, 73, 8, 4, 1, 233, 19, 3, 53, 235, 73, 8, 6, 1, + 233, 19, 3, 228, 50, 248, 57, 8, 4, 1, 233, 19, 3, 228, 50, 248, 57, 8, + 6, 1, 163, 3, 53, 235, 73, 8, 4, 1, 163, 3, 53, 235, 73, 8, 6, 1, 163, 3, + 228, 50, 248, 57, 8, 4, 1, 163, 3, 228, 50, 248, 57, 8, 6, 1, 214, 33, 3, + 53, 235, 73, 8, 4, 1, 214, 33, 3, 53, 235, 73, 8, 6, 1, 214, 33, 3, 228, + 50, 248, 57, 8, 4, 1, 214, 33, 3, 228, 50, 248, 57, 8, 6, 1, 108, 3, 53, + 235, 73, 8, 4, 1, 108, 3, 53, 235, 73, 8, 6, 1, 108, 3, 228, 50, 248, 57, + 8, 4, 1, 108, 3, 228, 50, 248, 57, 8, 6, 1, 212, 123, 3, 246, 71, 57, 8, + 4, 1, 212, 123, 3, 246, 71, 57, 8, 6, 1, 207, 84, 3, 246, 71, 57, 8, 4, + 1, 207, 84, 3, 246, 71, 57, 8, 6, 1, 199, 232, 8, 4, 1, 199, 232, 8, 6, + 1, 234, 248, 3, 247, 125, 8, 4, 1, 234, 248, 3, 247, 125, 8, 6, 1, 220, + 215, 3, 168, 51, 225, 16, 8, 4, 1, 242, 154, 3, 242, 198, 8, 6, 1, 217, + 3, 8, 4, 1, 217, 3, 8, 6, 1, 199, 158, 3, 117, 8, 4, 1, 199, 158, 3, 117, + 8, 6, 1, 35, 3, 73, 56, 8, 4, 1, 35, 3, 73, 56, 8, 6, 1, 197, 3, 247, 69, + 8, 4, 1, 197, 3, 247, 69, 8, 6, 1, 163, 3, 241, 75, 26, 222, 228, 8, 4, + 1, 163, 3, 241, 75, 26, 222, 228, 8, 6, 1, 163, 3, 205, 241, 26, 222, + 228, 8, 4, 1, 163, 3, 205, 241, 26, 222, 228, 8, 6, 1, 163, 3, 73, 56, 8, + 4, 1, 163, 3, 73, 56, 8, 6, 1, 163, 3, 73, 88, 26, 222, 228, 8, 4, 1, + 163, 3, 73, 88, 26, 222, 228, 8, 6, 1, 200, 124, 3, 222, 228, 8, 4, 1, + 200, 124, 3, 222, 228, 8, 4, 1, 225, 193, 3, 242, 198, 8, 4, 1, 220, 215, + 3, 242, 198, 8, 4, 1, 207, 84, 3, 242, 198, 8, 4, 1, 240, 181, 227, 251, + 8, 4, 1, 241, 230, 241, 34, 8, 4, 1, 214, 98, 241, 34, 8, 6, 1, 35, 3, + 97, 8, 6, 1, 247, 224, 3, 97, 8, 4, 1, 247, 224, 3, 97, 8, 6, 1, 225, + 193, 3, 148, 8, 6, 1, 207, 84, 3, 241, 71, 97, 8, 4, 1, 212, 123, 3, 207, + 183, 207, 6, 8, 4, 1, 199, 158, 3, 207, 183, 207, 6, 8, 6, 1, 235, 123, + 208, 76, 8, 4, 1, 235, 123, 208, 76, 8, 6, 1, 68, 3, 97, 8, 6, 1, 108, + 148, 8, 6, 1, 204, 185, 203, 168, 8, 6, 1, 197, 3, 97, 8, 4, 1, 197, 3, + 97, 8, 6, 1, 227, 252, 3, 97, 8, 4, 1, 227, 252, 3, 97, 8, 6, 1, 4, 214, + 168, 3, 233, 187, 207, 6, 8, 4, 1, 214, 168, 3, 233, 187, 207, 6, 8, 6, + 1, 214, 33, 3, 97, 8, 4, 1, 214, 33, 3, 97, 8, 6, 1, 200, 124, 3, 97, 8, + 4, 1, 200, 124, 3, 97, 8, 4, 1, 204, 185, 62, 8, 4, 1, 251, 112, 8, 4, 1, + 204, 185, 251, 112, 8, 4, 1, 68, 3, 117, 8, 4, 1, 176, 74, 8, 4, 1, 247, + 224, 3, 242, 198, 8, 4, 1, 242, 154, 3, 207, 6, 8, 4, 1, 242, 154, 3, + 117, 8, 4, 1, 213, 105, 72, 8, 4, 1, 211, 218, 8, 4, 1, 211, 219, 3, 117, + 8, 4, 1, 176, 72, 8, 4, 1, 213, 105, 176, 72, 8, 4, 1, 213, 105, 176, + 197, 3, 117, 8, 4, 1, 246, 110, 213, 105, 176, 72, 8, 4, 1, 240, 181, + 227, 252, 3, 97, 8, 4, 1, 236, 157, 3, 117, 8, 4, 1, 135, 236, 156, 8, 1, + 4, 6, 236, 156, 8, 4, 1, 236, 60, 8, 4, 1, 213, 214, 233, 124, 8, 4, 1, + 204, 185, 234, 247, 8, 4, 1, 234, 248, 3, 117, 8, 4, 1, 234, 104, 3, 117, + 8, 4, 1, 233, 19, 3, 97, 8, 4, 1, 228, 41, 8, 1, 4, 6, 70, 8, 4, 1, 225, + 193, 3, 101, 205, 240, 8, 4, 1, 225, 193, 3, 248, 226, 8, 4, 1, 225, 193, + 3, 213, 111, 117, 8, 4, 1, 224, 226, 8, 4, 1, 204, 185, 223, 243, 8, 4, + 1, 204, 185, 223, 244, 3, 168, 225, 16, 8, 4, 1, 223, 244, 3, 117, 8, 4, + 1, 220, 215, 3, 49, 117, 8, 4, 1, 220, 215, 3, 213, 111, 117, 8, 1, 4, 6, + 220, 214, 8, 4, 1, 249, 71, 74, 8, 1, 4, 6, 217, 121, 8, 4, 1, 246, 110, + 217, 83, 8, 4, 1, 215, 229, 8, 4, 1, 204, 185, 146, 8, 4, 1, 204, 185, + 214, 33, 3, 168, 225, 16, 8, 4, 1, 204, 185, 214, 33, 3, 117, 8, 4, 1, + 214, 33, 3, 168, 225, 16, 8, 4, 1, 214, 33, 3, 207, 6, 8, 4, 1, 214, 33, + 3, 237, 68, 8, 4, 1, 213, 105, 214, 33, 3, 237, 68, 8, 1, 4, 6, 146, 8, + 1, 4, 6, 228, 50, 146, 8, 4, 1, 212, 123, 3, 117, 8, 4, 1, 238, 94, 8, 4, + 1, 240, 181, 227, 252, 3, 208, 47, 26, 117, 8, 4, 1, 208, 190, 213, 105, + 238, 94, 8, 4, 1, 238, 95, 3, 242, 198, 8, 4, 1, 204, 185, 207, 83, 8, 4, + 1, 207, 84, 3, 213, 111, 117, 8, 4, 1, 108, 148, 8, 4, 1, 203, 220, 8, 4, + 1, 203, 169, 3, 117, 8, 4, 1, 204, 185, 203, 168, 8, 4, 1, 204, 185, 201, + 147, 8, 4, 1, 204, 185, 200, 123, 8, 1, 4, 6, 200, 123, 8, 4, 1, 199, + 158, 3, 213, 111, 117, 8, 4, 1, 199, 158, 3, 242, 198, 8, 4, 1, 238, 8, + 8, 4, 1, 238, 9, 3, 242, 198, 8, 1, 235, 123, 208, 76, 8, 1, 215, 236, + 202, 189, 236, 207, 8, 1, 228, 50, 235, 123, 208, 76, 8, 1, 208, 55, 247, + 223, 8, 1, 248, 172, 246, 121, 8, 1, 4, 6, 250, 103, 8, 4, 1, 246, 110, + 176, 72, 8, 1, 4, 6, 236, 157, 3, 117, 8, 1, 4, 6, 234, 247, 8, 4, 1, + 227, 252, 3, 242, 230, 8, 4, 1, 204, 185, 227, 118, 8, 1, 4, 6, 156, 8, + 4, 1, 214, 168, 3, 117, 8, 1, 235, 123, 208, 77, 3, 97, 8, 1, 213, 105, + 235, 123, 208, 77, 3, 97, 8, 4, 1, 239, 95, 241, 34, 8, 4, 1, 241, 102, + 241, 34, 8, 4, 1, 239, 95, 241, 35, 3, 242, 198, 8, 4, 1, 205, 34, 241, + 34, 8, 4, 1, 206, 151, 241, 34, 8, 4, 1, 206, 208, 241, 35, 3, 242, 198, + 8, 4, 1, 237, 125, 241, 34, 8, 4, 1, 224, 44, 241, 34, 8, 4, 1, 223, 245, + 241, 34, 8, 1, 248, 172, 216, 26, 8, 1, 248, 180, 216, 26, 8, 4, 1, 204, + 185, 234, 248, 3, 237, 68, 8, 4, 1, 204, 185, 234, 248, 3, 237, 69, 26, + 207, 6, 67, 1, 4, 234, 247, 67, 1, 4, 234, 248, 3, 117, 67, 1, 4, 227, + 251, 67, 1, 4, 146, 67, 1, 4, 204, 185, 146, 67, 1, 4, 204, 185, 214, 33, + 3, 117, 67, 1, 4, 6, 228, 50, 146, 67, 1, 4, 201, 147, 67, 1, 4, 200, + 123, 67, 1, 215, 14, 67, 1, 53, 215, 14, 67, 1, 204, 185, 246, 70, 67, 1, + 251, 13, 67, 1, 213, 105, 246, 70, 67, 1, 51, 167, 213, 26, 67, 1, 49, + 167, 213, 26, 67, 1, 235, 123, 208, 76, 67, 1, 213, 105, 235, 123, 208, + 76, 67, 1, 49, 250, 202, 67, 1, 51, 250, 202, 67, 1, 115, 250, 202, 67, + 1, 127, 250, 202, 67, 1, 246, 147, 251, 251, 247, 125, 67, 1, 83, 224, + 176, 67, 1, 222, 228, 67, 1, 251, 239, 251, 251, 67, 1, 235, 74, 251, + 251, 67, 1, 128, 83, 224, 176, 67, 1, 128, 222, 228, 67, 1, 128, 235, 74, + 251, 251, 67, 1, 128, 251, 239, 251, 251, 67, 1, 205, 95, 246, 79, 67, 1, + 167, 205, 95, 246, 79, 67, 1, 247, 54, 51, 167, 213, 26, 67, 1, 247, 54, + 49, 167, 213, 26, 67, 1, 115, 207, 17, 67, 1, 127, 207, 17, 67, 1, 93, + 54, 67, 1, 221, 157, 54, 248, 57, 73, 56, 213, 27, 56, 217, 110, 4, 205, + 240, 53, 251, 239, 251, 251, 67, 1, 213, 89, 117, 67, 1, 242, 235, 251, + 251, 67, 1, 4, 236, 60, 67, 1, 4, 156, 67, 1, 4, 212, 122, 67, 1, 4, 200, + 195, 67, 1, 4, 213, 105, 235, 123, 208, 76, 67, 1, 238, 29, 150, 148, 67, + 1, 122, 150, 148, 67, 1, 221, 206, 150, 148, 67, 1, 128, 150, 148, 67, 1, + 238, 28, 150, 148, 67, 1, 199, 255, 241, 126, 150, 81, 67, 1, 200, 76, + 241, 126, 150, 81, 67, 1, 202, 187, 67, 1, 204, 1, 67, 1, 53, 251, 13, + 67, 1, 128, 127, 250, 202, 67, 1, 128, 115, 250, 202, 67, 1, 128, 49, + 250, 202, 67, 1, 128, 51, 250, 202, 67, 1, 128, 213, 26, 67, 1, 101, 235, + 74, 251, 251, 67, 1, 101, 53, 235, 74, 251, 251, 67, 1, 101, 53, 251, + 239, 251, 251, 67, 1, 128, 205, 240, 67, 1, 213, 220, 246, 79, 67, 1, + 248, 244, 122, 205, 174, 67, 1, 238, 171, 122, 205, 174, 67, 1, 248, 244, + 128, 205, 174, 67, 1, 238, 171, 128, 205, 174, 67, 1, 210, 56, 67, 1, + 176, 210, 56, 67, 1, 128, 49, 48, 38, 235, 74, 251, 251, 38, 251, 239, + 251, 251, 38, 246, 147, 251, 251, 38, 205, 240, 38, 222, 228, 38, 216, + 241, 38, 248, 57, 38, 73, 56, 38, 241, 74, 38, 233, 187, 56, 38, 213, 27, + 56, 38, 53, 251, 239, 251, 251, 38, 247, 125, 38, 83, 224, 177, 56, 38, + 53, 83, 224, 177, 56, 38, 53, 235, 74, 251, 251, 38, 247, 149, 38, 228, + 50, 248, 57, 38, 204, 185, 246, 71, 56, 38, 246, 71, 56, 38, 213, 105, + 246, 71, 56, 38, 246, 71, 88, 213, 46, 38, 235, 74, 251, 252, 57, 38, + 251, 239, 251, 252, 57, 38, 49, 207, 18, 57, 38, 51, 207, 18, 57, 38, 49, + 251, 71, 56, 38, 233, 124, 38, 49, 167, 213, 27, 57, 38, 115, 207, 18, + 57, 38, 127, 207, 18, 57, 38, 93, 2, 57, 38, 221, 157, 2, 57, 38, 216, + 182, 233, 187, 57, 38, 213, 111, 233, 187, 57, 38, 73, 57, 38, 241, 75, + 57, 38, 213, 27, 57, 38, 246, 71, 57, 38, 247, 69, 38, 217, 110, 38, 83, + 224, 177, 57, 38, 248, 51, 57, 38, 228, 50, 53, 250, 235, 57, 38, 247, + 126, 57, 38, 246, 147, 251, 252, 57, 38, 248, 58, 57, 38, 228, 50, 248, + 58, 57, 38, 205, 241, 57, 38, 222, 229, 57, 38, 128, 224, 176, 38, 53, + 128, 224, 176, 38, 205, 241, 216, 242, 38, 209, 250, 208, 47, 216, 242, + 38, 168, 208, 47, 216, 242, 38, 209, 250, 209, 17, 216, 242, 38, 168, + 209, 17, 216, 242, 38, 51, 167, 213, 27, 57, 38, 228, 50, 248, 51, 57, + 38, 52, 57, 38, 211, 201, 57, 38, 200, 196, 56, 38, 83, 205, 240, 38, 53, + 216, 241, 38, 235, 74, 150, 81, 38, 251, 239, 150, 81, 38, 31, 216, 20, + 38, 31, 226, 58, 38, 31, 241, 68, 205, 162, 38, 31, 199, 219, 38, 248, + 51, 56, 38, 238, 122, 2, 57, 38, 53, 83, 224, 177, 57, 38, 49, 251, 71, + 57, 38, 218, 215, 205, 241, 56, 38, 233, 193, 56, 38, 251, 117, 160, 205, + 186, 56, 38, 49, 51, 55, 57, 38, 182, 55, 57, 38, 235, 80, 227, 161, 38, + 51, 250, 203, 56, 38, 49, 167, 213, 27, 56, 38, 237, 122, 38, 200, 196, + 57, 38, 49, 250, 203, 57, 38, 51, 250, 203, 57, 38, 51, 250, 203, 26, + 115, 250, 203, 57, 38, 51, 167, 213, 27, 56, 38, 73, 88, 213, 46, 38, + 250, 166, 57, 38, 53, 213, 27, 57, 38, 199, 27, 56, 38, 53, 248, 58, 57, + 38, 53, 248, 57, 38, 53, 222, 228, 38, 53, 222, 229, 57, 38, 53, 205, + 240, 38, 53, 228, 50, 248, 57, 38, 53, 87, 55, 57, 38, 8, 4, 1, 62, 38, + 8, 4, 1, 72, 38, 8, 4, 1, 70, 38, 8, 4, 1, 74, 38, 8, 4, 1, 66, 38, 8, 4, + 1, 247, 223, 38, 8, 4, 1, 242, 153, 38, 8, 4, 1, 234, 247, 38, 8, 4, 1, + 223, 243, 38, 8, 4, 1, 146, 38, 8, 4, 1, 207, 83, 38, 8, 4, 1, 203, 168, + 38, 8, 4, 1, 200, 195, 31, 6, 1, 234, 92, 31, 4, 1, 234, 92, 31, 6, 1, + 250, 234, 212, 16, 31, 4, 1, 250, 234, 212, 16, 31, 218, 93, 54, 31, 224, + 54, 218, 93, 54, 31, 6, 1, 216, 167, 241, 42, 31, 4, 1, 216, 167, 241, + 42, 31, 199, 219, 31, 4, 213, 105, 224, 24, 209, 164, 99, 31, 4, 239, + 180, 224, 24, 209, 164, 99, 31, 4, 213, 105, 239, 180, 224, 24, 209, 164, + 99, 31, 214, 79, 81, 31, 6, 1, 199, 225, 31, 205, 162, 31, 241, 68, 205, + 162, 31, 6, 1, 251, 113, 3, 205, 162, 31, 251, 56, 206, 177, 31, 6, 1, + 238, 125, 3, 205, 162, 31, 6, 1, 238, 80, 3, 205, 162, 31, 6, 1, 228, 42, + 3, 205, 162, 31, 6, 1, 217, 82, 3, 205, 162, 31, 6, 1, 203, 221, 3, 205, + 162, 31, 6, 1, 217, 84, 3, 205, 162, 31, 4, 1, 228, 42, 3, 241, 68, 26, + 205, 162, 31, 6, 1, 251, 112, 31, 6, 1, 248, 208, 31, 6, 1, 236, 60, 31, + 6, 1, 241, 136, 31, 6, 1, 238, 124, 31, 6, 1, 199, 80, 31, 6, 1, 238, 79, + 31, 6, 1, 206, 88, 31, 6, 1, 228, 41, 31, 6, 1, 227, 54, 31, 6, 1, 225, + 87, 31, 6, 1, 221, 41, 31, 6, 1, 218, 133, 31, 6, 1, 200, 169, 31, 6, 1, + 217, 81, 31, 6, 1, 215, 204, 31, 6, 1, 213, 90, 31, 6, 1, 209, 163, 31, + 6, 1, 206, 221, 31, 6, 1, 203, 220, 31, 6, 1, 215, 229, 31, 6, 1, 246, + 236, 31, 6, 1, 214, 235, 31, 6, 1, 217, 83, 31, 6, 1, 228, 42, 3, 241, + 67, 31, 6, 1, 203, 221, 3, 241, 67, 31, 4, 1, 251, 113, 3, 205, 162, 31, + 4, 1, 238, 125, 3, 205, 162, 31, 4, 1, 238, 80, 3, 205, 162, 31, 4, 1, + 228, 42, 3, 205, 162, 31, 4, 1, 203, 221, 3, 241, 68, 26, 205, 162, 31, + 4, 1, 251, 112, 31, 4, 1, 248, 208, 31, 4, 1, 236, 60, 31, 4, 1, 241, + 136, 31, 4, 1, 238, 124, 31, 4, 1, 199, 80, 31, 4, 1, 238, 79, 31, 4, 1, + 206, 88, 31, 4, 1, 228, 41, 31, 4, 1, 227, 54, 31, 4, 1, 225, 87, 31, 4, + 1, 221, 41, 31, 4, 1, 218, 133, 31, 4, 1, 200, 169, 31, 4, 1, 217, 81, + 31, 4, 1, 215, 204, 31, 4, 1, 213, 90, 31, 4, 1, 47, 209, 163, 31, 4, 1, + 209, 163, 31, 4, 1, 206, 221, 31, 4, 1, 203, 220, 31, 4, 1, 215, 229, 31, + 4, 1, 246, 236, 31, 4, 1, 214, 235, 31, 4, 1, 217, 83, 31, 4, 1, 228, 42, + 3, 241, 67, 31, 4, 1, 203, 221, 3, 241, 67, 31, 4, 1, 217, 82, 3, 205, + 162, 31, 4, 1, 203, 221, 3, 205, 162, 31, 4, 1, 217, 84, 3, 205, 162, 31, + 6, 227, 83, 99, 31, 248, 209, 99, 31, 206, 89, 99, 31, 203, 221, 3, 233, + 187, 99, 31, 203, 221, 3, 251, 239, 26, 233, 187, 99, 31, 203, 221, 3, + 241, 75, 26, 233, 187, 99, 31, 215, 230, 99, 31, 215, 205, 99, 31, 227, + 83, 99, 31, 1, 250, 234, 226, 62, 31, 4, 1, 250, 234, 226, 62, 31, 1, + 208, 86, 31, 4, 1, 208, 86, 31, 1, 241, 42, 31, 4, 1, 241, 42, 31, 1, + 226, 62, 31, 4, 1, 226, 62, 31, 1, 212, 16, 31, 4, 1, 212, 16, 85, 6, 1, + 210, 57, 85, 4, 1, 210, 57, 85, 6, 1, 237, 132, 85, 4, 1, 237, 132, 85, + 6, 1, 226, 190, 85, 4, 1, 226, 190, 85, 6, 1, 233, 178, 85, 4, 1, 233, + 178, 85, 6, 1, 236, 55, 85, 4, 1, 236, 55, 85, 6, 1, 210, 23, 85, 4, 1, + 210, 23, 85, 6, 1, 241, 152, 85, 4, 1, 241, 152, 31, 227, 55, 99, 31, + 213, 91, 99, 31, 224, 24, 209, 164, 99, 31, 1, 199, 225, 31, 6, 206, 89, + 99, 31, 224, 24, 238, 125, 99, 31, 213, 105, 224, 24, 238, 125, 99, 31, + 6, 1, 210, 8, 31, 4, 1, 210, 8, 31, 6, 224, 24, 209, 164, 99, 31, 6, 1, + 212, 13, 31, 4, 1, 212, 13, 31, 213, 91, 3, 208, 47, 99, 31, 6, 213, 105, + 224, 24, 209, 164, 99, 31, 6, 239, 180, 224, 24, 209, 164, 99, 31, 6, + 213, 105, 239, 180, 224, 24, 209, 164, 99, 37, 6, 1, 228, 179, 3, 235, + 73, 37, 6, 1, 228, 45, 37, 6, 1, 240, 228, 37, 6, 1, 235, 132, 37, 6, 1, + 204, 17, 228, 178, 37, 6, 1, 239, 90, 37, 6, 1, 247, 233, 70, 37, 6, 1, + 200, 9, 37, 6, 1, 227, 227, 37, 6, 1, 224, 141, 37, 6, 1, 219, 91, 37, 6, + 1, 205, 20, 37, 6, 1, 226, 111, 37, 6, 1, 233, 19, 3, 235, 73, 37, 6, 1, + 209, 250, 66, 37, 6, 1, 239, 86, 37, 6, 1, 62, 37, 6, 1, 249, 8, 37, 6, + 1, 203, 59, 37, 6, 1, 235, 185, 37, 6, 1, 241, 175, 37, 6, 1, 228, 178, + 37, 6, 1, 199, 68, 37, 6, 1, 199, 89, 37, 6, 1, 70, 37, 6, 1, 209, 250, + 70, 37, 6, 1, 161, 37, 6, 1, 238, 209, 37, 6, 1, 238, 190, 37, 6, 1, 238, + 179, 37, 6, 1, 74, 37, 6, 1, 216, 73, 37, 6, 1, 238, 115, 37, 6, 1, 238, + 104, 37, 6, 1, 206, 201, 37, 6, 1, 66, 37, 6, 1, 238, 248, 37, 6, 1, 144, + 37, 6, 1, 205, 26, 37, 6, 1, 247, 8, 37, 6, 1, 210, 114, 37, 6, 1, 210, + 68, 37, 6, 1, 234, 165, 54, 37, 6, 1, 200, 29, 37, 6, 1, 209, 23, 54, 37, + 6, 1, 72, 37, 6, 1, 199, 211, 37, 6, 1, 183, 37, 4, 1, 62, 37, 4, 1, 249, + 8, 37, 4, 1, 203, 59, 37, 4, 1, 235, 185, 37, 4, 1, 241, 175, 37, 4, 1, + 228, 178, 37, 4, 1, 199, 68, 37, 4, 1, 199, 89, 37, 4, 1, 70, 37, 4, 1, + 209, 250, 70, 37, 4, 1, 161, 37, 4, 1, 238, 209, 37, 4, 1, 238, 190, 37, + 4, 1, 238, 179, 37, 4, 1, 74, 37, 4, 1, 216, 73, 37, 4, 1, 238, 115, 37, + 4, 1, 238, 104, 37, 4, 1, 206, 201, 37, 4, 1, 66, 37, 4, 1, 238, 248, 37, + 4, 1, 144, 37, 4, 1, 205, 26, 37, 4, 1, 247, 8, 37, 4, 1, 210, 114, 37, + 4, 1, 210, 68, 37, 4, 1, 234, 165, 54, 37, 4, 1, 200, 29, 37, 4, 1, 209, + 23, 54, 37, 4, 1, 72, 37, 4, 1, 199, 211, 37, 4, 1, 183, 37, 4, 1, 228, + 179, 3, 235, 73, 37, 4, 1, 228, 45, 37, 4, 1, 240, 228, 37, 4, 1, 235, + 132, 37, 4, 1, 204, 17, 228, 178, 37, 4, 1, 239, 90, 37, 4, 1, 247, 233, + 70, 37, 4, 1, 200, 9, 37, 4, 1, 227, 227, 37, 4, 1, 224, 141, 37, 4, 1, + 219, 91, 37, 4, 1, 205, 20, 37, 4, 1, 226, 111, 37, 4, 1, 233, 19, 3, + 235, 73, 37, 4, 1, 209, 250, 66, 37, 4, 1, 239, 86, 37, 6, 1, 217, 83, + 37, 4, 1, 217, 83, 37, 6, 1, 200, 65, 37, 4, 1, 200, 65, 37, 6, 1, 228, + 39, 72, 37, 4, 1, 228, 39, 72, 37, 6, 1, 224, 148, 199, 181, 37, 4, 1, + 224, 148, 199, 181, 37, 6, 1, 228, 39, 224, 148, 199, 181, 37, 4, 1, 228, + 39, 224, 148, 199, 181, 37, 6, 1, 248, 175, 199, 181, 37, 4, 1, 248, 175, + 199, 181, 37, 6, 1, 228, 39, 248, 175, 199, 181, 37, 4, 1, 228, 39, 248, + 175, 199, 181, 37, 6, 1, 226, 31, 37, 4, 1, 226, 31, 37, 6, 1, 214, 235, + 37, 4, 1, 214, 235, 37, 6, 1, 237, 63, 37, 4, 1, 237, 63, 37, 6, 1, 227, + 253, 37, 4, 1, 227, 253, 37, 6, 1, 227, 254, 3, 53, 235, 74, 251, 251, + 37, 4, 1, 227, 254, 3, 53, 235, 74, 251, 251, 37, 6, 1, 204, 20, 37, 4, + 1, 204, 20, 37, 6, 1, 212, 221, 217, 83, 37, 4, 1, 212, 221, 217, 83, 37, + 6, 1, 217, 84, 3, 205, 210, 37, 4, 1, 217, 84, 3, 205, 210, 37, 6, 1, + 217, 11, 37, 4, 1, 217, 11, 37, 6, 1, 226, 62, 37, 4, 1, 226, 62, 37, + 206, 49, 54, 38, 37, 205, 210, 38, 37, 216, 183, 38, 37, 241, 242, 215, + 108, 38, 37, 214, 229, 215, 108, 38, 37, 215, 92, 38, 37, 233, 83, 206, + 49, 54, 38, 37, 221, 168, 54, 37, 6, 1, 209, 250, 233, 19, 3, 207, 6, 37, + 4, 1, 209, 250, 233, 19, 3, 207, 6, 37, 6, 1, 210, 163, 54, 37, 4, 1, + 210, 163, 54, 37, 6, 1, 238, 116, 3, 206, 11, 37, 4, 1, 238, 116, 3, 206, + 11, 37, 6, 1, 235, 186, 3, 203, 219, 37, 4, 1, 235, 186, 3, 203, 219, 37, + 6, 1, 235, 186, 3, 97, 37, 4, 1, 235, 186, 3, 97, 37, 6, 1, 235, 186, 3, + 101, 117, 37, 4, 1, 235, 186, 3, 101, 117, 37, 6, 1, 199, 69, 3, 241, + 119, 37, 4, 1, 199, 69, 3, 241, 119, 37, 6, 1, 199, 90, 3, 241, 119, 37, + 4, 1, 199, 90, 3, 241, 119, 37, 6, 1, 227, 108, 3, 241, 119, 37, 4, 1, + 227, 108, 3, 241, 119, 37, 6, 1, 227, 108, 3, 83, 97, 37, 4, 1, 227, 108, + 3, 83, 97, 37, 6, 1, 227, 108, 3, 97, 37, 4, 1, 227, 108, 3, 97, 37, 6, + 1, 249, 60, 161, 37, 4, 1, 249, 60, 161, 37, 6, 1, 238, 180, 3, 241, 119, + 37, 4, 1, 238, 180, 3, 241, 119, 37, 6, 33, 238, 180, 235, 185, 37, 4, + 33, 238, 180, 235, 185, 37, 6, 1, 216, 74, 3, 101, 117, 37, 4, 1, 216, + 74, 3, 101, 117, 37, 6, 1, 252, 2, 144, 37, 4, 1, 252, 2, 144, 37, 6, 1, + 238, 105, 3, 241, 119, 37, 4, 1, 238, 105, 3, 241, 119, 37, 6, 1, 206, + 202, 3, 241, 119, 37, 4, 1, 206, 202, 3, 241, 119, 37, 6, 1, 208, 68, 66, + 37, 4, 1, 208, 68, 66, 37, 6, 1, 208, 68, 108, 3, 97, 37, 4, 1, 208, 68, + 108, 3, 97, 37, 6, 1, 234, 236, 3, 241, 119, 37, 4, 1, 234, 236, 3, 241, + 119, 37, 6, 33, 206, 202, 205, 26, 37, 4, 33, 206, 202, 205, 26, 37, 6, + 1, 247, 9, 3, 241, 119, 37, 4, 1, 247, 9, 3, 241, 119, 37, 6, 1, 247, 9, + 3, 83, 97, 37, 4, 1, 247, 9, 3, 83, 97, 37, 6, 1, 210, 34, 37, 4, 1, 210, + 34, 37, 6, 1, 252, 2, 247, 8, 37, 4, 1, 252, 2, 247, 8, 37, 6, 1, 252, 2, + 247, 9, 3, 241, 119, 37, 4, 1, 252, 2, 247, 9, 3, 241, 119, 37, 1, 216, + 174, 37, 6, 1, 199, 69, 3, 248, 57, 37, 4, 1, 199, 69, 3, 248, 57, 37, 6, + 1, 227, 108, 3, 117, 37, 4, 1, 227, 108, 3, 117, 37, 6, 1, 238, 210, 3, + 207, 6, 37, 4, 1, 238, 210, 3, 207, 6, 37, 6, 1, 238, 180, 3, 117, 37, 4, + 1, 238, 180, 3, 117, 37, 6, 1, 238, 180, 3, 207, 6, 37, 4, 1, 238, 180, + 3, 207, 6, 37, 6, 1, 226, 201, 247, 8, 37, 4, 1, 226, 201, 247, 8, 37, 6, + 1, 238, 191, 3, 207, 6, 37, 4, 1, 238, 191, 3, 207, 6, 37, 4, 1, 216, + 174, 37, 6, 1, 35, 3, 248, 57, 37, 4, 1, 35, 3, 248, 57, 37, 6, 1, 35, 3, + 241, 74, 37, 4, 1, 35, 3, 241, 74, 37, 6, 33, 35, 228, 178, 37, 4, 33, + 35, 228, 178, 37, 6, 1, 228, 179, 3, 248, 57, 37, 4, 1, 228, 179, 3, 248, + 57, 37, 6, 1, 211, 218, 37, 4, 1, 211, 218, 37, 6, 1, 211, 219, 3, 241, + 74, 37, 4, 1, 211, 219, 3, 241, 74, 37, 6, 1, 199, 69, 3, 241, 74, 37, 4, + 1, 199, 69, 3, 241, 74, 37, 6, 1, 199, 90, 3, 241, 74, 37, 4, 1, 199, 90, + 3, 241, 74, 37, 6, 1, 252, 2, 239, 90, 37, 4, 1, 252, 2, 239, 90, 37, 6, + 1, 233, 19, 3, 222, 228, 37, 4, 1, 233, 19, 3, 222, 228, 37, 6, 1, 233, + 19, 3, 241, 74, 37, 4, 1, 233, 19, 3, 241, 74, 37, 6, 1, 163, 3, 241, 74, + 37, 4, 1, 163, 3, 241, 74, 37, 6, 1, 249, 71, 74, 37, 4, 1, 249, 71, 74, + 37, 6, 1, 249, 71, 163, 3, 241, 74, 37, 4, 1, 249, 71, 163, 3, 241, 74, + 37, 6, 1, 197, 3, 241, 74, 37, 4, 1, 197, 3, 241, 74, 37, 6, 1, 108, 3, + 222, 228, 37, 4, 1, 108, 3, 222, 228, 37, 6, 1, 108, 3, 241, 74, 37, 4, + 1, 108, 3, 241, 74, 37, 6, 1, 108, 3, 53, 169, 37, 4, 1, 108, 3, 53, 169, + 37, 6, 1, 247, 9, 3, 241, 74, 37, 4, 1, 247, 9, 3, 241, 74, 37, 6, 1, + 235, 186, 3, 241, 119, 37, 4, 1, 235, 186, 3, 241, 119, 37, 6, 1, 200, + 30, 3, 241, 74, 37, 4, 1, 200, 30, 3, 241, 74, 37, 6, 1, 235, 186, 3, + 208, 47, 26, 117, 37, 4, 1, 235, 186, 3, 208, 47, 26, 117, 37, 6, 1, 234, + 236, 3, 117, 37, 4, 1, 234, 236, 3, 117, 37, 6, 1, 234, 236, 3, 97, 37, + 4, 1, 234, 236, 3, 97, 37, 6, 1, 226, 72, 241, 175, 37, 4, 1, 226, 72, + 241, 175, 37, 6, 1, 226, 72, 240, 228, 37, 4, 1, 226, 72, 240, 228, 37, + 6, 1, 226, 72, 199, 18, 37, 4, 1, 226, 72, 199, 18, 37, 6, 1, 226, 72, + 239, 82, 37, 4, 1, 226, 72, 239, 82, 37, 6, 1, 226, 72, 224, 141, 37, 4, + 1, 226, 72, 224, 141, 37, 6, 1, 226, 72, 219, 91, 37, 4, 1, 226, 72, 219, + 91, 37, 6, 1, 226, 72, 209, 89, 37, 4, 1, 226, 72, 209, 89, 37, 6, 1, + 226, 72, 205, 204, 37, 4, 1, 226, 72, 205, 204, 37, 6, 1, 213, 105, 199, + 89, 37, 4, 1, 213, 105, 199, 89, 37, 6, 1, 238, 210, 3, 117, 37, 4, 1, + 238, 210, 3, 117, 37, 6, 1, 224, 223, 37, 4, 1, 224, 223, 37, 6, 1, 213, + 93, 37, 4, 1, 213, 93, 37, 6, 1, 200, 98, 37, 4, 1, 200, 98, 37, 6, 1, + 214, 159, 37, 4, 1, 214, 159, 37, 6, 1, 201, 64, 37, 4, 1, 201, 64, 37, + 6, 1, 251, 138, 161, 37, 4, 1, 251, 138, 161, 37, 6, 1, 238, 210, 3, 101, + 117, 37, 4, 1, 238, 210, 3, 101, 117, 37, 6, 1, 238, 180, 3, 101, 117, + 37, 4, 1, 238, 180, 3, 101, 117, 37, 6, 1, 216, 74, 3, 241, 119, 37, 4, + 1, 216, 74, 3, 241, 119, 37, 6, 1, 210, 35, 3, 241, 119, 37, 4, 1, 210, + 35, 3, 241, 119, 37, 6, 1, 238, 180, 3, 49, 117, 37, 4, 1, 238, 180, 3, + 49, 117, 37, 6, 1, 239, 75, 37, 4, 1, 239, 75, 37, 6, 1, 241, 224, 37, 4, + 1, 241, 224, 37, 6, 1, 238, 210, 3, 241, 119, 37, 4, 1, 238, 210, 3, 241, + 119, 184, 6, 1, 250, 109, 184, 6, 1, 248, 224, 184, 6, 1, 235, 149, 184, + 6, 1, 242, 58, 184, 6, 1, 239, 5, 184, 6, 1, 199, 114, 184, 6, 1, 238, + 241, 184, 6, 1, 238, 81, 184, 6, 1, 138, 184, 6, 1, 199, 68, 184, 6, 1, + 228, 86, 184, 6, 1, 224, 145, 184, 6, 1, 200, 173, 184, 6, 1, 247, 190, + 184, 6, 1, 226, 243, 184, 6, 1, 233, 207, 184, 6, 1, 227, 248, 184, 6, 1, + 235, 196, 184, 6, 1, 246, 254, 184, 6, 1, 222, 40, 184, 6, 1, 200, 9, + 184, 6, 1, 218, 201, 184, 6, 1, 210, 114, 184, 6, 1, 202, 193, 184, 6, 1, + 247, 37, 184, 6, 1, 216, 54, 184, 6, 1, 227, 210, 184, 6, 1, 213, 252, + 184, 6, 1, 211, 180, 184, 6, 1, 202, 238, 184, 6, 1, 205, 207, 184, 6, 1, + 213, 154, 184, 6, 1, 246, 91, 184, 6, 1, 199, 250, 184, 6, 1, 215, 139, + 184, 6, 1, 226, 254, 184, 6, 1, 217, 108, 184, 6, 1, 237, 134, 184, 67, + 1, 49, 167, 213, 26, 184, 251, 13, 184, 238, 183, 81, 184, 238, 43, 81, + 184, 246, 70, 184, 214, 79, 81, 184, 252, 3, 81, 184, 4, 1, 250, 109, + 184, 4, 1, 248, 224, 184, 4, 1, 235, 149, 184, 4, 1, 242, 58, 184, 4, 1, + 239, 5, 184, 4, 1, 199, 114, 184, 4, 1, 238, 241, 184, 4, 1, 238, 81, + 184, 4, 1, 138, 184, 4, 1, 199, 68, 184, 4, 1, 228, 86, 184, 4, 1, 224, + 145, 184, 4, 1, 200, 173, 184, 4, 1, 247, 190, 184, 4, 1, 226, 243, 184, + 4, 1, 233, 207, 184, 4, 1, 227, 248, 184, 4, 1, 235, 196, 184, 4, 1, 246, + 254, 184, 4, 1, 222, 40, 184, 4, 1, 200, 9, 184, 4, 1, 218, 201, 184, 4, + 1, 210, 114, 184, 4, 1, 202, 193, 184, 4, 1, 247, 37, 184, 4, 1, 216, 54, + 184, 4, 1, 227, 210, 184, 4, 1, 213, 252, 184, 4, 1, 211, 180, 184, 4, 1, + 202, 238, 184, 4, 1, 205, 207, 184, 4, 1, 213, 154, 184, 4, 1, 246, 91, + 184, 4, 1, 199, 250, 184, 4, 1, 215, 139, 184, 4, 1, 226, 254, 184, 4, 1, + 217, 108, 184, 4, 1, 237, 134, 184, 4, 33, 239, 6, 199, 250, 184, 236, + 183, 208, 76, 184, 233, 33, 213, 45, 184, 238, 77, 54, 225, 27, 184, 238, + 77, 54, 184, 239, 157, 54, 113, 251, 252, 238, 72, 113, 251, 252, 211, + 181, 113, 251, 252, 210, 92, 113, 251, 252, 199, 100, 214, 142, 113, 251, + 252, 199, 100, 236, 79, 113, 251, 252, 205, 222, 113, 251, 252, 213, 102, + 113, 251, 252, 199, 98, 113, 251, 252, 216, 100, 113, 251, 252, 200, 22, + 113, 251, 252, 206, 129, 113, 251, 252, 235, 247, 113, 251, 252, 235, + 248, 221, 3, 113, 251, 252, 235, 245, 113, 251, 252, 214, 143, 216, 129, + 113, 251, 252, 206, 172, 236, 8, 113, 251, 252, 216, 79, 113, 251, 252, + 250, 148, 234, 228, 113, 251, 252, 221, 13, 113, 251, 252, 222, 203, 113, + 251, 252, 222, 29, 113, 251, 252, 222, 30, 226, 255, 113, 251, 252, 241, + 251, 113, 251, 252, 214, 154, 113, 251, 252, 206, 172, 214, 137, 113, + 251, 252, 200, 32, 248, 225, 199, 231, 113, 251, 252, 217, 90, 113, 251, + 252, 228, 137, 113, 251, 252, 241, 153, 113, 251, 252, 199, 25, 113, 134, + 222, 131, 246, 155, 113, 215, 100, 210, 37, 113, 215, 100, 234, 156, 211, + 181, 113, 215, 100, 234, 156, 216, 93, 113, 215, 100, 234, 156, 214, 147, + 113, 215, 100, 234, 47, 113, 215, 100, 205, 23, 113, 215, 100, 211, 181, + 113, 215, 100, 216, 93, 113, 215, 100, 214, 147, 113, 215, 100, 233, 199, + 113, 215, 100, 233, 200, 234, 158, 36, 203, 63, 113, 215, 100, 214, 83, + 113, 215, 100, 242, 43, 217, 34, 222, 163, 113, 215, 100, 222, 19, 113, + 214, 212, 222, 160, 113, 215, 100, 213, 232, 113, 214, 212, 216, 102, + 113, 215, 100, 210, 22, 240, 182, 113, 215, 100, 209, 143, 240, 182, 113, + 214, 212, 209, 24, 216, 95, 113, 134, 203, 225, 240, 182, 113, 134, 224, + 54, 240, 182, 113, 214, 212, 218, 90, 234, 227, 113, 215, 100, 214, 148, + 214, 142, 113, 1, 251, 142, 113, 1, 248, 210, 113, 1, 235, 147, 113, 1, + 242, 23, 113, 1, 234, 139, 113, 1, 203, 63, 113, 1, 199, 92, 113, 1, 234, + 93, 113, 1, 206, 146, 113, 1, 199, 234, 113, 1, 47, 227, 86, 113, 1, 227, + 86, 113, 1, 225, 83, 113, 1, 47, 222, 47, 113, 1, 222, 47, 113, 1, 47, + 218, 89, 113, 1, 218, 89, 113, 1, 212, 19, 113, 1, 250, 107, 113, 1, 47, + 216, 73, 113, 1, 216, 73, 113, 1, 47, 205, 27, 113, 1, 205, 27, 113, 1, + 214, 106, 113, 1, 213, 123, 113, 1, 210, 21, 113, 1, 206, 217, 113, 33, + 200, 7, 53, 203, 63, 113, 33, 200, 7, 203, 64, 199, 234, 113, 33, 200, 7, + 53, 199, 234, 113, 214, 212, 235, 247, 113, 214, 212, 235, 245, 9, 41, + 54, 9, 2, 212, 12, 9, 236, 253, 222, 145, 9, 2, 212, 52, 9, 2, 212, 15, + 9, 41, 134, 56, 250, 248, 242, 210, 212, 234, 250, 248, 236, 222, 212, + 234, 9, 213, 197, 250, 248, 216, 28, 221, 170, 54, 250, 248, 216, 28, + 206, 167, 206, 51, 54, 251, 198, 54, 9, 246, 70, 9, 241, 238, 210, 154, + 9, 215, 102, 203, 44, 54, 9, 2, 221, 149, 9, 2, 212, 29, 251, 145, 201, + 88, 9, 2, 251, 145, 250, 170, 9, 2, 213, 230, 251, 144, 9, 2, 213, 238, + 251, 122, 251, 63, 9, 2, 206, 254, 9, 4, 122, 207, 9, 9, 4, 122, 33, 140, + 3, 225, 92, 3, 200, 46, 9, 4, 122, 199, 105, 9, 4, 237, 158, 9, 4, 242, + 17, 9, 4, 227, 36, 9, 210, 167, 9, 1, 81, 9, 205, 83, 73, 214, 212, 81, + 9, 214, 79, 81, 9, 1, 227, 40, 200, 46, 9, 1, 234, 203, 9, 1, 140, 3, + 222, 224, 56, 9, 1, 140, 3, 234, 204, 56, 9, 1, 201, 73, 3, 234, 204, 56, + 9, 1, 140, 3, 234, 204, 57, 9, 1, 90, 3, 234, 204, 56, 9, 1, 251, 142, 9, + 1, 248, 240, 9, 1, 206, 184, 222, 156, 9, 1, 206, 183, 9, 1, 206, 102, 9, + 1, 227, 224, 9, 1, 234, 224, 9, 1, 226, 203, 9, 1, 242, 29, 9, 1, 206, + 114, 9, 1, 213, 154, 9, 1, 199, 105, 9, 1, 211, 186, 9, 1, 210, 61, 9, 1, + 212, 56, 9, 1, 242, 52, 9, 1, 207, 9, 9, 1, 199, 108, 9, 1, 251, 171, 9, + 1, 235, 194, 9, 1, 226, 253, 3, 120, 190, 56, 9, 1, 226, 253, 3, 126, + 190, 57, 9, 1, 237, 162, 90, 3, 228, 50, 203, 168, 9, 1, 237, 162, 90, 3, + 120, 190, 56, 9, 1, 237, 162, 90, 3, 126, 190, 56, 9, 206, 223, 9, 1, + 237, 134, 9, 1, 214, 152, 9, 1, 227, 86, 9, 1, 225, 91, 9, 1, 222, 61, 9, + 1, 218, 227, 9, 1, 234, 115, 9, 1, 201, 72, 9, 1, 140, 222, 187, 9, 1, + 200, 46, 9, 237, 156, 9, 242, 15, 9, 227, 34, 9, 237, 158, 9, 242, 17, 9, + 227, 36, 9, 210, 104, 9, 207, 236, 9, 222, 222, 56, 9, 234, 204, 56, 9, + 234, 204, 57, 9, 208, 4, 251, 142, 9, 228, 50, 242, 17, 9, 134, 218, 228, + 235, 165, 9, 198, 245, 9, 22, 2, 4, 203, 169, 56, 9, 22, 2, 228, 50, 4, + 203, 169, 56, 9, 22, 2, 73, 57, 9, 213, 105, 242, 17, 9, 237, 159, 3, + 120, 240, 180, 9, 201, 74, 234, 204, 57, 250, 248, 17, 199, 81, 250, 248, + 17, 102, 250, 248, 17, 105, 250, 248, 17, 147, 250, 248, 17, 149, 250, + 248, 17, 164, 250, 248, 17, 187, 250, 248, 17, 210, 135, 250, 248, 17, + 192, 250, 248, 17, 219, 113, 9, 216, 27, 54, 9, 241, 168, 210, 154, 9, + 206, 49, 210, 154, 9, 237, 61, 215, 98, 208, 109, 9, 1, 240, 181, 248, + 240, 9, 1, 240, 181, 214, 152, 9, 1, 207, 213, 251, 142, 9, 1, 140, 201, + 89, 9, 1, 140, 3, 201, 74, 234, 204, 56, 9, 1, 140, 3, 201, 74, 234, 204, + 57, 9, 1, 122, 234, 203, 9, 1, 122, 234, 204, 251, 142, 9, 1, 122, 234, + 204, 201, 72, 9, 1, 108, 3, 234, 204, 56, 9, 1, 122, 234, 204, 200, 46, + 9, 1, 204, 245, 9, 1, 204, 243, 9, 1, 248, 250, 9, 1, 206, 184, 3, 213, + 26, 9, 1, 206, 184, 3, 126, 190, 88, 239, 165, 9, 1, 216, 54, 9, 1, 206, + 181, 9, 1, 248, 238, 9, 1, 155, 3, 234, 204, 56, 9, 1, 155, 3, 120, 190, + 83, 56, 9, 1, 218, 47, 9, 1, 239, 99, 9, 1, 155, 3, 126, 190, 56, 9, 1, + 206, 205, 9, 1, 206, 203, 9, 1, 241, 215, 9, 1, 242, 30, 3, 213, 26, 9, + 1, 242, 30, 3, 73, 57, 9, 1, 242, 30, 3, 73, 248, 228, 26, 4, 207, 9, 9, + 1, 242, 36, 9, 1, 241, 217, 9, 1, 239, 127, 9, 1, 242, 30, 3, 126, 190, + 88, 239, 165, 9, 1, 242, 30, 3, 236, 229, 190, 56, 9, 1, 212, 207, 9, 1, + 213, 155, 3, 4, 203, 168, 9, 1, 213, 155, 3, 213, 26, 9, 1, 213, 155, 3, + 73, 57, 9, 1, 213, 155, 3, 4, 203, 169, 57, 9, 1, 213, 155, 3, 73, 248, + 228, 26, 73, 56, 9, 1, 213, 155, 3, 120, 190, 56, 9, 1, 227, 221, 9, 1, + 213, 155, 3, 236, 229, 190, 56, 9, 1, 211, 187, 3, 73, 248, 228, 26, 73, + 56, 9, 1, 211, 187, 3, 126, 190, 57, 9, 1, 211, 187, 3, 126, 190, 248, + 228, 26, 126, 190, 56, 9, 1, 212, 57, 3, 120, 190, 57, 9, 1, 212, 57, 3, + 126, 190, 56, 9, 1, 207, 10, 3, 126, 190, 56, 9, 1, 251, 172, 3, 126, + 190, 56, 9, 1, 240, 181, 237, 134, 9, 1, 237, 135, 3, 73, 221, 56, 57, 9, + 1, 237, 135, 3, 73, 57, 9, 1, 203, 52, 9, 1, 237, 135, 3, 126, 190, 57, + 9, 1, 216, 52, 9, 1, 214, 153, 3, 73, 56, 9, 1, 214, 153, 3, 126, 190, + 56, 9, 1, 226, 252, 9, 1, 207, 183, 227, 86, 9, 1, 227, 87, 3, 213, 26, + 9, 1, 227, 87, 3, 73, 56, 9, 1, 219, 255, 9, 1, 227, 87, 3, 126, 190, 57, + 9, 1, 236, 76, 9, 1, 236, 77, 3, 213, 26, 9, 1, 219, 176, 9, 1, 236, 77, + 3, 120, 190, 57, 9, 1, 235, 37, 9, 1, 236, 77, 3, 126, 190, 56, 9, 1, + 225, 92, 3, 4, 203, 168, 9, 1, 225, 92, 3, 73, 56, 9, 1, 225, 92, 3, 126, + 190, 56, 9, 1, 225, 92, 3, 126, 190, 57, 9, 1, 218, 228, 3, 73, 57, 9, 1, + 218, 228, 235, 165, 9, 1, 213, 4, 9, 1, 218, 228, 3, 213, 26, 9, 1, 218, + 228, 3, 126, 190, 56, 9, 1, 234, 116, 240, 207, 9, 1, 206, 206, 3, 73, + 56, 9, 1, 234, 116, 3, 90, 56, 9, 1, 234, 116, 235, 113, 9, 1, 234, 116, + 235, 114, 3, 234, 204, 56, 9, 1, 206, 184, 222, 157, 235, 113, 9, 1, 201, + 73, 3, 213, 26, 9, 1, 226, 139, 217, 121, 9, 1, 217, 121, 9, 1, 66, 9, 1, + 199, 211, 9, 1, 226, 139, 199, 211, 9, 1, 201, 73, 3, 120, 190, 56, 9, 1, + 203, 59, 9, 1, 237, 162, 200, 46, 9, 1, 90, 3, 207, 6, 9, 1, 90, 3, 4, + 203, 168, 9, 1, 201, 73, 3, 73, 56, 9, 1, 72, 9, 1, 90, 3, 126, 190, 57, + 9, 1, 90, 249, 69, 9, 1, 90, 249, 70, 3, 234, 204, 56, 9, 236, 183, 208, + 76, 9, 1, 251, 221, 9, 4, 122, 33, 212, 57, 3, 225, 92, 3, 140, 222, 187, + 9, 4, 122, 33, 214, 153, 3, 225, 92, 3, 140, 222, 187, 9, 4, 122, 84, 82, + 19, 9, 4, 122, 225, 92, 251, 142, 9, 4, 122, 227, 224, 9, 4, 122, 126, + 240, 180, 9, 4, 122, 211, 186, 9, 238, 171, 76, 250, 111, 9, 208, 105, + 76, 212, 173, 238, 210, 234, 42, 9, 4, 122, 212, 219, 199, 81, 9, 4, 122, + 203, 223, 213, 174, 199, 81, 9, 4, 122, 240, 181, 234, 137, 76, 226, 203, + 9, 4, 122, 84, 65, 19, 9, 4, 128, 211, 186, 9, 4, 122, 222, 223, 9, 4, + 201, 72, 9, 4, 200, 46, 9, 4, 122, 200, 46, 9, 4, 122, 218, 227, 9, 215, + 134, 76, 212, 42, 9, 238, 181, 247, 56, 128, 208, 76, 9, 238, 181, 247, + 56, 122, 208, 76, 9, 212, 219, 122, 208, 77, 3, 237, 94, 247, 55, 9, 4, + 128, 222, 61, 9, 1, 242, 30, 3, 228, 50, 203, 168, 9, 1, 213, 155, 3, + 228, 50, 203, 168, 238, 33, 250, 248, 17, 199, 81, 238, 33, 250, 248, 17, + 102, 238, 33, 250, 248, 17, 105, 238, 33, 250, 248, 17, 147, 238, 33, + 250, 248, 17, 149, 238, 33, 250, 248, 17, 164, 238, 33, 250, 248, 17, + 187, 238, 33, 250, 248, 17, 210, 135, 238, 33, 250, 248, 17, 192, 238, + 33, 250, 248, 17, 219, 113, 9, 1, 210, 62, 3, 73, 57, 9, 1, 242, 53, 3, + 73, 57, 9, 1, 235, 195, 3, 73, 57, 9, 2, 209, 142, 251, 89, 9, 2, 209, + 142, 215, 63, 222, 40, 9, 1, 234, 116, 3, 228, 50, 203, 168, 207, 103, + 238, 171, 76, 216, 127, 207, 103, 207, 209, 236, 183, 208, 76, 207, 103, + 208, 6, 236, 183, 208, 76, 207, 103, 207, 209, 246, 79, 207, 103, 208, 6, + 246, 79, 207, 103, 233, 177, 246, 79, 207, 103, 246, 80, 209, 86, 225, + 28, 207, 103, 246, 80, 209, 86, 213, 46, 207, 103, 207, 209, 246, 80, + 209, 86, 225, 28, 207, 103, 208, 6, 246, 80, 209, 86, 213, 46, 207, 103, + 243, 36, 207, 103, 234, 163, 217, 140, 207, 103, 234, 163, 222, 17, 207, + 103, 234, 163, 250, 167, 207, 103, 252, 3, 81, 207, 103, 1, 251, 147, + 207, 103, 1, 207, 213, 251, 147, 207, 103, 1, 248, 207, 207, 103, 1, 236, + 66, 207, 103, 1, 236, 67, 236, 44, 207, 103, 1, 242, 26, 207, 103, 1, + 240, 181, 242, 27, 213, 20, 207, 103, 1, 234, 139, 207, 103, 1, 201, 72, + 207, 103, 1, 199, 105, 207, 103, 1, 234, 91, 207, 103, 1, 206, 142, 207, + 103, 1, 206, 143, 236, 44, 207, 103, 1, 199, 198, 207, 103, 1, 199, 199, + 234, 139, 207, 103, 1, 227, 57, 207, 103, 1, 225, 90, 207, 103, 1, 221, + 166, 207, 103, 1, 218, 89, 207, 103, 1, 210, 160, 207, 103, 1, 47, 210, + 160, 207, 103, 1, 72, 207, 103, 1, 216, 73, 207, 103, 1, 213, 105, 216, + 73, 207, 103, 1, 212, 54, 207, 103, 1, 214, 146, 207, 103, 1, 213, 20, + 207, 103, 1, 210, 21, 207, 103, 1, 206, 215, 207, 103, 1, 216, 12, 248, + 194, 207, 103, 1, 216, 12, 235, 192, 207, 103, 1, 216, 12, 241, 95, 207, + 103, 214, 225, 56, 207, 103, 214, 225, 57, 207, 103, 214, 225, 239, 179, + 207, 103, 199, 8, 56, 207, 103, 199, 8, 57, 207, 103, 199, 8, 239, 179, + 207, 103, 213, 193, 56, 207, 103, 213, 193, 57, 207, 103, 239, 180, 199, + 15, 233, 176, 207, 103, 239, 180, 199, 15, 251, 64, 207, 103, 234, 144, + 56, 207, 103, 234, 144, 57, 207, 103, 234, 143, 239, 179, 207, 103, 238, + 98, 56, 207, 103, 238, 98, 57, 207, 103, 212, 138, 207, 103, 237, 128, + 240, 182, 207, 103, 214, 57, 207, 103, 212, 167, 207, 103, 120, 83, 190, + 56, 207, 103, 120, 83, 190, 57, 207, 103, 126, 190, 56, 207, 103, 126, + 190, 57, 207, 103, 217, 138, 224, 177, 56, 207, 103, 217, 138, 224, 177, + 57, 207, 103, 220, 245, 207, 103, 249, 68, 207, 103, 1, 209, 20, 199, 75, + 207, 103, 1, 209, 20, 226, 196, 207, 103, 1, 209, 20, 237, 147, 9, 1, + 248, 241, 3, 126, 190, 233, 126, 57, 9, 1, 248, 241, 3, 73, 248, 228, 26, + 126, 190, 56, 9, 1, 248, 241, 3, 126, 190, 215, 96, 182, 57, 9, 1, 248, + 241, 3, 126, 190, 215, 96, 182, 248, 228, 26, 120, 190, 56, 9, 1, 248, + 241, 3, 120, 190, 248, 228, 26, 73, 56, 9, 1, 248, 241, 3, 228, 50, 4, + 203, 169, 57, 9, 1, 248, 241, 3, 4, 203, 168, 9, 1, 155, 3, 120, 190, 56, + 9, 1, 155, 3, 126, 190, 215, 96, 182, 57, 9, 1, 242, 30, 3, 120, 190, + 202, 248, 248, 228, 26, 4, 207, 9, 9, 1, 242, 30, 3, 228, 50, 4, 203, + 169, 57, 9, 1, 213, 155, 3, 97, 9, 1, 211, 187, 3, 236, 229, 190, 56, 9, + 1, 251, 172, 3, 120, 190, 56, 9, 1, 251, 172, 3, 126, 190, 215, 96, 191, + 56, 9, 1, 251, 172, 3, 120, 190, 202, 248, 56, 9, 1, 237, 135, 3, 120, + 190, 57, 9, 1, 237, 135, 3, 126, 190, 215, 96, 182, 57, 9, 1, 226, 253, + 3, 73, 56, 9, 1, 226, 253, 3, 126, 190, 56, 9, 1, 226, 253, 3, 126, 190, + 215, 96, 182, 57, 9, 1, 84, 3, 73, 56, 9, 1, 84, 3, 73, 57, 9, 1, 218, + 228, 3, 120, 190, 57, 9, 1, 218, 228, 3, 4, 207, 9, 9, 1, 218, 228, 3, 4, + 203, 168, 9, 1, 225, 92, 3, 148, 9, 1, 213, 155, 3, 120, 190, 202, 248, + 56, 9, 1, 213, 155, 3, 234, 204, 56, 9, 1, 211, 187, 3, 120, 190, 202, + 248, 56, 9, 1, 155, 3, 4, 9, 1, 207, 10, 57, 9, 1, 155, 3, 4, 9, 1, 207, + 10, 26, 120, 240, 180, 9, 1, 211, 187, 3, 4, 9, 1, 207, 10, 26, 120, 240, + 180, 9, 1, 213, 155, 3, 4, 9, 1, 207, 10, 26, 120, 240, 180, 9, 1, 155, + 3, 4, 9, 1, 207, 10, 56, 9, 1, 140, 3, 238, 33, 250, 248, 17, 120, 56, 9, + 1, 140, 3, 238, 33, 250, 248, 17, 126, 56, 9, 1, 237, 162, 90, 3, 238, + 33, 250, 248, 17, 120, 56, 9, 1, 237, 162, 90, 3, 238, 33, 250, 248, 17, + 126, 56, 9, 1, 237, 162, 90, 3, 238, 33, 250, 248, 17, 236, 229, 57, 9, + 1, 201, 73, 3, 238, 33, 250, 248, 17, 120, 56, 9, 1, 201, 73, 3, 238, 33, + 250, 248, 17, 126, 56, 9, 1, 90, 249, 70, 3, 238, 33, 250, 248, 17, 120, + 56, 9, 1, 90, 249, 70, 3, 238, 33, 250, 248, 17, 126, 56, 9, 1, 155, 3, + 238, 33, 250, 248, 17, 236, 229, 57, 9, 1, 211, 187, 3, 238, 33, 250, + 248, 17, 236, 229, 56, 9, 1, 211, 187, 3, 228, 50, 203, 168, 9, 1, 227, + 87, 3, 120, 190, 56, 206, 119, 1, 234, 233, 206, 119, 1, 210, 71, 206, + 119, 1, 218, 226, 206, 119, 1, 213, 248, 206, 119, 1, 249, 134, 206, 119, + 1, 224, 220, 206, 119, 1, 227, 101, 206, 119, 1, 251, 129, 206, 119, 1, + 203, 88, 206, 119, 1, 222, 60, 206, 119, 1, 237, 193, 206, 119, 1, 241, + 98, 206, 119, 1, 206, 121, 206, 119, 1, 225, 172, 206, 119, 1, 236, 85, + 206, 119, 1, 235, 119, 206, 119, 1, 211, 185, 206, 119, 1, 241, 236, 206, + 119, 1, 199, 95, 206, 119, 1, 206, 216, 206, 119, 1, 200, 109, 206, 119, + 1, 216, 86, 206, 119, 1, 227, 232, 206, 119, 1, 247, 11, 206, 119, 1, + 204, 252, 206, 119, 1, 234, 83, 206, 119, 1, 226, 206, 206, 119, 1, 206, + 120, 206, 119, 1, 199, 112, 206, 119, 1, 210, 60, 206, 119, 1, 212, 60, + 206, 119, 1, 242, 56, 206, 119, 1, 138, 206, 119, 1, 199, 14, 206, 119, + 1, 251, 168, 206, 119, 1, 235, 193, 206, 119, 1, 214, 156, 206, 119, 1, + 201, 112, 206, 119, 252, 5, 206, 119, 252, 103, 206, 119, 232, 234, 206, + 119, 238, 254, 206, 119, 204, 39, 206, 119, 217, 62, 206, 119, 239, 8, + 206, 119, 238, 24, 206, 119, 217, 137, 206, 119, 217, 145, 206, 119, 207, + 236, 206, 119, 1, 220, 157, 219, 49, 17, 199, 81, 219, 49, 17, 102, 219, + 49, 17, 105, 219, 49, 17, 147, 219, 49, 17, 149, 219, 49, 17, 164, 219, + 49, 17, 187, 219, 49, 17, 210, 135, 219, 49, 17, 192, 219, 49, 17, 219, + 113, 219, 49, 1, 62, 219, 49, 1, 238, 255, 219, 49, 1, 70, 219, 49, 1, + 72, 219, 49, 1, 66, 219, 49, 1, 217, 63, 219, 49, 1, 74, 219, 49, 1, 242, + 44, 219, 49, 1, 220, 214, 219, 49, 1, 249, 136, 219, 49, 1, 172, 219, 49, + 1, 207, 36, 219, 49, 1, 227, 248, 219, 49, 1, 247, 37, 219, 49, 1, 242, + 58, 219, 49, 1, 213, 252, 219, 49, 1, 212, 215, 219, 49, 1, 212, 64, 219, + 49, 1, 236, 32, 219, 49, 1, 237, 195, 219, 49, 1, 161, 219, 49, 1, 194, + 219, 49, 1, 220, 162, 200, 252, 219, 49, 1, 178, 219, 49, 1, 218, 60, + 219, 49, 1, 188, 219, 49, 1, 144, 219, 49, 1, 201, 114, 219, 49, 1, 183, + 219, 49, 1, 218, 61, 200, 252, 219, 49, 1, 227, 158, 227, 248, 219, 49, + 1, 227, 158, 247, 37, 219, 49, 1, 227, 158, 213, 252, 219, 49, 38, 209, + 250, 122, 205, 174, 219, 49, 38, 209, 250, 128, 205, 174, 219, 49, 38, + 209, 250, 213, 19, 205, 174, 219, 49, 38, 168, 241, 118, 205, 174, 219, + 49, 38, 168, 122, 205, 174, 219, 49, 38, 168, 128, 205, 174, 219, 49, 38, + 168, 213, 19, 205, 174, 219, 49, 38, 220, 122, 81, 219, 49, 38, 53, 73, + 56, 219, 49, 122, 150, 251, 13, 219, 49, 128, 150, 251, 13, 219, 49, 16, + 217, 64, 241, 132, 219, 49, 16, 236, 31, 219, 49, 246, 70, 219, 49, 238, + 43, 81, 219, 49, 225, 147, 212, 22, 1, 251, 149, 212, 22, 1, 248, 152, + 212, 22, 1, 236, 65, 212, 22, 1, 242, 28, 212, 22, 1, 228, 3, 212, 22, 1, + 249, 134, 212, 22, 1, 199, 84, 212, 22, 1, 228, 12, 212, 22, 1, 205, 213, + 212, 22, 1, 199, 180, 212, 22, 1, 227, 102, 212, 22, 1, 225, 169, 212, + 22, 1, 221, 166, 212, 22, 1, 218, 89, 212, 22, 1, 209, 140, 212, 22, 1, + 228, 117, 212, 22, 1, 237, 112, 212, 22, 1, 205, 30, 212, 22, 1, 214, 76, + 212, 22, 1, 213, 20, 212, 22, 1, 210, 89, 212, 22, 1, 207, 31, 212, 22, + 134, 228, 117, 212, 22, 134, 228, 116, 212, 22, 134, 217, 133, 212, 22, + 134, 242, 42, 212, 22, 67, 1, 238, 129, 199, 180, 212, 22, 134, 238, 129, + 199, 180, 212, 22, 22, 2, 168, 72, 212, 22, 22, 2, 72, 212, 22, 22, 2, + 216, 240, 252, 138, 212, 22, 22, 2, 168, 252, 138, 212, 22, 22, 2, 252, + 138, 212, 22, 22, 2, 216, 240, 62, 212, 22, 22, 2, 168, 62, 212, 22, 22, + 2, 62, 212, 22, 67, 1, 209, 250, 62, 212, 22, 22, 2, 209, 250, 62, 212, + 22, 22, 2, 168, 66, 212, 22, 22, 2, 66, 212, 22, 67, 1, 70, 212, 22, 22, + 2, 168, 70, 212, 22, 22, 2, 70, 212, 22, 22, 2, 74, 212, 22, 22, 2, 207, + 236, 212, 22, 134, 220, 17, 212, 22, 214, 212, 220, 17, 212, 22, 214, + 212, 251, 195, 212, 22, 214, 212, 251, 75, 212, 22, 214, 212, 249, 48, + 212, 22, 214, 212, 250, 149, 212, 22, 214, 212, 210, 9, 212, 22, 252, 3, + 81, 212, 22, 214, 212, 222, 50, 214, 112, 212, 22, 214, 212, 199, 22, + 212, 22, 214, 212, 214, 112, 212, 22, 214, 212, 199, 111, 212, 22, 214, + 212, 204, 181, 212, 22, 214, 212, 250, 219, 212, 22, 214, 212, 209, 24, + 222, 133, 212, 22, 214, 212, 251, 59, 222, 176, 1, 234, 210, 222, 176, 1, + 252, 89, 222, 176, 1, 251, 193, 222, 176, 1, 251, 235, 222, 176, 1, 251, + 185, 222, 176, 1, 203, 188, 222, 176, 1, 250, 105, 222, 176, 1, 228, 12, + 222, 176, 1, 250, 146, 222, 176, 1, 251, 154, 222, 176, 1, 251, 159, 222, + 176, 1, 251, 151, 222, 176, 1, 251, 101, 222, 176, 1, 251, 85, 222, 176, + 1, 250, 188, 222, 176, 1, 228, 117, 222, 176, 1, 251, 28, 222, 176, 1, + 250, 157, 222, 176, 1, 251, 1, 222, 176, 1, 250, 253, 222, 176, 1, 250, + 181, 222, 176, 1, 250, 155, 222, 176, 1, 239, 112, 222, 176, 1, 227, 94, + 222, 176, 1, 251, 171, 222, 176, 251, 199, 81, 222, 176, 202, 191, 81, + 222, 176, 236, 3, 81, 222, 176, 214, 211, 9, 1, 248, 241, 3, 4, 203, 169, + 57, 9, 1, 248, 241, 3, 234, 204, 56, 9, 1, 193, 3, 120, 190, 56, 9, 1, + 207, 10, 3, 120, 190, 56, 9, 1, 237, 135, 3, 73, 248, 228, 26, 126, 190, + 56, 9, 1, 214, 153, 3, 73, 57, 9, 1, 225, 92, 3, 53, 148, 9, 1, 84, 3, + 126, 190, 56, 9, 1, 90, 3, 120, 190, 248, 228, 26, 234, 204, 56, 9, 1, + 90, 3, 120, 190, 248, 228, 26, 73, 56, 9, 1, 213, 155, 3, 224, 74, 9, 1, + 201, 73, 3, 73, 201, 4, 9, 1, 212, 245, 200, 46, 9, 1, 128, 251, 142, 9, + 1, 242, 30, 3, 126, 190, 57, 9, 1, 212, 57, 3, 126, 190, 57, 9, 1, 236, + 77, 3, 228, 50, 97, 9, 1, 208, 68, 201, 72, 9, 1, 199, 106, 3, 228, 50, + 203, 169, 56, 9, 1, 251, 172, 3, 126, 190, 57, 9, 1, 227, 87, 3, 73, 57, + 9, 1, 248, 241, 3, 4, 84, 56, 9, 1, 216, 55, 3, 4, 84, 56, 9, 1, 206, + 184, 3, 4, 206, 184, 56, 9, 1, 213, 155, 3, 4, 218, 228, 56, 9, 1, 90, 3, + 120, 190, 248, 228, 26, 4, 218, 228, 56, 9, 1, 251, 196, 237, 134, 9, 1, + 251, 196, 214, 152, 9, 1, 251, 196, 218, 227, 9, 4, 122, 200, 238, 250, + 250, 9, 4, 122, 212, 56, 9, 4, 122, 251, 171, 9, 4, 122, 214, 152, 9, 4, + 122, 218, 228, 3, 227, 36, 9, 4, 128, 218, 228, 3, 227, 36, 9, 4, 122, + 200, 238, 250, 154, 9, 4, 122, 200, 238, 250, 187, 9, 4, 122, 200, 238, + 251, 84, 9, 4, 122, 200, 238, 212, 37, 9, 4, 122, 200, 238, 214, 116, 9, + 4, 122, 200, 238, 201, 95, 9, 4, 122, 236, 253, 222, 145, 9, 4, 122, 2, + 212, 52, 9, 240, 251, 238, 171, 76, 250, 111, 9, 204, 185, 242, 18, 57, + 9, 242, 196, 237, 158, 9, 242, 196, 242, 17, 9, 242, 196, 227, 36, 9, + 242, 196, 237, 156, 9, 242, 196, 242, 15, 9, 242, 196, 227, 34, 9, 150, + 112, 73, 56, 9, 150, 120, 190, 56, 9, 150, 224, 75, 56, 9, 150, 112, 73, + 57, 9, 150, 120, 190, 57, 9, 150, 224, 75, 57, 9, 176, 237, 156, 9, 176, + 242, 15, 9, 176, 227, 34, 9, 4, 122, 201, 72, 9, 237, 159, 3, 213, 26, 9, + 237, 159, 3, 73, 56, 9, 227, 37, 3, 73, 57, 9, 49, 250, 203, 56, 9, 51, + 250, 203, 56, 9, 49, 250, 203, 57, 9, 51, 250, 203, 57, 9, 53, 51, 250, + 203, 56, 9, 53, 51, 250, 203, 88, 3, 240, 182, 9, 51, 250, 203, 88, 3, + 240, 182, 9, 242, 18, 3, 240, 182, 9, 134, 209, 173, 218, 228, 235, 165, + 94, 2, 228, 50, 247, 149, 94, 2, 247, 149, 94, 2, 251, 33, 94, 2, 202, + 203, 94, 1, 209, 250, 62, 94, 1, 62, 94, 1, 252, 138, 94, 1, 70, 94, 1, + 228, 151, 94, 1, 66, 94, 1, 203, 182, 94, 1, 109, 146, 94, 1, 109, 156, + 94, 1, 247, 152, 72, 94, 1, 209, 250, 72, 94, 1, 72, 94, 1, 251, 176, 94, + 1, 247, 152, 74, 94, 1, 209, 250, 74, 94, 1, 74, 94, 1, 250, 139, 94, 1, + 161, 94, 1, 226, 207, 94, 1, 236, 89, 94, 1, 235, 199, 94, 1, 219, 253, + 94, 1, 247, 190, 94, 1, 247, 37, 94, 1, 227, 248, 94, 1, 227, 215, 94, 1, + 218, 60, 94, 1, 204, 253, 94, 1, 204, 241, 94, 1, 241, 220, 94, 1, 241, + 204, 94, 1, 219, 21, 94, 1, 207, 36, 94, 1, 206, 122, 94, 1, 242, 58, 94, + 1, 241, 100, 94, 1, 188, 94, 1, 219, 3, 94, 1, 172, 94, 1, 215, 245, 94, + 1, 249, 136, 94, 1, 248, 200, 94, 1, 178, 94, 1, 183, 94, 1, 213, 252, + 94, 1, 212, 215, 94, 1, 194, 94, 1, 224, 138, 94, 1, 224, 129, 94, 1, + 203, 90, 94, 1, 210, 114, 94, 1, 208, 179, 94, 1, 212, 64, 94, 1, 144, + 94, 22, 2, 217, 121, 94, 22, 2, 217, 61, 94, 2, 218, 100, 94, 2, 250, + 122, 94, 22, 2, 252, 138, 94, 22, 2, 70, 94, 22, 2, 228, 151, 94, 22, 2, + 66, 94, 22, 2, 203, 182, 94, 22, 2, 109, 146, 94, 22, 2, 109, 212, 216, + 94, 22, 2, 247, 152, 72, 94, 22, 2, 209, 250, 72, 94, 22, 2, 72, 94, 22, + 2, 251, 176, 94, 22, 2, 247, 152, 74, 94, 22, 2, 209, 250, 74, 94, 22, 2, + 74, 94, 22, 2, 250, 139, 94, 2, 202, 208, 94, 22, 2, 215, 6, 72, 94, 22, + 2, 250, 117, 94, 217, 86, 94, 208, 57, 2, 204, 33, 94, 208, 57, 2, 251, + 35, 94, 235, 74, 251, 251, 94, 251, 239, 251, 251, 94, 22, 2, 247, 152, + 168, 72, 94, 22, 2, 204, 31, 94, 22, 2, 203, 181, 94, 1, 214, 159, 94, 1, + 226, 188, 94, 1, 235, 174, 94, 1, 199, 114, 94, 1, 241, 209, 94, 1, 213, + 93, 94, 1, 237, 195, 94, 1, 199, 166, 94, 1, 109, 212, 216, 94, 1, 109, + 224, 139, 94, 22, 2, 109, 156, 94, 22, 2, 109, 224, 139, 94, 242, 10, 94, + 53, 242, 10, 94, 17, 199, 81, 94, 17, 102, 94, 17, 105, 94, 17, 147, 94, + 17, 149, 94, 17, 164, 94, 17, 187, 94, 17, 210, 135, 94, 17, 192, 94, 17, + 219, 113, 94, 252, 3, 54, 94, 2, 122, 208, 243, 240, 182, 94, 1, 247, + 152, 62, 94, 1, 217, 121, 94, 1, 217, 61, 94, 1, 250, 117, 94, 1, 204, + 31, 94, 1, 203, 181, 94, 1, 222, 138, 241, 220, 94, 1, 199, 77, 94, 1, + 80, 183, 94, 1, 235, 235, 94, 1, 227, 194, 94, 1, 235, 123, 208, 76, 94, + 1, 241, 210, 94, 1, 249, 44, 185, 251, 62, 185, 2, 247, 149, 185, 2, 251, + 33, 185, 2, 202, 203, 185, 1, 62, 185, 1, 252, 138, 185, 1, 70, 185, 1, + 228, 151, 185, 1, 66, 185, 1, 203, 182, 185, 1, 109, 146, 185, 1, 109, + 156, 185, 1, 72, 185, 1, 251, 176, 185, 1, 74, 185, 1, 250, 139, 185, 1, + 161, 185, 1, 226, 207, 185, 1, 236, 89, 185, 1, 235, 199, 185, 1, 219, + 253, 185, 1, 247, 190, 185, 1, 247, 37, 185, 1, 227, 248, 185, 1, 227, + 215, 185, 1, 218, 60, 185, 1, 204, 253, 185, 1, 204, 241, 185, 1, 241, + 220, 185, 1, 241, 204, 185, 1, 219, 21, 185, 1, 207, 36, 185, 1, 206, + 122, 185, 1, 242, 58, 185, 1, 241, 100, 185, 1, 188, 185, 1, 172, 185, 1, + 215, 245, 185, 1, 249, 136, 185, 1, 248, 200, 185, 1, 178, 185, 1, 183, + 185, 1, 213, 252, 185, 1, 194, 185, 1, 210, 114, 185, 1, 208, 179, 185, + 1, 212, 64, 185, 1, 144, 185, 2, 218, 100, 185, 2, 250, 122, 185, 22, 2, + 252, 138, 185, 22, 2, 70, 185, 22, 2, 228, 151, 185, 22, 2, 66, 185, 22, + 2, 203, 182, 185, 22, 2, 109, 146, 185, 22, 2, 109, 212, 216, 185, 22, 2, + 72, 185, 22, 2, 251, 176, 185, 22, 2, 74, 185, 22, 2, 250, 139, 185, 2, + 202, 208, 185, 1, 226, 198, 207, 36, 185, 250, 140, 225, 2, 81, 185, 1, + 212, 215, 185, 1, 213, 93, 185, 1, 199, 166, 185, 1, 109, 212, 216, 185, + 1, 109, 224, 139, 185, 22, 2, 109, 156, 185, 22, 2, 109, 224, 139, 185, + 17, 199, 81, 185, 17, 102, 185, 17, 105, 185, 17, 147, 185, 17, 149, 185, + 17, 164, 185, 17, 187, 185, 17, 210, 135, 185, 17, 192, 185, 17, 219, + 113, 185, 1, 213, 253, 3, 101, 241, 70, 185, 1, 213, 253, 3, 224, 54, + 241, 70, 185, 212, 149, 81, 185, 212, 149, 54, 185, 242, 195, 218, 92, + 102, 185, 242, 195, 218, 92, 105, 185, 242, 195, 218, 92, 147, 185, 242, + 195, 218, 92, 149, 185, 242, 195, 218, 92, 112, 224, 242, 206, 112, 206, + 107, 241, 130, 185, 242, 195, 241, 131, 209, 100, 185, 228, 13, 185, 236, + 56, 81, 235, 18, 2, 251, 234, 248, 168, 235, 18, 2, 248, 168, 235, 18, 2, + 202, 203, 235, 18, 1, 62, 235, 18, 1, 252, 138, 235, 18, 1, 70, 235, 18, + 1, 228, 151, 235, 18, 1, 66, 235, 18, 1, 203, 182, 235, 18, 1, 238, 255, + 235, 18, 1, 251, 176, 235, 18, 1, 217, 63, 235, 18, 1, 250, 139, 235, 18, + 1, 161, 235, 18, 1, 226, 207, 235, 18, 1, 236, 89, 235, 18, 1, 235, 199, + 235, 18, 1, 219, 253, 235, 18, 1, 247, 190, 235, 18, 1, 247, 37, 235, 18, + 1, 227, 248, 235, 18, 1, 227, 215, 235, 18, 1, 218, 60, 235, 18, 1, 204, + 253, 235, 18, 1, 204, 241, 235, 18, 1, 241, 220, 235, 18, 1, 241, 204, + 235, 18, 1, 219, 21, 235, 18, 1, 207, 36, 235, 18, 1, 206, 122, 235, 18, + 1, 242, 58, 235, 18, 1, 241, 100, 235, 18, 1, 188, 235, 18, 1, 172, 235, + 18, 1, 215, 245, 235, 18, 1, 249, 136, 235, 18, 1, 248, 200, 235, 18, 1, + 178, 235, 18, 1, 183, 235, 18, 1, 213, 252, 235, 18, 1, 194, 235, 18, 1, + 224, 138, 235, 18, 1, 203, 90, 235, 18, 1, 210, 114, 235, 18, 1, 212, 64, + 235, 18, 1, 144, 235, 18, 2, 218, 100, 235, 18, 22, 2, 252, 138, 235, 18, + 22, 2, 70, 235, 18, 22, 2, 228, 151, 235, 18, 22, 2, 66, 235, 18, 22, 2, + 203, 182, 235, 18, 22, 2, 238, 255, 235, 18, 22, 2, 251, 176, 235, 18, + 22, 2, 217, 63, 235, 18, 22, 2, 250, 139, 235, 18, 2, 202, 208, 235, 18, + 2, 204, 35, 235, 18, 1, 226, 188, 235, 18, 1, 235, 174, 235, 18, 1, 199, + 114, 235, 18, 1, 212, 215, 235, 18, 1, 237, 195, 235, 18, 17, 199, 81, + 235, 18, 17, 102, 235, 18, 17, 105, 235, 18, 17, 147, 235, 18, 17, 149, + 235, 18, 17, 164, 235, 18, 17, 187, 235, 18, 17, 210, 135, 235, 18, 17, + 192, 235, 18, 17, 219, 113, 235, 18, 205, 221, 235, 18, 251, 233, 235, + 18, 228, 33, 235, 18, 203, 210, 235, 18, 238, 217, 217, 68, 235, 18, 2, + 200, 84, 235, 33, 2, 247, 149, 235, 33, 2, 251, 33, 235, 33, 2, 202, 203, + 235, 33, 1, 62, 235, 33, 1, 252, 138, 235, 33, 1, 70, 235, 33, 1, 228, + 151, 235, 33, 1, 66, 235, 33, 1, 203, 182, 235, 33, 1, 109, 146, 235, 33, + 1, 109, 156, 235, 33, 22, 247, 152, 72, 235, 33, 1, 72, 235, 33, 1, 251, + 176, 235, 33, 22, 247, 152, 74, 235, 33, 1, 74, 235, 33, 1, 250, 139, + 235, 33, 1, 161, 235, 33, 1, 226, 207, 235, 33, 1, 236, 89, 235, 33, 1, + 235, 199, 235, 33, 1, 219, 253, 235, 33, 1, 247, 190, 235, 33, 1, 247, + 37, 235, 33, 1, 227, 248, 235, 33, 1, 227, 215, 235, 33, 1, 218, 60, 235, + 33, 1, 204, 253, 235, 33, 1, 204, 241, 235, 33, 1, 241, 220, 235, 33, 1, + 241, 204, 235, 33, 1, 219, 21, 235, 33, 1, 207, 36, 235, 33, 1, 206, 122, + 235, 33, 1, 242, 58, 235, 33, 1, 241, 100, 235, 33, 1, 188, 235, 33, 1, + 172, 235, 33, 1, 215, 245, 235, 33, 1, 249, 136, 235, 33, 1, 248, 200, + 235, 33, 1, 178, 235, 33, 1, 183, 235, 33, 1, 213, 252, 235, 33, 1, 194, + 235, 33, 1, 224, 138, 235, 33, 1, 203, 90, 235, 33, 1, 210, 114, 235, 33, + 1, 208, 179, 235, 33, 1, 212, 64, 235, 33, 1, 144, 235, 33, 2, 218, 100, + 235, 33, 2, 250, 122, 235, 33, 22, 2, 252, 138, 235, 33, 22, 2, 70, 235, + 33, 22, 2, 228, 151, 235, 33, 22, 2, 66, 235, 33, 22, 2, 203, 182, 235, + 33, 22, 2, 109, 146, 235, 33, 22, 2, 109, 212, 216, 235, 33, 22, 2, 247, + 152, 72, 235, 33, 22, 2, 72, 235, 33, 22, 2, 251, 176, 235, 33, 22, 2, + 247, 152, 74, 235, 33, 22, 2, 74, 235, 33, 22, 2, 250, 139, 235, 33, 2, + 202, 208, 235, 33, 217, 86, 235, 33, 1, 109, 212, 216, 235, 33, 1, 109, + 224, 139, 235, 33, 22, 2, 109, 156, 235, 33, 22, 2, 109, 224, 139, 235, + 33, 17, 199, 81, 235, 33, 17, 102, 235, 33, 17, 105, 235, 33, 17, 147, + 235, 33, 17, 149, 235, 33, 17, 164, 235, 33, 17, 187, 235, 33, 17, 210, + 135, 235, 33, 17, 192, 235, 33, 17, 219, 113, 235, 33, 252, 3, 54, 235, + 33, 212, 149, 54, 235, 33, 1, 199, 77, 217, 24, 2, 247, 149, 217, 24, 2, + 251, 33, 217, 24, 2, 202, 203, 217, 24, 1, 62, 217, 24, 1, 252, 138, 217, + 24, 1, 70, 217, 24, 1, 228, 151, 217, 24, 1, 66, 217, 24, 1, 203, 182, + 217, 24, 1, 109, 146, 217, 24, 1, 109, 156, 217, 24, 1, 72, 217, 24, 1, + 251, 176, 217, 24, 1, 74, 217, 24, 1, 250, 139, 217, 24, 1, 161, 217, 24, + 1, 226, 207, 217, 24, 1, 236, 89, 217, 24, 1, 235, 199, 217, 24, 1, 219, + 253, 217, 24, 1, 247, 190, 217, 24, 1, 247, 37, 217, 24, 1, 227, 248, + 217, 24, 1, 227, 215, 217, 24, 1, 218, 60, 217, 24, 1, 204, 253, 217, 24, + 1, 204, 241, 217, 24, 1, 241, 220, 217, 24, 1, 241, 204, 217, 24, 1, 219, + 21, 217, 24, 1, 207, 36, 217, 24, 1, 206, 122, 217, 24, 1, 242, 58, 217, + 24, 1, 241, 100, 217, 24, 1, 188, 217, 24, 1, 172, 217, 24, 1, 215, 245, + 217, 24, 1, 249, 136, 217, 24, 1, 248, 200, 217, 24, 1, 178, 217, 24, 1, + 183, 217, 24, 1, 213, 252, 217, 24, 1, 194, 217, 24, 1, 224, 138, 217, + 24, 1, 203, 90, 217, 24, 1, 210, 114, 217, 24, 1, 208, 179, 217, 24, 1, + 212, 64, 217, 24, 1, 144, 217, 24, 2, 218, 100, 217, 24, 2, 250, 122, + 217, 24, 22, 2, 252, 138, 217, 24, 22, 2, 70, 217, 24, 22, 2, 228, 151, + 217, 24, 22, 2, 66, 217, 24, 22, 2, 203, 182, 217, 24, 22, 2, 109, 146, + 217, 24, 22, 2, 109, 212, 216, 217, 24, 22, 2, 72, 217, 24, 22, 2, 251, + 176, 217, 24, 22, 2, 74, 217, 24, 22, 2, 250, 139, 217, 24, 2, 202, 208, + 217, 24, 251, 177, 225, 2, 81, 217, 24, 250, 140, 225, 2, 81, 217, 24, 1, + 212, 215, 217, 24, 1, 213, 93, 217, 24, 1, 199, 166, 217, 24, 1, 109, + 212, 216, 217, 24, 1, 109, 224, 139, 217, 24, 22, 2, 109, 156, 217, 24, + 22, 2, 109, 224, 139, 217, 24, 17, 199, 81, 217, 24, 17, 102, 217, 24, + 17, 105, 217, 24, 17, 147, 217, 24, 17, 149, 217, 24, 17, 164, 217, 24, + 17, 187, 217, 24, 17, 210, 135, 217, 24, 17, 192, 217, 24, 17, 219, 113, + 217, 24, 228, 13, 217, 24, 1, 201, 114, 217, 24, 236, 219, 112, 214, 87, + 217, 24, 236, 219, 112, 234, 213, 217, 24, 236, 219, 126, 214, 85, 217, + 24, 236, 219, 112, 209, 98, 217, 24, 236, 219, 112, 238, 227, 217, 24, + 236, 219, 126, 209, 97, 45, 2, 251, 33, 45, 2, 202, 203, 45, 1, 62, 45, + 1, 252, 138, 45, 1, 70, 45, 1, 228, 151, 45, 1, 66, 45, 1, 203, 182, 45, + 1, 72, 45, 1, 238, 255, 45, 1, 251, 176, 45, 1, 74, 45, 1, 217, 63, 45, + 1, 250, 139, 45, 1, 161, 45, 1, 219, 253, 45, 1, 247, 190, 45, 1, 227, + 248, 45, 1, 218, 60, 45, 1, 204, 253, 45, 1, 219, 21, 45, 1, 207, 36, 45, + 1, 188, 45, 1, 219, 3, 45, 1, 172, 45, 1, 178, 45, 1, 183, 45, 1, 213, + 252, 45, 1, 212, 215, 45, 1, 194, 45, 1, 224, 138, 45, 1, 224, 129, 45, + 1, 203, 90, 45, 1, 210, 114, 45, 1, 208, 179, 45, 1, 212, 64, 45, 1, 144, + 45, 22, 2, 252, 138, 45, 22, 2, 70, 45, 22, 2, 228, 151, 45, 22, 2, 66, + 45, 22, 2, 203, 182, 45, 22, 2, 72, 45, 22, 2, 238, 255, 45, 22, 2, 251, + 176, 45, 22, 2, 74, 45, 22, 2, 217, 63, 45, 22, 2, 250, 139, 45, 2, 202, + 208, 45, 217, 86, 45, 250, 140, 225, 2, 81, 45, 17, 199, 81, 45, 17, 102, + 45, 17, 105, 45, 17, 147, 45, 17, 149, 45, 17, 164, 45, 17, 187, 45, 17, + 210, 135, 45, 17, 192, 45, 17, 219, 113, 45, 41, 206, 166, 45, 41, 112, + 233, 82, 45, 41, 112, 206, 50, 45, 241, 233, 54, 45, 221, 90, 54, 45, + 200, 49, 54, 45, 241, 172, 54, 45, 242, 246, 54, 45, 250, 189, 88, 54, + 45, 212, 149, 54, 45, 41, 54, 180, 2, 38, 247, 150, 56, 180, 2, 247, 149, + 180, 2, 251, 33, 180, 2, 202, 203, 180, 1, 62, 180, 1, 252, 138, 180, 1, + 70, 180, 1, 228, 151, 180, 1, 66, 180, 1, 203, 182, 180, 1, 109, 146, + 180, 1, 109, 156, 180, 1, 72, 180, 1, 238, 255, 180, 1, 251, 176, 180, 1, + 74, 180, 1, 217, 63, 180, 1, 250, 139, 180, 1, 161, 180, 1, 226, 207, + 180, 1, 236, 89, 180, 1, 235, 199, 180, 1, 219, 253, 180, 1, 247, 190, + 180, 1, 247, 37, 180, 1, 227, 248, 180, 1, 227, 215, 180, 1, 218, 60, + 180, 1, 204, 253, 180, 1, 204, 241, 180, 1, 241, 220, 180, 1, 241, 204, + 180, 1, 219, 21, 180, 1, 207, 36, 180, 1, 206, 122, 180, 1, 242, 58, 180, + 1, 241, 100, 180, 1, 188, 180, 1, 172, 180, 1, 215, 245, 180, 1, 249, + 136, 180, 1, 248, 200, 180, 1, 178, 180, 1, 183, 180, 1, 213, 252, 180, + 1, 212, 215, 180, 1, 194, 180, 1, 224, 138, 180, 1, 224, 129, 180, 1, + 203, 90, 180, 1, 210, 114, 180, 1, 208, 179, 180, 1, 212, 64, 180, 1, + 144, 180, 2, 250, 122, 180, 22, 2, 252, 138, 180, 22, 2, 70, 180, 22, 2, + 228, 151, 180, 22, 2, 66, 180, 22, 2, 203, 182, 180, 22, 2, 109, 146, + 180, 22, 2, 109, 212, 216, 180, 22, 2, 72, 180, 22, 2, 238, 255, 180, 22, + 2, 251, 176, 180, 22, 2, 74, 180, 22, 2, 217, 63, 180, 22, 2, 250, 139, + 180, 2, 202, 208, 180, 225, 2, 81, 180, 251, 177, 225, 2, 81, 180, 1, + 205, 32, 180, 1, 239, 93, 180, 1, 212, 196, 180, 1, 109, 212, 216, 180, + 1, 109, 224, 139, 180, 22, 2, 109, 156, 180, 22, 2, 109, 224, 139, 180, + 17, 199, 81, 180, 17, 102, 180, 17, 105, 180, 17, 147, 180, 17, 149, 180, + 17, 164, 180, 17, 187, 180, 17, 210, 135, 180, 17, 192, 180, 17, 219, + 113, 180, 236, 219, 17, 199, 82, 36, 217, 125, 215, 50, 76, 149, 180, + 236, 219, 17, 112, 36, 217, 125, 215, 50, 76, 149, 180, 236, 219, 17, + 120, 36, 217, 125, 215, 50, 76, 149, 180, 236, 219, 17, 126, 36, 217, + 125, 215, 50, 76, 149, 180, 236, 219, 17, 112, 36, 238, 56, 215, 50, 76, + 149, 180, 236, 219, 17, 120, 36, 238, 56, 215, 50, 76, 149, 180, 236, + 219, 17, 126, 36, 238, 56, 215, 50, 76, 149, 180, 2, 204, 175, 227, 63, + 2, 208, 243, 247, 149, 227, 63, 2, 247, 149, 227, 63, 2, 251, 33, 227, + 63, 2, 202, 203, 227, 63, 1, 62, 227, 63, 1, 252, 138, 227, 63, 1, 70, + 227, 63, 1, 228, 151, 227, 63, 1, 66, 227, 63, 1, 203, 182, 227, 63, 1, + 109, 146, 227, 63, 1, 109, 156, 227, 63, 1, 72, 227, 63, 1, 238, 255, + 227, 63, 1, 251, 176, 227, 63, 1, 74, 227, 63, 1, 217, 63, 227, 63, 1, + 250, 139, 227, 63, 1, 161, 227, 63, 1, 226, 207, 227, 63, 1, 236, 89, + 227, 63, 1, 235, 199, 227, 63, 1, 219, 253, 227, 63, 1, 247, 190, 227, + 63, 1, 247, 37, 227, 63, 1, 227, 248, 227, 63, 1, 227, 215, 227, 63, 1, + 218, 60, 227, 63, 1, 204, 253, 227, 63, 1, 204, 241, 227, 63, 1, 241, + 220, 227, 63, 1, 241, 204, 227, 63, 1, 219, 21, 227, 63, 1, 207, 36, 227, + 63, 1, 206, 122, 227, 63, 1, 242, 58, 227, 63, 1, 241, 100, 227, 63, 1, + 188, 227, 63, 1, 172, 227, 63, 1, 215, 245, 227, 63, 1, 249, 136, 227, + 63, 1, 248, 200, 227, 63, 1, 178, 227, 63, 1, 183, 227, 63, 1, 213, 252, + 227, 63, 1, 212, 215, 227, 63, 1, 194, 227, 63, 1, 224, 138, 227, 63, 1, + 203, 90, 227, 63, 1, 210, 114, 227, 63, 1, 208, 179, 227, 63, 1, 212, 64, + 227, 63, 1, 144, 227, 63, 2, 218, 100, 227, 63, 2, 250, 122, 227, 63, 22, + 2, 252, 138, 227, 63, 22, 2, 70, 227, 63, 22, 2, 228, 151, 227, 63, 22, + 2, 66, 227, 63, 22, 2, 203, 182, 227, 63, 22, 2, 109, 146, 227, 63, 22, + 2, 109, 212, 216, 227, 63, 22, 2, 72, 227, 63, 22, 2, 238, 255, 227, 63, + 22, 2, 251, 176, 227, 63, 22, 2, 74, 227, 63, 22, 2, 217, 63, 227, 63, + 22, 2, 250, 139, 227, 63, 2, 202, 208, 227, 63, 225, 2, 81, 227, 63, 251, + 177, 225, 2, 81, 227, 63, 1, 237, 195, 227, 63, 1, 109, 212, 216, 227, + 63, 1, 109, 224, 139, 227, 63, 22, 2, 109, 156, 227, 63, 22, 2, 109, 224, + 139, 227, 63, 17, 199, 81, 227, 63, 17, 102, 227, 63, 17, 105, 227, 63, + 17, 147, 227, 63, 17, 149, 227, 63, 17, 164, 227, 63, 17, 187, 227, 63, + 17, 210, 135, 227, 63, 17, 192, 227, 63, 17, 219, 113, 227, 63, 2, 227, + 201, 227, 63, 2, 203, 226, 142, 2, 247, 149, 142, 2, 251, 33, 142, 2, + 202, 203, 142, 1, 62, 142, 1, 252, 138, 142, 1, 70, 142, 1, 228, 151, + 142, 1, 66, 142, 1, 203, 182, 142, 1, 109, 146, 142, 1, 109, 156, 142, 1, + 72, 142, 1, 238, 255, 142, 1, 251, 176, 142, 1, 74, 142, 1, 217, 63, 142, + 1, 250, 139, 142, 1, 161, 142, 1, 226, 207, 142, 1, 236, 89, 142, 1, 235, + 199, 142, 1, 219, 253, 142, 1, 247, 190, 142, 1, 247, 37, 142, 1, 227, + 248, 142, 1, 227, 215, 142, 1, 218, 60, 142, 1, 204, 253, 142, 1, 204, + 241, 142, 1, 241, 220, 142, 1, 241, 204, 142, 1, 219, 21, 142, 1, 207, + 36, 142, 1, 206, 122, 142, 1, 242, 58, 142, 1, 241, 100, 142, 1, 188, + 142, 1, 219, 3, 142, 1, 172, 142, 1, 215, 245, 142, 1, 249, 136, 142, 1, + 248, 200, 142, 1, 178, 142, 1, 183, 142, 1, 213, 252, 142, 1, 212, 215, + 142, 1, 194, 142, 1, 224, 138, 142, 1, 224, 129, 142, 1, 203, 90, 142, 1, + 210, 114, 142, 1, 208, 179, 142, 1, 212, 64, 142, 1, 144, 142, 1, 204, + 222, 142, 2, 250, 122, 142, 22, 2, 252, 138, 142, 22, 2, 70, 142, 22, 2, + 228, 151, 142, 22, 2, 66, 142, 22, 2, 203, 182, 142, 22, 2, 109, 146, + 142, 22, 2, 109, 212, 216, 142, 22, 2, 72, 142, 22, 2, 238, 255, 142, 22, + 2, 251, 176, 142, 22, 2, 74, 142, 22, 2, 217, 63, 142, 22, 2, 250, 139, + 142, 2, 202, 208, 142, 1, 73, 213, 129, 142, 2, 216, 129, 142, 1, 246, + 225, 223, 243, 142, 1, 246, 225, 200, 123, 142, 1, 246, 225, 224, 130, + 142, 250, 140, 225, 2, 81, 142, 236, 219, 112, 217, 74, 142, 236, 219, + 112, 236, 237, 142, 236, 219, 126, 238, 224, 142, 236, 219, 112, 204, + 162, 142, 236, 219, 112, 206, 157, 142, 236, 219, 126, 204, 161, 142, + 236, 219, 112, 237, 107, 142, 1, 250, 234, 228, 151, 142, 1, 109, 212, + 216, 142, 1, 109, 224, 139, 142, 22, 2, 109, 156, 142, 22, 2, 109, 224, + 139, 142, 17, 199, 81, 142, 17, 102, 142, 17, 105, 142, 17, 147, 142, 17, + 149, 142, 17, 164, 142, 17, 187, 142, 17, 210, 135, 142, 17, 192, 142, + 17, 219, 113, 142, 41, 206, 166, 142, 41, 112, 233, 82, 142, 41, 112, + 206, 50, 142, 236, 219, 112, 214, 87, 142, 236, 219, 112, 234, 213, 142, + 236, 219, 126, 214, 85, 142, 236, 219, 112, 209, 98, 142, 236, 219, 112, + 238, 227, 142, 236, 219, 126, 209, 97, 142, 241, 238, 81, 142, 1, 246, + 225, 219, 22, 142, 1, 246, 225, 220, 214, 142, 1, 246, 225, 212, 216, + 142, 1, 246, 225, 156, 142, 1, 246, 225, 224, 139, 142, 1, 246, 225, 227, + 118, 143, 2, 251, 32, 143, 2, 202, 202, 143, 1, 250, 110, 143, 1, 252, + 92, 143, 1, 251, 201, 143, 1, 251, 216, 143, 1, 228, 2, 143, 1, 228, 150, + 143, 1, 203, 173, 143, 1, 203, 176, 143, 1, 228, 28, 143, 1, 228, 29, + 143, 1, 228, 136, 143, 1, 228, 138, 143, 1, 238, 25, 143, 1, 238, 250, + 143, 1, 251, 161, 143, 1, 216, 229, 143, 1, 217, 56, 143, 1, 250, 125, + 143, 1, 251, 115, 227, 13, 143, 1, 222, 205, 227, 13, 143, 1, 251, 115, + 236, 35, 143, 1, 222, 205, 236, 35, 143, 1, 227, 62, 220, 154, 143, 1, + 212, 5, 236, 35, 143, 1, 251, 115, 247, 102, 143, 1, 222, 205, 247, 102, + 143, 1, 251, 115, 227, 230, 143, 1, 222, 205, 227, 230, 143, 1, 207, 29, + 220, 154, 143, 1, 207, 29, 212, 4, 220, 155, 143, 1, 212, 5, 227, 230, + 143, 1, 251, 115, 204, 249, 143, 1, 222, 205, 204, 249, 143, 1, 251, 115, + 241, 211, 143, 1, 222, 205, 241, 211, 143, 1, 220, 242, 220, 108, 143, 1, + 212, 5, 241, 211, 143, 1, 251, 115, 206, 209, 143, 1, 222, 205, 206, 209, + 143, 1, 251, 115, 241, 231, 143, 1, 222, 205, 241, 231, 143, 1, 242, 6, + 220, 108, 143, 1, 212, 5, 241, 231, 143, 1, 251, 115, 216, 81, 143, 1, + 222, 205, 216, 81, 143, 1, 251, 115, 249, 46, 143, 1, 222, 205, 249, 46, + 143, 1, 222, 118, 143, 1, 251, 95, 249, 46, 143, 1, 200, 56, 143, 1, 213, + 196, 143, 1, 242, 6, 225, 49, 143, 1, 203, 61, 143, 1, 207, 29, 211, 233, + 143, 1, 220, 242, 211, 233, 143, 1, 242, 6, 211, 233, 143, 1, 234, 145, + 143, 1, 220, 242, 225, 49, 143, 1, 237, 149, 143, 2, 251, 150, 143, 22, + 2, 251, 211, 143, 22, 2, 226, 232, 251, 218, 143, 22, 2, 241, 43, 251, + 218, 143, 22, 2, 226, 232, 228, 25, 143, 22, 2, 241, 43, 228, 25, 143, + 22, 2, 226, 232, 216, 209, 143, 22, 2, 241, 43, 216, 209, 143, 22, 2, + 236, 78, 143, 22, 2, 226, 73, 143, 22, 2, 241, 43, 226, 73, 143, 22, 2, + 226, 75, 241, 150, 143, 22, 2, 226, 74, 234, 234, 251, 211, 143, 22, 2, + 226, 74, 234, 234, 241, 43, 251, 211, 143, 22, 2, 226, 74, 234, 234, 236, + 34, 143, 22, 2, 236, 34, 143, 224, 151, 17, 199, 81, 143, 224, 151, 17, + 102, 143, 224, 151, 17, 105, 143, 224, 151, 17, 147, 143, 224, 151, 17, + 149, 143, 224, 151, 17, 164, 143, 224, 151, 17, 187, 143, 224, 151, 17, + 210, 135, 143, 224, 151, 17, 192, 143, 224, 151, 17, 219, 113, 143, 22, + 2, 241, 43, 236, 78, 143, 22, 2, 241, 43, 236, 34, 143, 214, 212, 226, 0, + 206, 117, 171, 226, 89, 227, 82, 206, 117, 171, 226, 179, 226, 202, 206, + 117, 171, 226, 179, 226, 171, 206, 117, 171, 226, 179, 226, 166, 206, + 117, 171, 226, 179, 226, 175, 206, 117, 171, 226, 179, 213, 217, 206, + 117, 171, 219, 179, 219, 166, 206, 117, 171, 246, 211, 247, 26, 206, 117, + 171, 246, 211, 246, 221, 206, 117, 171, 246, 211, 247, 25, 206, 117, 171, + 209, 30, 209, 29, 206, 117, 171, 246, 211, 246, 207, 206, 117, 171, 199, + 246, 199, 253, 206, 117, 171, 240, 212, 247, 34, 206, 117, 171, 205, 186, + 216, 92, 206, 117, 171, 206, 62, 206, 111, 206, 117, 171, 206, 62, 220, + 131, 206, 117, 171, 206, 62, 215, 207, 206, 117, 171, 218, 242, 220, 24, + 206, 117, 171, 240, 212, 241, 151, 206, 117, 171, 205, 186, 206, 237, + 206, 117, 171, 206, 62, 206, 29, 206, 117, 171, 206, 62, 206, 118, 206, + 117, 171, 206, 62, 206, 57, 206, 117, 171, 218, 242, 218, 133, 206, 117, + 171, 248, 125, 249, 102, 206, 117, 171, 215, 107, 215, 135, 206, 117, + 171, 215, 218, 215, 209, 206, 117, 171, 237, 14, 237, 195, 206, 117, 171, + 215, 218, 215, 238, 206, 117, 171, 237, 14, 237, 168, 206, 117, 171, 215, + 218, 212, 17, 206, 117, 171, 221, 137, 178, 206, 117, 171, 199, 246, 200, + 85, 206, 117, 171, 213, 2, 212, 174, 206, 117, 171, 212, 175, 206, 117, + 171, 224, 111, 224, 169, 206, 117, 171, 224, 42, 206, 117, 171, 201, 1, + 201, 109, 206, 117, 171, 209, 30, 212, 33, 206, 117, 171, 209, 30, 212, + 145, 206, 117, 171, 209, 30, 208, 23, 206, 117, 171, 233, 208, 234, 48, + 206, 117, 171, 224, 111, 246, 191, 206, 117, 171, 163, 251, 76, 206, 117, + 171, 233, 208, 218, 237, 206, 117, 171, 216, 186, 206, 117, 171, 211, + 255, 62, 206, 117, 171, 222, 199, 234, 201, 206, 117, 171, 211, 255, 252, + 138, 206, 117, 171, 211, 255, 251, 101, 206, 117, 171, 211, 255, 70, 206, + 117, 171, 211, 255, 228, 151, 206, 117, 171, 211, 255, 204, 31, 206, 117, + 171, 211, 255, 204, 29, 206, 117, 171, 211, 255, 66, 206, 117, 171, 211, + 255, 203, 182, 206, 117, 171, 215, 220, 206, 117, 242, 195, 16, 249, 103, + 206, 117, 171, 211, 255, 72, 206, 117, 171, 211, 255, 251, 221, 206, 117, + 171, 211, 255, 74, 206, 117, 171, 211, 255, 251, 177, 222, 193, 206, 117, + 171, 211, 255, 251, 177, 222, 194, 206, 117, 171, 225, 95, 206, 117, 171, + 222, 190, 206, 117, 171, 222, 191, 206, 117, 171, 222, 199, 238, 216, + 206, 117, 171, 222, 199, 206, 61, 206, 117, 171, 222, 199, 205, 101, 206, + 117, 171, 222, 199, 247, 13, 206, 117, 171, 206, 109, 206, 117, 171, 219, + 122, 206, 117, 171, 200, 79, 206, 117, 171, 237, 4, 206, 117, 17, 199, + 81, 206, 117, 17, 102, 206, 117, 17, 105, 206, 117, 17, 147, 206, 117, + 17, 149, 206, 117, 17, 164, 206, 117, 17, 187, 206, 117, 17, 210, 135, + 206, 117, 17, 192, 206, 117, 17, 219, 113, 206, 117, 171, 251, 72, 206, + 117, 171, 226, 176, 225, 75, 1, 226, 88, 225, 75, 1, 226, 179, 207, 225, + 225, 75, 1, 226, 179, 206, 246, 225, 75, 1, 219, 178, 225, 75, 1, 246, + 91, 225, 75, 1, 209, 30, 206, 246, 225, 75, 1, 218, 26, 225, 75, 1, 240, + 211, 225, 75, 1, 138, 225, 75, 1, 206, 62, 207, 225, 225, 75, 1, 206, 62, + 206, 246, 225, 75, 1, 218, 241, 225, 75, 1, 248, 124, 225, 75, 1, 215, + 106, 225, 75, 1, 215, 218, 207, 225, 225, 75, 1, 237, 14, 206, 246, 225, + 75, 1, 215, 218, 206, 246, 225, 75, 1, 237, 14, 207, 225, 225, 75, 1, + 221, 136, 225, 75, 1, 199, 245, 225, 75, 1, 224, 111, 224, 169, 225, 75, + 1, 224, 111, 224, 72, 225, 75, 1, 201, 0, 225, 75, 1, 209, 30, 207, 225, + 225, 75, 1, 233, 208, 207, 225, 225, 75, 1, 74, 225, 75, 1, 233, 208, + 206, 246, 225, 75, 238, 195, 225, 75, 22, 2, 62, 225, 75, 22, 2, 222, + 199, 227, 68, 225, 75, 22, 2, 252, 138, 225, 75, 22, 2, 251, 101, 225, + 75, 22, 2, 70, 225, 75, 22, 2, 228, 151, 225, 75, 22, 2, 200, 123, 225, + 75, 22, 2, 199, 167, 225, 75, 22, 2, 66, 225, 75, 22, 2, 203, 182, 225, + 75, 22, 2, 222, 199, 226, 71, 225, 75, 210, 162, 2, 224, 110, 225, 75, + 210, 162, 2, 218, 26, 225, 75, 22, 2, 72, 225, 75, 22, 2, 238, 234, 225, + 75, 22, 2, 74, 225, 75, 22, 2, 250, 112, 225, 75, 22, 2, 251, 176, 225, + 75, 226, 89, 194, 225, 75, 150, 222, 199, 238, 216, 225, 75, 150, 222, + 199, 206, 61, 225, 75, 150, 222, 199, 206, 15, 225, 75, 150, 222, 199, + 247, 110, 225, 75, 247, 155, 81, 225, 75, 219, 131, 225, 75, 17, 199, 81, + 225, 75, 17, 102, 225, 75, 17, 105, 225, 75, 17, 147, 225, 75, 17, 149, + 225, 75, 17, 164, 225, 75, 17, 187, 225, 75, 17, 210, 135, 225, 75, 17, + 192, 225, 75, 17, 219, 113, 225, 75, 233, 208, 218, 241, 225, 75, 233, + 208, 221, 136, 225, 75, 1, 226, 180, 235, 116, 225, 75, 1, 226, 180, 218, + 26, 79, 5, 217, 86, 79, 134, 235, 52, 200, 1, 221, 229, 205, 38, 62, 79, + 134, 235, 52, 200, 1, 221, 229, 255, 135, 213, 6, 249, 10, 178, 79, 134, + 235, 52, 200, 1, 221, 229, 255, 135, 235, 52, 205, 18, 178, 79, 134, 82, + 200, 1, 221, 229, 222, 78, 178, 79, 134, 246, 106, 200, 1, 221, 229, 210, + 121, 178, 79, 134, 247, 130, 200, 1, 221, 229, 215, 208, 210, 107, 178, + 79, 134, 200, 1, 221, 229, 205, 18, 210, 107, 178, 79, 134, 211, 231, + 210, 106, 79, 134, 248, 39, 200, 1, 221, 228, 79, 134, 248, 146, 210, 4, + 200, 1, 221, 228, 79, 134, 228, 54, 205, 17, 79, 134, 241, 143, 205, 18, + 248, 38, 79, 134, 210, 106, 79, 134, 218, 31, 210, 106, 79, 134, 205, 18, + 210, 106, 79, 134, 218, 31, 205, 18, 210, 106, 79, 134, 213, 29, 246, + 250, 208, 196, 210, 106, 79, 134, 213, 97, 235, 85, 210, 106, 79, 134, + 247, 130, 255, 139, 212, 179, 222, 77, 168, 247, 158, 79, 134, 235, 52, + 205, 17, 79, 224, 96, 2, 247, 35, 212, 178, 79, 224, 96, 2, 224, 221, + 212, 178, 79, 250, 161, 2, 210, 117, 236, 18, 255, 140, 212, 178, 79, + 250, 161, 2, 255, 137, 172, 79, 250, 161, 2, 211, 203, 205, 12, 79, 2, + 213, 192, 240, 225, 236, 17, 79, 2, 213, 192, 240, 225, 235, 118, 79, 2, + 213, 192, 240, 225, 235, 53, 79, 2, 213, 192, 220, 150, 236, 17, 79, 2, + 213, 192, 220, 150, 235, 118, 79, 2, 213, 192, 240, 225, 213, 192, 220, + 149, 79, 17, 199, 81, 79, 17, 102, 79, 17, 105, 79, 17, 147, 79, 17, 149, + 79, 17, 164, 79, 17, 187, 79, 17, 210, 135, 79, 17, 192, 79, 17, 219, + 113, 79, 17, 167, 102, 79, 17, 167, 105, 79, 17, 167, 147, 79, 17, 167, + 149, 79, 17, 167, 164, 79, 17, 167, 187, 79, 17, 167, 210, 135, 79, 17, + 167, 192, 79, 17, 167, 219, 113, 79, 17, 167, 199, 81, 79, 134, 248, 41, + 212, 178, 79, 134, 219, 244, 247, 225, 218, 42, 199, 16, 79, 134, 247, + 130, 255, 139, 212, 179, 247, 226, 221, 182, 247, 158, 79, 134, 219, 244, + 247, 225, 210, 118, 212, 178, 79, 134, 247, 9, 221, 228, 79, 134, 205, + 33, 255, 136, 79, 134, 235, 35, 212, 179, 234, 250, 79, 134, 235, 35, + 212, 179, 235, 0, 79, 134, 251, 77, 226, 197, 234, 250, 79, 134, 251, 77, + 226, 197, 235, 0, 79, 2, 200, 71, 205, 16, 79, 2, 222, 159, 205, 16, 79, + 1, 161, 79, 1, 226, 207, 79, 1, 236, 89, 79, 1, 235, 199, 79, 1, 219, + 253, 79, 1, 247, 190, 79, 1, 247, 37, 79, 1, 227, 248, 79, 1, 218, 60, + 79, 1, 204, 253, 79, 1, 204, 241, 79, 1, 241, 220, 79, 1, 241, 204, 79, + 1, 219, 21, 79, 1, 207, 36, 79, 1, 206, 122, 79, 1, 242, 58, 79, 1, 241, + 100, 79, 1, 188, 79, 1, 172, 79, 1, 215, 245, 79, 1, 249, 136, 79, 1, + 248, 200, 79, 1, 178, 79, 1, 205, 32, 79, 1, 205, 22, 79, 1, 239, 93, 79, + 1, 239, 87, 79, 1, 201, 114, 79, 1, 199, 77, 79, 1, 199, 114, 79, 1, 255, + 142, 79, 1, 183, 79, 1, 213, 252, 79, 1, 194, 79, 1, 210, 114, 79, 1, + 208, 179, 79, 1, 212, 64, 79, 1, 144, 79, 1, 62, 79, 1, 226, 29, 79, 1, + 237, 57, 213, 252, 79, 1, 226, 109, 79, 1, 212, 215, 79, 22, 2, 252, 138, + 79, 22, 2, 70, 79, 22, 2, 228, 151, 79, 22, 2, 66, 79, 22, 2, 203, 182, + 79, 22, 2, 109, 146, 79, 22, 2, 109, 212, 216, 79, 22, 2, 109, 156, 79, + 22, 2, 109, 224, 139, 79, 22, 2, 72, 79, 22, 2, 238, 255, 79, 22, 2, 74, + 79, 22, 2, 217, 63, 79, 2, 213, 12, 208, 25, 219, 254, 213, 1, 79, 2, + 213, 6, 249, 9, 79, 22, 2, 213, 105, 70, 79, 22, 2, 213, 105, 228, 151, + 79, 2, 218, 42, 199, 17, 220, 158, 242, 58, 79, 2, 209, 44, 225, 42, 79, + 134, 234, 215, 79, 134, 216, 173, 79, 2, 225, 45, 212, 178, 79, 2, 200, + 76, 212, 178, 79, 2, 225, 46, 205, 33, 247, 158, 79, 2, 222, 80, 247, + 158, 79, 2, 235, 56, 247, 159, 213, 95, 79, 2, 235, 56, 222, 70, 213, 95, + 79, 2, 228, 50, 222, 80, 247, 158, 79, 208, 12, 2, 225, 46, 205, 33, 247, + 158, 79, 208, 12, 2, 222, 80, 247, 158, 79, 208, 12, 2, 228, 50, 222, 80, + 247, 158, 79, 208, 12, 1, 161, 79, 208, 12, 1, 226, 207, 79, 208, 12, 1, + 236, 89, 79, 208, 12, 1, 235, 199, 79, 208, 12, 1, 219, 253, 79, 208, 12, + 1, 247, 190, 79, 208, 12, 1, 247, 37, 79, 208, 12, 1, 227, 248, 79, 208, + 12, 1, 218, 60, 79, 208, 12, 1, 204, 253, 79, 208, 12, 1, 204, 241, 79, + 208, 12, 1, 241, 220, 79, 208, 12, 1, 241, 204, 79, 208, 12, 1, 219, 21, + 79, 208, 12, 1, 207, 36, 79, 208, 12, 1, 206, 122, 79, 208, 12, 1, 242, + 58, 79, 208, 12, 1, 241, 100, 79, 208, 12, 1, 188, 79, 208, 12, 1, 172, + 79, 208, 12, 1, 215, 245, 79, 208, 12, 1, 249, 136, 79, 208, 12, 1, 248, + 200, 79, 208, 12, 1, 178, 79, 208, 12, 1, 205, 32, 79, 208, 12, 1, 205, + 22, 79, 208, 12, 1, 239, 93, 79, 208, 12, 1, 239, 87, 79, 208, 12, 1, + 201, 114, 79, 208, 12, 1, 199, 77, 79, 208, 12, 1, 199, 114, 79, 208, 12, + 1, 255, 142, 79, 208, 12, 1, 183, 79, 208, 12, 1, 213, 252, 79, 208, 12, + 1, 194, 79, 208, 12, 1, 210, 114, 79, 208, 12, 1, 208, 179, 79, 208, 12, + 1, 212, 64, 79, 208, 12, 1, 144, 79, 208, 12, 1, 62, 79, 208, 12, 1, 226, + 29, 79, 208, 12, 1, 237, 57, 201, 114, 79, 208, 12, 1, 237, 57, 183, 79, + 208, 12, 1, 237, 57, 213, 252, 79, 226, 16, 212, 176, 226, 207, 79, 226, + 16, 212, 176, 226, 208, 247, 226, 221, 182, 247, 158, 79, 247, 145, 2, + 80, 249, 1, 79, 247, 145, 2, 162, 249, 1, 79, 247, 145, 2, 247, 147, 206, + 199, 79, 247, 145, 2, 211, 230, 255, 141, 79, 16, 239, 152, 248, 36, 79, + 16, 213, 191, 213, 13, 79, 16, 216, 197, 236, 16, 79, 16, 213, 191, 213, + 14, 213, 97, 235, 84, 79, 16, 215, 208, 172, 79, 16, 218, 224, 248, 36, + 79, 16, 218, 224, 248, 37, 218, 31, 255, 138, 79, 16, 218, 224, 248, 37, + 235, 54, 255, 138, 79, 16, 218, 224, 248, 37, 247, 226, 255, 138, 79, 2, + 213, 192, 220, 150, 213, 192, 240, 224, 79, 2, 213, 192, 220, 150, 235, + 53, 79, 134, 248, 40, 210, 4, 235, 162, 221, 229, 213, 96, 79, 134, 221, + 138, 200, 1, 235, 162, 221, 229, 213, 96, 79, 134, 218, 31, 205, 17, 79, + 134, 82, 248, 63, 213, 3, 200, 1, 221, 229, 222, 78, 178, 79, 134, 246, + 106, 248, 63, 213, 3, 200, 1, 221, 229, 210, 121, 178, 213, 45, 207, 188, + 54, 225, 27, 207, 188, 54, 213, 45, 207, 188, 2, 3, 240, 180, 225, 27, + 207, 188, 2, 3, 240, 180, 79, 134, 225, 37, 222, 81, 212, 178, 79, 134, + 205, 125, 222, 81, 212, 178, 71, 1, 161, 71, 1, 226, 207, 71, 1, 236, 89, + 71, 1, 235, 199, 71, 1, 219, 253, 71, 1, 247, 190, 71, 1, 247, 37, 71, 1, + 227, 248, 71, 1, 227, 215, 71, 1, 218, 60, 71, 1, 218, 243, 71, 1, 204, + 253, 71, 1, 204, 241, 71, 1, 241, 220, 71, 1, 241, 204, 71, 1, 219, 21, + 71, 1, 207, 36, 71, 1, 206, 122, 71, 1, 242, 58, 71, 1, 241, 100, 71, 1, + 188, 71, 1, 172, 71, 1, 215, 245, 71, 1, 249, 136, 71, 1, 248, 200, 71, + 1, 178, 71, 1, 183, 71, 1, 213, 252, 71, 1, 194, 71, 1, 201, 114, 71, 1, + 212, 64, 71, 1, 144, 71, 1, 224, 138, 71, 1, 62, 71, 1, 210, 90, 62, 71, + 1, 70, 71, 1, 228, 151, 71, 1, 66, 71, 1, 203, 182, 71, 1, 72, 71, 1, + 221, 107, 72, 71, 1, 74, 71, 1, 250, 139, 71, 22, 2, 206, 248, 252, 138, + 71, 22, 2, 252, 138, 71, 22, 2, 70, 71, 22, 2, 228, 151, 71, 22, 2, 66, + 71, 22, 2, 203, 182, 71, 22, 2, 72, 71, 22, 2, 251, 176, 71, 22, 2, 221, + 107, 228, 151, 71, 22, 2, 221, 107, 74, 71, 22, 2, 197, 56, 71, 2, 251, + 33, 71, 2, 73, 57, 71, 2, 202, 203, 71, 2, 202, 208, 71, 2, 250, 185, 71, + 111, 2, 179, 183, 71, 111, 2, 179, 213, 252, 71, 111, 2, 179, 201, 114, + 71, 111, 2, 179, 144, 71, 1, 235, 69, 212, 64, 71, 17, 199, 81, 71, 17, + 102, 71, 17, 105, 71, 17, 147, 71, 17, 149, 71, 17, 164, 71, 17, 187, 71, + 17, 210, 135, 71, 17, 192, 71, 17, 219, 113, 71, 2, 224, 148, 211, 192, + 71, 2, 211, 192, 71, 16, 224, 105, 71, 16, 246, 64, 71, 16, 251, 197, 71, + 16, 235, 254, 71, 1, 210, 114, 71, 1, 208, 179, 71, 1, 109, 146, 71, 1, + 109, 212, 216, 71, 1, 109, 156, 71, 1, 109, 224, 139, 71, 22, 2, 109, + 146, 71, 22, 2, 109, 212, 216, 71, 22, 2, 109, 156, 71, 22, 2, 109, 224, + 139, 71, 1, 221, 107, 219, 253, 71, 1, 221, 107, 227, 215, 71, 1, 221, + 107, 249, 44, 71, 1, 221, 107, 249, 39, 71, 111, 2, 221, 107, 179, 188, + 71, 111, 2, 221, 107, 179, 178, 71, 111, 2, 221, 107, 179, 194, 71, 1, + 210, 120, 227, 44, 210, 114, 71, 22, 2, 210, 120, 227, 44, 238, 69, 71, + 150, 134, 210, 120, 227, 44, 234, 153, 71, 150, 134, 210, 120, 227, 44, + 227, 9, 215, 217, 71, 1, 201, 45, 214, 179, 227, 44, 206, 122, 71, 1, + 201, 45, 214, 179, 227, 44, 214, 185, 71, 22, 2, 201, 45, 214, 179, 227, + 44, 238, 69, 71, 22, 2, 201, 45, 214, 179, 227, 44, 204, 31, 71, 2, 201, + 45, 214, 179, 227, 44, 205, 173, 71, 2, 201, 45, 214, 179, 227, 44, 205, + 172, 71, 2, 201, 45, 214, 179, 227, 44, 205, 171, 71, 2, 201, 45, 214, + 179, 227, 44, 205, 170, 71, 2, 201, 45, 214, 179, 227, 44, 205, 169, 71, + 1, 239, 12, 214, 179, 227, 44, 219, 21, 71, 1, 239, 12, 214, 179, 227, + 44, 199, 174, 71, 1, 239, 12, 214, 179, 227, 44, 235, 164, 71, 22, 2, + 236, 11, 227, 44, 70, 71, 22, 2, 227, 14, 217, 121, 71, 22, 2, 227, 14, + 66, 71, 22, 2, 227, 14, 238, 255, 71, 1, 210, 90, 161, 71, 1, 210, 90, + 226, 207, 71, 1, 210, 90, 236, 89, 71, 1, 210, 90, 247, 190, 71, 1, 210, + 90, 199, 114, 71, 1, 210, 90, 218, 60, 71, 1, 210, 90, 242, 58, 71, 1, + 210, 90, 188, 71, 1, 210, 90, 215, 245, 71, 1, 210, 90, 237, 195, 71, 1, + 210, 90, 249, 136, 71, 1, 210, 90, 206, 122, 71, 1, 210, 90, 144, 71, + 111, 2, 210, 90, 179, 201, 114, 71, 22, 2, 210, 90, 252, 138, 71, 22, 2, + 210, 90, 72, 71, 22, 2, 210, 90, 197, 56, 71, 22, 2, 210, 90, 47, 200, + 123, 71, 2, 210, 90, 205, 172, 71, 2, 210, 90, 205, 171, 71, 2, 210, 90, + 205, 169, 71, 2, 210, 90, 205, 168, 71, 2, 210, 90, 243, 6, 205, 172, 71, + 2, 210, 90, 243, 6, 205, 171, 71, 2, 210, 90, 243, 6, 238, 182, 205, 174, + 71, 1, 212, 160, 216, 181, 237, 195, 71, 2, 212, 160, 216, 181, 205, 169, + 71, 210, 90, 17, 199, 81, 71, 210, 90, 17, 102, 71, 210, 90, 17, 105, 71, + 210, 90, 17, 147, 71, 210, 90, 17, 149, 71, 210, 90, 17, 164, 71, 210, + 90, 17, 187, 71, 210, 90, 17, 210, 135, 71, 210, 90, 17, 192, 71, 210, + 90, 17, 219, 113, 71, 2, 226, 200, 205, 173, 71, 2, 226, 200, 205, 171, + 71, 22, 2, 251, 163, 62, 71, 22, 2, 251, 163, 251, 176, 71, 16, 210, 90, + 102, 71, 16, 210, 90, 238, 42, 118, 6, 1, 251, 85, 118, 6, 1, 249, 88, + 118, 6, 1, 236, 59, 118, 6, 1, 240, 190, 118, 6, 1, 238, 179, 118, 6, 1, + 202, 217, 118, 6, 1, 199, 84, 118, 6, 1, 206, 244, 118, 6, 1, 228, 117, + 118, 6, 1, 227, 68, 118, 6, 1, 225, 65, 118, 6, 1, 222, 180, 118, 6, 1, + 220, 125, 118, 6, 1, 217, 78, 118, 6, 1, 216, 130, 118, 6, 1, 199, 73, + 118, 6, 1, 213, 234, 118, 6, 1, 212, 13, 118, 6, 1, 206, 232, 118, 6, 1, + 204, 5, 118, 6, 1, 215, 237, 118, 6, 1, 226, 195, 118, 6, 1, 235, 190, + 118, 6, 1, 214, 144, 118, 6, 1, 210, 21, 118, 6, 1, 246, 223, 118, 6, 1, + 247, 158, 118, 6, 1, 227, 198, 118, 6, 1, 246, 162, 118, 6, 1, 247, 21, + 118, 6, 1, 200, 179, 118, 6, 1, 227, 212, 118, 6, 1, 234, 230, 118, 6, 1, + 234, 139, 118, 6, 1, 234, 69, 118, 6, 1, 201, 64, 118, 6, 1, 234, 166, + 118, 6, 1, 233, 203, 118, 6, 1, 199, 247, 118, 6, 1, 251, 210, 118, 1, + 251, 85, 118, 1, 249, 88, 118, 1, 236, 59, 118, 1, 240, 190, 118, 1, 238, + 179, 118, 1, 202, 217, 118, 1, 199, 84, 118, 1, 206, 244, 118, 1, 228, + 117, 118, 1, 227, 68, 118, 1, 225, 65, 118, 1, 222, 180, 118, 1, 220, + 125, 118, 1, 217, 78, 118, 1, 216, 130, 118, 1, 199, 73, 118, 1, 213, + 234, 118, 1, 212, 13, 118, 1, 206, 232, 118, 1, 204, 5, 118, 1, 215, 237, + 118, 1, 226, 195, 118, 1, 235, 190, 118, 1, 214, 144, 118, 1, 210, 21, + 118, 1, 246, 223, 118, 1, 247, 158, 118, 1, 227, 198, 118, 1, 246, 162, + 118, 1, 247, 21, 118, 1, 200, 179, 118, 1, 227, 212, 118, 1, 234, 230, + 118, 1, 234, 139, 118, 1, 234, 69, 118, 1, 201, 64, 118, 1, 234, 166, + 118, 1, 233, 203, 118, 1, 237, 112, 118, 1, 199, 247, 118, 1, 238, 197, + 118, 1, 204, 185, 236, 59, 118, 1, 251, 171, 118, 216, 128, 210, 154, 67, + 1, 118, 220, 125, 118, 1, 251, 210, 118, 1, 234, 165, 54, 118, 1, 225, + 167, 54, 29, 129, 226, 121, 29, 129, 208, 171, 29, 129, 219, 143, 29, + 129, 205, 253, 29, 129, 208, 160, 29, 129, 213, 78, 29, 129, 221, 197, + 29, 129, 215, 190, 29, 129, 208, 168, 29, 129, 209, 129, 29, 129, 208, + 165, 29, 129, 228, 174, 29, 129, 246, 168, 29, 129, 208, 175, 29, 129, + 246, 232, 29, 129, 226, 183, 29, 129, 206, 80, 29, 129, 215, 227, 29, + 129, 234, 66, 29, 129, 219, 139, 29, 129, 208, 169, 29, 129, 219, 133, + 29, 129, 219, 137, 29, 129, 205, 250, 29, 129, 213, 66, 29, 129, 208, + 167, 29, 129, 213, 76, 29, 129, 227, 50, 29, 129, 221, 190, 29, 129, 227, + 53, 29, 129, 215, 185, 29, 129, 215, 183, 29, 129, 215, 171, 29, 129, + 215, 179, 29, 129, 215, 177, 29, 129, 215, 174, 29, 129, 215, 176, 29, + 129, 215, 173, 29, 129, 215, 178, 29, 129, 215, 188, 29, 129, 215, 189, + 29, 129, 215, 172, 29, 129, 215, 182, 29, 129, 227, 51, 29, 129, 227, 49, + 29, 129, 209, 122, 29, 129, 209, 120, 29, 129, 209, 112, 29, 129, 209, + 115, 29, 129, 209, 121, 29, 129, 209, 117, 29, 129, 209, 116, 29, 129, + 209, 114, 29, 129, 209, 125, 29, 129, 209, 127, 29, 129, 209, 128, 29, + 129, 209, 123, 29, 129, 209, 113, 29, 129, 209, 118, 29, 129, 209, 126, + 29, 129, 246, 214, 29, 129, 246, 212, 29, 129, 247, 48, 29, 129, 247, 46, + 29, 129, 216, 146, 29, 129, 228, 169, 29, 129, 228, 160, 29, 129, 228, + 168, 29, 129, 228, 165, 29, 129, 228, 163, 29, 129, 228, 167, 29, 129, + 208, 172, 29, 129, 228, 172, 29, 129, 228, 173, 29, 129, 228, 161, 29, + 129, 228, 166, 29, 129, 200, 28, 29, 129, 246, 167, 29, 129, 246, 215, + 29, 129, 246, 213, 29, 129, 247, 49, 29, 129, 247, 47, 29, 129, 246, 230, + 29, 129, 246, 231, 29, 129, 246, 216, 29, 129, 247, 50, 29, 129, 215, + 225, 29, 129, 227, 52, 29, 129, 208, 173, 29, 129, 200, 34, 29, 129, 226, + 112, 29, 129, 219, 135, 29, 129, 219, 141, 29, 129, 219, 140, 29, 129, + 205, 247, 29, 129, 237, 93, 29, 181, 237, 93, 29, 181, 62, 29, 181, 251, + 221, 29, 181, 183, 29, 181, 200, 98, 29, 181, 238, 142, 29, 181, 72, 29, + 181, 200, 38, 29, 181, 200, 51, 29, 181, 74, 29, 181, 201, 114, 29, 181, + 201, 110, 29, 181, 217, 121, 29, 181, 199, 245, 29, 181, 66, 29, 181, + 201, 50, 29, 181, 201, 64, 29, 181, 201, 31, 29, 181, 199, 211, 29, 181, + 238, 69, 29, 181, 200, 9, 29, 181, 70, 29, 181, 255, 133, 29, 181, 255, + 132, 29, 181, 200, 112, 29, 181, 200, 110, 29, 181, 238, 140, 29, 181, + 238, 139, 29, 181, 238, 141, 29, 181, 200, 37, 29, 181, 200, 36, 29, 181, + 217, 230, 29, 181, 217, 231, 29, 181, 217, 224, 29, 181, 217, 229, 29, + 181, 217, 227, 29, 181, 199, 239, 29, 181, 199, 238, 29, 181, 199, 237, + 29, 181, 199, 240, 29, 181, 199, 241, 29, 181, 204, 104, 29, 181, 204, + 103, 29, 181, 204, 101, 29, 181, 204, 97, 29, 181, 204, 98, 29, 181, 199, + 210, 29, 181, 199, 207, 29, 181, 199, 208, 29, 181, 199, 202, 29, 181, + 199, 203, 29, 181, 199, 204, 29, 181, 199, 206, 29, 181, 238, 63, 29, + 181, 238, 65, 29, 181, 200, 8, 29, 181, 233, 18, 29, 181, 233, 10, 29, + 181, 233, 13, 29, 181, 233, 11, 29, 181, 233, 15, 29, 181, 233, 17, 29, + 181, 250, 245, 29, 181, 250, 242, 29, 181, 250, 240, 29, 181, 250, 241, + 29, 181, 208, 176, 29, 181, 255, 134, 29, 181, 200, 111, 29, 181, 200, + 35, 29, 181, 217, 226, 29, 181, 217, 225, 29, 110, 226, 121, 29, 110, + 208, 171, 29, 110, 226, 114, 29, 110, 219, 143, 29, 110, 219, 141, 29, + 110, 219, 140, 29, 110, 205, 253, 29, 110, 213, 78, 29, 110, 213, 73, 29, + 110, 213, 70, 29, 110, 213, 63, 29, 110, 213, 58, 29, 110, 213, 53, 29, + 110, 213, 64, 29, 110, 213, 76, 29, 110, 221, 197, 29, 110, 215, 190, 29, + 110, 215, 179, 29, 110, 209, 129, 29, 110, 208, 165, 29, 110, 228, 174, + 29, 110, 246, 168, 29, 110, 246, 232, 29, 110, 226, 183, 29, 110, 206, + 80, 29, 110, 215, 227, 29, 110, 234, 66, 29, 110, 226, 115, 29, 110, 226, + 113, 29, 110, 219, 139, 29, 110, 219, 133, 29, 110, 219, 135, 29, 110, + 219, 138, 29, 110, 219, 134, 29, 110, 205, 250, 29, 110, 205, 247, 29, + 110, 213, 71, 29, 110, 213, 66, 29, 110, 213, 52, 29, 110, 213, 51, 29, + 110, 208, 167, 29, 110, 213, 68, 29, 110, 213, 67, 29, 110, 213, 60, 29, + 110, 213, 62, 29, 110, 213, 75, 29, 110, 213, 55, 29, 110, 213, 65, 29, + 110, 213, 74, 29, 110, 213, 50, 29, 110, 221, 193, 29, 110, 221, 188, 29, + 110, 221, 190, 29, 110, 221, 187, 29, 110, 221, 185, 29, 110, 221, 191, + 29, 110, 221, 196, 29, 110, 221, 194, 29, 110, 227, 53, 29, 110, 215, + 181, 29, 110, 215, 182, 29, 110, 215, 187, 29, 110, 227, 51, 29, 110, + 209, 122, 29, 110, 209, 112, 29, 110, 209, 115, 29, 110, 209, 117, 29, + 110, 216, 146, 29, 110, 228, 169, 29, 110, 228, 162, 29, 110, 208, 172, + 29, 110, 228, 170, 29, 110, 200, 28, 29, 110, 200, 24, 29, 110, 200, 25, + 29, 110, 215, 225, 29, 110, 227, 52, 29, 110, 234, 64, 29, 110, 234, 62, + 29, 110, 234, 65, 29, 110, 234, 63, 29, 110, 200, 34, 29, 110, 226, 117, + 29, 110, 226, 116, 29, 110, 226, 120, 29, 110, 226, 118, 29, 110, 226, + 119, 29, 110, 208, 169, 34, 5, 144, 34, 5, 233, 97, 34, 5, 234, 75, 34, + 5, 234, 233, 34, 5, 234, 120, 34, 5, 234, 139, 34, 5, 233, 207, 34, 5, + 233, 206, 34, 5, 194, 34, 5, 224, 42, 34, 5, 224, 210, 34, 5, 225, 175, + 34, 5, 225, 32, 34, 5, 225, 40, 34, 5, 224, 110, 34, 5, 224, 10, 34, 5, + 234, 84, 34, 5, 234, 78, 34, 5, 234, 80, 34, 5, 234, 83, 34, 5, 234, 81, + 34, 5, 234, 82, 34, 5, 234, 79, 34, 5, 234, 77, 34, 5, 178, 34, 5, 221, + 41, 34, 5, 221, 211, 34, 5, 222, 233, 34, 5, 222, 64, 34, 5, 222, 76, 34, + 5, 221, 136, 34, 5, 220, 231, 34, 5, 207, 94, 34, 5, 207, 88, 34, 5, 207, + 90, 34, 5, 207, 93, 34, 5, 207, 91, 34, 5, 207, 92, 34, 5, 207, 89, 34, + 5, 207, 87, 34, 5, 213, 252, 34, 5, 212, 175, 34, 5, 213, 88, 34, 5, 213, + 248, 34, 5, 213, 167, 34, 5, 213, 190, 34, 5, 213, 1, 34, 5, 212, 140, + 34, 5, 212, 64, 34, 5, 208, 24, 34, 5, 209, 182, 34, 5, 212, 61, 34, 5, + 211, 190, 34, 5, 211, 202, 34, 5, 209, 29, 34, 5, 207, 186, 34, 5, 210, + 114, 34, 5, 209, 220, 34, 5, 210, 33, 34, 5, 210, 109, 34, 5, 210, 63, + 34, 5, 210, 65, 34, 5, 210, 8, 34, 5, 209, 200, 34, 5, 214, 159, 34, 5, + 214, 97, 34, 5, 214, 121, 34, 5, 214, 158, 34, 5, 214, 138, 34, 5, 214, + 139, 34, 5, 214, 109, 34, 5, 214, 108, 34, 5, 214, 51, 34, 5, 214, 47, + 34, 5, 214, 50, 34, 5, 214, 48, 34, 5, 214, 49, 34, 5, 214, 135, 34, 5, + 214, 127, 34, 5, 214, 130, 34, 5, 214, 134, 34, 5, 214, 131, 34, 5, 214, + 132, 34, 5, 214, 129, 34, 5, 214, 126, 34, 5, 214, 122, 34, 5, 214, 125, + 34, 5, 214, 123, 34, 5, 214, 124, 34, 5, 249, 136, 34, 5, 248, 36, 34, 5, + 248, 188, 34, 5, 249, 134, 34, 5, 248, 252, 34, 5, 249, 8, 34, 5, 248, + 124, 34, 5, 247, 240, 34, 5, 203, 90, 34, 5, 201, 166, 34, 5, 202, 234, + 34, 5, 203, 89, 34, 5, 203, 54, 34, 5, 203, 59, 34, 5, 202, 193, 34, 5, + 201, 157, 34, 5, 207, 36, 34, 5, 204, 215, 34, 5, 206, 15, 34, 5, 207, + 32, 34, 5, 206, 190, 34, 5, 206, 201, 34, 5, 138, 34, 5, 204, 170, 34, 5, + 247, 190, 34, 5, 242, 214, 34, 5, 246, 173, 34, 5, 247, 189, 34, 5, 247, + 68, 34, 5, 247, 76, 34, 5, 246, 91, 34, 5, 242, 176, 34, 5, 200, 181, 34, + 5, 200, 151, 34, 5, 200, 169, 34, 5, 200, 180, 34, 5, 200, 174, 34, 5, + 200, 175, 34, 5, 200, 159, 34, 5, 200, 158, 34, 5, 200, 145, 34, 5, 200, + 141, 34, 5, 200, 144, 34, 5, 200, 142, 34, 5, 200, 143, 34, 5, 188, 34, + 5, 218, 133, 34, 5, 219, 150, 34, 5, 220, 157, 34, 5, 220, 29, 34, 5, + 220, 34, 34, 5, 218, 241, 34, 5, 218, 69, 34, 5, 218, 60, 34, 5, 218, 19, + 34, 5, 218, 41, 34, 5, 218, 59, 34, 5, 218, 49, 34, 5, 218, 50, 34, 5, + 218, 26, 34, 5, 218, 9, 34, 5, 235, 123, 62, 34, 5, 235, 123, 66, 34, 5, + 235, 123, 70, 34, 5, 235, 123, 252, 138, 34, 5, 235, 123, 238, 255, 34, + 5, 235, 123, 72, 34, 5, 235, 123, 74, 34, 5, 235, 123, 201, 114, 34, 5, + 161, 34, 5, 226, 15, 34, 5, 226, 163, 34, 5, 227, 105, 34, 5, 227, 5, 34, + 5, 227, 8, 34, 5, 226, 88, 34, 5, 226, 87, 34, 5, 225, 229, 34, 5, 225, + 222, 34, 5, 225, 228, 34, 5, 225, 223, 34, 5, 225, 224, 34, 5, 225, 215, + 34, 5, 225, 209, 34, 5, 225, 211, 34, 5, 225, 214, 34, 5, 225, 212, 34, + 5, 225, 213, 34, 5, 225, 210, 34, 5, 225, 208, 34, 5, 225, 204, 34, 5, + 225, 207, 34, 5, 225, 205, 34, 5, 225, 206, 34, 5, 201, 114, 34, 5, 200, + 216, 34, 5, 201, 31, 34, 5, 201, 113, 34, 5, 201, 57, 34, 5, 201, 64, 34, + 5, 201, 0, 34, 5, 200, 255, 34, 5, 215, 236, 62, 34, 5, 215, 236, 66, 34, + 5, 215, 236, 70, 34, 5, 215, 236, 252, 138, 34, 5, 215, 236, 238, 255, + 34, 5, 215, 236, 72, 34, 5, 215, 236, 74, 34, 5, 199, 114, 34, 5, 199, 3, + 34, 5, 199, 36, 34, 5, 199, 112, 34, 5, 199, 87, 34, 5, 199, 89, 34, 5, + 199, 14, 34, 5, 198, 246, 34, 5, 199, 77, 34, 5, 199, 54, 34, 5, 199, 63, + 34, 5, 199, 76, 34, 5, 199, 67, 34, 5, 199, 68, 34, 5, 199, 60, 34, 5, + 199, 45, 34, 5, 183, 34, 5, 199, 211, 34, 5, 200, 9, 34, 5, 200, 109, 34, + 5, 200, 48, 34, 5, 200, 51, 34, 5, 199, 245, 34, 5, 199, 236, 34, 5, 242, + 58, 34, 5, 239, 137, 34, 5, 241, 76, 34, 5, 242, 57, 34, 5, 241, 161, 34, + 5, 241, 175, 34, 5, 240, 211, 34, 5, 239, 104, 34, 5, 241, 220, 34, 5, + 241, 185, 34, 5, 241, 197, 34, 5, 241, 219, 34, 5, 241, 207, 34, 5, 241, + 208, 34, 5, 241, 190, 34, 5, 241, 176, 34, 5, 227, 248, 34, 5, 227, 147, + 34, 5, 227, 207, 34, 5, 227, 247, 34, 5, 227, 225, 34, 5, 227, 227, 34, + 5, 227, 166, 34, 5, 227, 126, 34, 5, 236, 89, 34, 5, 235, 50, 34, 5, 235, + 161, 34, 5, 236, 86, 34, 5, 236, 7, 34, 5, 236, 15, 34, 5, 235, 116, 34, + 5, 235, 115, 34, 5, 235, 10, 34, 5, 235, 6, 34, 5, 235, 9, 34, 5, 235, 7, + 34, 5, 235, 8, 34, 5, 235, 235, 34, 5, 235, 215, 34, 5, 235, 225, 34, 5, + 235, 234, 34, 5, 235, 229, 34, 5, 235, 230, 34, 5, 235, 219, 34, 5, 235, + 204, 34, 5, 206, 122, 34, 5, 206, 35, 34, 5, 206, 84, 34, 5, 206, 121, + 34, 5, 206, 104, 34, 5, 206, 106, 34, 5, 206, 61, 34, 5, 206, 26, 34, 5, + 247, 37, 34, 5, 246, 192, 34, 5, 246, 236, 34, 5, 247, 36, 34, 5, 247, 4, + 34, 5, 247, 8, 34, 5, 246, 210, 34, 5, 246, 181, 34, 5, 215, 245, 34, 5, + 215, 210, 34, 5, 215, 229, 34, 5, 215, 244, 34, 5, 215, 231, 34, 5, 215, + 232, 34, 5, 215, 217, 34, 5, 215, 206, 34, 5, 205, 32, 34, 5, 205, 5, 34, + 5, 205, 11, 34, 5, 205, 31, 34, 5, 205, 25, 34, 5, 205, 26, 34, 5, 205, + 9, 34, 5, 205, 3, 34, 5, 204, 113, 34, 5, 204, 105, 34, 5, 204, 109, 34, + 5, 204, 112, 34, 5, 204, 110, 34, 5, 204, 111, 34, 5, 204, 107, 34, 5, + 204, 106, 34, 5, 237, 195, 34, 5, 236, 189, 34, 5, 237, 112, 34, 5, 237, + 194, 34, 5, 237, 140, 34, 5, 237, 147, 34, 5, 237, 13, 34, 5, 236, 167, + 34, 5, 172, 34, 5, 214, 224, 34, 5, 215, 204, 34, 5, 216, 210, 34, 5, + 216, 61, 34, 5, 216, 73, 34, 5, 215, 106, 34, 5, 214, 185, 34, 5, 212, + 130, 34, 5, 220, 220, 34, 5, 236, 161, 34, 38, 236, 3, 26, 22, 225, 2, + 81, 34, 38, 22, 225, 2, 81, 34, 38, 236, 3, 81, 34, 211, 193, 81, 34, + 200, 237, 34, 236, 183, 208, 76, 34, 246, 70, 34, 210, 167, 34, 246, 79, + 34, 215, 25, 246, 79, 34, 214, 79, 81, 34, 216, 128, 210, 154, 34, 17, + 102, 34, 17, 105, 34, 17, 147, 34, 17, 149, 34, 17, 164, 34, 17, 187, 34, + 17, 210, 135, 34, 17, 192, 34, 17, 219, 113, 34, 41, 206, 166, 34, 41, + 204, 159, 34, 41, 206, 67, 34, 41, 236, 235, 34, 41, 237, 104, 34, 41, + 209, 92, 34, 41, 210, 129, 34, 41, 238, 222, 34, 41, 219, 108, 34, 41, + 233, 82, 34, 41, 206, 167, 206, 50, 34, 5, 211, 198, 220, 231, 34, 5, + 220, 227, 34, 5, 220, 228, 34, 5, 220, 229, 34, 5, 211, 198, 247, 240, + 34, 5, 247, 237, 34, 5, 247, 238, 34, 5, 247, 239, 34, 5, 211, 198, 236, + 167, 34, 5, 236, 163, 34, 5, 236, 164, 34, 5, 236, 165, 34, 5, 211, 198, + 214, 185, 34, 5, 214, 181, 34, 5, 214, 182, 34, 5, 214, 183, 34, 205, + 175, 134, 199, 248, 34, 205, 175, 134, 241, 121, 34, 205, 175, 134, 213, + 32, 34, 205, 175, 134, 209, 250, 213, 32, 34, 205, 175, 134, 241, 50, 34, + 205, 175, 134, 226, 242, 34, 205, 175, 134, 246, 218, 34, 205, 175, 134, + 234, 71, 34, 205, 175, 134, 241, 120, 34, 205, 175, 134, 225, 243, 91, 1, + 62, 91, 1, 72, 91, 1, 70, 91, 1, 74, 91, 1, 66, 91, 1, 203, 168, 91, 1, + 236, 89, 91, 1, 161, 91, 1, 236, 15, 91, 1, 235, 161, 91, 1, 235, 116, + 91, 1, 235, 50, 91, 1, 235, 12, 91, 1, 144, 91, 1, 234, 139, 91, 1, 234, + 75, 91, 1, 233, 207, 91, 1, 233, 97, 91, 1, 233, 69, 91, 1, 194, 91, 1, + 225, 40, 91, 1, 224, 210, 91, 1, 224, 110, 91, 1, 224, 42, 91, 1, 224, + 11, 91, 1, 178, 91, 1, 222, 76, 91, 1, 221, 211, 91, 1, 221, 136, 91, 1, + 221, 41, 91, 1, 188, 91, 1, 233, 231, 91, 1, 220, 144, 91, 1, 220, 34, + 91, 1, 219, 150, 91, 1, 218, 241, 91, 1, 218, 133, 91, 1, 218, 71, 91, 1, + 214, 96, 91, 1, 214, 82, 91, 1, 214, 75, 91, 1, 214, 66, 91, 1, 214, 55, + 91, 1, 214, 53, 91, 1, 212, 64, 91, 1, 212, 122, 91, 1, 211, 202, 91, 1, + 209, 182, 91, 1, 209, 29, 91, 1, 208, 24, 91, 1, 207, 191, 91, 1, 242, + 58, 91, 1, 207, 36, 91, 1, 241, 175, 91, 1, 206, 201, 91, 1, 241, 76, 91, + 1, 206, 15, 91, 1, 240, 211, 91, 1, 239, 137, 91, 1, 239, 107, 91, 1, + 240, 222, 91, 1, 205, 203, 91, 1, 205, 202, 91, 1, 205, 191, 91, 1, 205, + 190, 91, 1, 205, 189, 91, 1, 205, 188, 91, 1, 205, 32, 91, 1, 205, 26, + 91, 1, 205, 11, 91, 1, 205, 9, 91, 1, 205, 5, 91, 1, 205, 4, 91, 1, 201, + 114, 91, 1, 201, 64, 91, 1, 201, 31, 91, 1, 201, 0, 91, 1, 200, 216, 91, + 1, 200, 203, 91, 1, 183, 91, 1, 200, 51, 91, 1, 200, 9, 91, 1, 199, 245, + 91, 1, 199, 211, 91, 1, 199, 175, 91, 1, 220, 238, 91, 4, 1, 200, 51, 91, + 4, 1, 200, 9, 91, 4, 1, 199, 245, 91, 4, 1, 199, 211, 91, 4, 1, 199, 175, + 91, 4, 1, 220, 238, 20, 21, 233, 33, 20, 21, 72, 20, 21, 252, 102, 20, + 21, 70, 20, 21, 228, 151, 20, 21, 74, 20, 21, 217, 63, 20, 21, 200, 122, + 217, 63, 20, 21, 89, 238, 255, 20, 21, 89, 70, 20, 21, 62, 20, 21, 252, + 138, 20, 21, 201, 64, 20, 21, 201, 46, 201, 64, 20, 21, 201, 31, 20, 21, + 201, 46, 201, 31, 20, 21, 201, 20, 20, 21, 201, 46, 201, 20, 20, 21, 201, + 0, 20, 21, 201, 46, 201, 0, 20, 21, 200, 244, 20, 21, 201, 46, 200, 244, + 20, 21, 220, 119, 200, 244, 20, 21, 201, 114, 20, 21, 201, 46, 201, 114, + 20, 21, 201, 113, 20, 21, 201, 46, 201, 113, 20, 21, 220, 119, 201, 113, + 20, 21, 251, 176, 20, 21, 200, 122, 201, 147, 20, 21, 235, 123, 208, 76, + 20, 21, 47, 169, 20, 21, 47, 235, 73, 20, 21, 47, 248, 93, 167, 213, 26, + 20, 21, 47, 205, 158, 167, 213, 26, 20, 21, 47, 51, 167, 213, 26, 20, 21, + 47, 213, 26, 20, 21, 47, 53, 169, 20, 21, 47, 53, 209, 250, 83, 208, 34, + 20, 21, 47, 101, 240, 182, 20, 21, 47, 209, 250, 233, 177, 97, 20, 21, + 47, 215, 113, 20, 21, 47, 127, 207, 17, 20, 21, 238, 179, 20, 21, 228, + 117, 20, 21, 217, 78, 20, 21, 251, 85, 20, 21, 216, 73, 20, 21, 216, 208, + 20, 21, 215, 204, 20, 21, 215, 166, 20, 21, 215, 106, 20, 21, 215, 81, + 20, 21, 200, 122, 215, 81, 20, 21, 89, 234, 120, 20, 21, 89, 234, 75, 20, + 21, 172, 20, 21, 216, 210, 20, 21, 214, 183, 20, 21, 201, 46, 214, 183, + 20, 21, 214, 181, 20, 21, 201, 46, 214, 181, 20, 21, 214, 180, 20, 21, + 201, 46, 214, 180, 20, 21, 214, 178, 20, 21, 201, 46, 214, 178, 20, 21, + 214, 177, 20, 21, 201, 46, 214, 177, 20, 21, 214, 185, 20, 21, 201, 46, + 214, 185, 20, 21, 214, 184, 20, 21, 201, 46, 214, 184, 20, 21, 200, 122, + 214, 184, 20, 21, 216, 226, 20, 21, 201, 46, 216, 226, 20, 21, 89, 234, + 247, 20, 21, 206, 201, 20, 21, 207, 30, 20, 21, 206, 15, 20, 21, 205, + 255, 20, 21, 138, 20, 21, 205, 161, 20, 21, 200, 122, 205, 161, 20, 21, + 89, 241, 161, 20, 21, 89, 241, 76, 20, 21, 207, 36, 20, 21, 207, 32, 20, + 21, 204, 168, 20, 21, 201, 46, 204, 168, 20, 21, 204, 147, 20, 21, 201, + 46, 204, 147, 20, 21, 204, 146, 20, 21, 201, 46, 204, 146, 20, 21, 105, + 20, 21, 201, 46, 105, 20, 21, 204, 137, 20, 21, 201, 46, 204, 137, 20, + 21, 204, 170, 20, 21, 201, 46, 204, 170, 20, 21, 204, 169, 20, 21, 201, + 46, 204, 169, 20, 21, 220, 119, 204, 169, 20, 21, 207, 83, 20, 21, 204, + 248, 20, 21, 204, 232, 20, 21, 204, 230, 20, 21, 204, 253, 20, 21, 227, + 8, 20, 21, 227, 100, 20, 21, 226, 163, 20, 21, 226, 150, 20, 21, 226, 88, + 20, 21, 226, 68, 20, 21, 200, 122, 226, 68, 20, 21, 161, 20, 21, 227, + 105, 20, 21, 225, 224, 20, 21, 201, 46, 225, 224, 20, 21, 225, 222, 20, + 21, 201, 46, 225, 222, 20, 21, 225, 221, 20, 21, 201, 46, 225, 221, 20, + 21, 225, 219, 20, 21, 201, 46, 225, 219, 20, 21, 225, 218, 20, 21, 201, + 46, 225, 218, 20, 21, 225, 229, 20, 21, 201, 46, 225, 229, 20, 21, 225, + 228, 20, 21, 201, 46, 225, 228, 20, 21, 220, 119, 225, 228, 20, 21, 227, + 118, 20, 21, 225, 230, 20, 21, 208, 253, 226, 254, 20, 21, 208, 253, 226, + 151, 20, 21, 208, 253, 226, 82, 20, 21, 208, 253, 227, 84, 20, 21, 247, + 76, 20, 21, 247, 188, 20, 21, 246, 173, 20, 21, 246, 163, 20, 21, 246, + 91, 20, 21, 243, 30, 20, 21, 200, 122, 243, 30, 20, 21, 247, 190, 20, 21, + 247, 189, 20, 21, 242, 174, 20, 21, 201, 46, 242, 174, 20, 21, 242, 172, + 20, 21, 201, 46, 242, 172, 20, 21, 242, 171, 20, 21, 201, 46, 242, 171, + 20, 21, 242, 170, 20, 21, 201, 46, 242, 170, 20, 21, 242, 169, 20, 21, + 201, 46, 242, 169, 20, 21, 242, 176, 20, 21, 201, 46, 242, 176, 20, 21, + 242, 175, 20, 21, 201, 46, 242, 175, 20, 21, 220, 119, 242, 175, 20, 21, + 247, 223, 20, 21, 211, 232, 206, 124, 20, 21, 222, 76, 20, 21, 222, 232, + 20, 21, 221, 211, 20, 21, 221, 181, 20, 21, 221, 136, 20, 21, 221, 87, + 20, 21, 200, 122, 221, 87, 20, 21, 178, 20, 21, 222, 233, 20, 21, 220, + 229, 20, 21, 201, 46, 220, 229, 20, 21, 220, 227, 20, 21, 201, 46, 220, + 227, 20, 21, 220, 226, 20, 21, 201, 46, 220, 226, 20, 21, 220, 225, 20, + 21, 201, 46, 220, 225, 20, 21, 220, 224, 20, 21, 201, 46, 220, 224, 20, + 21, 220, 231, 20, 21, 201, 46, 220, 231, 20, 21, 220, 230, 20, 21, 201, + 46, 220, 230, 20, 21, 220, 119, 220, 230, 20, 21, 223, 243, 20, 21, 201, + 46, 223, 243, 20, 21, 221, 215, 20, 21, 250, 153, 223, 243, 20, 21, 211, + 232, 223, 243, 20, 21, 220, 34, 20, 21, 220, 156, 20, 21, 219, 150, 20, + 21, 219, 125, 20, 21, 218, 241, 20, 21, 218, 229, 20, 21, 200, 122, 218, + 229, 20, 21, 188, 20, 21, 220, 157, 20, 21, 218, 67, 20, 21, 201, 46, + 218, 67, 20, 21, 218, 69, 20, 21, 201, 46, 218, 69, 20, 21, 218, 68, 20, + 21, 201, 46, 218, 68, 20, 21, 220, 119, 218, 68, 20, 21, 220, 214, 20, + 21, 89, 219, 255, 20, 21, 219, 155, 20, 21, 225, 40, 20, 21, 225, 174, + 20, 21, 224, 210, 20, 21, 224, 192, 20, 21, 224, 110, 20, 21, 224, 78, + 20, 21, 200, 122, 224, 78, 20, 21, 194, 20, 21, 225, 175, 20, 21, 224, 8, + 20, 21, 201, 46, 224, 8, 20, 21, 224, 7, 20, 21, 201, 46, 224, 7, 20, 21, + 224, 6, 20, 21, 201, 46, 224, 6, 20, 21, 224, 5, 20, 21, 201, 46, 224, 5, + 20, 21, 224, 4, 20, 21, 201, 46, 224, 4, 20, 21, 224, 10, 20, 21, 201, + 46, 224, 10, 20, 21, 224, 9, 20, 21, 201, 46, 224, 9, 20, 21, 156, 20, + 21, 201, 46, 156, 20, 21, 179, 156, 20, 21, 211, 202, 20, 21, 212, 59, + 20, 21, 209, 182, 20, 21, 209, 161, 20, 21, 209, 29, 20, 21, 209, 10, 20, + 21, 200, 122, 209, 10, 20, 21, 212, 64, 20, 21, 212, 61, 20, 21, 207, + 182, 20, 21, 201, 46, 207, 182, 20, 21, 207, 176, 20, 21, 201, 46, 207, + 176, 20, 21, 207, 175, 20, 21, 201, 46, 207, 175, 20, 21, 207, 171, 20, + 21, 201, 46, 207, 171, 20, 21, 207, 170, 20, 21, 201, 46, 207, 170, 20, + 21, 207, 186, 20, 21, 201, 46, 207, 186, 20, 21, 207, 185, 20, 21, 201, + 46, 207, 185, 20, 21, 220, 119, 207, 185, 20, 21, 212, 122, 20, 21, 250, + 153, 212, 122, 20, 21, 207, 187, 20, 21, 248, 141, 212, 122, 20, 21, 221, + 80, 209, 88, 20, 21, 220, 119, 209, 79, 20, 21, 220, 119, 212, 120, 20, + 21, 220, 119, 208, 195, 20, 21, 220, 119, 208, 27, 20, 21, 220, 119, 209, + 78, 20, 21, 220, 119, 211, 205, 20, 21, 210, 65, 20, 21, 210, 33, 20, 21, + 210, 28, 20, 21, 210, 8, 20, 21, 210, 2, 20, 21, 210, 114, 20, 21, 210, + 109, 20, 21, 209, 197, 20, 21, 201, 46, 209, 197, 20, 21, 209, 196, 20, + 21, 201, 46, 209, 196, 20, 21, 209, 195, 20, 21, 201, 46, 209, 195, 20, + 21, 209, 194, 20, 21, 201, 46, 209, 194, 20, 21, 209, 193, 20, 21, 201, + 46, 209, 193, 20, 21, 209, 200, 20, 21, 201, 46, 209, 200, 20, 21, 209, + 199, 20, 21, 201, 46, 209, 199, 20, 21, 210, 116, 20, 21, 200, 51, 20, + 21, 200, 107, 20, 21, 200, 9, 20, 21, 200, 0, 20, 21, 199, 245, 20, 21, + 199, 230, 20, 21, 200, 122, 199, 230, 20, 21, 183, 20, 21, 200, 109, 20, + 21, 199, 172, 20, 21, 201, 46, 199, 172, 20, 21, 199, 171, 20, 21, 201, + 46, 199, 171, 20, 21, 199, 170, 20, 21, 201, 46, 199, 170, 20, 21, 199, + 169, 20, 21, 201, 46, 199, 169, 20, 21, 199, 168, 20, 21, 201, 46, 199, + 168, 20, 21, 199, 174, 20, 21, 201, 46, 199, 174, 20, 21, 199, 173, 20, + 21, 201, 46, 199, 173, 20, 21, 220, 119, 199, 173, 20, 21, 200, 123, 20, + 21, 248, 186, 200, 123, 20, 21, 201, 46, 200, 123, 20, 21, 211, 232, 200, + 9, 20, 21, 213, 190, 20, 21, 214, 32, 213, 190, 20, 21, 201, 46, 225, 40, + 20, 21, 213, 247, 20, 21, 213, 88, 20, 21, 213, 33, 20, 21, 213, 1, 20, + 21, 212, 238, 20, 21, 201, 46, 224, 110, 20, 21, 213, 252, 20, 21, 213, + 248, 20, 21, 201, 46, 194, 20, 21, 212, 139, 20, 21, 201, 46, 212, 139, + 20, 21, 146, 20, 21, 201, 46, 146, 20, 21, 179, 146, 20, 21, 237, 147, + 20, 21, 237, 192, 20, 21, 237, 112, 20, 21, 237, 98, 20, 21, 237, 13, 20, + 21, 237, 2, 20, 21, 237, 195, 20, 21, 237, 194, 20, 21, 236, 166, 20, 21, + 201, 46, 236, 166, 20, 21, 238, 5, 20, 21, 206, 106, 20, 21, 220, 212, + 206, 106, 20, 21, 206, 84, 20, 21, 220, 212, 206, 84, 20, 21, 206, 78, + 20, 21, 220, 212, 206, 78, 20, 21, 206, 61, 20, 21, 206, 56, 20, 21, 206, + 122, 20, 21, 206, 121, 20, 21, 206, 25, 20, 21, 201, 46, 206, 25, 20, 21, + 206, 124, 20, 21, 204, 239, 20, 21, 204, 237, 20, 21, 204, 236, 20, 21, + 204, 241, 20, 21, 204, 242, 20, 21, 204, 131, 20, 21, 204, 130, 20, 21, + 204, 129, 20, 21, 204, 133, 20, 21, 218, 88, 234, 139, 20, 21, 218, 88, + 234, 75, 20, 21, 218, 88, 234, 54, 20, 21, 218, 88, 233, 207, 20, 21, + 218, 88, 233, 188, 20, 21, 218, 88, 144, 20, 21, 218, 88, 234, 233, 20, + 21, 218, 88, 234, 247, 20, 21, 218, 87, 234, 247, 20, 21, 234, 41, 20, + 21, 214, 155, 20, 21, 214, 121, 20, 21, 214, 115, 20, 21, 214, 109, 20, + 21, 214, 104, 20, 21, 214, 159, 20, 21, 214, 158, 20, 21, 214, 167, 20, + 21, 205, 199, 20, 21, 205, 197, 20, 21, 205, 196, 20, 21, 205, 200, 20, + 21, 201, 46, 213, 190, 20, 21, 201, 46, 213, 88, 20, 21, 201, 46, 213, 1, + 20, 21, 201, 46, 213, 252, 20, 21, 219, 251, 20, 21, 219, 201, 20, 21, + 219, 197, 20, 21, 219, 178, 20, 21, 219, 173, 20, 21, 219, 253, 20, 21, + 219, 252, 20, 21, 219, 255, 20, 21, 219, 14, 20, 21, 211, 232, 210, 65, + 20, 21, 211, 232, 210, 33, 20, 21, 211, 232, 210, 8, 20, 21, 211, 232, + 210, 114, 20, 21, 200, 242, 206, 106, 20, 21, 200, 242, 206, 84, 20, 21, + 200, 242, 206, 61, 20, 21, 200, 242, 206, 122, 20, 21, 200, 242, 206, + 124, 20, 21, 224, 217, 20, 21, 224, 216, 20, 21, 224, 215, 20, 21, 224, + 214, 20, 21, 224, 223, 20, 21, 224, 222, 20, 21, 224, 224, 20, 21, 206, + 123, 206, 106, 20, 21, 206, 123, 206, 84, 20, 21, 206, 123, 206, 78, 20, + 21, 206, 123, 206, 61, 20, 21, 206, 123, 206, 56, 20, 21, 206, 123, 206, + 122, 20, 21, 206, 123, 206, 121, 20, 21, 206, 123, 206, 124, 20, 21, 251, + 162, 250, 103, 20, 21, 248, 141, 72, 20, 21, 248, 141, 70, 20, 21, 248, + 141, 74, 20, 21, 248, 141, 62, 20, 21, 248, 141, 201, 64, 20, 21, 248, + 141, 201, 31, 20, 21, 248, 141, 201, 0, 20, 21, 248, 141, 201, 114, 20, + 21, 248, 141, 220, 34, 20, 21, 248, 141, 219, 150, 20, 21, 248, 141, 218, + 241, 20, 21, 248, 141, 188, 20, 21, 248, 141, 227, 8, 20, 21, 248, 141, + 226, 163, 20, 21, 248, 141, 226, 88, 20, 21, 248, 141, 161, 20, 21, 211, + 232, 234, 139, 20, 21, 211, 232, 234, 75, 20, 21, 211, 232, 233, 207, 20, + 21, 211, 232, 144, 20, 21, 89, 235, 167, 20, 21, 89, 235, 171, 20, 21, + 89, 235, 185, 20, 21, 89, 235, 184, 20, 21, 89, 235, 173, 20, 21, 89, + 235, 199, 20, 21, 89, 212, 175, 20, 21, 89, 213, 1, 20, 21, 89, 213, 190, + 20, 21, 89, 213, 167, 20, 21, 89, 213, 88, 20, 21, 89, 213, 252, 20, 21, + 89, 200, 216, 20, 21, 89, 201, 0, 20, 21, 89, 201, 64, 20, 21, 89, 201, + 57, 20, 21, 89, 201, 31, 20, 21, 89, 201, 114, 20, 21, 89, 233, 61, 20, + 21, 89, 233, 62, 20, 21, 89, 233, 65, 20, 21, 89, 233, 64, 20, 21, 89, + 233, 63, 20, 21, 89, 233, 68, 20, 21, 89, 206, 35, 20, 21, 89, 206, 61, + 20, 21, 89, 206, 106, 20, 21, 89, 206, 104, 20, 21, 89, 206, 84, 20, 21, + 89, 206, 122, 20, 21, 89, 204, 220, 20, 21, 89, 204, 230, 20, 21, 89, + 204, 248, 20, 21, 89, 204, 247, 20, 21, 89, 204, 232, 20, 21, 89, 204, + 253, 20, 21, 89, 214, 224, 20, 21, 89, 215, 106, 20, 21, 89, 216, 73, 20, + 21, 89, 216, 61, 20, 21, 89, 215, 204, 20, 21, 89, 172, 20, 21, 89, 216, + 226, 20, 21, 89, 235, 50, 20, 21, 89, 235, 116, 20, 21, 89, 236, 15, 20, + 21, 89, 236, 7, 20, 21, 89, 235, 161, 20, 21, 89, 236, 89, 20, 21, 89, + 226, 172, 20, 21, 89, 226, 178, 20, 21, 89, 226, 192, 20, 21, 89, 226, + 191, 20, 21, 89, 226, 185, 20, 21, 89, 226, 207, 20, 21, 89, 226, 104, + 20, 21, 89, 226, 105, 20, 21, 89, 226, 108, 20, 21, 89, 226, 107, 20, 21, + 89, 226, 106, 20, 21, 89, 226, 109, 20, 21, 89, 226, 110, 20, 21, 89, + 218, 133, 20, 21, 89, 218, 241, 20, 21, 89, 220, 34, 20, 21, 89, 220, 29, + 20, 21, 89, 219, 150, 20, 21, 89, 188, 20, 21, 89, 221, 41, 20, 21, 89, + 221, 136, 20, 21, 89, 222, 76, 20, 21, 89, 222, 64, 20, 21, 89, 221, 211, + 20, 21, 89, 178, 20, 21, 89, 199, 211, 20, 21, 89, 199, 245, 20, 21, 89, + 200, 51, 20, 21, 89, 200, 48, 20, 21, 89, 200, 9, 20, 21, 89, 183, 20, + 21, 89, 227, 147, 20, 21, 211, 232, 227, 147, 20, 21, 89, 227, 166, 20, + 21, 89, 227, 227, 20, 21, 89, 227, 225, 20, 21, 89, 227, 207, 20, 21, + 211, 232, 227, 207, 20, 21, 89, 227, 248, 20, 21, 89, 227, 179, 20, 21, + 89, 227, 183, 20, 21, 89, 227, 193, 20, 21, 89, 227, 192, 20, 21, 89, + 227, 191, 20, 21, 89, 227, 194, 20, 21, 89, 224, 42, 20, 21, 89, 224, + 110, 20, 21, 89, 225, 40, 20, 21, 89, 225, 32, 20, 21, 89, 224, 210, 20, + 21, 89, 194, 20, 21, 89, 240, 215, 20, 21, 89, 240, 216, 20, 21, 89, 240, + 221, 20, 21, 89, 240, 220, 20, 21, 89, 240, 217, 20, 21, 89, 240, 222, + 20, 21, 89, 224, 213, 20, 21, 89, 224, 215, 20, 21, 89, 224, 219, 20, 21, + 89, 224, 218, 20, 21, 89, 224, 217, 20, 21, 89, 224, 223, 20, 21, 89, + 205, 194, 20, 21, 89, 205, 196, 20, 21, 89, 205, 199, 20, 21, 89, 205, + 198, 20, 21, 89, 205, 197, 20, 21, 89, 205, 200, 20, 21, 89, 205, 189, + 20, 21, 89, 205, 190, 20, 21, 89, 205, 202, 20, 21, 89, 205, 201, 20, 21, + 89, 205, 191, 20, 21, 89, 205, 203, 20, 21, 89, 199, 3, 20, 21, 89, 199, + 14, 20, 21, 89, 199, 89, 20, 21, 89, 199, 87, 20, 21, 89, 199, 36, 20, + 21, 89, 199, 114, 20, 21, 89, 199, 157, 20, 21, 89, 82, 199, 157, 20, 21, + 89, 239, 80, 20, 21, 89, 239, 81, 20, 21, 89, 239, 90, 20, 21, 89, 239, + 89, 20, 21, 89, 239, 84, 20, 21, 89, 239, 93, 20, 21, 89, 208, 24, 20, + 21, 89, 209, 29, 20, 21, 89, 211, 202, 20, 21, 89, 211, 190, 20, 21, 89, + 209, 182, 20, 21, 89, 212, 64, 20, 21, 89, 209, 220, 20, 21, 89, 210, 8, + 20, 21, 89, 210, 65, 20, 21, 89, 210, 63, 20, 21, 89, 210, 33, 20, 21, + 89, 210, 114, 20, 21, 89, 210, 116, 20, 21, 89, 205, 5, 20, 21, 89, 205, + 9, 20, 21, 89, 205, 26, 20, 21, 89, 205, 25, 20, 21, 89, 205, 11, 20, 21, + 89, 205, 32, 20, 21, 89, 246, 192, 20, 21, 89, 246, 210, 20, 21, 89, 247, + 8, 20, 21, 89, 247, 4, 20, 21, 89, 246, 236, 20, 21, 89, 247, 37, 20, 21, + 89, 204, 223, 20, 21, 89, 204, 224, 20, 21, 89, 204, 227, 20, 21, 89, + 204, 226, 20, 21, 89, 204, 225, 20, 21, 89, 204, 228, 20, 21, 246, 237, + 54, 20, 21, 236, 183, 208, 76, 20, 21, 214, 151, 20, 21, 219, 249, 20, + 21, 219, 11, 20, 21, 219, 10, 20, 21, 219, 9, 20, 21, 219, 8, 20, 21, + 219, 13, 20, 21, 219, 12, 20, 21, 200, 242, 206, 23, 20, 21, 200, 242, + 206, 22, 20, 21, 200, 242, 206, 21, 20, 21, 200, 242, 206, 20, 20, 21, + 200, 242, 206, 19, 20, 21, 200, 242, 206, 26, 20, 21, 200, 242, 206, 25, + 20, 21, 200, 242, 47, 206, 124, 20, 21, 248, 141, 201, 147, 217, 112, + 208, 245, 81, 217, 112, 1, 248, 234, 217, 112, 1, 224, 28, 217, 112, 1, + 237, 144, 217, 112, 1, 212, 44, 217, 112, 1, 219, 106, 217, 112, 1, 204, + 43, 217, 112, 1, 242, 31, 217, 112, 1, 205, 227, 217, 112, 1, 246, 82, + 217, 112, 1, 247, 63, 217, 112, 1, 221, 28, 217, 112, 1, 235, 96, 217, + 112, 1, 219, 239, 217, 112, 1, 208, 69, 217, 112, 1, 212, 168, 217, 112, + 1, 251, 173, 217, 112, 1, 217, 67, 217, 112, 1, 203, 214, 217, 112, 1, + 239, 25, 217, 112, 1, 228, 44, 217, 112, 1, 239, 26, 217, 112, 1, 217, + 33, 217, 112, 1, 204, 21, 217, 112, 1, 228, 157, 217, 112, 1, 239, 23, + 217, 112, 1, 216, 51, 217, 112, 237, 143, 81, 217, 112, 213, 105, 237, + 143, 81, 212, 157, 1, 237, 133, 237, 124, 237, 148, 238, 5, 212, 157, 1, + 203, 168, 212, 157, 1, 203, 199, 203, 215, 66, 212, 157, 1, 199, 214, + 212, 157, 1, 200, 123, 212, 157, 1, 201, 147, 212, 157, 1, 206, 28, 206, + 27, 206, 54, 212, 157, 1, 238, 74, 212, 157, 1, 251, 52, 62, 212, 157, 1, + 217, 16, 74, 212, 157, 1, 251, 255, 62, 212, 157, 1, 251, 205, 212, 157, + 1, 224, 85, 74, 212, 157, 1, 209, 243, 74, 212, 157, 1, 74, 212, 157, 1, + 217, 121, 212, 157, 1, 217, 78, 212, 157, 1, 213, 227, 213, 240, 213, + 152, 146, 212, 157, 1, 227, 23, 212, 157, 1, 247, 59, 212, 157, 1, 227, + 24, 227, 118, 212, 157, 1, 236, 156, 212, 157, 1, 238, 165, 212, 157, 1, + 236, 10, 234, 253, 236, 156, 212, 157, 1, 236, 49, 212, 157, 1, 200, 208, + 200, 199, 201, 147, 212, 157, 1, 234, 225, 234, 247, 212, 157, 1, 234, + 229, 234, 247, 212, 157, 1, 224, 87, 234, 247, 212, 157, 1, 209, 246, + 234, 247, 212, 157, 1, 220, 114, 218, 51, 220, 115, 220, 214, 212, 157, + 1, 209, 244, 220, 214, 212, 157, 1, 239, 177, 212, 157, 1, 228, 23, 228, + 27, 228, 14, 70, 212, 157, 1, 72, 212, 157, 1, 227, 218, 227, 251, 212, + 157, 1, 235, 249, 212, 157, 1, 224, 88, 251, 221, 212, 157, 1, 209, 248, + 62, 212, 157, 1, 228, 6, 238, 138, 212, 157, 1, 216, 7, 216, 32, 216, + 226, 212, 157, 1, 251, 135, 238, 136, 212, 157, 1, 208, 250, 212, 122, + 212, 157, 1, 209, 165, 224, 84, 212, 122, 212, 157, 1, 209, 242, 212, + 122, 212, 157, 1, 247, 223, 212, 157, 1, 199, 157, 212, 157, 1, 205, 208, + 205, 220, 204, 115, 207, 83, 212, 157, 1, 209, 241, 207, 83, 212, 157, 1, + 242, 153, 212, 157, 1, 248, 213, 248, 216, 248, 147, 250, 103, 212, 157, + 1, 209, 247, 250, 103, 212, 157, 1, 239, 176, 212, 157, 1, 217, 47, 212, + 157, 1, 238, 235, 238, 242, 72, 212, 157, 1, 222, 171, 222, 181, 223, + 243, 212, 157, 1, 224, 86, 223, 243, 212, 157, 1, 209, 245, 223, 243, + 212, 157, 1, 225, 55, 225, 154, 224, 95, 156, 212, 157, 1, 239, 178, 212, + 157, 1, 228, 90, 212, 157, 1, 228, 91, 212, 157, 1, 242, 45, 242, 51, + 242, 153, 212, 157, 1, 217, 9, 238, 73, 74, 212, 157, 1, 239, 21, 212, + 157, 1, 228, 43, 212, 157, 1, 242, 173, 212, 157, 1, 247, 173, 212, 157, + 1, 247, 75, 212, 157, 1, 208, 114, 212, 157, 1, 224, 83, 212, 157, 1, + 209, 240, 212, 157, 1, 232, 230, 212, 157, 1, 214, 167, 212, 157, 1, 200, + 195, 212, 157, 209, 139, 214, 211, 212, 157, 221, 21, 214, 211, 212, 157, + 242, 235, 214, 211, 212, 157, 250, 216, 99, 212, 157, 204, 172, 99, 212, + 157, 248, 232, 99, 212, 157, 1, 227, 118, 212, 157, 1, 210, 116, 212, + 157, 1, 217, 63, 212, 157, 1, 236, 212, 247, 114, 217, 15, 212, 157, 1, + 236, 212, 247, 114, 228, 26, 212, 157, 1, 236, 212, 247, 114, 238, 241, + 212, 157, 1, 236, 212, 247, 114, 251, 254, 212, 157, 1, 236, 212, 247, + 114, 251, 205, 207, 12, 1, 62, 207, 12, 1, 70, 207, 12, 1, 66, 207, 12, + 1, 161, 207, 12, 1, 236, 89, 207, 12, 1, 219, 253, 207, 12, 1, 207, 36, + 207, 12, 1, 242, 58, 207, 12, 1, 188, 207, 12, 1, 172, 207, 12, 1, 249, + 136, 207, 12, 1, 178, 207, 12, 1, 183, 207, 12, 1, 194, 207, 12, 1, 201, + 114, 207, 12, 1, 212, 64, 207, 12, 1, 144, 207, 12, 22, 2, 70, 207, 12, + 22, 2, 66, 207, 12, 2, 202, 208, 234, 170, 1, 62, 234, 170, 1, 70, 234, + 170, 1, 66, 234, 170, 1, 161, 234, 170, 1, 236, 89, 234, 170, 1, 219, + 253, 234, 170, 1, 207, 36, 234, 170, 1, 242, 58, 234, 170, 1, 188, 234, + 170, 1, 172, 234, 170, 1, 249, 136, 234, 170, 1, 178, 234, 170, 1, 183, + 234, 170, 1, 213, 252, 234, 170, 1, 194, 234, 170, 1, 201, 114, 234, 170, + 1, 212, 64, 234, 170, 1, 144, 234, 170, 22, 2, 70, 234, 170, 22, 2, 66, + 234, 170, 2, 216, 165, 215, 222, 209, 139, 214, 211, 215, 222, 53, 214, + 211, 248, 28, 1, 62, 248, 28, 1, 70, 248, 28, 1, 66, 248, 28, 1, 161, + 248, 28, 1, 236, 89, 248, 28, 1, 219, 253, 248, 28, 1, 207, 36, 248, 28, + 1, 242, 58, 248, 28, 1, 188, 248, 28, 1, 172, 248, 28, 1, 249, 136, 248, + 28, 1, 178, 248, 28, 1, 183, 248, 28, 1, 213, 252, 248, 28, 1, 194, 248, + 28, 1, 201, 114, 248, 28, 1, 212, 64, 248, 28, 1, 144, 248, 28, 22, 2, + 70, 248, 28, 22, 2, 66, 207, 11, 1, 62, 207, 11, 1, 70, 207, 11, 1, 66, + 207, 11, 1, 161, 207, 11, 1, 236, 89, 207, 11, 1, 219, 253, 207, 11, 1, + 207, 36, 207, 11, 1, 242, 58, 207, 11, 1, 188, 207, 11, 1, 172, 207, 11, + 1, 249, 136, 207, 11, 1, 178, 207, 11, 1, 183, 207, 11, 1, 194, 207, 11, + 1, 201, 114, 207, 11, 1, 212, 64, 207, 11, 22, 2, 70, 207, 11, 22, 2, 66, + 86, 1, 161, 86, 1, 226, 207, 86, 1, 226, 88, 86, 1, 226, 178, 86, 1, 219, + 178, 86, 1, 247, 190, 86, 1, 247, 37, 86, 1, 246, 91, 86, 1, 246, 210, + 86, 1, 218, 26, 86, 1, 242, 58, 86, 1, 204, 241, 86, 1, 240, 211, 86, 1, + 204, 236, 86, 1, 218, 247, 86, 1, 207, 36, 86, 1, 206, 122, 86, 1, 138, + 86, 1, 206, 61, 86, 1, 218, 241, 86, 1, 249, 136, 86, 1, 215, 245, 86, 1, + 215, 106, 86, 1, 215, 217, 86, 1, 221, 136, 86, 1, 199, 245, 86, 1, 213, + 1, 86, 1, 224, 110, 86, 1, 202, 193, 86, 1, 210, 114, 86, 1, 208, 139, + 86, 1, 212, 64, 86, 1, 144, 86, 1, 194, 86, 1, 214, 159, 86, 228, 104, + 22, 214, 145, 86, 228, 104, 22, 214, 158, 86, 228, 104, 22, 214, 121, 86, + 228, 104, 22, 214, 115, 86, 228, 104, 22, 214, 97, 86, 228, 104, 22, 214, + 67, 86, 228, 104, 22, 214, 55, 86, 228, 104, 22, 214, 54, 86, 228, 104, + 22, 212, 131, 86, 228, 104, 22, 212, 124, 86, 228, 104, 22, 224, 2, 86, + 228, 104, 22, 223, 246, 86, 228, 104, 22, 214, 139, 86, 228, 104, 22, + 214, 151, 86, 228, 104, 22, 214, 105, 204, 128, 102, 86, 228, 104, 22, + 214, 105, 204, 128, 105, 86, 228, 104, 22, 214, 141, 86, 22, 228, 88, + 251, 1, 86, 22, 228, 88, 252, 138, 86, 22, 2, 252, 138, 86, 22, 2, 70, + 86, 22, 2, 228, 151, 86, 22, 2, 200, 123, 86, 22, 2, 199, 167, 86, 22, 2, + 66, 86, 22, 2, 203, 182, 86, 22, 2, 204, 46, 86, 22, 2, 217, 121, 86, 22, + 2, 183, 86, 22, 2, 228, 178, 86, 22, 2, 72, 86, 22, 2, 251, 221, 86, 22, + 2, 251, 176, 86, 22, 2, 217, 63, 86, 22, 2, 250, 139, 86, 2, 219, 123, + 86, 2, 213, 188, 86, 2, 199, 178, 86, 2, 220, 241, 86, 2, 205, 86, 86, 2, + 249, 79, 86, 2, 212, 252, 86, 2, 205, 184, 86, 2, 227, 75, 86, 2, 251, + 178, 86, 2, 212, 14, 212, 7, 86, 2, 202, 205, 86, 2, 246, 85, 86, 2, 249, + 51, 86, 2, 226, 199, 86, 2, 249, 74, 86, 2, 247, 161, 215, 167, 225, 235, + 86, 2, 225, 9, 205, 161, 86, 2, 248, 202, 86, 2, 215, 219, 221, 38, 86, + 2, 226, 66, 86, 242, 195, 16, 213, 80, 86, 2, 250, 121, 86, 2, 250, 142, + 86, 17, 199, 81, 86, 17, 102, 86, 17, 105, 86, 17, 147, 86, 17, 149, 86, + 17, 164, 86, 17, 187, 86, 17, 210, 135, 86, 17, 192, 86, 17, 219, 113, + 86, 16, 225, 9, 250, 144, 209, 13, 86, 16, 225, 9, 250, 144, 221, 5, 86, + 16, 225, 9, 250, 144, 215, 166, 86, 16, 225, 9, 250, 144, 248, 235, 86, + 16, 225, 9, 250, 144, 248, 8, 86, 16, 225, 9, 250, 144, 215, 42, 86, 16, + 225, 9, 250, 144, 215, 36, 86, 16, 225, 9, 250, 144, 215, 34, 86, 16, + 225, 9, 250, 144, 215, 40, 86, 16, 225, 9, 250, 144, 215, 38, 92, 248, + 160, 92, 238, 195, 92, 246, 70, 92, 236, 183, 208, 76, 92, 246, 79, 92, + 236, 229, 240, 180, 92, 205, 183, 209, 23, 233, 33, 92, 209, 180, 5, 248, + 89, 222, 145, 92, 222, 177, 246, 70, 92, 222, 177, 236, 183, 208, 76, 92, + 219, 104, 92, 236, 211, 58, 211, 176, 102, 92, 236, 211, 58, 211, 176, + 105, 92, 236, 211, 58, 211, 176, 147, 92, 22, 210, 154, 92, 17, 199, 81, + 92, 17, 102, 92, 17, 105, 92, 17, 147, 92, 17, 149, 92, 17, 164, 92, 17, + 187, 92, 17, 210, 135, 92, 17, 192, 92, 17, 219, 113, 92, 1, 62, 92, 1, + 72, 92, 1, 70, 92, 1, 74, 92, 1, 66, 92, 1, 217, 121, 92, 1, 204, 31, 92, + 1, 238, 255, 92, 1, 188, 92, 1, 251, 76, 92, 1, 249, 136, 92, 1, 172, 92, + 1, 214, 159, 92, 1, 236, 89, 92, 1, 178, 92, 1, 194, 92, 1, 212, 64, 92, + 1, 210, 114, 92, 1, 207, 36, 92, 1, 242, 58, 92, 1, 247, 37, 92, 1, 227, + 248, 92, 1, 183, 92, 1, 213, 252, 92, 1, 201, 114, 92, 1, 237, 195, 92, + 1, 161, 92, 1, 226, 207, 92, 1, 205, 32, 92, 1, 199, 114, 92, 1, 234, + 233, 92, 1, 199, 7, 92, 1, 224, 223, 92, 1, 199, 63, 92, 1, 246, 236, 92, + 1, 205, 183, 168, 22, 54, 92, 1, 205, 183, 72, 92, 1, 205, 183, 70, 92, + 1, 205, 183, 74, 92, 1, 205, 183, 66, 92, 1, 205, 183, 217, 121, 92, 1, + 205, 183, 204, 31, 92, 1, 205, 183, 251, 76, 92, 1, 205, 183, 249, 136, + 92, 1, 205, 183, 172, 92, 1, 205, 183, 214, 159, 92, 1, 205, 183, 236, + 89, 92, 1, 205, 183, 178, 92, 1, 205, 183, 207, 36, 92, 1, 205, 183, 242, + 58, 92, 1, 205, 183, 247, 37, 92, 1, 205, 183, 227, 248, 92, 1, 205, 183, + 205, 32, 92, 1, 205, 183, 183, 92, 1, 205, 183, 201, 114, 92, 1, 205, + 183, 161, 92, 1, 205, 183, 236, 86, 92, 1, 205, 183, 234, 233, 92, 1, + 205, 183, 227, 206, 92, 1, 205, 183, 219, 148, 92, 1, 205, 183, 239, 93, + 92, 1, 209, 180, 72, 92, 1, 209, 180, 70, 92, 1, 209, 180, 228, 3, 92, 1, + 209, 180, 204, 31, 92, 1, 209, 180, 66, 92, 1, 209, 180, 251, 76, 92, 1, + 209, 180, 161, 92, 1, 209, 180, 236, 89, 92, 1, 209, 180, 144, 92, 1, + 209, 180, 172, 92, 1, 209, 180, 210, 114, 92, 1, 209, 180, 207, 36, 92, + 1, 209, 180, 242, 58, 92, 1, 209, 180, 227, 248, 92, 1, 209, 180, 237, + 195, 92, 1, 209, 180, 236, 86, 92, 1, 209, 180, 234, 233, 92, 1, 209, + 180, 205, 32, 92, 1, 209, 180, 199, 114, 92, 1, 209, 180, 213, 248, 92, + 1, 209, 180, 247, 37, 92, 1, 209, 180, 199, 77, 92, 1, 222, 177, 70, 92, + 1, 222, 177, 161, 92, 1, 222, 177, 213, 252, 92, 1, 222, 177, 237, 195, + 92, 1, 222, 177, 199, 77, 92, 1, 251, 134, 236, 69, 251, 34, 102, 92, 1, + 251, 134, 236, 69, 202, 204, 102, 92, 1, 251, 134, 236, 69, 242, 19, 92, + 1, 251, 134, 236, 69, 204, 41, 92, 1, 251, 134, 236, 69, 228, 50, 204, + 41, 92, 1, 251, 134, 236, 69, 249, 91, 92, 1, 251, 134, 236, 69, 126, + 249, 91, 92, 1, 251, 134, 236, 69, 62, 92, 1, 251, 134, 236, 69, 70, 92, + 1, 251, 134, 236, 69, 161, 92, 1, 251, 134, 236, 69, 219, 253, 92, 1, + 251, 134, 236, 69, 247, 190, 92, 1, 251, 134, 236, 69, 204, 253, 92, 1, + 251, 134, 236, 69, 204, 241, 92, 1, 251, 134, 236, 69, 241, 220, 92, 1, + 251, 134, 236, 69, 219, 21, 92, 1, 251, 134, 236, 69, 207, 36, 92, 1, + 251, 134, 236, 69, 242, 58, 92, 1, 251, 134, 236, 69, 172, 92, 1, 251, + 134, 236, 69, 215, 245, 92, 1, 251, 134, 236, 69, 208, 179, 92, 1, 251, + 134, 236, 69, 199, 77, 92, 1, 251, 134, 236, 69, 199, 114, 92, 1, 251, + 134, 236, 69, 251, 185, 92, 1, 205, 183, 251, 134, 236, 69, 207, 36, 92, + 1, 205, 183, 251, 134, 236, 69, 199, 77, 92, 1, 222, 177, 251, 134, 236, + 69, 235, 199, 92, 1, 222, 177, 251, 134, 236, 69, 219, 253, 92, 1, 222, + 177, 251, 134, 236, 69, 247, 190, 92, 1, 222, 177, 251, 134, 236, 69, + 227, 215, 92, 1, 222, 177, 251, 134, 236, 69, 204, 253, 92, 1, 222, 177, + 251, 134, 236, 69, 241, 204, 92, 1, 222, 177, 251, 134, 236, 69, 207, 36, + 92, 1, 222, 177, 251, 134, 236, 69, 241, 100, 92, 1, 222, 177, 251, 134, + 236, 69, 208, 179, 92, 1, 222, 177, 251, 134, 236, 69, 242, 167, 92, 1, + 222, 177, 251, 134, 236, 69, 199, 77, 92, 1, 222, 177, 251, 134, 236, 69, + 199, 114, 92, 1, 251, 134, 236, 69, 167, 66, 92, 1, 251, 134, 236, 69, + 167, 183, 92, 1, 222, 177, 251, 134, 236, 69, 248, 200, 92, 1, 251, 134, + 236, 69, 242, 46, 92, 1, 222, 177, 251, 134, 236, 69, 224, 223, 20, 21, + 216, 230, 20, 21, 250, 112, 20, 21, 252, 93, 20, 21, 201, 67, 20, 21, + 215, 48, 20, 21, 216, 82, 20, 21, 214, 176, 20, 21, 206, 210, 20, 21, + 227, 15, 20, 21, 225, 226, 20, 21, 222, 119, 20, 21, 218, 198, 20, 21, + 220, 109, 20, 21, 225, 50, 20, 21, 208, 248, 20, 21, 211, 234, 20, 21, + 209, 229, 20, 21, 210, 69, 20, 21, 209, 192, 20, 21, 199, 220, 20, 21, + 200, 57, 20, 21, 213, 197, 20, 21, 218, 66, 20, 21, 217, 100, 218, 66, + 20, 21, 218, 65, 20, 21, 217, 100, 218, 65, 20, 21, 218, 64, 20, 21, 217, + 100, 218, 64, 20, 21, 218, 63, 20, 21, 217, 100, 218, 63, 20, 21, 212, + 136, 20, 21, 212, 135, 20, 21, 212, 134, 20, 21, 212, 133, 20, 21, 212, + 132, 20, 21, 212, 140, 20, 21, 217, 100, 216, 226, 20, 21, 217, 100, 207, + 83, 20, 21, 217, 100, 227, 118, 20, 21, 217, 100, 247, 223, 20, 21, 217, + 100, 223, 243, 20, 21, 217, 100, 220, 214, 20, 21, 217, 100, 212, 122, + 20, 21, 217, 100, 210, 116, 20, 21, 239, 12, 201, 147, 20, 21, 201, 45, + 201, 147, 20, 21, 47, 4, 213, 26, 20, 21, 47, 213, 220, 240, 182, 20, 21, + 214, 32, 212, 137, 20, 21, 201, 46, 224, 78, 20, 21, 201, 46, 225, 175, + 20, 21, 206, 24, 20, 21, 206, 26, 20, 21, 204, 233, 20, 21, 204, 235, 20, + 21, 204, 240, 20, 21, 205, 193, 20, 21, 205, 195, 20, 21, 211, 232, 209, + 197, 20, 21, 211, 232, 210, 2, 20, 21, 211, 232, 233, 188, 20, 21, 89, + 235, 5, 20, 21, 89, 241, 134, 236, 7, 20, 21, 89, 236, 86, 20, 21, 89, + 235, 10, 20, 21, 211, 232, 227, 128, 20, 21, 89, 227, 126, 20, 21, 248, + 255, 241, 134, 156, 20, 21, 248, 255, 241, 134, 146, 20, 21, 89, 241, + 129, 212, 122, 224, 186, 202, 172, 224, 236, 224, 186, 1, 161, 224, 186, + 1, 226, 207, 224, 186, 1, 236, 89, 224, 186, 1, 235, 199, 224, 186, 1, + 219, 253, 224, 186, 1, 247, 190, 224, 186, 1, 247, 37, 224, 186, 1, 227, + 248, 224, 186, 1, 227, 215, 224, 186, 1, 200, 77, 224, 186, 1, 207, 36, + 224, 186, 1, 206, 122, 224, 186, 1, 242, 58, 224, 186, 1, 241, 100, 224, + 186, 1, 188, 224, 186, 1, 172, 224, 186, 1, 215, 245, 224, 186, 1, 249, + 136, 224, 186, 1, 248, 200, 224, 186, 1, 178, 224, 186, 1, 183, 224, 186, + 1, 213, 252, 224, 186, 1, 194, 224, 186, 1, 201, 114, 224, 186, 1, 210, + 114, 224, 186, 1, 208, 179, 224, 186, 1, 212, 64, 224, 186, 1, 144, 224, + 186, 1, 235, 1, 224, 186, 1, 205, 132, 224, 186, 22, 2, 62, 224, 186, 22, + 2, 70, 224, 186, 22, 2, 66, 224, 186, 22, 2, 238, 255, 224, 186, 22, 2, + 251, 176, 224, 186, 22, 2, 217, 63, 224, 186, 22, 2, 250, 139, 224, 186, + 22, 2, 72, 224, 186, 22, 2, 74, 224, 186, 208, 12, 1, 183, 224, 186, 208, + 12, 1, 213, 252, 224, 186, 208, 12, 1, 201, 114, 224, 186, 4, 1, 161, + 224, 186, 4, 1, 219, 253, 224, 186, 4, 1, 251, 33, 224, 186, 4, 1, 207, + 36, 224, 186, 4, 1, 188, 224, 186, 4, 1, 172, 224, 186, 4, 1, 178, 224, + 186, 4, 1, 213, 252, 224, 186, 4, 1, 194, 224, 186, 2, 221, 26, 224, 186, + 2, 226, 249, 224, 186, 2, 212, 62, 224, 186, 2, 224, 78, 224, 186, 238, + 43, 81, 224, 186, 214, 79, 81, 224, 186, 17, 199, 81, 224, 186, 17, 102, + 224, 186, 17, 105, 224, 186, 17, 147, 224, 186, 17, 149, 224, 186, 17, + 164, 224, 186, 17, 187, 224, 186, 17, 210, 135, 224, 186, 17, 192, 224, + 186, 17, 219, 113, 46, 225, 41, 1, 161, 46, 225, 41, 1, 200, 181, 46, + 225, 41, 1, 219, 253, 46, 225, 41, 1, 205, 32, 46, 225, 41, 1, 212, 64, + 46, 225, 41, 1, 183, 46, 225, 41, 1, 207, 36, 46, 225, 41, 1, 206, 122, + 46, 225, 41, 1, 194, 46, 225, 41, 1, 172, 46, 225, 41, 1, 215, 245, 46, + 225, 41, 1, 178, 46, 225, 41, 1, 237, 195, 46, 225, 41, 1, 203, 90, 46, + 225, 41, 1, 144, 46, 225, 41, 1, 214, 159, 46, 225, 41, 1, 226, 207, 46, + 225, 41, 1, 205, 22, 46, 225, 41, 1, 188, 46, 225, 41, 1, 62, 46, 225, + 41, 1, 70, 46, 225, 41, 1, 238, 255, 46, 225, 41, 1, 238, 241, 46, 225, + 41, 1, 66, 46, 225, 41, 1, 217, 63, 46, 225, 41, 1, 74, 46, 225, 41, 1, + 204, 31, 46, 225, 41, 1, 72, 46, 225, 41, 1, 250, 137, 46, 225, 41, 1, + 251, 176, 46, 225, 41, 1, 205, 172, 46, 225, 41, 1, 205, 171, 46, 225, + 41, 1, 205, 170, 46, 225, 41, 1, 205, 169, 46, 225, 41, 1, 205, 168, 220, + 8, 46, 224, 36, 1, 122, 214, 159, 220, 8, 46, 224, 36, 1, 128, 214, 159, + 220, 8, 46, 224, 36, 1, 122, 161, 220, 8, 46, 224, 36, 1, 122, 200, 181, + 220, 8, 46, 224, 36, 1, 122, 219, 253, 220, 8, 46, 224, 36, 1, 128, 161, + 220, 8, 46, 224, 36, 1, 128, 200, 181, 220, 8, 46, 224, 36, 1, 128, 219, + 253, 220, 8, 46, 224, 36, 1, 122, 205, 32, 220, 8, 46, 224, 36, 1, 122, + 212, 64, 220, 8, 46, 224, 36, 1, 122, 183, 220, 8, 46, 224, 36, 1, 128, + 205, 32, 220, 8, 46, 224, 36, 1, 128, 212, 64, 220, 8, 46, 224, 36, 1, + 128, 183, 220, 8, 46, 224, 36, 1, 122, 207, 36, 220, 8, 46, 224, 36, 1, + 122, 206, 122, 220, 8, 46, 224, 36, 1, 122, 188, 220, 8, 46, 224, 36, 1, + 128, 207, 36, 220, 8, 46, 224, 36, 1, 128, 206, 122, 220, 8, 46, 224, 36, + 1, 128, 188, 220, 8, 46, 224, 36, 1, 122, 172, 220, 8, 46, 224, 36, 1, + 122, 215, 245, 220, 8, 46, 224, 36, 1, 122, 178, 220, 8, 46, 224, 36, 1, + 128, 172, 220, 8, 46, 224, 36, 1, 128, 215, 245, 220, 8, 46, 224, 36, 1, + 128, 178, 220, 8, 46, 224, 36, 1, 122, 237, 195, 220, 8, 46, 224, 36, 1, + 122, 203, 90, 220, 8, 46, 224, 36, 1, 122, 194, 220, 8, 46, 224, 36, 1, + 128, 237, 195, 220, 8, 46, 224, 36, 1, 128, 203, 90, 220, 8, 46, 224, 36, + 1, 128, 194, 220, 8, 46, 224, 36, 1, 122, 144, 220, 8, 46, 224, 36, 1, + 122, 242, 58, 220, 8, 46, 224, 36, 1, 122, 249, 136, 220, 8, 46, 224, 36, + 1, 128, 144, 220, 8, 46, 224, 36, 1, 128, 242, 58, 220, 8, 46, 224, 36, + 1, 128, 249, 136, 220, 8, 46, 224, 36, 1, 122, 225, 231, 220, 8, 46, 224, + 36, 1, 122, 200, 148, 220, 8, 46, 224, 36, 1, 128, 225, 231, 220, 8, 46, + 224, 36, 1, 128, 200, 148, 220, 8, 46, 224, 36, 1, 122, 208, 23, 220, 8, + 46, 224, 36, 1, 128, 208, 23, 220, 8, 46, 224, 36, 22, 2, 22, 209, 238, + 220, 8, 46, 224, 36, 22, 2, 252, 138, 220, 8, 46, 224, 36, 22, 2, 228, + 151, 220, 8, 46, 224, 36, 22, 2, 66, 220, 8, 46, 224, 36, 22, 2, 203, + 182, 220, 8, 46, 224, 36, 22, 2, 72, 220, 8, 46, 224, 36, 22, 2, 251, + 221, 220, 8, 46, 224, 36, 22, 2, 74, 220, 8, 46, 224, 36, 22, 2, 217, + 146, 220, 8, 46, 224, 36, 22, 2, 204, 31, 220, 8, 46, 224, 36, 22, 2, + 250, 112, 220, 8, 46, 224, 36, 22, 2, 252, 93, 220, 8, 46, 224, 36, 22, + 2, 203, 174, 220, 8, 46, 224, 36, 22, 2, 216, 230, 220, 8, 46, 224, 36, + 22, 2, 217, 143, 220, 8, 46, 224, 36, 22, 2, 204, 27, 220, 8, 46, 224, + 36, 22, 2, 228, 3, 220, 8, 46, 224, 36, 1, 47, 203, 168, 220, 8, 46, 224, + 36, 1, 47, 219, 255, 220, 8, 46, 224, 36, 1, 47, 220, 214, 220, 8, 46, + 224, 36, 1, 47, 223, 243, 220, 8, 46, 224, 36, 1, 47, 227, 118, 220, 8, + 46, 224, 36, 1, 47, 242, 153, 220, 8, 46, 224, 36, 1, 47, 250, 103, 220, + 8, 46, 224, 36, 150, 222, 149, 220, 8, 46, 224, 36, 150, 222, 148, 220, + 8, 46, 224, 36, 17, 199, 81, 220, 8, 46, 224, 36, 17, 102, 220, 8, 46, + 224, 36, 17, 105, 220, 8, 46, 224, 36, 17, 147, 220, 8, 46, 224, 36, 17, + 149, 220, 8, 46, 224, 36, 17, 164, 220, 8, 46, 224, 36, 17, 187, 220, 8, + 46, 224, 36, 17, 210, 135, 220, 8, 46, 224, 36, 17, 192, 220, 8, 46, 224, + 36, 17, 219, 113, 220, 8, 46, 224, 36, 107, 17, 102, 220, 8, 46, 224, 36, + 2, 225, 160, 220, 8, 46, 224, 36, 2, 225, 159, 86, 16, 216, 90, 86, 16, + 221, 6, 226, 84, 86, 16, 215, 167, 226, 84, 86, 16, 248, 236, 226, 84, + 86, 16, 248, 9, 226, 84, 86, 16, 215, 43, 226, 84, 86, 16, 215, 37, 226, + 84, 86, 16, 215, 35, 226, 84, 86, 16, 215, 41, 226, 84, 86, 16, 215, 39, + 226, 84, 86, 16, 242, 5, 226, 84, 86, 16, 242, 1, 226, 84, 86, 16, 242, + 0, 226, 84, 86, 16, 242, 3, 226, 84, 86, 16, 242, 2, 226, 84, 86, 16, + 241, 255, 226, 84, 86, 16, 204, 178, 86, 16, 221, 6, 212, 250, 86, 16, + 215, 167, 212, 250, 86, 16, 248, 236, 212, 250, 86, 16, 248, 9, 212, 250, + 86, 16, 215, 43, 212, 250, 86, 16, 215, 37, 212, 250, 86, 16, 215, 35, + 212, 250, 86, 16, 215, 41, 212, 250, 86, 16, 215, 39, 212, 250, 86, 16, + 242, 5, 212, 250, 86, 16, 242, 1, 212, 250, 86, 16, 242, 0, 212, 250, 86, + 16, 242, 3, 212, 250, 86, 16, 242, 2, 212, 250, 86, 16, 241, 255, 212, + 250, 248, 29, 1, 161, 248, 29, 1, 236, 89, 248, 29, 1, 219, 253, 248, 29, + 1, 219, 196, 248, 29, 1, 172, 248, 29, 1, 249, 136, 248, 29, 1, 178, 248, + 29, 1, 221, 45, 248, 29, 1, 207, 36, 248, 29, 1, 242, 58, 248, 29, 1, + 188, 248, 29, 1, 218, 196, 248, 29, 1, 247, 190, 248, 29, 1, 227, 248, + 248, 29, 1, 218, 60, 248, 29, 1, 218, 52, 248, 29, 1, 183, 248, 29, 1, + 213, 252, 248, 29, 1, 194, 248, 29, 1, 203, 90, 248, 29, 1, 212, 64, 248, + 29, 1, 62, 248, 29, 1, 144, 248, 29, 22, 2, 70, 248, 29, 22, 2, 66, 248, + 29, 22, 2, 72, 248, 29, 22, 2, 74, 248, 29, 22, 2, 251, 221, 248, 29, + 216, 178, 248, 29, 238, 171, 76, 211, 192, 46, 107, 1, 122, 161, 46, 107, + 1, 122, 226, 207, 46, 107, 1, 122, 225, 215, 46, 107, 1, 128, 161, 46, + 107, 1, 128, 225, 215, 46, 107, 1, 128, 226, 207, 46, 107, 1, 219, 253, + 46, 107, 1, 122, 247, 190, 46, 107, 1, 122, 247, 37, 46, 107, 1, 128, + 247, 190, 46, 107, 1, 128, 212, 64, 46, 107, 1, 128, 247, 37, 46, 107, 1, + 218, 60, 46, 107, 1, 213, 203, 46, 107, 1, 122, 213, 201, 46, 107, 1, + 242, 58, 46, 107, 1, 128, 213, 201, 46, 107, 1, 213, 212, 46, 107, 1, + 122, 207, 36, 46, 107, 1, 122, 206, 122, 46, 107, 1, 128, 207, 36, 46, + 107, 1, 128, 206, 122, 46, 107, 1, 188, 46, 107, 1, 249, 136, 46, 107, 1, + 122, 172, 46, 107, 1, 122, 215, 245, 46, 107, 1, 122, 237, 195, 46, 107, + 1, 128, 172, 46, 107, 1, 128, 237, 195, 46, 107, 1, 128, 215, 245, 46, + 107, 1, 178, 46, 107, 1, 128, 183, 46, 107, 1, 122, 183, 46, 107, 1, 213, + 252, 46, 107, 1, 212, 170, 46, 107, 1, 194, 46, 107, 1, 224, 35, 46, 107, + 1, 201, 114, 46, 107, 1, 122, 210, 114, 46, 107, 1, 122, 208, 179, 46, + 107, 1, 122, 212, 64, 46, 107, 1, 122, 144, 46, 107, 1, 224, 138, 46, + 107, 1, 62, 46, 107, 1, 128, 144, 46, 107, 1, 70, 46, 107, 1, 228, 151, + 46, 107, 1, 66, 46, 107, 1, 203, 182, 46, 107, 1, 238, 255, 46, 107, 1, + 217, 63, 46, 107, 1, 225, 160, 46, 107, 1, 235, 69, 212, 64, 46, 107, + 111, 2, 179, 213, 252, 46, 107, 111, 2, 179, 194, 46, 107, 111, 2, 225, + 176, 206, 242, 225, 149, 46, 107, 2, 222, 199, 227, 65, 225, 149, 46, + 107, 111, 2, 47, 219, 253, 46, 107, 111, 2, 128, 172, 46, 107, 111, 2, + 122, 213, 202, 217, 34, 128, 172, 46, 107, 111, 2, 178, 46, 107, 111, 2, + 249, 136, 46, 107, 111, 2, 212, 64, 46, 107, 2, 212, 38, 46, 107, 22, 2, + 62, 46, 107, 22, 2, 222, 199, 211, 251, 46, 107, 22, 2, 252, 138, 46, + 107, 22, 2, 206, 248, 252, 138, 46, 107, 22, 2, 70, 46, 107, 22, 2, 228, + 151, 46, 107, 22, 2, 204, 31, 46, 107, 22, 2, 203, 181, 46, 107, 22, 2, + 66, 46, 107, 22, 2, 203, 182, 46, 107, 22, 2, 74, 46, 107, 22, 2, 217, + 147, 57, 46, 107, 22, 2, 216, 230, 46, 107, 22, 2, 72, 46, 107, 22, 2, + 251, 221, 46, 107, 22, 2, 217, 63, 46, 107, 22, 2, 251, 176, 46, 107, 22, + 2, 107, 251, 176, 46, 107, 22, 2, 217, 147, 56, 46, 107, 2, 222, 199, + 227, 64, 46, 107, 2, 205, 173, 46, 107, 2, 205, 172, 46, 107, 2, 226, + 168, 205, 171, 46, 107, 2, 226, 168, 205, 170, 46, 107, 2, 226, 168, 205, + 169, 46, 107, 2, 213, 253, 234, 232, 46, 107, 2, 222, 199, 212, 23, 46, + 107, 2, 226, 167, 227, 46, 46, 107, 38, 242, 217, 240, 182, 46, 107, 233, + 179, 17, 199, 81, 46, 107, 233, 179, 17, 102, 46, 107, 233, 179, 17, 105, + 46, 107, 233, 179, 17, 147, 46, 107, 233, 179, 17, 149, 46, 107, 233, + 179, 17, 164, 46, 107, 233, 179, 17, 187, 46, 107, 233, 179, 17, 210, + 135, 46, 107, 233, 179, 17, 192, 46, 107, 233, 179, 17, 219, 113, 46, + 107, 107, 17, 199, 81, 46, 107, 107, 17, 102, 46, 107, 107, 17, 105, 46, + 107, 107, 17, 147, 46, 107, 107, 17, 149, 46, 107, 107, 17, 164, 46, 107, + 107, 17, 187, 46, 107, 107, 17, 210, 135, 46, 107, 107, 17, 192, 46, 107, + 107, 17, 219, 113, 46, 107, 2, 201, 30, 46, 107, 2, 201, 29, 46, 107, 2, + 211, 238, 46, 107, 2, 226, 238, 46, 107, 2, 233, 107, 46, 107, 2, 240, + 196, 46, 107, 2, 213, 105, 212, 228, 213, 212, 46, 107, 2, 222, 199, 200, + 78, 46, 107, 2, 227, 99, 46, 107, 2, 227, 98, 46, 107, 2, 211, 246, 46, + 107, 2, 211, 245, 46, 107, 2, 234, 172, 46, 107, 2, 247, 187, 38, 239, + 172, 246, 147, 251, 251, 38, 241, 73, 38, 228, 94, 38, 191, 48, 38, 205, + 83, 240, 182, 38, 200, 194, 57, 38, 201, 22, 224, 177, 57, 38, 176, 134, + 57, 38, 53, 176, 134, 57, 38, 162, 247, 57, 208, 47, 57, 38, 208, 33, + 247, 57, 208, 47, 57, 38, 216, 117, 56, 38, 53, 216, 117, 56, 38, 216, + 117, 57, 38, 216, 117, 216, 242, 133, 2, 204, 15, 213, 82, 133, 2, 204, + 15, 247, 151, 133, 2, 247, 72, 133, 2, 207, 205, 133, 2, 248, 157, 133, + 1, 251, 157, 133, 1, 251, 158, 206, 192, 133, 1, 228, 147, 133, 1, 228, + 148, 206, 192, 133, 1, 204, 18, 133, 1, 204, 19, 206, 192, 133, 1, 213, + 253, 213, 135, 133, 1, 213, 253, 213, 136, 206, 192, 133, 1, 225, 176, + 225, 3, 133, 1, 225, 176, 225, 4, 206, 192, 133, 1, 238, 214, 133, 1, + 251, 174, 133, 1, 217, 96, 133, 1, 217, 97, 206, 192, 133, 1, 161, 133, + 1, 227, 108, 222, 202, 133, 1, 236, 89, 133, 1, 236, 90, 235, 102, 133, + 1, 219, 253, 133, 1, 247, 190, 133, 1, 247, 191, 225, 163, 133, 1, 227, + 248, 133, 1, 227, 249, 227, 219, 133, 1, 218, 60, 133, 1, 207, 37, 225, + 60, 133, 1, 207, 37, 221, 1, 222, 202, 133, 1, 242, 59, 221, 1, 251, 114, + 133, 1, 242, 59, 221, 1, 222, 202, 133, 1, 220, 162, 213, 215, 133, 1, + 207, 36, 133, 1, 207, 37, 206, 214, 133, 1, 242, 58, 133, 1, 242, 59, + 222, 221, 133, 1, 188, 133, 1, 172, 133, 1, 216, 211, 227, 58, 133, 1, + 249, 136, 133, 1, 249, 137, 226, 250, 133, 1, 178, 133, 1, 183, 133, 1, + 213, 252, 133, 1, 194, 133, 1, 201, 114, 133, 1, 212, 65, 212, 49, 133, + 1, 212, 65, 212, 2, 133, 1, 212, 64, 133, 1, 144, 133, 2, 213, 126, 133, + 22, 2, 206, 192, 133, 22, 2, 204, 14, 133, 22, 2, 204, 15, 211, 254, 133, + 22, 2, 207, 238, 133, 22, 2, 207, 239, 228, 139, 133, 22, 2, 213, 253, + 213, 135, 133, 22, 2, 213, 253, 213, 136, 206, 192, 133, 22, 2, 225, 176, + 225, 3, 133, 22, 2, 225, 176, 225, 4, 206, 192, 133, 22, 2, 206, 249, + 133, 22, 2, 206, 250, 213, 135, 133, 22, 2, 206, 250, 206, 192, 133, 22, + 2, 206, 250, 213, 136, 206, 192, 133, 22, 2, 216, 30, 133, 22, 2, 216, + 31, 206, 192, 133, 251, 230, 251, 229, 133, 1, 227, 87, 211, 253, 133, 1, + 226, 174, 211, 253, 133, 1, 204, 108, 211, 253, 133, 1, 238, 249, 211, + 253, 133, 1, 203, 60, 211, 253, 133, 1, 199, 104, 211, 253, 133, 1, 250, + 158, 211, 253, 133, 17, 199, 81, 133, 17, 102, 133, 17, 105, 133, 17, + 147, 133, 17, 149, 133, 17, 164, 133, 17, 187, 133, 17, 210, 135, 133, + 17, 192, 133, 17, 219, 113, 133, 216, 143, 133, 216, 171, 133, 201, 14, + 133, 247, 127, 216, 164, 133, 247, 127, 209, 158, 133, 247, 127, 216, + 114, 133, 216, 170, 133, 32, 16, 240, 188, 133, 32, 16, 241, 133, 133, + 32, 16, 239, 121, 133, 32, 16, 242, 8, 133, 32, 16, 242, 9, 207, 205, + 133, 32, 16, 241, 18, 133, 32, 16, 242, 50, 133, 32, 16, 241, 109, 133, + 32, 16, 242, 32, 133, 32, 16, 242, 9, 236, 9, 133, 32, 16, 38, 206, 185, + 133, 32, 16, 38, 238, 169, 133, 32, 16, 38, 226, 245, 133, 32, 16, 38, + 226, 247, 133, 32, 16, 38, 227, 223, 133, 32, 16, 38, 226, 246, 3, 227, + 223, 133, 32, 16, 38, 226, 248, 3, 227, 223, 133, 32, 16, 38, 248, 221, + 133, 32, 16, 38, 235, 106, 133, 32, 16, 213, 44, 176, 239, 131, 133, 32, + 16, 213, 44, 176, 242, 48, 133, 32, 16, 213, 44, 246, 110, 204, 207, 133, + 32, 16, 213, 44, 246, 110, 207, 2, 133, 32, 16, 225, 26, 176, 216, 157, + 133, 32, 16, 225, 26, 176, 214, 210, 133, 32, 16, 225, 26, 246, 110, 215, + 131, 133, 32, 16, 225, 26, 246, 110, 215, 117, 133, 32, 16, 225, 26, 176, + 215, 156, 207, 227, 2, 216, 140, 207, 227, 2, 216, 153, 207, 227, 2, 216, + 149, 207, 227, 1, 62, 207, 227, 1, 70, 207, 227, 1, 66, 207, 227, 1, 251, + 221, 207, 227, 1, 74, 207, 227, 1, 72, 207, 227, 1, 238, 69, 207, 227, 1, + 161, 207, 227, 1, 214, 159, 207, 227, 1, 236, 89, 207, 227, 1, 219, 253, + 207, 227, 1, 247, 190, 207, 227, 1, 227, 248, 207, 227, 1, 199, 114, 207, + 227, 1, 218, 60, 207, 227, 1, 207, 36, 207, 227, 1, 242, 58, 207, 227, 1, + 188, 207, 227, 1, 172, 207, 227, 1, 237, 195, 207, 227, 1, 203, 90, 207, + 227, 1, 249, 136, 207, 227, 1, 178, 207, 227, 1, 183, 207, 227, 1, 213, + 252, 207, 227, 1, 194, 207, 227, 1, 201, 114, 207, 227, 1, 212, 64, 207, + 227, 1, 200, 181, 207, 227, 1, 144, 207, 227, 111, 2, 216, 168, 207, 227, + 111, 2, 216, 142, 207, 227, 111, 2, 216, 139, 207, 227, 22, 2, 216, 156, + 207, 227, 22, 2, 216, 138, 207, 227, 22, 2, 216, 161, 207, 227, 22, 2, + 216, 148, 207, 227, 22, 2, 216, 169, 207, 227, 22, 2, 216, 158, 207, 227, + 2, 216, 172, 207, 227, 2, 202, 208, 207, 227, 111, 2, 216, 103, 178, 207, + 227, 111, 2, 216, 103, 201, 114, 207, 227, 1, 226, 207, 207, 227, 1, 207, + 164, 207, 227, 17, 199, 81, 207, 227, 17, 102, 207, 227, 17, 105, 207, + 227, 17, 147, 207, 227, 17, 149, 207, 227, 17, 164, 207, 227, 17, 187, + 207, 227, 17, 210, 135, 207, 227, 17, 192, 207, 227, 17, 219, 113, 207, + 227, 250, 122, 207, 227, 1, 213, 108, 207, 227, 1, 224, 233, 207, 227, 1, + 248, 200, 207, 227, 1, 47, 227, 118, 207, 227, 1, 47, 223, 243, 249, 54, + 1, 62, 249, 54, 1, 209, 150, 62, 249, 54, 1, 144, 249, 54, 1, 209, 150, + 144, 249, 54, 1, 222, 175, 144, 249, 54, 1, 249, 136, 249, 54, 1, 227, + 43, 249, 136, 249, 54, 1, 172, 249, 54, 1, 209, 150, 172, 249, 54, 1, + 188, 249, 54, 1, 222, 175, 188, 249, 54, 1, 201, 114, 249, 54, 1, 209, + 150, 201, 114, 249, 54, 1, 216, 185, 201, 114, 249, 54, 1, 236, 89, 249, + 54, 1, 209, 150, 236, 89, 249, 54, 1, 227, 248, 249, 54, 1, 242, 58, 249, + 54, 1, 213, 252, 249, 54, 1, 209, 150, 213, 252, 249, 54, 1, 178, 249, + 54, 1, 209, 150, 178, 249, 54, 1, 208, 252, 207, 36, 249, 54, 1, 218, + 219, 207, 36, 249, 54, 1, 212, 64, 249, 54, 1, 209, 150, 212, 64, 249, + 54, 1, 222, 175, 212, 64, 249, 54, 1, 183, 249, 54, 1, 209, 150, 183, + 249, 54, 1, 219, 253, 249, 54, 1, 194, 249, 54, 1, 209, 150, 194, 249, + 54, 1, 218, 60, 249, 54, 1, 247, 190, 249, 54, 1, 220, 75, 249, 54, 1, + 222, 110, 249, 54, 1, 70, 249, 54, 1, 66, 249, 54, 2, 205, 177, 249, 54, + 22, 2, 72, 249, 54, 22, 2, 216, 185, 72, 249, 54, 22, 2, 238, 255, 249, + 54, 22, 2, 70, 249, 54, 22, 2, 227, 43, 70, 249, 54, 22, 2, 74, 249, 54, + 22, 2, 227, 43, 74, 249, 54, 22, 2, 66, 249, 54, 22, 2, 108, 36, 209, + 150, 212, 64, 249, 54, 111, 2, 219, 255, 249, 54, 111, 2, 234, 247, 249, + 54, 216, 151, 249, 54, 216, 147, 249, 54, 16, 248, 166, 220, 162, 222, + 18, 249, 54, 16, 248, 166, 215, 159, 249, 54, 16, 248, 166, 227, 144, + 249, 54, 16, 248, 166, 216, 151, 224, 243, 1, 161, 224, 243, 1, 226, 102, + 224, 243, 1, 226, 207, 224, 243, 1, 236, 89, 224, 243, 1, 235, 131, 224, + 243, 1, 219, 253, 224, 243, 1, 247, 190, 224, 243, 1, 247, 37, 224, 243, + 1, 227, 248, 224, 243, 1, 218, 60, 224, 243, 1, 207, 36, 224, 243, 1, + 206, 122, 224, 243, 1, 242, 58, 224, 243, 1, 188, 224, 243, 1, 172, 224, + 243, 1, 215, 135, 224, 243, 1, 215, 245, 224, 243, 1, 237, 195, 224, 243, + 1, 237, 55, 224, 243, 1, 249, 136, 224, 243, 1, 248, 145, 224, 243, 1, + 178, 224, 243, 1, 221, 143, 224, 243, 1, 205, 32, 224, 243, 1, 205, 22, + 224, 243, 1, 239, 93, 224, 243, 1, 183, 224, 243, 1, 213, 252, 224, 243, + 1, 194, 224, 243, 1, 144, 224, 243, 1, 234, 39, 224, 243, 1, 203, 90, + 224, 243, 1, 212, 64, 224, 243, 1, 210, 114, 224, 243, 1, 201, 114, 224, + 243, 1, 62, 224, 243, 208, 12, 1, 183, 224, 243, 208, 12, 1, 213, 252, + 224, 243, 22, 2, 252, 138, 224, 243, 22, 2, 70, 224, 243, 22, 2, 74, 224, + 243, 22, 2, 217, 63, 224, 243, 22, 2, 66, 224, 243, 22, 2, 203, 182, 224, + 243, 22, 2, 72, 224, 243, 111, 2, 227, 118, 224, 243, 111, 2, 223, 243, + 224, 243, 111, 2, 156, 224, 243, 111, 2, 220, 214, 224, 243, 111, 2, 216, + 226, 224, 243, 111, 2, 146, 224, 243, 111, 2, 207, 83, 224, 243, 111, 2, + 218, 34, 224, 243, 111, 2, 227, 64, 224, 243, 2, 213, 213, 224, 243, 2, + 218, 100, 224, 243, 214, 212, 207, 34, 224, 243, 214, 212, 218, 45, 206, + 18, 207, 34, 224, 243, 214, 212, 247, 44, 224, 243, 214, 212, 205, 14, + 247, 44, 224, 243, 214, 212, 205, 13, 224, 243, 17, 199, 81, 224, 243, + 17, 102, 224, 243, 17, 105, 224, 243, 17, 147, 224, 243, 17, 149, 224, + 243, 17, 164, 224, 243, 17, 187, 224, 243, 17, 210, 135, 224, 243, 17, + 192, 224, 243, 17, 219, 113, 224, 243, 1, 204, 253, 224, 243, 1, 204, + 241, 224, 243, 1, 241, 220, 217, 94, 246, 229, 17, 199, 81, 217, 94, 246, + 229, 17, 102, 217, 94, 246, 229, 17, 105, 217, 94, 246, 229, 17, 147, + 217, 94, 246, 229, 17, 149, 217, 94, 246, 229, 17, 164, 217, 94, 246, + 229, 17, 187, 217, 94, 246, 229, 17, 210, 135, 217, 94, 246, 229, 17, + 192, 217, 94, 246, 229, 17, 219, 113, 217, 94, 246, 229, 1, 194, 217, 94, + 246, 229, 1, 250, 155, 217, 94, 246, 229, 1, 251, 193, 217, 94, 246, 229, + 1, 251, 76, 217, 94, 246, 229, 1, 251, 151, 217, 94, 246, 229, 1, 225, + 175, 217, 94, 246, 229, 1, 252, 100, 217, 94, 246, 229, 1, 252, 101, 217, + 94, 246, 229, 1, 252, 99, 217, 94, 246, 229, 1, 252, 94, 217, 94, 246, + 229, 1, 224, 210, 217, 94, 246, 229, 1, 228, 26, 217, 94, 246, 229, 1, + 228, 152, 217, 94, 246, 229, 1, 228, 47, 217, 94, 246, 229, 1, 228, 35, + 217, 94, 246, 229, 1, 224, 42, 217, 94, 246, 229, 1, 204, 38, 217, 94, + 246, 229, 1, 204, 36, 217, 94, 246, 229, 1, 203, 233, 217, 94, 246, 229, + 1, 203, 174, 217, 94, 246, 229, 1, 225, 40, 217, 94, 246, 229, 1, 238, + 133, 217, 94, 246, 229, 1, 239, 2, 217, 94, 246, 229, 1, 238, 179, 217, + 94, 246, 229, 1, 238, 108, 217, 94, 246, 229, 1, 224, 110, 217, 94, 246, + 229, 1, 217, 6, 217, 94, 246, 229, 1, 217, 142, 217, 94, 246, 229, 1, + 216, 249, 217, 94, 246, 229, 1, 217, 108, 217, 94, 246, 229, 221, 42, + 204, 218, 217, 94, 246, 229, 236, 84, 204, 219, 217, 94, 246, 229, 221, + 40, 204, 219, 217, 94, 246, 229, 213, 150, 217, 94, 246, 229, 215, 243, + 217, 94, 246, 229, 251, 184, 217, 94, 246, 229, 214, 212, 221, 36, 217, + 94, 246, 229, 214, 212, 53, 221, 36, 37, 4, 1, 212, 219, 203, 59, 37, 4, + 1, 224, 82, 241, 175, 37, 4, 1, 220, 124, 74, 37, 4, 1, 201, 28, 238, + 104, 37, 4, 1, 206, 248, 206, 201, 37, 4, 1, 206, 43, 206, 201, 37, 4, 1, + 206, 248, 234, 165, 54, 37, 4, 1, 206, 248, 200, 65, 37, 4, 1, 204, 0, + 204, 20, 207, 227, 214, 212, 248, 166, 207, 198, 207, 227, 214, 212, 248, + 166, 216, 152, 207, 227, 214, 212, 248, 166, 214, 200, 207, 227, 214, + 212, 248, 166, 247, 175, 207, 227, 214, 212, 248, 166, 224, 234, 211, + 250, 207, 227, 214, 212, 248, 166, 227, 108, 211, 250, 207, 227, 214, + 212, 248, 166, 242, 59, 211, 250, 207, 227, 214, 212, 248, 166, 249, 137, + 211, 250, 203, 56, 150, 227, 41, 203, 56, 150, 210, 81, 203, 56, 150, + 215, 23, 203, 56, 2, 219, 126, 203, 56, 2, 200, 86, 221, 202, 207, 189, + 203, 56, 150, 200, 86, 251, 189, 228, 104, 207, 189, 203, 56, 150, 200, + 86, 228, 104, 207, 189, 203, 56, 150, 200, 86, 227, 29, 228, 104, 207, + 189, 203, 56, 150, 247, 152, 57, 203, 56, 150, 200, 86, 227, 29, 228, + 104, 207, 190, 211, 220, 203, 56, 150, 53, 207, 189, 203, 56, 150, 205, + 83, 207, 189, 203, 56, 150, 227, 29, 251, 35, 203, 56, 150, 73, 57, 203, + 56, 150, 120, 190, 57, 203, 56, 150, 126, 190, 57, 203, 56, 150, 213, 34, + 227, 40, 228, 104, 207, 189, 203, 56, 150, 250, 152, 228, 104, 207, 189, + 203, 56, 2, 202, 204, 207, 189, 203, 56, 2, 202, 204, 204, 33, 203, 56, + 2, 213, 105, 202, 204, 204, 33, 203, 56, 2, 202, 204, 251, 35, 203, 56, + 2, 213, 105, 202, 204, 251, 35, 203, 56, 2, 202, 204, 204, 34, 3, 207, 6, + 203, 56, 2, 202, 204, 251, 36, 3, 207, 6, 203, 56, 2, 251, 34, 251, 50, + 203, 56, 2, 251, 34, 249, 104, 203, 56, 2, 251, 34, 203, 81, 203, 56, 2, + 251, 34, 203, 82, 3, 207, 6, 203, 56, 2, 205, 214, 203, 56, 2, 234, 87, + 168, 251, 33, 203, 56, 2, 168, 251, 33, 203, 56, 2, 212, 177, 168, 251, + 33, 203, 56, 2, 251, 34, 204, 40, 221, 27, 203, 56, 2, 250, 230, 203, 56, + 2, 212, 228, 250, 230, 203, 56, 150, 247, 152, 56, 203, 56, 2, 227, 201, + 203, 56, 2, 203, 226, 203, 56, 150, 213, 27, 56, 203, 56, 150, 53, 213, + 27, 56, 8, 1, 4, 6, 62, 8, 1, 4, 6, 251, 221, 8, 4, 1, 204, 185, 251, + 221, 8, 1, 4, 6, 249, 71, 250, 103, 8, 1, 4, 6, 247, 223, 8, 1, 4, 6, + 242, 153, 8, 1, 4, 6, 238, 74, 8, 1, 4, 6, 72, 8, 4, 1, 204, 185, 176, + 72, 8, 4, 1, 204, 185, 70, 8, 1, 4, 6, 227, 251, 8, 1, 4, 6, 227, 118, 8, + 1, 4, 6, 225, 193, 3, 97, 8, 1, 4, 6, 223, 243, 8, 1, 4, 6, 213, 105, + 220, 214, 8, 1, 4, 6, 74, 8, 1, 4, 6, 176, 74, 8, 4, 1, 209, 173, 74, 8, + 4, 1, 209, 173, 176, 74, 8, 4, 1, 209, 173, 163, 3, 97, 8, 4, 1, 204, + 185, 217, 121, 8, 1, 4, 6, 217, 3, 8, 4, 1, 205, 158, 167, 74, 8, 4, 1, + 248, 93, 167, 74, 8, 1, 4, 6, 216, 226, 8, 1, 4, 6, 213, 105, 146, 8, 1, + 4, 6, 204, 185, 146, 8, 1, 4, 6, 207, 83, 8, 1, 4, 6, 66, 8, 4, 1, 209, + 173, 66, 8, 4, 1, 209, 173, 241, 72, 66, 8, 4, 1, 209, 173, 204, 185, + 223, 243, 8, 1, 4, 6, 203, 168, 8, 1, 4, 6, 201, 147, 8, 1, 4, 6, 199, + 157, 8, 1, 4, 6, 238, 8, 8, 1, 202, 189, 225, 66, 208, 216, 8, 1, 251, + 171, 31, 1, 4, 6, 236, 60, 31, 1, 4, 6, 225, 87, 31, 1, 4, 6, 215, 204, + 31, 1, 4, 6, 213, 90, 31, 1, 4, 6, 214, 235, 37, 1, 4, 6, 238, 209, 67, + 1, 6, 62, 67, 1, 6, 251, 221, 67, 1, 6, 250, 103, 67, 1, 6, 249, 71, 250, + 103, 67, 1, 6, 242, 153, 67, 1, 6, 72, 67, 1, 6, 213, 105, 72, 67, 1, 6, + 236, 156, 67, 1, 6, 234, 247, 67, 1, 6, 70, 67, 1, 6, 227, 251, 67, 1, 6, + 227, 118, 67, 1, 6, 156, 67, 1, 6, 223, 243, 67, 1, 6, 220, 214, 67, 1, + 6, 213, 105, 220, 214, 67, 1, 6, 74, 67, 1, 6, 217, 3, 67, 1, 6, 216, + 226, 67, 1, 6, 146, 67, 1, 6, 207, 83, 67, 1, 6, 66, 67, 1, 6, 201, 147, + 67, 1, 4, 62, 67, 1, 4, 204, 185, 62, 67, 1, 4, 251, 112, 67, 1, 4, 204, + 185, 251, 221, 67, 1, 4, 250, 103, 67, 1, 4, 242, 153, 67, 1, 4, 72, 67, + 1, 4, 211, 218, 67, 1, 4, 176, 72, 67, 1, 4, 204, 185, 176, 72, 67, 1, 4, + 236, 156, 67, 1, 4, 204, 185, 70, 67, 1, 4, 227, 118, 67, 1, 4, 223, 243, + 67, 1, 4, 238, 165, 67, 1, 4, 74, 67, 1, 4, 176, 74, 67, 1, 4, 205, 158, + 167, 74, 67, 1, 4, 248, 93, 167, 74, 67, 1, 4, 216, 226, 67, 1, 4, 207, + 83, 67, 1, 4, 66, 67, 1, 4, 209, 173, 66, 67, 1, 4, 204, 185, 223, 243, + 67, 1, 4, 203, 168, 67, 1, 4, 251, 171, 67, 1, 4, 248, 208, 67, 1, 4, 31, + 236, 60, 67, 1, 4, 241, 136, 67, 1, 4, 31, 215, 229, 67, 1, 4, 246, 236, + 8, 208, 4, 4, 1, 70, 8, 208, 4, 4, 1, 146, 8, 208, 4, 4, 1, 66, 8, 208, + 4, 4, 1, 203, 168, 31, 208, 4, 4, 1, 248, 208, 31, 208, 4, 4, 1, 236, 60, + 31, 208, 4, 4, 1, 213, 90, 31, 208, 4, 4, 1, 215, 229, 31, 208, 4, 4, 1, + 246, 236, 8, 4, 1, 204, 31, 8, 4, 1, 68, 3, 101, 205, 240, 8, 4, 1, 242, + 154, 3, 101, 205, 240, 8, 4, 1, 238, 6, 3, 101, 205, 240, 8, 4, 1, 223, + 244, 3, 101, 205, 240, 8, 4, 1, 220, 215, 3, 101, 205, 240, 8, 4, 1, 216, + 227, 3, 101, 205, 240, 8, 4, 1, 214, 33, 3, 101, 205, 240, 8, 4, 1, 214, + 33, 3, 237, 69, 26, 101, 205, 240, 8, 4, 1, 212, 123, 3, 101, 205, 240, + 8, 4, 1, 207, 84, 3, 101, 205, 240, 8, 4, 1, 199, 158, 3, 101, 205, 240, + 8, 4, 1, 204, 185, 236, 156, 67, 1, 37, 238, 179, 8, 4, 1, 228, 71, 236, + 156, 8, 4, 1, 206, 125, 3, 208, 51, 8, 4, 6, 1, 233, 19, 3, 97, 8, 4, 1, + 228, 42, 3, 97, 8, 4, 1, 216, 227, 3, 97, 8, 4, 6, 1, 108, 3, 97, 8, 4, + 1, 203, 221, 3, 97, 8, 4, 1, 68, 3, 216, 184, 117, 8, 4, 1, 242, 154, 3, + 216, 184, 117, 8, 4, 1, 238, 6, 3, 216, 184, 117, 8, 4, 1, 236, 157, 3, + 216, 184, 117, 8, 4, 1, 227, 119, 3, 216, 184, 117, 8, 4, 1, 225, 193, 3, + 216, 184, 117, 8, 4, 1, 223, 244, 3, 216, 184, 117, 8, 4, 1, 220, 215, 3, + 216, 184, 117, 8, 4, 1, 216, 227, 3, 216, 184, 117, 8, 4, 1, 214, 33, 3, + 216, 184, 117, 8, 4, 1, 212, 123, 3, 216, 184, 117, 8, 4, 1, 238, 95, 3, + 216, 184, 117, 8, 4, 1, 203, 169, 3, 216, 184, 117, 8, 4, 1, 200, 196, 3, + 216, 184, 117, 8, 4, 1, 199, 158, 3, 216, 184, 117, 8, 4, 1, 35, 3, 213, + 111, 117, 8, 4, 1, 251, 113, 3, 213, 111, 117, 8, 4, 1, 242, 154, 3, 233, + 187, 26, 207, 6, 8, 4, 1, 197, 3, 213, 111, 117, 8, 4, 1, 176, 197, 3, + 213, 111, 117, 8, 4, 1, 213, 105, 176, 197, 3, 213, 111, 117, 8, 4, 1, + 211, 219, 3, 213, 111, 117, 8, 4, 1, 233, 19, 3, 213, 111, 117, 8, 4, 1, + 176, 163, 3, 213, 111, 117, 8, 4, 1, 238, 95, 3, 213, 111, 117, 8, 4, 1, + 108, 3, 213, 111, 117, 8, 4, 1, 238, 9, 3, 213, 111, 117, 67, 1, 4, 204, + 185, 251, 112, 67, 1, 4, 247, 223, 67, 1, 4, 247, 224, 3, 242, 198, 67, + 1, 4, 238, 74, 67, 1, 4, 213, 105, 176, 72, 67, 1, 4, 238, 5, 67, 1, 4, + 240, 181, 227, 252, 3, 97, 67, 1, 4, 135, 236, 156, 67, 1, 4, 204, 185, + 234, 247, 67, 1, 4, 233, 19, 3, 97, 67, 1, 4, 228, 41, 67, 1, 4, 6, 70, + 67, 1, 4, 6, 233, 19, 3, 97, 67, 1, 4, 227, 252, 3, 242, 230, 67, 1, 4, + 225, 193, 3, 213, 111, 117, 67, 1, 4, 225, 193, 3, 216, 184, 117, 67, 1, + 4, 6, 156, 67, 1, 4, 223, 244, 3, 117, 67, 1, 4, 204, 185, 223, 244, 3, + 168, 225, 16, 67, 1, 4, 220, 215, 3, 49, 117, 67, 1, 4, 220, 215, 3, 213, + 111, 117, 67, 1, 4, 6, 220, 214, 67, 1, 4, 249, 71, 74, 67, 1, 4, 215, + 229, 67, 1, 4, 212, 123, 3, 117, 67, 1, 4, 238, 94, 67, 1, 4, 207, 84, 3, + 216, 184, 117, 67, 1, 4, 108, 148, 67, 1, 4, 203, 220, 67, 1, 4, 6, 66, + 67, 1, 4, 203, 169, 3, 117, 67, 1, 4, 204, 185, 203, 168, 67, 1, 4, 199, + 157, 67, 1, 4, 199, 158, 3, 213, 111, 117, 67, 1, 4, 199, 158, 3, 242, + 198, 67, 1, 4, 238, 8, 67, 1, 4, 206, 88, 38, 239, 180, 235, 74, 251, + 251, 38, 239, 180, 251, 239, 251, 251, 38, 209, 42, 57, 38, 207, 196, 81, + 38, 222, 227, 38, 235, 71, 38, 222, 225, 38, 251, 237, 38, 235, 72, 38, + 251, 238, 38, 8, 4, 1, 214, 33, 57, 38, 248, 56, 38, 222, 226, 38, 53, + 246, 147, 56, 38, 217, 111, 56, 38, 199, 27, 57, 38, 228, 27, 57, 38, + 203, 215, 56, 38, 203, 198, 56, 38, 8, 4, 1, 237, 41, 176, 35, 56, 38, 8, + 4, 1, 251, 221, 38, 8, 4, 1, 251, 31, 38, 8, 4, 1, 250, 123, 38, 8, 4, 1, + 247, 224, 247, 69, 38, 8, 4, 1, 228, 71, 242, 153, 38, 8, 4, 1, 238, 74, + 38, 8, 4, 1, 236, 156, 38, 8, 1, 4, 6, 236, 156, 38, 8, 4, 1, 227, 118, + 38, 8, 4, 1, 156, 38, 8, 1, 4, 6, 156, 38, 8, 1, 4, 6, 223, 243, 38, 8, + 4, 1, 220, 214, 38, 8, 1, 4, 6, 220, 214, 38, 8, 1, 4, 6, 146, 38, 8, 4, + 1, 214, 33, 212, 222, 38, 8, 4, 1, 212, 122, 38, 8, 4, 1, 168, 212, 122, + 38, 8, 4, 1, 199, 157, 38, 8, 4, 1, 251, 112, 38, 8, 4, 1, 250, 103, 38, + 8, 4, 1, 248, 208, 38, 8, 4, 1, 211, 218, 38, 8, 4, 1, 238, 5, 38, 8, 4, + 1, 225, 193, 3, 53, 101, 205, 240, 38, 8, 4, 1, 163, 3, 162, 247, 57, 97, + 38, 8, 4, 1, 216, 226, 38, 8, 4, 1, 238, 94, 38, 8, 4, 1, 108, 3, 162, + 247, 57, 97, 38, 8, 4, 1, 201, 147, 38, 8, 4, 1, 35, 3, 241, 74, 38, 8, + 4, 1, 163, 3, 241, 74, 38, 8, 4, 1, 108, 3, 241, 74, 38, 115, 207, 18, + 56, 38, 241, 145, 81, 38, 53, 228, 50, 248, 58, 57, 38, 251, 117, 160, + 205, 186, 57, 38, 49, 250, 203, 56, 38, 51, 250, 203, 26, 127, 250, 203, + 57, 8, 6, 1, 35, 3, 213, 27, 57, 8, 4, 1, 35, 3, 213, 27, 57, 8, 6, 1, + 68, 3, 73, 56, 8, 4, 1, 68, 3, 73, 56, 8, 6, 1, 68, 3, 73, 57, 8, 4, 1, + 68, 3, 73, 57, 8, 6, 1, 68, 3, 224, 177, 57, 8, 4, 1, 68, 3, 224, 177, + 57, 8, 6, 1, 247, 224, 3, 247, 70, 26, 169, 8, 4, 1, 247, 224, 3, 247, + 70, 26, 169, 8, 6, 1, 242, 154, 3, 73, 56, 8, 4, 1, 242, 154, 3, 73, 56, + 8, 6, 1, 242, 154, 3, 73, 57, 8, 4, 1, 242, 154, 3, 73, 57, 8, 6, 1, 242, + 154, 3, 224, 177, 57, 8, 4, 1, 242, 154, 3, 224, 177, 57, 8, 6, 1, 242, + 154, 3, 247, 69, 8, 4, 1, 242, 154, 3, 247, 69, 8, 6, 1, 242, 154, 3, + 246, 147, 57, 8, 4, 1, 242, 154, 3, 246, 147, 57, 8, 6, 1, 197, 3, 222, + 229, 26, 235, 73, 8, 4, 1, 197, 3, 222, 229, 26, 235, 73, 8, 6, 1, 197, + 3, 222, 229, 26, 169, 8, 4, 1, 197, 3, 222, 229, 26, 169, 8, 6, 1, 197, + 3, 246, 147, 57, 8, 4, 1, 197, 3, 246, 147, 57, 8, 6, 1, 197, 3, 205, + 241, 57, 8, 4, 1, 197, 3, 205, 241, 57, 8, 6, 1, 197, 3, 247, 70, 26, + 248, 57, 8, 4, 1, 197, 3, 247, 70, 26, 248, 57, 8, 6, 1, 238, 6, 3, 73, + 56, 8, 4, 1, 238, 6, 3, 73, 56, 8, 6, 1, 236, 157, 3, 222, 228, 8, 4, 1, + 236, 157, 3, 222, 228, 8, 6, 1, 234, 248, 3, 73, 56, 8, 4, 1, 234, 248, + 3, 73, 56, 8, 6, 1, 234, 248, 3, 73, 57, 8, 4, 1, 234, 248, 3, 73, 57, 8, + 6, 1, 234, 248, 3, 241, 74, 8, 4, 1, 234, 248, 3, 241, 74, 8, 6, 1, 234, + 248, 3, 247, 69, 8, 4, 1, 234, 248, 3, 247, 69, 8, 6, 1, 234, 248, 3, + 248, 58, 57, 8, 4, 1, 234, 248, 3, 248, 58, 57, 8, 6, 1, 233, 19, 3, 205, + 241, 57, 8, 4, 1, 233, 19, 3, 205, 241, 57, 8, 6, 1, 233, 19, 3, 241, 75, + 26, 169, 8, 4, 1, 233, 19, 3, 241, 75, 26, 169, 8, 6, 1, 227, 119, 3, + 169, 8, 4, 1, 227, 119, 3, 169, 8, 6, 1, 227, 119, 3, 73, 57, 8, 4, 1, + 227, 119, 3, 73, 57, 8, 6, 1, 227, 119, 3, 224, 177, 57, 8, 4, 1, 227, + 119, 3, 224, 177, 57, 8, 6, 1, 225, 193, 3, 73, 57, 8, 4, 1, 225, 193, 3, + 73, 57, 8, 6, 1, 225, 193, 3, 73, 248, 228, 26, 222, 228, 8, 4, 1, 225, + 193, 3, 73, 248, 228, 26, 222, 228, 8, 6, 1, 225, 193, 3, 224, 177, 57, + 8, 4, 1, 225, 193, 3, 224, 177, 57, 8, 6, 1, 225, 193, 3, 246, 147, 57, + 8, 4, 1, 225, 193, 3, 246, 147, 57, 8, 6, 1, 223, 244, 3, 169, 8, 4, 1, + 223, 244, 3, 169, 8, 6, 1, 223, 244, 3, 73, 56, 8, 4, 1, 223, 244, 3, 73, + 56, 8, 6, 1, 223, 244, 3, 73, 57, 8, 4, 1, 223, 244, 3, 73, 57, 8, 6, 1, + 220, 215, 3, 73, 56, 8, 4, 1, 220, 215, 3, 73, 56, 8, 6, 1, 220, 215, 3, + 73, 57, 8, 4, 1, 220, 215, 3, 73, 57, 8, 6, 1, 220, 215, 3, 224, 177, 57, + 8, 4, 1, 220, 215, 3, 224, 177, 57, 8, 6, 1, 220, 215, 3, 246, 147, 57, + 8, 4, 1, 220, 215, 3, 246, 147, 57, 8, 6, 1, 163, 3, 205, 241, 26, 169, + 8, 4, 1, 163, 3, 205, 241, 26, 169, 8, 6, 1, 163, 3, 205, 241, 26, 241, + 74, 8, 4, 1, 163, 3, 205, 241, 26, 241, 74, 8, 6, 1, 163, 3, 222, 229, + 26, 235, 73, 8, 4, 1, 163, 3, 222, 229, 26, 235, 73, 8, 6, 1, 163, 3, + 222, 229, 26, 169, 8, 4, 1, 163, 3, 222, 229, 26, 169, 8, 6, 1, 216, 227, + 3, 169, 8, 4, 1, 216, 227, 3, 169, 8, 6, 1, 216, 227, 3, 73, 56, 8, 4, 1, + 216, 227, 3, 73, 56, 8, 6, 1, 214, 33, 3, 73, 56, 8, 4, 1, 214, 33, 3, + 73, 56, 8, 6, 1, 214, 33, 3, 73, 57, 8, 4, 1, 214, 33, 3, 73, 57, 8, 6, + 1, 214, 33, 3, 73, 248, 228, 26, 222, 228, 8, 4, 1, 214, 33, 3, 73, 248, + 228, 26, 222, 228, 8, 6, 1, 214, 33, 3, 224, 177, 57, 8, 4, 1, 214, 33, + 3, 224, 177, 57, 8, 6, 1, 212, 123, 3, 73, 56, 8, 4, 1, 212, 123, 3, 73, + 56, 8, 6, 1, 212, 123, 3, 73, 57, 8, 4, 1, 212, 123, 3, 73, 57, 8, 6, 1, + 212, 123, 3, 251, 239, 26, 73, 56, 8, 4, 1, 212, 123, 3, 251, 239, 26, + 73, 56, 8, 6, 1, 212, 123, 3, 247, 126, 26, 73, 56, 8, 4, 1, 212, 123, 3, + 247, 126, 26, 73, 56, 8, 6, 1, 212, 123, 3, 73, 248, 228, 26, 73, 56, 8, + 4, 1, 212, 123, 3, 73, 248, 228, 26, 73, 56, 8, 6, 1, 207, 84, 3, 73, 56, + 8, 4, 1, 207, 84, 3, 73, 56, 8, 6, 1, 207, 84, 3, 73, 57, 8, 4, 1, 207, + 84, 3, 73, 57, 8, 6, 1, 207, 84, 3, 224, 177, 57, 8, 4, 1, 207, 84, 3, + 224, 177, 57, 8, 6, 1, 207, 84, 3, 246, 147, 57, 8, 4, 1, 207, 84, 3, + 246, 147, 57, 8, 6, 1, 108, 3, 241, 75, 57, 8, 4, 1, 108, 3, 241, 75, 57, + 8, 6, 1, 108, 3, 205, 241, 57, 8, 4, 1, 108, 3, 205, 241, 57, 8, 6, 1, + 108, 3, 246, 147, 57, 8, 4, 1, 108, 3, 246, 147, 57, 8, 6, 1, 108, 3, + 205, 241, 26, 169, 8, 4, 1, 108, 3, 205, 241, 26, 169, 8, 6, 1, 108, 3, + 222, 229, 26, 241, 74, 8, 4, 1, 108, 3, 222, 229, 26, 241, 74, 8, 6, 1, + 203, 169, 3, 205, 240, 8, 4, 1, 203, 169, 3, 205, 240, 8, 6, 1, 203, 169, + 3, 73, 57, 8, 4, 1, 203, 169, 3, 73, 57, 8, 6, 1, 201, 148, 3, 235, 73, + 8, 4, 1, 201, 148, 3, 235, 73, 8, 6, 1, 201, 148, 3, 169, 8, 4, 1, 201, + 148, 3, 169, 8, 6, 1, 201, 148, 3, 241, 74, 8, 4, 1, 201, 148, 3, 241, + 74, 8, 6, 1, 201, 148, 3, 73, 56, 8, 4, 1, 201, 148, 3, 73, 56, 8, 6, 1, + 201, 148, 3, 73, 57, 8, 4, 1, 201, 148, 3, 73, 57, 8, 6, 1, 200, 196, 3, + 73, 56, 8, 4, 1, 200, 196, 3, 73, 56, 8, 6, 1, 200, 196, 3, 241, 74, 8, + 4, 1, 200, 196, 3, 241, 74, 8, 6, 1, 200, 124, 3, 73, 56, 8, 4, 1, 200, + 124, 3, 73, 56, 8, 6, 1, 199, 158, 3, 246, 146, 8, 4, 1, 199, 158, 3, + 246, 146, 8, 6, 1, 199, 158, 3, 73, 57, 8, 4, 1, 199, 158, 3, 73, 57, 8, + 6, 1, 199, 158, 3, 224, 177, 57, 8, 4, 1, 199, 158, 3, 224, 177, 57, 8, + 4, 1, 234, 248, 3, 224, 177, 57, 8, 4, 1, 207, 84, 3, 241, 74, 8, 4, 1, + 201, 148, 3, 213, 27, 56, 8, 4, 1, 200, 124, 3, 213, 27, 56, 8, 4, 1, 35, + 3, 51, 167, 213, 26, 8, 4, 1, 168, 212, 123, 3, 73, 56, 8, 4, 1, 168, + 212, 123, 3, 241, 71, 97, 8, 4, 1, 168, 212, 123, 3, 122, 97, 8, 6, 1, + 210, 79, 212, 122, 8, 4, 1, 241, 136, 8, 6, 1, 35, 3, 73, 57, 8, 4, 1, + 35, 3, 73, 57, 8, 6, 1, 35, 3, 233, 187, 56, 8, 4, 1, 35, 3, 233, 187, + 56, 8, 6, 1, 35, 3, 246, 147, 26, 169, 8, 4, 1, 35, 3, 246, 147, 26, 169, + 8, 6, 1, 35, 3, 246, 147, 26, 235, 73, 8, 4, 1, 35, 3, 246, 147, 26, 235, + 73, 8, 6, 1, 35, 3, 246, 147, 26, 233, 187, 56, 8, 4, 1, 35, 3, 246, 147, + 26, 233, 187, 56, 8, 6, 1, 35, 3, 246, 147, 26, 205, 240, 8, 4, 1, 35, 3, + 246, 147, 26, 205, 240, 8, 6, 1, 35, 3, 246, 147, 26, 73, 57, 8, 4, 1, + 35, 3, 246, 147, 26, 73, 57, 8, 6, 1, 35, 3, 248, 58, 26, 169, 8, 4, 1, + 35, 3, 248, 58, 26, 169, 8, 6, 1, 35, 3, 248, 58, 26, 235, 73, 8, 4, 1, + 35, 3, 248, 58, 26, 235, 73, 8, 6, 1, 35, 3, 248, 58, 26, 233, 187, 56, + 8, 4, 1, 35, 3, 248, 58, 26, 233, 187, 56, 8, 6, 1, 35, 3, 248, 58, 26, + 205, 240, 8, 4, 1, 35, 3, 248, 58, 26, 205, 240, 8, 6, 1, 35, 3, 248, 58, + 26, 73, 57, 8, 4, 1, 35, 3, 248, 58, 26, 73, 57, 8, 6, 1, 197, 3, 73, 57, + 8, 4, 1, 197, 3, 73, 57, 8, 6, 1, 197, 3, 233, 187, 56, 8, 4, 1, 197, 3, + 233, 187, 56, 8, 6, 1, 197, 3, 205, 240, 8, 4, 1, 197, 3, 205, 240, 8, 6, + 1, 197, 3, 246, 147, 26, 169, 8, 4, 1, 197, 3, 246, 147, 26, 169, 8, 6, + 1, 197, 3, 246, 147, 26, 235, 73, 8, 4, 1, 197, 3, 246, 147, 26, 235, 73, + 8, 6, 1, 197, 3, 246, 147, 26, 233, 187, 56, 8, 4, 1, 197, 3, 246, 147, + 26, 233, 187, 56, 8, 6, 1, 197, 3, 246, 147, 26, 205, 240, 8, 4, 1, 197, + 3, 246, 147, 26, 205, 240, 8, 6, 1, 197, 3, 246, 147, 26, 73, 57, 8, 4, + 1, 197, 3, 246, 147, 26, 73, 57, 8, 6, 1, 233, 19, 3, 233, 187, 56, 8, 4, + 1, 233, 19, 3, 233, 187, 56, 8, 6, 1, 233, 19, 3, 73, 57, 8, 4, 1, 233, + 19, 3, 73, 57, 8, 6, 1, 163, 3, 73, 57, 8, 4, 1, 163, 3, 73, 57, 8, 6, 1, + 163, 3, 233, 187, 56, 8, 4, 1, 163, 3, 233, 187, 56, 8, 6, 1, 163, 3, + 246, 147, 26, 169, 8, 4, 1, 163, 3, 246, 147, 26, 169, 8, 6, 1, 163, 3, + 246, 147, 26, 235, 73, 8, 4, 1, 163, 3, 246, 147, 26, 235, 73, 8, 6, 1, + 163, 3, 246, 147, 26, 233, 187, 56, 8, 4, 1, 163, 3, 246, 147, 26, 233, + 187, 56, 8, 6, 1, 163, 3, 246, 147, 26, 205, 240, 8, 4, 1, 163, 3, 246, + 147, 26, 205, 240, 8, 6, 1, 163, 3, 246, 147, 26, 73, 57, 8, 4, 1, 163, + 3, 246, 147, 26, 73, 57, 8, 6, 1, 163, 3, 233, 125, 26, 169, 8, 4, 1, + 163, 3, 233, 125, 26, 169, 8, 6, 1, 163, 3, 233, 125, 26, 235, 73, 8, 4, + 1, 163, 3, 233, 125, 26, 235, 73, 8, 6, 1, 163, 3, 233, 125, 26, 233, + 187, 56, 8, 4, 1, 163, 3, 233, 125, 26, 233, 187, 56, 8, 6, 1, 163, 3, + 233, 125, 26, 205, 240, 8, 4, 1, 163, 3, 233, 125, 26, 205, 240, 8, 6, 1, + 163, 3, 233, 125, 26, 73, 57, 8, 4, 1, 163, 3, 233, 125, 26, 73, 57, 8, + 6, 1, 108, 3, 73, 57, 8, 4, 1, 108, 3, 73, 57, 8, 6, 1, 108, 3, 233, 187, + 56, 8, 4, 1, 108, 3, 233, 187, 56, 8, 6, 1, 108, 3, 233, 125, 26, 169, 8, + 4, 1, 108, 3, 233, 125, 26, 169, 8, 6, 1, 108, 3, 233, 125, 26, 235, 73, + 8, 4, 1, 108, 3, 233, 125, 26, 235, 73, 8, 6, 1, 108, 3, 233, 125, 26, + 233, 187, 56, 8, 4, 1, 108, 3, 233, 125, 26, 233, 187, 56, 8, 6, 1, 108, + 3, 233, 125, 26, 205, 240, 8, 4, 1, 108, 3, 233, 125, 26, 205, 240, 8, 6, + 1, 108, 3, 233, 125, 26, 73, 57, 8, 4, 1, 108, 3, 233, 125, 26, 73, 57, + 8, 6, 1, 200, 124, 3, 235, 73, 8, 4, 1, 200, 124, 3, 235, 73, 8, 6, 1, + 200, 124, 3, 73, 57, 8, 4, 1, 200, 124, 3, 73, 57, 8, 6, 1, 200, 124, 3, + 233, 187, 56, 8, 4, 1, 200, 124, 3, 233, 187, 56, 8, 6, 1, 200, 124, 3, + 205, 240, 8, 4, 1, 200, 124, 3, 205, 240, 8, 6, 1, 221, 203, 224, 139, 8, + 4, 1, 221, 203, 224, 139, 8, 6, 1, 221, 203, 203, 168, 8, 4, 1, 221, 203, + 203, 168, 8, 6, 1, 200, 124, 3, 224, 74, 8, 4, 1, 200, 124, 3, 224, 74, + 31, 4, 1, 251, 113, 3, 214, 228, 31, 4, 1, 251, 113, 3, 241, 241, 31, 4, + 1, 251, 113, 3, 214, 229, 26, 203, 74, 31, 4, 1, 251, 113, 3, 241, 242, + 26, 203, 74, 31, 4, 1, 251, 113, 3, 214, 229, 26, 216, 231, 31, 4, 1, + 251, 113, 3, 241, 242, 26, 216, 231, 31, 4, 1, 251, 113, 3, 214, 229, 26, + 216, 20, 31, 4, 1, 251, 113, 3, 241, 242, 26, 216, 20, 31, 6, 1, 251, + 113, 3, 214, 228, 31, 6, 1, 251, 113, 3, 241, 241, 31, 6, 1, 251, 113, 3, + 214, 229, 26, 203, 74, 31, 6, 1, 251, 113, 3, 241, 242, 26, 203, 74, 31, + 6, 1, 251, 113, 3, 214, 229, 26, 216, 231, 31, 6, 1, 251, 113, 3, 241, + 242, 26, 216, 231, 31, 6, 1, 251, 113, 3, 214, 229, 26, 216, 20, 31, 6, + 1, 251, 113, 3, 241, 242, 26, 216, 20, 31, 4, 1, 238, 125, 3, 214, 228, + 31, 4, 1, 238, 125, 3, 241, 241, 31, 4, 1, 238, 125, 3, 214, 229, 26, + 203, 74, 31, 4, 1, 238, 125, 3, 241, 242, 26, 203, 74, 31, 4, 1, 238, + 125, 3, 214, 229, 26, 216, 231, 31, 4, 1, 238, 125, 3, 241, 242, 26, 216, + 231, 31, 6, 1, 238, 125, 3, 214, 228, 31, 6, 1, 238, 125, 3, 241, 241, + 31, 6, 1, 238, 125, 3, 214, 229, 26, 203, 74, 31, 6, 1, 238, 125, 3, 241, + 242, 26, 203, 74, 31, 6, 1, 238, 125, 3, 214, 229, 26, 216, 231, 31, 6, + 1, 238, 125, 3, 241, 242, 26, 216, 231, 31, 4, 1, 238, 80, 3, 214, 228, + 31, 4, 1, 238, 80, 3, 241, 241, 31, 4, 1, 238, 80, 3, 214, 229, 26, 203, + 74, 31, 4, 1, 238, 80, 3, 241, 242, 26, 203, 74, 31, 4, 1, 238, 80, 3, + 214, 229, 26, 216, 231, 31, 4, 1, 238, 80, 3, 241, 242, 26, 216, 231, 31, + 4, 1, 238, 80, 3, 214, 229, 26, 216, 20, 31, 4, 1, 238, 80, 3, 241, 242, + 26, 216, 20, 31, 6, 1, 238, 80, 3, 214, 228, 31, 6, 1, 238, 80, 3, 241, + 241, 31, 6, 1, 238, 80, 3, 214, 229, 26, 203, 74, 31, 6, 1, 238, 80, 3, + 241, 242, 26, 203, 74, 31, 6, 1, 238, 80, 3, 214, 229, 26, 216, 231, 31, + 6, 1, 238, 80, 3, 241, 242, 26, 216, 231, 31, 6, 1, 238, 80, 3, 214, 229, + 26, 216, 20, 31, 6, 1, 238, 80, 3, 241, 242, 26, 216, 20, 31, 4, 1, 228, + 42, 3, 214, 228, 31, 4, 1, 228, 42, 3, 241, 241, 31, 4, 1, 228, 42, 3, + 214, 229, 26, 203, 74, 31, 4, 1, 228, 42, 3, 241, 242, 26, 203, 74, 31, + 4, 1, 228, 42, 3, 214, 229, 26, 216, 231, 31, 4, 1, 228, 42, 3, 241, 242, + 26, 216, 231, 31, 4, 1, 228, 42, 3, 214, 229, 26, 216, 20, 31, 4, 1, 228, + 42, 3, 241, 242, 26, 216, 20, 31, 6, 1, 228, 42, 3, 214, 228, 31, 6, 1, + 228, 42, 3, 241, 241, 31, 6, 1, 228, 42, 3, 214, 229, 26, 203, 74, 31, 6, + 1, 228, 42, 3, 241, 242, 26, 203, 74, 31, 6, 1, 228, 42, 3, 214, 229, 26, + 216, 231, 31, 6, 1, 228, 42, 3, 241, 242, 26, 216, 231, 31, 6, 1, 228, + 42, 3, 214, 229, 26, 216, 20, 31, 6, 1, 228, 42, 3, 241, 242, 26, 216, + 20, 31, 4, 1, 217, 82, 3, 214, 228, 31, 4, 1, 217, 82, 3, 241, 241, 31, + 4, 1, 217, 82, 3, 214, 229, 26, 203, 74, 31, 4, 1, 217, 82, 3, 241, 242, + 26, 203, 74, 31, 4, 1, 217, 82, 3, 214, 229, 26, 216, 231, 31, 4, 1, 217, + 82, 3, 241, 242, 26, 216, 231, 31, 6, 1, 217, 82, 3, 214, 228, 31, 6, 1, + 217, 82, 3, 241, 241, 31, 6, 1, 217, 82, 3, 214, 229, 26, 203, 74, 31, 6, + 1, 217, 82, 3, 241, 242, 26, 203, 74, 31, 6, 1, 217, 82, 3, 214, 229, 26, + 216, 231, 31, 6, 1, 217, 82, 3, 241, 242, 26, 216, 231, 31, 4, 1, 203, + 221, 3, 214, 228, 31, 4, 1, 203, 221, 3, 241, 241, 31, 4, 1, 203, 221, 3, + 214, 229, 26, 203, 74, 31, 4, 1, 203, 221, 3, 241, 242, 26, 203, 74, 31, + 4, 1, 203, 221, 3, 214, 229, 26, 216, 231, 31, 4, 1, 203, 221, 3, 241, + 242, 26, 216, 231, 31, 4, 1, 203, 221, 3, 214, 229, 26, 216, 20, 31, 4, + 1, 203, 221, 3, 241, 242, 26, 216, 20, 31, 6, 1, 203, 221, 3, 241, 241, + 31, 6, 1, 203, 221, 3, 241, 242, 26, 203, 74, 31, 6, 1, 203, 221, 3, 241, + 242, 26, 216, 231, 31, 6, 1, 203, 221, 3, 241, 242, 26, 216, 20, 31, 4, + 1, 217, 84, 3, 214, 228, 31, 4, 1, 217, 84, 3, 241, 241, 31, 4, 1, 217, + 84, 3, 214, 229, 26, 203, 74, 31, 4, 1, 217, 84, 3, 241, 242, 26, 203, + 74, 31, 4, 1, 217, 84, 3, 214, 229, 26, 216, 231, 31, 4, 1, 217, 84, 3, + 241, 242, 26, 216, 231, 31, 4, 1, 217, 84, 3, 214, 229, 26, 216, 20, 31, + 4, 1, 217, 84, 3, 241, 242, 26, 216, 20, 31, 6, 1, 217, 84, 3, 214, 228, + 31, 6, 1, 217, 84, 3, 241, 241, 31, 6, 1, 217, 84, 3, 214, 229, 26, 203, + 74, 31, 6, 1, 217, 84, 3, 241, 242, 26, 203, 74, 31, 6, 1, 217, 84, 3, + 214, 229, 26, 216, 231, 31, 6, 1, 217, 84, 3, 241, 242, 26, 216, 231, 31, + 6, 1, 217, 84, 3, 214, 229, 26, 216, 20, 31, 6, 1, 217, 84, 3, 241, 242, + 26, 216, 20, 31, 4, 1, 251, 113, 3, 203, 74, 31, 4, 1, 251, 113, 3, 216, + 231, 31, 4, 1, 238, 125, 3, 203, 74, 31, 4, 1, 238, 125, 3, 216, 231, 31, + 4, 1, 238, 80, 3, 203, 74, 31, 4, 1, 238, 80, 3, 216, 231, 31, 4, 1, 228, + 42, 3, 203, 74, 31, 4, 1, 228, 42, 3, 216, 231, 31, 4, 1, 217, 82, 3, + 203, 74, 31, 4, 1, 217, 82, 3, 216, 231, 31, 4, 1, 203, 221, 3, 203, 74, + 31, 4, 1, 203, 221, 3, 216, 231, 31, 4, 1, 217, 84, 3, 203, 74, 31, 4, 1, + 217, 84, 3, 216, 231, 31, 4, 1, 251, 113, 3, 214, 229, 26, 199, 219, 31, + 4, 1, 251, 113, 3, 241, 242, 26, 199, 219, 31, 4, 1, 251, 113, 3, 214, + 229, 26, 203, 75, 26, 199, 219, 31, 4, 1, 251, 113, 3, 241, 242, 26, 203, + 75, 26, 199, 219, 31, 4, 1, 251, 113, 3, 214, 229, 26, 216, 232, 26, 199, + 219, 31, 4, 1, 251, 113, 3, 241, 242, 26, 216, 232, 26, 199, 219, 31, 4, + 1, 251, 113, 3, 214, 229, 26, 216, 21, 26, 199, 219, 31, 4, 1, 251, 113, + 3, 241, 242, 26, 216, 21, 26, 199, 219, 31, 6, 1, 251, 113, 3, 214, 229, + 26, 214, 242, 31, 6, 1, 251, 113, 3, 241, 242, 26, 214, 242, 31, 6, 1, + 251, 113, 3, 214, 229, 26, 203, 75, 26, 214, 242, 31, 6, 1, 251, 113, 3, + 241, 242, 26, 203, 75, 26, 214, 242, 31, 6, 1, 251, 113, 3, 214, 229, 26, + 216, 232, 26, 214, 242, 31, 6, 1, 251, 113, 3, 241, 242, 26, 216, 232, + 26, 214, 242, 31, 6, 1, 251, 113, 3, 214, 229, 26, 216, 21, 26, 214, 242, + 31, 6, 1, 251, 113, 3, 241, 242, 26, 216, 21, 26, 214, 242, 31, 4, 1, + 238, 80, 3, 214, 229, 26, 199, 219, 31, 4, 1, 238, 80, 3, 241, 242, 26, + 199, 219, 31, 4, 1, 238, 80, 3, 214, 229, 26, 203, 75, 26, 199, 219, 31, + 4, 1, 238, 80, 3, 241, 242, 26, 203, 75, 26, 199, 219, 31, 4, 1, 238, 80, + 3, 214, 229, 26, 216, 232, 26, 199, 219, 31, 4, 1, 238, 80, 3, 241, 242, + 26, 216, 232, 26, 199, 219, 31, 4, 1, 238, 80, 3, 214, 229, 26, 216, 21, + 26, 199, 219, 31, 4, 1, 238, 80, 3, 241, 242, 26, 216, 21, 26, 199, 219, + 31, 6, 1, 238, 80, 3, 214, 229, 26, 214, 242, 31, 6, 1, 238, 80, 3, 241, + 242, 26, 214, 242, 31, 6, 1, 238, 80, 3, 214, 229, 26, 203, 75, 26, 214, + 242, 31, 6, 1, 238, 80, 3, 241, 242, 26, 203, 75, 26, 214, 242, 31, 6, 1, + 238, 80, 3, 214, 229, 26, 216, 232, 26, 214, 242, 31, 6, 1, 238, 80, 3, + 241, 242, 26, 216, 232, 26, 214, 242, 31, 6, 1, 238, 80, 3, 214, 229, 26, + 216, 21, 26, 214, 242, 31, 6, 1, 238, 80, 3, 241, 242, 26, 216, 21, 26, + 214, 242, 31, 4, 1, 217, 84, 3, 214, 229, 26, 199, 219, 31, 4, 1, 217, + 84, 3, 241, 242, 26, 199, 219, 31, 4, 1, 217, 84, 3, 214, 229, 26, 203, + 75, 26, 199, 219, 31, 4, 1, 217, 84, 3, 241, 242, 26, 203, 75, 26, 199, + 219, 31, 4, 1, 217, 84, 3, 214, 229, 26, 216, 232, 26, 199, 219, 31, 4, + 1, 217, 84, 3, 241, 242, 26, 216, 232, 26, 199, 219, 31, 4, 1, 217, 84, + 3, 214, 229, 26, 216, 21, 26, 199, 219, 31, 4, 1, 217, 84, 3, 241, 242, + 26, 216, 21, 26, 199, 219, 31, 6, 1, 217, 84, 3, 214, 229, 26, 214, 242, + 31, 6, 1, 217, 84, 3, 241, 242, 26, 214, 242, 31, 6, 1, 217, 84, 3, 214, + 229, 26, 203, 75, 26, 214, 242, 31, 6, 1, 217, 84, 3, 241, 242, 26, 203, + 75, 26, 214, 242, 31, 6, 1, 217, 84, 3, 214, 229, 26, 216, 232, 26, 214, + 242, 31, 6, 1, 217, 84, 3, 241, 242, 26, 216, 232, 26, 214, 242, 31, 6, + 1, 217, 84, 3, 214, 229, 26, 216, 21, 26, 214, 242, 31, 6, 1, 217, 84, 3, + 241, 242, 26, 216, 21, 26, 214, 242, 31, 4, 1, 251, 113, 3, 202, 170, 31, + 4, 1, 251, 113, 3, 222, 228, 31, 4, 1, 251, 113, 3, 203, 75, 26, 199, + 219, 31, 4, 1, 251, 113, 3, 199, 219, 31, 4, 1, 251, 113, 3, 216, 232, + 26, 199, 219, 31, 4, 1, 251, 113, 3, 216, 20, 31, 4, 1, 251, 113, 3, 216, + 21, 26, 199, 219, 31, 6, 1, 251, 113, 3, 202, 170, 31, 6, 1, 251, 113, 3, + 222, 228, 31, 6, 1, 251, 113, 3, 203, 74, 31, 6, 1, 251, 113, 3, 216, + 231, 31, 6, 1, 251, 113, 3, 214, 242, 31, 226, 58, 31, 214, 242, 31, 214, + 228, 31, 216, 20, 31, 241, 68, 26, 216, 20, 31, 4, 1, 238, 80, 3, 203, + 75, 26, 199, 219, 31, 4, 1, 238, 80, 3, 199, 219, 31, 4, 1, 238, 80, 3, + 216, 232, 26, 199, 219, 31, 4, 1, 238, 80, 3, 216, 20, 31, 4, 1, 238, 80, + 3, 216, 21, 26, 199, 219, 31, 6, 1, 238, 125, 3, 203, 74, 31, 6, 1, 238, + 125, 3, 216, 231, 31, 6, 1, 238, 80, 3, 203, 74, 31, 6, 1, 238, 80, 3, + 216, 231, 31, 6, 1, 238, 80, 3, 214, 242, 31, 214, 229, 26, 203, 74, 31, + 214, 229, 26, 216, 231, 31, 214, 229, 26, 216, 20, 31, 4, 1, 228, 42, 3, + 202, 170, 31, 4, 1, 228, 42, 3, 222, 228, 31, 4, 1, 228, 42, 3, 241, 68, + 26, 203, 74, 31, 4, 1, 228, 42, 3, 241, 68, 26, 216, 231, 31, 4, 1, 228, + 42, 3, 216, 20, 31, 4, 1, 228, 42, 3, 241, 68, 26, 216, 20, 31, 6, 1, + 228, 42, 3, 202, 170, 31, 6, 1, 228, 42, 3, 222, 228, 31, 6, 1, 228, 42, + 3, 203, 74, 31, 6, 1, 228, 42, 3, 216, 231, 31, 241, 242, 26, 203, 74, + 31, 241, 242, 26, 216, 231, 31, 241, 242, 26, 216, 20, 31, 4, 1, 203, + 221, 3, 202, 170, 31, 4, 1, 203, 221, 3, 222, 228, 31, 4, 1, 203, 221, 3, + 241, 68, 26, 203, 74, 31, 4, 1, 203, 221, 3, 241, 68, 26, 216, 231, 31, + 4, 1, 213, 91, 3, 214, 228, 31, 4, 1, 213, 91, 3, 241, 241, 31, 4, 1, + 203, 221, 3, 216, 20, 31, 4, 1, 203, 221, 3, 241, 68, 26, 216, 20, 31, 6, + 1, 203, 221, 3, 202, 170, 31, 6, 1, 203, 221, 3, 222, 228, 31, 6, 1, 203, + 221, 3, 203, 74, 31, 6, 1, 203, 221, 3, 216, 231, 31, 6, 1, 213, 91, 3, + 241, 241, 31, 241, 68, 26, 203, 74, 31, 241, 68, 26, 216, 231, 31, 203, + 74, 31, 4, 1, 217, 84, 3, 203, 75, 26, 199, 219, 31, 4, 1, 217, 84, 3, + 199, 219, 31, 4, 1, 217, 84, 3, 216, 232, 26, 199, 219, 31, 4, 1, 217, + 84, 3, 216, 20, 31, 4, 1, 217, 84, 3, 216, 21, 26, 199, 219, 31, 6, 1, + 217, 82, 3, 203, 74, 31, 6, 1, 217, 82, 3, 216, 231, 31, 6, 1, 217, 84, + 3, 203, 74, 31, 6, 1, 217, 84, 3, 216, 231, 31, 6, 1, 217, 84, 3, 214, + 242, 31, 216, 231, 31, 241, 241, 238, 180, 214, 94, 238, 191, 214, 94, + 238, 180, 208, 244, 238, 191, 208, 244, 206, 41, 208, 244, 236, 227, 208, + 244, 209, 104, 208, 244, 237, 102, 208, 244, 214, 212, 208, 244, 206, 77, + 208, 244, 234, 222, 208, 244, 199, 82, 201, 25, 208, 244, 199, 82, 201, + 25, 218, 232, 199, 82, 201, 25, 227, 161, 225, 19, 81, 213, 37, 81, 233, + 33, 218, 233, 233, 33, 237, 102, 241, 244, 238, 180, 241, 244, 238, 191, + 241, 244, 233, 177, 148, 53, 83, 224, 176, 53, 128, 224, 176, 49, 209, + 139, 214, 63, 81, 51, 209, 139, 214, 63, 81, 209, 139, 224, 58, 214, 63, + 81, 209, 139, 234, 56, 214, 63, 81, 49, 53, 214, 63, 81, 51, 53, 214, 63, + 81, 53, 224, 58, 214, 63, 81, 53, 234, 56, 214, 63, 81, 242, 40, 53, 242, + 40, 248, 20, 205, 95, 248, 20, 112, 73, 225, 38, 120, 73, 225, 38, 233, + 177, 238, 195, 233, 31, 215, 99, 224, 177, 210, 154, 216, 128, 210, 154, + 225, 19, 238, 189, 213, 37, 238, 189, 215, 78, 241, 8, 236, 240, 225, 19, + 216, 239, 213, 37, 216, 239, 220, 124, 218, 240, 208, 244, 216, 28, 221, + 170, 54, 216, 28, 206, 167, 206, 51, 54, 215, 14, 53, 215, 14, 205, 83, + 215, 14, 213, 105, 215, 14, 213, 105, 53, 215, 14, 213, 105, 205, 83, + 215, 14, 247, 129, 209, 139, 225, 23, 251, 71, 214, 63, 81, 209, 139, + 213, 41, 251, 71, 214, 63, 81, 213, 166, 81, 53, 238, 43, 81, 228, 58, + 216, 241, 203, 248, 171, 206, 7, 247, 130, 228, 75, 215, 99, 250, 163, + 233, 34, 248, 20, 236, 219, 209, 75, 49, 52, 248, 70, 3, 214, 73, 51, 52, + 248, 70, 3, 214, 73, 53, 214, 79, 81, 214, 79, 238, 43, 81, 238, 43, 214, + 79, 81, 205, 216, 2, 238, 81, 213, 105, 215, 163, 54, 63, 98, 248, 20, + 63, 87, 248, 20, 128, 250, 165, 213, 105, 210, 167, 246, 111, 203, 228, + 120, 250, 164, 251, 128, 202, 247, 246, 68, 221, 157, 54, 207, 167, 241, + 244, 228, 50, 203, 248, 237, 25, 214, 212, 81, 126, 73, 214, 211, 214, + 90, 215, 14, 236, 229, 73, 214, 211, 237, 61, 73, 214, 211, 120, 73, 214, + 211, 236, 229, 73, 81, 239, 180, 242, 234, 205, 94, 83, 236, 229, 240, + 180, 222, 66, 13, 208, 244, 200, 238, 227, 161, 236, 181, 251, 8, 228, + 48, 205, 232, 228, 48, 210, 154, 228, 48, 215, 113, 225, 19, 228, 18, + 213, 37, 228, 18, 237, 73, 208, 33, 228, 18, 215, 78, 241, 8, 228, 18, + 228, 87, 207, 115, 207, 184, 251, 241, 207, 115, 207, 184, 228, 87, 9, + 236, 242, 210, 84, 251, 241, 9, 236, 242, 210, 84, 220, 118, 17, 210, 85, + 218, 236, 17, 210, 85, 207, 213, 199, 81, 207, 213, 8, 4, 1, 70, 207, + 213, 149, 207, 213, 164, 207, 213, 187, 207, 213, 210, 135, 207, 213, + 192, 207, 213, 219, 113, 207, 213, 93, 54, 207, 213, 221, 156, 207, 213, + 238, 122, 54, 207, 213, 49, 216, 115, 207, 213, 51, 216, 115, 207, 213, + 8, 4, 1, 220, 214, 208, 4, 199, 81, 208, 4, 102, 208, 4, 105, 208, 4, + 147, 208, 4, 149, 208, 4, 164, 208, 4, 187, 208, 4, 210, 135, 208, 4, + 192, 208, 4, 219, 113, 208, 4, 93, 54, 208, 4, 221, 156, 208, 4, 238, + 122, 54, 208, 4, 49, 216, 115, 208, 4, 51, 216, 115, 8, 208, 4, 4, 1, 62, + 8, 208, 4, 4, 1, 72, 8, 208, 4, 4, 1, 74, 8, 208, 4, 4, 1, 200, 195, 8, + 208, 4, 4, 1, 211, 218, 8, 208, 4, 4, 1, 234, 247, 8, 208, 4, 4, 1, 227, + 118, 8, 208, 4, 4, 1, 156, 8, 208, 4, 4, 1, 223, 243, 8, 208, 4, 4, 1, + 220, 214, 8, 208, 4, 4, 1, 216, 226, 8, 208, 4, 4, 1, 212, 122, 8, 208, + 4, 4, 1, 207, 83, 238, 60, 54, 246, 80, 54, 242, 219, 54, 236, 209, 236, + 213, 54, 224, 156, 54, 221, 171, 54, 220, 141, 54, 216, 5, 54, 212, 149, + 54, 200, 246, 54, 220, 8, 210, 51, 54, 240, 189, 54, 238, 61, 54, 226, + 142, 54, 204, 208, 54, 239, 163, 54, 235, 246, 216, 40, 54, 216, 2, 54, + 235, 45, 54, 250, 129, 54, 233, 103, 54, 247, 71, 54, 224, 146, 205, 138, + 54, 208, 225, 54, 206, 164, 54, 228, 102, 212, 149, 54, 204, 188, 224, + 156, 54, 218, 222, 134, 54, 222, 178, 54, 212, 172, 54, 225, 67, 54, 38, + 49, 234, 161, 56, 38, 51, 234, 161, 56, 38, 168, 83, 224, 177, 216, 242, + 38, 209, 250, 83, 224, 177, 216, 242, 38, 251, 47, 55, 56, 38, 246, 112, + 55, 56, 38, 49, 55, 56, 38, 51, 55, 56, 38, 213, 27, 216, 242, 38, 246, + 112, 213, 27, 216, 242, 38, 251, 47, 213, 27, 216, 242, 38, 126, 190, 56, + 38, 236, 229, 190, 56, 38, 238, 175, 246, 155, 38, 238, 175, 208, 193, + 38, 238, 175, 241, 64, 38, 238, 175, 246, 156, 249, 124, 38, 49, 51, 55, + 56, 38, 238, 175, 211, 209, 38, 238, 175, 226, 210, 38, 238, 175, 203, + 218, 215, 96, 205, 98, 38, 213, 106, 209, 17, 216, 242, 38, 53, 83, 208, + 47, 216, 242, 38, 251, 57, 99, 38, 205, 83, 203, 250, 38, 201, 28, 248, + 51, 56, 38, 98, 55, 216, 242, 38, 168, 53, 209, 17, 216, 242, 38, 87, + 234, 161, 3, 154, 239, 165, 38, 98, 234, 161, 3, 154, 239, 165, 38, 49, + 55, 57, 38, 51, 55, 57, 38, 250, 166, 56, 251, 247, 217, 117, 251, 231, + 205, 186, 206, 107, 208, 13, 175, 6, 247, 223, 241, 155, 247, 61, 247, + 56, 224, 177, 99, 247, 131, 217, 117, 247, 182, 204, 4, 238, 62, 243, 50, + 211, 206, 241, 155, 237, 177, 135, 4, 236, 156, 135, 6, 234, 247, 248, + 142, 6, 234, 247, 175, 6, 234, 247, 215, 130, 243, 50, 215, 130, 243, 51, + 119, 120, 215, 204, 135, 6, 70, 248, 142, 6, 70, 135, 6, 156, 135, 4, + 156, 225, 193, 68, 249, 77, 99, 175, 6, 220, 214, 218, 91, 54, 209, 1, + 213, 178, 243, 18, 135, 6, 216, 226, 175, 6, 216, 226, 175, 6, 214, 167, + 135, 6, 146, 248, 142, 6, 146, 175, 6, 146, 215, 21, 206, 255, 213, 118, + 210, 146, 81, 206, 176, 54, 205, 128, 134, 54, 203, 43, 175, 6, 199, 157, + 217, 2, 54, 217, 107, 54, 228, 50, 217, 107, 54, 248, 142, 6, 199, 157, + 204, 185, 31, 4, 1, 228, 41, 226, 251, 54, 251, 66, 54, 135, 6, 250, 103, + 248, 142, 6, 247, 223, 238, 86, 99, 135, 4, 72, 135, 6, 72, 135, 6, 238, + 5, 204, 185, 6, 238, 5, 135, 6, 223, 243, 135, 4, 74, 140, 99, 248, 211, + 99, 235, 148, 99, 242, 24, 99, 228, 92, 208, 255, 212, 228, 6, 214, 167, + 237, 180, 54, 175, 4, 215, 204, 175, 4, 236, 60, 175, 6, 236, 60, 175, 6, + 215, 204, 175, 220, 213, 207, 231, 204, 185, 43, 6, 236, 156, 204, 185, + 43, 6, 156, 213, 105, 43, 6, 156, 204, 185, 43, 6, 200, 123, 175, 39, 6, + 242, 153, 175, 39, 4, 242, 153, 175, 39, 4, 72, 175, 39, 4, 70, 175, 39, + 4, 227, 251, 214, 245, 224, 176, 204, 185, 251, 89, 216, 28, 54, 251, + 153, 204, 185, 4, 238, 5, 16, 36, 212, 22, 208, 255, 201, 164, 236, 219, + 112, 210, 131, 201, 164, 236, 219, 112, 219, 107, 201, 164, 236, 219, + 112, 206, 157, 201, 164, 236, 219, 112, 206, 74, 201, 164, 236, 219, 120, + 206, 71, 201, 164, 236, 219, 112, 237, 107, 201, 164, 236, 219, 120, 237, + 106, 201, 164, 236, 219, 126, 237, 106, 201, 164, 236, 219, 236, 229, + 237, 106, 201, 164, 236, 219, 112, 209, 96, 201, 164, 236, 219, 237, 61, + 209, 94, 201, 164, 236, 219, 112, 238, 227, 201, 164, 236, 219, 126, 238, + 225, 201, 164, 236, 219, 237, 61, 238, 225, 201, 164, 236, 219, 210, 136, + 238, 225, 236, 219, 218, 92, 102, 212, 240, 218, 93, 102, 212, 240, 218, + 93, 105, 212, 240, 218, 93, 147, 212, 240, 218, 93, 149, 212, 240, 218, + 93, 164, 212, 240, 218, 93, 187, 212, 240, 218, 93, 210, 135, 212, 240, + 218, 93, 192, 212, 240, 218, 93, 219, 113, 212, 240, 218, 93, 206, 166, + 212, 240, 218, 93, 238, 199, 212, 240, 218, 93, 204, 164, 212, 240, 218, + 93, 237, 104, 212, 240, 218, 93, 112, 233, 82, 212, 240, 218, 93, 237, + 61, 233, 82, 212, 240, 218, 93, 112, 206, 50, 4, 212, 240, 218, 93, 102, + 4, 212, 240, 218, 93, 105, 4, 212, 240, 218, 93, 147, 4, 212, 240, 218, + 93, 149, 4, 212, 240, 218, 93, 164, 4, 212, 240, 218, 93, 187, 4, 212, + 240, 218, 93, 210, 135, 4, 212, 240, 218, 93, 192, 4, 212, 240, 218, 93, + 219, 113, 4, 212, 240, 218, 93, 206, 166, 4, 212, 240, 218, 93, 238, 199, + 4, 212, 240, 218, 93, 204, 164, 4, 212, 240, 218, 93, 237, 104, 4, 212, + 240, 218, 93, 112, 233, 82, 4, 212, 240, 218, 93, 237, 61, 233, 82, 4, + 212, 240, 218, 93, 112, 206, 50, 212, 240, 218, 93, 112, 206, 51, 247, + 224, 242, 153, 212, 240, 218, 93, 237, 61, 206, 50, 212, 240, 218, 93, + 206, 167, 206, 50, 212, 240, 218, 93, 213, 105, 112, 233, 82, 8, 4, 1, + 213, 105, 247, 223, 212, 240, 218, 93, 209, 106, 225, 62, 19, 212, 240, + 218, 93, 237, 105, 239, 20, 19, 212, 240, 218, 93, 237, 105, 206, 50, + 212, 240, 218, 93, 112, 233, 83, 206, 50, 201, 164, 236, 219, 199, 82, + 206, 71, 204, 185, 17, 105, 204, 185, 17, 147, 98, 48, 182, 48, 87, 48, + 191, 48, 49, 51, 48, 115, 127, 48, 157, 201, 48, 48, 157, 239, 14, 48, + 208, 254, 239, 14, 48, 208, 254, 201, 48, 48, 98, 55, 3, 97, 87, 55, 3, + 97, 98, 201, 78, 48, 87, 201, 78, 48, 98, 120, 234, 134, 48, 182, 120, + 234, 134, 48, 87, 120, 234, 134, 48, 191, 120, 234, 134, 48, 98, 55, 3, + 207, 6, 87, 55, 3, 207, 6, 98, 55, 236, 201, 148, 182, 55, 236, 201, 148, + 87, 55, 236, 201, 148, 191, 55, 236, 201, 148, 115, 127, 55, 3, 249, 64, + 98, 55, 3, 117, 87, 55, 3, 117, 98, 55, 3, 224, 74, 87, 55, 3, 224, 74, + 49, 51, 201, 78, 48, 49, 51, 55, 3, 97, 191, 199, 27, 48, 182, 55, 3, + 205, 224, 225, 18, 182, 55, 3, 205, 224, 213, 35, 191, 55, 3, 205, 224, + 225, 18, 191, 55, 3, 205, 224, 213, 35, 87, 55, 3, 243, 16, 239, 165, + 191, 55, 3, 243, 16, 225, 18, 251, 47, 205, 158, 210, 170, 48, 246, 112, + 205, 158, 210, 170, 48, 157, 201, 48, 55, 205, 186, 168, 148, 98, 55, + 205, 186, 249, 77, 119, 87, 55, 205, 186, 148, 251, 47, 176, 246, 156, + 48, 246, 112, 176, 246, 156, 48, 98, 234, 161, 3, 154, 203, 216, 98, 234, + 161, 3, 154, 239, 165, 182, 234, 161, 3, 154, 213, 35, 182, 234, 161, 3, + 154, 225, 18, 87, 234, 161, 3, 154, 203, 216, 87, 234, 161, 3, 154, 239, + 165, 191, 234, 161, 3, 154, 213, 35, 191, 234, 161, 3, 154, 225, 18, 87, + 55, 119, 98, 48, 182, 55, 98, 76, 191, 48, 98, 55, 119, 87, 48, 98, 216, + 188, 250, 199, 182, 216, 188, 250, 199, 87, 216, 188, 250, 199, 191, 216, + 188, 250, 199, 98, 234, 161, 119, 87, 234, 160, 87, 234, 161, 119, 98, + 234, 160, 98, 53, 55, 3, 97, 49, 51, 53, 55, 3, 97, 87, 53, 55, 3, 97, + 98, 53, 48, 182, 53, 48, 87, 53, 48, 191, 53, 48, 49, 51, 53, 48, 115, + 127, 53, 48, 157, 201, 48, 53, 48, 157, 239, 14, 53, 48, 208, 254, 239, + 14, 53, 48, 208, 254, 201, 48, 53, 48, 98, 205, 83, 48, 87, 205, 83, 48, + 98, 208, 186, 48, 87, 208, 186, 48, 182, 55, 3, 53, 97, 191, 55, 3, 53, + 97, 98, 241, 243, 48, 182, 241, 243, 48, 87, 241, 243, 48, 191, 241, 243, + 48, 98, 55, 205, 186, 148, 87, 55, 205, 186, 148, 98, 64, 48, 182, 64, + 48, 87, 64, 48, 191, 64, 48, 182, 64, 55, 236, 201, 148, 182, 64, 55, + 217, 79, 216, 64, 182, 64, 55, 217, 79, 216, 65, 3, 233, 177, 148, 182, + 64, 55, 217, 79, 216, 65, 3, 83, 148, 182, 64, 53, 48, 182, 64, 53, 55, + 217, 79, 216, 64, 87, 64, 55, 236, 201, 201, 102, 157, 201, 48, 55, 205, + 186, 243, 15, 208, 254, 239, 14, 55, 205, 186, 243, 15, 115, 127, 64, 48, + 51, 55, 3, 4, 246, 155, 191, 55, 98, 76, 182, 48, 126, 87, 250, 199, 98, + 55, 3, 83, 97, 87, 55, 3, 83, 97, 49, 51, 55, 3, 83, 97, 98, 55, 3, 53, + 83, 97, 87, 55, 3, 53, 83, 97, 49, 51, 55, 3, 53, 83, 97, 98, 217, 51, + 48, 87, 217, 51, 48, 49, 51, 217, 51, 48, 36, 251, 124, 246, 65, 216, + 108, 241, 48, 206, 97, 238, 38, 206, 97, 240, 202, 218, 215, 238, 39, + 238, 181, 210, 141, 228, 106, 220, 152, 238, 202, 217, 117, 218, 215, + 251, 86, 238, 202, 217, 117, 4, 238, 202, 217, 117, 243, 44, 250, 189, + 222, 44, 240, 202, 218, 215, 243, 46, 250, 189, 222, 44, 4, 243, 44, 250, + 189, 222, 44, 238, 171, 76, 214, 247, 220, 213, 215, 1, 220, 213, 243, + 21, 220, 213, 207, 231, 221, 157, 54, 221, 155, 54, 73, 215, 113, 240, + 235, 209, 75, 210, 142, 221, 156, 250, 166, 217, 43, 213, 27, 217, 43, + 248, 21, 217, 43, 52, 212, 234, 242, 210, 212, 234, 236, 222, 212, 234, + 214, 243, 138, 228, 94, 51, 251, 70, 251, 70, 222, 73, 251, 70, 208, 224, + 251, 70, 240, 237, 240, 202, 218, 215, 240, 241, 216, 121, 138, 218, 215, + 216, 121, 138, 224, 98, 251, 79, 224, 98, 217, 33, 228, 55, 203, 241, + 228, 69, 53, 228, 69, 205, 83, 228, 69, 243, 38, 228, 69, 207, 203, 228, + 69, 202, 181, 228, 69, 246, 112, 228, 69, 246, 112, 243, 38, 228, 69, + 251, 47, 243, 38, 228, 69, 206, 96, 248, 254, 213, 200, 214, 244, 73, + 221, 156, 238, 46, 235, 252, 214, 244, 233, 192, 205, 241, 217, 43, 213, + 105, 205, 240, 228, 50, 225, 47, 212, 122, 209, 141, 201, 77, 200, 226, + 215, 1, 218, 215, 205, 240, 221, 157, 205, 240, 250, 159, 160, 138, 218, + 215, 250, 159, 160, 138, 251, 4, 160, 138, 251, 4, 247, 247, 218, 215, + 251, 240, 160, 138, 220, 26, 251, 4, 218, 224, 251, 240, 160, 138, 251, + 117, 160, 138, 218, 215, 251, 117, 160, 138, 251, 117, 160, 217, 34, 160, + 138, 205, 83, 205, 240, 251, 125, 160, 138, 238, 117, 138, 235, 251, 238, + 117, 138, 241, 49, 248, 205, 251, 6, 206, 107, 224, 184, 235, 251, 160, + 138, 251, 4, 160, 205, 186, 217, 34, 206, 107, 228, 133, 217, 117, 228, + 133, 76, 217, 34, 251, 4, 160, 138, 246, 80, 238, 121, 238, 122, 246, 79, + 213, 27, 228, 118, 160, 138, 213, 27, 160, 138, 243, 9, 138, 238, 85, + 238, 120, 138, 208, 110, 238, 121, 241, 137, 160, 138, 160, 205, 186, + 247, 235, 241, 156, 222, 73, 247, 234, 214, 77, 160, 138, 218, 215, 160, + 138, 232, 223, 138, 218, 215, 232, 223, 138, 208, 54, 238, 117, 138, 224, + 241, 217, 34, 160, 138, 235, 67, 217, 34, 160, 138, 224, 241, 119, 160, + 138, 235, 67, 119, 160, 138, 224, 241, 247, 247, 218, 215, 160, 138, 235, + 67, 247, 247, 218, 215, 160, 138, 221, 35, 224, 240, 221, 35, 235, 66, + 248, 205, 218, 215, 238, 117, 138, 218, 215, 224, 240, 218, 215, 235, 66, + 220, 26, 224, 241, 218, 224, 160, 138, 220, 26, 235, 67, 218, 224, 160, + 138, 224, 241, 217, 34, 238, 117, 138, 235, 67, 217, 34, 238, 117, 138, + 220, 26, 224, 241, 218, 224, 238, 117, 138, 220, 26, 235, 67, 218, 224, + 238, 117, 138, 224, 241, 217, 34, 235, 66, 235, 67, 217, 34, 224, 240, + 220, 26, 224, 241, 218, 224, 235, 66, 220, 26, 235, 67, 218, 224, 224, + 240, 215, 28, 207, 250, 215, 29, 217, 34, 160, 138, 207, 251, 217, 34, + 160, 138, 215, 29, 217, 34, 238, 117, 138, 207, 251, 217, 34, 238, 117, + 138, 240, 202, 218, 215, 215, 31, 240, 202, 218, 215, 207, 252, 208, 3, + 217, 117, 207, 212, 217, 117, 218, 215, 35, 208, 3, 217, 117, 218, 215, + 35, 207, 212, 217, 117, 208, 3, 76, 217, 34, 160, 138, 207, 212, 76, 217, + 34, 160, 138, 220, 26, 35, 208, 3, 76, 218, 224, 160, 138, 220, 26, 35, + 207, 212, 76, 218, 224, 160, 138, 208, 3, 76, 3, 218, 215, 160, 138, 207, + 212, 76, 3, 218, 215, 160, 138, 221, 16, 221, 17, 221, 18, 221, 17, 203, + 241, 52, 228, 133, 217, 117, 52, 217, 25, 217, 117, 52, 228, 133, 76, + 217, 34, 160, 138, 52, 217, 25, 76, 217, 34, 160, 138, 52, 247, 144, 52, + 242, 202, 44, 215, 113, 44, 221, 156, 44, 205, 232, 44, 240, 235, 209, + 75, 44, 73, 217, 43, 44, 213, 27, 217, 43, 44, 250, 166, 217, 43, 44, + 238, 121, 44, 241, 244, 95, 215, 113, 95, 221, 156, 95, 205, 232, 95, 73, + 217, 43, 51, 207, 17, 49, 207, 17, 127, 207, 17, 115, 207, 17, 250, 169, + 221, 131, 205, 61, 236, 248, 205, 83, 83, 249, 77, 51, 204, 184, 53, 83, + 249, 77, 53, 51, 204, 184, 240, 202, 218, 215, 214, 238, 218, 215, 205, + 61, 240, 202, 218, 215, 236, 249, 220, 28, 53, 83, 249, 77, 53, 51, 204, + 184, 215, 29, 203, 253, 213, 149, 207, 251, 203, 253, 213, 149, 218, 221, + 208, 16, 217, 117, 243, 44, 250, 189, 218, 221, 208, 15, 218, 221, 208, + 16, 76, 217, 34, 160, 138, 243, 44, 250, 189, 218, 221, 208, 16, 217, 34, + 160, 138, 217, 25, 217, 117, 228, 133, 217, 117, 221, 23, 234, 96, 243, + 55, 222, 125, 228, 66, 200, 155, 220, 132, 218, 223, 51, 251, 71, 3, 250, + 236, 51, 205, 98, 220, 213, 224, 98, 251, 79, 220, 213, 224, 98, 217, 33, + 220, 213, 228, 55, 220, 213, 203, 241, 241, 65, 217, 43, 73, 217, 43, + 208, 110, 217, 43, 240, 235, 205, 232, 248, 79, 49, 218, 221, 237, 179, + 210, 166, 215, 1, 51, 218, 221, 237, 179, 210, 166, 215, 1, 49, 210, 166, + 215, 1, 51, 210, 166, 215, 1, 213, 105, 205, 241, 238, 121, 242, 196, + 224, 98, 217, 33, 242, 196, 224, 98, 251, 79, 53, 208, 2, 53, 207, 211, + 53, 228, 55, 53, 203, 241, 215, 140, 160, 26, 216, 121, 138, 224, 241, 3, + 240, 182, 235, 67, 3, 240, 182, 202, 246, 221, 35, 224, 240, 202, 246, + 221, 35, 235, 66, 224, 241, 160, 205, 186, 217, 34, 235, 66, 235, 67, + 160, 205, 186, 217, 34, 224, 240, 160, 205, 186, 217, 34, 224, 240, 160, + 205, 186, 217, 34, 235, 66, 160, 205, 186, 217, 34, 215, 28, 160, 205, + 186, 217, 34, 207, 250, 240, 202, 218, 215, 215, 32, 217, 34, 238, 123, + 240, 202, 218, 215, 207, 253, 217, 34, 238, 123, 218, 215, 52, 228, 133, + 76, 217, 34, 160, 138, 218, 215, 52, 217, 25, 76, 217, 34, 160, 138, 52, + 228, 133, 76, 217, 34, 218, 215, 160, 138, 52, 217, 25, 76, 217, 34, 218, + 215, 160, 138, 224, 241, 247, 247, 218, 215, 238, 117, 138, 235, 67, 247, + 247, 218, 215, 238, 117, 138, 215, 29, 247, 247, 218, 215, 238, 117, 138, + 207, 251, 247, 247, 218, 215, 238, 117, 138, 218, 215, 218, 221, 208, 16, + 217, 117, 240, 202, 218, 215, 243, 46, 250, 189, 218, 221, 208, 15, 218, + 215, 218, 221, 208, 16, 76, 217, 34, 160, 138, 240, 202, 218, 215, 243, + 46, 250, 189, 218, 221, 208, 16, 217, 34, 238, 123, 83, 238, 195, 221, + 202, 233, 177, 238, 195, 115, 51, 241, 71, 238, 195, 127, 51, 241, 71, + 238, 195, 238, 202, 76, 3, 168, 233, 177, 97, 238, 202, 76, 3, 83, 249, + 77, 250, 156, 238, 171, 76, 233, 177, 97, 4, 238, 202, 76, 3, 83, 249, + 77, 250, 156, 238, 171, 76, 233, 177, 97, 238, 202, 76, 3, 73, 56, 238, + 202, 76, 3, 216, 246, 4, 238, 202, 76, 3, 216, 246, 238, 202, 76, 3, 203, + 251, 238, 202, 76, 3, 120, 233, 177, 208, 34, 243, 44, 3, 168, 233, 177, + 97, 243, 44, 3, 83, 249, 77, 250, 156, 238, 171, 76, 233, 177, 97, 4, + 243, 44, 3, 83, 249, 77, 250, 156, 238, 171, 76, 233, 177, 97, 243, 44, + 3, 216, 246, 4, 243, 44, 3, 216, 246, 199, 158, 218, 213, 249, 114, 222, + 43, 241, 66, 54, 238, 204, 48, 233, 109, 115, 250, 202, 127, 250, 202, + 214, 251, 216, 8, 201, 74, 224, 176, 49, 247, 64, 51, 247, 64, 49, 237, + 31, 51, 237, 31, 248, 93, 51, 242, 236, 248, 93, 49, 242, 236, 205, 158, + 51, 242, 236, 205, 158, 49, 242, 236, 213, 105, 218, 215, 54, 52, 224, + 49, 250, 236, 211, 183, 211, 191, 206, 176, 213, 179, 215, 70, 228, 99, + 202, 222, 208, 193, 215, 134, 76, 228, 65, 54, 204, 185, 218, 215, 54, + 201, 84, 233, 111, 205, 158, 49, 243, 15, 205, 158, 51, 243, 15, 248, 93, + 49, 243, 15, 248, 93, 51, 243, 15, 205, 158, 167, 228, 69, 248, 93, 167, + 228, 69, 236, 196, 209, 48, 115, 250, 203, 248, 206, 120, 233, 177, 249, + 66, 217, 36, 226, 214, 238, 113, 205, 186, 206, 107, 213, 46, 200, 196, + 228, 118, 35, 213, 176, 248, 78, 226, 212, 225, 23, 251, 71, 159, 213, + 41, 251, 71, 159, 238, 113, 205, 186, 206, 107, 225, 28, 248, 217, 213, + 26, 242, 163, 251, 125, 250, 211, 207, 114, 205, 143, 212, 154, 241, 28, + 217, 26, 243, 59, 206, 234, 209, 61, 243, 5, 243, 4, 251, 22, 236, 179, + 16, 233, 16, 251, 22, 236, 179, 16, 208, 184, 214, 94, 251, 22, 236, 179, + 16, 214, 95, 238, 123, 251, 22, 236, 179, 16, 214, 95, 240, 241, 251, 22, + 236, 179, 16, 214, 95, 241, 64, 251, 22, 236, 179, 16, 214, 95, 227, 153, + 251, 22, 236, 179, 16, 214, 95, 246, 155, 251, 22, 236, 179, 16, 246, + 156, 208, 84, 251, 22, 236, 179, 16, 246, 156, 227, 153, 251, 22, 236, + 179, 16, 209, 76, 148, 251, 22, 236, 179, 16, 249, 125, 148, 251, 22, + 236, 179, 16, 214, 95, 209, 75, 251, 22, 236, 179, 16, 214, 95, 249, 124, + 251, 22, 236, 179, 16, 214, 95, 224, 240, 251, 22, 236, 179, 16, 214, 95, + 235, 66, 251, 22, 236, 179, 16, 98, 203, 80, 251, 22, 236, 179, 16, 87, + 203, 80, 251, 22, 236, 179, 16, 214, 95, 98, 48, 251, 22, 236, 179, 16, + 214, 95, 87, 48, 251, 22, 236, 179, 16, 246, 156, 249, 124, 251, 22, 236, + 179, 16, 127, 207, 18, 203, 251, 251, 22, 236, 179, 16, 241, 137, 208, + 84, 251, 22, 236, 179, 16, 214, 95, 127, 247, 129, 251, 22, 236, 179, 16, + 214, 95, 241, 136, 251, 22, 236, 179, 16, 127, 207, 18, 227, 153, 251, + 22, 236, 179, 16, 182, 203, 80, 251, 22, 236, 179, 16, 214, 95, 182, 48, + 251, 22, 236, 179, 16, 115, 207, 18, 216, 246, 251, 22, 236, 179, 16, + 241, 149, 208, 84, 251, 22, 236, 179, 16, 214, 95, 115, 247, 129, 251, + 22, 236, 179, 16, 214, 95, 241, 148, 251, 22, 236, 179, 16, 115, 207, 18, + 227, 153, 251, 22, 236, 179, 16, 191, 203, 80, 251, 22, 236, 179, 16, + 214, 95, 191, 48, 251, 22, 236, 179, 16, 214, 62, 203, 251, 251, 22, 236, + 179, 16, 241, 137, 203, 251, 251, 22, 236, 179, 16, 241, 65, 203, 251, + 251, 22, 236, 179, 16, 227, 154, 203, 251, 251, 22, 236, 179, 16, 246, + 156, 203, 251, 251, 22, 236, 179, 16, 115, 210, 6, 227, 153, 251, 22, + 236, 179, 16, 214, 62, 214, 94, 251, 22, 236, 179, 16, 246, 156, 208, + 109, 251, 22, 236, 179, 16, 214, 95, 246, 79, 251, 22, 236, 179, 16, 115, + 207, 18, 241, 74, 251, 22, 236, 179, 16, 241, 149, 241, 74, 251, 22, 236, + 179, 16, 208, 110, 241, 74, 251, 22, 236, 179, 16, 227, 154, 241, 74, + 251, 22, 236, 179, 16, 246, 156, 241, 74, 251, 22, 236, 179, 16, 127, + 210, 6, 208, 84, 251, 22, 236, 179, 16, 49, 210, 6, 208, 84, 251, 22, + 236, 179, 16, 205, 241, 241, 74, 251, 22, 236, 179, 16, 235, 67, 241, 74, + 251, 22, 236, 179, 16, 246, 71, 148, 251, 22, 236, 179, 16, 241, 149, + 205, 240, 251, 22, 236, 179, 16, 199, 26, 251, 22, 236, 179, 16, 208, 85, + 205, 240, 251, 22, 236, 179, 16, 210, 168, 203, 251, 251, 22, 236, 179, + 16, 214, 95, 218, 215, 238, 123, 251, 22, 236, 179, 16, 214, 95, 214, 78, + 251, 22, 236, 179, 16, 127, 247, 130, 205, 240, 251, 22, 236, 179, 16, + 115, 247, 130, 205, 240, 251, 22, 236, 179, 16, 228, 41, 251, 22, 236, + 179, 16, 213, 90, 251, 22, 236, 179, 16, 217, 83, 251, 22, 236, 179, 16, + 251, 113, 203, 251, 251, 22, 236, 179, 16, 238, 125, 203, 251, 251, 22, + 236, 179, 16, 228, 42, 203, 251, 251, 22, 236, 179, 16, 217, 84, 203, + 251, 251, 22, 236, 179, 16, 251, 112, 218, 215, 247, 7, 81, 51, 251, 71, + 3, 191, 199, 27, 48, 209, 232, 176, 248, 78, 248, 231, 99, 83, 224, 177, + 3, 101, 240, 182, 228, 75, 99, 243, 39, 203, 249, 99, 241, 1, 203, 249, + 99, 238, 183, 99, 243, 74, 99, 64, 52, 3, 247, 56, 83, 224, 176, 238, + 155, 99, 251, 104, 226, 215, 99, 234, 109, 99, 44, 233, 177, 249, 77, 3, + 218, 212, 44, 205, 99, 239, 167, 248, 46, 246, 156, 3, 218, 218, 48, 203, + 247, 99, 221, 92, 99, 233, 29, 99, 217, 52, 234, 246, 99, 217, 52, 225, + 191, 99, 216, 98, 99, 216, 97, 99, 241, 10, 242, 194, 16, 236, 242, 105, + 209, 21, 99, 251, 22, 236, 179, 16, 214, 94, 241, 168, 210, 155, 226, + 215, 99, 215, 16, 216, 195, 220, 2, 216, 195, 215, 11, 211, 210, 99, 246, + 127, 211, 210, 99, 49, 216, 116, 203, 225, 117, 49, 216, 116, 238, 31, + 49, 216, 116, 224, 54, 117, 51, 216, 116, 203, 225, 117, 51, 216, 116, + 238, 31, 51, 216, 116, 224, 54, 117, 49, 52, 248, 70, 203, 225, 243, 15, + 49, 52, 248, 70, 238, 31, 49, 52, 248, 70, 224, 54, 243, 15, 51, 52, 248, + 70, 203, 225, 243, 15, 51, 52, 248, 70, 238, 31, 51, 52, 248, 70, 224, + 54, 243, 15, 49, 242, 196, 248, 70, 203, 225, 117, 49, 242, 196, 248, 70, + 101, 215, 196, 49, 242, 196, 248, 70, 224, 54, 117, 242, 196, 248, 70, + 238, 31, 51, 242, 196, 248, 70, 203, 225, 117, 51, 242, 196, 248, 70, + 101, 215, 196, 51, 242, 196, 248, 70, 224, 54, 117, 228, 70, 238, 31, + 233, 177, 224, 177, 238, 31, 203, 225, 49, 217, 34, 224, 54, 51, 242, + 196, 248, 70, 211, 192, 203, 225, 51, 217, 34, 224, 54, 49, 242, 196, + 248, 70, 211, 192, 207, 232, 205, 157, 207, 232, 248, 92, 205, 158, 52, + 159, 248, 93, 52, 159, 248, 93, 52, 248, 70, 119, 205, 158, 52, 159, 42, + 16, 248, 92, 49, 83, 100, 224, 176, 51, 83, 100, 224, 176, 233, 177, 211, + 228, 224, 175, 233, 177, 211, 228, 224, 174, 233, 177, 211, 228, 224, + 173, 233, 177, 211, 228, 224, 172, 241, 128, 16, 162, 83, 26, 205, 158, + 213, 46, 241, 128, 16, 162, 83, 26, 248, 93, 213, 46, 241, 128, 16, 162, + 83, 3, 246, 155, 241, 128, 16, 162, 127, 26, 233, 177, 3, 246, 155, 241, + 128, 16, 162, 115, 26, 233, 177, 3, 246, 155, 241, 128, 16, 162, 83, 3, + 205, 98, 241, 128, 16, 162, 127, 26, 233, 177, 3, 205, 98, 241, 128, 16, + 162, 115, 26, 233, 177, 3, 205, 98, 241, 128, 16, 162, 83, 26, 201, 77, + 241, 128, 16, 162, 127, 26, 233, 177, 3, 201, 77, 241, 128, 16, 162, 115, + 26, 233, 177, 3, 201, 77, 241, 128, 16, 162, 127, 26, 233, 176, 241, 128, + 16, 162, 115, 26, 233, 176, 241, 128, 16, 162, 83, 26, 205, 158, 225, 28, + 241, 128, 16, 162, 83, 26, 248, 93, 225, 28, 52, 236, 255, 213, 110, 99, + 238, 218, 99, 83, 224, 177, 238, 31, 222, 14, 248, 57, 222, 14, 168, 119, + 209, 249, 222, 14, 209, 250, 119, 224, 89, 222, 14, 168, 119, 120, 209, + 235, 222, 14, 120, 209, 236, 119, 224, 89, 222, 14, 120, 209, 236, 227, + 162, 222, 14, 205, 79, 222, 14, 206, 138, 222, 14, 216, 35, 239, 18, 235, + 59, 236, 173, 205, 158, 216, 115, 248, 93, 216, 115, 205, 158, 242, 196, + 159, 248, 93, 242, 196, 159, 205, 158, 205, 146, 210, 55, 159, 248, 93, + 205, 146, 210, 55, 159, 64, 205, 114, 248, 217, 213, 27, 3, 246, 155, + 208, 66, 237, 42, 251, 255, 242, 193, 238, 203, 228, 55, 241, 168, 238, + 35, 99, 63, 213, 41, 53, 205, 98, 63, 225, 23, 53, 205, 98, 63, 203, 227, + 53, 205, 98, 63, 239, 166, 53, 205, 98, 63, 213, 41, 53, 205, 99, 3, 83, + 148, 63, 225, 23, 53, 205, 99, 3, 83, 148, 63, 213, 41, 205, 99, 3, 53, + 83, 148, 251, 146, 246, 113, 208, 73, 205, 233, 246, 113, 233, 112, 3, + 237, 22, 212, 11, 63, 222, 66, 225, 23, 205, 98, 63, 222, 66, 213, 41, + 205, 98, 63, 222, 66, 203, 227, 205, 98, 63, 222, 66, 239, 166, 205, 98, + 53, 83, 148, 63, 52, 36, 208, 76, 63, 246, 156, 36, 213, 180, 215, 52, + 99, 215, 52, 217, 77, 99, 215, 52, 217, 79, 99, 215, 52, 209, 72, 99, 16, + 36, 218, 97, 16, 36, 208, 105, 76, 234, 133, 16, 36, 208, 105, 76, 206, + 126, 16, 36, 238, 171, 76, 206, 126, 16, 36, 238, 171, 76, 205, 118, 16, + 36, 238, 158, 16, 36, 251, 243, 16, 36, 248, 230, 16, 36, 249, 123, 16, + 36, 233, 177, 207, 19, 16, 36, 224, 177, 237, 138, 16, 36, 83, 207, 19, + 16, 36, 236, 242, 237, 138, 16, 36, 247, 121, 213, 109, 16, 36, 210, 29, + 216, 254, 16, 36, 210, 29, 228, 117, 16, 36, 241, 239, 224, 167, 238, 96, + 16, 36, 241, 107, 243, 34, 102, 16, 36, 241, 107, 243, 34, 105, 16, 36, + 241, 107, 243, 34, 147, 16, 36, 241, 107, 243, 34, 149, 16, 36, 189, 251, + 243, 16, 36, 207, 109, 228, 180, 16, 36, 238, 171, 76, 205, 119, 248, + 134, 16, 36, 247, 156, 16, 36, 238, 171, 76, 222, 65, 16, 36, 208, 0, 16, + 36, 238, 96, 16, 36, 237, 97, 210, 154, 16, 36, 235, 58, 210, 154, 16, + 36, 213, 181, 210, 154, 16, 36, 203, 240, 210, 154, 16, 36, 208, 244, 16, + 36, 241, 146, 248, 138, 99, 176, 248, 78, 16, 36, 220, 5, 16, 36, 241, + 147, 236, 242, 105, 16, 36, 208, 1, 236, 242, 105, 217, 131, 117, 217, + 131, 247, 32, 217, 131, 236, 245, 217, 131, 228, 50, 236, 245, 217, 131, + 248, 227, 248, 33, 217, 131, 248, 86, 206, 7, 217, 131, 248, 67, 249, 82, + 232, 222, 217, 131, 251, 91, 76, 247, 6, 217, 131, 241, 244, 217, 131, + 242, 182, 251, 247, 218, 95, 217, 131, 53, 249, 124, 44, 17, 102, 44, 17, + 105, 44, 17, 147, 44, 17, 149, 44, 17, 164, 44, 17, 187, 44, 17, 210, + 135, 44, 17, 192, 44, 17, 219, 113, 44, 41, 206, 166, 44, 41, 238, 199, + 44, 41, 204, 164, 44, 41, 206, 69, 44, 41, 236, 223, 44, 41, 237, 108, + 44, 41, 209, 100, 44, 41, 210, 132, 44, 41, 238, 229, 44, 41, 219, 110, + 44, 41, 204, 159, 106, 17, 102, 106, 17, 105, 106, 17, 147, 106, 17, 149, + 106, 17, 164, 106, 17, 187, 106, 17, 210, 135, 106, 17, 192, 106, 17, + 219, 113, 106, 41, 206, 166, 106, 41, 238, 199, 106, 41, 204, 164, 106, + 41, 206, 69, 106, 41, 236, 223, 106, 41, 237, 108, 106, 41, 209, 100, + 106, 41, 210, 132, 106, 41, 238, 229, 106, 41, 219, 110, 106, 41, 204, + 159, 17, 112, 236, 183, 208, 76, 17, 120, 236, 183, 208, 76, 17, 126, + 236, 183, 208, 76, 17, 236, 229, 236, 183, 208, 76, 17, 237, 61, 236, + 183, 208, 76, 17, 209, 106, 236, 183, 208, 76, 17, 210, 136, 236, 183, + 208, 76, 17, 238, 232, 236, 183, 208, 76, 17, 219, 114, 236, 183, 208, + 76, 41, 206, 167, 236, 183, 208, 76, 41, 238, 200, 236, 183, 208, 76, 41, + 204, 165, 236, 183, 208, 76, 41, 206, 70, 236, 183, 208, 76, 41, 236, + 224, 236, 183, 208, 76, 41, 237, 109, 236, 183, 208, 76, 41, 209, 101, + 236, 183, 208, 76, 41, 210, 133, 236, 183, 208, 76, 41, 238, 230, 236, + 183, 208, 76, 41, 219, 111, 236, 183, 208, 76, 41, 204, 160, 236, 183, + 208, 76, 106, 8, 4, 1, 62, 106, 8, 4, 1, 250, 103, 106, 8, 4, 1, 247, + 223, 106, 8, 4, 1, 242, 153, 106, 8, 4, 1, 72, 106, 8, 4, 1, 238, 5, 106, + 8, 4, 1, 236, 156, 106, 8, 4, 1, 234, 247, 106, 8, 4, 1, 70, 106, 8, 4, + 1, 227, 251, 106, 8, 4, 1, 227, 118, 106, 8, 4, 1, 156, 106, 8, 4, 1, + 223, 243, 106, 8, 4, 1, 220, 214, 106, 8, 4, 1, 74, 106, 8, 4, 1, 216, + 226, 106, 8, 4, 1, 214, 167, 106, 8, 4, 1, 146, 106, 8, 4, 1, 212, 122, + 106, 8, 4, 1, 207, 83, 106, 8, 4, 1, 66, 106, 8, 4, 1, 203, 168, 106, 8, + 4, 1, 201, 147, 106, 8, 4, 1, 200, 195, 106, 8, 4, 1, 200, 123, 106, 8, + 4, 1, 199, 157, 44, 8, 6, 1, 62, 44, 8, 6, 1, 250, 103, 44, 8, 6, 1, 247, + 223, 44, 8, 6, 1, 242, 153, 44, 8, 6, 1, 72, 44, 8, 6, 1, 238, 5, 44, 8, + 6, 1, 236, 156, 44, 8, 6, 1, 234, 247, 44, 8, 6, 1, 70, 44, 8, 6, 1, 227, + 251, 44, 8, 6, 1, 227, 118, 44, 8, 6, 1, 156, 44, 8, 6, 1, 223, 243, 44, + 8, 6, 1, 220, 214, 44, 8, 6, 1, 74, 44, 8, 6, 1, 216, 226, 44, 8, 6, 1, + 214, 167, 44, 8, 6, 1, 146, 44, 8, 6, 1, 212, 122, 44, 8, 6, 1, 207, 83, + 44, 8, 6, 1, 66, 44, 8, 6, 1, 203, 168, 44, 8, 6, 1, 201, 147, 44, 8, 6, + 1, 200, 195, 44, 8, 6, 1, 200, 123, 44, 8, 6, 1, 199, 157, 44, 8, 4, 1, + 62, 44, 8, 4, 1, 250, 103, 44, 8, 4, 1, 247, 223, 44, 8, 4, 1, 242, 153, + 44, 8, 4, 1, 72, 44, 8, 4, 1, 238, 5, 44, 8, 4, 1, 236, 156, 44, 8, 4, 1, + 234, 247, 44, 8, 4, 1, 70, 44, 8, 4, 1, 227, 251, 44, 8, 4, 1, 227, 118, + 44, 8, 4, 1, 156, 44, 8, 4, 1, 223, 243, 44, 8, 4, 1, 220, 214, 44, 8, 4, + 1, 74, 44, 8, 4, 1, 216, 226, 44, 8, 4, 1, 214, 167, 44, 8, 4, 1, 146, + 44, 8, 4, 1, 212, 122, 44, 8, 4, 1, 207, 83, 44, 8, 4, 1, 66, 44, 8, 4, + 1, 203, 168, 44, 8, 4, 1, 201, 147, 44, 8, 4, 1, 200, 195, 44, 8, 4, 1, + 200, 123, 44, 8, 4, 1, 199, 157, 44, 17, 199, 81, 189, 44, 41, 238, 199, + 189, 44, 41, 204, 164, 189, 44, 41, 206, 69, 189, 44, 41, 236, 223, 189, + 44, 41, 237, 108, 189, 44, 41, 209, 100, 189, 44, 41, 210, 132, 189, 44, + 41, 238, 229, 189, 44, 41, 219, 110, 189, 44, 41, 204, 159, 53, 44, 17, + 102, 53, 44, 17, 105, 53, 44, 17, 147, 53, 44, 17, 149, 53, 44, 17, 164, + 53, 44, 17, 187, 53, 44, 17, 210, 135, 53, 44, 17, 192, 53, 44, 17, 219, + 113, 53, 44, 41, 206, 166, 189, 44, 17, 199, 81, 100, 121, 162, 233, 176, + 100, 121, 80, 233, 176, 100, 121, 162, 203, 42, 100, 121, 80, 203, 42, + 100, 121, 162, 205, 83, 241, 245, 233, 176, 100, 121, 80, 205, 83, 241, + 245, 233, 176, 100, 121, 162, 205, 83, 241, 245, 203, 42, 100, 121, 80, + 205, 83, 241, 245, 203, 42, 100, 121, 162, 214, 90, 241, 245, 233, 176, + 100, 121, 80, 214, 90, 241, 245, 233, 176, 100, 121, 162, 214, 90, 241, + 245, 203, 42, 100, 121, 80, 214, 90, 241, 245, 203, 42, 100, 121, 162, + 127, 26, 213, 46, 100, 121, 127, 162, 26, 51, 234, 121, 100, 121, 127, + 80, 26, 51, 224, 196, 100, 121, 80, 127, 26, 213, 46, 100, 121, 162, 127, + 26, 225, 28, 100, 121, 127, 162, 26, 49, 234, 121, 100, 121, 127, 80, 26, + 49, 224, 196, 100, 121, 80, 127, 26, 225, 28, 100, 121, 162, 115, 26, + 213, 46, 100, 121, 115, 162, 26, 51, 234, 121, 100, 121, 115, 80, 26, 51, + 224, 196, 100, 121, 80, 115, 26, 213, 46, 100, 121, 162, 115, 26, 225, + 28, 100, 121, 115, 162, 26, 49, 234, 121, 100, 121, 115, 80, 26, 49, 224, + 196, 100, 121, 80, 115, 26, 225, 28, 100, 121, 162, 83, 26, 213, 46, 100, + 121, 83, 162, 26, 51, 234, 121, 100, 121, 115, 80, 26, 51, 127, 224, 196, + 100, 121, 127, 80, 26, 51, 115, 224, 196, 100, 121, 83, 80, 26, 51, 224, + 196, 100, 121, 127, 162, 26, 51, 115, 234, 121, 100, 121, 115, 162, 26, + 51, 127, 234, 121, 100, 121, 80, 83, 26, 213, 46, 100, 121, 162, 83, 26, + 225, 28, 100, 121, 83, 162, 26, 49, 234, 121, 100, 121, 115, 80, 26, 49, + 127, 224, 196, 100, 121, 127, 80, 26, 49, 115, 224, 196, 100, 121, 83, + 80, 26, 49, 224, 196, 100, 121, 127, 162, 26, 49, 115, 234, 121, 100, + 121, 115, 162, 26, 49, 127, 234, 121, 100, 121, 80, 83, 26, 225, 28, 100, + 121, 162, 127, 26, 233, 176, 100, 121, 49, 80, 26, 51, 127, 224, 196, + 100, 121, 51, 80, 26, 49, 127, 224, 196, 100, 121, 127, 162, 26, 233, + 177, 234, 121, 100, 121, 127, 80, 26, 233, 177, 224, 196, 100, 121, 51, + 162, 26, 49, 127, 234, 121, 100, 121, 49, 162, 26, 51, 127, 234, 121, + 100, 121, 80, 127, 26, 233, 176, 100, 121, 162, 115, 26, 233, 176, 100, + 121, 49, 80, 26, 51, 115, 224, 196, 100, 121, 51, 80, 26, 49, 115, 224, + 196, 100, 121, 115, 162, 26, 233, 177, 234, 121, 100, 121, 115, 80, 26, + 233, 177, 224, 196, 100, 121, 51, 162, 26, 49, 115, 234, 121, 100, 121, + 49, 162, 26, 51, 115, 234, 121, 100, 121, 80, 115, 26, 233, 176, 100, + 121, 162, 83, 26, 233, 176, 100, 121, 49, 80, 26, 51, 83, 224, 196, 100, + 121, 51, 80, 26, 49, 83, 224, 196, 100, 121, 83, 162, 26, 233, 177, 234, + 121, 100, 121, 115, 80, 26, 127, 233, 177, 224, 196, 100, 121, 127, 80, + 26, 115, 233, 177, 224, 196, 100, 121, 83, 80, 26, 233, 177, 224, 196, + 100, 121, 49, 115, 80, 26, 51, 127, 224, 196, 100, 121, 51, 115, 80, 26, + 49, 127, 224, 196, 100, 121, 49, 127, 80, 26, 51, 115, 224, 196, 100, + 121, 51, 127, 80, 26, 49, 115, 224, 196, 100, 121, 127, 162, 26, 115, + 233, 177, 234, 121, 100, 121, 115, 162, 26, 127, 233, 177, 234, 121, 100, + 121, 51, 162, 26, 49, 83, 234, 121, 100, 121, 49, 162, 26, 51, 83, 234, + 121, 100, 121, 80, 83, 26, 233, 176, 100, 121, 162, 53, 241, 245, 233, + 176, 100, 121, 80, 53, 241, 245, 233, 176, 100, 121, 162, 53, 241, 245, + 203, 42, 100, 121, 80, 53, 241, 245, 203, 42, 100, 121, 53, 233, 176, + 100, 121, 53, 203, 42, 100, 121, 127, 209, 139, 26, 51, 239, 175, 100, + 121, 127, 53, 26, 51, 209, 138, 100, 121, 53, 127, 26, 213, 46, 100, 121, + 127, 209, 139, 26, 49, 239, 175, 100, 121, 127, 53, 26, 49, 209, 138, + 100, 121, 53, 127, 26, 225, 28, 100, 121, 115, 209, 139, 26, 51, 239, + 175, 100, 121, 115, 53, 26, 51, 209, 138, 100, 121, 53, 115, 26, 213, 46, + 100, 121, 115, 209, 139, 26, 49, 239, 175, 100, 121, 115, 53, 26, 49, + 209, 138, 100, 121, 53, 115, 26, 225, 28, 100, 121, 83, 209, 139, 26, 51, + 239, 175, 100, 121, 83, 53, 26, 51, 209, 138, 100, 121, 53, 83, 26, 213, + 46, 100, 121, 83, 209, 139, 26, 49, 239, 175, 100, 121, 83, 53, 26, 49, + 209, 138, 100, 121, 53, 83, 26, 225, 28, 100, 121, 127, 209, 139, 26, + 233, 177, 239, 175, 100, 121, 127, 53, 26, 233, 177, 209, 138, 100, 121, + 53, 127, 26, 233, 176, 100, 121, 115, 209, 139, 26, 233, 177, 239, 175, + 100, 121, 115, 53, 26, 233, 177, 209, 138, 100, 121, 53, 115, 26, 233, + 176, 100, 121, 83, 209, 139, 26, 233, 177, 239, 175, 100, 121, 83, 53, + 26, 233, 177, 209, 138, 100, 121, 53, 83, 26, 233, 176, 100, 121, 162, + 250, 237, 127, 26, 213, 46, 100, 121, 162, 250, 237, 127, 26, 225, 28, + 100, 121, 162, 250, 237, 115, 26, 225, 28, 100, 121, 162, 250, 237, 115, + 26, 213, 46, 100, 121, 162, 241, 71, 203, 225, 51, 205, 186, 224, 54, + 225, 28, 100, 121, 162, 241, 71, 203, 225, 49, 205, 186, 224, 54, 213, + 46, 100, 121, 162, 241, 71, 242, 234, 100, 121, 162, 225, 28, 100, 121, + 162, 203, 228, 100, 121, 162, 213, 46, 100, 121, 162, 239, 167, 100, 121, + 80, 225, 28, 100, 121, 80, 203, 228, 100, 121, 80, 213, 46, 100, 121, 80, + 239, 167, 100, 121, 162, 49, 26, 80, 213, 46, 100, 121, 162, 115, 26, 80, + 239, 167, 100, 121, 80, 49, 26, 162, 213, 46, 100, 121, 80, 115, 26, 162, + 239, 167, 203, 225, 167, 248, 134, 224, 54, 112, 238, 228, 248, 134, 224, + 54, 112, 214, 88, 248, 134, 224, 54, 126, 238, 226, 248, 134, 224, 54, + 167, 248, 134, 224, 54, 237, 61, 238, 226, 248, 134, 224, 54, 126, 214, + 86, 248, 134, 224, 54, 210, 136, 238, 226, 248, 134, 236, 183, 248, 134, + 49, 210, 136, 238, 226, 248, 134, 49, 126, 214, 86, 248, 134, 49, 237, + 61, 238, 226, 248, 134, 49, 167, 248, 134, 49, 126, 238, 226, 248, 134, + 49, 112, 214, 88, 248, 134, 49, 112, 238, 228, 248, 134, 51, 167, 248, + 134, 162, 210, 103, 222, 66, 210, 103, 241, 250, 210, 103, 203, 225, 112, + 238, 228, 248, 134, 51, 112, 238, 228, 248, 134, 214, 92, 224, 54, 225, + 28, 214, 92, 224, 54, 213, 46, 214, 92, 203, 225, 225, 28, 214, 92, 203, + 225, 49, 26, 224, 54, 49, 26, 224, 54, 213, 46, 214, 92, 203, 225, 49, + 26, 224, 54, 213, 46, 214, 92, 203, 225, 49, 26, 203, 225, 51, 26, 224, + 54, 225, 28, 214, 92, 203, 225, 49, 26, 203, 225, 51, 26, 224, 54, 213, + 46, 214, 92, 203, 225, 213, 46, 214, 92, 203, 225, 51, 26, 224, 54, 225, + 28, 214, 92, 203, 225, 51, 26, 224, 54, 49, 26, 224, 54, 213, 46, 63, + 208, 193, 64, 208, 193, 64, 52, 3, 212, 219, 243, 14, 64, 52, 243, 45, + 63, 4, 208, 193, 52, 3, 233, 177, 237, 95, 52, 3, 83, 237, 95, 52, 3, + 217, 17, 242, 229, 237, 95, 52, 3, 203, 225, 49, 205, 186, 224, 54, 51, + 237, 95, 52, 3, 203, 225, 51, 205, 186, 224, 54, 49, 237, 95, 52, 3, 241, + 71, 242, 229, 237, 95, 63, 4, 208, 193, 64, 4, 208, 193, 63, 213, 175, + 64, 213, 175, 63, 83, 213, 175, 64, 83, 213, 175, 63, 216, 119, 64, 216, + 119, 63, 203, 227, 205, 98, 64, 203, 227, 205, 98, 63, 203, 227, 4, 205, + 98, 64, 203, 227, 4, 205, 98, 63, 213, 41, 205, 98, 64, 213, 41, 205, 98, + 63, 213, 41, 4, 205, 98, 64, 213, 41, 4, 205, 98, 63, 213, 41, 215, 97, + 64, 213, 41, 215, 97, 63, 239, 166, 205, 98, 64, 239, 166, 205, 98, 63, + 239, 166, 4, 205, 98, 64, 239, 166, 4, 205, 98, 63, 225, 23, 205, 98, 64, + 225, 23, 205, 98, 63, 225, 23, 4, 205, 98, 64, 225, 23, 4, 205, 98, 63, + 225, 23, 215, 97, 64, 225, 23, 215, 97, 63, 241, 64, 64, 241, 64, 64, + 241, 65, 243, 45, 63, 4, 241, 64, 237, 70, 224, 49, 64, 246, 155, 239, + 180, 246, 155, 246, 156, 3, 83, 237, 95, 248, 16, 63, 246, 155, 246, 156, + 3, 49, 167, 248, 144, 246, 156, 3, 51, 167, 248, 144, 246, 156, 3, 224, + 54, 167, 248, 144, 246, 156, 3, 203, 225, 167, 248, 144, 246, 156, 3, + 203, 225, 51, 214, 92, 248, 144, 246, 156, 3, 251, 125, 247, 247, 203, + 225, 49, 214, 92, 248, 144, 49, 167, 63, 246, 155, 51, 167, 63, 246, 155, + 228, 51, 248, 20, 228, 51, 64, 246, 155, 203, 225, 167, 228, 51, 64, 246, + 155, 224, 54, 167, 228, 51, 64, 246, 155, 203, 225, 49, 214, 92, 246, + 149, 250, 236, 203, 225, 51, 214, 92, 246, 149, 250, 236, 224, 54, 51, + 214, 92, 246, 149, 250, 236, 224, 54, 49, 214, 92, 246, 149, 250, 236, + 203, 225, 167, 246, 155, 224, 54, 167, 246, 155, 63, 224, 54, 51, 205, + 98, 63, 224, 54, 49, 205, 98, 63, 203, 225, 49, 205, 98, 63, 203, 225, + 51, 205, 98, 64, 248, 20, 52, 3, 49, 167, 248, 144, 52, 3, 51, 167, 248, + 144, 52, 3, 203, 225, 49, 241, 71, 167, 248, 144, 52, 3, 224, 54, 51, + 241, 71, 167, 248, 144, 64, 52, 3, 83, 248, 156, 224, 176, 64, 203, 227, + 205, 99, 3, 240, 182, 203, 227, 205, 99, 3, 49, 167, 248, 144, 203, 227, + 205, 99, 3, 51, 167, 248, 144, 225, 71, 246, 155, 64, 52, 3, 203, 225, + 49, 214, 91, 64, 52, 3, 224, 54, 49, 214, 91, 64, 52, 3, 224, 54, 51, + 214, 91, 64, 52, 3, 203, 225, 51, 214, 91, 64, 246, 156, 3, 203, 225, 49, + 214, 91, 64, 246, 156, 3, 224, 54, 49, 214, 91, 64, 246, 156, 3, 224, 54, + 51, 214, 91, 64, 246, 156, 3, 203, 225, 51, 214, 91, 203, 225, 49, 205, + 98, 203, 225, 51, 205, 98, 224, 54, 49, 205, 98, 64, 222, 66, 208, 193, + 63, 222, 66, 208, 193, 64, 222, 66, 4, 208, 193, 63, 222, 66, 4, 208, + 193, 224, 54, 51, 205, 98, 63, 207, 229, 3, 213, 194, 246, 101, 204, 9, + 209, 31, 246, 73, 63, 208, 109, 64, 208, 109, 224, 193, 206, 30, 207, + 228, 250, 184, 218, 238, 241, 118, 218, 238, 243, 54, 217, 39, 63, 206, + 175, 64, 206, 175, 249, 94, 248, 78, 249, 94, 100, 3, 247, 6, 249, 94, + 100, 3, 200, 195, 212, 24, 204, 10, 3, 213, 223, 239, 144, 233, 118, 248, + 204, 64, 210, 3, 215, 196, 63, 210, 3, 215, 196, 210, 91, 213, 105, 212, + 228, 237, 28, 234, 128, 248, 20, 63, 49, 215, 96, 228, 103, 63, 51, 215, + 96, 228, 103, 64, 49, 215, 96, 228, 103, 64, 115, 215, 96, 228, 103, 64, + 51, 215, 96, 228, 103, 64, 127, 215, 96, 228, 103, 209, 81, 26, 242, 233, + 247, 105, 54, 213, 235, 54, 248, 164, 54, 247, 181, 251, 61, 217, 18, + 242, 234, 246, 237, 213, 90, 242, 235, 76, 224, 69, 242, 235, 76, 227, + 217, 208, 110, 26, 242, 243, 237, 162, 99, 251, 228, 210, 94, 234, 207, + 26, 209, 179, 216, 72, 99, 199, 255, 200, 75, 205, 88, 36, 234, 123, 205, + 88, 36, 225, 96, 205, 88, 36, 237, 77, 205, 88, 36, 206, 31, 205, 88, 36, + 201, 16, 205, 88, 36, 201, 82, 205, 88, 36, 221, 63, 205, 88, 36, 239, + 17, 201, 38, 76, 241, 92, 64, 236, 195, 237, 189, 64, 209, 47, 237, 189, + 63, 209, 47, 237, 189, 64, 207, 229, 3, 213, 194, 237, 73, 214, 88, 221, + 81, 225, 64, 214, 88, 221, 81, 222, 34, 237, 130, 54, 239, 17, 222, 185, + 54, 227, 133, 211, 244, 203, 209, 220, 18, 215, 110, 250, 222, 206, 219, + 236, 2, 247, 154, 224, 246, 202, 206, 224, 207, 211, 212, 212, 48, 247, + 139, 250, 254, 215, 145, 64, 246, 244, 226, 144, 64, 246, 244, 214, 80, + 64, 246, 244, 212, 236, 64, 246, 244, 248, 155, 64, 246, 244, 226, 93, + 64, 246, 244, 216, 84, 63, 246, 244, 226, 144, 63, 246, 244, 214, 80, 63, + 246, 244, 212, 236, 63, 246, 244, 248, 155, 63, 246, 244, 226, 93, 63, + 246, 244, 216, 84, 63, 208, 242, 207, 241, 64, 234, 128, 207, 241, 64, + 241, 65, 207, 241, 63, 246, 98, 207, 241, 64, 208, 242, 207, 241, 63, + 234, 128, 207, 241, 63, 241, 65, 207, 241, 64, 246, 98, 207, 241, 233, + 118, 208, 198, 214, 88, 218, 209, 238, 228, 218, 209, 249, 4, 238, 228, + 218, 204, 249, 4, 209, 99, 218, 204, 220, 246, 237, 45, 54, 220, 246, + 220, 117, 54, 220, 246, 210, 79, 54, 201, 48, 207, 103, 242, 234, 239, + 14, 207, 103, 242, 234, 203, 237, 213, 171, 99, 213, 171, 16, 36, 204, + 127, 215, 127, 213, 171, 16, 36, 204, 125, 215, 127, 213, 171, 16, 36, + 204, 124, 215, 127, 213, 171, 16, 36, 204, 122, 215, 127, 213, 171, 16, + 36, 204, 120, 215, 127, 213, 171, 16, 36, 204, 118, 215, 127, 213, 171, + 16, 36, 204, 116, 215, 127, 213, 171, 16, 36, 236, 0, 222, 126, 63, 203, + 237, 213, 171, 99, 213, 172, 216, 134, 99, 216, 107, 216, 134, 99, 216, + 19, 216, 134, 54, 201, 36, 99, 241, 57, 237, 188, 241, 57, 237, 187, 241, + 57, 237, 186, 241, 57, 237, 185, 241, 57, 237, 184, 241, 57, 237, 183, + 64, 246, 156, 3, 73, 213, 46, 64, 246, 156, 3, 120, 240, 180, 63, 246, + 156, 3, 64, 73, 213, 46, 63, 246, 156, 3, 120, 64, 240, 180, 221, 97, 36, + 200, 75, 221, 97, 36, 199, 254, 241, 38, 36, 235, 68, 200, 75, 241, 38, + 36, 224, 239, 199, 254, 241, 38, 36, 224, 239, 200, 75, 241, 38, 36, 235, + 68, 199, 254, 64, 237, 53, 63, 237, 53, 234, 207, 26, 215, 200, 251, 81, + 242, 232, 207, 168, 208, 118, 76, 251, 204, 211, 229, 251, 141, 237, 24, + 236, 12, 208, 118, 76, 234, 98, 250, 147, 99, 237, 40, 216, 250, 64, 208, + 109, 126, 224, 171, 243, 31, 213, 46, 126, 224, 171, 243, 31, 225, 28, + 201, 93, 54, 122, 202, 182, 54, 239, 172, 237, 130, 54, 239, 172, 222, + 185, 54, 228, 61, 237, 130, 26, 222, 185, 54, 222, 185, 26, 237, 130, 54, + 222, 185, 3, 208, 47, 54, 222, 185, 3, 208, 47, 26, 222, 185, 26, 237, + 130, 54, 83, 222, 185, 3, 208, 47, 54, 233, 177, 222, 185, 3, 208, 47, + 54, 222, 66, 64, 246, 155, 222, 66, 63, 246, 155, 222, 66, 4, 64, 246, + 155, 222, 143, 99, 240, 233, 99, 203, 234, 216, 106, 99, 246, 84, 236, + 178, 203, 205, 220, 11, 247, 41, 216, 179, 227, 139, 202, 244, 246, 217, + 63, 221, 82, 224, 190, 210, 125, 210, 164, 214, 70, 210, 144, 209, 26, + 249, 97, 249, 63, 95, 226, 214, 64, 239, 155, 222, 180, 64, 239, 155, + 226, 144, 63, 239, 155, 222, 180, 63, 239, 155, 226, 144, 209, 32, 201, + 3, 209, 35, 207, 229, 248, 237, 246, 101, 213, 222, 63, 209, 31, 206, 32, + 246, 102, 26, 213, 222, 204, 185, 64, 210, 3, 215, 196, 204, 185, 63, + 210, 3, 215, 196, 64, 241, 65, 228, 118, 208, 193, 242, 228, 225, 78, + 241, 5, 247, 135, 217, 42, 215, 200, 247, 136, 209, 65, 234, 108, 3, 64, + 242, 234, 44, 242, 228, 225, 78, 247, 33, 218, 242, 238, 149, 251, 109, + 217, 71, 49, 201, 68, 205, 126, 63, 204, 138, 49, 201, 68, 205, 126, 64, + 204, 138, 49, 201, 68, 205, 126, 63, 49, 225, 79, 222, 33, 64, 49, 225, + 79, 222, 33, 239, 150, 209, 57, 54, 80, 64, 239, 166, 205, 98, 49, 246, + 110, 238, 149, 95, 212, 24, 237, 171, 241, 71, 228, 118, 64, 246, 156, + 228, 118, 63, 208, 193, 63, 205, 62, 213, 116, 49, 238, 148, 213, 116, + 49, 238, 147, 250, 160, 16, 36, 203, 209, 80, 246, 156, 3, 208, 47, 26, + 120, 190, 56, 216, 36, 213, 43, 228, 63, 216, 36, 225, 25, 228, 63, 216, + 36, 228, 50, 216, 36, 63, 242, 235, 217, 79, 210, 30, 210, 18, 209, 225, + 246, 184, 247, 113, 234, 46, 209, 107, 236, 13, 201, 3, 233, 94, 236, 13, + 3, 234, 176, 222, 165, 16, 36, 224, 195, 221, 63, 204, 10, 217, 79, 235, + 59, 236, 230, 237, 54, 228, 118, 233, 197, 237, 120, 212, 43, 52, 236, + 229, 243, 14, 209, 84, 232, 232, 209, 87, 216, 11, 3, 249, 97, 206, 158, + 227, 236, 249, 82, 99, 234, 131, 235, 70, 99, 236, 186, 214, 213, 242, + 203, 217, 79, 63, 208, 193, 64, 237, 54, 3, 233, 177, 101, 63, 208, 48, + 63, 212, 53, 211, 216, 203, 225, 248, 139, 211, 216, 63, 211, 216, 224, + 54, 248, 139, 211, 216, 64, 211, 216, 64, 80, 247, 7, 81, 206, 176, 224, + 108, 54, 206, 235, 239, 149, 251, 164, 238, 144, 213, 220, 237, 66, 213, + 220, 234, 199, 202, 232, 234, 199, 200, 219, 234, 199, 224, 54, 51, 216, + 46, 216, 46, 203, 225, 51, 216, 46, 64, 219, 147, 63, 219, 147, 247, 7, + 81, 80, 247, 7, 81, 221, 19, 200, 195, 80, 221, 19, 200, 195, 249, 94, + 200, 195, 80, 249, 94, 200, 195, 216, 250, 31, 242, 234, 80, 31, 242, + 234, 176, 247, 56, 242, 234, 80, 176, 247, 56, 242, 234, 8, 242, 234, + 210, 101, 64, 8, 242, 234, 216, 250, 8, 242, 234, 222, 182, 242, 234, + 208, 110, 76, 241, 237, 236, 229, 206, 194, 250, 165, 236, 229, 249, 95, + 250, 165, 80, 236, 229, 249, 95, 250, 165, 236, 229, 246, 96, 250, 165, + 63, 236, 229, 215, 98, 208, 109, 64, 236, 229, 215, 98, 208, 109, 208, + 237, 208, 57, 216, 250, 64, 208, 109, 44, 64, 208, 109, 176, 247, 56, 63, + 208, 109, 63, 247, 56, 64, 208, 109, 216, 250, 63, 208, 109, 80, 216, + 250, 63, 208, 109, 215, 155, 208, 109, 210, 101, 64, 208, 109, 80, 250, + 165, 176, 247, 56, 250, 165, 238, 232, 208, 207, 250, 165, 238, 232, 215, + 98, 63, 208, 109, 238, 232, 215, 98, 215, 155, 208, 109, 209, 106, 215, + 98, 63, 208, 109, 238, 232, 215, 98, 213, 173, 63, 208, 109, 80, 238, + 232, 215, 98, 213, 173, 63, 208, 109, 204, 165, 215, 98, 63, 208, 109, + 209, 101, 215, 98, 250, 165, 206, 194, 250, 165, 176, 247, 56, 206, 194, + 250, 165, 80, 206, 194, 250, 165, 209, 106, 215, 255, 63, 26, 64, 237, + 27, 63, 237, 27, 64, 237, 27, 238, 232, 215, 255, 216, 250, 63, 237, 27, + 44, 176, 247, 56, 238, 232, 215, 98, 208, 109, 80, 206, 194, 215, 155, + 250, 165, 209, 33, 206, 1, 205, 91, 209, 33, 80, 246, 240, 209, 33, 208, + 239, 80, 208, 239, 249, 95, 250, 165, 238, 232, 206, 194, 214, 246, 250, + 165, 80, 238, 232, 206, 194, 214, 246, 250, 165, 242, 235, 81, 210, 101, + 64, 246, 155, 189, 95, 242, 235, 81, 224, 54, 51, 239, 146, 64, 208, 193, + 203, 225, 51, 239, 146, 64, 208, 193, 224, 54, 51, 210, 101, 64, 208, + 193, 203, 225, 51, 210, 101, 64, 208, 193, 63, 214, 79, 134, 217, 21, 64, + 214, 79, 134, 217, 21, 64, 238, 43, 134, 217, 21, 63, 241, 65, 221, 157, + 64, 200, 195, 80, 238, 43, 134, 99, 162, 83, 148, 222, 66, 83, 148, 80, + 83, 148, 80, 209, 139, 204, 185, 246, 71, 214, 63, 134, 217, 21, 80, 209, + 139, 246, 71, 214, 63, 134, 217, 21, 80, 53, 204, 185, 246, 71, 214, 63, + 134, 217, 21, 80, 53, 246, 71, 214, 63, 134, 217, 21, 80, 128, 209, 139, + 246, 71, 214, 63, 134, 217, 21, 80, 128, 53, 246, 71, 214, 63, 134, 217, + 21, 242, 188, 208, 93, 216, 128, 2, 217, 21, 80, 238, 43, 134, 217, 21, + 80, 234, 128, 238, 43, 134, 217, 21, 80, 63, 234, 127, 212, 228, 80, 63, + 234, 128, 248, 20, 237, 28, 234, 127, 212, 228, 237, 28, 234, 128, 248, + 20, 222, 66, 49, 216, 116, 217, 21, 222, 66, 51, 216, 116, 217, 21, 222, + 66, 237, 41, 49, 216, 116, 217, 21, 222, 66, 237, 41, 51, 216, 116, 217, + 21, 222, 66, 225, 23, 251, 71, 248, 70, 217, 21, 222, 66, 213, 41, 251, + 71, 248, 70, 217, 21, 80, 225, 23, 251, 71, 214, 63, 134, 217, 21, 80, + 213, 41, 251, 71, 214, 63, 134, 217, 21, 80, 225, 23, 251, 71, 248, 70, + 217, 21, 80, 213, 41, 251, 71, 248, 70, 217, 21, 162, 49, 205, 146, 210, + 55, 248, 70, 217, 21, 162, 51, 205, 146, 210, 55, 248, 70, 217, 21, 222, + 66, 49, 242, 196, 248, 70, 217, 21, 222, 66, 51, 242, 196, 248, 70, 217, + 21, 241, 17, 189, 44, 17, 102, 241, 17, 189, 44, 17, 105, 241, 17, 189, + 44, 17, 147, 241, 17, 189, 44, 17, 149, 241, 17, 189, 44, 17, 164, 241, + 17, 189, 44, 17, 187, 241, 17, 189, 44, 17, 210, 135, 241, 17, 189, 44, + 17, 192, 241, 17, 189, 44, 17, 219, 113, 241, 17, 189, 44, 41, 206, 166, + 241, 17, 44, 43, 17, 102, 241, 17, 44, 43, 17, 105, 241, 17, 44, 43, 17, + 147, 241, 17, 44, 43, 17, 149, 241, 17, 44, 43, 17, 164, 241, 17, 44, 43, + 17, 187, 241, 17, 44, 43, 17, 210, 135, 241, 17, 44, 43, 17, 192, 241, + 17, 44, 43, 17, 219, 113, 241, 17, 44, 43, 41, 206, 166, 241, 17, 189, + 44, 43, 17, 102, 241, 17, 189, 44, 43, 17, 105, 241, 17, 189, 44, 43, 17, + 147, 241, 17, 189, 44, 43, 17, 149, 241, 17, 189, 44, 43, 17, 164, 241, + 17, 189, 44, 43, 17, 187, 241, 17, 189, 44, 43, 17, 210, 135, 241, 17, + 189, 44, 43, 17, 192, 241, 17, 189, 44, 43, 17, 219, 113, 241, 17, 189, + 44, 43, 41, 206, 166, 80, 201, 27, 87, 48, 80, 93, 54, 80, 221, 157, 54, + 80, 240, 235, 54, 80, 208, 254, 239, 14, 48, 80, 87, 48, 80, 157, 239, + 14, 48, 239, 160, 215, 100, 87, 48, 80, 212, 220, 87, 48, 205, 97, 87, + 48, 80, 205, 97, 87, 48, 241, 243, 205, 97, 87, 48, 80, 241, 243, 205, + 97, 87, 48, 63, 87, 48, 206, 45, 205, 156, 87, 250, 202, 206, 45, 248, + 91, 87, 250, 202, 63, 87, 250, 202, 80, 63, 242, 188, 191, 26, 87, 48, + 80, 63, 242, 188, 182, 26, 87, 48, 208, 190, 63, 87, 48, 80, 243, 67, 63, + 87, 48, 213, 40, 64, 87, 48, 225, 22, 64, 87, 48, 249, 128, 210, 101, 64, + 87, 48, 236, 198, 210, 101, 64, 87, 48, 80, 224, 54, 213, 39, 64, 87, 48, + 80, 203, 225, 213, 39, 64, 87, 48, 218, 211, 224, 54, 213, 39, 64, 87, + 48, 242, 196, 224, 74, 218, 211, 203, 225, 213, 39, 64, 87, 48, 44, 80, + 64, 87, 48, 201, 33, 87, 48, 248, 143, 208, 254, 239, 14, 48, 248, 143, + 87, 48, 248, 143, 157, 239, 14, 48, 80, 248, 143, 208, 254, 239, 14, 48, + 80, 248, 143, 87, 48, 80, 248, 143, 157, 239, 14, 48, 206, 196, 87, 48, + 80, 206, 195, 87, 48, 201, 58, 87, 48, 80, 201, 58, 87, 48, 217, 48, 87, + 48, 53, 242, 196, 224, 74, 126, 241, 27, 251, 70, 64, 205, 99, 243, 45, + 4, 64, 205, 98, 216, 14, 176, 208, 2, 176, 207, 211, 49, 212, 121, 249, + 114, 241, 142, 51, 212, 121, 249, 114, 241, 142, 217, 34, 3, 73, 228, 73, + 213, 106, 209, 17, 215, 27, 208, 2, 207, 212, 215, 27, 209, 16, 83, 249, + 77, 3, 233, 177, 97, 13, 213, 19, 241, 70, 168, 240, 234, 13, 237, 171, + 241, 70, 95, 224, 98, 251, 79, 95, 224, 98, 217, 33, 64, 241, 65, 3, 247, + 54, 240, 182, 26, 3, 240, 182, 238, 202, 76, 217, 46, 203, 216, 224, 54, + 51, 243, 16, 3, 240, 182, 203, 225, 49, 243, 16, 3, 240, 182, 49, 216, + 252, 227, 164, 51, 216, 252, 227, 164, 236, 183, 216, 252, 227, 164, 225, + 71, 115, 207, 17, 225, 71, 127, 207, 17, 49, 26, 51, 53, 204, 184, 49, + 26, 51, 207, 17, 49, 221, 23, 168, 51, 207, 17, 168, 49, 207, 17, 115, + 207, 18, 3, 246, 156, 56, 224, 50, 240, 240, 247, 235, 233, 177, 212, + 165, 64, 243, 66, 241, 64, 64, 243, 66, 241, 65, 3, 98, 206, 11, 64, 243, + 66, 241, 65, 3, 87, 206, 11, 64, 52, 3, 98, 206, 11, 64, 52, 3, 87, 206, + 11, 13, 49, 64, 52, 159, 13, 51, 64, 52, 159, 13, 49, 251, 71, 159, 13, + 51, 251, 71, 159, 13, 49, 53, 251, 71, 159, 13, 51, 53, 251, 71, 159, 13, + 49, 64, 205, 146, 210, 55, 159, 13, 51, 64, 205, 146, 210, 55, 159, 13, + 49, 237, 41, 216, 115, 13, 51, 237, 41, 216, 115, 182, 214, 90, 48, 191, + 214, 90, 48, 251, 47, 236, 51, 246, 156, 48, 246, 112, 236, 51, 246, 156, + 48, 51, 55, 3, 44, 215, 113, 168, 98, 48, 168, 87, 48, 168, 49, 51, 48, + 168, 98, 53, 48, 168, 87, 53, 48, 168, 49, 51, 53, 48, 168, 98, 55, 236, + 201, 148, 168, 87, 55, 236, 201, 148, 168, 98, 53, 55, 236, 201, 148, + 168, 87, 53, 55, 236, 201, 148, 168, 87, 208, 186, 48, 59, 60, 248, 137, + 59, 60, 240, 179, 59, 60, 240, 51, 59, 60, 240, 178, 59, 60, 239, 243, + 59, 60, 240, 114, 59, 60, 240, 50, 59, 60, 240, 177, 59, 60, 239, 211, + 59, 60, 240, 82, 59, 60, 240, 18, 59, 60, 240, 145, 59, 60, 239, 242, 59, + 60, 240, 113, 59, 60, 240, 49, 59, 60, 240, 176, 59, 60, 239, 195, 59, + 60, 240, 66, 59, 60, 240, 2, 59, 60, 240, 129, 59, 60, 239, 226, 59, 60, + 240, 97, 59, 60, 240, 33, 59, 60, 240, 160, 59, 60, 239, 210, 59, 60, + 240, 81, 59, 60, 240, 17, 59, 60, 240, 144, 59, 60, 239, 241, 59, 60, + 240, 112, 59, 60, 240, 48, 59, 60, 240, 175, 59, 60, 239, 187, 59, 60, + 240, 58, 59, 60, 239, 250, 59, 60, 240, 121, 59, 60, 239, 218, 59, 60, + 240, 89, 59, 60, 240, 25, 59, 60, 240, 152, 59, 60, 239, 202, 59, 60, + 240, 73, 59, 60, 240, 9, 59, 60, 240, 136, 59, 60, 239, 233, 59, 60, 240, + 104, 59, 60, 240, 40, 59, 60, 240, 167, 59, 60, 239, 194, 59, 60, 240, + 65, 59, 60, 240, 1, 59, 60, 240, 128, 59, 60, 239, 225, 59, 60, 240, 96, + 59, 60, 240, 32, 59, 60, 240, 159, 59, 60, 239, 209, 59, 60, 240, 80, 59, + 60, 240, 16, 59, 60, 240, 143, 59, 60, 239, 240, 59, 60, 240, 111, 59, + 60, 240, 47, 59, 60, 240, 174, 59, 60, 239, 183, 59, 60, 240, 54, 59, 60, + 239, 246, 59, 60, 240, 117, 59, 60, 239, 214, 59, 60, 240, 85, 59, 60, + 240, 21, 59, 60, 240, 148, 59, 60, 239, 198, 59, 60, 240, 69, 59, 60, + 240, 5, 59, 60, 240, 132, 59, 60, 239, 229, 59, 60, 240, 100, 59, 60, + 240, 36, 59, 60, 240, 163, 59, 60, 239, 190, 59, 60, 240, 61, 59, 60, + 239, 253, 59, 60, 240, 124, 59, 60, 239, 221, 59, 60, 240, 92, 59, 60, + 240, 28, 59, 60, 240, 155, 59, 60, 239, 205, 59, 60, 240, 76, 59, 60, + 240, 12, 59, 60, 240, 139, 59, 60, 239, 236, 59, 60, 240, 107, 59, 60, + 240, 43, 59, 60, 240, 170, 59, 60, 239, 186, 59, 60, 240, 57, 59, 60, + 239, 249, 59, 60, 240, 120, 59, 60, 239, 217, 59, 60, 240, 88, 59, 60, + 240, 24, 59, 60, 240, 151, 59, 60, 239, 201, 59, 60, 240, 72, 59, 60, + 240, 8, 59, 60, 240, 135, 59, 60, 239, 232, 59, 60, 240, 103, 59, 60, + 240, 39, 59, 60, 240, 166, 59, 60, 239, 193, 59, 60, 240, 64, 59, 60, + 240, 0, 59, 60, 240, 127, 59, 60, 239, 224, 59, 60, 240, 95, 59, 60, 240, + 31, 59, 60, 240, 158, 59, 60, 239, 208, 59, 60, 240, 79, 59, 60, 240, 15, + 59, 60, 240, 142, 59, 60, 239, 239, 59, 60, 240, 110, 59, 60, 240, 46, + 59, 60, 240, 173, 59, 60, 239, 181, 59, 60, 240, 52, 59, 60, 239, 244, + 59, 60, 240, 115, 59, 60, 239, 212, 59, 60, 240, 83, 59, 60, 240, 19, 59, + 60, 240, 146, 59, 60, 239, 196, 59, 60, 240, 67, 59, 60, 240, 3, 59, 60, + 240, 130, 59, 60, 239, 227, 59, 60, 240, 98, 59, 60, 240, 34, 59, 60, + 240, 161, 59, 60, 239, 188, 59, 60, 240, 59, 59, 60, 239, 251, 59, 60, + 240, 122, 59, 60, 239, 219, 59, 60, 240, 90, 59, 60, 240, 26, 59, 60, + 240, 153, 59, 60, 239, 203, 59, 60, 240, 74, 59, 60, 240, 10, 59, 60, + 240, 137, 59, 60, 239, 234, 59, 60, 240, 105, 59, 60, 240, 41, 59, 60, + 240, 168, 59, 60, 239, 184, 59, 60, 240, 55, 59, 60, 239, 247, 59, 60, + 240, 118, 59, 60, 239, 215, 59, 60, 240, 86, 59, 60, 240, 22, 59, 60, + 240, 149, 59, 60, 239, 199, 59, 60, 240, 70, 59, 60, 240, 6, 59, 60, 240, + 133, 59, 60, 239, 230, 59, 60, 240, 101, 59, 60, 240, 37, 59, 60, 240, + 164, 59, 60, 239, 191, 59, 60, 240, 62, 59, 60, 239, 254, 59, 60, 240, + 125, 59, 60, 239, 222, 59, 60, 240, 93, 59, 60, 240, 29, 59, 60, 240, + 156, 59, 60, 239, 206, 59, 60, 240, 77, 59, 60, 240, 13, 59, 60, 240, + 140, 59, 60, 239, 237, 59, 60, 240, 108, 59, 60, 240, 44, 59, 60, 240, + 171, 59, 60, 239, 182, 59, 60, 240, 53, 59, 60, 239, 245, 59, 60, 240, + 116, 59, 60, 239, 213, 59, 60, 240, 84, 59, 60, 240, 20, 59, 60, 240, + 147, 59, 60, 239, 197, 59, 60, 240, 68, 59, 60, 240, 4, 59, 60, 240, 131, + 59, 60, 239, 228, 59, 60, 240, 99, 59, 60, 240, 35, 59, 60, 240, 162, 59, + 60, 239, 189, 59, 60, 240, 60, 59, 60, 239, 252, 59, 60, 240, 123, 59, + 60, 239, 220, 59, 60, 240, 91, 59, 60, 240, 27, 59, 60, 240, 154, 59, 60, + 239, 204, 59, 60, 240, 75, 59, 60, 240, 11, 59, 60, 240, 138, 59, 60, + 239, 235, 59, 60, 240, 106, 59, 60, 240, 42, 59, 60, 240, 169, 59, 60, + 239, 185, 59, 60, 240, 56, 59, 60, 239, 248, 59, 60, 240, 119, 59, 60, + 239, 216, 59, 60, 240, 87, 59, 60, 240, 23, 59, 60, 240, 150, 59, 60, + 239, 200, 59, 60, 240, 71, 59, 60, 240, 7, 59, 60, 240, 134, 59, 60, 239, + 231, 59, 60, 240, 102, 59, 60, 240, 38, 59, 60, 240, 165, 59, 60, 239, + 192, 59, 60, 240, 63, 59, 60, 239, 255, 59, 60, 240, 126, 59, 60, 239, + 223, 59, 60, 240, 94, 59, 60, 240, 30, 59, 60, 240, 157, 59, 60, 239, + 207, 59, 60, 240, 78, 59, 60, 240, 14, 59, 60, 240, 141, 59, 60, 239, + 238, 59, 60, 240, 109, 59, 60, 240, 45, 59, 60, 240, 172, 87, 204, 141, + 55, 3, 83, 97, 87, 204, 141, 55, 3, 53, 83, 97, 98, 53, 55, 3, 83, 97, + 87, 53, 55, 3, 83, 97, 49, 51, 53, 55, 3, 83, 97, 87, 204, 141, 55, 236, + 201, 148, 98, 53, 55, 236, 201, 148, 87, 53, 55, 236, 201, 148, 191, 55, + 3, 233, 177, 97, 182, 55, 3, 233, 177, 97, 182, 205, 83, 48, 191, 205, + 83, 48, 98, 53, 241, 245, 48, 87, 53, 241, 245, 48, 98, 205, 83, 241, + 245, 48, 87, 205, 83, 241, 245, 48, 87, 204, 141, 205, 83, 241, 245, 48, + 87, 55, 3, 239, 180, 208, 92, 182, 55, 205, 186, 148, 191, 55, 205, 186, + 148, 87, 55, 3, 207, 7, 3, 83, 97, 87, 55, 3, 207, 7, 3, 53, 83, 97, 87, + 204, 141, 55, 3, 207, 6, 87, 204, 141, 55, 3, 207, 7, 3, 83, 97, 87, 204, + 141, 55, 3, 207, 7, 3, 53, 83, 97, 98, 250, 204, 87, 250, 204, 98, 53, + 250, 204, 87, 53, 250, 204, 98, 55, 205, 186, 63, 241, 64, 87, 55, 205, + 186, 63, 241, 64, 98, 55, 236, 201, 249, 77, 205, 186, 63, 241, 64, 87, + 55, 236, 201, 249, 77, 205, 186, 63, 241, 64, 157, 201, 48, 26, 208, 254, + 239, 14, 48, 157, 239, 14, 26, 208, 254, 201, 48, 48, 157, 201, 48, 55, + 3, 117, 157, 239, 14, 55, 3, 117, 208, 254, 239, 14, 55, 3, 117, 208, + 254, 201, 48, 55, 3, 117, 157, 201, 48, 55, 26, 157, 239, 14, 48, 157, + 239, 14, 55, 26, 208, 254, 239, 14, 48, 208, 254, 239, 14, 55, 26, 208, + 254, 201, 48, 48, 208, 254, 201, 48, 55, 26, 157, 201, 48, 48, 213, 19, + 241, 71, 242, 228, 237, 171, 241, 70, 237, 171, 241, 71, 242, 228, 213, + 19, 241, 70, 208, 254, 239, 14, 55, 242, 228, 157, 239, 14, 48, 157, 239, + 14, 55, 242, 228, 208, 254, 239, 14, 48, 237, 171, 241, 71, 242, 228, + 157, 239, 14, 48, 213, 19, 241, 71, 242, 228, 208, 254, 239, 14, 48, 157, + 239, 14, 55, 242, 228, 157, 201, 48, 48, 157, 201, 48, 55, 242, 228, 157, + 239, 14, 48, 201, 78, 55, 215, 96, 241, 7, 213, 46, 55, 215, 96, 87, 206, + 98, 242, 186, 203, 216, 55, 215, 96, 87, 206, 98, 242, 186, 239, 165, 55, + 215, 96, 191, 206, 98, 242, 186, 225, 18, 55, 215, 96, 191, 206, 98, 242, + 186, 213, 35, 213, 38, 250, 237, 246, 112, 48, 225, 21, 250, 237, 251, + 47, 48, 205, 158, 250, 237, 251, 47, 48, 248, 93, 250, 237, 251, 47, 48, + 205, 158, 250, 237, 246, 112, 55, 3, 221, 156, 205, 158, 250, 237, 251, + 47, 55, 3, 215, 113, 224, 54, 51, 210, 169, 246, 112, 48, 224, 54, 49, + 210, 169, 251, 47, 48, 251, 47, 246, 110, 246, 156, 48, 246, 112, 246, + 110, 246, 156, 48, 87, 55, 88, 209, 250, 98, 48, 98, 55, 88, 209, 250, + 87, 48, 209, 250, 87, 55, 88, 98, 48, 87, 55, 3, 93, 57, 98, 55, 3, 93, + 57, 87, 55, 206, 38, 200, 195, 49, 51, 55, 206, 38, 4, 246, 155, 182, + 204, 141, 55, 236, 201, 4, 246, 155, 49, 154, 115, 51, 154, 127, 234, + 160, 49, 154, 127, 51, 154, 115, 234, 160, 115, 154, 51, 127, 154, 49, + 234, 160, 115, 154, 49, 127, 154, 51, 234, 160, 49, 154, 115, 51, 154, + 115, 234, 160, 115, 154, 51, 127, 154, 51, 234, 160, 49, 154, 127, 51, + 154, 127, 234, 160, 115, 154, 49, 127, 154, 49, 234, 160, 98, 234, 161, + 3, 154, 115, 205, 186, 148, 87, 234, 161, 3, 154, 115, 205, 186, 148, + 182, 234, 161, 3, 154, 51, 205, 186, 148, 191, 234, 161, 3, 154, 51, 205, + 186, 148, 98, 234, 161, 3, 154, 127, 205, 186, 148, 87, 234, 161, 3, 154, + 127, 205, 186, 148, 182, 234, 161, 3, 154, 49, 205, 186, 148, 191, 234, + 161, 3, 154, 49, 205, 186, 148, 98, 234, 161, 3, 154, 115, 236, 201, 148, + 87, 234, 161, 3, 154, 115, 236, 201, 148, 182, 234, 161, 3, 154, 51, 236, + 201, 148, 191, 234, 161, 3, 154, 51, 236, 201, 148, 98, 234, 161, 3, 154, + 127, 236, 201, 148, 87, 234, 161, 3, 154, 127, 236, 201, 148, 182, 234, + 161, 3, 154, 49, 236, 201, 148, 191, 234, 161, 3, 154, 49, 236, 201, 148, + 98, 234, 161, 3, 154, 115, 88, 98, 234, 161, 3, 154, 239, 167, 182, 234, + 161, 3, 154, 49, 248, 212, 182, 234, 161, 3, 154, 213, 46, 87, 234, 161, + 3, 154, 115, 88, 87, 234, 161, 3, 154, 239, 167, 191, 234, 161, 3, 154, + 49, 248, 212, 191, 234, 161, 3, 154, 213, 46, 98, 234, 161, 3, 154, 115, + 88, 87, 234, 161, 3, 154, 203, 228, 98, 234, 161, 3, 154, 127, 88, 87, + 234, 161, 3, 154, 239, 167, 87, 234, 161, 3, 154, 115, 88, 98, 234, 161, + 3, 154, 203, 228, 87, 234, 161, 3, 154, 127, 88, 98, 234, 161, 3, 154, + 239, 167, 98, 234, 161, 3, 154, 115, 88, 168, 241, 244, 98, 234, 161, 3, + 154, 127, 248, 228, 168, 241, 244, 87, 234, 161, 3, 154, 115, 88, 168, + 241, 244, 87, 234, 161, 3, 154, 127, 248, 228, 168, 241, 244, 182, 234, + 161, 3, 154, 49, 248, 212, 191, 234, 161, 3, 154, 213, 46, 191, 234, 161, + 3, 154, 49, 248, 212, 182, 234, 161, 3, 154, 213, 46, 51, 53, 55, 3, 212, + 219, 234, 136, 238, 122, 2, 88, 87, 48, 205, 241, 217, 44, 88, 87, 48, + 98, 55, 88, 205, 241, 217, 43, 87, 55, 88, 205, 241, 217, 43, 87, 55, 88, + 251, 117, 160, 138, 224, 241, 88, 98, 48, 98, 55, 206, 38, 224, 240, 235, + 67, 88, 87, 48, 208, 3, 88, 87, 48, 98, 55, 206, 38, 208, 2, 207, 212, + 88, 98, 48, 49, 237, 72, 207, 6, 51, 237, 72, 207, 6, 115, 237, 72, 207, + 6, 127, 237, 72, 207, 6, 205, 83, 83, 249, 77, 241, 142, 199, 158, 218, + 213, 208, 204, 199, 158, 218, 213, 204, 128, 246, 79, 49, 64, 242, 196, + 159, 51, 64, 242, 196, 159, 49, 64, 216, 115, 51, 64, 216, 115, 199, 158, + 218, 213, 49, 228, 133, 159, 199, 158, 218, 213, 51, 228, 133, 159, 199, + 158, 218, 213, 49, 248, 167, 159, 199, 158, 218, 213, 51, 248, 167, 159, + 49, 52, 248, 70, 3, 203, 251, 51, 52, 248, 70, 3, 203, 251, 49, 52, 248, + 70, 3, 206, 12, 228, 118, 205, 158, 243, 15, 51, 52, 248, 70, 3, 206, 12, + 228, 118, 248, 93, 243, 15, 49, 52, 248, 70, 3, 206, 12, 228, 118, 248, + 93, 243, 15, 51, 52, 248, 70, 3, 206, 12, 228, 118, 205, 158, 243, 15, + 49, 251, 71, 248, 70, 3, 240, 182, 51, 251, 71, 248, 70, 3, 240, 182, 49, + 250, 237, 224, 241, 159, 51, 250, 237, 235, 67, 159, 53, 49, 250, 237, + 235, 67, 159, 53, 51, 250, 237, 224, 241, 159, 49, 63, 205, 146, 210, 55, + 159, 51, 63, 205, 146, 210, 55, 159, 239, 180, 237, 127, 83, 199, 27, + 224, 176, 222, 73, 251, 71, 217, 46, 225, 28, 51, 251, 71, 203, 73, 3, + 208, 193, 222, 73, 51, 251, 71, 3, 240, 182, 251, 71, 3, 212, 123, 228, + 73, 251, 239, 251, 70, 208, 224, 251, 71, 217, 46, 225, 28, 208, 224, + 251, 71, 217, 46, 203, 228, 204, 185, 251, 70, 213, 105, 251, 70, 251, + 71, 3, 203, 251, 213, 105, 251, 71, 3, 203, 251, 217, 138, 251, 71, 217, + 46, 203, 228, 217, 138, 251, 71, 217, 46, 239, 167, 222, 73, 251, 71, 3, + 176, 250, 215, 238, 168, 228, 118, 55, 215, 96, 115, 26, 213, 46, 222, + 73, 251, 71, 3, 176, 250, 215, 238, 168, 228, 118, 55, 215, 96, 115, 26, + 225, 28, 222, 73, 251, 71, 3, 176, 250, 215, 238, 168, 228, 118, 55, 215, + 96, 127, 26, 213, 46, 222, 73, 251, 71, 3, 176, 250, 215, 238, 168, 228, + 118, 55, 215, 96, 127, 26, 225, 28, 222, 73, 251, 71, 3, 176, 250, 215, + 238, 168, 228, 118, 55, 215, 96, 51, 26, 203, 228, 222, 73, 251, 71, 3, + 176, 250, 215, 238, 168, 228, 118, 55, 215, 96, 49, 26, 203, 228, 222, + 73, 251, 71, 3, 176, 250, 215, 238, 168, 228, 118, 55, 215, 96, 51, 26, + 239, 167, 222, 73, 251, 71, 3, 176, 250, 215, 238, 168, 228, 118, 55, + 215, 96, 49, 26, 239, 167, 213, 105, 238, 181, 210, 141, 238, 181, 210, + 142, 3, 216, 246, 238, 181, 210, 142, 3, 4, 246, 156, 56, 238, 181, 210, + 142, 3, 51, 55, 56, 238, 181, 210, 142, 3, 49, 55, 56, 246, 156, 3, 233, + 177, 148, 44, 83, 148, 44, 216, 120, 44, 213, 106, 209, 16, 44, 216, 14, + 246, 156, 240, 240, 247, 235, 233, 177, 249, 77, 26, 205, 158, 167, 240, + 240, 247, 235, 83, 148, 246, 156, 3, 207, 214, 200, 195, 44, 251, 45, + 240, 235, 54, 115, 55, 206, 38, 246, 155, 44, 64, 248, 20, 44, 248, 20, + 44, 224, 240, 44, 235, 66, 246, 156, 3, 4, 246, 156, 205, 186, 206, 107, + 213, 46, 246, 156, 3, 120, 233, 177, 208, 35, 205, 186, 206, 107, 213, + 46, 95, 213, 19, 241, 71, 209, 75, 95, 237, 171, 241, 71, 209, 75, 95, + 250, 165, 95, 4, 246, 155, 95, 208, 193, 120, 227, 163, 208, 191, 205, + 99, 3, 73, 56, 205, 99, 3, 203, 251, 212, 123, 228, 118, 205, 98, 205, + 99, 3, 210, 148, 250, 156, 248, 92, 51, 205, 99, 88, 49, 205, 98, 49, + 205, 99, 248, 212, 83, 148, 83, 249, 77, 248, 212, 51, 205, 98, 248, 80, + 3, 49, 167, 248, 144, 248, 80, 3, 51, 167, 248, 144, 63, 248, 79, 24, 3, + 49, 167, 248, 144, 24, 3, 51, 167, 248, 144, 64, 233, 111, 63, 233, 111, + 49, 201, 22, 237, 127, 51, 201, 22, 237, 127, 49, 53, 201, 22, 237, 127, + 51, 53, 201, 22, 237, 127, 228, 110, 228, 94, 206, 8, 119, 228, 94, 228, + 95, 220, 28, 3, 83, 148, 239, 174, 221, 23, 52, 3, 243, 37, 216, 251, + 228, 107, 250, 188, 209, 214, 215, 1, 238, 122, 2, 26, 209, 77, 216, 120, + 238, 122, 2, 26, 209, 77, 216, 121, 3, 205, 241, 56, 232, 223, 205, 186, + 26, 209, 77, 216, 120, 235, 126, 208, 108, 206, 95, 239, 166, 205, 99, 3, + 49, 167, 248, 144, 239, 166, 205, 99, 3, 51, 167, 248, 144, 63, 241, 65, + 3, 127, 48, 63, 224, 49, 64, 246, 156, 3, 127, 48, 63, 246, 156, 3, 127, + 48, 238, 107, 64, 208, 193, 238, 107, 63, 208, 193, 238, 107, 64, 241, + 64, 238, 107, 63, 241, 64, 238, 107, 64, 246, 155, 238, 107, 63, 246, + 155, 212, 164, 213, 106, 209, 17, 217, 43, 209, 17, 3, 216, 246, 213, + 106, 209, 17, 3, 233, 177, 97, 248, 175, 209, 16, 248, 175, 213, 106, + 209, 16, 53, 215, 113, 205, 83, 215, 113, 225, 23, 242, 188, 251, 71, + 159, 213, 41, 242, 188, 251, 71, 159, 205, 225, 221, 154, 220, 213, 44, + 73, 217, 43, 220, 213, 44, 93, 217, 43, 220, 213, 44, 24, 217, 43, 220, + 213, 203, 242, 217, 44, 3, 240, 182, 220, 213, 203, 242, 217, 44, 3, 215, + 113, 220, 213, 52, 228, 56, 217, 43, 220, 213, 52, 203, 242, 217, 43, + 120, 224, 98, 26, 217, 43, 120, 224, 98, 217, 34, 217, 43, 220, 213, 24, + 217, 43, 221, 110, 120, 207, 234, 207, 232, 3, 228, 69, 214, 90, 228, 70, + 217, 43, 237, 80, 216, 110, 228, 69, 228, 70, 3, 53, 97, 228, 70, 250, + 120, 3, 209, 75, 246, 148, 236, 180, 251, 47, 228, 67, 224, 177, 228, 68, + 3, 213, 174, 216, 91, 250, 212, 215, 90, 224, 177, 228, 68, 3, 210, 169, + 216, 91, 250, 212, 215, 90, 224, 177, 228, 68, 218, 215, 228, 112, 206, + 107, 215, 90, 228, 70, 250, 212, 35, 215, 100, 217, 43, 214, 84, 228, 70, + 217, 43, 228, 70, 3, 98, 55, 3, 117, 228, 70, 3, 24, 54, 228, 70, 3, 228, + 55, 228, 70, 3, 203, 241, 228, 70, 3, 216, 246, 228, 70, 3, 203, 251, + 227, 164, 225, 71, 49, 205, 99, 217, 43, 199, 158, 218, 213, 211, 224, + 243, 73, 199, 158, 218, 213, 211, 224, 215, 151, 199, 158, 218, 213, 211, + 224, 214, 252, 93, 2, 3, 4, 246, 156, 56, 93, 2, 3, 246, 147, 251, 252, + 56, 93, 2, 3, 205, 241, 56, 93, 2, 3, 73, 57, 93, 2, 3, 205, 241, 57, 93, + 2, 3, 208, 4, 105, 93, 2, 3, 63, 205, 98, 221, 157, 2, 3, 246, 71, 56, + 221, 157, 2, 3, 73, 57, 221, 157, 2, 3, 237, 171, 240, 180, 221, 157, 2, + 3, 213, 19, 240, 180, 93, 2, 228, 118, 49, 167, 246, 155, 93, 2, 228, + 118, 51, 167, 246, 155, 203, 58, 217, 34, 242, 235, 215, 1, 221, 19, 2, + 3, 73, 56, 221, 19, 2, 3, 203, 251, 210, 166, 215, 2, 3, 248, 93, 246, + 109, 209, 51, 215, 1, 221, 19, 2, 228, 118, 49, 167, 246, 155, 221, 19, + 2, 228, 118, 51, 167, 246, 155, 44, 221, 19, 2, 3, 246, 147, 251, 251, + 221, 19, 2, 228, 118, 53, 246, 155, 44, 240, 235, 54, 93, 2, 228, 118, + 205, 98, 221, 157, 2, 228, 118, 205, 98, 221, 19, 2, 228, 118, 205, 98, + 228, 64, 215, 1, 213, 36, 228, 64, 215, 1, 199, 158, 218, 213, 213, 148, + 243, 73, 251, 99, 217, 34, 243, 21, 228, 56, 3, 240, 182, 203, 242, 3, + 221, 157, 54, 203, 242, 3, 216, 246, 228, 56, 3, 216, 246, 228, 56, 3, + 224, 98, 251, 79, 203, 242, 3, 224, 98, 217, 33, 203, 242, 88, 228, 55, + 228, 56, 88, 203, 241, 203, 242, 88, 249, 77, 88, 228, 55, 228, 56, 88, + 249, 77, 88, 203, 241, 203, 242, 248, 212, 26, 227, 163, 3, 203, 241, + 228, 56, 248, 212, 26, 227, 163, 3, 228, 55, 246, 110, 203, 242, 3, 210, + 147, 246, 110, 228, 56, 3, 210, 147, 53, 52, 228, 55, 53, 52, 203, 241, + 246, 110, 203, 242, 3, 210, 148, 26, 209, 51, 215, 1, 224, 98, 26, 3, 73, + 56, 224, 98, 217, 34, 3, 73, 56, 53, 224, 98, 251, 79, 53, 224, 98, 217, + 33, 120, 228, 57, 224, 98, 251, 79, 120, 228, 57, 224, 98, 217, 33, 209, + 60, 225, 71, 217, 33, 209, 60, 225, 71, 251, 79, 224, 98, 217, 34, 216, + 243, 224, 98, 251, 79, 224, 98, 26, 3, 101, 208, 92, 224, 98, 217, 34, 3, + 101, 208, 92, 224, 98, 26, 3, 233, 177, 241, 244, 224, 98, 217, 34, 3, + 233, 177, 241, 244, 224, 98, 26, 3, 53, 216, 246, 224, 98, 26, 3, 203, + 251, 224, 98, 26, 3, 53, 203, 251, 4, 203, 55, 3, 203, 251, 224, 98, 217, + 34, 3, 53, 216, 246, 224, 98, 217, 34, 3, 53, 203, 251, 199, 158, 218, + 213, 240, 191, 251, 37, 199, 158, 218, 213, 213, 211, 251, 37, 238, 122, + 2, 3, 73, 57, 232, 223, 3, 73, 56, 205, 83, 233, 177, 249, 77, 3, 53, 83, + 97, 205, 83, 233, 177, 249, 77, 3, 205, 83, 83, 97, 205, 241, 217, 44, 3, + 73, 56, 205, 241, 217, 44, 3, 213, 19, 240, 180, 209, 148, 221, 157, 209, + 147, 243, 60, 3, 73, 56, 238, 122, 3, 250, 165, 251, 117, 160, 205, 186, + 3, 246, 147, 251, 251, 251, 4, 160, 217, 34, 160, 138, 238, 122, 2, 88, + 93, 54, 93, 2, 88, 238, 122, 54, 238, 122, 2, 88, 205, 241, 217, 43, 53, + 246, 80, 238, 123, 120, 243, 53, 238, 122, 209, 162, 126, 243, 53, 238, + 122, 209, 162, 238, 122, 2, 3, 120, 190, 88, 26, 120, 190, 57, 238, 117, + 3, 236, 229, 190, 56, 224, 241, 3, 246, 156, 228, 73, 235, 67, 3, 246, + 156, 228, 73, 224, 241, 3, 214, 79, 134, 56, 235, 67, 3, 214, 79, 134, + 56, 224, 241, 217, 34, 209, 77, 160, 138, 235, 67, 217, 34, 209, 77, 160, + 138, 224, 241, 217, 34, 209, 77, 160, 205, 186, 3, 73, 228, 73, 235, 67, + 217, 34, 209, 77, 160, 205, 186, 3, 73, 228, 73, 224, 241, 217, 34, 209, + 77, 160, 205, 186, 3, 73, 56, 235, 67, 217, 34, 209, 77, 160, 205, 186, + 3, 73, 56, 224, 241, 217, 34, 209, 77, 160, 205, 186, 3, 73, 88, 213, 46, + 235, 67, 217, 34, 209, 77, 160, 205, 186, 3, 73, 88, 225, 28, 224, 241, + 217, 34, 251, 5, 235, 67, 217, 34, 251, 5, 224, 241, 26, 209, 137, 218, + 215, 160, 138, 235, 67, 26, 209, 137, 218, 215, 160, 138, 224, 241, 26, + 218, 215, 251, 5, 235, 67, 26, 218, 215, 251, 5, 224, 241, 88, 239, 173, + 160, 88, 235, 66, 235, 67, 88, 239, 173, 160, 88, 224, 240, 224, 241, 88, + 209, 148, 217, 34, 238, 123, 235, 67, 88, 209, 148, 217, 34, 238, 123, + 224, 241, 88, 209, 148, 88, 235, 66, 235, 67, 88, 209, 148, 88, 224, 240, + 224, 241, 88, 235, 67, 88, 239, 173, 238, 123, 235, 67, 88, 224, 241, 88, + 239, 173, 238, 123, 224, 241, 88, 209, 77, 160, 88, 235, 67, 88, 209, 77, + 238, 123, 235, 67, 88, 209, 77, 160, 88, 224, 241, 88, 209, 77, 238, 123, + 209, 77, 160, 205, 186, 217, 34, 224, 240, 209, 77, 160, 205, 186, 217, + 34, 235, 66, 209, 77, 160, 205, 186, 217, 34, 224, 241, 3, 73, 228, 73, + 209, 77, 160, 205, 186, 217, 34, 235, 67, 3, 73, 228, 73, 239, 173, 160, + 205, 186, 217, 34, 224, 240, 239, 173, 160, 205, 186, 217, 34, 235, 66, + 239, 173, 209, 77, 160, 205, 186, 217, 34, 224, 240, 239, 173, 209, 77, + 160, 205, 186, 217, 34, 235, 66, 209, 148, 217, 34, 224, 240, 209, 148, + 217, 34, 235, 66, 209, 148, 88, 224, 241, 88, 238, 122, 54, 209, 148, 88, + 235, 67, 88, 238, 122, 54, 53, 220, 15, 224, 240, 53, 220, 15, 235, 66, + 53, 220, 15, 224, 241, 3, 203, 251, 235, 67, 216, 243, 224, 240, 235, 67, + 248, 212, 224, 240, 224, 241, 246, 110, 247, 235, 242, 189, 235, 67, 246, + 110, 247, 235, 242, 189, 224, 241, 246, 110, 247, 235, 242, 190, 88, 209, + 77, 238, 123, 235, 67, 246, 110, 247, 235, 242, 190, 88, 209, 77, 238, + 123, 209, 52, 206, 111, 225, 69, 206, 111, 209, 52, 206, 112, 217, 34, + 160, 138, 225, 69, 206, 112, 217, 34, 160, 138, 238, 122, 2, 3, 248, 13, + 56, 215, 29, 88, 209, 137, 238, 122, 54, 207, 251, 88, 209, 137, 238, + 122, 54, 215, 29, 88, 209, 137, 218, 215, 160, 138, 207, 251, 88, 209, + 137, 218, 215, 160, 138, 215, 29, 88, 238, 122, 54, 207, 251, 88, 238, + 122, 54, 215, 29, 88, 218, 215, 160, 138, 207, 251, 88, 218, 215, 160, + 138, 215, 29, 88, 251, 117, 160, 138, 207, 251, 88, 251, 117, 160, 138, + 215, 29, 88, 218, 215, 251, 117, 160, 138, 207, 251, 88, 218, 215, 251, + 117, 160, 138, 53, 215, 28, 53, 207, 250, 208, 3, 3, 240, 182, 207, 212, + 3, 240, 182, 208, 3, 3, 93, 2, 57, 207, 212, 3, 93, 2, 57, 208, 3, 3, + 221, 19, 2, 57, 207, 212, 3, 221, 19, 2, 57, 208, 3, 76, 217, 34, 160, + 205, 186, 3, 73, 56, 207, 212, 76, 217, 34, 160, 205, 186, 3, 73, 56, + 208, 3, 76, 88, 238, 122, 54, 207, 212, 76, 88, 238, 122, 54, 208, 3, 76, + 88, 205, 241, 217, 43, 207, 212, 76, 88, 205, 241, 217, 43, 208, 3, 76, + 88, 251, 117, 160, 138, 207, 212, 76, 88, 251, 117, 160, 138, 208, 3, 76, + 88, 218, 215, 160, 138, 207, 212, 76, 88, 218, 215, 160, 138, 52, 49, + 176, 100, 217, 43, 52, 51, 176, 100, 217, 43, 246, 110, 208, 2, 246, 110, + 207, 211, 246, 110, 208, 3, 217, 34, 160, 138, 246, 110, 207, 212, 217, + 34, 160, 138, 208, 3, 88, 207, 211, 207, 212, 88, 208, 2, 208, 3, 88, + 208, 2, 207, 212, 88, 207, 211, 207, 212, 248, 212, 208, 2, 207, 212, + 248, 212, 26, 227, 163, 247, 235, 241, 245, 3, 208, 2, 238, 202, 76, 217, + 46, 239, 165, 215, 141, 3, 206, 191, 205, 157, 205, 115, 228, 55, 236, + 243, 218, 230, 209, 250, 49, 207, 17, 209, 250, 127, 207, 17, 209, 250, + 115, 207, 17, 216, 15, 3, 212, 122, 83, 249, 77, 205, 83, 51, 204, 184, + 53, 83, 249, 77, 49, 204, 184, 83, 249, 77, 53, 49, 204, 184, 53, 83, + 249, 77, 53, 49, 204, 184, 168, 241, 245, 236, 201, 49, 222, 45, 76, 53, + 203, 42, 209, 250, 127, 207, 18, 3, 216, 246, 209, 250, 115, 207, 18, 3, + 203, 251, 209, 250, 115, 207, 18, 88, 209, 250, 127, 207, 17, 53, 127, + 207, 17, 53, 115, 207, 17, 53, 208, 47, 218, 215, 54, 213, 105, 53, 208, + 47, 218, 215, 54, 240, 202, 218, 215, 240, 242, 3, 213, 105, 220, 27, + 209, 75, 83, 224, 177, 3, 246, 156, 56, 83, 224, 177, 3, 246, 156, 57, + 127, 207, 18, 3, 246, 156, 57, 216, 121, 3, 233, 177, 97, 216, 121, 3, + 205, 241, 217, 43, 205, 83, 83, 249, 77, 248, 169, 213, 149, 205, 83, 83, + 249, 77, 3, 233, 177, 97, 205, 83, 246, 80, 217, 43, 205, 83, 220, 15, + 224, 240, 205, 83, 220, 15, 235, 66, 239, 173, 209, 77, 224, 241, 217, + 34, 160, 138, 239, 173, 209, 77, 235, 67, 217, 34, 160, 138, 205, 83, + 209, 17, 248, 169, 213, 149, 225, 71, 205, 83, 83, 249, 77, 217, 43, 53, + 209, 17, 217, 43, 64, 83, 148, 220, 213, 64, 83, 148, 157, 239, 14, 64, + 48, 157, 201, 48, 64, 48, 208, 254, 239, 14, 64, 48, 208, 254, 201, 48, + 64, 48, 49, 51, 64, 48, 98, 63, 48, 182, 63, 48, 191, 63, 48, 157, 239, + 14, 63, 48, 157, 201, 48, 63, 48, 208, 254, 239, 14, 63, 48, 208, 254, + 201, 48, 63, 48, 49, 51, 63, 48, 115, 127, 63, 48, 87, 55, 3, 205, 224, + 239, 165, 87, 55, 3, 205, 224, 203, 216, 98, 55, 3, 205, 224, 239, 165, + 98, 55, 3, 205, 224, 203, 216, 52, 3, 205, 158, 167, 248, 144, 52, 3, + 248, 93, 167, 248, 144, 52, 3, 203, 225, 51, 241, 71, 167, 248, 144, 52, + 3, 224, 54, 49, 241, 71, 167, 248, 144, 241, 65, 3, 49, 167, 248, 144, + 241, 65, 3, 51, 167, 248, 144, 241, 65, 3, 205, 158, 167, 248, 144, 241, + 65, 3, 248, 93, 167, 248, 144, 239, 180, 208, 193, 63, 225, 71, 208, 193, + 64, 225, 71, 208, 193, 63, 202, 246, 4, 208, 193, 64, 202, 246, 4, 208, + 193, 63, 216, 37, 64, 216, 37, 64, 234, 89, 63, 234, 89, 233, 177, 63, + 234, 89, 63, 225, 71, 246, 155, 63, 222, 66, 241, 64, 64, 222, 66, 241, + 64, 63, 222, 66, 224, 49, 64, 222, 66, 224, 49, 63, 4, 241, 64, 63, 4, + 224, 49, 64, 4, 224, 49, 63, 233, 177, 238, 196, 64, 233, 177, 238, 196, + 63, 83, 238, 196, 64, 83, 238, 196, 49, 55, 3, 4, 246, 155, 126, 98, 250, + 199, 49, 55, 3, 44, 215, 113, 168, 98, 208, 186, 48, 98, 204, 141, 55, 3, + 83, 97, 98, 204, 141, 55, 3, 53, 83, 97, 98, 204, 141, 55, 236, 201, 148, + 98, 204, 141, 205, 83, 241, 245, 48, 98, 55, 3, 239, 180, 208, 92, 98, + 55, 3, 207, 7, 3, 83, 97, 98, 55, 3, 207, 7, 3, 53, 83, 97, 98, 204, 141, + 55, 3, 207, 6, 98, 204, 141, 55, 3, 207, 7, 3, 83, 97, 98, 204, 141, 55, + 3, 207, 7, 3, 53, 83, 97, 98, 55, 206, 38, 200, 195, 201, 78, 55, 215, + 96, 241, 7, 225, 28, 238, 122, 2, 88, 98, 48, 213, 106, 205, 241, 217, + 44, 88, 98, 48, 98, 55, 88, 213, 106, 251, 117, 160, 138, 87, 55, 206, + 38, 235, 66, 87, 55, 206, 38, 207, 211, 98, 214, 90, 48, 87, 214, 90, 48, + 213, 106, 205, 241, 217, 44, 88, 87, 48, 87, 55, 88, 213, 106, 251, 117, + 160, 138, 205, 241, 217, 44, 88, 98, 48, 98, 55, 88, 251, 117, 160, 138, + 98, 55, 88, 213, 106, 205, 241, 217, 43, 87, 55, 88, 213, 106, 205, 241, + 217, 43, 191, 205, 97, 199, 27, 48, 209, 250, 209, 77, 157, 48, 209, 250, + 249, 126, 208, 254, 48, 64, 222, 66, 208, 109, 63, 4, 208, 109, 64, 4, + 208, 109, 63, 213, 41, 216, 37, 64, 213, 41, 216, 37, 80, 225, 71, 246, + 155, 80, 216, 248, 3, 216, 248, 228, 73, 80, 246, 156, 3, 246, 156, 228, + 73, 80, 246, 155, 80, 44, 212, 24, 209, 77, 157, 55, 3, 233, 186, 234, + 136, 249, 126, 208, 254, 55, 3, 233, 186, 207, 6, 209, 77, 157, 55, 3, + 233, 177, 207, 6, 249, 126, 208, 254, 55, 3, 233, 177, 207, 6, 248, 220, + 55, 215, 96, 191, 206, 98, 157, 239, 13, 209, 250, 248, 220, 55, 215, 96, + 191, 206, 98, 157, 239, 13, 98, 205, 97, 48, 182, 205, 97, 48, 87, 205, + 97, 48, 191, 205, 97, 48, 49, 51, 205, 97, 48, 115, 127, 205, 97, 48, + 157, 201, 48, 205, 97, 48, 157, 239, 14, 205, 97, 48, 208, 254, 239, 14, + 205, 97, 48, 208, 254, 201, 48, 205, 97, 48, 98, 205, 97, 241, 243, 48, + 182, 205, 97, 241, 243, 48, 87, 205, 97, 241, 243, 48, 191, 205, 97, 241, + 243, 48, 246, 112, 205, 97, 176, 246, 156, 48, 251, 47, 205, 97, 176, + 246, 156, 48, 98, 205, 97, 55, 205, 186, 148, 182, 205, 97, 55, 205, 186, + 148, 87, 205, 97, 55, 205, 186, 148, 191, 205, 97, 55, 205, 186, 148, + 157, 201, 48, 205, 97, 55, 205, 186, 148, 157, 239, 14, 205, 97, 55, 205, + 186, 148, 208, 254, 239, 14, 205, 97, 55, 205, 186, 148, 208, 254, 201, + 48, 205, 97, 55, 205, 186, 148, 98, 205, 97, 55, 3, 53, 233, 177, 97, + 182, 205, 97, 55, 3, 53, 233, 177, 97, 87, 205, 97, 55, 3, 53, 233, 177, + 97, 191, 205, 97, 55, 3, 53, 233, 177, 97, 233, 177, 207, 25, 226, 214, + 83, 207, 25, 226, 214, 98, 205, 97, 55, 119, 87, 205, 97, 48, 182, 205, + 97, 55, 98, 76, 191, 205, 97, 48, 87, 205, 97, 55, 119, 98, 205, 97, 48, + 191, 205, 97, 55, 98, 76, 182, 205, 97, 48, 98, 205, 97, 216, 188, 250, + 199, 182, 205, 97, 216, 188, 250, 199, 87, 205, 97, 216, 188, 250, 199, + 191, 205, 97, 216, 188, 250, 199, 98, 63, 44, 64, 48, 182, 63, 44, 64, + 48, 87, 63, 44, 64, 48, 191, 63, 44, 64, 48, 251, 47, 205, 97, 51, 204, + 99, 48, 251, 47, 205, 97, 248, 93, 204, 99, 48, 251, 47, 205, 97, 49, + 204, 99, 48, 251, 47, 205, 97, 205, 158, 204, 99, 48, 213, 110, 225, 28, + 213, 110, 213, 46, 220, 6, 225, 28, 220, 6, 213, 46, 236, 229, 243, 16, + 250, 200, 246, 151, 251, 46, 87, 63, 48, 206, 45, 205, 156, 98, 238, 118, + 250, 202, 206, 45, 213, 42, 182, 238, 118, 250, 202, 206, 45, 205, 156, + 87, 238, 118, 250, 202, 206, 45, 225, 24, 191, 238, 118, 250, 202, 63, + 98, 238, 118, 250, 202, 63, 182, 238, 118, 250, 202, 63, 87, 238, 118, + 250, 202, 63, 191, 238, 118, 250, 202, 191, 205, 97, 55, 3, 168, 205, + 224, 225, 18, 191, 205, 97, 55, 3, 168, 205, 224, 213, 35, 182, 205, 97, + 55, 3, 168, 205, 224, 225, 18, 182, 205, 97, 55, 3, 168, 205, 224, 213, + 35, 98, 205, 97, 55, 3, 168, 205, 224, 203, 216, 87, 205, 97, 55, 3, 168, + 205, 224, 203, 216, 98, 205, 97, 55, 3, 168, 205, 224, 239, 165, 87, 205, + 97, 55, 3, 168, 205, 224, 239, 165, 63, 242, 188, 191, 26, 98, 48, 63, + 242, 188, 191, 26, 87, 48, 63, 242, 188, 182, 26, 98, 48, 63, 242, 188, + 182, 26, 87, 48, 63, 242, 188, 98, 26, 182, 48, 63, 242, 188, 87, 26, + 182, 48, 63, 242, 188, 98, 26, 191, 48, 63, 242, 188, 87, 26, 191, 48, + 213, 86, 55, 127, 225, 28, 213, 86, 55, 127, 213, 46, 213, 86, 55, 115, + 225, 28, 213, 86, 55, 115, 213, 46, 213, 86, 55, 49, 203, 228, 213, 86, + 55, 51, 203, 228, 213, 86, 55, 49, 239, 167, 213, 86, 55, 51, 239, 167, + 182, 64, 55, 236, 201, 249, 77, 3, 233, 177, 148, 115, 250, 203, 228, + 118, 35, 213, 176, 248, 78, 249, 94, 100, 3, 162, 200, 195, 44, 200, 195, + 44, 27, 200, 195, 63, 52, 247, 53, 63, 241, 65, 247, 53, 204, 185, 63, + 216, 37, 233, 177, 63, 217, 130, 63, 217, 130, 63, 222, 66, 203, 227, + 205, 99, 247, 53, 63, 222, 66, 239, 166, 205, 99, 247, 53, 63, 222, 66, + 225, 23, 205, 99, 247, 53, 63, 222, 66, 213, 41, 205, 99, 247, 53, 205, + 158, 167, 63, 246, 155, 248, 93, 167, 63, 246, 155, 162, 236, 229, 215, + 98, 63, 242, 184, 212, 228, 162, 236, 229, 215, 98, 63, 242, 184, 64, + 236, 229, 215, 98, 242, 184, 212, 228, 64, 236, 229, 215, 98, 242, 184, + 52, 215, 70, 228, 99, 203, 255, 54, 98, 204, 141, 55, 3, 205, 99, 250, + 201, 182, 204, 141, 55, 3, 205, 99, 250, 201, 87, 204, 141, 55, 3, 205, + 99, 250, 201, 191, 204, 141, 55, 3, 205, 99, 250, 201, 116, 6, 1, 250, + 104, 116, 6, 1, 248, 24, 116, 6, 1, 203, 57, 116, 6, 1, 235, 130, 116, 6, + 1, 240, 206, 116, 6, 1, 200, 23, 116, 6, 1, 199, 61, 116, 6, 1, 239, 88, + 116, 6, 1, 199, 86, 116, 6, 1, 227, 255, 116, 6, 1, 82, 227, 255, 116, 6, + 1, 70, 116, 6, 1, 240, 226, 116, 6, 1, 227, 74, 116, 6, 1, 224, 140, 116, + 6, 1, 220, 218, 116, 6, 1, 220, 120, 116, 6, 1, 217, 65, 116, 6, 1, 215, + 93, 116, 6, 1, 213, 18, 116, 6, 1, 209, 58, 116, 6, 1, 204, 171, 116, 6, + 1, 204, 16, 116, 6, 1, 236, 204, 116, 6, 1, 234, 95, 116, 6, 1, 217, 4, + 116, 6, 1, 216, 73, 116, 6, 1, 209, 223, 116, 6, 1, 205, 11, 116, 6, 1, + 246, 198, 116, 6, 1, 210, 114, 116, 6, 1, 200, 29, 116, 6, 1, 200, 31, + 116, 6, 1, 200, 63, 116, 6, 1, 208, 220, 144, 116, 6, 1, 199, 211, 116, + 6, 1, 4, 199, 181, 116, 6, 1, 4, 199, 182, 3, 207, 6, 116, 6, 1, 199, + 245, 116, 6, 1, 228, 40, 4, 199, 181, 116, 6, 1, 248, 175, 199, 181, 116, + 6, 1, 228, 40, 248, 175, 199, 181, 116, 6, 1, 237, 63, 116, 6, 1, 227, + 253, 116, 6, 1, 209, 222, 116, 6, 1, 205, 73, 62, 116, 6, 1, 225, 59, + 220, 218, 116, 4, 1, 250, 104, 116, 4, 1, 248, 24, 116, 4, 1, 203, 57, + 116, 4, 1, 235, 130, 116, 4, 1, 240, 206, 116, 4, 1, 200, 23, 116, 4, 1, + 199, 61, 116, 4, 1, 239, 88, 116, 4, 1, 199, 86, 116, 4, 1, 227, 255, + 116, 4, 1, 82, 227, 255, 116, 4, 1, 70, 116, 4, 1, 240, 226, 116, 4, 1, + 227, 74, 116, 4, 1, 224, 140, 116, 4, 1, 220, 218, 116, 4, 1, 220, 120, + 116, 4, 1, 217, 65, 116, 4, 1, 215, 93, 116, 4, 1, 213, 18, 116, 4, 1, + 209, 58, 116, 4, 1, 204, 171, 116, 4, 1, 204, 16, 116, 4, 1, 236, 204, + 116, 4, 1, 234, 95, 116, 4, 1, 217, 4, 116, 4, 1, 216, 73, 116, 4, 1, + 209, 223, 116, 4, 1, 205, 11, 116, 4, 1, 246, 198, 116, 4, 1, 210, 114, + 116, 4, 1, 200, 29, 116, 4, 1, 200, 31, 116, 4, 1, 200, 63, 116, 4, 1, + 208, 220, 144, 116, 4, 1, 199, 211, 116, 4, 1, 4, 199, 181, 116, 4, 1, 4, + 199, 182, 3, 207, 6, 116, 4, 1, 199, 245, 116, 4, 1, 228, 40, 4, 199, + 181, 116, 4, 1, 248, 175, 199, 181, 116, 4, 1, 228, 40, 248, 175, 199, + 181, 116, 4, 1, 237, 63, 116, 4, 1, 227, 253, 116, 4, 1, 209, 222, 116, + 4, 1, 205, 73, 62, 116, 4, 1, 225, 59, 220, 218, 8, 6, 1, 225, 193, 3, + 53, 148, 8, 4, 1, 225, 193, 3, 53, 148, 8, 6, 1, 225, 193, 3, 101, 205, + 240, 8, 6, 1, 216, 227, 3, 97, 8, 6, 1, 214, 33, 3, 207, 6, 8, 4, 1, 35, + 3, 97, 8, 4, 1, 207, 84, 3, 241, 71, 97, 8, 6, 1, 234, 248, 3, 241, 119, + 8, 4, 1, 234, 248, 3, 241, 119, 8, 6, 1, 227, 119, 3, 241, 119, 8, 4, 1, + 227, 119, 3, 241, 119, 8, 6, 1, 199, 158, 3, 241, 119, 8, 4, 1, 199, 158, + 3, 241, 119, 8, 6, 1, 251, 112, 8, 6, 1, 223, 244, 3, 117, 8, 6, 1, 204, + 185, 62, 8, 6, 1, 204, 185, 251, 112, 8, 4, 1, 203, 169, 3, 51, 117, 8, + 6, 1, 201, 148, 3, 117, 8, 4, 1, 201, 148, 3, 117, 8, 4, 1, 203, 169, 3, + 242, 198, 8, 6, 1, 167, 234, 247, 8, 4, 1, 167, 234, 247, 8, 4, 1, 207, + 4, 215, 229, 8, 4, 1, 197, 3, 218, 212, 8, 4, 1, 204, 185, 214, 33, 3, + 207, 6, 8, 4, 1, 163, 3, 128, 213, 27, 228, 73, 8, 1, 4, 6, 204, 185, 72, + 8, 208, 4, 4, 1, 227, 251, 67, 1, 6, 203, 168, 8, 6, 1, 212, 123, 3, 207, + 183, 207, 6, 8, 6, 1, 199, 158, 3, 207, 183, 207, 6, 85, 6, 1, 251, 136, + 85, 4, 1, 251, 136, 85, 6, 1, 202, 231, 85, 4, 1, 202, 231, 85, 6, 1, + 236, 60, 85, 4, 1, 236, 60, 85, 6, 1, 242, 25, 85, 4, 1, 242, 25, 85, 6, + 1, 238, 233, 85, 4, 1, 238, 233, 85, 6, 1, 209, 3, 85, 4, 1, 209, 3, 85, + 6, 1, 199, 96, 85, 4, 1, 199, 96, 85, 6, 1, 234, 154, 85, 4, 1, 234, 154, + 85, 6, 1, 206, 86, 85, 4, 1, 206, 86, 85, 6, 1, 232, 237, 85, 4, 1, 232, + 237, 85, 6, 1, 227, 59, 85, 4, 1, 227, 59, 85, 6, 1, 225, 54, 85, 4, 1, + 225, 54, 85, 6, 1, 221, 211, 85, 4, 1, 221, 211, 85, 6, 1, 219, 150, 85, + 4, 1, 219, 150, 85, 6, 1, 226, 31, 85, 4, 1, 226, 31, 85, 6, 1, 74, 85, + 4, 1, 74, 85, 6, 1, 215, 204, 85, 4, 1, 215, 204, 85, 6, 1, 213, 1, 85, + 4, 1, 213, 1, 85, 6, 1, 209, 151, 85, 4, 1, 209, 151, 85, 6, 1, 206, 221, + 85, 4, 1, 206, 221, 85, 6, 1, 204, 46, 85, 4, 1, 204, 46, 85, 6, 1, 237, + 112, 85, 4, 1, 237, 112, 85, 6, 1, 226, 185, 85, 4, 1, 226, 185, 85, 6, + 1, 214, 235, 85, 4, 1, 214, 235, 85, 6, 1, 217, 57, 85, 4, 1, 217, 57, + 85, 6, 1, 241, 69, 251, 142, 85, 4, 1, 241, 69, 251, 142, 85, 6, 1, 40, + 85, 251, 171, 85, 4, 1, 40, 85, 251, 171, 85, 6, 1, 242, 217, 238, 233, + 85, 4, 1, 242, 217, 238, 233, 85, 6, 1, 241, 69, 227, 59, 85, 4, 1, 241, + 69, 227, 59, 85, 6, 1, 241, 69, 219, 150, 85, 4, 1, 241, 69, 219, 150, + 85, 6, 1, 242, 217, 219, 150, 85, 4, 1, 242, 217, 219, 150, 85, 6, 1, 40, + 85, 217, 57, 85, 4, 1, 40, 85, 217, 57, 85, 6, 1, 212, 16, 85, 4, 1, 212, + 16, 85, 6, 1, 242, 232, 210, 57, 85, 4, 1, 242, 232, 210, 57, 85, 6, 1, + 40, 85, 210, 57, 85, 4, 1, 40, 85, 210, 57, 85, 6, 1, 40, 85, 238, 94, + 85, 4, 1, 40, 85, 238, 94, 85, 6, 1, 251, 155, 226, 190, 85, 4, 1, 251, + 155, 226, 190, 85, 6, 1, 241, 69, 233, 178, 85, 4, 1, 241, 69, 233, 178, + 85, 6, 1, 40, 85, 233, 178, 85, 4, 1, 40, 85, 233, 178, 85, 6, 1, 40, 85, + 144, 85, 4, 1, 40, 85, 144, 85, 6, 1, 225, 192, 144, 85, 4, 1, 225, 192, + 144, 85, 6, 1, 40, 85, 234, 114, 85, 4, 1, 40, 85, 234, 114, 85, 6, 1, + 40, 85, 234, 157, 85, 4, 1, 40, 85, 234, 157, 85, 6, 1, 40, 85, 236, 55, + 85, 4, 1, 40, 85, 236, 55, 85, 6, 1, 40, 85, 240, 229, 85, 4, 1, 40, 85, + 240, 229, 85, 6, 1, 40, 85, 210, 23, 85, 4, 1, 40, 85, 210, 23, 85, 6, 1, + 40, 218, 103, 210, 23, 85, 4, 1, 40, 218, 103, 210, 23, 85, 6, 1, 40, + 218, 103, 219, 201, 85, 4, 1, 40, 218, 103, 219, 201, 85, 6, 1, 40, 218, + 103, 218, 41, 85, 4, 1, 40, 218, 103, 218, 41, 85, 6, 1, 40, 218, 103, + 201, 79, 85, 4, 1, 40, 218, 103, 201, 79, 85, 16, 227, 82, 85, 16, 221, + 212, 213, 1, 85, 16, 215, 205, 213, 1, 85, 16, 208, 100, 85, 16, 206, + 222, 213, 1, 85, 16, 226, 186, 213, 1, 85, 16, 210, 24, 209, 151, 85, 6, + 1, 242, 217, 210, 57, 85, 4, 1, 242, 217, 210, 57, 85, 6, 1, 242, 217, + 236, 55, 85, 4, 1, 242, 217, 236, 55, 85, 38, 219, 151, 56, 85, 38, 208, + 213, 250, 173, 85, 38, 208, 213, 224, 248, 85, 6, 1, 248, 117, 226, 190, + 85, 4, 1, 248, 117, 226, 190, 85, 40, 218, 103, 236, 183, 208, 76, 85, + 40, 218, 103, 241, 10, 214, 79, 81, 85, 40, 218, 103, 228, 97, 214, 79, + 81, 85, 40, 218, 103, 203, 44, 240, 239, 85, 236, 219, 112, 234, 213, 85, + 236, 183, 208, 76, 85, 221, 77, 240, 239, 118, 4, 1, 251, 85, 118, 4, 1, + 249, 88, 118, 4, 1, 236, 59, 118, 4, 1, 240, 190, 118, 4, 1, 238, 179, + 118, 4, 1, 202, 217, 118, 4, 1, 199, 84, 118, 4, 1, 206, 244, 118, 4, 1, + 228, 117, 118, 4, 1, 227, 68, 118, 4, 1, 225, 65, 118, 4, 1, 222, 180, + 118, 4, 1, 220, 125, 118, 4, 1, 217, 78, 118, 4, 1, 216, 130, 118, 4, 1, + 199, 73, 118, 4, 1, 213, 234, 118, 4, 1, 212, 13, 118, 4, 1, 206, 232, + 118, 4, 1, 204, 5, 118, 4, 1, 215, 237, 118, 4, 1, 226, 195, 118, 4, 1, + 235, 190, 118, 4, 1, 214, 144, 118, 4, 1, 210, 21, 118, 4, 1, 246, 223, + 118, 4, 1, 247, 158, 118, 4, 1, 227, 198, 118, 4, 1, 246, 162, 118, 4, 1, + 247, 21, 118, 4, 1, 200, 179, 118, 4, 1, 227, 212, 118, 4, 1, 234, 230, + 118, 4, 1, 234, 139, 118, 4, 1, 234, 69, 118, 4, 1, 201, 64, 118, 4, 1, + 234, 166, 118, 4, 1, 233, 203, 118, 4, 1, 199, 247, 118, 4, 1, 251, 210, + 206, 4, 1, 183, 206, 4, 1, 200, 105, 206, 4, 1, 200, 104, 206, 4, 1, 200, + 94, 206, 4, 1, 200, 92, 206, 4, 1, 248, 214, 251, 253, 200, 87, 206, 4, + 1, 200, 87, 206, 4, 1, 200, 102, 206, 4, 1, 200, 99, 206, 4, 1, 200, 101, + 206, 4, 1, 200, 100, 206, 4, 1, 200, 14, 206, 4, 1, 200, 96, 206, 4, 1, + 200, 85, 206, 4, 1, 204, 212, 200, 85, 206, 4, 1, 200, 82, 206, 4, 1, + 200, 90, 206, 4, 1, 248, 214, 251, 253, 200, 90, 206, 4, 1, 204, 212, + 200, 90, 206, 4, 1, 200, 89, 206, 4, 1, 200, 109, 206, 4, 1, 200, 83, + 206, 4, 1, 204, 212, 200, 83, 206, 4, 1, 200, 72, 206, 4, 1, 204, 212, + 200, 72, 206, 4, 1, 200, 9, 206, 4, 1, 200, 53, 206, 4, 1, 251, 183, 200, + 53, 206, 4, 1, 204, 212, 200, 53, 206, 4, 1, 200, 81, 206, 4, 1, 200, 80, + 206, 4, 1, 200, 77, 206, 4, 1, 204, 212, 200, 91, 206, 4, 1, 204, 212, + 200, 75, 206, 4, 1, 200, 73, 206, 4, 1, 199, 211, 206, 4, 1, 200, 70, + 206, 4, 1, 200, 69, 206, 4, 1, 200, 93, 206, 4, 1, 204, 212, 200, 93, + 206, 4, 1, 250, 108, 200, 93, 206, 4, 1, 200, 68, 206, 4, 1, 200, 66, + 206, 4, 1, 200, 67, 206, 4, 1, 200, 65, 206, 4, 1, 200, 64, 206, 4, 1, + 200, 103, 206, 4, 1, 200, 62, 206, 4, 1, 200, 60, 206, 4, 1, 200, 59, + 206, 4, 1, 200, 57, 206, 4, 1, 200, 54, 206, 4, 1, 206, 213, 200, 54, + 206, 4, 1, 200, 52, 206, 4, 1, 200, 51, 206, 4, 1, 199, 245, 206, 4, 67, + 1, 225, 166, 81, 206, 4, 210, 155, 81, 206, 4, 111, 227, 161, 34, 5, 224, + 109, 34, 5, 221, 135, 34, 5, 212, 255, 34, 5, 209, 28, 34, 5, 210, 7, 34, + 5, 248, 123, 34, 5, 205, 185, 34, 5, 246, 90, 34, 5, 218, 239, 34, 5, + 218, 25, 34, 5, 235, 123, 217, 146, 34, 5, 199, 13, 34, 5, 240, 209, 34, + 5, 241, 189, 34, 5, 227, 165, 34, 5, 206, 60, 34, 5, 246, 209, 34, 5, + 215, 216, 34, 5, 215, 105, 34, 5, 235, 205, 34, 5, 235, 201, 34, 5, 235, + 202, 34, 5, 235, 203, 34, 5, 208, 179, 34, 5, 208, 134, 34, 5, 208, 147, + 34, 5, 208, 178, 34, 5, 208, 152, 34, 5, 208, 153, 34, 5, 208, 139, 34, + 5, 247, 99, 34, 5, 247, 78, 34, 5, 247, 80, 34, 5, 247, 98, 34, 5, 247, + 96, 34, 5, 247, 97, 34, 5, 247, 79, 34, 5, 198, 232, 34, 5, 198, 210, 34, + 5, 198, 223, 34, 5, 198, 231, 34, 5, 198, 226, 34, 5, 198, 227, 34, 5, + 198, 215, 34, 5, 247, 94, 34, 5, 247, 81, 34, 5, 247, 83, 34, 5, 247, 93, + 34, 5, 247, 91, 34, 5, 247, 92, 34, 5, 247, 82, 34, 5, 214, 45, 34, 5, + 214, 35, 34, 5, 214, 41, 34, 5, 214, 44, 34, 5, 214, 42, 34, 5, 214, 43, + 34, 5, 214, 40, 34, 5, 225, 203, 34, 5, 225, 195, 34, 5, 225, 198, 34, 5, + 225, 202, 34, 5, 225, 199, 34, 5, 225, 200, 34, 5, 225, 196, 34, 5, 200, + 139, 34, 5, 200, 126, 34, 5, 200, 134, 34, 5, 200, 138, 34, 5, 200, 136, + 34, 5, 200, 137, 34, 5, 200, 133, 34, 5, 235, 3, 34, 5, 234, 249, 34, 5, + 234, 252, 34, 5, 235, 2, 34, 5, 234, 254, 34, 5, 234, 255, 34, 5, 234, + 251, 38, 37, 1, 249, 8, 38, 37, 1, 203, 59, 38, 37, 1, 235, 185, 38, 37, + 1, 241, 175, 38, 37, 1, 199, 68, 38, 37, 1, 199, 89, 38, 37, 1, 161, 38, + 37, 1, 238, 209, 38, 37, 1, 238, 190, 38, 37, 1, 238, 179, 38, 37, 1, 74, + 38, 37, 1, 216, 73, 38, 37, 1, 238, 115, 38, 37, 1, 238, 104, 38, 37, 1, + 206, 201, 38, 37, 1, 144, 38, 37, 1, 205, 26, 38, 37, 1, 247, 8, 38, 37, + 1, 210, 114, 38, 37, 1, 210, 68, 38, 37, 1, 237, 63, 38, 37, 1, 238, 100, + 38, 37, 1, 62, 38, 37, 1, 228, 178, 38, 37, 1, 240, 227, 38, 37, 1, 221, + 95, 204, 20, 38, 37, 1, 200, 65, 38, 37, 1, 199, 211, 38, 37, 1, 228, 39, + 62, 38, 37, 1, 224, 148, 199, 181, 38, 37, 1, 248, 175, 199, 181, 38, 37, + 1, 228, 39, 248, 175, 199, 181, 51, 251, 71, 207, 255, 222, 145, 51, 251, + 71, 239, 180, 207, 255, 222, 145, 49, 207, 255, 159, 51, 207, 255, 159, + 49, 239, 180, 207, 255, 159, 51, 239, 180, 207, 255, 159, 213, 220, 228, + 60, 222, 145, 213, 220, 239, 180, 228, 60, 222, 145, 239, 180, 205, 116, + 222, 145, 49, 205, 116, 159, 51, 205, 116, 159, 213, 220, 208, 193, 49, + 213, 220, 217, 80, 159, 51, 213, 220, 217, 80, 159, 239, 0, 243, 13, 216, + 126, 236, 244, 216, 126, 213, 105, 236, 244, 216, 126, 233, 30, 239, 180, + 217, 141, 191, 251, 80, 182, 251, 80, 239, 180, 213, 41, 251, 70, 53, + 217, 138, 233, 33, 228, 50, 228, 58, 216, 177, 248, 66, 233, 34, 3, 241, + 74, 205, 241, 3, 213, 27, 56, 49, 128, 216, 118, 159, 51, 128, 216, 118, + 159, 205, 241, 3, 73, 56, 205, 241, 3, 73, 57, 49, 83, 249, 77, 3, 214, + 73, 51, 83, 249, 77, 3, 214, 73, 205, 158, 49, 167, 159, 205, 158, 51, + 167, 159, 248, 93, 49, 167, 159, 248, 93, 51, 167, 159, 49, 209, 173, + 108, 159, 51, 209, 173, 108, 159, 49, 53, 216, 115, 51, 53, 216, 115, + 120, 190, 119, 112, 73, 214, 211, 112, 73, 119, 120, 190, 214, 211, 95, + 236, 229, 73, 214, 211, 237, 61, 73, 81, 213, 105, 214, 79, 81, 83, 205, + 240, 213, 27, 215, 99, 200, 238, 210, 155, 101, 240, 182, 204, 185, 246, + 70, 213, 220, 240, 182, 213, 220, 246, 70, 204, 185, 210, 167, 242, 41, + 3, 49, 235, 44, 242, 41, 3, 51, 235, 44, 204, 185, 242, 40, 205, 158, + 167, 211, 193, 54, 204, 142, 241, 244, 206, 44, 241, 244, 208, 91, 236, + 183, 208, 76, 83, 209, 106, 240, 180, 201, 22, 83, 224, 176, 247, 142, + 53, 233, 33, 213, 105, 246, 70, 53, 224, 55, 214, 63, 81, 241, 245, 3, + 49, 203, 219, 53, 207, 196, 81, 12, 42, 213, 132, 12, 42, 246, 120, 12, + 42, 211, 196, 102, 12, 42, 211, 196, 105, 12, 42, 211, 196, 147, 12, 42, + 216, 10, 12, 42, 248, 78, 12, 42, 207, 22, 12, 42, 226, 96, 102, 12, 42, + 226, 96, 105, 12, 42, 240, 236, 12, 42, 211, 200, 12, 42, 4, 102, 12, 42, + 4, 105, 12, 42, 225, 86, 102, 12, 42, 225, 86, 105, 12, 42, 225, 86, 147, + 12, 42, 225, 86, 149, 12, 42, 209, 41, 12, 42, 206, 47, 12, 42, 209, 38, + 102, 12, 42, 209, 38, 105, 12, 42, 234, 128, 102, 12, 42, 234, 128, 105, + 12, 42, 234, 199, 12, 42, 213, 210, 12, 42, 246, 206, 12, 42, 207, 228, + 12, 42, 221, 81, 12, 42, 241, 173, 12, 42, 221, 71, 12, 42, 246, 138, 12, + 42, 201, 83, 102, 12, 42, 201, 83, 105, 12, 42, 237, 77, 12, 42, 216, 85, + 102, 12, 42, 216, 85, 105, 12, 42, 209, 146, 167, 205, 109, 205, 37, 12, + 42, 242, 255, 12, 42, 240, 200, 12, 42, 227, 243, 12, 42, 248, 116, 76, + 246, 104, 12, 42, 238, 22, 12, 42, 208, 215, 102, 12, 42, 208, 215, 105, + 12, 42, 249, 90, 12, 42, 209, 153, 12, 42, 247, 220, 209, 153, 12, 42, + 220, 14, 102, 12, 42, 220, 14, 105, 12, 42, 220, 14, 147, 12, 42, 220, + 14, 149, 12, 42, 222, 27, 12, 42, 210, 59, 12, 42, 213, 216, 12, 42, 238, + 50, 12, 42, 217, 92, 12, 42, 248, 44, 102, 12, 42, 248, 44, 105, 12, 42, + 222, 71, 12, 42, 221, 76, 12, 42, 235, 77, 102, 12, 42, 235, 77, 105, 12, + 42, 235, 77, 147, 12, 42, 206, 2, 12, 42, 246, 103, 12, 42, 201, 48, 102, + 12, 42, 201, 48, 105, 12, 42, 247, 220, 211, 190, 12, 42, 209, 146, 233, + 124, 12, 42, 233, 124, 12, 42, 247, 220, 208, 227, 12, 42, 247, 220, 210, + 54, 12, 42, 236, 255, 12, 42, 247, 220, 247, 118, 12, 42, 209, 146, 201, + 104, 12, 42, 201, 105, 102, 12, 42, 201, 105, 105, 12, 42, 246, 141, 12, + 42, 247, 220, 235, 108, 12, 42, 168, 102, 12, 42, 168, 105, 12, 42, 247, + 220, 224, 89, 12, 42, 247, 220, 236, 41, 12, 42, 221, 67, 102, 12, 42, + 221, 67, 105, 12, 42, 213, 222, 12, 42, 248, 126, 12, 42, 247, 220, 206, + 238, 225, 34, 12, 42, 247, 220, 225, 35, 12, 42, 247, 220, 201, 16, 12, + 42, 247, 220, 237, 17, 12, 42, 239, 11, 102, 12, 42, 239, 11, 105, 12, + 42, 239, 11, 147, 12, 42, 247, 220, 239, 10, 12, 42, 234, 136, 12, 42, + 247, 220, 233, 120, 12, 42, 248, 112, 12, 42, 235, 169, 12, 42, 247, 220, + 237, 71, 12, 42, 247, 220, 248, 162, 12, 42, 247, 220, 212, 27, 12, 42, + 209, 146, 201, 39, 12, 42, 209, 146, 200, 43, 12, 42, 247, 220, 236, 202, + 12, 42, 227, 250, 238, 55, 12, 42, 247, 220, 238, 55, 12, 42, 227, 250, + 205, 159, 12, 42, 247, 220, 205, 159, 12, 42, 227, 250, 239, 158, 12, 42, + 247, 220, 239, 158, 12, 42, 204, 182, 12, 42, 227, 250, 204, 182, 12, 42, + 247, 220, 204, 182, 75, 42, 102, 75, 42, 224, 176, 75, 42, 240, 182, 75, + 42, 209, 75, 75, 42, 211, 195, 75, 42, 117, 75, 42, 105, 75, 42, 224, + 205, 75, 42, 222, 180, 75, 42, 225, 13, 75, 42, 238, 154, 75, 42, 192, + 75, 42, 127, 248, 78, 75, 42, 243, 1, 75, 42, 232, 231, 75, 42, 207, 22, + 75, 42, 176, 248, 78, 75, 42, 226, 95, 75, 42, 215, 51, 75, 42, 200, 228, + 75, 42, 208, 206, 75, 42, 51, 176, 248, 78, 75, 42, 234, 70, 238, 174, + 75, 42, 206, 166, 75, 42, 240, 236, 75, 42, 211, 200, 75, 42, 246, 120, + 75, 42, 215, 3, 75, 42, 251, 192, 75, 42, 221, 58, 75, 42, 238, 174, 75, + 42, 239, 17, 75, 42, 211, 223, 75, 42, 235, 116, 75, 42, 235, 117, 209, + 55, 75, 42, 238, 54, 75, 42, 248, 174, 75, 42, 200, 250, 75, 42, 246, + 227, 75, 42, 212, 237, 75, 42, 228, 113, 75, 42, 209, 53, 75, 42, 225, + 85, 75, 42, 243, 11, 75, 42, 208, 197, 75, 42, 221, 63, 75, 42, 213, 15, + 75, 42, 200, 235, 75, 42, 217, 70, 75, 42, 204, 191, 75, 42, 239, 139, + 75, 42, 209, 250, 206, 47, 75, 42, 239, 180, 246, 120, 75, 42, 168, 208, + 53, 75, 42, 120, 234, 174, 75, 42, 210, 0, 75, 42, 248, 85, 75, 42, 209, + 37, 75, 42, 248, 48, 75, 42, 208, 90, 75, 42, 234, 127, 75, 42, 234, 214, + 75, 42, 240, 185, 75, 42, 234, 199, 75, 42, 248, 66, 75, 42, 213, 210, + 75, 42, 211, 208, 75, 42, 241, 12, 75, 42, 250, 113, 75, 42, 208, 193, + 75, 42, 218, 214, 75, 42, 207, 228, 75, 42, 211, 234, 75, 42, 221, 81, + 75, 42, 205, 108, 75, 42, 225, 162, 75, 42, 208, 76, 75, 42, 241, 173, + 75, 42, 201, 63, 75, 42, 240, 212, 218, 214, 75, 42, 246, 66, 75, 42, + 236, 176, 75, 42, 246, 132, 75, 42, 208, 95, 75, 42, 201, 82, 75, 42, + 237, 77, 75, 42, 246, 128, 75, 42, 237, 154, 75, 42, 53, 200, 195, 75, + 42, 167, 205, 109, 205, 37, 75, 42, 209, 67, 75, 42, 237, 166, 75, 42, + 242, 255, 75, 42, 240, 200, 75, 42, 215, 0, 75, 42, 227, 243, 75, 42, + 222, 49, 75, 42, 205, 239, 75, 42, 207, 178, 75, 42, 224, 199, 75, 42, + 203, 195, 75, 42, 237, 110, 75, 42, 248, 116, 76, 246, 104, 75, 42, 209, + 178, 75, 42, 239, 180, 206, 158, 75, 42, 201, 34, 75, 42, 209, 83, 75, + 42, 240, 255, 75, 42, 238, 22, 75, 42, 208, 230, 75, 42, 48, 75, 42, 208, + 78, 75, 42, 208, 214, 75, 42, 205, 131, 75, 42, 235, 86, 75, 42, 247, + 104, 75, 42, 208, 113, 75, 42, 249, 90, 75, 42, 213, 83, 75, 42, 209, + 153, 75, 42, 227, 235, 75, 42, 220, 13, 75, 42, 210, 59, 75, 42, 237, + 142, 75, 42, 217, 92, 75, 42, 251, 79, 75, 42, 215, 120, 75, 42, 239, 21, + 75, 42, 248, 43, 75, 42, 222, 71, 75, 42, 221, 158, 75, 42, 210, 174, 75, + 42, 250, 206, 75, 42, 221, 76, 75, 42, 205, 163, 75, 42, 217, 41, 75, 42, + 248, 120, 75, 42, 208, 74, 75, 42, 246, 78, 75, 42, 235, 76, 75, 42, 206, + 2, 75, 42, 228, 76, 75, 42, 248, 132, 75, 42, 201, 105, 238, 174, 75, 42, + 246, 103, 75, 42, 201, 47, 75, 42, 211, 190, 75, 42, 233, 124, 75, 42, + 208, 227, 75, 42, 203, 83, 75, 42, 249, 3, 75, 42, 215, 168, 75, 42, 249, + 116, 75, 42, 210, 54, 75, 42, 213, 169, 75, 42, 212, 158, 75, 42, 236, + 255, 75, 42, 248, 118, 75, 42, 247, 118, 75, 42, 248, 149, 75, 42, 221, + 78, 75, 42, 201, 104, 75, 42, 246, 141, 75, 42, 201, 12, 75, 42, 240, + 247, 75, 42, 202, 218, 75, 42, 235, 108, 75, 42, 224, 89, 75, 42, 236, + 41, 75, 42, 221, 66, 75, 42, 209, 74, 75, 42, 209, 250, 207, 5, 248, 162, + 75, 42, 213, 222, 75, 42, 248, 126, 75, 42, 200, 218, 75, 42, 237, 189, + 75, 42, 225, 34, 75, 42, 206, 238, 225, 34, 75, 42, 225, 30, 75, 42, 209, + 0, 75, 42, 225, 35, 75, 42, 201, 16, 75, 42, 237, 17, 75, 42, 239, 10, + 75, 42, 234, 136, 75, 42, 236, 217, 75, 42, 233, 120, 75, 42, 248, 112, + 75, 42, 206, 247, 75, 42, 234, 221, 75, 42, 237, 103, 75, 42, 212, 58, + 201, 12, 75, 42, 247, 106, 75, 42, 235, 169, 75, 42, 237, 71, 75, 42, + 248, 162, 75, 42, 212, 27, 75, 42, 241, 158, 75, 42, 201, 39, 75, 42, + 234, 106, 75, 42, 200, 43, 75, 42, 221, 169, 75, 42, 248, 144, 75, 42, + 238, 186, 75, 42, 236, 202, 75, 42, 205, 80, 75, 42, 239, 142, 75, 42, + 213, 204, 75, 42, 218, 216, 75, 42, 238, 55, 75, 42, 205, 159, 75, 42, + 239, 158, 75, 42, 204, 182, 75, 42, 237, 20, 141, 241, 117, 171, 49, 205, + 186, 213, 46, 141, 241, 117, 171, 88, 205, 186, 57, 141, 241, 117, 171, + 49, 205, 186, 101, 26, 213, 46, 141, 241, 117, 171, 88, 205, 186, 101, + 26, 57, 141, 241, 117, 171, 236, 183, 207, 200, 141, 241, 117, 171, 207, + 201, 236, 201, 56, 141, 241, 117, 171, 207, 201, 236, 201, 57, 141, 241, + 117, 171, 207, 201, 236, 201, 225, 28, 141, 241, 117, 171, 207, 201, 236, + 201, 203, 225, 225, 28, 141, 241, 117, 171, 207, 201, 236, 201, 203, 225, + 213, 46, 141, 241, 117, 171, 207, 201, 236, 201, 224, 54, 225, 28, 141, + 241, 117, 171, 216, 245, 141, 208, 244, 141, 246, 70, 141, 236, 183, 208, + 76, 240, 244, 81, 227, 236, 228, 96, 208, 112, 99, 141, 228, 10, 81, 141, + 246, 106, 81, 141, 41, 199, 81, 49, 251, 71, 159, 51, 251, 71, 159, 49, + 53, 251, 71, 159, 51, 53, 251, 71, 159, 49, 243, 16, 159, 51, 243, 16, + 159, 49, 64, 243, 16, 159, 51, 64, 243, 16, 159, 49, 63, 224, 247, 159, + 51, 63, 224, 247, 159, 215, 65, 81, 235, 238, 81, 49, 205, 146, 210, 55, + 159, 51, 205, 146, 210, 55, 159, 49, 64, 224, 247, 159, 51, 64, 224, 247, + 159, 49, 64, 205, 146, 210, 55, 159, 51, 64, 205, 146, 210, 55, 159, 49, + 64, 52, 159, 51, 64, 52, 159, 201, 78, 241, 244, 213, 105, 53, 215, 15, + 214, 63, 81, 53, 215, 15, 214, 63, 81, 128, 53, 215, 15, 214, 63, 81, + 215, 65, 134, 237, 189, 234, 171, 218, 93, 102, 234, 171, 218, 93, 105, + 234, 171, 218, 93, 147, 234, 171, 218, 93, 149, 234, 171, 218, 93, 164, + 234, 171, 218, 93, 187, 234, 171, 218, 93, 210, 135, 234, 171, 218, 93, + 192, 234, 171, 218, 93, 219, 113, 141, 224, 229, 150, 81, 141, 213, 19, + 150, 81, 141, 241, 126, 150, 81, 141, 238, 153, 150, 81, 29, 209, 139, + 73, 150, 81, 29, 53, 73, 150, 81, 201, 74, 241, 244, 83, 227, 67, 213, + 133, 81, 83, 227, 67, 213, 133, 3, 202, 189, 209, 1, 81, 83, 227, 67, + 213, 133, 134, 203, 225, 234, 213, 83, 227, 67, 213, 133, 3, 202, 189, + 209, 1, 134, 203, 225, 234, 213, 83, 227, 67, 213, 133, 134, 224, 54, + 234, 213, 44, 215, 65, 81, 141, 206, 178, 224, 177, 237, 139, 210, 155, + 99, 234, 171, 218, 93, 206, 166, 234, 171, 218, 93, 204, 159, 234, 171, + 218, 93, 206, 67, 83, 141, 228, 10, 81, 222, 128, 81, 216, 110, 251, 105, + 81, 141, 58, 228, 99, 141, 167, 237, 96, 208, 244, 177, 1, 4, 62, 177, 1, + 62, 177, 1, 4, 70, 177, 1, 70, 177, 1, 4, 66, 177, 1, 66, 177, 1, 4, 72, + 177, 1, 72, 177, 1, 4, 74, 177, 1, 74, 177, 1, 161, 177, 1, 236, 89, 177, + 1, 226, 163, 177, 1, 235, 161, 177, 1, 226, 15, 177, 1, 235, 50, 177, 1, + 227, 8, 177, 1, 236, 15, 177, 1, 226, 88, 177, 1, 235, 116, 177, 1, 212, + 64, 177, 1, 199, 114, 177, 1, 209, 182, 177, 1, 199, 36, 177, 1, 208, 24, + 177, 1, 199, 3, 177, 1, 211, 202, 177, 1, 199, 89, 177, 1, 209, 29, 177, + 1, 199, 14, 177, 1, 207, 36, 177, 1, 242, 58, 177, 1, 206, 15, 177, 1, + 241, 76, 177, 1, 4, 204, 215, 177, 1, 204, 215, 177, 1, 239, 137, 177, 1, + 206, 201, 177, 1, 241, 175, 177, 1, 138, 177, 1, 240, 211, 177, 1, 188, + 177, 1, 219, 150, 177, 1, 218, 133, 177, 1, 220, 34, 177, 1, 218, 241, + 177, 1, 144, 177, 1, 249, 136, 177, 1, 172, 177, 1, 234, 75, 177, 1, 248, + 188, 177, 1, 215, 204, 177, 1, 233, 97, 177, 1, 248, 36, 177, 1, 214, + 224, 177, 1, 234, 139, 177, 1, 249, 8, 177, 1, 216, 73, 177, 1, 233, 207, + 177, 1, 248, 124, 177, 1, 215, 106, 177, 1, 178, 177, 1, 221, 211, 177, + 1, 221, 41, 177, 1, 222, 76, 177, 1, 221, 136, 177, 1, 4, 183, 177, 1, + 183, 177, 1, 4, 199, 211, 177, 1, 199, 211, 177, 1, 4, 199, 245, 177, 1, + 199, 245, 177, 1, 213, 252, 177, 1, 213, 88, 177, 1, 212, 175, 177, 1, + 213, 190, 177, 1, 213, 1, 177, 1, 4, 201, 114, 177, 1, 201, 114, 177, 1, + 201, 31, 177, 1, 201, 64, 177, 1, 201, 0, 177, 1, 220, 214, 177, 1, 201, + 166, 177, 1, 4, 161, 177, 1, 4, 227, 8, 38, 227, 32, 202, 189, 209, 1, + 81, 38, 227, 32, 210, 172, 209, 1, 81, 227, 32, 202, 189, 209, 1, 81, + 227, 32, 210, 172, 209, 1, 81, 177, 228, 10, 81, 177, 202, 189, 228, 10, + 81, 177, 241, 35, 199, 226, 227, 32, 53, 233, 33, 69, 1, 4, 62, 69, 1, + 62, 69, 1, 4, 70, 69, 1, 70, 69, 1, 4, 66, 69, 1, 66, 69, 1, 4, 72, 69, + 1, 72, 69, 1, 4, 74, 69, 1, 74, 69, 1, 161, 69, 1, 236, 89, 69, 1, 226, + 163, 69, 1, 235, 161, 69, 1, 226, 15, 69, 1, 235, 50, 69, 1, 227, 8, 69, + 1, 236, 15, 69, 1, 226, 88, 69, 1, 235, 116, 69, 1, 212, 64, 69, 1, 199, + 114, 69, 1, 209, 182, 69, 1, 199, 36, 69, 1, 208, 24, 69, 1, 199, 3, 69, + 1, 211, 202, 69, 1, 199, 89, 69, 1, 209, 29, 69, 1, 199, 14, 69, 1, 207, + 36, 69, 1, 242, 58, 69, 1, 206, 15, 69, 1, 241, 76, 69, 1, 4, 204, 215, + 69, 1, 204, 215, 69, 1, 239, 137, 69, 1, 206, 201, 69, 1, 241, 175, 69, + 1, 138, 69, 1, 240, 211, 69, 1, 188, 69, 1, 219, 150, 69, 1, 218, 133, + 69, 1, 220, 34, 69, 1, 218, 241, 69, 1, 144, 69, 1, 249, 136, 69, 1, 172, + 69, 1, 234, 75, 69, 1, 248, 188, 69, 1, 215, 204, 69, 1, 233, 97, 69, 1, + 248, 36, 69, 1, 214, 224, 69, 1, 234, 139, 69, 1, 249, 8, 69, 1, 216, 73, + 69, 1, 233, 207, 69, 1, 248, 124, 69, 1, 215, 106, 69, 1, 178, 69, 1, + 221, 211, 69, 1, 221, 41, 69, 1, 222, 76, 69, 1, 221, 136, 69, 1, 4, 183, + 69, 1, 183, 69, 1, 4, 199, 211, 69, 1, 199, 211, 69, 1, 4, 199, 245, 69, + 1, 199, 245, 69, 1, 213, 252, 69, 1, 213, 88, 69, 1, 212, 175, 69, 1, + 213, 190, 69, 1, 213, 1, 69, 1, 4, 201, 114, 69, 1, 201, 114, 69, 1, 201, + 31, 69, 1, 201, 64, 69, 1, 201, 0, 69, 1, 220, 214, 69, 1, 201, 166, 69, + 1, 4, 161, 69, 1, 4, 227, 8, 69, 1, 203, 90, 69, 1, 202, 234, 69, 1, 203, + 59, 69, 1, 202, 193, 69, 101, 240, 182, 227, 32, 214, 248, 209, 1, 81, + 69, 228, 10, 81, 69, 202, 189, 228, 10, 81, 69, 241, 35, 226, 55, 248, + 102, 1, 250, 103, 248, 102, 1, 216, 226, 248, 102, 1, 223, 243, 248, 102, + 1, 238, 5, 248, 102, 1, 242, 153, 248, 102, 1, 207, 83, 248, 102, 1, 220, + 214, 248, 102, 1, 156, 248, 102, 1, 236, 156, 248, 102, 1, 227, 118, 248, + 102, 1, 234, 247, 248, 102, 1, 227, 251, 248, 102, 1, 214, 167, 248, 102, + 1, 200, 195, 248, 102, 1, 199, 78, 248, 102, 1, 247, 38, 248, 102, 1, + 210, 116, 248, 102, 1, 146, 248, 102, 1, 199, 157, 248, 102, 1, 247, 223, + 248, 102, 1, 212, 122, 248, 102, 1, 62, 248, 102, 1, 74, 248, 102, 1, 72, + 248, 102, 1, 238, 241, 248, 102, 1, 251, 176, 248, 102, 1, 238, 234, 248, + 102, 1, 250, 139, 248, 102, 1, 217, 3, 248, 102, 1, 251, 85, 248, 102, 1, + 238, 179, 248, 102, 1, 251, 76, 248, 102, 1, 238, 165, 248, 102, 1, 238, + 115, 248, 102, 1, 70, 248, 102, 1, 66, 248, 102, 1, 228, 8, 248, 102, 1, + 203, 168, 248, 102, 1, 219, 255, 248, 102, 1, 235, 120, 248, 102, 1, 228, + 152, 29, 1, 226, 121, 29, 1, 208, 171, 29, 1, 226, 114, 29, 1, 219, 143, + 29, 1, 219, 141, 29, 1, 219, 140, 29, 1, 205, 253, 29, 1, 208, 160, 29, + 1, 213, 78, 29, 1, 213, 73, 29, 1, 213, 70, 29, 1, 213, 63, 29, 1, 213, + 58, 29, 1, 213, 53, 29, 1, 213, 64, 29, 1, 213, 76, 29, 1, 221, 197, 29, + 1, 215, 190, 29, 1, 208, 168, 29, 1, 215, 179, 29, 1, 209, 129, 29, 1, + 208, 165, 29, 1, 228, 174, 29, 1, 246, 168, 29, 1, 208, 175, 29, 1, 246, + 232, 29, 1, 226, 183, 29, 1, 206, 80, 29, 1, 215, 227, 29, 1, 234, 66, + 29, 1, 62, 29, 1, 251, 221, 29, 1, 183, 29, 1, 200, 98, 29, 1, 238, 142, + 29, 1, 72, 29, 1, 200, 38, 29, 1, 200, 51, 29, 1, 74, 29, 1, 201, 114, + 29, 1, 201, 110, 29, 1, 217, 121, 29, 1, 199, 245, 29, 1, 66, 29, 1, 201, + 50, 29, 1, 201, 64, 29, 1, 201, 31, 29, 1, 199, 211, 29, 1, 238, 69, 29, + 1, 200, 9, 29, 1, 70, 29, 237, 93, 29, 1, 208, 169, 29, 1, 219, 133, 29, + 1, 219, 135, 29, 1, 219, 138, 29, 1, 213, 71, 29, 1, 213, 52, 29, 1, 213, + 60, 29, 1, 213, 65, 29, 1, 213, 50, 29, 1, 221, 190, 29, 1, 221, 187, 29, + 1, 221, 191, 29, 1, 227, 53, 29, 1, 215, 185, 29, 1, 215, 171, 29, 1, + 215, 177, 29, 1, 215, 174, 29, 1, 215, 188, 29, 1, 215, 172, 29, 1, 227, + 51, 29, 1, 227, 49, 29, 1, 209, 122, 29, 1, 209, 120, 29, 1, 209, 112, + 29, 1, 209, 117, 29, 1, 209, 127, 29, 1, 216, 146, 29, 1, 208, 172, 29, + 1, 200, 28, 29, 1, 200, 24, 29, 1, 200, 25, 29, 1, 227, 52, 29, 1, 208, + 173, 29, 1, 200, 34, 29, 1, 199, 239, 29, 1, 199, 238, 29, 1, 199, 241, + 29, 1, 199, 202, 29, 1, 199, 203, 29, 1, 199, 206, 29, 1, 250, 245, 29, + 1, 250, 239, 141, 251, 58, 224, 165, 81, 141, 251, 58, 213, 106, 81, 141, + 251, 58, 112, 81, 141, 251, 58, 120, 81, 141, 251, 58, 126, 81, 141, 251, + 58, 236, 229, 81, 141, 251, 58, 205, 158, 81, 141, 251, 58, 101, 81, 141, + 251, 58, 248, 93, 81, 141, 251, 58, 237, 73, 81, 141, 251, 58, 211, 196, + 81, 141, 251, 58, 206, 75, 81, 141, 251, 58, 236, 222, 81, 141, 251, 58, + 234, 124, 81, 141, 251, 58, 239, 18, 81, 141, 251, 58, 222, 181, 81, 248, + 102, 1, 248, 36, 248, 102, 1, 199, 36, 248, 102, 1, 227, 207, 248, 102, + 1, 235, 50, 248, 102, 1, 238, 255, 248, 102, 1, 238, 162, 248, 102, 1, + 217, 63, 248, 102, 1, 217, 67, 248, 102, 1, 228, 35, 248, 102, 1, 251, + 60, 248, 102, 1, 228, 83, 248, 102, 1, 203, 233, 248, 102, 1, 228, 134, + 248, 102, 1, 219, 233, 248, 102, 1, 251, 170, 248, 102, 1, 250, 134, 248, + 102, 1, 251, 101, 248, 102, 1, 217, 86, 248, 102, 1, 217, 69, 248, 102, + 1, 228, 80, 248, 102, 47, 1, 216, 226, 248, 102, 47, 1, 207, 83, 248, + 102, 47, 1, 227, 118, 248, 102, 47, 1, 234, 247, 248, 102, 1, 235, 200, + 248, 102, 1, 224, 224, 248, 102, 1, 198, 239, 12, 208, 47, 207, 83, 12, + 208, 47, 201, 42, 12, 208, 47, 200, 170, 12, 208, 47, 247, 236, 12, 208, + 47, 207, 187, 12, 208, 47, 233, 23, 12, 208, 47, 233, 27, 12, 208, 47, + 233, 106, 12, 208, 47, 233, 24, 12, 208, 47, 207, 86, 12, 208, 47, 233, + 26, 12, 208, 47, 233, 22, 12, 208, 47, 233, 104, 12, 208, 47, 233, 25, + 12, 208, 47, 233, 21, 12, 208, 47, 220, 214, 12, 208, 47, 234, 247, 12, + 208, 47, 212, 122, 12, 208, 47, 216, 226, 12, 208, 47, 208, 247, 12, 208, + 47, 242, 153, 12, 208, 47, 233, 28, 12, 208, 47, 234, 85, 12, 208, 47, + 207, 95, 12, 208, 47, 207, 166, 12, 208, 47, 208, 123, 12, 208, 47, 210, + 122, 12, 208, 47, 216, 77, 12, 208, 47, 214, 169, 12, 208, 47, 205, 187, + 12, 208, 47, 207, 85, 12, 208, 47, 207, 177, 12, 208, 47, 233, 37, 12, + 208, 47, 233, 20, 12, 208, 47, 215, 247, 12, 208, 47, 214, 167, 69, 1, 4, + 226, 15, 69, 1, 4, 209, 182, 69, 1, 4, 208, 24, 69, 1, 4, 138, 69, 1, 4, + 218, 133, 69, 1, 4, 144, 69, 1, 4, 234, 75, 69, 1, 4, 233, 97, 69, 1, 4, + 234, 139, 69, 1, 4, 233, 207, 69, 1, 4, 221, 41, 69, 1, 4, 213, 252, 69, + 1, 4, 213, 88, 69, 1, 4, 212, 175, 69, 1, 4, 213, 190, 69, 1, 4, 213, 1, + 106, 29, 226, 121, 106, 29, 219, 143, 106, 29, 205, 253, 106, 29, 213, + 78, 106, 29, 221, 197, 106, 29, 215, 190, 106, 29, 209, 129, 106, 29, + 228, 174, 106, 29, 246, 168, 106, 29, 246, 232, 106, 29, 226, 183, 106, + 29, 206, 80, 106, 29, 215, 227, 106, 29, 234, 66, 106, 29, 226, 122, 62, + 106, 29, 219, 144, 62, 106, 29, 205, 254, 62, 106, 29, 213, 79, 62, 106, + 29, 221, 198, 62, 106, 29, 215, 191, 62, 106, 29, 209, 130, 62, 106, 29, + 228, 175, 62, 106, 29, 246, 169, 62, 106, 29, 246, 233, 62, 106, 29, 226, + 184, 62, 106, 29, 206, 81, 62, 106, 29, 215, 228, 62, 106, 29, 234, 67, + 62, 106, 29, 246, 169, 66, 106, 226, 59, 171, 217, 101, 106, 226, 59, + 171, 163, 233, 97, 106, 198, 198, 102, 106, 198, 198, 105, 106, 198, 198, + 147, 106, 198, 198, 149, 106, 198, 198, 164, 106, 198, 198, 187, 106, + 198, 198, 210, 135, 106, 198, 198, 192, 106, 198, 198, 219, 113, 106, + 198, 198, 206, 166, 106, 198, 198, 221, 81, 106, 198, 198, 237, 77, 106, + 198, 198, 201, 82, 106, 198, 198, 200, 243, 106, 198, 198, 222, 20, 106, + 198, 198, 239, 17, 106, 198, 198, 207, 228, 106, 198, 198, 208, 79, 106, + 198, 198, 234, 148, 106, 198, 198, 209, 25, 106, 198, 198, 220, 135, 106, + 198, 198, 208, 229, 106, 198, 198, 237, 88, 106, 198, 198, 243, 61, 106, + 198, 198, 225, 165, 106, 198, 198, 213, 127, 106, 198, 198, 247, 168, + 106, 198, 198, 208, 29, 106, 198, 198, 207, 210, 106, 198, 198, 238, 152, + 106, 198, 198, 213, 119, 106, 198, 198, 251, 120, 106, 198, 198, 237, + 119, 106, 198, 198, 213, 117, 106, 198, 198, 210, 174, 106, 198, 198, + 213, 189, 44, 198, 198, 214, 78, 44, 198, 198, 226, 146, 44, 198, 198, + 211, 221, 44, 198, 198, 226, 55, 44, 41, 206, 167, 217, 79, 63, 208, 193, + 44, 41, 204, 160, 217, 79, 63, 208, 193, 44, 41, 206, 68, 217, 79, 63, + 208, 193, 44, 41, 236, 236, 217, 79, 63, 208, 193, 44, 41, 237, 105, 217, + 79, 63, 208, 193, 44, 41, 209, 93, 217, 79, 63, 208, 193, 44, 41, 210, + 130, 217, 79, 63, 208, 193, 44, 41, 238, 223, 217, 79, 63, 208, 193, 216, + 106, 54, 44, 41, 204, 160, 102, 44, 41, 204, 160, 105, 44, 41, 204, 160, + 147, 44, 41, 204, 160, 149, 44, 41, 204, 160, 164, 44, 41, 204, 160, 187, + 44, 41, 204, 160, 210, 135, 44, 41, 204, 160, 192, 44, 41, 204, 160, 219, + 113, 44, 41, 206, 67, 44, 41, 206, 68, 102, 44, 41, 206, 68, 105, 44, 41, + 206, 68, 147, 44, 41, 206, 68, 149, 44, 41, 206, 68, 164, 44, 29, 226, + 121, 44, 29, 219, 143, 44, 29, 205, 253, 44, 29, 213, 78, 44, 29, 221, + 197, 44, 29, 215, 190, 44, 29, 209, 129, 44, 29, 228, 174, 44, 29, 246, + 168, 44, 29, 246, 232, 44, 29, 226, 183, 44, 29, 206, 80, 44, 29, 215, + 227, 44, 29, 234, 66, 44, 29, 226, 122, 62, 44, 29, 219, 144, 62, 44, 29, + 205, 254, 62, 44, 29, 213, 79, 62, 44, 29, 221, 198, 62, 44, 29, 215, + 191, 62, 44, 29, 209, 130, 62, 44, 29, 228, 175, 62, 44, 29, 246, 169, + 62, 44, 29, 246, 233, 62, 44, 29, 226, 184, 62, 44, 29, 206, 81, 62, 44, + 29, 215, 228, 62, 44, 29, 234, 67, 62, 44, 226, 59, 171, 247, 27, 44, + 226, 59, 171, 227, 143, 44, 29, 228, 175, 66, 226, 59, 208, 112, 99, 44, + 198, 198, 102, 44, 198, 198, 105, 44, 198, 198, 147, 44, 198, 198, 149, + 44, 198, 198, 164, 44, 198, 198, 187, 44, 198, 198, 210, 135, 44, 198, + 198, 192, 44, 198, 198, 219, 113, 44, 198, 198, 206, 166, 44, 198, 198, + 221, 81, 44, 198, 198, 237, 77, 44, 198, 198, 201, 82, 44, 198, 198, 200, + 243, 44, 198, 198, 222, 20, 44, 198, 198, 239, 17, 44, 198, 198, 207, + 228, 44, 198, 198, 208, 79, 44, 198, 198, 234, 148, 44, 198, 198, 209, + 25, 44, 198, 198, 220, 135, 44, 198, 198, 208, 229, 44, 198, 198, 237, + 88, 44, 198, 198, 243, 61, 44, 198, 198, 225, 165, 44, 198, 198, 211, + 194, 44, 198, 198, 222, 184, 44, 198, 198, 237, 129, 44, 198, 198, 207, + 240, 44, 198, 198, 238, 47, 44, 198, 198, 215, 10, 44, 198, 198, 250, + 143, 44, 198, 198, 228, 11, 44, 198, 198, 213, 117, 44, 198, 198, 243, + 20, 44, 198, 198, 243, 10, 44, 198, 198, 234, 59, 44, 198, 198, 247, 55, + 44, 198, 198, 224, 59, 44, 198, 198, 225, 28, 44, 198, 198, 213, 46, 44, + 198, 198, 222, 67, 44, 198, 198, 213, 144, 44, 198, 198, 208, 29, 44, + 198, 198, 207, 210, 44, 198, 198, 238, 152, 44, 198, 198, 213, 119, 44, + 198, 198, 251, 120, 44, 198, 198, 219, 129, 44, 41, 206, 68, 187, 44, 41, + 206, 68, 210, 135, 44, 41, 206, 68, 192, 44, 41, 206, 68, 219, 113, 44, + 41, 236, 235, 44, 41, 236, 236, 102, 44, 41, 236, 236, 105, 44, 41, 236, + 236, 147, 44, 41, 236, 236, 149, 44, 41, 236, 236, 164, 44, 41, 236, 236, + 187, 44, 41, 236, 236, 210, 135, 44, 41, 236, 236, 192, 44, 41, 236, 236, + 219, 113, 44, 41, 237, 104, 141, 206, 178, 16, 36, 227, 238, 141, 206, + 178, 16, 36, 237, 141, 141, 206, 178, 16, 36, 222, 152, 141, 206, 178, + 16, 36, 251, 3, 141, 206, 178, 16, 36, 222, 119, 141, 206, 178, 16, 36, + 227, 140, 141, 206, 178, 16, 36, 227, 141, 141, 206, 178, 16, 36, 250, + 135, 141, 206, 178, 16, 36, 210, 153, 141, 206, 178, 16, 36, 217, 127, + 141, 206, 178, 16, 36, 218, 202, 141, 206, 178, 16, 36, 241, 170, 52, + 234, 85, 52, 238, 111, 52, 238, 57, 224, 182, 224, 209, 54, 44, 69, 62, + 44, 69, 70, 44, 69, 66, 44, 69, 72, 44, 69, 74, 44, 69, 161, 44, 69, 226, + 163, 44, 69, 226, 15, 44, 69, 227, 8, 44, 69, 226, 88, 44, 69, 212, 64, + 44, 69, 209, 182, 44, 69, 208, 24, 44, 69, 211, 202, 44, 69, 209, 29, 44, + 69, 207, 36, 44, 69, 206, 15, 44, 69, 204, 215, 44, 69, 206, 201, 44, 69, + 138, 44, 69, 188, 44, 69, 219, 150, 44, 69, 218, 133, 44, 69, 220, 34, + 44, 69, 218, 241, 44, 69, 144, 44, 69, 234, 75, 44, 69, 233, 97, 44, 69, + 234, 139, 44, 69, 233, 207, 44, 69, 178, 44, 69, 221, 211, 44, 69, 221, + 41, 44, 69, 222, 76, 44, 69, 221, 136, 44, 69, 183, 44, 69, 199, 211, 44, + 69, 199, 245, 44, 69, 213, 252, 44, 69, 213, 88, 44, 69, 212, 175, 44, + 69, 213, 190, 44, 69, 213, 1, 44, 69, 201, 114, 44, 69, 201, 31, 44, 69, + 201, 64, 44, 69, 201, 0, 52, 251, 27, 52, 250, 190, 52, 251, 54, 52, 252, + 96, 52, 228, 85, 52, 228, 53, 52, 203, 231, 52, 238, 84, 52, 238, 252, + 52, 217, 66, 52, 217, 59, 52, 227, 80, 52, 227, 45, 52, 227, 42, 52, 236, + 45, 52, 236, 54, 52, 235, 150, 52, 235, 146, 52, 225, 194, 52, 235, 138, + 52, 226, 138, 52, 226, 137, 52, 226, 136, 52, 226, 135, 52, 235, 20, 52, + 235, 19, 52, 225, 242, 52, 225, 244, 52, 227, 1, 52, 226, 57, 52, 226, + 65, 52, 212, 45, 52, 212, 6, 52, 209, 110, 52, 210, 158, 52, 210, 157, + 52, 242, 54, 52, 241, 113, 52, 240, 183, 52, 205, 176, 52, 220, 130, 52, + 218, 203, 52, 234, 218, 52, 216, 205, 52, 216, 204, 52, 249, 133, 52, + 215, 201, 52, 215, 164, 52, 215, 165, 52, 248, 158, 52, 233, 95, 52, 233, + 90, 52, 247, 250, 52, 233, 74, 52, 234, 111, 52, 216, 1, 52, 216, 42, 52, + 234, 94, 52, 216, 38, 52, 216, 56, 52, 248, 247, 52, 215, 95, 52, 248, + 98, 52, 233, 191, 52, 215, 82, 52, 233, 182, 52, 233, 184, 52, 222, 196, + 52, 222, 192, 52, 222, 201, 52, 222, 139, 52, 222, 168, 52, 221, 176, 52, + 221, 151, 52, 221, 150, 52, 222, 56, 52, 222, 53, 52, 222, 57, 52, 200, + 108, 52, 200, 106, 52, 199, 200, 52, 213, 17, 52, 213, 21, 52, 212, 148, + 52, 212, 142, 52, 213, 141, 52, 213, 138, 52, 201, 80, 141, 206, 178, 16, + 36, 233, 114, 199, 81, 141, 206, 178, 16, 36, 233, 114, 102, 141, 206, + 178, 16, 36, 233, 114, 105, 141, 206, 178, 16, 36, 233, 114, 147, 141, + 206, 178, 16, 36, 233, 114, 149, 141, 206, 178, 16, 36, 233, 114, 164, + 141, 206, 178, 16, 36, 233, 114, 187, 141, 206, 178, 16, 36, 233, 114, + 210, 135, 141, 206, 178, 16, 36, 233, 114, 192, 141, 206, 178, 16, 36, + 233, 114, 219, 113, 141, 206, 178, 16, 36, 233, 114, 206, 166, 141, 206, + 178, 16, 36, 233, 114, 238, 199, 141, 206, 178, 16, 36, 233, 114, 204, + 164, 141, 206, 178, 16, 36, 233, 114, 206, 69, 141, 206, 178, 16, 36, + 233, 114, 236, 223, 141, 206, 178, 16, 36, 233, 114, 237, 108, 141, 206, + 178, 16, 36, 233, 114, 209, 100, 141, 206, 178, 16, 36, 233, 114, 210, + 132, 141, 206, 178, 16, 36, 233, 114, 238, 229, 141, 206, 178, 16, 36, + 233, 114, 219, 110, 141, 206, 178, 16, 36, 233, 114, 204, 159, 141, 206, + 178, 16, 36, 233, 114, 204, 153, 141, 206, 178, 16, 36, 233, 114, 204, + 148, 141, 206, 178, 16, 36, 233, 114, 204, 150, 141, 206, 178, 16, 36, + 233, 114, 204, 155, 52, 233, 105, 52, 242, 58, 52, 250, 139, 52, 148, 52, + 216, 249, 52, 216, 78, 52, 240, 213, 52, 240, 214, 208, 192, 52, 240, + 214, 242, 209, 52, 228, 8, 52, 238, 114, 220, 136, 234, 112, 52, 238, + 114, 220, 136, 207, 106, 52, 238, 114, 220, 136, 207, 3, 52, 238, 114, + 220, 136, 222, 52, 52, 243, 12, 52, 216, 211, 251, 87, 52, 188, 52, 221, + 42, 62, 52, 178, 52, 161, 52, 227, 11, 52, 222, 115, 52, 236, 33, 52, + 247, 174, 52, 227, 10, 52, 215, 248, 52, 220, 1, 52, 221, 42, 238, 5, 52, + 221, 42, 236, 156, 52, 221, 252, 52, 226, 209, 52, 233, 28, 52, 226, 165, + 52, 221, 213, 52, 235, 163, 52, 206, 17, 52, 221, 42, 156, 52, 221, 144, + 52, 240, 223, 52, 226, 103, 52, 237, 15, 52, 219, 23, 52, 221, 42, 223, + 243, 52, 221, 141, 52, 246, 92, 52, 226, 97, 52, 221, 142, 208, 192, 52, + 246, 93, 208, 192, 52, 223, 244, 208, 192, 52, 226, 98, 208, 192, 52, + 221, 142, 242, 209, 52, 246, 93, 242, 209, 52, 223, 244, 242, 209, 52, + 226, 98, 242, 209, 52, 223, 244, 119, 212, 122, 52, 223, 244, 119, 212, + 123, 208, 192, 52, 172, 52, 226, 50, 52, 221, 45, 52, 235, 91, 52, 213, + 239, 52, 213, 240, 119, 212, 122, 52, 213, 240, 119, 212, 123, 208, 192, + 52, 214, 237, 52, 218, 171, 52, 221, 42, 212, 122, 52, 221, 43, 52, 214, + 187, 52, 218, 71, 52, 221, 42, 203, 168, 52, 220, 238, 52, 225, 232, 52, + 220, 239, 222, 56, 52, 214, 186, 52, 218, 70, 52, 221, 42, 201, 147, 52, + 220, 232, 52, 225, 230, 52, 220, 233, 222, 56, 52, 227, 119, 217, 106, + 52, 223, 244, 217, 106, 52, 251, 101, 52, 248, 73, 52, 247, 100, 52, 247, + 77, 52, 247, 224, 119, 226, 209, 52, 246, 91, 52, 241, 229, 52, 235, 4, + 52, 144, 52, 233, 106, 52, 228, 117, 52, 226, 110, 52, 226, 98, 247, 143, + 52, 226, 17, 52, 224, 113, 52, 224, 112, 52, 224, 99, 52, 224, 3, 52, + 222, 116, 209, 53, 52, 221, 175, 52, 221, 108, 52, 215, 246, 52, 215, + 109, 52, 215, 46, 52, 215, 44, 52, 208, 183, 52, 207, 191, 52, 201, 66, + 52, 203, 169, 119, 223, 243, 52, 35, 119, 223, 243, 141, 206, 178, 16, + 36, 241, 233, 102, 141, 206, 178, 16, 36, 241, 233, 105, 141, 206, 178, + 16, 36, 241, 233, 147, 141, 206, 178, 16, 36, 241, 233, 149, 141, 206, + 178, 16, 36, 241, 233, 164, 141, 206, 178, 16, 36, 241, 233, 187, 141, + 206, 178, 16, 36, 241, 233, 210, 135, 141, 206, 178, 16, 36, 241, 233, + 192, 141, 206, 178, 16, 36, 241, 233, 219, 113, 141, 206, 178, 16, 36, + 241, 233, 206, 166, 141, 206, 178, 16, 36, 241, 233, 238, 199, 141, 206, + 178, 16, 36, 241, 233, 204, 164, 141, 206, 178, 16, 36, 241, 233, 206, + 69, 141, 206, 178, 16, 36, 241, 233, 236, 223, 141, 206, 178, 16, 36, + 241, 233, 237, 108, 141, 206, 178, 16, 36, 241, 233, 209, 100, 141, 206, + 178, 16, 36, 241, 233, 210, 132, 141, 206, 178, 16, 36, 241, 233, 238, + 229, 141, 206, 178, 16, 36, 241, 233, 219, 110, 141, 206, 178, 16, 36, + 241, 233, 204, 159, 141, 206, 178, 16, 36, 241, 233, 204, 153, 141, 206, + 178, 16, 36, 241, 233, 204, 148, 141, 206, 178, 16, 36, 241, 233, 204, + 150, 141, 206, 178, 16, 36, 241, 233, 204, 155, 141, 206, 178, 16, 36, + 241, 233, 204, 156, 141, 206, 178, 16, 36, 241, 233, 204, 151, 141, 206, + 178, 16, 36, 241, 233, 204, 152, 141, 206, 178, 16, 36, 241, 233, 204, + 158, 141, 206, 178, 16, 36, 241, 233, 204, 154, 141, 206, 178, 16, 36, + 241, 233, 206, 67, 141, 206, 178, 16, 36, 241, 233, 206, 66, 52, 236, 71, + 234, 88, 36, 206, 107, 242, 247, 234, 123, 234, 88, 36, 206, 107, 213, + 183, 239, 17, 234, 88, 36, 241, 46, 250, 156, 206, 107, 248, 242, 234, + 88, 36, 199, 224, 237, 7, 234, 88, 36, 201, 106, 234, 88, 36, 243, 64, + 234, 88, 36, 206, 107, 250, 213, 234, 88, 36, 233, 198, 205, 182, 234, + 88, 36, 4, 206, 245, 234, 88, 36, 205, 110, 234, 88, 36, 216, 71, 234, + 88, 36, 208, 111, 234, 88, 36, 237, 131, 234, 88, 36, 235, 69, 215, 68, + 234, 88, 36, 221, 128, 234, 88, 36, 238, 151, 234, 88, 36, 237, 8, 234, + 88, 36, 200, 236, 217, 79, 206, 107, 241, 171, 234, 88, 36, 251, 7, 234, + 88, 36, 243, 43, 234, 88, 36, 248, 150, 206, 37, 234, 88, 36, 235, 89, + 234, 88, 36, 208, 208, 251, 26, 234, 88, 36, 213, 109, 234, 88, 36, 228, + 79, 234, 88, 36, 235, 69, 206, 245, 234, 88, 36, 221, 59, 243, 14, 234, + 88, 36, 235, 69, 215, 22, 234, 88, 36, 206, 107, 252, 0, 201, 82, 234, + 88, 36, 206, 107, 246, 118, 237, 77, 234, 88, 36, 228, 93, 234, 88, 36, + 239, 114, 234, 88, 36, 213, 112, 234, 88, 36, 235, 69, 215, 51, 234, 88, + 36, 214, 254, 234, 88, 36, 241, 249, 76, 206, 107, 224, 196, 234, 88, 36, + 206, 107, 237, 169, 234, 88, 36, 217, 39, 234, 88, 36, 217, 134, 234, 88, + 36, 241, 141, 234, 88, 36, 241, 163, 234, 88, 36, 228, 108, 234, 88, 36, + 248, 60, 234, 88, 36, 246, 72, 205, 186, 222, 59, 234, 88, 36, 236, 40, + 205, 182, 234, 88, 36, 214, 196, 203, 217, 234, 88, 36, 217, 38, 234, 88, + 36, 206, 107, 201, 52, 234, 88, 36, 213, 100, 234, 88, 36, 206, 107, 247, + 106, 234, 88, 36, 206, 107, 250, 209, 206, 31, 234, 88, 36, 206, 107, + 227, 2, 208, 83, 221, 63, 234, 88, 36, 241, 108, 234, 88, 36, 206, 107, + 222, 142, 222, 197, 234, 88, 36, 252, 1, 234, 88, 36, 206, 107, 201, 99, + 234, 88, 36, 206, 107, 235, 253, 201, 16, 234, 88, 36, 206, 107, 227, + 149, 225, 96, 234, 88, 36, 240, 252, 234, 88, 36, 224, 183, 234, 88, 36, + 228, 82, 205, 36, 234, 88, 36, 4, 215, 22, 234, 88, 36, 251, 194, 246, + 63, 234, 88, 36, 248, 245, 246, 63, 11, 5, 228, 12, 11, 5, 228, 4, 11, 5, + 70, 11, 5, 228, 38, 11, 5, 228, 176, 11, 5, 228, 159, 11, 5, 228, 178, + 11, 5, 228, 177, 11, 5, 250, 155, 11, 5, 250, 114, 11, 5, 62, 11, 5, 251, + 28, 11, 5, 203, 229, 11, 5, 203, 232, 11, 5, 203, 230, 11, 5, 217, 11, + 11, 5, 216, 235, 11, 5, 74, 11, 5, 217, 54, 11, 5, 238, 48, 11, 5, 72, + 11, 5, 200, 216, 11, 5, 248, 152, 11, 5, 248, 148, 11, 5, 248, 188, 11, + 5, 248, 163, 11, 5, 248, 177, 11, 5, 248, 176, 11, 5, 248, 179, 11, 5, + 248, 178, 11, 5, 249, 55, 11, 5, 249, 47, 11, 5, 249, 136, 11, 5, 249, + 78, 11, 5, 248, 6, 11, 5, 248, 10, 11, 5, 248, 7, 11, 5, 248, 97, 11, 5, + 248, 78, 11, 5, 248, 124, 11, 5, 248, 103, 11, 5, 248, 203, 11, 5, 249, + 8, 11, 5, 248, 215, 11, 5, 247, 246, 11, 5, 247, 241, 11, 5, 248, 36, 11, + 5, 248, 5, 11, 5, 247, 254, 11, 5, 248, 3, 11, 5, 247, 229, 11, 5, 247, + 227, 11, 5, 247, 234, 11, 5, 247, 232, 11, 5, 247, 230, 11, 5, 247, 231, + 11, 5, 215, 142, 11, 5, 215, 138, 11, 5, 215, 204, 11, 5, 215, 154, 11, + 5, 215, 170, 11, 5, 215, 197, 11, 5, 215, 193, 11, 5, 216, 94, 11, 5, + 216, 83, 11, 5, 172, 11, 5, 216, 135, 11, 5, 214, 206, 11, 5, 214, 208, + 11, 5, 214, 207, 11, 5, 215, 61, 11, 5, 215, 49, 11, 5, 215, 106, 11, 5, + 215, 77, 11, 5, 214, 192, 11, 5, 214, 188, 11, 5, 214, 224, 11, 5, 214, + 205, 11, 5, 214, 197, 11, 5, 214, 203, 11, 5, 214, 171, 11, 5, 214, 170, + 11, 5, 214, 175, 11, 5, 214, 174, 11, 5, 214, 172, 11, 5, 214, 173, 11, + 5, 249, 29, 11, 5, 249, 28, 11, 5, 249, 35, 11, 5, 249, 30, 11, 5, 249, + 32, 11, 5, 249, 31, 11, 5, 249, 34, 11, 5, 249, 33, 11, 5, 249, 41, 11, + 5, 249, 40, 11, 5, 249, 44, 11, 5, 249, 42, 11, 5, 249, 20, 11, 5, 249, + 22, 11, 5, 249, 21, 11, 5, 249, 25, 11, 5, 249, 24, 11, 5, 249, 27, 11, + 5, 249, 26, 11, 5, 249, 36, 11, 5, 249, 39, 11, 5, 249, 37, 11, 5, 249, + 16, 11, 5, 249, 15, 11, 5, 249, 23, 11, 5, 249, 19, 11, 5, 249, 17, 11, + 5, 249, 18, 11, 5, 249, 12, 11, 5, 249, 11, 11, 5, 249, 14, 11, 5, 249, + 13, 11, 5, 220, 97, 11, 5, 220, 96, 11, 5, 220, 102, 11, 5, 220, 98, 11, + 5, 220, 99, 11, 5, 220, 101, 11, 5, 220, 100, 11, 5, 220, 105, 11, 5, + 220, 104, 11, 5, 220, 107, 11, 5, 220, 106, 11, 5, 220, 93, 11, 5, 220, + 92, 11, 5, 220, 95, 11, 5, 220, 94, 11, 5, 220, 86, 11, 5, 220, 85, 11, + 5, 220, 90, 11, 5, 220, 89, 11, 5, 220, 87, 11, 5, 220, 88, 11, 5, 220, + 80, 11, 5, 220, 79, 11, 5, 220, 84, 11, 5, 220, 83, 11, 5, 220, 81, 11, + 5, 220, 82, 11, 5, 233, 251, 11, 5, 233, 250, 11, 5, 234, 0, 11, 5, 233, + 252, 11, 5, 233, 253, 11, 5, 233, 255, 11, 5, 233, 254, 11, 5, 234, 3, + 11, 5, 234, 2, 11, 5, 234, 5, 11, 5, 234, 4, 11, 5, 233, 242, 11, 5, 233, + 244, 11, 5, 233, 243, 11, 5, 233, 247, 11, 5, 233, 246, 11, 5, 233, 249, + 11, 5, 233, 248, 11, 5, 233, 238, 11, 5, 233, 237, 11, 5, 233, 245, 11, + 5, 233, 241, 11, 5, 233, 239, 11, 5, 233, 240, 11, 5, 233, 232, 11, 5, + 233, 236, 11, 5, 233, 235, 11, 5, 233, 233, 11, 5, 233, 234, 11, 5, 221, + 147, 11, 5, 221, 146, 11, 5, 221, 211, 11, 5, 221, 153, 11, 5, 221, 183, + 11, 5, 221, 201, 11, 5, 221, 199, 11, 5, 222, 127, 11, 5, 222, 122, 11, + 5, 178, 11, 5, 222, 164, 11, 5, 221, 8, 11, 5, 221, 7, 11, 5, 221, 11, + 11, 5, 221, 9, 11, 5, 221, 73, 11, 5, 221, 47, 11, 5, 221, 136, 11, 5, + 221, 79, 11, 5, 222, 7, 11, 5, 222, 76, 11, 5, 220, 244, 11, 5, 220, 240, + 11, 5, 221, 41, 11, 5, 221, 4, 11, 5, 220, 253, 11, 5, 221, 2, 11, 5, + 220, 217, 11, 5, 220, 216, 11, 5, 220, 222, 11, 5, 220, 219, 11, 5, 237, + 64, 11, 5, 237, 58, 11, 5, 237, 112, 11, 5, 237, 79, 11, 5, 237, 160, 11, + 5, 237, 151, 11, 5, 237, 195, 11, 5, 237, 165, 11, 5, 236, 220, 11, 5, + 237, 13, 11, 5, 236, 250, 11, 5, 236, 172, 11, 5, 236, 171, 11, 5, 236, + 189, 11, 5, 236, 177, 11, 5, 236, 175, 11, 5, 236, 176, 11, 5, 236, 159, + 11, 5, 236, 158, 11, 5, 236, 162, 11, 5, 236, 160, 11, 5, 202, 200, 11, + 5, 202, 195, 11, 5, 202, 234, 11, 5, 202, 209, 11, 5, 202, 223, 11, 5, + 202, 220, 11, 5, 202, 226, 11, 5, 202, 225, 11, 5, 203, 67, 11, 5, 203, + 62, 11, 5, 203, 90, 11, 5, 203, 79, 11, 5, 202, 175, 11, 5, 202, 171, 11, + 5, 202, 193, 11, 5, 202, 177, 11, 5, 202, 237, 11, 5, 203, 48, 11, 5, + 201, 160, 11, 5, 201, 158, 11, 5, 201, 166, 11, 5, 201, 163, 11, 5, 201, + 161, 11, 5, 201, 162, 11, 5, 201, 151, 11, 5, 201, 150, 11, 5, 201, 155, + 11, 5, 201, 154, 11, 5, 201, 152, 11, 5, 201, 153, 11, 5, 240, 245, 11, + 5, 240, 232, 11, 5, 241, 76, 11, 5, 241, 16, 11, 5, 241, 51, 11, 5, 241, + 56, 11, 5, 241, 55, 11, 5, 241, 240, 11, 5, 241, 234, 11, 5, 242, 58, 11, + 5, 242, 4, 11, 5, 239, 119, 11, 5, 239, 120, 11, 5, 240, 182, 11, 5, 239, + 164, 11, 5, 240, 211, 11, 5, 240, 184, 11, 5, 241, 106, 11, 5, 241, 175, + 11, 5, 241, 127, 11, 5, 239, 110, 11, 5, 239, 108, 11, 5, 239, 137, 11, + 5, 239, 118, 11, 5, 239, 113, 11, 5, 239, 116, 11, 5, 205, 213, 11, 5, + 205, 205, 11, 5, 206, 15, 11, 5, 205, 223, 11, 5, 206, 5, 11, 5, 206, 7, + 11, 5, 206, 6, 11, 5, 206, 226, 11, 5, 206, 212, 11, 5, 207, 36, 11, 5, + 206, 236, 11, 5, 204, 196, 11, 5, 204, 195, 11, 5, 204, 198, 11, 5, 204, + 197, 11, 5, 205, 144, 11, 5, 205, 134, 11, 5, 138, 11, 5, 205, 157, 11, + 5, 206, 128, 11, 5, 206, 201, 11, 5, 206, 153, 11, 5, 204, 179, 11, 5, + 204, 174, 11, 5, 204, 215, 11, 5, 204, 194, 11, 5, 204, 180, 11, 5, 204, + 192, 11, 5, 241, 192, 11, 5, 241, 191, 11, 5, 241, 197, 11, 5, 241, 193, + 11, 5, 241, 194, 11, 5, 241, 196, 11, 5, 241, 195, 11, 5, 241, 213, 11, + 5, 241, 212, 11, 5, 241, 220, 11, 5, 241, 214, 11, 5, 241, 182, 11, 5, + 241, 184, 11, 5, 241, 183, 11, 5, 241, 187, 11, 5, 241, 186, 11, 5, 241, + 190, 11, 5, 241, 188, 11, 5, 241, 205, 11, 5, 241, 208, 11, 5, 241, 206, + 11, 5, 241, 178, 11, 5, 241, 177, 11, 5, 241, 185, 11, 5, 241, 181, 11, + 5, 241, 179, 11, 5, 241, 180, 11, 5, 220, 53, 11, 5, 220, 52, 11, 5, 220, + 60, 11, 5, 220, 55, 11, 5, 220, 56, 11, 5, 220, 57, 11, 5, 220, 69, 11, + 5, 220, 68, 11, 5, 220, 75, 11, 5, 220, 70, 11, 5, 220, 45, 11, 5, 220, + 44, 11, 5, 220, 51, 11, 5, 220, 46, 11, 5, 220, 61, 11, 5, 220, 67, 11, + 5, 220, 65, 11, 5, 220, 37, 11, 5, 220, 36, 11, 5, 220, 42, 11, 5, 220, + 40, 11, 5, 220, 38, 11, 5, 220, 39, 11, 5, 233, 217, 11, 5, 233, 216, 11, + 5, 233, 223, 11, 5, 233, 218, 11, 5, 233, 220, 11, 5, 233, 219, 11, 5, + 233, 222, 11, 5, 233, 221, 11, 5, 233, 229, 11, 5, 233, 227, 11, 5, 233, + 231, 11, 5, 233, 230, 11, 5, 233, 210, 11, 5, 233, 211, 11, 5, 233, 214, + 11, 5, 233, 213, 11, 5, 233, 215, 11, 5, 233, 224, 11, 5, 233, 226, 11, + 5, 233, 225, 11, 5, 233, 209, 11, 5, 219, 102, 11, 5, 219, 100, 11, 5, + 219, 150, 11, 5, 219, 105, 11, 5, 219, 132, 11, 5, 219, 146, 11, 5, 219, + 145, 11, 5, 220, 111, 11, 5, 188, 11, 5, 220, 127, 11, 5, 218, 81, 11, 5, + 218, 83, 11, 5, 218, 82, 11, 5, 218, 214, 11, 5, 218, 199, 11, 5, 218, + 241, 11, 5, 218, 225, 11, 5, 220, 3, 11, 5, 220, 34, 11, 5, 220, 19, 11, + 5, 218, 76, 11, 5, 218, 72, 11, 5, 218, 133, 11, 5, 218, 80, 11, 5, 218, + 78, 11, 5, 218, 79, 11, 5, 234, 26, 11, 5, 234, 25, 11, 5, 234, 31, 11, + 5, 234, 27, 11, 5, 234, 28, 11, 5, 234, 30, 11, 5, 234, 29, 11, 5, 234, + 37, 11, 5, 234, 35, 11, 5, 234, 39, 11, 5, 234, 38, 11, 5, 234, 18, 11, + 5, 234, 20, 11, 5, 234, 19, 11, 5, 234, 22, 11, 5, 234, 24, 11, 5, 234, + 23, 11, 5, 234, 32, 11, 5, 234, 34, 11, 5, 234, 33, 11, 5, 234, 14, 11, + 5, 234, 13, 11, 5, 234, 21, 11, 5, 234, 17, 11, 5, 234, 15, 11, 5, 234, + 16, 11, 5, 234, 8, 11, 5, 234, 7, 11, 5, 234, 12, 11, 5, 234, 11, 11, 5, + 234, 9, 11, 5, 234, 10, 11, 5, 224, 152, 11, 5, 224, 144, 11, 5, 224, + 210, 11, 5, 224, 162, 11, 5, 224, 201, 11, 5, 224, 200, 11, 5, 224, 204, + 11, 5, 224, 202, 11, 5, 225, 63, 11, 5, 225, 51, 11, 5, 194, 11, 5, 225, + 74, 11, 5, 224, 20, 11, 5, 224, 19, 11, 5, 224, 22, 11, 5, 224, 21, 11, + 5, 224, 65, 11, 5, 224, 51, 11, 5, 224, 110, 11, 5, 224, 71, 11, 5, 224, + 227, 11, 5, 225, 40, 11, 5, 224, 244, 11, 5, 224, 14, 11, 5, 224, 12, 11, + 5, 224, 42, 11, 5, 224, 18, 11, 5, 224, 16, 11, 5, 224, 17, 11, 5, 223, + 248, 11, 5, 223, 247, 11, 5, 224, 2, 11, 5, 223, 251, 11, 5, 223, 249, + 11, 5, 223, 250, 11, 5, 235, 134, 11, 5, 235, 133, 11, 5, 235, 161, 11, + 5, 235, 145, 11, 5, 235, 153, 11, 5, 235, 152, 11, 5, 235, 155, 11, 5, + 235, 154, 11, 5, 236, 42, 11, 5, 236, 37, 11, 5, 236, 89, 11, 5, 236, 52, + 11, 5, 235, 25, 11, 5, 235, 24, 11, 5, 235, 27, 11, 5, 235, 26, 11, 5, + 235, 94, 11, 5, 235, 92, 11, 5, 235, 116, 11, 5, 235, 103, 11, 5, 235, + 239, 11, 5, 235, 237, 11, 5, 236, 15, 11, 5, 235, 250, 11, 5, 235, 14, + 11, 5, 235, 13, 11, 5, 235, 50, 11, 5, 235, 23, 11, 5, 235, 15, 11, 5, + 235, 22, 11, 5, 226, 127, 11, 5, 226, 123, 11, 5, 226, 163, 11, 5, 226, + 141, 11, 5, 226, 152, 11, 5, 226, 156, 11, 5, 226, 154, 11, 5, 227, 33, + 11, 5, 227, 16, 11, 5, 161, 11, 5, 227, 60, 11, 5, 225, 249, 11, 5, 225, + 254, 11, 5, 225, 251, 11, 5, 226, 56, 11, 5, 226, 51, 11, 5, 226, 88, 11, + 5, 226, 63, 11, 5, 226, 233, 11, 5, 226, 216, 11, 5, 227, 8, 11, 5, 226, + 237, 11, 5, 225, 237, 11, 5, 225, 233, 11, 5, 226, 15, 11, 5, 225, 248, + 11, 5, 225, 241, 11, 5, 225, 245, 11, 5, 235, 221, 11, 5, 235, 220, 11, + 5, 235, 225, 11, 5, 235, 222, 11, 5, 235, 224, 11, 5, 235, 223, 11, 5, + 235, 232, 11, 5, 235, 231, 11, 5, 235, 235, 11, 5, 235, 233, 11, 5, 235, + 212, 11, 5, 235, 211, 11, 5, 235, 214, 11, 5, 235, 213, 11, 5, 235, 217, + 11, 5, 235, 216, 11, 5, 235, 219, 11, 5, 235, 218, 11, 5, 235, 227, 11, + 5, 235, 226, 11, 5, 235, 230, 11, 5, 235, 228, 11, 5, 235, 207, 11, 5, + 235, 206, 11, 5, 235, 215, 11, 5, 235, 210, 11, 5, 235, 208, 11, 5, 235, + 209, 11, 5, 221, 230, 11, 5, 221, 231, 11, 5, 221, 249, 11, 5, 221, 248, + 11, 5, 221, 251, 11, 5, 221, 250, 11, 5, 221, 221, 11, 5, 221, 223, 11, + 5, 221, 222, 11, 5, 221, 226, 11, 5, 221, 225, 11, 5, 221, 228, 11, 5, + 221, 227, 11, 5, 221, 232, 11, 5, 221, 234, 11, 5, 221, 233, 11, 5, 221, + 217, 11, 5, 221, 216, 11, 5, 221, 224, 11, 5, 221, 220, 11, 5, 221, 218, + 11, 5, 221, 219, 11, 5, 233, 47, 11, 5, 233, 46, 11, 5, 233, 53, 11, 5, + 233, 48, 11, 5, 233, 50, 11, 5, 233, 49, 11, 5, 233, 52, 11, 5, 233, 51, + 11, 5, 233, 58, 11, 5, 233, 57, 11, 5, 233, 60, 11, 5, 233, 59, 11, 5, + 233, 39, 11, 5, 233, 38, 11, 5, 233, 41, 11, 5, 233, 40, 11, 5, 233, 43, + 11, 5, 233, 42, 11, 5, 233, 45, 11, 5, 233, 44, 11, 5, 233, 54, 11, 5, + 233, 56, 11, 5, 233, 55, 11, 5, 219, 198, 11, 5, 219, 200, 11, 5, 219, + 199, 11, 5, 219, 243, 11, 5, 219, 241, 11, 5, 219, 253, 11, 5, 219, 246, + 11, 5, 219, 160, 11, 5, 219, 159, 11, 5, 219, 161, 11, 5, 219, 170, 11, + 5, 219, 167, 11, 5, 219, 178, 11, 5, 219, 172, 11, 5, 219, 234, 11, 5, + 219, 240, 11, 5, 219, 236, 11, 5, 234, 45, 11, 5, 234, 60, 11, 5, 234, + 69, 11, 5, 234, 157, 11, 5, 234, 146, 11, 5, 144, 11, 5, 234, 168, 11, 5, + 233, 76, 11, 5, 233, 75, 11, 5, 233, 78, 11, 5, 233, 77, 11, 5, 233, 117, + 11, 5, 233, 108, 11, 5, 233, 207, 11, 5, 233, 180, 11, 5, 234, 90, 11, 5, + 234, 139, 11, 5, 234, 102, 11, 5, 201, 85, 11, 5, 201, 70, 11, 5, 201, + 114, 11, 5, 201, 96, 11, 5, 200, 205, 11, 5, 200, 207, 11, 5, 200, 206, + 11, 5, 200, 229, 11, 5, 201, 0, 11, 5, 200, 239, 11, 5, 201, 43, 11, 5, + 201, 64, 11, 5, 201, 49, 11, 5, 199, 21, 11, 5, 199, 20, 11, 5, 199, 36, + 11, 5, 199, 24, 11, 5, 199, 29, 11, 5, 199, 31, 11, 5, 199, 30, 11, 5, + 199, 97, 11, 5, 199, 94, 11, 5, 199, 114, 11, 5, 199, 101, 11, 5, 198, + 252, 11, 5, 198, 254, 11, 5, 198, 253, 11, 5, 199, 10, 11, 5, 199, 9, 11, + 5, 199, 14, 11, 5, 199, 11, 11, 5, 199, 79, 11, 5, 199, 89, 11, 5, 199, + 83, 11, 5, 198, 248, 11, 5, 198, 247, 11, 5, 199, 3, 11, 5, 198, 251, 11, + 5, 198, 249, 11, 5, 198, 250, 11, 5, 198, 234, 11, 5, 198, 233, 11, 5, + 198, 239, 11, 5, 198, 237, 11, 5, 198, 235, 11, 5, 198, 236, 11, 5, 246, + 144, 11, 5, 246, 137, 11, 5, 246, 173, 11, 5, 246, 157, 11, 5, 246, 170, + 11, 5, 246, 164, 11, 5, 246, 172, 11, 5, 246, 171, 11, 5, 247, 111, 11, + 5, 247, 103, 11, 5, 247, 190, 11, 5, 247, 144, 11, 5, 242, 204, 11, 5, + 242, 206, 11, 5, 242, 205, 11, 5, 243, 8, 11, 5, 242, 253, 11, 5, 246, + 91, 11, 5, 243, 25, 11, 5, 247, 40, 11, 5, 247, 76, 11, 5, 247, 45, 11, + 5, 242, 179, 11, 5, 242, 177, 11, 5, 242, 214, 11, 5, 242, 202, 11, 5, + 242, 185, 11, 5, 242, 199, 11, 5, 242, 156, 11, 5, 242, 155, 11, 5, 242, + 168, 11, 5, 242, 162, 11, 5, 242, 157, 11, 5, 242, 159, 11, 5, 198, 217, + 11, 5, 198, 216, 11, 5, 198, 223, 11, 5, 198, 218, 11, 5, 198, 220, 11, + 5, 198, 219, 11, 5, 198, 222, 11, 5, 198, 221, 11, 5, 198, 229, 11, 5, + 198, 228, 11, 5, 198, 232, 11, 5, 198, 230, 11, 5, 198, 213, 11, 5, 198, + 215, 11, 5, 198, 214, 11, 5, 198, 224, 11, 5, 198, 227, 11, 5, 198, 225, + 11, 5, 198, 206, 11, 5, 198, 210, 11, 5, 198, 209, 11, 5, 198, 207, 11, + 5, 198, 208, 11, 5, 198, 200, 11, 5, 198, 199, 11, 5, 198, 205, 11, 5, + 198, 203, 11, 5, 198, 201, 11, 5, 198, 202, 11, 5, 217, 250, 11, 5, 217, + 249, 11, 5, 217, 255, 11, 5, 217, 251, 11, 5, 217, 252, 11, 5, 217, 254, + 11, 5, 217, 253, 11, 5, 218, 4, 11, 5, 218, 3, 11, 5, 218, 7, 11, 5, 218, + 6, 11, 5, 217, 243, 11, 5, 217, 244, 11, 5, 217, 247, 11, 5, 217, 248, + 11, 5, 218, 0, 11, 5, 218, 2, 11, 5, 217, 238, 11, 5, 217, 246, 11, 5, + 217, 242, 11, 5, 217, 239, 11, 5, 217, 240, 11, 5, 217, 233, 11, 5, 217, + 232, 11, 5, 217, 237, 11, 5, 217, 236, 11, 5, 217, 234, 11, 5, 217, 235, + 11, 5, 209, 108, 11, 5, 187, 11, 5, 209, 182, 11, 5, 209, 111, 11, 5, + 209, 169, 11, 5, 209, 172, 11, 5, 209, 170, 11, 5, 211, 251, 11, 5, 211, + 237, 11, 5, 212, 64, 11, 5, 212, 3, 11, 5, 207, 218, 11, 5, 207, 220, 11, + 5, 207, 219, 11, 5, 209, 4, 11, 5, 208, 249, 11, 5, 209, 29, 11, 5, 209, + 8, 11, 5, 210, 127, 11, 5, 211, 202, 11, 5, 210, 156, 11, 5, 207, 195, + 11, 5, 207, 192, 11, 5, 208, 24, 11, 5, 207, 217, 11, 5, 207, 199, 11, 5, + 207, 207, 11, 5, 207, 97, 11, 5, 207, 96, 11, 5, 207, 165, 11, 5, 207, + 105, 11, 5, 207, 99, 11, 5, 207, 104, 11, 5, 208, 141, 11, 5, 208, 140, + 11, 5, 208, 147, 11, 5, 208, 142, 11, 5, 208, 144, 11, 5, 208, 146, 11, + 5, 208, 145, 11, 5, 208, 156, 11, 5, 208, 154, 11, 5, 208, 179, 11, 5, + 208, 157, 11, 5, 208, 136, 11, 5, 208, 135, 11, 5, 208, 139, 11, 5, 208, + 137, 11, 5, 208, 150, 11, 5, 208, 153, 11, 5, 208, 151, 11, 5, 208, 132, + 11, 5, 208, 130, 11, 5, 208, 134, 11, 5, 208, 133, 11, 5, 208, 125, 11, + 5, 208, 124, 11, 5, 208, 129, 11, 5, 208, 128, 11, 5, 208, 126, 11, 5, + 208, 127, 11, 5, 199, 72, 11, 5, 199, 71, 11, 5, 199, 77, 11, 5, 199, 74, + 11, 5, 199, 51, 11, 5, 199, 53, 11, 5, 199, 52, 11, 5, 199, 56, 11, 5, + 199, 55, 11, 5, 199, 60, 11, 5, 199, 57, 11, 5, 199, 65, 11, 5, 199, 64, + 11, 5, 199, 68, 11, 5, 199, 66, 11, 5, 199, 47, 11, 5, 199, 46, 11, 5, + 199, 54, 11, 5, 199, 50, 11, 5, 199, 48, 11, 5, 199, 49, 11, 5, 199, 39, + 11, 5, 199, 38, 11, 5, 199, 43, 11, 5, 199, 42, 11, 5, 199, 40, 11, 5, + 199, 41, 11, 5, 247, 14, 11, 5, 247, 10, 11, 5, 247, 37, 11, 5, 247, 23, + 11, 5, 246, 188, 11, 5, 246, 187, 11, 5, 246, 190, 11, 5, 246, 189, 11, + 5, 246, 203, 11, 5, 246, 202, 11, 5, 246, 210, 11, 5, 246, 205, 11, 5, + 246, 241, 11, 5, 246, 239, 11, 5, 247, 8, 11, 5, 246, 249, 11, 5, 246, + 182, 11, 5, 246, 192, 11, 5, 246, 186, 11, 5, 246, 183, 11, 5, 246, 185, + 11, 5, 246, 175, 11, 5, 246, 174, 11, 5, 246, 179, 11, 5, 246, 178, 11, + 5, 246, 176, 11, 5, 246, 177, 11, 5, 212, 211, 11, 5, 212, 215, 11, 5, + 212, 193, 11, 5, 212, 194, 11, 5, 212, 198, 11, 5, 212, 197, 11, 5, 212, + 201, 11, 5, 212, 199, 11, 5, 212, 205, 11, 5, 212, 204, 11, 5, 212, 210, + 11, 5, 212, 206, 11, 5, 212, 189, 11, 5, 212, 187, 11, 5, 212, 195, 11, + 5, 212, 192, 11, 5, 212, 190, 11, 5, 212, 191, 11, 5, 212, 182, 11, 5, + 212, 181, 11, 5, 212, 186, 11, 5, 212, 185, 11, 5, 212, 183, 11, 5, 212, + 184, 11, 5, 218, 194, 11, 5, 218, 193, 11, 5, 218, 196, 11, 5, 218, 195, + 11, 5, 218, 185, 11, 5, 218, 187, 11, 5, 218, 186, 11, 5, 218, 189, 11, + 5, 218, 188, 11, 5, 218, 192, 11, 5, 218, 191, 11, 5, 218, 179, 11, 5, + 218, 178, 11, 5, 218, 184, 11, 5, 218, 182, 11, 5, 218, 180, 11, 5, 218, + 181, 11, 5, 218, 173, 11, 5, 218, 172, 11, 5, 218, 177, 11, 5, 218, 176, + 11, 5, 218, 174, 11, 5, 218, 175, 11, 5, 210, 75, 11, 5, 210, 70, 11, 5, + 210, 114, 11, 5, 210, 87, 11, 5, 209, 209, 11, 5, 209, 211, 11, 5, 209, + 210, 11, 5, 209, 234, 11, 5, 209, 230, 11, 5, 210, 8, 11, 5, 209, 254, + 11, 5, 210, 43, 11, 5, 210, 36, 11, 5, 210, 65, 11, 5, 210, 52, 11, 5, + 209, 205, 11, 5, 209, 202, 11, 5, 209, 220, 11, 5, 209, 208, 11, 5, 209, + 206, 11, 5, 209, 207, 11, 5, 209, 185, 11, 5, 209, 184, 11, 5, 209, 191, + 11, 5, 209, 188, 11, 5, 209, 186, 11, 5, 209, 187, 11, 5, 213, 204, 11, + 5, 213, 198, 11, 5, 213, 252, 11, 5, 213, 210, 11, 5, 212, 151, 11, 5, + 212, 153, 11, 5, 212, 152, 11, 5, 212, 229, 11, 5, 212, 217, 11, 5, 213, + 1, 11, 5, 212, 233, 11, 5, 213, 98, 11, 5, 213, 190, 11, 5, 213, 137, 11, + 5, 212, 144, 11, 5, 212, 141, 11, 5, 212, 175, 11, 5, 212, 150, 11, 5, + 212, 146, 11, 5, 212, 147, 11, 5, 212, 126, 11, 5, 212, 125, 11, 5, 212, + 131, 11, 5, 212, 129, 11, 5, 212, 127, 11, 5, 212, 128, 11, 5, 227, 196, + 11, 5, 227, 195, 11, 5, 227, 207, 11, 5, 227, 197, 11, 5, 227, 203, 11, + 5, 227, 202, 11, 5, 227, 205, 11, 5, 227, 204, 11, 5, 227, 136, 11, 5, + 227, 135, 11, 5, 227, 138, 11, 5, 227, 137, 11, 5, 227, 153, 11, 5, 227, + 151, 11, 5, 227, 166, 11, 5, 227, 155, 11, 5, 227, 129, 11, 5, 227, 127, + 11, 5, 227, 147, 11, 5, 227, 134, 11, 5, 227, 131, 11, 5, 227, 132, 11, + 5, 227, 121, 11, 5, 227, 120, 11, 5, 227, 125, 11, 5, 227, 124, 11, 5, + 227, 122, 11, 5, 227, 123, 11, 5, 214, 113, 11, 5, 214, 111, 11, 5, 214, + 121, 11, 5, 214, 114, 11, 5, 214, 118, 11, 5, 214, 117, 11, 5, 214, 120, + 11, 5, 214, 119, 11, 5, 214, 64, 11, 5, 214, 61, 11, 5, 214, 66, 11, 5, + 214, 65, 11, 5, 214, 100, 11, 5, 214, 99, 11, 5, 214, 109, 11, 5, 214, + 103, 11, 5, 214, 56, 11, 5, 214, 52, 11, 5, 214, 97, 11, 5, 214, 60, 11, + 5, 214, 58, 11, 5, 214, 59, 11, 5, 214, 36, 11, 5, 214, 34, 11, 5, 214, + 46, 11, 5, 214, 39, 11, 5, 214, 37, 11, 5, 214, 38, 11, 5, 227, 185, 11, + 5, 227, 184, 11, 5, 227, 191, 11, 5, 227, 186, 11, 5, 227, 188, 11, 5, + 227, 187, 11, 5, 227, 190, 11, 5, 227, 189, 11, 5, 227, 176, 11, 5, 227, + 178, 11, 5, 227, 177, 11, 5, 227, 181, 11, 5, 227, 180, 11, 5, 227, 183, + 11, 5, 227, 182, 11, 5, 227, 172, 11, 5, 227, 171, 11, 5, 227, 179, 11, + 5, 227, 175, 11, 5, 227, 173, 11, 5, 227, 174, 11, 5, 227, 168, 11, 5, + 227, 167, 11, 5, 227, 170, 11, 5, 227, 169, 11, 5, 219, 75, 11, 5, 219, + 74, 11, 5, 219, 82, 11, 5, 219, 76, 11, 5, 219, 78, 11, 5, 219, 77, 11, + 5, 219, 81, 11, 5, 219, 79, 11, 5, 219, 64, 11, 5, 219, 65, 11, 5, 219, + 70, 11, 5, 219, 69, 11, 5, 219, 73, 11, 5, 219, 71, 11, 5, 219, 59, 11, + 5, 219, 68, 11, 5, 219, 63, 11, 5, 219, 60, 11, 5, 219, 61, 11, 5, 219, + 54, 11, 5, 219, 53, 11, 5, 219, 58, 11, 5, 219, 57, 11, 5, 219, 55, 11, + 5, 219, 56, 11, 5, 218, 29, 11, 5, 218, 28, 11, 5, 218, 41, 11, 5, 218, + 33, 11, 5, 218, 38, 11, 5, 218, 37, 11, 5, 218, 40, 11, 5, 218, 39, 11, + 5, 218, 14, 11, 5, 218, 16, 11, 5, 218, 15, 11, 5, 218, 21, 11, 5, 218, + 20, 11, 5, 218, 26, 11, 5, 218, 22, 11, 5, 218, 12, 11, 5, 218, 10, 11, + 5, 218, 19, 11, 5, 218, 13, 11, 5, 200, 161, 11, 5, 200, 160, 11, 5, 200, + 169, 11, 5, 200, 163, 11, 5, 200, 165, 11, 5, 200, 164, 11, 5, 200, 167, + 11, 5, 200, 166, 11, 5, 200, 149, 11, 5, 200, 150, 11, 5, 200, 154, 11, + 5, 200, 153, 11, 5, 200, 159, 11, 5, 200, 157, 11, 5, 200, 127, 11, 5, + 200, 125, 11, 5, 200, 140, 11, 5, 200, 130, 11, 5, 200, 128, 11, 5, 200, + 129, 11, 5, 199, 251, 11, 5, 199, 249, 11, 5, 200, 9, 11, 5, 199, 252, + 11, 5, 200, 3, 11, 5, 200, 2, 11, 5, 200, 6, 11, 5, 200, 4, 11, 5, 199, + 189, 11, 5, 199, 188, 11, 5, 199, 192, 11, 5, 199, 190, 11, 5, 199, 225, + 11, 5, 199, 221, 11, 5, 199, 245, 11, 5, 199, 229, 11, 5, 199, 180, 11, + 5, 199, 176, 11, 5, 199, 211, 11, 5, 199, 187, 11, 5, 199, 183, 11, 5, + 199, 184, 11, 5, 199, 160, 11, 5, 199, 159, 11, 5, 199, 167, 11, 5, 199, + 163, 11, 5, 199, 161, 11, 5, 199, 162, 11, 42, 214, 100, 11, 42, 224, + 210, 11, 42, 226, 127, 11, 42, 218, 33, 11, 42, 242, 162, 11, 42, 208, + 147, 11, 42, 235, 218, 11, 42, 235, 250, 11, 42, 221, 211, 11, 42, 233, + 47, 11, 42, 223, 250, 11, 42, 249, 16, 11, 42, 221, 79, 11, 42, 199, 245, + 11, 42, 214, 192, 11, 42, 233, 41, 11, 42, 206, 226, 11, 42, 236, 89, 11, + 42, 198, 251, 11, 42, 242, 156, 11, 42, 241, 180, 11, 42, 248, 3, 11, 42, + 235, 214, 11, 42, 218, 22, 11, 42, 204, 215, 11, 42, 217, 54, 11, 42, + 227, 172, 11, 42, 199, 10, 11, 42, 214, 171, 11, 42, 233, 249, 11, 42, + 199, 251, 11, 42, 201, 162, 11, 42, 209, 191, 11, 42, 203, 48, 11, 42, + 199, 114, 11, 42, 227, 166, 11, 42, 217, 242, 11, 42, 227, 170, 11, 42, + 235, 94, 11, 42, 227, 190, 11, 42, 201, 0, 11, 42, 239, 137, 11, 42, 209, + 207, 11, 42, 224, 204, 11, 42, 242, 168, 11, 42, 242, 205, 11, 42, 246, + 157, 11, 42, 233, 44, 11, 42, 210, 75, 11, 42, 198, 250, 11, 42, 209, + 254, 11, 42, 247, 8, 11, 42, 198, 220, 11, 42, 220, 101, 11, 42, 227, 8, + 224, 153, 1, 249, 136, 224, 153, 1, 172, 224, 153, 1, 215, 245, 224, 153, + 1, 242, 58, 224, 153, 1, 207, 36, 224, 153, 1, 206, 122, 224, 153, 1, + 236, 89, 224, 153, 1, 161, 224, 153, 1, 226, 207, 224, 153, 1, 227, 248, + 224, 153, 1, 247, 190, 224, 153, 1, 247, 37, 224, 153, 1, 239, 93, 224, + 153, 1, 205, 32, 224, 153, 1, 205, 22, 224, 153, 1, 178, 224, 153, 1, + 188, 224, 153, 1, 194, 224, 153, 1, 212, 64, 224, 153, 1, 199, 77, 224, + 153, 1, 199, 114, 224, 153, 1, 219, 253, 224, 153, 1, 144, 224, 153, 1, + 200, 181, 224, 153, 1, 234, 84, 224, 153, 1, 237, 195, 224, 153, 1, 201, + 114, 224, 153, 1, 210, 114, 224, 153, 1, 183, 224, 153, 1, 235, 199, 224, + 153, 1, 62, 224, 153, 1, 251, 221, 224, 153, 1, 72, 224, 153, 1, 238, 69, + 224, 153, 1, 70, 224, 153, 1, 74, 224, 153, 1, 66, 224, 153, 1, 204, 31, + 224, 153, 1, 204, 25, 224, 153, 1, 217, 121, 224, 153, 1, 150, 220, 221, + 206, 15, 224, 153, 1, 150, 220, 162, 215, 106, 224, 153, 1, 150, 220, + 221, 242, 167, 224, 153, 1, 150, 220, 221, 248, 124, 224, 153, 1, 150, + 220, 221, 188, 224, 153, 1, 150, 220, 221, 227, 216, 224, 153, 214, 212, + 246, 70, 224, 153, 214, 212, 236, 183, 208, 76, 50, 5, 238, 255, 50, 5, + 238, 251, 50, 5, 234, 120, 50, 5, 201, 57, 50, 5, 201, 56, 50, 5, 216, + 61, 50, 5, 248, 195, 50, 5, 248, 252, 50, 5, 222, 102, 50, 5, 226, 45, + 50, 5, 221, 243, 50, 5, 236, 28, 50, 5, 237, 140, 50, 5, 203, 54, 50, 5, + 206, 190, 50, 5, 206, 104, 50, 5, 241, 90, 50, 5, 241, 87, 50, 5, 225, + 32, 50, 5, 213, 167, 50, 5, 241, 161, 50, 5, 220, 66, 50, 5, 211, 190, + 50, 5, 210, 63, 50, 5, 199, 87, 50, 5, 199, 67, 50, 5, 247, 68, 50, 5, + 227, 225, 50, 5, 219, 89, 50, 5, 200, 48, 50, 5, 227, 5, 50, 5, 219, 226, + 50, 5, 236, 7, 50, 5, 222, 64, 50, 5, 220, 29, 50, 5, 218, 49, 50, 5, 70, + 50, 5, 228, 117, 50, 5, 234, 75, 50, 5, 234, 53, 50, 5, 201, 31, 50, 5, + 201, 18, 50, 5, 215, 204, 50, 5, 248, 193, 50, 5, 248, 188, 50, 5, 222, + 95, 50, 5, 226, 42, 50, 5, 221, 240, 50, 5, 236, 24, 50, 5, 237, 112, 50, + 5, 202, 234, 50, 5, 206, 15, 50, 5, 206, 84, 50, 5, 241, 82, 50, 5, 241, + 86, 50, 5, 224, 210, 50, 5, 213, 88, 50, 5, 241, 76, 50, 5, 220, 60, 50, + 5, 209, 182, 50, 5, 210, 33, 50, 5, 199, 36, 50, 5, 199, 63, 50, 5, 246, + 173, 50, 5, 227, 207, 50, 5, 219, 82, 50, 5, 200, 9, 50, 5, 226, 163, 50, + 5, 219, 218, 50, 5, 235, 161, 50, 5, 221, 211, 50, 5, 219, 150, 50, 5, + 218, 41, 50, 5, 62, 50, 5, 251, 85, 50, 5, 219, 248, 50, 5, 144, 50, 5, + 234, 202, 50, 5, 201, 114, 50, 5, 201, 100, 50, 5, 172, 50, 5, 248, 200, + 50, 5, 249, 136, 50, 5, 222, 110, 50, 5, 226, 50, 50, 5, 226, 48, 50, 5, + 221, 247, 50, 5, 236, 32, 50, 5, 237, 195, 50, 5, 203, 90, 50, 5, 207, + 36, 50, 5, 206, 122, 50, 5, 241, 100, 50, 5, 241, 89, 50, 5, 194, 50, 5, + 213, 252, 50, 5, 242, 58, 50, 5, 220, 75, 50, 5, 212, 64, 50, 5, 210, + 114, 50, 5, 199, 114, 50, 5, 199, 77, 50, 5, 247, 190, 50, 5, 227, 248, + 50, 5, 219, 98, 50, 5, 183, 50, 5, 161, 50, 5, 227, 68, 50, 5, 219, 232, + 50, 5, 236, 89, 50, 5, 178, 50, 5, 188, 50, 5, 218, 60, 50, 5, 217, 63, + 50, 5, 217, 58, 50, 5, 233, 188, 50, 5, 200, 244, 50, 5, 200, 240, 50, 5, + 215, 81, 50, 5, 248, 191, 50, 5, 248, 111, 50, 5, 222, 90, 50, 5, 226, + 40, 50, 5, 221, 236, 50, 5, 236, 20, 50, 5, 237, 2, 50, 5, 202, 179, 50, + 5, 205, 161, 50, 5, 206, 56, 50, 5, 241, 79, 50, 5, 241, 84, 50, 5, 224, + 78, 50, 5, 212, 238, 50, 5, 240, 187, 50, 5, 220, 47, 50, 5, 209, 10, 50, + 5, 210, 2, 50, 5, 199, 12, 50, 5, 199, 58, 50, 5, 243, 30, 50, 5, 227, + 156, 50, 5, 219, 72, 50, 5, 199, 230, 50, 5, 226, 68, 50, 5, 219, 216, + 50, 5, 235, 105, 50, 5, 221, 87, 50, 5, 218, 229, 50, 5, 218, 23, 50, 5, + 66, 50, 5, 204, 5, 50, 5, 233, 97, 50, 5, 233, 84, 50, 5, 200, 216, 50, + 5, 200, 209, 50, 5, 214, 224, 50, 5, 248, 190, 50, 5, 248, 36, 50, 5, + 222, 89, 50, 5, 226, 38, 50, 5, 221, 235, 50, 5, 236, 19, 50, 5, 236, + 189, 50, 5, 201, 166, 50, 5, 204, 215, 50, 5, 206, 35, 50, 5, 241, 77, + 50, 5, 241, 83, 50, 5, 224, 42, 50, 5, 212, 175, 50, 5, 239, 137, 50, 5, + 220, 42, 50, 5, 208, 24, 50, 5, 209, 220, 50, 5, 199, 3, 50, 5, 199, 54, + 50, 5, 242, 214, 50, 5, 227, 147, 50, 5, 219, 68, 50, 5, 199, 211, 50, 5, + 226, 15, 50, 5, 219, 215, 50, 5, 235, 50, 50, 5, 221, 41, 50, 5, 218, + 133, 50, 5, 218, 19, 50, 5, 74, 50, 5, 217, 78, 50, 5, 219, 174, 50, 5, + 233, 207, 50, 5, 233, 191, 50, 5, 201, 0, 50, 5, 200, 245, 50, 5, 215, + 106, 50, 5, 248, 192, 50, 5, 248, 124, 50, 5, 222, 91, 50, 5, 226, 41, + 50, 5, 221, 238, 50, 5, 236, 22, 50, 5, 236, 21, 50, 5, 237, 13, 50, 5, + 202, 193, 50, 5, 138, 50, 5, 206, 61, 50, 5, 241, 80, 50, 5, 241, 85, 50, + 5, 224, 110, 50, 5, 213, 1, 50, 5, 240, 211, 50, 5, 220, 51, 50, 5, 209, + 29, 50, 5, 210, 8, 50, 5, 199, 14, 50, 5, 199, 60, 50, 5, 246, 91, 50, 5, + 227, 166, 50, 5, 219, 73, 50, 5, 199, 245, 50, 5, 226, 88, 50, 5, 219, + 217, 50, 5, 235, 116, 50, 5, 221, 136, 50, 5, 218, 241, 50, 5, 218, 26, + 50, 5, 72, 50, 5, 238, 179, 50, 5, 219, 237, 50, 5, 234, 139, 50, 5, 234, + 105, 50, 5, 201, 64, 50, 5, 201, 51, 50, 5, 216, 73, 50, 5, 248, 196, 50, + 5, 249, 8, 50, 5, 222, 103, 50, 5, 226, 46, 50, 5, 226, 44, 50, 5, 221, + 244, 50, 5, 236, 29, 50, 5, 236, 27, 50, 5, 237, 147, 50, 5, 203, 59, 50, + 5, 206, 201, 50, 5, 206, 106, 50, 5, 241, 91, 50, 5, 241, 88, 50, 5, 225, + 40, 50, 5, 213, 190, 50, 5, 241, 175, 50, 5, 220, 67, 50, 5, 211, 202, + 50, 5, 210, 65, 50, 5, 199, 89, 50, 5, 199, 68, 50, 5, 247, 76, 50, 5, + 227, 227, 50, 5, 219, 91, 50, 5, 200, 51, 50, 5, 227, 8, 50, 5, 219, 227, + 50, 5, 219, 223, 50, 5, 236, 15, 50, 5, 236, 1, 50, 5, 222, 76, 50, 5, + 220, 34, 50, 5, 218, 50, 50, 5, 219, 255, 50, 5, 224, 250, 50, 246, 70, + 50, 236, 183, 208, 76, 50, 214, 79, 81, 50, 5, 220, 50, 237, 195, 50, 5, + 220, 50, 161, 50, 5, 220, 50, 209, 10, 50, 16, 237, 136, 50, 16, 227, 3, + 50, 16, 205, 228, 50, 16, 219, 125, 50, 16, 249, 83, 50, 16, 237, 194, + 50, 16, 207, 32, 50, 16, 242, 8, 50, 16, 240, 186, 50, 16, 225, 255, 50, + 16, 205, 165, 50, 16, 240, 210, 50, 16, 227, 157, 50, 17, 199, 81, 50, + 17, 102, 50, 17, 105, 50, 17, 147, 50, 17, 149, 50, 17, 164, 50, 17, 187, + 50, 17, 210, 135, 50, 17, 192, 50, 17, 219, 113, 50, 5, 220, 50, 178, 50, + 5, 220, 50, 240, 211, 37, 6, 1, 199, 85, 37, 4, 1, 199, 85, 37, 6, 1, + 239, 88, 37, 4, 1, 239, 88, 37, 6, 1, 213, 105, 239, 90, 37, 4, 1, 213, + 105, 239, 90, 37, 6, 1, 228, 41, 37, 4, 1, 228, 41, 37, 6, 1, 240, 227, + 37, 4, 1, 240, 227, 37, 6, 1, 221, 95, 204, 20, 37, 4, 1, 221, 95, 204, + 20, 37, 6, 1, 248, 47, 217, 83, 37, 4, 1, 248, 47, 217, 83, 37, 6, 1, + 220, 10, 200, 33, 37, 4, 1, 220, 10, 200, 33, 37, 6, 1, 200, 30, 3, 249, + 130, 200, 33, 37, 4, 1, 200, 30, 3, 249, 130, 200, 33, 37, 6, 1, 228, 39, + 200, 65, 37, 4, 1, 228, 39, 200, 65, 37, 6, 1, 213, 105, 199, 211, 37, 4, + 1, 213, 105, 199, 211, 37, 6, 1, 228, 39, 62, 37, 4, 1, 228, 39, 62, 37, + 6, 1, 246, 110, 224, 148, 199, 181, 37, 4, 1, 246, 110, 224, 148, 199, + 181, 37, 6, 1, 248, 136, 199, 181, 37, 4, 1, 248, 136, 199, 181, 37, 6, + 1, 228, 39, 246, 110, 224, 148, 199, 181, 37, 4, 1, 228, 39, 246, 110, + 224, 148, 199, 181, 37, 6, 1, 199, 247, 37, 4, 1, 199, 247, 37, 6, 1, + 213, 105, 205, 26, 37, 4, 1, 213, 105, 205, 26, 37, 6, 1, 209, 23, 241, + 175, 37, 4, 1, 209, 23, 241, 175, 37, 6, 1, 209, 23, 238, 209, 37, 4, 1, + 209, 23, 238, 209, 37, 6, 1, 209, 23, 238, 190, 37, 4, 1, 209, 23, 238, + 190, 37, 6, 1, 221, 99, 74, 37, 4, 1, 221, 99, 74, 37, 6, 1, 248, 165, + 74, 37, 4, 1, 248, 165, 74, 37, 6, 1, 53, 221, 99, 74, 37, 4, 1, 53, 221, + 99, 74, 37, 1, 221, 22, 74, 38, 37, 201, 149, 38, 37, 206, 167, 221, 168, + 54, 38, 37, 233, 83, 221, 168, 54, 38, 37, 206, 51, 221, 168, 54, 209, + 73, 250, 165, 38, 37, 1, 204, 17, 228, 178, 38, 37, 1, 70, 38, 37, 1, + 200, 9, 38, 37, 1, 66, 38, 37, 1, 234, 165, 54, 38, 37, 1, 200, 29, 38, + 37, 1, 209, 23, 54, 38, 37, 1, 217, 83, 38, 37, 227, 20, 38, 37, 216, 80, + 37, 227, 20, 37, 216, 80, 37, 6, 1, 239, 103, 37, 4, 1, 239, 103, 37, 6, + 1, 239, 79, 37, 4, 1, 239, 79, 37, 6, 1, 199, 44, 37, 4, 1, 199, 44, 37, + 6, 1, 247, 92, 37, 4, 1, 247, 92, 37, 6, 1, 239, 76, 37, 4, 1, 239, 76, + 37, 6, 1, 206, 202, 3, 101, 117, 37, 4, 1, 206, 202, 3, 101, 117, 37, 6, + 1, 204, 168, 37, 4, 1, 204, 168, 37, 6, 1, 205, 1, 37, 4, 1, 205, 1, 37, + 6, 1, 205, 6, 37, 4, 1, 205, 6, 37, 6, 1, 206, 207, 37, 4, 1, 206, 207, + 37, 6, 1, 233, 65, 37, 4, 1, 233, 65, 37, 6, 1, 209, 197, 37, 4, 1, 209, + 197, 37, 6, 1, 53, 74, 37, 4, 1, 53, 74, 37, 6, 1, 242, 232, 74, 37, 4, + 1, 242, 232, 74, 67, 1, 37, 234, 165, 54, 67, 1, 37, 209, 23, 54, 38, 37, + 1, 238, 248, 38, 37, 1, 228, 39, 72, 25, 1, 62, 25, 1, 161, 25, 1, 66, + 25, 1, 226, 15, 25, 1, 238, 255, 25, 1, 213, 167, 25, 1, 207, 15, 25, 1, + 74, 25, 1, 218, 41, 25, 1, 70, 25, 1, 194, 25, 1, 172, 25, 1, 213, 33, + 25, 1, 213, 81, 25, 1, 225, 31, 25, 1, 222, 63, 25, 1, 207, 32, 25, 1, + 220, 73, 25, 1, 219, 96, 25, 1, 223, 243, 25, 1, 207, 193, 25, 1, 221, + 41, 25, 1, 210, 28, 25, 1, 209, 182, 25, 1, 210, 38, 25, 1, 210, 137, 25, + 1, 225, 199, 25, 1, 226, 233, 25, 1, 218, 104, 25, 1, 218, 133, 25, 1, + 219, 67, 25, 1, 199, 227, 25, 1, 209, 220, 25, 1, 199, 185, 25, 1, 183, + 25, 1, 218, 167, 25, 1, 226, 219, 25, 1, 215, 249, 25, 1, 219, 89, 25, 1, + 218, 148, 25, 1, 214, 216, 25, 1, 200, 213, 25, 1, 216, 61, 25, 1, 237, + 140, 25, 1, 212, 175, 25, 1, 224, 42, 25, 1, 221, 211, 25, 1, 219, 150, + 25, 1, 213, 107, 25, 1, 213, 234, 25, 1, 226, 243, 25, 1, 219, 181, 25, + 1, 219, 232, 25, 1, 219, 253, 25, 1, 210, 8, 25, 1, 214, 221, 25, 1, 236, + 189, 25, 1, 237, 6, 25, 1, 201, 114, 25, 1, 188, 25, 1, 224, 210, 25, 1, + 215, 204, 25, 1, 224, 70, 25, 1, 226, 88, 25, 1, 222, 100, 25, 1, 213, + 139, 25, 1, 222, 40, 25, 1, 178, 25, 1, 206, 15, 25, 1, 226, 163, 25, 1, + 221, 136, 25, 1, 222, 108, 25, 1, 206, 146, 25, 1, 226, 50, 25, 1, 206, + 166, 25, 1, 218, 135, 25, 1, 212, 21, 25, 1, 237, 191, 25, 1, 226, 52, + 25, 1, 226, 83, 25, 38, 134, 226, 61, 25, 38, 134, 204, 206, 25, 219, 95, + 25, 236, 183, 208, 76, 25, 246, 79, 25, 246, 70, 25, 210, 167, 25, 214, + 79, 81, 67, 1, 246, 222, 150, 199, 255, 215, 156, 67, 1, 246, 222, 150, + 200, 76, 215, 156, 67, 1, 246, 222, 150, 199, 255, 210, 88, 67, 1, 246, + 222, 150, 200, 76, 210, 88, 67, 1, 246, 222, 150, 199, 255, 214, 97, 67, + 1, 246, 222, 150, 200, 76, 214, 97, 67, 1, 246, 222, 150, 199, 255, 212, + 175, 67, 1, 246, 222, 150, 200, 76, 212, 175, 67, 1, 238, 29, 239, 180, + 150, 148, 67, 1, 122, 239, 180, 150, 148, 67, 1, 221, 206, 239, 180, 150, + 148, 67, 1, 128, 239, 180, 150, 148, 67, 1, 238, 28, 239, 180, 150, 148, + 67, 1, 238, 29, 239, 180, 225, 20, 150, 148, 67, 1, 122, 239, 180, 225, + 20, 150, 148, 67, 1, 221, 206, 239, 180, 225, 20, 150, 148, 67, 1, 128, + 239, 180, 225, 20, 150, 148, 67, 1, 238, 28, 239, 180, 225, 20, 150, 148, + 67, 1, 238, 29, 225, 20, 150, 148, 67, 1, 122, 225, 20, 150, 148, 67, 1, + 221, 206, 225, 20, 150, 148, 67, 1, 128, 225, 20, 150, 148, 67, 1, 238, + 28, 225, 20, 150, 148, 67, 1, 73, 83, 148, 67, 1, 73, 209, 75, 67, 1, 73, + 233, 177, 148, 67, 1, 224, 54, 51, 243, 16, 251, 70, 67, 1, 213, 220, + 115, 48, 67, 1, 213, 220, 127, 48, 67, 1, 213, 220, 238, 43, 81, 67, 1, + 213, 220, 228, 50, 238, 43, 81, 67, 1, 128, 228, 50, 238, 43, 81, 67, 1, + 208, 57, 26, 122, 205, 174, 67, 1, 208, 57, 26, 128, 205, 174, 8, 6, 1, + 238, 243, 251, 142, 8, 4, 1, 238, 243, 251, 142, 8, 6, 1, 238, 243, 251, + 171, 8, 4, 1, 238, 243, 251, 171, 8, 6, 1, 234, 103, 8, 4, 1, 234, 103, + 8, 6, 1, 204, 114, 8, 4, 1, 204, 114, 8, 6, 1, 205, 102, 8, 4, 1, 205, + 102, 8, 6, 1, 242, 211, 8, 4, 1, 242, 211, 8, 6, 1, 242, 212, 3, 246, 70, + 8, 4, 1, 242, 212, 3, 246, 70, 8, 1, 4, 6, 238, 5, 8, 1, 4, 6, 212, 122, + 8, 6, 1, 252, 138, 8, 4, 1, 252, 138, 8, 6, 1, 251, 31, 8, 4, 1, 251, 31, + 8, 6, 1, 250, 139, 8, 4, 1, 250, 139, 8, 6, 1, 250, 123, 8, 4, 1, 250, + 123, 8, 6, 1, 250, 124, 3, 233, 177, 148, 8, 4, 1, 250, 124, 3, 233, 177, + 148, 8, 6, 1, 250, 112, 8, 4, 1, 250, 112, 8, 6, 1, 213, 105, 247, 224, + 3, 240, 182, 8, 4, 1, 213, 105, 247, 224, 3, 240, 182, 8, 6, 1, 227, 119, + 3, 97, 8, 4, 1, 227, 119, 3, 97, 8, 6, 1, 227, 119, 3, 241, 71, 97, 8, 4, + 1, 227, 119, 3, 241, 71, 97, 8, 6, 1, 227, 119, 3, 208, 47, 26, 241, 71, + 97, 8, 4, 1, 227, 119, 3, 208, 47, 26, 241, 71, 97, 8, 6, 1, 248, 46, + 156, 8, 4, 1, 248, 46, 156, 8, 6, 1, 225, 193, 3, 122, 97, 8, 4, 1, 225, + 193, 3, 122, 97, 8, 6, 1, 163, 3, 168, 208, 47, 216, 242, 8, 4, 1, 163, + 3, 168, 208, 47, 216, 242, 8, 6, 1, 163, 3, 224, 74, 8, 4, 1, 163, 3, + 224, 74, 8, 6, 1, 217, 63, 8, 4, 1, 217, 63, 8, 6, 1, 216, 227, 3, 208, + 47, 206, 38, 241, 119, 8, 4, 1, 216, 227, 3, 208, 47, 206, 38, 241, 119, + 8, 6, 1, 216, 227, 3, 237, 26, 8, 4, 1, 216, 227, 3, 237, 26, 8, 6, 1, + 216, 227, 3, 208, 185, 207, 6, 8, 4, 1, 216, 227, 3, 208, 185, 207, 6, 8, + 6, 1, 214, 168, 3, 208, 47, 206, 38, 241, 119, 8, 4, 1, 214, 168, 3, 208, + 47, 206, 38, 241, 119, 8, 6, 1, 214, 168, 3, 241, 71, 97, 8, 4, 1, 214, + 168, 3, 241, 71, 97, 8, 6, 1, 214, 33, 212, 222, 8, 4, 1, 214, 33, 212, + 222, 8, 6, 1, 212, 162, 212, 222, 8, 4, 1, 212, 162, 212, 222, 8, 6, 1, + 203, 169, 3, 241, 71, 97, 8, 4, 1, 203, 169, 3, 241, 71, 97, 8, 6, 1, + 201, 155, 8, 4, 1, 201, 155, 8, 6, 1, 202, 201, 199, 157, 8, 4, 1, 202, + 201, 199, 157, 8, 6, 1, 206, 55, 3, 97, 8, 4, 1, 206, 55, 3, 97, 8, 6, 1, + 206, 55, 3, 208, 47, 206, 38, 241, 119, 8, 4, 1, 206, 55, 3, 208, 47, + 206, 38, 241, 119, 8, 6, 1, 203, 49, 8, 4, 1, 203, 49, 8, 6, 1, 238, 81, + 8, 4, 1, 238, 81, 8, 6, 1, 228, 26, 8, 4, 1, 228, 26, 8, 6, 1, 243, 68, + 8, 4, 1, 243, 68, 67, 1, 203, 197, 8, 4, 1, 239, 126, 8, 4, 1, 224, 25, + 8, 4, 1, 221, 15, 8, 4, 1, 218, 96, 8, 4, 1, 212, 161, 8, 1, 4, 6, 212, + 161, 8, 4, 1, 204, 203, 8, 4, 1, 204, 12, 8, 6, 1, 228, 71, 242, 153, 8, + 4, 1, 228, 71, 242, 153, 8, 6, 1, 228, 71, 238, 5, 8, 4, 1, 228, 71, 238, + 5, 8, 6, 1, 228, 71, 236, 156, 8, 6, 1, 204, 185, 228, 71, 236, 156, 8, + 4, 1, 204, 185, 228, 71, 236, 156, 8, 6, 1, 204, 185, 156, 8, 4, 1, 204, + 185, 156, 8, 6, 1, 228, 71, 146, 8, 4, 1, 228, 71, 146, 8, 6, 1, 228, 71, + 212, 122, 8, 4, 1, 228, 71, 212, 122, 8, 6, 1, 228, 71, 207, 83, 8, 4, 1, + 228, 71, 207, 83, 67, 1, 128, 246, 147, 251, 251, 67, 1, 246, 79, 67, 1, + 209, 250, 238, 122, 54, 8, 6, 1, 212, 25, 8, 4, 1, 212, 25, 8, 6, 1, 204, + 185, 234, 247, 8, 4, 1, 225, 193, 3, 213, 111, 233, 187, 26, 248, 226, 8, + 1, 209, 132, 240, 182, 8, 6, 1, 220, 215, 3, 241, 119, 8, 4, 1, 220, 215, + 3, 241, 119, 8, 6, 1, 247, 224, 3, 148, 8, 4, 1, 247, 224, 3, 148, 8, 4, + 1, 247, 224, 3, 216, 184, 117, 8, 4, 1, 234, 248, 3, 216, 184, 117, 8, 6, + 1, 68, 3, 237, 26, 8, 4, 1, 68, 3, 237, 26, 8, 6, 1, 238, 6, 3, 97, 8, 4, + 1, 238, 6, 3, 97, 8, 6, 1, 202, 185, 251, 221, 8, 4, 1, 202, 185, 251, + 221, 8, 6, 1, 202, 185, 217, 121, 8, 4, 1, 202, 185, 217, 121, 8, 6, 1, + 202, 185, 204, 31, 8, 4, 1, 202, 185, 204, 31, 8, 6, 1, 236, 157, 3, 217, + 138, 97, 8, 4, 1, 236, 157, 3, 217, 138, 97, 8, 6, 1, 227, 119, 3, 217, + 138, 97, 8, 4, 1, 227, 119, 3, 217, 138, 97, 8, 6, 1, 220, 215, 3, 217, + 138, 97, 8, 4, 1, 220, 215, 3, 217, 138, 97, 8, 6, 1, 214, 33, 3, 217, + 138, 97, 8, 4, 1, 214, 33, 3, 217, 138, 97, 8, 6, 1, 212, 123, 3, 217, + 138, 97, 8, 4, 1, 212, 123, 3, 217, 138, 97, 8, 6, 1, 234, 248, 3, 117, + 8, 6, 1, 213, 105, 176, 72, 8, 6, 1, 135, 236, 156, 8, 6, 1, 225, 193, 3, + 248, 226, 8, 6, 1, 4, 6, 70, 8, 6, 1, 204, 185, 227, 118, 8, 6, 1, 204, + 185, 207, 83, 8, 6, 1, 227, 252, 3, 242, 230, 8, 6, 1, 246, 236, 8, 6, 1, + 248, 208, 8, 4, 1, 248, 208, 8, 6, 1, 217, 83, 8, 4, 1, 217, 83, 8, 238, + 127, 1, 209, 173, 70, 67, 1, 6, 234, 248, 3, 97, 67, 1, 4, 33, 217, 121, + 8, 1, 4, 6, 204, 185, 223, 243, 8, 238, 127, 1, 213, 105, 238, 5, 8, 238, + 127, 1, 213, 105, 216, 226, 8, 238, 127, 1, 228, 50, 223, 243, 8, 238, + 127, 1, 233, 19, 224, 80, 8, 238, 127, 1, 250, 234, 223, 243, 207, 163, + 220, 145, 1, 62, 207, 163, 220, 145, 1, 70, 207, 163, 220, 145, 2, 239, + 105, 207, 163, 220, 145, 1, 66, 207, 163, 220, 145, 1, 72, 207, 163, 220, + 145, 1, 74, 207, 163, 220, 145, 2, 234, 159, 207, 163, 220, 145, 1, 226, + 88, 207, 163, 220, 145, 1, 226, 178, 207, 163, 220, 145, 1, 235, 116, + 207, 163, 220, 145, 1, 235, 171, 207, 163, 220, 145, 2, 251, 33, 207, + 163, 220, 145, 1, 246, 91, 207, 163, 220, 145, 1, 246, 210, 207, 163, + 220, 145, 1, 227, 166, 207, 163, 220, 145, 1, 227, 209, 207, 163, 220, + 145, 1, 204, 230, 207, 163, 220, 145, 1, 204, 236, 207, 163, 220, 145, 1, + 241, 190, 207, 163, 220, 145, 1, 241, 199, 207, 163, 220, 145, 1, 138, + 207, 163, 220, 145, 1, 206, 61, 207, 163, 220, 145, 1, 240, 211, 207, + 163, 220, 145, 1, 241, 80, 207, 163, 220, 145, 1, 218, 241, 207, 163, + 220, 145, 1, 215, 106, 207, 163, 220, 145, 1, 215, 217, 207, 163, 220, + 145, 1, 248, 124, 207, 163, 220, 145, 1, 248, 192, 207, 163, 220, 145, 1, + 221, 136, 207, 163, 220, 145, 1, 213, 1, 207, 163, 220, 145, 1, 224, 110, + 207, 163, 220, 145, 1, 212, 201, 207, 163, 220, 145, 1, 209, 29, 207, + 163, 220, 145, 1, 233, 207, 207, 163, 220, 145, 22, 2, 62, 207, 163, 220, + 145, 22, 2, 70, 207, 163, 220, 145, 22, 2, 66, 207, 163, 220, 145, 22, 2, + 72, 207, 163, 220, 145, 22, 2, 217, 63, 207, 163, 220, 145, 215, 101, + 222, 149, 207, 163, 220, 145, 215, 101, 222, 148, 207, 163, 220, 145, + 215, 101, 222, 147, 207, 163, 220, 145, 215, 101, 222, 146, 157, 228, + 101, 236, 219, 112, 214, 87, 157, 228, 101, 236, 219, 112, 234, 213, 157, + 228, 101, 236, 219, 126, 214, 85, 157, 228, 101, 236, 219, 112, 209, 98, + 157, 228, 101, 236, 219, 112, 238, 227, 157, 228, 101, 236, 219, 126, + 209, 97, 157, 228, 101, 214, 88, 81, 157, 228, 101, 215, 133, 81, 157, + 228, 101, 212, 149, 81, 157, 228, 101, 214, 89, 81, 215, 241, 1, 161, + 215, 241, 1, 226, 207, 215, 241, 1, 236, 89, 215, 241, 1, 219, 253, 215, + 241, 1, 247, 190, 215, 241, 1, 247, 37, 215, 241, 1, 227, 248, 215, 241, + 1, 218, 60, 215, 241, 1, 207, 36, 215, 241, 1, 206, 122, 215, 241, 1, + 242, 58, 215, 241, 1, 188, 215, 241, 1, 172, 215, 241, 1, 215, 245, 215, + 241, 1, 249, 136, 215, 241, 1, 178, 215, 241, 1, 205, 32, 215, 241, 1, + 205, 22, 215, 241, 1, 239, 93, 215, 241, 1, 201, 114, 215, 241, 1, 199, + 77, 215, 241, 1, 199, 114, 215, 241, 1, 4, 62, 215, 241, 1, 183, 215, + 241, 1, 213, 252, 215, 241, 1, 194, 215, 241, 1, 210, 114, 215, 241, 1, + 212, 64, 215, 241, 1, 144, 215, 241, 1, 62, 215, 241, 1, 70, 215, 241, 1, + 66, 215, 241, 1, 72, 215, 241, 1, 74, 215, 241, 1, 214, 159, 215, 241, 1, + 200, 181, 215, 241, 1, 237, 195, 215, 241, 1, 235, 235, 215, 241, 1, 238, + 255, 215, 241, 208, 12, 1, 201, 114, 215, 241, 208, 12, 1, 183, 215, 241, + 1, 204, 253, 215, 241, 1, 204, 241, 215, 241, 1, 241, 220, 215, 241, 1, + 219, 21, 215, 241, 1, 251, 109, 183, 215, 241, 1, 202, 188, 210, 114, + 215, 241, 1, 202, 189, 144, 215, 241, 1, 250, 172, 237, 195, 215, 241, + 208, 12, 1, 213, 252, 215, 241, 207, 215, 1, 213, 252, 215, 241, 1, 247, + 149, 215, 241, 209, 139, 234, 137, 81, 215, 241, 53, 234, 137, 81, 215, + 241, 134, 210, 106, 215, 241, 134, 53, 210, 106, 211, 241, 2, 251, 33, + 211, 241, 2, 202, 203, 211, 241, 1, 62, 211, 241, 1, 252, 138, 211, 241, + 1, 70, 211, 241, 1, 228, 151, 211, 241, 1, 66, 211, 241, 1, 203, 182, + 211, 241, 1, 109, 146, 211, 241, 1, 109, 212, 216, 211, 241, 1, 109, 156, + 211, 241, 1, 109, 224, 139, 211, 241, 1, 72, 211, 241, 1, 238, 255, 211, + 241, 1, 251, 176, 211, 241, 1, 74, 211, 241, 1, 217, 63, 211, 241, 1, + 250, 139, 211, 241, 1, 161, 211, 241, 1, 226, 207, 211, 241, 1, 236, 89, + 211, 241, 1, 235, 199, 211, 241, 1, 219, 253, 211, 241, 1, 247, 190, 211, + 241, 1, 247, 37, 211, 241, 1, 227, 248, 211, 241, 1, 227, 215, 211, 241, + 1, 218, 60, 211, 241, 1, 204, 253, 211, 241, 1, 204, 241, 211, 241, 1, + 241, 220, 211, 241, 1, 241, 204, 211, 241, 1, 219, 21, 211, 241, 1, 207, + 36, 211, 241, 1, 206, 122, 211, 241, 1, 242, 58, 211, 241, 1, 241, 100, + 211, 241, 1, 188, 211, 241, 1, 172, 211, 241, 1, 215, 245, 211, 241, 1, + 249, 136, 211, 241, 1, 248, 200, 211, 241, 1, 178, 211, 241, 1, 183, 211, + 241, 1, 213, 252, 211, 241, 1, 194, 211, 241, 1, 203, 90, 211, 241, 1, + 210, 114, 211, 241, 1, 208, 179, 211, 241, 1, 212, 64, 211, 241, 1, 144, + 211, 241, 1, 224, 138, 211, 241, 111, 2, 234, 231, 211, 241, 22, 2, 252, + 138, 211, 241, 22, 2, 70, 211, 241, 22, 2, 228, 151, 211, 241, 22, 2, 66, + 211, 241, 22, 2, 203, 182, 211, 241, 22, 2, 109, 146, 211, 241, 22, 2, + 109, 212, 216, 211, 241, 22, 2, 109, 156, 211, 241, 22, 2, 109, 224, 139, + 211, 241, 22, 2, 72, 211, 241, 22, 2, 238, 255, 211, 241, 22, 2, 251, + 176, 211, 241, 22, 2, 74, 211, 241, 22, 2, 217, 63, 211, 241, 22, 2, 250, + 139, 211, 241, 2, 202, 208, 211, 241, 2, 247, 149, 211, 241, 242, 10, + 211, 241, 53, 242, 10, 211, 241, 17, 199, 81, 211, 241, 17, 102, 211, + 241, 17, 105, 211, 241, 17, 147, 211, 241, 17, 149, 211, 241, 17, 164, + 211, 241, 17, 187, 211, 241, 17, 210, 135, 211, 241, 17, 192, 211, 241, + 17, 219, 113, 38, 94, 17, 199, 81, 38, 94, 17, 102, 38, 94, 17, 105, 38, + 94, 17, 147, 38, 94, 17, 149, 38, 94, 17, 164, 38, 94, 17, 187, 38, 94, + 17, 210, 135, 38, 94, 17, 192, 38, 94, 17, 219, 113, 38, 94, 1, 62, 38, + 94, 1, 66, 38, 94, 1, 161, 38, 94, 1, 188, 38, 94, 1, 172, 38, 94, 1, + 213, 252, 38, 94, 1, 202, 234, 38, 94, 2, 250, 122, 94, 2, 208, 243, 247, + 149, 94, 2, 247, 150, 202, 208, 94, 2, 53, 247, 150, 202, 208, 94, 2, + 247, 150, 105, 94, 2, 247, 150, 147, 94, 2, 247, 150, 250, 122, 94, 2, + 214, 195, 94, 236, 53, 237, 93, 94, 247, 129, 94, 234, 130, 94, 2, 209, + 177, 94, 227, 240, 217, 86, 227, 14, 224, 211, 17, 199, 81, 227, 14, 224, + 211, 17, 102, 227, 14, 224, 211, 17, 105, 227, 14, 224, 211, 17, 147, + 227, 14, 224, 211, 17, 149, 227, 14, 224, 211, 17, 164, 227, 14, 224, + 211, 17, 187, 227, 14, 224, 211, 17, 210, 135, 227, 14, 224, 211, 17, + 192, 227, 14, 224, 211, 17, 219, 113, 227, 14, 224, 211, 1, 161, 227, 14, + 224, 211, 1, 226, 207, 227, 14, 224, 211, 1, 236, 89, 227, 14, 224, 211, + 1, 219, 253, 227, 14, 224, 211, 1, 212, 64, 227, 14, 224, 211, 1, 210, + 114, 227, 14, 224, 211, 1, 199, 114, 227, 14, 224, 211, 1, 218, 60, 227, + 14, 224, 211, 1, 207, 36, 227, 14, 224, 211, 1, 233, 101, 227, 14, 224, + 211, 1, 188, 227, 14, 224, 211, 1, 172, 227, 14, 224, 211, 1, 215, 245, + 227, 14, 224, 211, 1, 178, 227, 14, 224, 211, 1, 242, 58, 227, 14, 224, + 211, 1, 249, 136, 227, 14, 224, 211, 1, 213, 252, 227, 14, 224, 211, 1, + 183, 227, 14, 224, 211, 1, 194, 227, 14, 224, 211, 1, 201, 114, 227, 14, + 224, 211, 1, 206, 122, 227, 14, 224, 211, 1, 144, 227, 14, 224, 211, 1, + 203, 90, 227, 14, 224, 211, 1, 247, 190, 227, 14, 224, 211, 1, 62, 227, + 14, 224, 211, 1, 217, 121, 227, 14, 224, 211, 1, 70, 227, 14, 224, 211, + 1, 217, 63, 227, 14, 224, 211, 22, 204, 31, 227, 14, 224, 211, 22, 72, + 227, 14, 224, 211, 22, 66, 227, 14, 224, 211, 22, 238, 255, 227, 14, 224, + 211, 22, 74, 227, 14, 224, 211, 150, 215, 121, 227, 14, 224, 211, 150, + 247, 165, 227, 14, 224, 211, 150, 247, 166, 215, 121, 227, 14, 224, 211, + 2, 242, 172, 227, 14, 224, 211, 2, 209, 190, 213, 151, 1, 161, 213, 151, + 1, 236, 89, 213, 151, 1, 219, 253, 213, 151, 1, 207, 36, 213, 151, 1, + 242, 58, 213, 151, 1, 188, 213, 151, 1, 172, 213, 151, 1, 249, 136, 213, + 151, 1, 178, 213, 151, 1, 247, 190, 213, 151, 1, 227, 248, 213, 151, 1, + 218, 60, 213, 151, 1, 212, 64, 213, 151, 1, 213, 252, 213, 151, 1, 194, + 213, 151, 1, 183, 213, 151, 1, 201, 114, 213, 151, 1, 144, 213, 151, 1, + 222, 110, 213, 151, 1, 219, 232, 213, 151, 1, 220, 75, 213, 151, 1, 218, + 27, 213, 151, 1, 62, 213, 151, 22, 2, 70, 213, 151, 22, 2, 66, 213, 151, + 22, 2, 72, 213, 151, 22, 2, 251, 176, 213, 151, 22, 2, 74, 213, 151, 22, + 2, 250, 139, 213, 151, 22, 2, 238, 69, 213, 151, 22, 2, 239, 27, 213, + 151, 111, 2, 219, 255, 213, 151, 111, 2, 220, 214, 213, 151, 111, 2, 146, + 213, 151, 111, 2, 234, 247, 213, 151, 202, 208, 213, 151, 211, 193, 81, + 29, 129, 205, 249, 29, 129, 205, 248, 29, 129, 205, 246, 29, 129, 205, + 251, 29, 129, 213, 73, 29, 129, 213, 57, 29, 129, 213, 52, 29, 129, 213, + 54, 29, 129, 213, 70, 29, 129, 213, 63, 29, 129, 213, 56, 29, 129, 213, + 75, 29, 129, 213, 58, 29, 129, 213, 77, 29, 129, 213, 74, 29, 129, 221, + 193, 29, 129, 221, 184, 29, 129, 221, 187, 29, 129, 215, 175, 29, 129, + 215, 186, 29, 129, 215, 187, 29, 129, 208, 163, 29, 129, 228, 164, 29, + 129, 228, 171, 29, 129, 208, 174, 29, 129, 208, 161, 29, 129, 215, 226, + 29, 129, 234, 61, 29, 129, 208, 158, 227, 233, 2, 216, 141, 227, 233, 2, + 247, 73, 227, 233, 2, 225, 48, 227, 233, 2, 201, 21, 227, 233, 1, 62, + 227, 233, 1, 233, 19, 227, 18, 227, 233, 1, 70, 227, 233, 1, 228, 151, + 227, 233, 1, 66, 227, 233, 1, 216, 211, 247, 43, 227, 233, 1, 219, 254, + 225, 7, 227, 233, 1, 219, 254, 225, 8, 213, 205, 227, 233, 1, 72, 227, + 233, 1, 251, 176, 227, 233, 1, 74, 227, 233, 1, 161, 227, 233, 1, 227, + 108, 211, 253, 227, 233, 1, 227, 108, 221, 0, 227, 233, 1, 236, 89, 227, + 233, 1, 236, 90, 221, 0, 227, 233, 1, 219, 253, 227, 233, 1, 247, 190, + 227, 233, 1, 247, 191, 221, 0, 227, 233, 1, 227, 248, 227, 233, 1, 218, + 61, 221, 0, 227, 233, 1, 227, 249, 222, 202, 227, 233, 1, 218, 60, 227, + 233, 1, 204, 253, 227, 233, 1, 204, 254, 222, 202, 227, 233, 1, 241, 220, + 227, 233, 1, 241, 221, 222, 202, 227, 233, 1, 220, 162, 221, 0, 227, 233, + 1, 207, 36, 227, 233, 1, 207, 37, 221, 0, 227, 233, 1, 242, 58, 227, 233, + 1, 242, 59, 222, 202, 227, 233, 1, 188, 227, 233, 1, 172, 227, 233, 1, + 216, 211, 221, 0, 227, 233, 1, 249, 136, 227, 233, 1, 249, 137, 221, 0, + 227, 233, 1, 178, 227, 233, 1, 183, 227, 233, 1, 213, 252, 227, 233, 1, + 213, 253, 251, 186, 227, 233, 1, 194, 227, 233, 1, 201, 114, 227, 233, 1, + 212, 65, 221, 0, 227, 233, 1, 212, 65, 222, 202, 227, 233, 1, 212, 64, + 227, 233, 1, 144, 227, 233, 2, 247, 74, 206, 169, 227, 233, 22, 2, 206, + 228, 227, 233, 22, 2, 205, 179, 227, 233, 22, 2, 200, 210, 227, 233, 22, + 2, 200, 211, 222, 51, 227, 233, 22, 2, 207, 238, 227, 233, 22, 2, 207, + 239, 222, 39, 227, 233, 22, 2, 206, 249, 227, 233, 22, 2, 241, 6, 220, + 255, 227, 233, 22, 2, 216, 30, 227, 233, 111, 2, 226, 236, 227, 233, 111, + 2, 216, 44, 227, 233, 111, 2, 247, 175, 227, 233, 216, 154, 227, 233, 49, + 213, 125, 227, 233, 51, 213, 125, 227, 233, 216, 200, 251, 78, 227, 233, + 216, 200, 222, 220, 227, 233, 216, 200, 224, 29, 227, 233, 216, 200, 201, + 14, 227, 233, 216, 200, 216, 155, 227, 233, 216, 200, 224, 168, 227, 233, + 216, 200, 224, 23, 227, 233, 216, 200, 251, 229, 227, 233, 216, 200, 251, + 230, 251, 229, 227, 233, 216, 200, 215, 144, 227, 233, 204, 185, 216, + 200, 215, 144, 227, 233, 216, 150, 227, 233, 17, 199, 81, 227, 233, 17, + 102, 227, 233, 17, 105, 227, 233, 17, 147, 227, 233, 17, 149, 227, 233, + 17, 164, 227, 233, 17, 187, 227, 233, 17, 210, 135, 227, 233, 17, 192, + 227, 233, 17, 219, 113, 227, 233, 216, 200, 205, 215, 204, 200, 227, 233, + 216, 200, 228, 22, 71, 1, 210, 90, 235, 199, 71, 1, 210, 90, 247, 37, 71, + 1, 210, 90, 227, 215, 71, 1, 210, 90, 219, 21, 71, 1, 210, 90, 248, 200, + 71, 2, 210, 90, 211, 239, 71, 67, 1, 210, 90, 213, 168, 71, 1, 46, 225, + 148, 218, 60, 71, 1, 46, 225, 148, 237, 195, 71, 1, 46, 225, 148, 236, + 89, 71, 1, 46, 225, 148, 235, 199, 71, 1, 46, 225, 148, 227, 248, 71, 1, + 46, 225, 148, 227, 215, 71, 1, 46, 225, 148, 241, 220, 71, 1, 46, 225, + 148, 241, 204, 71, 1, 46, 225, 148, 219, 21, 71, 46, 225, 148, 17, 199, + 81, 71, 46, 225, 148, 17, 102, 71, 46, 225, 148, 17, 105, 71, 46, 225, + 148, 17, 147, 71, 46, 225, 148, 17, 149, 71, 46, 225, 148, 17, 164, 71, + 46, 225, 148, 17, 187, 71, 46, 225, 148, 17, 210, 135, 71, 46, 225, 148, + 17, 192, 71, 46, 225, 148, 17, 219, 113, 71, 1, 46, 225, 148, 224, 138, + 71, 1, 46, 225, 148, 242, 58, 71, 1, 46, 225, 148, 241, 100, 71, 1, 46, + 225, 148, 249, 136, 71, 1, 46, 225, 148, 248, 200, 247, 30, 1, 62, 247, + 30, 1, 70, 247, 30, 1, 66, 247, 30, 1, 72, 247, 30, 1, 251, 176, 247, 30, + 1, 74, 247, 30, 1, 161, 247, 30, 1, 226, 207, 247, 30, 1, 236, 89, 247, + 30, 1, 235, 199, 247, 30, 1, 219, 162, 247, 30, 1, 219, 253, 247, 30, 1, + 247, 37, 247, 30, 1, 246, 238, 247, 30, 1, 227, 248, 247, 30, 1, 227, + 215, 247, 30, 1, 219, 152, 247, 30, 1, 219, 154, 247, 30, 1, 219, 153, + 247, 30, 1, 207, 36, 247, 30, 1, 206, 122, 247, 30, 1, 242, 58, 247, 30, + 1, 241, 100, 247, 30, 1, 218, 102, 247, 30, 1, 188, 247, 30, 1, 241, 220, + 247, 30, 1, 172, 247, 30, 1, 215, 47, 247, 30, 1, 215, 245, 247, 30, 1, + 249, 136, 247, 30, 1, 248, 200, 247, 30, 1, 221, 33, 247, 30, 1, 178, + 247, 30, 1, 249, 44, 247, 30, 1, 183, 247, 30, 1, 213, 252, 247, 30, 1, + 194, 247, 30, 1, 203, 90, 247, 30, 1, 208, 179, 247, 30, 1, 212, 64, 247, + 30, 1, 144, 247, 30, 22, 2, 252, 138, 247, 30, 22, 2, 70, 247, 30, 22, 2, + 228, 151, 247, 30, 22, 2, 238, 234, 247, 30, 22, 2, 66, 247, 30, 22, 2, + 217, 121, 247, 30, 22, 2, 74, 247, 30, 22, 2, 251, 176, 247, 30, 22, 2, + 250, 139, 247, 30, 22, 2, 204, 31, 247, 30, 111, 2, 183, 247, 30, 111, 2, + 213, 252, 247, 30, 111, 2, 194, 247, 30, 111, 2, 201, 114, 247, 30, 1, + 47, 227, 118, 247, 30, 1, 47, 236, 156, 247, 30, 1, 47, 219, 255, 247, + 30, 111, 2, 47, 219, 255, 247, 30, 1, 47, 247, 38, 247, 30, 1, 47, 207, + 83, 247, 30, 1, 47, 220, 214, 247, 30, 1, 47, 216, 226, 247, 30, 1, 47, + 200, 123, 247, 30, 1, 47, 146, 247, 30, 1, 47, 156, 247, 30, 1, 47, 208, + 182, 247, 30, 111, 2, 47, 223, 243, 247, 30, 111, 2, 47, 234, 247, 247, + 30, 17, 199, 81, 247, 30, 17, 102, 247, 30, 17, 105, 247, 30, 17, 147, + 247, 30, 17, 149, 247, 30, 17, 164, 247, 30, 17, 187, 247, 30, 17, 210, + 135, 247, 30, 17, 192, 247, 30, 17, 219, 113, 247, 30, 214, 212, 208, + 217, 247, 30, 214, 212, 242, 10, 247, 30, 214, 212, 53, 242, 10, 247, 30, + 214, 212, 205, 83, 242, 10, 71, 1, 226, 200, 236, 89, 71, 1, 226, 200, + 247, 190, 71, 1, 226, 200, 247, 37, 71, 1, 226, 200, 227, 248, 71, 1, + 226, 200, 227, 215, 71, 1, 226, 200, 218, 60, 71, 1, 226, 200, 204, 253, + 71, 1, 226, 200, 204, 241, 71, 1, 226, 200, 241, 220, 71, 1, 226, 200, + 241, 204, 71, 1, 226, 200, 241, 100, 71, 1, 226, 200, 188, 71, 1, 226, + 200, 212, 64, 71, 1, 226, 200, 144, 71, 1, 226, 200, 234, 84, 71, 1, 226, + 200, 237, 195, 71, 67, 1, 226, 200, 213, 168, 71, 1, 226, 200, 200, 181, + 71, 1, 226, 200, 199, 114, 71, 1, 226, 200, 213, 252, 71, 224, 97, 226, + 200, 217, 143, 71, 224, 97, 226, 200, 214, 110, 71, 224, 97, 226, 200, + 234, 6, 71, 16, 251, 163, 238, 42, 71, 16, 251, 163, 102, 71, 16, 251, + 163, 105, 71, 1, 251, 163, 213, 252, 71, 2, 216, 137, 227, 44, 205, 174, + 71, 2, 46, 225, 148, 205, 172, 71, 2, 46, 225, 148, 205, 169, 71, 1, 209, + 198, 216, 181, 247, 37, 71, 1, 209, 198, 216, 181, 210, 114, 46, 202, + 224, 1, 128, 226, 88, 46, 202, 224, 1, 122, 226, 88, 46, 202, 224, 1, + 128, 226, 178, 46, 202, 224, 1, 122, 226, 178, 46, 202, 224, 1, 128, 226, + 187, 46, 202, 224, 1, 122, 226, 187, 46, 202, 224, 1, 128, 235, 116, 46, + 202, 224, 1, 122, 235, 116, 46, 202, 224, 1, 128, 219, 178, 46, 202, 224, + 1, 122, 219, 178, 46, 202, 224, 1, 128, 246, 91, 46, 202, 224, 1, 122, + 246, 91, 46, 202, 224, 1, 128, 246, 210, 46, 202, 224, 1, 122, 246, 210, + 46, 202, 224, 1, 128, 209, 29, 46, 202, 224, 1, 122, 209, 29, 46, 202, + 224, 1, 128, 218, 26, 46, 202, 224, 1, 122, 218, 26, 46, 202, 224, 1, + 128, 240, 211, 46, 202, 224, 1, 122, 240, 211, 46, 202, 224, 1, 128, 138, + 46, 202, 224, 1, 122, 138, 46, 202, 224, 1, 128, 206, 61, 46, 202, 224, + 1, 122, 206, 61, 46, 202, 224, 1, 128, 218, 241, 46, 202, 224, 1, 122, + 218, 241, 46, 202, 224, 1, 128, 248, 124, 46, 202, 224, 1, 122, 248, 124, + 46, 202, 224, 1, 128, 215, 106, 46, 202, 224, 1, 122, 215, 106, 46, 202, + 224, 1, 128, 215, 217, 46, 202, 224, 1, 122, 215, 217, 46, 202, 224, 1, + 128, 237, 13, 46, 202, 224, 1, 122, 237, 13, 46, 202, 224, 1, 128, 221, + 136, 46, 202, 224, 1, 122, 221, 136, 46, 202, 224, 1, 128, 199, 245, 46, + 202, 224, 1, 122, 199, 245, 46, 202, 224, 1, 128, 213, 1, 46, 202, 224, + 1, 122, 213, 1, 46, 202, 224, 1, 128, 224, 110, 46, 202, 224, 1, 122, + 224, 110, 46, 202, 224, 1, 128, 202, 193, 46, 202, 224, 1, 122, 202, 193, + 46, 202, 224, 1, 128, 233, 207, 46, 202, 224, 1, 122, 233, 207, 46, 202, + 224, 1, 128, 74, 46, 202, 224, 1, 122, 74, 46, 202, 224, 222, 199, 227, + 64, 46, 202, 224, 22, 252, 138, 46, 202, 224, 22, 70, 46, 202, 224, 22, + 204, 31, 46, 202, 224, 22, 66, 46, 202, 224, 22, 72, 46, 202, 224, 22, + 74, 46, 202, 224, 222, 199, 226, 181, 46, 202, 224, 22, 232, 240, 46, + 202, 224, 22, 204, 30, 46, 202, 224, 22, 204, 46, 46, 202, 224, 22, 250, + 137, 46, 202, 224, 22, 250, 112, 46, 202, 224, 22, 251, 85, 46, 202, 224, + 22, 251, 101, 46, 202, 224, 150, 222, 199, 238, 216, 46, 202, 224, 150, + 222, 199, 218, 101, 46, 202, 224, 150, 222, 199, 206, 61, 46, 202, 224, + 150, 222, 199, 209, 12, 46, 202, 224, 16, 226, 71, 46, 202, 224, 16, 218, + 101, 46, 202, 224, 16, 212, 23, 46, 202, 224, 16, 233, 208, 233, 202, 46, + 202, 224, 16, 226, 81, 226, 80, 222, 58, 222, 117, 1, 72, 222, 58, 222, + 117, 1, 74, 222, 58, 222, 117, 1, 247, 37, 222, 58, 222, 117, 1, 218, 60, + 222, 58, 222, 117, 1, 204, 253, 222, 58, 222, 117, 1, 204, 241, 222, 58, + 222, 117, 1, 241, 220, 222, 58, 222, 117, 1, 241, 204, 222, 58, 222, 117, + 1, 219, 21, 222, 58, 222, 117, 1, 210, 114, 222, 58, 222, 117, 1, 208, + 179, 222, 58, 222, 117, 22, 2, 228, 151, 222, 58, 222, 117, 22, 2, 203, + 182, 222, 58, 222, 117, 22, 2, 252, 102, 222, 58, 222, 117, 22, 2, 250, + 139, 222, 58, 222, 117, 22, 2, 252, 95, 222, 58, 222, 117, 246, 253, 222, + 58, 222, 117, 251, 182, 226, 170, 222, 58, 222, 117, 251, 62, 222, 58, + 222, 117, 5, 213, 130, 81, 222, 58, 222, 117, 200, 238, 213, 130, 81, + 222, 58, 222, 117, 22, 2, 202, 203, 222, 58, 222, 117, 202, 208, 34, 5, + 204, 234, 34, 5, 204, 237, 34, 5, 204, 240, 34, 5, 204, 238, 34, 5, 204, + 239, 34, 5, 204, 236, 34, 5, 241, 198, 34, 5, 241, 200, 34, 5, 241, 203, + 34, 5, 241, 201, 34, 5, 241, 202, 34, 5, 241, 199, 34, 5, 239, 80, 34, 5, + 239, 84, 34, 5, 239, 92, 34, 5, 239, 89, 34, 5, 239, 90, 34, 5, 239, 81, + 34, 5, 247, 90, 34, 5, 247, 84, 34, 5, 247, 86, 34, 5, 247, 89, 34, 5, + 247, 87, 34, 5, 247, 88, 34, 5, 247, 85, 34, 5, 249, 44, 34, 5, 249, 23, + 34, 5, 249, 35, 34, 5, 249, 43, 34, 5, 249, 38, 34, 5, 249, 39, 34, 5, + 249, 27, 8, 4, 1, 249, 71, 251, 112, 8, 4, 1, 35, 213, 103, 8, 4, 1, 248, + 140, 72, 8, 4, 1, 249, 71, 72, 8, 4, 1, 197, 3, 237, 26, 8, 4, 1, 224, + 249, 238, 5, 8, 4, 1, 135, 236, 157, 3, 242, 230, 8, 4, 1, 225, 193, 3, + 228, 50, 225, 47, 212, 122, 8, 4, 1, 225, 193, 3, 53, 101, 205, 240, 8, + 4, 1, 225, 193, 3, 101, 213, 26, 8, 4, 1, 223, 244, 3, 242, 230, 8, 4, 1, + 220, 215, 3, 242, 230, 8, 4, 1, 238, 166, 3, 242, 230, 8, 4, 1, 248, 140, + 74, 8, 4, 1, 248, 140, 163, 3, 97, 8, 4, 1, 176, 163, 3, 97, 8, 4, 1, + 228, 50, 217, 121, 8, 4, 1, 204, 185, 217, 122, 3, 97, 8, 4, 1, 204, 185, + 217, 122, 3, 233, 177, 97, 8, 4, 1, 204, 185, 163, 217, 49, 8, 4, 1, 204, + 185, 163, 217, 50, 3, 97, 8, 4, 1, 208, 81, 146, 8, 1, 4, 6, 214, 33, 3, + 51, 225, 16, 8, 4, 1, 214, 33, 201, 3, 234, 177, 8, 4, 1, 53, 146, 8, 4, + 1, 214, 33, 3, 242, 230, 8, 4, 1, 53, 214, 33, 3, 242, 230, 8, 4, 1, 135, + 146, 8, 4, 1, 135, 214, 33, 3, 213, 26, 8, 4, 1, 249, 62, 238, 94, 8, 4, + 1, 108, 3, 209, 250, 51, 225, 16, 8, 4, 1, 108, 249, 77, 3, 209, 250, 51, + 225, 16, 8, 4, 1, 204, 23, 8, 4, 1, 204, 185, 204, 23, 8, 4, 1, 108, 3, + 49, 117, 8, 4, 1, 246, 236, 8, 4, 1, 246, 237, 3, 128, 51, 213, 26, 8, 4, + 1, 246, 237, 3, 128, 49, 210, 149, 8, 4, 1, 200, 196, 3, 128, 51, 213, + 26, 8, 4, 1, 200, 196, 3, 168, 49, 225, 16, 8, 4, 1, 200, 196, 3, 168, + 49, 225, 17, 26, 128, 51, 213, 26, 8, 4, 1, 200, 196, 3, 168, 49, 225, + 17, 3, 210, 149, 8, 4, 1, 200, 124, 3, 209, 250, 51, 225, 16, 67, 248, + 58, 3, 228, 50, 248, 57, 67, 1, 4, 234, 103, 67, 1, 4, 225, 193, 3, 228, + 50, 225, 47, 212, 122, 67, 1, 4, 225, 193, 3, 101, 205, 240, 67, 1, 4, + 108, 3, 49, 117, 8, 4, 1, 212, 39, 200, 65, 8, 4, 1, 228, 39, 72, 8, 4, + 1, 176, 217, 121, 8, 4, 1, 203, 232, 8, 4, 1, 228, 50, 251, 112, 31, 1, + 4, 6, 217, 83, 91, 4, 1, 62, 91, 4, 1, 72, 91, 4, 1, 70, 91, 4, 1, 74, + 91, 4, 1, 66, 91, 4, 1, 203, 168, 91, 4, 1, 236, 89, 91, 4, 1, 161, 91, + 4, 1, 236, 15, 91, 4, 1, 235, 161, 91, 4, 1, 235, 116, 91, 4, 1, 235, 50, + 91, 4, 1, 235, 12, 91, 4, 1, 144, 91, 4, 1, 234, 139, 91, 4, 1, 234, 75, + 91, 4, 1, 233, 207, 91, 4, 1, 233, 97, 91, 4, 1, 233, 69, 91, 4, 1, 194, + 91, 4, 1, 225, 40, 91, 4, 1, 224, 210, 91, 4, 1, 224, 110, 91, 4, 1, 224, + 42, 91, 4, 1, 224, 11, 91, 4, 1, 178, 91, 4, 1, 222, 76, 91, 4, 1, 221, + 211, 91, 4, 1, 221, 136, 91, 4, 1, 221, 41, 91, 4, 1, 188, 91, 4, 1, 233, + 231, 91, 4, 1, 220, 144, 91, 4, 1, 220, 34, 91, 4, 1, 219, 150, 91, 4, 1, + 218, 241, 91, 4, 1, 218, 133, 91, 4, 1, 218, 71, 91, 4, 1, 214, 96, 91, + 4, 1, 214, 82, 91, 4, 1, 214, 75, 91, 4, 1, 214, 66, 91, 4, 1, 214, 55, + 91, 4, 1, 214, 53, 91, 4, 1, 212, 64, 91, 4, 1, 212, 122, 91, 4, 1, 211, + 202, 91, 4, 1, 209, 182, 91, 4, 1, 209, 29, 91, 4, 1, 208, 24, 91, 4, 1, + 207, 191, 91, 4, 1, 242, 58, 91, 4, 1, 207, 36, 91, 4, 1, 241, 175, 91, + 4, 1, 206, 201, 91, 4, 1, 241, 76, 91, 4, 1, 206, 15, 91, 4, 1, 240, 211, + 91, 4, 1, 239, 137, 91, 4, 1, 239, 107, 91, 4, 1, 240, 222, 91, 4, 1, + 205, 203, 91, 4, 1, 205, 202, 91, 4, 1, 205, 191, 91, 4, 1, 205, 190, 91, + 4, 1, 205, 189, 91, 4, 1, 205, 188, 91, 4, 1, 205, 32, 91, 4, 1, 205, 26, + 91, 4, 1, 205, 11, 91, 4, 1, 205, 9, 91, 4, 1, 205, 5, 91, 4, 1, 205, 4, + 91, 4, 1, 201, 114, 91, 4, 1, 201, 64, 91, 4, 1, 201, 31, 91, 4, 1, 201, + 0, 91, 4, 1, 200, 216, 91, 4, 1, 200, 203, 91, 4, 1, 183, 222, 58, 222, + 117, 1, 226, 78, 222, 58, 222, 117, 1, 212, 23, 222, 58, 222, 117, 1, + 225, 149, 222, 58, 222, 117, 1, 221, 147, 222, 58, 222, 117, 1, 172, 222, + 58, 222, 117, 1, 188, 222, 58, 222, 117, 1, 246, 228, 222, 58, 222, 117, + 1, 205, 242, 222, 58, 222, 117, 1, 226, 173, 222, 58, 222, 117, 1, 219, + 168, 222, 58, 222, 117, 1, 206, 53, 222, 58, 222, 117, 1, 201, 108, 222, + 58, 222, 117, 1, 200, 75, 222, 58, 222, 117, 1, 233, 89, 222, 58, 222, + 117, 1, 204, 5, 222, 58, 222, 117, 1, 70, 222, 58, 222, 117, 1, 215, 239, + 222, 58, 222, 117, 1, 250, 150, 222, 58, 222, 117, 1, 235, 109, 222, 58, + 222, 117, 1, 227, 213, 222, 58, 222, 117, 1, 213, 229, 222, 58, 222, 117, + 1, 249, 136, 222, 58, 222, 117, 1, 227, 198, 222, 58, 222, 117, 1, 241, + 33, 222, 58, 222, 117, 1, 235, 168, 222, 58, 222, 117, 1, 241, 78, 222, + 58, 222, 117, 1, 248, 198, 222, 58, 222, 117, 1, 226, 79, 224, 79, 222, + 58, 222, 117, 1, 225, 150, 224, 79, 222, 58, 222, 117, 1, 221, 148, 224, + 79, 222, 58, 222, 117, 1, 216, 211, 224, 79, 222, 58, 222, 117, 1, 220, + 162, 224, 79, 222, 58, 222, 117, 1, 205, 243, 224, 79, 222, 58, 222, 117, + 1, 219, 169, 224, 79, 222, 58, 222, 117, 1, 233, 19, 224, 79, 222, 58, + 222, 117, 22, 2, 217, 76, 222, 58, 222, 117, 22, 2, 228, 115, 222, 58, + 222, 117, 22, 2, 251, 83, 222, 58, 222, 117, 22, 2, 200, 40, 222, 58, + 222, 117, 22, 2, 209, 2, 222, 58, 222, 117, 22, 2, 204, 2, 222, 58, 222, + 117, 22, 2, 246, 251, 222, 58, 222, 117, 22, 2, 218, 86, 222, 58, 222, + 117, 246, 252, 222, 58, 222, 117, 224, 26, 228, 1, 222, 58, 222, 117, + 251, 2, 228, 1, 222, 58, 222, 117, 17, 199, 81, 222, 58, 222, 117, 17, + 102, 222, 58, 222, 117, 17, 105, 222, 58, 222, 117, 17, 147, 222, 58, + 222, 117, 17, 149, 222, 58, 222, 117, 17, 164, 222, 58, 222, 117, 17, + 187, 222, 58, 222, 117, 17, 210, 135, 222, 58, 222, 117, 17, 192, 222, + 58, 222, 117, 17, 219, 113, 29, 181, 217, 223, 29, 181, 217, 228, 29, + 181, 199, 244, 29, 181, 199, 243, 29, 181, 199, 242, 29, 181, 204, 96, + 29, 181, 204, 100, 29, 181, 199, 209, 29, 181, 199, 205, 29, 181, 238, + 68, 29, 181, 238, 66, 29, 181, 238, 67, 29, 181, 238, 64, 29, 181, 233, + 9, 29, 181, 233, 8, 29, 181, 233, 6, 29, 181, 233, 7, 29, 181, 233, 12, + 29, 181, 233, 5, 29, 181, 233, 4, 29, 181, 233, 14, 29, 181, 250, 244, + 29, 181, 250, 243, 29, 110, 219, 136, 29, 110, 219, 142, 29, 110, 208, + 160, 29, 110, 208, 159, 29, 110, 205, 248, 29, 110, 205, 246, 29, 110, + 205, 245, 29, 110, 205, 251, 29, 110, 205, 252, 29, 110, 205, 244, 29, + 110, 213, 57, 29, 110, 213, 72, 29, 110, 208, 166, 29, 110, 213, 69, 29, + 110, 213, 59, 29, 110, 213, 61, 29, 110, 213, 48, 29, 110, 213, 49, 29, + 110, 227, 50, 29, 110, 221, 192, 29, 110, 221, 186, 29, 110, 208, 170, + 29, 110, 221, 189, 29, 110, 221, 195, 29, 110, 215, 171, 29, 110, 215, + 180, 29, 110, 215, 184, 29, 110, 208, 168, 29, 110, 215, 174, 29, 110, + 215, 188, 29, 110, 215, 189, 29, 110, 209, 121, 29, 110, 209, 124, 29, + 110, 208, 164, 29, 110, 208, 162, 29, 110, 209, 119, 29, 110, 209, 127, + 29, 110, 209, 128, 29, 110, 209, 113, 29, 110, 209, 126, 29, 110, 216, + 144, 29, 110, 216, 145, 29, 110, 200, 26, 29, 110, 200, 27, 29, 110, 246, + 166, 29, 110, 246, 165, 29, 110, 208, 175, 29, 110, 215, 224, 29, 110, + 215, 223, 12, 15, 230, 142, 12, 15, 230, 141, 12, 15, 230, 140, 12, 15, + 230, 139, 12, 15, 230, 138, 12, 15, 230, 137, 12, 15, 230, 136, 12, 15, + 230, 135, 12, 15, 230, 134, 12, 15, 230, 133, 12, 15, 230, 132, 12, 15, + 230, 131, 12, 15, 230, 130, 12, 15, 230, 129, 12, 15, 230, 128, 12, 15, + 230, 127, 12, 15, 230, 126, 12, 15, 230, 125, 12, 15, 230, 124, 12, 15, + 230, 123, 12, 15, 230, 122, 12, 15, 230, 121, 12, 15, 230, 120, 12, 15, + 230, 119, 12, 15, 230, 118, 12, 15, 230, 117, 12, 15, 230, 116, 12, 15, + 230, 115, 12, 15, 230, 114, 12, 15, 230, 113, 12, 15, 230, 112, 12, 15, + 230, 111, 12, 15, 230, 110, 12, 15, 230, 109, 12, 15, 230, 108, 12, 15, + 230, 107, 12, 15, 230, 106, 12, 15, 230, 105, 12, 15, 230, 104, 12, 15, + 230, 103, 12, 15, 230, 102, 12, 15, 230, 101, 12, 15, 230, 100, 12, 15, + 230, 99, 12, 15, 230, 98, 12, 15, 230, 97, 12, 15, 230, 96, 12, 15, 230, + 95, 12, 15, 230, 94, 12, 15, 230, 93, 12, 15, 230, 92, 12, 15, 230, 91, + 12, 15, 230, 90, 12, 15, 230, 89, 12, 15, 230, 88, 12, 15, 230, 87, 12, + 15, 230, 86, 12, 15, 230, 85, 12, 15, 230, 84, 12, 15, 230, 83, 12, 15, + 230, 82, 12, 15, 230, 81, 12, 15, 230, 80, 12, 15, 230, 79, 12, 15, 230, + 78, 12, 15, 230, 77, 12, 15, 230, 76, 12, 15, 230, 75, 12, 15, 230, 74, + 12, 15, 230, 73, 12, 15, 230, 72, 12, 15, 230, 71, 12, 15, 230, 70, 12, + 15, 230, 69, 12, 15, 230, 68, 12, 15, 230, 67, 12, 15, 230, 66, 12, 15, + 230, 65, 12, 15, 230, 64, 12, 15, 230, 63, 12, 15, 230, 62, 12, 15, 230, + 61, 12, 15, 230, 60, 12, 15, 230, 59, 12, 15, 230, 58, 12, 15, 230, 57, + 12, 15, 230, 56, 12, 15, 230, 55, 12, 15, 230, 54, 12, 15, 230, 53, 12, + 15, 230, 52, 12, 15, 230, 51, 12, 15, 230, 50, 12, 15, 230, 49, 12, 15, + 230, 48, 12, 15, 230, 47, 12, 15, 230, 46, 12, 15, 230, 45, 12, 15, 230, + 44, 12, 15, 230, 43, 12, 15, 230, 42, 12, 15, 230, 41, 12, 15, 230, 40, + 12, 15, 230, 39, 12, 15, 230, 38, 12, 15, 230, 37, 12, 15, 230, 36, 12, + 15, 230, 35, 12, 15, 230, 34, 12, 15, 230, 33, 12, 15, 230, 32, 12, 15, + 230, 31, 12, 15, 230, 30, 12, 15, 230, 29, 12, 15, 230, 28, 12, 15, 230, + 27, 12, 15, 230, 26, 12, 15, 230, 25, 12, 15, 230, 24, 12, 15, 230, 23, + 12, 15, 230, 22, 12, 15, 230, 21, 12, 15, 230, 20, 12, 15, 230, 19, 12, + 15, 230, 18, 12, 15, 230, 17, 12, 15, 230, 16, 12, 15, 230, 15, 12, 15, + 230, 14, 12, 15, 230, 13, 12, 15, 230, 12, 12, 15, 230, 11, 12, 15, 230, + 10, 12, 15, 230, 9, 12, 15, 230, 8, 12, 15, 230, 7, 12, 15, 230, 6, 12, + 15, 230, 5, 12, 15, 230, 4, 12, 15, 230, 3, 12, 15, 230, 2, 12, 15, 230, + 1, 12, 15, 230, 0, 12, 15, 229, 255, 12, 15, 229, 254, 12, 15, 229, 253, + 12, 15, 229, 252, 12, 15, 229, 251, 12, 15, 229, 250, 12, 15, 229, 249, + 12, 15, 229, 248, 12, 15, 229, 247, 12, 15, 229, 246, 12, 15, 229, 245, + 12, 15, 229, 244, 12, 15, 229, 243, 12, 15, 229, 242, 12, 15, 229, 241, + 12, 15, 229, 240, 12, 15, 229, 239, 12, 15, 229, 238, 12, 15, 229, 237, + 12, 15, 229, 236, 12, 15, 229, 235, 12, 15, 229, 234, 12, 15, 229, 233, + 12, 15, 229, 232, 12, 15, 229, 231, 12, 15, 229, 230, 12, 15, 229, 229, + 12, 15, 229, 228, 12, 15, 229, 227, 12, 15, 229, 226, 12, 15, 229, 225, + 12, 15, 229, 224, 12, 15, 229, 223, 12, 15, 229, 222, 12, 15, 229, 221, + 12, 15, 229, 220, 12, 15, 229, 219, 12, 15, 229, 218, 12, 15, 229, 217, + 12, 15, 229, 216, 12, 15, 229, 215, 12, 15, 229, 214, 12, 15, 229, 213, + 12, 15, 229, 212, 12, 15, 229, 211, 12, 15, 229, 210, 12, 15, 229, 209, + 12, 15, 229, 208, 12, 15, 229, 207, 12, 15, 229, 206, 12, 15, 229, 205, + 12, 15, 229, 204, 12, 15, 229, 203, 12, 15, 229, 202, 12, 15, 229, 201, + 12, 15, 229, 200, 12, 15, 229, 199, 12, 15, 229, 198, 12, 15, 229, 197, + 12, 15, 229, 196, 12, 15, 229, 195, 12, 15, 229, 194, 12, 15, 229, 193, + 12, 15, 229, 192, 12, 15, 229, 191, 12, 15, 229, 190, 12, 15, 229, 189, + 12, 15, 229, 188, 12, 15, 229, 187, 12, 15, 229, 186, 12, 15, 229, 185, + 12, 15, 229, 184, 12, 15, 229, 183, 12, 15, 229, 182, 12, 15, 229, 181, + 12, 15, 229, 180, 12, 15, 229, 179, 12, 15, 229, 178, 12, 15, 229, 177, + 12, 15, 229, 176, 12, 15, 229, 175, 12, 15, 229, 174, 12, 15, 229, 173, + 12, 15, 229, 172, 12, 15, 229, 171, 12, 15, 229, 170, 12, 15, 229, 169, + 12, 15, 229, 168, 12, 15, 229, 167, 12, 15, 229, 166, 12, 15, 229, 165, + 12, 15, 229, 164, 12, 15, 229, 163, 12, 15, 229, 162, 12, 15, 229, 161, + 12, 15, 229, 160, 12, 15, 229, 159, 12, 15, 229, 158, 12, 15, 229, 157, + 12, 15, 229, 156, 12, 15, 229, 155, 12, 15, 229, 154, 12, 15, 229, 153, + 12, 15, 229, 152, 12, 15, 229, 151, 12, 15, 229, 150, 12, 15, 229, 149, + 12, 15, 229, 148, 12, 15, 229, 147, 12, 15, 229, 146, 12, 15, 229, 145, + 12, 15, 229, 144, 12, 15, 229, 143, 12, 15, 229, 142, 12, 15, 229, 141, + 12, 15, 229, 140, 12, 15, 229, 139, 12, 15, 229, 138, 12, 15, 229, 137, + 12, 15, 229, 136, 12, 15, 229, 135, 12, 15, 229, 134, 12, 15, 229, 133, + 12, 15, 229, 132, 12, 15, 229, 131, 12, 15, 229, 130, 12, 15, 229, 129, + 12, 15, 229, 128, 12, 15, 229, 127, 12, 15, 229, 126, 12, 15, 229, 125, + 12, 15, 229, 124, 12, 15, 229, 123, 12, 15, 229, 122, 12, 15, 229, 121, + 12, 15, 229, 120, 12, 15, 229, 119, 12, 15, 229, 118, 12, 15, 229, 117, + 12, 15, 229, 116, 12, 15, 229, 115, 12, 15, 229, 114, 12, 15, 229, 113, + 12, 15, 229, 112, 12, 15, 229, 111, 12, 15, 229, 110, 12, 15, 229, 109, + 12, 15, 229, 108, 12, 15, 229, 107, 12, 15, 229, 106, 12, 15, 229, 105, + 12, 15, 229, 104, 12, 15, 229, 103, 12, 15, 229, 102, 12, 15, 229, 101, + 12, 15, 229, 100, 12, 15, 229, 99, 12, 15, 229, 98, 12, 15, 229, 97, 12, + 15, 229, 96, 12, 15, 229, 95, 12, 15, 229, 94, 12, 15, 229, 93, 12, 15, + 229, 92, 12, 15, 229, 91, 12, 15, 229, 90, 12, 15, 229, 89, 12, 15, 229, + 88, 12, 15, 229, 87, 12, 15, 229, 86, 12, 15, 229, 85, 12, 15, 229, 84, + 12, 15, 229, 83, 12, 15, 229, 82, 12, 15, 229, 81, 12, 15, 229, 80, 12, + 15, 229, 79, 12, 15, 229, 78, 12, 15, 229, 77, 12, 15, 229, 76, 12, 15, + 229, 75, 12, 15, 229, 74, 12, 15, 229, 73, 12, 15, 229, 72, 12, 15, 229, + 71, 12, 15, 229, 70, 12, 15, 229, 69, 12, 15, 229, 68, 12, 15, 229, 67, + 12, 15, 229, 66, 12, 15, 229, 65, 12, 15, 229, 64, 12, 15, 229, 63, 12, + 15, 229, 62, 12, 15, 229, 61, 12, 15, 229, 60, 12, 15, 229, 59, 12, 15, + 229, 58, 12, 15, 229, 57, 12, 15, 229, 56, 12, 15, 229, 55, 12, 15, 229, + 54, 12, 15, 229, 53, 12, 15, 229, 52, 12, 15, 229, 51, 12, 15, 229, 50, + 12, 15, 229, 49, 12, 15, 229, 48, 12, 15, 229, 47, 12, 15, 229, 46, 12, + 15, 229, 45, 12, 15, 229, 44, 12, 15, 229, 43, 12, 15, 229, 42, 12, 15, + 229, 41, 12, 15, 229, 40, 12, 15, 229, 39, 12, 15, 229, 38, 12, 15, 229, + 37, 12, 15, 229, 36, 12, 15, 229, 35, 12, 15, 229, 34, 12, 15, 229, 33, + 12, 15, 229, 32, 12, 15, 229, 31, 12, 15, 229, 30, 12, 15, 229, 29, 12, + 15, 229, 28, 12, 15, 229, 27, 12, 15, 229, 26, 12, 15, 229, 25, 12, 15, + 229, 24, 12, 15, 229, 23, 12, 15, 229, 22, 12, 15, 229, 21, 12, 15, 229, + 20, 12, 15, 229, 19, 12, 15, 229, 18, 12, 15, 229, 17, 12, 15, 229, 16, + 12, 15, 229, 15, 12, 15, 229, 14, 12, 15, 229, 13, 12, 15, 229, 12, 12, + 15, 229, 11, 12, 15, 229, 10, 12, 15, 229, 9, 12, 15, 229, 8, 12, 15, + 229, 7, 12, 15, 229, 6, 12, 15, 229, 5, 12, 15, 229, 4, 12, 15, 229, 3, + 12, 15, 229, 2, 12, 15, 229, 1, 12, 15, 229, 0, 12, 15, 228, 255, 12, 15, + 228, 254, 12, 15, 228, 253, 12, 15, 228, 252, 12, 15, 228, 251, 12, 15, + 228, 250, 12, 15, 228, 249, 12, 15, 228, 248, 12, 15, 228, 247, 12, 15, + 228, 246, 12, 15, 228, 245, 12, 15, 228, 244, 12, 15, 228, 243, 12, 15, + 228, 242, 12, 15, 228, 241, 12, 15, 228, 240, 12, 15, 228, 239, 12, 15, + 228, 238, 12, 15, 228, 237, 12, 15, 228, 236, 12, 15, 228, 235, 12, 15, + 228, 234, 12, 15, 228, 233, 12, 15, 228, 232, 12, 15, 228, 231, 12, 15, + 228, 230, 12, 15, 228, 229, 12, 15, 228, 228, 12, 15, 228, 227, 12, 15, + 228, 226, 12, 15, 228, 225, 12, 15, 228, 224, 12, 15, 228, 223, 12, 15, + 228, 222, 12, 15, 228, 221, 12, 15, 228, 220, 12, 15, 228, 219, 12, 15, + 228, 218, 12, 15, 228, 217, 12, 15, 228, 216, 12, 15, 228, 215, 12, 15, + 228, 214, 12, 15, 228, 213, 12, 15, 228, 212, 12, 15, 228, 211, 12, 15, + 228, 210, 12, 15, 228, 209, 12, 15, 228, 208, 12, 15, 228, 207, 12, 15, + 228, 206, 12, 15, 228, 205, 12, 15, 228, 204, 12, 15, 228, 203, 12, 15, + 228, 202, 12, 15, 228, 201, 12, 15, 228, 200, 12, 15, 228, 199, 12, 15, + 228, 198, 12, 15, 228, 197, 12, 15, 228, 196, 12, 15, 228, 195, 12, 15, + 228, 194, 12, 15, 228, 193, 12, 15, 228, 192, 12, 15, 228, 191, 12, 15, + 228, 190, 12, 15, 228, 189, 12, 15, 228, 188, 12, 15, 228, 187, 12, 15, + 228, 186, 12, 15, 228, 185, 12, 15, 228, 184, 12, 15, 228, 183, 8, 4, 33, + 237, 116, 8, 4, 33, 237, 112, 8, 4, 33, 237, 56, 8, 4, 33, 237, 115, 8, + 4, 33, 237, 114, 8, 4, 33, 168, 212, 123, 207, 83, 8, 4, 33, 208, 123, + 184, 4, 33, 222, 41, 218, 201, 184, 4, 33, 222, 41, 239, 5, 184, 4, 33, + 222, 41, 228, 86, 184, 4, 33, 202, 239, 218, 201, 184, 4, 33, 222, 41, + 200, 173, 113, 1, 199, 235, 3, 234, 47, 113, 215, 100, 227, 146, 203, 71, + 113, 33, 200, 7, 199, 235, 199, 235, 216, 93, 113, 1, 251, 104, 250, 107, + 113, 1, 201, 28, 251, 142, 113, 1, 201, 28, 242, 23, 113, 1, 201, 28, + 234, 139, 113, 1, 201, 28, 227, 86, 113, 1, 201, 28, 225, 83, 113, 1, + 201, 28, 47, 222, 47, 113, 1, 201, 28, 213, 123, 113, 1, 201, 28, 206, + 217, 113, 1, 251, 104, 93, 54, 113, 1, 210, 22, 3, 210, 22, 240, 182, + 113, 1, 210, 22, 3, 209, 143, 240, 182, 113, 1, 210, 22, 3, 242, 43, 26, + 210, 22, 240, 182, 113, 1, 210, 22, 3, 242, 43, 26, 209, 143, 240, 182, + 113, 1, 140, 3, 216, 93, 113, 1, 140, 3, 214, 147, 113, 1, 140, 3, 222, + 163, 113, 1, 248, 211, 3, 242, 42, 113, 1, 235, 148, 3, 242, 42, 113, 1, + 242, 24, 3, 242, 42, 113, 1, 234, 140, 3, 222, 163, 113, 1, 203, 64, 3, + 242, 42, 113, 1, 199, 93, 3, 242, 42, 113, 1, 206, 147, 3, 242, 42, 113, + 1, 199, 235, 3, 242, 42, 113, 1, 47, 227, 87, 3, 242, 42, 113, 1, 227, + 87, 3, 242, 42, 113, 1, 225, 84, 3, 242, 42, 113, 1, 222, 48, 3, 242, 42, + 113, 1, 218, 90, 3, 242, 42, 113, 1, 212, 20, 3, 242, 42, 113, 1, 47, + 216, 74, 3, 242, 42, 113, 1, 216, 74, 3, 242, 42, 113, 1, 205, 28, 3, + 242, 42, 113, 1, 214, 107, 3, 242, 42, 113, 1, 213, 124, 3, 242, 42, 113, + 1, 210, 22, 3, 242, 42, 113, 1, 206, 218, 3, 242, 42, 113, 1, 203, 64, 3, + 233, 199, 113, 1, 248, 211, 3, 213, 232, 113, 1, 227, 87, 3, 213, 232, + 113, 1, 216, 74, 3, 213, 232, 113, 33, 140, 225, 83, 9, 1, 140, 201, 90, + 65, 19, 9, 1, 140, 201, 90, 47, 19, 9, 1, 248, 251, 65, 19, 9, 1, 248, + 251, 47, 19, 9, 1, 248, 251, 82, 19, 9, 1, 248, 251, 179, 19, 9, 1, 216, + 55, 65, 19, 9, 1, 216, 55, 47, 19, 9, 1, 216, 55, 82, 19, 9, 1, 216, 55, + 179, 19, 9, 1, 248, 239, 65, 19, 9, 1, 248, 239, 47, 19, 9, 1, 248, 239, + 82, 19, 9, 1, 248, 239, 179, 19, 9, 1, 204, 244, 65, 19, 9, 1, 204, 244, + 47, 19, 9, 1, 204, 244, 82, 19, 9, 1, 204, 244, 179, 19, 9, 1, 206, 182, + 65, 19, 9, 1, 206, 182, 47, 19, 9, 1, 206, 182, 82, 19, 9, 1, 206, 182, + 179, 19, 9, 1, 204, 246, 65, 19, 9, 1, 204, 246, 47, 19, 9, 1, 204, 246, + 82, 19, 9, 1, 204, 246, 179, 19, 9, 1, 203, 53, 65, 19, 9, 1, 203, 53, + 47, 19, 9, 1, 203, 53, 82, 19, 9, 1, 203, 53, 179, 19, 9, 1, 216, 53, 65, + 19, 9, 1, 216, 53, 47, 19, 9, 1, 216, 53, 82, 19, 9, 1, 216, 53, 179, 19, + 9, 1, 239, 100, 65, 19, 9, 1, 239, 100, 47, 19, 9, 1, 239, 100, 82, 19, + 9, 1, 239, 100, 179, 19, 9, 1, 218, 48, 65, 19, 9, 1, 218, 48, 47, 19, 9, + 1, 218, 48, 82, 19, 9, 1, 218, 48, 179, 19, 9, 1, 206, 206, 65, 19, 9, 1, + 206, 206, 47, 19, 9, 1, 206, 206, 82, 19, 9, 1, 206, 206, 179, 19, 9, 1, + 206, 204, 65, 19, 9, 1, 206, 204, 47, 19, 9, 1, 206, 204, 82, 19, 9, 1, + 206, 204, 179, 19, 9, 1, 241, 218, 65, 19, 9, 1, 241, 218, 47, 19, 9, 1, + 242, 37, 65, 19, 9, 1, 242, 37, 47, 19, 9, 1, 239, 128, 65, 19, 9, 1, + 239, 128, 47, 19, 9, 1, 241, 216, 65, 19, 9, 1, 241, 216, 47, 19, 9, 1, + 227, 222, 65, 19, 9, 1, 227, 222, 47, 19, 9, 1, 212, 208, 65, 19, 9, 1, + 212, 208, 47, 19, 9, 1, 226, 253, 65, 19, 9, 1, 226, 253, 47, 19, 9, 1, + 226, 253, 82, 19, 9, 1, 226, 253, 179, 19, 9, 1, 236, 77, 65, 19, 9, 1, + 236, 77, 47, 19, 9, 1, 236, 77, 82, 19, 9, 1, 236, 77, 179, 19, 9, 1, + 235, 38, 65, 19, 9, 1, 235, 38, 47, 19, 9, 1, 235, 38, 82, 19, 9, 1, 235, + 38, 179, 19, 9, 1, 219, 177, 65, 19, 9, 1, 219, 177, 47, 19, 9, 1, 219, + 177, 82, 19, 9, 1, 219, 177, 179, 19, 9, 1, 218, 228, 235, 166, 65, 19, + 9, 1, 218, 228, 235, 166, 47, 19, 9, 1, 213, 5, 65, 19, 9, 1, 213, 5, 47, + 19, 9, 1, 213, 5, 82, 19, 9, 1, 213, 5, 179, 19, 9, 1, 234, 116, 3, 90, + 88, 65, 19, 9, 1, 234, 116, 3, 90, 88, 47, 19, 9, 1, 234, 116, 235, 114, + 65, 19, 9, 1, 234, 116, 235, 114, 47, 19, 9, 1, 234, 116, 235, 114, 82, + 19, 9, 1, 234, 116, 235, 114, 179, 19, 9, 1, 234, 116, 240, 208, 65, 19, + 9, 1, 234, 116, 240, 208, 47, 19, 9, 1, 234, 116, 240, 208, 82, 19, 9, 1, + 234, 116, 240, 208, 179, 19, 9, 1, 90, 249, 70, 65, 19, 9, 1, 90, 249, + 70, 47, 19, 9, 1, 90, 249, 70, 3, 234, 204, 88, 65, 19, 9, 1, 90, 249, + 70, 3, 234, 204, 88, 47, 19, 9, 16, 73, 56, 9, 16, 73, 57, 9, 16, 120, + 190, 56, 9, 16, 120, 190, 57, 9, 16, 126, 190, 56, 9, 16, 126, 190, 57, + 9, 16, 126, 190, 215, 96, 191, 56, 9, 16, 126, 190, 215, 96, 191, 57, 9, + 16, 236, 229, 190, 56, 9, 16, 236, 229, 190, 57, 9, 16, 53, 83, 249, 77, + 57, 9, 16, 120, 190, 202, 248, 56, 9, 16, 120, 190, 202, 248, 57, 9, 16, + 213, 26, 9, 16, 4, 207, 10, 56, 9, 16, 4, 207, 10, 57, 9, 1, 220, 0, 65, + 19, 9, 1, 220, 0, 47, 19, 9, 1, 220, 0, 82, 19, 9, 1, 220, 0, 179, 19, 9, + 1, 108, 65, 19, 9, 1, 108, 47, 19, 9, 1, 217, 122, 65, 19, 9, 1, 217, + 122, 47, 19, 9, 1, 199, 212, 65, 19, 9, 1, 199, 212, 47, 19, 9, 1, 108, + 3, 234, 204, 88, 65, 19, 9, 1, 203, 60, 65, 19, 9, 1, 203, 60, 47, 19, 9, + 1, 226, 139, 217, 122, 65, 19, 9, 1, 226, 139, 217, 122, 47, 19, 9, 1, + 226, 139, 199, 212, 65, 19, 9, 1, 226, 139, 199, 212, 47, 19, 9, 1, 197, + 65, 19, 9, 1, 197, 47, 19, 9, 1, 197, 82, 19, 9, 1, 197, 179, 19, 9, 1, + 204, 22, 227, 12, 226, 139, 140, 222, 188, 82, 19, 9, 1, 204, 22, 227, + 12, 226, 139, 140, 222, 188, 179, 19, 9, 33, 90, 3, 234, 204, 88, 3, 140, + 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, 140, 47, 19, 9, 33, 90, 3, 234, + 204, 88, 3, 251, 222, 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, 251, 222, + 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 201, 73, 65, 19, 9, 33, 90, 3, + 234, 204, 88, 3, 201, 73, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 108, 65, + 19, 9, 33, 90, 3, 234, 204, 88, 3, 108, 47, 19, 9, 33, 90, 3, 234, 204, + 88, 3, 217, 122, 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, 217, 122, 47, 19, + 9, 33, 90, 3, 234, 204, 88, 3, 199, 212, 65, 19, 9, 33, 90, 3, 234, 204, + 88, 3, 199, 212, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 197, 65, 19, 9, + 33, 90, 3, 234, 204, 88, 3, 197, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, + 197, 82, 19, 9, 33, 204, 22, 226, 139, 90, 3, 234, 204, 88, 3, 140, 222, + 188, 65, 19, 9, 33, 204, 22, 226, 139, 90, 3, 234, 204, 88, 3, 140, 222, + 188, 47, 19, 9, 33, 204, 22, 226, 139, 90, 3, 234, 204, 88, 3, 140, 222, + 188, 82, 19, 9, 1, 237, 162, 90, 65, 19, 9, 1, 237, 162, 90, 47, 19, 9, + 1, 237, 162, 90, 82, 19, 9, 1, 237, 162, 90, 179, 19, 9, 33, 90, 3, 234, + 204, 88, 3, 193, 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, 155, 65, 19, 9, + 33, 90, 3, 234, 204, 88, 3, 84, 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, + 140, 222, 188, 65, 19, 9, 33, 90, 3, 234, 204, 88, 3, 90, 65, 19, 9, 33, + 248, 241, 3, 193, 65, 19, 9, 33, 248, 241, 3, 155, 65, 19, 9, 33, 248, + 241, 3, 226, 204, 65, 19, 9, 33, 248, 241, 3, 84, 65, 19, 9, 33, 248, + 241, 3, 140, 222, 188, 65, 19, 9, 33, 248, 241, 3, 90, 65, 19, 9, 33, + 206, 184, 3, 193, 65, 19, 9, 33, 206, 184, 3, 155, 65, 19, 9, 33, 206, + 184, 3, 226, 204, 65, 19, 9, 33, 206, 184, 3, 84, 65, 19, 9, 33, 206, + 184, 3, 140, 222, 188, 65, 19, 9, 33, 206, 184, 3, 90, 65, 19, 9, 33, + 206, 103, 3, 193, 65, 19, 9, 33, 206, 103, 3, 84, 65, 19, 9, 33, 206, + 103, 3, 140, 222, 188, 65, 19, 9, 33, 206, 103, 3, 90, 65, 19, 9, 33, + 193, 3, 155, 65, 19, 9, 33, 193, 3, 84, 65, 19, 9, 33, 155, 3, 193, 65, + 19, 9, 33, 155, 3, 84, 65, 19, 9, 33, 226, 204, 3, 193, 65, 19, 9, 33, + 226, 204, 3, 155, 65, 19, 9, 33, 226, 204, 3, 84, 65, 19, 9, 33, 211, + 187, 3, 193, 65, 19, 9, 33, 211, 187, 3, 155, 65, 19, 9, 33, 211, 187, 3, + 226, 204, 65, 19, 9, 33, 211, 187, 3, 84, 65, 19, 9, 33, 212, 57, 3, 155, + 65, 19, 9, 33, 212, 57, 3, 84, 65, 19, 9, 33, 242, 53, 3, 193, 65, 19, 9, + 33, 242, 53, 3, 155, 65, 19, 9, 33, 242, 53, 3, 226, 204, 65, 19, 9, 33, + 242, 53, 3, 84, 65, 19, 9, 33, 207, 10, 3, 155, 65, 19, 9, 33, 207, 10, + 3, 84, 65, 19, 9, 33, 199, 109, 3, 84, 65, 19, 9, 33, 251, 172, 3, 193, + 65, 19, 9, 33, 251, 172, 3, 84, 65, 19, 9, 33, 235, 195, 3, 193, 65, 19, + 9, 33, 235, 195, 3, 84, 65, 19, 9, 33, 237, 135, 3, 193, 65, 19, 9, 33, + 237, 135, 3, 155, 65, 19, 9, 33, 237, 135, 3, 226, 204, 65, 19, 9, 33, + 237, 135, 3, 84, 65, 19, 9, 33, 237, 135, 3, 140, 222, 188, 65, 19, 9, + 33, 237, 135, 3, 90, 65, 19, 9, 33, 214, 153, 3, 155, 65, 19, 9, 33, 214, + 153, 3, 84, 65, 19, 9, 33, 214, 153, 3, 140, 222, 188, 65, 19, 9, 33, + 214, 153, 3, 90, 65, 19, 9, 33, 227, 87, 3, 140, 65, 19, 9, 33, 227, 87, + 3, 193, 65, 19, 9, 33, 227, 87, 3, 155, 65, 19, 9, 33, 227, 87, 3, 226, + 204, 65, 19, 9, 33, 227, 87, 3, 225, 92, 65, 19, 9, 33, 227, 87, 3, 84, + 65, 19, 9, 33, 227, 87, 3, 140, 222, 188, 65, 19, 9, 33, 227, 87, 3, 90, + 65, 19, 9, 33, 225, 92, 3, 193, 65, 19, 9, 33, 225, 92, 3, 155, 65, 19, + 9, 33, 225, 92, 3, 226, 204, 65, 19, 9, 33, 225, 92, 3, 84, 65, 19, 9, + 33, 225, 92, 3, 140, 222, 188, 65, 19, 9, 33, 225, 92, 3, 90, 65, 19, 9, + 33, 84, 3, 193, 65, 19, 9, 33, 84, 3, 155, 65, 19, 9, 33, 84, 3, 226, + 204, 65, 19, 9, 33, 84, 3, 84, 65, 19, 9, 33, 84, 3, 140, 222, 188, 65, + 19, 9, 33, 84, 3, 90, 65, 19, 9, 33, 218, 228, 3, 193, 65, 19, 9, 33, + 218, 228, 3, 155, 65, 19, 9, 33, 218, 228, 3, 226, 204, 65, 19, 9, 33, + 218, 228, 3, 84, 65, 19, 9, 33, 218, 228, 3, 140, 222, 188, 65, 19, 9, + 33, 218, 228, 3, 90, 65, 19, 9, 33, 234, 116, 3, 193, 65, 19, 9, 33, 234, + 116, 3, 84, 65, 19, 9, 33, 234, 116, 3, 140, 222, 188, 65, 19, 9, 33, + 234, 116, 3, 90, 65, 19, 9, 33, 90, 3, 193, 65, 19, 9, 33, 90, 3, 155, + 65, 19, 9, 33, 90, 3, 226, 204, 65, 19, 9, 33, 90, 3, 84, 65, 19, 9, 33, + 90, 3, 140, 222, 188, 65, 19, 9, 33, 90, 3, 90, 65, 19, 9, 33, 206, 115, + 3, 207, 213, 140, 65, 19, 9, 33, 213, 155, 3, 207, 213, 140, 65, 19, 9, + 33, 140, 222, 188, 3, 207, 213, 140, 65, 19, 9, 33, 210, 105, 3, 242, 16, + 65, 19, 9, 33, 210, 105, 3, 227, 35, 65, 19, 9, 33, 210, 105, 3, 237, + 159, 65, 19, 9, 33, 210, 105, 3, 242, 18, 65, 19, 9, 33, 210, 105, 3, + 227, 37, 65, 19, 9, 33, 210, 105, 3, 207, 213, 140, 65, 19, 9, 33, 90, 3, + 234, 204, 88, 3, 213, 155, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 199, + 106, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 84, 47, 19, 9, 33, 90, 3, + 234, 204, 88, 3, 218, 228, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 140, + 222, 188, 47, 19, 9, 33, 90, 3, 234, 204, 88, 3, 90, 47, 19, 9, 33, 248, + 241, 3, 213, 155, 47, 19, 9, 33, 248, 241, 3, 199, 106, 47, 19, 9, 33, + 248, 241, 3, 84, 47, 19, 9, 33, 248, 241, 3, 218, 228, 47, 19, 9, 33, + 248, 241, 3, 140, 222, 188, 47, 19, 9, 33, 248, 241, 3, 90, 47, 19, 9, + 33, 206, 184, 3, 213, 155, 47, 19, 9, 33, 206, 184, 3, 199, 106, 47, 19, + 9, 33, 206, 184, 3, 84, 47, 19, 9, 33, 206, 184, 3, 218, 228, 47, 19, 9, + 33, 206, 184, 3, 140, 222, 188, 47, 19, 9, 33, 206, 184, 3, 90, 47, 19, + 9, 33, 206, 103, 3, 213, 155, 47, 19, 9, 33, 206, 103, 3, 199, 106, 47, + 19, 9, 33, 206, 103, 3, 84, 47, 19, 9, 33, 206, 103, 3, 218, 228, 47, 19, + 9, 33, 206, 103, 3, 140, 222, 188, 47, 19, 9, 33, 206, 103, 3, 90, 47, + 19, 9, 33, 237, 135, 3, 140, 222, 188, 47, 19, 9, 33, 237, 135, 3, 90, + 47, 19, 9, 33, 214, 153, 3, 140, 222, 188, 47, 19, 9, 33, 214, 153, 3, + 90, 47, 19, 9, 33, 227, 87, 3, 140, 47, 19, 9, 33, 227, 87, 3, 225, 92, + 47, 19, 9, 33, 227, 87, 3, 84, 47, 19, 9, 33, 227, 87, 3, 140, 222, 188, + 47, 19, 9, 33, 227, 87, 3, 90, 47, 19, 9, 33, 225, 92, 3, 84, 47, 19, 9, + 33, 225, 92, 3, 140, 222, 188, 47, 19, 9, 33, 225, 92, 3, 90, 47, 19, 9, + 33, 84, 3, 140, 47, 19, 9, 33, 84, 3, 84, 47, 19, 9, 33, 218, 228, 3, + 213, 155, 47, 19, 9, 33, 218, 228, 3, 199, 106, 47, 19, 9, 33, 218, 228, + 3, 84, 47, 19, 9, 33, 218, 228, 3, 218, 228, 47, 19, 9, 33, 218, 228, 3, + 140, 222, 188, 47, 19, 9, 33, 218, 228, 3, 90, 47, 19, 9, 33, 140, 222, + 188, 3, 207, 213, 140, 47, 19, 9, 33, 90, 3, 213, 155, 47, 19, 9, 33, 90, + 3, 199, 106, 47, 19, 9, 33, 90, 3, 84, 47, 19, 9, 33, 90, 3, 218, 228, + 47, 19, 9, 33, 90, 3, 140, 222, 188, 47, 19, 9, 33, 90, 3, 90, 47, 19, 9, + 33, 90, 3, 234, 204, 88, 3, 193, 82, 19, 9, 33, 90, 3, 234, 204, 88, 3, + 155, 82, 19, 9, 33, 90, 3, 234, 204, 88, 3, 226, 204, 82, 19, 9, 33, 90, + 3, 234, 204, 88, 3, 84, 82, 19, 9, 33, 90, 3, 234, 204, 88, 3, 234, 116, + 82, 19, 9, 33, 248, 241, 3, 193, 82, 19, 9, 33, 248, 241, 3, 155, 82, 19, + 9, 33, 248, 241, 3, 226, 204, 82, 19, 9, 33, 248, 241, 3, 84, 82, 19, 9, + 33, 248, 241, 3, 234, 116, 82, 19, 9, 33, 206, 184, 3, 193, 82, 19, 9, + 33, 206, 184, 3, 155, 82, 19, 9, 33, 206, 184, 3, 226, 204, 82, 19, 9, + 33, 206, 184, 3, 84, 82, 19, 9, 33, 206, 184, 3, 234, 116, 82, 19, 9, 33, + 206, 103, 3, 84, 82, 19, 9, 33, 193, 3, 155, 82, 19, 9, 33, 193, 3, 84, + 82, 19, 9, 33, 155, 3, 193, 82, 19, 9, 33, 155, 3, 84, 82, 19, 9, 33, + 226, 204, 3, 193, 82, 19, 9, 33, 226, 204, 3, 84, 82, 19, 9, 33, 211, + 187, 3, 193, 82, 19, 9, 33, 211, 187, 3, 155, 82, 19, 9, 33, 211, 187, 3, + 226, 204, 82, 19, 9, 33, 211, 187, 3, 84, 82, 19, 9, 33, 212, 57, 3, 155, + 82, 19, 9, 33, 212, 57, 3, 226, 204, 82, 19, 9, 33, 212, 57, 3, 84, 82, + 19, 9, 33, 242, 53, 3, 193, 82, 19, 9, 33, 242, 53, 3, 155, 82, 19, 9, + 33, 242, 53, 3, 226, 204, 82, 19, 9, 33, 242, 53, 3, 84, 82, 19, 9, 33, + 207, 10, 3, 155, 82, 19, 9, 33, 199, 109, 3, 84, 82, 19, 9, 33, 251, 172, + 3, 193, 82, 19, 9, 33, 251, 172, 3, 84, 82, 19, 9, 33, 235, 195, 3, 193, + 82, 19, 9, 33, 235, 195, 3, 84, 82, 19, 9, 33, 237, 135, 3, 193, 82, 19, + 9, 33, 237, 135, 3, 155, 82, 19, 9, 33, 237, 135, 3, 226, 204, 82, 19, 9, + 33, 237, 135, 3, 84, 82, 19, 9, 33, 214, 153, 3, 155, 82, 19, 9, 33, 214, + 153, 3, 84, 82, 19, 9, 33, 227, 87, 3, 193, 82, 19, 9, 33, 227, 87, 3, + 155, 82, 19, 9, 33, 227, 87, 3, 226, 204, 82, 19, 9, 33, 227, 87, 3, 225, + 92, 82, 19, 9, 33, 227, 87, 3, 84, 82, 19, 9, 33, 225, 92, 3, 193, 82, + 19, 9, 33, 225, 92, 3, 155, 82, 19, 9, 33, 225, 92, 3, 226, 204, 82, 19, + 9, 33, 225, 92, 3, 84, 82, 19, 9, 33, 225, 92, 3, 234, 116, 82, 19, 9, + 33, 84, 3, 193, 82, 19, 9, 33, 84, 3, 155, 82, 19, 9, 33, 84, 3, 226, + 204, 82, 19, 9, 33, 84, 3, 84, 82, 19, 9, 33, 218, 228, 3, 193, 82, 19, + 9, 33, 218, 228, 3, 155, 82, 19, 9, 33, 218, 228, 3, 226, 204, 82, 19, 9, + 33, 218, 228, 3, 84, 82, 19, 9, 33, 218, 228, 3, 234, 116, 82, 19, 9, 33, + 234, 116, 3, 193, 82, 19, 9, 33, 234, 116, 3, 84, 82, 19, 9, 33, 234, + 116, 3, 207, 213, 140, 82, 19, 9, 33, 90, 3, 193, 82, 19, 9, 33, 90, 3, + 155, 82, 19, 9, 33, 90, 3, 226, 204, 82, 19, 9, 33, 90, 3, 84, 82, 19, 9, + 33, 90, 3, 234, 116, 82, 19, 9, 33, 90, 3, 234, 204, 88, 3, 84, 179, 19, + 9, 33, 90, 3, 234, 204, 88, 3, 234, 116, 179, 19, 9, 33, 248, 241, 3, 84, + 179, 19, 9, 33, 248, 241, 3, 234, 116, 179, 19, 9, 33, 206, 184, 3, 84, + 179, 19, 9, 33, 206, 184, 3, 234, 116, 179, 19, 9, 33, 206, 103, 3, 84, + 179, 19, 9, 33, 206, 103, 3, 234, 116, 179, 19, 9, 33, 211, 187, 3, 84, + 179, 19, 9, 33, 211, 187, 3, 234, 116, 179, 19, 9, 33, 210, 62, 3, 84, + 179, 19, 9, 33, 210, 62, 3, 234, 116, 179, 19, 9, 33, 227, 87, 3, 225, + 92, 179, 19, 9, 33, 227, 87, 3, 84, 179, 19, 9, 33, 225, 92, 3, 84, 179, + 19, 9, 33, 218, 228, 3, 84, 179, 19, 9, 33, 218, 228, 3, 234, 116, 179, + 19, 9, 33, 90, 3, 84, 179, 19, 9, 33, 90, 3, 234, 116, 179, 19, 9, 33, + 210, 105, 3, 237, 159, 179, 19, 9, 33, 210, 105, 3, 242, 18, 179, 19, 9, + 33, 210, 105, 3, 227, 37, 179, 19, 9, 33, 207, 10, 3, 140, 222, 188, 65, + 19, 9, 33, 207, 10, 3, 90, 65, 19, 9, 33, 251, 172, 3, 140, 222, 188, 65, + 19, 9, 33, 251, 172, 3, 90, 65, 19, 9, 33, 235, 195, 3, 140, 222, 188, + 65, 19, 9, 33, 235, 195, 3, 90, 65, 19, 9, 33, 211, 187, 3, 140, 222, + 188, 65, 19, 9, 33, 211, 187, 3, 90, 65, 19, 9, 33, 210, 62, 3, 140, 222, + 188, 65, 19, 9, 33, 210, 62, 3, 90, 65, 19, 9, 33, 155, 3, 140, 222, 188, + 65, 19, 9, 33, 155, 3, 90, 65, 19, 9, 33, 193, 3, 140, 222, 188, 65, 19, + 9, 33, 193, 3, 90, 65, 19, 9, 33, 226, 204, 3, 140, 222, 188, 65, 19, 9, + 33, 226, 204, 3, 90, 65, 19, 9, 33, 212, 57, 3, 140, 222, 188, 65, 19, 9, + 33, 212, 57, 3, 90, 65, 19, 9, 33, 242, 53, 3, 140, 222, 188, 65, 19, 9, + 33, 242, 53, 3, 90, 65, 19, 9, 33, 210, 62, 3, 193, 65, 19, 9, 33, 210, + 62, 3, 155, 65, 19, 9, 33, 210, 62, 3, 226, 204, 65, 19, 9, 33, 210, 62, + 3, 84, 65, 19, 9, 33, 210, 62, 3, 213, 155, 65, 19, 9, 33, 211, 187, 3, + 213, 155, 65, 19, 9, 33, 212, 57, 3, 213, 155, 65, 19, 9, 33, 242, 53, 3, + 213, 155, 65, 19, 9, 33, 207, 10, 3, 140, 222, 188, 47, 19, 9, 33, 207, + 10, 3, 90, 47, 19, 9, 33, 251, 172, 3, 140, 222, 188, 47, 19, 9, 33, 251, + 172, 3, 90, 47, 19, 9, 33, 235, 195, 3, 140, 222, 188, 47, 19, 9, 33, + 235, 195, 3, 90, 47, 19, 9, 33, 211, 187, 3, 140, 222, 188, 47, 19, 9, + 33, 211, 187, 3, 90, 47, 19, 9, 33, 210, 62, 3, 140, 222, 188, 47, 19, 9, + 33, 210, 62, 3, 90, 47, 19, 9, 33, 155, 3, 140, 222, 188, 47, 19, 9, 33, + 155, 3, 90, 47, 19, 9, 33, 193, 3, 140, 222, 188, 47, 19, 9, 33, 193, 3, + 90, 47, 19, 9, 33, 226, 204, 3, 140, 222, 188, 47, 19, 9, 33, 226, 204, + 3, 90, 47, 19, 9, 33, 212, 57, 3, 140, 222, 188, 47, 19, 9, 33, 212, 57, + 3, 90, 47, 19, 9, 33, 242, 53, 3, 140, 222, 188, 47, 19, 9, 33, 242, 53, + 3, 90, 47, 19, 9, 33, 210, 62, 3, 193, 47, 19, 9, 33, 210, 62, 3, 155, + 47, 19, 9, 33, 210, 62, 3, 226, 204, 47, 19, 9, 33, 210, 62, 3, 84, 47, + 19, 9, 33, 210, 62, 3, 213, 155, 47, 19, 9, 33, 211, 187, 3, 213, 155, + 47, 19, 9, 33, 212, 57, 3, 213, 155, 47, 19, 9, 33, 242, 53, 3, 213, 155, + 47, 19, 9, 33, 210, 62, 3, 193, 82, 19, 9, 33, 210, 62, 3, 155, 82, 19, + 9, 33, 210, 62, 3, 226, 204, 82, 19, 9, 33, 210, 62, 3, 84, 82, 19, 9, + 33, 211, 187, 3, 234, 116, 82, 19, 9, 33, 210, 62, 3, 234, 116, 82, 19, + 9, 33, 207, 10, 3, 84, 82, 19, 9, 33, 211, 187, 3, 193, 179, 19, 9, 33, + 211, 187, 3, 155, 179, 19, 9, 33, 211, 187, 3, 226, 204, 179, 19, 9, 33, + 210, 62, 3, 193, 179, 19, 9, 33, 210, 62, 3, 155, 179, 19, 9, 33, 210, + 62, 3, 226, 204, 179, 19, 9, 33, 207, 10, 3, 84, 179, 19, 9, 33, 199, + 109, 3, 84, 179, 19, 9, 33, 140, 3, 237, 157, 47, 19, 9, 33, 140, 3, 237, + 157, 65, 19, 217, 19, 49, 216, 115, 217, 19, 51, 216, 115, 9, 33, 206, + 184, 3, 193, 3, 84, 82, 19, 9, 33, 206, 184, 3, 155, 3, 193, 47, 19, 9, + 33, 206, 184, 3, 155, 3, 193, 82, 19, 9, 33, 206, 184, 3, 155, 3, 84, 82, + 19, 9, 33, 206, 184, 3, 226, 204, 3, 84, 82, 19, 9, 33, 206, 184, 3, 84, + 3, 193, 82, 19, 9, 33, 206, 184, 3, 84, 3, 155, 82, 19, 9, 33, 206, 184, + 3, 84, 3, 226, 204, 82, 19, 9, 33, 193, 3, 84, 3, 155, 47, 19, 9, 33, + 193, 3, 84, 3, 155, 82, 19, 9, 33, 155, 3, 84, 3, 90, 47, 19, 9, 33, 155, + 3, 84, 3, 140, 222, 188, 47, 19, 9, 33, 211, 187, 3, 155, 3, 193, 82, 19, + 9, 33, 211, 187, 3, 193, 3, 155, 82, 19, 9, 33, 211, 187, 3, 193, 3, 140, + 222, 188, 47, 19, 9, 33, 211, 187, 3, 84, 3, 155, 47, 19, 9, 33, 211, + 187, 3, 84, 3, 155, 82, 19, 9, 33, 211, 187, 3, 84, 3, 193, 82, 19, 9, + 33, 211, 187, 3, 84, 3, 84, 47, 19, 9, 33, 211, 187, 3, 84, 3, 84, 82, + 19, 9, 33, 212, 57, 3, 155, 3, 155, 47, 19, 9, 33, 212, 57, 3, 155, 3, + 155, 82, 19, 9, 33, 212, 57, 3, 84, 3, 84, 47, 19, 9, 33, 210, 62, 3, + 155, 3, 84, 47, 19, 9, 33, 210, 62, 3, 155, 3, 84, 82, 19, 9, 33, 210, + 62, 3, 193, 3, 90, 47, 19, 9, 33, 210, 62, 3, 84, 3, 226, 204, 47, 19, 9, + 33, 210, 62, 3, 84, 3, 226, 204, 82, 19, 9, 33, 210, 62, 3, 84, 3, 84, + 47, 19, 9, 33, 210, 62, 3, 84, 3, 84, 82, 19, 9, 33, 242, 53, 3, 155, 3, + 140, 222, 188, 47, 19, 9, 33, 242, 53, 3, 226, 204, 3, 84, 47, 19, 9, 33, + 242, 53, 3, 226, 204, 3, 84, 82, 19, 9, 33, 207, 10, 3, 84, 3, 155, 47, + 19, 9, 33, 207, 10, 3, 84, 3, 155, 82, 19, 9, 33, 207, 10, 3, 84, 3, 84, + 82, 19, 9, 33, 207, 10, 3, 84, 3, 90, 47, 19, 9, 33, 251, 172, 3, 193, 3, + 84, 47, 19, 9, 33, 251, 172, 3, 84, 3, 84, 47, 19, 9, 33, 251, 172, 3, + 84, 3, 84, 82, 19, 9, 33, 251, 172, 3, 84, 3, 140, 222, 188, 47, 19, 9, + 33, 235, 195, 3, 84, 3, 84, 47, 19, 9, 33, 235, 195, 3, 84, 3, 90, 47, + 19, 9, 33, 235, 195, 3, 84, 3, 140, 222, 188, 47, 19, 9, 33, 237, 135, 3, + 226, 204, 3, 84, 47, 19, 9, 33, 237, 135, 3, 226, 204, 3, 84, 82, 19, 9, + 33, 214, 153, 3, 84, 3, 155, 47, 19, 9, 33, 214, 153, 3, 84, 3, 84, 47, + 19, 9, 33, 225, 92, 3, 155, 3, 84, 47, 19, 9, 33, 225, 92, 3, 155, 3, 90, + 47, 19, 9, 33, 225, 92, 3, 155, 3, 140, 222, 188, 47, 19, 9, 33, 225, 92, + 3, 193, 3, 193, 82, 19, 9, 33, 225, 92, 3, 193, 3, 193, 47, 19, 9, 33, + 225, 92, 3, 226, 204, 3, 84, 47, 19, 9, 33, 225, 92, 3, 226, 204, 3, 84, + 82, 19, 9, 33, 225, 92, 3, 84, 3, 155, 47, 19, 9, 33, 225, 92, 3, 84, 3, + 155, 82, 19, 9, 33, 84, 3, 155, 3, 193, 82, 19, 9, 33, 84, 3, 155, 3, 84, + 82, 19, 9, 33, 84, 3, 155, 3, 90, 47, 19, 9, 33, 84, 3, 193, 3, 155, 82, + 19, 9, 33, 84, 3, 193, 3, 84, 82, 19, 9, 33, 84, 3, 226, 204, 3, 193, 82, + 19, 9, 33, 84, 3, 226, 204, 3, 84, 82, 19, 9, 33, 84, 3, 193, 3, 226, + 204, 82, 19, 9, 33, 234, 116, 3, 84, 3, 193, 82, 19, 9, 33, 234, 116, 3, + 84, 3, 84, 82, 19, 9, 33, 218, 228, 3, 155, 3, 84, 82, 19, 9, 33, 218, + 228, 3, 155, 3, 140, 222, 188, 47, 19, 9, 33, 218, 228, 3, 193, 3, 84, + 47, 19, 9, 33, 218, 228, 3, 193, 3, 84, 82, 19, 9, 33, 218, 228, 3, 193, + 3, 140, 222, 188, 47, 19, 9, 33, 218, 228, 3, 84, 3, 90, 47, 19, 9, 33, + 218, 228, 3, 84, 3, 140, 222, 188, 47, 19, 9, 33, 90, 3, 84, 3, 84, 47, + 19, 9, 33, 90, 3, 84, 3, 84, 82, 19, 9, 33, 248, 241, 3, 226, 204, 3, 90, + 47, 19, 9, 33, 206, 184, 3, 193, 3, 90, 47, 19, 9, 33, 206, 184, 3, 193, + 3, 140, 222, 188, 47, 19, 9, 33, 206, 184, 3, 226, 204, 3, 90, 47, 19, 9, + 33, 206, 184, 3, 226, 204, 3, 140, 222, 188, 47, 19, 9, 33, 206, 184, 3, + 84, 3, 90, 47, 19, 9, 33, 206, 184, 3, 84, 3, 140, 222, 188, 47, 19, 9, + 33, 193, 3, 84, 3, 90, 47, 19, 9, 33, 193, 3, 155, 3, 140, 222, 188, 47, + 19, 9, 33, 193, 3, 84, 3, 140, 222, 188, 47, 19, 9, 33, 211, 187, 3, 226, + 204, 3, 140, 222, 188, 47, 19, 9, 33, 212, 57, 3, 155, 3, 90, 47, 19, 9, + 33, 210, 62, 3, 155, 3, 90, 47, 19, 9, 33, 242, 53, 3, 155, 3, 90, 47, + 19, 9, 33, 225, 92, 3, 193, 3, 90, 47, 19, 9, 33, 225, 92, 3, 84, 3, 90, + 47, 19, 9, 33, 90, 3, 155, 3, 90, 47, 19, 9, 33, 90, 3, 193, 3, 90, 47, + 19, 9, 33, 90, 3, 84, 3, 90, 47, 19, 9, 33, 84, 3, 84, 3, 90, 47, 19, 9, + 33, 214, 153, 3, 84, 3, 90, 47, 19, 9, 33, 218, 228, 3, 155, 3, 90, 47, + 19, 9, 33, 214, 153, 3, 84, 3, 155, 82, 19, 9, 33, 225, 92, 3, 155, 3, + 84, 82, 19, 9, 33, 251, 172, 3, 84, 3, 90, 47, 19, 9, 33, 227, 87, 3, 84, + 3, 90, 47, 19, 9, 33, 218, 228, 3, 193, 3, 155, 82, 19, 9, 33, 84, 3, + 226, 204, 3, 90, 47, 19, 9, 33, 225, 92, 3, 193, 3, 84, 82, 19, 9, 33, + 227, 87, 3, 84, 3, 84, 47, 19, 9, 33, 225, 92, 3, 193, 3, 84, 47, 19, 9, + 33, 218, 228, 3, 193, 3, 155, 47, 19, 9, 33, 193, 3, 155, 3, 90, 47, 19, + 9, 33, 155, 3, 193, 3, 90, 47, 19, 9, 33, 84, 3, 193, 3, 90, 47, 19, 9, + 33, 237, 135, 3, 84, 3, 90, 47, 19, 9, 33, 248, 241, 3, 155, 3, 90, 47, + 19, 9, 33, 227, 87, 3, 84, 3, 84, 82, 19, 9, 33, 251, 172, 3, 193, 3, 84, + 82, 19, 9, 33, 212, 57, 3, 84, 3, 84, 82, 19, 9, 33, 211, 187, 3, 226, + 204, 3, 90, 47, 19, 9, 33, 218, 228, 3, 193, 3, 90, 47, 19, 9, 33, 212, + 30, 203, 192, 250, 189, 226, 60, 208, 77, 2, 65, 19, 9, 33, 214, 149, + 203, 192, 250, 189, 226, 60, 208, 77, 2, 65, 19, 9, 33, 251, 123, 65, 19, + 9, 33, 251, 156, 65, 19, 9, 33, 221, 109, 65, 19, 9, 33, 212, 31, 65, 19, + 9, 33, 213, 206, 65, 19, 9, 33, 251, 145, 65, 19, 9, 33, 201, 92, 65, 19, + 9, 33, 212, 30, 65, 19, 9, 33, 212, 29, 251, 145, 201, 91, 9, 33, 227, + 239, 213, 87, 54, 9, 33, 248, 154, 250, 251, 250, 252, 58, 211, 174, 58, + 211, 63, 58, 210, 251, 58, 210, 240, 58, 210, 229, 58, 210, 218, 58, 210, + 207, 58, 210, 196, 58, 210, 185, 58, 211, 173, 58, 211, 162, 58, 211, + 151, 58, 211, 140, 58, 211, 129, 58, 211, 118, 58, 211, 107, 215, 19, + 236, 242, 36, 83, 246, 70, 215, 19, 236, 242, 36, 83, 141, 246, 70, 215, + 19, 236, 242, 36, 83, 141, 236, 183, 208, 76, 215, 19, 236, 242, 36, 83, + 246, 79, 215, 19, 236, 242, 36, 83, 210, 167, 215, 19, 236, 242, 36, 83, + 238, 43, 81, 215, 19, 236, 242, 36, 83, 214, 79, 81, 215, 19, 236, 242, + 36, 83, 49, 64, 224, 247, 159, 215, 19, 236, 242, 36, 83, 51, 64, 224, + 247, 248, 68, 215, 19, 236, 242, 36, 83, 233, 177, 238, 195, 38, 33, 49, + 234, 213, 38, 33, 51, 234, 213, 38, 53, 205, 241, 49, 234, 213, 38, 53, + 205, 241, 51, 234, 213, 38, 222, 229, 49, 234, 213, 38, 222, 229, 51, + 234, 213, 38, 243, 56, 222, 228, 38, 33, 49, 167, 57, 38, 33, 51, 167, + 57, 38, 205, 241, 49, 167, 57, 38, 205, 241, 51, 167, 57, 38, 222, 229, + 49, 167, 57, 38, 222, 229, 51, 167, 57, 38, 243, 56, 222, 229, 57, 38, + 37, 205, 211, 49, 234, 213, 38, 37, 205, 211, 51, 234, 213, 215, 19, 236, + 242, 36, 83, 120, 73, 225, 38, 215, 19, 236, 242, 36, 83, 238, 191, 241, + 244, 215, 19, 236, 242, 36, 83, 238, 180, 241, 244, 215, 19, 236, 242, + 36, 83, 128, 224, 176, 215, 19, 236, 242, 36, 83, 201, 74, 128, 224, 176, + 215, 19, 236, 242, 36, 83, 49, 216, 115, 215, 19, 236, 242, 36, 83, 51, + 216, 115, 215, 19, 236, 242, 36, 83, 49, 242, 196, 159, 215, 19, 236, + 242, 36, 83, 51, 242, 196, 159, 215, 19, 236, 242, 36, 83, 49, 205, 146, + 210, 55, 159, 215, 19, 236, 242, 36, 83, 51, 205, 146, 210, 55, 159, 215, + 19, 236, 242, 36, 83, 49, 63, 224, 247, 159, 215, 19, 236, 242, 36, 83, + 51, 63, 224, 247, 159, 215, 19, 236, 242, 36, 83, 49, 53, 251, 71, 159, + 215, 19, 236, 242, 36, 83, 51, 53, 251, 71, 159, 215, 19, 236, 242, 36, + 83, 49, 251, 71, 159, 215, 19, 236, 242, 36, 83, 51, 251, 71, 159, 215, + 19, 236, 242, 36, 83, 49, 243, 16, 159, 215, 19, 236, 242, 36, 83, 51, + 243, 16, 159, 215, 19, 236, 242, 36, 83, 49, 64, 243, 16, 159, 215, 19, + 236, 242, 36, 83, 51, 64, 243, 16, 159, 210, 145, 240, 182, 64, 210, 145, + 240, 182, 215, 19, 236, 242, 36, 83, 49, 52, 159, 215, 19, 236, 242, 36, + 83, 51, 52, 159, 241, 243, 216, 241, 247, 52, 216, 241, 201, 74, 216, + 241, 53, 201, 74, 216, 241, 241, 243, 128, 224, 176, 247, 52, 128, 224, + 176, 201, 74, 128, 224, 176, 4, 246, 70, 4, 141, 246, 70, 4, 236, 183, + 208, 76, 4, 210, 167, 4, 246, 79, 4, 214, 79, 81, 4, 238, 43, 81, 4, 238, + 191, 241, 244, 4, 49, 216, 115, 4, 51, 216, 115, 4, 49, 242, 196, 159, 4, + 51, 242, 196, 159, 4, 49, 205, 146, 210, 55, 159, 4, 51, 205, 146, 210, + 55, 159, 4, 41, 54, 4, 251, 89, 4, 250, 165, 4, 93, 54, 4, 233, 32, 4, + 224, 241, 54, 4, 235, 67, 54, 4, 238, 122, 54, 4, 213, 106, 209, 16, 4, + 240, 194, 54, 4, 216, 27, 54, 4, 246, 68, 250, 155, 9, 237, 157, 65, 19, + 9, 206, 224, 3, 237, 157, 56, 9, 242, 16, 65, 19, 9, 207, 7, 236, 218, 9, + 227, 35, 65, 19, 9, 237, 159, 65, 19, 9, 237, 159, 179, 19, 9, 242, 18, + 65, 19, 9, 242, 18, 179, 19, 9, 227, 37, 65, 19, 9, 227, 37, 179, 19, 9, + 210, 105, 65, 19, 9, 210, 105, 179, 19, 9, 207, 237, 65, 19, 9, 207, 237, + 179, 19, 9, 1, 234, 204, 65, 19, 9, 1, 140, 3, 222, 224, 88, 65, 19, 9, + 1, 140, 3, 222, 224, 88, 47, 19, 9, 1, 140, 3, 234, 204, 88, 65, 19, 9, + 1, 140, 3, 234, 204, 88, 47, 19, 9, 1, 201, 73, 3, 234, 204, 88, 65, 19, + 9, 1, 201, 73, 3, 234, 204, 88, 47, 19, 9, 1, 140, 3, 234, 204, 248, 228, + 65, 19, 9, 1, 140, 3, 234, 204, 248, 228, 47, 19, 9, 1, 90, 3, 234, 204, + 88, 65, 19, 9, 1, 90, 3, 234, 204, 88, 47, 19, 9, 1, 90, 3, 234, 204, 88, + 82, 19, 9, 1, 90, 3, 234, 204, 88, 179, 19, 9, 1, 140, 65, 19, 9, 1, 140, + 47, 19, 9, 1, 248, 241, 65, 19, 9, 1, 248, 241, 47, 19, 9, 1, 248, 241, + 82, 19, 9, 1, 248, 241, 179, 19, 9, 1, 206, 184, 222, 157, 65, 19, 9, 1, + 206, 184, 222, 157, 47, 19, 9, 1, 206, 184, 65, 19, 9, 1, 206, 184, 47, + 19, 9, 1, 206, 184, 82, 19, 9, 1, 206, 184, 179, 19, 9, 1, 206, 103, 65, + 19, 9, 1, 206, 103, 47, 19, 9, 1, 206, 103, 82, 19, 9, 1, 206, 103, 179, + 19, 9, 1, 193, 65, 19, 9, 1, 193, 47, 19, 9, 1, 193, 82, 19, 9, 1, 193, + 179, 19, 9, 1, 155, 65, 19, 9, 1, 155, 47, 19, 9, 1, 155, 82, 19, 9, 1, + 155, 179, 19, 9, 1, 226, 204, 65, 19, 9, 1, 226, 204, 47, 19, 9, 1, 226, + 204, 82, 19, 9, 1, 226, 204, 179, 19, 9, 1, 242, 30, 65, 19, 9, 1, 242, + 30, 47, 19, 9, 1, 206, 115, 65, 19, 9, 1, 206, 115, 47, 19, 9, 1, 213, + 155, 65, 19, 9, 1, 213, 155, 47, 19, 9, 1, 199, 106, 65, 19, 9, 1, 199, + 106, 47, 19, 9, 1, 211, 187, 65, 19, 9, 1, 211, 187, 47, 19, 9, 1, 211, + 187, 82, 19, 9, 1, 211, 187, 179, 19, 9, 1, 210, 62, 65, 19, 9, 1, 210, + 62, 47, 19, 9, 1, 210, 62, 82, 19, 9, 1, 210, 62, 179, 19, 9, 1, 212, 57, + 65, 19, 9, 1, 212, 57, 47, 19, 9, 1, 212, 57, 82, 19, 9, 1, 212, 57, 179, + 19, 9, 1, 242, 53, 65, 19, 9, 1, 242, 53, 47, 19, 9, 1, 242, 53, 82, 19, + 9, 1, 242, 53, 179, 19, 9, 1, 207, 10, 65, 19, 9, 1, 207, 10, 47, 19, 9, + 1, 207, 10, 82, 19, 9, 1, 207, 10, 179, 19, 9, 1, 199, 109, 65, 19, 9, 1, + 199, 109, 47, 19, 9, 1, 199, 109, 82, 19, 9, 1, 199, 109, 179, 19, 9, 1, + 251, 172, 65, 19, 9, 1, 251, 172, 47, 19, 9, 1, 251, 172, 82, 19, 9, 1, + 251, 172, 179, 19, 9, 1, 235, 195, 65, 19, 9, 1, 235, 195, 47, 19, 9, 1, + 235, 195, 82, 19, 9, 1, 235, 195, 179, 19, 9, 1, 237, 135, 65, 19, 9, 1, + 237, 135, 47, 19, 9, 1, 237, 135, 82, 19, 9, 1, 237, 135, 179, 19, 9, 1, + 214, 153, 65, 19, 9, 1, 214, 153, 47, 19, 9, 1, 214, 153, 82, 19, 9, 1, + 214, 153, 179, 19, 9, 1, 227, 87, 65, 19, 9, 1, 227, 87, 47, 19, 9, 1, + 227, 87, 82, 19, 9, 1, 227, 87, 179, 19, 9, 1, 225, 92, 65, 19, 9, 1, + 225, 92, 47, 19, 9, 1, 225, 92, 82, 19, 9, 1, 225, 92, 179, 19, 9, 1, 84, + 65, 19, 9, 1, 84, 47, 19, 9, 1, 84, 82, 19, 9, 1, 84, 179, 19, 9, 1, 218, + 228, 65, 19, 9, 1, 218, 228, 47, 19, 9, 1, 218, 228, 82, 19, 9, 1, 218, + 228, 179, 19, 9, 1, 234, 116, 65, 19, 9, 1, 234, 116, 47, 19, 9, 1, 234, + 116, 82, 19, 9, 1, 234, 116, 179, 19, 9, 1, 201, 73, 65, 19, 9, 1, 201, + 73, 47, 19, 9, 1, 140, 222, 188, 65, 19, 9, 1, 140, 222, 188, 47, 19, 9, + 1, 90, 65, 19, 9, 1, 90, 47, 19, 9, 1, 90, 82, 19, 9, 1, 90, 179, 19, 9, + 33, 225, 92, 3, 140, 3, 222, 224, 88, 65, 19, 9, 33, 225, 92, 3, 140, 3, + 222, 224, 88, 47, 19, 9, 33, 225, 92, 3, 140, 3, 234, 204, 88, 65, 19, 9, + 33, 225, 92, 3, 140, 3, 234, 204, 88, 47, 19, 9, 33, 225, 92, 3, 140, 3, + 234, 204, 248, 228, 65, 19, 9, 33, 225, 92, 3, 140, 3, 234, 204, 248, + 228, 47, 19, 9, 33, 225, 92, 3, 140, 65, 19, 9, 33, 225, 92, 3, 140, 47, + 19, 199, 82, 201, 25, 218, 240, 208, 244, 158, 238, 43, 81, 158, 214, 63, + 81, 158, 41, 54, 158, 240, 194, 54, 158, 216, 27, 54, 158, 251, 89, 158, + 251, 13, 158, 49, 216, 115, 158, 51, 216, 115, 158, 250, 165, 158, 93, + 54, 158, 246, 70, 158, 233, 32, 158, 236, 183, 208, 76, 158, 209, 16, + 158, 17, 199, 81, 158, 17, 102, 158, 17, 105, 158, 17, 147, 158, 17, 149, + 158, 17, 164, 158, 17, 187, 158, 17, 210, 135, 158, 17, 192, 158, 17, + 219, 113, 158, 246, 79, 158, 210, 167, 158, 224, 241, 54, 158, 238, 122, + 54, 158, 235, 67, 54, 158, 214, 79, 81, 158, 246, 68, 250, 155, 158, 8, + 6, 1, 62, 158, 8, 6, 1, 250, 103, 158, 8, 6, 1, 247, 223, 158, 8, 6, 1, + 242, 153, 158, 8, 6, 1, 72, 158, 8, 6, 1, 238, 5, 158, 8, 6, 1, 236, 156, + 158, 8, 6, 1, 234, 247, 158, 8, 6, 1, 70, 158, 8, 6, 1, 227, 251, 158, 8, + 6, 1, 227, 118, 158, 8, 6, 1, 156, 158, 8, 6, 1, 223, 243, 158, 8, 6, 1, + 220, 214, 158, 8, 6, 1, 74, 158, 8, 6, 1, 216, 226, 158, 8, 6, 1, 214, + 167, 158, 8, 6, 1, 146, 158, 8, 6, 1, 212, 122, 158, 8, 6, 1, 207, 83, + 158, 8, 6, 1, 66, 158, 8, 6, 1, 203, 168, 158, 8, 6, 1, 201, 147, 158, 8, + 6, 1, 200, 195, 158, 8, 6, 1, 200, 123, 158, 8, 6, 1, 199, 157, 158, 49, + 52, 159, 158, 213, 106, 209, 16, 158, 51, 52, 159, 158, 246, 147, 251, + 251, 158, 128, 224, 176, 158, 235, 74, 251, 251, 158, 8, 4, 1, 62, 158, + 8, 4, 1, 250, 103, 158, 8, 4, 1, 247, 223, 158, 8, 4, 1, 242, 153, 158, + 8, 4, 1, 72, 158, 8, 4, 1, 238, 5, 158, 8, 4, 1, 236, 156, 158, 8, 4, 1, + 234, 247, 158, 8, 4, 1, 70, 158, 8, 4, 1, 227, 251, 158, 8, 4, 1, 227, + 118, 158, 8, 4, 1, 156, 158, 8, 4, 1, 223, 243, 158, 8, 4, 1, 220, 214, + 158, 8, 4, 1, 74, 158, 8, 4, 1, 216, 226, 158, 8, 4, 1, 214, 167, 158, 8, + 4, 1, 146, 158, 8, 4, 1, 212, 122, 158, 8, 4, 1, 207, 83, 158, 8, 4, 1, + 66, 158, 8, 4, 1, 203, 168, 158, 8, 4, 1, 201, 147, 158, 8, 4, 1, 200, + 195, 158, 8, 4, 1, 200, 123, 158, 8, 4, 1, 199, 157, 158, 49, 242, 196, + 159, 158, 83, 224, 176, 158, 51, 242, 196, 159, 158, 205, 240, 158, 49, + 64, 216, 115, 158, 51, 64, 216, 115, 130, 141, 236, 183, 208, 76, 130, + 49, 243, 16, 159, 130, 51, 243, 16, 159, 130, 141, 246, 70, 130, 69, 101, + 240, 182, 130, 69, 1, 201, 0, 130, 69, 1, 4, 62, 130, 69, 1, 4, 70, 130, + 69, 1, 4, 66, 130, 69, 1, 4, 72, 130, 69, 1, 4, 74, 130, 69, 1, 4, 183, + 130, 69, 1, 4, 199, 211, 130, 69, 1, 4, 199, 245, 130, 69, 1, 4, 204, + 215, 130, 227, 32, 214, 248, 209, 1, 81, 130, 69, 1, 62, 130, 69, 1, 70, + 130, 69, 1, 66, 130, 69, 1, 72, 130, 69, 1, 74, 130, 69, 1, 161, 130, 69, + 1, 226, 163, 130, 69, 1, 226, 15, 130, 69, 1, 227, 8, 130, 69, 1, 226, + 88, 130, 69, 1, 212, 64, 130, 69, 1, 209, 182, 130, 69, 1, 208, 24, 130, + 69, 1, 211, 202, 130, 69, 1, 209, 29, 130, 69, 1, 207, 36, 130, 69, 1, + 206, 15, 130, 69, 1, 204, 215, 130, 69, 1, 206, 201, 130, 69, 1, 138, + 130, 69, 1, 188, 130, 69, 1, 219, 150, 130, 69, 1, 218, 133, 130, 69, 1, + 220, 34, 130, 69, 1, 218, 241, 130, 69, 1, 144, 130, 69, 1, 234, 75, 130, + 69, 1, 233, 97, 130, 69, 1, 234, 139, 130, 69, 1, 233, 207, 130, 69, 1, + 178, 130, 69, 1, 221, 211, 130, 69, 1, 221, 41, 130, 69, 1, 222, 76, 130, + 69, 1, 221, 136, 130, 69, 1, 183, 130, 69, 1, 199, 211, 130, 69, 1, 199, + 245, 130, 69, 1, 213, 252, 130, 69, 1, 213, 88, 130, 69, 1, 212, 175, + 130, 69, 1, 213, 190, 130, 69, 1, 213, 1, 130, 69, 1, 201, 114, 130, 69, + 1, 220, 214, 130, 69, 202, 189, 209, 1, 81, 130, 69, 210, 172, 209, 1, + 81, 130, 29, 237, 93, 130, 29, 1, 226, 121, 130, 29, 1, 208, 171, 130, + 29, 1, 226, 114, 130, 29, 1, 219, 143, 130, 29, 1, 219, 141, 130, 29, 1, + 219, 140, 130, 29, 1, 205, 253, 130, 29, 1, 208, 160, 130, 29, 1, 213, + 78, 130, 29, 1, 213, 73, 130, 29, 1, 213, 70, 130, 29, 1, 213, 63, 130, + 29, 1, 213, 58, 130, 29, 1, 213, 53, 130, 29, 1, 213, 64, 130, 29, 1, + 213, 76, 130, 29, 1, 221, 197, 130, 29, 1, 215, 190, 130, 29, 1, 208, + 168, 130, 29, 1, 215, 179, 130, 29, 1, 209, 129, 130, 29, 1, 208, 165, + 130, 29, 1, 228, 174, 130, 29, 1, 246, 168, 130, 29, 1, 208, 175, 130, + 29, 1, 246, 232, 130, 29, 1, 226, 183, 130, 29, 1, 206, 80, 130, 29, 1, + 215, 227, 130, 29, 1, 234, 66, 130, 29, 1, 62, 130, 29, 1, 251, 221, 130, + 29, 1, 183, 130, 29, 1, 200, 98, 130, 29, 1, 238, 142, 130, 29, 1, 72, + 130, 29, 1, 200, 38, 130, 29, 1, 200, 51, 130, 29, 1, 74, 130, 29, 1, + 201, 114, 130, 29, 1, 201, 110, 130, 29, 1, 217, 121, 130, 29, 1, 199, + 245, 130, 29, 1, 66, 130, 29, 1, 201, 50, 130, 29, 1, 201, 64, 130, 29, + 1, 201, 31, 130, 29, 1, 199, 211, 130, 29, 1, 238, 69, 130, 29, 1, 200, + 9, 130, 29, 1, 70, 158, 247, 58, 54, 158, 215, 56, 54, 158, 218, 215, 54, + 158, 222, 228, 158, 248, 46, 148, 158, 200, 42, 54, 158, 200, 246, 54, + 130, 236, 239, 162, 203, 42, 130, 98, 48, 130, 182, 48, 130, 87, 48, 130, + 191, 48, 130, 63, 208, 193, 130, 64, 246, 155, 228, 62, 251, 58, 251, 81, + 228, 62, 251, 58, 210, 154, 228, 62, 251, 58, 206, 152, 217, 139, 213, + 128, 247, 20, 213, 128, 247, 20, 30, 68, 5, 250, 87, 62, 30, 68, 5, 250, + 56, 72, 30, 68, 5, 250, 65, 70, 30, 68, 5, 250, 33, 74, 30, 68, 5, 250, + 83, 66, 30, 68, 5, 250, 102, 242, 58, 30, 68, 5, 250, 49, 241, 175, 30, + 68, 5, 250, 89, 241, 76, 30, 68, 5, 250, 79, 240, 211, 30, 68, 5, 250, + 43, 239, 137, 30, 68, 5, 250, 37, 227, 248, 30, 68, 5, 250, 48, 227, 227, + 30, 68, 5, 250, 58, 227, 166, 30, 68, 5, 250, 29, 227, 147, 30, 68, 5, + 250, 17, 161, 30, 68, 5, 250, 50, 227, 8, 30, 68, 5, 250, 27, 226, 163, + 30, 68, 5, 250, 24, 226, 88, 30, 68, 5, 250, 13, 226, 15, 30, 68, 5, 250, + 14, 178, 30, 68, 5, 250, 80, 222, 76, 30, 68, 5, 250, 21, 221, 211, 30, + 68, 5, 250, 78, 221, 136, 30, 68, 5, 250, 70, 221, 41, 30, 68, 5, 250, + 91, 188, 30, 68, 5, 250, 69, 220, 34, 30, 68, 5, 250, 63, 219, 150, 30, + 68, 5, 250, 42, 218, 241, 30, 68, 5, 250, 39, 218, 133, 30, 68, 5, 250, + 98, 172, 30, 68, 5, 250, 22, 216, 73, 30, 68, 5, 250, 55, 215, 204, 30, + 68, 5, 250, 82, 215, 106, 30, 68, 5, 250, 44, 214, 224, 30, 68, 5, 250, + 77, 214, 159, 30, 68, 5, 250, 16, 214, 139, 30, 68, 5, 250, 72, 214, 121, + 30, 68, 5, 250, 61, 214, 109, 30, 68, 5, 250, 34, 213, 252, 30, 68, 5, + 250, 66, 213, 190, 30, 68, 5, 250, 41, 213, 88, 30, 68, 5, 250, 100, 213, + 1, 30, 68, 5, 250, 67, 212, 175, 30, 68, 5, 250, 62, 212, 64, 30, 68, 5, + 250, 85, 211, 202, 30, 68, 5, 250, 53, 209, 182, 30, 68, 5, 250, 81, 209, + 29, 30, 68, 5, 250, 36, 208, 24, 30, 68, 5, 250, 35, 207, 36, 30, 68, 5, + 250, 96, 206, 201, 30, 68, 5, 250, 57, 206, 15, 30, 68, 5, 250, 94, 138, + 30, 68, 5, 250, 25, 204, 215, 30, 68, 5, 250, 40, 201, 114, 30, 68, 5, + 250, 19, 201, 64, 30, 68, 5, 250, 54, 201, 31, 30, 68, 5, 250, 52, 201, + 0, 30, 68, 5, 250, 76, 199, 114, 30, 68, 5, 250, 20, 199, 89, 30, 68, 5, + 250, 73, 199, 14, 30, 68, 5, 250, 68, 254, 147, 30, 68, 5, 250, 51, 254, + 35, 30, 68, 5, 250, 10, 250, 139, 30, 68, 5, 250, 23, 239, 103, 30, 68, + 5, 250, 6, 239, 102, 30, 68, 5, 250, 46, 218, 69, 30, 68, 5, 250, 64, + 214, 222, 30, 68, 5, 250, 32, 214, 226, 30, 68, 5, 250, 18, 213, 250, 30, + 68, 5, 250, 60, 213, 249, 30, 68, 5, 250, 26, 213, 0, 30, 68, 5, 250, 28, + 207, 33, 30, 68, 5, 250, 8, 204, 168, 30, 68, 5, 250, 5, 105, 30, 68, 16, + 250, 75, 30, 68, 16, 250, 74, 30, 68, 16, 250, 71, 30, 68, 16, 250, 59, + 30, 68, 16, 250, 47, 30, 68, 16, 250, 45, 30, 68, 16, 250, 38, 30, 68, + 16, 250, 31, 30, 68, 16, 250, 30, 30, 68, 16, 250, 15, 30, 68, 16, 250, + 12, 30, 68, 16, 250, 11, 30, 68, 16, 250, 9, 30, 68, 16, 250, 7, 30, 68, + 136, 250, 4, 222, 180, 30, 68, 136, 250, 3, 200, 250, 30, 68, 136, 250, + 2, 241, 158, 30, 68, 136, 250, 1, 238, 119, 30, 68, 136, 250, 0, 222, + 150, 30, 68, 136, 249, 255, 208, 116, 30, 68, 136, 249, 254, 238, 50, 30, + 68, 136, 249, 253, 213, 216, 30, 68, 136, 249, 252, 210, 64, 30, 68, 136, + 249, 251, 234, 138, 30, 68, 136, 249, 250, 208, 251, 30, 68, 136, 249, + 249, 248, 122, 30, 68, 136, 249, 248, 242, 255, 30, 68, 136, 249, 247, + 248, 22, 30, 68, 136, 249, 246, 201, 39, 30, 68, 136, 249, 245, 249, 73, + 30, 68, 136, 249, 244, 217, 88, 30, 68, 136, 249, 243, 208, 223, 30, 68, + 136, 249, 242, 242, 161, 30, 68, 221, 97, 249, 241, 227, 56, 30, 68, 221, + 97, 249, 240, 227, 66, 30, 68, 136, 249, 239, 217, 103, 30, 68, 136, 249, + 238, 201, 12, 30, 68, 136, 249, 237, 30, 68, 221, 97, 249, 236, 250, 227, + 30, 68, 221, 97, 249, 235, 222, 32, 30, 68, 136, 249, 234, 248, 45, 30, + 68, 136, 249, 233, 235, 108, 30, 68, 136, 249, 232, 30, 68, 136, 249, + 231, 200, 241, 30, 68, 136, 249, 230, 30, 68, 136, 249, 229, 30, 68, 136, + 249, 228, 233, 124, 30, 68, 136, 249, 227, 30, 68, 136, 249, 226, 30, 68, + 136, 249, 225, 30, 68, 221, 97, 249, 223, 204, 183, 30, 68, 136, 249, + 222, 30, 68, 136, 249, 221, 30, 68, 136, 249, 220, 246, 104, 30, 68, 136, + 249, 219, 30, 68, 136, 249, 218, 30, 68, 136, 249, 217, 236, 46, 30, 68, + 136, 249, 216, 250, 214, 30, 68, 136, 249, 215, 30, 68, 136, 249, 214, + 30, 68, 136, 249, 213, 30, 68, 136, 249, 212, 30, 68, 136, 249, 211, 30, + 68, 136, 249, 210, 30, 68, 136, 249, 209, 30, 68, 136, 249, 208, 30, 68, + 136, 249, 207, 30, 68, 136, 249, 206, 221, 89, 30, 68, 136, 249, 205, 30, + 68, 136, 249, 204, 205, 108, 30, 68, 136, 249, 203, 30, 68, 136, 249, + 202, 30, 68, 136, 249, 201, 30, 68, 136, 249, 200, 30, 68, 136, 249, 199, + 30, 68, 136, 249, 198, 30, 68, 136, 249, 197, 30, 68, 136, 249, 196, 30, + 68, 136, 249, 195, 30, 68, 136, 249, 194, 30, 68, 136, 249, 193, 30, 68, + 136, 249, 192, 234, 107, 30, 68, 136, 249, 171, 236, 251, 30, 68, 136, + 249, 168, 249, 50, 30, 68, 136, 249, 163, 208, 230, 30, 68, 136, 249, + 162, 48, 30, 68, 136, 249, 161, 30, 68, 136, 249, 160, 207, 169, 30, 68, + 136, 249, 159, 30, 68, 136, 249, 158, 30, 68, 136, 249, 157, 201, 35, + 247, 17, 30, 68, 136, 249, 156, 247, 17, 30, 68, 136, 249, 155, 247, 18, + 236, 215, 30, 68, 136, 249, 154, 201, 37, 30, 68, 136, 249, 153, 30, 68, + 136, 249, 152, 30, 68, 221, 97, 249, 151, 241, 11, 30, 68, 136, 249, 150, + 30, 68, 136, 249, 149, 30, 68, 136, 249, 147, 30, 68, 136, 249, 146, 30, + 68, 136, 249, 145, 30, 68, 136, 249, 144, 241, 247, 30, 68, 136, 249, + 143, 30, 68, 136, 249, 142, 30, 68, 136, 249, 141, 30, 68, 136, 249, 140, + 30, 68, 136, 249, 139, 30, 68, 136, 202, 245, 249, 224, 30, 68, 136, 202, + 245, 249, 191, 30, 68, 136, 202, 245, 249, 190, 30, 68, 136, 202, 245, + 249, 189, 30, 68, 136, 202, 245, 249, 188, 30, 68, 136, 202, 245, 249, + 187, 30, 68, 136, 202, 245, 249, 186, 30, 68, 136, 202, 245, 249, 185, + 30, 68, 136, 202, 245, 249, 184, 30, 68, 136, 202, 245, 249, 183, 30, 68, + 136, 202, 245, 249, 182, 30, 68, 136, 202, 245, 249, 181, 30, 68, 136, + 202, 245, 249, 180, 30, 68, 136, 202, 245, 249, 179, 30, 68, 136, 202, + 245, 249, 178, 30, 68, 136, 202, 245, 249, 177, 30, 68, 136, 202, 245, + 249, 176, 30, 68, 136, 202, 245, 249, 175, 30, 68, 136, 202, 245, 249, + 174, 30, 68, 136, 202, 245, 249, 173, 30, 68, 136, 202, 245, 249, 172, + 30, 68, 136, 202, 245, 249, 170, 30, 68, 136, 202, 245, 249, 169, 30, 68, + 136, 202, 245, 249, 167, 30, 68, 136, 202, 245, 249, 166, 30, 68, 136, + 202, 245, 249, 165, 30, 68, 136, 202, 245, 249, 164, 30, 68, 136, 202, + 245, 249, 148, 30, 68, 136, 202, 245, 249, 138, 251, 214, 200, 238, 210, + 155, 224, 176, 251, 214, 200, 238, 210, 155, 240, 182, 251, 214, 247, 7, + 81, 251, 214, 41, 102, 251, 214, 41, 105, 251, 214, 41, 147, 251, 214, + 41, 149, 251, 214, 41, 164, 251, 214, 41, 187, 251, 214, 41, 210, 135, + 251, 214, 41, 192, 251, 214, 41, 219, 113, 251, 214, 41, 206, 166, 251, + 214, 41, 204, 159, 251, 214, 41, 206, 67, 251, 214, 41, 236, 235, 251, + 214, 41, 237, 104, 251, 214, 41, 209, 92, 251, 214, 41, 210, 129, 251, + 214, 41, 238, 222, 251, 214, 41, 219, 108, 251, 214, 41, 112, 233, 82, + 251, 214, 41, 120, 233, 82, 251, 214, 41, 126, 233, 82, 251, 214, 41, + 236, 229, 233, 82, 251, 214, 41, 237, 61, 233, 82, 251, 214, 41, 209, + 106, 233, 82, 251, 214, 41, 210, 136, 233, 82, 251, 214, 41, 238, 232, + 233, 82, 251, 214, 41, 219, 114, 233, 82, 251, 214, 41, 112, 206, 50, + 251, 214, 41, 120, 206, 50, 251, 214, 41, 126, 206, 50, 251, 214, 41, + 236, 229, 206, 50, 251, 214, 41, 237, 61, 206, 50, 251, 214, 41, 209, + 106, 206, 50, 251, 214, 41, 210, 136, 206, 50, 251, 214, 41, 238, 232, + 206, 50, 251, 214, 41, 219, 114, 206, 50, 251, 214, 41, 206, 167, 206, + 50, 251, 214, 41, 204, 160, 206, 50, 251, 214, 41, 206, 68, 206, 50, 251, + 214, 41, 236, 236, 206, 50, 251, 214, 41, 237, 105, 206, 50, 251, 214, + 41, 209, 93, 206, 50, 251, 214, 41, 210, 130, 206, 50, 251, 214, 41, 238, + 223, 206, 50, 251, 214, 41, 219, 109, 206, 50, 251, 214, 201, 53, 249, + 65, 203, 239, 251, 214, 201, 53, 237, 73, 207, 254, 251, 214, 201, 53, + 211, 196, 207, 254, 251, 214, 201, 53, 206, 75, 207, 254, 251, 214, 201, + 53, 236, 222, 207, 254, 251, 214, 239, 140, 222, 75, 237, 73, 207, 254, + 251, 214, 224, 157, 222, 75, 237, 73, 207, 254, 251, 214, 222, 75, 211, + 196, 207, 254, 251, 214, 222, 75, 206, 75, 207, 254, 31, 251, 242, 250, + 141, 112, 214, 87, 31, 251, 242, 250, 141, 112, 234, 213, 31, 251, 242, + 250, 141, 112, 239, 162, 31, 251, 242, 250, 141, 164, 31, 251, 242, 250, + 141, 237, 104, 31, 251, 242, 250, 141, 237, 61, 233, 82, 31, 251, 242, + 250, 141, 237, 61, 206, 50, 31, 251, 242, 250, 141, 237, 105, 206, 50, + 31, 251, 242, 250, 141, 237, 61, 206, 251, 31, 251, 242, 250, 141, 206, + 167, 206, 251, 31, 251, 242, 250, 141, 237, 105, 206, 251, 31, 251, 242, + 250, 141, 112, 233, 83, 206, 251, 31, 251, 242, 250, 141, 237, 61, 233, + 83, 206, 251, 31, 251, 242, 250, 141, 112, 206, 51, 206, 251, 31, 251, + 242, 250, 141, 237, 61, 206, 51, 206, 251, 31, 251, 242, 250, 141, 237, + 61, 208, 103, 31, 251, 242, 250, 141, 206, 167, 208, 103, 31, 251, 242, + 250, 141, 237, 105, 208, 103, 31, 251, 242, 250, 141, 112, 233, 83, 208, + 103, 31, 251, 242, 250, 141, 237, 61, 233, 83, 208, 103, 31, 251, 242, + 250, 141, 112, 206, 51, 208, 103, 31, 251, 242, 250, 141, 206, 167, 206, + 51, 208, 103, 31, 251, 242, 250, 141, 237, 105, 206, 51, 208, 103, 31, + 251, 242, 250, 141, 206, 167, 221, 139, 31, 251, 242, 234, 101, 112, 215, + 123, 31, 251, 242, 206, 90, 102, 31, 251, 242, 234, 97, 102, 31, 251, + 242, 238, 128, 105, 31, 251, 242, 206, 90, 105, 31, 251, 242, 242, 158, + 120, 239, 161, 31, 251, 242, 238, 128, 120, 239, 161, 31, 251, 242, 205, + 74, 164, 31, 251, 242, 205, 74, 206, 166, 31, 251, 242, 205, 74, 206, + 167, 251, 109, 19, 31, 251, 242, 234, 97, 206, 166, 31, 251, 242, 222, + 22, 206, 166, 31, 251, 242, 206, 90, 206, 166, 31, 251, 242, 206, 90, + 206, 67, 31, 251, 242, 205, 74, 237, 104, 31, 251, 242, 205, 74, 237, + 105, 251, 109, 19, 31, 251, 242, 234, 97, 237, 104, 31, 251, 242, 206, + 90, 237, 104, 31, 251, 242, 206, 90, 112, 233, 82, 31, 251, 242, 206, 90, + 126, 233, 82, 31, 251, 242, 238, 128, 237, 61, 233, 82, 31, 251, 242, + 205, 74, 237, 61, 233, 82, 31, 251, 242, 206, 90, 237, 61, 233, 82, 31, + 251, 242, 247, 115, 237, 61, 233, 82, 31, 251, 242, 220, 110, 237, 61, + 233, 82, 31, 251, 242, 206, 90, 112, 206, 50, 31, 251, 242, 206, 90, 237, + 61, 206, 50, 31, 251, 242, 241, 139, 237, 61, 221, 139, 31, 251, 242, + 208, 64, 237, 105, 221, 139, 31, 112, 167, 54, 31, 112, 167, 2, 251, 109, + 19, 31, 120, 206, 72, 54, 31, 126, 214, 86, 54, 31, 200, 49, 54, 31, 206, + 252, 54, 31, 239, 163, 54, 31, 217, 136, 54, 31, 120, 217, 135, 54, 31, + 126, 217, 135, 54, 31, 236, 229, 217, 135, 54, 31, 237, 61, 217, 135, 54, + 31, 222, 16, 54, 31, 225, 201, 249, 65, 54, 31, 224, 150, 54, 31, 217, 0, + 54, 31, 200, 172, 54, 31, 250, 195, 54, 31, 250, 210, 54, 31, 235, 83, + 54, 31, 205, 35, 249, 65, 54, 31, 199, 82, 54, 31, 112, 214, 88, 54, 31, + 209, 131, 54, 31, 228, 98, 54, 218, 235, 54, 212, 240, 210, 126, 54, 212, + 240, 203, 254, 54, 212, 240, 210, 159, 54, 212, 240, 210, 124, 54, 212, + 240, 241, 26, 210, 124, 54, 212, 240, 209, 154, 54, 212, 240, 241, 135, + 54, 212, 240, 214, 71, 54, 212, 240, 210, 143, 54, 212, 240, 239, 117, + 54, 212, 240, 250, 189, 54, 212, 240, 247, 51, 54, 31, 16, 206, 222, 213, + 90, 215, 240, 241, 3, 2, 216, 63, 215, 240, 241, 3, 2, 215, 115, 234, + 136, 215, 240, 241, 3, 2, 206, 225, 234, 136, 215, 240, 241, 3, 2, 247, + 138, 215, 240, 241, 3, 2, 246, 227, 215, 240, 241, 3, 2, 200, 250, 215, + 240, 241, 3, 2, 234, 107, 215, 240, 241, 3, 2, 236, 38, 215, 240, 241, 3, + 2, 206, 13, 215, 240, 241, 3, 2, 48, 215, 240, 241, 3, 2, 248, 85, 215, + 240, 241, 3, 2, 210, 30, 215, 240, 241, 3, 2, 246, 97, 215, 240, 241, 3, + 2, 222, 179, 215, 240, 241, 3, 2, 222, 124, 215, 240, 241, 3, 2, 211, + 239, 215, 240, 241, 3, 2, 224, 205, 215, 240, 241, 3, 2, 248, 106, 215, + 240, 241, 3, 2, 247, 122, 215, 128, 215, 240, 241, 3, 2, 240, 195, 215, + 240, 241, 3, 2, 246, 76, 215, 240, 241, 3, 2, 209, 63, 215, 240, 241, 3, + 2, 246, 77, 215, 240, 241, 3, 2, 248, 249, 215, 240, 241, 3, 2, 210, 17, + 215, 240, 241, 3, 2, 233, 124, 215, 240, 241, 3, 2, 234, 72, 215, 240, + 241, 3, 2, 248, 17, 225, 16, 215, 240, 241, 3, 2, 247, 111, 215, 240, + 241, 3, 2, 213, 216, 215, 240, 241, 3, 2, 239, 24, 215, 240, 241, 3, 2, + 239, 168, 215, 240, 241, 3, 2, 204, 199, 215, 240, 241, 3, 2, 248, 252, + 215, 240, 241, 3, 2, 215, 129, 205, 108, 215, 240, 241, 3, 2, 202, 215, + 215, 240, 241, 3, 2, 216, 131, 215, 240, 241, 3, 2, 212, 231, 215, 240, + 241, 3, 2, 224, 189, 215, 240, 241, 3, 2, 216, 236, 249, 129, 215, 240, + 241, 3, 2, 237, 20, 215, 240, 241, 3, 2, 235, 75, 215, 240, 241, 3, 2, + 208, 65, 215, 240, 241, 3, 2, 4, 250, 113, 215, 240, 241, 3, 2, 201, 74, + 249, 84, 215, 240, 241, 3, 2, 38, 217, 138, 97, 224, 0, 1, 62, 224, 0, 1, + 72, 224, 0, 1, 250, 103, 224, 0, 1, 248, 201, 224, 0, 1, 236, 156, 224, + 0, 1, 242, 153, 224, 0, 1, 70, 224, 0, 1, 201, 147, 224, 0, 1, 199, 157, + 224, 0, 1, 206, 124, 224, 0, 1, 227, 251, 224, 0, 1, 227, 118, 224, 0, 1, + 214, 167, 224, 0, 1, 156, 224, 0, 1, 223, 243, 224, 0, 1, 220, 214, 224, + 0, 1, 221, 141, 224, 0, 1, 219, 22, 224, 0, 1, 66, 224, 0, 1, 216, 226, + 224, 0, 1, 226, 110, 224, 0, 1, 146, 224, 0, 1, 212, 122, 224, 0, 1, 207, + 83, 224, 0, 1, 205, 0, 224, 0, 1, 251, 85, 224, 0, 1, 238, 179, 224, 0, + 1, 234, 247, 224, 0, 1, 200, 195, 247, 128, 1, 62, 247, 128, 1, 216, 212, + 247, 128, 1, 242, 153, 247, 128, 1, 156, 247, 128, 1, 203, 180, 247, 128, + 1, 146, 247, 128, 1, 225, 44, 247, 128, 1, 254, 147, 247, 128, 1, 214, + 167, 247, 128, 1, 250, 103, 247, 128, 1, 223, 243, 247, 128, 1, 74, 247, + 128, 1, 242, 60, 247, 128, 1, 207, 83, 247, 128, 1, 210, 116, 247, 128, + 1, 210, 115, 247, 128, 1, 212, 122, 247, 128, 1, 247, 222, 247, 128, 1, + 66, 247, 128, 1, 219, 22, 247, 128, 1, 200, 195, 247, 128, 1, 220, 214, + 247, 128, 1, 204, 255, 247, 128, 1, 216, 226, 247, 128, 1, 208, 182, 247, + 128, 1, 70, 247, 128, 1, 72, 247, 128, 1, 203, 177, 247, 128, 1, 227, + 118, 247, 128, 1, 227, 109, 247, 128, 1, 220, 77, 247, 128, 1, 203, 182, + 247, 128, 1, 236, 156, 247, 128, 1, 236, 91, 247, 128, 1, 208, 123, 247, + 128, 1, 208, 122, 247, 128, 1, 219, 255, 247, 128, 1, 228, 151, 247, 128, + 1, 247, 221, 247, 128, 1, 205, 0, 247, 128, 1, 203, 179, 247, 128, 1, + 212, 216, 247, 128, 1, 222, 115, 247, 128, 1, 222, 114, 247, 128, 1, 222, + 113, 247, 128, 1, 222, 112, 247, 128, 1, 225, 43, 247, 128, 1, 239, 28, + 247, 128, 1, 203, 178, 85, 238, 131, 206, 49, 81, 85, 238, 131, 17, 102, + 85, 238, 131, 17, 105, 85, 238, 131, 17, 147, 85, 238, 131, 17, 149, 85, + 238, 131, 17, 164, 85, 238, 131, 17, 187, 85, 238, 131, 17, 210, 135, 85, + 238, 131, 17, 192, 85, 238, 131, 17, 219, 113, 85, 238, 131, 41, 206, + 166, 85, 238, 131, 41, 204, 159, 85, 238, 131, 41, 206, 67, 85, 238, 131, + 41, 236, 235, 85, 238, 131, 41, 237, 104, 85, 238, 131, 41, 209, 92, 85, + 238, 131, 41, 210, 129, 85, 238, 131, 41, 238, 222, 85, 238, 131, 41, + 219, 108, 85, 238, 131, 41, 112, 233, 82, 85, 238, 131, 41, 120, 233, 82, + 85, 238, 131, 41, 126, 233, 82, 85, 238, 131, 41, 236, 229, 233, 82, 85, + 238, 131, 41, 237, 61, 233, 82, 85, 238, 131, 41, 209, 106, 233, 82, 85, + 238, 131, 41, 210, 136, 233, 82, 85, 238, 131, 41, 238, 232, 233, 82, 85, + 238, 131, 41, 219, 114, 233, 82, 40, 39, 1, 62, 40, 39, 1, 249, 8, 40, + 39, 1, 227, 8, 40, 39, 1, 241, 175, 40, 39, 1, 72, 40, 39, 1, 203, 59, + 40, 39, 1, 199, 89, 40, 39, 1, 234, 139, 40, 39, 1, 206, 106, 40, 39, 1, + 70, 40, 39, 1, 161, 40, 39, 1, 238, 209, 40, 39, 1, 238, 190, 40, 39, 1, + 238, 179, 40, 39, 1, 238, 94, 40, 39, 1, 74, 40, 39, 1, 216, 73, 40, 39, + 1, 210, 65, 40, 39, 1, 226, 15, 40, 39, 1, 238, 115, 40, 39, 1, 238, 104, + 40, 39, 1, 206, 201, 40, 39, 1, 66, 40, 39, 1, 238, 212, 40, 39, 1, 215, + 232, 40, 39, 1, 226, 192, 40, 39, 1, 238, 248, 40, 39, 1, 238, 106, 40, + 39, 1, 247, 8, 40, 39, 1, 228, 151, 40, 39, 1, 203, 182, 40, 39, 1, 238, + 87, 40, 39, 218, 93, 102, 40, 39, 218, 93, 164, 40, 39, 218, 93, 206, + 166, 40, 39, 218, 93, 237, 104, 235, 93, 1, 251, 179, 235, 93, 1, 249, + 101, 235, 93, 1, 235, 158, 235, 93, 1, 242, 39, 235, 93, 1, 251, 175, + 235, 93, 1, 214, 150, 235, 93, 1, 228, 7, 235, 93, 1, 234, 226, 235, 93, + 1, 206, 63, 235, 93, 1, 238, 220, 235, 93, 1, 225, 238, 235, 93, 1, 225, + 153, 235, 93, 1, 222, 172, 235, 93, 1, 220, 112, 235, 93, 1, 227, 220, + 235, 93, 1, 203, 200, 235, 93, 1, 216, 187, 235, 93, 1, 219, 108, 235, + 93, 1, 213, 228, 235, 93, 1, 211, 242, 235, 93, 1, 206, 180, 235, 93, 1, + 201, 10, 235, 93, 1, 237, 175, 235, 93, 1, 228, 155, 235, 93, 1, 233, 66, + 235, 93, 1, 217, 10, 235, 93, 1, 219, 114, 233, 82, 40, 216, 18, 1, 251, + 85, 40, 216, 18, 1, 248, 3, 40, 216, 18, 1, 236, 73, 40, 216, 18, 1, 240, + 199, 40, 216, 18, 1, 72, 40, 216, 18, 1, 199, 59, 40, 216, 18, 1, 239, + 85, 40, 216, 18, 1, 199, 96, 40, 216, 18, 1, 239, 83, 40, 216, 18, 1, 70, + 40, 216, 18, 1, 226, 77, 40, 216, 18, 1, 225, 12, 40, 216, 18, 1, 222, + 38, 40, 216, 18, 1, 220, 22, 40, 216, 18, 1, 202, 178, 40, 216, 18, 1, + 216, 60, 40, 216, 18, 1, 213, 153, 40, 216, 18, 1, 209, 161, 40, 216, 18, + 1, 207, 8, 40, 216, 18, 1, 66, 40, 216, 18, 1, 246, 245, 40, 216, 18, 1, + 210, 1, 40, 216, 18, 1, 210, 67, 40, 216, 18, 1, 199, 213, 40, 216, 18, + 1, 200, 29, 40, 216, 18, 1, 74, 40, 216, 18, 1, 217, 63, 40, 216, 18, 1, + 238, 248, 40, 216, 18, 1, 144, 40, 216, 18, 1, 205, 10, 40, 216, 18, 1, + 203, 47, 40, 216, 18, 1, 200, 33, 40, 216, 18, 1, 200, 31, 40, 216, 18, + 1, 200, 65, 40, 216, 18, 1, 228, 178, 40, 216, 18, 1, 199, 211, 40, 216, + 18, 1, 183, 40, 216, 18, 1, 232, 240, 38, 40, 216, 18, 1, 251, 85, 38, + 40, 216, 18, 1, 240, 199, 38, 40, 216, 18, 1, 199, 96, 38, 40, 216, 18, + 1, 220, 22, 38, 40, 216, 18, 1, 209, 161, 204, 26, 1, 251, 116, 204, 26, + 1, 248, 208, 204, 26, 1, 236, 61, 204, 26, 1, 226, 207, 204, 26, 1, 241, + 136, 204, 26, 1, 233, 207, 204, 26, 1, 201, 0, 204, 26, 1, 199, 80, 204, + 26, 1, 233, 116, 204, 26, 1, 206, 146, 204, 26, 1, 199, 234, 204, 26, 1, + 227, 86, 204, 26, 1, 210, 21, 204, 26, 1, 225, 87, 204, 26, 1, 222, 47, + 204, 26, 1, 241, 96, 204, 26, 1, 218, 89, 204, 26, 1, 199, 3, 204, 26, 1, + 212, 18, 204, 26, 1, 251, 171, 204, 26, 1, 214, 224, 204, 26, 1, 212, 55, + 204, 26, 1, 214, 102, 204, 26, 1, 213, 207, 204, 26, 1, 206, 110, 204, + 26, 1, 235, 194, 204, 26, 1, 138, 204, 26, 1, 70, 204, 26, 1, 66, 204, + 26, 1, 208, 134, 204, 26, 200, 238, 240, 239, 40, 216, 12, 2, 62, 40, + 216, 12, 2, 70, 40, 216, 12, 2, 66, 40, 216, 12, 2, 161, 40, 216, 12, 2, + 226, 15, 40, 216, 12, 2, 236, 89, 40, 216, 12, 2, 235, 50, 40, 216, 12, + 2, 200, 181, 40, 216, 12, 2, 247, 190, 40, 216, 12, 2, 227, 248, 40, 216, + 12, 2, 227, 207, 40, 216, 12, 2, 207, 36, 40, 216, 12, 2, 204, 215, 40, + 216, 12, 2, 242, 58, 40, 216, 12, 2, 241, 76, 40, 216, 12, 2, 239, 137, + 40, 216, 12, 2, 206, 122, 40, 216, 12, 2, 172, 40, 216, 12, 2, 249, 136, + 40, 216, 12, 2, 237, 195, 40, 216, 12, 2, 188, 40, 216, 12, 2, 218, 133, + 40, 216, 12, 2, 178, 40, 216, 12, 2, 221, 211, 40, 216, 12, 2, 221, 41, + 40, 216, 12, 2, 183, 40, 216, 12, 2, 203, 90, 40, 216, 12, 2, 202, 234, + 40, 216, 12, 2, 213, 252, 40, 216, 12, 2, 212, 175, 40, 216, 12, 2, 194, + 40, 216, 12, 2, 212, 64, 40, 216, 12, 2, 199, 114, 40, 216, 12, 2, 210, + 114, 40, 216, 12, 2, 208, 179, 40, 216, 12, 2, 144, 40, 216, 12, 2, 250, + 133, 40, 216, 12, 2, 250, 132, 40, 216, 12, 2, 250, 131, 40, 216, 12, 2, + 200, 152, 40, 216, 12, 2, 242, 35, 40, 216, 12, 2, 242, 34, 40, 216, 12, + 2, 249, 111, 40, 216, 12, 2, 247, 242, 40, 216, 12, 200, 238, 240, 239, + 40, 216, 12, 41, 102, 40, 216, 12, 41, 105, 40, 216, 12, 41, 206, 166, + 40, 216, 12, 41, 204, 159, 40, 216, 12, 41, 233, 82, 241, 116, 6, 1, 168, + 70, 241, 116, 6, 1, 168, 72, 241, 116, 6, 1, 168, 62, 241, 116, 6, 1, + 168, 251, 185, 241, 116, 6, 1, 168, 74, 241, 116, 6, 1, 168, 217, 63, + 241, 116, 6, 1, 209, 250, 70, 241, 116, 6, 1, 209, 250, 72, 241, 116, 6, + 1, 209, 250, 62, 241, 116, 6, 1, 209, 250, 251, 185, 241, 116, 6, 1, 209, + 250, 74, 241, 116, 6, 1, 209, 250, 217, 63, 241, 116, 6, 1, 250, 112, + 241, 116, 6, 1, 216, 238, 241, 116, 6, 1, 200, 216, 241, 116, 6, 1, 200, + 48, 241, 116, 6, 1, 234, 247, 241, 116, 6, 1, 216, 61, 241, 116, 6, 1, + 248, 252, 241, 116, 6, 1, 206, 190, 241, 116, 6, 1, 241, 161, 241, 116, + 6, 1, 247, 4, 241, 116, 6, 1, 227, 225, 241, 116, 6, 1, 227, 15, 241, + 116, 6, 1, 236, 36, 241, 116, 6, 1, 238, 248, 241, 116, 6, 1, 203, 54, + 241, 116, 6, 1, 238, 74, 241, 116, 6, 1, 206, 104, 241, 116, 6, 1, 238, + 104, 241, 116, 6, 1, 199, 87, 241, 116, 6, 1, 238, 94, 241, 116, 6, 1, + 199, 67, 241, 116, 6, 1, 238, 115, 241, 116, 6, 1, 238, 209, 241, 116, 6, + 1, 238, 190, 241, 116, 6, 1, 238, 179, 241, 116, 6, 1, 238, 165, 241, + 116, 6, 1, 217, 105, 241, 116, 6, 1, 238, 51, 241, 116, 4, 1, 168, 70, + 241, 116, 4, 1, 168, 72, 241, 116, 4, 1, 168, 62, 241, 116, 4, 1, 168, + 251, 185, 241, 116, 4, 1, 168, 74, 241, 116, 4, 1, 168, 217, 63, 241, + 116, 4, 1, 209, 250, 70, 241, 116, 4, 1, 209, 250, 72, 241, 116, 4, 1, + 209, 250, 62, 241, 116, 4, 1, 209, 250, 251, 185, 241, 116, 4, 1, 209, + 250, 74, 241, 116, 4, 1, 209, 250, 217, 63, 241, 116, 4, 1, 250, 112, + 241, 116, 4, 1, 216, 238, 241, 116, 4, 1, 200, 216, 241, 116, 4, 1, 200, + 48, 241, 116, 4, 1, 234, 247, 241, 116, 4, 1, 216, 61, 241, 116, 4, 1, + 248, 252, 241, 116, 4, 1, 206, 190, 241, 116, 4, 1, 241, 161, 241, 116, + 4, 1, 247, 4, 241, 116, 4, 1, 227, 225, 241, 116, 4, 1, 227, 15, 241, + 116, 4, 1, 236, 36, 241, 116, 4, 1, 238, 248, 241, 116, 4, 1, 203, 54, + 241, 116, 4, 1, 238, 74, 241, 116, 4, 1, 206, 104, 241, 116, 4, 1, 238, + 104, 241, 116, 4, 1, 199, 87, 241, 116, 4, 1, 238, 94, 241, 116, 4, 1, + 199, 67, 241, 116, 4, 1, 238, 115, 241, 116, 4, 1, 238, 209, 241, 116, 4, + 1, 238, 190, 241, 116, 4, 1, 238, 179, 241, 116, 4, 1, 238, 165, 241, + 116, 4, 1, 217, 105, 241, 116, 4, 1, 238, 51, 210, 72, 1, 216, 58, 210, + 72, 1, 205, 144, 210, 72, 1, 226, 159, 210, 72, 1, 237, 140, 210, 72, 1, + 206, 79, 210, 72, 1, 209, 29, 210, 72, 1, 207, 204, 210, 72, 1, 246, 184, + 210, 72, 1, 200, 50, 210, 72, 1, 233, 79, 210, 72, 1, 248, 187, 210, 72, + 1, 241, 174, 210, 72, 1, 236, 75, 210, 72, 1, 202, 173, 210, 72, 1, 206, + 85, 210, 72, 1, 199, 12, 210, 72, 1, 222, 74, 210, 72, 1, 227, 145, 210, + 72, 1, 200, 254, 210, 72, 1, 234, 235, 210, 72, 1, 224, 94, 210, 72, 1, + 221, 165, 210, 72, 1, 228, 158, 210, 72, 1, 238, 246, 210, 72, 1, 250, + 181, 210, 72, 1, 251, 225, 210, 72, 1, 217, 78, 210, 72, 1, 200, 241, + 210, 72, 1, 216, 254, 210, 72, 1, 251, 185, 210, 72, 1, 212, 254, 210, + 72, 1, 218, 89, 210, 72, 1, 239, 10, 210, 72, 1, 251, 190, 210, 72, 1, + 232, 231, 210, 72, 1, 203, 228, 210, 72, 1, 217, 144, 210, 72, 1, 217, + 55, 210, 72, 1, 217, 103, 210, 72, 1, 250, 115, 210, 72, 1, 250, 229, + 210, 72, 1, 217, 33, 210, 72, 1, 251, 166, 210, 72, 1, 238, 108, 210, 72, + 1, 250, 207, 210, 72, 1, 239, 21, 210, 72, 1, 232, 239, 210, 72, 1, 200, + 15, 217, 12, 1, 251, 142, 217, 12, 1, 249, 136, 217, 12, 1, 207, 36, 217, + 12, 1, 227, 248, 217, 12, 1, 200, 181, 217, 12, 1, 226, 207, 217, 12, 1, + 241, 160, 217, 12, 1, 213, 252, 217, 12, 1, 212, 64, 217, 12, 1, 210, 27, + 217, 12, 1, 241, 100, 217, 12, 1, 247, 101, 217, 12, 1, 236, 89, 217, 12, + 1, 237, 195, 217, 12, 1, 214, 157, 217, 12, 1, 227, 102, 217, 12, 1, 225, + 171, 217, 12, 1, 221, 179, 217, 12, 1, 218, 73, 217, 12, 1, 201, 72, 217, + 12, 1, 144, 217, 12, 1, 183, 217, 12, 1, 62, 217, 12, 1, 72, 217, 12, 1, + 70, 217, 12, 1, 74, 217, 12, 1, 66, 217, 12, 1, 252, 138, 217, 12, 1, + 238, 255, 217, 12, 1, 217, 63, 217, 12, 17, 199, 81, 217, 12, 17, 102, + 217, 12, 17, 105, 217, 12, 17, 147, 217, 12, 17, 149, 217, 12, 17, 164, + 217, 12, 17, 187, 217, 12, 17, 210, 135, 217, 12, 17, 192, 217, 12, 17, + 219, 113, 217, 14, 6, 1, 62, 217, 14, 6, 1, 251, 176, 217, 14, 6, 1, 251, + 171, 217, 14, 6, 1, 251, 185, 217, 14, 6, 1, 248, 72, 217, 14, 6, 1, 247, + 37, 217, 14, 6, 1, 238, 240, 217, 14, 6, 1, 72, 217, 14, 6, 1, 238, 221, + 217, 14, 6, 1, 144, 217, 14, 6, 1, 233, 36, 217, 14, 6, 1, 70, 217, 14, + 6, 1, 161, 217, 14, 6, 1, 238, 239, 217, 14, 6, 1, 225, 203, 217, 14, 6, + 1, 194, 217, 14, 6, 1, 178, 217, 14, 6, 1, 188, 217, 14, 6, 1, 74, 217, + 14, 6, 1, 217, 102, 217, 14, 6, 1, 172, 217, 14, 6, 1, 238, 238, 217, 14, + 6, 1, 212, 64, 217, 14, 6, 1, 210, 114, 217, 14, 6, 1, 207, 36, 217, 14, + 6, 1, 238, 237, 217, 14, 6, 1, 205, 32, 217, 14, 6, 1, 238, 236, 217, 14, + 6, 1, 205, 22, 217, 14, 6, 1, 241, 100, 217, 14, 6, 1, 66, 217, 14, 6, 1, + 201, 114, 217, 14, 6, 1, 226, 207, 217, 14, 6, 1, 235, 199, 217, 14, 6, + 1, 199, 114, 217, 14, 6, 1, 199, 77, 217, 14, 4, 1, 62, 217, 14, 4, 1, + 251, 176, 217, 14, 4, 1, 251, 171, 217, 14, 4, 1, 251, 185, 217, 14, 4, + 1, 248, 72, 217, 14, 4, 1, 247, 37, 217, 14, 4, 1, 238, 240, 217, 14, 4, + 1, 72, 217, 14, 4, 1, 238, 221, 217, 14, 4, 1, 144, 217, 14, 4, 1, 233, + 36, 217, 14, 4, 1, 70, 217, 14, 4, 1, 161, 217, 14, 4, 1, 238, 239, 217, + 14, 4, 1, 225, 203, 217, 14, 4, 1, 194, 217, 14, 4, 1, 178, 217, 14, 4, + 1, 188, 217, 14, 4, 1, 74, 217, 14, 4, 1, 217, 102, 217, 14, 4, 1, 172, + 217, 14, 4, 1, 238, 238, 217, 14, 4, 1, 212, 64, 217, 14, 4, 1, 210, 114, + 217, 14, 4, 1, 207, 36, 217, 14, 4, 1, 238, 237, 217, 14, 4, 1, 205, 32, + 217, 14, 4, 1, 238, 236, 217, 14, 4, 1, 205, 22, 217, 14, 4, 1, 241, 100, + 217, 14, 4, 1, 66, 217, 14, 4, 1, 201, 114, 217, 14, 4, 1, 226, 207, 217, + 14, 4, 1, 235, 199, 217, 14, 4, 1, 199, 114, 217, 14, 4, 1, 199, 77, 238, + 205, 1, 62, 238, 205, 1, 249, 8, 238, 205, 1, 247, 76, 238, 205, 1, 247, + 8, 238, 205, 1, 241, 175, 238, 205, 1, 220, 67, 238, 205, 1, 241, 91, + 238, 205, 1, 238, 234, 238, 205, 1, 72, 238, 205, 1, 237, 147, 238, 205, + 1, 236, 15, 238, 205, 1, 235, 132, 238, 205, 1, 234, 139, 238, 205, 1, + 70, 238, 205, 1, 227, 227, 238, 205, 1, 227, 8, 238, 205, 1, 225, 40, + 238, 205, 1, 224, 134, 238, 205, 1, 222, 76, 238, 205, 1, 220, 34, 238, + 205, 1, 188, 238, 205, 1, 219, 91, 238, 205, 1, 74, 238, 205, 1, 216, 73, + 238, 205, 1, 214, 139, 238, 205, 1, 213, 190, 238, 205, 1, 212, 210, 238, + 205, 1, 211, 202, 238, 205, 1, 210, 65, 238, 205, 1, 206, 201, 238, 205, + 1, 206, 106, 238, 205, 1, 66, 238, 205, 1, 203, 59, 238, 205, 1, 200, + 175, 238, 205, 1, 200, 123, 238, 205, 1, 199, 89, 238, 205, 1, 199, 68, + 238, 205, 1, 235, 185, 238, 205, 1, 235, 191, 238, 205, 1, 226, 192, 247, + 108, 251, 143, 1, 251, 111, 247, 108, 251, 143, 1, 248, 210, 247, 108, + 251, 143, 1, 235, 149, 247, 108, 251, 143, 1, 241, 240, 247, 108, 251, + 143, 1, 239, 9, 247, 108, 251, 143, 1, 199, 99, 247, 108, 251, 143, 1, + 238, 14, 247, 108, 251, 143, 1, 199, 62, 247, 108, 251, 143, 1, 206, 227, + 247, 108, 251, 143, 1, 247, 37, 247, 108, 251, 143, 1, 199, 222, 247, + 108, 251, 143, 1, 199, 77, 247, 108, 251, 143, 1, 228, 34, 247, 108, 251, + 143, 1, 210, 114, 247, 108, 251, 143, 1, 225, 80, 247, 108, 251, 143, 1, + 228, 46, 247, 108, 251, 143, 1, 200, 171, 247, 108, 251, 143, 1, 239, + 101, 247, 108, 251, 143, 1, 247, 135, 247, 108, 251, 143, 1, 227, 208, + 247, 108, 251, 143, 1, 227, 47, 247, 108, 251, 143, 1, 223, 252, 247, + 108, 251, 143, 1, 234, 86, 247, 108, 251, 143, 1, 214, 140, 247, 108, + 251, 143, 1, 251, 30, 247, 108, 251, 143, 1, 246, 201, 247, 108, 251, + 143, 1, 246, 236, 247, 108, 251, 143, 1, 242, 165, 247, 108, 251, 143, 1, + 222, 161, 247, 108, 251, 143, 1, 214, 144, 247, 108, 251, 143, 1, 218, + 200, 247, 108, 251, 143, 1, 239, 78, 247, 108, 251, 143, 1, 210, 97, 247, + 108, 251, 143, 1, 227, 228, 247, 108, 251, 143, 1, 217, 78, 247, 108, + 251, 143, 1, 204, 132, 247, 108, 251, 143, 1, 237, 170, 247, 108, 251, + 143, 1, 239, 91, 247, 108, 251, 143, 1, 247, 14, 247, 108, 251, 143, 1, + 216, 47, 247, 108, 251, 143, 1, 235, 175, 247, 108, 251, 143, 1, 213, + 204, 247, 108, 251, 143, 1, 210, 123, 247, 108, 251, 143, 1, 202, 236, + 247, 108, 251, 143, 1, 205, 206, 247, 108, 251, 143, 1, 209, 229, 247, + 108, 251, 143, 1, 228, 5, 247, 108, 251, 143, 1, 242, 166, 247, 108, 251, + 143, 1, 247, 101, 247, 108, 251, 143, 1, 200, 55, 247, 108, 251, 143, 1, + 215, 139, 247, 108, 251, 143, 1, 226, 125, 247, 108, 251, 143, 246, 143, + 81, 30, 35, 2, 252, 88, 30, 35, 2, 252, 87, 30, 35, 2, 252, 86, 30, 35, + 2, 252, 85, 30, 35, 2, 252, 84, 30, 35, 2, 252, 83, 30, 35, 2, 252, 82, + 30, 35, 2, 252, 81, 30, 35, 2, 252, 80, 30, 35, 2, 252, 79, 30, 35, 2, + 252, 78, 30, 35, 2, 252, 77, 30, 35, 2, 252, 76, 30, 35, 2, 252, 75, 30, + 35, 2, 252, 74, 30, 35, 2, 252, 73, 30, 35, 2, 252, 72, 30, 35, 2, 252, + 71, 30, 35, 2, 252, 70, 30, 35, 2, 252, 69, 30, 35, 2, 252, 68, 30, 35, + 2, 252, 67, 30, 35, 2, 252, 66, 30, 35, 2, 252, 65, 30, 35, 2, 252, 64, + 30, 35, 2, 252, 63, 30, 35, 2, 252, 62, 30, 35, 2, 255, 96, 30, 35, 2, + 252, 61, 30, 35, 2, 252, 60, 30, 35, 2, 252, 59, 30, 35, 2, 252, 58, 30, + 35, 2, 252, 57, 30, 35, 2, 252, 56, 30, 35, 2, 252, 55, 30, 35, 2, 252, + 54, 30, 35, 2, 252, 53, 30, 35, 2, 252, 52, 30, 35, 2, 252, 51, 30, 35, + 2, 252, 50, 30, 35, 2, 252, 49, 30, 35, 2, 252, 48, 30, 35, 2, 252, 47, + 30, 35, 2, 252, 46, 30, 35, 2, 252, 45, 30, 35, 2, 252, 44, 30, 35, 2, + 252, 43, 30, 35, 2, 252, 42, 30, 35, 2, 252, 41, 30, 35, 2, 252, 40, 30, + 35, 2, 252, 39, 30, 35, 2, 252, 38, 30, 35, 2, 252, 37, 30, 35, 2, 252, + 36, 30, 35, 2, 252, 35, 30, 35, 2, 252, 34, 30, 35, 2, 252, 33, 30, 35, + 2, 252, 32, 30, 35, 2, 252, 31, 30, 35, 2, 252, 30, 30, 35, 2, 252, 29, + 30, 35, 2, 252, 28, 30, 35, 2, 252, 27, 30, 35, 2, 252, 26, 30, 35, 2, + 252, 25, 30, 35, 2, 252, 24, 30, 35, 2, 252, 23, 30, 35, 2, 252, 22, 30, + 35, 2, 252, 21, 30, 35, 2, 252, 20, 30, 35, 2, 252, 19, 30, 35, 2, 255, + 9, 30, 35, 2, 252, 18, 30, 35, 2, 252, 17, 30, 35, 2, 254, 230, 30, 35, + 2, 252, 16, 30, 35, 2, 252, 15, 30, 35, 2, 252, 14, 30, 35, 2, 252, 13, + 30, 35, 2, 254, 217, 30, 35, 2, 252, 12, 30, 35, 2, 252, 11, 30, 35, 2, + 252, 10, 30, 35, 2, 252, 9, 30, 35, 2, 252, 8, 30, 35, 2, 254, 33, 30, + 35, 2, 254, 32, 30, 35, 2, 254, 31, 30, 35, 2, 254, 30, 30, 35, 2, 254, + 29, 30, 35, 2, 254, 28, 30, 35, 2, 254, 27, 30, 35, 2, 254, 26, 30, 35, + 2, 254, 24, 30, 35, 2, 254, 23, 30, 35, 2, 254, 22, 30, 35, 2, 254, 21, + 30, 35, 2, 254, 20, 30, 35, 2, 254, 19, 30, 35, 2, 254, 17, 30, 35, 2, + 254, 16, 30, 35, 2, 254, 15, 30, 35, 2, 254, 14, 30, 35, 2, 254, 13, 30, + 35, 2, 254, 12, 30, 35, 2, 254, 11, 30, 35, 2, 254, 10, 30, 35, 2, 254, + 9, 30, 35, 2, 254, 8, 30, 35, 2, 254, 7, 30, 35, 2, 254, 6, 30, 35, 2, + 254, 5, 30, 35, 2, 254, 4, 30, 35, 2, 254, 3, 30, 35, 2, 254, 2, 30, 35, + 2, 254, 1, 30, 35, 2, 254, 0, 30, 35, 2, 253, 255, 30, 35, 2, 253, 253, + 30, 35, 2, 253, 252, 30, 35, 2, 253, 251, 30, 35, 2, 253, 247, 30, 35, 2, + 253, 246, 30, 35, 2, 253, 245, 30, 35, 2, 253, 244, 30, 35, 2, 253, 240, + 30, 35, 2, 253, 239, 30, 35, 2, 253, 238, 30, 35, 2, 253, 237, 30, 35, 2, + 253, 236, 30, 35, 2, 253, 235, 30, 35, 2, 253, 234, 30, 35, 2, 253, 233, + 30, 35, 2, 253, 232, 30, 35, 2, 253, 231, 30, 35, 2, 253, 230, 30, 35, 2, + 253, 229, 30, 35, 2, 253, 228, 30, 35, 2, 253, 227, 30, 35, 2, 253, 226, + 30, 35, 2, 253, 225, 30, 35, 2, 253, 224, 30, 35, 2, 253, 223, 30, 35, 2, + 253, 222, 30, 35, 2, 253, 221, 30, 35, 2, 253, 220, 30, 35, 2, 253, 219, + 30, 35, 2, 253, 218, 30, 35, 2, 253, 216, 30, 35, 2, 253, 215, 30, 35, 2, + 253, 214, 30, 35, 2, 253, 213, 30, 35, 2, 253, 212, 30, 35, 2, 253, 210, + 30, 35, 2, 253, 209, 30, 35, 2, 253, 208, 30, 35, 2, 253, 207, 30, 35, 2, + 253, 205, 30, 35, 2, 253, 204, 30, 35, 2, 253, 203, 30, 35, 2, 253, 169, + 30, 35, 2, 253, 167, 30, 35, 2, 253, 165, 30, 35, 2, 253, 163, 30, 35, 2, + 253, 161, 30, 35, 2, 253, 159, 30, 35, 2, 253, 157, 30, 35, 2, 253, 155, + 30, 35, 2, 253, 153, 30, 35, 2, 253, 151, 30, 35, 2, 253, 149, 30, 35, 2, + 253, 146, 30, 35, 2, 253, 144, 30, 35, 2, 253, 142, 30, 35, 2, 253, 140, + 30, 35, 2, 253, 138, 30, 35, 2, 253, 136, 30, 35, 2, 253, 134, 30, 35, 2, + 253, 132, 30, 35, 2, 253, 50, 30, 35, 2, 253, 49, 30, 35, 2, 253, 48, 30, + 35, 2, 253, 47, 30, 35, 2, 253, 46, 30, 35, 2, 253, 45, 30, 35, 2, 253, + 43, 30, 35, 2, 253, 42, 30, 35, 2, 253, 41, 30, 35, 2, 253, 40, 30, 35, + 2, 253, 39, 30, 35, 2, 253, 38, 30, 35, 2, 253, 36, 30, 35, 2, 253, 35, + 30, 35, 2, 253, 31, 30, 35, 2, 253, 30, 30, 35, 2, 253, 28, 30, 35, 2, + 253, 27, 30, 35, 2, 253, 26, 30, 35, 2, 253, 25, 30, 35, 2, 253, 24, 30, + 35, 2, 253, 23, 30, 35, 2, 253, 22, 30, 35, 2, 253, 21, 30, 35, 2, 253, + 20, 30, 35, 2, 253, 19, 30, 35, 2, 253, 18, 30, 35, 2, 253, 17, 30, 35, + 2, 253, 16, 30, 35, 2, 253, 15, 30, 35, 2, 253, 14, 30, 35, 2, 253, 13, + 30, 35, 2, 253, 12, 30, 35, 2, 253, 11, 30, 35, 2, 253, 10, 30, 35, 2, + 253, 9, 30, 35, 2, 253, 8, 30, 35, 2, 253, 7, 30, 35, 2, 253, 6, 30, 35, + 2, 253, 5, 30, 35, 2, 253, 4, 30, 35, 2, 253, 3, 30, 35, 2, 253, 2, 30, + 35, 2, 253, 1, 30, 35, 2, 253, 0, 30, 35, 2, 252, 255, 30, 35, 2, 252, + 254, 30, 35, 2, 252, 253, 30, 35, 2, 252, 252, 30, 35, 2, 252, 251, 30, + 35, 2, 252, 250, 30, 35, 2, 252, 249, 30, 35, 2, 252, 248, 30, 35, 2, + 252, 247, 30, 35, 2, 252, 246, 30, 35, 2, 252, 245, 30, 35, 2, 252, 244, + 30, 35, 2, 252, 243, 30, 35, 2, 252, 242, 30, 35, 2, 252, 241, 30, 35, 2, + 252, 240, 30, 35, 2, 252, 239, 30, 35, 2, 252, 238, 30, 35, 2, 252, 237, + 30, 35, 2, 252, 236, 30, 35, 2, 252, 235, 30, 35, 2, 252, 234, 30, 35, 2, + 252, 233, 30, 35, 2, 252, 232, 30, 35, 2, 252, 231, 30, 35, 2, 252, 230, + 30, 35, 2, 252, 229, 30, 35, 2, 252, 228, 30, 35, 2, 252, 227, 30, 35, 2, + 252, 226, 30, 35, 2, 252, 225, 30, 35, 2, 252, 224, 30, 35, 2, 252, 223, + 30, 35, 2, 252, 222, 30, 35, 2, 252, 221, 30, 35, 2, 252, 220, 30, 35, 2, + 252, 219, 30, 35, 2, 252, 218, 30, 35, 2, 252, 217, 30, 35, 2, 252, 216, + 30, 35, 2, 252, 215, 30, 35, 2, 252, 214, 30, 35, 2, 252, 213, 30, 35, 2, + 252, 212, 30, 35, 2, 252, 211, 30, 35, 2, 252, 210, 30, 35, 2, 252, 209, + 30, 35, 2, 252, 208, 30, 35, 2, 252, 207, 30, 35, 2, 252, 206, 30, 35, 2, + 252, 205, 30, 35, 2, 252, 204, 30, 35, 2, 252, 203, 30, 35, 2, 252, 202, + 30, 35, 2, 252, 201, 30, 35, 2, 252, 200, 30, 35, 2, 252, 199, 30, 35, 2, + 252, 198, 30, 35, 2, 252, 197, 30, 35, 2, 252, 196, 30, 35, 2, 252, 195, + 30, 35, 2, 252, 194, 30, 35, 2, 252, 193, 30, 35, 2, 252, 192, 30, 35, 2, + 252, 191, 30, 35, 2, 252, 190, 30, 35, 2, 252, 189, 30, 35, 2, 252, 188, + 30, 35, 2, 252, 187, 30, 35, 2, 252, 186, 30, 35, 2, 252, 185, 30, 35, 2, + 252, 184, 30, 35, 2, 252, 183, 30, 35, 2, 252, 182, 30, 35, 2, 252, 181, + 30, 35, 2, 252, 180, 30, 35, 2, 252, 179, 30, 35, 2, 252, 178, 30, 35, 2, + 252, 177, 30, 35, 2, 252, 176, 30, 35, 2, 252, 175, 30, 35, 2, 252, 174, + 30, 35, 2, 252, 173, 30, 35, 2, 252, 172, 30, 35, 2, 252, 171, 30, 35, 2, + 252, 170, 30, 35, 2, 252, 169, 30, 35, 2, 252, 168, 62, 30, 35, 2, 252, + 167, 250, 103, 30, 35, 2, 252, 166, 242, 153, 30, 35, 2, 252, 165, 72, + 30, 35, 2, 252, 164, 238, 5, 30, 35, 2, 252, 163, 234, 247, 30, 35, 2, + 252, 162, 227, 251, 30, 35, 2, 252, 161, 227, 118, 30, 35, 2, 252, 160, + 156, 30, 35, 2, 252, 159, 225, 180, 30, 35, 2, 252, 158, 225, 179, 30, + 35, 2, 252, 157, 225, 178, 30, 35, 2, 252, 156, 225, 177, 30, 35, 2, 252, + 155, 201, 147, 30, 35, 2, 252, 154, 200, 195, 30, 35, 2, 252, 153, 200, + 123, 30, 35, 2, 252, 152, 217, 83, 30, 35, 2, 252, 151, 252, 4, 30, 35, + 2, 252, 150, 249, 45, 30, 35, 2, 252, 149, 241, 222, 30, 35, 2, 252, 148, + 238, 13, 30, 35, 2, 252, 147, 227, 227, 30, 35, 2, 252, 146, 30, 35, 2, + 252, 145, 30, 35, 2, 252, 144, 30, 35, 2, 252, 143, 30, 35, 2, 252, 142, + 30, 35, 2, 252, 141, 30, 35, 2, 252, 140, 30, 35, 2, 252, 139, 242, 160, + 5, 62, 242, 160, 5, 72, 242, 160, 5, 70, 242, 160, 5, 74, 242, 160, 5, + 66, 242, 160, 5, 227, 248, 242, 160, 5, 227, 166, 242, 160, 5, 161, 242, + 160, 5, 227, 8, 242, 160, 5, 226, 163, 242, 160, 5, 226, 88, 242, 160, 5, + 226, 15, 242, 160, 5, 194, 242, 160, 5, 225, 40, 242, 160, 5, 224, 210, + 242, 160, 5, 224, 110, 242, 160, 5, 224, 42, 242, 160, 5, 178, 242, 160, + 5, 222, 76, 242, 160, 5, 221, 211, 242, 160, 5, 221, 136, 242, 160, 5, + 221, 41, 242, 160, 5, 188, 242, 160, 5, 220, 34, 242, 160, 5, 219, 150, + 242, 160, 5, 218, 241, 242, 160, 5, 218, 133, 242, 160, 5, 172, 242, 160, + 5, 216, 73, 242, 160, 5, 215, 204, 242, 160, 5, 215, 106, 242, 160, 5, + 214, 224, 242, 160, 5, 213, 252, 242, 160, 5, 213, 190, 242, 160, 5, 213, + 88, 242, 160, 5, 213, 1, 242, 160, 5, 212, 175, 242, 160, 5, 212, 64, + 242, 160, 5, 211, 202, 242, 160, 5, 209, 182, 242, 160, 5, 209, 29, 242, + 160, 5, 208, 24, 242, 160, 5, 207, 36, 242, 160, 5, 206, 201, 242, 160, + 5, 206, 15, 242, 160, 5, 138, 242, 160, 5, 204, 215, 242, 160, 5, 201, + 114, 242, 160, 5, 201, 64, 242, 160, 5, 201, 31, 242, 160, 5, 201, 0, + 242, 160, 5, 200, 181, 242, 160, 5, 200, 175, 242, 160, 5, 199, 114, 242, + 160, 5, 199, 14, 228, 119, 250, 238, 1, 251, 140, 228, 119, 250, 238, 1, + 248, 207, 228, 119, 250, 238, 1, 235, 147, 228, 119, 250, 238, 1, 242, + 22, 228, 119, 250, 238, 1, 234, 139, 228, 119, 250, 238, 1, 201, 72, 228, + 119, 250, 238, 1, 199, 92, 228, 119, 250, 238, 1, 234, 91, 228, 119, 250, + 238, 1, 206, 142, 228, 119, 250, 238, 1, 199, 233, 228, 119, 250, 238, 1, + 227, 57, 228, 119, 250, 238, 1, 225, 82, 228, 119, 250, 238, 1, 222, 47, + 228, 119, 250, 238, 1, 218, 89, 228, 119, 250, 238, 1, 212, 19, 228, 119, + 250, 238, 1, 250, 107, 228, 119, 250, 238, 1, 216, 73, 228, 119, 250, + 238, 1, 212, 54, 228, 119, 250, 238, 1, 214, 101, 228, 119, 250, 238, 1, + 213, 123, 228, 119, 250, 238, 1, 210, 21, 228, 119, 250, 238, 1, 206, + 215, 228, 119, 250, 238, 211, 193, 54, 228, 119, 250, 238, 41, 102, 228, + 119, 250, 238, 41, 105, 228, 119, 250, 238, 41, 147, 228, 119, 250, 238, + 41, 206, 166, 228, 119, 250, 238, 41, 204, 159, 228, 119, 250, 238, 41, + 112, 233, 82, 228, 119, 250, 238, 41, 112, 206, 50, 228, 119, 250, 238, + 41, 206, 167, 206, 50, 216, 175, 1, 251, 140, 216, 175, 1, 248, 207, 216, + 175, 1, 235, 147, 216, 175, 1, 242, 22, 216, 175, 1, 234, 139, 216, 175, + 1, 201, 72, 216, 175, 1, 199, 92, 216, 175, 1, 234, 91, 216, 175, 1, 206, + 142, 216, 175, 1, 199, 233, 216, 175, 1, 227, 57, 216, 175, 1, 225, 82, + 216, 175, 1, 222, 47, 216, 175, 1, 47, 218, 89, 216, 175, 1, 218, 89, + 216, 175, 1, 212, 19, 216, 175, 1, 250, 107, 216, 175, 1, 216, 73, 216, + 175, 1, 212, 54, 216, 175, 1, 214, 101, 216, 175, 1, 213, 123, 216, 175, + 1, 210, 21, 216, 175, 1, 206, 215, 216, 175, 225, 23, 237, 39, 216, 175, + 213, 41, 237, 39, 216, 175, 41, 102, 216, 175, 41, 105, 216, 175, 41, + 147, 216, 175, 41, 149, 216, 175, 41, 164, 216, 175, 41, 206, 166, 216, + 175, 41, 204, 159, 220, 153, 1, 47, 251, 140, 220, 153, 1, 251, 140, 220, + 153, 1, 47, 248, 207, 220, 153, 1, 248, 207, 220, 153, 1, 235, 147, 220, + 153, 1, 242, 22, 220, 153, 1, 47, 234, 139, 220, 153, 1, 234, 139, 220, + 153, 1, 201, 72, 220, 153, 1, 199, 92, 220, 153, 1, 234, 91, 220, 153, 1, + 206, 142, 220, 153, 1, 47, 199, 233, 220, 153, 1, 199, 233, 220, 153, 1, + 47, 227, 57, 220, 153, 1, 227, 57, 220, 153, 1, 47, 225, 82, 220, 153, 1, + 225, 82, 220, 153, 1, 47, 222, 47, 220, 153, 1, 222, 47, 220, 153, 1, 47, + 218, 89, 220, 153, 1, 218, 89, 220, 153, 1, 212, 19, 220, 153, 1, 250, + 107, 220, 153, 1, 216, 73, 220, 153, 1, 212, 54, 220, 153, 1, 214, 101, + 220, 153, 1, 213, 123, 220, 153, 1, 47, 210, 21, 220, 153, 1, 210, 21, + 220, 153, 1, 206, 215, 220, 153, 41, 102, 220, 153, 41, 105, 220, 153, + 41, 147, 220, 153, 41, 149, 220, 153, 242, 220, 41, 149, 220, 153, 41, + 164, 220, 153, 41, 206, 166, 220, 153, 41, 204, 159, 220, 153, 41, 112, + 233, 82, 234, 152, 1, 251, 140, 234, 152, 1, 248, 207, 234, 152, 1, 235, + 147, 234, 152, 1, 242, 21, 234, 152, 1, 234, 139, 234, 152, 1, 201, 72, + 234, 152, 1, 199, 91, 234, 152, 1, 234, 91, 234, 152, 1, 206, 142, 234, + 152, 1, 199, 233, 234, 152, 1, 227, 57, 234, 152, 1, 225, 82, 234, 152, + 1, 222, 47, 234, 152, 1, 218, 89, 234, 152, 1, 212, 19, 234, 152, 1, 250, + 106, 234, 152, 1, 216, 73, 234, 152, 1, 212, 54, 234, 152, 1, 214, 101, + 234, 152, 1, 210, 21, 234, 152, 1, 206, 215, 234, 152, 41, 102, 234, 152, + 41, 164, 234, 152, 41, 206, 166, 234, 152, 41, 204, 159, 234, 152, 41, + 112, 233, 82, 215, 215, 1, 251, 137, 215, 215, 1, 248, 210, 215, 215, 1, + 236, 62, 215, 215, 1, 241, 138, 215, 215, 1, 234, 139, 215, 215, 1, 201, + 79, 215, 215, 1, 199, 107, 215, 215, 1, 234, 93, 215, 215, 1, 206, 146, + 215, 215, 1, 199, 234, 215, 215, 1, 227, 86, 215, 215, 1, 225, 88, 215, + 215, 1, 222, 47, 215, 215, 1, 218, 89, 215, 215, 1, 210, 161, 215, 215, + 1, 251, 171, 215, 215, 1, 216, 73, 215, 215, 1, 212, 55, 215, 215, 1, + 214, 106, 215, 215, 1, 212, 230, 215, 215, 1, 210, 21, 215, 215, 1, 206, + 221, 215, 215, 41, 102, 215, 215, 41, 206, 166, 215, 215, 41, 204, 159, + 215, 215, 41, 112, 233, 82, 215, 215, 41, 105, 215, 215, 41, 147, 215, + 215, 200, 238, 210, 154, 223, 255, 1, 62, 223, 255, 1, 250, 103, 223, + 255, 1, 236, 156, 223, 255, 1, 242, 153, 223, 255, 1, 72, 223, 255, 1, + 203, 168, 223, 255, 1, 70, 223, 255, 1, 200, 123, 223, 255, 1, 227, 118, + 223, 255, 1, 156, 223, 255, 1, 223, 243, 223, 255, 1, 220, 214, 223, 255, + 1, 74, 223, 255, 1, 146, 223, 255, 1, 208, 182, 223, 255, 1, 207, 83, + 223, 255, 1, 66, 223, 255, 1, 238, 5, 223, 255, 1, 214, 167, 223, 255, 1, + 212, 122, 223, 255, 1, 205, 0, 223, 255, 1, 251, 85, 223, 255, 1, 238, + 179, 223, 255, 1, 224, 2, 223, 255, 1, 219, 22, 223, 255, 1, 247, 223, + 223, 255, 205, 95, 81, 132, 234, 68, 1, 62, 132, 234, 68, 1, 72, 132, + 234, 68, 1, 70, 132, 234, 68, 1, 74, 132, 234, 68, 1, 183, 132, 234, 68, + 1, 201, 114, 132, 234, 68, 1, 249, 136, 132, 234, 68, 1, 249, 135, 132, + 234, 68, 1, 172, 132, 234, 68, 1, 178, 132, 234, 68, 1, 188, 132, 234, + 68, 1, 220, 161, 132, 234, 68, 1, 220, 34, 132, 234, 68, 1, 220, 33, 132, + 234, 68, 1, 213, 252, 132, 234, 68, 1, 213, 251, 132, 234, 68, 1, 194, + 132, 234, 68, 1, 226, 207, 132, 234, 68, 1, 234, 84, 132, 234, 68, 1, + 212, 64, 132, 234, 68, 1, 212, 63, 132, 234, 68, 1, 211, 202, 132, 234, + 68, 1, 161, 132, 234, 68, 1, 214, 159, 132, 234, 68, 1, 207, 36, 132, + 234, 68, 1, 207, 35, 132, 234, 68, 1, 206, 201, 132, 234, 68, 1, 206, + 200, 132, 234, 68, 1, 138, 132, 234, 68, 1, 242, 58, 132, 234, 68, 16, + 202, 228, 132, 234, 68, 16, 202, 227, 132, 242, 191, 1, 62, 132, 242, + 191, 1, 72, 132, 242, 191, 1, 70, 132, 242, 191, 1, 74, 132, 242, 191, 1, + 183, 132, 242, 191, 1, 201, 114, 132, 242, 191, 1, 249, 136, 132, 242, + 191, 1, 172, 132, 242, 191, 1, 178, 132, 242, 191, 1, 188, 132, 242, 191, + 1, 220, 34, 132, 242, 191, 1, 213, 252, 132, 242, 191, 1, 194, 132, 242, + 191, 1, 226, 207, 132, 242, 191, 1, 234, 84, 132, 242, 191, 1, 212, 64, + 132, 242, 191, 1, 250, 234, 212, 64, 132, 242, 191, 1, 211, 202, 132, + 242, 191, 1, 161, 132, 242, 191, 1, 214, 159, 132, 242, 191, 1, 207, 36, + 132, 242, 191, 1, 206, 201, 132, 242, 191, 1, 138, 132, 242, 191, 1, 242, + 58, 132, 242, 191, 236, 219, 238, 200, 204, 166, 132, 242, 191, 236, 219, + 112, 234, 213, 132, 242, 191, 224, 97, 213, 7, 132, 242, 191, 224, 97, + 228, 124, 132, 242, 191, 41, 102, 132, 242, 191, 41, 105, 132, 242, 191, + 41, 147, 132, 242, 191, 41, 149, 132, 242, 191, 41, 164, 132, 242, 191, + 41, 187, 132, 242, 191, 41, 210, 135, 132, 242, 191, 41, 192, 132, 242, + 191, 41, 219, 113, 132, 242, 191, 41, 206, 166, 132, 242, 191, 41, 204, + 159, 132, 242, 191, 41, 206, 67, 132, 242, 191, 41, 236, 235, 132, 242, + 191, 41, 237, 104, 132, 242, 191, 41, 209, 92, 132, 242, 191, 41, 210, + 129, 132, 242, 191, 41, 112, 233, 82, 132, 242, 191, 41, 120, 233, 82, + 132, 242, 191, 41, 126, 233, 82, 132, 242, 191, 41, 236, 229, 233, 82, + 132, 242, 191, 41, 237, 61, 233, 82, 132, 242, 191, 41, 209, 106, 233, + 82, 132, 242, 191, 41, 210, 136, 233, 82, 132, 242, 191, 41, 238, 232, + 233, 82, 132, 242, 191, 41, 219, 114, 233, 82, 132, 242, 191, 41, 112, + 206, 50, 132, 242, 191, 41, 120, 206, 50, 132, 242, 191, 41, 126, 206, + 50, 132, 242, 191, 41, 236, 229, 206, 50, 132, 242, 191, 41, 237, 61, + 206, 50, 132, 242, 191, 41, 209, 106, 206, 50, 132, 242, 191, 41, 210, + 136, 206, 50, 132, 242, 191, 41, 238, 232, 206, 50, 132, 242, 191, 41, + 219, 114, 206, 50, 132, 242, 191, 41, 206, 167, 206, 50, 132, 242, 191, + 41, 204, 160, 206, 50, 132, 242, 191, 41, 206, 68, 206, 50, 132, 242, + 191, 41, 236, 236, 206, 50, 132, 242, 191, 41, 237, 105, 206, 50, 132, + 242, 191, 41, 209, 93, 206, 50, 132, 242, 191, 41, 210, 130, 206, 50, + 132, 242, 191, 41, 238, 223, 206, 50, 132, 242, 191, 41, 219, 109, 206, + 50, 132, 242, 191, 41, 112, 233, 83, 206, 50, 132, 242, 191, 41, 120, + 233, 83, 206, 50, 132, 242, 191, 41, 126, 233, 83, 206, 50, 132, 242, + 191, 41, 236, 229, 233, 83, 206, 50, 132, 242, 191, 41, 237, 61, 233, 83, + 206, 50, 132, 242, 191, 41, 209, 106, 233, 83, 206, 50, 132, 242, 191, + 41, 210, 136, 233, 83, 206, 50, 132, 242, 191, 41, 238, 232, 233, 83, + 206, 50, 132, 242, 191, 41, 219, 114, 233, 83, 206, 50, 132, 242, 191, + 236, 219, 112, 204, 167, 132, 242, 191, 236, 219, 120, 204, 166, 132, + 242, 191, 236, 219, 126, 204, 166, 132, 242, 191, 236, 219, 236, 229, + 204, 166, 132, 242, 191, 236, 219, 237, 61, 204, 166, 132, 242, 191, 236, + 219, 209, 106, 204, 166, 132, 242, 191, 236, 219, 210, 136, 204, 166, + 132, 242, 191, 236, 219, 238, 232, 204, 166, 132, 242, 191, 236, 219, + 219, 114, 204, 166, 132, 242, 191, 236, 219, 206, 167, 204, 166, 226, + 194, 1, 62, 226, 194, 22, 2, 70, 226, 194, 22, 2, 66, 226, 194, 22, 2, + 109, 146, 226, 194, 22, 2, 72, 226, 194, 22, 2, 74, 226, 194, 22, 225, 2, + 81, 226, 194, 2, 53, 213, 27, 57, 226, 194, 2, 251, 33, 226, 194, 2, 202, + 203, 226, 194, 1, 161, 226, 194, 1, 226, 207, 226, 194, 1, 236, 89, 226, + 194, 1, 235, 199, 226, 194, 1, 247, 190, 226, 194, 1, 247, 37, 226, 194, + 1, 227, 248, 226, 194, 1, 218, 60, 226, 194, 1, 204, 253, 226, 194, 1, + 204, 241, 226, 194, 1, 241, 220, 226, 194, 1, 241, 204, 226, 194, 1, 219, + 21, 226, 194, 1, 207, 36, 226, 194, 1, 206, 122, 226, 194, 1, 242, 58, + 226, 194, 1, 241, 100, 226, 194, 1, 188, 226, 194, 1, 172, 226, 194, 1, + 215, 245, 226, 194, 1, 249, 136, 226, 194, 1, 248, 200, 226, 194, 1, 178, + 226, 194, 1, 183, 226, 194, 1, 213, 252, 226, 194, 1, 194, 226, 194, 1, + 203, 90, 226, 194, 1, 210, 114, 226, 194, 1, 208, 179, 226, 194, 1, 212, + 64, 226, 194, 1, 199, 114, 226, 194, 1, 144, 226, 194, 1, 226, 109, 226, + 194, 1, 204, 221, 226, 194, 2, 249, 77, 56, 226, 194, 2, 247, 107, 226, + 194, 2, 73, 57, 226, 194, 202, 208, 226, 194, 17, 102, 226, 194, 17, 105, + 226, 194, 17, 147, 226, 194, 17, 149, 226, 194, 41, 206, 166, 226, 194, + 41, 204, 159, 226, 194, 41, 112, 233, 82, 226, 194, 41, 112, 206, 50, + 226, 194, 214, 212, 240, 182, 226, 194, 214, 212, 4, 246, 155, 226, 194, + 214, 212, 246, 155, 226, 194, 214, 212, 242, 244, 148, 226, 194, 214, + 212, 222, 174, 226, 194, 214, 212, 224, 64, 226, 194, 214, 212, 242, 10, + 226, 194, 214, 212, 53, 242, 10, 226, 194, 214, 212, 224, 170, 40, 208, + 254, 250, 249, 1, 234, 139, 40, 208, 254, 250, 249, 1, 225, 82, 40, 208, + 254, 250, 249, 1, 234, 91, 40, 208, 254, 250, 249, 1, 222, 47, 40, 208, + 254, 250, 249, 1, 214, 101, 40, 208, 254, 250, 249, 1, 201, 72, 40, 208, + 254, 250, 249, 1, 210, 21, 40, 208, 254, 250, 249, 1, 213, 123, 40, 208, + 254, 250, 249, 1, 248, 207, 40, 208, 254, 250, 249, 1, 206, 215, 40, 208, + 254, 250, 249, 1, 211, 251, 40, 208, 254, 250, 249, 1, 227, 57, 40, 208, + 254, 250, 249, 1, 218, 89, 40, 208, 254, 250, 249, 1, 226, 189, 40, 208, + 254, 250, 249, 1, 212, 54, 40, 208, 254, 250, 249, 1, 212, 19, 40, 208, + 254, 250, 249, 1, 237, 147, 40, 208, 254, 250, 249, 1, 251, 142, 40, 208, + 254, 250, 249, 1, 250, 106, 40, 208, 254, 250, 249, 1, 241, 97, 40, 208, + 254, 250, 249, 1, 235, 147, 40, 208, 254, 250, 249, 1, 242, 22, 40, 208, + 254, 250, 249, 1, 235, 187, 40, 208, 254, 250, 249, 1, 206, 142, 40, 208, + 254, 250, 249, 1, 199, 91, 40, 208, 254, 250, 249, 1, 241, 94, 40, 208, + 254, 250, 249, 1, 199, 233, 40, 208, 254, 250, 249, 1, 206, 108, 40, 208, + 254, 250, 249, 1, 206, 87, 40, 208, 254, 250, 249, 41, 102, 40, 208, 254, + 250, 249, 41, 237, 104, 40, 208, 254, 250, 249, 145, 228, 99, 40, 157, + 250, 249, 1, 234, 115, 40, 157, 250, 249, 1, 225, 91, 40, 157, 250, 249, + 1, 234, 224, 40, 157, 250, 249, 1, 222, 61, 40, 157, 250, 249, 1, 214, + 152, 40, 157, 250, 249, 1, 201, 72, 40, 157, 250, 249, 1, 238, 102, 40, + 157, 250, 249, 1, 213, 154, 40, 157, 250, 249, 1, 248, 240, 40, 157, 250, + 249, 1, 206, 183, 40, 157, 250, 249, 1, 238, 103, 40, 157, 250, 249, 1, + 227, 86, 40, 157, 250, 249, 1, 218, 227, 40, 157, 250, 249, 1, 226, 203, + 40, 157, 250, 249, 1, 212, 56, 40, 157, 250, 249, 1, 238, 101, 40, 157, + 250, 249, 1, 237, 134, 40, 157, 250, 249, 1, 251, 142, 40, 157, 250, 249, + 1, 251, 171, 40, 157, 250, 249, 1, 242, 52, 40, 157, 250, 249, 1, 236, 6, + 40, 157, 250, 249, 1, 242, 29, 40, 157, 250, 249, 1, 235, 194, 40, 157, + 250, 249, 1, 207, 9, 40, 157, 250, 249, 1, 199, 105, 40, 157, 250, 249, + 1, 206, 114, 40, 157, 250, 249, 1, 200, 46, 40, 157, 250, 249, 1, 206, + 102, 40, 157, 250, 249, 1, 199, 108, 40, 157, 250, 249, 41, 102, 40, 157, + 250, 249, 41, 206, 166, 40, 157, 250, 249, 41, 204, 159, 222, 173, 1, + 251, 140, 222, 173, 1, 248, 207, 222, 173, 1, 248, 194, 222, 173, 1, 235, + 147, 222, 173, 1, 235, 172, 222, 173, 1, 242, 22, 222, 173, 1, 234, 139, + 222, 173, 1, 201, 72, 222, 173, 2, 204, 36, 222, 173, 1, 199, 92, 222, + 173, 1, 199, 70, 222, 173, 1, 227, 229, 222, 173, 1, 227, 211, 222, 173, + 1, 234, 91, 222, 173, 1, 206, 142, 222, 173, 1, 199, 233, 222, 173, 1, + 227, 57, 222, 173, 1, 200, 178, 222, 173, 1, 226, 196, 222, 173, 1, 225, + 82, 222, 173, 1, 241, 93, 222, 173, 1, 206, 113, 222, 173, 1, 222, 47, + 222, 173, 1, 218, 89, 222, 173, 1, 212, 19, 222, 173, 1, 250, 107, 222, + 173, 1, 252, 91, 222, 173, 1, 216, 73, 222, 173, 1, 237, 147, 222, 173, + 1, 212, 54, 222, 173, 1, 214, 101, 222, 173, 1, 200, 156, 222, 173, 1, + 214, 128, 222, 173, 1, 213, 123, 222, 173, 1, 210, 21, 222, 173, 1, 208, + 148, 222, 173, 1, 206, 215, 222, 173, 252, 3, 134, 56, 222, 173, 252, 3, + 134, 57, 222, 173, 41, 102, 222, 173, 41, 164, 222, 173, 41, 206, 166, + 222, 173, 41, 204, 159, 222, 173, 41, 112, 233, 82, 222, 173, 214, 212, + 208, 109, 222, 173, 214, 212, 237, 39, 222, 173, 214, 212, 53, 73, 201, + 5, 240, 182, 222, 173, 214, 212, 73, 201, 5, 240, 182, 222, 173, 214, + 212, 240, 182, 222, 173, 214, 212, 120, 240, 180, 222, 173, 214, 212, + 224, 177, 237, 93, 250, 119, 1, 62, 250, 119, 1, 252, 138, 250, 119, 1, + 251, 31, 250, 119, 1, 252, 97, 250, 119, 1, 251, 85, 250, 119, 1, 252, + 98, 250, 119, 1, 251, 221, 250, 119, 1, 251, 217, 250, 119, 1, 72, 250, + 119, 1, 238, 255, 250, 119, 1, 74, 250, 119, 1, 217, 63, 250, 119, 1, 70, + 250, 119, 1, 228, 151, 250, 119, 1, 66, 250, 119, 1, 203, 182, 250, 119, + 1, 227, 8, 250, 119, 1, 200, 175, 250, 119, 1, 200, 137, 250, 119, 1, + 200, 147, 250, 119, 1, 236, 15, 250, 119, 1, 235, 230, 250, 119, 1, 235, + 185, 250, 119, 1, 247, 76, 250, 119, 1, 227, 227, 250, 119, 1, 206, 201, + 250, 119, 1, 206, 106, 250, 119, 1, 241, 175, 250, 119, 1, 241, 91, 250, + 119, 1, 204, 248, 250, 119, 1, 216, 73, 250, 119, 1, 237, 147, 250, 119, + 1, 249, 8, 250, 119, 1, 248, 196, 250, 119, 1, 219, 240, 250, 119, 1, + 219, 156, 250, 119, 1, 219, 157, 250, 119, 1, 220, 34, 250, 119, 1, 218, + 50, 250, 119, 1, 219, 16, 250, 119, 1, 222, 76, 250, 119, 1, 234, 1, 250, + 119, 1, 199, 164, 250, 119, 1, 200, 51, 250, 119, 1, 203, 59, 250, 119, + 1, 213, 190, 250, 119, 1, 225, 40, 250, 119, 1, 211, 202, 250, 119, 1, + 199, 89, 250, 119, 1, 210, 65, 250, 119, 1, 199, 68, 250, 119, 1, 209, + 189, 250, 119, 1, 208, 149, 250, 119, 1, 234, 139, 250, 119, 252, 3, 81, + 205, 226, 120, 190, 119, 112, 73, 214, 211, 4, 120, 190, 119, 112, 73, + 214, 211, 225, 71, 120, 190, 119, 112, 73, 214, 211, 225, 71, 112, 73, + 119, 120, 190, 214, 211, 225, 71, 120, 213, 24, 119, 112, 213, 27, 214, + 211, 225, 71, 112, 213, 27, 119, 120, 213, 24, 214, 211, 228, 77, 216, + 109, 1, 251, 140, 228, 77, 216, 109, 1, 248, 207, 228, 77, 216, 109, 1, + 235, 147, 228, 77, 216, 109, 1, 242, 22, 228, 77, 216, 109, 1, 234, 139, + 228, 77, 216, 109, 1, 201, 72, 228, 77, 216, 109, 1, 199, 92, 228, 77, + 216, 109, 1, 234, 91, 228, 77, 216, 109, 1, 206, 142, 228, 77, 216, 109, + 1, 199, 233, 228, 77, 216, 109, 1, 227, 57, 228, 77, 216, 109, 1, 225, + 82, 228, 77, 216, 109, 1, 222, 47, 228, 77, 216, 109, 1, 218, 89, 228, + 77, 216, 109, 1, 212, 19, 228, 77, 216, 109, 1, 250, 107, 228, 77, 216, + 109, 1, 216, 73, 228, 77, 216, 109, 1, 212, 54, 228, 77, 216, 109, 1, + 214, 101, 228, 77, 216, 109, 1, 213, 123, 228, 77, 216, 109, 1, 210, 21, + 228, 77, 216, 109, 1, 206, 215, 228, 77, 216, 109, 41, 102, 228, 77, 216, + 109, 41, 105, 228, 77, 216, 109, 41, 147, 228, 77, 216, 109, 41, 149, + 228, 77, 216, 109, 41, 206, 166, 228, 77, 216, 109, 41, 204, 159, 228, + 77, 216, 109, 41, 112, 233, 82, 228, 77, 216, 109, 41, 112, 206, 50, 228, + 77, 216, 191, 1, 251, 140, 228, 77, 216, 191, 1, 248, 207, 228, 77, 216, + 191, 1, 235, 147, 228, 77, 216, 191, 1, 242, 22, 228, 77, 216, 191, 1, + 234, 139, 228, 77, 216, 191, 1, 201, 71, 228, 77, 216, 191, 1, 199, 92, + 228, 77, 216, 191, 1, 234, 91, 228, 77, 216, 191, 1, 206, 142, 228, 77, + 216, 191, 1, 199, 233, 228, 77, 216, 191, 1, 227, 57, 228, 77, 216, 191, + 1, 225, 82, 228, 77, 216, 191, 1, 222, 46, 228, 77, 216, 191, 1, 218, 89, + 228, 77, 216, 191, 1, 212, 19, 228, 77, 216, 191, 1, 216, 73, 228, 77, + 216, 191, 1, 212, 54, 228, 77, 216, 191, 1, 210, 21, 228, 77, 216, 191, + 1, 206, 215, 228, 77, 216, 191, 41, 102, 228, 77, 216, 191, 41, 105, 228, + 77, 216, 191, 41, 147, 228, 77, 216, 191, 41, 149, 228, 77, 216, 191, 41, + 206, 166, 228, 77, 216, 191, 41, 204, 159, 228, 77, 216, 191, 41, 112, + 233, 82, 228, 77, 216, 191, 41, 112, 206, 50, 214, 236, 216, 191, 1, 251, + 140, 214, 236, 216, 191, 1, 248, 207, 214, 236, 216, 191, 1, 235, 147, + 214, 236, 216, 191, 1, 242, 22, 214, 236, 216, 191, 1, 234, 139, 214, + 236, 216, 191, 1, 201, 71, 214, 236, 216, 191, 1, 199, 92, 214, 236, 216, + 191, 1, 234, 91, 214, 236, 216, 191, 1, 199, 233, 214, 236, 216, 191, 1, + 227, 57, 214, 236, 216, 191, 1, 225, 82, 214, 236, 216, 191, 1, 222, 46, + 214, 236, 216, 191, 1, 218, 89, 214, 236, 216, 191, 1, 212, 19, 214, 236, + 216, 191, 1, 216, 73, 214, 236, 216, 191, 1, 212, 54, 214, 236, 216, 191, + 1, 210, 21, 214, 236, 216, 191, 1, 206, 215, 214, 236, 216, 191, 211, + 193, 81, 214, 236, 216, 191, 204, 185, 211, 193, 81, 214, 236, 216, 191, + 236, 229, 190, 3, 242, 234, 214, 236, 216, 191, 236, 229, 190, 3, 240, + 182, 214, 236, 216, 191, 41, 102, 214, 236, 216, 191, 41, 105, 214, 236, + 216, 191, 41, 147, 214, 236, 216, 191, 41, 149, 214, 236, 216, 191, 41, + 206, 166, 214, 236, 216, 191, 41, 204, 159, 214, 236, 216, 191, 41, 112, + 233, 82, 40, 204, 189, 1, 217, 23, 62, 40, 204, 189, 1, 200, 39, 62, 40, + 204, 189, 1, 200, 39, 251, 221, 40, 204, 189, 1, 217, 23, 70, 40, 204, + 189, 1, 200, 39, 70, 40, 204, 189, 1, 200, 39, 72, 40, 204, 189, 1, 217, + 23, 74, 40, 204, 189, 1, 217, 23, 217, 121, 40, 204, 189, 1, 200, 39, + 217, 121, 40, 204, 189, 1, 217, 23, 252, 89, 40, 204, 189, 1, 200, 39, + 252, 89, 40, 204, 189, 1, 217, 23, 251, 220, 40, 204, 189, 1, 200, 39, + 251, 220, 40, 204, 189, 1, 217, 23, 251, 193, 40, 204, 189, 1, 200, 39, + 251, 193, 40, 204, 189, 1, 217, 23, 251, 215, 40, 204, 189, 1, 200, 39, + 251, 215, 40, 204, 189, 1, 217, 23, 251, 235, 40, 204, 189, 1, 200, 39, + 251, 235, 40, 204, 189, 1, 217, 23, 251, 219, 40, 204, 189, 1, 217, 23, + 238, 12, 40, 204, 189, 1, 200, 39, 238, 12, 40, 204, 189, 1, 217, 23, + 250, 112, 40, 204, 189, 1, 200, 39, 250, 112, 40, 204, 189, 1, 217, 23, + 251, 202, 40, 204, 189, 1, 200, 39, 251, 202, 40, 204, 189, 1, 217, 23, + 251, 213, 40, 204, 189, 1, 200, 39, 251, 213, 40, 204, 189, 1, 217, 23, + 217, 119, 40, 204, 189, 1, 200, 39, 217, 119, 40, 204, 189, 1, 217, 23, + 251, 151, 40, 204, 189, 1, 200, 39, 251, 151, 40, 204, 189, 1, 217, 23, + 251, 212, 40, 204, 189, 1, 217, 23, 238, 193, 40, 204, 189, 1, 217, 23, + 238, 190, 40, 204, 189, 1, 217, 23, 251, 85, 40, 204, 189, 1, 217, 23, + 251, 210, 40, 204, 189, 1, 200, 39, 251, 210, 40, 204, 189, 1, 217, 23, + 238, 157, 40, 204, 189, 1, 200, 39, 238, 157, 40, 204, 189, 1, 217, 23, + 238, 176, 40, 204, 189, 1, 200, 39, 238, 176, 40, 204, 189, 1, 217, 23, + 238, 143, 40, 204, 189, 1, 200, 39, 238, 143, 40, 204, 189, 1, 200, 39, + 251, 76, 40, 204, 189, 1, 217, 23, 238, 165, 40, 204, 189, 1, 200, 39, + 251, 209, 40, 204, 189, 1, 217, 23, 238, 133, 40, 204, 189, 1, 217, 23, + 217, 54, 40, 204, 189, 1, 217, 23, 232, 233, 40, 204, 189, 1, 217, 23, + 239, 7, 40, 204, 189, 1, 200, 39, 239, 7, 40, 204, 189, 1, 217, 23, 251, + 1, 40, 204, 189, 1, 200, 39, 251, 1, 40, 204, 189, 1, 217, 23, 228, 37, + 40, 204, 189, 1, 200, 39, 228, 37, 40, 204, 189, 1, 217, 23, 217, 35, 40, + 204, 189, 1, 200, 39, 217, 35, 40, 204, 189, 1, 217, 23, 250, 253, 40, + 204, 189, 1, 200, 39, 250, 253, 40, 204, 189, 1, 217, 23, 251, 208, 40, + 204, 189, 1, 217, 23, 250, 188, 40, 204, 189, 1, 217, 23, 251, 206, 40, + 204, 189, 1, 217, 23, 250, 181, 40, 204, 189, 1, 200, 39, 250, 181, 40, + 204, 189, 1, 217, 23, 238, 94, 40, 204, 189, 1, 200, 39, 238, 94, 40, + 204, 189, 1, 217, 23, 250, 155, 40, 204, 189, 1, 200, 39, 250, 155, 40, + 204, 189, 1, 217, 23, 251, 203, 40, 204, 189, 1, 200, 39, 251, 203, 40, + 204, 189, 1, 217, 23, 217, 11, 40, 204, 189, 1, 217, 23, 249, 61, 40, + 152, 6, 1, 62, 40, 152, 6, 1, 252, 138, 40, 152, 6, 1, 239, 9, 40, 152, + 6, 1, 251, 96, 40, 152, 6, 1, 239, 7, 40, 152, 6, 1, 238, 176, 40, 152, + 6, 1, 239, 4, 40, 152, 6, 1, 239, 3, 40, 152, 6, 1, 251, 79, 40, 152, 6, + 1, 72, 40, 152, 6, 1, 246, 111, 72, 40, 152, 6, 1, 238, 255, 40, 152, 6, + 1, 238, 248, 40, 152, 6, 1, 238, 247, 40, 152, 6, 1, 238, 244, 40, 152, + 6, 1, 238, 241, 40, 152, 6, 1, 70, 40, 152, 6, 1, 228, 151, 40, 152, 6, + 1, 238, 219, 40, 152, 6, 1, 238, 216, 40, 152, 6, 1, 251, 159, 40, 152, + 6, 1, 203, 236, 40, 152, 6, 1, 238, 209, 40, 152, 6, 1, 238, 192, 40, + 152, 6, 1, 238, 190, 40, 152, 6, 1, 238, 179, 40, 152, 6, 1, 238, 143, + 40, 152, 6, 1, 74, 40, 152, 6, 1, 217, 63, 40, 152, 6, 1, 219, 121, 217, + 121, 40, 152, 6, 1, 212, 171, 217, 121, 40, 152, 6, 1, 217, 120, 40, 152, + 6, 1, 238, 133, 40, 152, 6, 1, 238, 184, 40, 152, 6, 1, 238, 115, 40, + 152, 6, 1, 209, 250, 238, 115, 40, 152, 6, 1, 238, 104, 40, 152, 6, 1, + 238, 83, 40, 152, 6, 1, 238, 81, 40, 152, 6, 1, 238, 157, 40, 152, 6, 1, + 238, 70, 40, 152, 6, 1, 239, 5, 40, 152, 6, 1, 66, 40, 152, 6, 1, 203, + 182, 40, 152, 6, 1, 219, 121, 204, 31, 40, 152, 6, 1, 212, 171, 204, 31, + 40, 152, 6, 1, 238, 57, 40, 152, 6, 1, 238, 12, 40, 152, 6, 1, 238, 7, + 40, 152, 6, 1, 238, 156, 54, 40, 152, 6, 1, 203, 197, 40, 152, 4, 1, 62, + 40, 152, 4, 1, 252, 138, 40, 152, 4, 1, 239, 9, 40, 152, 4, 1, 251, 96, + 40, 152, 4, 1, 239, 7, 40, 152, 4, 1, 238, 176, 40, 152, 4, 1, 239, 4, + 40, 152, 4, 1, 239, 3, 40, 152, 4, 1, 251, 79, 40, 152, 4, 1, 72, 40, + 152, 4, 1, 246, 111, 72, 40, 152, 4, 1, 238, 255, 40, 152, 4, 1, 238, + 248, 40, 152, 4, 1, 238, 247, 40, 152, 4, 1, 238, 244, 40, 152, 4, 1, + 238, 241, 40, 152, 4, 1, 70, 40, 152, 4, 1, 228, 151, 40, 152, 4, 1, 238, + 219, 40, 152, 4, 1, 238, 216, 40, 152, 4, 1, 251, 159, 40, 152, 4, 1, + 203, 236, 40, 152, 4, 1, 238, 209, 40, 152, 4, 1, 238, 192, 40, 152, 4, + 1, 238, 190, 40, 152, 4, 1, 238, 179, 40, 152, 4, 1, 238, 143, 40, 152, + 4, 1, 74, 40, 152, 4, 1, 217, 63, 40, 152, 4, 1, 219, 121, 217, 121, 40, + 152, 4, 1, 212, 171, 217, 121, 40, 152, 4, 1, 217, 120, 40, 152, 4, 1, + 238, 133, 40, 152, 4, 1, 238, 184, 40, 152, 4, 1, 238, 115, 40, 152, 4, + 1, 209, 250, 238, 115, 40, 152, 4, 1, 238, 104, 40, 152, 4, 1, 238, 83, + 40, 152, 4, 1, 238, 81, 40, 152, 4, 1, 238, 157, 40, 152, 4, 1, 238, 70, + 40, 152, 4, 1, 239, 5, 40, 152, 4, 1, 66, 40, 152, 4, 1, 203, 182, 40, + 152, 4, 1, 219, 121, 204, 31, 40, 152, 4, 1, 212, 171, 204, 31, 40, 152, + 4, 1, 238, 57, 40, 152, 4, 1, 238, 12, 40, 152, 4, 1, 238, 7, 40, 152, 4, + 1, 238, 156, 54, 40, 152, 4, 1, 203, 197, 40, 152, 41, 102, 40, 152, 41, + 164, 40, 152, 41, 206, 166, 40, 152, 41, 237, 104, 40, 152, 41, 112, 233, + 82, 40, 152, 41, 112, 206, 50, 212, 159, 17, 102, 212, 159, 17, 105, 212, + 159, 17, 147, 212, 159, 17, 149, 212, 159, 17, 164, 212, 159, 17, 187, + 212, 159, 17, 210, 135, 212, 159, 17, 192, 212, 159, 17, 219, 113, 212, + 159, 41, 206, 166, 212, 159, 41, 204, 159, 212, 159, 41, 206, 67, 212, + 159, 41, 236, 235, 212, 159, 41, 237, 104, 212, 159, 41, 209, 92, 212, + 159, 41, 210, 129, 212, 159, 41, 238, 222, 212, 159, 41, 219, 108, 212, + 159, 41, 112, 233, 82, 212, 159, 41, 120, 233, 82, 212, 159, 41, 126, + 233, 82, 212, 159, 41, 236, 229, 233, 82, 212, 159, 41, 237, 61, 233, 82, + 212, 159, 41, 209, 106, 233, 82, 212, 159, 41, 210, 136, 233, 82, 212, + 159, 41, 238, 232, 233, 82, 212, 159, 41, 219, 114, 233, 82, 212, 159, + 236, 219, 112, 234, 213, 212, 159, 236, 219, 112, 214, 87, 212, 159, 236, + 219, 112, 206, 74, 212, 159, 236, 219, 120, 206, 71, 151, 2, 247, 149, + 151, 2, 251, 33, 151, 2, 202, 203, 151, 2, 227, 201, 151, 2, 203, 226, + 151, 1, 62, 151, 1, 252, 138, 151, 1, 70, 151, 1, 228, 151, 151, 1, 66, + 151, 1, 203, 182, 151, 1, 109, 146, 151, 1, 109, 212, 216, 151, 1, 109, + 156, 151, 1, 109, 224, 139, 151, 1, 72, 151, 1, 251, 176, 151, 1, 74, + 151, 1, 250, 139, 151, 1, 161, 151, 1, 226, 207, 151, 1, 236, 89, 151, 1, + 235, 199, 151, 1, 219, 253, 151, 1, 247, 190, 151, 1, 247, 37, 151, 1, + 227, 248, 151, 1, 227, 215, 151, 1, 218, 60, 151, 1, 204, 253, 151, 1, + 204, 241, 151, 1, 241, 220, 151, 1, 241, 204, 151, 1, 219, 21, 151, 1, + 207, 36, 151, 1, 206, 122, 151, 1, 242, 58, 151, 1, 241, 100, 151, 1, + 188, 151, 1, 172, 151, 1, 215, 245, 151, 1, 249, 136, 151, 1, 248, 200, + 151, 1, 178, 151, 1, 183, 151, 1, 213, 252, 151, 1, 194, 151, 1, 203, 90, + 151, 1, 210, 114, 151, 1, 208, 179, 151, 1, 212, 64, 151, 1, 144, 151, 1, + 224, 138, 151, 1, 40, 45, 224, 129, 151, 1, 40, 45, 212, 215, 151, 1, 40, + 45, 219, 3, 151, 22, 2, 252, 138, 151, 22, 2, 248, 197, 252, 138, 151, + 22, 2, 70, 151, 22, 2, 228, 151, 151, 22, 2, 66, 151, 22, 2, 203, 182, + 151, 22, 2, 109, 146, 151, 22, 2, 109, 212, 216, 151, 22, 2, 109, 156, + 151, 22, 2, 109, 224, 139, 151, 22, 2, 72, 151, 22, 2, 251, 176, 151, 22, + 2, 74, 151, 22, 2, 250, 139, 151, 202, 208, 151, 242, 10, 151, 53, 242, + 10, 151, 214, 212, 240, 182, 151, 214, 212, 53, 240, 182, 151, 214, 212, + 224, 176, 151, 214, 212, 242, 244, 148, 151, 214, 212, 224, 64, 151, 41, + 102, 151, 41, 105, 151, 41, 147, 151, 41, 149, 151, 41, 164, 151, 41, + 187, 151, 41, 210, 135, 151, 41, 192, 151, 41, 219, 113, 151, 41, 206, + 166, 151, 41, 204, 159, 151, 41, 206, 67, 151, 41, 236, 235, 151, 41, + 237, 104, 151, 41, 209, 92, 151, 41, 210, 129, 151, 41, 238, 222, 151, + 41, 219, 108, 151, 41, 112, 233, 82, 151, 41, 112, 206, 50, 151, 17, 199, + 81, 151, 17, 102, 151, 17, 105, 151, 17, 147, 151, 17, 149, 151, 17, 164, + 151, 17, 187, 151, 17, 210, 135, 151, 17, 192, 151, 17, 219, 113, 151, + 41, 227, 161, 227, 79, 2, 247, 149, 227, 79, 2, 251, 33, 227, 79, 2, 202, + 203, 227, 79, 1, 62, 227, 79, 1, 252, 138, 227, 79, 1, 70, 227, 79, 1, + 228, 151, 227, 79, 1, 66, 227, 79, 1, 203, 182, 227, 79, 1, 72, 227, 79, + 1, 251, 176, 227, 79, 1, 74, 227, 79, 1, 250, 139, 227, 79, 1, 161, 227, + 79, 1, 226, 207, 227, 79, 1, 236, 89, 227, 79, 1, 235, 199, 227, 79, 1, + 219, 253, 227, 79, 1, 247, 190, 227, 79, 1, 247, 37, 227, 79, 1, 227, + 248, 227, 79, 1, 227, 215, 227, 79, 1, 218, 60, 227, 79, 1, 204, 253, + 227, 79, 1, 204, 241, 227, 79, 1, 241, 220, 227, 79, 1, 241, 209, 227, + 79, 1, 241, 204, 227, 79, 1, 213, 93, 227, 79, 1, 219, 21, 227, 79, 1, + 207, 36, 227, 79, 1, 206, 122, 227, 79, 1, 242, 58, 227, 79, 1, 241, 100, + 227, 79, 1, 188, 227, 79, 1, 172, 227, 79, 1, 215, 245, 227, 79, 1, 249, + 136, 227, 79, 1, 248, 200, 227, 79, 1, 178, 227, 79, 1, 183, 227, 79, 1, + 213, 252, 227, 79, 1, 194, 227, 79, 1, 203, 90, 227, 79, 1, 210, 114, + 227, 79, 1, 208, 179, 227, 79, 1, 212, 64, 227, 79, 1, 144, 227, 79, 22, + 2, 252, 138, 227, 79, 22, 2, 70, 227, 79, 22, 2, 228, 151, 227, 79, 22, + 2, 66, 227, 79, 22, 2, 203, 182, 227, 79, 22, 2, 72, 227, 79, 22, 2, 251, + 176, 227, 79, 22, 2, 74, 227, 79, 22, 2, 250, 139, 227, 79, 2, 202, 208, + 227, 79, 2, 218, 100, 227, 79, 252, 3, 54, 227, 79, 238, 146, 54, 227, + 79, 41, 54, 227, 79, 211, 193, 81, 227, 79, 53, 211, 193, 81, 227, 79, + 242, 10, 227, 79, 53, 242, 10, 209, 6, 209, 14, 1, 212, 47, 209, 6, 209, + 14, 1, 207, 9, 209, 6, 209, 14, 1, 249, 107, 209, 6, 209, 14, 1, 247, + 179, 209, 6, 209, 14, 1, 242, 38, 209, 6, 209, 14, 1, 236, 74, 209, 6, + 209, 14, 1, 222, 206, 209, 6, 209, 14, 1, 219, 250, 209, 6, 209, 14, 1, + 225, 152, 209, 6, 209, 14, 1, 220, 144, 209, 6, 209, 14, 1, 203, 86, 209, + 6, 209, 14, 1, 216, 192, 209, 6, 209, 14, 1, 200, 90, 209, 6, 209, 14, 1, + 213, 231, 209, 6, 209, 14, 1, 234, 224, 209, 6, 209, 14, 1, 227, 84, 209, + 6, 209, 14, 1, 227, 242, 209, 6, 209, 14, 1, 218, 57, 209, 6, 209, 14, 1, + 251, 185, 209, 6, 209, 14, 1, 238, 253, 209, 6, 209, 14, 1, 228, 152, + 209, 6, 209, 14, 1, 204, 25, 209, 6, 209, 14, 1, 217, 108, 209, 6, 209, + 14, 1, 238, 241, 209, 6, 209, 14, 1, 222, 219, 209, 6, 209, 14, 17, 199, + 81, 209, 6, 209, 14, 17, 102, 209, 6, 209, 14, 17, 105, 209, 6, 209, 14, + 17, 147, 209, 6, 209, 14, 17, 149, 209, 6, 209, 14, 17, 164, 209, 6, 209, + 14, 17, 187, 209, 6, 209, 14, 17, 210, 135, 209, 6, 209, 14, 17, 192, + 209, 6, 209, 14, 17, 219, 113, 247, 31, 2, 247, 149, 247, 31, 2, 251, 33, + 247, 31, 2, 202, 203, 247, 31, 1, 252, 138, 247, 31, 1, 70, 247, 31, 1, + 66, 247, 31, 1, 72, 247, 31, 1, 227, 105, 247, 31, 1, 226, 206, 247, 31, + 1, 236, 86, 247, 31, 1, 235, 198, 247, 31, 1, 219, 252, 247, 31, 1, 247, + 189, 247, 31, 1, 247, 36, 247, 31, 1, 227, 247, 247, 31, 1, 227, 214, + 247, 31, 1, 218, 59, 247, 31, 1, 204, 252, 247, 31, 1, 204, 240, 247, 31, + 1, 241, 219, 247, 31, 1, 241, 203, 247, 31, 1, 219, 20, 247, 31, 1, 207, + 32, 247, 31, 1, 206, 121, 247, 31, 1, 242, 57, 247, 31, 1, 241, 99, 247, + 31, 1, 220, 157, 247, 31, 1, 216, 210, 247, 31, 1, 215, 244, 247, 31, 1, + 249, 134, 247, 31, 1, 248, 199, 247, 31, 1, 222, 233, 247, 31, 1, 199, + 165, 247, 31, 1, 200, 109, 247, 31, 1, 213, 248, 247, 31, 1, 225, 175, + 247, 31, 1, 201, 113, 247, 31, 1, 212, 61, 247, 31, 1, 234, 233, 247, 31, + 22, 2, 62, 247, 31, 22, 2, 70, 247, 31, 22, 2, 228, 151, 247, 31, 22, 2, + 66, 247, 31, 22, 2, 203, 182, 247, 31, 22, 2, 72, 247, 31, 22, 2, 251, + 176, 247, 31, 22, 2, 74, 247, 31, 22, 2, 250, 139, 247, 31, 22, 2, 217, + 105, 247, 31, 163, 81, 247, 31, 250, 140, 81, 247, 31, 202, 208, 247, 31, + 222, 231, 247, 31, 17, 199, 81, 247, 31, 17, 102, 247, 31, 17, 105, 247, + 31, 17, 147, 247, 31, 17, 149, 247, 31, 17, 164, 247, 31, 17, 187, 247, + 31, 17, 210, 135, 247, 31, 17, 192, 247, 31, 17, 219, 113, 247, 31, 211, + 193, 81, 247, 31, 242, 10, 247, 31, 53, 242, 10, 247, 31, 214, 79, 81, + 222, 204, 1, 62, 222, 204, 1, 70, 222, 204, 1, 66, 222, 204, 1, 72, 222, + 204, 1, 74, 222, 204, 1, 161, 222, 204, 1, 226, 207, 222, 204, 1, 236, + 89, 222, 204, 1, 235, 199, 222, 204, 1, 247, 190, 222, 204, 1, 247, 37, + 222, 204, 1, 227, 248, 222, 204, 1, 227, 215, 222, 204, 1, 218, 60, 222, + 204, 1, 204, 253, 222, 204, 1, 204, 241, 222, 204, 1, 241, 220, 222, 204, + 1, 241, 204, 222, 204, 1, 219, 21, 222, 204, 1, 207, 36, 222, 204, 1, + 206, 122, 222, 204, 1, 242, 58, 222, 204, 1, 241, 100, 222, 204, 1, 188, + 222, 204, 1, 172, 222, 204, 1, 215, 245, 222, 204, 1, 249, 136, 222, 204, + 1, 248, 200, 222, 204, 1, 178, 222, 204, 1, 213, 252, 222, 204, 1, 194, + 222, 204, 1, 203, 90, 222, 204, 1, 212, 64, 222, 204, 1, 144, 222, 204, + 1, 212, 215, 222, 204, 2, 218, 100, 222, 204, 252, 3, 54, 222, 204, 211, + 193, 81, 222, 204, 33, 209, 228, 186, 2, 247, 149, 186, 2, 251, 33, 186, + 2, 202, 203, 186, 1, 62, 186, 1, 252, 138, 186, 1, 70, 186, 1, 228, 151, + 186, 1, 66, 186, 1, 203, 182, 186, 1, 109, 146, 186, 1, 109, 212, 216, + 186, 1, 109, 156, 186, 1, 109, 224, 139, 186, 1, 72, 186, 1, 251, 176, + 186, 1, 74, 186, 1, 250, 139, 186, 1, 161, 186, 1, 226, 207, 186, 1, 236, + 89, 186, 1, 235, 199, 186, 1, 219, 253, 186, 1, 247, 190, 186, 1, 247, + 37, 186, 1, 227, 248, 186, 1, 227, 215, 186, 1, 218, 60, 186, 1, 204, + 253, 186, 1, 204, 241, 186, 1, 241, 220, 186, 1, 241, 204, 186, 1, 219, + 21, 186, 1, 207, 36, 186, 1, 206, 122, 186, 1, 242, 58, 186, 1, 241, 100, + 186, 1, 188, 186, 1, 172, 186, 1, 215, 245, 186, 1, 249, 136, 186, 1, + 248, 200, 186, 1, 178, 186, 1, 183, 186, 1, 213, 252, 186, 1, 194, 186, + 1, 224, 138, 186, 1, 203, 90, 186, 1, 210, 114, 186, 1, 208, 179, 186, 1, + 212, 64, 186, 1, 144, 186, 22, 2, 252, 138, 186, 22, 2, 70, 186, 22, 2, + 228, 151, 186, 22, 2, 66, 186, 22, 2, 203, 182, 186, 22, 2, 109, 146, + 186, 22, 2, 109, 212, 216, 186, 22, 2, 109, 156, 186, 22, 2, 109, 224, + 139, 186, 22, 2, 72, 186, 22, 2, 251, 176, 186, 22, 2, 74, 186, 22, 2, + 250, 139, 186, 2, 202, 208, 186, 2, 250, 122, 186, 2, 227, 201, 186, 2, + 203, 226, 186, 217, 86, 186, 242, 10, 186, 53, 242, 10, 186, 252, 3, 54, + 186, 210, 154, 186, 212, 9, 81, 186, 2, 218, 100, 186, 22, 67, 81, 186, + 238, 30, 209, 250, 22, 81, 186, 207, 194, 81, 186, 17, 199, 81, 186, 17, + 102, 186, 17, 105, 186, 17, 147, 186, 17, 149, 186, 17, 164, 186, 17, + 187, 186, 17, 210, 135, 186, 17, 192, 186, 17, 219, 113, 186, 238, 215, + 186, 2, 209, 177, 186, 234, 130, 186, 243, 41, 54, 186, 211, 193, 222, + 149, 186, 211, 193, 222, 148, 143, 250, 234, 17, 102, 143, 250, 234, 17, + 105, 143, 250, 234, 17, 147, 143, 250, 234, 17, 149, 143, 250, 234, 17, + 164, 143, 250, 234, 17, 187, 143, 250, 234, 17, 210, 135, 143, 250, 234, + 17, 192, 143, 250, 234, 17, 219, 113, 143, 250, 234, 41, 206, 166, 143, + 250, 234, 41, 204, 159, 143, 250, 234, 41, 206, 67, 143, 250, 234, 41, + 236, 235, 143, 250, 234, 41, 237, 104, 143, 250, 234, 41, 209, 92, 143, + 250, 234, 41, 210, 129, 143, 250, 234, 41, 238, 222, 143, 250, 234, 41, + 219, 108, 143, 250, 234, 41, 112, 233, 82, 143, 250, 234, 41, 112, 206, + 50, 226, 177, 1, 62, 226, 177, 1, 252, 138, 226, 177, 1, 70, 226, 177, 1, + 66, 226, 177, 1, 72, 226, 177, 1, 251, 176, 226, 177, 1, 74, 226, 177, 1, + 250, 139, 226, 177, 1, 161, 226, 177, 1, 226, 207, 226, 177, 1, 236, 89, + 226, 177, 1, 235, 235, 226, 177, 1, 235, 199, 226, 177, 1, 219, 253, 226, + 177, 1, 247, 190, 226, 177, 1, 247, 37, 226, 177, 1, 227, 248, 226, 177, + 1, 227, 194, 226, 177, 1, 218, 60, 226, 177, 1, 204, 253, 226, 177, 1, + 204, 241, 226, 177, 1, 241, 220, 226, 177, 1, 241, 204, 226, 177, 1, 219, + 21, 226, 177, 1, 207, 36, 226, 177, 1, 206, 122, 226, 177, 1, 242, 58, + 226, 177, 1, 241, 210, 226, 177, 1, 241, 100, 226, 177, 1, 188, 226, 177, + 1, 172, 226, 177, 1, 215, 245, 226, 177, 1, 249, 136, 226, 177, 1, 249, + 44, 226, 177, 1, 248, 200, 226, 177, 1, 178, 226, 177, 1, 183, 226, 177, + 1, 213, 252, 226, 177, 1, 194, 226, 177, 1, 203, 90, 226, 177, 1, 212, + 64, 226, 177, 1, 144, 226, 177, 1, 224, 138, 226, 177, 22, 2, 252, 138, + 226, 177, 22, 2, 70, 226, 177, 22, 2, 228, 151, 226, 177, 22, 2, 66, 226, + 177, 22, 2, 72, 226, 177, 22, 2, 251, 176, 226, 177, 22, 2, 74, 226, 177, + 22, 2, 250, 139, 226, 177, 2, 251, 33, 226, 177, 2, 202, 208, 226, 177, + 2, 218, 100, 226, 177, 2, 210, 104, 226, 177, 242, 10, 226, 177, 53, 242, + 10, 226, 177, 200, 238, 210, 154, 226, 177, 211, 193, 81, 226, 177, 53, + 211, 193, 81, 226, 177, 252, 3, 54, 226, 177, 2, 207, 236, 221, 25, 1, + 62, 221, 25, 1, 70, 221, 25, 1, 66, 221, 25, 1, 72, 221, 25, 1, 161, 221, + 25, 1, 226, 207, 221, 25, 1, 236, 89, 221, 25, 1, 235, 199, 221, 25, 1, + 247, 190, 221, 25, 1, 247, 37, 221, 25, 1, 227, 248, 221, 25, 1, 227, + 194, 221, 25, 1, 218, 60, 221, 25, 1, 204, 253, 221, 25, 1, 204, 241, + 221, 25, 1, 241, 220, 221, 25, 1, 241, 210, 221, 25, 1, 241, 204, 221, + 25, 1, 219, 21, 221, 25, 1, 207, 36, 221, 25, 1, 206, 122, 221, 25, 1, + 242, 58, 221, 25, 1, 241, 100, 221, 25, 1, 188, 221, 25, 1, 172, 221, 25, + 1, 215, 245, 221, 25, 1, 249, 136, 221, 25, 1, 248, 200, 221, 25, 1, 178, + 221, 25, 1, 183, 221, 25, 1, 213, 252, 221, 25, 1, 194, 221, 25, 1, 203, + 90, 221, 25, 1, 212, 64, 221, 25, 1, 144, 221, 25, 1, 212, 215, 221, 25, + 1, 213, 93, 221, 25, 211, 193, 81, 226, 169, 1, 62, 226, 169, 1, 252, + 138, 226, 169, 1, 70, 226, 169, 1, 228, 151, 226, 169, 1, 66, 226, 169, + 1, 203, 182, 226, 169, 1, 72, 226, 169, 1, 251, 176, 226, 169, 1, 74, + 226, 169, 1, 250, 139, 226, 169, 1, 161, 226, 169, 1, 226, 207, 226, 169, + 1, 236, 89, 226, 169, 1, 235, 235, 226, 169, 1, 235, 199, 226, 169, 1, + 219, 253, 226, 169, 1, 247, 190, 226, 169, 1, 247, 37, 226, 169, 1, 227, + 248, 226, 169, 1, 227, 194, 226, 169, 1, 227, 215, 226, 169, 1, 218, 60, + 226, 169, 1, 204, 253, 226, 169, 1, 204, 241, 226, 169, 1, 241, 220, 226, + 169, 1, 241, 210, 226, 169, 1, 212, 215, 226, 169, 1, 241, 204, 226, 169, + 1, 219, 21, 226, 169, 1, 207, 36, 226, 169, 1, 206, 122, 226, 169, 1, + 242, 58, 226, 169, 1, 241, 100, 226, 169, 1, 188, 226, 169, 1, 172, 226, + 169, 1, 215, 245, 226, 169, 1, 249, 136, 226, 169, 1, 249, 44, 226, 169, + 1, 248, 200, 226, 169, 1, 178, 226, 169, 1, 183, 226, 169, 1, 213, 252, + 226, 169, 1, 194, 226, 169, 1, 203, 90, 226, 169, 1, 210, 114, 226, 169, + 1, 212, 64, 226, 169, 1, 144, 226, 169, 2, 251, 33, 226, 169, 22, 2, 252, + 138, 226, 169, 22, 2, 70, 226, 169, 22, 2, 228, 151, 226, 169, 22, 2, 66, + 226, 169, 22, 2, 203, 182, 226, 169, 22, 2, 72, 226, 169, 22, 2, 251, + 176, 226, 169, 22, 2, 74, 226, 169, 22, 2, 250, 139, 226, 169, 2, 218, + 100, 226, 169, 2, 202, 208, 226, 169, 17, 199, 81, 226, 169, 17, 102, + 226, 169, 17, 105, 226, 169, 17, 147, 226, 169, 17, 149, 226, 169, 17, + 164, 226, 169, 17, 187, 226, 169, 17, 210, 135, 226, 169, 17, 192, 226, + 169, 17, 219, 113, 235, 82, 2, 38, 251, 34, 56, 235, 82, 2, 247, 149, + 235, 82, 2, 251, 33, 235, 82, 2, 202, 203, 235, 82, 1, 62, 235, 82, 1, + 252, 138, 235, 82, 1, 70, 235, 82, 1, 228, 151, 235, 82, 1, 66, 235, 82, + 1, 203, 182, 235, 82, 1, 109, 146, 235, 82, 1, 109, 156, 235, 82, 1, 238, + 255, 235, 82, 1, 251, 176, 235, 82, 1, 217, 63, 235, 82, 1, 250, 139, + 235, 82, 1, 161, 235, 82, 1, 226, 207, 235, 82, 1, 236, 89, 235, 82, 1, + 235, 199, 235, 82, 1, 219, 253, 235, 82, 1, 247, 190, 235, 82, 1, 247, + 37, 235, 82, 1, 227, 248, 235, 82, 1, 227, 215, 235, 82, 1, 218, 60, 235, + 82, 1, 204, 253, 235, 82, 1, 204, 241, 235, 82, 1, 241, 220, 235, 82, 1, + 241, 204, 235, 82, 1, 219, 21, 235, 82, 1, 207, 36, 235, 82, 1, 206, 122, + 235, 82, 1, 242, 58, 235, 82, 1, 241, 100, 235, 82, 1, 188, 235, 82, 1, + 172, 235, 82, 1, 215, 245, 235, 82, 1, 249, 136, 235, 82, 1, 248, 200, + 235, 82, 1, 178, 235, 82, 1, 183, 235, 82, 1, 213, 252, 235, 82, 1, 194, + 235, 82, 1, 224, 138, 235, 82, 1, 203, 90, 235, 82, 1, 210, 114, 235, 82, + 1, 208, 179, 235, 82, 1, 212, 64, 235, 82, 1, 144, 235, 82, 2, 218, 100, + 235, 82, 2, 250, 122, 235, 82, 22, 2, 252, 138, 235, 82, 22, 2, 70, 235, + 82, 22, 2, 228, 151, 235, 82, 22, 2, 66, 235, 82, 22, 2, 203, 182, 235, + 82, 22, 2, 109, 146, 235, 82, 22, 2, 109, 212, 216, 235, 82, 22, 2, 238, + 255, 235, 82, 22, 2, 251, 176, 235, 82, 22, 2, 217, 63, 235, 82, 22, 2, + 250, 139, 235, 82, 2, 202, 208, 235, 82, 217, 86, 235, 82, 250, 140, 225, + 2, 81, 235, 82, 2, 215, 111, 235, 82, 1, 203, 56, 251, 33, 235, 82, 1, + 203, 56, 53, 251, 33, 235, 82, 1, 109, 212, 216, 235, 82, 1, 109, 224, + 139, 235, 82, 22, 2, 109, 156, 235, 82, 22, 2, 109, 224, 139, 38, 235, + 82, 17, 199, 81, 38, 235, 82, 17, 102, 38, 235, 82, 17, 105, 38, 235, 82, + 17, 147, 38, 235, 82, 17, 149, 38, 235, 82, 17, 164, 38, 235, 82, 17, + 187, 38, 235, 82, 1, 62, 38, 235, 82, 1, 161, 38, 235, 82, 1, 188, 38, + 235, 82, 1, 202, 234, 38, 235, 82, 1, 172, 195, 1, 62, 195, 1, 252, 138, + 195, 1, 70, 195, 1, 228, 151, 195, 1, 66, 195, 1, 203, 182, 195, 1, 109, + 146, 195, 1, 109, 212, 216, 195, 1, 109, 156, 195, 1, 109, 224, 139, 195, + 1, 72, 195, 1, 251, 176, 195, 1, 74, 195, 1, 250, 139, 195, 1, 161, 195, + 1, 226, 207, 195, 1, 236, 89, 195, 1, 235, 199, 195, 1, 219, 253, 195, 1, + 219, 202, 195, 1, 247, 190, 195, 1, 247, 37, 195, 1, 227, 248, 195, 1, + 227, 215, 195, 1, 218, 60, 195, 1, 218, 43, 195, 1, 204, 253, 195, 1, + 204, 241, 195, 1, 241, 220, 195, 1, 241, 204, 195, 1, 219, 21, 195, 1, + 207, 36, 195, 1, 206, 122, 195, 1, 242, 58, 195, 1, 241, 100, 195, 1, + 188, 195, 1, 219, 154, 195, 1, 172, 195, 1, 215, 245, 195, 1, 249, 136, + 195, 1, 248, 200, 195, 1, 178, 195, 1, 221, 214, 195, 1, 183, 195, 1, + 213, 252, 195, 1, 213, 93, 195, 1, 194, 195, 1, 224, 223, 195, 1, 201, + 114, 195, 1, 210, 114, 195, 1, 208, 179, 195, 1, 212, 64, 195, 1, 144, + 195, 22, 2, 252, 138, 195, 22, 2, 70, 195, 22, 2, 228, 151, 195, 22, 2, + 66, 195, 22, 2, 203, 182, 195, 22, 2, 109, 146, 195, 22, 2, 109, 212, + 216, 195, 22, 2, 109, 156, 195, 22, 2, 109, 224, 139, 195, 22, 2, 72, + 195, 22, 2, 251, 176, 195, 22, 2, 74, 195, 22, 2, 250, 139, 195, 2, 202, + 208, 195, 2, 247, 149, 195, 2, 251, 33, 195, 2, 202, 203, 195, 2, 218, + 100, 195, 2, 250, 122, 195, 2, 47, 251, 33, 195, 217, 86, 195, 209, 176, + 195, 242, 10, 195, 53, 242, 10, 195, 246, 70, 195, 236, 53, 237, 93, 195, + 252, 3, 54, 195, 17, 199, 81, 195, 17, 102, 195, 17, 105, 195, 17, 147, + 195, 17, 149, 195, 17, 164, 195, 17, 187, 195, 17, 210, 135, 195, 17, + 192, 195, 17, 219, 113, 195, 215, 133, 81, 195, 228, 75, 54, 205, 217, + 251, 62, 205, 217, 1, 62, 205, 217, 1, 252, 138, 205, 217, 1, 70, 205, + 217, 1, 228, 151, 205, 217, 1, 66, 205, 217, 1, 203, 182, 205, 217, 1, + 109, 146, 205, 217, 1, 109, 212, 216, 205, 217, 1, 109, 156, 205, 217, 1, + 109, 224, 139, 205, 217, 1, 72, 205, 217, 1, 251, 176, 205, 217, 1, 74, + 205, 217, 1, 250, 139, 205, 217, 1, 161, 205, 217, 1, 226, 207, 205, 217, + 1, 236, 89, 205, 217, 1, 235, 199, 205, 217, 1, 219, 253, 205, 217, 1, + 247, 190, 205, 217, 1, 247, 37, 205, 217, 1, 227, 248, 205, 217, 1, 227, + 215, 205, 217, 1, 218, 60, 205, 217, 1, 204, 253, 205, 217, 1, 204, 241, + 205, 217, 1, 241, 220, 205, 217, 1, 241, 204, 205, 217, 1, 219, 21, 205, + 217, 1, 207, 36, 205, 217, 1, 206, 122, 205, 217, 1, 242, 58, 205, 217, + 1, 241, 100, 205, 217, 1, 188, 205, 217, 1, 172, 205, 217, 1, 215, 245, + 205, 217, 1, 249, 136, 205, 217, 1, 248, 200, 205, 217, 1, 178, 205, 217, + 1, 183, 205, 217, 1, 213, 252, 205, 217, 1, 194, 205, 217, 1, 203, 90, + 205, 217, 1, 210, 114, 205, 217, 1, 208, 179, 205, 217, 1, 212, 64, 205, + 217, 1, 144, 205, 217, 22, 2, 252, 138, 205, 217, 22, 2, 70, 205, 217, + 22, 2, 228, 151, 205, 217, 22, 2, 66, 205, 217, 22, 2, 203, 182, 205, + 217, 22, 2, 109, 146, 205, 217, 22, 2, 109, 212, 216, 205, 217, 22, 2, + 109, 156, 205, 217, 22, 2, 109, 224, 139, 205, 217, 22, 2, 72, 205, 217, + 22, 2, 209, 250, 72, 205, 217, 22, 2, 251, 176, 205, 217, 22, 2, 74, 205, + 217, 22, 2, 209, 250, 74, 205, 217, 22, 2, 250, 139, 205, 217, 2, 247, + 149, 205, 217, 2, 251, 33, 205, 217, 2, 202, 203, 205, 217, 2, 202, 208, + 205, 217, 2, 218, 100, 205, 217, 2, 250, 122, 205, 217, 235, 11, 205, + 217, 252, 3, 54, 205, 217, 217, 86, 205, 217, 17, 199, 81, 205, 217, 17, + 102, 205, 217, 17, 105, 205, 217, 17, 147, 205, 217, 17, 149, 205, 217, + 17, 164, 205, 217, 17, 187, 205, 217, 17, 210, 135, 205, 217, 17, 192, + 205, 217, 17, 219, 113, 196, 1, 62, 196, 1, 252, 138, 196, 1, 70, 196, 1, + 228, 151, 196, 1, 66, 196, 1, 203, 182, 196, 1, 109, 146, 196, 1, 109, + 212, 216, 196, 1, 109, 156, 196, 1, 109, 224, 139, 196, 1, 72, 196, 1, + 251, 176, 196, 1, 74, 196, 1, 250, 139, 196, 1, 161, 196, 1, 226, 207, + 196, 1, 236, 89, 196, 1, 235, 199, 196, 1, 219, 253, 196, 1, 247, 190, + 196, 1, 247, 37, 196, 1, 227, 248, 196, 1, 227, 215, 196, 1, 218, 60, + 196, 1, 204, 253, 196, 1, 204, 241, 196, 1, 241, 220, 196, 1, 241, 204, + 196, 1, 219, 21, 196, 1, 207, 36, 196, 1, 206, 122, 196, 1, 242, 58, 196, + 1, 241, 100, 196, 1, 188, 196, 1, 172, 196, 1, 215, 245, 196, 1, 249, + 136, 196, 1, 248, 200, 196, 1, 178, 196, 1, 183, 196, 1, 213, 252, 196, + 1, 194, 196, 1, 203, 90, 196, 1, 210, 114, 196, 1, 208, 179, 196, 1, 212, + 64, 196, 1, 144, 196, 22, 2, 252, 138, 196, 22, 2, 70, 196, 22, 2, 228, + 151, 196, 22, 2, 66, 196, 22, 2, 203, 182, 196, 22, 2, 109, 146, 196, 22, + 2, 109, 212, 216, 196, 22, 2, 72, 196, 22, 2, 251, 176, 196, 22, 2, 74, + 196, 22, 2, 250, 139, 196, 2, 247, 149, 196, 2, 251, 33, 196, 2, 202, + 203, 196, 2, 202, 208, 196, 2, 218, 100, 196, 2, 209, 177, 196, 242, 10, + 196, 53, 242, 10, 196, 210, 155, 240, 182, 196, 210, 155, 148, 196, 213, + 130, 222, 149, 196, 213, 130, 222, 148, 196, 213, 130, 222, 147, 196, + 238, 171, 76, 206, 127, 81, 196, 211, 193, 134, 3, 205, 93, 26, 204, 99, + 217, 20, 196, 211, 193, 134, 3, 205, 93, 26, 239, 180, 242, 242, 196, + 211, 193, 134, 3, 213, 195, 26, 239, 180, 242, 242, 196, 211, 193, 134, + 3, 213, 195, 26, 239, 180, 53, 242, 242, 196, 211, 193, 134, 3, 213, 195, + 26, 239, 180, 205, 83, 242, 242, 196, 211, 193, 134, 53, 213, 26, 196, + 211, 193, 134, 53, 213, 27, 3, 213, 194, 196, 211, 193, 134, 3, 53, 242, + 242, 196, 211, 193, 134, 3, 205, 83, 242, 242, 196, 211, 193, 134, 3, + 214, 90, 242, 242, 196, 211, 193, 134, 3, 210, 152, 242, 242, 196, 211, + 193, 134, 3, 246, 153, 26, 213, 194, 196, 211, 193, 134, 3, 246, 153, 26, + 120, 238, 173, 196, 211, 193, 134, 3, 246, 153, 26, 236, 229, 238, 173, + 196, 1, 206, 46, 251, 109, 70, 196, 1, 204, 143, 251, 109, 70, 196, 1, + 204, 143, 251, 109, 228, 151, 196, 1, 251, 109, 66, 196, 22, 2, 251, 109, + 66, 196, 22, 2, 251, 109, 203, 182, 221, 127, 1, 62, 221, 127, 1, 252, + 138, 221, 127, 1, 70, 221, 127, 1, 228, 151, 221, 127, 1, 66, 221, 127, + 1, 203, 182, 221, 127, 1, 109, 146, 221, 127, 1, 109, 212, 216, 221, 127, + 1, 109, 156, 221, 127, 1, 109, 224, 139, 221, 127, 1, 72, 221, 127, 1, + 251, 176, 221, 127, 1, 74, 221, 127, 1, 250, 139, 221, 127, 1, 161, 221, + 127, 1, 226, 207, 221, 127, 1, 236, 89, 221, 127, 1, 235, 199, 221, 127, + 1, 219, 253, 221, 127, 1, 247, 190, 221, 127, 1, 247, 37, 221, 127, 1, + 227, 248, 221, 127, 1, 227, 215, 221, 127, 1, 218, 60, 221, 127, 1, 204, + 253, 221, 127, 1, 204, 241, 221, 127, 1, 241, 220, 221, 127, 1, 241, 204, + 221, 127, 1, 219, 21, 221, 127, 1, 207, 36, 221, 127, 1, 206, 122, 221, + 127, 1, 242, 58, 221, 127, 1, 241, 100, 221, 127, 1, 188, 221, 127, 1, + 172, 221, 127, 1, 215, 245, 221, 127, 1, 249, 136, 221, 127, 1, 248, 200, + 221, 127, 1, 178, 221, 127, 1, 183, 221, 127, 1, 213, 252, 221, 127, 1, + 194, 221, 127, 1, 203, 90, 221, 127, 1, 210, 114, 221, 127, 1, 208, 179, + 221, 127, 1, 212, 64, 221, 127, 1, 144, 221, 127, 1, 224, 138, 221, 127, + 22, 2, 252, 138, 221, 127, 22, 2, 70, 221, 127, 22, 2, 228, 151, 221, + 127, 22, 2, 66, 221, 127, 22, 2, 203, 182, 221, 127, 22, 2, 109, 146, + 221, 127, 22, 2, 109, 212, 216, 221, 127, 22, 2, 109, 156, 221, 127, 22, + 2, 109, 224, 139, 221, 127, 22, 2, 72, 221, 127, 22, 2, 251, 176, 221, + 127, 22, 2, 74, 221, 127, 22, 2, 250, 139, 221, 127, 2, 251, 33, 221, + 127, 2, 202, 203, 221, 127, 2, 202, 208, 221, 127, 2, 250, 231, 221, 127, + 242, 10, 221, 127, 53, 242, 10, 221, 127, 252, 3, 54, 221, 127, 2, 233, + 70, 221, 127, 17, 199, 81, 221, 127, 17, 102, 221, 127, 17, 105, 221, + 127, 17, 147, 221, 127, 17, 149, 221, 127, 17, 164, 221, 127, 17, 187, + 221, 127, 17, 210, 135, 221, 127, 17, 192, 221, 127, 17, 219, 113, 92, + 248, 161, 3, 217, 21, 92, 212, 228, 248, 160, 92, 53, 248, 161, 3, 217, + 21, 92, 205, 83, 248, 161, 3, 217, 21, 92, 248, 161, 3, 53, 217, 21, 92, + 212, 228, 248, 161, 3, 217, 21, 92, 212, 228, 248, 161, 3, 53, 217, 21, + 92, 228, 50, 248, 160, 92, 228, 50, 248, 161, 3, 53, 217, 21, 92, 207, + 172, 248, 160, 92, 207, 172, 248, 161, 3, 217, 21, 92, 207, 172, 248, + 161, 3, 53, 217, 21, 92, 204, 185, 207, 172, 248, 161, 3, 53, 217, 21, + 206, 253, 1, 62, 206, 253, 1, 252, 138, 206, 253, 1, 70, 206, 253, 1, + 228, 151, 206, 253, 1, 66, 206, 253, 1, 203, 182, 206, 253, 1, 72, 206, + 253, 1, 251, 176, 206, 253, 1, 74, 206, 253, 1, 250, 139, 206, 253, 1, + 161, 206, 253, 1, 226, 207, 206, 253, 1, 236, 89, 206, 253, 1, 235, 199, + 206, 253, 1, 219, 253, 206, 253, 1, 247, 190, 206, 253, 1, 247, 37, 206, + 253, 1, 227, 248, 206, 253, 1, 227, 215, 206, 253, 1, 218, 60, 206, 253, + 1, 204, 253, 206, 253, 1, 204, 241, 206, 253, 1, 241, 220, 206, 253, 1, + 241, 204, 206, 253, 1, 219, 21, 206, 253, 1, 207, 36, 206, 253, 1, 206, + 122, 206, 253, 1, 242, 58, 206, 253, 1, 241, 100, 206, 253, 1, 188, 206, + 253, 1, 172, 206, 253, 1, 215, 245, 206, 253, 1, 249, 136, 206, 253, 1, + 248, 200, 206, 253, 1, 178, 206, 253, 1, 183, 206, 253, 1, 213, 252, 206, + 253, 1, 194, 206, 253, 1, 203, 90, 206, 253, 1, 210, 114, 206, 253, 1, + 212, 64, 206, 253, 1, 144, 206, 253, 1, 212, 215, 206, 253, 2, 251, 33, + 206, 253, 2, 202, 203, 206, 253, 22, 2, 252, 138, 206, 253, 22, 2, 70, + 206, 253, 22, 2, 228, 151, 206, 253, 22, 2, 66, 206, 253, 22, 2, 203, + 182, 206, 253, 22, 2, 72, 206, 253, 22, 2, 251, 176, 206, 253, 22, 2, 74, + 206, 253, 22, 2, 250, 139, 206, 253, 2, 202, 208, 206, 253, 2, 218, 100, + 206, 253, 17, 199, 81, 206, 253, 17, 102, 206, 253, 17, 105, 206, 253, + 17, 147, 206, 253, 17, 149, 206, 253, 17, 164, 206, 253, 17, 187, 206, + 253, 17, 210, 135, 206, 253, 17, 192, 206, 253, 17, 219, 113, 251, 180, + 1, 161, 251, 180, 1, 226, 207, 251, 180, 1, 219, 253, 251, 180, 1, 188, + 251, 180, 1, 207, 36, 251, 180, 1, 251, 109, 207, 36, 251, 180, 1, 172, + 251, 180, 1, 215, 245, 251, 180, 1, 249, 136, 251, 180, 1, 178, 251, 180, + 1, 227, 248, 251, 180, 1, 247, 37, 251, 180, 1, 206, 122, 251, 180, 1, + 213, 252, 251, 180, 1, 194, 251, 180, 1, 212, 64, 251, 180, 1, 218, 60, + 251, 180, 1, 144, 251, 180, 1, 62, 251, 180, 1, 242, 58, 251, 180, 1, + 241, 100, 251, 180, 1, 236, 89, 251, 180, 1, 251, 109, 236, 89, 251, 180, + 1, 235, 199, 251, 180, 1, 248, 200, 251, 180, 1, 227, 215, 251, 180, 111, + 2, 179, 194, 251, 180, 111, 2, 179, 213, 252, 251, 180, 111, 2, 179, 224, + 197, 213, 252, 251, 180, 22, 2, 62, 251, 180, 22, 2, 252, 138, 251, 180, + 22, 2, 70, 251, 180, 22, 2, 228, 151, 251, 180, 22, 2, 66, 251, 180, 22, + 2, 203, 182, 251, 180, 22, 2, 72, 251, 180, 22, 2, 250, 117, 251, 180, + 22, 2, 74, 251, 180, 22, 2, 251, 176, 251, 180, 22, 2, 251, 101, 251, + 180, 2, 226, 149, 251, 180, 17, 199, 81, 251, 180, 17, 102, 251, 180, 17, + 105, 251, 180, 17, 147, 251, 180, 17, 149, 251, 180, 17, 164, 251, 180, + 17, 187, 251, 180, 17, 210, 135, 251, 180, 17, 192, 251, 180, 17, 219, + 113, 251, 180, 41, 206, 166, 251, 180, 41, 204, 159, 251, 180, 2, 4, 211, + 192, 251, 180, 2, 211, 192, 251, 180, 2, 212, 166, 251, 180, 16, 202, + 234, 201, 94, 246, 142, 6, 1, 219, 252, 201, 94, 246, 142, 6, 1, 62, 201, + 94, 246, 142, 6, 1, 201, 31, 201, 94, 246, 142, 6, 1, 199, 211, 201, 94, + 246, 142, 6, 1, 183, 201, 94, 246, 142, 6, 1, 199, 245, 201, 94, 246, + 142, 6, 1, 228, 151, 201, 94, 246, 142, 6, 1, 203, 182, 201, 94, 246, + 142, 6, 1, 72, 201, 94, 246, 142, 6, 1, 74, 201, 94, 246, 142, 6, 1, 251, + 76, 201, 94, 246, 142, 6, 1, 236, 89, 201, 94, 246, 142, 6, 1, 226, 88, + 201, 94, 246, 142, 6, 1, 238, 143, 201, 94, 246, 142, 6, 1, 199, 195, + 201, 94, 246, 142, 6, 1, 204, 38, 201, 94, 246, 142, 6, 1, 238, 162, 201, + 94, 246, 142, 6, 1, 217, 124, 201, 94, 246, 142, 6, 1, 204, 248, 201, 94, + 246, 142, 6, 1, 218, 86, 201, 94, 246, 142, 6, 1, 242, 58, 201, 94, 246, + 142, 6, 1, 250, 155, 201, 94, 246, 142, 6, 1, 251, 101, 201, 94, 246, + 142, 6, 1, 248, 36, 201, 94, 246, 142, 6, 1, 214, 224, 201, 94, 246, 142, + 6, 1, 234, 43, 201, 94, 246, 142, 6, 1, 233, 195, 201, 94, 246, 142, 6, + 1, 233, 122, 201, 94, 246, 142, 6, 1, 234, 166, 201, 94, 246, 142, 6, 1, + 208, 131, 201, 94, 246, 142, 6, 1, 209, 161, 201, 94, 246, 142, 6, 1, + 202, 194, 201, 94, 246, 142, 4, 1, 219, 252, 201, 94, 246, 142, 4, 1, 62, + 201, 94, 246, 142, 4, 1, 201, 31, 201, 94, 246, 142, 4, 1, 199, 211, 201, + 94, 246, 142, 4, 1, 183, 201, 94, 246, 142, 4, 1, 199, 245, 201, 94, 246, + 142, 4, 1, 228, 151, 201, 94, 246, 142, 4, 1, 203, 182, 201, 94, 246, + 142, 4, 1, 72, 201, 94, 246, 142, 4, 1, 74, 201, 94, 246, 142, 4, 1, 251, + 76, 201, 94, 246, 142, 4, 1, 236, 89, 201, 94, 246, 142, 4, 1, 226, 88, + 201, 94, 246, 142, 4, 1, 238, 143, 201, 94, 246, 142, 4, 1, 199, 195, + 201, 94, 246, 142, 4, 1, 204, 38, 201, 94, 246, 142, 4, 1, 238, 162, 201, + 94, 246, 142, 4, 1, 217, 124, 201, 94, 246, 142, 4, 1, 204, 248, 201, 94, + 246, 142, 4, 1, 218, 86, 201, 94, 246, 142, 4, 1, 242, 58, 201, 94, 246, + 142, 4, 1, 250, 155, 201, 94, 246, 142, 4, 1, 251, 101, 201, 94, 246, + 142, 4, 1, 248, 36, 201, 94, 246, 142, 4, 1, 214, 224, 201, 94, 246, 142, + 4, 1, 234, 43, 201, 94, 246, 142, 4, 1, 233, 195, 201, 94, 246, 142, 4, + 1, 233, 122, 201, 94, 246, 142, 4, 1, 234, 166, 201, 94, 246, 142, 4, 1, + 208, 131, 201, 94, 246, 142, 4, 1, 209, 161, 201, 94, 246, 142, 4, 1, + 202, 194, 201, 94, 246, 142, 17, 199, 81, 201, 94, 246, 142, 17, 102, + 201, 94, 246, 142, 17, 105, 201, 94, 246, 142, 17, 147, 201, 94, 246, + 142, 17, 149, 201, 94, 246, 142, 17, 164, 201, 94, 246, 142, 17, 187, + 201, 94, 246, 142, 17, 210, 135, 201, 94, 246, 142, 17, 192, 201, 94, + 246, 142, 17, 219, 113, 201, 94, 246, 142, 41, 206, 166, 201, 94, 246, + 142, 41, 204, 159, 201, 94, 246, 142, 41, 206, 67, 201, 94, 246, 142, 41, + 236, 235, 201, 94, 246, 142, 41, 237, 104, 201, 94, 246, 142, 41, 209, + 92, 201, 94, 246, 142, 41, 210, 129, 201, 94, 246, 142, 41, 238, 222, + 201, 94, 246, 142, 41, 219, 108, 201, 94, 246, 142, 217, 86, 216, 88, + 246, 160, 234, 151, 1, 172, 216, 88, 246, 160, 234, 151, 1, 161, 216, 88, + 246, 160, 234, 151, 1, 194, 216, 88, 246, 160, 234, 151, 1, 178, 216, 88, + 246, 160, 234, 151, 1, 242, 58, 216, 88, 246, 160, 234, 151, 1, 199, 114, + 216, 88, 246, 160, 234, 151, 1, 203, 90, 216, 88, 246, 160, 234, 151, 1, + 219, 253, 216, 88, 246, 160, 234, 151, 1, 144, 216, 88, 246, 160, 234, + 151, 1, 236, 89, 216, 88, 246, 160, 234, 151, 1, 226, 207, 216, 88, 246, + 160, 234, 151, 1, 212, 64, 216, 88, 246, 160, 234, 151, 1, 249, 136, 216, + 88, 246, 160, 234, 151, 1, 247, 190, 216, 88, 246, 160, 234, 151, 1, 207, + 36, 216, 88, 246, 160, 234, 151, 1, 206, 122, 216, 88, 246, 160, 234, + 151, 1, 188, 216, 88, 246, 160, 234, 151, 1, 215, 245, 216, 88, 246, 160, + 234, 151, 1, 213, 252, 216, 88, 246, 160, 234, 151, 1, 237, 195, 216, 88, + 246, 160, 234, 151, 1, 247, 37, 216, 88, 246, 160, 234, 151, 1, 62, 216, + 88, 246, 160, 234, 151, 1, 72, 216, 88, 246, 160, 234, 151, 1, 70, 216, + 88, 246, 160, 234, 151, 1, 74, 216, 88, 246, 160, 234, 151, 1, 66, 216, + 88, 246, 160, 234, 151, 1, 204, 46, 216, 88, 246, 160, 234, 151, 1, 232, + 240, 216, 88, 246, 160, 234, 151, 1, 47, 216, 226, 216, 88, 246, 160, + 234, 151, 1, 47, 227, 118, 216, 88, 246, 160, 234, 151, 1, 47, 207, 83, + 216, 88, 246, 160, 234, 151, 1, 47, 223, 243, 216, 88, 246, 160, 234, + 151, 1, 47, 220, 214, 216, 88, 246, 160, 234, 151, 1, 47, 156, 216, 88, + 246, 160, 234, 151, 1, 47, 201, 147, 216, 88, 246, 160, 234, 151, 1, 47, + 219, 255, 216, 88, 246, 160, 234, 151, 1, 47, 200, 123, 216, 88, 246, + 160, 234, 151, 213, 19, 150, 224, 89, 216, 88, 246, 160, 234, 151, 213, + 19, 205, 174, 216, 88, 246, 160, 234, 151, 212, 9, 235, 123, 208, 76, + 216, 88, 246, 160, 234, 151, 213, 19, 150, 168, 237, 89, 216, 88, 246, + 160, 234, 151, 213, 19, 150, 237, 89, 216, 88, 246, 160, 234, 151, 212, + 9, 235, 123, 208, 77, 237, 89, 216, 88, 246, 160, 234, 151, 212, 9, 150, + 224, 89, 216, 88, 246, 160, 234, 151, 212, 9, 205, 174, 216, 88, 246, + 160, 234, 151, 212, 9, 150, 168, 237, 89, 216, 88, 246, 160, 234, 151, + 212, 9, 150, 237, 89, 216, 88, 246, 160, 234, 151, 221, 205, 205, 174, + 216, 88, 246, 160, 234, 151, 235, 123, 208, 77, 203, 72, 216, 88, 246, + 160, 234, 151, 221, 205, 150, 168, 237, 89, 216, 88, 246, 160, 234, 151, + 221, 205, 150, 237, 89, 216, 88, 246, 160, 234, 151, 224, 57, 150, 224, + 89, 216, 88, 246, 160, 234, 151, 224, 57, 205, 174, 216, 88, 246, 160, + 234, 151, 235, 123, 208, 76, 216, 88, 246, 160, 234, 151, 224, 57, 150, + 168, 237, 89, 216, 88, 246, 160, 234, 151, 224, 57, 150, 237, 89, 216, + 88, 246, 160, 234, 151, 235, 123, 208, 77, 237, 89, 174, 1, 62, 174, 1, + 252, 138, 174, 1, 70, 174, 1, 228, 151, 174, 1, 66, 174, 1, 203, 182, + 174, 1, 109, 146, 174, 1, 109, 212, 216, 174, 1, 109, 156, 174, 1, 72, + 174, 1, 251, 176, 174, 1, 74, 174, 1, 250, 139, 174, 1, 161, 174, 1, 226, + 207, 174, 1, 236, 89, 174, 1, 235, 199, 174, 1, 219, 253, 174, 1, 247, + 190, 174, 1, 247, 37, 174, 1, 227, 248, 174, 1, 227, 215, 174, 1, 218, + 60, 174, 1, 204, 253, 174, 1, 204, 241, 174, 1, 241, 220, 174, 1, 241, + 204, 174, 1, 219, 21, 174, 1, 207, 36, 174, 1, 206, 122, 174, 1, 242, 58, + 174, 1, 241, 100, 174, 1, 188, 174, 1, 172, 174, 1, 215, 245, 174, 1, + 249, 136, 174, 1, 248, 200, 174, 1, 178, 174, 1, 183, 174, 1, 213, 252, + 174, 1, 194, 174, 1, 203, 90, 174, 1, 210, 114, 174, 1, 208, 179, 174, 1, + 212, 64, 174, 1, 144, 174, 22, 2, 252, 138, 174, 22, 2, 70, 174, 22, 2, + 228, 151, 174, 22, 2, 66, 174, 22, 2, 203, 182, 174, 22, 2, 109, 146, + 174, 22, 2, 109, 212, 216, 174, 22, 2, 109, 156, 174, 22, 2, 72, 174, 22, + 2, 251, 176, 174, 22, 2, 74, 174, 22, 2, 250, 139, 174, 2, 247, 149, 174, + 2, 251, 33, 174, 2, 202, 203, 174, 2, 202, 208, 174, 2, 250, 122, 174, + 242, 10, 174, 53, 242, 10, 174, 200, 238, 210, 154, 174, 236, 53, 237, + 92, 174, 236, 53, 237, 91, 174, 17, 199, 81, 174, 17, 102, 174, 17, 105, + 174, 17, 147, 174, 17, 149, 174, 17, 164, 174, 17, 187, 174, 17, 210, + 135, 174, 17, 192, 174, 17, 219, 113, 174, 41, 102, 174, 41, 105, 174, + 41, 147, 174, 41, 149, 174, 41, 164, 174, 41, 187, 174, 41, 210, 135, + 174, 41, 192, 174, 41, 219, 113, 174, 41, 206, 166, 174, 41, 204, 159, + 174, 41, 206, 67, 174, 41, 236, 235, 174, 41, 237, 104, 174, 41, 209, 92, + 174, 41, 210, 129, 174, 41, 238, 222, 174, 41, 219, 108, 174, 233, 81, + 203, 240, 81, 222, 151, 234, 137, 81, 222, 151, 134, 210, 106, 222, 151, + 1, 161, 222, 151, 1, 226, 207, 222, 151, 1, 236, 89, 222, 151, 1, 219, + 253, 222, 151, 1, 247, 190, 222, 151, 1, 247, 37, 222, 151, 1, 227, 248, + 222, 151, 1, 218, 60, 222, 151, 1, 207, 36, 222, 151, 1, 206, 122, 222, + 151, 1, 242, 58, 222, 151, 1, 188, 222, 151, 1, 172, 222, 151, 1, 215, + 245, 222, 151, 1, 249, 136, 222, 151, 1, 178, 222, 151, 1, 205, 32, 222, + 151, 1, 205, 22, 222, 151, 1, 239, 93, 222, 151, 1, 201, 114, 222, 151, + 1, 199, 77, 222, 151, 1, 199, 114, 222, 151, 1, 255, 142, 222, 151, 1, + 183, 222, 151, 1, 213, 252, 222, 151, 1, 194, 222, 151, 1, 210, 114, 222, + 151, 1, 212, 64, 222, 151, 1, 144, 222, 151, 1, 62, 222, 151, 208, 12, 1, + 161, 222, 151, 208, 12, 1, 226, 207, 222, 151, 208, 12, 1, 236, 89, 222, + 151, 208, 12, 1, 219, 253, 222, 151, 208, 12, 1, 247, 190, 222, 151, 208, + 12, 1, 247, 37, 222, 151, 208, 12, 1, 227, 248, 222, 151, 208, 12, 1, + 218, 60, 222, 151, 208, 12, 1, 207, 36, 222, 151, 208, 12, 1, 206, 122, + 222, 151, 208, 12, 1, 242, 58, 222, 151, 208, 12, 1, 188, 222, 151, 208, + 12, 1, 172, 222, 151, 208, 12, 1, 215, 245, 222, 151, 208, 12, 1, 249, + 136, 222, 151, 208, 12, 1, 178, 222, 151, 208, 12, 1, 205, 32, 222, 151, + 208, 12, 1, 205, 22, 222, 151, 208, 12, 1, 239, 93, 222, 151, 208, 12, 1, + 201, 114, 222, 151, 208, 12, 1, 199, 77, 222, 151, 208, 12, 1, 199, 114, + 222, 151, 208, 12, 1, 183, 222, 151, 208, 12, 1, 213, 252, 222, 151, 208, + 12, 1, 194, 222, 151, 208, 12, 1, 210, 114, 222, 151, 208, 12, 1, 212, + 64, 222, 151, 208, 12, 1, 144, 222, 151, 208, 12, 1, 62, 222, 151, 22, 2, + 252, 138, 222, 151, 22, 2, 70, 222, 151, 22, 2, 66, 222, 151, 22, 2, 72, + 222, 151, 22, 2, 74, 222, 151, 2, 251, 33, 222, 151, 2, 247, 149, 10, 2, + 62, 10, 2, 35, 24, 62, 10, 2, 35, 24, 249, 118, 10, 2, 35, 24, 236, 58, + 206, 155, 10, 2, 35, 24, 144, 10, 2, 35, 24, 228, 153, 10, 2, 35, 24, + 225, 156, 235, 28, 10, 2, 35, 24, 220, 250, 10, 2, 35, 24, 212, 50, 10, + 2, 254, 147, 10, 2, 252, 89, 10, 2, 252, 90, 24, 250, 179, 10, 2, 252, + 90, 24, 239, 124, 235, 28, 10, 2, 252, 90, 24, 236, 71, 10, 2, 252, 90, + 24, 236, 58, 206, 155, 10, 2, 252, 90, 24, 144, 10, 2, 252, 90, 24, 228, + 154, 235, 28, 10, 2, 252, 90, 24, 228, 127, 10, 2, 252, 90, 24, 225, 157, + 10, 2, 252, 90, 24, 210, 49, 10, 2, 252, 90, 24, 108, 93, 108, 93, 66, + 10, 2, 252, 90, 235, 28, 10, 2, 252, 6, 10, 2, 252, 7, 24, 249, 98, 10, + 2, 252, 7, 24, 236, 58, 206, 155, 10, 2, 252, 7, 24, 222, 77, 93, 238, + 179, 10, 2, 252, 7, 24, 210, 112, 10, 2, 252, 7, 24, 207, 0, 10, 2, 251, + 235, 10, 2, 251, 159, 10, 2, 251, 160, 24, 238, 109, 10, 2, 251, 160, 24, + 210, 11, 93, 235, 135, 10, 2, 251, 151, 10, 2, 251, 152, 24, 251, 151, + 10, 2, 251, 152, 24, 241, 29, 10, 2, 251, 152, 24, 235, 135, 10, 2, 251, + 152, 24, 144, 10, 2, 251, 152, 24, 227, 91, 10, 2, 251, 152, 24, 226, + 163, 10, 2, 251, 152, 24, 210, 65, 10, 2, 251, 152, 24, 203, 190, 10, 2, + 251, 148, 10, 2, 251, 140, 10, 2, 251, 97, 10, 2, 251, 98, 24, 210, 65, + 10, 2, 251, 85, 10, 2, 251, 86, 119, 251, 85, 10, 2, 251, 86, 126, 205, + 232, 10, 2, 251, 86, 93, 220, 148, 217, 40, 251, 86, 93, 220, 147, 10, 2, + 251, 86, 93, 220, 148, 208, 192, 10, 2, 251, 53, 10, 2, 251, 23, 10, 2, + 250, 246, 10, 2, 250, 247, 24, 225, 245, 10, 2, 250, 218, 10, 2, 250, + 186, 10, 2, 250, 181, 10, 2, 250, 182, 199, 32, 206, 155, 10, 2, 250, + 182, 227, 95, 206, 155, 10, 2, 250, 182, 119, 250, 182, 204, 210, 119, + 204, 210, 204, 210, 119, 204, 210, 216, 135, 10, 2, 250, 182, 119, 250, + 182, 119, 250, 181, 10, 2, 250, 182, 119, 250, 182, 119, 250, 182, 242, + 228, 250, 182, 119, 250, 182, 119, 250, 181, 10, 2, 250, 179, 10, 2, 250, + 175, 10, 2, 249, 136, 10, 2, 249, 118, 10, 2, 249, 112, 10, 2, 249, 105, + 10, 2, 249, 99, 10, 2, 249, 100, 119, 249, 99, 10, 2, 249, 98, 10, 2, + 148, 10, 2, 249, 76, 10, 2, 248, 188, 10, 2, 248, 189, 24, 62, 10, 2, + 248, 189, 24, 236, 49, 10, 2, 248, 189, 24, 228, 154, 235, 28, 10, 2, + 248, 36, 10, 2, 248, 37, 119, 248, 37, 252, 89, 10, 2, 248, 37, 119, 248, + 37, 204, 5, 10, 2, 248, 37, 242, 228, 248, 36, 10, 2, 248, 14, 10, 2, + 248, 15, 119, 248, 14, 10, 2, 248, 3, 10, 2, 248, 2, 10, 2, 242, 58, 10, + 2, 242, 48, 10, 2, 242, 49, 226, 132, 24, 35, 93, 222, 135, 10, 2, 242, + 49, 226, 132, 24, 251, 97, 10, 2, 242, 49, 226, 132, 24, 249, 98, 10, 2, + 242, 49, 226, 132, 24, 248, 188, 10, 2, 242, 49, 226, 132, 24, 236, 89, + 10, 2, 242, 49, 226, 132, 24, 236, 90, 93, 222, 135, 10, 2, 242, 49, 226, + 132, 24, 235, 161, 10, 2, 242, 49, 226, 132, 24, 235, 143, 10, 2, 242, + 49, 226, 132, 24, 235, 39, 10, 2, 242, 49, 226, 132, 24, 144, 10, 2, 242, + 49, 226, 132, 24, 228, 35, 10, 2, 242, 49, 226, 132, 24, 228, 36, 93, + 224, 42, 10, 2, 242, 49, 226, 132, 24, 227, 76, 10, 2, 242, 49, 226, 132, + 24, 194, 10, 2, 242, 49, 226, 132, 24, 224, 42, 10, 2, 242, 49, 226, 132, + 24, 224, 43, 93, 222, 134, 10, 2, 242, 49, 226, 132, 24, 224, 25, 10, 2, + 242, 49, 226, 132, 24, 220, 34, 10, 2, 242, 49, 226, 132, 24, 216, 136, + 93, 216, 135, 10, 2, 242, 49, 226, 132, 24, 209, 182, 10, 2, 242, 49, + 226, 132, 24, 207, 0, 10, 2, 242, 49, 226, 132, 24, 204, 48, 93, 235, + 143, 10, 2, 242, 49, 226, 132, 24, 203, 190, 10, 2, 242, 20, 10, 2, 241, + 254, 10, 2, 241, 253, 10, 2, 241, 252, 10, 2, 241, 76, 10, 2, 241, 58, + 10, 2, 241, 31, 10, 2, 241, 32, 24, 210, 65, 10, 2, 241, 29, 10, 2, 241, + 19, 10, 2, 241, 20, 227, 39, 108, 235, 29, 240, 255, 10, 2, 240, 255, 10, + 2, 239, 137, 10, 2, 239, 138, 119, 239, 137, 10, 2, 239, 138, 235, 28, + 10, 2, 239, 138, 210, 46, 10, 2, 239, 135, 10, 2, 239, 136, 24, 238, 91, + 10, 2, 239, 134, 10, 2, 239, 131, 10, 2, 239, 130, 10, 2, 239, 129, 10, + 2, 239, 125, 10, 2, 239, 123, 10, 2, 239, 124, 235, 28, 10, 2, 239, 124, + 235, 29, 235, 28, 10, 2, 239, 122, 10, 2, 239, 115, 10, 2, 72, 10, 2, + 197, 24, 216, 135, 10, 2, 197, 119, 197, 218, 90, 119, 218, 89, 10, 2, + 239, 28, 10, 2, 239, 29, 24, 35, 93, 234, 236, 93, 242, 58, 10, 2, 239, + 29, 24, 236, 49, 10, 2, 239, 29, 24, 221, 211, 10, 2, 239, 29, 24, 212, + 35, 10, 2, 239, 29, 24, 210, 65, 10, 2, 239, 29, 24, 66, 10, 2, 239, 1, + 10, 2, 238, 245, 10, 2, 238, 209, 10, 2, 238, 179, 10, 2, 238, 180, 24, + 236, 57, 10, 2, 238, 180, 24, 236, 58, 206, 155, 10, 2, 238, 180, 24, + 222, 76, 10, 2, 238, 180, 242, 228, 238, 179, 10, 2, 238, 180, 217, 40, + 238, 179, 10, 2, 238, 180, 208, 192, 10, 2, 238, 112, 10, 2, 238, 109, + 10, 2, 238, 91, 10, 2, 238, 10, 10, 2, 238, 11, 24, 62, 10, 2, 238, 11, + 24, 35, 93, 225, 93, 10, 2, 238, 11, 24, 35, 93, 225, 94, 24, 225, 93, + 10, 2, 238, 11, 24, 251, 85, 10, 2, 238, 11, 24, 249, 118, 10, 2, 238, + 11, 24, 239, 124, 235, 28, 10, 2, 238, 11, 24, 239, 124, 235, 29, 235, + 28, 10, 2, 238, 11, 24, 144, 10, 2, 238, 11, 24, 234, 236, 235, 28, 10, + 2, 238, 11, 24, 228, 154, 235, 28, 10, 2, 238, 11, 24, 227, 38, 10, 2, + 238, 11, 24, 227, 39, 208, 192, 10, 2, 238, 11, 24, 226, 13, 10, 2, 238, + 11, 24, 194, 10, 2, 238, 11, 24, 225, 94, 24, 225, 93, 10, 2, 238, 11, + 24, 224, 210, 10, 2, 238, 11, 24, 224, 42, 10, 2, 238, 11, 24, 204, 47, + 10, 2, 238, 11, 24, 204, 36, 10, 2, 236, 89, 10, 2, 236, 90, 235, 28, 10, + 2, 236, 87, 10, 2, 236, 88, 24, 35, 93, 242, 59, 93, 144, 10, 2, 236, 88, + 24, 35, 93, 144, 10, 2, 236, 88, 24, 35, 93, 228, 153, 10, 2, 236, 88, + 24, 252, 7, 206, 156, 93, 207, 24, 10, 2, 236, 88, 24, 251, 85, 10, 2, + 236, 88, 24, 250, 181, 10, 2, 236, 88, 24, 250, 180, 93, 236, 71, 10, 2, + 236, 88, 24, 249, 118, 10, 2, 236, 88, 24, 249, 77, 93, 213, 252, 10, 2, + 236, 88, 24, 248, 3, 10, 2, 236, 88, 24, 248, 4, 93, 213, 252, 10, 2, + 236, 88, 24, 242, 58, 10, 2, 236, 88, 24, 241, 76, 10, 2, 236, 88, 24, + 241, 32, 24, 210, 65, 10, 2, 236, 88, 24, 239, 135, 10, 2, 236, 88, 24, + 238, 209, 10, 2, 236, 88, 24, 238, 210, 93, 194, 10, 2, 236, 88, 24, 238, + 179, 10, 2, 236, 88, 24, 238, 180, 24, 236, 58, 206, 155, 10, 2, 236, 88, + 24, 236, 58, 206, 155, 10, 2, 236, 88, 24, 236, 49, 10, 2, 236, 88, 24, + 235, 161, 10, 2, 236, 88, 24, 235, 159, 10, 2, 236, 88, 24, 235, 160, 93, + 62, 10, 2, 236, 88, 24, 235, 144, 93, 208, 24, 10, 2, 236, 88, 24, 234, + 236, 93, 224, 43, 93, 238, 91, 10, 2, 236, 88, 24, 234, 216, 10, 2, 236, + 88, 24, 234, 217, 93, 194, 10, 2, 236, 88, 24, 234, 76, 93, 224, 210, 10, + 2, 236, 88, 24, 233, 92, 10, 2, 236, 88, 24, 228, 154, 235, 28, 10, 2, + 236, 88, 24, 228, 21, 93, 233, 98, 93, 250, 181, 10, 2, 236, 88, 24, 227, + 76, 10, 2, 236, 88, 24, 227, 38, 10, 2, 236, 88, 24, 226, 157, 10, 2, + 236, 88, 24, 226, 158, 93, 225, 93, 10, 2, 236, 88, 24, 226, 14, 93, 251, + 85, 10, 2, 236, 88, 24, 194, 10, 2, 236, 88, 24, 222, 77, 93, 238, 179, + 10, 2, 236, 88, 24, 221, 211, 10, 2, 236, 88, 24, 218, 89, 10, 2, 236, + 88, 24, 218, 90, 119, 218, 89, 10, 2, 236, 88, 24, 172, 10, 2, 236, 88, + 24, 212, 35, 10, 2, 236, 88, 24, 212, 0, 10, 2, 236, 88, 24, 210, 65, 10, + 2, 236, 88, 24, 210, 66, 93, 204, 192, 10, 2, 236, 88, 24, 210, 31, 10, + 2, 236, 88, 24, 207, 234, 10, 2, 236, 88, 24, 207, 0, 10, 2, 236, 88, 24, + 66, 10, 2, 236, 88, 24, 204, 36, 10, 2, 236, 88, 24, 204, 37, 93, 239, + 137, 10, 2, 236, 88, 119, 236, 87, 10, 2, 236, 82, 10, 2, 236, 83, 242, + 228, 236, 82, 10, 2, 236, 80, 10, 2, 236, 81, 119, 236, 81, 236, 50, 119, + 236, 49, 10, 2, 236, 71, 10, 2, 236, 72, 236, 81, 119, 236, 81, 236, 50, + 119, 236, 49, 10, 2, 236, 70, 10, 2, 236, 68, 10, 2, 236, 59, 10, 2, 236, + 57, 10, 2, 236, 58, 206, 155, 10, 2, 236, 58, 119, 236, 57, 10, 2, 236, + 58, 242, 228, 236, 57, 10, 2, 236, 49, 10, 2, 236, 48, 10, 2, 236, 43, + 10, 2, 235, 242, 10, 2, 235, 243, 24, 225, 245, 10, 2, 235, 161, 10, 2, + 235, 162, 24, 72, 10, 2, 235, 162, 24, 66, 10, 2, 235, 162, 242, 228, + 235, 161, 10, 2, 235, 159, 10, 2, 235, 160, 119, 235, 159, 10, 2, 235, + 160, 242, 228, 235, 159, 10, 2, 235, 156, 10, 2, 235, 143, 10, 2, 235, + 144, 235, 28, 10, 2, 235, 141, 10, 2, 235, 142, 24, 35, 93, 228, 153, 10, + 2, 235, 142, 24, 236, 58, 206, 155, 10, 2, 235, 142, 24, 228, 153, 10, 2, + 235, 142, 24, 224, 43, 93, 228, 153, 10, 2, 235, 142, 24, 172, 10, 2, + 235, 137, 10, 2, 235, 135, 10, 2, 235, 136, 242, 228, 235, 135, 10, 2, + 235, 136, 24, 249, 118, 10, 2, 235, 136, 24, 207, 0, 10, 2, 235, 136, + 206, 155, 10, 2, 235, 50, 10, 2, 235, 51, 242, 228, 235, 50, 10, 2, 235, + 48, 10, 2, 235, 49, 24, 227, 76, 10, 2, 235, 49, 24, 227, 77, 24, 228, + 154, 235, 28, 10, 2, 235, 49, 24, 218, 89, 10, 2, 235, 49, 24, 212, 36, + 93, 204, 209, 10, 2, 235, 49, 235, 28, 10, 2, 235, 39, 10, 2, 235, 40, + 24, 35, 93, 225, 245, 10, 2, 235, 40, 24, 225, 245, 10, 2, 235, 40, 119, + 235, 40, 224, 33, 10, 2, 235, 32, 10, 2, 235, 30, 10, 2, 235, 31, 24, + 210, 65, 10, 2, 235, 22, 10, 2, 235, 21, 10, 2, 235, 17, 10, 2, 235, 16, + 10, 2, 144, 10, 2, 234, 236, 206, 155, 10, 2, 234, 236, 235, 28, 10, 2, + 234, 216, 10, 2, 234, 75, 10, 2, 234, 76, 24, 250, 181, 10, 2, 234, 76, + 24, 250, 179, 10, 2, 234, 76, 24, 249, 118, 10, 2, 234, 76, 24, 240, 255, + 10, 2, 234, 76, 24, 236, 80, 10, 2, 234, 76, 24, 226, 147, 10, 2, 234, + 76, 24, 218, 89, 10, 2, 234, 76, 24, 210, 65, 10, 2, 234, 76, 24, 66, 10, + 2, 233, 97, 10, 2, 233, 92, 10, 2, 233, 93, 24, 251, 85, 10, 2, 233, 93, + 24, 234, 216, 10, 2, 233, 93, 24, 227, 38, 10, 2, 233, 93, 24, 224, 154, + 10, 2, 233, 93, 24, 204, 36, 10, 2, 233, 88, 10, 2, 70, 10, 2, 233, 19, + 62, 10, 2, 232, 235, 10, 2, 228, 181, 10, 2, 228, 182, 119, 228, 182, + 248, 3, 10, 2, 228, 182, 119, 228, 182, 208, 192, 10, 2, 228, 156, 10, 2, + 228, 153, 10, 2, 228, 154, 241, 58, 10, 2, 228, 154, 213, 88, 10, 2, 228, + 154, 119, 228, 154, 210, 15, 119, 210, 15, 204, 37, 119, 204, 36, 10, 2, + 228, 154, 235, 28, 10, 2, 228, 145, 10, 2, 228, 146, 24, 236, 58, 206, + 155, 10, 2, 228, 144, 10, 2, 228, 134, 10, 2, 228, 135, 24, 207, 0, 10, + 2, 228, 135, 242, 228, 228, 134, 10, 2, 228, 135, 217, 40, 228, 134, 10, + 2, 228, 135, 208, 192, 10, 2, 228, 127, 10, 2, 228, 117, 10, 2, 228, 35, + 10, 2, 228, 20, 10, 2, 161, 10, 2, 227, 108, 24, 62, 10, 2, 227, 108, 24, + 251, 235, 10, 2, 227, 108, 24, 251, 236, 93, 226, 13, 10, 2, 227, 108, + 24, 250, 179, 10, 2, 227, 108, 24, 249, 118, 10, 2, 227, 108, 24, 249, + 98, 10, 2, 227, 108, 24, 148, 10, 2, 227, 108, 24, 248, 188, 10, 2, 227, + 108, 24, 238, 109, 10, 2, 227, 108, 24, 238, 91, 10, 2, 227, 108, 24, + 236, 89, 10, 2, 227, 108, 24, 236, 71, 10, 2, 227, 108, 24, 236, 58, 206, + 155, 10, 2, 227, 108, 24, 236, 49, 10, 2, 227, 108, 24, 236, 50, 93, 210, + 113, 93, 62, 10, 2, 227, 108, 24, 235, 161, 10, 2, 227, 108, 24, 235, + 143, 10, 2, 227, 108, 24, 235, 136, 93, 212, 0, 10, 2, 227, 108, 24, 235, + 136, 242, 228, 235, 135, 10, 2, 227, 108, 24, 235, 50, 10, 2, 227, 108, + 24, 235, 21, 10, 2, 227, 108, 24, 228, 153, 10, 2, 227, 108, 24, 228, + 134, 10, 2, 227, 108, 24, 227, 76, 10, 2, 227, 108, 24, 226, 163, 10, 2, + 227, 108, 24, 226, 157, 10, 2, 227, 108, 24, 224, 210, 10, 2, 227, 108, + 24, 224, 42, 10, 2, 227, 108, 24, 222, 76, 10, 2, 227, 108, 24, 222, 77, + 93, 239, 137, 10, 2, 227, 108, 24, 222, 77, 93, 235, 161, 10, 2, 227, + 108, 24, 222, 77, 93, 206, 201, 10, 2, 227, 108, 24, 221, 211, 10, 2, + 227, 108, 24, 221, 212, 93, 218, 84, 10, 2, 227, 108, 24, 220, 34, 10, 2, + 227, 108, 24, 218, 89, 10, 2, 227, 108, 24, 215, 204, 10, 2, 227, 108, + 24, 212, 175, 10, 2, 227, 108, 24, 212, 64, 10, 2, 227, 108, 24, 212, 0, + 10, 2, 227, 108, 24, 210, 114, 10, 2, 227, 108, 24, 210, 65, 10, 2, 227, + 108, 24, 210, 31, 10, 2, 227, 108, 24, 209, 220, 10, 2, 227, 108, 24, + 209, 168, 10, 2, 227, 108, 24, 207, 243, 10, 2, 227, 108, 24, 206, 232, + 10, 2, 227, 108, 24, 66, 10, 2, 227, 108, 24, 204, 47, 10, 2, 227, 108, + 24, 204, 36, 10, 2, 227, 108, 24, 204, 8, 24, 172, 10, 2, 227, 108, 24, + 203, 190, 10, 2, 227, 108, 24, 199, 36, 10, 2, 227, 106, 10, 2, 227, 107, + 242, 228, 227, 106, 10, 2, 227, 96, 10, 2, 227, 93, 10, 2, 227, 91, 10, + 2, 227, 90, 10, 2, 227, 88, 10, 2, 227, 89, 119, 227, 88, 10, 2, 227, 76, + 10, 2, 227, 77, 24, 228, 154, 235, 28, 10, 2, 227, 72, 10, 2, 227, 73, + 24, 249, 118, 10, 2, 227, 73, 242, 228, 227, 72, 10, 2, 227, 70, 10, 2, + 227, 69, 10, 2, 227, 38, 10, 2, 227, 39, 225, 158, 24, 108, 119, 225, + 158, 24, 66, 10, 2, 227, 39, 119, 227, 39, 225, 158, 24, 108, 119, 225, + 158, 24, 66, 10, 2, 226, 234, 10, 2, 226, 163, 10, 2, 226, 164, 24, 249, + 118, 10, 2, 226, 164, 24, 66, 10, 2, 226, 164, 24, 204, 36, 10, 2, 226, + 157, 10, 2, 226, 147, 10, 2, 226, 134, 10, 2, 226, 133, 10, 2, 226, 131, + 10, 2, 226, 132, 119, 226, 131, 10, 2, 226, 15, 10, 2, 226, 16, 119, 234, + 76, 24, 250, 180, 226, 16, 119, 234, 76, 24, 250, 179, 10, 2, 226, 13, + 10, 2, 226, 11, 10, 2, 226, 12, 203, 73, 19, 10, 2, 226, 10, 10, 2, 226, + 2, 10, 2, 226, 3, 235, 28, 10, 2, 226, 1, 10, 2, 225, 245, 10, 2, 225, + 246, 217, 40, 225, 245, 10, 2, 225, 239, 10, 2, 225, 217, 10, 2, 194, 10, + 2, 225, 157, 10, 2, 225, 158, 24, 62, 10, 2, 225, 158, 24, 35, 93, 242, + 59, 93, 144, 10, 2, 225, 158, 24, 35, 93, 236, 49, 10, 2, 225, 158, 24, + 35, 93, 225, 93, 10, 2, 225, 158, 24, 251, 151, 10, 2, 225, 158, 24, 251, + 85, 10, 2, 225, 158, 24, 250, 182, 199, 32, 206, 155, 10, 2, 225, 158, + 24, 249, 118, 10, 2, 225, 158, 24, 248, 188, 10, 2, 225, 158, 24, 241, + 254, 10, 2, 225, 158, 24, 238, 179, 10, 2, 225, 158, 24, 236, 89, 10, 2, + 225, 158, 24, 236, 49, 10, 2, 225, 158, 24, 235, 39, 10, 2, 225, 158, 24, + 235, 40, 93, 235, 39, 10, 2, 225, 158, 24, 144, 10, 2, 225, 158, 24, 234, + 216, 10, 2, 225, 158, 24, 234, 76, 24, 218, 89, 10, 2, 225, 158, 24, 228, + 154, 235, 28, 10, 2, 225, 158, 24, 228, 134, 10, 2, 225, 158, 24, 228, + 135, 93, 144, 10, 2, 225, 158, 24, 228, 135, 93, 224, 42, 10, 2, 225, + 158, 24, 226, 163, 10, 2, 225, 158, 24, 226, 147, 10, 2, 225, 158, 24, + 226, 13, 10, 2, 225, 158, 24, 226, 2, 10, 2, 225, 158, 24, 226, 3, 93, + 234, 76, 93, 62, 10, 2, 225, 158, 24, 225, 157, 10, 2, 225, 158, 24, 224, + 154, 10, 2, 225, 158, 24, 224, 42, 10, 2, 225, 158, 24, 224, 27, 10, 2, + 225, 158, 24, 222, 76, 10, 2, 225, 158, 24, 222, 77, 93, 238, 179, 10, 2, + 225, 158, 24, 220, 250, 10, 2, 225, 158, 24, 220, 34, 10, 2, 225, 158, + 24, 210, 66, 93, 207, 234, 10, 2, 225, 158, 24, 210, 11, 93, 235, 136, + 93, 238, 109, 10, 2, 225, 158, 24, 210, 11, 93, 235, 136, 206, 155, 10, + 2, 225, 158, 24, 209, 218, 10, 2, 225, 158, 24, 209, 219, 93, 209, 218, + 10, 2, 225, 158, 24, 207, 234, 10, 2, 225, 158, 24, 207, 13, 10, 2, 225, + 158, 24, 207, 0, 10, 2, 225, 158, 24, 206, 202, 93, 35, 93, 208, 25, 93, + 188, 10, 2, 225, 158, 24, 66, 10, 2, 225, 158, 24, 108, 93, 62, 10, 2, + 225, 158, 24, 108, 93, 108, 93, 66, 10, 2, 225, 158, 24, 204, 48, 93, + 250, 181, 10, 2, 225, 158, 24, 204, 36, 10, 2, 225, 158, 24, 203, 190, + 10, 2, 225, 158, 208, 192, 10, 2, 225, 155, 10, 2, 225, 156, 24, 210, 65, + 10, 2, 225, 156, 24, 210, 66, 93, 207, 234, 10, 2, 225, 156, 235, 28, 10, + 2, 225, 156, 235, 29, 119, 225, 156, 235, 29, 210, 65, 10, 2, 225, 151, + 10, 2, 225, 93, 10, 2, 225, 94, 24, 225, 93, 10, 2, 225, 91, 10, 2, 225, + 92, 24, 225, 245, 10, 2, 225, 92, 24, 225, 246, 93, 212, 175, 10, 2, 224, + 210, 10, 2, 224, 191, 10, 2, 224, 179, 10, 2, 224, 154, 10, 2, 224, 42, + 10, 2, 224, 43, 24, 249, 118, 10, 2, 224, 40, 10, 2, 224, 41, 24, 251, + 151, 10, 2, 224, 41, 24, 249, 118, 10, 2, 224, 41, 24, 238, 91, 10, 2, + 224, 41, 24, 238, 92, 206, 155, 10, 2, 224, 41, 24, 236, 58, 206, 155, + 10, 2, 224, 41, 24, 234, 76, 24, 249, 118, 10, 2, 224, 41, 24, 228, 134, + 10, 2, 224, 41, 24, 227, 93, 10, 2, 224, 41, 24, 227, 91, 10, 2, 224, 41, + 24, 227, 92, 93, 250, 181, 10, 2, 224, 41, 24, 226, 163, 10, 2, 224, 41, + 24, 225, 176, 93, 250, 181, 10, 2, 224, 41, 24, 225, 157, 10, 2, 224, 41, + 24, 222, 77, 93, 238, 179, 10, 2, 224, 41, 24, 220, 34, 10, 2, 224, 41, + 24, 218, 133, 10, 2, 224, 41, 24, 209, 183, 93, 250, 181, 10, 2, 224, 41, + 24, 209, 160, 93, 248, 36, 10, 2, 224, 41, 24, 204, 209, 10, 2, 224, 41, + 206, 155, 10, 2, 224, 41, 242, 228, 224, 40, 10, 2, 224, 41, 217, 40, + 224, 40, 10, 2, 224, 41, 208, 192, 10, 2, 224, 41, 210, 46, 10, 2, 224, + 39, 10, 2, 224, 33, 10, 2, 224, 34, 119, 224, 33, 10, 2, 224, 34, 217, + 40, 224, 33, 10, 2, 224, 34, 210, 46, 10, 2, 224, 30, 10, 2, 224, 27, 10, + 2, 224, 25, 10, 2, 224, 26, 119, 224, 25, 10, 2, 224, 26, 119, 224, 26, + 236, 50, 119, 236, 49, 10, 2, 178, 10, 2, 222, 235, 24, 207, 0, 10, 2, + 222, 235, 235, 28, 10, 2, 222, 234, 10, 2, 222, 206, 10, 2, 222, 158, 10, + 2, 222, 135, 10, 2, 222, 134, 10, 2, 222, 76, 10, 2, 222, 28, 10, 2, 221, + 211, 10, 2, 221, 164, 10, 2, 221, 41, 10, 2, 221, 42, 119, 221, 41, 10, + 2, 221, 30, 10, 2, 221, 31, 235, 28, 10, 2, 221, 12, 10, 2, 220, 254, 10, + 2, 220, 250, 10, 2, 220, 251, 24, 62, 10, 2, 220, 251, 24, 225, 245, 10, + 2, 220, 251, 24, 199, 114, 10, 2, 220, 251, 119, 220, 250, 10, 2, 220, + 251, 119, 220, 251, 24, 35, 93, 188, 10, 2, 220, 251, 242, 228, 220, 250, + 10, 2, 220, 248, 10, 2, 220, 249, 24, 62, 10, 2, 220, 249, 24, 35, 93, + 241, 76, 10, 2, 220, 249, 24, 241, 76, 10, 2, 220, 249, 235, 28, 10, 2, + 188, 10, 2, 220, 160, 10, 2, 220, 147, 10, 2, 220, 148, 228, 49, 10, 2, + 220, 148, 24, 209, 221, 206, 155, 10, 2, 220, 148, 217, 40, 220, 147, 10, + 2, 220, 146, 10, 2, 220, 139, 218, 75, 10, 2, 220, 138, 10, 2, 220, 137, + 10, 2, 220, 34, 10, 2, 220, 35, 24, 62, 10, 2, 220, 35, 24, 204, 36, 10, + 2, 220, 35, 210, 46, 10, 2, 219, 150, 10, 2, 219, 151, 24, 72, 10, 2, + 219, 149, 10, 2, 219, 119, 10, 2, 219, 120, 24, 236, 58, 206, 155, 10, 2, + 219, 120, 24, 236, 50, 93, 236, 58, 206, 155, 10, 2, 219, 115, 10, 2, + 219, 116, 24, 251, 85, 10, 2, 219, 116, 24, 250, 181, 10, 2, 219, 116, + 24, 250, 182, 93, 250, 181, 10, 2, 219, 116, 24, 235, 39, 10, 2, 219, + 116, 24, 222, 77, 93, 236, 58, 206, 155, 10, 2, 219, 116, 24, 220, 34, + 10, 2, 219, 116, 24, 218, 89, 10, 2, 219, 116, 24, 210, 65, 10, 2, 219, + 116, 24, 210, 66, 93, 35, 251, 85, 10, 2, 219, 116, 24, 210, 66, 93, 250, + 181, 10, 2, 219, 116, 24, 210, 66, 93, 250, 182, 93, 250, 181, 10, 2, + 219, 116, 24, 204, 48, 93, 250, 181, 10, 2, 219, 116, 24, 203, 190, 10, + 2, 219, 103, 10, 2, 218, 133, 10, 2, 218, 105, 10, 2, 218, 89, 10, 2, + 218, 90, 225, 156, 24, 236, 49, 10, 2, 218, 90, 225, 156, 24, 222, 135, + 10, 2, 218, 90, 225, 156, 24, 212, 35, 10, 2, 218, 90, 225, 156, 24, 212, + 36, 119, 218, 90, 225, 156, 24, 212, 35, 10, 2, 218, 90, 225, 156, 24, + 203, 190, 10, 2, 218, 90, 206, 155, 10, 2, 218, 90, 119, 218, 89, 10, 2, + 218, 90, 242, 228, 218, 89, 10, 2, 218, 90, 242, 228, 218, 90, 225, 156, + 119, 225, 155, 10, 2, 218, 84, 10, 2, 218, 85, 252, 7, 24, 250, 175, 10, + 2, 218, 85, 252, 7, 24, 248, 188, 10, 2, 218, 85, 252, 7, 24, 239, 131, + 10, 2, 218, 85, 252, 7, 24, 235, 39, 10, 2, 218, 85, 252, 7, 24, 228, + 154, 235, 28, 10, 2, 218, 85, 252, 7, 24, 227, 91, 10, 2, 218, 85, 252, + 7, 24, 194, 10, 2, 218, 85, 252, 7, 24, 220, 34, 10, 2, 218, 85, 252, 7, + 24, 209, 157, 10, 2, 218, 85, 252, 7, 24, 204, 47, 10, 2, 218, 85, 226, + 132, 24, 248, 188, 10, 2, 218, 85, 226, 132, 24, 248, 189, 66, 10, 2, + 172, 10, 2, 216, 201, 10, 2, 216, 162, 10, 2, 216, 135, 10, 2, 216, 3, + 10, 2, 215, 204, 10, 2, 215, 205, 24, 62, 10, 2, 215, 205, 24, 252, 89, + 10, 2, 215, 205, 24, 248, 188, 10, 2, 215, 205, 24, 248, 36, 10, 2, 215, + 205, 24, 72, 10, 2, 215, 205, 24, 70, 10, 2, 215, 205, 24, 232, 235, 10, + 2, 215, 205, 24, 66, 10, 2, 215, 205, 24, 204, 47, 10, 2, 215, 205, 242, + 228, 215, 204, 10, 2, 215, 146, 10, 2, 215, 147, 24, 227, 72, 10, 2, 215, + 147, 24, 204, 36, 10, 2, 215, 147, 24, 199, 114, 10, 2, 215, 147, 217, + 40, 215, 146, 10, 2, 213, 252, 10, 2, 213, 246, 10, 2, 213, 88, 10, 2, + 212, 175, 10, 2, 212, 64, 10, 2, 212, 51, 218, 75, 10, 2, 212, 50, 10, 2, + 212, 51, 24, 62, 10, 2, 212, 51, 24, 239, 137, 10, 2, 212, 51, 24, 239, + 135, 10, 2, 212, 51, 24, 144, 10, 2, 212, 51, 24, 227, 76, 10, 2, 212, + 51, 24, 225, 245, 10, 2, 212, 51, 24, 224, 25, 10, 2, 212, 51, 24, 221, + 211, 10, 2, 212, 51, 24, 218, 89, 10, 2, 212, 51, 24, 212, 35, 10, 2, + 212, 51, 24, 210, 31, 10, 2, 212, 51, 24, 207, 24, 10, 2, 212, 51, 24, + 204, 47, 10, 2, 212, 51, 24, 204, 42, 10, 2, 212, 51, 24, 204, 12, 10, 2, + 212, 51, 24, 203, 214, 10, 2, 212, 51, 24, 203, 190, 10, 2, 212, 51, 119, + 212, 50, 10, 2, 212, 51, 235, 28, 10, 2, 212, 35, 10, 2, 212, 36, 225, + 158, 24, 250, 179, 10, 2, 212, 8, 10, 2, 212, 0, 10, 2, 210, 114, 10, 2, + 210, 112, 10, 2, 210, 113, 24, 62, 10, 2, 210, 113, 24, 249, 118, 10, 2, + 210, 113, 24, 235, 135, 10, 2, 210, 113, 24, 220, 34, 10, 2, 210, 113, + 24, 209, 218, 10, 2, 210, 113, 24, 204, 192, 10, 2, 210, 113, 24, 66, 10, + 2, 210, 113, 24, 108, 93, 62, 10, 2, 210, 110, 10, 2, 210, 108, 10, 2, + 210, 82, 10, 2, 210, 65, 10, 2, 210, 66, 233, 97, 10, 2, 210, 66, 119, + 210, 66, 236, 81, 119, 236, 81, 236, 50, 119, 236, 49, 10, 2, 210, 66, + 119, 210, 66, 207, 25, 119, 207, 25, 236, 50, 119, 236, 49, 10, 2, 210, + 58, 10, 2, 210, 53, 10, 2, 210, 49, 10, 2, 210, 48, 10, 2, 210, 45, 10, + 2, 210, 31, 10, 2, 210, 32, 24, 62, 10, 2, 210, 32, 24, 228, 134, 10, 2, + 210, 25, 10, 2, 210, 26, 24, 62, 10, 2, 210, 26, 24, 249, 99, 10, 2, 210, + 26, 24, 248, 14, 10, 2, 210, 26, 24, 241, 19, 10, 2, 210, 26, 24, 236, + 49, 10, 2, 210, 26, 24, 228, 153, 10, 2, 210, 26, 24, 228, 154, 235, 28, + 10, 2, 210, 26, 24, 225, 239, 10, 2, 210, 26, 24, 224, 27, 10, 2, 210, + 26, 24, 221, 30, 10, 2, 210, 26, 24, 212, 35, 10, 2, 210, 19, 10, 2, 210, + 14, 10, 2, 210, 15, 206, 155, 10, 2, 210, 15, 119, 210, 15, 248, 4, 119, + 248, 3, 10, 2, 210, 10, 10, 2, 209, 220, 10, 2, 209, 221, 119, 228, 50, + 209, 220, 10, 2, 209, 218, 10, 2, 209, 217, 10, 2, 209, 182, 10, 2, 209, + 183, 235, 28, 10, 2, 209, 168, 10, 2, 209, 166, 10, 2, 209, 167, 119, + 209, 167, 209, 218, 10, 2, 209, 159, 10, 2, 209, 157, 10, 2, 208, 24, 10, + 2, 208, 25, 119, 208, 24, 10, 2, 207, 246, 10, 2, 207, 245, 10, 2, 207, + 243, 10, 2, 207, 234, 10, 2, 207, 233, 10, 2, 207, 207, 10, 2, 207, 206, + 10, 2, 207, 36, 10, 2, 207, 37, 250, 165, 10, 2, 207, 37, 24, 234, 75, + 10, 2, 207, 37, 24, 221, 211, 10, 2, 207, 37, 235, 28, 10, 2, 207, 24, + 10, 2, 207, 25, 119, 207, 25, 219, 151, 119, 219, 151, 241, 0, 119, 240, + 255, 10, 2, 207, 25, 208, 192, 10, 2, 207, 13, 10, 2, 165, 24, 248, 188, + 10, 2, 165, 24, 235, 39, 10, 2, 165, 24, 210, 65, 10, 2, 165, 24, 209, + 220, 10, 2, 165, 24, 204, 209, 10, 2, 165, 24, 204, 36, 10, 2, 207, 0, + 10, 2, 206, 232, 10, 2, 206, 201, 10, 2, 206, 202, 235, 28, 10, 2, 206, + 15, 10, 2, 206, 16, 206, 155, 10, 2, 205, 242, 10, 2, 205, 219, 10, 2, + 205, 220, 24, 207, 0, 10, 2, 205, 220, 119, 205, 219, 10, 2, 205, 220, + 119, 205, 220, 236, 81, 119, 236, 81, 236, 50, 119, 236, 49, 10, 2, 204, + 215, 10, 2, 204, 209, 10, 2, 204, 207, 10, 2, 204, 203, 10, 2, 204, 192, + 10, 2, 204, 193, 119, 204, 193, 199, 115, 119, 199, 114, 10, 2, 66, 10, + 2, 108, 235, 39, 10, 2, 108, 108, 66, 10, 2, 108, 119, 108, 216, 211, + 119, 216, 211, 236, 50, 119, 236, 49, 10, 2, 108, 119, 108, 207, 208, + 119, 207, 207, 10, 2, 108, 119, 108, 108, 213, 105, 119, 108, 213, 104, + 10, 2, 204, 47, 10, 2, 204, 42, 10, 2, 204, 36, 10, 2, 204, 37, 225, 239, + 10, 2, 204, 37, 24, 249, 118, 10, 2, 204, 37, 24, 221, 211, 10, 2, 204, + 37, 24, 108, 93, 108, 93, 66, 10, 2, 204, 37, 24, 108, 93, 108, 93, 108, + 235, 28, 10, 2, 204, 37, 235, 28, 10, 2, 204, 37, 210, 46, 10, 2, 204, + 37, 210, 47, 24, 249, 118, 10, 2, 204, 32, 10, 2, 204, 12, 10, 2, 204, + 13, 24, 225, 157, 10, 2, 204, 13, 24, 222, 77, 93, 242, 58, 10, 2, 204, + 13, 24, 210, 112, 10, 2, 204, 13, 24, 66, 10, 2, 204, 11, 10, 2, 204, 7, + 10, 2, 204, 8, 24, 227, 38, 10, 2, 204, 8, 24, 172, 10, 2, 204, 5, 10, 2, + 204, 6, 235, 28, 10, 2, 203, 214, 10, 2, 203, 215, 242, 228, 203, 214, + 10, 2, 203, 215, 210, 46, 10, 2, 203, 212, 10, 2, 203, 213, 24, 35, 93, + 144, 10, 2, 203, 213, 24, 35, 93, 188, 10, 2, 203, 213, 24, 251, 151, 10, + 2, 203, 213, 24, 144, 10, 2, 203, 213, 24, 218, 89, 10, 2, 203, 213, 24, + 204, 47, 10, 2, 203, 213, 24, 204, 48, 93, 250, 181, 10, 2, 203, 213, 24, + 204, 48, 93, 248, 188, 10, 2, 203, 211, 10, 2, 203, 208, 10, 2, 203, 207, + 10, 2, 203, 203, 10, 2, 203, 204, 24, 62, 10, 2, 203, 204, 24, 250, 175, + 10, 2, 203, 204, 24, 148, 10, 2, 203, 204, 24, 239, 125, 10, 2, 203, 204, + 24, 236, 89, 10, 2, 203, 204, 24, 236, 71, 10, 2, 203, 204, 24, 236, 58, + 206, 155, 10, 2, 203, 204, 24, 236, 49, 10, 2, 203, 204, 24, 235, 50, 10, + 2, 203, 204, 24, 144, 10, 2, 203, 204, 24, 228, 153, 10, 2, 203, 204, 24, + 228, 134, 10, 2, 203, 204, 24, 228, 20, 10, 2, 203, 204, 24, 226, 163, + 10, 2, 203, 204, 24, 224, 25, 10, 2, 203, 204, 24, 221, 164, 10, 2, 203, + 204, 24, 172, 10, 2, 203, 204, 24, 210, 65, 10, 2, 203, 204, 24, 209, + 166, 10, 2, 203, 204, 24, 204, 215, 10, 2, 203, 204, 24, 108, 93, 235, + 39, 10, 2, 203, 204, 24, 204, 36, 10, 2, 203, 204, 24, 203, 201, 10, 2, + 203, 201, 10, 2, 203, 202, 24, 66, 10, 2, 203, 190, 10, 2, 203, 191, 24, + 62, 10, 2, 203, 191, 24, 226, 15, 10, 2, 203, 191, 24, 225, 245, 10, 2, + 203, 191, 24, 207, 0, 10, 2, 203, 186, 10, 2, 203, 189, 10, 2, 203, 187, + 10, 2, 203, 183, 10, 2, 203, 171, 10, 2, 203, 172, 24, 227, 38, 10, 2, + 203, 170, 10, 2, 199, 114, 10, 2, 199, 115, 206, 155, 10, 2, 199, 115, + 95, 24, 225, 245, 10, 2, 199, 110, 10, 2, 199, 102, 10, 2, 199, 88, 10, + 2, 199, 36, 10, 2, 199, 37, 119, 199, 36, 10, 2, 199, 35, 10, 2, 199, 33, + 10, 2, 199, 34, 227, 95, 206, 155, 10, 2, 199, 28, 10, 2, 199, 19, 10, 2, + 199, 3, 10, 2, 199, 1, 10, 2, 199, 2, 24, 62, 10, 2, 199, 0, 10, 2, 198, + 255, 10, 2, 227, 61, 238, 206, 10, 2, 252, 90, 24, 218, 89, 10, 2, 252, + 7, 24, 62, 10, 2, 251, 98, 24, 226, 4, 10, 2, 242, 49, 226, 132, 24, 204, + 48, 93, 222, 135, 10, 2, 242, 47, 10, 2, 241, 0, 93, 209, 220, 10, 2, + 239, 136, 24, 210, 65, 10, 2, 238, 11, 24, 235, 39, 10, 2, 238, 11, 24, + 210, 65, 10, 2, 236, 88, 24, 251, 86, 93, 227, 77, 93, 62, 10, 2, 236, + 88, 24, 250, 179, 10, 2, 236, 14, 10, 2, 235, 151, 10, 2, 233, 73, 10, 2, + 227, 108, 24, 251, 53, 10, 2, 227, 108, 24, 250, 178, 10, 2, 227, 108, + 24, 235, 135, 10, 2, 227, 108, 24, 235, 39, 10, 2, 227, 108, 24, 234, 76, + 24, 250, 179, 10, 2, 227, 108, 24, 224, 25, 10, 2, 227, 108, 24, 172, 10, + 2, 227, 108, 24, 209, 213, 10, 2, 227, 108, 24, 204, 215, 10, 2, 227, + 108, 24, 203, 212, 10, 2, 225, 158, 24, 235, 161, 10, 2, 224, 41, 210, + 47, 24, 249, 118, 10, 2, 224, 41, 24, 238, 92, 93, 225, 93, 10, 2, 224, + 41, 24, 209, 220, 10, 2, 222, 27, 10, 2, 220, 249, 24, 199, 114, 10, 2, + 220, 159, 10, 2, 219, 118, 10, 2, 219, 117, 10, 2, 219, 116, 24, 249, 99, + 10, 2, 219, 116, 24, 235, 161, 10, 2, 218, 106, 212, 228, 219, 109, 241, + 154, 10, 2, 216, 4, 250, 165, 10, 2, 215, 150, 10, 2, 212, 51, 24, 228, + 154, 235, 28, 10, 2, 206, 14, 10, 2, 204, 13, 24, 222, 76, 10, 2, 108, + 66, 10, 145, 2, 120, 250, 181, 10, 145, 2, 126, 250, 181, 10, 145, 2, + 236, 229, 250, 181, 10, 145, 2, 237, 61, 250, 181, 10, 145, 2, 209, 106, + 250, 181, 10, 145, 2, 210, 136, 250, 181, 10, 145, 2, 238, 232, 250, 181, + 10, 145, 2, 219, 114, 250, 181, 10, 145, 2, 126, 240, 255, 10, 145, 2, + 236, 229, 240, 255, 10, 145, 2, 237, 61, 240, 255, 10, 145, 2, 209, 106, + 240, 255, 10, 145, 2, 210, 136, 240, 255, 10, 145, 2, 238, 232, 240, 255, + 10, 145, 2, 219, 114, 240, 255, 10, 145, 2, 236, 229, 66, 10, 145, 2, + 237, 61, 66, 10, 145, 2, 209, 106, 66, 10, 145, 2, 210, 136, 66, 10, 145, + 2, 238, 232, 66, 10, 145, 2, 219, 114, 66, 10, 145, 2, 112, 235, 244, 10, + 145, 2, 120, 235, 244, 10, 145, 2, 126, 235, 244, 10, 145, 2, 236, 229, + 235, 244, 10, 145, 2, 237, 61, 235, 244, 10, 145, 2, 209, 106, 235, 244, + 10, 145, 2, 210, 136, 235, 244, 10, 145, 2, 238, 232, 235, 244, 10, 145, + 2, 219, 114, 235, 244, 10, 145, 2, 112, 235, 241, 10, 145, 2, 120, 235, + 241, 10, 145, 2, 126, 235, 241, 10, 145, 2, 236, 229, 235, 241, 10, 145, + 2, 237, 61, 235, 241, 10, 145, 2, 120, 210, 82, 10, 145, 2, 126, 210, 82, + 10, 145, 2, 126, 210, 83, 203, 73, 19, 10, 145, 2, 236, 229, 210, 82, 10, + 145, 2, 237, 61, 210, 82, 10, 145, 2, 209, 106, 210, 82, 10, 145, 2, 210, + 136, 210, 82, 10, 145, 2, 238, 232, 210, 82, 10, 145, 2, 219, 114, 210, + 82, 10, 145, 2, 112, 210, 76, 10, 145, 2, 120, 210, 76, 10, 145, 2, 126, + 210, 76, 10, 145, 2, 126, 210, 77, 203, 73, 19, 10, 145, 2, 236, 229, + 210, 76, 10, 145, 2, 237, 61, 210, 76, 10, 145, 2, 210, 83, 24, 236, 72, + 93, 240, 255, 10, 145, 2, 210, 83, 24, 236, 72, 93, 221, 164, 10, 145, 2, + 112, 247, 255, 10, 145, 2, 120, 247, 255, 10, 145, 2, 126, 247, 255, 10, + 145, 2, 126, 248, 0, 203, 73, 19, 10, 145, 2, 236, 229, 247, 255, 10, + 145, 2, 237, 61, 247, 255, 10, 145, 2, 126, 203, 73, 236, 242, 238, 93, + 10, 145, 2, 126, 203, 73, 236, 242, 238, 90, 10, 145, 2, 236, 229, 203, + 73, 236, 242, 224, 180, 10, 145, 2, 236, 229, 203, 73, 236, 242, 224, + 178, 10, 145, 2, 236, 229, 203, 73, 236, 242, 224, 181, 62, 10, 145, 2, + 236, 229, 203, 73, 236, 242, 224, 181, 250, 103, 10, 145, 2, 209, 106, + 203, 73, 236, 242, 250, 177, 10, 145, 2, 210, 136, 203, 73, 236, 242, + 228, 126, 10, 145, 2, 210, 136, 203, 73, 236, 242, 228, 128, 62, 10, 145, + 2, 210, 136, 203, 73, 236, 242, 228, 128, 250, 103, 10, 145, 2, 238, 232, + 203, 73, 236, 242, 203, 185, 10, 145, 2, 238, 232, 203, 73, 236, 242, + 203, 184, 10, 145, 2, 219, 114, 203, 73, 236, 242, 228, 142, 10, 145, 2, + 219, 114, 203, 73, 236, 242, 228, 141, 10, 145, 2, 219, 114, 203, 73, + 236, 242, 228, 140, 10, 145, 2, 219, 114, 203, 73, 236, 242, 228, 143, + 62, 10, 145, 2, 120, 250, 182, 206, 155, 10, 145, 2, 126, 250, 182, 206, + 155, 10, 145, 2, 236, 229, 250, 182, 206, 155, 10, 145, 2, 237, 61, 250, + 182, 206, 155, 10, 145, 2, 209, 106, 250, 182, 206, 155, 10, 145, 2, 112, + 249, 86, 10, 145, 2, 120, 249, 86, 10, 145, 2, 126, 249, 86, 10, 145, 2, + 236, 229, 249, 86, 10, 145, 2, 236, 229, 249, 87, 203, 73, 19, 10, 145, + 2, 237, 61, 249, 86, 10, 145, 2, 237, 61, 249, 87, 203, 73, 19, 10, 145, + 2, 219, 127, 10, 145, 2, 219, 128, 10, 145, 2, 112, 238, 89, 10, 145, 2, + 120, 238, 89, 10, 145, 2, 112, 206, 75, 240, 255, 10, 145, 2, 120, 206, + 72, 240, 255, 10, 145, 2, 237, 61, 209, 95, 240, 255, 10, 145, 2, 112, + 206, 75, 203, 73, 236, 242, 62, 10, 145, 2, 120, 206, 72, 203, 73, 236, + 242, 62, 10, 145, 2, 112, 238, 228, 250, 181, 10, 145, 2, 112, 214, 88, + 250, 181, 10, 145, 2, 40, 250, 168, 112, 209, 96, 10, 145, 2, 40, 250, + 168, 112, 214, 87, 10, 145, 2, 112, 214, 88, 235, 22, 10, 145, 2, 112, + 167, 235, 22, 10, 145, 2, 238, 207, 112, 206, 74, 10, 145, 2, 238, 207, + 120, 206, 71, 10, 145, 2, 238, 207, 236, 235, 10, 145, 2, 238, 207, 237, + 104, 10, 145, 2, 236, 229, 108, 203, 73, 19, 10, 145, 2, 237, 61, 108, + 203, 73, 19, 10, 145, 2, 209, 106, 108, 203, 73, 19, 10, 145, 2, 210, + 136, 108, 203, 73, 19, 10, 145, 2, 238, 232, 108, 203, 73, 19, 10, 145, + 2, 219, 114, 108, 203, 73, 19, 10, 214, 212, 2, 40, 250, 168, 200, 238, + 240, 239, 10, 214, 212, 2, 83, 246, 79, 10, 214, 212, 2, 241, 71, 246, + 79, 10, 214, 212, 2, 241, 71, 205, 94, 10, 214, 212, 2, 241, 71, 214, 93, + 10, 2, 252, 90, 24, 218, 90, 206, 155, 10, 2, 252, 90, 24, 209, 218, 10, + 2, 251, 236, 24, 238, 91, 10, 2, 249, 119, 24, 241, 0, 206, 155, 10, 2, + 249, 106, 24, 252, 6, 10, 2, 249, 106, 24, 219, 150, 10, 2, 249, 106, 24, + 199, 114, 10, 2, 248, 37, 119, 248, 37, 24, 220, 160, 10, 2, 242, 59, 24, + 207, 0, 10, 2, 242, 49, 24, 225, 245, 10, 2, 241, 32, 24, 228, 153, 10, + 2, 241, 32, 24, 108, 108, 66, 10, 2, 241, 30, 24, 204, 36, 10, 2, 239, + 132, 24, 251, 53, 10, 2, 239, 132, 24, 250, 181, 10, 2, 239, 132, 24, + 250, 182, 250, 156, 225, 28, 10, 2, 239, 132, 24, 241, 19, 10, 2, 239, + 132, 24, 239, 125, 10, 2, 239, 132, 24, 238, 109, 10, 2, 239, 132, 24, + 236, 89, 10, 2, 239, 132, 24, 235, 161, 10, 2, 239, 132, 24, 235, 144, + 235, 28, 10, 2, 239, 132, 24, 235, 135, 10, 2, 239, 132, 24, 144, 10, 2, + 239, 132, 24, 234, 75, 10, 2, 239, 132, 24, 228, 154, 235, 28, 10, 2, + 239, 132, 24, 227, 38, 10, 2, 239, 132, 24, 225, 245, 10, 2, 239, 132, + 24, 225, 239, 10, 2, 239, 132, 24, 225, 240, 93, 227, 38, 10, 2, 239, + 132, 24, 225, 145, 10, 2, 239, 132, 24, 225, 91, 10, 2, 239, 132, 24, + 225, 92, 24, 225, 245, 10, 2, 239, 132, 24, 224, 31, 93, 235, 135, 10, 2, + 239, 132, 24, 222, 135, 10, 2, 239, 132, 24, 222, 28, 10, 2, 239, 132, + 24, 221, 211, 10, 2, 239, 132, 24, 219, 150, 10, 2, 239, 132, 24, 215, + 204, 10, 2, 239, 132, 24, 210, 65, 10, 2, 239, 132, 24, 209, 183, 235, + 28, 10, 2, 239, 29, 24, 225, 245, 10, 2, 239, 29, 24, 216, 135, 10, 2, + 238, 110, 200, 195, 10, 2, 238, 92, 242, 228, 238, 91, 10, 2, 238, 11, + 210, 47, 24, 250, 181, 10, 2, 238, 11, 210, 47, 24, 234, 75, 10, 2, 238, + 11, 210, 47, 24, 228, 154, 235, 28, 10, 2, 238, 11, 210, 47, 24, 194, 10, + 2, 238, 11, 210, 47, 24, 225, 93, 10, 2, 238, 11, 210, 47, 24, 222, 76, + 10, 2, 238, 11, 210, 47, 24, 222, 28, 10, 2, 238, 11, 210, 47, 24, 208, + 24, 10, 2, 238, 11, 24, 208, 24, 10, 2, 236, 88, 24, 249, 105, 10, 2, + 236, 88, 24, 241, 32, 235, 28, 10, 2, 236, 88, 24, 239, 132, 24, 228, + 154, 235, 28, 10, 2, 236, 88, 24, 239, 132, 24, 227, 38, 10, 2, 236, 88, + 24, 238, 112, 10, 2, 236, 88, 24, 236, 89, 10, 2, 236, 88, 24, 236, 50, + 93, 241, 76, 10, 2, 236, 88, 24, 236, 50, 93, 220, 34, 10, 2, 236, 88, + 24, 234, 236, 93, 62, 10, 2, 236, 88, 24, 225, 240, 93, 227, 38, 10, 2, + 236, 88, 24, 225, 91, 10, 2, 236, 88, 24, 225, 92, 24, 225, 245, 10, 2, + 236, 88, 24, 224, 30, 10, 2, 236, 88, 24, 220, 250, 10, 2, 236, 88, 24, + 220, 34, 10, 2, 236, 88, 24, 220, 35, 93, 239, 28, 10, 2, 236, 88, 24, + 220, 35, 93, 235, 161, 10, 2, 236, 88, 24, 210, 25, 10, 2, 236, 88, 24, + 199, 19, 10, 2, 236, 83, 212, 228, 219, 109, 241, 154, 10, 2, 235, 243, + 24, 66, 10, 2, 235, 136, 24, 235, 136, 242, 228, 235, 135, 10, 2, 235, + 49, 24, 228, 154, 235, 28, 10, 2, 235, 40, 93, 235, 136, 24, 207, 0, 10, + 2, 234, 236, 206, 156, 235, 28, 10, 2, 234, 76, 24, 250, 182, 119, 234, + 76, 24, 250, 181, 10, 2, 227, 108, 24, 248, 36, 10, 2, 227, 108, 24, 161, + 10, 2, 227, 108, 24, 108, 108, 66, 10, 2, 227, 108, 24, 203, 214, 10, 2, + 225, 158, 24, 199, 4, 119, 199, 3, 10, 2, 225, 146, 10, 2, 225, 144, 10, + 2, 225, 143, 10, 2, 225, 142, 10, 2, 225, 141, 10, 2, 225, 140, 10, 2, + 225, 139, 10, 2, 225, 138, 119, 225, 138, 235, 28, 10, 2, 225, 137, 10, + 2, 225, 136, 119, 225, 135, 10, 2, 225, 134, 10, 2, 225, 133, 10, 2, 225, + 132, 10, 2, 225, 131, 10, 2, 225, 130, 10, 2, 225, 129, 10, 2, 225, 128, + 10, 2, 225, 127, 10, 2, 225, 126, 10, 2, 225, 125, 10, 2, 225, 124, 10, + 2, 225, 123, 10, 2, 225, 122, 10, 2, 225, 121, 10, 2, 225, 120, 10, 2, + 225, 119, 10, 2, 225, 118, 10, 2, 225, 117, 10, 2, 225, 115, 10, 2, 225, + 116, 24, 235, 50, 10, 2, 225, 116, 24, 228, 153, 10, 2, 225, 116, 24, + 216, 136, 93, 224, 39, 10, 2, 225, 116, 24, 216, 136, 93, 216, 136, 93, + 224, 39, 10, 2, 225, 116, 24, 204, 48, 93, 249, 136, 10, 2, 225, 114, 10, + 2, 225, 113, 10, 2, 225, 112, 10, 2, 225, 111, 10, 2, 225, 110, 10, 2, + 225, 109, 10, 2, 225, 108, 10, 2, 225, 107, 10, 2, 225, 106, 10, 2, 225, + 105, 10, 2, 225, 103, 10, 2, 225, 104, 24, 250, 181, 10, 2, 225, 104, 24, + 249, 118, 10, 2, 225, 104, 24, 239, 124, 235, 29, 235, 28, 10, 2, 225, + 104, 24, 226, 13, 10, 2, 225, 104, 24, 194, 10, 2, 225, 104, 24, 206, + 232, 10, 2, 225, 104, 24, 206, 201, 10, 2, 225, 104, 24, 204, 47, 10, 2, + 225, 104, 24, 204, 36, 10, 2, 225, 104, 24, 203, 201, 10, 2, 225, 102, + 10, 2, 225, 100, 10, 2, 225, 101, 24, 239, 135, 10, 2, 225, 101, 24, 236, + 89, 10, 2, 225, 101, 24, 228, 153, 10, 2, 225, 101, 24, 228, 154, 235, + 28, 10, 2, 225, 101, 24, 219, 150, 10, 2, 225, 101, 24, 216, 136, 93, + 216, 136, 93, 224, 39, 10, 2, 225, 101, 24, 210, 50, 93, 226, 163, 10, 2, + 225, 101, 24, 204, 36, 10, 2, 225, 101, 24, 203, 201, 10, 2, 225, 98, 10, + 2, 225, 97, 10, 2, 224, 41, 235, 29, 24, 250, 181, 10, 2, 224, 41, 24, + 240, 255, 10, 2, 224, 41, 24, 234, 216, 10, 2, 224, 41, 24, 216, 135, 10, + 2, 224, 41, 24, 216, 136, 93, 216, 136, 93, 224, 39, 10, 2, 224, 41, 24, + 207, 0, 10, 2, 221, 212, 93, 199, 113, 10, 2, 220, 251, 119, 220, 251, + 24, 236, 89, 10, 2, 220, 251, 119, 220, 251, 24, 227, 76, 10, 2, 219, + 116, 24, 241, 32, 235, 28, 10, 2, 219, 116, 24, 235, 135, 10, 2, 219, + 116, 24, 235, 32, 10, 2, 219, 116, 24, 234, 75, 10, 2, 219, 116, 24, 226, + 234, 10, 2, 219, 116, 24, 225, 141, 10, 2, 219, 116, 24, 222, 135, 10, 2, + 219, 116, 24, 216, 136, 93, 216, 135, 10, 2, 219, 116, 24, 66, 10, 2, + 219, 116, 24, 108, 93, 66, 10, 2, 219, 116, 24, 203, 201, 10, 2, 212, 51, + 235, 29, 24, 144, 10, 2, 212, 51, 24, 238, 179, 10, 2, 212, 51, 24, 210, + 66, 250, 156, 225, 28, 10, 2, 212, 51, 24, 207, 0, 10, 2, 210, 111, 206, + 155, 10, 2, 210, 66, 119, 210, 65, 10, 2, 210, 66, 93, 233, 92, 10, 2, + 210, 66, 93, 220, 137, 10, 2, 210, 66, 93, 212, 0, 10, 2, 209, 219, 93, + 239, 132, 24, 219, 150, 10, 2, 209, 219, 93, 239, 29, 24, 251, 85, 10, 2, + 209, 183, 24, 207, 0, 10, 2, 207, 1, 93, 212, 50, 10, 2, 204, 204, 24, + 236, 58, 206, 155, 10, 2, 204, 204, 24, 126, 240, 255, 10, 2, 203, 213, + 228, 49, 10, 2, 203, 213, 24, 204, 36, 10, 2, 203, 204, 24, 241, 253, 10, + 2, 203, 204, 24, 225, 99, 10, 2, 203, 204, 24, 224, 39, 10, 2, 199, 113, + 10, 2, 199, 4, 119, 199, 4, 93, 212, 0, 10, 2, 199, 2, 24, 126, 241, 0, + 206, 155, 14, 7, 255, 131, 14, 7, 255, 130, 14, 7, 255, 129, 14, 7, 255, + 128, 14, 7, 255, 127, 14, 7, 255, 126, 14, 7, 255, 125, 14, 7, 255, 124, + 14, 7, 255, 123, 14, 7, 255, 122, 14, 7, 255, 121, 14, 7, 255, 120, 14, + 7, 255, 119, 14, 7, 255, 117, 14, 7, 255, 116, 14, 7, 255, 115, 14, 7, + 255, 114, 14, 7, 255, 113, 14, 7, 255, 112, 14, 7, 255, 111, 14, 7, 255, + 110, 14, 7, 255, 109, 14, 7, 255, 108, 14, 7, 255, 107, 14, 7, 255, 106, + 14, 7, 255, 105, 14, 7, 255, 104, 14, 7, 255, 103, 14, 7, 255, 102, 14, + 7, 255, 101, 14, 7, 255, 100, 14, 7, 255, 98, 14, 7, 255, 97, 14, 7, 255, + 95, 14, 7, 255, 94, 14, 7, 255, 93, 14, 7, 255, 92, 14, 7, 255, 91, 14, + 7, 255, 90, 14, 7, 255, 89, 14, 7, 255, 88, 14, 7, 255, 87, 14, 7, 255, + 86, 14, 7, 255, 85, 14, 7, 255, 84, 14, 7, 255, 82, 14, 7, 255, 81, 14, + 7, 255, 80, 14, 7, 255, 78, 14, 7, 255, 77, 14, 7, 255, 76, 14, 7, 255, + 75, 14, 7, 255, 74, 14, 7, 255, 73, 14, 7, 255, 72, 14, 7, 255, 71, 14, + 7, 255, 68, 14, 7, 255, 67, 14, 7, 255, 66, 14, 7, 255, 65, 14, 7, 255, + 64, 14, 7, 255, 63, 14, 7, 255, 62, 14, 7, 255, 61, 14, 7, 255, 60, 14, + 7, 255, 59, 14, 7, 255, 58, 14, 7, 255, 57, 14, 7, 255, 56, 14, 7, 255, + 55, 14, 7, 255, 54, 14, 7, 255, 53, 14, 7, 255, 52, 14, 7, 255, 51, 14, + 7, 255, 50, 14, 7, 255, 49, 14, 7, 255, 45, 14, 7, 255, 44, 14, 7, 255, + 43, 14, 7, 255, 42, 14, 7, 250, 101, 14, 7, 250, 99, 14, 7, 250, 97, 14, + 7, 250, 95, 14, 7, 250, 93, 14, 7, 250, 92, 14, 7, 250, 90, 14, 7, 250, + 88, 14, 7, 250, 86, 14, 7, 250, 84, 14, 7, 247, 219, 14, 7, 247, 218, 14, + 7, 247, 217, 14, 7, 247, 216, 14, 7, 247, 215, 14, 7, 247, 214, 14, 7, + 247, 213, 14, 7, 247, 212, 14, 7, 247, 211, 14, 7, 247, 210, 14, 7, 247, + 209, 14, 7, 247, 208, 14, 7, 247, 207, 14, 7, 247, 206, 14, 7, 247, 205, + 14, 7, 247, 204, 14, 7, 247, 203, 14, 7, 247, 202, 14, 7, 247, 201, 14, + 7, 247, 200, 14, 7, 247, 199, 14, 7, 247, 198, 14, 7, 247, 197, 14, 7, + 247, 196, 14, 7, 247, 195, 14, 7, 247, 194, 14, 7, 247, 193, 14, 7, 247, + 192, 14, 7, 242, 152, 14, 7, 242, 151, 14, 7, 242, 150, 14, 7, 242, 149, + 14, 7, 242, 148, 14, 7, 242, 147, 14, 7, 242, 146, 14, 7, 242, 145, 14, + 7, 242, 144, 14, 7, 242, 143, 14, 7, 242, 142, 14, 7, 242, 141, 14, 7, + 242, 140, 14, 7, 242, 139, 14, 7, 242, 138, 14, 7, 242, 137, 14, 7, 242, + 136, 14, 7, 242, 135, 14, 7, 242, 134, 14, 7, 242, 133, 14, 7, 242, 132, + 14, 7, 242, 131, 14, 7, 242, 130, 14, 7, 242, 129, 14, 7, 242, 128, 14, + 7, 242, 127, 14, 7, 242, 126, 14, 7, 242, 125, 14, 7, 242, 124, 14, 7, + 242, 123, 14, 7, 242, 122, 14, 7, 242, 121, 14, 7, 242, 120, 14, 7, 242, + 119, 14, 7, 242, 118, 14, 7, 242, 117, 14, 7, 242, 116, 14, 7, 242, 115, + 14, 7, 242, 114, 14, 7, 242, 113, 14, 7, 242, 112, 14, 7, 242, 111, 14, + 7, 242, 110, 14, 7, 242, 109, 14, 7, 242, 108, 14, 7, 242, 107, 14, 7, + 242, 106, 14, 7, 242, 105, 14, 7, 242, 104, 14, 7, 242, 103, 14, 7, 242, + 102, 14, 7, 242, 101, 14, 7, 242, 100, 14, 7, 242, 99, 14, 7, 242, 98, + 14, 7, 242, 97, 14, 7, 242, 96, 14, 7, 242, 95, 14, 7, 242, 94, 14, 7, + 242, 93, 14, 7, 242, 92, 14, 7, 242, 91, 14, 7, 242, 90, 14, 7, 242, 89, + 14, 7, 242, 88, 14, 7, 242, 87, 14, 7, 242, 86, 14, 7, 242, 85, 14, 7, + 242, 84, 14, 7, 242, 83, 14, 7, 242, 82, 14, 7, 242, 81, 14, 7, 242, 80, + 14, 7, 242, 79, 14, 7, 242, 78, 14, 7, 242, 77, 14, 7, 242, 76, 14, 7, + 242, 75, 14, 7, 242, 74, 14, 7, 242, 73, 14, 7, 242, 72, 14, 7, 242, 71, + 14, 7, 242, 70, 14, 7, 242, 69, 14, 7, 242, 68, 14, 7, 242, 67, 14, 7, + 242, 66, 14, 7, 242, 65, 14, 7, 242, 64, 14, 7, 242, 63, 14, 7, 242, 62, + 14, 7, 242, 61, 14, 7, 239, 73, 14, 7, 239, 72, 14, 7, 239, 71, 14, 7, + 239, 70, 14, 7, 239, 69, 14, 7, 239, 68, 14, 7, 239, 67, 14, 7, 239, 66, + 14, 7, 239, 65, 14, 7, 239, 64, 14, 7, 239, 63, 14, 7, 239, 62, 14, 7, + 239, 61, 14, 7, 239, 60, 14, 7, 239, 59, 14, 7, 239, 58, 14, 7, 239, 57, + 14, 7, 239, 56, 14, 7, 239, 55, 14, 7, 239, 54, 14, 7, 239, 53, 14, 7, + 239, 52, 14, 7, 239, 51, 14, 7, 239, 50, 14, 7, 239, 49, 14, 7, 239, 48, + 14, 7, 239, 47, 14, 7, 239, 46, 14, 7, 239, 45, 14, 7, 239, 44, 14, 7, + 239, 43, 14, 7, 239, 42, 14, 7, 239, 41, 14, 7, 239, 40, 14, 7, 239, 39, + 14, 7, 239, 38, 14, 7, 239, 37, 14, 7, 239, 36, 14, 7, 239, 35, 14, 7, + 239, 34, 14, 7, 239, 33, 14, 7, 239, 32, 14, 7, 239, 31, 14, 7, 239, 30, + 14, 7, 238, 4, 14, 7, 238, 3, 14, 7, 238, 2, 14, 7, 238, 1, 14, 7, 238, + 0, 14, 7, 237, 255, 14, 7, 237, 254, 14, 7, 237, 253, 14, 7, 237, 252, + 14, 7, 237, 251, 14, 7, 237, 250, 14, 7, 237, 249, 14, 7, 237, 248, 14, + 7, 237, 247, 14, 7, 237, 246, 14, 7, 237, 245, 14, 7, 237, 244, 14, 7, + 237, 243, 14, 7, 237, 242, 14, 7, 237, 241, 14, 7, 237, 240, 14, 7, 237, + 239, 14, 7, 237, 238, 14, 7, 237, 237, 14, 7, 237, 236, 14, 7, 237, 235, + 14, 7, 237, 234, 14, 7, 237, 233, 14, 7, 237, 232, 14, 7, 237, 231, 14, + 7, 237, 230, 14, 7, 237, 229, 14, 7, 237, 228, 14, 7, 237, 227, 14, 7, + 237, 226, 14, 7, 237, 225, 14, 7, 237, 224, 14, 7, 237, 223, 14, 7, 237, + 222, 14, 7, 237, 221, 14, 7, 237, 220, 14, 7, 237, 219, 14, 7, 237, 218, + 14, 7, 237, 217, 14, 7, 237, 216, 14, 7, 237, 215, 14, 7, 237, 214, 14, + 7, 237, 213, 14, 7, 237, 212, 14, 7, 237, 211, 14, 7, 237, 210, 14, 7, + 237, 209, 14, 7, 237, 208, 14, 7, 237, 207, 14, 7, 237, 206, 14, 7, 237, + 205, 14, 7, 237, 204, 14, 7, 237, 203, 14, 7, 237, 202, 14, 7, 237, 201, + 14, 7, 237, 200, 14, 7, 237, 199, 14, 7, 237, 198, 14, 7, 237, 197, 14, + 7, 237, 196, 14, 7, 236, 155, 14, 7, 236, 154, 14, 7, 236, 153, 14, 7, + 236, 152, 14, 7, 236, 151, 14, 7, 236, 150, 14, 7, 236, 149, 14, 7, 236, + 148, 14, 7, 236, 147, 14, 7, 236, 146, 14, 7, 236, 145, 14, 7, 236, 144, + 14, 7, 236, 143, 14, 7, 236, 142, 14, 7, 236, 141, 14, 7, 236, 140, 14, + 7, 236, 139, 14, 7, 236, 138, 14, 7, 236, 137, 14, 7, 236, 136, 14, 7, + 236, 135, 14, 7, 236, 134, 14, 7, 236, 133, 14, 7, 236, 132, 14, 7, 236, + 131, 14, 7, 236, 130, 14, 7, 236, 129, 14, 7, 236, 128, 14, 7, 236, 127, + 14, 7, 236, 126, 14, 7, 236, 125, 14, 7, 236, 124, 14, 7, 236, 123, 14, + 7, 236, 122, 14, 7, 236, 121, 14, 7, 236, 120, 14, 7, 236, 119, 14, 7, + 236, 118, 14, 7, 236, 117, 14, 7, 236, 116, 14, 7, 236, 115, 14, 7, 236, + 114, 14, 7, 236, 113, 14, 7, 236, 112, 14, 7, 236, 111, 14, 7, 236, 110, + 14, 7, 236, 109, 14, 7, 236, 108, 14, 7, 236, 107, 14, 7, 236, 106, 14, + 7, 236, 105, 14, 7, 236, 104, 14, 7, 236, 103, 14, 7, 236, 102, 14, 7, + 236, 101, 14, 7, 236, 100, 14, 7, 236, 99, 14, 7, 236, 98, 14, 7, 236, + 97, 14, 7, 236, 96, 14, 7, 236, 95, 14, 7, 236, 94, 14, 7, 236, 93, 14, + 7, 236, 92, 14, 7, 234, 245, 14, 7, 234, 244, 14, 7, 234, 243, 14, 7, + 234, 242, 14, 7, 234, 241, 14, 7, 234, 240, 14, 7, 234, 239, 14, 7, 234, + 238, 14, 7, 234, 237, 14, 7, 233, 3, 14, 7, 233, 2, 14, 7, 233, 1, 14, 7, + 233, 0, 14, 7, 232, 255, 14, 7, 232, 254, 14, 7, 232, 253, 14, 7, 232, + 252, 14, 7, 232, 251, 14, 7, 232, 250, 14, 7, 232, 249, 14, 7, 232, 248, + 14, 7, 232, 247, 14, 7, 232, 246, 14, 7, 232, 245, 14, 7, 232, 244, 14, + 7, 232, 243, 14, 7, 232, 242, 14, 7, 232, 241, 14, 7, 227, 117, 14, 7, + 227, 116, 14, 7, 227, 115, 14, 7, 227, 114, 14, 7, 227, 113, 14, 7, 227, + 112, 14, 7, 227, 111, 14, 7, 227, 110, 14, 7, 225, 190, 14, 7, 225, 189, + 14, 7, 225, 188, 14, 7, 225, 187, 14, 7, 225, 186, 14, 7, 225, 185, 14, + 7, 225, 184, 14, 7, 225, 183, 14, 7, 225, 182, 14, 7, 225, 181, 14, 7, + 223, 241, 14, 7, 223, 240, 14, 7, 223, 239, 14, 7, 223, 237, 14, 7, 223, + 235, 14, 7, 223, 234, 14, 7, 223, 232, 14, 7, 223, 230, 14, 7, 223, 228, + 14, 7, 223, 226, 14, 7, 223, 224, 14, 7, 223, 222, 14, 7, 223, 220, 14, + 7, 223, 219, 14, 7, 223, 217, 14, 7, 223, 215, 14, 7, 223, 214, 14, 7, + 223, 213, 14, 7, 223, 212, 14, 7, 223, 211, 14, 7, 223, 210, 14, 7, 223, + 209, 14, 7, 223, 208, 14, 7, 223, 207, 14, 7, 223, 205, 14, 7, 223, 203, + 14, 7, 223, 201, 14, 7, 223, 200, 14, 7, 223, 198, 14, 7, 223, 197, 14, + 7, 223, 195, 14, 7, 223, 194, 14, 7, 223, 192, 14, 7, 223, 190, 14, 7, + 223, 188, 14, 7, 223, 186, 14, 7, 223, 184, 14, 7, 223, 183, 14, 7, 223, + 181, 14, 7, 223, 179, 14, 7, 223, 178, 14, 7, 223, 176, 14, 7, 223, 174, + 14, 7, 223, 172, 14, 7, 223, 170, 14, 7, 223, 169, 14, 7, 223, 167, 14, + 7, 223, 165, 14, 7, 223, 163, 14, 7, 223, 162, 14, 7, 223, 160, 14, 7, + 223, 158, 14, 7, 223, 157, 14, 7, 223, 156, 14, 7, 223, 154, 14, 7, 223, + 152, 14, 7, 223, 150, 14, 7, 223, 148, 14, 7, 223, 146, 14, 7, 223, 144, + 14, 7, 223, 142, 14, 7, 223, 141, 14, 7, 223, 139, 14, 7, 223, 137, 14, + 7, 223, 135, 14, 7, 223, 133, 14, 7, 220, 211, 14, 7, 220, 210, 14, 7, + 220, 209, 14, 7, 220, 208, 14, 7, 220, 207, 14, 7, 220, 206, 14, 7, 220, + 205, 14, 7, 220, 204, 14, 7, 220, 203, 14, 7, 220, 202, 14, 7, 220, 201, + 14, 7, 220, 200, 14, 7, 220, 199, 14, 7, 220, 198, 14, 7, 220, 197, 14, + 7, 220, 196, 14, 7, 220, 195, 14, 7, 220, 194, 14, 7, 220, 193, 14, 7, + 220, 192, 14, 7, 220, 191, 14, 7, 220, 190, 14, 7, 220, 189, 14, 7, 220, + 188, 14, 7, 220, 187, 14, 7, 220, 186, 14, 7, 220, 185, 14, 7, 220, 184, + 14, 7, 220, 183, 14, 7, 220, 182, 14, 7, 220, 181, 14, 7, 220, 180, 14, + 7, 220, 179, 14, 7, 220, 178, 14, 7, 220, 177, 14, 7, 220, 176, 14, 7, + 220, 175, 14, 7, 220, 174, 14, 7, 220, 173, 14, 7, 220, 172, 14, 7, 220, + 171, 14, 7, 220, 170, 14, 7, 220, 169, 14, 7, 220, 168, 14, 7, 220, 167, + 14, 7, 220, 166, 14, 7, 220, 165, 14, 7, 220, 164, 14, 7, 220, 163, 14, + 7, 219, 46, 14, 7, 219, 45, 14, 7, 219, 44, 14, 7, 219, 43, 14, 7, 219, + 42, 14, 7, 219, 41, 14, 7, 219, 40, 14, 7, 219, 39, 14, 7, 219, 38, 14, + 7, 219, 37, 14, 7, 219, 36, 14, 7, 219, 35, 14, 7, 219, 34, 14, 7, 219, + 33, 14, 7, 219, 32, 14, 7, 219, 31, 14, 7, 219, 30, 14, 7, 219, 29, 14, + 7, 219, 28, 14, 7, 219, 27, 14, 7, 219, 26, 14, 7, 219, 25, 14, 7, 218, + 132, 14, 7, 218, 131, 14, 7, 218, 130, 14, 7, 218, 129, 14, 7, 218, 128, + 14, 7, 218, 127, 14, 7, 218, 126, 14, 7, 218, 125, 14, 7, 218, 124, 14, + 7, 218, 123, 14, 7, 218, 122, 14, 7, 218, 121, 14, 7, 218, 120, 14, 7, + 218, 119, 14, 7, 218, 118, 14, 7, 218, 117, 14, 7, 218, 116, 14, 7, 218, + 115, 14, 7, 218, 114, 14, 7, 218, 113, 14, 7, 218, 112, 14, 7, 218, 111, + 14, 7, 218, 110, 14, 7, 218, 109, 14, 7, 218, 108, 14, 7, 218, 107, 14, + 7, 217, 222, 14, 7, 217, 221, 14, 7, 217, 220, 14, 7, 217, 219, 14, 7, + 217, 218, 14, 7, 217, 217, 14, 7, 217, 216, 14, 7, 217, 215, 14, 7, 217, + 214, 14, 7, 217, 213, 14, 7, 217, 212, 14, 7, 217, 211, 14, 7, 217, 210, + 14, 7, 217, 209, 14, 7, 217, 208, 14, 7, 217, 207, 14, 7, 217, 206, 14, + 7, 217, 205, 14, 7, 217, 204, 14, 7, 217, 203, 14, 7, 217, 202, 14, 7, + 217, 201, 14, 7, 217, 200, 14, 7, 217, 199, 14, 7, 217, 198, 14, 7, 217, + 197, 14, 7, 217, 196, 14, 7, 217, 195, 14, 7, 217, 194, 14, 7, 217, 193, + 14, 7, 217, 192, 14, 7, 217, 191, 14, 7, 217, 190, 14, 7, 217, 189, 14, + 7, 217, 188, 14, 7, 217, 187, 14, 7, 217, 186, 14, 7, 217, 185, 14, 7, + 217, 184, 14, 7, 217, 183, 14, 7, 217, 182, 14, 7, 217, 181, 14, 7, 217, + 180, 14, 7, 217, 179, 14, 7, 217, 178, 14, 7, 217, 177, 14, 7, 217, 176, + 14, 7, 217, 175, 14, 7, 217, 174, 14, 7, 217, 173, 14, 7, 217, 172, 14, + 7, 217, 171, 14, 7, 217, 170, 14, 7, 217, 169, 14, 7, 217, 168, 14, 7, + 217, 167, 14, 7, 217, 166, 14, 7, 217, 165, 14, 7, 217, 164, 14, 7, 217, + 163, 14, 7, 217, 162, 14, 7, 217, 161, 14, 7, 217, 160, 14, 7, 217, 159, + 14, 7, 217, 158, 14, 7, 217, 157, 14, 7, 217, 156, 14, 7, 217, 155, 14, + 7, 217, 154, 14, 7, 217, 153, 14, 7, 217, 152, 14, 7, 217, 151, 14, 7, + 217, 150, 14, 7, 217, 149, 14, 7, 217, 148, 14, 7, 216, 225, 14, 7, 216, + 224, 14, 7, 216, 223, 14, 7, 216, 222, 14, 7, 216, 221, 14, 7, 216, 220, + 14, 7, 216, 219, 14, 7, 216, 218, 14, 7, 216, 217, 14, 7, 216, 216, 14, + 7, 216, 215, 14, 7, 216, 214, 14, 7, 216, 213, 14, 7, 214, 166, 14, 7, + 214, 165, 14, 7, 214, 164, 14, 7, 214, 163, 14, 7, 214, 162, 14, 7, 214, + 161, 14, 7, 214, 160, 14, 7, 214, 31, 14, 7, 214, 30, 14, 7, 214, 29, 14, + 7, 214, 28, 14, 7, 214, 27, 14, 7, 214, 26, 14, 7, 214, 25, 14, 7, 214, + 24, 14, 7, 214, 23, 14, 7, 214, 22, 14, 7, 214, 21, 14, 7, 214, 20, 14, + 7, 214, 19, 14, 7, 214, 18, 14, 7, 214, 17, 14, 7, 214, 16, 14, 7, 214, + 15, 14, 7, 214, 14, 14, 7, 214, 13, 14, 7, 214, 12, 14, 7, 214, 11, 14, + 7, 214, 10, 14, 7, 214, 9, 14, 7, 214, 8, 14, 7, 214, 7, 14, 7, 214, 6, + 14, 7, 214, 5, 14, 7, 214, 4, 14, 7, 214, 3, 14, 7, 214, 2, 14, 7, 214, + 1, 14, 7, 214, 0, 14, 7, 213, 255, 14, 7, 213, 254, 14, 7, 212, 119, 14, + 7, 212, 118, 14, 7, 212, 117, 14, 7, 212, 116, 14, 7, 212, 115, 14, 7, + 212, 114, 14, 7, 212, 113, 14, 7, 212, 112, 14, 7, 212, 111, 14, 7, 212, + 110, 14, 7, 212, 109, 14, 7, 212, 108, 14, 7, 212, 107, 14, 7, 212, 106, + 14, 7, 212, 105, 14, 7, 212, 104, 14, 7, 212, 103, 14, 7, 212, 102, 14, + 7, 212, 101, 14, 7, 212, 100, 14, 7, 212, 99, 14, 7, 212, 98, 14, 7, 212, + 97, 14, 7, 212, 96, 14, 7, 212, 95, 14, 7, 212, 94, 14, 7, 212, 93, 14, + 7, 212, 92, 14, 7, 212, 91, 14, 7, 212, 90, 14, 7, 212, 89, 14, 7, 212, + 88, 14, 7, 212, 87, 14, 7, 212, 86, 14, 7, 212, 85, 14, 7, 212, 84, 14, + 7, 212, 83, 14, 7, 212, 82, 14, 7, 212, 81, 14, 7, 212, 80, 14, 7, 212, + 79, 14, 7, 212, 78, 14, 7, 212, 77, 14, 7, 212, 76, 14, 7, 212, 75, 14, + 7, 212, 74, 14, 7, 212, 73, 14, 7, 212, 72, 14, 7, 212, 71, 14, 7, 212, + 70, 14, 7, 212, 69, 14, 7, 212, 68, 14, 7, 212, 67, 14, 7, 212, 66, 14, + 7, 207, 81, 14, 7, 207, 80, 14, 7, 207, 79, 14, 7, 207, 78, 14, 7, 207, + 77, 14, 7, 207, 76, 14, 7, 207, 75, 14, 7, 207, 74, 14, 7, 207, 73, 14, + 7, 207, 72, 14, 7, 207, 71, 14, 7, 207, 70, 14, 7, 207, 69, 14, 7, 207, + 68, 14, 7, 207, 67, 14, 7, 207, 66, 14, 7, 207, 65, 14, 7, 207, 64, 14, + 7, 207, 63, 14, 7, 207, 62, 14, 7, 207, 61, 14, 7, 207, 60, 14, 7, 207, + 59, 14, 7, 207, 58, 14, 7, 207, 57, 14, 7, 207, 56, 14, 7, 207, 55, 14, + 7, 207, 54, 14, 7, 207, 53, 14, 7, 207, 52, 14, 7, 207, 51, 14, 7, 207, + 50, 14, 7, 207, 49, 14, 7, 207, 48, 14, 7, 207, 47, 14, 7, 207, 46, 14, + 7, 207, 45, 14, 7, 207, 44, 14, 7, 207, 43, 14, 7, 207, 42, 14, 7, 207, + 41, 14, 7, 207, 40, 14, 7, 207, 39, 14, 7, 207, 38, 14, 7, 204, 95, 14, + 7, 204, 94, 14, 7, 204, 93, 14, 7, 204, 92, 14, 7, 204, 91, 14, 7, 204, + 90, 14, 7, 204, 89, 14, 7, 204, 88, 14, 7, 204, 87, 14, 7, 204, 86, 14, + 7, 204, 85, 14, 7, 204, 84, 14, 7, 204, 83, 14, 7, 204, 82, 14, 7, 204, + 81, 14, 7, 204, 80, 14, 7, 204, 79, 14, 7, 204, 78, 14, 7, 204, 77, 14, + 7, 204, 76, 14, 7, 204, 75, 14, 7, 204, 74, 14, 7, 204, 73, 14, 7, 204, + 72, 14, 7, 204, 71, 14, 7, 204, 70, 14, 7, 204, 69, 14, 7, 204, 68, 14, + 7, 204, 67, 14, 7, 204, 66, 14, 7, 204, 65, 14, 7, 204, 64, 14, 7, 204, + 63, 14, 7, 204, 62, 14, 7, 204, 61, 14, 7, 204, 60, 14, 7, 204, 59, 14, + 7, 204, 58, 14, 7, 204, 57, 14, 7, 204, 56, 14, 7, 204, 55, 14, 7, 204, + 54, 14, 7, 204, 53, 14, 7, 204, 52, 14, 7, 204, 51, 14, 7, 204, 50, 14, + 7, 204, 49, 14, 7, 203, 167, 14, 7, 203, 166, 14, 7, 203, 165, 14, 7, + 203, 164, 14, 7, 203, 163, 14, 7, 203, 162, 14, 7, 203, 161, 14, 7, 203, + 160, 14, 7, 203, 159, 14, 7, 203, 158, 14, 7, 203, 157, 14, 7, 203, 156, + 14, 7, 203, 155, 14, 7, 203, 154, 14, 7, 203, 153, 14, 7, 203, 152, 14, + 7, 203, 151, 14, 7, 203, 150, 14, 7, 203, 149, 14, 7, 203, 148, 14, 7, + 203, 147, 14, 7, 203, 146, 14, 7, 203, 145, 14, 7, 203, 144, 14, 7, 203, + 143, 14, 7, 203, 142, 14, 7, 203, 141, 14, 7, 203, 140, 14, 7, 203, 139, + 14, 7, 203, 138, 14, 7, 203, 137, 14, 7, 203, 136, 14, 7, 203, 135, 14, + 7, 203, 134, 14, 7, 203, 133, 14, 7, 203, 132, 14, 7, 203, 131, 14, 7, + 203, 130, 14, 7, 203, 129, 14, 7, 203, 128, 14, 7, 203, 127, 14, 7, 203, + 126, 14, 7, 203, 125, 14, 7, 203, 124, 14, 7, 203, 123, 14, 7, 203, 122, + 14, 7, 203, 121, 14, 7, 203, 120, 14, 7, 203, 119, 14, 7, 203, 118, 14, + 7, 203, 117, 14, 7, 203, 116, 14, 7, 203, 115, 14, 7, 203, 114, 14, 7, + 203, 113, 14, 7, 203, 112, 14, 7, 203, 111, 14, 7, 203, 110, 14, 7, 203, + 109, 14, 7, 203, 108, 14, 7, 203, 107, 14, 7, 203, 106, 14, 7, 203, 105, + 14, 7, 203, 104, 14, 7, 203, 103, 14, 7, 203, 102, 14, 7, 203, 101, 14, + 7, 203, 100, 14, 7, 203, 99, 14, 7, 203, 98, 14, 7, 203, 97, 14, 7, 203, + 96, 14, 7, 203, 95, 14, 7, 203, 94, 14, 7, 203, 93, 14, 7, 203, 92, 14, + 7, 203, 91, 14, 7, 201, 146, 14, 7, 201, 145, 14, 7, 201, 144, 14, 7, + 201, 143, 14, 7, 201, 142, 14, 7, 201, 141, 14, 7, 201, 140, 14, 7, 201, + 139, 14, 7, 201, 138, 14, 7, 201, 137, 14, 7, 201, 136, 14, 7, 201, 135, + 14, 7, 201, 134, 14, 7, 201, 133, 14, 7, 201, 132, 14, 7, 201, 131, 14, + 7, 201, 130, 14, 7, 201, 129, 14, 7, 201, 128, 14, 7, 201, 127, 14, 7, + 201, 126, 14, 7, 201, 125, 14, 7, 201, 124, 14, 7, 201, 123, 14, 7, 201, + 122, 14, 7, 201, 121, 14, 7, 201, 120, 14, 7, 201, 119, 14, 7, 201, 118, + 14, 7, 201, 117, 14, 7, 201, 116, 14, 7, 201, 115, 14, 7, 200, 193, 14, + 7, 200, 192, 14, 7, 200, 191, 14, 7, 200, 190, 14, 7, 200, 189, 14, 7, + 200, 188, 14, 7, 200, 187, 14, 7, 200, 186, 14, 7, 200, 185, 14, 7, 200, + 184, 14, 7, 200, 183, 14, 7, 200, 182, 14, 7, 200, 121, 14, 7, 200, 120, + 14, 7, 200, 119, 14, 7, 200, 118, 14, 7, 200, 117, 14, 7, 200, 116, 14, + 7, 200, 115, 14, 7, 200, 114, 14, 7, 200, 113, 14, 7, 199, 156, 14, 7, + 199, 155, 14, 7, 199, 154, 14, 7, 199, 153, 14, 7, 199, 152, 14, 7, 199, + 151, 14, 7, 199, 150, 14, 7, 199, 149, 14, 7, 199, 148, 14, 7, 199, 147, + 14, 7, 199, 146, 14, 7, 199, 145, 14, 7, 199, 144, 14, 7, 199, 143, 14, + 7, 199, 142, 14, 7, 199, 141, 14, 7, 199, 140, 14, 7, 199, 139, 14, 7, + 199, 138, 14, 7, 199, 137, 14, 7, 199, 136, 14, 7, 199, 135, 14, 7, 199, + 134, 14, 7, 199, 133, 14, 7, 199, 132, 14, 7, 199, 131, 14, 7, 199, 130, + 14, 7, 199, 129, 14, 7, 199, 128, 14, 7, 199, 127, 14, 7, 199, 126, 14, + 7, 199, 125, 14, 7, 199, 124, 14, 7, 199, 123, 14, 7, 199, 122, 14, 7, + 199, 121, 14, 7, 199, 120, 14, 7, 199, 119, 14, 7, 199, 118, 14, 7, 199, + 117, 14, 7, 199, 116, 14, 7, 252, 137, 14, 7, 252, 136, 14, 7, 252, 135, + 14, 7, 252, 134, 14, 7, 252, 133, 14, 7, 252, 132, 14, 7, 252, 131, 14, + 7, 252, 130, 14, 7, 252, 129, 14, 7, 252, 128, 14, 7, 252, 127, 14, 7, + 252, 126, 14, 7, 252, 125, 14, 7, 252, 124, 14, 7, 252, 123, 14, 7, 252, + 122, 14, 7, 252, 121, 14, 7, 252, 120, 14, 7, 252, 119, 14, 7, 252, 118, + 14, 7, 252, 117, 14, 7, 252, 116, 14, 7, 252, 115, 14, 7, 252, 114, 14, + 7, 252, 113, 14, 7, 252, 112, 14, 7, 252, 111, 14, 7, 252, 110, 14, 7, + 252, 109, 14, 7, 252, 108, 14, 7, 252, 107, 14, 7, 252, 106, 14, 7, 252, + 105, 14, 7, 252, 104, 28, 7, 255, 131, 28, 7, 255, 130, 28, 7, 255, 129, + 28, 7, 255, 128, 28, 7, 255, 127, 28, 7, 255, 125, 28, 7, 255, 122, 28, + 7, 255, 121, 28, 7, 255, 120, 28, 7, 255, 119, 28, 7, 255, 118, 28, 7, + 255, 117, 28, 7, 255, 116, 28, 7, 255, 115, 28, 7, 255, 114, 28, 7, 255, + 112, 28, 7, 255, 111, 28, 7, 255, 110, 28, 7, 255, 108, 28, 7, 255, 107, + 28, 7, 255, 106, 28, 7, 255, 105, 28, 7, 255, 104, 28, 7, 255, 103, 28, + 7, 255, 102, 28, 7, 255, 101, 28, 7, 255, 100, 28, 7, 255, 99, 28, 7, + 255, 98, 28, 7, 255, 97, 28, 7, 255, 95, 28, 7, 255, 94, 28, 7, 255, 93, + 28, 7, 255, 92, 28, 7, 255, 90, 28, 7, 255, 89, 28, 7, 255, 88, 28, 7, + 255, 87, 28, 7, 255, 86, 28, 7, 255, 85, 28, 7, 255, 84, 28, 7, 255, 83, + 28, 7, 255, 82, 28, 7, 255, 80, 28, 7, 255, 79, 28, 7, 255, 78, 28, 7, + 255, 76, 28, 7, 255, 74, 28, 7, 255, 73, 28, 7, 255, 72, 28, 7, 255, 71, + 28, 7, 255, 70, 28, 7, 255, 69, 28, 7, 255, 68, 28, 7, 255, 67, 28, 7, + 255, 66, 28, 7, 255, 65, 28, 7, 255, 64, 28, 7, 255, 63, 28, 7, 255, 62, + 28, 7, 255, 61, 28, 7, 255, 60, 28, 7, 255, 59, 28, 7, 255, 58, 28, 7, + 255, 57, 28, 7, 255, 56, 28, 7, 255, 55, 28, 7, 255, 54, 28, 7, 255, 53, + 28, 7, 255, 52, 28, 7, 255, 51, 28, 7, 255, 50, 28, 7, 255, 49, 28, 7, + 255, 48, 28, 7, 255, 47, 28, 7, 255, 46, 28, 7, 255, 45, 28, 7, 255, 44, + 28, 7, 255, 43, 28, 7, 255, 42, 28, 7, 255, 41, 28, 7, 255, 40, 28, 7, + 255, 39, 28, 7, 255, 38, 28, 7, 255, 37, 28, 7, 255, 36, 28, 7, 255, 35, + 28, 7, 255, 34, 28, 7, 255, 33, 28, 7, 255, 32, 28, 7, 255, 31, 28, 7, + 255, 30, 28, 7, 255, 29, 28, 7, 255, 28, 28, 7, 255, 27, 28, 7, 255, 26, + 28, 7, 255, 25, 28, 7, 255, 24, 28, 7, 255, 23, 28, 7, 255, 22, 28, 7, + 255, 21, 28, 7, 255, 20, 28, 7, 255, 19, 28, 7, 255, 18, 28, 7, 255, 17, + 28, 7, 255, 16, 28, 7, 255, 15, 28, 7, 255, 14, 28, 7, 255, 13, 28, 7, + 255, 12, 28, 7, 255, 11, 28, 7, 255, 10, 28, 7, 255, 8, 28, 7, 255, 7, + 28, 7, 255, 6, 28, 7, 255, 5, 28, 7, 255, 4, 28, 7, 255, 3, 28, 7, 255, + 2, 28, 7, 255, 1, 28, 7, 255, 0, 28, 7, 254, 255, 28, 7, 254, 254, 28, 7, + 254, 253, 28, 7, 254, 252, 28, 7, 254, 251, 28, 7, 254, 250, 28, 7, 254, + 249, 28, 7, 254, 248, 28, 7, 254, 247, 28, 7, 254, 246, 28, 7, 254, 245, + 28, 7, 254, 244, 28, 7, 254, 243, 28, 7, 254, 242, 28, 7, 254, 241, 28, + 7, 254, 240, 28, 7, 254, 239, 28, 7, 254, 238, 28, 7, 254, 237, 28, 7, + 254, 236, 28, 7, 254, 235, 28, 7, 254, 234, 28, 7, 254, 233, 28, 7, 254, + 232, 28, 7, 254, 231, 28, 7, 254, 229, 28, 7, 254, 228, 28, 7, 254, 227, + 28, 7, 254, 226, 28, 7, 254, 225, 28, 7, 254, 224, 28, 7, 254, 223, 28, + 7, 254, 222, 28, 7, 254, 221, 28, 7, 254, 220, 28, 7, 254, 219, 28, 7, + 254, 218, 28, 7, 254, 216, 28, 7, 254, 215, 28, 7, 254, 214, 28, 7, 254, + 213, 28, 7, 254, 212, 28, 7, 254, 211, 28, 7, 254, 210, 28, 7, 254, 209, + 28, 7, 254, 208, 28, 7, 254, 207, 28, 7, 254, 206, 28, 7, 254, 205, 28, + 7, 254, 204, 28, 7, 254, 203, 28, 7, 254, 202, 28, 7, 254, 201, 28, 7, + 254, 200, 28, 7, 254, 199, 28, 7, 254, 198, 28, 7, 254, 197, 28, 7, 254, + 196, 28, 7, 254, 195, 28, 7, 254, 194, 28, 7, 254, 193, 28, 7, 254, 192, + 28, 7, 254, 191, 28, 7, 254, 190, 28, 7, 254, 189, 28, 7, 254, 188, 28, + 7, 254, 187, 28, 7, 254, 186, 28, 7, 254, 185, 28, 7, 254, 184, 28, 7, + 254, 183, 28, 7, 254, 182, 28, 7, 254, 181, 28, 7, 254, 180, 28, 7, 254, + 179, 28, 7, 254, 178, 28, 7, 254, 177, 28, 7, 254, 176, 28, 7, 254, 175, + 28, 7, 254, 174, 28, 7, 254, 173, 28, 7, 254, 172, 28, 7, 254, 171, 28, + 7, 254, 170, 28, 7, 254, 169, 28, 7, 254, 168, 28, 7, 254, 167, 28, 7, + 254, 166, 28, 7, 254, 165, 28, 7, 254, 164, 28, 7, 254, 163, 28, 7, 254, + 162, 28, 7, 254, 161, 28, 7, 254, 160, 28, 7, 254, 159, 28, 7, 254, 158, + 28, 7, 254, 157, 28, 7, 254, 156, 28, 7, 254, 155, 28, 7, 254, 154, 28, + 7, 254, 153, 28, 7, 254, 152, 28, 7, 254, 151, 28, 7, 254, 150, 28, 7, + 254, 149, 28, 7, 254, 148, 28, 7, 254, 146, 28, 7, 254, 145, 28, 7, 254, + 144, 28, 7, 254, 143, 28, 7, 254, 142, 28, 7, 254, 141, 28, 7, 254, 140, + 28, 7, 254, 139, 28, 7, 254, 138, 28, 7, 254, 137, 28, 7, 254, 136, 28, + 7, 254, 135, 28, 7, 254, 134, 28, 7, 254, 133, 28, 7, 254, 132, 28, 7, + 254, 131, 28, 7, 254, 130, 28, 7, 254, 129, 28, 7, 254, 128, 28, 7, 254, + 127, 28, 7, 254, 126, 28, 7, 254, 125, 28, 7, 254, 124, 28, 7, 254, 123, + 28, 7, 254, 122, 28, 7, 254, 121, 28, 7, 254, 120, 28, 7, 254, 119, 28, + 7, 254, 118, 28, 7, 254, 117, 28, 7, 254, 116, 28, 7, 254, 115, 28, 7, + 254, 114, 28, 7, 254, 113, 28, 7, 254, 112, 28, 7, 254, 111, 28, 7, 254, + 110, 28, 7, 254, 109, 28, 7, 254, 108, 28, 7, 254, 107, 28, 7, 254, 106, + 28, 7, 254, 105, 28, 7, 254, 104, 28, 7, 254, 103, 28, 7, 254, 102, 28, + 7, 254, 101, 28, 7, 254, 100, 28, 7, 254, 99, 28, 7, 254, 98, 28, 7, 254, + 97, 28, 7, 254, 96, 28, 7, 254, 95, 28, 7, 254, 94, 28, 7, 254, 93, 28, + 7, 254, 92, 28, 7, 254, 91, 28, 7, 254, 90, 28, 7, 254, 89, 28, 7, 254, + 88, 28, 7, 254, 87, 28, 7, 254, 86, 28, 7, 254, 85, 28, 7, 254, 84, 28, + 7, 254, 83, 28, 7, 254, 82, 28, 7, 254, 81, 28, 7, 254, 80, 28, 7, 254, + 79, 28, 7, 254, 78, 28, 7, 254, 77, 28, 7, 254, 76, 28, 7, 254, 75, 28, + 7, 254, 74, 28, 7, 254, 73, 28, 7, 254, 72, 28, 7, 254, 71, 28, 7, 254, + 70, 28, 7, 254, 69, 28, 7, 254, 68, 28, 7, 254, 67, 28, 7, 254, 66, 28, + 7, 254, 65, 28, 7, 254, 64, 28, 7, 254, 63, 28, 7, 254, 62, 28, 7, 254, + 61, 28, 7, 254, 60, 28, 7, 254, 59, 28, 7, 254, 58, 28, 7, 254, 57, 28, + 7, 254, 56, 28, 7, 254, 55, 28, 7, 254, 54, 28, 7, 254, 53, 28, 7, 254, + 52, 28, 7, 254, 51, 28, 7, 254, 50, 28, 7, 254, 49, 28, 7, 254, 48, 28, + 7, 254, 47, 28, 7, 254, 46, 28, 7, 254, 45, 28, 7, 254, 44, 28, 7, 254, + 43, 28, 7, 254, 42, 28, 7, 254, 41, 28, 7, 254, 40, 28, 7, 254, 39, 28, + 7, 254, 38, 28, 7, 254, 37, 28, 7, 254, 36, 28, 7, 254, 34, 28, 7, 254, + 33, 28, 7, 254, 32, 28, 7, 254, 31, 28, 7, 254, 30, 28, 7, 254, 29, 28, + 7, 254, 28, 28, 7, 254, 27, 28, 7, 254, 26, 28, 7, 254, 25, 28, 7, 254, + 24, 28, 7, 254, 21, 28, 7, 254, 20, 28, 7, 254, 19, 28, 7, 254, 18, 28, + 7, 254, 14, 28, 7, 254, 13, 28, 7, 254, 12, 28, 7, 254, 11, 28, 7, 254, + 10, 28, 7, 254, 9, 28, 7, 254, 8, 28, 7, 254, 7, 28, 7, 254, 6, 28, 7, + 254, 5, 28, 7, 254, 4, 28, 7, 254, 3, 28, 7, 254, 2, 28, 7, 254, 1, 28, + 7, 254, 0, 28, 7, 253, 255, 28, 7, 253, 254, 28, 7, 253, 253, 28, 7, 253, + 252, 28, 7, 253, 250, 28, 7, 253, 249, 28, 7, 253, 248, 28, 7, 253, 247, + 28, 7, 253, 246, 28, 7, 253, 245, 28, 7, 253, 244, 28, 7, 253, 243, 28, + 7, 253, 242, 28, 7, 253, 241, 28, 7, 253, 240, 28, 7, 253, 239, 28, 7, + 253, 238, 28, 7, 253, 237, 28, 7, 253, 236, 28, 7, 253, 235, 28, 7, 253, + 234, 28, 7, 253, 233, 28, 7, 253, 232, 28, 7, 253, 231, 28, 7, 253, 230, + 28, 7, 253, 229, 28, 7, 253, 228, 28, 7, 253, 227, 28, 7, 253, 226, 28, + 7, 253, 225, 28, 7, 253, 224, 28, 7, 253, 223, 28, 7, 253, 222, 28, 7, + 253, 221, 28, 7, 253, 220, 28, 7, 253, 219, 28, 7, 253, 218, 28, 7, 253, + 217, 28, 7, 253, 216, 28, 7, 253, 215, 28, 7, 253, 214, 28, 7, 253, 213, + 28, 7, 253, 212, 28, 7, 253, 211, 28, 7, 253, 210, 28, 7, 253, 209, 28, + 7, 253, 208, 28, 7, 253, 207, 28, 7, 253, 206, 28, 7, 253, 205, 28, 7, + 253, 204, 28, 7, 253, 203, 28, 7, 253, 202, 28, 7, 253, 201, 28, 7, 253, + 200, 28, 7, 253, 199, 28, 7, 253, 198, 28, 7, 253, 197, 28, 7, 253, 196, + 28, 7, 253, 195, 28, 7, 253, 194, 28, 7, 253, 193, 28, 7, 253, 192, 28, + 7, 253, 191, 28, 7, 253, 190, 28, 7, 253, 189, 213, 253, 217, 34, 213, + 88, 28, 7, 253, 188, 28, 7, 253, 187, 28, 7, 253, 186, 28, 7, 253, 185, + 28, 7, 253, 184, 28, 7, 253, 183, 28, 7, 253, 182, 28, 7, 253, 181, 28, + 7, 253, 180, 28, 7, 253, 179, 28, 7, 253, 178, 28, 7, 253, 177, 192, 28, + 7, 253, 176, 28, 7, 253, 175, 28, 7, 253, 174, 28, 7, 253, 173, 28, 7, + 253, 172, 28, 7, 253, 171, 28, 7, 253, 170, 28, 7, 253, 168, 28, 7, 253, + 166, 28, 7, 253, 164, 28, 7, 253, 162, 28, 7, 253, 160, 28, 7, 253, 158, + 28, 7, 253, 156, 28, 7, 253, 154, 28, 7, 253, 152, 28, 7, 253, 150, 248, + 244, 224, 97, 81, 28, 7, 253, 148, 238, 171, 224, 97, 81, 28, 7, 253, + 147, 28, 7, 253, 145, 28, 7, 253, 143, 28, 7, 253, 141, 28, 7, 253, 139, + 28, 7, 253, 137, 28, 7, 253, 135, 28, 7, 253, 133, 28, 7, 253, 131, 28, + 7, 253, 130, 28, 7, 253, 129, 28, 7, 253, 128, 28, 7, 253, 127, 28, 7, + 253, 126, 28, 7, 253, 125, 28, 7, 253, 124, 28, 7, 253, 123, 28, 7, 253, + 122, 28, 7, 253, 121, 28, 7, 253, 120, 28, 7, 253, 119, 28, 7, 253, 118, + 28, 7, 253, 117, 28, 7, 253, 116, 28, 7, 253, 115, 28, 7, 253, 114, 28, + 7, 253, 113, 28, 7, 253, 112, 28, 7, 253, 111, 28, 7, 253, 110, 28, 7, + 253, 109, 28, 7, 253, 108, 28, 7, 253, 107, 28, 7, 253, 106, 28, 7, 253, + 105, 28, 7, 253, 104, 28, 7, 253, 103, 28, 7, 253, 102, 28, 7, 253, 101, + 28, 7, 253, 100, 28, 7, 253, 99, 28, 7, 253, 98, 28, 7, 253, 97, 28, 7, + 253, 96, 28, 7, 253, 95, 28, 7, 253, 94, 28, 7, 253, 93, 28, 7, 253, 92, + 28, 7, 253, 91, 28, 7, 253, 90, 28, 7, 253, 89, 28, 7, 253, 88, 28, 7, + 253, 87, 28, 7, 253, 86, 28, 7, 253, 85, 28, 7, 253, 84, 28, 7, 253, 83, + 28, 7, 253, 82, 28, 7, 253, 81, 28, 7, 253, 80, 28, 7, 253, 79, 28, 7, + 253, 78, 28, 7, 253, 77, 28, 7, 253, 76, 28, 7, 253, 75, 28, 7, 253, 74, + 28, 7, 253, 73, 28, 7, 253, 72, 28, 7, 253, 71, 28, 7, 253, 70, 28, 7, + 253, 69, 28, 7, 253, 68, 28, 7, 253, 67, 28, 7, 253, 66, 28, 7, 253, 65, + 28, 7, 253, 64, 28, 7, 253, 63, 28, 7, 253, 62, 28, 7, 253, 61, 28, 7, + 253, 60, 28, 7, 253, 59, 28, 7, 253, 58, 28, 7, 253, 57, 28, 7, 253, 56, + 28, 7, 253, 55, 28, 7, 253, 54, 28, 7, 253, 53, 28, 7, 253, 52, 28, 7, + 253, 51, 28, 7, 253, 50, 28, 7, 253, 49, 28, 7, 253, 48, 28, 7, 253, 47, + 28, 7, 253, 46, 28, 7, 253, 45, 28, 7, 253, 44, 28, 7, 253, 43, 28, 7, + 253, 42, 28, 7, 253, 41, 28, 7, 253, 40, 28, 7, 253, 39, 28, 7, 253, 38, + 28, 7, 253, 37, 28, 7, 253, 36, 28, 7, 253, 35, 28, 7, 253, 34, 28, 7, + 253, 33, 28, 7, 253, 32, 28, 7, 253, 31, 28, 7, 253, 30, 28, 7, 253, 29, + 28, 7, 253, 28, 28, 7, 253, 27, 28, 7, 253, 26, 28, 7, 253, 25, 28, 7, + 253, 24, 28, 7, 253, 23, 28, 7, 253, 22, 28, 7, 253, 21, 25, 1, 215, 235, + 219, 186, 221, 253, 25, 1, 215, 235, 236, 23, 237, 5, 25, 1, 215, 235, + 215, 83, 221, 254, 215, 152, 25, 1, 215, 235, 215, 83, 221, 254, 215, + 153, 25, 1, 215, 235, 220, 158, 221, 253, 25, 1, 215, 235, 209, 216, 25, + 1, 215, 235, 205, 212, 221, 253, 25, 1, 215, 235, 218, 8, 221, 253, 25, + 1, 215, 235, 210, 20, 216, 211, 219, 82, 25, 1, 215, 235, 215, 83, 216, + 211, 219, 83, 215, 152, 25, 1, 215, 235, 215, 83, 216, 211, 219, 83, 215, + 153, 25, 1, 215, 235, 222, 214, 25, 1, 215, 235, 204, 216, 222, 215, 25, + 1, 215, 235, 219, 247, 25, 1, 215, 235, 222, 211, 25, 1, 215, 235, 222, + 169, 25, 1, 215, 235, 220, 237, 25, 1, 215, 235, 210, 138, 25, 1, 215, + 235, 218, 140, 25, 1, 215, 235, 226, 226, 25, 1, 215, 235, 219, 50, 25, + 1, 215, 235, 207, 193, 25, 1, 215, 235, 219, 185, 25, 1, 215, 235, 225, + 73, 25, 1, 215, 235, 224, 238, 225, 237, 25, 1, 215, 235, 218, 150, 222, + 5, 25, 1, 215, 235, 222, 218, 25, 1, 215, 235, 216, 101, 25, 1, 215, 235, + 235, 180, 25, 1, 215, 235, 216, 166, 25, 1, 215, 235, 221, 107, 219, 220, + 25, 1, 215, 235, 217, 245, 222, 8, 25, 1, 215, 235, 108, 199, 186, 220, + 151, 25, 1, 215, 235, 235, 181, 25, 1, 215, 235, 218, 150, 218, 151, 25, + 1, 215, 235, 209, 109, 25, 1, 215, 235, 221, 246, 25, 1, 215, 235, 222, + 11, 25, 1, 215, 235, 221, 83, 25, 1, 215, 235, 227, 85, 25, 1, 215, 235, + 216, 211, 225, 29, 25, 1, 215, 235, 220, 76, 225, 29, 25, 1, 215, 235, + 216, 0, 25, 1, 215, 235, 222, 212, 25, 1, 215, 235, 219, 124, 25, 1, 215, + 235, 214, 205, 25, 1, 215, 235, 204, 213, 25, 1, 215, 235, 224, 38, 25, + 1, 215, 235, 209, 11, 25, 1, 215, 235, 206, 131, 25, 1, 215, 235, 222, + 209, 25, 1, 215, 235, 226, 233, 25, 1, 215, 235, 220, 72, 25, 1, 215, + 235, 225, 250, 25, 1, 215, 235, 221, 84, 25, 1, 215, 235, 209, 212, 25, + 1, 215, 235, 224, 90, 25, 1, 215, 235, 237, 74, 25, 1, 215, 235, 212, + 241, 25, 1, 215, 235, 226, 39, 25, 1, 215, 235, 209, 7, 25, 1, 215, 235, + 222, 165, 215, 194, 25, 1, 215, 235, 210, 13, 25, 1, 215, 235, 218, 149, + 25, 1, 215, 235, 209, 252, 218, 160, 199, 194, 25, 1, 215, 235, 218, 30, + 221, 103, 25, 1, 215, 235, 216, 206, 25, 1, 215, 235, 219, 52, 25, 1, + 215, 235, 203, 235, 25, 1, 215, 235, 219, 223, 25, 1, 215, 235, 222, 208, + 25, 1, 215, 235, 219, 94, 25, 1, 215, 235, 222, 105, 25, 1, 215, 235, + 218, 44, 25, 1, 215, 235, 206, 135, 25, 1, 215, 235, 209, 4, 25, 1, 215, + 235, 216, 207, 25, 1, 215, 235, 218, 164, 25, 1, 215, 235, 222, 216, 25, + 1, 215, 235, 218, 41, 25, 1, 215, 235, 227, 48, 25, 1, 215, 235, 218, + 167, 25, 1, 215, 235, 203, 54, 25, 1, 215, 235, 224, 42, 25, 1, 215, 235, + 220, 24, 25, 1, 215, 235, 220, 126, 25, 1, 215, 235, 222, 104, 25, 1, + 215, 234, 218, 162, 25, 1, 215, 234, 204, 216, 222, 213, 25, 1, 215, 234, + 209, 171, 25, 1, 215, 234, 210, 142, 204, 215, 25, 1, 215, 234, 224, 92, + 218, 146, 25, 1, 215, 234, 222, 111, 222, 217, 25, 1, 215, 234, 226, 155, + 25, 1, 215, 234, 200, 17, 25, 1, 215, 234, 222, 106, 25, 1, 215, 234, + 227, 71, 25, 1, 215, 234, 216, 57, 25, 1, 215, 234, 200, 95, 225, 29, 25, + 1, 215, 234, 225, 92, 218, 160, 218, 55, 25, 1, 215, 234, 218, 143, 210, + 39, 25, 1, 215, 234, 220, 43, 219, 97, 25, 1, 215, 234, 235, 178, 25, 1, + 215, 234, 215, 142, 25, 1, 215, 234, 204, 216, 218, 158, 25, 1, 215, 234, + 210, 44, 219, 92, 25, 1, 215, 234, 210, 40, 25, 1, 215, 234, 221, 254, + 206, 134, 25, 1, 215, 234, 222, 93, 222, 107, 25, 1, 215, 234, 218, 42, + 218, 146, 25, 1, 215, 234, 226, 222, 25, 1, 215, 234, 235, 179, 25, 1, + 215, 234, 226, 218, 25, 1, 215, 234, 225, 170, 25, 1, 215, 234, 216, 104, + 25, 1, 215, 234, 202, 241, 25, 1, 215, 234, 219, 187, 220, 235, 25, 1, + 215, 234, 219, 222, 222, 89, 25, 1, 215, 234, 200, 214, 25, 1, 215, 234, + 212, 40, 25, 1, 215, 234, 207, 28, 25, 1, 215, 234, 222, 10, 25, 1, 215, + 234, 219, 206, 25, 1, 215, 234, 219, 207, 225, 70, 25, 1, 215, 234, 222, + 0, 25, 1, 215, 234, 207, 244, 25, 1, 215, 234, 222, 97, 25, 1, 215, 234, + 221, 88, 25, 1, 215, 234, 218, 58, 25, 1, 215, 234, 214, 209, 25, 1, 215, + 234, 222, 9, 219, 224, 25, 1, 215, 234, 237, 117, 25, 1, 215, 234, 222, + 84, 25, 1, 215, 234, 237, 140, 25, 1, 215, 234, 226, 230, 25, 1, 215, + 234, 222, 235, 219, 86, 25, 1, 215, 234, 222, 235, 219, 62, 25, 1, 215, + 234, 224, 237, 25, 1, 215, 234, 219, 230, 25, 1, 215, 234, 218, 169, 25, + 1, 215, 234, 178, 25, 1, 215, 234, 226, 140, 25, 1, 215, 234, 219, 175, + 25, 1, 173, 219, 186, 222, 215, 25, 1, 173, 218, 7, 25, 1, 173, 199, 194, + 25, 1, 173, 201, 98, 25, 1, 173, 219, 223, 25, 1, 173, 220, 64, 25, 1, + 173, 219, 193, 25, 1, 173, 235, 188, 25, 1, 173, 222, 101, 25, 1, 173, + 236, 30, 25, 1, 173, 218, 32, 221, 145, 222, 12, 25, 1, 173, 218, 138, + 222, 92, 25, 1, 173, 222, 98, 25, 1, 173, 215, 148, 25, 1, 173, 220, 49, + 25, 1, 173, 222, 109, 247, 186, 25, 1, 173, 226, 220, 25, 1, 173, 235, + 189, 25, 1, 173, 226, 227, 25, 1, 173, 199, 212, 221, 10, 25, 1, 173, + 218, 1, 25, 1, 173, 222, 86, 25, 1, 173, 218, 168, 25, 1, 173, 222, 92, + 25, 1, 173, 200, 18, 25, 1, 173, 226, 47, 25, 1, 173, 227, 105, 25, 1, + 173, 210, 137, 25, 1, 173, 220, 58, 25, 1, 173, 207, 26, 25, 1, 173, 219, + 66, 25, 1, 173, 205, 212, 199, 197, 25, 1, 173, 208, 19, 25, 1, 173, 219, + 213, 218, 55, 25, 1, 173, 202, 240, 25, 1, 173, 220, 129, 25, 1, 173, + 222, 235, 226, 229, 25, 1, 173, 218, 151, 25, 1, 173, 219, 208, 25, 1, + 173, 225, 74, 25, 1, 173, 222, 94, 25, 1, 173, 221, 245, 25, 1, 173, 218, + 145, 25, 1, 173, 206, 130, 25, 1, 173, 219, 210, 25, 1, 173, 236, 187, + 25, 1, 173, 220, 63, 25, 1, 173, 218, 170, 25, 1, 173, 218, 166, 25, 1, + 173, 248, 12, 25, 1, 173, 202, 242, 25, 1, 173, 222, 99, 25, 1, 173, 212, + 175, 25, 1, 173, 219, 96, 25, 1, 173, 225, 91, 25, 1, 173, 205, 209, 25, + 1, 173, 218, 152, 219, 175, 25, 1, 173, 219, 88, 25, 1, 173, 226, 233, + 25, 1, 173, 219, 215, 25, 1, 173, 222, 208, 25, 1, 173, 222, 87, 25, 1, + 173, 224, 42, 25, 1, 173, 225, 237, 25, 1, 173, 219, 94, 25, 1, 173, 219, + 175, 25, 1, 173, 200, 204, 25, 1, 173, 219, 211, 25, 1, 173, 218, 155, + 25, 1, 173, 218, 147, 25, 1, 173, 225, 252, 219, 52, 25, 1, 173, 218, + 153, 25, 1, 173, 220, 71, 25, 1, 173, 222, 235, 218, 158, 25, 1, 173, + 200, 109, 25, 1, 173, 220, 70, 25, 1, 173, 209, 215, 25, 1, 173, 210, + 140, 25, 1, 173, 222, 95, 25, 1, 173, 222, 215, 25, 1, 173, 222, 105, 25, + 1, 173, 226, 221, 25, 1, 173, 222, 96, 25, 1, 173, 226, 225, 25, 1, 173, + 222, 109, 215, 199, 25, 1, 173, 199, 177, 25, 1, 173, 219, 84, 25, 1, + 173, 221, 200, 25, 1, 173, 221, 39, 25, 1, 173, 210, 16, 25, 1, 173, 226, + 244, 225, 52, 25, 1, 173, 226, 244, 237, 153, 25, 1, 173, 219, 245, 25, + 1, 173, 220, 126, 25, 1, 173, 224, 158, 25, 1, 173, 215, 160, 25, 1, 173, + 216, 47, 25, 1, 173, 206, 146, 25, 1, 137, 222, 85, 25, 1, 137, 201, 96, + 25, 1, 137, 219, 82, 25, 1, 137, 221, 253, 25, 1, 137, 219, 80, 25, 1, + 137, 224, 203, 25, 1, 137, 219, 85, 25, 1, 137, 218, 165, 25, 1, 137, + 219, 229, 25, 1, 137, 218, 55, 25, 1, 137, 200, 215, 25, 1, 137, 219, + 183, 25, 1, 137, 210, 63, 25, 1, 137, 219, 194, 25, 1, 137, 226, 228, 25, + 1, 137, 206, 132, 25, 1, 137, 210, 42, 25, 1, 137, 219, 93, 25, 1, 137, + 207, 244, 25, 1, 137, 226, 233, 25, 1, 137, 200, 97, 25, 1, 137, 225, + 253, 25, 1, 137, 212, 3, 25, 1, 137, 222, 2, 25, 1, 137, 220, 62, 25, 1, + 137, 222, 183, 25, 1, 137, 222, 8, 25, 1, 137, 210, 139, 25, 1, 137, 200, + 41, 25, 1, 137, 219, 87, 25, 1, 137, 226, 224, 222, 88, 25, 1, 137, 219, + 190, 25, 1, 137, 204, 215, 25, 1, 137, 235, 198, 25, 1, 137, 219, 180, + 25, 1, 137, 237, 118, 25, 1, 137, 220, 66, 25, 1, 137, 221, 237, 25, 1, + 137, 224, 231, 25, 1, 137, 220, 48, 25, 1, 137, 221, 102, 25, 1, 137, + 221, 241, 25, 1, 137, 214, 189, 25, 1, 137, 221, 239, 25, 1, 137, 221, + 255, 25, 1, 137, 224, 25, 25, 1, 137, 218, 157, 25, 1, 137, 222, 108, 25, + 1, 137, 225, 227, 25, 1, 137, 218, 44, 25, 1, 137, 206, 135, 25, 1, 137, + 209, 4, 25, 1, 137, 199, 177, 25, 1, 137, 226, 225, 25, 1, 137, 213, 233, + 25, 1, 137, 206, 189, 25, 1, 137, 219, 191, 25, 1, 137, 222, 4, 25, 1, + 137, 218, 156, 25, 1, 137, 226, 223, 25, 1, 137, 215, 154, 25, 1, 137, + 215, 250, 25, 1, 137, 218, 18, 25, 1, 137, 224, 237, 25, 1, 137, 219, + 230, 25, 1, 137, 222, 1, 25, 1, 137, 219, 203, 25, 1, 137, 199, 191, 25, + 1, 137, 216, 135, 25, 1, 137, 199, 190, 25, 1, 137, 220, 71, 25, 1, 137, + 218, 146, 25, 1, 137, 208, 21, 25, 1, 137, 226, 1, 25, 1, 137, 219, 219, + 25, 1, 137, 219, 188, 25, 1, 137, 204, 196, 25, 1, 137, 222, 12, 25, 1, + 137, 225, 247, 25, 1, 137, 218, 154, 25, 1, 137, 206, 133, 25, 1, 137, + 222, 210, 25, 1, 137, 219, 228, 25, 1, 137, 224, 230, 25, 1, 137, 219, + 209, 25, 1, 137, 218, 159, 25, 1, 137, 219, 66, 25, 1, 137, 235, 182, 25, + 1, 137, 226, 15, 25, 1, 137, 213, 140, 217, 92, 25, 1, 137, 207, 15, 25, + 1, 137, 205, 154, 25, 1, 137, 218, 41, 25, 1, 137, 213, 33, 25, 1, 137, + 225, 31, 25, 1, 137, 222, 63, 25, 1, 137, 223, 243, 25, 1, 137, 207, 193, + 25, 1, 137, 221, 41, 25, 1, 137, 210, 28, 25, 1, 137, 210, 38, 25, 1, + 137, 225, 199, 25, 1, 137, 218, 133, 25, 1, 137, 209, 220, 25, 1, 137, + 218, 148, 25, 1, 137, 216, 61, 25, 1, 137, 219, 150, 25, 1, 137, 209, + 251, 25, 1, 137, 214, 204, 25, 1, 137, 220, 235, 25, 1, 137, 224, 70, 25, + 1, 137, 213, 140, 221, 34, 25, 1, 137, 206, 15, 25, 1, 137, 218, 135, 25, + 1, 137, 222, 109, 210, 135, 25, 1, 137, 212, 1, 25, 1, 137, 237, 194, 25, + 1, 96, 220, 70, 25, 1, 96, 205, 160, 25, 1, 96, 222, 98, 25, 1, 96, 225, + 74, 25, 1, 96, 202, 180, 25, 1, 96, 224, 76, 25, 1, 96, 216, 210, 25, 1, + 96, 209, 15, 25, 1, 96, 213, 208, 25, 1, 96, 218, 161, 25, 1, 96, 220, + 41, 25, 1, 96, 214, 221, 25, 1, 96, 206, 246, 25, 1, 96, 219, 196, 25, 1, + 96, 226, 43, 25, 1, 96, 200, 207, 25, 1, 96, 211, 190, 25, 1, 96, 219, + 220, 25, 1, 96, 216, 207, 25, 1, 96, 205, 161, 25, 1, 96, 225, 251, 25, + 1, 96, 224, 91, 25, 1, 96, 218, 164, 25, 1, 96, 219, 172, 25, 1, 96, 222, + 216, 25, 1, 96, 219, 189, 25, 1, 96, 219, 171, 25, 1, 96, 218, 163, 25, + 1, 96, 213, 30, 25, 1, 96, 219, 84, 25, 1, 96, 216, 59, 25, 1, 96, 212, + 61, 25, 1, 96, 219, 204, 25, 1, 96, 221, 247, 25, 1, 96, 235, 176, 25, 1, + 96, 219, 192, 25, 1, 96, 219, 95, 25, 1, 96, 222, 164, 25, 1, 96, 224, + 72, 25, 1, 96, 219, 225, 25, 1, 96, 220, 54, 25, 1, 96, 207, 14, 218, + 146, 25, 1, 96, 210, 141, 25, 1, 96, 214, 214, 25, 1, 96, 220, 74, 209, + 22, 25, 1, 96, 219, 212, 218, 55, 25, 1, 96, 200, 5, 25, 1, 96, 235, 177, + 25, 1, 96, 204, 214, 25, 1, 96, 200, 21, 25, 1, 96, 215, 106, 25, 1, 96, + 204, 202, 25, 1, 96, 226, 231, 25, 1, 96, 208, 20, 25, 1, 96, 206, 134, + 25, 1, 96, 202, 243, 25, 1, 96, 201, 44, 25, 1, 96, 225, 173, 25, 1, 96, + 214, 224, 25, 1, 96, 207, 27, 25, 1, 96, 235, 197, 25, 1, 96, 219, 235, + 25, 1, 96, 210, 41, 25, 1, 96, 221, 242, 25, 1, 96, 222, 102, 25, 1, 96, + 218, 5, 25, 1, 96, 219, 48, 25, 1, 96, 236, 26, 25, 1, 96, 204, 203, 25, + 1, 96, 226, 5, 25, 1, 96, 200, 73, 25, 1, 96, 218, 42, 246, 126, 25, 1, + 96, 199, 251, 25, 1, 96, 222, 3, 25, 1, 96, 220, 59, 25, 1, 96, 215, 195, + 25, 1, 96, 199, 196, 25, 1, 96, 224, 232, 25, 1, 96, 236, 187, 25, 1, 96, + 236, 25, 25, 1, 96, 219, 182, 25, 1, 96, 226, 233, 25, 1, 96, 222, 219, + 25, 1, 96, 219, 195, 25, 1, 96, 235, 183, 25, 1, 96, 237, 195, 25, 1, 96, + 218, 136, 25, 1, 96, 215, 251, 25, 1, 96, 200, 19, 25, 1, 96, 219, 221, + 25, 1, 96, 218, 42, 248, 205, 25, 1, 96, 217, 241, 25, 1, 96, 215, 79, + 25, 1, 96, 221, 200, 25, 1, 96, 236, 185, 25, 1, 96, 220, 151, 25, 1, 96, + 221, 39, 25, 1, 96, 235, 182, 25, 1, 96, 236, 190, 70, 25, 1, 96, 220, + 236, 25, 1, 96, 214, 220, 25, 1, 96, 219, 184, 25, 1, 96, 225, 237, 25, + 1, 96, 215, 192, 25, 1, 96, 218, 149, 25, 1, 96, 200, 20, 25, 1, 96, 219, + 205, 25, 1, 96, 216, 211, 216, 33, 25, 1, 96, 236, 190, 247, 168, 25, 1, + 96, 237, 6, 25, 1, 96, 219, 89, 25, 1, 96, 62, 25, 1, 96, 205, 154, 25, + 1, 96, 74, 25, 1, 96, 70, 25, 1, 96, 225, 72, 25, 1, 96, 216, 211, 215, + 114, 25, 1, 96, 207, 32, 25, 1, 96, 206, 233, 25, 1, 96, 220, 74, 220, + 223, 233, 109, 25, 1, 96, 210, 16, 25, 1, 96, 200, 16, 25, 1, 96, 219, + 165, 25, 1, 96, 199, 201, 25, 1, 96, 199, 228, 207, 173, 25, 1, 96, 199, + 228, 243, 1, 25, 1, 96, 199, 185, 25, 1, 96, 199, 193, 25, 1, 96, 226, + 219, 25, 1, 96, 215, 249, 25, 1, 96, 219, 90, 238, 126, 25, 1, 96, 214, + 216, 25, 1, 96, 200, 213, 25, 1, 96, 237, 140, 25, 1, 96, 203, 54, 25, 1, + 96, 224, 42, 25, 1, 96, 221, 211, 25, 1, 96, 213, 107, 25, 1, 96, 213, + 234, 25, 1, 96, 219, 164, 25, 1, 96, 219, 253, 25, 1, 96, 210, 8, 25, 1, + 96, 209, 251, 25, 1, 96, 236, 190, 213, 143, 25, 1, 96, 188, 25, 1, 96, + 215, 204, 25, 1, 96, 224, 70, 25, 1, 96, 226, 88, 25, 1, 96, 222, 40, 25, + 1, 96, 178, 25, 1, 96, 222, 161, 25, 1, 96, 206, 136, 25, 1, 96, 226, + 163, 25, 1, 96, 221, 106, 25, 1, 96, 206, 166, 25, 1, 96, 237, 164, 25, + 1, 96, 235, 170, 25, 1, 215, 233, 161, 25, 1, 215, 233, 66, 25, 1, 215, + 233, 226, 15, 25, 1, 215, 233, 238, 255, 25, 1, 215, 233, 213, 167, 25, + 1, 215, 233, 207, 15, 25, 1, 215, 233, 218, 41, 25, 1, 215, 233, 194, 25, + 1, 215, 233, 213, 33, 25, 1, 215, 233, 213, 81, 25, 1, 215, 233, 222, 63, + 25, 1, 215, 233, 207, 32, 25, 1, 215, 233, 220, 73, 25, 1, 215, 233, 219, + 96, 25, 1, 215, 233, 223, 243, 25, 1, 215, 233, 207, 193, 25, 1, 215, + 233, 210, 28, 25, 1, 215, 233, 209, 182, 25, 1, 215, 233, 210, 137, 25, + 1, 215, 233, 225, 199, 25, 1, 215, 233, 226, 233, 25, 1, 215, 233, 218, + 104, 25, 1, 215, 233, 218, 133, 25, 1, 215, 233, 219, 67, 25, 1, 215, + 233, 199, 227, 25, 1, 215, 233, 209, 220, 25, 1, 215, 233, 183, 25, 1, + 215, 233, 218, 167, 25, 1, 215, 233, 215, 249, 25, 1, 215, 233, 218, 148, + 25, 1, 215, 233, 200, 213, 25, 1, 215, 233, 216, 61, 25, 1, 215, 233, + 212, 175, 25, 1, 215, 233, 219, 150, 25, 1, 215, 233, 213, 107, 25, 1, + 215, 233, 226, 243, 25, 1, 215, 233, 219, 181, 25, 1, 215, 233, 219, 232, + 25, 1, 215, 233, 210, 8, 25, 1, 215, 233, 214, 221, 25, 1, 215, 233, 237, + 6, 25, 1, 215, 233, 201, 114, 25, 1, 215, 233, 224, 210, 25, 1, 215, 233, + 224, 70, 25, 1, 215, 233, 226, 88, 25, 1, 215, 233, 222, 100, 25, 1, 215, + 233, 213, 139, 25, 1, 215, 233, 178, 25, 1, 215, 233, 221, 136, 25, 1, + 215, 233, 222, 108, 25, 1, 215, 233, 206, 146, 25, 1, 215, 233, 226, 50, + 25, 1, 215, 233, 212, 21, 25, 1, 215, 233, 201, 165, 221, 44, 1, 207, 36, + 221, 44, 1, 219, 201, 221, 44, 1, 199, 245, 221, 44, 1, 221, 166, 221, + 44, 1, 249, 136, 221, 44, 1, 242, 58, 221, 44, 1, 62, 221, 44, 1, 215, + 229, 221, 44, 1, 226, 202, 221, 44, 1, 234, 169, 221, 44, 1, 242, 33, + 221, 44, 1, 246, 192, 221, 44, 1, 227, 7, 221, 44, 1, 217, 93, 221, 44, + 1, 222, 216, 221, 44, 1, 219, 118, 221, 44, 1, 172, 221, 44, 1, 217, 63, + 221, 44, 1, 74, 221, 44, 1, 213, 1, 221, 44, 1, 210, 33, 221, 44, 1, 206, + 105, 221, 44, 1, 239, 27, 221, 44, 1, 201, 114, 221, 44, 1, 72, 221, 44, + 1, 226, 88, 221, 44, 1, 225, 80, 221, 44, 1, 194, 221, 44, 1, 234, 223, + 221, 44, 1, 213, 88, 221, 44, 1, 206, 179, 221, 44, 17, 199, 81, 221, 44, + 17, 102, 221, 44, 17, 105, 221, 44, 17, 147, 221, 44, 17, 149, 221, 44, + 17, 164, 221, 44, 17, 187, 221, 44, 17, 210, 135, 221, 44, 17, 192, 221, + 44, 17, 219, 113, 221, 44, 242, 10, 221, 44, 53, 242, 10, 249, 58, 203, + 87, 1, 238, 161, 249, 58, 203, 87, 1, 161, 249, 58, 203, 87, 1, 211, 202, + 249, 58, 203, 87, 1, 237, 195, 249, 58, 203, 87, 1, 222, 103, 249, 58, + 203, 87, 1, 200, 6, 249, 58, 203, 87, 1, 236, 74, 249, 58, 203, 87, 1, + 241, 81, 249, 58, 203, 87, 1, 226, 49, 249, 58, 203, 87, 1, 227, 166, + 249, 58, 203, 87, 1, 233, 67, 249, 58, 203, 87, 1, 201, 114, 249, 58, + 203, 87, 1, 199, 14, 249, 58, 203, 87, 1, 236, 19, 249, 58, 203, 87, 1, + 240, 211, 249, 58, 203, 87, 1, 247, 76, 249, 58, 203, 87, 1, 203, 175, + 249, 58, 203, 87, 1, 138, 249, 58, 203, 87, 1, 249, 136, 249, 58, 203, + 87, 1, 201, 166, 249, 58, 203, 87, 1, 200, 45, 249, 58, 203, 87, 1, 172, + 249, 58, 203, 87, 1, 201, 111, 249, 58, 203, 87, 1, 62, 249, 58, 203, 87, + 1, 74, 249, 58, 203, 87, 1, 217, 63, 249, 58, 203, 87, 1, 66, 249, 58, + 203, 87, 1, 238, 255, 249, 58, 203, 87, 1, 72, 249, 58, 203, 87, 1, 70, + 249, 58, 203, 87, 38, 122, 205, 174, 249, 58, 203, 87, 38, 128, 205, 174, + 249, 58, 203, 87, 38, 221, 206, 205, 174, 249, 58, 203, 87, 38, 224, 56, + 205, 174, 249, 58, 203, 87, 38, 234, 57, 205, 174, 249, 58, 203, 87, 236, + 183, 208, 76, 125, 123, 22, 227, 4, 125, 123, 22, 227, 0, 125, 123, 22, + 226, 160, 125, 123, 22, 226, 126, 125, 123, 22, 227, 25, 125, 123, 22, + 227, 22, 125, 123, 22, 226, 6, 125, 123, 22, 225, 234, 125, 123, 22, 227, + 6, 125, 123, 22, 226, 217, 125, 123, 22, 227, 81, 125, 123, 22, 227, 78, + 125, 123, 22, 226, 67, 125, 123, 22, 226, 64, 125, 123, 22, 227, 19, 125, + 123, 22, 227, 17, 125, 123, 22, 226, 8, 125, 123, 22, 226, 7, 125, 123, + 22, 226, 85, 125, 123, 22, 226, 53, 125, 123, 22, 226, 162, 125, 123, 22, + 226, 161, 125, 123, 22, 227, 96, 125, 123, 22, 227, 21, 125, 123, 22, + 225, 225, 125, 123, 22, 225, 216, 125, 123, 22, 227, 104, 125, 123, 22, + 227, 97, 125, 123, 111, 203, 65, 125, 123, 111, 218, 139, 125, 123, 111, + 225, 58, 125, 123, 111, 234, 150, 125, 123, 111, 219, 24, 125, 123, 111, + 213, 199, 125, 123, 111, 219, 51, 125, 123, 111, 214, 133, 125, 123, 111, + 200, 61, 125, 123, 111, 234, 36, 125, 123, 111, 222, 123, 125, 123, 111, + 247, 12, 125, 123, 111, 220, 78, 125, 123, 111, 233, 228, 125, 123, 111, + 215, 122, 125, 123, 111, 218, 144, 125, 123, 111, 220, 116, 125, 123, + 111, 250, 139, 125, 123, 111, 200, 177, 125, 123, 111, 247, 109, 125, + 123, 134, 246, 161, 204, 211, 125, 123, 134, 246, 161, 209, 29, 125, 123, + 134, 246, 161, 226, 235, 125, 123, 134, 246, 161, 226, 193, 125, 123, + 134, 246, 161, 208, 18, 125, 123, 134, 246, 161, 233, 194, 125, 123, 134, + 246, 161, 206, 220, 125, 123, 2, 202, 176, 206, 58, 125, 123, 2, 202, + 176, 205, 21, 247, 67, 125, 123, 2, 246, 161, 247, 1, 125, 123, 2, 202, + 176, 206, 83, 125, 123, 2, 202, 176, 237, 137, 125, 123, 2, 200, 135, + 218, 134, 125, 123, 2, 200, 135, 213, 90, 125, 123, 2, 200, 135, 205, + 137, 125, 123, 2, 200, 135, 237, 176, 125, 123, 2, 202, 176, 211, 184, + 125, 123, 2, 222, 62, 208, 22, 125, 123, 2, 202, 176, 218, 183, 125, 123, + 2, 232, 236, 200, 80, 125, 123, 2, 200, 176, 125, 123, 2, 246, 161, 205, + 8, 212, 246, 125, 123, 17, 199, 81, 125, 123, 17, 102, 125, 123, 17, 105, + 125, 123, 17, 147, 125, 123, 17, 149, 125, 123, 17, 164, 125, 123, 17, + 187, 125, 123, 17, 210, 135, 125, 123, 17, 192, 125, 123, 17, 219, 113, + 125, 123, 41, 206, 161, 125, 123, 41, 233, 80, 125, 123, 41, 206, 167, + 206, 48, 125, 123, 41, 221, 167, 125, 123, 41, 233, 83, 221, 167, 125, + 123, 41, 206, 167, 248, 170, 125, 123, 41, 205, 85, 125, 123, 2, 202, + 176, 224, 37, 125, 123, 2, 200, 132, 125, 123, 2, 234, 31, 125, 123, 2, + 206, 73, 234, 31, 125, 123, 2, 198, 244, 206, 116, 125, 123, 2, 233, 212, + 125, 123, 2, 218, 197, 125, 123, 2, 200, 168, 125, 123, 2, 218, 137, 125, + 123, 2, 250, 123, 125, 123, 2, 204, 136, 247, 66, 125, 123, 2, 222, 62, + 205, 24, 125, 123, 2, 206, 221, 125, 123, 2, 224, 67, 125, 123, 2, 220, + 252, 125, 123, 2, 246, 161, 234, 219, 224, 15, 218, 142, 218, 141, 125, + 123, 2, 246, 161, 242, 213, 205, 15, 125, 123, 2, 246, 161, 204, 134, + 125, 123, 2, 246, 161, 204, 135, 246, 180, 125, 123, 2, 246, 161, 214, + 219, 241, 235, 125, 123, 2, 246, 161, 218, 190, 205, 145, 125, 123, 246, + 133, 2, 205, 19, 125, 123, 246, 133, 2, 200, 47, 125, 123, 246, 133, 2, + 224, 155, 125, 123, 246, 133, 2, 225, 56, 125, 123, 246, 133, 2, 200, + 131, 125, 123, 246, 133, 2, 226, 68, 125, 123, 246, 133, 2, 234, 147, + 125, 123, 246, 133, 2, 221, 37, 125, 123, 246, 133, 2, 206, 59, 125, 123, + 246, 133, 2, 205, 29, 125, 123, 246, 133, 2, 215, 242, 125, 123, 246, + 133, 2, 226, 205, 125, 123, 246, 133, 2, 234, 209, 125, 123, 246, 133, 2, + 203, 84, 125, 123, 246, 133, 2, 237, 173, 125, 123, 246, 133, 2, 200, 87, + 125, 123, 246, 133, 2, 205, 2, 125, 123, 246, 133, 2, 225, 220, 125, 123, + 246, 133, 2, 201, 156, 114, 1, 172, 114, 1, 249, 136, 114, 1, 11, 172, + 114, 1, 215, 135, 114, 1, 178, 114, 1, 221, 214, 114, 1, 250, 234, 178, + 114, 1, 237, 195, 114, 1, 203, 90, 114, 1, 202, 235, 114, 1, 207, 36, + 114, 1, 242, 58, 114, 1, 11, 204, 253, 114, 1, 11, 207, 36, 114, 1, 204, + 253, 114, 1, 241, 220, 114, 1, 188, 114, 1, 219, 154, 114, 1, 11, 219, + 21, 114, 1, 250, 234, 188, 114, 1, 219, 21, 114, 1, 219, 7, 114, 1, 194, + 114, 1, 224, 1, 114, 1, 224, 223, 114, 1, 224, 212, 114, 1, 205, 200, + 114, 1, 240, 219, 114, 1, 205, 192, 114, 1, 240, 218, 114, 1, 161, 114, + 1, 236, 89, 114, 1, 11, 161, 114, 1, 214, 159, 114, 1, 214, 136, 114, 1, + 219, 253, 114, 1, 219, 202, 114, 1, 250, 234, 219, 253, 114, 1, 144, 114, + 1, 200, 181, 114, 1, 235, 199, 114, 1, 235, 174, 114, 1, 205, 7, 114, 1, + 239, 77, 114, 1, 218, 60, 114, 1, 218, 43, 114, 1, 205, 22, 114, 1, 239, + 87, 114, 1, 11, 205, 22, 114, 1, 11, 239, 87, 114, 1, 213, 165, 205, 22, + 114, 1, 210, 114, 114, 1, 208, 179, 114, 1, 199, 77, 114, 1, 199, 5, 114, + 1, 205, 32, 114, 1, 239, 93, 114, 1, 11, 205, 32, 114, 1, 212, 64, 114, + 1, 199, 114, 114, 1, 199, 6, 114, 1, 198, 232, 114, 1, 198, 212, 114, 1, + 250, 234, 198, 232, 114, 1, 198, 204, 114, 1, 198, 211, 114, 1, 201, 114, + 114, 1, 251, 185, 114, 1, 234, 84, 114, 1, 220, 121, 114, 2, 250, 171, + 114, 2, 213, 165, 202, 187, 114, 2, 213, 165, 250, 171, 114, 22, 2, 62, + 114, 22, 2, 252, 138, 114, 22, 2, 251, 181, 114, 22, 2, 251, 85, 114, 22, + 2, 251, 76, 114, 22, 2, 74, 114, 22, 2, 217, 63, 114, 22, 2, 201, 0, 114, + 22, 2, 201, 147, 114, 22, 2, 72, 114, 22, 2, 238, 179, 114, 22, 2, 238, + 165, 114, 22, 2, 217, 118, 114, 22, 2, 70, 114, 22, 2, 232, 240, 114, 22, + 2, 232, 239, 114, 22, 2, 232, 238, 114, 22, 2, 228, 45, 114, 22, 2, 228, + 178, 114, 22, 2, 228, 151, 114, 22, 2, 228, 8, 114, 22, 2, 228, 91, 114, + 22, 2, 66, 114, 22, 2, 204, 46, 114, 22, 2, 204, 45, 114, 22, 2, 204, 44, + 114, 22, 2, 203, 182, 114, 22, 2, 204, 28, 114, 22, 2, 203, 246, 114, 22, + 2, 200, 123, 114, 22, 2, 200, 9, 114, 22, 2, 251, 221, 114, 22, 2, 251, + 217, 114, 22, 2, 238, 108, 114, 22, 2, 212, 219, 238, 108, 114, 22, 2, + 238, 115, 114, 22, 2, 212, 219, 238, 115, 114, 22, 2, 251, 176, 114, 22, + 2, 238, 234, 114, 22, 2, 250, 139, 114, 22, 2, 217, 3, 114, 22, 2, 220, + 214, 114, 22, 2, 219, 255, 114, 150, 213, 46, 114, 150, 205, 158, 213, + 46, 114, 150, 56, 114, 150, 57, 114, 1, 205, 172, 114, 1, 205, 171, 114, + 1, 205, 170, 114, 1, 205, 169, 114, 1, 205, 168, 114, 1, 205, 167, 114, + 1, 205, 166, 114, 1, 213, 165, 205, 173, 114, 1, 213, 165, 205, 172, 114, + 1, 213, 165, 205, 170, 114, 1, 213, 165, 205, 169, 114, 1, 213, 165, 205, + 168, 114, 1, 213, 165, 205, 166, 18, 228, 10, 81, 18, 246, 61, 18, 246, + 60, 18, 246, 59, 18, 246, 58, 18, 246, 57, 18, 246, 56, 18, 246, 55, 18, + 246, 54, 18, 246, 53, 18, 246, 52, 18, 246, 51, 18, 246, 50, 18, 246, 49, + 18, 246, 48, 18, 246, 47, 18, 246, 46, 18, 246, 45, 18, 246, 44, 18, 246, + 43, 18, 246, 42, 18, 246, 41, 18, 246, 40, 18, 246, 39, 18, 246, 38, 18, + 246, 37, 18, 246, 36, 18, 246, 35, 18, 246, 34, 18, 246, 33, 18, 246, 32, + 18, 246, 31, 18, 246, 30, 18, 246, 29, 18, 246, 28, 18, 246, 27, 18, 246, + 26, 18, 246, 25, 18, 246, 24, 18, 246, 23, 18, 246, 22, 18, 246, 21, 18, + 246, 20, 18, 246, 19, 18, 246, 18, 18, 246, 17, 18, 246, 16, 18, 246, 15, + 18, 246, 14, 18, 246, 13, 18, 246, 12, 18, 246, 11, 18, 246, 10, 18, 246, + 9, 18, 246, 8, 18, 246, 7, 18, 246, 6, 18, 246, 5, 18, 246, 4, 18, 246, + 3, 18, 246, 2, 18, 246, 1, 18, 246, 0, 18, 245, 255, 18, 245, 254, 18, + 245, 253, 18, 245, 252, 18, 245, 251, 18, 245, 250, 18, 245, 249, 18, + 245, 248, 18, 245, 247, 18, 245, 246, 18, 245, 245, 18, 245, 244, 18, + 245, 243, 18, 245, 242, 18, 245, 241, 18, 245, 240, 18, 245, 239, 18, + 245, 238, 18, 245, 237, 18, 245, 236, 18, 245, 235, 18, 245, 234, 18, + 245, 233, 18, 245, 232, 18, 245, 231, 18, 245, 230, 18, 245, 229, 18, + 245, 228, 18, 245, 227, 18, 245, 226, 18, 245, 225, 18, 245, 224, 18, + 245, 223, 18, 245, 222, 18, 245, 221, 18, 245, 220, 18, 245, 219, 18, + 245, 218, 18, 245, 217, 18, 245, 216, 18, 245, 215, 18, 245, 214, 18, + 245, 213, 18, 245, 212, 18, 245, 211, 18, 245, 210, 18, 245, 209, 18, + 245, 208, 18, 245, 207, 18, 245, 206, 18, 245, 205, 18, 245, 204, 18, + 245, 203, 18, 245, 202, 18, 245, 201, 18, 245, 200, 18, 245, 199, 18, + 245, 198, 18, 245, 197, 18, 245, 196, 18, 245, 195, 18, 245, 194, 18, + 245, 193, 18, 245, 192, 18, 245, 191, 18, 245, 190, 18, 245, 189, 18, + 245, 188, 18, 245, 187, 18, 245, 186, 18, 245, 185, 18, 245, 184, 18, + 245, 183, 18, 245, 182, 18, 245, 181, 18, 245, 180, 18, 245, 179, 18, + 245, 178, 18, 245, 177, 18, 245, 176, 18, 245, 175, 18, 245, 174, 18, + 245, 173, 18, 245, 172, 18, 245, 171, 18, 245, 170, 18, 245, 169, 18, + 245, 168, 18, 245, 167, 18, 245, 166, 18, 245, 165, 18, 245, 164, 18, + 245, 163, 18, 245, 162, 18, 245, 161, 18, 245, 160, 18, 245, 159, 18, + 245, 158, 18, 245, 157, 18, 245, 156, 18, 245, 155, 18, 245, 154, 18, + 245, 153, 18, 245, 152, 18, 245, 151, 18, 245, 150, 18, 245, 149, 18, + 245, 148, 18, 245, 147, 18, 245, 146, 18, 245, 145, 18, 245, 144, 18, + 245, 143, 18, 245, 142, 18, 245, 141, 18, 245, 140, 18, 245, 139, 18, + 245, 138, 18, 245, 137, 18, 245, 136, 18, 245, 135, 18, 245, 134, 18, + 245, 133, 18, 245, 132, 18, 245, 131, 18, 245, 130, 18, 245, 129, 18, + 245, 128, 18, 245, 127, 18, 245, 126, 18, 245, 125, 18, 245, 124, 18, + 245, 123, 18, 245, 122, 18, 245, 121, 18, 245, 120, 18, 245, 119, 18, + 245, 118, 18, 245, 117, 18, 245, 116, 18, 245, 115, 18, 245, 114, 18, + 245, 113, 18, 245, 112, 18, 245, 111, 18, 245, 110, 18, 245, 109, 18, + 245, 108, 18, 245, 107, 18, 245, 106, 18, 245, 105, 18, 245, 104, 18, + 245, 103, 18, 245, 102, 18, 245, 101, 18, 245, 100, 18, 245, 99, 18, 245, + 98, 18, 245, 97, 18, 245, 96, 18, 245, 95, 18, 245, 94, 18, 245, 93, 18, + 245, 92, 18, 245, 91, 18, 245, 90, 18, 245, 89, 18, 245, 88, 18, 245, 87, + 18, 245, 86, 18, 245, 85, 18, 245, 84, 18, 245, 83, 18, 245, 82, 18, 245, + 81, 18, 245, 80, 18, 245, 79, 18, 245, 78, 18, 245, 77, 18, 245, 76, 18, + 245, 75, 18, 245, 74, 18, 245, 73, 18, 245, 72, 18, 245, 71, 18, 245, 70, + 18, 245, 69, 18, 245, 68, 18, 245, 67, 18, 245, 66, 18, 245, 65, 18, 245, + 64, 18, 245, 63, 18, 245, 62, 18, 245, 61, 18, 245, 60, 18, 245, 59, 18, + 245, 58, 18, 245, 57, 18, 245, 56, 18, 245, 55, 18, 245, 54, 18, 245, 53, + 18, 245, 52, 18, 245, 51, 18, 245, 50, 18, 245, 49, 18, 245, 48, 18, 245, + 47, 18, 245, 46, 18, 245, 45, 18, 245, 44, 18, 245, 43, 18, 245, 42, 18, + 245, 41, 18, 245, 40, 18, 245, 39, 18, 245, 38, 18, 245, 37, 18, 245, 36, + 18, 245, 35, 18, 245, 34, 18, 245, 33, 18, 245, 32, 18, 245, 31, 18, 245, + 30, 18, 245, 29, 18, 245, 28, 18, 245, 27, 18, 245, 26, 18, 245, 25, 18, + 245, 24, 18, 245, 23, 18, 245, 22, 18, 245, 21, 18, 245, 20, 18, 245, 19, + 18, 245, 18, 18, 245, 17, 18, 245, 16, 18, 245, 15, 18, 245, 14, 18, 245, + 13, 18, 245, 12, 18, 245, 11, 18, 245, 10, 18, 245, 9, 18, 245, 8, 18, + 245, 7, 18, 245, 6, 18, 245, 5, 18, 245, 4, 18, 245, 3, 18, 245, 2, 18, + 245, 1, 18, 245, 0, 18, 244, 255, 18, 244, 254, 18, 244, 253, 18, 244, + 252, 18, 244, 251, 18, 244, 250, 18, 244, 249, 18, 244, 248, 18, 244, + 247, 18, 244, 246, 18, 244, 245, 18, 244, 244, 18, 244, 243, 18, 244, + 242, 18, 244, 241, 18, 244, 240, 18, 244, 239, 18, 244, 238, 18, 244, + 237, 18, 244, 236, 18, 244, 235, 18, 244, 234, 18, 244, 233, 18, 244, + 232, 18, 244, 231, 18, 244, 230, 18, 244, 229, 18, 244, 228, 18, 244, + 227, 18, 244, 226, 18, 244, 225, 18, 244, 224, 18, 244, 223, 18, 244, + 222, 18, 244, 221, 18, 244, 220, 18, 244, 219, 18, 244, 218, 18, 244, + 217, 18, 244, 216, 18, 244, 215, 18, 244, 214, 18, 244, 213, 18, 244, + 212, 18, 244, 211, 18, 244, 210, 18, 244, 209, 18, 244, 208, 18, 244, + 207, 18, 244, 206, 18, 244, 205, 18, 244, 204, 18, 244, 203, 18, 244, + 202, 18, 244, 201, 18, 244, 200, 18, 244, 199, 18, 244, 198, 18, 244, + 197, 18, 244, 196, 18, 244, 195, 18, 244, 194, 18, 244, 193, 18, 244, + 192, 18, 244, 191, 18, 244, 190, 18, 244, 189, 18, 244, 188, 18, 244, + 187, 18, 244, 186, 18, 244, 185, 18, 244, 184, 18, 244, 183, 18, 244, + 182, 18, 244, 181, 18, 244, 180, 18, 244, 179, 18, 244, 178, 18, 244, + 177, 18, 244, 176, 18, 244, 175, 18, 244, 174, 18, 244, 173, 18, 244, + 172, 18, 244, 171, 18, 244, 170, 18, 244, 169, 18, 244, 168, 18, 244, + 167, 18, 244, 166, 18, 244, 165, 18, 244, 164, 18, 244, 163, 18, 244, + 162, 18, 244, 161, 18, 244, 160, 18, 244, 159, 18, 244, 158, 18, 244, + 157, 18, 244, 156, 18, 244, 155, 18, 244, 154, 18, 244, 153, 18, 244, + 152, 18, 244, 151, 18, 244, 150, 18, 244, 149, 18, 244, 148, 18, 244, + 147, 18, 244, 146, 18, 244, 145, 18, 244, 144, 18, 244, 143, 18, 244, + 142, 18, 244, 141, 18, 244, 140, 18, 244, 139, 18, 244, 138, 18, 244, + 137, 18, 244, 136, 18, 244, 135, 18, 244, 134, 18, 244, 133, 18, 244, + 132, 18, 244, 131, 18, 244, 130, 18, 244, 129, 18, 244, 128, 18, 244, + 127, 18, 244, 126, 18, 244, 125, 18, 244, 124, 18, 244, 123, 18, 244, + 122, 18, 244, 121, 18, 244, 120, 18, 244, 119, 18, 244, 118, 18, 244, + 117, 18, 244, 116, 18, 244, 115, 18, 244, 114, 18, 244, 113, 18, 244, + 112, 18, 244, 111, 18, 244, 110, 18, 244, 109, 18, 244, 108, 18, 244, + 107, 18, 244, 106, 18, 244, 105, 18, 244, 104, 18, 244, 103, 18, 244, + 102, 18, 244, 101, 18, 244, 100, 18, 244, 99, 18, 244, 98, 18, 244, 97, + 18, 244, 96, 18, 244, 95, 18, 244, 94, 18, 244, 93, 18, 244, 92, 18, 244, + 91, 18, 244, 90, 18, 244, 89, 18, 244, 88, 18, 244, 87, 18, 244, 86, 18, + 244, 85, 18, 244, 84, 18, 244, 83, 18, 244, 82, 18, 244, 81, 18, 244, 80, + 18, 244, 79, 18, 244, 78, 18, 244, 77, 18, 244, 76, 18, 244, 75, 18, 244, + 74, 18, 244, 73, 18, 244, 72, 18, 244, 71, 18, 244, 70, 18, 244, 69, 18, + 244, 68, 18, 244, 67, 18, 244, 66, 18, 244, 65, 18, 244, 64, 18, 244, 63, + 18, 244, 62, 18, 244, 61, 18, 244, 60, 18, 244, 59, 18, 244, 58, 18, 244, + 57, 18, 244, 56, 18, 244, 55, 18, 244, 54, 18, 244, 53, 18, 244, 52, 18, + 244, 51, 18, 244, 50, 18, 244, 49, 18, 244, 48, 18, 244, 47, 18, 244, 46, + 18, 244, 45, 18, 244, 44, 18, 244, 43, 18, 244, 42, 18, 244, 41, 18, 244, + 40, 18, 244, 39, 18, 244, 38, 18, 244, 37, 18, 244, 36, 18, 244, 35, 18, + 244, 34, 18, 244, 33, 18, 244, 32, 18, 244, 31, 18, 244, 30, 18, 244, 29, + 18, 244, 28, 18, 244, 27, 18, 244, 26, 18, 244, 25, 18, 244, 24, 18, 244, + 23, 18, 244, 22, 18, 244, 21, 18, 244, 20, 18, 244, 19, 18, 244, 18, 18, + 244, 17, 18, 244, 16, 18, 244, 15, 18, 244, 14, 18, 244, 13, 18, 244, 12, + 18, 244, 11, 18, 244, 10, 18, 244, 9, 18, 244, 8, 18, 244, 7, 18, 244, 6, + 18, 244, 5, 18, 244, 4, 18, 244, 3, 18, 244, 2, 18, 244, 1, 18, 244, 0, + 18, 243, 255, 18, 243, 254, 18, 243, 253, 18, 243, 252, 18, 243, 251, 18, + 243, 250, 18, 243, 249, 18, 243, 248, 18, 243, 247, 18, 243, 246, 18, + 243, 245, 18, 243, 244, 18, 243, 243, 18, 243, 242, 18, 243, 241, 18, + 243, 240, 18, 243, 239, 18, 243, 238, 18, 243, 237, 18, 243, 236, 18, + 243, 235, 18, 243, 234, 18, 243, 233, 18, 243, 232, 18, 243, 231, 18, + 243, 230, 18, 243, 229, 18, 243, 228, 18, 243, 227, 18, 243, 226, 18, + 243, 225, 18, 243, 224, 18, 243, 223, 18, 243, 222, 18, 243, 221, 18, + 243, 220, 18, 243, 219, 18, 243, 218, 18, 243, 217, 18, 243, 216, 18, + 243, 215, 18, 243, 214, 18, 243, 213, 18, 243, 212, 18, 243, 211, 18, + 243, 210, 18, 243, 209, 18, 243, 208, 18, 243, 207, 18, 243, 206, 18, + 243, 205, 18, 243, 204, 18, 243, 203, 18, 243, 202, 18, 243, 201, 18, + 243, 200, 18, 243, 199, 18, 243, 198, 18, 243, 197, 18, 243, 196, 18, + 243, 195, 18, 243, 194, 18, 243, 193, 18, 243, 192, 18, 243, 191, 18, + 243, 190, 18, 243, 189, 18, 243, 188, 18, 243, 187, 18, 243, 186, 18, + 243, 185, 18, 243, 184, 18, 243, 183, 18, 243, 182, 18, 243, 181, 18, + 243, 180, 18, 243, 179, 18, 243, 178, 18, 243, 177, 18, 243, 176, 18, + 243, 175, 18, 243, 174, 18, 243, 173, 18, 243, 172, 18, 243, 171, 18, + 243, 170, 18, 243, 169, 18, 243, 168, 18, 243, 167, 18, 243, 166, 18, + 243, 165, 18, 243, 164, 18, 243, 163, 18, 243, 162, 18, 243, 161, 18, + 243, 160, 18, 243, 159, 18, 243, 158, 18, 243, 157, 18, 243, 156, 18, + 243, 155, 18, 243, 154, 18, 243, 153, 18, 243, 152, 18, 243, 151, 18, + 243, 150, 18, 243, 149, 18, 243, 148, 18, 243, 147, 18, 243, 146, 18, + 243, 145, 18, 243, 144, 18, 243, 143, 18, 243, 142, 18, 243, 141, 18, + 243, 140, 18, 243, 139, 18, 243, 138, 18, 243, 137, 18, 243, 136, 18, + 243, 135, 18, 243, 134, 18, 243, 133, 18, 243, 132, 18, 243, 131, 18, + 243, 130, 18, 243, 129, 18, 243, 128, 18, 243, 127, 18, 243, 126, 18, + 243, 125, 18, 243, 124, 18, 243, 123, 18, 243, 122, 18, 243, 121, 18, + 243, 120, 18, 243, 119, 18, 243, 118, 18, 243, 117, 18, 243, 116, 18, + 243, 115, 18, 243, 114, 18, 243, 113, 18, 243, 112, 18, 243, 111, 18, + 243, 110, 18, 243, 109, 18, 243, 108, 18, 243, 107, 18, 243, 106, 18, + 243, 105, 18, 243, 104, 18, 243, 103, 18, 243, 102, 18, 243, 101, 18, + 243, 100, 18, 243, 99, 18, 243, 98, 18, 243, 97, 18, 243, 96, 18, 243, + 95, 18, 243, 94, 18, 243, 93, 18, 243, 92, 18, 243, 91, 18, 243, 90, 18, + 243, 89, 18, 243, 88, 18, 243, 87, 18, 243, 86, 18, 243, 85, 18, 243, 84, + 18, 243, 83, 18, 243, 82, 18, 243, 81, 18, 243, 80, 18, 243, 79, 18, 243, + 78, 18, 243, 77, 18, 243, 76, 18, 243, 75, 69, 1, 250, 234, 72, 177, 1, + 250, 234, 200, 51, 104, 1, 234, 247, 104, 1, 200, 195, 104, 1, 216, 226, + 104, 1, 207, 83, 104, 1, 238, 5, 104, 1, 227, 118, 104, 1, 156, 104, 1, + 250, 103, 104, 1, 242, 153, 104, 1, 203, 168, 104, 1, 236, 156, 104, 1, + 146, 104, 1, 216, 227, 220, 214, 104, 1, 242, 154, 212, 122, 104, 1, 238, + 6, 220, 214, 104, 1, 227, 119, 223, 243, 104, 1, 214, 33, 212, 122, 104, + 1, 206, 124, 104, 1, 209, 62, 241, 101, 104, 1, 241, 101, 104, 1, 226, + 110, 104, 1, 209, 62, 227, 251, 104, 1, 234, 40, 104, 1, 224, 224, 104, + 1, 213, 94, 104, 1, 223, 243, 104, 1, 220, 214, 104, 1, 227, 251, 104, 1, + 212, 122, 104, 1, 223, 244, 220, 214, 104, 1, 220, 215, 223, 243, 104, 1, + 227, 252, 223, 243, 104, 1, 212, 123, 227, 251, 104, 1, 223, 244, 3, 240, + 182, 104, 1, 220, 215, 3, 240, 182, 104, 1, 227, 252, 3, 240, 182, 104, + 1, 227, 252, 3, 190, 228, 74, 26, 56, 104, 1, 212, 123, 3, 240, 182, 104, + 1, 212, 123, 3, 73, 57, 104, 1, 223, 244, 212, 122, 104, 1, 220, 215, + 212, 122, 104, 1, 227, 252, 212, 122, 104, 1, 212, 123, 212, 122, 104, 1, + 223, 244, 220, 215, 212, 122, 104, 1, 220, 215, 223, 244, 212, 122, 104, + 1, 227, 252, 223, 244, 212, 122, 104, 1, 212, 123, 227, 252, 212, 122, + 104, 1, 227, 252, 212, 123, 3, 240, 182, 104, 1, 227, 252, 220, 214, 104, + 1, 227, 252, 220, 215, 212, 122, 104, 1, 212, 123, 207, 83, 104, 1, 212, + 123, 207, 84, 146, 104, 1, 212, 123, 216, 226, 104, 1, 212, 123, 216, + 227, 146, 104, 1, 207, 84, 212, 122, 104, 1, 207, 84, 214, 33, 212, 122, + 104, 1, 201, 147, 104, 1, 201, 41, 104, 1, 201, 148, 146, 104, 1, 212, + 123, 220, 214, 104, 1, 212, 123, 223, 243, 104, 1, 227, 119, 214, 33, + 212, 122, 104, 1, 236, 157, 214, 33, 212, 122, 104, 1, 212, 123, 227, + 118, 104, 1, 212, 123, 227, 119, 146, 104, 1, 62, 104, 1, 209, 62, 216, + 238, 104, 1, 217, 146, 104, 1, 74, 104, 1, 251, 29, 104, 1, 70, 104, 1, + 72, 104, 1, 228, 178, 104, 1, 209, 250, 70, 104, 1, 204, 23, 104, 1, 238, + 255, 104, 1, 209, 62, 238, 241, 104, 1, 212, 239, 70, 104, 1, 209, 62, + 238, 255, 104, 1, 168, 70, 104, 1, 200, 51, 104, 1, 66, 104, 1, 238, 69, + 104, 1, 200, 146, 104, 1, 108, 220, 214, 104, 1, 168, 66, 104, 1, 212, + 239, 66, 104, 1, 204, 25, 104, 1, 209, 62, 66, 104, 1, 217, 60, 104, 1, + 216, 238, 104, 1, 217, 3, 104, 1, 201, 114, 104, 1, 201, 0, 104, 1, 201, + 31, 104, 1, 201, 55, 104, 1, 200, 230, 104, 1, 220, 123, 66, 104, 1, 220, + 123, 74, 104, 1, 220, 123, 70, 104, 1, 220, 123, 62, 104, 1, 216, 16, + 251, 85, 104, 1, 216, 16, 251, 101, 104, 1, 209, 62, 238, 179, 104, 1, + 209, 62, 251, 85, 104, 1, 209, 62, 217, 78, 104, 1, 109, 223, 243, 104, + 251, 200, 49, 233, 177, 211, 197, 104, 251, 200, 221, 206, 233, 177, 211, + 197, 104, 251, 200, 51, 233, 177, 211, 197, 104, 251, 200, 128, 83, 211, + 197, 104, 251, 200, 221, 206, 83, 211, 197, 104, 251, 200, 122, 83, 211, + 197, 104, 251, 200, 250, 145, 211, 197, 104, 251, 200, 250, 145, 225, 19, + 211, 197, 104, 251, 200, 250, 145, 206, 240, 104, 251, 200, 250, 145, + 207, 6, 104, 251, 200, 250, 145, 197, 117, 104, 251, 200, 250, 145, 233, + 19, 117, 104, 251, 200, 250, 145, 206, 241, 117, 104, 251, 200, 122, 169, + 104, 251, 200, 122, 206, 1, 169, 104, 251, 200, 122, 235, 73, 104, 251, + 200, 122, 168, 235, 73, 104, 251, 200, 122, 240, 182, 104, 251, 200, 122, + 246, 155, 104, 251, 200, 122, 224, 176, 104, 251, 200, 122, 201, 77, 104, + 251, 200, 122, 203, 42, 104, 251, 200, 128, 169, 104, 251, 200, 128, 206, + 1, 169, 104, 251, 200, 128, 235, 73, 104, 251, 200, 128, 168, 235, 73, + 104, 251, 200, 128, 240, 182, 104, 251, 200, 128, 246, 155, 104, 251, + 200, 128, 224, 176, 104, 251, 200, 128, 201, 77, 104, 251, 200, 128, 203, + 42, 104, 251, 200, 128, 48, 104, 2, 163, 3, 242, 234, 104, 206, 82, 1, + 211, 175, 104, 53, 81, 104, 214, 212, 246, 220, 236, 183, 208, 76, 209, + 237, 236, 241, 1, 216, 244, 209, 237, 236, 241, 243, 40, 216, 244, 209, + 237, 236, 241, 127, 208, 90, 209, 237, 236, 241, 115, 208, 90, 61, 32, + 16, 214, 228, 61, 32, 16, 241, 246, 61, 32, 16, 216, 20, 61, 32, 16, 216, + 234, 238, 213, 61, 32, 16, 216, 234, 241, 14, 61, 32, 16, 203, 77, 238, + 213, 61, 32, 16, 203, 77, 241, 14, 61, 32, 16, 227, 28, 61, 32, 16, 207, + 100, 61, 32, 16, 216, 122, 61, 32, 16, 199, 217, 61, 32, 16, 199, 218, + 241, 14, 61, 32, 16, 226, 32, 61, 32, 16, 251, 24, 238, 213, 61, 32, 16, + 238, 37, 238, 213, 61, 32, 16, 206, 177, 61, 32, 16, 226, 239, 61, 32, + 16, 251, 14, 61, 32, 16, 251, 15, 241, 14, 61, 32, 16, 207, 107, 61, 32, + 16, 206, 64, 61, 32, 16, 217, 89, 250, 232, 61, 32, 16, 235, 100, 250, + 232, 61, 32, 16, 214, 227, 61, 32, 16, 247, 28, 61, 32, 16, 203, 66, 61, + 32, 16, 228, 17, 250, 232, 61, 32, 16, 226, 241, 250, 232, 61, 32, 16, + 226, 240, 250, 232, 61, 32, 16, 211, 236, 61, 32, 16, 216, 112, 61, 32, + 16, 208, 99, 251, 17, 61, 32, 16, 216, 233, 250, 232, 61, 32, 16, 203, + 76, 250, 232, 61, 32, 16, 251, 18, 250, 232, 61, 32, 16, 251, 12, 61, 32, + 16, 226, 100, 61, 32, 16, 213, 101, 61, 32, 16, 215, 202, 250, 232, 61, + 32, 16, 205, 230, 61, 32, 16, 251, 82, 61, 32, 16, 211, 178, 61, 32, 16, + 207, 111, 250, 232, 61, 32, 16, 207, 111, 222, 21, 208, 97, 61, 32, 16, + 216, 228, 250, 232, 61, 32, 16, 206, 100, 61, 32, 16, 225, 6, 61, 32, 16, + 239, 96, 61, 32, 16, 205, 100, 61, 32, 16, 206, 148, 61, 32, 16, 226, 35, + 61, 32, 16, 251, 24, 238, 37, 220, 20, 61, 32, 16, 236, 191, 250, 232, + 61, 32, 16, 228, 130, 61, 32, 16, 205, 69, 250, 232, 61, 32, 16, 227, 31, + 205, 68, 61, 32, 16, 216, 49, 61, 32, 16, 214, 232, 61, 32, 16, 226, 69, + 61, 32, 16, 246, 204, 250, 232, 61, 32, 16, 213, 209, 61, 32, 16, 216, + 125, 250, 232, 61, 32, 16, 216, 123, 250, 232, 61, 32, 16, 232, 229, 61, + 32, 16, 220, 133, 61, 32, 16, 215, 254, 61, 32, 16, 226, 70, 251, 119, + 61, 32, 16, 205, 69, 251, 119, 61, 32, 16, 208, 70, 61, 32, 16, 235, 60, + 61, 32, 16, 228, 17, 220, 20, 61, 32, 16, 217, 89, 220, 20, 61, 32, 16, + 216, 234, 220, 20, 61, 32, 16, 215, 253, 61, 32, 16, 226, 54, 61, 32, 16, + 215, 252, 61, 32, 16, 226, 34, 61, 32, 16, 216, 50, 220, 20, 61, 32, 16, + 226, 240, 220, 21, 251, 55, 61, 32, 16, 226, 241, 220, 21, 251, 55, 61, + 32, 16, 199, 215, 61, 32, 16, 251, 15, 220, 20, 61, 32, 16, 251, 16, 207, + 108, 220, 20, 61, 32, 16, 199, 216, 61, 32, 16, 226, 33, 61, 32, 16, 238, + 208, 61, 32, 16, 247, 29, 61, 32, 16, 221, 177, 228, 16, 61, 32, 16, 203, + 77, 220, 20, 61, 32, 16, 215, 202, 220, 20, 61, 32, 16, 214, 233, 220, + 20, 61, 32, 16, 217, 85, 61, 32, 16, 251, 42, 61, 32, 16, 223, 254, 61, + 32, 16, 216, 123, 220, 20, 61, 32, 16, 216, 125, 220, 20, 61, 32, 16, + 238, 75, 216, 124, 61, 32, 16, 225, 197, 61, 32, 16, 251, 43, 61, 32, 16, + 205, 69, 220, 20, 61, 32, 16, 238, 211, 61, 32, 16, 207, 111, 220, 20, + 61, 32, 16, 207, 101, 61, 32, 16, 246, 204, 220, 20, 61, 32, 16, 238, + 130, 61, 32, 16, 211, 179, 220, 20, 61, 32, 16, 200, 162, 226, 100, 61, + 32, 16, 205, 66, 61, 32, 16, 214, 234, 61, 32, 16, 205, 70, 61, 32, 16, + 205, 67, 61, 32, 16, 214, 231, 61, 32, 16, 205, 65, 61, 32, 16, 214, 230, + 61, 32, 16, 235, 99, 61, 32, 16, 250, 224, 61, 32, 16, 238, 75, 250, 224, + 61, 32, 16, 216, 228, 220, 20, 61, 32, 16, 206, 99, 238, 88, 61, 32, 16, + 206, 99, 238, 36, 61, 32, 16, 206, 101, 251, 19, 61, 32, 16, 206, 93, + 227, 83, 251, 11, 61, 32, 16, 227, 30, 61, 32, 16, 238, 167, 61, 32, 16, + 200, 13, 227, 27, 61, 32, 16, 200, 13, 251, 55, 61, 32, 16, 208, 98, 61, + 32, 16, 226, 101, 251, 55, 61, 32, 16, 241, 15, 250, 232, 61, 32, 16, + 226, 36, 250, 232, 61, 32, 16, 226, 36, 251, 119, 61, 32, 16, 226, 36, + 220, 20, 61, 32, 16, 251, 18, 220, 20, 61, 32, 16, 251, 20, 61, 32, 16, + 241, 14, 61, 32, 16, 205, 81, 61, 32, 16, 206, 139, 61, 32, 16, 226, 58, + 61, 32, 16, 225, 11, 238, 160, 246, 194, 61, 32, 16, 225, 11, 239, 97, + 246, 195, 61, 32, 16, 225, 11, 205, 84, 246, 195, 61, 32, 16, 225, 11, + 206, 150, 246, 195, 61, 32, 16, 225, 11, 228, 125, 246, 194, 61, 32, 16, + 235, 100, 220, 21, 251, 55, 61, 32, 16, 235, 100, 216, 113, 250, 220, 61, + 32, 16, 235, 100, 216, 113, 241, 105, 61, 32, 16, 241, 39, 61, 32, 16, + 241, 40, 216, 113, 250, 221, 227, 27, 61, 32, 16, 241, 40, 216, 113, 250, + 221, 251, 55, 61, 32, 16, 241, 40, 216, 113, 241, 105, 61, 32, 16, 205, + 89, 61, 32, 16, 250, 225, 61, 32, 16, 228, 132, 61, 32, 16, 241, 62, 61, + 32, 16, 251, 187, 215, 89, 250, 226, 61, 32, 16, 251, 187, 250, 223, 61, + 32, 16, 251, 187, 250, 226, 61, 32, 16, 251, 187, 222, 15, 61, 32, 16, + 251, 187, 222, 26, 61, 32, 16, 251, 187, 235, 101, 61, 32, 16, 251, 187, + 235, 98, 61, 32, 16, 251, 187, 215, 89, 235, 101, 61, 32, 16, 222, 140, + 214, 240, 232, 227, 61, 32, 16, 222, 140, 251, 121, 214, 240, 232, 227, + 61, 32, 16, 222, 140, 241, 104, 232, 227, 61, 32, 16, 222, 140, 251, 121, + 241, 104, 232, 227, 61, 32, 16, 222, 140, 205, 76, 232, 227, 61, 32, 16, + 222, 140, 205, 90, 61, 32, 16, 222, 140, 206, 144, 232, 227, 61, 32, 16, + 222, 140, 206, 144, 225, 15, 232, 227, 61, 32, 16, 222, 140, 225, 15, + 232, 227, 61, 32, 16, 222, 140, 215, 132, 232, 227, 61, 32, 16, 228, 24, + 206, 170, 232, 228, 61, 32, 16, 251, 16, 206, 170, 232, 228, 61, 32, 16, + 237, 167, 206, 141, 61, 32, 16, 237, 167, 221, 98, 61, 32, 16, 237, 167, + 241, 45, 61, 32, 16, 222, 140, 203, 70, 232, 227, 61, 32, 16, 222, 140, + 214, 239, 232, 227, 61, 32, 16, 222, 140, 215, 132, 206, 144, 232, 227, + 61, 32, 16, 235, 95, 220, 215, 251, 19, 61, 32, 16, 235, 95, 220, 215, + 241, 13, 61, 32, 16, 238, 177, 227, 83, 236, 191, 202, 174, 61, 32, 16, + 228, 131, 61, 32, 16, 228, 129, 61, 32, 16, 236, 191, 250, 233, 241, 103, + 232, 226, 61, 32, 16, 236, 191, 241, 60, 172, 61, 32, 16, 236, 191, 241, + 60, 220, 133, 61, 32, 16, 236, 191, 220, 128, 232, 227, 61, 32, 16, 236, + 191, 241, 60, 241, 76, 61, 32, 16, 236, 191, 209, 82, 241, 59, 241, 76, + 61, 32, 16, 236, 191, 241, 60, 227, 8, 61, 32, 16, 236, 191, 241, 60, + 199, 14, 61, 32, 16, 236, 191, 241, 60, 219, 151, 227, 27, 61, 32, 16, + 236, 191, 241, 60, 219, 151, 251, 55, 61, 32, 16, 236, 191, 222, 186, + 246, 196, 241, 45, 61, 32, 16, 236, 191, 222, 186, 246, 196, 221, 98, 61, + 32, 16, 237, 113, 209, 82, 246, 196, 203, 69, 61, 32, 16, 236, 191, 209, + 82, 246, 196, 207, 112, 61, 32, 16, 236, 191, 220, 23, 61, 32, 16, 246, + 197, 198, 238, 61, 32, 16, 246, 197, 226, 99, 61, 32, 16, 246, 197, 208, + 235, 61, 32, 16, 236, 191, 233, 19, 200, 12, 206, 145, 61, 32, 16, 236, + 191, 238, 178, 251, 44, 61, 32, 16, 200, 12, 205, 77, 61, 32, 16, 241, + 53, 205, 77, 61, 32, 16, 241, 53, 206, 145, 61, 32, 16, 241, 53, 251, 21, + 239, 97, 240, 203, 61, 32, 16, 241, 53, 221, 96, 206, 149, 240, 203, 61, + 32, 16, 241, 53, 241, 36, 238, 49, 240, 203, 61, 32, 16, 241, 53, 205, + 87, 217, 95, 240, 203, 61, 32, 16, 200, 12, 251, 21, 239, 97, 240, 203, + 61, 32, 16, 200, 12, 221, 96, 206, 149, 240, 203, 61, 32, 16, 200, 12, + 241, 36, 238, 49, 240, 203, 61, 32, 16, 200, 12, 205, 87, 217, 95, 240, + 203, 61, 32, 16, 235, 255, 241, 52, 61, 32, 16, 235, 255, 200, 11, 61, + 32, 16, 241, 61, 251, 21, 221, 178, 61, 32, 16, 241, 61, 251, 21, 222, + 55, 61, 32, 16, 241, 61, 241, 14, 61, 32, 16, 241, 61, 206, 91, 61, 32, + 16, 209, 149, 206, 91, 61, 32, 16, 209, 149, 206, 92, 240, 254, 61, 32, + 16, 209, 149, 206, 92, 205, 78, 61, 32, 16, 209, 149, 206, 92, 206, 137, + 61, 32, 16, 209, 149, 250, 196, 61, 32, 16, 209, 149, 250, 197, 240, 254, + 61, 32, 16, 209, 149, 250, 197, 205, 78, 61, 32, 16, 209, 149, 250, 197, + 206, 137, 61, 32, 16, 241, 37, 235, 236, 61, 32, 16, 241, 44, 217, 3, 61, + 32, 16, 208, 86, 61, 32, 16, 250, 217, 172, 61, 32, 16, 250, 217, 202, + 174, 61, 32, 16, 250, 217, 236, 89, 61, 32, 16, 250, 217, 241, 76, 61, + 32, 16, 250, 217, 227, 8, 61, 32, 16, 250, 217, 199, 14, 61, 32, 16, 250, + 217, 219, 150, 61, 32, 16, 226, 240, 220, 21, 222, 25, 61, 32, 16, 226, + 241, 220, 21, 222, 25, 61, 32, 16, 226, 240, 220, 21, 227, 27, 61, 32, + 16, 226, 241, 220, 21, 227, 27, 61, 32, 16, 226, 101, 227, 27, 61, 32, + 16, 235, 100, 220, 21, 227, 27, 32, 16, 209, 139, 249, 72, 32, 16, 53, + 249, 72, 32, 16, 47, 249, 72, 32, 16, 213, 106, 47, 249, 72, 32, 16, 241, + 243, 249, 72, 32, 16, 209, 250, 249, 72, 32, 16, 49, 213, 133, 54, 32, + 16, 51, 213, 133, 54, 32, 16, 213, 133, 240, 180, 32, 16, 242, 30, 211, + 182, 32, 16, 242, 59, 247, 141, 32, 16, 211, 182, 32, 16, 246, 87, 32, + 16, 213, 131, 237, 101, 32, 16, 213, 131, 237, 100, 32, 16, 213, 131, + 237, 99, 32, 16, 237, 122, 32, 16, 237, 123, 57, 32, 16, 248, 59, 81, 32, + 16, 247, 180, 32, 16, 248, 71, 32, 16, 159, 32, 16, 217, 73, 208, 117, + 32, 16, 204, 140, 208, 117, 32, 16, 206, 42, 208, 117, 32, 16, 236, 228, + 208, 117, 32, 16, 237, 60, 208, 117, 32, 16, 209, 105, 208, 117, 32, 16, + 209, 103, 236, 208, 32, 16, 236, 226, 236, 208, 32, 16, 236, 157, 246, + 124, 32, 16, 236, 157, 246, 125, 217, 5, 251, 110, 32, 16, 236, 157, 246, + 125, 217, 5, 249, 57, 32, 16, 247, 224, 246, 124, 32, 16, 238, 6, 246, + 124, 32, 16, 238, 6, 246, 125, 217, 5, 251, 110, 32, 16, 238, 6, 246, + 125, 217, 5, 249, 57, 32, 16, 239, 143, 246, 123, 32, 16, 239, 143, 246, + 122, 32, 16, 221, 21, 222, 75, 213, 117, 32, 16, 53, 210, 78, 32, 16, 53, + 237, 44, 32, 16, 237, 45, 203, 228, 32, 16, 237, 45, 239, 167, 32, 16, + 220, 117, 203, 228, 32, 16, 220, 117, 239, 167, 32, 16, 210, 79, 203, + 228, 32, 16, 210, 79, 239, 167, 32, 16, 214, 88, 150, 210, 78, 32, 16, + 214, 88, 150, 237, 44, 32, 16, 246, 67, 205, 234, 32, 16, 242, 180, 205, + 234, 32, 16, 217, 5, 251, 110, 32, 16, 217, 5, 249, 57, 32, 16, 214, 69, + 251, 110, 32, 16, 214, 69, 249, 57, 32, 16, 221, 24, 213, 117, 32, 16, + 201, 32, 213, 117, 32, 16, 167, 213, 117, 32, 16, 214, 88, 213, 117, 32, + 16, 238, 228, 213, 117, 32, 16, 209, 99, 213, 117, 32, 16, 206, 65, 213, + 117, 32, 16, 209, 91, 213, 117, 32, 16, 112, 233, 83, 204, 157, 213, 117, + 32, 16, 200, 196, 218, 205, 32, 16, 93, 218, 205, 32, 16, 246, 156, 200, + 196, 218, 205, 32, 16, 52, 218, 206, 201, 34, 32, 16, 52, 218, 206, 248, + 144, 32, 16, 205, 99, 218, 206, 115, 201, 34, 32, 16, 205, 99, 218, 206, + 115, 248, 144, 32, 16, 205, 99, 218, 206, 49, 201, 34, 32, 16, 205, 99, + 218, 206, 49, 248, 144, 32, 16, 205, 99, 218, 206, 51, 201, 34, 32, 16, + 205, 99, 218, 206, 51, 248, 144, 32, 16, 205, 99, 218, 206, 127, 201, 34, + 32, 16, 205, 99, 218, 206, 127, 248, 144, 32, 16, 205, 99, 218, 206, 115, + 51, 201, 34, 32, 16, 205, 99, 218, 206, 115, 51, 248, 144, 32, 16, 221, + 82, 218, 206, 201, 34, 32, 16, 221, 82, 218, 206, 248, 144, 32, 16, 205, + 96, 218, 206, 127, 201, 34, 32, 16, 205, 96, 218, 206, 127, 248, 144, 32, + 16, 216, 116, 218, 205, 32, 16, 202, 186, 218, 205, 32, 16, 218, 206, + 248, 144, 32, 16, 218, 98, 218, 205, 32, 16, 246, 94, 218, 206, 201, 34, + 32, 16, 246, 94, 218, 206, 248, 144, 32, 16, 248, 57, 32, 16, 201, 32, + 218, 209, 32, 16, 167, 218, 209, 32, 16, 214, 88, 218, 209, 32, 16, 238, + 228, 218, 209, 32, 16, 209, 99, 218, 209, 32, 16, 206, 65, 218, 209, 32, + 16, 209, 91, 218, 209, 32, 16, 112, 233, 83, 204, 157, 218, 209, 32, 16, + 38, 208, 92, 32, 16, 38, 208, 200, 208, 92, 32, 16, 38, 205, 107, 32, 16, + 38, 205, 106, 32, 16, 38, 205, 105, 32, 16, 237, 84, 205, 107, 32, 16, + 237, 84, 205, 106, 32, 16, 237, 84, 205, 105, 32, 16, 38, 250, 136, 240, + 182, 32, 16, 38, 237, 52, 32, 16, 38, 237, 51, 32, 16, 38, 237, 50, 32, + 16, 38, 237, 49, 32, 16, 38, 237, 48, 32, 16, 248, 244, 249, 5, 32, 16, + 238, 171, 249, 5, 32, 16, 248, 244, 206, 7, 32, 16, 238, 171, 206, 7, 32, + 16, 248, 244, 209, 54, 32, 16, 238, 171, 209, 54, 32, 16, 248, 244, 215, + 211, 32, 16, 238, 171, 215, 211, 32, 16, 38, 251, 251, 32, 16, 38, 208, + 120, 32, 16, 38, 206, 154, 32, 16, 38, 208, 121, 32, 16, 38, 222, 154, + 32, 16, 38, 222, 153, 32, 16, 38, 251, 250, 32, 16, 38, 224, 61, 32, 16, + 250, 208, 203, 228, 32, 16, 250, 208, 239, 167, 32, 16, 38, 240, 197, 32, + 16, 38, 213, 23, 32, 16, 38, 237, 33, 32, 16, 38, 209, 50, 32, 16, 38, + 248, 222, 32, 16, 38, 53, 205, 163, 32, 16, 38, 205, 83, 205, 163, 32, + 16, 213, 28, 32, 16, 208, 14, 32, 16, 199, 157, 32, 16, 215, 203, 32, 16, + 222, 6, 32, 16, 236, 238, 32, 16, 242, 245, 32, 16, 241, 162, 32, 16, + 235, 90, 218, 210, 209, 75, 32, 16, 235, 90, 218, 210, 218, 242, 209, 75, + 32, 16, 205, 133, 32, 16, 204, 186, 32, 16, 228, 50, 204, 186, 32, 16, + 204, 187, 209, 75, 32, 16, 204, 187, 203, 228, 32, 16, 217, 22, 208, 46, + 32, 16, 217, 22, 208, 43, 32, 16, 217, 22, 208, 42, 32, 16, 217, 22, 208, + 41, 32, 16, 217, 22, 208, 40, 32, 16, 217, 22, 208, 39, 32, 16, 217, 22, + 208, 38, 32, 16, 217, 22, 208, 37, 32, 16, 217, 22, 208, 36, 32, 16, 217, + 22, 208, 45, 32, 16, 217, 22, 208, 44, 32, 16, 234, 149, 32, 16, 220, 32, + 32, 16, 238, 171, 76, 208, 82, 32, 16, 241, 155, 209, 75, 32, 16, 38, + 127, 248, 85, 32, 16, 38, 115, 248, 85, 32, 16, 38, 234, 162, 32, 16, 38, + 209, 40, 215, 136, 32, 16, 216, 66, 81, 32, 16, 216, 66, 115, 81, 32, 16, + 167, 216, 66, 81, 32, 16, 235, 125, 203, 228, 32, 16, 235, 125, 239, 167, + 32, 16, 3, 237, 83, 32, 16, 242, 13, 32, 16, 242, 14, 251, 124, 32, 16, + 222, 121, 32, 16, 224, 80, 32, 16, 248, 54, 32, 16, 210, 171, 201, 34, + 32, 16, 210, 171, 248, 144, 32, 16, 221, 160, 32, 16, 221, 161, 248, 144, + 32, 16, 210, 165, 201, 34, 32, 16, 210, 165, 248, 144, 32, 16, 236, 174, + 201, 34, 32, 16, 236, 174, 248, 144, 32, 16, 224, 81, 216, 25, 213, 117, + 32, 16, 224, 81, 228, 122, 213, 117, 32, 16, 248, 55, 213, 117, 32, 16, + 210, 171, 213, 117, 32, 16, 221, 161, 213, 117, 32, 16, 210, 165, 213, + 117, 32, 16, 206, 168, 216, 23, 242, 207, 214, 249, 216, 24, 32, 16, 206, + 168, 216, 23, 242, 207, 214, 249, 228, 121, 32, 16, 206, 168, 216, 23, + 242, 207, 214, 249, 216, 25, 241, 24, 32, 16, 206, 168, 228, 120, 242, + 207, 214, 249, 216, 24, 32, 16, 206, 168, 228, 120, 242, 207, 214, 249, + 228, 121, 32, 16, 206, 168, 228, 120, 242, 207, 214, 249, 228, 122, 241, + 24, 32, 16, 206, 168, 228, 120, 242, 207, 214, 249, 228, 122, 241, 23, + 32, 16, 206, 168, 228, 120, 242, 207, 214, 249, 228, 122, 241, 22, 32, + 16, 242, 237, 32, 16, 235, 63, 247, 224, 246, 124, 32, 16, 235, 63, 238, + 6, 246, 124, 32, 16, 52, 250, 103, 32, 16, 202, 207, 32, 16, 215, 103, + 32, 16, 246, 115, 32, 16, 211, 226, 32, 16, 246, 119, 32, 16, 205, 151, + 32, 16, 215, 72, 32, 16, 215, 73, 237, 36, 32, 16, 211, 227, 237, 36, 32, + 16, 205, 152, 213, 114, 32, 16, 216, 6, 208, 5, 32, 16, 226, 153, 247, + 224, 246, 124, 32, 16, 226, 153, 238, 171, 76, 215, 196, 32, 16, 226, + 153, 47, 218, 209, 32, 16, 226, 153, 213, 182, 81, 32, 16, 226, 153, 201, + 32, 218, 209, 32, 16, 226, 153, 167, 218, 209, 32, 16, 226, 153, 214, 88, + 218, 210, 208, 93, 239, 167, 32, 16, 226, 153, 214, 88, 218, 210, 208, + 93, 203, 228, 32, 16, 226, 153, 238, 228, 218, 210, 208, 93, 239, 167, + 32, 16, 226, 153, 238, 228, 218, 210, 208, 93, 203, 228, 32, 16, 226, + 153, 237, 45, 54, 31, 202, 192, 218, 213, 207, 162, 31, 202, 192, 218, + 213, 207, 151, 31, 202, 192, 218, 213, 207, 141, 31, 202, 192, 218, 213, + 207, 134, 31, 202, 192, 218, 213, 207, 126, 31, 202, 192, 218, 213, 207, + 120, 31, 202, 192, 218, 213, 207, 119, 31, 202, 192, 218, 213, 207, 118, + 31, 202, 192, 218, 213, 207, 117, 31, 202, 192, 218, 213, 207, 161, 31, + 202, 192, 218, 213, 207, 160, 31, 202, 192, 218, 213, 207, 159, 31, 202, + 192, 218, 213, 207, 158, 31, 202, 192, 218, 213, 207, 157, 31, 202, 192, + 218, 213, 207, 156, 31, 202, 192, 218, 213, 207, 155, 31, 202, 192, 218, + 213, 207, 154, 31, 202, 192, 218, 213, 207, 153, 31, 202, 192, 218, 213, + 207, 152, 31, 202, 192, 218, 213, 207, 150, 31, 202, 192, 218, 213, 207, + 149, 31, 202, 192, 218, 213, 207, 148, 31, 202, 192, 218, 213, 207, 147, + 31, 202, 192, 218, 213, 207, 146, 31, 202, 192, 218, 213, 207, 125, 31, + 202, 192, 218, 213, 207, 124, 31, 202, 192, 218, 213, 207, 123, 31, 202, + 192, 218, 213, 207, 122, 31, 202, 192, 218, 213, 207, 121, 31, 228, 72, + 218, 213, 207, 162, 31, 228, 72, 218, 213, 207, 151, 31, 228, 72, 218, + 213, 207, 134, 31, 228, 72, 218, 213, 207, 126, 31, 228, 72, 218, 213, + 207, 119, 31, 228, 72, 218, 213, 207, 118, 31, 228, 72, 218, 213, 207, + 160, 31, 228, 72, 218, 213, 207, 159, 31, 228, 72, 218, 213, 207, 158, + 31, 228, 72, 218, 213, 207, 157, 31, 228, 72, 218, 213, 207, 154, 31, + 228, 72, 218, 213, 207, 153, 31, 228, 72, 218, 213, 207, 152, 31, 228, + 72, 218, 213, 207, 147, 31, 228, 72, 218, 213, 207, 146, 31, 228, 72, + 218, 213, 207, 145, 31, 228, 72, 218, 213, 207, 144, 31, 228, 72, 218, + 213, 207, 143, 31, 228, 72, 218, 213, 207, 142, 31, 228, 72, 218, 213, + 207, 140, 31, 228, 72, 218, 213, 207, 139, 31, 228, 72, 218, 213, 207, + 138, 31, 228, 72, 218, 213, 207, 137, 31, 228, 72, 218, 213, 207, 136, + 31, 228, 72, 218, 213, 207, 135, 31, 228, 72, 218, 213, 207, 133, 31, + 228, 72, 218, 213, 207, 132, 31, 228, 72, 218, 213, 207, 131, 31, 228, + 72, 218, 213, 207, 130, 31, 228, 72, 218, 213, 207, 129, 31, 228, 72, + 218, 213, 207, 128, 31, 228, 72, 218, 213, 207, 127, 31, 228, 72, 218, + 213, 207, 125, 31, 228, 72, 218, 213, 207, 124, 31, 228, 72, 218, 213, + 207, 123, 31, 228, 72, 218, 213, 207, 122, 31, 228, 72, 218, 213, 207, + 121, 38, 31, 32, 205, 79, 38, 31, 32, 206, 138, 38, 31, 32, 216, 35, 31, + 32, 225, 10, 221, 97, 36, 239, 17, 241, 38, 36, 234, 122, 239, 17, 241, + 38, 36, 233, 87, 239, 17, 241, 38, 36, 239, 16, 234, 123, 241, 38, 36, + 239, 16, 233, 86, 241, 38, 36, 239, 17, 206, 140, 36, 247, 55, 206, 140, + 36, 236, 183, 246, 155, 206, 140, 36, 221, 152, 206, 140, 36, 249, 67, + 206, 140, 36, 227, 2, 209, 53, 206, 140, 36, 243, 35, 206, 140, 36, 250, + 183, 206, 140, 36, 217, 39, 206, 140, 36, 248, 64, 216, 254, 206, 140, + 36, 241, 157, 217, 34, 240, 246, 206, 140, 36, 240, 243, 206, 140, 36, + 199, 223, 206, 140, 36, 228, 108, 206, 140, 36, 216, 45, 206, 140, 36, + 213, 189, 206, 140, 36, 243, 47, 206, 140, 36, 233, 198, 249, 129, 206, + 140, 36, 201, 106, 206, 140, 36, 237, 8, 206, 140, 36, 251, 224, 206, + 140, 36, 213, 146, 206, 140, 36, 213, 121, 206, 140, 36, 239, 15, 206, + 140, 36, 227, 150, 206, 140, 36, 243, 42, 206, 140, 36, 238, 170, 206, + 140, 36, 239, 109, 206, 140, 36, 247, 24, 206, 140, 36, 241, 167, 206, + 140, 36, 27, 213, 120, 206, 140, 36, 216, 202, 206, 140, 36, 225, 14, + 206, 140, 36, 246, 108, 206, 140, 36, 226, 143, 206, 140, 36, 236, 39, + 206, 140, 36, 208, 58, 206, 140, 36, 214, 201, 206, 140, 36, 236, 182, + 206, 140, 36, 213, 122, 206, 140, 36, 225, 53, 217, 34, 221, 132, 206, + 140, 36, 213, 118, 206, 140, 36, 235, 110, 205, 186, 222, 59, 206, 140, + 36, 238, 172, 206, 140, 36, 208, 71, 206, 140, 36, 235, 65, 206, 140, 36, + 238, 163, 206, 140, 36, 216, 89, 206, 140, 36, 213, 16, 206, 140, 36, + 237, 34, 206, 140, 36, 203, 68, 217, 34, 201, 86, 206, 140, 36, 243, 52, + 206, 140, 36, 222, 74, 206, 140, 36, 238, 76, 206, 140, 36, 203, 238, + 206, 140, 36, 241, 25, 206, 140, 36, 246, 110, 221, 58, 206, 140, 36, + 235, 42, 206, 140, 36, 236, 40, 228, 117, 206, 140, 36, 222, 129, 206, + 140, 36, 251, 246, 206, 140, 36, 238, 188, 206, 140, 36, 239, 171, 206, + 140, 36, 201, 84, 206, 140, 36, 209, 134, 206, 140, 36, 228, 81, 206, + 140, 36, 241, 124, 206, 140, 36, 241, 248, 206, 140, 36, 241, 21, 206, + 140, 36, 238, 40, 206, 140, 36, 210, 128, 206, 140, 36, 208, 75, 206, + 140, 36, 234, 164, 206, 140, 36, 246, 63, 206, 140, 36, 246, 105, 206, + 140, 36, 237, 174, 206, 140, 36, 251, 188, 206, 140, 36, 246, 62, 206, + 140, 36, 217, 79, 206, 107, 203, 45, 206, 140, 36, 241, 47, 206, 140, 36, + 225, 164, 206, 140, 36, 236, 232, 243, 3, 212, 247, 203, 240, 17, 102, + 243, 3, 212, 247, 203, 240, 17, 105, 243, 3, 212, 247, 203, 240, 17, 147, + 243, 3, 212, 247, 203, 240, 17, 149, 243, 3, 212, 247, 203, 240, 17, 164, + 243, 3, 212, 247, 203, 240, 17, 187, 243, 3, 212, 247, 203, 240, 17, 210, + 135, 243, 3, 212, 247, 203, 240, 17, 192, 243, 3, 212, 247, 203, 240, 17, + 219, 113, 243, 3, 212, 247, 206, 162, 17, 102, 243, 3, 212, 247, 206, + 162, 17, 105, 243, 3, 212, 247, 206, 162, 17, 147, 243, 3, 212, 247, 206, + 162, 17, 149, 243, 3, 212, 247, 206, 162, 17, 164, 243, 3, 212, 247, 206, + 162, 17, 187, 243, 3, 212, 247, 206, 162, 17, 210, 135, 243, 3, 212, 247, + 206, 162, 17, 192, 243, 3, 212, 247, 206, 162, 17, 219, 113, 13, 27, 6, + 62, 13, 27, 6, 250, 103, 13, 27, 6, 247, 223, 13, 27, 6, 242, 153, 13, + 27, 6, 72, 13, 27, 6, 238, 5, 13, 27, 6, 236, 156, 13, 27, 6, 234, 247, + 13, 27, 6, 70, 13, 27, 6, 227, 251, 13, 27, 6, 227, 118, 13, 27, 6, 156, + 13, 27, 6, 223, 243, 13, 27, 6, 220, 214, 13, 27, 6, 74, 13, 27, 6, 216, + 226, 13, 27, 6, 214, 167, 13, 27, 6, 146, 13, 27, 6, 212, 122, 13, 27, 6, + 207, 83, 13, 27, 6, 66, 13, 27, 6, 203, 168, 13, 27, 6, 201, 147, 13, 27, + 6, 200, 195, 13, 27, 6, 200, 123, 13, 27, 6, 199, 157, 13, 27, 4, 62, 13, + 27, 4, 250, 103, 13, 27, 4, 247, 223, 13, 27, 4, 242, 153, 13, 27, 4, 72, + 13, 27, 4, 238, 5, 13, 27, 4, 236, 156, 13, 27, 4, 234, 247, 13, 27, 4, + 70, 13, 27, 4, 227, 251, 13, 27, 4, 227, 118, 13, 27, 4, 156, 13, 27, 4, + 223, 243, 13, 27, 4, 220, 214, 13, 27, 4, 74, 13, 27, 4, 216, 226, 13, + 27, 4, 214, 167, 13, 27, 4, 146, 13, 27, 4, 212, 122, 13, 27, 4, 207, 83, + 13, 27, 4, 66, 13, 27, 4, 203, 168, 13, 27, 4, 201, 147, 13, 27, 4, 200, + 195, 13, 27, 4, 200, 123, 13, 27, 4, 199, 157, 13, 39, 6, 62, 13, 39, 6, + 250, 103, 13, 39, 6, 247, 223, 13, 39, 6, 242, 153, 13, 39, 6, 72, 13, + 39, 6, 238, 5, 13, 39, 6, 236, 156, 13, 39, 6, 234, 247, 13, 39, 6, 70, + 13, 39, 6, 227, 251, 13, 39, 6, 227, 118, 13, 39, 6, 156, 13, 39, 6, 223, + 243, 13, 39, 6, 220, 214, 13, 39, 6, 74, 13, 39, 6, 216, 226, 13, 39, 6, + 214, 167, 13, 39, 6, 146, 13, 39, 6, 212, 122, 13, 39, 6, 207, 83, 13, + 39, 6, 66, 13, 39, 6, 203, 168, 13, 39, 6, 201, 147, 13, 39, 6, 200, 195, + 13, 39, 6, 200, 123, 13, 39, 6, 199, 157, 13, 39, 4, 62, 13, 39, 4, 250, + 103, 13, 39, 4, 247, 223, 13, 39, 4, 242, 153, 13, 39, 4, 72, 13, 39, 4, + 238, 5, 13, 39, 4, 236, 156, 13, 39, 4, 70, 13, 39, 4, 227, 251, 13, 39, + 4, 227, 118, 13, 39, 4, 156, 13, 39, 4, 223, 243, 13, 39, 4, 220, 214, + 13, 39, 4, 74, 13, 39, 4, 216, 226, 13, 39, 4, 214, 167, 13, 39, 4, 146, + 13, 39, 4, 212, 122, 13, 39, 4, 207, 83, 13, 39, 4, 66, 13, 39, 4, 203, + 168, 13, 39, 4, 201, 147, 13, 39, 4, 200, 195, 13, 39, 4, 200, 123, 13, + 39, 4, 199, 157, 13, 27, 39, 6, 62, 13, 27, 39, 6, 250, 103, 13, 27, 39, + 6, 247, 223, 13, 27, 39, 6, 242, 153, 13, 27, 39, 6, 72, 13, 27, 39, 6, + 238, 5, 13, 27, 39, 6, 236, 156, 13, 27, 39, 6, 234, 247, 13, 27, 39, 6, + 70, 13, 27, 39, 6, 227, 251, 13, 27, 39, 6, 227, 118, 13, 27, 39, 6, 156, + 13, 27, 39, 6, 223, 243, 13, 27, 39, 6, 220, 214, 13, 27, 39, 6, 74, 13, + 27, 39, 6, 216, 226, 13, 27, 39, 6, 214, 167, 13, 27, 39, 6, 146, 13, 27, + 39, 6, 212, 122, 13, 27, 39, 6, 207, 83, 13, 27, 39, 6, 66, 13, 27, 39, + 6, 203, 168, 13, 27, 39, 6, 201, 147, 13, 27, 39, 6, 200, 195, 13, 27, + 39, 6, 200, 123, 13, 27, 39, 6, 199, 157, 13, 27, 39, 4, 62, 13, 27, 39, + 4, 250, 103, 13, 27, 39, 4, 247, 223, 13, 27, 39, 4, 242, 153, 13, 27, + 39, 4, 72, 13, 27, 39, 4, 238, 5, 13, 27, 39, 4, 236, 156, 13, 27, 39, 4, + 234, 247, 13, 27, 39, 4, 70, 13, 27, 39, 4, 227, 251, 13, 27, 39, 4, 227, + 118, 13, 27, 39, 4, 156, 13, 27, 39, 4, 223, 243, 13, 27, 39, 4, 220, + 214, 13, 27, 39, 4, 74, 13, 27, 39, 4, 216, 226, 13, 27, 39, 4, 214, 167, + 13, 27, 39, 4, 146, 13, 27, 39, 4, 212, 122, 13, 27, 39, 4, 207, 83, 13, + 27, 39, 4, 66, 13, 27, 39, 4, 203, 168, 13, 27, 39, 4, 201, 147, 13, 27, + 39, 4, 200, 195, 13, 27, 39, 4, 200, 123, 13, 27, 39, 4, 199, 157, 13, + 135, 6, 62, 13, 135, 6, 247, 223, 13, 135, 6, 242, 153, 13, 135, 6, 236, + 156, 13, 135, 6, 227, 251, 13, 135, 6, 227, 118, 13, 135, 6, 220, 214, + 13, 135, 6, 74, 13, 135, 6, 216, 226, 13, 135, 6, 214, 167, 13, 135, 6, + 212, 122, 13, 135, 6, 207, 83, 13, 135, 6, 66, 13, 135, 6, 203, 168, 13, + 135, 6, 201, 147, 13, 135, 6, 200, 195, 13, 135, 6, 200, 123, 13, 135, 6, + 199, 157, 13, 135, 4, 62, 13, 135, 4, 250, 103, 13, 135, 4, 247, 223, 13, + 135, 4, 242, 153, 13, 135, 4, 238, 5, 13, 135, 4, 234, 247, 13, 135, 4, + 70, 13, 135, 4, 227, 251, 13, 135, 4, 227, 118, 13, 135, 4, 156, 13, 135, + 4, 223, 243, 13, 135, 4, 220, 214, 13, 135, 4, 216, 226, 13, 135, 4, 214, + 167, 13, 135, 4, 146, 13, 135, 4, 212, 122, 13, 135, 4, 207, 83, 13, 135, + 4, 66, 13, 135, 4, 203, 168, 13, 135, 4, 201, 147, 13, 135, 4, 200, 195, + 13, 135, 4, 200, 123, 13, 135, 4, 199, 157, 13, 27, 135, 6, 62, 13, 27, + 135, 6, 250, 103, 13, 27, 135, 6, 247, 223, 13, 27, 135, 6, 242, 153, 13, + 27, 135, 6, 72, 13, 27, 135, 6, 238, 5, 13, 27, 135, 6, 236, 156, 13, 27, + 135, 6, 234, 247, 13, 27, 135, 6, 70, 13, 27, 135, 6, 227, 251, 13, 27, + 135, 6, 227, 118, 13, 27, 135, 6, 156, 13, 27, 135, 6, 223, 243, 13, 27, + 135, 6, 220, 214, 13, 27, 135, 6, 74, 13, 27, 135, 6, 216, 226, 13, 27, + 135, 6, 214, 167, 13, 27, 135, 6, 146, 13, 27, 135, 6, 212, 122, 13, 27, + 135, 6, 207, 83, 13, 27, 135, 6, 66, 13, 27, 135, 6, 203, 168, 13, 27, + 135, 6, 201, 147, 13, 27, 135, 6, 200, 195, 13, 27, 135, 6, 200, 123, 13, + 27, 135, 6, 199, 157, 13, 27, 135, 4, 62, 13, 27, 135, 4, 250, 103, 13, + 27, 135, 4, 247, 223, 13, 27, 135, 4, 242, 153, 13, 27, 135, 4, 72, 13, + 27, 135, 4, 238, 5, 13, 27, 135, 4, 236, 156, 13, 27, 135, 4, 234, 247, + 13, 27, 135, 4, 70, 13, 27, 135, 4, 227, 251, 13, 27, 135, 4, 227, 118, + 13, 27, 135, 4, 156, 13, 27, 135, 4, 223, 243, 13, 27, 135, 4, 220, 214, + 13, 27, 135, 4, 74, 13, 27, 135, 4, 216, 226, 13, 27, 135, 4, 214, 167, + 13, 27, 135, 4, 146, 13, 27, 135, 4, 212, 122, 13, 27, 135, 4, 207, 83, + 13, 27, 135, 4, 66, 13, 27, 135, 4, 203, 168, 13, 27, 135, 4, 201, 147, + 13, 27, 135, 4, 200, 195, 13, 27, 135, 4, 200, 123, 13, 27, 135, 4, 199, + 157, 13, 170, 6, 62, 13, 170, 6, 250, 103, 13, 170, 6, 242, 153, 13, 170, + 6, 72, 13, 170, 6, 238, 5, 13, 170, 6, 236, 156, 13, 170, 6, 227, 251, + 13, 170, 6, 227, 118, 13, 170, 6, 156, 13, 170, 6, 223, 243, 13, 170, 6, + 220, 214, 13, 170, 6, 74, 13, 170, 6, 216, 226, 13, 170, 6, 214, 167, 13, + 170, 6, 212, 122, 13, 170, 6, 207, 83, 13, 170, 6, 66, 13, 170, 6, 203, + 168, 13, 170, 6, 201, 147, 13, 170, 6, 200, 195, 13, 170, 6, 200, 123, + 13, 170, 4, 62, 13, 170, 4, 250, 103, 13, 170, 4, 247, 223, 13, 170, 4, + 242, 153, 13, 170, 4, 72, 13, 170, 4, 238, 5, 13, 170, 4, 236, 156, 13, + 170, 4, 234, 247, 13, 170, 4, 70, 13, 170, 4, 227, 251, 13, 170, 4, 227, + 118, 13, 170, 4, 156, 13, 170, 4, 223, 243, 13, 170, 4, 220, 214, 13, + 170, 4, 74, 13, 170, 4, 216, 226, 13, 170, 4, 214, 167, 13, 170, 4, 146, + 13, 170, 4, 212, 122, 13, 170, 4, 207, 83, 13, 170, 4, 66, 13, 170, 4, + 203, 168, 13, 170, 4, 201, 147, 13, 170, 4, 200, 195, 13, 170, 4, 200, + 123, 13, 170, 4, 199, 157, 13, 175, 6, 62, 13, 175, 6, 250, 103, 13, 175, + 6, 242, 153, 13, 175, 6, 72, 13, 175, 6, 238, 5, 13, 175, 6, 236, 156, + 13, 175, 6, 70, 13, 175, 6, 227, 251, 13, 175, 6, 227, 118, 13, 175, 6, + 156, 13, 175, 6, 223, 243, 13, 175, 6, 74, 13, 175, 6, 212, 122, 13, 175, + 6, 207, 83, 13, 175, 6, 66, 13, 175, 6, 203, 168, 13, 175, 6, 201, 147, + 13, 175, 6, 200, 195, 13, 175, 6, 200, 123, 13, 175, 4, 62, 13, 175, 4, + 250, 103, 13, 175, 4, 247, 223, 13, 175, 4, 242, 153, 13, 175, 4, 72, 13, + 175, 4, 238, 5, 13, 175, 4, 236, 156, 13, 175, 4, 234, 247, 13, 175, 4, + 70, 13, 175, 4, 227, 251, 13, 175, 4, 227, 118, 13, 175, 4, 156, 13, 175, + 4, 223, 243, 13, 175, 4, 220, 214, 13, 175, 4, 74, 13, 175, 4, 216, 226, + 13, 175, 4, 214, 167, 13, 175, 4, 146, 13, 175, 4, 212, 122, 13, 175, 4, + 207, 83, 13, 175, 4, 66, 13, 175, 4, 203, 168, 13, 175, 4, 201, 147, 13, + 175, 4, 200, 195, 13, 175, 4, 200, 123, 13, 175, 4, 199, 157, 13, 27, + 170, 6, 62, 13, 27, 170, 6, 250, 103, 13, 27, 170, 6, 247, 223, 13, 27, + 170, 6, 242, 153, 13, 27, 170, 6, 72, 13, 27, 170, 6, 238, 5, 13, 27, + 170, 6, 236, 156, 13, 27, 170, 6, 234, 247, 13, 27, 170, 6, 70, 13, 27, + 170, 6, 227, 251, 13, 27, 170, 6, 227, 118, 13, 27, 170, 6, 156, 13, 27, + 170, 6, 223, 243, 13, 27, 170, 6, 220, 214, 13, 27, 170, 6, 74, 13, 27, + 170, 6, 216, 226, 13, 27, 170, 6, 214, 167, 13, 27, 170, 6, 146, 13, 27, + 170, 6, 212, 122, 13, 27, 170, 6, 207, 83, 13, 27, 170, 6, 66, 13, 27, + 170, 6, 203, 168, 13, 27, 170, 6, 201, 147, 13, 27, 170, 6, 200, 195, 13, + 27, 170, 6, 200, 123, 13, 27, 170, 6, 199, 157, 13, 27, 170, 4, 62, 13, + 27, 170, 4, 250, 103, 13, 27, 170, 4, 247, 223, 13, 27, 170, 4, 242, 153, + 13, 27, 170, 4, 72, 13, 27, 170, 4, 238, 5, 13, 27, 170, 4, 236, 156, 13, + 27, 170, 4, 234, 247, 13, 27, 170, 4, 70, 13, 27, 170, 4, 227, 251, 13, + 27, 170, 4, 227, 118, 13, 27, 170, 4, 156, 13, 27, 170, 4, 223, 243, 13, + 27, 170, 4, 220, 214, 13, 27, 170, 4, 74, 13, 27, 170, 4, 216, 226, 13, + 27, 170, 4, 214, 167, 13, 27, 170, 4, 146, 13, 27, 170, 4, 212, 122, 13, + 27, 170, 4, 207, 83, 13, 27, 170, 4, 66, 13, 27, 170, 4, 203, 168, 13, + 27, 170, 4, 201, 147, 13, 27, 170, 4, 200, 195, 13, 27, 170, 4, 200, 123, + 13, 27, 170, 4, 199, 157, 13, 43, 6, 62, 13, 43, 6, 250, 103, 13, 43, 6, + 247, 223, 13, 43, 6, 242, 153, 13, 43, 6, 72, 13, 43, 6, 238, 5, 13, 43, + 6, 236, 156, 13, 43, 6, 234, 247, 13, 43, 6, 70, 13, 43, 6, 227, 251, 13, + 43, 6, 227, 118, 13, 43, 6, 156, 13, 43, 6, 223, 243, 13, 43, 6, 220, + 214, 13, 43, 6, 74, 13, 43, 6, 216, 226, 13, 43, 6, 214, 167, 13, 43, 6, + 146, 13, 43, 6, 212, 122, 13, 43, 6, 207, 83, 13, 43, 6, 66, 13, 43, 6, + 203, 168, 13, 43, 6, 201, 147, 13, 43, 6, 200, 195, 13, 43, 6, 200, 123, + 13, 43, 6, 199, 157, 13, 43, 4, 62, 13, 43, 4, 250, 103, 13, 43, 4, 247, + 223, 13, 43, 4, 242, 153, 13, 43, 4, 72, 13, 43, 4, 238, 5, 13, 43, 4, + 236, 156, 13, 43, 4, 234, 247, 13, 43, 4, 70, 13, 43, 4, 227, 251, 13, + 43, 4, 227, 118, 13, 43, 4, 156, 13, 43, 4, 223, 243, 13, 43, 4, 220, + 214, 13, 43, 4, 74, 13, 43, 4, 216, 226, 13, 43, 4, 214, 167, 13, 43, 4, + 146, 13, 43, 4, 212, 122, 13, 43, 4, 207, 83, 13, 43, 4, 66, 13, 43, 4, + 203, 168, 13, 43, 4, 201, 147, 13, 43, 4, 200, 195, 13, 43, 4, 200, 123, + 13, 43, 4, 199, 157, 13, 43, 27, 6, 62, 13, 43, 27, 6, 250, 103, 13, 43, + 27, 6, 247, 223, 13, 43, 27, 6, 242, 153, 13, 43, 27, 6, 72, 13, 43, 27, + 6, 238, 5, 13, 43, 27, 6, 236, 156, 13, 43, 27, 6, 234, 247, 13, 43, 27, + 6, 70, 13, 43, 27, 6, 227, 251, 13, 43, 27, 6, 227, 118, 13, 43, 27, 6, + 156, 13, 43, 27, 6, 223, 243, 13, 43, 27, 6, 220, 214, 13, 43, 27, 6, 74, + 13, 43, 27, 6, 216, 226, 13, 43, 27, 6, 214, 167, 13, 43, 27, 6, 146, 13, + 43, 27, 6, 212, 122, 13, 43, 27, 6, 207, 83, 13, 43, 27, 6, 66, 13, 43, + 27, 6, 203, 168, 13, 43, 27, 6, 201, 147, 13, 43, 27, 6, 200, 195, 13, + 43, 27, 6, 200, 123, 13, 43, 27, 6, 199, 157, 13, 43, 27, 4, 62, 13, 43, + 27, 4, 250, 103, 13, 43, 27, 4, 247, 223, 13, 43, 27, 4, 242, 153, 13, + 43, 27, 4, 72, 13, 43, 27, 4, 238, 5, 13, 43, 27, 4, 236, 156, 13, 43, + 27, 4, 234, 247, 13, 43, 27, 4, 70, 13, 43, 27, 4, 227, 251, 13, 43, 27, + 4, 227, 118, 13, 43, 27, 4, 156, 13, 43, 27, 4, 223, 243, 13, 43, 27, 4, + 220, 214, 13, 43, 27, 4, 74, 13, 43, 27, 4, 216, 226, 13, 43, 27, 4, 214, + 167, 13, 43, 27, 4, 146, 13, 43, 27, 4, 212, 122, 13, 43, 27, 4, 207, 83, + 13, 43, 27, 4, 66, 13, 43, 27, 4, 203, 168, 13, 43, 27, 4, 201, 147, 13, + 43, 27, 4, 200, 195, 13, 43, 27, 4, 200, 123, 13, 43, 27, 4, 199, 157, + 13, 43, 39, 6, 62, 13, 43, 39, 6, 250, 103, 13, 43, 39, 6, 247, 223, 13, + 43, 39, 6, 242, 153, 13, 43, 39, 6, 72, 13, 43, 39, 6, 238, 5, 13, 43, + 39, 6, 236, 156, 13, 43, 39, 6, 234, 247, 13, 43, 39, 6, 70, 13, 43, 39, + 6, 227, 251, 13, 43, 39, 6, 227, 118, 13, 43, 39, 6, 156, 13, 43, 39, 6, + 223, 243, 13, 43, 39, 6, 220, 214, 13, 43, 39, 6, 74, 13, 43, 39, 6, 216, + 226, 13, 43, 39, 6, 214, 167, 13, 43, 39, 6, 146, 13, 43, 39, 6, 212, + 122, 13, 43, 39, 6, 207, 83, 13, 43, 39, 6, 66, 13, 43, 39, 6, 203, 168, + 13, 43, 39, 6, 201, 147, 13, 43, 39, 6, 200, 195, 13, 43, 39, 6, 200, + 123, 13, 43, 39, 6, 199, 157, 13, 43, 39, 4, 62, 13, 43, 39, 4, 250, 103, + 13, 43, 39, 4, 247, 223, 13, 43, 39, 4, 242, 153, 13, 43, 39, 4, 72, 13, + 43, 39, 4, 238, 5, 13, 43, 39, 4, 236, 156, 13, 43, 39, 4, 234, 247, 13, + 43, 39, 4, 70, 13, 43, 39, 4, 227, 251, 13, 43, 39, 4, 227, 118, 13, 43, + 39, 4, 156, 13, 43, 39, 4, 223, 243, 13, 43, 39, 4, 220, 214, 13, 43, 39, + 4, 74, 13, 43, 39, 4, 216, 226, 13, 43, 39, 4, 214, 167, 13, 43, 39, 4, + 146, 13, 43, 39, 4, 212, 122, 13, 43, 39, 4, 207, 83, 13, 43, 39, 4, 66, + 13, 43, 39, 4, 203, 168, 13, 43, 39, 4, 201, 147, 13, 43, 39, 4, 200, + 195, 13, 43, 39, 4, 200, 123, 13, 43, 39, 4, 199, 157, 13, 43, 27, 39, 6, + 62, 13, 43, 27, 39, 6, 250, 103, 13, 43, 27, 39, 6, 247, 223, 13, 43, 27, + 39, 6, 242, 153, 13, 43, 27, 39, 6, 72, 13, 43, 27, 39, 6, 238, 5, 13, + 43, 27, 39, 6, 236, 156, 13, 43, 27, 39, 6, 234, 247, 13, 43, 27, 39, 6, + 70, 13, 43, 27, 39, 6, 227, 251, 13, 43, 27, 39, 6, 227, 118, 13, 43, 27, + 39, 6, 156, 13, 43, 27, 39, 6, 223, 243, 13, 43, 27, 39, 6, 220, 214, 13, + 43, 27, 39, 6, 74, 13, 43, 27, 39, 6, 216, 226, 13, 43, 27, 39, 6, 214, + 167, 13, 43, 27, 39, 6, 146, 13, 43, 27, 39, 6, 212, 122, 13, 43, 27, 39, + 6, 207, 83, 13, 43, 27, 39, 6, 66, 13, 43, 27, 39, 6, 203, 168, 13, 43, + 27, 39, 6, 201, 147, 13, 43, 27, 39, 6, 200, 195, 13, 43, 27, 39, 6, 200, + 123, 13, 43, 27, 39, 6, 199, 157, 13, 43, 27, 39, 4, 62, 13, 43, 27, 39, + 4, 250, 103, 13, 43, 27, 39, 4, 247, 223, 13, 43, 27, 39, 4, 242, 153, + 13, 43, 27, 39, 4, 72, 13, 43, 27, 39, 4, 238, 5, 13, 43, 27, 39, 4, 236, + 156, 13, 43, 27, 39, 4, 234, 247, 13, 43, 27, 39, 4, 70, 13, 43, 27, 39, + 4, 227, 251, 13, 43, 27, 39, 4, 227, 118, 13, 43, 27, 39, 4, 156, 13, 43, + 27, 39, 4, 223, 243, 13, 43, 27, 39, 4, 220, 214, 13, 43, 27, 39, 4, 74, + 13, 43, 27, 39, 4, 216, 226, 13, 43, 27, 39, 4, 214, 167, 13, 43, 27, 39, + 4, 146, 13, 43, 27, 39, 4, 212, 122, 13, 43, 27, 39, 4, 207, 83, 13, 43, + 27, 39, 4, 66, 13, 43, 27, 39, 4, 203, 168, 13, 43, 27, 39, 4, 201, 147, + 13, 43, 27, 39, 4, 200, 195, 13, 43, 27, 39, 4, 200, 123, 13, 43, 27, 39, + 4, 199, 157, 13, 221, 93, 6, 62, 13, 221, 93, 6, 250, 103, 13, 221, 93, + 6, 247, 223, 13, 221, 93, 6, 242, 153, 13, 221, 93, 6, 72, 13, 221, 93, + 6, 238, 5, 13, 221, 93, 6, 236, 156, 13, 221, 93, 6, 234, 247, 13, 221, + 93, 6, 70, 13, 221, 93, 6, 227, 251, 13, 221, 93, 6, 227, 118, 13, 221, + 93, 6, 156, 13, 221, 93, 6, 223, 243, 13, 221, 93, 6, 220, 214, 13, 221, + 93, 6, 74, 13, 221, 93, 6, 216, 226, 13, 221, 93, 6, 214, 167, 13, 221, + 93, 6, 146, 13, 221, 93, 6, 212, 122, 13, 221, 93, 6, 207, 83, 13, 221, + 93, 6, 66, 13, 221, 93, 6, 203, 168, 13, 221, 93, 6, 201, 147, 13, 221, + 93, 6, 200, 195, 13, 221, 93, 6, 200, 123, 13, 221, 93, 6, 199, 157, 13, + 221, 93, 4, 62, 13, 221, 93, 4, 250, 103, 13, 221, 93, 4, 247, 223, 13, + 221, 93, 4, 242, 153, 13, 221, 93, 4, 72, 13, 221, 93, 4, 238, 5, 13, + 221, 93, 4, 236, 156, 13, 221, 93, 4, 234, 247, 13, 221, 93, 4, 70, 13, + 221, 93, 4, 227, 251, 13, 221, 93, 4, 227, 118, 13, 221, 93, 4, 156, 13, + 221, 93, 4, 223, 243, 13, 221, 93, 4, 220, 214, 13, 221, 93, 4, 74, 13, + 221, 93, 4, 216, 226, 13, 221, 93, 4, 214, 167, 13, 221, 93, 4, 146, 13, + 221, 93, 4, 212, 122, 13, 221, 93, 4, 207, 83, 13, 221, 93, 4, 66, 13, + 221, 93, 4, 203, 168, 13, 221, 93, 4, 201, 147, 13, 221, 93, 4, 200, 195, + 13, 221, 93, 4, 200, 123, 13, 221, 93, 4, 199, 157, 13, 39, 4, 240, 181, + 70, 13, 39, 4, 240, 181, 227, 251, 13, 27, 6, 251, 112, 13, 27, 6, 248, + 208, 13, 27, 6, 236, 60, 13, 27, 6, 241, 136, 13, 27, 6, 238, 124, 13, + 27, 6, 199, 80, 13, 27, 6, 238, 79, 13, 27, 6, 206, 88, 13, 27, 6, 228, + 41, 13, 27, 6, 227, 54, 13, 27, 6, 225, 87, 13, 27, 6, 221, 41, 13, 27, + 6, 218, 133, 13, 27, 6, 200, 169, 13, 27, 6, 217, 81, 13, 27, 6, 215, + 204, 13, 27, 6, 213, 90, 13, 27, 6, 206, 89, 99, 13, 27, 6, 209, 163, 13, + 27, 6, 206, 221, 13, 27, 6, 203, 220, 13, 27, 6, 215, 229, 13, 27, 6, + 246, 236, 13, 27, 6, 214, 235, 13, 27, 6, 217, 83, 13, 27, 220, 152, 13, + 27, 4, 251, 112, 13, 27, 4, 248, 208, 13, 27, 4, 236, 60, 13, 27, 4, 241, + 136, 13, 27, 4, 238, 124, 13, 27, 4, 199, 80, 13, 27, 4, 238, 79, 13, 27, + 4, 206, 88, 13, 27, 4, 228, 41, 13, 27, 4, 227, 54, 13, 27, 4, 225, 87, + 13, 27, 4, 221, 41, 13, 27, 4, 218, 133, 13, 27, 4, 200, 169, 13, 27, 4, + 217, 81, 13, 27, 4, 215, 204, 13, 27, 4, 213, 90, 13, 27, 4, 47, 209, + 163, 13, 27, 4, 209, 163, 13, 27, 4, 206, 221, 13, 27, 4, 203, 220, 13, + 27, 4, 215, 229, 13, 27, 4, 246, 236, 13, 27, 4, 214, 235, 13, 27, 4, + 217, 83, 13, 27, 216, 108, 241, 48, 13, 27, 238, 125, 99, 13, 27, 206, + 89, 99, 13, 27, 227, 55, 99, 13, 27, 215, 230, 99, 13, 27, 213, 91, 99, + 13, 27, 215, 205, 99, 13, 39, 6, 251, 112, 13, 39, 6, 248, 208, 13, 39, + 6, 236, 60, 13, 39, 6, 241, 136, 13, 39, 6, 238, 124, 13, 39, 6, 199, 80, + 13, 39, 6, 238, 79, 13, 39, 6, 206, 88, 13, 39, 6, 228, 41, 13, 39, 6, + 227, 54, 13, 39, 6, 225, 87, 13, 39, 6, 221, 41, 13, 39, 6, 218, 133, 13, + 39, 6, 200, 169, 13, 39, 6, 217, 81, 13, 39, 6, 215, 204, 13, 39, 6, 213, + 90, 13, 39, 6, 206, 89, 99, 13, 39, 6, 209, 163, 13, 39, 6, 206, 221, 13, + 39, 6, 203, 220, 13, 39, 6, 215, 229, 13, 39, 6, 246, 236, 13, 39, 6, + 214, 235, 13, 39, 6, 217, 83, 13, 39, 220, 152, 13, 39, 4, 251, 112, 13, + 39, 4, 248, 208, 13, 39, 4, 236, 60, 13, 39, 4, 241, 136, 13, 39, 4, 238, + 124, 13, 39, 4, 199, 80, 13, 39, 4, 238, 79, 13, 39, 4, 206, 88, 13, 39, + 4, 228, 41, 13, 39, 4, 227, 54, 13, 39, 4, 225, 87, 13, 39, 4, 221, 41, + 13, 39, 4, 218, 133, 13, 39, 4, 200, 169, 13, 39, 4, 217, 81, 13, 39, 4, + 215, 204, 13, 39, 4, 213, 90, 13, 39, 4, 47, 209, 163, 13, 39, 4, 209, + 163, 13, 39, 4, 206, 221, 13, 39, 4, 203, 220, 13, 39, 4, 215, 229, 13, + 39, 4, 246, 236, 13, 39, 4, 214, 235, 13, 39, 4, 217, 83, 13, 39, 216, + 108, 241, 48, 13, 39, 238, 125, 99, 13, 39, 206, 89, 99, 13, 39, 227, 55, + 99, 13, 39, 215, 230, 99, 13, 39, 213, 91, 99, 13, 39, 215, 205, 99, 13, + 27, 39, 6, 251, 112, 13, 27, 39, 6, 248, 208, 13, 27, 39, 6, 236, 60, 13, + 27, 39, 6, 241, 136, 13, 27, 39, 6, 238, 124, 13, 27, 39, 6, 199, 80, 13, + 27, 39, 6, 238, 79, 13, 27, 39, 6, 206, 88, 13, 27, 39, 6, 228, 41, 13, + 27, 39, 6, 227, 54, 13, 27, 39, 6, 225, 87, 13, 27, 39, 6, 221, 41, 13, + 27, 39, 6, 218, 133, 13, 27, 39, 6, 200, 169, 13, 27, 39, 6, 217, 81, 13, + 27, 39, 6, 215, 204, 13, 27, 39, 6, 213, 90, 13, 27, 39, 6, 206, 89, 99, + 13, 27, 39, 6, 209, 163, 13, 27, 39, 6, 206, 221, 13, 27, 39, 6, 203, + 220, 13, 27, 39, 6, 215, 229, 13, 27, 39, 6, 246, 236, 13, 27, 39, 6, + 214, 235, 13, 27, 39, 6, 217, 83, 13, 27, 39, 220, 152, 13, 27, 39, 4, + 251, 112, 13, 27, 39, 4, 248, 208, 13, 27, 39, 4, 236, 60, 13, 27, 39, 4, + 241, 136, 13, 27, 39, 4, 238, 124, 13, 27, 39, 4, 199, 80, 13, 27, 39, 4, + 238, 79, 13, 27, 39, 4, 206, 88, 13, 27, 39, 4, 228, 41, 13, 27, 39, 4, + 227, 54, 13, 27, 39, 4, 225, 87, 13, 27, 39, 4, 221, 41, 13, 27, 39, 4, + 218, 133, 13, 27, 39, 4, 200, 169, 13, 27, 39, 4, 217, 81, 13, 27, 39, 4, + 215, 204, 13, 27, 39, 4, 213, 90, 13, 27, 39, 4, 47, 209, 163, 13, 27, + 39, 4, 209, 163, 13, 27, 39, 4, 206, 221, 13, 27, 39, 4, 203, 220, 13, + 27, 39, 4, 215, 229, 13, 27, 39, 4, 246, 236, 13, 27, 39, 4, 214, 235, + 13, 27, 39, 4, 217, 83, 13, 27, 39, 216, 108, 241, 48, 13, 27, 39, 238, + 125, 99, 13, 27, 39, 206, 89, 99, 13, 27, 39, 227, 55, 99, 13, 27, 39, + 215, 230, 99, 13, 27, 39, 213, 91, 99, 13, 27, 39, 215, 205, 99, 13, 43, + 27, 6, 251, 112, 13, 43, 27, 6, 248, 208, 13, 43, 27, 6, 236, 60, 13, 43, + 27, 6, 241, 136, 13, 43, 27, 6, 238, 124, 13, 43, 27, 6, 199, 80, 13, 43, + 27, 6, 238, 79, 13, 43, 27, 6, 206, 88, 13, 43, 27, 6, 228, 41, 13, 43, + 27, 6, 227, 54, 13, 43, 27, 6, 225, 87, 13, 43, 27, 6, 221, 41, 13, 43, + 27, 6, 218, 133, 13, 43, 27, 6, 200, 169, 13, 43, 27, 6, 217, 81, 13, 43, + 27, 6, 215, 204, 13, 43, 27, 6, 213, 90, 13, 43, 27, 6, 206, 89, 99, 13, + 43, 27, 6, 209, 163, 13, 43, 27, 6, 206, 221, 13, 43, 27, 6, 203, 220, + 13, 43, 27, 6, 215, 229, 13, 43, 27, 6, 246, 236, 13, 43, 27, 6, 214, + 235, 13, 43, 27, 6, 217, 83, 13, 43, 27, 220, 152, 13, 43, 27, 4, 251, + 112, 13, 43, 27, 4, 248, 208, 13, 43, 27, 4, 236, 60, 13, 43, 27, 4, 241, + 136, 13, 43, 27, 4, 238, 124, 13, 43, 27, 4, 199, 80, 13, 43, 27, 4, 238, + 79, 13, 43, 27, 4, 206, 88, 13, 43, 27, 4, 228, 41, 13, 43, 27, 4, 227, + 54, 13, 43, 27, 4, 225, 87, 13, 43, 27, 4, 221, 41, 13, 43, 27, 4, 218, + 133, 13, 43, 27, 4, 200, 169, 13, 43, 27, 4, 217, 81, 13, 43, 27, 4, 215, + 204, 13, 43, 27, 4, 213, 90, 13, 43, 27, 4, 47, 209, 163, 13, 43, 27, 4, + 209, 163, 13, 43, 27, 4, 206, 221, 13, 43, 27, 4, 203, 220, 13, 43, 27, + 4, 215, 229, 13, 43, 27, 4, 246, 236, 13, 43, 27, 4, 214, 235, 13, 43, + 27, 4, 217, 83, 13, 43, 27, 216, 108, 241, 48, 13, 43, 27, 238, 125, 99, + 13, 43, 27, 206, 89, 99, 13, 43, 27, 227, 55, 99, 13, 43, 27, 215, 230, + 99, 13, 43, 27, 213, 91, 99, 13, 43, 27, 215, 205, 99, 13, 43, 27, 39, 6, + 251, 112, 13, 43, 27, 39, 6, 248, 208, 13, 43, 27, 39, 6, 236, 60, 13, + 43, 27, 39, 6, 241, 136, 13, 43, 27, 39, 6, 238, 124, 13, 43, 27, 39, 6, + 199, 80, 13, 43, 27, 39, 6, 238, 79, 13, 43, 27, 39, 6, 206, 88, 13, 43, + 27, 39, 6, 228, 41, 13, 43, 27, 39, 6, 227, 54, 13, 43, 27, 39, 6, 225, + 87, 13, 43, 27, 39, 6, 221, 41, 13, 43, 27, 39, 6, 218, 133, 13, 43, 27, + 39, 6, 200, 169, 13, 43, 27, 39, 6, 217, 81, 13, 43, 27, 39, 6, 215, 204, + 13, 43, 27, 39, 6, 213, 90, 13, 43, 27, 39, 6, 206, 89, 99, 13, 43, 27, + 39, 6, 209, 163, 13, 43, 27, 39, 6, 206, 221, 13, 43, 27, 39, 6, 203, + 220, 13, 43, 27, 39, 6, 215, 229, 13, 43, 27, 39, 6, 246, 236, 13, 43, + 27, 39, 6, 214, 235, 13, 43, 27, 39, 6, 217, 83, 13, 43, 27, 39, 220, + 152, 13, 43, 27, 39, 4, 251, 112, 13, 43, 27, 39, 4, 248, 208, 13, 43, + 27, 39, 4, 236, 60, 13, 43, 27, 39, 4, 241, 136, 13, 43, 27, 39, 4, 238, + 124, 13, 43, 27, 39, 4, 199, 80, 13, 43, 27, 39, 4, 238, 79, 13, 43, 27, + 39, 4, 206, 88, 13, 43, 27, 39, 4, 228, 41, 13, 43, 27, 39, 4, 227, 54, + 13, 43, 27, 39, 4, 225, 87, 13, 43, 27, 39, 4, 221, 41, 13, 43, 27, 39, + 4, 218, 133, 13, 43, 27, 39, 4, 200, 169, 13, 43, 27, 39, 4, 217, 81, 13, + 43, 27, 39, 4, 215, 204, 13, 43, 27, 39, 4, 213, 90, 13, 43, 27, 39, 4, + 47, 209, 163, 13, 43, 27, 39, 4, 209, 163, 13, 43, 27, 39, 4, 206, 221, + 13, 43, 27, 39, 4, 203, 220, 13, 43, 27, 39, 4, 215, 229, 13, 43, 27, 39, + 4, 246, 236, 13, 43, 27, 39, 4, 214, 235, 13, 43, 27, 39, 4, 217, 83, 13, + 43, 27, 39, 216, 108, 241, 48, 13, 43, 27, 39, 238, 125, 99, 13, 43, 27, + 39, 206, 89, 99, 13, 43, 27, 39, 227, 55, 99, 13, 43, 27, 39, 215, 230, + 99, 13, 43, 27, 39, 213, 91, 99, 13, 43, 27, 39, 215, 205, 99, 13, 27, 6, + 241, 42, 13, 27, 4, 241, 42, 13, 27, 17, 199, 81, 13, 27, 17, 102, 13, + 27, 17, 105, 13, 27, 17, 147, 13, 27, 17, 149, 13, 27, 17, 164, 13, 27, + 17, 187, 13, 27, 17, 210, 135, 13, 27, 17, 192, 13, 27, 17, 219, 113, 13, + 175, 17, 199, 81, 13, 175, 17, 102, 13, 175, 17, 105, 13, 175, 17, 147, + 13, 175, 17, 149, 13, 175, 17, 164, 13, 175, 17, 187, 13, 175, 17, 210, + 135, 13, 175, 17, 192, 13, 175, 17, 219, 113, 13, 43, 17, 199, 81, 13, + 43, 17, 102, 13, 43, 17, 105, 13, 43, 17, 147, 13, 43, 17, 149, 13, 43, + 17, 164, 13, 43, 17, 187, 13, 43, 17, 210, 135, 13, 43, 17, 192, 13, 43, + 17, 219, 113, 13, 43, 27, 17, 199, 81, 13, 43, 27, 17, 102, 13, 43, 27, + 17, 105, 13, 43, 27, 17, 147, 13, 43, 27, 17, 149, 13, 43, 27, 17, 164, + 13, 43, 27, 17, 187, 13, 43, 27, 17, 210, 135, 13, 43, 27, 17, 192, 13, + 43, 27, 17, 219, 113, 13, 221, 93, 17, 199, 81, 13, 221, 93, 17, 102, 13, + 221, 93, 17, 105, 13, 221, 93, 17, 147, 13, 221, 93, 17, 149, 13, 221, + 93, 17, 164, 13, 221, 93, 17, 187, 13, 221, 93, 17, 210, 135, 13, 221, + 93, 17, 192, 13, 221, 93, 17, 219, 113, 23, 131, 228, 103, 23, 234, 196, + 228, 103, 23, 234, 192, 228, 103, 23, 234, 181, 228, 103, 23, 234, 185, + 228, 103, 23, 234, 198, 228, 103, 23, 131, 124, 248, 219, 23, 234, 196, + 124, 248, 219, 23, 131, 153, 203, 253, 124, 248, 219, 23, 131, 124, 213, + 220, 226, 91, 23, 131, 124, 242, 200, 23, 131, 124, 234, 50, 23, 131, + 124, 234, 51, 224, 59, 23, 234, 196, 124, 234, 52, 23, 131, 124, 221, + 204, 23, 234, 196, 124, 221, 204, 23, 131, 124, 101, 248, 219, 23, 131, + 124, 101, 213, 220, 226, 90, 23, 131, 124, 101, 234, 50, 23, 131, 124, + 115, 101, 234, 50, 23, 131, 124, 234, 51, 101, 203, 228, 23, 131, 124, + 101, 243, 57, 23, 131, 124, 101, 243, 58, 124, 248, 219, 23, 131, 124, + 101, 243, 58, 101, 248, 219, 23, 131, 124, 101, 243, 58, 242, 200, 23, + 131, 124, 101, 243, 58, 234, 50, 23, 131, 124, 101, 242, 231, 23, 234, + 196, 124, 101, 242, 231, 23, 131, 101, 248, 220, 119, 228, 103, 23, 131, + 124, 248, 220, 119, 221, 204, 23, 131, 124, 101, 206, 34, 23, 234, 196, + 124, 101, 206, 34, 23, 131, 124, 101, 208, 68, 153, 248, 219, 23, 131, + 124, 101, 248, 220, 153, 208, 67, 23, 131, 124, 101, 153, 248, 219, 23, + 131, 124, 101, 234, 51, 208, 202, 153, 209, 174, 23, 131, 124, 115, 101, + 234, 51, 153, 209, 174, 23, 131, 124, 115, 101, 234, 51, 153, 243, 57, + 23, 131, 124, 234, 51, 101, 115, 153, 209, 174, 23, 131, 124, 101, 115, + 208, 202, 153, 236, 233, 23, 131, 124, 101, 153, 242, 200, 23, 131, 124, + 101, 153, 246, 154, 23, 131, 124, 101, 153, 233, 185, 23, 131, 124, 101, + 153, 234, 50, 23, 131, 153, 248, 206, 124, 101, 208, 67, 23, 131, 124, + 101, 243, 58, 153, 209, 174, 23, 131, 124, 101, 243, 58, 153, 209, 175, + 243, 57, 23, 131, 124, 101, 243, 58, 153, 209, 175, 248, 219, 23, 131, + 101, 153, 233, 186, 124, 203, 228, 23, 131, 124, 153, 233, 186, 101, 203, + 228, 23, 131, 124, 101, 243, 58, 234, 51, 153, 209, 174, 23, 131, 124, + 101, 242, 232, 153, 209, 174, 23, 131, 124, 101, 243, 58, 153, 236, 233, + 23, 131, 124, 101, 243, 58, 242, 201, 153, 236, 233, 23, 131, 101, 153, + 242, 201, 124, 203, 228, 23, 131, 124, 153, 242, 201, 101, 203, 228, 23, + 131, 101, 153, 44, 124, 203, 228, 23, 131, 101, 153, 44, 124, 234, 50, + 23, 131, 124, 153, 251, 69, 216, 255, 101, 203, 228, 23, 131, 124, 153, + 251, 69, 228, 118, 101, 203, 228, 23, 131, 124, 153, 44, 101, 203, 228, + 23, 131, 124, 101, 153, 243, 58, 234, 50, 23, 131, 124, 101, 153, 251, + 69, 216, 254, 23, 131, 124, 101, 153, 251, 68, 23, 131, 101, 153, 251, + 69, 216, 255, 124, 203, 228, 23, 131, 101, 153, 251, 69, 216, 255, 124, + 242, 231, 23, 131, 101, 153, 251, 69, 124, 203, 228, 23, 131, 124, 153, + 233, 186, 101, 234, 50, 23, 234, 187, 236, 229, 237, 81, 23, 234, 187, + 236, 229, 237, 82, 248, 219, 23, 234, 187, 236, 229, 237, 82, 234, 50, + 23, 234, 187, 236, 229, 237, 82, 243, 57, 23, 234, 187, 236, 229, 237, + 82, 243, 58, 208, 209, 23, 234, 194, 236, 229, 237, 82, 243, 57, 23, 131, + 236, 229, 237, 82, 243, 58, 248, 219, 23, 234, 185, 236, 229, 237, 82, + 243, 57, 23, 234, 187, 237, 61, 237, 82, 208, 201, 23, 234, 187, 234, + 118, 237, 61, 237, 82, 208, 201, 23, 234, 187, 237, 61, 237, 82, 208, + 202, 236, 229, 248, 219, 23, 234, 187, 234, 118, 237, 61, 237, 82, 208, + 202, 236, 229, 248, 219, 23, 234, 187, 237, 61, 237, 82, 208, 202, 248, + 219, 23, 234, 187, 234, 118, 237, 61, 237, 82, 208, 202, 248, 219, 23, + 234, 187, 237, 61, 237, 82, 208, 202, 153, 236, 233, 23, 234, 192, 237, + 61, 237, 82, 208, 201, 23, 234, 192, 237, 61, 237, 82, 208, 202, 217, 53, + 23, 234, 185, 237, 61, 237, 82, 208, 202, 217, 53, 23, 234, 181, 237, 61, + 237, 82, 208, 201, 23, 234, 187, 237, 61, 237, 82, 208, 202, 234, 50, 23, + 234, 187, 237, 61, 237, 82, 208, 202, 234, 51, 153, 209, 174, 23, 234, + 187, 237, 61, 237, 82, 208, 202, 234, 51, 218, 242, 206, 34, 23, 234, + 186, 23, 234, 187, 248, 206, 216, 177, 237, 181, 23, 234, 187, 234, 117, + 23, 234, 187, 153, 209, 174, 23, 234, 187, 234, 118, 153, 209, 174, 23, + 234, 187, 153, 248, 219, 23, 234, 187, 153, 236, 233, 23, 234, 187, 208, + 210, 124, 153, 209, 174, 23, 234, 187, 208, 210, 247, 55, 23, 234, 187, + 208, 210, 247, 56, 153, 209, 174, 23, 234, 187, 208, 210, 247, 56, 153, + 209, 175, 248, 219, 23, 234, 187, 208, 210, 224, 147, 23, 234, 193, 23, + 234, 194, 153, 209, 174, 23, 234, 194, 218, 242, 206, 34, 23, 234, 194, + 153, 236, 233, 23, 234, 183, 242, 197, 23, 234, 182, 23, 234, 192, 217, + 53, 23, 234, 191, 23, 234, 192, 176, 153, 209, 174, 23, 234, 192, 153, + 209, 174, 23, 234, 192, 176, 218, 242, 206, 34, 23, 234, 192, 218, 242, + 206, 34, 23, 234, 192, 176, 153, 236, 233, 23, 234, 192, 153, 236, 233, + 23, 234, 190, 217, 53, 23, 234, 189, 23, 234, 195, 23, 234, 180, 23, 234, + 181, 153, 209, 174, 23, 234, 181, 218, 242, 206, 34, 23, 234, 181, 153, + 236, 233, 23, 234, 185, 217, 53, 23, 234, 185, 176, 153, 236, 233, 23, + 234, 184, 23, 234, 185, 209, 53, 23, 234, 185, 176, 153, 209, 174, 23, + 234, 185, 153, 209, 174, 23, 234, 185, 176, 218, 242, 206, 34, 23, 234, + 185, 218, 242, 206, 34, 23, 234, 185, 153, 209, 175, 205, 140, 228, 103, + 23, 234, 185, 153, 248, 206, 101, 213, 26, 23, 234, 197, 23, 131, 124, + 101, 213, 26, 23, 234, 196, 124, 101, 213, 26, 23, 234, 185, 124, 101, + 213, 26, 23, 234, 198, 124, 101, 213, 26, 23, 234, 185, 224, 147, 23, + 131, 124, 101, 213, 27, 248, 219, 23, 131, 124, 101, 213, 27, 243, 57, + 23, 234, 185, 124, 101, 213, 27, 243, 57, 23, 131, 224, 148, 239, 167, + 23, 131, 224, 148, 127, 213, 22, 208, 67, 23, 131, 224, 148, 127, 213, + 22, 242, 187, 23, 131, 224, 148, 127, 217, 7, 246, 154, 23, 131, 224, + 148, 203, 228, 23, 131, 153, 203, 253, 224, 148, 203, 228, 23, 234, 196, + 224, 148, 203, 228, 23, 234, 181, 224, 148, 203, 228, 23, 234, 198, 224, + 148, 203, 228, 23, 131, 224, 148, 213, 220, 226, 91, 23, 131, 224, 148, + 248, 219, 23, 131, 224, 148, 205, 141, 206, 34, 23, 131, 224, 148, 206, + 34, 23, 234, 185, 224, 148, 206, 34, 23, 131, 224, 148, 124, 206, 34, 23, + 234, 185, 224, 148, 124, 206, 34, 23, 234, 198, 224, 148, 124, 153, 124, + 153, 216, 254, 23, 234, 198, 224, 148, 124, 153, 124, 206, 34, 23, 131, + 224, 148, 228, 103, 23, 234, 196, 224, 148, 228, 103, 23, 234, 185, 224, + 148, 228, 103, 23, 234, 198, 224, 148, 228, 103, 23, 131, 124, 101, 224, + 147, 23, 234, 196, 124, 101, 224, 147, 23, 234, 185, 124, 101, 224, 147, + 23, 234, 185, 213, 26, 23, 234, 198, 124, 101, 224, 147, 23, 131, 124, + 101, 242, 235, 224, 147, 23, 234, 196, 124, 101, 242, 235, 224, 147, 23, + 131, 213, 27, 239, 167, 23, 234, 185, 213, 27, 127, 124, 153, 233, 187, + 221, 204, 23, 234, 198, 213, 27, 127, 101, 153, 124, 242, 234, 23, 131, + 213, 27, 203, 228, 23, 131, 213, 27, 213, 220, 226, 91, 23, 131, 213, 27, + 224, 147, 23, 234, 196, 213, 27, 224, 147, 23, 234, 181, 213, 27, 224, + 147, 23, 234, 198, 213, 27, 224, 147, 23, 131, 213, 27, 221, 204, 23, + 131, 213, 27, 101, 243, 57, 23, 131, 213, 27, 101, 213, 220, 226, 90, 23, + 131, 213, 27, 228, 103, 23, 131, 213, 27, 206, 34, 23, 234, 183, 213, 27, + 206, 34, 23, 131, 124, 213, 27, 224, 147, 23, 234, 196, 124, 213, 27, + 224, 147, 23, 234, 190, 124, 213, 27, 224, 148, 217, 78, 23, 234, 183, + 124, 213, 27, 224, 148, 216, 254, 23, 234, 183, 124, 213, 27, 224, 148, + 228, 117, 23, 234, 183, 124, 213, 27, 224, 148, 203, 252, 23, 234, 192, + 124, 213, 27, 224, 147, 23, 234, 185, 124, 213, 27, 224, 147, 23, 234, + 198, 124, 213, 27, 224, 148, 216, 254, 23, 234, 198, 124, 213, 27, 224, + 147, 23, 131, 101, 239, 167, 23, 234, 185, 221, 204, 23, 131, 101, 203, + 228, 23, 234, 196, 101, 203, 228, 23, 131, 101, 213, 220, 226, 91, 23, + 131, 101, 115, 153, 209, 174, 23, 234, 183, 101, 206, 34, 23, 131, 101, + 153, 224, 147, 23, 131, 101, 224, 147, 23, 131, 101, 213, 27, 224, 147, + 23, 234, 196, 101, 213, 27, 224, 147, 23, 234, 190, 101, 213, 27, 224, + 148, 217, 78, 23, 234, 192, 101, 213, 27, 224, 147, 23, 234, 185, 101, + 213, 27, 224, 147, 23, 234, 198, 101, 213, 27, 224, 148, 216, 254, 23, + 234, 198, 101, 213, 27, 224, 148, 228, 117, 23, 234, 198, 101, 213, 27, + 224, 147, 23, 234, 196, 101, 213, 27, 224, 148, 248, 219, 23, 234, 194, + 101, 213, 27, 224, 148, 243, 57, 23, 234, 194, 101, 213, 27, 224, 148, + 243, 58, 209, 174, 23, 234, 183, 101, 213, 27, 224, 148, 243, 58, 216, + 254, 23, 234, 183, 101, 213, 27, 224, 148, 243, 58, 228, 117, 23, 234, + 183, 101, 213, 27, 224, 148, 243, 57, 23, 234, 185, 124, 234, 50, 23, + 131, 124, 153, 209, 174, 23, 234, 185, 124, 153, 209, 174, 23, 131, 124, + 153, 209, 175, 153, 241, 70, 23, 131, 124, 153, 209, 175, 153, 243, 57, + 23, 131, 124, 153, 209, 175, 153, 248, 219, 23, 131, 124, 153, 209, 175, + 124, 248, 219, 23, 131, 124, 153, 209, 175, 248, 96, 248, 219, 23, 131, + 124, 153, 209, 175, 124, 234, 52, 23, 131, 124, 153, 236, 234, 124, 208, + 67, 23, 131, 124, 153, 236, 234, 124, 248, 219, 23, 131, 124, 153, 117, + 23, 131, 124, 153, 242, 197, 23, 131, 124, 153, 242, 190, 153, 228, 73, + 23, 234, 194, 124, 153, 242, 190, 153, 228, 73, 23, 131, 124, 153, 242, + 190, 153, 203, 252, 23, 131, 124, 153, 246, 155, 23, 234, 192, 124, 206, + 34, 23, 234, 192, 124, 153, 217, 53, 23, 234, 185, 124, 153, 217, 53, 23, + 234, 185, 124, 153, 225, 70, 23, 234, 185, 124, 206, 34, 23, 234, 185, + 124, 153, 209, 53, 23, 234, 198, 124, 153, 216, 254, 23, 234, 198, 124, + 153, 228, 117, 23, 234, 198, 124, 206, 34, 23, 131, 206, 34, 23, 131, + 153, 234, 117, 23, 131, 153, 209, 175, 241, 70, 23, 131, 153, 209, 175, + 243, 57, 23, 131, 153, 209, 175, 248, 219, 23, 131, 153, 236, 233, 23, + 131, 153, 248, 206, 124, 221, 204, 23, 131, 153, 248, 206, 101, 213, 26, + 23, 131, 153, 248, 206, 213, 27, 224, 147, 23, 131, 153, 203, 253, 120, + 237, 81, 23, 131, 153, 119, 120, 237, 81, 23, 131, 153, 203, 253, 126, + 237, 81, 23, 131, 153, 203, 253, 236, 229, 237, 81, 23, 131, 153, 119, + 236, 229, 213, 220, 226, 90, 23, 234, 188, 23, 131, 234, 117, 23, 205, + 142, 209, 138, 23, 205, 142, 221, 20, 23, 205, 142, 248, 205, 23, 235, + 78, 209, 138, 23, 235, 78, 221, 20, 23, 235, 78, 248, 205, 23, 208, 52, + 209, 138, 23, 208, 52, 221, 20, 23, 208, 52, 248, 205, 23, 248, 44, 209, + 138, 23, 248, 44, 221, 20, 23, 248, 44, 248, 205, 23, 212, 173, 209, 138, + 23, 212, 173, 221, 20, 23, 212, 173, 248, 205, 23, 207, 203, 207, 116, + 23, 207, 203, 248, 205, 23, 208, 189, 225, 71, 209, 138, 23, 208, 189, 4, + 209, 138, 23, 208, 189, 225, 71, 221, 20, 23, 208, 189, 4, 221, 20, 23, + 208, 189, 210, 150, 23, 237, 35, 225, 71, 209, 138, 23, 237, 35, 4, 209, + 138, 23, 237, 35, 225, 71, 221, 20, 23, 237, 35, 4, 221, 20, 23, 237, 35, + 210, 150, 23, 208, 189, 237, 35, 251, 106, 23, 221, 51, 115, 127, 225, + 70, 23, 221, 51, 115, 127, 209, 53, 23, 221, 51, 115, 210, 150, 23, 221, + 51, 127, 210, 150, 23, 221, 51, 115, 127, 251, 107, 225, 70, 23, 221, 51, + 115, 127, 251, 107, 209, 53, 23, 221, 51, 209, 175, 205, 186, 209, 175, + 211, 216, 23, 221, 50, 237, 87, 243, 47, 23, 221, 52, 237, 87, 243, 47, + 23, 221, 50, 209, 139, 208, 68, 209, 53, 23, 221, 50, 209, 139, 208, 68, + 222, 65, 23, 221, 50, 209, 139, 208, 68, 225, 70, 23, 221, 50, 209, 139, + 208, 68, 225, 68, 23, 221, 50, 209, 139, 200, 220, 237, 38, 23, 221, 50, + 53, 208, 67, 23, 221, 50, 53, 200, 220, 237, 38, 23, 221, 50, 53, 251, + 106, 23, 221, 50, 53, 251, 107, 200, 220, 237, 38, 23, 221, 50, 242, 234, + 23, 221, 50, 205, 83, 208, 68, 221, 54, 23, 221, 50, 205, 83, 200, 220, + 237, 38, 23, 221, 50, 205, 83, 251, 106, 23, 221, 50, 205, 83, 251, 107, + 200, 220, 237, 38, 23, 221, 50, 248, 223, 209, 53, 23, 221, 50, 248, 223, + 222, 65, 23, 221, 50, 248, 223, 225, 70, 23, 221, 50, 243, 16, 209, 53, + 23, 221, 50, 243, 16, 222, 65, 23, 221, 50, 243, 16, 225, 70, 23, 221, + 50, 243, 16, 212, 226, 23, 221, 50, 247, 7, 209, 53, 23, 221, 50, 247, 7, + 222, 65, 23, 221, 50, 247, 7, 225, 70, 23, 221, 50, 100, 209, 53, 23, + 221, 50, 100, 222, 65, 23, 221, 50, 100, 225, 70, 23, 221, 50, 199, 27, + 209, 53, 23, 221, 50, 199, 27, 222, 65, 23, 221, 50, 199, 27, 225, 70, + 23, 221, 50, 216, 69, 209, 53, 23, 221, 50, 216, 69, 222, 65, 23, 221, + 50, 216, 69, 225, 70, 23, 205, 112, 212, 224, 209, 138, 23, 205, 112, + 212, 224, 239, 175, 23, 205, 112, 212, 224, 251, 106, 23, 205, 112, 212, + 225, 209, 138, 23, 205, 112, 212, 225, 239, 175, 23, 205, 112, 212, 225, + 251, 106, 23, 205, 112, 210, 95, 23, 205, 112, 250, 215, 208, 218, 209, + 138, 23, 205, 112, 250, 215, 208, 218, 239, 175, 23, 205, 112, 250, 215, + 208, 218, 205, 82, 23, 221, 53, 250, 116, 209, 53, 23, 221, 53, 250, 116, + 222, 65, 23, 221, 53, 250, 116, 225, 70, 23, 221, 53, 250, 116, 225, 68, + 23, 221, 53, 205, 136, 209, 53, 23, 221, 53, 205, 136, 222, 65, 23, 221, + 53, 205, 136, 225, 70, 23, 221, 53, 205, 136, 225, 68, 23, 221, 53, 248, + 206, 250, 116, 209, 53, 23, 221, 53, 248, 206, 250, 116, 222, 65, 23, + 221, 53, 248, 206, 250, 116, 225, 70, 23, 221, 53, 248, 206, 250, 116, + 225, 68, 23, 221, 53, 248, 206, 205, 136, 209, 53, 23, 221, 53, 248, 206, + 205, 136, 222, 65, 23, 221, 53, 248, 206, 205, 136, 225, 70, 23, 221, 53, + 248, 206, 205, 136, 225, 68, 23, 221, 52, 209, 139, 208, 68, 209, 53, 23, + 221, 52, 209, 139, 208, 68, 222, 65, 23, 221, 52, 209, 139, 208, 68, 225, + 70, 23, 221, 52, 209, 139, 208, 68, 225, 68, 23, 221, 52, 209, 139, 200, + 220, 237, 38, 23, 221, 52, 53, 208, 67, 23, 221, 52, 53, 200, 220, 237, + 38, 23, 221, 52, 53, 251, 106, 23, 221, 52, 53, 251, 107, 200, 220, 237, + 38, 23, 221, 52, 242, 234, 23, 221, 52, 205, 83, 208, 68, 221, 54, 23, + 221, 52, 205, 83, 200, 220, 237, 38, 23, 221, 52, 205, 83, 251, 107, 221, + 54, 23, 221, 52, 205, 83, 251, 107, 200, 220, 237, 38, 23, 221, 52, 248, + 222, 23, 221, 52, 243, 16, 209, 53, 23, 221, 52, 243, 16, 222, 65, 23, + 221, 52, 243, 16, 225, 70, 23, 221, 52, 247, 6, 23, 221, 52, 100, 209, + 53, 23, 221, 52, 100, 222, 65, 23, 221, 52, 100, 225, 70, 23, 221, 52, + 199, 27, 209, 53, 23, 221, 52, 199, 27, 222, 65, 23, 221, 52, 199, 27, + 225, 70, 23, 221, 52, 216, 69, 209, 53, 23, 221, 52, 216, 69, 222, 65, + 23, 221, 52, 216, 69, 225, 70, 23, 205, 113, 212, 225, 209, 138, 23, 205, + 113, 212, 225, 239, 175, 23, 205, 113, 212, 225, 251, 106, 23, 205, 113, + 212, 224, 209, 138, 23, 205, 113, 212, 224, 239, 175, 23, 205, 113, 212, + 224, 251, 106, 23, 205, 113, 210, 95, 23, 221, 50, 242, 190, 214, 88, + 209, 53, 23, 221, 50, 242, 190, 214, 88, 222, 65, 23, 221, 50, 242, 190, + 214, 88, 225, 70, 23, 221, 50, 242, 190, 214, 88, 225, 68, 23, 221, 50, + 242, 190, 234, 212, 209, 53, 23, 221, 50, 242, 190, 234, 212, 222, 65, + 23, 221, 50, 242, 190, 234, 212, 225, 70, 23, 221, 50, 242, 190, 234, + 212, 225, 68, 23, 221, 50, 242, 190, 206, 40, 246, 156, 209, 53, 23, 221, + 50, 242, 190, 206, 40, 246, 156, 222, 65, 23, 221, 50, 233, 85, 209, 53, + 23, 221, 50, 233, 85, 222, 65, 23, 221, 50, 233, 85, 225, 70, 23, 221, + 50, 224, 75, 209, 53, 23, 221, 50, 224, 75, 222, 65, 23, 221, 50, 224, + 75, 225, 70, 23, 221, 50, 224, 75, 4, 239, 175, 23, 221, 50, 201, 78, + 242, 190, 53, 209, 53, 23, 221, 50, 201, 78, 242, 190, 53, 222, 65, 23, + 221, 50, 201, 78, 242, 190, 53, 225, 70, 23, 221, 50, 201, 78, 242, 190, + 205, 83, 209, 53, 23, 221, 50, 201, 78, 242, 190, 205, 83, 222, 65, 23, + 221, 50, 201, 78, 242, 190, 205, 83, 225, 70, 23, 221, 50, 242, 190, 206, + 98, 208, 67, 23, 221, 50, 242, 188, 242, 235, 209, 53, 23, 221, 50, 242, + 188, 242, 235, 222, 65, 23, 212, 224, 209, 138, 23, 212, 224, 239, 175, + 23, 212, 224, 251, 108, 23, 221, 50, 210, 95, 23, 221, 50, 242, 190, 234, + 44, 236, 200, 201, 102, 23, 221, 50, 233, 85, 234, 44, 236, 200, 201, + 102, 23, 221, 50, 224, 75, 234, 44, 236, 200, 201, 102, 23, 221, 50, 201, + 78, 234, 44, 236, 200, 201, 102, 23, 212, 224, 209, 139, 234, 44, 236, + 200, 201, 102, 23, 212, 224, 53, 234, 44, 236, 200, 201, 102, 23, 212, + 224, 251, 107, 234, 44, 236, 200, 201, 102, 23, 221, 50, 242, 190, 234, + 44, 246, 243, 23, 221, 50, 233, 85, 234, 44, 246, 243, 23, 221, 50, 224, + 75, 234, 44, 246, 243, 23, 221, 50, 201, 78, 234, 44, 246, 243, 23, 212, + 224, 209, 139, 234, 44, 246, 243, 23, 212, 224, 53, 234, 44, 246, 243, + 23, 212, 224, 251, 107, 234, 44, 246, 243, 23, 221, 50, 201, 78, 241, 71, + 216, 91, 209, 53, 23, 221, 50, 201, 78, 241, 71, 216, 91, 222, 65, 23, + 221, 50, 201, 78, 241, 71, 216, 91, 225, 70, 23, 221, 52, 242, 190, 234, + 44, 247, 65, 209, 53, 23, 221, 52, 242, 190, 234, 44, 247, 65, 225, 70, + 23, 221, 52, 233, 85, 234, 44, 247, 65, 4, 239, 175, 23, 221, 52, 233, + 85, 234, 44, 247, 65, 225, 71, 239, 175, 23, 221, 52, 233, 85, 234, 44, + 247, 65, 4, 205, 82, 23, 221, 52, 233, 85, 234, 44, 247, 65, 225, 71, + 205, 82, 23, 221, 52, 224, 75, 234, 44, 247, 65, 4, 209, 138, 23, 221, + 52, 224, 75, 234, 44, 247, 65, 225, 71, 209, 138, 23, 221, 52, 224, 75, + 234, 44, 247, 65, 4, 239, 175, 23, 221, 52, 224, 75, 234, 44, 247, 65, + 225, 71, 239, 175, 23, 221, 52, 201, 78, 234, 44, 247, 65, 209, 53, 23, + 221, 52, 201, 78, 234, 44, 247, 65, 225, 70, 23, 212, 225, 209, 139, 234, + 44, 247, 64, 23, 212, 225, 53, 234, 44, 247, 64, 23, 212, 225, 251, 107, + 234, 44, 247, 64, 23, 221, 52, 242, 190, 234, 44, 237, 32, 209, 53, 23, + 221, 52, 242, 190, 234, 44, 237, 32, 225, 70, 23, 221, 52, 233, 85, 234, + 44, 237, 32, 4, 239, 175, 23, 221, 52, 233, 85, 234, 44, 237, 32, 225, + 71, 239, 175, 23, 221, 52, 233, 85, 234, 44, 237, 32, 205, 83, 4, 205, + 82, 23, 221, 52, 233, 85, 234, 44, 237, 32, 205, 83, 225, 71, 205, 82, + 23, 221, 52, 224, 75, 234, 44, 237, 32, 4, 209, 138, 23, 221, 52, 224, + 75, 234, 44, 237, 32, 225, 71, 209, 138, 23, 221, 52, 224, 75, 234, 44, + 237, 32, 4, 239, 175, 23, 221, 52, 224, 75, 234, 44, 237, 32, 225, 71, + 239, 175, 23, 221, 52, 201, 78, 234, 44, 237, 32, 209, 53, 23, 221, 52, + 201, 78, 234, 44, 237, 32, 225, 70, 23, 212, 225, 209, 139, 234, 44, 237, + 31, 23, 212, 225, 53, 234, 44, 237, 31, 23, 212, 225, 251, 107, 234, 44, + 237, 31, 23, 221, 52, 242, 190, 209, 53, 23, 221, 52, 242, 190, 222, 65, + 23, 221, 52, 242, 190, 225, 70, 23, 221, 52, 242, 190, 225, 68, 23, 221, + 52, 242, 190, 246, 74, 23, 221, 52, 233, 85, 209, 53, 23, 221, 52, 224, + 75, 209, 53, 23, 221, 52, 201, 78, 209, 41, 23, 221, 52, 201, 78, 209, + 53, 23, 221, 52, 201, 78, 225, 70, 23, 212, 225, 209, 138, 23, 212, 225, + 239, 175, 23, 212, 225, 251, 106, 23, 221, 52, 210, 96, 216, 120, 23, + 221, 50, 250, 215, 246, 156, 4, 209, 138, 23, 221, 50, 250, 215, 246, + 156, 222, 66, 209, 138, 23, 221, 50, 250, 215, 246, 156, 4, 239, 175, 23, + 221, 50, 250, 215, 246, 156, 222, 66, 239, 175, 23, 221, 52, 250, 215, + 246, 156, 234, 44, 201, 103, 4, 209, 138, 23, 221, 52, 250, 215, 246, + 156, 234, 44, 201, 103, 222, 66, 209, 138, 23, 221, 52, 250, 215, 246, + 156, 234, 44, 201, 103, 225, 71, 209, 138, 23, 221, 52, 250, 215, 246, + 156, 234, 44, 201, 103, 4, 239, 175, 23, 221, 52, 250, 215, 246, 156, + 234, 44, 201, 103, 222, 66, 239, 175, 23, 221, 52, 250, 215, 246, 156, + 234, 44, 201, 103, 225, 71, 239, 175, 23, 221, 50, 200, 220, 246, 156, + 236, 200, 209, 138, 23, 221, 50, 200, 220, 246, 156, 236, 200, 239, 175, + 23, 221, 52, 200, 220, 246, 156, 234, 44, 201, 103, 209, 138, 23, 221, + 52, 200, 220, 246, 156, 234, 44, 201, 103, 239, 175, 23, 221, 50, 237, + 87, 246, 153, 209, 138, 23, 221, 50, 237, 87, 246, 153, 239, 175, 23, + 221, 52, 237, 87, 246, 153, 234, 44, 201, 103, 209, 138, 23, 221, 52, + 237, 87, 246, 153, 234, 44, 201, 103, 239, 175, 23, 239, 98, 250, 203, + 209, 53, 23, 239, 98, 250, 203, 225, 70, 23, 239, 98, 237, 161, 23, 239, + 98, 209, 56, 23, 239, 98, 206, 159, 23, 239, 98, 213, 147, 23, 239, 98, + 209, 144, 23, 239, 98, 209, 145, 251, 106, 23, 239, 98, 238, 52, 217, 8, + 205, 234, 23, 239, 98, 235, 88, 23, 234, 136, 23, 234, 137, 213, 31, 23, + 234, 137, 221, 50, 208, 67, 23, 234, 137, 221, 50, 205, 237, 23, 234, + 137, 221, 52, 208, 67, 23, 234, 137, 221, 50, 242, 189, 23, 234, 137, + 221, 52, 242, 189, 23, 234, 137, 221, 55, 246, 155, 23, 237, 190, 241, 9, + 215, 70, 218, 217, 236, 234, 205, 235, 23, 237, 190, 241, 9, 215, 70, + 218, 217, 115, 217, 34, 239, 167, 23, 237, 190, 241, 9, 215, 70, 218, + 217, 115, 217, 34, 127, 205, 235, 23, 238, 21, 208, 68, 203, 228, 23, + 238, 21, 208, 68, 220, 9, 23, 238, 21, 208, 68, 239, 167, 23, 239, 154, + 238, 21, 220, 10, 239, 167, 23, 239, 154, 238, 21, 127, 220, 9, 23, 239, + 154, 238, 21, 115, 220, 9, 23, 239, 154, 238, 21, 220, 10, 203, 228, 23, + 236, 247, 220, 9, 23, 236, 247, 243, 47, 23, 236, 247, 200, 223, 23, 238, + 16, 217, 53, 23, 238, 16, 208, 188, 23, 238, 16, 246, 109, 23, 238, 23, + 248, 135, 209, 138, 23, 238, 23, 248, 135, 221, 20, 23, 238, 16, 167, + 217, 53, 23, 238, 16, 201, 28, 217, 53, 23, 238, 16, 167, 246, 109, 23, + 238, 16, 201, 26, 221, 54, 23, 238, 23, 201, 9, 23, 238, 17, 203, 228, + 23, 238, 17, 239, 167, 23, 238, 17, 237, 18, 23, 238, 19, 208, 67, 23, + 238, 19, 208, 68, 239, 175, 23, 238, 19, 208, 68, 251, 106, 23, 238, 20, + 208, 67, 23, 238, 20, 208, 68, 239, 175, 23, 238, 20, 208, 68, 251, 106, + 23, 238, 19, 242, 187, 23, 238, 20, 242, 187, 23, 238, 19, 246, 150, 23, + 247, 2, 214, 215, 23, 247, 2, 220, 9, 23, 247, 2, 207, 248, 23, 206, 160, + 247, 2, 234, 59, 23, 206, 160, 247, 2, 221, 204, 23, 206, 160, 247, 2, + 224, 59, 23, 239, 19, 23, 218, 217, 220, 9, 23, 218, 217, 243, 47, 23, + 218, 217, 200, 221, 23, 218, 217, 201, 23, 23, 251, 167, 248, 128, 216, + 254, 23, 251, 167, 207, 247, 228, 117, 23, 251, 167, 248, 130, 4, 212, + 223, 23, 251, 167, 207, 249, 4, 212, 223, 23, 248, 59, 228, 89, 23, 248, + 59, 238, 41, 23, 221, 59, 246, 110, 220, 9, 23, 221, 59, 246, 110, 236, + 233, 23, 221, 59, 246, 110, 243, 47, 23, 221, 59, 209, 48, 23, 221, 59, + 209, 49, 200, 223, 23, 221, 59, 209, 49, 217, 53, 23, 221, 59, 236, 196, + 23, 221, 59, 236, 197, 200, 223, 23, 221, 59, 236, 197, 217, 53, 23, 221, + 59, 176, 246, 155, 23, 221, 59, 176, 236, 233, 23, 221, 59, 176, 200, + 223, 23, 221, 59, 176, 216, 247, 23, 221, 59, 176, 216, 248, 200, 223, + 23, 221, 59, 176, 216, 248, 200, 58, 23, 221, 59, 176, 213, 175, 23, 221, + 59, 176, 213, 176, 200, 223, 23, 221, 59, 176, 213, 176, 200, 58, 23, + 221, 59, 226, 129, 23, 221, 59, 226, 130, 236, 233, 23, 221, 59, 226, + 130, 200, 223, 23, 221, 59, 206, 159, 23, 221, 59, 206, 160, 236, 233, + 23, 221, 59, 206, 160, 207, 248, 23, 224, 161, 215, 17, 205, 182, 23, + 224, 163, 224, 54, 119, 203, 224, 23, 224, 163, 203, 225, 119, 224, 53, + 23, 221, 59, 243, 14, 23, 221, 59, 200, 222, 209, 138, 23, 221, 59, 200, + 222, 239, 175, 23, 205, 164, 208, 87, 216, 255, 237, 163, 23, 205, 164, + 224, 206, 224, 160, 23, 205, 164, 205, 224, 248, 206, 224, 160, 23, 205, + 164, 205, 224, 205, 140, 228, 74, 221, 58, 23, 205, 164, 228, 74, 221, + 59, 213, 147, 23, 205, 164, 221, 49, 251, 191, 247, 3, 23, 205, 164, 247, + 56, 208, 87, 216, 254, 23, 205, 164, 247, 56, 228, 74, 221, 58, 23, 206, + 186, 23, 206, 187, 221, 54, 23, 206, 187, 217, 79, 205, 163, 23, 206, + 187, 217, 79, 205, 164, 221, 54, 23, 206, 187, 217, 79, 224, 160, 23, + 206, 187, 217, 79, 224, 161, 221, 54, 23, 206, 187, 248, 151, 224, 160, + 23, 221, 50, 227, 231, 23, 221, 52, 227, 231, 23, 220, 31, 23, 234, 221, + 23, 238, 44, 23, 209, 233, 234, 49, 208, 219, 23, 209, 233, 234, 49, 215, + 69, 23, 201, 101, 209, 233, 234, 49, 221, 57, 23, 237, 30, 209, 233, 234, + 49, 221, 57, 23, 209, 233, 205, 236, 236, 201, 201, 107, 23, 205, 147, + 208, 68, 208, 56, 23, 205, 147, 242, 188, 248, 222, 23, 205, 148, 204, + 144, 23, 203, 225, 248, 119, 205, 236, 236, 201, 234, 49, 227, 160, 23, + 224, 188, 246, 75, 23, 224, 188, 225, 1, 23, 224, 188, 225, 0, 23, 224, + 188, 224, 255, 23, 224, 188, 224, 254, 23, 224, 188, 224, 253, 23, 224, + 188, 224, 252, 23, 224, 188, 224, 251, 23, 237, 86, 23, 224, 106, 208, + 244, 23, 224, 107, 208, 244, 23, 224, 108, 234, 113, 23, 224, 108, 201, + 24, 23, 224, 108, 241, 123, 23, 224, 108, 234, 137, 220, 31, 23, 224, + 108, 205, 149, 23, 224, 108, 224, 187, 241, 41, 23, 246, 70, 23, 236, + 183, 208, 76, 23, 210, 167, 23, 246, 79, 23, 216, 115, 23, 237, 96, 221, + 118, 23, 237, 96, 221, 117, 23, 237, 96, 221, 116, 23, 237, 96, 221, 115, + 23, 237, 96, 221, 114, 23, 212, 227, 221, 118, 23, 212, 227, 221, 117, + 23, 212, 227, 221, 116, 23, 212, 227, 221, 115, 23, 212, 227, 221, 114, + 23, 212, 227, 221, 113, 23, 212, 227, 221, 112, 23, 212, 227, 221, 111, + 23, 212, 227, 221, 125, 23, 212, 227, 221, 124, 23, 212, 227, 221, 123, + 23, 212, 227, 221, 122, 23, 212, 227, 221, 121, 23, 212, 227, 221, 120, + 23, 212, 227, 221, 119, 38, 116, 1, 250, 104, 38, 116, 1, 248, 24, 38, + 116, 1, 203, 57, 38, 116, 1, 235, 130, 38, 116, 1, 240, 206, 38, 116, 1, + 200, 23, 38, 116, 1, 199, 61, 38, 116, 1, 199, 86, 38, 116, 1, 227, 255, + 38, 116, 1, 82, 227, 255, 38, 116, 1, 70, 38, 116, 1, 240, 226, 38, 116, + 1, 227, 74, 38, 116, 1, 224, 140, 38, 116, 1, 220, 218, 38, 116, 1, 220, + 120, 38, 116, 1, 217, 65, 38, 116, 1, 215, 93, 38, 116, 1, 213, 18, 38, + 116, 1, 209, 58, 38, 116, 1, 204, 171, 38, 116, 1, 204, 16, 38, 116, 1, + 236, 204, 38, 116, 1, 234, 95, 38, 116, 1, 209, 223, 38, 116, 1, 205, 11, + 38, 116, 1, 246, 198, 38, 116, 1, 210, 114, 38, 116, 1, 200, 29, 38, 116, + 1, 200, 31, 38, 116, 1, 200, 63, 38, 116, 1, 199, 211, 38, 116, 1, 4, + 199, 181, 38, 116, 1, 199, 245, 38, 116, 1, 228, 40, 4, 199, 181, 38, + 116, 1, 248, 175, 199, 181, 38, 116, 1, 228, 40, 248, 175, 199, 181, 38, + 116, 1, 237, 63, 78, 77, 5, 223, 242, 226, 163, 78, 77, 5, 223, 238, 161, + 78, 77, 5, 223, 236, 226, 15, 78, 77, 5, 223, 112, 227, 5, 78, 77, 5, + 223, 82, 227, 8, 78, 77, 5, 223, 101, 226, 68, 78, 77, 5, 223, 129, 226, + 88, 78, 77, 5, 222, 254, 226, 9, 78, 77, 5, 223, 233, 201, 31, 78, 77, 5, + 223, 231, 201, 114, 78, 77, 5, 223, 229, 200, 216, 78, 77, 5, 223, 51, + 201, 57, 78, 77, 5, 223, 59, 201, 64, 78, 77, 5, 223, 63, 200, 244, 78, + 77, 5, 223, 132, 201, 0, 78, 77, 5, 222, 239, 200, 212, 78, 77, 5, 223, + 34, 201, 55, 78, 77, 5, 223, 116, 200, 200, 78, 77, 5, 223, 128, 200, + 202, 78, 77, 5, 223, 38, 200, 201, 78, 77, 5, 223, 227, 221, 164, 78, 77, + 5, 223, 225, 222, 180, 78, 77, 5, 223, 223, 221, 14, 78, 77, 5, 223, 118, + 222, 40, 78, 77, 5, 223, 83, 221, 106, 78, 77, 5, 223, 23, 221, 38, 78, + 77, 5, 222, 244, 221, 32, 78, 77, 5, 223, 221, 248, 188, 78, 77, 5, 223, + 218, 249, 136, 78, 77, 5, 223, 216, 248, 36, 78, 77, 5, 223, 27, 248, + 252, 78, 77, 5, 223, 80, 249, 8, 78, 77, 5, 223, 74, 248, 111, 78, 77, 5, + 223, 39, 248, 124, 78, 77, 5, 223, 206, 70, 78, 77, 5, 223, 204, 62, 78, + 77, 5, 223, 202, 66, 78, 77, 5, 223, 14, 238, 255, 78, 77, 5, 223, 77, + 72, 78, 77, 5, 223, 12, 217, 63, 78, 77, 5, 223, 30, 74, 78, 77, 5, 223, + 40, 238, 234, 78, 77, 5, 223, 46, 228, 117, 78, 77, 5, 223, 42, 228, 117, + 78, 77, 5, 222, 238, 251, 85, 78, 77, 5, 222, 255, 238, 179, 78, 77, 5, + 223, 191, 209, 182, 78, 77, 5, 223, 189, 212, 64, 78, 77, 5, 223, 187, + 208, 24, 78, 77, 5, 223, 15, 211, 190, 78, 77, 5, 223, 61, 211, 202, 78, + 77, 5, 223, 41, 209, 10, 78, 77, 5, 223, 98, 209, 29, 78, 77, 5, 222, + 237, 209, 181, 78, 77, 5, 223, 177, 224, 210, 78, 77, 5, 223, 175, 194, + 78, 77, 5, 223, 173, 224, 42, 78, 77, 5, 223, 93, 225, 32, 78, 77, 5, + 223, 104, 225, 40, 78, 77, 5, 223, 123, 224, 78, 78, 77, 5, 223, 24, 224, + 110, 78, 77, 5, 223, 67, 168, 225, 40, 78, 77, 5, 223, 199, 241, 76, 78, + 77, 5, 223, 196, 242, 58, 78, 77, 5, 223, 193, 239, 137, 78, 77, 5, 223, + 88, 241, 161, 78, 77, 5, 222, 253, 240, 187, 78, 77, 5, 222, 252, 240, + 211, 78, 77, 5, 223, 185, 206, 15, 78, 77, 5, 223, 182, 207, 36, 78, 77, + 5, 223, 180, 204, 215, 78, 77, 5, 223, 86, 206, 190, 78, 77, 5, 223, 122, + 206, 201, 78, 77, 5, 223, 73, 205, 161, 78, 77, 5, 223, 108, 138, 78, 77, + 5, 223, 171, 227, 207, 78, 77, 5, 223, 168, 227, 248, 78, 77, 5, 223, + 166, 227, 147, 78, 77, 5, 223, 20, 227, 225, 78, 77, 5, 223, 64, 227, + 227, 78, 77, 5, 223, 17, 227, 156, 78, 77, 5, 223, 114, 227, 166, 78, 77, + 5, 223, 2, 168, 227, 166, 78, 77, 5, 223, 164, 200, 9, 78, 77, 5, 223, + 161, 183, 78, 77, 5, 223, 159, 199, 211, 78, 77, 5, 223, 68, 200, 48, 78, + 77, 5, 223, 97, 200, 51, 78, 77, 5, 223, 36, 199, 230, 78, 77, 5, 223, + 56, 199, 245, 78, 77, 5, 223, 155, 237, 112, 78, 77, 5, 223, 153, 237, + 195, 78, 77, 5, 223, 151, 236, 189, 78, 77, 5, 223, 99, 237, 140, 78, 77, + 5, 223, 102, 237, 147, 78, 77, 5, 223, 44, 237, 2, 78, 77, 5, 223, 89, + 237, 13, 78, 77, 5, 222, 236, 236, 188, 78, 77, 5, 223, 76, 237, 168, 78, + 77, 5, 223, 149, 219, 118, 78, 77, 5, 223, 147, 220, 134, 78, 77, 5, 223, + 145, 218, 89, 78, 77, 5, 223, 60, 220, 24, 78, 77, 5, 223, 8, 218, 234, + 78, 77, 5, 223, 1, 234, 75, 78, 77, 5, 223, 140, 144, 78, 77, 5, 222, + 247, 233, 97, 78, 77, 5, 223, 143, 234, 120, 78, 77, 5, 223, 81, 234, + 139, 78, 77, 5, 223, 138, 233, 188, 78, 77, 5, 223, 37, 233, 207, 78, 77, + 5, 223, 94, 234, 119, 78, 77, 5, 223, 49, 233, 181, 78, 77, 5, 223, 124, + 234, 53, 78, 77, 5, 223, 47, 234, 202, 78, 77, 5, 223, 90, 233, 84, 78, + 77, 5, 223, 125, 234, 105, 78, 77, 5, 222, 240, 233, 191, 78, 77, 5, 223, + 131, 233, 96, 78, 77, 5, 223, 87, 219, 218, 78, 77, 5, 223, 136, 219, + 232, 78, 77, 5, 223, 95, 219, 215, 78, 77, 5, 223, 62, 219, 226, 78, 77, + 5, 223, 31, 219, 227, 78, 77, 5, 223, 21, 219, 216, 78, 77, 5, 223, 57, + 219, 217, 78, 77, 5, 223, 18, 219, 231, 78, 77, 5, 223, 50, 219, 214, 78, + 77, 5, 223, 91, 168, 219, 227, 78, 77, 5, 223, 71, 168, 219, 216, 78, 77, + 5, 222, 250, 168, 219, 217, 78, 77, 5, 223, 22, 235, 161, 78, 77, 5, 223, + 66, 236, 89, 78, 77, 5, 223, 9, 235, 50, 78, 77, 5, 222, 243, 236, 7, 78, + 77, 5, 223, 11, 235, 36, 78, 77, 5, 223, 10, 235, 46, 78, 77, 5, 222, + 249, 219, 237, 78, 77, 5, 223, 120, 219, 174, 78, 77, 5, 223, 0, 219, + 163, 78, 77, 5, 223, 109, 215, 204, 78, 77, 5, 223, 78, 172, 78, 77, 5, + 223, 127, 214, 224, 78, 77, 5, 223, 96, 216, 61, 78, 77, 5, 223, 126, + 216, 73, 78, 77, 5, 223, 75, 215, 81, 78, 77, 5, 223, 111, 215, 106, 78, + 77, 5, 223, 32, 222, 95, 78, 77, 5, 223, 115, 222, 110, 78, 77, 5, 223, + 55, 222, 89, 78, 77, 5, 223, 130, 222, 102, 78, 77, 5, 222, 245, 222, + 102, 78, 77, 5, 223, 105, 222, 103, 78, 77, 5, 223, 5, 222, 90, 78, 77, + 5, 223, 3, 222, 91, 78, 77, 5, 222, 246, 222, 83, 78, 77, 5, 223, 16, + 168, 222, 103, 78, 77, 5, 223, 72, 168, 222, 90, 78, 77, 5, 223, 35, 168, + 222, 91, 78, 77, 5, 223, 45, 226, 42, 78, 77, 5, 223, 85, 226, 50, 78, + 77, 5, 223, 103, 226, 38, 78, 77, 5, 223, 134, 226, 45, 78, 77, 5, 223, + 69, 226, 46, 78, 77, 5, 223, 65, 226, 40, 78, 77, 5, 223, 19, 226, 41, + 78, 77, 5, 223, 53, 236, 24, 78, 77, 5, 223, 121, 236, 32, 78, 77, 5, + 223, 29, 236, 19, 78, 77, 5, 223, 84, 236, 28, 78, 77, 5, 223, 70, 236, + 29, 78, 77, 5, 223, 106, 236, 20, 78, 77, 5, 223, 107, 236, 22, 78, 77, + 5, 223, 6, 213, 252, 78, 77, 5, 223, 54, 220, 60, 78, 77, 5, 223, 48, + 220, 75, 78, 77, 5, 223, 52, 220, 42, 78, 77, 5, 222, 242, 220, 66, 78, + 77, 5, 223, 58, 220, 67, 78, 77, 5, 223, 110, 220, 47, 78, 77, 5, 223, + 113, 220, 51, 78, 77, 5, 223, 25, 219, 98, 78, 77, 5, 222, 241, 219, 68, + 78, 77, 5, 223, 28, 219, 89, 78, 77, 5, 223, 43, 219, 72, 78, 77, 5, 222, + 251, 202, 234, 78, 77, 5, 222, 248, 203, 90, 78, 77, 5, 223, 26, 201, + 166, 78, 77, 5, 223, 4, 203, 54, 78, 77, 5, 223, 92, 203, 59, 78, 77, 5, + 223, 33, 202, 179, 78, 77, 5, 223, 100, 202, 193, 78, 77, 5, 223, 13, + 218, 35, 78, 77, 5, 223, 119, 218, 54, 78, 77, 5, 223, 7, 218, 17, 78, + 77, 5, 223, 79, 218, 46, 78, 77, 5, 223, 117, 218, 24, 78, 77, 17, 102, + 78, 77, 17, 105, 78, 77, 17, 147, 78, 77, 17, 149, 78, 77, 17, 164, 78, + 77, 17, 187, 78, 77, 17, 210, 135, 78, 77, 17, 192, 78, 77, 17, 219, 113, + 78, 77, 38, 41, 206, 188, 78, 77, 38, 41, 206, 161, 78, 77, 38, 41, 233, + 80, 78, 77, 38, 41, 206, 48, 78, 77, 38, 41, 206, 167, 206, 48, 78, 77, + 38, 41, 233, 83, 206, 48, 78, 77, 38, 41, 221, 167, 251, 227, 6, 1, 251, + 130, 251, 227, 6, 1, 242, 55, 251, 227, 6, 1, 225, 173, 251, 227, 6, 1, + 221, 180, 251, 227, 6, 1, 249, 136, 251, 227, 6, 1, 209, 133, 251, 227, + 6, 1, 216, 73, 251, 227, 6, 1, 248, 196, 251, 227, 6, 1, 213, 252, 251, + 227, 6, 1, 72, 251, 227, 6, 1, 237, 195, 251, 227, 6, 1, 70, 251, 227, 6, + 1, 74, 251, 227, 6, 1, 241, 100, 251, 227, 6, 1, 200, 10, 251, 227, 6, 1, + 201, 72, 251, 227, 6, 1, 218, 89, 251, 227, 6, 1, 227, 86, 251, 227, 6, + 1, 183, 251, 227, 6, 1, 66, 251, 227, 6, 1, 227, 199, 251, 227, 6, 1, + 246, 236, 251, 227, 6, 1, 144, 251, 227, 6, 1, 214, 157, 251, 227, 6, 1, + 236, 89, 251, 227, 6, 1, 218, 60, 251, 227, 6, 1, 204, 215, 251, 227, 6, + 1, 219, 154, 251, 227, 6, 1, 203, 90, 251, 227, 6, 1, 226, 207, 251, 227, + 6, 1, 236, 29, 251, 227, 6, 1, 199, 103, 251, 227, 6, 1, 226, 41, 251, + 227, 6, 1, 210, 114, 251, 227, 4, 1, 251, 130, 251, 227, 4, 1, 242, 55, + 251, 227, 4, 1, 225, 173, 251, 227, 4, 1, 221, 180, 251, 227, 4, 1, 249, + 136, 251, 227, 4, 1, 209, 133, 251, 227, 4, 1, 216, 73, 251, 227, 4, 1, + 248, 196, 251, 227, 4, 1, 213, 252, 251, 227, 4, 1, 72, 251, 227, 4, 1, + 237, 195, 251, 227, 4, 1, 70, 251, 227, 4, 1, 74, 251, 227, 4, 1, 241, + 100, 251, 227, 4, 1, 200, 10, 251, 227, 4, 1, 201, 72, 251, 227, 4, 1, + 218, 89, 251, 227, 4, 1, 227, 86, 251, 227, 4, 1, 183, 251, 227, 4, 1, + 66, 251, 227, 4, 1, 227, 199, 251, 227, 4, 1, 246, 236, 251, 227, 4, 1, + 144, 251, 227, 4, 1, 214, 157, 251, 227, 4, 1, 236, 89, 251, 227, 4, 1, + 218, 60, 251, 227, 4, 1, 204, 215, 251, 227, 4, 1, 219, 154, 251, 227, 4, + 1, 203, 90, 251, 227, 4, 1, 226, 207, 251, 227, 4, 1, 236, 29, 251, 227, + 4, 1, 199, 103, 251, 227, 4, 1, 226, 41, 251, 227, 4, 1, 210, 114, 251, + 227, 251, 131, 224, 250, 251, 227, 22, 224, 250, 251, 227, 236, 3, 81, + 251, 227, 234, 203, 251, 227, 111, 221, 126, 251, 227, 236, 4, 111, 221, + 126, 251, 227, 218, 100, 251, 227, 17, 199, 81, 251, 227, 17, 102, 251, + 227, 17, 105, 251, 227, 17, 147, 251, 227, 17, 149, 251, 227, 17, 164, + 251, 227, 17, 187, 251, 227, 17, 210, 135, 251, 227, 17, 192, 251, 227, + 17, 219, 113, 251, 227, 82, 238, 43, 81, 251, 227, 82, 214, 79, 81, 9, + 13, 251, 142, 9, 13, 248, 240, 9, 13, 227, 224, 9, 13, 242, 29, 9, 13, + 201, 72, 9, 13, 199, 105, 9, 13, 234, 224, 9, 13, 207, 9, 9, 13, 200, 46, + 9, 13, 227, 86, 9, 13, 225, 91, 9, 13, 222, 61, 9, 13, 218, 227, 9, 13, + 211, 186, 9, 13, 251, 171, 9, 13, 237, 134, 9, 13, 212, 56, 9, 13, 214, + 152, 9, 13, 213, 154, 9, 13, 210, 61, 9, 13, 206, 183, 9, 13, 206, 102, + 9, 13, 226, 203, 9, 13, 206, 114, 9, 13, 242, 52, 9, 13, 199, 108, 9, 13, + 235, 194, 9, 13, 240, 181, 248, 240, 9, 13, 240, 181, 218, 227, 9, 13, + 240, 181, 237, 134, 9, 13, 240, 181, 214, 152, 9, 13, 82, 248, 240, 9, + 13, 82, 227, 224, 9, 13, 82, 234, 115, 9, 13, 82, 234, 224, 9, 13, 82, + 200, 46, 9, 13, 82, 227, 86, 9, 13, 82, 225, 91, 9, 13, 82, 222, 61, 9, + 13, 82, 218, 227, 9, 13, 82, 211, 186, 9, 13, 82, 251, 171, 9, 13, 82, + 237, 134, 9, 13, 82, 212, 56, 9, 13, 82, 214, 152, 9, 13, 82, 210, 61, 9, + 13, 82, 206, 183, 9, 13, 82, 206, 102, 9, 13, 82, 226, 203, 9, 13, 82, + 242, 52, 9, 13, 82, 235, 194, 9, 13, 207, 5, 227, 224, 9, 13, 207, 5, + 234, 224, 9, 13, 207, 5, 200, 46, 9, 13, 207, 5, 225, 91, 9, 13, 207, 5, + 218, 227, 9, 13, 207, 5, 211, 186, 9, 13, 207, 5, 251, 171, 9, 13, 207, + 5, 212, 56, 9, 13, 207, 5, 214, 152, 9, 13, 207, 5, 210, 61, 9, 13, 207, + 5, 226, 203, 9, 13, 207, 5, 242, 52, 9, 13, 207, 5, 235, 194, 9, 13, 207, + 5, 240, 181, 218, 227, 9, 13, 207, 5, 240, 181, 214, 152, 9, 13, 208, 55, + 248, 240, 9, 13, 208, 55, 227, 224, 9, 13, 208, 55, 234, 115, 9, 13, 208, + 55, 234, 224, 9, 13, 208, 55, 207, 9, 9, 13, 208, 55, 200, 46, 9, 13, + 208, 55, 227, 86, 9, 13, 208, 55, 222, 61, 9, 13, 208, 55, 218, 227, 9, + 13, 208, 55, 211, 186, 9, 13, 208, 55, 251, 171, 9, 13, 208, 55, 237, + 134, 9, 13, 208, 55, 212, 56, 9, 13, 208, 55, 214, 152, 9, 13, 208, 55, + 210, 61, 9, 13, 208, 55, 206, 183, 9, 13, 208, 55, 206, 102, 9, 13, 208, + 55, 226, 203, 9, 13, 208, 55, 242, 52, 9, 13, 208, 55, 199, 108, 9, 13, + 208, 55, 235, 194, 9, 13, 208, 55, 240, 181, 248, 240, 9, 13, 208, 55, + 240, 181, 237, 134, 9, 13, 224, 73, 251, 142, 9, 13, 224, 73, 248, 240, + 9, 13, 224, 73, 227, 224, 9, 13, 224, 73, 242, 29, 9, 13, 224, 73, 234, + 115, 9, 13, 224, 73, 201, 72, 9, 13, 224, 73, 199, 105, 9, 13, 224, 73, + 234, 224, 9, 13, 224, 73, 207, 9, 9, 13, 224, 73, 200, 46, 9, 13, 224, + 73, 225, 91, 9, 13, 224, 73, 222, 61, 9, 13, 224, 73, 218, 227, 9, 13, + 224, 73, 211, 186, 9, 13, 224, 73, 251, 171, 9, 13, 224, 73, 237, 134, 9, + 13, 224, 73, 212, 56, 9, 13, 224, 73, 214, 152, 9, 13, 224, 73, 213, 154, + 9, 13, 224, 73, 210, 61, 9, 13, 224, 73, 206, 183, 9, 13, 224, 73, 206, + 102, 9, 13, 224, 73, 226, 203, 9, 13, 224, 73, 206, 114, 9, 13, 224, 73, + 242, 52, 9, 13, 224, 73, 199, 108, 9, 13, 224, 73, 235, 194, 9, 13, 175, + 248, 240, 9, 13, 175, 227, 224, 9, 13, 175, 242, 29, 9, 13, 175, 201, 72, + 9, 13, 175, 199, 105, 9, 13, 175, 234, 224, 9, 13, 175, 207, 9, 9, 13, + 175, 200, 46, 9, 13, 175, 225, 91, 9, 13, 175, 222, 61, 9, 13, 175, 218, + 227, 9, 13, 175, 211, 186, 9, 13, 175, 251, 171, 9, 13, 175, 237, 134, 9, + 13, 175, 212, 56, 9, 13, 175, 214, 152, 9, 13, 175, 213, 154, 9, 13, 175, + 210, 61, 9, 13, 175, 206, 183, 9, 13, 175, 206, 102, 9, 13, 175, 226, + 203, 9, 13, 175, 206, 114, 9, 13, 175, 242, 52, 9, 13, 175, 199, 108, 9, + 13, 175, 235, 194, 9, 13, 217, 44, 84, 3, 155, 3, 206, 223, 9, 13, 217, + 44, 155, 3, 242, 29, 222, 200, 103, 239, 14, 201, 16, 222, 200, 103, 208, + 254, 201, 16, 222, 200, 103, 201, 48, 201, 16, 222, 200, 103, 157, 201, + 16, 222, 200, 103, 213, 170, 239, 158, 222, 200, 103, 235, 64, 239, 158, + 222, 200, 103, 64, 239, 158, 222, 200, 103, 112, 76, 247, 19, 222, 200, + 103, 120, 76, 247, 19, 222, 200, 103, 126, 76, 247, 19, 222, 200, 103, + 236, 229, 76, 247, 19, 222, 200, 103, 237, 61, 76, 247, 19, 222, 200, + 103, 209, 106, 76, 247, 19, 222, 200, 103, 210, 136, 76, 247, 19, 222, + 200, 103, 238, 232, 76, 247, 19, 222, 200, 103, 219, 114, 76, 247, 19, + 222, 200, 103, 112, 76, 249, 89, 222, 200, 103, 120, 76, 249, 89, 222, + 200, 103, 126, 76, 249, 89, 222, 200, 103, 236, 229, 76, 249, 89, 222, + 200, 103, 237, 61, 76, 249, 89, 222, 200, 103, 209, 106, 76, 249, 89, + 222, 200, 103, 210, 136, 76, 249, 89, 222, 200, 103, 238, 232, 76, 249, + 89, 222, 200, 103, 219, 114, 76, 249, 89, 222, 200, 103, 112, 76, 246, + 152, 222, 200, 103, 120, 76, 246, 152, 222, 200, 103, 126, 76, 246, 152, + 222, 200, 103, 236, 229, 76, 246, 152, 222, 200, 103, 237, 61, 76, 246, + 152, 222, 200, 103, 209, 106, 76, 246, 152, 222, 200, 103, 210, 136, 76, + 246, 152, 222, 200, 103, 238, 232, 76, 246, 152, 222, 200, 103, 219, 114, + 76, 246, 152, 222, 200, 103, 215, 116, 222, 200, 103, 217, 31, 222, 200, + 103, 249, 90, 222, 200, 103, 246, 193, 222, 200, 103, 208, 199, 222, 200, + 103, 207, 230, 222, 200, 103, 250, 126, 222, 200, 103, 201, 7, 222, 200, + 103, 227, 159, 222, 200, 103, 249, 129, 166, 103, 233, 177, 249, 129, + 166, 103, 233, 175, 166, 103, 233, 174, 166, 103, 233, 173, 166, 103, + 233, 172, 166, 103, 233, 171, 166, 103, 233, 170, 166, 103, 233, 169, + 166, 103, 233, 168, 166, 103, 233, 167, 166, 103, 233, 166, 166, 103, + 233, 165, 166, 103, 233, 164, 166, 103, 233, 163, 166, 103, 233, 162, + 166, 103, 233, 161, 166, 103, 233, 160, 166, 103, 233, 159, 166, 103, + 233, 158, 166, 103, 233, 157, 166, 103, 233, 156, 166, 103, 233, 155, + 166, 103, 233, 154, 166, 103, 233, 153, 166, 103, 233, 152, 166, 103, + 233, 151, 166, 103, 233, 150, 166, 103, 233, 149, 166, 103, 233, 148, + 166, 103, 233, 147, 166, 103, 233, 146, 166, 103, 233, 145, 166, 103, + 233, 144, 166, 103, 233, 143, 166, 103, 233, 142, 166, 103, 233, 141, + 166, 103, 233, 140, 166, 103, 233, 139, 166, 103, 233, 138, 166, 103, + 233, 137, 166, 103, 233, 136, 166, 103, 233, 135, 166, 103, 233, 134, + 166, 103, 233, 133, 166, 103, 233, 132, 166, 103, 233, 131, 166, 103, + 233, 130, 166, 103, 233, 129, 166, 103, 233, 128, 166, 103, 233, 127, + 166, 103, 83, 249, 129, 166, 103, 203, 41, 166, 103, 203, 40, 166, 103, + 203, 39, 166, 103, 203, 38, 166, 103, 203, 37, 166, 103, 203, 36, 166, + 103, 203, 35, 166, 103, 203, 34, 166, 103, 203, 33, 166, 103, 203, 32, + 166, 103, 203, 31, 166, 103, 203, 30, 166, 103, 203, 29, 166, 103, 203, + 28, 166, 103, 203, 27, 166, 103, 203, 26, 166, 103, 203, 25, 166, 103, + 203, 24, 166, 103, 203, 23, 166, 103, 203, 22, 166, 103, 203, 21, 166, + 103, 203, 20, 166, 103, 203, 19, 166, 103, 203, 18, 166, 103, 203, 17, + 166, 103, 203, 16, 166, 103, 203, 15, 166, 103, 203, 14, 166, 103, 203, + 13, 166, 103, 203, 12, 166, 103, 203, 11, 166, 103, 203, 10, 166, 103, + 203, 9, 166, 103, 203, 8, 166, 103, 203, 7, 166, 103, 203, 6, 166, 103, + 203, 5, 166, 103, 203, 4, 166, 103, 203, 3, 166, 103, 203, 2, 166, 103, + 203, 1, 166, 103, 203, 0, 166, 103, 202, 255, 166, 103, 202, 254, 166, + 103, 202, 253, 166, 103, 202, 252, 166, 103, 202, 251, 166, 103, 202, + 250, 166, 103, 202, 249, 215, 125, 247, 134, 249, 129, 215, 125, 247, + 134, 251, 245, 76, 208, 241, 215, 125, 247, 134, 120, 76, 208, 241, 215, + 125, 247, 134, 126, 76, 208, 241, 215, 125, 247, 134, 236, 229, 76, 208, + 241, 215, 125, 247, 134, 237, 61, 76, 208, 241, 215, 125, 247, 134, 209, + 106, 76, 208, 241, 215, 125, 247, 134, 210, 136, 76, 208, 241, 215, 125, + 247, 134, 238, 232, 76, 208, 241, 215, 125, 247, 134, 219, 114, 76, 208, + 241, 215, 125, 247, 134, 206, 167, 76, 208, 241, 215, 125, 247, 134, 227, + 246, 76, 208, 241, 215, 125, 247, 134, 226, 94, 76, 208, 241, 215, 125, + 247, 134, 214, 81, 76, 208, 241, 215, 125, 247, 134, 226, 145, 76, 208, + 241, 215, 125, 247, 134, 251, 245, 76, 234, 125, 215, 125, 247, 134, 120, + 76, 234, 125, 215, 125, 247, 134, 126, 76, 234, 125, 215, 125, 247, 134, + 236, 229, 76, 234, 125, 215, 125, 247, 134, 237, 61, 76, 234, 125, 215, + 125, 247, 134, 209, 106, 76, 234, 125, 215, 125, 247, 134, 210, 136, 76, + 234, 125, 215, 125, 247, 134, 238, 232, 76, 234, 125, 215, 125, 247, 134, + 219, 114, 76, 234, 125, 215, 125, 247, 134, 206, 167, 76, 234, 125, 215, + 125, 247, 134, 227, 246, 76, 234, 125, 215, 125, 247, 134, 226, 94, 76, + 234, 125, 215, 125, 247, 134, 214, 81, 76, 234, 125, 215, 125, 247, 134, + 226, 145, 76, 234, 125, 215, 125, 247, 134, 213, 170, 227, 159, 215, 125, + 247, 134, 251, 245, 76, 241, 63, 215, 125, 247, 134, 120, 76, 241, 63, + 215, 125, 247, 134, 126, 76, 241, 63, 215, 125, 247, 134, 236, 229, 76, + 241, 63, 215, 125, 247, 134, 237, 61, 76, 241, 63, 215, 125, 247, 134, + 209, 106, 76, 241, 63, 215, 125, 247, 134, 210, 136, 76, 241, 63, 215, + 125, 247, 134, 238, 232, 76, 241, 63, 215, 125, 247, 134, 219, 114, 76, + 241, 63, 215, 125, 247, 134, 206, 167, 76, 241, 63, 215, 125, 247, 134, + 227, 246, 76, 241, 63, 215, 125, 247, 134, 226, 94, 76, 241, 63, 215, + 125, 247, 134, 214, 81, 76, 241, 63, 215, 125, 247, 134, 226, 145, 76, + 241, 63, 215, 125, 247, 134, 63, 227, 159, 215, 125, 247, 134, 251, 245, + 76, 246, 95, 215, 125, 247, 134, 120, 76, 246, 95, 215, 125, 247, 134, + 126, 76, 246, 95, 215, 125, 247, 134, 236, 229, 76, 246, 95, 215, 125, + 247, 134, 237, 61, 76, 246, 95, 215, 125, 247, 134, 209, 106, 76, 246, + 95, 215, 125, 247, 134, 210, 136, 76, 246, 95, 215, 125, 247, 134, 238, + 232, 76, 246, 95, 215, 125, 247, 134, 219, 114, 76, 246, 95, 215, 125, + 247, 134, 206, 167, 76, 246, 95, 215, 125, 247, 134, 227, 246, 76, 246, + 95, 215, 125, 247, 134, 226, 94, 76, 246, 95, 215, 125, 247, 134, 214, + 81, 76, 246, 95, 215, 125, 247, 134, 226, 145, 76, 246, 95, 215, 125, + 247, 134, 64, 227, 159, 215, 125, 247, 134, 237, 0, 215, 125, 247, 134, + 205, 60, 215, 125, 247, 134, 205, 49, 215, 125, 247, 134, 205, 46, 215, + 125, 247, 134, 205, 45, 215, 125, 247, 134, 205, 44, 215, 125, 247, 134, + 205, 43, 215, 125, 247, 134, 205, 42, 215, 125, 247, 134, 205, 41, 215, + 125, 247, 134, 205, 40, 215, 125, 247, 134, 205, 59, 215, 125, 247, 134, + 205, 58, 215, 125, 247, 134, 205, 57, 215, 125, 247, 134, 205, 56, 215, + 125, 247, 134, 205, 55, 215, 125, 247, 134, 205, 54, 215, 125, 247, 134, + 205, 53, 215, 125, 247, 134, 205, 52, 215, 125, 247, 134, 205, 51, 215, + 125, 247, 134, 205, 50, 215, 125, 247, 134, 205, 48, 215, 125, 247, 134, + 205, 47, 17, 199, 82, 236, 183, 208, 76, 17, 199, 82, 246, 70, 17, 112, + 246, 70, 17, 120, 246, 70, 17, 126, 246, 70, 17, 236, 229, 246, 70, 17, + 237, 61, 246, 70, 17, 209, 106, 246, 70, 17, 210, 136, 246, 70, 17, 238, + 232, 246, 70, 17, 219, 114, 246, 70, 241, 17, 44, 43, 17, 199, 81, 241, + 17, 189, 44, 43, 17, 199, 81, 106, 8, 6, 1, 62, 106, 8, 6, 1, 250, 103, + 106, 8, 6, 1, 247, 223, 106, 8, 6, 1, 242, 153, 106, 8, 6, 1, 72, 106, 8, + 6, 1, 238, 5, 106, 8, 6, 1, 236, 156, 106, 8, 6, 1, 234, 247, 106, 8, 6, + 1, 70, 106, 8, 6, 1, 227, 251, 106, 8, 6, 1, 227, 118, 106, 8, 6, 1, 156, + 106, 8, 6, 1, 223, 243, 106, 8, 6, 1, 220, 214, 106, 8, 6, 1, 74, 106, 8, + 6, 1, 216, 226, 106, 8, 6, 1, 214, 167, 106, 8, 6, 1, 146, 106, 8, 6, 1, + 212, 122, 106, 8, 6, 1, 207, 83, 106, 8, 6, 1, 66, 106, 8, 6, 1, 203, + 168, 106, 8, 6, 1, 201, 147, 106, 8, 6, 1, 200, 195, 106, 8, 6, 1, 200, + 123, 106, 8, 6, 1, 199, 157, 205, 146, 210, 55, 248, 69, 8, 6, 1, 212, + 122, 44, 39, 8, 6, 1, 247, 223, 44, 39, 8, 6, 1, 146, 44, 247, 77, 44, + 200, 197, 95, 8, 6, 1, 62, 95, 8, 6, 1, 250, 103, 95, 8, 6, 1, 247, 223, + 95, 8, 6, 1, 242, 153, 95, 8, 6, 1, 72, 95, 8, 6, 1, 238, 5, 95, 8, 6, 1, + 236, 156, 95, 8, 6, 1, 234, 247, 95, 8, 6, 1, 70, 95, 8, 6, 1, 227, 251, + 95, 8, 6, 1, 227, 118, 95, 8, 6, 1, 156, 95, 8, 6, 1, 223, 243, 95, 8, 6, + 1, 220, 214, 95, 8, 6, 1, 74, 95, 8, 6, 1, 216, 226, 95, 8, 6, 1, 214, + 167, 95, 8, 6, 1, 146, 95, 8, 6, 1, 212, 122, 95, 8, 6, 1, 207, 83, 95, + 8, 6, 1, 66, 95, 8, 6, 1, 203, 168, 95, 8, 6, 1, 201, 147, 95, 8, 6, 1, + 200, 195, 95, 8, 6, 1, 200, 123, 95, 8, 6, 1, 199, 157, 95, 233, 69, 95, + 220, 238, 95, 211, 204, 95, 208, 182, 95, 215, 45, 95, 201, 65, 189, 44, + 8, 6, 1, 62, 189, 44, 8, 6, 1, 250, 103, 189, 44, 8, 6, 1, 247, 223, 189, + 44, 8, 6, 1, 242, 153, 189, 44, 8, 6, 1, 72, 189, 44, 8, 6, 1, 238, 5, + 189, 44, 8, 6, 1, 236, 156, 189, 44, 8, 6, 1, 234, 247, 189, 44, 8, 6, 1, + 70, 189, 44, 8, 6, 1, 227, 251, 189, 44, 8, 6, 1, 227, 118, 189, 44, 8, + 6, 1, 156, 189, 44, 8, 6, 1, 223, 243, 189, 44, 8, 6, 1, 220, 214, 189, + 44, 8, 6, 1, 74, 189, 44, 8, 6, 1, 216, 226, 189, 44, 8, 6, 1, 214, 167, + 189, 44, 8, 6, 1, 146, 189, 44, 8, 6, 1, 212, 122, 189, 44, 8, 6, 1, 207, + 83, 189, 44, 8, 6, 1, 66, 189, 44, 8, 6, 1, 203, 168, 189, 44, 8, 6, 1, + 201, 147, 189, 44, 8, 6, 1, 200, 195, 189, 44, 8, 6, 1, 200, 123, 189, + 44, 8, 6, 1, 199, 157, 213, 220, 222, 82, 54, 213, 220, 222, 79, 54, 189, + 95, 8, 6, 1, 62, 189, 95, 8, 6, 1, 250, 103, 189, 95, 8, 6, 1, 247, 223, + 189, 95, 8, 6, 1, 242, 153, 189, 95, 8, 6, 1, 72, 189, 95, 8, 6, 1, 238, + 5, 189, 95, 8, 6, 1, 236, 156, 189, 95, 8, 6, 1, 234, 247, 189, 95, 8, 6, + 1, 70, 189, 95, 8, 6, 1, 227, 251, 189, 95, 8, 6, 1, 227, 118, 189, 95, + 8, 6, 1, 156, 189, 95, 8, 6, 1, 223, 243, 189, 95, 8, 6, 1, 220, 214, + 189, 95, 8, 6, 1, 74, 189, 95, 8, 6, 1, 216, 226, 189, 95, 8, 6, 1, 214, + 167, 189, 95, 8, 6, 1, 146, 189, 95, 8, 6, 1, 212, 122, 189, 95, 8, 6, 1, + 207, 83, 189, 95, 8, 6, 1, 66, 189, 95, 8, 6, 1, 203, 168, 189, 95, 8, 6, + 1, 201, 147, 189, 95, 8, 6, 1, 200, 195, 189, 95, 8, 6, 1, 200, 123, 189, + 95, 8, 6, 1, 199, 157, 242, 232, 189, 95, 8, 6, 1, 216, 226, 189, 95, + 232, 233, 189, 95, 172, 189, 95, 212, 64, 189, 95, 252, 89, 189, 95, 201, + 65, 52, 240, 230, 95, 246, 136, 95, 243, 26, 95, 236, 210, 95, 232, 224, + 95, 220, 7, 95, 219, 255, 95, 217, 98, 95, 209, 5, 95, 115, 3, 238, 43, + 81, 95, 202, 169, 95, 126, 242, 153, 95, 211, 196, 211, 209, 95, 120, + 227, 118, 95, 236, 229, 227, 118, 95, 238, 232, 227, 118, 95, 237, 61, + 215, 100, 102, 95, 210, 136, 215, 100, 102, 95, 204, 149, 215, 100, 105, + 95, 209, 93, 216, 226, 95, 112, 233, 83, 204, 160, 216, 226, 95, 8, 4, 1, + 242, 153, 95, 234, 142, 95, 234, 141, 95, 234, 74, 95, 224, 66, 95, 209, + 201, 95, 204, 24, 95, 202, 190, 213, 162, 228, 100, 16, 1, 62, 213, 162, + 228, 100, 16, 1, 250, 103, 213, 162, 228, 100, 16, 1, 247, 223, 213, 162, + 228, 100, 16, 1, 242, 153, 213, 162, 228, 100, 16, 1, 72, 213, 162, 228, + 100, 16, 1, 238, 5, 213, 162, 228, 100, 16, 1, 236, 156, 213, 162, 228, + 100, 16, 1, 234, 247, 213, 162, 228, 100, 16, 1, 70, 213, 162, 228, 100, + 16, 1, 227, 251, 213, 162, 228, 100, 16, 1, 227, 118, 213, 162, 228, 100, + 16, 1, 156, 213, 162, 228, 100, 16, 1, 223, 243, 213, 162, 228, 100, 16, + 1, 220, 214, 213, 162, 228, 100, 16, 1, 74, 213, 162, 228, 100, 16, 1, + 216, 226, 213, 162, 228, 100, 16, 1, 214, 167, 213, 162, 228, 100, 16, 1, + 146, 213, 162, 228, 100, 16, 1, 212, 122, 213, 162, 228, 100, 16, 1, 207, + 83, 213, 162, 228, 100, 16, 1, 66, 213, 162, 228, 100, 16, 1, 203, 168, + 213, 162, 228, 100, 16, 1, 201, 147, 213, 162, 228, 100, 16, 1, 200, 195, + 213, 162, 228, 100, 16, 1, 200, 123, 213, 162, 228, 100, 16, 1, 199, 157, + 52, 177, 233, 201, 95, 69, 226, 76, 95, 69, 212, 64, 95, 12, 203, 244, + 230, 169, 95, 12, 203, 244, 230, 173, 95, 12, 203, 244, 230, 181, 95, 69, + 241, 175, 95, 12, 203, 244, 230, 188, 95, 12, 203, 244, 230, 175, 95, 12, + 203, 244, 230, 147, 95, 12, 203, 244, 230, 174, 95, 12, 203, 244, 230, + 187, 95, 12, 203, 244, 230, 161, 95, 12, 203, 244, 230, 154, 95, 12, 203, + 244, 230, 163, 95, 12, 203, 244, 230, 184, 95, 12, 203, 244, 230, 170, + 95, 12, 203, 244, 230, 186, 95, 12, 203, 244, 230, 162, 95, 12, 203, 244, + 230, 185, 95, 12, 203, 244, 230, 148, 95, 12, 203, 244, 230, 153, 95, 12, + 203, 244, 230, 146, 95, 12, 203, 244, 230, 176, 95, 12, 203, 244, 230, + 178, 95, 12, 203, 244, 230, 156, 95, 12, 203, 244, 230, 167, 95, 12, 203, + 244, 230, 165, 95, 12, 203, 244, 230, 191, 95, 12, 203, 244, 230, 190, + 95, 12, 203, 244, 230, 144, 95, 12, 203, 244, 230, 171, 95, 12, 203, 244, + 230, 189, 95, 12, 203, 244, 230, 180, 95, 12, 203, 244, 230, 166, 95, 12, + 203, 244, 230, 145, 95, 12, 203, 244, 230, 168, 95, 12, 203, 244, 230, + 150, 95, 12, 203, 244, 230, 149, 95, 12, 203, 244, 230, 179, 95, 12, 203, + 244, 230, 157, 95, 12, 203, 244, 230, 159, 95, 12, 203, 244, 230, 160, + 95, 12, 203, 244, 230, 152, 95, 12, 203, 244, 230, 183, 95, 12, 203, 244, + 230, 177, 95, 12, 203, 244, 230, 143, 205, 146, 210, 55, 248, 69, 12, + 203, 244, 230, 158, 205, 146, 210, 55, 248, 69, 12, 203, 244, 230, 190, + 205, 146, 210, 55, 248, 69, 12, 203, 244, 230, 188, 205, 146, 210, 55, + 248, 69, 12, 203, 244, 230, 172, 205, 146, 210, 55, 248, 69, 12, 203, + 244, 230, 155, 205, 146, 210, 55, 248, 69, 12, 203, 244, 230, 168, 205, + 146, 210, 55, 248, 69, 12, 203, 244, 230, 151, 205, 146, 210, 55, 248, + 69, 12, 203, 244, 230, 182, 205, 146, 210, 55, 248, 69, 12, 203, 244, + 230, 164, 44, 198, 198, 251, 223, 44, 198, 198, 251, 249, 242, 164, 237, + 11, 246, 110, 204, 9, 219, 130, 3, 208, 106, 207, 223, 119, 221, 62, 207, + 222, 246, 140, 250, 156, 239, 111, 207, 221, 119, 248, 25, 213, 221, 248, + 51, 250, 156, 219, 129, 201, 83, 201, 77, 202, 184, 221, 172, 201, 67, + 239, 18, 235, 124, 238, 59, 239, 18, 235, 124, 251, 92, 239, 18, 235, + 124, 250, 174, 235, 124, 3, 222, 31, 220, 8, 221, 82, 99, 201, 69, 242, + 244, 221, 82, 99, 237, 73, 214, 88, 221, 82, 99, 201, 69, 235, 157, 221, + 82, 99, 236, 183, 221, 82, 99, 201, 97, 235, 157, 221, 82, 99, 225, 64, + 214, 88, 221, 82, 99, 201, 97, 242, 244, 221, 82, 99, 242, 244, 221, 81, + 220, 8, 221, 82, 3, 237, 189, 237, 73, 214, 88, 221, 82, 3, 237, 189, + 225, 64, 214, 88, 221, 82, 3, 237, 189, 236, 183, 221, 82, 3, 237, 189, + 207, 229, 3, 237, 189, 235, 121, 208, 109, 209, 255, 208, 109, 206, 94, + 63, 239, 145, 64, 207, 228, 64, 207, 229, 3, 4, 246, 101, 64, 207, 229, + 248, 237, 246, 101, 64, 207, 229, 248, 237, 246, 102, 3, 213, 222, 246, + 102, 3, 213, 222, 246, 102, 3, 209, 35, 246, 102, 3, 224, 193, 246, 102, + 3, 205, 150, 237, 12, 201, 17, 248, 128, 237, 189, 233, 118, 240, 200, + 207, 16, 248, 1, 246, 242, 211, 188, 238, 53, 205, 108, 241, 169, 205, + 108, 216, 177, 205, 108, 247, 183, 233, 118, 216, 29, 204, 205, 246, 246, + 248, 131, 212, 232, 234, 73, 207, 226, 248, 131, 239, 22, 76, 222, 189, + 239, 22, 76, 213, 83, 234, 100, 236, 229, 225, 36, 246, 100, 222, 162, + 225, 35, 237, 172, 225, 35, 225, 36, 237, 19, 228, 118, 201, 16, 220, + 247, 205, 178, 250, 138, 235, 81, 222, 49, 201, 81, 206, 239, 225, 5, + 249, 85, 215, 157, 213, 170, 251, 10, 235, 64, 251, 10, 216, 67, 216, 70, + 246, 247, 208, 60, 234, 208, 209, 68, 76, 215, 137, 222, 72, 217, 79, + 248, 112, 215, 57, 225, 16, 213, 84, 242, 250, 213, 84, 249, 97, 243, 29, + 213, 83, 242, 192, 26, 213, 83, 208, 94, 248, 82, 208, 240, 248, 62, 236, + 209, 236, 205, 212, 253, 207, 179, 215, 59, 242, 7, 217, 123, 207, 197, + 236, 206, 209, 226, 237, 72, 247, 177, 3, 207, 172, 241, 112, 209, 23, + 232, 232, 242, 248, 210, 73, 232, 231, 232, 232, 242, 248, 239, 170, 243, + 28, 246, 208, 148, 247, 148, 224, 93, 242, 183, 233, 190, 215, 61, 209, + 239, 248, 218, 248, 78, 215, 62, 76, 237, 1, 243, 27, 236, 246, 26, 226, + 95, 206, 198, 201, 3, 234, 177, 212, 41, 248, 95, 26, 242, 202, 201, 13, + 235, 128, 246, 88, 235, 128, 205, 63, 239, 151, 248, 248, 221, 30, 246, + 117, 248, 248, 221, 29, 249, 132, 248, 94, 236, 246, 26, 226, 96, 3, 215, + 126, 248, 95, 3, 215, 74, 243, 17, 215, 76, 213, 85, 200, 227, 215, 20, + 248, 159, 247, 176, 227, 245, 246, 200, 205, 108, 237, 155, 246, 199, + 237, 75, 237, 76, 208, 238, 249, 96, 216, 105, 215, 75, 243, 65, 249, 97, + 206, 243, 205, 108, 242, 232, 237, 47, 215, 158, 241, 166, 227, 236, 240, + 193, 247, 123, 208, 59, 201, 17, 246, 224, 221, 82, 202, 221, 247, 42, + 211, 222, 211, 249, 235, 87, 247, 144, 234, 128, 3, 205, 224, 217, 79, + 206, 107, 225, 28, 248, 88, 76, 237, 23, 221, 174, 222, 69, 213, 142, + 213, 85, 32, 226, 213, 3, 227, 244, 208, 30, 221, 208, 224, 229, 209, 66, + 243, 34, 226, 92, 249, 4, 250, 184, 32, 218, 204, 249, 4, 241, 118, 32, + 218, 204, 237, 90, 236, 214, 251, 226, 206, 9, 247, 124, 233, 120, 237, + 121, 201, 37, 212, 243, 246, 89, 237, 67, 215, 91, 26, 237, 71, 221, 208, + 221, 48, 247, 162, 246, 159, 234, 132, 250, 193, 216, 180, 205, 158, 234, + 157, 246, 145, 206, 158, 206, 10, 246, 131, 248, 121, 216, 22, 250, 191, + 202, 230, 236, 63, 241, 10, 234, 45, 209, 59, 222, 230, 248, 171, 236, + 64, 241, 56, 248, 81, 237, 25, 215, 125, 247, 132, 32, 218, 209, 221, 21, + 32, 218, 204, 211, 235, 235, 34, 32, 226, 212, 205, 39, 202, 210, 32, + 211, 214, 212, 155, 210, 12, 3, 211, 252, 206, 163, 213, 241, 26, 249, + 97, 209, 85, 26, 209, 85, 248, 105, 249, 59, 26, 233, 183, 246, 248, 237, + 53, 209, 34, 212, 156, 207, 202, 208, 205, 222, 69, 205, 64, 233, 121, + 213, 242, 251, 93, 236, 254, 212, 169, 236, 254, 207, 174, 201, 53, 224, + 198, 235, 107, 213, 243, 221, 69, 213, 243, 247, 135, 242, 241, 249, 56, + 26, 249, 97, 202, 183, 237, 111, 233, 204, 208, 88, 26, 249, 97, 232, + 232, 233, 204, 208, 88, 26, 214, 217, 207, 23, 206, 163, 216, 198, 26, + 249, 97, 209, 36, 247, 140, 221, 63, 247, 160, 249, 7, 3, 204, 9, 248, + 27, 243, 48, 233, 110, 248, 25, 246, 139, 241, 122, 233, 110, 248, 26, + 246, 129, 248, 26, 241, 114, 241, 115, 228, 19, 220, 118, 216, 111, 208, + 119, 233, 110, 248, 26, 233, 110, 3, 236, 47, 217, 115, 248, 26, 227, + 236, 215, 67, 217, 114, 238, 58, 215, 67, 217, 114, 233, 119, 249, 81, + 250, 128, 206, 171, 222, 230, 233, 115, 224, 60, 233, 115, 243, 32, 208, + 72, 211, 221, 241, 125, 208, 72, 237, 178, 228, 0, 225, 76, 227, 236, + 247, 113, 238, 58, 247, 113, 64, 216, 41, 63, 216, 41, 201, 75, 64, 237, + 53, 201, 75, 63, 237, 53, 212, 231, 63, 212, 231, 225, 168, 249, 115, + 213, 241, 26, 209, 204, 248, 86, 26, 48, 251, 88, 238, 185, 67, 237, 62, + 204, 126, 238, 185, 67, 237, 62, 204, 123, 238, 185, 67, 237, 62, 204, + 121, 238, 185, 67, 237, 62, 204, 119, 238, 185, 67, 237, 62, 204, 117, + 213, 204, 221, 60, 216, 235, 201, 83, 248, 31, 242, 255, 206, 2, 224, + 245, 213, 244, 247, 111, 239, 158, 242, 240, 201, 40, 209, 43, 209, 41, + 233, 120, 213, 216, 235, 112, 210, 59, 221, 100, 212, 235, 246, 234, 240, + 200, 215, 168, 248, 122, 238, 201, 217, 126, 208, 218, 210, 54, 248, 30, + 251, 51, 233, 189, 225, 161, 248, 246, 237, 71, 205, 63, 237, 71, 248, + 129, 204, 182, 234, 155, 246, 235, 249, 132, 246, 235, 236, 199, 249, + 132, 246, 235, 248, 162, 216, 43, 226, 86, 215, 80, 239, 148, 247, 164, + 249, 120, 247, 164, 240, 192, 221, 61, 237, 189, 243, 0, 237, 189, 206, + 3, 237, 189, 213, 245, 237, 189, 247, 112, 237, 189, 239, 159, 237, 189, + 208, 203, 201, 40, 233, 121, 237, 189, 221, 101, 237, 189, 240, 201, 237, + 189, 215, 169, 237, 189, 236, 203, 237, 189, 234, 205, 237, 189, 200, + 253, 237, 189, 249, 2, 237, 189, 216, 159, 237, 189, 215, 169, 218, 216, + 216, 85, 215, 7, 246, 219, 238, 15, 238, 22, 239, 21, 218, 216, 221, 58, + 205, 163, 64, 115, 215, 96, 249, 127, 228, 103, 64, 127, 215, 96, 249, + 127, 228, 103, 64, 49, 215, 96, 249, 127, 228, 103, 64, 51, 215, 96, 249, + 127, 228, 103, 237, 65, 234, 200, 54, 201, 75, 234, 200, 54, 217, 99, + 234, 200, 54, 206, 33, 115, 54, 206, 33, 127, 54, 246, 130, 234, 175, 54, + 176, 234, 175, 54, 242, 226, 200, 249, 234, 157, 238, 18, 220, 30, 207, + 82, 227, 226, 239, 153, 226, 148, 248, 173, 200, 249, 246, 103, 214, 198, + 234, 179, 215, 58, 222, 170, 210, 5, 250, 151, 210, 5, 234, 58, 210, 5, + 200, 249, 212, 10, 200, 249, 248, 104, 236, 252, 247, 249, 228, 118, 209, + 155, 247, 248, 228, 118, 209, 155, 248, 76, 235, 140, 222, 180, 200, 250, + 237, 169, 222, 181, 26, 200, 251, 233, 198, 234, 174, 120, 222, 41, 233, + 198, 234, 174, 120, 200, 248, 233, 198, 234, 174, 215, 88, 217, 113, 200, + 251, 3, 248, 11, 239, 19, 248, 52, 3, 203, 50, 216, 11, 3, 248, 133, 234, + 221, 222, 181, 3, 235, 47, 215, 205, 222, 166, 222, 181, 3, 204, 191, + 217, 91, 222, 180, 217, 91, 200, 250, 249, 131, 243, 49, 200, 234, 215, + 12, 227, 236, 217, 109, 227, 236, 235, 111, 235, 169, 249, 132, 251, 74, + 238, 27, 251, 132, 251, 133, 221, 91, 228, 123, 209, 80, 228, 92, 241, + 111, 216, 10, 235, 41, 242, 12, 224, 159, 220, 142, 215, 87, 237, 190, + 222, 130, 234, 220, 249, 75, 215, 90, 207, 102, 215, 161, 226, 130, 81, + 224, 60, 224, 236, 213, 26, 236, 5, 208, 78, 226, 129, 248, 87, 243, 2, + 3, 234, 127, 201, 60, 249, 0, 234, 127, 248, 46, 234, 127, 120, 234, 125, + 208, 236, 234, 127, 235, 57, 234, 127, 234, 128, 3, 48, 248, 127, 234, + 127, 235, 64, 234, 127, 200, 44, 234, 127, 214, 199, 234, 127, 234, 128, + 3, 213, 85, 213, 99, 234, 125, 234, 128, 241, 166, 241, 65, 210, 86, 3, + 35, 73, 228, 73, 238, 204, 162, 248, 23, 251, 73, 99, 248, 113, 209, 71, + 99, 246, 81, 99, 208, 212, 207, 181, 99, 239, 145, 241, 245, 99, 215, + 162, 76, 215, 81, 237, 37, 248, 185, 240, 231, 99, 208, 228, 249, 96, + 206, 52, 249, 96, 64, 237, 24, 233, 83, 215, 94, 99, 221, 105, 249, 113, + 242, 195, 238, 45, 80, 240, 194, 54, 242, 246, 247, 133, 249, 80, 3, 200, + 42, 54, 249, 80, 3, 240, 194, 54, 249, 80, 3, 238, 61, 54, 249, 80, 3, + 215, 56, 54, 221, 105, 3, 201, 11, 247, 16, 3, 182, 205, 104, 26, 200, + 42, 54, 211, 199, 216, 9, 243, 70, 248, 50, 221, 162, 237, 29, 240, 253, + 217, 37, 241, 2, 239, 106, 237, 97, 237, 9, 176, 237, 97, 237, 9, 216, + 196, 3, 242, 198, 216, 196, 237, 182, 203, 228, 247, 170, 206, 197, 247, + 170, 247, 134, 228, 103, 247, 16, 3, 182, 205, 103, 247, 16, 3, 191, 205, + 103, 249, 77, 247, 15, 246, 116, 214, 194, 212, 221, 214, 194, 216, 133, + 208, 68, 212, 163, 205, 95, 212, 163, 248, 109, 207, 21, 225, 33, 218, + 207, 218, 208, 3, 241, 165, 243, 1, 246, 110, 248, 110, 176, 248, 110, + 235, 64, 248, 110, 248, 127, 248, 110, 217, 32, 248, 110, 248, 107, 220, + 136, 249, 117, 211, 207, 222, 42, 206, 176, 213, 184, 216, 194, 237, 152, + 222, 230, 211, 248, 251, 48, 214, 218, 251, 232, 224, 62, 247, 0, 222, + 54, 216, 253, 205, 111, 228, 114, 205, 111, 216, 203, 239, 74, 99, 228, + 111, 238, 144, 238, 145, 3, 191, 55, 56, 246, 110, 222, 195, 3, 224, 52, + 237, 53, 246, 110, 222, 195, 3, 213, 220, 237, 53, 176, 222, 195, 3, 213, + 220, 237, 53, 176, 222, 195, 3, 224, 52, 237, 53, 215, 64, 215, 65, 233, + 124, 220, 4, 221, 134, 215, 213, 221, 134, 215, 214, 3, 87, 55, 250, 156, + 225, 28, 202, 233, 221, 133, 221, 134, 215, 214, 217, 116, 218, 242, 221, + 134, 215, 212, 251, 49, 3, 249, 66, 247, 162, 247, 163, 3, 237, 46, 202, + 230, 247, 162, 206, 173, 213, 236, 202, 229, 237, 90, 214, 250, 215, 71, + 208, 89, 215, 33, 249, 6, 204, 145, 87, 250, 199, 246, 112, 87, 26, 98, + 176, 246, 156, 250, 199, 246, 112, 87, 26, 98, 176, 246, 156, 250, 200, + 3, 44, 112, 216, 242, 246, 112, 191, 26, 182, 176, 246, 156, 250, 199, + 251, 47, 191, 26, 182, 176, 246, 156, 250, 199, 128, 248, 49, 99, 122, + 248, 49, 99, 208, 233, 3, 247, 155, 97, 208, 232, 208, 233, 3, 112, 209, + 1, 201, 77, 208, 233, 3, 126, 209, 1, 201, 76, 249, 49, 238, 204, 215, + 118, 225, 23, 222, 207, 235, 128, 213, 41, 222, 207, 235, 128, 224, 104, + 3, 228, 84, 216, 47, 246, 110, 224, 104, 3, 226, 214, 226, 214, 224, 103, + 176, 224, 103, 248, 230, 248, 231, 3, 247, 155, 97, 248, 108, 224, 167, + 99, 213, 237, 247, 243, 249, 130, 3, 98, 55, 56, 238, 171, 3, 98, 55, 56, + 217, 79, 3, 238, 43, 134, 3, 49, 51, 55, 56, 209, 9, 3, 87, 55, 56, 205, + 158, 3, 182, 55, 56, 218, 242, 112, 203, 253, 238, 230, 99, 226, 211, + 206, 166, 228, 78, 16, 36, 8, 6, 224, 235, 228, 78, 16, 36, 8, 4, 224, + 235, 228, 78, 16, 36, 218, 94, 228, 78, 16, 36, 207, 116, 228, 78, 16, + 36, 8, 224, 235, 237, 77, 238, 204, 205, 153, 200, 225, 234, 206, 218, + 77, 26, 248, 115, 233, 205, 215, 143, 221, 207, 206, 174, 242, 216, 249, + 97, 209, 106, 215, 98, 208, 110, 3, 101, 240, 182, 227, 236, 16, 36, 248, + 243, 205, 93, 238, 187, 63, 52, 247, 243, 64, 52, 247, 243, 225, 71, 213, + 170, 246, 155, 225, 71, 248, 127, 246, 155, 225, 71, 217, 32, 241, 64, + 225, 71, 248, 127, 241, 64, 4, 217, 32, 241, 64, 4, 248, 127, 241, 64, + 203, 227, 213, 170, 205, 98, 239, 166, 213, 170, 205, 98, 203, 227, 4, + 213, 170, 205, 98, 239, 166, 4, 213, 170, 205, 98, 224, 54, 51, 210, 101, + 64, 246, 155, 203, 225, 51, 210, 101, 64, 246, 155, 44, 242, 235, 215, + 84, 242, 235, 215, 85, 3, 234, 212, 57, 242, 235, 215, 84, 218, 211, 49, + 210, 170, 3, 126, 240, 180, 218, 211, 51, 210, 170, 3, 126, 240, 180, 16, + 36, 222, 144, 247, 22, 64, 8, 242, 234, 80, 8, 242, 234, 247, 60, 242, + 234, 217, 87, 99, 239, 169, 76, 216, 71, 227, 103, 221, 74, 207, 110, + 222, 37, 3, 219, 114, 248, 65, 248, 83, 76, 233, 35, 246, 114, 237, 190, + 112, 217, 132, 246, 114, 237, 190, 120, 217, 132, 246, 114, 237, 190, + 126, 217, 132, 246, 114, 237, 190, 236, 229, 217, 132, 246, 114, 237, + 190, 237, 61, 217, 132, 246, 114, 237, 190, 209, 106, 217, 132, 246, 114, + 237, 190, 210, 136, 217, 132, 246, 114, 237, 190, 238, 232, 217, 132, + 246, 114, 237, 190, 219, 114, 217, 132, 246, 114, 237, 190, 206, 167, + 217, 132, 246, 114, 237, 190, 238, 200, 217, 132, 246, 114, 237, 190, + 204, 165, 217, 132, 246, 114, 237, 190, 217, 72, 246, 114, 237, 190, 204, + 139, 246, 114, 237, 190, 206, 39, 246, 114, 237, 190, 236, 225, 246, 114, + 237, 190, 237, 59, 246, 114, 237, 190, 209, 102, 246, 114, 237, 190, 210, + 134, 246, 114, 237, 190, 238, 231, 246, 114, 237, 190, 219, 112, 246, + 114, 237, 190, 206, 165, 246, 114, 237, 190, 238, 198, 246, 114, 237, + 190, 204, 163, 51, 208, 232, 51, 208, 233, 3, 112, 209, 1, 201, 77, 51, + 208, 233, 3, 126, 209, 1, 201, 76, 248, 18, 248, 19, 3, 209, 1, 201, 76, + 213, 25, 248, 230, 248, 110, 247, 153, 222, 167, 246, 113, 63, 209, 81, + 26, 242, 233, 218, 242, 215, 149, 233, 197, 222, 181, 228, 118, 247, 251, + 207, 242, 224, 228, 209, 69, 217, 34, 208, 194, 241, 250, 207, 224, 208, + 221, 208, 222, 201, 61, 227, 148, 222, 181, 242, 11, 49, 234, 200, 206, + 176, 213, 184, 206, 176, 213, 185, 3, 216, 195, 51, 234, 200, 206, 176, + 213, 184, 64, 205, 139, 206, 175, 63, 205, 139, 206, 175, 206, 176, 217, + 79, 205, 158, 76, 221, 130, 246, 134, 221, 134, 215, 213, 249, 130, 76, + 238, 144, 208, 115, 238, 144, 238, 145, 3, 224, 193, 237, 16, 238, 144, + 216, 48, 119, 208, 115, 238, 144, 224, 166, 216, 132, 63, 214, 194, 224, + 54, 49, 216, 46, 224, 54, 49, 249, 92, 216, 47, 224, 54, 49, 236, 231, + 216, 47, 224, 54, 49, 216, 189, 224, 54, 49, 242, 249, 49, 200, 219, 234, + 199, 204, 185, 217, 99, 234, 200, 54, 213, 220, 234, 200, 3, 237, 82, + 208, 211, 213, 105, 213, 220, 234, 200, 3, 237, 82, 208, 211, 213, 105, + 206, 33, 115, 54, 213, 105, 206, 33, 127, 54, 213, 105, 202, 232, 234, + 199, 213, 105, 234, 200, 3, 101, 237, 87, 238, 32, 213, 220, 234, 200, 3, + 216, 110, 248, 206, 101, 26, 213, 27, 237, 81, 64, 127, 215, 96, 49, 234, + 200, 228, 103, 209, 173, 64, 49, 215, 96, 228, 103, 209, 173, 64, 51, + 215, 96, 228, 103, 209, 173, 63, 49, 215, 96, 228, 103, 209, 173, 63, 51, + 215, 96, 228, 103, 63, 49, 215, 96, 249, 127, 228, 103, 63, 51, 215, 96, + 249, 127, 228, 103, 209, 173, 64, 115, 215, 96, 228, 103, 209, 173, 64, + 127, 215, 96, 228, 103, 209, 173, 63, 115, 215, 96, 228, 103, 209, 173, + 63, 127, 215, 96, 228, 103, 63, 115, 215, 96, 249, 127, 228, 103, 63, + 127, 215, 96, 249, 127, 228, 103, 63, 234, 127, 241, 110, 243, 70, 226, + 213, 26, 221, 60, 126, 220, 12, 243, 69, 215, 8, 215, 104, 247, 172, 63, + 234, 165, 210, 55, 237, 29, 240, 253, 64, 234, 165, 210, 55, 237, 29, + 240, 253, 209, 23, 210, 55, 237, 29, 240, 253, 206, 235, 247, 117, 201, + 6, 226, 212, 112, 247, 244, 221, 60, 120, 247, 244, 221, 60, 126, 247, + 244, 221, 60, 205, 130, 40, 216, 9, 243, 70, 234, 165, 240, 253, 211, + 209, 215, 9, 232, 225, 237, 152, 232, 225, 217, 37, 241, 3, 232, 225, + 240, 205, 3, 206, 126, 240, 205, 3, 206, 127, 26, 215, 198, 240, 205, 3, + 215, 198, 236, 216, 3, 215, 198, 236, 216, 3, 205, 238, 236, 216, 3, 251, + 86, 200, 195, 63, 237, 9, 237, 9, 176, 237, 9, 247, 134, 124, 240, 238, + 247, 134, 237, 97, 248, 78, 237, 97, 247, 185, 238, 181, 218, 209, 238, + 181, 218, 210, 216, 195, 238, 181, 218, 210, 216, 201, 218, 209, 218, + 210, 216, 195, 218, 210, 216, 201, 238, 181, 240, 204, 238, 181, 216, + 195, 238, 181, 216, 193, 240, 204, 216, 195, 216, 193, 201, 87, 208, 218, + 218, 210, 216, 201, 208, 218, 247, 171, 216, 201, 241, 110, 201, 15, 221, + 159, 222, 120, 216, 244, 246, 112, 51, 26, 49, 210, 170, 250, 199, 247, + 155, 200, 195, 228, 109, 237, 3, 209, 90, 99, 241, 164, 237, 3, 209, 90, + 99, 243, 71, 40, 226, 214, 212, 244, 220, 4, 216, 196, 3, 44, 206, 126, + 208, 80, 247, 15, 242, 41, 226, 95, 224, 160, 208, 231, 234, 137, 228, + 118, 209, 155, 126, 213, 195, 56, 126, 213, 195, 57, 126, 213, 195, 225, + 28, 126, 213, 195, 213, 46, 49, 208, 228, 248, 35, 51, 208, 228, 248, 35, + 120, 208, 228, 248, 34, 126, 208, 228, 248, 34, 49, 206, 52, 248, 35, 51, + 206, 52, 248, 35, 49, 251, 73, 248, 35, 51, 251, 73, 248, 35, 221, 86, + 248, 35, 224, 194, 221, 86, 248, 35, 224, 194, 221, 85, 249, 94, 100, 3, + 249, 93, 249, 94, 135, 200, 195, 249, 94, 100, 3, 135, 200, 195, 249, 94, + 27, 135, 200, 195, 249, 94, 100, 3, 27, 135, 200, 195, 162, 247, 7, 81, + 249, 94, 100, 3, 27, 247, 6, 200, 233, 222, 164, 221, 65, 236, 184, 205, + 180, 205, 135, 208, 101, 76, 224, 208, 209, 156, 76, 227, 237, 221, 46, + 235, 61, 237, 189, 235, 61, 237, 190, 3, 209, 47, 238, 15, 237, 190, 3, + 206, 193, 76, 227, 150, 209, 47, 237, 190, 3, 176, 221, 58, 209, 47, 237, + 190, 3, 176, 221, 59, 26, 209, 47, 238, 15, 209, 47, 237, 190, 3, 176, + 221, 59, 26, 246, 83, 207, 180, 209, 47, 237, 190, 3, 176, 221, 59, 26, + 206, 0, 238, 15, 209, 47, 237, 190, 3, 234, 211, 209, 47, 237, 190, 3, + 233, 123, 201, 8, 237, 189, 209, 47, 237, 190, 3, 209, 47, 238, 15, 237, + 190, 211, 240, 241, 144, 237, 1, 213, 145, 237, 189, 209, 47, 237, 190, + 3, 234, 126, 238, 15, 209, 47, 237, 190, 3, 207, 224, 209, 46, 237, 189, + 220, 10, 237, 189, 238, 34, 237, 189, 204, 3, 237, 189, 237, 190, 3, 246, + 83, 207, 180, 216, 39, 237, 189, 243, 62, 237, 189, 243, 63, 237, 189, + 226, 128, 237, 189, 237, 190, 206, 36, 35, 226, 129, 226, 128, 237, 190, + 3, 209, 47, 238, 15, 226, 128, 237, 190, 3, 246, 110, 238, 15, 237, 190, + 3, 208, 31, 205, 163, 237, 190, 3, 208, 31, 205, 164, 26, 201, 8, 238, + 22, 237, 190, 3, 208, 31, 205, 164, 26, 206, 0, 238, 15, 241, 4, 237, + 189, 200, 232, 237, 189, 251, 67, 237, 189, 215, 55, 237, 189, 242, 218, + 237, 189, 216, 13, 237, 189, 237, 190, 3, 224, 77, 76, 205, 75, 241, 4, + 247, 247, 213, 145, 237, 189, 236, 195, 237, 190, 3, 176, 221, 58, 251, + 65, 237, 189, 237, 145, 237, 189, 201, 62, 237, 189, 209, 70, 237, 189, + 205, 218, 237, 189, 235, 62, 237, 189, 224, 63, 242, 218, 237, 189, 237, + 190, 3, 176, 221, 58, 233, 72, 237, 189, 237, 190, 3, 176, 221, 59, 26, + 246, 83, 207, 180, 237, 190, 211, 211, 228, 118, 237, 146, 250, 162, 237, + 189, 237, 21, 237, 189, 209, 71, 237, 189, 240, 231, 237, 189, 237, 190, + 201, 3, 221, 58, 237, 190, 3, 222, 68, 222, 132, 235, 61, 247, 112, 237, + 190, 3, 209, 47, 238, 15, 247, 112, 237, 190, 3, 206, 193, 76, 227, 150, + 209, 47, 247, 112, 237, 190, 3, 176, 221, 58, 209, 47, 247, 112, 237, + 190, 3, 234, 126, 238, 15, 247, 112, 237, 190, 3, 200, 217, 209, 48, 226, + 128, 247, 112, 237, 190, 3, 246, 110, 238, 15, 215, 55, 247, 112, 237, + 189, 242, 218, 247, 112, 237, 189, 201, 62, 247, 112, 237, 189, 209, 64, + 236, 195, 237, 189, 209, 64, 209, 47, 237, 189, 203, 222, 237, 189, 237, + 190, 3, 212, 242, 238, 15, 237, 190, 3, 218, 242, 235, 104, 235, 240, + 237, 190, 3, 217, 99, 235, 240, 216, 11, 248, 84, 241, 159, 211, 189, + 221, 100, 234, 129, 221, 100, 208, 234, 221, 100, 234, 167, 216, 11, 213, + 219, 112, 234, 199, 216, 11, 213, 219, 248, 96, 234, 175, 228, 118, 247, + 62, 216, 11, 236, 194, 216, 11, 3, 215, 55, 237, 189, 216, 11, 3, 237, + 10, 234, 174, 157, 201, 48, 215, 96, 225, 35, 208, 254, 201, 48, 215, 96, + 225, 35, 157, 239, 14, 215, 96, 225, 35, 208, 254, 239, 14, 215, 96, 225, + 35, 204, 185, 157, 201, 48, 215, 96, 225, 35, 204, 185, 208, 254, 201, + 48, 215, 96, 225, 35, 204, 185, 157, 239, 14, 215, 96, 225, 35, 204, 185, + 208, 254, 239, 14, 215, 96, 225, 35, 157, 201, 48, 215, 96, 202, 216, + 225, 35, 208, 254, 201, 48, 215, 96, 202, 216, 225, 35, 157, 239, 14, + 215, 96, 202, 216, 225, 35, 208, 254, 239, 14, 215, 96, 202, 216, 225, + 35, 80, 157, 201, 48, 215, 96, 202, 216, 225, 35, 80, 208, 254, 201, 48, + 215, 96, 202, 216, 225, 35, 80, 157, 239, 14, 215, 96, 202, 216, 225, 35, + 80, 208, 254, 239, 14, 215, 96, 202, 216, 225, 35, 157, 201, 48, 215, 96, + 248, 32, 208, 254, 201, 48, 215, 96, 248, 32, 157, 239, 14, 215, 96, 248, + 32, 208, 254, 239, 14, 215, 96, 248, 32, 80, 157, 201, 48, 215, 96, 248, + 32, 80, 208, 254, 201, 48, 215, 96, 248, 32, 80, 157, 239, 14, 215, 96, + 248, 32, 80, 208, 254, 239, 14, 215, 96, 248, 32, 233, 196, 214, 72, 52, + 217, 21, 233, 196, 214, 72, 52, 217, 22, 228, 118, 63, 208, 193, 209, 18, + 214, 72, 52, 217, 21, 209, 18, 214, 72, 52, 217, 22, 228, 118, 63, 208, + 193, 98, 212, 248, 182, 212, 248, 87, 212, 248, 191, 212, 248, 135, 33, + 238, 82, 217, 21, 80, 135, 33, 238, 82, 217, 21, 33, 176, 238, 82, 217, + 21, 80, 33, 176, 238, 82, 217, 21, 80, 251, 90, 217, 21, 207, 183, 251, + 90, 217, 21, 43, 80, 53, 204, 185, 246, 71, 214, 63, 134, 217, 21, 43, + 80, 53, 246, 71, 214, 63, 134, 217, 21, 43, 80, 128, 53, 246, 71, 214, + 63, 134, 217, 21, 80, 228, 59, 217, 21, 43, 228, 59, 217, 21, 80, 43, + 228, 59, 217, 21, 202, 246, 80, 209, 16, 202, 246, 80, 213, 106, 209, 16, + 247, 5, 248, 121, 213, 106, 247, 5, 248, 121, 212, 248, 234, 110, 208, + 96, 224, 101, 213, 225, 247, 135, 234, 55, 205, 123, 234, 55, 205, 124, + 3, 248, 21, 218, 216, 205, 123, 222, 13, 162, 213, 226, 208, 102, 205, + 121, 205, 122, 247, 135, 247, 252, 217, 75, 247, 252, 205, 71, 247, 253, + 208, 76, 221, 163, 251, 94, 237, 78, 238, 164, 215, 88, 247, 135, 217, + 75, 215, 88, 247, 135, 206, 211, 217, 75, 206, 211, 250, 127, 217, 75, + 250, 127, 213, 177, 203, 51, 241, 140, 205, 62, 250, 194, 224, 68, 205, + 129, 221, 94, 221, 64, 213, 224, 207, 196, 213, 224, 221, 64, 247, 184, + 251, 207, 205, 120, 210, 17, 212, 218, 208, 226, 233, 177, 205, 127, 224, + 196, 83, 205, 127, 224, 196, 243, 49, 54, 215, 88, 247, 119, 213, 99, + 224, 196, 205, 95, 237, 54, 217, 79, 215, 66, 240, 185, 218, 242, 238, + 150, 54, 209, 45, 99, 218, 242, 209, 45, 99, 214, 193, 224, 149, 228, + 118, 228, 9, 215, 134, 99, 240, 212, 218, 215, 224, 149, 99, 215, 60, + 201, 83, 99, 218, 231, 201, 83, 99, 248, 184, 218, 242, 248, 183, 248, + 182, 221, 64, 248, 182, 216, 63, 218, 242, 216, 62, 246, 226, 242, 227, + 222, 36, 99, 200, 247, 99, 213, 115, 249, 132, 99, 205, 181, 201, 83, + 246, 107, 209, 231, 249, 52, 249, 50, 216, 96, 243, 33, 242, 181, 249, + 110, 246, 135, 49, 224, 32, 205, 99, 3, 212, 219, 243, 14, 214, 253, 54, + 44, 228, 92, 208, 255, 248, 75, 99, 235, 139, 99, 243, 7, 26, 225, 81, + 209, 71, 251, 248, 209, 253, 249, 109, 248, 229, 248, 230, 248, 253, 215, + 134, 76, 200, 231, 217, 129, 54, 209, 253, 205, 72, 234, 207, 26, 200, + 225, 210, 30, 217, 104, 239, 142, 221, 68, 213, 225, 205, 131, 221, 70, + 248, 120, 203, 227, 221, 174, 251, 164, 203, 227, 251, 164, 203, 227, 4, + 251, 164, 4, 251, 164, 218, 220, 251, 164, 251, 165, 241, 124, 251, 165, + 250, 205, 211, 247, 217, 75, 237, 78, 238, 164, 241, 54, 224, 101, 216, + 99, 210, 17, 211, 215, 221, 70, 211, 215, 247, 146, 139, 16, 36, 214, 68, + 139, 16, 36, 251, 166, 139, 16, 36, 237, 77, 139, 16, 36, 239, 17, 139, + 16, 36, 201, 82, 139, 16, 36, 250, 255, 139, 16, 36, 251, 0, 213, 164, + 139, 16, 36, 251, 0, 213, 163, 139, 16, 36, 251, 0, 202, 199, 139, 16, + 36, 251, 0, 202, 198, 139, 16, 36, 202, 213, 139, 16, 36, 202, 212, 139, + 16, 36, 202, 211, 139, 16, 36, 207, 235, 139, 16, 36, 215, 221, 207, 235, + 139, 16, 36, 63, 207, 235, 139, 16, 36, 222, 35, 208, 10, 139, 16, 36, + 222, 35, 208, 9, 139, 16, 36, 222, 35, 208, 8, 139, 16, 36, 246, 158, + 139, 16, 36, 212, 27, 139, 16, 36, 219, 101, 139, 16, 36, 202, 197, 139, + 16, 36, 202, 196, 139, 16, 36, 212, 249, 212, 27, 139, 16, 36, 212, 249, + 212, 26, 139, 16, 36, 235, 108, 139, 16, 36, 209, 152, 139, 16, 36, 228, + 32, 217, 28, 139, 16, 36, 228, 32, 217, 27, 139, 16, 36, 242, 239, 76, + 228, 31, 139, 16, 36, 213, 160, 76, 228, 31, 139, 16, 36, 243, 24, 217, + 28, 139, 16, 36, 228, 30, 217, 28, 139, 16, 36, 208, 11, 76, 243, 23, + 139, 16, 36, 242, 239, 76, 243, 23, 139, 16, 36, 242, 239, 76, 243, 22, + 139, 16, 36, 243, 24, 251, 41, 139, 16, 36, 212, 28, 76, 243, 24, 251, + 41, 139, 16, 36, 208, 11, 76, 212, 28, 76, 243, 23, 139, 16, 36, 203, 46, + 139, 16, 36, 205, 231, 217, 28, 139, 16, 36, 225, 39, 217, 28, 139, 16, + 36, 251, 40, 217, 28, 139, 16, 36, 208, 11, 76, 251, 39, 139, 16, 36, + 212, 28, 76, 251, 39, 139, 16, 36, 208, 11, 76, 212, 28, 76, 251, 39, + 139, 16, 36, 202, 214, 76, 251, 39, 139, 16, 36, 213, 160, 76, 251, 39, + 139, 16, 36, 213, 160, 76, 251, 38, 139, 16, 36, 213, 159, 139, 16, 36, + 213, 158, 139, 16, 36, 213, 157, 139, 16, 36, 213, 156, 139, 16, 36, 251, + 127, 139, 16, 36, 251, 126, 139, 16, 36, 222, 155, 139, 16, 36, 212, 34, + 139, 16, 36, 250, 198, 139, 16, 36, 213, 187, 139, 16, 36, 213, 186, 139, + 16, 36, 250, 130, 139, 16, 36, 248, 153, 217, 28, 139, 16, 36, 206, 230, + 139, 16, 36, 206, 229, 139, 16, 36, 214, 74, 224, 185, 139, 16, 36, 248, + 101, 139, 16, 36, 248, 100, 139, 16, 36, 248, 99, 139, 16, 36, 251, 103, + 139, 16, 36, 217, 103, 139, 16, 36, 208, 214, 139, 16, 36, 205, 229, 139, + 16, 36, 235, 30, 139, 16, 36, 201, 70, 139, 16, 36, 215, 54, 139, 16, 36, + 247, 167, 139, 16, 36, 204, 177, 139, 16, 36, 247, 137, 221, 75, 139, 16, + 36, 211, 225, 76, 227, 152, 139, 16, 36, 247, 181, 139, 16, 36, 205, 92, + 139, 16, 36, 208, 107, 205, 92, 139, 16, 36, 224, 100, 139, 16, 36, 209, + 27, 139, 16, 36, 203, 206, 139, 16, 36, 233, 121, 239, 121, 139, 16, 36, + 250, 176, 139, 16, 36, 215, 62, 250, 176, 139, 16, 36, 248, 53, 139, 16, + 36, 215, 53, 248, 53, 139, 16, 36, 251, 100, 139, 16, 36, 208, 63, 207, + 216, 208, 62, 139, 16, 36, 208, 63, 207, 216, 208, 61, 139, 16, 36, 208, + 7, 139, 16, 36, 215, 26, 139, 16, 36, 240, 248, 139, 16, 36, 240, 250, + 139, 16, 36, 240, 249, 139, 16, 36, 214, 202, 139, 16, 36, 214, 191, 139, + 16, 36, 242, 225, 139, 16, 36, 242, 224, 139, 16, 36, 242, 223, 139, 16, + 36, 242, 222, 139, 16, 36, 242, 221, 139, 16, 36, 251, 141, 139, 16, 36, + 249, 53, 76, 222, 137, 139, 16, 36, 249, 53, 76, 203, 78, 139, 16, 36, + 213, 113, 139, 16, 36, 233, 113, 139, 16, 36, 219, 129, 139, 16, 36, 241, + 232, 139, 16, 36, 221, 89, 139, 16, 36, 167, 239, 156, 139, 16, 36, 167, + 217, 1, 63, 225, 23, 228, 15, 51, 205, 98, 63, 203, 227, 228, 15, 51, + 205, 98, 63, 213, 41, 228, 15, 51, 205, 98, 63, 239, 166, 228, 15, 51, + 205, 98, 63, 209, 64, 4, 246, 155, 222, 66, 27, 64, 246, 155, 27, 64, + 246, 155, 80, 64, 246, 155, 202, 246, 80, 64, 246, 155, 238, 26, 80, 64, + 246, 155, 64, 246, 156, 243, 45, 63, 4, 246, 155, 212, 221, 206, 231, 63, + 205, 226, 208, 193, 63, 209, 64, 4, 208, 193, 162, 64, 208, 193, 222, 66, + 64, 208, 193, 27, 64, 208, 193, 80, 64, 208, 193, 202, 246, 80, 64, 208, + 193, 238, 26, 80, 64, 208, 193, 64, 52, 243, 45, 63, 202, 246, 4, 208, + 193, 64, 52, 243, 45, 63, 222, 66, 208, 193, 52, 206, 231, 63, 205, 226, + 241, 64, 63, 202, 246, 4, 241, 64, 63, 222, 66, 4, 241, 64, 64, 241, 65, + 243, 45, 63, 202, 246, 4, 241, 64, 64, 241, 65, 243, 45, 63, 222, 66, + 241, 64, 241, 65, 206, 231, 63, 205, 226, 224, 49, 63, 202, 246, 4, 224, + 49, 63, 222, 66, 4, 224, 49, 64, 224, 50, 243, 45, 63, 4, 224, 49, 206, + 77, 31, 242, 234, 162, 31, 242, 234, 222, 66, 31, 242, 234, 27, 31, 242, + 234, 202, 246, 27, 31, 242, 234, 202, 246, 80, 31, 242, 234, 238, 26, 80, + 31, 242, 234, 206, 77, 212, 24, 162, 212, 24, 222, 66, 212, 24, 27, 212, + 24, 80, 212, 24, 202, 246, 80, 212, 24, 238, 26, 80, 212, 24, 162, 237, + 61, 208, 207, 250, 165, 222, 66, 237, 61, 208, 207, 250, 165, 27, 237, + 61, 208, 207, 250, 165, 80, 237, 61, 208, 207, 250, 165, 202, 246, 80, + 237, 61, 208, 207, 250, 165, 238, 26, 80, 237, 61, 208, 207, 250, 165, + 162, 209, 106, 208, 207, 250, 165, 222, 66, 209, 106, 208, 207, 250, 165, + 27, 209, 106, 208, 207, 250, 165, 80, 209, 106, 208, 207, 250, 165, 202, + 246, 80, 209, 106, 208, 207, 250, 165, 238, 26, 80, 209, 106, 208, 207, + 250, 165, 162, 238, 232, 208, 207, 250, 165, 222, 66, 238, 232, 208, 207, + 250, 165, 27, 238, 232, 208, 207, 250, 165, 80, 238, 232, 208, 207, 250, + 165, 202, 246, 80, 238, 232, 208, 207, 250, 165, 162, 126, 215, 98, 63, + 208, 109, 222, 66, 126, 215, 98, 63, 208, 109, 126, 215, 98, 63, 208, + 109, 222, 66, 126, 215, 98, 215, 155, 208, 109, 162, 236, 229, 215, 98, + 63, 208, 109, 222, 66, 236, 229, 215, 98, 63, 208, 109, 236, 229, 215, + 98, 63, 208, 109, 222, 66, 236, 229, 215, 98, 215, 155, 208, 109, 213, + 106, 162, 236, 229, 215, 98, 215, 155, 208, 109, 162, 237, 61, 215, 98, + 63, 208, 109, 80, 237, 61, 215, 98, 63, 208, 109, 222, 66, 209, 106, 215, + 98, 63, 208, 109, 80, 209, 106, 215, 98, 63, 208, 109, 209, 106, 215, 98, + 215, 155, 208, 109, 222, 66, 238, 232, 215, 98, 63, 208, 109, 80, 238, + 232, 215, 98, 63, 208, 109, 202, 246, 80, 238, 232, 215, 98, 63, 208, + 109, 80, 238, 232, 215, 98, 215, 155, 208, 109, 162, 204, 165, 215, 98, + 63, 208, 109, 80, 204, 165, 215, 98, 63, 208, 109, 80, 204, 165, 215, 98, + 215, 155, 208, 109, 98, 55, 3, 4, 205, 99, 250, 202, 182, 55, 3, 4, 205, + 99, 250, 202, 87, 55, 3, 4, 205, 99, 250, 202, 191, 55, 3, 4, 205, 99, + 250, 202, 98, 55, 3, 222, 66, 205, 99, 250, 202, 182, 55, 3, 222, 66, + 205, 99, 250, 202, 87, 55, 3, 222, 66, 205, 99, 250, 202, 191, 55, 3, + 222, 66, 205, 99, 250, 202, 98, 55, 3, 225, 71, 205, 99, 250, 202, 182, + 55, 3, 225, 71, 205, 99, 250, 202, 87, 55, 3, 225, 71, 205, 99, 250, 202, + 191, 55, 3, 225, 71, 205, 99, 250, 202, 98, 55, 3, 4, 238, 118, 250, 202, + 182, 55, 3, 4, 238, 118, 250, 202, 87, 55, 3, 4, 238, 118, 250, 202, 191, + 55, 3, 4, 238, 118, 250, 202, 98, 55, 3, 238, 118, 250, 202, 182, 55, 3, + 238, 118, 250, 202, 87, 55, 3, 238, 118, 250, 202, 191, 55, 3, 238, 118, + 250, 202, 80, 98, 55, 3, 238, 118, 250, 202, 80, 182, 55, 3, 238, 118, + 250, 202, 80, 87, 55, 3, 238, 118, 250, 202, 80, 191, 55, 3, 238, 118, + 250, 202, 80, 98, 55, 3, 225, 71, 238, 118, 250, 202, 80, 182, 55, 3, + 225, 71, 238, 118, 250, 202, 80, 87, 55, 3, 225, 71, 238, 118, 250, 202, + 80, 191, 55, 3, 225, 71, 238, 118, 250, 202, 98, 205, 97, 55, 3, 220, + 124, 210, 99, 182, 205, 97, 55, 3, 220, 124, 210, 99, 87, 205, 97, 55, 3, + 220, 124, 210, 99, 191, 205, 97, 55, 3, 220, 124, 210, 99, 98, 205, 97, + 55, 3, 222, 66, 210, 99, 182, 205, 97, 55, 3, 222, 66, 210, 99, 87, 205, + 97, 55, 3, 222, 66, 210, 99, 191, 205, 97, 55, 3, 222, 66, 210, 99, 98, + 205, 97, 55, 3, 27, 210, 99, 182, 205, 97, 55, 3, 27, 210, 99, 87, 205, + 97, 55, 3, 27, 210, 99, 191, 205, 97, 55, 3, 27, 210, 99, 98, 205, 97, + 55, 3, 80, 210, 99, 182, 205, 97, 55, 3, 80, 210, 99, 87, 205, 97, 55, 3, + 80, 210, 99, 191, 205, 97, 55, 3, 80, 210, 99, 98, 205, 97, 55, 3, 202, + 246, 80, 210, 99, 182, 205, 97, 55, 3, 202, 246, 80, 210, 99, 87, 205, + 97, 55, 3, 202, 246, 80, 210, 99, 191, 205, 97, 55, 3, 202, 246, 80, 210, + 99, 98, 237, 85, 48, 182, 237, 85, 48, 87, 237, 85, 48, 191, 237, 85, 48, + 98, 95, 48, 182, 95, 48, 87, 95, 48, 191, 95, 48, 98, 243, 72, 48, 182, + 243, 72, 48, 87, 243, 72, 48, 191, 243, 72, 48, 98, 80, 243, 72, 48, 182, + 80, 243, 72, 48, 87, 80, 243, 72, 48, 191, 80, 243, 72, 48, 98, 80, 48, + 182, 80, 48, 87, 80, 48, 191, 80, 48, 98, 43, 48, 182, 43, 48, 87, 43, + 48, 191, 43, 48, 157, 201, 48, 43, 48, 157, 239, 14, 43, 48, 208, 254, + 239, 14, 43, 48, 208, 254, 201, 48, 43, 48, 49, 51, 43, 48, 115, 127, 43, + 48, 201, 27, 98, 162, 154, 48, 201, 27, 182, 162, 154, 48, 201, 27, 87, + 162, 154, 48, 201, 27, 191, 162, 154, 48, 201, 27, 157, 201, 48, 162, + 154, 48, 201, 27, 157, 239, 14, 162, 154, 48, 201, 27, 208, 254, 239, 14, + 162, 154, 48, 201, 27, 208, 254, 201, 48, 162, 154, 48, 201, 27, 98, 154, + 48, 201, 27, 182, 154, 48, 201, 27, 87, 154, 48, 201, 27, 191, 154, 48, + 201, 27, 157, 201, 48, 154, 48, 201, 27, 157, 239, 14, 154, 48, 201, 27, + 208, 254, 239, 14, 154, 48, 201, 27, 208, 254, 201, 48, 154, 48, 201, 27, + 98, 222, 66, 154, 48, 201, 27, 182, 222, 66, 154, 48, 201, 27, 87, 222, + 66, 154, 48, 201, 27, 191, 222, 66, 154, 48, 201, 27, 157, 201, 48, 222, + 66, 154, 48, 201, 27, 157, 239, 14, 222, 66, 154, 48, 201, 27, 208, 254, + 239, 14, 222, 66, 154, 48, 201, 27, 208, 254, 201, 48, 222, 66, 154, 48, + 201, 27, 98, 80, 154, 48, 201, 27, 182, 80, 154, 48, 201, 27, 87, 80, + 154, 48, 201, 27, 191, 80, 154, 48, 201, 27, 157, 201, 48, 80, 154, 48, + 201, 27, 157, 239, 14, 80, 154, 48, 201, 27, 208, 254, 239, 14, 80, 154, + 48, 201, 27, 208, 254, 201, 48, 80, 154, 48, 201, 27, 98, 202, 246, 80, + 154, 48, 201, 27, 182, 202, 246, 80, 154, 48, 201, 27, 87, 202, 246, 80, + 154, 48, 201, 27, 191, 202, 246, 80, 154, 48, 201, 27, 157, 201, 48, 202, + 246, 80, 154, 48, 201, 27, 157, 239, 14, 202, 246, 80, 154, 48, 201, 27, + 208, 254, 239, 14, 202, 246, 80, 154, 48, 201, 27, 208, 254, 201, 48, + 202, 246, 80, 154, 48, 98, 205, 99, 250, 202, 182, 205, 99, 250, 202, 87, + 205, 99, 250, 202, 191, 205, 99, 250, 202, 98, 64, 55, 201, 5, 205, 99, + 250, 202, 182, 64, 55, 201, 5, 205, 99, 250, 202, 87, 64, 55, 201, 5, + 205, 99, 250, 202, 191, 64, 55, 201, 5, 205, 99, 250, 202, 98, 55, 3, + 218, 211, 207, 6, 182, 55, 3, 218, 211, 207, 6, 87, 55, 3, 218, 211, 207, + 6, 191, 55, 3, 218, 211, 207, 6, 80, 55, 210, 100, 201, 25, 102, 80, 55, + 210, 100, 201, 25, 120, 206, 71, 80, 55, 210, 100, 201, 25, 112, 234, + 213, 80, 55, 210, 100, 201, 25, 112, 206, 74, 98, 248, 90, 64, 48, 87, + 248, 93, 210, 102, 64, 48, 98, 205, 158, 210, 102, 64, 48, 87, 205, 158, + 210, 102, 64, 48, 98, 225, 22, 64, 48, 87, 213, 40, 64, 48, 98, 213, 40, + 64, 48, 87, 225, 22, 64, 48, 98, 249, 128, 210, 101, 64, 48, 87, 249, + 128, 210, 101, 64, 48, 98, 236, 198, 210, 101, 64, 48, 87, 236, 198, 210, + 101, 64, 48, 64, 55, 210, 100, 201, 25, 102, 64, 55, 210, 100, 201, 25, + 120, 206, 71, 199, 23, 237, 189, 221, 104, 237, 189, 237, 190, 3, 206, + 94, 220, 16, 237, 189, 206, 76, 237, 189, 237, 190, 3, 234, 135, 212, + 251, 237, 189, 233, 91, 237, 189, 2, 76, 206, 107, 233, 123, 247, 169, + 222, 77, 234, 199, 213, 220, 249, 130, 76, 234, 199, 225, 27, 237, 66, + 213, 45, 237, 66, 234, 173, 234, 200, 3, 124, 26, 101, 237, 82, 242, 231, + 237, 190, 3, 242, 254, 234, 157, 246, 99, 237, 189, 220, 113, 237, 189, + 212, 242, 217, 79, 206, 107, 237, 32, 225, 57, 239, 147, 237, 189, 223, + 253, 237, 189, 237, 190, 216, 176, 209, 39, 237, 189, 215, 24, 200, 250, + 210, 173, 215, 13, 222, 181, 228, 118, 204, 173, 221, 72, 246, 199, 209, + 224, 216, 11, 240, 198, 247, 116, 227, 142, 237, 126, 221, 129, 216, 34, + 200, 224, 201, 83, 215, 86, 234, 178, 201, 19, 237, 24, 239, 143, 3, 239, + 141, 246, 117, 235, 127, 204, 201, 235, 128, 208, 206, 235, 114, 220, 13, + 213, 47, 237, 73, 215, 134, 222, 69, 211, 196, 215, 134, 222, 69, 206, + 75, 215, 134, 222, 69, 248, 77, 235, 122, 222, 141, 250, 192, 203, 243, + 242, 238, 250, 118, 242, 208, 249, 121, 215, 59, 247, 120, 249, 108, 248, + 62, 235, 64, 212, 32, 210, 93, 216, 163, 76, 237, 1, 208, 28, 237, 43, + 238, 246, 235, 129, 76, 221, 173, 216, 68, 226, 124, 216, 160, 242, 251, + 224, 164, 237, 189, 211, 213, 204, 190, 203, 245, 237, 189, 239, 24, 239, + 133, 249, 55, 210, 80, 216, 237, 236, 221, 237, 189, 247, 245, 241, 158, + 235, 97, 224, 143, 213, 92, 209, 226, 208, 187, 246, 255, 201, 59, 12, + 15, 232, 221, 12, 15, 232, 220, 12, 15, 232, 219, 12, 15, 232, 218, 12, + 15, 232, 217, 12, 15, 232, 216, 12, 15, 232, 215, 12, 15, 232, 214, 12, + 15, 232, 213, 12, 15, 232, 212, 12, 15, 232, 211, 12, 15, 232, 210, 12, + 15, 232, 209, 12, 15, 232, 208, 12, 15, 232, 207, 12, 15, 232, 206, 12, + 15, 232, 205, 12, 15, 232, 204, 12, 15, 232, 203, 12, 15, 232, 202, 12, + 15, 232, 201, 12, 15, 232, 200, 12, 15, 232, 199, 12, 15, 232, 198, 12, + 15, 232, 197, 12, 15, 232, 196, 12, 15, 232, 195, 12, 15, 232, 194, 12, + 15, 232, 193, 12, 15, 232, 192, 12, 15, 232, 191, 12, 15, 232, 190, 12, + 15, 232, 189, 12, 15, 232, 188, 12, 15, 232, 187, 12, 15, 232, 186, 12, + 15, 232, 185, 12, 15, 232, 184, 12, 15, 232, 183, 12, 15, 232, 182, 12, + 15, 232, 181, 12, 15, 232, 180, 12, 15, 232, 179, 12, 15, 232, 178, 12, + 15, 232, 177, 12, 15, 232, 176, 12, 15, 232, 175, 12, 15, 232, 174, 12, + 15, 232, 173, 12, 15, 232, 172, 12, 15, 232, 171, 12, 15, 232, 170, 12, + 15, 232, 169, 12, 15, 232, 168, 12, 15, 232, 167, 12, 15, 232, 166, 12, + 15, 232, 165, 12, 15, 232, 164, 12, 15, 232, 163, 12, 15, 232, 162, 12, + 15, 232, 161, 12, 15, 232, 160, 12, 15, 232, 159, 12, 15, 232, 158, 12, + 15, 232, 157, 12, 15, 232, 156, 12, 15, 232, 155, 12, 15, 232, 154, 12, + 15, 232, 153, 12, 15, 232, 152, 12, 15, 232, 151, 12, 15, 232, 150, 12, + 15, 232, 149, 12, 15, 232, 148, 12, 15, 232, 147, 12, 15, 232, 146, 12, + 15, 232, 145, 12, 15, 232, 144, 12, 15, 232, 143, 12, 15, 232, 142, 12, + 15, 232, 141, 12, 15, 232, 140, 12, 15, 232, 139, 12, 15, 232, 138, 12, + 15, 232, 137, 12, 15, 232, 136, 12, 15, 232, 135, 12, 15, 232, 134, 12, + 15, 232, 133, 12, 15, 232, 132, 12, 15, 232, 131, 12, 15, 232, 130, 12, + 15, 232, 129, 12, 15, 232, 128, 12, 15, 232, 127, 12, 15, 232, 126, 12, + 15, 232, 125, 12, 15, 232, 124, 12, 15, 232, 123, 12, 15, 232, 122, 12, + 15, 232, 121, 12, 15, 232, 120, 12, 15, 232, 119, 12, 15, 232, 118, 12, + 15, 232, 117, 12, 15, 232, 116, 12, 15, 232, 115, 12, 15, 232, 114, 12, + 15, 232, 113, 12, 15, 232, 112, 12, 15, 232, 111, 12, 15, 232, 110, 12, + 15, 232, 109, 12, 15, 232, 108, 12, 15, 232, 107, 12, 15, 232, 106, 12, + 15, 232, 105, 12, 15, 232, 104, 12, 15, 232, 103, 12, 15, 232, 102, 12, + 15, 232, 101, 12, 15, 232, 100, 12, 15, 232, 99, 12, 15, 232, 98, 12, 15, + 232, 97, 12, 15, 232, 96, 12, 15, 232, 95, 12, 15, 232, 94, 12, 15, 232, + 93, 12, 15, 232, 92, 12, 15, 232, 91, 12, 15, 232, 90, 12, 15, 232, 89, + 12, 15, 232, 88, 12, 15, 232, 87, 12, 15, 232, 86, 12, 15, 232, 85, 12, + 15, 232, 84, 12, 15, 232, 83, 12, 15, 232, 82, 12, 15, 232, 81, 12, 15, + 232, 80, 12, 15, 232, 79, 12, 15, 232, 78, 12, 15, 232, 77, 12, 15, 232, + 76, 12, 15, 232, 75, 12, 15, 232, 74, 12, 15, 232, 73, 12, 15, 232, 72, + 12, 15, 232, 71, 12, 15, 232, 70, 12, 15, 232, 69, 12, 15, 232, 68, 12, + 15, 232, 67, 12, 15, 232, 66, 12, 15, 232, 65, 12, 15, 232, 64, 12, 15, + 232, 63, 12, 15, 232, 62, 12, 15, 232, 61, 12, 15, 232, 60, 12, 15, 232, + 59, 12, 15, 232, 58, 12, 15, 232, 57, 12, 15, 232, 56, 12, 15, 232, 55, + 12, 15, 232, 54, 12, 15, 232, 53, 12, 15, 232, 52, 12, 15, 232, 51, 12, + 15, 232, 50, 12, 15, 232, 49, 12, 15, 232, 48, 12, 15, 232, 47, 12, 15, + 232, 46, 12, 15, 232, 45, 12, 15, 232, 44, 12, 15, 232, 43, 12, 15, 232, + 42, 12, 15, 232, 41, 12, 15, 232, 40, 12, 15, 232, 39, 12, 15, 232, 38, + 12, 15, 232, 37, 12, 15, 232, 36, 12, 15, 232, 35, 12, 15, 232, 34, 12, + 15, 232, 33, 12, 15, 232, 32, 12, 15, 232, 31, 12, 15, 232, 30, 12, 15, + 232, 29, 12, 15, 232, 28, 12, 15, 232, 27, 12, 15, 232, 26, 12, 15, 232, + 25, 12, 15, 232, 24, 12, 15, 232, 23, 12, 15, 232, 22, 12, 15, 232, 21, + 12, 15, 232, 20, 12, 15, 232, 19, 12, 15, 232, 18, 12, 15, 232, 17, 12, + 15, 232, 16, 12, 15, 232, 15, 12, 15, 232, 14, 12, 15, 232, 13, 12, 15, + 232, 12, 12, 15, 232, 11, 12, 15, 232, 10, 12, 15, 232, 9, 12, 15, 232, + 8, 12, 15, 232, 7, 12, 15, 232, 6, 12, 15, 232, 5, 12, 15, 232, 4, 12, + 15, 232, 3, 12, 15, 232, 2, 12, 15, 232, 1, 12, 15, 232, 0, 12, 15, 231, + 255, 12, 15, 231, 254, 12, 15, 231, 253, 12, 15, 231, 252, 12, 15, 231, + 251, 12, 15, 231, 250, 12, 15, 231, 249, 12, 15, 231, 248, 12, 15, 231, + 247, 12, 15, 231, 246, 12, 15, 231, 245, 12, 15, 231, 244, 12, 15, 231, + 243, 12, 15, 231, 242, 12, 15, 231, 241, 12, 15, 231, 240, 12, 15, 231, + 239, 12, 15, 231, 238, 12, 15, 231, 237, 12, 15, 231, 236, 12, 15, 231, + 235, 12, 15, 231, 234, 12, 15, 231, 233, 12, 15, 231, 232, 12, 15, 231, + 231, 12, 15, 231, 230, 12, 15, 231, 229, 12, 15, 231, 228, 12, 15, 231, + 227, 12, 15, 231, 226, 12, 15, 231, 225, 12, 15, 231, 224, 12, 15, 231, + 223, 12, 15, 231, 222, 12, 15, 231, 221, 12, 15, 231, 220, 12, 15, 231, + 219, 12, 15, 231, 218, 12, 15, 231, 217, 12, 15, 231, 216, 12, 15, 231, + 215, 12, 15, 231, 214, 12, 15, 231, 213, 12, 15, 231, 212, 12, 15, 231, + 211, 12, 15, 231, 210, 12, 15, 231, 209, 12, 15, 231, 208, 12, 15, 231, + 207, 12, 15, 231, 206, 12, 15, 231, 205, 12, 15, 231, 204, 12, 15, 231, + 203, 12, 15, 231, 202, 12, 15, 231, 201, 12, 15, 231, 200, 12, 15, 231, + 199, 12, 15, 231, 198, 12, 15, 231, 197, 12, 15, 231, 196, 12, 15, 231, + 195, 12, 15, 231, 194, 12, 15, 231, 193, 12, 15, 231, 192, 12, 15, 231, + 191, 12, 15, 231, 190, 12, 15, 231, 189, 12, 15, 231, 188, 12, 15, 231, + 187, 12, 15, 231, 186, 12, 15, 231, 185, 12, 15, 231, 184, 12, 15, 231, + 183, 12, 15, 231, 182, 12, 15, 231, 181, 12, 15, 231, 180, 12, 15, 231, + 179, 12, 15, 231, 178, 12, 15, 231, 177, 12, 15, 231, 176, 12, 15, 231, + 175, 12, 15, 231, 174, 12, 15, 231, 173, 12, 15, 231, 172, 12, 15, 231, + 171, 12, 15, 231, 170, 12, 15, 231, 169, 12, 15, 231, 168, 12, 15, 231, + 167, 12, 15, 231, 166, 12, 15, 231, 165, 12, 15, 231, 164, 12, 15, 231, + 163, 12, 15, 231, 162, 12, 15, 231, 161, 12, 15, 231, 160, 12, 15, 231, + 159, 12, 15, 231, 158, 12, 15, 231, 157, 12, 15, 231, 156, 12, 15, 231, + 155, 12, 15, 231, 154, 12, 15, 231, 153, 12, 15, 231, 152, 12, 15, 231, + 151, 12, 15, 231, 150, 12, 15, 231, 149, 12, 15, 231, 148, 12, 15, 231, + 147, 12, 15, 231, 146, 12, 15, 231, 145, 12, 15, 231, 144, 12, 15, 231, + 143, 12, 15, 231, 142, 12, 15, 231, 141, 12, 15, 231, 140, 12, 15, 231, + 139, 12, 15, 231, 138, 12, 15, 231, 137, 12, 15, 231, 136, 12, 15, 231, + 135, 12, 15, 231, 134, 12, 15, 231, 133, 12, 15, 231, 132, 12, 15, 231, + 131, 12, 15, 231, 130, 12, 15, 231, 129, 12, 15, 231, 128, 12, 15, 231, + 127, 12, 15, 231, 126, 12, 15, 231, 125, 12, 15, 231, 124, 12, 15, 231, + 123, 12, 15, 231, 122, 12, 15, 231, 121, 12, 15, 231, 120, 12, 15, 231, + 119, 12, 15, 231, 118, 12, 15, 231, 117, 12, 15, 231, 116, 12, 15, 231, + 115, 12, 15, 231, 114, 12, 15, 231, 113, 12, 15, 231, 112, 12, 15, 231, + 111, 12, 15, 231, 110, 12, 15, 231, 109, 12, 15, 231, 108, 12, 15, 231, + 107, 12, 15, 231, 106, 12, 15, 231, 105, 12, 15, 231, 104, 12, 15, 231, + 103, 12, 15, 231, 102, 12, 15, 231, 101, 12, 15, 231, 100, 12, 15, 231, + 99, 12, 15, 231, 98, 12, 15, 231, 97, 12, 15, 231, 96, 12, 15, 231, 95, + 12, 15, 231, 94, 12, 15, 231, 93, 12, 15, 231, 92, 12, 15, 231, 91, 12, + 15, 231, 90, 12, 15, 231, 89, 12, 15, 231, 88, 12, 15, 231, 87, 12, 15, + 231, 86, 12, 15, 231, 85, 12, 15, 231, 84, 12, 15, 231, 83, 12, 15, 231, + 82, 12, 15, 231, 81, 12, 15, 231, 80, 12, 15, 231, 79, 12, 15, 231, 78, + 12, 15, 231, 77, 12, 15, 231, 76, 12, 15, 231, 75, 12, 15, 231, 74, 12, + 15, 231, 73, 12, 15, 231, 72, 12, 15, 231, 71, 12, 15, 231, 70, 12, 15, + 231, 69, 12, 15, 231, 68, 12, 15, 231, 67, 12, 15, 231, 66, 12, 15, 231, + 65, 12, 15, 231, 64, 12, 15, 231, 63, 12, 15, 231, 62, 12, 15, 231, 61, + 12, 15, 231, 60, 12, 15, 231, 59, 12, 15, 231, 58, 12, 15, 231, 57, 12, + 15, 231, 56, 12, 15, 231, 55, 12, 15, 231, 54, 12, 15, 231, 53, 12, 15, + 231, 52, 12, 15, 231, 51, 12, 15, 231, 50, 12, 15, 231, 49, 12, 15, 231, + 48, 12, 15, 231, 47, 12, 15, 231, 46, 12, 15, 231, 45, 12, 15, 231, 44, + 12, 15, 231, 43, 12, 15, 231, 42, 12, 15, 231, 41, 12, 15, 231, 40, 12, + 15, 231, 39, 12, 15, 231, 38, 12, 15, 231, 37, 12, 15, 231, 36, 12, 15, + 231, 35, 12, 15, 231, 34, 12, 15, 231, 33, 12, 15, 231, 32, 12, 15, 231, + 31, 12, 15, 231, 30, 12, 15, 231, 29, 12, 15, 231, 28, 12, 15, 231, 27, + 12, 15, 231, 26, 12, 15, 231, 25, 12, 15, 231, 24, 12, 15, 231, 23, 12, + 15, 231, 22, 12, 15, 231, 21, 12, 15, 231, 20, 12, 15, 231, 19, 12, 15, + 231, 18, 12, 15, 231, 17, 12, 15, 231, 16, 12, 15, 231, 15, 12, 15, 231, + 14, 12, 15, 231, 13, 12, 15, 231, 12, 12, 15, 231, 11, 12, 15, 231, 10, + 12, 15, 231, 9, 12, 15, 231, 8, 12, 15, 231, 7, 12, 15, 231, 6, 12, 15, + 231, 5, 12, 15, 231, 4, 12, 15, 231, 3, 12, 15, 231, 2, 12, 15, 231, 1, + 12, 15, 231, 0, 12, 15, 230, 255, 12, 15, 230, 254, 12, 15, 230, 253, 12, + 15, 230, 252, 12, 15, 230, 251, 12, 15, 230, 250, 12, 15, 230, 249, 12, + 15, 230, 248, 12, 15, 230, 247, 12, 15, 230, 246, 12, 15, 230, 245, 12, + 15, 230, 244, 12, 15, 230, 243, 12, 15, 230, 242, 12, 15, 230, 241, 12, + 15, 230, 240, 12, 15, 230, 239, 12, 15, 230, 238, 12, 15, 230, 237, 12, + 15, 230, 236, 12, 15, 230, 235, 12, 15, 230, 234, 12, 15, 230, 233, 12, + 15, 230, 232, 12, 15, 230, 231, 12, 15, 230, 230, 12, 15, 230, 229, 12, + 15, 230, 228, 12, 15, 230, 227, 12, 15, 230, 226, 12, 15, 230, 225, 12, + 15, 230, 224, 12, 15, 230, 223, 12, 15, 230, 222, 12, 15, 230, 221, 12, + 15, 230, 220, 12, 15, 230, 219, 12, 15, 230, 218, 12, 15, 230, 217, 12, + 15, 230, 216, 12, 15, 230, 215, 12, 15, 230, 214, 12, 15, 230, 213, 12, + 15, 230, 212, 12, 15, 230, 211, 12, 15, 230, 210, 12, 15, 230, 209, 12, + 15, 230, 208, 12, 15, 230, 207, 12, 15, 230, 206, 12, 15, 230, 205, 12, + 15, 230, 204, 12, 15, 230, 203, 12, 15, 230, 202, 12, 15, 230, 201, 12, + 15, 230, 200, 12, 15, 230, 199, 12, 15, 230, 198, 12, 15, 230, 197, 12, + 15, 230, 196, 12, 15, 230, 195, 12, 15, 230, 194, 12, 15, 230, 193, 12, + 15, 230, 192, 225, 77, 207, 13, 165, 208, 244, 165, 238, 43, 81, 165, + 214, 63, 81, 165, 41, 54, 165, 240, 194, 54, 165, 216, 27, 54, 165, 251, + 89, 165, 251, 13, 165, 49, 216, 115, 165, 51, 216, 115, 165, 250, 165, + 165, 93, 54, 165, 246, 70, 165, 233, 32, 165, 236, 183, 208, 76, 165, + 209, 16, 165, 17, 199, 81, 165, 17, 102, 165, 17, 105, 165, 17, 147, 165, + 17, 149, 165, 17, 164, 165, 17, 187, 165, 17, 210, 135, 165, 17, 192, + 165, 17, 219, 113, 165, 246, 79, 165, 210, 167, 165, 224, 241, 54, 165, + 238, 122, 54, 165, 235, 67, 54, 165, 214, 79, 81, 165, 246, 68, 250, 155, + 165, 8, 6, 1, 62, 165, 8, 6, 1, 250, 103, 165, 8, 6, 1, 247, 223, 165, 8, + 6, 1, 242, 153, 165, 8, 6, 1, 72, 165, 8, 6, 1, 238, 5, 165, 8, 6, 1, + 236, 156, 165, 8, 6, 1, 234, 247, 165, 8, 6, 1, 70, 165, 8, 6, 1, 227, + 251, 165, 8, 6, 1, 227, 118, 165, 8, 6, 1, 156, 165, 8, 6, 1, 223, 243, + 165, 8, 6, 1, 220, 214, 165, 8, 6, 1, 74, 165, 8, 6, 1, 216, 226, 165, 8, + 6, 1, 214, 167, 165, 8, 6, 1, 146, 165, 8, 6, 1, 212, 122, 165, 8, 6, 1, + 207, 83, 165, 8, 6, 1, 66, 165, 8, 6, 1, 203, 168, 165, 8, 6, 1, 201, + 147, 165, 8, 6, 1, 200, 195, 165, 8, 6, 1, 200, 123, 165, 8, 6, 1, 199, + 157, 165, 49, 52, 159, 165, 213, 106, 209, 16, 165, 51, 52, 159, 165, + 246, 147, 251, 251, 165, 128, 224, 176, 165, 235, 74, 251, 251, 165, 8, + 4, 1, 62, 165, 8, 4, 1, 250, 103, 165, 8, 4, 1, 247, 223, 165, 8, 4, 1, + 242, 153, 165, 8, 4, 1, 72, 165, 8, 4, 1, 238, 5, 165, 8, 4, 1, 236, 156, + 165, 8, 4, 1, 234, 247, 165, 8, 4, 1, 70, 165, 8, 4, 1, 227, 251, 165, 8, + 4, 1, 227, 118, 165, 8, 4, 1, 156, 165, 8, 4, 1, 223, 243, 165, 8, 4, 1, + 220, 214, 165, 8, 4, 1, 74, 165, 8, 4, 1, 216, 226, 165, 8, 4, 1, 214, + 167, 165, 8, 4, 1, 146, 165, 8, 4, 1, 212, 122, 165, 8, 4, 1, 207, 83, + 165, 8, 4, 1, 66, 165, 8, 4, 1, 203, 168, 165, 8, 4, 1, 201, 147, 165, 8, + 4, 1, 200, 195, 165, 8, 4, 1, 200, 123, 165, 8, 4, 1, 199, 157, 165, 49, + 242, 196, 159, 165, 83, 224, 176, 165, 51, 242, 196, 159, 165, 205, 240, + 247, 157, 207, 13, 58, 211, 96, 58, 211, 85, 58, 211, 74, 58, 211, 62, + 58, 211, 51, 58, 211, 40, 58, 211, 29, 58, 211, 18, 58, 211, 7, 58, 210, + 255, 58, 210, 254, 58, 210, 253, 58, 210, 252, 58, 210, 250, 58, 210, + 249, 58, 210, 248, 58, 210, 247, 58, 210, 246, 58, 210, 245, 58, 210, + 244, 58, 210, 243, 58, 210, 242, 58, 210, 241, 58, 210, 239, 58, 210, + 238, 58, 210, 237, 58, 210, 236, 58, 210, 235, 58, 210, 234, 58, 210, + 233, 58, 210, 232, 58, 210, 231, 58, 210, 230, 58, 210, 228, 58, 210, + 227, 58, 210, 226, 58, 210, 225, 58, 210, 224, 58, 210, 223, 58, 210, + 222, 58, 210, 221, 58, 210, 220, 58, 210, 219, 58, 210, 217, 58, 210, + 216, 58, 210, 215, 58, 210, 214, 58, 210, 213, 58, 210, 212, 58, 210, + 211, 58, 210, 210, 58, 210, 209, 58, 210, 208, 58, 210, 206, 58, 210, + 205, 58, 210, 204, 58, 210, 203, 58, 210, 202, 58, 210, 201, 58, 210, + 200, 58, 210, 199, 58, 210, 198, 58, 210, 197, 58, 210, 195, 58, 210, + 194, 58, 210, 193, 58, 210, 192, 58, 210, 191, 58, 210, 190, 58, 210, + 189, 58, 210, 188, 58, 210, 187, 58, 210, 186, 58, 210, 184, 58, 210, + 183, 58, 210, 182, 58, 210, 181, 58, 210, 180, 58, 210, 179, 58, 210, + 178, 58, 210, 177, 58, 210, 176, 58, 210, 175, 58, 211, 172, 58, 211, + 171, 58, 211, 170, 58, 211, 169, 58, 211, 168, 58, 211, 167, 58, 211, + 166, 58, 211, 165, 58, 211, 164, 58, 211, 163, 58, 211, 161, 58, 211, + 160, 58, 211, 159, 58, 211, 158, 58, 211, 157, 58, 211, 156, 58, 211, + 155, 58, 211, 154, 58, 211, 153, 58, 211, 152, 58, 211, 150, 58, 211, + 149, 58, 211, 148, 58, 211, 147, 58, 211, 146, 58, 211, 145, 58, 211, + 144, 58, 211, 143, 58, 211, 142, 58, 211, 141, 58, 211, 139, 58, 211, + 138, 58, 211, 137, 58, 211, 136, 58, 211, 135, 58, 211, 134, 58, 211, + 133, 58, 211, 132, 58, 211, 131, 58, 211, 130, 58, 211, 128, 58, 211, + 127, 58, 211, 126, 58, 211, 125, 58, 211, 124, 58, 211, 123, 58, 211, + 122, 58, 211, 121, 58, 211, 120, 58, 211, 119, 58, 211, 117, 58, 211, + 116, 58, 211, 115, 58, 211, 114, 58, 211, 113, 58, 211, 112, 58, 211, + 111, 58, 211, 110, 58, 211, 109, 58, 211, 108, 58, 211, 106, 58, 211, + 105, 58, 211, 104, 58, 211, 103, 58, 211, 102, 58, 211, 101, 58, 211, + 100, 58, 211, 99, 58, 211, 98, 58, 211, 97, 58, 211, 95, 58, 211, 94, 58, + 211, 93, 58, 211, 92, 58, 211, 91, 58, 211, 90, 58, 211, 89, 58, 211, 88, + 58, 211, 87, 58, 211, 86, 58, 211, 84, 58, 211, 83, 58, 211, 82, 58, 211, + 81, 58, 211, 80, 58, 211, 79, 58, 211, 78, 58, 211, 77, 58, 211, 76, 58, + 211, 75, 58, 211, 73, 58, 211, 72, 58, 211, 71, 58, 211, 70, 58, 211, 69, + 58, 211, 68, 58, 211, 67, 58, 211, 66, 58, 211, 65, 58, 211, 64, 58, 211, + 61, 58, 211, 60, 58, 211, 59, 58, 211, 58, 58, 211, 57, 58, 211, 56, 58, + 211, 55, 58, 211, 54, 58, 211, 53, 58, 211, 52, 58, 211, 50, 58, 211, 49, + 58, 211, 48, 58, 211, 47, 58, 211, 46, 58, 211, 45, 58, 211, 44, 58, 211, + 43, 58, 211, 42, 58, 211, 41, 58, 211, 39, 58, 211, 38, 58, 211, 37, 58, + 211, 36, 58, 211, 35, 58, 211, 34, 58, 211, 33, 58, 211, 32, 58, 211, 31, + 58, 211, 30, 58, 211, 28, 58, 211, 27, 58, 211, 26, 58, 211, 25, 58, 211, + 24, 58, 211, 23, 58, 211, 22, 58, 211, 21, 58, 211, 20, 58, 211, 19, 58, + 211, 17, 58, 211, 16, 58, 211, 15, 58, 211, 14, 58, 211, 13, 58, 211, 12, + 58, 211, 11, 58, 211, 10, 58, 211, 9, 58, 211, 8, 58, 211, 6, 58, 211, 5, + 58, 211, 4, 58, 211, 3, 58, 211, 2, 58, 211, 1, 58, 211, 0, 218, 97, 218, + 99, 208, 105, 76, 234, 133, 209, 19, 208, 105, 76, 206, 126, 208, 26, + 238, 171, 76, 206, 126, 238, 71, 238, 171, 76, 205, 118, 238, 134, 238, + 158, 238, 159, 251, 243, 251, 244, 251, 139, 248, 233, 249, 123, 248, 42, + 171, 207, 19, 233, 177, 207, 19, 233, 102, 207, 24, 224, 177, 237, 138, + 220, 8, 224, 176, 238, 171, 76, 224, 176, 224, 225, 219, 47, 238, 137, + 224, 177, 207, 19, 83, 207, 19, 201, 168, 236, 242, 237, 138, 237, 116, + 247, 121, 213, 109, 242, 252, 210, 29, 216, 254, 224, 102, 102, 209, 29, + 210, 29, 228, 117, 224, 102, 199, 81, 209, 182, 241, 239, 224, 167, 238, + 96, 240, 221, 241, 107, 243, 34, 102, 241, 228, 241, 107, 243, 34, 105, + 241, 227, 241, 107, 243, 34, 147, 241, 226, 241, 107, 243, 34, 149, 241, + 225, 189, 251, 243, 220, 140, 207, 109, 228, 180, 207, 113, 238, 171, 76, + 205, 119, 248, 134, 238, 78, 247, 156, 247, 158, 238, 171, 76, 222, 65, + 238, 135, 208, 0, 208, 17, 238, 96, 238, 97, 228, 92, 210, 155, 149, 237, + 97, 210, 154, 236, 193, 228, 92, 210, 155, 147, 235, 58, 210, 154, 235, + 55, 228, 92, 210, 155, 105, 213, 181, 210, 154, 212, 180, 228, 92, 210, + 155, 102, 203, 240, 210, 154, 203, 197, 208, 247, 241, 146, 241, 148, + 216, 199, 247, 20, 216, 201, 122, 217, 128, 215, 18, 233, 180, 248, 61, + 216, 17, 234, 99, 248, 74, 218, 242, 248, 61, 234, 99, 220, 103, 228, + 103, 228, 105, 220, 2, 224, 176, 220, 25, 208, 105, 76, 211, 177, 250, + 228, 208, 179, 238, 171, 76, 211, 177, 250, 228, 238, 99, 171, 207, 20, + 210, 141, 233, 177, 207, 20, 210, 141, 233, 99, 171, 207, 20, 3, 227, + 130, 233, 177, 207, 20, 3, 227, 130, 233, 100, 224, 177, 207, 20, 210, + 141, 83, 207, 20, 210, 141, 201, 167, 216, 108, 224, 177, 236, 233, 216, + 108, 224, 177, 239, 167, 215, 124, 216, 108, 224, 177, 249, 122, 216, + 108, 224, 177, 203, 228, 215, 119, 213, 106, 224, 177, 237, 138, 213, + 106, 228, 103, 213, 88, 209, 139, 210, 29, 105, 209, 136, 208, 181, 209, + 139, 210, 29, 147, 209, 135, 208, 180, 241, 107, 243, 34, 208, 49, 241, + 223, 215, 4, 203, 196, 102, 215, 4, 203, 194, 214, 223, 215, 4, 203, 196, + 105, 215, 4, 203, 193, 214, 222, 210, 142, 205, 117, 208, 104, 208, 32, + 247, 157, 247, 20, 247, 95, 222, 24, 201, 106, 220, 232, 208, 105, 76, + 235, 43, 250, 228, 208, 105, 76, 214, 241, 250, 228, 208, 246, 238, 171, + 76, 235, 43, 250, 228, 238, 171, 76, 214, 241, 250, 228, 238, 132, 208, + 105, 76, 208, 49, 209, 5, 209, 139, 235, 79, 171, 228, 52, 210, 119, 209, + 139, 171, 228, 52, 211, 217, 243, 34, 210, 151, 228, 52, 242, 215, 208, + 50, 206, 152, 208, 123, 217, 45, 207, 98, 246, 69, 217, 13, 215, 5, 222, + 23, 215, 109, 251, 9, 214, 255, 246, 69, 251, 25, 220, 91, 209, 191, 8, + 6, 1, 235, 199, 8, 4, 1, 235, 199, 247, 39, 251, 118, 207, 103, 208, 6, + 246, 80, 209, 86, 225, 28, 227, 63, 1, 224, 129, 225, 75, 1, 237, 14, + 237, 5, 225, 75, 1, 237, 14, 237, 150, 225, 75, 1, 213, 1, 225, 75, 1, + 224, 110, 79, 134, 248, 146, 210, 4, 235, 162, 221, 229, 213, 96, 236, + 170, 236, 169, 236, 168, 220, 234, 198, 240, 198, 241, 198, 243, 224, 46, + 213, 9, 224, 48, 213, 11, 216, 76, 224, 45, 213, 8, 219, 17, 221, 140, + 201, 2, 224, 47, 213, 10, 236, 192, 216, 75, 201, 54, 238, 194, 236, 180, + 221, 210, 217, 79, 203, 198, 99, 221, 210, 241, 245, 99, 98, 205, 97, 55, + 3, 53, 83, 97, 87, 205, 97, 55, 3, 53, 83, 97, 11, 5, 228, 10, 81, 215, + 19, 236, 242, 36, 83, 51, 64, 224, 247, 159, 202, 168, 202, 57, 201, 245, + 201, 234, 201, 223, 201, 212, 201, 201, 201, 190, 201, 179, 202, 167, + 202, 156, 202, 145, 202, 134, 202, 123, 202, 112, 202, 101, 247, 228, + 217, 30, 81, 248, 114, 198, 242, 10, 2, 218, 106, 206, 155, 10, 2, 218, + 106, 119, 218, 106, 248, 4, 119, 248, 3, 61, 32, 16, 236, 191, 209, 82, + 246, 196, 203, 69, 202, 90, 202, 79, 202, 68, 202, 56, 202, 45, 202, 34, + 202, 23, 202, 12, 202, 1, 201, 249, 201, 248, 201, 247, 201, 246, 201, + 244, 201, 243, 201, 242, 201, 241, 201, 240, 201, 239, 201, 238, 201, + 237, 201, 236, 201, 235, 201, 233, 201, 232, 201, 231, 201, 230, 201, + 229, 201, 228, 201, 227, 201, 226, 201, 225, 201, 224, 201, 222, 201, + 221, 201, 220, 201, 219, 201, 218, 201, 217, 201, 216, 201, 215, 201, + 214, 201, 213, 201, 211, 201, 210, 201, 209, 201, 208, 201, 207, 201, + 206, 201, 205, 201, 204, 201, 203, 201, 202, 201, 200, 201, 199, 201, + 198, 201, 197, 201, 196, 201, 195, 201, 194, 201, 193, 201, 192, 201, + 191, 201, 189, 201, 188, 201, 187, 201, 186, 201, 185, 201, 184, 201, + 183, 201, 182, 201, 181, 201, 180, 201, 178, 201, 177, 201, 176, 201, + 175, 201, 174, 201, 173, 201, 172, 201, 171, 201, 170, 201, 169, 202, + 166, 202, 165, 202, 164, 202, 163, 202, 162, 202, 161, 202, 160, 202, + 159, 202, 158, 202, 157, 202, 155, 202, 154, 202, 153, 202, 152, 202, + 151, 202, 150, 202, 149, 202, 148, 202, 147, 202, 146, 202, 144, 202, + 143, 202, 142, 202, 141, 202, 140, 202, 139, 202, 138, 202, 137, 202, + 136, 202, 135, 202, 133, 202, 132, 202, 131, 202, 130, 202, 129, 202, + 128, 202, 127, 202, 126, 202, 125, 202, 124, 202, 122, 202, 121, 202, + 120, 202, 119, 202, 118, 202, 117, 202, 116, 202, 115, 202, 114, 202, + 113, 202, 111, 202, 110, 202, 109, 202, 108, 202, 107, 202, 106, 202, + 105, 202, 104, 202, 103, 202, 102, 202, 100, 202, 99, 202, 98, 202, 97, + 202, 96, 202, 95, 202, 94, 202, 93, 202, 92, 202, 91, 202, 89, 202, 88, + 202, 87, 202, 86, 202, 85, 202, 84, 202, 83, 202, 82, 202, 81, 202, 80, + 202, 78, 202, 77, 202, 76, 202, 75, 202, 74, 202, 73, 202, 72, 202, 71, + 202, 70, 202, 69, 202, 67, 202, 66, 202, 65, 202, 64, 202, 63, 202, 62, + 202, 61, 202, 60, 202, 59, 202, 58, 202, 55, 202, 54, 202, 53, 202, 52, + 202, 51, 202, 50, 202, 49, 202, 48, 202, 47, 202, 46, 202, 44, 202, 43, + 202, 42, 202, 41, 202, 40, 202, 39, 202, 38, 202, 37, 202, 36, 202, 35, + 202, 33, 202, 32, 202, 31, 202, 30, 202, 29, 202, 28, 202, 27, 202, 26, + 202, 25, 202, 24, 202, 22, 202, 21, 202, 20, 202, 19, 202, 18, 202, 17, + 202, 16, 202, 15, 202, 14, 202, 13, 202, 11, 202, 10, 202, 9, 202, 8, + 202, 7, 202, 6, 202, 5, 202, 4, 202, 3, 202, 2, 202, 0, 201, 255, 201, + 254, 201, 253, 201, 252, 201, 251, 201, 250, 8, 6, 1, 35, 3, 222, 229, + 26, 235, 73, 8, 4, 1, 35, 3, 222, 229, 26, 235, 73, 8, 6, 1, 197, 3, 83, + 224, 177, 57, 8, 4, 1, 197, 3, 83, 224, 177, 57, 8, 6, 1, 197, 3, 83, + 224, 177, 248, 228, 26, 235, 73, 8, 4, 1, 197, 3, 83, 224, 177, 248, 228, + 26, 235, 73, 8, 6, 1, 197, 3, 83, 224, 177, 248, 228, 26, 169, 8, 4, 1, + 197, 3, 83, 224, 177, 248, 228, 26, 169, 8, 6, 1, 197, 3, 246, 147, 26, + 222, 228, 8, 4, 1, 197, 3, 246, 147, 26, 222, 228, 8, 6, 1, 197, 3, 246, + 147, 26, 247, 125, 8, 4, 1, 197, 3, 246, 147, 26, 247, 125, 8, 6, 1, 233, + 19, 3, 222, 229, 26, 235, 73, 8, 4, 1, 233, 19, 3, 222, 229, 26, 235, 73, + 8, 4, 1, 233, 19, 3, 73, 88, 26, 169, 8, 4, 1, 220, 0, 3, 205, 241, 56, + 8, 6, 1, 163, 3, 83, 224, 177, 57, 8, 4, 1, 163, 3, 83, 224, 177, 57, 8, + 6, 1, 163, 3, 83, 224, 177, 248, 228, 26, 235, 73, 8, 4, 1, 163, 3, 83, + 224, 177, 248, 228, 26, 235, 73, 8, 6, 1, 163, 3, 83, 224, 177, 248, 228, + 26, 169, 8, 4, 1, 163, 3, 83, 224, 177, 248, 228, 26, 169, 8, 6, 1, 212, + 123, 3, 83, 224, 177, 57, 8, 4, 1, 212, 123, 3, 83, 224, 177, 57, 8, 6, + 1, 108, 3, 222, 229, 26, 235, 73, 8, 4, 1, 108, 3, 222, 229, 26, 235, 73, + 8, 6, 1, 35, 3, 217, 111, 26, 169, 8, 4, 1, 35, 3, 217, 111, 26, 169, 8, + 6, 1, 35, 3, 217, 111, 26, 205, 240, 8, 4, 1, 35, 3, 217, 111, 26, 205, + 240, 8, 6, 1, 197, 3, 217, 111, 26, 169, 8, 4, 1, 197, 3, 217, 111, 26, + 169, 8, 6, 1, 197, 3, 217, 111, 26, 205, 240, 8, 4, 1, 197, 3, 217, 111, + 26, 205, 240, 8, 6, 1, 197, 3, 73, 88, 26, 169, 8, 4, 1, 197, 3, 73, 88, + 26, 169, 8, 6, 1, 197, 3, 73, 88, 26, 205, 240, 8, 4, 1, 197, 3, 73, 88, + 26, 205, 240, 8, 4, 1, 233, 19, 3, 73, 88, 26, 235, 73, 8, 4, 1, 233, 19, + 3, 73, 88, 26, 205, 240, 8, 6, 1, 233, 19, 3, 217, 111, 26, 169, 8, 4, 1, + 233, 19, 3, 217, 111, 26, 73, 88, 26, 169, 8, 6, 1, 233, 19, 3, 217, 111, + 26, 205, 240, 8, 4, 1, 233, 19, 3, 217, 111, 26, 73, 88, 26, 205, 240, 8, + 6, 1, 227, 252, 3, 205, 240, 8, 4, 1, 227, 252, 3, 73, 88, 26, 205, 240, + 8, 6, 1, 225, 193, 3, 205, 240, 8, 4, 1, 225, 193, 3, 205, 240, 8, 6, 1, + 223, 244, 3, 205, 240, 8, 4, 1, 223, 244, 3, 205, 240, 8, 6, 1, 214, 33, + 3, 205, 240, 8, 4, 1, 214, 33, 3, 205, 240, 8, 6, 1, 108, 3, 217, 111, + 26, 169, 8, 4, 1, 108, 3, 217, 111, 26, 169, 8, 6, 1, 108, 3, 217, 111, + 26, 205, 240, 8, 4, 1, 108, 3, 217, 111, 26, 205, 240, 8, 6, 1, 108, 3, + 222, 229, 26, 169, 8, 4, 1, 108, 3, 222, 229, 26, 169, 8, 6, 1, 108, 3, + 222, 229, 26, 205, 240, 8, 4, 1, 108, 3, 222, 229, 26, 205, 240, 8, 4, 1, + 251, 222, 3, 235, 73, 8, 4, 1, 176, 163, 3, 235, 73, 8, 4, 1, 176, 163, + 3, 169, 8, 4, 1, 204, 185, 203, 169, 3, 235, 73, 8, 4, 1, 204, 185, 203, + 169, 3, 169, 8, 4, 1, 211, 219, 3, 235, 73, 8, 4, 1, 211, 219, 3, 169, 8, + 4, 1, 233, 186, 211, 219, 3, 235, 73, 8, 4, 1, 233, 186, 211, 219, 3, + 169, 9, 210, 151, 90, 3, 234, 204, 88, 3, 251, 142, 9, 210, 151, 90, 3, + 234, 204, 88, 3, 201, 72, 9, 210, 151, 90, 3, 234, 204, 88, 3, 140, 222, + 187, 9, 210, 151, 90, 3, 234, 204, 88, 3, 217, 121, 9, 210, 151, 90, 3, + 234, 204, 88, 3, 66, 9, 210, 151, 90, 3, 234, 204, 88, 3, 199, 211, 9, + 210, 151, 90, 3, 234, 204, 88, 3, 72, 9, 210, 151, 90, 3, 234, 204, 88, + 3, 251, 221, 9, 210, 151, 218, 228, 3, 226, 252, 185, 1, 226, 182, 45, + 111, 227, 118, 45, 111, 219, 255, 45, 111, 247, 223, 45, 111, 218, 62, + 45, 111, 205, 0, 45, 111, 219, 22, 45, 111, 207, 83, 45, 111, 220, 214, + 45, 111, 216, 226, 45, 111, 223, 243, 45, 111, 200, 123, 45, 111, 146, + 45, 111, 156, 45, 111, 203, 168, 45, 111, 224, 130, 45, 111, 224, 139, + 45, 111, 212, 216, 45, 111, 219, 4, 45, 111, 227, 251, 45, 111, 210, 116, + 45, 111, 208, 182, 45, 111, 212, 122, 45, 111, 234, 247, 45, 111, 226, + 30, 45, 5, 227, 105, 45, 5, 226, 163, 45, 5, 226, 150, 45, 5, 226, 15, + 45, 5, 225, 236, 45, 5, 227, 8, 45, 5, 227, 5, 45, 5, 227, 82, 45, 5, + 226, 88, 45, 5, 226, 68, 45, 5, 227, 26, 45, 5, 219, 252, 45, 5, 219, + 201, 45, 5, 219, 197, 45, 5, 219, 166, 45, 5, 219, 158, 45, 5, 219, 240, + 45, 5, 219, 238, 45, 5, 219, 249, 45, 5, 219, 178, 45, 5, 219, 173, 45, + 5, 219, 242, 45, 5, 247, 189, 45, 5, 246, 173, 45, 5, 246, 163, 45, 5, + 242, 214, 45, 5, 242, 178, 45, 5, 247, 76, 45, 5, 247, 68, 45, 5, 247, + 178, 45, 5, 246, 91, 45, 5, 243, 30, 45, 5, 247, 109, 45, 5, 218, 59, 45, + 5, 218, 41, 45, 5, 218, 36, 45, 5, 218, 19, 45, 5, 218, 11, 45, 5, 218, + 50, 45, 5, 218, 49, 45, 5, 218, 56, 45, 5, 218, 26, 45, 5, 218, 23, 45, + 5, 218, 53, 45, 5, 204, 252, 45, 5, 204, 232, 45, 5, 204, 231, 45, 5, + 204, 220, 45, 5, 204, 217, 45, 5, 204, 248, 45, 5, 204, 247, 45, 5, 204, + 251, 45, 5, 204, 230, 45, 5, 204, 229, 45, 5, 204, 250, 45, 5, 219, 20, + 45, 5, 219, 6, 45, 5, 219, 5, 45, 5, 218, 245, 45, 5, 218, 244, 45, 5, + 219, 16, 45, 5, 219, 15, 45, 5, 219, 19, 45, 5, 218, 247, 45, 5, 218, + 246, 45, 5, 219, 18, 45, 5, 207, 32, 45, 5, 206, 15, 45, 5, 205, 255, 45, + 5, 204, 215, 45, 5, 204, 176, 45, 5, 206, 201, 45, 5, 206, 190, 45, 5, + 207, 8, 45, 5, 138, 45, 5, 205, 161, 45, 5, 206, 221, 45, 5, 220, 157, + 45, 5, 219, 150, 45, 5, 219, 125, 45, 5, 218, 133, 45, 5, 218, 74, 45, 5, + 220, 34, 45, 5, 220, 29, 45, 5, 220, 143, 45, 5, 218, 241, 45, 5, 218, + 229, 45, 5, 220, 116, 45, 5, 216, 210, 45, 5, 215, 204, 45, 5, 215, 166, + 45, 5, 214, 224, 45, 5, 214, 190, 45, 5, 216, 73, 45, 5, 216, 61, 45, 5, + 216, 190, 45, 5, 215, 106, 45, 5, 215, 81, 45, 5, 216, 87, 45, 5, 222, + 233, 45, 5, 221, 211, 45, 5, 221, 181, 45, 5, 221, 41, 45, 5, 220, 243, + 45, 5, 222, 76, 45, 5, 222, 64, 45, 5, 222, 198, 45, 5, 221, 136, 45, 5, + 221, 87, 45, 5, 222, 123, 45, 5, 200, 109, 45, 5, 200, 9, 45, 5, 200, 0, + 45, 5, 199, 211, 45, 5, 199, 179, 45, 5, 200, 51, 45, 5, 200, 48, 45, 5, + 200, 88, 45, 5, 199, 245, 45, 5, 199, 230, 45, 5, 200, 61, 45, 5, 213, + 248, 45, 5, 213, 88, 45, 5, 213, 33, 45, 5, 212, 175, 45, 5, 212, 143, + 45, 5, 213, 190, 45, 5, 213, 167, 45, 5, 213, 229, 45, 5, 213, 1, 45, 5, + 212, 238, 45, 5, 213, 199, 45, 5, 225, 175, 45, 5, 224, 210, 45, 5, 224, + 192, 45, 5, 224, 42, 45, 5, 224, 13, 45, 5, 225, 40, 45, 5, 225, 32, 45, + 5, 225, 149, 45, 5, 224, 110, 45, 5, 224, 78, 45, 5, 225, 58, 45, 5, 203, + 89, 45, 5, 202, 234, 45, 5, 202, 219, 45, 5, 201, 166, 45, 5, 201, 159, + 45, 5, 203, 59, 45, 5, 203, 54, 45, 5, 203, 85, 45, 5, 202, 193, 45, 5, + 202, 179, 45, 5, 203, 65, 45, 5, 224, 128, 45, 5, 224, 123, 45, 5, 224, + 122, 45, 5, 224, 119, 45, 5, 224, 118, 45, 5, 224, 125, 45, 5, 224, 124, + 45, 5, 224, 127, 45, 5, 224, 121, 45, 5, 224, 120, 45, 5, 224, 126, 45, + 5, 224, 137, 45, 5, 224, 132, 45, 5, 224, 131, 45, 5, 224, 115, 45, 5, + 224, 114, 45, 5, 224, 134, 45, 5, 224, 133, 45, 5, 224, 136, 45, 5, 224, + 117, 45, 5, 224, 116, 45, 5, 224, 135, 45, 5, 212, 214, 45, 5, 212, 203, + 45, 5, 212, 202, 45, 5, 212, 195, 45, 5, 212, 188, 45, 5, 212, 210, 45, + 5, 212, 209, 45, 5, 212, 213, 45, 5, 212, 201, 45, 5, 212, 200, 45, 5, + 212, 212, 45, 5, 219, 2, 45, 5, 218, 253, 45, 5, 218, 252, 45, 5, 218, + 249, 45, 5, 218, 248, 45, 5, 218, 255, 45, 5, 218, 254, 45, 5, 219, 1, + 45, 5, 218, 251, 45, 5, 218, 250, 45, 5, 219, 0, 45, 5, 227, 247, 45, 5, + 227, 207, 45, 5, 227, 200, 45, 5, 227, 147, 45, 5, 227, 128, 45, 5, 227, + 227, 45, 5, 227, 225, 45, 5, 227, 241, 45, 5, 227, 166, 45, 5, 227, 156, + 45, 5, 227, 234, 45, 5, 210, 109, 45, 5, 210, 33, 45, 5, 210, 28, 45, 5, + 209, 220, 45, 5, 209, 203, 45, 5, 210, 65, 45, 5, 210, 63, 45, 5, 210, + 98, 45, 5, 210, 8, 45, 5, 210, 2, 45, 5, 210, 74, 45, 5, 208, 178, 45, 5, + 208, 147, 45, 5, 208, 143, 45, 5, 208, 134, 45, 5, 208, 131, 45, 5, 208, + 153, 45, 5, 208, 152, 45, 5, 208, 177, 45, 5, 208, 139, 45, 5, 208, 138, + 45, 5, 208, 155, 45, 5, 212, 61, 45, 5, 209, 182, 45, 5, 209, 161, 45, 5, + 208, 24, 45, 5, 207, 193, 45, 5, 211, 202, 45, 5, 211, 190, 45, 5, 212, + 46, 45, 5, 209, 29, 45, 5, 209, 10, 45, 5, 211, 243, 45, 5, 234, 233, 45, + 5, 234, 75, 45, 5, 234, 54, 45, 5, 233, 97, 45, 5, 233, 71, 45, 5, 234, + 139, 45, 5, 234, 120, 45, 5, 234, 223, 45, 5, 233, 207, 45, 5, 233, 188, + 45, 5, 234, 150, 45, 5, 226, 29, 45, 5, 226, 28, 45, 5, 226, 23, 45, 5, + 226, 22, 45, 5, 226, 19, 45, 5, 226, 18, 45, 5, 226, 25, 45, 5, 226, 24, + 45, 5, 226, 27, 45, 5, 226, 21, 45, 5, 226, 20, 45, 5, 226, 26, 45, 5, + 209, 227, 143, 111, 2, 200, 74, 143, 111, 2, 213, 218, 143, 111, 2, 213, + 134, 118, 1, 204, 102, 86, 111, 2, 246, 86, 161, 86, 111, 2, 246, 86, + 226, 207, 86, 111, 2, 246, 86, 226, 88, 86, 111, 2, 246, 86, 226, 178, + 86, 111, 2, 246, 86, 219, 178, 86, 111, 2, 246, 86, 247, 190, 86, 111, 2, + 246, 86, 247, 37, 86, 111, 2, 246, 86, 246, 91, 86, 111, 2, 246, 86, 246, + 210, 86, 111, 2, 246, 86, 218, 26, 86, 111, 2, 246, 86, 242, 58, 86, 111, + 2, 246, 86, 204, 241, 86, 111, 2, 246, 86, 240, 211, 86, 111, 2, 246, 86, + 204, 236, 86, 111, 2, 246, 86, 188, 86, 111, 2, 246, 86, 207, 36, 86, + 111, 2, 246, 86, 206, 122, 86, 111, 2, 246, 86, 138, 86, 111, 2, 246, 86, + 206, 61, 86, 111, 2, 246, 86, 218, 241, 86, 111, 2, 246, 86, 249, 136, + 86, 111, 2, 246, 86, 215, 245, 86, 111, 2, 246, 86, 215, 106, 86, 111, 2, + 246, 86, 215, 217, 86, 111, 2, 246, 86, 221, 136, 86, 111, 2, 246, 86, + 199, 245, 86, 111, 2, 246, 86, 213, 1, 86, 111, 2, 246, 86, 224, 110, 86, + 111, 2, 246, 86, 202, 193, 86, 111, 2, 246, 86, 210, 114, 86, 111, 2, + 246, 86, 208, 179, 86, 111, 2, 246, 86, 212, 64, 86, 111, 2, 246, 86, + 144, 86, 111, 2, 246, 86, 194, 86, 22, 2, 246, 86, 214, 159, 86, 228, + 104, 22, 2, 246, 86, 214, 97, 86, 228, 104, 22, 2, 246, 86, 212, 131, 86, + 228, 104, 22, 2, 246, 86, 212, 124, 86, 228, 104, 22, 2, 246, 86, 214, + 139, 86, 22, 2, 217, 86, 86, 22, 2, 252, 99, 177, 1, 248, 181, 219, 253, + 177, 1, 248, 181, 219, 201, 177, 1, 248, 181, 219, 166, 177, 1, 248, 181, + 219, 240, 177, 1, 248, 181, 219, 178, 69, 1, 248, 181, 219, 253, 69, 1, + 248, 181, 219, 201, 69, 1, 248, 181, 219, 166, 69, 1, 248, 181, 219, 240, + 69, 1, 248, 181, 219, 178, 69, 1, 251, 169, 247, 76, 69, 1, 251, 169, + 204, 215, 69, 1, 251, 169, 138, 69, 1, 251, 169, 216, 226, 67, 1, 238, + 29, 238, 28, 243, 38, 150, 148, 67, 1, 238, 28, 238, 29, 243, 38, 150, + 148, }; static unsigned char phrasebook_offset1[] = { @@ -16533,20 +17649,22 @@ static unsigned char phrasebook_offset1[] = { 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 52, 87, 52, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 52, 97, 52, 52, 52, 52, 52, 98, 99, 100, - 101, 102, 103, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 104, 105, 106, - 107, 108, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 109, 110, 111, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 89, 90, 91, 92, 93, 94, 95, 96, 52, 97, 52, 98, 52, 52, 52, 99, 100, 101, + 102, 103, 104, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 105, 106, 107, + 108, 109, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 110, 111, 112, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 112, 113, 114, 115, 52, 52, 52, 116, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 113, 114, 115, 116, 52, 52, 52, 117, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 118, 119, + 120, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 121, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 122, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 52, 52, 52, 52, 52, 134, 52, + 52, 52, 52, 52, 52, 52, 135, 136, 52, 52, 52, 52, 137, 52, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 117, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 118, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 130, 52, 52, 52, 52, 52, 131, 52, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, @@ -16558,9 +17676,9 @@ static unsigned char phrasebook_offset1[] = { 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 148, 149, 150, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 142, 143, 144, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, @@ -16715,9 +17833,9 @@ static unsigned char phrasebook_offset1[] = { 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 151, 152, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 145, 146, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, @@ -16729,10 +17847,8 @@ static unsigned char phrasebook_offset1[] = { 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 147, 148, 149, - 150, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 153, 154, 155, + 156, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, @@ -16768,1214 +17884,1217 @@ static unsigned int phrasebook_offset2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 6, 9, 11, 14, 17, 19, 21, 24, 27, 29, 31, 33, 35, 39, 41, 44, 46, 48, 50, 52, 54, 56, 59, 61, 64, 66, 68, 71, 74, 77, 80, 84, 88, 93, 98, 103, 107, 112, 117, 122, 126, 131, 136, 140, 145, - 150, 154, 159, 164, 168, 172, 177, 181, 186, 191, 196, 201, 206, 209, - 213, 216, 220, 223, 227, 231, 236, 241, 246, 250, 255, 260, 265, 269, - 274, 279, 283, 288, 293, 297, 302, 307, 311, 315, 320, 324, 329, 334, - 339, 344, 349, 353, 356, 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 362, 366, 371, - 374, 377, 380, 383, 386, 389, 391, 394, 400, 408, 411, 415, 418, 420, - 423, 426, 429, 432, 436, 439, 442, 445, 447, 450, 456, 464, 471, 478, - 485, 490, 497, 503, 510, 517, 524, 532, 537, 545, 552, 558, 565, 572, - 580, 587, 595, 603, 608, 616, 623, 629, 636, 643, 650, 653, 659, 666, - 672, 679, 686, 693, 698, 704, 711, 717, 724, 731, 738, 746, 751, 759, - 766, 772, 779, 786, 794, 801, 809, 817, 822, 830, 837, 843, 850, 857, - 864, 867, 873, 880, 886, 893, 900, 907, 912, 920, 927, 934, 941, 948, - 955, 962, 969, 976, 984, 992, 1000, 1008, 1016, 1024, 1032, 1040, 1047, - 1054, 1061, 1068, 1075, 1082, 1089, 1096, 1103, 1110, 1117, 1124, 1132, - 1140, 1148, 1156, 1164, 1172, 1180, 1188, 1196, 1204, 1211, 1218, 1226, - 1234, 1242, 1250, 1258, 1266, 1274, 1282, 1290, 1296, 1301, 1306, 1314, - 1322, 1330, 1338, 1343, 1350, 1357, 1365, 1373, 1381, 1389, 1398, 1407, - 1414, 1421, 1428, 1435, 1443, 1451, 1459, 1467, 1478, 1483, 1488, 1495, - 1502, 1509, 1516, 1523, 1530, 1535, 1540, 1547, 1554, 1562, 1570, 1578, - 1586, 1593, 1600, 1608, 1616, 1624, 1632, 1640, 1648, 1656, 1664, 1672, - 1680, 1687, 1694, 1701, 1708, 1715, 1722, 1729, 1736, 1744, 1752, 1759, - 1766, 1773, 1780, 1788, 1796, 1804, 1812, 1820, 1827, 1834, 1842, 1850, - 1858, 1866, 1871, 1877, 1883, 1890, 1897, 1902, 1907, 1912, 1919, 1926, - 1933, 1940, 1948, 1956, 1963, 1969, 1974, 1979, 1986, 1993, 2000, 2005, - 2010, 2015, 2022, 2029, 2036, 2043, 2050, 2057, 2065, 2075, 2083, 2090, - 2097, 2102, 2107, 2114, 2121, 2125, 2130, 2135, 2140, 2148, 2157, 2164, - 2171, 2180, 2187, 2194, 2199, 2206, 2213, 2220, 2227, 2234, 2239, 2246, - 2253, 2261, 2266, 2271, 2276, 2286, 2290, 2296, 2302, 2308, 2314, 2322, - 2335, 2343, 2348, 2358, 2363, 2368, 2378, 2383, 2390, 2397, 2405, 2413, - 2420, 2427, 2434, 2441, 2451, 2461, 2470, 2479, 2489, 2499, 2509, 2519, - 2525, 2535, 2545, 2555, 2565, 2573, 2581, 2588, 2595, 2603, 2611, 2619, - 2627, 2634, 2641, 2651, 2661, 2669, 2677, 2685, 2690, 2700, 2705, 2712, - 2719, 2724, 2729, 2737, 2745, 2755, 2765, 2772, 2779, 2788, 2797, 2805, - 2813, 2822, 2831, 2839, 2847, 2856, 2865, 2874, 2883, 2893, 2903, 2911, - 2919, 2928, 2937, 2946, 2955, 2965, 2975, 2983, 2991, 3000, 3009, 3018, - 3027, 3036, 3045, 3050, 3055, 3063, 3071, 3081, 3089, 3094, 3099, 3106, - 3113, 3120, 3127, 3134, 3141, 3151, 3161, 3171, 3181, 3188, 3195, 3205, - 3215, 3223, 3231, 3239, 3247, 3255, 3262, 3269, 3276, 3282, 3289, 3296, - 3303, 3312, 3322, 3332, 3339, 3346, 3352, 3357, 3364, 3370, 3376, 3383, - 3390, 3401, 3411, 3418, 3425, 3432, 3439, 3445, 3450, 3457, 3463, 3468, - 3476, 3484, 3491, 3497, 3502, 3509, 3514, 3521, 3530, 3539, 3548, 3555, - 3561, 3567, 3572, 3579, 3586, 3593, 3600, 3607, 3612, 3617, 3626, 3634, - 3643, 3648, 3655, 3666, 3673, 3681, 3690, 3696, 3702, 3708, 3715, 3720, - 3726, 3737, 3746, 3755, 3763, 3771, 3781, 3786, 3793, 3800, 3805, 3817, - 3826, 3834, 3841, 3850, 3855, 3860, 3867, 3874, 3881, 3888, 3894, 3903, - 3911, 3916, 3924, 3930, 3938, 3946, 3952, 3958, 3964, 3971, 3979, 3985, - 3993, 4000, 4005, 4012, 4020, 4030, 4037, 4044, 4054, 4061, 4068, 4078, - 4085, 4092, 4099, 4105, 4111, 4121, 4134, 4139, 4146, 4151, 4155, 4161, - 4170, 4177, 4182, 4187, 4191, 4196, 4202, 4206, 4212, 4218, 4224, 4230, - 4238, 4243, 4248, 4253, 4258, 4264, 4266, 4271, 4275, 4281, 4287, 4293, - 4298, 4305, 4312, 4318, 4325, 4333, 4341, 4346, 4351, 4355, 4360, 4362, - 4364, 4367, 4369, 4372, 4377, 4382, 4388, 4393, 4397, 4401, 4406, 4415, - 4421, 4426, 4432, 4437, 4443, 4451, 4459, 4463, 4467, 4472, 4478, 4484, - 4490, 4496, 4501, 4508, 4516, 4524, 4529, 4535, 4542, 4549, 4556, 4563, - 4567, 4572, 4577, 4582, 4587, 4592, 4595, 4598, 4601, 4604, 4607, 4610, - 4614, 4618, 4624, 4627, 4632, 4638, 4644, 4647, 4652, 4658, 4662, 4668, - 4674, 4680, 4686, 4691, 4696, 4701, 4704, 4710, 4715, 4720, 4724, 4729, - 4735, 4741, 4744, 4748, 4752, 4756, 4759, 4762, 4767, 4771, 4778, 4782, - 4788, 4792, 4798, 4802, 4806, 4810, 4815, 4820, 4827, 4833, 4840, 4846, - 4852, 4858, 4861, 4865, 4869, 4873, 4877, 4882, 4887, 4891, 4895, 4901, - 4905, 4909, 4914, 4920, 4925, 4931, 4935, 4942, 4947, 4951, 4956, 4961, - 4967, 4970, 4974, 4979, 4984, 4993, 4999, 5004, 5008, 5013, 5017, 5022, - 5026, 5030, 5035, 5039, 5045, 5050, 5055, 5060, 5065, 5070, 5075, 5081, - 5087, 5093, 5099, 5104, 5110, 5116, 5122, 5127, 5132, 5139, 5146, 5150, - 5156, 5163, 0, 0, 5170, 5173, 5182, 5191, 5202, 5206, 0, 0, 0, 0, 5211, - 5214, 5219, 5227, 5232, 5240, 5248, 0, 5256, 0, 5264, 5272, 5280, 5291, - 5296, 5301, 5306, 5311, 5316, 5321, 5326, 5331, 5336, 5341, 5346, 5351, - 5356, 5361, 5366, 5371, 0, 5376, 5381, 5386, 5391, 5396, 5401, 5406, - 5411, 5419, 5427, 5435, 5443, 5451, 5459, 5470, 5475, 5480, 5485, 5490, - 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545, 5550, - 5555, 5561, 5566, 5571, 5576, 5581, 5586, 5591, 5596, 5604, 5612, 5620, - 5628, 5636, 5641, 5645, 5649, 5656, 5666, 5676, 5680, 5684, 5688, 5694, - 5701, 5705, 5710, 5714, 5719, 5723, 5728, 5732, 5737, 5742, 5747, 5752, - 5757, 5762, 5767, 5772, 5777, 5782, 5787, 5792, 5797, 5802, 5807, 5811, - 5815, 5821, 5825, 5830, 5836, 5844, 5849, 5854, 5861, 5866, 5871, 5878, - 5887, 5896, 5907, 5915, 5920, 5925, 5930, 5937, 5942, 5948, 5953, 5958, - 5963, 5968, 5973, 5978, 5986, 5992, 5997, 6001, 6006, 6011, 6016, 6021, - 6026, 6031, 6036, 6040, 6046, 6050, 6055, 6060, 6065, 6069, 6074, 6079, - 6084, 6089, 6093, 6098, 6102, 6107, 6112, 6117, 6122, 6128, 6133, 6139, - 6143, 6148, 6152, 6156, 6161, 6166, 6171, 6176, 6181, 6186, 6191, 6195, - 6201, 6205, 6210, 6215, 6220, 6224, 6229, 6234, 6239, 6244, 6248, 6253, - 6257, 6262, 6267, 6272, 6277, 6283, 6288, 6294, 6298, 6303, 6307, 6315, - 6320, 6325, 6330, 6337, 6342, 6348, 6353, 6358, 6363, 6368, 6373, 6378, - 6386, 6392, 6397, 6402, 6407, 6412, 6417, 6423, 6429, 6436, 6443, 6452, - 6461, 6468, 6475, 6484, 6493, 6498, 6503, 6508, 6513, 6518, 6523, 6528, - 6533, 6544, 6555, 6560, 6565, 6572, 6579, 6587, 6595, 6600, 6605, 6610, - 6615, 6619, 6623, 6627, 6633, 6639, 6643, 6650, 6655, 6665, 6675, 6681, - 6687, 6695, 6703, 6711, 6719, 6726, 6733, 6741, 6749, 6757, 6765, 6773, - 6781, 6789, 6797, 6805, 6813, 6820, 6827, 6833, 6839, 6847, 6855, 6862, - 6869, 6877, 6885, 6891, 6897, 6905, 6913, 6921, 6929, 6935, 6941, 6949, - 6957, 6965, 6973, 6980, 6987, 6995, 7003, 7011, 7019, 7024, 7029, 7036, - 7043, 7053, 7063, 7067, 7075, 7083, 7090, 7097, 7105, 7113, 7120, 7127, - 7135, 7143, 7150, 7157, 7165, 7173, 7178, 7185, 7192, 7199, 7206, 7212, - 7218, 7226, 7234, 7239, 7244, 7252, 7260, 7268, 7276, 7284, 7292, 7299, - 7306, 7314, 7322, 7330, 7338, 7345, 7352, 7358, 7364, 7373, 7382, 7389, - 7396, 7403, 7410, 7417, 7424, 7431, 7438, 7446, 7454, 7462, 7470, 7478, - 7486, 7496, 7506, 7513, 7520, 7527, 7534, 7541, 7548, 7555, 7562, 7569, - 7576, 7583, 7590, 7597, 7604, 7611, 7618, 7625, 7632, 7639, 7646, 7653, - 7660, 7667, 7674, 7679, 7684, 7689, 7694, 7699, 7704, 7709, 7714, 7719, - 7724, 7730, 7736, 7744, 7752, 7760, 7768, 7776, 7784, 7792, 7800, 7808, - 7816, 7821, 7826, 7831, 7836, 7844, 0, 7852, 7857, 7862, 7867, 7872, - 7877, 7882, 7887, 7892, 7896, 7901, 7906, 7911, 7916, 7921, 7926, 7931, - 7936, 7941, 7946, 7951, 7956, 7961, 7966, 7971, 7976, 7981, 7986, 7991, - 7996, 8001, 8006, 8011, 8016, 8021, 8026, 8031, 8036, 0, 0, 8041, 8048, - 8051, 8055, 8059, 8062, 8066, 0, 8070, 8075, 8080, 8085, 8090, 8095, - 8100, 8105, 8110, 8114, 8119, 8124, 8129, 8134, 8139, 8144, 8149, 8154, - 8159, 8164, 8169, 8174, 8179, 8184, 8189, 8194, 8199, 8204, 8209, 8214, - 8219, 8224, 8229, 8234, 8239, 8244, 8249, 8254, 8259, 0, 8266, 8271, 0, - 0, 8274, 8280, 8286, 0, 8290, 8295, 8300, 8305, 8312, 8319, 8324, 8329, - 8334, 8339, 8344, 8349, 8354, 8361, 8366, 8373, 8380, 8385, 8392, 8397, - 8402, 8407, 8414, 8419, 8424, 8431, 8440, 8445, 8450, 8455, 8460, 8466, - 8471, 8478, 8485, 8492, 8497, 8502, 8507, 8512, 8517, 8522, 8532, 8537, - 8546, 8551, 8556, 8561, 8566, 8573, 8580, 8587, 8593, 8599, 8606, 0, 0, - 0, 0, 0, 0, 0, 0, 8613, 8617, 8621, 8625, 8629, 8633, 8637, 8641, 8645, - 8649, 8653, 8658, 8662, 8666, 8671, 8675, 8680, 8684, 8688, 8692, 8697, - 8701, 8706, 8710, 8714, 8718, 8722, 0, 0, 0, 0, 0, 8726, 8733, 8741, - 8748, 8753, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8758, 8761, 8765, 8770, - 8774, 8778, 8782, 8788, 8794, 8797, 8804, 8813, 8816, 8819, 8824, 8830, - 8834, 8842, 8848, 8854, 8862, 8866, 8871, 8882, 8887, 8891, 8895, 8899, - 8902, 0, 8905, 8912, 8916, 8922, 8926, 8933, 8940, 8948, 8955, 8962, - 8966, 8970, 8976, 8980, 8984, 8988, 8992, 8996, 9000, 9004, 9008, 9012, - 9016, 9020, 9024, 9028, 9032, 9036, 9040, 9044, 9052, 9060, 9070, 9079, - 9088, 9091, 9095, 9099, 9103, 9107, 9111, 9115, 9119, 9123, 9128, 9132, - 9135, 9138, 9141, 9144, 9147, 9150, 9153, 9156, 9160, 9164, 9168, 9173, - 9178, 9184, 9187, 9194, 9203, 9208, 9213, 9220, 9226, 9231, 9235, 9239, - 9243, 9247, 9251, 9255, 9260, 9264, 9269, 9273, 9278, 9283, 9290, 9296, - 9302, 9308, 9313, 9322, 9331, 9336, 9343, 9350, 9357, 9364, 9368, 9372, - 9376, 9383, 9393, 9397, 9401, 9405, 9412, 9420, 9424, 9428, 9435, 9439, - 9443, 9447, 9454, 9461, 9473, 9477, 9481, 9485, 9495, 9504, 9508, 9516, - 9523, 9530, 9539, 9550, 9558, 9562, 9571, 9582, 9590, 9603, 9611, 9619, - 9627, 9635, 9641, 9650, 9657, 9661, 9669, 9673, 9680, 9688, 9692, 9698, - 9705, 9712, 9716, 9724, 9728, 9735, 9739, 9747, 9751, 9759, 9767, 9774, - 9782, 9790, 9797, 9803, 9807, 9814, 9822, 9828, 9835, 9842, 9848, 9858, - 9866, 9873, 9879, 9883, 9886, 9890, 9896, 9904, 9908, 9914, 9920, 9927, - 9934, 9937, 9944, 9949, 9958, 9963, 9967, 9980, 9993, 9999, 10006, 10011, - 10017, 10022, 10028, 10038, 10045, 10054, 10064, 10070, 10075, 10080, - 10084, 10088, 10093, 10098, 10104, 10112, 10120, 10131, 10136, 10145, - 10154, 10161, 10167, 10173, 10179, 10185, 10191, 10197, 10204, 10210, - 10217, 10224, 10231, 10238, 10244, 10252, 10261, 10268, 10276, 10284, - 10290, 10296, 10302, 10310, 10318, 10328, 10338, 10342, 10348, 10354, 0, - 10360, 10365, 10370, 10377, 10382, 10387, 10394, 10399, 10408, 10413, - 10418, 10423, 10428, 10433, 10440, 10445, 10452, 10457, 10462, 10467, - 10472, 10477, 10483, 10487, 10492, 10499, 10504, 10509, 10514, 10519, - 10524, 10531, 10538, 10545, 10550, 10555, 10561, 10566, 10571, 10577, - 10582, 10587, 10595, 10603, 10608, 10613, 10619, 10624, 10629, 10633, - 10639, 10643, 10647, 10653, 10659, 10664, 10669, 10676, 10683, 10687, 0, - 0, 10691, 10698, 10705, 10712, 10722, 10734, 10745, 10761, 10773, 10784, - 10792, 10799, 10809, 10824, 10835, 10841, 10850, 10858, 10869, 10879, - 10887, 10898, 10905, 10913, 10924, 10930, 10936, 10944, 10952, 10960, - 10966, 10976, 10984, 10994, 11004, 11017, 11031, 11045, 11055, 11066, - 11077, 11090, 11103, 11117, 11129, 11141, 11154, 11167, 11179, 11192, - 11201, 11209, 11214, 11219, 11224, 11229, 11234, 11239, 11244, 11249, - 11254, 11259, 11264, 11269, 11274, 11279, 11284, 11289, 11294, 11299, - 11304, 11309, 11314, 11319, 11324, 11329, 11334, 11339, 11344, 11349, - 11354, 11359, 11364, 11369, 11373, 11378, 11383, 11388, 11393, 11398, - 11402, 11406, 11410, 11414, 11418, 11422, 11426, 11430, 11434, 11438, - 11442, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11447, 11452, 11456, - 11460, 11464, 11468, 11472, 11476, 11481, 11485, 11490, 11494, 11499, - 11503, 11507, 11511, 11516, 11520, 11525, 11530, 11535, 11539, 11544, - 11549, 11554, 11559, 11564, 11569, 11574, 11579, 11584, 11588, 11593, - 11600, 11604, 11609, 11614, 11618, 11623, 11627, 11634, 11641, 11648, - 11655, 11663, 11671, 11680, 11688, 11695, 11702, 11710, 11716, 11722, - 11728, 11734, 11741, 11746, 11750, 11755, 0, 0, 0, 0, 0, 11759, 11764, - 11769, 11774, 11779, 11784, 11789, 11794, 11799, 11804, 11809, 11814, - 11819, 11824, 11829, 11834, 11839, 11844, 11849, 11854, 11859, 11864, - 11869, 11874, 11879, 11884, 11889, 11897, 11904, 11910, 11915, 11923, - 11930, 11936, 11943, 11949, 11954, 11961, 11968, 11974, 11979, 11984, - 11990, 11995, 12000, 12006, 0, 0, 12011, 12017, 12023, 12029, 12035, - 12041, 12047, 12052, 12060, 12066, 12072, 12078, 12084, 12090, 12098, 0, - 12104, 12109, 12114, 12119, 12124, 12129, 12134, 12139, 12144, 12149, - 12154, 12159, 12164, 12169, 12174, 12179, 12184, 12189, 12194, 12199, - 12204, 12209, 12214, 12219, 12224, 12229, 12234, 12239, 0, 0, 12244, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12248, 12257, 12265, - 12272, 12280, 12292, 12299, 12306, 12313, 12325, 12336, 12343, 12351, - 12357, 12362, 12370, 12378, 12386, 12392, 12402, 12410, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12417, 12423, 12428, - 12433, 12438, 12443, 12448, 12453, 12458, 12463, 12468, 12473, 12478, - 12483, 12487, 12491, 12495, 12500, 12506, 12512, 12518, 12523, 12528, - 12533, 12538, 12544, 12553, 12561, 12567, 12575, 12581, 12585, 12589, - 12593, 12598, 12601, 12605, 12608, 12612, 12615, 12619, 12623, 12627, - 12632, 12637, 12640, 12644, 12649, 12654, 12657, 12661, 12664, 12668, - 12672, 12676, 12680, 12684, 12688, 12692, 12696, 12700, 12704, 12708, - 12712, 12716, 12720, 12724, 12728, 12732, 12736, 12740, 12744, 12747, - 12751, 12755, 12759, 12762, 12765, 12769, 12773, 12777, 12781, 12785, - 12789, 12793, 12797, 12801, 12804, 12809, 12814, 12818, 12822, 12827, - 12831, 12836, 12840, 12845, 12850, 12856, 12862, 12868, 12872, 12877, - 12883, 12889, 12893, 12898, 12902, 12908, 12913, 12916, 12922, 12928, - 12933, 12938, 12945, 12950, 12955, 12959, 12963, 12967, 12971, 12975, - 12979, 12983, 12987, 12992, 12997, 13002, 13008, 13011, 13015, 13019, - 13022, 13025, 13028, 13031, 13034, 13037, 13041, 13044, 13048, 13052, - 13059, 13064, 13068, 13072, 13076, 13080, 13084, 13090, 13094, 13098, - 13102, 13106, 13112, 13116, 13120, 13123, 13127, 13131, 0, 13135, 13138, - 13142, 13145, 13149, 13152, 13156, 13160, 0, 0, 13164, 13167, 0, 0, - 13171, 13174, 13178, 13181, 13185, 13189, 13193, 13197, 13201, 13205, - 13209, 13213, 13217, 13221, 13225, 13229, 13233, 13237, 13241, 13245, - 13249, 13253, 0, 13257, 13260, 13264, 13268, 13272, 13275, 13278, 0, - 13282, 0, 0, 0, 13286, 13290, 13294, 13298, 0, 0, 13301, 13305, 13309, - 13314, 13318, 13323, 13327, 13332, 13337, 0, 0, 13343, 13347, 0, 0, - 13352, 13356, 13361, 13365, 0, 0, 0, 0, 0, 0, 0, 0, 13371, 0, 0, 0, 0, - 13377, 13381, 0, 13385, 13389, 13394, 13399, 13404, 0, 0, 13410, 13414, - 13417, 13420, 13423, 13426, 13429, 13432, 13436, 13439, 13443, 13451, - 13460, 13464, 13468, 13474, 13480, 13486, 13492, 13506, 13513, 13516, 0, - 0, 0, 0, 0, 13520, 13527, 13532, 0, 13537, 13541, 13546, 13550, 13555, - 13559, 0, 0, 0, 0, 13564, 13569, 0, 0, 13574, 13579, 13584, 13588, 13593, - 13598, 13603, 13608, 13613, 13618, 13623, 13628, 13633, 13638, 13643, - 13648, 13653, 13658, 13663, 13668, 13673, 13678, 0, 13683, 13687, 13692, - 13697, 13702, 13706, 13710, 0, 13715, 13720, 0, 13725, 13730, 0, 13735, - 13740, 0, 0, 13744, 0, 13749, 13755, 13760, 13766, 13771, 0, 0, 0, 0, - 13777, 13783, 0, 0, 13789, 13795, 13801, 0, 0, 0, 13806, 0, 0, 0, 0, 0, - 0, 0, 13811, 13816, 13821, 13826, 0, 13831, 0, 0, 0, 0, 0, 0, 0, 13836, - 13841, 13845, 13849, 13853, 13857, 13861, 13865, 13870, 13874, 13879, - 13883, 13887, 13891, 13895, 13901, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13906, 13911, 13916, 0, 13921, 13925, 13930, 13934, 13939, 13943, 13948, - 13953, 13958, 0, 13964, 13968, 13973, 0, 13979, 13983, 13988, 13992, - 13997, 14002, 14007, 14012, 14017, 14022, 14027, 14032, 14037, 14042, - 14047, 14052, 14057, 14062, 14067, 14072, 14077, 14082, 0, 14087, 14091, - 14096, 14101, 14106, 14110, 14114, 0, 14119, 14124, 0, 14129, 14134, - 14139, 14144, 14149, 0, 0, 14153, 14158, 14163, 14169, 14174, 14180, - 14185, 14191, 14197, 14204, 0, 14211, 14216, 14222, 0, 14229, 14234, - 14240, 0, 0, 14245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14249, - 14255, 14261, 14267, 0, 0, 14274, 14279, 14283, 14287, 14291, 14295, - 14299, 14303, 14308, 14312, 14317, 14322, 0, 0, 0, 0, 0, 0, 0, 14327, 0, - 0, 0, 0, 0, 0, 0, 14332, 14336, 14340, 0, 14344, 14347, 14351, 14354, - 14358, 14361, 14365, 14369, 0, 0, 14373, 14376, 0, 0, 14380, 14383, - 14387, 14390, 14394, 14398, 14402, 14406, 14410, 14414, 14418, 14422, - 14426, 14430, 14434, 14438, 14442, 14446, 14450, 14454, 14458, 14462, 0, - 14466, 14469, 14473, 14477, 14481, 14484, 14487, 0, 14491, 14495, 0, - 14499, 14503, 14507, 14511, 14515, 0, 0, 14518, 14522, 14526, 14531, - 14535, 14540, 14544, 14549, 14554, 0, 0, 14560, 14564, 0, 0, 14569, - 14573, 14578, 0, 0, 0, 0, 0, 0, 0, 0, 14582, 14588, 0, 0, 0, 0, 14594, - 14598, 0, 14602, 14606, 14611, 14616, 14621, 0, 0, 14627, 14631, 14634, - 14637, 14640, 14643, 14646, 14649, 14653, 14656, 14660, 14663, 14667, - 14673, 14679, 14685, 14691, 14697, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14703, - 14707, 0, 14711, 14714, 14718, 14721, 14725, 14728, 0, 0, 0, 14732, - 14735, 14739, 0, 14743, 14746, 14750, 14754, 0, 0, 0, 14757, 14761, 0, - 14765, 0, 14769, 14773, 0, 0, 0, 14777, 14781, 0, 0, 0, 14785, 14789, - 14793, 0, 0, 0, 14796, 14799, 14802, 14806, 14810, 14814, 14818, 14822, - 14826, 14830, 14834, 14838, 0, 0, 0, 0, 14841, 14846, 14850, 14855, - 14859, 0, 0, 0, 14864, 14868, 14873, 0, 14878, 14882, 14887, 14892, 0, 0, - 14896, 0, 0, 0, 0, 0, 0, 14899, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 14905, 14909, 14912, 14915, 14918, 14921, 14924, 14927, 14931, 14934, - 14938, 14942, 14947, 14952, 14956, 14960, 14964, 14968, 14972, 14977, - 14981, 0, 0, 0, 0, 0, 14984, 14990, 14994, 14998, 0, 15002, 15005, 15009, - 15012, 15016, 15019, 15023, 15027, 0, 15031, 15034, 15038, 0, 15042, - 15045, 15049, 15053, 15056, 15060, 15064, 15068, 15072, 15076, 15080, - 15084, 15088, 15092, 15096, 15100, 15104, 15108, 15112, 15116, 15120, - 15124, 15128, 0, 15132, 15135, 15139, 15143, 15147, 15150, 15153, 15157, - 15161, 15165, 15169, 15173, 15177, 15181, 15185, 15189, 0, 0, 0, 15192, - 15196, 15201, 15205, 15210, 15214, 15219, 15224, 0, 15230, 15234, 15239, - 0, 15244, 15248, 15253, 15258, 0, 0, 0, 0, 0, 0, 0, 15262, 15266, 0, - 15272, 15276, 15280, 0, 0, 0, 0, 0, 15284, 15289, 15294, 15299, 0, 0, - 15305, 15309, 15312, 15315, 15318, 15321, 15324, 15327, 15331, 15334, 0, - 0, 0, 0, 0, 0, 0, 0, 15338, 15351, 15363, 15375, 15387, 15399, 15411, - 15423, 0, 15427, 15431, 15435, 0, 15439, 15442, 15446, 15449, 15453, - 15456, 15460, 15464, 0, 15468, 15471, 15475, 0, 15479, 15482, 15486, - 15490, 15493, 15497, 15501, 15505, 15509, 15513, 15517, 15521, 15525, - 15529, 15533, 15537, 15541, 15545, 15549, 15553, 15557, 15561, 15565, 0, - 15569, 15572, 15576, 15580, 15584, 15587, 15590, 15594, 15598, 15602, 0, - 15606, 15610, 15614, 15618, 15622, 0, 0, 15625, 15629, 15633, 15638, - 15642, 15647, 15651, 15656, 15661, 0, 15667, 15671, 15676, 0, 15681, - 15685, 15690, 15695, 0, 0, 0, 0, 0, 0, 0, 15699, 15703, 0, 0, 0, 0, 0, 0, - 0, 15709, 0, 15713, 15718, 15723, 15728, 0, 0, 15734, 15738, 15741, - 15744, 15747, 15750, 15753, 15756, 15760, 15763, 0, 15767, 15771, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15775, 15779, 15783, 0, 15787, 15790, - 15794, 15797, 15801, 15804, 15808, 15812, 0, 15816, 15819, 15823, 0, - 15827, 15830, 15834, 15838, 15841, 15845, 15849, 15853, 15857, 15861, - 15865, 15869, 15873, 15877, 15881, 15885, 15889, 15893, 15897, 15901, - 15905, 15909, 15913, 15917, 15921, 15924, 15928, 15932, 15936, 15939, - 15942, 15946, 15950, 15954, 15958, 15962, 15966, 15970, 15974, 15978, - 15981, 0, 0, 15985, 15989, 15994, 15998, 16003, 16007, 16012, 16017, 0, - 16023, 16027, 16032, 0, 16037, 16041, 16046, 16051, 16055, 0, 0, 0, 0, 0, - 0, 0, 0, 16060, 0, 0, 0, 0, 0, 0, 0, 16066, 16072, 16077, 16082, 16087, - 0, 0, 16093, 16097, 16100, 16103, 16106, 16109, 16112, 16115, 16119, - 16122, 16126, 16130, 16135, 16140, 16146, 16152, 0, 0, 0, 16158, 16162, - 16168, 16174, 16180, 16185, 16191, 0, 0, 16197, 16201, 0, 16205, 16209, - 16213, 16217, 16221, 16225, 16229, 16233, 16237, 16241, 16245, 16249, - 16253, 16257, 16261, 16265, 16269, 16273, 0, 0, 0, 16277, 16283, 16289, - 16295, 16301, 16307, 16313, 16319, 16325, 16331, 16337, 16343, 16351, - 16357, 16363, 16369, 16375, 16381, 16387, 16393, 16399, 16405, 16411, - 16417, 0, 16423, 16429, 16435, 16441, 16447, 16453, 16457, 16463, 16467, - 0, 16471, 0, 0, 16477, 16481, 16487, 16493, 16499, 16503, 16509, 0, 0, 0, - 16513, 0, 0, 0, 0, 16517, 16522, 16529, 16536, 16543, 16550, 0, 16557, 0, - 16564, 16569, 16574, 16581, 16588, 16597, 16608, 16617, 0, 0, 0, 0, 0, 0, - 16622, 16628, 16633, 16638, 16643, 16648, 16653, 16658, 16664, 16669, 0, - 0, 16675, 16682, 16689, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16694, 16701, - 16708, 16715, 16722, 16729, 16736, 16743, 16750, 16757, 16764, 16771, - 16778, 16785, 16792, 16799, 16806, 16813, 16820, 16827, 16834, 16841, - 16848, 16855, 16862, 16869, 16876, 16883, 16890, 16897, 16904, 16911, - 16918, 16924, 16931, 16938, 16943, 16950, 16955, 16962, 16969, 16976, - 16983, 16990, 16997, 17003, 17010, 17015, 17021, 17028, 17035, 17042, - 17048, 17055, 17062, 17069, 17075, 17082, 0, 0, 0, 0, 17087, 17094, - 17100, 17107, 17113, 17122, 17131, 17136, 17141, 17146, 17153, 17160, - 17167, 17174, 17179, 17184, 17189, 17194, 17199, 17203, 17207, 17211, - 17215, 17219, 17223, 17228, 17232, 17237, 17242, 0, 0, 0, 0, 0, 0, 0, 0, + 150, 154, 159, 164, 168, 173, 178, 182, 187, 192, 197, 202, 207, 210, + 214, 217, 221, 224, 228, 232, 237, 242, 247, 251, 256, 261, 266, 270, + 275, 280, 284, 289, 294, 298, 303, 308, 312, 317, 322, 326, 331, 336, + 341, 346, 351, 355, 358, 362, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 364, 368, 373, + 376, 379, 382, 385, 388, 391, 393, 396, 402, 410, 413, 417, 420, 422, + 425, 428, 431, 434, 438, 441, 444, 447, 449, 452, 458, 466, 473, 480, + 487, 492, 499, 505, 512, 519, 526, 534, 539, 547, 554, 560, 567, 574, + 582, 589, 597, 605, 610, 618, 625, 631, 638, 645, 652, 655, 661, 668, + 674, 681, 688, 695, 700, 707, 714, 720, 727, 734, 741, 749, 754, 762, + 769, 775, 782, 789, 797, 804, 812, 820, 825, 833, 840, 846, 853, 860, + 867, 870, 876, 883, 889, 896, 903, 910, 915, 923, 930, 937, 944, 951, + 958, 965, 972, 979, 987, 995, 1003, 1011, 1019, 1027, 1035, 1043, 1050, + 1057, 1064, 1071, 1078, 1085, 1092, 1099, 1106, 1113, 1120, 1127, 1135, + 1143, 1151, 1159, 1167, 1175, 1183, 1191, 1199, 1207, 1214, 1221, 1229, + 1237, 1245, 1253, 1261, 1269, 1277, 1285, 1293, 1299, 1304, 1309, 1317, + 1325, 1333, 1341, 1346, 1353, 1360, 1368, 1376, 1384, 1392, 1401, 1410, + 1417, 1424, 1431, 1438, 1446, 1454, 1462, 1470, 1481, 1486, 1491, 1498, + 1505, 1512, 1519, 1526, 1533, 1538, 1543, 1550, 1557, 1565, 1573, 1581, + 1589, 1596, 1603, 1611, 1619, 1627, 1635, 1643, 1651, 1659, 1667, 1675, + 1683, 1690, 1697, 1704, 1711, 1718, 1725, 1732, 1739, 1747, 1755, 1762, + 1769, 1776, 1783, 1791, 1799, 1807, 1815, 1823, 1830, 1837, 1845, 1853, + 1861, 1869, 1875, 1881, 1887, 1894, 1901, 1906, 1911, 1916, 1923, 1930, + 1937, 1944, 1952, 1960, 1967, 1973, 1978, 1983, 1990, 1997, 2004, 2009, + 2014, 2019, 2026, 2033, 2040, 2047, 2054, 2061, 2069, 2079, 2087, 2094, + 2101, 2106, 2111, 2118, 2125, 2129, 2134, 2139, 2144, 2152, 2161, 2168, + 2175, 2184, 2191, 2198, 2203, 2210, 2217, 2224, 2231, 2238, 2243, 2250, + 2257, 2265, 2270, 2275, 2280, 2290, 2294, 2300, 2306, 2312, 2318, 2326, + 2339, 2347, 2352, 2362, 2367, 2372, 2382, 2387, 2394, 2401, 2409, 2417, + 2424, 2431, 2438, 2445, 2455, 2465, 2474, 2483, 2493, 2503, 2513, 2523, + 2529, 2539, 2549, 2559, 2569, 2577, 2585, 2592, 2599, 2607, 2615, 2623, + 2631, 2638, 2645, 2655, 2665, 2673, 2681, 2689, 2694, 2704, 2709, 2716, + 2723, 2728, 2733, 2741, 2749, 2759, 2769, 2776, 2783, 2792, 2801, 2809, + 2817, 2826, 2835, 2843, 2851, 2860, 2869, 2878, 2887, 2897, 2907, 2915, + 2923, 2932, 2941, 2950, 2959, 2969, 2979, 2987, 2995, 3004, 3013, 3022, + 3031, 3040, 3049, 3054, 3059, 3067, 3075, 3085, 3093, 3098, 3103, 3110, + 3117, 3124, 3131, 3138, 3145, 3155, 3165, 3175, 3185, 3192, 3199, 3209, + 3219, 3227, 3235, 3243, 3251, 3259, 3266, 3273, 3280, 3286, 3293, 3300, + 3307, 3316, 3326, 3336, 3343, 3350, 3356, 3361, 3368, 3374, 3380, 3387, + 3394, 3405, 3415, 3422, 3429, 3436, 3443, 3449, 3454, 3461, 3467, 3472, + 3480, 3488, 3495, 3501, 3506, 3513, 3518, 3525, 3534, 3543, 3552, 3559, + 3565, 3571, 3576, 3583, 3590, 3597, 3604, 3611, 3616, 3621, 3630, 3638, + 3647, 3652, 3659, 3670, 3677, 3685, 3694, 3700, 3706, 3712, 3719, 3724, + 3730, 3741, 3750, 3759, 3767, 3775, 3785, 3790, 3797, 3804, 3809, 3821, + 3830, 3838, 3845, 3854, 3859, 3864, 3871, 3878, 3885, 3892, 3898, 3907, + 3915, 3920, 3928, 3934, 3942, 3950, 3956, 3962, 3968, 3975, 3983, 3989, + 3997, 4004, 4009, 4016, 4024, 4034, 4041, 4048, 4058, 4065, 4072, 4082, + 4089, 4096, 4103, 4109, 4115, 4125, 4138, 4143, 4150, 4155, 4159, 4165, + 4174, 4181, 4186, 4191, 4195, 4200, 4206, 4210, 4216, 4222, 4228, 4234, + 4242, 4247, 4252, 4257, 4262, 4268, 4270, 4275, 4279, 4285, 4291, 4297, + 4302, 4309, 4316, 4322, 4329, 4337, 4345, 4350, 4355, 4359, 4364, 4366, + 4368, 4371, 4373, 4376, 4381, 4386, 4392, 4397, 4401, 4406, 4411, 4420, + 4426, 4431, 4437, 4442, 4448, 4456, 4464, 4468, 4472, 4477, 4483, 4489, + 4495, 4501, 4506, 4513, 4521, 4529, 4534, 4540, 4547, 4554, 4561, 4568, + 4572, 4577, 4582, 4587, 4592, 4597, 4600, 4603, 4606, 4609, 4612, 4615, + 4619, 4623, 4629, 4632, 4637, 4643, 4649, 4652, 4657, 4663, 4667, 4673, + 4679, 4685, 4691, 4696, 4701, 4706, 4709, 4715, 4720, 4725, 4729, 4734, + 4740, 4746, 4749, 4753, 4757, 4761, 4764, 4767, 4772, 4776, 4783, 4787, + 4793, 4797, 4803, 4807, 4811, 4815, 4820, 4825, 4832, 4838, 4845, 4851, + 4857, 4863, 4866, 4870, 4874, 4878, 4882, 4887, 4892, 4896, 4900, 4906, + 4910, 4914, 4919, 4925, 4930, 4936, 4940, 4947, 4952, 4956, 4961, 4966, + 4972, 4975, 4979, 4984, 4989, 4998, 5004, 5009, 5013, 5018, 5022, 5027, + 5031, 5035, 5040, 5044, 5050, 5055, 5060, 5065, 5070, 5075, 5080, 5086, + 5092, 5098, 5104, 5109, 5115, 5121, 5127, 5132, 5137, 5144, 5151, 5155, + 5161, 5168, 0, 0, 5175, 5178, 5187, 5196, 5207, 5211, 0, 0, 0, 0, 5216, + 5219, 5224, 5232, 5237, 5245, 5253, 0, 5261, 0, 5269, 5277, 5285, 5296, + 5301, 5306, 5311, 5316, 5321, 5326, 5331, 5336, 5341, 5346, 5351, 5356, + 5361, 5366, 5371, 5376, 0, 5381, 5386, 5391, 5396, 5401, 5406, 5411, + 5416, 5424, 5432, 5440, 5448, 5456, 5464, 5475, 5480, 5485, 5490, 5495, + 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545, 5550, 5555, + 5560, 5566, 5571, 5576, 5581, 5586, 5591, 5596, 5601, 5609, 5617, 5625, + 5633, 5641, 5646, 5650, 5654, 5661, 5671, 5681, 5685, 5689, 5693, 5699, + 5706, 5710, 5715, 5719, 5724, 5728, 5733, 5737, 5742, 5747, 5752, 5757, + 5762, 5767, 5772, 5777, 5782, 5787, 5792, 5797, 5802, 5807, 5812, 5816, + 5820, 5826, 5830, 5835, 5841, 5849, 5854, 5859, 5866, 5871, 5876, 5883, + 5892, 5901, 5912, 5920, 5925, 5930, 5935, 5942, 5947, 5953, 5958, 5963, + 5968, 5973, 5978, 5983, 5991, 5997, 6002, 6006, 6011, 6016, 6021, 6026, + 6031, 6036, 6041, 6045, 6051, 6055, 6060, 6065, 6070, 6074, 6079, 6084, + 6089, 6094, 6098, 6103, 6107, 6112, 6117, 6122, 6127, 6133, 6138, 6144, + 6148, 6153, 6157, 6161, 6166, 6171, 6176, 6181, 6186, 6191, 6196, 6200, + 6206, 6210, 6215, 6220, 6225, 6229, 6234, 6239, 6244, 6249, 6253, 6258, + 6262, 6267, 6272, 6277, 6282, 6288, 6293, 6299, 6303, 6308, 6312, 6320, + 6325, 6330, 6335, 6342, 6347, 6353, 6358, 6363, 6368, 6373, 6378, 6383, + 6391, 6397, 6402, 6407, 6412, 6417, 6422, 6428, 6434, 6441, 6448, 6457, + 6466, 6473, 6480, 6489, 6498, 6503, 6508, 6513, 6518, 6523, 6528, 6533, + 6538, 6549, 6560, 6565, 6570, 6577, 6584, 6592, 6600, 6605, 6610, 6615, + 6620, 6624, 6628, 6632, 6638, 6644, 6648, 6655, 6660, 6670, 6680, 6686, + 6692, 6700, 6708, 6716, 6724, 6731, 6738, 6746, 6754, 6762, 6770, 6778, + 6786, 6794, 6802, 6810, 6818, 6825, 6832, 6838, 6844, 6852, 6860, 6867, + 6874, 6882, 6890, 6896, 6902, 6910, 6918, 6926, 6934, 6940, 6946, 6954, + 6962, 6970, 6978, 6985, 6992, 7000, 7008, 7016, 7024, 7029, 7034, 7041, + 7048, 7058, 7068, 7072, 7080, 7088, 7095, 7102, 7110, 7118, 7125, 7132, + 7140, 7148, 7155, 7162, 7170, 7178, 7183, 7190, 7197, 7204, 7211, 7217, + 7223, 7231, 7239, 7244, 7249, 7257, 7265, 7273, 7281, 7289, 7297, 7304, + 7311, 7319, 7327, 7335, 7343, 7350, 7357, 7363, 7369, 7378, 7387, 7394, + 7401, 7408, 7415, 7422, 7429, 7436, 7443, 7451, 7459, 7467, 7475, 7483, + 7491, 7501, 7511, 7518, 7525, 7532, 7539, 7546, 7553, 7560, 7567, 7574, + 7581, 7588, 7595, 7602, 7609, 7616, 7623, 7630, 7637, 7644, 7651, 7658, + 7665, 7672, 7679, 7684, 7689, 7694, 7699, 7704, 7709, 7714, 7719, 7724, + 7729, 7735, 7741, 7749, 7757, 7765, 7773, 7781, 7789, 7797, 7805, 7813, + 7821, 7826, 7831, 7836, 7841, 7849, 0, 7857, 7862, 7867, 7872, 7877, + 7882, 7887, 7892, 7897, 7901, 7906, 7911, 7916, 7921, 7926, 7931, 7936, + 7941, 7946, 7951, 7956, 7961, 7966, 7971, 7976, 7981, 7986, 7991, 7996, + 8001, 8006, 8011, 8016, 8021, 8026, 8031, 8036, 8041, 0, 0, 8046, 8053, + 8056, 8060, 8064, 8067, 8071, 0, 8075, 8080, 8085, 8090, 8095, 8100, + 8105, 8110, 8115, 8119, 8124, 8129, 8134, 8139, 8144, 8149, 8154, 8159, + 8164, 8169, 8174, 8179, 8184, 8189, 8194, 8199, 8204, 8209, 8214, 8219, + 8224, 8229, 8234, 8239, 8244, 8249, 8254, 8259, 8264, 0, 8271, 8276, 0, + 0, 8279, 8285, 8291, 0, 8295, 8300, 8305, 8310, 8317, 8324, 8329, 8334, + 8339, 8344, 8349, 8354, 8359, 8366, 8371, 8378, 8385, 8390, 8397, 8402, + 8407, 8412, 8419, 8424, 8429, 8436, 8445, 8450, 8455, 8460, 8465, 8471, + 8476, 8483, 8490, 8497, 8502, 8507, 8512, 8517, 8522, 8527, 8537, 8542, + 8551, 8556, 8561, 8566, 8571, 8578, 8585, 8592, 8598, 8604, 8611, 0, 0, + 0, 0, 0, 0, 0, 0, 8618, 8622, 8626, 8630, 8634, 8638, 8642, 8646, 8650, + 8654, 8658, 8663, 8667, 8671, 8676, 8680, 8685, 8689, 8693, 8697, 8702, + 8706, 8711, 8715, 8719, 8723, 8727, 0, 0, 0, 0, 0, 8731, 8738, 8746, + 8753, 8758, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8763, 8766, 8770, 8775, + 8779, 8783, 8787, 8793, 8799, 8802, 8809, 8818, 8821, 8824, 8829, 8835, + 8839, 8847, 8853, 8859, 8867, 8871, 8876, 8887, 8892, 8896, 8900, 8904, + 8907, 0, 8910, 8917, 8921, 8927, 8931, 8938, 8945, 8953, 8960, 8967, + 8971, 8975, 8981, 8985, 8989, 8993, 8997, 9001, 9005, 9009, 9013, 9017, + 9021, 9025, 9029, 9033, 9037, 9041, 9045, 9049, 9057, 9065, 9075, 9084, + 9093, 9096, 9100, 9104, 9108, 9112, 9116, 9120, 9124, 9128, 9133, 9137, + 9140, 9143, 9146, 9149, 9152, 9155, 9158, 9161, 9165, 9169, 9173, 9178, + 9183, 9189, 9192, 9199, 9208, 9213, 9218, 9225, 9231, 9236, 9240, 9244, + 9248, 9252, 9256, 9260, 9265, 9269, 9274, 9278, 9283, 9288, 9295, 9301, + 9307, 9313, 9318, 9327, 9336, 9341, 9348, 9355, 9362, 9369, 9373, 9377, + 9381, 9388, 9398, 9402, 9406, 9410, 9417, 9425, 9429, 9433, 9440, 9444, + 9448, 9452, 9459, 9466, 9478, 9482, 9486, 9490, 9500, 9509, 9513, 9521, + 9528, 9535, 9544, 9555, 9563, 9567, 9576, 9587, 9595, 9608, 9616, 9624, + 9632, 9640, 9646, 9655, 9662, 9666, 9674, 9678, 9685, 9693, 9697, 9703, + 9710, 9717, 9721, 9729, 9733, 9740, 9744, 9752, 9756, 9764, 9772, 9779, + 9787, 9795, 9802, 9808, 9812, 9819, 9827, 9833, 9840, 9847, 9853, 9863, + 9871, 9878, 9884, 9888, 9891, 9895, 9901, 9909, 9913, 9919, 9925, 9932, + 9939, 9942, 9949, 9954, 9963, 9968, 9972, 9985, 9998, 10004, 10011, + 10016, 10022, 10027, 10033, 10043, 10050, 10059, 10069, 10075, 10080, + 10085, 10089, 10093, 10098, 10103, 10109, 10117, 10125, 10136, 10141, + 10150, 10159, 10166, 10172, 10178, 10184, 10190, 10196, 10202, 10209, + 10215, 10222, 10229, 10236, 10243, 10249, 10257, 10266, 10273, 10281, + 10289, 10295, 10301, 10307, 10315, 10323, 10333, 10343, 10347, 10353, + 10359, 0, 10365, 10370, 10375, 10382, 10387, 10392, 10399, 10404, 10413, + 10418, 10423, 10428, 10433, 10438, 10445, 10450, 10457, 10462, 10467, + 10472, 10477, 10482, 10488, 10492, 10497, 10504, 10509, 10514, 10519, + 10524, 10529, 10536, 10543, 10550, 10555, 10560, 10566, 10571, 10576, + 10582, 10587, 10592, 10600, 10608, 10613, 10618, 10624, 10629, 10634, + 10638, 10644, 10648, 10652, 10658, 10664, 10669, 10674, 10681, 10688, + 10692, 0, 0, 10696, 10703, 10710, 10717, 10727, 10739, 10750, 10766, + 10778, 10789, 10797, 10804, 10814, 10829, 10840, 10846, 10855, 10863, + 10874, 10884, 10892, 10903, 10910, 10918, 10929, 10935, 10941, 10949, + 10957, 10965, 10971, 10981, 10989, 10999, 11009, 11022, 11036, 11050, + 11060, 11071, 11082, 11095, 11108, 11122, 11134, 11146, 11159, 11172, + 11184, 11197, 11206, 11214, 11219, 11224, 11229, 11234, 11239, 11244, + 11249, 11254, 11259, 11264, 11269, 11274, 11279, 11284, 11289, 11294, + 11299, 11304, 11309, 11314, 11319, 11324, 11329, 11334, 11339, 11344, + 11349, 11354, 11359, 11364, 11369, 11374, 11378, 11383, 11388, 11393, + 11398, 11403, 11407, 11411, 11415, 11419, 11423, 11427, 11431, 11435, + 11439, 11443, 11447, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11452, + 11457, 11461, 11465, 11469, 11473, 11477, 11481, 11486, 11490, 11495, + 11499, 11504, 11508, 11512, 11516, 11521, 11525, 11530, 11535, 11540, + 11544, 11549, 11554, 11559, 11564, 11569, 11574, 11579, 11584, 11589, + 11593, 11597, 11604, 11608, 11613, 11617, 11621, 11626, 11630, 11637, + 11644, 11651, 11658, 11666, 11674, 11683, 11691, 11698, 11705, 11713, + 11719, 11725, 11731, 11737, 11744, 11749, 11753, 11758, 0, 0, 0, 0, 0, + 11762, 11767, 11772, 11777, 11782, 11787, 11792, 11797, 11802, 11807, + 11812, 11817, 11822, 11827, 11832, 11837, 11842, 11847, 11852, 11857, + 11862, 11867, 11872, 11877, 11882, 11887, 11892, 11900, 11907, 11913, + 11918, 11926, 11933, 11939, 11946, 11952, 11957, 11964, 11971, 11977, + 11982, 11987, 11993, 11998, 12003, 12009, 0, 0, 12014, 12020, 12026, + 12032, 12038, 12044, 12050, 12055, 12063, 12069, 12075, 12081, 12087, + 12093, 12101, 0, 12107, 12112, 12117, 12122, 12127, 12132, 12137, 12142, + 12147, 12152, 12157, 12162, 12167, 12172, 12177, 12182, 12187, 12192, + 12197, 12202, 12207, 12212, 12217, 12222, 12227, 12232, 12237, 12242, 0, + 0, 12247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 17247, 17252, 0, 17259, 0, 0, 17266, 17271, 0, 17276, 0, - 0, 17283, 0, 0, 0, 0, 0, 0, 17288, 17293, 17297, 17304, 0, 17311, 17316, - 17321, 17326, 17333, 17340, 17347, 0, 17354, 17359, 17364, 0, 17371, 0, - 17378, 0, 0, 17383, 17390, 0, 17397, 17401, 17408, 17412, 17417, 17425, - 17431, 17437, 17442, 17448, 17454, 17460, 17465, 0, 17471, 17479, 17486, - 0, 0, 17493, 17498, 17504, 17509, 17515, 0, 17521, 0, 17527, 17534, - 17541, 17548, 17555, 17560, 0, 0, 17564, 17569, 17573, 17577, 17581, - 17585, 17589, 17593, 17598, 17602, 0, 0, 17607, 17613, 17619, 17626, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12251, 12260, + 12268, 12275, 12283, 12295, 12302, 12309, 12316, 12328, 12339, 12346, + 12354, 12360, 12365, 12373, 12381, 12389, 12395, 12405, 12413, 0, 12420, + 12428, 12436, 12445, 12454, 12467, 12473, 12479, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12485, 12492, 12497, 12502, + 12507, 12515, 12523, 12530, 12537, 12544, 12551, 12558, 12565, 12572, + 12578, 12586, 12592, 12597, 12602, 12607, 12612, 12617, 12622, 12627, + 12632, 12637, 12642, 12647, 12652, 12656, 12660, 12664, 12669, 12675, + 12681, 12687, 12692, 12697, 12702, 12707, 12713, 12722, 12730, 12736, + 12744, 12750, 12754, 12758, 12762, 12767, 12770, 12774, 12777, 12781, + 12784, 12788, 12792, 12796, 12801, 12806, 12809, 12813, 12818, 12823, + 12826, 12830, 12833, 12837, 12841, 12845, 12849, 12853, 12857, 12861, + 12865, 12869, 12873, 12877, 12881, 12885, 12889, 12893, 12897, 12901, + 12905, 12908, 12912, 12915, 12919, 12923, 12927, 12930, 12933, 12937, + 12941, 12944, 12948, 12952, 12956, 12960, 12964, 12968, 12971, 12976, + 12981, 12985, 12989, 12994, 12998, 13003, 13007, 13012, 13017, 13023, + 13029, 13035, 13039, 13044, 13050, 13056, 13060, 13065, 13069, 13075, + 13080, 13083, 13089, 13095, 13100, 13105, 13112, 13117, 13122, 13126, + 13130, 13134, 13138, 13142, 13146, 13150, 13154, 13159, 13164, 13169, + 13175, 13178, 13182, 13186, 13189, 13192, 13195, 13198, 13201, 13204, + 13208, 13211, 13215, 13219, 13226, 13231, 13235, 13239, 13243, 13247, + 13251, 13257, 13261, 13265, 13269, 13273, 13279, 13283, 13287, 13290, + 13294, 13298, 0, 13302, 13305, 13309, 13312, 13316, 13319, 13323, 13327, + 0, 0, 13331, 13334, 0, 0, 13338, 13341, 13345, 13348, 13352, 13356, + 13360, 13364, 13368, 13372, 13376, 13380, 13384, 13388, 13392, 13396, + 13400, 13404, 13408, 13412, 13416, 13420, 0, 13423, 13426, 13430, 13434, + 13438, 13441, 13444, 0, 13448, 0, 0, 0, 13451, 13455, 13459, 13463, 0, 0, + 13466, 13470, 13474, 13479, 13483, 13488, 13492, 13497, 13502, 0, 0, + 13508, 13512, 0, 0, 13517, 13521, 13526, 13530, 0, 0, 0, 0, 0, 0, 0, 0, + 13536, 0, 0, 0, 0, 13542, 13546, 0, 13550, 13554, 13559, 13564, 13569, 0, + 0, 13575, 13579, 13582, 13585, 13588, 13591, 13594, 13597, 13601, 13604, + 13608, 13616, 13625, 13629, 13633, 13639, 13645, 13651, 13657, 13671, + 13678, 13681, 0, 0, 0, 0, 0, 13685, 13692, 13697, 0, 13702, 13706, 13711, + 13715, 13720, 13724, 0, 0, 0, 0, 13729, 13734, 0, 0, 13739, 13744, 13749, + 13753, 13758, 13763, 13768, 13773, 13778, 13783, 13788, 13793, 13798, + 13803, 13808, 13813, 13818, 13823, 13828, 13833, 13838, 13843, 0, 13847, + 13851, 13856, 13861, 13866, 13870, 13874, 0, 13879, 13883, 0, 13888, + 13893, 0, 13898, 13903, 0, 0, 13907, 0, 13912, 13918, 13923, 13929, + 13934, 0, 0, 0, 0, 13940, 13946, 0, 0, 13952, 13958, 13964, 0, 0, 0, + 13969, 0, 0, 0, 0, 0, 0, 0, 13974, 13979, 13984, 13989, 0, 13994, 0, 0, + 0, 0, 0, 0, 0, 13999, 14004, 14008, 14012, 14016, 14020, 14024, 14028, + 14033, 14037, 14042, 14046, 14050, 14054, 14058, 14064, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 14069, 14074, 14079, 0, 14084, 14088, 14093, 14097, 14102, + 14106, 14111, 14116, 14121, 0, 14127, 14131, 14136, 0, 14142, 14146, + 14151, 14155, 14160, 14165, 14170, 14175, 14180, 14185, 14190, 14195, + 14200, 14205, 14210, 14215, 14220, 14225, 14230, 14235, 14240, 14245, 0, + 14249, 14253, 14258, 14263, 14268, 14272, 14276, 0, 14281, 14285, 0, + 14290, 14295, 14300, 14305, 14310, 0, 0, 14314, 14319, 14324, 14330, + 14335, 14341, 14346, 14352, 14358, 14365, 0, 14372, 14377, 14383, 0, + 14390, 14395, 14401, 0, 0, 14406, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 14410, 14416, 14422, 14428, 0, 0, 14435, 14440, 14444, 14448, + 14452, 14456, 14460, 14464, 14469, 14473, 14478, 14483, 0, 0, 0, 0, 0, 0, + 0, 14488, 0, 0, 0, 0, 0, 0, 0, 14493, 14498, 14503, 0, 14508, 14512, + 14517, 14521, 14526, 14530, 14535, 14540, 0, 0, 14545, 14549, 0, 0, + 14554, 14558, 14563, 14567, 14572, 14577, 14582, 14587, 14592, 14597, + 14602, 14607, 14612, 14617, 14622, 14627, 14632, 14637, 14642, 14647, + 14652, 14657, 0, 14661, 14665, 14670, 14675, 14680, 14684, 14688, 0, + 14693, 14697, 0, 14702, 14707, 14712, 14717, 14722, 0, 0, 14726, 14731, + 14736, 14742, 14747, 14753, 14758, 14764, 14770, 0, 0, 14777, 14782, 0, + 0, 14788, 14793, 14799, 0, 0, 0, 0, 0, 0, 0, 0, 14804, 14811, 0, 0, 0, 0, + 14818, 14823, 0, 14828, 14833, 14839, 14845, 14851, 0, 0, 14858, 14863, + 14867, 14871, 14875, 14879, 14883, 14887, 14892, 14896, 14901, 14905, + 14910, 14917, 14924, 14931, 14938, 14945, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 14952, 14956, 0, 14960, 14963, 14967, 14970, 14974, 14977, 0, 0, 0, + 14981, 14984, 14988, 0, 14992, 14995, 14999, 15003, 0, 0, 0, 15006, + 15010, 0, 15014, 0, 15018, 15022, 0, 0, 0, 15026, 15030, 0, 0, 0, 15034, + 15037, 15041, 0, 0, 0, 15044, 15047, 15050, 15054, 15058, 15061, 15065, + 15069, 15073, 15077, 15081, 15085, 0, 0, 0, 0, 15088, 15093, 15097, + 15102, 15106, 0, 0, 0, 15111, 15115, 15120, 0, 15125, 15129, 15134, + 15139, 0, 0, 15143, 0, 0, 0, 0, 0, 0, 15146, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 15152, 15156, 15159, 15162, 15165, 15168, 15171, 15174, + 15178, 15181, 15185, 15189, 15194, 15199, 15203, 15207, 15211, 15215, + 15219, 15224, 15228, 0, 0, 0, 0, 0, 15231, 15237, 15241, 15245, 0, 15249, + 15252, 15256, 15259, 15263, 15266, 15270, 15274, 0, 15278, 15281, 15285, + 0, 15289, 15292, 15296, 15300, 15303, 15307, 15311, 15315, 15319, 15323, + 15327, 15331, 15335, 15339, 15343, 15347, 15351, 15355, 15359, 15363, + 15367, 15371, 15375, 0, 15378, 15381, 15385, 15389, 15393, 15396, 15399, + 15403, 15407, 15410, 15414, 15418, 15422, 15426, 15430, 15434, 0, 0, 0, + 15437, 15441, 15446, 15450, 15455, 15459, 15464, 15469, 0, 15475, 15479, + 15484, 0, 15489, 15493, 15498, 15503, 0, 0, 0, 0, 0, 0, 0, 15507, 15511, + 0, 15517, 15521, 15525, 0, 0, 0, 0, 0, 15529, 15534, 15539, 15544, 0, 0, + 15550, 15554, 15557, 15560, 15563, 15566, 15569, 15572, 15576, 15579, 0, + 0, 0, 0, 0, 0, 0, 0, 15583, 15596, 15608, 15620, 15632, 15644, 15656, + 15668, 15672, 15679, 15684, 15689, 0, 15694, 15698, 15703, 15707, 15712, + 15716, 15721, 15726, 0, 15731, 15735, 15740, 0, 15745, 15749, 15754, + 15759, 15763, 15768, 15773, 15778, 15783, 15788, 15793, 15798, 15803, + 15808, 15813, 15818, 15823, 15828, 15833, 15838, 15843, 15848, 15853, 0, + 15857, 15861, 15866, 15871, 15876, 15880, 15884, 15889, 15894, 15898, 0, + 15903, 15908, 15913, 15918, 15923, 0, 0, 15927, 15932, 15937, 15943, + 15948, 15954, 15959, 15965, 15971, 0, 15978, 15983, 15989, 0, 15995, + 16000, 16006, 16012, 0, 0, 0, 0, 0, 0, 0, 16017, 16022, 0, 0, 0, 0, 0, 0, + 0, 16029, 0, 16034, 16040, 16046, 16052, 0, 0, 16059, 16064, 16068, + 16072, 16076, 16080, 16084, 16088, 16093, 16097, 0, 16102, 16107, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16112, 16116, 16120, 0, 16124, 16127, + 16131, 16134, 16138, 16141, 16145, 16149, 0, 16153, 16156, 16160, 0, + 16164, 16167, 16171, 16175, 16178, 16182, 16186, 16190, 16194, 16198, + 16202, 16206, 16210, 16214, 16218, 16222, 16226, 16230, 16234, 16238, + 16242, 16246, 16250, 16253, 16257, 16260, 16264, 16268, 16272, 16275, + 16278, 16282, 16286, 16289, 16293, 16297, 16301, 16305, 16309, 16313, + 16316, 0, 0, 16320, 16324, 16329, 16333, 16338, 16342, 16347, 16352, 0, + 16358, 16362, 16367, 0, 16372, 16376, 16381, 16386, 16390, 16395, 0, 0, + 0, 0, 16399, 16405, 16411, 16417, 16423, 16429, 16435, 16441, 16447, + 16453, 16459, 16465, 16471, 16476, 16481, 16486, 0, 0, 16492, 16496, + 16499, 16502, 16505, 16508, 16511, 16514, 16518, 16521, 16525, 16529, + 16534, 16539, 16545, 16551, 16557, 16563, 16569, 16575, 16579, 16585, + 16591, 16597, 16602, 16608, 0, 0, 16614, 16618, 0, 16622, 16626, 16630, + 16634, 16638, 16642, 16646, 16650, 16654, 16658, 16662, 16666, 16670, + 16674, 16678, 16682, 16686, 16690, 0, 0, 0, 16694, 16700, 16706, 16712, + 16718, 16724, 16730, 16736, 16742, 16748, 16754, 16760, 16768, 16774, + 16780, 16786, 16792, 16798, 16804, 16810, 16816, 16822, 16828, 16834, 0, + 16840, 16846, 16852, 16858, 16864, 16870, 16874, 16880, 16884, 0, 16888, + 0, 0, 16894, 16898, 16904, 16910, 16916, 16920, 16926, 0, 0, 0, 16930, 0, + 0, 0, 0, 16934, 16939, 16946, 16953, 16960, 16967, 0, 16974, 0, 16981, + 16986, 16991, 16998, 17005, 17014, 17025, 17034, 0, 0, 0, 0, 0, 0, 17039, + 17045, 17050, 17055, 17060, 17065, 17070, 17075, 17081, 17086, 0, 0, + 17092, 17099, 17106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17111, 17118, + 17125, 17132, 17139, 17146, 17153, 17160, 17167, 17174, 17181, 17188, + 17195, 17202, 17209, 17216, 17223, 17230, 17237, 17244, 17251, 17258, + 17265, 17272, 17279, 17286, 17293, 17300, 17307, 17314, 17321, 17328, + 17335, 17341, 17348, 17355, 17360, 17367, 17372, 17379, 17386, 17393, + 17400, 17407, 17414, 17420, 17427, 17432, 17438, 17445, 17452, 17459, + 17465, 17472, 17479, 17486, 17492, 17499, 0, 0, 0, 0, 17504, 17511, + 17517, 17524, 17530, 17539, 17548, 17553, 17558, 17563, 17570, 17577, + 17584, 17591, 17596, 17601, 17606, 17611, 17616, 17620, 17624, 17628, + 17632, 17636, 17640, 17645, 17649, 17654, 17659, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17633, 17637, 17648, 17663, 17678, 17688, 17699, - 17712, 17723, 17729, 17737, 17747, 17753, 17761, 17765, 17771, 17777, - 17785, 17795, 17803, 17816, 17822, 17830, 17838, 17850, 17857, 17865, - 17873, 17881, 17889, 17897, 17905, 17915, 17919, 17922, 17925, 17928, - 17931, 17934, 17937, 17941, 17944, 17948, 17952, 17956, 17960, 17964, - 17968, 17972, 17977, 17981, 17986, 17991, 17997, 18007, 18021, 18031, - 18037, 18043, 18051, 18059, 18067, 18075, 18081, 18087, 18090, 18094, - 18098, 18102, 18106, 18110, 18114, 0, 18118, 18122, 18126, 18130, 18134, - 18138, 18142, 18146, 18150, 18154, 18158, 18162, 18165, 18169, 18173, - 18177, 18180, 18184, 18188, 18192, 18196, 18200, 18204, 18208, 18212, - 18215, 18219, 18223, 18227, 18231, 18235, 18238, 18241, 18245, 18251, - 18255, 0, 0, 0, 0, 18259, 18264, 18268, 18273, 18277, 18282, 18287, - 18293, 18298, 18304, 18308, 18313, 18317, 18322, 18332, 18338, 18344, - 18351, 18361, 18367, 18371, 18375, 18381, 18387, 18395, 18401, 18409, - 18417, 18425, 18435, 18443, 18453, 18458, 18464, 18470, 18476, 18482, - 18488, 18494, 0, 18500, 18506, 18512, 18518, 18524, 18530, 18536, 18542, - 18548, 18554, 18560, 18566, 18571, 18577, 18583, 18589, 18594, 18600, - 18606, 18612, 18618, 18624, 18630, 18636, 18642, 18647, 18653, 18659, - 18665, 18671, 18677, 18682, 18687, 18693, 18701, 18708, 0, 18716, 18723, - 18736, 18743, 18750, 18758, 18766, 18772, 18778, 18784, 18794, 18799, - 18805, 18815, 18825, 0, 18835, 18845, 18853, 18865, 18877, 18883, 18897, - 18912, 18917, 18922, 18930, 18938, 18946, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 17664, 17669, 0, 17676, 0, 0, 17683, 17688, 0, 17693, 0, + 0, 17700, 0, 0, 0, 0, 0, 0, 17705, 17710, 17714, 17721, 0, 17728, 17733, + 17738, 17743, 17750, 17757, 17764, 0, 17771, 17776, 17781, 0, 17788, 0, + 17795, 0, 0, 17800, 17807, 0, 17814, 17818, 17825, 17829, 17834, 17842, + 17848, 17854, 17859, 17865, 17871, 17877, 17882, 0, 17888, 17896, 17903, + 0, 0, 17910, 17915, 17921, 17926, 17932, 0, 17938, 0, 17943, 17950, + 17957, 17964, 17971, 17976, 0, 0, 17980, 17985, 17989, 17993, 17997, + 18001, 18005, 18009, 18014, 18018, 0, 0, 18023, 18029, 18035, 18042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 18954, 18957, 18961, 18965, 18969, 18973, 18977, 18981, 18985, - 18989, 18993, 18997, 19001, 19005, 19009, 19013, 19017, 19021, 19025, - 19029, 19033, 19037, 19040, 19044, 19048, 19052, 19055, 19058, 19062, - 19066, 19070, 19074, 19077, 19081, 19084, 19089, 19092, 19096, 19099, - 19103, 19106, 19111, 19114, 19118, 19125, 19130, 19134, 19139, 19143, - 19148, 19152, 19157, 19164, 19170, 19175, 19179, 19183, 19187, 19191, - 19195, 19200, 19206, 19212, 19217, 19223, 19227, 19230, 19233, 19236, - 19239, 19242, 19245, 19249, 19252, 19256, 19262, 19266, 19270, 19274, - 19278, 19282, 19286, 19290, 19294, 19299, 19303, 19308, 19313, 19319, - 19324, 19330, 19336, 19342, 19348, 19354, 19362, 19369, 19377, 19385, - 19394, 19403, 19414, 19424, 19434, 19445, 19456, 19466, 19476, 19486, - 19496, 19506, 19516, 19526, 19536, 19544, 19551, 19557, 19564, 19569, - 19575, 19581, 19587, 19593, 19599, 19605, 19611, 19617, 19623, 19629, - 19635, 19640, 19648, 19655, 19661, 19668, 19676, 19682, 19688, 19694, - 19700, 19708, 19716, 19726, 19734, 19742, 19748, 19753, 19758, 19763, - 19768, 19773, 19778, 19784, 19789, 19795, 19801, 19807, 19813, 19820, - 19825, 19831, 19836, 19841, 19846, 19851, 19856, 19861, 19866, 19871, - 19876, 19881, 19886, 19891, 19896, 19901, 19906, 19911, 19916, 19921, - 19926, 19931, 19936, 19941, 19946, 19951, 19956, 19961, 19966, 19971, - 19976, 19981, 19986, 19991, 19996, 20001, 20006, 20011, 20016, 0, 20021, - 0, 0, 0, 0, 0, 20026, 0, 0, 20031, 20035, 20039, 20043, 20047, 20051, - 20055, 20059, 20063, 20067, 20071, 20075, 20079, 20083, 20087, 20091, - 20095, 20099, 20103, 20107, 20111, 20115, 20119, 20123, 20127, 20131, - 20135, 20139, 20143, 20147, 20151, 20155, 20159, 20163, 20167, 20171, - 20175, 20179, 20183, 20187, 20191, 20195, 20201, 20205, 20210, 20215, - 20219, 20224, 20229, 20233, 20237, 20241, 20245, 20249, 20253, 20257, - 20261, 20265, 20269, 20273, 20277, 20281, 20285, 20289, 20293, 20297, - 20301, 20305, 20309, 20313, 20317, 20321, 20325, 20329, 20333, 20337, - 20341, 20345, 20349, 20353, 20357, 20361, 20365, 20369, 20373, 20377, - 20381, 20385, 20389, 20393, 20397, 20401, 20405, 20409, 20413, 20417, - 20421, 20425, 20429, 20433, 20437, 20441, 20445, 20449, 20453, 20457, - 20461, 20465, 20469, 20473, 20477, 20481, 20485, 20489, 20493, 20497, - 20501, 20505, 20509, 20513, 20517, 20521, 20525, 20529, 20533, 20537, - 20541, 20545, 20549, 20553, 20557, 20561, 20565, 20569, 20573, 20577, - 20581, 20585, 20589, 20593, 20597, 20601, 20605, 20609, 20613, 20617, - 20620, 20624, 20627, 20631, 20635, 20638, 20642, 20646, 20649, 20653, - 20657, 20661, 20665, 20668, 20672, 20676, 20680, 20684, 20688, 20692, - 20695, 20699, 20703, 20707, 20711, 20715, 20719, 20723, 20727, 20731, - 20735, 20739, 20743, 20747, 20751, 20755, 20759, 20763, 20767, 20771, - 20775, 20779, 20783, 20787, 20791, 20795, 20799, 20803, 20807, 20811, - 20815, 20819, 20823, 20827, 20831, 20835, 20839, 20843, 20847, 20851, - 20855, 20859, 20863, 20867, 20871, 20875, 20879, 20883, 20887, 20891, - 20895, 20899, 20903, 20907, 20911, 20915, 20919, 20923, 20927, 20931, - 20935, 20939, 20943, 20947, 20951, 20955, 20959, 20963, 20967, 20971, - 20975, 20979, 20983, 20987, 20991, 20995, 20999, 21003, 21007, 21011, - 21015, 21019, 21023, 21027, 21031, 21035, 21039, 21043, 21047, 21051, - 21055, 21059, 21063, 21067, 21071, 21075, 21079, 21083, 21087, 21091, - 21095, 21099, 21103, 21107, 21111, 21115, 21119, 21123, 21127, 21131, - 21135, 21139, 21143, 21147, 21151, 21155, 21159, 21163, 21167, 21171, - 21175, 21179, 21183, 21187, 21191, 21195, 21199, 21203, 21207, 21211, - 21215, 21219, 21223, 21227, 21231, 21235, 21239, 21243, 21247, 21250, - 21254, 21258, 21262, 21266, 21270, 21274, 21278, 21282, 21286, 21290, - 21294, 21298, 21302, 21306, 21310, 21314, 21318, 21322, 21326, 21330, - 21334, 21338, 21342, 21345, 21349, 21353, 21357, 21361, 21365, 21369, - 21373, 21377, 21381, 21385, 21389, 21393, 21397, 21401, 21405, 21409, - 21413, 21417, 21421, 21425, 21429, 21433, 21437, 21441, 21445, 21449, - 21453, 21457, 21461, 21465, 21469, 21473, 21477, 21481, 21485, 21489, - 21493, 21497, 21501, 21505, 21509, 21513, 21517, 21521, 21525, 21529, - 21533, 0, 21537, 21541, 21545, 21549, 0, 0, 21553, 21557, 21561, 21565, - 21569, 21573, 21577, 0, 21581, 0, 21585, 21589, 21593, 21597, 0, 0, - 21601, 21605, 21609, 21613, 21617, 21621, 21625, 21629, 21633, 21637, - 21641, 21645, 21649, 21653, 21657, 21661, 21665, 21669, 21673, 21677, - 21681, 21685, 21689, 21692, 21696, 21700, 21704, 21708, 21712, 21716, - 21720, 21724, 21728, 21732, 21736, 21740, 21744, 21748, 21752, 21756, - 21760, 0, 21764, 21768, 21772, 21776, 0, 0, 21780, 21784, 21788, 21792, - 21796, 21800, 21804, 21808, 21812, 21816, 21820, 21824, 21828, 21832, - 21836, 21840, 21844, 21849, 21854, 21859, 21865, 21871, 21876, 21881, - 21887, 21890, 21894, 21898, 21902, 21906, 21910, 21914, 21918, 0, 21922, - 21926, 21930, 21934, 0, 0, 21938, 21942, 21946, 21950, 21954, 21958, - 21962, 0, 21966, 0, 21970, 21974, 21978, 21982, 0, 0, 21986, 21990, - 21994, 21998, 22002, 22006, 22010, 22014, 22018, 22023, 22028, 22033, - 22039, 22045, 22050, 0, 22055, 22059, 22063, 22067, 22071, 22075, 22079, - 22083, 22087, 22091, 22095, 22099, 22103, 22107, 22111, 22115, 22119, - 22122, 22126, 22130, 22134, 22138, 22142, 22146, 22150, 22154, 22158, - 22162, 22166, 22170, 22174, 22178, 22182, 22186, 22190, 22194, 22198, - 22202, 22206, 22210, 22214, 22218, 22222, 22226, 22230, 22234, 22238, - 22242, 22246, 22250, 22254, 22258, 22262, 22266, 22270, 22274, 22278, 0, - 22282, 22286, 22290, 22294, 0, 0, 22298, 22302, 22306, 22310, 22314, - 22318, 22322, 22326, 22330, 22334, 22338, 22342, 22346, 22350, 22354, - 22358, 22362, 22366, 22370, 22374, 22378, 22382, 22386, 22390, 22394, - 22398, 22402, 22406, 22410, 22414, 22418, 22422, 22426, 22430, 22434, - 22438, 22442, 22446, 22450, 22454, 22458, 22462, 22466, 22470, 22474, - 22478, 22482, 22486, 22490, 22494, 22498, 22502, 22506, 22510, 22514, - 22518, 22522, 22525, 22529, 22533, 22537, 22541, 22545, 22549, 22553, - 22557, 22561, 0, 0, 22565, 22574, 22580, 22585, 22589, 22592, 22597, - 22600, 22603, 22606, 22611, 22615, 22620, 22623, 22626, 22629, 22632, - 22635, 22638, 22642, 22645, 22649, 22653, 22657, 22661, 22665, 22669, - 22673, 22677, 22681, 22685, 22689, 0, 0, 0, 22695, 22701, 22705, 22709, - 22713, 22719, 22723, 22727, 22731, 22737, 22741, 22745, 22749, 22755, - 22759, 22763, 22767, 22773, 22779, 22785, 22793, 22799, 22805, 22811, - 22817, 22823, 0, 0, 0, 0, 0, 0, 22829, 22832, 22835, 22838, 22841, 22844, - 22848, 22852, 22855, 22859, 22863, 22867, 22871, 22875, 22878, 22882, - 22886, 22890, 22894, 22898, 22902, 22906, 22910, 22914, 22918, 22922, - 22925, 22929, 22933, 22937, 22941, 22945, 22949, 22953, 22957, 22961, - 22965, 22969, 22973, 22977, 22981, 22985, 22989, 22993, 22997, 23001, - 23004, 23008, 23012, 23016, 23020, 23024, 23028, 23032, 23036, 23040, - 23044, 23048, 23052, 23056, 23060, 23064, 23068, 23072, 23076, 23080, - 23084, 23088, 23092, 23096, 23100, 23104, 23108, 23112, 23116, 23120, - 23124, 23128, 23132, 23136, 23139, 23143, 23147, 23151, 23155, 23159, 0, - 0, 23163, 23168, 23173, 23178, 23183, 23188, 0, 0, 23193, 23197, 23200, - 23204, 23207, 23211, 23214, 23218, 23224, 23229, 23233, 23236, 23240, - 23244, 23249, 23253, 23258, 23262, 23267, 23271, 23276, 23280, 23285, - 23291, 23295, 23300, 23304, 23309, 23315, 23319, 23325, 23331, 23335, - 23340, 23348, 23356, 23363, 23368, 23373, 23382, 23388, 23396, 23401, - 23407, 23411, 23415, 23419, 23423, 23427, 23431, 23435, 23439, 23443, - 23447, 23453, 23458, 23463, 23466, 23470, 23474, 23479, 23483, 23488, - 23492, 23497, 23501, 23506, 23510, 23515, 23519, 23524, 23528, 23533, - 23539, 23543, 23548, 23553, 23557, 23561, 23565, 23569, 23572, 23576, - 23582, 23587, 23592, 23596, 23600, 23604, 23609, 23613, 23618, 23622, - 23627, 23630, 23634, 23638, 23643, 23647, 23652, 23656, 23661, 23667, - 23671, 23675, 23679, 23683, 23687, 23691, 23695, 23699, 23703, 23707, - 23711, 23717, 23720, 23724, 23728, 23733, 23737, 23742, 23746, 23751, - 23755, 23760, 23764, 23769, 23773, 23778, 23782, 23787, 23793, 23797, - 23801, 23807, 23813, 23819, 23825, 23829, 23833, 23837, 23841, 23845, - 23849, 23855, 23859, 23863, 23867, 23872, 23876, 23881, 23885, 23890, - 23894, 23899, 23903, 23908, 23912, 23917, 23921, 23926, 23932, 23936, - 23942, 23946, 23950, 23954, 23958, 23962, 23966, 23972, 23975, 23979, - 23983, 23988, 23992, 23997, 24001, 24006, 24010, 24015, 24019, 24024, - 24028, 24033, 24037, 24042, 24048, 24052, 24057, 24061, 24067, 24073, - 24077, 24081, 24085, 24089, 24093, 24097, 24103, 24107, 24111, 24115, - 24120, 24124, 24129, 24133, 24138, 24144, 24148, 24153, 24157, 24161, - 24165, 24169, 24173, 24177, 24181, 24187, 24191, 24195, 24199, 24204, - 24208, 24213, 24217, 24222, 24226, 24231, 24235, 24240, 24244, 24249, - 24253, 24258, 24261, 24265, 24269, 24273, 24277, 24281, 24285, 24289, - 24293, 24299, 24303, 24307, 24311, 24316, 24320, 24325, 24329, 24334, - 24338, 24343, 24347, 24352, 24356, 24361, 24365, 24370, 24376, 24379, - 24384, 24388, 24393, 24399, 24405, 24411, 24417, 24423, 24429, 24435, - 24439, 24443, 24447, 24451, 24455, 24459, 24463, 24467, 24472, 24476, - 24481, 24485, 24490, 24494, 24499, 24503, 24508, 24512, 24517, 24521, - 24526, 24530, 24534, 24538, 24542, 24546, 24550, 24554, 24560, 24563, - 24567, 24571, 24576, 24580, 24585, 24589, 24594, 24598, 24603, 24607, - 24612, 24616, 24621, 24625, 24630, 24636, 24640, 24646, 24651, 24657, - 24661, 24667, 24672, 24676, 24680, 24684, 24688, 24692, 24697, 24701, - 24705, 24710, 24714, 24719, 24722, 24726, 24730, 24734, 24738, 24742, - 24746, 24750, 24754, 24758, 24762, 24766, 24771, 24775, 24779, 24785, - 24789, 24795, 24799, 24805, 24809, 24813, 24817, 24821, 24825, 24830, - 24834, 24838, 24842, 24846, 24850, 24854, 24858, 24862, 24866, 24870, - 24876, 24882, 24888, 24894, 24900, 24905, 24911, 24917, 24923, 24927, - 24931, 24935, 24939, 24943, 24947, 24951, 24955, 24959, 24963, 24967, - 24971, 24975, 24980, 24985, 24990, 24995, 24999, 25003, 25007, 25011, - 25015, 25019, 25023, 25027, 25031, 25037, 25043, 25049, 25055, 25061, - 25067, 25073, 25079, 25085, 25089, 25093, 25097, 25101, 25105, 25109, - 25113, 25119, 25125, 25131, 25137, 25143, 25149, 25155, 25161, 25167, - 25172, 25177, 25182, 25187, 25193, 25199, 25205, 25211, 25217, 25223, - 25229, 25235, 25241, 25247, 25253, 25258, 25264, 25270, 25276, 25281, - 25286, 25291, 25296, 25301, 25306, 25311, 25316, 25321, 25326, 25331, - 25336, 25341, 25346, 25351, 25356, 25361, 25366, 25371, 25376, 25381, - 25386, 25391, 25396, 25401, 25406, 25411, 25416, 25421, 25426, 25431, - 25436, 25441, 25446, 25451, 25456, 25461, 25466, 25471, 25476, 25481, - 25486, 25490, 25495, 25500, 25505, 25510, 25515, 25520, 25525, 25530, - 25535, 25540, 25545, 25550, 25555, 25560, 25565, 25570, 25575, 25580, - 25585, 25590, 25595, 25600, 25605, 25610, 25615, 25620, 25625, 25630, - 25635, 25640, 25645, 25649, 25654, 25659, 25664, 25669, 25674, 25678, - 25683, 25689, 25694, 25699, 25704, 25709, 25715, 25720, 25725, 25730, - 25735, 25740, 25745, 25750, 25755, 25760, 25765, 25770, 25775, 25780, - 25785, 25790, 25795, 25800, 25805, 25810, 25815, 25820, 25825, 25830, - 25835, 25840, 25845, 25850, 25855, 25860, 25865, 25870, 25875, 25880, - 25885, 25890, 25895, 25900, 25905, 25910, 25915, 25920, 25925, 25930, - 25935, 25941, 25946, 25951, 25956, 25961, 25966, 25971, 25976, 25981, - 25986, 25991, 25996, 26001, 26006, 26011, 26016, 26021, 26026, 26031, - 26036, 26041, 26046, 26051, 26056, 26061, 26066, 26071, 26076, 26081, - 26086, 26091, 26096, 26101, 26106, 26111, 26116, 26121, 26126, 26131, - 26137, 26141, 26145, 26149, 26153, 26157, 26161, 26165, 26169, 26175, - 26181, 26187, 26193, 26199, 26205, 26211, 26218, 26224, 26229, 26234, - 26239, 26244, 26249, 26254, 26259, 26264, 26269, 26274, 26279, 26284, - 26289, 26294, 26299, 26304, 26309, 26314, 26319, 26324, 26329, 26334, - 26339, 26344, 26349, 26354, 26359, 26364, 0, 0, 0, 26371, 26381, 26385, - 26392, 26396, 26400, 26404, 26412, 26416, 26421, 26426, 26431, 26435, - 26440, 26445, 26448, 26452, 26456, 26465, 26469, 26473, 26479, 26483, - 26487, 26495, 26499, 26507, 26513, 26519, 26525, 26531, 26541, 26547, - 26551, 26560, 26563, 26569, 26573, 26579, 26584, 26590, 26598, 26604, - 26609, 26616, 26621, 26625, 26629, 26639, 26645, 26649, 26659, 26665, - 26669, 26673, 26680, 26688, 26694, 26700, 26709, 26713, 26717, 26721, - 26729, 26736, 26740, 26744, 26748, 26752, 26756, 26760, 26764, 26768, - 26772, 26776, 26780, 26785, 26790, 26795, 26799, 26803, 26807, 26811, - 26815, 26819, 26827, 26835, 26843, 26851, 0, 0, 0, 0, 0, 0, 0, 26859, - 26863, 26867, 26871, 26875, 26880, 26885, 26890, 26895, 26900, 26904, - 26909, 26913, 0, 26917, 26922, 26927, 26932, 26936, 26941, 26946, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 26951, 26955, 26959, 26963, 26967, 26972, - 26977, 26982, 26987, 26992, 26996, 27001, 27005, 27009, 27014, 27019, - 27024, 27029, 27033, 27038, 27043, 27048, 27054, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 27059, 27063, 27067, 27071, 27075, 27080, 27085, 27090, 27095, 27100, - 27104, 27109, 27113, 27117, 27122, 27127, 27132, 27137, 27141, 27146, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27151, 27155, 27159, 27163, 27167, - 27172, 27177, 27182, 27187, 27192, 27196, 27201, 27205, 0, 27209, 27214, - 27219, 0, 27224, 27229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27234, 27237, - 27241, 27245, 27249, 27253, 27257, 27261, 27265, 27269, 27273, 27277, - 27281, 27285, 27289, 27293, 27297, 27301, 27304, 27308, 27312, 27316, - 27320, 27324, 27328, 27332, 27336, 27340, 27344, 27348, 27352, 27356, - 27360, 27363, 27367, 27371, 27377, 27383, 27389, 27395, 27401, 27407, - 27413, 27419, 27425, 27431, 27437, 27443, 27449, 27455, 27464, 27473, - 27479, 27485, 27491, 27496, 27500, 27505, 27510, 27515, 27519, 27524, - 27529, 27534, 27538, 27543, 27547, 27552, 27557, 27562, 27567, 27571, - 27575, 27579, 27583, 27587, 27591, 27595, 27599, 27603, 27607, 27613, - 27617, 27621, 27625, 27629, 27633, 27641, 27647, 27651, 27657, 27661, - 27667, 27671, 0, 0, 27675, 27679, 27682, 27685, 27688, 27691, 27694, - 27697, 27701, 27704, 0, 0, 0, 0, 0, 0, 27708, 27716, 27724, 27732, 27740, - 27748, 27756, 27764, 27772, 27780, 0, 0, 0, 0, 0, 0, 27788, 27791, 27794, - 27797, 27802, 27805, 27810, 27817, 27825, 27830, 27837, 27840, 27847, - 27854, 27861, 0, 27865, 27869, 27872, 27875, 27878, 27881, 27884, 27887, - 27891, 27894, 0, 0, 0, 0, 0, 0, 27898, 27901, 27904, 27907, 27910, 27913, - 27917, 27921, 27925, 27929, 27933, 27937, 27940, 27944, 27948, 27951, - 27955, 27959, 27963, 27967, 27971, 27975, 27979, 27982, 27986, 27990, - 27994, 27997, 28001, 28005, 28009, 28013, 28017, 28021, 28025, 28029, - 28036, 28041, 28046, 28051, 28056, 28062, 28068, 28074, 28080, 28085, - 28091, 28097, 28102, 28108, 28114, 28120, 28126, 28132, 28137, 28143, - 28148, 28154, 28160, 28166, 28172, 28178, 28183, 28188, 28194, 28200, - 28205, 28211, 28216, 28222, 28227, 28232, 28238, 28244, 28250, 28256, - 28262, 28268, 28274, 28280, 28286, 28292, 28298, 28304, 28309, 28314, - 28320, 28326, 0, 0, 0, 0, 0, 0, 0, 0, 28332, 28341, 28350, 28358, 28366, - 28376, 28384, 28393, 28400, 28407, 28414, 28422, 28430, 28438, 28446, - 28454, 28462, 28470, 28478, 28485, 28493, 28501, 28509, 28517, 28525, - 28535, 28545, 28555, 28565, 28575, 28585, 28595, 28605, 28615, 28625, - 28635, 28645, 28655, 28665, 28673, 28681, 28691, 28699, 0, 0, 0, 0, 0, - 28709, 28713, 28717, 28721, 28725, 28729, 28733, 28737, 28741, 28745, - 28749, 28753, 28757, 28761, 28765, 28769, 28773, 28777, 28781, 28785, - 28789, 28793, 28797, 28801, 28807, 28811, 28817, 28821, 28827, 28831, - 28837, 28841, 28845, 28849, 28853, 28857, 28861, 28867, 28873, 28879, - 28885, 28891, 28897, 28902, 28908, 28914, 28920, 28926, 28933, 28939, - 28944, 28949, 28953, 28957, 28961, 28965, 28969, 28973, 28977, 28983, - 28989, 28995, 29000, 29007, 29012, 29017, 29023, 29028, 29035, 29042, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 29048, 29054, 29058, 29063, 29068, 29073, - 29078, 29083, 29088, 29093, 29098, 29103, 29108, 29113, 29118, 29123, - 29128, 29132, 29137, 29142, 29147, 29151, 29155, 29160, 29165, 29170, - 29175, 29180, 29185, 29189, 29194, 0, 29199, 29204, 29209, 29214, 29220, - 29226, 29232, 29238, 29243, 29248, 29254, 29261, 0, 0, 0, 0, 29268, - 29273, 29279, 29285, 29291, 29297, 29302, 29307, 29313, 29319, 29324, - 29329, 0, 0, 0, 0, 29334, 0, 0, 0, 29339, 29344, 29349, 29354, 29358, - 29362, 29366, 29370, 29374, 29378, 29383, 29387, 29392, 29397, 29403, - 29409, 29415, 29421, 29426, 29432, 29438, 29444, 29449, 29455, 29460, - 29466, 29472, 29477, 29483, 29489, 29495, 29501, 29506, 29511, 29517, - 29523, 29528, 29534, 29539, 29545, 29550, 29556, 0, 0, 29562, 29568, - 29574, 29580, 29586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29592, 29601, - 29610, 29618, 29627, 29636, 29644, 29653, 29662, 29671, 29680, 29688, - 29697, 29706, 29714, 29723, 29732, 29741, 29750, 29759, 29768, 29776, - 29785, 29793, 29801, 29810, 29818, 29827, 29836, 29845, 29854, 29863, - 29872, 29880, 29889, 29898, 29906, 29915, 29924, 29933, 29942, 29951, - 29960, 29969, 0, 0, 0, 0, 29978, 29988, 29997, 30006, 30014, 30023, - 30031, 30040, 30048, 30057, 30066, 30075, 30084, 30093, 30102, 30111, - 30120, 30129, 30138, 30147, 30156, 30165, 30174, 30183, 30192, 30200, 0, - 0, 0, 0, 0, 0, 30208, 30216, 30223, 30230, 30237, 30244, 30251, 30258, - 30266, 30273, 30281, 0, 0, 0, 30289, 30297, 30305, 30309, 30315, 30321, - 30327, 30333, 30339, 30345, 30351, 30357, 30363, 30369, 30375, 30381, - 30387, 30393, 30399, 30403, 30409, 30415, 30421, 30427, 30433, 30439, - 30445, 30451, 30457, 30463, 30469, 30475, 30481, 30487, 30493, 30497, - 30502, 30507, 30512, 30516, 30521, 30525, 30530, 30535, 30540, 30545, - 30550, 30555, 30560, 30565, 30570, 30574, 30579, 30584, 30589, 30594, - 30598, 30602, 30607, 30612, 30617, 30622, 0, 0, 30628, 30632, 30639, - 30644, 30650, 30656, 30661, 30667, 30673, 30678, 30684, 30690, 30696, - 30702, 30708, 30713, 30718, 30724, 30729, 30735, 30740, 30746, 30752, - 30758, 30764, 30769, 30774, 30779, 30785, 30791, 30796, 30802, 30808, - 30812, 30817, 30822, 30827, 30832, 30837, 30842, 30847, 30853, 30859, - 30865, 30870, 30875, 30879, 30884, 30888, 30893, 30897, 30902, 30907, - 30912, 30917, 30924, 30931, 30938, 30948, 30957, 30964, 30970, 30981, - 30986, 30992, 0, 30998, 31003, 31008, 31016, 31022, 31030, 31035, 31041, - 31047, 31053, 31058, 31064, 31069, 31076, 31082, 31087, 31093, 31099, - 31105, 31112, 31119, 31126, 31131, 31136, 31143, 31150, 31157, 31164, - 31171, 0, 0, 31178, 31185, 31192, 31198, 31204, 31210, 31216, 31222, - 31228, 31235, 31241, 0, 0, 0, 0, 0, 0, 31248, 31254, 31259, 31264, 31269, - 31274, 31279, 31284, 31290, 31295, 0, 0, 0, 0, 0, 0, 31301, 31306, 31311, - 31316, 31321, 31326, 31331, 31340, 31347, 31352, 31357, 31362, 31367, - 31372, 0, 0, 31377, 31384, 31387, 31390, 31393, 31398, 31402, 31408, - 31412, 31417, 31424, 31432, 31436, 31441, 31445, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 18049, 18053, 18064, 18079, 18094, 18104, 18115, + 18128, 18139, 18145, 18153, 18163, 18169, 18177, 18181, 18187, 18193, + 18201, 18211, 18219, 18232, 18238, 18246, 18254, 18266, 18273, 18281, + 18289, 18297, 18305, 18313, 18321, 18331, 18335, 18338, 18341, 18344, + 18347, 18350, 18353, 18357, 18360, 18364, 18368, 18372, 18376, 18380, + 18384, 18388, 18393, 18397, 18402, 18407, 18413, 18423, 18437, 18447, + 18453, 18459, 18467, 18475, 18483, 18491, 18497, 18503, 18506, 18510, + 18514, 18518, 18522, 18526, 18530, 0, 18534, 18538, 18542, 18546, 18550, + 18554, 18558, 18562, 18566, 18570, 18574, 18577, 18580, 18584, 18588, + 18592, 18595, 18599, 18603, 18607, 18611, 18615, 18619, 18623, 18627, + 18630, 18634, 18637, 18641, 18645, 18649, 18652, 18655, 18659, 18665, + 18669, 0, 0, 0, 0, 18673, 18678, 18682, 18687, 18691, 18696, 18701, + 18707, 18712, 18718, 18722, 18727, 18731, 18736, 18746, 18752, 18758, + 18765, 18775, 18781, 18785, 18789, 18795, 18801, 18809, 18815, 18823, + 18831, 18839, 18849, 18857, 18867, 18872, 18878, 18884, 18890, 18896, + 18902, 18908, 0, 18914, 18920, 18926, 18932, 18938, 18944, 18950, 18956, + 18962, 18968, 18974, 18979, 18984, 18990, 18996, 19002, 19007, 19013, + 19019, 19025, 19031, 19037, 19043, 19049, 19055, 19060, 19066, 19071, + 19077, 19083, 19089, 19094, 19099, 19105, 19113, 19120, 0, 19128, 19135, + 19148, 19155, 19162, 19170, 19178, 19184, 19190, 19196, 19206, 19211, + 19217, 19227, 19237, 0, 19247, 19257, 19265, 19277, 19289, 19295, 19309, + 19324, 19329, 19334, 19342, 19350, 19358, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 19366, 19369, 19373, 19377, 19381, 19385, 19389, 19393, 19397, + 19401, 19405, 19409, 19413, 19417, 19421, 19425, 19429, 19433, 19437, + 19441, 19445, 19448, 19451, 19455, 19459, 19463, 19466, 19469, 19473, + 19476, 19480, 19484, 19487, 19491, 19494, 19499, 19502, 19506, 19509, + 19513, 19516, 19521, 19524, 19528, 19535, 19540, 19544, 19549, 19553, + 19558, 19562, 19567, 19574, 19580, 19585, 19589, 19593, 19597, 19601, + 19605, 19610, 19616, 19622, 19627, 19633, 19637, 19640, 19643, 19646, + 19649, 19652, 19655, 19659, 19662, 19666, 19672, 19676, 19680, 19684, + 19688, 19692, 19696, 19700, 19704, 19709, 19713, 19718, 19723, 19729, + 19734, 19740, 19746, 19752, 19758, 19764, 19771, 19778, 19785, 19793, + 19802, 19811, 19822, 19832, 19842, 19853, 19864, 19874, 19884, 19894, + 19904, 19914, 19924, 19934, 19944, 19952, 19959, 19965, 19972, 19977, + 19983, 19989, 19995, 20001, 20007, 20013, 20018, 20024, 20030, 20036, + 20042, 20047, 20055, 20062, 20068, 20075, 20083, 20089, 20095, 20101, + 20107, 20115, 20123, 20133, 20141, 20149, 20155, 20160, 20165, 20170, + 20175, 20180, 20185, 20191, 20196, 20202, 20208, 20214, 20220, 20227, + 20232, 20238, 20243, 20248, 20253, 20258, 20263, 20268, 20273, 20278, + 20283, 20288, 20293, 20298, 20303, 20308, 20313, 20318, 20323, 20328, + 20333, 20338, 20343, 20348, 20353, 20358, 20363, 20368, 20373, 20378, + 20383, 20388, 20393, 20398, 20403, 20408, 20413, 20418, 20423, 0, 20428, + 0, 0, 0, 0, 0, 20433, 0, 0, 20438, 20442, 20446, 20450, 20454, 20458, + 20462, 20466, 20470, 20474, 20478, 20482, 20486, 20490, 20494, 20498, + 20502, 20506, 20510, 20514, 20518, 20522, 20526, 20530, 20534, 20538, + 20542, 20546, 20550, 20554, 20558, 20562, 20566, 20570, 20574, 20578, + 20582, 20586, 20590, 20594, 20598, 20602, 20608, 20612, 20617, 20622, + 20626, 20631, 20636, 20640, 20644, 20648, 20652, 20656, 20660, 20664, + 20668, 20672, 20676, 20680, 20684, 20688, 20692, 20696, 20700, 20704, + 20708, 20712, 20716, 20720, 20724, 20728, 20732, 20736, 20740, 20744, + 20748, 20752, 20756, 20760, 20764, 20768, 20772, 20776, 20780, 20784, + 20788, 20792, 20796, 20800, 20804, 20808, 20812, 20816, 20820, 20824, + 20828, 20832, 20836, 20840, 20844, 20848, 20852, 20856, 20860, 20864, + 20868, 20872, 20876, 20880, 20884, 20888, 20892, 20896, 20900, 20904, + 20908, 20912, 20916, 20920, 20924, 20928, 20932, 20936, 20940, 20944, + 20948, 20952, 20956, 20960, 20964, 20968, 20972, 20976, 20980, 20984, + 20988, 20992, 20996, 21000, 21004, 21008, 21012, 21016, 21020, 21024, + 21027, 21031, 21034, 21038, 21042, 21045, 21049, 21053, 21056, 21060, + 21064, 21068, 21072, 21075, 21079, 21083, 21087, 21091, 21095, 21099, + 21102, 21106, 21110, 21114, 21118, 21122, 21126, 21130, 21134, 21138, + 21142, 21146, 21150, 21154, 21158, 21162, 21166, 21170, 21174, 21178, + 21182, 21186, 21190, 21194, 21198, 21202, 21206, 21210, 21214, 21218, + 21222, 21226, 21230, 21234, 21238, 21242, 21246, 21250, 21254, 21258, + 21262, 21266, 21270, 21274, 21278, 21282, 21286, 21290, 21294, 21298, + 21302, 21306, 21310, 21314, 21318, 21322, 21326, 21330, 21334, 21338, + 21342, 21346, 21350, 21354, 21358, 21362, 21366, 21370, 21374, 21378, + 21382, 21386, 21390, 21394, 21398, 21402, 21406, 21410, 21414, 21418, + 21422, 21426, 21430, 21434, 21438, 21442, 21446, 21450, 21454, 21458, + 21462, 21466, 21470, 21474, 21478, 21482, 21486, 21490, 21494, 21498, + 21502, 21506, 21510, 21514, 21518, 21522, 21526, 21530, 21534, 21538, + 21542, 21546, 21550, 21554, 21558, 21562, 21566, 21570, 21574, 21578, + 21582, 21586, 21590, 21594, 21598, 21602, 21606, 21610, 21614, 21618, + 21622, 21626, 21630, 21634, 21638, 21642, 21646, 21650, 21654, 21657, + 21661, 21665, 21669, 21673, 21677, 21681, 21685, 21688, 21692, 21696, + 21700, 21704, 21708, 21712, 21716, 21720, 21724, 21728, 21732, 21736, + 21740, 21744, 21748, 21751, 21755, 21759, 21763, 21767, 21771, 21775, + 21779, 21783, 21787, 21791, 21795, 21799, 21803, 21807, 21811, 21815, + 21819, 21823, 21827, 21831, 21835, 21839, 21843, 21847, 21851, 21855, + 21859, 21863, 21867, 21871, 21875, 21879, 21883, 21887, 21891, 21895, + 21899, 21903, 21907, 21911, 21915, 21919, 21923, 21927, 21931, 21935, + 21939, 0, 21943, 21947, 21951, 21955, 0, 0, 21959, 21963, 21967, 21971, + 21975, 21979, 21983, 0, 21987, 0, 21991, 21995, 21999, 22003, 0, 0, + 22007, 22011, 22015, 22019, 22023, 22027, 22031, 22035, 22039, 22043, + 22047, 22051, 22055, 22059, 22063, 22067, 22071, 22075, 22079, 22083, + 22087, 22091, 22095, 22098, 22102, 22106, 22110, 22114, 22118, 22122, + 22126, 22130, 22134, 22138, 22142, 22146, 22150, 22154, 22158, 22162, + 22166, 0, 22170, 22174, 22178, 22182, 0, 0, 22186, 22189, 22193, 22197, + 22201, 22205, 22209, 22213, 22217, 22221, 22225, 22229, 22233, 22237, + 22241, 22245, 22249, 22254, 22259, 22264, 22270, 22276, 22281, 22286, + 22292, 22295, 22299, 22303, 22307, 22311, 22315, 22319, 22323, 0, 22327, + 22331, 22335, 22339, 0, 0, 22343, 22347, 22351, 22355, 22359, 22363, + 22367, 0, 22371, 0, 22375, 22379, 22383, 22387, 0, 0, 22391, 22395, + 22399, 22403, 22407, 22411, 22415, 22419, 22423, 22428, 22433, 22438, + 22444, 22450, 22455, 0, 22460, 22464, 22468, 22472, 22476, 22480, 22484, + 22488, 22492, 22496, 22500, 22504, 22508, 22512, 22516, 22520, 22524, + 22527, 22531, 22535, 22539, 22543, 22547, 22551, 22555, 22559, 22563, + 22567, 22571, 22575, 22579, 22583, 22587, 22591, 22595, 22599, 22603, + 22607, 22611, 22615, 22619, 22623, 22627, 22631, 22635, 22639, 22643, + 22647, 22651, 22655, 22659, 22663, 22667, 22671, 22675, 22679, 22683, 0, + 22687, 22691, 22695, 22699, 0, 0, 22703, 22707, 22711, 22715, 22719, + 22723, 22727, 22731, 22735, 22739, 22743, 22747, 22751, 22755, 22759, + 22763, 22767, 22771, 22775, 22779, 22783, 22787, 22791, 22795, 22799, + 22803, 22807, 22811, 22815, 22819, 22823, 22827, 22831, 22835, 22839, + 22843, 22847, 22851, 22855, 22859, 22863, 22867, 22871, 22875, 22879, + 22883, 22887, 22891, 22895, 22899, 22903, 22907, 22911, 22915, 22919, + 22923, 22927, 22930, 22934, 22938, 22942, 22946, 22950, 22954, 22958, + 22962, 22966, 0, 0, 22970, 22979, 22985, 22990, 22994, 22997, 23002, + 23005, 23008, 23011, 23016, 23020, 23025, 23028, 23031, 23034, 23037, + 23040, 23043, 23047, 23050, 23054, 23058, 23062, 23066, 23070, 23074, + 23078, 23082, 23086, 23090, 23094, 0, 0, 0, 23100, 23106, 23110, 23114, + 23118, 23124, 23128, 23132, 23136, 23142, 23146, 23150, 23154, 23160, + 23164, 23168, 23172, 23178, 23184, 23190, 23198, 23204, 23210, 23216, + 23222, 23228, 0, 0, 0, 0, 0, 0, 23234, 23237, 23240, 23243, 23246, 23249, + 23253, 23257, 23260, 23264, 23268, 23272, 23276, 23280, 23283, 23287, + 23291, 23295, 23299, 23303, 23306, 23310, 23314, 23318, 23322, 23326, + 23329, 23333, 23337, 23341, 23345, 23348, 23352, 23356, 23360, 23364, + 23368, 23372, 23376, 23380, 23384, 23388, 23392, 23396, 23400, 23404, + 23408, 23412, 23416, 23420, 23424, 23428, 23432, 23436, 23440, 23444, + 23448, 23452, 23456, 23460, 23464, 23468, 23472, 23476, 23480, 23484, + 23488, 23492, 23496, 23500, 23504, 23508, 23512, 23516, 23520, 23524, + 23528, 23532, 23536, 23540, 23543, 23547, 23551, 23555, 23559, 23563, 0, + 0, 23567, 23572, 23577, 23582, 23587, 23592, 0, 0, 23597, 23601, 23604, + 23608, 23611, 23615, 23618, 23622, 23628, 23633, 23637, 23640, 23644, + 23648, 23654, 23658, 23664, 23668, 23674, 23678, 23684, 23688, 23694, + 23700, 23704, 23710, 23714, 23720, 23726, 23730, 23736, 23742, 23746, + 23751, 23759, 23767, 23774, 23779, 23784, 23793, 23799, 23807, 23812, + 23818, 23822, 23826, 23830, 23834, 23838, 23842, 23846, 23850, 23854, + 23858, 23864, 23869, 23874, 23877, 23881, 23885, 23891, 23895, 23901, + 23905, 23911, 23915, 23921, 23925, 23931, 23935, 23941, 23945, 23951, + 23957, 23961, 23967, 23972, 23976, 23980, 23984, 23988, 23991, 23995, + 24001, 24006, 24011, 24015, 24019, 24023, 24029, 24033, 24039, 24043, + 24049, 24052, 24057, 24061, 24067, 24071, 24077, 24081, 24087, 24093, + 24097, 24101, 24105, 24109, 24113, 24117, 24121, 24125, 24129, 24133, + 24137, 24143, 24146, 24150, 24154, 24160, 24164, 24170, 24174, 24180, + 24184, 24190, 24194, 24200, 24204, 24210, 24214, 24220, 24226, 24230, + 24234, 24240, 24246, 24252, 24258, 24262, 24266, 24270, 24274, 24278, + 24282, 24288, 24292, 24296, 24300, 24306, 24310, 24316, 24320, 24326, + 24330, 24336, 24340, 24346, 24350, 24356, 24360, 24366, 24372, 24376, + 24382, 24386, 24390, 24394, 24398, 24402, 24406, 24412, 24415, 24419, + 24423, 24429, 24433, 24439, 24443, 24449, 24453, 24459, 24463, 24469, + 24473, 24479, 24483, 24489, 24495, 24499, 24505, 24509, 24515, 24521, + 24525, 24529, 24533, 24537, 24541, 24545, 24551, 24554, 24558, 24562, + 24568, 24572, 24578, 24582, 24588, 24594, 24598, 24603, 24607, 24611, + 24615, 24619, 24623, 24627, 24631, 24637, 24640, 24644, 24648, 24654, + 24658, 24664, 24668, 24674, 24678, 24684, 24688, 24694, 24698, 24704, + 24708, 24714, 24717, 24722, 24726, 24730, 24734, 24738, 24742, 24746, + 24750, 24756, 24760, 24764, 24768, 24774, 24778, 24784, 24788, 24794, + 24798, 24804, 24808, 24814, 24818, 24824, 24828, 24834, 24840, 24844, + 24850, 24854, 24860, 24866, 24872, 24878, 24884, 24890, 24896, 24902, + 24906, 24910, 24914, 24918, 24922, 24926, 24930, 24934, 24940, 24944, + 24950, 24954, 24960, 24964, 24970, 24974, 24980, 24984, 24990, 24994, + 25000, 25004, 25008, 25012, 25016, 25020, 25024, 25028, 25034, 25037, + 25041, 25045, 25051, 25055, 25061, 25065, 25071, 25075, 25081, 25085, + 25091, 25095, 25101, 25105, 25111, 25117, 25121, 25127, 25133, 25139, + 25143, 25149, 25155, 25159, 25163, 25167, 25171, 25175, 25181, 25185, + 25189, 25194, 25198, 25204, 25207, 25212, 25216, 25220, 25224, 25228, + 25232, 25236, 25240, 25244, 25248, 25252, 25258, 25262, 25266, 25272, + 25276, 25282, 25286, 25292, 25296, 25300, 25304, 25308, 25312, 25318, + 25322, 25326, 25330, 25334, 25338, 25342, 25346, 25350, 25354, 25358, + 25364, 25370, 25376, 25382, 25388, 25393, 25399, 25405, 25411, 25415, + 25419, 25423, 25427, 25431, 25435, 25439, 25443, 25447, 25451, 25455, + 25459, 25463, 25469, 25475, 25481, 25487, 25491, 25495, 25499, 25503, + 25507, 25511, 25515, 25519, 25523, 25529, 25535, 25541, 25547, 25553, + 25559, 25565, 25571, 25577, 25581, 25585, 25589, 25593, 25597, 25601, + 25605, 25611, 25617, 25623, 25629, 25635, 25641, 25647, 25653, 25659, + 25664, 25669, 25674, 25679, 25685, 25691, 25697, 25703, 25709, 25715, + 25721, 25726, 25732, 25738, 25744, 25749, 25755, 25761, 25767, 25772, + 25777, 25782, 25787, 25792, 25797, 25802, 25807, 25812, 25817, 25822, + 25827, 25832, 25837, 25842, 25847, 25852, 25857, 25862, 25867, 25872, + 25877, 25882, 25887, 25892, 25897, 25902, 25907, 25912, 25917, 25922, + 25927, 25932, 25937, 25942, 25947, 25952, 25957, 25962, 25967, 25972, + 25977, 25981, 25986, 25991, 25996, 26001, 26006, 26011, 26016, 26021, + 26026, 26031, 26036, 26041, 26046, 26051, 26056, 26061, 26066, 26071, + 26076, 26081, 26086, 26091, 26096, 26101, 26106, 26110, 26115, 26120, + 26125, 26130, 26135, 26139, 26144, 26149, 26154, 26159, 26164, 26168, + 26173, 26179, 26184, 26189, 26194, 26199, 26205, 26210, 26215, 26220, + 26225, 26230, 26235, 26240, 26245, 26250, 26255, 26260, 26265, 26269, + 26274, 26279, 26284, 26289, 26294, 26299, 26304, 26309, 26314, 26319, + 26324, 26329, 26334, 26339, 26344, 26349, 26354, 26359, 26364, 26369, + 26374, 26379, 26384, 26389, 26394, 26399, 26404, 26409, 26414, 26419, + 26424, 26430, 26435, 26440, 26445, 26450, 26455, 26460, 26465, 26470, + 26475, 26480, 26485, 26490, 26495, 26500, 26505, 26510, 26515, 26520, + 26525, 26530, 26535, 26540, 26545, 26550, 26555, 26560, 26565, 26570, + 26575, 26580, 26585, 26590, 26595, 26600, 26605, 26610, 26615, 26620, + 26626, 26630, 26634, 26638, 26642, 26646, 26650, 26654, 26658, 26664, + 26670, 26676, 26682, 26688, 26694, 26700, 26707, 26713, 26718, 26723, + 26728, 26733, 26738, 26743, 26748, 26753, 26758, 26763, 26768, 26773, + 26778, 26783, 26788, 26793, 26798, 26803, 26808, 26813, 26818, 26823, + 26828, 26833, 26838, 26843, 26848, 26853, 0, 0, 0, 26860, 26871, 26876, + 26884, 26889, 26894, 26899, 26908, 26913, 26919, 26925, 26931, 26936, + 26942, 26948, 26952, 26957, 26962, 26972, 26977, 26982, 26989, 26994, + 26999, 27008, 27013, 27022, 27029, 27036, 27043, 27050, 27061, 27068, + 27073, 27083, 27087, 27094, 27099, 27106, 27112, 27119, 27128, 27135, + 27142, 27151, 27158, 27163, 27168, 27179, 27186, 27191, 27202, 27209, + 27214, 27219, 27227, 27236, 27243, 27250, 27260, 27265, 27270, 27275, + 27284, 27292, 27297, 27302, 27307, 27312, 27317, 27322, 27327, 27332, + 27337, 27342, 27347, 27353, 27359, 27365, 27370, 27375, 27380, 27385, + 27390, 27395, 27404, 27413, 27422, 27431, 0, 0, 0, 0, 0, 0, 0, 27440, + 27444, 27448, 27452, 27456, 27461, 27466, 27471, 27476, 27480, 27484, + 27489, 27493, 0, 27497, 27501, 27506, 27511, 27515, 27520, 27525, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 27530, 27534, 27538, 27542, 27546, 27551, + 27556, 27561, 27566, 27570, 27574, 27579, 27583, 27587, 27592, 27596, + 27601, 27606, 27610, 27615, 27620, 27625, 27631, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 27636, 27640, 27644, 27648, 27652, 27657, 27662, 27667, 27672, 27676, + 27680, 27685, 27689, 27693, 27698, 27702, 27707, 27712, 27716, 27721, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27726, 27730, 27734, 27738, 27742, + 27747, 27752, 27757, 27762, 27766, 27770, 27775, 27779, 0, 27783, 27787, + 27792, 0, 27797, 27802, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27807, 27810, + 27814, 27818, 27822, 27826, 27830, 27834, 27838, 27842, 27846, 27850, + 27854, 27858, 27862, 27866, 27870, 27874, 27877, 27881, 27885, 27889, + 27893, 27897, 27901, 27905, 27909, 27913, 27917, 27921, 27925, 27929, + 27933, 27936, 27939, 27943, 27949, 27955, 27961, 27967, 27973, 27979, + 27985, 27991, 27997, 28003, 28009, 28015, 28021, 28027, 28036, 28045, + 28051, 28057, 28063, 28068, 28072, 28077, 28082, 28087, 28091, 28096, + 28101, 28106, 28110, 28115, 28119, 28124, 28129, 28134, 28139, 28143, + 28147, 28151, 28155, 28159, 28163, 28167, 28171, 28175, 28179, 28185, + 28189, 28193, 28197, 28201, 28205, 28213, 28219, 28223, 28229, 28233, + 28239, 28243, 0, 0, 28247, 28251, 28254, 28257, 28260, 28263, 28266, + 28269, 28273, 28276, 0, 0, 0, 0, 0, 0, 28280, 28288, 28296, 28304, 28312, + 28320, 28328, 28336, 28344, 28352, 0, 0, 0, 0, 0, 0, 28360, 28363, 28366, + 28369, 28374, 28377, 28382, 28389, 28397, 28402, 28409, 28412, 28419, + 28426, 28433, 0, 28437, 28441, 28444, 28447, 28450, 28453, 28456, 28459, + 28463, 28466, 0, 0, 0, 0, 0, 0, 28470, 28473, 28476, 28479, 28482, 28485, + 28489, 28493, 28497, 28500, 28504, 28508, 28511, 28515, 28519, 28522, + 28525, 28529, 28533, 28537, 28541, 28545, 28549, 28552, 28556, 28560, + 28564, 28567, 28571, 28575, 28579, 28583, 28587, 28591, 28595, 28599, + 28606, 28611, 28616, 28621, 28626, 28632, 28638, 28644, 28650, 28655, + 28661, 28667, 28672, 28678, 28684, 28690, 28696, 28702, 28707, 28713, + 28718, 28724, 28730, 28736, 28742, 28748, 28753, 28758, 28764, 28770, + 28775, 28781, 28786, 28792, 28797, 28802, 28808, 28814, 28820, 28826, + 28832, 28838, 28844, 28850, 28856, 28862, 28868, 28874, 28879, 28884, + 28890, 28896, 0, 0, 0, 0, 0, 0, 0, 0, 28902, 28911, 28920, 28928, 28936, + 28946, 28954, 28963, 28970, 28977, 28984, 28992, 29000, 29008, 29016, + 29024, 29032, 29040, 29048, 29055, 29063, 29071, 29079, 29087, 29095, + 29105, 29115, 29125, 29135, 29145, 29155, 29165, 29175, 29185, 29195, + 29205, 29215, 29225, 29235, 29243, 29251, 29261, 29269, 0, 0, 0, 0, 0, + 29279, 29283, 29287, 29291, 29295, 29299, 29303, 29307, 29311, 29315, + 29319, 29323, 29327, 29331, 29335, 29339, 29343, 29347, 29351, 29355, + 29359, 29363, 29367, 29371, 29377, 29381, 29387, 29391, 29397, 29401, + 29407, 29411, 29415, 29419, 29423, 29427, 29431, 29437, 29443, 29449, + 29455, 29461, 29467, 29473, 29479, 29485, 29491, 29497, 29504, 29510, + 29516, 29522, 29526, 29530, 29534, 29538, 29542, 29546, 29550, 29556, + 29562, 29568, 29573, 29580, 29585, 29590, 29596, 29601, 29608, 29615, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 29622, 29628, 29632, 29637, 29642, 29647, + 29652, 29657, 29662, 29667, 29672, 29677, 29682, 29687, 29692, 29697, + 29701, 29705, 29710, 29715, 29720, 29724, 29728, 29733, 29737, 29742, + 29747, 29752, 29757, 29761, 29766, 0, 29771, 29776, 29781, 29786, 29792, + 29798, 29804, 29810, 29815, 29820, 29826, 29833, 0, 0, 0, 0, 29840, + 29845, 29851, 29857, 29863, 29868, 29873, 29878, 29884, 29889, 29894, + 29899, 0, 0, 0, 0, 29904, 0, 0, 0, 29909, 29914, 29919, 29924, 29928, + 29932, 29936, 29940, 29944, 29948, 29953, 29957, 29962, 29967, 29973, + 29979, 29985, 29991, 29996, 30002, 30008, 30013, 30018, 30024, 30029, + 30035, 30041, 30046, 30052, 30058, 30064, 30069, 30074, 30079, 30085, + 30091, 30096, 30102, 30107, 30113, 30118, 30124, 0, 0, 30130, 30136, + 30142, 30148, 30154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30160, 30169, + 30178, 30186, 30195, 30204, 30212, 30221, 30230, 30239, 30248, 30256, + 30265, 30274, 30282, 30291, 30300, 30308, 30317, 30326, 30334, 30342, + 30351, 30359, 30367, 30376, 30384, 30393, 30402, 30410, 30419, 30428, + 30436, 30444, 30453, 30462, 30470, 30479, 30488, 30497, 30506, 30515, + 30524, 30533, 0, 0, 0, 0, 30542, 30552, 30561, 30570, 30578, 30587, + 30595, 30604, 30612, 30621, 30630, 30639, 30648, 30657, 30666, 30675, + 30684, 30693, 30702, 30711, 30720, 30729, 30738, 30747, 30756, 30764, 0, + 0, 0, 0, 0, 0, 30772, 30780, 30787, 30794, 30801, 30808, 30815, 30822, + 30830, 30837, 30845, 0, 0, 0, 30853, 30861, 30869, 30873, 30879, 30885, + 30891, 30897, 30903, 30909, 30915, 30921, 30927, 30933, 30939, 30945, + 30951, 30957, 30963, 30967, 30973, 30979, 30985, 30991, 30997, 31003, + 31009, 31015, 31021, 31027, 31033, 31039, 31045, 31051, 31057, 31061, + 31066, 31071, 31076, 31080, 31085, 31089, 31094, 31099, 31104, 31108, + 31113, 31118, 31123, 31128, 31133, 31137, 31142, 31146, 31151, 31156, + 31160, 31164, 31169, 31174, 31179, 31184, 0, 0, 31190, 31194, 31201, + 31206, 31212, 31218, 31223, 31229, 31235, 31240, 31246, 31252, 31258, + 31264, 31270, 31275, 31280, 31286, 31291, 31297, 31302, 31308, 31314, + 31320, 31326, 31330, 31335, 31340, 31346, 31352, 31357, 31363, 31369, + 31373, 31378, 31383, 31388, 31393, 31397, 31402, 31407, 31413, 31419, + 31425, 31430, 31435, 31439, 31444, 31448, 31453, 31457, 31462, 31467, + 31472, 31477, 31484, 31491, 31497, 31507, 31516, 31523, 31529, 31540, + 31545, 31551, 0, 31557, 31562, 31567, 31575, 31581, 31589, 31594, 31600, + 31606, 31612, 31617, 31623, 31628, 31635, 31641, 31646, 31652, 31658, + 31664, 31671, 31678, 31685, 31690, 31695, 31702, 31709, 31716, 31723, + 31730, 0, 0, 31737, 31744, 31751, 31757, 31763, 31769, 31775, 31781, + 31787, 31794, 31800, 0, 0, 0, 0, 0, 0, 31807, 31813, 31818, 31823, 31828, + 31833, 31838, 31843, 31849, 31854, 0, 0, 0, 0, 0, 0, 31860, 31865, 31870, + 31875, 31880, 31885, 31890, 31899, 31906, 31911, 31916, 31921, 31926, + 31931, 0, 0, 31936, 31943, 31946, 31949, 31952, 31957, 31961, 31967, + 31971, 31976, 31983, 31991, 31995, 32000, 32004, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 31450, 31456, 31462, 31466, 31470, 31474, - 31478, 31484, 31488, 31494, 31498, 31504, 31510, 31518, 31524, 31532, - 31536, 31540, 31544, 31550, 31553, 31559, 31563, 31569, 31573, 31577, - 31583, 31587, 31593, 31597, 31603, 31611, 31619, 31627, 31633, 31637, - 31643, 31647, 31653, 31657, 31660, 31666, 31670, 31676, 31679, 31682, - 31686, 31690, 31694, 31700, 31706, 31710, 31713, 31717, 31722, 31727, - 31734, 31739, 31746, 31753, 31762, 31769, 31778, 31783, 31790, 31797, - 31806, 31811, 31818, 31823, 31829, 31835, 31841, 31847, 31853, 31859, 0, - 0, 0, 0, 31865, 31869, 31872, 31875, 31878, 31881, 31884, 31887, 31891, - 31894, 31898, 31901, 31904, 31907, 31912, 31917, 31922, 31925, 31930, - 31935, 31940, 31945, 31952, 31957, 31962, 31967, 31972, 31979, 31985, - 31991, 31997, 32003, 32009, 32018, 32027, 32033, 32039, 32047, 32055, - 32064, 32073, 32081, 32089, 32098, 32107, 0, 0, 0, 32115, 32120, 32125, - 32130, 32134, 32138, 32142, 32147, 32151, 32155, 32160, 32164, 32169, - 32174, 32179, 32184, 32189, 32194, 32199, 32204, 32209, 32214, 32218, - 32223, 32228, 32233, 32237, 32241, 32246, 32251, 32256, 32261, 32266, - 32270, 32276, 32282, 32288, 32294, 32300, 32306, 32312, 32318, 32324, - 32329, 32334, 32341, 32349, 32354, 32359, 32364, 32368, 32372, 32376, - 32380, 32384, 32388, 32393, 32397, 32402, 32406, 32411, 32416, 32421, - 32427, 32433, 32437, 32443, 32447, 32453, 32459, 32464, 32471, 32475, - 32481, 32486, 32493, 32498, 32505, 32512, 32517, 32524, 32529, 32534, - 32539, 32546, 32550, 32556, 32563, 32570, 32575, 32582, 32589, 32593, - 32599, 32604, 32609, 32616, 32621, 32626, 32631, 32636, 32640, 32644, - 32649, 32654, 32661, 32667, 32672, 32679, 32684, 32691, 32696, 32706, - 32712, 32718, 32722, 0, 0, 0, 0, 0, 0, 0, 0, 32726, 32735, 32742, 32749, - 32756, 32760, 32765, 32770, 32775, 32780, 32785, 32790, 32795, 32800, - 32805, 32810, 32815, 32820, 32825, 32829, 32834, 32839, 32844, 32849, - 32854, 32859, 32863, 32868, 32873, 32878, 32883, 32887, 32892, 32897, - 32901, 32906, 32911, 32916, 32921, 32926, 32930, 32936, 32943, 32949, - 32954, 32959, 32965, 32970, 32976, 32981, 32987, 32993, 32998, 33004, - 33010, 33015, 33021, 33027, 33033, 33038, 0, 0, 0, 33043, 33049, 33059, - 33065, 33073, 33079, 33084, 33088, 33092, 33096, 33100, 33104, 33108, - 33113, 33117, 0, 0, 0, 33122, 33127, 33132, 33137, 33144, 33150, 33156, - 33162, 33168, 33174, 33180, 33187, 33193, 33200, 33207, 33214, 33221, - 33228, 33235, 33242, 33249, 33256, 33263, 33270, 33277, 33284, 33291, - 33298, 33305, 33312, 33319, 33326, 33333, 33340, 33347, 33354, 33361, - 33368, 33375, 33382, 33389, 33396, 33403, 33410, 33418, 33426, 33434, - 33440, 33446, 33452, 33460, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 32009, 32015, 32021, 32025, 32029, 32033, + 32037, 32043, 32047, 32053, 32057, 32063, 32069, 32077, 32083, 32091, + 32095, 32099, 32103, 32109, 32112, 32118, 32122, 32128, 32132, 32136, + 32142, 32146, 32152, 32156, 32162, 32170, 32178, 32186, 32192, 32196, + 32202, 32206, 32212, 32215, 32218, 32224, 32228, 32234, 32237, 32240, + 32244, 32247, 32251, 32257, 32263, 32267, 32270, 32274, 32279, 32284, + 32291, 32296, 32303, 32310, 32319, 32326, 32335, 32340, 32347, 32354, + 32363, 32368, 32375, 32380, 32386, 32392, 32398, 32404, 32410, 32416, 0, + 0, 0, 0, 32422, 32426, 32429, 32432, 32435, 32438, 32441, 32444, 32448, + 32451, 32455, 32458, 32461, 32464, 32469, 32474, 32479, 32482, 32487, + 32492, 32497, 32502, 32509, 32514, 32519, 32524, 32529, 32536, 32542, + 32548, 32554, 32560, 32566, 32575, 32584, 32590, 32596, 32604, 32612, + 32621, 32630, 32638, 32646, 32655, 32664, 0, 0, 0, 32672, 32677, 32682, + 32687, 32691, 32695, 32699, 32704, 32708, 32712, 32717, 32721, 32726, + 32731, 32736, 32741, 32746, 32751, 32756, 32761, 32766, 32770, 32774, + 32779, 32784, 32789, 32793, 32797, 32802, 32806, 32811, 32816, 32821, + 32825, 32831, 32837, 32843, 32849, 32855, 32861, 32867, 32873, 32879, + 32884, 32889, 32896, 32904, 32909, 32914, 32919, 32923, 32927, 32931, + 32935, 32939, 32943, 32948, 32952, 32957, 32961, 32966, 32971, 32976, + 32982, 32988, 32992, 32998, 33002, 33008, 33014, 33019, 33026, 33030, + 33036, 33040, 33046, 33051, 33058, 33065, 33070, 33077, 33082, 33087, + 33092, 33099, 33103, 33109, 33116, 33123, 33128, 33135, 33142, 33146, + 33152, 33157, 33161, 33167, 33172, 33177, 33182, 33187, 33191, 33195, + 33200, 33205, 33212, 33218, 33223, 33230, 33235, 33242, 33247, 33257, + 33263, 33269, 33273, 0, 0, 0, 0, 0, 0, 0, 0, 33277, 33286, 33293, 33300, + 33307, 33311, 33316, 33321, 33326, 33331, 33336, 33341, 33346, 33351, + 33356, 33361, 33366, 33371, 33375, 33379, 33384, 33389, 33394, 33399, + 33404, 33409, 33413, 33418, 33423, 33428, 33433, 33437, 33442, 33446, + 33450, 33455, 33460, 33465, 33470, 33475, 33479, 33485, 33492, 33498, + 33503, 33508, 33514, 33519, 33525, 33530, 33536, 33542, 33547, 33553, + 33559, 33564, 33570, 33576, 33582, 33587, 0, 0, 0, 33592, 33598, 33608, + 33614, 33622, 33628, 33633, 33637, 33641, 33645, 33649, 33653, 33657, + 33662, 33666, 0, 0, 0, 33671, 33676, 33681, 33686, 33693, 33699, 33705, + 33711, 33717, 33723, 33729, 33736, 33742, 33749, 33755, 33762, 33769, + 33776, 33783, 33790, 33797, 33804, 33811, 33818, 33825, 33832, 33839, + 33846, 33853, 33860, 33867, 33874, 33881, 33888, 33895, 33902, 33909, + 33916, 33923, 33930, 33937, 33944, 33951, 33958, 33966, 33974, 33982, + 33988, 33994, 34000, 34008, 34017, 34024, 34031, 34037, 34044, 34051, + 34058, 34066, 34073, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 33469, 33477, 33485, 33493, 33501, 33511, 33521, 33531, 0, 0, 0, 0, 0, - 0, 0, 0, 33541, 33546, 33551, 33556, 33561, 33570, 33581, 33590, 33601, - 33607, 33620, 33626, 33633, 33640, 33645, 33651, 33657, 33668, 33677, - 33684, 33691, 33700, 33707, 33716, 33726, 33736, 33743, 33750, 33757, - 33767, 33772, 33780, 33786, 33794, 33803, 33808, 33815, 33821, 33826, 0, - 33831, 33837, 0, 0, 0, 0, 0, 0, 33844, 33849, 33855, 33862, 33870, 33876, - 33882, 33888, 33893, 33900, 33906, 33912, 33918, 33926, 33932, 33940, - 33945, 33951, 33957, 33964, 33972, 33979, 33985, 33992, 33999, 34005, - 34012, 34019, 34025, 34030, 34036, 34044, 34053, 34059, 34065, 34071, - 34077, 34085, 34089, 34095, 34101, 34107, 34113, 34119, 34125, 34129, - 34134, 34139, 34146, 34151, 34155, 34161, 34166, 34171, 34175, 34180, - 34185, 34189, 34194, 34199, 34206, 34210, 34215, 34220, 34224, 34229, - 34233, 34238, 34242, 34248, 34253, 34260, 34265, 34270, 34274, 34279, - 34284, 34291, 34296, 34302, 34307, 34312, 34317, 34321, 34326, 34333, - 34340, 34345, 34350, 34354, 34360, 34367, 34372, 34377, 34382, 34388, - 34393, 34399, 34404, 34410, 34416, 34422, 34429, 34436, 34443, 34450, - 34457, 34464, 34469, 34477, 34486, 34495, 34504, 34513, 34522, 34531, - 34543, 34552, 34561, 34570, 34577, 34582, 34589, 34597, 34605, 34612, - 34619, 34626, 34633, 34641, 34650, 34659, 34668, 34677, 34686, 34695, - 34704, 34713, 34722, 34731, 34740, 34749, 34758, 34767, 34775, 34784, - 34795, 34803, 34812, 34823, 34832, 34841, 34850, 34859, 34867, 34876, - 34883, 34888, 34896, 34901, 34908, 34913, 34922, 34928, 34935, 34942, - 34947, 34952, 34960, 34968, 34977, 34986, 34991, 34998, 35009, 35017, - 35026, 35032, 35038, 35043, 35050, 35055, 35064, 35069, 35074, 35079, - 35086, 35093, 35098, 35107, 35115, 35120, 35125, 35132, 35139, 35143, - 35147, 35150, 35153, 35156, 35159, 35162, 35165, 35172, 35175, 35178, - 35183, 35187, 35191, 35195, 35199, 35203, 35212, 35218, 35224, 35230, - 35238, 35246, 35252, 35258, 35265, 35271, 35276, 35282, 35289, 35295, - 35302, 35308, 35316, 35321, 35327, 35333, 35339, 35345, 35351, 35357, - 35363, 35374, 35384, 35390, 35396, 35406, 35412, 35420, 35428, 35436, 0, - 0, 0, 0, 0, 0, 35441, 35448, 35455, 35460, 35469, 35477, 35485, 35492, - 35499, 35506, 35513, 35521, 35529, 35539, 35549, 35557, 35565, 35573, - 35581, 35590, 35599, 35607, 35615, 35624, 35633, 35643, 35653, 35662, - 35671, 35679, 35687, 35695, 35703, 35713, 35723, 35731, 35739, 35747, - 35755, 35763, 35771, 35779, 35787, 35795, 35803, 35811, 35819, 35828, - 35837, 35846, 35855, 35865, 35875, 35882, 35889, 35897, 35905, 35914, - 35923, 35931, 35939, 35951, 35963, 35972, 35981, 35990, 35999, 36006, - 36013, 36021, 36029, 36037, 36045, 36053, 36061, 36069, 36077, 36086, - 36095, 36104, 36113, 36122, 36131, 36141, 36151, 36161, 36171, 36180, - 36189, 36196, 36203, 36211, 36219, 36227, 36235, 36243, 36251, 36263, - 36275, 36284, 36293, 36301, 36309, 36317, 36325, 36336, 36347, 36358, - 36369, 36381, 36393, 36401, 36409, 36417, 36425, 36434, 36443, 36452, - 36461, 36469, 36477, 36485, 36493, 36501, 36509, 36518, 36527, 36537, - 36547, 36555, 36563, 36571, 36579, 36587, 36595, 36602, 36609, 36617, - 36625, 36633, 36641, 36649, 36657, 36665, 36673, 36681, 36689, 36697, - 36705, 36713, 36721, 36729, 36737, 36746, 36755, 36764, 36772, 36781, - 36790, 36799, 36808, 36818, 36827, 36833, 36838, 36845, 36852, 36860, - 36868, 36877, 36886, 36896, 36906, 36917, 36928, 36938, 36948, 36958, - 36968, 36977, 36986, 36996, 37006, 37017, 37028, 37038, 37048, 37058, - 37068, 37075, 37082, 37090, 37098, 37105, 37112, 37121, 37130, 37140, - 37150, 37161, 37172, 37182, 37192, 37202, 37212, 37221, 37230, 37238, - 37246, 37253, 37260, 37268, 37276, 37285, 37294, 37304, 37314, 37325, - 37336, 37346, 37356, 37366, 37376, 37385, 37394, 37404, 37414, 37425, - 37436, 37446, 37456, 37466, 37476, 37483, 37490, 37498, 37506, 37515, - 37524, 37534, 37544, 37555, 37566, 37576, 37586, 37596, 37606, 37614, - 37622, 37630, 37638, 37647, 37656, 37664, 37672, 37679, 37686, 37693, - 37700, 37708, 37716, 37724, 37732, 37743, 37754, 37765, 37776, 37787, - 37798, 37806, 37814, 37825, 37836, 37847, 37858, 37869, 37880, 37888, - 37896, 37907, 37918, 37929, 0, 0, 37940, 37948, 37956, 37967, 37978, - 37989, 0, 0, 38000, 38008, 38016, 38027, 38038, 38049, 38060, 38071, - 38082, 38090, 38098, 38109, 38120, 38131, 38142, 38153, 38164, 38172, - 38180, 38191, 38202, 38213, 38224, 38235, 38246, 38254, 38262, 38273, - 38284, 38295, 38306, 38317, 38328, 38336, 38344, 38355, 38366, 38377, 0, - 0, 38388, 38396, 38404, 38415, 38426, 38437, 0, 0, 38448, 38456, 38464, - 38475, 38486, 38497, 38508, 38519, 0, 38530, 0, 38538, 0, 38549, 0, - 38560, 38571, 38579, 38587, 38598, 38609, 38620, 38631, 38642, 38653, - 38661, 38669, 38680, 38691, 38702, 38713, 38724, 38735, 38743, 38751, - 38759, 38767, 38775, 38783, 38791, 38799, 38807, 38815, 38823, 38831, - 38839, 0, 0, 38847, 38858, 38869, 38883, 38897, 38911, 38925, 38939, - 38953, 38964, 38975, 38989, 39003, 39017, 39031, 39045, 39059, 39070, - 39081, 39095, 39109, 39123, 39137, 39151, 39165, 39176, 39187, 39201, - 39215, 39229, 39243, 39257, 39271, 39282, 39293, 39307, 39321, 39335, - 39349, 39363, 39377, 39388, 39399, 39413, 39427, 39441, 39455, 39469, - 39483, 39491, 39499, 39510, 39518, 0, 39529, 39537, 39548, 39556, 39564, - 39572, 39580, 39588, 39591, 39594, 39597, 39600, 39606, 39617, 39625, 0, - 39636, 39644, 39655, 39663, 39671, 39679, 39687, 39695, 39701, 39707, - 39713, 39721, 39729, 39740, 0, 0, 39751, 39759, 39770, 39778, 39786, - 39794, 0, 39802, 39808, 39814, 39820, 39828, 39836, 39847, 39858, 39866, - 39874, 39882, 39893, 39901, 39909, 39917, 39925, 39933, 39939, 39945, 0, - 0, 39948, 39959, 39967, 0, 39978, 39986, 39997, 40005, 40013, 40021, - 40029, 40037, 40040, 0, 40043, 40047, 40051, 40055, 40059, 40063, 40067, - 40071, 40075, 40079, 40083, 40087, 40093, 40099, 40105, 40108, 40111, - 40113, 40117, 40121, 40125, 40129, 40132, 40136, 40140, 40146, 40152, - 40159, 40166, 40171, 40176, 40182, 40188, 40190, 40193, 40195, 40199, - 40203, 40207, 40211, 40215, 40219, 40223, 40227, 40231, 40237, 40241, - 40245, 40251, 40256, 40263, 40265, 40268, 40272, 40276, 40281, 40287, - 40289, 40298, 40307, 40310, 40314, 40316, 40318, 40320, 40323, 40329, - 40331, 40335, 40339, 40346, 40353, 40357, 40362, 40367, 40372, 40377, - 40381, 40385, 40388, 40392, 40396, 40403, 40408, 40412, 40416, 40421, - 40425, 40429, 40434, 40439, 40443, 40447, 40451, 40453, 40458, 40463, - 40467, 40471, 40475, 40479, 0, 40483, 40487, 40491, 40497, 40503, 40509, - 40515, 40522, 40529, 40534, 40539, 40543, 0, 0, 40549, 40552, 40555, - 40558, 40562, 40565, 40569, 40573, 40577, 40582, 40587, 40592, 40599, - 40603, 40606, 40609, 40612, 40615, 40618, 40621, 40625, 40628, 40632, - 40636, 40640, 40645, 40650, 0, 40655, 40661, 40667, 40673, 40680, 40687, - 40694, 40701, 40707, 40714, 40721, 40728, 40734, 0, 0, 0, 40741, 40744, - 40747, 40750, 40755, 40758, 40761, 40764, 40767, 40770, 40773, 40778, - 40781, 40784, 40787, 40790, 40793, 40798, 40801, 40804, 40807, 40810, - 40813, 40818, 40821, 40824, 40829, 40834, 40838, 40841, 40844, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40847, 40852, 40857, 40864, - 40872, 40877, 40882, 40886, 40890, 40895, 40902, 40909, 40913, 40918, - 40923, 40928, 40933, 40940, 40945, 40950, 40955, 40964, 40971, 40978, - 40982, 40987, 40993, 40998, 41005, 41013, 41021, 41025, 41029, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41033, 41037, 41045, 41049, 41053, - 41058, 41062, 41066, 41070, 41072, 41076, 41080, 41084, 41089, 41093, - 41097, 41105, 41108, 41112, 41115, 41118, 41124, 41128, 41131, 41137, - 41141, 41145, 41149, 41152, 41156, 41159, 41163, 41165, 41168, 41171, - 41175, 41177, 41181, 41184, 41187, 41192, 41197, 41204, 41207, 41210, - 41214, 41219, 41222, 41225, 41228, 41232, 41237, 41241, 41244, 41246, - 41249, 41252, 41255, 41259, 41264, 41267, 41271, 41275, 41279, 41283, - 41288, 41294, 41299, 41304, 41310, 41315, 41320, 41324, 41328, 41333, - 41337, 41341, 41344, 41346, 41351, 41357, 41364, 41371, 41378, 41385, - 41392, 41399, 41406, 41413, 41421, 41428, 41436, 41443, 41450, 41458, - 41466, 41471, 41476, 41481, 41486, 41491, 41496, 41501, 41507, 41512, - 41518, 41524, 41530, 41536, 41542, 41549, 41557, 41564, 41570, 41576, - 41582, 41588, 41594, 41600, 41607, 41613, 41620, 41627, 41634, 41641, - 41648, 41656, 41665, 41673, 41684, 41692, 41700, 41709, 41716, 41725, - 41734, 41742, 41751, 41759, 41763, 0, 0, 0, 0, 41767, 41769, 41771, - 41773, 41775, 41778, 41781, 41785, 41789, 41794, 41799, 41803, 41807, - 41811, 41815, 41820, 41825, 41830, 41835, 41840, 41845, 41850, 41855, - 41860, 41865, 41871, 41875, 41879, 41884, 41889, 41894, 41899, 41903, - 41910, 41917, 41924, 41931, 41938, 41945, 41952, 41959, 41967, 41979, - 41985, 41991, 41998, 42005, 42012, 42019, 42026, 42033, 42040, 42047, - 42052, 42058, 42063, 42068, 42073, 42078, 42083, 42090, 42097, 42102, - 42108, 42113, 42116, 42119, 42122, 42125, 42129, 42133, 42138, 42143, - 42149, 42155, 42159, 42163, 42167, 42171, 42176, 42181, 42185, 42189, - 42193, 42197, 42202, 42207, 42210, 42213, 42216, 42219, 42225, 42232, - 42243, 42253, 42257, 42265, 42272, 42280, 42289, 42293, 42299, 42305, - 42309, 42314, 42319, 42325, 42331, 42337, 42344, 42348, 42352, 42357, - 42360, 42362, 42366, 42370, 42378, 42382, 42384, 42386, 42390, 42398, - 42403, 42409, 42419, 42426, 42431, 42435, 42439, 42443, 42446, 42449, - 42452, 42456, 42460, 42464, 42468, 42472, 42475, 42479, 42483, 42486, - 42488, 42491, 42493, 42497, 42501, 42503, 42509, 42512, 42517, 42521, - 42525, 42527, 42529, 42531, 42534, 42538, 42542, 42546, 42550, 42554, - 42560, 42566, 42568, 42570, 42572, 42574, 42577, 42579, 42583, 42585, - 42589, 42593, 42598, 42602, 42606, 42610, 42614, 42618, 42624, 42628, - 42638, 42648, 42652, 42658, 42665, 42669, 42673, 42676, 42681, 42685, - 42691, 42695, 42708, 42717, 42721, 42725, 42731, 42735, 42738, 42740, - 42743, 42747, 42751, 42758, 42762, 42766, 42770, 42773, 42778, 42783, - 42789, 42795, 42800, 42805, 42813, 42821, 42825, 42829, 42831, 42836, - 42840, 42844, 42852, 42860, 42867, 42874, 42883, 42892, 42898, 42904, - 42912, 42920, 42922, 42924, 42930, 42936, 42943, 42950, 42956, 42962, - 42966, 42970, 42977, 42984, 42991, 42998, 43008, 43018, 43026, 43034, - 43036, 43040, 43044, 43049, 43054, 43062, 43070, 43073, 43076, 43079, - 43082, 43085, 43090, 43094, 43099, 43104, 43107, 43110, 43113, 43116, - 43119, 43123, 43126, 43129, 43132, 43135, 43137, 43139, 43141, 43143, - 43151, 43159, 43165, 43169, 43175, 43185, 43191, 43197, 43203, 43211, - 43220, 43232, 43236, 43240, 43242, 43248, 43250, 43252, 43254, 43256, - 43262, 43265, 43271, 43277, 43281, 43285, 43289, 43292, 43296, 43300, - 43302, 43311, 43320, 43325, 43330, 43336, 43342, 43348, 43351, 43354, - 43357, 43360, 43362, 43367, 43372, 43377, 43383, 43389, 43398, 43407, - 43414, 43421, 43428, 43435, 43445, 43455, 43465, 43475, 43485, 43495, - 43504, 43513, 43522, 43531, 43539, 43551, 43562, 43578, 43581, 43587, - 43593, 43599, 43607, 43622, 43638, 43644, 43650, 43657, 43663, 43672, - 43679, 43693, 43708, 43713, 43719, 43727, 43730, 43733, 43735, 43738, - 43741, 43743, 43745, 43749, 43752, 43755, 43758, 43761, 43766, 43771, - 43776, 43781, 43786, 43789, 43791, 43793, 43795, 43799, 43803, 43807, - 43813, 43818, 43820, 43822, 43827, 43832, 43837, 43842, 43847, 43852, - 43854, 43856, 43866, 43870, 43878, 43887, 43889, 43894, 43899, 43907, - 43911, 43913, 43917, 43919, 43923, 43927, 43931, 43933, 43935, 43937, - 43944, 43953, 43962, 43971, 43980, 43989, 43998, 44007, 44016, 44024, - 44032, 44041, 44050, 44059, 44068, 44076, 44084, 44093, 44102, 44111, - 44121, 44130, 44140, 44149, 44159, 44167, 44176, 44186, 44195, 44205, - 44214, 44224, 44232, 44241, 44250, 44259, 44268, 44277, 44286, 44296, - 44305, 44314, 44323, 44333, 44342, 44351, 44360, 44369, 44379, 44389, - 44398, 44407, 44415, 44424, 44431, 44440, 44449, 44460, 44469, 44479, - 44489, 44496, 44503, 44510, 44519, 44528, 44537, 44546, 44553, 44558, - 44566, 44571, 44574, 44581, 44584, 44589, 44594, 44597, 44600, 44608, - 44611, 44616, 44619, 44627, 44632, 44640, 44643, 44646, 44649, 44654, - 44659, 44662, 44665, 44673, 44676, 44683, 44690, 44694, 44698, 44703, - 44708, 44714, 44719, 44725, 44731, 44736, 44742, 44750, 44756, 44764, - 44772, 44778, 44786, 44794, 44802, 44810, 44816, 44824, 44832, 44840, - 44844, 44850, 44864, 44878, 44882, 44886, 44890, 44894, 44904, 44908, - 44913, 44918, 44924, 44930, 44936, 44942, 44952, 44962, 44970, 44981, - 44992, 45000, 45011, 45022, 45030, 45041, 45052, 45060, 45068, 45078, - 45088, 45091, 45094, 45097, 45102, 45106, 45112, 45119, 45126, 45134, - 45141, 45145, 45149, 45153, 45157, 45159, 45163, 45167, 45172, 45177, - 45184, 45191, 45194, 45201, 45203, 45205, 45209, 45213, 45218, 45224, - 45230, 45236, 45242, 45251, 45260, 45269, 45273, 45275, 45279, 45286, - 45293, 45300, 45307, 45314, 45317, 45322, 0, 0, 0, 0, 0, 45328, 45332, - 45339, 45346, 45353, 45360, 45364, 45368, 45372, 45376, 45382, 45388, - 45393, 45399, 45405, 45411, 45417, 45425, 45432, 45439, 45446, 45453, - 45458, 45464, 45473, 45477, 45484, 45488, 45492, 45498, 45504, 45510, - 45516, 45520, 45524, 45527, 45530, 45534, 45541, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45548, 45551, 45555, - 45559, 45565, 45571, 45577, 45585, 45592, 45596, 45604, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45609, 45612, 45615, 45618, - 45621, 45624, 45627, 45631, 45634, 45638, 45642, 45646, 45650, 45654, - 45658, 45662, 45666, 45670, 45674, 45678, 45682, 45685, 45688, 45691, - 45694, 45697, 45700, 45704, 45707, 45711, 45715, 45719, 45723, 45727, - 45731, 45735, 45739, 45743, 45747, 45751, 45755, 45761, 45767, 45773, - 45780, 45787, 45794, 45801, 45808, 45815, 45822, 45829, 45836, 45843, - 45850, 45857, 45864, 45871, 45878, 45885, 45892, 45897, 45903, 45909, - 45915, 45920, 45926, 45932, 45938, 45943, 45949, 45955, 45960, 45966, - 45972, 45977, 45983, 45989, 45994, 45999, 46005, 46010, 46016, 46022, - 46028, 46034, 46040, 46045, 46051, 46057, 46063, 46068, 46074, 46080, - 46086, 46091, 46097, 46103, 46108, 46114, 46120, 46125, 46131, 46137, - 46142, 46147, 46153, 46158, 46164, 46170, 46176, 46182, 46188, 46193, - 46199, 46205, 46211, 46216, 46222, 46228, 46234, 46239, 46245, 46251, - 46256, 46262, 46268, 46273, 46279, 46285, 46290, 46295, 46301, 46306, - 46312, 46318, 46324, 46330, 46336, 46340, 46345, 46350, 46355, 46360, - 46365, 46370, 46375, 46380, 46385, 46390, 46394, 46398, 46402, 46406, - 46410, 46414, 46419, 46423, 46428, 46433, 46438, 46443, 46448, 46453, - 46458, 46467, 46476, 46485, 46494, 46503, 46512, 46521, 46530, 46537, - 46545, 46553, 46560, 46567, 46575, 46583, 46590, 46597, 46605, 46613, - 46620, 46627, 46635, 46643, 46650, 46657, 46665, 46674, 46683, 46691, - 46700, 46709, 46716, 46723, 46731, 46740, 46749, 46757, 46766, 46775, - 46782, 46789, 46798, 46807, 46816, 46825, 46834, 46843, 46850, 46857, - 46866, 46875, 46884, 46893, 46902, 46911, 46918, 46925, 46934, 46943, - 46952, 46962, 46972, 46981, 46991, 47001, 47011, 47021, 47031, 47041, - 47050, 47059, 47066, 47074, 47082, 47090, 47098, 47103, 47108, 47117, - 47125, 47132, 47141, 47149, 47156, 47165, 47173, 47180, 47189, 47197, - 47204, 47213, 47221, 47228, 47237, 47245, 47252, 47262, 47271, 47278, - 47288, 47297, 47304, 47314, 47323, 47330, 47339, 47348, 47357, 47366, - 47380, 47394, 47401, 47406, 47411, 47416, 47421, 47426, 47431, 47436, - 47441, 47449, 47457, 47465, 47473, 47478, 47485, 47492, 47499, 47504, - 47512, 47519, 47527, 47531, 47538, 47544, 47551, 47555, 47561, 47567, - 47573, 47577, 47580, 47584, 47588, 47595, 47601, 47607, 47613, 47619, - 47633, 47643, 47657, 47671, 47677, 47687, 47701, 47704, 47707, 47714, - 47722, 47728, 47733, 47741, 47753, 47765, 47773, 47777, 47781, 47784, - 47787, 47791, 47795, 47798, 47801, 47806, 47811, 47817, 47823, 47828, - 47833, 47839, 47845, 47850, 47855, 47860, 47865, 47871, 47877, 47882, - 47887, 47893, 47899, 47904, 47909, 47912, 47915, 47924, 47926, 47928, - 47931, 47935, 47941, 47943, 47946, 47953, 47960, 47968, 47976, 47986, - 48000, 48005, 48010, 48014, 48019, 48027, 48035, 48044, 48053, 48062, - 48071, 48076, 48081, 48087, 48093, 48099, 48105, 48108, 48114, 48120, - 48130, 48140, 48148, 48156, 48165, 48174, 48178, 48186, 48194, 48202, - 48210, 48219, 48228, 48237, 48246, 48251, 48256, 48261, 48266, 48271, - 48277, 48283, 48288, 48294, 48296, 48298, 48300, 48302, 48305, 48308, - 48310, 48312, 48314, 48318, 48322, 48324, 48326, 48329, 48332, 48336, - 48342, 48348, 48350, 48357, 48361, 48366, 48371, 48373, 48383, 48389, - 48395, 48401, 48407, 48413, 48419, 48424, 48427, 48430, 48433, 48435, - 48437, 48441, 48445, 48450, 48455, 48460, 48463, 48467, 48472, 48475, - 48479, 48484, 48489, 48494, 48499, 48504, 48509, 48514, 48519, 48524, - 48529, 48534, 48539, 48545, 48551, 48557, 48559, 48562, 48564, 48567, - 48569, 48571, 48573, 48575, 48577, 48579, 48581, 48583, 48585, 48587, - 48589, 48591, 48593, 48595, 48597, 48599, 48601, 48606, 48611, 48616, - 48621, 48626, 48631, 48636, 48641, 48646, 48651, 48656, 48661, 48666, - 48671, 48676, 48681, 48686, 48691, 48696, 48701, 48705, 48709, 48713, - 48719, 48725, 48730, 48735, 48740, 48746, 48752, 48757, 48765, 48773, - 48781, 48789, 48797, 48805, 48813, 48821, 48827, 48832, 48837, 48842, - 48845, 48849, 48853, 48857, 48861, 48865, 48869, 48876, 48883, 48891, - 48899, 48904, 48909, 48916, 48923, 48930, 48937, 48940, 48943, 48948, - 48950, 48954, 48959, 48961, 48963, 48965, 48967, 48972, 48975, 48977, - 48982, 48989, 48996, 48999, 49003, 49008, 49013, 49021, 49027, 49033, - 49045, 49052, 49060, 49065, 49070, 49076, 49079, 49082, 49087, 49089, - 49093, 49095, 49097, 49099, 49101, 49103, 49105, 49110, 49112, 49114, - 49116, 49118, 49122, 49124, 49127, 49132, 49137, 49142, 49147, 49153, - 49159, 49161, 49164, 49171, 49178, 49185, 49192, 49196, 49200, 49202, - 49204, 49208, 49214, 49219, 49221, 49225, 49234, 49242, 49250, 49256, - 49262, 49267, 49273, 49278, 49281, 49295, 49298, 49303, 49308, 49314, - 49324, 49326, 49332, 49338, 49342, 49349, 49353, 49355, 49357, 49361, - 49367, 49372, 49378, 49380, 49386, 49388, 49394, 49396, 49398, 49403, - 49405, 49409, 49414, 49416, 49421, 49426, 49430, 49437, 49447, 49452, - 49458, 49461, 49467, 49470, 49475, 49480, 49484, 49486, 49488, 49492, - 49496, 49500, 49504, 49509, 49511, 49516, 49519, 49522, 49525, 49529, - 49533, 49538, 49542, 49547, 49552, 49556, 49561, 49567, 49570, 49576, - 49581, 49585, 49590, 49596, 49602, 49609, 49615, 49622, 49629, 49631, - 49638, 49642, 49648, 49654, 49659, 49665, 49669, 49674, 49677, 49682, - 49688, 49695, 49703, 49710, 49719, 49729, 49736, 49742, 49746, 49753, - 49758, 49767, 49770, 49773, 49782, 49792, 49799, 49801, 49807, 49812, - 49814, 49817, 49821, 49829, 49838, 49841, 49846, 49851, 49859, 49867, - 49875, 49883, 49889, 49895, 49901, 49909, 49914, 49917, 49921, 49924, - 49936, 49946, 49957, 49966, 49977, 49987, 49996, 50002, 50010, 50014, - 50022, 50026, 50034, 50041, 50048, 50057, 50066, 50076, 50086, 50096, - 50106, 50115, 50124, 50134, 50144, 50153, 50162, 50168, 50174, 50180, - 50186, 50192, 50198, 50205, 50211, 50218, 50225, 50231, 50237, 50243, - 50249, 50255, 50261, 50268, 50274, 50281, 50288, 50295, 50302, 50309, - 50316, 50323, 50330, 50338, 50345, 50353, 50361, 50366, 50369, 50373, - 50377, 50383, 50386, 50391, 50397, 50402, 50406, 50411, 50417, 50424, - 50427, 50434, 50441, 50445, 50453, 50461, 50466, 50472, 50477, 50482, - 50489, 50496, 50504, 50512, 50521, 50525, 50534, 50539, 50543, 50550, - 50554, 50560, 50568, 50573, 50580, 50584, 50589, 50593, 50598, 50602, - 50607, 50612, 50621, 50623, 50626, 50629, 50636, 50643, 50649, 50657, - 50663, 50670, 50675, 50678, 50683, 50688, 50693, 50701, 50705, 50712, - 50720, 50728, 50733, 50738, 50744, 50749, 50754, 50760, 50765, 50768, - 50772, 50776, 50783, 50793, 50798, 50807, 50816, 50822, 50828, 50833, - 50838, 50843, 50848, 50854, 50860, 50868, 50876, 50882, 50888, 50892, - 50896, 50903, 50910, 50916, 50919, 50922, 50926, 50930, 50934, 50939, - 50945, 50951, 50958, 50965, 50970, 50974, 50978, 50982, 50986, 50990, - 50994, 50998, 51002, 51006, 51010, 51014, 51018, 51022, 51026, 51030, - 51034, 51038, 51042, 51046, 51050, 51054, 51058, 51062, 51066, 51070, - 51074, 51078, 51082, 51086, 51090, 51094, 51098, 51102, 51106, 51110, - 51114, 51118, 51122, 51126, 51130, 51134, 51138, 51142, 51146, 51150, - 51154, 51158, 51162, 51166, 51170, 51174, 51178, 51182, 51186, 51190, - 51194, 51198, 51202, 51206, 51210, 51214, 51218, 51222, 51226, 51230, - 51234, 51238, 51242, 51246, 51250, 51254, 51258, 51262, 51266, 51270, - 51274, 51278, 51282, 51286, 51290, 51294, 51298, 51302, 51306, 51310, - 51314, 51318, 51322, 51326, 51330, 51334, 51338, 51342, 51346, 51350, - 51354, 51358, 51362, 51366, 51370, 51374, 51378, 51382, 51386, 51390, - 51394, 51398, 51402, 51406, 51410, 51414, 51418, 51422, 51426, 51430, - 51434, 51438, 51442, 51446, 51450, 51454, 51458, 51462, 51466, 51470, - 51474, 51478, 51482, 51486, 51490, 51494, 51498, 51502, 51506, 51510, - 51514, 51518, 51522, 51526, 51530, 51534, 51538, 51542, 51546, 51550, - 51554, 51558, 51562, 51566, 51570, 51574, 51578, 51582, 51586, 51590, - 51594, 51598, 51602, 51606, 51610, 51614, 51618, 51622, 51626, 51630, - 51634, 51638, 51642, 51646, 51650, 51654, 51658, 51662, 51666, 51670, - 51674, 51678, 51682, 51686, 51690, 51694, 51698, 51702, 51706, 51710, - 51714, 51718, 51722, 51726, 51730, 51734, 51738, 51742, 51746, 51750, - 51754, 51758, 51762, 51766, 51770, 51774, 51778, 51782, 51786, 51790, - 51794, 51798, 51802, 51806, 51810, 51814, 51818, 51822, 51826, 51830, - 51834, 51838, 51842, 51846, 51850, 51854, 51858, 51862, 51866, 51870, - 51874, 51878, 51882, 51886, 51890, 51894, 51898, 51902, 51906, 51910, - 51914, 51918, 51922, 51926, 51930, 51934, 51938, 51942, 51946, 51950, - 51954, 51958, 51962, 51966, 51970, 51974, 51978, 51982, 51986, 51990, - 51994, 52001, 52009, 52015, 52021, 52028, 52035, 52041, 52047, 52053, - 52059, 52063, 52067, 52072, 52077, 52083, 52089, 52097, 52104, 52109, - 52114, 52122, 52131, 52138, 52148, 52159, 52162, 52165, 52169, 52173, - 52180, 52187, 52198, 52209, 52218, 52227, 52233, 52239, 52246, 52253, - 52262, 52272, 52283, 52293, 52303, 52313, 52324, 52335, 52345, 52356, - 52366, 52376, 52385, 52395, 52405, 52415, 52425, 52432, 52439, 52446, - 52453, 52463, 52473, 52481, 52489, 52496, 52503, 52510, 52517, 52524, - 52529, 52534, 52540, 52548, 52557, 52565, 52573, 52581, 52589, 52597, - 52605, 52613, 52621, 52630, 52639, 52648, 52657, 52666, 52675, 52684, - 52693, 52702, 52711, 52720, 52729, 52738, 52747, 52756, 52765, 52779, - 52794, 52808, 52823, 52837, 52851, 52865, 52879, 52889, 52900, 52910, - 52921, 52936, 52951, 52959, 52965, 52972, 52979, 52986, 52993, 52998, - 53004, 53009, 53014, 53020, 53025, 53030, 53035, 53040, 53045, 53052, - 53058, 53066, 53071, 53076, 53080, 53084, 53092, 53100, 53108, 53116, - 53123, 53130, 53143, 53156, 53169, 53182, 53190, 53198, 53204, 53210, - 53217, 53224, 53231, 53238, 53242, 53247, 53255, 53263, 53271, 53278, - 53282, 53290, 53298, 53302, 53306, 53311, 53318, 53326, 53334, 53353, - 53372, 53391, 53410, 53429, 53448, 53467, 53486, 53492, 53499, 53508, - 53516, 53524, 53530, 53533, 53536, 53541, 53544, 53564, 53571, 53577, - 53583, 53587, 53590, 53593, 53596, 53608, 53622, 53629, 53636, 53639, - 53643, 53646, 53651, 53656, 53661, 53667, 53676, 53683, 53690, 53698, - 53705, 53712, 53715, 53721, 53727, 53730, 53733, 53738, 53743, 53749, - 53755, 53759, 53764, 53771, 53775, 53781, 53785, 53789, 53797, 53809, - 53818, 53822, 53824, 53833, 53842, 53848, 53851, 53857, 53863, 53868, - 53873, 53878, 53883, 53888, 53893, 53895, 53901, 53906, 53914, 53918, - 53924, 53927, 53931, 53938, 53945, 53947, 53949, 53955, 53961, 53967, - 53976, 53985, 53992, 53999, 54005, 54012, 54017, 54022, 54027, 54033, - 54039, 54044, 54051, 54055, 54059, 54072, 54085, 54097, 54106, 54112, - 54119, 54124, 54129, 54134, 54139, 54144, 54146, 54153, 54161, 54169, - 54177, 54184, 54192, 54198, 54203, 54209, 54215, 54221, 54228, 54234, - 54242, 54250, 54258, 54266, 54274, 54280, 54286, 54295, 54299, 54308, - 54317, 54326, 54334, 54338, 54344, 54351, 54358, 54362, 54368, 54376, - 54382, 54387, 54393, 54398, 54403, 54410, 54417, 54422, 54427, 54435, - 54443, 54453, 54463, 54470, 54477, 54481, 54485, 54497, 54503, 54510, - 54515, 54520, 54527, 54534, 54540, 54546, 54556, 54563, 54571, 54579, - 54588, 54595, 54601, 54608, 54614, 54622, 54630, 54638, 54646, 54652, - 54657, 54667, 54678, 54685, 54694, 54700, 54705, 54710, 54720, 54727, - 54733, 54739, 54747, 54752, 54759, 54766, 54777, 54784, 54791, 54798, - 54805, 54812, 54820, 54828, 54841, 54854, 54866, 54878, 54892, 54906, - 54912, 54918, 54927, 54936, 54943, 54950, 54959, 54968, 54977, 54986, - 54994, 55002, 55012, 55022, 55036, 55050, 55059, 55068, 55081, 55094, - 55103, 55112, 55123, 55134, 55140, 55146, 55155, 55164, 55169, 55174, - 55182, 55188, 55194, 55202, 55210, 55223, 55236, 55240, 55244, 55252, - 55260, 55267, 55275, 55283, 55292, 55301, 55307, 55313, 55320, 55327, - 55334, 55341, 55350, 55359, 55362, 55365, 55370, 55375, 55381, 55387, - 55394, 55401, 55412, 55423, 55430, 55437, 55445, 55453, 55461, 55469, - 55477, 55485, 55491, 55497, 55501, 55505, 55513, 55521, 55526, 55531, - 55536, 55541, 55547, 55561, 55568, 55575, 55579, 55581, 55583, 55588, - 55593, 55598, 55602, 55610, 55617, 55624, 55632, 55644, 55652, 55660, - 55671, 55675, 55679, 55685, 55693, 55706, 55713, 55720, 55727, 55733, - 55740, 55749, 55758, 55764, 55770, 55776, 55786, 55796, 55804, 55813, - 55818, 55821, 55826, 55831, 55836, 55842, 55848, 55852, 55855, 55858, - 55861, 55866, 55871, 55877, 55883, 55887, 55891, 55898, 55905, 55912, - 55919, 55926, 55933, 55943, 55953, 55960, 55967, 55975, 55983, 55987, - 55992, 55997, 56003, 56009, 56012, 56015, 56018, 56021, 56026, 56031, - 56036, 56041, 56046, 56051, 56055, 56059, 56063, 56068, 56073, 56077, - 56081, 56087, 56091, 56097, 56102, 56109, 56117, 56124, 56132, 56139, - 56147, 56156, 56163, 56173, 56184, 56190, 56199, 56205, 56214, 56223, - 56229, 56235, 56239, 56243, 56252, 56261, 56268, 56275, 56284, 56293, - 56299, 56305, 56312, 56317, 56321, 56325, 56330, 56335, 56340, 56348, - 56356, 56359, 56363, 56372, 56382, 56391, 56401, 56412, 56425, 56429, - 56433, 56437, 56441, 56446, 56451, 56457, 56463, 56470, 56477, 56483, - 56489, 56495, 56501, 56509, 56517, 56524, 56531, 56538, 0, 0, 56545, - 56554, 56563, 56573, 56583, 56592, 56601, 56610, 56619, 56625, 56630, - 56639, 56649, 56658, 56668, 56675, 56682, 56689, 56696, 56701, 56706, - 56711, 56716, 56724, 56733, 56741, 56750, 56754, 56758, 56762, 56766, - 56776, 0, 0, 56779, 56788, 56797, 56806, 56815, 56821, 56827, 56833, - 56839, 56849, 56859, 56869, 56879, 56889, 56899, 56909, 56919, 56926, - 56933, 56940, 56947, 56954, 56961, 56968, 56975, 56981, 56987, 56993, - 56999, 57005, 57011, 57017, 57023, 57034, 0, 0, 0, 57044, 57051, 57054, - 57058, 57062, 57067, 57072, 57077, 57080, 57089, 57098, 57107, 0, 57116, - 57122, 57128, 57136, 57146, 57153, 57162, 57167, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57170, 57179, - 57188, 57197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57206, - 57211, 57216, 57221, 57226, 57231, 57236, 57241, 57246, 57251, 57256, - 57262, 57266, 57271, 57276, 57281, 57286, 57291, 57296, 57301, 57306, - 57311, 57316, 57321, 57326, 57331, 57336, 57341, 57346, 57351, 57356, - 57361, 57366, 57371, 57376, 57382, 57387, 57393, 57402, 57407, 57415, - 57422, 57431, 57436, 57441, 57446, 57452, 0, 57459, 57464, 57469, 57474, - 57479, 57484, 57489, 57494, 57499, 57504, 57509, 57515, 57519, 57524, - 57529, 57534, 57539, 57544, 57549, 57554, 57559, 57564, 57569, 57574, - 57579, 57584, 57589, 57594, 57599, 57604, 57609, 57614, 57619, 57624, - 57629, 57635, 57640, 57646, 57655, 57660, 57668, 57675, 57684, 57689, - 57694, 57699, 57705, 0, 57712, 57720, 57728, 57737, 57744, 57752, 57758, - 57767, 57775, 57783, 57791, 57799, 57807, 57815, 57820, 57827, 57833, - 57840, 57848, 57855, 57862, 57870, 57876, 57882, 57889, 57896, 57906, - 57916, 57923, 57930, 57935, 57945, 57955, 57960, 57965, 57970, 57975, - 57980, 57985, 57990, 57995, 58000, 58005, 58010, 58015, 58020, 58025, - 58030, 58035, 58040, 58045, 58050, 58055, 58060, 58065, 58070, 58075, - 58080, 58085, 58090, 58095, 58100, 58105, 58109, 58113, 58118, 58123, - 58128, 58133, 58138, 58143, 58148, 58153, 58158, 58163, 58168, 58173, - 58178, 58183, 58188, 58193, 58198, 58203, 58210, 58217, 58224, 58231, - 58238, 58245, 58252, 58259, 58266, 58273, 58280, 58287, 58294, 58301, - 58306, 58311, 58318, 58325, 58332, 58339, 58346, 58353, 58360, 58367, - 58374, 58381, 58388, 58395, 58401, 58407, 58413, 58419, 58426, 58433, - 58440, 58447, 58454, 58461, 58468, 58475, 58482, 58489, 58497, 58505, - 58513, 58521, 58529, 58537, 58545, 58553, 58557, 58563, 58569, 58573, - 58579, 58585, 58591, 58598, 58605, 58612, 58619, 58624, 58630, 58636, - 58643, 0, 0, 0, 0, 0, 58650, 58658, 58667, 58676, 58684, 58690, 58695, - 58700, 58705, 58710, 58715, 58720, 58725, 58730, 58735, 58740, 58745, - 58750, 58755, 58760, 58765, 58770, 58775, 58780, 58785, 58790, 58795, - 58800, 58805, 58810, 58815, 58820, 58825, 58830, 58835, 58840, 58845, - 58850, 58855, 58860, 58865, 58870, 58875, 58880, 58885, 0, 58890, 0, 0, - 0, 0, 0, 58895, 0, 0, 58900, 58904, 58909, 58914, 58919, 58924, 58933, - 58938, 58943, 58948, 58953, 58958, 58963, 58968, 58973, 58980, 58985, - 58990, 58999, 59006, 59011, 59016, 59021, 59028, 59033, 59040, 59045, - 59050, 59057, 59064, 59069, 59074, 59079, 59086, 59093, 59098, 59103, - 59108, 59113, 59118, 59125, 59132, 59137, 59142, 59147, 59152, 59157, - 59162, 59167, 59172, 59177, 59182, 59187, 59194, 59199, 59204, 0, 0, 0, - 0, 0, 0, 0, 59209, 59216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 59221, 59226, 59230, 59234, 59238, 59242, 59246, 59250, 59254, 59258, - 59262, 59266, 59272, 59276, 59280, 59284, 59288, 59292, 59296, 59300, - 59304, 59308, 59312, 59316, 0, 0, 0, 0, 0, 0, 0, 0, 0, 59320, 59324, - 59328, 59332, 59336, 59340, 59344, 0, 59348, 59352, 59356, 59360, 59364, - 59368, 59372, 0, 59376, 59380, 59384, 59388, 59392, 59396, 59400, 0, - 59404, 59408, 59412, 59416, 59420, 59424, 59428, 0, 59432, 59436, 59440, - 59444, 59448, 59452, 59456, 0, 59460, 59464, 59468, 59472, 59476, 59480, - 59484, 0, 59488, 59492, 59496, 59500, 59504, 59508, 59512, 0, 59516, - 59520, 59524, 59528, 59532, 59536, 59540, 0, 59544, 59549, 59554, 59559, - 59564, 59569, 59574, 59578, 59583, 59588, 59593, 59597, 59602, 59607, - 59612, 59617, 59621, 59626, 59631, 59636, 59641, 59646, 59651, 59655, - 59660, 59665, 59672, 59677, 59682, 59688, 59695, 59702, 59711, 59718, - 59727, 59731, 59735, 59741, 59747, 59753, 59761, 59767, 59771, 59775, - 59779, 59785, 59791, 59795, 59797, 59801, 59807, 59809, 59813, 59816, - 59819, 59825, 59830, 59834, 59838, 59843, 59849, 59854, 59859, 59864, - 59869, 59876, 59883, 59888, 59893, 59898, 59903, 59908, 59913, 59917, - 59921, 59928, 59935, 59941, 59945, 59950, 59953, 59957, 59964, 59968, - 59972, 59976, 59980, 59986, 59992, 59996, 60002, 60006, 60010, 60016, - 60021, 60026, 60028, 60031, 60035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34080, 34088, 34096, 34104, + 34112, 34122, 34132, 34142, 0, 0, 0, 0, 0, 0, 0, 0, 34152, 34157, 34162, + 34167, 34172, 34181, 34192, 34201, 34212, 34218, 34231, 34237, 34244, + 34251, 34256, 34262, 34268, 34279, 34288, 34295, 34302, 34311, 34318, + 34327, 34337, 34347, 34354, 34361, 34368, 34378, 34383, 34391, 34397, + 34405, 34414, 34419, 34426, 34432, 34437, 0, 34442, 34448, 0, 0, 0, 0, 0, + 0, 34455, 34460, 34466, 34473, 34481, 34487, 34493, 34499, 34504, 34511, + 34517, 34523, 34529, 34537, 34543, 34551, 34556, 34562, 34568, 34575, + 34583, 34590, 34596, 34603, 34610, 34616, 34623, 34630, 34636, 34641, + 34647, 34655, 34664, 34670, 34676, 34682, 34688, 34696, 34700, 34706, + 34712, 34718, 34724, 34730, 34736, 34740, 34745, 34750, 34757, 34762, + 34766, 34772, 34777, 34782, 34786, 34791, 34796, 34800, 34805, 34810, + 34817, 34821, 34826, 34831, 34835, 34840, 34844, 34849, 34853, 34859, + 34864, 34871, 34876, 34881, 34885, 34890, 34895, 34902, 34907, 34913, + 34918, 34923, 34928, 34932, 34937, 34944, 34951, 34956, 34961, 34965, + 34971, 34978, 34983, 34988, 34993, 34999, 35004, 35010, 35015, 35021, + 35027, 35033, 35040, 35047, 35054, 35061, 35068, 35075, 35080, 35088, + 35097, 35106, 35115, 35124, 35133, 35142, 35154, 35163, 35172, 35181, + 35188, 35193, 35200, 35208, 35216, 35223, 35230, 35237, 35244, 35252, + 35261, 35270, 35279, 35288, 35297, 35306, 35315, 35324, 35333, 35342, + 35351, 35360, 35369, 35378, 35386, 35395, 35406, 35414, 35423, 35434, + 35443, 35452, 35461, 35470, 35478, 35487, 35494, 35499, 35507, 35512, + 35519, 35524, 35533, 35539, 35546, 35553, 35558, 35563, 35571, 35579, + 35588, 35597, 35602, 35609, 35620, 35628, 35637, 35643, 35649, 35654, + 35661, 35666, 35675, 35680, 35685, 35690, 35697, 35704, 35709, 35718, + 35726, 35731, 35736, 35743, 35750, 35754, 35758, 35761, 35764, 35767, + 35770, 35773, 35776, 35783, 35786, 35789, 35794, 35798, 35802, 35806, + 35810, 35814, 35823, 35829, 35835, 35841, 35849, 35857, 35863, 35869, + 35876, 35882, 35887, 35893, 35900, 35906, 35913, 35919, 35927, 35933, + 35940, 35946, 35952, 35958, 35964, 35970, 35976, 35987, 35997, 36003, + 36009, 36019, 36025, 36033, 36041, 36049, 0, 0, 0, 0, 0, 36054, 36058, + 36065, 36072, 36077, 36086, 36094, 36102, 36109, 36116, 36123, 36130, + 36138, 36146, 36156, 36166, 36174, 36182, 36190, 36198, 36207, 36216, + 36224, 36232, 36241, 36250, 36260, 36270, 36279, 36288, 36296, 36304, + 36312, 36320, 36330, 36340, 36348, 36356, 36364, 36372, 36380, 36388, + 36396, 36404, 36412, 36420, 36428, 36436, 36445, 36454, 36463, 36472, + 36482, 36492, 36499, 36506, 36514, 36522, 36531, 36540, 36548, 36556, + 36568, 36580, 36589, 36598, 36607, 36616, 36623, 36630, 36638, 36646, + 36654, 36662, 36670, 36678, 36686, 36694, 36703, 36712, 36721, 36730, + 36739, 36748, 36758, 36768, 36778, 36788, 36797, 36806, 36813, 36820, + 36828, 36836, 36844, 36852, 36860, 36868, 36880, 36892, 36901, 36910, + 36918, 36926, 36934, 36942, 36953, 36964, 36975, 36986, 36998, 37010, + 37018, 37026, 37034, 37042, 37051, 37060, 37069, 37078, 37086, 37094, + 37102, 37110, 37118, 37126, 37135, 37144, 37154, 37164, 37172, 37180, + 37188, 37196, 37204, 37212, 37219, 37226, 37234, 37242, 37250, 37258, + 37266, 37274, 37282, 37290, 37298, 37306, 37314, 37322, 37330, 37338, + 37346, 37354, 37363, 37372, 37381, 37389, 37398, 37407, 37416, 37425, + 37435, 37444, 37451, 37456, 37463, 37470, 37478, 37486, 37495, 37504, + 37514, 37524, 37535, 37546, 37556, 37566, 37576, 37586, 37595, 37604, + 37614, 37624, 37635, 37646, 37656, 37666, 37676, 37686, 37693, 37700, + 37708, 37716, 37723, 37730, 37739, 37748, 37758, 37768, 37779, 37790, + 37800, 37810, 37820, 37830, 37839, 37848, 37856, 37864, 37871, 37878, + 37886, 37894, 37903, 37912, 37922, 37932, 37943, 37954, 37964, 37974, + 37984, 37994, 38003, 38012, 38022, 38032, 38043, 38054, 38064, 38074, + 38084, 38094, 38101, 38108, 38116, 38124, 38133, 38142, 38152, 38162, + 38173, 38184, 38194, 38204, 38214, 38224, 38232, 38240, 38248, 38256, + 38265, 38274, 38282, 38290, 38297, 38304, 38311, 38318, 38326, 38334, + 38342, 38350, 38361, 38372, 38383, 38394, 38405, 38416, 38424, 38432, + 38443, 38454, 38465, 38476, 38487, 38498, 38506, 38514, 38525, 38536, + 38547, 0, 0, 38558, 38566, 38574, 38585, 38596, 38607, 0, 0, 38618, + 38626, 38634, 38645, 38656, 38667, 38678, 38689, 38700, 38708, 38716, + 38727, 38738, 38749, 38760, 38771, 38782, 38790, 38798, 38809, 38820, + 38831, 38842, 38853, 38864, 38872, 38880, 38891, 38902, 38913, 38924, + 38935, 38946, 38954, 38962, 38973, 38984, 38995, 0, 0, 39006, 39014, + 39022, 39033, 39044, 39055, 0, 0, 39066, 39074, 39082, 39093, 39104, + 39115, 39126, 39137, 0, 39148, 0, 39156, 0, 39167, 0, 39178, 39189, + 39197, 39205, 39216, 39227, 39238, 39249, 39260, 39271, 39279, 39287, + 39298, 39309, 39320, 39331, 39342, 39353, 39361, 39369, 39377, 39385, + 39393, 39401, 39409, 39417, 39425, 39433, 39441, 39449, 39457, 0, 0, + 39465, 39476, 39487, 39501, 39515, 39529, 39543, 39557, 39571, 39582, + 39593, 39607, 39621, 39635, 39649, 39663, 39677, 39688, 39699, 39713, + 39727, 39741, 39755, 39769, 39783, 39794, 39805, 39819, 39833, 39847, + 39861, 39875, 39889, 39900, 39911, 39925, 39939, 39953, 39967, 39981, + 39995, 40006, 40017, 40031, 40045, 40059, 40073, 40087, 40101, 40109, + 40117, 40128, 40136, 0, 40147, 40155, 40166, 40174, 40182, 40190, 40198, + 40206, 40209, 40212, 40215, 40218, 40224, 40235, 40243, 0, 40254, 40262, + 40273, 40281, 40289, 40297, 40305, 40313, 40319, 40325, 40331, 40339, + 40347, 40358, 0, 0, 40369, 40377, 40388, 40396, 40404, 40412, 0, 40420, + 40426, 40432, 40438, 40446, 40454, 40465, 40476, 40484, 40492, 40500, + 40511, 40519, 40527, 40535, 40543, 40551, 40557, 40563, 0, 0, 40566, + 40577, 40585, 0, 40596, 40604, 40615, 40623, 40631, 40639, 40647, 40655, + 40658, 0, 40661, 40665, 40669, 40673, 40677, 40681, 40685, 40689, 40693, + 40697, 40701, 40705, 40711, 40717, 40723, 40726, 40729, 40731, 40735, + 40739, 40743, 40747, 40750, 40754, 40758, 40764, 40770, 40777, 40784, + 40789, 40794, 40800, 40806, 40808, 40811, 40813, 40817, 40821, 40825, + 40829, 40833, 40837, 40841, 40845, 40849, 40855, 40859, 40863, 40869, + 40874, 40881, 40883, 40886, 40890, 40894, 40899, 40905, 40907, 40916, + 40925, 40928, 40932, 40934, 40936, 40938, 40941, 40947, 40949, 40953, + 40957, 40964, 40971, 40975, 40980, 40985, 40990, 40995, 40999, 41003, + 41006, 41010, 41014, 41021, 41026, 41030, 41034, 41039, 41043, 41047, + 41052, 41057, 41061, 41065, 41069, 41071, 41076, 41081, 41085, 41089, + 41093, 41097, 0, 41101, 41105, 41109, 41115, 41121, 41127, 41133, 41140, + 41147, 41152, 41157, 41161, 0, 0, 41167, 41170, 41173, 41176, 41180, + 41183, 41187, 41191, 41195, 41200, 41205, 41210, 41217, 41221, 41224, + 41227, 41230, 41233, 41236, 41239, 41243, 41246, 41250, 41254, 41258, + 41263, 41268, 0, 41273, 41279, 41285, 41291, 41298, 41305, 41312, 41319, + 41325, 41332, 41339, 41346, 41353, 0, 0, 0, 41360, 41363, 41366, 41369, + 41374, 41377, 41380, 41383, 41386, 41389, 41392, 41397, 41400, 41403, + 41406, 41409, 41412, 41417, 41420, 41423, 41426, 41429, 41432, 41437, + 41440, 41443, 41448, 41453, 41457, 41460, 41463, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 41466, 41471, 41476, 41483, 41491, 41496, + 41501, 41505, 41509, 41514, 41521, 41528, 41532, 41537, 41542, 41547, + 41552, 41559, 41564, 41569, 41574, 41583, 41590, 41597, 41601, 41606, + 41612, 41617, 41624, 41632, 41640, 41644, 41648, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 41652, 41656, 41664, 41668, 41672, 41677, 41681, + 41685, 41689, 41691, 41695, 41699, 41703, 41708, 41712, 41716, 41724, + 41727, 41731, 41734, 41737, 41743, 41747, 41750, 41756, 41760, 41764, + 41768, 41771, 41775, 41778, 41782, 41784, 41787, 41790, 41794, 41796, + 41800, 41803, 41806, 41811, 41816, 41823, 41826, 41829, 41833, 41838, + 41841, 41844, 41847, 41851, 41856, 41860, 41863, 41865, 41868, 41871, + 41874, 41878, 41883, 41886, 41890, 41894, 41898, 41902, 41907, 41913, + 41918, 41923, 41929, 41934, 41939, 41943, 41947, 41952, 41956, 41960, + 41963, 41965, 41970, 41976, 41983, 41990, 41997, 42004, 42011, 42018, + 42025, 42032, 42040, 42047, 42055, 42062, 42069, 42077, 42085, 42090, + 42095, 42100, 42105, 42110, 42115, 42120, 42126, 42131, 42137, 42143, + 42149, 42155, 42161, 42168, 42176, 42183, 42189, 42195, 42201, 42207, + 42213, 42219, 42226, 42232, 42239, 42246, 42253, 42260, 42267, 42275, + 42284, 42292, 42303, 42311, 42319, 42328, 42335, 42344, 42353, 42361, + 42370, 42378, 42382, 0, 0, 0, 0, 42386, 42388, 42390, 42392, 42394, + 42397, 42400, 42404, 42408, 42413, 42418, 42422, 42426, 42430, 42434, + 42439, 42444, 42449, 42454, 42459, 42464, 42469, 42474, 42479, 42484, + 42490, 42494, 42498, 42503, 42508, 42513, 42518, 42522, 42529, 42536, + 42543, 42550, 42557, 42564, 42571, 42578, 42586, 42598, 42604, 42610, + 42617, 42624, 42631, 42638, 42645, 42652, 42659, 42666, 42671, 42677, + 42682, 42687, 42692, 42697, 42702, 42709, 42716, 42721, 42727, 42732, + 42735, 42738, 42741, 42744, 42748, 42752, 42757, 42762, 42768, 42774, + 42778, 42782, 42786, 42790, 42795, 42800, 42804, 42808, 42812, 42816, + 42821, 42826, 42829, 42832, 42835, 42838, 42844, 42851, 42862, 42872, + 42876, 42884, 42891, 42899, 42908, 42912, 42918, 42924, 42928, 42933, + 42938, 42944, 42950, 42956, 42963, 42967, 42971, 42976, 42979, 42981, + 42985, 42989, 42997, 43001, 43003, 43005, 43009, 43017, 43022, 43028, + 43038, 43045, 43050, 43054, 43058, 43062, 43065, 43068, 43071, 43075, + 43079, 43083, 43087, 43091, 43094, 43098, 43102, 43105, 43107, 43110, + 43112, 43116, 43120, 43122, 43128, 43131, 43136, 43140, 43144, 43146, + 43148, 43150, 43153, 43157, 43161, 43165, 43169, 43173, 43179, 43185, + 43187, 43189, 43191, 43193, 43196, 43198, 43202, 43204, 43208, 43212, + 43218, 43222, 43226, 43230, 43234, 43238, 43244, 43248, 43258, 43268, + 43272, 43278, 43285, 43289, 43293, 43296, 43301, 43305, 43311, 43315, + 43328, 43337, 43341, 43345, 43351, 43355, 43358, 43360, 43363, 43367, + 43371, 43378, 43382, 43386, 43390, 43393, 43398, 43403, 43409, 43415, + 43420, 43425, 43433, 43441, 43445, 43449, 43451, 43456, 43460, 43464, + 43472, 43480, 43487, 43494, 43503, 43512, 43518, 43524, 43532, 43540, + 43542, 43544, 43550, 43556, 43563, 43570, 43576, 43582, 43586, 43590, + 43597, 43604, 43611, 43618, 43628, 43638, 43646, 43654, 43656, 43660, + 43664, 43669, 43674, 43682, 43690, 43693, 43696, 43699, 43702, 43705, + 43710, 43714, 43719, 43724, 43727, 43730, 43733, 43736, 43739, 43743, + 43746, 43749, 43752, 43755, 43757, 43759, 43761, 43763, 43771, 43779, + 43785, 43789, 43795, 43805, 43811, 43817, 43823, 43831, 43840, 43852, + 43856, 43860, 43862, 43868, 43870, 43872, 43874, 43876, 43882, 43885, + 43891, 43897, 43901, 43905, 43909, 43912, 43916, 43920, 43922, 43931, + 43940, 43945, 43950, 43956, 43962, 43968, 43971, 43974, 43977, 43980, + 43982, 43987, 43992, 43997, 44003, 44009, 44018, 44027, 44034, 44041, + 44048, 44055, 44065, 44075, 44085, 44095, 44105, 44115, 44124, 44133, + 44142, 44151, 44159, 44171, 44182, 44198, 44201, 44207, 44213, 44219, + 44227, 44242, 44258, 44264, 44270, 44277, 44283, 44292, 44299, 44313, + 44328, 44333, 44339, 44347, 44350, 44353, 44355, 44358, 44361, 44363, + 44365, 44369, 44372, 44375, 44378, 44381, 44386, 44391, 44396, 44401, + 44406, 44409, 44411, 44413, 44415, 44419, 44423, 44427, 44433, 44438, + 44440, 44442, 44447, 44452, 44457, 44462, 44467, 44472, 44474, 44476, + 44486, 44490, 44498, 44507, 44509, 44514, 44519, 44527, 44531, 44533, + 44537, 44539, 44543, 44547, 44551, 44553, 44555, 44557, 44564, 44573, + 44582, 44591, 44600, 44609, 44618, 44627, 44636, 44644, 44652, 44661, + 44670, 44679, 44688, 44696, 44704, 44713, 44722, 44731, 44741, 44750, + 44760, 44769, 44779, 44787, 44796, 44806, 44815, 44825, 44834, 44844, + 44852, 44861, 44870, 44879, 44888, 44897, 44906, 44916, 44925, 44934, + 44943, 44953, 44962, 44971, 44980, 44989, 44999, 45009, 45018, 45027, + 45035, 45044, 45051, 45060, 45069, 45080, 45089, 45099, 45109, 45116, + 45123, 45130, 45139, 45148, 45157, 45166, 45173, 45178, 45186, 45191, + 45194, 45201, 45204, 45209, 45214, 45217, 45220, 45228, 45231, 45236, + 45239, 45247, 45252, 45260, 45263, 45266, 45269, 45274, 45279, 45282, + 45285, 45293, 45296, 45303, 45310, 45314, 45318, 45323, 45328, 45334, + 45339, 45345, 45351, 45356, 45362, 45370, 45376, 45384, 45392, 45398, + 45406, 45414, 45422, 45430, 45436, 45444, 45452, 45460, 45464, 45470, + 45484, 45498, 45502, 45506, 45510, 45514, 45524, 45528, 45533, 45538, + 45544, 45550, 45556, 45562, 45572, 45582, 45590, 45601, 45612, 45620, + 45631, 45642, 45650, 45661, 45672, 45680, 45688, 45698, 45708, 45711, + 45714, 45717, 45722, 45726, 45732, 45739, 45746, 45754, 45761, 45765, + 45769, 45773, 45777, 45779, 45783, 45787, 45792, 45797, 45804, 45811, + 45814, 45821, 45823, 45825, 45829, 45833, 45838, 45844, 45850, 45856, + 45862, 45871, 45880, 45889, 45893, 45895, 45899, 45906, 45913, 45920, + 45927, 45934, 45937, 45942, 45948, 45951, 45956, 45961, 0, 45966, 45970, + 45977, 45984, 45991, 45998, 46002, 46006, 46010, 46014, 46020, 46026, + 46031, 46037, 46043, 46049, 46055, 46063, 46070, 46077, 46084, 46091, + 46096, 46102, 46111, 46115, 46122, 46126, 46130, 46136, 46142, 46148, + 46154, 46158, 46162, 46165, 46168, 46172, 46179, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46186, 46189, 46193, + 46197, 46203, 46209, 46215, 46223, 46230, 46234, 46242, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46247, 46250, 46253, 46256, + 46259, 46262, 46265, 46269, 46272, 46276, 46280, 46284, 46288, 46292, + 46296, 46300, 46304, 46308, 46312, 46316, 46320, 46323, 46326, 46329, + 46332, 46335, 46338, 46342, 46345, 46349, 46353, 46357, 46361, 46365, + 46369, 46373, 46377, 46381, 46385, 46389, 46393, 46399, 46405, 46411, + 46418, 46425, 46432, 46439, 46446, 46453, 46460, 46467, 46474, 46481, + 46488, 46495, 46502, 46509, 46516, 46523, 46530, 46535, 46541, 46547, + 46553, 46558, 46564, 46570, 46576, 46581, 46587, 46593, 46598, 46604, + 46610, 46615, 46621, 46627, 46632, 46638, 46644, 46649, 46655, 46661, + 46667, 46673, 46679, 46684, 46690, 46696, 46702, 46707, 46713, 46719, + 46725, 46730, 46736, 46742, 46747, 46753, 46759, 46764, 46770, 46776, + 46781, 46787, 46793, 46798, 46804, 46810, 46816, 46822, 46828, 46833, + 46839, 46845, 46851, 46856, 46862, 46868, 46874, 46879, 46885, 46891, + 46896, 46902, 46908, 46913, 46919, 46925, 46930, 46936, 46942, 46947, + 46953, 46959, 46965, 46971, 46977, 46981, 46986, 46991, 46996, 47001, + 47006, 47011, 47016, 47021, 47026, 47031, 47035, 47039, 47043, 47047, + 47051, 47055, 47060, 47064, 47069, 47074, 47079, 47084, 47089, 47094, + 47099, 47108, 47117, 47126, 47135, 47144, 47153, 47162, 47171, 47178, + 47186, 47194, 47201, 47208, 47216, 47224, 47231, 47238, 47246, 47254, + 47261, 47268, 47276, 47284, 47291, 47298, 47306, 47315, 47324, 47332, + 47341, 47350, 47357, 47364, 47372, 47381, 47390, 47398, 47407, 47416, + 47423, 47430, 47439, 47448, 47457, 47466, 47475, 47484, 47491, 47498, + 47507, 47516, 47525, 47534, 47543, 47552, 47559, 47566, 47575, 47584, + 47593, 47603, 47613, 47622, 47632, 47642, 47652, 47662, 47672, 47682, + 47691, 47700, 47707, 47715, 47723, 47731, 47739, 47744, 47749, 47758, + 47766, 47773, 47782, 47790, 47797, 47806, 47814, 47821, 47830, 47838, + 47845, 47854, 47862, 47869, 47878, 47886, 47893, 47903, 47912, 47919, + 47929, 47938, 47945, 47955, 47964, 47971, 47980, 47989, 47998, 48007, + 48021, 48035, 48042, 48047, 48052, 48057, 48062, 48067, 48072, 48077, + 48082, 48090, 48098, 48106, 48114, 48119, 48126, 48133, 48140, 48145, + 48153, 48160, 48168, 48172, 48179, 48185, 48192, 48196, 48202, 48208, + 48214, 48218, 48221, 48225, 48229, 48236, 48242, 48248, 48254, 48260, + 48274, 48284, 48298, 48312, 48318, 48328, 48342, 48345, 48348, 48355, + 48363, 48369, 48374, 48382, 48394, 48406, 48414, 48418, 48422, 48425, + 48428, 48432, 48436, 48439, 48442, 48447, 48452, 48458, 48464, 48469, + 48474, 48480, 48486, 48491, 48496, 48501, 48506, 48512, 48518, 48523, + 48528, 48534, 48540, 48545, 48550, 48553, 48556, 48565, 48567, 48569, + 48572, 48576, 48582, 48584, 48587, 48594, 48601, 48609, 48617, 48627, + 48641, 48646, 48651, 48655, 48660, 48668, 48676, 48685, 48694, 48703, + 48712, 48717, 48722, 48728, 48734, 48740, 48746, 48749, 48755, 48761, + 48771, 48781, 48789, 48797, 48806, 48815, 48819, 48827, 48835, 48843, + 48851, 48860, 48869, 48878, 48887, 48892, 48897, 48902, 48907, 48912, + 48918, 48924, 48929, 48935, 48937, 48939, 48941, 48943, 48946, 48949, + 48951, 48953, 48955, 48959, 48963, 48965, 48967, 48970, 48973, 48977, + 48983, 48989, 48991, 48998, 49002, 49007, 49012, 49014, 49024, 49030, + 49036, 49042, 49048, 49054, 49060, 49065, 49068, 49071, 49074, 49076, + 49078, 49082, 49086, 49091, 49096, 49101, 49104, 49108, 49113, 49116, + 49120, 49125, 49130, 49135, 49140, 49145, 49150, 49155, 49160, 49165, + 49170, 49175, 49180, 49186, 49192, 49198, 49200, 49203, 49205, 49208, + 49210, 49212, 49214, 49216, 49218, 49220, 49222, 49224, 49226, 49228, + 49230, 49232, 49234, 49236, 49238, 49240, 49242, 49247, 49252, 49257, + 49262, 49267, 49272, 49277, 49282, 49287, 49292, 49297, 49302, 49307, + 49312, 49317, 49322, 49327, 49332, 49337, 49342, 49346, 49350, 49354, + 49360, 49366, 49371, 49376, 49381, 49387, 49393, 49398, 49406, 49414, + 49422, 49430, 49438, 49446, 49454, 49462, 49468, 49473, 49478, 49483, + 49486, 49490, 49494, 49498, 49502, 49506, 49510, 49517, 49524, 49532, + 49540, 49545, 49550, 49557, 49564, 49571, 49578, 49581, 49584, 49589, + 49591, 49595, 49600, 49602, 49604, 49606, 49608, 49613, 49616, 49618, + 49623, 49630, 49637, 49640, 49644, 49649, 49654, 49662, 49668, 49674, + 49686, 49693, 49701, 49706, 49711, 49717, 49720, 49723, 49728, 49730, + 49734, 49736, 49738, 49740, 49742, 49744, 49746, 49751, 49753, 49755, + 49757, 49759, 49763, 49765, 49768, 49773, 49778, 49783, 49788, 49794, + 49800, 49802, 49805, 49812, 49819, 49826, 49833, 49837, 49841, 49843, + 49845, 49849, 49855, 49860, 49862, 49866, 49875, 49883, 49891, 49897, + 49903, 49908, 49914, 49919, 49922, 49936, 49939, 49944, 49949, 49955, + 49965, 49967, 49973, 49979, 49983, 49990, 49994, 49996, 49998, 50002, + 50008, 50013, 50019, 50021, 50027, 50029, 50035, 50037, 50039, 50044, + 50046, 50050, 50055, 50057, 50062, 50067, 50071, 50078, 50088, 50093, + 50099, 50102, 50108, 50111, 50116, 50121, 50125, 50127, 50129, 50133, + 50137, 50141, 50145, 50150, 50152, 50157, 50160, 50163, 50166, 50170, + 50174, 50179, 50183, 50188, 50193, 50197, 50202, 50208, 50211, 50217, + 50222, 50226, 50231, 50237, 50243, 50250, 50256, 50263, 50270, 50272, + 50279, 50283, 50289, 50295, 50300, 50306, 50310, 50315, 50318, 50323, + 50329, 50336, 50344, 50351, 50360, 50370, 50377, 50383, 50387, 50394, + 50399, 50408, 50411, 50414, 50423, 50433, 50440, 50442, 50448, 50453, + 50455, 50458, 50462, 50470, 50479, 50482, 50487, 50492, 50500, 50508, + 50516, 50524, 50530, 50536, 50542, 50550, 50555, 50558, 50562, 50565, + 50577, 50587, 50598, 50607, 50618, 50628, 50637, 50643, 50651, 50655, + 50663, 50667, 50675, 50682, 50689, 50698, 50707, 50717, 50727, 50737, + 50747, 50756, 50765, 50775, 50785, 50794, 50803, 50809, 50815, 50821, + 50827, 50833, 50839, 50846, 50852, 50859, 50866, 50872, 50878, 50884, + 50890, 50896, 50902, 50909, 50915, 50922, 50929, 50936, 50943, 50950, + 50957, 50964, 50971, 50979, 50986, 50994, 51002, 51007, 51010, 51014, + 51018, 51024, 51027, 51032, 51038, 51043, 51047, 51052, 51058, 51065, + 51068, 51075, 51082, 51086, 51094, 51102, 51107, 51113, 51118, 51123, + 51130, 51137, 51145, 51153, 51162, 51166, 51175, 51180, 51184, 51191, + 51195, 51201, 51209, 51214, 51221, 51225, 51230, 51234, 51239, 51243, + 51248, 51253, 51262, 51264, 51267, 51270, 51277, 51284, 51290, 51298, + 51304, 51311, 51316, 51319, 51324, 51329, 51334, 51342, 51346, 51353, + 51361, 51369, 51374, 51379, 51385, 51390, 51395, 51401, 51406, 51409, + 51413, 51417, 51424, 51434, 51439, 51448, 51457, 51463, 51469, 51474, + 51479, 51484, 51489, 51495, 51501, 51509, 51517, 51523, 51529, 51533, + 51537, 51544, 51551, 51557, 51560, 51563, 51567, 51571, 51575, 51580, + 51586, 51592, 51599, 51606, 51611, 51615, 51619, 51623, 51627, 51631, + 51635, 51639, 51643, 51647, 51651, 51655, 51659, 51663, 51667, 51671, + 51675, 51679, 51683, 51687, 51691, 51695, 51699, 51703, 51707, 51711, + 51715, 51719, 51723, 51727, 51731, 51735, 51739, 51743, 51747, 51751, + 51755, 51759, 51763, 51767, 51771, 51775, 51779, 51783, 51787, 51791, + 51795, 51799, 51803, 51807, 51811, 51815, 51819, 51823, 51827, 51831, + 51835, 51839, 51843, 51847, 51851, 51855, 51859, 51863, 51867, 51871, + 51875, 51879, 51883, 51887, 51891, 51895, 51899, 51903, 51907, 51911, + 51915, 51919, 51923, 51927, 51931, 51935, 51939, 51943, 51947, 51951, + 51955, 51959, 51963, 51967, 51971, 51975, 51979, 51983, 51987, 51991, + 51995, 51999, 52003, 52007, 52011, 52015, 52019, 52023, 52027, 52031, + 52035, 52039, 52043, 52047, 52051, 52055, 52059, 52063, 52067, 52071, + 52075, 52079, 52083, 52087, 52091, 52095, 52099, 52103, 52107, 52111, + 52115, 52119, 52123, 52127, 52131, 52135, 52139, 52143, 52147, 52151, + 52155, 52159, 52163, 52167, 52171, 52175, 52179, 52183, 52187, 52191, + 52195, 52199, 52203, 52207, 52211, 52215, 52219, 52223, 52227, 52231, + 52235, 52239, 52243, 52247, 52251, 52255, 52259, 52263, 52267, 52271, + 52275, 52279, 52283, 52287, 52291, 52295, 52299, 52303, 52307, 52311, + 52315, 52319, 52323, 52327, 52331, 52335, 52339, 52343, 52347, 52351, + 52355, 52359, 52363, 52367, 52371, 52375, 52379, 52383, 52387, 52391, + 52395, 52399, 52403, 52407, 52411, 52415, 52419, 52423, 52427, 52431, + 52435, 52439, 52443, 52447, 52451, 52455, 52459, 52463, 52467, 52471, + 52475, 52479, 52483, 52487, 52491, 52495, 52499, 52503, 52507, 52511, + 52515, 52519, 52523, 52527, 52531, 52535, 52539, 52543, 52547, 52551, + 52555, 52559, 52563, 52567, 52571, 52575, 52579, 52583, 52587, 52591, + 52595, 52599, 52603, 52607, 52611, 52615, 52619, 52623, 52627, 52631, + 52635, 52642, 52650, 52656, 52662, 52669, 52676, 52682, 52688, 52694, + 52700, 52704, 52708, 52713, 52718, 52724, 52730, 52738, 52745, 52750, + 52755, 52763, 52772, 52779, 52789, 52800, 52803, 52806, 52810, 52814, + 52821, 52828, 52839, 52850, 52859, 52868, 52874, 52880, 52887, 52894, + 52903, 52913, 52924, 52934, 52944, 52954, 52965, 52976, 52986, 52997, + 53007, 53017, 53026, 53036, 53046, 53056, 53066, 53073, 53080, 53087, + 53094, 53104, 53114, 53122, 53130, 53137, 53144, 53151, 53158, 53165, + 53170, 53175, 53181, 53189, 53198, 53206, 53214, 53222, 53230, 53238, + 53246, 53254, 53262, 53271, 53280, 53289, 53298, 53307, 53316, 53325, + 53334, 53343, 53352, 53361, 53370, 53379, 53388, 53397, 53406, 53420, + 53435, 53449, 53464, 53478, 53492, 53506, 53520, 53530, 53541, 53551, + 53562, 53577, 53592, 53600, 53606, 53613, 53620, 53627, 53634, 53639, + 53645, 53650, 53655, 53661, 53666, 53671, 53676, 53681, 53686, 53693, + 53699, 53707, 53712, 53717, 53721, 53725, 53733, 53741, 53749, 53757, + 53764, 53771, 53784, 53797, 53810, 53823, 53831, 53839, 53845, 53851, + 53858, 53865, 53872, 53879, 53883, 53888, 53896, 53904, 53912, 53919, + 53923, 53931, 53939, 53943, 53947, 53952, 53959, 53967, 53975, 53994, + 54013, 54032, 54051, 54070, 54089, 54108, 54127, 54133, 54140, 54149, + 54157, 54165, 54171, 54174, 54177, 54182, 54185, 54205, 54212, 54218, + 54224, 54228, 54231, 54234, 54237, 54249, 54263, 54270, 54277, 54280, + 54284, 54287, 54292, 54297, 54302, 54308, 54317, 54324, 54331, 54339, + 54346, 54353, 54356, 54362, 54368, 54371, 54374, 54379, 54384, 54390, + 54396, 54400, 54405, 54412, 54416, 54422, 54426, 54430, 54438, 54450, + 54459, 54463, 54465, 54474, 54483, 54489, 54492, 54498, 54504, 54509, + 54514, 54519, 54524, 54529, 54534, 54536, 54542, 54547, 54555, 54559, + 54565, 54568, 54572, 54579, 54586, 54588, 54590, 54596, 54602, 54608, + 54617, 54626, 54633, 54640, 54646, 54653, 54658, 54663, 54668, 54674, + 54680, 54685, 54692, 54696, 54700, 54713, 54726, 54738, 54747, 54753, + 54760, 54765, 54770, 54775, 54780, 54785, 54787, 54794, 54802, 54810, + 54818, 54825, 54833, 54839, 54844, 54850, 54856, 54862, 54869, 54875, + 54883, 54891, 54899, 54907, 54915, 54921, 54927, 54936, 54940, 54949, + 54958, 54967, 54975, 54979, 54985, 54992, 54999, 55003, 55009, 55017, + 55023, 55028, 55034, 55039, 55044, 55051, 55058, 55063, 55068, 55076, + 55084, 55094, 55104, 55111, 55118, 55122, 55126, 55138, 55144, 55151, + 55156, 55161, 55168, 55175, 55181, 55187, 55197, 55204, 55212, 55220, + 55229, 55236, 55242, 55249, 55255, 55263, 55271, 55279, 55287, 55293, + 55298, 55308, 55319, 55326, 55335, 55341, 55346, 55351, 55361, 55368, + 55374, 55380, 55388, 55393, 55400, 55407, 55418, 55425, 55432, 55439, + 55446, 55453, 55461, 55469, 55482, 55495, 55507, 55519, 55533, 55547, + 55553, 55559, 55568, 55577, 55584, 55591, 55600, 55609, 55618, 55627, + 55635, 55643, 55653, 55663, 55677, 55691, 55700, 55709, 55722, 55735, + 55744, 55753, 55764, 55775, 55781, 55787, 55796, 55805, 55810, 55815, + 55823, 55829, 55835, 55843, 55851, 55864, 55877, 55881, 55885, 55893, + 55901, 55908, 55916, 55924, 55933, 55942, 55948, 55954, 55961, 55968, + 55975, 55982, 55991, 56000, 56003, 56006, 56011, 56016, 56022, 56028, + 56035, 56042, 56053, 56064, 56071, 56078, 56086, 56094, 56102, 56110, + 56118, 56126, 56132, 56138, 56142, 56146, 56154, 56162, 56167, 56172, + 56177, 56182, 56188, 56202, 56209, 56216, 56220, 56222, 56224, 56229, + 56234, 56239, 56244, 56252, 56259, 56266, 56274, 56286, 56294, 56302, + 56313, 56317, 56321, 56327, 56335, 56348, 56355, 56362, 56369, 56375, + 56382, 56391, 56400, 56406, 56412, 56418, 56428, 56438, 56446, 56455, + 56460, 56463, 56468, 56473, 56478, 56484, 56490, 56494, 56497, 56500, + 56503, 56508, 56513, 56519, 56525, 56529, 56533, 56540, 56547, 56554, + 56561, 56568, 56575, 56585, 56595, 56602, 56609, 56617, 56625, 56629, + 56634, 56639, 56645, 56651, 56654, 56657, 56660, 56663, 56668, 56673, + 56678, 56683, 56688, 56693, 56697, 56701, 56705, 56710, 56715, 56719, + 56723, 56729, 56733, 56739, 56744, 56751, 56759, 56766, 56774, 56781, + 56789, 56798, 56805, 56815, 56826, 56832, 56841, 56847, 56856, 56865, + 56871, 56877, 56881, 56885, 56894, 56903, 56910, 56917, 56926, 56935, + 56941, 56947, 56954, 56959, 56963, 56967, 56972, 56977, 56982, 56990, + 56998, 57001, 57005, 57014, 57024, 57033, 57043, 57054, 57067, 57071, + 57075, 57079, 57083, 57088, 57093, 57099, 57105, 57112, 57119, 57125, + 57131, 57137, 57143, 57151, 57159, 57166, 57173, 57180, 0, 0, 57187, + 57196, 57205, 57215, 57225, 57234, 57243, 57252, 57261, 57267, 57272, + 57281, 57291, 57300, 57310, 57317, 57324, 57331, 57338, 57343, 57348, + 57353, 57358, 57366, 57375, 57383, 57392, 57396, 57400, 57404, 57408, + 57418, 0, 0, 57421, 57430, 57439, 57448, 57457, 57463, 57469, 57475, + 57481, 57491, 57501, 57511, 57521, 57531, 57541, 57551, 57561, 57568, + 57575, 57582, 57589, 57596, 57603, 57610, 57617, 57623, 57629, 57635, + 57641, 57647, 57653, 57659, 57665, 57676, 0, 0, 0, 57686, 57693, 57696, + 57700, 57704, 57709, 57714, 57719, 57722, 57731, 57740, 57749, 0, 57758, + 57764, 57770, 57778, 57788, 57795, 57804, 57809, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57812, 57821, + 57830, 57839, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57848, + 57853, 57858, 57863, 57868, 57873, 57878, 57883, 57888, 57893, 57898, + 57904, 57908, 57913, 57918, 57923, 57928, 57933, 57938, 57943, 57948, + 57953, 57958, 57963, 57968, 57973, 57978, 57983, 57988, 57993, 57998, + 58003, 58008, 58013, 58018, 58024, 58029, 58035, 58044, 58049, 58057, + 58064, 58073, 58078, 58083, 58088, 58094, 0, 58101, 58106, 58111, 58116, + 58121, 58126, 58131, 58136, 58141, 58146, 58151, 58157, 58161, 58166, + 58171, 58176, 58181, 58186, 58191, 58196, 58201, 58206, 58211, 58216, + 58221, 58226, 58231, 58236, 58241, 58246, 58251, 58256, 58261, 58266, + 58271, 58277, 58282, 58288, 58297, 58302, 58310, 58317, 58326, 58331, + 58336, 58341, 58347, 0, 58354, 58362, 58370, 58379, 58386, 58394, 58400, + 58409, 58417, 58425, 58433, 58441, 58449, 58457, 58462, 58469, 58475, + 58482, 58490, 58497, 58504, 58512, 58518, 58524, 58531, 58538, 58548, + 58558, 58565, 58572, 58577, 58587, 58597, 58602, 58607, 58612, 58617, + 58622, 58627, 58632, 58637, 58642, 58647, 58652, 58657, 58662, 58667, + 58672, 58677, 58682, 58687, 58692, 58697, 58702, 58707, 58712, 58717, + 58722, 58727, 58732, 58737, 58742, 58747, 58751, 58755, 58760, 58765, + 58770, 58775, 58780, 58785, 58790, 58795, 58800, 58805, 58810, 58815, + 58820, 58825, 58830, 58835, 58840, 58845, 58852, 58859, 58866, 58873, + 58880, 58887, 58894, 58901, 58908, 58915, 58922, 58929, 58936, 58943, + 58948, 58953, 58960, 58967, 58974, 58981, 58988, 58995, 59002, 59009, + 59016, 59023, 59030, 59037, 59043, 59049, 59055, 59061, 59068, 59075, + 59082, 59089, 59096, 59103, 59110, 59117, 59124, 59131, 59139, 59147, + 59155, 59163, 59171, 59179, 59187, 59195, 59199, 59205, 59211, 59215, + 59221, 59227, 59233, 59240, 59247, 59254, 59261, 59266, 59272, 59278, + 59285, 0, 0, 0, 0, 0, 59292, 59300, 59309, 59318, 59326, 59332, 59337, + 59342, 59347, 59352, 59357, 59362, 59367, 59372, 59377, 59382, 59387, + 59392, 59397, 59402, 59407, 59412, 59417, 59422, 59427, 59432, 59437, + 59442, 59447, 59452, 59457, 59462, 59467, 59472, 59477, 59482, 59487, + 59492, 59497, 59502, 59507, 59512, 59517, 59522, 59527, 0, 59532, 0, 0, + 0, 0, 0, 59537, 0, 0, 59542, 59546, 59551, 59556, 59561, 59566, 59575, + 59580, 59585, 59590, 59595, 59600, 59605, 59610, 59615, 59622, 59627, + 59632, 59641, 59648, 59653, 59658, 59663, 59670, 59675, 59682, 59687, + 59692, 59699, 59706, 59711, 59716, 59721, 59728, 59735, 59740, 59745, + 59750, 59755, 59760, 59767, 59774, 59779, 59784, 59789, 59794, 59799, + 59804, 59809, 59814, 59819, 59824, 59829, 59836, 59841, 59846, 0, 0, 0, + 0, 0, 0, 0, 59851, 59858, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 59863, 59868, 59872, 59876, 59880, 59884, 59888, 59892, 59896, 59900, + 59904, 59908, 59914, 59918, 59922, 59926, 59930, 59934, 59938, 59942, + 59946, 59950, 59954, 59958, 0, 0, 0, 0, 0, 0, 0, 0, 0, 59962, 59966, + 59970, 59974, 59978, 59982, 59986, 0, 59990, 59994, 59998, 60002, 60006, + 60010, 60014, 0, 60018, 60022, 60026, 60030, 60034, 60038, 60042, 0, + 60046, 60050, 60054, 60058, 60062, 60066, 60070, 0, 60074, 60078, 60082, + 60086, 60090, 60094, 60098, 0, 60102, 60106, 60110, 60114, 60118, 60122, + 60126, 0, 60130, 60134, 60138, 60142, 60146, 60150, 60154, 0, 60158, + 60162, 60166, 60170, 60174, 60178, 60182, 0, 60186, 60191, 60196, 60201, + 60206, 60211, 60216, 60220, 60225, 60230, 60235, 60239, 60244, 60249, + 60254, 60259, 60263, 60268, 60273, 60278, 60283, 60288, 60293, 60297, + 60302, 60307, 60314, 60319, 60324, 60330, 60337, 60344, 60353, 60360, + 60369, 60373, 60377, 60383, 60389, 60395, 60403, 60409, 60413, 60417, + 60421, 60427, 60433, 60437, 60439, 60443, 60449, 60451, 60455, 60458, + 60461, 60467, 60472, 60476, 60480, 60485, 60491, 60496, 60501, 60506, + 60511, 60518, 60525, 60530, 60535, 60540, 60545, 60550, 60555, 60559, + 60563, 60570, 60577, 60583, 60587, 60592, 60595, 60599, 60606, 60610, + 60614, 60618, 60622, 60628, 60634, 60638, 60644, 60648, 60652, 60658, + 60663, 60668, 60670, 60673, 60677, 60683, 60689, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60041, 60045, 60049, 60054, 60059, 60064, 60068, 60072, 60076, 60081, - 60086, 60090, 60094, 60098, 60102, 60107, 60112, 60117, 60122, 60126, - 60130, 60135, 60140, 60145, 60150, 60154, 0, 60158, 60162, 60166, 60170, - 60174, 60178, 60182, 60187, 60192, 60196, 60201, 60206, 60215, 60219, - 60223, 60227, 60234, 60238, 60243, 60248, 60252, 60256, 60262, 60267, - 60272, 60277, 60282, 60286, 60290, 60294, 60298, 60302, 60307, 60312, - 60316, 60320, 60325, 60330, 60335, 60339, 60343, 60348, 60353, 60359, - 60365, 60369, 60375, 60381, 60385, 60391, 60397, 60402, 60407, 60411, - 60417, 60421, 60425, 60431, 60437, 60442, 60447, 60451, 60455, 60463, - 60469, 60475, 60481, 60486, 60491, 60496, 60502, 60506, 60512, 60516, - 60520, 60526, 60532, 60538, 60544, 60550, 60556, 60562, 60568, 60574, - 60580, 60586, 60592, 60596, 60602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60608, 60611, 60615, 60619, 60623, 60627, 60630, 60633, 60637, 60641, - 60645, 60649, 60652, 60657, 60661, 60665, 60669, 60674, 60678, 60682, - 60686, 60690, 60696, 60702, 60706, 60710, 60714, 60718, 60722, 60726, - 60730, 60734, 60738, 60742, 60746, 60752, 60756, 60760, 60764, 60768, - 60772, 60776, 60780, 60784, 60788, 60792, 60796, 60800, 60804, 60808, - 60812, 60816, 60822, 60828, 60833, 60838, 60842, 60846, 60850, 60854, - 60858, 60862, 60866, 60870, 60874, 60878, 60882, 60886, 60890, 60894, - 60898, 60902, 60906, 60910, 60914, 60918, 60922, 60926, 60930, 60934, - 60940, 60944, 60948, 60952, 60956, 60960, 60964, 60968, 60972, 60977, - 60984, 60988, 60992, 60996, 61000, 61004, 61008, 61012, 61016, 61020, - 61024, 61028, 61032, 61039, 61043, 61049, 61053, 61057, 61061, 61065, - 61069, 61072, 61076, 61080, 61084, 61088, 61092, 61096, 61100, 61104, - 61108, 61112, 61116, 61120, 61124, 61128, 61132, 61136, 61140, 61144, - 61148, 61152, 61156, 61160, 61164, 61168, 61172, 61176, 61180, 61184, - 61188, 61192, 61196, 61200, 61206, 61210, 61214, 61218, 61222, 61226, - 61230, 61234, 61238, 61242, 61246, 61250, 61254, 61258, 61262, 61266, - 61270, 61274, 61278, 61282, 61286, 61290, 61294, 61298, 61302, 61306, - 61310, 61314, 61322, 61326, 61330, 61334, 61338, 61342, 61348, 61352, - 61356, 61360, 61364, 61368, 61372, 61376, 61380, 61384, 61388, 61392, - 61396, 61400, 61406, 61410, 61414, 61418, 61422, 61426, 61430, 61434, - 61438, 61442, 61446, 61450, 61454, 61458, 61462, 61466, 61470, 61474, - 61478, 61482, 61486, 61490, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61494, 61503, 61511, 61522, 61532, - 61540, 61549, 61558, 61568, 61580, 61592, 61604, 0, 0, 0, 0, 61610, - 61613, 61616, 61621, 61624, 61631, 61635, 61639, 61643, 61647, 61651, - 61656, 61661, 61665, 61669, 61674, 61679, 61684, 61689, 61692, 61695, - 61701, 61707, 61712, 61717, 61724, 61731, 61735, 61739, 61743, 61751, - 61757, 61764, 61769, 61774, 61779, 61784, 61789, 61794, 61799, 61805, - 61810, 61816, 61821, 61826, 61831, 61836, 61842, 61847, 61851, 61857, - 61868, 61878, 61893, 61903, 61907, 61917, 61923, 61929, 61935, 61940, - 61943, 61948, 61952, 0, 61958, 61962, 61965, 61969, 61972, 61976, 61979, - 61983, 61986, 61990, 61993, 61996, 62000, 62004, 62008, 62012, 62016, - 62020, 62024, 62028, 62032, 62036, 62040, 62044, 62048, 62052, 62056, - 62060, 62064, 62068, 62072, 62076, 62080, 62084, 62088, 62093, 62097, - 62101, 62105, 62109, 62112, 62116, 62120, 62124, 62128, 62132, 62136, - 62139, 62143, 62146, 62150, 62154, 62158, 62162, 62166, 62170, 62174, - 62178, 62182, 62186, 62190, 62194, 62197, 62201, 62205, 62209, 62213, - 62217, 62220, 62225, 62229, 62234, 62238, 62242, 62246, 62250, 62254, - 62258, 62263, 62267, 62271, 62275, 62279, 62283, 62287, 62291, 0, 0, - 62296, 62304, 62312, 62319, 62326, 62330, 62336, 62341, 62346, 62350, - 62353, 62357, 62360, 62364, 62367, 62371, 62374, 62378, 62381, 62384, - 62388, 62392, 62396, 62400, 62404, 62408, 62412, 62416, 62420, 62424, - 62428, 62432, 62436, 62440, 62444, 62448, 62452, 62456, 62460, 62464, - 62468, 62472, 62476, 62481, 62485, 62489, 62493, 62497, 62500, 62504, - 62508, 62512, 62516, 62520, 62524, 62527, 62531, 62534, 62538, 62542, - 62546, 62550, 62554, 62558, 62562, 62566, 62570, 62574, 62578, 62582, - 62585, 62589, 62593, 62597, 62601, 62605, 62608, 62613, 62617, 62622, - 62626, 62630, 62634, 62638, 62642, 62646, 62651, 62655, 62659, 62663, - 62667, 62671, 62675, 62679, 62684, 62688, 62692, 62696, 62700, 62704, - 62711, 62715, 62721, 0, 0, 0, 0, 0, 62726, 62731, 62736, 62741, 62746, - 62751, 62756, 62761, 62765, 62770, 62775, 62780, 62785, 62790, 62795, - 62800, 62805, 62810, 62814, 62819, 62824, 62828, 62832, 62836, 62840, - 62845, 62850, 62855, 62860, 62865, 62870, 62875, 62880, 62885, 62890, - 62894, 62898, 62903, 62908, 62913, 62918, 0, 0, 0, 62923, 62927, 62931, - 62935, 62939, 62943, 62947, 62951, 62955, 62959, 62963, 62967, 62971, - 62975, 62979, 62983, 62987, 62991, 62995, 62999, 63003, 63007, 63011, - 63015, 63019, 63023, 63027, 63031, 63035, 63039, 63043, 63046, 63050, - 63053, 63057, 63061, 63064, 63068, 63072, 63075, 63079, 63083, 63087, - 63091, 63094, 63098, 63102, 63106, 63110, 63114, 63118, 63121, 63124, - 63128, 63132, 63136, 63140, 63144, 63148, 63152, 63156, 63160, 63164, - 63168, 63172, 63176, 63180, 63184, 63188, 63192, 63196, 63200, 63204, - 63208, 63212, 63216, 63220, 63224, 63228, 63232, 63236, 63240, 63244, - 63248, 63252, 63256, 63260, 63264, 63268, 63272, 63276, 63280, 63284, - 63288, 0, 63292, 63298, 63304, 63309, 63314, 63319, 63325, 63331, 63336, - 63342, 63348, 63354, 63360, 63366, 63372, 63378, 63384, 63389, 63394, - 63399, 63404, 63409, 63414, 63419, 63424, 63429, 63434, 63439, 63444, - 63449, 63454, 63459, 63464, 63469, 63474, 63479, 63484, 63490, 63496, - 63502, 63508, 63513, 63518, 0, 0, 0, 0, 0, 63523, 63528, 63533, 63538, - 63543, 63548, 63553, 63558, 63563, 63568, 63573, 63578, 63583, 63588, - 63593, 63598, 63603, 63608, 63612, 63617, 63622, 63627, 63632, 63637, - 63642, 63647, 63652, 63657, 63662, 63667, 63672, 63677, 63682, 63687, - 63692, 63697, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63702, 63707, 63712, - 63717, 63721, 63726, 63730, 63735, 63740, 63745, 63750, 63755, 63760, - 63765, 63770, 63775, 63780, 63784, 63788, 63792, 63796, 63800, 63804, - 63808, 63812, 63816, 63820, 63824, 63828, 63832, 63836, 63841, 63846, - 63851, 63856, 63861, 63866, 63871, 63876, 63881, 63886, 63891, 63896, - 63901, 63906, 63911, 63917, 0, 63924, 63927, 63930, 63933, 63936, 63939, - 63942, 63946, 63949, 63953, 63957, 63961, 63965, 63969, 63973, 63977, - 63981, 63985, 63989, 63993, 63997, 64001, 64005, 64009, 64013, 64017, - 64021, 64025, 64029, 64033, 64037, 64041, 64045, 64049, 64053, 64057, - 64061, 64065, 64069, 64073, 64077, 64086, 64095, 64104, 64113, 64122, - 64131, 64140, 64149, 64152, 64157, 64162, 64167, 64172, 64177, 64182, - 64188, 64193, 64199, 64203, 64208, 64213, 64218, 64223, 64228, 64232, - 64236, 64240, 64244, 64248, 64252, 64256, 64260, 64264, 64268, 64272, - 64276, 64280, 64284, 64289, 64294, 64299, 64304, 64309, 64314, 64319, - 64324, 64329, 64334, 64339, 64344, 64349, 64354, 64360, 64366, 64371, - 64376, 64379, 64382, 64385, 64388, 64391, 64394, 64398, 64401, 64405, - 64409, 64413, 64417, 64421, 64425, 64429, 64433, 64437, 64441, 64445, - 64449, 64453, 64457, 64461, 64465, 64469, 64473, 64477, 64481, 64485, - 64489, 64493, 64497, 64501, 64505, 64509, 64513, 64517, 64521, 64525, - 64529, 64533, 64537, 64541, 64545, 64549, 64553, 64557, 64561, 64565, - 64570, 64576, 64581, 64587, 64591, 64596, 64601, 64606, 64611, 64616, - 64621, 64627, 64632, 64638, 64642, 64649, 64656, 64663, 64670, 64677, - 64684, 64691, 64698, 64705, 64712, 64719, 64726, 64729, 64732, 64735, - 64740, 64743, 64746, 64749, 64752, 64755, 64758, 64762, 64766, 64770, - 64774, 64778, 64782, 64786, 64790, 64794, 64798, 64802, 64806, 64810, - 64813, 64817, 64821, 64825, 64829, 64833, 64836, 64840, 64844, 64848, - 64852, 64855, 64859, 64863, 64867, 64871, 64874, 64878, 64882, 64886, - 64890, 64894, 64898, 64902, 64906, 64910, 64914, 0, 64918, 64921, 64924, - 64927, 64930, 64933, 64936, 64939, 64942, 64945, 64948, 64951, 64954, - 64957, 64960, 64963, 64966, 64969, 64972, 64975, 64978, 64981, 64984, - 64987, 64990, 64993, 64996, 64999, 65002, 65005, 65008, 65011, 65014, - 65017, 65020, 65023, 65026, 65029, 65032, 65035, 65038, 65041, 65044, - 65047, 65050, 65053, 65056, 65059, 65062, 65065, 65068, 65071, 65074, - 65077, 65080, 65083, 65086, 65089, 65092, 65095, 65098, 65101, 65104, - 65107, 65110, 65113, 65116, 65119, 65122, 65125, 65128, 65131, 65134, - 65137, 65140, 65143, 65146, 65149, 65152, 65155, 65158, 65161, 65164, - 65167, 65170, 65173, 65176, 65179, 65182, 65191, 65199, 65207, 65215, - 65223, 65231, 65239, 65248, 65256, 65265, 65274, 65283, 65292, 65301, - 65310, 65319, 65328, 65337, 65346, 65355, 65364, 65373, 65382, 65391, - 65400, 65403, 65406, 65409, 65411, 65414, 65417, 65420, 65425, 65430, - 65433, 65440, 65447, 65454, 65461, 65464, 65469, 65472, 65476, 65478, - 65480, 65483, 65486, 65489, 65492, 65495, 65498, 65501, 65506, 65511, - 65514, 65517, 65520, 65523, 65526, 65529, 65532, 65536, 65539, 65542, - 65545, 65548, 65551, 65556, 65559, 65562, 65565, 65570, 65575, 65580, - 65585, 65590, 65595, 65600, 65605, 65610, 65618, 65620, 65623, 65626, - 65629, 65632, 65637, 65645, 65648, 65651, 65655, 65658, 65661, 65664, - 65669, 65672, 65675, 65680, 65683, 65686, 65691, 65694, 65697, 65702, - 65707, 65712, 65715, 65718, 65721, 65724, 65730, 65733, 65736, 65739, - 65741, 65744, 65747, 65750, 65755, 65758, 65761, 65764, 65767, 65770, - 65775, 65778, 65781, 65784, 65787, 65790, 65793, 65796, 65799, 65802, - 65808, 65813, 65821, 65829, 65837, 65845, 65853, 65861, 65870, 65878, - 65887, 65896, 65905, 65914, 65923, 65932, 65941, 65950, 65959, 65968, - 65977, 65986, 65995, 66004, 66013, 66022, 66031, 66040, 66049, 66058, - 66067, 66076, 66085, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 60693, 60697, 60701, 60706, 60711, 60716, 60720, 60724, 60728, + 60733, 60738, 60742, 60746, 60750, 60754, 60759, 60764, 60769, 60774, + 60778, 60782, 60787, 60792, 60797, 60802, 60806, 0, 60810, 60814, 60818, + 60822, 60826, 60830, 60834, 60839, 60844, 60848, 60853, 60858, 60867, + 60871, 60875, 60879, 60886, 60890, 60895, 60900, 60904, 60908, 60914, + 60919, 60924, 60929, 60934, 60938, 60942, 60946, 60950, 60954, 60959, + 60964, 60968, 60972, 60977, 60982, 60987, 60991, 60995, 61000, 61005, + 61011, 61017, 61021, 61027, 61033, 61037, 61043, 61049, 61054, 61059, + 61063, 61069, 61073, 61077, 61083, 61089, 61094, 61099, 61103, 61107, + 61115, 61121, 61127, 61133, 61138, 61143, 61148, 61154, 61158, 61164, + 61168, 61172, 61178, 61184, 61190, 61196, 61202, 61208, 61214, 61220, + 61226, 61232, 61238, 61244, 61248, 61254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 61260, 61263, 61267, 61271, 61275, 61279, 61282, 61285, 61289, + 61293, 61297, 61301, 61304, 61309, 61313, 61317, 61321, 61326, 61330, + 61334, 61338, 61342, 61348, 61354, 61358, 61362, 61366, 61370, 61374, + 61378, 61382, 61386, 61390, 61394, 61398, 61404, 61408, 61412, 61416, + 61420, 61424, 61428, 61432, 61436, 61440, 61444, 61448, 61452, 61456, + 61460, 61464, 61468, 61474, 61480, 61485, 61490, 61494, 61498, 61502, + 61506, 61510, 61514, 61518, 61522, 61526, 61530, 61534, 61538, 61542, + 61546, 61550, 61554, 61558, 61562, 61566, 61570, 61574, 61578, 61582, + 61586, 61592, 61596, 61600, 61604, 61608, 61612, 61616, 61620, 61624, + 61629, 61636, 61640, 61644, 61648, 61652, 61656, 61660, 61664, 61668, + 61672, 61676, 61680, 61684, 61691, 61695, 61701, 61705, 61709, 61713, + 61717, 61721, 61724, 61728, 61732, 61736, 61740, 61744, 61748, 61752, + 61756, 61760, 61764, 61768, 61772, 61776, 61780, 61784, 61788, 61792, + 61796, 61800, 61804, 61808, 61812, 61816, 61820, 61824, 61828, 61832, + 61836, 61840, 61844, 61848, 61852, 61858, 61862, 61866, 61870, 61874, + 61878, 61882, 61886, 61890, 61894, 61898, 61902, 61906, 61910, 61914, + 61918, 61922, 61926, 61930, 61934, 61938, 61942, 61946, 61950, 61954, + 61958, 61962, 61966, 61974, 61978, 61982, 61986, 61990, 61994, 62000, + 62004, 62008, 62012, 62016, 62020, 62024, 62028, 62032, 62036, 62040, + 62044, 62048, 62052, 62058, 62062, 62066, 62070, 62074, 62078, 62082, + 62086, 62090, 62094, 62098, 62102, 62106, 62110, 62114, 62118, 62122, + 62126, 62130, 62134, 62138, 62142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62146, 62155, 62163, 62174, 62184, + 62192, 62201, 62210, 62220, 62232, 62244, 62256, 0, 0, 0, 0, 62262, + 62265, 62268, 62273, 62276, 62283, 62287, 62291, 62295, 62299, 62303, + 62308, 62313, 62317, 62321, 62326, 62331, 62336, 62341, 62344, 62347, + 62353, 62359, 62364, 62369, 62376, 62383, 62387, 62391, 62395, 62403, + 62409, 62416, 62421, 62426, 62431, 62436, 62441, 62446, 62451, 62457, + 62462, 62468, 62473, 62478, 62483, 62488, 62494, 62499, 62503, 62509, + 62520, 62530, 62545, 62555, 62559, 62569, 62575, 62581, 62587, 62592, + 62595, 62600, 62604, 0, 62610, 62614, 62617, 62621, 62624, 62628, 62631, + 62635, 62638, 62642, 62645, 62648, 62652, 62656, 62660, 62664, 62668, + 62672, 62676, 62680, 62684, 62688, 62692, 62696, 62700, 62704, 62708, + 62712, 62716, 62720, 62724, 62728, 62732, 62736, 62740, 62745, 62749, + 62753, 62757, 62761, 62764, 62768, 62771, 62775, 62779, 62783, 62787, + 62790, 62794, 62797, 62801, 62805, 62809, 62813, 62817, 62821, 62825, + 62829, 62833, 62837, 62841, 62845, 62848, 62852, 62856, 62860, 62864, + 62868, 62871, 62876, 62880, 62885, 62889, 62893, 62897, 62901, 62905, + 62909, 62914, 62918, 62922, 62926, 62930, 62934, 62938, 62942, 0, 0, + 62947, 62955, 62963, 62970, 62977, 62981, 62987, 62992, 62997, 63001, + 63004, 63008, 63011, 63015, 63018, 63022, 63025, 63029, 63032, 63035, + 63039, 63043, 63047, 63051, 63055, 63059, 63063, 63067, 63071, 63075, + 63079, 63083, 63087, 63091, 63095, 63099, 63103, 63107, 63111, 63115, + 63119, 63123, 63127, 63132, 63136, 63140, 63144, 63148, 63151, 63155, + 63158, 63162, 63166, 63170, 63174, 63177, 63181, 63184, 63188, 63192, + 63196, 63200, 63204, 63208, 63212, 63216, 63220, 63224, 63228, 63232, + 63235, 63239, 63243, 63247, 63251, 63255, 63258, 63263, 63267, 63272, + 63276, 63280, 63284, 63288, 63292, 63296, 63301, 63305, 63309, 63313, + 63317, 63321, 63325, 63329, 63334, 63338, 63342, 63346, 63350, 63354, + 63361, 63365, 63371, 0, 0, 0, 0, 0, 63376, 63381, 63386, 63391, 63396, + 63401, 63406, 63411, 63415, 63420, 63425, 63430, 63435, 63440, 63445, + 63450, 63455, 63460, 63464, 63469, 63474, 63479, 63483, 63487, 63491, + 63496, 63501, 63506, 63511, 63516, 63521, 63526, 63531, 63536, 63541, + 63545, 63549, 63554, 63559, 63564, 63569, 0, 0, 0, 63574, 63578, 63582, + 63586, 63590, 63594, 63598, 63602, 63606, 63610, 63614, 63618, 63622, + 63626, 63630, 63634, 63638, 63642, 63646, 63650, 63654, 63658, 63662, + 63666, 63670, 63674, 63678, 63682, 63686, 63690, 63694, 63697, 63701, + 63704, 63708, 63712, 63715, 63719, 63723, 63726, 63730, 63734, 63738, + 63742, 63745, 63749, 63753, 63757, 63761, 63765, 63769, 63772, 63775, + 63779, 63783, 63787, 63791, 63795, 63799, 63803, 63807, 63811, 63815, + 63819, 63823, 63827, 63831, 63835, 63839, 63843, 63847, 63851, 63855, + 63859, 63863, 63867, 63871, 63875, 63879, 63883, 63887, 63891, 63895, + 63899, 63903, 63907, 63911, 63915, 63919, 63923, 63927, 63931, 63935, + 63939, 0, 63943, 63949, 63955, 63960, 63965, 63970, 63976, 63982, 63987, + 63993, 63999, 64005, 64011, 64017, 64023, 64029, 64035, 64040, 64045, + 64050, 64055, 64060, 64065, 64070, 64075, 64080, 64085, 64090, 64095, + 64100, 64105, 64110, 64115, 64120, 64125, 64130, 64135, 64141, 64147, + 64153, 64159, 64164, 64169, 0, 0, 0, 0, 0, 64174, 64179, 64184, 64189, + 64194, 64199, 64204, 64209, 64214, 64219, 64224, 64229, 64234, 64239, + 64244, 64249, 64254, 64259, 64264, 64269, 64274, 64279, 64284, 64289, + 64294, 64299, 64304, 64309, 64314, 64319, 64324, 64329, 64334, 64339, + 64344, 64349, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64354, 64359, 64364, + 64369, 64373, 64378, 64382, 64387, 64392, 64397, 64402, 64407, 64412, + 64417, 64422, 64427, 64432, 64436, 64440, 64444, 64448, 64452, 64456, + 64460, 64464, 64468, 64472, 64476, 64480, 64484, 64488, 64493, 64498, + 64503, 64508, 64513, 64518, 64523, 64528, 64533, 64538, 64543, 64548, + 64553, 64558, 64563, 64569, 0, 64576, 64580, 64584, 64588, 64592, 64596, + 64600, 64605, 64609, 64614, 64619, 64624, 64629, 64634, 64639, 64644, + 64649, 64654, 64659, 64664, 64669, 64674, 64679, 64684, 64689, 64694, + 64699, 64704, 64709, 64714, 64719, 64724, 64729, 64734, 64739, 64744, + 64749, 64754, 64759, 64764, 64769, 64778, 64787, 64796, 64805, 64814, + 64823, 64832, 64841, 64844, 64849, 64854, 64859, 64864, 64869, 64874, + 64880, 64885, 64891, 64895, 64900, 64905, 64910, 64915, 64920, 64924, + 64928, 64932, 64936, 64940, 64944, 64948, 64952, 64956, 64960, 64964, + 64968, 64972, 64976, 64981, 64986, 64991, 64996, 65001, 65006, 65011, + 65016, 65021, 65026, 65031, 65036, 65041, 65046, 65052, 65058, 65063, + 65068, 65072, 65076, 65080, 65084, 65088, 65092, 65097, 65101, 65106, + 65111, 65116, 65121, 65126, 65131, 65136, 65141, 65146, 65151, 65156, + 65161, 65166, 65171, 65176, 65181, 65186, 65191, 65196, 65201, 65206, + 65211, 65216, 65221, 65226, 65231, 65236, 65241, 65246, 65251, 65256, + 65261, 65266, 65271, 65276, 65281, 65286, 65291, 65296, 65301, 65306, + 65311, 65317, 65322, 65328, 65332, 65337, 65342, 65347, 65352, 65357, + 65362, 65368, 65373, 65379, 65383, 65390, 65397, 65404, 65411, 65418, + 65425, 65432, 65439, 65446, 65453, 65460, 65467, 65470, 65473, 65476, + 65481, 65484, 65487, 65490, 65493, 65496, 65499, 65503, 65507, 65511, + 65515, 65519, 65523, 65527, 65531, 65535, 65539, 65543, 65547, 65551, + 65554, 65557, 65561, 65565, 65569, 65573, 65576, 65580, 65584, 65588, + 65592, 65595, 65599, 65603, 65607, 65611, 65614, 65618, 65622, 65626, + 65630, 65634, 65638, 65642, 65646, 65650, 65654, 0, 65658, 65661, 65664, + 65667, 65670, 65673, 65676, 65679, 65682, 65685, 65688, 65691, 65694, + 65697, 65700, 65703, 65706, 65709, 65712, 65715, 65718, 65721, 65724, + 65727, 65730, 65733, 65736, 65739, 65742, 65745, 65748, 65751, 65754, + 65757, 65760, 65763, 65766, 65769, 65772, 65775, 65778, 65781, 65784, + 65787, 65790, 65793, 65796, 65799, 65802, 65805, 65808, 65811, 65814, + 65817, 65820, 65823, 65826, 65829, 65832, 65835, 65838, 65841, 65844, + 65847, 65850, 65853, 65856, 65859, 65862, 65865, 65868, 65871, 65874, + 65877, 65880, 65883, 65886, 65889, 65892, 65895, 65898, 65901, 65904, + 65907, 65910, 65913, 65916, 65919, 65922, 65931, 65939, 65947, 65955, + 65963, 65971, 65979, 65988, 65996, 66005, 66014, 66023, 66032, 66041, + 66050, 66059, 66068, 66077, 66086, 66095, 66104, 66113, 66122, 66131, + 66140, 66143, 66146, 66149, 66151, 66154, 66157, 66160, 66165, 66170, + 66173, 66180, 66187, 66194, 66201, 66204, 66209, 66211, 66215, 66217, + 66219, 66222, 66225, 66228, 66231, 66234, 66237, 66240, 66245, 66250, + 66253, 66256, 66259, 66262, 66265, 66268, 66271, 66275, 66278, 66281, + 66284, 66287, 66290, 66295, 66298, 66301, 66304, 66309, 66314, 66319, + 66324, 66329, 66334, 66339, 66344, 66350, 66358, 66360, 66363, 66366, + 66369, 66372, 66378, 66386, 66389, 66392, 66397, 66400, 66403, 66406, + 66411, 66414, 66417, 66422, 66425, 66428, 66433, 66436, 66439, 66444, + 66449, 66454, 66457, 66460, 66463, 66466, 66472, 66475, 66478, 66481, + 66483, 66486, 66489, 66492, 66497, 66500, 66503, 66506, 66509, 66512, + 66517, 66520, 66523, 66526, 66529, 66532, 66535, 66538, 66541, 66544, + 66550, 66555, 66563, 66571, 66579, 66587, 66595, 66603, 66612, 66620, + 66629, 66638, 66647, 66656, 66665, 66674, 66683, 66692, 66701, 66710, + 66719, 66728, 66737, 66746, 66755, 66764, 66773, 66782, 66791, 66800, + 66809, 66818, 66827, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -17994,305 +19113,305 @@ static unsigned int phrasebook_offset2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 66088, 66097, 66106, 66117, 66124, 66129, 66134, 66141, 66148, 66154, - 66159, 66164, 66169, 66174, 66181, 66186, 66191, 66196, 66207, 66212, - 66217, 66224, 66229, 66236, 66241, 66246, 66253, 66260, 66267, 66276, - 66285, 66290, 66295, 66300, 66307, 66312, 66322, 66329, 66334, 66339, - 66344, 66349, 66354, 66359, 66368, 66375, 66382, 66387, 66394, 66399, - 66406, 66415, 66426, 66431, 66440, 66445, 66452, 66461, 66470, 66475, - 66480, 66487, 66493, 66500, 66507, 66511, 66515, 66518, 66522, 66526, - 66530, 66534, 66538, 66542, 66546, 66549, 66553, 66557, 66561, 66565, - 66569, 66573, 66576, 66580, 66584, 66587, 66591, 66595, 66599, 66603, - 66607, 66611, 66615, 66619, 66623, 66627, 66631, 66635, 66639, 66643, - 66647, 66651, 66655, 66659, 66663, 66667, 66671, 66675, 66679, 66683, - 66687, 66691, 66695, 66699, 66703, 66707, 66711, 66715, 66719, 66723, - 66727, 66731, 66735, 66739, 66743, 66747, 66751, 66755, 66759, 66763, - 66766, 66770, 66774, 66778, 66782, 66786, 66790, 66794, 66798, 66802, - 66806, 66810, 66814, 66818, 66822, 66826, 66830, 66834, 66838, 66842, - 66846, 66850, 66854, 66858, 66862, 66866, 66870, 66874, 66878, 66882, - 66886, 66890, 66894, 66898, 66902, 66906, 66910, 66914, 66918, 66922, - 66926, 66930, 66934, 66938, 66942, 66946, 66950, 66954, 66958, 66962, - 66966, 66970, 66974, 66978, 66982, 66986, 66990, 66994, 66998, 67002, - 67006, 67010, 67014, 67018, 67022, 67026, 67030, 67034, 67038, 67042, - 67046, 67050, 67054, 67058, 67062, 67066, 67070, 67074, 67078, 67082, - 67086, 67090, 67094, 67098, 67102, 67106, 67110, 67114, 67118, 67122, - 67126, 67130, 67134, 67138, 67142, 67146, 67150, 67154, 67158, 67162, - 67166, 67170, 67174, 67178, 67182, 67186, 67190, 67194, 67198, 67202, - 67206, 67210, 67214, 67218, 67222, 67226, 67230, 67234, 67237, 67241, - 67245, 67249, 67253, 67257, 67261, 67265, 67269, 67273, 67277, 67281, - 67285, 67289, 67293, 67297, 67301, 67305, 67309, 67313, 67317, 67321, - 67325, 67329, 67333, 67337, 67341, 67345, 67349, 67353, 67357, 67361, - 67365, 67369, 67373, 67377, 67381, 67385, 67389, 67393, 67397, 67401, - 67405, 67409, 67413, 67417, 67421, 67425, 67429, 67433, 67437, 67441, - 67445, 67449, 67453, 67457, 67461, 67465, 67469, 67473, 67477, 67481, - 67485, 67489, 67493, 67497, 67501, 67505, 67509, 67513, 67517, 67521, - 67525, 67529, 67533, 67537, 67541, 67545, 67549, 67553, 67557, 67561, - 67565, 67569, 67573, 67577, 67581, 67585, 67589, 67593, 67597, 67601, - 67605, 67609, 67613, 67617, 67621, 67625, 67629, 67633, 67637, 67641, - 67645, 67649, 67653, 67657, 67661, 67665, 67669, 67673, 67677, 67681, - 67685, 67689, 67693, 67697, 67700, 67704, 67708, 67712, 67716, 67720, - 67724, 67728, 67732, 67736, 67740, 67744, 67748, 67752, 67756, 67760, - 67764, 67768, 67772, 67776, 67780, 67784, 67788, 67792, 67796, 67800, - 67804, 67808, 67812, 67816, 67820, 67824, 67828, 67832, 67836, 67840, - 67844, 67848, 67852, 67856, 67860, 67864, 67868, 67872, 67876, 67880, - 67884, 67888, 67892, 67896, 67900, 67904, 67908, 67912, 67916, 67920, - 67924, 67928, 67932, 67936, 67940, 67944, 67948, 67952, 67956, 67960, - 67964, 67968, 67972, 67976, 67980, 67984, 67988, 67992, 67996, 68000, - 68004, 68008, 68012, 68016, 68020, 68024, 68028, 68032, 68036, 68040, - 68044, 68048, 68052, 68056, 68060, 68064, 68068, 68072, 68076, 68080, - 68084, 68088, 68092, 68096, 68100, 68104, 68108, 68112, 68116, 68120, - 68124, 68128, 68132, 68136, 68140, 68144, 68148, 68152, 68156, 68160, - 68164, 68168, 68172, 68176, 68180, 68184, 68188, 68192, 68196, 68200, - 68204, 68208, 68212, 68216, 68220, 68224, 68228, 68232, 68236, 68240, - 68244, 68248, 68252, 68256, 68260, 68264, 68268, 68272, 68276, 68280, - 68284, 68288, 68292, 68296, 68300, 68304, 68308, 68312, 68316, 68320, - 68324, 68328, 68332, 68336, 68340, 68344, 68348, 68352, 68356, 68360, - 68364, 68368, 68372, 68376, 68380, 68384, 68388, 68392, 68396, 68400, - 68404, 68408, 68412, 68416, 68420, 68424, 68428, 68432, 68436, 68440, - 68444, 68448, 68452, 68456, 68460, 68464, 68468, 68472, 68476, 68480, - 68484, 68488, 68492, 68496, 68500, 68504, 68508, 68512, 68516, 68520, - 68524, 68528, 68532, 68536, 68540, 68544, 68548, 68552, 68555, 68559, - 68563, 68567, 68571, 68575, 68579, 68583, 68587, 68591, 68595, 68599, - 68603, 68607, 68611, 68615, 68619, 68623, 68627, 68631, 68635, 68639, - 68643, 68647, 68651, 68655, 68659, 68663, 68667, 68671, 68675, 68679, - 68683, 68687, 68691, 68695, 68699, 68703, 68707, 68711, 68715, 68719, - 68723, 68727, 68731, 68735, 68739, 68743, 68747, 68751, 68755, 68759, - 68763, 68767, 68771, 68775, 68779, 68783, 68787, 68791, 68795, 68799, - 68803, 68807, 68811, 68815, 68819, 68823, 68827, 68831, 68835, 68839, - 68843, 68847, 68851, 68855, 68859, 68863, 68867, 68871, 68875, 68879, - 68883, 68887, 68891, 68895, 68899, 68903, 68907, 68911, 68915, 68919, - 68923, 68927, 68931, 68935, 68939, 68943, 68947, 68951, 68955, 68959, - 68963, 68967, 68971, 68975, 68979, 68983, 68987, 68991, 68995, 68999, - 69003, 69007, 69010, 69014, 69018, 69022, 69026, 69030, 69034, 69038, - 69042, 69046, 69050, 69054, 69058, 69062, 69066, 69070, 69074, 69078, - 69082, 69086, 69090, 69094, 69098, 69102, 69106, 69110, 69114, 69118, - 69122, 69126, 69130, 69134, 69138, 69142, 69146, 69150, 69154, 69158, - 69162, 69166, 69170, 69174, 69178, 69182, 69186, 69190, 69194, 69198, - 69202, 69206, 69210, 69214, 69218, 69222, 69226, 69230, 69234, 69238, - 69242, 69246, 69250, 69254, 69258, 69262, 69266, 69270, 69274, 69278, - 69282, 69286, 69290, 69294, 69298, 69302, 69306, 69310, 69314, 69318, - 69322, 69326, 69330, 69334, 69338, 69342, 69346, 69350, 69354, 69358, - 69362, 69366, 69370, 69374, 69378, 69382, 69386, 69390, 69394, 69398, - 69402, 69406, 69410, 69414, 69418, 69422, 69426, 69430, 69434, 69438, - 69442, 69446, 69450, 69454, 69458, 69462, 69466, 69470, 69474, 69478, - 69482, 69486, 69490, 69494, 69498, 69502, 69506, 69510, 69514, 69518, - 69522, 69526, 69530, 69534, 69538, 69542, 69546, 69550, 69554, 69558, - 69562, 69566, 69570, 69574, 69578, 69582, 69586, 69590, 69594, 69598, - 69602, 69606, 69610, 69613, 69617, 69621, 69625, 69629, 69633, 69637, - 69641, 69645, 69649, 69653, 69657, 69661, 69665, 69669, 69673, 69677, - 69681, 69685, 69689, 69693, 69697, 69701, 69705, 69709, 69713, 69717, - 69721, 69725, 69729, 69733, 69737, 69741, 69745, 69749, 69753, 69757, - 69761, 69765, 69769, 69773, 69777, 69781, 69785, 69789, 69793, 69797, - 69801, 69805, 69809, 69813, 69817, 69821, 69825, 69829, 69833, 69837, - 69841, 69845, 69849, 69853, 69857, 69861, 69865, 69869, 69873, 69877, - 69881, 69885, 69889, 69893, 69897, 69901, 69905, 69909, 69913, 69917, - 69921, 69925, 69929, 69933, 69937, 69941, 69945, 69949, 69953, 69957, - 69961, 69965, 69969, 69973, 69977, 69981, 69985, 69989, 69993, 69997, - 70001, 70005, 70009, 70013, 70017, 70021, 70025, 70029, 70033, 70037, - 70041, 70045, 70049, 70053, 70057, 70061, 70065, 70069, 70073, 70077, - 70081, 70085, 70089, 70093, 70097, 70101, 70105, 70109, 70113, 70117, - 70121, 70125, 70129, 70133, 70137, 70141, 70145, 70149, 70153, 70157, - 70161, 70165, 70169, 70173, 70177, 70181, 70185, 70189, 70193, 70197, - 70201, 70205, 70209, 70213, 70217, 70221, 70225, 70229, 70233, 70237, - 70241, 70245, 70249, 70253, 70257, 70261, 70265, 70269, 70273, 70277, - 70281, 70285, 70289, 70293, 70297, 70301, 70305, 70309, 70313, 70317, - 70321, 70325, 70329, 70333, 70337, 70341, 70345, 70349, 70353, 70357, - 70361, 70365, 70369, 70373, 70377, 70381, 70385, 70389, 70393, 70397, - 70401, 70405, 70409, 70413, 70417, 70421, 70425, 70429, 70433, 70437, - 70441, 70445, 70449, 70453, 70457, 70461, 70465, 70469, 70473, 70477, - 70481, 70485, 70489, 70493, 70497, 70501, 70505, 70509, 70513, 70517, - 70521, 70525, 70529, 70533, 70537, 70541, 70545, 70549, 70553, 70557, - 70561, 70565, 70569, 70573, 70577, 70581, 70585, 70589, 70593, 70597, - 70601, 70605, 70609, 70613, 70617, 70621, 70625, 70629, 70633, 70637, - 70641, 70645, 70649, 70653, 70657, 70661, 70665, 70669, 70673, 70677, - 70681, 70685, 70689, 70693, 70697, 70701, 70705, 70709, 70713, 70717, - 70721, 70725, 70729, 70733, 70737, 70741, 70745, 70749, 70753, 70757, - 70761, 70765, 70769, 70773, 70777, 70781, 70785, 70789, 70793, 70797, - 70801, 70805, 70809, 70813, 70817, 70821, 70825, 70829, 70833, 70837, - 70841, 70845, 70849, 70853, 70857, 70861, 70865, 70869, 70873, 70877, - 70881, 70885, 70889, 70893, 70897, 70901, 70905, 70909, 70913, 70917, - 70921, 70925, 70929, 70933, 70937, 70941, 70945, 70949, 70953, 70957, - 70961, 70965, 70969, 70973, 70977, 70981, 70985, 70989, 70993, 70997, - 71001, 71005, 71009, 71013, 71017, 71021, 71025, 71029, 71033, 71037, - 71041, 71045, 71049, 71053, 71057, 71061, 71065, 71069, 71073, 71077, - 71081, 71085, 71089, 71093, 71097, 71101, 71105, 71109, 71113, 71117, - 71121, 71125, 71129, 71133, 71137, 71141, 71145, 71149, 71153, 0, 0, 0, - 71157, 71161, 71165, 71169, 71173, 71177, 71181, 71185, 71189, 71193, - 71197, 71201, 71205, 71209, 71213, 71217, 71221, 71225, 71229, 71233, - 71237, 71241, 71245, 71249, 71253, 71257, 71261, 71265, 71269, 71273, - 71277, 71281, 71285, 71289, 71293, 71297, 71301, 71305, 71309, 71313, - 71317, 71321, 71325, 71329, 71333, 71337, 71341, 71345, 71349, 71353, - 71357, 71361, 71365, 71369, 71373, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71377, - 71382, 71386, 71391, 71396, 71401, 71406, 71411, 71415, 71420, 71425, - 71430, 71435, 71440, 71445, 71450, 71454, 71459, 71464, 71469, 71474, - 71479, 71484, 71488, 71493, 71498, 71503, 71508, 71513, 71517, 71522, - 71526, 71531, 71535, 71540, 71544, 71548, 71552, 71557, 71562, 71567, - 71575, 71583, 71591, 71599, 71607, 71615, 71621, 71629, 71633, 71637, - 71641, 71645, 71649, 71653, 71657, 71661, 71665, 71669, 71673, 71677, - 71681, 71685, 71689, 71693, 71697, 71701, 71705, 71709, 71713, 71717, - 71721, 71725, 71729, 71733, 71737, 71741, 71745, 71749, 71753, 71757, - 71761, 71765, 71769, 71773, 71776, 71780, 71784, 71788, 71792, 71796, - 71800, 71804, 71808, 71812, 71816, 71820, 71824, 71828, 71832, 71836, - 71840, 71844, 71848, 71852, 71856, 71860, 71864, 71868, 71872, 71876, - 71880, 71884, 71888, 71892, 71896, 71900, 71904, 71908, 71912, 71916, - 71920, 71923, 71927, 71931, 71934, 71938, 71942, 71946, 71949, 71953, - 71957, 71961, 71965, 71969, 71973, 71977, 71981, 71985, 71989, 71993, - 71997, 72001, 72005, 72009, 72013, 72017, 72021, 72025, 72029, 72033, - 72037, 72041, 72045, 72048, 72051, 72055, 72059, 72063, 72066, 72070, - 72074, 72078, 72082, 72086, 72090, 72094, 72098, 72102, 72106, 72110, - 72114, 72118, 72122, 72126, 72130, 72134, 72138, 72142, 72146, 72150, - 72154, 72158, 72162, 72166, 72170, 72174, 72178, 72182, 72186, 72190, - 72194, 72198, 72202, 72206, 72210, 72214, 72218, 72221, 72225, 72229, - 72233, 72237, 72241, 72245, 72249, 72253, 72257, 72261, 72265, 72269, - 72273, 72277, 72281, 72285, 72289, 72293, 72297, 72301, 72305, 72309, - 72313, 72317, 72321, 72325, 72329, 72333, 72337, 72341, 72345, 72349, - 72353, 72357, 72361, 72365, 72368, 72372, 72376, 72380, 72384, 72388, - 72392, 72396, 72400, 72404, 72408, 72412, 72416, 72420, 72424, 72428, - 72432, 72435, 72439, 72443, 72447, 72451, 72455, 72459, 72463, 72467, - 72471, 72475, 72479, 72483, 72487, 72491, 72495, 72499, 72503, 72507, - 72511, 72515, 72519, 72522, 72526, 72530, 72534, 72538, 72542, 72546, - 72550, 72554, 72558, 72562, 72566, 72570, 72574, 72578, 72582, 72586, - 72590, 72594, 72598, 72602, 72606, 72610, 72614, 72618, 72622, 72626, - 72630, 72634, 72638, 72642, 72646, 72650, 72654, 72658, 72662, 72666, - 72670, 72674, 72678, 72682, 72686, 72690, 72694, 72697, 72702, 72706, - 72712, 72717, 72723, 72727, 72731, 72735, 72739, 72743, 72747, 72751, - 72755, 72759, 72763, 72767, 72771, 72775, 72779, 72782, 72785, 72788, - 72791, 72794, 72797, 72801, 72804, 72808, 72813, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72819, 72824, 72829, 72834, 72839, - 72846, 72853, 72858, 72863, 72868, 72873, 72880, 72887, 72894, 72901, - 72908, 72915, 72925, 72935, 72942, 72949, 72956, 72963, 72969, 72975, - 72984, 72993, 73000, 73007, 73018, 73029, 73034, 73039, 73046, 73053, - 73060, 73067, 73074, 73081, 73088, 73095, 73101, 73107, 73113, 73119, - 73126, 73133, 73138, 73142, 73149, 73156, 73163, 73167, 73174, 73178, - 73183, 73187, 73193, 73198, 73204, 73209, 73213, 73217, 73220, 73223, - 73228, 73233, 73238, 73243, 73248, 73253, 73258, 73263, 73268, 73273, - 73281, 73289, 73294, 73299, 73304, 73309, 73314, 73319, 73324, 73329, - 73334, 73339, 73344, 73349, 73354, 73359, 73365, 73371, 73377, 73383, - 73388, 73394, 73397, 73400, 73403, 73407, 73411, 73415, 73419, 73422, - 73426, 73429, 73433, 73436, 73440, 73444, 73448, 73452, 73456, 73460, - 73464, 73468, 73472, 73476, 73480, 73484, 73488, 73492, 73496, 73500, - 73504, 73508, 73512, 73516, 73520, 73524, 73527, 73531, 73535, 73539, - 73543, 73547, 73551, 73555, 73559, 73563, 73567, 73571, 73575, 73579, - 73583, 73587, 73591, 73595, 73599, 73603, 73607, 73611, 73615, 73619, - 73623, 73627, 73631, 73635, 73639, 73643, 73647, 73651, 73655, 73658, - 73662, 73666, 73670, 73674, 73678, 73682, 73686, 73690, 73694, 73698, - 73702, 73706, 73711, 73716, 73719, 73724, 73727, 73730, 73733, 0, 0, 0, - 0, 0, 0, 0, 0, 73737, 73746, 73755, 73764, 73773, 73782, 73791, 73800, - 73809, 73817, 73824, 73832, 73839, 73847, 73857, 73866, 73876, 73885, - 73895, 73903, 73910, 73918, 73925, 73933, 73938, 73943, 73949, 73958, - 73964, 73970, 73977, 73986, 73994, 74002, 74010, 74017, 74024, 74031, - 74038, 74043, 74048, 74053, 74058, 74063, 74068, 74073, 74078, 74086, - 74094, 74100, 74105, 74110, 74115, 74120, 74125, 74130, 74135, 74140, - 74145, 74154, 74163, 74168, 74173, 74183, 74193, 74200, 74207, 74216, - 74225, 74237, 74249, 74255, 74261, 74269, 74277, 74287, 74297, 74304, - 74311, 74316, 74321, 74333, 74345, 74353, 74361, 74371, 74381, 74393, - 74405, 74414, 74423, 74430, 74437, 74444, 74451, 74460, 74469, 74474, - 74479, 74486, 74493, 74500, 74507, 74519, 74531, 74536, 74541, 74546, - 74551, 74556, 74561, 74566, 74571, 74575, 74580, 74585, 74590, 74595, - 74600, 74606, 74611, 74616, 74623, 74630, 74637, 74644, 74651, 74660, - 74669, 74675, 74681, 74687, 74693, 74699, 74705, 74712, 74719, 74726, - 74730, 74737, 74742, 74747, 74754, 74767, 74773, 74781, 74789, 74796, - 74803, 74812, 74821, 74828, 74835, 74842, 74849, 74856, 74863, 74870, - 74877, 74884, 74891, 74900, 74909, 74918, 74927, 74936, 74945, 74954, - 74963, 74972, 74981, 74988, 74995, 75001, 0, 0, 75009, 75016, 75023, - 75031, 75036, 75041, 75046, 75051, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 66830, 66839, 66848, 66859, 66866, 66871, 66876, 66883, 66890, 66896, + 66901, 66906, 66911, 66916, 66923, 66928, 66933, 66938, 66949, 66954, + 66959, 66966, 66971, 66978, 66983, 66988, 66995, 67002, 67009, 67018, + 67027, 67032, 67037, 67042, 67049, 67054, 67064, 67071, 67076, 67081, + 67086, 67091, 67096, 67101, 67110, 67117, 67124, 67129, 67136, 67141, + 67148, 67157, 67168, 67173, 67182, 67187, 67194, 67203, 67212, 67217, + 67222, 67229, 67235, 67242, 67249, 67253, 67257, 67260, 67264, 67268, + 67272, 67276, 67280, 67284, 67288, 67291, 67295, 67299, 67303, 67307, + 67311, 67315, 67318, 67322, 67326, 67329, 67333, 67337, 67341, 67345, + 67349, 67353, 67357, 67361, 67365, 67369, 67373, 67377, 67381, 67385, + 67389, 67393, 67397, 67401, 67405, 67409, 67413, 67417, 67421, 67425, + 67429, 67433, 67437, 67441, 67445, 67449, 67453, 67457, 67461, 67465, + 67469, 67473, 67477, 67481, 67485, 67489, 67493, 67497, 67501, 67505, + 67508, 67512, 67516, 67520, 67524, 67528, 67532, 67536, 67540, 67544, + 67548, 67552, 67556, 67560, 67564, 67568, 67572, 67576, 67580, 67584, + 67588, 67592, 67596, 67600, 67604, 67608, 67612, 67616, 67620, 67624, + 67628, 67632, 67636, 67640, 67644, 67648, 67652, 67656, 67660, 67664, + 67668, 67672, 67676, 67680, 67684, 67688, 67692, 67696, 67700, 67704, + 67708, 67712, 67716, 67720, 67724, 67728, 67732, 67736, 67740, 67744, + 67748, 67752, 67756, 67760, 67764, 67768, 67772, 67776, 67780, 67784, + 67788, 67792, 67796, 67800, 67804, 67808, 67812, 67816, 67820, 67824, + 67828, 67832, 67836, 67840, 67844, 67848, 67852, 67856, 67860, 67864, + 67868, 67872, 67876, 67880, 67884, 67888, 67892, 67896, 67900, 67904, + 67908, 67912, 67916, 67920, 67924, 67928, 67932, 67936, 67940, 67944, + 67948, 67952, 67956, 67960, 67964, 67968, 67972, 67976, 67979, 67983, + 67987, 67991, 67995, 67999, 68003, 68007, 68011, 68015, 68019, 68023, + 68027, 68031, 68035, 68039, 68043, 68047, 68051, 68055, 68059, 68063, + 68067, 68071, 68075, 68079, 68083, 68087, 68091, 68095, 68099, 68103, + 68107, 68111, 68115, 68119, 68123, 68127, 68131, 68135, 68139, 68143, + 68147, 68151, 68155, 68159, 68163, 68167, 68171, 68175, 68179, 68183, + 68187, 68191, 68195, 68199, 68203, 68207, 68211, 68215, 68219, 68223, + 68227, 68231, 68235, 68239, 68243, 68247, 68251, 68255, 68259, 68263, + 68267, 68271, 68275, 68279, 68283, 68287, 68291, 68295, 68299, 68303, + 68307, 68311, 68315, 68319, 68323, 68327, 68331, 68335, 68339, 68343, + 68347, 68351, 68355, 68359, 68363, 68367, 68371, 68375, 68379, 68383, + 68387, 68391, 68395, 68399, 68403, 68407, 68411, 68415, 68419, 68423, + 68427, 68431, 68435, 68439, 68442, 68446, 68450, 68454, 68458, 68462, + 68466, 68470, 68474, 68478, 68482, 68486, 68490, 68494, 68498, 68502, + 68506, 68510, 68514, 68518, 68522, 68526, 68530, 68534, 68538, 68542, + 68546, 68550, 68554, 68558, 68562, 68566, 68570, 68574, 68578, 68582, + 68586, 68590, 68594, 68598, 68602, 68606, 68610, 68614, 68618, 68622, + 68626, 68630, 68634, 68638, 68642, 68646, 68650, 68654, 68658, 68662, + 68666, 68670, 68674, 68678, 68682, 68686, 68690, 68694, 68698, 68702, + 68706, 68710, 68714, 68718, 68722, 68726, 68730, 68734, 68738, 68742, + 68746, 68750, 68754, 68758, 68762, 68766, 68770, 68774, 68778, 68782, + 68786, 68790, 68794, 68798, 68801, 68805, 68809, 68813, 68817, 68821, + 68825, 68829, 68833, 68837, 68841, 68845, 68849, 68853, 68857, 68861, + 68865, 68869, 68873, 68877, 68881, 68885, 68889, 68893, 68897, 68901, + 68905, 68909, 68913, 68917, 68921, 68925, 68929, 68933, 68937, 68941, + 68945, 68949, 68953, 68957, 68961, 68965, 68969, 68973, 68977, 68981, + 68985, 68989, 68993, 68997, 69001, 69005, 69009, 69013, 69017, 69021, + 69025, 69029, 69033, 69037, 69040, 69044, 69048, 69052, 69056, 69060, + 69064, 69068, 69072, 69076, 69080, 69084, 69088, 69092, 69096, 69100, + 69104, 69108, 69112, 69116, 69120, 69124, 69128, 69132, 69136, 69140, + 69144, 69148, 69152, 69156, 69160, 69164, 69168, 69172, 69176, 69180, + 69184, 69188, 69192, 69196, 69200, 69204, 69208, 69212, 69216, 69220, + 69224, 69228, 69232, 69236, 69240, 69244, 69248, 69252, 69256, 69260, + 69264, 69268, 69272, 69276, 69280, 69284, 69288, 69292, 69295, 69299, + 69303, 69307, 69311, 69315, 69319, 69323, 69327, 69331, 69335, 69339, + 69343, 69347, 69351, 69355, 69359, 69363, 69367, 69371, 69375, 69379, + 69383, 69387, 69391, 69395, 69399, 69403, 69407, 69411, 69415, 69419, + 69423, 69427, 69431, 69435, 69439, 69443, 69447, 69451, 69455, 69459, + 69463, 69467, 69471, 69475, 69479, 69483, 69487, 69491, 69495, 69499, + 69503, 69507, 69511, 69515, 69519, 69523, 69527, 69531, 69535, 69539, + 69543, 69547, 69551, 69555, 69559, 69563, 69567, 69571, 69575, 69579, + 69583, 69587, 69591, 69595, 69599, 69603, 69607, 69611, 69615, 69619, + 69623, 69627, 69631, 69635, 69639, 69643, 69647, 69651, 69655, 69659, + 69663, 69667, 69671, 69675, 69679, 69683, 69687, 69691, 69695, 69699, + 69703, 69707, 69711, 69715, 69719, 69723, 69727, 69731, 69735, 69739, + 69743, 69747, 69750, 69754, 69758, 69762, 69766, 69770, 69774, 69778, + 69782, 69786, 69790, 69794, 69798, 69802, 69806, 69810, 69814, 69818, + 69822, 69826, 69830, 69834, 69838, 69842, 69846, 69850, 69854, 69858, + 69862, 69866, 69870, 69874, 69878, 69882, 69886, 69890, 69894, 69898, + 69902, 69906, 69910, 69914, 69918, 69922, 69926, 69930, 69934, 69938, + 69942, 69946, 69950, 69954, 69958, 69962, 69966, 69970, 69974, 69978, + 69982, 69986, 69990, 69994, 69998, 70002, 70006, 70010, 70014, 70018, + 70022, 70026, 70030, 70034, 70038, 70042, 70046, 70050, 70054, 70058, + 70062, 70066, 70070, 70074, 70078, 70082, 70086, 70090, 70094, 70098, + 70102, 70106, 70110, 70114, 70118, 70122, 70126, 70130, 70134, 70138, + 70142, 70146, 70150, 70154, 70158, 70162, 70166, 70170, 70174, 70178, + 70182, 70186, 70190, 70194, 70198, 70202, 70206, 70210, 70214, 70218, + 70222, 70226, 70230, 70234, 70238, 70242, 70246, 70250, 70254, 70258, + 70262, 70266, 70270, 70274, 70278, 70282, 70286, 70290, 70294, 70298, + 70302, 70306, 70310, 70314, 70318, 70322, 70326, 70330, 70334, 70338, + 70342, 70346, 70350, 70353, 70357, 70361, 70365, 70369, 70373, 70377, + 70381, 70385, 70389, 70393, 70397, 70401, 70405, 70409, 70413, 70417, + 70421, 70425, 70429, 70433, 70437, 70441, 70445, 70449, 70453, 70457, + 70461, 70465, 70469, 70473, 70477, 70481, 70485, 70489, 70493, 70497, + 70501, 70505, 70509, 70513, 70517, 70521, 70525, 70529, 70533, 70537, + 70541, 70545, 70549, 70553, 70557, 70561, 70565, 70569, 70573, 70577, + 70581, 70585, 70589, 70593, 70597, 70601, 70605, 70609, 70613, 70617, + 70621, 70625, 70629, 70633, 70637, 70641, 70645, 70649, 70653, 70657, + 70661, 70665, 70669, 70673, 70677, 70681, 70685, 70689, 70693, 70697, + 70701, 70705, 70709, 70713, 70717, 70721, 70725, 70729, 70733, 70737, + 70741, 70745, 70749, 70753, 70757, 70761, 70765, 70769, 70773, 70777, + 70781, 70785, 70789, 70793, 70797, 70801, 70805, 70809, 70813, 70817, + 70821, 70825, 70829, 70833, 70837, 70841, 70845, 70849, 70853, 70857, + 70861, 70865, 70869, 70873, 70877, 70881, 70885, 70889, 70893, 70897, + 70901, 70905, 70909, 70913, 70917, 70921, 70925, 70929, 70933, 70937, + 70941, 70945, 70949, 70953, 70957, 70961, 70965, 70969, 70973, 70977, + 70981, 70985, 70989, 70993, 70997, 71001, 71005, 71009, 71013, 71017, + 71021, 71025, 71029, 71033, 71037, 71041, 71045, 71049, 71053, 71057, + 71061, 71065, 71069, 71073, 71077, 71081, 71085, 71089, 71093, 71097, + 71101, 71105, 71109, 71113, 71117, 71121, 71125, 71129, 71133, 71137, + 71141, 71145, 71149, 71153, 71157, 71161, 71165, 71169, 71173, 71177, + 71181, 71185, 71189, 71193, 71197, 71201, 71205, 71209, 71213, 71217, + 71221, 71225, 71229, 71233, 71237, 71241, 71245, 71249, 71253, 71257, + 71261, 71265, 71269, 71273, 71277, 71281, 71285, 71289, 71293, 71297, + 71301, 71305, 71309, 71313, 71317, 71321, 71325, 71329, 71333, 71337, + 71341, 71345, 71349, 71353, 71357, 71361, 71365, 71369, 71373, 71377, + 71381, 71385, 71389, 71393, 71397, 71401, 71405, 71409, 71413, 71417, + 71421, 71425, 71429, 71433, 71437, 71441, 71445, 71449, 71453, 71457, + 71461, 71465, 71469, 71473, 71477, 71481, 71485, 71489, 71493, 71497, + 71501, 71505, 71509, 71513, 71517, 71521, 71525, 71529, 71533, 71537, + 71541, 71545, 71549, 71553, 71557, 71561, 71565, 71569, 71573, 71577, + 71581, 71585, 71589, 71593, 71597, 71601, 71605, 71609, 71613, 71617, + 71621, 71625, 71629, 71633, 71637, 71641, 71645, 71649, 71653, 71657, + 71661, 71665, 71669, 71673, 71677, 71681, 71685, 71689, 71693, 71697, + 71701, 71705, 71709, 71713, 71717, 71721, 71725, 71729, 71733, 71737, + 71741, 71745, 71749, 71753, 71757, 71761, 71765, 71769, 71773, 71777, + 71781, 71785, 71789, 71793, 71797, 71801, 71805, 71809, 71813, 71817, + 71821, 71825, 71829, 71833, 71837, 71841, 71845, 71849, 71853, 71857, + 71861, 71865, 71869, 71873, 71877, 71881, 71885, 71889, 71893, 0, 0, 0, + 71897, 71901, 71905, 71909, 71913, 71917, 71921, 71925, 71929, 71933, + 71937, 71941, 71945, 71949, 71953, 71957, 71961, 71965, 71969, 71973, + 71977, 71981, 71985, 71989, 71993, 71997, 72001, 72005, 72009, 72013, + 72017, 72021, 72025, 72029, 72033, 72037, 72041, 72045, 72049, 72053, + 72057, 72061, 72065, 72069, 72073, 72077, 72081, 72085, 72089, 72093, + 72097, 72101, 72105, 72109, 72113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72117, + 72122, 72126, 72131, 72136, 72141, 72146, 72151, 72155, 72160, 72165, + 72170, 72175, 72180, 72185, 72190, 72194, 72198, 72202, 72207, 72212, + 72217, 72222, 72226, 72231, 72236, 72241, 72246, 72251, 72255, 72260, + 72264, 72269, 72273, 72278, 72282, 72286, 72290, 72295, 72300, 72305, + 72313, 72321, 72329, 72337, 72344, 72352, 72358, 72366, 72370, 72374, + 72378, 72382, 72386, 72390, 72394, 72398, 72402, 72406, 72410, 72414, + 72418, 72422, 72426, 72430, 72434, 72438, 72442, 72446, 72450, 72454, + 72458, 72462, 72466, 72470, 72474, 72478, 72482, 72486, 72490, 72494, + 72498, 72502, 72506, 72510, 72513, 72517, 72521, 72525, 72529, 72533, + 72537, 72541, 72545, 72549, 72553, 72557, 72561, 72565, 72569, 72573, + 72577, 72581, 72585, 72589, 72593, 72597, 72601, 72605, 72609, 72613, + 72617, 72621, 72625, 72629, 72633, 72637, 72641, 72645, 72649, 72653, + 72657, 72660, 72664, 72668, 72671, 72675, 72679, 72683, 72686, 72690, + 72694, 72698, 72702, 72706, 72710, 72714, 72718, 72722, 72726, 72730, + 72734, 72738, 72741, 72745, 72749, 72753, 72757, 72761, 72765, 72769, + 72773, 72777, 72781, 72784, 72787, 72791, 72795, 72799, 72802, 72805, + 72809, 72813, 72817, 72821, 72825, 72829, 72833, 72837, 72841, 72845, + 72849, 72853, 72857, 72861, 72865, 72869, 72873, 72877, 72881, 72885, + 72889, 72893, 72897, 72901, 72905, 72909, 72913, 72917, 72921, 72925, + 72929, 72933, 72937, 72941, 72945, 72949, 72953, 72956, 72960, 72964, + 72968, 72972, 72976, 72980, 72984, 72988, 72992, 72996, 73000, 73004, + 73008, 73012, 73016, 73020, 73024, 73028, 73032, 73036, 73040, 73044, + 73048, 73052, 73056, 73060, 73064, 73068, 73072, 73076, 73080, 73084, + 73088, 73092, 73096, 73100, 73103, 73107, 73111, 73115, 73119, 73123, + 73127, 73131, 73135, 73139, 73143, 73147, 73151, 73155, 73159, 73163, + 73167, 73170, 73174, 73178, 73182, 73186, 73190, 73194, 73198, 73202, + 73206, 73210, 73214, 73218, 73222, 73226, 73230, 73234, 73238, 73242, + 73246, 73250, 73254, 73257, 73261, 73265, 73269, 73273, 73277, 73281, + 73285, 73289, 73293, 73297, 73301, 73305, 73309, 73313, 73317, 73321, + 73325, 73329, 73333, 73337, 73341, 73345, 73349, 73353, 73357, 73361, + 73365, 73369, 73373, 73377, 73381, 73385, 73389, 73393, 73397, 73401, + 73405, 73409, 73413, 73417, 73421, 73425, 73429, 73432, 73437, 73441, + 73447, 73452, 73458, 73462, 73466, 73470, 73474, 73478, 73482, 73486, + 73490, 73494, 73498, 73502, 73506, 73510, 73514, 73517, 73520, 73523, + 73526, 73529, 73532, 73536, 73539, 73543, 73548, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73554, 73559, 73564, 73569, 73574, + 73581, 73588, 73593, 73598, 73603, 73608, 73615, 73622, 73629, 73636, + 73643, 73650, 73660, 73670, 73677, 73684, 73691, 73698, 73704, 73710, + 73719, 73728, 73735, 73742, 73753, 73764, 73769, 73774, 73781, 73788, + 73795, 73802, 73809, 73816, 73823, 73830, 73836, 73842, 73848, 73854, + 73861, 73868, 73873, 73877, 73884, 73891, 73898, 73902, 73909, 73913, + 73918, 73922, 73928, 73933, 73939, 73944, 73948, 73952, 73955, 73958, + 73963, 73968, 73973, 73978, 73983, 73988, 73993, 73998, 74003, 74008, + 74016, 74024, 74029, 74034, 74039, 74044, 74049, 74054, 74059, 74064, + 74069, 74074, 74079, 74084, 74089, 74094, 74100, 74106, 74112, 74118, + 74123, 74129, 74132, 74135, 74138, 74142, 74146, 74150, 74154, 74157, + 74161, 74164, 74167, 74170, 74174, 74178, 74182, 74186, 74190, 74194, + 74198, 74202, 74206, 74210, 74214, 74218, 74222, 74226, 74230, 74234, + 74238, 74242, 74246, 74250, 74254, 74258, 74261, 74265, 74269, 74273, + 74277, 74281, 74285, 74289, 74293, 74297, 74301, 74305, 74309, 74313, + 74317, 74321, 74325, 74329, 74333, 74337, 74341, 74345, 74349, 74353, + 74357, 74360, 74364, 74368, 74372, 74376, 74380, 74384, 74388, 74391, + 74395, 74399, 74403, 74407, 74411, 74415, 74419, 74423, 74427, 74431, + 74435, 74439, 74444, 74449, 74452, 74457, 74460, 74463, 74466, 0, 0, 0, + 0, 0, 0, 0, 0, 74470, 74479, 74488, 74497, 74506, 74515, 74524, 74533, + 74542, 74550, 74557, 74565, 74572, 74580, 74590, 74599, 74609, 74618, + 74628, 74636, 74643, 74651, 74658, 74666, 74671, 74676, 74682, 74691, + 74697, 74703, 74710, 74719, 74727, 74735, 74743, 74750, 74757, 74764, + 74771, 74776, 74781, 74786, 74791, 74796, 74801, 74806, 74811, 74819, + 74827, 74833, 74839, 74844, 74849, 74854, 74859, 74864, 74869, 74874, + 74879, 74888, 74897, 74902, 74907, 74917, 74927, 74934, 74941, 74950, + 74959, 74971, 74983, 74989, 74995, 75003, 75011, 75021, 75031, 75038, + 75045, 75050, 75055, 75067, 75079, 75087, 75095, 75105, 75115, 75127, + 75139, 75148, 75157, 75164, 75171, 75178, 75185, 75194, 75203, 75208, + 75213, 75220, 75227, 75234, 75241, 75253, 75265, 75270, 75275, 75280, + 75285, 75290, 75295, 75300, 75305, 75309, 75314, 75319, 75324, 75329, + 75334, 75340, 75345, 75350, 75357, 75364, 75371, 75378, 75385, 75394, + 75403, 75409, 75415, 75421, 75427, 75434, 75441, 75448, 75455, 75462, + 75466, 75473, 75478, 75483, 75490, 75503, 75509, 75517, 75525, 75532, + 75539, 75548, 75557, 75564, 75571, 75578, 75585, 75592, 75599, 75606, + 75613, 75620, 75627, 75636, 75645, 75654, 75663, 75672, 75681, 75690, + 75699, 75708, 75717, 75724, 75731, 75737, 75745, 0, 75751, 75758, 75765, + 75773, 75778, 75783, 75788, 75793, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 75056, 75063, 75070, 75076, 75084, 75092, 75100, 75108, 75116, - 75124, 75130, 75136, 75143, 75149, 75155, 75161, 75168, 75175, 75182, - 75189, 75196, 75203, 75210, 75217, 75224, 75231, 75238, 75245, 75252, - 75259, 75265, 75272, 75279, 75286, 75293, 75300, 75307, 75314, 75321, - 75328, 75335, 75342, 75349, 75356, 75363, 75370, 75377, 75384, 75391, - 75399, 75407, 75415, 75423, 0, 0, 0, 0, 75431, 75439, 75447, 75455, - 75463, 75471, 75479, 75485, 75491, 75497, 0, 0, 0, 0, 0, 0, 75503, 75507, - 75512, 75517, 75522, 75527, 75532, 75537, 75542, 75547, 75552, 75557, - 75562, 75566, 75571, 75576, 75580, 75585, 75590, 75595, 75600, 75605, - 75610, 75615, 75619, 75624, 75629, 75634, 75639, 75643, 75647, 75651, - 75655, 75659, 75663, 75668, 75673, 75678, 75683, 75688, 75695, 75701, - 75706, 75711, 75716, 75721, 75727, 75734, 75740, 75747, 75754, 75761, - 75766, 75773, 75779, 75784, 0, 0, 0, 0, 0, 0, 0, 0, 75790, 75795, 75800, - 75804, 75809, 75813, 75818, 75822, 75827, 75832, 75838, 75843, 75849, - 75853, 75858, 75863, 75867, 75872, 75877, 75881, 75886, 75891, 75896, - 75901, 75906, 75911, 75916, 75921, 75926, 75931, 75936, 75941, 75946, - 75951, 75956, 75961, 75966, 75971, 75976, 75980, 75985, 75990, 75995, - 75999, 76003, 76008, 76013, 76018, 76023, 76028, 76033, 76037, 76042, - 76048, 76054, 76059, 76065, 76070, 76076, 76082, 76089, 76095, 76102, - 76107, 76113, 76119, 76124, 76130, 76136, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76141, 76145, 76150, 76155, 76159, 76163, 76167, 76171, 76175, 76179, - 76184, 76188, 0, 0, 0, 0, 0, 0, 76193, 76198, 76202, 76206, 76210, 76214, - 76218, 76222, 76227, 76231, 76236, 76240, 76244, 76248, 76253, 76257, - 76262, 76267, 76272, 76278, 76284, 76291, 76296, 76301, 76307, 76311, - 76316, 76319, 76322, 76326, 0, 0, 76331, 76338, 76344, 76350, 76356, - 76362, 76368, 76374, 76381, 76387, 76394, 76400, 76407, 76414, 76421, - 76428, 76435, 76442, 76449, 76456, 76463, 76470, 76476, 76483, 76489, - 76496, 76503, 76510, 76516, 76523, 76530, 76537, 76543, 76550, 76557, - 76563, 76570, 76576, 76583, 76590, 76596, 76602, 76609, 76615, 76622, - 76629, 76638, 76645, 76652, 76656, 76661, 76666, 76671, 76676, 76681, - 76685, 76690, 76694, 76699, 76704, 76709, 76714, 76719, 76724, 76728, - 76733, 76737, 76742, 76747, 76752, 76757, 76761, 76766, 76771, 76776, - 76782, 76787, 76793, 76799, 76805, 76811, 76817, 76822, 76828, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 76832, 76837, 76841, 76845, 76849, 76853, 76857, - 76861, 76865, 76869, 76873, 76877, 76881, 76885, 76889, 76893, 76897, - 76901, 76905, 76909, 76913, 76917, 76921, 76925, 76929, 76933, 76937, - 76941, 76945, 76949, 0, 0, 0, 76953, 76957, 76961, 76965, 76969, 76972, - 76978, 76981, 76985, 76988, 76994, 77000, 77008, 77011, 77015, 77018, - 77021, 77027, 77033, 77037, 77043, 77047, 77051, 77057, 77061, 77067, - 77073, 77077, 77081, 77087, 77091, 77097, 77103, 77107, 77113, 77117, - 77123, 77127, 77130, 77136, 77140, 77146, 77149, 77152, 77156, 77162, - 77166, 77170, 77176, 77182, 77186, 77189, 77195, 77200, 77205, 77210, - 77217, 77222, 77229, 77234, 77241, 77246, 77251, 77256, 77261, 77264, - 77268, 77272, 77277, 77282, 77287, 77292, 77297, 77302, 77307, 77312, - 77319, 77324, 0, 77331, 77334, 77338, 77341, 77344, 77347, 77350, 77353, - 77356, 77360, 77363, 0, 0, 0, 0, 77367, 77374, 77379, 77385, 77391, - 77397, 77403, 77409, 77415, 77422, 77429, 77436, 77443, 77450, 77457, - 77464, 77471, 77478, 77485, 77492, 77498, 77504, 77510, 77516, 77522, - 77528, 77535, 77541, 77548, 77555, 77562, 77569, 77576, 0, 77583, 77587, - 77591, 77595, 77599, 77604, 77608, 77612, 77617, 77622, 77627, 77632, - 77637, 77642, 77647, 77652, 77657, 77662, 77667, 77672, 77677, 77682, - 77687, 77692, 77697, 77702, 77707, 77711, 77716, 77721, 77726, 77731, - 77736, 77740, 77745, 77749, 77754, 77759, 77764, 77769, 77774, 77778, - 77784, 77789, 77795, 77801, 77806, 77812, 77817, 77823, 77829, 77835, - 77840, 77846, 77852, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77858, 77864, 77870, - 77876, 77883, 77889, 77895, 77901, 77907, 77913, 77918, 77923, 77929, - 77936, 0, 0, 77943, 77948, 77952, 77956, 77960, 77964, 77968, 77972, - 77977, 77981, 0, 0, 77986, 77992, 77998, 78005, 78013, 78019, 78025, - 78031, 78037, 78043, 78049, 78055, 78061, 78067, 78073, 78079, 78085, - 78091, 78096, 78102, 78108, 78115, 78121, 78127, 78133, 78140, 78147, - 78154, 78160, 78165, 78170, 78176, 78184, 78191, 78198, 78206, 78214, - 78221, 78228, 78235, 78242, 78249, 78256, 78263, 78270, 78277, 78284, - 78291, 78298, 78305, 78312, 78319, 78326, 78333, 78340, 78347, 78354, - 78360, 78366, 78373, 78380, 78387, 78394, 78401, 78408, 78415, 78422, - 78429, 78436, 78443, 78450, 78457, 78464, 78471, 78478, 78485, 78492, - 78499, 78506, 78513, 78520, 78527, 78534, 78540, 78546, 78553, 78559, - 78564, 78570, 78575, 78580, 78585, 78592, 78598, 78604, 78610, 78616, - 78622, 78628, 78634, 78642, 78650, 78658, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78666, 78672, 78678, 78684, - 78692, 78700, 78706, 78712, 78719, 78726, 78733, 78740, 78747, 78754, - 78761, 78768, 78775, 78783, 78791, 78799, 78807, 78815, 78821, 78829, - 78835, 78843, 78852, 78860, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78866, 78870, - 78874, 78878, 78882, 78886, 0, 0, 78890, 78894, 78898, 78902, 78906, - 78910, 0, 0, 78914, 78918, 78922, 78926, 78930, 78934, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 78938, 78942, 78946, 78950, 78954, 78958, 78962, 0, 78966, - 78970, 78974, 78978, 78982, 78986, 78990, 0, 78994, 79001, 79007, 79013, - 79019, 79026, 79033, 79042, 79053, 79063, 79072, 79080, 79088, 79096, - 79102, 79110, 79117, 79124, 79133, 79144, 79152, 79162, 79168, 79178, - 79187, 79192, 79200, 79209, 79214, 79223, 79230, 79240, 79252, 79257, - 79264, 79271, 79276, 79286, 79296, 79306, 79316, 79331, 79344, 79355, - 79363, 79368, 79379, 79388, 79395, 79402, 79408, 79414, 79419, 79426, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 79432, 79436, 79440, 79444, 79448, 79452, - 79457, 79462, 79466, 79471, 79476, 79481, 79486, 79491, 79495, 79500, - 79505, 79510, 79515, 79520, 79525, 79530, 79535, 79540, 79545, 79550, - 79554, 79559, 79564, 79569, 79574, 79579, 79584, 79589, 79594, 79599, - 79604, 79609, 79614, 79619, 79624, 79629, 79634, 79639, 79644, 79649, - 79653, 79658, 79663, 79668, 79673, 79678, 79683, 79688, 79693, 79698, - 79703, 79708, 79713, 79718, 79723, 79728, 79733, 79738, 79743, 79748, - 79753, 79758, 79763, 79768, 79773, 79778, 79783, 79788, 79793, 79798, - 79803, 79808, 79813, 79818, 79822, 79829, 79836, 79843, 79850, 79856, - 79863, 79870, 79877, 79884, 79891, 79898, 79905, 79912, 79919, 79926, - 79932, 79939, 79946, 79953, 79960, 79967, 79974, 79981, 79988, 79995, - 80002, 80009, 80018, 80027, 80036, 80045, 80054, 80063, 80072, 80081, - 80089, 80097, 80105, 80113, 80121, 80129, 80137, 80145, 80151, 80159, 0, - 0, 80167, 80174, 80180, 80186, 80192, 80198, 80204, 80210, 80217, 80223, + 0, 0, 75798, 75805, 75812, 75818, 75826, 75834, 75842, 75850, 75858, + 75866, 75872, 75878, 75885, 75891, 75897, 75903, 75910, 75917, 75924, + 75931, 75938, 75945, 75952, 75959, 75966, 75973, 75980, 75987, 75994, + 76001, 76007, 76014, 76021, 76028, 76035, 76042, 76049, 76056, 76063, + 76070, 76077, 76084, 76091, 76098, 76105, 76112, 76119, 76126, 76133, + 76141, 76149, 76157, 76165, 0, 0, 0, 0, 76173, 76181, 76189, 76197, + 76205, 76213, 76221, 76227, 76233, 76239, 0, 0, 0, 0, 0, 0, 76245, 76249, + 76254, 76259, 76264, 76269, 76274, 76279, 76284, 76289, 76294, 76299, + 76303, 76307, 76312, 76317, 76321, 76326, 76331, 76336, 76341, 76346, + 76351, 76356, 76360, 76365, 76369, 76374, 76379, 76383, 76387, 76391, + 76395, 76399, 76403, 76408, 76413, 76418, 76423, 76428, 76435, 76441, + 76446, 76451, 76456, 76461, 76467, 76474, 76480, 76487, 76494, 76501, + 76506, 76513, 76519, 76524, 0, 0, 0, 0, 0, 0, 0, 0, 76530, 76535, 76540, + 76544, 76549, 76553, 76558, 76562, 76567, 76572, 76578, 76583, 76589, + 76593, 76598, 76603, 76607, 76612, 76617, 76621, 76626, 76631, 76636, + 76641, 76646, 76651, 76656, 76661, 76666, 76671, 76676, 76681, 76686, + 76691, 76696, 76701, 76706, 76711, 76715, 76719, 76724, 76729, 76734, + 76738, 76742, 76747, 76751, 76756, 76761, 76766, 76771, 76775, 76780, + 76786, 76792, 76797, 76803, 76808, 76814, 76820, 76827, 76833, 76840, + 76845, 76851, 76857, 76862, 76868, 76874, 76879, 0, 0, 0, 0, 0, 0, 0, 0, + 76884, 76888, 76893, 76898, 76902, 76906, 76910, 76914, 76918, 76922, + 76927, 76931, 0, 0, 0, 0, 0, 0, 76936, 76941, 76945, 76949, 76953, 76957, + 76961, 76965, 76970, 76974, 76979, 76983, 76987, 76991, 76995, 76999, + 77004, 77009, 77014, 77020, 77026, 77033, 77038, 77043, 77049, 77053, + 77058, 77061, 77064, 77068, 0, 0, 77073, 77080, 77086, 77092, 77098, + 77104, 77110, 77116, 77123, 77129, 77136, 77142, 77149, 77156, 77163, + 77170, 77177, 77184, 77191, 77198, 77205, 77211, 77217, 77224, 77230, + 77237, 77244, 77251, 77257, 77263, 77270, 77277, 77283, 77290, 77297, + 77303, 77310, 77316, 77323, 77330, 77336, 77342, 77349, 77355, 77362, + 77369, 77378, 77385, 77392, 77396, 77401, 77406, 77411, 77416, 77420, + 77424, 77429, 77433, 77438, 77443, 77448, 77453, 77458, 77462, 77466, + 77471, 77475, 77480, 77485, 77490, 77495, 77499, 77504, 77509, 77514, + 77520, 77525, 77531, 77537, 77543, 77549, 77555, 77560, 77566, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 77570, 77575, 77579, 77583, 77587, 77591, 77595, + 77599, 77603, 77607, 77611, 77615, 77619, 77623, 77627, 77631, 77635, + 77639, 77643, 77647, 77651, 77655, 77659, 77663, 77667, 77671, 77675, + 77679, 77683, 77687, 0, 0, 0, 77691, 77696, 77701, 77706, 77711, 77715, + 77722, 77726, 77731, 77735, 77742, 77749, 77758, 77762, 77767, 77771, + 77775, 77782, 77789, 77794, 77801, 77806, 77811, 77818, 77823, 77830, + 77837, 77842, 77847, 77854, 77859, 77866, 77873, 77878, 77885, 77890, + 77897, 77901, 77905, 77912, 77917, 77924, 77928, 77932, 77937, 77944, + 77948, 77953, 77960, 77967, 77972, 77976, 77983, 77989, 77995, 78001, + 78009, 78015, 78023, 78029, 78037, 78043, 78049, 78055, 78061, 78065, + 78070, 78075, 78081, 78087, 78093, 78099, 78105, 78111, 78117, 78123, + 78131, 78137, 0, 78145, 78149, 78154, 78158, 78162, 78166, 78170, 78174, + 78178, 78183, 78187, 0, 0, 0, 0, 78192, 78200, 78206, 78212, 78218, + 78224, 78230, 78236, 78242, 78249, 78256, 78263, 78270, 78277, 78284, + 78291, 78298, 78305, 78312, 78319, 78325, 78331, 78337, 78343, 78349, + 78355, 78362, 78368, 78375, 78382, 78389, 78396, 78403, 0, 78410, 78414, + 78418, 78422, 78426, 78431, 78435, 78439, 78444, 78449, 78454, 78459, + 78464, 78469, 78474, 78479, 78484, 78489, 78494, 78499, 78504, 78509, + 78514, 78519, 78524, 78528, 78533, 78537, 78542, 78547, 78552, 78557, + 78562, 78566, 78571, 78575, 78580, 78584, 78589, 78594, 78599, 78603, + 78609, 78614, 78620, 78626, 78631, 78637, 78642, 78648, 78654, 78660, + 78665, 78671, 78676, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78682, 78688, 78694, + 78700, 78707, 78713, 78719, 78725, 78731, 78737, 78742, 78747, 78753, + 78760, 0, 0, 78767, 78772, 78776, 78780, 78784, 78788, 78792, 78796, + 78801, 78805, 0, 0, 78810, 78816, 78822, 78829, 78837, 78843, 78849, + 78855, 78861, 78867, 78873, 78879, 78885, 78891, 78897, 78903, 78908, + 78914, 78919, 78925, 78931, 78938, 78944, 78950, 78956, 78963, 78970, + 78977, 78983, 78988, 78993, 78999, 79007, 79014, 79021, 79029, 79037, + 79044, 79051, 79058, 79065, 79072, 79079, 79086, 79093, 79100, 79107, + 79114, 79121, 79128, 79135, 79142, 79149, 79156, 79163, 79170, 79177, + 79183, 79189, 79196, 79203, 79210, 79217, 79224, 79231, 79238, 79245, + 79252, 79259, 79266, 79273, 79280, 79287, 79294, 79301, 79308, 79315, + 79322, 79329, 79336, 79343, 79350, 79357, 79363, 79369, 79376, 79382, + 79387, 79393, 79398, 79403, 79408, 79415, 79421, 79427, 79433, 79439, + 79445, 79451, 79457, 79465, 79473, 79481, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 79489, 79495, 79501, 79507, + 79515, 79523, 79529, 79535, 79542, 79549, 79556, 79563, 79570, 79577, + 79584, 79591, 79598, 79606, 79614, 79622, 79630, 79638, 79644, 79652, + 79658, 79666, 79675, 79683, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 79689, 79693, + 79697, 79701, 79705, 79709, 0, 0, 79713, 79717, 79721, 79725, 79729, + 79733, 0, 0, 79737, 79741, 79745, 79749, 79753, 79757, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 79761, 79765, 79769, 79773, 79777, 79781, 79785, 0, 79789, + 79793, 79797, 79801, 79805, 79809, 79813, 0, 79817, 79824, 79830, 79836, + 79842, 79849, 79856, 79865, 79877, 79887, 79896, 79904, 79912, 79920, + 79926, 79934, 79941, 79948, 79957, 79968, 79976, 79986, 79992, 80002, + 80011, 80016, 80024, 80033, 80038, 80047, 80054, 80064, 80076, 80081, + 80088, 80095, 80100, 80110, 80120, 80130, 80140, 80155, 80168, 80179, + 80187, 80192, 80204, 80213, 80220, 80227, 80233, 80239, 80244, 80251, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 80257, 80261, 80265, 80269, 80273, 80277, + 80282, 80287, 80291, 80296, 80301, 80306, 80311, 80316, 80320, 80325, + 80330, 80335, 80340, 80345, 80349, 80354, 80359, 80364, 80369, 80374, + 80378, 80383, 80388, 80393, 80398, 80402, 80407, 80412, 80417, 80422, + 80427, 80432, 80437, 80442, 80447, 80452, 80457, 80462, 80467, 80472, + 80477, 80482, 80487, 80492, 80497, 80502, 80507, 80512, 80517, 80522, + 80527, 80532, 80537, 80542, 80547, 80552, 80557, 80562, 80567, 80572, + 80577, 80582, 80587, 80592, 80597, 80602, 80607, 80612, 80617, 80622, + 80627, 80632, 80637, 80642, 80646, 80653, 80660, 80667, 80674, 80680, + 80686, 80693, 80700, 80707, 80714, 80721, 80728, 80735, 80742, 80749, + 80755, 80762, 80769, 80776, 80783, 80790, 80797, 80804, 80811, 80818, + 80825, 80832, 80841, 80850, 80859, 80868, 80877, 80886, 80895, 80904, + 80912, 80920, 80928, 80936, 80944, 80952, 80960, 80968, 80974, 80982, 0, + 0, 80990, 80997, 81003, 81009, 81015, 81021, 81027, 81033, 81040, 81046, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -18300,624 +19419,657 @@ static unsigned int phrasebook_offset2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80230, 80234, 80238, 80242, - 80246, 80250, 80254, 80258, 80262, 80266, 80270, 80274, 80278, 80282, - 80286, 80290, 80294, 80298, 80302, 80306, 80310, 80314, 80318, 0, 0, 0, - 0, 80322, 80326, 80330, 80334, 80338, 80342, 80346, 80350, 80354, 80358, - 80362, 80366, 80370, 80374, 80378, 80382, 80386, 80390, 80394, 80398, - 80402, 80406, 80410, 80414, 80418, 80422, 80426, 80430, 80434, 80438, - 80442, 80446, 80450, 80454, 80458, 80462, 80466, 80470, 80474, 80478, - 80482, 80486, 80490, 80494, 80498, 80502, 80506, 80510, 80514, 0, 0, 0, - 0, 80518, 80522, 80526, 80530, 80534, 80538, 80542, 80546, 80550, 80554, - 80558, 80562, 80566, 80570, 80574, 80578, 80582, 80586, 80590, 80594, - 80598, 80602, 80606, 80610, 80614, 80618, 80622, 80626, 80630, 80634, - 80638, 80642, 80646, 80650, 80654, 80658, 80662, 80666, 80670, 80674, - 80678, 80682, 80686, 80690, 80694, 80698, 80702, 80706, 80710, 80714, - 80718, 80722, 80726, 80730, 80734, 80738, 80742, 80746, 80750, 80754, - 80758, 80762, 80766, 80770, 80774, 80778, 80782, 80786, 80790, 80794, - 80798, 80802, 80806, 80810, 80814, 80818, 80822, 80826, 80830, 80834, - 80838, 80842, 80846, 80850, 80854, 80858, 80862, 80866, 80870, 80874, - 80878, 80882, 80886, 80890, 80894, 80898, 80902, 80906, 80910, 80914, - 80918, 80922, 80926, 80930, 80934, 80938, 80942, 80946, 80950, 80954, - 80958, 80962, 80966, 80970, 80974, 80978, 80982, 80986, 80990, 80994, - 80998, 81002, 81006, 81010, 81014, 81018, 81022, 81026, 81030, 81034, - 81038, 81042, 81046, 81050, 81054, 81058, 81062, 81066, 81070, 81074, - 81078, 81082, 81086, 81090, 81094, 81098, 81102, 81106, 81110, 81114, - 81118, 81122, 81126, 81130, 81134, 81138, 81142, 81146, 81150, 81154, - 81158, 81162, 81166, 81170, 81174, 81178, 81182, 81186, 81190, 81194, - 81198, 81202, 81206, 81210, 81214, 81218, 81222, 81226, 81230, 81234, - 81238, 81242, 81246, 81250, 81254, 81258, 81262, 81266, 81270, 81274, - 81278, 81282, 81286, 81290, 81294, 81298, 81302, 81306, 81310, 81314, - 81318, 81322, 81326, 81330, 81334, 81338, 81342, 81346, 81350, 81354, - 81358, 81362, 81366, 81370, 81374, 81378, 81382, 81386, 81390, 81394, - 81398, 81402, 81406, 81410, 81414, 81418, 81422, 81426, 81430, 81434, - 81438, 81442, 81446, 81450, 81454, 81458, 81462, 81466, 81470, 81474, - 81478, 81482, 81486, 81490, 81494, 81498, 81502, 81506, 81510, 81514, - 81518, 81522, 81526, 81530, 81534, 81538, 81542, 81546, 81550, 81554, - 81558, 81562, 81566, 81570, 81574, 81578, 81582, 81586, 81590, 81594, - 81598, 81602, 81606, 81610, 81614, 81618, 81622, 81626, 81630, 81634, - 81638, 81642, 81646, 81650, 81654, 81658, 81662, 81666, 81670, 81674, - 81678, 81682, 81686, 81690, 81694, 81698, 81702, 81706, 81710, 81714, - 81718, 81722, 81726, 81730, 81734, 81738, 81742, 81746, 81750, 81754, - 81758, 81762, 81766, 81770, 81774, 81778, 81782, 81786, 81790, 81794, - 81798, 81802, 81806, 81810, 81814, 81818, 81822, 81826, 81830, 81834, - 81838, 81842, 81846, 81850, 81854, 81858, 81862, 81866, 81870, 81874, - 81878, 81882, 81886, 81890, 81894, 81898, 81902, 81906, 81910, 81914, - 81918, 81922, 81926, 81930, 81934, 81938, 81942, 81946, 81950, 81954, - 81958, 81962, 81966, 81970, 81974, 81978, 0, 0, 81982, 81986, 81990, - 81994, 81998, 82002, 82006, 82010, 82014, 82018, 82022, 82026, 82030, - 82034, 82038, 82042, 82046, 82050, 82054, 82058, 82062, 82066, 82070, - 82074, 82078, 82082, 82086, 82090, 82094, 82098, 82102, 82106, 82110, - 82114, 82118, 82122, 82126, 82130, 82134, 82138, 82142, 82146, 82150, - 82154, 82158, 82162, 82166, 82170, 82174, 82178, 82182, 82186, 82190, - 82194, 82198, 82202, 82206, 82210, 82214, 82218, 82222, 82226, 82230, - 82234, 82238, 82242, 82246, 82250, 82254, 82258, 82262, 82266, 82270, - 82274, 82278, 82282, 82286, 82290, 82294, 82298, 82302, 82306, 82310, - 82314, 82318, 82322, 82326, 82330, 82334, 82338, 82342, 82346, 82350, - 82354, 82358, 82362, 82366, 82370, 82374, 82378, 82382, 82386, 82390, - 82394, 82398, 82402, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82406, - 82411, 82416, 82421, 82426, 82431, 82439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82444, 82451, 82458, 82465, 82472, 0, 0, 0, 0, 0, 82479, 82486, - 82493, 82503, 82509, 82515, 82521, 82527, 82533, 82539, 82546, 82552, - 82558, 82564, 82573, 82582, 82594, 82606, 82612, 82618, 82624, 82631, - 82638, 82645, 82652, 82659, 0, 82666, 82673, 82680, 82688, 82695, 0, - 82702, 0, 82709, 82716, 0, 82723, 82731, 0, 82738, 82745, 82752, 82759, - 82766, 82773, 82780, 82787, 82794, 82801, 82806, 82813, 82820, 82826, - 82832, 82838, 82844, 82850, 82856, 82862, 82868, 82874, 82880, 82886, - 82892, 82898, 82904, 82910, 82916, 82922, 82928, 82934, 82940, 82946, - 82952, 82958, 82964, 82970, 82976, 82982, 82988, 82994, 83000, 83006, - 83012, 83018, 83024, 83030, 83036, 83042, 83048, 83054, 83060, 83066, - 83072, 83078, 83084, 83090, 83096, 83102, 83108, 83114, 83120, 83126, - 83132, 83138, 83144, 83150, 83156, 83162, 83168, 83174, 83180, 83186, - 83192, 83198, 83204, 83210, 83216, 83222, 83228, 83234, 83240, 83246, - 83252, 83258, 83264, 83270, 83276, 83284, 83292, 83298, 83304, 83310, - 83316, 83325, 83334, 83342, 83350, 83358, 83366, 83374, 83382, 83390, - 83398, 83405, 83412, 83423, 83434, 83438, 83442, 83447, 83452, 83457, - 83462, 83470, 83478, 83484, 83490, 83497, 83504, 83511, 83515, 83521, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83527, 83533, 83539, - 83545, 83551, 83556, 83561, 83567, 83573, 83579, 83585, 83594, 83600, - 83606, 83614, 83622, 83630, 83638, 83643, 83648, 83653, 83658, 83671, - 83684, 83695, 83706, 83718, 83730, 83742, 83754, 83765, 83776, 83788, - 83800, 83812, 83824, 83835, 83846, 83857, 83874, 83891, 83908, 83915, - 83922, 83929, 83936, 83947, 83958, 83969, 83982, 83993, 84001, 84009, - 84018, 84026, 84036, 84044, 84052, 84060, 84069, 84077, 84087, 84095, - 84103, 84111, 84121, 84129, 84136, 84143, 84150, 84157, 84165, 84173, - 84181, 84189, 84197, 84206, 84214, 84222, 84230, 84238, 84246, 84255, - 84263, 84271, 84279, 84287, 84295, 84303, 84311, 84319, 84327, 84335, - 84344, 84352, 84362, 84370, 84378, 84386, 84396, 84404, 84412, 84420, - 84428, 84437, 84446, 84454, 84464, 84472, 84480, 84488, 84497, 84505, - 84515, 84523, 84530, 84537, 84545, 84552, 84561, 84568, 84576, 84584, - 84593, 84601, 84611, 84619, 84627, 84635, 84645, 84653, 84660, 84667, - 84675, 84682, 84691, 84698, 84708, 84718, 84729, 84738, 84747, 84756, - 84765, 84774, 84784, 84796, 84808, 84819, 84831, 84844, 84855, 84864, - 84873, 84881, 84890, 84900, 84908, 84917, 84926, 84934, 84943, 84953, - 84961, 84970, 84979, 84987, 84996, 85006, 85014, 85024, 85032, 85042, - 85050, 85058, 85067, 85075, 85085, 85093, 85101, 85111, 85119, 85126, - 85133, 85142, 85151, 85159, 85168, 85178, 85186, 85197, 85205, 85213, - 85220, 85228, 85237, 85244, 85255, 85266, 85278, 85289, 85301, 85309, - 85317, 85326, 85334, 85343, 85351, 85359, 85368, 85376, 85385, 85393, - 85400, 85407, 85414, 85421, 85429, 85437, 85445, 85453, 85462, 85470, - 85478, 85487, 85495, 85503, 85511, 85520, 85528, 85536, 85544, 85552, - 85560, 85568, 85576, 85584, 85592, 85601, 85609, 85617, 85625, 85633, - 85641, 85650, 85659, 85667, 85675, 85683, 85692, 85700, 85709, 85716, - 85723, 85731, 85738, 85746, 85754, 85763, 85771, 85780, 85788, 85796, - 85806, 85813, 85820, 85828, 85835, 85843, 85854, 85866, 85874, 85883, - 85891, 85900, 85908, 85917, 85925, 85934, 85942, 85951, 85960, 85968, - 85976, 85984, 85993, 86000, 86008, 86017, 86026, 86035, 86045, 86053, - 86063, 86071, 86081, 86089, 86099, 86107, 86117, 86125, 86134, 86141, - 86150, 86157, 86167, 86175, 86185, 86193, 86203, 86211, 86219, 86227, - 86236, 86244, 86253, 86262, 86271, 86280, 86290, 86298, 86308, 86316, - 86326, 86334, 86344, 86352, 86362, 86370, 86379, 86386, 86395, 86402, - 86412, 86420, 86430, 86438, 86448, 86456, 86464, 86472, 86481, 86489, - 86498, 86507, 86516, 86525, 86533, 86541, 86550, 86558, 86567, 86576, - 86584, 86592, 86600, 86609, 86617, 86625, 86634, 86642, 86650, 86658, - 86666, 86671, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86676, - 86686, 86696, 86706, 86716, 86727, 86737, 86747, 86758, 86767, 86776, - 86785, 86796, 86806, 86816, 86828, 86838, 86848, 86858, 86868, 86878, - 86888, 86898, 86908, 86918, 86928, 86938, 86949, 86960, 86970, 86980, - 86992, 87003, 87014, 87024, 87034, 87044, 87054, 87064, 87074, 87084, - 87096, 87106, 87116, 87128, 87139, 87150, 87160, 87170, 87180, 87190, - 87202, 87212, 87222, 87233, 87244, 87254, 87264, 87273, 87282, 87291, - 87300, 87309, 87319, 0, 0, 87329, 87339, 87349, 87359, 87369, 87381, - 87391, 87401, 87413, 87423, 87435, 87444, 87453, 87464, 87474, 87486, - 87497, 87510, 87520, 87532, 87541, 87552, 87563, 87576, 87586, 87596, - 87606, 87616, 87626, 87635, 87644, 87653, 87662, 87672, 87682, 87692, - 87702, 87712, 87722, 87732, 87742, 87752, 87762, 87772, 87782, 87791, - 87800, 87809, 87819, 87829, 87839, 87849, 87859, 87870, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81053, 81057, 81061, 81065, + 81069, 81073, 81077, 81081, 81085, 81089, 81093, 81097, 81101, 81105, + 81109, 81113, 81117, 81121, 81125, 81129, 81133, 81137, 81141, 0, 0, 0, + 0, 81145, 81149, 81153, 81157, 81161, 81165, 81169, 81173, 81177, 81181, + 81185, 81189, 81193, 81197, 81201, 81205, 81209, 81213, 81217, 81221, + 81225, 81229, 81233, 81237, 81241, 81245, 81249, 81253, 81257, 81261, + 81265, 81269, 81273, 81277, 81281, 81285, 81289, 81293, 81297, 81301, + 81305, 81309, 81313, 81317, 81321, 81325, 81329, 81333, 81337, 0, 0, 0, + 0, 81341, 81345, 81349, 81353, 81357, 81361, 81365, 81369, 81373, 81377, + 81381, 81385, 81389, 81393, 81397, 81401, 81405, 81409, 81413, 81417, + 81421, 81425, 81429, 81433, 81437, 81441, 81445, 81449, 81453, 81457, + 81461, 81465, 81469, 81473, 81477, 81481, 81485, 81489, 81493, 81497, + 81501, 81505, 81509, 81513, 81517, 81521, 81525, 81529, 81533, 81537, + 81541, 81545, 81549, 81553, 81557, 81561, 81565, 81569, 81573, 81577, + 81581, 81585, 81589, 81593, 81597, 81601, 81605, 81609, 81613, 81617, + 81621, 81625, 81629, 81633, 81637, 81641, 81645, 81649, 81653, 81657, + 81661, 81665, 81669, 81673, 81677, 81681, 81685, 81689, 81693, 81697, + 81701, 81705, 81709, 81713, 81717, 81721, 81725, 81729, 81733, 81737, + 81741, 81745, 81749, 81753, 81757, 81761, 81765, 81769, 81773, 81777, + 81781, 81785, 81789, 81793, 81797, 81801, 81805, 81809, 81813, 81817, + 81821, 81825, 81829, 81833, 81837, 81841, 81845, 81849, 81853, 81857, + 81861, 81865, 81869, 81873, 81877, 81881, 81885, 81889, 81893, 81897, + 81901, 81905, 81909, 81913, 81917, 81921, 81925, 81929, 81933, 81937, + 81941, 81945, 81949, 81953, 81957, 81961, 81965, 81969, 81973, 81977, + 81981, 81985, 81989, 81993, 81997, 82001, 82005, 82009, 82013, 82017, + 82021, 82025, 82029, 82033, 82037, 82041, 82045, 82049, 82053, 82057, + 82061, 82065, 82069, 82073, 82077, 82081, 82085, 82089, 82093, 82097, + 82101, 82105, 82109, 82113, 82117, 82121, 82125, 82129, 82133, 82137, + 82141, 82145, 82149, 82153, 82157, 82161, 82165, 82169, 82173, 82177, + 82181, 82185, 82189, 82193, 82197, 82201, 82205, 82209, 82213, 82217, + 82221, 82225, 82229, 82233, 82237, 82241, 82245, 82249, 82253, 82257, + 82261, 82265, 82269, 82273, 82277, 82281, 82285, 82289, 82293, 82297, + 82301, 82305, 82309, 82313, 82317, 82321, 82325, 82329, 82333, 82337, + 82341, 82345, 82349, 82353, 82357, 82361, 82365, 82369, 82373, 82377, + 82381, 82385, 82389, 82393, 82397, 82401, 82405, 82409, 82413, 82417, + 82421, 82425, 82429, 82433, 82437, 82441, 82445, 82449, 82453, 82457, + 82461, 82465, 82469, 82473, 82477, 82481, 82485, 82489, 82493, 82497, + 82501, 82505, 82509, 82513, 82517, 82521, 82525, 82529, 82533, 82537, + 82541, 82545, 82549, 82553, 82557, 82561, 82565, 82569, 82573, 82577, + 82581, 82585, 82589, 82593, 82597, 82601, 82605, 82609, 82613, 82617, + 82621, 82625, 82629, 82633, 82637, 82641, 82645, 82649, 82653, 82657, + 82661, 82665, 82669, 82673, 82677, 82681, 82685, 82689, 82693, 82697, + 82701, 82705, 82709, 82713, 82717, 82721, 82725, 82729, 82733, 82737, + 82741, 82745, 82749, 82753, 82757, 82761, 82765, 82769, 82773, 82777, + 82781, 82785, 82789, 82793, 82797, 82801, 0, 0, 82805, 82809, 82813, + 82817, 82821, 82825, 82829, 82833, 82837, 82841, 82845, 82849, 82853, + 82857, 82861, 82865, 82869, 82873, 82877, 82881, 82885, 82889, 82893, + 82897, 82901, 82905, 82909, 82913, 82917, 82921, 82925, 82929, 82933, + 82937, 82941, 82945, 82949, 82953, 82957, 82961, 82965, 82969, 82973, + 82977, 82981, 82985, 82989, 82993, 82997, 83001, 83005, 83009, 83013, + 83017, 83021, 83025, 83029, 83033, 83037, 83041, 83045, 83049, 83053, + 83057, 83061, 83065, 83069, 83073, 83077, 83081, 83085, 83089, 83093, + 83097, 83101, 83105, 83109, 83113, 83117, 83121, 83125, 83129, 83133, + 83137, 83141, 83145, 83149, 83153, 83157, 83161, 83165, 83169, 83173, + 83177, 83181, 83185, 83189, 83193, 83197, 83201, 83205, 83209, 83213, + 83217, 83221, 83225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83229, + 83234, 83239, 83244, 83249, 83254, 83262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 83267, 83274, 83281, 83288, 83295, 0, 0, 0, 0, 0, 83302, 83309, + 83316, 83326, 83332, 83338, 83344, 83350, 83356, 83362, 83369, 83375, + 83381, 83387, 83396, 83405, 83417, 83429, 83435, 83441, 83447, 83454, + 83461, 83468, 83475, 83482, 0, 83489, 83496, 83503, 83511, 83518, 0, + 83525, 0, 83532, 83539, 0, 83546, 83554, 0, 83561, 83568, 83575, 83582, + 83589, 83596, 83603, 83610, 83617, 83624, 83629, 83636, 83643, 83649, + 83655, 83661, 83667, 83673, 83679, 83685, 83691, 83697, 83703, 83709, + 83715, 83721, 83727, 83733, 83739, 83745, 83751, 83757, 83763, 83769, + 83775, 83781, 83787, 83793, 83799, 83805, 83811, 83817, 83823, 83829, + 83835, 83841, 83847, 83853, 83859, 83865, 83871, 83877, 83883, 83889, + 83895, 83901, 83907, 83913, 83919, 83925, 83931, 83937, 83943, 83949, + 83955, 83961, 83967, 83973, 83979, 83985, 83991, 83997, 84003, 84009, + 84015, 84021, 84027, 84033, 84039, 84045, 84051, 84057, 84063, 84069, + 84075, 84081, 84087, 84093, 84099, 84107, 84115, 84121, 84127, 84133, + 84139, 84148, 84157, 84165, 84173, 84181, 84189, 84197, 84205, 84213, + 84221, 84228, 84235, 84246, 84257, 84261, 84265, 84270, 84275, 84280, + 84285, 84293, 84301, 84307, 84313, 84320, 84327, 84334, 84338, 84344, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84350, 84356, 84362, + 84368, 84374, 84379, 84384, 84390, 84396, 84402, 84408, 84417, 84423, + 84429, 84437, 84445, 84453, 84461, 84466, 84471, 84476, 84481, 84494, + 84507, 84518, 84529, 84541, 84553, 84565, 84577, 84588, 84599, 84611, + 84623, 84635, 84647, 84658, 84669, 84680, 84697, 84714, 84731, 84738, + 84745, 84752, 84759, 84770, 84781, 84792, 84805, 84816, 84824, 84832, + 84841, 84849, 84859, 84867, 84875, 84883, 84892, 84900, 84910, 84918, + 84926, 84934, 84944, 84952, 84959, 84966, 84973, 84980, 84988, 84996, + 85004, 85012, 85020, 85029, 85037, 85045, 85053, 85061, 85069, 85078, + 85086, 85094, 85102, 85110, 85118, 85126, 85134, 85142, 85150, 85158, + 85167, 85175, 85185, 85193, 85201, 85209, 85219, 85227, 85235, 85243, + 85251, 85260, 85269, 85277, 85287, 85295, 85303, 85311, 85320, 85328, + 85338, 85346, 85353, 85360, 85368, 85375, 85384, 85391, 85399, 85407, + 85416, 85424, 85434, 85442, 85450, 85458, 85468, 85476, 85483, 85490, + 85498, 85505, 85514, 85521, 85531, 85541, 85552, 85561, 85570, 85579, + 85588, 85597, 85607, 85619, 85631, 85642, 85654, 85667, 85678, 85687, + 85696, 85704, 85713, 85723, 85731, 85740, 85749, 85757, 85766, 85776, + 85784, 85793, 85802, 85810, 85819, 85829, 85837, 85847, 85855, 85865, + 85873, 85881, 85890, 85898, 85908, 85916, 85924, 85934, 85942, 85949, + 85956, 85965, 85974, 85982, 85991, 86001, 86009, 86020, 86028, 86036, + 86043, 86051, 86060, 86067, 86078, 86089, 86101, 86112, 86124, 86132, + 86140, 86149, 86157, 86166, 86174, 86182, 86191, 86199, 86208, 86216, + 86223, 86230, 86237, 86244, 86252, 86260, 86268, 86276, 86285, 86293, + 86301, 86310, 86318, 86326, 86334, 86343, 86351, 86359, 86367, 86375, + 86383, 86391, 86399, 86407, 86415, 86424, 86432, 86440, 86448, 86456, + 86464, 86473, 86482, 86490, 86498, 86506, 86515, 86523, 86532, 86539, + 86546, 86554, 86561, 86569, 86577, 86586, 86594, 86603, 86611, 86619, + 86629, 86636, 86643, 86651, 86658, 86666, 86677, 86689, 86697, 86706, + 86714, 86723, 86731, 86740, 86748, 86757, 86765, 86774, 86783, 86791, + 86799, 86807, 86816, 86823, 86831, 86840, 86849, 86858, 86868, 86876, + 86886, 86894, 86904, 86912, 86922, 86930, 86940, 86948, 86957, 86964, + 86973, 86980, 86990, 86998, 87008, 87016, 87026, 87034, 87042, 87050, + 87059, 87067, 87076, 87085, 87094, 87103, 87113, 87121, 87131, 87139, + 87149, 87157, 87167, 87175, 87185, 87193, 87202, 87209, 87218, 87225, + 87235, 87243, 87253, 87261, 87271, 87279, 87287, 87295, 87304, 87312, + 87321, 87330, 87339, 87348, 87356, 87364, 87373, 87381, 87390, 87399, + 87407, 87415, 87423, 87432, 87440, 87448, 87457, 87465, 87473, 87481, + 87489, 87494, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87499, + 87509, 87519, 87529, 87539, 87550, 87560, 87570, 87581, 87590, 87599, + 87608, 87619, 87629, 87639, 87651, 87661, 87671, 87681, 87691, 87701, + 87711, 87721, 87731, 87741, 87751, 87761, 87772, 87783, 87793, 87803, + 87815, 87826, 87837, 87847, 87857, 87867, 87877, 87887, 87897, 87907, + 87919, 87929, 87939, 87951, 87962, 87973, 87983, 87993, 88003, 88013, + 88025, 88035, 88045, 88056, 88067, 88077, 88087, 88096, 88105, 88114, + 88123, 88132, 88142, 0, 0, 88152, 88162, 88172, 88182, 88192, 88204, + 88214, 88224, 88236, 88246, 88258, 88267, 88276, 88287, 88297, 88309, + 88320, 88333, 88343, 88355, 88364, 88375, 88386, 88399, 88409, 88419, + 88429, 88439, 88449, 88458, 88467, 88476, 88485, 88495, 88505, 88515, + 88525, 88535, 88545, 88555, 88565, 88575, 88585, 88595, 88605, 88614, + 88623, 88632, 88642, 88652, 88662, 88672, 88682, 88693, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87880, 87895, 87910, 87916, 87922, 87928, - 87934, 87940, 87946, 87952, 87958, 87966, 87970, 87973, 0, 0, 87981, - 87984, 87987, 87990, 87993, 87996, 87999, 88002, 88005, 88008, 88011, - 88014, 88017, 88020, 88023, 88026, 88029, 88037, 88046, 88057, 88065, - 88073, 88082, 88091, 88102, 88114, 0, 0, 0, 0, 0, 0, 88124, 88129, 88134, - 88141, 88148, 88154, 88160, 88165, 88170, 88175, 88181, 88187, 88193, - 88199, 88205, 88212, 88219, 88229, 88239, 88249, 88258, 88269, 88278, - 88287, 88297, 88307, 88319, 88331, 88342, 88353, 88364, 88375, 88385, - 88395, 88405, 88415, 88426, 88437, 88441, 88446, 88455, 88464, 88468, - 88472, 88476, 88481, 88486, 88491, 88496, 88499, 88503, 0, 88508, 88511, - 88514, 88518, 88522, 88527, 88531, 88535, 88540, 88545, 88552, 88559, - 88562, 88565, 88568, 88571, 88574, 88578, 88582, 0, 88586, 88591, 88595, - 88599, 0, 0, 0, 0, 88604, 88609, 88616, 88621, 88626, 0, 88631, 88636, - 88641, 88646, 88651, 88656, 88661, 88666, 88671, 88676, 88681, 88687, - 88696, 88705, 88714, 88723, 88733, 88743, 88753, 88763, 88772, 88781, - 88790, 88799, 88804, 88809, 88815, 88821, 88827, 88833, 88841, 88849, - 88855, 88861, 88867, 88873, 88879, 88885, 88891, 88897, 88902, 88907, - 88912, 88917, 88922, 88927, 88932, 88937, 88943, 88949, 88955, 88961, - 88967, 88973, 88979, 88985, 88991, 88997, 89003, 89009, 89015, 89021, - 89027, 89033, 89039, 89045, 89051, 89057, 89063, 89069, 89075, 89081, - 89087, 89093, 89099, 89105, 89111, 89117, 89123, 89129, 89135, 89141, - 89147, 89153, 89159, 89165, 89171, 89177, 89183, 89189, 89195, 89201, - 89207, 89213, 89219, 89225, 89231, 89237, 89243, 89249, 89255, 89261, - 89267, 89273, 89279, 89285, 89291, 89297, 89302, 89307, 89312, 89317, - 89323, 89329, 89335, 89341, 89347, 89353, 89359, 89365, 89371, 89377, - 89384, 89391, 89396, 89401, 89406, 89411, 89423, 89435, 89447, 89459, - 89472, 89485, 89493, 0, 0, 89501, 0, 89509, 89513, 89517, 89520, 89524, - 89528, 89531, 89534, 89538, 89542, 89545, 89548, 89551, 89554, 89559, - 89562, 89566, 89569, 89572, 89575, 89578, 89581, 89584, 89588, 89591, - 89595, 89598, 89601, 89605, 89609, 89613, 89617, 89622, 89627, 89633, - 89639, 89645, 89650, 89656, 89662, 89668, 89673, 89679, 89685, 89690, - 89696, 89702, 89707, 89713, 89719, 89724, 89729, 89735, 89740, 89746, - 89752, 89758, 89764, 89770, 89774, 89779, 89783, 89788, 89792, 89797, - 89802, 89808, 89814, 89820, 89825, 89831, 89837, 89843, 89848, 89854, - 89860, 89865, 89871, 89877, 89882, 89888, 89894, 89899, 89904, 89910, - 89915, 89921, 89927, 89933, 89939, 89945, 89950, 89954, 89959, 89962, - 89967, 89972, 89978, 89983, 89988, 89992, 89997, 90002, 90007, 90012, - 90017, 90022, 90027, 90032, 90038, 90044, 90050, 90058, 90062, 90066, - 90070, 90074, 90078, 90082, 90087, 90092, 90097, 90102, 90107, 90112, - 90117, 90122, 90127, 90132, 90137, 90142, 90147, 90151, 90156, 90161, - 90166, 90171, 90176, 90180, 90185, 90190, 90195, 90200, 90204, 90209, - 90214, 90219, 90224, 90228, 90233, 90238, 90243, 90248, 90253, 90258, - 90263, 90268, 90273, 90280, 90287, 90291, 90296, 90301, 90306, 90311, - 90316, 90321, 90326, 90331, 90336, 90341, 90346, 90351, 90356, 90361, - 90366, 90371, 90376, 90381, 90386, 90391, 90396, 90401, 90406, 90411, - 90416, 90421, 90426, 90431, 90436, 0, 0, 0, 90441, 90445, 90450, 90454, - 90459, 90464, 0, 0, 90468, 90473, 90478, 90482, 90487, 90492, 0, 0, - 90497, 90502, 90506, 90511, 90516, 90521, 0, 0, 90526, 90531, 90536, 0, - 0, 0, 90540, 90544, 90548, 90552, 90555, 90559, 90563, 0, 90567, 90573, - 90576, 90579, 90582, 90585, 90589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90593, - 90599, 90605, 90611, 90617, 0, 0, 90621, 90627, 90633, 90639, 90645, - 90651, 90658, 90665, 90672, 90679, 90686, 90693, 0, 90700, 90707, 90714, - 90720, 90727, 90734, 90741, 90748, 90754, 90761, 90768, 90775, 90782, - 90789, 90796, 90803, 90810, 90817, 90823, 90830, 90837, 90844, 90851, - 90858, 90865, 90872, 0, 90879, 90886, 90893, 90900, 90907, 90914, 90921, - 90928, 90935, 90942, 90949, 90956, 90963, 90970, 90976, 90983, 90990, - 90997, 91004, 0, 91011, 91018, 0, 91025, 91032, 91039, 91046, 91053, - 91060, 91067, 91074, 91081, 91088, 91095, 91102, 91109, 91116, 91123, 0, - 0, 91129, 91134, 91139, 91144, 91149, 91154, 91159, 91164, 91169, 91174, - 91179, 91184, 91189, 91194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91199, 91206, - 91213, 91220, 91227, 91234, 91241, 91248, 91255, 91262, 91269, 91276, - 91283, 91290, 91297, 91304, 91311, 91318, 91325, 91332, 91340, 91348, - 91355, 91362, 91367, 91375, 91383, 91390, 91397, 91402, 91409, 91414, - 91419, 91426, 91431, 91436, 91441, 91449, 91454, 91459, 91466, 91471, - 91476, 91483, 91490, 91495, 91500, 91505, 91510, 91515, 91520, 91525, - 91530, 91535, 91542, 91547, 91554, 91559, 91564, 91569, 91574, 91579, - 91584, 91589, 91594, 91599, 91604, 91609, 91616, 91623, 91630, 91637, - 91643, 91648, 91655, 91660, 91665, 91674, 91681, 91690, 91697, 91702, - 91707, 91715, 91720, 91725, 91730, 91735, 91740, 91747, 91752, 91757, - 91762, 91767, 91772, 91779, 91786, 91793, 91800, 91807, 91814, 91821, - 91828, 91835, 91842, 91849, 91856, 91863, 91870, 91877, 91884, 91891, - 91898, 91905, 91912, 91919, 91926, 91933, 91940, 91947, 91954, 91961, - 91968, 0, 0, 0, 0, 0, 91975, 91983, 91991, 0, 0, 0, 0, 91996, 92000, - 92004, 92008, 92012, 92016, 92020, 92025, 92029, 92034, 92039, 92044, - 92049, 92054, 92059, 92064, 92069, 92074, 92079, 92085, 92091, 92097, - 92104, 92111, 92118, 92125, 92132, 92139, 92145, 92151, 92157, 92164, - 92171, 92178, 92185, 92192, 92199, 92206, 92213, 92220, 92227, 92234, - 92241, 92248, 92255, 0, 0, 0, 92262, 92270, 92278, 92286, 92294, 92302, - 92312, 92322, 92330, 92338, 92346, 92354, 92362, 92368, 92375, 92384, - 92393, 92402, 92411, 92420, 92429, 92439, 92450, 92460, 92471, 92480, - 92489, 92498, 92508, 92519, 92529, 92540, 92551, 92560, 92568, 92574, - 92580, 92586, 92592, 92600, 92608, 92614, 92621, 92631, 92638, 92645, - 92652, 92659, 92666, 92676, 92683, 92690, 92698, 92706, 92715, 92724, - 92733, 92742, 92751, 92759, 92768, 92777, 92786, 92790, 92797, 92802, - 92807, 92811, 92815, 92819, 92823, 92828, 92833, 92839, 92845, 92849, - 92855, 92859, 92863, 92867, 92871, 92875, 92879, 92885, 92889, 92894, 0, - 0, 0, 92898, 92903, 92908, 92913, 92918, 92925, 92930, 92935, 92940, - 92945, 92950, 92955, 0, 0, 0, 0, 92960, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88703, 88718, 88733, 88739, 88745, 88751, + 88757, 88763, 88769, 88775, 88781, 88789, 88793, 88796, 0, 0, 88804, + 88807, 88810, 88813, 88816, 88819, 88822, 88825, 88828, 88831, 88834, + 88837, 88840, 88843, 88846, 88849, 88852, 88860, 88869, 88880, 88888, + 88896, 88905, 88914, 88925, 88937, 0, 0, 0, 0, 0, 0, 88947, 88952, 88957, + 88964, 88971, 88977, 88983, 88988, 88993, 88998, 89004, 89010, 89016, + 89022, 89028, 89035, 89042, 89052, 89062, 89072, 89081, 89092, 89101, + 89110, 89120, 89130, 89142, 89154, 89165, 89176, 89187, 89198, 89208, + 89218, 89228, 89238, 89249, 89260, 89264, 89269, 89278, 89287, 89291, + 89295, 89299, 89304, 89309, 89314, 89319, 89322, 89326, 0, 89331, 89334, + 89337, 89341, 89345, 89350, 89354, 89358, 89363, 89368, 89375, 89382, + 89385, 89388, 89391, 89394, 89397, 89401, 89405, 0, 89409, 89414, 89418, + 89422, 0, 0, 0, 0, 89427, 89432, 89439, 89444, 89449, 0, 89454, 89459, + 89464, 89469, 89474, 89479, 89484, 89489, 89494, 89499, 89504, 89510, + 89519, 89528, 89537, 89546, 89556, 89566, 89576, 89586, 89595, 89604, + 89613, 89622, 89627, 89632, 89638, 89644, 89650, 89656, 89664, 89672, + 89678, 89684, 89690, 89696, 89702, 89708, 89714, 89720, 89725, 89730, + 89735, 89740, 89745, 89750, 89755, 89760, 89766, 89772, 89778, 89784, + 89790, 89796, 89802, 89808, 89814, 89820, 89826, 89832, 89838, 89844, + 89850, 89856, 89862, 89868, 89874, 89880, 89886, 89892, 89898, 89904, + 89910, 89916, 89922, 89928, 89934, 89940, 89946, 89952, 89958, 89964, + 89970, 89976, 89982, 89988, 89994, 90000, 90006, 90012, 90018, 90024, + 90030, 90036, 90042, 90048, 90054, 90060, 90066, 90072, 90078, 90084, + 90090, 90096, 90102, 90108, 90114, 90120, 90125, 90130, 90135, 90140, + 90146, 90152, 90158, 90164, 90170, 90176, 90182, 90188, 90194, 90200, + 90207, 90214, 90219, 90224, 90229, 90234, 90246, 90258, 90270, 90282, + 90295, 90308, 90316, 0, 0, 90324, 0, 90332, 90336, 90340, 90343, 90347, + 90351, 90354, 90357, 90361, 90365, 90368, 90371, 90374, 90377, 90382, + 90385, 90389, 90392, 90395, 90398, 90401, 90404, 90407, 90411, 90414, + 90418, 90421, 90424, 90428, 90432, 90436, 90440, 90445, 90450, 90456, + 90462, 90468, 90473, 90479, 90485, 90491, 90496, 90502, 90508, 90513, + 90519, 90525, 90530, 90536, 90542, 90547, 90553, 90559, 90564, 90570, + 90576, 90582, 90588, 90594, 90598, 90603, 90607, 90612, 90616, 90621, + 90626, 90632, 90638, 90644, 90649, 90655, 90661, 90667, 90672, 90678, + 90684, 90689, 90695, 90701, 90706, 90712, 90718, 90723, 90729, 90735, + 90740, 90746, 90752, 90758, 90764, 90770, 90775, 90779, 90784, 90787, + 90792, 90797, 90803, 90808, 90813, 90817, 90822, 90827, 90832, 90837, + 90842, 90847, 90852, 90857, 90863, 90869, 90875, 90883, 90887, 90891, + 90895, 90899, 90903, 90907, 90912, 90917, 90922, 90927, 90932, 90937, + 90942, 90947, 90952, 90957, 90962, 90967, 90972, 90976, 90980, 90985, + 90990, 90995, 91000, 91004, 91009, 91014, 91019, 91024, 91028, 91033, + 91038, 91043, 91048, 91052, 91057, 91062, 91067, 91072, 91077, 91082, + 91087, 91092, 91097, 91104, 91111, 91115, 91120, 91125, 91130, 91135, + 91140, 91145, 91150, 91155, 91160, 91165, 91170, 91175, 91180, 91185, + 91190, 91195, 91200, 91205, 91210, 91215, 91220, 91225, 91230, 91235, + 91240, 91245, 91250, 91255, 91260, 0, 0, 0, 91265, 91269, 91274, 91278, + 91283, 91288, 0, 0, 91292, 91297, 91302, 91306, 91311, 91316, 0, 0, + 91321, 91326, 91330, 91335, 91340, 91345, 0, 0, 91350, 91355, 91360, 0, + 0, 0, 91364, 91368, 91372, 91376, 91379, 91383, 91387, 0, 91391, 91397, + 91400, 91403, 91406, 91409, 91413, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91417, + 91423, 91429, 91435, 91441, 0, 0, 91445, 91451, 91457, 91463, 91469, + 91475, 91482, 91489, 91496, 91503, 91510, 91517, 0, 91524, 91531, 91538, + 91544, 91551, 91558, 91565, 91572, 91578, 91585, 91592, 91599, 91606, + 91612, 91619, 91626, 91633, 91640, 91646, 91653, 91660, 91667, 91674, + 91681, 91688, 91695, 0, 91702, 91709, 91716, 91723, 91730, 91737, 91744, + 91751, 91758, 91765, 91772, 91779, 91786, 91793, 91799, 91806, 91813, + 91820, 91827, 0, 91834, 91841, 0, 91848, 91855, 91862, 91869, 91876, + 91883, 91890, 91897, 91904, 91911, 91918, 91925, 91932, 91939, 91946, 0, + 0, 91952, 91957, 91962, 91967, 91972, 91977, 91982, 91987, 91992, 91997, + 92002, 92007, 92012, 92017, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92022, 92029, + 92036, 92043, 92050, 92057, 92064, 92071, 92078, 92085, 92092, 92099, + 92106, 92113, 92120, 92127, 92134, 92141, 92148, 92155, 92163, 92171, + 92178, 92185, 92190, 92198, 92206, 92213, 92220, 92225, 92232, 92237, + 92242, 92249, 92254, 92259, 92264, 92272, 92277, 92282, 92289, 92294, + 92299, 92306, 92313, 92318, 92323, 92328, 92333, 92338, 92343, 92348, + 92353, 92358, 92365, 92370, 92377, 92382, 92387, 92392, 92397, 92402, + 92407, 92412, 92417, 92422, 92427, 92432, 92439, 92446, 92453, 92460, + 92466, 92471, 92478, 92483, 92488, 92497, 92504, 92513, 92520, 92525, + 92530, 92538, 92543, 92548, 92553, 92558, 92563, 92570, 92575, 92580, + 92585, 92590, 92595, 92602, 92609, 92616, 92623, 92630, 92637, 92644, + 92651, 92658, 92665, 92672, 92679, 92686, 92693, 92700, 92707, 92714, + 92721, 92728, 92735, 92742, 92749, 92756, 92763, 92770, 92777, 92784, + 92791, 0, 0, 0, 0, 0, 92798, 92806, 92814, 0, 0, 0, 0, 92819, 92823, + 92827, 92831, 92835, 92839, 92843, 92848, 92852, 92857, 92862, 92867, + 92872, 92877, 92882, 92887, 92892, 92897, 92902, 92908, 92914, 92920, + 92927, 92934, 92941, 92948, 92955, 92962, 92968, 92974, 92980, 92987, + 92994, 93001, 93008, 93015, 93022, 93029, 93036, 93043, 93050, 93057, + 93064, 93071, 93078, 0, 0, 0, 93085, 93093, 93101, 93109, 93117, 93125, + 93135, 93145, 93153, 93161, 93169, 93177, 93185, 93191, 93198, 93207, + 93216, 93225, 93234, 93243, 93252, 93262, 93273, 93283, 93294, 93303, + 93312, 93321, 93331, 93342, 93352, 93363, 93374, 93383, 93391, 93397, + 93403, 93409, 93415, 93423, 93431, 93437, 93444, 93454, 93461, 93468, + 93475, 93482, 93489, 93499, 93506, 93513, 93521, 93529, 93538, 93547, + 93556, 93565, 93574, 93582, 93591, 93600, 93609, 93613, 93620, 93625, + 93630, 93634, 93638, 93642, 93646, 93651, 93656, 93662, 93668, 93672, + 93678, 93682, 93686, 93690, 93694, 93698, 93702, 93708, 93712, 93717, + 93721, 93725, 0, 93728, 93733, 93738, 93743, 93748, 93755, 93760, 93765, + 93770, 93775, 93780, 93785, 0, 0, 0, 0, 93790, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92966, 92973, 92982, 92991, 92998, - 93005, 93012, 93019, 93026, 93033, 93039, 93046, 93053, 93060, 93067, - 93074, 93081, 93088, 93095, 93104, 93111, 93118, 93125, 93132, 93139, - 93146, 93153, 93160, 93169, 93176, 93183, 93190, 93197, 93204, 93211, - 93220, 93227, 93234, 93241, 93248, 93257, 93264, 93271, 93278, 93286, - 93295, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93796, 93803, 93812, 93821, + 93828, 93835, 93842, 93849, 93856, 93863, 93869, 93876, 93883, 93890, + 93897, 93904, 93911, 93918, 93925, 93934, 93941, 93948, 93955, 93962, + 93969, 93976, 93983, 93990, 93999, 94006, 94013, 94020, 94027, 94034, + 94041, 94050, 94057, 94064, 94071, 94078, 94087, 94094, 94101, 94108, + 94116, 94125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93304, 93308, 93312, 93317, 93322, - 93327, 93332, 93336, 93341, 93346, 93351, 93356, 93361, 93366, 93370, - 93375, 93380, 93385, 93390, 93394, 93399, 93404, 93408, 93412, 93417, - 93422, 93427, 93432, 93437, 0, 0, 0, 93442, 93446, 93451, 93456, 93460, - 93465, 93469, 93474, 93479, 93484, 93489, 93494, 93498, 93503, 93508, - 93513, 93518, 93522, 93527, 93531, 93536, 93541, 93546, 93551, 93556, - 93561, 93565, 93569, 93574, 93579, 93584, 93589, 93594, 93599, 93604, - 93609, 93614, 93619, 93624, 93629, 93634, 93639, 93644, 93649, 93654, - 93659, 93664, 93669, 93674, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93679, 93685, 93690, 93695, 93700, 93705, 93710, 93715, 93721, 93726, - 93732, 93738, 93744, 93750, 93756, 93762, 93768, 93774, 93780, 93786, - 93793, 93800, 93807, 93815, 93823, 93831, 93839, 93847, 0, 0, 0, 0, - 93855, 93859, 93864, 93869, 93874, 93878, 93883, 93888, 93893, 93898, - 93902, 93906, 93911, 93916, 93921, 93926, 93930, 93935, 93940, 93945, - 93950, 93955, 93960, 93964, 93969, 93974, 93979, 93984, 93989, 93994, - 93999, 94004, 94009, 94014, 94019, 94025, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 94031, 94036, 94041, 94046, 94051, 94056, 94061, 94066, 94071, - 94076, 94081, 94086, 94091, 94096, 94101, 94106, 94111, 94116, 94121, - 94126, 94131, 94136, 94141, 94146, 94151, 94156, 94161, 0, 0, 0, 0, 0, - 94168, 94174, 94180, 94186, 94192, 94197, 94203, 94209, 94215, 94221, - 94226, 94232, 94238, 94244, 94250, 94256, 94262, 94268, 94274, 94280, - 94285, 94291, 94297, 94303, 94309, 94315, 94320, 94326, 94332, 94337, - 94343, 94349, 94355, 94361, 94367, 94373, 94379, 94384, 94390, 94397, - 94404, 94411, 94418, 0, 0, 0, 0, 0, 94425, 94430, 94435, 94440, 94445, - 94450, 94455, 94460, 94465, 94470, 94475, 94480, 94485, 94490, 94495, - 94500, 94505, 94510, 94515, 94520, 94525, 94530, 94535, 94540, 94545, - 94550, 94555, 94559, 94563, 94567, 0, 94572, 94578, 94583, 94588, 94593, - 94598, 94604, 94610, 94616, 94622, 94628, 94634, 94640, 94646, 94652, - 94658, 94664, 94670, 94676, 94681, 94687, 94693, 94699, 94705, 94710, - 94716, 94722, 94727, 94733, 94739, 94745, 94751, 94757, 94763, 94769, - 94775, 94781, 0, 0, 0, 0, 94786, 94792, 94798, 94804, 94810, 94816, - 94822, 94828, 94834, 94841, 94846, 94851, 94857, 94863, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94134, 94138, 94142, 94147, + 94152, 94157, 94162, 94166, 94171, 94176, 94181, 94186, 94191, 94196, + 94200, 94205, 94210, 94215, 94220, 94224, 94229, 94234, 94238, 94243, + 94248, 94253, 94258, 94263, 94268, 0, 0, 0, 94273, 94277, 94282, 94287, + 94291, 94296, 94300, 94305, 94310, 94315, 94320, 94325, 94329, 94334, + 94339, 94344, 94349, 94354, 94359, 94363, 94368, 94373, 94378, 94383, + 94388, 94393, 94397, 94401, 94406, 94411, 94416, 94421, 94426, 94431, + 94436, 94441, 94446, 94451, 94456, 94461, 94466, 94471, 94476, 94481, + 94486, 94491, 94496, 94501, 94506, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 94511, 94517, 94522, 94527, 94532, 94537, 94542, 94547, 94553, + 94558, 94564, 94570, 94576, 94582, 94588, 94594, 94600, 94606, 94612, + 94618, 94625, 94632, 94639, 94647, 94655, 94663, 94671, 94679, 0, 0, 0, + 0, 94687, 94691, 94696, 94701, 94706, 94710, 94715, 94720, 94725, 94730, + 94734, 94738, 94743, 94748, 94753, 94758, 94762, 94767, 94772, 94777, + 94782, 94787, 94792, 94796, 94801, 94806, 94811, 94816, 94821, 94826, + 94831, 94836, 94841, 94846, 94851, 94857, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 94863, 94868, 94873, 94878, 94883, 94888, 94893, 94898, 94903, + 94908, 94913, 94918, 94923, 94928, 94933, 94938, 94943, 94948, 94953, + 94958, 94963, 94968, 94973, 94978, 94983, 94988, 94993, 0, 0, 0, 0, 0, + 95000, 95006, 95012, 95018, 95024, 95029, 95035, 95041, 95047, 95053, + 95058, 95064, 95070, 95076, 95082, 95088, 95094, 95100, 95106, 95112, + 95117, 95123, 95129, 95135, 95141, 95147, 95152, 95158, 95164, 95169, + 95175, 95181, 95187, 95193, 95199, 95205, 95211, 95216, 95222, 95229, + 95236, 95243, 95250, 0, 0, 0, 0, 0, 95257, 95262, 95267, 95272, 95277, + 95282, 95287, 95292, 95297, 95302, 95307, 95312, 95317, 95322, 95327, + 95332, 95337, 95342, 95347, 95352, 95357, 95362, 95367, 95372, 95377, + 95382, 95387, 95391, 95395, 95399, 0, 95404, 95410, 95415, 95420, 95425, + 95430, 95436, 95442, 95448, 95454, 95460, 95466, 95472, 95478, 95484, + 95490, 95496, 95502, 95508, 95513, 95519, 95525, 95530, 95536, 95541, + 95547, 95553, 95558, 95564, 95570, 95576, 95582, 95587, 95593, 95599, + 95605, 95611, 0, 0, 0, 0, 95616, 95622, 95628, 95634, 95640, 95646, + 95652, 95658, 95664, 95671, 95676, 95681, 95687, 95693, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94869, 94875, 94881, 94887, 94894, - 94900, 94907, 94914, 94921, 94928, 94936, 94943, 94951, 94957, 94963, - 94969, 94975, 94981, 94987, 94993, 94999, 95005, 95011, 95017, 95023, - 95029, 95035, 95041, 95047, 95053, 95059, 95065, 95071, 95077, 95083, - 95089, 95095, 95101, 95107, 95113, 95119, 95125, 95131, 95137, 95144, - 95150, 95157, 95164, 95171, 95178, 95186, 95193, 95201, 95207, 95213, - 95219, 95225, 95231, 95237, 95243, 95249, 95255, 95261, 95267, 95273, - 95279, 95285, 95291, 95297, 95303, 95309, 95315, 95321, 95327, 95333, - 95339, 95345, 95351, 95357, 95363, 95369, 95374, 95379, 95384, 95389, - 95394, 95399, 95404, 95409, 95414, 95419, 95424, 95429, 95434, 95439, - 95444, 95449, 95454, 95459, 95464, 95469, 95474, 95479, 95484, 95489, - 95494, 95499, 95504, 95509, 95514, 95519, 95524, 95529, 95534, 95539, - 95544, 95549, 95554, 95559, 95564, 95569, 95574, 95579, 95584, 95589, - 95594, 95599, 95604, 95609, 95614, 95619, 95624, 95629, 95634, 95639, - 95644, 95649, 95654, 95659, 95664, 95669, 95674, 95679, 95684, 95689, - 95694, 95699, 95704, 95709, 95713, 95717, 95721, 95725, 95729, 95733, - 95737, 95742, 95747, 0, 0, 95752, 95757, 95761, 95765, 95769, 95773, - 95777, 95781, 95786, 95790, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95699, 95705, 95711, 95717, 95724, + 95730, 95737, 95744, 95751, 95758, 95766, 95773, 95781, 95787, 95793, + 95799, 95805, 95811, 95817, 95823, 95829, 95835, 95841, 95847, 95853, + 95859, 95865, 95871, 95877, 95883, 95889, 95895, 95901, 95907, 95913, + 95919, 95925, 95931, 95937, 95943, 95949, 95955, 95961, 95967, 95974, + 95980, 95987, 95994, 96001, 96008, 96016, 96023, 96031, 96037, 96043, + 96049, 96055, 96061, 96067, 96073, 96079, 96085, 96091, 96097, 96103, + 96109, 96115, 96121, 96127, 96133, 96139, 96145, 96151, 96157, 96163, + 96169, 96175, 96181, 96187, 96193, 96199, 96204, 96209, 96214, 96219, + 96224, 96229, 96234, 96239, 96244, 96249, 96254, 96259, 96264, 96269, + 96274, 96279, 96284, 96289, 96294, 96299, 96304, 96309, 96314, 96319, + 96324, 96329, 96334, 96339, 96344, 96349, 96354, 96359, 96364, 96369, + 96374, 96379, 96384, 96389, 96394, 96399, 96404, 96409, 96414, 96419, + 96424, 96429, 96434, 96439, 96444, 96449, 96454, 96459, 96464, 96469, + 96474, 96479, 96484, 96489, 96494, 96499, 96504, 96509, 96514, 96519, + 96524, 96529, 96534, 96539, 96543, 96547, 96551, 96555, 96559, 96563, + 96567, 96572, 96577, 0, 0, 96582, 96587, 96591, 96595, 96599, 96603, + 96607, 96611, 96616, 96620, 0, 0, 0, 0, 0, 0, 96625, 96630, 96636, 96642, + 96648, 96654, 96660, 96666, 96671, 96677, 96682, 96688, 96693, 96698, + 96704, 96710, 96715, 96720, 96725, 96730, 96736, 96741, 96747, 96753, + 96759, 96765, 96771, 96777, 96783, 96789, 96795, 96800, 96806, 96812, + 96818, 96824, 0, 0, 0, 0, 96830, 96835, 96841, 96847, 96853, 96859, + 96865, 96871, 96876, 96882, 96887, 96893, 96898, 96903, 96909, 96915, + 96920, 96925, 96930, 96935, 96941, 96946, 96952, 96958, 96964, 96970, + 96976, 96982, 96988, 96994, 97000, 97005, 97011, 97017, 97023, 97029, 0, + 0, 0, 0, 97035, 97039, 97044, 97049, 97054, 97059, 97064, 97069, 97074, + 97078, 97083, 97088, 97093, 97098, 97102, 97107, 97112, 97117, 97122, + 97127, 97132, 97136, 97141, 97145, 97150, 97155, 97160, 97165, 97170, + 97175, 97180, 97185, 97189, 97194, 97199, 97204, 97209, 97214, 97219, + 97224, 0, 0, 0, 0, 0, 0, 0, 0, 97229, 97236, 97243, 97250, 97257, 97264, + 97271, 97278, 97285, 97292, 97299, 97306, 97313, 97320, 97327, 97334, + 97341, 97348, 97355, 97362, 97369, 97376, 97383, 97390, 97397, 97404, + 97411, 97418, 97425, 97432, 97439, 97446, 97453, 97460, 97467, 97474, + 97481, 97488, 97495, 97502, 97509, 97516, 97523, 97530, 97537, 97544, + 97551, 97558, 97565, 97572, 97579, 97586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 97593, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 95795, 95799, 95804, 95809, 95814, 95819, 95824, 95829, 95834, 95838, - 95843, 95848, 95853, 95858, 95862, 95867, 95872, 95877, 95882, 95887, - 95892, 95897, 95902, 95906, 95911, 95916, 95921, 95926, 95931, 95936, - 95941, 95946, 95950, 95955, 95960, 95965, 95970, 95975, 95980, 95985, 0, - 0, 0, 0, 0, 0, 0, 0, 95990, 95997, 96004, 96011, 96018, 96025, 96032, - 96039, 96046, 96053, 96060, 96067, 96074, 96081, 96088, 96095, 96102, - 96109, 96116, 96123, 96130, 96137, 96144, 96151, 96158, 96165, 96172, - 96179, 96186, 96193, 96200, 96207, 96214, 96221, 96228, 96235, 96242, - 96249, 96256, 96263, 96270, 96277, 96284, 96291, 96298, 96305, 96312, - 96319, 96326, 96333, 96340, 96347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 96354, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97600, 97605, 97610, 97615, 97620, 97625, 97630, 97635, 97640, + 97645, 97650, 97655, 97660, 97665, 97670, 97675, 97680, 97685, 97690, + 97695, 97700, 97705, 97710, 97715, 97720, 97725, 97730, 97735, 97740, + 97745, 97750, 97755, 97760, 97765, 97770, 97775, 97780, 97785, 97790, + 97795, 97800, 97805, 97810, 97815, 97820, 97825, 97830, 97835, 97840, + 97845, 97850, 97855, 97860, 97865, 97870, 97875, 97880, 97885, 97890, + 97895, 97900, 97905, 97910, 97915, 97920, 97925, 97930, 97935, 97940, + 97945, 97950, 97955, 97960, 97965, 97970, 97975, 97980, 97985, 97990, + 97995, 98000, 98005, 98010, 98015, 98020, 98025, 98030, 98035, 98040, + 98045, 98050, 98055, 98060, 98065, 98070, 98075, 98080, 98085, 98090, + 98095, 98100, 98105, 98110, 98115, 98120, 98125, 98130, 98135, 98140, + 98145, 98150, 98155, 98160, 98165, 98170, 98175, 98180, 98185, 98190, + 98195, 98200, 98205, 98210, 98215, 98220, 98225, 98230, 98235, 98240, + 98245, 98250, 98255, 98260, 98265, 98270, 98275, 98280, 98285, 98290, + 98295, 98300, 98305, 98310, 98315, 98320, 98325, 98330, 98335, 98340, + 98345, 98350, 98355, 98360, 98365, 98370, 98375, 98380, 98385, 98390, + 98395, 98400, 98405, 98410, 98415, 98420, 98425, 98430, 98435, 98440, + 98445, 98450, 98455, 98460, 98465, 98470, 98475, 98480, 98485, 98490, + 98495, 98500, 98505, 98510, 98515, 98520, 98525, 98530, 98535, 98540, + 98545, 98550, 98555, 98560, 98565, 98570, 98575, 98580, 98585, 98590, + 98595, 98600, 98605, 98610, 98615, 98620, 98625, 98630, 98635, 98640, + 98645, 98650, 98655, 98660, 98665, 98670, 98675, 98680, 98685, 98690, + 98695, 98700, 98705, 98710, 98715, 98720, 98725, 98730, 98735, 98740, + 98745, 98750, 98755, 98760, 98765, 98770, 98775, 98780, 98785, 98790, + 98795, 98800, 98805, 98810, 98815, 98820, 98825, 98830, 98835, 98840, + 98845, 98850, 98855, 98860, 98865, 98870, 98875, 98880, 98885, 98890, + 98895, 98900, 98905, 98910, 98915, 98920, 98925, 98930, 98935, 98940, + 98945, 98950, 98955, 98960, 98965, 98970, 98975, 98980, 98985, 98990, + 98995, 99000, 99005, 99010, 99015, 99020, 99025, 99030, 99035, 99040, + 99045, 99050, 99055, 99060, 99065, 99070, 99075, 99080, 99085, 99090, + 99095, 99100, 99105, 99110, 99115, 99120, 99125, 99130, 99135, 99140, + 99145, 99150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99155, 99161, 99168, 99175, + 99181, 99188, 99195, 99202, 99209, 99215, 99222, 99229, 99236, 99243, + 99250, 99257, 99264, 99271, 99278, 99285, 99292, 99299, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 99306, 99311, 99316, 99321, 99326, 99331, 99336, 99341, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 96361, 96366, 96371, 96376, 96381, 96386, 96391, 96396, 96401, - 96406, 96411, 96416, 96421, 96426, 96431, 96436, 96441, 96446, 96451, - 96456, 96461, 96466, 96471, 96476, 96481, 96486, 96491, 96496, 96501, - 96506, 96511, 96516, 96521, 96526, 96531, 96536, 96541, 96546, 96551, - 96556, 96561, 96566, 96571, 96576, 96581, 96586, 96591, 96596, 96601, - 96606, 96611, 96616, 96621, 96626, 96631, 96636, 96641, 96646, 96651, - 96656, 96661, 96666, 96671, 96676, 96681, 96686, 96691, 96696, 96701, - 96706, 96711, 96716, 96721, 96726, 96731, 96736, 96741, 96746, 96751, - 96756, 96761, 96766, 96771, 96776, 96781, 96786, 96791, 96796, 96801, - 96806, 96811, 96816, 96821, 96826, 96831, 96836, 96841, 96846, 96851, - 96856, 96861, 96866, 96871, 96876, 96881, 96886, 96891, 96896, 96901, - 96906, 96911, 96916, 96921, 96926, 96931, 96936, 96941, 96946, 96951, - 96956, 96961, 96966, 96971, 96976, 96981, 96986, 96991, 96996, 97001, - 97006, 97011, 97016, 97021, 97026, 97031, 97036, 97041, 97046, 97051, - 97056, 97061, 97066, 97071, 97076, 97081, 97086, 97091, 97096, 97101, - 97106, 97111, 97116, 97121, 97126, 97131, 97136, 97141, 97146, 97151, - 97156, 97161, 97166, 97171, 97176, 97181, 97186, 97191, 97196, 97201, - 97206, 97211, 97216, 97221, 97226, 97231, 97236, 97241, 97246, 97251, - 97256, 97261, 97266, 97271, 97276, 97281, 97286, 97291, 97296, 97301, - 97306, 97311, 97316, 97321, 97326, 97331, 97336, 97341, 97346, 97351, - 97356, 97361, 97366, 97371, 97376, 97381, 97386, 97391, 97396, 97401, - 97406, 97411, 97416, 97421, 97426, 97431, 97436, 97441, 97446, 97451, - 97456, 97461, 97466, 97471, 97476, 97481, 97486, 97491, 97496, 97501, - 97506, 97511, 97516, 97521, 97526, 97531, 97536, 97541, 97546, 97551, - 97556, 97561, 97566, 97571, 97576, 97581, 97586, 97591, 97596, 97601, - 97606, 97611, 97616, 97621, 97626, 97631, 97636, 97641, 97646, 97651, - 97656, 97661, 97666, 97671, 97676, 97681, 97686, 97691, 97696, 97701, - 97706, 97711, 97716, 97721, 97726, 97731, 97736, 97741, 97746, 97751, - 97756, 97761, 97766, 97771, 97776, 97781, 97786, 97791, 97796, 97801, - 97806, 97811, 97816, 97821, 97826, 97831, 97836, 97841, 97846, 97851, - 97856, 97861, 97866, 97871, 97876, 97881, 97886, 97891, 97896, 97901, - 97906, 97911, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97916, 97922, 97929, 97936, - 97942, 97949, 97956, 97963, 97970, 97976, 97983, 97990, 97997, 98004, - 98011, 98018, 98025, 98032, 98039, 98046, 98053, 98060, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 98067, 98072, 98077, 98082, 98087, 98092, 98097, 98102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 99346, 99350, 99354, 99358, 99362, 99366, 0, 0, 99371, + 0, 99376, 99380, 99385, 99390, 99395, 99400, 99404, 99409, 99414, 99419, + 99424, 99428, 99433, 99438, 99443, 99448, 99452, 99457, 99462, 99467, + 99472, 99476, 99481, 99486, 99491, 99496, 99501, 99506, 99511, 99516, + 99521, 99526, 99531, 99536, 99541, 99546, 99551, 99556, 99561, 99565, + 99570, 99575, 99580, 99585, 0, 99590, 99595, 0, 0, 0, 99600, 0, 0, 99605, + 99610, 99617, 99624, 99631, 99638, 99645, 99652, 99659, 99666, 99673, + 99680, 99687, 99694, 99701, 99708, 99715, 99722, 99729, 99736, 99743, + 99750, 99757, 0, 99764, 99771, 99777, 99783, 99789, 99796, 99803, 99811, + 99819, 99828, 99833, 99838, 99843, 99848, 99853, 99858, 99863, 99868, + 99873, 99878, 99883, 99888, 99893, 99899, 99904, 99909, 99914, 99919, + 99924, 99929, 99934, 99939, 99944, 99950, 99956, 99960, 99964, 99968, + 99972, 99976, 99981, 99986, 99992, 99997, 100003, 100008, 100013, 100018, + 100024, 100029, 100034, 100039, 100044, 100049, 100055, 100060, 100066, + 100071, 100077, 100082, 100088, 100093, 100099, 100104, 100109, 100114, + 100119, 100124, 100129, 100134, 100140, 100145, 0, 0, 0, 0, 0, 0, 0, 0, + 100150, 100154, 100158, 100162, 100166, 100172, 100176, 100181, 100186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 98107, 98111, 98115, 98119, 98123, 98127, 0, 0, 98132, - 0, 98137, 98141, 98146, 98151, 98156, 98161, 98166, 98171, 98176, 98181, - 98186, 98190, 98195, 98200, 98205, 98210, 98215, 98220, 98225, 98230, - 98235, 98239, 98244, 98249, 98254, 98259, 98264, 98269, 98274, 98279, - 98284, 98289, 98294, 98299, 98304, 98309, 98314, 98319, 98324, 98328, - 98333, 98338, 98343, 98348, 0, 98353, 98358, 0, 0, 0, 98363, 0, 0, 98368, - 98373, 98380, 98387, 98394, 98401, 98408, 98415, 98422, 98429, 98436, - 98443, 98450, 98457, 98464, 98471, 98478, 98485, 98492, 98499, 98506, - 98513, 98520, 0, 98527, 98534, 98540, 98546, 98552, 98559, 98566, 98574, - 98582, 98591, 98596, 98601, 98606, 98611, 98616, 98621, 98626, 98631, - 98636, 98641, 98646, 98651, 98656, 98662, 98667, 98672, 98677, 98682, - 98687, 98692, 98697, 98702, 98707, 98713, 98719, 98723, 98727, 98731, - 98735, 98739, 98744, 98749, 98755, 98760, 98766, 98771, 98776, 98781, - 98787, 98792, 98797, 98802, 98807, 98812, 98818, 98823, 98829, 98834, - 98840, 98845, 98851, 98856, 98862, 98867, 98872, 98877, 98882, 98887, - 98892, 98897, 98903, 98908, 0, 0, 0, 0, 0, 0, 0, 0, 98913, 98917, 98921, - 98925, 98929, 98935, 98939, 98944, 98949, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 100192, 100197, 100202, 100207, 100212, 100217, 100222, 100227, 100232, + 100237, 100242, 100247, 100252, 100257, 100262, 100267, 100272, 100277, + 100282, 0, 100287, 100292, 0, 0, 0, 0, 0, 100297, 100301, 100305, 100310, + 100315, 100321, 100326, 100331, 100336, 100341, 100346, 100351, 100356, + 100361, 100366, 100371, 100376, 100381, 100386, 100391, 100396, 100401, + 100406, 100411, 100416, 100421, 100426, 100431, 100435, 100440, 100445, + 100451, 100455, 0, 0, 0, 100459, 100465, 100469, 100474, 100479, 100484, + 100488, 100493, 100497, 100502, 100507, 100511, 100516, 100521, 100525, + 100529, 100534, 100539, 100543, 100548, 100553, 100558, 100563, 100568, + 100573, 100578, 100583, 0, 0, 0, 0, 0, 100588, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98955, 98960, 98965, 98970, - 98975, 98980, 98985, 98990, 98995, 99000, 99005, 99010, 99015, 99020, - 99025, 99030, 99035, 99040, 99045, 0, 99050, 99055, 0, 0, 0, 0, 0, 99060, - 99064, 99068, 99073, 99078, 99084, 99089, 99094, 99099, 99104, 99109, - 99114, 99119, 99124, 99129, 99134, 99139, 99144, 99149, 99154, 99159, - 99164, 99169, 99174, 99179, 99184, 99189, 99194, 99198, 99203, 99208, - 99214, 99218, 0, 0, 0, 99222, 99228, 99232, 99237, 99242, 99247, 99251, - 99256, 99260, 99265, 99270, 99274, 99279, 99284, 99288, 99292, 99297, - 99302, 99306, 99311, 99316, 99320, 99325, 99330, 99335, 99340, 99345, 0, - 0, 0, 0, 0, 99350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99355, - 99360, 99365, 99370, 99375, 99380, 99386, 99392, 99398, 99403, 99408, - 99414, 99420, 99426, 99432, 99438, 99444, 99450, 99456, 99462, 99468, - 99474, 99480, 99485, 99491, 99497, 99503, 99509, 99515, 99520, 99526, - 99532, 99538, 99542, 99546, 99550, 99554, 99558, 99563, 99568, 99572, - 99576, 99581, 99586, 99591, 99596, 99601, 99606, 99611, 99618, 99623, - 99627, 99632, 99637, 99642, 99646, 0, 0, 0, 0, 99651, 99659, 99666, - 99672, 99678, 99682, 99686, 99690, 99694, 99698, 99702, 99707, 99711, - 99716, 99721, 99726, 99731, 99736, 99741, 99746, 0, 0, 99751, 99757, - 99763, 99769, 99776, 99783, 99790, 99797, 99804, 99811, 99817, 99823, - 99829, 99836, 99843, 99850, 99857, 99864, 99871, 99878, 99885, 99892, - 99899, 99906, 99913, 99920, 99927, 99934, 99942, 99950, 99958, 99967, - 99976, 99985, 99994, 100003, 100012, 100019, 100026, 100033, 100041, - 100049, 100057, 100065, 100073, 100081, 100089, 100093, 100098, 100103, - 0, 100109, 100114, 0, 0, 0, 0, 0, 100119, 100125, 100132, 100137, 100142, - 100146, 100151, 100156, 0, 100161, 100166, 100171, 0, 100176, 100181, - 100186, 100191, 100196, 100201, 100206, 100211, 100216, 100221, 100226, - 100231, 100235, 100240, 100245, 100250, 100254, 100258, 100263, 100268, - 100273, 100278, 100283, 100288, 100293, 100297, 100302, 0, 0, 0, 0, - 100307, 100313, 100318, 0, 0, 0, 0, 100323, 100327, 100331, 100335, - 100339, 100343, 100348, 100353, 100359, 0, 0, 0, 0, 0, 0, 0, 0, 100365, - 100371, 100378, 100384, 100391, 100397, 100403, 100409, 100416, 0, 0, 0, - 0, 0, 0, 0, 100422, 100430, 100438, 100446, 100454, 100462, 100470, - 100478, 100486, 100494, 100502, 100510, 100518, 100526, 100534, 100542, - 100550, 100558, 100566, 100574, 100582, 100590, 100598, 100606, 100614, - 100622, 100630, 100638, 100646, 100654, 100661, 100669, 100677, 100684, - 100691, 100698, 100705, 100712, 100719, 100726, 100733, 100740, 100747, - 100754, 100761, 100768, 100775, 100782, 100789, 100796, 100803, 100810, - 100817, 100824, 100831, 100838, 100845, 100852, 100859, 100866, 100873, - 100880, 100886, 100893, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100900, 100905, 100910, - 100915, 100920, 100925, 100930, 100935, 100940, 100945, 100950, 100955, - 100960, 100965, 100970, 100975, 100980, 100985, 100990, 100995, 101000, - 101005, 101010, 101015, 101020, 101025, 101030, 101035, 101040, 101045, - 101050, 101055, 101060, 101065, 101070, 101075, 101080, 101085, 101091, - 0, 0, 0, 0, 101097, 101101, 101105, 101110, 101115, 101121, 101127, - 101133, 101143, 101152, 101158, 101165, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101173, 101177, 101182, 101187, 101192, 101197, 101202, 101207, 101212, - 101216, 101221, 101225, 101230, 101234, 101239, 101243, 101248, 101253, - 101258, 101263, 101268, 101273, 101278, 101283, 101288, 101293, 101298, - 101303, 101308, 101313, 101318, 101323, 101328, 101333, 101338, 101343, - 101348, 101353, 101358, 101363, 101368, 101373, 101378, 101383, 101388, - 101393, 101398, 101403, 101408, 101413, 101418, 101423, 101428, 101433, - 0, 0, 0, 101438, 101443, 101452, 101460, 101469, 101478, 101489, 101500, - 101507, 101514, 101521, 101528, 101535, 101542, 101549, 101556, 101563, - 101570, 101577, 101584, 101591, 101598, 101605, 101612, 101619, 101626, - 101633, 101640, 101647, 0, 0, 101654, 101660, 101666, 101672, 101678, - 101685, 101692, 101700, 101708, 101715, 101722, 101729, 101736, 101743, - 101750, 101757, 101764, 101771, 101778, 101785, 101792, 101799, 101806, - 101813, 101820, 101827, 101834, 0, 0, 0, 0, 0, 101841, 101847, 101853, - 101859, 101865, 101872, 101879, 101887, 101895, 101902, 101909, 101916, - 101923, 101930, 101937, 101944, 101951, 101958, 101965, 101972, 101979, - 101986, 101993, 102000, 102007, 102014, 0, 0, 0, 0, 0, 0, 0, 102021, - 102028, 102037, 102047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102057, - 102063, 102069, 102075, 102081, 102088, 102095, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 100593, 100598, 100603, 100608, 100613, 100618, + 100624, 100630, 100636, 100641, 100646, 100651, 100657, 100663, 100669, + 100675, 100681, 100686, 100692, 100698, 100704, 100710, 100716, 100721, + 100727, 100733, 100739, 100745, 100751, 100756, 100762, 100768, 100774, + 100779, 100784, 100789, 100794, 100799, 100805, 100811, 100816, 100821, + 100826, 100832, 100838, 100843, 100849, 100855, 100861, 100869, 100875, + 100880, 100886, 100892, 100898, 100903, 0, 0, 0, 0, 100909, 100918, + 100926, 100933, 100940, 100945, 100950, 100955, 100960, 100965, 100970, + 100976, 100981, 100987, 100993, 100999, 101005, 101011, 101017, 101023, + 0, 0, 101029, 101036, 101043, 101050, 101058, 101066, 101074, 101082, + 101090, 101098, 101105, 101112, 101119, 101127, 101135, 101143, 101151, + 101159, 101167, 101175, 101183, 101191, 101199, 101207, 101215, 101223, + 101231, 101239, 101248, 101257, 101266, 101276, 101286, 101296, 101306, + 101316, 101326, 101334, 101342, 101350, 101359, 101368, 101377, 101386, + 101395, 101404, 101413, 101417, 101422, 101427, 0, 101433, 101438, 0, 0, + 0, 0, 0, 101443, 101449, 101456, 101461, 101466, 101470, 101475, 101480, + 0, 101485, 101490, 101495, 0, 101500, 101505, 101510, 101515, 101520, + 101525, 101530, 101535, 101540, 101545, 101550, 101554, 101558, 101563, + 101568, 101573, 101577, 101581, 101586, 101590, 101595, 101600, 101605, + 101610, 101615, 101619, 101624, 0, 0, 0, 0, 101629, 101635, 101640, 0, 0, + 0, 0, 101645, 101649, 101653, 101657, 101661, 101665, 101670, 101675, + 101681, 0, 0, 0, 0, 0, 0, 0, 0, 101687, 101693, 101700, 101706, 101713, + 101719, 101725, 101731, 101738, 0, 0, 0, 0, 0, 0, 0, 101744, 101752, + 101760, 101768, 101776, 101784, 101792, 101800, 101808, 101816, 101824, + 101832, 101840, 101848, 101856, 101864, 101872, 101880, 101888, 101896, + 101904, 101912, 101920, 101928, 101936, 101944, 101952, 101960, 101968, + 101976, 101983, 101991, 101999, 102006, 102013, 102020, 102027, 102034, + 102041, 102048, 102055, 102062, 102069, 102076, 102083, 102090, 102097, + 102104, 102111, 102118, 102125, 102132, 102139, 102146, 102153, 102160, + 102167, 102174, 102181, 102188, 102195, 102202, 102208, 102215, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 102222, 102227, 102232, 102237, 102242, 102247, 102252, + 102257, 102262, 102267, 102272, 102277, 102282, 102287, 102292, 102297, + 102302, 102307, 102312, 102317, 102322, 102327, 102332, 102337, 102342, + 102347, 102352, 102357, 102362, 102367, 102372, 102377, 102382, 102387, + 102392, 102397, 102402, 102407, 102413, 0, 0, 0, 0, 102419, 102423, + 102427, 102432, 102437, 102443, 102449, 102455, 102465, 102474, 102480, + 102487, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102495, 102499, 102504, 102509, + 102514, 102519, 102524, 102529, 102534, 102538, 102543, 102547, 102552, + 102556, 102561, 102565, 102570, 102575, 102580, 102585, 102590, 102595, + 102600, 102605, 102610, 102615, 102620, 102625, 102630, 102635, 102640, + 102645, 102650, 102655, 102660, 102665, 102670, 102675, 102680, 102685, + 102690, 102695, 102700, 102705, 102710, 102715, 102720, 102725, 102730, + 102735, 102740, 102745, 102750, 102755, 0, 0, 0, 102760, 102765, 102774, + 102782, 102791, 102800, 102811, 102822, 102829, 102836, 102843, 102850, + 102857, 102864, 102871, 102878, 102885, 102892, 102899, 102906, 102913, + 102920, 102927, 102934, 102941, 102948, 102955, 102962, 102969, 0, 0, + 102976, 102982, 102988, 102994, 103000, 103007, 103014, 103022, 103030, + 103037, 103044, 103051, 103058, 103065, 103072, 103079, 103086, 103093, + 103100, 103107, 103114, 103121, 103128, 103135, 103142, 103149, 103156, + 0, 0, 0, 0, 0, 103163, 103169, 103175, 103181, 103187, 103194, 103201, + 103209, 103217, 103224, 103231, 103238, 103245, 103252, 103259, 103266, + 103273, 103280, 103287, 103294, 103301, 103308, 103315, 103322, 103329, + 103336, 0, 0, 0, 0, 0, 0, 0, 103343, 103350, 103359, 103369, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 103379, 103385, 103391, 103397, 103403, 103410, + 103417, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 102103, 102110, 102117, 102125, 102132, 102139, 102146, 102153, 102161, - 102169, 102177, 102185, 102193, 102201, 102209, 102217, 102225, 102233, - 102241, 102249, 102257, 102265, 102273, 102281, 102289, 102297, 102305, - 102313, 102321, 102329, 102337, 102345, 102353, 102361, 102369, 102377, - 102385, 102393, 102401, 102409, 102417, 102425, 102433, 102441, 102449, - 102457, 102465, 102473, 102481, 102489, 102497, 102505, 102513, 102521, - 102529, 102537, 102545, 102553, 102561, 102569, 102577, 102585, 102593, - 102601, 102609, 102617, 102625, 102633, 102641, 102649, 102657, 102665, - 102673, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103425, 103432, 103439, 103447, 103454, + 103461, 103468, 103475, 103483, 103491, 103499, 103507, 103515, 103523, + 103531, 103539, 103547, 103555, 103563, 103571, 103579, 103587, 103595, + 103603, 103611, 103619, 103627, 103635, 103643, 103651, 103659, 103667, + 103675, 103683, 103691, 103699, 103707, 103715, 103723, 103731, 103739, + 103747, 103755, 103763, 103771, 103779, 103787, 103795, 103803, 103811, + 103819, 103827, 103835, 103843, 103851, 103859, 103867, 103875, 103883, + 103891, 103899, 103907, 103915, 103923, 103931, 103939, 103947, 103955, + 103963, 103971, 103979, 103987, 103995, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 102681, 102686, 102692, 102698, 102704, - 102710, 102716, 102722, 102728, 102734, 102739, 102746, 102752, 102758, - 102764, 102770, 102776, 102781, 102787, 102793, 102799, 102805, 102811, - 102817, 102823, 102829, 102835, 102841, 102846, 102852, 102860, 102868, - 102874, 102880, 102886, 102892, 102900, 102906, 102912, 102918, 102924, - 102930, 102936, 102941, 102947, 102955, 102963, 102969, 102975, 102981, - 102988, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102994, 102999, 103005, - 103011, 103017, 103023, 103029, 103035, 103041, 103047, 103052, 103059, - 103065, 103071, 103077, 103083, 103089, 103094, 103100, 103106, 103112, - 103118, 103124, 103130, 103136, 103142, 103148, 103154, 103159, 103165, - 103173, 103181, 103187, 103193, 103199, 103205, 103213, 103219, 103225, - 103231, 103237, 103243, 103249, 103254, 103260, 103268, 103276, 103282, - 103288, 103294, 103301, 0, 0, 0, 0, 0, 0, 0, 103307, 103311, 103315, - 103320, 103325, 103331, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104003, + 104008, 104014, 104020, 104026, 104032, 104038, 104044, 104050, 104056, + 104061, 104068, 104074, 104080, 104086, 104092, 104098, 104103, 104109, + 104115, 104121, 104127, 104133, 104139, 104145, 104151, 104157, 104163, + 104168, 104174, 104182, 104190, 104196, 104202, 104208, 104214, 104222, + 104228, 104234, 104240, 104246, 104252, 104258, 104263, 104269, 104277, + 104285, 104291, 104297, 104303, 104310, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 104316, 104321, 104327, 104333, 104339, 104345, 104351, 104357, + 104363, 104369, 104374, 104381, 104387, 104393, 104399, 104405, 104411, + 104416, 104422, 104428, 104434, 104440, 104446, 104452, 104458, 104464, + 104470, 104476, 104481, 104487, 104495, 104503, 104509, 104515, 104521, + 104527, 104535, 104541, 104547, 104553, 104559, 104565, 104571, 104576, + 104582, 104590, 104598, 104604, 104610, 104616, 104623, 0, 0, 0, 0, 0, 0, + 0, 104629, 104633, 104637, 104642, 104647, 104653, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 103337, 103341, 103345, 103349, 103353, 103357, - 103361, 103366, 103370, 103375, 103380, 103385, 103390, 103395, 103400, - 103405, 103410, 103415, 103420, 103426, 103432, 103438, 103445, 103452, - 103459, 103466, 103473, 103480, 103487, 103494, 103501, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104659, 104663, + 104667, 104671, 104675, 104679, 104683, 104688, 104692, 104697, 104702, + 104707, 104712, 104717, 104722, 104727, 104732, 104737, 104742, 104748, + 104754, 104760, 104767, 104774, 104781, 104788, 104795, 104802, 104809, + 104816, 104823, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104830, 104834, 104838, 104842, + 104846, 104850, 104853, 104857, 104860, 104864, 104867, 104871, 104875, + 104880, 104884, 104889, 104892, 104896, 104899, 104903, 104906, 104910, + 104914, 104918, 104922, 104926, 104930, 104934, 104938, 104942, 104946, + 104950, 104954, 104958, 104962, 104966, 104970, 104974, 104978, 104981, + 104984, 104988, 104992, 104996, 104999, 105002, 105006, 105009, 105013, + 105017, 105021, 105025, 105028, 105032, 105038, 105044, 105050, 105055, + 105062, 105066, 105071, 105075, 105080, 105085, 105091, 105096, 105102, + 105106, 105111, 105115, 105120, 105123, 105126, 105130, 105135, 105141, + 105146, 105152, 0, 0, 0, 0, 105157, 105160, 105163, 105166, 105169, + 105172, 105175, 105179, 105182, 105186, 105190, 105194, 105198, 105202, + 105206, 105210, 105214, 105218, 105222, 105227, 105232, 105236, 105239, + 105242, 105245, 105248, 105251, 105254, 105258, 105261, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 105265, 105269, 105274, 105279, 105284, + 105288, 105293, 105297, 105302, 105306, 105311, 105315, 105320, 105324, + 105329, 105333, 105338, 105343, 105348, 105353, 105358, 105363, 105368, + 105373, 105378, 105383, 105388, 105393, 105398, 105403, 105408, 105413, + 105418, 105423, 105428, 105433, 105437, 105441, 105446, 105451, 105456, + 105460, 105464, 105469, 105473, 105478, 105483, 105488, 105493, 105497, + 105503, 105508, 105514, 105519, 105525, 105530, 105536, 105541, 105547, + 105552, 105557, 105562, 105567, 105571, 105576, 105582, 105586, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 105591, 105598, 105605, 105612, 105619, + 105626, 105633, 105640, 105647, 105654, 105661, 105668, 105675, 105682, + 105689, 105696, 105703, 105710, 105717, 105724, 105731, 105738, 105745, + 105752, 105759, 0, 0, 0, 0, 0, 0, 0, 105766, 105773, 105779, 105785, + 105791, 105797, 105803, 105809, 105816, 105822, 0, 0, 0, 0, 0, 0, 105829, + 105834, 105839, 105844, 105849, 105853, 105857, 105861, 105866, 105871, + 105876, 105881, 105886, 105891, 105896, 105901, 105906, 105911, 105916, + 105921, 105926, 105931, 105936, 105941, 105946, 105951, 105956, 105961, + 105966, 105971, 105976, 105981, 105986, 105991, 105996, 106001, 106006, + 106011, 106016, 106021, 106026, 106031, 106037, 106042, 106048, 106053, + 106059, 106064, 106070, 106076, 106080, 106085, 106089, 0, 106093, + 106098, 106102, 106106, 106110, 106114, 106118, 106122, 106127, 106131, + 106136, 106141, 106145, 106150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 106155, 106159, 106163, 106167, 106171, 106175, 106179, 106184, 106189, + 106194, 106199, 106204, 106209, 106214, 106219, 106224, 106229, 106234, + 106239, 106244, 106249, 106254, 106259, 106264, 106268, 106272, 106277, + 106282, 106287, 106291, 106296, 106300, 106305, 106310, 106314, 106319, + 106324, 106329, 106334, 0, 0, 0, 0, 0, 0, 0, 0, 0, 106339, 106343, + 106347, 106351, 106354, 106358, 106361, 106365, 106368, 106372, 106376, + 106381, 106385, 106390, 106393, 106397, 106400, 106404, 106407, 106411, + 106415, 106419, 106423, 106427, 106431, 106435, 106439, 106443, 106447, + 106451, 106455, 106459, 106463, 106467, 106471, 106475, 106479, 106482, + 106485, 106489, 106493, 106497, 106500, 106503, 106507, 106510, 106514, + 106518, 106522, 106526, 106530, 106533, 106538, 106542, 106547, 106551, + 106556, 106561, 106567, 106572, 106578, 106582, 106587, 106591, 106596, + 106600, 106604, 106608, 106612, 106615, 106618, 106622, 106626, 106629, + 106633, 106637, 106641, 106648, 0, 0, 106652, 106656, 106659, 106662, + 106665, 106668, 106671, 106674, 106678, 106681, 106685, 106688, 106692, + 106695, 106699, 106704, 0, 106709, 106714, 106719, 106724, 106729, + 106734, 106739, 106745, 106750, 106756, 106762, 106768, 106774, 106780, + 106786, 106792, 106798, 106804, 106810, 106817, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 106824, 106828, 106833, 106837, 106841, 106845, 106850, 106854, + 106859, 106863, 106868, 106873, 106878, 106883, 106888, 106893, 106898, + 106903, 0, 106908, 106913, 106918, 106923, 106928, 106933, 106938, + 106943, 106948, 106953, 106958, 106963, 106967, 106971, 106976, 106981, + 106986, 106991, 106995, 106999, 107004, 107008, 107013, 107018, 107022, + 107027, 107033, 107038, 107044, 107049, 107054, 107060, 107065, 107071, + 107076, 107081, 107086, 107091, 107095, 107100, 107106, 107111, 107117, + 107122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 103508, 103512, 103516, 103520, 103524, 103528, 103531, 103535, - 103538, 103542, 103545, 103549, 103553, 103558, 103562, 103567, 103570, - 103574, 103577, 103581, 103584, 103588, 103592, 103596, 103600, 103604, - 103608, 103612, 103616, 103620, 103624, 103628, 103632, 103636, 103640, - 103644, 103648, 103652, 103656, 103660, 103663, 103667, 103671, 103675, - 103678, 103681, 103685, 103689, 103693, 103697, 103701, 103705, 103708, - 103712, 103718, 103724, 103730, 103735, 103742, 103746, 103751, 103755, - 103760, 103765, 103771, 103776, 103782, 103786, 103791, 103795, 103800, - 103803, 103806, 103810, 103815, 103821, 103826, 103832, 0, 0, 0, 0, - 103837, 103840, 103843, 103846, 103849, 103852, 103855, 103859, 103862, - 103866, 103870, 103874, 103878, 103882, 103886, 103890, 103894, 103898, - 103902, 103907, 103912, 103916, 103919, 103922, 103925, 103928, 103931, - 103934, 103938, 103941, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 103945, 103949, 103954, 103959, 103964, 103968, 103973, 103977, 103982, - 103986, 103991, 103995, 104000, 104004, 104009, 104013, 104018, 104023, - 104028, 104033, 104038, 104043, 104048, 104053, 104058, 104063, 104068, - 104073, 104078, 104083, 104088, 104093, 104098, 104103, 104108, 104113, - 104118, 104122, 104127, 104132, 104137, 104141, 104145, 104150, 104155, - 104160, 104165, 104170, 104175, 104179, 104185, 104190, 104196, 104201, - 104207, 104212, 104218, 104223, 104229, 104234, 104239, 104244, 104249, - 104253, 104258, 104264, 104268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 104273, 104280, 104287, 104294, 104301, 104308, 104315, 104322, 104329, - 104336, 104343, 104350, 104357, 104364, 104371, 104378, 104385, 104392, - 104399, 104406, 104413, 104420, 104427, 104434, 104441, 0, 0, 0, 0, 0, 0, - 0, 104448, 104455, 104461, 104467, 104473, 104479, 104485, 104491, - 104498, 104504, 0, 0, 0, 0, 0, 0, 104511, 104516, 104521, 104526, 104531, - 104535, 104539, 104543, 104548, 104553, 104558, 104563, 104568, 104573, - 104578, 104583, 104588, 104593, 104598, 104603, 104608, 104613, 104618, - 104623, 104628, 104633, 104638, 104643, 104648, 104653, 104658, 104663, - 104668, 104673, 104678, 104683, 104688, 104693, 104698, 104703, 104708, - 104713, 104719, 104724, 104730, 104735, 104741, 104746, 104752, 104758, - 104762, 104767, 104771, 0, 104775, 104780, 104784, 104788, 104792, - 104796, 104800, 104804, 104809, 104813, 104818, 104823, 104827, 104832, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104837, 104841, 104845, 104849, - 104853, 104857, 104861, 104866, 104871, 104876, 104881, 104886, 104891, - 104896, 104901, 104906, 104911, 104916, 104921, 104926, 104931, 104936, - 104941, 104946, 104951, 104955, 104960, 104965, 104970, 104974, 104979, - 104984, 104989, 104994, 104998, 105003, 105008, 105013, 105018, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 105023, 105027, 105031, 105035, 105038, 105042, 105045, - 105049, 105052, 105056, 105060, 105065, 105069, 105074, 105077, 105081, - 105084, 105088, 105091, 105095, 105099, 105103, 105107, 105111, 105115, - 105119, 105123, 105127, 105131, 105135, 105139, 105143, 105147, 105151, - 105155, 105159, 105163, 105167, 105170, 105174, 105178, 105182, 105185, - 105188, 105192, 105196, 105200, 105204, 105208, 105212, 105216, 105219, - 105224, 105228, 105233, 105237, 105242, 105247, 105253, 105258, 105264, - 105268, 105273, 105277, 105282, 105286, 105290, 105294, 105298, 105301, - 105304, 105308, 105312, 105315, 105319, 105323, 105327, 105334, 0, 0, - 105338, 105342, 105345, 105348, 105351, 105354, 105357, 105360, 105364, - 105367, 105371, 105374, 105378, 105381, 105385, 105390, 0, 105395, - 105400, 105405, 105410, 105415, 105420, 105425, 105431, 105436, 105442, - 105448, 105454, 105460, 105466, 105472, 105478, 105484, 105490, 105496, - 105503, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 105510, 105514, 105519, 105523, - 105527, 105531, 105536, 105540, 105545, 105549, 105554, 105559, 105564, - 105569, 105574, 105579, 105584, 105589, 0, 105594, 105599, 105604, - 105609, 105614, 105619, 105624, 105629, 105634, 105639, 105644, 105649, - 105654, 105658, 105663, 105668, 105673, 105678, 105682, 105686, 105691, - 105696, 105701, 105706, 105710, 105715, 105721, 105726, 105732, 105737, - 105742, 105748, 105753, 105759, 105764, 105769, 105774, 105779, 105783, - 105788, 105794, 105799, 105805, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107127, 107131, + 107135, 107139, 107143, 107147, 107152, 0, 107157, 0, 107162, 107167, + 107172, 107177, 0, 107182, 107187, 107192, 107197, 107202, 107207, + 107212, 107217, 107222, 107227, 107232, 107237, 107241, 107245, 107250, + 0, 107255, 107260, 107264, 107268, 107273, 107277, 107282, 107287, + 107291, 107296, 107301, 0, 0, 0, 0, 0, 0, 107306, 107310, 107315, 107319, + 107324, 107328, 107333, 107337, 107342, 107346, 107351, 107355, 107360, + 107365, 107370, 107375, 107380, 107385, 107390, 107395, 107400, 107405, + 107410, 107415, 107420, 107425, 107430, 107435, 107440, 107445, 107450, + 107455, 107460, 107465, 107469, 107473, 107478, 107483, 107488, 107493, + 107497, 107501, 107506, 107510, 107515, 107520, 107525, 107529, 107534, + 107540, 107545, 107551, 107556, 107562, 107567, 107573, 107578, 107584, + 107589, 0, 0, 0, 0, 0, 107594, 107599, 107603, 107607, 107611, 107615, + 107619, 107623, 107628, 107632, 0, 0, 0, 0, 0, 0, 107637, 107644, 107649, + 107654, 0, 107659, 107663, 107668, 107672, 107677, 107681, 107686, + 107691, 0, 0, 107696, 107701, 0, 0, 107706, 107711, 107716, 107720, + 107725, 107730, 107735, 107740, 107745, 107750, 107755, 107760, 107765, + 107770, 107775, 107780, 107785, 107790, 107795, 107800, 107805, 107810, + 0, 107814, 107818, 107823, 107828, 107833, 107837, 107841, 0, 107846, + 107850, 0, 107855, 107860, 107865, 107870, 107875, 0, 0, 107879, 107884, + 107889, 107895, 107900, 107906, 107911, 107917, 107923, 0, 0, 107930, + 107936, 0, 0, 107942, 107948, 107954, 0, 0, 107959, 0, 0, 0, 0, 0, 0, + 107963, 0, 0, 0, 0, 0, 107970, 107975, 107982, 107990, 107996, 108002, + 108008, 0, 0, 108015, 108021, 108026, 108031, 108036, 108041, 108046, 0, + 0, 0, 108051, 108056, 108061, 108066, 108072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 105810, 105814, 105818, 105822, 105826, 105830, 105835, 0, - 105840, 0, 105845, 105850, 105855, 105860, 0, 105865, 105870, 105875, - 105880, 105885, 105890, 105895, 105900, 105905, 105910, 105915, 105920, - 105925, 105929, 105934, 0, 105939, 105944, 105948, 105952, 105957, - 105962, 105967, 105972, 105976, 105981, 105986, 0, 0, 0, 0, 0, 0, 105991, - 105995, 106000, 106004, 106009, 106013, 106018, 106022, 106027, 106031, - 106036, 106040, 106045, 106050, 106055, 106060, 106065, 106070, 106075, - 106080, 106085, 106090, 106095, 106100, 106105, 106110, 106115, 106120, - 106125, 106130, 106135, 106140, 106145, 106150, 106155, 106159, 106164, - 106169, 106174, 106179, 106183, 106187, 106192, 106197, 106202, 106207, - 106212, 106216, 106221, 106227, 106232, 106238, 106243, 106249, 106254, - 106260, 106265, 106271, 106276, 0, 0, 0, 0, 0, 106281, 106286, 106290, - 106294, 106298, 106302, 106306, 106310, 106315, 106319, 0, 0, 0, 0, 0, 0, - 106324, 106331, 106336, 106341, 0, 106346, 106350, 106355, 106359, - 106364, 106368, 106373, 106378, 0, 0, 106383, 106388, 0, 0, 106393, - 106398, 106403, 106407, 106412, 106417, 106422, 106427, 106432, 106437, - 106442, 106447, 106452, 106457, 106462, 106467, 106472, 106477, 106482, - 106487, 106492, 106497, 0, 106502, 106506, 106511, 106516, 106521, - 106525, 106529, 0, 106534, 106539, 0, 106544, 106549, 106554, 106559, - 106564, 0, 0, 106568, 106573, 106578, 106584, 106589, 106595, 106600, - 106606, 106612, 0, 0, 106619, 106625, 0, 0, 106631, 106637, 106643, 0, 0, - 106648, 0, 0, 0, 0, 0, 0, 106652, 0, 0, 0, 0, 0, 106659, 106664, 106671, - 106679, 106685, 106691, 106697, 0, 0, 106704, 106710, 106715, 106720, - 106725, 106730, 106735, 0, 0, 0, 106740, 106745, 106750, 106756, 106762, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108077, 108080, 108084, 108087, 108091, + 108094, 108098, 108102, 108107, 108111, 108116, 108119, 108123, 108126, + 108130, 108133, 108137, 108141, 108145, 108149, 108153, 108157, 108161, + 108165, 108169, 108173, 108177, 108181, 108185, 108189, 108193, 108197, + 108201, 108205, 108209, 108213, 108216, 108220, 108223, 108227, 108231, + 108235, 108238, 108242, 108245, 108249, 108253, 108256, 108260, 108264, + 108268, 108272, 108276, 108279, 108284, 108288, 108293, 108297, 108302, + 108307, 108313, 108318, 108324, 108328, 108333, 108337, 108342, 108346, + 108350, 108354, 108358, 108362, 108366, 108371, 108374, 108377, 108380, + 108384, 108387, 108392, 108396, 108400, 108403, 108406, 108409, 108412, + 108415, 108418, 108422, 108425, 0, 108429, 0, 108433, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 108437, 108441, 108445, 108450, 108454, 108459, 108463, + 108468, 108473, 108479, 108484, 108490, 108494, 108499, 108503, 108508, + 108512, 108517, 108522, 108527, 108532, 108537, 108542, 108547, 108552, + 108557, 108562, 108567, 108572, 108577, 108582, 108587, 108592, 108597, + 108602, 108606, 108610, 108615, 108620, 108625, 108629, 108633, 108638, + 108642, 108647, 108652, 108657, 108662, 108666, 108672, 108677, 108683, + 108688, 108694, 108700, 108707, 108713, 108720, 108725, 108732, 108738, + 108743, 108750, 108756, 108761, 108766, 108771, 108776, 108781, 108786, + 108790, 108795, 0, 0, 0, 0, 0, 0, 0, 0, 108799, 108804, 108808, 108812, + 108816, 108820, 108824, 108828, 108833, 108837, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108842, 108845, 108849, 108852, + 108856, 108859, 108863, 108867, 108872, 108876, 108881, 108884, 108888, + 108891, 108895, 108898, 108902, 108906, 108910, 108914, 108918, 108922, + 108926, 108930, 108934, 108938, 108942, 108946, 108950, 108954, 108958, + 108962, 108966, 108970, 108973, 108976, 108980, 108984, 108988, 108991, + 108994, 108998, 109001, 109005, 109009, 109013, 109017, 109020, 109025, + 109029, 109034, 109038, 109043, 109048, 0, 0, 109054, 109058, 109063, + 109067, 109072, 109076, 109080, 109084, 109088, 109092, 109096, 109099, + 109103, 109108, 109112, 109117, 109122, 109127, 109134, 109146, 109158, + 109170, 109183, 109197, 109204, 109214, 109222, 109231, 109240, 109249, + 109259, 109270, 109282, 109289, 109296, 109304, 109309, 109315, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 106767, 106771, 106775, 106780, 106784, 106789, 106793, 106798, - 106803, 106809, 106814, 106820, 106824, 106829, 106833, 106838, 106842, - 106847, 106852, 106857, 106862, 106867, 106872, 106877, 106882, 106887, - 106892, 106897, 106902, 106907, 106912, 106917, 106922, 106927, 106932, - 106937, 106941, 106946, 106951, 106956, 106960, 106964, 106969, 106974, - 106979, 106984, 106989, 106994, 106998, 107004, 107009, 107015, 107020, - 107026, 107032, 107039, 107045, 107052, 107057, 107064, 107070, 107075, - 107082, 107088, 107093, 107098, 107103, 107108, 107113, 107118, 107122, - 107127, 0, 0, 0, 0, 0, 0, 0, 0, 107131, 107136, 107140, 107144, 107148, - 107152, 107156, 107160, 107165, 107169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 109322, 109326, 109331, 109335, 109340, 109344, + 109349, 109354, 109360, 109365, 109371, 109375, 109380, 109384, 109389, + 109393, 109398, 109403, 109408, 109413, 109418, 109423, 109428, 109433, + 109438, 109443, 109448, 109453, 109458, 109463, 109468, 109473, 109478, + 109483, 109487, 109491, 109496, 109501, 109506, 109510, 109514, 109519, + 109523, 109528, 109533, 109538, 109543, 109547, 109552, 109558, 109563, + 109569, 109574, 109580, 109586, 109593, 109599, 109606, 109611, 109617, + 109622, 109628, 109633, 109638, 109643, 109648, 109652, 109657, 109662, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109667, 109672, 109676, 109680, 109684, + 109688, 109692, 109696, 109701, 109705, 0, 0, 0, 0, 0, 0, 109710, 109716, + 109721, 109728, 109736, 109743, 109751, 109760, 109765, 109774, 109779, + 109787, 109796, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 109807, 109811, 109816, 109820, 109825, 109829, 109834, 109838, 109843, + 109847, 109852, 109856, 109861, 109866, 109871, 109876, 109881, 109886, + 109891, 109896, 109901, 109906, 109911, 109916, 109921, 109926, 109931, + 109936, 109941, 109946, 109950, 109954, 109959, 109964, 109969, 109973, + 109977, 109982, 109986, 109991, 109996, 110001, 110005, 110010, 110015, + 110020, 110026, 110031, 110037, 110042, 110048, 110053, 110059, 110064, + 110070, 110075, 0, 0, 0, 0, 0, 0, 0, 0, 110080, 110085, 110089, 110093, + 110097, 110101, 110105, 110109, 110114, 110118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110123, + 110127, 110132, 110137, 110141, 110146, 110153, 110157, 110162, 110167, + 110171, 110176, 110181, 110186, 110191, 110195, 110200, 110205, 110209, + 110213, 110218, 110223, 110228, 110235, 110240, 110245, 0, 0, 0, 110250, + 110256, 110263, 110272, 110277, 110283, 110288, 110294, 110299, 110305, + 110310, 110316, 110321, 110327, 110333, 0, 0, 0, 0, 110338, 110343, + 110347, 110351, 110355, 110359, 110363, 110367, 110372, 110376, 110381, + 110386, 110391, 110397, 110402, 110407, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107174, 107177, 107181, 107184, 107188, - 107191, 107195, 107199, 107204, 107208, 107213, 107216, 107220, 107223, - 107227, 107230, 107234, 107238, 107242, 107246, 107250, 107254, 107258, - 107262, 107266, 107270, 107274, 107278, 107282, 107286, 107290, 107294, - 107298, 107302, 107306, 107309, 107313, 107317, 107321, 107324, 107327, - 107331, 107335, 107339, 107343, 107347, 107351, 107354, 107359, 107363, - 107368, 107372, 107377, 107382, 0, 0, 107388, 107392, 107397, 107401, - 107406, 107410, 107414, 107418, 107422, 107426, 107430, 107433, 107437, - 107442, 107446, 107451, 107456, 107461, 107468, 107480, 107492, 107504, - 107517, 107531, 107538, 107548, 107556, 107565, 107574, 107583, 107593, - 107604, 107616, 107623, 107630, 107638, 107643, 107649, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 107656, 107660, 107665, 107669, 107674, 107678, 107683, - 107688, 107694, 107699, 107705, 107709, 107714, 107718, 107723, 107727, - 107732, 107737, 107742, 107747, 107752, 107757, 107762, 107767, 107772, - 107777, 107782, 107787, 107792, 107797, 107802, 107807, 107812, 107817, - 107822, 107826, 107831, 107836, 107841, 107845, 107849, 107854, 107859, - 107864, 107869, 107874, 107879, 107883, 107888, 107894, 107899, 107905, - 107910, 107916, 107922, 107929, 107935, 107942, 107947, 107953, 107958, - 107964, 107969, 107974, 107979, 107984, 107988, 107993, 107998, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 108003, 108008, 108012, 108016, 108020, 108024, - 108028, 108032, 108037, 108041, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 108046, 108050, 108055, 108059, 108064, 108068, 108073, 108077, 108082, - 108086, 108091, 108095, 108100, 108105, 108110, 108115, 108120, 108125, - 108130, 108135, 108140, 108145, 108150, 108155, 108160, 108165, 108170, - 108175, 108180, 108185, 108190, 108194, 108199, 108204, 108209, 108213, - 108217, 108222, 108227, 108232, 108237, 108242, 108246, 108251, 108256, - 108261, 108267, 108272, 108278, 108283, 108289, 108294, 108300, 108305, - 108311, 108316, 0, 0, 0, 0, 0, 0, 0, 0, 108321, 108326, 108330, 108334, - 108338, 108342, 108346, 108350, 108355, 108359, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108364, - 108368, 108373, 108378, 108383, 108388, 108395, 108399, 108404, 108409, - 108413, 108418, 108423, 108428, 108433, 108438, 108443, 108448, 108452, - 108456, 108461, 108466, 108471, 108478, 108483, 108488, 0, 0, 0, 108493, - 108500, 108507, 108516, 108521, 108527, 108532, 108538, 108543, 108549, - 108554, 108560, 108565, 108571, 108577, 0, 0, 0, 0, 108582, 108587, - 108591, 108595, 108599, 108603, 108607, 108611, 108616, 108620, 108625, - 108630, 108635, 108641, 108646, 108651, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 110412, 110420, 110427, 110435, 110443, 110450, 110458, + 110466, 110474, 110481, 110488, 110496, 110504, 110512, 110520, 110528, + 110536, 110544, 110552, 110560, 110568, 110576, 110584, 110592, 110600, + 110608, 110616, 110624, 110632, 110640, 110648, 110656, 110664, 110672, + 110679, 110687, 110695, 110702, 110710, 110718, 110726, 110733, 110740, + 110748, 110756, 110764, 110772, 110780, 110788, 110796, 110804, 110812, + 110820, 110828, 110836, 110844, 110852, 110860, 110868, 110876, 110884, + 110892, 110900, 110908, 110916, 110923, 110929, 110935, 110941, 110947, + 110953, 110959, 110966, 110972, 110979, 110986, 110993, 111000, 111007, + 111014, 111021, 111028, 111035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 111042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -18925,1151 +20077,1274 @@ static unsigned int phrasebook_offset2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 111048, 111056, 111064, 111072, 111080, 111089, 111098, 111107, + 111116, 111124, 111133, 111142, 111151, 111160, 111169, 111178, 111187, + 111195, 111204, 111213, 111222, 111231, 111239, 111247, 111255, 111263, + 111271, 111280, 111289, 111299, 111309, 111319, 111329, 111339, 111348, + 111358, 111368, 111378, 111389, 111399, 111411, 111423, 111434, 111448, + 111459, 111469, 111481, 111492, 111502, 111514, 111526, 111537, 111548, + 111558, 111568, 111580, 111591, 0, 0, 0, 0, 0, 0, 0, 111603, 111606, + 111610, 111613, 111617, 111620, 111624, 111628, 111633, 0, 111637, + 111640, 111644, 111647, 111651, 111654, 111658, 111662, 111666, 111670, + 111674, 111678, 111682, 111686, 111690, 111694, 111698, 111702, 111706, + 111710, 111714, 111718, 111722, 111726, 111729, 111732, 111736, 111740, + 111744, 111747, 111750, 111754, 111757, 111761, 111765, 111769, 111773, + 111776, 111781, 111785, 111790, 111794, 111799, 111804, 111810, 0, + 111815, 111819, 111824, 111828, 111833, 111837, 111841, 111845, 111849, + 111853, 111856, 111860, 111865, 111870, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 111875, 111879, 111882, 111885, 111888, 111891, 111894, 111897, 111901, + 111904, 111908, 111911, 111914, 111917, 111920, 111923, 111926, 111930, + 111933, 111937, 111941, 111945, 111949, 111953, 111957, 111961, 111965, + 111969, 111973, 0, 0, 0, 111979, 111984, 111989, 111993, 111998, 112003, + 112008, 112013, 112018, 112023, 112028, 112033, 112038, 112043, 112047, + 112051, 112056, 112061, 112065, 112070, 112075, 112080, 112085, 112090, + 112095, 112100, 112104, 112109, 112113, 112118, 112123, 112127, 0, 0, + 112131, 112137, 112144, 112151, 112158, 112165, 112172, 112179, 112186, + 112193, 112200, 112207, 112213, 112219, 112226, 112233, 112239, 112246, + 112253, 112260, 112267, 112274, 0, 112281, 112287, 112294, 112300, + 112307, 112314, 112320, 112326, 112332, 112337, 112342, 112347, 112352, + 112357, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 108656, 108664, 108671, 108679, 108687, 108694, 108702, - 108710, 108718, 108725, 108732, 108740, 108748, 108756, 108764, 108772, - 108780, 108788, 108796, 108804, 108812, 108820, 108828, 108836, 108844, - 108852, 108860, 108868, 108876, 108884, 108892, 108900, 108908, 108916, - 108923, 108931, 108939, 108946, 108954, 108962, 108970, 108977, 108984, - 108992, 109000, 109008, 109016, 109024, 109032, 109040, 109048, 109056, - 109064, 109072, 109080, 109088, 109096, 109104, 109112, 109120, 109128, - 109136, 109144, 109152, 109160, 109167, 109173, 109179, 109185, 109191, - 109197, 109203, 109210, 109216, 109223, 109230, 109237, 109244, 109251, - 109258, 109265, 109272, 109279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 109286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 112362, 112365, 112370, 112376, 112384, 112389, 112395, 112403, + 112409, 112415, 112419, 112423, 112430, 112439, 112446, 112455, 112461, + 112470, 112477, 112484, 112491, 112501, 112507, 112511, 112518, 112527, + 112537, 112544, 112551, 112555, 112559, 112566, 112576, 112580, 112587, + 112594, 112601, 112607, 112614, 112621, 112628, 112635, 112639, 112643, + 112647, 112654, 112658, 112665, 112672, 112686, 112695, 112699, 112703, + 112707, 112714, 112718, 112722, 112726, 112734, 112742, 112761, 112771, + 112791, 112795, 112799, 112803, 112807, 112811, 112815, 112819, 112826, + 112830, 112833, 112837, 112841, 112847, 112854, 112863, 112867, 112876, + 112885, 112893, 112897, 112904, 112908, 112912, 112916, 112920, 112931, + 112940, 112949, 112958, 112967, 112979, 112988, 112997, 113006, 113014, + 113023, 113035, 113044, 113052, 113061, 113073, 113082, 113091, 113103, + 113112, 113121, 113133, 113142, 113146, 113150, 113154, 113158, 113162, + 113166, 113170, 113177, 113181, 113185, 113196, 113200, 113204, 113211, + 113217, 113223, 113227, 113234, 113238, 113242, 113246, 113250, 113254, + 113258, 113264, 113272, 113276, 113280, 113283, 113289, 113299, 113303, + 113315, 113322, 113329, 113336, 113343, 113349, 113353, 113357, 113361, + 113365, 113372, 113381, 113388, 113396, 113404, 113410, 113414, 113418, + 113422, 113426, 113432, 113441, 113453, 113460, 113467, 113476, 113487, + 113493, 113502, 113511, 113518, 113527, 113534, 113540, 113550, 113557, + 113564, 113571, 113578, 113582, 113588, 113592, 113603, 113611, 113620, + 113632, 113639, 113646, 113656, 113663, 113673, 113680, 113690, 113697, + 113704, 113714, 113721, 113728, 113737, 113744, 113756, 113765, 113772, + 113779, 113786, 113795, 113805, 113818, 113825, 113834, 113844, 113851, + 113860, 113873, 113880, 113887, 113894, 113904, 113914, 113920, 113930, + 113937, 113944, 113954, 113960, 113967, 113974, 113981, 113991, 113998, + 114005, 114012, 114018, 114025, 114035, 114042, 114046, 114054, 114058, + 114070, 114074, 114088, 114092, 114096, 114100, 114104, 114110, 114117, + 114125, 114129, 114133, 114137, 114141, 114148, 114152, 114158, 114164, + 114172, 114176, 114183, 114191, 114195, 114199, 114205, 114209, 114218, + 114227, 114234, 114244, 114250, 114254, 114258, 114266, 114273, 114280, + 114286, 114290, 114298, 114302, 114309, 114321, 114328, 114338, 114344, + 114348, 114357, 114364, 114373, 114377, 114381, 114388, 114392, 114396, + 114400, 114404, 114407, 114413, 114419, 114423, 114427, 114434, 114441, + 114448, 114455, 114462, 114469, 114476, 114483, 114489, 114493, 114497, + 114504, 114511, 114518, 114525, 114532, 114536, 114539, 114544, 114548, + 114552, 114561, 114570, 114574, 114578, 114584, 114590, 114607, 114613, + 114617, 114626, 114630, 114634, 114641, 114649, 114657, 114663, 114667, + 114671, 114675, 114679, 114682, 114688, 114695, 114705, 114712, 114719, + 114726, 114732, 114739, 114746, 114753, 114760, 114767, 114776, 114783, + 114795, 114802, 114809, 114819, 114830, 114837, 114844, 114851, 114858, + 114865, 114872, 114879, 114886, 114893, 114900, 114910, 114920, 114930, + 114937, 114947, 114954, 114961, 114968, 114975, 114982, 114989, 114996, + 115003, 115010, 115017, 115024, 115031, 115038, 115044, 115051, 115058, + 115067, 115074, 115081, 115085, 115093, 115097, 115101, 115105, 115109, + 115113, 115120, 115124, 115133, 115137, 115144, 115152, 115156, 115160, + 115164, 115177, 115193, 115197, 115201, 115208, 115214, 115221, 115225, + 115229, 115233, 115237, 115241, 115248, 115252, 115270, 115274, 115278, + 115285, 115289, 115293, 115299, 115303, 115307, 115315, 115319, 115323, + 115326, 115330, 115336, 115347, 115356, 115365, 115372, 115379, 115390, + 115397, 115404, 115411, 115418, 115425, 115432, 115439, 115449, 115455, + 115462, 115472, 115481, 115488, 115497, 115507, 115514, 115521, 115528, + 115535, 115547, 115554, 115561, 115568, 115575, 115582, 115592, 115599, + 115606, 115616, 115629, 115641, 115648, 115658, 115665, 115672, 115679, + 115693, 115699, 115707, 115717, 115727, 115734, 115741, 115747, 115751, + 115758, 115768, 115774, 115787, 115791, 115795, 115802, 115806, 115813, + 115823, 115827, 115831, 115835, 115839, 115843, 115850, 115854, 115861, + 115868, 115875, 115884, 115893, 115903, 115910, 115917, 115924, 115934, + 115941, 115951, 115958, 115968, 115975, 115982, 115992, 116002, 116009, + 116015, 116023, 116031, 116037, 116043, 116047, 116051, 116058, 116066, + 116072, 116076, 116080, 116084, 116091, 116103, 116106, 116113, 116119, + 116123, 116127, 116131, 116135, 116139, 116143, 116147, 116151, 116155, + 116159, 116166, 116170, 116176, 116180, 116184, 116188, 116194, 116201, + 116208, 116215, 116226, 116234, 116238, 116244, 116253, 116260, 116266, + 116269, 116273, 116277, 116283, 116292, 116300, 116304, 116310, 116314, + 116318, 116322, 116328, 116335, 116341, 116345, 116351, 116355, 116359, + 116368, 116380, 116384, 116391, 116398, 116408, 116415, 116427, 116434, + 116441, 116448, 116459, 116469, 116482, 116492, 116499, 116503, 116507, + 116511, 116515, 116524, 116533, 116542, 116559, 116568, 116574, 116581, + 116589, 116602, 116606, 116615, 116624, 116633, 116642, 116653, 116662, + 116670, 116679, 116688, 116697, 116706, 116716, 116719, 116723, 116727, + 116731, 116735, 116739, 116745, 116752, 116759, 116766, 116772, 116778, + 116785, 116791, 116798, 116806, 116810, 116817, 116824, 116831, 116839, + 116843, 116847, 116851, 116855, 116859, 116865, 116869, 116875, 116882, + 116889, 116895, 116902, 116909, 116916, 116923, 116930, 116937, 116944, + 116951, 116958, 116965, 116972, 116979, 116986, 116993, 116999, 117003, + 117012, 117016, 117020, 117024, 117028, 117034, 117041, 117048, 117055, + 117062, 117069, 117075, 117083, 117087, 117091, 117095, 117099, 117105, + 117122, 117139, 117143, 117147, 117151, 117155, 117159, 117163, 117169, + 117176, 117180, 117186, 117193, 117200, 117207, 117214, 117221, 117230, + 117237, 117244, 117251, 117258, 117262, 117266, 117272, 117284, 117288, + 117292, 117301, 117305, 117309, 117313, 117319, 117323, 117327, 117336, + 117340, 117344, 117348, 117355, 117359, 117363, 117367, 117371, 117375, + 117379, 117383, 117387, 117393, 117400, 117407, 117413, 117417, 117434, + 117440, 117444, 117450, 117456, 117462, 117468, 117474, 117480, 117484, + 117488, 117492, 117498, 117502, 117508, 117512, 117516, 117523, 117530, + 117547, 117551, 117555, 117559, 117563, 117567, 117579, 117582, 117587, + 117592, 117607, 117617, 117629, 117633, 117637, 117641, 117647, 117654, + 117661, 117671, 117683, 117689, 117695, 117704, 117708, 117712, 117719, + 117729, 117736, 117742, 117746, 117750, 117757, 117763, 117767, 117773, + 117777, 117785, 117791, 117795, 117803, 117811, 117818, 117824, 117831, + 117838, 117848, 117858, 117862, 117866, 117870, 117874, 117880, 117887, + 117893, 117900, 117907, 117914, 117923, 117930, 117937, 117943, 117950, + 117957, 117964, 117971, 117978, 117985, 117991, 117998, 118005, 118012, + 118021, 118028, 118035, 118039, 118045, 118049, 118055, 118062, 118069, + 118076, 118080, 118084, 118088, 118092, 118096, 118103, 118107, 118111, + 118117, 118125, 118129, 118133, 118137, 118141, 118148, 118152, 118156, + 118164, 118168, 118172, 118176, 118180, 118186, 118190, 118194, 118200, + 118207, 118213, 118220, 118232, 118236, 118243, 118250, 118257, 118264, + 118276, 118283, 118287, 118291, 118295, 118302, 118309, 118316, 118323, + 118333, 118340, 118346, 118353, 118360, 118367, 118374, 118383, 118393, + 118400, 118404, 118411, 118415, 118419, 118423, 118430, 118437, 118447, + 118453, 118457, 118466, 118470, 118477, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 118481, 118487, + 118493, 118500, 118507, 118514, 118521, 118528, 118535, 118541, 118548, + 118555, 118562, 118569, 118576, 118583, 118589, 118595, 118601, 118607, + 118613, 118619, 118625, 118631, 118637, 118644, 118651, 118658, 118665, + 118672, 118679, 118685, 118691, 118697, 118704, 118711, 118717, 118723, + 118732, 118739, 118746, 118753, 118760, 118767, 118774, 118780, 118786, + 118792, 118801, 118808, 118815, 118826, 118837, 118843, 118849, 118855, + 118864, 118871, 118878, 118888, 118898, 118909, 118920, 118932, 118945, + 118956, 118967, 118979, 118992, 119003, 119014, 119025, 119036, 119047, + 119059, 119067, 119075, 119084, 119093, 119102, 119108, 119114, 119120, + 119127, 119137, 119144, 119154, 119159, 119164, 119170, 119176, 119184, + 119192, 119201, 119212, 119223, 119231, 119239, 119248, 119257, 119265, + 119272, 119280, 119288, 119295, 119302, 119311, 119320, 119329, 119338, + 119347, 0, 119356, 119367, 119374, 119382, 119390, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 119398, 119407, 119414, 119421, 119430, 119437, 119444, + 119451, 119461, 119468, 119475, 119482, 119490, 119497, 119504, 119511, + 119522, 119529, 119536, 119543, 119550, 119557, 119566, 119573, 119579, + 119586, 119595, 119602, 119609, 119616, 119626, 119633, 119640, 119650, + 119660, 119667, 119674, 119681, 119688, 119695, 119702, 119711, 119718, + 119725, 119731, 119739, 119748, 119757, 119768, 119776, 119785, 119794, + 119803, 119812, 119819, 119826, 119835, 119847, 119857, 119864, 119871, + 119881, 119891, 119900, 119910, 119917, 119927, 119934, 119941, 119948, + 119958, 119968, 119975, 119982, 119992, 119998, 120009, 120018, 120028, + 120036, 120049, 120056, 120062, 120070, 120077, 120087, 120091, 120095, + 120099, 120103, 120107, 120111, 120115, 120124, 120128, 120135, 120139, + 120143, 120147, 120151, 120155, 120159, 120163, 120167, 120171, 120175, + 120179, 120183, 120187, 120191, 120195, 120199, 120203, 120207, 120211, + 120218, 120225, 120235, 120248, 120258, 120262, 120266, 120270, 120274, + 120278, 120282, 120286, 120290, 120294, 120298, 120302, 120309, 120316, + 120327, 120334, 120340, 120347, 120354, 120361, 120368, 120375, 120379, + 120383, 120390, 120397, 120404, 120413, 120420, 120433, 120443, 120450, + 120457, 120461, 120465, 120474, 120481, 120488, 120495, 120508, 120515, + 120522, 120532, 120542, 120551, 120558, 120565, 120572, 120579, 120586, + 120593, 120603, 120609, 120617, 120624, 120632, 120639, 120650, 120657, + 120663, 120670, 120677, 120684, 120691, 120701, 120711, 120718, 120725, + 120734, 120742, 120748, 120755, 120762, 120769, 120776, 120780, 120790, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 109292, 109300, 109308, 109317, 109325, 109334, 109343, 109352, - 109361, 109369, 109378, 109387, 109396, 109405, 109414, 109423, 109432, - 109441, 109450, 109459, 109468, 109477, 109485, 109493, 109501, 109509, - 109517, 109526, 109535, 109545, 109555, 109565, 109575, 109585, 109594, - 109604, 109614, 109624, 109635, 109645, 109657, 109669, 109680, 109694, - 109705, 109715, 109727, 109738, 109748, 109760, 109772, 109783, 109794, - 109804, 109814, 109826, 109837, 0, 0, 0, 0, 0, 0, 0, 109849, 109852, - 109857, 109863, 109871, 109876, 109882, 109890, 109896, 109902, 109906, - 109910, 109917, 109926, 109933, 109942, 109948, 109957, 109964, 109971, - 109978, 109988, 109994, 109998, 110005, 110014, 110024, 110031, 110038, - 110042, 110046, 110053, 110063, 110067, 110074, 110081, 110088, 110094, - 110101, 110108, 110115, 110122, 110126, 110130, 110134, 110141, 110145, - 110152, 110159, 110173, 110182, 110186, 110190, 110194, 110201, 110205, - 110209, 110213, 110221, 110229, 110248, 110258, 110278, 110282, 110286, - 110290, 110294, 110298, 110302, 110306, 110313, 110317, 110320, 110324, - 110328, 110334, 110341, 110350, 110354, 110363, 110372, 110380, 110384, - 110391, 110395, 110399, 110403, 110407, 110418, 110427, 110436, 110445, - 110454, 110466, 110475, 110484, 110493, 110501, 110510, 110522, 110531, - 110540, 110549, 110561, 110570, 110579, 110591, 110600, 110609, 110621, - 110630, 110634, 110638, 110642, 110646, 110650, 110654, 110658, 110665, - 110669, 110673, 110684, 110688, 110692, 110699, 110705, 110711, 110715, - 110722, 110726, 110730, 110734, 110738, 110742, 110746, 110752, 110760, - 110764, 110768, 110771, 110777, 110787, 110791, 110803, 110810, 110817, - 110824, 110831, 110837, 110841, 110845, 110849, 110853, 110860, 110869, - 110876, 110884, 110892, 110898, 110902, 110906, 110910, 110914, 110920, - 110929, 110941, 110948, 110955, 110964, 110975, 110981, 110990, 110999, - 111006, 111015, 111022, 111029, 111039, 111046, 111053, 111060, 111067, - 111071, 111077, 111081, 111092, 111100, 111109, 111121, 111128, 111135, - 111145, 111152, 111162, 111169, 111179, 111186, 111193, 111203, 111210, - 111217, 111227, 111234, 111246, 111255, 111262, 111269, 111276, 111285, - 111295, 111308, 111315, 111325, 111335, 111342, 111351, 111364, 111371, - 111378, 111385, 111395, 111405, 111412, 111422, 111429, 111436, 111446, - 111452, 111459, 111466, 111473, 111483, 111490, 111497, 111504, 111510, - 111517, 111527, 111534, 111538, 111546, 111550, 111562, 111566, 111580, - 111584, 111588, 111592, 111596, 111602, 111609, 111617, 111621, 111625, - 111629, 111633, 111640, 111644, 111650, 111656, 111664, 111668, 111675, - 111683, 111687, 111691, 111697, 111701, 111710, 111719, 111726, 111736, - 111742, 111746, 111750, 111758, 111765, 111772, 111778, 111782, 111790, - 111794, 111801, 111813, 111820, 111830, 111836, 111840, 111849, 111856, - 111865, 111869, 111873, 111880, 111884, 111888, 111892, 111896, 111899, - 111905, 111911, 111915, 111919, 111926, 111933, 111940, 111947, 111954, - 111961, 111968, 111975, 111981, 111985, 111989, 111996, 112003, 112010, - 112017, 112024, 112028, 112031, 112036, 112040, 112044, 112053, 112062, - 112066, 112070, 112076, 112082, 112099, 112105, 112109, 112118, 112122, - 112126, 112133, 112141, 112149, 112155, 112159, 112163, 112167, 112171, - 112174, 112180, 112187, 112197, 112204, 112211, 112218, 112224, 112231, - 112238, 112245, 112252, 112259, 112268, 112275, 112287, 112294, 112301, - 112311, 112322, 112329, 112336, 112343, 112350, 112357, 112364, 112371, - 112378, 112385, 112392, 112402, 112412, 112422, 112429, 112439, 112446, - 112453, 112460, 112467, 112474, 112481, 112488, 112495, 112502, 112509, - 112516, 112523, 112530, 112536, 112543, 112550, 112559, 112566, 112573, - 112577, 112585, 112589, 112593, 112597, 112601, 112605, 112612, 112616, - 112625, 112629, 112636, 112644, 112648, 112652, 112656, 112669, 112685, - 112689, 112693, 112700, 112706, 112713, 112717, 112721, 112725, 112729, - 112733, 112740, 112744, 112762, 112766, 112770, 112777, 112781, 112785, - 112791, 112795, 112799, 112807, 112811, 112815, 112819, 112823, 112829, - 112840, 112849, 112858, 112865, 112872, 112883, 112890, 112897, 112904, - 112911, 112918, 112925, 112932, 112942, 112948, 112955, 112965, 112974, - 112981, 112990, 113000, 113007, 113014, 113021, 113028, 113040, 113047, - 113054, 113061, 113068, 113075, 113085, 113092, 113099, 113109, 113122, - 113134, 113141, 113151, 113158, 113165, 113172, 113187, 113193, 113201, - 113211, 113221, 113228, 113235, 113241, 113245, 113252, 113262, 113268, - 113281, 113285, 113289, 113296, 113300, 113307, 113317, 113321, 113325, - 113329, 113333, 113337, 113344, 113348, 113355, 113362, 113369, 113378, - 113387, 113397, 113404, 113411, 113418, 113428, 113435, 113445, 113452, - 113462, 113469, 113476, 113486, 113496, 113503, 113509, 113517, 113525, - 113531, 113537, 113541, 113545, 113552, 113560, 113566, 113570, 113574, - 113578, 113585, 113597, 113600, 113607, 113613, 113617, 113621, 113625, - 113629, 113633, 113637, 113641, 113645, 113649, 113653, 113660, 113664, - 113670, 113674, 113678, 113682, 113688, 113695, 113702, 113709, 113721, - 113729, 113733, 113739, 113748, 113755, 113761, 113765, 113769, 113773, - 113779, 113788, 113796, 113800, 113806, 113810, 113814, 113818, 113824, - 113831, 113837, 113841, 113847, 113851, 113855, 113864, 113876, 113880, - 113887, 113894, 113904, 113911, 113923, 113930, 113937, 113944, 113955, - 113965, 113978, 113988, 113995, 113999, 114003, 114007, 114011, 114020, - 114029, 114038, 114055, 114064, 114070, 114077, 114085, 114098, 114102, - 114111, 114120, 114129, 114138, 114149, 114158, 114167, 114176, 114185, - 114194, 114203, 114213, 114216, 114220, 114224, 114228, 114232, 114236, - 114242, 114249, 114256, 114263, 114269, 114275, 114282, 114288, 114295, - 114303, 114307, 114314, 114321, 114328, 114336, 114340, 114344, 114348, - 114352, 114356, 114362, 114366, 114372, 114379, 114386, 114392, 114399, - 114406, 114413, 114420, 114427, 114434, 114441, 114448, 114455, 114462, - 114469, 114476, 114483, 114490, 114496, 114500, 114509, 114513, 114517, - 114521, 114525, 114531, 114538, 114545, 114552, 114559, 114566, 114572, - 114580, 114584, 114588, 114592, 114596, 114602, 114619, 114636, 114640, - 114644, 114648, 114652, 114656, 114660, 114666, 114673, 114677, 114683, - 114690, 114697, 114704, 114711, 114718, 114727, 114734, 114741, 114748, - 114755, 114759, 114763, 114769, 114781, 114785, 114789, 114798, 114802, - 114806, 114810, 114816, 114820, 114824, 114833, 114837, 114841, 114845, - 114852, 114856, 114860, 114864, 114868, 114872, 114876, 114880, 114884, - 114890, 114897, 114904, 114910, 114914, 114931, 114937, 114941, 114947, - 114953, 114959, 114965, 114971, 114977, 114981, 114985, 114989, 114995, - 114999, 115005, 115009, 115013, 115020, 115027, 115044, 115048, 115052, - 115056, 115060, 115064, 115076, 115079, 115084, 115089, 115104, 115114, - 115126, 115130, 115134, 115138, 115144, 115151, 115158, 115168, 115180, - 115186, 115192, 115201, 115205, 115209, 115216, 115226, 115233, 115239, - 115243, 115247, 115254, 115260, 115264, 115270, 115274, 115282, 115288, - 115292, 115300, 115309, 115316, 115322, 115329, 115336, 115346, 115356, - 115360, 115364, 115368, 115372, 115378, 115385, 115391, 115398, 115405, - 115412, 115421, 115428, 115435, 115441, 115448, 115455, 115462, 115469, - 115476, 115483, 115489, 115496, 115503, 115510, 115519, 115526, 115533, - 115537, 115543, 115547, 115553, 115560, 115567, 115574, 115578, 115582, - 115586, 115590, 115594, 115601, 115605, 115609, 115615, 115623, 115627, - 115631, 115635, 115639, 115646, 115650, 115654, 115662, 115666, 115670, - 115674, 115678, 115684, 115688, 115692, 115698, 115705, 115711, 115718, - 115730, 115734, 115741, 115748, 115755, 115762, 115774, 115781, 115785, - 115789, 115793, 115800, 115807, 115814, 115821, 115831, 115838, 115844, - 115851, 115858, 115865, 115872, 115881, 115891, 115898, 115902, 115909, - 115913, 115917, 115921, 115928, 115935, 115945, 115951, 115955, 115964, - 115968, 115975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115979, 115985, 115991, 115998, 116005, - 116012, 116019, 116026, 116033, 116039, 116046, 116053, 116060, 116067, - 116074, 116081, 116087, 116093, 116099, 116105, 116111, 116117, 116123, - 116129, 116135, 116142, 116149, 116156, 116163, 116170, 116177, 116183, - 116189, 116195, 116202, 116209, 116215, 116221, 116230, 116237, 116244, - 116251, 116258, 116265, 116272, 116278, 116284, 116290, 116299, 116306, - 116313, 116324, 116335, 116341, 116347, 116353, 116362, 116369, 116376, - 116386, 116396, 116407, 116418, 116430, 116443, 116454, 116465, 116477, - 116490, 116501, 116512, 116523, 116534, 116545, 116557, 116565, 116573, - 116582, 116591, 116600, 116606, 116612, 116618, 116625, 116635, 116642, - 116652, 116657, 116662, 116668, 116674, 116682, 116690, 116699, 116710, - 116721, 116729, 116737, 116746, 116755, 116763, 116770, 116778, 116786, - 116793, 116800, 116809, 116818, 116827, 116836, 116845, 0, 116854, - 116865, 116872, 116880, 116888, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116896, - 116905, 116912, 116919, 116928, 116935, 116942, 116949, 116959, 116966, - 116973, 116980, 116988, 116995, 117002, 117009, 117020, 117027, 117034, - 117041, 117048, 117055, 117064, 117071, 117077, 117084, 117093, 117100, - 117107, 117114, 117124, 117131, 117138, 117148, 117158, 117165, 117172, - 117179, 117186, 117193, 117200, 117209, 117216, 117223, 117229, 117237, - 117246, 117255, 117266, 117275, 117284, 117293, 117302, 117311, 117318, - 117325, 117334, 117346, 117356, 117363, 117370, 117380, 117390, 117399, - 117409, 117416, 117426, 117433, 117440, 117447, 117457, 117467, 117474, - 117481, 117491, 117497, 117508, 117517, 117527, 117535, 117548, 117555, - 117561, 117569, 117576, 117586, 117590, 117594, 117598, 117602, 117606, - 117610, 117614, 117623, 117627, 117634, 117638, 117642, 117646, 117650, - 117654, 117658, 117662, 117666, 117670, 117674, 117678, 117682, 117686, - 117690, 117694, 117698, 117702, 117706, 117710, 117717, 117724, 117734, - 117747, 117757, 117761, 117765, 117769, 117773, 117777, 117781, 117785, - 117789, 117793, 117797, 117801, 117808, 117815, 117826, 117833, 117840, - 117847, 117854, 117861, 117868, 117875, 117879, 117883, 117890, 117897, - 117904, 117913, 117920, 117933, 117943, 117950, 117957, 117961, 117965, - 117974, 117981, 117988, 117995, 118008, 118015, 118022, 118032, 118042, - 118051, 118058, 118065, 118072, 118079, 118086, 118093, 118103, 118109, - 118117, 118124, 118132, 118139, 118150, 118157, 118163, 118170, 118177, - 118184, 118191, 118201, 118211, 118218, 118225, 118234, 118242, 118248, - 118255, 118262, 118269, 118276, 118280, 118290, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120800, + 120804, 120808, 120812, 120816, 120820, 120824, 120828, 120832, 120836, + 120840, 120844, 120848, 120852, 120856, 120860, 120864, 120868, 120872, + 120876, 120880, 120884, 120888, 120892, 120896, 120900, 120904, 120908, + 120912, 120916, 120920, 120924, 120928, 120932, 120936, 120940, 120944, + 120948, 120952, 120956, 120960, 120964, 120968, 120972, 120976, 120980, + 120984, 120988, 120992, 120996, 121000, 121004, 121008, 121012, 121016, + 121020, 121024, 121028, 121032, 121036, 121040, 121044, 121048, 121052, + 121056, 121060, 121064, 121068, 121072, 121076, 121080, 121084, 121088, + 121092, 121096, 121100, 121104, 121108, 121112, 121116, 121120, 121124, + 121128, 121132, 121136, 121140, 121144, 121148, 121152, 121156, 121160, + 121164, 121168, 121172, 121176, 121180, 121184, 121188, 121192, 121196, + 121200, 121204, 121208, 121212, 121216, 121220, 121224, 121228, 121232, + 121236, 121240, 121244, 121248, 121252, 121256, 121260, 121264, 121268, + 121272, 121276, 121280, 121284, 121288, 121292, 121296, 121300, 121304, + 121308, 121312, 121316, 121320, 121324, 121328, 121332, 121336, 121340, + 121344, 121348, 121352, 121356, 121360, 121364, 121368, 121372, 121376, + 121380, 121384, 121388, 121392, 121396, 121400, 121404, 121408, 121412, + 121416, 121420, 121424, 121428, 121432, 121436, 121440, 121444, 121448, + 121452, 121456, 121460, 121464, 121468, 121472, 121476, 121480, 121484, + 121488, 121492, 121496, 121500, 121504, 121508, 121512, 121516, 121520, + 121524, 121528, 121532, 121536, 121540, 121544, 121548, 121552, 121556, + 121560, 121564, 121568, 121572, 121576, 121580, 121584, 121588, 121592, + 121596, 121600, 121604, 121608, 121612, 121616, 121620, 121624, 121628, + 121632, 121636, 121640, 121644, 121648, 121652, 121656, 121660, 121664, + 121668, 121672, 121676, 121680, 121684, 121688, 121692, 121696, 121700, + 121704, 121708, 121712, 121716, 121720, 121724, 121728, 121732, 121736, + 121740, 121744, 121748, 121752, 121756, 121760, 121764, 121768, 121772, + 121776, 121780, 121784, 121788, 121792, 121796, 121800, 121804, 121808, + 121812, 121816, 121820, 121824, 121828, 121832, 121836, 121840, 121844, + 121848, 121852, 121856, 121860, 121864, 121868, 121872, 121876, 121880, + 121884, 121888, 121892, 121896, 121900, 121904, 121908, 121912, 121916, + 121920, 121924, 121928, 121932, 121936, 121940, 121944, 121948, 121952, + 121956, 121960, 121964, 121968, 121972, 121976, 121980, 121984, 121988, + 121992, 121996, 122000, 122004, 122008, 122012, 122016, 122020, 122024, + 122028, 122032, 122036, 122040, 122044, 122048, 122052, 122056, 122060, + 122064, 122068, 122072, 122076, 122080, 122084, 122088, 122092, 122096, + 122100, 122104, 122108, 122112, 122116, 122120, 122124, 122128, 122132, + 122136, 122140, 122144, 122148, 122152, 122156, 122160, 122164, 122168, + 122172, 122176, 122180, 122184, 122188, 122192, 122196, 122200, 122204, + 122208, 122212, 122216, 122220, 122224, 122228, 122232, 122236, 122240, + 122244, 122248, 122252, 122256, 122260, 122264, 122268, 122272, 122276, + 122280, 122284, 122288, 122292, 122296, 122300, 122304, 122308, 122312, + 122316, 122320, 122324, 122328, 122332, 122336, 122340, 122344, 122348, + 122352, 122356, 122360, 122364, 122368, 122372, 122376, 122380, 122384, + 122388, 122392, 122396, 122400, 122404, 122408, 122412, 122416, 122420, + 122424, 122428, 122432, 122436, 122440, 122444, 122448, 122452, 122456, + 122460, 122464, 122468, 122472, 122476, 122480, 122484, 122488, 122492, + 122496, 122500, 122504, 122508, 122512, 122516, 122520, 122524, 122528, + 122532, 122536, 122540, 122544, 122548, 122552, 122556, 122560, 122564, + 122568, 122572, 122576, 122580, 122584, 122588, 122592, 122596, 122600, + 122604, 122608, 122612, 122616, 122620, 122624, 122628, 122632, 122636, + 122640, 122644, 122648, 122652, 122656, 122660, 122664, 122668, 122672, + 122676, 122680, 122684, 122688, 122692, 122696, 122700, 122704, 122708, + 122712, 122716, 122720, 122724, 122728, 122732, 122736, 122740, 122744, + 122748, 122752, 122756, 122760, 122764, 122768, 122772, 122776, 122780, + 122784, 122788, 122792, 122796, 122800, 122804, 122808, 122812, 122816, + 122820, 122824, 122828, 122832, 122836, 122840, 122844, 122848, 122852, + 122856, 122860, 122864, 122868, 122872, 122876, 122880, 122884, 122888, + 122892, 122896, 122900, 122904, 122908, 122912, 122916, 122920, 122924, + 122928, 122932, 122936, 122940, 122944, 122948, 122952, 122956, 122960, + 122964, 122968, 122972, 122976, 122980, 122984, 122988, 122992, 122996, + 123000, 123004, 123008, 123012, 123016, 123020, 123024, 123028, 123032, + 123036, 123040, 123044, 123048, 123052, 123056, 123060, 123064, 123068, + 123072, 123076, 123080, 123084, 123088, 123092, 123096, 123100, 123104, + 123108, 123112, 123116, 123120, 123124, 123128, 123132, 123136, 123140, + 123144, 123148, 123152, 123156, 123160, 123164, 123168, 123172, 123176, + 123180, 123184, 123188, 123192, 123196, 123200, 123204, 123208, 123212, + 123216, 123220, 123224, 123228, 123232, 123236, 123240, 123244, 123248, + 123252, 123256, 123260, 123264, 123268, 123272, 123276, 123280, 123284, + 123288, 123292, 123296, 123300, 123304, 123308, 123312, 123316, 123320, + 123324, 123328, 123332, 123336, 123340, 123344, 123348, 123352, 123356, + 123360, 123364, 123368, 123372, 123376, 123380, 123384, 123388, 123392, + 123396, 123400, 123404, 123408, 123412, 123416, 123420, 123424, 123428, + 123432, 123436, 123440, 123444, 123448, 123452, 123456, 123460, 123464, + 123468, 123472, 123476, 123480, 123484, 123488, 123492, 123496, 123500, + 123504, 123508, 123512, 123516, 123520, 123524, 123528, 123532, 123536, + 123540, 123544, 123548, 123552, 123556, 123560, 123564, 123568, 123572, + 123576, 123580, 123584, 123588, 123592, 123596, 123600, 123604, 123608, + 123612, 123616, 123620, 123624, 123628, 123632, 123636, 123640, 123644, + 123648, 123652, 123656, 123660, 123664, 123668, 123672, 123676, 123680, + 123684, 123688, 123692, 123696, 123700, 123704, 123708, 123712, 123716, + 123720, 123724, 123728, 123732, 123736, 123740, 123744, 123748, 123752, + 123756, 123760, 123764, 123768, 123772, 123776, 123780, 123784, 123788, + 123792, 123796, 123800, 123804, 123808, 123812, 123816, 123820, 123824, + 123828, 123832, 123836, 123840, 123844, 123848, 123852, 123856, 123860, + 123864, 123868, 123872, 123876, 123880, 123884, 123888, 123892, 123896, + 123900, 123904, 123908, 123912, 123916, 123920, 123924, 123928, 123932, + 123936, 123940, 123944, 123948, 123952, 123956, 123960, 123964, 123968, + 123972, 123976, 123980, 123984, 123988, 123992, 123996, 124000, 124004, + 124008, 124012, 124016, 124020, 124024, 124028, 124032, 124036, 124040, + 124044, 124048, 124052, 124056, 124060, 124064, 124068, 124072, 124076, + 124080, 124084, 124088, 124092, 124096, 124100, 124104, 124108, 124112, + 124116, 124120, 124124, 124128, 124132, 124136, 124140, 124144, 124148, + 124152, 124156, 124160, 124164, 124168, 124172, 124176, 124180, 124184, + 124188, 124192, 124196, 124200, 124204, 124208, 124212, 124216, 124220, + 124224, 124228, 124232, 124236, 124240, 124244, 124248, 124252, 124256, + 124260, 124264, 124268, 124272, 124276, 124280, 124284, 124288, 124292, + 124296, 124300, 124304, 124308, 124312, 124316, 124320, 124324, 124328, + 124332, 124336, 124340, 124344, 124348, 124352, 124356, 124360, 124364, + 124368, 124372, 124376, 124380, 124384, 124388, 124392, 124396, 124400, + 124404, 124408, 124412, 124416, 124420, 124424, 124428, 124432, 124436, + 124440, 124444, 124448, 124452, 124456, 124460, 124464, 124468, 124472, + 124476, 124480, 124484, 124488, 124492, 124496, 124500, 124504, 124508, + 124512, 124516, 124520, 124524, 124528, 124532, 124536, 124540, 124544, + 124548, 124552, 124556, 124560, 124564, 124568, 124572, 124576, 124580, + 124584, 124588, 124592, 124596, 124600, 124604, 124608, 124612, 124616, + 124620, 124624, 124628, 124632, 124636, 124640, 124644, 124648, 124652, + 124656, 124660, 124664, 124668, 124672, 124676, 124680, 124684, 124688, + 124692, 124696, 124700, 124704, 124708, 124712, 124716, 124720, 124724, + 124728, 124732, 124736, 124740, 124744, 124748, 124752, 124756, 124760, + 124764, 124768, 124772, 124776, 124780, 124784, 124788, 124792, 124796, + 124800, 124804, 124808, 124812, 124816, 124820, 124824, 124828, 124832, + 124836, 124840, 124844, 124848, 124852, 124856, 124860, 124864, 124868, + 124872, 124876, 124880, 124884, 124888, 124892, 124896, 124900, 124904, + 124908, 124912, 124916, 124920, 124924, 124928, 124932, 124936, 124940, + 124944, 124948, 124952, 124956, 124960, 124964, 124968, 124972, 124976, + 124980, 124984, 124988, 124992, 124996, 125000, 125004, 125008, 125012, + 125016, 125020, 125024, 125028, 125032, 125036, 125040, 125044, 125048, + 125052, 125056, 125060, 125064, 125068, 125072, 125076, 125080, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 118300, 118304, 118308, 118312, - 118316, 118320, 118324, 118328, 118332, 118336, 118340, 118344, 118348, - 118352, 118356, 118360, 118364, 118368, 118372, 118376, 118380, 118384, - 118388, 118392, 118396, 118400, 118404, 118408, 118412, 118416, 118420, - 118424, 118428, 118432, 118436, 118440, 118444, 118448, 118452, 118456, - 118460, 118464, 118468, 118472, 118476, 118480, 118484, 118488, 118492, - 118496, 118500, 118504, 118508, 118512, 118516, 118520, 118524, 118528, - 118532, 118536, 118540, 118544, 118548, 118552, 118556, 118560, 118564, - 118568, 118572, 118576, 118580, 118584, 118588, 118592, 118596, 118600, - 118604, 118608, 118612, 118616, 118620, 118624, 118628, 118632, 118636, - 118640, 118644, 118648, 118652, 118656, 118660, 118664, 118668, 118672, - 118676, 118680, 118684, 118688, 118692, 118696, 118700, 118704, 118708, - 118712, 118716, 118720, 118724, 118728, 118732, 118736, 118740, 118744, - 118748, 118752, 118756, 118760, 118764, 118768, 118772, 118776, 118780, - 118784, 118788, 118792, 118796, 118800, 118804, 118808, 118812, 118816, - 118820, 118824, 118828, 118832, 118836, 118840, 118844, 118848, 118852, - 118856, 118860, 118864, 118868, 118872, 118876, 118880, 118884, 118888, - 118892, 118896, 118900, 118904, 118908, 118912, 118916, 118920, 118924, - 118928, 118932, 118936, 118940, 118944, 118948, 118952, 118956, 118960, - 118964, 118968, 118972, 118976, 118980, 118984, 118988, 118992, 118996, - 119000, 119004, 119008, 119012, 119016, 119020, 119024, 119028, 119032, - 119036, 119040, 119044, 119048, 119052, 119056, 119060, 119064, 119068, - 119072, 119076, 119080, 119084, 119088, 119092, 119096, 119100, 119104, - 119108, 119112, 119116, 119120, 119124, 119128, 119132, 119136, 119140, - 119144, 119148, 119152, 119156, 119160, 119164, 119168, 119172, 119176, - 119180, 119184, 119188, 119192, 119196, 119200, 119204, 119208, 119212, - 119216, 119220, 119224, 119228, 119232, 119236, 119240, 119244, 119248, - 119252, 119256, 119260, 119264, 119268, 119272, 119276, 119280, 119284, - 119288, 119292, 119296, 119300, 119304, 119308, 119312, 119316, 119320, - 119324, 119328, 119332, 119336, 119340, 119344, 119348, 119352, 119356, - 119360, 119364, 119368, 119372, 119376, 119380, 119384, 119388, 119392, - 119396, 119400, 119404, 119408, 119412, 119416, 119420, 119424, 119428, - 119432, 119436, 119440, 119444, 119448, 119452, 119456, 119460, 119464, - 119468, 119472, 119476, 119480, 119484, 119488, 119492, 119496, 119500, - 119504, 119508, 119512, 119516, 119520, 119524, 119528, 119532, 119536, - 119540, 119544, 119548, 119552, 119556, 119560, 119564, 119568, 119572, - 119576, 119580, 119584, 119588, 119592, 119596, 119600, 119604, 119608, - 119612, 119616, 119620, 119624, 119628, 119632, 119636, 119640, 119644, - 119648, 119652, 119656, 119660, 119664, 119668, 119672, 119676, 119680, - 119684, 119688, 119692, 119696, 119700, 119704, 119708, 119712, 119716, - 119720, 119724, 119728, 119732, 119736, 119740, 119744, 119748, 119752, - 119756, 119760, 119764, 119768, 119772, 119776, 119780, 119784, 119788, - 119792, 119796, 119800, 119804, 119808, 119812, 119816, 119820, 119824, - 119828, 119832, 119836, 119840, 119844, 119848, 119852, 119856, 119860, - 119864, 119868, 119872, 119876, 119880, 119884, 119888, 119892, 119896, - 119900, 119904, 119908, 119912, 119916, 119920, 119924, 119928, 119932, - 119936, 119940, 119944, 119948, 119952, 119956, 119960, 119964, 119968, - 119972, 119976, 119980, 119984, 119988, 119992, 119996, 120000, 120004, - 120008, 120012, 120016, 120020, 120024, 120028, 120032, 120036, 120040, - 120044, 120048, 120052, 120056, 120060, 120064, 120068, 120072, 120076, - 120080, 120084, 120088, 120092, 120096, 120100, 120104, 120108, 120112, - 120116, 120120, 120124, 120128, 120132, 120136, 120140, 120144, 120148, - 120152, 120156, 120160, 120164, 120168, 120172, 120176, 120180, 120184, - 120188, 120192, 120196, 120200, 120204, 120208, 120212, 120216, 120220, - 120224, 120228, 120232, 120236, 120240, 120244, 120248, 120252, 120256, - 120260, 120264, 120268, 120272, 120276, 120280, 120284, 120288, 120292, - 120296, 120300, 120304, 120308, 120312, 120316, 120320, 120324, 120328, - 120332, 120336, 120340, 120344, 120348, 120352, 120356, 120360, 120364, - 120368, 120372, 120376, 120380, 120384, 120388, 120392, 120396, 120400, - 120404, 120408, 120412, 120416, 120420, 120424, 120428, 120432, 120436, - 120440, 120444, 120448, 120452, 120456, 120460, 120464, 120468, 120472, - 120476, 120480, 120484, 120488, 120492, 120496, 120500, 120504, 120508, - 120512, 120516, 120520, 120524, 120528, 120532, 120536, 120540, 120544, - 120548, 120552, 120556, 120560, 120564, 120568, 120572, 120576, 120580, - 120584, 120588, 120592, 120596, 120600, 120604, 120608, 120612, 120616, - 120620, 120624, 120628, 120632, 120636, 120640, 120644, 120648, 120652, - 120656, 120660, 120664, 120668, 120672, 120676, 120680, 120684, 120688, - 120692, 120696, 120700, 120704, 120708, 120712, 120716, 120720, 120724, - 120728, 120732, 120736, 120740, 120744, 120748, 120752, 120756, 120760, - 120764, 120768, 120772, 120776, 120780, 120784, 120788, 120792, 120796, - 120800, 120804, 120808, 120812, 120816, 120820, 120824, 120828, 120832, - 120836, 120840, 120844, 120848, 120852, 120856, 120860, 120864, 120868, - 120872, 120876, 120880, 120884, 120888, 120892, 120896, 120900, 120904, - 120908, 120912, 120916, 120920, 120924, 120928, 120932, 120936, 120940, - 120944, 120948, 120952, 120956, 120960, 120964, 120968, 120972, 120976, - 120980, 120984, 120988, 120992, 120996, 121000, 121004, 121008, 121012, - 121016, 121020, 121024, 121028, 121032, 121036, 121040, 121044, 121048, - 121052, 121056, 121060, 121064, 121068, 121072, 121076, 121080, 121084, - 121088, 121092, 121096, 121100, 121104, 121108, 121112, 121116, 121120, - 121124, 121128, 121132, 121136, 121140, 121144, 121148, 121152, 121156, - 121160, 121164, 121168, 121172, 121176, 121180, 121184, 121188, 121192, - 121196, 121200, 121204, 121208, 121212, 121216, 121220, 121224, 121228, - 121232, 121236, 121240, 121244, 121248, 121252, 121256, 121260, 121264, - 121268, 121272, 121276, 121280, 121284, 121288, 121292, 121296, 121300, - 121304, 121308, 121312, 121316, 121320, 121324, 121328, 121332, 121336, - 121340, 121344, 121348, 121352, 121356, 121360, 121364, 121368, 121372, - 121376, 121380, 121384, 121388, 121392, 121396, 121400, 121404, 121408, - 121412, 121416, 121420, 121424, 121428, 121432, 121436, 121440, 121444, - 121448, 121452, 121456, 121460, 121464, 121468, 121472, 121476, 121480, - 121484, 121488, 121492, 121496, 121500, 121504, 121508, 121512, 121516, - 121520, 121524, 121528, 121532, 121536, 121540, 121544, 121548, 121552, - 121556, 121560, 121564, 121568, 121572, 121576, 121580, 121584, 121588, - 121592, 121596, 121600, 121604, 121608, 121612, 121616, 121620, 121624, - 121628, 121632, 121636, 121640, 121644, 121648, 121652, 121656, 121660, - 121664, 121668, 121672, 121676, 121680, 121684, 121688, 121692, 121696, - 121700, 121704, 121708, 121712, 121716, 121720, 121724, 121728, 121732, - 121736, 121740, 121744, 121748, 121752, 121756, 121760, 121764, 121768, - 121772, 121776, 121780, 121784, 121788, 121792, 121796, 121800, 121804, - 121808, 121812, 121816, 121820, 121824, 121828, 121832, 121836, 121840, - 121844, 121848, 121852, 121856, 121860, 121864, 121868, 121872, 121876, - 121880, 121884, 121888, 121892, 121896, 121900, 121904, 121908, 121912, - 121916, 121920, 121924, 121928, 121932, 121936, 121940, 121944, 121948, - 121952, 121956, 121960, 121964, 121968, 121972, 121976, 121980, 121984, - 121988, 121992, 121996, 122000, 122004, 122008, 122012, 122016, 122020, - 122024, 122028, 122032, 122036, 122040, 122044, 122048, 122052, 122056, - 122060, 122064, 122068, 122072, 122076, 122080, 122084, 122088, 122092, - 122096, 122100, 122104, 122108, 122112, 122116, 122120, 122124, 122128, - 122132, 122136, 122140, 122144, 122148, 122152, 122156, 122160, 122164, - 122168, 122172, 122176, 122180, 122184, 122188, 122192, 122196, 122200, - 122204, 122208, 122212, 122216, 122220, 122224, 122228, 122232, 122236, - 122240, 122244, 122248, 122252, 122256, 122260, 122264, 122268, 122272, - 122276, 122280, 122284, 122288, 122292, 122296, 122300, 122304, 122308, - 122312, 122316, 122320, 122324, 122328, 122332, 122336, 122340, 122344, - 122348, 122352, 122356, 122360, 122364, 122368, 122372, 122376, 122380, - 122384, 122388, 122392, 122396, 122400, 122404, 122408, 122412, 122416, - 122420, 122424, 122428, 122432, 122436, 122440, 122444, 122448, 122452, - 122456, 122460, 122464, 122468, 122472, 122476, 122480, 122484, 122488, - 122492, 122496, 122500, 122504, 122508, 122512, 122516, 122520, 122524, - 122528, 122532, 122536, 122540, 122544, 122548, 122552, 122556, 122560, - 122564, 122568, 122572, 122576, 122580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125084, 125088, 125092, 125096, + 125100, 125104, 125108, 125112, 125116, 125120, 125124, 125128, 125132, + 125136, 125140, 125144, 125148, 125152, 125156, 125160, 125164, 125168, + 125172, 125176, 125180, 125184, 125188, 125192, 125196, 125200, 125204, + 125208, 125212, 125216, 125220, 125224, 125228, 125232, 125236, 125240, + 125244, 125248, 125252, 125256, 125260, 125264, 125268, 125272, 125276, + 125280, 125284, 125288, 125292, 125296, 125300, 125304, 125308, 125312, + 125316, 125320, 125324, 125328, 125332, 125336, 125340, 125344, 125348, + 125352, 125356, 125360, 125364, 125368, 125372, 125376, 125380, 125384, + 125388, 125392, 125396, 125400, 125404, 125408, 125412, 125416, 125420, + 125424, 125428, 125432, 125436, 125440, 125444, 125448, 125452, 125456, + 125460, 125464, 125468, 125472, 125476, 125480, 125484, 125488, 125492, + 125496, 125500, 125504, 125508, 125512, 125516, 125520, 125524, 125528, + 125532, 125536, 125540, 125544, 125548, 125552, 125556, 125560, 125564, + 125568, 125572, 125576, 125580, 125584, 125588, 125592, 125596, 125600, + 125604, 125608, 125612, 125616, 125620, 125624, 125628, 125632, 125636, + 125640, 125644, 125648, 125652, 125656, 125660, 125664, 125668, 125672, + 125676, 125680, 125684, 125688, 125692, 125696, 125700, 125704, 125708, + 125712, 125716, 125720, 125724, 125728, 125732, 125736, 125740, 125744, + 125748, 125752, 125756, 125760, 125764, 125768, 125772, 125776, 125780, + 125784, 125788, 125792, 125796, 125800, 125804, 125808, 125812, 125816, + 125820, 125824, 125828, 125832, 125836, 125840, 125844, 125848, 125852, + 125856, 125860, 125864, 125868, 125872, 125876, 125880, 125884, 125888, + 125892, 125896, 125900, 125904, 125908, 125912, 125916, 125920, 125924, + 125928, 125932, 125936, 125940, 125944, 125948, 125952, 125956, 125960, + 125964, 125968, 125972, 125976, 125980, 125984, 125988, 125992, 125996, + 126000, 126004, 126008, 126012, 126016, 126020, 126024, 126028, 126032, + 126036, 126040, 126044, 126048, 126052, 126056, 126060, 126064, 126068, + 126072, 126076, 126080, 126084, 126088, 126092, 126096, 126100, 126104, + 126108, 126112, 126116, 126120, 126124, 126128, 126132, 126136, 126140, + 126144, 126148, 126152, 126156, 126160, 126164, 126168, 126172, 126176, + 126180, 126184, 126188, 126192, 126196, 126200, 126204, 126208, 126212, + 126216, 126220, 126224, 126228, 126232, 126236, 126240, 126244, 126248, + 126252, 126256, 126260, 126264, 126268, 126272, 126276, 126280, 126284, + 126288, 126292, 126296, 126300, 126304, 126308, 126312, 126316, 126320, + 126324, 126328, 126332, 126336, 126340, 126344, 126348, 126352, 126356, + 126360, 126364, 126368, 126372, 126376, 126380, 126384, 126388, 126392, + 126396, 126400, 126404, 126408, 126412, 126416, 126420, 126424, 126428, + 126432, 126436, 126440, 126444, 126448, 126452, 126456, 126460, 126464, + 126468, 126472, 126476, 126480, 126484, 126488, 126492, 126496, 126500, + 126504, 126508, 126512, 126516, 126520, 126524, 126528, 126532, 126536, + 126540, 126544, 126548, 126552, 126556, 126560, 126564, 126568, 126572, + 126576, 126580, 126584, 126588, 126592, 126596, 126600, 126604, 126608, + 126612, 126616, 126620, 126624, 126628, 126632, 126636, 126640, 126644, + 126648, 126652, 126656, 126660, 126664, 126668, 126672, 126676, 126680, + 126684, 126688, 126692, 126696, 126700, 126704, 126708, 126712, 126716, + 126720, 126724, 126728, 126732, 126736, 126740, 126744, 126748, 126752, + 126756, 126760, 126764, 126768, 126772, 126776, 126780, 126784, 126788, + 126792, 126796, 126800, 126804, 126808, 126812, 126816, 126826, 126830, + 126834, 126838, 126842, 126846, 126850, 126854, 126858, 126862, 126866, + 126870, 126875, 126879, 126883, 126887, 126891, 126895, 126899, 126903, + 126907, 126911, 126915, 126919, 126923, 126927, 126931, 126935, 126939, + 126948, 126957, 126961, 126965, 126969, 126973, 126977, 126981, 126985, + 126989, 126993, 126997, 127001, 127005, 127009, 127013, 127017, 127021, + 127025, 127029, 127033, 127037, 127041, 127045, 127049, 127053, 127057, + 127061, 127065, 127069, 127073, 127077, 127081, 127085, 127089, 127093, + 127097, 127101, 127105, 127109, 127113, 127117, 127121, 127125, 127129, + 127133, 127137, 127141, 127145, 127149, 127153, 127157, 127161, 127165, + 127169, 127173, 127177, 127181, 127185, 127189, 127193, 127197, 127201, + 127205, 127209, 127213, 127217, 127221, 127225, 127229, 127233, 127237, + 127241, 127245, 127249, 127253, 127257, 127261, 127265, 127269, 127273, + 127277, 127281, 127285, 127289, 127293, 127297, 127301, 127305, 127309, + 127313, 127317, 127321, 127325, 127329, 127333, 127337, 127341, 127345, + 127349, 127353, 127357, 127361, 127365, 127369, 127373, 127377, 127381, + 127385, 127389, 127393, 127397, 127401, 127405, 127409, 127413, 127417, + 127421, 127425, 127429, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 122584, 122588, 122592, 122596, 122600, 122604, 122608, - 122612, 122616, 122620, 122624, 122628, 122632, 122636, 122640, 122644, - 122648, 122652, 122656, 122660, 122664, 122668, 122672, 122676, 122680, - 122684, 122688, 122692, 122696, 122700, 122704, 122708, 122712, 122716, - 122720, 122724, 122728, 122732, 122736, 122740, 122744, 122748, 122752, - 122756, 122760, 122764, 122768, 122772, 122776, 122780, 122784, 122788, - 122792, 122796, 122800, 122804, 122808, 122812, 122816, 122820, 122824, - 122828, 122832, 122836, 122840, 122844, 122848, 122852, 122856, 122860, - 122864, 122868, 122872, 122876, 122880, 122884, 122888, 122892, 122896, - 122900, 122904, 122908, 122912, 122916, 122920, 122924, 122928, 122932, - 122936, 122940, 122944, 122948, 122952, 122956, 122960, 122964, 122968, - 122972, 122976, 122980, 122984, 122988, 122992, 122996, 123000, 123004, - 123008, 123012, 123016, 123020, 123024, 123028, 123032, 123036, 123040, - 123044, 123048, 123052, 123056, 123060, 123064, 123068, 123072, 123076, - 123080, 123084, 123088, 123092, 123096, 123100, 123104, 123108, 123112, - 123116, 123120, 123124, 123128, 123132, 123136, 123140, 123144, 123148, - 123152, 123156, 123160, 123164, 123168, 123172, 123176, 123180, 123184, - 123188, 123192, 123196, 123200, 123204, 123208, 123212, 123216, 123220, - 123224, 123228, 123232, 123236, 123240, 123244, 123248, 123252, 123256, - 123260, 123264, 123268, 123272, 123276, 123280, 123284, 123288, 123292, - 123296, 123300, 123304, 123308, 123312, 123316, 123320, 123324, 123328, - 123332, 123336, 123340, 123344, 123348, 123352, 123356, 123360, 123364, - 123368, 123372, 123376, 123380, 123384, 123388, 123392, 123396, 123400, - 123404, 123408, 123412, 123416, 123420, 123424, 123428, 123432, 123436, - 123440, 123444, 123448, 123452, 123456, 123460, 123464, 123468, 123472, - 123476, 123480, 123484, 123488, 123492, 123496, 123500, 123504, 123508, - 123512, 123516, 123520, 123524, 123528, 123532, 123536, 123540, 123544, - 123548, 123552, 123556, 123560, 123564, 123568, 123572, 123576, 123580, - 123584, 123588, 123592, 123596, 123600, 123604, 123608, 123612, 123616, - 123620, 123624, 123628, 123632, 123636, 123640, 123644, 123648, 123652, - 123656, 123660, 123664, 123668, 123672, 123676, 123680, 123684, 123688, - 123692, 123696, 123700, 123704, 123708, 123712, 123716, 123720, 123724, - 123728, 123732, 123736, 123740, 123744, 123748, 123752, 123756, 123760, - 123764, 123768, 123772, 123776, 123780, 123784, 123788, 123792, 123796, - 123800, 123804, 123808, 123812, 123816, 123820, 123824, 123828, 123832, - 123836, 123840, 123844, 123848, 123852, 123856, 123860, 123864, 123868, - 123872, 123876, 123880, 123884, 123888, 123892, 123896, 123900, 123904, - 123908, 123912, 123916, 123920, 123924, 123928, 123932, 123936, 123940, - 123944, 123948, 123952, 123956, 123960, 123964, 123968, 123972, 123976, - 123980, 123984, 123988, 123992, 123996, 124000, 124004, 124008, 124012, - 124016, 124020, 124024, 124028, 124032, 124036, 124040, 124044, 124048, - 124052, 124056, 124060, 124064, 124068, 124072, 124076, 124080, 124084, - 124088, 124092, 124096, 124100, 124104, 124108, 124112, 124116, 124120, - 124124, 124128, 124132, 124136, 124140, 124144, 124148, 124152, 124156, - 124160, 124164, 124168, 124172, 124176, 124180, 124184, 124188, 124192, - 124196, 124200, 124204, 124208, 124212, 124216, 124220, 124224, 124228, - 124232, 124236, 124240, 124244, 124248, 124252, 124256, 124260, 124264, - 124268, 124272, 124276, 124280, 124284, 124288, 124292, 124296, 124300, - 124304, 124308, 124312, 124316, 124326, 124330, 124334, 124338, 124342, - 124346, 124350, 124354, 124358, 124362, 124366, 124370, 124375, 124379, - 124383, 124387, 124391, 124395, 124399, 124403, 124407, 124411, 124415, - 124419, 124423, 124427, 124431, 124435, 124439, 124448, 124457, 124461, - 124465, 124469, 124473, 124477, 124481, 124485, 124489, 124493, 124497, - 124501, 124505, 124509, 124513, 124517, 124521, 124525, 124529, 124533, - 124537, 124541, 124545, 124549, 124553, 124557, 124561, 124565, 124569, - 124573, 124577, 124581, 124585, 124589, 124593, 124597, 124601, 124605, - 124609, 124613, 124617, 124621, 124625, 124629, 124633, 124637, 124641, - 124645, 124649, 124653, 124657, 124661, 124665, 124669, 124673, 124677, - 124681, 124685, 124689, 124693, 124697, 124701, 124705, 124709, 124713, - 124717, 124721, 124725, 124729, 124733, 124737, 124741, 124745, 124749, - 124753, 124757, 124761, 124765, 124769, 124773, 124777, 124781, 124785, - 124789, 124793, 124797, 124801, 124805, 124809, 124813, 124817, 124821, - 124825, 124829, 124833, 124837, 124841, 124845, 124849, 124853, 124857, - 124861, 124865, 124869, 124873, 124877, 124881, 124885, 124889, 124893, - 124897, 124901, 124905, 124909, 124913, 124917, 124921, 124925, 124929, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 127433, 127441, 127449, 127459, 127469, 127477, 127483, 127491, + 127499, 127509, 127521, 127533, 127539, 127547, 127553, 127559, 127565, + 127571, 127577, 127583, 127589, 127595, 127601, 127607, 127613, 127621, + 127629, 127635, 127641, 127647, 127653, 127661, 127669, 127678, 127684, + 127692, 127698, 127704, 127710, 127716, 127722, 127730, 127738, 127744, + 127750, 127756, 127762, 127768, 127774, 127780, 127786, 127792, 127798, + 127804, 127810, 127816, 127822, 127828, 127834, 127840, 127846, 127852, + 127860, 127866, 127872, 127882, 127890, 127896, 127902, 127908, 127914, + 127920, 127926, 127932, 127938, 127944, 127950, 127956, 127962, 127968, + 127974, 127980, 127986, 127992, 127998, 128004, 128010, 128016, 128022, + 128030, 128036, 128044, 128052, 128060, 128066, 128072, 128078, 128084, + 128090, 128098, 128108, 128116, 128124, 128130, 128136, 128144, 128152, + 128158, 128166, 128174, 128182, 128188, 128194, 128200, 128206, 128212, + 128218, 128226, 128234, 128240, 128246, 128252, 128258, 128264, 128272, + 128278, 128284, 128290, 128296, 128302, 128308, 128316, 128322, 128328, + 128334, 128340, 128348, 128356, 128362, 128368, 128374, 128379, 128385, + 128391, 128398, 128403, 128408, 128413, 128418, 128423, 128428, 128433, + 128438, 128443, 128452, 128459, 128464, 128469, 128474, 128481, 128486, + 128491, 128496, 128503, 128508, 128513, 128518, 128523, 128528, 128533, + 128538, 128543, 128548, 128553, 128558, 128565, 128570, 128577, 128582, + 128587, 128594, 128599, 128604, 128609, 128614, 128619, 128624, 128629, + 128634, 128639, 128644, 128649, 128654, 128659, 128664, 128669, 128674, + 128679, 128684, 128689, 128696, 128701, 128706, 128711, 128716, 128721, + 128726, 128731, 128736, 128741, 128746, 128751, 128756, 128761, 128768, + 128773, 128778, 128785, 128790, 128795, 128800, 128805, 128810, 128815, + 128820, 128825, 128830, 128835, 128842, 128847, 128852, 128857, 128862, + 128867, 128874, 128881, 128886, 128891, 128896, 128901, 128906, 128911, + 128916, 128921, 128926, 128931, 128936, 128941, 128946, 128951, 128956, + 128961, 128966, 128971, 128976, 128981, 128986, 128991, 128996, 129001, + 129006, 129011, 129016, 129021, 129026, 129031, 129036, 129041, 129046, + 129051, 129056, 129061, 129068, 129073, 129078, 129083, 129088, 129093, + 129098, 129103, 129108, 129113, 129118, 129123, 129128, 129133, 129138, + 129143, 129148, 129153, 129158, 129163, 129168, 129173, 129178, 129183, + 129188, 129193, 129198, 129203, 129208, 129213, 129218, 129223, 129228, + 129233, 129238, 129243, 129248, 129253, 129258, 129263, 129268, 129273, + 129278, 129283, 129288, 129293, 129298, 129303, 129308, 129313, 129318, + 129323, 129328, 129333, 129338, 129343, 129348, 129353, 129358, 129365, + 129370, 129375, 129380, 129385, 129390, 129395, 129400, 129405, 129410, + 129415, 129420, 129425, 129430, 129435, 129440, 129445, 129450, 129455, + 129460, 129465, 129470, 129477, 129482, 129487, 129494, 129499, 129504, + 129509, 129514, 129519, 129524, 129529, 129534, 129539, 129544, 129549, + 129554, 129559, 129564, 129569, 129574, 129579, 129584, 129589, 129594, + 129599, 129604, 129609, 129614, 129619, 129624, 129629, 129634, 129639, + 129644, 129649, 129654, 129659, 129664, 129669, 129674, 129679, 129684, + 129689, 129694, 129699, 129704, 129709, 129716, 129721, 129726, 129733, + 129740, 129745, 129750, 129755, 129760, 129765, 129770, 129775, 129780, + 129785, 129790, 129795, 129800, 129805, 129810, 129815, 129820, 129825, + 129830, 129835, 129840, 129845, 129850, 129855, 129860, 129865, 129872, + 129877, 129882, 129887, 129892, 129897, 129902, 129907, 129912, 129917, + 129922, 129927, 129932, 129937, 129942, 129947, 129952, 129957, 129962, + 129969, 129974, 129979, 129984, 129989, 129994, 129999, 130004, 130010, + 130015, 130020, 130025, 130030, 130035, 130040, 130045, 130050, 130057, + 130064, 130069, 130074, 130078, 130083, 130087, 130091, 130096, 130103, + 130108, 130113, 130122, 130127, 130132, 130137, 130142, 130149, 130156, + 130161, 130166, 130171, 130176, 130183, 130188, 130193, 130198, 130203, + 130208, 130213, 130218, 130223, 130228, 130233, 130238, 130243, 130250, + 130254, 130259, 130264, 130269, 130274, 130278, 130283, 130288, 130293, + 130298, 130303, 130308, 130313, 130318, 130323, 130329, 130335, 130341, + 130347, 130353, 130358, 130364, 130370, 130376, 130382, 130388, 130394, + 130400, 130406, 130412, 130418, 130424, 130430, 130436, 130442, 130448, + 130454, 130460, 130466, 130471, 130477, 130483, 130489, 130495, 130501, + 130507, 130513, 130519, 130525, 130531, 130537, 130543, 130549, 130555, + 130561, 130567, 130573, 130579, 130585, 130591, 130596, 130602, 130608, + 130614, 130620, 130626, 0, 0, 0, 0, 0, 0, 0, 130632, 130637, 130642, + 130647, 130652, 130657, 130662, 130666, 130671, 130676, 130681, 130686, + 130691, 130696, 130701, 130706, 130711, 130715, 130720, 130724, 130729, + 130734, 130739, 130744, 130749, 130753, 130758, 130763, 130767, 130772, + 130777, 0, 130782, 130787, 130791, 130795, 130799, 130803, 130807, + 130811, 130816, 130820, 0, 0, 0, 0, 130825, 130829, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130834, 130841, + 130847, 130854, 130861, 130868, 130875, 130882, 130889, 130896, 130903, + 130910, 130917, 130924, 130931, 130938, 130945, 130952, 130958, 130965, + 130972, 130979, 130985, 130992, 130998, 131004, 131011, 131017, 131024, + 131030, 0, 0, 131036, 131044, 131052, 131061, 131070, 131079, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 131087, 131092, 131097, 131102, 131107, 131112, 131117, + 131122, 131127, 131132, 131137, 131142, 131147, 131152, 131157, 131162, + 131167, 131172, 131177, 131182, 131187, 131192, 131197, 131202, 131207, + 131212, 131217, 131222, 131227, 131232, 131237, 131242, 131247, 131252, + 131257, 131262, 131267, 131272, 131277, 131282, 131287, 131292, 131297, + 131302, 131307, 131312, 131317, 131322, 131327, 131334, 131341, 131348, + 131355, 131362, 131369, 131376, 131383, 131392, 131399, 131406, 131413, + 131420, 131427, 131434, 131441, 131448, 131455, 131462, 131469, 131474, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131483, 131488, 131492, 131496, 131500, + 131504, 131508, 131512, 131517, 131521, 0, 131526, 131531, 131536, + 131543, 131548, 131555, 131562, 0, 131567, 131574, 131579, 131584, + 131591, 131598, 131603, 131608, 131613, 131618, 131623, 131630, 131637, + 131642, 131647, 131652, 131665, 131674, 131681, 131690, 131699, 0, 0, 0, + 0, 0, 131708, 131715, 131722, 131729, 131736, 131743, 131750, 131757, + 131764, 131771, 131778, 131785, 131792, 131799, 131806, 131813, 131820, + 131827, 131834, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124933, 124941, - 124949, 124959, 124969, 124977, 124983, 124991, 124999, 125009, 125021, - 125033, 125039, 125047, 125053, 125059, 125065, 125071, 125077, 125083, - 125089, 125095, 125101, 125107, 125113, 125121, 125129, 125135, 125141, - 125147, 125153, 125161, 125169, 125178, 125184, 125192, 125198, 125204, - 125210, 125216, 125222, 125230, 125238, 125244, 125250, 125256, 125262, - 125268, 125274, 125280, 125286, 125292, 125298, 125304, 125310, 125316, - 125322, 125328, 125334, 125340, 125346, 125352, 125360, 125366, 125372, - 125382, 125390, 125396, 125402, 125408, 125414, 125420, 125426, 125432, - 125438, 125444, 125450, 125456, 125462, 125468, 125474, 125480, 125486, - 125492, 125498, 125504, 125510, 125516, 125522, 125530, 125536, 125544, - 125552, 125560, 125566, 125572, 125578, 125584, 125590, 125598, 125608, - 125616, 125624, 125630, 125636, 125644, 125652, 125658, 125666, 125674, - 125682, 125688, 125694, 125700, 125706, 125712, 125718, 125726, 125734, - 125740, 125746, 125752, 125758, 125764, 125772, 125778, 125784, 125790, - 125796, 125802, 125808, 125816, 125822, 125828, 125834, 125840, 125848, - 125856, 125862, 125868, 125874, 125879, 125885, 125891, 125898, 125903, - 125908, 125913, 125918, 125923, 125928, 125933, 125938, 125943, 125952, - 125959, 125964, 125969, 125974, 125981, 125986, 125991, 125996, 126003, - 126008, 126013, 126018, 126023, 126028, 126033, 126038, 126043, 126048, - 126053, 126058, 126065, 126070, 126077, 126082, 126087, 126094, 126099, - 126104, 126109, 126114, 126119, 126124, 126129, 126134, 126139, 126144, - 126149, 126154, 126159, 126164, 126169, 126174, 126179, 126184, 126189, - 126196, 126201, 126206, 126211, 126216, 126221, 126226, 126231, 126236, - 126241, 126246, 126251, 126256, 126261, 126268, 126273, 126278, 126285, - 126290, 126295, 126300, 126305, 126310, 126315, 126320, 126325, 126330, - 126335, 126342, 126347, 126352, 126357, 126362, 126367, 126374, 126381, - 126386, 126391, 126396, 126401, 126406, 126411, 126416, 126421, 126426, - 126431, 126436, 126441, 126446, 126451, 126456, 126461, 126466, 126471, - 126476, 126481, 126486, 126491, 126496, 126501, 126506, 126511, 126516, - 126521, 126526, 126531, 126536, 126541, 126546, 126551, 126556, 126561, - 126568, 126573, 126578, 126583, 126588, 126593, 126598, 126603, 126608, - 126613, 126618, 126623, 126628, 126633, 126638, 126643, 126648, 126653, - 126658, 126663, 126668, 126673, 126678, 126683, 126688, 126693, 126698, - 126703, 126708, 126713, 126718, 126723, 126728, 126733, 126738, 126743, - 126748, 126753, 126758, 126763, 126768, 126773, 126778, 126783, 126788, - 126793, 126798, 126803, 126808, 126813, 126818, 126823, 126828, 126833, - 126838, 126843, 126848, 126853, 126858, 126865, 126870, 126875, 126880, - 126885, 126890, 126895, 126900, 126905, 126910, 126915, 126920, 126925, - 126930, 126935, 126940, 126945, 126950, 126955, 126960, 126965, 126970, - 126977, 126982, 126987, 126994, 126999, 127004, 127009, 127014, 127019, - 127024, 127029, 127034, 127039, 127044, 127049, 127054, 127059, 127064, - 127069, 127074, 127079, 127084, 127089, 127094, 127099, 127104, 127109, - 127114, 127119, 127124, 127129, 127134, 127139, 127144, 127149, 127154, - 127159, 127164, 127169, 127174, 127179, 127184, 127189, 127194, 127199, - 127204, 127209, 127216, 127221, 127226, 127233, 127240, 127245, 127250, - 127255, 127260, 127265, 127270, 127275, 127280, 127285, 127290, 127295, - 127300, 127305, 127310, 127315, 127320, 127325, 127330, 127335, 127340, - 127345, 127350, 127355, 127360, 127365, 127372, 127377, 127382, 127387, - 127392, 127397, 127402, 127407, 127412, 127417, 127422, 127427, 127432, - 127437, 127442, 127447, 127452, 127457, 127462, 127469, 127474, 127479, - 127484, 127489, 127494, 127499, 127504, 127510, 127515, 127520, 127525, - 127530, 127535, 127540, 127545, 127550, 127557, 127564, 127569, 127574, - 127578, 127583, 127587, 127591, 127596, 127603, 127608, 127613, 127622, - 127627, 127632, 127637, 127642, 127649, 127656, 127661, 127666, 127671, - 127676, 127683, 127688, 127693, 127698, 127703, 127708, 127713, 127718, - 127723, 127728, 127733, 127738, 127743, 127750, 127755, 127760, 127765, - 127770, 127775, 127779, 127784, 127789, 127794, 127799, 127804, 127809, - 127814, 127819, 127824, 127830, 127836, 127842, 127848, 127854, 127860, - 127866, 127872, 127878, 127884, 127890, 127896, 127902, 127908, 127914, - 127920, 127926, 127932, 127938, 127944, 127950, 127956, 127962, 127968, - 127973, 127979, 127985, 127991, 127997, 128003, 128009, 128015, 128021, - 128027, 128033, 128039, 128045, 128051, 128057, 128063, 128069, 128075, - 128081, 128087, 128093, 128098, 128104, 128110, 128116, 128122, 128128, - 0, 0, 0, 0, 0, 0, 0, 128134, 128139, 128144, 128149, 128154, 128159, - 128164, 128168, 128173, 128178, 128183, 128188, 128193, 128198, 128203, - 128208, 128213, 128217, 128222, 128226, 128231, 128236, 128241, 128246, - 128251, 128255, 128260, 128265, 128270, 128275, 128280, 0, 128285, - 128290, 128294, 128298, 128302, 128306, 128310, 128314, 128319, 128323, - 0, 0, 0, 0, 128328, 128332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131841, + 131844, 131848, 131852, 131856, 131859, 131863, 131868, 131872, 131876, + 131880, 131884, 131888, 131893, 131898, 131902, 131906, 131909, 131913, + 131918, 131923, 131927, 131931, 131934, 131938, 131942, 131946, 131950, + 131954, 131958, 131962, 131965, 131969, 131973, 131977, 131981, 131985, + 131989, 131995, 131998, 132002, 132006, 132010, 132014, 132018, 132022, + 132026, 132030, 132034, 132039, 132044, 132050, 132054, 132058, 132062, + 132066, 132070, 132074, 132079, 132083, 132087, 132091, 132095, 132099, + 132105, 132109, 132113, 132117, 132121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 132125, 132129, 132133, 132139, 132145, 132149, 132154, 132159, 132164, + 132169, 132173, 132178, 132183, 132188, 132192, 132197, 132202, 132207, + 132211, 132216, 132221, 132226, 132231, 132236, 132241, 132246, 132251, + 132255, 132260, 132265, 132270, 132275, 132280, 132285, 132290, 132295, + 132300, 132305, 132310, 132317, 132322, 132329, 132334, 132339, 132344, + 132349, 132354, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132359, + 132363, 132369, 132372, 132375, 132379, 132383, 132387, 132391, 132395, + 132399, 132403, 132409, 132415, 132421, 132427, 132433, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132443, 132446, + 132449, 132452, 132455, 132458, 132461, 132464, 132467, 132470, 132473, + 132476, 132479, 132482, 132485, 132488, 132491, 132494, 132497, 132500, + 132503, 132506, 132509, 132512, 132515, 132518, 132521, 132524, 132527, + 132530, 132533, 132536, 132539, 132542, 132545, 132548, 132551, 132554, + 132557, 132560, 132563, 132566, 132569, 132572, 132575, 132578, 132581, + 132584, 132587, 132590, 132593, 132596, 132599, 132602, 132605, 132608, + 132611, 132614, 132617, 132620, 132623, 132626, 132629, 132632, 132635, + 132638, 132641, 132644, 132647, 132650, 132653, 132656, 132659, 132662, + 132665, 132668, 132671, 132674, 132677, 132680, 132683, 132686, 132689, + 132692, 132695, 132698, 132701, 132704, 132707, 132710, 132713, 132716, + 132719, 132722, 132725, 132728, 132731, 132734, 132737, 132740, 132743, + 132746, 132749, 132752, 132755, 132758, 132761, 132764, 132767, 132770, + 132773, 132776, 132779, 132782, 132785, 132788, 132791, 132794, 132797, + 132800, 132803, 132806, 132809, 132812, 132815, 132818, 132821, 132824, + 132827, 132830, 132833, 132836, 132839, 132842, 132845, 132848, 132851, + 132854, 132857, 132860, 132863, 132866, 132869, 132872, 132875, 132878, + 132881, 132884, 132887, 132890, 132893, 132896, 132899, 132902, 132905, + 132908, 132911, 132914, 132917, 132920, 132923, 132926, 132929, 132932, + 132935, 132938, 132941, 132944, 132947, 132950, 132953, 132956, 132959, + 132962, 132965, 132968, 132971, 132974, 132977, 132980, 132983, 132986, + 132989, 132992, 132995, 132998, 133001, 133004, 133007, 133010, 133013, + 133016, 133019, 133022, 133025, 133028, 133031, 133034, 133037, 133040, + 133043, 133046, 133049, 133052, 133055, 133058, 133061, 133064, 133067, + 133070, 133073, 133076, 133079, 133082, 133085, 133088, 133091, 133094, + 133097, 133100, 133103, 133106, 133109, 133112, 133115, 133118, 133121, + 133124, 133127, 133130, 133133, 133136, 133139, 133142, 133145, 133148, + 133151, 133154, 133157, 133160, 133163, 133166, 133169, 133172, 133175, + 133178, 133181, 133184, 133187, 133190, 133193, 133196, 133199, 133202, + 133205, 133208, 133211, 133214, 133217, 133220, 133223, 133226, 133229, + 133232, 133235, 133238, 133241, 133244, 133247, 133250, 133253, 133256, + 133259, 133262, 133265, 133268, 133271, 133274, 133277, 133280, 133283, + 133286, 133289, 133292, 133295, 133298, 133301, 133304, 133307, 133310, + 133313, 133316, 133319, 133322, 133325, 133328, 133331, 133334, 133337, + 133340, 133343, 133346, 133349, 133352, 133355, 133358, 133361, 133364, + 133367, 133370, 133373, 133376, 133379, 133382, 133385, 133388, 133391, + 133394, 133397, 133400, 133403, 133406, 133409, 133412, 133415, 133418, + 133421, 133424, 133427, 133430, 133433, 133436, 133439, 133442, 133445, + 133448, 133451, 133454, 133457, 133460, 133463, 133466, 133469, 133472, + 133475, 133478, 133481, 133484, 133487, 133490, 133493, 133496, 133499, + 133502, 133505, 133508, 133511, 133514, 133517, 133520, 133523, 133526, + 133529, 133532, 133535, 133538, 133541, 133544, 133547, 133550, 133553, + 133556, 133559, 133562, 133565, 133568, 133571, 133574, 133577, 133580, + 133583, 133586, 133589, 133592, 133595, 133598, 133601, 133604, 133607, + 133610, 133613, 133616, 133619, 133622, 133625, 133628, 133631, 133634, + 133637, 133640, 133643, 133646, 133649, 133652, 133655, 133658, 133661, + 133664, 133667, 133670, 133673, 133676, 133679, 133682, 133685, 133688, + 133691, 133694, 133697, 133700, 133703, 133706, 133709, 133712, 133715, + 133718, 133721, 133724, 133727, 133730, 133733, 133736, 133739, 133742, + 133745, 133748, 133751, 133754, 133757, 133760, 133763, 133766, 133769, + 133772, 133775, 133778, 133781, 133784, 133787, 133790, 133793, 133796, + 133799, 133802, 133805, 133808, 133811, 133814, 133817, 133820, 133823, + 133826, 133829, 133832, 133835, 133838, 133841, 133844, 133847, 133850, + 133853, 133856, 133859, 133862, 133865, 133868, 133871, 133874, 133877, + 133880, 133883, 133886, 133889, 133892, 133895, 133898, 133901, 133904, + 133907, 133910, 133913, 133916, 133919, 133922, 133925, 133928, 133931, + 133934, 133937, 133940, 133943, 133946, 133949, 133952, 133955, 133958, + 133961, 133964, 133967, 133970, 133973, 133976, 133979, 133982, 133985, + 133988, 133991, 133994, 133997, 134000, 134003, 134006, 134009, 134012, + 134015, 134018, 134021, 134024, 134027, 134030, 134033, 134036, 134039, + 134042, 134045, 134048, 134051, 134054, 134057, 134060, 134063, 134066, + 134069, 134072, 134075, 134078, 134081, 134084, 134087, 134090, 134093, + 134096, 134099, 134102, 134105, 134108, 134111, 134114, 134117, 134120, + 134123, 134126, 134129, 134132, 134135, 134138, 134141, 134144, 134147, + 134150, 134153, 134156, 134159, 134162, 134165, 134168, 134171, 134174, + 134177, 134180, 134183, 134186, 134189, 134192, 134195, 134198, 134201, + 134204, 134207, 134210, 134213, 134216, 134219, 134222, 134225, 134228, + 134231, 134234, 134237, 134240, 134243, 134246, 134249, 134252, 134255, + 134258, 134261, 134264, 134267, 134270, 134273, 134276, 134279, 134282, + 134285, 134288, 134291, 134294, 134297, 134300, 134303, 134306, 134309, + 134312, 134315, 134318, 134321, 134324, 134327, 134330, 134333, 134336, + 134339, 134342, 134345, 134348, 134351, 134354, 134357, 134360, 134363, + 134366, 134369, 134372, 134375, 134378, 134381, 134384, 134387, 134390, + 134393, 134396, 134399, 134402, 134405, 134408, 134411, 134414, 134417, + 134420, 134423, 134426, 134429, 134432, 134435, 134438, 134441, 134444, + 134447, 134450, 134453, 134456, 134459, 134462, 134465, 134468, 134471, + 134474, 134477, 134480, 134483, 134486, 134489, 134492, 134495, 134498, + 134501, 134504, 134507, 134510, 134513, 134516, 134519, 134522, 134525, + 134528, 134531, 134534, 134537, 134540, 134543, 134546, 134549, 134552, + 134555, 134558, 134561, 134564, 134567, 134570, 134573, 134576, 134579, + 134582, 134585, 134588, 134591, 134594, 134597, 134600, 134603, 134606, + 134609, 134612, 134615, 134618, 134621, 134624, 134627, 134630, 134633, + 134636, 134639, 134642, 134645, 134648, 134651, 134654, 134657, 134660, + 134663, 134666, 134669, 134672, 134675, 134678, 134681, 134684, 134687, + 134690, 134693, 134696, 134699, 134702, 134705, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 134708, 134713, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 128337, 128344, 128350, 128357, 128364, - 128371, 128378, 128385, 128392, 128399, 128406, 128413, 128420, 128427, - 128434, 128441, 128448, 128455, 128461, 128468, 128475, 128482, 128488, - 128495, 128501, 128507, 128514, 128520, 128527, 128533, 0, 0, 128539, - 128547, 128555, 128564, 128573, 128582, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 128590, 128595, 128600, 128605, 128610, 128615, 128620, 128625, 128630, - 128635, 128640, 128645, 128650, 128655, 128660, 128665, 128670, 128675, - 128680, 128685, 128690, 128695, 128700, 128705, 128710, 128715, 128720, - 128725, 128730, 128735, 128740, 128745, 128750, 128755, 128760, 128765, - 128770, 128775, 128780, 128785, 128790, 128795, 128800, 128805, 128810, - 128815, 128820, 128825, 128830, 128837, 128844, 128851, 128858, 128865, - 128872, 128879, 128886, 128895, 128902, 128909, 128916, 128923, 128930, - 128937, 128944, 128951, 128958, 128965, 128972, 128977, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 128986, 128991, 128995, 128999, 129003, 129007, 129011, - 129015, 129020, 129024, 0, 129029, 129034, 129039, 129046, 129051, - 129058, 129065, 0, 129070, 129077, 129082, 129087, 129094, 129101, - 129106, 129111, 129116, 129121, 129126, 129133, 129140, 129145, 129150, - 129155, 129168, 129177, 129184, 129193, 129202, 0, 0, 0, 0, 0, 129211, - 129218, 129225, 129232, 129239, 129246, 129253, 129260, 129267, 129274, - 129281, 129288, 129295, 129302, 129309, 129316, 129323, 129330, 129337, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129344, 129347, 129351, - 129355, 129359, 129362, 129366, 129371, 129375, 129379, 129383, 129387, - 129391, 129396, 129401, 129405, 129409, 129413, 129417, 129422, 129428, - 129432, 129436, 129440, 129444, 129448, 129452, 129456, 129460, 129464, - 129468, 129471, 129475, 129479, 129483, 129487, 129491, 129495, 129501, - 129504, 129508, 129512, 129516, 129520, 129524, 129528, 129532, 129536, - 129540, 129545, 129550, 129556, 129560, 129564, 129568, 129572, 129576, - 129580, 129585, 129589, 129593, 129597, 129601, 129605, 129611, 129615, - 129619, 129623, 129627, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129631, 129635, - 129639, 129645, 129651, 129655, 129660, 129665, 129670, 129675, 129679, - 129684, 129689, 129694, 129698, 129703, 129708, 129713, 129717, 129722, - 129727, 129732, 129737, 129742, 129747, 129752, 129757, 129761, 129766, - 129771, 129776, 129781, 129786, 129791, 129796, 129801, 129806, 129811, - 129816, 129823, 129828, 129835, 129840, 129845, 129850, 129855, 129860, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129865, 129869, 129875, - 129878, 129881, 129885, 129889, 129893, 129897, 129901, 129905, 129909, - 129915, 129921, 129927, 129933, 129939, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129945, 129950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 134719, 134723, 134727, 134731, 134735, 134739, 134743, 134746, 134750, + 134754, 134758, 134762, 134765, 134771, 134777, 134783, 134789, 134795, + 134799, 134805, 134809, 134813, 134819, 134823, 134827, 134831, 134835, + 134839, 134843, 134847, 134853, 134859, 134865, 134871, 134878, 134885, + 134892, 134902, 134909, 134916, 134922, 134928, 134934, 134940, 134948, + 134956, 134964, 134972, 134981, 134987, 134995, 135001, 135008, 135014, + 135021, 135027, 135035, 135039, 135043, 135048, 135054, 135060, 135068, + 135076, 135082, 135089, 135092, 135098, 135102, 135105, 135109, 135112, + 135115, 135119, 135124, 135128, 135132, 135138, 135143, 135149, 135153, + 135157, 135160, 135164, 135168, 135173, 135177, 135182, 135186, 135191, + 135195, 135199, 135203, 135207, 135211, 135215, 135219, 135223, 135228, + 135233, 135238, 135243, 135249, 135255, 135261, 135267, 135273, 0, 0, 0, + 0, 0, 135278, 135286, 135295, 135303, 135310, 135318, 135325, 135332, + 135341, 135348, 135355, 135362, 135370, 0, 0, 0, 135378, 135383, 135390, + 135396, 135403, 135409, 135415, 135421, 135427, 0, 0, 0, 0, 0, 0, 0, + 135433, 135438, 135445, 135451, 135458, 135464, 135470, 135476, 135482, + 135488, 0, 0, 135493, 135499, 135505, 135508, 135517, 135524, 135532, + 135539, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135546, + 135551, 135556, 135561, 135568, 135575, 135582, 135589, 135594, 135599, + 135604, 135609, 135616, 135621, 135628, 135635, 135640, 135645, 135650, + 135657, 135662, 135667, 135674, 135681, 135686, 135691, 135696, 135703, + 135710, 135717, 135722, 135727, 135734, 135741, 135748, 135755, 135760, + 135765, 135770, 135777, 135782, 135787, 135792, 135799, 135808, 135815, + 135820, 135825, 135830, 135835, 135840, 135845, 135854, 135861, 135866, + 135873, 135880, 135885, 135890, 135895, 135902, 135907, 135914, 135921, + 135926, 135931, 135936, 135943, 135950, 135955, 135960, 135967, 135974, + 135981, 135986, 135991, 135996, 136001, 136008, 136017, 136026, 136031, + 136038, 136047, 136052, 136057, 136062, 136067, 136074, 136081, 136088, + 136095, 136100, 136105, 136110, 136117, 136124, 136131, 136136, 136141, + 136148, 136153, 136160, 136165, 136172, 136177, 136184, 136191, 136196, + 136201, 136206, 136211, 136216, 136221, 136226, 136231, 136236, 136243, + 136250, 136257, 136264, 136271, 136280, 136285, 136290, 136297, 136304, + 136309, 136316, 136323, 136330, 136337, 136344, 136351, 136356, 136361, + 136366, 136371, 136376, 136385, 136394, 136403, 136412, 136421, 136430, + 136439, 136448, 136453, 136464, 136475, 136484, 136489, 136494, 136499, + 136504, 136513, 136520, 136527, 136534, 136541, 136548, 136555, 136564, + 136573, 136584, 136593, 136604, 136613, 136620, 136629, 136640, 136649, + 136658, 136667, 136676, 136683, 136690, 136697, 136706, 136715, 136726, + 136735, 136744, 136755, 136760, 136765, 136776, 136784, 136793, 136802, + 136811, 136822, 136831, 136840, 136851, 136862, 136873, 136884, 136895, + 136906, 136913, 136920, 136927, 136934, 136945, 136954, 136961, 136968, + 136975, 136986, 136997, 137008, 137019, 137030, 137041, 137052, 137063, + 137070, 137077, 137086, 137095, 137102, 137109, 137116, 137125, 137134, + 137143, 137150, 137159, 137168, 137177, 137184, 137191, 137196, 137202, + 137209, 137216, 137223, 137230, 137237, 137244, 137253, 137262, 137271, + 137280, 137287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 137296, 137302, 137307, + 137312, 137319, 137325, 137331, 137337, 137343, 137349, 137355, 137361, + 137365, 137369, 137375, 137381, 137387, 137391, 137396, 137401, 137405, + 137409, 137412, 137418, 137424, 137430, 137436, 137442, 137448, 137454, + 137460, 137466, 137476, 137486, 137492, 137498, 137508, 137518, 137524, + 0, 0, 137530, 137538, 137543, 137548, 137554, 137560, 137566, 137572, + 137578, 137584, 137591, 137598, 137604, 137610, 137616, 137622, 137628, + 137634, 137640, 137646, 137651, 137657, 137663, 137669, 137675, 137681, + 137690, 137696, 137701, 137709, 137716, 137723, 137732, 137741, 137750, + 137759, 137768, 137777, 137786, 137795, 137805, 137815, 137823, 137831, + 137840, 137849, 137855, 137861, 137867, 137873, 137881, 137889, 137893, + 137899, 137904, 137910, 137916, 137922, 137928, 137934, 137943, 137948, + 137955, 137960, 137965, 137970, 137976, 137982, 137988, 137995, 138000, + 138005, 138010, 138015, 138020, 138026, 138032, 138038, 138044, 138050, + 138056, 138062, 138068, 138073, 138078, 138083, 138088, 138093, 138098, + 138103, 138108, 138114, 138120, 138125, 138130, 138135, 138140, 138145, + 138151, 138158, 138162, 138166, 138170, 138174, 138178, 138182, 138186, + 138190, 138198, 138208, 138212, 138216, 138222, 138228, 138234, 138240, + 138246, 138252, 138258, 138264, 138270, 138276, 138282, 138288, 138294, + 138300, 138304, 138308, 138315, 138321, 138327, 138333, 138338, 138345, + 138350, 138356, 138362, 138368, 138374, 138379, 138383, 138389, 138393, + 138397, 138401, 138407, 138413, 138417, 138423, 138429, 138435, 138441, + 138447, 138455, 138463, 138469, 138475, 138481, 138487, 138499, 138511, + 138525, 138537, 138549, 138563, 138577, 138591, 138595, 138603, 138611, + 138616, 138620, 138624, 138628, 138632, 138636, 138640, 138644, 138650, + 138656, 138662, 138668, 138676, 138685, 138692, 138699, 138707, 138714, + 138726, 138738, 138750, 138762, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 138769, 138776, 138783, 138790, 138797, + 138804, 138811, 138818, 138825, 138832, 138839, 138846, 138853, 138860, + 138867, 138874, 138881, 138888, 138895, 138902, 138909, 138916, 138923, + 138930, 138937, 138944, 138951, 138958, 138965, 138972, 138979, 138986, + 138993, 139000, 139007, 139014, 139021, 139028, 139035, 139042, 139049, + 139056, 139063, 139070, 139077, 139084, 139091, 139098, 139105, 139112, + 139119, 139126, 139133, 139140, 139147, 139154, 139161, 139168, 139175, + 139182, 139189, 139196, 139203, 139210, 139217, 139224, 139231, 139236, + 139241, 139246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 129956, 129960, 129964, 129968, 129972, 129976, - 129980, 129983, 129987, 129991, 129995, 129999, 130002, 130008, 130013, - 130019, 130025, 130030, 130034, 130040, 130044, 130048, 130054, 130058, - 130062, 130066, 130070, 130074, 130078, 130081, 130087, 130093, 130099, - 130105, 130112, 130119, 130126, 130136, 130143, 130150, 130155, 130160, - 130165, 130170, 130177, 130184, 130191, 130198, 130207, 130213, 130220, - 130226, 130233, 130239, 130246, 130251, 130258, 130262, 130266, 130271, - 130277, 130283, 130290, 130297, 130303, 130310, 130313, 130319, 130323, - 130326, 130330, 130333, 130336, 130340, 130345, 130349, 130353, 130359, - 130364, 130370, 130374, 130378, 130381, 130385, 130389, 130394, 130398, - 130403, 130407, 130412, 130416, 130420, 130424, 130428, 130432, 130436, - 130440, 130444, 130449, 130454, 130459, 130464, 130470, 130476, 130482, - 130488, 130494, 0, 0, 0, 0, 0, 130499, 130507, 130516, 130524, 130531, - 130539, 130546, 130553, 130562, 130569, 130576, 130583, 130591, 0, 0, 0, - 130599, 130604, 130611, 130617, 130624, 130630, 130636, 130642, 130648, - 0, 0, 0, 0, 0, 0, 0, 130654, 130659, 130666, 130672, 130679, 130685, - 130691, 130697, 130703, 130709, 0, 0, 130714, 130720, 130726, 130729, - 130738, 130745, 130753, 130760, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 139250, 139255, 139262, 139269, 139276, 139283, 139288, 139293, 139300, + 139305, 139310, 139317, 139322, 139327, 139332, 139339, 139348, 139353, + 139358, 139363, 139368, 139373, 139378, 139385, 139390, 139395, 139400, + 139405, 139410, 139415, 139420, 139425, 139430, 139435, 139440, 139445, + 139451, 139456, 139461, 139466, 139471, 139476, 139481, 139486, 139491, + 139496, 139505, 139510, 139519, 139524, 139529, 139534, 139539, 139544, + 139549, 139554, 139563, 139568, 139573, 139578, 139583, 139588, 139595, + 139600, 139607, 139612, 139617, 139622, 139627, 139632, 139637, 139642, + 139647, 139652, 139657, 139662, 139667, 139672, 139677, 139682, 139687, + 139692, 139697, 139702, 139711, 139716, 139721, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 139726, 139734, 139742, 139750, 139758, 139766, 139774, 139783, + 139791, 139800, 139808, 139816, 139824, 139832, 139840, 139848, 139857, + 139865, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 130767, 130772, 130777, 130782, 130789, 130796, 130803, - 130810, 130815, 130820, 130825, 130830, 130837, 130842, 130849, 130856, - 130861, 130866, 130871, 130878, 130883, 130888, 130895, 130902, 130907, - 130912, 130917, 130924, 130931, 130938, 130943, 130948, 130955, 130962, - 130969, 130976, 130981, 130986, 130991, 130998, 131003, 131008, 131013, - 131020, 131029, 131036, 131041, 131046, 131051, 131056, 131061, 131066, - 131075, 131082, 131087, 131094, 131101, 131106, 131111, 131116, 131123, - 131128, 131135, 131142, 131147, 131152, 131157, 131164, 131171, 131176, - 131181, 131188, 131195, 131202, 131207, 131212, 131217, 131222, 131229, - 131238, 131247, 131252, 131259, 131268, 131273, 131278, 131283, 131288, - 131295, 131302, 131309, 131316, 131321, 131326, 131331, 131338, 131345, - 131352, 131357, 131362, 131369, 131374, 131381, 131386, 131393, 131398, - 131405, 131412, 131417, 131422, 131427, 131432, 131437, 131442, 131447, - 131452, 131457, 131464, 131471, 131478, 131485, 131492, 131501, 131506, - 131511, 131518, 131525, 131530, 131537, 131544, 131551, 131558, 131565, - 131572, 131577, 131582, 131587, 131592, 131597, 131606, 131615, 131624, - 131633, 131642, 131651, 131660, 131669, 131674, 131685, 131696, 131705, - 131710, 131715, 131720, 131725, 131734, 131741, 131748, 131755, 131762, - 131769, 131776, 131785, 131794, 131805, 131814, 131825, 131834, 131841, - 131850, 131861, 131870, 131879, 131888, 131897, 131904, 131911, 131918, - 131927, 131936, 131947, 131956, 131965, 131976, 131981, 131986, 131997, - 132005, 132014, 132023, 132032, 132043, 132052, 132061, 132072, 132083, - 132094, 132105, 132116, 132127, 132134, 132141, 132148, 132155, 132166, - 132175, 132182, 132189, 132196, 132207, 132218, 132229, 132240, 132251, - 132262, 132273, 132284, 132291, 132298, 132307, 132316, 132323, 132330, - 132337, 132346, 132355, 132364, 132371, 132380, 132389, 132398, 132405, - 132412, 132417, 132423, 132430, 132437, 132444, 132451, 132458, 132465, - 132474, 132483, 132492, 132501, 132508, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132517, 132523, 132528, 132533, 132540, 132546, 132552, 132558, 132564, - 132570, 132576, 132582, 132586, 132590, 132596, 132602, 132608, 132612, - 132617, 132622, 132626, 132630, 132633, 132639, 132645, 132651, 132657, - 132663, 132669, 132675, 132681, 132687, 132697, 132707, 132713, 132719, - 132729, 132739, 132745, 0, 0, 132751, 132759, 132764, 132769, 132775, - 132781, 132787, 132793, 132799, 132805, 132812, 132819, 132825, 132831, - 132837, 132843, 132849, 132855, 132861, 132867, 132872, 132878, 132884, - 132890, 132896, 132902, 132911, 132917, 132922, 132930, 132937, 132944, - 132953, 132962, 132971, 132980, 132989, 132998, 133007, 133016, 133026, - 133036, 133044, 133052, 133061, 133070, 133076, 133082, 133088, 133094, - 133102, 133110, 133114, 133120, 133125, 133131, 133137, 133143, 133149, - 133155, 133164, 133169, 133176, 133181, 133186, 133191, 133197, 133203, - 133209, 133216, 133221, 133226, 133231, 133236, 133241, 133247, 133253, - 133259, 133265, 133271, 133277, 133283, 133289, 133294, 133299, 133304, - 133309, 133314, 133319, 133324, 133329, 133335, 133341, 133346, 133351, - 133356, 133361, 133366, 133372, 133379, 133383, 133387, 133391, 133395, - 133399, 133403, 133407, 133411, 133419, 133429, 133433, 133437, 133443, - 133449, 133455, 133461, 133467, 133473, 133479, 133485, 133491, 133497, - 133503, 133509, 133515, 133521, 133525, 133529, 133536, 133542, 133548, - 133554, 133559, 133566, 133571, 133577, 133583, 133589, 133595, 133600, - 133604, 133610, 133614, 133618, 133622, 133628, 133634, 133638, 133644, - 133650, 133656, 133662, 133668, 133676, 133684, 133690, 133696, 133702, - 133708, 133720, 133732, 133746, 133758, 133770, 133784, 133798, 133812, - 133816, 133824, 133832, 133837, 133841, 133845, 133849, 133853, 133857, - 133861, 133865, 133871, 133877, 133883, 133889, 133897, 133906, 133913, - 133920, 133928, 133935, 133947, 133959, 133971, 133983, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 133990, 133997, - 134004, 134011, 134018, 134025, 134032, 134039, 134046, 134053, 134060, - 134067, 134074, 134081, 134088, 134095, 134102, 134109, 134116, 134123, - 134130, 134137, 134144, 134151, 134158, 134165, 134172, 134179, 134186, - 134193, 134200, 134207, 134214, 134221, 134228, 134235, 134242, 134249, - 134256, 134263, 134270, 134277, 134284, 134291, 134298, 134305, 134312, - 134319, 134326, 134333, 134340, 134347, 134354, 134361, 134368, 134375, - 134382, 134389, 134396, 134403, 134410, 134417, 134424, 134431, 134438, - 134445, 134452, 134457, 134462, 134467, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 139874, 139878, 139883, 139888, 139893, 139897, 139902, 139907, 139912, + 139916, 139921, 139926, 139930, 139935, 139940, 139944, 139949, 139954, + 139958, 139963, 139968, 139972, 139977, 139982, 139987, 139992, 139997, + 140001, 140006, 140011, 140016, 140020, 140025, 140030, 140035, 140039, + 140044, 140049, 140053, 140058, 140063, 140067, 140072, 140077, 140081, + 140086, 140091, 140095, 140100, 140105, 140110, 140115, 140120, 140124, + 140129, 140134, 140139, 140143, 140148, 140153, 140158, 140162, 140167, + 140172, 140176, 140181, 140186, 140190, 140195, 140200, 140204, 140209, + 140214, 140218, 140223, 140228, 140233, 140238, 140243, 140247, 140252, + 140257, 140262, 140266, 140271, 0, 140276, 140280, 140285, 140290, + 140294, 140299, 140304, 140308, 140313, 140318, 140322, 140327, 140332, + 140336, 140341, 140346, 140351, 140356, 140361, 140366, 140372, 140378, + 140384, 140389, 140395, 140401, 140407, 140412, 140418, 140424, 140429, + 140435, 140441, 140446, 140452, 140458, 140463, 140469, 140475, 140480, + 140486, 140492, 140498, 140504, 140510, 140515, 140521, 140527, 140533, + 140538, 140544, 140550, 140556, 140561, 140567, 140573, 140578, 140584, + 140590, 140595, 140601, 140607, 140612, 140618, 140624, 140629, 140635, + 140641, 140647, 140653, 140659, 0, 140663, 140668, 0, 0, 140673, 0, 0, + 140678, 140683, 0, 0, 140688, 140693, 140697, 140702, 0, 140707, 140712, + 140717, 140721, 140726, 140731, 140736, 140741, 140746, 140750, 140755, + 140760, 0, 140765, 0, 140770, 140775, 140779, 140784, 140789, 140793, + 140798, 0, 140803, 140808, 140813, 140817, 140822, 140827, 140831, + 140836, 140841, 140846, 140851, 140856, 140861, 140867, 140873, 140879, + 140884, 140890, 140896, 140902, 140907, 140913, 140919, 140924, 140930, + 140936, 140941, 140947, 140953, 140958, 140964, 140970, 140975, 140981, + 140987, 140993, 140999, 141005, 141010, 141016, 141022, 141028, 141033, + 141039, 141045, 141051, 141056, 141062, 141068, 141073, 141079, 141085, + 141090, 141096, 141102, 141107, 141113, 141119, 141124, 141130, 141136, + 141142, 141148, 141154, 141158, 0, 141163, 141168, 141172, 141177, 0, 0, + 141182, 141187, 141192, 141196, 141201, 141206, 141210, 141215, 0, + 141220, 141225, 141230, 141234, 141239, 141244, 141249, 0, 141254, + 141258, 141263, 141268, 141273, 141277, 141282, 141287, 141292, 141296, + 141301, 141306, 141310, 141315, 141320, 141324, 141329, 141334, 141338, + 141343, 141348, 141352, 141357, 141362, 141367, 141372, 141377, 141381, + 0, 141386, 141391, 141395, 141400, 0, 141405, 141409, 141414, 141419, + 141423, 0, 141428, 0, 0, 0, 141432, 141437, 141442, 141446, 141451, + 141456, 141461, 0, 141466, 141470, 141475, 141480, 141485, 141489, + 141494, 141499, 141504, 141508, 141513, 141518, 141522, 141527, 141532, + 141536, 141541, 141546, 141550, 141555, 141560, 141564, 141569, 141574, + 141579, 141584, 141589, 141594, 141600, 141606, 141612, 141617, 141623, + 141629, 141635, 141640, 141646, 141652, 141657, 141663, 141669, 141674, + 141680, 141686, 141691, 141697, 141703, 141708, 141714, 141720, 141726, + 141732, 141738, 141743, 141749, 141755, 141761, 141766, 141772, 141778, + 141784, 141789, 141795, 141801, 141806, 141812, 141818, 141823, 141829, + 141835, 141840, 141846, 141852, 141857, 141863, 141869, 141875, 141881, + 141887, 141891, 141896, 141901, 141906, 141910, 141915, 141920, 141925, + 141929, 141934, 141939, 141943, 141948, 141953, 141957, 141962, 141967, + 141971, 141976, 141981, 141985, 141990, 141995, 142000, 142005, 142010, + 142014, 142019, 142024, 142029, 142033, 142038, 142043, 142048, 142052, + 142057, 142062, 142066, 142071, 142076, 142080, 142085, 142090, 142094, + 142099, 142104, 142108, 142113, 142118, 142123, 142128, 142133, 142138, + 142144, 142150, 142156, 142161, 142167, 142173, 142179, 142184, 142190, + 142196, 142201, 142207, 142213, 142218, 142224, 142230, 142235, 142241, + 142247, 142252, 142258, 142264, 142270, 142276, 142282, 142287, 142293, + 142299, 142305, 142310, 142316, 142322, 142328, 142333, 142339, 142345, + 142350, 142356, 142362, 142367, 142373, 142379, 142384, 142390, 142396, + 142401, 142407, 142413, 142419, 142425, 142431, 142436, 142442, 142448, + 142454, 142459, 142465, 142471, 142477, 142482, 142488, 142494, 142499, + 142505, 142511, 142516, 142522, 142528, 142533, 142539, 142545, 142550, + 142556, 142562, 142568, 142574, 142580, 142585, 142591, 142597, 142603, + 142608, 142614, 142620, 142626, 142631, 142637, 142643, 142648, 142654, + 142660, 142665, 142671, 142677, 142682, 142688, 142694, 142699, 142705, + 142711, 142717, 142723, 142729, 142735, 142742, 142749, 142756, 142762, + 142769, 142776, 142783, 142789, 142796, 142803, 142809, 142816, 142823, + 142829, 142836, 142843, 142849, 142856, 142863, 142869, 142876, 142883, + 142890, 142897, 142904, 142910, 142917, 142924, 142931, 142937, 142944, + 142951, 142958, 142964, 142971, 142978, 142984, 142991, 142998, 143004, + 143011, 143018, 143024, 143031, 143038, 143044, 143051, 143058, 143065, + 143072, 143079, 143084, 143090, 143096, 143102, 143107, 143113, 143119, + 143125, 143130, 143136, 143142, 143147, 143153, 143159, 143164, 143170, + 143176, 143181, 143187, 143193, 143198, 143204, 143210, 143216, 143222, + 143228, 143233, 143239, 143245, 143251, 143256, 143262, 143268, 143274, + 143279, 143285, 143291, 143296, 143302, 143308, 143313, 143319, 143325, + 143330, 143336, 143342, 143347, 143353, 143359, 143365, 143371, 143377, + 143383, 0, 0, 143390, 143395, 143400, 143405, 143410, 143415, 143420, + 143425, 143430, 143435, 143440, 143445, 143450, 143455, 143460, 143465, + 143470, 143475, 143481, 143486, 143491, 143496, 143501, 143506, 143511, + 143516, 143520, 143525, 143530, 143535, 143540, 143545, 143550, 143555, + 143560, 143565, 143570, 143575, 143580, 143585, 143590, 143595, 143600, + 143605, 143611, 143616, 143621, 143626, 143631, 143636, 143641, 143646, + 143652, 143657, 143662, 143667, 143672, 143677, 143682, 143687, 143692, + 143697, 143702, 143707, 143712, 143717, 143722, 143727, 143732, 143737, + 143742, 143747, 143752, 143757, 143762, 143767, 143773, 143778, 143783, + 143788, 143793, 143798, 143803, 143808, 143812, 143817, 143822, 143827, + 143832, 143837, 143842, 143847, 143852, 143857, 143862, 143867, 143872, + 143877, 143882, 143887, 143892, 143897, 143903, 143908, 143913, 143918, + 143923, 143928, 143933, 143938, 143944, 143949, 143954, 143959, 143964, + 143969, 143974, 143980, 143986, 143992, 143998, 144004, 144010, 144016, + 144022, 144028, 144034, 144040, 144046, 144052, 144058, 144064, 144070, + 144076, 144083, 144089, 144095, 144101, 144107, 144113, 144119, 144125, + 144130, 144136, 144142, 144148, 144154, 144160, 144166, 144172, 144178, + 144184, 144190, 144196, 144202, 144208, 144214, 144220, 144226, 144232, + 144239, 144245, 144251, 144257, 144263, 144269, 144275, 144281, 144288, + 144294, 144300, 144306, 144312, 144318, 144324, 144330, 144336, 144342, + 144348, 144354, 144360, 144366, 144372, 144378, 144384, 144390, 144396, + 144402, 144408, 144414, 144420, 144426, 144433, 144439, 144445, 144451, + 144457, 144463, 144469, 144475, 144480, 144486, 144492, 144498, 144504, + 144510, 144516, 144522, 144528, 144534, 144540, 144546, 144552, 144558, + 144564, 144570, 144576, 144582, 144589, 144595, 144601, 144607, 144613, + 144619, 144625, 144631, 144638, 144644, 144650, 144656, 144662, 144668, + 144674, 144681, 144688, 144695, 144702, 144709, 144716, 144723, 144730, + 144737, 144744, 144751, 144758, 144765, 144772, 144779, 144786, 144793, + 144801, 144808, 144815, 144822, 144829, 144836, 144843, 144850, 144856, + 144863, 144870, 144877, 144884, 144891, 144898, 144905, 144912, 144919, + 144926, 144933, 144940, 144947, 144954, 144961, 144968, 144975, 144983, + 144990, 144997, 145004, 145011, 145018, 145025, 145032, 145040, 145047, + 145054, 145061, 145068, 145075, 145082, 145087, 0, 0, 145092, 145097, + 145101, 145105, 145109, 145113, 145117, 145121, 145126, 145130, 145135, + 145140, 145144, 145148, 145152, 145156, 145160, 145164, 145169, 145173, + 145178, 145183, 145187, 145191, 145195, 145199, 145203, 145207, 145212, + 145216, 145221, 145227, 145232, 145237, 145242, 145247, 145252, 145257, + 145263, 145268, 145274, 145280, 145285, 145290, 145295, 145300, 145305, + 145310, 145316, 145321, 145327, 145331, 145336, 145341, 145346, 145351, + 145356, 145361, 145367, 145375, 145382, 145387, 145392, 145399, 145405, + 145410, 145416, 145422, 145430, 145436, 145443, 145451, 145457, 145466, + 145475, 145483, 145491, 145497, 145504, 145512, 145520, 145526, 145533, + 145542, 145551, 145558, 145569, 145579, 145589, 145599, 145609, 145616, + 145623, 145630, 145637, 145646, 145655, 145666, 145677, 145686, 145695, + 145706, 145715, 145724, 145735, 145744, 145753, 145761, 145769, 145780, + 145791, 145799, 145808, 145817, 145824, 145835, 145846, 145855, 145864, + 145871, 145880, 145889, 145898, 145909, 145918, 145928, 145937, 145946, + 145957, 145970, 145985, 145996, 146009, 146021, 146030, 146041, 146052, + 146061, 146072, 146086, 146101, 146104, 146113, 146118, 146124, 146132, + 146138, 146144, 146153, 146160, 146170, 146182, 146189, 146192, 146198, + 146205, 146211, 146216, 146219, 146224, 146227, 146234, 146240, 146248, + 146255, 146262, 146268, 146273, 146276, 146279, 146282, 146288, 146295, + 146301, 146306, 146313, 146316, 146321, 146328, 146334, 146342, 146349, + 146359, 146368, 146371, 146377, 146384, 146391, 146398, 146403, 146411, + 146419, 146428, 146434, 146443, 146452, 146461, 146467, 146476, 146483, + 146490, 146497, 146505, 146511, 146519, 146525, 146532, 146539, 146547, + 146558, 146568, 146574, 146581, 146588, 146595, 146601, 146608, 146615, + 146620, 146627, 146635, 146644, 146650, 146662, 146673, 146679, 146687, + 146693, 146700, 146707, 146714, 146720, 146727, 146736, 146742, 146748, + 146755, 146762, 146770, 146780, 146790, 146800, 146810, 146818, 146826, + 146836, 146844, 146849, 146854, 146859, 146865, 146872, 146879, 146885, + 146891, 146896, 146903, 146911, 146921, 146929, 146937, 146947, 146957, + 146965, 146975, 146985, 146997, 147009, 147021, 147031, 147037, 147043, + 147050, 147059, 147068, 147077, 147086, 147096, 147105, 147114, 147123, + 147128, 147134, 147143, 147153, 147162, 147168, 147174, 147181, 147188, + 147195, 147201, 147208, 147215, 147222, 147228, 147232, 147237, 147244, + 147251, 147258, 147263, 147271, 147279, 147288, 147296, 147303, 147311, + 147320, 147330, 147333, 147337, 147342, 147347, 147352, 147357, 147362, + 147367, 147372, 147377, 147382, 147387, 147392, 147397, 147402, 147407, + 147412, 147417, 147422, 147429, 147435, 147442, 147448, 147453, 147460, + 147466, 147473, 147479, 147484, 147491, 147498, 147505, 147511, 147517, + 147526, 147535, 147546, 147553, 147560, 147569, 147578, 147587, 147596, + 147605, 147611, 147619, 147625, 147635, 147640, 147649, 147658, 147665, + 147676, 147683, 147690, 147697, 147704, 147711, 147718, 147725, 147732, + 147739, 147746, 147752, 147758, 147764, 147771, 147778, 147785, 147792, + 147799, 147806, 147813, 147820, 147827, 147834, 147841, 147848, 147853, + 147862, 147871, 147880, 147887, 147894, 147901, 147908, 147915, 147922, + 147929, 147936, 147945, 147954, 147963, 147972, 147981, 147990, 147999, + 148008, 148017, 148026, 148035, 148044, 148053, 148059, 148067, 148073, + 148083, 148088, 148097, 148106, 148115, 148126, 148131, 148138, 148145, + 148152, 148157, 148163, 148169, 148175, 148182, 148189, 148196, 148203, + 148210, 148217, 148224, 148231, 148238, 148245, 148252, 148259, 148264, + 148273, 148282, 148291, 148300, 148309, 148318, 148327, 148336, 148347, + 148358, 148365, 148372, 148379, 148386, 148393, 148400, 148408, 148418, + 148428, 148438, 148449, 148460, 148471, 148480, 148489, 148498, 148503, + 148508, 148513, 148518, 148529, 148540, 148551, 148562, 148573, 148583, + 148594, 148603, 148612, 148621, 148630, 148639, 148647, 148656, 148667, + 148678, 148689, 148700, 148711, 148723, 148736, 148748, 148761, 148773, + 148786, 148798, 148811, 148822, 148833, 148842, 148850, 148859, 148870, + 148881, 148893, 148906, 148920, 148935, 148947, 148960, 148972, 148985, + 148996, 149007, 149016, 149024, 149033, 149040, 149047, 149054, 149061, + 149068, 149075, 149082, 149089, 149096, 149103, 149108, 149113, 149118, + 149125, 149135, 149146, 149156, 149167, 149181, 149196, 149211, 149225, + 149240, 149255, 149266, 149277, 149290, 149303, 149312, 149321, 149334, + 149347, 149354, 149361, 149366, 149371, 149376, 149381, 149386, 149393, + 149402, 149407, 149410, 149415, 149422, 149429, 149436, 149443, 149450, + 149457, 149470, 149484, 149499, 149506, 149513, 149520, 149529, 149537, + 149545, 149554, 149559, 149564, 149569, 149574, 149579, 149584, 149591, + 149598, 149604, 149611, 149617, 149624, 149629, 149634, 149639, 149644, + 149649, 149656, 149663, 149668, 149675, 149682, 149687, 149692, 149697, + 149702, 149707, 149712, 149719, 149726, 149733, 149736, 149741, 149746, + 149751, 149756, 149763, 149770, 149778, 149786, 149791, 149796, 149803, + 149810, 149817, 149822, 149829, 149836, 149841, 149848, 149855, 149861, + 149867, 149873, 149879, 149887, 149895, 149901, 149909, 149917, 149922, + 149929, 149936, 149941, 149948, 149955, 149962, 149970, 149978, 149983, + 149990, 149997, 150006, 150013, 150022, 150033, 150042, 150051, 150060, + 150069, 150072, 150077, 150084, 150093, 150100, 150109, 150116, 150121, + 150126, 150129, 150132, 150135, 150142, 150149, 150158, 150167, 150176, + 150183, 150190, 150195, 150208, 150213, 150218, 150223, 150228, 150233, + 150238, 150243, 150248, 150251, 150256, 150261, 150266, 150271, 150276, + 150283, 150288, 150295, 150298, 150303, 150306, 150309, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 150312, 150317, 150322, 150327, 150332, 0, + 150337, 150342, 150347, 150352, 150357, 150362, 150367, 150372, 150377, + 150382, 150387, 150392, 150397, 150402, 150407, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 150412, 150417, 150422, 150427, 150432, 150437, 150442, 0, 150447, + 150452, 150457, 150463, 150467, 150472, 150477, 150482, 150487, 150492, + 150497, 150502, 150507, 150512, 150517, 150522, 150527, 0, 0, 150532, + 150537, 150542, 150547, 150552, 150557, 150562, 0, 150567, 150572, 0, + 150578, 150583, 150591, 150598, 150607, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 134471, 134476, 134483, 134490, 134497, 134504, - 134509, 134514, 134521, 134526, 134531, 134538, 134543, 134548, 134553, - 134560, 134569, 134574, 134579, 134584, 134589, 134594, 134599, 134606, - 134611, 134616, 134621, 134626, 134631, 134636, 134641, 134646, 134651, - 134656, 134661, 134666, 134672, 134677, 134682, 134687, 134692, 134697, - 134702, 134707, 134712, 134717, 134726, 134731, 134740, 134745, 134750, - 134755, 134760, 134765, 134770, 134775, 134784, 134789, 134794, 134799, - 134804, 134809, 134816, 134821, 134828, 134833, 134838, 134843, 134848, - 134853, 134858, 134863, 134868, 134873, 134878, 134883, 134888, 134893, - 134898, 134903, 134908, 134913, 134918, 134923, 134932, 134937, 134942, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 134947, 134955, 134963, 134971, 134979, - 134987, 134995, 135004, 135012, 135021, 135029, 135037, 135045, 135053, - 135061, 135069, 135078, 135086, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 135095, 135099, 135104, 135109, 135114, 135118, - 135123, 135128, 135133, 135137, 135142, 135147, 135151, 135156, 135161, - 135165, 135170, 135175, 135179, 135183, 135188, 135192, 135197, 135202, - 135207, 135212, 135217, 135221, 135226, 135231, 135236, 135240, 135245, - 135250, 135255, 135259, 135264, 135269, 135273, 135278, 135283, 135287, - 135292, 135297, 135301, 135305, 135310, 135314, 135319, 135324, 135329, - 135334, 135339, 135343, 135348, 135353, 135358, 135362, 135367, 135372, - 135377, 135381, 135386, 135391, 135395, 135400, 135405, 135409, 135414, - 135419, 135423, 135427, 135432, 135436, 135441, 135446, 135451, 135456, - 135461, 135465, 135470, 135475, 135480, 135484, 135489, 0, 135494, - 135498, 135503, 135508, 135512, 135517, 135522, 135526, 135531, 135536, - 135540, 135544, 135549, 135553, 135558, 135563, 135568, 135573, 135578, - 135583, 135589, 135595, 135601, 135606, 135612, 135618, 135624, 135629, - 135635, 135641, 135646, 135652, 135658, 135663, 135669, 135675, 135680, - 135685, 135691, 135696, 135702, 135708, 135714, 135720, 135726, 135731, - 135737, 135743, 135749, 135754, 135760, 135766, 135772, 135777, 135783, - 135789, 135794, 135800, 135806, 135811, 135817, 135823, 135828, 135833, - 135839, 135844, 135850, 135856, 135862, 135868, 135874, 0, 135878, - 135883, 0, 0, 135888, 0, 0, 135893, 135898, 0, 0, 135903, 135908, 135912, - 135917, 0, 135922, 135926, 135931, 135935, 135940, 135945, 135950, - 135955, 135960, 135964, 135969, 135974, 0, 135979, 0, 135984, 135989, - 135993, 135998, 136003, 136007, 136012, 0, 136017, 136022, 136027, - 136031, 136035, 136040, 136044, 136049, 136054, 136059, 136064, 136069, - 136074, 136080, 136086, 136092, 136097, 136103, 136109, 136115, 136120, - 136126, 136132, 136137, 136143, 136149, 136154, 136160, 136166, 136171, - 136176, 136182, 136187, 136193, 136199, 136205, 136211, 136217, 136222, - 136228, 136234, 136240, 136245, 136251, 136257, 136263, 136268, 136274, - 136280, 136285, 136291, 136297, 136302, 136308, 136314, 136319, 136324, - 136330, 136335, 136341, 136347, 136353, 136359, 136365, 136369, 0, - 136374, 136379, 136383, 136388, 0, 0, 136393, 136398, 136403, 136407, - 136412, 136417, 136421, 136426, 0, 136431, 136435, 136440, 136444, - 136449, 136454, 136459, 0, 136464, 136468, 136473, 136478, 136483, - 136487, 136492, 136497, 136502, 136506, 136511, 136516, 136520, 136525, - 136530, 136534, 136539, 136544, 136548, 136552, 136557, 136561, 136566, - 136571, 136576, 136581, 136586, 136590, 0, 136595, 136600, 136604, - 136609, 0, 136614, 136618, 136623, 136628, 136632, 0, 136637, 0, 0, 0, - 136641, 136645, 136650, 136654, 136659, 136664, 136669, 0, 136674, - 136678, 136683, 136688, 136693, 136697, 136702, 136707, 136712, 136716, - 136721, 136726, 136730, 136735, 136740, 136744, 136749, 136754, 136758, - 136762, 136767, 136771, 136776, 136781, 136786, 136791, 136796, 136801, - 136807, 136813, 136819, 136824, 136830, 136836, 136842, 136847, 136853, - 136859, 136864, 136870, 136876, 136881, 136887, 136893, 136898, 136903, - 136909, 136914, 136920, 136926, 136932, 136938, 136944, 136949, 136955, - 136961, 136967, 136972, 136978, 136984, 136990, 136995, 137001, 137007, - 137012, 137018, 137024, 137029, 137035, 137041, 137046, 137051, 137057, - 137062, 137068, 137074, 137080, 137086, 137092, 137096, 137101, 137106, - 137111, 137115, 137120, 137125, 137130, 137134, 137139, 137144, 137148, - 137153, 137158, 137162, 137167, 137172, 137176, 137180, 137185, 137189, - 137194, 137199, 137204, 137209, 137214, 137218, 137223, 137228, 137233, - 137237, 137242, 137247, 137252, 137256, 137261, 137266, 137270, 137275, - 137280, 137284, 137289, 137294, 137298, 137302, 137307, 137311, 137316, - 137321, 137326, 137331, 137336, 137341, 137347, 137353, 137359, 137364, - 137370, 137376, 137382, 137387, 137393, 137399, 137404, 137410, 137416, - 137421, 137427, 137433, 137438, 137443, 137449, 137454, 137460, 137466, - 137472, 137478, 137484, 137489, 137495, 137501, 137507, 137512, 137518, - 137524, 137530, 137535, 137541, 137547, 137552, 137558, 137564, 137569, - 137575, 137581, 137586, 137591, 137597, 137602, 137608, 137614, 137620, - 137626, 137632, 137637, 137643, 137649, 137655, 137660, 137666, 137672, - 137678, 137683, 137689, 137695, 137700, 137706, 137712, 137717, 137723, - 137729, 137734, 137739, 137745, 137750, 137756, 137762, 137768, 137774, - 137780, 137785, 137791, 137797, 137803, 137808, 137814, 137820, 137826, - 137831, 137837, 137843, 137848, 137854, 137860, 137865, 137871, 137877, - 137882, 137887, 137893, 137898, 137904, 137910, 137916, 137922, 137928, - 137934, 137941, 137948, 137955, 137961, 137968, 137975, 137982, 137988, - 137995, 138002, 138008, 138015, 138022, 138028, 138035, 138042, 138048, - 138054, 138061, 138067, 138074, 138081, 138088, 138095, 138102, 138108, - 138115, 138122, 138129, 138135, 138142, 138149, 138156, 138162, 138169, - 138176, 138182, 138189, 138196, 138202, 138209, 138216, 138222, 138228, - 138235, 138241, 138248, 138255, 138262, 138269, 138276, 138281, 138287, - 138293, 138299, 138304, 138310, 138316, 138322, 138327, 138333, 138339, - 138344, 138350, 138356, 138361, 138367, 138373, 138378, 138383, 138389, - 138394, 138400, 138406, 138412, 138418, 138424, 138429, 138435, 138441, - 138447, 138452, 138458, 138464, 138470, 138475, 138481, 138487, 138492, - 138498, 138504, 138509, 138515, 138521, 138526, 138531, 138537, 138542, - 138548, 138554, 138560, 138566, 138572, 138578, 0, 0, 138585, 138590, - 138595, 138600, 138605, 138610, 138615, 138620, 138625, 138630, 138635, - 138640, 138645, 138650, 138655, 138660, 138665, 138670, 138676, 138681, - 138686, 138691, 138696, 138701, 138706, 138711, 138715, 138720, 138725, - 138730, 138735, 138740, 138745, 138750, 138755, 138760, 138765, 138770, - 138775, 138780, 138785, 138790, 138795, 138800, 138806, 138811, 138816, - 138821, 138826, 138831, 138836, 138841, 138847, 138852, 138857, 138862, - 138867, 138872, 138877, 138882, 138887, 138892, 138897, 138902, 138907, - 138912, 138917, 138922, 138927, 138932, 138937, 138942, 138947, 138952, - 138957, 138962, 138968, 138973, 138978, 138983, 138988, 138993, 138998, - 139003, 139007, 139012, 139017, 139022, 139027, 139032, 139037, 139042, - 139047, 139052, 139057, 139062, 139067, 139072, 139077, 139082, 139087, - 139092, 139098, 139103, 139108, 139113, 139118, 139123, 139128, 139133, - 139139, 139144, 139149, 139154, 139159, 139164, 139169, 139175, 139181, - 139187, 139193, 139199, 139205, 139211, 139217, 139223, 139229, 139235, - 139241, 139247, 139253, 139259, 139265, 139271, 139278, 139284, 139290, - 139296, 139302, 139308, 139314, 139320, 139325, 139331, 139337, 139343, - 139349, 139355, 139361, 139367, 139373, 139379, 139385, 139391, 139397, - 139403, 139409, 139415, 139421, 139427, 139434, 139440, 139446, 139452, - 139458, 139464, 139470, 139476, 139483, 139489, 139495, 139501, 139507, - 139513, 139519, 139525, 139531, 139537, 139543, 139549, 139555, 139561, - 139567, 139573, 139579, 139585, 139591, 139597, 139603, 139609, 139615, - 139621, 139628, 139634, 139640, 139646, 139652, 139658, 139664, 139670, - 139675, 139681, 139687, 139693, 139699, 139705, 139711, 139717, 139723, - 139729, 139735, 139741, 139747, 139753, 139759, 139765, 139771, 139777, - 139784, 139790, 139796, 139802, 139808, 139814, 139820, 139826, 139833, - 139839, 139845, 139851, 139857, 139863, 139869, 139876, 139883, 139890, - 139897, 139904, 139911, 139918, 139925, 139932, 139939, 139946, 139953, - 139960, 139967, 139974, 139981, 139988, 139996, 140003, 140010, 140017, - 140024, 140031, 140038, 140045, 140051, 140058, 140065, 140072, 140079, - 140086, 140093, 140100, 140107, 140114, 140121, 140128, 140135, 140142, - 140149, 140156, 140163, 140170, 140178, 140185, 140192, 140199, 140206, - 140213, 140220, 140227, 140235, 140242, 140249, 140256, 140263, 140270, - 140277, 140282, 0, 0, 140287, 140292, 140296, 140300, 140304, 140308, - 140312, 140316, 140321, 140325, 140330, 140335, 140339, 140343, 140347, - 140351, 140355, 140359, 140364, 140368, 140373, 140378, 140382, 140386, - 140390, 140394, 140398, 140402, 140407, 140411, 140416, 140422, 140427, - 140432, 140437, 140442, 140447, 140452, 140458, 140463, 140469, 140475, - 140480, 140485, 140490, 140495, 140500, 140505, 140511, 140516, 140522, - 140526, 140531, 140536, 140541, 140546, 140551, 140556, 140562, 140570, - 140577, 140582, 140587, 140594, 140600, 140605, 140611, 140617, 140625, - 140631, 140638, 140646, 140652, 140661, 140670, 140678, 140686, 140692, - 140699, 140707, 140715, 140721, 140728, 140737, 140746, 140753, 140764, - 140774, 140784, 140794, 140804, 140811, 140818, 140825, 140832, 140841, - 140850, 140861, 140872, 140881, 140890, 140901, 140910, 140919, 140930, - 140939, 140948, 140956, 140964, 140975, 140986, 140994, 141003, 141012, - 141019, 141030, 141041, 141050, 141059, 141066, 141075, 141084, 141093, - 141104, 141113, 141123, 141132, 141141, 141152, 141165, 141180, 141191, - 141204, 141216, 141225, 141236, 141247, 141256, 141267, 141281, 141296, - 141299, 141308, 141313, 141319, 141327, 141333, 141339, 141348, 141355, - 141365, 141377, 141384, 141387, 141393, 141400, 141406, 141411, 141414, - 141419, 141422, 141429, 141435, 141443, 141450, 141457, 141463, 141468, - 141471, 141474, 141477, 141483, 141490, 141496, 141501, 141508, 141511, - 141516, 141523, 141529, 141537, 141544, 141554, 141563, 141566, 141572, - 141579, 141586, 141593, 141598, 141606, 141614, 141623, 141629, 141638, - 141647, 141656, 141662, 141671, 141678, 141685, 141692, 141700, 141706, - 141714, 141720, 141727, 141734, 141742, 141753, 141763, 141769, 141776, - 141783, 141790, 141796, 141803, 141810, 141815, 141822, 141830, 141839, - 141845, 141857, 141868, 141874, 141882, 141888, 141895, 141902, 141909, - 141915, 141922, 141931, 141937, 141943, 141950, 141957, 141965, 141975, - 141985, 141995, 142005, 142013, 142021, 142031, 142039, 142044, 142049, - 142054, 142060, 142067, 142074, 142080, 142086, 142091, 142098, 142106, - 142116, 142124, 142132, 142142, 142152, 142160, 142170, 142180, 142192, - 142204, 142216, 142226, 142232, 142238, 142245, 142254, 142263, 142272, - 142281, 142291, 142300, 142309, 142318, 142323, 142329, 142338, 142348, - 142357, 142363, 142369, 142376, 142383, 142390, 142396, 142403, 142410, - 142417, 142423, 142427, 142432, 142439, 142446, 142453, 142458, 142466, - 142474, 142483, 142491, 142498, 142506, 142515, 142525, 142528, 142532, - 142537, 142542, 142547, 142552, 142557, 142562, 142567, 142572, 142577, - 142582, 142587, 142592, 142597, 142602, 142607, 142612, 142617, 142624, - 142630, 142637, 142643, 142648, 142655, 142661, 142668, 142674, 142679, - 142686, 142693, 142700, 142706, 142712, 142721, 142730, 142741, 142748, - 142755, 142764, 142773, 142782, 142791, 142800, 142806, 142814, 142820, - 142830, 142835, 142844, 142853, 142860, 142871, 142878, 142885, 142892, - 142899, 142906, 142913, 142920, 142927, 142934, 142941, 142947, 142953, - 142959, 142966, 142973, 142980, 142987, 142994, 143001, 143008, 143015, - 143022, 143029, 143036, 143043, 143048, 143057, 143066, 143075, 143082, - 143089, 143096, 143103, 143110, 143117, 143124, 143131, 143140, 143149, - 143158, 143167, 143176, 143185, 143194, 143203, 143212, 143221, 143230, - 143239, 143248, 143254, 143262, 143268, 143278, 143283, 143292, 143301, - 143310, 143321, 143326, 143333, 143340, 143347, 143352, 143358, 143364, - 143370, 143377, 143384, 143391, 143398, 143405, 143412, 143419, 143426, - 143433, 143440, 143447, 143454, 143459, 143468, 143477, 143486, 143495, - 143504, 143513, 143522, 143531, 143542, 143553, 143560, 143567, 143574, - 143581, 143588, 143595, 143603, 143613, 143623, 143633, 143644, 143655, - 143666, 143675, 143684, 143693, 143698, 143703, 143708, 143713, 143724, - 143735, 143746, 143757, 143768, 143778, 143789, 143798, 143807, 143816, - 143825, 143834, 143842, 143851, 143862, 143873, 143884, 143895, 143906, - 143918, 143931, 143943, 143956, 143968, 143981, 143993, 144006, 144017, - 144028, 144037, 144045, 144054, 144065, 144076, 144088, 144101, 144115, - 144130, 144142, 144155, 144167, 144180, 144191, 144202, 144211, 144219, - 144228, 144235, 144242, 144249, 144256, 144263, 144270, 144277, 144284, - 144291, 144298, 144303, 144308, 144313, 144320, 144330, 144341, 144351, - 144362, 144376, 144391, 144406, 144420, 144435, 144450, 144461, 144472, - 144485, 144498, 144507, 144516, 144529, 144542, 144549, 144556, 144561, - 144566, 144571, 144576, 144581, 144588, 144597, 144602, 144605, 144610, - 144617, 144624, 144631, 144638, 144645, 144652, 144665, 144679, 144694, - 144701, 144708, 144715, 144724, 144732, 144740, 144749, 144754, 144759, - 144764, 144769, 144774, 144779, 144786, 144793, 144799, 144806, 144812, - 144819, 144824, 144829, 144834, 144839, 144844, 144851, 144858, 144863, - 144870, 144877, 144882, 144887, 144892, 144897, 144902, 144907, 144914, - 144921, 144928, 144931, 144936, 144941, 144946, 144951, 144958, 144965, - 144973, 144981, 144986, 144991, 144998, 145005, 145012, 145017, 145024, - 145031, 145036, 145043, 145050, 145056, 145062, 145068, 145074, 145082, - 145090, 145096, 145104, 145112, 145117, 145124, 145131, 145136, 145143, - 145150, 145157, 145165, 145173, 145178, 145185, 145192, 145201, 145208, - 145217, 145228, 145237, 145246, 145255, 145264, 145267, 145272, 145279, - 145288, 145295, 145304, 145311, 145316, 145321, 145324, 145327, 145330, - 145337, 145344, 145353, 145362, 145371, 145378, 145385, 145390, 145403, - 145408, 145413, 145418, 145423, 145428, 145433, 145438, 145443, 145446, - 145451, 145456, 145461, 145466, 145471, 145478, 145483, 145490, 145493, - 145498, 145501, 145504, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 145507, 145512, 145517, 145522, 145527, 0, 145532, 145537, 145542, - 145547, 145552, 145557, 145562, 145567, 145572, 145577, 145582, 145587, - 145592, 145597, 145602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 150612, 150619, 150625, 150632, 150639, + 150646, 150653, 150660, 150667, 150674, 150681, 150688, 150695, 150702, + 150709, 150716, 150723, 150730, 150737, 150744, 150751, 150758, 150765, + 150772, 150779, 150786, 150793, 150800, 150807, 150814, 150821, 150828, + 150835, 150842, 150849, 150855, 150861, 150867, 150874, 150880, 150887, + 150893, 150900, 150907, 150914, 150921, 150928, 150935, 150942, 150949, + 150956, 150963, 150970, 150977, 150984, 150991, 150997, 151004, 151011, + 151018, 151025, 151032, 151040, 151047, 151054, 151061, 151068, 151075, + 151082, 151089, 151096, 151103, 151110, 151117, 151124, 151130, 151137, + 151144, 151151, 151158, 151165, 151172, 151179, 151187, 151194, 151200, + 151207, 151214, 151221, 151228, 151235, 151242, 151249, 151256, 151263, + 151270, 151277, 151284, 151291, 151298, 151305, 151312, 151319, 151326, + 151333, 151340, 151346, 151353, 151360, 151367, 151374, 151381, 151388, + 151395, 151402, 151409, 151416, 151423, 151430, 151437, 151444, 151451, + 151458, 151465, 151472, 151479, 151486, 151493, 151500, 151508, 151516, + 151524, 151531, 151538, 151545, 151552, 151559, 151566, 151573, 151580, + 151587, 151594, 151600, 151607, 151614, 151621, 151628, 151635, 151642, + 151649, 151656, 151663, 151670, 151677, 151684, 151691, 151698, 151706, + 151714, 151722, 151729, 151736, 151743, 151750, 151757, 151764, 151771, + 151778, 151785, 151792, 151799, 151806, 151813, 151820, 151827, 151834, + 151841, 151848, 151855, 151862, 151869, 151876, 151883, 151890, 151897, + 151904, 151911, 151918, 151925, 151932, 151939, 151946, 151953, 151960, + 151967, 151974, 151981, 0, 0, 151988, 151992, 151996, 152000, 152004, + 152008, 152012, 152017, 152021, 152026, 152032, 152038, 152044, 152050, + 152058, 152066, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152072, + 152078, 152084, 152090, 152096, 152102, 152108, 152114, 152120, 152126, + 152131, 152137, 152142, 152147, 152153, 152159, 152165, 152171, 152177, + 152182, 152187, 152193, 152199, 152204, 152210, 152216, 152222, 152228, + 152234, 152240, 152246, 152252, 152258, 152264, 152270, 152276, 152282, + 152288, 152294, 152300, 152306, 152312, 152318, 152324, 152329, 152335, + 152340, 152345, 152351, 152357, 152363, 152369, 152375, 152380, 152385, + 152391, 152397, 152402, 152408, 152414, 152420, 152426, 152432, 152438, + 152444, 152450, 152456, 152462, 152468, 152474, 152479, 152484, 152488, + 152493, 152500, 0, 0, 0, 0, 0, 152504, 152509, 152513, 152517, 152521, + 152525, 152529, 152533, 152538, 152542, 0, 0, 0, 0, 152547, 152553, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145607, 145614, 145620, - 145627, 145634, 145641, 145648, 145655, 145662, 145669, 145676, 145683, - 145690, 145697, 145704, 145711, 145718, 145725, 145732, 145739, 145746, - 145753, 145760, 145767, 145774, 145781, 145788, 145795, 145802, 145809, - 145816, 145823, 145830, 145837, 145844, 145850, 145856, 145862, 145869, - 145875, 145882, 145888, 145895, 145902, 145909, 145916, 145923, 145930, - 145937, 145944, 145951, 145958, 145965, 145972, 145979, 145986, 145993, - 146000, 146007, 146014, 146021, 146028, 146036, 146043, 146050, 146057, - 146064, 146071, 146078, 146085, 146092, 146099, 146106, 146113, 146120, - 146126, 146133, 146140, 146147, 146154, 146161, 146168, 146175, 146183, - 146190, 146196, 146203, 146210, 146217, 146224, 146231, 146238, 146245, - 146252, 146259, 146266, 146273, 146280, 146287, 146294, 146301, 146308, - 146315, 146322, 146329, 146336, 146342, 146349, 146356, 146363, 146370, - 146377, 146384, 146391, 146398, 146405, 146412, 146419, 146426, 146433, - 146440, 146447, 146454, 146461, 146468, 146475, 146482, 146489, 146496, - 146504, 146512, 146520, 146527, 146534, 146541, 146548, 146555, 146562, - 146569, 146576, 146583, 146590, 146596, 146603, 146610, 146617, 146624, - 146631, 146638, 146645, 146652, 146659, 146666, 146673, 146680, 146687, - 146694, 146702, 146710, 146718, 146725, 146732, 146739, 146746, 146753, - 146760, 146767, 146774, 146781, 146788, 146795, 146802, 146809, 146816, - 146823, 146830, 146837, 146844, 146851, 146858, 146865, 146872, 146879, - 146886, 146893, 146900, 146907, 146914, 146921, 146928, 146935, 146942, - 146949, 146956, 146963, 146970, 146977, 0, 0, 146984, 146988, 146992, - 146996, 147000, 147004, 147008, 147013, 147017, 147022, 147028, 147034, - 147040, 147046, 147054, 147062, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 147068, 147072, 147076, 147080, 0, 147084, 147088, 147092, - 147096, 147100, 147104, 147108, 147112, 147116, 147120, 147124, 147128, - 147132, 147136, 147140, 147144, 147148, 147152, 147156, 147160, 147164, - 147168, 147172, 147176, 147182, 147188, 147194, 0, 147200, 147205, 0, - 147210, 0, 0, 147215, 0, 147220, 147225, 147230, 147235, 147240, 147245, - 147250, 147255, 147260, 147265, 0, 147270, 147275, 147280, 147285, 0, - 147290, 0, 147295, 0, 0, 0, 0, 0, 0, 147300, 0, 0, 0, 0, 147306, 0, - 147312, 0, 147318, 0, 147324, 147330, 147336, 0, 147342, 147348, 0, - 147354, 0, 0, 147360, 0, 147366, 0, 147372, 0, 147378, 0, 147386, 0, - 147394, 147400, 0, 147406, 0, 0, 147412, 147418, 147424, 147430, 0, - 147436, 147442, 147448, 147454, 147460, 147466, 147472, 0, 147478, - 147484, 147490, 147496, 0, 147502, 147508, 147514, 147520, 0, 147528, 0, - 147536, 147542, 147548, 147554, 147560, 147566, 147572, 147578, 147584, - 147590, 0, 147596, 147602, 147608, 147614, 147620, 147626, 147632, - 147638, 147644, 147650, 147656, 147662, 147668, 147674, 147680, 147686, - 147692, 0, 0, 0, 0, 0, 147698, 147703, 147708, 0, 147713, 147718, 147723, - 147728, 147733, 0, 147738, 147743, 147748, 147753, 147758, 147763, - 147768, 147773, 147778, 147783, 147788, 147793, 147798, 147803, 147808, - 147813, 147818, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 147823, 147833, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 147841, 147848, 147855, 147862, 147868, 147875, 147882, - 147888, 147895, 147902, 147909, 147917, 147925, 147933, 147941, 147949, - 147957, 147964, 147971, 147978, 147986, 147994, 148002, 148010, 148018, - 148026, 148033, 148040, 148047, 148055, 148063, 148071, 148079, 148087, - 148095, 148100, 148105, 148110, 148115, 148120, 148125, 148130, 148135, - 148140, 0, 0, 0, 0, 148145, 148151, 148155, 148159, 148163, 148167, - 148171, 148175, 148179, 148183, 148187, 148191, 148195, 148199, 148203, - 148207, 148211, 148215, 148219, 148223, 148227, 148231, 148235, 148239, - 148243, 148247, 148251, 148255, 148259, 148263, 148267, 148271, 148275, - 148279, 148283, 148287, 148291, 148295, 148299, 148303, 148307, 148311, - 148315, 148319, 148323, 148327, 148331, 148335, 148339, 148343, 148347, - 148352, 148356, 148360, 148364, 148368, 148372, 148376, 148380, 148384, - 148388, 148392, 148396, 148400, 148404, 148408, 148412, 148416, 148420, - 148424, 148428, 148432, 148436, 148440, 148444, 148448, 148452, 148456, - 148460, 148464, 148468, 148472, 148476, 148480, 148484, 148488, 148492, - 148496, 148500, 148504, 148508, 148512, 148516, 148520, 148524, 148528, - 148532, 148536, 148540, 148544, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148548, 148554, 148563, 148571, 148579, 148588, 148597, 148606, 148615, - 148624, 148633, 148642, 148651, 148660, 148669, 0, 0, 148678, 148687, - 148695, 148703, 148712, 148721, 148730, 148739, 148748, 148757, 148766, - 148775, 148784, 148793, 148802, 0, 148810, 148819, 148827, 148835, - 148844, 148853, 148862, 148871, 148880, 148889, 148898, 148907, 148916, - 148925, 148934, 0, 148941, 148950, 148958, 148966, 148975, 148984, - 148993, 149002, 149011, 149020, 149029, 149038, 149047, 149056, 149065, - 149072, 149078, 149084, 149090, 149096, 149102, 149108, 149114, 149120, - 149126, 149132, 149138, 149144, 149150, 149156, 149162, 149168, 149174, - 149180, 149186, 149192, 149198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 149204, - 149211, 149216, 149220, 149224, 149228, 149233, 149238, 149243, 149248, - 149253, 149258, 149265, 0, 0, 0, 149273, 149278, 149284, 149290, 149296, - 149301, 149307, 149313, 149319, 149324, 149330, 149336, 149341, 149347, - 149353, 149358, 149364, 149370, 149375, 149380, 149386, 149391, 149397, - 149403, 149409, 149415, 149421, 149431, 149438, 149444, 149447, 0, - 149450, 149455, 149461, 149467, 149473, 149478, 149484, 149490, 149496, - 149501, 149507, 149513, 149518, 149524, 149530, 149535, 149541, 149547, - 149552, 149557, 149563, 149568, 149574, 149580, 149586, 149592, 149598, - 149601, 149604, 149607, 149610, 149613, 149616, 149622, 149629, 149636, - 149643, 149649, 149656, 149663, 149670, 149676, 149683, 149690, 149696, - 149703, 149710, 149716, 149723, 149730, 149736, 149742, 149749, 149755, - 149762, 149769, 149776, 149783, 149790, 149795, 0, 0, 0, 0, 149800, - 149806, 149813, 149820, 149827, 149833, 149840, 149847, 149854, 149860, - 149867, 149874, 149880, 149887, 149894, 149900, 149907, 149914, 149920, - 149926, 149933, 149939, 149946, 149953, 149960, 149967, 149974, 149983, - 149987, 149990, 149994, 149998, 150002, 150005, 150008, 150011, 150014, - 150017, 150020, 150023, 150026, 150029, 150035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 150038, 150045, - 150053, 150061, 150069, 150076, 150084, 150092, 150100, 150107, 150115, - 150123, 150130, 150138, 150146, 150153, 150161, 150169, 150176, 150183, - 150191, 150198, 150206, 150214, 150222, 150230, 150238, 150242, 150246, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 150250, 150256, 150262, 150268, - 150272, 150278, 150284, 150290, 150296, 150302, 150308, 150314, 150320, - 150326, 150332, 150338, 150344, 150350, 150356, 150362, 150368, 150374, - 150380, 150386, 150392, 150398, 150404, 150410, 150416, 150422, 150428, - 150434, 150440, 150446, 150452, 150458, 150464, 150470, 150476, 150482, - 150488, 150494, 150500, 0, 0, 0, 0, 0, 150506, 150517, 150528, 150539, - 150550, 150561, 150572, 150583, 150594, 0, 0, 0, 0, 0, 0, 0, 150605, - 150609, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152559, 152563, 152567, 152571, + 0, 152575, 152579, 152583, 152587, 152591, 152595, 152599, 152603, + 152607, 152611, 152615, 152619, 152623, 152627, 152631, 152635, 152639, + 152643, 152647, 152651, 152655, 152659, 152663, 152667, 152673, 152679, + 152685, 0, 152691, 152696, 0, 152701, 0, 0, 152706, 0, 152711, 152716, + 152721, 152726, 152731, 152736, 152741, 152746, 152751, 152756, 0, + 152761, 152766, 152771, 152776, 0, 152781, 0, 152786, 0, 0, 0, 0, 0, 0, + 152791, 0, 0, 0, 0, 152797, 0, 152803, 0, 152809, 0, 152815, 152821, + 152827, 0, 152833, 152839, 0, 152845, 0, 0, 152851, 0, 152857, 0, 152863, + 0, 152869, 0, 152877, 0, 152885, 152891, 0, 152897, 0, 0, 152903, 152909, + 152915, 152921, 0, 152927, 152933, 152939, 152945, 152951, 152957, + 152963, 0, 152969, 152975, 152981, 152987, 0, 152993, 152999, 153005, + 153011, 0, 153019, 0, 153027, 153033, 153039, 153045, 153051, 153057, + 153063, 153069, 153075, 153081, 0, 153087, 153093, 153099, 153105, + 153111, 153117, 153123, 153129, 153135, 153141, 153147, 153153, 153159, + 153165, 153171, 153177, 153183, 0, 0, 0, 0, 0, 153189, 153194, 153199, 0, + 153204, 153209, 153214, 153219, 153224, 0, 153229, 153234, 153239, + 153244, 153249, 153254, 153259, 153264, 153269, 153274, 153279, 153284, + 153289, 153294, 153299, 153304, 153309, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153314, 153324, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153332, 153339, 153346, 153353, + 153359, 153366, 153373, 153379, 153386, 153393, 153400, 153408, 153416, + 153424, 153432, 153440, 153448, 153455, 153462, 153469, 153477, 153485, + 153493, 153501, 153509, 153517, 153524, 153531, 153538, 153546, 153554, + 153562, 153570, 153578, 153586, 153591, 153596, 153601, 153606, 153611, + 153616, 153621, 153626, 153631, 0, 0, 0, 0, 153636, 153642, 153646, + 153650, 153654, 153658, 153662, 153666, 153670, 153674, 153678, 153682, + 153686, 153690, 153694, 153698, 153702, 153706, 153710, 153714, 153718, + 153722, 153726, 153730, 153734, 153738, 153742, 153746, 153750, 153754, + 153758, 153762, 153766, 153770, 153774, 153778, 153782, 153786, 153790, + 153794, 153798, 153802, 153806, 153810, 153814, 153818, 153822, 153826, + 153830, 153834, 153838, 153843, 153847, 153851, 153855, 153859, 153863, + 153867, 153871, 153875, 153879, 153883, 153887, 153891, 153895, 153899, + 153903, 153907, 153911, 153915, 153919, 153923, 153927, 153931, 153935, + 153939, 153943, 153947, 153951, 153955, 153959, 153963, 153967, 153971, + 153975, 153979, 153983, 153987, 153991, 153995, 153999, 154003, 154007, + 154011, 154015, 154019, 154023, 154027, 154031, 154035, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 154039, 154045, 154054, 154062, 154070, 154079, 154088, + 154097, 154106, 154115, 154124, 154133, 154142, 154151, 154160, 0, 0, + 154169, 154178, 154186, 154194, 154203, 154212, 154221, 154230, 154239, + 154248, 154257, 154266, 154275, 154284, 154293, 0, 154301, 154310, + 154318, 154326, 154335, 154344, 154353, 154362, 154371, 154380, 154389, + 154398, 154407, 154416, 154425, 0, 154432, 154441, 154449, 154457, + 154466, 154475, 154484, 154493, 154502, 154511, 154520, 154529, 154538, + 154547, 154556, 154563, 154569, 154575, 154581, 154587, 154593, 154599, + 154605, 154611, 154617, 154623, 154629, 154635, 154641, 154647, 154653, + 154659, 154665, 154671, 154677, 154683, 154689, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 154695, 154702, 154707, 154711, 154715, 154719, 154724, 154729, + 154734, 154739, 154744, 154749, 154756, 0, 0, 0, 154764, 154769, 154775, + 154781, 154787, 154792, 154798, 154804, 154810, 154815, 154821, 154827, + 154832, 154838, 154844, 154849, 154855, 154861, 154866, 154872, 154878, + 154883, 154889, 154895, 154901, 154907, 154913, 154924, 154931, 154937, + 154940, 0, 154943, 154948, 154954, 154960, 154966, 154971, 154977, + 154983, 154989, 154994, 155000, 155006, 155011, 155017, 155023, 155028, + 155034, 155040, 155045, 155051, 155057, 155062, 155068, 155074, 155080, + 155086, 155092, 155095, 155098, 155101, 155104, 155107, 155110, 155116, + 155123, 155130, 155137, 155143, 155150, 155157, 155164, 155170, 155177, + 155184, 155190, 155197, 155204, 155210, 155217, 155224, 155230, 155237, + 155244, 155250, 155257, 155264, 155271, 155278, 155285, 155290, 0, 0, 0, + 0, 155295, 155301, 155308, 155315, 155322, 155328, 155335, 155342, + 155349, 155355, 155362, 155369, 155375, 155382, 155389, 155395, 155402, + 155409, 155415, 155422, 155429, 155435, 155442, 155449, 155456, 155463, + 155470, 155479, 155483, 155486, 155490, 155494, 155498, 155501, 155504, + 155507, 155510, 155513, 155516, 155519, 155522, 155525, 155531, 155534, + 155538, 155543, 155547, 155552, 155557, 155563, 155569, 155575, 155580, + 155588, 155594, 155597, 155600, 155603, 155606, 155609, 155612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 155615, 155622, 155630, 155638, 155646, 155653, 155661, + 155669, 155677, 155684, 155692, 155700, 155707, 155715, 155723, 155730, + 155738, 155746, 155753, 155761, 155769, 155776, 155784, 155792, 155800, + 155808, 155816, 155820, 155824, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 155828, 155834, 155840, 155846, 155850, 155856, 155862, 155868, 155874, + 155880, 155886, 155892, 155898, 155904, 155910, 155916, 155922, 155928, + 155934, 155940, 155946, 155952, 155958, 155964, 155970, 155976, 155982, + 155988, 155994, 156000, 156006, 156012, 156018, 156024, 156030, 156036, + 156042, 156048, 156054, 156060, 156066, 156072, 156078, 156084, 0, 0, 0, + 0, 156090, 156101, 156112, 156123, 156134, 156145, 156156, 156167, + 156178, 0, 0, 0, 0, 0, 0, 0, 156189, 156194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 150613, 150615, 150617, 150621, 150626, 150631, - 150633, 150639, 150644, 150646, 150652, 150656, 150658, 150662, 150668, - 150674, 150680, 150685, 150690, 150697, 150704, 150711, 150716, 150723, - 150730, 150737, 150741, 150748, 150757, 150766, 150773, 150778, 150782, - 150786, 150788, 150791, 150794, 150801, 150808, 150818, 150823, 150828, - 150833, 150838, 150840, 150846, 150850, 150852, 150854, 150856, 150858, - 150862, 150866, 150870, 150872, 150876, 150878, 150882, 150884, 150886, - 150888, 150890, 150895, 150900, 150902, 150908, 150912, 150916, 150924, - 150926, 150928, 150930, 150932, 150934, 150936, 150938, 150940, 150942, - 150944, 150948, 150952, 150954, 150956, 150958, 150960, 150962, 150967, - 150973, 150977, 150981, 150985, 150989, 150994, 150998, 151000, 151002, - 151006, 151012, 151014, 151016, 151018, 151022, 151031, 151037, 151041, - 151045, 151047, 151049, 151052, 151054, 151056, 151058, 151062, 151064, - 151068, 151073, 151075, 151080, 151086, 151093, 151097, 151101, 151105, - 151109, 151115, 151119, 151127, 151134, 151136, 151138, 151142, 151146, - 151148, 151152, 151156, 151158, 151162, 151164, 151168, 151172, 151176, - 151180, 151184, 151188, 151192, 151196, 151202, 151206, 151210, 151221, - 151226, 151230, 151234, 151240, 151244, 151248, 151252, 151259, 151266, - 151270, 151274, 151278, 151282, 151286, 151293, 151295, 151299, 151301, - 151303, 151307, 151311, 151315, 151317, 151321, 151325, 151329, 151333, - 151337, 151339, 151343, 151345, 151351, 151354, 151359, 151361, 151363, - 151366, 151368, 151370, 151373, 151380, 151387, 151394, 151399, 151403, - 151405, 151407, 151409, 151413, 151415, 151419, 151423, 151427, 151429, - 151433, 151435, 151439, 151443, 151450, 151452, 151461, 151470, 151479, - 151485, 151487, 151492, 151496, 151500, 151502, 151508, 151512, 151514, - 151518, 151522, 151524, 151528, 151533, 151537, 151543, 151549, 151551, - 151553, 151559, 151561, 151565, 151569, 151571, 151575, 151577, 151581, - 151585, 151589, 151592, 151595, 151600, 151605, 151607, 151610, 151612, - 151619, 151623, 151625, 151632, 151639, 151646, 151653, 151660, 151662, - 151664, 151666, 151670, 151672, 151674, 151676, 151678, 151680, 151682, - 151684, 151686, 151688, 151690, 151692, 151694, 151696, 151698, 151700, - 151702, 151704, 151706, 151708, 151710, 151712, 151714, 151718, 151720, - 151722, 151724, 151728, 151730, 151734, 151736, 151738, 151742, 151746, - 151752, 151754, 151756, 151758, 151760, 151764, 151768, 151770, 151774, - 151778, 151782, 151786, 151790, 151794, 151798, 151802, 151806, 151810, - 151814, 151818, 151822, 151826, 151830, 151834, 151838, 151842, 151844, - 151846, 151848, 151850, 151852, 151854, 151856, 151864, 151872, 151880, - 151888, 151893, 151898, 151903, 151907, 151911, 151916, 151920, 151922, - 151926, 151928, 151930, 151932, 151934, 151936, 151938, 151940, 151944, - 151946, 151948, 151950, 151954, 151958, 151962, 151966, 151970, 151972, - 151978, 151984, 151986, 151988, 151990, 151992, 151994, 152003, 152010, - 152017, 152021, 152028, 152033, 152040, 152049, 152054, 152058, 152062, - 152064, 152068, 152070, 152074, 152078, 152080, 152084, 152088, 152092, - 152094, 152096, 152102, 152104, 152106, 152108, 152112, 152116, 152118, - 152122, 152124, 152126, 152129, 152133, 152135, 152139, 152141, 152143, - 152148, 152150, 152154, 152158, 152161, 152165, 152169, 152173, 152177, - 152181, 152185, 152189, 152194, 152198, 152202, 152211, 152216, 152219, - 152221, 152224, 152227, 152232, 152234, 152237, 152242, 152246, 152249, - 152253, 152257, 152260, 152265, 152269, 152273, 152277, 152281, 152287, - 152293, 152299, 152305, 152310, 152320, 152322, 152326, 152328, 152330, - 152334, 152338, 152340, 152344, 152349, 152354, 152360, 152362, 152366, - 152370, 152376, 152382, 152386, 152388, 152390, 152394, 152396, 152400, - 152404, 152408, 152410, 152412, 152419, 152423, 152426, 152430, 152434, - 152438, 152440, 152444, 152446, 152448, 152452, 152454, 152458, 152462, - 152468, 152472, 152476, 152480, 152482, 152485, 152489, 152495, 152504, - 152513, 152521, 152529, 152531, 152535, 152537, 152541, 152552, 152556, - 152562, 152568, 152573, 152575, 152580, 152584, 152586, 152588, 152590, - 152594, 152598, 152602, 152607, 152617, 152632, 152642, 152652, 152656, - 152660, 152666, 152668, 152676, 152684, 152686, 152690, 152696, 152702, - 152709, 152716, 152718, 152720, 152723, 152725, 152731, 152733, 152736, - 152740, 152746, 152752, 152763, 152769, 152775, 152783, 152787, 152795, - 152803, 152809, 152815, 152822, 152824, 152828, 152830, 152832, 152837, - 152839, 152841, 152843, 152845, 152849, 152859, 152865, 152869, 152873, - 152877, 152883, 152889, 152895, 152901, 152906, 152911, 152917, 152923, - 152930, 152937, 152945, 152953, 152958, 152966, 152970, 152979, 152988, - 152994, 152998, 153002, 153006, 153009, 153014, 153016, 153018, 153020, - 153027, 153032, 153039, 153046, 153053, 153061, 153069, 153077, 153085, - 153093, 153101, 153109, 153117, 153125, 153131, 153137, 153143, 153149, - 153155, 153161, 153167, 153173, 153179, 153185, 153191, 153197, 153200, - 153209, 153218, 153220, 153227, 153231, 153233, 153235, 153239, 153245, - 153249, 153251, 153261, 153267, 153271, 153273, 153277, 0, 153279, - 153286, 153293, 153300, 153305, 153310, 153319, 153325, 153330, 153334, - 153339, 153343, 153350, 153354, 153357, 153362, 153369, 153376, 153381, - 153386, 153391, 153398, 153407, 153418, 153424, 153430, 153436, 153446, - 153461, 153470, 153478, 153486, 153494, 153502, 153510, 153518, 153526, - 153534, 153542, 153550, 153558, 0, 153566, 153570, 153575, 153580, - 153582, 153586, 153595, 153604, 153612, 153616, 153620, 153625, 153630, - 153635, 153637, 153642, 153646, 153648, 153652, 153656, 153662, 153667, - 153675, 153680, 153685, 153690, 153697, 153700, 153702, 153705, 153710, - 153716, 153720, 153724, 153730, 153736, 153738, 153742, 153746, 153750, - 153754, 153758, 153760, 153762, 153764, 153766, 153772, 153778, 153782, - 153784, 153786, 153788, 153797, 153801, 153808, 153815, 153817, 153820, - 153824, 153830, 153834, 153838, 153840, 153848, 153852, 153856, 153861, - 153866, 153871, 153876, 153881, 153886, 153891, 153896, 153901, 153906, - 153910, 153916, 153920, 153926, 153931, 153938, 153944, 153952, 153956, - 153963, 153967, 153971, 153975, 153980, 153985, 153987, 153991, 154000, - 154008, 154016, 154029, 154042, 154055, 154062, 154069, 154073, 154082, - 154090, 154094, 154103, 154110, 154114, 154118, 154122, 154126, 154133, - 154137, 154141, 154145, 154149, 154156, 154165, 154174, 154181, 154193, - 154205, 154209, 154213, 154217, 154221, 154225, 154229, 154237, 154245, - 154253, 154257, 154261, 154265, 154269, 154273, 154277, 154283, 154289, - 154293, 154304, 154312, 154316, 154320, 154324, 154328, 154334, 154341, - 154352, 154362, 154372, 154383, 154392, 154403, 154409, 154415, 154421, - 154427, 154433, 154437, 154444, 154453, 154460, 154466, 154470, 154474, - 154478, 154487, 154499, 154503, 154510, 154517, 154524, 154532, 154539, - 154547, 154556, 154566, 154575, 154585, 154594, 154604, 154613, 154623, - 154633, 154644, 154654, 154665, 154672, 154680, 154687, 154695, 154703, - 154712, 154720, 154729, 154736, 154748, 154755, 154767, 154770, 154773, - 154776, 154779, 154785, 154792, 154798, 154805, 154810, 154816, 154828, - 154838, 154849, 154854, 154859, 154865, 154870, 154877, 154881, 154887, - 154889, 154891, 154895, 154899, 154903, 154912, 154914, 154916, 154919, - 154921, 154923, 154927, 154929, 154933, 154935, 154939, 154941, 154943, - 154947, 154951, 154957, 154959, 154963, 154965, 154969, 154973, 154977, - 154981, 154983, 154985, 154989, 154993, 154997, 155001, 155003, 155005, - 155007, 155013, 155018, 155021, 155029, 155037, 155039, 155044, 155047, - 155052, 155063, 155070, 155075, 155080, 155082, 155086, 155088, 155092, - 155094, 155098, 155102, 155105, 155108, 155110, 155113, 155115, 155119, - 155121, 155123, 155125, 155129, 155131, 155135, 155138, 155145, 155148, - 155153, 155156, 155159, 155164, 155168, 155172, 155176, 155178, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155183, 155188, 155190, 155194, - 155196, 155200, 155204, 155210, 155214, 155219, 155222, 155226, 155230, - 0, 0, 0, 155234, 155236, 155242, 155246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 155250, 155255, 155260, 155265, 155270, 155275, 155280, 155287, - 155294, 155301, 155308, 155313, 155318, 155323, 155328, 155335, 155341, - 155348, 155355, 155362, 155367, 155372, 155377, 155382, 155387, 155394, - 155401, 155406, 155411, 155418, 155425, 155433, 155441, 155448, 155455, - 155463, 155471, 155479, 155486, 155496, 155507, 155512, 155519, 155526, - 155533, 155541, 155549, 155560, 155568, 155576, 155584, 155589, 155594, - 155599, 155604, 155609, 155614, 155619, 155624, 155629, 155634, 155639, - 155644, 155651, 155656, 155661, 155668, 155673, 155678, 155683, 155688, - 155693, 155698, 155703, 155708, 155713, 155718, 155723, 155728, 155735, - 155743, 155748, 155753, 155760, 155765, 155770, 155775, 155782, 155787, - 155794, 155799, 155806, 155811, 155820, 155829, 155834, 155839, 155844, - 155849, 155854, 155859, 155864, 155869, 155874, 155879, 155884, 155889, - 155894, 155902, 155910, 155915, 155920, 155925, 155930, 155935, 155941, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 155947, 155955, 155963, 155971, - 155979, 155985, 155991, 155995, 155999, 156005, 156011, 156020, 156024, - 156029, 156035, 156039, 156044, 156048, 156052, 156058, 156064, 156074, - 156083, 156086, 156091, 156097, 156103, 156114, 156124, 156128, 156133, - 156139, 156145, 156154, 156159, 156163, 156168, 156172, 156178, 156184, - 156190, 156194, 156197, 156201, 156204, 156207, 156212, 156217, 156224, - 156232, 156239, 156246, 156255, 156264, 156271, 156279, 156286, 156293, - 156302, 156311, 156318, 156326, 156333, 156340, 156349, 156356, 156364, - 156370, 156379, 156387, 156396, 156403, 156413, 156424, 156432, 156440, - 156449, 156457, 156465, 156474, 156482, 156492, 156501, 156509, 156517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156526, 156534, - 156542, 156550, 156558, 156567, 156576, 156585, 156594, 156603, 156612, - 156621, 0, 0, 0, 0, 156630, 156638, 156646, 156654, 156662, 156669, - 156676, 156683, 156690, 156698, 156706, 156714, 156722, 156732, 156742, - 156752, 156762, 156771, 156780, 156789, 156798, 156807, 156816, 156825, - 156834, 156842, 156850, 156858, 156866, 156874, 156882, 156890, 156898, - 156908, 156918, 156928, 156938, 156942, 156946, 156950, 156954, 156957, - 156960, 156963, 156966, 156970, 156974, 156978, 156982, 156987, 156992, - 156997, 157002, 157005, 157008, 157011, 0, 0, 0, 0, 0, 0, 0, 0, 157014, - 157017, 157020, 157023, 157026, 157031, 157036, 157042, 157048, 157052, - 0, 0, 0, 0, 0, 0, 157056, 157062, 157068, 157074, 157080, 157088, 157096, - 157105, 157114, 157119, 157124, 157129, 157134, 157141, 157148, 157156, - 157164, 157171, 157178, 157185, 157192, 157201, 157210, 157220, 157230, - 157236, 157242, 157248, 157254, 157262, 157270, 157279, 157288, 157296, - 157304, 157312, 157320, 157330, 157340, 157351, 0, 0, 0, 0, 0, 0, 0, 0, - 157362, 157367, 157372, 157377, 157382, 157391, 157400, 157409, 157418, - 157425, 157432, 157439, 157446, 157453, 157462, 157471, 157480, 157485, - 157492, 157499, 157506, 157511, 157516, 157521, 157526, 157533, 157540, - 157547, 157554, 157561, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157570, 157574, 157578, 157583, 157587, - 157591, 157596, 157600, 157604, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156199, + 156201, 156203, 156207, 156212, 156217, 156219, 156225, 156230, 156232, + 156238, 156242, 156244, 156248, 156254, 156260, 156266, 156271, 156276, + 156283, 156290, 156297, 156302, 156309, 156316, 156323, 156327, 156334, + 156343, 156352, 156359, 156364, 156368, 156372, 156374, 156377, 156380, + 156387, 156394, 156404, 156409, 156414, 156419, 156424, 156426, 156432, + 156436, 156438, 156440, 156442, 156444, 156448, 156452, 156456, 156458, + 156462, 156464, 156468, 156470, 156472, 156474, 156476, 156481, 156486, + 156488, 156494, 156498, 156502, 156510, 156512, 156514, 156516, 156518, + 156520, 156522, 156524, 156526, 156528, 156530, 156534, 156538, 156540, + 156542, 156544, 156546, 156548, 156553, 156559, 156563, 156567, 156571, + 156575, 156580, 156584, 156586, 156588, 156592, 156598, 156600, 156602, + 156604, 156608, 156617, 156623, 156627, 156631, 156633, 156635, 156638, + 156640, 156642, 156644, 156648, 156650, 156654, 156659, 156661, 156666, + 156672, 156679, 156683, 156687, 156691, 156695, 156701, 156705, 156713, + 156720, 156722, 156724, 156728, 156732, 156734, 156738, 156742, 156744, + 156748, 156750, 156754, 156758, 156762, 156766, 156770, 156774, 156778, + 156782, 156788, 156792, 156796, 156807, 156812, 156816, 156820, 156826, + 156830, 156834, 156838, 156845, 156852, 156856, 156860, 156864, 156868, + 156872, 156879, 156881, 156885, 156887, 156889, 156893, 156897, 156901, + 156903, 156907, 156911, 156915, 156919, 156923, 156925, 156929, 156931, + 156937, 156940, 156945, 156947, 156949, 156952, 156954, 156956, 156959, + 156966, 156973, 156980, 156985, 156989, 156991, 156993, 156995, 156999, + 157001, 157005, 157009, 157013, 157015, 157019, 157021, 157025, 157029, + 157036, 157038, 157047, 157056, 157065, 157071, 157073, 157078, 157082, + 157086, 157088, 157094, 157098, 157100, 157104, 157108, 157110, 157114, + 157119, 157123, 157129, 157135, 157137, 157139, 157145, 157147, 157151, + 157155, 157157, 157161, 157163, 157167, 157171, 157175, 157178, 157181, + 157186, 157191, 157193, 157196, 157198, 157205, 157209, 157211, 157218, + 157225, 157232, 157239, 157246, 157248, 157250, 157252, 157256, 157258, + 157260, 157262, 157264, 157266, 157268, 157270, 157272, 157274, 157276, + 157278, 157280, 157282, 157284, 157286, 157288, 157290, 157292, 157294, + 157296, 157298, 157300, 157304, 157306, 157308, 157310, 157314, 157316, + 157320, 157322, 157324, 157328, 157332, 157338, 157340, 157342, 157344, + 157346, 157350, 157354, 157356, 157360, 157364, 157368, 157372, 157376, + 157380, 157384, 157388, 157392, 157396, 157400, 157404, 157408, 157412, + 157416, 157420, 157424, 157428, 157430, 157432, 157434, 157436, 157438, + 157440, 157442, 157450, 157458, 157466, 157474, 157479, 157484, 157489, + 157493, 157497, 157502, 157506, 157508, 157512, 157514, 157516, 157518, + 157520, 157522, 157524, 157526, 157530, 157532, 157534, 157536, 157540, + 157544, 157548, 157552, 157556, 157558, 157564, 157570, 157572, 157574, + 157576, 157578, 157580, 157589, 157596, 157603, 157607, 157614, 157619, + 157626, 157635, 157640, 157644, 157648, 157650, 157654, 157656, 157660, + 157664, 157666, 157670, 157674, 157678, 157680, 157682, 157688, 157690, + 157692, 157694, 157698, 157702, 157704, 157708, 157710, 157712, 157715, + 157719, 157721, 157725, 157727, 157729, 157734, 157736, 157740, 157744, + 157747, 157751, 157755, 157759, 157763, 157767, 157771, 157775, 157780, + 157784, 157788, 157797, 157802, 157805, 157807, 157810, 157813, 157818, + 157820, 157823, 157828, 157832, 157835, 157839, 157843, 157846, 157851, + 157855, 157859, 157863, 157867, 157873, 157879, 157885, 157891, 157896, + 157906, 157908, 157912, 157914, 157916, 157920, 157924, 157926, 157930, + 157935, 157940, 157946, 157948, 157952, 157956, 157962, 157968, 157972, + 157974, 157976, 157980, 157982, 157986, 157990, 157994, 157996, 157998, + 158005, 158009, 158012, 158016, 158020, 158024, 158026, 158030, 158032, + 158034, 158038, 158040, 158044, 158048, 158054, 158058, 158062, 158066, + 158068, 158071, 158075, 158081, 158090, 158099, 158107, 158115, 158117, + 158121, 158123, 158127, 158138, 158142, 158148, 158154, 158159, 158161, + 158166, 158170, 158172, 158174, 158176, 158180, 158184, 158188, 158193, + 158203, 158218, 158228, 158238, 158242, 158246, 158252, 158254, 158262, + 158270, 158272, 158276, 158282, 158288, 158295, 158302, 158304, 158306, + 158309, 158311, 158317, 158319, 158322, 158326, 158332, 158338, 158349, + 158355, 158361, 158369, 158373, 158381, 158389, 158395, 158401, 158408, + 158410, 158414, 158416, 158418, 158423, 158425, 158427, 158429, 158431, + 158435, 158445, 158451, 158455, 158459, 158463, 158469, 158475, 158481, + 158487, 158492, 158497, 158503, 158509, 158516, 158523, 158531, 158539, + 158544, 158552, 158556, 158565, 158574, 158580, 158584, 158588, 158592, + 158595, 158600, 158602, 158604, 158606, 158613, 158618, 158625, 158632, + 158639, 158647, 158655, 158663, 158671, 158679, 158687, 158695, 158703, + 158711, 158717, 158723, 158729, 158735, 158741, 158747, 158753, 158759, + 158765, 158771, 158777, 158783, 158786, 158795, 158804, 158806, 158813, + 158817, 158819, 158821, 158825, 158831, 158835, 158837, 158847, 158853, + 158857, 158859, 158863, 158865, 158869, 158876, 158883, 158890, 158895, + 158900, 158909, 158915, 158920, 158924, 158929, 158933, 158940, 158944, + 158947, 158952, 158959, 158966, 158971, 158976, 158981, 158988, 158997, + 159008, 159014, 159020, 159026, 159036, 159051, 159060, 159068, 159076, + 159084, 159092, 159100, 159108, 159116, 159124, 159132, 159140, 159148, + 159156, 159159, 159163, 159168, 159173, 159175, 159179, 159188, 159197, + 159205, 159209, 159213, 159218, 159223, 159228, 159230, 159235, 159239, + 159241, 159245, 159249, 159255, 159260, 159268, 159273, 159278, 159283, + 159290, 159293, 159295, 159298, 159303, 159309, 159313, 159317, 159323, + 159329, 159331, 159335, 159339, 159343, 159347, 159351, 159353, 159355, + 159357, 159359, 159365, 159371, 159375, 159377, 159379, 159381, 159390, + 159394, 159401, 159408, 159410, 159413, 159417, 159423, 159427, 159431, + 159433, 159441, 159445, 159449, 159454, 159459, 159464, 159469, 159474, + 159479, 159484, 159489, 159494, 159499, 159503, 159509, 159513, 159519, + 159524, 159531, 159537, 159545, 159549, 159556, 159560, 159564, 159568, + 159573, 159578, 159580, 159584, 159593, 159601, 159609, 159622, 159635, + 159648, 159655, 159662, 159666, 159675, 159683, 159687, 159696, 159703, + 159707, 159711, 159715, 159719, 159726, 159730, 159734, 159738, 159742, + 159749, 159758, 159767, 159774, 159786, 159798, 159802, 159806, 159810, + 159814, 159818, 159822, 159830, 159838, 159846, 159850, 159854, 159858, + 159862, 159866, 159870, 159876, 159882, 159886, 159897, 159905, 159909, + 159913, 159917, 159921, 159927, 159934, 159945, 159955, 159965, 159976, + 159985, 159996, 160002, 160008, 160014, 160020, 160026, 160030, 160037, + 160046, 160053, 160059, 160063, 160067, 160071, 160080, 160092, 160096, + 160103, 160110, 160117, 160125, 160132, 160140, 160149, 160159, 160168, + 160178, 160187, 160197, 160206, 160216, 160226, 160237, 160247, 160258, + 160265, 160273, 160280, 160288, 160296, 160305, 160313, 160322, 160329, + 160341, 160348, 160360, 160363, 160366, 160369, 160372, 160378, 160385, + 160391, 160398, 160403, 160409, 160421, 160431, 160442, 160447, 160452, + 160458, 160463, 160470, 160474, 160480, 160482, 160484, 160488, 160492, + 160496, 160505, 160507, 160509, 160512, 160514, 160516, 160520, 160522, + 160526, 160528, 160532, 160534, 160536, 160540, 160544, 160550, 160552, + 160556, 160558, 160562, 160566, 160570, 160574, 160576, 160578, 160582, + 160586, 160590, 160594, 160596, 160598, 160600, 160606, 160611, 160614, + 160622, 160630, 160632, 160637, 160640, 160645, 160656, 160663, 160668, + 160673, 160675, 160679, 160681, 160685, 160687, 160691, 160695, 160698, + 160701, 160703, 160706, 160708, 160712, 160714, 160716, 160718, 160722, + 160724, 160728, 160731, 160738, 160741, 160746, 160749, 160752, 160757, + 160761, 160765, 160769, 160771, 160776, 160779, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 160783, 160788, 160790, 160794, 160796, 160800, 160804, + 160810, 160814, 160819, 160822, 160826, 160830, 0, 0, 0, 160834, 160836, + 160842, 160846, 160850, 160852, 160856, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 160858, 160863, 160868, 160873, 160878, 160883, 160888, 160895, 160902, + 160909, 160916, 160921, 160926, 160931, 160936, 160943, 160949, 160956, + 160963, 160970, 160975, 160980, 160985, 160990, 160995, 161002, 161009, + 161014, 161019, 161026, 161033, 161041, 161049, 161056, 161063, 161071, + 161079, 161087, 161094, 161104, 161115, 161120, 161127, 161134, 161141, + 161149, 161157, 161168, 161176, 161184, 161192, 161197, 161202, 161207, + 161212, 161217, 161222, 161227, 161232, 161237, 161242, 161247, 161252, + 161259, 161264, 161269, 161276, 161281, 161286, 161291, 161296, 161301, + 161306, 161311, 161316, 161321, 161326, 161331, 161336, 161343, 161351, + 161356, 161361, 161368, 161373, 161378, 161383, 161390, 161395, 161402, + 161407, 161414, 161419, 161428, 161437, 161442, 161447, 161452, 161457, + 161462, 161467, 161472, 161477, 161482, 161487, 161492, 161497, 161502, + 161510, 161518, 161523, 161528, 161533, 161538, 161543, 161549, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 161555, 161563, 161571, 161579, 161587, + 161593, 161599, 161603, 161607, 161613, 161619, 161628, 161632, 161637, + 161643, 161647, 161652, 161656, 161660, 161666, 161672, 161682, 161691, + 161694, 161699, 161705, 161711, 161722, 161732, 161736, 161741, 161747, + 161753, 161762, 161767, 161771, 161776, 161780, 161786, 161792, 161798, + 161802, 161805, 161809, 161812, 161815, 161820, 161825, 161832, 161840, + 161847, 161854, 161863, 161872, 161879, 161887, 161894, 161901, 161910, + 161919, 161926, 161934, 161941, 161948, 161957, 161964, 161972, 161978, + 161987, 161995, 162004, 162011, 162021, 162032, 162040, 162048, 162057, + 162065, 162073, 162082, 162090, 162100, 162109, 162117, 162125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 162134, 162142, 162150, + 162158, 162166, 162175, 162184, 162193, 162202, 162211, 162220, 162229, + 0, 0, 0, 0, 162238, 162246, 162254, 162262, 162270, 162277, 162284, + 162291, 162298, 162306, 162314, 162322, 162330, 162340, 162350, 162360, + 162370, 162379, 162388, 162397, 162406, 162415, 162424, 162433, 162442, + 162450, 162458, 162466, 162474, 162482, 162490, 162498, 162506, 162516, + 162526, 162536, 162546, 162550, 162554, 162558, 162562, 162565, 162568, + 162571, 162574, 162578, 162582, 162586, 162590, 162595, 162600, 162605, + 162610, 162613, 162616, 162619, 0, 0, 0, 0, 0, 0, 0, 0, 162622, 162625, + 162628, 162631, 162634, 162639, 162644, 162650, 162656, 162660, 0, 0, 0, + 0, 0, 0, 162664, 162670, 162676, 162682, 162688, 162696, 162704, 162713, + 162722, 162727, 162732, 162737, 162742, 162749, 162756, 162764, 162772, + 162779, 162786, 162793, 162800, 162809, 162818, 162828, 162838, 162844, + 162850, 162856, 162862, 162870, 162878, 162887, 162896, 162904, 162912, + 162920, 162928, 162938, 162948, 162959, 0, 0, 0, 0, 0, 0, 0, 0, 162970, + 162975, 162980, 162985, 162990, 162999, 163008, 163017, 163026, 163033, + 163040, 163047, 163054, 163061, 163070, 163079, 163088, 163093, 163100, + 163107, 163114, 163119, 163124, 163129, 163134, 163141, 163148, 163155, + 163162, 163169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157610, 157612, - 157616, 157618, 157620, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157624, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 163178, 163182, 163186, 163191, 163195, 163199, + 163204, 163208, 163212, 163218, 163224, 163231, 163235, 163239, 163241, + 0, 163251, 163258, 163262, 163266, 163276, 163280, 163284, 163288, 0, 0, + 0, 0, 0, 0, 0, 0, 163292, 0, 0, 163296, 163298, 163300, 163306, 163310, + 163312, 163318, 163320, 163322, 163326, 163328, 163332, 0, 163334, + 163338, 163343, 163347, 163351, 163353, 163357, 163359, 163365, 163371, + 163377, 163381, 0, 0, 0, 0, 163387, 163389, 163391, 163393, 163395, + 163397, 163399, 163403, 163407, 163414, 163418, 163420, 163425, 163427, + 163429, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 163431, 163433, 163437, 163439, 163441, + 163445, 163447, 163449, 163451, 163453, 163455, 163459, 163461, 163463, + 163465, 163467, 163469, 163471, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 163473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157628, 157632, 157636, 157640, - 157644, 157648, 157652, 157656, 157660, 157664, 157668, 157672, 157676, - 157680, 157684, 157688, 157692, 157696, 157700, 157704, 157708, 157712, - 157716, 157720, 157724, 157728, 157732, 157736, 157740, 157744, 157748, - 157752, 157756, 157760, 157764, 157768, 157772, 157776, 157780, 157784, - 157788, 157792, 157796, 157800, 157804, 157808, 157812, 157816, 157820, - 157824, 157828, 157832, 157836, 157840, 157844, 157848, 157852, 157856, - 157860, 157864, 157868, 157872, 157876, 157880, 157884, 157888, 157892, - 157896, 157900, 157904, 157908, 157912, 157916, 157920, 157924, 157928, - 157932, 157936, 157940, 157944, 157948, 157952, 157956, 157960, 157964, - 157968, 157972, 157976, 157980, 157984, 157988, 157992, 157996, 158000, - 158004, 158008, 158012, 158016, 158020, 158024, 158028, 158032, 158036, - 158040, 158044, 158048, 158052, 158056, 158060, 158064, 158068, 158072, - 158076, 158080, 158084, 158088, 158092, 158096, 158100, 158104, 158108, - 158112, 158116, 158120, 158124, 158128, 158132, 158136, 158140, 158144, - 158148, 158152, 158156, 158160, 158164, 158168, 158172, 158176, 158180, - 158184, 158188, 158192, 158196, 158200, 158204, 158208, 158212, 158216, - 158220, 158224, 158228, 158232, 158236, 158240, 158244, 158248, 158252, - 158256, 158260, 158264, 158268, 158272, 158276, 158280, 158284, 158288, - 158292, 158296, 158300, 158304, 158308, 158312, 158316, 158320, 158324, - 158328, 158332, 158336, 158340, 158344, 158348, 158352, 158356, 158360, - 158364, 158368, 158372, 158376, 158380, 158384, 158388, 158392, 158396, - 158400, 158404, 158408, 158412, 158416, 158420, 158424, 158428, 158432, - 158436, 158440, 158444, 158448, 158452, 158456, 158460, 158464, 158468, - 158472, 158476, 158480, 158484, 158488, 158492, 158496, 158500, 158504, - 158508, 158512, 158516, 158520, 158524, 158528, 158532, 158536, 158540, - 158544, 158548, 158552, 158556, 158560, 158564, 158568, 158572, 158576, - 158580, 158584, 158588, 158592, 158596, 158600, 158604, 158608, 158612, - 158616, 158620, 158624, 158628, 158632, 158636, 158640, 158644, 158648, - 158652, 158656, 158660, 158664, 158668, 158672, 158676, 158680, 158684, - 158688, 158692, 158696, 158700, 158704, 158708, 158712, 158716, 158720, - 158724, 158728, 158732, 158736, 158740, 158744, 158748, 158752, 158756, - 158760, 158764, 158768, 158772, 158776, 158780, 158784, 158788, 158792, - 158796, 158800, 158804, 158808, 158812, 158816, 158820, 158824, 158828, - 158832, 158836, 158840, 158844, 158848, 158852, 158856, 158860, 158864, - 158868, 158872, 158876, 158880, 158884, 158888, 158892, 158896, 158900, - 158904, 158908, 158912, 158916, 158920, 158924, 158928, 158932, 158936, - 158940, 158944, 158948, 158952, 158956, 158960, 158964, 158968, 158972, - 158976, 158980, 158984, 158988, 158992, 158996, 159000, 159004, 159008, - 159012, 159016, 159020, 159024, 159028, 159032, 159036, 159040, 159044, - 159048, 159052, 159056, 159060, 159064, 159068, 159072, 159076, 159080, - 159084, 159088, 159092, 159096, 159100, 159104, 159108, 159112, 159116, - 159120, 159124, 159128, 159132, 159136, 159140, 159144, 159148, 159152, - 159156, 159160, 159164, 159168, 159172, 159176, 159180, 159184, 159188, - 159192, 159196, 159200, 159204, 159208, 159212, 159216, 159220, 159224, - 159228, 159232, 159236, 159240, 159244, 159248, 159252, 159256, 159260, - 159264, 159268, 159272, 159276, 159280, 159284, 159288, 159292, 159296, - 159300, 159304, 159308, 159312, 159316, 159320, 159324, 159328, 159332, - 159336, 159340, 159344, 159348, 159352, 159356, 159360, 159364, 159368, - 159372, 159376, 159380, 159384, 159388, 159392, 159396, 159400, 159404, - 159408, 159412, 159416, 159420, 159424, 159428, 159432, 159436, 159440, - 159444, 159448, 159452, 159456, 159460, 159464, 159468, 159472, 159476, - 159480, 159484, 159488, 159492, 159496, 159500, 159504, 159508, 159512, - 159516, 159520, 159524, 159528, 159532, 159536, 159540, 159544, 159548, - 159552, 159556, 159560, 159564, 159568, 159572, 159576, 159580, 159584, - 159588, 159592, 159596, 159600, 159604, 159608, 159612, 159616, 159620, - 159624, 159628, 159632, 159636, 159640, 159644, 159648, 159652, 159656, - 159660, 159664, 159668, 159672, 159676, 159680, 159684, 159688, 159692, - 159696, 159700, 159704, 159708, 159712, 159716, 159720, 159724, 159728, - 159732, 159736, 159740, 159744, 159748, 159752, 159756, 159760, 159764, - 159768, 159772, 159776, 159780, 159784, 159788, 159792, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 163477, 163481, 163485, 163489, 163493, 163497, 163501, 163505, + 163509, 163513, 163517, 163521, 163525, 163529, 163533, 163537, 163541, + 163545, 163549, 163553, 163557, 163561, 163565, 163569, 163573, 163577, + 163581, 163585, 163589, 163593, 163597, 163601, 163605, 163609, 163613, + 163617, 163621, 163625, 163629, 163633, 163637, 163641, 163645, 163649, + 163653, 163657, 163661, 163665, 163669, 163673, 163677, 163681, 163685, + 163689, 163693, 163697, 163701, 163705, 163709, 163713, 163717, 163721, + 163725, 163729, 163733, 163737, 163741, 163745, 163749, 163753, 163757, + 163761, 163765, 163769, 163773, 163777, 163781, 163785, 163789, 163793, + 163797, 163801, 163805, 163809, 163813, 163817, 163821, 163825, 163829, + 163833, 163837, 163841, 163845, 163849, 163853, 163857, 163861, 163865, + 163869, 163873, 163877, 163881, 163885, 163889, 163893, 163897, 163901, + 163905, 163909, 163913, 163917, 163921, 163925, 163929, 163933, 163937, + 163941, 163945, 163949, 163953, 163957, 163961, 163965, 163969, 163973, + 163977, 163981, 163985, 163989, 163993, 163997, 164001, 164005, 164009, + 164013, 164017, 164021, 164025, 164029, 164033, 164037, 164041, 164045, + 164049, 164053, 164057, 164061, 164065, 164069, 164073, 164077, 164081, + 164085, 164089, 164093, 164097, 164101, 164105, 164109, 164113, 164117, + 164121, 164125, 164129, 164133, 164137, 164141, 164145, 164149, 164153, + 164157, 164161, 164165, 164169, 164173, 164177, 164181, 164185, 164189, + 164193, 164197, 164201, 164205, 164209, 164213, 164217, 164221, 164225, + 164229, 164233, 164237, 164241, 164245, 164249, 164253, 164257, 164261, + 164265, 164269, 164273, 164277, 164281, 164285, 164289, 164293, 164297, + 164301, 164305, 164309, 164313, 164317, 164321, 164325, 164329, 164333, + 164337, 164341, 164345, 164349, 164353, 164357, 164361, 164365, 164369, + 164373, 164377, 164381, 164385, 164389, 164393, 164397, 164401, 164405, + 164409, 164413, 164417, 164421, 164425, 164429, 164433, 164437, 164441, + 164445, 164449, 164453, 164457, 164461, 164465, 164469, 164473, 164477, + 164481, 164485, 164489, 164493, 164497, 164501, 164505, 164509, 164513, + 164517, 164521, 164525, 164529, 164533, 164537, 164541, 164545, 164549, + 164553, 164557, 164561, 164565, 164569, 164573, 164577, 164581, 164585, + 164589, 164593, 164597, 164601, 164605, 164609, 164613, 164617, 164621, + 164625, 164629, 164633, 164637, 164641, 164645, 164649, 164653, 164657, + 164661, 164665, 164669, 164673, 164677, 164681, 164685, 164689, 164693, + 164697, 164701, 164705, 164709, 164713, 164717, 164721, 164725, 164729, + 164733, 164737, 164741, 164745, 164749, 164753, 164757, 164761, 164765, + 164769, 164773, 164777, 164781, 164785, 164789, 164793, 164797, 164801, + 164805, 164809, 164813, 164817, 164821, 164825, 164829, 164833, 164837, + 164841, 164845, 164849, 164853, 164857, 164861, 164865, 164869, 164873, + 164877, 164881, 164885, 164889, 164893, 164897, 164901, 164905, 164909, + 164913, 164917, 164921, 164925, 164929, 164933, 164937, 164941, 164945, + 164949, 164953, 164957, 164961, 164965, 164969, 164973, 164977, 164981, + 164985, 164989, 164993, 164997, 165001, 165005, 165009, 165013, 165017, + 165021, 165025, 165029, 165033, 165037, 165041, 165045, 165049, 165053, + 165057, 165061, 165065, 165069, 165073, 165077, 165081, 165085, 165089, + 165093, 165097, 165101, 165105, 165109, 165113, 165117, 165121, 165125, + 165129, 165133, 165137, 165141, 165145, 165149, 165153, 165157, 165161, + 165165, 165169, 165173, 165177, 165181, 165185, 165189, 165193, 165197, + 165201, 165205, 165209, 165213, 165217, 165221, 165225, 165229, 165233, + 165237, 165241, 165245, 165249, 165253, 165257, 165261, 165265, 165269, + 165273, 165277, 165281, 165285, 165289, 165293, 165297, 165301, 165305, + 165309, 165313, 165317, 165321, 165325, 165329, 165333, 165337, 165341, + 165345, 165349, 165353, 165357, 165361, 165365, 165369, 165373, 165377, + 165381, 165385, 165389, 165393, 165397, 165401, 165405, 165409, 165413, + 165417, 165421, 165425, 165429, 165433, 165437, 165441, 165445, 165449, + 165453, 165457, 165461, 165465, 165469, 165473, 165477, 165481, 165485, + 165489, 165493, 165497, 165501, 165505, 165509, 165513, 165517, 165521, + 165525, 165529, 165533, 165537, 165541, 165545, 165549, 165553, 165557, + 165561, 165565, 165569, 165573, 165577, 165581, 165585, 165589, 165593, + 165597, 165601, 165605, 165609, 165613, 165617, 165621, 165625, 165629, + 165633, 165637, 165641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -20078,3186 +21353,3279 @@ static unsigned int phrasebook_offset2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 159796, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 159800, 159803, 159807, 159811, - 159814, 159818, 159822, 159825, 159828, 159832, 159836, 159839, 159842, - 159845, 159848, 159853, 159856, 159860, 159863, 159866, 159869, 159872, - 159875, 159878, 159882, 159885, 159889, 159892, 159895, 159899, 159903, - 159907, 159911, 159916, 159921, 159927, 159933, 159939, 159944, 159950, - 159956, 159962, 159967, 159973, 159979, 159984, 159990, 159996, 160001, - 160007, 160013, 160018, 160023, 160029, 160034, 160040, 160046, 160052, - 160058, 160064, 160068, 160073, 160077, 160082, 160086, 160091, 160096, - 160102, 160108, 160114, 160119, 160125, 160131, 160137, 160142, 160148, - 160154, 160159, 160165, 160171, 160176, 160182, 160188, 160193, 160198, - 160204, 160209, 160215, 160221, 160227, 160233, 160239, 160244, 160248, - 160253, 160256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 165645, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 165649, 165652, 165656, 165660, 165663, 165667, 165671, 165674, + 165677, 165681, 165685, 165688, 165691, 165694, 165697, 165702, 165705, + 165709, 165712, 165715, 165718, 165721, 165724, 165727, 165731, 165734, + 165738, 165741, 165744, 165748, 165752, 165756, 165760, 165765, 165770, + 165776, 165782, 165788, 165793, 165799, 165805, 165811, 165816, 165822, + 165828, 165833, 165839, 165845, 165850, 165856, 165862, 165867, 165873, + 165879, 165884, 165890, 165896, 165902, 165908, 165914, 165918, 165923, + 165927, 165932, 165936, 165941, 165946, 165952, 165958, 165964, 165969, + 165975, 165981, 165987, 165992, 165998, 166004, 166009, 166015, 166021, + 166026, 166032, 166038, 166043, 166049, 166055, 166060, 166066, 166072, + 166078, 166084, 166090, 166095, 166099, 166104, 166107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160260, 160263, 160266, 160269, - 160272, 160275, 160278, 160281, 160284, 160287, 160290, 160293, 160296, - 160299, 160302, 160305, 160308, 160311, 160314, 160317, 160320, 160323, - 160326, 160329, 160332, 160335, 160338, 160341, 160344, 160347, 160350, - 160353, 160356, 160359, 160362, 160365, 160368, 160371, 160374, 160377, - 160380, 160383, 160386, 160389, 160392, 160395, 160398, 160401, 160404, - 160407, 160410, 160413, 160416, 160419, 160422, 160425, 160428, 160431, - 160434, 160437, 160440, 160443, 160446, 160449, 160452, 160455, 160458, - 160461, 160464, 160467, 160470, 160473, 160476, 160479, 160482, 160485, - 160488, 160491, 160494, 160497, 160500, 160503, 160506, 160509, 160512, - 160515, 160518, 160521, 160524, 160527, 160530, 160533, 160536, 160539, - 160542, 160545, 160548, 160551, 160554, 160557, 160560, 160563, 160566, - 160569, 160572, 160575, 160578, 160581, 160584, 160587, 160590, 160593, - 160596, 160599, 160602, 160605, 160608, 160611, 160614, 160617, 160620, - 160623, 160626, 160629, 160632, 160635, 160638, 160641, 160644, 160647, - 160650, 160653, 160656, 160659, 160662, 160665, 160668, 160671, 160674, - 160677, 160680, 160683, 160686, 160689, 160692, 160695, 160698, 160701, - 160704, 160707, 160710, 160713, 160716, 160719, 160722, 160725, 160728, - 160731, 160734, 160737, 160740, 160743, 160746, 160749, 160752, 160755, - 160758, 160761, 160764, 160767, 160770, 160773, 160776, 160779, 160782, - 160785, 160788, 160791, 160794, 160797, 160800, 160803, 160806, 160809, - 160812, 160815, 160818, 160821, 160824, 160827, 160830, 160833, 160836, - 160839, 160842, 160845, 160848, 160851, 160854, 160857, 160860, 160863, - 160866, 160869, 160872, 160875, 160878, 160881, 160884, 160887, 160890, - 160893, 160896, 160899, 160902, 160905, 160908, 160911, 160914, 160917, - 160920, 160923, 160926, 160929, 160932, 160935, 160938, 160941, 160944, - 160947, 160950, 160953, 160956, 160959, 160962, 160965, 160968, 160971, - 160974, 160977, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160980, - 160982, 160984, 160989, 160991, 160996, 160998, 161003, 161005, 161010, - 161012, 161014, 161016, 161018, 161020, 161022, 161024, 161026, 161028, - 161031, 161035, 161037, 161039, 161043, 161047, 161052, 161054, 161056, - 161058, 161062, 161065, 161067, 161071, 161073, 161077, 161079, 161083, - 161086, 161088, 161092, 161096, 161098, 161104, 161106, 161111, 161113, - 161118, 161120, 161125, 161127, 161132, 161134, 161137, 161139, 161143, - 161145, 161152, 161154, 161156, 161158, 161163, 161165, 161167, 161169, - 161171, 161173, 161178, 161182, 161184, 161189, 161193, 161195, 161200, - 161204, 161206, 161211, 161215, 161217, 161219, 161221, 161223, 161227, - 161229, 161234, 161236, 161242, 161244, 161250, 161252, 161254, 161256, - 161260, 161262, 161269, 161271, 161278, 161280, 161285, 161291, 161293, - 161299, 161306, 161308, 161314, 161319, 161321, 161327, 161333, 161335, - 161341, 161347, 161349, 161355, 161359, 161361, 161366, 161368, 161370, - 161375, 161377, 161379, 161385, 161387, 161392, 161396, 161398, 161403, - 161407, 161409, 161415, 161417, 161421, 161423, 161427, 161429, 161436, - 161443, 161445, 161452, 161459, 161461, 161466, 161468, 161475, 161477, - 161482, 161484, 161490, 161492, 161496, 161498, 161504, 161506, 161510, - 161512, 161518, 161520, 161522, 161524, 161529, 161534, 161536, 161538, - 161548, 161552, 161559, 161566, 161571, 161576, 161588, 161590, 161592, - 161594, 161596, 161598, 161600, 161602, 161604, 161606, 161608, 161610, - 161612, 161614, 161616, 161618, 161620, 161622, 161624, 161626, 161628, - 161630, 161636, 161643, 161648, 161656, 161664, 161669, 161680, 161682, - 161684, 161686, 161688, 161690, 161692, 161694, 161696, 161698, 161700, - 161702, 161704, 161706, 161708, 161710, 161712, 161717, 161719, 161721, - 161727, 161739, 161750, 161752, 161754, 161756, 161758, 161760, 161762, - 161764, 161766, 161768, 161770, 161772, 161774, 161776, 161778, 161780, - 161782, 161784, 161786, 161788, 161790, 161792, 161794, 161796, 161798, - 161800, 161802, 161804, 161806, 161808, 161810, 161812, 161814, 161816, - 161818, 161820, 161822, 161824, 161826, 161828, 161830, 161832, 161834, - 161836, 161838, 161840, 161842, 161844, 161846, 161848, 161850, 161852, - 161854, 161856, 161858, 161860, 161862, 161864, 161866, 161868, 161870, - 161872, 161874, 161876, 161878, 161880, 161882, 161884, 161886, 161888, - 161890, 161892, 161894, 161896, 161898, 161900, 161902, 161904, 161906, - 161908, 161910, 161912, 161914, 161916, 161918, 161920, 161922, 161924, - 161926, 161928, 161930, 161932, 161934, 161936, 161938, 161940, 161942, - 161944, 161946, 161948, 161950, 161952, 161954, 161956, 161958, 161960, - 161962, 161964, 161966, 161968, 161970, 161972, 161974, 161976, 161978, - 161980, 161982, 161984, 161986, 161988, 161990, 161992, 161994, 161996, - 161998, 162000, 162002, 162004, 162006, 162008, 162010, 162012, 162014, - 162016, 162018, 162020, 162022, 162024, 162026, 162028, 162030, 162032, - 162034, 162036, 162038, 162040, 162042, 162044, 162046, 162048, 162050, - 162052, 162054, 162056, 162058, 162060, 162062, 162064, 162066, 162068, - 162070, 162072, 162074, 162076, 162078, 162080, 162082, 162084, 162086, - 162088, 162090, 162092, 162094, 162096, 162098, 162100, 162102, 162104, - 162106, 162108, 162110, 162112, 162114, 162116, 162118, 162120, 162122, - 162124, 162126, 162128, 162130, 162132, 162134, 162136, 162138, 162140, - 162142, 162144, 162146, 162148, 162150, 162152, 162154, 162156, 162158, - 162160, 162162, 162164, 162166, 162168, 162170, 162172, 162174, 162176, - 162178, 162180, 162182, 162184, 162186, 162188, 162190, 162192, 162194, - 162196, 162198, 162200, 162202, 162204, 162206, 162208, 162210, 162212, - 162214, 162216, 162218, 162220, 162222, 162224, 162226, 162228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 162230, 162240, 162250, 162259, 162268, 162281, 162294, 162306, - 162318, 162328, 162338, 162348, 162358, 162369, 162380, 162390, 162399, - 162408, 162417, 162430, 162443, 162455, 162467, 162477, 162487, 162497, - 162507, 162516, 162525, 162535, 162545, 162554, 162563, 162573, 162583, - 162592, 162601, 162611, 162621, 162632, 162643, 162653, 162666, 162677, - 162691, 162699, 162710, 162718, 162726, 162734, 162742, 162750, 162758, - 162767, 162776, 162786, 162796, 162805, 162814, 162824, 162834, 162842, - 162850, 162857, 162867, 162876, 162884, 162891, 162901, 162910, 162921, - 162932, 162944, 162955, 162965, 162976, 162986, 162997, 163005, 163009, - 163013, 163017, 163021, 163025, 163029, 163033, 163037, 163041, 163045, - 163049, 163053, 163056, 163059, 163063, 163067, 163071, 163075, 163079, - 163083, 163087, 163091, 163094, 163098, 163102, 163106, 163110, 163114, - 163118, 163122, 163126, 163130, 163134, 163138, 163142, 163146, 163150, - 163154, 163158, 163162, 163166, 163170, 163174, 163178, 163182, 163186, - 163190, 163194, 163198, 163202, 163206, 163210, 163214, 163218, 163222, - 163226, 163230, 163234, 163238, 163242, 163246, 163250, 163254, 163258, - 163262, 163266, 163270, 163274, 163278, 163282, 163286, 163290, 163294, - 163298, 163302, 163306, 163310, 163314, 163318, 163322, 163326, 163330, - 163334, 163338, 163342, 163346, 163350, 163354, 163358, 163362, 163366, - 163370, 163374, 163378, 163382, 163386, 163390, 163394, 163398, 163401, - 163405, 163409, 163413, 163417, 163421, 163425, 163429, 163433, 163437, - 163441, 163445, 163449, 163453, 163457, 163461, 163465, 163469, 163473, - 163477, 163481, 163485, 163489, 163493, 163497, 163501, 163505, 163509, - 163513, 163517, 163521, 163525, 163529, 163533, 163537, 163541, 163545, - 163549, 163553, 163557, 163561, 163565, 163569, 163573, 163577, 163581, - 163585, 163589, 163593, 163597, 163601, 163605, 163609, 163613, 163617, - 163621, 163625, 163629, 163633, 163637, 163641, 163645, 163649, 163653, - 163657, 163661, 163665, 163669, 163673, 163677, 163681, 163685, 163689, - 163693, 163697, 163701, 163705, 163709, 163713, 163717, 163721, 163725, - 163729, 163733, 163737, 163741, 163745, 163749, 163753, 163757, 163761, - 163765, 163769, 163773, 163777, 163781, 163785, 163789, 163793, 163797, - 163801, 163805, 163809, 163813, 163817, 163821, 163825, 163829, 163833, - 163837, 163841, 163845, 163849, 163853, 163857, 163861, 163865, 163869, - 163873, 163877, 163881, 163885, 163889, 163893, 163897, 163901, 163905, - 163909, 163913, 163917, 163921, 163925, 163929, 163933, 163937, 163941, - 163945, 163949, 163953, 163957, 163961, 163965, 163969, 163973, 163977, - 163981, 163985, 163989, 163993, 163997, 164001, 164005, 164009, 164013, - 164017, 164021, 164025, 164029, 164033, 164037, 164041, 164045, 164049, - 164053, 164057, 164061, 164065, 164069, 164073, 164077, 164081, 164085, - 164089, 164093, 164097, 164101, 164105, 164109, 164113, 164117, 164121, - 164125, 164129, 164133, 164137, 164141, 164145, 164149, 164153, 164157, - 164161, 164165, 164170, 164175, 164180, 164184, 164190, 164197, 164204, - 164211, 164218, 164225, 164232, 164239, 164246, 164253, 164260, 164267, - 164274, 164281, 164288, 164295, 164302, 164308, 164315, 164322, 164329, - 164336, 164343, 164350, 164357, 164364, 164371, 164378, 164385, 164392, - 164399, 164406, 164412, 164419, 164426, 164435, 164444, 164453, 164462, - 164467, 164472, 164478, 164484, 164490, 164496, 164502, 164508, 164514, - 164520, 164526, 164532, 164538, 164544, 164549, 164555, 164565, 0, 0, 0, + 0, 0, 166111, 166114, 166117, 166120, 166123, 166126, 166129, 166132, + 166135, 166138, 166141, 166144, 166147, 166150, 166153, 166156, 166159, + 166162, 166165, 166168, 166171, 166174, 166177, 166180, 166183, 166186, + 166189, 166192, 166195, 166198, 166201, 166204, 166207, 166210, 166213, + 166216, 166219, 166222, 166225, 166228, 166231, 166234, 166237, 166240, + 166243, 166246, 166249, 166252, 166255, 166258, 166261, 166264, 166267, + 166270, 166273, 166276, 166279, 166282, 166285, 166288, 166291, 166294, + 166297, 166300, 166303, 166306, 166309, 166312, 166315, 166318, 166321, + 166324, 166327, 166330, 166333, 166336, 166339, 166342, 166345, 166348, + 166351, 166354, 166357, 166360, 166363, 166366, 166369, 166372, 166375, + 166378, 166381, 166384, 166387, 166390, 166393, 166396, 166399, 166402, + 166405, 166408, 166411, 166414, 166417, 166420, 166423, 166426, 166429, + 166432, 166435, 166438, 166441, 166444, 166447, 166450, 166453, 166456, + 166459, 166462, 166465, 166468, 166471, 166474, 166477, 166480, 166483, + 166486, 166489, 166492, 166495, 166498, 166501, 166504, 166507, 166510, + 166513, 166516, 166519, 166522, 166525, 166528, 166531, 166534, 166537, + 166540, 166543, 166546, 166549, 166552, 166555, 166558, 166561, 166564, + 166567, 166570, 166573, 166576, 166579, 166582, 166585, 166588, 166591, + 166594, 166597, 166600, 166603, 166606, 166609, 166612, 166615, 166618, + 166621, 166624, 166627, 166630, 166633, 166636, 166639, 166642, 166645, + 166648, 166651, 166654, 166657, 166660, 166663, 166666, 166669, 166672, + 166675, 166678, 166681, 166684, 166687, 166690, 166693, 166696, 166699, + 166702, 166705, 166708, 166711, 166714, 166717, 166720, 166723, 166726, + 166729, 166732, 166735, 166738, 166741, 166744, 166747, 166750, 166753, + 166756, 166759, 166762, 166765, 166768, 166771, 166774, 166777, 166780, + 166783, 166786, 166789, 166792, 166795, 166798, 166801, 166804, 166807, + 166810, 166813, 166816, 166819, 166822, 166825, 166828, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 166831, 166833, 166835, 166840, 166842, + 166847, 166849, 166854, 166856, 166861, 166863, 166865, 166867, 166869, + 166871, 166873, 166875, 166877, 166879, 166882, 166886, 166888, 166890, + 166894, 166898, 166903, 166905, 166907, 166909, 166913, 166916, 166918, + 166922, 166924, 166928, 166930, 166934, 166937, 166939, 166943, 166947, + 166949, 166955, 166957, 166962, 166964, 166969, 166971, 166976, 166978, + 166983, 166985, 166988, 166990, 166994, 166996, 167003, 167005, 167007, + 167009, 167014, 167016, 167018, 167020, 167022, 167024, 167029, 167033, + 167035, 167040, 167044, 167046, 167051, 167055, 167057, 167062, 167066, + 167068, 167070, 167072, 167074, 167078, 167080, 167085, 167087, 167093, + 167095, 167101, 167103, 167105, 167107, 167111, 167113, 167120, 167122, + 167129, 167131, 167136, 167142, 167144, 167150, 167157, 167159, 167165, + 167170, 167172, 167178, 167184, 167186, 167192, 167198, 167200, 167206, + 167210, 167212, 167217, 167219, 167221, 167226, 167228, 167230, 167236, + 167238, 167243, 167247, 167249, 167254, 167258, 167260, 167266, 167268, + 167272, 167274, 167278, 167280, 167287, 167294, 167296, 167303, 167310, + 167312, 167317, 167319, 167326, 167328, 167333, 167335, 167341, 167343, + 167347, 167349, 167355, 167357, 167361, 167363, 167369, 167371, 167373, + 167375, 167380, 167385, 167387, 167389, 167399, 167404, 167411, 167418, + 167423, 167428, 167440, 167442, 167444, 167446, 167448, 167450, 167452, + 167454, 167456, 167458, 167460, 167462, 167464, 167466, 167468, 167470, + 167472, 167474, 167476, 167478, 167480, 167482, 167488, 167495, 167500, + 167508, 167516, 167521, 167532, 167534, 167536, 167538, 167540, 167542, + 167544, 167546, 167548, 167550, 167552, 167554, 167556, 167558, 167560, + 167562, 167564, 167569, 167571, 167573, 167579, 167591, 167602, 167604, + 167606, 167608, 167610, 167612, 167614, 167616, 167618, 167620, 167622, + 167624, 167626, 167628, 167630, 167632, 167634, 167636, 167638, 167640, + 167642, 167644, 167646, 167648, 167650, 167652, 167654, 167656, 167658, + 167660, 167662, 167664, 167666, 167668, 167670, 167672, 167674, 167676, + 167678, 167680, 167682, 167684, 167686, 167688, 167690, 167692, 167694, + 167696, 167698, 167700, 167702, 167704, 167706, 167708, 167710, 167712, + 167714, 167716, 167718, 167720, 167722, 167724, 167726, 167728, 167730, + 167732, 167734, 167736, 167738, 167740, 167742, 167744, 167746, 167748, + 167750, 167752, 167754, 167756, 167758, 167760, 167762, 167764, 167766, + 167768, 167770, 167772, 167774, 167776, 167778, 167780, 167782, 167784, + 167786, 167788, 167790, 167792, 167794, 167796, 167798, 167800, 167802, + 167804, 167806, 167808, 167810, 167812, 167814, 167816, 167818, 167820, + 167822, 167824, 167826, 167828, 167830, 167832, 167834, 167836, 167838, + 167840, 167842, 167844, 167846, 167848, 167850, 167852, 167854, 167856, + 167858, 167860, 167862, 167864, 167866, 167868, 167870, 167872, 167874, + 167876, 167878, 167880, 167882, 167884, 167886, 167888, 167890, 167892, + 167894, 167896, 167898, 167900, 167902, 167904, 167906, 167908, 167910, + 167912, 167914, 167916, 167918, 167920, 167922, 167924, 167926, 167928, + 167930, 167932, 167934, 167936, 167938, 167940, 167942, 167944, 167946, + 167948, 167950, 167952, 167954, 167956, 167958, 167960, 167962, 167964, + 167966, 167968, 167970, 167972, 167974, 167976, 167978, 167980, 167982, + 167984, 167986, 167988, 167990, 167992, 167994, 167996, 167998, 168000, + 168002, 168004, 168006, 168008, 168010, 168012, 168014, 168016, 168018, + 168020, 168022, 168024, 168026, 168028, 168030, 168032, 168034, 168036, + 168038, 168040, 168042, 168044, 168046, 168048, 168050, 168052, 168054, + 168056, 168058, 168060, 168062, 168064, 168066, 168068, 168070, 168072, + 168074, 168076, 168078, 168080, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 168082, 168092, 168102, + 168111, 168120, 168133, 168146, 168158, 168170, 168180, 168190, 168200, + 168210, 168221, 168232, 168242, 168251, 168260, 168269, 168282, 168295, + 168307, 168319, 168329, 168339, 168349, 168359, 168368, 168377, 168387, + 168397, 168406, 168415, 168425, 168435, 168444, 168453, 168463, 168473, + 168484, 168495, 168505, 168518, 168529, 168543, 168551, 168562, 168570, + 168578, 168586, 168594, 168602, 168610, 168619, 168628, 168638, 168648, + 168657, 168666, 168676, 168686, 168694, 168702, 168709, 168719, 168728, + 168736, 168743, 168753, 168762, 168773, 168784, 168796, 168807, 168817, + 168828, 168838, 168849, 168857, 168861, 168865, 168869, 168873, 168877, + 168881, 168885, 168889, 168893, 168897, 168901, 168905, 168908, 168911, + 168915, 168919, 168923, 168927, 168931, 168935, 168939, 168943, 168947, + 168951, 168955, 168959, 168963, 168967, 168971, 168975, 168979, 168983, + 168987, 168991, 168995, 168999, 169003, 169007, 169011, 169015, 169019, + 169023, 169027, 169031, 169035, 169039, 169043, 169047, 169051, 169055, + 169059, 169063, 169067, 169071, 169075, 169079, 169083, 169087, 169091, + 169095, 169099, 169103, 169107, 169111, 169115, 169119, 169123, 169127, + 169131, 169135, 169139, 169143, 169147, 169151, 169155, 169159, 169163, + 169167, 169171, 169175, 169179, 169183, 169187, 169191, 169195, 169199, + 169203, 169207, 169211, 169215, 169219, 169223, 169227, 169231, 169235, + 169239, 169243, 169247, 169251, 169254, 169258, 169262, 169266, 169270, + 169274, 169278, 169282, 169286, 169290, 169294, 169298, 169302, 169306, + 169310, 169314, 169318, 169322, 169326, 169330, 169334, 169338, 169342, + 169346, 169350, 169354, 169358, 169362, 169366, 169370, 169374, 169378, + 169382, 169386, 169390, 169394, 169398, 169402, 169406, 169410, 169414, + 169418, 169422, 169426, 169430, 169434, 169438, 169442, 169446, 169450, + 169454, 169458, 169462, 169466, 169470, 169474, 169478, 169482, 169486, + 169490, 169494, 169498, 169502, 169506, 169510, 169514, 169518, 169522, + 169526, 169530, 169534, 169538, 169542, 169546, 169550, 169554, 169558, + 169562, 169566, 169570, 169574, 169578, 169582, 169586, 169590, 169594, + 169598, 169602, 169606, 169610, 169614, 169618, 169622, 169626, 169630, + 169634, 169638, 169642, 169646, 169650, 169654, 169658, 169662, 169666, + 169670, 169674, 169678, 169682, 169686, 169690, 169694, 169698, 169702, + 169706, 169710, 169714, 169718, 169722, 169726, 169730, 169734, 169738, + 169742, 169746, 169750, 169754, 169758, 169762, 169766, 169770, 169774, + 169778, 169782, 169786, 169790, 169794, 169798, 169802, 169806, 169810, + 169814, 169818, 169822, 169826, 169830, 169834, 169838, 169842, 169846, + 169850, 169854, 169858, 169862, 169866, 169870, 169874, 169878, 169882, + 169886, 169890, 169894, 169898, 169902, 169906, 169910, 169914, 169918, + 169922, 169926, 169930, 169934, 169938, 169942, 169946, 169950, 169954, + 169958, 169962, 169966, 169970, 169974, 169978, 169982, 169986, 169990, + 169994, 169998, 170002, 170006, 170010, 170014, 170018, 170023, 170028, + 170033, 170037, 170043, 170050, 170057, 170064, 170071, 170078, 170085, + 170092, 170099, 170106, 170113, 170120, 170127, 170134, 170140, 170147, + 170154, 170160, 170167, 170174, 170181, 170188, 170195, 170202, 170209, + 170216, 170223, 170230, 170237, 170244, 170251, 170258, 170264, 170270, + 170277, 170286, 170295, 170304, 170313, 170318, 170323, 170329, 170335, + 170341, 170347, 170353, 170359, 170365, 170371, 170377, 170383, 170389, + 170395, 170400, 170406, 170416, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; /* name->code dictionary */ static unsigned int code_hash[] = { - 74224, 4851, 125138, 78156, 78499, 72391, 7929, 66910, 194682, 127766, + 74224, 4851, 125138, 78156, 78499, 72391, 7929, 8999, 194682, 127766, 78500, 66480, 64038, 42833, 74529, 12064, 72385, 596, 983821, 69850, - 13192, 8651, 120217, 126542, 120218, 12995, 64865, 1373, 119856, 113752, + 13192, 8651, 120217, 66789, 120218, 12995, 64865, 1373, 70740, 113752, 5816, 119067, 64810, 4231, 6825, 42897, 4233, 4234, 4232, 120889, 74415, - 120210, 6384, 70351, 78108, 8851, 67698, 128553, 82954, 41601, 8874, - 72392, 7748, 125083, 0, 127026, 127939, 41603, 9784, 0, 9188, 41600, 0, - 120618, 128343, 1457, 3535, 128635, 6381, 0, 0, 65240, 11951, 0, 3404, - 983079, 70487, 72411, 1759, 120853, 41076, 68383, 69972, 119205, 66577, - 94014, 127764, 65859, 0, 7404, 0, 0, 69970, 128387, 65908, 9834, 3055, - 9852, 128360, 65288, 121291, 11398, 0, 92417, 93016, 128380, 127337, 603, - 74398, 43548, 0, 71865, 917824, 3350, 120817, 64318, 194698, 78121, 3390, - 74483, 43265, 92399, 917830, 78573, 118803, 1919, 3400, 120651, 83296, - 11647, 83298, 66446, 64141, 8562, 2121, 64138, 4043, 8712, 64134, 64133, - 11297, 983688, 983152, 11966, 64128, 66286, 93042, 128830, 64132, 10867, - 64130, 64129, 121255, 43374, 9779, 2764, 66002, 10167, 9471, 83458, - 66021, 74509, 0, 5457, 5440, 8857, 93981, 65282, 2843, 5355, 68858, - 983342, 69971, 5194, 11657, 43984, 128292, 113724, 128872, 0, 0, 72393, - 10717, 64570, 5630, 5396, 64143, 10682, 83300, 10602, 800, 42499, 66186, - 0, 0, 64930, 11631, 64146, 64145, 64144, 762, 13172, 75008, 77928, 43929, - 10906, 1353, 6960, 83032, 128779, 5828, 8724, 917806, 8933, 1601, 42244, - 858, 7080, 64109, 64108, 8090, 70455, 72388, 74606, 587, 917907, 82971, - 0, 0, 0, 78214, 2750, 74218, 556, 64158, 64157, 78707, 12213, 83290, - 2760, 83284, 83285, 78708, 83287, 64156, 64155, 42496, 83283, 64151, - 64150, 12679, 10053, 10421, 11093, 64153, 64152, 125016, 0, 4839, 68527, - 0, 1874, 119016, 120091, 6577, 64125, 64124, 64123, 0, 127531, 92534, - 7007, 7590, 65443, 9036, 78847, 64122, 66389, 66609, 121347, 64117, - 64116, 6287, 64114, 2725, 64120, 64119, 43981, 42128, 127842, 1177, - 65601, 12322, 64106, 69640, 92895, 64102, 7859, 1945, 64099, 0, 10453, - 64104, 7188, 7997, 0, 7389, 983161, 8705, 64097, 64096, 9571, 528, - 128545, 44017, 11429, 71347, 0, 983077, 120864, 73841, 83339, 83340, - 9056, 64313, 6188, 74360, 6155, 64068, 1823, 64066, 64065, 64072, 64071, - 63, 7233, 92212, 72414, 41904, 6639, 64064, 983775, 128344, 121388, 1176, - 118959, 127930, 8162, 127019, 128197, 92747, 120519, 42931, 66242, 11415, - 4333, 9855, 64112, 64642, 0, 5388, 0, 121271, 983649, 7714, 66222, 69902, + 100413, 6384, 70351, 78108, 8851, 67698, 128553, 82954, 41601, 8874, + 72392, 7748, 125083, 0, 127026, 127939, 41603, 9784, 0, 9188, 41600, + 983981, 120618, 128343, 1457, 3535, 128635, 6381, 100872, 66797, 65240, + 11951, 0, 3404, 983079, 70487, 72411, 1759, 120853, 41076, 68383, 69972, + 119205, 66577, 94014, 127764, 65859, 125253, 7404, 125248, 128308, 69970, + 120648, 65908, 9834, 3055, 2234, 128360, 65288, 121291, 11398, 0, 92417, + 93016, 128380, 127337, 603, 74398, 43548, 0, 71865, 129366, 3350, 120817, + 64318, 120699, 78121, 3390, 74483, 43265, 92399, 917830, 78573, 118803, + 1919, 3400, 120651, 83296, 11647, 83298, 66446, 64141, 8562, 2121, 64138, + 4043, 8712, 64134, 64133, 11297, 983688, 983152, 11966, 64128, 66286, + 93042, 128830, 64132, 10867, 64130, 64129, 121255, 43374, 9779, 2764, + 66002, 10167, 9471, 83458, 66021, 74509, 983308, 5457, 5440, 8857, 93981, + 65282, 2843, 5355, 68858, 100530, 69971, 5194, 11657, 43984, 128292, + 100529, 128872, 0, 983907, 72393, 10717, 64570, 5630, 5396, 64143, 10682, + 83300, 10602, 800, 42499, 66186, 0, 128146, 64930, 11631, 64146, 64145, + 64144, 762, 13172, 75008, 77928, 43929, 10906, 1353, 6960, 83032, 100423, + 5828, 8724, 122916, 8933, 1601, 42244, 858, 7080, 64109, 64108, 8090, + 70455, 72388, 74606, 587, 194649, 82971, 983808, 129345, 194795, 78214, + 2750, 74218, 556, 64158, 64157, 78707, 12213, 83290, 2760, 83284, 83285, + 77934, 83287, 64156, 64155, 42496, 83283, 64151, 64150, 12679, 10053, + 10421, 11093, 64153, 64152, 125016, 0, 4839, 68527, 125091, 1874, 119016, + 120091, 6577, 64125, 64124, 64123, 120188, 127531, 92534, 7007, 7590, + 65443, 9036, 78847, 64122, 66389, 66609, 121347, 64117, 64116, 6287, + 64114, 2725, 64120, 64119, 43981, 42128, 127842, 1177, 65601, 12322, + 64106, 69640, 92895, 64102, 7859, 1945, 64099, 983482, 10453, 64104, + 7188, 7997, 128600, 7389, 983161, 8705, 64097, 64096, 9571, 528, 128545, + 44017, 11429, 71347, 0, 983077, 120864, 73841, 83339, 83340, 9056, 64313, + 6188, 74360, 6155, 64068, 1823, 64066, 64065, 64072, 64071, 63, 7233, + 74953, 72414, 41904, 6639, 64064, 983775, 128344, 121388, 1176, 118959, + 127930, 8162, 127019, 128197, 92747, 120519, 42931, 66242, 11415, 4333, + 9855, 64112, 64642, 0, 5388, 983405, 121271, 917907, 7714, 66222, 69902, 7768, 72403, 4199, 64708, 65064, 70117, 0, 8708, 9560, 64077, 64076, - 8996, 4992, 4471, 42622, 64079, 64078, 92179, 71878, 126570, 121256, - 64615, 41915, 0, 12075, 42041, 194825, 5174, 983217, 0, 127557, 3123, - 125100, 12685, 119216, 8408, 64704, 83328, 0, 9223, 0, 41616, 67999, - 73797, 83327, 1116, 75067, 43049, 7136, 43050, 8548, 120485, 0, 75031, - 917622, 128168, 13115, 43675, 64091, 9322, 83338, 83331, 64095, 64094, - 8111, 66247, 42332, 64089, 64088, 6199, 67249, 66398, 11434, 64083, - 64082, 11329, 7737, 64087, 64086, 64085, 64084, 83033, 9927, 41335, 4118, - 1797, 83312, 41334, 0, 46, 43448, 83309, 298, 83303, 83304, 83305, 42627, - 125011, 32, 6187, 83037, 11495, 11459, 3665, 83036, 42871, 0, 19923, - 74335, 0, 127192, 66239, 42264, 64403, 4412, 7240, 83314, 71444, 983468, - 65758, 12750, 4181, 8544, 83461, 68053, 83407, 120198, 69809, 6181, - 65014, 983422, 128484, 983196, 3639, 119588, 118851, 83039, 118904, - 10073, 120206, 83038, 127186, 68409, 42844, 7498, 1098, 92565, 120205, 0, - 128915, 10207, 8789, 93070, 120338, 92973, 128325, 9234, 917895, 6182, - 983475, 65058, 120319, 983480, 68064, 917831, 5471, 9461, 5573, 118936, - 5473, 44, 0, 66244, 94072, 0, 66238, 12844, 66894, 1622, 7767, 1900, - 41339, 11458, 119061, 0, 6581, 5576, 128618, 43855, 41337, 0, 41631, - 8947, 68390, 69683, 41694, 983848, 72396, 7908, 0, 10408, 6579, 917872, - 64618, 0, 120147, 2138, 6583, 7761, 70005, 120504, 194828, 128961, 5058, - 41010, 9992, 128299, 5057, 917941, 0, 74538, 5054, 118951, 194971, 78606, - 0, 1437, 41617, 658, 3497, 128509, 7486, 5061, 5060, 4235, 127878, - 128322, 128529, 12113, 4236, 4727, 128487, 0, 7693, 10749, 120332, 7488, - 5773, 978, 128134, 983699, 41619, 10239, 68611, 71864, 66209, 127233, - 74135, 9748, 983956, 127524, 0, 983316, 194676, 194675, 128081, 0, - 983313, 983302, 0, 127865, 0, 92776, 9341, 78821, 2379, 11325, 917902, - 64668, 67854, 8125, 120545, 6743, 83164, 917940, 2369, 83406, 983323, - 127966, 119235, 71868, 73936, 7008, 43660, 120346, 0, 43841, 2367, - 127827, 983857, 264, 2375, 8060, 6194, 119858, 1844, 119084, 129049, - 6019, 128975, 0, 6961, 0, 70435, 67171, 8800, 127332, 42862, 4463, 65581, - 6192, 119610, 42771, 0, 92333, 725, 65042, 93014, 120800, 74942, 12892, - 0, 67149, 74899, 73931, 0, 120495, 127261, 12224, 983128, 129061, 5074, - 5073, 121164, 8983, 118981, 74493, 71231, 5072, 74547, 6198, 11614, 0, - 196, 983154, 0, 983936, 4929, 120342, 129145, 0, 127987, 121455, 42847, - 92953, 0, 67754, 4934, 983981, 41323, 9758, 0, 92289, 70181, 42584, 0, - 4329, 41321, 4979, 3048, 7752, 41320, 983042, 64667, 12819, 983870, 5071, - 127915, 3642, 67334, 5070, 10042, 113813, 3987, 5068, 983460, 8909, - 78650, 78649, 69917, 10636, 73981, 11806, 43167, 4531, 1245, 9105, 66463, - 4921, 120219, 4926, 65544, 73884, 121359, 128028, 0, 64709, 83269, - 128854, 78880, 4922, 325, 992, 119568, 4925, 127218, 0, 9526, 4920, - 128617, 948, 0, 120208, 4930, 127857, 92175, 120275, 4933, 113779, - 121049, 118985, 4928, 983149, 83514, 74770, 120194, 126548, 722, 194934, - 19908, 12637, 127485, 82999, 8753, 1509, 0, 5468, 9511, 43493, 127477, - 1672, 6205, 10864, 74586, 127480, 70103, 92694, 78555, 127468, 73863, - 126577, 68336, 41607, 120115, 1679, 120116, 120180, 92761, 127462, 7005, - 41609, 9580, 70431, 401, 69949, 43779, 6968, 5761, 342, 8553, 127900, - 8143, 127115, 11983, 92249, 624, 74508, 4057, 43788, 5078, 74258, 12478, - 0, 5076, 128702, 82991, 0, 8295, 685, 9025, 1524, 12618, 0, 5539, 129182, - 92523, 71435, 7138, 120552, 43504, 194611, 66914, 65794, 12520, 8058, - 9732, 92480, 5080, 64775, 5036, 5035, 120590, 42604, 983656, 0, 8074, - 275, 13291, 1907, 78838, 4432, 121313, 5033, 120341, 120818, 4836, 3888, - 73792, 10729, 64546, 127262, 43704, 127264, 92957, 67588, 68061, 124983, - 70360, 8858, 6409, 7663, 120252, 128100, 119007, 0, 66321, 94052, 12814, - 127248, 3432, 10218, 0, 6094, 7641, 42445, 128792, 92487, 42406, 1676, - 67362, 74862, 67365, 5030, 67364, 118810, 195008, 73869, 9622, 113763, - 69944, 6787, 67361, 983270, 0, 68319, 10544, 12919, 71484, 72397, 0, 0, - 69906, 120789, 983041, 947, 67695, 67367, 128528, 10969, 67228, 7613, - 92562, 119936, 4795, 119930, 7018, 7376, 120181, 120192, 120268, 0, - 43567, 74056, 120266, 11833, 119919, 7216, 65232, 7217, 251, 7218, 7895, - 4395, 43538, 119926, 119834, 119928, 7213, 68476, 7214, 7215, 5879, - 74141, 8880, 7685, 66459, 120173, 65540, 67359, 625, 8187, 42861, 1113, - 7236, 7915, 3630, 120176, 8179, 70163, 67886, 9316, 10980, 2489, 65624, - 8150, 1359, 67652, 70464, 127330, 73756, 5042, 5041, 42769, 12084, - 127324, 127321, 74410, 127319, 127320, 127317, 121284, 127315, 12283, - 1616, 3795, 67732, 8795, 66245, 0, 0, 0, 1138, 73905, 12677, 128280, - 67724, 3239, 66893, 128818, 0, 8431, 0, 42164, 71229, 11778, 12620, 6826, - 73773, 70169, 5040, 127969, 0, 67094, 78420, 0, 5039, 983241, 78418, 0, - 5038, 0, 983862, 13184, 43960, 120931, 64648, 0, 9359, 78416, 917623, - 128770, 65157, 6662, 0, 70182, 3863, 73909, 4835, 55266, 43432, 127822, - 4309, 7127, 194569, 0, 194568, 1301, 0, 42589, 569, 128804, 73813, 711, - 4389, 7133, 120643, 73880, 11610, 11368, 0, 194570, 41331, 1006, 74240, - 67224, 1550, 8201, 70453, 7627, 5499, 5031, 77908, 42738, 65784, 43957, - 65267, 3758, 0, 65781, 64734, 67222, 2440, 43955, 70787, 8449, 0, 5008, - 983572, 2118, 126508, 12121, 8255, 5512, 73875, 2128, 2130, 2131, 2126, - 2133, 1119, 121250, 2114, 2116, 2455, 113798, 2122, 2123, 2124, 2125, - 127486, 8714, 983820, 2113, 195049, 2115, 128177, 127907, 43713, 5052, - 66220, 5821, 6186, 65778, 65775, 5051, 65773, 1429, 42647, 5050, 302, - 388, 41115, 735, 6637, 5907, 65088, 0, 12726, 74594, 9117, 983181, 12003, - 5513, 5109, 5053, 74230, 5510, 78451, 0, 78447, 2470, 78437, 0, 1925, - 71251, 92237, 74807, 983062, 5048, 5047, 194837, 983380, 74201, 92313, - 194802, 74497, 82982, 8089, 6929, 639, 82981, 68179, 64442, 70180, 82984, - 4599, 41402, 6674, 43397, 43294, 1476, 648, 0, 65819, 3233, 0, 41782, - 6951, 94017, 129197, 3530, 9750, 128317, 120991, 6656, 42618, 70175, - 5046, 8512, 65856, 74261, 8967, 0, 5045, 42026, 1916, 7986, 5044, 120556, - 9006, 13128, 5043, 121335, 7853, 67808, 74004, 9669, 12341, 12703, 8402, - 128883, 119070, 70174, 41750, 3586, 64508, 43148, 0, 127971, 119606, - 67983, 13296, 517, 0, 128467, 194946, 41528, 123, 65454, 0, 121326, - 74478, 10531, 7784, 41526, 10829, 73991, 8057, 1126, 73895, 194857, - 194591, 0, 3925, 4251, 8069, 10517, 71112, 489, 71110, 4250, 92266, - 120452, 43151, 983178, 92738, 66200, 0, 0, 125026, 74298, 128879, 983476, - 8711, 6183, 83448, 983952, 72402, 120448, 7623, 118925, 66376, 9235, - 12760, 74176, 69662, 66445, 43540, 10062, 3743, 11514, 11078, 0, 12136, - 0, 126597, 120434, 194850, 7726, 195095, 19922, 267, 3393, 42198, 1371, - 194849, 69233, 2458, 0, 6201, 0, 41074, 4266, 10652, 41612, 41077, 3402, - 9050, 3398, 128424, 983350, 0, 3391, 41075, 2476, 0, 128017, 0, 10625, - 129106, 12767, 13017, 78743, 64261, 64934, 70152, 13014, 13013, 121198, - 6673, 0, 0, 121324, 12438, 0, 983344, 83106, 71128, 120062, 9053, 13015, - 74523, 0, 704, 66215, 6195, 74949, 6660, 78758, 917760, 74861, 42212, - 12629, 11435, 0, 55256, 65538, 67343, 121437, 129086, 43876, 92941, - 65448, 78100, 12948, 119001, 128595, 43949, 120048, 78099, 127085, 0, - 128320, 4287, 8276, 4902, 1131, 983606, 78458, 66728, 1816, 43952, 42533, - 168, 42845, 4898, 64298, 43950, 78105, 4901, 1821, 43951, 578, 3653, - 128946, 791, 9162, 6977, 74196, 78889, 70160, 0, 73731, 8354, 43590, - 119303, 983451, 7557, 119108, 67378, 8234, 7241, 128608, 113735, 119167, - 194996, 12811, 65925, 3946, 78078, 10998, 78080, 673, 194867, 64397, - 128276, 74599, 78449, 8890, 194977, 194976, 2448, 78085, 10267, 8424, - 2452, 78083, 67217, 8729, 78456, 0, 7845, 126564, 71302, 4408, 4122, - 6772, 11039, 8723, 65896, 71310, 119302, 731, 119304, 71904, 2438, 64855, - 119300, 119299, 1175, 0, 42135, 373, 119172, 2119, 11457, 11521, 7723, - 128639, 0, 0, 41952, 93023, 5273, 2127, 5269, 6337, 5202, 2404, 5267, - 42823, 11291, 19915, 5277, 12963, 70320, 6189, 4125, 1314, 12133, 120340, - 118873, 1271, 983640, 129112, 66024, 41482, 3864, 9204, 0, 3879, 0, - 12978, 4166, 4574, 128111, 7567, 7459, 78128, 41390, 5384, 41882, 67647, - 70154, 5759, 194869, 121413, 41388, 64446, 41392, 64288, 41387, 67201, - 8706, 5552, 68837, 700, 0, 5553, 0, 7088, 5356, 7499, 68007, 66596, - 74066, 67251, 10263, 5554, 0, 12344, 10311, 78113, 6665, 11115, 121035, - 7618, 8517, 11455, 78440, 64632, 64447, 5555, 78088, 78093, 78091, 0, - 42803, 65033, 9143, 6668, 67288, 67995, 195069, 656, 195071, 65037, 4577, - 64624, 0, 0, 71912, 194908, 4269, 73885, 917775, 42846, 69644, 950, 0, - 92273, 66580, 77992, 66683, 10554, 119008, 119121, 6832, 5098, 917768, - 194668, 70403, 5097, 4935, 9848, 10381, 0, 67296, 92896, 3651, 0, 67294, - 70848, 5102, 5101, 10269, 12983, 8138, 4517, 1932, 5100, 1439, 12093, - 1247, 10034, 121340, 5099, 78373, 1441, 42087, 3063, 650, 119953, 7838, - 0, 128655, 195040, 119142, 9031, 70829, 78427, 9078, 8545, 66356, 128799, - 194923, 9154, 9118, 126543, 119586, 2676, 2277, 128422, 68237, 6190, - 8599, 125118, 69918, 10795, 9857, 7014, 9856, 195033, 71903, 12129, - 126651, 8481, 83068, 6202, 67711, 10920, 113726, 5203, 195039, 195038, - 5108, 5107, 65818, 66019, 9762, 11205, 5541, 74772, 0, 12613, 5284, 6657, - 207, 121206, 4275, 74819, 854, 68147, 74381, 66816, 78786, 5103, 127861, - 64348, 41368, 43974, 488, 69811, 0, 71339, 10157, 194612, 43034, 11438, - 64674, 0, 70158, 68431, 41771, 5106, 6669, 8504, 65154, 69813, 41367, - 5105, 65266, 69720, 6476, 5104, 983749, 304, 3176, 78871, 70149, 932, - 113683, 6567, 238, 69656, 78432, 194595, 19905, 43850, 195015, 78870, - 41044, 67640, 67302, 42055, 9912, 65939, 10670, 74093, 13273, 0, 12552, - 93039, 8803, 309, 6622, 8151, 10858, 78706, 67636, 70171, 12568, 127917, - 12553, 10814, 43275, 6950, 9712, 68680, 43970, 126535, 65165, 92725, 0, - 66466, 124986, 127784, 0, 66725, 6191, 11351, 10437, 11316, 67634, 43763, + 8996, 4992, 4471, 42622, 64079, 64078, 92179, 71878, 100377, 121256, + 64615, 41915, 100375, 12075, 42041, 125084, 5174, 983217, 100372, 74186, + 3123, 125100, 12685, 119216, 8408, 64704, 83328, 122891, 9223, 0, 41616, + 67999, 73797, 83327, 1116, 75067, 43049, 7136, 43050, 8548, 120485, + 983871, 75031, 917622, 128168, 13115, 43675, 64091, 9322, 83338, 83331, + 64095, 64094, 8111, 66247, 42332, 64089, 64088, 6199, 67249, 66398, + 11434, 64083, 64082, 11329, 7737, 64087, 64086, 64085, 64084, 83033, + 9927, 41335, 4118, 1797, 83312, 41334, 0, 46, 43448, 78591, 298, 83303, + 83304, 83305, 42627, 125011, 32, 6187, 83037, 11495, 11459, 3665, 83036, + 42871, 118902, 19923, 74335, 0, 127192, 66239, 42264, 64403, 4412, 7240, + 83314, 71444, 119321, 65758, 12750, 4181, 8544, 83461, 68053, 83407, + 120198, 69809, 6181, 65014, 100750, 128484, 983196, 3639, 119588, 118851, + 83039, 118904, 10073, 120206, 83038, 127186, 68409, 42844, 7498, 1098, + 92565, 120205, 917773, 128915, 10207, 8789, 93070, 120338, 92973, 128325, + 9234, 917895, 6182, 983475, 65058, 120319, 983211, 68064, 917831, 5471, + 9461, 5573, 118936, 5473, 44, 0, 66244, 94072, 0, 66238, 12844, 66894, + 1622, 7767, 1900, 41339, 11458, 119061, 983183, 6581, 5576, 128618, + 43855, 41337, 983772, 41631, 8947, 68390, 69683, 41694, 917787, 72396, + 7908, 0, 10408, 6579, 127890, 64618, 0, 120147, 2138, 6583, 7761, 70005, + 120504, 194828, 66802, 5058, 41010, 9992, 128299, 5057, 69892, 0, 74538, + 5054, 118951, 194971, 78606, 0, 1437, 41617, 658, 3497, 71365, 7486, + 5061, 5060, 4235, 127878, 128322, 128529, 12113, 4236, 4727, 128487, 0, + 7693, 10749, 120332, 7488, 5773, 978, 128134, 128693, 41619, 10239, + 68611, 71864, 66209, 127233, 74135, 9748, 100383, 127524, 125218, 983316, + 194676, 194675, 128081, 70681, 100385, 72811, 83354, 127865, 120999, + 92776, 9341, 78821, 2379, 11325, 100386, 64668, 67854, 8125, 120545, + 6743, 83164, 917940, 2369, 83406, 983323, 127966, 100543, 71868, 73936, + 7008, 43660, 120346, 0, 43841, 2367, 127827, 128275, 264, 2375, 8060, + 6194, 119858, 1844, 119084, 129049, 6019, 128975, 983557, 6961, 0, 70435, + 67171, 8800, 127332, 42862, 4463, 65581, 6192, 100744, 42771, 127983, + 92333, 725, 65042, 93014, 120800, 74942, 12892, 125212, 67149, 74899, + 73931, 0, 120495, 127261, 12224, 983128, 129061, 5074, 5073, 121164, + 8983, 118981, 74493, 70723, 5072, 74547, 6198, 11614, 125251, 196, + 983154, 128805, 128263, 4929, 120342, 129145, 100794, 100747, 121455, + 42847, 92953, 0, 67754, 4934, 128338, 41323, 9758, 128211, 92289, 70181, + 42584, 0, 4329, 41321, 4979, 3048, 7752, 41320, 917952, 64667, 12819, + 983597, 5071, 127915, 3642, 67334, 5070, 10042, 113813, 3987, 5068, + 983460, 8909, 78650, 78649, 69917, 10636, 73981, 11806, 43167, 4531, + 1245, 9105, 66463, 4921, 120219, 4926, 65544, 73884, 121359, 121267, + 127972, 64709, 83269, 128854, 78880, 4922, 325, 992, 119568, 4925, + 127218, 983059, 9526, 4920, 128617, 948, 0, 70706, 4930, 127857, 92175, + 119886, 4933, 113779, 121049, 118985, 4928, 983149, 83514, 74770, 120194, + 126548, 722, 194934, 19908, 12637, 127485, 82999, 8753, 1509, 125264, + 5468, 9511, 43493, 127477, 1672, 6205, 10864, 74586, 127480, 70103, + 92694, 78555, 127468, 73863, 126577, 68336, 41607, 92627, 1679, 120116, + 120180, 78837, 127462, 7005, 41609, 9580, 70431, 401, 69949, 43779, 6968, + 5761, 342, 8553, 92256, 8143, 120979, 11983, 74208, 624, 74508, 4057, + 43788, 5078, 74258, 12478, 120250, 5076, 128702, 82991, 0, 8295, 685, + 9025, 1524, 12618, 0, 5539, 100907, 92523, 71435, 7138, 120552, 43504, + 125197, 66914, 65794, 12520, 8058, 9732, 92480, 5080, 64775, 5036, 5035, + 100429, 42604, 100428, 0, 8074, 275, 13291, 1907, 74370, 4432, 121313, + 5033, 120341, 120818, 4836, 3888, 73792, 10729, 64546, 127262, 43704, + 127264, 92957, 2274, 68061, 100422, 70360, 8858, 6409, 7663, 78069, + 128100, 119007, 100424, 66321, 94052, 12814, 127248, 3432, 10218, 0, + 6094, 7641, 42445, 128792, 92487, 42406, 1676, 67362, 74862, 67365, 5030, + 67364, 118810, 195008, 73869, 9622, 113763, 69944, 6787, 67361, 194930, + 0, 68319, 10544, 12919, 71484, 72397, 983641, 0, 69906, 100857, 983041, + 947, 67695, 67367, 128528, 10969, 67228, 7613, 92562, 119936, 4795, + 100431, 7018, 7376, 120181, 120192, 120268, 120189, 43567, 74056, 120266, + 11833, 119919, 7216, 65232, 7217, 251, 7218, 7895, 4395, 43538, 100433, + 100860, 119928, 7213, 68476, 7214, 7215, 5879, 74141, 8880, 7685, 66459, + 120173, 65540, 67359, 625, 8187, 42861, 1113, 7236, 7915, 3630, 120176, + 8179, 70163, 67886, 9316, 10980, 2489, 65624, 8150, 1359, 67652, 70464, + 127330, 73756, 5042, 5041, 42769, 12084, 127324, 127321, 74410, 127319, + 127320, 127317, 121284, 127315, 12283, 1616, 3795, 67732, 8795, 66245, + 120838, 0, 0, 1138, 73905, 12677, 128280, 67724, 3239, 66893, 128818, + 194624, 8431, 0, 42164, 71229, 11778, 12620, 6826, 73773, 70169, 5040, + 127969, 0, 67094, 78420, 127036, 5039, 983241, 78418, 983936, 5038, + 917990, 983862, 13184, 43960, 70695, 64648, 126641, 9359, 78416, 917623, + 128770, 65157, 6662, 100604, 70182, 3863, 73909, 4835, 55266, 43432, + 127822, 4309, 7127, 118841, 129074, 194568, 1301, 0, 42589, 569, 128804, + 73813, 711, 4389, 7133, 120643, 73880, 11610, 11368, 0, 128436, 41331, + 1006, 74240, 67224, 1550, 8201, 70453, 7627, 5499, 5031, 77908, 42738, + 65784, 43957, 65267, 3758, 983844, 65781, 64734, 67222, 2440, 43955, + 70787, 8449, 983684, 5008, 983572, 2118, 122896, 12121, 8255, 5512, + 73875, 2128, 2130, 2131, 2126, 2133, 1119, 121250, 2114, 2116, 2455, + 113798, 2122, 2123, 2124, 2125, 127486, 8714, 983820, 2113, 195049, 2115, + 128177, 127748, 43713, 5052, 66220, 5821, 6186, 65778, 65775, 5051, + 65773, 1429, 42647, 5050, 302, 388, 41115, 735, 6637, 5907, 65088, 0, + 12726, 74594, 9117, 983181, 12003, 5513, 5109, 5053, 74230, 5510, 78451, + 0, 78447, 2470, 78437, 0, 1925, 71251, 92237, 74807, 983062, 5048, 5047, + 194837, 121275, 74201, 78743, 194802, 74497, 65933, 8089, 6929, 639, + 82981, 68179, 64442, 70180, 82984, 4599, 41402, 6674, 43397, 43294, 1476, + 648, 0, 65819, 3233, 0, 41782, 6951, 74306, 129197, 3530, 9750, 128317, + 120991, 6656, 42618, 70175, 5046, 8512, 65856, 74261, 8967, 100516, 5045, + 42026, 1916, 7986, 5044, 120556, 9006, 13128, 5043, 121335, 7853, 67808, + 74004, 9669, 12341, 12703, 8402, 128883, 119070, 70174, 41750, 3586, + 64508, 43148, 0, 127971, 119606, 67983, 13296, 517, 983878, 125017, + 100565, 41528, 123, 65454, 127215, 121326, 74478, 10531, 7784, 41526, + 10829, 73991, 8057, 1126, 73895, 100803, 194591, 983379, 3925, 4251, + 8069, 10517, 71112, 489, 71110, 4250, 92266, 120452, 43151, 983178, + 92738, 66200, 983626, 127905, 125026, 74298, 128879, 126625, 8711, 6183, + 83448, 983952, 72402, 120448, 7623, 100809, 66376, 9235, 12760, 74176, + 69662, 66445, 43540, 10062, 3743, 11514, 11078, 0, 12136, 983799, 126597, + 120434, 119052, 7726, 195095, 19922, 267, 3393, 42198, 1371, 122919, + 69233, 2458, 100435, 6201, 0, 41074, 4266, 10652, 41612, 41077, 3402, + 9050, 3398, 128424, 127083, 194894, 3391, 41075, 2476, 129129, 74990, 0, + 10625, 70715, 12767, 13017, 78741, 64261, 64934, 70152, 13014, 13013, + 121198, 6673, 0, 0, 121324, 12438, 0, 983344, 83106, 71128, 120062, 9053, + 13015, 74523, 0, 704, 66215, 6195, 74949, 6660, 78758, 917760, 74861, + 42212, 12629, 11435, 0, 55256, 65538, 66809, 121437, 129086, 43876, + 92941, 65448, 78100, 12948, 119001, 119926, 43949, 120048, 78099, 127085, + 127964, 128320, 4287, 8276, 4902, 1131, 983606, 78458, 66728, 1816, + 43952, 42533, 168, 42845, 4898, 64298, 43950, 78105, 4901, 1821, 43951, + 578, 3653, 100476, 791, 9162, 6977, 74196, 78889, 70160, 0, 73731, 8354, + 43590, 119303, 983451, 7557, 119108, 67378, 8234, 7241, 128608, 113735, + 119167, 194996, 12811, 65925, 3946, 78078, 10998, 66807, 673, 194867, + 64397, 119235, 74599, 78449, 8890, 194977, 119322, 2448, 78085, 10267, + 8424, 2452, 78083, 67217, 8729, 78456, 0, 7845, 125117, 71302, 4408, + 4122, 6772, 11039, 8723, 65896, 71310, 119302, 731, 119304, 71904, 2438, + 64855, 119300, 119299, 1175, 129136, 42135, 373, 119172, 2119, 11457, + 11521, 7723, 128639, 125242, 0, 41952, 93023, 5273, 2127, 5269, 6337, + 5202, 2404, 5267, 42823, 11291, 19915, 5277, 12963, 70320, 6189, 4125, + 1314, 12133, 120340, 118873, 1271, 983556, 129112, 66024, 41482, 2434, + 9204, 917558, 3879, 194868, 12978, 4166, 4574, 128111, 7567, 7459, 78128, + 41390, 5384, 41882, 67647, 70154, 5759, 194869, 121413, 41388, 64446, + 41392, 64288, 41387, 67201, 8706, 5552, 68837, 700, 0, 5553, 0, 7088, + 5356, 7499, 68007, 66596, 74066, 67251, 10263, 5554, 0, 12344, 10311, + 78113, 6665, 11115, 121035, 7618, 8517, 11455, 78440, 64632, 64447, 5555, + 78088, 66810, 78091, 0, 42803, 65033, 9143, 6668, 67288, 67995, 194986, + 656, 128574, 65037, 4577, 64624, 129354, 120264, 71912, 194908, 4269, + 73885, 917775, 42846, 69644, 950, 195085, 92273, 66580, 77992, 66683, + 10554, 3417, 101057, 6832, 5098, 917768, 194668, 70403, 5097, 4935, 9848, + 10381, 0, 67296, 72798, 3651, 0, 67294, 70848, 5102, 5101, 10269, 12983, + 8138, 4517, 1932, 5100, 1439, 12093, 1247, 10034, 121340, 5099, 78373, + 1441, 42087, 3063, 650, 119953, 7838, 983669, 128655, 195040, 119142, + 9031, 70829, 78427, 9078, 8545, 66356, 128799, 194923, 9154, 9118, + 126543, 119586, 2676, 2277, 128422, 68237, 6190, 8599, 125118, 69918, + 10795, 9857, 7014, 9856, 195033, 71903, 12129, 126651, 8481, 83068, 6202, + 67711, 10920, 113726, 5203, 195039, 129328, 5108, 5107, 65818, 66019, + 9762, 11205, 5541, 74772, 0, 12613, 5284, 6657, 207, 121206, 4275, 74819, + 854, 68147, 74381, 66816, 78786, 5103, 127861, 64348, 41368, 43974, 488, + 69811, 100911, 71339, 10157, 194612, 43034, 11438, 64674, 0, 70158, + 68431, 41771, 5106, 6669, 8504, 65154, 69813, 41367, 5105, 65266, 69720, + 6476, 5104, 194734, 304, 3176, 78871, 70149, 932, 113683, 6567, 238, + 69656, 78432, 194595, 19905, 43850, 195015, 78870, 41044, 67640, 67302, + 42055, 9912, 65939, 10670, 74093, 13273, 0, 12552, 93039, 8803, 309, + 6622, 8151, 10858, 78706, 67636, 70171, 12568, 127917, 12553, 10814, + 43275, 6950, 9712, 68680, 43970, 126535, 65165, 92725, 983822, 66466, + 124986, 127784, 128534, 66725, 6191, 11351, 10437, 11316, 67634, 43763, 0, 41754, 67635, 9370, 2720, 194600, 68462, 8232, 118817, 121056, 3222, - 121439, 121137, 0, 66663, 983047, 93067, 10834, 983127, 0, 65732, 94095, - 917547, 92682, 67679, 120734, 67309, 7781, 41383, 64568, 67311, 120738, + 121439, 121137, 0, 66663, 127928, 93067, 10834, 127547, 0, 65732, 94095, + 917547, 92682, 67679, 101021, 67309, 7781, 41383, 64568, 67311, 120738, 12077, 74433, 64586, 917620, 42396, 55255, 3475, 67260, 2479, 67306, 3632, 120728, 10698, 8376, 3648, 67263, 74844, 67639, 3636, 67894, 3650, - 8837, 65229, 1843, 42283, 43250, 41562, 9100, 74548, 68826, 3640, 127190, - 42321, 7284, 92880, 118987, 194950, 194949, 74115, 194951, 126649, - 194953, 42080, 2529, 0, 983784, 66010, 42083, 74952, 68398, 194957, - 67619, 66367, 194958, 9634, 92380, 9988, 0, 41068, 0, 4295, 65264, 68006, - 0, 67835, 0, 785, 8236, 128647, 9027, 68160, 67623, 64383, 120265, 925, - 127156, 0, 41985, 41071, 9586, 120988, 41984, 9217, 128372, 92510, 92218, - 9186, 2067, 4016, 983803, 0, 381, 12936, 0, 42077, 92985, 69880, 5184, - 42078, 194607, 10810, 128531, 4585, 19943, 5860, 67633, 121334, 127104, - 812, 3615, 72401, 5178, 44000, 92436, 78807, 5188, 74287, 67629, 3605, - 10692, 1166, 64429, 42639, 924, 127793, 67631, 42616, 120670, 2442, - 10703, 67317, 67632, 67316, 12771, 12736, 12753, 66708, 73933, 67626, - 42401, 194865, 69872, 127373, 42288, 12751, 74906, 8542, 13145, 194963, - 2468, 66706, 41294, 3626, 3883, 64388, 42479, 71220, 41117, 0, 92580, - 128624, 74939, 67624, 127976, 1290, 0, 65585, 2715, 806, 65208, 41884, - 917883, 1318, 64731, 78004, 0, 0, 66325, 3465, 2405, 9240, 983858, 12756, - 65259, 0, 983781, 12752, 5833, 1432, 11246, 41883, 73912, 9799, 917893, - 41886, 2480, 127906, 2062, 67326, 6494, 5537, 78656, 0, 194587, 124969, - 1211, 0, 120971, 67269, 118832, 12318, 129024, 113796, 68005, 10622, - 983779, 0, 68821, 6566, 71195, 0, 73780, 119196, 64864, 0, 78660, 0, - 8284, 13081, 119206, 3589, 42051, 4035, 6492, 83003, 4265, 6642, 3977, - 74186, 41778, 836, 92947, 2488, 125096, 4582, 0, 71426, 41777, 12926, - 983379, 7528, 10550, 113761, 92706, 983955, 10961, 93977, 1374, 64878, - 119014, 67720, 42389, 41374, 2286, 917604, 78492, 41377, 127909, 195047, - 400, 12597, 120586, 128097, 129071, 6661, 917961, 64827, 0, 73817, 390, - 0, 71301, 127292, 3473, 7718, 113755, 68814, 0, 55285, 73784, 66394, 0, - 11969, 120461, 127841, 6365, 1887, 6763, 92551, 8080, 7006, 0, 118902, - 6757, 64351, 1544, 67156, 6766, 64677, 120716, 67088, 6146, 74031, 771, - 120682, 0, 12812, 13168, 42272, 12200, 66423, 7904, 0, 953, 12917, - 119560, 12300, 67089, 11491, 9724, 10341, 983773, 9524, 7490, 11389, - 7489, 3379, 0, 7487, 194624, 471, 7484, 7482, 6753, 7480, 5764, 7478, - 7477, 6501, 7475, 6918, 7473, 7472, 2474, 7470, 7468, 10232, 10615, - 10213, 127288, 92357, 10049, 11834, 3544, 983785, 6017, 65311, 74935, - 120216, 13306, 10533, 7870, 73949, 7625, 194882, 120544, 0, 127950, - 92660, 983356, 77889, 0, 19961, 2472, 42665, 92341, 121133, 2139, 4256, - 120776, 74380, 43836, 42675, 42658, 12845, 6666, 70508, 65138, 119355, - 67862, 0, 65671, 7083, 120008, 8066, 7678, 74865, 125134, 120321, 127283, - 983396, 7186, 0, 120555, 0, 445, 120566, 66849, 125141, 0, 8330, 0, 0, - 42797, 113736, 120215, 83001, 3902, 0, 1770, 43959, 125067, 1560, 43958, - 92167, 4584, 73843, 0, 11712, 10866, 67092, 1118, 71334, 74888, 0, 1081, - 7436, 11147, 7252, 70093, 5996, 69921, 4903, 68142, 41386, 5162, 119189, - 1330, 128613, 7139, 0, 12047, 41384, 0, 0, 1848, 4334, 6324, 41975, - 64777, 10674, 12308, 12186, 0, 0, 983741, 12715, 68002, 194576, 83256, - 2018, 66672, 41979, 66685, 119157, 68000, 78490, 0, 126984, 68001, 9334, - 92705, 70800, 70101, 7975, 0, 77957, 0, 43494, 4884, 66597, 69732, 0, - 121010, 6313, 65513, 69857, 0, 0, 0, 2345, 43697, 463, 0, 127890, 68178, - 3117, 5460, 121423, 128717, 983389, 0, 42279, 127142, 126503, 78415, - 983228, 68524, 983386, 13248, 125027, 983843, 43956, 128415, 983153, - 121009, 5663, 71120, 128472, 128958, 0, 2482, 1471, 194583, 113747, - 42247, 12378, 73925, 69664, 71427, 12374, 121357, 127067, 0, 118828, - 2460, 71882, 11944, 12376, 92342, 64679, 92893, 12380, 10557, 64473, - 5870, 11122, 2024, 127180, 983391, 71879, 539, 0, 120302, 70120, 3853, - 65180, 127923, 120796, 120245, 92324, 0, 8659, 0, 12474, 67241, 9503, - 194969, 2478, 120248, 4162, 0, 4260, 12953, 69633, 82966, 12470, 92640, - 74189, 2742, 12476, 11798, 10946, 127310, 5000, 113687, 983579, 128190, - 69672, 8213, 43824, 7771, 6161, 68018, 6709, 194967, 78885, 119243, - 68235, 120582, 78547, 113709, 10301, 10333, 10397, 119044, 0, 73791, 0, - 83030, 0, 121482, 119123, 4014, 12842, 73952, 12015, 127290, 8275, 3893, - 74903, 120927, 12210, 7221, 42147, 74868, 74550, 71215, 64747, 118841, - 128086, 12516, 4444, 0, 92271, 74537, 10892, 8231, 0, 6473, 41968, 78388, - 41973, 3591, 41969, 83008, 2453, 118899, 92666, 64705, 71068, 0, 10349, - 10413, 43591, 41962, 3202, 74353, 129175, 8316, 129174, 0, 94060, 687, - 93055, 129074, 0, 1840, 127809, 68671, 11121, 4883, 285, 4723, 11175, - 92692, 4459, 74577, 42921, 41720, 11089, 240, 19906, 0, 42323, 74640, - 9743, 120232, 13134, 93065, 128956, 65931, 92579, 128329, 42634, 983345, - 43437, 3081, 11463, 120154, 0, 195013, 10445, 121322, 92969, 66717, 2614, - 9125, 71125, 1729, 129034, 72420, 65221, 63883, 43334, 64852, 124929, - 65194, 66201, 0, 66578, 5001, 41879, 74427, 4121, 5003, 884, 66700, - 63879, 4943, 5150, 73889, 73764, 4039, 643, 3086, 92533, 42448, 42299, - 58, 120084, 917952, 120083, 63873, 8491, 0, 0, 983623, 4530, 42409, 7126, - 194575, 2721, 120073, 119096, 19929, 118941, 128797, 92975, 4242, 4264, - 120077, 120530, 66179, 42412, 65941, 13114, 64522, 10740, 3094, 983199, - 9754, 119102, 4437, 73948, 127074, 983240, 55280, 42174, 127954, 42430, - 0, 983452, 42355, 66026, 4306, 41380, 68432, 92586, 68314, 66667, 119351, - 194982, 121172, 42200, 42566, 70000, 128928, 5088, 6948, 0, 8524, 125040, - 0, 12385, 0, 74926, 69646, 1386, 64580, 11480, 6116, 65039, 65038, 12392, - 65036, 8064, 127558, 12101, 5822, 119004, 2080, 710, 77999, 11663, 1666, - 42091, 119657, 12383, 43671, 42092, 68418, 4289, 127897, 63896, 12061, - 42096, 43621, 3362, 12377, 119934, 983834, 68449, 7461, 73901, 1244, 331, - 73786, 12683, 10662, 0, 8112, 0, 65852, 74629, 12379, 127107, 92930, - 41964, 42208, 63843, 2084, 41965, 70089, 65866, 4327, 0, 63840, 66413, - 41220, 13032, 92980, 584, 12933, 43177, 12373, 69855, 13000, 1351, 2935, - 8698, 12665, 0, 1930, 0, 78229, 12427, 66514, 69859, 13031, 0, 63901, 0, - 3657, 119611, 65202, 6000, 113786, 12426, 121058, 119935, 41740, 12428, - 41283, 41916, 119210, 128318, 0, 12429, 6727, 983948, 7562, 125129, 5170, - 983915, 41755, 676, 0, 66704, 66664, 9978, 66491, 3536, 0, 9752, 92397, - 6162, 78320, 69228, 10113, 41829, 65886, 5159, 12422, 41832, 439, 3072, - 917828, 42207, 74549, 11796, 40970, 41830, 125021, 70151, 8308, 917797, - 70807, 119258, 67864, 113696, 917800, 12336, 4135, 67231, 341, 2727, - 4129, 3539, 0, 63861, 0, 7913, 0, 63859, 4131, 63868, 129085, 63867, + 8837, 65229, 1843, 42283, 43250, 41562, 9100, 74548, 68826, 3640, 92411, + 42321, 7284, 92880, 118987, 194783, 100897, 74115, 194951, 125199, + 194953, 42080, 2529, 983909, 983471, 66010, 42083, 74952, 68398, 194957, + 67619, 66367, 100899, 9634, 92380, 9988, 0, 41068, 0, 4295, 65264, 68006, + 0, 67835, 100900, 785, 8236, 128647, 9027, 68160, 67623, 64383, 120265, + 925, 127156, 0, 41985, 41071, 9586, 120988, 41984, 9217, 128372, 92510, + 92218, 9186, 2067, 4016, 128848, 129182, 381, 12936, 983736, 42077, + 92985, 69880, 5184, 42078, 194607, 10810, 128531, 4585, 19943, 5860, + 67633, 121334, 127104, 812, 3615, 72401, 5178, 44000, 92436, 78807, 5188, + 74287, 67629, 3605, 10692, 1166, 64429, 42639, 924, 127793, 67631, 42616, + 120670, 2442, 10703, 67317, 67632, 67316, 12771, 12736, 12753, 66708, + 73933, 67626, 42401, 194865, 69872, 127373, 42288, 12751, 74906, 8542, + 13145, 194963, 2468, 66706, 41294, 3626, 3883, 64388, 42479, 71220, + 41117, 100893, 92580, 128624, 74939, 67624, 127976, 1290, 100591, 65585, + 2715, 806, 65208, 41884, 917883, 1318, 64731, 78004, 0, 0, 66325, 3465, + 2405, 9240, 983858, 12756, 65259, 0, 983781, 12752, 5833, 1432, 11246, + 41883, 73912, 9799, 917893, 41886, 2480, 127906, 2062, 67326, 6494, 5537, + 78656, 983275, 70661, 124969, 1211, 0, 120971, 67269, 118832, 12318, + 129024, 113796, 68005, 10622, 983779, 0, 68821, 6566, 71195, 0, 73780, + 119196, 64864, 0, 78660, 129052, 8284, 13081, 119206, 3589, 42051, 4035, + 6492, 83003, 4265, 6642, 3977, 72743, 41778, 836, 92947, 2488, 125096, + 4582, 0, 71426, 41777, 12926, 72708, 7528, 10550, 113761, 92706, 983955, + 10961, 93977, 1374, 64878, 119014, 67720, 42389, 2273, 2286, 917604, + 78492, 41377, 127909, 195047, 400, 12597, 100482, 128097, 129071, 6661, + 917961, 64827, 0, 73817, 390, 119617, 71301, 127292, 3473, 7718, 113755, + 66742, 125139, 55285, 73784, 66394, 0, 11969, 120461, 127841, 6365, 1887, + 6763, 92551, 8080, 7006, 0, 92763, 6757, 64351, 1544, 67156, 6766, 64677, + 120716, 67088, 6146, 74031, 771, 120682, 194650, 12812, 13168, 42272, + 12200, 66423, 7904, 128715, 953, 12917, 72704, 12300, 67089, 11491, 9724, + 10341, 983773, 9524, 7490, 11389, 7489, 3379, 128775, 7487, 72716, 471, + 7484, 7482, 6753, 7480, 5764, 7478, 7477, 6501, 7475, 6918, 7473, 7472, + 2474, 7470, 7468, 10232, 10615, 10213, 127288, 92357, 10049, 11834, 3544, + 983390, 6017, 65311, 74935, 120216, 13306, 10533, 7870, 73949, 7625, + 100936, 120544, 0, 127950, 92660, 983356, 77889, 0, 19961, 2472, 42665, + 92341, 121133, 2139, 4256, 120776, 74380, 43836, 42675, 42658, 12845, + 6666, 70508, 65138, 119355, 67862, 0, 65671, 7083, 120008, 8066, 7678, + 74865, 125134, 120321, 127283, 127872, 7186, 72751, 120555, 72763, 445, + 119028, 66849, 125031, 917840, 8330, 0, 125018, 42797, 113736, 120215, + 83001, 3902, 0, 1770, 43959, 101039, 1560, 43958, 92167, 4584, 73843, + 122911, 11712, 10866, 67092, 1118, 71334, 74888, 983476, 1081, 7436, + 11147, 7252, 70093, 5996, 69921, 4903, 68142, 41386, 5162, 119189, 1330, + 126600, 7139, 0, 12047, 7675, 983847, 128797, 1848, 4334, 6324, 41975, + 64777, 10674, 12308, 12186, 0, 113795, 72807, 12715, 68002, 194576, + 83256, 2018, 66672, 41979, 66685, 119157, 68000, 78490, 129140, 126984, + 68001, 9334, 92705, 70800, 70101, 7975, 100910, 77957, 9214, 43494, 4884, + 66597, 69732, 0, 92958, 6313, 65513, 69857, 100908, 127799, 128757, 2345, + 43697, 463, 0, 121281, 68178, 3117, 5460, 121423, 127955, 983389, 0, + 42279, 127142, 126503, 78415, 983228, 8221, 983386, 13248, 125027, + 983843, 43956, 128415, 129093, 121009, 5663, 71120, 128472, 128958, + 127854, 2482, 1471, 194583, 113747, 42247, 12378, 73925, 69664, 71427, + 12374, 121357, 127067, 0, 118828, 2460, 71882, 11944, 12376, 92342, + 64679, 92893, 12380, 10557, 64473, 5870, 11122, 2024, 127180, 983391, + 71879, 539, 100933, 100932, 70120, 3853, 65180, 72730, 100939, 100938, + 92324, 983742, 8659, 0, 12474, 67241, 9503, 100941, 2478, 100943, 4162, + 100945, 4260, 12953, 69633, 82966, 12470, 92640, 74189, 2742, 12476, + 11798, 10946, 127310, 5000, 113687, 983579, 128190, 69672, 8213, 43824, + 7771, 6161, 68018, 6709, 92249, 78885, 119243, 68235, 83388, 78547, + 100921, 10301, 10333, 10397, 100925, 100928, 73791, 120238, 83030, 0, + 121482, 119123, 4014, 12842, 73952, 12015, 127290, 8275, 3893, 74903, + 120927, 12210, 7221, 42147, 74868, 74550, 71215, 64747, 100919, 128086, + 12516, 4444, 0, 92271, 74537, 10892, 8231, 0, 6473, 41968, 78388, 41973, + 3591, 41969, 83008, 2453, 118899, 92666, 64705, 71068, 0, 10349, 10413, + 43591, 41962, 3202, 74353, 129175, 8316, 129174, 0, 94060, 687, 93055, + 100705, 0, 1840, 121224, 68671, 11121, 4883, 285, 4723, 11175, 92692, + 4459, 74577, 42921, 41720, 11089, 240, 19906, 917770, 42323, 74640, 9743, + 120232, 13134, 93065, 128956, 65931, 92579, 128329, 42634, 983345, 43437, + 3081, 11463, 120154, 0, 194567, 10445, 121322, 92969, 66717, 2614, 9125, + 71125, 1729, 129034, 72420, 65221, 63883, 43334, 64852, 100915, 65194, + 66201, 100916, 66578, 5001, 41879, 74427, 4121, 5003, 884, 66700, 63879, + 4943, 5150, 73889, 73764, 4039, 643, 3086, 92533, 42448, 42299, 58, + 120084, 100355, 101026, 63873, 8491, 194643, 100891, 983623, 4530, 42409, + 7126, 100894, 2721, 120073, 119096, 19929, 118941, 127326, 92975, 4242, + 4264, 120077, 100902, 66179, 42412, 65941, 13114, 64522, 10740, 3094, + 120225, 9754, 119102, 4437, 73948, 127074, 119186, 55280, 42174, 127954, + 42430, 127835, 983452, 42355, 66026, 4306, 41380, 68432, 92586, 68314, + 66667, 119351, 100677, 121172, 42200, 42566, 70000, 100881, 5088, 6948, + 0, 8524, 72736, 0, 12385, 917855, 74926, 69646, 1386, 64580, 11480, 6116, + 65039, 65038, 12392, 65036, 8064, 127558, 12101, 5822, 119004, 2080, 710, + 77999, 11663, 1666, 42091, 74067, 12383, 43671, 42092, 68418, 4289, + 100885, 63896, 12061, 42096, 43621, 3362, 12377, 119934, 128586, 68449, + 7461, 73901, 1244, 331, 73786, 12683, 10662, 128778, 8112, 0, 65852, + 74629, 12379, 127107, 92930, 41964, 42208, 63843, 2084, 41965, 70089, + 65866, 4327, 63848, 63840, 66413, 41220, 13032, 92980, 584, 12933, 43177, + 12373, 69855, 13000, 1351, 2935, 8698, 12665, 100877, 1930, 100879, + 78229, 12427, 66514, 69859, 13031, 100571, 63901, 100587, 3657, 119611, + 65202, 6000, 113786, 12426, 121058, 74013, 41740, 12428, 41283, 41916, + 119210, 128318, 0, 12429, 6727, 100873, 7562, 100853, 5170, 78249, 41755, + 676, 100856, 66704, 66664, 9978, 66491, 3536, 83047, 9752, 92397, 6162, + 78320, 69228, 10113, 41829, 65886, 5159, 12422, 41832, 439, 3072, 917828, + 42207, 74549, 11796, 40970, 41830, 125021, 70151, 8308, 100694, 70807, + 119258, 67864, 113696, 917800, 12336, 4135, 67231, 341, 2727, 4129, 3539, + 100861, 63861, 70683, 7913, 100766, 63859, 4131, 63868, 100366, 63867, 4133, 11371, 210, 4600, 983897, 74560, 4137, 8082, 78506, 119062, 78504, 6704, 4591, 128029, 43873, 120753, 9680, 12937, 120623, 561, 12159, 195, 68321, 41501, 194581, 42031, 5719, 7172, 42687, 8368, 128306, 41499, - 93068, 71047, 42242, 41498, 917794, 42025, 78565, 65805, 42463, 67182, + 93068, 71047, 42242, 41498, 128178, 42025, 78565, 65805, 42463, 67182, 2924, 67183, 120510, 0, 983972, 92766, 73941, 67186, 42330, 67187, 3969, - 121405, 0, 7169, 1992, 9652, 73977, 7246, 42086, 126615, 2219, 121349, 0, - 128801, 67180, 127569, 327, 121277, 9042, 917777, 917776, 65148, 12433, - 917781, 120222, 83129, 12431, 8668, 12434, 67194, 113812, 5999, 75013, - 7712, 12432, 128243, 43653, 1726, 1015, 74079, 8212, 128065, 113754, - 42423, 119066, 194613, 72398, 66709, 121061, 8811, 927, 92532, 0, 12436, - 120087, 42021, 0, 67644, 1299, 12240, 42350, 65143, 0, 195016, 127972, - 78197, 11348, 0, 78037, 9194, 983184, 0, 19914, 12179, 128740, 2296, - 128932, 63836, 63832, 917773, 10967, 63816, 2594, 3444, 63817, 11178, - 917584, 41503, 127478, 11265, 68295, 120756, 194922, 67285, 5664, 3972, - 120891, 128583, 129408, 67284, 12416, 917764, 119608, 10816, 917769, - 11210, 12418, 8586, 3882, 8532, 917771, 1573, 68081, 119847, 4596, 66339, - 12417, 66001, 65343, 126491, 12414, 8287, 68219, 195017, 68108, 1143, - 119169, 119846, 12415, 6626, 42763, 917594, 118884, 9021, 120783, 119931, - 11724, 127787, 0, 71122, 126619, 0, 983661, 8027, 10997, 9171, 12741, - 11400, 43943, 194799, 66833, 128239, 983707, 92557, 93976, 127523, - 120190, 1324, 67608, 128214, 42368, 983873, 7715, 3881, 41487, 12118, - 42514, 68651, 128210, 128594, 3009, 41476, 41489, 69825, 3007, 1448, - 3018, 194809, 3889, 8521, 5083, 5082, 119859, 78255, 8519, 121226, 3014, - 5081, 65853, 120715, 194992, 68014, 69951, 5079, 64802, 42210, 4597, - 65532, 11828, 120185, 12371, 11105, 8407, 67163, 10805, 8518, 10779, - 120188, 71303, 121240, 12367, 42170, 0, 67290, 629, 1924, 127098, 12037, - 67158, 5987, 8462, 8005, 12365, 63933, 69735, 120815, 12369, 10649, - 67981, 5077, 120174, 10880, 63927, 5075, 121109, 127300, 65075, 0, 11007, - 70851, 66659, 92607, 917933, 66684, 128063, 3434, 4954, 1904, 92679, - 5266, 126980, 5272, 10499, 4507, 9578, 63923, 120177, 7979, 0, 9831, 0, - 194926, 461, 9803, 42282, 4504, 1505, 127893, 6325, 5276, 43021, 120488, - 0, 55236, 92659, 66461, 5177, 41324, 12055, 8722, 120805, 41327, 983732, - 66695, 4114, 409, 4383, 8900, 8948, 41325, 74930, 721, 10182, 9108, - 71311, 0, 119185, 42229, 74963, 121014, 5998, 0, 42353, 74825, 0, 12587, - 94104, 78571, 74889, 71328, 128955, 41576, 42215, 78570, 74037, 0, 8578, - 5995, 7573, 41575, 74789, 74752, 63944, 63949, 64767, 2670, 4167, 194796, - 11723, 0, 74120, 126642, 65076, 938, 43414, 73854, 11737, 9721, 0, 67179, - 67168, 11742, 2419, 67177, 11493, 12334, 92494, 4153, 12302, 10793, 5250, - 12407, 11978, 4404, 9189, 12401, 42007, 5775, 6759, 65806, 43997, 0, - 42002, 12404, 68092, 74928, 4940, 12410, 7683, 1167, 73729, 4983, 120507, - 861, 67699, 74880, 68297, 983807, 43757, 43370, 129298, 0, 11956, 124967, - 121263, 70815, 9616, 6631, 92338, 12816, 43759, 42218, 12710, 68674, - 12721, 4101, 66185, 0, 5992, 7616, 195044, 0, 12577, 93017, 128289, 853, + 101072, 983961, 7169, 1992, 9652, 73977, 7246, 42086, 126615, 2219, + 121349, 0, 128801, 67180, 127569, 327, 121277, 9042, 120843, 917776, + 65148, 12433, 917781, 120222, 74206, 12431, 8668, 12434, 67194, 113812, + 5999, 75013, 7712, 12432, 120885, 43653, 1726, 1015, 74079, 8212, 128065, + 113754, 42423, 119066, 194613, 72398, 66709, 121061, 8811, 927, 92532, + 983637, 12436, 101056, 42021, 194610, 67644, 1299, 12240, 42350, 65143, + 101058, 195016, 100566, 78197, 11348, 0, 78037, 9194, 100870, 0, 19914, + 12179, 100569, 2296, 100596, 63836, 63832, 72793, 10967, 63816, 2594, + 3444, 63817, 11178, 917584, 41503, 120087, 11265, 68295, 120756, 100600, + 67285, 5664, 3972, 100985, 128583, 129408, 67284, 12416, 917764, 119608, + 10816, 127289, 11210, 12418, 8586, 3882, 8532, 917771, 1573, 68081, + 119847, 4596, 66339, 12417, 66001, 65343, 126491, 12414, 8287, 68219, + 195017, 68108, 1143, 119169, 119846, 12415, 6626, 42763, 917594, 118884, + 9021, 120783, 119931, 11724, 127787, 120191, 71122, 126619, 0, 983661, + 8027, 10997, 9171, 12741, 11400, 43943, 100674, 66833, 100805, 127779, + 92557, 93976, 119844, 120190, 1324, 67608, 128214, 42368, 101062, 7715, + 2271, 41487, 12118, 42514, 68651, 128210, 128594, 3009, 41476, 41489, + 69825, 3007, 1448, 3018, 194807, 3889, 8521, 5083, 5082, 119859, 78255, + 8519, 72711, 3014, 5081, 65853, 120715, 194992, 68014, 69951, 5079, + 64802, 42210, 4597, 65532, 11828, 120185, 12371, 11105, 8407, 67163, + 10805, 8518, 10779, 100801, 71303, 121240, 12367, 42170, 128215, 67290, + 629, 1924, 127098, 12037, 67158, 5987, 8462, 8005, 12365, 63933, 69735, + 100888, 12369, 10649, 67981, 5077, 120174, 10880, 63927, 5075, 121109, + 127300, 65075, 0, 11007, 70851, 66659, 92607, 100607, 66684, 128063, + 3434, 4954, 1904, 92679, 5266, 126980, 5272, 10499, 4507, 9578, 63923, + 120177, 7979, 0, 9831, 0, 120589, 461, 9803, 42282, 4504, 1505, 127893, + 6325, 5276, 43021, 120488, 0, 55236, 92659, 66461, 5177, 41324, 12055, + 8722, 120805, 41327, 129332, 66695, 4114, 409, 4383, 8900, 8948, 41325, + 74930, 721, 10182, 9108, 71311, 0, 3419, 42229, 74963, 100627, 5998, 0, + 42353, 74825, 0, 12587, 94104, 78571, 74889, 71328, 100629, 41576, 42215, + 78570, 74037, 0, 8578, 5995, 7573, 41575, 74789, 74752, 63944, 63949, + 64767, 2670, 4167, 194796, 11723, 983439, 74120, 119000, 65076, 938, + 43414, 73854, 11737, 9721, 983262, 67179, 67168, 11742, 2419, 67177, + 11493, 12334, 92494, 4153, 12302, 10793, 5250, 12407, 11978, 4404, 9189, + 12401, 42007, 5775, 6759, 65806, 43997, 122922, 42002, 12404, 68092, + 74928, 4940, 12410, 7683, 1167, 73729, 4983, 120507, 861, 67699, 74880, + 68297, 983807, 43757, 43370, 129298, 128307, 11956, 124967, 121263, + 70815, 9616, 6631, 92338, 12816, 43759, 42218, 12710, 68674, 12721, 4101, + 66185, 983269, 5992, 7616, 195044, 983392, 12577, 93017, 100880, 853, 42693, 194647, 119027, 983284, 5016, 43535, 63893, 42835, 9491, 917913, - 0, 917914, 0, 12712, 7105, 127807, 65060, 66875, 9900, 7750, 917946, + 100875, 917914, 0, 12712, 7105, 127807, 65060, 66875, 9900, 7750, 917946, 127896, 74619, 119265, 983587, 64778, 12585, 10565, 128151, 12177, - 119843, 983260, 0, 77824, 0, 4900, 127874, 12878, 92630, 8984, 4119, + 119843, 118891, 0, 77824, 0, 4900, 125245, 12878, 92630, 8984, 4119, 74768, 8971, 78593, 43113, 9702, 66852, 11025, 9245, 13048, 4927, 4138, - 74185, 92481, 92710, 12397, 77827, 119040, 13054, 12394, 0, 0, 194954, - 13053, 118974, 3948, 10781, 1546, 0, 5010, 1680, 10507, 78590, 78583, - 92431, 121037, 126644, 194915, 7267, 127479, 74833, 128181, 5993, 2819, - 128788, 12706, 71063, 1893, 7266, 63915, 7264, 7265, 0, 1363, 983580, - 42923, 63910, 63996, 3077, 120018, 0, 1512, 69929, 12589, 41479, 128313, - 71048, 43339, 73776, 9836, 120727, 983909, 41481, 43335, 7832, 42343, - 3090, 43337, 817, 1664, 1850, 83177, 3079, 11340, 42408, 42447, 74932, - 74044, 42307, 12386, 42304, 917555, 83428, 12389, 121079, 92366, 41996, - 11526, 63985, 5864, 1147, 43849, 42887, 1987, 92718, 5480, 7858, 11653, - 4116, 12391, 66193, 121383, 4939, 12384, 0, 127778, 41686, 63905, 119601, - 70285, 67398, 128820, 12649, 120022, 0, 8247, 507, 91, 2042, 120775, - 43643, 121445, 66028, 10036, 41844, 119813, 774, 119829, 77840, 119815, - 5994, 12539, 0, 78375, 120597, 119833, 983105, 78377, 983237, 917628, - 7719, 6026, 2486, 128312, 119808, 162, 0, 65219, 41073, 9687, 41681, - 6304, 119812, 66196, 194881, 5262, 0, 55233, 12681, 42379, 0, 7534, - 12219, 2226, 70499, 42810, 10492, 121510, 121148, 121509, 43119, 0, - 78537, 12403, 2500, 70145, 83246, 4899, 12729, 983399, 194619, 74113, + 74185, 92481, 92710, 12397, 77827, 119040, 13054, 12394, 66182, 0, + 194937, 13053, 118974, 3948, 10781, 1546, 0, 5010, 1680, 10507, 78590, + 78583, 92431, 121037, 126644, 194915, 7267, 127479, 74833, 128181, 5993, + 2819, 128788, 12706, 71063, 1893, 7266, 63915, 7264, 7265, 983673, 1363, + 983580, 42923, 13109, 63996, 3077, 120018, 0, 1512, 69929, 12589, 41479, + 101031, 71048, 43339, 73776, 9836, 119607, 917817, 41481, 43335, 7832, + 42343, 3090, 43337, 817, 1664, 1850, 83177, 3079, 11340, 42408, 42447, + 74932, 74044, 42307, 12386, 42304, 917555, 83428, 12389, 121079, 92366, + 41996, 11526, 63985, 5864, 1147, 43849, 42887, 1987, 92718, 5480, 7858, + 11653, 4116, 12391, 66193, 121383, 4939, 12384, 120184, 127778, 41686, + 63905, 119601, 70285, 67398, 100884, 12649, 120022, 0, 8247, 507, 91, + 2042, 120775, 43643, 121445, 66028, 10036, 41844, 70680, 774, 119829, + 77840, 119815, 5994, 12539, 0, 78375, 120597, 119833, 983105, 78377, + 917823, 917628, 7719, 6026, 2486, 101019, 119808, 162, 0, 65219, 41073, + 9687, 41681, 6304, 119812, 66196, 119089, 5262, 0, 55233, 12681, 42379, + 0, 7534, 12219, 2226, 70499, 42810, 10492, 121510, 121148, 121509, 43119, + 0, 78537, 12403, 2500, 70145, 83246, 4899, 12729, 983399, 194619, 74113, 2343, 4103, 19946, 74112, 77851, 13112, 129046, 74834, 12859, 70087, 120148, 66369, 5861, 127758, 11999, 12400, 43641, 128183, 12645, 5146, 11320, 68410, 6748, 65040, 194786, 64184, 12974, 64183, 67613, 120645, - 5147, 125019, 0, 74524, 128356, 1928, 0, 67649, 5991, 3445, 67609, 4976, - 64176, 0, 67610, 8241, 0, 77868, 4206, 0, 78662, 129029, 128298, 67277, - 10138, 67238, 128785, 8897, 120234, 1422, 8357, 4124, 77862, 65836, - 120641, 127926, 77859, 0, 120930, 1123, 963, 41553, 10120, 12405, 120150, - 92664, 398, 13278, 9723, 6366, 120311, 7945, 129126, 4402, 9970, 12402, - 93062, 42392, 1305, 12408, 92384, 44007, 128563, 127216, 41464, 12411, - 12969, 67268, 41465, 121092, 8528, 1575, 0, 63955, 165, 3024, 41467, - 119163, 70119, 9093, 128535, 6833, 92574, 63958, 0, 9148, 9692, 4096, 53, - 8296, 6750, 66855, 128410, 9594, 120308, 120938, 43527, 121192, 727, - 74192, 93060, 5805, 0, 6726, 0, 42176, 12370, 11655, 119095, 10591, 2280, - 983234, 12372, 120642, 120307, 71209, 92343, 983872, 12366, 10963, 6066, - 1329, 0, 3052, 9220, 121045, 64478, 194701, 10803, 4132, 120306, 68474, - 92473, 983247, 120712, 74837, 120155, 1499, 0, 8055, 42740, 63965, - 120305, 63962, 74042, 8924, 43123, 5988, 3660, 63969, 11781, 42718, 8788, - 1357, 64851, 65743, 92894, 8774, 70337, 127086, 9941, 120172, 92748, - 1933, 69655, 9564, 120016, 92435, 73866, 0, 121241, 2487, 67614, 3121, - 1804, 3311, 67615, 70081, 78302, 12220, 67616, 92769, 120020, 194594, - 68200, 6675, 128144, 0, 67592, 120685, 0, 64771, 1198, 9132, 0, 64619, - 510, 64663, 0, 121500, 4561, 2101, 1398, 917972, 92554, 74034, 41569, - 92684, 11406, 8167, 12127, 120505, 840, 983283, 69992, 7101, 6967, 0, - 194898, 9796, 127000, 333, 69891, 0, 8144, 2117, 0, 121155, 12406, - 917970, 19931, 66388, 6678, 7769, 983124, 12621, 0, 127366, 10227, 4764, - 43101, 9981, 0, 40986, 4127, 66487, 983576, 42202, 12754, 195021, 983191, - 0, 94097, 67594, 2048, 12944, 4050, 67595, 917967, 43102, 10581, 11184, - 4533, 127212, 74003, 6490, 0, 12038, 0, 0, 68225, 65461, 9798, 69704, - 128912, 1948, 69841, 0, 952, 128235, 125107, 983354, 70296, 6449, 9494, - 120313, 0, 43098, 4843, 8142, 64160, 4098, 64170, 983341, 0, 3436, - 119973, 0, 12817, 67597, 6676, 3930, 42615, 66407, 69991, 67598, 0, 0, 0, - 65591, 41581, 65916, 1453, 194993, 121458, 127859, 8500, 42222, 120142, - 73743, 120400, 4317, 11543, 67676, 64676, 0, 127833, 67606, 119083, - 121083, 42217, 13102, 0, 66003, 6672, 0, 0, 66880, 77912, 63841, 9613, - 9001, 4526, 11274, 67601, 64520, 64210, 6664, 78704, 42056, 10228, 64957, - 11281, 0, 3807, 1469, 66640, 65381, 42197, 4988, 42372, 0, 9598, 904, - 352, 42225, 1451, 8061, 8453, 4134, 83485, 67223, 66576, 127916, 127831, - 10520, 8575, 9960, 1201, 127289, 12846, 127291, 68040, 11919, 64962, - 127081, 43739, 127281, 8511, 9460, 823, 11587, 12305, 0, 64695, 127305, - 12387, 1253, 13183, 65766, 500, 42783, 65765, 64208, 64369, 65760, 65761, - 70334, 11606, 64784, 11702, 66498, 9821, 64304, 127369, 5152, 11048, - 7533, 68366, 64410, 92305, 0, 4323, 70276, 92669, 71332, 120158, 42587, - 42214, 41394, 11188, 4763, 4112, 118935, 0, 5260, 43143, 94038, 326, - 120131, 68423, 119218, 10771, 2876, 74074, 92530, 128460, 41398, 7382, - 9802, 127077, 127076, 453, 41396, 120524, 13159, 12140, 9572, 983132, - 7003, 194883, 42334, 7704, 125069, 125020, 43144, 4123, 8494, 43146, - 9977, 0, 121283, 65759, 10765, 64061, 4465, 9808, 64056, 65582, 4126, 0, - 9521, 9589, 64755, 0, 64020, 126604, 10464, 0, 92968, 194610, 64514, - 11528, 64024, 128072, 679, 64013, 983555, 5850, 758, 7536, 120538, 92234, - 41441, 10693, 64006, 75044, 64005, 4058, 119019, 126487, 64660, 128176, - 119050, 0, 983069, 1139, 43298, 64027, 64029, 8970, 0, 9934, 128685, - 10774, 67104, 42201, 12421, 128216, 127006, 1852, 3057, 64046, 73744, - 64034, 64039, 68065, 0, 983690, 92913, 92322, 7645, 12854, 74338, 3496, - 0, 121323, 113710, 9102, 627, 127795, 6158, 8327, 74553, 66632, 12419, - 13309, 11570, 127811, 19960, 11696, 0, 1018, 118970, 129075, 194897, - 1682, 43863, 194896, 42756, 6765, 194906, 67717, 74358, 73814, 11412, - 6768, 10728, 119982, 71316, 71099, 43311, 64966, 11577, 127832, 43040, - 1833, 11576, 70054, 74779, 0, 185, 65085, 74533, 64754, 119334, 7535, - 8085, 42525, 119944, 9749, 41701, 6131, 1949, 4117, 7847, 120489, 120997, - 64483, 65693, 983711, 983495, 128615, 69695, 42240, 128587, 121352, - 42864, 126498, 43168, 41868, 1184, 0, 815, 11484, 127535, 67840, 983651, - 0, 66197, 983474, 10986, 64683, 128549, 128454, 3455, 126530, 0, 9879, 0, - 0, 4158, 70307, 68166, 0, 128091, 0, 0, 69645, 332, 118808, 83368, 5142, - 2407, 69643, 42199, 0, 92404, 74373, 83372, 55217, 71457, 63870, 43163, - 0, 0, 12985, 42867, 1834, 120387, 92461, 69817, 10940, 65249, 70385, - 8662, 120324, 0, 2652, 120527, 7164, 10784, 195093, 67674, 0, 83359, - 92482, 194749, 74562, 917505, 1828, 74474, 120019, 68078, 8531, 12499, - 6280, 12324, 72434, 65238, 68374, 4832, 65573, 43851, 6279, 12508, 12904, - 12502, 9161, 128555, 1620, 11247, 3601, 121301, 83353, 67246, 609, 11555, - 83456, 12496, 11980, 74181, 4343, 12505, 82960, 127863, 0, 11377, 239, - 128114, 637, 0, 128678, 42671, 0, 93032, 83095, 43565, 71306, 126493, - 12696, 128256, 917600, 94062, 12929, 0, 712, 0, 4197, 983206, 42818, - 126632, 70306, 120490, 70333, 119137, 1506, 43562, 119913, 92491, 68076, - 12651, 120917, 64628, 74517, 12058, 74084, 194633, 7494, 0, 4924, 65592, - 118844, 194823, 127088, 355, 9719, 127087, 13066, 64796, 121077, 983297, - 12033, 42178, 194754, 69760, 42571, 92635, 11430, 0, 70299, 121508, - 124951, 68324, 3178, 126488, 128633, 92704, 917566, 9080, 120943, 67697, - 195101, 68209, 72418, 11082, 71485, 5699, 83373, 66000, 9488, 65166, - 119112, 70477, 11170, 68662, 128120, 71313, 0, 5265, 69235, 83384, 11487, - 67858, 12464, 983365, 43045, 983831, 70345, 43345, 983276, 10770, 118994, - 6807, 465, 9829, 69997, 74348, 0, 43346, 8116, 795, 120352, 72412, 12462, - 10930, 10831, 121320, 118952, 64362, 74334, 93056, 83047, 983933, 12468, - 8607, 1008, 118948, 10092, 125122, 128851, 67855, 55257, 73771, 1766, - 11282, 11996, 1820, 4547, 0, 11202, 120243, 128345, 13223, 74934, 64595, + 5147, 125019, 917624, 74524, 128356, 1928, 0, 67649, 5991, 3445, 67609, + 4976, 64176, 74966, 67610, 8241, 983900, 77868, 4206, 127352, 78662, + 129029, 128298, 67277, 10138, 67238, 128785, 8897, 120234, 1422, 8357, + 4124, 77862, 65836, 120641, 127926, 77859, 100912, 120930, 1123, 963, + 41553, 10120, 12405, 120150, 92664, 398, 13278, 9723, 6366, 120311, 7945, + 129126, 4402, 9970, 12402, 93062, 42392, 1305, 12408, 92384, 44007, + 128465, 127216, 41464, 12411, 12969, 67268, 41465, 121092, 8528, 1575, 0, + 63955, 165, 3024, 41467, 119163, 70119, 9093, 100620, 6833, 92574, 63958, + 120931, 9148, 9692, 4096, 53, 8296, 6750, 66855, 128410, 9594, 120308, + 120938, 43527, 100611, 727, 74192, 93060, 5805, 0, 6726, 127387, 42176, + 12370, 11655, 119095, 10591, 2280, 983234, 12372, 120642, 120307, 71209, + 92343, 983872, 12366, 10963, 6066, 1329, 0, 3052, 9220, 121045, 64478, + 194701, 10803, 4132, 120306, 68474, 92473, 100876, 118923, 74837, 120155, + 1499, 121299, 8055, 42740, 63965, 74338, 63962, 74042, 8924, 43123, 5988, + 3660, 63969, 11781, 42718, 8788, 1357, 64851, 65743, 92894, 8774, 70337, + 127086, 9941, 120172, 92748, 1933, 69655, 9564, 120016, 92435, 73866, + 983932, 121241, 2487, 67614, 3121, 1804, 3311, 67615, 70081, 78302, + 12220, 67616, 92769, 120020, 194594, 68200, 6675, 128144, 983282, 67592, + 120685, 0, 64771, 1198, 9132, 983709, 64619, 510, 64663, 94033, 121500, + 4561, 2101, 1398, 195051, 92554, 74034, 41569, 92684, 11406, 8167, 12127, + 120505, 840, 983283, 69992, 7101, 6967, 0, 194898, 9796, 127000, 333, + 69891, 127145, 8144, 2117, 0, 70712, 12406, 917970, 19931, 66388, 6678, + 7769, 983124, 12621, 0, 127366, 10227, 4764, 43101, 9981, 74157, 40986, + 4127, 66487, 983576, 42202, 12754, 195021, 983191, 100628, 94097, 67594, + 2048, 12944, 4050, 67595, 917967, 43102, 10581, 11184, 4533, 127212, + 74003, 6490, 983857, 12038, 0, 0, 68225, 65461, 9798, 69704, 128912, + 1948, 69841, 0, 952, 128235, 125107, 983354, 70296, 6449, 9494, 120313, + 70738, 43098, 4843, 8142, 64160, 4098, 64170, 128871, 917621, 3436, + 66780, 0, 12817, 67597, 6676, 3930, 42615, 66407, 69991, 67598, 983336, + 0, 0, 65591, 41581, 65916, 1453, 121189, 121458, 127859, 8500, 42222, + 101047, 73743, 120143, 4317, 11543, 67676, 64676, 100697, 127833, 67606, + 119083, 121083, 42217, 13102, 128736, 66003, 6672, 0, 0, 66880, 77912, + 63841, 9613, 9001, 4526, 11274, 67601, 64520, 64210, 6664, 78704, 42056, + 10228, 64957, 11281, 128312, 3807, 1469, 66640, 65381, 42197, 4988, + 42372, 72786, 9598, 904, 352, 42225, 1451, 8061, 8453, 4134, 83485, + 67223, 66576, 127916, 127568, 10520, 8575, 9960, 1201, 125235, 12846, + 127291, 68040, 11919, 64962, 100695, 43739, 101041, 8511, 9460, 823, + 11587, 12305, 0, 64695, 127305, 12387, 1253, 13183, 65766, 500, 42783, + 65765, 64208, 64369, 65760, 65761, 70334, 11606, 64784, 11702, 66498, + 9821, 64304, 127369, 5152, 11048, 7533, 68366, 64410, 92305, 127852, + 4323, 70276, 92669, 71332, 120158, 42587, 42214, 41394, 11188, 4763, + 4112, 118935, 0, 5260, 43143, 94038, 326, 120131, 68423, 119218, 10771, + 2876, 74074, 92530, 128460, 41398, 7382, 9802, 127077, 127076, 453, + 41396, 120524, 13159, 12140, 9572, 129085, 7003, 194883, 42334, 7704, + 125069, 125020, 43144, 4123, 8494, 43146, 9977, 0, 121283, 65759, 10765, + 64061, 4465, 9808, 64056, 65582, 4126, 0, 9521, 9589, 64755, 125200, + 64020, 126604, 10464, 194980, 92968, 72847, 64514, 11528, 64024, 128072, + 679, 64013, 129314, 5850, 758, 7536, 120538, 92234, 41441, 10693, 64006, + 75044, 64005, 4058, 119019, 126487, 64660, 128176, 119050, 0, 195023, + 1139, 43298, 64027, 64029, 8970, 0, 9934, 128685, 10774, 67104, 42201, + 12421, 119109, 125270, 1852, 3057, 64046, 73744, 64034, 64039, 68065, + 127075, 983690, 72773, 92322, 7645, 12854, 72772, 3496, 0, 121323, + 113710, 9102, 627, 127795, 6158, 8327, 74553, 66632, 12419, 13309, 11570, + 127811, 19960, 11696, 92913, 1018, 118970, 129075, 194897, 1682, 43863, + 194896, 42756, 6765, 194906, 67717, 74358, 73814, 11412, 6768, 10728, + 119982, 71316, 71099, 43311, 64966, 11577, 127832, 43040, 1833, 11576, + 70054, 74779, 0, 185, 65085, 74533, 64754, 119334, 7535, 8085, 42525, + 119944, 9749, 41701, 6131, 1949, 4117, 7847, 120489, 120997, 64483, + 65693, 983711, 127120, 74288, 69695, 42240, 128587, 121352, 42864, + 101037, 43168, 41868, 1184, 121285, 815, 11484, 127535, 67840, 983651, + 129340, 66197, 983474, 10986, 64683, 128549, 128454, 3455, 126530, + 119664, 9879, 0, 983215, 4158, 70307, 68166, 0, 128091, 194982, 0, 66799, + 332, 118808, 83368, 5142, 2407, 69643, 42199, 92386, 92404, 74373, 83372, + 55217, 71457, 63870, 43163, 0, 917763, 12985, 42867, 1834, 120387, 92461, + 69817, 10940, 65249, 70385, 8662, 120324, 0, 2652, 120527, 7164, 10784, + 195093, 67674, 917942, 83359, 92482, 194749, 74562, 917505, 1828, 74474, + 120019, 68078, 8531, 12499, 6280, 12324, 72434, 65238, 68374, 4832, + 65573, 43851, 6279, 12508, 12904, 12502, 9161, 128555, 1620, 11247, 3601, + 121301, 83353, 67246, 609, 11555, 83456, 12496, 11980, 74181, 4343, + 12505, 82960, 127863, 125258, 11377, 239, 128114, 637, 0, 128678, 42671, + 0, 93032, 83095, 43565, 71306, 126493, 7298, 128256, 917600, 94062, + 12929, 0, 712, 0, 4197, 983206, 42818, 126632, 70306, 120490, 70333, + 119137, 1506, 43562, 119913, 92491, 68076, 12651, 120917, 64628, 74517, + 12058, 74084, 194633, 7494, 128780, 4924, 65592, 118844, 194823, 127088, + 355, 9719, 66762, 13066, 64796, 78663, 983297, 12033, 42178, 194754, + 69760, 42571, 92635, 11430, 0, 70299, 121508, 124951, 68324, 3178, + 126488, 128633, 92704, 917566, 9080, 120943, 67697, 195101, 68209, 72418, + 11082, 71485, 5699, 83373, 66000, 9488, 65166, 119112, 70477, 11170, + 68662, 100505, 71313, 0, 5265, 69235, 83384, 11487, 67858, 12464, 983365, + 43045, 983201, 70345, 43345, 120657, 10770, 118994, 6807, 465, 9829, + 69997, 74348, 121403, 43346, 8116, 795, 120352, 72412, 12462, 10930, + 10831, 121320, 118952, 64362, 74334, 93056, 10112, 983933, 12468, 8607, + 1008, 118948, 10092, 120539, 128851, 67855, 55257, 73771, 1766, 11282, + 11996, 1820, 4547, 100709, 11202, 120243, 128345, 13223, 74934, 64595, 127294, 83374, 68489, 4345, 12616, 917784, 128947, 983155, 74467, 0, - 983819, 128291, 5382, 127779, 0, 67233, 119060, 64953, 5406, 19920, - 69897, 66510, 3590, 194835, 1130, 917766, 120977, 42016, 11823, 43023, - 121002, 118896, 7742, 127374, 13280, 71323, 9326, 73826, 5310, 43509, - 78584, 92229, 8959, 43589, 6747, 66723, 64757, 8568, 194684, 120496, - 73816, 83060, 128418, 42670, 0, 11621, 12460, 1326, 120631, 83393, 43063, + 73955, 128291, 5382, 121390, 0, 67233, 119060, 64953, 5406, 19920, 69897, + 66510, 3590, 194835, 1130, 128689, 120977, 42016, 11823, 43023, 121002, + 118896, 7742, 127374, 13280, 71323, 9326, 73826, 5310, 43509, 78584, + 92229, 8959, 43589, 6747, 66723, 64757, 8568, 194684, 120496, 73816, + 83060, 128418, 42670, 127539, 11621, 12460, 1326, 120631, 83393, 43063, 43239, 65678, 194840, 73917, 7843, 69783, 11689, 5410, 5783, 10468, 8403, 5400, 11594, 120405, 68333, 83390, 10491, 69842, 64412, 0, 128012, 5587, 42865, 64404, 8268, 4923, 65086, 8981, 12382, 42133, 120755, 9706, 69738, - 70294, 66610, 10461, 12103, 0, 8642, 83388, 42766, 83387, 2210, 9983, - 128689, 94009, 0, 0, 0, 7398, 41515, 0, 11802, 8041, 1461, 910, 119133, - 0, 6749, 3658, 93964, 120525, 0, 7617, 194841, 12888, 127983, 67668, - 13143, 0, 9193, 11097, 5703, 128247, 41517, 41504, 41519, 10016, 64305, - 0, 65864, 623, 781, 670, 10660, 5769, 613, 7543, 120279, 477, 41083, - 92521, 0, 592, 1578, 12459, 43449, 0, 0, 8225, 121191, 654, 11345, 653, - 652, 0, 647, 83266, 633, 120744, 983809, 126472, 12480, 43243, 194909, - 39, 12487, 121247, 120529, 74199, 12482, 0, 12489, 119607, 3195, 5550, - 129121, 7897, 127089, 1203, 74396, 1813, 64544, 41311, 12090, 983634, - 2877, 121518, 70496, 1675, 69840, 0, 0, 119078, 10070, 10595, 0, 119077, - 194777, 121162, 67170, 120790, 118787, 43244, 92233, 917835, 983916, - 119561, 983078, 194914, 194921, 128160, 9939, 0, 983151, 77860, 128948, - 83440, 270, 0, 10714, 118983, 72437, 0, 119942, 119338, 65372, 73803, - 74038, 68251, 6273, 66679, 364, 9595, 71440, 0, 0, 707, 194839, 128409, - 9282, 11163, 224, 128588, 68670, 9332, 4966, 68677, 194586, 68644, - 983131, 3841, 67357, 67341, 10732, 68640, 850, 4972, 127181, 12890, 2909, - 68619, 44008, 68627, 120699, 11544, 10203, 9608, 0, 917943, 11962, - 121397, 12507, 1196, 67684, 67100, 777, 120187, 4375, 65271, 67678, 0, - 12198, 917887, 64824, 119343, 127243, 9454, 63778, 8658, 42528, 70073, - 2705, 128680, 41520, 195098, 120379, 11986, 7765, 42502, 8280, 74520, - 2701, 0, 120240, 5767, 0, 195018, 9809, 8353, 63747, 66701, 63772, - 121233, 63745, 1748, 63770, 121419, 121078, 0, 65542, 63766, 55244, 3061, - 78609, 63764, 63787, 9067, 6096, 0, 7694, 0, 7257, 63768, 3485, 12987, - 127781, 127522, 120628, 63807, 1591, 0, 6386, 63783, 120990, 125041, - 92535, 0, 0, 68249, 74575, 127010, 65719, 13083, 64574, 65012, 121452, + 70294, 66610, 10461, 12103, 0, 8642, 70701, 42766, 83387, 2210, 9983, + 119963, 94009, 129299, 0, 128810, 7398, 41515, 983880, 11802, 8041, 1461, + 910, 119133, 983327, 6749, 3658, 93964, 120525, 127363, 7617, 194841, + 12888, 100501, 67668, 13143, 127975, 9193, 11097, 5703, 128247, 41517, + 41504, 41519, 10016, 64305, 983593, 65864, 623, 781, 670, 10660, 5769, + 613, 7543, 100787, 477, 41083, 92521, 194593, 592, 1578, 12459, 43449, + 128628, 0, 8225, 121191, 654, 11345, 653, 652, 0, 647, 83266, 633, + 120744, 72788, 126472, 12480, 43243, 194909, 39, 12487, 121247, 120529, + 74199, 12482, 983770, 12489, 100917, 3195, 5550, 128172, 7897, 127089, + 1203, 74396, 1813, 64544, 41311, 12090, 983634, 2877, 121518, 70496, + 1675, 69840, 0, 0, 119078, 10070, 10595, 0, 119077, 194777, 121162, + 67170, 120790, 118787, 43244, 92233, 917835, 125193, 119561, 983078, + 194914, 194921, 128160, 9939, 121511, 125195, 77860, 128948, 83440, 270, + 983309, 10714, 118983, 72437, 0, 119942, 119338, 65372, 73803, 74038, + 68251, 6273, 66679, 364, 9595, 71440, 0, 0, 707, 119649, 100400, 9282, + 11163, 224, 72799, 68670, 9332, 4966, 68677, 70674, 68644, 127214, 3841, + 67357, 67341, 10732, 68640, 850, 4972, 127181, 12890, 2909, 68619, 44008, + 68627, 101023, 11544, 10203, 9608, 0, 917943, 11962, 121397, 12507, 1196, + 67684, 67100, 777, 120187, 4375, 65271, 67678, 101024, 12198, 917887, + 64824, 119343, 126608, 9454, 63778, 8658, 42528, 70073, 2705, 128680, + 41520, 195098, 120379, 11986, 7765, 42502, 8280, 74520, 2701, 983333, + 120240, 5767, 0, 195018, 9809, 8353, 63747, 66701, 63772, 121233, 63745, + 1748, 63770, 121419, 121078, 0, 65542, 63766, 55244, 3061, 78609, 63764, + 63787, 9067, 6096, 0, 7694, 983776, 7257, 63768, 3485, 12987, 127781, + 127522, 120628, 63807, 1591, 127140, 6386, 63783, 120990, 125041, 92535, + 122884, 0, 68249, 74575, 100997, 65719, 13083, 64574, 65012, 121452, 1640, 12495, 66691, 7624, 3138, 10996, 11171, 1922, 127275, 12498, 10987, - 69936, 69939, 3894, 65543, 129183, 194842, 128112, 493, 0, 43197, 1717, - 4228, 479, 10303, 74020, 0, 917935, 10335, 3520, 917932, 12490, 64315, - 92170, 127039, 12493, 6233, 42681, 1002, 12491, 83519, 64911, 83521, - 2096, 65120, 83516, 78219, 83270, 8378, 11632, 68838, 66213, 63864, - 66221, 66226, 66229, 13218, 66231, 66216, 8507, 66236, 66211, 66218, - 92672, 66240, 78041, 66233, 8928, 983552, 7909, 66234, 11605, 63759, - 127308, 66208, 67339, 13002, 63803, 244, 11542, 12898, 12494, 73761, - 12492, 12669, 94070, 0, 74153, 120310, 128278, 120680, 4882, 13040, - 983362, 8612, 4885, 74053, 127830, 13042, 4880, 64662, 2429, 1360, 248, - 129066, 63797, 92394, 42358, 0, 7292, 0, 63756, 42786, 66693, 0, 1870, - 78040, 470, 78038, 78035, 78036, 70028, 78034, 4579, 69232, 0, 12511, - 74453, 12514, 0, 71130, 7239, 7001, 8623, 94011, 125137, 128048, 7378, - 12512, 11615, 6104, 0, 120900, 659, 6098, 0, 12234, 83511, 67358, 8311, - 12510, 7669, 13039, 83509, 12513, 10202, 12471, 0, 8747, 121385, 70193, - 128354, 2323, 0, 2319, 77917, 12477, 77916, 2311, 7666, 4415, 237, 6281, - 127280, 983311, 83020, 2309, 1312, 8173, 83013, 12469, 83015, 78505, - 64335, 10609, 83011, 78006, 9397, 11524, 9395, 9396, 9393, 9394, 9391, - 9392, 9389, 6209, 9387, 9388, 4932, 9386, 9383, 9384, 6740, 127990, - 65451, 8185, 128931, 194843, 43024, 43336, 67659, 2313, 128167, 7948, - 9236, 77942, 0, 0, 10570, 43473, 6289, 10484, 83006, 83007, 11998, 12082, - 10924, 3147, 83004, 66406, 12524, 119081, 2310, 11818, 9381, 9382, 9379, - 9380, 9377, 9378, 9375, 9376, 1683, 9374, 983778, 9372, 12444, 74256, 0, - 13016, 8210, 121062, 42029, 11079, 12331, 43451, 42032, 8744, 726, 0, - 120630, 4155, 121090, 120704, 42030, 5007, 12522, 43088, 0, 4951, 113826, - 127217, 983202, 9922, 43309, 11211, 12525, 983473, 12016, 65770, 9548, - 67665, 403, 78230, 12503, 194689, 127191, 11030, 43916, 92567, 65691, - 63998, 1819, 10496, 0, 0, 119920, 0, 129143, 121072, 12506, 983838, - 11146, 71477, 12500, 44023, 12509, 64393, 78830, 3389, 10589, 6608, - 11208, 120236, 78395, 78394, 74069, 71446, 78391, 3608, 8281, 113732, - 1107, 113745, 9076, 8862, 69743, 41052, 13084, 64766, 43217, 7803, 13222, - 74165, 74782, 43499, 8546, 11553, 63995, 13177, 9043, 6303, 113664, 498, - 64471, 77987, 92974, 12529, 8042, 43899, 2344, 12528, 8031, 2414, 74506, - 69719, 3231, 917836, 6422, 66512, 69653, 12530, 2537, 78405, 41429, - 12658, 13036, 65772, 0, 78738, 41433, 4719, 469, 917810, 4363, 3313, - 41428, 78407, 2023, 1772, 78224, 78225, 65706, 10051, 64812, 78220, - 74237, 9920, 12215, 82978, 4931, 1951, 12497, 119363, 9607, 70368, 9663, - 66838, 119634, 6503, 41110, 983467, 1491, 66847, 129169, 127304, 41061, - 70454, 194838, 127187, 65026, 41993, 41509, 11045, 65028, 71181, 66476, - 41108, 9738, 41995, 1075, 1958, 12535, 41992, 41506, 127002, 41687, 0, - 120717, 127776, 9940, 127299, 7692, 983833, 8008, 41131, 330, 8566, - 65083, 6839, 9816, 126517, 12532, 78550, 78546, 3508, 127058, 43235, - 120351, 127298, 64139, 78231, 6411, 12910, 67710, 66644, 13028, 6737, - 12537, 0, 43506, 64136, 12536, 2350, 13029, 78233, 120914, 43897, 13030, - 6702, 4527, 71250, 12538, 128810, 983645, 65599, 65717, 9966, 93046, - 4948, 12484, 4032, 121177, 12623, 0, 6207, 983225, 6117, 65930, 8412, - 127183, 7438, 1296, 2325, 41511, 121020, 10149, 74118, 0, 120233, 12481, - 121280, 12488, 66713, 0, 41556, 64414, 118802, 2354, 42619, 73766, - 119244, 6295, 901, 41510, 7953, 0, 65032, 41513, 120209, 11927, 66584, - 78559, 78560, 78557, 71459, 83034, 67603, 848, 9868, 67220, 6424, 78568, - 67226, 69922, 70190, 78563, 78564, 2352, 67219, 893, 64576, 11289, 1407, - 67973, 983193, 13026, 6762, 78579, 70192, 13023, 8903, 9777, 66715, 1871, - 8099, 127984, 0, 1343, 917999, 120784, 9325, 6818, 6283, 11738, 0, 72436, - 113713, 11741, 917986, 75043, 9216, 8263, 11279, 83023, 83024, 83025, - 13021, 64494, 3136, 194758, 194757, 194760, 13022, 42737, 9956, 0, 43954, - 74552, 10014, 0, 41260, 119340, 13020, 10024, 194764, 74583, 74340, - 69681, 0, 43001, 8029, 0, 0, 983780, 3335, 119341, 9209, 9776, 120526, - 194748, 5215, 42644, 3333, 1632, 194751, 64849, 3342, 78582, 5363, 12957, - 78581, 4156, 0, 127329, 6421, 78039, 1611, 78589, 13018, 74257, 78588, - 74542, 3337, 4537, 67895, 11736, 0, 68608, 6482, 4214, 73790, 11945, - 43925, 13046, 8838, 425, 4025, 10709, 78595, 2108, 2392, 13047, 92745, 0, - 6819, 13049, 6499, 92243, 12424, 68614, 65827, 13050, 9924, 194745, 6507, + 69936, 69939, 3894, 65543, 129183, 194842, 120793, 493, 118925, 43197, + 1717, 4228, 479, 10303, 74020, 0, 917935, 10335, 3520, 917932, 12490, + 64315, 92170, 127039, 12493, 6233, 42681, 1002, 12491, 83519, 64911, + 83521, 2096, 65120, 83516, 78219, 83270, 8378, 11632, 68838, 66213, + 63864, 66221, 66226, 66229, 13218, 66231, 66216, 8507, 66236, 66211, + 66218, 92672, 66240, 78041, 66233, 8928, 983552, 7909, 66234, 11605, + 63759, 127308, 66208, 67339, 13002, 63803, 244, 11542, 12898, 12494, + 73761, 12492, 12669, 94070, 0, 74153, 120310, 126513, 120472, 4882, + 13040, 983362, 8612, 4885, 74053, 127830, 13042, 4880, 64662, 2429, 1360, + 248, 101018, 63793, 92394, 42358, 0, 7292, 101017, 63756, 42786, 66693, + 917598, 1870, 78040, 470, 78038, 78035, 78036, 70028, 78034, 4579, 69232, + 0, 12511, 74453, 12514, 983947, 70656, 7239, 7001, 8623, 94011, 125137, + 128048, 7378, 12512, 11615, 6104, 101011, 120900, 659, 6098, 100948, + 12234, 83511, 67358, 8311, 12510, 7669, 13039, 83509, 12513, 10202, + 12471, 0, 8747, 121385, 70193, 100946, 2323, 128147, 2319, 77917, 12477, + 77916, 2311, 7666, 4415, 237, 6281, 127280, 100940, 83020, 2309, 1312, + 8173, 83013, 12469, 83015, 78505, 64335, 10609, 83011, 78006, 9397, + 11524, 9395, 9396, 9393, 9394, 9391, 9392, 9389, 6209, 9387, 9388, 4932, + 9386, 9383, 9384, 6740, 127990, 65451, 8185, 128931, 194843, 43024, + 43336, 67659, 2313, 74446, 7948, 9236, 77942, 128899, 0, 10570, 43473, + 6289, 10484, 83006, 83007, 11998, 12082, 10924, 3147, 83004, 66406, + 12524, 119081, 2310, 11818, 9381, 9382, 9379, 9380, 9377, 9378, 9375, + 9376, 1683, 9374, 983778, 9372, 12444, 74256, 0, 13016, 8210, 121062, + 42029, 11079, 12331, 43451, 42032, 8744, 726, 0, 120630, 4155, 121090, + 120704, 42030, 5007, 12522, 43088, 0, 4951, 113826, 127217, 983202, 9922, + 43309, 11211, 12525, 195035, 12016, 65770, 9548, 67665, 403, 78230, + 11021, 194689, 125250, 11030, 43916, 92567, 65691, 63998, 1819, 10496, 0, + 194657, 119920, 0, 129143, 121072, 12506, 194605, 11146, 71477, 12500, + 44023, 12509, 64393, 78830, 3389, 10589, 6608, 11208, 120236, 78395, + 78394, 74069, 71446, 78391, 3608, 8281, 113732, 1107, 113745, 9076, 8862, + 69743, 41052, 13084, 64766, 43217, 7803, 13222, 74165, 74782, 43499, + 8546, 11553, 63995, 13177, 9043, 6303, 113664, 498, 64471, 77987, 92974, + 12529, 8042, 43899, 2344, 12528, 8031, 2414, 74506, 69719, 3231, 194569, + 6422, 66512, 69653, 12530, 2537, 78405, 41429, 12658, 13036, 65772, 0, + 78738, 41433, 4719, 469, 917810, 4363, 3313, 41428, 78407, 2023, 1772, + 78224, 78225, 65706, 10051, 64812, 78220, 74237, 9920, 12215, 82978, + 4931, 1951, 12497, 119363, 9607, 70368, 9663, 66838, 119634, 6503, 41110, + 125232, 1491, 66847, 129169, 127304, 41061, 70454, 194838, 121014, 65026, + 41993, 41509, 11045, 65028, 71181, 66476, 41108, 9738, 41995, 1075, 1958, + 12535, 41992, 41506, 127002, 41687, 127398, 120717, 127776, 9940, 100419, + 7692, 120680, 8008, 41131, 330, 8566, 65083, 6839, 9816, 126517, 12532, + 78550, 78546, 3508, 127058, 43235, 120351, 127298, 64139, 78231, 6411, + 12910, 67710, 66644, 13028, 6737, 12537, 100417, 43506, 64136, 12536, + 2350, 13029, 78233, 120914, 43897, 13030, 6702, 4527, 71250, 12538, + 100416, 129352, 65599, 65717, 9966, 93046, 4948, 12484, 4032, 121177, + 12623, 120207, 6207, 194726, 6117, 65930, 8412, 127183, 7438, 1296, 2325, + 41511, 121020, 10149, 74118, 0, 119625, 12481, 121280, 12488, 66713, 0, + 41556, 64414, 118802, 2354, 42619, 73766, 72757, 6295, 901, 41510, 7953, + 983465, 65032, 41513, 120209, 11927, 66584, 78559, 78560, 78557, 71459, + 83034, 67603, 848, 9868, 67220, 6424, 78568, 67226, 69922, 70190, 78563, + 78564, 2352, 67219, 893, 64576, 11289, 1407, 67973, 983193, 13026, 6762, + 78579, 70192, 13023, 8903, 9777, 66715, 1871, 8099, 127984, 129367, 1343, + 128438, 120784, 9325, 6818, 6283, 11738, 120210, 72436, 113713, 11741, + 129196, 75043, 9216, 8263, 11279, 83023, 83024, 83025, 13021, 64494, + 3136, 194758, 194757, 194760, 13022, 42737, 9956, 100746, 43954, 74552, + 10014, 0, 41260, 119340, 13020, 10024, 194764, 74583, 74340, 69681, 0, + 43001, 8029, 0, 983639, 983780, 3335, 119341, 9209, 9776, 120526, 128404, + 5215, 42644, 3333, 1632, 194751, 64849, 3342, 78582, 5363, 12957, 78581, + 4156, 0, 127329, 6421, 78039, 1611, 78589, 13018, 74257, 78588, 74542, + 3337, 4537, 67895, 11736, 983789, 68608, 6482, 4214, 73790, 11945, 43925, + 13046, 8838, 425, 4025, 10709, 78595, 2108, 2392, 13047, 92745, 125040, + 6819, 13049, 6499, 92243, 12424, 68614, 65827, 13050, 9924, 128378, 6507, 127919, 94073, 128069, 3277, 8929, 4947, 41055, 0, 194722, 194721, 194724, 13045, 64626, 66034, 7751, 194727, 8371, 121036, 3997, 12806, 8768, 13044, 0, 12420, 4024, 128000, 41054, 1078, 9757, 69736, 41057, - 68307, 917842, 0, 0, 983791, 92210, 92411, 129303, 41496, 0, 9165, 1572, - 11911, 124990, 118842, 2346, 13270, 8958, 0, 9646, 3773, 43183, 6401, - 5831, 0, 120865, 13043, 8056, 70108, 65681, 208, 127382, 41514, 0, - 121048, 983884, 10699, 6408, 92227, 7825, 5661, 82972, 82973, 3603, - 41109, 2398, 3548, 82969, 82970, 119933, 82964, 3115, 9918, 127823, 8294, - 42912, 0, 127287, 194726, 4876, 65804, 0, 0, 43468, 121221, 41558, 41471, - 73950, 8158, 9944, 41472, 120298, 13051, 78689, 3143, 194674, 6701, - 41559, 1896, 65215, 13052, 194680, 5665, 78594, 119071, 7025, 63974, 0, - 74352, 74161, 4154, 9863, 43550, 12310, 5662, 42382, 1564, 73924, 1121, - 78319, 63959, 0, 9942, 13231, 983578, 64752, 4732, 194666, 11596, 78142, - 65187, 1626, 63983, 10110, 64772, 42024, 6420, 42028, 92294, 10509, 2795, - 4910, 129193, 69231, 64753, 6275, 93957, 118830, 63978, 11044, 3229, - 6423, 42774, 0, 0, 68526, 12823, 2331, 127788, 7085, 6137, 0, 7524, - 120721, 917809, 8346, 128438, 8338, 128315, 65043, 77982, 822, 70412, - 9903, 64721, 42722, 69877, 82956, 78655, 66882, 82959, 78484, 41265, - 5311, 1795, 965, 118791, 10587, 43962, 11278, 78632, 74111, 128095, - 12946, 121076, 71921, 120349, 6294, 3144, 113706, 127967, 65019, 74078, - 73990, 65111, 983960, 748, 41067, 2330, 535, 3148, 12375, 78799, 194629, - 10556, 2475, 12388, 4889, 8968, 67863, 3593, 74076, 82949, 2342, 82951, - 82944, 65206, 4894, 82947, 4890, 121059, 64433, 581, 4893, 42929, 6571, - 65545, 4888, 4157, 78048, 78049, 64651, 78047, 0, 10119, 6415, 42893, 0, - 69702, 983937, 0, 11375, 64746, 2332, 78063, 412, 78061, 42928, 42880, - 43587, 121098, 0, 0, 70461, 65197, 78066, 12203, 78064, 78065, 8913, - 65854, 4875, 65811, 75024, 120389, 71854, 9344, 8826, 92916, 120395, - 13104, 67828, 11997, 120393, 78075, 0, 3134, 83096, 65696, 72432, 121412, - 66217, 121190, 8334, 92755, 83207, 3449, 121264, 13100, 78414, 78413, - 83216, 66405, 70430, 83089, 83203, 127250, 1908, 120167, 4328, 10734, - 127014, 83198, 67825, 7804, 78272, 10811, 6250, 11339, 4914, 11367, - 83510, 78054, 4917, 74516, 74208, 64285, 4912, 5464, 127836, 83100, 2361, - 7971, 78072, 78073, 55243, 78071, 983575, 8086, 74317, 6707, 8319, 2312, - 40977, 10960, 40962, 8305, 12573, 71131, 40980, 983964, 13202, 127816, - 12582, 78282, 983048, 69856, 42438, 55221, 6288, 78280, 127946, 5653, - 42400, 10891, 7698, 5658, 70401, 70039, 0, 70460, 4913, 71060, 128562, - 71333, 42326, 121119, 12728, 92685, 42478, 2327, 0, 12563, 42287, 12705, - 120829, 83081, 12588, 8821, 6153, 2867, 83085, 66312, 698, 83076, 83087, - 10356, 70017, 128570, 651, 12641, 83138, 125098, 120710, 129064, 41552, - 65115, 78465, 78467, 78463, 74905, 127516, 78461, 92960, 66927, 64945, - 4716, 43277, 120932, 78474, 12340, 120568, 120928, 194700, 55264, 41211, - 120676, 8703, 5462, 83195, 83185, 10101, 0, 70049, 8479, 4151, 41933, - 83189, 0, 66254, 120821, 68497, 0, 128654, 113799, 83159, 74050, 42651, - 127371, 0, 0, 83225, 83218, 12278, 75011, 128405, 0, 2700, 12576, 7842, - 12899, 83155, 0, 2699, 129304, 73845, 2985, 83149, 68648, 83146, 12192, - 119314, 0, 66489, 9827, 119310, 8609, 119308, 67426, 119306, 11481, - 41210, 119305, 0, 35, 70838, 67431, 66694, 68479, 78477, 67428, 43596, - 6090, 64257, 7812, 10534, 0, 78485, 73848, 67975, 4272, 78321, 40967, - 40964, 917825, 12704, 78487, 43306, 0, 64497, 12138, 7930, 0, 2292, - 68216, 194871, 121390, 5244, 4189, 92697, 67596, 127504, 4188, 1879, - 70463, 968, 0, 43743, 0, 8873, 2279, 127100, 917827, 65555, 12574, 0, - 92749, 92753, 74490, 127099, 11838, 75001, 0, 0, 42682, 12578, 12720, 0, - 41227, 0, 12346, 127101, 64848, 69950, 917950, 7251, 0, 120382, 118850, + 68307, 917842, 127897, 0, 983791, 92210, 72735, 129303, 41496, 194574, + 9165, 1572, 11911, 124990, 118842, 2346, 13270, 8958, 983416, 9646, 3773, + 43183, 6401, 5831, 194723, 120865, 13043, 8056, 70108, 65681, 208, + 127382, 41514, 121124, 121048, 983884, 10699, 6408, 92227, 7825, 5661, + 82972, 82973, 3603, 41109, 2398, 3548, 82969, 82970, 119933, 82964, 3115, + 9918, 72723, 8294, 42912, 194745, 125185, 126483, 4876, 65804, 0, 100583, + 43468, 121221, 41558, 41471, 73950, 8158, 9944, 41472, 120298, 13051, + 78689, 3143, 194674, 6701, 41559, 1896, 65215, 13052, 119930, 5665, + 78594, 83129, 7025, 63974, 100464, 74352, 74161, 4154, 9863, 43550, + 12310, 5662, 42382, 1564, 73924, 1121, 78319, 63959, 983184, 9942, 13231, + 983250, 64752, 4732, 194666, 11596, 78142, 65187, 1626, 63983, 10110, + 64772, 42024, 6420, 42028, 92294, 10509, 2795, 4910, 129193, 69231, + 64753, 6275, 93957, 118830, 63978, 11044, 3229, 6423, 42774, 100455, 0, + 68526, 12823, 2331, 127788, 7085, 6137, 0, 7524, 120721, 113703, 8346, + 78802, 8338, 128315, 65043, 77982, 822, 70412, 9903, 64721, 42722, 69877, + 82956, 78655, 66882, 82959, 78484, 41265, 5311, 1795, 965, 118791, 10587, + 43962, 11278, 78632, 74111, 128095, 12946, 121076, 71921, 120349, 6294, + 3144, 113706, 127967, 65019, 74078, 73990, 65111, 917954, 748, 41067, + 2330, 535, 3148, 12375, 78799, 129313, 10556, 2475, 12388, 4889, 8968, + 67863, 3593, 74076, 72750, 2342, 82951, 82944, 65206, 4894, 82947, 4890, + 121059, 64433, 581, 4893, 42929, 6571, 65545, 4888, 4157, 78048, 70735, + 64651, 78047, 917806, 10119, 6415, 42893, 983068, 69702, 983937, 0, + 11375, 64746, 2332, 78063, 412, 78061, 42928, 42880, 43587, 121098, 0, 0, + 70461, 65197, 78066, 12203, 78064, 78065, 8913, 65854, 4875, 65811, + 75024, 120389, 71854, 9344, 8826, 92916, 120395, 13104, 67828, 11997, + 120393, 78075, 0, 3134, 83096, 65696, 72432, 100631, 66217, 121190, 8334, + 92755, 83207, 3449, 83214, 13100, 78414, 78413, 83216, 66405, 70430, + 83089, 83203, 127250, 1908, 120167, 4328, 10734, 127014, 70709, 67825, + 7804, 78272, 10811, 6250, 11339, 4914, 11367, 83510, 78054, 4917, 70686, + 72816, 64285, 4912, 5464, 127836, 83100, 2361, 7971, 78072, 78073, 55243, + 78071, 194693, 8086, 74317, 6707, 8319, 2312, 40977, 10960, 40962, 8305, + 12573, 71131, 40980, 983964, 13202, 127816, 12582, 78282, 983048, 69856, + 42438, 55221, 6288, 78280, 127946, 5653, 42400, 10891, 7698, 5658, 70401, + 70039, 0, 70460, 4913, 71060, 128562, 71333, 42326, 121119, 12728, 92685, + 42478, 2327, 0, 12563, 42287, 12705, 100483, 83081, 12588, 8821, 6153, + 2867, 83085, 66312, 698, 83076, 83087, 10356, 70017, 128570, 651, 12641, + 72809, 125098, 100639, 129064, 41552, 65115, 78465, 78467, 78463, 74905, + 127516, 78461, 92960, 66927, 64945, 4716, 43277, 72745, 78474, 12340, + 120568, 70721, 70719, 55264, 41211, 120676, 8703, 5462, 83195, 83185, + 10101, 120441, 70049, 8479, 4151, 41933, 83189, 0, 66254, 120821, 68497, + 0, 128654, 113799, 83159, 74050, 42651, 127371, 0, 0, 83225, 83218, + 12278, 70716, 128405, 0, 2700, 12576, 7842, 12899, 83155, 0, 2699, + 129304, 72718, 2985, 83149, 68648, 83146, 12192, 119314, 129062, 66489, + 9827, 119310, 8609, 119308, 67426, 119306, 11481, 41210, 119305, 125207, + 35, 70838, 67431, 66694, 68479, 78477, 67428, 43596, 6090, 64257, 7812, + 10534, 0, 78485, 73848, 67975, 4272, 78321, 40967, 40964, 124983, 12704, + 78487, 43306, 0, 64497, 12138, 7930, 0, 2292, 68216, 194871, 72737, 5244, + 4189, 92697, 67596, 127504, 4188, 1879, 70463, 968, 0, 43743, 983685, + 8873, 2279, 127100, 917827, 65555, 12574, 121103, 92749, 92753, 74490, + 127099, 11838, 66787, 0, 120664, 42682, 12578, 12720, 983698, 41227, + 72765, 12346, 127101, 64848, 69950, 917950, 7251, 113792, 120382, 118850, 119141, 128461, 66015, 67332, 959, 8885, 12564, 66457, 78808, 9469, 9632, - 92231, 74761, 64323, 127335, 128842, 0, 11132, 310, 120924, 41281, 10976, - 0, 71325, 128364, 74266, 10054, 6497, 8574, 917823, 9012, 19958, 74420, - 65089, 13215, 12730, 65163, 64260, 374, 43195, 816, 92783, 0, 83191, - 41934, 7465, 74615, 92752, 127895, 4715, 6101, 71089, 41936, 82967, 4879, - 43965, 65446, 0, 307, 127147, 9585, 5374, 127962, 128059, 0, 129189, - 126618, 120390, 74953, 65567, 120614, 1929, 120984, 12142, 194696, 12236, - 41419, 194618, 120610, 12982, 75003, 5378, 75004, 120957, 41421, 75005, - 4462, 0, 126599, 128092, 821, 0, 2498, 5800, 120157, 67758, 1760, 2421, - 4469, 2324, 828, 3611, 78400, 757, 1185, 0, 78770, 43597, 10628, 74808, - 68849, 7999, 43971, 11217, 121224, 10634, 10942, 7713, 2348, 0, 64374, - 4380, 128284, 83061, 9982, 64324, 41240, 862, 64468, 78462, 1810, 3673, - 5137, 194617, 0, 7277, 65622, 65069, 7566, 64688, 67143, 194592, 74957, - 43912, 128385, 4748, 92228, 129185, 194601, 42260, 5871, 119075, 121278, - 74576, 44019, 194720, 128189, 3967, 71098, 13137, 8775, 127945, 0, 2963, - 917785, 8410, 4454, 723, 83084, 966, 4449, 92330, 92238, 75022, 7819, - 2320, 194589, 339, 4968, 194590, 120399, 8075, 55276, 83057, 8047, 0, - 78827, 12634, 41542, 78780, 7466, 6705, 12174, 42610, 124934, 74452, - 983763, 1584, 66645, 6045, 6729, 120640, 65218, 11559, 194983, 78062, - 7537, 124991, 11370, 125093, 10330, 78798, 10394, 92236, 74194, 0, - 127929, 9780, 0, 11117, 74993, 77950, 67091, 7074, 92648, 194579, 194582, - 11414, 68781, 2531, 13034, 129159, 0, 4211, 1259, 7517, 70866, 70198, - 83122, 40996, 13037, 7092, 641, 5219, 83125, 194566, 11064, 41129, - 121253, 42850, 13035, 9075, 92387, 5466, 74293, 74530, 64098, 65793, - 4535, 121267, 4271, 78417, 127059, 6769, 41410, 127257, 64262, 6767, - 41407, 66273, 917816, 6755, 118864, 9046, 120886, 126608, 70830, 0, - 83232, 0, 67675, 983694, 83234, 121254, 64338, 2563, 13033, 247, 83229, - 0, 12338, 4651, 67355, 11270, 0, 74630, 11933, 70107, 0, 41903, 43447, - 11001, 73827, 42255, 83243, 83238, 69821, 41905, 67350, 0, 10775, 9793, - 5009, 128774, 42269, 64587, 983063, 42535, 69812, 64529, 41408, 42853, - 3877, 120795, 42674, 8147, 43566, 119021, 67342, 10236, 65918, 43782, - 78769, 78060, 64506, 69652, 118921, 4747, 83251, 69844, 43200, 5832, - 71208, 83250, 5141, 42600, 71866, 43203, 127208, 120129, 43286, 0, - 128211, 43778, 7657, 41305, 71132, 43781, 11303, 65547, 128609, 7031, - 859, 128488, 83262, 83237, 6059, 126985, 55235, 194817, 8535, 128638, - 65196, 125084, 66032, 11488, 120481, 120786, 42233, 64140, 9946, 7667, - 194792, 11822, 128591, 11135, 983600, 0, 1788, 1579, 120482, 71298, 0, - 983461, 0, 9028, 119571, 69234, 71061, 92545, 1285, 64882, 41242, 70086, - 83111, 12640, 83112, 7401, 0, 12625, 68198, 0, 70082, 3940, 41597, 43754, - 3396, 12642, 8665, 983610, 983609, 12630, 1653, 917815, 10153, 0, 6166, - 70825, 118989, 129409, 8815, 66673, 65046, 9285, 913, 42259, 11180, - 119318, 2142, 68454, 42485, 94012, 7878, 8211, 42293, 64377, 120478, - 92643, 121118, 194673, 12032, 0, 9725, 983491, 78431, 5263, 12818, 78430, - 41939, 10022, 65387, 78419, 42777, 10139, 980, 43698, 65386, 2208, 68848, - 43701, 43198, 7184, 92542, 128423, 128875, 10085, 74979, 0, 67394, 6634, - 92373, 125085, 83413, 8072, 119321, 43700, 0, 8872, 7783, 917991, 12398, - 8237, 0, 0, 12395, 0, 126977, 74891, 9914, 2217, 92323, 73975, 6367, - 6351, 66688, 92740, 68766, 0, 64735, 41243, 92199, 7808, 1829, 126541, - 41937, 4358, 43272, 6353, 0, 0, 120422, 93045, 1710, 120140, 0, 65607, - 67234, 49, 6627, 0, 6258, 10683, 78672, 9741, 78329, 5649, 78441, 43443, - 64418, 1643, 65213, 8405, 3470, 67244, 13213, 42452, 78331, 78013, 78445, - 125124, 1072, 78457, 78452, 78454, 6576, 41988, 41132, 65675, 1080, - 70824, 9886, 55225, 1101, 68404, 12309, 55227, 71082, 12632, 1086, 1869, - 78685, 7680, 0, 65458, 120714, 12639, 3380, 8123, 1091, 12638, 7977, - 4501, 41099, 0, 66309, 120141, 92758, 1494, 113716, 126613, 0, 11693, - 71255, 10494, 92655, 65872, 12363, 11386, 113727, 0, 0, 78771, 64582, 0, - 73794, 67395, 8022, 120989, 120462, 74106, 12413, 66883, 917994, 93035, - 75007, 5570, 1881, 7210, 120425, 1012, 43752, 0, 120709, 7208, 66442, + 92231, 74761, 64323, 127335, 74102, 2266, 11132, 310, 120924, 41281, + 10976, 101069, 71325, 125279, 74266, 10054, 6497, 8574, 101087, 9012, + 19958, 74420, 65089, 13215, 12730, 65163, 64260, 374, 43195, 816, 92783, + 0, 83191, 41934, 7465, 74615, 92752, 70666, 4715, 6101, 71089, 41936, + 82967, 4879, 43965, 65446, 0, 307, 127147, 9585, 5374, 127962, 128059, + 100472, 129189, 100471, 120390, 70727, 65567, 100964, 1929, 120984, + 12142, 194696, 12236, 41419, 194618, 120610, 12982, 75003, 5378, 75004, + 120957, 41421, 75005, 4462, 0, 126599, 128092, 821, 125030, 2498, 5800, + 100834, 67758, 1760, 2421, 4469, 2324, 828, 3611, 78400, 757, 1185, + 128274, 78770, 43597, 10628, 74808, 68849, 7999, 43971, 11217, 100849, + 10634, 10942, 7713, 2348, 0, 64374, 4380, 128284, 83061, 9982, 64324, + 41240, 862, 64468, 78462, 1810, 3673, 5137, 194617, 120481, 7277, 65622, + 65069, 7566, 64688, 67143, 194592, 74957, 43912, 100825, 4748, 92228, + 100826, 100829, 42260, 5871, 119075, 121278, 74576, 44019, 194720, + 128189, 3967, 71098, 13137, 8775, 127945, 0, 2963, 917785, 8410, 4454, + 723, 83084, 966, 4449, 92330, 92238, 75022, 7819, 2320, 129312, 339, + 4968, 194590, 120399, 8075, 55276, 83057, 8047, 195050, 78827, 12634, + 41542, 78780, 7466, 6705, 12174, 42610, 124934, 74452, 120482, 1584, + 66645, 6045, 6729, 78417, 65218, 11559, 194983, 78062, 7537, 124991, + 11370, 125093, 10330, 78798, 10394, 92236, 74194, 100808, 127929, 9780, + 0, 11117, 74993, 77950, 67091, 7074, 92648, 194579, 100495, 11414, 68781, + 2531, 13034, 100819, 128523, 4211, 1259, 7517, 70866, 70198, 83122, + 40996, 13037, 7092, 641, 5219, 83125, 194566, 11064, 41129, 100496, + 42850, 13035, 9075, 92387, 5466, 74293, 74530, 64098, 65793, 4535, + 100491, 4271, 72881, 100798, 6769, 41410, 100799, 64262, 6767, 41407, + 66273, 917816, 6755, 118864, 9046, 101086, 72803, 70830, 0, 83232, 0, + 67675, 983694, 83234, 100534, 64338, 2563, 13033, 247, 83229, 100791, + 12338, 4651, 67355, 11270, 0, 74630, 11933, 70107, 0, 41903, 43447, + 11001, 73827, 42255, 83243, 83238, 69821, 41905, 67350, 100806, 10775, + 9793, 5009, 128774, 42269, 64587, 983063, 42535, 69812, 64529, 41408, + 42853, 3877, 120795, 42674, 8147, 43566, 119021, 67342, 10236, 65918, + 43782, 78769, 78060, 64506, 69652, 100781, 4747, 83251, 69844, 43200, + 5832, 71208, 83250, 5141, 42600, 71866, 43203, 127208, 100541, 43286, + 126494, 120789, 43778, 7657, 41305, 71132, 43781, 11303, 65547, 128609, + 7031, 859, 92313, 83262, 83237, 6059, 126985, 55235, 194817, 8535, + 128638, 65196, 122910, 66032, 11488, 72838, 100788, 42233, 64140, 9946, + 7667, 100549, 11822, 128349, 11135, 983600, 0, 1788, 1579, 100507, 71298, + 0, 917537, 983839, 9028, 119571, 69234, 71061, 92545, 1285, 64882, 41242, + 70086, 83111, 12640, 83112, 7401, 100767, 12625, 68198, 83184, 70082, + 3940, 41597, 7296, 3396, 12642, 8665, 983610, 120208, 12630, 1653, + 100567, 10153, 100777, 6166, 70825, 118989, 129409, 8815, 66673, 65046, + 9285, 913, 42259, 11180, 119318, 2142, 68454, 42485, 94012, 7878, 8211, + 42293, 64377, 120478, 92643, 121118, 194673, 12032, 100771, 9725, 100773, + 78431, 5263, 12818, 78430, 41939, 10022, 65387, 78419, 42777, 10139, 980, + 43698, 65386, 2208, 68848, 43701, 43198, 7184, 92542, 128423, 100527, + 10085, 74979, 0, 67394, 6634, 92373, 125085, 83413, 8072, 100752, 43700, + 128202, 7304, 7783, 917991, 12398, 8237, 194893, 0, 12395, 120279, + 126977, 74891, 9914, 2217, 92323, 73975, 6367, 6351, 66688, 92740, 68766, + 983848, 64735, 41243, 92199, 7808, 1829, 126541, 41937, 4358, 43272, + 6353, 0, 0, 120422, 93045, 1710, 120140, 0, 65607, 67234, 49, 6627, + 983120, 6258, 10683, 78672, 9741, 78329, 5649, 78441, 43443, 64418, 1643, + 65213, 8405, 3470, 67244, 13213, 42452, 78331, 78013, 78445, 125124, + 1072, 78457, 78452, 78454, 6576, 41988, 41132, 65675, 1080, 70824, 9886, + 55225, 1101, 68404, 12309, 55227, 71082, 12632, 1086, 1869, 78685, 7680, + 101093, 65458, 120714, 12639, 3380, 8123, 1091, 12638, 7977, 4501, 41099, + 0, 66309, 120141, 92758, 1494, 113716, 126613, 0, 11693, 71255, 10494, + 92655, 65872, 12363, 11386, 113727, 128789, 0, 78771, 64582, 101098, + 73794, 67395, 8022, 101099, 120462, 74106, 12413, 66883, 917994, 93035, + 75007, 5570, 1881, 7210, 120425, 1012, 43752, 0, 101094, 7208, 66442, 5569, 195007, 42339, 92997, 6063, 67888, 69981, 119594, 6053, 65602, 0, - 92201, 64727, 9160, 70301, 0, 92905, 92180, 10503, 70387, 3423, 3870, - 4279, 8490, 120114, 4319, 64786, 8602, 120110, 11326, 92204, 983116, 0, - 74961, 78333, 120117, 120118, 120099, 92385, 65087, 5571, 3674, 9740, - 9121, 5568, 71464, 120108, 42085, 10107, 42159, 42870, 113700, 589, 7050, - 983800, 43281, 10233, 41263, 66251, 65729, 66253, 126497, 74099, 42645, - 92331, 121358, 8583, 121123, 5847, 6928, 128074, 0, 0, 0, 0, 66592, - 12204, 917962, 19966, 77856, 42561, 120626, 129170, 66854, 8120, 70311, - 194585, 0, 70308, 41063, 120417, 10664, 0, 8369, 0, 4551, 194964, 3369, - 74971, 121094, 9673, 66334, 65580, 10478, 118960, 12517, 557, 9457, - 12034, 68496, 6355, 12519, 41004, 0, 74937, 74094, 917888, 125060, 77970, - 92171, 127219, 128175, 12111, 3927, 0, 12515, 1474, 67893, 5492, 6923, - 92281, 10441, 73836, 0, 43990, 5493, 0, 74319, 0, 66635, 12019, 0, 1618, - 0, 120474, 9645, 10430, 126636, 5853, 13063, 10363, 983898, 12956, - 113666, 120729, 11314, 917582, 12060, 128648, 78392, 12826, 6329, 0, - 10514, 65517, 74395, 2707, 8309, 0, 127054, 78398, 43570, 2697, 43420, - 78396, 68247, 2695, 42171, 70809, 68334, 0, 67617, 118971, 0, 2693, - 12125, 12766, 120409, 1164, 113729, 70283, 41918, 77849, 67150, 8687, - 66009, 12178, 7053, 92540, 7469, 0, 5248, 12218, 69988, 6427, 42884, - 41123, 11176, 0, 42873, 41126, 9991, 41128, 74371, 127031, 983932, 9873, - 0, 42877, 7994, 64762, 2053, 42843, 6591, 9340, 128841, 1589, 128691, - 296, 67712, 78852, 121409, 67841, 74370, 128504, 8922, 128068, 43829, - 12700, 74836, 0, 12579, 0, 12575, 6416, 5656, 2891, 13262, 65590, 5299, - 78837, 11473, 5449, 1252, 127328, 78404, 41431, 74369, 65373, 5295, - 917569, 68320, 1223, 1642, 174, 78399, 883, 4161, 12691, 42603, 41413, - 3212, 41459, 3211, 74810, 41425, 74598, 78412, 74450, 9728, 3846, 8070, - 6150, 6636, 4370, 128619, 129158, 74178, 74587, 74117, 195094, 0, 113748, - 4986, 12189, 127512, 67648, 120499, 94001, 4257, 12104, 71176, 6220, - 9004, 65561, 983881, 77949, 0, 68135, 917576, 77946, 83453, 69679, 69684, - 9890, 78561, 12971, 78453, 92556, 73898, 11979, 70051, 71897, 83451, 0, - 9635, 12600, 8871, 67366, 68491, 0, 6469, 74227, 118900, 65304, 4679, - 10230, 64300, 64867, 3427, 4240, 67376, 67375, 67374, 67373, 42916, - 129155, 128279, 67377, 7282, 78728, 65733, 4445, 67372, 67371, 3494, - 67369, 6555, 129148, 77976, 0, 0, 78566, 0, 983189, 65898, 983246, 65312, - 5447, 0, 12895, 65593, 4010, 83154, 41106, 74357, 64448, 93994, 41105, - 74114, 65820, 6232, 68233, 126625, 0, 43608, 119091, 78118, 6538, 4335, + 92201, 64727, 9160, 70301, 195071, 92905, 92180, 10503, 70387, 3423, + 3870, 4279, 8490, 120114, 4319, 64786, 8602, 120110, 11326, 92204, + 983116, 121084, 74961, 78333, 119132, 120118, 120099, 92385, 65087, 5571, + 3674, 9740, 9121, 5568, 71464, 120108, 42085, 10107, 42159, 42870, + 113700, 589, 7050, 983800, 43281, 10233, 41263, 66251, 65729, 66253, + 126497, 74099, 42645, 92331, 121358, 8583, 121123, 5847, 6928, 128074, 0, + 0, 0, 0, 66592, 12204, 917962, 19966, 77856, 42561, 120626, 129170, + 66854, 8120, 70311, 129154, 0, 70308, 41063, 120417, 10664, 0, 8369, + 128278, 4551, 122912, 3369, 74971, 121094, 9673, 66334, 65580, 10478, + 118960, 12517, 557, 9457, 12034, 68496, 6355, 12519, 41004, 0, 74937, + 74094, 124948, 100478, 77970, 92171, 127219, 125254, 12111, 3927, 119880, + 12515, 1474, 67893, 5492, 6923, 92281, 10441, 66798, 983831, 43990, 5493, + 983618, 71130, 917766, 66635, 12019, 0, 1618, 0, 120474, 9645, 10430, + 126636, 5853, 13063, 10363, 983898, 12956, 113666, 120729, 11314, 125271, + 12060, 128648, 78392, 12826, 6329, 195097, 10514, 65517, 74395, 2707, + 8309, 0, 127054, 78398, 43570, 2697, 43420, 78396, 68247, 2695, 42171, + 70809, 68334, 983444, 67617, 118971, 0, 2693, 12125, 12766, 120409, 1164, + 113729, 70283, 41918, 77849, 67150, 8687, 66009, 12178, 7053, 92540, + 7469, 72795, 5248, 12218, 69988, 6427, 42884, 41123, 11176, 0, 42873, + 41126, 9991, 41128, 70703, 127031, 126508, 9873, 0, 42877, 7994, 64762, + 2053, 42843, 6591, 9340, 128841, 1589, 128691, 296, 67712, 78852, 121409, + 67841, 71314, 128504, 8922, 128068, 43829, 12700, 74836, 0, 12579, 0, + 12575, 6416, 5656, 2891, 13262, 65590, 5299, 70732, 11473, 5449, 1252, + 127328, 78404, 41431, 74369, 65373, 5295, 917569, 68320, 1223, 1642, 174, + 78399, 883, 4161, 12691, 42603, 41413, 3212, 41459, 3211, 74810, 41425, + 74598, 78412, 74450, 9728, 3846, 8070, 6150, 6636, 4370, 128619, 129158, + 74178, 74587, 74117, 195094, 0, 113748, 4986, 12189, 119599, 67648, + 120499, 94001, 4257, 12104, 71176, 6220, 9004, 65561, 983881, 77949, 0, + 68135, 917576, 77946, 83453, 69679, 69684, 9890, 78561, 12971, 78453, + 92556, 73898, 11979, 70051, 71897, 83451, 127187, 9635, 12600, 8871, + 67366, 68491, 0, 6469, 74227, 118900, 65304, 4679, 10230, 64300, 64867, + 3427, 4240, 67376, 67375, 67374, 67373, 42916, 129155, 127489, 67377, + 7282, 78728, 65733, 4445, 67372, 67371, 3494, 67369, 3416, 129148, 77976, + 195010, 983192, 78566, 0, 127047, 65898, 983246, 65312, 5447, 100895, + 12895, 64382, 4010, 83154, 41106, 74357, 64448, 93994, 41105, 70677, + 65820, 6232, 68233, 101104, 101103, 43608, 101105, 78118, 6538, 4335, 78364, 3941, 41122, 11061, 78363, 64892, 9113, 1954, 12155, 983674, - 42878, 11500, 67405, 128152, 74578, 0, 65832, 128667, 0, 70789, 67333, - 119230, 4586, 0, 350, 10951, 0, 509, 67336, 983879, 92307, 0, 0, 5133, - 67382, 0, 9500, 0, 4957, 64741, 2422, 2212, 983080, 67381, 67380, 2496, - 11516, 944, 67817, 3890, 12168, 1438, 67813, 68335, 70003, 41947, 1220, - 120828, 74946, 70854, 74058, 1571, 42630, 41949, 42805, 8270, 943, 564, - 0, 312, 41980, 983944, 128295, 70797, 8877, 269, 4429, 6272, 9617, 1460, - 6954, 78657, 41120, 65121, 10862, 6060, 41119, 41416, 74355, 4173, 0, - 82948, 0, 1906, 121169, 11532, 74073, 127338, 0, 1985, 6296, 9582, 75071, - 64287, 128406, 78115, 11428, 1730, 2457, 917808, 19918, 10469, 0, 68088, - 7703, 8840, 8035, 120711, 0, 92230, 983357, 6129, 128437, 78586, 128268, - 0, 7874, 8681, 119092, 11206, 13136, 0, 0, 70102, 63886, 70450, 9605, - 71308, 13220, 67348, 67354, 5514, 74960, 9228, 67349, 67356, 67346, 5240, - 9811, 10012, 3096, 0, 0, 74526, 66676, 65873, 0, 128179, 0, 9501, 120832, - 1272, 64536, 65465, 64654, 7467, 0, 1467, 10158, 10040, 0, 9519, 68759, - 70312, 195085, 68820, 12193, 70400, 127240, 121373, 0, 983355, 19935, - 120733, 92162, 68801, 127955, 83133, 93057, 5275, 120195, 128632, 8637, - 43682, 0, 3789, 63880, 11471, 43554, 65862, 11474, 66332, 66603, 68784, - 2426, 12042, 92194, 983911, 9537, 3961, 12115, 77953, 2605, 4500, 64561, - 55224, 4981, 74644, 0, 41646, 11667, 42686, 74991, 42362, 64686, 4499, - 41649, 7589, 128776, 0, 3237, 0, 66895, 68296, 8541, 78298, 70034, 41866, - 0, 983814, 94056, 11174, 69924, 43555, 2823, 9559, 10060, 41940, 8299, - 41945, 7132, 41941, 3308, 7190, 64880, 8614, 65220, 41493, 128679, 41699, - 10762, 43780, 12999, 119245, 128494, 8106, 4128, 0, 6274, 4494, 983082, - 4012, 10395, 983591, 43633, 65447, 78260, 120973, 11004, 695, 739, 696, - 7611, 121073, 42755, 74802, 9227, 7506, 7510, 69937, 691, 738, 7511, - 7512, 7515, 3868, 688, 41847, 690, 2548, 737, 974, 8003, 7406, 127353, - 120166, 128688, 3985, 66425, 65860, 41851, 7051, 69777, 4682, 71873, - 12809, 6406, 4685, 92505, 10879, 10347, 4680, 6341, 0, 3851, 8132, 74325, - 119263, 120855, 127948, 41958, 119176, 917908, 194855, 0, 42657, 71075, - 7643, 42373, 11714, 67587, 43568, 983175, 11717, 7650, 10594, 64951, - 7647, 7649, 128155, 7646, 0, 78082, 9651, 126475, 3891, 127205, 0, 2337, + 42878, 11500, 67405, 128152, 74578, 0, 65832, 126978, 0, 70789, 67333, + 119230, 4586, 194922, 350, 10951, 101081, 509, 67336, 100904, 92307, + 100903, 0, 5133, 67382, 128827, 9500, 100906, 4957, 64741, 2422, 2212, + 983080, 67381, 67380, 2496, 11516, 944, 67817, 3890, 12168, 1438, 67813, + 68335, 70003, 41947, 1220, 120828, 74946, 70854, 74058, 1571, 42630, + 41949, 42805, 8270, 943, 564, 0, 312, 41980, 983944, 128295, 70797, 8877, + 269, 4429, 6272, 9617, 1460, 6954, 78657, 41120, 65121, 10862, 6060, + 41119, 41416, 74355, 4173, 0, 82948, 0, 1906, 121169, 11532, 74073, + 101068, 101067, 1985, 6296, 9582, 75071, 64287, 128406, 70717, 11428, + 1730, 2457, 917808, 19918, 10469, 101076, 68088, 7703, 8840, 8035, + 120711, 194602, 92230, 983357, 6129, 127065, 78586, 128268, 194965, 7874, + 8681, 72800, 11206, 13136, 0, 129305, 70102, 63886, 70450, 9605, 71308, + 13220, 67348, 67354, 5514, 74960, 9228, 67349, 67356, 67346, 5240, 9811, + 10012, 3096, 917809, 0, 74526, 66676, 65873, 194608, 128179, 100918, + 9501, 120275, 1272, 64536, 65465, 64654, 7467, 100920, 1467, 10158, + 10040, 74096, 9519, 68759, 70312, 101052, 68820, 12193, 70400, 127240, + 121373, 72817, 983355, 19935, 120733, 92162, 68801, 100682, 83133, 93057, + 5275, 101063, 128632, 8637, 43682, 128576, 3789, 63880, 11471, 43554, + 65862, 11474, 66332, 66603, 68784, 2426, 12042, 92194, 121187, 9537, + 3961, 12115, 77953, 2605, 4500, 64561, 55224, 4981, 74644, 0, 41646, + 11667, 42686, 74991, 42362, 64686, 4499, 41649, 7589, 128776, 128271, + 3237, 0, 66895, 68296, 8541, 78298, 70034, 41866, 0, 127509, 94056, + 11174, 69924, 43555, 2823, 9559, 10060, 41940, 8299, 41945, 7132, 41941, + 3308, 7190, 64880, 8614, 65220, 41493, 128679, 41699, 10762, 43780, + 12999, 119245, 70689, 8106, 4128, 983751, 6274, 4494, 983082, 4012, + 10395, 983591, 43633, 65447, 78260, 120973, 11004, 695, 739, 696, 7611, + 121073, 42755, 74802, 9227, 7506, 7510, 69937, 691, 738, 7511, 7512, + 7515, 3868, 688, 41847, 690, 2548, 737, 974, 8003, 7406, 127353, 120166, + 128688, 3985, 66425, 65860, 41851, 7051, 69777, 4682, 71873, 12809, 6406, + 4685, 92505, 10879, 10347, 4680, 6341, 125217, 3851, 8132, 74325, 119263, + 120855, 127948, 41958, 119176, 917908, 194855, 0, 42657, 71075, 7643, + 42373, 11714, 67587, 43568, 983175, 11717, 7650, 10594, 64951, 7647, + 7649, 128155, 7646, 0, 78082, 9651, 126475, 3891, 127205, 983803, 2337, 1735, 74324, 11134, 2363, 121008, 92443, 43561, 67706, 128032, 74146, 1860, 7495, 7580, 5812, 7497, 7584, 119140, 127853, 78753, 120347, 7727, - 0, 8498, 69818, 8949, 3065, 42719, 7135, 1569, 92375, 12534, 12124, 7690, - 0, 12533, 983796, 6418, 4543, 78086, 6969, 128444, 74800, 71051, 67974, - 10859, 128650, 983801, 63894, 120760, 12282, 66192, 983583, 74592, 8850, - 74275, 9238, 10617, 68063, 917909, 92625, 917801, 12791, 0, 94069, - 127843, 4447, 71065, 12793, 12900, 92377, 10950, 983449, 74639, 12790, - 41400, 119128, 66607, 12792, 42232, 119239, 1744, 12789, 10366, 12317, - 41310, 120730, 41399, 0, 0, 55258, 0, 12690, 127763, 0, 43672, 127840, - 41652, 2974, 9010, 11315, 983808, 278, 121204, 41405, 43871, 0, 10077, - 63853, 74557, 42586, 0, 0, 6002, 67335, 43553, 11189, 67338, 67337, - 12787, 41308, 7934, 65306, 120263, 120940, 94042, 8646, 128257, 77829, - 71360, 0, 6413, 6550, 113759, 1940, 2809, 43637, 220, 65193, 43551, - 10678, 10044, 68841, 128121, 983816, 68290, 6403, 5707, 10393, 127532, 0, - 66614, 0, 0, 0, 10297, 0, 3742, 67331, 3959, 0, 120466, 0, 2467, 68806, - 6003, 63844, 6663, 8040, 983220, 43758, 4182, 78171, 4676, 120501, 9210, - 0, 2510, 0, 10208, 78168, 92361, 11540, 43546, 6692, 6837, 41060, 128018, - 4668, 9083, 0, 0, 78144, 1559, 63831, 9677, 67340, 67347, 65256, 67345, - 67344, 983352, 983266, 365, 12056, 43027, 120423, 41716, 128236, 67352, - 67351, 5516, 2845, 7717, 8036, 41717, 67353, 544, 12045, 6278, 74632, - 5515, 129186, 120884, 983051, 65339, 43221, 2211, 0, 5517, 70116, 74225, - 74841, 67884, 128414, 67890, 67885, 67880, 67881, 67882, 67883, 120199, - 118883, 67879, 127188, 1902, 67887, 9638, 12976, 126546, 12483, 12368, - 41769, 42726, 41765, 7361, 6667, 67874, 7556, 67878, 74351, 11264, 989, - 42677, 67889, 93040, 1311, 128949, 4326, 11000, 63824, 13068, 10932, - 128880, 6917, 78155, 120837, 949, 77882, 917968, 6148, 8605, 42253, - 78177, 66906, 0, 42715, 71432, 70282, 983373, 63871, 0, 41796, 1269, - 6530, 121414, 65057, 70493, 5144, 12221, 42716, 68299, 4431, 4331, - 983729, 128675, 41834, 5279, 121362, 10336, 8312, 0, 42701, 92959, 0, - 78165, 66036, 70166, 120937, 6428, 42270, 983726, 983596, 43059, 42666, - 5256, 1067, 255, 12131, 128742, 9493, 74990, 41014, 11793, 194920, - 121195, 74394, 43460, 10653, 42723, 983854, 119632, 70427, 6560, 7016, - 74274, 69986, 43556, 3929, 67977, 6614, 2768, 92504, 9746, 5135, 11811, - 12796, 11953, 0, 69761, 5139, 346, 74303, 6305, 12795, 4675, 5168, 78552, + 983658, 8498, 69818, 8949, 3065, 42719, 7135, 1569, 92375, 12534, 12124, + 7690, 0, 12533, 983796, 6418, 4543, 78086, 6969, 128444, 74800, 71051, + 67974, 10859, 128650, 983801, 63894, 120760, 12282, 66192, 983583, 74592, + 8850, 74275, 9238, 10617, 68063, 917909, 92625, 917801, 12791, 128976, + 94069, 127843, 4447, 71065, 12793, 12900, 92377, 10950, 100878, 74639, + 12790, 41400, 119128, 66607, 12792, 42232, 119239, 1744, 12789, 10366, + 12317, 41310, 100865, 41399, 100822, 126649, 55258, 0, 12690, 120083, 0, + 43672, 127840, 41652, 2974, 9010, 11315, 119658, 278, 121204, 41405, + 43871, 100867, 10077, 63853, 70667, 42586, 917886, 74114, 6002, 67335, + 43553, 11189, 67338, 67337, 12787, 41308, 7934, 65306, 120263, 120940, + 94042, 8646, 128257, 77829, 71360, 0, 6413, 6550, 113759, 1940, 2809, + 43637, 220, 65193, 43551, 10678, 10044, 68841, 128121, 983350, 68290, + 6403, 5707, 10393, 127532, 0, 66614, 0, 122921, 127912, 10297, 195057, + 3742, 67331, 3959, 0, 120466, 0, 2467, 68806, 6003, 63844, 6663, 8040, + 983220, 43758, 4182, 78171, 4676, 120501, 9210, 0, 2510, 0, 10208, 78168, + 92361, 11540, 43546, 6692, 6837, 41060, 101097, 4668, 9083, 983244, 0, + 78144, 1559, 63831, 9677, 67340, 67347, 65256, 67345, 67344, 983352, + 983266, 365, 12056, 43027, 120423, 41716, 120258, 67352, 67351, 5516, + 2845, 7717, 8036, 41717, 67353, 544, 12045, 6278, 74632, 5515, 129186, + 120884, 983051, 65339, 43221, 2211, 120541, 5517, 70116, 74225, 74841, + 67884, 128414, 67890, 67885, 67880, 67881, 67882, 67883, 120199, 118883, + 67879, 121448, 1902, 67887, 9638, 12976, 74394, 12483, 12368, 41769, + 42726, 41765, 7361, 6667, 67874, 7556, 67878, 74351, 11264, 989, 42677, + 67889, 93040, 1311, 100882, 4326, 11000, 63824, 13068, 10932, 100643, + 6917, 78155, 120837, 949, 77882, 917968, 6148, 8605, 42253, 78177, 66906, + 100644, 42715, 71432, 70282, 100647, 63871, 128296, 41796, 1269, 6530, + 101049, 65057, 70493, 5144, 12221, 42716, 68299, 4431, 4331, 101045, + 128675, 41834, 5279, 121362, 10336, 8312, 0, 42701, 92959, 0, 78165, + 66036, 70166, 100387, 6428, 42270, 983726, 983163, 43059, 42666, 5256, + 1067, 255, 12131, 128742, 9493, 73894, 41014, 11793, 126467, 78740, + 70728, 43460, 10653, 42723, 125216, 100658, 70427, 6560, 7016, 74274, + 69986, 43556, 3929, 67977, 6614, 2768, 92504, 9746, 5135, 11811, 12796, + 11953, 127380, 69761, 5139, 346, 74303, 6305, 12795, 4675, 5168, 78552, 43845, 74315, 74361, 8253, 8817, 1136, 917931, 43563, 92232, 128914, - 66410, 7392, 8230, 9365, 71194, 127109, 983607, 66915, 128402, 4041, 0, + 66410, 7392, 8230, 9365, 71194, 127109, 194878, 66915, 128402, 4041, 0, 2357, 43240, 12786, 229, 43834, 119884, 44004, 7142, 119881, 12350, 65554, 119882, 71305, 119876, 12785, 63863, 43795, 7770, 10712, 64853, 12686, 43831, 42375, 65780, 124944, 66352, 10470, 71119, 11059, 10791, - 917944, 450, 119328, 127254, 10432, 12097, 5450, 64691, 1233, 0, 44009, + 72724, 450, 119328, 127254, 10432, 12097, 5450, 64691, 1233, 0, 44009, 78284, 66338, 66395, 917832, 1839, 118799, 983219, 10927, 1701, 983664, 2388, 41749, 41761, 5453, 8361, 119865, 895, 5444, 41763, 64889, 7143, - 92493, 78677, 983137, 92429, 69983, 66432, 8801, 3053, 4340, 983044, - 128013, 65812, 120675, 70001, 41824, 67985, 120203, 92600, 127053, 42700, - 194805, 127980, 194807, 78676, 92356, 194808, 127844, 0, 4493, 4336, - 129171, 2314, 43602, 78826, 119325, 194811, 42439, 64638, 42327, 43528, + 92493, 78677, 983137, 92429, 69983, 66432, 8801, 3053, 4340, 194849, + 125189, 65812, 100633, 70001, 41824, 67985, 120203, 92600, 127053, 42700, + 194805, 127403, 128040, 78676, 92356, 194808, 127844, 0, 4493, 4336, + 129171, 2314, 43602, 41808, 119325, 194811, 42439, 64638, 42327, 43528, 4489, 68750, 125116, 194793, 1912, 42385, 10306, 10370, 0, 194761, 8867, 10250, 10258, 2712, 1635, 71064, 1410, 78763, 983252, 118878, 983567, - 128715, 9919, 120528, 559, 128157, 41825, 121274, 74641, 4892, 74016, + 100988, 9919, 120528, 559, 128157, 41825, 121274, 74641, 4892, 74016, 121502, 6542, 41957, 128865, 5777, 127167, 759, 65749, 2079, 65248, - 12788, 64487, 64552, 93063, 10223, 42062, 121279, 0, 74246, 3668, 65754, + 12788, 64487, 64552, 93063, 10223, 42062, 100640, 0, 74246, 3668, 65754, 43560, 12226, 67991, 65149, 2340, 41959, 71463, 194785, 194788, 43618, - 65747, 10937, 2962, 0, 2321, 3587, 65745, 67236, 8921, 9952, 128941, 0, - 42714, 9951, 43409, 194770, 2949, 66012, 194775, 194774, 2958, 68359, - 41820, 2300, 2395, 120061, 9976, 120043, 120050, 71896, 68220, 128143, + 65747, 10937, 2962, 121171, 2321, 3587, 65745, 67236, 8921, 9952, 128941, + 0, 42714, 9951, 43409, 100668, 2949, 66012, 194582, 194774, 2958, 68359, + 41820, 2300, 2395, 120061, 9976, 100975, 120050, 71896, 68220, 128143, 42809, 42807, 70798, 66290, 10198, 4150, 64371, 8318, 41790, 67976, - 41898, 2360, 41794, 917942, 70796, 92163, 93033, 0, 2418, 983098, 2411, - 11336, 799, 63823, 10276, 10308, 10372, 917541, 41772, 42813, 2317, + 41898, 2360, 41794, 100663, 70796, 92163, 93033, 983648, 2418, 983098, + 2411, 11336, 799, 63823, 10276, 10308, 10372, 194604, 41772, 42813, 2317, 10260, 118980, 55284, 78686, 127177, 10384, 194794, 121147, 129111, 7753, - 2351, 6655, 64489, 69931, 70199, 77872, 4443, 42779, 230, 0, 68067, + 2351, 6655, 64489, 69931, 70199, 77872, 4443, 42779, 230, 127015, 68067, 43549, 4855, 42150, 65739, 5441, 41896, 10288, 10320, 0, 855, 7046, 6109, 65045, 63839, 78198, 2049, 10098, 917779, 74145, 127943, 10264, 10280, - 9184, 10376, 7013, 4467, 78684, 917554, 92260, 41887, 0, 4862, 9735, + 9184, 10376, 7013, 4467, 78684, 917554, 92260, 41887, 101025, 4862, 9735, 6537, 120591, 74286, 3914, 92178, 68823, 9065, 12961, 0, 120456, 92253, - 128204, 289, 128714, 4694, 11420, 4690, 0, 120514, 917978, 4693, 73893, - 42724, 69977, 4688, 120454, 128507, 0, 67994, 8238, 3110, 120162, 3565, - 120163, 6528, 78387, 43035, 69898, 218, 983850, 1520, 0, 4786, 983168, - 43225, 4602, 92400, 78167, 10088, 6548, 121157, 120156, 43978, 8988, - 8888, 92724, 74812, 69709, 983967, 10666, 0, 73902, 69740, 121436, 0, - 9975, 113704, 119902, 4689, 8932, 0, 65560, 119209, 74441, 78810, 0, 0, - 67987, 0, 128828, 0, 67989, 119029, 10065, 8207, 71900, 92613, 128011, - 121028, 662, 128720, 9244, 194863, 83183, 119261, 983430, 0, 120901, - 917838, 41929, 0, 71084, 66674, 41926, 69994, 120443, 10513, 64637, - 194862, 68013, 52, 13118, 6475, 195004, 83479, 12095, 10225, 4812, 92578, - 128486, 67992, 74085, 0, 3978, 128425, 917945, 74015, 11582, 92768, - 12281, 127043, 6544, 13241, 93961, 69782, 125014, 194860, 11765, 65258, - 10369, 0, 1585, 7192, 10249, 422, 1500, 2036, 986, 194859, 64394, 5781, - 5599, 64294, 2494, 120450, 4861, 74021, 64334, 78203, 127808, 0, 83444, - 65102, 8961, 65842, 10243, 10245, 71907, 120410, 0, 120453, 64821, 9478, - 2508, 92683, 0, 202, 128246, 74131, 1242, 65514, 121170, 63940, 121363, - 64533, 71883, 120446, 67842, 11990, 92405, 63939, 43375, 65440, 2504, 0, - 78671, 64829, 93020, 6943, 917934, 5859, 0, 2858, 983363, 74294, 983914, - 69239, 0, 67871, 12992, 2753, 1936, 70078, 67701, 2751, 12662, 2763, - 8953, 64701, 10731, 12922, 7052, 917839, 66424, 63992, 0, 63920, 74128, - 2856, 119910, 47, 69908, 71053, 65858, 194806, 0, 67829, 7899, 0, 8417, - 43798, 7072, 74195, 0, 4033, 121289, 43992, 121081, 0, 212, 64600, 1903, - 12320, 83484, 120894, 194563, 0, 8915, 2759, 945, 6689, 93064, 0, 0, - 118798, 1291, 74828, 0, 120435, 9531, 13155, 8505, 68379, 12062, 128198, - 121216, 65487, 92189, 41837, 120611, 8246, 128874, 93066, 0, 120433, 0, - 63935, 73962, 120806, 64787, 43524, 0, 64426, 983092, 194948, 917866, - 917788, 65664, 6693, 9843, 0, 8674, 119887, 128812, 92715, 70788, 1320, - 121461, 1673, 4811, 92383, 5986, 9338, 3046, 74480, 5985, 917928, 119598, - 9820, 119892, 12187, 983841, 71041, 5984, 0, 43308, 4393, 67650, 983227, - 0, 74822, 0, 74826, 64733, 983214, 127898, 3491, 67146, 121142, 128219, - 3514, 65485, 72428, 7492, 128860, 74605, 92483, 7514, 983369, 126585, - 194731, 7502, 7587, 68353, 63921, 121178, 63925, 120161, 7610, 219, - 128158, 78722, 692, 43588, 68485, 41635, 43241, 9688, 7147, 9535, 0, - 93991, 0, 64530, 0, 64610, 11804, 0, 7149, 7453, 0, 8013, 66396, 92301, - 0, 8895, 5253, 70025, 5458, 917629, 2866, 129045, 127860, 11098, 68433, - 6700, 120484, 0, 120583, 194824, 8962, 77960, 9641, 43694, 7059, 983677, - 63997, 9604, 78700, 7441, 63826, 67970, 83435, 64392, 92626, 983687, - 2844, 74610, 41974, 67397, 12139, 67971, 0, 0, 3358, 65295, 983899, 3104, - 194734, 0, 121304, 983235, 5308, 83434, 290, 0, 121338, 2862, 2792, - 195088, 92963, 77984, 3268, 66591, 0, 6552, 42367, 7035, 120558, 0, 0, - 1814, 78464, 10240, 66285, 74305, 128382, 74528, 65903, 71454, 42646, - 7606, 2591, 2837, 4341, 43513, 64482, 92524, 8163, 65270, 0, 77932, 0, - 9112, 74431, 863, 9490, 75037, 128349, 43323, 120513, 119897, 9071, + 128204, 289, 101029, 4694, 11420, 4690, 122899, 100789, 917978, 4693, + 73893, 42724, 69977, 4688, 120454, 128507, 983813, 67994, 8238, 3110, + 120162, 3565, 120163, 6528, 78387, 43035, 69898, 218, 983850, 1520, 0, + 4786, 983168, 43225, 4602, 92400, 78167, 10088, 6548, 121157, 120156, + 43978, 8988, 8888, 65727, 74812, 69709, 983967, 10666, 0, 73902, 69740, + 121436, 0, 9975, 113704, 119902, 4689, 8932, 125238, 65560, 119209, + 74441, 78810, 122881, 128707, 67987, 0, 121021, 0, 67989, 119029, 10065, + 8207, 71900, 92613, 128011, 101090, 662, 125221, 9244, 194863, 83183, + 119261, 983430, 917889, 120901, 917838, 41929, 0, 71084, 66674, 41926, + 69994, 120443, 10513, 64637, 194862, 68013, 52, 13118, 6475, 195004, + 83479, 12095, 10225, 4812, 92578, 128486, 67992, 74085, 0, 3978, 128425, + 917945, 74015, 11582, 92768, 12281, 127043, 6544, 13241, 93961, 69782, + 125014, 128808, 11765, 65258, 10369, 983498, 1585, 7192, 10249, 422, + 1500, 2036, 986, 194859, 64394, 5781, 5599, 64294, 2494, 120450, 4861, + 74021, 64334, 78203, 127808, 0, 72871, 65102, 8961, 65842, 10243, 10245, + 71907, 120410, 100671, 120453, 64821, 9478, 2508, 92683, 0, 202, 128246, + 74131, 1242, 65514, 121170, 63940, 121363, 64533, 71883, 120446, 67842, + 11990, 92405, 63939, 43375, 65440, 2504, 0, 78671, 64829, 93020, 6943, + 917934, 5859, 983980, 2858, 983363, 66781, 983914, 69239, 983380, 67871, + 12992, 2753, 1936, 70078, 67701, 2751, 12662, 2763, 8953, 64701, 10731, + 12922, 7052, 917839, 66424, 63992, 0, 63920, 74128, 2856, 119910, 47, + 69908, 71053, 65858, 100863, 129033, 67829, 7899, 983575, 8417, 43798, + 7072, 74195, 0, 4033, 121289, 43992, 121081, 983315, 212, 64600, 1903, + 12320, 83484, 120894, 194563, 100979, 8915, 2759, 945, 6689, 93064, 0, + 983756, 118798, 1291, 74828, 0, 120435, 9531, 13155, 8505, 68379, 12062, + 121253, 121216, 65487, 92189, 41837, 120611, 8246, 128874, 93066, 100680, + 120433, 194570, 63935, 73962, 120806, 64787, 43524, 121431, 64426, + 983092, 194948, 2230, 917788, 65664, 6693, 9843, 0, 8674, 100869, 120858, + 92715, 70788, 1320, 121461, 1673, 4811, 92383, 5986, 9338, 3046, 74480, + 5985, 917928, 119598, 9820, 119892, 12187, 983841, 71041, 5984, 0, 43308, + 4393, 67650, 113787, 127013, 74822, 0, 74826, 64733, 983214, 127898, + 3491, 67146, 121142, 128219, 3514, 65485, 72428, 7492, 128860, 74605, + 72768, 7514, 983369, 126585, 194731, 7502, 7587, 68353, 63921, 121178, + 63925, 120161, 7610, 219, 128158, 78722, 692, 43588, 68485, 41635, 43241, + 9688, 7147, 9535, 194989, 93991, 983945, 64530, 0, 64610, 11804, 917918, + 7149, 7453, 119560, 8013, 66396, 92301, 0, 8895, 5253, 70025, 5458, + 194651, 2866, 118805, 127860, 11098, 68433, 6700, 120484, 129308, 120583, + 194824, 8962, 77960, 9641, 43694, 7059, 983677, 63997, 9604, 78700, 7441, + 63826, 67970, 83435, 64392, 92626, 983687, 2844, 74610, 41974, 67397, + 12139, 67971, 127166, 983834, 3358, 65295, 983292, 3104, 100779, 0, + 121304, 983235, 5308, 83434, 290, 0, 121338, 2862, 2792, 92483, 92963, + 77984, 3268, 66591, 0, 6552, 42367, 7035, 120558, 101008, 917971, 1814, + 78464, 10240, 66285, 74305, 128382, 74528, 65903, 71454, 42646, 7606, + 2591, 2837, 4341, 43513, 64482, 92524, 8163, 65270, 194825, 77932, 0, + 9112, 72721, 863, 9490, 75037, 128037, 43323, 120513, 119897, 9071, 68054, 0, 3654, 7789, 9637, 121136, 2535, 65504, 7653, 40993, 92415, 66587, 124987, 0, 92401, 43927, 11006, 12927, 7807, 8073, 120980, 10629, - 127869, 74088, 3056, 10823, 127267, 92391, 8762, 10508, 69689, 73770, - 43969, 43193, 10737, 3463, 120975, 983351, 66633, 8695, 4815, 11322, - 5811, 12345, 7049, 118811, 5195, 195081, 0, 66639, 92939, 0, 0, 128041, - 67903, 67739, 1262, 120165, 6561, 19939, 128673, 0, 127318, 119906, - 70300, 0, 983097, 0, 983667, 119907, 64612, 11991, 120654, 0, 92943, - 1502, 917568, 127988, 9107, 127316, 5702, 3655, 67661, 8430, 0, 71223, - 120758, 0, 74057, 9603, 128079, 5254, 120742, 7724, 74388, 68375, 10796, - 5129, 0, 70816, 590, 7579, 5614, 5893, 92280, 11720, 92496, 11721, 70804, - 4798, 121468, 119316, 66038, 4793, 67851, 11726, 127541, 74204, 68610, - 68824, 68626, 894, 300, 120875, 12306, 66235, 8004, 0, 119574, 2562, - 70156, 120856, 42503, 92900, 11652, 917813, 917799, 119241, 64699, - 126569, 5096, 5095, 2863, 3424, 92244, 10454, 42530, 5094, 70873, 0, - 13156, 129057, 10832, 5093, 0, 69852, 72430, 5092, 10708, 11327, 0, 5091, - 176, 0, 9153, 4104, 78599, 78601, 1215, 42712, 5744, 12272, 9832, 11777, - 71299, 66817, 42881, 0, 8980, 118988, 67861, 8844, 7209, 0, 0, 4278, - 128809, 0, 119160, 70821, 9074, 4348, 0, 65558, 65946, 8113, 7087, 5255, - 1786, 661, 128116, 0, 917925, 74423, 71345, 586, 74414, 64359, 1267, - 128269, 65468, 194966, 65731, 0, 72405, 3621, 92932, 66666, 64211, 0, - 6562, 12928, 194904, 1228, 65490, 11383, 0, 127953, 70343, 1714, 74406, - 120751, 0, 121113, 983976, 66225, 70110, 70867, 42660, 11436, 2070, 64, - 120694, 121025, 10291, 10323, 2826, 113809, 126510, 0, 42008, 9708, - 42710, 0, 42011, 41999, 92164, 12206, 5839, 1702, 1240, 74065, 6286, - 9689, 983969, 65833, 77848, 0, 1765, 0, 128622, 65588, 92350, 983281, 0, - 8401, 983924, 42014, 127307, 7030, 120969, 10479, 64959, 2852, 0, 121225, - 0, 70819, 128586, 917951, 6963, 126704, 12667, 64540, 74786, 10147, - 12935, 127568, 126483, 121281, 0, 0, 78757, 0, 113815, 121302, 0, 9994, - 12467, 2864, 64719, 1148, 10435, 11462, 41675, 7084, 2765, 78466, 43382, - 0, 120719, 128188, 92516, 66662, 0, 78133, 9364, 194685, 74416, 127797, - 0, 77988, 263, 10449, 41288, 0, 41839, 78385, 983742, 70313, 129140, - 6931, 69722, 43261, 7177, 70105, 92652, 0, 0, 4262, 10285, 10722, 42020, - 126575, 6806, 6992, 42019, 0, 41290, 983716, 750, 0, 71304, 10163, 63913, - 71300, 7032, 5954, 64931, 4314, 128600, 198, 68453, 730, 120094, 63907, - 77993, 70818, 13165, 7107, 74171, 42804, 678, 8240, 78015, 125005, 41378, - 11008, 6938, 70026, 92637, 2097, 66246, 120560, 70823, 194990, 983604, - 3892, 68632, 69642, 6712, 66045, 41470, 64805, 0, 983213, 126511, 64801, - 127818, 497, 12100, 5953, 92667, 7796, 69669, 43254, 73831, 0, 10293, - 5952, 1281, 43747, 0, 121399, 10677, 604, 41097, 9182, 1859, 0, 92603, - 3425, 127488, 126523, 2836, 983738, 0, 9707, 113718, 43202, 0, 0, 65199, - 1738, 128311, 67707, 2832, 92702, 9670, 11101, 0, 66374, 917956, 119552, - 2822, 68122, 4436, 92519, 983081, 73752, 70305, 64872, 92340, 1331, 0, 0, - 121377, 12708, 917954, 5090, 5089, 127977, 917953, 119109, 0, 70826, 319, - 118847, 43479, 9477, 0, 0, 5087, 74886, 7640, 96, 5086, 983597, 92379, 0, - 5085, 64286, 92665, 113717, 41422, 119617, 119901, 42356, 3772, 119042, - 0, 5011, 0, 983329, 126587, 0, 120698, 118874, 6677, 7601, 0, 591, 64419, - 118953, 92262, 118895, 70799, 70084, 0, 10939, 6106, 6933, 41271, 6760, - 71343, 4534, 41270, 128876, 67138, 65574, 194947, 9224, 67140, 3671, - 8976, 67139, 0, 41275, 6372, 82997, 55261, 7963, 6371, 0, 568, 92368, - 41273, 121448, 74531, 6728, 0, 9715, 129297, 8258, 11753, 74820, 0, 9602, - 118919, 42, 11191, 43688, 68243, 0, 7458, 0, 0, 65385, 67135, 67134, - 11958, 11165, 917822, 125087, 6254, 42721, 66336, 8045, 11550, 195064, - 67132, 67131, 42858, 11789, 65868, 5557, 10133, 9737, 13109, 0, 9467, - 5558, 8878, 43844, 195036, 7451, 6706, 10146, 0, 9086, 64566, 983185, - 64584, 7437, 7454, 12594, 73749, 68362, 4546, 7731, 0, 70048, 74243, - 125092, 3805, 0, 67128, 44001, 41008, 128052, 6307, 19949, 67129, 7544, - 124989, 43469, 121095, 983735, 10152, 64422, 65091, 67124, 7602, 64729, - 0, 43521, 0, 42302, 43711, 43523, 41447, 5559, 68483, 8704, 2397, 5556, - 0, 0, 0, 9011, 9630, 11166, 0, 93998, 5506, 92498, 1911, 66652, 67686, + 101004, 74088, 3056, 10823, 127267, 92391, 8762, 10508, 69689, 73770, + 43969, 43193, 10737, 3463, 72858, 194790, 66633, 8695, 4815, 11322, 5811, + 12345, 7049, 118811, 5195, 195081, 194958, 66639, 92939, 83193, 121010, + 128041, 67903, 67739, 1262, 120165, 6561, 19939, 128673, 0, 127318, + 119906, 70300, 0, 983097, 0, 983667, 119907, 64612, 11991, 120654, + 917866, 92943, 1502, 917568, 127988, 9107, 122904, 5702, 3655, 67661, + 8430, 0, 71223, 120758, 118963, 74057, 9603, 128079, 5254, 120742, 7724, + 74388, 68375, 10796, 5129, 0, 70816, 590, 7579, 5614, 5893, 92280, 11720, + 92496, 11721, 70804, 4798, 121468, 119316, 66038, 4793, 67851, 11726, + 127541, 74204, 68610, 68824, 68626, 894, 300, 120875, 12306, 66235, 8004, + 127189, 119574, 2562, 70156, 120856, 42503, 92900, 11652, 917813, 917799, + 119241, 64699, 126569, 5096, 5095, 2863, 3424, 92244, 10454, 42530, 5094, + 70873, 0, 13156, 129057, 10832, 5093, 194839, 69852, 72430, 5092, 10708, + 11327, 0, 5091, 176, 113810, 9153, 4104, 78599, 78601, 1215, 42712, 5744, + 12272, 9832, 11777, 71299, 66817, 42881, 983785, 8980, 118988, 67861, + 8844, 7209, 983741, 0, 4278, 128809, 0, 119160, 70821, 9074, 4348, + 917872, 65558, 65946, 8113, 7087, 5255, 1786, 661, 128116, 917857, + 917925, 74423, 71345, 586, 74414, 64359, 1267, 128269, 65468, 125234, + 65731, 983899, 72405, 3621, 92932, 66666, 64211, 129351, 6562, 12928, + 121306, 1228, 65490, 11383, 0, 127953, 70343, 1714, 74406, 120751, 0, + 121113, 127389, 66225, 70110, 70867, 42660, 11436, 2070, 64, 120694, + 121025, 10291, 10323, 2826, 100526, 126510, 127557, 42008, 9708, 42710, + 0, 42011, 41999, 92164, 12206, 5839, 1702, 1240, 74065, 6286, 9689, + 983969, 65833, 77848, 0, 1765, 983301, 128622, 65588, 92350, 983281, 0, + 8401, 983924, 42014, 125230, 7030, 120969, 10479, 64959, 2852, 72728, + 121225, 0, 70819, 119887, 125227, 6963, 126704, 12667, 64540, 74786, + 10147, 12935, 127401, 119185, 72812, 71265, 128779, 78757, 0, 113815, + 121302, 122892, 9994, 12467, 2864, 64719, 1148, 10435, 11462, 41675, + 7084, 2765, 78466, 43382, 983815, 120719, 128188, 92516, 66662, 0, 78133, + 9364, 194685, 74416, 127797, 0, 77988, 263, 10449, 41288, 0, 41839, + 78385, 100693, 70313, 127476, 6931, 69722, 43261, 7177, 70105, 92652, + 119895, 0, 4262, 10285, 10722, 42020, 126575, 6806, 6992, 42019, 195056, + 41290, 983716, 750, 121088, 71304, 10163, 63913, 71300, 7032, 5954, + 64931, 4314, 100636, 198, 68453, 730, 100635, 63907, 77993, 70818, 13165, + 7107, 74171, 42804, 678, 8240, 78015, 125005, 41378, 11008, 6938, 70026, + 92637, 2097, 66246, 120560, 70823, 194990, 983604, 3892, 68632, 69642, + 6712, 66045, 41470, 64805, 0, 983213, 126511, 64801, 127818, 497, 12100, + 5953, 92667, 7796, 69669, 43254, 73831, 128243, 10293, 5952, 1281, 43747, + 0, 121399, 10677, 604, 41097, 9182, 1859, 0, 72856, 3425, 127488, 72725, + 2836, 983738, 0, 9707, 70742, 43202, 0, 0, 65199, 1738, 119891, 67707, + 2832, 92702, 9670, 11101, 983795, 66374, 100704, 119552, 2822, 68122, + 4436, 92519, 983081, 73752, 70305, 64872, 92340, 1331, 917955, 983706, + 121377, 12708, 129333, 5090, 5089, 127977, 3200, 100984, 0, 70826, 319, + 118847, 43479, 9477, 0, 194881, 5087, 74886, 7640, 96, 5086, 127763, + 92379, 0, 5085, 64286, 92665, 113717, 41422, 100710, 119901, 42356, 3772, + 119042, 119909, 5011, 194882, 194742, 126587, 0, 120698, 118874, 6677, + 7601, 194725, 591, 64419, 118953, 92262, 118895, 70799, 70084, 125111, + 10939, 6106, 6933, 41271, 6760, 71343, 4534, 41270, 128876, 67138, 65574, + 194947, 9224, 67140, 3671, 8976, 67139, 0, 41275, 6372, 82997, 55261, + 7963, 6371, 0, 568, 92368, 41273, 120322, 74531, 6728, 983609, 9715, + 120975, 8258, 11753, 74820, 983965, 9602, 118919, 42, 11191, 43688, + 68243, 0, 7458, 73972, 983960, 65385, 67135, 67134, 11958, 11165, 194698, + 125087, 6254, 42721, 66336, 8045, 11550, 195064, 67132, 12696, 42858, + 11789, 65868, 5557, 10133, 9737, 7300, 0, 9467, 5558, 8878, 43844, + 195036, 7451, 6706, 10146, 100762, 9086, 64566, 983185, 64584, 7437, + 7454, 12594, 73749, 68362, 4546, 7731, 0, 70048, 74243, 125092, 3805, 0, + 67128, 44001, 41008, 128052, 6307, 19949, 67129, 7544, 124989, 43469, + 121095, 983735, 10152, 64422, 65091, 67124, 7602, 64729, 0, 43521, + 120772, 42302, 43711, 43523, 41447, 5559, 68483, 8704, 2397, 5556, 0, 0, + 66801, 9011, 9630, 11166, 0, 93998, 5506, 92498, 1911, 66652, 67686, 9961, 8845, 66698, 68325, 10792, 8889, 121402, 2098, 0, 64751, 70309, - 66622, 126626, 0, 74364, 68816, 129152, 983805, 42909, 7552, 70092, - 194567, 65384, 7223, 4559, 93015, 1956, 43138, 7024, 65728, 43490, 1210, - 195077, 65175, 10184, 43140, 43654, 0, 983233, 125045, 38, 8533, 66669, - 119124, 983295, 983792, 0, 4357, 0, 70289, 917863, 74233, 9967, 78884, - 42860, 119838, 10941, 65721, 6962, 0, 83279, 113808, 0, 11014, 120126, - 8942, 12000, 69224, 92267, 128536, 11974, 67363, 42772, 42650, 11650, - 5013, 92663, 68810, 66210, 118914, 6613, 92476, 0, 11193, 983770, 0, - 64714, 71479, 70802, 12162, 12120, 43476, 983766, 11024, 74811, 66228, - 10563, 92954, 127196, 43522, 2462, 92955, 1837, 125086, 63972, 6957, 0, - 113820, 4952, 65718, 64405, 5504, 65720, 65714, 65715, 65716, 128026, - 75016, 127119, 3109, 63975, 74028, 127213, 8107, 67154, 1127, 455, 0, - 63968, 127835, 3483, 119593, 1989, 983176, 69678, 9104, 3503, 65375, - 68300, 6694, 42633, 1864, 0, 74306, 41446, 2540, 7736, 121434, 74064, + 66622, 126626, 0, 70724, 68816, 129152, 124953, 42909, 7552, 70092, + 127490, 65384, 7223, 4559, 93015, 1956, 43138, 7024, 65728, 43490, 1210, + 195077, 65175, 10184, 43140, 43654, 917902, 128558, 125045, 38, 8533, + 66669, 119124, 983295, 983792, 0, 4357, 0, 70289, 917863, 74233, 9967, + 78884, 42860, 119323, 10941, 65721, 6962, 0, 83279, 113808, 0, 11014, + 120126, 8942, 12000, 69224, 92267, 128536, 11974, 67363, 42772, 42650, + 11650, 5013, 92663, 68810, 66210, 118914, 6613, 92476, 0, 11193, 194677, + 72754, 64714, 71479, 70802, 12162, 12120, 43476, 983766, 11024, 74811, + 66228, 10563, 92954, 127196, 43522, 2462, 92955, 1837, 125086, 63972, + 6957, 0, 113820, 4952, 65718, 64405, 5504, 65720, 65714, 65715, 65716, + 72877, 75016, 127119, 3109, 63975, 74028, 127213, 8107, 67154, 1127, 455, + 0, 63968, 72860, 3483, 119593, 1989, 983176, 69678, 9104, 3503, 65375, + 68300, 6694, 42633, 1864, 0, 72810, 41446, 2540, 7736, 121434, 74064, 128601, 10521, 70786, 42173, 9705, 74124, 8604, 6955, 10916, 43684, 6149, 3887, 19956, 1411, 2824, 0, 10106, 127862, 1403, 125053, 1347, 9631, - 74444, 983753, 127997, 92951, 74897, 8640, 0, 258, 1654, 0, 0, 983479, - 43314, 0, 0, 4042, 11478, 2873, 63977, 11522, 41668, 8549, 10861, 121053, - 63976, 70377, 68623, 67082, 67081, 41391, 67084, 83465, 376, 6987, 9221, - 0, 0, 8823, 128697, 12943, 65185, 41869, 12619, 128067, 10154, 983043, - 74439, 2039, 0, 7446, 1684, 63979, 10974, 458, 120620, 82950, 69791, - 127161, 11916, 65016, 0, 69671, 42115, 121057, 12288, 78057, 67080, 1493, - 42111, 7553, 4097, 128199, 13080, 0, 65808, 6610, 6030, 8059, 7508, - 13131, 67074, 67073, 128506, 8794, 41278, 41629, 12154, 75073, 41277, - 64658, 983456, 64380, 6625, 42911, 19904, 0, 121305, 71193, 65371, 7078, - 128699, 833, 128228, 6369, 194815, 10979, 41953, 983370, 41434, 6062, 0, - 0, 19916, 6913, 933, 1341, 9842, 6720, 65744, 71200, 983592, 121223, - 126567, 7405, 10105, 65810, 0, 41632, 7493, 55290, 92890, 41622, 0, 0, - 119556, 74584, 7632, 9716, 19954, 9805, 5990, 900, 0, 63957, 119638, 0, - 3612, 0, 64376, 93987, 5389, 92597, 0, 65938, 2839, 9621, 582, 0, 74368, - 3749, 6949, 7569, 74061, 83222, 83223, 6956, 4403, 19962, 65559, 3299, - 121005, 194939, 119127, 9002, 0, 74372, 74236, 8478, 7598, 546, 42469, - 65569, 1918, 9542, 472, 7716, 10319, 10383, 6996, 43077, 63952, 8425, - 3602, 8328, 11764, 83199, 83200, 65065, 41183, 12907, 10271, 10287, 684, - 43525, 127996, 2854, 83214, 4592, 65755, 83217, 67120, 11963, 43620, - 67117, 78249, 67123, 67122, 67121, 9881, 43115, 65757, 3415, 69677, - 67116, 8648, 128377, 6741, 43047, 119900, 13180, 78077, 418, 120653, - 64495, 10295, 10327, 10391, 41752, 66846, 8641, 41449, 83194, 74100, - 83186, 10911, 6942, 120879, 1024, 42849, 41751, 69776, 8941, 983556, - 4554, 66892, 9023, 11685, 121476, 9928, 67109, 66865, 11437, 43741, - 67113, 67112, 63967, 129056, 41206, 12624, 9049, 41185, 43166, 121275, - 8159, 92619, 11686, 71478, 65224, 4565, 4655, 119553, 129090, 92183, - 64523, 10343, 10407, 92764, 66671, 11466, 0, 128003, 42890, 74013, 12050, - 68201, 2860, 0, 127934, 70828, 42792, 5743, 10424, 12065, 42872, 121401, - 43875, 67103, 8875, 0, 67102, 67105, 7531, 12847, 2413, 118917, 67404, - 962, 0, 12855, 41196, 42564, 127975, 1582, 983715, 5508, 0, 120904, - 74588, 10801, 69876, 92354, 119207, 7173, 496, 10439, 4313, 64607, 69638, - 7860, 128049, 906, 42793, 2842, 6405, 64722, 13132, 798, 64694, 12801, - 8406, 1153, 83263, 64788, 83265, 8054, 9174, 67087, 67086, 9964, 67096, - 41611, 4642, 66574, 11556, 42512, 0, 78857, 42089, 74613, 9008, 0, - 126592, 195096, 42079, 83248, 77924, 42513, 77927, 42842, 73985, 65285, - 68338, 83239, 83240, 83241, 83242, 983590, 11335, 64069, 42093, 3920, - 917869, 0, 11110, 83255, 4580, 41967, 83258, 64384, 83252, 83253, 3021, - 42004, 983096, 83249, 42317, 41998, 0, 6946, 194755, 92967, 128455, + 74444, 194946, 127997, 92951, 74897, 8640, 100976, 258, 1654, 0, 0, + 983479, 43314, 127987, 70699, 4042, 11478, 2873, 63977, 11522, 41668, + 8549, 10861, 121053, 63976, 70377, 68623, 67082, 67081, 41391, 67084, + 67588, 376, 6987, 9221, 0, 0, 8823, 128697, 12943, 65185, 41869, 12619, + 128067, 10154, 917921, 74439, 2039, 0, 7446, 1684, 63979, 10974, 458, + 72831, 82950, 69791, 127161, 11916, 65016, 0, 69671, 42115, 121057, + 12288, 78057, 67080, 1493, 42111, 7553, 4097, 128199, 13080, 0, 65808, + 6610, 6030, 8059, 7508, 13131, 67074, 67073, 128506, 8794, 41278, 41629, + 12154, 75073, 41277, 64658, 128112, 64380, 6625, 42911, 19904, 0, 121305, + 71193, 65371, 7078, 128699, 833, 128228, 6369, 194815, 10979, 41953, + 194935, 41434, 6062, 0, 0, 19916, 6913, 933, 1341, 9842, 6720, 65744, + 71200, 128645, 121223, 121245, 7405, 10105, 65810, 0, 41632, 7493, 55290, + 92890, 41622, 70704, 0, 119556, 74584, 7632, 9716, 19954, 9805, 5990, + 900, 100757, 63957, 119638, 983977, 3612, 70687, 64376, 93987, 5389, + 92597, 0, 65938, 2839, 9621, 582, 0, 74368, 3749, 6949, 7569, 74061, + 83222, 83223, 6956, 4403, 19962, 65559, 3299, 65686, 128561, 119127, + 9002, 983422, 74372, 74236, 8478, 7598, 546, 42469, 65569, 1918, 9542, + 472, 7716, 10319, 10383, 6996, 43077, 63952, 8425, 3602, 8328, 11764, + 83199, 83200, 65065, 41183, 12907, 10271, 10287, 684, 43525, 100531, + 2854, 66747, 4592, 65755, 83217, 67120, 11963, 43620, 67117, 66736, + 67123, 67122, 67121, 9881, 43115, 65757, 3415, 69677, 67116, 8648, + 100995, 6741, 43047, 100460, 13180, 78077, 418, 66754, 64495, 10295, + 10327, 10391, 41752, 66846, 8641, 41449, 83194, 74100, 83186, 10911, + 6942, 120879, 1024, 42849, 41751, 69776, 8941, 101032, 4554, 66892, 9023, + 11685, 121476, 9928, 67109, 66865, 11437, 43741, 67113, 67112, 63967, + 129056, 41206, 12624, 9049, 41185, 43166, 100840, 8159, 92619, 11686, + 71478, 65224, 4565, 4655, 119553, 129090, 92183, 64523, 10343, 10407, + 92764, 66671, 11466, 0, 100837, 42890, 72844, 2261, 68201, 2860, 0, + 127934, 70828, 42792, 5743, 10424, 12065, 42872, 121401, 43875, 67103, + 8875, 0, 67102, 67105, 7531, 12847, 2413, 100522, 67404, 962, 917814, + 12855, 41196, 42564, 101009, 1582, 100842, 5508, 100492, 120904, 74588, + 10801, 69876, 92354, 119207, 7173, 496, 10439, 4313, 64607, 69638, 7860, + 128049, 906, 42793, 2842, 6405, 64722, 13132, 798, 64694, 12801, 8406, + 1153, 83263, 64788, 83265, 8054, 9174, 67087, 67086, 9964, 67096, 41611, + 4642, 66574, 11556, 42512, 0, 78857, 42089, 74613, 9008, 0, 101028, + 100468, 42079, 83248, 77924, 42513, 77927, 42842, 73985, 65285, 68338, + 83239, 83240, 83241, 83242, 983590, 11335, 64069, 42093, 3920, 100504, + 100850, 11110, 83255, 4580, 41967, 83258, 64384, 83252, 83253, 3021, + 42004, 983096, 83249, 42317, 41998, 128756, 6946, 194755, 92967, 128455, 128193, 65204, 0, 68113, 42690, 9880, 42010, 74824, 64589, 10111, 64875, - 127880, 68035, 43998, 11360, 83233, 74182, 83235, 83228, 42149, 83230, + 127880, 68035, 43998, 11360, 83233, 74182, 70691, 83228, 42149, 83230, 68508, 917993, 64941, 77919, 120421, 128077, 74885, 55247, 4110, 66005, 6959, 10929, 42907, 128080, 66703, 77921, 8617, 41982, 6025, 69242, - 121068, 194854, 125139, 0, 9597, 42099, 43172, 983378, 10117, 983169, - 92297, 41636, 194889, 73738, 120681, 8301, 0, 0, 187, 128237, 65669, - 128339, 4963, 0, 68765, 0, 8964, 65676, 7775, 983849, 41948, 125003, 0, - 83236, 41942, 65449, 3160, 10081, 13226, 42121, 42475, 42663, 120616, - 41766, 74948, 65882, 78849, 41760, 1189, 905, 480, 10985, 41733, 67859, - 9629, 6742, 1745, 43625, 73835, 7888, 83405, 3980, 70373, 42656, 41507, - 8806, 7023, 0, 74279, 9447, 78651, 7867, 69218, 6236, 127162, 0, 10505, - 126638, 12851, 83489, 348, 5474, 121382, 3103, 0, 41753, 71109, 128604, - 0, 78844, 78845, 41739, 78843, 42515, 10931, 41756, 43347, 42560, 5391, - 41746, 119147, 92591, 41259, 5561, 69930, 2691, 68752, 65553, 7933, 5562, - 69800, 128265, 41262, 128146, 64421, 74846, 41251, 127242, 0, 3979, - 71248, 194899, 68331, 917912, 68847, 983697, 83382, 74633, 41266, 68836, - 66566, 128836, 10585, 65741, 41737, 2275, 2666, 121232, 41738, 831, 419, - 13126, 10716, 83400, 42822, 0, 6434, 74857, 6939, 7766, 6432, 128106, - 69932, 916, 769, 41742, 11968, 74805, 6433, 5563, 547, 1943, 6439, 5560, - 4994, 487, 126537, 4497, 3754, 83072, 83105, 9039, 0, 41776, 0, 8716, - 1595, 41615, 121001, 0, 74260, 74860, 42854, 43219, 83311, 121107, 12185, - 113810, 70072, 68355, 68357, 68421, 42856, 8634, 0, 119988, 4209, 75057, - 68832, 65879, 41538, 65612, 68822, 669, 5679, 68813, 68815, 68811, 68812, - 68804, 5678, 11821, 68802, 6711, 460, 121513, 0, 983463, 70114, 120747, - 194718, 121519, 78050, 119022, 0, 121515, 121514, 7782, 9044, 4974, - 11760, 78494, 7577, 65711, 41912, 1216, 0, 127017, 5792, 126643, 128319, - 78501, 0, 2933, 12244, 983702, 5683, 917896, 120895, 78119, 1549, 0, - 983223, 120398, 5682, 6206, 8670, 10256, 5680, 69935, 10001, 67237, - 69768, 1449, 10241, 78290, 119587, 194891, 10552, 64342, 41922, 70330, - 8584, 68030, 5567, 2717, 83179, 71448, 5564, 42886, 41908, 42882, 5565, - 917611, 120881, 0, 65708, 65709, 5566, 69803, 65704, 65705, 11904, 42875, - 43373, 42539, 5942, 8468, 120561, 10361, 10425, 65697, 65698, 65699, - 68052, 66598, 110592, 64664, 10647, 78702, 78703, 78690, 457, 78502, - 65701, 1934, 43006, 83280, 8802, 78710, 65130, 11747, 78709, 6087, 78705, - 78716, 41757, 78711, 8043, 8950, 65694, 64485, 43534, 10457, 0, 11961, - 78725, 66850, 78723, 78720, 78721, 127899, 65515, 9499, 10035, 13069, + 121068, 128979, 121398, 917979, 9597, 42099, 43172, 983378, 10117, 70733, + 92297, 41636, 194889, 73738, 92724, 8301, 0, 0, 187, 128237, 65669, + 128339, 4963, 127996, 68765, 128198, 8964, 65676, 7775, 194763, 41948, + 125003, 0, 83236, 41942, 65449, 3160, 10081, 13226, 42121, 42475, 42663, + 120616, 41766, 74948, 65882, 78849, 41760, 1189, 905, 480, 10985, 41733, + 67859, 9629, 6742, 1745, 43625, 73835, 7888, 83405, 3980, 70373, 42656, + 41507, 8806, 7023, 72734, 74279, 9447, 70702, 7867, 69218, 6236, 127162, + 983608, 10505, 126638, 12851, 83489, 348, 5474, 121382, 3103, 0, 41753, + 71109, 128604, 0, 78844, 78845, 41739, 78843, 42515, 10931, 41756, 43347, + 42560, 5391, 41746, 100967, 92591, 41259, 5561, 69930, 2691, 68752, + 65553, 7933, 5562, 69800, 128265, 41262, 100823, 64421, 74846, 41251, + 127242, 0, 3979, 71248, 129415, 68331, 917912, 68847, 983697, 83382, + 74633, 41266, 68836, 66566, 128836, 10585, 65741, 41737, 2275, 2666, + 121232, 41738, 831, 419, 13126, 10716, 83400, 42822, 0, 6434, 74857, + 6939, 7766, 6432, 128106, 69932, 916, 769, 41742, 11968, 74805, 6433, + 5563, 547, 1943, 6439, 5560, 4994, 487, 126537, 4497, 3754, 83072, 83105, + 9039, 70678, 41776, 127391, 8716, 1595, 41615, 74431, 128902, 74260, + 74860, 42854, 43219, 83311, 121107, 12185, 113724, 70072, 68355, 68357, + 68421, 42856, 8634, 0, 119988, 4209, 75057, 68832, 65879, 41538, 65612, + 68822, 669, 5679, 68813, 68815, 68811, 68812, 68804, 5678, 11821, 68802, + 6711, 460, 121513, 0, 983463, 70114, 120747, 194718, 121519, 78050, + 119022, 983829, 121515, 121514, 7782, 9044, 4974, 11760, 78494, 7577, + 65711, 41912, 1216, 125088, 100411, 5792, 121364, 100393, 78501, 0, 2933, + 12244, 983702, 5683, 100392, 100397, 78119, 1549, 70670, 100415, 120398, + 5682, 6206, 8670, 10256, 5680, 69935, 10001, 67237, 69768, 1449, 10241, + 78290, 70708, 194891, 10552, 64342, 41922, 70330, 8584, 68030, 5567, + 2717, 68814, 71448, 5564, 42886, 41908, 42882, 5565, 917611, 120881, 0, + 65708, 65709, 5566, 69803, 65704, 65705, 11904, 42875, 43373, 42539, + 5942, 8468, 100729, 10361, 10425, 65697, 65698, 65699, 68052, 66598, + 100686, 64664, 10647, 78702, 78703, 78690, 457, 78502, 65701, 1934, + 43006, 83280, 8802, 78710, 65130, 11747, 78709, 6087, 78705, 78716, + 41757, 78711, 8043, 8950, 65694, 64485, 43534, 10457, 128552, 11961, + 78725, 66850, 78723, 78720, 78721, 119898, 65515, 9499, 10035, 13069, 71309, 0, 9889, 68184, 42806, 125061, 7256, 0, 68094, 1667, 42161, - 120981, 42428, 0, 6934, 0, 10802, 64861, 6556, 78390, 0, 8101, 3610, + 100958, 42428, 0, 6934, 100702, 10802, 64861, 6556, 78390, 0, 8101, 3610, 68420, 41748, 4995, 955, 65907, 119208, 5350, 64339, 78306, 64549, 10875, - 125052, 5477, 65692, 0, 128532, 120397, 12896, 10456, 68298, 0, 3874, 0, - 0, 983619, 120331, 128773, 113665, 65603, 83272, 65687, 0, 41038, 74009, - 9207, 42239, 8536, 78740, 78324, 78726, 74432, 724, 83058, 1455, 78749, - 7183, 64583, 78747, 68443, 4175, 78741, 43614, 69801, 939, 75021, 43520, - 68613, 74569, 917958, 0, 70168, 78764, 78760, 10788, 6088, 78759, 78755, - 190, 119899, 12593, 0, 8188, 64408, 0, 4417, 121303, 92261, 6370, 125128, - 7827, 68441, 6965, 128581, 128868, 13201, 128205, 69896, 78868, 74382, - 11841, 7918, 73988, 0, 113668, 917884, 1728, 983705, 43764, 178, 12972, - 74620, 113671, 71103, 11168, 983383, 113672, 78327, 75042, 65690, 8382, - 71107, 119054, 194968, 9252, 917889, 4652, 68371, 0, 121327, 74070, - 13065, 9923, 10806, 194596, 11763, 70016, 120688, 6723, 78187, 0, 6993, - 71044, 121312, 8333, 121329, 0, 11390, 0, 74464, 0, 92320, 74080, 983317, - 69911, 11910, 92559, 8278, 8963, 4034, 128560, 983113, 65344, 120517, - 41747, 0, 128110, 8677, 0, 12707, 9350, 66037, 128180, 8836, 12315, - 12747, 8300, 194562, 124984, 7491, 8856, 71361, 0, 43150, 127768, 120404, - 65389, 120402, 120403, 10813, 2592, 12853, 43269, 7263, 83308, 6536, - 120238, 71891, 65516, 12321, 120391, 120388, 55287, 10007, 120246, 9588, - 68494, 1596, 120383, 41994, 65801, 128808, 6838, 3561, 119867, 0, 10613, - 6697, 12805, 41928, 40981, 10804, 78409, 5006, 64328, 0, 9931, 0, 8825, + 125052, 5477, 65692, 983276, 119092, 120397, 12896, 10456, 68298, 121195, + 3874, 0, 125204, 100994, 120331, 100993, 100673, 65603, 83272, 65687, 0, + 41038, 74009, 9207, 42239, 8536, 70671, 78324, 78726, 74432, 724, 83058, + 1455, 78749, 7183, 64583, 78747, 68443, 4175, 78323, 43614, 69801, 939, + 75021, 43520, 68613, 74569, 917958, 194658, 70168, 78764, 78760, 10788, + 6088, 78759, 78755, 190, 119899, 12593, 100735, 8188, 64408, 0, 4417, + 121303, 92261, 6370, 100436, 7827, 68441, 6965, 128581, 128868, 13201, + 100430, 69896, 78868, 74382, 11841, 7918, 72742, 101006, 113668, 917884, + 1728, 983705, 43764, 178, 12972, 74620, 113671, 71103, 11168, 983383, + 113672, 78327, 75042, 65690, 8382, 71107, 119054, 100381, 9252, 100379, + 4652, 68371, 100382, 121327, 74070, 13065, 9923, 10806, 194596, 11763, + 70016, 120688, 6723, 78187, 100388, 6993, 71044, 121312, 8333, 121329, 0, + 11390, 983136, 74464, 127910, 92320, 74080, 100442, 69911, 11910, 92559, + 8278, 8963, 4034, 128560, 983113, 65344, 120517, 41747, 128342, 128110, + 8677, 120564, 12707, 9350, 66037, 128180, 8836, 12315, 12747, 8300, + 194562, 124984, 7491, 8856, 71361, 127913, 43150, 127768, 120404, 65389, + 66779, 66777, 10813, 2592, 12853, 43269, 7263, 83308, 6536, 100962, + 71891, 65516, 12321, 120391, 120388, 55287, 2237, 120246, 9588, 68494, + 1596, 120383, 41994, 65801, 100874, 6838, 3561, 72753, 0, 10613, 6697, + 12805, 41928, 40981, 10804, 78409, 5006, 64328, 100966, 9931, 0, 8825, 74555, 65940, 43259, 126586, 6107, 83455, 119177, 77941, 78401, 119270, 11783, 335, 120227, 64689, 438, 4510, 5765, 8721, 119570, 119227, 6092, - 12840, 43112, 8876, 120231, 8096, 10284, 120935, 0, 0, 10380, 8733, - 10316, 70121, 41602, 917575, 92308, 74831, 93984, 0, 68482, 65399, - 917820, 64591, 42405, 83466, 120820, 843, 11541, 128326, 70321, 2065, - 41935, 74496, 41902, 0, 983306, 215, 41258, 77875, 43159, 1953, 9579, - 41938, 1256, 3910, 9407, 6242, 0, 83464, 41257, 41900, 8675, 10700, 8805, - 1742, 113722, 9333, 8202, 72399, 0, 983197, 127252, 0, 73882, 499, - 983049, 43467, 0, 43818, 83482, 1712, 5932, 77845, 41762, 983103, 0, - 11967, 1775, 125006, 75009, 11118, 121391, 128009, 9458, 92935, 6470, - 9180, 120380, 43176, 128307, 0, 42782, 0, 124999, 983135, 128309, 73849, - 120669, 9414, 74647, 73782, 73969, 565, 42484, 5794, 201, 2662, 42292, - 194870, 8254, 0, 10975, 43518, 120625, 74763, 1022, 4108, 3880, 74247, - 127153, 0, 92263, 917980, 7507, 983118, 43149, 71059, 65031, 7961, 1636, - 0, 65029, 65024, 119099, 12473, 6534, 120633, 99, 98, 97, 68226, 67584, - 4049, 74163, 127065, 7090, 83274, 7892, 127064, 10777, 917803, 65310, - 65562, 66599, 66722, 194955, 8039, 3363, 66594, 43434, 127062, 71191, - 12596, 66595, 42258, 42570, 5593, 119148, 120534, 92425, 10100, 6061, - 64854, 119, 118, 117, 116, 12998, 122, 121, 120, 111, 110, 109, 108, 115, - 114, 113, 112, 103, 102, 101, 100, 107, 106, 105, 104, 6436, 73974, 534, - 41212, 67713, 1536, 64093, 73970, 77930, 121093, 0, 6020, 12716, 127112, - 12744, 475, 120394, 13266, 127813, 127111, 78842, 73926, 66291, 10645, - 1212, 6543, 983309, 8134, 42935, 2913, 73870, 127113, 1866, 983229, - 71892, 120996, 8923, 1645, 12059, 66585, 71297, 3196, 72404, 194827, - 5935, 1250, 127066, 8174, 9787, 6733, 9859, 7916, 9861, 9860, 5258, 1882, - 1892, 6731, 10882, 405, 11454, 73911, 113787, 73819, 41169, 8939, 41245, - 128775, 41170, 1454, 11369, 6477, 12157, 120861, 0, 0, 41172, 7855, 0, - 71472, 10480, 43258, 126596, 77936, 8264, 12610, 983310, 645, 126616, - 7609, 40973, 69943, 73833, 69948, 5824, 984, 77918, 10688, 5851, 0, 7729, - 73982, 120518, 83473, 195086, 43369, 983177, 128140, 68415, 77861, 4538, - 93978, 43141, 983769, 82976, 74214, 73886, 67709, 917599, 71918, 43005, - 71114, 9552, 0, 70129, 129173, 12997, 83477, 0, 128897, 195030, 2381, - 12883, 10994, 10529, 41906, 0, 74618, 0, 12425, 10661, 10856, 9614, 2428, - 41478, 8582, 10064, 73930, 82977, 70437, 121251, 64896, 119162, 1952, - 92181, 8455, 10082, 11575, 128450, 119566, 128093, 12808, 12183, 6145, - 75020, 64929, 74985, 71916, 74984, 43186, 42509, 0, 3922, 9187, 83277, - 83278, 10191, 83271, 11752, 3353, 9358, 983462, 71366, 66680, 120090, - 8248, 7931, 8558, 9795, 68380, 120047, 983056, 83470, 120081, 119052, - 41027, 120086, 71449, 120088, 7366, 7019, 70378, 0, 11751, 120078, 78294, - 64657, 8657, 83472, 8594, 120068, 0, 983789, 120069, 120072, 120071, 0, - 113711, 43154, 41029, 119956, 11332, 65380, 7728, 94077, 11294, 0, 66665, - 7851, 0, 8375, 8699, 127949, 42524, 68419, 9085, 94041, 7504, 9327, 6160, - 73842, 983864, 194929, 8088, 128937, 74012, 66562, 0, 4439, 6926, 72423, - 12924, 128227, 42369, 4350, 65491, 65145, 9041, 43559, 64577, 10826, - 127476, 11296, 983285, 983409, 0, 65825, 9577, 68199, 983393, 64670, - 983121, 78056, 6793, 11295, 70409, 78053, 73872, 78055, 119993, 10902, 0, - 0, 78070, 11200, 10472, 2995, 121438, 120138, 64682, 2371, 78069, 118893, - 259, 1009, 70405, 2402, 2333, 6440, 194741, 113757, 65125, 41244, 70407, - 13271, 9103, 2278, 983146, 194728, 129120, 0, 10219, 74968, 194740, 0, - 67718, 43178, 127070, 41261, 119362, 43640, 8613, 0, 94049, 6736, 83439, - 41492, 12005, 69927, 127068, 1890, 120056, 0, 83443, 0, 7293, 7991, - 74052, 10578, 121141, 78076, 128620, 67368, 69928, 71850, 78800, 92653, - 64445, 42668, 6635, 128308, 6164, 65170, 74936, 121182, 7676, 11664, 0, - 93025, 69707, 93022, 118812, 0, 71096, 128045, 9175, 11925, 78045, 9088, - 119145, 64545, 1396, 120664, 7546, 3847, 71088, 93037, 4985, 13288, 672, - 8098, 43196, 194746, 120723, 128126, 42655, 74043, 65072, 1577, 11772, - 13041, 5928, 4525, 10658, 65911, 1266, 10180, 194711, 128371, 12622, - 127234, 124948, 0, 121214, 127139, 13310, 773, 19933, 1539, 0, 74969, - 42731, 67972, 74970, 71066, 983200, 3051, 5862, 7823, 92478, 92746, - 120411, 3250, 43991, 69687, 66649, 9510, 66237, 983304, 0, 41066, 64673, - 917963, 92381, 128636, 3505, 8707, 74925, 6725, 120802, 121296, 75041, - 3471, 66391, 5479, 882, 6686, 119584, 11613, 120772, 42754, 74608, - 125029, 83433, 121237, 120845, 0, 83431, 3225, 917996, 4433, 41156, - 43973, 43173, 1443, 4381, 0, 983642, 10926, 11756, 11757, 64879, 121106, - 42654, 127848, 13227, 120320, 10021, 5160, 1387, 0, 92644, 41418, 128933, - 65914, 6721, 217, 917955, 917960, 121082, 10443, 10789, 41158, 119257, - 4274, 11143, 41483, 0, 41250, 128904, 42179, 128375, 5931, 11744, 11215, - 74446, 41252, 66682, 0, 119637, 41249, 1366, 64635, 65047, 12466, 983458, - 120813, 4397, 128037, 128336, 41296, 9545, 41291, 120893, 0, 41485, 3511, - 41282, 5923, 10400, 0, 120493, 760, 0, 12088, 5786, 68252, 42256, 119869, - 67145, 417, 41474, 119562, 41565, 74965, 5934, 74572, 66583, 74904, - 64877, 2284, 64481, 78614, 66013, 41956, 43455, 67240, 194656, 0, 0, - 42273, 5819, 0, 128056, 0, 119129, 983100, 65910, 127747, 10246, 120816, - 65785, 1237, 10274, 4552, 119576, 128287, 0, 1375, 66705, 43573, 65260, - 3329, 0, 42811, 10312, 69845, 120794, 7840, 0, 43630, 10252, 119242, - 128104, 43185, 0, 4396, 195051, 119880, 10769, 9676, 119041, 0, 9753, - 92762, 8944, 983164, 0, 10473, 983823, 120472, 6072, 43025, 10299, - 128436, 68845, 120608, 66326, 67412, 92952, 0, 43811, 9330, 120596, 7222, + 12840, 43112, 8876, 120231, 8096, 10284, 120935, 100970, 70713, 10380, + 8733, 10316, 70121, 41602, 917575, 92308, 74831, 93984, 983830, 68482, + 65399, 917820, 64591, 42405, 83466, 120820, 843, 11541, 100810, 70321, + 2065, 41935, 74496, 41902, 125060, 983306, 215, 41258, 77875, 43159, + 1953, 9579, 41938, 1256, 3910, 9407, 6242, 0, 83464, 41257, 41900, 8675, + 10700, 8805, 1742, 113722, 9333, 8202, 72399, 121027, 983197, 113809, + 100989, 73882, 499, 983049, 43467, 194927, 43818, 83482, 1712, 5932, + 77845, 41762, 129372, 0, 11967, 1775, 125006, 75009, 11118, 121391, + 100982, 9458, 92935, 6470, 9180, 120380, 43176, 100414, 100986, 42782, + 100440, 101036, 101035, 100581, 73849, 101040, 9414, 74647, 73782, 73969, + 565, 42484, 5794, 201, 2662, 42292, 101044, 8254, 101046, 10975, 43518, + 100954, 74763, 1022, 4108, 3880, 74247, 100951, 100991, 92263, 917980, + 7507, 100638, 43149, 71059, 65031, 7961, 1636, 0, 65029, 65024, 119099, + 12473, 6534, 120633, 99, 98, 97, 68226, 67584, 4049, 74163, 100955, 7090, + 83274, 7892, 101030, 10777, 917803, 65310, 65562, 66599, 66722, 194955, + 8039, 3363, 66594, 43434, 100960, 71191, 12596, 66595, 42258, 42570, + 5593, 119148, 120534, 92425, 10100, 6061, 64854, 119, 118, 117, 116, + 12998, 122, 121, 120, 111, 110, 109, 108, 115, 114, 113, 112, 103, 102, + 101, 100, 107, 106, 105, 104, 6436, 73974, 534, 41212, 67713, 1536, + 64093, 73970, 77930, 121093, 0, 6020, 12716, 127112, 12744, 475, 120394, + 13266, 127813, 101073, 78842, 70503, 66291, 10645, 1212, 6543, 125220, + 8134, 42935, 2913, 73870, 127113, 1866, 983229, 71892, 120996, 8923, + 1645, 12059, 66585, 71297, 3196, 72404, 194733, 5935, 1250, 127066, 8174, + 9787, 6733, 9859, 7916, 9861, 9860, 5258, 1882, 1892, 6731, 10882, 405, + 11454, 73911, 101020, 73819, 41169, 8939, 41245, 83465, 41170, 1454, + 11369, 6477, 12157, 120861, 0, 0, 41172, 7855, 100961, 71472, 10480, + 43258, 126596, 77936, 8264, 12610, 983310, 645, 100992, 7609, 40973, + 69943, 73833, 69948, 5824, 984, 77918, 10688, 5851, 100836, 7729, 73982, + 101001, 83473, 101003, 43369, 101005, 100973, 68415, 77861, 4538, 93978, + 43141, 100972, 82976, 74214, 73886, 67709, 917599, 71918, 43005, 71114, + 9552, 0, 70129, 129173, 12997, 83477, 194943, 128897, 100737, 2381, + 12883, 10994, 10529, 41906, 100981, 74618, 100983, 12425, 10661, 10856, + 9614, 2428, 41478, 8582, 10064, 73930, 82977, 70437, 121251, 64896, + 100956, 1952, 92181, 8455, 10082, 11575, 100957, 119566, 100817, 12808, + 12183, 6145, 75020, 64929, 74985, 71916, 74984, 43186, 42509, 0, 3922, + 9187, 83277, 83278, 10191, 83271, 11752, 3353, 9358, 128980, 71366, + 66680, 100813, 8248, 7931, 8558, 9795, 68380, 100812, 100977, 83470, + 120081, 100971, 41027, 100811, 71449, 120088, 7366, 7019, 70378, 0, + 11751, 120078, 78294, 64657, 8657, 83472, 8594, 100969, 100968, 100978, + 100820, 100914, 120071, 0, 113711, 43154, 41029, 119956, 11332, 65380, + 7728, 94077, 11294, 100980, 66665, 7851, 0, 8375, 8699, 121097, 42524, + 68419, 9085, 94041, 7504, 9327, 6160, 73842, 983864, 194929, 8088, 70698, + 74012, 66562, 0, 4439, 6926, 72423, 12924, 100974, 42369, 4350, 65491, + 65145, 9041, 43559, 64577, 10826, 100959, 11296, 983285, 983409, 0, + 65825, 9577, 68199, 82982, 64670, 983121, 78056, 6793, 11295, 70409, + 78053, 73872, 78055, 100815, 10902, 0, 0, 78070, 11200, 10472, 2995, + 100953, 120138, 64682, 2371, 72720, 118893, 259, 1009, 70405, 2402, 2333, + 6440, 125247, 100963, 65125, 41244, 70407, 13271, 9103, 2278, 983146, + 194728, 7301, 983693, 10219, 74968, 194740, 0, 67718, 43178, 127070, + 41261, 119362, 43640, 8613, 194895, 94049, 6736, 83439, 41492, 12005, + 69927, 127068, 1890, 120056, 983302, 83443, 983044, 7293, 7991, 74052, + 10578, 121141, 78076, 128620, 67368, 69928, 71850, 78800, 92653, 64445, + 42668, 6635, 100792, 6164, 65170, 74936, 121182, 7676, 11664, 128684, + 93025, 69707, 93022, 118812, 983233, 71096, 128045, 9175, 11925, 78045, + 9088, 119145, 64545, 1396, 120220, 7546, 3847, 71088, 93037, 4985, 13288, + 672, 8098, 43196, 100796, 120723, 128126, 42655, 74043, 65072, 1577, + 11772, 13041, 5928, 4525, 10658, 65911, 1266, 10180, 194711, 128371, + 12622, 127234, 120566, 194798, 121214, 127139, 13310, 773, 19933, 1539, + 983351, 74969, 42731, 67972, 74970, 71066, 983200, 3051, 5862, 7823, + 92478, 92746, 120411, 3250, 43991, 69687, 66649, 9510, 66237, 983304, + 194748, 41066, 64673, 917963, 92381, 128636, 3505, 8707, 74925, 6725, + 120802, 121296, 75041, 3471, 66391, 5479, 882, 6686, 119584, 11613, + 101106, 42754, 74608, 125029, 83433, 121237, 120845, 0, 83431, 3225, + 917996, 4433, 41156, 43973, 43173, 1443, 4381, 127949, 983642, 10926, + 11756, 11757, 64879, 121106, 42654, 127848, 13227, 120320, 10021, 5160, + 1387, 983730, 92644, 41418, 66749, 65914, 6721, 217, 72829, 917960, + 100965, 10443, 10789, 41158, 119257, 4274, 11143, 41483, 0, 41250, + 128563, 42179, 128375, 5931, 11744, 11215, 70676, 41252, 66682, 983680, + 119637, 41249, 1366, 64635, 65047, 12466, 74319, 120813, 4397, 100445, + 128336, 41296, 9545, 41291, 120893, 0, 41485, 3511, 41282, 5923, 10400, + 0, 120493, 760, 127188, 12088, 5786, 68252, 42256, 100446, 67145, 417, + 41474, 119562, 41565, 74965, 5934, 74572, 66583, 74904, 64877, 2284, + 64481, 78614, 66013, 41956, 43455, 67240, 194656, 0, 127153, 42273, 5819, + 0, 128056, 0, 119129, 983100, 65910, 127747, 10246, 120816, 65785, 1237, + 10274, 4552, 119576, 128287, 0, 1375, 66705, 43573, 65260, 3329, 0, + 42811, 10312, 69845, 120794, 7840, 0, 43630, 10252, 119242, 128104, + 43185, 0, 4396, 100532, 100535, 10769, 9676, 100536, 100539, 9753, 92762, + 8944, 983164, 121450, 10473, 983823, 100542, 6072, 43025, 10299, 100546, + 68845, 100548, 66326, 67412, 92952, 72808, 43811, 9330, 120596, 7222, 10283, 10315, 10379, 4996, 127902, 13281, 66517, 7865, 10087, 78343, 74938, 43324, 0, 0, 7565, 66363, 12952, 64806, 43180, 74967, 7414, 77929, - 43982, 74288, 622, 74023, 885, 43405, 1602, 0, 983731, 852, 0, 12160, - 83491, 10212, 65435, 129092, 12071, 9609, 12156, 917983, 917984, 43586, + 43982, 70741, 622, 74023, 885, 43405, 1602, 0, 71267, 852, 0, 12160, + 83491, 10212, 65435, 126603, 12071, 9609, 12156, 917983, 917984, 43586, 11035, 10411, 917988, 10255, 6710, 10279, 4194, 10375, 43853, 128599, 4315, 12644, 83490, 77937, 43639, 43343, 67408, 128945, 11501, 41177, - 121180, 128866, 43431, 127097, 92413, 8715, 0, 41179, 983358, 43313, - 120230, 41176, 128780, 994, 983045, 8452, 77973, 73966, 66890, 70812, - 5921, 0, 2597, 92423, 5922, 118903, 66873, 4186, 92531, 119967, 127105, - 6718, 127029, 4406, 74601, 8480, 9192, 9747, 121040, 4413, 92196, 42268, - 3198, 5924, 5920, 92469, 6921, 78081, 74007, 42869, 8418, 11681, 43169, - 10176, 0, 742, 74881, 2893, 10772, 65276, 5937, 1914, 2553, 11682, 6756, - 125104, 121126, 8363, 0, 2993, 7772, 3916, 4301, 120494, 1141, 42407, - 7417, 718, 7572, 973, 119599, 120718, 3235, 2415, 43164, 0, 8018, 42333, - 74756, 10675, 6937, 42486, 43381, 65390, 10067, 120849, 1202, 0, 983910, - 65863, 0, 68484, 94013, 78182, 64542, 3260, 73829, 65388, 9945, 8419, - 78042, 6738, 0, 43681, 69728, 2059, 92422, 0, 55237, 1431, 119194, 66565, - 10821, 0, 12804, 128076, 8229, 1235, 3307, 11472, 78089, 78184, 4544, - 71228, 917982, 129188, 1740, 78097, 8758, 985, 12872, 64511, 78094, - 12068, 78102, 71226, 10141, 74922, 63761, 8785, 4476, 65071, 63763, - 12655, 8907, 9147, 78106, 78103, 78104, 120898, 119572, 10665, 64616, - 41572, 127979, 127160, 983554, 41573, 83160, 3931, 120295, 74143, 83156, - 83157, 83158, 78460, 11982, 0, 83067, 128381, 92712, 64484, 119266, - 41167, 0, 41735, 94019, 717, 10754, 83168, 83169, 72413, 83163, 63767, - 83165, 1780, 6936, 0, 83161, 819, 10611, 9694, 126978, 71474, 0, 127871, - 129069, 8343, 8342, 8345, 8344, 6578, 7009, 7523, 6922, 8348, 8347, 7525, - 3346, 8339, 128165, 128208, 575, 268, 78111, 8563, 5754, 120343, 41541, - 65565, 8336, 5936, 7290, 78117, 8337, 8341, 308, 11388, 7522, 83151, - 78123, 65466, 11090, 6953, 0, 83375, 74973, 78132, 5926, 68250, 78130, - 78126, 78127, 78124, 78125, 9038, 7887, 43456, 7830, 11651, 13093, 64002, - 983559, 65742, 12874, 119597, 11590, 0, 74048, 67379, 8595, 9835, 917947, - 43703, 13097, 0, 64643, 13283, 12697, 74975, 12381, 3488, 5933, 10033, - 71101, 66241, 65570, 119154, 12297, 71212, 1955, 127970, 5349, 42538, 0, - 124932, 7411, 9462, 128150, 0, 128465, 43920, 42736, 121017, 5756, - 128324, 7638, 41642, 42764, 983717, 43109, 7637, 5752, 11213, 83481, - 73832, 128827, 83486, 128231, 78334, 917957, 7636, 65171, 9124, 983210, - 78892, 120798, 291, 0, 983221, 2027, 66230, 10080, 78136, 10403, 70869, - 4640, 64713, 10224, 120429, 11183, 120431, 120430, 0, 128351, 127489, - 127138, 0, 92499, 0, 119094, 74213, 7824, 0, 194648, 41274, 5778, 6302, - 121432, 0, 12680, 119130, 1417, 67242, 93041, 9452, 128153, 74393, 11552, - 0, 127855, 128217, 65391, 128614, 10172, 65453, 63789, 41264, 78658, - 6426, 4641, 9179, 64819, 55278, 41255, 42036, 41469, 41269, 120412, - 41267, 4646, 67759, 865, 42034, 78274, 78273, 4645, 42033, 78270, 127982, - 983172, 43948, 195100, 68840, 78674, 1659, 919, 42784, 1671, 127892, - 6069, 9219, 128558, 1661, 13120, 63784, 69819, 10140, 9713, 119143, 0, - 71462, 94050, 2306, 10485, 118943, 6068, 10612, 195099, 119567, 67705, - 92561, 41462, 120470, 195079, 5422, 128234, 983629, 128611, 83474, 10229, - 10635, 826, 83475, 195082, 127003, 195084, 71455, 6483, 92211, 1808, - 7848, 113788, 8100, 78227, 71198, 78670, 13301, 78667, 9667, 78665, - 67704, 983921, 11003, 9904, 83410, 983919, 120690, 9144, 10921, 92992, - 78680, 9840, 65131, 78678, 71092, 10313, 83408, 83500, 64320, 10265, - 67252, 10962, 66904, 43008, 8945, 78683, 120995, 41, 195072, 1792, - 120515, 195073, 8655, 68254, 92544, 77951, 12066, 67258, 385, 4152, 2585, - 127804, 119068, 3126, 917852, 73983, 10957, 127037, 11160, 119116, - 127873, 13157, 0, 128024, 3570, 129187, 7443, 118804, 44006, 6997, 68004, - 126631, 7879, 8739, 11075, 917971, 65216, 70196, 69795, 2593, 8463, 7810, - 128543, 7839, 92612, 78806, 75064, 9691, 4411, 78802, 121219, 120854, - 43442, 69851, 65254, 10066, 983889, 72419, 0, 0, 13061, 8016, 78687, - 19932, 64831, 0, 113684, 12390, 119171, 1634, 68115, 65070, 11056, - 983574, 119925, 983099, 41165, 11328, 12450, 983811, 41166, 0, 12456, - 119914, 171, 5941, 12452, 194709, 12458, 12531, 78779, 43013, 63800, - 74162, 119320, 120483, 9969, 120767, 12454, 63806, 42132, 12063, 78425, - 78424, 3230, 68773, 983497, 75025, 5209, 297, 5810, 8522, 8415, 119937, - 78429, 78428, 7077, 2497, 128651, 960, 74156, 6981, 92374, 12938, 4292, - 78893, 74815, 10512, 0, 74814, 78875, 127505, 78876, 2503, 73778, 1762, - 69794, 2495, 74911, 5844, 68031, 118838, 127947, 12654, 4663, 1899, - 78877, 2507, 64121, 8726, 65594, 92972, 0, 119000, 8892, 78872, 92339, - 71232, 983073, 5782, 420, 127348, 917871, 43796, 10797, 63794, 0, 128533, - 64814, 63796, 43861, 0, 66581, 119204, 41608, 128479, 121144, 63792, - 4659, 120788, 77971, 43676, 74944, 69673, 121029, 11129, 92929, 329, - 77968, 92707, 83496, 7399, 0, 41188, 13244, 67692, 42167, 7435, 78193, - 5380, 119086, 69225, 1155, 11365, 43126, 77972, 0, 65684, 0, 5601, 65192, - 42765, 63752, 0, 7987, 69676, 1172, 69799, 6786, 43601, 120476, 74126, - 5603, 0, 4473, 121085, 72426, 124947, 65347, 65346, 65345, 128548, - 119213, 5347, 69802, 917973, 73868, 70852, 10588, 0, 0, 63755, 128271, - 5343, 78422, 120661, 4555, 5341, 83459, 70071, 74916, 5351, 78675, 43104, - 65244, 121365, 64541, 42519, 68134, 128916, 126986, 74765, 128979, - 127510, 6638, 0, 65113, 271, 74180, 65370, 8835, 65368, 12653, 65366, - 42172, 41086, 65363, 65362, 65361, 11912, 43410, 11323, 65357, 11800, - 65355, 5345, 11103, 65352, 65351, 761, 65349, 19959, 69718, 63856, - 126635, 2423, 74518, 64647, 77959, 11957, 4699, 126573, 128670, 983787, - 0, 64605, 0, 68074, 983977, 4916, 128568, 380, 10958, 66563, 77955, - 69773, 9773, 13167, 12918, 41096, 73980, 69245, 78254, 83450, 10684, 0, - 125063, 92906, 7946, 12541, 8182, 67586, 69780, 0, 128207, 0, 983654, - 9005, 1225, 6630, 0, 0, 118854, 68011, 8847, 92371, 65876, 5535, 8329, - 74590, 125036, 92609, 0, 66874, 3127, 2595, 65713, 42013, 121211, 5607, - 41089, 128626, 0, 70292, 2665, 11304, 43751, 74200, 4970, 8764, 120459, - 8934, 92726, 41566, 4492, 67271, 65011, 41090, 0, 83417, 1188, 7254, - 1100, 0, 67270, 41081, 2912, 11749, 67282, 67281, 67280, 3572, 10023, - 4959, 13079, 0, 67275, 9729, 125110, 121042, 67278, 43361, 127355, 67276, - 11803, 7996, 9907, 41450, 13304, 83392, 83369, 41451, 83370, 11095, 8273, - 74322, 3451, 70291, 972, 41453, 68164, 119327, 73883, 68022, 73945, - 83363, 2288, 19955, 9538, 83366, 69807, 0, 129095, 0, 83381, 11396, - 83385, 11019, 0, 128416, 121205, 68020, 41078, 71365, 261, 5927, 7791, - 128681, 7362, 0, 10696, 70124, 6073, 9838, 118920, 0, 6075, 93995, 282, - 119178, 6437, 68830, 121459, 9801, 66399, 74177, 0, 917959, 3474, 67287, - 0, 67286, 6081, 83469, 78874, 67289, 67283, 83471, 70002, 42930, 0, - 93013, 8751, 11499, 67297, 7816, 12636, 4665, 12628, 4670, 67298, 120272, - 68017, 9642, 10912, 958, 67293, 11387, 67291, 4666, 70792, 4915, 67715, - 4669, 0, 68099, 13287, 4664, 10836, 120550, 75053, 69775, 0, 43595, 7450, - 0, 917875, 8664, 9697, 3606, 83446, 983978, 917874, 64815, 1063, 120250, - 67312, 9772, 7255, 8886, 1389, 127932, 120257, 120258, 120259, 12941, - 42661, 83438, 120255, 120256, 12301, 67836, 69820, 41102, 64428, 120262, - 66602, 120264, 1017, 66600, 523, 505, 1447, 74436, 0, 70340, 83437, 8608, - 42789, 120613, 83436, 0, 71906, 11307, 66707, 67301, 67300, 11745, 7919, - 67304, 1641, 0, 0, 8966, 128900, 74919, 5908, 71870, 67853, 6744, 67310, - 1699, 67308, 67307, 67314, 67313, 6306, 10169, 71324, 119251, 10068, - 3766, 2389, 67305, 120455, 6611, 257, 43170, 13153, 0, 42386, 983815, - 9436, 2599, 0, 6496, 9449, 5930, 11476, 11033, 11447, 10541, 5622, - 120436, 8477, 3760, 1718, 9442, 66433, 3776, 917837, 41435, 4352, 67324, - 2435, 71211, 5621, 120385, 4201, 3778, 4203, 4202, 4205, 4204, 120447, - 3768, 41774, 765, 41440, 3764, 8473, 6373, 8469, 120438, 12947, 4564, - 119049, 74623, 74271, 73753, 8374, 127201, 0, 6829, 5225, 66901, 127385, - 0, 0, 119615, 67319, 67318, 3162, 43507, 11771, 67322, 67321, 67320, - 42614, 5353, 5625, 74179, 67315, 0, 1010, 64572, 41780, 42623, 64277, - 69942, 6952, 67329, 67328, 67327, 2590, 5629, 65552, 7551, 10325, 5632, - 10471, 120038, 120027, 120028, 120025, 5628, 120031, 970, 120029, 4772, - 2400, 5627, 120017, 67330, 120023, 64275, 120021, 8786, 113693, 203, - 74365, 0, 0, 69985, 78350, 113703, 64378, 42054, 128575, 0, 554, 119649, - 11358, 71172, 12182, 42048, 11065, 125114, 73891, 83423, 83019, 5694, - 7689, 69798, 9323, 4325, 3047, 10317, 175, 120962, 93029, 69764, 0, 0, - 1243, 42154, 5431, 6652, 917561, 67753, 43651, 129129, 68118, 68093, - 1129, 126574, 0, 65900, 1986, 7846, 78804, 8661, 75058, 65255, 93992, - 3845, 4490, 118969, 6649, 74136, 1456, 7530, 11977, 7249, 8366, 0, 7756, - 12342, 120697, 51, 41516, 0, 8570, 9568, 71318, 456, 7026, 8145, 1168, - 9251, 9082, 119964, 64055, 42781, 3866, 12323, 41512, 73805, 68121, - 917850, 41494, 92316, 4660, 67114, 10405, 127195, 78803, 0, 129176, - 42040, 73918, 119627, 7944, 41454, 12605, 0, 42205, 41455, 236, 64051, - 78867, 8214, 83421, 113784, 120037, 41457, 983970, 119589, 1969, 2384, - 8097, 128019, 7413, 68012, 78029, 8766, 43864, 78079, 5854, 125000, - 10583, 0, 119989, 127556, 10416, 68070, 3872, 83424, 983839, 8429, - 121230, 118806, 2838, 6429, 0, 83426, 0, 128478, 0, 194620, 94005, 11096, - 83422, 10553, 1662, 8483, 120396, 43605, 5892, 43418, 67819, 73742, 66, - 65, 68, 67, 70, 69, 72, 71, 74, 73, 76, 75, 78, 77, 80, 79, 82, 81, 84, - 83, 86, 85, 88, 87, 90, 89, 119862, 10357, 7385, 8170, 1704, 8556, - 917975, 9659, 0, 0, 0, 9556, 0, 4503, 11353, 9647, 125015, 78185, 128959, - 0, 71437, 78886, 0, 0, 74229, 66593, 6438, 83364, 9109, 78882, 1289, - 64599, 118915, 68009, 128302, 65507, 2447, 119911, 128694, 128042, - 126545, 66589, 0, 6334, 128369, 0, 19937, 917793, 1322, 92359, 5675, 254, - 0, 0, 69686, 42425, 8918, 64003, 5716, 42312, 0, 194692, 6972, 42826, - 74409, 42464, 120567, 66899, 67155, 74796, 64400, 64693, 128805, 67687, - 65429, 9515, 4435, 0, 42522, 0, 68008, 11785, 7412, 43867, 41978, 1412, - 4594, 1391, 10536, 8067, 9901, 7103, 128293, 7102, 71428, 120748, 3140, - 127276, 7960, 43271, 121099, 12518, 10909, 127508, 1428, 12472, 67254, - 67253, 7699, 12393, 67257, 0, 67256, 67255, 8223, 0, 4261, 121460, - 120910, 74308, 983827, 113712, 67153, 983571, 128046, 43419, 983471, - 64554, 10574, 3878, 67691, 42352, 1752, 73785, 128171, 42506, 128541, - 10199, 917865, 125142, 68021, 65919, 0, 6695, 720, 324, 0, 129035, 43406, - 983736, 1464, 40985, 0, 7974, 0, 43474, 68082, 64488, 128977, 120951, - 64041, 74787, 0, 78865, 92258, 65597, 121416, 78863, 0, 1302, 66288, - 78861, 119134, 0, 67152, 5204, 74774, 43404, 11835, 120923, 3995, 68360, - 65608, 3714, 92190, 120026, 67262, 10999, 11750, 67259, 43251, 67264, - 43301, 0, 120557, 8130, 8672, 10845, 11964, 121268, 128014, 92173, 0, - 68455, 42863, 73839, 127529, 0, 67700, 917812, 113701, 43645, 468, 612, - 0, 64401, 66448, 68376, 0, 1674, 0, 5823, 128625, 12280, 70367, 540, - 74564, 119017, 66422, 8432, 78873, 11073, 0, 64316, 0, 121070, 820, + 121180, 128866, 43431, 127097, 92413, 8715, 983398, 41179, 983358, 43313, + 120230, 41176, 101007, 994, 100448, 8452, 77973, 73966, 66890, 70812, + 5921, 100804, 2597, 66776, 5922, 118903, 66873, 4186, 92531, 73741, + 127105, 6718, 127029, 4406, 74601, 8480, 9192, 9747, 121040, 4413, 92196, + 42268, 3198, 5924, 5920, 92469, 6921, 78081, 74007, 42869, 8418, 11681, + 43169, 10176, 983640, 742, 74881, 2893, 10772, 65276, 5937, 1914, 2553, + 11682, 6756, 125104, 121126, 8363, 0, 2993, 7772, 3916, 4301, 100517, + 1141, 42407, 7417, 718, 7572, 973, 100500, 120718, 3235, 2415, 43164, + 125099, 8018, 42333, 74756, 10675, 6937, 42486, 43381, 65390, 10067, + 100868, 1202, 100557, 128364, 65863, 119250, 68484, 94013, 78182, 64542, + 3260, 73829, 65388, 9945, 8419, 78042, 6738, 122882, 43681, 69728, 2059, + 92422, 100502, 55237, 1431, 100503, 66565, 10821, 100508, 12804, 100510, + 8229, 1235, 3307, 11472, 78089, 78184, 4544, 71228, 194626, 129188, 1740, + 78097, 8758, 985, 12872, 64511, 78094, 12068, 78102, 71226, 10141, 74922, + 63761, 8785, 4476, 65071, 63763, 12655, 8907, 9147, 78106, 78103, 78104, + 120898, 119572, 10665, 64616, 41572, 127979, 127160, 983127, 41573, + 83160, 3931, 120295, 74143, 83156, 83157, 83158, 78460, 11982, 983483, + 83067, 128381, 92712, 64484, 119266, 41167, 983366, 41735, 94019, 717, + 10754, 72740, 83169, 72413, 83163, 63767, 83165, 1780, 6936, 0, 83161, + 819, 10611, 9694, 125228, 71474, 0, 127871, 129069, 8343, 8342, 8345, + 8344, 6578, 7009, 7523, 6922, 8348, 8347, 7525, 3346, 8339, 128165, + 72705, 575, 268, 78111, 8563, 5754, 120343, 41541, 65565, 8336, 5936, + 7290, 78117, 8337, 8341, 308, 11388, 7522, 83151, 78123, 65466, 11090, + 6953, 125240, 83375, 74973, 78132, 5926, 68250, 78130, 78126, 78127, + 78124, 78125, 9038, 7887, 43456, 7830, 11651, 13093, 64002, 983559, + 65742, 12874, 100473, 11590, 100475, 74048, 67379, 8595, 9835, 100456, + 43703, 13097, 127197, 64643, 13283, 12697, 74975, 12381, 3488, 5933, + 10033, 71101, 66241, 65570, 78336, 12297, 71212, 1955, 127970, 5349, + 42538, 0, 124932, 7411, 9462, 128150, 100453, 100452, 43920, 42736, + 70747, 5756, 128324, 7638, 41642, 42764, 120444, 43109, 7637, 5752, + 11213, 83481, 73832, 100463, 83486, 100465, 78334, 121034, 7636, 65171, + 9124, 917957, 78892, 120798, 291, 0, 83488, 2027, 66230, 10080, 78136, + 10403, 70869, 4640, 64713, 10224, 120429, 11183, 120431, 120430, 983223, + 128351, 72845, 127138, 0, 92499, 0, 119094, 74213, 7824, 0, 194648, + 41274, 5778, 6302, 100367, 0, 12680, 119130, 1417, 67242, 93041, 9452, + 128153, 74393, 11552, 0, 127855, 121380, 65391, 128614, 10172, 65453, + 63789, 41264, 78658, 6426, 4641, 9179, 64819, 55278, 41255, 42036, 41469, + 41269, 120412, 41267, 4646, 67759, 865, 42034, 78274, 78273, 4645, 42033, + 78270, 127982, 983172, 43948, 195100, 68840, 78674, 1659, 919, 42784, + 1671, 127892, 6069, 9219, 100461, 1661, 13120, 63784, 69819, 10140, 9713, + 119143, 983359, 71462, 94050, 2306, 10485, 118943, 6068, 10612, 195099, + 119567, 67705, 92561, 41462, 120470, 195079, 5422, 128234, 983629, + 127770, 83474, 10229, 10635, 826, 83475, 195082, 92603, 121149, 71455, + 6483, 92211, 1808, 7848, 113788, 8100, 78227, 71198, 78670, 13301, 78667, + 9667, 78665, 67704, 983921, 11003, 9904, 83410, 983919, 120690, 9144, + 10921, 92992, 78680, 9840, 65131, 78678, 71092, 10313, 83408, 83500, + 64320, 10265, 67252, 10962, 66904, 43008, 8945, 78683, 120995, 41, + 194866, 1792, 120515, 195073, 8655, 68254, 92544, 77951, 12066, 67258, + 385, 4152, 2585, 127804, 119068, 3126, 917852, 73983, 10957, 127037, + 11160, 119116, 127873, 13157, 983645, 128024, 3570, 129187, 7443, 118804, + 44006, 6997, 68004, 126631, 7879, 8739, 11075, 195046, 65216, 70196, + 69795, 2593, 8463, 7810, 128543, 7839, 92612, 78806, 75064, 9691, 4411, + 71276, 72837, 120854, 43442, 69851, 65254, 10066, 122897, 72419, 121411, + 120886, 13061, 8016, 78687, 19932, 64831, 194975, 113684, 12390, 119171, + 1634, 68115, 65070, 11056, 983574, 119925, 983099, 41165, 11328, 12450, + 983811, 41166, 93971, 12456, 119194, 171, 5941, 12452, 194709, 12458, + 12531, 78779, 43013, 63800, 74162, 119320, 120483, 9969, 120767, 12454, + 63806, 42132, 12063, 78425, 78424, 3230, 68773, 128595, 75025, 5209, 297, + 5810, 8522, 8415, 119937, 78429, 78428, 7077, 2497, 128651, 960, 74156, + 6981, 92374, 12938, 4292, 78893, 74815, 10512, 0, 72866, 78875, 78049, + 72841, 2503, 73778, 1762, 69794, 2495, 74911, 5844, 68031, 118838, + 127947, 12654, 4663, 1899, 78877, 2507, 64121, 8726, 65594, 92972, + 120424, 71272, 8892, 78872, 92339, 71232, 983073, 5782, 420, 127348, + 917871, 43796, 10797, 63794, 194967, 125223, 64814, 63796, 43861, 0, + 66581, 119204, 41608, 128479, 121144, 63792, 4659, 120788, 77971, 43676, + 74944, 69673, 121029, 11129, 92929, 329, 77968, 92707, 83496, 7399, 0, + 41188, 13244, 67692, 42167, 7435, 78193, 5380, 119086, 69225, 1155, + 11365, 43126, 77972, 120862, 65684, 0, 5601, 65192, 42765, 63752, 0, + 7987, 69676, 1172, 69799, 6786, 43601, 120476, 74126, 5603, 0, 4473, + 121085, 72426, 124947, 65347, 65346, 65345, 128548, 66741, 5347, 69802, + 917973, 73868, 70852, 10588, 0, 128420, 63755, 126643, 5343, 78422, + 120661, 4555, 5341, 83459, 70071, 74916, 5351, 78675, 43104, 65244, + 121365, 64541, 42519, 68134, 128916, 126986, 74765, 66785, 127510, 6638, + 129363, 65113, 271, 74180, 65370, 8835, 65368, 12653, 65366, 42172, + 41086, 65363, 65362, 65361, 11912, 43410, 11323, 65357, 11800, 65355, + 5345, 11103, 65352, 65351, 761, 65349, 19959, 69718, 63856, 126635, 2423, + 74518, 64647, 77959, 11957, 4699, 126573, 128670, 983787, 0, 64605, 0, + 68074, 127307, 4916, 128568, 380, 10958, 66563, 77955, 69773, 9773, + 13167, 12918, 41096, 73980, 69245, 78254, 66737, 10684, 122913, 125063, + 92906, 7946, 12541, 8182, 67586, 69780, 129422, 128207, 983644, 128613, + 9005, 1225, 6630, 0, 983491, 118854, 68011, 8847, 92371, 65876, 5535, + 8329, 74590, 125036, 92609, 0, 66874, 3127, 2595, 65713, 42013, 121211, + 5607, 41089, 128626, 983396, 70292, 2665, 11304, 43751, 74200, 4970, + 8764, 120459, 8934, 92726, 41566, 4492, 67271, 65011, 41090, 0, 83417, + 1188, 7254, 1100, 129180, 67270, 41081, 2912, 11749, 67282, 67281, 67280, + 3572, 10023, 4959, 13079, 124978, 67275, 9729, 125110, 121042, 67278, + 43361, 127355, 67276, 11803, 7996, 9907, 41450, 13304, 83392, 83369, + 41451, 83370, 11095, 8273, 74322, 3451, 70291, 972, 41453, 68164, 119327, + 73883, 68022, 73945, 83363, 2288, 19955, 9538, 83366, 69807, 125246, + 129095, 0, 83381, 11396, 83385, 11019, 121218, 128416, 121205, 68020, + 41078, 66758, 261, 5927, 7791, 128681, 7362, 125256, 10696, 70124, 6073, + 9838, 118920, 917878, 6075, 93995, 282, 119178, 6437, 68830, 121459, + 9801, 66399, 74177, 66791, 917959, 3474, 67287, 0, 67286, 6081, 83469, + 78874, 67289, 67283, 83471, 70002, 42930, 129413, 93013, 8751, 11499, + 67297, 7816, 12636, 4665, 12628, 4670, 67298, 120272, 68017, 9642, 10912, + 958, 67293, 11387, 67291, 4666, 70792, 4915, 67715, 4669, 0, 68099, + 13287, 4664, 10836, 120550, 75053, 69775, 0, 43595, 7450, 74173, 917875, + 8664, 9697, 3606, 83446, 983978, 917874, 64815, 1063, 119088, 67312, + 9772, 7255, 8886, 1389, 100833, 120257, 119202, 120259, 12941, 42661, + 83438, 120255, 101101, 12301, 67836, 69820, 41102, 64428, 120262, 66602, + 66788, 1017, 66600, 523, 505, 1447, 74436, 0, 70340, 66793, 8608, 42789, + 70868, 83436, 983480, 71906, 11307, 66707, 67301, 67300, 11745, 7919, + 67304, 1641, 126523, 0, 8966, 128900, 74919, 5908, 71870, 67853, 6744, + 67310, 1699, 67308, 67307, 67314, 67313, 6306, 10169, 71324, 119251, + 10068, 3766, 2389, 67305, 120455, 6611, 257, 43170, 13153, 0, 42386, + 917974, 9436, 2599, 983747, 6496, 9449, 5930, 11476, 11033, 11447, 10541, + 5622, 120436, 8477, 3760, 1718, 9442, 66433, 3776, 917837, 41435, 4352, + 67324, 2435, 71211, 5621, 120385, 4201, 3778, 4203, 4202, 4205, 4204, + 120447, 3768, 41774, 765, 41440, 3764, 8473, 6373, 8469, 120438, 12947, + 4564, 100470, 74623, 74271, 73753, 8374, 127201, 0, 6829, 5225, 66901, + 127385, 0, 0, 119615, 67319, 67318, 3162, 43507, 11771, 67322, 67321, + 67320, 42614, 5353, 5625, 74179, 67315, 0, 1010, 64572, 41780, 42623, + 64277, 69942, 6952, 67329, 67328, 67327, 2590, 5629, 65552, 7551, 10325, + 5632, 10471, 120038, 120027, 120028, 120025, 5628, 120031, 970, 120029, + 4772, 2400, 5627, 74364, 67330, 120023, 64275, 120021, 8786, 113693, 203, + 74365, 0, 0, 69985, 78350, 101065, 64378, 42054, 128575, 194993, 554, + 83422, 11358, 71172, 12182, 42048, 11065, 125114, 73891, 83423, 83019, + 5694, 7689, 66784, 9323, 4325, 3047, 10317, 175, 120962, 93029, 69764, 0, + 120625, 1243, 42154, 5431, 6652, 917561, 67753, 43651, 127801, 68118, + 68093, 1129, 72846, 100707, 65900, 1986, 7846, 78804, 8661, 75058, 65255, + 93992, 3845, 4490, 118969, 6649, 74136, 1456, 7530, 11977, 7249, 8366, + 983612, 7756, 12342, 120697, 51, 41516, 0, 8570, 9568, 71318, 456, 7026, + 8145, 1168, 9251, 9082, 119964, 64055, 42781, 3866, 12323, 41512, 73805, + 68121, 917850, 41494, 92316, 4660, 67114, 10405, 127195, 78803, 100439, + 129176, 42040, 73918, 119627, 7944, 41454, 12605, 0, 42205, 41455, 236, + 64051, 78867, 8214, 83421, 113784, 120037, 41457, 983481, 119589, 1969, + 2384, 8097, 128019, 7413, 68012, 72820, 8766, 43864, 72824, 5854, 125000, + 10583, 0, 119989, 72819, 10416, 68070, 3872, 83424, 127399, 8429, 121230, + 118806, 2838, 6429, 121077, 83426, 72835, 100420, 0, 194620, 94005, + 11096, 83420, 10553, 1662, 8483, 120396, 43605, 5892, 43418, 67819, + 73742, 66, 65, 68, 67, 70, 69, 72, 71, 74, 73, 76, 75, 78, 77, 80, 79, + 82, 81, 84, 83, 86, 85, 88, 87, 90, 89, 119862, 10357, 7385, 8170, 1704, + 8556, 917975, 9659, 0, 100736, 0, 9556, 0, 4503, 11353, 9647, 125015, + 68288, 128959, 917976, 71437, 78886, 983288, 983496, 74229, 66593, 6438, + 83364, 9109, 78882, 1289, 64599, 118915, 68009, 128302, 65507, 2447, + 119911, 128694, 128042, 126545, 66589, 983875, 6334, 128369, 917919, + 19937, 917793, 1322, 92359, 5675, 254, 124964, 0, 69686, 42425, 8918, + 64003, 5716, 42312, 120090, 100552, 6972, 42826, 74409, 42464, 120567, + 66899, 67155, 74796, 64400, 64693, 128437, 67687, 65429, 9515, 4435, + 983367, 42522, 0, 68008, 11785, 7412, 43867, 41978, 1412, 4594, 1391, + 10536, 8067, 9901, 7103, 128293, 7102, 71428, 120748, 3140, 127276, 7960, + 43271, 121099, 12518, 10909, 127508, 1428, 12472, 67254, 67253, 7699, + 12393, 67257, 0, 67256, 67255, 8223, 0, 4261, 78784, 120910, 74308, + 983827, 113712, 67153, 125252, 72744, 43419, 72748, 64554, 10574, 3878, + 67691, 42352, 1752, 73785, 128171, 42506, 128541, 10199, 917865, 125142, + 68021, 65919, 127102, 6695, 720, 324, 0, 129035, 43406, 125269, 1464, + 40985, 0, 7974, 0, 43474, 68082, 64488, 128977, 120951, 3420, 74787, 0, + 78865, 92258, 65597, 121416, 78863, 0, 1302, 66288, 78861, 119134, + 120274, 67152, 5204, 74774, 43404, 11835, 120923, 3995, 68360, 65608, + 3714, 92190, 120026, 67262, 10999, 11750, 67259, 43251, 67264, 43301, 0, + 120557, 8130, 8672, 10845, 11964, 121268, 128014, 92173, 120710, 68455, + 42863, 73839, 119929, 0, 67700, 917812, 113701, 43645, 468, 612, 0, + 64401, 66448, 68376, 128208, 1674, 917581, 5823, 128625, 12280, 70367, + 540, 74564, 119017, 66422, 8432, 78873, 11073, 0, 64316, 0, 121001, 820, 41741, 983477, 120667, 124981, 64684, 126992, 3359, 7800, 69934, 65177, 6226, 353, 12396, 121176, 119612, 64742, 128682, 78879, 983478, 127938, - 12412, 19941, 0, 120277, 70352, 1884, 9481, 42418, 70059, 41157, 983142, - 1195, 64898, 7924, 119870, 41151, 2010, 71430, 41328, 42344, 0, 12409, 0, - 4360, 121023, 9739, 128550, 69933, 73921, 917631, 42521, 8539, 128606, 0, - 118986, 127148, 4788, 121345, 68023, 65734, 983457, 43790, 120274, 13075, - 74429, 94063, 64569, 43532, 10837, 2492, 127197, 118901, 68637, 41136, - 43785, 11813, 9649, 41154, 113731, 5128, 4038, 41143, 65604, 64859, - 41592, 6771, 1648, 5435, 67295, 6734, 41343, 119848, 65439, 12709, 6986, - 92364, 68015, 120533, 41349, 70021, 12581, 10374, 5175, 0, 73806, 10254, - 113681, 10278, 10262, 69858, 41346, 120870, 607, 0, 68182, 128846, 12923, - 10314, 10282, 65477, 10378, 120297, 40976, 8265, 129149, 78639, 40975, - 5840, 42838, 74987, 40978, 121386, 92945, 128020, 119809, 0, 66444, - 10538, 120810, 2550, 119836, 6779, 129130, 0, 3525, 6824, 118886, 983582, - 0, 5619, 65822, 113751, 113738, 7455, 71424, 5616, 11486, 9656, 0, 0, - 10727, 5615, 120873, 120551, 42380, 64895, 43693, 66451, 808, 5455, - 11347, 0, 1026, 5620, 194887, 0, 11350, 5617, 0, 9225, 64639, 127073, - 9145, 128060, 1338, 120581, 983158, 12739, 4603, 3084, 70408, 92484, - 9858, 6037, 983465, 3974, 78213, 10290, 983704, 3083, 10322, 129048, - 129030, 75038, 41036, 66897, 0, 43321, 65606, 127071, 41032, 42388, 0, - 64700, 10011, 1445, 40961, 0, 119105, 0, 40960, 194907, 67727, 125106, - 2223, 64952, 10402, 128358, 125049, 92304, 10603, 0, 983403, 71438, 0, - 6714, 10083, 127069, 121019, 78367, 69976, 0, 43872, 9073, 42585, 64302, - 10704, 65030, 4787, 129031, 74829, 0, 65423, 121306, 128118, 9570, 55260, - 9525, 2689, 917626, 65426, 194872, 917624, 43740, 121163, 40966, 120009, - 13286, 3998, 42598, 42596, 503, 71433, 8735, 2690, 66488, 42836, 127150, - 41954, 917615, 1652, 772, 6688, 8310, 65428, 3487, 43416, 3585, 10194, - 43320, 119159, 73955, 92315, 6468, 41976, 9720, 74964, 11179, 41970, - 66255, 5836, 12358, 0, 4355, 9048, 12180, 65027, 64680, 13038, 43699, 0, - 41488, 128087, 8527, 194917, 12362, 12435, 12360, 41053, 3266, 0, 12356, - 8616, 41466, 42924, 2227, 11450, 983691, 3638, 12354, 67299, 3216, 83099, - 2358, 83092, 8633, 71201, 983745, 119182, 69244, 83090, 70375, 11759, - 194903, 6368, 74823, 67303, 41423, 8078, 10504, 83104, 41698, 42237, - 983454, 7002, 83101, 41430, 42267, 41051, 41484, 0, 71467, 41050, 41473, + 12412, 19941, 0, 120277, 70352, 1884, 9481, 42418, 70059, 41157, 195058, + 1195, 64898, 7924, 119870, 41151, 2010, 71430, 41328, 42344, 0, 12409, + 120712, 4360, 121023, 9739, 128550, 69933, 73921, 917631, 42521, 8539, + 128606, 0, 118986, 127148, 4788, 121345, 68023, 65734, 983457, 43790, + 119869, 13075, 74429, 94063, 64569, 43532, 10837, 2492, 72762, 118901, + 68637, 41136, 43785, 11813, 9649, 41154, 113731, 5128, 4038, 41143, + 65604, 64859, 41592, 6771, 1648, 5435, 67295, 6734, 41343, 119848, 65439, + 12709, 6986, 66761, 68015, 120533, 41349, 70021, 12581, 10374, 5175, 0, + 73806, 10254, 113681, 10278, 10262, 69858, 41346, 120870, 607, 983621, + 68182, 128846, 12923, 10314, 10282, 65477, 10378, 120297, 40976, 8265, + 129149, 78639, 40975, 5840, 42838, 74987, 40978, 78174, 92945, 128020, + 119809, 120891, 66444, 10538, 120810, 2550, 119836, 6779, 129091, 917815, + 3525, 6824, 118886, 983582, 119838, 5619, 65822, 113751, 113738, 7455, + 71424, 5616, 11486, 9656, 0, 0, 10727, 5615, 120873, 120551, 42380, + 64895, 43693, 66451, 808, 5455, 11347, 72760, 1026, 5620, 194887, 0, + 11350, 5617, 7299, 9225, 64639, 127073, 9145, 41344, 1338, 120581, + 983158, 12739, 4603, 3084, 70408, 92484, 9858, 6037, 100376, 3974, 78213, + 10290, 983704, 3083, 10322, 129048, 129030, 75038, 41036, 66897, 100374, + 43321, 65606, 127071, 41032, 42388, 100619, 64700, 10011, 1445, 40961, 0, + 119105, 917969, 40960, 194907, 67727, 125106, 2223, 64952, 10402, 119213, + 125049, 92304, 10603, 0, 983403, 71438, 128500, 6714, 10083, 127069, + 121019, 78367, 69976, 983655, 43872, 9073, 42585, 64302, 10704, 65030, + 4787, 121279, 74829, 0, 65423, 74988, 128118, 9570, 55260, 9525, 2689, + 917626, 65426, 194872, 66740, 43740, 121163, 40966, 120009, 13286, 3998, + 42598, 42596, 503, 71433, 8735, 2690, 66488, 42836, 127150, 41954, + 917615, 1652, 772, 6688, 8310, 65428, 3487, 43416, 3585, 10194, 43320, + 72756, 66757, 92315, 6468, 41976, 9720, 74964, 11179, 41970, 66255, 5836, + 12358, 129421, 4355, 9048, 12180, 65027, 64680, 13038, 43699, 0, 41488, + 128087, 8527, 194917, 12362, 12435, 12360, 41053, 3266, 0, 12356, 8616, + 41466, 42924, 2227, 11450, 120734, 3638, 12354, 67299, 3216, 83099, 2358, + 83092, 8633, 71201, 983745, 119182, 69244, 83090, 70375, 11759, 194903, + 6368, 72834, 67303, 41423, 8078, 10504, 83104, 41698, 42237, 983454, + 7002, 83101, 41430, 42267, 41051, 41484, 129362, 71467, 41050, 8872, 10466, 13099, 71445, 70371, 120897, 6435, 74331, 11362, 128973, 83088, 65382, 92770, 41420, 83083, 3625, 74915, 41409, 71441, 69639, 2041, 9178, - 9672, 41427, 43541, 43317, 74924, 0, 128557, 41424, 917598, 120546, 0, - 128212, 0, 41417, 1261, 0, 0, 12102, 119662, 41401, 0, 127538, 0, 78251, - 124943, 42290, 3275, 92472, 42329, 68850, 74901, 0, 127951, 92388, 69649, - 10989, 74234, 113781, 10598, 7410, 2669, 903, 0, 2920, 0, 127232, 74603, - 64504, 19928, 0, 128411, 3917, 983119, 11732, 0, 983180, 41448, 41461, - 128823, 0, 113721, 113758, 8819, 12663, 0, 41184, 74014, 232, 74835, - 120646, 9168, 65786, 0, 83293, 121007, 9094, 983926, 11758, 68425, 71886, - 1064, 42467, 128044, 10115, 19924, 92711, 113682, 7862, 64551, 13224, - 8516, 41862, 66650, 7561, 78618, 69793, 1878, 0, 71434, 2911, 83074, - 41178, 5427, 64823, 83062, 83066, 3787, 41174, 83055, 41458, 67147, - 41463, 42413, 11292, 2406, 775, 0, 65584, 69923, 6074, 9618, 68056, - 121480, 43440, 74539, 194901, 41436, 3656, 917805, 120600, 41456, 67694, - 1599, 11333, 83139, 6703, 8513, 83134, 1613, 83136, 68456, 12598, 83131, - 83132, 78745, 74500, 41460, 10145, 10542, 9937, 78746, 67144, 9905, - 83145, 65730, 83147, 120374, 8427, 83142, 55246, 120376, 42895, 11497, - 64687, 74008, 42592, 3871, 983584, 128305, 9111, 5741, 83325, 120987, - 120366, 119111, 11150, 0, 120368, 128855, 11648, 83126, 83127, 83128, - 41587, 70391, 83123, 71108, 42113, 983588, 127155, 12172, 83121, 71443, - 65298, 65723, 68289, 73871, 65724, 7928, 120354, 983095, 41595, 73730, - 64671, 42118, 73830, 66042, 10355, 983110, 7875, 983669, 41598, 3993, - 121269, 1545, 40971, 536, 127075, 43029, 0, 121000, 65173, 65286, 0, - 70331, 195012, 0, 94065, 0, 41375, 5402, 83035, 128192, 1687, 120503, - 917817, 0, 78194, 64326, 40969, 10526, 73747, 8323, 40968, 1339, 11731, - 78756, 127108, 65460, 12242, 128513, 8020, 10843, 11554, 917867, 0, 8266, - 41006, 65722, 83041, 10710, 74045, 118942, 67667, 64567, 119155, 83313, - 128778, 71889, 67857, 120687, 0, 92958, 11755, 66305, 68332, 0, 10917, - 93979, 0, 11272, 2040, 41247, 41326, 195060, 1741, 42370, 1227, 83119, - 83120, 11413, 126583, 83115, 5283, 1586, 4978, 68050, 1984, 11830, 43819, - 92293, 40984, 42904, 9373, 0, 12916, 6284, 194888, 41663, 983093, 0, - 68313, 9237, 9385, 41648, 0, 128953, 2299, 41666, 1830, 73783, 2056, - 41287, 92610, 0, 71917, 42219, 68086, 120327, 41987, 41676, 983059, - 120823, 126553, 41670, 0, 92590, 2796, 55291, 11683, 9902, 74521, 67988, - 11451, 82995, 78855, 42631, 2359, 71890, 67844, 74164, 41238, 548, 11405, - 13133, 64368, 127270, 120925, 66272, 397, 43622, 42139, 9547, 9590, - 128238, 1614, 43661, 64356, 66307, 6651, 1358, 120871, 428, 9620, 1466, - 78112, 10982, 113785, 1333, 7104, 407, 6425, 128834, 74253, 127993, 0, 0, - 5804, 11976, 8554, 92721, 0, 70167, 9057, 42294, 41218, 125097, 121290, - 78137, 1883, 10952, 8048, 70443, 41225, 92621, 42915, 128616, 128512, - 128629, 4407, 74648, 65809, 11837, 194821, 8448, 7141, 74183, 120334, - 12675, 12659, 74634, 42363, 120624, 68077, 55273, 10766, 12012, 2386, - 64732, 9170, 917821, 9123, 64585, 10296, 119158, 7140, 10977, 127378, - 4164, 9081, 0, 120569, 42049, 42042, 8709, 128283, 126477, 120637, 42419, - 64799, 42047, 0, 194820, 8470, 11807, 65897, 577, 0, 983760, 74300, 0, - 68087, 74840, 126474, 0, 128791, 92224, 8736, 1414, 42643, 9683, 43486, - 74344, 0, 2536, 983941, 66330, 121238, 0, 0, 0, 0, 0, 194830, 66317, - 69945, 66315, 2106, 67809, 11273, 120986, 43004, 7541, 82988, 0, 961, - 64307, 66324, 64906, 125080, 3106, 65917, 41284, 1696, 983130, 891, - 12105, 0, 42624, 12802, 3264, 8824, 13268, 43003, 10936, 120878, 0, 0, - 194826, 92688, 3566, 2322, 120371, 70831, 11449, 128187, 42868, 41285, - 3547, 0, 0, 113746, 983400, 43216, 6089, 78682, 68490, 120578, 4170, - 1029, 127761, 127036, 119224, 42374, 0, 744, 92883, 113739, 0, 65823, - 127826, 11182, 3551, 92938, 983891, 4623, 55268, 128738, 4598, 983162, - 65136, 127136, 0, 128169, 10851, 120876, 6179, 92602, 6180, 0, 11952, - 74579, 78648, 11972, 78646, 78647, 78644, 78645, 177, 78643, 6176, - 120580, 983696, 125135, 6177, 9020, 78652, 78653, 6178, 120249, 120242, - 128027, 67673, 2214, 8754, 127051, 120237, 2137, 43081, 194663, 119114, - 9136, 66889, 4401, 41280, 70801, 8974, 2308, 194750, 74149, 128327, 2318, - 983183, 66361, 8198, 65626, 64360, 12601, 42536, 43931, 120827, 43930, - 92462, 6970, 5404, 43332, 3667, 7936, 12925, 126989, 6385, 128482, - 128403, 118949, 10874, 65505, 120002, 129151, 42053, 2075, 42057, 11083, - 42052, 0, 67266, 67651, 121104, 9665, 92300, 983666, 13181, 917617, 0, 0, - 70088, 74148, 0, 70419, 120225, 120229, 120224, 74172, 41145, 66404, - 94096, 74422, 41148, 8683, 7594, 113686, 75033, 119090, 10869, 43458, - 41146, 92407, 11441, 121456, 3512, 119633, 92965, 8103, 78140, 120847, - 65184, 11780, 41563, 42796, 129055, 69742, 41544, 65146, 71314, 0, 78109, - 129177, 19942, 983244, 118908, 7988, 10436, 74273, 3271, 73804, 64711, 0, - 94064, 983071, 128652, 3804, 13070, 11557, 42044, 0, 1095, 0, 3599, - 127774, 0, 128861, 8514, 0, 0, 0, 74346, 66697, 0, 11684, 0, 92486, - 917603, 0, 42043, 43232, 66677, 74927, 42046, 74157, 4036, 126481, 0, - 128213, 194861, 83355, 11954, 70348, 1450, 12986, 1340, 0, 65441, 92722, - 0, 0, 125117, 0, 917542, 73812, 83053, 6539, 92948, 126607, 120702, - 92390, 0, 120492, 41190, 3973, 119365, 4575, 41193, 7982, 429, 917979, - 78891, 0, 194848, 65792, 128408, 83282, 6417, 118918, 78178, 0, 128970, - 0, 0, 4919, 10590, 128556, 7755, 0, 92942, 64548, 120506, 1621, 10214, - 65126, 68253, 127004, 983616, 12188, 983668, 1617, 8050, 0, 5015, 0, - 119174, 42590, 70354, 1756, 78181, 0, 65768, 6352, 41892, 0, 7555, 13103, - 5408, 2817, 1214, 69919, 92335, 121208, 0, 68224, 120872, 41764, 7957, - 8689, 64723, 1056, 42896, 74147, 3559, 983918, 55286, 7073, 65850, 12327, - 70853, 119028, 0, 128122, 128442, 2341, 8450, 8484, 8474, 194884, 68322, - 70079, 8461, 67721, 12153, 12799, 0, 43709, 43708, 9451, 7571, 13073, - 43847, 0, 681, 983254, 703, 127518, 3272, 8781, 12894, 70077, 11709, - 92288, 70514, 983900, 83175, 71436, 11338, 120768, 3276, 128968, 917989, - 65928, 0, 121367, 65021, 64795, 74574, 0, 10047, 78814, 3262, 78811, - 42711, 0, 0, 68478, 163, 576, 9895, 1655, 70131, 74591, 78815, 78816, - 66888, 0, 0, 70513, 10039, 120426, 5626, 5623, 5717, 5776, 43488, 83497, - 66885, 41591, 11036, 65252, 92382, 0, 0, 120111, 67848, 128128, 983595, - 983472, 8887, 127521, 7295, 11031, 983336, 43157, 0, 8946, 10348, 10412, - 8755, 119152, 0, 5718, 13221, 0, 0, 78135, 70515, 917616, 8810, 74499, - 686, 0, 71362, 4619, 118954, 6654, 73769, 74426, 0, 12040, 65689, 10128, - 65118, 68029, 119151, 74205, 92651, 128902, 2401, 68144, 8792, 983648, - 68044, 65455, 0, 74328, 0, 74561, 120763, 12886, 120952, 66624, 126578, - 43557, 10300, 10161, 10396, 71210, 78602, 118945, 9984, 73851, 3010, - 6441, 70349, 1458, 41475, 72429, 93975, 127910, 11479, 121355, 120356, - 6350, 12864, 69674, 71473, 1061, 64780, 2001, 43111, 55230, 124946, 4052, - 113673, 7626, 0, 120907, 1045, 0, 5631, 41113, 127544, 0, 43707, 74127, - 0, 983718, 8486, 0, 73758, 2335, 4362, 983195, 126561, 69221, 1025, - 127277, 42625, 70325, 78084, 41443, 0, 128206, 0, 1774, 1523, 121330, - 68059, 41445, 78236, 11207, 8567, 41442, 3988, 74843, 78237, 118910, 0, - 65274, 8564, 78199, 78238, 127515, 121272, 0, 43446, 0, 66513, 6256, - 917807, 579, 55218, 10206, 78195, 6375, 2673, 983886, 11814, 0, 4488, - 128716, 120554, 68451, 10444, 118846, 127334, 11799, 74407, 68466, 4487, - 127849, 42832, 1032, 120267, 43450, 78257, 7203, 124998, 614, 70361, - 127215, 120615, 119622, 78262, 127271, 127323, 0, 43121, 127211, 128366, - 92513, 1050, 7549, 121260, 82994, 9314, 70365, 92898, 68039, 127061, - 10057, 70434, 127313, 128577, 66504, 120963, 82992, 2307, 128456, 64333, - 127312, 128230, 73873, 983710, 94035, 0, 127973, 128708, 70446, 10360, - 6746, 120473, 92245, 440, 0, 13085, 9233, 74216, 0, 127785, 9957, 128285, - 66447, 8046, 64963, 65777, 10125, 74212, 42819, 10910, 120424, 1521, - 9896, 93965, 10487, 69878, 12527, 68737, 7970, 125073, 128660, 0, 65769, - 5243, 9849, 5239, 65771, 121429, 0, 5237, 69714, 68756, 10103, 5247, - 4769, 129302, 118977, 12873, 2283, 92931, 0, 3008, 4896, 128102, 12087, - 0, 55231, 41103, 92256, 64565, 4773, 120846, 78549, 70074, 4770, 66891, - 917567, 8731, 65378, 66911, 120619, 9122, 128033, 126600, 4774, 3019, - 9997, 12834, 0, 9456, 10215, 120547, 0, 78556, 0, 121332, 74776, 4281, - 4768, 120572, 41535, 4099, 9017, 69993, 983692, 78095, 2225, 78096, - 118946, 121097, 0, 78098, 0, 42814, 880, 0, 113764, 66870, 2134, 0, - 10116, 9877, 92329, 128960, 0, 7095, 8379, 74116, 6778, 0, 78090, 8243, - 2427, 128141, 7093, 0, 11585, 195003, 9962, 82990, 12223, 128485, 92430, - 1434, 120254, 5637, 11573, 0, 0, 0, 19951, 83389, 74419, 0, 194686, - 55283, 0, 70363, 74437, 1156, 8740, 83295, 3782, 64331, 0, 41370, 1014, - 8261, 120956, 917596, 10835, 917966, 65536, 83294, 120463, 125051, 7702, - 118824, 128976, 43010, 65779, 65783, 1150, 10547, 5700, 0, 120603, 65383, - 2339, 42594, 5697, 118788, 75018, 128576, 74923, 42257, 5696, 92677, - 120465, 3862, 9643, 0, 70183, 7634, 65167, 9845, 0, 0, 5701, 9722, 41490, - 128719, 1426, 68217, 983614, 68447, 42204, 55270, 8571, 67403, 78067, - 43859, 78818, 92719, 43182, 12184, 0, 42022, 0, 10281, 0, 5650, 43194, - 64712, 10744, 78887, 990, 5647, 0, 7387, 78734, 41114, 11477, 5646, - 12879, 11018, 128362, 3945, 92589, 983466, 194989, 78883, 0, 78212, - 127746, 1020, 73763, 983835, 78731, 5648, 64748, 120920, 78733, 10205, - 3545, 983585, 6984, 128008, 74051, 128901, 43242, 120458, 2667, 128173, - 125037, 0, 9911, 0, 65020, 10097, 119166, 127145, 983662, 118836, 983748, - 78208, 1140, 78426, 0, 10159, 0, 0, 8128, 128644, 68326, 194911, 1815, - 19910, 890, 124935, 3267, 92291, 0, 10123, 121398, 4410, 1041, 10576, - 6354, 92581, 580, 74232, 983746, 128347, 0, 0, 128098, 19938, 65906, - 127819, 917811, 0, 3298, 5375, 10142, 0, 8215, 92633, 6134, 41246, 64402, - 983147, 69899, 194938, 0, 121426, 41382, 917927, 128653, 5173, 65348, - 527, 121174, 113782, 78469, 128250, 78797, 11915, 0, 0, 10072, 0, 42695, - 2329, 42250, 0, 11187, 69667, 12245, 1568, 94033, 83460, 0, 113705, - 917910, 11201, 92708, 74769, 126470, 67680, 9069, 6144, 0, 119840, 73822, - 0, 128010, 64917, 41521, 118934, 494, 13250, 92250, 65098, 6364, 956, - 113792, 12830, 10462, 73740, 73734, 0, 0, 983739, 66449, 13263, 74281, - 69217, 13171, 127796, 120564, 0, 63885, 127251, 1044, 41276, 128363, 0, - 0, 42068, 11795, 124985, 0, 127202, 0, 42450, 3907, 0, 64526, 11829, - 68197, 12295, 0, 11475, 70329, 3020, 11537, 0, 66441, 120761, 7098, - 125071, 0, 1057, 566, 42696, 127239, 3016, 42274, 43464, 66490, 12921, - 66571, 78472, 71207, 3006, 4620, 127237, 983330, 0, 0, 64659, 0, 127749, - 55253, 6357, 6362, 8626, 71337, 2216, 9090, 65377, 41596, 0, 42920, 1698, - 0, 64477, 917853, 43813, 1053, 0, 78269, 0, 92977, 1052, 1051, 459, 1060, - 74349, 66479, 67689, 66871, 917845, 70327, 42490, 689, 6508, 4163, 42298, - 8639, 66641, 4246, 0, 43514, 12130, 983308, 42337, 64596, 64375, 66481, - 127850, 983144, 127828, 6359, 0, 43471, 983768, 0, 83345, 75065, 0, 6358, - 6361, 1926, 6356, 92627, 7898, 8110, 10935, 0, 10069, 5830, 127773, - 43685, 74307, 0, 42910, 83301, 8693, 78611, 119565, 128621, 120413, - 92192, 121454, 65894, 194694, 0, 64296, 983681, 983644, 194959, 119187, - 2135, 11836, 0, 0, 78869, 42313, 5579, 92412, 70384, 129113, 43854, - 71913, 5578, 11840, 128115, 42023, 6234, 5669, 92275, 78620, 121171, - 68833, 92254, 68202, 5583, 0, 0, 42426, 5580, 42276, 2923, 892, 2220, - 42465, 41330, 194987, 5795, 65512, 68774, 65702, 68770, 120801, 65251, - 68228, 65710, 128399, 128429, 67672, 68783, 5370, 70465, 2931, 1638, - 10966, 10188, 65878, 118848, 0, 69694, 69879, 74585, 8172, 42017, 92756, - 10844, 121016, 128195, 92424, 6374, 119998, 121075, 286, 78023, 1062, 0, - 119999, 0, 7395, 127783, 1070, 64900, 7153, 6095, 41865, 194640, 3015, + 9672, 41427, 43541, 43317, 74924, 917777, 128557, 41424, 119563, 120546, + 983888, 128212, 0, 41417, 1261, 0, 128261, 12102, 119662, 41401, 128932, + 127538, 113767, 78251, 124943, 42290, 3275, 92472, 42329, 68850, 74901, + 121005, 127951, 92388, 69649, 10989, 74234, 113781, 10598, 7410, 2669, + 903, 195091, 2920, 0, 127232, 74603, 64504, 19928, 0, 128411, 3917, + 78185, 11732, 128512, 72797, 41448, 41461, 128823, 0, 113721, 113758, + 8819, 12663, 0, 41184, 74014, 232, 74835, 120646, 9168, 65786, 0, 83293, + 121007, 9094, 917794, 11758, 68425, 71886, 1064, 42467, 128044, 10115, + 19924, 92711, 113682, 7862, 64551, 13224, 8516, 41862, 66650, 7561, + 78618, 69793, 1878, 128641, 71434, 2911, 72758, 41178, 5427, 64823, + 78615, 83066, 3787, 41174, 83055, 41458, 67147, 41463, 42413, 11292, + 2406, 775, 0, 65584, 69923, 6074, 9618, 68056, 121480, 43440, 74539, + 194901, 41436, 3656, 917805, 120600, 41456, 67694, 1599, 11333, 83139, + 6703, 8513, 83134, 1613, 83136, 68456, 12598, 83131, 83132, 78745, 74500, + 41460, 10145, 10542, 9937, 78746, 67144, 9905, 83145, 65730, 83147, + 120374, 8427, 83142, 55246, 120376, 42895, 11497, 64687, 74008, 42592, + 3871, 983584, 128305, 9111, 5741, 83325, 120987, 120366, 119111, 11150, + 194876, 120368, 128855, 11648, 83126, 83127, 83128, 41587, 70391, 83123, + 71108, 42113, 917956, 127155, 12172, 83121, 71443, 65298, 65723, 68289, + 73871, 65724, 7928, 120354, 983095, 41595, 73730, 64671, 42118, 73830, + 66042, 10355, 121501, 7875, 100390, 41598, 3993, 121269, 1545, 40971, + 536, 72874, 43029, 0, 121000, 65173, 65286, 121254, 70331, 195012, 0, + 94065, 0, 41375, 5402, 83035, 128192, 1687, 120503, 128559, 0, 78194, + 64326, 40969, 10526, 73747, 8323, 40968, 1339, 11731, 78756, 127108, + 65460, 12242, 128513, 8020, 10843, 11554, 917867, 0, 8266, 41006, 65722, + 83041, 10710, 74045, 118942, 67667, 64567, 119155, 83313, 70729, 71889, + 67857, 100582, 0, 92418, 11755, 66305, 68332, 0, 10917, 93979, 0, 11272, + 2040, 41247, 41326, 195060, 1741, 42370, 1227, 83119, 83120, 11413, + 126583, 83115, 5283, 1586, 4978, 68050, 1984, 11830, 43819, 92293, 40984, + 42904, 9373, 0, 12916, 6284, 194888, 41663, 127895, 983045, 68313, 9237, + 9385, 41648, 0, 128953, 2299, 41666, 1830, 73783, 2056, 41287, 92610, + 983299, 71917, 42219, 68086, 120327, 41987, 41676, 125219, 72840, 126553, + 41670, 0, 92590, 2796, 55291, 11683, 9902, 74521, 67988, 11451, 82995, + 78855, 42631, 2359, 71890, 67844, 74164, 41238, 548, 11405, 13133, 64368, + 127270, 120925, 66272, 397, 43622, 42139, 9547, 9590, 128238, 1614, + 43661, 64356, 66307, 6651, 1358, 120871, 428, 9620, 1466, 78112, 10982, + 113785, 1333, 7104, 407, 6425, 128834, 74253, 127993, 0, 983151, 5804, + 11976, 8554, 92721, 0, 70167, 9057, 42294, 41218, 125097, 121290, 78137, + 1883, 10952, 8048, 70443, 41225, 92621, 42915, 128616, 128319, 128629, + 4407, 74648, 65809, 11837, 194821, 8448, 7141, 74183, 120334, 12675, + 12659, 74634, 42363, 120624, 68077, 55273, 10766, 12012, 2386, 64732, + 9170, 917821, 9123, 64585, 10296, 119158, 7140, 10977, 127378, 4164, + 9081, 0, 120569, 42049, 42042, 8709, 128283, 126477, 120637, 42419, + 64799, 42047, 129414, 194820, 8470, 11807, 65897, 577, 0, 126616, 74300, + 0, 68087, 74840, 126474, 917539, 128791, 92224, 8736, 1414, 42643, 9683, + 43486, 74344, 0, 2536, 983941, 66330, 121238, 72869, 120562, 119558, 0, + 0, 127831, 66317, 69945, 66315, 2106, 67809, 11273, 120986, 43004, 7541, + 82988, 194738, 961, 64307, 66324, 64906, 125080, 3106, 65917, 41284, + 1696, 983130, 891, 12105, 0, 42624, 12802, 3264, 8824, 13268, 43003, + 10936, 119255, 0, 0, 194826, 92688, 3566, 2322, 120371, 70831, 11449, + 128187, 42868, 41285, 3547, 983717, 0, 113746, 983400, 43216, 6089, + 78682, 68490, 120578, 4170, 1029, 127761, 100384, 119224, 42374, 983571, + 744, 92883, 113739, 194924, 65823, 127826, 11182, 3551, 92938, 983891, + 4623, 55268, 128738, 4598, 983162, 65136, 127136, 0, 128169, 10851, + 120876, 6179, 92602, 6180, 0, 11952, 74579, 78648, 11972, 78646, 78647, + 78644, 78645, 177, 78643, 6176, 120580, 983696, 125135, 6177, 9020, + 78652, 78653, 6178, 120249, 120242, 128027, 67673, 2214, 8754, 122894, + 100689, 2137, 43081, 194663, 119114, 9136, 66889, 4401, 41280, 70801, + 8974, 2308, 194750, 74149, 101050, 2318, 120693, 66361, 8198, 65626, + 64360, 12601, 42536, 43931, 120827, 43930, 92462, 6970, 5404, 43332, + 3667, 7936, 12925, 126989, 6385, 128482, 128403, 72861, 10874, 65505, + 120002, 72785, 42053, 2075, 42057, 11083, 42052, 0, 67266, 67651, 121104, + 9665, 92300, 983666, 13181, 917617, 0, 128937, 70088, 74148, 0, 70419, + 72868, 120229, 120224, 74172, 41145, 66404, 94096, 74422, 41148, 8683, + 7594, 113686, 75033, 119090, 10869, 43458, 41146, 92407, 11441, 121456, + 3512, 119633, 92965, 8103, 78140, 120847, 65184, 11780, 41563, 42796, + 129055, 69742, 41544, 65146, 66803, 0, 78109, 129177, 19942, 126618, + 118908, 7988, 10436, 74273, 3271, 73804, 64711, 120824, 94064, 983071, + 128652, 3804, 13070, 11557, 42044, 120859, 1095, 0, 3599, 127774, 0, + 128861, 8514, 0, 917579, 0, 74346, 66697, 128385, 11684, 983148, 92486, + 917603, 0, 42043, 43232, 66677, 74927, 42046, 72862, 4036, 126481, + 129373, 128213, 194861, 83355, 11954, 70348, 1450, 12986, 1340, 0, 65441, + 92722, 0, 127062, 72865, 100818, 917542, 73812, 72875, 6539, 73836, + 126607, 120702, 92390, 0, 120492, 41190, 3973, 119365, 4575, 41193, 7982, + 429, 122903, 78891, 127874, 194848, 65792, 128408, 83282, 6417, 118918, + 78178, 0, 128970, 66786, 0, 4919, 10590, 128093, 7755, 0, 92942, 64548, + 120506, 1621, 10214, 65126, 68253, 120689, 983616, 12188, 983668, 1617, + 8050, 195031, 5015, 0, 119174, 42590, 70354, 1756, 78181, 983910, 65768, + 6352, 41892, 125186, 7555, 13103, 5408, 2817, 1214, 69919, 92335, 121208, + 0, 42926, 120872, 41764, 7957, 8689, 64723, 1056, 42896, 74147, 3559, + 119162, 55286, 7073, 65850, 12327, 70853, 113720, 0, 128122, 72761, 2341, + 8450, 8484, 8474, 72885, 68322, 70079, 8461, 67721, 12153, 12799, 0, + 43709, 43708, 9451, 7571, 13073, 43847, 0, 681, 983254, 703, 127518, + 3272, 8781, 12894, 70077, 11709, 92288, 70514, 127059, 83175, 71436, + 11338, 72790, 3276, 128968, 120233, 65928, 0, 121367, 65021, 64795, + 74574, 0, 10047, 78814, 3262, 78811, 42711, 0, 983490, 68478, 163, 576, + 9895, 1655, 70131, 74591, 78815, 78816, 66888, 0, 0, 70513, 10039, + 120426, 5626, 5623, 5717, 5776, 43488, 83497, 66885, 41591, 11036, 65252, + 92382, 0, 0, 120111, 67848, 127309, 983595, 983472, 8887, 127521, 7295, + 11031, 125255, 43157, 100451, 8946, 10348, 10412, 8755, 119152, 67343, + 5718, 13221, 983341, 983278, 78135, 70515, 917616, 8810, 74499, 686, + 194776, 71362, 4619, 118954, 6654, 73769, 74426, 127523, 12040, 65689, + 10128, 65118, 68029, 119151, 74205, 92651, 128138, 2401, 68144, 8792, + 983179, 68044, 65455, 129315, 74328, 0, 74561, 120763, 12886, 120952, + 66624, 126578, 43557, 10300, 10161, 10396, 71210, 78602, 78774, 9984, + 73851, 3010, 6441, 70349, 1458, 41475, 72429, 93975, 100814, 11479, + 121355, 120356, 6350, 12864, 69674, 71473, 1061, 64780, 2001, 43111, + 55230, 100454, 4052, 113673, 7626, 983890, 120907, 1045, 195086, 5631, + 41113, 120494, 0, 43707, 74127, 0, 983718, 8486, 0, 73758, 2335, 4362, + 983195, 126561, 69221, 1025, 127277, 42625, 70325, 78084, 41443, 129130, + 128206, 0, 1774, 1523, 121330, 68059, 41445, 78236, 11207, 8567, 41442, + 3988, 74843, 78237, 118910, 983067, 65274, 8564, 78199, 78238, 127515, + 121272, 0, 43446, 983346, 66513, 6256, 917807, 579, 55218, 10206, 78195, + 6375, 2673, 983886, 11814, 0, 4488, 128716, 120554, 68451, 10444, 118846, + 127334, 11799, 74407, 68466, 4487, 127849, 42832, 1032, 120267, 43450, + 78257, 7203, 124998, 614, 70361, 126633, 120615, 119622, 78262, 127271, + 127323, 0, 43121, 127211, 127003, 92513, 1050, 7549, 121260, 82994, 9314, + 70365, 92898, 68039, 127061, 10057, 70434, 127313, 128577, 66504, 120963, + 82992, 2307, 128456, 64333, 127312, 119900, 73873, 983126, 94035, 983083, + 127973, 128708, 70446, 10360, 6746, 120473, 92245, 440, 128826, 13085, + 9233, 74216, 983566, 101089, 9957, 125213, 66447, 8046, 64963, 65777, + 10125, 74212, 42819, 10910, 100466, 1521, 9896, 93965, 10487, 69878, + 12527, 68737, 7970, 125073, 128660, 7303, 65769, 5243, 9849, 5239, 65771, + 121429, 0, 5237, 69714, 68756, 10103, 5247, 4769, 129302, 118977, 12873, + 2283, 92931, 100525, 3008, 4896, 128102, 12087, 983240, 55231, 41103, + 75011, 64565, 4773, 120846, 78549, 70074, 4770, 66891, 917567, 8731, + 65378, 66911, 120619, 9122, 128033, 119071, 4774, 3019, 9997, 12834, 0, + 9456, 10215, 120547, 120413, 78556, 126990, 121332, 74776, 4281, 4768, + 120572, 41535, 4099, 9017, 69993, 983692, 78095, 2225, 78096, 118946, + 120252, 0, 78098, 0, 42814, 880, 128926, 113764, 66870, 2134, 127388, + 10116, 9877, 70679, 128960, 0, 7095, 8379, 74116, 6778, 121155, 78090, + 8243, 2427, 128141, 7093, 983879, 11585, 195003, 9962, 82990, 12223, + 128485, 92430, 1434, 120254, 5637, 11573, 0, 0, 0, 19951, 83389, 74419, + 128530, 194686, 55283, 0, 70363, 74437, 1156, 8740, 83295, 3782, 64331, + 0, 41370, 1014, 8261, 120956, 917596, 10835, 125239, 65536, 83294, + 120463, 125051, 7702, 118824, 7302, 43010, 65779, 65783, 1150, 10547, + 5700, 0, 120603, 65383, 2339, 42594, 5697, 118788, 75018, 120471, 74923, + 42257, 5696, 92677, 120465, 3862, 9643, 917951, 70183, 7634, 65167, 9845, + 0, 0, 5701, 9722, 41490, 128719, 1426, 68217, 128668, 68447, 42204, + 55270, 8571, 67403, 78067, 43859, 78818, 92719, 43182, 12184, 0, 42022, + 0, 10281, 917798, 5650, 43194, 64712, 10744, 78887, 990, 5647, 0, 7387, + 78734, 41114, 11477, 5646, 12879, 11018, 128362, 3945, 92589, 983466, + 70664, 78883, 128128, 78212, 127746, 1020, 73763, 983835, 78731, 5648, + 64748, 120920, 42236, 10205, 3545, 129121, 6984, 127771, 74051, 128901, + 43242, 120458, 2667, 128173, 125037, 194746, 9911, 120590, 65020, 10097, + 119166, 78696, 983662, 118836, 983748, 78208, 1140, 78426, 128205, 10159, + 0, 0, 8128, 72857, 68326, 194911, 1815, 19910, 890, 124935, 3267, 92291, + 917629, 10123, 72882, 4410, 1041, 10576, 6354, 92581, 580, 74232, 983746, + 128347, 72884, 0, 128098, 19938, 65906, 127819, 72883, 128858, 3298, + 5375, 10142, 100421, 8215, 92633, 6134, 41246, 64402, 983147, 69899, + 194938, 983602, 121426, 41382, 917926, 128653, 5173, 65348, 527, 121174, + 113782, 78469, 128250, 78797, 11915, 121386, 0, 10072, 0, 42695, 2329, + 42250, 0, 11187, 69667, 12245, 1568, 66806, 83460, 983189, 113705, + 128532, 11201, 92708, 74769, 126470, 67680, 9069, 6144, 121246, 119840, + 70700, 121438, 66783, 64917, 41521, 118934, 494, 13250, 92250, 65098, + 6364, 956, 66794, 12830, 10462, 73740, 73734, 129109, 0, 983739, 66449, + 13263, 74281, 69217, 13171, 127796, 70714, 100942, 63885, 127251, 1044, + 41276, 128363, 0, 0, 42068, 11795, 124985, 0, 127202, 0, 42450, 3907, + 124995, 64526, 11829, 68197, 12295, 0, 11475, 70329, 3020, 11537, 0, + 66441, 120761, 7098, 125071, 0, 1057, 566, 42696, 127239, 3016, 42274, + 43464, 66490, 12921, 66571, 78472, 71207, 3006, 4620, 127237, 983330, + 120107, 129350, 64659, 917917, 127749, 55253, 6357, 6362, 8626, 71337, + 2216, 9090, 65377, 41596, 0, 42920, 1698, 0, 64477, 917853, 43813, 1053, + 100432, 78269, 100434, 92977, 1052, 1051, 459, 1060, 74349, 66479, 67689, + 66871, 917845, 70327, 42490, 689, 6508, 4163, 42298, 8639, 66641, 4246, + 100449, 43514, 12130, 100450, 42337, 64596, 64375, 66481, 127850, 983144, + 127828, 6359, 0, 43471, 983768, 0, 83345, 75065, 917953, 6358, 6361, + 1926, 6356, 72855, 7898, 8110, 10935, 0, 10069, 5830, 100425, 43685, + 74307, 100426, 42910, 83301, 8693, 78611, 119565, 128621, 119587, 92192, + 121454, 65894, 194694, 0, 64296, 983681, 983394, 194959, 119187, 2135, + 11836, 0, 129361, 78869, 42313, 5579, 92412, 70384, 129113, 43854, 71913, + 5578, 11840, 128115, 42023, 6234, 5669, 92275, 78620, 101038, 68833, + 92254, 68202, 5583, 0, 0, 42426, 5580, 42276, 2923, 892, 2220, 42465, + 41330, 194945, 5795, 65512, 68774, 65702, 68770, 120801, 65251, 68228, + 65710, 128399, 94176, 67672, 68783, 5370, 70465, 2931, 1638, 10966, + 10188, 65878, 118848, 0, 69694, 69879, 74585, 8172, 42017, 92756, 10844, + 121016, 128195, 92424, 6374, 92636, 100438, 286, 78023, 1062, 0, 119999, + 100437, 7395, 127783, 1070, 64900, 7153, 6095, 41865, 128928, 3015, 68743, 68740, 5211, 68805, 6400, 68749, 68748, 68760, 8189, 11276, 68754, 70284, 372, 128829, 68761, 113783, 42102, 41585, 127751, 0, 42101, 276, 78402, 67427, 33, 67425, 67424, 9007, 67430, 41588, 66033, 427, 10763, - 118819, 70872, 127884, 983943, 1031, 6257, 92489, 42104, 0, 983980, 2328, - 66837, 1071, 42899, 125088, 74848, 120857, 113793, 194981, 1047, 0, - 194943, 42908, 128480, 69723, 10651, 70356, 0, 125113, 72433, 66829, - 70817, 5711, 41633, 12098, 65571, 9166, 0, 5710, 128551, 6790, 65168, - 13216, 983150, 69716, 69726, 0, 64611, 41623, 195001, 5715, 69654, 71915, - 0, 5712, 2761, 41620, 68124, 3074, 5722, 0, 8643, 68525, 0, 118906, 2757, - 11067, 9718, 66419, 8910, 10689, 6479, 0, 0, 71173, 78607, 9196, 69670, - 125070, 0, 128338, 120335, 118911, 0, 94043, 129194, 0, 0, 120010, 73795, - 8701, 68130, 119616, 120522, 0, 42477, 194994, 12123, 4495, 43569, 0, - 129296, 0, 64946, 10992, 0, 74566, 70336, 113688, 9318, 93986, 13249, - 42902, 73808, 0, 65457, 42249, 7639, 43995, 67845, 42641, 5454, 0, 0, - 70366, 120005, 119585, 121212, 5084, 121189, 121134, 75062, 0, 733, - 74646, 78014, 68767, 78435, 11204, 0, 9218, 1731, 0, 92937, 71070, 67990, - 983125, 0, 0, 70323, 121371, 92492, 5155, 120000, 5358, 983744, 0, - 917767, 64424, 71236, 3840, 64314, 41432, 121316, 78315, 68430, 67980, - 43253, 65943, 0, 3371, 10988, 127960, 8771, 1479, 0, 0, 1109, 11580, - 43657, 64601, 12205, 92782, 0, 64507, 8868, 399, 67978, 74842, 983286, - 121336, 12149, 13088, 551, 0, 10156, 12119, 92572, 118916, 2544, 65074, - 119211, 983298, 0, 78011, 351, 68764, 0, 128713, 55229, 0, 74268, 78008, - 128094, 0, 42377, 0, 0, 0, 113767, 74320, 9013, 4054, 0, 194580, 113740, - 0, 73960, 5585, 65881, 2549, 74469, 74457, 11104, 5584, 8358, 126473, - 64215, 66864, 10919, 70480, 7980, 126601, 113698, 2218, 41800, 5589, - 82983, 2664, 41613, 5586, 118890, 0, 11356, 121120, 194833, 43452, 67245, + 118819, 70872, 127884, 100990, 1031, 6257, 92489, 42104, 100396, 100395, + 2328, 66837, 1071, 42899, 74418, 74848, 120857, 113793, 100401, 1047, + 100403, 100402, 42908, 100404, 69723, 10651, 70356, 100408, 125113, + 72433, 66829, 70817, 5711, 41633, 12098, 65571, 9166, 0, 5710, 128551, + 6790, 65168, 13216, 100935, 69716, 69726, 0, 64611, 41623, 195001, 5715, + 69654, 71915, 983720, 5712, 2761, 41620, 68124, 3074, 5722, 100389, 8643, + 68525, 0, 118906, 2757, 11067, 9718, 66419, 8910, 10689, 6479, 125196, + 129178, 71173, 78607, 9196, 69670, 125070, 0, 125184, 120335, 118911, + 41645, 94043, 129194, 127087, 128480, 113770, 73795, 8701, 68130, 119616, + 120522, 43754, 42477, 100459, 12123, 4495, 43569, 0, 129296, 74557, + 64946, 10992, 0, 74566, 70336, 113688, 9318, 93986, 13249, 42902, 73808, + 983335, 65457, 42249, 7639, 43995, 67845, 42641, 5454, 0, 0, 70366, + 120005, 100369, 100368, 5084, 100370, 121134, 75062, 983462, 733, 74646, + 78014, 68767, 78435, 11204, 0, 9218, 1731, 100380, 92937, 71070, 67990, + 983125, 983370, 0, 70323, 121371, 92492, 5155, 120000, 5358, 128515, + 129316, 194981, 64424, 71236, 3840, 64314, 41432, 121316, 78315, 68430, + 67980, 43253, 65943, 100373, 3371, 10988, 100378, 8771, 1479, 100357, + 100360, 1109, 11580, 43657, 64601, 12205, 92782, 0, 64507, 8868, 399, + 67978, 74842, 983286, 121336, 12149, 13088, 551, 194972, 10156, 12119, + 92572, 118916, 2544, 65074, 119211, 100354, 100353, 78011, 351, 68764, + 917981, 128713, 55229, 0, 74268, 66790, 127327, 100361, 42377, 100363, + 100362, 100365, 100364, 74320, 9013, 4054, 0, 194580, 113740, 3447, + 73960, 5585, 65881, 2549, 74469, 74457, 11104, 5584, 8358, 126473, 64215, + 66864, 10919, 70480, 7980, 100723, 113698, 2218, 41800, 5589, 82983, + 2664, 41613, 5586, 118890, 74522, 11356, 121120, 128175, 43452, 67245, 92993, 42573, 66879, 83329, 67810, 69767, 78752, 74392, 8135, 6450, - 10055, 77996, 119948, 983173, 119225, 5657, 0, 9626, 121453, 77994, - 10179, 5654, 12939, 92573, 120799, 71860, 0, 5652, 10945, 194599, 66486, - 0, 3661, 7863, 0, 68069, 983675, 70332, 127194, 5659, 194606, 78692, - 66729, 5655, 983626, 42168, 121131, 1055, 71171, 71888, 66310, 74030, - 70516, 12146, 70362, 73956, 11618, 0, 42720, 92949, 10272, 10304, 10368, - 42518, 594, 10244, 10248, 7407, 74978, 64870, 74191, 3467, 71073, 7881, - 3331, 946, 10231, 1495, 8131, 74330, 0, 9562, 69222, 65927, 0, 70036, - 69696, 69769, 64656, 917995, 0, 92409, 70056, 5666, 65227, 5318, 63994, - 119596, 9091, 10798, 78664, 78508, 10186, 983265, 7732, 983724, 64556, 0, - 983979, 5668, 74445, 74982, 74645, 5670, 113795, 127297, 11820, 2992, - 7826, 5667, 19952, 120807, 74981, 12749, 74551, 67757, 0, 66496, 4361, - 119260, 1306, 9286, 1497, 128286, 94004, 70359, 0, 3571, 13247, 5874, - 7973, 66353, 68435, 78278, 67896, 43192, 74621, 78265, 553, 113768, - 127012, 93053, 5829, 0, 4587, 78285, 65912, 194919, 12746, 128671, 70338, - 119924, 5633, 119927, 74259, 94102, 94099, 64905, 94105, 9512, 94103, - 12742, 6443, 983806, 0, 9135, 128863, 41564, 121517, 55219, 128832, - 983851, 194877, 12148, 0, 78297, 0, 64256, 0, 11669, 0, 5634, 4524, - 128903, 124936, 128390, 83215, 2425, 65182, 128769, 43636, 5221, 78410, - 328, 121031, 68736, 69815, 5636, 119917, 5329, 121293, 5638, 83166, 7940, - 64938, 43223, 43760, 5635, 3373, 2986, 78292, 74223, 3437, 68763, 6203, - 4247, 71169, 11920, 8274, 68240, 983658, 1657, 41561, 68778, 78295, 5639, - 2954, 5660, 5640, 78303, 983685, 71179, 42227, 68301, 83322, 41637, - 67872, 121105, 78310, 41625, 43362, 78309, 120713, 11705, 5642, 0, 5486, - 0, 4356, 11710, 0, 12051, 69938, 0, 5641, 8259, 126994, 1058, 0, 67630, - 0, 128927, 1144, 78750, 127293, 42228, 983714, 73890, 118972, 127352, - 2800, 83209, 5645, 64964, 8652, 2547, 66484, 43634, 121356, 5608, 65890, - 43808, 194972, 67621, 64932, 9000, 71204, 67235, 92673, 1865, 128706, - 5613, 66401, 121145, 0, 5610, 983226, 71199, 65826, 2069, 0, 10787, - 43999, 2997, 119932, 5609, 78316, 65319, 78313, 12316, 5875, 2412, 83206, - 8186, 9807, 74269, 66294, 13130, 65874, 71855, 5807, 113678, 10030, 5306, - 12364, 118863, 92970, 11704, 83202, 92583, 10211, 0, 120579, 0, 121063, - 11706, 9710, 125022, 82985, 120655, 413, 65623, 7118, 83167, 9133, 74262, - 917964, 1042, 125068, 64779, 12171, 119240, 6185, 64776, 4984, 121266, + 10055, 77996, 101033, 983173, 119225, 5657, 100443, 9626, 121453, 77994, + 10179, 5654, 12939, 92573, 120799, 71860, 917939, 5652, 10945, 194599, + 66486, 983360, 3661, 7863, 0, 68069, 101084, 70332, 127194, 5659, 194606, + 78692, 66729, 5655, 121012, 42168, 121131, 1055, 71171, 71888, 66310, + 74030, 70516, 12146, 70362, 73956, 11618, 72709, 42720, 92949, 10272, + 10304, 10368, 42518, 594, 10244, 10248, 7407, 74978, 64870, 74191, 3467, + 71073, 7881, 3331, 946, 10231, 1495, 8131, 74330, 0, 9562, 69222, 65927, + 194978, 70036, 69696, 69769, 64656, 917995, 0, 92409, 70056, 5666, 65227, + 5318, 63994, 119596, 9091, 10798, 78664, 78508, 10186, 983265, 7732, + 983724, 64556, 0, 983979, 5668, 74445, 74982, 74645, 5670, 100830, + 127297, 11820, 2992, 7826, 5667, 19952, 120807, 74981, 12749, 74551, + 67757, 2263, 66496, 4361, 119260, 1306, 9286, 1497, 128286, 94004, 70359, + 0, 3571, 13247, 5874, 7973, 66353, 68435, 78278, 67896, 43192, 74621, + 78265, 553, 113768, 127012, 93053, 5829, 983247, 4587, 78285, 65912, + 194919, 12746, 72806, 70338, 119924, 5633, 119927, 74259, 94102, 94099, + 64905, 94105, 9512, 94103, 12742, 6443, 983806, 0, 9135, 128863, 41564, + 121517, 55219, 128832, 983851, 128026, 12148, 0, 78297, 0, 64256, 119914, + 11669, 0, 5634, 4524, 128903, 124936, 128390, 83215, 2425, 65182, 128769, + 43636, 5221, 78410, 328, 121031, 68736, 69815, 5636, 119917, 5329, + 121293, 5638, 83166, 7940, 64938, 43223, 43760, 5635, 3373, 2986, 78292, + 74223, 3437, 68763, 6203, 4247, 71169, 11920, 8274, 68240, 194741, 1657, + 41561, 68778, 78295, 5639, 2954, 5660, 5640, 78303, 121420, 71179, 42227, + 68301, 83168, 41637, 67872, 121105, 78310, 41625, 43362, 78309, 100731, + 11705, 5642, 100732, 5486, 100734, 4356, 11710, 100739, 12051, 69938, + 100740, 5641, 8259, 126994, 1058, 0, 67630, 101016, 128927, 1144, 78750, + 127293, 42228, 983714, 73890, 118972, 100550, 2800, 83209, 5645, 64964, + 8652, 2547, 66484, 43634, 121356, 5608, 65890, 43808, 128335, 67621, + 64932, 9000, 71204, 67235, 92673, 1865, 128706, 5613, 66401, 100721, + 100724, 5610, 100726, 71199, 65826, 2069, 100730, 10787, 43999, 2997, + 119932, 5609, 78316, 65319, 78313, 12316, 5875, 2412, 83206, 8186, 9807, + 74269, 66294, 13130, 65874, 71855, 5807, 113678, 10030, 5306, 12364, + 118863, 92970, 11704, 83202, 92583, 10211, 0, 120579, 0, 121063, 11706, + 9710, 125022, 82985, 120655, 413, 65623, 7118, 83167, 9133, 74262, + 917964, 1042, 125068, 64779, 12171, 119240, 6185, 64776, 4984, 83198, 708, 11391, 0, 12241, 92720, 83399, 1308, 121258, 2534, 810, 125089, - 120933, 128016, 71849, 71869, 1917, 3000, 125140, 120184, 120739, 2364, + 120933, 128016, 71849, 71869, 1917, 3000, 125140, 70694, 120739, 2364, 66387, 74470, 66618, 65680, 66411, 10027, 71841, 128154, 12337, 74283, 127368, 983167, 2980, 755, 69774, 931, 13124, 68068, 6363, 2748, 121022, - 0, 65041, 92276, 44011, 8730, 194997, 127854, 78312, 7274, 119250, 92988, - 7275, 78304, 935, 127052, 65840, 377, 42325, 11649, 127363, 65253, 64301, + 0, 65041, 92276, 44011, 8730, 194997, 100711, 78312, 7274, 100712, 92988, + 7275, 78304, 935, 100719, 65840, 377, 42325, 11649, 100489, 65253, 64301, 128835, 78308, 42341, 65284, 2417, 0, 12884, 19912, 7907, 10768, 78300, - 194998, 194912, 10673, 68779, 7248, 68786, 43515, 1781, 5496, 3627, 62, - 1649, 67876, 964, 121034, 66403, 78226, 66393, 92897, 70355, 66409, 0, - 83398, 43689, 127911, 13142, 78812, 42415, 66575, 4542, 69909, 43547, - 83028, 0, 7677, 2991, 4946, 42454, 11565, 7949, 0, 69759, 11341, 42494, - 3073, 65625, 9714, 11692, 4657, 0, 70810, 6478, 9898, 43673, 65237, 6241, - 7106, 4877, 129108, 6238, 0, 10548, 127049, 4409, 0, 0, 64798, 70805, - 5346, 128240, 94047, 6237, 4874, 66851, 9176, 92882, 121153, 65231, - 65884, 12678, 78748, 118912, 11378, 44018, 42785, 2408, 3251, 11203, - 983159, 5685, 0, 2461, 11052, 7091, 5342, 8317, 121446, 68163, 5340, - 120559, 127820, 43635, 73928, 125001, 71069, 83318, 0, 83317, 65482, - 121394, 9142, 0, 68506, 0, 10938, 0, 118790, 1182, 2542, 4826, 0, 126648, - 72438, 529, 8580, 127490, 0, 10586, 10790, 10839, 66023, 41593, 41207, - 68744, 983825, 41594, 225, 42828, 0, 67821, 121200, 11376, 74379, 10721, - 67664, 3438, 42097, 68862, 11084, 3194, 41870, 266, 78305, 120183, 41873, - 120575, 11324, 120531, 0, 8420, 64918, 128839, 41871, 41338, 3734, 7734, - 43683, 8750, 66605, 66011, 92514, 40965, 127937, 983216, 5161, 10572, - 917558, 42906, 0, 64349, 7287, 42162, 120406, 983643, 126605, 11167, - 69220, 12359, 43429, 41369, 1697, 12191, 0, 68633, 7286, 0, 68635, 10031, - 113766, 9870, 67726, 8620, 65824, 917855, 11938, 121308, 7285, 983557, - 119577, 42678, 66842, 43677, 41583, 0, 65799, 92623, 0, 129168, 128267, - 78169, 66199, 0, 3609, 68624, 70280, 832, 120693, 120770, 78473, 66007, - 78471, 65703, 71256, 128517, 42732, 5180, 92699, 41395, 41530, 11691, - 64773, 92214, 74002, 127790, 120548, 128645, 6348, 243, 13200, 120160, - 6024, 92309, 9979, 10037, 41529, 10648, 8538, 43687, 0, 917844, 4285, - 66195, 121370, 4230, 92886, 7367, 43256, 92353, 7563, 42376, 983271, - 68442, 120512, 0, 0, 214, 128578, 0, 74856, 65893, 12208, 9973, 128386, - 66311, 65589, 128277, 2603, 0, 70155, 78622, 70047, 127273, 6022, 195023, - 2884, 0, 11620, 0, 43, 195020, 12682, 1016, 41107, 0, 41121, 3885, 92, - 65456, 64608, 0, 74801, 70855, 2074, 113742, 78283, 0, 12453, 70847, - 983826, 74241, 126568, 6791, 12457, 78268, 0, 66278, 0, 78279, 0, 0, - 92358, 66637, 7995, 8759, 43421, 78277, 12449, 128552, 71224, 43868, - 8752, 3197, 4720, 10165, 113765, 119249, 113715, 11595, 64893, 118905, - 43435, 124964, 125030, 4993, 0, 6168, 10934, 1946, 741, 120650, 5494, - 4639, 127559, 1990, 11107, 4498, 74169, 67736, 83273, 127272, 69734, - 2960, 73779, 0, 8969, 128117, 43424, 73959, 126464, 2950, 119579, 6210, - 65753, 370, 121360, 0, 0, 4953, 195009, 121054, 113708, 0, 69230, 0, - 195010, 65688, 74951, 5063, 3517, 2964, 43663, 917762, 6344, 74791, - 10566, 10144, 66333, 8252, 729, 66016, 78253, 0, 71317, 64923, 120571, - 43669, 9032, 78263, 78264, 0, 41215, 0, 65883, 0, 917774, 74914, 3761, 0, - 0, 70068, 120408, 12912, 119012, 3850, 128191, 983256, 128389, 0, 0, 908, - 0, 8611, 121384, 0, 74642, 43691, 41197, 0, 8978, 120540, 119135, 41586, - 10527, 70426, 917848, 3848, 78739, 74917, 127536, 65241, 5336, 74883, - 128786, 663, 0, 10780, 0, 0, 78767, 983259, 127163, 68193, 347, 0, - 917544, 78775, 64675, 41582, 78774, 78744, 65579, 12980, 68046, 12143, - 69657, 78512, 128493, 11153, 41804, 78523, 0, 78525, 0, 128859, 41584, - 10681, 0, 120979, 73938, 73781, 128022, 4800, 66661, 0, 66306, 64715, - 66384, 9518, 6609, 10434, 70845, 11319, 1097, 128964, 917564, 41730, - 129181, 121501, 73847, 74845, 65172, 41728, 41721, 194780, 194769, - 121499, 41203, 127056, 13110, 41726, 194856, 67077, 1000, 69651, 127509, - 41140, 1209, 73978, 125059, 73750, 1073, 6321, 77878, 41138, 983968, - 68213, 78000, 12167, 1115, 41605, 9794, 119904, 67671, 55248, 12237, - 78787, 66314, 6587, 9290, 78782, 78783, 9231, 78781, 2959, 7926, 0, - 917601, 128833, 64398, 71124, 119970, 12311, 119181, 78796, 68768, 78794, - 78795, 68434, 78793, 66670, 113797, 128579, 12290, 120169, 129093, - 119873, 42142, 9968, 8205, 0, 5131, 113694, 9627, 43646, 78542, 78535, - 983212, 1944, 1248, 10148, 127755, 119990, 119991, 12701, 78376, 11308, - 119995, 983493, 113702, 66836, 65305, 65100, 4031, 42794, 120003, 7075, - 8154, 119985, 120007, 41817, 73934, 42275, 120011, 120012, 78526, 120014, - 120015, 6041, 120520, 41899, 983288, 8002, 128367, 4364, 73732, 983570, - 64332, 120976, 7813, 9064, 119986, 10124, 7526, 8601, 7281, 68246, 7279, - 12041, 1418, 10885, 12673, 121152, 121381, 9660, 917929, 13012, 4571, - 917588, 0, 118940, 12078, 2970, 129122, 10933, 0, 77870, 121243, 77841, - 0, 41599, 70159, 121342, 120885, 12950, 92160, 3486, 983973, 78311, 4239, - 128073, 127799, 66511, 68066, 2637, 64629, 8460, 66834, 8476, 983975, 0, - 68312, 78489, 65673, 1019, 78495, 4148, 0, 12289, 0, 4316, 0, 13119, - 8488, 5412, 66243, 9935, 92777, 73864, 983203, 41734, 8206, 74081, 9163, - 3286, 9072, 5867, 13302, 7622, 7120, 41736, 92546, 41731, 0, 7400, 5416, - 68663, 118924, 10817, 0, 41539, 127284, 66853, 73963, 41855, 41867, - 65564, 11277, 65892, 11536, 10620, 92272, 7115, 66030, 73932, 5498, - 63876, 41536, 0, 68204, 92587, 3459, 8997, 194719, 92714, 0, 127782, - 92512, 0, 66377, 69781, 0, 124972, 78511, 3161, 295, 71257, 0, 92223, - 121328, 78742, 9016, 43454, 63903, 63902, 43501, 68210, 3971, 983959, - 70063, 2952, 78765, 11038, 10901, 63900, 63899, 63898, 68095, 667, 12332, - 63887, 6086, 41722, 0, 5172, 0, 983280, 4159, 983562, 0, 9815, 63884, - 19934, 63882, 41198, 8555, 63878, 63877, 42460, 6050, 42708, 63881, - 63872, 120941, 42421, 195035, 41723, 63875, 63874, 11460, 7432, 1913, - 41913, 63852, 66869, 128971, 42348, 73892, 6752, 446, 41911, 127901, - 63851, 63850, 41910, 128637, 63846, 2972, 12932, 7262, 69968, 63849, - 63848, 63847, 113749, 6570, 8302, 7259, 63842, 4178, 10746, 7250, 13214, - 10041, 8105, 63892, 127780, 69969, 1105, 4180, 127786, 12094, 9497, 0, - 63891, 63890, 63889, 63888, 5538, 9987, 0, 92739, 1678, 13274, 552, - 118834, 44010, 10785, 0, 11192, 4557, 74459, 9159, 10171, 13125, 63860, - 5540, 63858, 63865, 281, 13242, 63862, 74154, 0, 5536, 65568, 9574, 1388, - 71902, 0, 1077, 195000, 65099, 11531, 5834, 0, 0, 917789, 0, 42773, - 121331, 0, 0, 119220, 120912, 3663, 127027, 1112, 70335, 8686, 126611, - 5334, 65081, 43249, 74778, 127968, 11077, 125017, 6509, 0, 5327, 78776, - 19907, 63869, 3478, 7583, 7679, 2903, 0, 3001, 1158, 8745, 43746, 73748, - 63866, 78626, 1915, 4846, 67755, 66371, 118984, 42105, 2990, 120128, 805, - 69238, 64438, 12070, 8760, 1117, 113750, 12212, 120123, 65174, 42357, - 63835, 63834, 983947, 78240, 12225, 63838, 63837, 983853, 70173, 63833, - 6042, 66360, 8083, 128166, 983733, 63821, 63820, 63819, 63818, 983904, - 5227, 9047, 63822, 74797, 6091, 0, 10691, 560, 5643, 8226, 119578, 63812, - 63811, 63810, 63809, 2289, 63815, 63814, 63813, 6047, 1597, 120143, 780, - 206, 70126, 4936, 65147, 8168, 63930, 2076, 1093, 9882, 63934, 2082, - 63932, 75050, 63929, 3546, 1605, 77934, 9806, 43472, 77933, 8400, 11343, - 2086, 0, 63926, 2984, 5968, 9287, 0, 4618, 42209, 11137, 13169, 5290, - 2089, 1695, 10743, 1088, 63825, 7268, 1084, 1085, 63829, 1083, 10131, - 7283, 0, 63970, 121165, 1092, 4754, 7273, 5252, 44016, 43627, 127921, - 128920, 7408, 11809, 83220, 121181, 0, 2965, 7258, 8808, 66572, 1089, - 4187, 63937, 42119, 42120, 11106, 940, 5787, 10099, 63938, 0, 74494, - 12463, 2994, 125136, 118827, 68522, 9664, 70834, 77940, 67892, 77938, - 74343, 67370, 0, 660, 10127, 666, 9022, 5532, 43667, 5533, 12580, 78507, - 6118, 222, 979, 3884, 983394, 74151, 83227, 6502, 983855, 11085, 121261, - 63951, 12465, 917862, 0, 128782, 63946, 1707, 63924, 12461, 63950, 63897, - 63948, 63947, 63945, 6038, 63943, 63942, 64685, 63895, 65838, 2276, 7776, - 94076, 121086, 92464, 120444, 69730, 801, 43165, 1690, 63919, 63918, - 63917, 13277, 43659, 12951, 120638, 9906, 2054, 2334, 78515, 63916, 5483, - 63914, 69737, 63911, 5484, 63909, 63908, 2539, 120102, 43980, 5485, 0, - 42697, 9061, 5534, 10672, 4502, 68057, 253, 0, 68208, 120439, 9203, - 74231, 0, 11530, 68634, 68668, 121242, 11127, 0, 10474, 43426, 13257, - 42354, 128099, 983698, 70044, 195065, 0, 8413, 66841, 0, 5693, 7272, 0, - 13209, 64470, 65831, 74350, 195063, 0, 0, 0, 126639, 120097, 0, 94078, - 66840, 127165, 66608, 3111, 41863, 8804, 42913, 78347, 7270, 0, 66606, - 6628, 1076, 7433, 1436, 73844, 55226, 128353, 63982, 7393, 12807, 43413, - 63906, 1598, 63904, 71187, 70393, 41729, 4423, 1307, 113692, 10515, - 41589, 128698, 128918, 6218, 92917, 1430, 0, 126513, 120606, 78754, 5413, - 7619, 3255, 3493, 74032, 11549, 10735, 41743, 73937, 6801, 983633, 4518, - 10990, 65073, 5167, 4481, 3771, 67093, 2710, 983593, 66277, 41724, 67716, - 43073, 41690, 12479, 983635, 8380, 121071, 71852, 70046, 1628, 121229, - 128817, 129067, 65262, 6333, 10783, 11172, 121473, 63855, 70840, 113679, - 0, 5339, 74323, 120946, 13004, 66843, 4457, 0, 127756, 194818, 127116, - 5684, 8678, 10914, 43632, 5689, 65807, 70814, 68464, 12633, 12870, 69705, - 65183, 5688, 11926, 6033, 6310, 5686, 119076, 74251, 0, 120647, 128930, - 50, 10558, 9871, 42612, 43655, 74403, 983818, 74284, 66468, 66905, 13259, - 4448, 119150, 121406, 83349, 70043, 1321, 0, 10640, 11539, 1151, 121186, - 917607, 124958, 127079, 71106, 127852, 0, 0, 983075, 12501, 64604, - 128657, 11527, 118870, 8812, 983706, 11538, 8673, 12650, 11020, 0, 66467, - 2105, 8087, 78163, 69632, 9894, 127137, 127856, 69995, 4636, 55262, - 78513, 4515, 2382, 0, 127055, 983695, 113780, 0, 118968, 12277, 121239, - 11995, 92553, 121006, 12158, 70170, 8741, 10197, 68780, 92426, 121285, - 6531, 83051, 127846, 473, 43415, 92936, 983650, 1873, 1087, 124966, 0, - 74280, 78527, 66439, 43218, 983123, 194716, 7237, 12504, 71113, 126559, - 128748, 120887, 9489, 0, 70843, 4384, 74220, 63845, 2058, 69741, 13295, - 43191, 128030, 128571, 1154, 3857, 1205, 0, 0, 6055, 12958, 120706, - 74168, 128388, 70846, 4421, 10592, 0, 495, 66400, 41712, 7983, 70833, - 93997, 983332, 6347, 78715, 7654, 41710, 4196, 0, 437, 41709, 73772, - 70832, 0, 9465, 13290, 119180, 4997, 64306, 121309, 0, 4999, 194642, - 67401, 126582, 4711, 120769, 120602, 2739, 0, 8044, 74313, 194643, 41789, - 128142, 10809, 66279, 0, 0, 1779, 6600, 6601, 41543, 5325, 642, 64187, - 13058, 120449, 12875, 983804, 92186, 13229, 71845, 10575, 43399, 194577, - 0, 41791, 1104, 0, 983725, 10655, 983334, 983561, 120164, 0, 1082, - 121024, 8428, 6569, 0, 0, 78534, 69849, 6783, 194671, 12993, 8049, 41548, - 44021, 6458, 64728, 128882, 4761, 63828, 4766, 64623, 1273, 43407, - 120677, 118876, 195045, 6912, 1313, 6322, 10483, 128627, 41545, 126465, - 92449, 0, 11216, 121307, 0, 78624, 3484, 74337, 0, 0, 8503, 5122, 41527, - 71910, 66320, 70161, 74907, 0, 0, 41537, 66453, 8303, 8282, 11817, 73857, - 10003, 73859, 65904, 7363, 1686, 0, 70115, 11467, 3664, 65921, 64299, - 124939, 128462, 128001, 4324, 126, 42246, 75030, 69984, 67725, 65926, - 7744, 68859, 74277, 66283, 78052, 43817, 6966, 43822, 8136, 0, 65600, - 1633, 0, 126614, 4762, 1103, 70827, 70157, 4765, 983494, 13078, 0, 4760, - 63827, 2050, 10871, 43199, 1102, 194652, 42236, 128867, 127072, 11546, - 74794, 337, 121196, 42591, 8627, 12279, 1111, 0, 75047, 4707, 68206, - 10143, 7883, 121444, 7880, 4522, 8645, 5704, 13010, 69796, 8304, 92982, - 194688, 119575, 2293, 70195, 66654, 129077, 92676, 0, 13008, 121194, - 4385, 128736, 13011, 125004, 92569, 119161, 13009, 160, 2677, 70388, - 983282, 41793, 65763, 74221, 70790, 41792, 42770, 94054, 65762, 118829, - 43821, 5709, 128296, 71076, 43816, 983087, 983896, 1079, 3867, 5708, 0, - 0, 43797, 5706, 64768, 5705, 8791, 4005, 121091, 10237, 10991, 128816, - 43459, 9173, 917581, 917580, 13170, 12540, 129178, 42605, 120765, 126617, - 68647, 917572, 10058, 68058, 74867, 67730, 127078, 3339, 11448, 1106, - 917591, 917540, 917593, 3340, 74017, 917586, 120994, 129141, 120541, - 10605, 1309, 63966, 120743, 1754, 92226, 13246, 864, 983171, 118926, - 8972, 119918, 7849, 120092, 83130, 13240, 195068, 5192, 4338, 67982, - 10948, 66825, 13199, 92575, 1236, 13208, 13261, 13189, 13188, 93993, - 71847, 7440, 0, 120153, 9553, 1590, 63777, 63776, 13178, 63782, 63781, - 63780, 63779, 1583, 119923, 13260, 4550, 120598, 64205, 129107, 71071, - 41522, 41523, 68523, 983772, 118923, 11354, 94071, 0, 42795, 0, 119195, - 11394, 194646, 13236, 13272, 13194, 1334, 69926, 4479, 1178, 65586, - 68311, 66681, 119193, 4601, 0, 127885, 983765, 66828, 128972, 127839, - 74580, 6809, 63786, 6031, 67402, 63791, 63790, 1145, 63788, 7910, 63785, - 43153, 754, 10192, 13105, 8183, 120741, 2037, 0, 64710, 10747, 125, - 120803, 64890, 983064, 127376, 0, 41719, 63758, 3523, 1074, 13258, 9536, - 71056, 0, 4427, 74242, 63757, 43145, 12217, 63754, 41532, 1349, 63750, - 63749, 129025, 0, 127928, 63753, 63802, 41084, 120622, 68133, 41930, - 63805, 63804, 11140, 63801, 41082, 8140, 63798, 6260, 0, 128391, 94074, - 63793, 11988, 3898, 92246, 10201, 12238, 63795, 42194, 10367, 12521, - 10431, 42114, 41932, 1068, 0, 12523, 12945, 983331, 42203, 7950, 3124, - 63771, 42787, 4386, 11148, 6973, 2793, 12475, 129180, 75056, 63769, 9530, - 121248, 12232, 13135, 8596, 5681, 63762, 4595, 63760, 792, 113674, 64803, - 0, 8742, 195029, 11053, 128796, 63744, 128107, 128942, 7588, 63748, 1693, - 63746, 43204, 5055, 68426, 42063, 1090, 68803, 120778, 11665, 74133, - 4558, 65685, 9523, 983453, 63857, 71216, 11513, 0, 6157, 63775, 63774, - 63773, 13191, 12170, 3500, 3139, 68071, 3170, 12485, 43891, 10872, 43892, - 13006, 43933, 120074, 0, 941, 0, 129079, 120967, 65541, 11063, 0, 8228, - 0, 42065, 128368, 43889, 94039, 129299, 92455, 7386, 0, 64444, 70295, - 119863, 43603, 94075, 65397, 288, 83409, 0, 0, 10025, 69915, 2918, 66820, - 65300, 119871, 9883, 64726, 2790, 65395, 3793, 983620, 127829, 65393, - 120592, 74138, 83505, 92751, 75019, 74139, 78777, 65394, 11548, 5270, - 983238, 65396, 74998, 65813, 13256, 1282, 120771, 75012, 0, 10888, - 120934, 65242, 0, 3330, 0, 0, 68340, 0, 0, 71202, 3304, 42753, 92588, - 70298, 74643, 1627, 0, 127765, 194735, 5371, 13116, 0, 1826, 118794, 0, - 43094, 70023, 43650, 94037, 68317, 9035, 11141, 917977, 128005, 0, 92207, - 68125, 74898, 164, 68309, 94067, 94000, 6958, 0, 43116, 67719, 70019, - 13245, 0, 68808, 66818, 0, 70031, 11099, 12666, 13175, 13207, 120414, - 66014, 120428, 7447, 5929, 0, 65509, 129192, 7449, 11306, 0, 73920, 3180, - 125102, 63808, 9054, 971, 13062, 71090, 0, 65195, 10164, 92252, 74428, - 983321, 78146, 92611, 0, 70204, 0, 10045, 12882, 13275, 2303, 11057, - 917976, 13276, 125133, 41525, 78150, 7271, 11444, 126479, 127904, 121203, - 12229, 11680, 92956, 43411, 73751, 0, 64813, 195089, 0, 10476, 3858, - 64175, 3932, 64958, 120432, 983678, 73989, 68192, 0, 69847, 369, 74908, - 41784, 119175, 64163, 77997, 0, 92645, 65474, 4796, 12292, 126595, 65479, - 128631, 41781, 10486, 41480, 43002, 9899, 92608, 0, 404, 12821, 3741, 0, - 5788, 8092, 68212, 41222, 1831, 66020, 3982, 0, 4388, 194913, 746, - 118826, 74783, 0, 12018, 65294, 127545, 194925, 68835, 983488, 4422, - 4708, 3799, 74292, 119357, 121146, 74430, 0, 11700, 4374, 120377, 121151, - 1364, 0, 8038, 120883, 917597, 12868, 69814, 70425, 6735, 73979, 13174, + 194998, 100929, 10673, 68779, 7248, 68786, 43515, 1781, 5496, 3627, 62, + 1649, 67876, 964, 100696, 66403, 78226, 66393, 92897, 70355, 66409, + 983484, 83398, 43689, 100701, 13142, 78812, 42415, 66575, 4542, 69909, + 43547, 83028, 0, 7677, 2991, 4946, 42454, 11565, 7949, 127545, 69759, + 11341, 42494, 3073, 65625, 9714, 11692, 4657, 0, 70810, 6478, 9898, + 41039, 65237, 6241, 7106, 4877, 100681, 6238, 100683, 10548, 100685, + 4409, 100687, 100690, 64798, 70805, 5346, 128240, 94047, 6237, 4874, + 66851, 9176, 92882, 121153, 65231, 65884, 12678, 78748, 118912, 11378, + 44018, 42785, 2408, 3251, 11203, 983159, 5685, 0, 2461, 11052, 7091, + 5342, 8317, 121446, 68163, 5340, 120559, 125206, 43635, 73928, 125001, + 71069, 83318, 0, 83317, 65482, 121394, 9142, 983177, 68506, 195084, + 10938, 0, 118790, 1182, 2542, 4826, 0, 126648, 72438, 529, 8580, 66769, + 125058, 10586, 10790, 10839, 66023, 41593, 41207, 68744, 120620, 41594, + 225, 42828, 983632, 67821, 121200, 11376, 72729, 10721, 67664, 3438, + 42097, 68862, 11084, 3194, 41870, 266, 78305, 120183, 41873, 71271, + 11324, 120531, 983976, 8420, 64918, 128839, 41871, 41338, 3734, 7734, + 43683, 8750, 66605, 66011, 92514, 40965, 100672, 100675, 5161, 10572, + 100676, 42906, 100678, 64349, 7287, 42162, 100660, 983613, 126605, 11167, + 69220, 12359, 43429, 41369, 1697, 12191, 0, 68633, 7286, 194695, 68635, + 10031, 113766, 9870, 67726, 8620, 65824, 100651, 11938, 100653, 7285, + 100655, 100654, 42678, 66842, 43677, 41583, 0, 65799, 92623, 70693, + 128131, 128267, 78169, 66199, 100664, 3609, 68624, 70280, 832, 100667, + 120770, 78473, 66007, 78471, 65703, 71256, 128517, 42732, 5180, 92699, + 41395, 41530, 11691, 64773, 92214, 74002, 127790, 120548, 128478, 6348, + 243, 13200, 120160, 6024, 92309, 9979, 10037, 41529, 10648, 8538, 43687, + 120880, 917844, 4285, 66195, 121370, 4230, 92886, 7367, 43256, 92353, + 7563, 42376, 983271, 68442, 120512, 0, 0, 214, 128578, 0, 74856, 65893, + 12208, 9973, 128386, 66311, 65589, 128277, 2603, 125205, 70155, 78622, + 70047, 127273, 6022, 100485, 2884, 0, 11620, 0, 43, 195020, 12682, 1016, + 41107, 0, 41121, 3885, 92, 65456, 64608, 0, 74801, 70855, 2074, 113742, + 78283, 128737, 12453, 70847, 983826, 74241, 126568, 6791, 12457, 78268, + 0, 66278, 983633, 78279, 0, 127932, 92358, 66637, 7995, 8759, 43421, + 78277, 12449, 122908, 71224, 43868, 8752, 3197, 4720, 10165, 113765, + 119249, 113715, 11595, 64893, 118905, 43435, 83309, 121414, 4993, 129360, + 6168, 10934, 1946, 741, 120650, 5494, 4639, 70668, 1990, 11107, 4498, + 74169, 67736, 70658, 127272, 69734, 2960, 73779, 195076, 8969, 128117, + 43424, 73959, 126464, 2950, 119579, 6210, 65753, 370, 121360, 983654, + 120928, 4953, 195009, 121054, 113708, 122888, 69230, 0, 122900, 65688, + 74951, 5063, 3517, 2964, 43663, 917762, 6344, 74791, 10566, 10144, 66333, + 8252, 729, 66016, 78253, 0, 71317, 64923, 66744, 43669, 9032, 78263, + 78264, 0, 41215, 0, 65883, 983873, 917774, 74914, 3761, 0, 0, 70068, + 120408, 12912, 119012, 3850, 128191, 127282, 128389, 0, 983342, 908, 0, + 8611, 101074, 983699, 74642, 43691, 41197, 128812, 8978, 120540, 119135, + 41586, 10527, 70426, 917848, 3848, 78739, 74917, 127536, 65241, 5336, + 74883, 128786, 663, 0, 10780, 128395, 0, 78767, 119626, 100922, 68193, + 347, 0, 917544, 78775, 64675, 41582, 72792, 78744, 65579, 12980, 68046, + 12143, 69657, 78512, 128493, 11153, 41804, 78523, 119168, 78525, 0, + 128859, 41584, 10681, 0, 120094, 73938, 73781, 128022, 4800, 66661, + 125038, 66306, 64715, 66384, 9518, 6609, 10434, 70845, 11319, 1097, + 128964, 917564, 41730, 129181, 92512, 73847, 74845, 65172, 41728, 41721, + 194780, 194769, 121499, 41203, 127056, 13110, 41726, 129072, 67077, 1000, + 69651, 83520, 41140, 1209, 73978, 125059, 73750, 1073, 6321, 77878, + 41138, 983968, 68213, 78000, 12167, 1115, 41605, 9794, 119904, 67671, + 55248, 12237, 78787, 66314, 6587, 9290, 78782, 78783, 9231, 78781, 2959, + 7926, 0, 917601, 128833, 64398, 71124, 71274, 12311, 119181, 78796, + 68768, 78794, 78795, 68434, 78793, 66670, 113797, 128579, 12290, 120169, + 128233, 119873, 3937, 9968, 8205, 0, 5131, 113694, 9627, 43646, 78542, + 78535, 983212, 1944, 1248, 10148, 127755, 119990, 119991, 12701, 78376, + 11308, 119995, 983493, 113702, 66836, 65305, 65100, 4031, 42794, 120003, + 7075, 8154, 119985, 120007, 41817, 73934, 42275, 120011, 120012, 78526, + 120014, 120015, 6041, 120520, 41899, 983287, 8002, 128367, 4364, 73732, + 983570, 64332, 120976, 7813, 9064, 119986, 10124, 7526, 8601, 7281, + 68246, 7279, 12041, 1418, 10885, 12673, 101080, 121381, 9660, 917929, + 13012, 4571, 128331, 0, 118940, 12078, 2970, 129122, 10933, 0, 77870, + 121243, 77841, 100358, 41599, 70159, 121342, 100706, 12950, 92160, 3486, + 983973, 66782, 4239, 128073, 126592, 66511, 68066, 2637, 64629, 8460, + 66834, 8476, 983975, 917989, 68312, 78489, 65673, 1019, 78495, 4148, 0, + 12289, 0, 4316, 0, 13119, 8488, 5412, 66243, 9935, 92777, 73864, 983203, + 41734, 8206, 74081, 9163, 3286, 9072, 5867, 13302, 7622, 7120, 41736, + 92546, 41731, 0, 7400, 5416, 68663, 118924, 10817, 0, 41539, 127284, + 66853, 73963, 41855, 41867, 65564, 11277, 65892, 11536, 10620, 92272, + 7115, 66030, 73932, 5498, 63876, 41536, 917587, 66738, 92587, 3459, 8997, + 194719, 92714, 127238, 13060, 78301, 0, 66377, 69781, 120159, 124972, + 78511, 3161, 295, 71257, 0, 92223, 121328, 78742, 9016, 43454, 63903, + 63902, 43501, 68210, 3971, 983959, 70063, 2952, 78765, 11038, 10901, + 63900, 63899, 63898, 68095, 667, 12332, 63887, 6086, 41722, 0, 5172, 0, + 983280, 4159, 983562, 0, 9815, 63884, 19934, 63882, 41198, 8555, 63878, + 63877, 42460, 6050, 42708, 63881, 63872, 120941, 42421, 129335, 41723, + 63875, 63874, 11460, 7432, 1913, 41913, 63852, 66869, 128971, 42348, + 73892, 6752, 446, 41911, 127901, 63851, 63850, 41910, 128637, 63846, + 2972, 12932, 7262, 69968, 63849, 41384, 63847, 113749, 6570, 8302, 7259, + 63842, 4178, 10746, 7250, 13214, 10041, 8105, 63892, 127780, 69969, 1105, + 4180, 127786, 12094, 9497, 128396, 63891, 63890, 63889, 63888, 5538, + 9987, 0, 92739, 1678, 13274, 552, 118834, 44010, 10785, 0, 11192, 4557, + 74459, 9159, 10171, 13125, 63860, 5540, 63858, 63865, 281, 13242, 63862, + 74154, 128387, 5536, 65568, 9574, 1388, 71902, 983915, 1077, 195000, + 65099, 11531, 5834, 0, 917549, 917789, 0, 42773, 121331, 0, 0, 119220, + 120912, 3663, 127027, 1112, 70335, 8686, 126611, 5334, 65081, 43249, + 74778, 127968, 11077, 92515, 6509, 120117, 5327, 78776, 19907, 63869, + 3478, 7583, 7679, 2903, 0, 3001, 1158, 8745, 43746, 73748, 63866, 78626, + 1915, 4846, 67755, 66371, 118984, 42105, 2990, 120128, 805, 69238, 64438, + 12070, 8760, 1117, 113750, 12212, 120123, 65174, 42357, 63835, 63834, + 983592, 78240, 12225, 63838, 63837, 100458, 70173, 63833, 6042, 66360, + 8083, 128166, 983733, 63821, 63820, 63819, 63818, 983332, 5227, 9047, + 63822, 74797, 6091, 983322, 10691, 560, 5643, 8226, 119578, 63812, 63811, + 63810, 63809, 2289, 63815, 63814, 63813, 6047, 1597, 78876, 780, 206, + 70126, 4936, 65147, 8168, 63930, 2076, 1093, 9882, 63934, 2082, 63932, + 75050, 63929, 3546, 1605, 66811, 9806, 43472, 77933, 8400, 11343, 2086, + 0, 63926, 2984, 5968, 9287, 72791, 4618, 42209, 11137, 13169, 5290, 2089, + 1695, 10743, 1088, 63825, 7268, 1084, 1085, 63829, 1083, 10131, 7283, + 120109, 63970, 121165, 1092, 4754, 7273, 5252, 44016, 43627, 127921, + 128920, 7408, 11809, 83220, 121181, 194716, 2965, 7258, 8808, 66572, + 1089, 4187, 63937, 42119, 42120, 11106, 940, 5787, 10099, 63938, 983849, + 74494, 12463, 2994, 125136, 118827, 68522, 9664, 70834, 77940, 67892, + 77938, 74343, 67370, 72714, 660, 10127, 666, 9022, 5532, 43667, 5533, + 12580, 78507, 6118, 222, 979, 3884, 983319, 72706, 83227, 6502, 983762, + 11085, 121261, 63951, 12465, 917862, 0, 128782, 63946, 1707, 63924, + 12461, 63950, 63897, 63948, 63947, 63945, 6038, 63943, 63942, 64685, + 63895, 65838, 2276, 7776, 94076, 121086, 92464, 66792, 69730, 801, 43165, + 1690, 63919, 63918, 63917, 13277, 43659, 12951, 120638, 9906, 2054, 2334, + 66800, 63916, 5483, 63914, 69737, 63911, 5484, 63909, 63908, 2539, + 120102, 43980, 5485, 194873, 42697, 9061, 5534, 10672, 4502, 68057, 253, + 0, 68208, 120439, 9203, 74231, 100708, 11530, 68634, 68668, 121242, + 11127, 0, 10474, 43426, 13257, 42354, 128099, 120106, 70044, 127110, + 66808, 8413, 66841, 0, 5693, 7272, 129307, 13209, 64470, 65831, 74350, + 195063, 0, 0, 0, 113665, 120097, 127960, 94078, 66840, 127165, 66608, + 3111, 41863, 8804, 42913, 78347, 7270, 0, 66606, 6628, 1076, 7433, 1436, + 73844, 55226, 128353, 63982, 7393, 12807, 43413, 63906, 1598, 63904, + 71187, 70393, 41729, 4423, 1307, 113692, 10515, 41589, 128698, 128918, + 6218, 92917, 1430, 0, 100700, 120606, 78754, 5413, 7619, 3255, 3493, + 74032, 11549, 10735, 41743, 73937, 6801, 100743, 4518, 10990, 65073, + 5167, 4481, 3771, 67093, 2710, 917847, 66277, 41724, 67716, 43073, 41690, + 12479, 983635, 8380, 121071, 71852, 70046, 1628, 121229, 128817, 129067, + 65262, 6333, 10783, 11172, 121473, 63855, 70840, 113679, 0, 5339, 74323, + 120946, 13004, 66843, 4457, 100901, 127756, 194818, 127116, 5684, 8678, + 10914, 43632, 5689, 65807, 70814, 68464, 12633, 12870, 69705, 65183, + 5688, 11926, 6033, 6310, 5686, 119076, 74251, 128908, 120647, 128930, 50, + 10558, 9871, 42612, 43655, 74403, 983818, 74284, 66468, 66905, 13259, + 4448, 119150, 121406, 83349, 70043, 1321, 100987, 10640, 11539, 1151, + 121186, 917607, 124958, 127079, 71106, 118949, 0, 983920, 983075, 12501, + 64604, 128657, 11527, 118870, 8812, 125141, 11538, 8673, 12650, 11020, 0, + 66467, 2105, 8087, 72712, 69632, 9894, 127137, 127856, 69995, 4636, + 55262, 78513, 4515, 2382, 0, 127055, 983695, 113780, 983456, 118968, + 12277, 121239, 11995, 92553, 120675, 12158, 70170, 8741, 10197, 68780, + 92426, 119610, 6531, 83051, 127846, 473, 43415, 92936, 124949, 1873, + 1087, 124966, 71275, 74280, 78527, 66439, 43218, 983123, 127792, 7237, + 12504, 71113, 126559, 128748, 120887, 9489, 120069, 70843, 4384, 74220, + 63845, 2058, 69741, 13295, 43191, 128030, 128571, 1154, 3857, 1205, + 128955, 0, 6055, 12958, 120706, 74168, 128388, 70846, 4421, 10592, 0, + 495, 66400, 41712, 7983, 70833, 93997, 70696, 6347, 78715, 7654, 41710, + 4196, 194704, 437, 41709, 73772, 70832, 0, 9465, 13290, 119180, 4997, + 64306, 121309, 0, 4999, 194642, 67401, 126582, 4711, 120769, 100469, + 2739, 0, 8044, 74313, 128230, 41789, 128142, 10809, 66279, 128740, 0, + 1779, 6600, 6601, 41543, 5325, 642, 64187, 13058, 120449, 12875, 983804, + 92186, 13229, 71845, 10575, 43399, 100467, 0, 41791, 1104, 127922, + 983725, 10655, 983334, 983561, 120164, 63960, 1082, 121024, 8428, 6569, + 128429, 0, 78534, 69849, 6783, 194671, 12993, 8049, 41548, 44021, 6458, + 64728, 128882, 4761, 63828, 4766, 64623, 1273, 43407, 120677, 118876, + 195045, 6912, 1313, 6322, 10483, 128627, 41545, 126465, 92449, 125209, + 11216, 121307, 194851, 78624, 3484, 74337, 0, 983225, 8503, 5122, 41527, + 71910, 66320, 70161, 74907, 194856, 0, 41537, 66453, 8303, 8282, 11817, + 73857, 10003, 73859, 65904, 7363, 1686, 122920, 70115, 11467, 3664, + 65921, 64299, 124939, 128462, 128001, 4324, 126, 42246, 75030, 69984, + 67725, 65926, 7744, 68859, 74277, 66283, 78052, 43817, 6966, 43822, 8136, + 0, 65600, 1633, 128301, 126614, 4762, 1103, 70827, 70157, 4765, 983494, + 13078, 983270, 4760, 63827, 2050, 10871, 43199, 1102, 194652, 6555, + 128867, 127072, 11546, 74794, 337, 121196, 42591, 8627, 12279, 1111, + 983856, 75047, 4707, 68206, 10143, 7883, 121444, 7880, 4522, 8645, 5704, + 13010, 69796, 8304, 92982, 194688, 119575, 2293, 70195, 66654, 129077, + 92676, 0, 13008, 121194, 4385, 100462, 13011, 125004, 92569, 119161, + 13009, 160, 2677, 70388, 127785, 41793, 65763, 74221, 70790, 41792, + 42770, 94054, 65762, 118829, 43821, 5709, 125222, 71076, 43816, 983087, + 195005, 1079, 3867, 5708, 0, 0, 43797, 5706, 64768, 5705, 8791, 4005, + 121091, 10237, 10991, 128816, 43459, 9173, 121152, 121219, 13170, 12540, + 125233, 42605, 120765, 126617, 68647, 917572, 10058, 68058, 74867, 67730, + 127078, 3339, 11448, 1106, 917591, 917540, 128311, 3340, 74017, 917586, + 120994, 129141, 92979, 10605, 1309, 63966, 120743, 1754, 92226, 13246, + 864, 917582, 118926, 8972, 100444, 7849, 120092, 83130, 13240, 195068, + 5192, 4338, 67982, 10948, 66825, 13199, 92575, 1236, 13208, 13261, 13189, + 13188, 93993, 71847, 7440, 0, 120153, 9553, 1590, 63777, 63776, 13178, + 63782, 63781, 63780, 63779, 1583, 119923, 13260, 4550, 120598, 64205, + 129107, 71071, 41522, 41523, 68523, 129108, 66759, 11354, 94071, 0, + 42795, 128061, 119195, 11394, 194646, 13236, 13272, 13194, 1334, 69926, + 4479, 1178, 65586, 68311, 66681, 119193, 4601, 0, 127885, 195038, 66828, + 128972, 127839, 74580, 6809, 63786, 6031, 67402, 63791, 63790, 1145, + 63788, 7910, 63785, 43153, 754, 10192, 13105, 8183, 120741, 2037, 125122, + 64710, 10747, 125, 120803, 64890, 66805, 127376, 0, 41719, 63758, 3523, + 1074, 13258, 9536, 71056, 0, 4427, 74242, 63757, 43145, 12217, 63754, + 41532, 1349, 63750, 63749, 129025, 128773, 101014, 63753, 63802, 41084, + 72784, 68133, 41930, 63805, 63804, 11140, 63801, 41082, 8140, 63798, + 6260, 78826, 128391, 66765, 11439, 11988, 3898, 92246, 10201, 12238, + 63795, 42194, 10367, 12521, 10431, 42114, 41932, 1068, 0, 12523, 12945, + 983331, 42203, 7950, 3124, 63771, 42787, 4386, 11148, 6973, 2793, 12475, + 125241, 75056, 63769, 9530, 121248, 12232, 13135, 8596, 5681, 63762, + 4595, 63760, 792, 113674, 64803, 100512, 8742, 195029, 11053, 128796, + 63744, 128107, 128942, 7588, 63748, 1693, 63746, 43204, 5055, 68426, + 42063, 1090, 68803, 120778, 11665, 74133, 4558, 65685, 9523, 195053, + 63857, 71216, 11513, 0, 6157, 63775, 63774, 63773, 13191, 12170, 3500, + 3139, 68071, 3170, 12485, 43891, 10872, 43892, 13006, 43933, 120074, + 100650, 941, 0, 129079, 120967, 65541, 11063, 983198, 8228, 73988, 42065, + 122893, 43889, 94039, 127041, 92455, 7386, 0, 64444, 70295, 119863, + 43603, 94075, 65397, 288, 83409, 0, 0, 10025, 69915, 2918, 66820, 65300, + 119871, 9883, 64726, 2790, 65395, 3793, 983620, 127829, 65393, 120592, + 74138, 83505, 92751, 75019, 74139, 78777, 65394, 11548, 5270, 128149, + 65396, 74998, 65813, 13256, 1282, 120771, 75012, 120157, 10888, 120934, + 65242, 0, 3330, 129417, 0, 68340, 124931, 983605, 71202, 3304, 42753, + 92588, 70298, 74643, 1627, 129120, 127765, 194735, 5371, 13116, 983777, + 1826, 118794, 983497, 43094, 70023, 43650, 94037, 68317, 9035, 11141, + 917977, 128005, 0, 72733, 68125, 74898, 164, 68309, 94067, 94000, 6958, + 100634, 43116, 67719, 70019, 13245, 100637, 68808, 66818, 128009, 70031, + 11099, 12666, 13175, 13207, 120414, 66014, 120428, 7447, 5929, 983473, + 65509, 129192, 7449, 11306, 0, 73920, 3180, 125102, 63808, 9054, 971, + 13062, 71090, 0, 65195, 10164, 92252, 74428, 983321, 78146, 92611, 0, + 70204, 125129, 10045, 12882, 13275, 2303, 11057, 124994, 13276, 125133, + 41525, 78150, 7271, 11444, 126479, 127904, 119091, 12229, 11680, 92956, + 43411, 73751, 0, 64813, 195089, 983495, 10476, 3858, 64175, 3932, 64958, + 120432, 983678, 73989, 68192, 0, 69847, 369, 74908, 41784, 119175, 64163, + 77997, 72707, 92645, 65474, 4796, 12292, 126595, 65479, 128631, 41781, + 10486, 41480, 43002, 9899, 92608, 983870, 404, 12821, 3741, 0, 5788, + 8092, 68212, 41222, 1831, 66020, 3982, 0, 4388, 194913, 746, 118826, + 74783, 0, 12018, 65294, 124946, 194925, 68835, 983488, 4422, 4708, 3799, + 74292, 119357, 121146, 74430, 0, 11700, 4374, 120377, 121151, 1364, + 983317, 8038, 120883, 917597, 12868, 69814, 70425, 6735, 73979, 13174, 73968, 13225, 194902, 69808, 65835, 0, 2365, 7841, 71476, 42855, 118856, - 42866, 0, 0, 127986, 66438, 41785, 12617, 64172, 13173, 4372, 119354, - 983920, 983568, 128871, 127821, 67685, 128062, 12965, 384, 64512, 10404, - 10340, 119352, 1556, 5274, 13210, 120125, 10017, 9733, 41787, 983245, - 121149, 41373, 68486, 12303, 128476, 13232, 13233, 349, 4863, 41371, - 11656, 0, 120703, 119883, 12861, 4398, 8543, 65618, 92737, 1096, 43852, - 121433, 42688, 12441, 12355, 119348, 119347, 4318, 10452, 92902, 8032, - 13243, 13237, 12719, 126646, 119101, 121156, 64884, 92909, 119345, 8597, - 71100, 129062, 9864, 0, 120785, 119874, 94107, 13195, 41452, 64961, 7722, - 0, 10459, 119878, 124949, 119879, 66590, 128123, 41533, 66337, 128663, - 92184, 0, 4965, 43445, 917536, 67856, 0, 43638, 78536, 121187, 6261, - 119342, 43147, 66570, 1957, 10420, 982, 2756, 13292, 13206, 125064, - 917795, 2925, 73809, 13056, 92914, 13212, 43238, 121396, 13190, 13187, - 92541, 13198, 118793, 121089, 5242, 119179, 64476, 1694, 8216, 71369, - 6770, 43331, 0, 65620, 983728, 43544, 126466, 0, 41444, 65621, 69955, - 9197, 5246, 119106, 13185, 9709, 120323, 120322, 12314, 65616, 5238, - 43825, 71085, 119337, 5236, 40979, 983140, 71874, 8286, 128537, 3936, - 119331, 11699, 41347, 69739, 13235, 8842, 41248, 0, 4379, 13239, 12692, - 7969, 127266, 7219, 71875, 128251, 120509, 92907, 66224, 734, 2979, - 120303, 65619, 9872, 957, 64921, 1846, 66631, 41477, 119256, 71192, - 74511, 41770, 1670, 6442, 120317, 42446, 5379, 120318, 41163, 74832, - 11136, 71876, 11506, 128395, 42841, 13267, 128421, 0, 41775, 0, 7130, - 41773, 0, 10663, 70130, 0, 983974, 6151, 12110, 42673, 65572, 65293, - 65250, 13265, 13264, 64518, 0, 6100, 127964, 92647, 5808, 65922, 67814, - 12967, 66041, 5612, 4583, 70004, 43386, 68097, 64575, 126637, 11965, - 194930, 68358, 71483, 69789, 42653, 83181, 68102, 9698, 7814, 71045, - 119651, 128514, 0, 41921, 118858, 9756, 6985, 66418, 66621, 74219, 66412, - 128822, 118997, 8012, 5674, 12353, 66421, 12361, 5677, 5588, 92348, - 41925, 128124, 41920, 5673, 83113, 5676, 41923, 12694, 118978, 5672, - 1294, 0, 78059, 983962, 42511, 1727, 120725, 42436, 121400, 121183, 0, - 74222, 8718, 3550, 736, 10268, 4505, 5873, 74090, 5826, 55232, 5813, - 129032, 92889, 5841, 5837, 55234, 194864, 3105, 12829, 5838, 5796, 0, - 119592, 5793, 0, 5866, 5797, 41011, 5865, 93009, 7956, 598, 0, 64649, - 5806, 42398, 0, 9037, 5671, 120041, 983257, 83478, 983929, 83184, 0, 847, - 128242, 9529, 83018, 66657, 6980, 78483, 43510, 78122, 92219, 0, 67411, - 78486, 83017, 127260, 120039, 42683, 71848, 983055, 7114, 126521, 0, - 43190, 65463, 1554, 0, 42611, 42563, 0, 5651, 2929, 6792, 43201, 75059, - 19963, 5698, 194768, 983272, 92933, 71887, 5644, 10292, 65546, 69727, - 68141, 8372, 0, 65116, 0, 70304, 10175, 10388, 42799, 94100, 41013, - 10568, 0, 983618, 2869, 917843, 41015, 74473, 2785, 4366, 0, 10954, - 41802, 983652, 42608, 78468, 9884, 4759, 73768, 120296, 10266, 41359, - 1170, 43365, 69810, 73908, 1609, 902, 92773, 63936, 83247, 11661, 8122, - 5818, 83245, 0, 3861, 9540, 11028, 2554, 5158, 5714, 2213, 983966, 0, - 807, 43079, 78092, 78475, 976, 5511, 64553, 120863, 42155, 983319, 41356, - 74110, 118801, 71043, 120080, 8676, 983293, 94002, 5582, 451, 63941, + 42866, 101077, 0, 127986, 66438, 41785, 12617, 64172, 13173, 4372, + 119354, 194940, 983568, 127253, 127821, 67685, 128062, 12965, 384, 64512, + 10404, 10340, 41473, 1556, 5274, 13210, 120125, 10017, 9733, 41787, + 983245, 70684, 41373, 68486, 12303, 128476, 13232, 13233, 349, 4863, + 41371, 11656, 983691, 120703, 119883, 12861, 4398, 8543, 65618, 92737, + 1096, 43852, 121433, 42688, 12441, 12355, 119348, 119347, 4318, 10452, + 92902, 8032, 13243, 13237, 12719, 126646, 119101, 121156, 64884, 92909, + 119345, 8597, 71100, 127559, 9864, 983943, 120785, 119874, 94107, 13195, + 41452, 64961, 7722, 0, 10459, 119878, 72830, 119879, 66590, 128123, + 41533, 66337, 128663, 92184, 983860, 4965, 43445, 917536, 67856, 0, + 43638, 78536, 72719, 6261, 119342, 43147, 66570, 1957, 10420, 982, 2756, + 13292, 13206, 125064, 917795, 2925, 73809, 13056, 92914, 13212, 43238, + 121396, 13190, 13187, 92541, 13198, 118793, 121089, 5242, 119179, 64476, + 1694, 8216, 71369, 6770, 43331, 0, 65620, 194629, 43544, 100441, 0, + 41444, 65621, 69955, 9197, 5246, 119106, 13185, 9709, 120323, 100924, + 12314, 65616, 5238, 43825, 71085, 119337, 5236, 40979, 983140, 71874, + 8286, 121292, 3936, 119331, 11699, 41347, 69739, 13235, 8842, 41248, + 100490, 4379, 13239, 12692, 7969, 127266, 7219, 71875, 128251, 120509, + 92907, 66224, 734, 2979, 120303, 65619, 9872, 957, 64921, 1846, 66631, + 41477, 119256, 71192, 74511, 41770, 1670, 6442, 120317, 42446, 5379, + 120318, 41163, 74832, 11136, 71876, 11506, 65934, 42841, 13267, 128421, + 124988, 41775, 0, 7130, 41773, 917888, 10663, 70130, 125225, 983974, + 6151, 12110, 42673, 65572, 65293, 65250, 13265, 13264, 64518, 0, 6100, + 100493, 92647, 5808, 65922, 67814, 12967, 66041, 5612, 4583, 70004, + 43386, 68097, 64575, 126637, 11965, 70720, 68358, 71483, 69789, 42653, + 83181, 68102, 9698, 7814, 71045, 119651, 128514, 917915, 41921, 118858, + 9756, 6985, 66418, 66621, 74219, 66412, 128822, 70718, 8012, 5674, 12353, + 66421, 12361, 5677, 5588, 92348, 41925, 128124, 41920, 5673, 83113, 5676, + 41923, 12694, 118978, 5672, 1294, 120878, 78059, 983962, 42511, 1727, + 120725, 42436, 100497, 121183, 0, 74222, 8718, 3550, 736, 10268, 4505, + 5873, 74090, 5826, 55232, 5813, 120086, 92889, 5841, 5837, 55234, 194864, + 3105, 12829, 5838, 5796, 983840, 119592, 5793, 0, 5866, 5797, 41011, + 5865, 93009, 7956, 598, 983260, 64649, 5806, 42398, 0, 9037, 5671, + 120041, 983257, 83478, 983929, 71266, 917618, 847, 125065, 9529, 83018, + 66657, 6980, 78483, 43510, 78122, 92219, 0, 67411, 78486, 83017, 127260, + 120039, 42683, 71848, 101095, 7114, 126521, 0, 43190, 65463, 1554, 70657, + 42611, 42563, 101071, 5651, 2929, 6792, 43201, 75059, 19963, 5698, + 194768, 120730, 92933, 71887, 5644, 10292, 65546, 69727, 68141, 8372, + 100800, 65116, 0, 70304, 10175, 10388, 42799, 94100, 41013, 10568, + 917565, 127400, 2869, 917843, 41015, 74473, 2785, 4366, 0, 10954, 41802, + 983652, 42608, 78468, 9884, 4759, 73768, 120296, 10266, 41359, 1170, + 43365, 69810, 73908, 1609, 902, 92773, 63936, 83247, 11661, 8122, 5818, + 83245, 0, 3861, 9540, 11028, 2554, 5158, 5714, 2213, 983966, 121028, 807, + 43079, 78092, 78475, 976, 5511, 64553, 120863, 42155, 128951, 41356, + 74110, 118801, 71043, 120080, 8676, 100519, 94002, 5582, 451, 63941, 5798, 9349, 42018, 127858, 128521, 78681, 43609, 5906, 120553, 1440, 0, - 128853, 74933, 70342, 11005, 194699, 66656, 66044, 194636, 120079, - 128793, 0, 43393, 10094, 70164, 11529, 10857, 92944, 66436, 6546, 93, - 8102, 67323, 68405, 0, 194714, 8171, 118888, 119097, 82996, 917543, 383, - 7154, 41656, 43495, 94040, 67162, 5187, 71296, 71086, 11286, 68620, - 64217, 0, 5232, 0, 41009, 127377, 41005, 983810, 0, 128471, 8292, 125108, - 4980, 8860, 71054, 10028, 65291, 7076, 13182, 194705, 74912, 127974, - 10631, 11244, 7972, 68042, 78785, 0, 7900, 128590, 11309, 3806, 4198, - 42725, 0, 67656, 9995, 0, 92552, 0, 12931, 121110, 42684, 74285, 2088, - 64213, 64366, 65156, 8814, 42238, 74771, 127920, 194713, 12836, 0, - 113800, 74342, 8593, 0, 0, 68445, 13255, 121333, 128843, 7464, 0, 65865, - 0, 194650, 127144, 92395, 9342, 120464, 70376, 64516, 0, 78792, 10129, - 41007, 74375, 983701, 40995, 12209, 41012, 83501, 0, 83257, 69724, 40992, - 92264, 119136, 68653, 43558, 5522, 75026, 61, 120959, 74105, 3633, - 120082, 65162, 41234, 12089, 78281, 9771, 83281, 13251, 128701, 0, 6262, - 2784, 42743, 71078, 8126, 66483, 0, 0, 441, 42621, 0, 0, 41002, 40999, - 119623, 43266, 7108, 194779, 10890, 74481, 65834, 8324, 118944, 64417, - 74817, 127465, 64737, 74853, 983659, 8930, 66678, 67216, 1193, 10056, - 1800, 13253, 13252, 7829, 120992, 121175, 7743, 83502, 124996, 77904, - 77913, 77905, 9034, 6039, 129139, 10075, 0, 41018, 65683, 10338, 66469, - 0, 0, 194637, 42815, 92984, 41966, 0, 127471, 0, 11792, 43064, 41025, - 911, 7539, 0, 40963, 120339, 65159, 64390, 0, 983160, 5520, 11662, - 127473, 65330, 42812, 983215, 0, 12326, 71081, 194638, 42808, 128337, - 9348, 64901, 983861, 983892, 121050, 66839, 0, 0, 121004, 43702, 983148, - 5857, 65342, 92727, 119120, 83503, 8644, 121227, 83332, 11186, 74296, - 41909, 0, 66900, 2791, 69663, 1891, 69824, 66397, 41907, 66647, 118939, - 8761, 12942, 5748, 92713, 10773, 70868, 83174, 8796, 78149, 6412, 2061, - 8520, 13146, 127096, 63931, 83275, 65902, 2882, 83334, 0, 12843, 4520, - 120345, 92459, 0, 983660, 0, 73860, 83335, 0, 64345, 0, 9201, 128314, - 70871, 0, 917864, 43679, 121026, 65117, 92270, 0, 10427, 121506, 3844, - 6842, 9755, 1110, 6612, 12222, 93030, 128789, 983638, 92928, 783, 194935, + 128853, 74933, 70342, 11005, 194699, 66656, 66044, 194586, 120079, + 127249, 120797, 43393, 10094, 70164, 11529, 10857, 92944, 66436, 6546, + 93, 8102, 67323, 68405, 0, 194714, 8171, 118888, 119097, 82996, 917543, + 383, 7154, 41656, 43495, 94040, 67162, 5187, 71296, 71086, 11286, 68620, + 64217, 0, 5232, 0, 41009, 127377, 41005, 983810, 43205, 120829, 8292, + 125108, 4980, 8860, 71054, 10028, 65291, 7076, 13182, 194705, 74912, + 127974, 10631, 11244, 7972, 68042, 78785, 0, 7900, 128590, 11309, 3806, + 4198, 42725, 983311, 67656, 9995, 120072, 92552, 0, 12931, 121110, 42684, + 74285, 2088, 64213, 64366, 65156, 8814, 42238, 74771, 127920, 194713, + 12836, 125214, 113800, 74342, 8593, 120640, 0, 68445, 13255, 121333, + 128843, 7464, 101066, 65865, 0, 128535, 127144, 92395, 9342, 120464, + 70376, 64516, 0, 78792, 10129, 41007, 74375, 983701, 40995, 12209, 41012, + 83501, 0, 83257, 69724, 40992, 92264, 119136, 68653, 43558, 5522, 75026, + 61, 120959, 74105, 3633, 120082, 65162, 41234, 12089, 78281, 9771, 83281, + 13251, 128701, 0, 6262, 2784, 42743, 71078, 8126, 66483, 0, 194662, 441, + 42621, 70660, 0, 41002, 40999, 119623, 43266, 7108, 194779, 10890, 74481, + 65834, 8324, 118944, 64417, 74817, 127465, 64737, 74853, 983659, 8930, + 66678, 67216, 1193, 10056, 1800, 13253, 13252, 7829, 120992, 121175, + 7743, 83502, 124996, 77904, 77913, 77905, 9034, 6039, 129139, 10075, + 983765, 41018, 65683, 10338, 66469, 0, 0, 194637, 42815, 92984, 41966, 0, + 127471, 125188, 11792, 43064, 41025, 911, 7539, 983487, 40963, 100447, + 65159, 64390, 0, 983160, 5520, 11662, 127473, 65330, 42812, 119912, + 126647, 12326, 71081, 194638, 42808, 128337, 9348, 64901, 983861, 983892, + 121050, 66839, 0, 0, 121004, 43702, 100807, 5857, 65342, 92727, 119120, + 83503, 8644, 121227, 83332, 11186, 74296, 41909, 0, 66900, 2791, 69663, + 1891, 69824, 66397, 41907, 66647, 118939, 8761, 12942, 5748, 92713, + 10773, 70206, 83174, 8796, 78149, 6412, 2061, 8520, 13146, 72805, 63931, + 83275, 65902, 2882, 83334, 128285, 12843, 4520, 120345, 92459, 129092, + 983660, 120068, 73860, 83335, 128289, 64345, 983554, 9201, 128314, 70871, + 983809, 917864, 43679, 121026, 65117, 92270, 983636, 10427, 121506, 3844, + 6842, 9755, 1110, 6612, 12222, 93030, 101051, 983638, 92928, 783, 119577, 92185, 127221, 73855, 68032, 65056, 3620, 41180, 68378, 4556, 67839, 68480, 194933, 74250, 0, 67657, 10510, 4382, 66482, 67823, 0, 127527, - 9177, 8902, 93958, 9839, 120700, 12891, 983755, 983636, 63999, 2016, + 9177, 8902, 93958, 9839, 120700, 12891, 983755, 983239, 63999, 2016, 41917, 9788, 63928, 67696, 1862, 65800, 9155, 66623, 9786, 65082, 41919, 8579, 41914, 7981, 0, 66017, 4508, 64883, 92456, 92522, 127814, 120834, 64592, 74276, 67688, 6784, 78788, 68181, 0, 71218, 113821, 66366, 12147, 9024, 66378, 66472, 124976, 64289, 65289, 78151, 66658, 71935, 64509, 78152, 113697, 126505, 11051, 194928, 0, 11355, 65885, 121319, 127941, - 41214, 0, 12299, 0, 7500, 4506, 7773, 0, 0, 9963, 68649, 126609, 4040, - 120570, 6167, 74519, 63922, 6594, 983740, 0, 0, 3624, 43036, 129472, - 6387, 63990, 19947, 63988, 41955, 126990, 63993, 10440, 9611, 65605, - 6803, 120968, 7738, 63986, 11446, 63984, 92641, 3435, 78164, 43814, - 43810, 7029, 64258, 41292, 118898, 12748, 42742, 9517, 11518, 83292, - 78790, 983381, 67993, 63956, 42458, 63954, 63953, 63960, 9591, 4516, - 10217, 68370, 11469, 69697, 42306, 2723, 118947, 0, 92325, 0, 68079, - 121344, 11397, 2880, 70806, 917829, 2872, 0, 83321, 3498, 4378, 917539, - 4270, 0, 65551, 68205, 6633, 43387, 0, 5230, 194991, 0, 983040, 194910, - 121392, 8161, 393, 12013, 0, 983198, 119103, 415, 63964, 63963, 42345, - 92310, 5183, 1877, 42498, 0, 2927, 71058, 63961, 4472, 983299, 0, 78159, - 69699, 127301, 42340, 4756, 128078, 7081, 10730, 7691, 10331, 63830, - 119625, 42922, 42103, 8628, 9813, 78654, 42453, 1604, 9565, 10539, 69701, - 65764, 41415, 65767, 129196, 8457, 42301, 11372, 64873, 11992, 0, 0, - 63980, 11801, 3622, 195092, 64336, 12017, 10463, 63981, 4967, 64189, - 1966, 43628, 983908, 983294, 83267, 121052, 63971, 4347, 4416, 42098, - 11009, 10694, 63973, 402, 92213, 13147, 128692, 42100, 64646, 13228, 0, - 41875, 3515, 74252, 11805, 983157, 11302, 6259, 43395, 0, 83323, 194670, - 120836, 92351, 74813, 74425, 11299, 1561, 118881, 92318, 64942, 93021, - 194733, 70411, 78718, 121140, 74301, 68825, 11280, 128489, 69784, 74060, - 128392, 0, 119664, 5145, 12486, 65018, 66516, 5409, 127379, 124988, 7402, - 5399, 9685, 74089, 7952, 5401, 0, 66616, 66832, 92966, 120852, 5405, - 127875, 64866, 120965, 119583, 119122, 78784, 74248, 11330, 194723, - 64690, 3254, 983166, 128944, 92696, 42390, 43678, 194725, 129127, 65077, - 129059, 6388, 3355, 9508, 9867, 5723, 11520, 5611, 83021, 3377, 0, 0, - 74354, 194578, 78228, 983722, 983762, 42691, 127886, 120948, 68091, - 128404, 75023, 1379, 246, 74649, 983761, 3788, 92520, 11041, 67202, - 66304, 0, 121213, 8917, 42403, 301, 0, 128500, 127046, 0, 0, 113822, - 10656, 125042, 65214, 92987, 42567, 92217, 13163, 983204, 120831, 74597, - 3182, 0, 0, 0, 65034, 65889, 42169, 4755, 74244, 194574, 11443, 983603, - 66319, 6841, 608, 600, 0, 1219, 3934, 64206, 11483, 74510, 119117, 74485, - 42442, 65470, 983907, 64202, 13160, 7759, 42482, 485, 69982, 70505, 9828, - 0, 43505, 42280, 0, 9351, 7778, 64379, 7496, 42431, 6916, 1208, 0, - 119631, 11002, 42470, 0, 68315, 0, 0, 74041, 83144, 70045, 43539, 5411, - 42196, 0, 0, 0, 9150, 66831, 42393, 13086, 1310, 66848, 9337, 12052, - 10643, 55271, 128951, 12166, 2546, 194683, 213, 118852, 65611, 83316, - 194822, 194756, 74310, 6554, 94059, 11914, 5452, 0, 0, 92772, 0, 917880, - 194681, 92560, 2713, 119564, 9650, 43330, 121033, 128505, 1406, 125007, - 42925, 74638, 194593, 66256, 4143, 128136, 194762, 65748, 4141, 9682, - 65287, 1508, 127013, 8779, 10569, 8725, 13299, 66638, 65750, 42263, 4145, - 6380, 65751, 66613, 43994, 65738, 55250, 9185, 9550, 42932, 43403, 0, 0, - 194783, 65736, 41951, 64816, 65756, 983205, 12955, 10596, 2888, 83190, 0, - 121354, 9657, 9019, 121154, 0, 2878, 5390, 0, 194961, 67325, 68679, - 43552, 7501, 6328, 194960, 10429, 10365, 0, 0, 41946, 7503, 5235, 803, - 68381, 0, 0, 8986, 43838, 10632, 11934, 11452, 1332, 0, 194970, 126647, - 0, 118887, 1791, 5191, 9288, 64822, 2892, 83192, 43394, 555, 0, 0, 66646, - 128980, 119002, 13151, 74512, 7289, 74055, 64161, 8854, 64162, 5858, - 41927, 10582, 120457, 1784, 1361, 120921, 121516, 7905, 0, 64868, 128813, - 13158, 92166, 7211, 71884, 9371, 73973, 128441, 6828, 1625, 7664, 128768, - 1342, 68440, 64171, 92642, 10903, 983496, 0, 92527, 0, 70438, 4482, - 41606, 128934, 125033, 121475, 0, 64381, 983940, 194974, 195090, 42245, - 126467, 41972, 0, 444, 983439, 9127, 66687, 66619, 126489, 78025, 0, - 11349, 40991, 917570, 0, 70177, 120830, 0, 1197, 128282, 1149, 68316, 0, - 983258, 40990, 43765, 121262, 3492, 917906, 118784, 129026, 0, 983566, - 12838, 67208, 19948, 41677, 3099, 0, 0, 41087, 0, 0, 983261, 119059, - 12036, 41309, 128161, 0, 8152, 0, 41550, 12227, 983613, 0, 12828, 127511, - 75015, 120964, 120708, 0, 0, 10386, 75068, 119955, 127303, 92680, 983134, - 68154, 127876, 1743, 0, 0, 92239, 65186, 917571, 0, 9606, 0, 70052, - 64439, 128864, 68062, 92686, 983875, 0, 43866, 128881, 0, 3395, 9362, - 10878, 43260, 0, 78362, 64830, 0, 125046, 41091, 3426, 1344, 8870, - 121100, 71344, 4735, 11111, 6119, 12822, 42699, 0, 983824, 74818, 1423, - 128923, 42637, 41080, 0, 12039, 10559, 128634, 118892, 0, 9472, 67734, - 11929, 126557, 7170, 9596, 6130, 128826, 43629, 11579, 71475, 0, 92501, - 125081, 78046, 66699, 64440, 1004, 92584, 194736, 43234, 66008, 12627, 0, - 68414, 74614, 43619, 43303, 11300, 43304, 9686, 5890, 11776, 7558, 70109, - 65627, 0, 10718, 13154, 3461, 9139, 0, 983094, 0, 119023, 65365, 73877, - 65628, 78019, 119272, 83118, 41708, 12860, 2641, 12069, 10838, 5403, - 10352, 70085, 10061, 43237, 125057, 5140, 209, 128847, 41704, 41056, - 43078, 127789, 118809, 67232, 10899, 65469, 70125, 0, 0, 2410, 993, - 83117, 120589, 120689, 78693, 0, 0, 7232, 0, 119253, 124963, 7110, 74462, - 2066, 10489, 42166, 43463, 10659, 3600, 68863, 4224, 1336, 41518, 121311, - 0, 0, 0, 41139, 64820, 92538, 12966, 41134, 0, 0, 119153, 120441, 272, - 4263, 8793, 983856, 0, 41502, 128133, 983, 12549, 124940, 0, 1190, 4109, - 1335, 841, 5888, 41358, 64863, 9544, 43481, 0, 120926, 70027, 2099, 5120, - 2409, 7799, 0, 74424, 0, 121041, 4731, 92279, 66629, 128127, 92525, 1255, - 4149, 9247, 74977, 9913, 983828, 121101, 64914, 917787, 65101, 113714, - 11694, 92475, 11690, 5835, 127164, 66625, 10842, 41354, 42123, 43097, - 11688, 66634, 1094, 194, 64692, 917900, 8180, 125055, 0, 9972, 73865, - 4519, 6114, 10898, 43072, 92465, 0, 93960, 983324, 126581, 10695, 0, - 7540, 0, 881, 7857, 6067, 65164, 0, 917897, 129134, 13311, 68403, 41857, - 64321, 8359, 83286, 12689, 983312, 11245, 128105, 983314, 71859, 68183, - 983415, 194829, 1287, 5436, 0, 71097, 74142, 92328, 74152, 70205, 6051, - 10497, 69668, 8985, 12109, 82962, 128908, 93043, 121013, 0, 3652, 10537, - 120282, 1276, 120440, 6549, 279, 73745, 0, 128664, 83244, 1489, 0, 0, 0, - 3899, 1007, 42124, 43828, 42122, 92337, 92367, 0, 11985, 1345, 78600, - 119832, 917563, 8956, 43083, 94057, 42138, 78610, 129131, 6430, 78608, - 78604, 78605, 6285, 78603, 78612, 78613, 65942, 492, 8685, 128481, - 121270, 0, 75027, 43712, 2582, 11470, 64538, 7444, 78615, 78616, 2297, 0, - 73837, 119823, 2527, 119824, 197, 2799, 92594, 41944, 83152, 9933, 74011, - 66515, 767, 5524, 7028, 0, 92168, 119827, 119817, 92950, 78633, 10896, 0, - 1799, 120497, 6971, 74336, 128342, 0, 65340, 118979, 41551, 2434, 94018, - 118823, 65353, 0, 4631, 118996, 0, 6407, 113737, 6338, 43214, 0, 7570, 0, - 3192, 120330, 8414, 983392, 93983, 195043, 0, 0, 9164, 66612, 93959, - 3171, 6623, 4961, 68396, 886, 55216, 8654, 78832, 9993, 74390, 64603, - 70066, 69241, 9599, 78629, 43084, 78627, 78628, 78625, 2399, 69693, 8994, - 10944, 41208, 983713, 41168, 8178, 74859, 3367, 92334, 42510, 78641, - 78636, 6804, 70475, 1947, 917579, 0, 92681, 42759, 11068, 1705, 9331, 0, - 74798, 9181, 65359, 125065, 8017, 119831, 65096, 66720, 68223, 43475, - 917548, 4909, 12126, 127540, 120696, 4904, 92961, 43503, 1365, 9253, - 42757, 43436, 7462, 127772, 0, 0, 83173, 66845, 64415, 120500, 83172, - 5398, 125035, 127386, 93953, 127362, 983782, 119015, 83171, 127007, 9476, - 983887, 120695, 12763, 126603, 3629, 120844, 13005, 11181, 3628, 0, 0, - 92502, 3469, 42107, 42116, 917578, 64809, 2928, 4905, 9853, 851, 9040, - 120372, 64665, 43086, 9114, 43870, 42583, 9315, 4822, 4906, 3852, 2847, - 119821, 3236, 11317, 1251, 7777, 41852, 11410, 10964, 0, 43222, 12646, - 120269, 10259, 9865, 65821, 75046, 6018, 68293, 125010, 12276, 119110, - 68372, 128255, 92259, 71893, 0, 119828, 10467, 0, 2443, 10918, 78217, - 77947, 1001, 9241, 1927, 0, 124942, 73987, 127882, 71895, 93012, 7992, - 77943, 43939, 12867, 128649, 8260, 77945, 7519, 11505, 12274, 8904, 518, - 65857, 128361, 128674, 13204, 4387, 857, 121252, 65369, 0, 92336, 43125, - 11842, 0, 71072, 121462, 0, 5136, 1968, 128906, 126627, 1337, 64967, - 1629, 0, 796, 66506, 0, 74123, 12877, 120649, 42314, 43388, 43826, 43944, - 6120, 478, 65151, 68128, 128147, 43082, 6016, 0, 42284, 71894, 4276, - 1206, 3619, 41638, 69691, 3843, 12011, 8853, 3361, 0, 490, 10715, 7578, - 68384, 92754, 65350, 10530, 12348, 8653, 68245, 42435, 6154, 9551, 65354, - 78522, 784, 42397, 334, 121084, 42416, 65356, 65273, 43937, 69666, 4442, - 10364, 43935, 778, 41626, 42455, 7989, 74063, 3227, 69907, 43932, 11102, - 2915, 11502, 41022, 41702, 10309, 127035, 75032, 120273, 6975, 0, 5415, - 12176, 983709, 74193, 3462, 43940, 42629, 78691, 71175, 43942, 127256, - 9759, 127255, 70057, 121442, 8114, 78698, 78697, 78696, 78695, 8710, - 42495, 118956, 70189, 4051, 10460, 43364, 71206, 1356, 12161, 42713, - 128857, 127268, 1619, 9703, 43152, 42489, 42112, 64436, 1875, 10808, - 42109, 120284, 41860, 64862, 13305, 64907, 5289, 13144, 128658, 983224, - 5575, 9675, 71129, 5940, 226, 2649, 6336, 983279, 92979, 43236, 3382, - 42449, 6498, 1658, 11936, 78232, 113814, 11269, 10151, 73759, 43100, - 69888, 65508, 983143, 0, 121451, 8935, 78234, 0, 983757, 0, 616, 74753, - 65178, 4684, 78701, 119653, 74631, 126551, 124992, 6048, 74460, 42110, + 41214, 129331, 12299, 101075, 7500, 4506, 7773, 0, 0, 9963, 68649, + 126609, 4040, 120570, 6167, 74519, 63922, 6594, 983740, 113734, 127899, + 3624, 43036, 129472, 6387, 63990, 19947, 63988, 41955, 110592, 63993, + 10440, 9611, 65605, 6803, 120968, 7738, 63986, 11446, 63984, 92641, 3435, + 78164, 43814, 43810, 7029, 64258, 41292, 118898, 12748, 42742, 9517, + 11518, 83292, 78790, 983381, 67993, 63956, 42458, 63954, 63953, 12503, + 9591, 4516, 10217, 68370, 11469, 69697, 42306, 2723, 118947, 0, 92325, + 125067, 68079, 121344, 11397, 2880, 70806, 917829, 2872, 0, 83321, 3498, + 4378, 128743, 4270, 0, 65551, 68205, 6633, 43387, 0, 5230, 194991, 0, + 83322, 126612, 121392, 8161, 393, 12013, 983221, 100509, 119103, 415, + 63964, 63963, 42345, 92310, 5183, 1877, 42498, 0, 2927, 71058, 63961, + 4472, 101054, 0, 78159, 69699, 101055, 42340, 4756, 128078, 7081, 10730, + 7691, 10331, 63830, 83450, 42922, 42103, 8628, 9813, 78654, 42453, 1604, + 9565, 10539, 69701, 65764, 41415, 65767, 100506, 8457, 42301, 11372, + 64873, 11992, 194874, 129306, 63980, 11801, 3622, 128904, 64336, 12017, + 10463, 63981, 4967, 64189, 1966, 43628, 72794, 101060, 83267, 121052, + 63971, 4347, 4416, 42098, 11009, 10694, 63973, 402, 92213, 13147, 128692, + 42100, 64646, 13228, 0, 41875, 3515, 74252, 11805, 983157, 11302, 6259, + 43395, 983373, 83323, 128358, 120836, 92351, 74813, 74425, 11299, 1561, + 118881, 92318, 64942, 93021, 127049, 70411, 78718, 100930, 74301, 68825, + 11280, 128489, 69784, 74060, 128392, 194988, 72752, 5145, 12486, 65018, + 66516, 5409, 127379, 119057, 7402, 5399, 9685, 74089, 7952, 5401, 101053, + 66616, 66832, 92966, 120852, 5405, 127875, 64866, 120965, 119583, 119122, + 2235, 74248, 11330, 129123, 64690, 3254, 983166, 128944, 92696, 42390, + 43678, 101000, 129127, 65077, 129059, 6388, 3355, 9508, 9867, 5723, + 11520, 5611, 83021, 3377, 0, 983845, 74354, 194578, 78228, 983722, + 128368, 42691, 127886, 120948, 68091, 121166, 75023, 1379, 246, 74649, + 983761, 3788, 92520, 11041, 67202, 66304, 0, 121213, 8917, 42403, 301, + 119935, 119826, 127046, 0, 0, 113822, 10656, 125042, 65214, 92987, 42567, + 92217, 13163, 983204, 120831, 74597, 3182, 983607, 983926, 0, 65034, + 65889, 42169, 4755, 74244, 74631, 11443, 983603, 66319, 6841, 608, 600, + 0, 1219, 3934, 64206, 11483, 74510, 119117, 74485, 42442, 65470, 100538, + 64202, 13160, 7759, 42482, 485, 69982, 70505, 9828, 78311, 43505, 42280, + 0, 9351, 7778, 64379, 7496, 42431, 6916, 1208, 0, 119631, 11002, 42470, + 128913, 68315, 983838, 121159, 74041, 83144, 70045, 43539, 5411, 42196, + 0, 0, 128949, 9150, 66831, 42393, 13086, 1310, 66848, 9337, 12052, 10643, + 55271, 72727, 12166, 2546, 194683, 213, 118852, 65611, 83316, 194822, + 100733, 74310, 6554, 83053, 11914, 5452, 983649, 0, 92772, 127544, + 917880, 194681, 92560, 2713, 119564, 9650, 43330, 121033, 128505, 1406, + 125007, 42925, 74638, 125190, 66256, 4143, 128136, 194762, 65748, 4141, + 9682, 65287, 1508, 100533, 8779, 10569, 8725, 13299, 66638, 65750, 42263, + 4145, 6380, 65751, 66613, 43994, 65738, 55250, 9185, 9550, 42932, 43403, + 100623, 100622, 100625, 65736, 41951, 64816, 65756, 72731, 12955, 10596, + 2888, 83190, 0, 121354, 9657, 9019, 121154, 0, 2878, 5390, 100698, + 194961, 67325, 68679, 43552, 7501, 6328, 194960, 10429, 10365, 983631, + 128216, 41946, 7503, 5235, 803, 68381, 0, 100575, 8986, 43838, 10632, + 11934, 11452, 1332, 120709, 194970, 120602, 0, 118887, 1791, 5191, 9288, + 64822, 2892, 83192, 43394, 555, 129418, 128474, 66646, 128327, 119002, + 13151, 74512, 7289, 72739, 64161, 8854, 64162, 5858, 41927, 10582, + 120457, 1784, 1361, 120921, 121516, 7905, 0, 64868, 128813, 13158, 92166, + 7211, 71884, 9371, 73973, 128441, 6828, 1625, 7664, 127809, 1342, 68440, + 64171, 92642, 10903, 983449, 917818, 92527, 129374, 70438, 4482, 41606, + 128934, 125033, 121475, 983854, 64381, 100540, 194974, 100612, 42245, + 100614, 41972, 100616, 444, 100618, 9127, 66687, 66619, 126489, 78025, + 126606, 11349, 40991, 917570, 129132, 70177, 120830, 983450, 1197, + 128282, 1149, 68316, 128010, 983258, 40990, 43765, 121262, 3492, 917906, + 118784, 129026, 129346, 100592, 12838, 67208, 19948, 41677, 3099, 100598, + 100597, 41087, 100599, 0, 983261, 119059, 12036, 41309, 125210, 100603, + 8152, 100605, 41550, 12227, 100545, 100609, 12828, 127511, 75015, 120964, + 120708, 0, 194611, 10386, 75068, 119955, 127303, 92680, 983134, 68154, + 127876, 1743, 194860, 0, 92239, 65186, 917571, 0, 9606, 0, 70052, 64439, + 128864, 68062, 92686, 100585, 100584, 43866, 100586, 100589, 3395, 9362, + 10878, 43260, 0, 78362, 64830, 100866, 125046, 41091, 3426, 1344, 8870, + 121100, 71344, 4735, 11111, 6119, 12822, 42699, 120745, 983824, 74818, + 1423, 128923, 42637, 41080, 983210, 12039, 10559, 128634, 118892, 194910, + 9472, 67734, 11929, 126557, 7170, 9596, 6130, 125268, 43629, 11579, + 71475, 0, 92501, 125081, 78046, 66699, 64440, 1004, 92584, 194736, 43234, + 66008, 12627, 0, 68414, 74614, 43619, 43303, 11300, 43304, 9686, 5890, + 11776, 7558, 70109, 65627, 72876, 10718, 13154, 3461, 9139, 74947, + 983094, 0, 119023, 65365, 73877, 65628, 78019, 119272, 83118, 41708, + 12860, 2641, 12069, 10838, 5403, 10352, 70085, 10061, 43237, 125057, + 5140, 209, 128847, 41704, 41056, 43078, 127789, 118809, 67232, 10899, + 65469, 70125, 100574, 100573, 2410, 993, 83117, 100577, 100580, 78693, + 100560, 100559, 7232, 0, 119253, 124963, 7110, 74462, 2066, 10489, 42166, + 43463, 10659, 3600, 68863, 4224, 1336, 41518, 121311, 0, 917589, 983794, + 41139, 64820, 92538, 12966, 41134, 100553, 100556, 100555, 100558, 272, + 4263, 8793, 983385, 0, 41502, 128133, 983, 12549, 100563, 100562, 1190, + 4109, 1335, 841, 5888, 41358, 64863, 9544, 43481, 0, 120926, 70027, 2099, + 5120, 2409, 7799, 983954, 74424, 983896, 121041, 4731, 92279, 66629, + 128127, 92525, 1255, 4149, 9247, 74977, 9913, 983828, 101027, 64914, + 125002, 65101, 113714, 11694, 92475, 11690, 5835, 127096, 66625, 10842, + 41354, 42123, 43097, 11688, 66634, 1094, 194, 64692, 917900, 8180, + 125055, 983912, 9972, 73865, 4519, 6114, 10898, 43072, 92465, 0, 93960, + 983324, 74055, 10695, 129058, 7540, 0, 881, 7857, 6067, 65164, 917949, + 917897, 128326, 13311, 68403, 41857, 64321, 8359, 83286, 12689, 983312, + 11245, 128105, 983314, 71859, 68183, 983415, 194829, 1287, 5436, 983065, + 71097, 74142, 92328, 74152, 70205, 6051, 10497, 69668, 8985, 12109, + 82962, 127397, 93043, 121013, 0, 3652, 10537, 120282, 1276, 120440, 6549, + 279, 73745, 127823, 128664, 83244, 1489, 120622, 0, 0, 3899, 1007, 42124, + 43828, 42122, 92337, 92367, 125187, 11985, 1345, 78600, 119832, 917563, + 8956, 43083, 94057, 42138, 78610, 129131, 6430, 78608, 78604, 78605, + 6285, 78603, 78612, 78613, 65942, 492, 8685, 128481, 121270, 0, 75027, + 43712, 2582, 11470, 64538, 7444, 72863, 78616, 2297, 129341, 73837, + 119823, 2527, 119824, 197, 2799, 92594, 41944, 83152, 9933, 74011, 66515, + 767, 5524, 7028, 195065, 92168, 119827, 119817, 92950, 78633, 10896, + 63910, 1799, 120497, 6971, 74336, 70731, 0, 65340, 118979, 41551, 2262, + 94018, 118823, 65353, 100479, 4631, 118996, 195027, 6407, 113737, 6338, + 43214, 127163, 7570, 121017, 3192, 120330, 8414, 983388, 93983, 195043, + 0, 0, 9164, 66612, 93959, 3171, 6623, 4961, 68396, 886, 55216, 8654, + 78832, 9993, 74390, 64603, 70066, 69241, 9599, 78629, 43084, 78627, + 78628, 78625, 2399, 69693, 8994, 10944, 41208, 983713, 41168, 8178, + 74859, 3367, 92334, 42510, 78641, 78636, 6804, 70475, 1947, 72770, 0, + 92681, 42759, 11068, 1705, 9331, 0, 74798, 9181, 65359, 72722, 8017, + 119831, 65096, 66720, 68223, 43475, 917548, 4909, 12126, 127540, 101015, + 4904, 92961, 43503, 1365, 9253, 42757, 43436, 7462, 127772, 0, 0, 83173, + 66845, 64415, 120500, 83172, 5398, 125035, 127386, 93953, 127362, 983782, + 119015, 83171, 127007, 9476, 983066, 120695, 12763, 100523, 3629, 120844, + 13005, 11181, 3628, 119834, 0, 92502, 3469, 42107, 42116, 917578, 64809, + 2928, 4905, 9853, 851, 9040, 120372, 64665, 43086, 9114, 43870, 42583, + 9315, 4822, 4906, 3852, 2847, 119821, 3236, 11317, 1251, 7777, 41852, + 11410, 10964, 0, 43222, 12646, 120269, 10259, 9865, 65821, 75046, 6018, + 68293, 125010, 12276, 119110, 68372, 128255, 92259, 71893, 119813, + 119828, 10467, 983814, 2443, 10918, 78217, 77947, 1001, 9241, 1927, 0, + 124942, 73987, 127882, 71895, 93012, 7992, 77943, 43939, 12867, 128649, + 8260, 77945, 7519, 11505, 12274, 8904, 518, 65857, 128361, 128674, 13204, + 4387, 857, 121252, 65369, 0, 92336, 43125, 11842, 0, 71072, 121462, 0, + 5136, 1968, 128906, 126627, 1337, 64967, 1629, 0, 796, 66506, 128442, + 74123, 12877, 120649, 42314, 43388, 43826, 43944, 6120, 478, 65151, + 68128, 119044, 43082, 6016, 0, 42284, 71894, 4276, 1206, 3619, 41638, + 69691, 3843, 12011, 8853, 3361, 83179, 490, 10715, 7578, 68384, 92754, + 65350, 10530, 12348, 8653, 68245, 42435, 6154, 9551, 65354, 78522, 784, + 42397, 334, 72732, 42416, 65356, 65273, 43937, 69666, 4442, 10364, 43935, + 778, 41626, 42455, 7989, 74063, 3227, 69907, 43932, 11102, 2915, 11502, + 41022, 41702, 10309, 127035, 75032, 120273, 6975, 128793, 5415, 12176, + 120653, 74193, 3462, 43940, 42629, 78691, 71175, 43942, 127256, 9759, + 127255, 70057, 121442, 8114, 78698, 78697, 74823, 78695, 8710, 42495, + 118956, 70189, 4051, 10460, 43364, 71206, 1356, 12161, 42713, 128857, + 127268, 1619, 9703, 43152, 42489, 42112, 64436, 1875, 10808, 42109, + 120284, 41860, 64862, 13305, 64907, 5289, 13144, 128658, 983224, 5575, + 9675, 71129, 5940, 226, 2649, 6336, 983279, 65593, 43236, 3382, 42449, + 6498, 1658, 11936, 78232, 100409, 11269, 10151, 73759, 43100, 69888, + 65508, 129411, 0, 121451, 8935, 78234, 129337, 120451, 0, 616, 74753, + 65178, 4684, 78701, 119653, 2236, 126551, 124992, 6048, 74460, 42110, 73965, 10870, 8557, 11054, 68664, 75051, 9681, 4475, 67429, 41142, 2100, - 125024, 120731, 6035, 73796, 7651, 6846, 64443, 983957, 983296, 917987, + 125024, 120731, 6035, 73796, 7651, 6846, 64443, 983957, 194941, 917987, 0, 118966, 74144, 40997, 68488, 10392, 10328, 40998, 43462, 74488, 71182, - 9800, 8979, 0, 13307, 41000, 0, 5114, 6487, 3386, 129094, 10344, 0, 5115, - 5394, 43246, 78243, 5113, 66505, 41200, 128582, 4425, 194669, 0, 0, - 43074, 73799, 129076, 78147, 5112, 12173, 78545, 128771, 66824, 65338, - 983676, 0, 119582, 4474, 128936, 43093, 43964, 1587, 0, 127372, 64475, - 119217, 1369, 983672, 9959, 7927, 43963, 4560, 120793, 67811, 92277, - 983621, 64948, 4430, 43961, 42601, 4514, 66434, 93955, 8194, 65462, - 10626, 10965, 120905, 8893, 983303, 12542, 0, 65341, 67703, 65829, 7925, - 119822, 10475, 113825, 127011, 1352, 11069, 7707, 127560, 126486, 65279, - 127102, 68207, 74956, 7099, 6040, 67681, 10071, 78554, 9336, 43750, - 121074, 8899, 7798, 64474, 64259, 69873, 65188, 7820, 43018, 127082, - 128898, 7746, 1492, 78551, 10884, 75075, 66866, 5127, 11285, 42501, 5495, - 4273, 43095, 41426, 10849, 5730, 2999, 6342, 68636, 74304, 371, 64373, - 6023, 169, 5497, 11708, 75028, 128603, 6323, 129065, 8224, 128417, 8938, - 6043, 12738, 120671, 983076, 5321, 68645, 194798, 120251, 2589, 74332, - 1689, 7802, 4683, 74318, 42704, 92940, 11905, 983615, 0, 128516, 128163, - 74513, 6049, 0, 4027, 834, 118962, 1803, 983822, 1503, 78336, 127173, - 71312, 5731, 1381, 2387, 126610, 70808, 8289, 64525, 65817, 2881, 43142, - 0, 9601, 2879, 9668, 9766, 0, 5729, 129110, 71230, 6036, 64881, 4026, - 9361, 127091, 2887, 70389, 3526, 6298, 119851, 77897, 120095, 78519, - 118964, 8572, 6021, 77896, 128288, 71174, 43155, 0, 71197, 3146, 10959, - 9483, 83219, 77893, 10981, 166, 917841, 8635, 917840, 10623, 408, 119058, - 127507, 13298, 127253, 7426, 41641, 12717, 983795, 7607, 10639, 43396, - 129300, 119089, 41643, 74134, 983054, 8713, 41640, 10221, 41645, 66293, - 6645, 646, 66726, 66711, 42129, 68255, 77901, 3472, 8697, 0, 120936, - 121069, 0, 118859, 0, 5809, 1950, 119356, 92432, 68339, 128943, 42136, - 121440, 0, 0, 0, 3247, 92402, 65017, 128794, 68428, 66668, 0, 121112, - 10983, 0, 128787, 0, 41567, 119852, 0, 0, 78446, 119853, 127922, 0, 8285, - 126516, 4509, 121043, 66471, 12216, 128806, 40988, 83221, 74809, 41727, - 0, 42848, 2396, 128083, 194892, 74018, 917538, 64940, 7027, 3886, 0, + 9800, 8979, 119156, 13307, 41000, 0, 5114, 6487, 3386, 70730, 10344, + 125032, 5115, 5394, 43246, 78243, 5113, 66505, 41200, 128582, 4425, + 194669, 100405, 0, 43074, 73799, 129076, 78147, 5112, 12173, 3446, + 128771, 66824, 65338, 128969, 0, 119582, 4474, 128936, 43093, 6282, 1587, + 0, 100554, 64475, 119217, 1369, 983672, 9959, 7927, 43963, 4560, 66910, + 67811, 92277, 120614, 64948, 4430, 43961, 42601, 4514, 66434, 93955, + 8194, 65462, 10626, 10965, 120905, 8893, 983303, 12542, 194857, 65341, + 67703, 65829, 7925, 119822, 10475, 113825, 127011, 1352, 11069, 7707, + 127560, 126486, 65279, 100407, 68207, 74956, 7099, 6040, 67681, 10071, + 78554, 9336, 43750, 121074, 8899, 7798, 64474, 64259, 69873, 65188, 7820, + 43018, 100410, 128898, 7746, 1492, 78551, 10884, 75075, 66866, 5127, + 11285, 42501, 5495, 4273, 43095, 41426, 10849, 5730, 2999, 6342, 68636, + 74304, 371, 64373, 6023, 169, 5497, 11708, 75028, 128603, 6323, 129065, + 8224, 128417, 8938, 6043, 12738, 120671, 983076, 5321, 68645, 6553, + 120251, 2589, 74332, 1689, 7802, 4683, 74318, 42704, 92940, 11905, + 983615, 0, 128516, 127017, 74513, 6049, 128239, 4027, 834, 118962, 1803, + 128120, 1503, 72769, 127173, 71312, 5731, 1381, 2387, 126610, 70808, + 8289, 64525, 65817, 2881, 43142, 0, 9601, 2879, 9668, 9766, 0, 5729, + 129110, 71230, 6036, 64881, 4026, 9361, 127091, 2887, 70389, 3526, 6298, + 119851, 77897, 120095, 78519, 118964, 8572, 6021, 77896, 128288, 71174, + 43155, 983816, 71197, 3146, 10959, 9483, 83219, 77893, 10981, 166, + 917841, 8635, 128714, 10623, 408, 100480, 127507, 13298, 126518, 7426, + 41641, 12717, 120658, 7607, 10639, 43396, 129300, 119053, 41643, 74134, + 983054, 8713, 41640, 10221, 9852, 66293, 6645, 646, 66726, 66711, 42129, + 68255, 77901, 3472, 8697, 0, 120936, 121069, 129168, 118859, 125203, + 5809, 1950, 119356, 92432, 68339, 128943, 42136, 121440, 0, 0, 0, 3247, + 92402, 65017, 128794, 68428, 66668, 194884, 121112, 10983, 917767, + 128700, 0, 41567, 119852, 0, 0, 78446, 119853, 127907, 0, 8285, 126516, + 4509, 121043, 66471, 12216, 128806, 40988, 83221, 74809, 41727, 917825, + 42848, 2396, 128083, 194892, 74018, 917538, 64940, 7027, 3886, 983259, 42457, 92888, 83299, 996, 68123, 94058, 4249, 92410, 69650, 11707, 8222, - 73825, 7939, 71213, 92460, 127801, 121408, 128359, 8534, 69853, 40983, 0, - 121421, 0, 7201, 12561, 120866, 42371, 12558, 1540, 917549, 10052, 40982, - 119841, 0, 1488, 71177, 0, 194831, 917559, 128401, 0, 1563, 128034, 9619, - 120840, 917905, 120954, 127872, 71363, 3560, 7797, 6070, 10006, 128922, - 2922, 6082, 70147, 65009, 983942, 12567, 66712, 0, 41412, 128131, 119591, - 3607, 9200, 10046, 9612, 42153, 8218, 9485, 0, 2032, 78354, 83462, - 119131, 0, 0, 67826, 43085, 6057, 508, 93968, 92989, 67968, 0, 92198, 0, - 128831, 638, 6083, 119072, 124950, 0, 2305, 78348, 68096, 917772, 6056, - 6659, 67969, 983290, 6085, 0, 0, 3915, 41634, 0, 41639, 63912, 11941, - 983783, 4028, 1787, 42180, 43096, 43753, 3249, 1768, 93982, 12328, 501, - 93985, 10601, 0, 583, 0, 41977, 0, 66004, 66416, 6505, 74010, 983250, - 13064, 55267, 119113, 6500, 5526, 65049, 0, 12990, 0, 92376, 12745, 9678, - 121108, 120587, 9869, 83150, 1771, 128965, 8936, 92964, 0, 4208, 78341, - 78567, 78342, 67742, 983208, 74101, 128605, 11762, 0, 70096, 6835, 68010, - 66475, 120260, 5027, 78172, 128878, 119830, 5069, 73736, 5028, 9897, - 92774, 73739, 5026, 983255, 68639, 6331, 10079, 8931, 0, 1415, 8866, - 41901, 74790, 78138, 119361, 983564, 43106, 5029, 65309, 1580, 3598, - 68424, 41070, 77903, 7658, 3440, 78215, 1562, 128656, 127175, 119358, - 1716, 983679, 10600, 78558, 620, 41001, 6028, 70445, 42892, 0, 71116, - 5024, 74945, 41003, 68137, 5025, 69892, 983209, 75039, 118885, 127956, + 73825, 7939, 71213, 92460, 72747, 67131, 128359, 8534, 69853, 40983, 0, + 121421, 0, 7201, 12561, 120866, 42371, 11844, 1540, 194827, 10052, 40982, + 119841, 0, 1488, 71177, 0, 194831, 917559, 128401, 194920, 1563, 128034, + 9619, 120840, 129416, 120954, 121460, 71363, 3560, 7797, 6070, 10006, + 128922, 2922, 6082, 70147, 65009, 983942, 12567, 66712, 0, 41412, 78651, + 119591, 3607, 9200, 10046, 9612, 42153, 8218, 9485, 66764, 2032, 78354, + 83462, 119131, 0, 0, 67826, 43085, 6057, 508, 93968, 92989, 67968, + 917941, 92198, 0, 128831, 638, 6083, 119072, 124950, 70144, 2305, 78348, + 68096, 917772, 6056, 6659, 67969, 983290, 6085, 0, 0, 3915, 41634, + 128227, 41639, 63912, 11941, 983783, 4028, 1787, 42180, 43096, 43753, + 3249, 1768, 93982, 12328, 501, 93985, 10601, 983294, 583, 119352, 41977, + 0, 66004, 66416, 6505, 74010, 917833, 13064, 55267, 119113, 6500, 5526, + 65049, 128028, 12990, 983901, 92376, 12745, 9678, 121108, 120587, 9869, + 83150, 1771, 128965, 8936, 92964, 125273, 4208, 78341, 78567, 78342, + 67742, 983208, 74101, 128605, 11762, 129317, 70096, 6835, 68010, 66475, + 120260, 5027, 78172, 128878, 119830, 5069, 73736, 5028, 9897, 92774, + 73739, 5026, 983255, 68639, 6331, 10079, 8931, 0, 1415, 8866, 41901, + 74790, 78138, 119361, 983564, 43106, 5029, 65309, 1580, 3598, 68424, + 41070, 77903, 7658, 3440, 78215, 1562, 128656, 127175, 119358, 1716, + 983679, 10600, 78558, 620, 41001, 6028, 70445, 42892, 983313, 71116, + 5024, 74945, 41003, 68137, 5025, 7297, 917824, 75039, 118885, 127956, 65557, 0, 74541, 128924, 11599, 128209, 11602, 6243, 11574, 11581, 11597, 11598, 6253, 6105, 11584, 70273, 11569, 65275, 8906, 43945, 5755, 2636, 71203, 10815, 11619, 2301, 41540, 7815, 11616, 6979, 12080, 7721, 11604, - 7869, 1592, 0, 42152, 78498, 41048, 917763, 829, 0, 92406, 19950, 66886, - 64131, 6616, 0, 118875, 10953, 391, 0, 69785, 482, 42296, 11588, 0, - 43606, 71185, 68397, 66370, 74282, 42335, 69786, 72421, 82998, 7538, - 5315, 83367, 42491, 92901, 42061, 128002, 4576, 0, 68417, 43809, 4277, 0, - 3563, 64472, 42338, 368, 42058, 3960, 11043, 11337, 78209, 120244, 63989, - 3958, 12132, 1849, 0, 9921, 42451, 4253, 41147, 42064, 11959, 42404, - 41160, 121481, 3618, 78338, 194924, 43300, 5156, 92629, 70350, 929, 6827, - 42035, 42437, 1555, 0, 8691, 66435, 2215, 41662, 94010, 119262, 0, - 128824, 93952, 4578, 64513, 41664, 983734, 42578, 71049, 41661, 78351, - 43267, 9356, 0, 194880, 983401, 1286, 10166, 983117, 0, 64707, 128925, - 42476, 7730, 11156, 128522, 42483, 129083, 74940, 42324, 42291, 10020, - 43359, 0, 6641, 525, 41627, 917923, 8763, 128304, 41628, 533, 11931, - 65225, 8321, 42504, 42581, 0, 6915, 42310, 4377, 8559, 128321, 8587, - 121318, 13193, 64350, 11666, 8679, 41924, 1576, 7735, 92398, 0, 73840, - 83153, 11374, 78043, 10889, 43461, 7757, 42462, 120226, 10029, 66493, - 2718, 4168, 43904, 13308, 120112, 0, 1179, 4440, 43902, 77948, 363, - 11015, 43903, 77944, 43857, 83049, 66692, 120826, 0, 66492, 6593, 64625, - 41963, 92177, 119329, 0, 10013, 64434, 75010, 127095, 9492, 11782, 64382, - 12833, 77830, 0, 1297, 41630, 630, 120960, 983923, 120774, 70165, 1043, - 43652, 66223, 10090, 0, 124945, 313, 121483, 41881, 194658, 42311, 7445, - 43906, 5750, 10759, 9419, 55222, 9405, 11268, 42919, 9398, 8526, 9399, - 9422, 43894, 66495, 69990, 983885, 92990, 41718, 10707, 1603, 983703, - 119003, 0, 631, 77952, 69703, 13161, 65272, 71067, 10546, 74210, 78101, - 11600, 77961, 2797, 43924, 42427, 306, 714, 3058, 42381, 77962, 127080, - 12351, 42395, 0, 11607, 127528, 11198, 66821, 77967, 9157, 73765, 66364, - 42433, 77964, 7603, 12803, 180, 42141, 0, 120612, 66494, 12674, 8244, - 362, 92439, 43890, 8037, 43777, 11535, 126539, 43893, 5185, 7165, 5521, - 10334, 2093, 71329, 10302, 125131, 10104, 1027, 5181, 128435, 5117, - 10523, 1446, 42320, 6845, 991, 5189, 42472, 41647, 120105, 1722, 5581, - 42898, 3405, 0, 194644, 5523, 43915, 42620, 92447, 74943, 9549, 0, 10549, - 43923, 9661, 42933, 74884, 77910, 78068, 43921, 0, 71184, 983070, 41991, - 983893, 0, 7630, 9846, 7684, 10350, 128453, 1174, 77981, 42733, 77978, - 77980, 66485, 77977, 42277, 77974, 42456, 43909, 74438, 12330, 128272, 0, - 42417, 42383, 66630, 41344, 6293, 0, 66252, 43908, 74443, 127894, 10209, - 8313, 4195, 74435, 1316, 66690, 75072, 6332, 64894, 983156, 65871, 67250, - 1736, 983684, 3901, 12228, 120151, 65200, 3383, 10446, 78241, 693, 9130, - 314, 64149, 42420, 11949, 127200, 120152, 11026, 120516, 5332, 6940, - 64154, 12635, 124980, 42706, 1751, 273, 8165, 13166, 83307, 78840, 71368, - 12824, 43911, 4528, 5320, 6301, 43662, 6133, 9339, 9463, 42346, 10922, - 64560, 3757, 0, 0, 74302, 65869, 73760, 2569, 74976, 2326, 65740, 2565, - 42459, 7596, 7921, 983868, 73862, 127981, 41848, 2567, 66006, 92622, - 4044, 92646, 43953, 12233, 983871, 1023, 474, 194940, 119818, 0, 0, + 7869, 1592, 0, 42152, 78498, 41048, 126466, 829, 0, 92406, 19950, 66886, + 64131, 6616, 120796, 118875, 10953, 391, 983103, 69785, 482, 42296, + 11588, 128591, 43606, 71185, 68397, 66370, 74282, 42335, 69786, 12050, + 82998, 7538, 5315, 83367, 42491, 92901, 42061, 128002, 4576, 0, 68417, + 43809, 4277, 0, 3563, 64472, 42338, 368, 42058, 3960, 11043, 11337, + 78209, 120244, 63989, 3958, 12132, 1849, 127338, 9921, 42451, 4253, + 41147, 42064, 11959, 42404, 41160, 121481, 3618, 78338, 93956, 43300, + 5156, 92629, 70350, 929, 6827, 42035, 42437, 1555, 67847, 8691, 66435, + 2215, 41662, 94010, 119262, 0, 128824, 93952, 4578, 64513, 41664, 983734, + 42578, 71049, 41661, 78351, 43267, 9356, 0, 194880, 983401, 1286, 10166, + 983117, 0, 64707, 128925, 42476, 7730, 11156, 128522, 42483, 129083, + 74940, 42324, 42291, 10020, 43359, 72827, 6641, 525, 41627, 917923, 8763, + 128304, 41628, 533, 11931, 65225, 8321, 42504, 42581, 0, 6915, 42310, + 4377, 8559, 128321, 8587, 121318, 13193, 64350, 11666, 8679, 41924, 1576, + 7735, 92398, 0, 73840, 83153, 11374, 78043, 10889, 43461, 7757, 42462, + 120226, 10029, 66493, 2718, 4168, 43904, 13308, 120112, 0, 1179, 4440, + 43902, 77948, 363, 11015, 43903, 77944, 43857, 83049, 66692, 120826, 0, + 66492, 6593, 64625, 41963, 92177, 119329, 113794, 10013, 64434, 75010, + 127095, 9492, 11782, 9212, 12833, 77830, 70692, 1297, 41630, 630, 120960, + 983923, 120774, 70165, 1043, 43652, 66223, 10090, 125249, 124945, 313, + 121483, 41881, 194575, 42311, 7445, 43906, 5750, 10759, 9419, 55222, + 9405, 11268, 42919, 9398, 8526, 9399, 9422, 43894, 66495, 69990, 983885, + 92990, 41718, 10707, 1603, 983703, 119003, 101061, 631, 77952, 69703, + 13161, 65272, 71067, 10546, 74210, 78101, 11600, 77961, 2797, 43924, + 42427, 306, 714, 3058, 42381, 77962, 127080, 12351, 42395, 0, 11607, + 127528, 11198, 66821, 77967, 9157, 73765, 66364, 42433, 77964, 7603, + 12803, 180, 42141, 0, 120612, 66494, 12674, 8244, 362, 92439, 43890, + 8037, 43777, 11535, 126539, 43893, 5185, 7165, 5521, 10334, 2093, 71329, + 10302, 125131, 10104, 1027, 5181, 128435, 5117, 10523, 1446, 42320, 6845, + 991, 5189, 42472, 41647, 120105, 1722, 5581, 42898, 3405, 0, 194644, + 5523, 43915, 42620, 92447, 74943, 9549, 0, 10549, 43923, 9661, 42933, + 74884, 77910, 78068, 43921, 0, 71184, 983070, 41991, 129369, 0, 7630, + 9846, 7684, 10350, 128453, 1174, 77981, 42733, 77978, 77980, 66485, + 77977, 42277, 77974, 42456, 43909, 74438, 12330, 128272, 0, 42417, 42383, + 66630, 3407, 6293, 0, 66252, 43908, 74443, 127894, 10209, 8313, 4195, + 74435, 1316, 66690, 75072, 6332, 64894, 983156, 65871, 67250, 1736, + 121006, 3901, 12228, 120151, 65200, 3383, 10446, 78241, 693, 9130, 314, + 64149, 42420, 11949, 127200, 120152, 11026, 120516, 5332, 6940, 64154, + 12635, 124980, 42706, 1751, 273, 8165, 13166, 83307, 78840, 71368, 12824, + 43911, 4528, 5320, 6301, 43662, 6133, 9339, 9463, 42346, 10922, 64560, + 3757, 0, 94059, 74302, 65869, 73760, 2569, 74976, 2326, 65740, 2565, + 42459, 7596, 7921, 126567, 73862, 127981, 41848, 2567, 66006, 92622, + 4044, 92646, 43953, 12233, 113814, 1023, 474, 125272, 119818, 983744, 0, 42487, 65556, 121168, 127866, 42295, 128203, 121474, 71322, 92518, 2222, - 66499, 0, 5417, 12275, 10895, 0, 274, 0, 1858, 983455, 0, 55251, 10118, - 3133, 127771, 71857, 121201, 9610, 8068, 8197, 917545, 699, 0, 41665, - 5868, 128710, 92695, 42182, 7581, 19940, 43668, 41667, 128057, 0, 1923, - 65583, 65802, 93970, 64597, 43444, 78129, 68751, 0, 6464, 7036, 2996, - 1937, 983751, 68481, 41835, 4047, 41842, 0, 64107, 77965, 119837, 11017, - 120601, 0, 293, 77966, 92169, 64791, 41827, 42466, 43422, 10579, 8560, - 71350, 65413, 77963, 4803, 12964, 1739, 1941, 3900, 128967, 1713, 77969, - 121292, 73957, 11407, 42441, 41971, 6297, 120098, 64105, 120565, 42481, - 11716, 66473, 7179, 42289, 125095, 64103, 969, 0, 9352, 71481, 6165, - 64100, 917819, 6632, 73861, 42402, 74327, 7806, 113762, 8914, 66908, - 124954, 3183, 1435, 64876, 2969, 6046, 64441, 6208, 67849, 5746, 66408, - 0, 64416, 42422, 83506, 983046, 7082, 73775, 338, 5059, 121369, 83524, - 42328, 10767, 128862, 8115, 83454, 74758, 0, 8227, 2073, 1218, 917790, - 983230, 65848, 92884, 83517, 69863, 128328, 126987, 4486, 128082, 917796, - 0, 10925, 0, 83515, 83507, 124952, 42309, 10257, 65191, 10273, 7668, - 10305, 42461, 74882, 42349, 8832, 78051, 64127, 10644, 42662, 78828, - 42278, 74451, 126988, 69874, 7794, 119214, 42429, 6377, 42316, 119026, - 3669, 3968, 42468, 71319, 69658, 0, 65402, 119581, 194973, 128747, 64933, - 194627, 41960, 6699, 42903, 128755, 125013, 6823, 42391, 1588, 43502, - 8409, 78223, 19967, 65398, 787, 71315, 128335, 127744, 6115, 2078, 41654, - 42480, 917949, 92650, 41655, 65401, 43975, 72427, 0, 113816, 644, 65500, - 41657, 10778, 3659, 9533, 184, 1553, 13107, 65484, 69648, 10502, 66296, - 0, 0, 41554, 0, 8220, 128432, 41557, 0, 128938, 11070, 119221, 5157, - 4020, 73858, 41555, 9514, 64818, 65103, 64641, 64303, 78131, 7520, 73888, - 74377, 11029, 66651, 983068, 128492, 118930, 64527, 121395, 7877, 12723, - 983798, 68776, 120096, 74602, 9955, 119557, 4055, 42817, 0, 65212, 11715, - 12190, 12319, 78630, 0, 78631, 9502, 65427, 125048, 65424, 12607, 120966, - 9734, 65425, 0, 121431, 127357, 74890, 78836, 10112, 10827, 194635, 9866, - 74527, 66675, 118867, 8625, 64346, 11290, 10477, 67738, 8636, 983927, - 8315, 65444, 983793, 195011, 74595, 6152, 78820, 73947, 6629, 125056, - 120171, 0, 74589, 43993, 128346, 69790, 64435, 64955, 43690, 11046, - 11490, 42730, 4485, 71126, 128194, 64926, 0, 983133, 43830, 5869, 12437, - 42728, 0, 7040, 3588, 0, 12825, 121158, 0, 12725, 74092, 127106, 78634, + 66499, 129336, 5417, 12275, 10895, 0, 274, 983226, 1858, 983455, 0, + 55251, 10118, 3133, 126498, 71857, 121201, 9610, 8068, 8197, 917545, 699, + 0, 41665, 5868, 128710, 92695, 42182, 7581, 19940, 43668, 41667, 128057, + 0, 1923, 65583, 65802, 93970, 64597, 43444, 78129, 68751, 917836, 6464, + 7036, 2996, 1937, 127050, 68481, 41835, 4047, 41842, 0, 64107, 77965, + 119837, 11017, 120601, 983169, 293, 77966, 92169, 64791, 41827, 42466, + 43422, 10579, 8560, 71350, 65413, 77963, 4803, 12964, 1739, 1941, 3900, + 128967, 1713, 77969, 94017, 73957, 11407, 42441, 41971, 6297, 120098, + 64105, 120565, 42481, 11716, 66473, 7179, 42289, 125095, 64103, 969, 0, + 9352, 71481, 6165, 64100, 917819, 6632, 72828, 42402, 74327, 7806, + 113762, 8914, 66908, 124954, 3183, 1435, 64876, 2969, 6046, 64441, 6208, + 67849, 5746, 66408, 127402, 64416, 42422, 83506, 983046, 7082, 73775, + 338, 5059, 121369, 83524, 42328, 10767, 128862, 8115, 83454, 74758, 0, + 8227, 2073, 1218, 917790, 983230, 65848, 92884, 83517, 69863, 128328, + 126987, 4486, 119973, 917796, 0, 10925, 0, 83515, 83507, 124952, 42309, + 10257, 65191, 10273, 7668, 10305, 42461, 74882, 42349, 8832, 78051, + 64127, 10644, 42662, 78828, 42278, 74451, 126988, 69874, 7794, 119214, + 42429, 6377, 42316, 119026, 3669, 3968, 42468, 71319, 69658, 128170, + 65402, 119581, 194973, 128747, 64933, 194627, 41960, 6699, 42903, 128755, + 125013, 6823, 42391, 1588, 43502, 8409, 78223, 19967, 65398, 787, 71315, + 121145, 127744, 6115, 2078, 41654, 42480, 129031, 92650, 41655, 65401, + 43975, 72427, 0, 113816, 644, 65500, 41657, 10778, 3659, 9533, 184, 1553, + 13107, 65484, 69648, 10502, 66296, 0, 0, 41554, 0, 8220, 128432, 41557, + 983882, 128938, 11070, 119221, 5157, 4020, 73858, 41555, 9514, 64818, + 65103, 64641, 64303, 78131, 7520, 73888, 74377, 11029, 66651, 127346, + 128492, 118930, 64527, 121395, 7877, 12723, 983798, 68776, 120096, 73954, + 9955, 119557, 4055, 42817, 0, 65212, 11715, 12190, 12319, 78630, 71270, + 78631, 9502, 65427, 125048, 65424, 12607, 120966, 9734, 65425, 92207, + 78834, 127357, 74890, 72822, 3448, 10827, 194635, 9866, 74527, 66675, + 118867, 8625, 64346, 11290, 10477, 67738, 8636, 983927, 8315, 65444, + 983793, 195011, 74595, 6152, 78820, 73947, 6629, 125056, 120171, 0, + 74589, 43993, 128346, 69790, 64435, 64955, 43690, 11046, 11490, 42730, + 4485, 71126, 126588, 64926, 120168, 983133, 43830, 5869, 12437, 42728, 0, + 7040, 3588, 63797, 12825, 121158, 72864, 12725, 74092, 127106, 78634, 223, 78635, 69675, 120119, 42444, 128449, 64499, 65245, 129104, 1171, 128802, 69717, 120113, 1805, 8772, 43820, 0, 9930, 65247, 78619, 74954, 2338, 120032, 118853, 0, 42676, 0, 64800, 13092, 11185, 68126, 1213, 128419, 64075, 797, 64074, 8734, 4212, 83005, 64387, 4115, 71331, 5005, 64070, 64073, 10679, 83000, 77954, 9402, 64276, 426, 83358, 83010, 8251, - 10136, 65436, 0, 2120, 43302, 1224, 0, 65576, 70795, 10701, 1764, 3101, - 127815, 12858, 120159, 120101, 11373, 6378, 71093, 120103, 8663, 9312, - 41644, 4539, 2129, 70785, 9222, 121479, 118907, 4259, 9092, 74567, 41961, - 128515, 12724, 66357, 42331, 64935, 0, 0, 1293, 7947, 2132, 983767, - 71858, 72440, 2454, 42717, 3613, 128837, 71117, 0, 65888, 8816, 10978, - 10840, 0, 10668, 113723, 43087, 12595, 120304, 983114, 8822, 0, 1157, - 64903, 8638, 127265, 917886, 127905, 0, 69848, 8235, 120316, 4405, 10086, - 120247, 11128, 69216, 121065, 65430, 71321, 6079, 6817, 10764, 120314, - 64291, 120315, 998, 120312, 11062, 1317, 64327, 1558, 194572, 1991, 7882, - 42254, 128954, 41700, 530, 0, 10428, 119335, 12002, 119336, 5742, 43076, - 4692, 64630, 41823, 4007, 5004, 74033, 7896, 751, 6595, 6596, 120325, - 66373, 983249, 128746, 64908, 92691, 6311, 93019, 12004, 119192, 12049, - 43108, 120326, 71083, 41705, 92188, 6598, 121298, 6599, 66822, 93031, - 42148, 118825, 66027, 121055, 6597, 9412, 8340, 11824, 64745, 2281, - 69904, 128495, 1988, 5407, 67865, 2430, 41678, 93059, 83114, 2336, - 983903, 0, 67169, 120442, 127092, 1921, 10947, 19927, 70390, 65406, - 983464, 19913, 4284, 13217, 0, 43789, 12841, 9229, 10956, 42285, 41674, - 19964, 41679, 65084, 3521, 124957, 5774, 8325, 69864, 65403, 983089, - 1854, 10794, 93054, 67660, 69846, 194765, 78359, 5280, 0, 4344, 12905, - 65433, 6076, 64793, 41610, 768, 12074, 442, 0, 68162, 64081, 12934, - 41682, 65432, 41693, 0, 6071, 65434, 127467, 4804, 4053, 0, 127469, - 194653, 41696, 467, 69823, 127463, 69797, 121403, 121294, 8421, 127472, - 69682, 43705, 502, 75029, 65431, 119056, 69954, 12043, 1303, 316, 7364, - 2029, 2136, 119246, 11533, 64365, 43480, 92639, 4860, 70372, 127877, - 42488, 70339, 9583, 128849, 5546, 8019, 73856, 983840, 124960, 120839, - 5544, 2355, 12150, 65725, 5543, 75034, 63751, 12137, 5548, 77985, 0, - 65727, 68388, 65726, 6077, 128352, 65452, 0, 11301, 11214, 65952, 78010, - 9874, 78007, 983115, 1319, 3050, 65410, 67399, 92606, 78016, 78017, - 42830, 43996, 66716, 83050, 4691, 92242, 9345, 621, 83512, 128222, 0, - 65411, 0, 41182, 73881, 65408, 73899, 78024, 9474, 10545, 119118, 10887, - 3786, 65409, 8894, 43179, 71042, 7923, 3716, 92363, 9996, 8508, 127794, - 7012, 8195, 127834, 9566, 0, 3722, 983374, 41707, 8493, 545, 9575, 41379, - 10050, 12718, 69854, 8859, 6820, 74345, 65110, 120740, 128978, 55282, - 9119, 2787, 7920, 70091, 4021, 2012, 7985, 0, 119663, 917792, 0, 78021, - 78022, 410, 78020, 1802, 78018, 74107, 74895, 41659, 41671, 1827, 0, - 64396, 10126, 12116, 41673, 120370, 11422, 71846, 120373, 3860, 120367, - 68412, 41345, 120362, 120363, 11748, 42158, 7941, 11076, 8749, 120361, - 2104, 64858, 361, 120357, 845, 92174, 41560, 11970, 4562, 128473, 2926, - 68495, 4569, 74130, 128659, 43487, 194630, 611, 74129, 64871, 118891, - 65629, 0, 194858, 74854, 0, 70466, 67392, 66385, 71439, 6291, 0, 68487, - 41669, 7094, 121051, 0, 120999, 74054, 127754, 128917, 0, 839, 121315, - 7695, 8769, 65246, 4829, 67756, 4859, 64467, 0, 83525, 118998, 7206, - 119636, 6647, 43986, 83518, 69766, 194664, 64764, 4210, 128300, 127936, - 804, 83520, 0, 12298, 70344, 66653, 126983, 64924, 10091, 67200, 9468, + 10136, 65436, 100862, 2120, 43302, 1224, 0, 65576, 70795, 10701, 1764, + 3101, 125192, 12858, 74767, 120101, 11373, 6378, 71093, 120103, 8663, + 9312, 41644, 4539, 2129, 70785, 9222, 121479, 118907, 4259, 9092, 74567, + 41961, 121361, 12724, 66357, 42331, 64935, 72867, 120582, 1293, 7947, + 2132, 983767, 71858, 72440, 2454, 42717, 3613, 128837, 71117, 0, 65888, + 8816, 10978, 10840, 0, 10668, 72826, 43087, 12595, 120304, 983114, 8822, + 0, 1157, 64903, 8638, 127265, 129106, 120669, 100399, 69848, 8235, + 120316, 4405, 10086, 120247, 11128, 69216, 121065, 65430, 71321, 6079, + 6817, 10764, 120314, 64291, 120315, 998, 120312, 11062, 1317, 64327, + 1558, 194572, 1991, 7882, 42254, 128954, 41700, 530, 0, 10428, 119335, + 12002, 119336, 5742, 43076, 4692, 64630, 41823, 4007, 5004, 74033, 7896, + 751, 6595, 6596, 120325, 66373, 129066, 128746, 64908, 92691, 6311, + 93019, 12004, 119192, 12049, 43108, 120326, 71083, 41705, 92188, 6598, + 121298, 6599, 66822, 93031, 42148, 118825, 66027, 121055, 6597, 9412, + 8340, 11824, 64745, 2281, 69904, 128495, 1988, 5407, 67865, 2430, 41678, + 93059, 83114, 2336, 983903, 0, 67169, 120442, 127092, 1921, 10947, 19927, + 70390, 65406, 983464, 19913, 4284, 13217, 0, 43789, 12841, 9229, 10956, + 42285, 41674, 19964, 41679, 65084, 3521, 124957, 5774, 8325, 69864, + 65403, 983089, 1854, 10794, 93054, 67660, 69846, 194765, 78359, 5280, 0, + 4344, 12905, 65433, 6076, 64793, 41610, 768, 12074, 442, 0, 68162, 64081, + 12934, 41682, 65432, 41693, 983434, 6071, 65434, 119008, 4804, 4053, + 120237, 127469, 194653, 41696, 467, 69823, 127463, 69797, 120043, 121294, + 8421, 127472, 69682, 43705, 502, 75029, 65431, 119056, 69954, 12043, + 1303, 316, 7364, 2029, 2136, 119246, 11533, 64365, 43480, 92639, 4860, + 70372, 127877, 42488, 70339, 9583, 128849, 5546, 8019, 73856, 128194, + 124960, 120839, 5544, 2355, 12150, 65725, 5543, 75034, 63751, 12137, + 5548, 77985, 983555, 10007, 68388, 65726, 6077, 128352, 65452, 100391, + 11301, 11214, 65952, 78010, 9874, 78007, 194732, 1319, 3050, 65410, + 67399, 92606, 78016, 78017, 42830, 43996, 66716, 83050, 4691, 92242, + 9345, 621, 83512, 128222, 122889, 65411, 917541, 41182, 73881, 65408, + 73899, 78024, 9474, 10545, 119118, 10887, 3786, 65409, 8894, 43179, + 71042, 7923, 3716, 92363, 9996, 8508, 127794, 7012, 8195, 127834, 9566, + 119867, 3722, 983374, 41707, 8493, 545, 9575, 41379, 10050, 12718, 69854, + 8859, 6820, 74345, 65110, 120740, 128978, 55282, 9119, 2787, 7920, 70091, + 4021, 2012, 7985, 78093, 119663, 917792, 983951, 78021, 78022, 410, + 78020, 1802, 78018, 74107, 74895, 41659, 41671, 1827, 0, 64396, 10126, + 12116, 41673, 68524, 11422, 71846, 120373, 3860, 120367, 68412, 41345, + 120362, 120363, 11748, 42158, 7941, 11076, 8749, 120361, 2104, 64858, + 361, 120357, 845, 92174, 41560, 11970, 4562, 128473, 2926, 68495, 4569, + 74130, 128659, 43487, 194630, 611, 74129, 64871, 100909, 65629, 0, + 194858, 74854, 66750, 70466, 67392, 66385, 71439, 6291, 0, 68487, 41669, + 7094, 121051, 121408, 119041, 74054, 127754, 128917, 0, 839, 121315, + 7695, 8769, 65246, 4829, 67756, 4859, 64467, 983461, 83525, 118998, 7206, + 119636, 6647, 43986, 72738, 69766, 194664, 64764, 4210, 128300, 127936, + 804, 66746, 0, 12298, 70344, 66653, 126983, 64924, 10091, 67200, 9468, 67206, 67205, 67204, 67203, 92503, 12839, 64669, 92202, 71851, 1279, - 1425, 6224, 119229, 11049, 127123, 71480, 42649, 8482, 92440, 0, 5032, - 67209, 11940, 67207, 664, 120437, 5034, 92495, 70200, 127525, 42702, - 70194, 93061, 13294, 67873, 64869, 6032, 67218, 9115, 7430, 77837, 70191, - 120819, 68387, 120168, 73913, 120170, 41161, 5518, 4174, 10993, 41162, - 77836, 64528, 1169, 434, 41437, 1905, 6034, 41164, 64744, 9528, 67741, - 128800, 524, 0, 74029, 788, 74027, 194667, 71881, 0, 1663, 10419, 42901, - 42636, 67211, 67210, 129147, 120656, 67215, 67214, 67213, 67212, 0, - 67897, 74039, 0, 0, 11395, 0, 119107, 43612, 64344, 194732, 0, 10855, - 5445, 9355, 67221, 65198, 7391, 8989, 221, 65686, 983874, 119238, 8010, - 7191, 4962, 69772, 8855, 74612, 70820, 64469, 92592, 10555, 67227, 43333, - 67225, 128483, 120427, 10451, 67229, 67653, 7245, 12443, 74405, 9947, - 120149, 78317, 3873, 8367, 77842, 120146, 43433, 43649, 11987, 83343, - 983581, 11010, 11164, 74059, 74062, 6217, 5896, 43846, 7682, 74049, 1462, - 10235, 0, 0, 983325, 43441, 127924, 127777, 42595, 126641, 74402, 118860, - 78661, 120419, 92497, 66287, 120420, 92378, 120549, 119082, 64295, - 120418, 0, 64765, 73923, 83210, 120662, 69920, 194702, 6216, 67230, - 10755, 9455, 11155, 8124, 127042, 9470, 6944, 121125, 0, 69680, 2828, 0, - 531, 42638, 194804, 917856, 120961, 43428, 8204, 3614, 2827, 9696, - 120365, 0, 8728, 4354, 10904, 78562, 19936, 7833, 120691, 120850, 42599, - 42597, 42709, 68829, 125012, 0, 8537, 127306, 0, 9354, 121244, 121348, - 41199, 10121, 2028, 74950, 120253, 69715, 128525, 3062, 0, 74447, 12608, - 983657, 66440, 7545, 9700, 11948, 92205, 120777, 120502, 41155, 68306, - 74071, 0, 983459, 12713, 127519, 70402, 0, 78772, 113770, 1734, 0, 78141, - 127040, 64594, 2456, 231, 68227, 74167, 542, 917981, 118786, 983859, - 194797, 1230, 125018, 121343, 3597, 4446, 10584, 74235, 92215, 4037, - 67737, 8352, 78436, 5687, 127018, 64515, 121378, 194801, 55265, 67846, - 78434, 9704, 0, 194573, 70080, 71338, 0, 8660, 126478, 0, 128569, 78773, - 74482, 4483, 1709, 69721, 9909, 6080, 194851, 120358, 1746, 1315, 8667, - 983101, 0, 13140, 65899, 10604, 0, 4480, 11266, 121114, 1226, 6930, - 67979, 195019, 6360, 10897, 41230, 605, 68302, 74785, 69875, 0, 121478, + 1425, 6224, 119229, 11049, 127123, 71480, 42649, 8482, 92440, 983710, + 5032, 67209, 11940, 67207, 664, 120437, 5034, 92495, 70200, 122901, + 42702, 70194, 93061, 13294, 67873, 64869, 6032, 67218, 9115, 7430, 77837, + 70191, 120819, 68387, 100645, 73913, 120170, 41161, 5518, 4174, 10993, + 41162, 77836, 64528, 1169, 434, 41437, 1905, 6034, 41164, 64744, 9528, + 67741, 128800, 524, 128667, 74029, 788, 74027, 194667, 71881, 120370, + 1663, 10419, 42901, 42636, 67211, 67210, 129147, 120656, 67215, 67214, + 67213, 67212, 128828, 67897, 74039, 0, 0, 11395, 194904, 119107, 43612, + 64344, 129370, 0, 10855, 5445, 9355, 67221, 65198, 7391, 8989, 221, + 43673, 983874, 119238, 8010, 7191, 4962, 69772, 8855, 74612, 70820, + 64469, 92592, 10555, 67227, 43333, 67225, 128483, 120427, 10451, 67229, + 67653, 7245, 12443, 74405, 9947, 120149, 78317, 3873, 8367, 77842, + 120146, 43433, 43649, 11987, 83343, 983581, 11010, 11164, 74059, 74062, + 6217, 5896, 43846, 7682, 74049, 1462, 10235, 983918, 0, 983325, 43441, + 127924, 127777, 42595, 72804, 74402, 118860, 78661, 120419, 92497, 66287, + 120420, 92378, 120549, 119082, 64295, 120418, 0, 64765, 73923, 83210, + 120662, 69920, 125278, 6216, 67230, 10755, 9455, 11155, 8124, 127042, + 9470, 6944, 121125, 917982, 69680, 2828, 0, 531, 42638, 194804, 917856, + 120961, 43428, 8204, 3614, 2827, 9696, 120365, 0, 8728, 4354, 10904, + 78562, 19936, 7833, 120691, 120850, 42599, 42597, 42709, 68829, 125012, + 0, 8537, 127306, 983729, 9354, 121244, 121348, 41199, 10121, 2028, 74950, + 120253, 69715, 128525, 3062, 983663, 74447, 12608, 983657, 66440, 7545, + 9700, 11948, 92205, 120777, 120502, 41155, 68306, 74071, 128722, 92372, + 12713, 127519, 70402, 0, 78772, 113709, 1734, 0, 78141, 127040, 64594, + 2456, 231, 68227, 74167, 542, 120586, 100851, 983859, 194797, 1230, + 73845, 121343, 3597, 4446, 10584, 74235, 92215, 4037, 67737, 8352, 78436, + 5687, 127018, 64515, 121378, 194801, 55265, 67846, 78434, 9704, 983585, + 194573, 70080, 71338, 120575, 8660, 126478, 127010, 128467, 78773, 74482, + 4483, 1709, 69721, 9909, 6080, 128167, 120358, 1746, 1315, 8667, 983101, + 0, 13140, 65899, 10604, 118786, 4480, 11266, 121114, 1226, 6930, 67979, + 195019, 6360, 10897, 41230, 605, 68302, 74785, 69875, 120849, 121478, 41500, 0, 311, 11453, 6221, 10608, 64943, 67682, 10877, 118868, 64885, - 74272, 0, 194672, 128559, 120736, 74312, 345, 124933, 74456, 64606, 9917, - 0, 74855, 5037, 119912, 1776, 8422, 128935, 118814, 41508, 41201, 323, - 43328, 0, 42698, 1295, 194853, 4625, 77855, 4630, 13117, 83002, 128772, - 65123, 11293, 2668, 11288, 0, 42640, 65666, 2519, 92369, 65420, 92479, 0, - 4252, 5049, 42659, 119011, 706, 7754, 10854, 8738, 983949, 65419, 0, - 128496, 649, 65421, 0, 66702, 983721, 12670, 1013, 0, 64919, 705, 0, - 65422, 127803, 1183, 126519, 7017, 42852, 917826, 8157, 9736, 64503, - 65418, 129050, 983878, 74035, 194918, 11913, 73874, 6696, 120916, 8920, - 119298, 128426, 7962, 12211, 9837, 2051, 66227, 0, 4184, 119825, 128598, - 10177, 73777, 1857, 194657, 4626, 8464, 8472, 68844, 4629, 8499, 74627, - 78322, 4624, 7818, 118861, 128108, 0, 7805, 128754, 94007, 6935, 92292, - 78325, 78326, 78323, 43327, 43989, 119046, 8492, 8250, 8459, 0, 8497, - 8496, 83499, 74582, 75052, 78339, 9543, 67860, 78332, 77832, 65849, - 77831, 983961, 194649, 12451, 74376, 8684, 128301, 6102, 0, 5298, 917847, - 5294, 0, 83016, 68043, 195062, 9949, 83014, 43617, 119215, 0, 12073, 0, - 128646, 77863, 13108, 120617, 11439, 41468, 83012, 0, 5292, 55272, - 983883, 1939, 5302, 3970, 917877, 12455, 1793, 124982, 0, 75036, 6643, - 92477, 65263, 0, 78330, 41293, 78328, 65923, 78835, 13219, 9569, 129041, - 74383, 0, 74197, 129089, 5500, 8813, 0, 128612, 68860, 5322, 120944, - 78340, 43631, 5324, 66443, 3784, 41614, 65269, 6230, 78349, 78345, 13282, - 3360, 78344, 11523, 0, 92488, 9926, 7197, 128248, 68429, 42894, 41821, - 1249, 78360, 78361, 78356, 78358, 78353, 64899, 64763, 41149, 41807, - 43162, 41815, 41150, 128911, 10571, 10096, 67161, 67160, 67159, 6947, - 41152, 887, 9249, 6565, 78510, 41990, 78509, 41811, 67157, 93966, 6670, - 67175, 67174, 0, 43092, 43325, 67178, 10168, 67176, 9781, 68248, 9190, - 128497, 9666, 8269, 65944, 74005, 13019, 11670, 69860, 315, 12813, - 129132, 72409, 78256, 72408, 78352, 0, 75063, 0, 0, 1378, 9509, 194634, - 92996, 72407, 3066, 92220, 67847, 72406, 92355, 917890, 78365, 8787, - 67189, 194616, 41618, 194615, 78261, 127384, 0, 64652, 121222, 121012, 0, - 78366, 42088, 71040, 195061, 7176, 43756, 10137, 6121, 10995, 78259, - 71050, 8119, 64874, 71052, 78174, 128690, 128630, 74525, 0, 0, 12930, + 74272, 128076, 194672, 121202, 100652, 74312, 345, 124933, 74456, 64606, + 9917, 125244, 74855, 5037, 100998, 1776, 8422, 128935, 118814, 41508, + 41201, 323, 43328, 917849, 42698, 1295, 194853, 4625, 77855, 4630, 13117, + 83002, 128772, 65123, 11293, 2668, 11288, 0, 42640, 65666, 2519, 92369, + 65420, 92479, 127191, 4252, 5049, 42659, 119011, 706, 7754, 10854, 8738, + 129318, 65419, 0, 128496, 649, 65421, 122880, 66702, 983721, 12670, 1013, + 70707, 64919, 705, 72825, 65422, 127803, 1183, 126519, 7017, 42852, + 917826, 8157, 9736, 64503, 65418, 129050, 128090, 74035, 78836, 11913, + 73874, 6696, 120916, 8920, 119298, 128426, 7962, 12211, 9837, 2051, + 66227, 983272, 4184, 119825, 128598, 10177, 73777, 1857, 127773, 4626, + 8464, 8472, 68844, 4629, 8499, 74627, 78322, 4624, 7818, 118861, 128108, + 0, 7805, 128754, 94007, 6935, 92292, 78325, 78326, 78079, 43327, 43989, + 119046, 8492, 8250, 8459, 0, 8497, 8496, 83499, 74582, 70690, 78339, + 9543, 67860, 78332, 77832, 65849, 77831, 128615, 100412, 12451, 74376, + 8684, 100515, 6102, 128046, 5298, 128721, 5294, 83235, 83016, 68043, + 194899, 9949, 83014, 43617, 119215, 127030, 12073, 120736, 128017, 77863, + 13108, 71231, 2260, 41468, 83012, 0, 5292, 55272, 983883, 1939, 5302, + 3970, 129348, 12455, 1793, 124982, 0, 75036, 6643, 92477, 65263, 0, + 78330, 41293, 78328, 65923, 78835, 13219, 9569, 129041, 74383, 0, 74197, + 129089, 5500, 8813, 983414, 128612, 68860, 5322, 120944, 78340, 43631, + 5324, 66443, 3784, 41614, 65269, 6230, 78349, 78345, 13282, 3360, 78344, + 2231, 72726, 92488, 9926, 7197, 128248, 68429, 42894, 41821, 1249, 78360, + 78361, 78356, 78358, 78353, 64899, 64763, 41149, 41807, 43162, 41815, + 41150, 128911, 10571, 10096, 67161, 67160, 67159, 6947, 41152, 887, 9249, + 6565, 78510, 41990, 78509, 41811, 67157, 93966, 6670, 67175, 67174, 0, + 43092, 43325, 67178, 10168, 67176, 9781, 68248, 9190, 120981, 9666, 8269, + 65944, 74005, 13019, 11670, 69860, 315, 12813, 128556, 72409, 78256, + 72408, 78352, 92212, 75063, 72839, 0, 1378, 9509, 194634, 92996, 72407, + 3066, 92220, 2270, 72406, 92355, 917890, 78365, 8787, 67189, 72818, + 41618, 194615, 78261, 127384, 0, 64652, 121222, 72833, 125226, 78366, + 42088, 71040, 195061, 7176, 43756, 10137, 6121, 10995, 78259, 71050, + 8119, 64874, 71052, 43964, 128690, 128630, 74525, 72843, 100783, 12930, 1394, 74514, 128413, 74515, 983727, 67184, 2998, 9527, 67181, 65190, 12977, 42090, 67185, 983647, 119100, 41236, 92235, 42005, 42003, 41237, 5848, 67193, 67192, 3670, 67190, 67197, 67196, 67195, 7890, 128070, - 11298, 43315, 983315, 6229, 1593, 0, 125120, 619, 4635, 65080, 127158, + 11298, 43315, 77871, 6229, 1593, 0, 125120, 619, 4635, 65080, 127158, 12194, 4120, 65337, 65336, 128407, 11808, 67199, 67198, 9366, 42790, 42006, 119115, 65327, 65326, 65325, 10757, 1507, 42216, 65321, 65320, 43947, 65334, 43946, 65332, 65331, 42059, 65329, 42689, 92427, 9128, - 94045, 42073, 6785, 64590, 983830, 4371, 7196, 65318, 2035, 65316, 4106, - 65314, 65313, 42074, 127847, 41228, 120862, 65609, 41241, 7903, 41239, - 43533, 78459, 7189, 0, 0, 43941, 12357, 42802, 78450, 8487, 9131, 66292, - 4615, 12695, 127752, 0, 12175, 0, 64535, 0, 7809, 0, 121351, 562, 12169, - 6590, 69762, 66455, 64738, 3219, 68654, 121096, 128281, 1037, 128677, - 2025, 128263, 13098, 78442, 10637, 4568, 549, 1570, 43839, 2835, 83052, - 10624, 43623, 11072, 83045, 128523, 83046, 12606, 78433, 2825, 83048, - 10825, 8079, 2821, 41046, 92327, 7365, 83043, 120593, 13071, 121288, 452, - 41049, 42840, 6346, 2831, 5461, 74596, 11465, 5212, 917917, 64703, - 119191, 42308, 7181, 0, 41332, 0, 12333, 41047, 1668, 119849, 121150, - 128275, 1187, 983387, 42628, 78575, 82953, 71863, 82955, 3240, 128518, - 12151, 0, 11591, 41065, 5323, 8166, 0, 118932, 0, 66827, 1623, 65297, - 128856, 571, 0, 4918, 0, 5288, 127295, 1541, 65048, 1909, 8864, 0, 66402, - 10736, 92508, 11571, 7615, 70476, 92296, 4237, 92576, 1035, 65815, 68083, - 3567, 701, 65936, 3489, 120899, 70462, 70172, 11403, 0, 0, 82986, 3796, - 6800, 70472, 3994, 11421, 74611, 195076, 195078, 68036, 0, 0, 64857, - 83508, 2855, 74418, 66308, 41621, 68214, 83513, 127817, 10654, 82945, - 119226, 12164, 3246, 7906, 43972, 65847, 7182, 0, 13024, 66276, 74270, - 83069, 125090, 121115, 0, 1496, 747, 0, 942, 2378, 43136, 83031, 8466, - 83075, 9320, 8001, 1232, 8139, 11617, 74637, 0, 11409, 68373, 6382, - 126500, 64634, 92362, 70202, 11612, 93008, 67600, 2374, 94066, 8475, - 11609, 66313, 92568, 0, 5286, 119297, 83059, 983253, 64925, 120283, - 127204, 118982, 71905, 7705, 11942, 11305, 127203, 3309, 82979, 9206, - 82980, 113824, 6802, 70353, 41653, 1280, 1241, 7168, 12096, 0, 66615, - 42565, 41651, 0, 917627, 83042, 41650, 66507, 66470, 74472, 12914, 41491, - 43901, 94106, 6078, 9954, 78822, 1475, 119247, 9938, 6084, 917546, 41064, - 41062, 0, 113680, 3256, 10189, 42076, 43252, 78823, 68089, 8727, 120922, - 65875, 0, 0, 127762, 10562, 74215, 43065, 120906, 0, 3248, 74297, 3261, - 9015, 71351, 0, 3635, 64337, 92759, 125054, 0, 7195, 83346, 2007, 64431, - 195075, 0, 92197, 127090, 635, 0, 129082, 65613, 77909, 92420, 73997, - 128510, 121457, 43905, 7984, 8600, 74434, 127770, 4176, 70050, 2034, - 78423, 11154, 65891, 127038, 0, 318, 2038, 128544, 78596, 194602, 3649, - 13149, 42145, 42798, 3634, 120291, 71885, 67677, 120124, 7866, 75045, - 11402, 42146, 94032, 74238, 42664, 2849, 127034, 0, 7938, 12960, 1761, - 11812, 65379, 68386, 128185, 1159, 71183, 69729, 0, 120797, 7178, 120851, - 983836, 41680, 128469, 83098, 11534, 1514, 11668, 67891, 9313, 7015, - 128490, 67877, 194561, 12989, 66474, 9368, 12848, 1624, 43270, 0, 74278, - 10818, 83091, 9953, 194895, 78421, 1194, 3242, 9761, 9555, 8598, 120299, - 6169, 12871, 1551, 2798, 65176, 4958, 42752, 119025, 917924, 67875, - 120301, 3495, 66648, 125079, 83354, 68364, 120779, 4891, 0, 10641, 0, - 73746, 120945, 68352, 0, 73787, 128858, 127094, 7199, 11131, 0, 0, 0, - 983852, 126979, 42685, 42679, 193, 78789, 0, 0, 42667, 0, 5271, 68323, - 92517, 83356, 1362, 13297, 0, 71880, 0, 983333, 73789, 0, 6658, 4426, 0, - 66830, 983842, 83103, 7276, 42163, 5220, 0, 78621, 67822, 2416, 3310, - 42703, 83107, 379, 0, 43755, 70504, 43647, 3223, 65492, 1284, 194771, - 4549, 194738, 0, 71253, 70784, 10807, 9558, 93027, 0, 8515, 8688, 12866, - 65308, 3294, 83143, 8529, 128101, 43385, 7564, 0, 43329, 83148, 92458, - 73757, 66456, 42359, 128439, 2031, 983890, 7202, 128232, 12676, 42729, - 74777, 3215, 120982, 7710, 1610, 73801, 128807, 0, 65682, 0, 43917, - 65924, 9974, 228, 43922, 1501, 127994, 64395, 5179, 7200, 6225, 118927, - 42999, 1725, 65533, 8196, 7476, 74399, 0, 66868, 7152, 8502, 5762, 1967, - 7483, 43898, 0, 8104, 70128, 7474, 43914, 83080, 126507, 10414, 13001, - 8141, 983239, 42537, 1557, 43594, 128642, 6330, 6805, 8631, 2545, 42934, - 127166, 0, 74190, 128477, 70410, 983786, 42762, 194708, 42914, 1650, 262, - 1637, 128502, 7901, 3238, 83026, 41861, 0, 120211, 65158, 10860, 74959, - 43658, 7527, 83086, 43319, 6419, 0, 45, 0, 64588, 93989, 127753, 119810, - 7194, 5291, 0, 43666, 13129, 128684, 9084, 121039, 8737, 983165, 12881, - 75066, 12906, 9639, 7912, 2620, 983882, 3564, 0, 69978, 179, 43644, - 75049, 64756, 2853, 78443, 118813, 129042, 70347, 119009, 2850, 8084, - 983085, 73850, 2801, 92284, 42069, 119839, 74754, 83522, 42072, 92736, - 119842, 10398, 83386, 83523, 8377, 119312, 8245, 68401, 3158, 92396, - 3983, 43656, 923, 119857, 92470, 292, 11119, 119845, 119844, 3221, 1763, - 92463, 4612, 67729, 119850, 7253, 70456, 68391, 75002, 10782, 3637, - 12996, 43542, 113676, 64578, 83449, 3228, 69636, 8783, 983632, 119614, + 94045, 42073, 6785, 64590, 983135, 4371, 7196, 65318, 2035, 65316, 4106, + 65314, 65313, 42074, 127847, 41228, 100359, 65609, 41241, 7903, 41239, + 43533, 78459, 7189, 100418, 983227, 43941, 12357, 42802, 78450, 8487, + 9131, 66292, 4615, 12695, 127752, 0, 12175, 0, 64535, 0, 7809, 983887, + 121351, 562, 12169, 6590, 69762, 66455, 64738, 3219, 68654, 121096, + 128281, 1037, 128677, 2025, 119159, 13098, 78442, 10637, 4568, 549, 1570, + 43839, 2835, 83052, 10624, 43623, 11072, 83045, 120561, 83046, 12606, + 78433, 2825, 83048, 10825, 8079, 2821, 41046, 92327, 7365, 83043, 120593, + 13071, 121288, 452, 41049, 42840, 6346, 2831, 5461, 74596, 11465, 5212, + 118945, 64703, 119191, 42308, 7181, 128276, 41332, 0, 12333, 41047, 1668, + 119849, 121150, 127295, 1187, 128875, 42628, 78575, 82953, 71863, 82955, + 3240, 128518, 9213, 0, 11591, 41065, 5323, 8166, 70739, 118932, 127111, + 66827, 1623, 65297, 128856, 571, 0, 4918, 0, 5288, 127081, 1541, 65048, + 1909, 8864, 0, 66402, 10736, 92508, 11571, 7615, 70476, 92296, 4237, + 92576, 1035, 65815, 68083, 3567, 701, 65936, 3489, 120899, 70462, 70172, + 11403, 0, 0, 82986, 3796, 6800, 70472, 3994, 11421, 74611, 127911, + 195078, 68036, 70659, 0, 64857, 83508, 2855, 70697, 66308, 41621, 68214, + 83513, 127817, 10654, 82945, 119226, 12164, 3246, 7906, 43972, 65847, + 7182, 0, 13024, 66276, 74270, 83069, 125090, 121115, 0, 1496, 747, + 917999, 942, 2378, 43136, 83031, 8466, 83074, 9320, 8001, 1232, 8139, + 11617, 74637, 0, 11409, 68373, 6382, 126500, 64634, 92362, 70202, 11612, + 93008, 67600, 2374, 94066, 8475, 11609, 66313, 92568, 0, 5286, 119297, + 83059, 983253, 64925, 120283, 127204, 118982, 71905, 7705, 11942, 11305, + 127203, 3309, 82979, 9206, 82980, 113824, 6802, 70353, 41653, 1280, 1241, + 7168, 12096, 0, 66615, 42565, 41651, 983869, 917627, 83042, 41650, 66507, + 66470, 74472, 12914, 41491, 43901, 94106, 6078, 9954, 78822, 1475, + 119247, 9938, 6084, 917546, 41064, 41062, 0, 113680, 3256, 10189, 42076, + 43252, 78823, 68089, 8727, 120922, 65875, 917916, 129349, 127762, 10562, + 74215, 43065, 120906, 0, 3248, 74297, 3261, 9015, 71351, 113718, 3635, + 64337, 92759, 125054, 0, 7195, 83346, 2007, 64431, 195075, 194670, 92197, + 127090, 635, 983118, 129082, 65613, 77909, 92420, 73997, 127980, 121457, + 43905, 7984, 8600, 74434, 121047, 4176, 70050, 2034, 78423, 11154, 65891, + 127038, 0, 318, 2038, 128544, 78596, 129094, 3649, 13149, 42145, 42798, + 3634, 120291, 71885, 67677, 120124, 7866, 75045, 11402, 42146, 94032, + 74238, 42664, 2849, 127034, 0, 7938, 12960, 1761, 11812, 65379, 68386, + 128185, 1159, 71183, 69729, 0, 66768, 7178, 120851, 983836, 41680, + 128469, 83098, 11534, 1514, 11668, 67891, 9313, 7015, 128490, 67877, + 194561, 12989, 66474, 9368, 12848, 1624, 43270, 0, 74278, 10818, 83091, + 9953, 128008, 78421, 1194, 3242, 9761, 9555, 8598, 120299, 6169, 12871, + 1551, 2798, 65176, 4958, 42752, 119025, 917924, 67875, 120301, 3495, + 66648, 125079, 78708, 68364, 120779, 4891, 917933, 10641, 125265, 73746, + 120945, 68352, 0, 73787, 120195, 127094, 7199, 11131, 120617, 194700, 0, + 983852, 126979, 42685, 42679, 193, 78789, 0, 0, 42667, 983868, 5271, + 68323, 92517, 83356, 1362, 13297, 118862, 71880, 195090, 194969, 73789, + 120989, 6658, 4426, 127093, 66830, 983842, 83103, 7276, 42163, 5220, + 100670, 78621, 67822, 2416, 3310, 42703, 83107, 379, 129159, 43755, + 70504, 43647, 3223, 65492, 1284, 194771, 4549, 11523, 0, 71253, 70784, + 10807, 9558, 93027, 128003, 8515, 8688, 12866, 65308, 3294, 83143, 8529, + 128101, 43385, 7564, 917986, 43329, 83148, 92458, 73757, 66456, 42359, + 128439, 2031, 127394, 7202, 128232, 12676, 42729, 74777, 3215, 120982, + 7710, 1610, 73801, 128807, 0, 65682, 0, 43917, 65924, 9974, 228, 43922, + 1501, 127512, 64395, 5179, 7200, 6225, 118927, 42999, 1725, 65533, 8196, + 7476, 74399, 0, 66868, 7152, 8502, 5762, 1967, 7483, 43898, 0, 8104, + 70128, 7474, 43914, 83080, 126507, 10414, 13001, 8141, 194949, 42537, + 1557, 43594, 128642, 6330, 6805, 8631, 2545, 42934, 92203, 125211, 74190, + 128477, 70410, 983786, 42762, 194708, 42914, 1650, 262, 1637, 128502, + 7901, 3238, 83026, 41861, 983763, 120211, 65158, 10860, 74959, 43658, + 7527, 83086, 43319, 6419, 0, 45, 128060, 64588, 93989, 127753, 119810, + 7194, 5291, 100398, 43666, 13129, 126639, 9084, 72717, 8737, 983165, + 12881, 75066, 12906, 9639, 7912, 2620, 194830, 3564, 127393, 69978, 179, + 43644, 75049, 64756, 2853, 78443, 118813, 129042, 70347, 119009, 2850, + 8084, 983085, 73850, 2801, 92284, 42069, 119839, 74754, 83522, 42072, + 92736, 119842, 10398, 83386, 83523, 8377, 119312, 8245, 68401, 3158, + 92396, 3983, 43656, 923, 119857, 92470, 292, 11119, 119845, 72715, 3221, + 1763, 92463, 4612, 67729, 119850, 7253, 70456, 68391, 75002, 10782, 3637, + 12996, 43542, 113676, 64578, 83449, 3228, 69636, 8783, 983093, 119614, 2731, 0, 120833, 78585, 4102, 7696, 73878, 121417, 128132, 70813, 43316, 4177, 11283, 9089, 120918, 73996, 121111, 64500, 43674, 0, 64947, 1856, - 0, 0, 6379, 917804, 11142, 127176, 3208, 12975, 74775, 127380, 983931, - 92389, 74072, 55269, 0, 124962, 983683, 2033, 78577, 78576, 82965, 55254, - 7740, 82974, 70448, 126555, 73964, 68505, 93988, 67612, 65674, 128244, - 94110, 41689, 0, 74006, 64909, 6646, 11790, 74019, 128520, 128066, - 128031, 8561, 4573, 121375, 5326, 92571, 120605, 7230, 8257, 121415, - 8778, 41688, 0, 65776, 2071, 8314, 6459, 43511, 7628, 65092, 73903, - 64355, 11342, 128561, 0, 983434, 128226, 127001, 0, 11810, 13164, 10723, - 967, 983335, 120985, 11946, 983602, 3257, 127209, 12307, 1845, 129072, - 43526, 0, 119573, 1886, 42342, 10089, 870, 7648, 3499, 7662, 7652, 876, - 871, 877, 7665, 878, 42015, 879, 43692, 4563, 0, 917892, 7591, 65887, - 867, 9520, 872, 7656, 868, 873, 7642, 7659, 869, 874, 7644, 120674, 875, - 790, 128303, 118938, 195053, 93038, 66182, 194623, 5429, 195055, 66180, - 126480, 66181, 68452, 983291, 127214, 42067, 0, 5433, 10657, 7911, - 125119, 1547, 66176, 42012, 120576, 5425, 4977, 9999, 5317, 5423, 4611, - 125094, 67637, 127286, 9679, 74122, 92978, 917585, 0, 66194, 4418, 66184, - 4628, 4245, 119648, 0, 127263, 1851, 124995, 83320, 11908, 0, 9360, - 118897, 120874, 42776, 66187, 12837, 8829, 7711, 11112, 0, 92321, 43318, - 92302, 8809, 69881, 0, 126518, 120604, 983052, 983277, 983433, 128412, 0, - 120577, 7427, 9958, 4588, 43680, 0, 74484, 127185, 2433, 128602, 69973, - 3352, 74363, 128668, 121341, 793, 74404, 11197, 305, 567, 67662, 842, - 69979, 8208, 68308, 41695, 1647, 118877, 70841, 7837, 917625, 818, 5337, - 194628, 917621, 41376, 119978, 68742, 120594, 74086, 68777, 70179, - 917613, 10973, 66359, 1372, 127172, 917608, 4969, 1254, 917605, 194654, - 93967, 917602, 65228, 78221, 126612, 67723, 2840, 983905, 78829, 983939, - 66887, 3245, 9068, 68194, 64725, 121161, 128051, 12991, 124971, 2651, - 68016, 983267, 127326, 125038, 70835, 0, 70844, 43648, 120812, 917833, - 43322, 92662, 0, 0, 64372, 92698, 3226, 655, 752, 7457, 7456, 7452, 3285, - 74894, 11152, 92903, 65610, 2391, 92908, 92248, 671, 250, 7434, 618, 668, - 610, 42800, 7431, 1152, 42801, 640, 120666, 7448, 7439, 628, 3905, 73810, - 128340, 128266, 64749, 67850, 2107, 128290, 74249, 4605, 128174, 983192, - 43372, 65945, 127249, 11113, 119590, 0, 0, 70495, 987, 6927, 11572, - 42261, 11464, 3365, 9971, 0, 983951, 128297, 0, 78762, 127867, 121368, - 11334, 43326, 12609, 11519, 11503, 5530, 5210, 0, 4627, 119269, 5208, 0, - 70090, 10332, 2424, 7976, 9156, 0, 3244, 5529, 69647, 73894, 128852, - 5432, 64965, 5527, 42315, 10516, 7790, 5528, 128838, 42140, 120281, 0, - 983777, 43545, 9887, 121477, 4000, 7429, 7428, 665, 7424, 3206, 120278, - 7884, 0, 128566, 74910, 128666, 211, 2509, 92904, 70822, 68672, 3220, - 42235, 78480, 10690, 8951, 5214, 42474, 8118, 0, 7048, 4590, 127258, - 5852, 0, 78482, 127259, 1708, 0, 78481, 2623, 11943, 128700, 69226, - 69974, 4698, 66509, 1066, 119921, 4701, 983876, 120285, 70447, 94111, - 8267, 0, 1421, 66426, 7516, 127552, 2625, 983641, 8034, 74309, 0, 3631, - 10955, 7850, 120293, 8416, 0, 983065, 0, 43384, 12660, 128693, 128270, 0, - 74850, 41069, 70185, 128156, 12099, 4310, 10032, 6252, 713, 7990, 983489, - 3990, 125050, 983264, 66368, 5017, 64956, 7071, 0, 70457, 1030, 118800, - 92563, 9513, 41059, 9357, 74988, 1773, 77939, 120350, 124961, 6339, 7745, - 9844, 127220, 64650, 94, 1880, 74766, 113719, 8908, 983222, 128707, - 65913, 78470, 10752, 13003, 68769, 126572, 41307, 8732, 120336, 0, 1757, - 6964, 4696, 0, 120333, 64785, 7394, 3641, 5419, 128055, 0, 127883, - 194707, 120344, 43988, 70423, 8610, 43062, 7592, 856, 74299, 936, 13289, - 69894, 43171, 1459, 128224, 65243, 78638, 19953, 129078, 1504, 70064, 0, - 12913, 74206, 7529, 128745, 127868, 70203, 120782, 4113, 120929, 2372, - 336, 0, 7509, 12152, 194885, 682, 7655, 41505, 0, 64743, 10593, 1703, - 92467, 77911, 8033, 69953, 0, 9810, 127269, 120013, 12970, 0, 42351, - 10109, 74535, 74068, 74921, 0, 92690, 0, 65068, 74291, 1965, 7069, 43312, - 0, 73887, 11130, 2087, 64370, 6314, 41714, 8501, 11145, 121117, 74239, - 41317, 92614, 2091, 74545, 2090, 69912, 9353, 7117, 2077, 77886, 11161, - 10498, 2083, 77888, 71196, 0, 119236, 634, 124970, 92290, 194886, 69779, - 4165, 8746, 195048, 9654, 12856, 6924, 7660, 7066, 194693, 70415, 128135, - 41037, 42692, 7786, 12959, 41039, 127483, 124965, 680, 2302, 128200, - 1181, 7056, 3174, 67248, 0, 92668, 65665, 127375, 113776, 6920, 0, 92295, - 126606, 118965, 68318, 64644, 126981, 74119, 68238, 41028, 74025, 6231, + 100572, 127812, 6379, 917804, 11142, 127176, 3208, 12975, 74775, 119121, + 983931, 92389, 74072, 55269, 0, 124962, 983329, 2033, 78577, 78576, + 82965, 55254, 7740, 82974, 70448, 126555, 73964, 68505, 93988, 67612, + 65674, 127552, 94110, 41689, 983410, 74006, 64909, 6646, 11790, 74019, + 128520, 128066, 128031, 8561, 4573, 121375, 5326, 92571, 120605, 7230, + 8257, 121415, 8778, 41688, 0, 65776, 2071, 8314, 6459, 43511, 7628, + 65092, 73903, 64355, 11342, 100579, 983732, 194939, 128226, 127001, + 127944, 11810, 13164, 10723, 967, 100481, 120985, 11946, 129032, 3257, + 127209, 12307, 1845, 100578, 43526, 983084, 119573, 1886, 42342, 10089, + 870, 7648, 3499, 7662, 7652, 876, 871, 877, 7665, 878, 42015, 879, 43692, + 4563, 983249, 917892, 7591, 65887, 867, 9520, 872, 7656, 868, 873, 7642, + 7659, 869, 874, 7644, 120674, 875, 790, 121082, 118938, 100427, 93038, + 66177, 194623, 5429, 195055, 66180, 126480, 66181, 68452, 194966, 119244, + 42067, 119993, 5433, 10657, 7911, 125119, 1547, 66176, 42012, 120576, + 5425, 4977, 9999, 5317, 5423, 4611, 125094, 67637, 127286, 9679, 74122, + 92978, 917585, 0, 66194, 4418, 66184, 4628, 4245, 119648, 0, 127263, + 1851, 120823, 83320, 11908, 0, 9360, 118897, 120874, 42776, 66187, 12837, + 8829, 7711, 11112, 128787, 92321, 43318, 92302, 8809, 69881, 128564, + 125229, 120604, 983052, 983238, 983433, 128412, 0, 120577, 7427, 9958, + 4588, 43680, 0, 74484, 127185, 2433, 128602, 69973, 3352, 74363, 126601, + 121341, 793, 74404, 11197, 305, 567, 67662, 842, 69979, 8208, 68308, + 41695, 1647, 118877, 70841, 7837, 917625, 818, 5337, 128377, 127989, + 41376, 119978, 68742, 120594, 74086, 68777, 70179, 917613, 10973, 66359, + 1372, 127172, 917608, 4969, 1254, 195006, 194654, 93967, 917602, 65228, + 78221, 72746, 67723, 2840, 128842, 78829, 983939, 66887, 3245, 9068, + 68194, 64725, 121161, 128051, 12991, 124971, 2651, 68016, 983267, 72873, + 100601, 70835, 0, 70844, 43648, 120812, 194854, 43322, 92662, 0, 0, + 64372, 92698, 3226, 655, 752, 7457, 7456, 7452, 3285, 74894, 11152, + 92903, 65610, 2391, 92908, 92248, 671, 250, 7434, 618, 668, 610, 42800, + 7431, 1152, 42801, 640, 120666, 7448, 7439, 628, 3905, 73810, 128340, + 100741, 64749, 67850, 2107, 128290, 74249, 4605, 128174, 100745, 43372, + 65945, 72710, 11113, 119590, 0, 100749, 70495, 987, 6927, 11572, 42261, + 11464, 3365, 9971, 70673, 127942, 128297, 0, 78762, 127867, 121368, + 11334, 43326, 12609, 11519, 11503, 5530, 5210, 0, 4627, 119269, 5208, + 113690, 70090, 10332, 2424, 7976, 9156, 0, 3244, 5529, 69647, 42142, + 128852, 5432, 64965, 5527, 42315, 10516, 7790, 5528, 128838, 42140, + 120281, 0, 195088, 43545, 9887, 121477, 4000, 7429, 7428, 665, 7424, + 3206, 120278, 7884, 0, 128566, 74910, 128666, 211, 2509, 92904, 70822, + 68672, 3220, 42235, 78480, 10690, 8951, 5214, 42474, 8118, 983833, 7048, + 4590, 127258, 5852, 983819, 78482, 127259, 1708, 0, 78481, 2623, 11943, + 121140, 69226, 69974, 4698, 66509, 1066, 119921, 4701, 100564, 120285, + 70447, 94111, 8267, 0, 1421, 66426, 7516, 120406, 2625, 128242, 8034, + 74309, 194715, 3631, 10955, 7850, 120293, 8416, 127032, 120613, 983578, + 43384, 12660, 122883, 128270, 0, 74850, 41069, 70185, 128156, 12099, + 4310, 10032, 6252, 713, 7990, 983489, 3990, 125050, 983264, 66368, 5017, + 64956, 7071, 0, 70457, 1030, 118800, 92563, 9513, 41059, 9357, 70675, + 1773, 77939, 120350, 124961, 6339, 7745, 9844, 127220, 64650, 94, 1880, + 74766, 113719, 8908, 983222, 128236, 65913, 78470, 10752, 13003, 68769, + 126572, 41307, 8732, 120336, 100669, 1757, 6964, 4696, 0, 120333, 64785, + 7394, 3641, 5419, 128055, 0, 127883, 194707, 120344, 43988, 70423, 8610, + 43062, 7592, 856, 74299, 936, 13289, 69894, 43171, 1459, 128224, 65243, + 78638, 19953, 129078, 1504, 70064, 72421, 12913, 70722, 7529, 120608, + 127868, 70203, 120782, 4113, 120929, 2372, 336, 0, 7509, 12152, 194885, + 682, 7655, 41505, 983753, 64743, 10593, 1703, 92467, 77911, 8033, 69953, + 0, 9810, 127269, 120013, 12970, 983205, 42351, 10109, 74535, 74068, + 74921, 0, 92690, 122886, 65068, 74291, 1965, 7069, 43312, 0, 73887, + 11130, 2087, 64370, 6314, 41714, 8501, 11145, 121117, 74239, 41317, + 92614, 2091, 74545, 2090, 69912, 9353, 7117, 2077, 77886, 11161, 10498, + 2083, 77888, 71196, 0, 119236, 634, 124970, 92290, 194886, 69779, 4165, + 8746, 195048, 9654, 12856, 6924, 7660, 7066, 127051, 70415, 128135, + 41037, 42692, 7786, 12959, 2233, 127483, 124965, 680, 2302, 128200, 1181, + 7056, 3174, 67248, 983171, 92668, 65665, 100594, 113776, 6920, 0, 92295, + 70672, 118965, 68318, 64644, 126981, 74119, 68238, 41028, 74025, 6231, 2613, 65302, 40989, 68239, 68230, 68234, 42760, 0, 43896, 0, 40987, 4667, - 0, 71843, 8828, 77995, 70506, 1246, 4746, 128501, 128508, 11021, 4749, - 92675, 917882, 921, 4744, 0, 12702, 242, 0, 1566, 8217, 127210, 64653, - 78386, 74617, 74036, 74505, 43274, 5313, 951, 74568, 92983, 983867, 7604, - 983292, 4009, 70277, 71844, 120562, 0, 983720, 64860, 119138, 119069, 0, - 127370, 4048, 983598, 83009, 70024, 1646, 77890, 64534, 73995, 120705, - 129047, 119890, 2579, 119905, 3177, 11357, 9099, 4107, 3441, 119894, - 2975, 74442, 9822, 983935, 55220, 10084, 73943, 118840, 0, 917562, 78299, - 3399, 9851, 917609, 11909, 9059, 0, 7687, 0, 6789, 127767, 0, 71842, - 70178, 92314, 0, 1777, 9151, 1137, 66867, 749, 42366, 70444, 5385, 70791, - 72435, 70127, 83377, 5989, 128905, 74636, 120848, 0, 41685, 69223, 0, - 9769, 41684, 194737, 519, 119231, 11740, 5766, 0, 0, 2600, 8848, 70416, - 41297, 0, 3666, 70420, 41300, 74468, 65160, 0, 69688, 69771, 74479, 0, - 6558, 127149, 128064, 69765, 92775, 252, 0, 41302, 119350, 83504, 118839, - 69763, 68762, 11729, 8719, 9060, 129091, 120139, 10761, 0, 0, 129410, - 118792, 11734, 93011, 11730, 113741, 9593, 5757, 2403, 64808, 55275, 0, - 11728, 43572, 983139, 0, 7764, 68741, 11094, 120825, 0, 43489, 4282, - 8298, 0, 0, 70328, 194986, 70324, 64449, 0, 126650, 63854, 8456, 65587, - 70442, 65670, 983963, 78250, 0, 7774, 10607, 9792, 983869, 70326, 0, - 71460, 120764, 70322, 10019, 74762, 0, 3458, 4365, 70053, 983712, 3647, - 120207, 2602, 128341, 121103, 125043, 41135, 83498, 0, 121325, 64631, - 172, 4971, 41219, 41137, 1889, 7238, 6545, 126476, 77926, 7597, 10528, - 75054, 0, 3732, 73910, 194588, 5344, 983971, 43366, 43363, 9062, 119252, + 121212, 71843, 8828, 77995, 70506, 1246, 4746, 128501, 128508, 2269, + 4749, 92675, 917882, 921, 4744, 0, 12702, 242, 100595, 1566, 8217, + 127210, 64653, 78386, 74617, 74036, 74505, 43274, 5313, 951, 74568, + 92983, 983867, 7604, 128266, 4009, 70277, 71844, 120115, 126642, 94074, + 64860, 100551, 119069, 0, 127370, 4048, 983598, 83009, 70024, 1646, + 77890, 64534, 73995, 120705, 129047, 119890, 2579, 119905, 3177, 11357, + 9099, 4107, 3441, 119894, 2975, 74442, 9822, 983935, 55220, 10084, 73943, + 118840, 983728, 917562, 78299, 3399, 9851, 917609, 11909, 9059, 0, 7687, + 127052, 6789, 127767, 0, 71842, 70178, 92314, 0, 1777, 9151, 1137, 66867, + 749, 42366, 70444, 5385, 70791, 72435, 70127, 83377, 5989, 128905, 74636, + 120848, 0, 41685, 69223, 0, 9769, 41684, 194737, 519, 119231, 11740, + 5766, 0, 0, 2600, 8848, 70416, 41297, 0, 3666, 70420, 41300, 74468, + 65160, 0, 69688, 69771, 74479, 0, 6558, 127149, 128064, 69765, 92775, + 252, 983142, 41302, 100371, 83504, 118839, 69763, 68762, 11729, 8719, + 9060, 125077, 120139, 10761, 0, 0, 129410, 118792, 11734, 93011, 11730, + 113741, 9593, 5757, 2403, 64808, 55275, 0, 11728, 43572, 983139, 129412, + 7764, 68741, 11094, 120825, 983758, 43489, 4282, 8298, 0, 0, 70328, + 113691, 70324, 64449, 0, 126650, 63854, 8456, 65587, 70442, 65670, + 983180, 78250, 0, 7774, 10607, 9792, 101102, 70326, 0, 71460, 120764, + 70322, 10019, 74762, 0, 3458, 4365, 70053, 983712, 3647, 83437, 2602, + 128341, 100717, 125043, 41135, 83498, 120815, 121325, 64631, 172, 4971, + 41219, 41137, 1889, 7238, 6545, 126476, 77926, 7597, 10528, 75054, + 121405, 3732, 73910, 194588, 5344, 983971, 43366, 43363, 9062, 119252, 121441, 92528, 0, 64479, 9232, 92596, 83330, 113707, 194712, 10900, 41531, 1263, 3720, 12048, 74075, 64292, 41524, 7227, 119635, 6099, 41534, - 0, 127354, 127345, 299, 83022, 8525, 127347, 3524, 917565, 8831, 127349, - 92564, 3075, 67867, 94053, 0, 66362, 0, 64353, 70440, 0, 5845, 121310, 0, - 121185, 2581, 8200, 65114, 68460, 983693, 43283, 5551, 0, 120735, 983201, - 6340, 118855, 121027, 78134, 8680, 7204, 70065, 2588, 2914, 7011, 55281, - 0, 2471, 194631, 2883, 2749, 119563, 73774, 10913, 83116, 983086, 8666, - 675, 42493, 121297, 43571, 0, 6219, 128584, 9980, 41232, 10928, 0, 41153, - 41229, 118967, 0, 3738, 94016, 983243, 12711, 3181, 66212, 74289, 68472, - 42857, 8262, 93036, 0, 74476, 0, 42347, 12092, 9615, 7234, 74047, 983088, - 128137, 43744, 0, 0, 73846, 2934, 12722, 120762, 922, 43983, 74507, - 983126, 74461, 3218, 120471, 74290, 120469, 64562, 120475, 8569, 11404, - 11932, 73728, 3214, 11212, 120468, 12128, 3207, 65486, 78729, 1901, - 78727, 65667, 120460, 7425, 3205, 68003, 78737, 78736, 78735, 43383, - 69940, 65459, 2606, 78730, 73897, 129043, 11496, 1173, 0, 41272, 119661, - 0, 0, 83178, 120737, 120953, 194773, 983322, 378, 2610, 983328, 65079, - 983327, 65695, 121220, 37, 7068, 0, 120480, 68236, 3209, 120477, 120835, - 10638, 9768, 69952, 119909, 71486, 92225, 983953, 983340, 0, 43840, 0, 0, - 5233, 983337, 64792, 71233, 128223, 126633, 128919, 7060, 9847, 120144, - 1685, 595, 83197, 70428, 1292, 8940, 7380, 11088, 0, 10004, 126997, 0, - 6541, 43837, 71465, 121030, 3243, 9014, 5606, 125032, 538, 64620, 5602, - 8467, 74391, 6547, 71466, 8203, 66420, 68241, 8458, 65211, 8495, 92311, - 127481, 917552, 779, 78314, 64367, 2465, 69901, 8193, 55279, 9730, 9280, - 120913, 7065, 74155, 4346, 113690, 73798, 504, 125115, 92414, 8982, 0, - 121471, 119170, 782, 129028, 10883, 128446, 194852, 732, 3737, 121188, - 1548, 68650, 92507, 1832, 5604, 5735, 41141, 119020, 4376, 983372, 11787, - 3745, 917868, 119885, 42888, 65712, 127913, 3869, 11937, 5725, 127539, - 1783, 7416, 5728, 0, 128457, 119554, 11918, 66567, 5724, 127965, 5727, - 78521, 121121, 0, 764, 0, 121011, 43531, 113670, 9033, 127182, 42532, - 6223, 11042, 120749, 11423, 74852, 119861, 68303, 43465, 0, 74767, 6559, - 64557, 71348, 92649, 120648, 43019, 43477, 10238, 74491, 128711, 43377, - 92282, 71346, 1478, 9783, 11825, 2607, 64740, 113689, 7739, 74543, - 917765, 67393, 0, 6132, 0, 63765, 128396, 70058, 41144, 71899, 92438, - 43537, 6761, 10093, 4369, 917791, 128394, 194776, 8820, 3947, 0, 65299, - 11515, 526, 128103, 41295, 194603, 125002, 194932, 113691, 7688, 917786, - 7686, 8288, 11815, 983188, 121411, 983384, 1543, 3713, 41221, 12423, - 42281, 78544, 74024, 12293, 983680, 64357, 11794, 42082, 128125, 1737, - 8987, 42081, 0, 7205, 83264, 9335, 12850, 119173, 6553, 7055, 68041, - 8277, 0, 67751, 5475, 74795, 6780, 65067, 0, 1327, 1160, 42084, 93963, - 41217, 119660, 10018, 360, 129070, 983865, 68176, 5863, 3137, 0, 4147, - 983170, 41216, 7844, 2616, 70197, 68461, 65234, 68341, 13076, 3135, - 983289, 78143, 119139, 3142, 92451, 94068, 10819, 119580, 10183, 74635, - 2608, 1470, 73967, 94008, 6227, 121257, 83268, 65236, 917878, 6163, - 983558, 113728, 127314, 128138, 983236, 8603, 127959, 119866, 3306, - 10876, 43392, 83187, 127931, 5751, 127517, 6222, 0, 127466, 12086, 7403, - 1600, 64309, 64939, 0, 64783, 92658, 11310, 0, 8882, 119903, 0, 2570, - 7021, 74902, 194742, 43110, 0, 1234, 6540, 6974, 92750, 0, 983211, 5002, - 983563, 41286, 69946, 74465, 71074, 43585, 113720, 6551, 983375, 128229, - 983274, 41289, 125130, 71080, 127958, 8977, 602, 120814, 0, 128350, - 128661, 194890, 983377, 41279, 0, 0, 94108, 11081, 43615, 0, 0, 127888, - 983612, 12727, 43895, 0, 78397, 9475, 7112, 65105, 0, 9633, 10886, 43592, - 7831, 983829, 194571, 0, 73915, 8076, 43048, 8290, 8291, 43051, 92570, 0, - 2596, 43584, 120983, 13113, 0, 127757, 2393, 7058, 9087, 74067, 68673, - 41574, 78337, 70498, 42900, 6376, 0, 0, 0, 0, 9854, 127748, 64696, 73879, - 128220, 120752, 6994, 0, 1720, 0, 0, 0, 6529, 7063, 983179, 3751, 9120, - 983487, 68038, 1798, 709, 0, 1354, 1876, 13152, 6557, 12430, 8137, 94098, - 67752, 70850, 119057, 245, 121066, 11456, 41233, 7070, 0, 94046, 6136, - 68304, 65677, 8682, 41235, 92595, 42045, 9804, 118963, 432, 3595, 127015, - 65437, 0, 74455, 42399, 983136, 0, 128274, 0, 119658, 128184, 0, 0, - 77894, 8797, 0, 9052, 64888, 7167, 2356, 95, 74784, 10580, 0, 42286, - 71123, 64640, 69999, 94109, 120877, 74137, 70035, 10063, 12652, 12199, - 74622, 43492, 2566, 11971, 983737, 120882, 1065, 0, 127005, 43400, 2576, - 66696, 66819, 83333, 43604, 127891, 0, 3201, 514, 74502, 70032, 2921, - 43215, 64493, 5772, 12968, 70055, 194944, 70310, 43398, 2580, 195025, - 41341, 41223, 6564, 1463, 41342, 0, 5293, 70020, 127870, 3733, 11346, 0, - 12054, 0, 74098, 42827, 195074, 13091, 0, 128580, 0, 917915, 127961, - 127025, 128334, 74821, 71104, 66295, 68037, 0, 121116, 13090, 66643, 0, - 1270, 1132, 42360, 0, 74096, 66655, 42569, 127824, 66898, 64761, 0, - 41021, 8510, 42432, 119898, 119317, 194782, 194641, 64496, 74109, 70030, - 9915, 983083, 983218, 7061, 41336, 3854, 69700, 13141, 68413, 43401, - 42319, 13082, 78114, 7067, 68221, 127881, 127383, 127171, 0, 120745, - 74209, 9029, 43543, 70836, 2353, 6308, 129154, 74792, 2611, 119186, - 66881, 127241, 65063, 43664, 92319, 66627, 92912, 4484, 8509, 118976, - 11066, 65233, 127146, 41224, 41017, 128149, 3747, 10522, 0, 194876, 1691, - 41226, 74962, 12107, 7100, 10905, 65010, 121299, 697, 66018, 9284, 4244, - 983343, 93058, 74781, 13121, 120036, 0, 12010, 128573, 128221, 120949, - 121032, 0, 127193, 65816, 68111, 118950, 127933, 65668, 92257, 6618, - 3562, 66365, 0, 42234, 12648, 78110, 7123, 70038, 5785, 9198, 9764, - 41316, 65877, 7383, 13230, 41299, 0, 0, 68365, 128258, 195027, 0, 0, - 13122, 0, 191, 70060, 8585, 8000, 64411, 120652, 42889, 64850, 41072, - 41578, 983104, 41577, 0, 10002, 121364, 6533, 73802, 41570, 917919, 683, - 396, 41580, 68146, 983067, 12901, 43058, 0, 343, 7129, 42680, 41360, - 78154, 983397, 4743, 69987, 0, 74040, 74108, 8743, 1724, 1433, 119322, - 128665, 3739, 6263, 71349, 128811, 3964, 6592, 121424, 68288, 66040, + 0, 127354, 127345, 299, 83022, 8525, 127347, 3524, 128717, 8831, 127349, + 92564, 3075, 67867, 94053, 0, 66362, 0, 64353, 70440, 983970, 5845, + 121310, 127937, 121185, 2581, 8200, 65114, 68460, 74858, 43283, 5551, 0, + 120735, 129423, 6340, 118855, 100602, 78134, 8680, 7204, 70065, 2588, + 2914, 7011, 55281, 0, 2471, 194631, 2883, 2749, 100852, 73774, 10913, + 83116, 983086, 8666, 675, 42493, 121297, 43571, 0, 6219, 128584, 9980, + 41232, 10928, 0, 41153, 41229, 118967, 0, 3738, 94016, 983243, 12711, + 3181, 66212, 74289, 68472, 42857, 8262, 93036, 983676, 74476, 0, 42347, + 12092, 9615, 7234, 74047, 128768, 128137, 43744, 100610, 0, 73846, 2934, + 12722, 120762, 922, 43983, 74507, 983110, 74461, 3218, 101002, 74290, + 120469, 64562, 120475, 8569, 11404, 11932, 73728, 3214, 11212, 120468, + 12128, 3207, 65486, 78729, 1901, 78727, 65667, 120460, 7425, 3205, 68003, + 78737, 78736, 78735, 43383, 69940, 65459, 2606, 78730, 73897, 129043, + 11496, 1173, 0, 41272, 119661, 983853, 983893, 83178, 100728, 120953, + 194773, 194601, 378, 2610, 983328, 65079, 194879, 65695, 121220, 37, + 7068, 0, 120480, 68236, 3209, 120477, 120835, 10638, 9768, 69952, 100621, + 71486, 92225, 128494, 983340, 100905, 43840, 0, 101096, 5233, 100624, + 64792, 71233, 128223, 100626, 128919, 7060, 9847, 120144, 1685, 595, + 83197, 70428, 1292, 8940, 7380, 11088, 92948, 10004, 126997, 0, 6541, + 43837, 71465, 121030, 3243, 9014, 5606, 119585, 538, 64620, 5602, 8467, + 74391, 6547, 71466, 8203, 66420, 68241, 8458, 65211, 8495, 92311, 127481, + 917552, 779, 78314, 64367, 2465, 69901, 8193, 55279, 9730, 9280, 120913, + 7065, 74155, 4346, 100570, 73798, 504, 125115, 92414, 8982, 0, 121471, + 119170, 782, 129028, 10883, 128446, 194852, 732, 3737, 121188, 1548, + 68650, 92507, 1832, 5604, 5735, 41141, 119020, 4376, 983372, 11787, 3745, + 917868, 119885, 42888, 65712, 100606, 3869, 11937, 5725, 100608, 1783, + 7416, 5728, 128569, 128457, 119554, 11918, 66567, 5724, 127965, 5727, + 78521, 121121, 128488, 764, 0, 121011, 43531, 113670, 9033, 127182, + 42532, 6223, 11042, 120749, 11423, 74852, 119861, 68303, 43465, 194819, + 72854, 6559, 64557, 71348, 92649, 66763, 43019, 43477, 10238, 74491, + 128711, 43377, 92282, 71346, 1478, 9783, 11825, 2607, 64740, 113689, + 7739, 74543, 917765, 67393, 100588, 6132, 0, 63765, 100590, 70058, 41144, + 71899, 92438, 43537, 6761, 10093, 4369, 917791, 70682, 100561, 8820, + 3947, 122898, 65299, 11515, 526, 128103, 41295, 194603, 100931, 194932, + 78393, 7688, 917786, 7686, 8288, 11815, 983188, 100934, 983384, 1543, + 3713, 41221, 12423, 42281, 78544, 74024, 12293, 194589, 64357, 11794, + 42082, 70744, 1737, 8987, 42081, 0, 7205, 83264, 9335, 12850, 119173, + 2272, 7055, 68041, 8277, 0, 67751, 5475, 74795, 6780, 65067, 0, 1327, + 1160, 42084, 93963, 41217, 119660, 10018, 360, 129070, 100617, 68176, + 5863, 3137, 0, 4147, 983170, 41216, 7844, 2616, 70197, 68461, 65234, + 68341, 13076, 3135, 983289, 78143, 119139, 3142, 92451, 94068, 10819, + 119580, 10183, 74635, 2608, 1470, 73967, 94008, 6227, 121257, 83268, + 65236, 120256, 6163, 129297, 113728, 127314, 73822, 983236, 8603, 127959, + 119866, 3306, 10876, 43392, 83187, 127931, 5751, 127517, 6222, 100716, + 127466, 12086, 7403, 1600, 64309, 64939, 0, 64783, 92658, 11310, 983307, + 8882, 119903, 78518, 2570, 7021, 74902, 128880, 43110, 0, 1234, 6540, + 6974, 92750, 127396, 100923, 5002, 983563, 41286, 69946, 74465, 71074, + 43585, 100927, 6551, 983375, 128229, 983047, 41289, 125130, 71080, + 100521, 8977, 602, 120814, 100630, 128350, 128661, 194890, 983377, 41279, + 0, 0, 94108, 11081, 43615, 0, 101022, 127888, 194994, 12727, 43895, 0, + 78397, 9475, 7112, 65105, 127556, 9633, 10886, 43592, 7831, 66751, + 194571, 122885, 73915, 8076, 43048, 8290, 8291, 43051, 92570, 983895, + 2596, 43584, 120983, 13113, 983731, 127757, 2393, 7058, 9087, 4136, + 68673, 41574, 78337, 70498, 42900, 6376, 0, 194912, 127820, 0, 9854, + 101088, 64696, 73879, 128220, 120752, 6994, 0, 1720, 917797, 0, 0, 6529, + 7063, 118917, 3751, 9120, 194628, 68038, 1798, 709, 0, 1354, 1876, 13152, + 6557, 12430, 8137, 94098, 67752, 70850, 100832, 245, 100831, 11456, + 41233, 7070, 71264, 94046, 6136, 68304, 65677, 8682, 41235, 92595, 42045, + 9804, 100642, 432, 3595, 100784, 65437, 0, 74455, 42399, 100646, 100641, + 100649, 983949, 100648, 128184, 100786, 194587, 77894, 8797, 983956, + 9052, 64888, 7167, 2356, 95, 74784, 10580, 100845, 42286, 71123, 64640, + 69999, 94109, 120877, 74137, 70035, 10063, 12652, 12199, 74622, 43492, + 2566, 11971, 983737, 120882, 1065, 120768, 127005, 43400, 2576, 66696, + 66819, 83333, 43604, 127891, 0, 3201, 514, 74502, 70032, 2921, 43215, + 64493, 5772, 12968, 70055, 194944, 70310, 43398, 2580, 128497, 41341, + 41223, 6564, 1463, 41342, 195092, 5293, 70020, 127870, 3733, 11346, 0, + 12054, 100824, 74098, 42827, 195074, 13091, 0, 128580, 100821, 100828, + 127961, 127025, 128334, 74821, 71104, 66295, 68037, 983905, 121116, + 13090, 66643, 128820, 1270, 1132, 42360, 194968, 66752, 66655, 42569, + 120571, 66898, 64761, 100776, 41021, 8510, 42432, 100778, 119317, 194782, + 194641, 64496, 74109, 70030, 9915, 69798, 983218, 7061, 41336, 3854, + 69700, 13141, 68413, 43401, 42319, 13082, 78114, 7067, 68221, 127881, + 127383, 127171, 121207, 100765, 74209, 9029, 43543, 70836, 2353, 6308, + 70662, 74792, 2611, 100768, 66881, 127241, 65063, 43664, 92319, 66627, + 92912, 4484, 8509, 118976, 11066, 65233, 127146, 41224, 41017, 120514, + 3747, 10522, 917811, 119970, 1691, 41226, 74962, 12107, 7100, 10905, + 65010, 74602, 697, 66018, 9284, 4244, 983343, 93058, 74781, 13121, + 120036, 0, 12010, 128573, 128221, 120949, 121032, 983132, 127193, 65816, + 68111, 118950, 127933, 65668, 92257, 6618, 3562, 66365, 0, 42234, 12648, + 78110, 7123, 70038, 5785, 9198, 9764, 41316, 65877, 7383, 13230, 41299, + 0, 983150, 68365, 128258, 195026, 983402, 0, 13122, 127546, 191, 70060, + 8585, 8000, 64411, 120652, 42889, 64850, 41072, 41578, 983104, 41577, + 983371, 10002, 100754, 6533, 73802, 41570, 100756, 683, 396, 41580, + 68146, 127815, 12901, 43058, 100760, 343, 7129, 42680, 41360, 78154, + 127082, 4743, 69987, 100761, 74040, 74108, 8743, 1724, 1433, 100751, + 128665, 3739, 6263, 71349, 128811, 3964, 6592, 120701, 65108, 66040, 82946, 42568, 69806, 128113, 1778, 3956, 128443, 42070, 6563, 43075, - 9018, 94006, 983398, 12067, 41312, 92763, 5547, 8916, 120869, 128950, + 9018, 94006, 121424, 12067, 41312, 92761, 5547, 8916, 120869, 128950, 8175, 94034, 284, 8108, 934, 128039, 74001, 173, 66460, 7174, 92703, - 118822, 1750, 128686, 4394, 68368, 1807, 983888, 92298, 0, 5889, 128795, - 7180, 0, 67127, 0, 67126, 42471, 6982, 1721, 44022, 7891, 42243, 42160, - 2583, 4512, 119360, 65230, 128109, 0, 917630, 3855, 194810, 11767, - 127998, 0, 74295, 194651, 0, 92416, 3975, 67125, 74087, 74989, 12672, - 3798, 2703, 194608, 0, 2109, 9774, 1275, 0, 983750, 41095, 3962, 68242, - 2932, 41101, 3954, 6457, 4513, 74536, 127189, 73994, 73992, 1468, 120033, - 983057, 41803, 127999, 41846, 127244, 55238, 7633, 41849, 68385, 4320, - 3224, 113734, 92741, 66281, 42531, 74593, 1510, 128384, 8256, 0, 11393, - 0, 8879, 128075, 92474, 8770, 72416, 120811, 72415, 1910, 8671, 78374, - 4283, 68842, 120824, 68361, 78318, 2654, 7893, 195006, 128241, 0, 72394, - 65106, 42761, 12857, 4581, 8411, 78372, 78371, 78370, 78369, 78368, - 74475, 983444, 0, 1733, 4392, 2568, 10786, 69661, 0, 8184, 41486, 0, - 7396, 7116, 0, 69788, 0, 7185, 7965, 119144, 128447, 92347, 195066, - 41350, 9129, 983448, 0, 2294, 64501, 68034, 83326, 10481, 0, 70022, 7171, - 0, 340, 71105, 93972, 67360, 0, 92200, 128249, 124979, 6764, 127487, - 128393, 0, 92509, 128962, 65203, 11392, 119098, 119359, 119073, 3210, 0, - 0, 118795, 82958, 94101, 127484, 917619, 119149, 0, 10043, 121215, 1186, + 118822, 1750, 128686, 4394, 68368, 1807, 78545, 92298, 101082, 5889, + 128795, 7180, 101083, 67127, 101091, 67126, 42471, 6982, 1721, 44022, + 7891, 42243, 42160, 2583, 4512, 119360, 65230, 128109, 983467, 917630, + 3855, 194810, 11767, 127998, 983589, 74295, 194577, 100797, 92416, 3975, + 67125, 74087, 74989, 12672, 3798, 2703, 100793, 0, 2109, 9774, 1275, + 194964, 983750, 41095, 3962, 68242, 2932, 41101, 3954, 6457, 4513, 74536, + 100947, 73994, 73992, 1468, 120033, 983057, 41803, 127999, 41846, 127244, + 55238, 7633, 41849, 68385, 4320, 3224, 100755, 92741, 66281, 42531, + 74593, 1510, 128384, 8256, 983043, 11393, 0, 8879, 128075, 92474, 8770, + 72416, 120811, 72415, 1910, 8671, 78374, 4283, 68842, 72787, 68361, + 78318, 2654, 7893, 129151, 128241, 100802, 72394, 65106, 42761, 12857, + 4581, 8411, 78372, 78371, 78370, 78369, 78368, 74475, 983143, 0, 1733, + 4392, 2568, 10786, 69661, 0, 8184, 41486, 128644, 7396, 7116, 0, 69788, + 100790, 7185, 7965, 119144, 128447, 92347, 195066, 41350, 9129, 983448, + 983619, 2294, 64501, 68034, 83326, 10481, 0, 70022, 7171, 0, 340, 71105, + 93972, 67360, 194942, 92200, 128249, 124979, 6764, 120804, 128393, 0, + 92509, 128962, 65203, 11392, 119098, 119359, 119073, 3210, 0, 100632, + 118795, 82958, 94101, 127484, 917619, 119149, 73926, 10043, 121215, 1186, 41571, 6999, 617, 9464, 125123, 3675, 5207, 65062, 5213, 74616, 2617, - 41348, 41568, 128803, 3253, 120535, 0, 8630, 121209, 0, 5596, 5545, 7288, - 2586, 64887, 119826, 5217, 71336, 128687, 917614, 121038, 64293, 68098, - 2635, 92760, 83137, 983846, 0, 92742, 7835, 70040, 120707, 194988, 92285, - 64558, 127122, 121425, 67083, 67085, 70099, 71118, 5784, 983102, 195050, - 983812, 70033, 4011, 194565, 68101, 124978, 7864, 4254, 65095, 983498, - 5600, 3903, 127083, 10447, 5598, 1207, 120521, 66689, 3501, 42582, 43600, - 129054, 127103, 1124, 5597, 194778, 194772, 9321, 983486, 75040, 983484, - 67400, 1719, 68356, 68354, 9671, 1125, 4399, 68775, 66274, 983490, 7631, - 5488, 7128, 120532, 0, 5491, 118797, 8937, 43044, 2604, 74187, 5490, - 43046, 5489, 7212, 11768, 43043, 6300, 127121, 7122, 983090, 4390, 454, - 41397, 0, 9875, 7593, 194791, 92274, 118913, 7207, 0, 65901, 2394, 2575, - 119184, 3746, 11016, 65752, 92757, 0, 43423, 128683, 11989, 118889, - 127791, 127995, 78296, 0, 8249, 128172, 11109, 78531, 6640, 74806, 2598, - 513, 127118, 6586, 8656, 129301, 69792, 65008, 194597, 71111, 78383, - 194795, 127474, 92515, 68475, 93973, 194584, 63799, 78637, 12647, 917606, - 128043, 69893, 1036, 68090, 92419, 1723, 68215, 74217, 0, 41579, 2444, - 120722, 10705, 73876, 195054, 74486, 983469, 740, 119222, 194978, 194984, - 0, 4238, 11071, 9459, 43936, 43938, 78139, 194985, 8121, 10438, 74487, - 42574, 13285, 43967, 11907, 43928, 5690, 92255, 5116, 0, 43181, 13095, - 77925, 43926, 64498, 0, 9506, 6978, 70176, 74931, 0, 113743, 78379, - 43934, 127845, 1122, 317, 0, 71055, 120621, 0, 1920, 0, 10173, 827, 0, 0, - 78378, 119600, 5223, 1304, 0, 83526, 5226, 12602, 94044, 5880, 9329, - 7758, 9239, 41173, 5224, 5487, 1222, 5692, 41725, 69229, 9674, 5695, - 41711, 64627, 19909, 71077, 74604, 5691, 287, 866, 233, 68138, 983443, - 42816, 94036, 65140, 68028, 83093, 8830, 6568, 42300, 10524, 41175, - 83094, 983447, 68827, 5296, 983446, 42492, 43402, 92466, 3302, 0, 74858, - 6516, 6515, 6514, 6513, 6512, 0, 7856, 8690, 983686, 70870, 12122, - 119602, 43976, 194937, 1785, 69925, 68622, 65153, 68809, 5138, 983637, - 71922, 118869, 0, 4540, 41181, 917920, 6200, 0, 5134, 69980, 322, 4643, - 5132, 121184, 6389, 120998, 5143, 83205, 8790, 120911, 120121, 128695, - 71168, 8869, 69916, 93069, 42060, 71326, 9648, 83109, 71170, 10270, - 10286, 10318, 10382, 43529, 66477, 194800, 128534, 74170, 0, 3234, 43835, - 917818, 70111, 43139, 118815, 127084, 120627, 8767, 68231, 74489, 9695, - 72439, 5201, 75061, 6215, 12714, 6214, 13101, 0, 194999, 65268, 7661, 0, + 41348, 41568, 128803, 3253, 120535, 0, 8630, 121209, 194770, 5596, 5545, + 7288, 2586, 64887, 100896, 5217, 71336, 128687, 100898, 121038, 64293, + 68098, 2635, 92760, 83137, 983846, 0, 92742, 7835, 70040, 120707, 194950, + 92285, 64558, 127122, 121425, 67083, 67085, 70099, 71118, 5784, 983102, + 100854, 983812, 70033, 4011, 194565, 68101, 100859, 7864, 4254, 65095, + 120017, 5600, 3903, 100892, 10447, 5598, 1207, 120521, 66689, 3501, + 42582, 43600, 129054, 100913, 1124, 5597, 194778, 194772, 9321, 983486, + 75040, 917972, 67400, 1719, 68356, 68354, 9671, 1125, 4399, 68775, 66274, + 92165, 7631, 5488, 7128, 120532, 120339, 5491, 118797, 8937, 43044, 2604, + 74187, 5490, 43046, 5489, 7212, 11768, 43043, 6300, 127121, 7122, 983090, + 4390, 454, 41397, 983055, 9875, 7593, 194791, 92274, 118913, 7207, + 125062, 65901, 2394, 2575, 119184, 3746, 11016, 65752, 92757, 0, 43423, + 128683, 11989, 118889, 127791, 127995, 78296, 68224, 8249, 2232, 11109, + 78531, 6640, 74806, 2598, 513, 100714, 6586, 8656, 129301, 69792, 65008, + 194597, 71111, 78383, 127252, 127474, 66755, 68475, 93973, 72859, 63799, + 78637, 12647, 917606, 128043, 69893, 1036, 68090, 92419, 1723, 68215, + 74217, 0, 41579, 2444, 120722, 10705, 73876, 195054, 74486, 983469, 740, + 119222, 120305, 194984, 0, 4238, 11071, 9459, 43936, 43938, 78139, + 194985, 8121, 10438, 74487, 42574, 13285, 43967, 11907, 43928, 5690, + 92255, 5116, 128013, 43181, 13095, 77925, 43926, 64498, 0, 9506, 6978, + 70176, 74931, 0, 113743, 78379, 43934, 127845, 1122, 317, 194870, 71055, + 120621, 0, 1920, 129339, 10173, 827, 125236, 0, 78378, 119600, 5223, + 1304, 0, 83526, 5226, 12602, 94044, 5880, 9329, 7758, 9239, 41173, 5224, + 5487, 1222, 5692, 41725, 69229, 9674, 5695, 41711, 64627, 19909, 71077, + 74604, 5691, 287, 866, 233, 68138, 983443, 42816, 94036, 65140, 68028, + 83093, 8830, 6568, 42300, 10524, 41175, 83094, 983447, 68827, 5296, + 983446, 42492, 43402, 92466, 3302, 0, 72842, 6516, 6515, 6514, 6513, + 6512, 0, 7856, 8690, 983686, 70870, 12122, 119602, 43976, 125194, 1785, + 69925, 68622, 65153, 68809, 5138, 129420, 71922, 118869, 100883, 4540, + 41181, 917920, 6200, 82949, 5134, 69980, 322, 4643, 5132, 121184, 6389, + 120998, 5143, 83205, 8790, 120911, 120121, 128695, 71168, 8869, 69916, + 93069, 42060, 71326, 9648, 83109, 71170, 10270, 10286, 10318, 10382, + 43529, 66477, 194800, 125231, 74170, 0, 3234, 43835, 100886, 70111, + 43139, 118815, 127084, 120627, 8767, 68231, 74489, 9695, 72439, 5201, + 75061, 6215, 12714, 6214, 13101, 127869, 194999, 65268, 7661, 121308, 120909, 11027, 128596, 10059, 10511, 42075, 9767, 789, 1749, 78890, - 67115, 983670, 320, 0, 8647, 83054, 3049, 0, 6471, 42071, 43156, 9925, - 127356, 118894, 66478, 4960, 5549, 127359, 127346, 8485, 4671, 5418, + 66766, 983670, 320, 0, 8647, 83054, 3049, 0, 6471, 42071, 43156, 9925, + 127356, 118894, 66478, 4960, 5549, 127359, 100996, 8485, 4671, 5418, 127350, 3351, 120892, 127351, 10610, 5414, 3064, 6212, 4286, 5421, 127344, 9554, 68051, 94048, 66896, 6653, 83044, 83102, 64510, 6213, - 12885, 0, 119045, 64720, 917873, 120759, 73741, 12603, 7131, 11108, 4566, - 7518, 9317, 3801, 10342, 10406, 124938, 119259, 42576, 0, 5200, 92946, - 121435, 983895, 9183, 127361, 74458, 66282, 395, 5482, 5198, 4349, 10390, - 74202, 5196, 43224, 6113, 42009, 5205, 128383, 43307, 70297, 118973, - 70467, 12134, 121167, 0, 118843, 9126, 435, 983624, 12014, 10377, 8093, - 9079, 3203, 192, 65109, 3385, 125075, 64430, 5383, 10294, 10326, 127309, - 5738, 120089, 3336, 78355, 5361, 3623, 41159, 83378, 68112, 7872, 8581, - 0, 1260, 3149, 5359, 120134, 74955, 7914, 5357, 71190, 74339, 2624, 5364, - 983608, 11431, 120030, 9101, 11058, 78288, 67107, 78293, 42271, 78289, - 42917, 67111, 129179, 65566, 6717, 10619, 43360, 78291, 78384, 11832, - 78382, 78381, 78380, 69861, 9319, 7097, 119055, 77906, 3232, 73824, - 74581, 78087, 0, 71205, 41889, 92453, 129144, 1161, 41895, 74103, 9701, - 8622, 125025, 0, 68772, 120588, 5012, 71453, 41362, 69862, 68507, 11921, - 0, 11769, 68782, 68609, 41364, 120947, 74228, 41352, 41361, 917903, - 41366, 0, 3356, 11611, 917, 68422, 119915, 7134, 8199, 78389, 119618, - 677, 119916, 917876, 71482, 127169, 68747, 0, 68738, 3349, 74125, 7022, - 8927, 4739, 92599, 5802, 194874, 8615, 0, 128058, 491, 74401, 10190, - 68755, 65837, 68800, 8426, 11092, 9891, 0, 42497, 7113, 7586, 42305, - 10852, 0, 42648, 4606, 68448, 9095, 7741, 12684, 41885, 1046, 7124, - 128610, 68753, 5815, 5171, 65539, 68612, 6932, 74267, 42394, 41878, - 74849, 74947, 72424, 5169, 11935, 0, 0, 3175, 120822, 1537, 120804, 5176, - 8905, 4136, 4871, 78287, 120663, 9833, 0, 113730, 1128, 65920, 917879, - 9711, 7057, 9408, 9409, 9410, 9411, 3662, 9413, 3378, 9415, 9416, 9417, - 9418, 6320, 9420, 9421, 5897, 9423, 5165, 5126, 41385, 983938, 41389, - 127963, 8955, 3374, 9400, 9401, 7119, 9403, 9404, 3507, 9406, 7629, - 983617, 19925, 42669, 68463, 183, 43985, 2631, 70811, 10627, 41130, - 71079, 3996, 0, 71442, 128913, 119313, 119307, 78768, 6580, 4332, 64825, - 66329, 10726, 66686, 41125, 5899, 41365, 127206, 12085, 66902, 574, - 126705, 77825, 73828, 5448, 41058, 5446, 65932, 41322, 42211, 5442, 4190, - 77834, 77835, 5451, 77833, 3616, 77828, 68817, 77838, 7708, 74759, 2228, - 65867, 10345, 10409, 4191, 120378, 77844, 73800, 42181, 77843, 77839, - 2060, 121193, 7111, 11788, 65376, 68129, 10415, 74102, 983625, 205, - 83040, 10351, 67151, 0, 9862, 6588, 43257, 64697, 73998, 41355, 5505, - 74966, 5503, 8021, 128035, 7125, 9819, 41357, 8011, 42885, 5507, 12044, - 92636, 0, 10026, 5472, 7109, 1191, 13106, 5470, 10329, 5476, 8991, 66322, - 69778, 11133, 42874, 8550, 42876, 5592, 2919, 129052, 2675, 5595, 78411, - 43762, 4367, 127912, 917782, 5478, 5904, 5594, 0, 74150, 7291, 5590, - 43761, 13067, 118909, 75069, 983108, 9731, 69731, 64633, 77857, 77854, - 71217, 77852, 71227, 77850, 10750, 43714, 77858, 7137, 0, 66909, 12887, - 10551, 194564, 77866, 77867, 77864, 77865, 9929, 5199, 9936, 1120, 42387, - 0, 1444, 9486, 7554, 65839, 55252, 73972, 1442, 129080, 5894, 70069, - 128672, 41171, 92511, 70358, 1323, 13162, 120599, 3334, 128704, 92709, - 77881, 66022, 0, 69770, 1651, 120364, 8861, 0, 0, 1142, 983112, 8271, 0, - 983058, 126645, 12903, 78406, 4002, 43626, 10442, 10676, 3344, 128910, - 194787, 12920, 194560, 70497, 194687, 66642, 1277, 66876, 7871, 67106, - 71487, 78853, 129068, 78854, 120360, 983492, 11784, 0, 78012, 4700, - 43856, 78858, 120359, 11012, 983627, 78856, 78448, 77879, 4973, 8784, - 77877, 74804, 77874, 77869, 77871, 42440, 71225, 43118, 119875, 42364, - 6774, 6773, 917560, 120369, 10346, 10410, 78859, 9243, 2464, 74263, 6108, - 3372, 0, 6247, 43117, 70364, 7121, 74166, 124973, 120355, 92537, 194846, - 119877, 195034, 70357, 119922, 0, 67119, 3354, 195037, 4192, 9289, - 118999, 41191, 3876, 0, 70067, 120660, 43696, 43380, 0, 983091, 983965, - 983758, 11603, 983954, 75074, 6589, 128564, 82975, 120993, 67812, 983700, - 0, 129087, 42572, 128264, 10630, 74827, 1963, 11622, 118882, 11654, - 121287, 7550, 10686, 5903, 67098, 78009, 41329, 9662, 917937, 64698, - 3366, 10399, 917938, 5542, 11013, 127927, 71062, 194677, 71461, 67090, - 6925, 0, 0, 92892, 71856, 11568, 983673, 43367, 64579, 917930, 7852, - 11138, 0, 6754, 6312, 77956, 64672, 65296, 0, 118957, 0, 416, 12296, - 68457, 73834, 68177, 11050, 10984, 92208, 0, 0, 92182, 129146, 983605, - 9532, 66355, 119264, 68073, 113695, 64343, 195032, 92744, 195031, 0, - 194847, 195057, 11445, 68294, 2112, 128741, 128814, 10185, 1021, 128130, - 9507, 10210, 74544, 8023, 1200, 12243, 78001, 5282, 78003, 9624, 11545, - 0, 120276, 3343, 4424, 11047, 1885, 43268, 3896, 78444, 66497, 2947, 392, - 7894, 4391, 68139, 121064, 13059, 74816, 77998, 3381, 7942, 0, 69219, - 92433, 3558, 129190, 3913, 70429, 121376, 78235, 7044, 1265, 0, 6309, - 7045, 7175, 7047, 78239, 11791, 983122, 917587, 8221, 78307, 41864, 0, 0, - 67075, 71219, 167, 983906, 78301, 983653, 74211, 41897, 67072, 0, 917583, - 127140, 67076, 2493, 0, 113778, 121245, 78107, 64354, 0, 8777, 127940, - 406, 8884, 2385, 78210, 92450, 917590, 917573, 43030, 42027, 12114, 0, - 128597, 64936, 194695, 119267, 120629, 10561, 128940, 8365, 120539, - 983774, 65841, 120787, 11601, 0, 74121, 128896, 83176, 7834, 74159, 0, - 917574, 10298, 6624, 4908, 917577, 1639, 120842, 0, 70803, 6327, 6724, - 124953, 66354, 92566, 69910, 4817, 11087, 194759, 92536, 7043, 9600, - 11022, 0, 0, 0, 983599, 0, 73954, 7548, 64794, 42050, 12291, 55289, - 128781, 12343, 657, 67110, 42705, 4461, 1134, 1838, 78438, 2057, 0, 4468, - 92891, 194945, 83056, 4456, 5206, 10720, 0, 42523, 127520, 0, 93044, - 129411, 65550, 260, 4816, 67658, 10687, 0, 4821, 4466, 0, 83182, 4818, - 129058, 41403, 119977, 72422, 128458, 41406, 43273, 74160, 69805, 73939, - 92638, 119984, 119979, 41404, 1165, 119980, 4451, 13087, 0, 11284, - 119987, 70097, 65155, 43014, 5439, 9363, 70070, 3375, 128448, 5900, - 93990, 7889, 2722, 42262, 983481, 0, 67078, 128451, 2282, 121422, 127810, - 11401, 67079, 0, 68459, 125028, 983141, 0, 70150, 65438, 0, 7280, 127887, - 68055, 70146, 4868, 8297, 119966, 70148, 125008, 128744, 43161, 70144, - 92360, 0, 5182, 0, 120542, 0, 0, 4226, 70186, 12135, 5732, 4464, 195083, - 71330, 977, 4458, 43827, 92971, 64770, 74838, 0, 344, 0, 121228, 1395, - 64279, 0, 92240, 121179, 786, 126995, 43174, 64340, 83077, 194767, 73971, - 43026, 7612, 10132, 64413, 65025, 0, 0, 0, 93956, 983917, 68444, 0, - 92437, 124928, 92549, 10204, 92656, 83078, 119271, 128431, 1399, 121463, - 65217, 121465, 8852, 120808, 241, 121469, 4907, 128427, 983639, 7932, - 9727, 128463, 74255, 8748, 0, 128428, 983631, 0, 42780, 55263, 113677, - 983560, 4217, 93034, 8650, 127991, 120673, 128215, 69900, 118872, 43099, - 3965, 119119, 6719, 128007, 13300, 78439, 93971, 43057, 66588, 118991, - 66289, 120902, 73815, 4420, 983120, 6410, 7760, 0, 70468, 128752, 120684, - 121246, 7294, 128218, 43869, 120859, 9066, 121321, 11993, 43188, 2626, - 7762, 983866, 118831, 92899, 92601, 42825, 41854, 5304, 70290, 78516, - 6919, 8619, 119655, 10038, 66454, 9592, 42851, 120537, 1542, 92303, - 128819, 0, 127327, 121199, 74311, 78497, 0, 10181, 124937, 43624, 129060, - 7779, 917551, 10195, 9479, 6029, 128374, 92268, 2224, 0, 65577, 8993, - 66358, 0, 42378, 3368, 606, 127030, 7697, 69237, 69787, 2030, 70106, - 6027, 8370, 4322, 0, 65207, 0, 70386, 127903, 983339, 983338, 2735, - 42831, 77935, 70439, 74866, 8881, 119047, 0, 70433, 73946, 0, 194703, 0, + 12885, 127375, 119045, 64720, 917873, 120759, 70737, 12603, 7131, 11108, + 4566, 7518, 9317, 3801, 10342, 10406, 124938, 119259, 42576, 125237, + 5200, 92946, 121435, 983683, 9183, 127361, 74458, 66282, 395, 5482, 5198, + 4349, 10390, 74202, 5196, 43224, 6113, 42009, 5205, 128383, 43307, 70297, + 118973, 70467, 12134, 121167, 0, 118843, 9126, 435, 983624, 12014, 10377, + 8093, 9079, 3203, 192, 65109, 3385, 125075, 64430, 5383, 10294, 10326, + 120932, 5738, 120089, 3336, 78355, 5361, 3623, 41159, 83378, 68112, 7872, + 8581, 983771, 1260, 3149, 5359, 120134, 74955, 7914, 5357, 71190, 74339, + 2624, 5364, 128881, 11431, 100659, 9101, 11058, 78288, 67107, 78293, + 42271, 78289, 42917, 67111, 129179, 65566, 6717, 10619, 43360, 78291, + 78384, 11832, 78382, 78381, 78380, 69861, 9319, 7097, 119055, 77906, + 3232, 73824, 74581, 78087, 983817, 71205, 41889, 92453, 129144, 1161, + 41895, 74103, 9701, 8622, 125025, 0, 68772, 120588, 5012, 71453, 41362, + 69862, 68507, 11921, 0, 11769, 68782, 68609, 41364, 120947, 74228, 41352, + 41361, 917903, 41366, 194809, 3356, 11611, 917, 68422, 119915, 7134, + 8199, 78389, 119618, 677, 119916, 917876, 71482, 127169, 68747, 0, 68738, + 3349, 74125, 7022, 8927, 4739, 92599, 5802, 120047, 8615, 0, 128058, 491, + 74401, 10190, 68755, 65837, 68800, 8426, 11092, 9891, 0, 42497, 7113, + 7586, 42305, 10852, 917580, 42648, 4606, 68448, 9095, 7741, 12684, 41885, + 1046, 7124, 128610, 68753, 5815, 5171, 65539, 68612, 6932, 74267, 42394, + 41878, 74849, 72789, 72424, 5169, 11935, 0, 0, 3175, 120822, 1537, + 119049, 5176, 8905, 2267, 4871, 78287, 120663, 9833, 194850, 113730, + 1128, 65920, 917879, 9711, 7057, 9408, 9409, 9410, 9411, 3662, 9413, + 3378, 9415, 9416, 9417, 9418, 6320, 9420, 9421, 5897, 9423, 5165, 5126, + 41385, 194844, 41389, 127963, 8955, 3374, 9400, 9401, 7119, 9403, 9404, + 3507, 9406, 7629, 983617, 19925, 42669, 68463, 183, 43985, 2631, 70811, + 10627, 41130, 71079, 3996, 0, 71442, 100864, 119313, 119307, 78768, 6580, + 4332, 64825, 66329, 10726, 66686, 41125, 5899, 41365, 127206, 12085, + 66902, 574, 126705, 77825, 73828, 5448, 41058, 5446, 65932, 41322, 42211, + 5442, 4190, 77834, 77835, 5451, 77833, 3616, 77828, 68817, 77838, 7708, + 74759, 2228, 65867, 10345, 10409, 4191, 120378, 77844, 73800, 42181, + 77843, 77839, 2060, 121193, 7111, 11788, 65376, 68129, 10415, 72741, + 195025, 205, 83040, 10351, 67151, 0, 9862, 6588, 43257, 64697, 73998, + 41355, 5505, 70736, 5503, 8021, 128035, 7125, 9819, 41357, 8011, 42885, + 5507, 12044, 92364, 100742, 10026, 5472, 7109, 1191, 13106, 5470, 10329, + 5476, 8991, 66322, 69778, 11133, 42874, 8550, 42876, 5592, 2919, 74516, + 2675, 5595, 78411, 43762, 4367, 83518, 917782, 5478, 5904, 5594, 0, + 74150, 7291, 5590, 43761, 13067, 118909, 75069, 983108, 9731, 69731, + 64633, 77857, 77854, 71217, 77852, 71227, 77850, 10750, 43714, 77858, + 7137, 0, 66909, 12887, 10551, 194564, 77866, 77867, 77864, 77865, 9929, + 5199, 9936, 1120, 42387, 0, 1444, 9486, 7554, 65839, 55252, 72832, 1442, + 129080, 5894, 70069, 128672, 41171, 92511, 70358, 1323, 13162, 120599, + 3334, 128704, 92709, 77881, 66022, 70705, 69770, 1651, 120364, 8861, 0, + 917588, 1142, 983112, 8271, 0, 983058, 126645, 12903, 78406, 4002, 43626, + 10442, 10676, 3344, 128910, 194787, 12920, 194560, 70497, 194687, 66642, + 1277, 66876, 7871, 67106, 71487, 78853, 129068, 78854, 120360, 983492, + 11784, 0, 78012, 4700, 43856, 78858, 120359, 11012, 983627, 78856, 78448, + 77879, 4973, 8784, 77877, 74804, 77874, 77869, 66743, 42440, 71225, + 43118, 119875, 42364, 6774, 6773, 917560, 120369, 10346, 10410, 78859, + 9243, 2464, 74263, 6108, 3372, 122890, 6247, 43117, 70364, 7121, 74166, + 124973, 120355, 92537, 194846, 119877, 195034, 70357, 119922, 0, 67119, + 3354, 195037, 4192, 9289, 118999, 41191, 3876, 0, 70067, 120660, 43696, + 43380, 983625, 983091, 129342, 128450, 11603, 129347, 75074, 6589, + 127360, 82975, 120993, 67812, 127190, 194680, 129087, 42572, 128264, + 10630, 74827, 1963, 11622, 118882, 11654, 121287, 7550, 10686, 5903, + 67098, 78009, 41329, 9662, 917937, 64698, 3366, 10399, 917938, 5542, + 11013, 127927, 71062, 125224, 71461, 67090, 6925, 983274, 0, 92892, + 71856, 11568, 983131, 43367, 64579, 917930, 7852, 11138, 0, 6754, 6312, + 77956, 64672, 65296, 0, 118957, 0, 416, 12296, 68457, 73834, 68177, + 11050, 10984, 92208, 983216, 917822, 92182, 129146, 194636, 9532, 66355, + 119264, 68073, 113695, 64343, 195032, 92744, 127243, 0, 194847, 78838, + 11445, 68294, 2112, 128741, 128814, 10185, 1021, 128130, 9507, 10210, + 74544, 8023, 1200, 12243, 78001, 5282, 72850, 9624, 11545, 0, 120276, + 3343, 4424, 11047, 1885, 43268, 3896, 78444, 66497, 2947, 392, 7894, + 4391, 68139, 121064, 13059, 74816, 77998, 3381, 7942, 0, 69219, 92433, + 3558, 129190, 3913, 70429, 121376, 78235, 7044, 1265, 194660, 6309, 7045, + 7175, 7047, 78239, 11791, 983122, 194584, 3881, 78307, 41864, 127395, + 125208, 67075, 71219, 167, 121101, 72755, 983653, 74211, 41897, 67072, 0, + 917583, 66745, 67076, 2493, 0, 113778, 120530, 78107, 64354, 917593, + 8777, 127940, 406, 8884, 2385, 78210, 92450, 917590, 917573, 43030, + 42027, 12114, 0, 128597, 64936, 100763, 119267, 3421, 10561, 128940, + 8365, 74294, 983774, 65841, 120787, 11601, 0, 74121, 128896, 83176, 7834, + 74159, 0, 917574, 10298, 6624, 4908, 917577, 1639, 120842, 983586, 70803, + 6327, 6724, 71269, 66354, 92566, 69910, 4817, 11087, 194759, 92536, 7043, + 9600, 11022, 128427, 129344, 128354, 983599, 983209, 66771, 7548, 64794, + 42050, 12291, 55289, 128781, 12343, 657, 67110, 42705, 4461, 1134, 1838, + 78438, 2057, 0, 4468, 92891, 127372, 83056, 4456, 5206, 10720, 0, 42523, + 127520, 0, 93044, 128430, 65550, 260, 4816, 67658, 10687, 129319, 4821, + 4466, 0, 83182, 4818, 125257, 41403, 119977, 72422, 128458, 41406, 43273, + 74160, 69805, 73939, 92638, 119984, 119979, 41404, 1165, 119980, 4451, + 13087, 0, 11284, 119987, 70097, 65155, 43014, 5439, 9363, 70070, 3375, + 128448, 5900, 93990, 7889, 2722, 42262, 128313, 0, 67078, 128451, 2282, + 121422, 127810, 11401, 67079, 0, 68459, 125028, 983141, 0, 70150, 65438, + 983760, 7280, 127887, 68055, 70146, 4868, 8297, 119966, 70148, 125008, + 128744, 43161, 66739, 92360, 195070, 5182, 194692, 120542, 72764, 128588, + 4226, 70186, 12135, 5732, 4464, 195083, 71330, 977, 4458, 43827, 92971, + 64770, 74838, 0, 344, 121466, 121228, 1395, 64279, 0, 92240, 121179, 786, + 126995, 43174, 64340, 83077, 194767, 73971, 43026, 7612, 10132, 64413, + 65025, 0, 983468, 128303, 74151, 983917, 68444, 0, 92437, 124928, 92549, + 10204, 92656, 83078, 119271, 128431, 1399, 121463, 65217, 121465, 8852, + 120808, 241, 121469, 4907, 128161, 917927, 7932, 9727, 128463, 74255, + 8748, 0, 128428, 128646, 0, 42780, 55263, 113677, 119856, 4217, 93034, + 8650, 127991, 120673, 72878, 69900, 118872, 43099, 3965, 119119, 6719, + 128007, 13300, 78439, 72836, 43057, 66588, 118991, 66289, 120902, 73815, + 4420, 128533, 6410, 7760, 100999, 70468, 128752, 120684, 100528, 7294, + 128218, 43869, 68204, 9066, 121321, 11993, 43188, 2626, 7762, 983866, + 118831, 92899, 92601, 42825, 41854, 5304, 70290, 78516, 6919, 8619, + 119655, 10038, 66454, 9592, 42851, 120537, 1542, 92303, 128819, 0, + 124940, 121199, 74311, 78497, 121412, 10181, 124937, 43624, 129060, 7779, + 917551, 10195, 9479, 6029, 128374, 92268, 2224, 101079, 65577, 8993, + 66358, 0, 42378, 3368, 606, 66804, 7697, 69237, 69787, 2030, 70106, 6027, + 8370, 4322, 0, 65207, 120629, 70386, 127903, 983339, 983338, 2735, 42831, + 77935, 70439, 74866, 8881, 119047, 129364, 70433, 73946, 0, 194703, 0, 68140, 983928, 9576, 70288, 3347, 4160, 5154, 55288, 3794, 66564, 8530, 127063, 7709, 41112, 119868, 66560, 8381, 4572, 12876, 66561, 128921, - 6758, 66031, 1615, 5855, 809, 127117, 92283, 128316, 128004, 5799, - 128929, 70100, 128607, 7260, 983326, 43031, 64425, 65128, 78819, 64386, - 65257, 74909, 68616, 120607, 9347, 83360, 6532, 0, 917918, 120860, - 127060, 65828, 120006, 283, 68665, 78813, 532, 78663, 78817, 128021, - 120609, 0, 3370, 917881, 11361, 5443, 71431, 8153, 73767, 0, 10741, - 121503, 2298, 0, 125039, 65495, 64706, 983320, 43344, 983318, 7144, 9466, - 78866, 9824, 67142, 128963, 67133, 67130, 915, 43425, 67292, 43865, - 68232, 983111, 120888, 43264, 67136, 67137, 0, 43038, 78864, 6730, 78862, - 68161, 64550, 5186, 7360, 127837, 70451, 12108, 120644, 65124, 43127, - 66043, 0, 6326, 43107, 77826, 0, 42562, 0, 128821, 128178, 120919, 11485, - 6103, 92468, 983307, 11718, 983305, 12889, 92657, 125034, 120635, 127157, - 121128, 55245, 128709, 1630, 83027, 65483, 120634, 12565, 0, 65476, - 70369, 983072, 83029, 9283, 7700, 917537, 9690, 65499, 0, 64593, 512, - 3376, 68080, 0, 128253, 77892, 632, 12940, 77891, 42529, 78587, 194604, - 5957, 110593, 8926, 983301, 983300, 128273, 10745, 10174, 7379, 64581, - 5386, 120686, 11713, 10633, 69708, 5056, 0, 0, 0, 120773, 94055, 9812, 0, - 4460, 78791, 124956, 71307, 128038, 0, 121135, 127174, 64278, 92370, - 43466, 0, 0, 64389, 2953, 70122, 1801, 12835, 74847, 120867, 73823, - 83110, 66375, 2085, 702, 42579, 77884, 77885, 13074, 77883, 66299, - 983287, 71447, 12106, 120972, 74207, 1755, 10482, 12863, 77898, 1163, - 2951, 9522, 67816, 78266, 66604, 983860, 3384, 69227, 10702, 830, 77902, - 77899, 77900, 8451, 83324, 0, 0, 66458, 128957, 128870, 74896, 0, 2908, - 0, 11177, 64902, 4243, 92454, 12239, 121003, 124959, 4441, 0, 82968, - 73940, 64352, 127513, 125031, 411, 983275, 9199, 983273, 4056, 118992, - 41890, 128592, 2730, 41604, 128355, 5428, 194743, 3364, 42265, 64437, - 127935, 118816, 71458, 9684, 216, 71367, 1401, 128053, 44012, 92628, - 71456, 92585, 9158, 66878, 11126, 5768, 0, 983759, 0, 484, 194739, 0, 0, - 65895, 125076, 121380, 3338, 73935, 572, 7041, 2736, 67605, 127543, - 93962, 2794, 8807, 64491, 77847, 5438, 5222, 5381, 43114, 0, 5193, 5125, - 5456, 5509, 77846, 194747, 9534, 129109, 129040, 0, 3430, 0, 42905, - 78717, 74929, 981, 129184, 4330, 73929, 120536, 1824, 10908, 126506, - 7034, 41683, 64617, 0, 73754, 3957, 64358, 64547, 128259, 674, 63991, - 983251, 2946, 5354, 5251, 5328, 5307, 3759, 11411, 8364, 5123, 119628, - 5281, 5469, 5121, 77989, 118993, 0, 5130, 83180, 128357, 77990, 0, - 120726, 1221, 2733, 11746, 77991, 5216, 119268, 0, 128475, 92187, 3468, - 7033, 9230, 5939, 128397, 0, 5803, 71867, 68400, 7278, 10321, 10289, - 64613, 10385, 41706, 0, 0, 917939, 0, 11739, 77986, 41981, 92743, 5938, - 0, 43766, 12448, 7576, 10401, 10337, 73852, 124994, 13057, 0, 126976, - 129081, 10009, 0, 41703, 120950, 12165, 129191, 0, 9885, 0, 8077, 92620, - 127908, 121044, 194995, 0, 92457, 129138, 4220, 10725, 10433, 0, 68395, - 4987, 64519, 121265, 125078, 0, 194813, 128574, 10970, 11733, 0, 120792, - 126490, 19944, 74356, 9009, 8551, 92345, 11468, 64636, 7575, 0, 2724, - 128899, 0, 12313, 11151, 515, 119947, 42791, 63987, 78286, 119943, - 119940, 119941, 119938, 9775, 4046, 4589, 4521, 68629, 9141, 917904, - 78850, 2741, 64399, 6197, 1370, 0, 120841, 0, 125062, 983441, 120843, - 6184, 8606, 3303, 41372, 11786, 9473, 66203, 66177, 92446, 11593, 43007, - 4478, 66178, 0, 0, 2744, 0, 4477, 78267, 814, 42066, 66183, 66204, 43786, - 119961, 66198, 41880, 66188, 11623, 78148, 11955, 66190, 66191, 41111, - 66189, 73788, 7788, 4847, 983428, 127759, 0, 128433, 2221, 1581, 6535, + 6758, 66031, 1615, 5855, 809, 127117, 92283, 72853, 128004, 5799, 128929, + 70100, 128607, 7260, 983326, 43031, 64425, 65128, 78819, 64386, 65257, + 74909, 68616, 120607, 9347, 83360, 6532, 0, 195062, 120860, 127060, + 65828, 120006, 283, 68665, 78813, 532, 78642, 78817, 128021, 120609, 0, + 3370, 917881, 11361, 5443, 71431, 8153, 73767, 0, 10741, 121503, 2298, 0, + 125039, 65495, 64706, 983320, 43344, 983318, 7144, 9466, 78866, 9824, + 67142, 128963, 67133, 67130, 915, 43425, 67292, 43865, 68232, 983111, + 120888, 43264, 67136, 67137, 0, 43038, 78864, 6730, 78862, 68161, 64550, + 5186, 7360, 127837, 70451, 12108, 120644, 65124, 43127, 66043, 0, 6326, + 43107, 77826, 0, 42562, 0, 128821, 120328, 120919, 11485, 6103, 92468, + 121075, 11718, 983305, 12889, 92657, 125034, 120635, 101070, 121128, + 55245, 128709, 1630, 83027, 65483, 120634, 12565, 0, 65476, 70369, + 983072, 83029, 9283, 7700, 121192, 9690, 65499, 0, 64593, 512, 3376, + 68080, 0, 128253, 77892, 632, 12940, 77891, 42529, 78587, 101078, 5957, + 110593, 8926, 195072, 983300, 128273, 10745, 10174, 7379, 64581, 5386, + 120686, 11713, 10633, 69708, 5056, 100679, 127824, 12151, 120773, 94055, + 9812, 0, 4460, 78791, 124956, 71307, 128038, 0, 121135, 127174, 64278, + 92370, 43466, 0, 66760, 64389, 2953, 70122, 1801, 12835, 74847, 120867, + 73823, 83110, 66375, 2085, 702, 42579, 77884, 77885, 13074, 77883, 66299, + 194775, 71447, 12106, 120972, 74207, 1755, 10482, 12863, 77898, 1163, + 2951, 9522, 67816, 78266, 66604, 101059, 3384, 69227, 10702, 830, 77902, + 77899, 77900, 8451, 83324, 0, 0, 66458, 128957, 127301, 74896, 0, 2908, + 983558, 11177, 64902, 4243, 92454, 12239, 121003, 124959, 4441, 124929, + 82968, 73940, 64352, 127513, 121066, 411, 127525, 9199, 983273, 4056, + 118992, 41890, 128592, 2730, 41604, 128355, 5428, 194743, 3364, 42265, + 64437, 127935, 118816, 71458, 9684, 216, 71367, 1401, 128053, 44012, + 92628, 71456, 92585, 9158, 66878, 11126, 5768, 101064, 983759, 0, 484, + 194739, 0, 0, 65895, 125076, 100524, 3338, 73935, 572, 7041, 2736, 67605, + 127543, 93962, 2794, 8807, 64491, 77847, 5438, 5222, 5381, 43114, 128705, + 5193, 5125, 5456, 5509, 77846, 194747, 9534, 66767, 129040, 119967, 3430, + 983397, 42905, 78717, 74929, 981, 129184, 4330, 73929, 120536, 1824, + 10908, 126506, 7034, 41683, 64617, 119138, 73754, 3957, 64358, 64547, + 128259, 674, 63991, 983251, 2946, 5354, 5251, 5328, 5307, 3759, 11411, + 8364, 5123, 119628, 5281, 5469, 5121, 77989, 118993, 0, 5130, 83180, + 128357, 77990, 0, 120726, 1221, 2733, 11746, 77991, 5216, 119268, 0, + 128475, 92187, 3468, 7033, 9230, 5939, 128397, 120010, 5803, 71867, + 68400, 7278, 10321, 10289, 64613, 10385, 41706, 0, 0, 67115, 66753, + 11739, 77986, 41981, 92743, 5938, 0, 43766, 12448, 7576, 10401, 10337, + 73852, 100684, 13057, 983277, 126976, 129081, 10009, 917905, 41703, + 120950, 12165, 129191, 983757, 9885, 194814, 8077, 92620, 127908, 121044, + 194995, 0, 92457, 129138, 4220, 10725, 10433, 0, 68395, 4987, 64519, + 121265, 125078, 129185, 194813, 124999, 10970, 11733, 0, 120792, 126490, + 19944, 74356, 9009, 8551, 92345, 11468, 64636, 7575, 0, 2724, 100889, + 127390, 12313, 11151, 515, 119947, 42791, 63987, 78286, 119943, 119940, + 119941, 100890, 9775, 4046, 4589, 4521, 68629, 9141, 917904, 78850, 2741, + 64399, 6197, 1370, 983948, 120841, 0, 100887, 983441, 71273, 6184, 8606, + 3303, 41372, 11786, 9473, 66203, 3422, 92446, 11593, 43007, 4478, 66178, + 0, 0, 2744, 0, 4477, 78267, 814, 42066, 66183, 66204, 43786, 119961, + 66198, 41880, 66188, 11623, 78148, 11955, 66190, 66191, 41111, 66189, + 73788, 7788, 4847, 128366, 127759, 70725, 128433, 2221, 1581, 6535, 78161, 12954, 430, 78160, 55259, 73944, 128036, 5278, 4945, 42883, 4950, 983440, 68625, 983438, 7269, 128499, 5964, 12908, 124997, 0, 74764, - 43512, 119146, 194936, 4949, 983431, 443, 983429, 4944, 5467, 119603, - 70865, 65137, 6044, 65392, 0, 4213, 0, 41303, 917556, 194931, 119962, - 41306, 73984, 2698, 127159, 0, 12072, 3193, 0, 41304, 824, 128676, 12091, - 67118, 78894, 119816, 4673, 64804, 4678, 119820, 119819, 65059, 43860, - 6739, 66844, 5481, 3490, 1199, 119811, 8356, 69947, 67702, 4677, 12688, - 3102, 0, 4672, 78173, 78175, 5531, 68367, 42575, 78170, 78166, 4674, - 4548, 44005, 71087, 68658, 119946, 8025, 68630, 127024, 1855, 127475, - 68669, 118990, 92445, 127554, 126630, 127339, 119652, 2745, 11797, - 983419, 128159, 9202, 4654, 6840, 983416, 68638, 73993, 10525, 4649, - 65209, 121512, 121511, 4648, 43080, 75070, 121507, 983406, 6246, 64950, - 7828, 4650, 6777, 6776, 6775, 4653, 7822, 70287, 74624, 43187, 8669, - 120659, 6821, 65093, 983565, 78881, 2716, 983412, 983060, 70503, 194952, - 68369, 120054, 11060, 8547, 2711, 42165, 78027, 78026, 6836, 983423, 0, - 4662, 78033, 78032, 9149, 9146, 599, 2081, 78031, 78030, 194962, 4656, - 10130, 68450, 7811, 40994, 194965, 6414, 5967, 4658, 3725, 5713, 5814, - 4661, 42434, 983413, 128737, 11190, 64904, 9026, 10833, 74864, 7547, - 4867, 11100, 10008, 10222, 3054, 194956, 9744, 78860, 7605, 4622, 119656, - 43888, 70303, 983395, 69905, 67188, 9045, 78888, 4225, 19926, 68831, - 12880, 65307, 4617, 68757, 983388, 41732, 4616, 10518, 10423, 10359, - 983382, 5958, 0, 983435, 4215, 9789, 119619, 4321, 4621, 195028, 41313, - 522, 5368, 11139, 65803, 128546, 5366, 12201, 5372, 121060, 119949, - 194975, 7720, 7390, 2696, 983402, 0, 4638, 983407, 1790, 78242, 5965, - 64363, 66569, 68646, 68477, 5376, 1835, 5335, 121505, 128089, 4633, 0, - 68119, 1180, 4632, 67191, 5387, 5333, 0, 125132, 42094, 5331, 4634, - 11928, 983594, 5338, 4637, 128170, 5971, 42414, 43500, 1268, 65097, - 42361, 0, 0, 73853, 1427, 128440, 0, 5970, 3431, 0, 10358, 10422, 4758, - 983376, 1608, 2738, 125066, 10455, 4753, 74026, 11344, 4222, 6240, 5231, - 74384, 66611, 68377, 6248, 983364, 67815, 78878, 42318, 92582, 5229, - 4757, 0, 126576, 2728, 4752, 64563, 65235, 5234, 0, 128145, 128926, - 10713, 7166, 0, 2622, 7460, 83124, 67101, 126495, 8954, 74760, 65189, - 2632, 42617, 10108, 1011, 5574, 1853, 2709, 65139, 5577, 128966, 0, - 118871, 68641, 8965, 7635, 42177, 5316, 0, 5314, 6451, 5572, 66464, 5312, - 0, 5525, 5330, 5319, 68292, 127311, 65066, 44003, 68437, 983482, 43843, - 120498, 127851, 43918, 74851, 74022, 983424, 64609, 68643, 67410, 128593, - 5721, 74892, 5519, 8632, 66465, 11267, 73961, 92278, 5720, 78778, 1692, - 4219, 4610, 8696, 4305, 0, 4609, 43478, 4614, 541, 983242, 5287, 5309, - 5285, 68389, 5961, 4647, 56, 4216, 10577, 41381, 601, 4613, 120479, - 983348, 9208, 4608, 43966, 41124, 5190, 67628, 66826, 68145, 7086, 0, - 67998, 67620, 93047, 2734, 11074, 0, 67627, 43593, 0, 67625, 5960, 67722, - 8992, 42593, 128260, 1782, 67622, 68114, 119939, 0, 68180, 5501, 119952, - 42508, 7442, 43665, 359, 41253, 68392, 6239, 43900, 41256, 74132, 67740, - 0, 71178, 917550, 9346, 69660, 41254, 128047, 43291, 3767, 5737, 0, 4865, - 0, 5740, 917997, 5736, 4368, 64724, 7193, 67097, 128844, 5739, 41024, - 4866, 983880, 73904, 121420, 4869, 120563, 129172, 4223, 128201, 6650, - 126509, 0, 120212, 119872, 4870, 120445, 68661, 6716, 78176, 68667, - 68382, 68676, 127925, 10122, 4864, 66568, 4144, 7937, 83193, 6245, 68652, - 2732, 42734, 745, 68045, 195097, 92195, 4777, 7821, 129136, 68631, 42775, + 43512, 119146, 194936, 4949, 983431, 443, 122902, 4944, 5467, 119603, + 70865, 65137, 6044, 65392, 983119, 4213, 0, 41303, 917556, 194931, + 119962, 41306, 73984, 2698, 127159, 0, 12072, 3193, 0, 41304, 824, + 128676, 12091, 67118, 78894, 119816, 4673, 64804, 4678, 119820, 119819, + 65059, 43860, 6739, 66844, 5481, 3490, 1199, 119811, 8356, 69947, 67702, + 4677, 12688, 3102, 0, 4672, 78173, 78175, 5531, 68367, 42575, 78170, + 78166, 4674, 4548, 44005, 71087, 68658, 119946, 8025, 68630, 127024, + 1855, 127475, 68669, 118990, 92445, 127554, 126630, 127339, 119652, 2745, + 11797, 983419, 128159, 9202, 4654, 6840, 122909, 68638, 73993, 10525, + 4649, 65209, 121512, 120245, 4648, 43080, 75070, 121507, 983406, 6246, + 64950, 7828, 4650, 6777, 6776, 6775, 4653, 7822, 70287, 74624, 43187, + 8669, 120659, 6821, 65093, 983565, 78881, 2716, 983412, 983060, 66756, + 194952, 68369, 120054, 11060, 8547, 2711, 42165, 78027, 78026, 6836, + 983423, 983421, 4662, 78033, 78032, 9149, 9146, 599, 2081, 78031, 78030, + 194962, 4656, 10130, 68450, 7811, 40994, 194702, 6414, 5967, 4658, 3725, + 5713, 5814, 4661, 42434, 983413, 118997, 11190, 64904, 9026, 10833, + 74864, 7547, 4867, 11100, 10008, 10222, 3054, 194956, 9744, 78860, 7605, + 4622, 119656, 43888, 70303, 983395, 69905, 67188, 9045, 78888, 4225, + 19926, 68831, 12880, 65307, 4617, 68757, 78008, 41732, 4616, 10518, + 10423, 10359, 983382, 5958, 0, 983435, 4215, 9789, 119619, 4321, 4621, + 195028, 41313, 522, 5368, 11139, 65803, 128546, 5366, 12201, 5372, + 121060, 119948, 127064, 7720, 7390, 2696, 119657, 983115, 4638, 983407, + 1790, 78242, 5965, 64363, 66569, 68646, 68477, 5376, 1835, 5335, 121505, + 128089, 4633, 983418, 68119, 1180, 4632, 67191, 5387, 5333, 0, 125132, + 42094, 5331, 4634, 11928, 100952, 5338, 4637, 121070, 5971, 42414, 43500, + 1268, 65097, 42361, 128510, 917605, 73853, 1427, 128440, 0, 5970, 3431, + 983417, 10358, 10422, 4758, 983376, 1608, 2738, 125066, 10455, 4753, + 74026, 11344, 4222, 6240, 5231, 74384, 66611, 68377, 6248, 983364, 67815, + 78878, 42318, 92582, 5229, 4757, 125215, 126576, 2728, 4752, 64563, + 65235, 5234, 0, 128145, 127487, 10713, 7166, 0, 2622, 7460, 83124, 67101, + 126495, 8954, 74760, 65189, 2632, 42617, 10108, 1011, 5574, 1853, 2709, + 65139, 5577, 128966, 983088, 118871, 68641, 8965, 7635, 42177, 5316, + 917877, 5314, 6451, 5572, 66464, 5312, 127006, 5525, 5330, 5319, 68292, + 127311, 65066, 44003, 68437, 127299, 43843, 120498, 127851, 43918, 74851, + 74022, 983424, 64609, 68643, 67410, 128593, 5721, 74892, 5519, 8632, + 66465, 11267, 73961, 92278, 5720, 78778, 1692, 4219, 4610, 8696, 4305, + 75052, 4609, 43478, 4614, 541, 983242, 5287, 5309, 5285, 68389, 5961, + 4647, 56, 4216, 10577, 41381, 601, 4613, 120479, 983348, 9208, 4608, + 43966, 41124, 5190, 67628, 66826, 68145, 7086, 2265, 67998, 67620, 93047, + 2734, 11074, 0, 67627, 43593, 128758, 67625, 5960, 67722, 8992, 42593, + 128260, 1782, 67622, 68114, 119939, 0, 68180, 5501, 119952, 42508, 7442, + 43665, 359, 41253, 68392, 6239, 43900, 41256, 74132, 67740, 129309, + 71178, 917550, 9346, 69660, 41254, 128047, 43291, 3767, 5737, 917896, + 4865, 0, 5740, 917997, 5736, 4368, 64724, 7193, 67097, 128844, 5739, + 41024, 4866, 983855, 73904, 70726, 4869, 120563, 129172, 4223, 128201, + 6650, 126509, 0, 120212, 119872, 4870, 120445, 68661, 6716, 78176, 68667, + 68382, 68676, 127925, 10122, 4864, 66568, 4144, 7937, 72821, 6245, 68652, + 2732, 42734, 745, 68045, 128933, 92195, 4777, 7821, 128870, 68631, 42775, 194661, 128445, 120679, 3097, 120908, 5966, 121197, 4778, 126469, 10863, 127506, 4781, 92986, 64407, 128503, 128323, 8577, 71221, 68196, 43285, - 10216, 4782, 983485, 983411, 120757, 68618, 12325, 43056, 8717, 0, 0, - 4776, 73818, 11492, 8700, 129128, 13176, 68363, 10426, 67247, 71091, + 10216, 4782, 983485, 983411, 120757, 68618, 12325, 43056, 8717, 127118, + 0, 4776, 73818, 11492, 8700, 129128, 13176, 68363, 10426, 67247, 71091, 10362, 194706, 1715, 4849, 8242, 9561, 73922, 43278, 42635, 0, 127207, - 5963, 917926, 983483, 0, 4850, 73900, 1607, 466, 4853, 118995, 4854, + 5963, 120786, 125201, 0, 4850, 73900, 1607, 466, 4853, 118995, 4854, 127918, 5164, 73807, 1350, 5124, 64420, 1993, 5362, 8471, 2708, 92471, - 12445, 3785, 234, 3199, 121273, 41268, 4848, 2530, 74941, 2068, 1964, 0, - 73762, 10458, 983417, 8576, 78543, 0, 2704, 4794, 121102, 68211, 8322, - 4797, 5753, 0, 2694, 4792, 0, 2439, 65104, 69804, 983426, 303, 74625, - 68229, 983427, 2437, 78659, 4221, 4844, 92216, 0, 0, 0, 70042, 74095, - 43292, 0, 2441, 10739, 65090, 194622, 70436, 118929, 2451, 2714, 119326, - 0, 43379, 4937, 43376, 753, 5849, 10597, 43089, 11722, 9248, 92555, - 42879, 11725, 917969, 0, 2726, 3107, 73958, 4941, 64937, 119233, 9140, - 1408, 5261, 4607, 194715, 181, 983432, 4942, 9539, 4938, 0, 65201, 5259, - 9369, 64185, 4142, 5257, 983601, 6844, 4964, 5264, 64178, 64177, 12979, - 41411, 64182, 64181, 64180, 64179, 9482, 4873, 41231, 1822, 42526, - 127989, 12758, 3865, 194660, 121129, 10500, 0, 119024, 78028, 92408, - 9830, 43642, 389, 10893, 7521, 127879, 4872, 5463, 128119, 3125, 9567, 0, - 4878, 5459, 4604, 119650, 9557, 5465, 68617, 0, 11494, 126492, 9563, - 10865, 74570, 43279, 64186, 68521, 78714, 64191, 64190, 8898, 64188, - 129153, 41030, 74226, 78713, 74600, 74994, 917834, 0, 78805, 41031, - 78801, 11960, 6745, 3082, 983269, 78539, 73919, 10573, 41744, 7079, 5856, - 67838, 5163, 78809, 128162, 1817, 66724, 78538, 119010, 10564, 7763, - 13077, 41813, 4400, 41745, 64207, 10275, 8925, 10371, 10307, 41814, 4248, - 77979, 0, 4541, 6299, 64204, 64203, 64201, 64200, 64199, 64198, 126471, - 42156, 78688, 0, 64193, 64192, 65223, 9943, 64197, 64196, 64195, 64194, - 12231, 42652, 64174, 64173, 78189, 846, 78186, 9965, 74495, 83492, 83493, - 83494, 2543, 12163, 3108, 9745, 64167, 64166, 64165, 64164, 2110, 92176, - 64169, 64168, 64949, 10972, 10251, 10247, 42768, 715, 2295, 43299, 9453, - 5348, 10943, 66390, 0, 11352, 550, 9910, 125127, 0, 66579, 11551, 128464, - 195080, 9504, 7187, 82957, 10373, 983418, 120375, 10261, 10253, 6404, - 10277, 78183, 11984, 1552, 65222, 6998, 78180, 71429, 3128, 4789, 5067, - 5066, 118849, 4784, 0, 8827, 1146, 5065, 69890, 78192, 68136, 78190, - 43412, 5064, 2431, 0, 9450, 1809, 0, 78200, 78201, 5062, 1264, 64817, - 13254, 11697, 126598, 9785, 64716, 0, 3933, 74559, 4740, 7954, 0, 125023, - 42609, 119855, 74175, 66912, 127016, 0, 121300, 42130, 121046, 5151, - 121346, 83488, 0, 93980, 917802, 7620, 3800, 65122, 83487, 83480, 8355, + 12445, 3785, 234, 3199, 121273, 41268, 4848, 2530, 74941, 2068, 1964, + 128217, 73762, 10458, 128125, 8576, 78543, 0, 2704, 4794, 121102, 68211, + 8322, 4797, 5753, 0, 2694, 4792, 128163, 2439, 65104, 69804, 983426, 303, + 74625, 68229, 983420, 2437, 78659, 4221, 4844, 92216, 983805, 0, 0, + 70042, 74095, 43292, 983656, 2441, 10739, 65090, 194622, 70436, 118929, + 2451, 2714, 119326, 0, 43379, 4937, 43376, 753, 5849, 10597, 43089, + 11722, 9248, 92555, 42879, 11725, 120687, 0, 2726, 3107, 73958, 4941, + 64937, 119233, 9140, 1408, 5261, 4607, 129353, 181, 983432, 4942, 9539, + 4938, 0, 65201, 5259, 9369, 64185, 4142, 5257, 983601, 6844, 4964, 5264, + 64178, 64177, 12979, 41411, 64182, 64181, 64180, 64179, 9482, 4873, + 41231, 1822, 42526, 92344, 12758, 3865, 122918, 121129, 10500, 0, 119024, + 78028, 78003, 9830, 43642, 389, 10893, 7521, 127879, 4872, 5463, 128119, + 3125, 9567, 983291, 4878, 5459, 4604, 119650, 9557, 5465, 68617, 0, + 11494, 126492, 9563, 10865, 74570, 43279, 64186, 68521, 78714, 64191, + 64190, 8898, 64188, 129153, 41030, 74226, 78713, 74600, 74994, 917834, 0, + 78805, 41031, 78801, 11960, 6745, 3082, 126581, 78539, 73919, 10573, + 41744, 7079, 5856, 67838, 5163, 78809, 128162, 1817, 66724, 78538, + 119010, 10564, 7763, 13077, 41813, 4400, 41745, 64207, 10275, 8925, + 10371, 10307, 41814, 4248, 77979, 72802, 4541, 6299, 64204, 64203, 64201, + 64200, 64199, 64198, 126471, 42156, 78688, 0, 64193, 64192, 65223, 9943, + 64197, 64196, 64195, 64194, 12231, 42652, 64174, 64173, 78189, 846, + 78186, 9965, 74495, 83492, 83493, 83494, 2543, 12163, 3108, 9745, 64167, + 64166, 64165, 64164, 2110, 92176, 64169, 64168, 64949, 10972, 10251, + 10247, 42768, 715, 2295, 43299, 9453, 5348, 10943, 66390, 0, 11352, 550, + 9910, 125127, 0, 66579, 11551, 128464, 195080, 9504, 7187, 82957, 10373, + 983153, 120375, 10261, 10253, 6404, 10277, 78183, 11984, 1552, 65222, + 6998, 78180, 71429, 3128, 4789, 5067, 5066, 118849, 4784, 128394, 8827, + 1146, 5065, 69890, 78192, 68136, 78190, 43412, 5064, 2431, 194926, 9450, + 1809, 983588, 78200, 78201, 5062, 1264, 64817, 13254, 11697, 126598, + 9785, 64716, 128279, 3933, 74559, 4740, 7954, 128739, 101100, 42609, + 119855, 74175, 66912, 127016, 0, 121300, 42130, 121046, 5151, 121346, + 70743, 983715, 93980, 917802, 7620, 3800, 65122, 83487, 83480, 8355, 7854, 83483, 954, 64927, 4185, 41045, 127141, 41438, 41439, 68666, 10711, - 4593, 82993, 120584, 983410, 64774, 8053, 10532, 66727, 983414, 0, 78642, - 64759, 1325, 5166, 9888, 127800, 5148, 42834, 0, 78205, 78206, 43787, - 78204, 43913, 3119, 917814, 0, 3060, 64135, 9986, 74996, 77876, 636, - 11698, 83476, 82961, 9916, 11701, 7836, 42741, 64137, 8320, 78640, 8863, - 70201, 119960, 1477, 43289, 68492, 67164, 8618, 983404, 9908, 74972, 0, - 0, 3937, 12312, 0, 983405, 0, 64781, 912, 6349, 4536, 93954, 74532, - 126594, 6244, 92209, 71341, 3935, 120665, 128969, 0, 11950, 5392, 42248, - 65129, 68656, 5397, 128310, 12046, 12599, 67407, 128261, 5395, 0, 5393, - 354, 68615, 77853, 74366, 121404, 0, 42039, 113817, 0, 64142, 626, 0, - 5895, 0, 43910, 5780, 0, 10220, 121337, 43907, 71121, 43297, 70188, 4311, - 4644, 8818, 78158, 128186, 128869, 7145, 3918, 66452, 3797, 1644, 92346, - 9658, 4140, 11385, 65947, 6455, 9030, 813, 119945, 68131, 4146, 119957, - 5360, 2466, 0, 67669, 94020, 6249, 42117, 68828, 92206, 128023, 119255, - 74046, 43745, 4911, 988, 71180, 0, 983470, 43061, 7054, 64147, 983847, - 64920, 68195, 6698, 118933, 92506, 0, 70849, 11981, 12202, 195087, 11032, - 67654, 6093, 11608, 975, 66415, 65843, 170, 0, 67239, 4169, 0, 41859, - 6058, 120401, 13203, 120657, 70507, 125091, 68657, 9818, 10178, 10324, - 42106, 5898, 74540, 4738, 41856, 7062, 127120, 4737, 11779, 4742, 83425, - 68758, 68342, 83420, 9825, 6448, 6715, 127008, 4831, 83418, 83419, 67731, - 5300, 4741, 42108, 127057, 64159, 4736, 64148, 92634, 849, 92191, 78491, - 43288, 0, 66620, 127533, 127331, 65549, 9496, 64598, 118866, 983368, - 7876, 68132, 66280, 3928, 917870, 43378, 10706, 7198, 120890, 4842, - 12053, 128129, 68746, 4841, 0, 4171, 12008, 6251, 3923, 1490, 83411, - 83412, 126512, 40972, 5245, 70794, 10114, 42001, 41888, 4845, 8332, - 40974, 64347, 4840, 9077, 78346, 1747, 917849, 4825, 69240, 121443, - 68655, 0, 983390, 0, 0, 68628, 983349, 9850, 118937, 367, 1472, 917859, - 6687, 1274, 195022, 5905, 12339, 8919, 73953, 10907, 65261, 11023, - 119559, 4830, 9134, 78666, 64126, 43011, 83297, 78669, 64101, 0, 128434, - 4824, 10614, 119659, 126993, 1888, 1960, 7861, 83416, 78524, 41836, - 43012, 6052, 6064, 54, 43009, 12214, 83260, 6211, 120386, 358, 41997, - 41833, 11442, 10758, 65774, 113823, 120384, 64115, 92221, 70018, 983611, - 983708, 119053, 0, 12765, 64118, 126998, 12962, 0, 126580, 4017, 12827, - 5241, 120392, 0, 41118, 3924, 983894, 11366, 129084, 0, 0, 83401, 41116, + 4593, 82993, 120584, 128669, 64774, 8053, 10532, 66727, 127505, 983594, + 66795, 64759, 1325, 5166, 9888, 127800, 5148, 42834, 0, 78205, 78206, + 43787, 78204, 43913, 3119, 127257, 0, 3060, 64135, 9986, 74996, 77876, + 636, 11698, 83476, 82961, 9916, 11701, 7836, 42741, 64137, 8320, 78640, + 8863, 70201, 119960, 1477, 43289, 68492, 67164, 8618, 983404, 9908, + 74972, 0, 119147, 3414, 12312, 120832, 120727, 121264, 64781, 912, 6349, + 4536, 93954, 74532, 126594, 6244, 92209, 71341, 3935, 120665, 128316, 0, + 11950, 5392, 42248, 65129, 68656, 5397, 128310, 12046, 12599, 67407, + 126542, 5395, 72870, 5393, 354, 68615, 77853, 74366, 121404, 121266, + 42039, 113817, 128671, 64142, 626, 128244, 5895, 983573, 43910, 5780, 0, + 10220, 121337, 43907, 71121, 43297, 70188, 4311, 4644, 8818, 78158, + 128186, 128869, 7145, 3918, 66452, 3797, 1644, 92346, 9658, 4140, 11385, + 65947, 6455, 9030, 813, 119945, 68131, 4146, 119957, 5360, 2466, 70669, + 67669, 94020, 6249, 42117, 68828, 92206, 128023, 101048, 74046, 43745, + 4911, 988, 71180, 983337, 983470, 43061, 7054, 64147, 101042, 64920, + 68195, 6698, 118933, 92506, 0, 70849, 11981, 12202, 195087, 11032, 67654, + 6093, 11608, 975, 66415, 65843, 170, 0, 67239, 4169, 119938, 41859, 6058, + 120401, 13203, 120402, 70507, 120403, 68657, 9818, 10178, 10324, 42106, + 5898, 74540, 4738, 41856, 7062, 120142, 4737, 11779, 4742, 83425, 68758, + 68342, 41374, 9825, 6448, 6715, 127008, 4831, 83418, 83419, 67731, 5300, + 4741, 42108, 127057, 64159, 4736, 64148, 92634, 849, 92191, 78491, 43288, + 0, 66620, 127533, 127331, 65549, 9496, 64598, 118866, 983368, 7876, + 68132, 66280, 3928, 917870, 43378, 10706, 7198, 120890, 4842, 12053, + 128129, 68746, 4841, 129334, 4171, 12008, 6251, 3923, 1490, 83411, 83412, + 126512, 40972, 5245, 70794, 10114, 42001, 41888, 4845, 8332, 40974, + 64347, 4840, 9077, 78346, 1747, 72851, 4825, 69240, 121443, 68655, 0, + 128537, 0, 0, 68628, 983349, 9850, 118937, 367, 1472, 917859, 6687, 1274, + 195022, 5905, 12339, 8919, 73953, 10907, 65261, 11023, 119559, 4830, + 9134, 78666, 64126, 43011, 83297, 78669, 64101, 0, 128434, 4824, 10614, + 119659, 126993, 1888, 1960, 7861, 83416, 78524, 41836, 43012, 6052, 6064, + 54, 43009, 12214, 83260, 6211, 120386, 358, 41997, 41833, 11442, 10758, + 65774, 113823, 120384, 64115, 92221, 70018, 983611, 983708, 92408, + 128082, 12765, 64118, 126998, 12962, 119632, 126580, 4017, 12827, 5241, + 120392, 127900, 41118, 3924, 983894, 11366, 129084, 0, 0, 83401, 41116, 83403, 83404, 83397, 11363, 12057, 11917, 1567, 74000, 4721, 83396, - 66202, 8957, 4139, 70512, 0, 983074, 0, 0, 12740, 121470, 4722, 6816, - 124974, 12759, 4725, 67099, 4726, 83467, 83468, 983622, 70029, 83463, - 74913, 12755, 12762, 4015, 67690, 8052, 476, 0, 74893, 128294, 64212, - 41020, 1382, 64209, 64216, 44002, 64214, 1656, 41831, 127553, 125121, - 41843, 8720, 3908, 1452, 13111, 983421, 64067, 92287, 8552, 64113, 41845, - 3849, 78732, 66232, 9778, 120066, 5891, 7064, 55, 9948, 119085, 83302, - 917610, 7935, 2420, 0, 1114, 78120, 67585, 70104, 70432, 83447, 74920, - 3938, 120057, 65417, 64717, 120060, 71920, 65415, 66884, 6292, 65303, - 7955, 6452, 4713, 128196, 66249, 917885, 194766, 129073, 65152, 719, - 120044, 78623, 120042, 6713, 4532, 65412, 69822, 10868, 4717, 2349, 5902, - 66450, 4712, 75055, 917899, 65400, 65416, 8155, 4718, 3942, 4714, 9625, - 0, 6383, 194744, 12006, 128565, 194789, 0, 113756, 0, 65414, 6454, 1229, - 83457, 66437, 66025, 78699, 83452, 42500, 120508, 4809, 9623, 129137, - 78694, 121173, 128777, 917858, 65405, 68159, 12893, 78617, 5365, 4545, - 8901, 92421, 119555, 4813, 128262, 194729, 5925, 4808, 64330, 128400, - 65475, 83432, 68244, 4814, 83427, 4810, 83429, 83430, 64928, 10543, - 71249, 3522, 71335, 414, 65404, 0, 83442, 6456, 73820, 83445, 6691, - 42193, 66284, 83441, 0, 68337, 0, 43858, 43832, 118820, 9751, 65407, - 128085, 11770, 3919, 120724, 0, 65061, 983945, 917894, 129142, 12235, - 128572, 92701, 121087, 64092, 68739, 64080, 129063, 64090, 983586, 69913, - 10162, 10310, 121210, 8454, 121387, 42038, 387, 41363, 12737, 0, 4780, - 43368, 0, 64310, 64621, 6732, 78116, 0, 121295, 195024, 92193, 8896, 0, - 375, 6976, 66582, 119005, 74997, 127325, 983436, 119202, 119203, 12526, - 43120, 2315, 0, 1938, 119197, 128452, 4529, 119200, 119201, 119198, - 119199, 69692, 129124, 69698, 13150, 64492, 128974, 78761, 2291, 12902, - 0, 42891, 66327, 70502, 917857, 10799, 69690, 2587, 66372, 128628, 4193, - 66823, 4241, 129195, 7998, 83276, 0, 127009, 126640, 2316, 118821, 0, - 983934, 0, 64297, 74799, 92442, 74140, 128148, 5373, 128798, 70370, 3762, - 10015, 120672, 119232, 125109, 41590, 0, 70098, 3780, 7485, 5779, 917898, - 42037, 0, 3906, 12349, 74793, 8326, 127333, 65498, 3763, 6983, 5618, 0, - 3779, 983194, 43613, 70132, 0, 83288, 78335, 83289, 0, 280, 74558, - 121353, 67396, 13072, 1894, 83291, 67735, 65478, 43310, 7231, 0, 11773, - 0, 119165, 11144, 917778, 2551, 0, 6453, 10200, 6235, 983752, 119237, - 71877, 128669, 4470, 11826, 917557, 7780, 5369, 118958, 5249, 983066, - 5367, 8756, 127143, 119183, 5377, 120585, 68143, 1688, 78245, 5218, - 69685, 983756, 0, 113794, 44020, 6808, 41319, 1300, 10650, 41692, 64505, - 2290, 71057, 119624, 1465, 10850, 3943, 0, 41205, 41315, 118961, 119333, - 67148, 5352, 113753, 0, 8839, 41314, 7384, 7785, 41204, 127322, 41209, - 69637, 92241, 43607, 71254, 0, 5420, 3897, 10134, 120381, 74417, 4018, - 7150, 68127, 71425, 0, 121427, 127864, 127526, 2561, 68621, 3542, 7148, + 66202, 8957, 4139, 70512, 127115, 983074, 0, 122907, 12740, 121470, 4722, + 6816, 124974, 12759, 4725, 67099, 4726, 83467, 83468, 983622, 70029, + 83463, 74913, 12755, 12762, 4015, 67690, 8052, 476, 0, 74893, 128294, + 64212, 41020, 1382, 64209, 64216, 44002, 64214, 1656, 41831, 127553, + 125121, 41843, 8720, 3908, 1452, 13111, 195096, 64067, 92287, 8552, + 64113, 41845, 3849, 78732, 66232, 9778, 120066, 5891, 7064, 55, 9948, + 119085, 83302, 917610, 7935, 2420, 73861, 1114, 78120, 67585, 70104, + 70432, 83447, 74920, 3938, 120057, 65417, 64717, 120060, 71920, 65415, + 66884, 6292, 65303, 7955, 6452, 4713, 128196, 66249, 917885, 194766, + 129073, 65152, 719, 120044, 78623, 120042, 6713, 4532, 65412, 69822, + 10868, 4717, 2349, 5902, 66450, 4712, 75055, 917899, 65400, 65416, 8155, + 4718, 3942, 4714, 9625, 983293, 6383, 194744, 12006, 128565, 194789, + 121226, 113756, 983458, 65414, 6454, 1229, 83457, 66437, 66025, 78699, + 83452, 42500, 120508, 4809, 9623, 129137, 78694, 121173, 128777, 917858, + 65405, 68159, 12893, 78617, 5365, 4545, 8901, 92421, 119555, 4813, + 128262, 194729, 5925, 4808, 64330, 128400, 65475, 83432, 68244, 4814, + 83427, 4810, 83429, 83430, 64928, 10543, 71249, 3522, 71335, 414, 65404, + 92329, 83442, 6456, 73820, 83445, 6691, 42193, 66284, 83441, 0, 68337, 0, + 43858, 43832, 118820, 9751, 65407, 128085, 11770, 3919, 120724, 983596, + 65061, 78115, 917894, 129142, 12235, 128572, 92701, 121087, 64092, 68739, + 64080, 129063, 64090, 125267, 69913, 10162, 10310, 121210, 8454, 121387, + 42038, 387, 41363, 12737, 0, 4780, 43368, 0, 64310, 64621, 6732, 78116, + 0, 121295, 195024, 92193, 8896, 0, 375, 6976, 66582, 119005, 74997, + 127325, 983436, 113757, 119203, 12526, 43120, 2315, 0, 1938, 119197, + 128452, 4529, 119200, 119201, 119198, 119199, 69692, 129124, 69698, + 13150, 64492, 128974, 78761, 2291, 12902, 128140, 42891, 66327, 70502, + 129425, 10799, 69690, 2587, 66372, 100576, 4193, 66823, 4241, 129195, + 7998, 83276, 0, 127009, 126640, 2316, 118821, 0, 983934, 127478, 64297, + 74799, 92442, 74140, 128148, 5373, 128798, 70370, 3762, 10015, 120672, + 119232, 125109, 41590, 983865, 70098, 3780, 7485, 5779, 917898, 42037, 0, + 3906, 12349, 74793, 8326, 127333, 65498, 3763, 6983, 5618, 0, 3779, + 983194, 43613, 70132, 0, 83288, 78335, 83289, 129419, 280, 74558, 121353, + 67396, 13072, 1894, 83291, 67735, 65478, 43310, 7231, 0, 11773, 121314, + 119165, 11144, 917778, 2551, 0, 6453, 10200, 6235, 983752, 119237, 71877, + 72886, 4470, 11826, 917557, 7780, 5369, 118958, 5249, 119949, 5367, 8756, + 127143, 119183, 5377, 120585, 68143, 1688, 78245, 5218, 69685, 194918, 0, + 100780, 44020, 6808, 41319, 1300, 10650, 41692, 64505, 2290, 71057, + 119624, 1465, 10850, 3943, 127537, 41205, 41315, 118961, 119333, 67148, + 5352, 113753, 0, 8839, 41314, 7384, 7785, 41204, 127322, 41209, 69637, + 92241, 43607, 71254, 83444, 5420, 3897, 10134, 120381, 74417, 4018, 7150, + 68127, 71425, 70688, 121427, 127864, 127526, 2561, 68621, 3542, 7148, 12076, 7951, 68152, 118857, 5303, 6276, 1706, 120750, 78751, 7146, - 983682, 65150, 41819, 0, 73951, 10847, 41822, 9985, 860, 0, 10506, - 983437, 69641, 10753, 10830, 119339, 615, 64490, 7574, 74082, 77922, 0, - 12909, 43016, 64559, 127028, 0, 121231, 67996, 2020, 128790, 4022, - 128783, 120701, 77923, 126593, 41691, 0, 75060, 74329, 0, 64622, 9070, 0, - 68411, 3911, 42829, 43122, 1033, 74440, 983813, 7000, 3904, 983628, - 73737, 125105, 118931, 119630, 13123, 10846, 3450, 127360, 7397, 118807, - 917891, 42778, 10000, 41088, 449, 0, 3777, 68458, 113725, 9636, 0, 10738, - 69634, 9367, 593, 41085, 3999, 65226, 41713, 12764, 983723, 64409, 3596, - 129044, 128090, 9763, 120280, 74609, 12347, 124, 12981, 41127, 2092, - 92687, 0, 127555, 194632, 10820, 43987, 0, 128907, 1769, 41715, 2463, - 71214, 83070, 12770, 71222, 1538, 92617, 43124, 194614, 195058, 7795, - 120300, 129053, 4828, 1258, 127802, 2006, 0, 121130, 9498, 127032, - 127033, 120289, 120288, 3939, 120290, 8846, 8943, 120287, 120286, 2650, - 4491, 1961, 42602, 11525, 120292, 1959, 120294, 55228, 11774, 41016, - 983262, 68675, 128054, 1511, 9324, 78211, 10519, 66331, 3454, 19930, 0, - 41019, 127944, 0, 65292, 6822, 12862, 0, 0, 42143, 41828, 78207, 65531, - 70864, 118879, 55223, 0, 128071, 41826, 8865, 6402, 113827, 13279, 7917, - 74755, 917948, 7733, 983408, 4998, 68493, 92332, 41950, 0, 4268, 194790, - 195056, 70061, 4013, 128718, 10881, 0, 983163, 0, 74788, 2014, 2432, - 71901, 9765, 195052, 0, 917854, 195059, 78357, 65281, 127825, 10949, 0, - 0, 119315, 2015, 121088, 92765, 71840, 66318, 43233, 917992, 42517, - 68060, 0, 0, 12698, 8094, 10135, 65909, 6474, 794, 43497, 12656, 66335, - 119353, 67279, 1665, 71853, 4833, 917985, 71188, 127367, 121464, 189, - 12611, 0, 983420, 2859, 4838, 983930, 4834, 65078, 0, 92991, 4837, 67413, - 770, 92671, 811, 70062, 41042, 83073, 41318, 64427, 73999, 67693, 78848, - 3895, 92615, 74341, 3976, 128466, 42859, 10193, 3116, 7747, 78488, 0, - 43496, 0, 121015, 43686, 78846, 41877, 983743, 2871, 64614, 68843, 999, - 983844, 6345, 41876, 2663, 2017, 121234, 67824, 11040, 10150, 120678, - 64308, 1522, 597, 4775, 12555, 12571, 12550, 12583, 12560, 2019, 12556, - 12584, 3092, 0, 12562, 4783, 12566, 12569, 12554, 83344, 10812, 78851, 0, - 83342, 3078, 1402, 0, 83348, 0, 125072, 119248, 394, 3088, 83347, 92172, + 983682, 65150, 41819, 0, 73951, 10847, 41822, 9985, 860, 127287, 10506, + 983437, 69641, 10753, 10830, 119339, 615, 64490, 7574, 74082, 77922, + 983298, 12909, 43016, 64559, 127028, 128309, 121231, 67996, 2020, 128790, + 4022, 128783, 100748, 77923, 126593, 41691, 0, 75060, 74329, 0, 64622, + 9070, 983876, 68411, 3911, 42829, 43122, 1033, 74440, 125191, 7000, 3904, + 983628, 73737, 125105, 118931, 119630, 13123, 10846, 3450, 120518, 7397, + 118807, 917891, 42778, 10000, 41088, 449, 128509, 3777, 68458, 113725, + 9636, 0, 10738, 69634, 9367, 593, 41085, 3999, 65226, 41713, 12764, + 983723, 64409, 3596, 129044, 120895, 9763, 120280, 74609, 12347, 124, + 12981, 41127, 2092, 92687, 0, 127555, 194632, 10820, 43987, 0, 128907, + 1769, 41715, 2463, 71214, 83070, 12770, 71222, 1538, 92617, 43124, + 194614, 194585, 7795, 120300, 129053, 4828, 1258, 127802, 2006, 101034, + 121130, 9498, 100494, 127033, 120289, 120288, 3939, 120290, 8846, 8943, + 120287, 120286, 2650, 4491, 1961, 42602, 11525, 120292, 1959, 120294, + 55228, 11774, 41016, 917944, 68675, 128054, 1511, 9324, 78211, 10519, + 66331, 3454, 19930, 78163, 41019, 126546, 983671, 65292, 6822, 12862, + 983707, 0, 42143, 41828, 78207, 65531, 70864, 118879, 55223, 0, 128071, + 41826, 8865, 6402, 113827, 13279, 7917, 74755, 917948, 7733, 983408, + 4998, 68493, 92332, 41950, 0, 4268, 127923, 83075, 70061, 4013, 128718, + 10881, 0, 129045, 125266, 74788, 2014, 2432, 71901, 9765, 195052, 0, + 917854, 195059, 78357, 65281, 127825, 10949, 0, 0, 119315, 2015, 100871, + 92765, 71840, 66318, 43233, 917992, 42517, 68060, 983614, 983904, 12698, + 8094, 10135, 65909, 6474, 794, 43497, 12656, 66335, 119353, 67279, 1665, + 71853, 4833, 917985, 71188, 127367, 121464, 189, 12611, 0, 128094, 2859, + 4838, 983930, 4834, 65078, 0, 92991, 4837, 67413, 770, 92671, 811, 70062, + 41042, 83073, 41318, 64427, 73999, 67693, 78848, 3895, 92615, 74341, + 3976, 128466, 42859, 10193, 3116, 7747, 78488, 0, 43496, 983069, 121015, + 43686, 78846, 41877, 983743, 2871, 64614, 68843, 999, 125198, 6345, + 41876, 2663, 2017, 121234, 67824, 11040, 10150, 120678, 64308, 1522, 597, + 4775, 12555, 12571, 12550, 12583, 12560, 2019, 12556, 12584, 3092, + 983832, 12562, 4783, 12566, 12569, 12554, 83344, 10812, 78851, 126574, + 83342, 3078, 1402, 0, 83348, 0, 125072, 74371, 394, 3088, 83347, 92172, 917965, 3991, 64391, 83341, 128524, 424, 66328, 1999, 69659, 73914, 0, - 127534, 66903, 128468, 42231, 2209, 125103, 0, 0, 41840, 66913, 2377, + 125128, 66903, 128468, 42231, 2209, 125103, 0, 0, 41840, 66913, 2377, 1298, 64011, 12572, 11318, 12557, 12559, 12570, 7479, 1003, 2373, 9446, - 7481, 9448, 48, 983084, 9480, 481, 0, 9438, 9439, 9440, 9441, 8465, 9443, - 9444, 9445, 9430, 9431, 9432, 9433, 9434, 9435, 3984, 9437, 129135, + 7481, 9448, 48, 78029, 9480, 481, 100615, 9438, 9439, 9440, 9441, 8465, + 9443, 9444, 9445, 9430, 9431, 9432, 9433, 9434, 9435, 3984, 9437, 129135, 92934, 9424, 9425, 9426, 9427, 9428, 9429, 64758, 2362, 9655, 128050, 2004, 9096, 9782, 70842, 9172, 83071, 19965, 0, 5955, 67666, 1108, 0, - 74773, 78271, 128909, 64782, 3926, 92448, 65210, 8798, 0, 92165, 1392, - 983817, 120838, 127364, 10606, 8065, 118805, 10353, 10417, 127238, - 128739, 64524, 92418, 4019, 0, 125082, 43280, 8219, 68402, 1812, 119963, - 121067, 128430, 120939, 42410, 74448, 119132, 6054, 10697, 3169, 42297, - 42322, 10642, 3909, 9950, 128848, 128139, 983263, 68678, 74986, 983790, - 1049, 43517, 65707, 2304, 41806, 92326, 42336, 3921, 0, 11775, 64760, - 11766, 1038, 42303, 9823, 127278, 69236, 4008, 64004, 8773, 10733, 36, 0, - 5153, 41805, 0, 73735, 763, 41808, 64910, 121389, 2009, 0, 127985, 74245, - 9640, 119951, 0, 69895, 8621, 120523, 12852, 3031, 983050, 64361, 129088, - 182, 66414, 92716, 92598, 119950, 42613, 9058, 366, 0, 9892, 5969, 11754, - 10848, 4570, 65301, 44013, 4255, 127889, 10102, 41189, 4003, 41026, - 68109, 13293, 41192, 69635, 124977, 42251, 0, 42534, 65179, 11287, 6128, - 113811, 11034, 10923, 64423, 125058, 65506, 983912, 65861, 74083, 66872, - 9932, 43516, 83063, 83065, 83064, 9817, 0, 71234, 0, 12117, 66586, 4183, - 10540, 66250, 9063, 127045, 128547, 119954, 113685, 12897, 3792, 2011, - 121418, 6065, 43160, 128379, 120595, 8692, 41186, 41816, 41023, 41818, - 41187, 11659, 7922, 12614, 2005, 8523, 78002, 120035, 7513, 1863, 4710, - 0, 5956, 7621, 78005, 92624, 4705, 716, 74918, 0, 4704, 120040, 93024, - 42241, 161, 43977, 74546, 66214, 4706, 74077, 69914, 42672, 4709, 10680, - 119065, 43293, 68771, 983190, 119164, 120328, 83319, 10187, 1700, 119223, - 83315, 0, 74980, 4004, 917595, 10968, 43296, 128331, 8506, 113744, - 194812, 126996, 1005, 937, 78216, 4734, 2870, 121350, 78218, 983109, - 7463, 4729, 0, 235, 1384, 4728, 74887, 70494, 92490, 74449, 8109, 43105, - 128623, 4730, 447, 13186, 1513, 4733, 120415, 92548, 0, 42527, 12911, - 43427, 1383, 8565, 2469, 120024, 6690, 6156, 68117, 43439, 7993, 4288, - 120416, 2674, 13238, 11922, 0, 92529, 3510, 13234, 983832, 120407, 5605, + 74773, 78271, 128909, 64782, 3926, 92448, 65210, 8798, 129365, 83062, + 1392, 127782, 120696, 127364, 10606, 8065, 70710, 10353, 10417, 100613, + 125023, 64524, 70711, 4019, 100950, 125082, 43280, 8219, 68402, 1812, + 100949, 121067, 100944, 120939, 42410, 74448, 101085, 6054, 10697, 3169, + 42297, 42322, 10642, 3909, 9950, 128231, 128139, 983263, 68678, 74986, + 983790, 1049, 43517, 65707, 2304, 41806, 92326, 42336, 3921, 0, 11775, + 64760, 11766, 1038, 42303, 9823, 127278, 69236, 4008, 64004, 8773, 10733, + 36, 0, 5153, 41805, 119153, 73735, 763, 9211, 64910, 121389, 2009, 0, + 127985, 74245, 9640, 119951, 127316, 69895, 8621, 120523, 12852, 3031, + 983050, 64361, 129088, 182, 66414, 92716, 92598, 119950, 42613, 9058, + 366, 0, 9892, 5969, 11754, 10848, 4570, 65301, 44013, 4255, 127889, + 10102, 41189, 4003, 41026, 68109, 13293, 41192, 69635, 124977, 42251, + 983963, 42534, 65179, 11287, 6128, 113811, 11034, 10923, 64423, 101092, + 65506, 119248, 65861, 74083, 66872, 9932, 43516, 83063, 83065, 83064, + 9817, 100937, 71234, 70749, 12117, 66586, 4183, 10540, 66250, 9063, + 127045, 128547, 119954, 113685, 12897, 3792, 2011, 121418, 6065, 43160, + 128379, 120595, 8692, 41186, 41816, 41023, 41818, 41187, 11659, 7922, + 12614, 2005, 8523, 72852, 120035, 7513, 1863, 4710, 120030, 5956, 7621, + 78005, 92624, 4705, 716, 74918, 983453, 4704, 120040, 93024, 42241, 161, + 43977, 74546, 66214, 4706, 74077, 69914, 42672, 4709, 10680, 119065, + 43293, 68771, 195030, 119164, 100770, 83319, 10187, 1700, 119223, 83315, + 0, 74980, 4004, 917595, 10968, 43296, 72823, 8506, 113744, 194812, + 126996, 1005, 937, 78216, 4734, 2870, 121350, 78218, 983109, 7463, 4729, + 983393, 235, 1384, 4728, 74887, 70494, 92490, 74449, 8109, 43105, 128623, + 4730, 447, 13186, 1513, 4733, 120415, 92548, 0, 42527, 12911, 43427, + 1383, 8565, 2469, 120024, 6690, 6156, 68117, 43439, 7993, 4288, 120416, + 2674, 13238, 11922, 128409, 92529, 3510, 13234, 129368, 120407, 5605, 42095, 11364, 92286, 1380, 65617, 11162, 120261, 13196, 13197, 120309, 67708, 9495, 119346, 127154, 5959, 67984, 73976, 66275, 43371, 6941, 119349, 13205, 13211, 5801, 12769, 65905, 41697, 1283, 82952, 4779, 983922, 3719, 4006, 983569, 19957, 71186, 2021, 119332, 43877, 83140, 43028, 65493, 41838, 3875, 5962, 64341, 92616, 9814, 43457, 5827, 3314, - 7787, 71189, 65494, 68153, 126991, 194697, 120636, 64531, 120692, 194626, - 128753, 983958, 66316, 65467, 5771, 41298, 983794, 9742, 521, 0, 10800, - 92222, 8404, 194625, 483, 7096, 7089, 66323, 928, 0, 0, 119018, 10599, - 11586, 3989, 10971, 43748, 65782, 9841, 8843, 12145, 67261, 10074, 78548, - 93999, 3769, 0, 0, 128703, 983107, 9573, 917998, 65290, 8849, 119254, - 65855, 65112, 1796, 71046, 0, 69665, 8164, 41301, 3502, 83135, 7388, - 10621, 73838, 78553, 5825, 13007, 68165, 92203, 92915, 12661, 7608, - 10354, 10418, 42411, 2022, 0, 1409, 12195, 4001, 3112, 10824, 120639, - 1390, 70184, 194704, 421, 43536, 5846, 120120, 4130, 127775, 7595, 42588, - 7600, 74400, 66035, 195091, 0, 65851, 42607, 124955, 92403, 3168, 67733, - 42134, 11831, 2370, 2846, 92605, 128084, 0, 120132, 127745, 1836, 0, - 121207, 92558, 3740, 69843, 6290, 65374, 120451, 2390, 3944, 66628, - 119006, 0, 6135, 3118, 74265, 119093, 83310, 77975, 0, 8127, 8975, 64739, - 7943, 124968, 119234, 10618, 2584, 0, 0, 128225, 9998, 120573, 83306, 0, - 127750, 43508, 6204, 127044, 121374, 8279, 8776, 64954, 4975, 70075, - 120130, 4267, 1631, 42206, 77983, 128015, 195046, 65700, 66386, 0, 64645, - 0, 92887, 126588, 12586, 0, 9242, 120100, 0, 4523, 5842, 10495, 3122, - 983797, 7793, 78275, 9328, 119104, 78393, 12604, 92885, 6615, 2285, - 92344, 3986, 44025, 0, 8912, 64555, 7409, 92247, 983360, 9541, 78276, - 113669, 11275, 8540, 11498, 120868, 983359, 41040, 2459, 127302, 13060, - 41041, 74413, 983138, 0, 77931, 68427, 10450, 12551, 41043, 7020, 120353, - 3765, 92881, 917612, 1606, 120348, 92299, 3093, 68436, 128040, 983061, - 119613, 0, 0, 4312, 74091, 120337, 74983, 11923, 4023, 68399, 5763, - 94015, 4827, 10894, 12810, 64406, 118785, 4455, 74321, 433, 119620, - 66660, 2499, 67167, 67166, 118837, 11973, 13089, 4293, 120329, 42224, - 42758, 12196, 42837, 42226, 119319, 127992, 119126, 5817, 127806, 55277, - 3120, 9797, 0, 0, 11086, 10389, 126485, 128784, 4895, 65358, 124941, - 4359, 585, 2383, 3509, 70037, 486, 4290, 5758, 127546, 121160, 983106, - 7004, 113667, 65880, 126514, 119048, 2380, 11380, 983863, 93996, 2376, - 78841, 83402, 0, 5197, 70839, 127047, 127048, 2366, 127050, 119604, - 70837, 120045, 0, 128554, 0, 917846, 0, 0, 0, 74188, 71342, 78455, 75048, - 113675, 74900, 120046, 127542, 120049, 983366, 1847, 120978, 10339, - 983367, 42384, 121379, 4227, 74158, 0, 74498, 43032, 121124, 42365, 0, - 12671, 11384, 120059, 74264, 120058, 64797, 983347, 5820, 983346, 120052, + 7787, 71189, 65494, 68153, 126991, 194697, 120636, 64531, 120692, 72879, + 128753, 983958, 66316, 65467, 5771, 41298, 83138, 9742, 521, 983911, + 10800, 92222, 8404, 194625, 483, 7096, 7089, 66323, 928, 983908, 64041, + 119018, 10599, 11586, 3989, 10971, 43748, 65782, 9841, 8843, 12145, + 67261, 10074, 78548, 93999, 3769, 127958, 0, 128703, 983107, 9573, + 917998, 65290, 8849, 119254, 65855, 65112, 1796, 71046, 983428, 69665, + 8164, 41301, 3502, 83135, 7388, 10621, 73838, 78553, 5825, 13007, 68165, + 72749, 92915, 12661, 7608, 10354, 10418, 42411, 2022, 983429, 1409, + 12195, 4001, 3112, 10824, 120639, 1390, 70184, 78515, 421, 43536, 5846, + 120120, 4130, 127775, 7595, 42588, 7600, 74400, 66035, 194799, 0, 65851, + 42607, 124955, 92403, 3168, 67733, 42134, 11831, 2370, 2846, 92605, + 128084, 0, 120132, 127745, 1836, 0, 100782, 92558, 3740, 69843, 6290, + 65374, 100785, 2390, 3944, 66628, 119006, 983916, 6135, 3118, 74265, + 119093, 83310, 77975, 983889, 8127, 8975, 64739, 7943, 124968, 119234, + 10618, 2584, 0, 0, 128225, 9998, 120573, 83306, 0, 127750, 43508, 6204, + 127044, 121374, 8279, 8776, 64954, 4975, 70075, 120130, 4267, 1631, + 42206, 77983, 128015, 194753, 65700, 66386, 0, 64645, 0, 92887, 119154, + 12586, 0, 9242, 120100, 0, 4523, 5842, 10495, 3122, 983797, 7793, 78275, + 9328, 119104, 70685, 12604, 92885, 6615, 2285, 66796, 3986, 44025, 0, + 8912, 64555, 7409, 92247, 983190, 9541, 78276, 113669, 11275, 8540, + 11498, 120868, 128540, 41040, 2459, 127302, 12558, 41041, 74413, 983138, + 0, 77931, 68427, 10450, 12551, 41043, 7020, 120353, 3765, 92881, 917612, + 1606, 120348, 92299, 3093, 68436, 100718, 983061, 119613, 983938, 194756, + 4312, 74091, 120337, 74983, 11923, 4023, 68399, 5763, 94015, 4827, 10894, + 12810, 64406, 118785, 4455, 74321, 433, 119620, 66660, 2499, 67167, + 67166, 118837, 11973, 13089, 4293, 120329, 42224, 42758, 12196, 42837, + 42226, 119319, 127992, 119126, 5817, 127806, 55277, 3120, 9797, 0, 0, + 11086, 10389, 126485, 128784, 4895, 65358, 124941, 4359, 585, 2383, 3509, + 70037, 486, 4290, 5758, 100775, 121160, 983106, 7004, 113667, 65880, + 126514, 119048, 2380, 11380, 983863, 93996, 2376, 78841, 83402, 983256, + 5197, 70839, 120248, 127048, 2366, 100713, 119604, 70837, 120045, 0, + 128554, 0, 917846, 100715, 0, 0, 74188, 71342, 78455, 75048, 113675, + 74900, 120046, 127542, 120049, 100774, 1847, 120978, 10339, 100772, + 42384, 121379, 4227, 74158, 0, 74498, 43032, 100926, 42365, 194833, + 12671, 11384, 120059, 74264, 120058, 64797, 983347, 5820, 128018, 120052, 120065, 128825, 120064, 120053, 42137, 9893, 2754, 12664, 120063, 121286, 7377, 120051, 41799, 65530, 1711, 12984, 43039, 3114, 6255, 121132, - 68660, 0, 10853, 926, 983371, 74184, 120915, 120055, 119301, 43175, 0, - 43037, 41798, 41035, 11583, 127769, 41801, 119088, 119605, 520, 4200, - 12699, 8331, 70118, 3091, 41034, 66298, 70293, 8360, 983445, 78044, 321, - 4229, 64543, 128470, 65563, 194873, 917974, 2861, 43793, 10095, 121428, - 9195, 92386, 1861, 0, 73733, 917780, 68839, 43041, 0, 43794, 128530, - 3859, 12181, 41660, 8209, 70793, 73867, 12973, 75014, 74757, 127514, - 41658, 128376, 121235, 5760, 113699, 743, 4414, 120766, 0, 42632, 127236, - 65161, 73896, 128589, 0, 1405, 119063, 43220, 43341, 0, 19919, 70278, - 64532, 65367, 43710, 11199, 125077, 3513, 71115, 70341, 43342, 119064, - 65529, 65364, 83208, 83170, 6485, 1397, 194781, 41986, 92678, 83204, - 83212, 74097, 83213, 7471, 12079, 67997, 6843, 43287, 92317, 0, 67406, - 120239, 194678, 71914, 1099, 10490, 83201, 10501, 65181, 74463, 128952, - 464, 41624, 65283, 67663, 78222, 1346, 194609, 65679, 64573, 64897, 423, - 1818, 65144, 82963, 8272, 127812, 19911, 4218, 3087, 64960, 121447, - 43564, 0, 983182, 9584, 10465, 983902, 74359, 12626, 9106, 0, 42642, - 71235, 64750, 9390, 0, 41797, 194730, 128333, 265, 41795, 64666, 74628, - 43530, 2752, 127365, 128459, 126482, 59, 983671, 121410, 11149, 78074, - 77873, 41810, 83162, 7010, 0, 41809, 41495, 119364, 5877, 42252, 42213, - 8009, 3305, 43033, 511, 92700, 43848, 13127, 120067, 983946, 74397, - 120235, 128641, 65915, 1400, 41812, 10685, 75017, 2103, 10387, 4453, - 43276, 917783, 11169, 128939, 6481, 41213, 0, 0, 129133, 119929, 41983, - 74198, 6617, 9116, 119654, 92995, 462, 68110, 10493, 121449, 8129, 92994, - 128365, 74471, 6644, 11658, 0, 128245, 3452, 11906, 9581, 1385, 3098, 0, - 119013, 43340, 11123, 41033, 6493, 42626, 0, 129051, 11426, 77887, 1681, - 118789, 1204, 3755, 64661, 7235, 10170, 3966, 8911, 0, 41841, 43338, 0, - 119323, 5726, 64915, 42175, 983913, 0, 41497, 65044, 120109, 2851, 43017, - 983589, 120896, 4373, 78058, 0, 9587, 1789, 6671, 128840, 3100, 0, 65360, - 917589, 92365, 128202, 64922, 0, 8190, 12083, 0, 83141, 6506, 64312, - 74374, 2368, 983187, 4419, 121259, 119125, 3439, 1825, 1192, 120106, - 8891, 3080, 120228, 2347, 5430, 120107, 8990, 2848, 92981, 121372, 73942, - 249, 0, 0, 0, 120658, 119324, 128712, 8883, 119860, 728, 11173, 995, 0, - 121047, 64826, 124931, 917798, 128348, 0, 19945, 8091, 558, 0, 12273, - 194814, 67714, 12112, 67272, 67265, 67273, 67274, 12335, 120104, 68019, - 3443, 3129, 67267, 2102, 65445, 78258, 64891, 0, 7725, 65108, 11120, - 9205, 8624, 69246, 12446, 43295, 128519, 41894, 0, 6277, 41672, 41893, - 10010, 127381, 3540, 121450, 835, 71340, 69816, 119854, 74408, 0, 67108, - 5426, 4258, 83188, 120858, 5424, 92306, 8283, 127978, 5434, 83196, - 129027, 19917, 11408, 0, 11947, 128330, 1404, 3095, 11432, 121122, 3464, - 6486, 4819, 128233, 129123, 570, 8095, 3672, 119864, 1498, 67866, 0, - 128539, 431, 67820, 0, 128182, 128096, 68167, 983663, 13096, 128643, - 121018, 43408, 9516, 128538, 5268, 42230, 42220, 0, 4450, 120511, 11547, - 43417, 128542, 356, 3477, 227, 10488, 68203, 382, 11418, 0, 5878, 983799, - 0, 0, 0, 6484, 2541, 66039, 113777, 78157, 92723, 3549, 195067, 9110, - 119665, 2743, 0, 43290, 128585, 9097, 195026, 43015, 8782, 0, 776, 2524, - 42707, 8573, 120903, 126494, 0, 71102, 42694, 64944, 8952, 3856, 118818, - 125111, 5872, 6495, 129125, 0, 0, 92543, 67173, 67172, 12849, 3953, 1897, - 93071, 65094, 11994, 4339, 74556, 92654, 67843, 0, 0, 119087, 68473, - 74104, 5228, 119835, 7868, 43184, 0, 120955, 73986, 43438, 0, 43022, - 917553, 1162, 74995, 2671, 128567, 127198, 92632, 92631, 118865, 4553, - 73811, 983573, 195005, 118928, 68085, 19921, 73821, 11424, 195002, 4567, - 41891, 0, 983788, 55249, 4820, 65239, 194662, 0, 194665, 43042, 119212, - 1377, 12869, 4897, 42821, 9250, 70272, 4438, 64385, 0, 1753, 11331, 6147, - 194941, 43282, 8833, 69998, 0, 6504, 78408, 121166, 10719, 70275, 1898, - 1413, 42443, 0, 802, 12141, 121138, 83097, 6648, 10671, 2528, 0, 64789, - 9169, 838, 68819, 68807, 844, 5014, 66297, 256, 68818, 9990, 128398, - 42739, 917851, 7542, 65464, 9726, 83224, 6489, 10048, 74326, 78719, - 66573, 0, 78724, 78712, 11761, 121314, 83226, 41094, 0, 77958, 194893, - 78403, 92689, 6196, 6945, 93969, 120942, 67095, 120491, 11816, 68846, - 5733, 2930, 70274, 127179, 41098, 92771, 41093, 68834, 66626, 588, 9760, - 125099, 194717, 1238, 200, 983207, 1660, 73916, 0, 67141, 74362, 0, - 92485, 124930, 0, 74999, 3394, 194894, 120668, 0, 69996, 127358, 66219, + 68660, 0, 10853, 926, 983296, 74184, 120915, 120055, 119301, 43175, + 127103, 43037, 41798, 41035, 11583, 127769, 41801, 100498, 119605, 520, + 4200, 12699, 8331, 70118, 3091, 41034, 66298, 70293, 8360, 983445, 78044, + 321, 4229, 64543, 128470, 65563, 100764, 129310, 2861, 43793, 10095, + 121428, 9195, 72767, 1861, 983056, 73733, 917780, 68839, 43041, 0, 43794, + 100769, 3859, 12181, 41660, 8209, 70793, 73867, 12973, 75014, 74757, + 127514, 41658, 128376, 121235, 5760, 113699, 743, 4414, 120766, 0, 42632, + 127236, 65161, 73896, 128589, 100593, 1405, 119063, 43220, 43341, 194792, + 19919, 70278, 64532, 65367, 43710, 11199, 121400, 3513, 71115, 70341, + 43342, 119064, 65529, 65364, 83208, 83170, 6485, 1397, 194781, 41986, + 92678, 83204, 83212, 74097, 83213, 7471, 12079, 67997, 6843, 43287, + 92317, 0, 67406, 120239, 194678, 71914, 1099, 10490, 83201, 10501, 65181, + 74463, 128952, 464, 41624, 65283, 67663, 78222, 1346, 194609, 65679, + 64573, 64897, 423, 1818, 65144, 82963, 8272, 121203, 19911, 4218, 3087, + 64960, 121447, 43564, 983749, 983182, 9584, 10465, 983902, 74359, 12626, + 9106, 983064, 42642, 71235, 64750, 9390, 120737, 41797, 194730, 128333, + 265, 41795, 64666, 74628, 43530, 2752, 127365, 128459, 126482, 59, + 983427, 121410, 11149, 78074, 77873, 41810, 83162, 7010, 0, 41809, 41495, + 119364, 5877, 42252, 42213, 8009, 3305, 43033, 511, 92700, 43848, 13127, + 120067, 983946, 74397, 120235, 100835, 65915, 1400, 41812, 10685, 75017, + 2103, 10387, 4453, 43276, 917783, 11169, 128939, 6481, 41213, 0, 100839, + 129133, 100838, 41983, 74198, 6617, 9116, 119654, 92995, 462, 68110, + 10493, 121449, 8129, 92994, 128365, 74471, 6644, 11658, 0, 128245, 3452, + 11906, 9581, 1385, 3098, 100457, 119013, 43340, 11123, 41033, 6493, + 42626, 0, 129051, 11426, 77887, 1681, 118789, 1204, 3755, 64661, 7235, + 10170, 3966, 8911, 101013, 41841, 43338, 194954, 100848, 5726, 64915, + 42175, 983913, 0, 41497, 65044, 100844, 2851, 43017, 100484, 120896, + 4373, 78058, 0, 9587, 1789, 6671, 128840, 3100, 0, 65360, 101012, 92365, + 120937, 64922, 100486, 8190, 12083, 0, 83141, 6506, 64312, 74374, 2368, + 983187, 4419, 121259, 119125, 3439, 1825, 1192, 100488, 8891, 3080, + 120228, 2347, 5430, 100487, 8990, 2848, 92981, 121372, 73942, 249, + 983040, 917869, 983825, 74814, 119324, 128712, 8883, 119860, 728, 11173, + 995, 0, 100657, 64826, 100656, 129371, 128348, 0, 19945, 8091, 558, + 129134, 12273, 129156, 67714, 12112, 67272, 67265, 67273, 67274, 12335, + 120104, 68019, 3443, 3129, 67267, 2102, 65445, 78258, 64891, 195069, + 7725, 11843, 11120, 9205, 8624, 69246, 12446, 43295, 128519, 41894, 0, + 6277, 41672, 41893, 10010, 127381, 3540, 100827, 835, 71340, 69816, + 119854, 74408, 0, 67108, 5426, 4258, 83188, 100758, 5424, 92306, 8283, + 127978, 5434, 83196, 129027, 19917, 11408, 127392, 11947, 128330, 1404, + 3095, 11432, 121122, 3464, 6486, 4819, 100759, 127404, 570, 8095, 3672, + 119864, 1498, 67866, 0, 128539, 431, 67820, 78080, 128182, 128096, 68167, + 983459, 13096, 128643, 121018, 43408, 9516, 128538, 5268, 42230, 42220, + 0, 4450, 120511, 11547, 43417, 128542, 356, 3477, 227, 10488, 68203, 382, + 11418, 120681, 5878, 917860, 0, 0, 194877, 6484, 2541, 66039, 113777, + 78157, 92723, 3549, 195067, 9110, 119665, 2743, 121432, 43290, 128585, + 9097, 74379, 43015, 8782, 0, 776, 2524, 42707, 8573, 120903, 100666, 0, + 71102, 42694, 64944, 8952, 3856, 118818, 100662, 5872, 6495, 129125, + 127467, 0, 92543, 67173, 67172, 12849, 3953, 1897, 93071, 65094, 11994, + 4339, 74556, 92654, 67843, 128946, 0, 119087, 68473, 66778, 5228, 119835, + 7868, 43184, 0, 120955, 73986, 43438, 0, 43022, 917553, 1162, 74995, + 2671, 128567, 127198, 92632, 92631, 118865, 4553, 73811, 917947, 113723, + 118928, 68085, 19921, 73821, 11424, 195002, 4567, 41891, 127004, 983788, + 55249, 4820, 65239, 129338, 0, 101043, 43042, 119212, 1377, 12869, 4897, + 42821, 9250, 70272, 4438, 64385, 0, 1753, 11331, 6147, 128611, 43282, + 8833, 69998, 0, 6504, 78408, 100688, 10719, 70275, 1898, 1413, 42443, + 983387, 802, 12141, 121138, 83097, 6648, 10671, 2528, 72880, 64789, 9169, + 838, 68819, 68807, 844, 5014, 66297, 256, 68818, 9990, 128398, 42739, + 917851, 7542, 65464, 9726, 83224, 6489, 10048, 74326, 78719, 66573, 0, + 78724, 78712, 11761, 70665, 83226, 41094, 0, 77958, 119918, 78403, 92689, + 6196, 6945, 93969, 120942, 67095, 120491, 11816, 68846, 5733, 2930, + 70274, 127179, 41098, 92771, 41093, 68834, 66626, 588, 9760, 100568, + 194717, 1238, 200, 983207, 1660, 73916, 0, 67141, 74362, 983784, 92485, + 124930, 0, 74999, 3394, 70734, 120668, 100477, 69996, 127358, 66219, 72425, 43284, 68072, 7817, 1841, 11055, 66835, 194979, 74607, 1669, - 10776, 74534, 7701, 194980, 983450, 74992, 1732, 4030, 983442, 3963, - 65335, 127530, 41768, 6491, 65333, 65324, 914, 65323, 8071, 3538, 983845, - 2287, 65328, 92441, 74367, 7614, 0, 11819, 71908, 12009, 12399, 121217, - 67852, 65537, 0, 10841, 43430, 5301, 0, 92618, 5734, 8960, 0, 70123, - 65317, 77880, 0, 5876, 70374, 12304, 0, 0, 65315, 92670, 128511, 71862, - 0, 127957, 119621, 11114, 71909, 12447, 64486, 121236, 126562, 983129, 0, - 121393, 983802, 42767, 10915, 983174, 12007, 43695, 68033, 11975, 194878, - 0, 92604, 2555, 8629, 128640, 41133, 41872, 43706, 4496, 194879, 83108, - 120241, 128164, 0, 0, 983553, 64730, 70041, 66714, 68222, 0, 70076, - 65596, 67837, 11416, 4280, 67655, 8765, 12784, 7792, 1393, 78191, 11157, - 74386, 127274, 8233, 12820, 983730, 6683, 125112, 3442, 12144, 2841, - 12543, 0, 1473, 42820, 64329, 120880, 67243, 68642, 6488, 357, 1048, - 41100, 72417, 41104, 94003, 3406, 1054, 71320, 1040, 65450, 983385, 4434, - 1069, 194784, 118862, 65737, 121202, 128705, 0, 83211, 9693, 41943, - 68305, 41931, 41759, 12757, 4353, 983353, 1059, 9790, 8995, 119974, - 917770, 65937, 78572, 41758, 10646, 121159, 118833, 92372, 70424, 74830, - 78569, 12743, 983689, 6480, 917761, 41779, 42580, 66601, 12207, 77895, - 6335, 43919, 11312, 64807, 92962, 69989, 41767, 119629, 983764, 43020, - 74974, 3955, 74254, 120632, 983754, 917861, 70187, 69975, 9770, 9246, - 12230, 125047, 129105, 78580, 10448, 41783, 41786, 127093, 12797, 2755, - 64571, 78578, 194927, 4857, 983577, 4428, 12794, 73755, 128061, 78574, 0, - 11116, 43842, 5747, 78825, 70471, 7978, 41092, 74571, 0, 11924, 43812, - 42144, 65015, 0, 563, 0, 129412, 12798, 11271, 57, 92717, 83495, 917860, - 119043, 917618, 94051, 43137, 694, 983719, 9876, 0, 119168, 0, 70392, - 64537, 127914, 277, 74385, 7229, 12761, 983145, 74466, 13025, 64811, - 8757, 78824, 78188, 1574, 7381, 0, 2525, 4852, 5749, 68465, 13027, 42824, - 120574, 1039, 7151, 10155, 5745, 188, 41858, 11592, 129156, 69725, 9055, - 41853, 4858, 75000, 917990, 436, 4771, 917936, 2786, 93028, 4856, 8051, - 92500, 119609, 71327, 9644, 71133, 125009, 128873, 194916, 120732, 66710, - 68084, 983361, 73906, 67409, 127114, 917916, 10234, 5843, 11939, 70346, - 42157, 0, 3157, 194659, 68393, 75035, 3504, 70422, 0, 10822, 5149, 66029, - 10226, 65142, 128025, 3594, 42424, 124993, 40, 12657, 983665, 0, 386, - 121467, 8834, 120974, 12815, 43574, 121430, 73907, 127792, 70113, 7220, - 11839, 121143, 74316, 194752, 65322, 4304, 74503, 8160, 74314, 194753, - 121276, 0, 128526, 1348, 92349, 78597, 121139, 13303, 70406, 92392, - 128474, 7599, 1278, 43616, 13269, 127805, 127110, 74387, 78179, 78598, - 74492, 6097, 7568, 8780, 4982, 127464, 74501, 194763, 78592, 68745, 2672, - 3735, 127470, 13138, 42266, 9484, 10724, 41202, 71364, 128370, 43742, - 128373, 9487, 119959, 68785, 3842, 71911, 78668, 12442, 6193, 9791, - 119344, 0, 42516, 7228, 7559, 74803, 66721, 7873, 11399, 119219, 194691, - 70006, 194690, 127537, 3604, 120683, 119188, 128877, 78540, 78541, 42507, - 1962, 43305, 78476, 42505, 11660, 121021, 2072, 92312, 6995, 74173, 5437, - 74174, 10669, 8702, 7964, 92352, 983776, 199, 68075, 4105, 194845, - 127942, 75006, 194710, 67818, 13148, 7560, 78479, 9226, 78478, 195070, - 6472, 65814, 71919, 121218, 4724, 128491, 195041, 9191, 194645, 64432, - 120270, 82987, 119190, 10196, 7886, 0, 6585, 0, 6680, 195042, 983425, - 71872, 6679, 74412, 92251, 194866, 74421, 11382, 128254, 43862, 78591, - 113733, 194679, 194832, 6681, 127482, 12693, 194836, 42727, 78196, - 128252, 43874, 65442, 68047, 69733, 9989, 43248, 66248, 194816, 0, 11321, - 128845, 120809, 194819, 5297, 7042, 13284, 6112, 7968, 93010, 73927, - 92444, 127336, 65746, 118796, 69889, 74389, 128696, 4342, 42839, 121339, - 1677, 917592, 82989, 126590, 83415, 11091, 11011, 2719, 0, 0, 119595, - 10160, 0, 129150, 7585, 65169, 2052, 4308, 83414, 43000, 7505, 543, - 64916, 64736, 118835, 0, 64655, 983053, 118922, 2064, 0, 43158, 7902, - 983231, 65265, 194639, 121080, 127170, 127041, 128006, 92550, 983186, - 12994, 92728, 10828, 74378, 6228, 4307, 3482, 128527, 83231, 72389, - 83079, 506, 74573, 41194, 65735, 2055, 43255, 41195, 0, 8169, 121407, - 8841, 983747, 516, 93974, 2063, 119051, 34, 128850, 120186, 11504, 1612, - 74333, 120182, 11827, 67165, 12001, 120178, 10242, 64564, 120179, 67986, - 6584, 7749, 11037, 128743, 1758, 119074, 10667, 10560, 120197, 92593, - 1935, 11517, 120193, 120196, 83082, 1931, 120189, 74839, 120191, 1217, - 64702, 12643, 825, 127838, 194905, 12294, 92428, 78834, 9138, 78831, - 78833, 12631, 71871, 11080, 74554, 64000, 5591, 1239, 127199, 11313, - 194803, 3403, 983655, 120271, 64364, 92269, 121282, 72431, 8998, 12988, - 119983, 9152, 92161, 0, 126484, 67589, 41850, 64290, 3433, 92393, 12615, - 1594, 42192, 6914, 66392, 0, 119569, 74565, 41353, 67602, 67611, 4337, 0, - 127296, 918, 65035, 41351, 7681, 194900, 42577, 41393, 12668, 72395, - 2477, 127285, 121249, 118880, 0, 67604, 67683, 127235, 573, 127282, - 120543, 11417, 92661, 119814, 119309, 67599, 0, 72410, 67607, 11482, 0, - 3981, 3357, 0, 42223, 4207, 1288, 78503, 78839, 67728, 77907, 11589, + 10776, 74534, 7701, 194976, 100474, 74992, 1732, 4030, 983442, 3963, + 65335, 127530, 41768, 6491, 65333, 65324, 914, 65323, 8071, 3538, 195013, + 2287, 65328, 92441, 74367, 7614, 983953, 11819, 71908, 12009, 12399, + 121217, 67852, 65537, 78002, 10841, 43430, 5301, 0, 92618, 5734, 8960, 0, + 70123, 65317, 77880, 983199, 5876, 70374, 12304, 129355, 0, 65315, 92670, + 128511, 71862, 0, 127957, 119621, 11114, 71909, 12447, 64486, 121236, + 126562, 983129, 0, 121393, 983802, 42767, 10915, 983174, 12007, 43695, + 68033, 11975, 101010, 128745, 92604, 2555, 8629, 128640, 41133, 41872, + 43706, 4496, 100692, 83108, 120241, 128164, 100691, 0, 983553, 64730, + 70041, 66714, 68222, 0, 70076, 65596, 67837, 11416, 4280, 67655, 8765, + 12784, 7792, 1393, 78191, 11157, 74386, 127274, 8233, 12820, 100847, + 6683, 125112, 3442, 12144, 2841, 12543, 100699, 1473, 42820, 64329, + 100816, 67243, 68642, 6488, 357, 1048, 41100, 72417, 41104, 94003, 3406, + 1054, 71320, 1040, 65450, 113769, 4434, 1069, 194784, 100703, 65737, + 120129, 120302, 0, 83211, 9693, 41943, 68305, 41931, 41759, 12757, 4353, + 983353, 1059, 9790, 8995, 119974, 917769, 65937, 78572, 41758, 10646, + 100665, 118833, 2268, 70424, 74830, 78569, 12743, 983689, 6480, 917761, + 41779, 42580, 66601, 12207, 77895, 6335, 43919, 11312, 64807, 92962, + 69989, 41767, 119629, 983764, 43020, 74974, 3955, 74254, 120632, 983754, + 917861, 70187, 69975, 9770, 9246, 12230, 125047, 129105, 78580, 10448, + 41783, 41786, 70663, 12797, 2755, 64571, 78578, 127994, 4857, 983577, + 4428, 12794, 73755, 100722, 78574, 0, 11116, 43842, 5747, 78825, 70471, + 7978, 41092, 74571, 0, 11924, 43812, 42144, 65015, 100725, 563, 0, + 100795, 12798, 11271, 57, 92717, 83495, 100727, 119043, 71268, 94051, + 43137, 694, 983719, 9876, 128720, 83273, 0, 70392, 64537, 127914, 277, + 74385, 7229, 12761, 983145, 74466, 13025, 64811, 8757, 78824, 78188, + 1574, 7381, 194616, 2525, 4852, 5749, 68465, 13027, 42824, 120574, 1039, + 7151, 10155, 5745, 188, 41858, 11592, 100661, 69725, 9055, 41853, 4858, + 75000, 92896, 436, 4771, 917936, 2786, 93028, 4856, 8051, 92500, 119609, + 71327, 9644, 71133, 125009, 128873, 194916, 120732, 66710, 68084, 983361, + 73906, 67409, 127114, 917614, 10234, 5843, 11939, 70346, 42157, 0, 3157, + 194659, 68393, 75035, 3504, 70422, 983042, 10822, 5149, 66029, 10226, + 65142, 128025, 3594, 42424, 124993, 40, 12657, 983665, 0, 386, 121467, + 8834, 120974, 12815, 43574, 121430, 73907, 100513, 70113, 7220, 11839, + 121143, 74316, 194752, 65322, 4304, 74503, 8160, 74314, 100511, 121276, + 983940, 128526, 1348, 92349, 78597, 121139, 13303, 70406, 92392, 121384, + 7599, 1278, 43616, 13269, 127805, 92423, 74387, 78179, 78598, 74492, + 6097, 7568, 8780, 4982, 127464, 74501, 100720, 78592, 68745, 2672, 3735, + 127470, 13138, 42266, 9484, 10724, 41202, 71364, 128370, 43742, 128373, + 9487, 119959, 68785, 3842, 71911, 78668, 12442, 6193, 9791, 119344, + 100520, 42516, 7228, 7559, 74803, 66721, 7873, 11399, 119219, 194691, + 70006, 194690, 100518, 3604, 120683, 119188, 128877, 78540, 78541, 42507, + 1962, 43305, 78476, 42505, 11660, 119597, 2072, 92312, 6995, 72801, 5437, + 74174, 10669, 8702, 7964, 92352, 100514, 199, 68075, 4105, 194845, 3864, + 75006, 194710, 67818, 13148, 7560, 78479, 9226, 78478, 128471, 6472, + 65814, 71919, 100855, 4724, 128491, 195041, 9191, 194645, 64432, 120270, + 82987, 119190, 10196, 7886, 0, 6585, 194640, 6680, 195042, 983425, 71872, + 6679, 74412, 92251, 119350, 74421, 11382, 128254, 43862, 75001, 113733, + 194679, 194832, 6681, 127482, 12693, 194836, 42727, 78196, 128252, 43874, + 65442, 68047, 69733, 9989, 43248, 66248, 194816, 127534, 11321, 128845, + 120809, 122895, 5297, 7042, 13284, 6112, 7968, 93010, 73927, 92444, + 127336, 65746, 118796, 69889, 74389, 128696, 4342, 42839, 121339, 1677, + 917592, 82989, 126590, 83415, 11091, 11011, 2719, 0, 0, 119595, 10160, 0, + 129150, 7585, 65169, 2052, 4308, 83414, 43000, 7505, 543, 64916, 64736, + 118835, 194665, 64655, 983053, 118922, 2064, 917966, 43158, 7902, 983231, + 65265, 194639, 121080, 127170, 122915, 128006, 92550, 983186, 12994, + 92728, 10828, 74378, 6228, 4307, 3482, 128527, 83231, 72389, 83079, 506, + 74573, 41194, 65735, 2055, 43255, 41195, 0, 8169, 121407, 8841, 66770, + 516, 93974, 2063, 119051, 34, 128850, 120186, 11504, 1612, 74333, 120182, + 11827, 67165, 12001, 120178, 10242, 64564, 120179, 67986, 6584, 7749, + 11037, 127157, 1758, 119074, 10667, 10560, 120197, 92593, 1935, 11517, + 120193, 120196, 83082, 1931, 100499, 74839, 74104, 1217, 64702, 12643, + 825, 127838, 194905, 12294, 92428, 66748, 9138, 78831, 78833, 12631, + 71871, 11080, 74554, 64000, 5591, 1239, 127199, 11313, 194803, 3403, + 126564, 120271, 64364, 92269, 121282, 72431, 8998, 12988, 119983, 9152, + 92161, 0, 126484, 67589, 41850, 64290, 3433, 92393, 12615, 1594, 42192, + 6914, 66392, 125202, 119569, 74565, 41353, 67602, 67611, 4337, 0, 127296, + 918, 65035, 41351, 7681, 194900, 42577, 41393, 12668, 72395, 2477, + 127285, 121249, 118880, 0, 67604, 67683, 127235, 573, 127281, 120543, + 11417, 92661, 119814, 119309, 67599, 0, 72410, 67607, 11482, 128961, + 3981, 3357, 127164, 42223, 4207, 1288, 78503, 78839, 67728, 77907, 11589, 42195, 74477, 119997, 127178, 64602, 67618, 92539, 121366, 42788, 68416, - 64480, 194875, 8423, 3348, 448, 66907, 9717, 119311, 0, 997, 0, 0, 92577, - 0, 11440, 11379, 42000, 13139, 42221, 65013, 126999, 127760, 72390, 0, - 119228, 12035, 0, 2818, 0, 74411, 73793, 983278, 4172, 71252, 119992, - 8373, 10873, 12197, 125074, 195014, 92265, 69706, 128540, 6834, 74347, - 74958, 129033, 126982, 74563, 64828, 11419, 194868, 766, 1257, 194598, - 118845, 11381, 3265, 66617, 3274, 126629, 83254, 71861, 983950, 74522, - 41989, 121317, 0, 113769, 3263, 917922, 65672, 69243, 3270, 64539, 11489, - 917911, 0, 0, 71127, 9505, 65518, 128498, 756, 194605, 0, 0, 194621, - 7261, 92547, 186, 0, 119156, 5770, 13179, 65830, 12612, 12949, 64856, - 12800, 983901, 74203, 64718, 11507, 78673, 92434, 74626, 113760, 11578, - 983837, 119296, 120970, 121127, 125101, 0, 70083, 9254, 66877, 1794, - 68310, 64521, 5624, 120220, 120221, 119958, 120223, 3617, 66636, 64886, - 94061, 68659, 120213, 120214, 1872, 66508, 120467, 41079, 10748, 5502, - 119330, 4452, 128088, 983771, 92526, 4511, 120958, 983877, 64678, 11425, - 0, 43245, 1231, 68861, 69903, 0, 9003, 8192, 0, 5305, 9653, 10616, 8694, - 9546, 0, 128332, 70421, 120200, 65205, 120202, 64063, 9878, 74780, - 119626, 78202, 64058, 8799, 42131, 128662, 64062, 1028, 64060, 64059, - 837, 10567, 72384, 43103, 0, 120754, 11427, 2902, 64043, 64042, 43749, - 10756, 64047, 42606, 64045, 64044, 43979, 10076, 64040, 43060, 194942, - 1034, 3392, 83336, 43091, 64033, 64032, 42735, 43498, 64037, 64036, - 64035, 4291, 129157, 64015, 64014, 64681, 83394, 83395, 78145, 71898, - 43090, 83391, 3476, 8973, 64012, 42473, 64010, 64008, 64007, 2003, 7706, - 64517, 78153, 2538, 64009, 204, 0, 4802, 4111, 8239, 9098, 4805, 64001, - 64057, 7885, 7247, 64054, 983268, 0, 4767, 9343, 64049, 64048, 120034, - 1133, 64053, 64052, 43453, 64050, 41340, 118975, 83261, 10005, 12329, - 41333, 83259, 8489, 1942, 917921, 194834, 42520, 65510, 125044, 68291, - 10760, 64023, 64022, 64021, 6582, 43670, 127798, 64025, 9167, 42151, - 78244, 983232, 2026, 64019, 64018, 64017, 64016, 12768, 121361, 7582, - 78252, 78248, 77914, 78246, 78247, 120791, 77915, 78766, 6788, 13094, - 77920, 7532, 41414, 78520, 3179, 78518, 64769, 78514, 78517, 11461, - 74454, 10751, 9051, 120720, 6708, 10535, 118955, 68218, 55274, 2008, - 64031, 64030, 294, 41874, 83383, 64790, 65929, 83376, 83337, 83379, - 83380, 64028, 8146, 64026, 41788, 194844, 0, 4351, 6343, 43247, 119888, - 70153, 119886, 119891, 72387, 119889, 11433, 119895, 119896, 194655, - 7801, 65578, 83361, 12915, 43968, 3297, 9699, 83357, 1135, 83350, 83351, - 83352, 1995, 6722, 983925, 128815, 2552, 41546, 60, 68394, 8649, 41549, - 78496, 72386, 83371, 6682, 83365, 78679, 43833, 41547, 983630, 2013, - 83362, 78530, 78532, 78528, 78529, 12832, 78493, 8081, 8362, 3537, - 119908, 9137, 7155, 8999, 917901, 78533, 3466, 0, 121466, 1996, 0, 3453, - 6282, 0, 2002, 2000, 120175, 537, 92976, 4179, 65119, 1998, 120746, 1842, - 0, 92674, 9628, 68446, 12081, 9826, 64502, 1767, 0, 983248, 120001, - 120201, 983646, 124975, 127952, 3059, 44024, 120204, 43491, 92693, 0, - 121472, 92452, 4100, 920, 1811, 1355, 43189, 0, 3592, 10078, 0, 78162, - 119558, 8592, 65870, 66417, 74504, 10742, 72400, 42918, 1994, 9281, 3296, - 12865, 1997, 1895, + 64480, 194875, 8423, 3348, 448, 66907, 9717, 119311, 100738, 997, 119998, + 917910, 92577, 0, 11440, 11379, 42000, 13139, 42221, 65013, 126999, + 127760, 72390, 120713, 119228, 12035, 983906, 2818, 0, 74411, 73793, + 129424, 4172, 71252, 119992, 8373, 10873, 12197, 125074, 195014, 92265, + 69706, 100858, 6834, 74347, 74958, 69645, 126982, 74563, 64828, 11419, + 126570, 766, 1257, 194598, 118845, 11381, 3265, 66617, 3274, 126629, + 83254, 71861, 983950, 72796, 41989, 121317, 194806, 3418, 3263, 917922, + 65672, 69243, 3270, 64539, 11489, 917911, 0, 0, 71127, 9505, 65518, + 128498, 756, 120400, 125243, 983700, 194621, 7261, 92547, 186, 983769, + 72771, 5770, 13179, 65830, 12612, 12949, 64856, 12800, 127529, 74203, + 64718, 11507, 78673, 92434, 74626, 113760, 11578, 983837, 119296, 120970, + 121127, 125101, 0, 70083, 9254, 66877, 1794, 68310, 64521, 5624, 72766, + 120221, 119958, 120223, 3617, 66636, 64886, 94061, 68659, 120213, 120214, + 1872, 66508, 120467, 41079, 10748, 5502, 119330, 4452, 128088, 983560, + 92526, 4511, 120958, 983877, 64678, 11425, 0, 43245, 1231, 68861, 69903, + 983643, 9003, 8192, 0, 5305, 9653, 10616, 8694, 9546, 983237, 128332, + 70421, 120200, 65205, 120202, 64063, 9878, 74780, 119058, 78202, 64058, + 8799, 42131, 128662, 64062, 1028, 64060, 64059, 837, 10567, 72384, 43103, + 100352, 120754, 11427, 2902, 64043, 64042, 43749, 10756, 64047, 42606, + 64045, 64044, 43979, 10076, 64040, 43060, 100356, 1034, 3392, 83336, + 43091, 64033, 64032, 42735, 43498, 64037, 64036, 64035, 4291, 129157, + 64015, 64014, 64681, 83394, 83395, 78145, 71898, 43090, 83391, 3476, + 8973, 64012, 42473, 64010, 64008, 64007, 2003, 7706, 64517, 78153, 2538, + 64009, 204, 100841, 4802, 4111, 8239, 9098, 4805, 64001, 64057, 7885, + 7247, 64054, 983268, 118921, 4767, 9343, 64049, 64048, 120034, 1133, + 64053, 64052, 43453, 64050, 41340, 118975, 83261, 10005, 12329, 41333, + 83259, 8489, 1942, 100843, 194834, 42520, 65510, 125044, 68291, 10760, + 64023, 64022, 64021, 6582, 43670, 127798, 64025, 9167, 42151, 78244, + 983232, 2026, 64019, 64018, 64017, 64016, 12768, 100537, 7582, 78252, + 78248, 77914, 78246, 78247, 120791, 77915, 78766, 6788, 13094, 77920, + 7532, 41414, 78520, 3179, 70745, 64769, 78514, 78517, 11461, 74454, + 10751, 9051, 120720, 6708, 10535, 118955, 68218, 55274, 2008, 64031, + 64030, 294, 41874, 83383, 64790, 65929, 83376, 83337, 83379, 83380, + 64028, 8146, 64026, 41788, 100406, 983650, 4351, 6343, 43247, 119888, + 70153, 100753, 78733, 72387, 119889, 11433, 100544, 119896, 194655, 7801, + 65578, 83361, 12915, 43968, 3297, 9699, 83357, 1135, 83350, 83351, 83352, + 1995, 6722, 983925, 128815, 2552, 41546, 60, 68394, 8649, 41549, 78496, + 72386, 83371, 6682, 83365, 78679, 43833, 41547, 983630, 2013, 83362, + 78530, 78532, 78528, 78529, 12832, 78493, 8081, 8362, 3537, 119908, 9137, + 7155, 2264, 917901, 78533, 3466, 194987, 121039, 1996, 983675, 3453, + 3412, 0, 2002, 2000, 120175, 537, 92976, 4179, 65119, 1998, 120746, 1842, + 0, 92674, 9628, 68446, 12081, 9826, 64502, 1767, 3413, 983248, 120001, + 120201, 983646, 124975, 127952, 3059, 44024, 120204, 43491, 92693, + 100547, 121472, 92452, 4100, 920, 1811, 1355, 43189, 0, 3592, 10078, + 100394, 78162, 100846, 8592, 65870, 66417, 74504, 10742, 72400, 42918, + 1994, 9281, 3296, 12865, 1997, 1895, }; #define code_magic 47 diff --git a/Modules/winreparse.h b/Modules/winreparse.h index 66f7775..28049c9 100644 --- a/Modules/winreparse.h +++ b/Modules/winreparse.h @@ -2,7 +2,7 @@ #define Py_WINREPARSE_H #ifdef MS_WINDOWS -#include +#include #ifdef __cplusplus extern "C" { @@ -10,9 +10,10 @@ extern "C" { /* The following structure was copied from http://msdn.microsoft.com/en-us/library/ff552012.aspx as the required - include doesn't seem to be present in the Windows SDK (at least as included - with Visual Studio Express). */ -typedef struct _REPARSE_DATA_BUFFER { + include km\ntifs.h isn't present in the Windows SDK (at least as included + with Visual Studio Express). Use unique names to avoid conflicting with + the structure as defined by Min GW. */ +typedef struct { ULONG ReparseTag; USHORT ReparseDataLength; USHORT Reserved; @@ -38,11 +39,11 @@ typedef struct _REPARSE_DATA_BUFFER { UCHAR DataBuffer[1]; } GenericReparseBuffer; }; -} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; +} _Py_REPARSE_DATA_BUFFER, *_Py_PREPARSE_DATA_BUFFER; -#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER,\ - GenericReparseBuffer) -#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 ) +#define _Py_REPARSE_DATA_BUFFER_HEADER_SIZE \ + FIELD_OFFSET(_Py_REPARSE_DATA_BUFFER, GenericReparseBuffer) +#define _Py_MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 ) #ifdef __cplusplus } diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c index ea620fd..c1a9be9 100644 --- a/Modules/xxlimited.c +++ b/Modules/xxlimited.c @@ -31,7 +31,7 @@ static XxoObject * newXxoObject(PyObject *arg) { XxoObject *self; - self = PyObject_GC_New(XxoObject, (PyTypeObject*)Xxo_Type); + self = PyObject_New(XxoObject, (PyTypeObject*)Xxo_Type); if (self == NULL) return NULL; self->x_attr = NULL; @@ -89,7 +89,7 @@ Xxo_getattro(XxoObject *self, PyObject *name) } static int -Xxo_setattr(XxoObject *self, char *name, PyObject *v) +Xxo_setattr(XxoObject *self, const char *name, PyObject *v) { if (self->x_attr == NULL) { self->x_attr = PyDict_New(); diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c index 85230d9..0764407 100644 --- a/Modules/xxmodule.c +++ b/Modules/xxmodule.c @@ -76,7 +76,7 @@ Xxo_getattro(XxoObject *self, PyObject *name) } static int -Xxo_setattr(XxoObject *self, char *name, PyObject *v) +Xxo_setattr(XxoObject *self, const char *name, PyObject *v) { if (self->x_attr == NULL) { self->x_attr = PyDict_New(); diff --git a/Modules/zipimport.c b/Modules/zipimport.c index feef98f..59046aa 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -907,10 +907,8 @@ read_directory(PyObject *archive) fp = _Py_fopen_obj(archive, "rb"); if (fp == NULL) { if (PyErr_ExceptionMatches(PyExc_OSError)) { - PyObject *exc, *val, *tb; - PyErr_Fetch(&exc, &val, &tb); - PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); - _PyErr_ChainExceptions(exc, val, tb); + _PyErr_FormatFromCause(ZipImportError, + "can't open Zip file: %R", archive); } return NULL; } @@ -1104,7 +1102,7 @@ get_decompress_func(void) _Py_IDENTIFIER(decompress); if (importing_zlib != 0) - /* Someone has a zlib.pyc in their Zip file; + /* Someone has a zlib.py[co] in their Zip file; let's avoid a stack overflow. */ return NULL; importing_zlib = 1; @@ -1263,12 +1261,7 @@ eq_mtime(time_t t1, time_t t2) return d <= 1; } -/* Issue #29537: handle issue27286 bytecode incompatibility - * See Lib/importlib/_bootstrap_external.py for general discussion - */ -extern PY_UINT32_T _Py_BACKCOMPAT_MAGIC_NUMBER; - -/* Given the contents of a .pyc file in a buffer, unmarshal the data +/* Given the contents of a .py[co] file in a buffer, unmarshal the data and return the code object. Return None if it the magic word doesn't match (we do this instead of raising an exception as we fall back to .py if available and we don't want to mask other errors). @@ -1279,7 +1272,6 @@ unmarshal_code(PyObject *pathname, PyObject *data, time_t mtime) PyObject *code; unsigned char *buf = (unsigned char *)PyBytes_AsString(data); Py_ssize_t size = PyBytes_Size(data); - PY_UINT32_T magic; if (size < 12) { PyErr_SetString(ZipImportError, @@ -1287,10 +1279,7 @@ unmarshal_code(PyObject *pathname, PyObject *data, time_t mtime) return NULL; } - magic = get_uint32(buf); - if (magic != (unsigned int)PyImport_GetMagicNumber() - /* Issue #29537: handle issue27286 bytecode incompatibility */ - && magic != _Py_BACKCOMPAT_MAGIC_NUMBER) { + if (get_uint32(buf) != (unsigned int)PyImport_GetMagicNumber()) { if (Py_VerboseFlag) { PySys_FormatStderr("# %R has bad magic\n", pathname); @@ -1414,7 +1403,7 @@ get_mtime_of_source(ZipImporter *self, PyObject *path) PyObject *toc_entry, *stripped; time_t mtime; - /* strip 'c' from *.pyc */ + /* strip 'c' or 'o' from *.py[co] */ if (PyUnicode_READY(path) == -1) return (time_t)-1; stripped = PyUnicode_FromKindAndData(PyUnicode_KIND(path), diff --git a/Modules/zlib/ChangeLog b/Modules/zlib/ChangeLog index 30199a6..f22aaba 100644 --- a/Modules/zlib/ChangeLog +++ b/Modules/zlib/ChangeLog @@ -1,53 +1,10 @@ ChangeLog file for zlib -Changes in 1.2.11 (15 Jan 2017) -- Fix deflate stored bug when pulling last block from window -- Permit immediate deflateParams changes before any deflate input - -Changes in 1.2.10 (2 Jan 2017) -- Avoid warnings on snprintf() return value -- Fix bug in deflate_stored() for zero-length input -- Fix bug in gzwrite.c that produced corrupt gzip files -- Remove files to be installed before copying them in Makefile.in -- Add warnings when compiling with assembler code - -Changes in 1.2.9 (31 Dec 2016) -- Fix contrib/minizip to permit unzipping with desktop API [Zouzou] -- Improve contrib/blast to return unused bytes -- Assure that gzoffset() is correct when appending -- Improve compress() and uncompress() to support large lengths -- Fix bug in test/example.c where error code not saved -- Remedy Coverity warning [Randers-Pehrson] -- Improve speed of gzprintf() in transparent mode -- Fix inflateInit2() bug when windowBits is 16 or 32 -- Change DEBUG macro to ZLIB_DEBUG -- Avoid uninitialized access by gzclose_w() -- Allow building zlib outside of the source directory -- Fix bug that accepted invalid zlib header when windowBits is zero -- Fix gzseek() problem on MinGW due to buggy _lseeki64 there -- Loop on write() calls in gzwrite.c in case of non-blocking I/O -- Add --warn (-w) option to ./configure for more compiler warnings -- Reject a window size of 256 bytes if not using the zlib wrapper -- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE -- Add --debug (-d) option to ./configure to define ZLIB_DEBUG -- Fix bugs in creating a very large gzip header -- Add uncompress2() function, which returns the input size used -- Assure that deflateParams() will not switch functions mid-block -- Dramatically speed up deflation for level 0 (storing) -- Add gzfread(), duplicating the interface of fread() -- Add gzfwrite(), duplicating the interface of fwrite() -- Add deflateGetDictionary() function -- Use snprintf() for later versions of Microsoft C -- Fix *Init macros to use z_ prefix when requested -- Replace as400 with os400 for OS/400 support [Monnerat] -- Add crc32_z() and adler32_z() functions with size_t lengths -- Update Visual Studio project files [AraHaan] - Changes in 1.2.8 (28 Apr 2013) - Update contrib/minizip/iowin32.c for Windows RT [Vollant] - Do not force Z_CONST for C++ -- Clean up contrib/vstudio [Roß] +- Clean up contrib/vstudio [Ro§] - Correct spelling error in zlib.h - Fix mixed line endings in contrib/vstudio @@ -77,7 +34,7 @@ Changes in 1.2.7.1 (24 Mar 2013) - Clean up the usage of z_const and respect const usage within zlib - Clean up examples/gzlog.[ch] comparisons of different types - Avoid shift equal to bits in type (caused endless loop) -- Fix uninitialized value bug in gzputc() introduced by const patches +- Fix unintialized value bug in gzputc() introduced by const patches - Fix memory allocation error in examples/zran.c [Nor] - Fix bug where gzopen(), gzclose() would write an empty file - Fix bug in gzclose() when gzwrite() runs out of memory @@ -237,7 +194,7 @@ Changes in 1.2.5.2 (17 Dec 2011) - Add a transparent write mode to gzopen() when 'T' is in the mode - Update python link in zlib man page - Get inffixed.h and MAKEFIXED result to match -- Add a ./config --solo option to make zlib subset with no library use +- Add a ./config --solo option to make zlib subset with no libary use - Add undocumented inflateResetKeep() function for CAB file decoding - Add --cover option to ./configure for gcc coverage testing - Add #define ZLIB_CONST option to use const in the z_stream interface @@ -607,7 +564,7 @@ Changes in 1.2.3.1 (16 August 2006) - Update make_vms.com [Zinser] - Use -fPIC for shared build in configure [Teredesai, Nicholson] - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] -- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck] +- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] - Add some FAQ entries about the contrib directory - Update the MVS question in the FAQ - Avoid extraneous reads after EOF in gzio.c [Brown] @@ -1221,7 +1178,7 @@ Changes in 1.0.6 (19 Jan 1998) 386 asm code replacing longest_match(). contrib/iostream/ by Kevin Ruland A C++ I/O streams interface to the zlib gz* functions - contrib/iostream2/ by Tyge Løvset + contrib/iostream2/ by Tyge Løvset Another C++ I/O streams interface contrib/untgz/ by "Pedro A. Aranda Guti\irrez" A very simple tar.gz file extractor using zlib @@ -1310,7 +1267,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] - fix array overlay in deflate.c which sometimes caused bad compressed data - fix inflate bug with empty stored block - fix MSDOS medium model which was broken in 0.99 -- fix deflateParams() which could generate bad compressed data. +- fix deflateParams() which could generated bad compressed data. - Bytef is define'd instead of typedef'ed (work around Borland bug) - added an INDEX file - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), diff --git a/Modules/zlib/Makefile.in b/Modules/zlib/Makefile.in index 1852192..c61aa30 100644 --- a/Modules/zlib/Makefile.in +++ b/Modules/zlib/Makefile.in @@ -1,5 +1,5 @@ # Makefile for zlib -# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler +# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: @@ -20,7 +20,7 @@ CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 -#CFLAGS=-g -DZLIB_DEBUG +#CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes @@ -32,7 +32,7 @@ CPP=$(CC) -E STATICLIB=libz.a SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.2.10 +SHAREDLIBV=libz.so.1.2.8 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) @@ -53,9 +53,6 @@ includedir = ${prefix}/include mandir = ${prefix}/share/man man3dir = ${mandir}/man3 pkgconfigdir = ${libdir}/pkgconfig -SRCDIR= -ZINC= -ZINCOUT=-I. OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o @@ -116,8 +113,8 @@ test64: all64 fi; \ rm -f $$TMP64 -infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h - $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c +infcover.o: test/infcover.c zlib.h zconf.h + $(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c infcover: infcover.o libz.a $(CC) $(CFLAGS) -o $@ infcover.o libz.a @@ -143,140 +140,24 @@ match.lo: match.S mv _match.o match.lo rm -f _match.s -example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h - $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c +example.o: test/example.c zlib.h zconf.h + $(CC) $(CFLAGS) -I. -c -o $@ test/example.c -minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h - $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c +minigzip.o: test/minigzip.c zlib.h zconf.h + $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c -example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h - $(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c +example64.o: test/example.c zlib.h zconf.h + $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c -minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h - $(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c +minigzip64.o: test/minigzip.c zlib.h zconf.h + $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c +.SUFFIXES: .lo -adler32.o: $(SRCDIR)adler32.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c - -crc32.o: $(SRCDIR)crc32.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c - -deflate.o: $(SRCDIR)deflate.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c - -infback.o: $(SRCDIR)infback.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c - -inffast.o: $(SRCDIR)inffast.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c - -inflate.o: $(SRCDIR)inflate.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c - -inftrees.o: $(SRCDIR)inftrees.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c - -trees.o: $(SRCDIR)trees.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c - -zutil.o: $(SRCDIR)zutil.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c - -compress.o: $(SRCDIR)compress.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c - -uncompr.o: $(SRCDIR)uncompr.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c - -gzclose.o: $(SRCDIR)gzclose.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c - -gzlib.o: $(SRCDIR)gzlib.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c - -gzread.o: $(SRCDIR)gzread.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c - -gzwrite.o: $(SRCDIR)gzwrite.c - $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c - - -adler32.lo: $(SRCDIR)adler32.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c - -@mv objs/adler32.o $@ - -crc32.lo: $(SRCDIR)crc32.c +.c.lo: -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c - -@mv objs/crc32.o $@ - -deflate.lo: $(SRCDIR)deflate.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c - -@mv objs/deflate.o $@ - -infback.lo: $(SRCDIR)infback.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c - -@mv objs/infback.o $@ - -inffast.lo: $(SRCDIR)inffast.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c - -@mv objs/inffast.o $@ - -inflate.lo: $(SRCDIR)inflate.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c - -@mv objs/inflate.o $@ - -inftrees.lo: $(SRCDIR)inftrees.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c - -@mv objs/inftrees.o $@ - -trees.lo: $(SRCDIR)trees.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c - -@mv objs/trees.o $@ - -zutil.lo: $(SRCDIR)zutil.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c - -@mv objs/zutil.o $@ - -compress.lo: $(SRCDIR)compress.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c - -@mv objs/compress.o $@ - -uncompr.lo: $(SRCDIR)uncompr.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c - -@mv objs/uncompr.o $@ - -gzclose.lo: $(SRCDIR)gzclose.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c - -@mv objs/gzclose.o $@ - -gzlib.lo: $(SRCDIR)gzlib.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c - -@mv objs/gzlib.o $@ - -gzread.lo: $(SRCDIR)gzread.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c - -@mv objs/gzread.o $@ - -gzwrite.lo: $(SRCDIR)gzwrite.c - -@mkdir objs 2>/dev/null || test -d objs - $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c - -@mv objs/gzwrite.o $@ - + $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $< + -@mv objs/$*.o $@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) @@ -309,12 +190,10 @@ install-libs: $(LIBS) -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - rm -f $(DESTDIR)$(libdir)/$(STATICLIB) cp $(STATICLIB) $(DESTDIR)$(libdir) chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 -@if test -n "$(SHAREDLIBV)"; then \ - rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ @@ -324,10 +203,8 @@ install-libs: $(LIBS) ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ ($(LDCONFIG) || true) >/dev/null 2>&1; \ fi - rm -f $(DESTDIR)$(man3dir)/zlib.3 - cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir) + cp zlib.3 $(DESTDIR)$(man3dir) chmod 644 $(DESTDIR)$(man3dir)/zlib.3 - rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc cp zlib.pc $(DESTDIR)$(pkgconfigdir) chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc # The ranlib in install is needed on NeXTSTEP which checks file times @@ -335,8 +212,7 @@ install-libs: $(LIBS) install: install-libs -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi - rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h - cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir) + cp zlib.h zconf.h $(DESTDIR)$(includedir) chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h uninstall: @@ -350,18 +226,18 @@ uninstall: docs: zlib.3.pdf -zlib.3.pdf: $(SRCDIR)zlib.3 - groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@ +zlib.3.pdf: zlib.3 + groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf -zconf.h.cmakein: $(SRCDIR)zconf.h.in +zconf.h.cmakein: zconf.h.in -@ TEMPFILE=zconfh_$$; \ echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ - sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\ - touch -r $(SRCDIR)zconf.h.in $@ &&\ + sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\ + touch -r zconf.h.in zconf.h.cmakein &&\ rm $$TEMPFILE -zconf: $(SRCDIR)zconf.h.in - cp -p $(SRCDIR)zconf.h.in zconf.h +zconf: zconf.h.in + cp -p zconf.h.in zconf.h mostlyclean: clean clean: @@ -379,32 +255,34 @@ maintainer-clean: distclean distclean: clean zconf zconf.h.cmakein docs rm -f Makefile zlib.pc configure.log -@rm -f .DS_Store - @if [ -f Makefile.in ]; then \ - printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \ - printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \ - touch -r $(SRCDIR)Makefile.in Makefile ; fi - @if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi - @if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi + -@printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile + -@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile + -@touch -r Makefile.in Makefile tags: - etags $(SRCDIR)*.[ch] - -adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h -gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h -compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h -crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h -deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h -infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h -inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h -inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h -trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h - -adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h -gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h -compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h -crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h -deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h -infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h -inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h -inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h -trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h + etags *.[ch] + +depend: + makedepend -- $(CFLAGS) -- *.[ch] + +# DO NOT DELETE THIS LINE -- make depend depends on it. + +adler32.o zutil.o: zutil.h zlib.h zconf.h +gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h +compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h +crc32.o: zutil.h zlib.h zconf.h crc32.h +deflate.o: deflate.h zutil.h zlib.h zconf.h +infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h +inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inftrees.o: zutil.h zlib.h zconf.h inftrees.h +trees.o: deflate.h zutil.h zlib.h zconf.h trees.h + +adler32.lo zutil.lo: zutil.h zlib.h zconf.h +gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h +compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h +crc32.lo: zutil.h zlib.h zconf.h crc32.h +deflate.lo: deflate.h zutil.h zlib.h zconf.h +infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h +inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inftrees.lo: zutil.h zlib.h zconf.h inftrees.h +trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h diff --git a/Modules/zlib/README b/Modules/zlib/README index 51106de..5ca9d12 100644 --- a/Modules/zlib/README +++ b/Modules/zlib/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.11 is a general purpose data compression library. All the code is +zlib 1.2.8 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -31,7 +31,7 @@ Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at http://marknelson.us/1997/01/01/zlib-engine/ . -The changes made in version 1.2.11 are documented in the file ChangeLog. +The changes made in version 1.2.8 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . @@ -84,7 +84,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2017 Jean-loup Gailly and Mark Adler + (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Modules/zlib/adler32.c b/Modules/zlib/adler32.c index d0be438..a868f07 100644 --- a/Modules/zlib/adler32.c +++ b/Modules/zlib/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011, 2016 Mark Adler + * Copyright (C) 1995-2011 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -7,9 +7,11 @@ #include "zutil.h" +#define local static + local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -#define BASE 65521U /* largest prime smaller than 65536 */ +#define BASE 65521 /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -60,10 +62,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32_z(adler, buf, len) +uLong ZEXPORT adler32(adler, buf, len) uLong adler; const Bytef *buf; - z_size_t len; + uInt len; { unsigned long sum2; unsigned n; @@ -131,15 +133,6 @@ uLong ZEXPORT adler32_z(adler, buf, len) } /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ - return adler32_z(adler, buf, len); -} - -/* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; uLong adler2; @@ -163,7 +156,7 @@ local uLong adler32_combine_(adler1, adler2, len2) sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); + if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } diff --git a/Modules/zlib/compress.c b/Modules/zlib/compress.c index e2db404..6e97626 100644 --- a/Modules/zlib/compress.c +++ b/Modules/zlib/compress.c @@ -1,5 +1,5 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -28,11 +28,16 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) { z_stream stream; int err; - const uInt max = (uInt)-1; - uLong left; - left = *destLen; - *destLen = 0; + stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; +#ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; +#endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; @@ -41,26 +46,15 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) err = deflateInit(&stream, level); if (err != Z_OK) return err; - stream.next_out = dest; - stream.avail_out = 0; - stream.next_in = (z_const Bytef *)source; - stream.avail_in = 0; - - do { - if (stream.avail_out == 0) { - stream.avail_out = left > (uLong)max ? max : (uInt)left; - left -= stream.avail_out; - } - if (stream.avail_in == 0) { - stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen; - sourceLen -= stream.avail_in; - } - err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH); - } while (err == Z_OK); - + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } *destLen = stream.total_out; - deflateEnd(&stream); - return err == Z_STREAM_END ? Z_OK : err; + + err = deflateEnd(&stream); + return err; } /* =========================================================================== diff --git a/Modules/zlib/configure b/Modules/zlib/configure index e974d1f..b77a8a8 100755 --- a/Modules/zlib/configure +++ b/Modules/zlib/configure @@ -18,18 +18,6 @@ echo -------------------- >> configure.log echo $0 $* >> configure.log date >> configure.log -# get source directory -SRCDIR=`dirname $0` -if test $SRCDIR = "."; then - ZINC="" - ZINCOUT="-I." - SRCDIR="" -else - ZINC='-include zconf.h' - ZINCOUT='-I. -I$(SRCDIR)' - SRCDIR="$SRCDIR/" -fi - # set command prefix for cross-compilation if [ -n "${CHOST}" ]; then uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`" @@ -40,10 +28,10 @@ fi STATICLIB=libz.a # extract zlib version numbers from zlib.h -VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h` -VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h` -VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` -VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` +VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` +VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h` +VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` # establish commands for library building if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then @@ -85,8 +73,6 @@ zprefix=0 zconst=0 build64=0 gcc=0 -warn=0 -debug=0 old_cc="$CC" old_cflags="$CFLAGS" OBJC='$(OBJZ) $(OBJG)' @@ -135,8 +121,6 @@ case "$1" in --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;; --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;; -c* | --const) zconst=1; shift ;; - -w* | --warn) warn=1; shift ;; - -d* | --debug) debug=1; shift ;; *) echo "unknown option: $1" | tee -a configure.log echo "$0 --help for help" | tee -a configure.log @@ -175,42 +159,34 @@ case "$cc" in esac case `$cc -v 2>&1` in *gcc*) gcc=1 ;; - *clang*) gcc=1 ;; esac show $cc -c $test.c if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then echo ... using gcc >> configure.log CC="$cc" - CFLAGS="${CFLAGS--O3}" + CFLAGS="${CFLAGS--O3} ${ARCHS}" SFLAGS="${CFLAGS--O3} -fPIC" - if test "$ARCHS"; then - CFLAGS="${CFLAGS} ${ARCHS}" - LDFLAGS="${LDFLAGS} ${ARCHS}" - fi + LDFLAGS="${LDFLAGS} ${ARCHS}" if test $build64 -eq 1; then CFLAGS="${CFLAGS} -m64" SFLAGS="${SFLAGS} -m64" fi - if test "$warn" -eq 1; then + if test "${ZLIBGCCWARN}" = "YES"; then if test "$zconst" -eq 1; then CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST" else CFLAGS="${CFLAGS} -Wall -Wextra -pedantic" fi fi - if test $debug -eq 1; then - CFLAGS="${CFLAGS} -DZLIB_DEBUG" - SFLAGS="${SFLAGS} -DZLIB_DEBUG" - fi if test -z "$uname"; then uname=`(uname -s || echo unknown) 2>/dev/null` fi case "$uname" in Linux* | linux* | GNU | GNU/* | solaris*) - LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;; *BSD | *bsd* | DragonFly) - LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} LDCONFIG="ldconfig -m" ;; CYGWIN* | Cygwin* | cygwin* | OS/2*) EXE='.exe' ;; @@ -311,9 +287,6 @@ else esac fi fi - if test -n "$ZINC"; then - ZINC='-I- -I. -I$(SRCDIR)' - fi ;; SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} CFLAGS=${CFLAGS-"-O2"} @@ -364,16 +337,16 @@ if ($CC -c $CFLAGS $test.c) 2>/dev/null; then } echo - using any output from compiler to indicate an error >> configure.log else - try() - { - show $* - ( $* ) >> configure.log 2>&1 - ret=$? - if test $ret -ne 0; then - echo "(exit code "$ret")" >> configure.log - fi - return $ret - } +try() +{ + show $* + ( $* ) >> configure.log 2>&1 + ret=$? + if test $ret -ne 0; then + echo "(exit code "$ret")" >> configure.log + fi + return $ret +} fi tryboth() @@ -449,65 +422,6 @@ esac echo >> configure.log -# check for size_t -cat > $test.c < -#include -size_t dummy = 0; -EOF -if try $CC -c $CFLAGS $test.c; then - echo "Checking for size_t... Yes." | tee -a configure.log - need_sizet=0 -else - echo "Checking for size_t... No." | tee -a configure.log - need_sizet=1 -fi - -echo >> configure.log - -# find the size_t integer type, if needed -if test $need_sizet -eq 1; then - cat > $test.c < $test.c < -int main(void) { - if (sizeof(void *) <= sizeof(int)) puts("int"); - else if (sizeof(void *) <= sizeof(long)) puts("long"); - else puts("z_longlong"); - return 0; -} -EOF - else - echo "Checking for long long... No." | tee -a configure.log - cat > $test.c < -int main(void) { - if (sizeof(void *) <= sizeof(int)) puts("int"); - else puts("long"); - return 0; -} -EOF - fi - if try $CC $CFLAGS -o $test $test.c; then - sizet=`./$test` - echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log - else - echo "Failed to find a pointer-size integer type." | tee -a configure.log - leave 1 - fi -fi - -if test $need_sizet -eq 1; then - CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" - SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}" -fi - -echo >> configure.log - # check for large file support, and if none, check for fseeko() cat > $test.c < @@ -556,7 +470,7 @@ else fi # copy clean zconf.h for subsequent edits -cp -p ${SRCDIR}zconf.h.in zconf.h +cp -p zconf.h.in zconf.h echo >> configure.log @@ -850,7 +764,6 @@ echo STATICLIB = $STATICLIB >> configure.log echo TEST = $TEST >> configure.log echo VER = $VER >> configure.log echo Z_U4 = $Z_U4 >> configure.log -echo SRCDIR = $SRCDIR >> configure.log echo exec_prefix = $exec_prefix >> configure.log echo includedir = $includedir >> configure.log echo libdir = $libdir >> configure.log @@ -860,7 +773,7 @@ echo sharedlibdir = $sharedlibdir >> configure.log echo uname = $uname >> configure.log # udpate Makefile with the configure results -sed < ${SRCDIR}Makefile.in " +sed < Makefile.in " /^CC *=/s#=.*#=$CC# /^CFLAGS *=/s#=.*#=$CFLAGS# /^SFLAGS *=/s#=.*#=$SFLAGS# @@ -877,9 +790,6 @@ sed < ${SRCDIR}Makefile.in " /^LDCONFIG *=/s#=.*#=$LDCONFIG# /^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC# /^EXE *=/s#=.*#=$EXE# -/^SRCDIR *=/s#=.*#=$SRCDIR# -/^ZINC *=/s#=.*#=$ZINC# -/^ZINCOUT *=/s#=.*#=$ZINCOUT# /^prefix *=/s#=.*#=$prefix# /^exec_prefix *=/s#=.*#=$exec_prefix# /^libdir *=/s#=.*#=$libdir# @@ -893,7 +803,7 @@ sed < ${SRCDIR}Makefile.in " " > Makefile # create zlib.pc with the configure results -sed < ${SRCDIR}zlib.pc.in " +sed < zlib.pc.in " /^CC *=/s#=.*#=$CC# /^CFLAGS *=/s#=.*#=$CFLAGS# /^CPP *=/s#=.*#=$CPP# diff --git a/Modules/zlib/crc32.c b/Modules/zlib/crc32.c index 9580440..979a719 100644 --- a/Modules/zlib/crc32.c +++ b/Modules/zlib/crc32.c @@ -1,5 +1,5 @@ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler + * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster @@ -30,15 +30,17 @@ #include "zutil.h" /* for STDC and FAR definitions */ +#define local static + /* Definitions for doing the crc four data bytes at a time. */ #if !defined(NOBYFOUR) && defined(Z_U4) # define BYFOUR #endif #ifdef BYFOUR local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, z_size_t)); + const unsigned char FAR *, unsigned)); local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, z_size_t)); + const unsigned char FAR *, unsigned)); # define TBLS 8 #else # define TBLS 1 @@ -199,10 +201,10 @@ const z_crc_t FAR * ZEXPORT get_crc_table() #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 /* ========================================================================= */ -unsigned long ZEXPORT crc32_z(crc, buf, len) +unsigned long ZEXPORT crc32(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - z_size_t len; + uInt len; { if (buf == Z_NULL) return 0UL; @@ -233,29 +235,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) return crc ^ 0xffffffffUL; } -/* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - uInt len; -{ - return crc32_z(crc, buf, len); -} - #ifdef BYFOUR -/* - This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit - integer pointer type. This violates the strict aliasing rule, where a - compiler can assume, for optimization purposes, that two pointers to - fundamentally different types won't ever point to the same memory. This can - manifest as a problem only if one of the pointers is written to. This code - only reads from those pointers. So long as this code remains isolated in - this compilation unit, there won't be a problem. For this reason, this code - should not be copied and pasted into a compilation unit in which other code - writes to the buffer that is passed to these routines. - */ - /* ========================================================================= */ #define DOLIT4 c ^= *buf4++; \ c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ @@ -266,7 +247,7 @@ unsigned long ZEXPORT crc32(crc, buf, len) local unsigned long crc32_little(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - z_size_t len; + unsigned len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -297,7 +278,7 @@ local unsigned long crc32_little(crc, buf, len) } /* ========================================================================= */ -#define DOBIG4 c ^= *buf4++; \ +#define DOBIG4 c ^= *++buf4; \ c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 @@ -306,7 +287,7 @@ local unsigned long crc32_little(crc, buf, len) local unsigned long crc32_big(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - z_size_t len; + unsigned len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -319,6 +300,7 @@ local unsigned long crc32_big(crc, buf, len) } buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + buf4--; while (len >= 32) { DOBIG32; len -= 32; @@ -327,6 +309,7 @@ local unsigned long crc32_big(crc, buf, len) DOBIG4; len -= 4; } + buf4++; buf = (const unsigned char FAR *)buf4; if (len) do { diff --git a/Modules/zlib/deflate.c b/Modules/zlib/deflate.c index 1ec7614..6969577 100644 --- a/Modules/zlib/deflate.c +++ b/Modules/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -73,8 +73,6 @@ typedef enum { typedef block_state (*compress_func) OF((deflate_state *s, int flush)); /* Compression function. Returns the block state after the call. */ -local int deflateStateCheck OF((z_streamp strm)); -local void slide_hash OF((deflate_state *s)); local void fill_window OF((deflate_state *s)); local block_state deflate_stored OF((deflate_state *s, int flush)); local block_state deflate_fast OF((deflate_state *s, int flush)); @@ -86,16 +84,15 @@ local block_state deflate_huff OF((deflate_state *s, int flush)); local void lm_init OF((deflate_state *s)); local void putShortMSB OF((deflate_state *s, uInt b)); local void flush_pending OF((z_streamp strm)); -local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); #ifdef ASMV -# pragma message("Assembler code may have bugs -- use at your own risk") void match_init OF((void)); /* asm code initialization */ uInt longest_match OF((deflate_state *s, IPos cur_match)); #else local uInt longest_match OF((deflate_state *s, IPos cur_match)); #endif -#ifdef ZLIB_DEBUG +#ifdef DEBUG local void check_match OF((deflate_state *s, IPos start, IPos match, int length)); #endif @@ -151,14 +148,21 @@ local const config configuration_table[10] = { * meaning. */ +#define EQUAL 0 +/* result of memcmp for equal strings */ + +#ifndef NO_DUMMY_DECL +struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ +#endif + /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ -#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) +#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) /* =========================================================================== * Update a hash value with the given input byte - * IN assertion: all calls to UPDATE_HASH are made with consecutive input - * characters, so that a running hash key can be computed from the previous - * key instead of complete recalculation each time. + * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. */ #define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) @@ -169,9 +173,9 @@ local const config configuration_table[10] = { * the previous length of the hash chain. * If this file is compiled with -DFASTEST, the compression level is forced * to 1, and no hash chains are maintained. - * IN assertion: all calls to INSERT_STRING are made with consecutive input - * characters and the first MIN_MATCH bytes of str are valid (except for - * the last MIN_MATCH-1 bytes of the input file). + * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). */ #ifdef FASTEST #define INSERT_STRING(s, str, match_head) \ @@ -193,37 +197,6 @@ local const config configuration_table[10] = { s->head[s->hash_size-1] = NIL; \ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); -/* =========================================================================== - * Slide the hash table when sliding the window down (could be avoided with 32 - * bit values at the expense of memory usage). We slide even when level == 0 to - * keep the hash table consistent if we switch back to level > 0 later. - */ -local void slide_hash(s) - deflate_state *s; -{ - unsigned n, m; - Posf *p; - uInt wsize = s->w_size; - - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m - wsize : NIL); - } while (--n); - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m - wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif -} - /* ========================================================================= */ int ZEXPORT deflateInit_(strm, level, version, stream_size) z_streamp strm; @@ -297,7 +270,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, #endif if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { + strategy < 0 || strategy > Z_FIXED) { return Z_STREAM_ERROR; } if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ @@ -305,15 +278,14 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, if (s == Z_NULL) return Z_MEM_ERROR; strm->state = (struct internal_state FAR *)s; s->strm = strm; - s->status = INIT_STATE; /* to pass state test in deflateReset() */ s->wrap = wrap; s->gzhead = Z_NULL; - s->w_bits = (uInt)windowBits; + s->w_bits = windowBits; s->w_size = 1 << s->w_bits; s->w_mask = s->w_size - 1; - s->hash_bits = (uInt)memLevel + 7; + s->hash_bits = memLevel + 7; s->hash_size = 1 << s->hash_bits; s->hash_mask = s->hash_size - 1; s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); @@ -347,31 +319,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, return deflateReset(strm); } -/* ========================================================================= - * Check for a valid deflate stream state. Return 0 if ok, 1 if not. - */ -local int deflateStateCheck (strm) - z_streamp strm; -{ - deflate_state *s; - if (strm == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) - return 1; - s = strm->state; - if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && -#ifdef GZIP - s->status != GZIP_STATE && -#endif - s->status != EXTRA_STATE && - s->status != NAME_STATE && - s->status != COMMENT_STATE && - s->status != HCRC_STATE && - s->status != BUSY_STATE && - s->status != FINISH_STATE)) - return 1; - return 0; -} - /* ========================================================================= */ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) z_streamp strm; @@ -384,7 +331,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) unsigned avail; z_const unsigned char *next; - if (deflateStateCheck(strm) || dictionary == Z_NULL) + if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) return Z_STREAM_ERROR; s = strm->state; wrap = s->wrap; @@ -442,34 +389,13 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) } /* ========================================================================= */ -int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength) - z_streamp strm; - Bytef *dictionary; - uInt *dictLength; -{ - deflate_state *s; - uInt len; - - if (deflateStateCheck(strm)) - return Z_STREAM_ERROR; - s = strm->state; - len = s->strstart + s->lookahead; - if (len > s->w_size) - len = s->w_size; - if (dictionary != Z_NULL && len) - zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); - if (dictLength != Z_NULL) - *dictLength = len; - return Z_OK; -} - -/* ========================================================================= */ int ZEXPORT deflateResetKeep (strm) z_streamp strm; { deflate_state *s; - if (deflateStateCheck(strm)) { + if (strm == Z_NULL || strm->state == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { return Z_STREAM_ERROR; } @@ -484,11 +410,7 @@ int ZEXPORT deflateResetKeep (strm) if (s->wrap < 0) { s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ } - s->status = -#ifdef GZIP - s->wrap == 2 ? GZIP_STATE : -#endif - s->wrap ? INIT_STATE : BUSY_STATE; + s->status = s->wrap ? INIT_STATE : BUSY_STATE; strm->adler = #ifdef GZIP s->wrap == 2 ? crc32(0L, Z_NULL, 0) : @@ -518,8 +440,8 @@ int ZEXPORT deflateSetHeader (strm, head) z_streamp strm; gz_headerp head; { - if (deflateStateCheck(strm) || strm->state->wrap != 2) - return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (strm->state->wrap != 2) return Z_STREAM_ERROR; strm->state->gzhead = head; return Z_OK; } @@ -530,7 +452,7 @@ int ZEXPORT deflatePending (strm, pending, bits) int *bits; z_streamp strm; { - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (pending != Z_NULL) *pending = strm->state->pending; if (bits != Z_NULL) @@ -547,7 +469,7 @@ int ZEXPORT deflatePrime (strm, bits, value) deflate_state *s; int put; - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; s = strm->state; if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; @@ -572,8 +494,9 @@ int ZEXPORT deflateParams(strm, level, strategy) { deflate_state *s; compress_func func; + int err = Z_OK; - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; s = strm->state; #ifdef FASTEST @@ -587,22 +510,13 @@ int ZEXPORT deflateParams(strm, level, strategy) func = configuration_table[s->level].func; if ((strategy != s->strategy || func != configuration_table[level].func) && - s->high_water) { + strm->total_in != 0) { /* Flush the last buffer: */ - int err = deflate(strm, Z_BLOCK); - if (err == Z_STREAM_ERROR) - return err; - if (strm->avail_out == 0) - return Z_BUF_ERROR; + err = deflate(strm, Z_BLOCK); + if (err == Z_BUF_ERROR && s->pending == 0) + err = Z_OK; } if (s->level != level) { - if (s->level == 0 && s->matches != 0) { - if (s->matches == 1) - slide_hash(s); - else - CLEAR_HASH(s); - s->matches = 0; - } s->level = level; s->max_lazy_match = configuration_table[level].max_lazy; s->good_match = configuration_table[level].good_length; @@ -610,7 +524,7 @@ int ZEXPORT deflateParams(strm, level, strategy) s->max_chain_length = configuration_table[level].max_chain; } s->strategy = strategy; - return Z_OK; + return err; } /* ========================================================================= */ @@ -623,12 +537,12 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) { deflate_state *s; - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; s = strm->state; - s->good_match = (uInt)good_length; - s->max_lazy_match = (uInt)max_lazy; + s->good_match = good_length; + s->max_lazy_match = max_lazy; s->nice_match = nice_length; - s->max_chain_length = (uInt)max_chain; + s->max_chain_length = max_chain; return Z_OK; } @@ -655,13 +569,14 @@ uLong ZEXPORT deflateBound(strm, sourceLen) { deflate_state *s; uLong complen, wraplen; + Bytef *str; /* conservative upper bound for compressed data */ complen = sourceLen + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; /* if can't get parameters, return conservative bound plus zlib wrapper */ - if (deflateStateCheck(strm)) + if (strm == Z_NULL || strm->state == Z_NULL) return complen + 6; /* compute wrapper length */ @@ -673,11 +588,9 @@ uLong ZEXPORT deflateBound(strm, sourceLen) case 1: /* zlib wrapper */ wraplen = 6 + (s->strstart ? 4 : 0); break; -#ifdef GZIP case 2: /* gzip wrapper */ wraplen = 18; if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ - Bytef *str; if (s->gzhead->extra != Z_NULL) wraplen += 2 + s->gzhead->extra_len; str = s->gzhead->name; @@ -694,7 +607,6 @@ uLong ZEXPORT deflateBound(strm, sourceLen) wraplen += 2; } break; -#endif default: /* for compiler happiness */ wraplen = 6; } @@ -722,10 +634,10 @@ local void putShortMSB (s, b) } /* ========================================================================= - * Flush as much pending output as possible. All deflate() output, except for - * some deflate_stored() output, goes through this function so some - * applications may wish to modify it to avoid allocating a large - * strm->next_out buffer and copying into it. (See also read_buf()). + * Flush as much pending output as possible. All deflate() output goes + * through this function so some applications may wish to modify it + * to avoid allocating a large strm->next_out buffer and copying into it. + * (See also read_buf()). */ local void flush_pending(strm) z_streamp strm; @@ -742,23 +654,13 @@ local void flush_pending(strm) strm->next_out += len; s->pending_out += len; strm->total_out += len; - strm->avail_out -= len; - s->pending -= len; + strm->avail_out -= len; + s->pending -= len; if (s->pending == 0) { s->pending_out = s->pending_buf; } } -/* =========================================================================== - * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1]. - */ -#define HCRC_UPDATE(beg) \ - do { \ - if (s->gzhead->hcrc && s->pending > (beg)) \ - strm->adler = crc32(strm->adler, s->pending_buf + (beg), \ - s->pending - (beg)); \ - } while (0) - /* ========================================================================= */ int ZEXPORT deflate (strm, flush) z_streamp strm; @@ -767,229 +669,230 @@ int ZEXPORT deflate (strm, flush) int old_flush; /* value of flush param for previous deflate call */ deflate_state *s; - if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) { + if (strm == Z_NULL || strm->state == Z_NULL || + flush > Z_BLOCK || flush < 0) { return Z_STREAM_ERROR; } s = strm->state; if (strm->next_out == Z_NULL || - (strm->avail_in != 0 && strm->next_in == Z_NULL) || + (strm->next_in == Z_NULL && strm->avail_in != 0) || (s->status == FINISH_STATE && flush != Z_FINISH)) { ERR_RETURN(strm, Z_STREAM_ERROR); } if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); + s->strm = strm; /* just in case */ old_flush = s->last_flush; s->last_flush = flush; - /* Flush as much pending output as possible */ - if (s->pending != 0) { - flush_pending(strm); - if (strm->avail_out == 0) { - /* Since avail_out is 0, deflate will be called again with - * more output space, but possibly with both pending and - * avail_in equal to zero. There won't be anything to do, - * but this is not an error situation so make sure we - * return OK instead of BUF_ERROR at next call of deflate: - */ - s->last_flush = -1; - return Z_OK; - } - - /* Make sure there is something to do and avoid duplicate consecutive - * flushes. For repeated and useless calls with Z_FINISH, we keep - * returning Z_STREAM_END instead of Z_BUF_ERROR. - */ - } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && - flush != Z_FINISH) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* User must not provide more input after the first FINISH: */ - if (s->status == FINISH_STATE && strm->avail_in != 0) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - /* Write the header */ if (s->status == INIT_STATE) { - /* zlib header */ - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); +#ifdef GZIP + if (s->wrap == 2) { + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } } - strm->adler = adler32(0L, Z_NULL, 0); - s->status = BUSY_STATE; + else +#endif + { + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); - /* Compression must start with an empty pending buffer */ - flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; - } - } -#ifdef GZIP - if (s->status == GZIP_STATE) { - /* gzip header */ - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == Z_NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); s->status = BUSY_STATE; + putShortMSB(s, header); - /* Compression must start with an empty pending buffer */ - flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; - } - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != Z_NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; + strm->adler = adler32(0L, Z_NULL, 0); } } +#ifdef GZIP if (s->status == EXTRA_STATE) { if (s->gzhead->extra != Z_NULL) { - ulg beg = s->pending; /* start of bytes to update crc */ - uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex; - while (s->pending + left > s->pending_buf_size) { - uInt copy = s->pending_buf_size - s->pending; - zmemcpy(s->pending_buf + s->pending, - s->gzhead->extra + s->gzindex, copy); - s->pending = s->pending_buf_size; - HCRC_UPDATE(beg); - s->gzindex += copy; - flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) + break; } - beg = 0; - left -= copy; + put_byte(s, s->gzhead->extra[s->gzindex]); + s->gzindex++; + } + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (s->gzindex == s->gzhead->extra_len) { + s->gzindex = 0; + s->status = NAME_STATE; } - zmemcpy(s->pending_buf + s->pending, - s->gzhead->extra + s->gzindex, left); - s->pending += left; - HCRC_UPDATE(beg); - s->gzindex = 0; } - s->status = NAME_STATE; + else + s->status = NAME_STATE; } if (s->status == NAME_STATE) { if (s->gzhead->name != Z_NULL) { - ulg beg = s->pending; /* start of bytes to update crc */ + uInt beg = s->pending; /* start of bytes to update crc */ int val; + do { if (s->pending == s->pending_buf_size) { - HCRC_UPDATE(beg); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; } - beg = 0; } val = s->gzhead->name[s->gzindex++]; put_byte(s, val); } while (val != 0); - HCRC_UPDATE(beg); - s->gzindex = 0; + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) { + s->gzindex = 0; + s->status = COMMENT_STATE; + } } - s->status = COMMENT_STATE; + else + s->status = COMMENT_STATE; } if (s->status == COMMENT_STATE) { if (s->gzhead->comment != Z_NULL) { - ulg beg = s->pending; /* start of bytes to update crc */ + uInt beg = s->pending; /* start of bytes to update crc */ int val; + do { if (s->pending == s->pending_buf_size) { - HCRC_UPDATE(beg); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; } - beg = 0; } val = s->gzhead->comment[s->gzindex++]; put_byte(s, val); } while (val != 0); - HCRC_UPDATE(beg); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) + s->status = HCRC_STATE; } - s->status = HCRC_STATE; + else + s->status = HCRC_STATE; } if (s->status == HCRC_STATE) { if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) { + if (s->pending + 2 > s->pending_buf_size) flush_pending(strm); - if (s->pending != 0) { - s->last_flush = -1; - return Z_OK; - } + if (s->pending + 2 <= s->pending_buf_size) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + s->status = BUSY_STATE; } - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); } - s->status = BUSY_STATE; + else + s->status = BUSY_STATE; + } +#endif - /* Compression must start with an empty pending buffer */ + /* Flush as much pending output as possible */ + if (s->pending != 0) { flush_pending(strm); - if (s->pending != 0) { + if (strm->avail_out == 0) { + /* Since avail_out is 0, deflate will be called again with + * more output space, but possibly with both pending and + * avail_in equal to zero. There won't be anything to do, + * but this is not an error situation so make sure we + * return OK instead of BUF_ERROR at next call of deflate: + */ s->last_flush = -1; return Z_OK; } + + /* Make sure there is something to do and avoid duplicate consecutive + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ + } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* User must not provide more input after the first FINISH: */ + if (s->status == FINISH_STATE && strm->avail_in != 0) { + ERR_RETURN(strm, Z_BUF_ERROR); } -#endif /* Start a new block or continue the current one. */ @@ -997,10 +900,9 @@ int ZEXPORT deflate (strm, flush) (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { block_state bstate; - bstate = s->level == 0 ? deflate_stored(s, flush) : - s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : - s->strategy == Z_RLE ? deflate_rle(s, flush) : - (*(configuration_table[s->level].func))(s, flush); + bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + (s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush)); if (bstate == finish_started || bstate == finish_done) { s->status = FINISH_STATE; @@ -1042,6 +944,7 @@ int ZEXPORT deflate (strm, flush) } } } + Assert(strm->avail_out > 0, "bug2"); if (flush != Z_FINISH) return Z_OK; if (s->wrap <= 0) return Z_STREAM_END; @@ -1078,9 +981,18 @@ int ZEXPORT deflateEnd (strm) { int status; - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; status = strm->state->status; + if (status != INIT_STATE && + status != EXTRA_STATE && + status != NAME_STATE && + status != COMMENT_STATE && + status != HCRC_STATE && + status != BUSY_STATE && + status != FINISH_STATE) { + return Z_STREAM_ERROR; + } /* Deallocate in reverse order of allocations: */ TRY_FREE(strm, strm->state->pending_buf); @@ -1111,7 +1023,7 @@ int ZEXPORT deflateCopy (dest, source) ushf *overlay; - if (deflateStateCheck(source) || dest == Z_NULL) { + if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { return Z_STREAM_ERROR; } @@ -1161,7 +1073,7 @@ int ZEXPORT deflateCopy (dest, source) * allocating a large strm->next_in buffer and copying from it. * (See also flush_pending()). */ -local unsigned read_buf(strm, buf, size) +local int read_buf(strm, buf, size) z_streamp strm; Bytef *buf; unsigned size; @@ -1185,7 +1097,7 @@ local unsigned read_buf(strm, buf, size) strm->next_in += len; strm->total_in += len; - return len; + return (int)len; } /* =========================================================================== @@ -1239,9 +1151,9 @@ local uInt longest_match(s, cur_match) { unsigned chain_length = s->max_chain_length;/* max hash chain length */ register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ + register Bytef *match; /* matched string */ register int len; /* length of current match */ - int best_len = (int)s->prev_length; /* best match length so far */ + int best_len = s->prev_length; /* best match length so far */ int nice_match = s->nice_match; /* stop if match long enough */ IPos limit = s->strstart > (IPos)MAX_DIST(s) ? s->strstart - (IPos)MAX_DIST(s) : NIL; @@ -1276,7 +1188,7 @@ local uInt longest_match(s, cur_match) /* Do not look for matches beyond the end of the input. This is necessary * to make deflate deterministic. */ - if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead; + if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); @@ -1437,11 +1349,7 @@ local uInt longest_match(s, cur_match) #endif /* FASTEST */ -#ifdef ZLIB_DEBUG - -#define EQUAL 0 -/* result of memcmp for equal strings */ - +#ifdef DEBUG /* =========================================================================== * Check that the match at match_start is indeed a match. */ @@ -1467,7 +1375,7 @@ local void check_match(s, start, match, length) } #else # define check_match(s, start, match, length) -#endif /* ZLIB_DEBUG */ +#endif /* DEBUG */ /* =========================================================================== * Fill the window when the lookahead becomes insufficient. @@ -1482,7 +1390,8 @@ local void check_match(s, start, match, length) local void fill_window(s) deflate_state *s; { - unsigned n; + register unsigned n, m; + register Posf *p; unsigned more; /* Amount of free space at the end of the window. */ uInt wsize = s->w_size; @@ -1509,11 +1418,35 @@ local void fill_window(s) */ if (s->strstart >= wsize+MAX_DIST(s)) { - zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more); + zmemcpy(s->window, s->window+wsize, (unsigned)wsize); s->match_start -= wsize; s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ s->block_start -= (long) wsize; - slide_hash(s); + + /* Slide the hash table (could be avoided with 32 bit values + at the expense of memory usage). We slide even when level == 0 + to keep the hash table consistent if we switch back to level > 0 + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + } while (--n); + + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif more += wsize; } if (s->strm->avail_in == 0) break; @@ -1619,199 +1552,70 @@ local void fill_window(s) if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ } -/* Maximum stored block length in deflate format (not including header). */ -#define MAX_STORED 65535 - -/* Minimum of a and b. */ -#define MIN(a, b) ((a) > (b) ? (b) : (a)) - /* =========================================================================== * Copy without compression as much as possible from the input stream, return * the current block state. - * - * In case deflateParams() is used to later switch to a non-zero compression - * level, s->matches (otherwise unused when storing) keeps track of the number - * of hash table slides to perform. If s->matches is 1, then one hash table - * slide will be done when switching. If s->matches is 2, the maximum value - * allowed here, then the hash table will be cleared, since two or more slides - * is the same as a clear. - * - * deflate_stored() is written to minimize the number of times an input byte is - * copied. It is most efficient with large input and output buffers, which - * maximizes the opportunites to have a single copy from next_in to next_out. + * This function does not insert new strings in the dictionary since + * uncompressible data is probably not useful. This function is used + * only for the level=0 compression option. + * NOTE: this function should be optimized to avoid extra copying from + * window to pending_buf. */ local block_state deflate_stored(s, flush) deflate_state *s; int flush; { - /* Smallest worthy block size when not flushing or finishing. By default - * this is 32K. This can be as small as 507 bytes for memLevel == 1. For - * large input and output buffers, the stored block size will be larger. + /* Stored blocks are limited to 0xffff bytes, pending_buf is limited + * to pending_buf_size, and each stored block has a 5 byte header: */ - unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size); + ulg max_block_size = 0xffff; + ulg max_start; - /* Copy as many min_block or larger stored blocks directly to next_out as - * possible. If flushing, copy the remaining available input to next_out as - * stored blocks, if there is enough space. - */ - unsigned len, left, have, last = 0; - unsigned used = s->strm->avail_in; - do { - /* Set len to the maximum size block that we can copy directly with the - * available input data and output space. Set left to how much of that - * would be copied from what's left in the window. - */ - len = MAX_STORED; /* maximum deflate stored block length */ - have = (s->bi_valid + 42) >> 3; /* number of header bytes */ - if (s->strm->avail_out < have) /* need room for header */ - break; - /* maximum stored block length that will fit in avail_out: */ - have = s->strm->avail_out - have; - left = s->strstart - s->block_start; /* bytes left in window */ - if (len > (ulg)left + s->strm->avail_in) - len = left + s->strm->avail_in; /* limit len to the input */ - if (len > have) - len = have; /* limit len to the output */ - - /* If the stored block would be less than min_block in length, or if - * unable to copy all of the available input when flushing, then try - * copying to the window and the pending buffer instead. Also don't - * write an empty block when flushing -- deflate() does that. - */ - if (len < min_block && ((len == 0 && flush != Z_FINISH) || - flush == Z_NO_FLUSH || - len != left + s->strm->avail_in)) - break; + if (max_block_size > s->pending_buf_size - 5) { + max_block_size = s->pending_buf_size - 5; + } - /* Make a dummy stored block in pending to get the header bytes, - * including any pending bits. This also updates the debugging counts. - */ - last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0; - _tr_stored_block(s, (char *)0, 0L, last); - - /* Replace the lengths in the dummy stored block with len. */ - s->pending_buf[s->pending - 4] = len; - s->pending_buf[s->pending - 3] = len >> 8; - s->pending_buf[s->pending - 2] = ~len; - s->pending_buf[s->pending - 1] = ~len >> 8; - - /* Write the stored block header bytes. */ - flush_pending(s->strm); - -#ifdef ZLIB_DEBUG - /* Update debugging counts for the data about to be copied. */ - s->compressed_len += len << 3; - s->bits_sent += len << 3; -#endif + /* Copy as much as possible from input to output: */ + for (;;) { + /* Fill the window as much as possible: */ + if (s->lookahead <= 1) { - /* Copy uncompressed bytes from the window to next_out. */ - if (left) { - if (left > len) - left = len; - zmemcpy(s->strm->next_out, s->window + s->block_start, left); - s->strm->next_out += left; - s->strm->avail_out -= left; - s->strm->total_out += left; - s->block_start += left; - len -= left; - } + Assert(s->strstart < s->w_size+MAX_DIST(s) || + s->block_start >= (long)s->w_size, "slide too late"); - /* Copy uncompressed bytes directly from next_in to next_out, updating - * the check value. - */ - if (len) { - read_buf(s->strm, s->strm->next_out, len); - s->strm->next_out += len; - s->strm->avail_out -= len; - s->strm->total_out += len; - } - } while (last == 0); + fill_window(s); + if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - /* Update the sliding window with the last s->w_size bytes of the copied - * data, or append all of the copied data to the existing window if less - * than s->w_size bytes were copied. Also update the number of bytes to - * insert in the hash tables, in the event that deflateParams() switches to - * a non-zero compression level. - */ - used -= s->strm->avail_in; /* number of input bytes directly copied */ - if (used) { - /* If any input was used, then no unused input remains in the window, - * therefore s->block_start == s->strstart. - */ - if (used >= s->w_size) { /* supplant the previous history */ - s->matches = 2; /* clear hash */ - zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size); - s->strstart = s->w_size; + if (s->lookahead == 0) break; /* flush the current block */ } - else { - if (s->window_size - s->strstart <= used) { - /* Slide the window down. */ - s->strstart -= s->w_size; - zmemcpy(s->window, s->window + s->w_size, s->strstart); - if (s->matches < 2) - s->matches++; /* add a pending slide_hash() */ - } - zmemcpy(s->window + s->strstart, s->strm->next_in - used, used); - s->strstart += used; + Assert(s->block_start >= 0L, "block gone"); + + s->strstart += s->lookahead; + s->lookahead = 0; + + /* Emit a stored block if pending_buf will be full: */ + max_start = s->block_start + max_block_size; + if (s->strstart == 0 || (ulg)s->strstart >= max_start) { + /* strstart == 0 is possible when wraparound on 16-bit machine */ + s->lookahead = (uInt)(s->strstart - max_start); + s->strstart = (uInt)max_start; + FLUSH_BLOCK(s, 0); + } + /* Flush if we may have to slide, otherwise block_start may become + * negative and the data will be gone: + */ + if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { + FLUSH_BLOCK(s, 0); } - s->block_start = s->strstart; - s->insert += MIN(used, s->w_size - s->insert); } - if (s->high_water < s->strstart) - s->high_water = s->strstart; - - /* If the last block was written to next_out, then done. */ - if (last) + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); return finish_done; - - /* If flushing and all input has been consumed, then done. */ - if (flush != Z_NO_FLUSH && flush != Z_FINISH && - s->strm->avail_in == 0 && (long)s->strstart == s->block_start) - return block_done; - - /* Fill the window with any remaining input. */ - have = s->window_size - s->strstart - 1; - if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) { - /* Slide the window down. */ - s->block_start -= s->w_size; - s->strstart -= s->w_size; - zmemcpy(s->window, s->window + s->w_size, s->strstart); - if (s->matches < 2) - s->matches++; /* add a pending slide_hash() */ - have += s->w_size; /* more space now */ - } - if (have > s->strm->avail_in) - have = s->strm->avail_in; - if (have) { - read_buf(s->strm, s->window + s->strstart, have); - s->strstart += have; } - if (s->high_water < s->strstart) - s->high_water = s->strstart; - - /* There was not enough avail_out to write a complete worthy or flushed - * stored block to next_out. Write a stored block to pending instead, if we - * have enough input for a worthy block, or if flushing and there is enough - * room for the remaining input as a stored block in the pending buffer. - */ - have = (s->bi_valid + 42) >> 3; /* number of header bytes */ - /* maximum stored block length that will fit in pending: */ - have = MIN(s->pending_buf_size - have, MAX_STORED); - min_block = MIN(have, s->w_size); - left = s->strstart - s->block_start; - if (left >= min_block || - ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH && - s->strm->avail_in == 0 && left <= have)) { - len = MIN(left, have); - last = flush == Z_FINISH && s->strm->avail_in == 0 && - len == left ? 1 : 0; - _tr_stored_block(s, (charf *)s->window + s->block_start, len, last); - s->block_start += len; - flush_pending(s->strm); - } - - /* We've done all we can with the available input and output. */ - return last ? finish_started : need_more; + if ((long)s->strstart > s->block_start) + FLUSH_BLOCK(s, 0); + return block_done; } /* =========================================================================== @@ -2088,7 +1892,7 @@ local block_state deflate_rle(s, flush) prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan && scan < strend); - s->match_length = MAX_MATCH - (uInt)(strend - scan); + s->match_length = MAX_MATCH - (int)(strend - scan); if (s->match_length > s->lookahead) s->match_length = s->lookahead; } diff --git a/Modules/zlib/deflate.h b/Modules/zlib/deflate.h index 23ecdd3..ce0299e 100644 --- a/Modules/zlib/deflate.h +++ b/Modules/zlib/deflate.h @@ -1,5 +1,5 @@ /* deflate.h -- internal compression state - * Copyright (C) 1995-2016 Jean-loup Gailly + * Copyright (C) 1995-2012 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -51,16 +51,13 @@ #define Buf_size 16 /* size of bit buffer in bi_buf */ -#define INIT_STATE 42 /* zlib header -> BUSY_STATE */ -#ifdef GZIP -# define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */ -#endif -#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */ -#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */ -#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */ -#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */ -#define BUSY_STATE 113 /* deflate -> FINISH_STATE */ -#define FINISH_STATE 666 /* stream complete */ +#define INIT_STATE 42 +#define EXTRA_STATE 69 +#define NAME_STATE 73 +#define COMMENT_STATE 91 +#define HCRC_STATE 103 +#define BUSY_STATE 113 +#define FINISH_STATE 666 /* Stream status */ @@ -86,7 +83,7 @@ typedef struct static_tree_desc_s static_tree_desc; typedef struct tree_desc_s { ct_data *dyn_tree; /* the dynamic tree */ int max_code; /* largest code with non zero frequency */ - const static_tree_desc *stat_desc; /* the corresponding static tree */ + static_tree_desc *stat_desc; /* the corresponding static tree */ } FAR tree_desc; typedef ush Pos; @@ -103,10 +100,10 @@ typedef struct internal_state { Bytef *pending_buf; /* output still pending */ ulg pending_buf_size; /* size of pending_buf */ Bytef *pending_out; /* next pending byte to output to the stream */ - ulg pending; /* nb of bytes in the pending buffer */ + uInt pending; /* nb of bytes in the pending buffer */ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ gz_headerp gzhead; /* gzip header information to write */ - ulg gzindex; /* where in extra, name, or comment */ + uInt gzindex; /* where in extra, name, or comment */ Byte method; /* can only be DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ @@ -252,7 +249,7 @@ typedef struct internal_state { uInt matches; /* number of string matches in current block */ uInt insert; /* bytes at end of window left to insert */ -#ifdef ZLIB_DEBUG +#ifdef DEBUG ulg compressed_len; /* total bit length of compressed file mod 2^32 */ ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ #endif @@ -278,7 +275,7 @@ typedef struct internal_state { /* Output a byte on the stream. * IN assertion: there is enough room in pending_buf. */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);} +#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) @@ -312,7 +309,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, * used. */ -#ifndef ZLIB_DEBUG +#ifndef DEBUG /* Inline versions of _tr_tally for speed: */ #if defined(GEN_TREES_H) || !defined(STDC) @@ -331,8 +328,8 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, flush = (s->last_lit == s->lit_bufsize-1); \ } # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (uch)(length); \ - ush dist = (ush)(distance); \ + { uch len = (length); \ + ush dist = (distance); \ s->d_buf[s->last_lit] = dist; \ s->l_buf[s->last_lit++] = len; \ dist--; \ diff --git a/Modules/zlib/gzguts.h b/Modules/zlib/gzguts.h index 990a4d2..d87659d 100644 --- a/Modules/zlib/gzguts.h +++ b/Modules/zlib/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -25,10 +25,6 @@ # include # include #endif - -#ifndef _POSIX_SOURCE -# define _POSIX_SOURCE -#endif #include #ifdef _WIN32 @@ -39,10 +35,6 @@ # include #endif -#if defined(_WIN32) || defined(__CYGWIN__) -# define WIDECHAR -#endif - #ifdef WINAPI_FAMILY # define open _open # define read _read @@ -103,19 +95,18 @@ # endif #endif -/* unlike snprintf (which is required in C99), _snprintf does not guarantee - null termination of the result -- however this is only used in gzlib.c where +/* unlike snprintf (which is required in C99, yet still not supported by + Microsoft more than a decade later!), _snprintf does not guarantee null + termination of the result -- however this is only used in gzlib.c where the result is assured to fit in the space provided */ -#if defined(_MSC_VER) && _MSC_VER < 1900 +#ifdef _MSC_VER # define snprintf _snprintf #endif #ifndef local # define local static #endif -/* since "static" is used to mean two completely different things in C, we - define "local" for the non-static meaning of "static", for readability - (compile with -Dlocal if your debugger can't find static symbols) */ +/* compile with -Dlocal if your debugger can't find static symbols */ /* gz* functions always use library allocation functions */ #ifndef STDC @@ -179,7 +170,7 @@ typedef struct { char *path; /* path or fd for error messages */ unsigned size; /* buffer size, zero if not allocated yet */ unsigned want; /* requested buffer size, default is GZBUFSIZE */ - unsigned char *in; /* input buffer (double-sized when writing) */ + unsigned char *in; /* input buffer */ unsigned char *out; /* output buffer (double-sized when reading) */ int direct; /* 0 if processing gzip, 1 if transparent */ /* just for reading */ diff --git a/Modules/zlib/gzlib.c b/Modules/zlib/gzlib.c index 4105e6a..fae202e 100644 --- a/Modules/zlib/gzlib.c +++ b/Modules/zlib/gzlib.c @@ -1,11 +1,11 @@ /* gzlib.c -- zlib functions common to reading and writing gzip files - * Copyright (C) 2004-2017 Mark Adler + * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "gzguts.h" -#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) +#if defined(_WIN32) && !defined(__BORLANDC__) # define LSEEK _lseeki64 #else #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 @@ -94,7 +94,7 @@ local gzFile gz_open(path, fd, mode) const char *mode; { gz_statep state; - z_size_t len; + size_t len; int oflag; #ifdef O_CLOEXEC int cloexec = 0; @@ -188,10 +188,10 @@ local gzFile gz_open(path, fd, mode) } /* save the path name for error messages */ -#ifdef WIDECHAR +#ifdef _WIN32 if (fd == -2) { len = wcstombs(NULL, path, 0); - if (len == (z_size_t)-1) + if (len == (size_t)-1) len = 0; } else @@ -202,7 +202,7 @@ local gzFile gz_open(path, fd, mode) free(state); return NULL; } -#ifdef WIDECHAR +#ifdef _WIN32 if (fd == -2) if (len) wcstombs(state->path, path, len + 1); @@ -211,7 +211,7 @@ local gzFile gz_open(path, fd, mode) else #endif #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - (void)snprintf(state->path, len + 1, "%s", (const char *)path); + snprintf(state->path, len + 1, "%s", (const char *)path); #else strcpy(state->path, path); #endif @@ -239,7 +239,7 @@ local gzFile gz_open(path, fd, mode) /* open the file with the appropriate flags (or just use fd) */ state->fd = fd > -1 ? fd : ( -#ifdef WIDECHAR +#ifdef _WIN32 fd == -2 ? _wopen(path, oflag, 0666) : #endif open((const char *)path, oflag, 0666)); @@ -248,10 +248,8 @@ local gzFile gz_open(path, fd, mode) free(state); return NULL; } - if (state->mode == GZ_APPEND) { - LSEEK(state->fd, 0, SEEK_END); /* so gzoffset() is correct */ + if (state->mode == GZ_APPEND) state->mode = GZ_WRITE; /* simplify later checks */ - } /* save the current position for rewinding (only if reading) */ if (state->mode == GZ_READ) { @@ -293,7 +291,7 @@ gzFile ZEXPORT gzdopen(fd, mode) if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) return NULL; #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - (void)snprintf(path, 7 + 3 * sizeof(int), "", fd); + snprintf(path, 7 + 3 * sizeof(int), "", fd); /* for debugging */ #else sprintf(path, "", fd); /* for debugging */ #endif @@ -303,7 +301,7 @@ gzFile ZEXPORT gzdopen(fd, mode) } /* -- see zlib.h -- */ -#ifdef WIDECHAR +#ifdef _WIN32 gzFile ZEXPORT gzopen_w(path, mode) const wchar_t *path; const char *mode; @@ -331,8 +329,6 @@ int ZEXPORT gzbuffer(file, size) return -1; /* check and set requested size */ - if ((size << 1) < size) - return -1; /* need to be able to double it */ if (size < 2) size = 2; /* need two bytes to check magic header */ state->want = size; @@ -608,13 +604,14 @@ void ZLIB_INTERNAL gz_error(state, err, msg) return; } #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, - "%s%s%s", state->path, ": ", msg); + snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, + "%s%s%s", state->path, ": ", msg); #else strcpy(state->msg, state->path); strcat(state->msg, ": "); strcat(state->msg, msg); #endif + return; } #ifndef INT_MAX diff --git a/Modules/zlib/gzread.c b/Modules/zlib/gzread.c index 956b91e..bf4538e 100644 --- a/Modules/zlib/gzread.c +++ b/Modules/zlib/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -12,7 +12,6 @@ local int gz_look OF((gz_statep)); local int gz_decomp OF((gz_statep)); local int gz_fetch OF((gz_statep)); local int gz_skip OF((gz_statep, z_off64_t)); -local z_size_t gz_read OF((gz_statep, voidp, z_size_t)); /* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from state->fd, and update state->eof, state->err, and state->msg as appropriate. @@ -25,17 +24,13 @@ local int gz_load(state, buf, len, have) unsigned *have; { int ret; - unsigned get, max = ((unsigned)-1 >> 2) + 1; *have = 0; do { - get = len - *have; - if (get > max) - get = max; - ret = read(state->fd, buf + *have, get); + ret = read(state->fd, buf + *have, len - *have); if (ret <= 0) break; - *have += (unsigned)ret; + *have += ret; } while (*have < len); if (ret < 0) { gz_error(state, Z_ERRNO, zstrerror()); @@ -99,8 +94,10 @@ local int gz_look(state) state->in = (unsigned char *)malloc(state->want); state->out = (unsigned char *)malloc(state->want << 1); if (state->in == NULL || state->out == NULL) { - free(state->out); - free(state->in); + if (state->out != NULL) + free(state->out); + if (state->in != NULL) + free(state->in); gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; } @@ -287,17 +284,33 @@ local int gz_skip(state, len) return 0; } -/* Read len bytes into buf from file, or less than len up to the end of the - input. Return the number of bytes read. If zero is returned, either the - end of file was reached, or there was an error. state->err must be - consulted in that case to determine which. */ -local z_size_t gz_read(state, buf, len) - gz_statep state; +/* -- see zlib.h -- */ +int ZEXPORT gzread(file, buf, len) + gzFile file; voidp buf; - z_size_t len; + unsigned len; { - z_size_t got; - unsigned n; + unsigned got, n; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); + return -1; + } /* if len is zero, avoid unnecessary operations */ if (len == 0) @@ -307,38 +320,32 @@ local z_size_t gz_read(state, buf, len) if (state->seek) { state->seek = 0; if (gz_skip(state, state->skip) == -1) - return 0; + return -1; } /* get len bytes to buf, or less than len if at the end */ got = 0; do { - /* set n to the maximum amount of len that fits in an unsigned int */ - n = -1; - if (n > len) - n = len; - /* first just try copying data from the output buffer */ if (state->x.have) { - if (state->x.have < n) - n = state->x.have; + n = state->x.have > len ? len : state->x.have; memcpy(buf, state->x.next, n); state->x.next += n; state->x.have -= n; } /* output buffer empty -- return if we're at the end of the input */ - else if (state->eof && state->strm.avail_in == 0) { + else if (state->eof && strm->avail_in == 0) { state->past = 1; /* tried to read past end */ break; } /* need output data -- for small len or new stream load up our output buffer */ - else if (state->how == LOOK || n < (state->size << 1)) { + else if (state->how == LOOK || len < (state->size << 1)) { /* get more output, looking for header if required */ if (gz_fetch(state) == -1) - return 0; + return -1; continue; /* no progress yet -- go back to copy above */ /* the copy above assures that we will leave with space in the output buffer, allowing at least one gzungetc() to succeed */ @@ -346,16 +353,16 @@ local z_size_t gz_read(state, buf, len) /* large len -- read directly into user buffer */ else if (state->how == COPY) { /* read directly */ - if (gz_load(state, (unsigned char *)buf, n, &n) == -1) - return 0; + if (gz_load(state, (unsigned char *)buf, len, &n) == -1) + return -1; } /* large len -- decompress directly into user buffer */ else { /* state->how == GZIP */ - state->strm.avail_out = n; - state->strm.next_out = (unsigned char *)buf; + strm->avail_out = len; + strm->next_out = (unsigned char *)buf; if (gz_decomp(state) == -1) - return 0; + return -1; n = state->x.have; state->x.have = 0; } @@ -367,75 +374,8 @@ local z_size_t gz_read(state, buf, len) state->x.pos += n; } while (len); - /* return number of bytes read into user buffer */ - return got; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzread(file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're reading and that there's no (serious) error */ - if (state->mode != GZ_READ || - (state->err != Z_OK && state->err != Z_BUF_ERROR)) - return -1; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids a flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_STREAM_ERROR, "request does not fit in an int"); - return -1; - } - - /* read len or fewer bytes to buf */ - len = gz_read(state, buf, len); - - /* check for an error */ - if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR) - return -1; - - /* return the number of bytes read (this is assured to fit in an int) */ - return (int)len; -} - -/* -- see zlib.h -- */ -z_size_t ZEXPORT gzfread(buf, size, nitems, file) - voidp buf; - z_size_t size; - z_size_t nitems; - gzFile file; -{ - z_size_t len; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - - /* check that we're reading and that there's no (serious) error */ - if (state->mode != GZ_READ || - (state->err != Z_OK && state->err != Z_BUF_ERROR)) - return 0; - - /* compute bytes to read -- error on overflow */ - len = nitems * size; - if (size && len / size != nitems) { - gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t"); - return 0; - } - - /* read len or fewer bytes to buf, return the number of full items read */ - return len ? gz_read(state, buf, len) / size : 0; + /* return number of bytes read into user buffer (will fit in int) */ + return (int)got; } /* -- see zlib.h -- */ @@ -468,8 +408,8 @@ int ZEXPORT gzgetc(file) return *(state->x.next)++; } - /* nothing there -- try gz_read() */ - ret = gz_read(state, buf, 1); + /* nothing there -- try gzread() */ + ret = gzread(file, buf, 1); return ret < 1 ? -1 : buf[0]; } @@ -511,7 +451,7 @@ int ZEXPORT gzungetc(c, file) if (state->x.have == 0) { state->x.have = 1; state->x.next = state->out + (state->size << 1) - 1; - state->x.next[0] = (unsigned char)c; + state->x.next[0] = c; state->x.pos--; state->past = 0; return c; @@ -533,7 +473,7 @@ int ZEXPORT gzungetc(c, file) } state->x.have++; state->x.next--; - state->x.next[0] = (unsigned char)c; + state->x.next[0] = c; state->x.pos--; state->past = 0; return c; diff --git a/Modules/zlib/gzwrite.c b/Modules/zlib/gzwrite.c index c7b5651..aa767fb 100644 --- a/Modules/zlib/gzwrite.c +++ b/Modules/zlib/gzwrite.c @@ -1,5 +1,5 @@ /* gzwrite.c -- zlib functions for writing gzip files - * Copyright (C) 2004-2017 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,19 +9,17 @@ local int gz_init OF((gz_statep)); local int gz_comp OF((gz_statep, int)); local int gz_zero OF((gz_statep, z_off64_t)); -local z_size_t gz_write OF((gz_statep, voidpc, z_size_t)); /* Initialize state for writing a gzip file. Mark initialization by setting - state->size to non-zero. Return -1 on a memory allocation failure, or 0 on - success. */ + state->size to non-zero. Return -1 on failure or 0 on success. */ local int gz_init(state) gz_statep state; { int ret; z_streamp strm = &(state->strm); - /* allocate input buffer (double size for gzprintf) */ - state->in = (unsigned char *)malloc(state->want << 1); + /* allocate input buffer */ + state->in = (unsigned char *)malloc(state->want); if (state->in == NULL) { gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; @@ -49,7 +47,6 @@ local int gz_init(state) gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; } - strm->next_in = NULL; } /* mark state as initialized */ @@ -65,17 +62,17 @@ local int gz_init(state) } /* Compress whatever is at avail_in and next_in and write to the output file. - Return -1 if there is an error writing to the output file or if gz_init() - fails to allocate memory, otherwise 0. flush is assumed to be a valid - deflate() flush value. If flush is Z_FINISH, then the deflate() state is - reset to start a new gzip stream. If gz->direct is true, then simply write - to the output file without compressing, and ignore flush. */ + Return -1 if there is an error writing to the output file, otherwise 0. + flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, + then the deflate() state is reset to start a new gzip stream. If gz->direct + is true, then simply write to the output file without compressing, and + ignore flush. */ local int gz_comp(state, flush) gz_statep state; int flush; { - int ret, writ; - unsigned have, put, max = ((unsigned)-1 >> 2) + 1; + int ret, got; + unsigned have; z_streamp strm = &(state->strm); /* allocate memory if this is the first time through */ @@ -84,16 +81,12 @@ local int gz_comp(state, flush) /* write directly if requested */ if (state->direct) { - while (strm->avail_in) { - put = strm->avail_in > max ? max : strm->avail_in; - writ = write(state->fd, strm->next_in, put); - if (writ < 0) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; - } - strm->avail_in -= (unsigned)writ; - strm->next_in += writ; + got = write(state->fd, strm->next_in, strm->avail_in); + if (got < 0 || (unsigned)got != strm->avail_in) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; } + strm->avail_in = 0; return 0; } @@ -104,21 +97,17 @@ local int gz_comp(state, flush) doing Z_FINISH then don't write until we get to Z_STREAM_END */ if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && (flush != Z_FINISH || ret == Z_STREAM_END))) { - while (strm->next_out > state->x.next) { - put = strm->next_out - state->x.next > (int)max ? max : - (unsigned)(strm->next_out - state->x.next); - writ = write(state->fd, state->x.next, put); - if (writ < 0) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; - } - state->x.next += writ; + have = (unsigned)(strm->next_out - state->x.next); + if (have && ((got = write(state->fd, state->x.next, have)) < 0 || + (unsigned)got != have)) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; } if (strm->avail_out == 0) { strm->avail_out = state->size; strm->next_out = state->out; - state->x.next = state->out; } + state->x.next = strm->next_out; } /* compress */ @@ -140,8 +129,7 @@ local int gz_comp(state, flush) return 0; } -/* Compress len zeros to output. Return -1 on a write error or memory - allocation failure by gz_comp(), or 0 on success. */ +/* Compress len zeros to output. Return -1 on error, 0 on success. */ local int gz_zero(state, len) gz_statep state; z_off64_t len; @@ -173,14 +161,32 @@ local int gz_zero(state, len) return 0; } -/* Write len bytes from buf to file. Return the number of bytes written. If - the returned value is less than len, then there was an error. */ -local z_size_t gz_write(state, buf, len) - gz_statep state; +/* -- see zlib.h -- */ +int ZEXPORT gzwrite(file, buf, len) + gzFile file; voidpc buf; - z_size_t len; + unsigned len; { - z_size_t put = len; + unsigned put = len; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); + return 0; + } /* if len is zero, avoid unnecessary operations */ if (len == 0) @@ -203,15 +209,14 @@ local z_size_t gz_write(state, buf, len) do { unsigned have, copy; - if (state->strm.avail_in == 0) - state->strm.next_in = state->in; - have = (unsigned)((state->strm.next_in + state->strm.avail_in) - - state->in); + if (strm->avail_in == 0) + strm->next_in = state->in; + have = (unsigned)((strm->next_in + strm->avail_in) - state->in); copy = state->size - have; if (copy > len) copy = len; memcpy(state->in + have, buf, copy); - state->strm.avail_in += copy; + strm->avail_in += copy; state->x.pos += copy; buf = (const char *)buf + copy; len -= copy; @@ -221,83 +226,19 @@ local z_size_t gz_write(state, buf, len) } else { /* consume whatever's left in the input buffer */ - if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) return 0; /* directly compress user buffer to file */ - state->strm.next_in = (z_const Bytef *)buf; - do { - unsigned n = (unsigned)-1; - if (n > len) - n = len; - state->strm.avail_in = n; - state->x.pos += n; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - len -= n; - } while (len); - } - - /* input was all buffered or compressed */ - return put; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzwrite(file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids a flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); - return 0; - } - - /* write len bytes from buf (the return value will fit in an int) */ - return (int)gz_write(state, buf, len); -} - -/* -- see zlib.h -- */ -z_size_t ZEXPORT gzfwrite(buf, size, nitems, file) - voidpc buf; - z_size_t size; - z_size_t nitems; - gzFile file; -{ - z_size_t len; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* compute bytes to read -- error on overflow */ - len = nitems * size; - if (size && len / size != nitems) { - gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t"); - return 0; + strm->avail_in = len; + strm->next_in = (z_const Bytef *)buf; + state->x.pos += len; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return 0; } - /* write len bytes to buf, return the number of full items written */ - return len ? gz_write(state, buf, len) / size : 0; + /* input was all buffered or compressed (put will fit in int) */ + return (int)put; } /* -- see zlib.h -- */ @@ -334,7 +275,7 @@ int ZEXPORT gzputc(file, c) strm->next_in = state->in; have = (unsigned)((strm->next_in + strm->avail_in) - state->in); if (have < state->size) { - state->in[have] = (unsigned char)c; + state->in[have] = c; strm->avail_in++; state->x.pos++; return c & 0xff; @@ -342,8 +283,8 @@ int ZEXPORT gzputc(file, c) } /* no room in buffer or not initialized, use gz_write() */ - buf[0] = (unsigned char)c; - if (gz_write(state, buf, 1) != 1) + buf[0] = c; + if (gzwrite(file, buf, 1) != 1) return -1; return c & 0xff; } @@ -354,21 +295,11 @@ int ZEXPORT gzputs(file, str) const char *str; { int ret; - z_size_t len; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return -1; + unsigned len; /* write string */ - len = strlen(str); - ret = gz_write(state, str, len); + len = (unsigned)strlen(str); + ret = gzwrite(file, str, len); return ret == 0 && len != 0 ? -1 : ret; } @@ -378,73 +309,63 @@ int ZEXPORT gzputs(file, str) /* -- see zlib.h -- */ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) { - int len; - unsigned left; - char *next; + int size, len; gz_statep state; z_streamp strm; /* get internal structure */ if (file == NULL) - return Z_STREAM_ERROR; + return -1; state = (gz_statep)file; strm = &(state->strm); /* check that we're writing and that there's no error */ if (state->mode != GZ_WRITE || state->err != Z_OK) - return Z_STREAM_ERROR; + return 0; /* make sure we have some buffer space */ if (state->size == 0 && gz_init(state) == -1) - return state->err; + return 0; /* check for seek request */ if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return state->err; + return 0; } - /* do the printf() into the input buffer, put length in len -- the input - buffer is double-sized just for this function, so there is guaranteed to - be state->size bytes available after the current contents */ - if (strm->avail_in == 0) - strm->next_in = state->in; - next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in); - next[state->size - 1] = 0; + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; #ifdef NO_vsnprintf # ifdef HAS_vsprintf_void - (void)vsprintf(next, format, va); - for (len = 0; len < state->size; len++) - if (next[len] == 0) break; + (void)vsprintf((char *)(state->in), format, va); + for (len = 0; len < size; len++) + if (state->in[len] == 0) break; # else - len = vsprintf(next, format, va); + len = vsprintf((char *)(state->in), format, va); # endif #else # ifdef HAS_vsnprintf_void - (void)vsnprintf(next, state->size, format, va); - len = strlen(next); + (void)vsnprintf((char *)(state->in), size, format, va); + len = strlen((char *)(state->in)); # else - len = vsnprintf(next, state->size, format, va); + len = vsnprintf((char *)(state->in), size, format, va); # endif #endif /* check that printf() results fit in buffer */ - if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0) + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) return 0; - /* update buffer and position, compress first half if past that */ - strm->avail_in += (unsigned)len; + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; state->x.pos += len; - if (strm->avail_in >= state->size) { - left = strm->avail_in - state->size; - strm->avail_in = state->size; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return state->err; - memcpy(state->in, state->in + state->size, left); - strm->next_in = state->in; - strm->avail_in = left; - } return len; } @@ -469,82 +390,73 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; { - unsigned len, left; - char *next; + int size, len; gz_statep state; z_streamp strm; /* get internal structure */ if (file == NULL) - return Z_STREAM_ERROR; + return -1; state = (gz_statep)file; strm = &(state->strm); /* check that can really pass pointer in ints */ if (sizeof(int) != sizeof(void *)) - return Z_STREAM_ERROR; + return 0; /* check that we're writing and that there's no error */ if (state->mode != GZ_WRITE || state->err != Z_OK) - return Z_STREAM_ERROR; + return 0; /* make sure we have some buffer space */ if (state->size == 0 && gz_init(state) == -1) - return state->error; + return 0; /* check for seek request */ if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return state->error; + return 0; } - /* do the printf() into the input buffer, put length in len -- the input - buffer is double-sized just for this function, so there is guaranteed to - be state->size bytes available after the current contents */ - if (strm->avail_in == 0) - strm->next_in = state->in; - next = (char *)(strm->next_in + strm->avail_in); - next[state->size - 1] = 0; + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; #ifdef NO_snprintf # ifdef HAS_sprintf_void - sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, - a13, a14, a15, a16, a17, a18, a19, a20); + sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); for (len = 0; len < size; len++) - if (next[len] == 0) - break; + if (state->in[len] == 0) break; # else - len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, - a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); # endif #else # ifdef HAS_snprintf_void - snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - len = strlen(next); + snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen((char *)(state->in)); # else - len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, + a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, + a19, a20); # endif #endif /* check that printf() results fit in buffer */ - if (len == 0 || len >= state->size || next[state->size - 1] != 0) + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) return 0; - /* update buffer and position, compress first half if past that */ - strm->avail_in += len; + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; state->x.pos += len; - if (strm->avail_in >= state->size) { - left = strm->avail_in - state->size; - strm->avail_in = state->size; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return state->err; - memcpy(state->in, state->in + state->size, left); - strm->next_in = state->in; - strm->avail_in = left; - } - return (int)len; + return len; } #endif @@ -558,7 +470,7 @@ int ZEXPORT gzflush(file, flush) /* get internal structure */ if (file == NULL) - return Z_STREAM_ERROR; + return -1; state = (gz_statep)file; /* check that we're writing and that there's no error */ @@ -573,11 +485,11 @@ int ZEXPORT gzflush(file, flush) if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return state->err; + return -1; } /* compress remaining data with requested flush */ - (void)gz_comp(state, flush); + gz_comp(state, flush); return state->err; } @@ -608,13 +520,13 @@ int ZEXPORT gzsetparams(file, level, strategy) if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return state->err; + return -1; } /* change compression parameters for subsequent input */ if (state->size) { /* flush previous input with previous parameters before changing */ - if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1) + if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) return state->err; deflateParams(strm, level, strategy); } diff --git a/Modules/zlib/infback.c b/Modules/zlib/infback.c index 59679ec..f3833c2 100644 --- a/Modules/zlib/infback.c +++ b/Modules/zlib/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2016 Mark Adler + * Copyright (C) 1995-2011 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -61,7 +61,7 @@ int stream_size; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; state->dmax = 32768U; - state->wbits = (uInt)windowBits; + state->wbits = windowBits; state->wsize = 1U << windowBits; state->window = window; state->wnext = 0; diff --git a/Modules/zlib/inffast.c b/Modules/zlib/inffast.c index 0dbd1db..bda59ce 100644 --- a/Modules/zlib/inffast.c +++ b/Modules/zlib/inffast.c @@ -1,5 +1,5 @@ /* inffast.c -- fast decoding - * Copyright (C) 1995-2017 Mark Adler + * Copyright (C) 1995-2008, 2010, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,9 +8,26 @@ #include "inflate.h" #include "inffast.h" -#ifdef ASMINF -# pragma message("Assembler code may have bugs -- use at your own risk") +#ifndef ASMINF + +/* Allow machine dependent optimization for post-increment or pre-increment. + Based on testing to date, + Pre-increment preferred for: + - PowerPC G3 (Adler) + - MIPS R5000 (Randers-Pehrson) + Post-increment preferred for: + - none + No measurable difference: + - Pentium III (Anderson) + - M68060 (Nikl) + */ +#ifdef POSTINC +# define OFF 0 +# define PUP(a) *(a)++ #else +# define OFF 1 +# define PUP(a) *++(a) +#endif /* Decode literal, length, and distance codes and write out the resulting @@ -79,9 +96,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ /* copy state to local variables */ state = (struct inflate_state FAR *)strm->state; - in = strm->next_in; + in = strm->next_in - OFF; last = in + (strm->avail_in - 5); - out = strm->next_out; + out = strm->next_out - OFF; beg = out - (start - strm->avail_out); end = out + (strm->avail_out - 257); #ifdef INFLATE_STRICT @@ -102,9 +119,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ input data or output space */ do { if (bits < 15) { - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; } here = lcode[hold & lmask]; @@ -117,14 +134,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : "inflate: literal 0x%02x\n", here.val)); - *out++ = (unsigned char)(here.val); + PUP(out) = (unsigned char)(here.val); } else if (op & 16) { /* length base */ len = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; } len += (unsigned)hold & ((1U << op) - 1); @@ -133,9 +150,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } Tracevv((stderr, "inflate: length %u\n", len)); if (bits < 15) { - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; } here = dcode[hold & dmask]; @@ -148,10 +165,10 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ dist = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (bits < op) { - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; if (bits < op) { - hold += (unsigned long)(*in++) << bits; + hold += (unsigned long)(PUP(in)) << bits; bits += 8; } } @@ -179,30 +196,30 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR if (len <= op - whave) { do { - *out++ = 0; + PUP(out) = 0; } while (--len); continue; } len -= op - whave; do { - *out++ = 0; + PUP(out) = 0; } while (--op > whave); if (op == 0) { from = out - dist; do { - *out++ = *from++; + PUP(out) = PUP(from); } while (--len); continue; } #endif } - from = window; + from = window - OFF; if (wnext == 0) { /* very common case */ from += wsize - op; if (op < len) { /* some from window */ len -= op; do { - *out++ = *from++; + PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } @@ -213,14 +230,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from end of window */ len -= op; do { - *out++ = *from++; + PUP(out) = PUP(from); } while (--op); - from = window; + from = window - OFF; if (wnext < len) { /* some from start of window */ op = wnext; len -= op; do { - *out++ = *from++; + PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } @@ -231,35 +248,35 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from window */ len -= op; do { - *out++ = *from++; + PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } } while (len > 2) { - *out++ = *from++; - *out++ = *from++; - *out++ = *from++; + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); len -= 3; } if (len) { - *out++ = *from++; + PUP(out) = PUP(from); if (len > 1) - *out++ = *from++; + PUP(out) = PUP(from); } } else { from = out - dist; /* copy direct from output */ do { /* minimum length is three */ - *out++ = *from++; - *out++ = *from++; - *out++ = *from++; + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); len -= 3; } while (len > 2); if (len) { - *out++ = *from++; + PUP(out) = PUP(from); if (len > 1) - *out++ = *from++; + PUP(out) = PUP(from); } } } @@ -296,8 +313,8 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold &= (1U << bits) - 1; /* update state and return */ - strm->next_in = in; - strm->next_out = out; + strm->next_in = in + OFF; + strm->next_out = out + OFF; strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); strm->avail_out = (unsigned)(out < end ? 257 + (end - out) : 257 - (out - end)); diff --git a/Modules/zlib/inflate.c b/Modules/zlib/inflate.c index ac333e8..870f89b 100644 --- a/Modules/zlib/inflate.c +++ b/Modules/zlib/inflate.c @@ -1,5 +1,5 @@ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2016 Mark Adler + * Copyright (C) 1995-2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -92,7 +92,6 @@ #endif /* function prototypes */ -local int inflateStateCheck OF((z_streamp strm)); local void fixedtables OF((struct inflate_state FAR *state)); local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, unsigned copy)); @@ -102,26 +101,12 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, unsigned len)); -local int inflateStateCheck(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - if (strm == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) - return 1; - state = (struct inflate_state FAR *)strm->state; - if (state == Z_NULL || state->strm != strm || - state->mode < HEAD || state->mode > SYNC) - return 1; - return 0; -} - int ZEXPORT inflateResetKeep(strm) z_streamp strm; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; strm->total_in = strm->total_out = state->total = 0; strm->msg = Z_NULL; @@ -146,7 +131,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; state->wsize = 0; state->whave = 0; @@ -162,7 +147,7 @@ int windowBits; struct inflate_state FAR *state; /* get the state */ - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* extract wrap request from windowBits parameter */ @@ -171,7 +156,7 @@ int windowBits; windowBits = -windowBits; } else { - wrap = (windowBits >> 4) + 5; + wrap = (windowBits >> 4) + 1; #ifdef GUNZIP if (windowBits < 48) windowBits &= 15; @@ -225,9 +210,7 @@ int stream_size; if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; - state->strm = strm; state->window = Z_NULL; - state->mode = HEAD; /* to pass state test in inflateReset2() */ ret = inflateReset2(strm, windowBits); if (ret != Z_OK) { ZFREE(strm, state); @@ -251,17 +234,17 @@ int value; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (bits < 0) { state->hold = 0; state->bits = 0; return Z_OK; } - if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR; + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; value &= (1L << bits) - 1; - state->hold += (unsigned)value << state->bits; - state->bits += (uInt)bits; + state->hold += value << state->bits; + state->bits += bits; return Z_OK; } @@ -642,7 +625,7 @@ int flush; static const unsigned short order[19] = /* permutation of code lengths */ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - if (inflateStateCheck(strm) || strm->next_out == Z_NULL || + if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || (strm->next_in == Z_NULL && strm->avail_in != 0)) return Z_STREAM_ERROR; @@ -662,8 +645,6 @@ int flush; NEEDBITS(16); #ifdef GUNZIP if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ - if (state->wbits == 0) - state->wbits = 15; state->check = crc32(0L, Z_NULL, 0); CRC2(state->check, hold); INITBITS(); @@ -691,7 +672,7 @@ int flush; len = BITS(4) + 8; if (state->wbits == 0) state->wbits = len; - if (len > 15 || len > state->wbits) { + else if (len > state->wbits) { strm->msg = (char *)"invalid window size"; state->mode = BAD; break; @@ -718,16 +699,14 @@ int flush; } if (state->head != Z_NULL) state->head->text = (int)((hold >> 8) & 1); - if ((state->flags & 0x0200) && (state->wrap & 4)) - CRC2(state->check, hold); + if (state->flags & 0x0200) CRC2(state->check, hold); INITBITS(); state->mode = TIME; case TIME: NEEDBITS(32); if (state->head != Z_NULL) state->head->time = hold; - if ((state->flags & 0x0200) && (state->wrap & 4)) - CRC4(state->check, hold); + if (state->flags & 0x0200) CRC4(state->check, hold); INITBITS(); state->mode = OS; case OS: @@ -736,8 +715,7 @@ int flush; state->head->xflags = (int)(hold & 0xff); state->head->os = (int)(hold >> 8); } - if ((state->flags & 0x0200) && (state->wrap & 4)) - CRC2(state->check, hold); + if (state->flags & 0x0200) CRC2(state->check, hold); INITBITS(); state->mode = EXLEN; case EXLEN: @@ -746,8 +724,7 @@ int flush; state->length = (unsigned)(hold); if (state->head != Z_NULL) state->head->extra_len = (unsigned)hold; - if ((state->flags & 0x0200) && (state->wrap & 4)) - CRC2(state->check, hold); + if (state->flags & 0x0200) CRC2(state->check, hold); INITBITS(); } else if (state->head != Z_NULL) @@ -765,7 +742,7 @@ int flush; len + copy > state->head->extra_max ? state->head->extra_max - len : copy); } - if ((state->flags & 0x0200) && (state->wrap & 4)) + if (state->flags & 0x0200) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -784,9 +761,9 @@ int flush; if (state->head != Z_NULL && state->head->name != Z_NULL && state->length < state->head->name_max) - state->head->name[state->length++] = (Bytef)len; + state->head->name[state->length++] = len; } while (len && copy < have); - if ((state->flags & 0x0200) && (state->wrap & 4)) + if (state->flags & 0x0200) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -805,9 +782,9 @@ int flush; if (state->head != Z_NULL && state->head->comment != Z_NULL && state->length < state->head->comm_max) - state->head->comment[state->length++] = (Bytef)len; + state->head->comment[state->length++] = len; } while (len && copy < have); - if ((state->flags & 0x0200) && (state->wrap & 4)) + if (state->flags & 0x0200) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -819,7 +796,7 @@ int flush; case HCRC: if (state->flags & 0x0200) { NEEDBITS(16); - if ((state->wrap & 4) && hold != (state->check & 0xffff)) { + if (hold != (state->check & 0xffff)) { strm->msg = (char *)"header crc mismatch"; state->mode = BAD; break; @@ -1200,11 +1177,11 @@ int flush; out -= left; strm->total_out += out; state->total += out; - if ((state->wrap & 4) && out) + if (out) strm->adler = state->check = UPDATE(state->check, put - out, out); out = left; - if ((state->wrap & 4) && ( + if (( #ifdef GUNZIP state->flags ? hold : #endif @@ -1263,10 +1240,10 @@ int flush; strm->total_in += in; strm->total_out += out; state->total += out; - if ((state->wrap & 4) && out) + if (state->wrap && out) strm->adler = state->check = UPDATE(state->check, strm->next_out - out, out); - strm->data_type = (int)state->bits + (state->last ? 64 : 0) + + strm->data_type = state->bits + (state->last ? 64 : 0) + (state->mode == TYPE ? 128 : 0) + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) @@ -1278,7 +1255,7 @@ int ZEXPORT inflateEnd(strm) z_streamp strm; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->window != Z_NULL) ZFREE(strm, state->window); @@ -1296,7 +1273,7 @@ uInt *dictLength; struct inflate_state FAR *state; /* check state */ - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* copy dictionary */ @@ -1321,7 +1298,7 @@ uInt dictLength; int ret; /* check state */ - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->wrap != 0 && state->mode != DICT) return Z_STREAM_ERROR; @@ -1353,7 +1330,7 @@ gz_headerp head; struct inflate_state FAR *state; /* check state */ - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; @@ -1406,7 +1383,7 @@ z_streamp strm; struct inflate_state FAR *state; /* check parameters */ - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; @@ -1453,7 +1430,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; return state->mode == STORED && state->bits == 0; } @@ -1468,7 +1445,8 @@ z_streamp source; unsigned wsize; /* check input */ - if (inflateStateCheck(source) || dest == Z_NULL) + if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || + source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)source->state; @@ -1489,7 +1467,6 @@ z_streamp source; /* copy state */ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); - copy->strm = dest; if (state->lencode >= state->codes && state->lencode <= state->codes + ENOUGH - 1) { copy->lencode = copy->codes + (state->lencode - state->codes); @@ -1511,51 +1488,25 @@ int subvert; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR state->sane = !subvert; +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR return Z_OK; #else - (void)subvert; state->sane = 1; return Z_DATA_ERROR; #endif } -int ZEXPORT inflateValidate(strm, check) -z_streamp strm; -int check; -{ - struct inflate_state FAR *state; - - if (inflateStateCheck(strm)) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (check) - state->wrap |= 4; - else - state->wrap &= ~4; - return Z_OK; -} - long ZEXPORT inflateMark(strm) z_streamp strm; { struct inflate_state FAR *state; - if (inflateStateCheck(strm)) - return -(1L << 16); + if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; state = (struct inflate_state FAR *)strm->state; - return (long)(((unsigned long)((long)state->back)) << 16) + + return ((long)(state->back) << 16) + (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } - -unsigned long ZEXPORT inflateCodesUsed(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - if (inflateStateCheck(strm)) return (unsigned long)-1; - state = (struct inflate_state FAR *)strm->state; - return (unsigned long)(state->next - state->codes); -} diff --git a/Modules/zlib/inflate.h b/Modules/zlib/inflate.h index a46cce6..95f4986 100644 --- a/Modules/zlib/inflate.h +++ b/Modules/zlib/inflate.h @@ -1,5 +1,5 @@ /* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2016 Mark Adler + * Copyright (C) 1995-2009 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -18,7 +18,7 @@ /* Possible inflate modes between inflate() calls */ typedef enum { - HEAD = 16180, /* i: waiting for magic header */ + HEAD, /* i: waiting for magic header */ FLAGS, /* i: waiting for method and flags (gzip) */ TIME, /* i: waiting for modification time (gzip) */ OS, /* i: waiting for extra flags and operating system (gzip) */ @@ -77,14 +77,11 @@ typedef enum { CHECK -> LENGTH -> DONE */ -/* State maintained between inflate() calls -- approximately 7K bytes, not - including the allocated sliding window, which is up to 32K bytes. */ +/* state maintained between inflate() calls. Approximately 10K bytes. */ struct inflate_state { - z_streamp strm; /* pointer back to this zlib stream */ inflate_mode mode; /* current inflate mode */ int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip, - bit 2 true to validate check value */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ int havedict; /* true if dictionary provided */ int flags; /* gzip header method and flags (0 if zlib) */ unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ diff --git a/Modules/zlib/inftrees.c b/Modules/zlib/inftrees.c index 2ea08fc..44d89cf 100644 --- a/Modules/zlib/inftrees.c +++ b/Modules/zlib/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2017 Mark Adler + * Copyright (C) 1995-2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; + " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -54,7 +54,7 @@ unsigned short FAR *work; code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ const unsigned short FAR *extra; /* extra bits table to use */ - unsigned match; /* use base and extra for symbol >= match */ + int end; /* use base and extra for symbol > end */ unsigned short count[MAXBITS+1]; /* number of codes of each length */ unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ static const unsigned short lbase[31] = { /* Length codes 257..285 base */ @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -181,17 +181,19 @@ unsigned short FAR *work; switch (type) { case CODES: base = extra = work; /* dummy value--not used */ - match = 20; + end = 19; break; case LENS: base = lbase; + base -= 257; extra = lext; - match = 257; + extra -= 257; + end = 256; break; - default: /* DISTS */ + default: /* DISTS */ base = dbase; extra = dext; - match = 0; + end = -1; } /* initialize state for loop */ @@ -214,13 +216,13 @@ unsigned short FAR *work; for (;;) { /* create table entry */ here.bits = (unsigned char)(len - drop); - if (work[sym] + 1U < match) { + if ((int)(work[sym]) < end) { here.op = (unsigned char)0; here.val = work[sym]; } - else if (work[sym] >= match) { - here.op = (unsigned char)(extra[work[sym] - match]); - here.val = base[work[sym] - match]; + else if ((int)(work[sym]) > end) { + here.op = (unsigned char)(extra[work[sym]]); + here.val = base[work[sym]]; } else { here.op = (unsigned char)(32 + 64); /* end of block */ diff --git a/Modules/zlib/trees.c b/Modules/zlib/trees.c index 50cf4b4..1fd7759 100644 --- a/Modules/zlib/trees.c +++ b/Modules/zlib/trees.c @@ -1,5 +1,5 @@ /* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2017 Jean-loup Gailly + * Copyright (C) 1995-2012 Jean-loup Gailly * detect_data_type() function provided freely by Cosmin Truta, 2006 * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -36,7 +36,7 @@ #include "deflate.h" -#ifdef ZLIB_DEBUG +#ifdef DEBUG # include #endif @@ -122,13 +122,13 @@ struct static_tree_desc_s { int max_length; /* max bit length for the codes */ }; -local const static_tree_desc static_l_desc = +local static_tree_desc static_l_desc = {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; -local const static_tree_desc static_d_desc = +local static_tree_desc static_d_desc = {static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; -local const static_tree_desc static_bl_desc = +local static_tree_desc static_bl_desc = {(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; /* =========================================================================== @@ -152,16 +152,18 @@ local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); local void bi_flush OF((deflate_state *s)); +local void copy_block OF((deflate_state *s, charf *buf, unsigned len, + int header)); #ifdef GEN_TREES_H local void gen_trees_header OF((void)); #endif -#ifndef ZLIB_DEBUG +#ifndef DEBUG # define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) /* Send a code of the given tree. c and tree must not have side effects */ -#else /* !ZLIB_DEBUG */ +#else /* DEBUG */ # define send_code(s, c, tree) \ { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ send_bits(s, tree[c].Code, tree[c].Len); } @@ -180,7 +182,7 @@ local void gen_trees_header OF((void)); * Send a value on a given number of bits. * IN assertion: length <= 16 and value fits in length bits. */ -#ifdef ZLIB_DEBUG +#ifdef DEBUG local void send_bits OF((deflate_state *s, int value, int length)); local void send_bits(s, value, length) @@ -206,12 +208,12 @@ local void send_bits(s, value, length) s->bi_valid += length; } } -#else /* !ZLIB_DEBUG */ +#else /* !DEBUG */ #define send_bits(s, value, length) \ { int len = length;\ if (s->bi_valid > (int)Buf_size - len) {\ - int val = (int)value;\ + int val = value;\ s->bi_buf |= (ush)val << s->bi_valid;\ put_short(s, s->bi_buf);\ s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ @@ -221,7 +223,7 @@ local void send_bits(s, value, length) s->bi_valid += len;\ }\ } -#endif /* ZLIB_DEBUG */ +#endif /* DEBUG */ /* the arguments must not have side effects */ @@ -315,7 +317,7 @@ local void tr_static_init() * Genererate the file trees.h describing the static trees. */ #ifdef GEN_TREES_H -# ifndef ZLIB_DEBUG +# ifndef DEBUG # include # endif @@ -392,7 +394,7 @@ void ZLIB_INTERNAL _tr_init(s) s->bi_buf = 0; s->bi_valid = 0; -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len = 0L; s->bits_sent = 0L; #endif @@ -520,12 +522,12 @@ local void gen_bitlen(s, desc) xbits = 0; if (n >= base) xbits = extra[n-base]; f = tree[n].Freq; - s->opt_len += (ulg)f * (unsigned)(bits + xbits); - if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits); + s->opt_len += (ulg)f * (bits + xbits); + if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); } if (overflow == 0) return; - Tracev((stderr,"\nbit length overflow\n")); + Trace((stderr,"\nbit length overflow\n")); /* This happens for example on obj2 and pic of the Calgary corpus */ /* Find the first bit length which could increase: */ @@ -552,8 +554,9 @@ local void gen_bitlen(s, desc) m = s->heap[--h]; if (m > max_code) continue; if ((unsigned) tree[m].Len != (unsigned) bits) { - Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq; + Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((long)bits - (long)tree[m].Len) + *(long)tree[m].Freq; tree[m].Len = (ush)bits; } n--; @@ -575,7 +578,7 @@ local void gen_codes (tree, max_code, bl_count) ushf *bl_count; /* number of codes at each bit length */ { ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - unsigned code = 0; /* running code value */ + ush code = 0; /* running code value */ int bits; /* bit index */ int n; /* code index */ @@ -583,8 +586,7 @@ local void gen_codes (tree, max_code, bl_count) * without bit reversal. */ for (bits = 1; bits <= MAX_BITS; bits++) { - code = (code + bl_count[bits-1]) << 1; - next_code[bits] = (ush)code; + next_code[bits] = code = (code + bl_count[bits-1]) << 1; } /* Check that the bit counts in bl_count are consistent. The last code * must be all ones. @@ -597,7 +599,7 @@ local void gen_codes (tree, max_code, bl_count) int len = tree[n].Len; if (len == 0) continue; /* Now reverse the bits */ - tree[n].Code = (ush)bi_reverse(next_code[len]++, len); + tree[n].Code = bi_reverse(next_code[len]++, len); Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); @@ -819,7 +821,7 @@ local int build_bl_tree(s) if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; } /* Update opt_len to include the bit length tree and counts */ - s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4; + s->opt_len += 3*(max_blindex+1) + 5+5+4; Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", s->opt_len, s->static_len)); @@ -867,17 +869,11 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) int last; /* one if this is the last block for a file */ { send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ - bi_windup(s); /* align on byte boundary */ - put_short(s, (ush)stored_len); - put_short(s, (ush)~stored_len); - zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); - s->pending += stored_len; -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; s->compressed_len += (stored_len + 4) << 3; - s->bits_sent += 2*16; - s->bits_sent += stored_len<<3; #endif + copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ } /* =========================================================================== @@ -898,7 +894,7 @@ void ZLIB_INTERNAL _tr_align(s) { send_bits(s, STATIC_TREES<<1, 3); send_code(s, END_BLOCK, static_ltree); -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ #endif bi_flush(s); @@ -906,7 +902,7 @@ void ZLIB_INTERNAL _tr_align(s) /* =========================================================================== * Determine the best encoding for the current block: dynamic trees, static - * trees or store, and write out the encoded block. + * trees or store, and output the encoded block to the zip file. */ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) deflate_state *s; @@ -978,7 +974,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) send_bits(s, (STATIC_TREES<<1)+last, 3); compress_block(s, (const ct_data *)static_ltree, (const ct_data *)static_dtree); -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif } else { @@ -987,7 +983,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) max_blindex+1); compress_block(s, (const ct_data *)s->dyn_ltree, (const ct_data *)s->dyn_dtree); -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len += 3 + s->opt_len; #endif } @@ -999,7 +995,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) if (last) { bi_windup(s); -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->compressed_len += 7; /* align on byte boundary */ #endif } @@ -1094,7 +1090,7 @@ local void compress_block(s, ltree, dtree) send_code(s, code, dtree); /* send the distance code */ extra = extra_dbits[code]; if (extra != 0) { - dist -= (unsigned)base_dist[code]; + dist -= base_dist[code]; send_bits(s, dist, extra); /* send the extra distance bits */ } } /* literal or match pair ? */ @@ -1197,7 +1193,34 @@ local void bi_windup(s) } s->bi_buf = 0; s->bi_valid = 0; -#ifdef ZLIB_DEBUG +#ifdef DEBUG s->bits_sent = (s->bits_sent+7) & ~7; #endif } + +/* =========================================================================== + * Copy a stored block, storing first the length and its + * one's complement if requested. + */ +local void copy_block(s, buf, len, header) + deflate_state *s; + charf *buf; /* the input data */ + unsigned len; /* its length */ + int header; /* true if block header must be written */ +{ + bi_windup(s); /* align on byte boundary */ + + if (header) { + put_short(s, (ush)len); + put_short(s, (ush)~len); +#ifdef DEBUG + s->bits_sent += 2*16; +#endif + } +#ifdef DEBUG + s->bits_sent += (ulg)len<<3; +#endif + while (len--) { + put_byte(s, *buf++); + } +} diff --git a/Modules/zlib/uncompr.c b/Modules/zlib/uncompr.c index f03a1a8..242e949 100644 --- a/Modules/zlib/uncompr.c +++ b/Modules/zlib/uncompr.c @@ -1,5 +1,5 @@ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,85 +9,51 @@ #include "zlib.h" /* =========================================================================== - Decompresses the source buffer into the destination buffer. *sourceLen is - the byte length of the source buffer. Upon entry, *destLen is the total size - of the destination buffer, which must be large enough to hold the entire - uncompressed data. (The size of the uncompressed data must have been saved - previously by the compressor and transmitted to the decompressor by some - mechanism outside the scope of this compression library.) Upon exit, - *destLen is the size of the decompressed data and *sourceLen is the number - of source bytes consumed. Upon return, source + *sourceLen points to the - first unused input byte. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, or - Z_DATA_ERROR if the input data was corrupted, including if the input data is - an incomplete zlib stream. + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. */ -int ZEXPORT uncompress2 (dest, destLen, source, sourceLen) +int ZEXPORT uncompress (dest, destLen, source, sourceLen) Bytef *dest; uLongf *destLen; const Bytef *source; - uLong *sourceLen; + uLong sourceLen; { z_stream stream; int err; - const uInt max = (uInt)-1; - uLong len, left; - Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */ - - len = *sourceLen; - if (*destLen) { - left = *destLen; - *destLen = 0; - } - else { - left = 1; - dest = buf; - } stream.next_in = (z_const Bytef *)source; - stream.avail_in = 0; + stream.avail_in = (uInt)sourceLen; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; - stream.opaque = (voidpf)0; err = inflateInit(&stream); if (err != Z_OK) return err; - stream.next_out = dest; - stream.avail_out = 0; - - do { - if (stream.avail_out == 0) { - stream.avail_out = left > (uLong)max ? max : (uInt)left; - left -= stream.avail_out; - } - if (stream.avail_in == 0) { - stream.avail_in = len > (uLong)max ? max : (uInt)len; - len -= stream.avail_in; - } - err = inflate(&stream, Z_NO_FLUSH); - } while (err == Z_OK); - - *sourceLen -= len + stream.avail_in; - if (dest != buf) - *destLen = stream.total_out; - else if (stream.total_out && err == Z_BUF_ERROR) - left = 1; - - inflateEnd(&stream); - return err == Z_STREAM_END ? Z_OK : - err == Z_NEED_DICT ? Z_DATA_ERROR : - err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR : - err; -} + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; + } + *destLen = stream.total_out; -int ZEXPORT uncompress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ - return uncompress2(dest, destLen, source, &sourceLen); + err = inflateEnd(&stream); + return err; } diff --git a/Modules/zlib/zconf.h b/Modules/zlib/zconf.h index 5e1d68a..9987a77 100644 --- a/Modules/zlib/zconf.h +++ b/Modules/zlib/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -17,7 +17,7 @@ #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ # define Z_PREFIX_SET -/* all linked symbols and init macros */ +/* all linked symbols */ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align @@ -29,7 +29,6 @@ # define adler32 z_adler32 # define adler32_combine z_adler32_combine # define adler32_combine64 z_adler32_combine64 -# define adler32_z z_adler32_z # ifndef Z_SOLO # define compress z_compress # define compress2 z_compress2 @@ -38,14 +37,10 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 -# define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound # define deflateCopy z_deflateCopy # define deflateEnd z_deflateEnd -# define deflateGetDictionary z_deflateGetDictionary -# define deflateInit z_deflateInit -# define deflateInit2 z_deflateInit2 # define deflateInit2_ z_deflateInit2_ # define deflateInit_ z_deflateInit_ # define deflateParams z_deflateParams @@ -72,8 +67,6 @@ # define gzeof z_gzeof # define gzerror z_gzerror # define gzflush z_gzflush -# define gzfread z_gzfread -# define gzfwrite z_gzfwrite # define gzgetc z_gzgetc # define gzgetc_ z_gzgetc_ # define gzgets z_gzgets @@ -85,6 +78,7 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -95,39 +89,32 @@ # define gztell z_gztell # define gztell64 z_gztell64 # define gzungetc z_gzungetc -# define gzvprintf z_gzvprintf # define gzwrite z_gzwrite # endif # define inflate z_inflate # define inflateBack z_inflateBack # define inflateBackEnd z_inflateBackEnd -# define inflateBackInit z_inflateBackInit # define inflateBackInit_ z_inflateBackInit_ -# define inflateCodesUsed z_inflateCodesUsed # define inflateCopy z_inflateCopy # define inflateEnd z_inflateEnd -# define inflateGetDictionary z_inflateGetDictionary # define inflateGetHeader z_inflateGetHeader -# define inflateInit z_inflateInit -# define inflateInit2 z_inflateInit2 # define inflateInit2_ z_inflateInit2_ # define inflateInit_ z_inflateInit_ # define inflateMark z_inflateMark # define inflatePrime z_inflatePrime # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 -# define inflateResetKeep z_inflateResetKeep # define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine -# define inflateValidate z_inflateValidate +# define inflateResetKeep z_inflateResetKeep # define inflate_copyright z_inflate_copyright # define inflate_fast z_inflate_fast # define inflate_table z_inflate_table # ifndef Z_SOLO # define uncompress z_uncompress -# define uncompress2 z_uncompress2 # endif # define zError z_zError # ifndef Z_SOLO @@ -237,19 +224,9 @@ # define z_const #endif -#ifdef Z_SOLO - typedef unsigned long z_size_t; -#else -# define z_longlong long long -# if defined(NO_SIZE_T) - typedef unsigned NO_SIZE_T z_size_t; -# elif defined(STDC) -# include - typedef size_t z_size_t; -# else - typedef unsigned long z_size_t; -# endif -# undef z_longlong +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL #endif /* Maximum value for memLevel in deflateInit2 */ @@ -279,7 +256,7 @@ Of course this will generally degrade compression (there's no free lunch). The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus about 7 kilobytes + that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/Modules/zlib/zconf.h.cmakein b/Modules/zlib/zconf.h.cmakein index a7f24cc..043019c 100644 --- a/Modules/zlib/zconf.h.cmakein +++ b/Modules/zlib/zconf.h.cmakein @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -19,7 +19,7 @@ #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ # define Z_PREFIX_SET -/* all linked symbols and init macros */ +/* all linked symbols */ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align @@ -31,7 +31,6 @@ # define adler32 z_adler32 # define adler32_combine z_adler32_combine # define adler32_combine64 z_adler32_combine64 -# define adler32_z z_adler32_z # ifndef Z_SOLO # define compress z_compress # define compress2 z_compress2 @@ -40,14 +39,10 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 -# define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound # define deflateCopy z_deflateCopy # define deflateEnd z_deflateEnd -# define deflateGetDictionary z_deflateGetDictionary -# define deflateInit z_deflateInit -# define deflateInit2 z_deflateInit2 # define deflateInit2_ z_deflateInit2_ # define deflateInit_ z_deflateInit_ # define deflateParams z_deflateParams @@ -74,8 +69,6 @@ # define gzeof z_gzeof # define gzerror z_gzerror # define gzflush z_gzflush -# define gzfread z_gzfread -# define gzfwrite z_gzfwrite # define gzgetc z_gzgetc # define gzgetc_ z_gzgetc_ # define gzgets z_gzgets @@ -87,6 +80,7 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -97,39 +91,32 @@ # define gztell z_gztell # define gztell64 z_gztell64 # define gzungetc z_gzungetc -# define gzvprintf z_gzvprintf # define gzwrite z_gzwrite # endif # define inflate z_inflate # define inflateBack z_inflateBack # define inflateBackEnd z_inflateBackEnd -# define inflateBackInit z_inflateBackInit # define inflateBackInit_ z_inflateBackInit_ -# define inflateCodesUsed z_inflateCodesUsed # define inflateCopy z_inflateCopy # define inflateEnd z_inflateEnd -# define inflateGetDictionary z_inflateGetDictionary # define inflateGetHeader z_inflateGetHeader -# define inflateInit z_inflateInit -# define inflateInit2 z_inflateInit2 # define inflateInit2_ z_inflateInit2_ # define inflateInit_ z_inflateInit_ # define inflateMark z_inflateMark # define inflatePrime z_inflatePrime # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 -# define inflateResetKeep z_inflateResetKeep # define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine -# define inflateValidate z_inflateValidate +# define inflateResetKeep z_inflateResetKeep # define inflate_copyright z_inflate_copyright # define inflate_fast z_inflate_fast # define inflate_table z_inflate_table # ifndef Z_SOLO # define uncompress z_uncompress -# define uncompress2 z_uncompress2 # endif # define zError z_zError # ifndef Z_SOLO @@ -239,19 +226,9 @@ # define z_const #endif -#ifdef Z_SOLO - typedef unsigned long z_size_t; -#else -# define z_longlong long long -# if defined(NO_SIZE_T) - typedef unsigned NO_SIZE_T z_size_t; -# elif defined(STDC) -# include - typedef size_t z_size_t; -# else - typedef unsigned long z_size_t; -# endif -# undef z_longlong +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL #endif /* Maximum value for memLevel in deflateInit2 */ @@ -281,7 +258,7 @@ Of course this will generally degrade compression (there's no free lunch). The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus about 7 kilobytes + that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/Modules/zlib/zconf.h.in b/Modules/zlib/zconf.h.in index 5e1d68a..9987a77 100644 --- a/Modules/zlib/zconf.h.in +++ b/Modules/zlib/zconf.h.in @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -17,7 +17,7 @@ #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ # define Z_PREFIX_SET -/* all linked symbols and init macros */ +/* all linked symbols */ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align @@ -29,7 +29,6 @@ # define adler32 z_adler32 # define adler32_combine z_adler32_combine # define adler32_combine64 z_adler32_combine64 -# define adler32_z z_adler32_z # ifndef Z_SOLO # define compress z_compress # define compress2 z_compress2 @@ -38,14 +37,10 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 -# define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound # define deflateCopy z_deflateCopy # define deflateEnd z_deflateEnd -# define deflateGetDictionary z_deflateGetDictionary -# define deflateInit z_deflateInit -# define deflateInit2 z_deflateInit2 # define deflateInit2_ z_deflateInit2_ # define deflateInit_ z_deflateInit_ # define deflateParams z_deflateParams @@ -72,8 +67,6 @@ # define gzeof z_gzeof # define gzerror z_gzerror # define gzflush z_gzflush -# define gzfread z_gzfread -# define gzfwrite z_gzfwrite # define gzgetc z_gzgetc # define gzgetc_ z_gzgetc_ # define gzgets z_gzgets @@ -85,6 +78,7 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -95,39 +89,32 @@ # define gztell z_gztell # define gztell64 z_gztell64 # define gzungetc z_gzungetc -# define gzvprintf z_gzvprintf # define gzwrite z_gzwrite # endif # define inflate z_inflate # define inflateBack z_inflateBack # define inflateBackEnd z_inflateBackEnd -# define inflateBackInit z_inflateBackInit # define inflateBackInit_ z_inflateBackInit_ -# define inflateCodesUsed z_inflateCodesUsed # define inflateCopy z_inflateCopy # define inflateEnd z_inflateEnd -# define inflateGetDictionary z_inflateGetDictionary # define inflateGetHeader z_inflateGetHeader -# define inflateInit z_inflateInit -# define inflateInit2 z_inflateInit2 # define inflateInit2_ z_inflateInit2_ # define inflateInit_ z_inflateInit_ # define inflateMark z_inflateMark # define inflatePrime z_inflatePrime # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 -# define inflateResetKeep z_inflateResetKeep # define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine -# define inflateValidate z_inflateValidate +# define inflateResetKeep z_inflateResetKeep # define inflate_copyright z_inflate_copyright # define inflate_fast z_inflate_fast # define inflate_table z_inflate_table # ifndef Z_SOLO # define uncompress z_uncompress -# define uncompress2 z_uncompress2 # endif # define zError z_zError # ifndef Z_SOLO @@ -237,19 +224,9 @@ # define z_const #endif -#ifdef Z_SOLO - typedef unsigned long z_size_t; -#else -# define z_longlong long long -# if defined(NO_SIZE_T) - typedef unsigned NO_SIZE_T z_size_t; -# elif defined(STDC) -# include - typedef size_t z_size_t; -# else - typedef unsigned long z_size_t; -# endif -# undef z_longlong +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL #endif /* Maximum value for memLevel in deflateInit2 */ @@ -279,7 +256,7 @@ Of course this will generally degrade compression (there's no free lunch). The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus about 7 kilobytes + that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/Modules/zlib/zlib.3 b/Modules/zlib/zlib.3 index bda4eb0..0160e62 100644 --- a/Modules/zlib/zlib.3 +++ b/Modules/zlib/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "15 Jan 2017" +.TH ZLIB 3 "28 Apr 2013" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -48,10 +48,32 @@ Changes to this version are documented in the file that accompanies the source. .LP .I zlib -is built in to many languages and operating systems, including but not limited to -Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go. +is available in Java using the java.util.zip package: +.IP +http://java.sun.com/developer/technicalArticles/Programming/compression/ +.LP +A Perl interface to +.IR zlib , +written by Paul Marquess (pmqs@cpan.org), +is available at CPAN (Comprehensive Perl Archive Network) sites, +including: +.IP +http://search.cpan.org/~pmqs/IO-Compress-Zlib/ +.LP +A Python interface to +.IR zlib , +written by A.M. Kuchling (amk@magnet.com), +is available in Python 1.5 and later versions: +.IP +http://docs.python.org/library/zlib.html +.LP +.I zlib +is built into +.IR tcl: +.IP +http://wiki.tcl.tk/4610 .LP -An experimental package to read and write files in the .zip format, +An experimental package to read and write files in .zip format, written on top of .I zlib by Gilles Vollant (info@winimage.com), @@ -70,9 +92,7 @@ web site can be found at: .IP http://zlib.net/ .LP -The data format used by the -.I zlib -library is described by RFC +The data format used by the zlib library is described by RFC (Request for Comments) 1950 to 1952 in the files: .IP http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format) @@ -104,35 +124,17 @@ http://zlib.net/zlib_faq.html before asking for help. Send questions and/or comments to zlib@gzip.org, or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). -.SH AUTHORS AND LICENSE -Version 1.2.11 -.LP -Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler -.LP -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages +.SH AUTHORS +Version 1.2.8 +Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org) +and Mark Adler (madler@alumni.caltech.edu). +.LP +This software is provided "as-is," +without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. -.LP -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: -.LP -.nr step 1 1 -.IP \n[step]. 3 -The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software -in a product, an acknowledgment in the product documentation would be -appreciated but is not required. -.IP \n+[step]. -Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. -.IP \n+[step]. -This notice may not be removed or altered from any source distribution. -.LP -Jean-loup Gailly Mark Adler -.br -jloup@gzip.org madler@alumni.caltech.edu -.LP +See the distribution directory with respect to requirements +governing redistribution. The deflate format used by .I zlib was defined by Phil Katz. diff --git a/Modules/zlib/zlib.h b/Modules/zlib/zlib.h index f09cdaf..3e0c767 100644 --- a/Modules/zlib/zlib.h +++ b/Modules/zlib/zlib.h @@ -1,7 +1,7 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.11, January 15th, 2017 + version 1.2.8, April 28th, 2013 - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,11 +37,11 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.11" -#define ZLIB_VERNUM 0x12b0 +#define ZLIB_VERSION "1.2.8" +#define ZLIB_VERNUM 0x1280 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 11 +#define ZLIB_VER_REVISION 8 #define ZLIB_VER_SUBREVISION 0 /* @@ -65,8 +65,7 @@ extern "C" { with "gz". The gzip format is different from the zlib format. gzip is a gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - This library can optionally read and write gzip and raw deflate streams in - memory as well. + This library can optionally read and write gzip streams in memory as well. The zlib format was designed to be compact and fast for use in memory and on communications channels. The gzip format was designed for single- @@ -75,7 +74,7 @@ extern "C" { The library does not install any signal handler. The decoder checks the consistency of the compressed data, so the library should never crash - even in the case of corrupted input. + even in case of corrupted input. */ typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); @@ -88,7 +87,7 @@ typedef struct z_stream_s { uInt avail_in; /* number of bytes available at next_in */ uLong total_in; /* total number of input bytes read so far */ - Bytef *next_out; /* next output byte will go here */ + Bytef *next_out; /* next output byte should be put there */ uInt avail_out; /* remaining free space at next_out */ uLong total_out; /* total number of bytes output so far */ @@ -99,9 +98,8 @@ typedef struct z_stream_s { free_func zfree; /* used to free the internal state */ voidpf opaque; /* private data object passed to zalloc and zfree */ - int data_type; /* best guess about the data type: binary or text - for deflate, or the decoding state for inflate */ - uLong adler; /* Adler-32 or CRC-32 value of the uncompressed data */ + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ uLong reserved; /* reserved for future use */ } z_stream; @@ -144,9 +142,7 @@ typedef gz_header FAR *gz_headerp; zalloc must return Z_NULL if there is not enough memory for the object. If zlib is used in a multi-threaded application, zalloc and zfree must be - thread safe. In that case, zlib is thread-safe. When zalloc and zfree are - Z_NULL on entry to the initialization function, they are set to internal - routines that use the standard library functions malloc() and free(). + thread safe. On 16-bit systems, the functions zalloc and zfree must be able to allocate exactly 65536 bytes, but will not be required to allocate more than this if @@ -159,7 +155,7 @@ typedef gz_header FAR *gz_headerp; The fields total_in and total_out can be used for statistics or progress reports. After compression, total_in holds the total size of the - uncompressed data and may be saved for use by the decompressor (particularly + uncompressed data and may be saved for use in the decompressor (particularly if the decompressor wants to decompress everything in a single step). */ @@ -204,7 +200,7 @@ typedef gz_header FAR *gz_headerp; #define Z_TEXT 1 #define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ #define Z_UNKNOWN 2 -/* Possible values of the data_type field for deflate() */ +/* Possible values of the data_type field (though see inflate()) */ #define Z_DEFLATED 8 /* The deflate compression method (the only one supported in this version) */ @@ -262,11 +258,11 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); enough room in the output buffer), next_in and avail_in are updated and processing will resume at this point for the next call of deflate(). - - Generate more output starting at next_out and update next_out and avail_out + - Provide more output starting at next_out and update next_out and avail_out accordingly. This action is forced if the parameter flush is non zero. Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary. Some output may be provided even if - flush is zero. + should be set only when necessary (in interactive applications). Some + output may be provided even if flush is not set. Before the call of deflate(), the application should ensure that at least one of the actions is possible, by providing more input and/or consuming more @@ -275,9 +271,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); output when it wants, for example when the output buffer is full (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK and with zero avail_out, it must be called again after making room in the output - buffer because there might be more output pending. See deflatePending(), - which can be used if desired to determine whether or not there is more ouput - in that case. + buffer because there might be more output pending. Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to decide how much data to accumulate before producing output, in order to @@ -298,8 +292,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. This completes the current deflate block and follows it with an empty fixed codes block that is 10 bits long. This assures that enough bytes are output - in order for the decompressor to finish the block before the empty fixed - codes block. + in order for the decompressor to finish the block before the empty fixed code + block. If flush is set to Z_BLOCK, a deflate block is completed and emitted, as for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to @@ -325,38 +319,34 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); If the parameter flush is set to Z_FINISH, pending input is processed, pending output is flushed and deflate returns with Z_STREAM_END if there was - enough output space. If deflate returns with Z_OK or Z_BUF_ERROR, this - function must be called again with Z_FINISH and more output space (updated - avail_out) but no more input data, until it returns with Z_STREAM_END or an - error. After deflate has returned Z_STREAM_END, the only possible operations - on the stream are deflateReset or deflateEnd. - - Z_FINISH can be used in the first deflate call after deflateInit if all the - compression is to be done in a single step. In order to complete in one - call, avail_out must be at least the value returned by deflateBound (see - below). Then deflate is guaranteed to return Z_STREAM_END. If not enough - output space is provided, deflate will not return Z_STREAM_END, and it must - be called again as described above. - - deflate() sets strm->adler to the Adler-32 checksum of all input read - so far (that is, total_in bytes). If a gzip stream is being generated, then - strm->adler will be the CRC-32 checksum of the input read so far. (See - deflateInit2 below.) + enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the stream + are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least the + value returned by deflateBound (see below). Then deflate is guaranteed to + return Z_STREAM_END. If not enough output space is provided, deflate will + not return Z_STREAM_END, and it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). If in doubt, the data is - considered binary. This field is only for information purposes and does not - affect the compression algorithm in any manner. + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect the + compression algorithm in any manner. deflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if all input has been consumed and all output has been produced (only when flush is set to Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was Z_NULL or the state was inadvertently written over - by the application), or Z_BUF_ERROR if no progress is possible (for example - avail_in or avail_out was zero). Note that Z_BUF_ERROR is not fatal, and - deflate() can be called again with more input and more output space to - continue compressing. + if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. */ @@ -379,21 +369,23 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); Initializes the internal stream state for decompression. The fields next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. In the current version of inflate, the provided input is not - read or consumed. The allocation of a sliding window will be deferred to - the first call of inflate (if the decompression does not complete on the - first call). If zalloc and zfree are set to Z_NULL, inflateInit updates - them to use default allocation functions. + the caller. If next_in is not Z_NULL and avail_in is large enough (the + exact value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the version assumed by the caller, or Z_STREAM_ERROR if the parameters are invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit does not perform any decompression. - Actual decompression will be done by inflate(). So next_in, and avail_in, - next_out, and avail_out are unused and unchanged. The current - implementation of inflateInit() does not process any header information -- - that is deferred until inflate() is called. + there is no error message. inflateInit does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit() does not process any header information -- that is deferred + until inflate() is called. */ @@ -409,20 +401,17 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); - Decompress more input starting at next_in and update next_in and avail_in accordingly. If not all input can be processed (because there is not - enough room in the output buffer), then next_in and avail_in are updated - accordingly, and processing will resume at this point for the next call of - inflate(). + enough room in the output buffer), next_in is updated and processing will + resume at this point for the next call of inflate(). - - Generate more output starting at next_out and update next_out and avail_out + - Provide more output starting at next_out and update next_out and avail_out accordingly. inflate() provides as much output as possible, until there is no more input data or no more space in the output buffer (see below about the flush parameter). Before the call of inflate(), the application should ensure that at least one of the actions is possible, by providing more input and/or consuming more - output, and updating the next_* and avail_* values accordingly. If the - caller of inflate() does not provide both available input and available - output space, it is possible that there will be no progress made. The + output, and updating the next_* and avail_* values accordingly. The application can consume the uncompressed output when it wants, for example when the output buffer is full (avail_out == 0), or after each call of inflate(). If inflate returns Z_OK and with zero avail_out, it must be @@ -439,7 +428,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); gets to the end of that block, or when it runs out of data. The Z_BLOCK option assists in appending to or combining deflate streams. - To assist in this, on return inflate() always sets strm->data_type to the + Also to assist in this, on return inflate() will set strm->data_type to the number of unused bits in the last byte taken from strm->next_in, plus 64 if inflate() is currently decoding the last block in the deflate stream, plus 128 if inflate() returned immediately after decoding an end-of-block code or @@ -465,7 +454,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); this case all pending input is processed and all pending output is flushed; avail_out must be large enough to hold all of the uncompressed data for the operation to complete. (The size of the uncompressed data may have been - saved by the compressor for this purpose.) The use of Z_FINISH is not + saved by the compressor for this purpose.) The use of Z_FINISH is not required to perform an inflation in one step. However it may be used to inform inflate that a faster approach can be used for the single inflate() call. Z_FINISH also informs inflate to not maintain a sliding window if the @@ -487,33 +476,32 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the Adler-32 checksum of all output produced so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed Adler-32 + below. At the end of the stream, inflate() checks that its computed adler32 checksum is equal to that saved by the compressor and returns Z_STREAM_END only if the checksum is correct. inflate() can decompress and check either zlib-wrapped or gzip-wrapped deflate data. The header type is detected automatically, if requested when initializing with inflateInit2(). Any information contained in the gzip - header is not retained unless inflateGetHeader() is used. When processing + header is not retained, so applications that need that information should + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. When processing gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output - produced so far. The CRC-32 is checked against the gzip trailer, as is the - uncompressed length, modulo 2^32. + producted so far. The CRC-32 is checked against the gzip trailer. inflate() returns Z_OK if some progress has been made (more input processed or more output produced), Z_STREAM_END if the end of the compressed data has been reached and all uncompressed output has been produced, Z_NEED_DICT if a preset dictionary is needed at this point, Z_DATA_ERROR if the input data was corrupted (input stream not conforming to the zlib format or incorrect check - value, in which case strm->msg points to a string with a more specific - error), Z_STREAM_ERROR if the stream structure was inconsistent (for example - next_in or next_out was Z_NULL, or the state was inadvertently written over - by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR - if no progress was possible or if there was not enough room in the output - buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and inflate() can be called again with more input and more output space to continue decompressing. If Z_DATA_ERROR is returned, the application may then call inflateSync() to look for a good compression block if a partial - recovery of the data is to be attempted. + recovery of the data is desired. */ @@ -523,8 +511,9 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); This function discards any unprocessed input and does not flush any pending output. - inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state - was inconsistent. + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). */ @@ -555,29 +544,16 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, compression at the expense of memory usage. The default value is 15 if deflateInit is used instead. - For the current implementation of deflate(), a windowBits value of 8 (a - window size of 256 bytes) is not supported. As a result, a request for 8 - will result in 9 (a 512-byte window). In that case, providing 8 to - inflateInit2() will result in an error when the zlib header with 9 is - checked against the initialization of inflate(). The remedy is to not use 8 - with deflateInit2() with this initialization, or at least in that case use 9 - with inflateInit2(). - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute a check value. + with no zlib header or trailer, and will not compute an adler32 check value. windowBits can also be greater than 15 for optional gzip encoding. Add 16 to windowBits to write a simple gzip header and trailer around the compressed data instead of a zlib wrapper. The gzip header will have no file name, no extra data, no comment, no modification time (set to zero), no - header crc, and the operating system will be set to the appropriate value, - if the operating system was determined at compile time. If a gzip stream is - being written, strm->adler is a CRC-32 instead of an Adler-32. - - For raw deflate or gzip encoding, a request for a 256-byte window is - rejected as invalid, since only the zlib header provides a means of - transmitting the window size to the decompressor. + header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. The memLevel parameter specifies how much memory should be allocated for the internal compression state. memLevel=1 uses minimum memory but is @@ -638,12 +614,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, addition, the current implementation of deflate will use at most the window size minus 262 bytes of the provided dictionary. - Upon return of this function, strm->adler is set to the Adler-32 value + Upon return of this function, strm->adler is set to the adler32 value of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The Adler-32 value + which dictionary has been used by the compressor. (The adler32 value applies to the whole dictionary even if only a subset of the dictionary is actually used by the compressor.) If a raw deflate was requested, then the - Adler-32 value is not computed and strm->adler is not set. + adler32 value is not computed and strm->adler is not set. deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is @@ -652,28 +628,6 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, not perform any compression: this will be done by deflate(). */ -ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm, - Bytef *dictionary, - uInt *dictLength)); -/* - Returns the sliding dictionary being maintained by deflate. dictLength is - set to the number of bytes in the dictionary, and that many bytes are copied - to dictionary. dictionary must have enough space, where 32768 bytes is - always enough. If deflateGetDictionary() is called with dictionary equal to - Z_NULL, then only the dictionary length is returned, and nothing is copied. - Similary, if dictLength is Z_NULL, then it is not set. - - deflateGetDictionary() may return a length less than the window size, even - when more than the window size in input has been provided. It may return up - to 258 bytes less in that case, due to how zlib's implementation of deflate - manages the sliding window and lookahead for matches, where matches can be - up to 258 bytes long. If the application needs the last window-size bytes of - input, then that would need to be saved by the application outside of zlib. - - deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the - stream state is inconsistent. -*/ - ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, z_streamp source)); /* @@ -694,10 +648,10 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); /* - This function is equivalent to deflateEnd followed by deflateInit, but - does not free and reallocate the internal compression state. The stream - will leave the compression level and any other attributes that may have been - set unchanged. + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. The + stream will keep the same compression level and any other attributes that + may have been set by deflateInit2. deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent (such as zalloc or state being Z_NULL). @@ -708,36 +662,20 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, int strategy)); /* Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2(). This can be + interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or to switch to a different kind of input data requiring a different strategy. - If the compression approach (which is a function of the level) or the - strategy is changed, and if any input has been consumed in a previous - deflate() call, then the input available so far is compressed with the old - level and strategy using deflate(strm, Z_BLOCK). There are three approaches - for the compression levels 0, 1..3, and 4..9 respectively. The new level - and strategy will take effect at the next call of deflate(). - - If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does - not have enough output space to complete, then the parameter change will not - take effect. In this case, deflateParams() can be called again with the - same parameters and more output space to try again. - - In order to assure a change in the parameters on the first try, the - deflate stream should be flushed using deflate() with Z_BLOCK or other flush - request until strm.avail_out is not zero, before calling deflateParams(). - Then no more input data should be provided before the deflateParams() call. - If this is done, the old level and strategy will be applied to the data - compressed before deflateParams(), and the new level and strategy will be - applied to the the data compressed after deflateParams(). - - deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream - state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if - there was not enough output space to complete the compression of the - available input data before a change in the strategy or approach. Note that - in the case of a Z_BUF_ERROR, the parameters are not changed. A return - value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be - retried with more output space. + If the compression level is changed, the input available so far is + compressed with the old level (and may be flushed); the new level will take + effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to be + compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if + strm->avail_out was zero. */ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, @@ -855,7 +793,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, is for use with other formats that use the deflate compressed data format such as zip. Those formats provide their own check values. If a custom format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an Adler-32 or a CRC-32 be applied to + recommended that a check value such as an adler32 or a crc32 be applied to the uncompressed data as is done in the zlib, gzip, and zip formats. For most applications, the zlib format should be used as is. Note that comments above on the use in deflateInit2() applies to the magnitude of windowBits. @@ -864,10 +802,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a - CRC-32 instead of an Adler-32. Unlike the gunzip utility and gzread() (see - below), inflate() will not automatically decode concatenated gzip streams. - inflate() will return Z_STREAM_END at the end of the gzip stream. The state - would need to be reset to continue decoding a subsequent gzip stream. + crc32 instead of an adler32. inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_VERSION_ERROR if the zlib library version is incompatible with the @@ -888,7 +823,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, Initializes the decompression dictionary from the given uncompressed byte sequence. This function must be called immediately after a call of inflate, if that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the Adler-32 value returned by that call of inflate. + can be determined from the adler32 value returned by that call of inflate. The compressor and decompressor must use exactly the same dictionary (see deflateSetDictionary). For raw inflate, this function can be called at any time to set the dictionary. If the provided dictionary is smaller than the @@ -899,7 +834,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect Adler-32 value). inflateSetDictionary does not + expected one (incorrect adler32 value). inflateSetDictionary does not perform any decompression: this will be done by subsequent calls of inflate(). */ @@ -957,7 +892,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); /* This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate the internal decompression state. The + but does not free and reallocate all the internal decompression state. The stream will keep attributes that may have been set by inflateInit2. inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source @@ -969,9 +904,7 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, /* This function is the same as inflateReset, but it also permits changing the wrap and window size requests. The windowBits parameter is interpreted - the same as it is for inflateInit2. If the window size is changed, then the - memory allocated for the window is freed, and the window will be reallocated - by inflate() if needed. + the same as it is for inflateInit2. inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source stream state was inconsistent (such as zalloc or state being Z_NULL), or if @@ -1023,7 +956,7 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); location in the input stream can be determined from avail_in and data_type as noted in the description for the Z_BLOCK flush parameter for inflate. - inflateMark returns the value noted above, or -65536 if the provided + inflateMark returns the value noted above or -1 << 16 if the provided source stream state was inconsistent. */ @@ -1115,9 +1048,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, This routine would normally be used in a utility that reads zip or gzip files and writes out uncompressed files. The utility would decode the header and process the trailer on its own, hence this routine expects only - the raw deflate stream to decompress. This is different from the default - behavior of inflate(), which expects a zlib header and trailer around the - deflate stream. + the raw deflate stream to decompress. This is different from the normal + behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. inflateBack() uses two subroutines supplied by the caller that are then called by inflateBack() for input and output. inflateBack() calls those @@ -1126,12 +1059,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, parameters and return types are defined above in the in_func and out_func typedefs. inflateBack() will call in(in_desc, &buf) which should return the number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero -- buf is ignored in that - case -- and inflateBack() will return a buffer error. inflateBack() will - call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. - out() should return zero on success, or non-zero on failure. If out() - returns non-zero, inflateBack() will return with an error. Neither in() nor - out() are permitted to change the contents of the window provided to + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to inflateBackInit(), which is also the buffer that out() uses to write from. The length written by out() will be at most the window size. Any non-zero amount of input may be provided by in(). @@ -1159,7 +1092,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, using strm->next_in which will be Z_NULL only if in() returned an error. If strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning non-zero. (in() will always be called before out(), so strm->next_in is - assured to be defined if out() returns non-zero.) Note that inflateBack() + assured to be defined if out() returns non-zero.) Note that inflateBack() cannot return Z_OK. */ @@ -1181,7 +1114,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); 7.6: size of z_off_t Compiler, assembler, and debug options: - 8: ZLIB_DEBUG + 8: DEBUG 9: ASMV or ASMINF -- use ASM code 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention 11: 0 (reserved) @@ -1231,8 +1164,7 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, the byte length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be at least the value returned by compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed data. compress() is equivalent to compress2() with a level - parameter of Z_DEFAULT_COMPRESSION. + compressed buffer. compress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output @@ -1248,7 +1180,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be at least the value returned by compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed data. + compressed buffer. compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, @@ -1271,7 +1203,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, uncompressed data. (The size of the uncompressed data must have been saved previously by the compressor and transmitted to the decompressor by some mechanism outside the scope of this compression library.) Upon exit, destLen - is the actual size of the uncompressed data. + is the actual size of the uncompressed buffer. uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output @@ -1280,14 +1212,6 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, buffer with the uncompressed data up to that point. */ -ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong *sourceLen)); -/* - Same as uncompress, except that sourceLen is a pointer, where the - length of the source is *sourceLen. On return, *sourceLen is the number of - source bytes consumed. -*/ - /* gzip file access functions */ /* @@ -1366,9 +1290,10 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); default buffer size is 8192 bytes. This function must be called after gzopen() or gzdopen(), and before any other calls that read or write the file. The buffer memory allocation is always deferred to the first read or - write. Three times that size in buffer space is allocated. A larger buffer - size of, for example, 64K or 128K bytes will noticeably increase the speed - of decompression (reading). + write. Two buffers are allocated, either both of the specified size when + writing, or one of the specified size and the other twice that size when + reading. A larger buffer size of, for example, 64K or 128K bytes will + noticeably increase the speed of decompression (reading). The new buffer size also affects the maximum length for gzprintf(). @@ -1379,12 +1304,10 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); /* Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. Previously provided - data is flushed before the parameter change. + of deflateInit2 for the meaning of these parameters. - gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not - opened for writing, Z_ERRNO if there is an error writing the flushed data, - or Z_MEM_ERROR if there is a memory allocation error. + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. */ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); @@ -1412,35 +1335,7 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); case. gzread returns the number of uncompressed bytes actually read, less than - len for end of file, or -1 for error. If len is too large to fit in an int, - then nothing is read, -1 is returned, and the error state is set to - Z_STREAM_ERROR. -*/ - -ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems, - gzFile file)); -/* - Read up to nitems items of size size from file to buf, otherwise operating - as gzread() does. This duplicates the interface of stdio's fread(), with - size_t request and return types. If the library defines size_t, then - z_size_t is identical to size_t. If not, then z_size_t is an unsigned - integer type that can contain a pointer. - - gzfread() returns the number of full items read of size size, or zero if - the end of the file was reached and a full item could not be read, or if - there was an error. gzerror() must be consulted if zero is returned in - order to determine if there was an error. If the multiplication of size and - nitems overflows, i.e. the product does not fit in a z_size_t, then nothing - is read, zero is returned, and the error state is set to Z_STREAM_ERROR. - - In the event that the end of file is reached and only a partial item is - available at the end, i.e. the remaining uncompressed data length is not a - multiple of size, then the final partial item is nevetheless read into buf - and the end-of-file flag is set. The length of the partial item read is not - provided, but could be inferred from the result of gztell(). This behavior - is the same as the behavior of fread() implementations in common libraries, - but it prevents the direct use of gzfread() to read a concurrently written - file, reseting and retrying on end-of-file, when size is not 1. + len for end of file, or -1 for error. */ ZEXTERN int ZEXPORT gzwrite OF((gzFile file, @@ -1451,33 +1346,19 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file, error. */ -ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size, - z_size_t nitems, gzFile file)); -/* - gzfwrite() writes nitems items of size size from buf to file, duplicating - the interface of stdio's fwrite(), with size_t request and return types. If - the library defines size_t, then z_size_t is identical to size_t. If not, - then z_size_t is an unsigned integer type that can contain a pointer. - - gzfwrite() returns the number of full items written of size size, or zero - if there was an error. If the multiplication of size and nitems overflows, - i.e. the product does not fit in a z_size_t, then nothing is written, zero - is returned, and the error state is set to Z_STREAM_ERROR. -*/ - ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); /* Converts, formats, and writes the arguments to the compressed file under control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written, or a negative zlib error code in case - of error. The number of uncompressed bytes written is limited to 8191, or - one less than the buffer size given to gzbuffer(). The caller should assure - that this limit is not exceeded. If it is exceeded, then gzprintf() will - return an error (0) with nothing written. In this case, there may also be a - buffer overflow with unpredictable consequences, which is possible only if - zlib was compiled with the insecure functions sprintf() or vsprintf() - because the secure snprintf() or vsnprintf() functions were not available. - This can be determined using zlibCompileFlags(). + uncompressed bytes actually written, or 0 in case of error. The number of + uncompressed bytes written is limited to 8191, or one less than the buffer + size given to gzbuffer(). The caller should assure that this limit is not + exceeded. If it is exceeded, then gzprintf() will return an error (0) with + nothing written. In this case, there may also be a buffer overflow with + unpredictable consequences, which is possible only if zlib was compiled with + the insecure functions sprintf() or vsprintf() because the secure snprintf() + or vsnprintf() functions were not available. This can be determined using + zlibCompileFlags(). */ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); @@ -1537,7 +1418,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); If the flush parameter is Z_FINISH, the remaining data is written and the gzip stream is completed in the output. If gzwrite() is called again, a new gzip stream will be started in the output. gzread() is able to read such - concatenated gzip streams. + concatented gzip streams. gzflush should be called only when strictly necessary because it will degrade compression if called too often. @@ -1691,7 +1572,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); return the updated checksum. If buf is Z_NULL, this function returns the required initial value for the checksum. - An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed much faster. Usage example: @@ -1704,12 +1585,6 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); if (adler != original_adler) error(); */ -ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf, - z_size_t len)); -/* - Same as adler32(), but with a size_t length. -*/ - /* ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, z_off_t len2)); @@ -1739,12 +1614,6 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); if (crc != original_crc) error(); */ -ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf, - z_size_t len)); -/* - Same as crc32(), but with a size_t length. -*/ - /* ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); @@ -1775,35 +1644,19 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, unsigned char FAR *window, const char *version, int stream_size)); -#ifdef Z_PREFIX_SET -# define z_deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ - (int)sizeof(z_stream)) -# define z_inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, (int)sizeof(z_stream)) -#else -# define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) -# define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) -# define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) -# define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ - (int)sizeof(z_stream)) -# define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, (int)sizeof(z_stream)) -#endif +#define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +#define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) #ifndef Z_SOLO @@ -1823,10 +1676,10 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #ifdef Z_PREFIX_SET # undef z_gzgetc # define z_gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) #else # define gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) #endif /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or @@ -1884,16 +1737,19 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #endif /* !Z_SOLO */ +/* hack for buggy compilers */ +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; +#endif + /* undocumented functions */ ZEXTERN const char * ZEXPORT zError OF((int)); ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); -ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int)); -ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); -#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) +#if defined(_WIN32) && !defined(Z_SOLO) ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, const char *mode)); #endif diff --git a/Modules/zlib/zlib.map b/Modules/zlib/zlib.map index 40fa9db..55c6647 100644 --- a/Modules/zlib/zlib.map +++ b/Modules/zlib/zlib.map @@ -1,94 +1,83 @@ -ZLIB_1.2.0 { - global: - compressBound; - deflateBound; - inflateBack; - inflateBackEnd; - inflateBackInit_; - inflateCopy; - local: - deflate_copyright; - inflate_copyright; - inflate_fast; - inflate_table; - zcalloc; - zcfree; - z_errmsg; - gz_error; - gz_intmax; - _*; -}; - -ZLIB_1.2.0.2 { - gzclearerr; - gzungetc; - zlibCompileFlags; -} ZLIB_1.2.0; - -ZLIB_1.2.0.8 { - deflatePrime; -} ZLIB_1.2.0.2; - -ZLIB_1.2.2 { - adler32_combine; - crc32_combine; - deflateSetHeader; - inflateGetHeader; -} ZLIB_1.2.0.8; - -ZLIB_1.2.2.3 { - deflateTune; - gzdirect; -} ZLIB_1.2.2; - -ZLIB_1.2.2.4 { - inflatePrime; -} ZLIB_1.2.2.3; - -ZLIB_1.2.3.3 { - adler32_combine64; - crc32_combine64; - gzopen64; - gzseek64; - gztell64; - inflateUndermine; -} ZLIB_1.2.2.4; - -ZLIB_1.2.3.4 { - inflateReset2; - inflateMark; -} ZLIB_1.2.3.3; - -ZLIB_1.2.3.5 { - gzbuffer; - gzoffset; - gzoffset64; - gzclose_r; - gzclose_w; -} ZLIB_1.2.3.4; - -ZLIB_1.2.5.1 { - deflatePending; -} ZLIB_1.2.3.5; - -ZLIB_1.2.5.2 { - deflateResetKeep; - gzgetc_; - inflateResetKeep; -} ZLIB_1.2.5.1; - -ZLIB_1.2.7.1 { - inflateGetDictionary; - gzvprintf; -} ZLIB_1.2.5.2; - -ZLIB_1.2.9 { - inflateCodesUsed; - inflateValidate; - uncompress2; - gzfread; - gzfwrite; - deflateGetDictionary; - adler32_z; - crc32_z; -} ZLIB_1.2.7.1; +ZLIB_1.2.0 { + global: + compressBound; + deflateBound; + inflateBack; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + local: + deflate_copyright; + inflate_copyright; + inflate_fast; + inflate_table; + zcalloc; + zcfree; + z_errmsg; + gz_error; + gz_intmax; + _*; +}; + +ZLIB_1.2.0.2 { + gzclearerr; + gzungetc; + zlibCompileFlags; +} ZLIB_1.2.0; + +ZLIB_1.2.0.8 { + deflatePrime; +} ZLIB_1.2.0.2; + +ZLIB_1.2.2 { + adler32_combine; + crc32_combine; + deflateSetHeader; + inflateGetHeader; +} ZLIB_1.2.0.8; + +ZLIB_1.2.2.3 { + deflateTune; + gzdirect; +} ZLIB_1.2.2; + +ZLIB_1.2.2.4 { + inflatePrime; +} ZLIB_1.2.2.3; + +ZLIB_1.2.3.3 { + adler32_combine64; + crc32_combine64; + gzopen64; + gzseek64; + gztell64; + inflateUndermine; +} ZLIB_1.2.2.4; + +ZLIB_1.2.3.4 { + inflateReset2; + inflateMark; +} ZLIB_1.2.3.3; + +ZLIB_1.2.3.5 { + gzbuffer; + gzoffset; + gzoffset64; + gzclose_r; + gzclose_w; +} ZLIB_1.2.3.4; + +ZLIB_1.2.5.1 { + deflatePending; +} ZLIB_1.2.3.5; + +ZLIB_1.2.5.2 { + deflateResetKeep; + gzgetc_; + inflateResetKeep; +} ZLIB_1.2.5.1; + +ZLIB_1.2.7.1 { + inflateGetDictionary; + gzvprintf; +} ZLIB_1.2.5.2; diff --git a/Modules/zlib/zutil.c b/Modules/zlib/zutil.c index a76c6b0..23d2ebe 100644 --- a/Modules/zlib/zutil.c +++ b/Modules/zlib/zutil.c @@ -1,5 +1,5 @@ /* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2017 Jean-loup Gailly + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -10,18 +10,21 @@ # include "gzguts.h" #endif +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif + z_const char * const z_errmsg[10] = { - (z_const char *)"need dictionary", /* Z_NEED_DICT 2 */ - (z_const char *)"stream end", /* Z_STREAM_END 1 */ - (z_const char *)"", /* Z_OK 0 */ - (z_const char *)"file error", /* Z_ERRNO (-1) */ - (z_const char *)"stream error", /* Z_STREAM_ERROR (-2) */ - (z_const char *)"data error", /* Z_DATA_ERROR (-3) */ - (z_const char *)"insufficient memory", /* Z_MEM_ERROR (-4) */ - (z_const char *)"buffer error", /* Z_BUF_ERROR (-5) */ - (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */ - (z_const char *)"" -}; +"need dictionary", /* Z_NEED_DICT 2 */ +"stream end", /* Z_STREAM_END 1 */ +"", /* Z_OK 0 */ +"file error", /* Z_ERRNO (-1) */ +"stream error", /* Z_STREAM_ERROR (-2) */ +"data error", /* Z_DATA_ERROR (-3) */ +"insufficient memory", /* Z_MEM_ERROR (-4) */ +"buffer error", /* Z_BUF_ERROR (-5) */ +"incompatible version",/* Z_VERSION_ERROR (-6) */ +""}; const char * ZEXPORT zlibVersion() @@ -58,7 +61,7 @@ uLong ZEXPORT zlibCompileFlags() case 8: flags += 2 << 6; break; default: flags += 3 << 6; } -#ifdef ZLIB_DEBUG +#ifdef DEBUG flags += 1 << 8; #endif #if defined(ASMV) || defined(ASMINF) @@ -112,8 +115,8 @@ uLong ZEXPORT zlibCompileFlags() return flags; } -#ifdef ZLIB_DEBUG -#include +#ifdef DEBUG + # ifndef verbose # define verbose 0 # endif @@ -216,11 +219,9 @@ local ptr_table table[MAX_PTR]; voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) { - voidpf buf; + voidpf buf = opaque; /* just to make some compilers happy */ ulg bsize = (ulg)items*size; - (void)opaque; - /* If we allocate less than 65520 bytes, we assume that farmalloc * will return a usable pointer which doesn't have to be normalized. */ @@ -243,9 +244,6 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { int n; - - (void)opaque; - if (*(ush*)&ptr != 0) { /* object < 64K */ farfree(ptr); return; @@ -261,6 +259,7 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) next_ptr--; return; } + ptr = opaque; /* just to make some compilers happy */ Assert(0, "zcfree: ptr not found"); } @@ -279,13 +278,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) { - (void)opaque; + if (opaque) opaque = 0; /* to make compiler happy */ return _halloc((long)items, size); } void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) { - (void)opaque; + if (opaque) opaque = 0; /* to make compiler happy */ _hfree(ptr); } @@ -307,7 +306,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) unsigned items; unsigned size; { - (void)opaque; + if (opaque) items += size - size; /* make compiler happy */ return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : (voidpf)calloc(items, size); } @@ -316,8 +315,8 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) voidpf opaque; voidpf ptr; { - (void)opaque; free(ptr); + if (opaque) return; /* make compiler happy */ } #endif /* MY_ZCALLOC */ diff --git a/Modules/zlib/zutil.h b/Modules/zlib/zutil.h index b079ea6..24ab06b 100644 --- a/Modules/zlib/zutil.h +++ b/Modules/zlib/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -36,9 +36,7 @@ #ifndef local # define local static #endif -/* since "static" is used to mean two completely different things in C, we - define "local" for the non-static meaning of "static", for readability - (compile with -Dlocal if your debugger can't find static symbols) */ +/* compile with -Dlocal if your debugger can't find static symbols */ typedef unsigned char uch; typedef uch FAR uchf; @@ -100,38 +98,28 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif #ifdef AMIGA -# define OS_CODE 1 +# define OS_CODE 0x01 #endif #if defined(VAXC) || defined(VMS) -# define OS_CODE 2 +# define OS_CODE 0x02 # define F_OPEN(name, mode) \ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") #endif -#ifdef __370__ -# if __TARGET_LIB__ < 0x20000000 -# define OS_CODE 4 -# elif __TARGET_LIB__ < 0x40000000 -# define OS_CODE 11 -# else -# define OS_CODE 8 -# endif -#endif - #if defined(ATARI) || defined(atarist) -# define OS_CODE 5 +# define OS_CODE 0x05 #endif #ifdef OS2 -# define OS_CODE 6 +# define OS_CODE 0x06 # if defined(M_I86) && !defined(Z_SOLO) # include # endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 7 +# define OS_CODE 0x07 # ifndef Z_SOLO # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os # include /* for fdopen */ @@ -143,24 +131,18 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif #endif -#ifdef __acorn -# define OS_CODE 13 +#ifdef TOPS20 +# define OS_CODE 0x0a #endif -#if defined(WIN32) && !defined(__CYGWIN__) -# define OS_CODE 10 -#endif - -#ifdef _BEOS_ -# define OS_CODE 16 -#endif - -#ifdef __TOS_OS400__ -# define OS_CODE 18 +#ifdef WIN32 +# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ +# define OS_CODE 0x0b +# endif #endif -#ifdef __APPLE__ -# define OS_CODE 19 +#ifdef __50SERIES /* Prime/PRIMOS */ +# define OS_CODE 0x0f #endif #if defined(_BEOS_) || defined(RISCOS) @@ -195,7 +177,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* common defaults */ #ifndef OS_CODE -# define OS_CODE 3 /* assume Unix */ +# define OS_CODE 0x03 /* assume Unix */ #endif #ifndef F_OPEN @@ -234,7 +216,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* Diagnostic functions */ -#ifdef ZLIB_DEBUG +#ifdef DEBUG # include extern int ZLIB_INTERNAL z_verbose; extern void ZLIB_INTERNAL z_error OF((char *m)); diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index fccb616..cfe7f88 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -57,7 +57,7 @@ typedef struct } compobject; static void -zlib_error(z_stream zst, int err, char *msg) +zlib_error(z_stream zst, int err, const char *msg) { const char *zmsg = Z_NULL; /* In case of a version mismatch, zst.msg won't be initialized. @@ -199,18 +199,18 @@ arrange_output_buffer(z_stream *zst, PyObject **buffer, Py_ssize_t length) /*[clinic input] zlib.compress - bytes: Py_buffer + data: Py_buffer Binary data to be compressed. - level: int(c_default="Z_DEFAULT_COMPRESSION") = Z_DEFAULT_COMPRESSION - Compression level, in 0-9. / + level: int(c_default="Z_DEFAULT_COMPRESSION") = Z_DEFAULT_COMPRESSION + Compression level, in 0-9 or -1. Returns a bytes object containing compressed data. [clinic start generated code]*/ static PyObject * -zlib_compress_impl(PyObject *module, Py_buffer *bytes, int level) -/*[clinic end generated code: output=ae64c2c3076321a0 input=be3abe9934bda4b3]*/ +zlib_compress_impl(PyObject *module, Py_buffer *data, int level) +/*[clinic end generated code: output=d80906d73f6294c8 input=638d54b6315dbed3]*/ { PyObject *RetVal = NULL; Byte *ibuf; @@ -218,8 +218,8 @@ zlib_compress_impl(PyObject *module, Py_buffer *bytes, int level) int err, flush; z_stream zst; - ibuf = bytes->buf; - ibuflen = bytes->len; + ibuf = data->buf; + ibuflen = data->len; zst.opaque = NULL; zst.zalloc = PyZlib_Malloc; @@ -318,11 +318,11 @@ zlib.decompress data: Py_buffer Compressed data. + / wbits: int(c_default="MAX_WBITS") = MAX_WBITS The window buffer size and container format. bufsize: ssize_t(c_default="DEF_BUF_SIZE") = DEF_BUF_SIZE The initial output buffer size. - / Returns a bytes object containing the uncompressed data. [clinic start generated code]*/ @@ -330,7 +330,7 @@ Returns a bytes object containing the uncompressed data. static PyObject * zlib_decompress_impl(PyObject *module, Py_buffer *data, int wbits, Py_ssize_t bufsize) -/*[clinic end generated code: output=77c7e35111dc8c42 input=c13dd2c5696cd17f]*/ +/*[clinic end generated code: output=77c7e35111dc8c42 input=21960936208e9a5b]*/ { PyObject *RetVal = NULL; Byte *ibuf; @@ -721,9 +721,9 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err) new_data = PyBytes_FromStringAndSize(NULL, new_size); if (new_data == NULL) return -1; - Py_MEMCPY(PyBytes_AS_STRING(new_data), + memcpy(PyBytes_AS_STRING(new_data), PyBytes_AS_STRING(self->unused_data), old_size); - Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size, + memcpy(PyBytes_AS_STRING(new_data) + old_size, self->zst.next_in, left_size); Py_SETREF(self->unused_data, new_data); self->zst.avail_in = 0; @@ -750,11 +750,11 @@ zlib.Decompress.decompress data: Py_buffer The binary data to decompress. + / max_length: ssize_t = 0 The maximum allowable length of the decompressed data. Unconsumed input data will be stored in the unconsumed_tail attribute. - / Return a bytes object containing the decompressed version of the data. @@ -766,7 +766,7 @@ Call the flush() method to clear these buffers. static PyObject * zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, Py_ssize_t max_length) -/*[clinic end generated code: output=6e5173c74e710352 input=d6de9b53c4566b8a]*/ +/*[clinic end generated code: output=6e5173c74e710352 input=b85a212a012b770a]*/ { int err = Z_OK; Py_ssize_t ibuflen, obuflen = DEF_BUF_SIZE, hard_limit; @@ -1333,7 +1333,7 @@ PyDoc_STRVAR(zlib_module_documentation, "zlib library, which is based on GNU zip.\n" "\n" "adler32(string[, start]) -- Compute an Adler-32 checksum.\n" -"compress(string[, level]) -- Compress string, with compression level in 0-9.\n" +"compress(data[, level]) -- Compress data, with compression level 0-9 or -1.\n" "compressobj([level[, ...]]) -- Return a compressor object.\n" "crc32(string[, start]) -- Compute a CRC-32 checksum.\n" "decompress(string,[wbits],[bufsize]) -- Decompresses a compressed string.\n" diff --git a/Objects/abstract.c b/Objects/abstract.c index 952552e..f9afece 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -32,8 +32,10 @@ PyObject_Type(PyObject *o) { PyObject *v; - if (o == NULL) + if (o == NULL) { return null_error(); + } + v = (PyObject *)o->ob_type; Py_INCREF(v); return v; @@ -137,12 +139,16 @@ PyObject_GetItem(PyObject *o, PyObject *key) { PyMappingMethods *m; - if (o == NULL || key == NULL) + if (o == NULL || key == NULL) { return null_error(); + } m = o->ob_type->tp_as_mapping; - if (m && m->mp_subscript) - return m->mp_subscript(o, key); + if (m && m->mp_subscript) { + PyObject *item = m->mp_subscript(o, key); + assert((item != NULL) ^ (PyErr_Occurred() != NULL)); + return item; + } if (o->ob_type->tp_as_sequence) { if (PyIndex_Check(key)) { @@ -669,13 +675,31 @@ PyObject_Format(PyObject *obj, PyObject *format_spec) PyObject *result = NULL; _Py_IDENTIFIER(__format__); + if (format_spec != NULL && !PyUnicode_Check(format_spec)) { + PyErr_Format(PyExc_SystemError, + "Format specifier must be a string, not %.200s", + Py_TYPE(format_spec)->tp_name); + return NULL; + } + + /* Fast path for common types. */ + if (format_spec == NULL || PyUnicode_GET_LENGTH(format_spec) == 0) { + if (PyUnicode_CheckExact(obj)) { + Py_INCREF(obj); + return obj; + } + if (PyLong_CheckExact(obj)) { + return PyObject_Str(obj); + } + } + /* If no format_spec is provided, use an empty string */ if (format_spec == NULL) { empty = PyUnicode_New(0, 0); format_spec = empty; } - /* Find the (unbound!) __format__ method (a borrowed reference) */ + /* Find the (unbound!) __format__ method */ meth = _PyObject_LookupSpecial(obj, &PyId___format__); if (meth == NULL) { if (!PyErr_Occurred()) @@ -1122,8 +1146,10 @@ PyNumber_Negative(PyObject *o) { PyNumberMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } + m = o->ob_type->tp_as_number; if (m && m->nb_negative) return (*m->nb_negative)(o); @@ -1136,8 +1162,10 @@ PyNumber_Positive(PyObject *o) { PyNumberMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } + m = o->ob_type->tp_as_number; if (m && m->nb_positive) return (*m->nb_positive)(o); @@ -1150,8 +1178,10 @@ PyNumber_Invert(PyObject *o) { PyNumberMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } + m = o->ob_type->tp_as_number; if (m && m->nb_invert) return (*m->nb_invert)(o); @@ -1164,8 +1194,10 @@ PyNumber_Absolute(PyObject *o) { PyNumberMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } + m = o->ob_type->tp_as_number; if (m && m->nb_absolute) return m->nb_absolute(o); @@ -1181,8 +1213,10 @@ PyObject * PyNumber_Index(PyObject *item) { PyObject *result = NULL; - if (item == NULL) + if (item == NULL) { return null_error(); + } + if (PyLong_Check(item)) { Py_INCREF(item); return item; @@ -1265,42 +1299,55 @@ PyNumber_AsSsize_t(PyObject *item, PyObject *err) PyObject * PyNumber_Long(PyObject *o) { + PyObject *result; PyNumberMethods *m; PyObject *trunc_func; Py_buffer view; _Py_IDENTIFIER(__trunc__); - if (o == NULL) + if (o == NULL) { return null_error(); + } + if (PyLong_CheckExact(o)) { Py_INCREF(o); return o; } m = o->ob_type->tp_as_number; if (m && m->nb_int) { /* This should include subclasses of int */ - return (PyObject *)_PyLong_FromNbInt(o); + result = (PyObject *)_PyLong_FromNbInt(o); + if (result != NULL && !PyLong_CheckExact(result)) { + Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); + } + return result; } trunc_func = _PyObject_LookupSpecial(o, &PyId___trunc__); if (trunc_func) { - PyObject *truncated = PyEval_CallObject(trunc_func, NULL); - PyObject *int_instance; + result = PyEval_CallObject(trunc_func, NULL); Py_DECREF(trunc_func); - if (truncated == NULL || PyLong_Check(truncated)) - return truncated; + if (result == NULL || PyLong_CheckExact(result)) { + return result; + } + if (PyLong_Check(result)) { + Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); + return result; + } /* __trunc__ is specified to return an Integral type, but int() needs to return an int. */ - m = truncated->ob_type->tp_as_number; + m = result->ob_type->tp_as_number; if (m == NULL || m->nb_int == NULL) { PyErr_Format( PyExc_TypeError, "__trunc__ returned non-Integral (type %.200s)", - truncated->ob_type->tp_name); - Py_DECREF(truncated); + result->ob_type->tp_name); + Py_DECREF(result); return NULL; } - int_instance = (PyObject *)_PyLong_FromNbInt(truncated); - Py_DECREF(truncated); - return int_instance; + Py_SETREF(result, (PyObject *)_PyLong_FromNbInt(result)); + if (result != NULL && !PyLong_CheckExact(result)) { + Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); + } + return result; } if (PyErr_Occurred()) return NULL; @@ -1322,7 +1369,7 @@ PyNumber_Long(PyObject *o) PyByteArray_GET_SIZE(o), 10); if (PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) == 0) { - PyObject *result, *bytes; + PyObject *bytes; /* Copy to NUL-terminated buffer. */ bytes = PyBytes_FromStringAndSize((const char *)view.buf, view.len); @@ -1346,23 +1393,43 @@ PyNumber_Float(PyObject *o) { PyNumberMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } + + if (PyFloat_CheckExact(o)) { + Py_INCREF(o); + return o; + } m = o->ob_type->tp_as_number; if (m && m->nb_float) { /* This should include subclasses of float */ PyObject *res = m->nb_float(o); - if (res && !PyFloat_Check(res)) { + double val; + if (!res || PyFloat_CheckExact(res)) { + return res; + } + if (!PyFloat_Check(res)) { PyErr_Format(PyExc_TypeError, - "__float__ returned non-float (type %.200s)", - res->ob_type->tp_name); + "%.50s.__float__ returned non-float (type %.50s)", + o->ob_type->tp_name, res->ob_type->tp_name); Py_DECREF(res); return NULL; } - return res; + /* Issue #26983: warn if 'res' not of exact type float. */ + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "%.50s.__float__ returned non-float (type %.50s). " + "The ability to return an instance of a strict subclass of float " + "is deprecated, and may be removed in a future version of Python.", + o->ob_type->tp_name, res->ob_type->tp_name)) { + Py_DECREF(res); + return NULL; + } + val = PyFloat_AS_DOUBLE(res); + Py_DECREF(res); + return PyFloat_FromDouble(val); } if (PyFloat_Check(o)) { /* A float subclass with nb_float == NULL */ - PyFloatObject *po = (PyFloatObject *)o; - return PyFloat_FromDouble(po->ob_fval); + return PyFloat_FromDouble(PyFloat_AS_DOUBLE(o)); } return PyFloat_FromString(o); } @@ -1430,8 +1497,9 @@ PySequence_Concat(PyObject *s, PyObject *o) { PySequenceMethods *m; - if (s == NULL || o == NULL) + if (s == NULL || o == NULL) { return null_error(); + } m = s->ob_type->tp_as_sequence; if (m && m->sq_concat) @@ -1454,8 +1522,9 @@ PySequence_Repeat(PyObject *o, Py_ssize_t count) { PySequenceMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } m = o->ob_type->tp_as_sequence; if (m && m->sq_repeat) @@ -1483,8 +1552,9 @@ PySequence_InPlaceConcat(PyObject *s, PyObject *o) { PySequenceMethods *m; - if (s == NULL || o == NULL) + if (s == NULL || o == NULL) { return null_error(); + } m = s->ob_type->tp_as_sequence; if (m && m->sq_inplace_concat) @@ -1507,8 +1577,9 @@ PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count) { PySequenceMethods *m; - if (o == NULL) + if (o == NULL) { return null_error(); + } m = o->ob_type->tp_as_sequence; if (m && m->sq_inplace_repeat) @@ -1536,16 +1607,19 @@ PySequence_GetItem(PyObject *s, Py_ssize_t i) { PySequenceMethods *m; - if (s == NULL) + if (s == NULL) { return null_error(); + } m = s->ob_type->tp_as_sequence; if (m && m->sq_item) { if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) + if (l < 0) { + assert(PyErr_Occurred()); return NULL; + } i += l; } } @@ -1560,7 +1634,9 @@ PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2) { PyMappingMethods *mp; - if (!s) return null_error(); + if (!s) { + return null_error(); + } mp = s->ob_type->tp_as_mapping; if (mp && mp->mp_subscript) { @@ -1687,8 +1763,9 @@ PySequence_Tuple(PyObject *v) PyObject *result = NULL; Py_ssize_t j; - if (v == NULL) + if (v == NULL) { return null_error(); + } /* Special-case the common tuple and list cases, for efficiency. */ if (PyTuple_CheckExact(v)) { @@ -1768,8 +1845,9 @@ PySequence_List(PyObject *v) PyObject *result; /* result list */ PyObject *rv; /* return value from PyList_Extend */ - if (v == NULL) + if (v == NULL) { return null_error(); + } result = PyList_New(0); if (result == NULL) @@ -1789,8 +1867,9 @@ PySequence_Fast(PyObject *v, const char *m) { PyObject *it; - if (v == NULL) + if (v == NULL) { return null_error(); + } if (PyList_CheckExact(v) || PyTuple_CheckExact(v)) { Py_INCREF(v); @@ -1973,8 +2052,9 @@ PyMapping_GetItemString(PyObject *o, const char *key) { PyObject *okey, *r; - if (key == NULL) + if (key == NULL) { return null_error(); + } okey = PyUnicode_FromString(key); if (okey == NULL) @@ -2118,20 +2198,18 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where) } else { if (err_occurred) { - PyObject *exc, *val, *tb; - PyErr_Fetch(&exc, &val, &tb); - Py_DECREF(result); - if (func) - PyErr_Format(PyExc_SystemError, - "%R returned a result with an error set", - func); - else - PyErr_Format(PyExc_SystemError, - "%s returned a result with an error set", - where); - _PyErr_ChainExceptions(exc, val, tb); + if (func) { + _PyErr_FormatFromCause(PyExc_SystemError, + "%R returned a result with an error set", + func); + } + else { + _PyErr_FormatFromCause(PyExc_SystemError, + "%s returned a result with an error set", + where); + } #ifdef Py_DEBUG /* Ensure that the bug is caught in debug mode */ Py_FatalError("a function returned a result with an error set"); @@ -2143,7 +2221,7 @@ _Py_CheckFunctionResult(PyObject *func, PyObject *result, const char *where) } PyObject * -PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) +PyObject_Call(PyObject *func, PyObject *args, PyObject *kwargs) { ternaryfunc call; PyObject *result; @@ -2152,6 +2230,8 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) because it may clear it (directly or indirectly) and so the caller loses its exception */ assert(!PyErr_Occurred()); + assert(PyTuple_Check(args)); + assert(kwargs == NULL || PyDict_Check(kwargs)); call = func->ob_type->tp_call; if (call == NULL) { @@ -2163,108 +2243,343 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) if (Py_EnterRecursiveCall(" while calling a Python object")) return NULL; - result = (*call)(func, arg, kw); + result = (*call)(func, args, kwargs); Py_LeaveRecursiveCall(); return _Py_CheckFunctionResult(func, result, NULL); } -static PyObject* -call_function_tail(PyObject *callable, PyObject *args) +PyObject* +_PyStack_AsTuple(PyObject **stack, Py_ssize_t nargs) { - PyObject *retval; + PyObject *args; + Py_ssize_t i; - if (args == NULL) + args = PyTuple_New(nargs); + if (args == NULL) { return NULL; + } - if (!PyTuple_Check(args)) { - PyObject *a; + for (i=0; i < nargs; i++) { + PyObject *item = stack[i]; + Py_INCREF(item); + PyTuple_SET_ITEM(args, i, item); + } + + return args; +} + +PyObject * +_PyObject_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, + PyObject *kwargs) +{ + ternaryfunc call; + PyObject *result = NULL; + + /* _PyObject_FastCallDict() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller loses its exception */ + assert(!PyErr_Occurred()); + + assert(func != NULL); + assert(nargs >= 0); + assert(nargs == 0 || args != NULL); + assert(kwargs == NULL || PyDict_Check(kwargs)); + + if (Py_EnterRecursiveCall(" while calling a Python object")) { + return NULL; + } - a = PyTuple_New(1); - if (a == NULL) { - Py_DECREF(args); + if (PyFunction_Check(func)) { + result = _PyFunction_FastCallDict(func, args, nargs, kwargs); + } + else if (PyCFunction_Check(func)) { + result = _PyCFunction_FastCallDict(func, args, nargs, kwargs); + } + else { + PyObject *tuple; + + /* Slow-path: build a temporary tuple */ + call = func->ob_type->tp_call; + if (call == NULL) { + PyErr_Format(PyExc_TypeError, "'%.200s' object is not callable", + func->ob_type->tp_name); + goto exit; + } + + tuple = _PyStack_AsTuple(args, nargs); + if (tuple == NULL) { + goto exit; + } + + result = (*call)(func, tuple, kwargs); + Py_DECREF(tuple); + + result = _Py_CheckFunctionResult(func, result, NULL); + } + +exit: + Py_LeaveRecursiveCall(); + + return result; +} + +/* Positional arguments are obj followed args. */ +PyObject * +_PyObject_Call_Prepend(PyObject *func, + PyObject *obj, PyObject *args, PyObject *kwargs) +{ + PyObject *small_stack[8]; + PyObject **stack; + Py_ssize_t argcount; + PyObject *result; + + assert(PyTuple_Check(args)); + + argcount = PyTuple_GET_SIZE(args); + if (argcount + 1 <= (Py_ssize_t)Py_ARRAY_LENGTH(small_stack)) { + stack = small_stack; + } + else { + stack = PyMem_Malloc((argcount + 1) * sizeof(PyObject *)); + if (stack == NULL) { + PyErr_NoMemory(); return NULL; } - PyTuple_SET_ITEM(a, 0, args); - args = a; } - retval = PyObject_Call(callable, args, NULL); - Py_DECREF(args); + /* use borrowed references */ + stack[0] = obj; + memcpy(&stack[1], + &PyTuple_GET_ITEM(args, 0), + argcount * sizeof(PyObject *)); - return retval; + result = _PyObject_FastCallDict(func, + stack, argcount + 1, + kwargs); + if (stack != small_stack) { + PyMem_Free(stack); + } + return result; +} + +PyObject * +_PyStack_AsDict(PyObject **values, PyObject *kwnames) +{ + Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames); + PyObject *kwdict; + Py_ssize_t i; + + kwdict = PyDict_New(); + if (kwdict == NULL) { + return NULL; + } + + for (i = 0; i < nkwargs; i++) { + PyObject *key = PyTuple_GET_ITEM(kwnames, i); + PyObject *value = *values++; + assert(PyUnicode_CheckExact(key)); + assert(PyDict_GetItem(kwdict, key) == NULL); + if (PyDict_SetItem(kwdict, key, value)) { + Py_DECREF(kwdict); + return NULL; + } + } + return kwdict; +} + +PyObject ** +_PyStack_UnpackDict(PyObject **args, Py_ssize_t nargs, PyObject *kwargs, + PyObject **p_kwnames, PyObject *func) +{ + PyObject **stack, **kwstack; + Py_ssize_t nkwargs; + Py_ssize_t pos, i; + PyObject *key, *value; + PyObject *kwnames; + + assert(nargs >= 0); + assert(kwargs == NULL || PyDict_CheckExact(kwargs)); + + nkwargs = (kwargs != NULL) ? PyDict_Size(kwargs) : 0; + if (!nkwargs) { + *p_kwnames = NULL; + return args; + } + + if ((size_t)nargs > PY_SSIZE_T_MAX / sizeof(stack[0]) - (size_t)nkwargs) { + PyErr_NoMemory(); + return NULL; + } + + stack = PyMem_Malloc((nargs + nkwargs) * sizeof(stack[0])); + if (stack == NULL) { + PyErr_NoMemory(); + return NULL; + } + + kwnames = PyTuple_New(nkwargs); + if (kwnames == NULL) { + PyMem_Free(stack); + return NULL; + } + + /* Copy position arguments (borrowed references) */ + memcpy(stack, args, nargs * sizeof(stack[0])); + + kwstack = stack + nargs; + pos = i = 0; + /* This loop doesn't support lookup function mutating the dictionary + to change its size. It's a deliberate choice for speed, this function is + called in the performance critical hot code. */ + while (PyDict_Next(kwargs, &pos, &key, &value)) { + Py_INCREF(key); + PyTuple_SET_ITEM(kwnames, i, key); + /* The stack contains borrowed references */ + kwstack[i] = value; + i++; + } + + *p_kwnames = kwnames; + return stack; +} + +PyObject * +_PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs, + PyObject *kwnames) +{ + PyObject *kwdict, *result; + Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); + + assert(nargs >= 0); + assert(kwnames == NULL || PyTuple_CheckExact(kwnames)); + assert((nargs == 0 && nkwargs == 0) || stack != NULL); + /* kwnames must only contains str strings, no subclass, and all keys must + be unique: these are implemented in Python/ceval.c and + _PyArg_ParseStack(). */ + + if (PyFunction_Check(func)) { + return _PyFunction_FastCallKeywords(func, stack, nargs, kwnames); + } + + if (PyCFunction_Check(func)) { + return _PyCFunction_FastCallKeywords(func, stack, nargs, kwnames); + } + + if (nkwargs > 0) { + kwdict = _PyStack_AsDict(stack + nargs, kwnames); + if (kwdict == NULL) { + return NULL; + } + } + else { + kwdict = NULL; + } + + result = _PyObject_FastCallDict(func, stack, nargs, kwdict); + Py_XDECREF(kwdict); + return result; +} + +static PyObject* +call_function_tail(PyObject *callable, PyObject *args) +{ + PyObject *result; + + assert(args != NULL); + + if (!PyTuple_Check(args)) { + result = _PyObject_CallArg1(callable, args); + } + else { + result = PyObject_Call(callable, args, NULL); + } + + return result; } PyObject * PyObject_CallFunction(PyObject *callable, const char *format, ...) { va_list va; - PyObject *args; + PyObject *args, *result; - if (callable == NULL) + if (callable == NULL) { return null_error(); + } - if (format && *format) { - va_start(va, format); - args = Py_VaBuildValue(format, va); - va_end(va); + if (!format || !*format) { + return _PyObject_CallNoArg(callable); } - else - args = PyTuple_New(0); - if (args == NULL) + + va_start(va, format); + args = Py_VaBuildValue(format, va); + va_end(va); + if (args == NULL) { return NULL; + } - return call_function_tail(callable, args); + result = call_function_tail(callable, args); + Py_DECREF(args); + return result; } PyObject * _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...) { va_list va; - PyObject *args; + PyObject *args, *result; - if (callable == NULL) + if (callable == NULL) { return null_error(); + } - if (format && *format) { - va_start(va, format); - args = _Py_VaBuildValue_SizeT(format, va); - va_end(va); + if (!format || !*format) { + return _PyObject_CallNoArg(callable); } - else - args = PyTuple_New(0); - return call_function_tail(callable, args); + va_start(va, format); + args = _Py_VaBuildValue_SizeT(format, va); + va_end(va); + if (args == NULL) { + return NULL; + } + + result = call_function_tail(callable, args); + Py_DECREF(args); + return result; } static PyObject* callmethod(PyObject* func, const char *format, va_list va, int is_size_t) { - PyObject *retval = NULL; - PyObject *args; + PyObject *args, *result; + + assert(func != NULL); if (!PyCallable_Check(func)) { type_error("attribute of type '%.200s' is not callable", func); - goto exit; + return NULL; } - if (format && *format) { - if (is_size_t) - args = _Py_VaBuildValue_SizeT(format, va); - else - args = Py_VaBuildValue(format, va); + if (!format || !*format) { + return _PyObject_CallNoArg(func); } - else - args = PyTuple_New(0); - retval = call_function_tail(func, args); - - exit: - /* args gets consumed in call_function_tail */ - Py_XDECREF(func); + if (is_size_t) { + args = _Py_VaBuildValue_SizeT(format, va); + } + else { + args = Py_VaBuildValue(format, va); + } + if (args == NULL) { + return NULL; + } - return retval; + result = call_function_tail(func, args); + Py_DECREF(args); + return result; } PyObject * @@ -2274,8 +2589,9 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) PyObject *func = NULL; PyObject *retval = NULL; - if (o == NULL || name == NULL) + if (o == NULL || name == NULL) { return null_error(); + } func = PyObject_GetAttrString(o, name); if (func == NULL) @@ -2284,6 +2600,7 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) va_start(va, format); retval = callmethod(func, format, va, 0); va_end(va); + Py_DECREF(func); return retval; } @@ -2295,8 +2612,9 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, PyObject *func = NULL; PyObject *retval = NULL; - if (o == NULL || name == NULL) + if (o == NULL || name == NULL) { return null_error(); + } func = _PyObject_GetAttrId(o, name); if (func == NULL) @@ -2305,6 +2623,7 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, va_start(va, format); retval = callmethod(func, format, va, 0); va_end(va); + Py_DECREF(func); return retval; } @@ -2316,8 +2635,9 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name, PyObject *func = NULL; PyObject *retval; - if (o == NULL || name == NULL) + if (o == NULL || name == NULL) { return null_error(); + } func = PyObject_GetAttrString(o, name); if (func == NULL) @@ -2325,6 +2645,7 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name, va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); + Py_DECREF(func); return retval; } @@ -2336,8 +2657,9 @@ _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, PyObject *func = NULL; PyObject *retval; - if (o == NULL || name == NULL) + if (o == NULL || name == NULL) { return null_error(); + } func = _PyObject_GetAttrId(o, name); if (func == NULL) { @@ -2346,39 +2668,63 @@ _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); + Py_DECREF(func); return retval; } -static PyObject * -objargs_mktuple(va_list va) +static PyObject ** +objargs_mkstack(PyObject **small_stack, Py_ssize_t small_stack_size, + va_list va, Py_ssize_t *p_nargs) { - int i, n = 0; + Py_ssize_t i, n; va_list countva; - PyObject *result, *tmp; + PyObject **stack; - Py_VA_COPY(countva, va); + /* Count the number of arguments */ + va_copy(countva, va); - while (((PyObject *)va_arg(countva, PyObject *)) != NULL) - ++n; - result = PyTuple_New(n); - if (result != NULL && n > 0) { - for (i = 0; i < n; ++i) { - tmp = (PyObject *)va_arg(va, PyObject *); - PyTuple_SET_ITEM(result, i, tmp); - Py_INCREF(tmp); + n = 0; + while (1) { + PyObject *arg = va_arg(countva, PyObject *); + if (arg == NULL) { + break; } + n++; } - return result; + *p_nargs = n; + + /* Copy arguments */ + if (n <= small_stack_size) { + stack = small_stack; + } + else { + stack = PyMem_Malloc(n * sizeof(stack[0])); + if (stack == NULL) { + va_end(countva); + PyErr_NoMemory(); + return NULL; + } + } + + for (i = 0; i < n; ++i) { + stack[i] = va_arg(va, PyObject *); + } + va_end(countva); + return stack; } PyObject * PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) { - PyObject *args, *tmp; + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *result; va_list vargs; - if (callable == NULL || name == NULL) + if (callable == NULL || name == NULL) { return null_error(); + } callable = PyObject_GetAttr(callable, name); if (callable == NULL) @@ -2386,28 +2732,36 @@ PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) /* count the args */ va_start(vargs, name); - args = objargs_mktuple(vargs); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); va_end(vargs); - if (args == NULL) { + if (stack == NULL) { Py_DECREF(callable); return NULL; } - tmp = PyObject_Call(callable, args, NULL); - Py_DECREF(args); + + result = _PyObject_FastCall(callable, stack, nargs); Py_DECREF(callable); + if (stack != small_stack) { + PyMem_Free(stack); + } - return tmp; + return result; } PyObject * _PyObject_CallMethodIdObjArgs(PyObject *callable, struct _Py_Identifier *name, ...) { - PyObject *args, *tmp; + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *result; va_list vargs; - if (callable == NULL || name == NULL) + if (callable == NULL || name == NULL) { return null_error(); + } callable = _PyObject_GetAttrId(callable, name); if (callable == NULL) @@ -2415,38 +2769,51 @@ _PyObject_CallMethodIdObjArgs(PyObject *callable, /* count the args */ va_start(vargs, name); - args = objargs_mktuple(vargs); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); va_end(vargs); - if (args == NULL) { + if (stack == NULL) { Py_DECREF(callable); return NULL; } - tmp = PyObject_Call(callable, args, NULL); - Py_DECREF(args); + + result = _PyObject_FastCall(callable, stack, nargs); Py_DECREF(callable); + if (stack != small_stack) { + PyMem_Free(stack); + } - return tmp; + return result; } PyObject * PyObject_CallFunctionObjArgs(PyObject *callable, ...) { - PyObject *args, *tmp; + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *result; va_list vargs; - if (callable == NULL) + if (callable == NULL) { return null_error(); + } /* count the args */ va_start(vargs, callable); - args = objargs_mktuple(vargs); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); va_end(vargs); - if (args == NULL) + if (stack == NULL) { return NULL; - tmp = PyObject_Call(callable, args, NULL); - Py_DECREF(args); + } + + result = _PyObject_FastCall(callable, stack, nargs); + if (stack != small_stack) { + PyMem_Free(stack); + } - return tmp; + return result; } @@ -2825,8 +3192,8 @@ _PySequence_BytesToCharpArray(PyObject* self) array[i] = NULL; goto fail; } - /* check for embedded null bytes */ - if (PyBytes_AsStringAndSize(item, &data, NULL) < 0) { + data = PyBytes_AsString(item); + if (data == NULL) { /* NULL terminate before freeing. */ array[i] = NULL; goto fail; diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 85c6d1b..c6d0707 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -254,7 +254,7 @@ PyByteArray_Concat(PyObject *a, PyObject *b) if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 || PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) { PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s", - Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name); + Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name); goto done; } @@ -278,33 +278,6 @@ PyByteArray_Concat(PyObject *a, PyObject *b) return (PyObject *)result; } -static PyObject * -bytearray_format(PyByteArrayObject *self, PyObject *args) -{ - PyObject *bytes_in, *bytes_out, *res; - char *bytestring; - Py_ssize_t bytesize; - - if (self == NULL || !PyByteArray_Check(self) || args == NULL) { - PyErr_BadInternalCall(); - return NULL; - } - bytestring = PyByteArray_AS_STRING(self); - bytesize = PyByteArray_GET_SIZE(self); - bytes_in = PyBytes_FromStringAndSize(bytestring, bytesize); - if (bytes_in == NULL) - return NULL; - bytes_out = _PyBytes_Format(bytes_in, args); - Py_DECREF(bytes_in); - if (bytes_out == NULL) - return NULL; - res = PyByteArray_FromObject(bytes_out); - Py_DECREF(bytes_out); - if (res == NULL) - return NULL; - return res; -} - /* Functions stuffed into the type object */ static Py_ssize_t @@ -427,11 +400,11 @@ bytearray_subscript(PyByteArrayObject *self, PyObject *index) } else if (PySlice_Check(index)) { Py_ssize_t start, stop, step, slicelength, cur, i; - if (PySlice_Unpack(index, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(index, + PyByteArray_GET_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(PyByteArray_GET_SIZE(self), - &start, &stop, step); if (slicelength <= 0) return PyByteArray_FromStringAndSize("", 0); @@ -657,11 +630,11 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu } } else if (PySlice_Check(index)) { - if (PySlice_Unpack(index, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(index, + PyByteArray_GET_SIZE(self), + &start, &stop, &step, &slicelen) < 0) { return -1; } - slicelen = PySlice_AdjustIndices(PyByteArray_GET_SIZE(self), &start, - &stop, step); } else { PyErr_Format(PyExc_TypeError, @@ -822,17 +795,15 @@ bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds) } /* Is it an int? */ - count = PyNumber_AsSsize_t(arg, PyExc_OverflowError); - if (count == -1 && PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_OverflowError)) + if (PyIndex_Check(arg)) { + count = PyNumber_AsSsize_t(arg, PyExc_OverflowError); + if (count == -1 && PyErr_Occurred()) { return -1; - PyErr_Clear(); - } - else if (count < 0) { - PyErr_SetString(PyExc_ValueError, "negative count"); - return -1; - } - else { + } + if (count < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return -1; + } if (count > 0) { if (PyByteArray_Resize((PyObject *)self, count)) return -1; @@ -1121,161 +1092,27 @@ bytearray_dealloc(PyByteArrayObject *self) #include "stringlib/transmogrify.h" -/* The following Py_LOCAL_INLINE and Py_LOCAL functions -were copied from the old char* style string object. */ - -/* helper macro to fixup start/end slice values */ -#define ADJUST_INDICES(start, end, len) \ - if (end > len) \ - end = len; \ - else if (end < 0) { \ - end += len; \ - if (end < 0) \ - end = 0; \ - } \ - if (start < 0) { \ - start += len; \ - if (start < 0) \ - start = 0; \ - } - -Py_LOCAL_INLINE(Py_ssize_t) -bytearray_find_internal(PyByteArrayObject *self, PyObject *args, int dir) -{ - PyObject *subobj; - char byte; - Py_buffer subbuf; - const char *sub; - Py_ssize_t len, sub_len; - Py_ssize_t start=0, end=PY_SSIZE_T_MAX; - Py_ssize_t res; - - if (!stringlib_parse_args_finds_byte("find/rfind/index/rindex", - args, &subobj, &byte, &start, &end)) - return -2; - - if (subobj) { - if (PyObject_GetBuffer(subobj, &subbuf, PyBUF_SIMPLE) != 0) - return -2; - - sub = subbuf.buf; - sub_len = subbuf.len; - } - else { - sub = &byte; - sub_len = 1; - } - len = PyByteArray_GET_SIZE(self); - - ADJUST_INDICES(start, end, len); - if (end - start < sub_len) - res = -1; - else if (sub_len == 1 -#ifndef HAVE_MEMRCHR - && dir > 0 -#endif - ) { - unsigned char needle = *sub; - int mode = (dir > 0) ? FAST_SEARCH : FAST_RSEARCH; - res = stringlib_fastsearch_memchr_1char( - PyByteArray_AS_STRING(self) + start, end - start, - needle, needle, mode); - if (res >= 0) - res += start; - } - else { - if (dir > 0) - res = stringlib_find_slice( - PyByteArray_AS_STRING(self), len, - sub, sub_len, start, end); - else - res = stringlib_rfind_slice( - PyByteArray_AS_STRING(self), len, - sub, sub_len, start, end); - } - - if (subobj) - PyBuffer_Release(&subbuf); - - return res; -} - -PyDoc_STRVAR(find__doc__, -"B.find(sub[, start[, end]]) -> int\n\ -\n\ -Return the lowest index in B where subsection sub is found,\n\ -such that sub is contained within B[start,end]. Optional\n\ -arguments start and end are interpreted as in slice notation.\n\ -\n\ -Return -1 on failure."); - static PyObject * bytearray_find(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t result = bytearray_find_internal(self, args, +1); - if (result == -2) - return NULL; - return PyLong_FromSsize_t(result); + return _Py_bytes_find(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } -PyDoc_STRVAR(count__doc__, -"B.count(sub[, start[, end]]) -> int\n\ -\n\ -Return the number of non-overlapping occurrences of subsection sub in\n\ -bytes B[start:end]. Optional arguments start and end are interpreted\n\ -as in slice notation."); - static PyObject * bytearray_count(PyByteArrayObject *self, PyObject *args) { - PyObject *sub_obj; - const char *str = PyByteArray_AS_STRING(self), *sub; - Py_ssize_t sub_len; - char byte; - Py_ssize_t start = 0, end = PY_SSIZE_T_MAX; - - Py_buffer vsub; - PyObject *count_obj; - - if (!stringlib_parse_args_finds_byte("count", args, &sub_obj, &byte, - &start, &end)) - return NULL; - - if (sub_obj) { - if (PyObject_GetBuffer(sub_obj, &vsub, PyBUF_SIMPLE) != 0) - return NULL; - - sub = vsub.buf; - sub_len = vsub.len; - } - else { - sub = &byte; - sub_len = 1; - } - - ADJUST_INDICES(start, end, PyByteArray_GET_SIZE(self)); - - count_obj = PyLong_FromSsize_t( - stringlib_count(str + start, end - start, sub, sub_len, PY_SSIZE_T_MAX) - ); - - if (sub_obj) - PyBuffer_Release(&vsub); - - return count_obj; + return _Py_bytes_count(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } /*[clinic input] bytearray.clear - self: self(type="PyByteArrayObject *") - Remove all items from the bytearray. [clinic start generated code]*/ static PyObject * bytearray_clear_impl(PyByteArrayObject *self) -/*[clinic end generated code: output=85c2fe6aede0956c input=e524fd330abcdc18]*/ +/*[clinic end generated code: output=85c2fe6aede0956c input=ed6edae9de447ac4]*/ { if (PyByteArray_Resize((PyObject *)self, 0) < 0) return NULL; @@ -1285,253 +1122,72 @@ bytearray_clear_impl(PyByteArrayObject *self) /*[clinic input] bytearray.copy - self: self(type="PyByteArrayObject *") - Return a copy of B. [clinic start generated code]*/ static PyObject * bytearray_copy_impl(PyByteArrayObject *self) -/*[clinic end generated code: output=68cfbcfed484c132 input=6d5d2975aa0f33f3]*/ +/*[clinic end generated code: output=68cfbcfed484c132 input=6597b0c01bccaa9e]*/ { return PyByteArray_FromStringAndSize(PyByteArray_AS_STRING((PyObject *)self), PyByteArray_GET_SIZE(self)); } -PyDoc_STRVAR(index__doc__, -"B.index(sub[, start[, end]]) -> int\n\ -\n\ -Like B.find() but raise ValueError when the subsection is not found."); - static PyObject * bytearray_index(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t result = bytearray_find_internal(self, args, +1); - if (result == -2) - return NULL; - if (result == -1) { - PyErr_SetString(PyExc_ValueError, - "subsection not found"); - return NULL; - } - return PyLong_FromSsize_t(result); + return _Py_bytes_index(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } - -PyDoc_STRVAR(rfind__doc__, -"B.rfind(sub[, start[, end]]) -> int\n\ -\n\ -Return the highest index in B where subsection sub is found,\n\ -such that sub is contained within B[start,end]. Optional\n\ -arguments start and end are interpreted as in slice notation.\n\ -\n\ -Return -1 on failure."); - static PyObject * bytearray_rfind(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t result = bytearray_find_internal(self, args, -1); - if (result == -2) - return NULL; - return PyLong_FromSsize_t(result); + return _Py_bytes_rfind(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } - -PyDoc_STRVAR(rindex__doc__, -"B.rindex(sub[, start[, end]]) -> int\n\ -\n\ -Like B.rfind() but raise ValueError when the subsection is not found."); - static PyObject * bytearray_rindex(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t result = bytearray_find_internal(self, args, -1); - if (result == -2) - return NULL; - if (result == -1) { - PyErr_SetString(PyExc_ValueError, - "subsection not found"); - return NULL; - } - return PyLong_FromSsize_t(result); + return _Py_bytes_rindex(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } - static int bytearray_contains(PyObject *self, PyObject *arg) { - Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError); - if (ival == -1 && PyErr_Occurred()) { - Py_buffer varg; - Py_ssize_t pos; - PyErr_Clear(); - if (PyObject_GetBuffer(arg, &varg, PyBUF_SIMPLE) != 0) - return -1; - pos = stringlib_find(PyByteArray_AS_STRING(self), Py_SIZE(self), - varg.buf, varg.len, 0); - PyBuffer_Release(&varg); - return pos >= 0; - } - if (ival < 0 || ival >= 256) { - PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)"); - return -1; - } - - return memchr(PyByteArray_AS_STRING(self), (int) ival, Py_SIZE(self)) != NULL; + return _Py_bytes_contains(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), arg); } - -/* Matches the end (direction >= 0) or start (direction < 0) of self - * against substr, using the start and end arguments. Returns - * -1 on error, 0 if not found and 1 if found. - */ -Py_LOCAL(int) -_bytearray_tailmatch(PyByteArrayObject *self, PyObject *substr, Py_ssize_t start, - Py_ssize_t end, int direction) -{ - Py_ssize_t len = PyByteArray_GET_SIZE(self); - const char* str; - Py_buffer vsubstr; - int rv = 0; - - str = PyByteArray_AS_STRING(self); - - if (PyObject_GetBuffer(substr, &vsubstr, PyBUF_SIMPLE) != 0) - return -1; - - ADJUST_INDICES(start, end, len); - - if (direction < 0) { - /* startswith */ - if (start+vsubstr.len > len) { - goto done; - } - } else { - /* endswith */ - if (end-start < vsubstr.len || start > len) { - goto done; - } - - if (end-vsubstr.len > start) - start = end - vsubstr.len; - } - if (end-start >= vsubstr.len) - rv = ! memcmp(str+start, vsubstr.buf, vsubstr.len); - -done: - PyBuffer_Release(&vsubstr); - return rv; -} - - -PyDoc_STRVAR(startswith__doc__, -"B.startswith(prefix[, start[, end]]) -> bool\n\ -\n\ -Return True if B starts with the specified prefix, False otherwise.\n\ -With optional start, test B beginning at that position.\n\ -With optional end, stop comparing B at that position.\n\ -prefix can also be a tuple of bytes to try."); - static PyObject * bytearray_startswith(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t start = 0; - Py_ssize_t end = PY_SSIZE_T_MAX; - PyObject *subobj; - int result; - - if (!stringlib_parse_args_finds("startswith", args, &subobj, &start, &end)) - return NULL; - if (PyTuple_Check(subobj)) { - Py_ssize_t i; - for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - result = _bytearray_tailmatch(self, - PyTuple_GET_ITEM(subobj, i), - start, end, -1); - if (result == -1) - return NULL; - else if (result) { - Py_RETURN_TRUE; - } - } - Py_RETURN_FALSE; - } - result = _bytearray_tailmatch(self, subobj, start, end, -1); - if (result == -1) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "startswith first arg must be bytes " - "or a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name); - return NULL; - } - else - return PyBool_FromLong(result); + return _Py_bytes_startswith(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } -PyDoc_STRVAR(endswith__doc__, -"B.endswith(suffix[, start[, end]]) -> bool\n\ -\n\ -Return True if B ends with the specified suffix, False otherwise.\n\ -With optional start, test B beginning at that position.\n\ -With optional end, stop comparing B at that position.\n\ -suffix can also be a tuple of bytes to try."); - static PyObject * bytearray_endswith(PyByteArrayObject *self, PyObject *args) { - Py_ssize_t start = 0; - Py_ssize_t end = PY_SSIZE_T_MAX; - PyObject *subobj; - int result; - - if (!stringlib_parse_args_finds("endswith", args, &subobj, &start, &end)) - return NULL; - if (PyTuple_Check(subobj)) { - Py_ssize_t i; - for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - result = _bytearray_tailmatch(self, - PyTuple_GET_ITEM(subobj, i), - start, end, +1); - if (result == -1) - return NULL; - else if (result) { - Py_RETURN_TRUE; - } - } - Py_RETURN_FALSE; - } - result = _bytearray_tailmatch(self, subobj, start, end, +1); - if (result == -1) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "endswith first arg must be bytes or " - "a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name); - return NULL; - } - else - return PyBool_FromLong(result); + return _Py_bytes_endswith(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args); } /*[clinic input] bytearray.translate - self: self(type="PyByteArrayObject *") table: object Translation table, which must be a bytes object of length 256. - [ - deletechars: object - ] / + delete as deletechars: object(c_default="NULL") = b'' Return a copy with each character mapped by the given translation table. -All characters occurring in the optional argument deletechars are removed. +All characters occurring in the optional argument delete are removed. The remaining characters are mapped through the given translation table. [clinic start generated code]*/ static PyObject * bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, - int group_right_1, PyObject *deletechars) -/*[clinic end generated code: output=2bebc86a9a1ff083 input=b749ad85f4860824]*/ + PyObject *deletechars) +/*[clinic end generated code: output=b6a8f01c2a74e446 input=cfff956d4d127a9b]*/ { char *input, *output; const char *table_chars; @@ -1574,7 +1230,7 @@ bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, result = PyByteArray_FromStringAndSize((char *)NULL, inlen); if (result == NULL) goto done; - output_start = output = PyByteArray_AsString(result); + output_start = output = PyByteArray_AS_STRING(result); input = PyByteArray_AS_STRING(input_obj); if (vdel.len == 0 && table_chars != NULL) { @@ -1600,8 +1256,7 @@ bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, for (i = inlen; --i >= 0; ) { c = Py_CHARMASK(*input++); if (trans_table[c] != -1) - if (Py_CHARMASK(*output++ = (char)trans_table[c]) == c) - continue; + *output++ = (char)trans_table[c]; } /* Fix the size of the resulting string */ if (inlen > 0) @@ -1644,493 +1299,6 @@ bytearray_maketrans_impl(Py_buffer *frm, Py_buffer *to) } -/* find and count characters and substrings */ - -#define findchar(target, target_len, c) \ - ((char *)memchr((const void *)(target), c, target_len)) - - -/* Bytes ops must return a string, create a copy */ -Py_LOCAL(PyByteArrayObject *) -return_self(PyByteArrayObject *self) -{ - /* always return a new bytearray */ - return (PyByteArrayObject *)PyByteArray_FromStringAndSize( - PyByteArray_AS_STRING(self), - PyByteArray_GET_SIZE(self)); -} - -Py_LOCAL_INLINE(Py_ssize_t) -countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount) -{ - Py_ssize_t count=0; - const char *start=target; - const char *end=target+target_len; - - while ( (start=findchar(start, end-start, c)) != NULL ) { - count++; - if (count >= maxcount) - break; - start += 1; - } - return count; -} - - -/* Algorithms for different cases of string replacement */ - -/* len(self)>=1, from="", len(to)>=1, maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_interleave(PyByteArrayObject *self, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - Py_ssize_t self_len, result_len; - Py_ssize_t count, i; - PyByteArrayObject *result; - - self_len = PyByteArray_GET_SIZE(self); - - /* 1 at the end plus 1 after every character; - count = min(maxcount, self_len + 1) */ - if (maxcount <= self_len) - count = maxcount; - else - /* Can't overflow: self_len + 1 <= maxcount <= PY_SSIZE_T_MAX. */ - count = self_len + 1; - - /* Check for overflow */ - /* result_len = count * to_len + self_len; */ - assert(count > 0); - if (to_len > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, - "replace string is too long"); - return NULL; - } - result_len = count * to_len + self_len; - - if (! (result = (PyByteArrayObject *) - PyByteArray_FromStringAndSize(NULL, result_len)) ) - return NULL; - - self_s = PyByteArray_AS_STRING(self); - result_s = PyByteArray_AS_STRING(result); - - /* TODO: special case single character, which doesn't need memcpy */ - - /* Lay the first one down (guaranteed this will occur) */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - count -= 1; - - for (i=0; i=1, len(from)==1, to="", maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_delete_single_character(PyByteArrayObject *self, - char from_c, Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count; - PyByteArrayObject *result; - - self_len = PyByteArray_GET_SIZE(self); - self_s = PyByteArray_AS_STRING(self); - - count = countchar(self_s, self_len, from_c, maxcount); - if (count == 0) { - return return_self(self); - } - - result_len = self_len - count; /* from_len == 1 */ - assert(result_len>=0); - - if ( (result = (PyByteArrayObject *) - PyByteArray_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - start = next+1; - } - Py_MEMCPY(result_s, start, end-start); - - return result; -} - -/* len(self)>=1, len(from)>=2, to="", maxcount>=1 */ - -Py_LOCAL(PyByteArrayObject *) -replace_delete_substring(PyByteArrayObject *self, - const char *from_s, Py_ssize_t from_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count, offset; - PyByteArrayObject *result; - - self_len = PyByteArray_GET_SIZE(self); - self_s = PyByteArray_AS_STRING(self); - - count = stringlib_count(self_s, self_len, - from_s, from_len, - maxcount); - - if (count == 0) { - /* no matches */ - return return_self(self); - } - - result_len = self_len - (count * from_len); - assert (result_len>=0); - - if ( (result = (PyByteArrayObject *) - PyByteArray_FromStringAndSize(NULL, result_len)) == NULL ) - return NULL; - - result_s = PyByteArray_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset == -1) - break; - next = start + offset; - - Py_MEMCPY(result_s, start, next-start); - - result_s += (next-start); - start = next+from_len; - } - Py_MEMCPY(result_s, start, end-start); - return result; -} - -/* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_single_character_in_place(PyByteArrayObject *self, - char from_c, char to_c, - Py_ssize_t maxcount) -{ - char *self_s, *result_s, *start, *end, *next; - Py_ssize_t self_len; - PyByteArrayObject *result; - - /* The result string will be the same size */ - self_s = PyByteArray_AS_STRING(self); - self_len = PyByteArray_GET_SIZE(self); - - next = findchar(self_s, self_len, from_c); - - if (next == NULL) { - /* No matches; return the original bytes */ - return return_self(self); - } - - /* Need to make a new bytes */ - result = (PyByteArrayObject *) PyByteArray_FromStringAndSize(NULL, self_len); - if (result == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - Py_MEMCPY(result_s, self_s, self_len); - - /* change everything in-place, starting with this one */ - start = result_s + (next-self_s); - *start = to_c; - start++; - end = result_s + self_len; - - while (--maxcount > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - *next = to_c; - start = next+1; - } - - return result; -} - -/* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_substring_in_place(PyByteArrayObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *result_s, *start, *end; - char *self_s; - Py_ssize_t self_len, offset; - PyByteArrayObject *result; - - /* The result bytes will be the same size */ - - self_s = PyByteArray_AS_STRING(self); - self_len = PyByteArray_GET_SIZE(self); - - offset = stringlib_find(self_s, self_len, - from_s, from_len, - 0); - if (offset == -1) { - /* No matches; return the original bytes */ - return return_self(self); - } - - /* Need to make a new bytes */ - result = (PyByteArrayObject *) PyByteArray_FromStringAndSize(NULL, self_len); - if (result == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - Py_MEMCPY(result_s, self_s, self_len); - - /* change everything in-place, starting with this one */ - start = result_s + offset; - Py_MEMCPY(start, to_s, from_len); - start += from_len; - end = result_s + self_len; - - while ( --maxcount > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset==-1) - break; - Py_MEMCPY(start+offset, to_s, from_len); - start += offset+from_len; - } - - return result; -} - -/* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_single_character(PyByteArrayObject *self, - char from_c, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count; - PyByteArrayObject *result; - - self_s = PyByteArray_AS_STRING(self); - self_len = PyByteArray_GET_SIZE(self); - - count = countchar(self_s, self_len, from_c, maxcount); - if (count == 0) { - /* no matches, return unchanged */ - return return_self(self); - } - - /* use the difference between current and new, hence the "-1" */ - /* result_len = self_len + count * (to_len-1) */ - assert(count > 0); - if (to_len - 1 > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, "replace bytes is too long"); - return NULL; - } - result_len = self_len + count * (to_len - 1); - - if ( (result = (PyByteArrayObject *) - PyByteArray_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - - if (next == start) { - /* replace with the 'to' */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start += 1; - } else { - /* copy the unchanged old then the 'to' */ - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start = next+1; - } - } - /* Copy the remainder of the remaining bytes */ - Py_MEMCPY(result_s, start, end-start); - - return result; -} - -/* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyByteArrayObject *) -replace_substring(PyByteArrayObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count, offset; - PyByteArrayObject *result; - - self_s = PyByteArray_AS_STRING(self); - self_len = PyByteArray_GET_SIZE(self); - - count = stringlib_count(self_s, self_len, - from_s, from_len, - maxcount); - - if (count == 0) { - /* no matches, return unchanged */ - return return_self(self); - } - - /* Check for overflow */ - /* result_len = self_len + count * (to_len-from_len) */ - assert(count > 0); - if (to_len - from_len > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, "replace bytes is too long"); - return NULL; - } - result_len = self_len + count * (to_len - from_len); - - if ( (result = (PyByteArrayObject *) - PyByteArray_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyByteArray_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset == -1) - break; - next = start+offset; - if (next == start) { - /* replace with the 'to' */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start += from_len; - } else { - /* copy the unchanged old then the 'to' */ - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start = next+from_len; - } - } - /* Copy the remainder of the remaining bytes */ - Py_MEMCPY(result_s, start, end-start); - - return result; -} - - -Py_LOCAL(PyByteArrayObject *) -replace(PyByteArrayObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - if (maxcount < 0) { - maxcount = PY_SSIZE_T_MAX; - } else if (maxcount == 0 || PyByteArray_GET_SIZE(self) == 0) { - /* nothing to do; return the original bytes */ - return return_self(self); - } - - if (maxcount == 0 || - (from_len == 0 && to_len == 0)) { - /* nothing to do; return the original bytes */ - return return_self(self); - } - - /* Handle zero-length special cases */ - - if (from_len == 0) { - /* insert the 'to' bytes everywhere. */ - /* >>> "Python".replace("", ".") */ - /* '.P.y.t.h.o.n.' */ - return replace_interleave(self, to_s, to_len, maxcount); - } - - /* Except for "".replace("", "A") == "A" there is no way beyond this */ - /* point for an empty self bytes to generate a non-empty bytes */ - /* Special case so the remaining code always gets a non-empty bytes */ - if (PyByteArray_GET_SIZE(self) == 0) { - return return_self(self); - } - - if (to_len == 0) { - /* delete all occurrences of 'from' bytes */ - if (from_len == 1) { - return replace_delete_single_character( - self, from_s[0], maxcount); - } else { - return replace_delete_substring(self, from_s, from_len, maxcount); - } - } - - /* Handle special case where both bytes have the same length */ - - if (from_len == to_len) { - if (from_len == 1) { - return replace_single_character_in_place( - self, - from_s[0], - to_s[0], - maxcount); - } else { - return replace_substring_in_place( - self, from_s, from_len, to_s, to_len, maxcount); - } - } - - /* Otherwise use the more generic algorithms */ - if (from_len == 1) { - return replace_single_character(self, from_s[0], - to_s, to_len, maxcount); - } else { - /* len('from')>=2, len('to')>=1 */ - return replace_substring(self, from_s, from_len, to_s, to_len, maxcount); - } -} - - /*[clinic input] bytearray.replace @@ -2152,9 +1320,9 @@ bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count) /*[clinic end generated code: output=d39884c4dc59412a input=aa379d988637c7fb]*/ { - return (PyObject *)replace((PyByteArrayObject *) self, - old->buf, old->len, - new->buf, new->len, count); + return stringlib_replace((PyObject *)self, + (const char *)old->buf, old->len, + (const char *)new->buf, new->len, count); } /*[clinic input] @@ -2202,7 +1370,6 @@ bytearray_split_impl(PyByteArrayObject *self, PyObject *sep, /*[clinic input] bytearray.partition - self: self(type="PyByteArrayObject *") sep: object / @@ -2218,7 +1385,7 @@ bytearray object and two empty bytearray objects. static PyObject * bytearray_partition(PyByteArrayObject *self, PyObject *sep) -/*[clinic end generated code: output=45d2525ddd35f957 input=7d7fe37b1696d506]*/ +/*[clinic end generated code: output=45d2525ddd35f957 input=86f89223892b70b5]*/ { PyObject *bytesep, *result; @@ -2240,7 +1407,6 @@ bytearray_partition(PyByteArrayObject *self, PyObject *sep) /*[clinic input] bytearray.rpartition - self: self(type="PyByteArrayObject *") sep: object / @@ -2256,7 +1422,7 @@ objects and the original bytearray object. static PyObject * bytearray_rpartition(PyByteArrayObject *self, PyObject *sep) -/*[clinic end generated code: output=440de3c9426115e8 input=9b8cd540c1b75853]*/ +/*[clinic end generated code: output=440de3c9426115e8 input=5f4094f2de87c8f3]*/ { PyObject *bytesep, *result; @@ -2314,14 +1480,12 @@ bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep, /*[clinic input] bytearray.reverse - self: self(type="PyByteArrayObject *") - Reverse the order of the values in B in place. [clinic start generated code]*/ static PyObject * bytearray_reverse_impl(PyByteArrayObject *self) -/*[clinic end generated code: output=9f7616f29ab309d3 input=7933a499b8597bd1]*/ +/*[clinic end generated code: output=9f7616f29ab309d3 input=543356319fc78557]*/ { char swap, *head, *tail; Py_ssize_t i, j, n = Py_SIZE(self); @@ -2350,7 +1514,6 @@ class bytesvalue_converter(CConverter): /*[clinic input] bytearray.insert - self: self(type="PyByteArrayObject *") index: Py_ssize_t The index where the value is to be inserted. item: bytesvalue @@ -2362,7 +1525,7 @@ Insert a single item into the bytearray before the given index. static PyObject * bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item) -/*[clinic end generated code: output=76c775a70e7b07b7 input=833766836ba30e1e]*/ +/*[clinic end generated code: output=76c775a70e7b07b7 input=b2b5d07e9de6c070]*/ { Py_ssize_t n = Py_SIZE(self); char *buf; @@ -2392,7 +1555,6 @@ bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item) /*[clinic input] bytearray.append - self: self(type="PyByteArrayObject *") item: bytesvalue The item to be appended. / @@ -2402,7 +1564,7 @@ Append a single item to the end of the bytearray. static PyObject * bytearray_append_impl(PyByteArrayObject *self, int item) -/*[clinic end generated code: output=a154e19ed1886cb6 input=ae56ea87380407cc]*/ +/*[clinic end generated code: output=a154e19ed1886cb6 input=20d6bec3d1340593]*/ { Py_ssize_t n = Py_SIZE(self); @@ -2422,7 +1584,6 @@ bytearray_append_impl(PyByteArrayObject *self, int item) /*[clinic input] bytearray.extend - self: self(type="PyByteArrayObject *") iterable_of_ints: object The iterable of items to append. / @@ -2432,7 +1593,7 @@ Append all the items from the iterator or sequence to the end of the bytearray. static PyObject * bytearray_extend(PyByteArrayObject *self, PyObject *iterable_of_ints) -/*[clinic end generated code: output=98155dbe249170b1 input=ce83a5d75b70d850]*/ +/*[clinic end generated code: output=98155dbe249170b1 input=c617b3a93249ba28]*/ { PyObject *it, *item, *bytearray_obj; Py_ssize_t buf_size = 0, len = 0; @@ -2517,7 +1678,6 @@ bytearray_extend(PyByteArrayObject *self, PyObject *iterable_of_ints) /*[clinic input] bytearray.pop - self: self(type="PyByteArrayObject *") index: Py_ssize_t = -1 The index from where to remove the item. -1 (the default value) means remove the last item. @@ -2530,7 +1690,7 @@ If no index argument is given, will pop the last item. static PyObject * bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index) -/*[clinic end generated code: output=e0ccd401f8021da8 input=0797e6c0ca9d5a85]*/ +/*[clinic end generated code: output=e0ccd401f8021da8 input=3591df2d06c0d237]*/ { int value; Py_ssize_t n = Py_SIZE(self); @@ -2562,7 +1722,6 @@ bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index) /*[clinic input] bytearray.remove - self: self(type="PyByteArrayObject *") value: bytesvalue The value to remove. / @@ -2572,20 +1731,20 @@ Remove the first occurrence of a value in the bytearray. static PyObject * bytearray_remove_impl(PyByteArrayObject *self, int value) -/*[clinic end generated code: output=d659e37866709c13 input=47560b11fd856c24]*/ +/*[clinic end generated code: output=d659e37866709c13 input=121831240cd51ddf]*/ { - Py_ssize_t n = Py_SIZE(self); + Py_ssize_t where, n = Py_SIZE(self); char *buf = PyByteArray_AS_STRING(self); - char *where = memchr(buf, value, n); - if (!where) { + where = stringlib_find_char(buf, n, value); + if (where < 0) { PyErr_SetString(PyExc_ValueError, "value not found in bytearray"); return NULL; } if (!_canresize(self)) return NULL; - memmove(where, where + 1, buf + n - where); + memmove(buf + where, buf + where + 1, n - where); if (PyByteArray_Resize((PyObject *)self, n - 1) < 0) return NULL; @@ -2595,8 +1754,8 @@ bytearray_remove_impl(PyByteArrayObject *self, int value) /* XXX These two helpers could be optimized if argsize == 1 */ static Py_ssize_t -lstrip_helper(char *myptr, Py_ssize_t mysize, - void *argptr, Py_ssize_t argsize) +lstrip_helper(const char *myptr, Py_ssize_t mysize, + const void *argptr, Py_ssize_t argsize) { Py_ssize_t i = 0; while (i < mysize && memchr(argptr, (unsigned char) myptr[i], argsize)) @@ -2605,8 +1764,8 @@ lstrip_helper(char *myptr, Py_ssize_t mysize, } static Py_ssize_t -rstrip_helper(char *myptr, Py_ssize_t mysize, - void *argptr, Py_ssize_t argsize) +rstrip_helper(const char *myptr, Py_ssize_t mysize, + const void *argptr, Py_ssize_t argsize) { Py_ssize_t i = mysize - 1; while (i >= 0 && memchr(argptr, (unsigned char) myptr[i], argsize)) @@ -2807,27 +1966,10 @@ bytearray_splitlines_impl(PyByteArrayObject *self, int keepends) ); } -static int -hex_digit_to_int(Py_UCS4 c) -{ - if (c >= 128) - return -1; - if (Py_ISDIGIT(c)) - return c - '0'; - else { - if (Py_ISUPPER(c)) - c = Py_TOLOWER(c); - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - } - return -1; -} - /*[clinic input] @classmethod bytearray.fromhex - cls: self(type="PyObject*") string: unicode / @@ -2838,51 +1980,15 @@ Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef') [clinic start generated code]*/ static PyObject * -bytearray_fromhex_impl(PyObject*cls, PyObject *string) -/*[clinic end generated code: output=df3da60129b3700c input=907bbd2d34d9367a]*/ +bytearray_fromhex_impl(PyTypeObject *type, PyObject *string) +/*[clinic end generated code: output=8f0f0b6d30fb3ba0 input=f033a16d1fb21f48]*/ { - PyObject *newbytes; - char *buf; - Py_ssize_t hexlen, byteslen, i, j; - int top, bot; - void *data; - unsigned int kind; - - assert(PyUnicode_Check(string)); - if (PyUnicode_READY(string)) - return NULL; - kind = PyUnicode_KIND(string); - data = PyUnicode_DATA(string); - hexlen = PyUnicode_GET_LENGTH(string); - - byteslen = hexlen/2; /* This overestimates if there are spaces */ - newbytes = PyByteArray_FromStringAndSize(NULL, byteslen); - if (!newbytes) - return NULL; - buf = PyByteArray_AS_STRING(newbytes); - for (i = j = 0; i < hexlen; i += 2) { - /* skip over spaces in the input */ - while (PyUnicode_READ(kind, data, i) == ' ') - i++; - if (i >= hexlen) - break; - top = hex_digit_to_int(PyUnicode_READ(kind, data, i)); - bot = hex_digit_to_int(PyUnicode_READ(kind, data, i+1)); - if (top == -1 || bot == -1) { - PyErr_Format(PyExc_ValueError, - "non-hexadecimal number found in " - "fromhex() arg at position %zd", i); - goto error; - } - buf[j++] = (top << 4) + bot; + PyObject *result = _PyBytes_FromHex(string, type == &PyByteArray_Type); + if (type != &PyByteArray_Type && result != NULL) { + Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type, + result, NULL)); } - if (PyByteArray_Resize(newbytes, j) < 0) - goto error; - return newbytes; - - error: - Py_DECREF(newbytes); - return NULL; + return result; } PyDoc_STRVAR(hex__doc__, @@ -2937,14 +2043,12 @@ _common_reduce(PyByteArrayObject *self, int proto) /*[clinic input] bytearray.__reduce__ as bytearray_reduce - self: self(type="PyByteArrayObject *") - Return state information for pickling. [clinic start generated code]*/ static PyObject * bytearray_reduce_impl(PyByteArrayObject *self) -/*[clinic end generated code: output=52bf304086464cab input=fbb07de4d102a03a]*/ +/*[clinic end generated code: output=52bf304086464cab input=44b5737ada62dd3f]*/ { return _common_reduce(self, 2); } @@ -2952,7 +2056,6 @@ bytearray_reduce_impl(PyByteArrayObject *self) /*[clinic input] bytearray.__reduce_ex__ as bytearray_reduce_ex - self: self(type="PyByteArrayObject *") proto: int = 0 / @@ -2961,7 +2064,7 @@ Return state information for pickling. static PyObject * bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto) -/*[clinic end generated code: output=52eac33377197520 input=0e091a42ca6dbd91]*/ +/*[clinic end generated code: output=52eac33377197520 input=f129bc1a1aa151ee]*/ { return _common_reduce(self, proto); } @@ -2969,14 +2072,12 @@ bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto) /*[clinic input] bytearray.__sizeof__ as bytearray_sizeof - self: self(type="PyByteArrayObject *") - Returns the size of the bytearray object in memory, in bytes. [clinic start generated code]*/ static PyObject * bytearray_sizeof_impl(PyByteArrayObject *self) -/*[clinic end generated code: output=738abdd17951c427 input=6b23d305362b462b]*/ +/*[clinic end generated code: output=738abdd17951c427 input=e27320fd98a4bc5a]*/ { Py_ssize_t res; @@ -3017,19 +2118,22 @@ bytearray_methods[] = { BYTEARRAY_APPEND_METHODDEF {"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS, _Py_capitalize__doc__}, - {"center", (PyCFunction)stringlib_center, METH_VARARGS, center__doc__}, + {"center", (PyCFunction)stringlib_center, METH_VARARGS, _Py_center__doc__}, BYTEARRAY_CLEAR_METHODDEF BYTEARRAY_COPY_METHODDEF - {"count", (PyCFunction)bytearray_count, METH_VARARGS, count__doc__}, + {"count", (PyCFunction)bytearray_count, METH_VARARGS, + _Py_count__doc__}, BYTEARRAY_DECODE_METHODDEF - {"endswith", (PyCFunction)bytearray_endswith, METH_VARARGS, endswith__doc__}, + {"endswith", (PyCFunction)bytearray_endswith, METH_VARARGS, + _Py_endswith__doc__}, {"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS | METH_KEYWORDS, - expandtabs__doc__}, + _Py_expandtabs__doc__}, BYTEARRAY_EXTEND_METHODDEF - {"find", (PyCFunction)bytearray_find, METH_VARARGS, find__doc__}, + {"find", (PyCFunction)bytearray_find, METH_VARARGS, + _Py_find__doc__}, BYTEARRAY_FROMHEX_METHODDEF {"hex", (PyCFunction)bytearray_hex, METH_NOARGS, hex__doc__}, - {"index", (PyCFunction)bytearray_index, METH_VARARGS, index__doc__}, + {"index", (PyCFunction)bytearray_index, METH_VARARGS, _Py_index__doc__}, BYTEARRAY_INSERT_METHODDEF {"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS, _Py_isalnum__doc__}, @@ -3046,7 +2150,7 @@ bytearray_methods[] = { {"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS, _Py_isupper__doc__}, BYTEARRAY_JOIN_METHODDEF - {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, ljust__doc__}, + {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, _Py_ljust__doc__}, {"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__}, BYTEARRAY_LSTRIP_METHODDEF BYTEARRAY_MAKETRANS_METHODDEF @@ -3055,23 +2159,23 @@ bytearray_methods[] = { BYTEARRAY_REMOVE_METHODDEF BYTEARRAY_REPLACE_METHODDEF BYTEARRAY_REVERSE_METHODDEF - {"rfind", (PyCFunction)bytearray_rfind, METH_VARARGS, rfind__doc__}, - {"rindex", (PyCFunction)bytearray_rindex, METH_VARARGS, rindex__doc__}, - {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, rjust__doc__}, + {"rfind", (PyCFunction)bytearray_rfind, METH_VARARGS, _Py_rfind__doc__}, + {"rindex", (PyCFunction)bytearray_rindex, METH_VARARGS, _Py_rindex__doc__}, + {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, _Py_rjust__doc__}, BYTEARRAY_RPARTITION_METHODDEF BYTEARRAY_RSPLIT_METHODDEF BYTEARRAY_RSTRIP_METHODDEF BYTEARRAY_SPLIT_METHODDEF BYTEARRAY_SPLITLINES_METHODDEF {"startswith", (PyCFunction)bytearray_startswith, METH_VARARGS , - startswith__doc__}, + _Py_startswith__doc__}, BYTEARRAY_STRIP_METHODDEF {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS, _Py_swapcase__doc__}, {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__}, BYTEARRAY_TRANSLATE_METHODDEF {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__}, - {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__}, + {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, _Py_zfill__doc__}, {NULL} }; @@ -3080,7 +2184,7 @@ bytearray_mod(PyObject *v, PyObject *w) { if (!PyByteArray_Check(v)) Py_RETURN_NOTIMPLEMENTED; - return bytearray_format((PyByteArrayObject *)v, w); + return _PyBytes_FormatEx(PyByteArray_AS_STRING(v), PyByteArray_GET_SIZE(v), w, 1); } static PyNumberMethods bytearray_as_number = { diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c index a299915..d5c4fe6 100644 --- a/Objects/bytes_methods.c +++ b/Objects/bytes_methods.c @@ -1,3 +1,4 @@ +#define PY_SSIZE_T_CLEAN #include "Python.h" #include "bytes_methods.h" @@ -277,7 +278,7 @@ Return a titlecased version of B, i.e. ASCII words start with uppercase\n\ characters, all remaining cased characters have lowercase."); void -_Py_bytes_title(char *result, char *s, Py_ssize_t len) +_Py_bytes_title(char *result, const char *s, Py_ssize_t len) { Py_ssize_t i; int previous_is_cased = 0; @@ -306,7 +307,7 @@ Return a copy of B with only its first character capitalized (ASCII)\n\ and the rest lower-cased."); void -_Py_bytes_capitalize(char *result, char *s, Py_ssize_t len) +_Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len) { Py_ssize_t i; @@ -336,7 +337,7 @@ Return a copy of B with uppercase ASCII characters converted\n\ to lowercase ASCII and vice versa."); void -_Py_bytes_swapcase(char *result, char *s, Py_ssize_t len) +_Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len) { Py_ssize_t i; @@ -387,3 +388,427 @@ _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to) return res; } + +#define FASTSEARCH fastsearch +#define STRINGLIB(F) stringlib_##F +#define STRINGLIB_CHAR char +#define STRINGLIB_SIZEOF_CHAR 1 + +#include "stringlib/fastsearch.h" +#include "stringlib/count.h" +#include "stringlib/find.h" + +/* +Wraps stringlib_parse_args_finds() and additionally checks whether the +first argument is an integer in range(0, 256). + +If this is the case, writes the integer value to the byte parameter +and sets subobj to NULL. Otherwise, sets the first argument to subobj +and doesn't touch byte. The other parameters are similar to those of +stringlib_parse_args_finds(). +*/ + +Py_LOCAL_INLINE(int) +parse_args_finds_byte(const char *function_name, PyObject *args, + PyObject **subobj, char *byte, + Py_ssize_t *start, Py_ssize_t *end) +{ + PyObject *tmp_subobj; + Py_ssize_t ival; + PyObject *err; + + if(!stringlib_parse_args_finds(function_name, args, &tmp_subobj, + start, end)) + return 0; + + if (!PyNumber_Check(tmp_subobj)) { + *subobj = tmp_subobj; + return 1; + } + + ival = PyNumber_AsSsize_t(tmp_subobj, PyExc_OverflowError); + if (ival == -1) { + err = PyErr_Occurred(); + if (err && !PyErr_GivenExceptionMatches(err, PyExc_OverflowError)) { + PyErr_Clear(); + *subobj = tmp_subobj; + return 1; + } + } + + if (ival < 0 || ival > 255) { + PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)"); + return 0; + } + + *subobj = NULL; + *byte = (char)ival; + return 1; +} + +/* helper macro to fixup start/end slice values */ +#define ADJUST_INDICES(start, end, len) \ + if (end > len) \ + end = len; \ + else if (end < 0) { \ + end += len; \ + if (end < 0) \ + end = 0; \ + } \ + if (start < 0) { \ + start += len; \ + if (start < 0) \ + start = 0; \ + } + +Py_LOCAL_INLINE(Py_ssize_t) +find_internal(const char *str, Py_ssize_t len, + const char *function_name, PyObject *args, int dir) +{ + PyObject *subobj; + char byte; + Py_buffer subbuf; + const char *sub; + Py_ssize_t sub_len; + Py_ssize_t start = 0, end = PY_SSIZE_T_MAX; + Py_ssize_t res; + + if (!parse_args_finds_byte(function_name, args, + &subobj, &byte, &start, &end)) + return -2; + + if (subobj) { + if (PyObject_GetBuffer(subobj, &subbuf, PyBUF_SIMPLE) != 0) + return -2; + + sub = subbuf.buf; + sub_len = subbuf.len; + } + else { + sub = &byte; + sub_len = 1; + } + + ADJUST_INDICES(start, end, len); + if (end - start < sub_len) + res = -1; + else if (sub_len == 1) { + if (dir > 0) + res = stringlib_find_char( + str + start, end - start, + *sub); + else + res = stringlib_rfind_char( + str + start, end - start, + *sub); + if (res >= 0) + res += start; + } + else { + if (dir > 0) + res = stringlib_find_slice( + str, len, + sub, sub_len, start, end); + else + res = stringlib_rfind_slice( + str, len, + sub, sub_len, start, end); + } + + if (subobj) + PyBuffer_Release(&subbuf); + + return res; +} + +PyDoc_STRVAR_shared(_Py_find__doc__, +"B.find(sub[, start[, end]]) -> int\n\ +\n\ +Return the lowest index in B where subsection sub is found,\n\ +such that sub is contained within B[start,end]. Optional\n\ +arguments start and end are interpreted as in slice notation.\n\ +\n\ +Return -1 on failure."); + +PyObject * +_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args) +{ + Py_ssize_t result = find_internal(str, len, "find", args, +1); + if (result == -2) + return NULL; + return PyLong_FromSsize_t(result); +} + +PyDoc_STRVAR_shared(_Py_index__doc__, +"B.index(sub[, start[, end]]) -> int\n\ +\n\ +Like B.find() but raise ValueError when the subsection is not found."); + +PyObject * +_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args) +{ + Py_ssize_t result = find_internal(str, len, "index", args, +1); + if (result == -2) + return NULL; + if (result == -1) { + PyErr_SetString(PyExc_ValueError, + "subsection not found"); + return NULL; + } + return PyLong_FromSsize_t(result); +} + +PyDoc_STRVAR_shared(_Py_rfind__doc__, +"B.rfind(sub[, start[, end]]) -> int\n\ +\n\ +Return the highest index in B where subsection sub is found,\n\ +such that sub is contained within B[start,end]. Optional\n\ +arguments start and end are interpreted as in slice notation.\n\ +\n\ +Return -1 on failure."); + +PyObject * +_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args) +{ + Py_ssize_t result = find_internal(str, len, "rfind", args, -1); + if (result == -2) + return NULL; + return PyLong_FromSsize_t(result); +} + +PyDoc_STRVAR_shared(_Py_rindex__doc__, +"B.rindex(sub[, start[, end]]) -> int\n\ +\n\ +Like B.rfind() but raise ValueError when the subsection is not found."); + +PyObject * +_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args) +{ + Py_ssize_t result = find_internal(str, len, "rindex", args, -1); + if (result == -2) + return NULL; + if (result == -1) { + PyErr_SetString(PyExc_ValueError, + "subsection not found"); + return NULL; + } + return PyLong_FromSsize_t(result); +} + +PyDoc_STRVAR_shared(_Py_count__doc__, +"B.count(sub[, start[, end]]) -> int\n\ +\n\ +Return the number of non-overlapping occurrences of subsection sub in\n\ +bytes B[start:end]. Optional arguments start and end are interpreted\n\ +as in slice notation."); + +PyObject * +_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args) +{ + PyObject *sub_obj; + const char *sub; + Py_ssize_t sub_len; + char byte; + Py_ssize_t start = 0, end = PY_SSIZE_T_MAX; + + Py_buffer vsub; + PyObject *count_obj; + + if (!parse_args_finds_byte("count", args, + &sub_obj, &byte, &start, &end)) + return NULL; + + if (sub_obj) { + if (PyObject_GetBuffer(sub_obj, &vsub, PyBUF_SIMPLE) != 0) + return NULL; + + sub = vsub.buf; + sub_len = vsub.len; + } + else { + sub = &byte; + sub_len = 1; + } + + ADJUST_INDICES(start, end, len); + + count_obj = PyLong_FromSsize_t( + stringlib_count(str + start, end - start, sub, sub_len, PY_SSIZE_T_MAX) + ); + + if (sub_obj) + PyBuffer_Release(&vsub); + + return count_obj; +} + +int +_Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg) +{ + Py_ssize_t ival = PyNumber_AsSsize_t(arg, NULL); + if (ival == -1 && PyErr_Occurred()) { + Py_buffer varg; + Py_ssize_t pos; + PyErr_Clear(); + if (PyObject_GetBuffer(arg, &varg, PyBUF_SIMPLE) != 0) + return -1; + pos = stringlib_find(str, len, + varg.buf, varg.len, 0); + PyBuffer_Release(&varg); + return pos >= 0; + } + if (ival < 0 || ival >= 256) { + PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)"); + return -1; + } + + return memchr(str, (int) ival, len) != NULL; +} + + +/* Matches the end (direction >= 0) or start (direction < 0) of the buffer + * against substr, using the start and end arguments. Returns + * -1 on error, 0 if not found and 1 if found. + */ +static int +tailmatch(const char *str, Py_ssize_t len, PyObject *substr, + Py_ssize_t start, Py_ssize_t end, int direction) +{ + Py_buffer sub_view = {NULL, NULL}; + const char *sub; + Py_ssize_t slen; + + if (PyBytes_Check(substr)) { + sub = PyBytes_AS_STRING(substr); + slen = PyBytes_GET_SIZE(substr); + } + else { + if (PyObject_GetBuffer(substr, &sub_view, PyBUF_SIMPLE) != 0) + return -1; + sub = sub_view.buf; + slen = sub_view.len; + } + + ADJUST_INDICES(start, end, len); + + if (direction < 0) { + /* startswith */ + if (start + slen > len) + goto notfound; + } else { + /* endswith */ + if (end - start < slen || start > len) + goto notfound; + + if (end - slen > start) + start = end - slen; + } + if (end - start < slen) + goto notfound; + if (memcmp(str + start, sub, slen) != 0) + goto notfound; + + PyBuffer_Release(&sub_view); + return 1; + +notfound: + PyBuffer_Release(&sub_view); + return 0; +} + +static PyObject * +_Py_bytes_tailmatch(const char *str, Py_ssize_t len, + const char *function_name, PyObject *args, + int direction) +{ + Py_ssize_t start = 0; + Py_ssize_t end = PY_SSIZE_T_MAX; + PyObject *subobj; + int result; + + if (!stringlib_parse_args_finds(function_name, args, &subobj, &start, &end)) + return NULL; + if (PyTuple_Check(subobj)) { + Py_ssize_t i; + for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { + result = tailmatch(str, len, PyTuple_GET_ITEM(subobj, i), + start, end, direction); + if (result == -1) + return NULL; + else if (result) { + Py_RETURN_TRUE; + } + } + Py_RETURN_FALSE; + } + result = tailmatch(str, len, subobj, start, end, direction); + if (result == -1) { + if (PyErr_ExceptionMatches(PyExc_TypeError)) + PyErr_Format(PyExc_TypeError, + "%s first arg must be bytes or a tuple of bytes, " + "not %s", + function_name, Py_TYPE(subobj)->tp_name); + return NULL; + } + else + return PyBool_FromLong(result); +} + +PyDoc_STRVAR_shared(_Py_startswith__doc__, +"B.startswith(prefix[, start[, end]]) -> bool\n\ +\n\ +Return True if B starts with the specified prefix, False otherwise.\n\ +With optional start, test B beginning at that position.\n\ +With optional end, stop comparing B at that position.\n\ +prefix can also be a tuple of bytes to try."); + +PyObject * +_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args) +{ + return _Py_bytes_tailmatch(str, len, "startswith", args, -1); +} + +PyDoc_STRVAR_shared(_Py_endswith__doc__, +"B.endswith(suffix[, start[, end]]) -> bool\n\ +\n\ +Return True if B ends with the specified suffix, False otherwise.\n\ +With optional start, test B beginning at that position.\n\ +With optional end, stop comparing B at that position.\n\ +suffix can also be a tuple of bytes to try."); + +PyObject * +_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args) +{ + return _Py_bytes_tailmatch(str, len, "endswith", args, +1); +} + +PyDoc_STRVAR_shared(_Py_expandtabs__doc__, +"B.expandtabs(tabsize=8) -> copy of B\n\ +\n\ +Return a copy of B where all tab characters are expanded using spaces.\n\ +If tabsize is not given, a tab size of 8 characters is assumed."); + +PyDoc_STRVAR_shared(_Py_ljust__doc__, +"B.ljust(width[, fillchar]) -> copy of B\n" +"\n" +"Return B left justified in a string of length width. Padding is\n" +"done using the specified fill character (default is a space)."); + +PyDoc_STRVAR_shared(_Py_rjust__doc__, +"B.rjust(width[, fillchar]) -> copy of B\n" +"\n" +"Return B right justified in a string of length width. Padding is\n" +"done using the specified fill character (default is a space)"); + +PyDoc_STRVAR_shared(_Py_center__doc__, +"B.center(width[, fillchar]) -> copy of B\n" +"\n" +"Return B centered in a string of length width. Padding is\n" +"done using the specified fill character (default is a space)."); + +PyDoc_STRVAR_shared(_Py_zfill__doc__, +"B.zfill(width) -> copy of B\n" +"\n" +"Pad a numeric string B with zeros on the left, to fill a field\n" +"of the specified width. B is never truncated."); + diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 77dd45e..779fe29 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -9,9 +9,9 @@ #include /*[clinic input] -class bytes "PyBytesObject*" "&PyBytes_Type" +class bytes "PyBytesObject *" "&PyBytes_Type" [clinic start generated code]*/ -/*[clinic end generated code: output=da39a3ee5e6b4b0d input=1a1d9102afc1b00c]*/ +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=7a238f965d64892b]*/ #include "clinic/bytesobject.c.h" @@ -30,6 +30,10 @@ static PyBytesObject *nullstring; */ #define PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1) +/* Forward declaration */ +Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer, + char *str); + /* For PyBytes_FromString(), the parameter `str' points to a null-terminated string containing exactly `size' bytes. @@ -116,7 +120,7 @@ PyBytes_FromStringAndSize(const char *str, Py_ssize_t size) if (str == NULL) return (PyObject *) op; - Py_MEMCPY(op->ob_sval, str, size); + memcpy(op->ob_sval, str, size); /* share short strings */ if (size == 1) { characters[*str & UCHAR_MAX] = op; @@ -159,7 +163,7 @@ PyBytes_FromString(const char *str) return PyErr_NoMemory(); (void)PyObject_INIT_VAR(op, &PyBytes_Type, size); op->ob_shash = -1; - Py_MEMCPY(op->ob_sval, str, size+1); + memcpy(op->ob_sval, str, size+1); /* share short strings */ if (size == 0) { nullstring = op; @@ -174,190 +178,184 @@ PyBytes_FromString(const char *str) PyObject * PyBytes_FromFormatV(const char *format, va_list vargs) { - va_list count; - Py_ssize_t n = 0; - const char* f; char *s; - PyObject* string; + const char *f; + const char *p; + Py_ssize_t prec; + int longflag; + int size_tflag; + /* Longest 64-bit formatted numbers: + - "18446744073709551615\0" (21 bytes) + - "-9223372036854775808\0" (21 bytes) + Decimal takes the most space (it isn't enough for octal.) + + Longest 64-bit pointer representation: + "0xffffffffffffffff\0" (19 bytes). */ + char buffer[21]; + _PyBytesWriter writer; + + _PyBytesWriter_Init(&writer); + + s = _PyBytesWriter_Alloc(&writer, strlen(format)); + if (s == NULL) + return NULL; + writer.overallocate = 1; + +#define WRITE_BYTES(str) \ + do { \ + s = _PyBytesWriter_WriteBytes(&writer, s, (str), strlen(str)); \ + if (s == NULL) \ + goto error; \ + } while (0) - Py_VA_COPY(count, vargs); - /* step 1: figure out how large a buffer we need */ for (f = format; *f; f++) { - if (*f == '%') { - const char* p = f; - while (*++f && *f != '%' && !Py_ISALPHA(*f)) - ; - - /* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since - * they don't affect the amount of space we reserve. - */ - if ((*f == 'l' || *f == 'z') && - (f[1] == 'd' || f[1] == 'u')) - ++f; - - switch (*f) { - case 'c': - { - int c = va_arg(count, int); - if (c < 0 || c > 255) { - PyErr_SetString(PyExc_OverflowError, - "PyBytes_FromFormatV(): %c format " - "expects an integer in range [0; 255]"); - return NULL; - } - n++; - break; + if (*f != '%') { + *s++ = *f; + continue; + } + + p = f++; + + /* ignore the width (ex: 10 in "%10s") */ + while (Py_ISDIGIT(*f)) + f++; + + /* parse the precision (ex: 10 in "%.10s") */ + prec = 0; + if (*f == '.') { + f++; + for (; Py_ISDIGIT(*f); f++) { + prec = (prec * 10) + (*f - '0'); } - case '%': - n++; - break; - case 'd': case 'u': case 'i': case 'x': - (void) va_arg(count, int); - /* 20 bytes is enough to hold a 64-bit - integer. Decimal takes the most space. - This isn't enough for octal. */ - n += 20; - break; - case 's': - s = va_arg(count, char*); - n += strlen(s); - break; - case 'p': - (void) va_arg(count, int); - /* maximum 64-bit pointer representation: - * 0xffffffffffffffff - * so 19 characters is enough. - * XXX I count 18 -- what's the extra for? - */ - n += 19; - break; - default: - /* if we stumble upon an unknown - formatting code, copy the rest of - the format string to the output - string. (we cannot just skip the - code, since there's no way to know - what's in the argument list) */ - n += strlen(p); - goto expand; + } + + while (*f && *f != '%' && !Py_ISALPHA(*f)) + f++; + + /* handle the long flag ('l'), but only for %ld and %lu. + others can be added when necessary. */ + longflag = 0; + if (*f == 'l' && (f[1] == 'd' || f[1] == 'u')) { + longflag = 1; + ++f; + } + + /* handle the size_t flag ('z'). */ + size_tflag = 0; + if (*f == 'z' && (f[1] == 'd' || f[1] == 'u')) { + size_tflag = 1; + ++f; + } + + /* subtract bytes preallocated for the format string + (ex: 2 for "%s") */ + writer.min_size -= (f - p + 1); + + switch (*f) { + case 'c': + { + int c = va_arg(vargs, int); + if (c < 0 || c > 255) { + PyErr_SetString(PyExc_OverflowError, + "PyBytes_FromFormatV(): %c format " + "expects an integer in range [0; 255]"); + goto error; } - } else - n++; - } - expand: - /* step 2: fill the buffer */ - /* Since we've analyzed how much space we need for the worst case, - use sprintf directly instead of the slower PyOS_snprintf. */ - string = PyBytes_FromStringAndSize(NULL, n); - if (!string) - return NULL; + writer.min_size++; + *s++ = (unsigned char)c; + break; + } + + case 'd': + if (longflag) + sprintf(buffer, "%ld", va_arg(vargs, long)); + else if (size_tflag) + sprintf(buffer, "%" PY_FORMAT_SIZE_T "d", + va_arg(vargs, Py_ssize_t)); + else + sprintf(buffer, "%d", va_arg(vargs, int)); + assert(strlen(buffer) < sizeof(buffer)); + WRITE_BYTES(buffer); + break; - s = PyBytes_AsString(string); + case 'u': + if (longflag) + sprintf(buffer, "%lu", + va_arg(vargs, unsigned long)); + else if (size_tflag) + sprintf(buffer, "%" PY_FORMAT_SIZE_T "u", + va_arg(vargs, size_t)); + else + sprintf(buffer, "%u", + va_arg(vargs, unsigned int)); + assert(strlen(buffer) < sizeof(buffer)); + WRITE_BYTES(buffer); + break; - for (f = format; *f; f++) { - if (*f == '%') { - const char* p = f++; + case 'i': + sprintf(buffer, "%i", va_arg(vargs, int)); + assert(strlen(buffer) < sizeof(buffer)); + WRITE_BYTES(buffer); + break; + + case 'x': + sprintf(buffer, "%x", va_arg(vargs, int)); + assert(strlen(buffer) < sizeof(buffer)); + WRITE_BYTES(buffer); + break; + + case 's': + { Py_ssize_t i; - int longflag = 0; - int size_tflag = 0; - /* parse the width.precision part (we're only - interested in the precision value, if any) */ - n = 0; - while (Py_ISDIGIT(*f)) - n = (n*10) + *f++ - '0'; - if (*f == '.') { - f++; - n = 0; - while (Py_ISDIGIT(*f)) - n = (n*10) + *f++ - '0'; - } - while (*f && *f != '%' && !Py_ISALPHA(*f)) - f++; - /* handle the long flag, but only for %ld and %lu. - others can be added when necessary. */ - if (*f == 'l' && (f[1] == 'd' || f[1] == 'u')) { - longflag = 1; - ++f; - } - /* handle the size_t flag. */ - if (*f == 'z' && (f[1] == 'd' || f[1] == 'u')) { - size_tflag = 1; - ++f; - } - switch (*f) { - case 'c': - { - int c = va_arg(vargs, int); - /* c has been checked for overflow in the first step */ - *s++ = (unsigned char)c; - break; + p = va_arg(vargs, const char*); + i = strlen(p); + if (prec > 0 && i > prec) + i = prec; + s = _PyBytesWriter_WriteBytes(&writer, s, p, i); + if (s == NULL) + goto error; + break; + } + + case 'p': + sprintf(buffer, "%p", va_arg(vargs, void*)); + assert(strlen(buffer) < sizeof(buffer)); + /* %p is ill-defined: ensure leading 0x. */ + if (buffer[1] == 'X') + buffer[1] = 'x'; + else if (buffer[1] != 'x') { + memmove(buffer+2, buffer, strlen(buffer)+1); + buffer[0] = '0'; + buffer[1] = 'x'; } - case 'd': - if (longflag) - sprintf(s, "%ld", va_arg(vargs, long)); - else if (size_tflag) - sprintf(s, "%" PY_FORMAT_SIZE_T "d", - va_arg(vargs, Py_ssize_t)); - else - sprintf(s, "%d", va_arg(vargs, int)); - s += strlen(s); - break; - case 'u': - if (longflag) - sprintf(s, "%lu", - va_arg(vargs, unsigned long)); - else if (size_tflag) - sprintf(s, "%" PY_FORMAT_SIZE_T "u", - va_arg(vargs, size_t)); - else - sprintf(s, "%u", - va_arg(vargs, unsigned int)); - s += strlen(s); - break; - case 'i': - sprintf(s, "%i", va_arg(vargs, int)); - s += strlen(s); - break; - case 'x': - sprintf(s, "%x", va_arg(vargs, int)); - s += strlen(s); - break; - case 's': - p = va_arg(vargs, char*); - i = strlen(p); - if (n > 0 && i > n) - i = n; - Py_MEMCPY(s, p, i); - s += i; - break; - case 'p': - sprintf(s, "%p", va_arg(vargs, void*)); - /* %p is ill-defined: ensure leading 0x. */ - if (s[1] == 'X') - s[1] = 'x'; - else if (s[1] != 'x') { - memmove(s+2, s, strlen(s)+1); - s[0] = '0'; - s[1] = 'x'; - } - s += strlen(s); - break; - case '%': - *s++ = '%'; - break; - default: - strcpy(s, p); - s += strlen(s); - goto end; + WRITE_BYTES(buffer); + break; + + case '%': + writer.min_size++; + *s++ = '%'; + break; + + default: + if (*f == 0) { + /* fix min_size if we reached the end of the format string */ + writer.min_size++; } - } else - *s++ = *f; + + /* invalid format string: copy unformatted string and exit */ + WRITE_BYTES(p); + return _PyBytesWriter_Finish(&writer, s); + } } - end: - _PyBytes_Resize(&string, s - PyBytes_AS_STRING(string)); - return string; +#undef WRITE_BYTES + + return _PyBytesWriter_Finish(&writer, s); + + error: + _PyBytesWriter_Dealloc(&writer); + return NULL; } PyObject * @@ -409,12 +407,14 @@ getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx) /* Returns a new reference to a PyBytes object, or NULL on failure. */ -static PyObject * -formatfloat(PyObject *v, int flags, int prec, int type) +static char* +formatfloat(PyObject *v, int flags, int prec, int type, + PyObject **p_result, _PyBytesWriter *writer, char *str) { char *p; PyObject *result; double x; + size_t len; x = PyFloat_AsDouble(v); if (x == -1.0 && PyErr_Occurred()) { @@ -431,9 +431,22 @@ formatfloat(PyObject *v, int flags, int prec, int type) if (p == NULL) return NULL; - result = PyBytes_FromStringAndSize(p, strlen(p)); + + len = strlen(p); + if (writer != NULL) { + str = _PyBytesWriter_Prepare(writer, str, len); + if (str == NULL) + return NULL; + memcpy(str, p, len); + PyMem_Free(p); + str += len; + return str; + } + + result = PyBytes_FromStringAndSize(p, len); PyMem_Free(p); - return result; + *p_result = result; + return str; } static PyObject * @@ -473,11 +486,11 @@ formatlong(PyObject *v, int flags, int prec, int type) static int byte_converter(PyObject *arg, char *p) { - if (PyBytes_Check(arg) && PyBytes_Size(arg) == 1) { + if (PyBytes_Check(arg) && PyBytes_GET_SIZE(arg) == 1) { *p = PyBytes_AS_STRING(arg)[0]; return 1; } - else if (PyByteArray_Check(arg) && PyByteArray_Size(arg) == 1) { + else if (PyByteArray_Check(arg) && PyByteArray_GET_SIZE(arg) == 1) { *p = PyByteArray_AS_STRING(arg)[0]; return 1; } @@ -557,36 +570,36 @@ format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen) return NULL; } -/* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) - - FORMATBUFLEN is the length of the buffer in which the ints & - chars are formatted. XXX This is a magic number. Each formatting - routine does bounds checking to ensure no overflow, but a better - solution may be to malloc a buffer of appropriate size for each - format. For now, the current solution is sufficient. -*/ -#define FORMATBUFLEN (size_t)120 +/* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) */ PyObject * -_PyBytes_Format(PyObject *format, PyObject *args) +_PyBytes_FormatEx(const char *format, Py_ssize_t format_len, + PyObject *args, int use_bytearray) { - char *fmt, *res; + const char *fmt; + char *res; Py_ssize_t arglen, argidx; - Py_ssize_t reslen, rescnt, fmtcnt; + Py_ssize_t fmtcnt; int args_owned = 0; - PyObject *result; PyObject *dict = NULL; - if (format == NULL || !PyBytes_Check(format) || args == NULL) { + _PyBytesWriter writer; + + if (args == NULL) { PyErr_BadInternalCall(); return NULL; } - fmt = PyBytes_AS_STRING(format); - fmtcnt = PyBytes_GET_SIZE(format); - reslen = rescnt = fmtcnt + 100; - result = PyBytes_FromStringAndSize((char *)NULL, reslen); - if (result == NULL) + fmt = format; + fmtcnt = format_len; + + _PyBytesWriter_Init(&writer); + writer.use_bytearray = use_bytearray; + + res = _PyBytesWriter_Alloc(&writer, fmtcnt); + if (res == NULL) return NULL; - res = PyBytes_AsString(result); + if (!use_bytearray) + writer.overallocate = 1; + if (PyTuple_Check(args)) { arglen = PyTuple_GET_SIZE(args); argidx = 0; @@ -600,18 +613,23 @@ _PyBytes_Format(PyObject *format, PyObject *args) !PyByteArray_Check(args)) { dict = args; } + while (--fmtcnt >= 0) { if (*fmt != '%') { - if (--rescnt < 0) { - rescnt = fmtcnt + 100; - reslen += rescnt; - if (_PyBytes_Resize(&result, reslen)) - return NULL; - res = PyBytes_AS_STRING(result) - + reslen - rescnt; - --rescnt; - } - *res++ = *fmt++; + Py_ssize_t len; + char *pos; + + pos = strchr(fmt + 1, '%'); + if (pos != NULL) + len = pos - fmt; + else + len = format_len - (fmt - format); + assert(len != 0); + + memcpy(res, fmt, len); + res += len; + fmt += len; + fmtcnt -= (len - 1); } else { /* Got a format specifier */ @@ -626,10 +644,14 @@ _PyBytes_Format(PyObject *format, PyObject *args) int sign; Py_ssize_t len = 0; char onechar; /* For byte_converter() */ + Py_ssize_t alloc; +#ifdef Py_DEBUG + char *before; +#endif fmt++; if (*fmt == '(') { - char *keystart; + const char *keystart; Py_ssize_t keylen; PyObject *key; int pcount = 1; @@ -673,6 +695,8 @@ _PyBytes_Format(PyObject *format, PyObject *args) arglen = -1; argidx = -2; } + + /* Parse flags. Example: "%+i" => flags=F_SIGN. */ while (--fmtcnt >= 0) { switch (c = *fmt++) { case '-': flags |= F_LJUST; continue; @@ -683,6 +707,8 @@ _PyBytes_Format(PyObject *format, PyObject *args) } break; } + + /* Parse width. Example: "%10s" => width=10 */ if (c == '*') { v = getnextarg(args, arglen, &argidx); if (v == NULL) @@ -717,6 +743,8 @@ _PyBytes_Format(PyObject *format, PyObject *args) width = width*10 + (c - '0'); } } + + /* Parse precision. Example: "%.3f" => prec=3 */ if (c == '.') { prec = 0; if (--fmtcnt >= 0) @@ -771,13 +799,19 @@ _PyBytes_Format(PyObject *format, PyObject *args) if (v == NULL) goto error; } + + if (fmtcnt < 0) { + /* last writer: disable writer overallocation */ + writer.overallocate = 0; + } + sign = 0; fill = ' '; switch (c) { case '%': - pbuf = "%"; - len = 1; - break; + *res++ = '%'; + continue; + case 'r': // %r is only for 2/3 code; 3 only code should use %a case 'a': @@ -790,6 +824,7 @@ _PyBytes_Format(PyObject *format, PyObject *args) if (prec >= 0 && len > prec) len = prec; break; + case 's': // %s is only for 2/3 code; 3 only code should use %b case 'b': @@ -799,12 +834,49 @@ _PyBytes_Format(PyObject *format, PyObject *args) if (prec >= 0 && len > prec) len = prec; break; + case 'i': case 'd': case 'u': case 'o': case 'x': case 'X': + if (PyLong_CheckExact(v) + && width == -1 && prec == -1 + && !(flags & (F_SIGN | F_BLANK)) + && c != 'X') + { + /* Fast path */ + int alternate = flags & F_ALT; + int base; + + switch(c) + { + default: + assert(0 && "'type' not in [diuoxX]"); + case 'd': + case 'i': + case 'u': + base = 10; + break; + case 'o': + base = 8; + break; + case 'x': + case 'X': + base = 16; + break; + } + + /* Fast path */ + writer.min_size -= 2; /* size preallocated for "%d" */ + res = _PyLong_FormatBytesWriter(&writer, res, + v, base, alternate); + if (res == NULL) + goto error; + continue; + } + temp = formatlong(v, flags, prec, c); if (!temp) goto error; @@ -815,14 +887,25 @@ _PyBytes_Format(PyObject *format, PyObject *args) if (flags & F_ZERO) fill = '0'; break; + case 'e': case 'E': case 'f': case 'F': case 'g': case 'G': - temp = formatfloat(v, flags, prec, c); - if (temp == NULL) + if (width == -1 && prec == -1 + && !(flags & (F_SIGN | F_BLANK))) + { + /* Fast path */ + writer.min_size -= 2; /* size preallocated for "%f" */ + res = formatfloat(v, flags, prec, c, NULL, &writer, res); + if (res == NULL) + goto error; + continue; + } + + if (!formatfloat(v, flags, prec, c, &temp, NULL, res)) goto error; pbuf = PyBytes_AS_STRING(temp); len = PyBytes_GET_SIZE(temp); @@ -830,21 +913,28 @@ _PyBytes_Format(PyObject *format, PyObject *args) if (flags & F_ZERO) fill = '0'; break; + case 'c': pbuf = &onechar; len = byte_converter(v, &onechar); if (!len) goto error; + if (width == -1) { + /* Fast path */ + *res++ = onechar; + continue; + } break; + default: PyErr_Format(PyExc_ValueError, "unsupported format character '%c' (0x%x) " "at index %zd", c, c, - (Py_ssize_t)(fmt - 1 - - PyBytes_AsString(format))); + (Py_ssize_t)(fmt - 1 - format)); goto error; } + if (sign) { if (*pbuf == '-' || *pbuf == '+') { sign = *pbuf++; @@ -859,65 +949,75 @@ _PyBytes_Format(PyObject *format, PyObject *args) } if (width < len) width = len; - if (rescnt - (sign != 0) < width) { - reslen -= rescnt; - rescnt = width + fmtcnt + 100; - reslen += rescnt; - if (reslen < 0) { - Py_DECREF(result); - Py_XDECREF(temp); - return PyErr_NoMemory(); - } - if (_PyBytes_Resize(&result, reslen)) { - Py_XDECREF(temp); - return NULL; - } - res = PyBytes_AS_STRING(result) - + reslen - rescnt; + + alloc = width; + if (sign != 0 && len == width) + alloc++; + /* 2: size preallocated for %s */ + if (alloc > 2) { + res = _PyBytesWriter_Prepare(&writer, res, alloc - 2); + if (res == NULL) + goto error; } +#ifdef Py_DEBUG + before = res; +#endif + + /* Write the sign if needed */ if (sign) { if (fill != ' ') *res++ = sign; - rescnt--; if (width > len) width--; } - if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) { + + /* Write the numeric prefix for "x", "X" and "o" formats + if the alternate form is used. + For example, write "0x" for the "%#x" format. */ + if ((flags & F_ALT) && (c == 'x' || c == 'X')) { assert(pbuf[0] == '0'); assert(pbuf[1] == c); if (fill != ' ') { *res++ = *pbuf++; *res++ = *pbuf++; } - rescnt -= 2; width -= 2; if (width < 0) width = 0; len -= 2; } + + /* Pad left with the fill character if needed */ if (width > len && !(flags & F_LJUST)) { - do { - --rescnt; - *res++ = fill; - } while (--width > len); + memset(res, fill, width - len); + res += (width - len); + width = len; } + + /* If padding with spaces: write sign if needed and/or numeric + prefix if the alternate form is used */ if (fill == ' ') { if (sign) *res++ = sign; - if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) { + if ((flags & F_ALT) && + (c == 'x' || c == 'X')) { assert(pbuf[0] == '0'); assert(pbuf[1] == c); *res++ = *pbuf++; *res++ = *pbuf++; } } - Py_MEMCPY(res, pbuf, len); + + /* Copy bytes */ + memcpy(res, pbuf, len); res += len; - rescnt -= len; - while (--width >= len) { - --rescnt; - *res++ = ' '; + + /* Pad right with the fill character if needed */ + if (width > len) { + memset(res, ' ', width - len); + res += (width - len); } + if (dict && (argidx < arglen) && c != '%') { PyErr_SetString(PyExc_TypeError, "not all arguments converted during bytes formatting"); @@ -925,22 +1025,31 @@ _PyBytes_Format(PyObject *format, PyObject *args) goto error; } Py_XDECREF(temp); + +#ifdef Py_DEBUG + /* check that we computed the exact size for this write */ + assert((res - before) == alloc); +#endif } /* '%' */ + + /* If overallocation was disabled, ensure that it was the last + write. Otherwise, we missed an optimization */ + assert(writer.overallocate || fmtcnt < 0 || use_bytearray); } /* until end */ + if (argidx < arglen && !dict) { PyErr_SetString(PyExc_TypeError, "not all arguments converted during bytes formatting"); goto error; } + if (args_owned) { Py_DECREF(args); } - if (_PyBytes_Resize(&result, reslen - rescnt)) - return NULL; - return result; + return _PyBytesWriter_Finish(&writer, res); error: - Py_DECREF(result); + _PyBytesWriter_Dealloc(&writer); if (args_owned) { Py_DECREF(args); } @@ -960,61 +1069,88 @@ bytes_dealloc(PyObject *op) the string is UTF-8 encoded and should be re-encoded in the specified encoding. */ -PyObject *PyBytes_DecodeEscape(const char *s, +static char * +_PyBytes_DecodeEscapeRecode(const char **s, const char *end, + const char *errors, const char *recode_encoding, + _PyBytesWriter *writer, char *p) +{ + PyObject *u, *w; + const char* t; + + t = *s; + /* Decode non-ASCII bytes as UTF-8. */ + while (t < end && (*t & 0x80)) + t++; + u = PyUnicode_DecodeUTF8(*s, t - *s, errors); + if (u == NULL) + return NULL; + + /* Recode them in target encoding. */ + w = PyUnicode_AsEncodedString(u, recode_encoding, errors); + Py_DECREF(u); + if (w == NULL) + return NULL; + assert(PyBytes_Check(w)); + + /* Append bytes to output buffer. */ + writer->min_size--; /* subtract 1 preallocated byte */ + p = _PyBytesWriter_WriteBytes(writer, p, + PyBytes_AS_STRING(w), + PyBytes_GET_SIZE(w)); + Py_DECREF(w); + if (p == NULL) + return NULL; + + *s = t; + return p; +} + +PyObject *_PyBytes_DecodeEscape(const char *s, Py_ssize_t len, const char *errors, Py_ssize_t unicode, - const char *recode_encoding) + const char *recode_encoding, + const char **first_invalid_escape) { int c; - char *p, *buf; + char *p; const char *end; - PyObject *v; - Py_ssize_t newlen = recode_encoding ? 4*len:len; - v = PyBytes_FromStringAndSize((char *)NULL, newlen); - if (v == NULL) + _PyBytesWriter writer; + + _PyBytesWriter_Init(&writer); + + p = _PyBytesWriter_Alloc(&writer, len); + if (p == NULL) return NULL; - p = buf = PyBytes_AsString(v); + writer.overallocate = 1; + + *first_invalid_escape = NULL; + end = s + len; while (s < end) { if (*s != '\\') { non_esc: - if (recode_encoding && (*s & 0x80)) { - PyObject *u, *w; - char *r; - const char* t; - Py_ssize_t rn; - t = s; - /* Decode non-ASCII bytes as UTF-8. */ - while (t < end && (*t & 0x80)) t++; - u = PyUnicode_DecodeUTF8(s, t - s, errors); - if(!u) goto failed; - - /* Recode them in target encoding. */ - w = PyUnicode_AsEncodedString( - u, recode_encoding, errors); - Py_DECREF(u); - if (!w) goto failed; - - /* Append bytes to output buffer. */ - assert(PyBytes_Check(w)); - r = PyBytes_AS_STRING(w); - rn = PyBytes_GET_SIZE(w); - Py_MEMCPY(p, r, rn); - p += rn; - Py_DECREF(w); - s = t; - } else { + if (!(recode_encoding && (*s & 0x80))) { *p++ = *s++; } + else { + /* non-ASCII character and need to recode */ + p = _PyBytes_DecodeEscapeRecode(&s, end, + errors, recode_encoding, + &writer, p); + if (p == NULL) + goto failed; + } continue; } + s++; - if (s==end) { + if (s == end) { PyErr_SetString(PyExc_ValueError, "Trailing \\ in string"); goto failed; } + switch (*s++) { /* XXX This assumes ASCII! */ case '\n': break; @@ -1039,28 +1175,18 @@ PyObject *PyBytes_DecodeEscape(const char *s, *p++ = c; break; case 'x': - if (s+1 < end && Py_ISXDIGIT(s[0]) && Py_ISXDIGIT(s[1])) { - unsigned int x = 0; - c = Py_CHARMASK(*s); - s++; - if (Py_ISDIGIT(c)) - x = c - '0'; - else if (Py_ISLOWER(c)) - x = 10 + c - 'a'; - else - x = 10 + c - 'A'; - x = x << 4; - c = Py_CHARMASK(*s); - s++; - if (Py_ISDIGIT(c)) - x += c - '0'; - else if (Py_ISLOWER(c)) - x += 10 + c - 'a'; - else - x += 10 + c - 'A'; - *p++ = x; - break; + if (s+1 < end) { + int digit1, digit2; + digit1 = _PyLong_DigitValue[Py_CHARMASK(s[0])]; + digit2 = _PyLong_DigitValue[Py_CHARMASK(s[1])]; + if (digit1 < 16 && digit2 < 16) { + *p++ = (unsigned char)((digit1 << 4) + digit2); + s += 2; + break; + } } + /* invalid hexadecimal digits */ + if (!errors || strcmp(errors, "strict") == 0) { PyErr_Format(PyExc_ValueError, "invalid \\x escape at position %d", @@ -1082,21 +1208,49 @@ PyObject *PyBytes_DecodeEscape(const char *s, if (s < end && Py_ISXDIGIT(s[0])) s++; /* and a hexdigit */ break; + default: + if (*first_invalid_escape == NULL) { + *first_invalid_escape = s-1; /* Back up one char, since we've + already incremented s. */ + } *p++ = '\\'; s--; goto non_esc; /* an arbitrary number of unescaped UTF-8 bytes may follow. */ } } - if (p-buf < newlen) - _PyBytes_Resize(&v, p - buf); - return v; + + return _PyBytesWriter_Finish(&writer, p); + failed: - Py_DECREF(v); + _PyBytesWriter_Dealloc(&writer); return NULL; } +PyObject *PyBytes_DecodeEscape(const char *s, + Py_ssize_t len, + const char *errors, + Py_ssize_t unicode, + const char *recode_encoding) +{ + const char* first_invalid_escape; + PyObject *result = _PyBytes_DecodeEscape(s, len, errors, unicode, + recode_encoding, + &first_invalid_escape); + if (result == NULL) + return NULL; + if (first_invalid_escape != NULL) { + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "invalid escape sequence '\\%c'", + *first_invalid_escape) < 0) { + Py_DECREF(result); + return NULL; + } + } + return result; + +} /* -------------------------------------------------------------------- */ /* object api */ @@ -1272,7 +1426,7 @@ bytes_concat(PyObject *a, PyObject *b) if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 || PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) { PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s", - Py_TYPE(b)->tp_name, Py_TYPE(a)->tp_name); + Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name); goto done; } @@ -1348,12 +1502,12 @@ bytes_repeat(PyBytesObject *a, Py_ssize_t n) } i = 0; if (i < size) { - Py_MEMCPY(op->ob_sval, a->ob_sval, Py_SIZE(a)); + memcpy(op->ob_sval, a->ob_sval, Py_SIZE(a)); i = Py_SIZE(a); } while (i < size) { j = (i <= size-i) ? i : size-i; - Py_MEMCPY(op->ob_sval+i, op->ob_sval, j); + memcpy(op->ob_sval+i, op->ob_sval, j); i += j; } return (PyObject *) op; @@ -1362,24 +1516,7 @@ bytes_repeat(PyBytesObject *a, Py_ssize_t n) static int bytes_contains(PyObject *self, PyObject *arg) { - Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError); - if (ival == -1 && PyErr_Occurred()) { - Py_buffer varg; - Py_ssize_t pos; - PyErr_Clear(); - if (PyObject_GetBuffer(arg, &varg, PyBUF_SIMPLE) != 0) - return -1; - pos = stringlib_find(PyBytes_AS_STRING(self), Py_SIZE(self), - varg.buf, varg.len, 0); - PyBuffer_Release(&varg); - return pos >= 0; - } - if (ival < 0 || ival >= 256) { - PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)"); - return -1; - } - - return memchr(PyBytes_AS_STRING(self), (int) ival, Py_SIZE(self)) != NULL; + return _Py_bytes_contains(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), arg); } static PyObject * @@ -1392,7 +1529,7 @@ bytes_item(PyBytesObject *a, Py_ssize_t i) return PyLong_FromLong((unsigned char)a->ob_sval[i]); } -Py_LOCAL(int) +static int bytes_compare_eq(PyBytesObject *a, PyBytesObject *b) { int cmp; @@ -1534,11 +1671,11 @@ bytes_subscript(PyBytesObject* self, PyObject* item) char* result_buf; PyObject* result; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + PyBytes_GET_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(PyBytes_GET_SIZE(self), &start, - &stop, step); if (slicelength <= 0) { return PyBytes_FromStringAndSize("", 0); @@ -1626,8 +1763,8 @@ Return a list of the sections in the bytes, using sep as the delimiter. [clinic start generated code]*/ static PyObject * -bytes_split_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit) -/*[clinic end generated code: output=8bde44dacb36ef2e input=8b809b39074abbfa]*/ +bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit) +/*[clinic end generated code: output=52126b5844c1d8ef input=8b809b39074abbfa]*/ { Py_ssize_t len = PyBytes_GET_SIZE(self), n; const char *s = PyBytes_AS_STRING(self), *sub; @@ -1651,7 +1788,6 @@ bytes_split_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit) /*[clinic input] bytes.partition - self: self(type="PyBytesObject *") sep: Py_buffer / @@ -1667,7 +1803,7 @@ object and two empty bytes objects. static PyObject * bytes_partition_impl(PyBytesObject *self, Py_buffer *sep) -/*[clinic end generated code: output=f532b392a17ff695 input=bc855dc63ca949de]*/ +/*[clinic end generated code: output=f532b392a17ff695 input=61cca95519406099]*/ { return stringlib_partition( (PyObject*) self, @@ -1679,7 +1815,6 @@ bytes_partition_impl(PyBytesObject *self, Py_buffer *sep) /*[clinic input] bytes.rpartition - self: self(type="PyBytesObject *") sep: Py_buffer / @@ -1695,7 +1830,7 @@ objects and the original bytes object. static PyObject * bytes_rpartition_impl(PyBytesObject *self, Py_buffer *sep) -/*[clinic end generated code: output=191b114cbb028e50 input=6588fff262a9170e]*/ +/*[clinic end generated code: output=191b114cbb028e50 input=67f689e63a62d478]*/ { return stringlib_rpartition( (PyObject*) self, @@ -1713,8 +1848,8 @@ Splitting is done starting at the end of the bytes and working to the front. [clinic start generated code]*/ static PyObject * -bytes_rsplit_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit) -/*[clinic end generated code: output=0b6570b977911d88 input=0f86c9f28f7d7b7b]*/ +bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit) +/*[clinic end generated code: output=ba698d9ea01e1c8f input=0f86c9f28f7d7b7b]*/ { Py_ssize_t len = PyBytes_GET_SIZE(self), n; const char *s = PyBytes_AS_STRING(self), *sub; @@ -1752,8 +1887,8 @@ Example: b'.'.join([b'ab', b'pq', b'rs']) -> b'ab.pq.rs'. [clinic start generated code]*/ static PyObject * -bytes_join(PyBytesObject*self, PyObject *iterable_of_bytes) -/*[clinic end generated code: output=634aff14764ff997 input=7fe377b95bd549d2]*/ +bytes_join(PyBytesObject *self, PyObject *iterable_of_bytes) +/*[clinic end generated code: output=a046f379f626f6f8 input=7fe377b95bd549d2]*/ { return stringlib_bytes_join((PyObject*)self, iterable_of_bytes); } @@ -1766,158 +1901,30 @@ _PyBytes_Join(PyObject *sep, PyObject *x) return bytes_join((PyBytesObject*)sep, x); } -/* helper macro to fixup start/end slice values */ -#define ADJUST_INDICES(start, end, len) \ - if (end > len) \ - end = len; \ - else if (end < 0) { \ - end += len; \ - if (end < 0) \ - end = 0; \ - } \ - if (start < 0) { \ - start += len; \ - if (start < 0) \ - start = 0; \ - } - -Py_LOCAL_INLINE(Py_ssize_t) -bytes_find_internal(PyBytesObject *self, PyObject *args, int dir) -{ - PyObject *subobj; - char byte; - Py_buffer subbuf; - const char *sub; - Py_ssize_t len, sub_len; - Py_ssize_t start=0, end=PY_SSIZE_T_MAX; - Py_ssize_t res; - - if (!stringlib_parse_args_finds_byte("find/rfind/index/rindex", - args, &subobj, &byte, &start, &end)) - return -2; - - if (subobj) { - if (PyObject_GetBuffer(subobj, &subbuf, PyBUF_SIMPLE) != 0) - return -2; - - sub = subbuf.buf; - sub_len = subbuf.len; - } - else { - sub = &byte; - sub_len = 1; - } - len = PyBytes_GET_SIZE(self); - - ADJUST_INDICES(start, end, len); - if (end - start < sub_len) - res = -1; - else if (sub_len == 1 -#ifndef HAVE_MEMRCHR - && dir > 0 -#endif - ) { - unsigned char needle = *sub; - int mode = (dir > 0) ? FAST_SEARCH : FAST_RSEARCH; - res = stringlib_fastsearch_memchr_1char( - PyBytes_AS_STRING(self) + start, end - start, - needle, needle, mode); - if (res >= 0) - res += start; - } - else { - if (dir > 0) - res = stringlib_find_slice( - PyBytes_AS_STRING(self), len, - sub, sub_len, start, end); - else - res = stringlib_rfind_slice( - PyBytes_AS_STRING(self), len, - sub, sub_len, start, end); - } - - if (subobj) - PyBuffer_Release(&subbuf); - - return res; -} - - -PyDoc_STRVAR(find__doc__, -"B.find(sub[, start[, end]]) -> int\n\ -\n\ -Return the lowest index in B where substring sub is found,\n\ -such that sub is contained within B[start:end]. Optional\n\ -arguments start and end are interpreted as in slice notation.\n\ -\n\ -Return -1 on failure."); - static PyObject * bytes_find(PyBytesObject *self, PyObject *args) { - Py_ssize_t result = bytes_find_internal(self, args, +1); - if (result == -2) - return NULL; - return PyLong_FromSsize_t(result); + return _Py_bytes_find(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } - -PyDoc_STRVAR(index__doc__, -"B.index(sub[, start[, end]]) -> int\n\ -\n\ -Like B.find() but raise ValueError when the substring is not found."); - static PyObject * bytes_index(PyBytesObject *self, PyObject *args) { - Py_ssize_t result = bytes_find_internal(self, args, +1); - if (result == -2) - return NULL; - if (result == -1) { - PyErr_SetString(PyExc_ValueError, - "substring not found"); - return NULL; - } - return PyLong_FromSsize_t(result); + return _Py_bytes_index(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } -PyDoc_STRVAR(rfind__doc__, -"B.rfind(sub[, start[, end]]) -> int\n\ -\n\ -Return the highest index in B where substring sub is found,\n\ -such that sub is contained within B[start:end]. Optional\n\ -arguments start and end are interpreted as in slice notation.\n\ -\n\ -Return -1 on failure."); - static PyObject * bytes_rfind(PyBytesObject *self, PyObject *args) { - Py_ssize_t result = bytes_find_internal(self, args, -1); - if (result == -2) - return NULL; - return PyLong_FromSsize_t(result); + return _Py_bytes_rfind(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } -PyDoc_STRVAR(rindex__doc__, -"B.rindex(sub[, start[, end]]) -> int\n\ -\n\ -Like B.rfind() but raise ValueError when the substring is not found."); - static PyObject * bytes_rindex(PyBytesObject *self, PyObject *args) { - Py_ssize_t result = bytes_find_internal(self, args, -1); - if (result == -2) - return NULL; - if (result == -1) { - PyErr_SetString(PyExc_ValueError, - "substring not found"); - return NULL; - } - return PyLong_FromSsize_t(result); + return _Py_bytes_rindex(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } @@ -2004,7 +2011,6 @@ do_argstrip(PyBytesObject *self, int striptype, PyObject *bytes) /*[clinic input] bytes.strip - self: self(type="PyBytesObject *") bytes: object = None / @@ -2015,7 +2021,7 @@ If the argument is omitted or None, strip leading and trailing ASCII whitespace. static PyObject * bytes_strip_impl(PyBytesObject *self, PyObject *bytes) -/*[clinic end generated code: output=c7c228d3bd104a1b input=37daa5fad1395d95]*/ +/*[clinic end generated code: output=c7c228d3bd104a1b input=8a354640e4e0b3ef]*/ { return do_argstrip(self, BOTHSTRIP, bytes); } @@ -2023,7 +2029,6 @@ bytes_strip_impl(PyBytesObject *self, PyObject *bytes) /*[clinic input] bytes.lstrip - self: self(type="PyBytesObject *") bytes: object = None / @@ -2034,7 +2039,7 @@ If the argument is omitted or None, strip leading ASCII whitespace. static PyObject * bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes) -/*[clinic end generated code: output=28602e586f524e82 input=88811b09dfbc2988]*/ +/*[clinic end generated code: output=28602e586f524e82 input=9baff4398c3f6857]*/ { return do_argstrip(self, LEFTSTRIP, bytes); } @@ -2042,7 +2047,6 @@ bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes) /*[clinic input] bytes.rstrip - self: self(type="PyBytesObject *") bytes: object = None / @@ -2053,81 +2057,37 @@ If the argument is omitted or None, strip trailing ASCII whitespace. static PyObject * bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes) -/*[clinic end generated code: output=547e3815c95447da input=8f93c9cd361f0140]*/ +/*[clinic end generated code: output=547e3815c95447da input=b78af445c727e32b]*/ { return do_argstrip(self, RIGHTSTRIP, bytes); } -PyDoc_STRVAR(count__doc__, -"B.count(sub[, start[, end]]) -> int\n\ -\n\ -Return the number of non-overlapping occurrences of substring sub in\n\ -string B[start:end]. Optional arguments start and end are interpreted\n\ -as in slice notation."); - static PyObject * bytes_count(PyBytesObject *self, PyObject *args) { - PyObject *sub_obj; - const char *str = PyBytes_AS_STRING(self), *sub; - Py_ssize_t sub_len; - char byte; - Py_ssize_t start = 0, end = PY_SSIZE_T_MAX; + return _Py_bytes_count(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); +} - Py_buffer vsub; - PyObject *count_obj; - if (!stringlib_parse_args_finds_byte("count", args, &sub_obj, &byte, - &start, &end)) - return NULL; +/*[clinic input] +bytes.translate - if (sub_obj) { - if (PyObject_GetBuffer(sub_obj, &vsub, PyBUF_SIMPLE) != 0) - return NULL; - - sub = vsub.buf; - sub_len = vsub.len; - } - else { - sub = &byte; - sub_len = 1; - } - - ADJUST_INDICES(start, end, PyBytes_GET_SIZE(self)); - - count_obj = PyLong_FromSsize_t( - stringlib_count(str + start, end - start, sub, sub_len, PY_SSIZE_T_MAX) - ); - - if (sub_obj) - PyBuffer_Release(&vsub); - - return count_obj; -} - - -/*[clinic input] -bytes.translate - - self: self(type="PyBytesObject *") - table: object - Translation table, which must be a bytes object of length 256. - [ - deletechars: object - ] - / + table: object + Translation table, which must be a bytes object of length 256. + / + delete as deletechars: object(c_default="NULL") = b'' Return a copy with each character mapped by the given translation table. -All characters occurring in the optional argument deletechars are removed. +All characters occurring in the optional argument delete are removed. The remaining characters are mapped through the given translation table. [clinic start generated code]*/ static PyObject * -bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1, +bytes_translate_impl(PyBytesObject *self, PyObject *table, PyObject *deletechars) -/*[clinic end generated code: output=233df850eb50bf8d input=d8fa5519d7cc4be7]*/ +/*[clinic end generated code: output=43be3437f1956211 input=0ecdf159f654233c]*/ { char *input, *output; Py_buffer table_view = {NULL, NULL}; @@ -2188,7 +2148,7 @@ bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1, PyBuffer_Release(&table_view); return NULL; } - output_start = output = PyBytes_AsString(result); + output_start = output = PyBytes_AS_STRING(result); input = PyBytes_AS_STRING(input_obj); if (dellen == 0 && table_chars != NULL) { @@ -2264,498 +2224,6 @@ bytes_maketrans_impl(Py_buffer *frm, Py_buffer *to) return _Py_bytes_maketrans(frm, to); } -/* find and count characters and substrings */ - -#define findchar(target, target_len, c) \ - ((char *)memchr((const void *)(target), c, target_len)) - -/* String ops must return a string. */ -/* If the object is subclass of string, create a copy */ -Py_LOCAL(PyBytesObject *) -return_self(PyBytesObject *self) -{ - if (PyBytes_CheckExact(self)) { - Py_INCREF(self); - return self; - } - return (PyBytesObject *)PyBytes_FromStringAndSize( - PyBytes_AS_STRING(self), - PyBytes_GET_SIZE(self)); -} - -Py_LOCAL_INLINE(Py_ssize_t) -countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount) -{ - Py_ssize_t count=0; - const char *start=target; - const char *end=target+target_len; - - while ( (start=findchar(start, end-start, c)) != NULL ) { - count++; - if (count >= maxcount) - break; - start += 1; - } - return count; -} - - -/* Algorithms for different cases of string replacement */ - -/* len(self)>=1, from="", len(to)>=1, maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_interleave(PyBytesObject *self, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - Py_ssize_t self_len, result_len; - Py_ssize_t count, i; - PyBytesObject *result; - - self_len = PyBytes_GET_SIZE(self); - - /* 1 at the end plus 1 after every character; - count = min(maxcount, self_len + 1) */ - if (maxcount <= self_len) - count = maxcount; - else - /* Can't overflow: self_len + 1 <= maxcount <= PY_SSIZE_T_MAX. */ - count = self_len + 1; - - /* Check for overflow */ - /* result_len = count * to_len + self_len; */ - assert(count > 0); - if (to_len > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, - "replacement bytes are too long"); - return NULL; - } - result_len = count * to_len + self_len; - - if (! (result = (PyBytesObject *) - PyBytes_FromStringAndSize(NULL, result_len)) ) - return NULL; - - self_s = PyBytes_AS_STRING(self); - result_s = PyBytes_AS_STRING(result); - - /* TODO: special case single character, which doesn't need memcpy */ - - /* Lay the first one down (guaranteed this will occur) */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - count -= 1; - - for (i=0; i=1, len(from)==1, to="", maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_delete_single_character(PyBytesObject *self, - char from_c, Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count; - PyBytesObject *result; - - self_len = PyBytes_GET_SIZE(self); - self_s = PyBytes_AS_STRING(self); - - count = countchar(self_s, self_len, from_c, maxcount); - if (count == 0) { - return return_self(self); - } - - result_len = self_len - count; /* from_len == 1 */ - assert(result_len>=0); - - if ( (result = (PyBytesObject *) - PyBytes_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyBytes_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - start = next+1; - } - Py_MEMCPY(result_s, start, end-start); - - return result; -} - -/* len(self)>=1, len(from)>=2, to="", maxcount>=1 */ - -Py_LOCAL(PyBytesObject *) -replace_delete_substring(PyBytesObject *self, - const char *from_s, Py_ssize_t from_len, - Py_ssize_t maxcount) { - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count, offset; - PyBytesObject *result; - - self_len = PyBytes_GET_SIZE(self); - self_s = PyBytes_AS_STRING(self); - - count = stringlib_count(self_s, self_len, - from_s, from_len, - maxcount); - - if (count == 0) { - /* no matches */ - return return_self(self); - } - - result_len = self_len - (count * from_len); - assert (result_len>=0); - - if ( (result = (PyBytesObject *) - PyBytes_FromStringAndSize(NULL, result_len)) == NULL ) - return NULL; - - result_s = PyBytes_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset == -1) - break; - next = start + offset; - - Py_MEMCPY(result_s, start, next-start); - - result_s += (next-start); - start = next+from_len; - } - Py_MEMCPY(result_s, start, end-start); - return result; -} - -/* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_single_character_in_place(PyBytesObject *self, - char from_c, char to_c, - Py_ssize_t maxcount) -{ - char *self_s, *result_s, *start, *end, *next; - Py_ssize_t self_len; - PyBytesObject *result; - - /* The result string will be the same size */ - self_s = PyBytes_AS_STRING(self); - self_len = PyBytes_GET_SIZE(self); - - next = findchar(self_s, self_len, from_c); - - if (next == NULL) { - /* No matches; return the original string */ - return return_self(self); - } - - /* Need to make a new string */ - result = (PyBytesObject *) PyBytes_FromStringAndSize(NULL, self_len); - if (result == NULL) - return NULL; - result_s = PyBytes_AS_STRING(result); - Py_MEMCPY(result_s, self_s, self_len); - - /* change everything in-place, starting with this one */ - start = result_s + (next-self_s); - *start = to_c; - start++; - end = result_s + self_len; - - while (--maxcount > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - *next = to_c; - start = next+1; - } - - return result; -} - -/* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_substring_in_place(PyBytesObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *result_s, *start, *end; - char *self_s; - Py_ssize_t self_len, offset; - PyBytesObject *result; - - /* The result string will be the same size */ - - self_s = PyBytes_AS_STRING(self); - self_len = PyBytes_GET_SIZE(self); - - offset = stringlib_find(self_s, self_len, - from_s, from_len, - 0); - if (offset == -1) { - /* No matches; return the original string */ - return return_self(self); - } - - /* Need to make a new string */ - result = (PyBytesObject *) PyBytes_FromStringAndSize(NULL, self_len); - if (result == NULL) - return NULL; - result_s = PyBytes_AS_STRING(result); - Py_MEMCPY(result_s, self_s, self_len); - - /* change everything in-place, starting with this one */ - start = result_s + offset; - Py_MEMCPY(start, to_s, from_len); - start += from_len; - end = result_s + self_len; - - while ( --maxcount > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset==-1) - break; - Py_MEMCPY(start+offset, to_s, from_len); - start += offset+from_len; - } - - return result; -} - -/* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_single_character(PyBytesObject *self, - char from_c, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count; - PyBytesObject *result; - - self_s = PyBytes_AS_STRING(self); - self_len = PyBytes_GET_SIZE(self); - - count = countchar(self_s, self_len, from_c, maxcount); - if (count == 0) { - /* no matches, return unchanged */ - return return_self(self); - } - - /* use the difference between current and new, hence the "-1" */ - /* result_len = self_len + count * (to_len-1) */ - assert(count > 0); - if (to_len - 1 > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, - "replacement bytes are too long"); - return NULL; - } - result_len = self_len + count * (to_len - 1); - - if ( (result = (PyBytesObject *) - PyBytes_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyBytes_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - next = findchar(start, end-start, from_c); - if (next == NULL) - break; - - if (next == start) { - /* replace with the 'to' */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start += 1; - } else { - /* copy the unchanged old then the 'to' */ - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start = next+1; - } - } - /* Copy the remainder of the remaining string */ - Py_MEMCPY(result_s, start, end-start); - - return result; -} - -/* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */ -Py_LOCAL(PyBytesObject *) -replace_substring(PyBytesObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) { - char *self_s, *result_s; - char *start, *next, *end; - Py_ssize_t self_len, result_len; - Py_ssize_t count, offset; - PyBytesObject *result; - - self_s = PyBytes_AS_STRING(self); - self_len = PyBytes_GET_SIZE(self); - - count = stringlib_count(self_s, self_len, - from_s, from_len, - maxcount); - - if (count == 0) { - /* no matches, return unchanged */ - return return_self(self); - } - - /* Check for overflow */ - /* result_len = self_len + count * (to_len-from_len) */ - assert(count > 0); - if (to_len - from_len > (PY_SSIZE_T_MAX - self_len) / count) { - PyErr_SetString(PyExc_OverflowError, - "replacement bytes are too long"); - return NULL; - } - result_len = self_len + count * (to_len-from_len); - - if ( (result = (PyBytesObject *) - PyBytes_FromStringAndSize(NULL, result_len)) == NULL) - return NULL; - result_s = PyBytes_AS_STRING(result); - - start = self_s; - end = self_s + self_len; - while (count-- > 0) { - offset = stringlib_find(start, end-start, - from_s, from_len, - 0); - if (offset == -1) - break; - next = start+offset; - if (next == start) { - /* replace with the 'to' */ - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start += from_len; - } else { - /* copy the unchanged old then the 'to' */ - Py_MEMCPY(result_s, start, next-start); - result_s += (next-start); - Py_MEMCPY(result_s, to_s, to_len); - result_s += to_len; - start = next+from_len; - } - } - /* Copy the remainder of the remaining string */ - Py_MEMCPY(result_s, start, end-start); - - return result; -} - - -Py_LOCAL(PyBytesObject *) -replace(PyBytesObject *self, - const char *from_s, Py_ssize_t from_len, - const char *to_s, Py_ssize_t to_len, - Py_ssize_t maxcount) -{ - if (maxcount < 0) { - maxcount = PY_SSIZE_T_MAX; - } else if (maxcount == 0 || PyBytes_GET_SIZE(self) == 0) { - /* nothing to do; return the original string */ - return return_self(self); - } - - if (maxcount == 0 || - (from_len == 0 && to_len == 0)) { - /* nothing to do; return the original string */ - return return_self(self); - } - - /* Handle zero-length special cases */ - - if (from_len == 0) { - /* insert the 'to' string everywhere. */ - /* >>> "Python".replace("", ".") */ - /* '.P.y.t.h.o.n.' */ - return replace_interleave(self, to_s, to_len, maxcount); - } - - /* Except for "".replace("", "A") == "A" there is no way beyond this */ - /* point for an empty self string to generate a non-empty string */ - /* Special case so the remaining code always gets a non-empty string */ - if (PyBytes_GET_SIZE(self) == 0) { - return return_self(self); - } - - if (to_len == 0) { - /* delete all occurrences of 'from' string */ - if (from_len == 1) { - return replace_delete_single_character( - self, from_s[0], maxcount); - } else { - return replace_delete_substring(self, from_s, - from_len, maxcount); - } - } - - /* Handle special case where both strings have the same length */ - - if (from_len == to_len) { - if (from_len == 1) { - return replace_single_character_in_place( - self, - from_s[0], - to_s[0], - maxcount); - } else { - return replace_substring_in_place( - self, from_s, from_len, to_s, to_len, - maxcount); - } - } - - /* Otherwise use the more generic algorithms */ - if (from_len == 1) { - return replace_single_character(self, from_s[0], - to_s, to_len, maxcount); - } else { - /* len('from')>=2, len('to')>=1 */ - return replace_substring(self, from_s, from_len, to_s, to_len, - maxcount); - } -} - /*[clinic input] bytes.replace @@ -2774,156 +2242,28 @@ replaced. [clinic start generated code]*/ static PyObject * -bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new, +bytes_replace_impl(PyBytesObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count) -/*[clinic end generated code: output=403dc9d7a83c5a1d input=b2fbbf0bf04de8e5]*/ +/*[clinic end generated code: output=994fa588b6b9c104 input=b2fbbf0bf04de8e5]*/ { - return (PyObject *)replace((PyBytesObject *) self, - (const char *)old->buf, old->len, - (const char *)new->buf, new->len, count); + return stringlib_replace((PyObject *)self, + (const char *)old->buf, old->len, + (const char *)new->buf, new->len, count); } /** End DALKE **/ -/* Matches the end (direction >= 0) or start (direction < 0) of self - * against substr, using the start and end arguments. Returns - * -1 on error, 0 if not found and 1 if found. - */ -Py_LOCAL(int) -_bytes_tailmatch(PyBytesObject *self, PyObject *substr, Py_ssize_t start, - Py_ssize_t end, int direction) -{ - Py_ssize_t len = PyBytes_GET_SIZE(self); - Py_ssize_t slen; - Py_buffer sub_view = {NULL, NULL}; - const char* sub; - const char* str; - - if (PyBytes_Check(substr)) { - sub = PyBytes_AS_STRING(substr); - slen = PyBytes_GET_SIZE(substr); - } - else { - if (PyObject_GetBuffer(substr, &sub_view, PyBUF_SIMPLE) != 0) - return -1; - sub = sub_view.buf; - slen = sub_view.len; - } - str = PyBytes_AS_STRING(self); - - ADJUST_INDICES(start, end, len); - - if (direction < 0) { - /* startswith */ - if (start+slen > len) - goto notfound; - } else { - /* endswith */ - if (end-start < slen || start > len) - goto notfound; - - if (end-slen > start) - start = end - slen; - } - if (end-start < slen) - goto notfound; - if (memcmp(str+start, sub, slen) != 0) - goto notfound; - - PyBuffer_Release(&sub_view); - return 1; - -notfound: - PyBuffer_Release(&sub_view); - return 0; -} - - -PyDoc_STRVAR(startswith__doc__, -"B.startswith(prefix[, start[, end]]) -> bool\n\ -\n\ -Return True if B starts with the specified prefix, False otherwise.\n\ -With optional start, test B beginning at that position.\n\ -With optional end, stop comparing B at that position.\n\ -prefix can also be a tuple of bytes to try."); static PyObject * bytes_startswith(PyBytesObject *self, PyObject *args) { - Py_ssize_t start = 0; - Py_ssize_t end = PY_SSIZE_T_MAX; - PyObject *subobj; - int result; - - if (!stringlib_parse_args_finds("startswith", args, &subobj, &start, &end)) - return NULL; - if (PyTuple_Check(subobj)) { - Py_ssize_t i; - for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - result = _bytes_tailmatch(self, - PyTuple_GET_ITEM(subobj, i), - start, end, -1); - if (result == -1) - return NULL; - else if (result) { - Py_RETURN_TRUE; - } - } - Py_RETURN_FALSE; - } - result = _bytes_tailmatch(self, subobj, start, end, -1); - if (result == -1) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "startswith first arg must be bytes " - "or a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name); - return NULL; - } - else - return PyBool_FromLong(result); + return _Py_bytes_startswith(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } - -PyDoc_STRVAR(endswith__doc__, -"B.endswith(suffix[, start[, end]]) -> bool\n\ -\n\ -Return True if B ends with the specified suffix, False otherwise.\n\ -With optional start, test B beginning at that position.\n\ -With optional end, stop comparing B at that position.\n\ -suffix can also be a tuple of bytes to try."); - static PyObject * bytes_endswith(PyBytesObject *self, PyObject *args) { - Py_ssize_t start = 0; - Py_ssize_t end = PY_SSIZE_T_MAX; - PyObject *subobj; - int result; - - if (!stringlib_parse_args_finds("endswith", args, &subobj, &start, &end)) - return NULL; - if (PyTuple_Check(subobj)) { - Py_ssize_t i; - for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - result = _bytes_tailmatch(self, - PyTuple_GET_ITEM(subobj, i), - start, end, +1); - if (result == -1) - return NULL; - else if (result) { - Py_RETURN_TRUE; - } - } - Py_RETURN_FALSE; - } - result = _bytes_tailmatch(self, subobj, start, end, +1); - if (result == -1) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "endswith first arg must be bytes or " - "a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name); - return NULL; - } - else - return PyBool_FromLong(result); + return _Py_bytes_endswith(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), args); } @@ -2943,9 +2283,9 @@ Decode the bytes using the codec registered for encoding. [clinic start generated code]*/ static PyObject * -bytes_decode_impl(PyBytesObject*self, const char *encoding, +bytes_decode_impl(PyBytesObject *self, const char *encoding, const char *errors) -/*[clinic end generated code: output=2d2016ff8e0bb176 input=958174769d2a40ca]*/ +/*[clinic end generated code: output=5649a53dde27b314 input=958174769d2a40ca]*/ { return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors); } @@ -2963,8 +2303,8 @@ true. [clinic start generated code]*/ static PyObject * -bytes_splitlines_impl(PyBytesObject*self, int keepends) -/*[clinic end generated code: output=995c3598f7833cad input=7f4aac67144f9944]*/ +bytes_splitlines_impl(PyBytesObject *self, int keepends) +/*[clinic end generated code: output=3484149a5d880ffb input=7f4aac67144f9944]*/ { return stringlib_splitlines( (PyObject*) self, PyBytes_AS_STRING(self), @@ -2972,22 +2312,6 @@ bytes_splitlines_impl(PyBytesObject*self, int keepends) ); } -static int -hex_digit_to_int(Py_UCS4 c) -{ - if (c >= 128) - return -1; - if (Py_ISDIGIT(c)) - return c - '0'; - else { - if (Py_ISUPPER(c)) - c = Py_TOLOWER(c); - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - } - return -1; -} - /*[clinic input] @classmethod bytes.fromhex @@ -3005,47 +2329,88 @@ static PyObject * bytes_fromhex_impl(PyTypeObject *type, PyObject *string) /*[clinic end generated code: output=0973acc63661bb2e input=bf4d1c361670acd3]*/ { - PyObject *newstring; + PyObject *result = _PyBytes_FromHex(string, 0); + if (type != &PyBytes_Type && result != NULL) { + Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type, + result, NULL)); + } + return result; +} + +PyObject* +_PyBytes_FromHex(PyObject *string, int use_bytearray) +{ char *buf; - Py_ssize_t hexlen, byteslen, i, j; - int top, bot; - void *data; - unsigned int kind; + Py_ssize_t hexlen, invalid_char; + unsigned int top, bot; + Py_UCS1 *str, *end; + _PyBytesWriter writer; + + _PyBytesWriter_Init(&writer); + writer.use_bytearray = use_bytearray; assert(PyUnicode_Check(string)); if (PyUnicode_READY(string)) return NULL; - kind = PyUnicode_KIND(string); - data = PyUnicode_DATA(string); hexlen = PyUnicode_GET_LENGTH(string); - byteslen = hexlen/2; /* This overestimates if there are spaces */ - newstring = PyBytes_FromStringAndSize(NULL, byteslen); - if (!newstring) + if (!PyUnicode_IS_ASCII(string)) { + void *data = PyUnicode_DATA(string); + unsigned int kind = PyUnicode_KIND(string); + Py_ssize_t i; + + /* search for the first non-ASCII character */ + for (i = 0; i < hexlen; i++) { + if (PyUnicode_READ(kind, data, i) >= 128) + break; + } + invalid_char = i; + goto error; + } + + assert(PyUnicode_KIND(string) == PyUnicode_1BYTE_KIND); + str = PyUnicode_1BYTE_DATA(string); + + /* This overestimates if there are spaces */ + buf = _PyBytesWriter_Alloc(&writer, hexlen / 2); + if (buf == NULL) return NULL; - buf = PyBytes_AS_STRING(newstring); - for (i = j = 0; i < hexlen; i += 2) { + + end = str + hexlen; + while (str < end) { /* skip over spaces in the input */ - while (PyUnicode_READ(kind, data, i) == ' ') - i++; - if (i >= hexlen) - break; - top = hex_digit_to_int(PyUnicode_READ(kind, data, i)); - bot = hex_digit_to_int(PyUnicode_READ(kind, data, i+1)); - if (top == -1 || bot == -1) { - PyErr_Format(PyExc_ValueError, - "non-hexadecimal number found in " - "fromhex() arg at position %zd", i); + if (*str == ' ') { + do { + str++; + } while (*str == ' '); + if (str >= end) + break; + } + + top = _PyLong_DigitValue[*str]; + if (top >= 16) { + invalid_char = str - PyUnicode_1BYTE_DATA(string); goto error; } - buf[j++] = (top << 4) + bot; + str++; + + bot = _PyLong_DigitValue[*str]; + if (bot >= 16) { + invalid_char = str - PyUnicode_1BYTE_DATA(string); + goto error; + } + str++; + + *buf++ = (unsigned char)((top << 4) + bot); } - if (j != byteslen && _PyBytes_Resize(&newstring, j) < 0) - goto error; - return newstring; + + return _PyBytesWriter_Finish(&writer, buf); error: - Py_XDECREF(newstring); + PyErr_Format(PyExc_ValueError, + "non-hexadecimal number found in " + "fromhex() arg at position %zd", invalid_char); + _PyBytesWriter_Dealloc(&writer); return NULL; } @@ -3075,17 +2440,20 @@ bytes_methods[] = { {"__getnewargs__", (PyCFunction)bytes_getnewargs, METH_NOARGS}, {"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS, _Py_capitalize__doc__}, - {"center", (PyCFunction)stringlib_center, METH_VARARGS, center__doc__}, - {"count", (PyCFunction)bytes_count, METH_VARARGS, count__doc__}, + {"center", (PyCFunction)stringlib_center, METH_VARARGS, + _Py_center__doc__}, + {"count", (PyCFunction)bytes_count, METH_VARARGS, + _Py_count__doc__}, BYTES_DECODE_METHODDEF {"endswith", (PyCFunction)bytes_endswith, METH_VARARGS, - endswith__doc__}, + _Py_endswith__doc__}, {"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS | METH_KEYWORDS, - expandtabs__doc__}, - {"find", (PyCFunction)bytes_find, METH_VARARGS, find__doc__}, + _Py_expandtabs__doc__}, + {"find", (PyCFunction)bytes_find, METH_VARARGS, + _Py_find__doc__}, BYTES_FROMHEX_METHODDEF {"hex", (PyCFunction)bytes_hex, METH_NOARGS, hex__doc__}, - {"index", (PyCFunction)bytes_index, METH_VARARGS, index__doc__}, + {"index", (PyCFunction)bytes_index, METH_VARARGS, _Py_index__doc__}, {"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS, _Py_isalnum__doc__}, {"isalpha", (PyCFunction)stringlib_isalpha, METH_NOARGS, @@ -3101,38 +2469,40 @@ bytes_methods[] = { {"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS, _Py_isupper__doc__}, BYTES_JOIN_METHODDEF - {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, ljust__doc__}, + {"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, _Py_ljust__doc__}, {"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__}, BYTES_LSTRIP_METHODDEF BYTES_MAKETRANS_METHODDEF BYTES_PARTITION_METHODDEF BYTES_REPLACE_METHODDEF - {"rfind", (PyCFunction)bytes_rfind, METH_VARARGS, rfind__doc__}, - {"rindex", (PyCFunction)bytes_rindex, METH_VARARGS, rindex__doc__}, - {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, rjust__doc__}, + {"rfind", (PyCFunction)bytes_rfind, METH_VARARGS, _Py_rfind__doc__}, + {"rindex", (PyCFunction)bytes_rindex, METH_VARARGS, _Py_rindex__doc__}, + {"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, _Py_rjust__doc__}, BYTES_RPARTITION_METHODDEF BYTES_RSPLIT_METHODDEF BYTES_RSTRIP_METHODDEF BYTES_SPLIT_METHODDEF BYTES_SPLITLINES_METHODDEF {"startswith", (PyCFunction)bytes_startswith, METH_VARARGS, - startswith__doc__}, + _Py_startswith__doc__}, BYTES_STRIP_METHODDEF {"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS, _Py_swapcase__doc__}, {"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__}, BYTES_TRANSLATE_METHODDEF {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__}, - {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__}, + {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, _Py_zfill__doc__}, {NULL, NULL} /* sentinel */ }; static PyObject * -bytes_mod(PyObject *v, PyObject *w) +bytes_mod(PyObject *self, PyObject *arg) { - if (!PyBytes_Check(v)) + if (!PyBytes_Check(self)) { Py_RETURN_NOTIMPLEMENTED; - return _PyBytes_Format(v, w); + } + return _PyBytes_FormatEx(PyBytes_AS_STRING(self), PyBytes_GET_SIZE(self), + arg, 0); } static PyNumberMethods bytes_as_number = { @@ -3221,17 +2591,15 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; } /* Is it an integer? */ - size = PyNumber_AsSsize_t(x, PyExc_OverflowError); - if (size == -1 && PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_OverflowError)) + if (PyIndex_Check(x)) { + size = PyNumber_AsSsize_t(x, PyExc_OverflowError); + if (size == -1 && PyErr_Occurred()) { return NULL; - PyErr_Clear(); - } - else if (size < 0) { - PyErr_SetString(PyExc_ValueError, "negative count"); - return NULL; - } - else { + } + if (size < 0) { + PyErr_SetString(PyExc_ValueError, "negative count"); + return NULL; + } new = _PyBytes_FromSize(size, 1); if (new == NULL) return NULL; @@ -3241,108 +2609,93 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return PyBytes_FromObject(x); } -PyObject * -PyBytes_FromObject(PyObject *x) +static PyObject* +_PyBytes_FromBuffer(PyObject *x) { - PyObject *new, *it; - Py_ssize_t i, size; + PyObject *new; + Py_buffer view; - if (x == NULL) { - PyErr_BadInternalCall(); + if (PyObject_GetBuffer(x, &view, PyBUF_FULL_RO) < 0) return NULL; - } - if (PyBytes_CheckExact(x)) { - Py_INCREF(x); - return x; - } + new = PyBytes_FromStringAndSize(NULL, view.len); + if (!new) + goto fail; + if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval, + &view, view.len, 'C') < 0) + goto fail; + PyBuffer_Release(&view); + return new; - /* Use the modern buffer interface */ - if (PyObject_CheckBuffer(x)) { - Py_buffer view; - if (PyObject_GetBuffer(x, &view, PyBUF_FULL_RO) < 0) - return NULL; - new = PyBytes_FromStringAndSize(NULL, view.len); - if (!new) - goto fail; - if (PyBuffer_ToContiguous(((PyBytesObject *)new)->ob_sval, - &view, view.len, 'C') < 0) - goto fail; - PyBuffer_Release(&view); - return new; - fail: - Py_XDECREF(new); - PyBuffer_Release(&view); - return NULL; - } - if (PyUnicode_Check(x)) { - PyErr_SetString(PyExc_TypeError, - "cannot convert unicode object to bytes"); - return NULL; - } +fail: + Py_XDECREF(new); + PyBuffer_Release(&view); + return NULL; +} - if (PyList_CheckExact(x)) { - new = PyBytes_FromStringAndSize(NULL, Py_SIZE(x)); - if (new == NULL) - return NULL; - for (i = 0; i < Py_SIZE(x); i++) { - Py_ssize_t value = PyNumber_AsSsize_t( - PyList_GET_ITEM(x, i), PyExc_ValueError); - if (value == -1 && PyErr_Occurred()) { - Py_DECREF(new); - return NULL; - } - if (value < 0 || value >= 256) { - PyErr_SetString(PyExc_ValueError, - "bytes must be in range(0, 256)"); - Py_DECREF(new); - return NULL; - } - ((PyBytesObject *)new)->ob_sval[i] = (char) value; - } - return new; - } - if (PyTuple_CheckExact(x)) { - new = PyBytes_FromStringAndSize(NULL, Py_SIZE(x)); - if (new == NULL) - return NULL; - for (i = 0; i < Py_SIZE(x); i++) { - Py_ssize_t value = PyNumber_AsSsize_t( - PyTuple_GET_ITEM(x, i), PyExc_ValueError); - if (value == -1 && PyErr_Occurred()) { - Py_DECREF(new); - return NULL; - } - if (value < 0 || value >= 256) { - PyErr_SetString(PyExc_ValueError, - "bytes must be in range(0, 256)"); - Py_DECREF(new); - return NULL; - } - ((PyBytesObject *)new)->ob_sval[i] = (char) value; - } - return new; - } +#define _PyBytes_FROM_LIST_BODY(x, GET_ITEM) \ + do { \ + PyObject *bytes; \ + Py_ssize_t i; \ + Py_ssize_t value; \ + char *str; \ + PyObject *item; \ + \ + bytes = PyBytes_FromStringAndSize(NULL, Py_SIZE(x)); \ + if (bytes == NULL) \ + return NULL; \ + str = ((PyBytesObject *)bytes)->ob_sval; \ + \ + for (i = 0; i < Py_SIZE(x); i++) { \ + item = GET_ITEM((x), i); \ + value = PyNumber_AsSsize_t(item, NULL); \ + if (value == -1 && PyErr_Occurred()) \ + goto error; \ + \ + if (value < 0 || value >= 256) { \ + PyErr_SetString(PyExc_ValueError, \ + "bytes must be in range(0, 256)"); \ + goto error; \ + } \ + *str++ = (char) value; \ + } \ + return bytes; \ + \ + error: \ + Py_DECREF(bytes); \ + return NULL; \ + } while (0) + +static PyObject* +_PyBytes_FromList(PyObject *x) +{ + _PyBytes_FROM_LIST_BODY(x, PyList_GET_ITEM); +} + +static PyObject* +_PyBytes_FromTuple(PyObject *x) +{ + _PyBytes_FROM_LIST_BODY(x, PyTuple_GET_ITEM); +} + +static PyObject * +_PyBytes_FromIterator(PyObject *it, PyObject *x) +{ + char *str; + Py_ssize_t i, size; + _PyBytesWriter writer; /* For iterator version, create a string object and resize as needed */ size = PyObject_LengthHint(x, 64); if (size == -1 && PyErr_Occurred()) return NULL; - /* Allocate an extra byte to prevent PyBytes_FromStringAndSize() from - returning a shared empty bytes string. This required because we - want to call _PyBytes_Resize() the returned object, which we can - only do on bytes objects with refcount == 1. */ - if (size == 0) - size = 1; - new = PyBytes_FromStringAndSize(NULL, size); - if (new == NULL) - return NULL; - assert(Py_REFCNT(new) == 1); - /* Get the iterator */ - it = PyObject_GetIter(x); - if (it == NULL) - goto error; + _PyBytesWriter_Init(&writer); + str = _PyBytesWriter_Alloc(&writer, size); + if (str == NULL) + return NULL; + writer.overallocate = 1; + size = writer.allocated; /* Run the iterator to exhaustion */ for (i = 0; ; i++) { @@ -3358,7 +2711,7 @@ PyBytes_FromObject(PyObject *x) } /* Interpret it as an int (__index__) */ - value = PyNumber_AsSsize_t(item, PyExc_ValueError); + value = PyNumber_AsSsize_t(item, NULL); Py_DECREF(item); if (value == -1 && PyErr_Occurred()) goto error; @@ -3372,21 +2725,58 @@ PyBytes_FromObject(PyObject *x) /* Append the byte */ if (i >= size) { - size = 2 * size + 1; - if (_PyBytes_Resize(&new, size) < 0) - goto error; + str = _PyBytesWriter_Resize(&writer, str, size+1); + if (str == NULL) + return NULL; + size = writer.allocated; } - ((PyBytesObject *)new)->ob_sval[i] = (char) value; + *str++ = (char) value; } - _PyBytes_Resize(&new, i); - /* Clean up and return success */ - Py_DECREF(it); - return new; + return _PyBytesWriter_Finish(&writer, str); error: - Py_XDECREF(it); - Py_XDECREF(new); + _PyBytesWriter_Dealloc(&writer); + return NULL; +} + +PyObject * +PyBytes_FromObject(PyObject *x) +{ + PyObject *it, *result; + + if (x == NULL) { + PyErr_BadInternalCall(); + return NULL; + } + + if (PyBytes_CheckExact(x)) { + Py_INCREF(x); + return x; + } + + /* Use the modern buffer interface */ + if (PyObject_CheckBuffer(x)) + return _PyBytes_FromBuffer(x); + + if (PyList_CheckExact(x)) + return _PyBytes_FromList(x); + + if (PyTuple_CheckExact(x)) + return _PyBytes_FromTuple(x); + + if (!PyUnicode_Check(x)) { + it = PyObject_GetIter(x); + if (it != NULL) { + result = _PyBytes_FromIterator(it, x); + Py_DECREF(it); + return result; + } + } + + PyErr_Format(PyExc_TypeError, + "cannot convert '%.200s' object to bytes", + x->ob_type->tp_name); return NULL; } @@ -3404,7 +2794,7 @@ bytes_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) n = PyBytes_GET_SIZE(tmp); pnew = type->tp_alloc(type, n); if (pnew != NULL) { - Py_MEMCPY(PyBytes_AS_STRING(pnew), + memcpy(PyBytes_AS_STRING(pnew), PyBytes_AS_STRING(tmp), n+1); ((PyBytesObject *)pnew)->ob_shash = ((PyBytesObject *)tmp)->ob_shash; @@ -3746,3 +3136,282 @@ bytes_iter(PyObject *seq) _PyObject_GC_TRACK(it); return (PyObject *)it; } + + +/* _PyBytesWriter API */ + +#ifdef MS_WINDOWS + /* On Windows, overallocate by 50% is the best factor */ +# define OVERALLOCATE_FACTOR 2 +#else + /* On Linux, overallocate by 25% is the best factor */ +# define OVERALLOCATE_FACTOR 4 +#endif + +void +_PyBytesWriter_Init(_PyBytesWriter *writer) +{ + /* Set all attributes before small_buffer to 0 */ + memset(writer, 0, offsetof(_PyBytesWriter, small_buffer)); +#ifdef Py_DEBUG + memset(writer->small_buffer, 0xCB, sizeof(writer->small_buffer)); +#endif +} + +void +_PyBytesWriter_Dealloc(_PyBytesWriter *writer) +{ + Py_CLEAR(writer->buffer); +} + +Py_LOCAL_INLINE(char*) +_PyBytesWriter_AsString(_PyBytesWriter *writer) +{ + if (writer->use_small_buffer) { + assert(writer->buffer == NULL); + return writer->small_buffer; + } + else if (writer->use_bytearray) { + assert(writer->buffer != NULL); + return PyByteArray_AS_STRING(writer->buffer); + } + else { + assert(writer->buffer != NULL); + return PyBytes_AS_STRING(writer->buffer); + } +} + +Py_LOCAL_INLINE(Py_ssize_t) +_PyBytesWriter_GetSize(_PyBytesWriter *writer, char *str) +{ + char *start = _PyBytesWriter_AsString(writer); + assert(str != NULL); + assert(str >= start); + assert(str - start <= writer->allocated); + return str - start; +} + +Py_LOCAL_INLINE(void) +_PyBytesWriter_CheckConsistency(_PyBytesWriter *writer, char *str) +{ +#ifdef Py_DEBUG + char *start, *end; + + if (writer->use_small_buffer) { + assert(writer->buffer == NULL); + } + else { + assert(writer->buffer != NULL); + if (writer->use_bytearray) + assert(PyByteArray_CheckExact(writer->buffer)); + else + assert(PyBytes_CheckExact(writer->buffer)); + assert(Py_REFCNT(writer->buffer) == 1); + } + + if (writer->use_bytearray) { + /* bytearray has its own overallocation algorithm, + writer overallocation must be disabled */ + assert(!writer->overallocate); + } + + assert(0 <= writer->allocated); + assert(0 <= writer->min_size && writer->min_size <= writer->allocated); + /* the last byte must always be null */ + start = _PyBytesWriter_AsString(writer); + assert(start[writer->allocated] == 0); + + end = start + writer->allocated; + assert(str != NULL); + assert(start <= str && str <= end); +#endif +} + +void* +_PyBytesWriter_Resize(_PyBytesWriter *writer, void *str, Py_ssize_t size) +{ + Py_ssize_t allocated, pos; + + _PyBytesWriter_CheckConsistency(writer, str); + assert(writer->allocated < size); + + allocated = size; + if (writer->overallocate + && allocated <= (PY_SSIZE_T_MAX - allocated / OVERALLOCATE_FACTOR)) { + /* overallocate to limit the number of realloc() */ + allocated += allocated / OVERALLOCATE_FACTOR; + } + + pos = _PyBytesWriter_GetSize(writer, str); + if (!writer->use_small_buffer) { + if (writer->use_bytearray) { + if (PyByteArray_Resize(writer->buffer, allocated)) + goto error; + /* writer->allocated can be smaller than writer->buffer->ob_alloc, + but we cannot use ob_alloc because bytes may need to be moved + to use the whole buffer. bytearray uses an internal optimization + to avoid moving or copying bytes when bytes are removed at the + beginning (ex: del bytearray[:1]). */ + } + else { + if (_PyBytes_Resize(&writer->buffer, allocated)) + goto error; + } + } + else { + /* convert from stack buffer to bytes object buffer */ + assert(writer->buffer == NULL); + + if (writer->use_bytearray) + writer->buffer = PyByteArray_FromStringAndSize(NULL, allocated); + else + writer->buffer = PyBytes_FromStringAndSize(NULL, allocated); + if (writer->buffer == NULL) + goto error; + + if (pos != 0) { + char *dest; + if (writer->use_bytearray) + dest = PyByteArray_AS_STRING(writer->buffer); + else + dest = PyBytes_AS_STRING(writer->buffer); + memcpy(dest, + writer->small_buffer, + pos); + } + + writer->use_small_buffer = 0; +#ifdef Py_DEBUG + memset(writer->small_buffer, 0xDB, sizeof(writer->small_buffer)); +#endif + } + writer->allocated = allocated; + + str = _PyBytesWriter_AsString(writer) + pos; + _PyBytesWriter_CheckConsistency(writer, str); + return str; + +error: + _PyBytesWriter_Dealloc(writer); + return NULL; +} + +void* +_PyBytesWriter_Prepare(_PyBytesWriter *writer, void *str, Py_ssize_t size) +{ + Py_ssize_t new_min_size; + + _PyBytesWriter_CheckConsistency(writer, str); + assert(size >= 0); + + if (size == 0) { + /* nothing to do */ + return str; + } + + if (writer->min_size > PY_SSIZE_T_MAX - size) { + PyErr_NoMemory(); + _PyBytesWriter_Dealloc(writer); + return NULL; + } + new_min_size = writer->min_size + size; + + if (new_min_size > writer->allocated) + str = _PyBytesWriter_Resize(writer, str, new_min_size); + + writer->min_size = new_min_size; + return str; +} + +/* Allocate the buffer to write size bytes. + Return the pointer to the beginning of buffer data. + Raise an exception and return NULL on error. */ +void* +_PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size) +{ + /* ensure that _PyBytesWriter_Alloc() is only called once */ + assert(writer->min_size == 0 && writer->buffer == NULL); + assert(size >= 0); + + writer->use_small_buffer = 1; +#ifdef Py_DEBUG + writer->allocated = sizeof(writer->small_buffer) - 1; + /* In debug mode, don't use the full small buffer because it is less + efficient than bytes and bytearray objects to detect buffer underflow + and buffer overflow. Use 10 bytes of the small buffer to test also + code using the smaller buffer in debug mode. + + Don't modify the _PyBytesWriter structure (use a shorter small buffer) + in debug mode to also be able to detect stack overflow when running + tests in debug mode. The _PyBytesWriter is large (more than 512 bytes), + if Py_EnterRecursiveCall() is not used in deep C callback, we may hit a + stack overflow. */ + writer->allocated = Py_MIN(writer->allocated, 10); + /* _PyBytesWriter_CheckConsistency() requires the last byte to be 0, + to detect buffer overflow */ + writer->small_buffer[writer->allocated] = 0; +#else + writer->allocated = sizeof(writer->small_buffer); +#endif + return _PyBytesWriter_Prepare(writer, writer->small_buffer, size); +} + +PyObject * +_PyBytesWriter_Finish(_PyBytesWriter *writer, void *str) +{ + Py_ssize_t size; + PyObject *result; + + _PyBytesWriter_CheckConsistency(writer, str); + + size = _PyBytesWriter_GetSize(writer, str); + if (size == 0 && !writer->use_bytearray) { + Py_CLEAR(writer->buffer); + /* Get the empty byte string singleton */ + result = PyBytes_FromStringAndSize(NULL, 0); + } + else if (writer->use_small_buffer) { + if (writer->use_bytearray) { + result = PyByteArray_FromStringAndSize(writer->small_buffer, size); + } + else { + result = PyBytes_FromStringAndSize(writer->small_buffer, size); + } + } + else { + result = writer->buffer; + writer->buffer = NULL; + + if (size != writer->allocated) { + if (writer->use_bytearray) { + if (PyByteArray_Resize(result, size)) { + Py_DECREF(result); + return NULL; + } + } + else { + if (_PyBytes_Resize(&result, size)) { + assert(result == NULL); + return NULL; + } + } + } + } + return result; +} + +void* +_PyBytesWriter_WriteBytes(_PyBytesWriter *writer, void *ptr, + const void *bytes, Py_ssize_t size) +{ + char *str = (char *)ptr; + + str = _PyBytesWriter_Prepare(writer, str, size); + if (str == NULL) + return NULL; + + memcpy(str, bytes, size); + str += size; + + return str; +} diff --git a/Objects/classobject.c b/Objects/classobject.c index 5e8ac59..b0ed023 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -302,34 +302,19 @@ method_traverse(PyMethodObject *im, visitproc visit, void *arg) } static PyObject * -method_call(PyObject *func, PyObject *arg, PyObject *kw) +method_call(PyObject *method, PyObject *args, PyObject *kwargs) { - PyObject *self = PyMethod_GET_SELF(func); - PyObject *result; + PyObject *self, *func; - func = PyMethod_GET_FUNCTION(func); + self = PyMethod_GET_SELF(method); if (self == NULL) { PyErr_BadInternalCall(); return NULL; } - else { - Py_ssize_t argcount = PyTuple_Size(arg); - PyObject *newarg = PyTuple_New(argcount + 1); - int i; - if (newarg == NULL) - return NULL; - Py_INCREF(self); - PyTuple_SET_ITEM(newarg, 0, self); - for (i = 0; i < argcount; i++) { - PyObject *v = PyTuple_GET_ITEM(arg, i); - Py_XINCREF(v); - PyTuple_SET_ITEM(newarg, i+1, v); - } - arg = newarg; - } - result = PyObject_Call((PyObject *)func, arg, kw); - Py_DECREF(arg); - return result; + + func = PyMethod_GET_FUNCTION(method); + + return _PyObject_Call_Prepend(func, self, args, kwargs); } static PyObject * diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h index e87a221..c75acb7 100644 --- a/Objects/clinic/bytearrayobject.c.h +++ b/Objects/clinic/bytearrayobject.c.h @@ -39,45 +39,38 @@ bytearray_copy(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) } PyDoc_STRVAR(bytearray_translate__doc__, -"translate(table, [deletechars])\n" +"translate($self, table, /, delete=b\'\')\n" +"--\n" +"\n" "Return a copy with each character mapped by the given translation table.\n" "\n" " table\n" " Translation table, which must be a bytes object of length 256.\n" "\n" -"All characters occurring in the optional argument deletechars are removed.\n" +"All characters occurring in the optional argument delete are removed.\n" "The remaining characters are mapped through the given translation table."); #define BYTEARRAY_TRANSLATE_METHODDEF \ - {"translate", (PyCFunction)bytearray_translate, METH_VARARGS, bytearray_translate__doc__}, + {"translate", (PyCFunction)bytearray_translate, METH_FASTCALL, bytearray_translate__doc__}, static PyObject * bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, - int group_right_1, PyObject *deletechars); + PyObject *deletechars); static PyObject * -bytearray_translate(PyByteArrayObject *self, PyObject *args) +bytearray_translate(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"", "delete", NULL}; + static _PyArg_Parser _parser = {"O|O:translate", _keywords, 0}; PyObject *table; - int group_right_1 = 0; PyObject *deletechars = NULL; - switch (PyTuple_GET_SIZE(args)) { - case 1: - if (!PyArg_ParseTuple(args, "O:translate", &table)) - goto exit; - break; - case 2: - if (!PyArg_ParseTuple(args, "OO:translate", &table, &deletechars)) - goto exit; - group_right_1 = 1; - break; - default: - PyErr_SetString(PyExc_TypeError, "bytearray.translate requires 1 to 2 arguments"); - goto exit; + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &table, &deletechars)) { + goto exit; } - return_value = bytearray_translate_impl(self, table, group_right_1, deletechars); + return_value = bytearray_translate_impl(self, table, deletechars); exit: return return_value; @@ -108,17 +101,20 @@ bytearray_maketrans(void *null, PyObject *args) Py_buffer to = {NULL, NULL}; if (!PyArg_ParseTuple(args, "y*y*:maketrans", - &frm, &to)) + &frm, &to)) { goto exit; + } return_value = bytearray_maketrans_impl(&frm, &to); exit: /* Cleanup for frm */ - if (frm.obj) + if (frm.obj) { PyBuffer_Release(&frm); + } /* Cleanup for to */ - if (to.obj) + if (to.obj) { PyBuffer_Release(&to); + } return return_value; } @@ -152,17 +148,20 @@ bytearray_replace(PyByteArrayObject *self, PyObject *args) Py_ssize_t count = -1; if (!PyArg_ParseTuple(args, "y*y*|n:replace", - &old, &new, &count)) + &old, &new, &count)) { goto exit; + } return_value = bytearray_replace_impl(self, &old, &new, count); exit: /* Cleanup for old */ - if (old.obj) + if (old.obj) { PyBuffer_Release(&old); + } /* Cleanup for new */ - if (new.obj) + if (new.obj) { PyBuffer_Release(&new); + } return return_value; } @@ -182,23 +181,25 @@ PyDoc_STRVAR(bytearray_split__doc__, " -1 (the default value) means no limit."); #define BYTEARRAY_SPLIT_METHODDEF \ - {"split", (PyCFunction)bytearray_split, METH_VARARGS|METH_KEYWORDS, bytearray_split__doc__}, + {"split", (PyCFunction)bytearray_split, METH_FASTCALL, bytearray_split__doc__}, static PyObject * bytearray_split_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit); static PyObject * -bytearray_split(PyByteArrayObject *self, PyObject *args, PyObject *kwargs) +bytearray_split(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"sep", "maxsplit", NULL}; + static const char * const _keywords[] = {"sep", "maxsplit", NULL}; + static _PyArg_Parser _parser = {"|On:split", _keywords, 0}; PyObject *sep = Py_None; Py_ssize_t maxsplit = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|On:split", _keywords, - &sep, &maxsplit)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &sep, &maxsplit)) { goto exit; + } return_value = bytearray_split_impl(self, sep, maxsplit); exit: @@ -254,23 +255,25 @@ PyDoc_STRVAR(bytearray_rsplit__doc__, "Splitting is done starting at the end of the bytearray and working to the front."); #define BYTEARRAY_RSPLIT_METHODDEF \ - {"rsplit", (PyCFunction)bytearray_rsplit, METH_VARARGS|METH_KEYWORDS, bytearray_rsplit__doc__}, + {"rsplit", (PyCFunction)bytearray_rsplit, METH_FASTCALL, bytearray_rsplit__doc__}, static PyObject * bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep, Py_ssize_t maxsplit); static PyObject * -bytearray_rsplit(PyByteArrayObject *self, PyObject *args, PyObject *kwargs) +bytearray_rsplit(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"sep", "maxsplit", NULL}; + static const char * const _keywords[] = {"sep", "maxsplit", NULL}; + static _PyArg_Parser _parser = {"|On:rsplit", _keywords, 0}; PyObject *sep = Py_None; Py_ssize_t maxsplit = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|On:rsplit", _keywords, - &sep, &maxsplit)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &sep, &maxsplit)) { goto exit; + } return_value = bytearray_rsplit_impl(self, sep, maxsplit); exit: @@ -320,8 +323,9 @@ bytearray_insert(PyByteArrayObject *self, PyObject *args) int item; if (!PyArg_ParseTuple(args, "nO&:insert", - &index, _getbytevalue, &item)) + &index, _getbytevalue, &item)) { goto exit; + } return_value = bytearray_insert_impl(self, index, item); exit: @@ -349,8 +353,9 @@ bytearray_append(PyByteArrayObject *self, PyObject *arg) PyObject *return_value = NULL; int item; - if (!PyArg_Parse(arg, "O&:append", _getbytevalue, &item)) + if (!PyArg_Parse(arg, "O&:append", _getbytevalue, &item)) { goto exit; + } return_value = bytearray_append_impl(self, item); exit: @@ -394,8 +399,9 @@ bytearray_pop(PyByteArrayObject *self, PyObject *args) Py_ssize_t index = -1; if (!PyArg_ParseTuple(args, "|n:pop", - &index)) + &index)) { goto exit; + } return_value = bytearray_pop_impl(self, index); exit: @@ -423,8 +429,9 @@ bytearray_remove(PyByteArrayObject *self, PyObject *arg) PyObject *return_value = NULL; int value; - if (!PyArg_Parse(arg, "O&:remove", _getbytevalue, &value)) + if (!PyArg_Parse(arg, "O&:remove", _getbytevalue, &value)) { goto exit; + } return_value = bytearray_remove_impl(self, value); exit: @@ -453,8 +460,9 @@ bytearray_strip(PyByteArrayObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "strip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytearray_strip_impl(self, bytes); exit: @@ -483,8 +491,9 @@ bytearray_lstrip(PyByteArrayObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "lstrip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytearray_lstrip_impl(self, bytes); exit: @@ -513,8 +522,9 @@ bytearray_rstrip(PyByteArrayObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "rstrip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytearray_rstrip_impl(self, bytes); exit: @@ -537,23 +547,25 @@ PyDoc_STRVAR(bytearray_decode__doc__, " can handle UnicodeDecodeErrors."); #define BYTEARRAY_DECODE_METHODDEF \ - {"decode", (PyCFunction)bytearray_decode, METH_VARARGS|METH_KEYWORDS, bytearray_decode__doc__}, + {"decode", (PyCFunction)bytearray_decode, METH_FASTCALL, bytearray_decode__doc__}, static PyObject * bytearray_decode_impl(PyByteArrayObject *self, const char *encoding, const char *errors); static PyObject * -bytearray_decode(PyByteArrayObject *self, PyObject *args, PyObject *kwargs) +bytearray_decode(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"encoding", "errors", NULL}; + static const char * const _keywords[] = {"encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"|ss:decode", _keywords, 0}; const char *encoding = NULL; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:decode", _keywords, - &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &encoding, &errors)) { goto exit; + } return_value = bytearray_decode_impl(self, encoding, errors); exit: @@ -583,21 +595,23 @@ PyDoc_STRVAR(bytearray_splitlines__doc__, "true."); #define BYTEARRAY_SPLITLINES_METHODDEF \ - {"splitlines", (PyCFunction)bytearray_splitlines, METH_VARARGS|METH_KEYWORDS, bytearray_splitlines__doc__}, + {"splitlines", (PyCFunction)bytearray_splitlines, METH_FASTCALL, bytearray_splitlines__doc__}, static PyObject * bytearray_splitlines_impl(PyByteArrayObject *self, int keepends); static PyObject * -bytearray_splitlines(PyByteArrayObject *self, PyObject *args, PyObject *kwargs) +bytearray_splitlines(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"keepends", NULL}; + static const char * const _keywords[] = {"keepends", NULL}; + static _PyArg_Parser _parser = {"|i:splitlines", _keywords, 0}; int keepends = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:splitlines", _keywords, - &keepends)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &keepends)) { goto exit; + } return_value = bytearray_splitlines_impl(self, keepends); exit: @@ -617,17 +631,18 @@ PyDoc_STRVAR(bytearray_fromhex__doc__, {"fromhex", (PyCFunction)bytearray_fromhex, METH_O|METH_CLASS, bytearray_fromhex__doc__}, static PyObject * -bytearray_fromhex_impl(PyObject*cls, PyObject *string); +bytearray_fromhex_impl(PyTypeObject *type, PyObject *string); static PyObject * -bytearray_fromhex(PyTypeObject *cls, PyObject *arg) +bytearray_fromhex(PyTypeObject *type, PyObject *arg) { PyObject *return_value = NULL; PyObject *string; - if (!PyArg_Parse(arg, "U:fromhex", &string)) + if (!PyArg_Parse(arg, "U:fromhex", &string)) { goto exit; - return_value = bytearray_fromhex_impl((PyObject*)cls, string); + } + return_value = bytearray_fromhex_impl(type, string); exit: return return_value; @@ -670,8 +685,9 @@ bytearray_reduce_ex(PyByteArrayObject *self, PyObject *args) int proto = 0; if (!PyArg_ParseTuple(args, "|i:__reduce_ex__", - &proto)) + &proto)) { goto exit; + } return_value = bytearray_reduce_ex_impl(self, proto); exit: @@ -695,4 +711,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) { return bytearray_sizeof_impl(self); } -/*[clinic end generated code: output=966c15ff22c5e243 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=225342a680391b9c input=a9049054013a1b77]*/ diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h index 5a1a5e9..a11ebd2 100644 --- a/Objects/clinic/bytesobject.c.h +++ b/Objects/clinic/bytesobject.c.h @@ -17,22 +17,24 @@ PyDoc_STRVAR(bytes_split__doc__, " -1 (the default value) means no limit."); #define BYTES_SPLIT_METHODDEF \ - {"split", (PyCFunction)bytes_split, METH_VARARGS|METH_KEYWORDS, bytes_split__doc__}, + {"split", (PyCFunction)bytes_split, METH_FASTCALL, bytes_split__doc__}, static PyObject * -bytes_split_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit); +bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit); static PyObject * -bytes_split(PyBytesObject*self, PyObject *args, PyObject *kwargs) +bytes_split(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"sep", "maxsplit", NULL}; + static const char * const _keywords[] = {"sep", "maxsplit", NULL}; + static _PyArg_Parser _parser = {"|On:split", _keywords, 0}; PyObject *sep = Py_None; Py_ssize_t maxsplit = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|On:split", _keywords, - &sep, &maxsplit)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &sep, &maxsplit)) { goto exit; + } return_value = bytes_split_impl(self, sep, maxsplit); exit: @@ -64,14 +66,16 @@ bytes_partition(PyBytesObject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer sep = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:partition", &sep)) + if (!PyArg_Parse(arg, "y*:partition", &sep)) { goto exit; + } return_value = bytes_partition_impl(self, &sep); exit: /* Cleanup for sep */ - if (sep.obj) + if (sep.obj) { PyBuffer_Release(&sep); + } return return_value; } @@ -101,14 +105,16 @@ bytes_rpartition(PyBytesObject *self, PyObject *arg) PyObject *return_value = NULL; Py_buffer sep = {NULL, NULL}; - if (!PyArg_Parse(arg, "y*:rpartition", &sep)) + if (!PyArg_Parse(arg, "y*:rpartition", &sep)) { goto exit; + } return_value = bytes_rpartition_impl(self, &sep); exit: /* Cleanup for sep */ - if (sep.obj) + if (sep.obj) { PyBuffer_Release(&sep); + } return return_value; } @@ -130,22 +136,24 @@ PyDoc_STRVAR(bytes_rsplit__doc__, "Splitting is done starting at the end of the bytes and working to the front."); #define BYTES_RSPLIT_METHODDEF \ - {"rsplit", (PyCFunction)bytes_rsplit, METH_VARARGS|METH_KEYWORDS, bytes_rsplit__doc__}, + {"rsplit", (PyCFunction)bytes_rsplit, METH_FASTCALL, bytes_rsplit__doc__}, static PyObject * -bytes_rsplit_impl(PyBytesObject*self, PyObject *sep, Py_ssize_t maxsplit); +bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit); static PyObject * -bytes_rsplit(PyBytesObject*self, PyObject *args, PyObject *kwargs) +bytes_rsplit(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"sep", "maxsplit", NULL}; + static const char * const _keywords[] = {"sep", "maxsplit", NULL}; + static _PyArg_Parser _parser = {"|On:rsplit", _keywords, 0}; PyObject *sep = Py_None; Py_ssize_t maxsplit = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|On:rsplit", _keywords, - &sep, &maxsplit)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &sep, &maxsplit)) { goto exit; + } return_value = bytes_rsplit_impl(self, sep, maxsplit); exit: @@ -189,8 +197,9 @@ bytes_strip(PyBytesObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "strip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytes_strip_impl(self, bytes); exit: @@ -219,8 +228,9 @@ bytes_lstrip(PyBytesObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "lstrip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytes_lstrip_impl(self, bytes); exit: @@ -249,8 +259,9 @@ bytes_rstrip(PyBytesObject *self, PyObject *args) if (!PyArg_UnpackTuple(args, "rstrip", 0, 1, - &bytes)) + &bytes)) { goto exit; + } return_value = bytes_rstrip_impl(self, bytes); exit: @@ -258,45 +269,38 @@ exit: } PyDoc_STRVAR(bytes_translate__doc__, -"translate(table, [deletechars])\n" +"translate($self, table, /, delete=b\'\')\n" +"--\n" +"\n" "Return a copy with each character mapped by the given translation table.\n" "\n" " table\n" " Translation table, which must be a bytes object of length 256.\n" "\n" -"All characters occurring in the optional argument deletechars are removed.\n" +"All characters occurring in the optional argument delete are removed.\n" "The remaining characters are mapped through the given translation table."); #define BYTES_TRANSLATE_METHODDEF \ - {"translate", (PyCFunction)bytes_translate, METH_VARARGS, bytes_translate__doc__}, + {"translate", (PyCFunction)bytes_translate, METH_FASTCALL, bytes_translate__doc__}, static PyObject * -bytes_translate_impl(PyBytesObject *self, PyObject *table, int group_right_1, +bytes_translate_impl(PyBytesObject *self, PyObject *table, PyObject *deletechars); static PyObject * -bytes_translate(PyBytesObject *self, PyObject *args) +bytes_translate(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"", "delete", NULL}; + static _PyArg_Parser _parser = {"O|O:translate", _keywords, 0}; PyObject *table; - int group_right_1 = 0; PyObject *deletechars = NULL; - switch (PyTuple_GET_SIZE(args)) { - case 1: - if (!PyArg_ParseTuple(args, "O:translate", &table)) - goto exit; - break; - case 2: - if (!PyArg_ParseTuple(args, "OO:translate", &table, &deletechars)) - goto exit; - group_right_1 = 1; - break; - default: - PyErr_SetString(PyExc_TypeError, "bytes.translate requires 1 to 2 arguments"); - goto exit; + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &table, &deletechars)) { + goto exit; } - return_value = bytes_translate_impl(self, table, group_right_1, deletechars); + return_value = bytes_translate_impl(self, table, deletechars); exit: return return_value; @@ -327,17 +331,20 @@ bytes_maketrans(void *null, PyObject *args) Py_buffer to = {NULL, NULL}; if (!PyArg_ParseTuple(args, "y*y*:maketrans", - &frm, &to)) + &frm, &to)) { goto exit; + } return_value = bytes_maketrans_impl(&frm, &to); exit: /* Cleanup for frm */ - if (frm.obj) + if (frm.obj) { PyBuffer_Release(&frm); + } /* Cleanup for to */ - if (to.obj) + if (to.obj) { PyBuffer_Release(&to); + } return return_value; } @@ -359,11 +366,11 @@ PyDoc_STRVAR(bytes_replace__doc__, {"replace", (PyCFunction)bytes_replace, METH_VARARGS, bytes_replace__doc__}, static PyObject * -bytes_replace_impl(PyBytesObject*self, Py_buffer *old, Py_buffer *new, +bytes_replace_impl(PyBytesObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count); static PyObject * -bytes_replace(PyBytesObject*self, PyObject *args) +bytes_replace(PyBytesObject *self, PyObject *args) { PyObject *return_value = NULL; Py_buffer old = {NULL, NULL}; @@ -371,17 +378,20 @@ bytes_replace(PyBytesObject*self, PyObject *args) Py_ssize_t count = -1; if (!PyArg_ParseTuple(args, "y*y*|n:replace", - &old, &new, &count)) + &old, &new, &count)) { goto exit; + } return_value = bytes_replace_impl(self, &old, &new, count); exit: /* Cleanup for old */ - if (old.obj) + if (old.obj) { PyBuffer_Release(&old); + } /* Cleanup for new */ - if (new.obj) + if (new.obj) { PyBuffer_Release(&new); + } return return_value; } @@ -402,23 +412,25 @@ PyDoc_STRVAR(bytes_decode__doc__, " can handle UnicodeDecodeErrors."); #define BYTES_DECODE_METHODDEF \ - {"decode", (PyCFunction)bytes_decode, METH_VARARGS|METH_KEYWORDS, bytes_decode__doc__}, + {"decode", (PyCFunction)bytes_decode, METH_FASTCALL, bytes_decode__doc__}, static PyObject * -bytes_decode_impl(PyBytesObject*self, const char *encoding, +bytes_decode_impl(PyBytesObject *self, const char *encoding, const char *errors); static PyObject * -bytes_decode(PyBytesObject*self, PyObject *args, PyObject *kwargs) +bytes_decode(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"encoding", "errors", NULL}; + static const char * const _keywords[] = {"encoding", "errors", NULL}; + static _PyArg_Parser _parser = {"|ss:decode", _keywords, 0}; const char *encoding = NULL; const char *errors = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:decode", _keywords, - &encoding, &errors)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &encoding, &errors)) { goto exit; + } return_value = bytes_decode_impl(self, encoding, errors); exit: @@ -435,21 +447,23 @@ PyDoc_STRVAR(bytes_splitlines__doc__, "true."); #define BYTES_SPLITLINES_METHODDEF \ - {"splitlines", (PyCFunction)bytes_splitlines, METH_VARARGS|METH_KEYWORDS, bytes_splitlines__doc__}, + {"splitlines", (PyCFunction)bytes_splitlines, METH_FASTCALL, bytes_splitlines__doc__}, static PyObject * -bytes_splitlines_impl(PyBytesObject*self, int keepends); +bytes_splitlines_impl(PyBytesObject *self, int keepends); static PyObject * -bytes_splitlines(PyBytesObject*self, PyObject *args, PyObject *kwargs) +bytes_splitlines(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"keepends", NULL}; + static const char * const _keywords[] = {"keepends", NULL}; + static _PyArg_Parser _parser = {"|i:splitlines", _keywords, 0}; int keepends = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:splitlines", _keywords, - &keepends)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &keepends)) { goto exit; + } return_value = bytes_splitlines_impl(self, keepends); exit: @@ -477,11 +491,12 @@ bytes_fromhex(PyTypeObject *type, PyObject *arg) PyObject *return_value = NULL; PyObject *string; - if (!PyArg_Parse(arg, "U:fromhex", &string)) + if (!PyArg_Parse(arg, "U:fromhex", &string)) { goto exit; + } return_value = bytes_fromhex_impl(type, string); exit: return return_value; } -/*[clinic end generated code: output=bd0ce8f25d7e18f4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=2dc3c93cfd2dc440 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h index 5288b9a..d0cdfc3 100644 --- a/Objects/clinic/dictobject.c.h +++ b/Objects/clinic/dictobject.c.h @@ -23,8 +23,9 @@ dict_fromkeys(PyTypeObject *type, PyObject *args) if (!PyArg_UnpackTuple(args, "fromkeys", 1, 2, - &iterable, &value)) + &iterable, &value)) { goto exit; + } return_value = dict_fromkeys_impl(type, iterable, value); exit: @@ -39,4 +40,4 @@ PyDoc_STRVAR(dict___contains____doc__, #define DICT___CONTAINS___METHODDEF \ {"__contains__", (PyCFunction)dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__}, -/*[clinic end generated code: output=fe74d676332fdba6 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=926326109e3d9839 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h index d42a700..891e90c 100644 --- a/Objects/clinic/unicodeobject.c.h +++ b/Objects/clinic/unicodeobject.c.h @@ -31,11 +31,12 @@ unicode_maketrans(void *null, PyObject *args) PyObject *z = NULL; if (!PyArg_ParseTuple(args, "O|UU:maketrans", - &x, &y, &z)) + &x, &y, &z)) { goto exit; + } return_value = unicode_maketrans_impl(x, y, z); exit: return return_value; } -/*[clinic end generated code: output=94affdff5b2daff5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4a86dd108d92d104 input=a9049054013a1b77]*/ diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 2f1bef2..f7f91a8 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1,3 +1,5 @@ +#include + #include "Python.h" #include "code.h" #include "structmember.h" @@ -5,6 +7,12 @@ #define NAME_CHARS \ "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" +/* Holder for co_extra information */ +typedef struct { + Py_ssize_t ce_size; + void **ce_extras; +} _PyCodeObjectExtra; + /* all_name_chars(s): true iff all chars in s are valid NAME_CHARS */ static int @@ -136,7 +144,7 @@ PyCode_New(int argcount, int kwonlyargcount, Py_ssize_t total_args = argcount + kwonlyargcount + ((flags & CO_VARARGS) != 0) + ((flags & CO_VARKEYWORDS) != 0); Py_ssize_t alloc_size = sizeof(unsigned char) * n_cellvars; - int used_cell2arg = 0; + bool used_cell2arg = false; cell2arg = PyMem_MALLOC(alloc_size); if (cell2arg == NULL) return NULL; @@ -149,7 +157,7 @@ PyCode_New(int argcount, int kwonlyargcount, PyObject *arg = PyTuple_GET_ITEM(varnames, j); if (!PyUnicode_Compare(cell, arg)) { cell2arg[i] = j; - used_cell2arg = 1; + used_cell2arg = true; break; } } @@ -192,6 +200,7 @@ PyCode_New(int argcount, int kwonlyargcount, co->co_lnotab = lnotab; co->co_zombieframe = NULL; co->co_weakreflist = NULL; + co->co_extra = NULL; return co; } @@ -401,6 +410,21 @@ code_new(PyTypeObject *type, PyObject *args, PyObject *kw) static void code_dealloc(PyCodeObject *co) { + if (co->co_extra != NULL) { + PyThreadState *tstate = PyThreadState_Get(); + _PyCodeObjectExtra *co_extra = co->co_extra; + + for (Py_ssize_t i = 0; i < co_extra->ce_size; i++) { + freefunc free_extra = tstate->co_extra_freefuncs[i]; + + if (free_extra != NULL) { + free_extra(co_extra->ce_extras[i]); + } + } + + PyMem_FREE(co->co_extra); + } + Py_XDECREF(co->co_code); Py_XDECREF(co->co_consts); Py_XDECREF(co->co_names); @@ -521,7 +545,7 @@ _PyCode_ConstantKey(PyObject *op) PyTuple_SET_ITEM(tuple, i, item_key); } - key = PyTuple_Pack(2, tuple, op); + key = PyTuple_Pack(3, Py_TYPE(op), op, tuple); Py_DECREF(tuple); } else if (PyFrozenSet_CheckExact(op)) { @@ -555,7 +579,7 @@ _PyCode_ConstantKey(PyObject *op) if (set == NULL) return NULL; - key = PyTuple_Pack(2, set, op); + key = PyTuple_Pack(3, Py_TYPE(op), op, set); Py_DECREF(set); return key; } @@ -566,7 +590,7 @@ _PyCode_ConstantKey(PyObject *op) if (obj_id == NULL) return NULL; - key = PyTuple_Pack(2, obj_id, op); + key = PyTuple_Pack(3, Py_TYPE(op), op, obj_id); Py_DECREF(obj_id); } return key; @@ -734,7 +758,8 @@ PyCode_Addr2Line(PyCodeObject *co, int addrq) addr += *p++; if (addr > addrq) break; - line += *p++; + line += (signed char)*p; + p++; } return line; } @@ -769,17 +794,19 @@ _PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds) if (addr + *p > lasti) break; addr += *p++; - if (*p) + if ((signed char)*p) bounds->ap_lower = addr; - line += *p++; + line += (signed char)*p; + p++; --size; } if (size > 0) { while (--size >= 0) { addr += *p++; - if (*p++) + if ((signed char)*p) break; + p++; } bounds->ap_upper = addr; } @@ -789,3 +816,80 @@ _PyCode_CheckLineNumber(PyCodeObject* co, int lasti, PyAddrPair *bounds) return line; } + + +int +_PyCode_GetExtra(PyObject *code, Py_ssize_t index, void **extra) +{ + assert(*extra == NULL); + + if (!PyCode_Check(code)) { + PyErr_BadInternalCall(); + return -1; + } + + PyCodeObject *o = (PyCodeObject*) code; + _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) o->co_extra; + + + if (co_extra == NULL || co_extra->ce_size <= index) { + return 0; + } + + *extra = co_extra->ce_extras[index]; + return 0; +} + + +int +_PyCode_SetExtra(PyObject *code, Py_ssize_t index, void *extra) +{ + PyThreadState *tstate = PyThreadState_Get(); + + if (!PyCode_Check(code) || index < 0 || + index >= tstate->co_extra_user_count) { + PyErr_BadInternalCall(); + return -1; + } + + PyCodeObject *o = (PyCodeObject*) code; + _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra *) o->co_extra; + + if (co_extra == NULL) { + o->co_extra = (_PyCodeObjectExtra*) PyMem_Malloc( + sizeof(_PyCodeObjectExtra)); + if (o->co_extra == NULL) { + return -1; + } + co_extra = (_PyCodeObjectExtra *) o->co_extra; + + co_extra->ce_extras = PyMem_Malloc( + tstate->co_extra_user_count * sizeof(void*)); + if (co_extra->ce_extras == NULL) { + return -1; + } + + co_extra->ce_size = tstate->co_extra_user_count; + + for (Py_ssize_t i = 0; i < co_extra->ce_size; i++) { + co_extra->ce_extras[i] = NULL; + } + } + else if (co_extra->ce_size <= index) { + co_extra->ce_extras = PyMem_Realloc( + co_extra->ce_extras, tstate->co_extra_user_count * sizeof(void*)); + + if (co_extra->ce_extras == NULL) { + return -1; + } + + co_extra->ce_size = tstate->co_extra_user_count; + + for (Py_ssize_t i = co_extra->ce_size; i < co_extra->ce_size; i++) { + co_extra->ce_extras[i] = NULL; + } + } + + co_extra->ce_extras[index] = extra; + return 0; +} diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 606c101..31e1278 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -759,29 +759,12 @@ static PyMemberDef complex_members[] = { }; static PyObject * -complex_subtype_from_string(PyTypeObject *type, PyObject *v) +complex_from_string_inner(const char *s, Py_ssize_t len, void *type) { - const char *s, *start; - char *end; double x=0.0, y=0.0, z; int got_bracket=0; - PyObject *s_buffer = NULL; - Py_ssize_t len; - - if (PyUnicode_Check(v)) { - s_buffer = _PyUnicode_TransformDecimalAndSpaceToASCII(v); - if (s_buffer == NULL) - return NULL; - s = PyUnicode_AsUTF8AndSize(s_buffer, &len); - if (s == NULL) - goto error; - } - else { - PyErr_Format(PyExc_TypeError, - "complex() argument must be a string or a number, not '%.200s'", - Py_TYPE(v)->tp_name); - return NULL; - } + const char *start; + char *end; /* position on first nonblank */ start = s; @@ -822,7 +805,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (PyErr_ExceptionMatches(PyExc_ValueError)) PyErr_Clear(); else - goto error; + return NULL; } if (end != s) { /* all 4 forms starting with land here */ @@ -835,7 +818,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (PyErr_ExceptionMatches(PyExc_ValueError)) PyErr_Clear(); else - goto error; + return NULL; } if (end != s) /* j */ @@ -890,18 +873,46 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v) if (s-start != len) goto parse_error; - Py_XDECREF(s_buffer); - return complex_subtype_from_doubles(type, x, y); + return complex_subtype_from_doubles((PyTypeObject *)type, x, y); parse_error: PyErr_SetString(PyExc_ValueError, "complex() arg is a malformed string"); - error: - Py_XDECREF(s_buffer); return NULL; } static PyObject * +complex_subtype_from_string(PyTypeObject *type, PyObject *v) +{ + const char *s; + PyObject *s_buffer = NULL, *result = NULL; + Py_ssize_t len; + + if (PyUnicode_Check(v)) { + s_buffer = _PyUnicode_TransformDecimalAndSpaceToASCII(v); + if (s_buffer == NULL) { + return NULL; + } + s = PyUnicode_AsUTF8AndSize(s_buffer, &len); + if (s == NULL) { + goto exit; + } + } + else { + PyErr_Format(PyExc_TypeError, + "complex() argument must be a string or a number, not '%.200s'", + Py_TYPE(v)->tp_name); + return NULL; + } + + result = _Py_string_to_number_with_underscores(s, len, "complex", v, type, + complex_from_string_inner); + exit: + Py_DECREF(s_buffer); + return result; +} + +static PyObject * complex_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { PyObject *r, *i, *tmp; @@ -1014,11 +1025,11 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; } cr.real = PyFloat_AsDouble(tmp); - cr.imag = 0.0; + cr.imag = 0.0; /* Shut up compiler warning */ Py_DECREF(tmp); } if (i == NULL) { - ci.real = cr.imag; + ci.real = 0.0; } else if (PyComplex_Check(i)) { ci = ((PyComplexObject*)i)->cval; @@ -1040,7 +1051,7 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (ci_is_complex) { cr.real -= ci.imag; } - if (cr_is_complex && i != NULL) { + if (cr_is_complex) { ci.real += cr.imag; } return complex_subtype_from_doubles(type, cr.real, ci.real); diff --git a/Objects/descrobject.c b/Objects/descrobject.c index da68e3b..076e741 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -22,7 +22,7 @@ descr_name(PyDescrObject *descr) } static PyObject * -descr_repr(PyDescrObject *descr, char *format) +descr_repr(PyDescrObject *descr, const char *format) { PyObject *name = NULL; if (descr->d_name != NULL && PyUnicode_Check(descr->d_name)) @@ -213,7 +213,7 @@ static PyObject * methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwds) { Py_ssize_t argc; - PyObject *self, *func, *result; + PyObject *self, *func, *result, **stack; /* Make sure that the first argument is acceptable as 'self' */ assert(PyTuple_Check(args)); @@ -242,13 +242,8 @@ methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwds) func = PyCFunction_NewEx(descr->d_method, self, NULL); if (func == NULL) return NULL; - args = PyTuple_GetSlice(args, 1, argc); - if (args == NULL) { - Py_DECREF(func); - return NULL; - } - result = PyEval_CallObjectWithKeywords(func, args, kwds); - Py_DECREF(args); + stack = &PyTuple_GET_ITEM(args, 1); + result = _PyObject_FastCallDict(func, stack, argc - 1, kwds); Py_DECREF(func); return result; } @@ -258,7 +253,7 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwds) { Py_ssize_t argc; - PyObject *self, *func, *result; + PyObject *self, *func, *result, **stack; /* Make sure that the first argument is acceptable as 'self' */ assert(PyTuple_Check(args)); @@ -295,14 +290,9 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args, func = PyCFunction_NewEx(descr->d_method, self, NULL); if (func == NULL) return NULL; - args = PyTuple_GetSlice(args, 1, argc); - if (args == NULL) { - Py_DECREF(func); - return NULL; - } - result = PyEval_CallObjectWithKeywords(func, args, kwds); + stack = &PyTuple_GET_ITEM(args, 1); + result = _PyObject_FastCallDict(func, stack, argc - 1, kwds); Py_DECREF(func); - Py_DECREF(args); return result; } @@ -310,7 +300,7 @@ static PyObject * wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds) { Py_ssize_t argc; - PyObject *self, *func, *result; + PyObject *self, *func, *result, **stack; /* Make sure that the first argument is acceptable as 'self' */ assert(PyTuple_Check(args)); @@ -339,13 +329,9 @@ wrapperdescr_call(PyWrapperDescrObject *descr, PyObject *args, PyObject *kwds) func = PyWrapper_New((PyObject *)descr, self); if (func == NULL) return NULL; - args = PyTuple_GetSlice(args, 1, argc); - if (args == NULL) { - Py_DECREF(func); - return NULL; - } - result = PyEval_CallObjectWithKeywords(func, args, kwds); - Py_DECREF(args); + + stack = &PyTuple_GET_ITEM(args, 1); + result = _PyObject_FastCallDict(func, stack, argc - 1, kwds); Py_DECREF(func); return result; } @@ -1033,7 +1019,7 @@ wrapper_dealloc(wrapperobject *wp) static PyObject * wrapper_richcompare(PyObject *a, PyObject *b, int op) { - Py_intptr_t result; + intptr_t result; PyObject *v; PyWrapperDescrObject *a_descr, *b_descr; diff --git a/Objects/dict-common.h b/Objects/dict-common.h index 2912eb9..ce9edab 100644 --- a/Objects/dict-common.h +++ b/Objects/dict-common.h @@ -8,15 +8,69 @@ typedef struct { PyObject *me_value; /* This field is only meaningful for combined tables */ } PyDictKeyEntry; -typedef PyDictKeyEntry *(*dict_lookup_func) -(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject ***value_addr); +/* dict_lookup_func() returns index of entry which can be used like DK_ENTRIES(dk)[index]. + * -1 when no entry found, -3 when compare raises error. + */ +typedef Py_ssize_t (*dict_lookup_func) +(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos); +#define DKIX_EMPTY (-1) +#define DKIX_DUMMY (-2) /* Used internally */ +#define DKIX_ERROR (-3) + +/* See dictobject.c for actual layout of DictKeysObject */ struct _dictkeysobject { Py_ssize_t dk_refcnt; + + /* Size of the hash table (dk_indices). It must be a power of 2. */ Py_ssize_t dk_size; + + /* Function to lookup in the hash table (dk_indices): + + - lookdict(): general-purpose, and may return DKIX_ERROR if (and + only if) a comparison raises an exception. + + - lookdict_unicode(): specialized to Unicode string keys, comparison of + which can never raise an exception; that function can never return + DKIX_ERROR. + + - lookdict_unicode_nodummy(): similar to lookdict_unicode() but further + specialized for Unicode string keys that cannot be the value. + + - lookdict_split(): Version of lookdict() for split tables. */ dict_lookup_func dk_lookup; + + /* Number of usable entries in dk_entries. */ Py_ssize_t dk_usable; - PyDictKeyEntry dk_entries[1]; + + /* Number of used entries in dk_entries. */ + Py_ssize_t dk_nentries; + + /* Actual hash table of dk_size entries. It holds indices in dk_entries, + or DKIX_EMPTY(-1) or DKIX_DUMMY(-2). + + Indices must be: 0 <= indice < USABLE_FRACTION(dk_size). + + The size in bytes of an indice depends on dk_size: + + - 1 byte if dk_size <= 0xff (char*) + - 2 bytes if dk_size <= 0xffff (int16_t*) + - 4 bytes if dk_size <= 0xffffffff (int32_t*) + - 8 bytes otherwise (int64_t*) + + Dynamically sized, 8 is minimum. */ + union { + int8_t as_1[8]; + int16_t as_2[4]; + int32_t as_4[2]; +#if SIZEOF_VOID_P > 4 + int64_t as_8[1]; +#endif + } dk_indices; + + /* "PyDictKeyEntry dk_entries[dk_usable];" array follows: + see the DK_ENTRIES() macro */ }; #endif diff --git a/Objects/dictobject.c b/Objects/dictobject.c index ff77bee..20b6f2f 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1,4 +1,3 @@ - /* Dictionary object implementation using a hash table */ /* The distribution includes a separate file, Objects/dictnotes.txt, @@ -7,68 +6,112 @@ tuning dictionaries, and several ideas for possible optimizations. */ +/* PyDictKeysObject -/* -There are four kinds of slots in the table: +This implements the dictionary's hashtable. -1. Unused. me_key == me_value == NULL - Does not hold an active (key, value) pair now and never did. Unused can - transition to Active upon key insertion. This is the only case in which - me_key is NULL, and is each slot's initial state. +As of Python 3.6, this is compact and ordered. Basic idea is described here. +https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html -2. Active. me_key != NULL and me_key != dummy and me_value != NULL - Holds an active (key, value) pair. Active can transition to Dummy or - Pending upon key deletion (for combined and split tables respectively). - This is the only case in which me_value != NULL. +layout: -3. Dummy. me_key == dummy and me_value == NULL - Previously held an active (key, value) pair, but that was deleted and an - active pair has not yet overwritten the slot. Dummy can transition to - Active upon key insertion. Dummy slots cannot be made Unused again - (cannot have me_key set to NULL), else the probe sequence in case of - collision would have no way to know they were once active. ++---------------+ +| dk_refcnt | +| dk_size | +| dk_lookup | +| dk_usable | +| dk_nentries | ++---------------+ +| dk_indices | +| | ++---------------+ +| dk_entries | +| | ++---------------+ + +dk_indices is actual hashtable. It holds index in entries, or DKIX_EMPTY(-1) +or DKIX_DUMMY(-2). +Size of indices is dk_size. Type of each index in indices is vary on dk_size: + +* int8 for dk_size <= 128 +* int16 for 256 <= dk_size <= 2**15 +* int32 for 2**16 <= dk_size <= 2**31 +* int64 for 2**32 <= dk_size + +dk_entries is array of PyDictKeyEntry. It's size is USABLE_FRACTION(dk_size). +DK_ENTRIES(dk) can be used to get pointer to entries. + +NOTE: Since negative value is used for DKIX_EMPTY and DKIX_DUMMY, type of +dk_indices entry is signed integer and int16 is used for table which +dk_size == 256. +*/ -4. Pending. Not yet inserted or deleted from a split-table. - key != NULL, key != dummy and value == NULL +/* The DictObject can be in one of two forms. + Either: A combined table: ma_values == NULL, dk_refcnt == 1. Values are stored in the me_value field of the PyDictKeysObject. - Slot kind 4 is not allowed i.e. - key != NULL, key != dummy and value == NULL is illegal. Or: A split table: ma_values != NULL, dk_refcnt >= 1 Values are stored in the ma_values array. - Only string (unicode) keys are allowed, no keys are present. + Only string (unicode) keys are allowed. + All dicts sharing same key must have same insertion order. + +There are four kinds of slots in the table (slot is index, and +DK_ENTRIES(keys)[index] if index >= 0): + +1. Unused. index == DKIX_EMPTY + Does not hold an active (key, value) pair now and never did. Unused can + transition to Active upon key insertion. This is each slot's initial state. + +2. Active. index >= 0, me_key != NULL and me_value != NULL + Holds an active (key, value) pair. Active can transition to Dummy or + Pending upon key deletion (for combined and split tables respectively). + This is the only case in which me_value != NULL. + +3. Dummy. index == DKIX_DUMMY (combined only) + Previously held an active (key, value) pair, but that was deleted and an + active pair has not yet overwritten the slot. Dummy can transition to + Active upon key insertion. Dummy slots cannot be made Unused again + else the probe sequence in case of collision would have no way to know + they were once active. -Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to -hold a search finger. The me_hash field of Unused or Dummy slots has no -meaning otherwise. As a consequence of this popitem always converts the dict -to the combined-table form. +4. Pending. index >= 0, key != NULL, and value == NULL (split only) + Not yet inserted in split-table. */ -/* PyDict_MINSIZE_SPLIT is the minimum size of a split dictionary. - * It must be a power of 2, and at least 4. - * Resizing of split dictionaries is very rare, so the saving memory is more - * important than the cost of resizing. - */ -#define PyDict_MINSIZE_SPLIT 4 +/* +Preserving insertion order + +It's simple for combined table. Since dk_entries is mostly append only, we can +get insertion order by just iterating dk_entries. -/* PyDict_MINSIZE_COMBINED is the starting size for any new, non-split dict. +One exception is .popitem(). It removes last item in dk_entries and decrement +dk_nentries to achieve amortized O(1). Since there are DKIX_DUMMY remains in +dk_indices, we can't increment dk_usable even though dk_nentries is +decremented. + +In split table, inserting into pending entry is allowed only for dk_entries[ix] +where ix == mp->ma_used. Inserting into other index and deleting item cause +converting the dict to the combined table. +*/ + +/* PyDict_MINSIZE is the starting size for any new dict. * 8 allows dicts with no more than 5 active entries; experiments suggested * this suffices for the majority of dicts (consisting mostly of usually-small * dicts created to pass keyword arguments). * Making this 8, rather than 4 reduces the number of resizes for most * dictionaries, without any significant extra memory use. */ -#define PyDict_MINSIZE_COMBINED 8 +#define PyDict_MINSIZE 8 #include "Python.h" #include "dict-common.h" -#include "stringlib/eq.h" +#include "stringlib/eq.h" /* to get unicode_eq() */ /*[clinic input] class dict "PyDictObject *" "&PyDict_Type" @@ -141,8 +184,8 @@ The other half of the strategy is to get the other bits of the hash code into play. This is done by initializing a (unsigned) vrbl "perturb" to the full hash code, and changing the recurrence to: - j = (5*j) + 1 + perturb; perturb >>= PERTURB_SHIFT; + j = (5*j) + 1 + perturb; use j % 2**i as the next table index; Now the probe sequence depends (eventually) on every bit in the hash code, @@ -177,41 +220,38 @@ equally good collision statistics, needed less code & used less memory. */ -/* Object used as dummy key to fill deleted entries - * This could be any unique object, - * use a custom type in order to minimise coupling. -*/ -static PyObject _dummy_struct; - -#define dummy (&_dummy_struct) - -#ifdef Py_REF_DEBUG -PyObject * -_PyDict_Dummy(void) -{ - return dummy; -} -#endif - /* forward declarations */ -static PyDictKeyEntry *lookdict(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr); -static PyDictKeyEntry *lookdict_unicode(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr); -static PyDictKeyEntry * +static Py_ssize_t lookdict(PyDictObject *mp, PyObject *key, + Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos); +static Py_ssize_t lookdict_unicode(PyDictObject *mp, PyObject *key, + Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos); +static Py_ssize_t lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr); -static PyDictKeyEntry *lookdict_split(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr); + Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos); +static Py_ssize_t lookdict_split(PyDictObject *mp, PyObject *key, + Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos); static int dictresize(PyDictObject *mp, Py_ssize_t minused); -/* Dictionary reuse scheme to save calls to malloc, free, and memset */ +/*Global counter used to set ma_version_tag field of dictionary. + * It is incremented each time that a dictionary is created and each + * time that a dictionary is modified. */ +static uint64_t pydict_global_version = 0; + +#define DICT_NEXT_VERSION() (++pydict_global_version) + +/* Dictionary reuse scheme to save calls to malloc and free */ #ifndef PyDict_MAXFREELIST #define PyDict_MAXFREELIST 80 #endif static PyDictObject *free_list[PyDict_MAXFREELIST]; static int numfree = 0; +static PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST]; +static int numfreekeys = 0; #include "clinic/dictobject.c.h" @@ -219,12 +259,15 @@ int PyDict_ClearFreeList(void) { PyDictObject *op; - int ret = numfree; + int ret = numfree + numfreekeys; while (numfree) { op = free_list[--numfree]; assert(PyDict_CheckExact(op)); PyObject_GC_Del(op); } + while (numfreekeys) { + PyObject_FREE(keys_free_list[--numfreekeys]); + } return ret; } @@ -243,40 +286,116 @@ PyDict_Fini(void) PyDict_ClearFreeList(); } +#define DK_SIZE(dk) ((dk)->dk_size) +#if SIZEOF_VOID_P > 4 +#define DK_IXSIZE(dk) \ + (DK_SIZE(dk) <= 0xff ? \ + 1 : DK_SIZE(dk) <= 0xffff ? \ + 2 : DK_SIZE(dk) <= 0xffffffff ? \ + 4 : sizeof(int64_t)) +#else +#define DK_IXSIZE(dk) \ + (DK_SIZE(dk) <= 0xff ? \ + 1 : DK_SIZE(dk) <= 0xffff ? \ + 2 : sizeof(int32_t)) +#endif +#define DK_ENTRIES(dk) \ + ((PyDictKeyEntry*)(&(dk)->dk_indices.as_1[DK_SIZE(dk) * DK_IXSIZE(dk)])) + #define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA #define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA #define DK_INCREF(dk) (DK_DEBUG_INCREF ++(dk)->dk_refcnt) #define DK_DECREF(dk) if (DK_DEBUG_DECREF (--(dk)->dk_refcnt) == 0) free_keys_object(dk) -#define DK_SIZE(dk) ((dk)->dk_size) #define DK_MASK(dk) (((dk)->dk_size)-1) #define IS_POWER_OF_2(x) (((x) & (x-1)) == 0) +/* lookup indices. returns DKIX_EMPTY, DKIX_DUMMY, or ix >=0 */ +static inline Py_ssize_t +dk_get_index(PyDictKeysObject *keys, Py_ssize_t i) +{ + Py_ssize_t s = DK_SIZE(keys); + Py_ssize_t ix; + + if (s <= 0xff) { + int8_t *indices = keys->dk_indices.as_1; + ix = indices[i]; + } + else if (s <= 0xffff) { + int16_t *indices = keys->dk_indices.as_2; + ix = indices[i]; + } +#if SIZEOF_VOID_P > 4 + else if (s > 0xffffffff) { + int64_t *indices = keys->dk_indices.as_8; + ix = indices[i]; + } +#endif + else { + int32_t *indices = keys->dk_indices.as_4; + ix = indices[i]; + } + assert(ix >= DKIX_DUMMY); + return ix; +} + +/* write to indices. */ +static inline void +dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix) +{ + Py_ssize_t s = DK_SIZE(keys); + + assert(ix >= DKIX_DUMMY); + + if (s <= 0xff) { + int8_t *indices = keys->dk_indices.as_1; + assert(ix <= 0x7f); + indices[i] = (char)ix; + } + else if (s <= 0xffff) { + int16_t *indices = keys->dk_indices.as_2; + assert(ix <= 0x7fff); + indices[i] = (int16_t)ix; + } +#if SIZEOF_VOID_P > 4 + else if (s > 0xffffffff) { + int64_t *indices = keys->dk_indices.as_8; + indices[i] = ix; + } +#endif + else { + int32_t *indices = keys->dk_indices.as_4; + assert(ix <= 0x7fffffff); + indices[i] = (int32_t)ix; + } +} + + /* USABLE_FRACTION is the maximum dictionary load. - * Currently set to (2n+1)/3. Increasing this ratio makes dictionaries more - * dense resulting in more collisions. Decreasing it improves sparseness - * at the expense of spreading entries over more cache lines and at the - * cost of total memory consumed. + * Increasing this ratio makes dictionaries more dense resulting in more + * collisions. Decreasing it improves sparseness at the expense of spreading + * indices over more cache lines and at the cost of total memory consumed. * * USABLE_FRACTION must obey the following: * (0 < USABLE_FRACTION(n) < n) for all n >= 2 * - * USABLE_FRACTION should be very quick to calculate. - * Fractions around 5/8 to 2/3 seem to work well in practice. + * USABLE_FRACTION should be quick to calculate. + * Fractions around 1/2 to 2/3 seem to work well in practice. */ +#define USABLE_FRACTION(n) (((n) << 1)/3) -/* Use (2n+1)/3 rather than 2n+3 because: it makes no difference for - * combined tables (the two fractions round to the same number n < ), - * but 2*4/3 is 2 whereas (2*4+1)/3 is 3 which potentially saves quite - * a lot of space for small, split tables */ -#define USABLE_FRACTION(n) ((((n) << 1)+1)/3) +/* ESTIMATE_SIZE is reverse function of USABLE_FRACTION. + * This can be used to reserve enough size to insert n entries without + * resizing. + */ +#define ESTIMATE_SIZE(n) (((n)*3) >> 1) -/* Alternative fraction that is otherwise close enough to (2n+1)/3 to make +/* Alternative fraction that is otherwise close enough to 2n/3 to make * little difference. 8 * 2/3 == 8 * 5/8 == 5. 16 * 2/3 == 16 * 5/8 == 10. * 32 * 2/3 = 21, 32 * 5/8 = 20. * Its advantage is that it is faster to compute on machines with slow division. * #define USABLE_FRACTION(n) (((n) >> 1) + ((n) >> 2) - ((n) >> 3)) -*/ + */ /* GROWTH_RATE. Growth rate upon hitting maximum load. * Currently set to used*2 + capacity/2. @@ -300,61 +419,155 @@ PyDict_Fini(void) * (which cannot fail and thus can do no allocation). */ static PyDictKeysObject empty_keys_struct = { - 2, /* dk_refcnt 1 for this struct, 1 for dummy_struct */ + 1, /* dk_refcnt */ 1, /* dk_size */ lookdict_split, /* dk_lookup */ 0, /* dk_usable (immutable) */ - { - { 0, 0, 0 } /* dk_entries (empty) */ - } + 0, /* dk_nentries */ + .dk_indices = { .as_1 = {DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, + DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY}}, }; static PyObject *empty_values[1] = { NULL }; #define Py_EMPTY_KEYS &empty_keys_struct +/* Uncomment to check the dict content in _PyDict_CheckConsistency() */ +/* #define DEBUG_PYDICT */ + + +#ifdef Py_DEBUG +static int +_PyDict_CheckConsistency(PyDictObject *mp) +{ + PyDictKeysObject *keys = mp->ma_keys; + int splitted = _PyDict_HasSplitTable(mp); + Py_ssize_t usable = USABLE_FRACTION(keys->dk_size); +#ifdef DEBUG_PYDICT + PyDictKeyEntry *entries = DK_ENTRIES(keys); + Py_ssize_t i; +#endif + + assert(0 <= mp->ma_used && mp->ma_used <= usable); + assert(IS_POWER_OF_2(keys->dk_size)); + assert(0 <= keys->dk_usable + && keys->dk_usable <= usable); + assert(0 <= keys->dk_nentries + && keys->dk_nentries <= usable); + assert(keys->dk_usable + keys->dk_nentries <= usable); + + if (!splitted) { + /* combined table */ + assert(keys->dk_refcnt == 1); + } + +#ifdef DEBUG_PYDICT + for (i=0; i < keys->dk_size; i++) { + Py_ssize_t ix = dk_get_index(keys, i); + assert(DKIX_DUMMY <= ix && ix <= usable); + } + + for (i=0; i < usable; i++) { + PyDictKeyEntry *entry = &entries[i]; + PyObject *key = entry->me_key; + + if (key != NULL) { + if (PyUnicode_CheckExact(key)) { + Py_hash_t hash = ((PyASCIIObject *)key)->hash; + assert(hash != -1); + assert(entry->me_hash == hash); + } + else { + /* test_dict fails if PyObject_Hash() is called again */ + assert(entry->me_hash != -1); + } + if (!splitted) { + assert(entry->me_value != NULL); + } + } + + if (splitted) { + assert(entry->me_value == NULL); + } + } + + if (splitted) { + /* splitted table */ + for (i=0; i < mp->ma_used; i++) { + assert(mp->ma_values[i] != NULL); + } + } +#endif + + return 1; +} +#endif + + static PyDictKeysObject *new_keys_object(Py_ssize_t size) { PyDictKeysObject *dk; - Py_ssize_t i; - PyDictKeyEntry *ep0; + Py_ssize_t es, usable; - assert(size >= PyDict_MINSIZE_SPLIT); + assert(size >= PyDict_MINSIZE); assert(IS_POWER_OF_2(size)); - dk = PyMem_MALLOC(sizeof(PyDictKeysObject) + - sizeof(PyDictKeyEntry) * (size-1)); - if (dk == NULL) { - PyErr_NoMemory(); - return NULL; + + usable = USABLE_FRACTION(size); + if (size <= 0xff) { + es = 1; + } + else if (size <= 0xffff) { + es = 2; + } +#if SIZEOF_VOID_P > 4 + else if (size <= 0xffffffff) { + es = 4; + } +#endif + else { + es = sizeof(Py_ssize_t); + } + + if (size == PyDict_MINSIZE && numfreekeys > 0) { + dk = keys_free_list[--numfreekeys]; + } + else { + dk = PyObject_MALLOC(sizeof(PyDictKeysObject) + - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) + + es * size + + sizeof(PyDictKeyEntry) * usable); + if (dk == NULL) { + PyErr_NoMemory(); + return NULL; + } } DK_DEBUG_INCREF dk->dk_refcnt = 1; dk->dk_size = size; - dk->dk_usable = USABLE_FRACTION(size); - ep0 = &dk->dk_entries[0]; - /* Hash value of slot 0 is used by popitem, so it must be initialized */ - ep0->me_hash = 0; - for (i = 0; i < size; i++) { - ep0[i].me_key = NULL; - ep0[i].me_value = NULL; - } + dk->dk_usable = usable; dk->dk_lookup = lookdict_unicode_nodummy; + dk->dk_nentries = 0; + memset(&dk->dk_indices.as_1[0], 0xff, es * size); + memset(DK_ENTRIES(dk), 0, sizeof(PyDictKeyEntry) * usable); return dk; } static void free_keys_object(PyDictKeysObject *keys) { - PyDictKeyEntry *entries = &keys->dk_entries[0]; + PyDictKeyEntry *entries = DK_ENTRIES(keys); Py_ssize_t i, n; - for (i = 0, n = DK_SIZE(keys); i < n; i++) { + for (i = 0, n = keys->dk_nentries; i < n; i++) { Py_XDECREF(entries[i].me_key); Py_XDECREF(entries[i].me_value); } - PyMem_FREE(keys); + if (keys->dk_size == PyDict_MINSIZE && numfreekeys < PyDict_MAXFREELIST) { + keys_free_list[numfreekeys++] = keys; + return; + } + PyObject_FREE(keys); } #define new_values(size) PyMem_NEW(PyObject *, size) - #define free_values(values) PyMem_FREE(values) /* Consumes a reference to the keys object */ @@ -380,6 +593,8 @@ new_dict(PyDictKeysObject *keys, PyObject **values) mp->ma_keys = keys; mp->ma_values = values; mp->ma_used = 0; + mp->ma_version_tag = DICT_NEXT_VERSION(); + assert(_PyDict_CheckConsistency(mp)); return (PyObject *)mp; } @@ -390,7 +605,7 @@ new_dict_with_shared_keys(PyDictKeysObject *keys) PyObject **values; Py_ssize_t i, size; - size = DK_SIZE(keys); + size = USABLE_FRACTION(DK_SIZE(keys)); values = new_values(size); if (values == NULL) { DK_DECREF(keys); @@ -405,12 +620,44 @@ new_dict_with_shared_keys(PyDictKeysObject *keys) PyObject * PyDict_New(void) { - PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE_COMBINED); + PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE); if (keys == NULL) return NULL; return new_dict(keys, NULL); } +/* Search index of hash table from offset of entry table */ +static Py_ssize_t +lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index) +{ + size_t i; + size_t mask = DK_MASK(k); + Py_ssize_t ix; + + i = (size_t)hash & mask; + ix = dk_get_index(k, i); + if (ix == index) { + return i; + } + if (ix == DKIX_EMPTY) { + return DKIX_EMPTY; + } + + for (size_t perturb = hash;;) { + perturb >>= PERTURB_SHIFT; + i = mask & ((i << 2) + i + perturb + 1); + ix = dk_get_index(k, i); + if (ix == index) { + return i; + } + if (ix == DKIX_EMPTY) { + return DKIX_EMPTY; + } + } + assert(0); /* NOT REACHED */ + return DKIX_ERROR; +} + /* The basic lookup function used by all operations. This is based on Algorithm D from Knuth Vol. 3, Sec. 6.4. @@ -426,52 +673,66 @@ The details in this version are due to Tim Peters, building on many past contributions by Reimer Behrends, Jyrki Alakuijala, Vladimir Marangozov and Christian Tismer. -lookdict() is general-purpose, and may return NULL if (and only if) a -comparison raises an exception (this was new in Python 2.5). +lookdict() is general-purpose, and may return DKIX_ERROR if (and only if) a +comparison raises an exception. lookdict_unicode() below is specialized to string keys, comparison of which can -never raise an exception; that function must not return NULL for string key. +never raise an exception; that function can never return DKIX_ERROR. lookdict_unicode_nodummy is further specialized for string keys that cannot be the value. -For both, when the key isn't found a PyDictEntry* is returned -where the key would have been found, *value_addr points to the matching value -slot. +For both, when the key isn't found a DKIX_EMPTY is returned. hashpos returns +where the key index should be inserted. */ -static PyDictKeyEntry * +static Py_ssize_t lookdict(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr) + Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos) { - size_t i; - size_t perturb; - PyDictKeyEntry *freeslot; - size_t mask; - PyDictKeyEntry *ep0; - PyDictKeyEntry *ep; + size_t i, mask; + Py_ssize_t ix, freeslot; int cmp; + PyDictKeysObject *dk; + PyDictKeyEntry *ep0, *ep; PyObject *startkey; top: - mask = DK_MASK(mp->ma_keys); - ep0 = &mp->ma_keys->dk_entries[0]; + dk = mp->ma_keys; + mask = DK_MASK(dk); + ep0 = DK_ENTRIES(dk); i = (size_t)hash & mask; - ep = &ep0[i]; - if (ep->me_key == NULL || ep->me_key == key) { - *value_addr = &ep->me_value; - return ep; + + ix = dk_get_index(dk, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + if (ix == DKIX_DUMMY) { + freeslot = i; } - if (ep->me_key == dummy) - freeslot = ep; else { + ep = &ep0[ix]; + assert(ep->me_key != NULL); + if (ep->me_key == key) { + *value_addr = &ep->me_value; + if (hashpos != NULL) + *hashpos = i; + return ix; + } if (ep->me_hash == hash) { startkey = ep->me_key; Py_INCREF(startkey); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Py_DECREF(startkey); - if (cmp < 0) - return NULL; - if (ep0 == mp->ma_keys->dk_entries && ep->me_key == startkey) { + if (cmp < 0) { + *value_addr = NULL; + return DKIX_ERROR; + } + if (dk == mp->ma_keys && ep->me_key == startkey) { if (cmp > 0) { *value_addr = &ep->me_value; - return ep; + if (hashpos != NULL) + *hashpos = i; + return ix; } } else { @@ -479,40 +740,50 @@ top: goto top; } } - freeslot = NULL; + freeslot = -1; } - /* In the loop, me_key == dummy is by far (factor of 100s) the - least likely outcome, so test for that last. */ - for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { - i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; - if (ep->me_key == NULL) { - if (freeslot == NULL) { - *value_addr = &ep->me_value; - return ep; - } else { - *value_addr = &freeslot->me_value; - return freeslot; + for (size_t perturb = hash;;) { + perturb >>= PERTURB_SHIFT; + i = ((i << 2) + i + perturb + 1) & mask; + ix = dk_get_index(dk, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) { + *hashpos = (freeslot == -1) ? (Py_ssize_t)i : freeslot; } + *value_addr = NULL; + return ix; } + if (ix == DKIX_DUMMY) { + if (freeslot == -1) + freeslot = i; + continue; + } + ep = &ep0[ix]; + assert(ep->me_key != NULL); if (ep->me_key == key) { + if (hashpos != NULL) { + *hashpos = i; + } *value_addr = &ep->me_value; - return ep; + return ix; } - if (ep->me_hash == hash && ep->me_key != dummy) { + if (ep->me_hash == hash) { startkey = ep->me_key; Py_INCREF(startkey); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Py_DECREF(startkey); if (cmp < 0) { *value_addr = NULL; - return NULL; + return DKIX_ERROR; } - if (ep0 == mp->ma_keys->dk_entries && ep->me_key == startkey) { + if (dk == mp->ma_keys && ep->me_key == startkey) { if (cmp > 0) { + if (hashpos != NULL) { + *hashpos = i; + } *value_addr = &ep->me_value; - return ep; + return ix; } } else { @@ -520,72 +791,80 @@ top: goto top; } } - else if (ep->me_key == dummy && freeslot == NULL) - freeslot = ep; } assert(0); /* NOT REACHED */ return 0; } /* Specialized version for string-only keys */ -static PyDictKeyEntry * +static Py_ssize_t lookdict_unicode(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr) + Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos) { size_t i; - size_t perturb; - PyDictKeyEntry *freeslot; size_t mask = DK_MASK(mp->ma_keys); - PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0]; - PyDictKeyEntry *ep; + Py_ssize_t ix, freeslot; + PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys); + assert(mp->ma_values == NULL); /* Make sure this function doesn't have to handle non-unicode keys, including subclasses of str; e.g., one reason to subclass unicodes is to override __eq__, and for speed we don't cater to that here. */ if (!PyUnicode_CheckExact(key)) { mp->ma_keys->dk_lookup = lookdict; - return lookdict(mp, key, hash, value_addr); + return lookdict(mp, key, hash, value_addr, hashpos); } i = (size_t)hash & mask; - ep = &ep0[i]; - if (ep->me_key == NULL || ep->me_key == key) { - *value_addr = &ep->me_value; - return ep; + ix = dk_get_index(mp->ma_keys, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + if (ix == DKIX_DUMMY) { + freeslot = i; } - if (ep->me_key == dummy) - freeslot = ep; else { - if (ep->me_hash == hash && unicode_eq(ep->me_key, key)) { + ep = &ep0[ix]; + assert(ep->me_key != NULL); + if (ep->me_key == key + || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { + if (hashpos != NULL) + *hashpos = i; *value_addr = &ep->me_value; - return ep; + return ix; } - freeslot = NULL; + freeslot = -1; } - /* In the loop, me_key == dummy is by far (factor of 100s) the - least likely outcome, so test for that last. */ - for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { - i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; - if (ep->me_key == NULL) { - if (freeslot == NULL) { - *value_addr = &ep->me_value; - return ep; - } else { - *value_addr = &freeslot->me_value; - return freeslot; + for (size_t perturb = hash;;) { + perturb >>= PERTURB_SHIFT; + i = mask & ((i << 2) + i + perturb + 1); + ix = dk_get_index(mp->ma_keys, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) { + *hashpos = (freeslot == -1) ? (Py_ssize_t)i : freeslot; } + *value_addr = NULL; + return DKIX_EMPTY; + } + if (ix == DKIX_DUMMY) { + if (freeslot == -1) + freeslot = i; + continue; } + ep = &ep0[ix]; + assert(ep->me_key != NULL); if (ep->me_key == key - || (ep->me_hash == hash - && ep->me_key != dummy - && unicode_eq(ep->me_key, key))) { + || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { *value_addr = &ep->me_value; - return ep; + if (hashpos != NULL) { + *hashpos = i; + } + return ix; } - if (ep->me_key == dummy && freeslot == NULL) - freeslot = ep; } assert(0); /* NOT REACHED */ return 0; @@ -593,40 +872,63 @@ lookdict_unicode(PyDictObject *mp, PyObject *key, /* Faster version of lookdict_unicode when it is known that no keys * will be present. */ -static PyDictKeyEntry * +static Py_ssize_t lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr) + Py_hash_t hash, PyObject ***value_addr, + Py_ssize_t *hashpos) { size_t i; - size_t perturb; size_t mask = DK_MASK(mp->ma_keys); - PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0]; - PyDictKeyEntry *ep; + Py_ssize_t ix; + PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys); + assert(mp->ma_values == NULL); /* Make sure this function doesn't have to handle non-unicode keys, including subclasses of str; e.g., one reason to subclass unicodes is to override __eq__, and for speed we don't cater to that here. */ if (!PyUnicode_CheckExact(key)) { mp->ma_keys->dk_lookup = lookdict; - return lookdict(mp, key, hash, value_addr); + return lookdict(mp, key, hash, value_addr, hashpos); } i = (size_t)hash & mask; - ep = &ep0[i]; - assert(ep->me_key == NULL || PyUnicode_CheckExact(ep->me_key)); - if (ep->me_key == NULL || ep->me_key == key || + ix = dk_get_index(mp->ma_keys, i); + assert (ix != DKIX_DUMMY); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + ep = &ep0[ix]; + assert(ep->me_key != NULL); + assert(PyUnicode_CheckExact(ep->me_key)); + if (ep->me_key == key || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { + if (hashpos != NULL) + *hashpos = i; *value_addr = &ep->me_value; - return ep; - } - for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { - i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; - assert(ep->me_key == NULL || PyUnicode_CheckExact(ep->me_key)); - if (ep->me_key == NULL || ep->me_key == key || + return ix; + } + for (size_t perturb = hash;;) { + perturb >>= PERTURB_SHIFT; + i = mask & ((i << 2) + i + perturb + 1); + ix = dk_get_index(mp->ma_keys, i); + assert (ix != DKIX_DUMMY); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + ep = &ep0[ix]; + assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key)); + if (ep->me_key == key || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { + if (hashpos != NULL) + *hashpos = i; *value_addr = &ep->me_value; - return ep; + return ix; } } assert(0); /* NOT REACHED */ @@ -638,39 +940,62 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key, * Split tables only contain unicode keys and no dummy keys, * so algorithm is the same as lookdict_unicode_nodummy. */ -static PyDictKeyEntry * +static Py_ssize_t lookdict_split(PyDictObject *mp, PyObject *key, - Py_hash_t hash, PyObject ***value_addr) + Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos) { size_t i; - size_t perturb; size_t mask = DK_MASK(mp->ma_keys); - PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0]; - PyDictKeyEntry *ep; + Py_ssize_t ix; + PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys); + /* mp must split table */ + assert(mp->ma_values != NULL); if (!PyUnicode_CheckExact(key)) { - ep = lookdict(mp, key, hash, value_addr); - /* lookdict expects a combined-table, so fix value_addr */ - i = ep - ep0; - *value_addr = &mp->ma_values[i]; - return ep; + ix = lookdict(mp, key, hash, value_addr, hashpos); + if (ix >= 0) { + *value_addr = &mp->ma_values[ix]; + } + return ix; } + i = (size_t)hash & mask; - ep = &ep0[i]; - assert(ep->me_key == NULL || PyUnicode_CheckExact(ep->me_key)); - if (ep->me_key == NULL || ep->me_key == key || + ix = dk_get_index(mp->ma_keys, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + assert(ix >= 0); + ep = &ep0[ix]; + assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key)); + if (ep->me_key == key || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { - *value_addr = &mp->ma_values[i]; - return ep; - } - for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { - i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; - assert(ep->me_key == NULL || PyUnicode_CheckExact(ep->me_key)); - if (ep->me_key == NULL || ep->me_key == key || + if (hashpos != NULL) + *hashpos = i; + *value_addr = &mp->ma_values[ix]; + return ix; + } + for (size_t perturb = hash;;) { + perturb >>= PERTURB_SHIFT; + i = mask & ((i << 2) + i + perturb + 1); + ix = dk_get_index(mp->ma_keys, i); + if (ix == DKIX_EMPTY) { + if (hashpos != NULL) + *hashpos = i; + *value_addr = NULL; + return DKIX_EMPTY; + } + assert(ix >= 0); + ep = &ep0[ix]; + assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key)); + if (ep->me_key == key || (ep->me_hash == hash && unicode_eq(ep->me_key, key))) { - *value_addr = &mp->ma_values[i & mask]; - return ep; + if (hashpos != NULL) + *hashpos = i; + *value_addr = &mp->ma_values[ix]; + return ix; } } assert(0); /* NOT REACHED */ @@ -707,27 +1032,27 @@ _PyDict_MaybeUntrack(PyObject *op) { PyDictObject *mp; PyObject *value; - Py_ssize_t i, size; + Py_ssize_t i, numentries; + PyDictKeyEntry *ep0; if (!PyDict_CheckExact(op) || !_PyObject_GC_IS_TRACKED(op)) return; mp = (PyDictObject *) op; - size = DK_SIZE(mp->ma_keys); + ep0 = DK_ENTRIES(mp->ma_keys); + numentries = mp->ma_keys->dk_nentries; if (_PyDict_HasSplitTable(mp)) { - for (i = 0; i < size; i++) { + for (i = 0; i < numentries; i++) { if ((value = mp->ma_values[i]) == NULL) continue; if (_PyObject_GC_MAY_BE_TRACKED(value)) { - assert(!_PyObject_GC_MAY_BE_TRACKED( - mp->ma_keys->dk_entries[i].me_key)); + assert(!_PyObject_GC_MAY_BE_TRACKED(ep0[i].me_key)); return; } } } else { - PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0]; - for (i = 0; i < size; i++) { + for (i = 0; i < numentries; i++) { if ((value = ep0[i].me_value) == NULL) continue; if (_PyObject_GC_MAY_BE_TRACKED(value) || @@ -739,33 +1064,35 @@ _PyDict_MaybeUntrack(PyObject *op) } /* Internal function to find slot for an item from its hash - * when it is known that the key is not present in the dict. - */ -static PyDictKeyEntry * + when it is known that the key is not present in the dict. + + The dict must be combined. */ +static void find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash, - PyObject ***value_addr) + PyObject ***value_addr, Py_ssize_t *hashpos) { size_t i; - size_t perturb; size_t mask = DK_MASK(mp->ma_keys); - PyDictKeyEntry *ep0 = &mp->ma_keys->dk_entries[0]; - PyDictKeyEntry *ep; + Py_ssize_t ix; + PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys); + assert(!_PyDict_HasSplitTable(mp)); + assert(hashpos != NULL); assert(key != NULL); + if (!PyUnicode_CheckExact(key)) mp->ma_keys->dk_lookup = lookdict; i = hash & mask; - ep = &ep0[i]; - for (perturb = hash; ep->me_key != NULL; perturb >>= PERTURB_SHIFT) { + ix = dk_get_index(mp->ma_keys, i); + for (size_t perturb = hash; ix != DKIX_EMPTY;) { + perturb >>= PERTURB_SHIFT; i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; + ix = dk_get_index(mp->ma_keys, i & mask); } + ep = &ep0[mp->ma_keys->dk_nentries]; + *hashpos = i & mask; assert(ep->me_value == NULL); - if (mp->ma_values) - *value_addr = &mp->ma_values[i & mask]; - else - *value_addr = &ep->me_value; - return ep; + *value_addr = &ep->me_value; } static int @@ -784,64 +1111,89 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value) { PyObject *old_value; PyObject **value_addr; - PyDictKeyEntry *ep; - assert(key != dummy); + PyDictKeyEntry *ep, *ep0; + Py_ssize_t hashpos, ix; - Py_INCREF(key); - Py_INCREF(value); if (mp->ma_values != NULL && !PyUnicode_CheckExact(key)) { if (insertion_resize(mp) < 0) - goto Fail; + return -1; } - ep = mp->ma_keys->dk_lookup(mp, key, hash, &value_addr); - if (ep == NULL) - goto Fail; + ix = mp->ma_keys->dk_lookup(mp, key, hash, &value_addr, &hashpos); + if (ix == DKIX_ERROR) { + return -1; + } assert(PyUnicode_CheckExact(key) || mp->ma_keys->dk_lookup == lookdict); + Py_INCREF(value); MAINTAIN_TRACKING(mp, key, value); - old_value = *value_addr; - if (old_value != NULL) { - assert(ep->me_key != NULL && ep->me_key != dummy); - *value_addr = value; - Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */ - Py_DECREF(key); + + /* When insertion order is different from shared key, we can't share + * the key anymore. Convert this instance to combine table. + */ + if (_PyDict_HasSplitTable(mp) && + ((ix >= 0 && *value_addr == NULL && mp->ma_used != ix) || + (ix == DKIX_EMPTY && mp->ma_used != mp->ma_keys->dk_nentries))) { + if (insertion_resize(mp) < 0) { + Py_DECREF(value); + return -1; + } + find_empty_slot(mp, key, hash, &value_addr, &hashpos); + ix = DKIX_EMPTY; } - else { - if (ep->me_key == NULL) { - if (mp->ma_keys->dk_usable <= 0) { - /* Need to resize. */ - if (insertion_resize(mp) < 0) - goto Fail; - ep = find_empty_slot(mp, key, hash, &value_addr); + + if (ix == DKIX_EMPTY) { + /* Insert into new slot. */ + if (mp->ma_keys->dk_usable <= 0) { + /* Need to resize. */ + if (insertion_resize(mp) < 0) { + Py_DECREF(value); + return -1; } - mp->ma_used++; - *value_addr = value; - mp->ma_keys->dk_usable--; - assert(mp->ma_keys->dk_usable >= 0); - ep->me_key = key; - ep->me_hash = hash; - assert(ep->me_key != NULL && ep->me_key != dummy); + find_empty_slot(mp, key, hash, &value_addr, &hashpos); + } + ep0 = DK_ENTRIES(mp->ma_keys); + ep = &ep0[mp->ma_keys->dk_nentries]; + dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); + Py_INCREF(key); + ep->me_key = key; + ep->me_hash = hash; + if (mp->ma_values) { + assert (mp->ma_values[mp->ma_keys->dk_nentries] == NULL); + mp->ma_values[mp->ma_keys->dk_nentries] = value; } else { - mp->ma_used++; - *value_addr = value; - if (ep->me_key == dummy) { - ep->me_key = key; - ep->me_hash = hash; - Py_DECREF(dummy); - } else { - assert(_PyDict_HasSplitTable(mp)); - Py_DECREF(key); - } + ep->me_value = value; } + mp->ma_used++; + mp->ma_version_tag = DICT_NEXT_VERSION(); + mp->ma_keys->dk_usable--; + mp->ma_keys->dk_nentries++; + assert(mp->ma_keys->dk_usable >= 0); + assert(_PyDict_CheckConsistency(mp)); + return 0; } - return 0; -Fail: - Py_DECREF(value); - Py_DECREF(key); - return -1; + assert(value_addr != NULL); + + old_value = *value_addr; + if (old_value != NULL) { + *value_addr = value; + mp->ma_version_tag = DICT_NEXT_VERSION(); + assert(_PyDict_CheckConsistency(mp)); + + Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */ + return 0; + } + + /* pending state */ + assert(_PyDict_HasSplitTable(mp)); + assert(ix == mp->ma_used); + *value_addr = value; + mp->ma_used++; + mp->ma_version_tag = DICT_NEXT_VERSION(); + assert(_PyDict_CheckConsistency(mp)); + return 0; } /* @@ -859,24 +1211,24 @@ insertdict_clean(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value) { size_t i; - size_t perturb; PyDictKeysObject *k = mp->ma_keys; size_t mask = (size_t)DK_SIZE(k)-1; - PyDictKeyEntry *ep0 = &k->dk_entries[0]; + PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys); PyDictKeyEntry *ep; assert(k->dk_lookup != NULL); assert(value != NULL); assert(key != NULL); - assert(key != dummy); assert(PyUnicode_CheckExact(key) || k->dk_lookup == lookdict); i = hash & mask; - ep = &ep0[i]; - for (perturb = hash; ep->me_key != NULL; perturb >>= PERTURB_SHIFT) { - i = (i << 2) + i + perturb + 1; - ep = &ep0[i & mask]; + for (size_t perturb = hash; dk_get_index(k, i) != DKIX_EMPTY;) { + perturb >>= PERTURB_SHIFT; + i = mask & ((i << 2) + i + perturb + 1); } + ep = &ep0[k->dk_nentries]; assert(ep->me_value == NULL); + dk_set_index(k, i, k->dk_nentries); + k->dk_nentries++; ep->me_key = key; ep->me_hash = hash; ep->me_value = value; @@ -893,16 +1245,16 @@ After resizing a table is always combined, but can be resplit by make_keys_shared(). */ static int -dictresize(PyDictObject *mp, Py_ssize_t minused) +dictresize(PyDictObject *mp, Py_ssize_t minsize) { - Py_ssize_t newsize; + Py_ssize_t i, newsize; PyDictKeysObject *oldkeys; PyObject **oldvalues; - Py_ssize_t i, oldsize; + PyDictKeyEntry *ep0; -/* Find the smallest table size > minused. */ - for (newsize = PyDict_MINSIZE_COMBINED; - newsize <= minused && newsize > 0; + /* Find the smallest table size > minused. */ + for (newsize = PyDict_MINSIZE; + newsize < minsize && newsize > 0; newsize <<= 1) ; if (newsize <= 0) { @@ -917,56 +1269,45 @@ dictresize(PyDictObject *mp, Py_ssize_t minused) mp->ma_keys = oldkeys; return -1; } + // New table must be large enough. + assert(mp->ma_keys->dk_usable >= mp->ma_used); if (oldkeys->dk_lookup == lookdict) mp->ma_keys->dk_lookup = lookdict; - oldsize = DK_SIZE(oldkeys); mp->ma_values = NULL; - /* If empty then nothing to copy so just return */ - if (oldsize == 1) { - assert(oldkeys == Py_EMPTY_KEYS); - DK_DECREF(oldkeys); - return 0; - } + ep0 = DK_ENTRIES(oldkeys); /* Main loop below assumes we can transfer refcount to new keys * and that value is stored in me_value. * Increment ref-counts and copy values here to compensate * This (resizing a split table) should be relatively rare */ if (oldvalues != NULL) { - for (i = 0; i < oldsize; i++) { + for (i = 0; i < oldkeys->dk_nentries; i++) { if (oldvalues[i] != NULL) { - Py_INCREF(oldkeys->dk_entries[i].me_key); - oldkeys->dk_entries[i].me_value = oldvalues[i]; + Py_INCREF(ep0[i].me_key); + ep0[i].me_value = oldvalues[i]; } } } /* Main loop */ - for (i = 0; i < oldsize; i++) { - PyDictKeyEntry *ep = &oldkeys->dk_entries[i]; + for (i = 0; i < oldkeys->dk_nentries; i++) { + PyDictKeyEntry *ep = &ep0[i]; if (ep->me_value != NULL) { - assert(ep->me_key != dummy); insertdict_clean(mp, ep->me_key, ep->me_hash, ep->me_value); } } mp->ma_keys->dk_usable -= mp->ma_used; if (oldvalues != NULL) { /* NULL out me_value slot in oldkeys, in case it was shared */ - for (i = 0; i < oldsize; i++) - oldkeys->dk_entries[i].me_value = NULL; - assert(oldvalues != empty_values); - free_values(oldvalues); + for (i = 0; i < oldkeys->dk_nentries; i++) + ep0[i].me_value = NULL; DK_DECREF(oldkeys); + if (oldvalues != empty_values) { + free_values(oldvalues); + } } else { assert(oldkeys->dk_lookup != lookdict_split); - if (oldkeys->dk_lookup != lookdict_unicode_nodummy) { - PyDictKeyEntry *ep0 = &oldkeys->dk_entries[0]; - for (i = 0; i < oldsize; i++) { - if (ep0[i].me_key == dummy) - Py_DECREF(dummy); - } - } assert(oldkeys->dk_refcnt == 1); - DK_DEBUG_DECREF PyMem_FREE(oldkeys); + DK_DEBUG_DECREF PyObject_FREE(oldkeys); } return 0; } @@ -990,16 +1331,14 @@ make_keys_shared(PyObject *op) return NULL; } else if (mp->ma_keys->dk_lookup == lookdict_unicode) { - /* Remove dummy keys - * -1 is required since dictresize() uses key size > minused - */ - if (dictresize(mp, DK_SIZE(mp->ma_keys) - 1)) + /* Remove dummy keys */ + if (dictresize(mp, DK_SIZE(mp->ma_keys))) return NULL; } assert(mp->ma_keys->dk_lookup == lookdict_unicode_nodummy); /* Copy values into a new array */ - ep0 = &mp->ma_keys->dk_entries[0]; - size = DK_SIZE(mp->ma_keys); + ep0 = DK_ENTRIES(mp->ma_keys); + size = USABLE_FRACTION(DK_SIZE(mp->ma_keys)); values = new_values(size); if (values == NULL) { PyErr_SetString(PyExc_MemoryError, @@ -1022,7 +1361,7 @@ _PyDict_NewPresized(Py_ssize_t minused) { Py_ssize_t newsize; PyDictKeysObject *new_keys; - for (newsize = PyDict_MINSIZE_COMBINED; + for (newsize = PyDict_MINSIZE; newsize <= minused && newsize > 0; newsize <<= 1) ; @@ -1046,8 +1385,8 @@ PyObject * PyDict_GetItem(PyObject *op, PyObject *key) { Py_hash_t hash; + Py_ssize_t ix; PyDictObject *mp = (PyDictObject *)op; - PyDictKeyEntry *ep; PyThreadState *tstate; PyObject **value_addr; @@ -1073,15 +1412,15 @@ PyDict_GetItem(PyObject *op, PyObject *key) /* preserve the existing exception */ PyObject *err_type, *err_value, *err_tb; PyErr_Fetch(&err_type, &err_value, &err_tb); - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); /* ignore errors */ PyErr_Restore(err_type, err_value, err_tb); - if (ep == NULL) + if (ix < 0) return NULL; } else { - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) { + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix < 0) { PyErr_Clear(); return NULL; } @@ -1089,39 +1428,25 @@ PyDict_GetItem(PyObject *op, PyObject *key) return *value_addr; } +/* Same as PyDict_GetItemWithError() but with hash supplied by caller. + This returns NULL *with* an exception set if an exception occurred. + It returns NULL *without* an exception set if the key wasn't present. +*/ PyObject * _PyDict_GetItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) { + Py_ssize_t ix; PyDictObject *mp = (PyDictObject *)op; - PyDictKeyEntry *ep; - PyThreadState *tstate; PyObject **value_addr; - if (!PyDict_Check(op)) + if (!PyDict_Check(op)) { + PyErr_BadInternalCall(); return NULL; - - /* We can arrive here with a NULL tstate during initialization: try - running "python -Wi" for an example related to string interning. - Let's just hope that no exception occurs then... This must be - _PyThreadState_Current and not PyThreadState_GET() because in debug - mode, the latter complains if tstate is NULL. */ - tstate = _PyThreadState_UncheckedGet(); - if (tstate != NULL && tstate->curexc_type != NULL) { - /* preserve the existing exception */ - PyObject *err_type, *err_value, *err_tb; - PyErr_Fetch(&err_type, &err_value, &err_tb); - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - /* ignore errors */ - PyErr_Restore(err_type, err_value, err_tb); - if (ep == NULL) - return NULL; } - else { - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) { - PyErr_Clear(); - return NULL; - } + + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix < 0) { + return NULL; } return *value_addr; } @@ -1133,9 +1458,9 @@ _PyDict_GetItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) PyObject * PyDict_GetItemWithError(PyObject *op, PyObject *key) { + Py_ssize_t ix; Py_hash_t hash; PyDictObject*mp = (PyDictObject *)op; - PyDictKeyEntry *ep; PyObject **value_addr; if (!PyDict_Check(op)) { @@ -1151,8 +1476,8 @@ PyDict_GetItemWithError(PyObject *op, PyObject *key) } } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix < 0) return NULL; return *value_addr; } @@ -1167,39 +1492,40 @@ _PyDict_GetItemIdWithError(PyObject *dp, struct _Py_Identifier *key) return PyDict_GetItemWithError(dp, kv); } -/* Fast version of global value lookup. +/* Fast version of global value lookup (LOAD_GLOBAL). * Lookup in globals, then builtins. + * + * Raise an exception and return NULL if an error occurred (ex: computing the + * key hash failed, key comparison failed, ...). Return NULL if the key doesn't + * exist. Return the value if the key exists. */ PyObject * _PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key) { - PyObject *x; - if (PyUnicode_CheckExact(key)) { - PyObject **value_addr; - Py_hash_t hash = ((PyASCIIObject *)key)->hash; - if (hash != -1) { - PyDictKeyEntry *e; - e = globals->ma_keys->dk_lookup(globals, key, hash, &value_addr); - if (e == NULL) { - return NULL; - } - x = *value_addr; - if (x != NULL) - return x; - e = builtins->ma_keys->dk_lookup(builtins, key, hash, &value_addr); - if (e == NULL) { - return NULL; - } - x = *value_addr; - return x; - } + Py_ssize_t ix; + Py_hash_t hash; + PyObject **value_addr; + + if (!PyUnicode_CheckExact(key) || + (hash = ((PyASCIIObject *) key)->hash) == -1) + { + hash = PyObject_Hash(key); + if (hash == -1) + return NULL; } - x = PyDict_GetItemWithError((PyObject *)globals, key); - if (x != NULL) - return x; - if (PyErr_Occurred()) + + /* namespace 1: globals */ + ix = globals->ma_keys->dk_lookup(globals, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) return NULL; - return PyDict_GetItemWithError((PyObject *)builtins, key); + if (ix != DKIX_EMPTY && *value_addr != NULL) + return *value_addr; + + /* namespace 2: builtins */ + ix = builtins->ma_keys->dk_lookup(builtins, key, hash, &value_addr, NULL); + if (ix < 0) + return NULL; + return *value_addr; } /* CAUTION: PyDict_SetItem() must guarantee that it won't resize the @@ -1251,37 +1577,11 @@ _PyDict_SetItem_KnownHash(PyObject *op, PyObject *key, PyObject *value, return insertdict(mp, key, hash, value); } -static int -delitem_common(PyDictObject *mp, PyDictKeyEntry *ep, PyObject **value_addr) -{ - PyObject *old_key, *old_value; - - old_value = *value_addr; - *value_addr = NULL; - mp->ma_used--; - if (!_PyDict_HasSplitTable(mp)) { - ENSURE_ALLOWS_DELETIONS(mp); - old_key = ep->me_key; - Py_INCREF(dummy); - ep->me_key = dummy; - Py_DECREF(old_key); - } - Py_DECREF(old_value); - return 0; -} - int PyDict_DelItem(PyObject *op, PyObject *key) { - PyDictObject *mp; Py_hash_t hash; - PyDictKeyEntry *ep; - PyObject **value_addr; - if (!PyDict_Check(op)) { - PyErr_BadInternalCall(); - return -1; - } assert(key); if (!PyUnicode_CheckExact(key) || (hash = ((PyASCIIObject *) key)->hash) == -1) { @@ -1289,22 +1589,17 @@ PyDict_DelItem(PyObject *op, PyObject *key) if (hash == -1) return -1; } - mp = (PyDictObject *)op; - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) - return -1; - if (*value_addr == NULL) { - _PyErr_SetKeyError(key); - return -1; - } - return delitem_common(mp, ep, value_addr); + + return _PyDict_DelItem_KnownHash(op, key, hash); } int _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) { + Py_ssize_t hashpos, ix; PyDictObject *mp; PyDictKeyEntry *ep; + PyObject *old_key, *old_value; PyObject **value_addr; if (!PyDict_Check(op)) { @@ -1314,51 +1609,40 @@ _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash) assert(key); assert(hash != -1); mp = (PyDictObject *)op; - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, &hashpos); + if (ix == DKIX_ERROR) return -1; - if (*value_addr == NULL) { + if (ix == DKIX_EMPTY || *value_addr == NULL) { _PyErr_SetKeyError(key); return -1; } - return delitem_common(mp, ep, value_addr); -} - -int -_PyDict_DelItemIf(PyObject *op, PyObject *key, - int (*predicate)(PyObject *value)) -{ - PyDictObject *mp; - Py_hash_t hash; - PyDictKeyEntry *ep; - PyObject **value_addr; - int res; + assert(dk_get_index(mp->ma_keys, hashpos) == ix); - if (!PyDict_Check(op)) { - PyErr_BadInternalCall(); - return -1; - } - assert(key); - hash = PyObject_Hash(key); - if (hash == -1) - return -1; - mp = (PyDictObject *)op; - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) - return -1; - if (*value_addr == NULL) { - _PyErr_SetKeyError(key); - return -1; + // Split table doesn't allow deletion. Combine it. + if (_PyDict_HasSplitTable(mp)) { + if (dictresize(mp, DK_SIZE(mp->ma_keys))) { + return -1; + } + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, &hashpos); + assert(ix >= 0); } - res = predicate(*value_addr); - if (res == -1) - return -1; - if (res > 0) - return delitem_common(mp, ep, value_addr); - else - return 0; -} + old_value = *value_addr; + assert(old_value != NULL); + *value_addr = NULL; + mp->ma_used--; + mp->ma_version_tag = DICT_NEXT_VERSION(); + ep = &DK_ENTRIES(mp->ma_keys)[ix]; + dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); + ENSURE_ALLOWS_DELETIONS(mp); + old_key = ep->me_key; + ep->me_key = NULL; + Py_DECREF(old_key); + Py_DECREF(old_value); + + assert(_PyDict_CheckConsistency(mp)); + return 0; +} void PyDict_Clear(PyObject *op) @@ -1380,9 +1664,10 @@ PyDict_Clear(PyObject *op) mp->ma_keys = Py_EMPTY_KEYS; mp->ma_values = empty_values; mp->ma_used = 0; + mp->ma_version_tag = DICT_NEXT_VERSION(); /* ...then clear the keys and values */ if (oldvalues != NULL) { - n = DK_SIZE(oldkeys); + n = oldkeys->dk_nentries; for (i = 0; i < n; i++) Py_CLEAR(oldvalues[i]); free_values(oldvalues); @@ -1392,42 +1677,59 @@ PyDict_Clear(PyObject *op) assert(oldkeys->dk_refcnt == 1); DK_DECREF(oldkeys); } + assert(_PyDict_CheckConsistency(mp)); } -/* Returns -1 if no more items (or op is not a dict), - * index of item otherwise. Stores value in pvalue +/* Internal version of PyDict_Next that returns a hash value in addition + * to the key and value. + * Return 1 on success, return 0 when the reached the end of the dictionary + * (or if op is not a dictionary) */ -Py_LOCAL_INLINE(Py_ssize_t) -dict_next(PyObject *op, Py_ssize_t i, PyObject **pvalue) +int +_PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, + PyObject **pvalue, Py_hash_t *phash) { - Py_ssize_t mask, offset; + Py_ssize_t i, n; PyDictObject *mp; - PyObject **value_ptr; - + PyDictKeyEntry *entry_ptr; + PyObject *value; if (!PyDict_Check(op)) - return -1; + return 0; mp = (PyDictObject *)op; - if (i < 0) - return -1; + i = *ppos; + n = mp->ma_keys->dk_nentries; + if ((size_t)i >= (size_t)n) + return 0; if (mp->ma_values) { - value_ptr = &mp->ma_values[i]; - offset = sizeof(PyObject *); + PyObject **value_ptr = &mp->ma_values[i]; + while (i < n && *value_ptr == NULL) { + value_ptr++; + i++; + } + if (i >= n) + return 0; + entry_ptr = &DK_ENTRIES(mp->ma_keys)[i]; + value = *value_ptr; } else { - value_ptr = &mp->ma_keys->dk_entries[i].me_value; - offset = sizeof(PyDictKeyEntry); - } - mask = DK_MASK(mp->ma_keys); - while (i <= mask && *value_ptr == NULL) { - value_ptr = (PyObject **)(((char *)value_ptr) + offset); - i++; + entry_ptr = &DK_ENTRIES(mp->ma_keys)[i]; + while (i < n && entry_ptr->me_value == NULL) { + entry_ptr++; + i++; + } + if (i >= n) + return 0; + value = entry_ptr->me_value; } - if (i > mask) - return -1; + *ppos = i+1; + if (pkey) + *pkey = entry_ptr->me_key; + if (phash) + *phash = entry_ptr->me_hash; if (pvalue) - *pvalue = *value_ptr; - return i; + *pvalue = value; + return 1; } /* @@ -1437,9 +1739,12 @@ dict_next(PyObject *op, Py_ssize_t i, PyObject **pvalue) * PyObject *key, *value; * i = 0; # important! i should not otherwise be changed by you * while (PyDict_Next(yourdict, &i, &key, &value)) { - * Refer to borrowed references in key and value. + * Refer to borrowed references in key and value. * } * + * Return 1 on success, return 0 when the reached the end of the dictionary + * (or if op is not a dictionary) + * * CAUTION: In general, it isn't safe to use PyDict_Next in a loop that * mutates the dict. One exception: it is safe if the loop merely changes * the values associated with the keys (but doesn't insert new keys or @@ -1448,43 +1753,22 @@ dict_next(PyObject *op, Py_ssize_t i, PyObject **pvalue) int PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue) { - PyDictObject *mp; - Py_ssize_t i = dict_next(op, *ppos, pvalue); - if (i < 0) - return 0; - mp = (PyDictObject *)op; - *ppos = i+1; - if (pkey) - *pkey = mp->ma_keys->dk_entries[i].me_key; - return 1; -} - -/* Internal version of PyDict_Next that returns a hash value in addition - * to the key and value. - */ -int -_PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, - PyObject **pvalue, Py_hash_t *phash) -{ - PyDictObject *mp; - Py_ssize_t i = dict_next(op, *ppos, pvalue); - if (i < 0) - return 0; - mp = (PyDictObject *)op; - *ppos = i+1; - *phash = mp->ma_keys->dk_entries[i].me_hash; - if (pkey) - *pkey = mp->ma_keys->dk_entries[i].me_key; - return 1; + return _PyDict_Next(op, ppos, pkey, pvalue, NULL); } /* Internal version of dict.pop(). */ PyObject * -_PyDict_Pop_KnownHash(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *deflt) +_PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt) { + Py_hash_t hash; + Py_ssize_t ix, hashpos; PyObject *old_value, *old_key; PyDictKeyEntry *ep; PyObject **value_addr; + PyDictObject *mp; + + assert(PyDict_Check(dict)); + mp = (PyDictObject *)dict; if (mp->ma_used == 0) { if (deflt) { @@ -1494,11 +1778,16 @@ _PyDict_Pop_KnownHash(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject _PyErr_SetKeyError(key); return NULL; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + if (!PyUnicode_CheckExact(key) || + (hash = ((PyASCIIObject *) key)->hash) == -1) { + hash = PyObject_Hash(key); + if (hash == -1) + return NULL; + } + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, &hashpos); + if (ix == DKIX_ERROR) return NULL; - old_value = *value_addr; - if (old_value == NULL) { + if (ix == DKIX_EMPTY || *value_addr == NULL) { if (deflt) { Py_INCREF(deflt); return deflt; @@ -1506,38 +1795,30 @@ _PyDict_Pop_KnownHash(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject _PyErr_SetKeyError(key); return NULL; } - *value_addr = NULL; - mp->ma_used--; - if (!_PyDict_HasSplitTable(mp)) { - ENSURE_ALLOWS_DELETIONS(mp); - old_key = ep->me_key; - Py_INCREF(dummy); - ep->me_key = dummy; - Py_DECREF(old_key); - } - return old_value; -} -PyObject * -_PyDict_Pop(PyDictObject *mp, PyObject *key, PyObject *deflt) -{ - Py_hash_t hash; - - if (mp->ma_used == 0) { - if (deflt) { - Py_INCREF(deflt); - return deflt; - } - _PyErr_SetKeyError(key); - return NULL; - } - if (!PyUnicode_CheckExact(key) || - (hash = ((PyASCIIObject *) key)->hash) == -1) { - hash = PyObject_Hash(key); - if (hash == -1) + // Split table doesn't allow deletion. Combine it. + if (_PyDict_HasSplitTable(mp)) { + if (dictresize(mp, DK_SIZE(mp->ma_keys))) { return NULL; + } + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, &hashpos); + assert(ix >= 0); } - return _PyDict_Pop_KnownHash(mp, key, hash, deflt); + + old_value = *value_addr; + assert(old_value != NULL); + *value_addr = NULL; + mp->ma_used--; + mp->ma_version_tag = DICT_NEXT_VERSION(); + dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); + ep = &DK_ENTRIES(mp->ma_keys)[ix]; + ENSURE_ALLOWS_DELETIONS(mp); + old_key = ep->me_key; + ep->me_key = NULL; + Py_DECREF(old_key); + + assert(_PyDict_CheckConsistency(mp)); + return old_value; } /* Internal version of dict.from_keys(). It is subclass-friendly. */ @@ -1561,7 +1842,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value) PyObject *key; Py_hash_t hash; - if (dictresize(mp, Py_SIZE(iterable))) { + if (dictresize(mp, ESTIMATE_SIZE(Py_SIZE(iterable)))) { Py_DECREF(d); return NULL; } @@ -1580,7 +1861,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value) PyObject *key; Py_hash_t hash; - if (dictresize(mp, PySet_GET_SIZE(iterable))) { + if (dictresize(mp, ESTIMATE_SIZE(PySet_GET_SIZE(iterable)))) { Py_DECREF(d); return NULL; } @@ -1640,7 +1921,7 @@ dict_dealloc(PyDictObject *mp) Py_TRASHCAN_SAFE_BEGIN(mp) if (values != NULL) { if (values != empty_values) { - for (i = 0, n = DK_SIZE(mp->ma_keys); i < n; i++) { + for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) { Py_XDECREF(values[i]); } free_values(values); @@ -1752,8 +2033,8 @@ static PyObject * dict_subscript(PyDictObject *mp, PyObject *key) { PyObject *v; + Py_ssize_t ix; Py_hash_t hash; - PyDictKeyEntry *ep; PyObject **value_addr; if (!PyUnicode_CheckExact(key) || @@ -1762,11 +2043,10 @@ dict_subscript(PyDictObject *mp, PyObject *key) if (hash == -1) return NULL; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) return NULL; - v = *value_addr; - if (v == NULL) { + if (ix == DKIX_EMPTY || *value_addr == NULL) { if (!PyDict_CheckExact(mp)) { /* Look up __missing__ method if we're a subclass. */ PyObject *missing, *res; @@ -1784,8 +2064,8 @@ dict_subscript(PyDictObject *mp, PyObject *key) _PyErr_SetKeyError(key); return NULL; } - else - Py_INCREF(v); + v = *value_addr; + Py_INCREF(v); return v; } @@ -1825,8 +2105,8 @@ dict_keys(PyDictObject *mp) Py_DECREF(v); goto again; } - ep = &mp->ma_keys->dk_entries[0]; - size = DK_SIZE(mp->ma_keys); + ep = DK_ENTRIES(mp->ma_keys); + size = mp->ma_keys->dk_nentries; if (mp->ma_values) { value_ptr = mp->ma_values; offset = sizeof(PyObject *); @@ -1853,6 +2133,7 @@ dict_values(PyDictObject *mp) { PyObject *v; Py_ssize_t i, j; + PyDictKeyEntry *ep; Py_ssize_t size, n, offset; PyObject **value_ptr; @@ -1868,13 +2149,14 @@ dict_values(PyDictObject *mp) Py_DECREF(v); goto again; } - size = DK_SIZE(mp->ma_keys); + ep = DK_ENTRIES(mp->ma_keys); + size = mp->ma_keys->dk_nentries; if (mp->ma_values) { value_ptr = mp->ma_values; offset = sizeof(PyObject *); } else { - value_ptr = &mp->ma_keys->dk_entries[0].me_value; + value_ptr = &ep[0].me_value; offset = sizeof(PyDictKeyEntry); } for (i = 0, j = 0; i < size; i++) { @@ -1925,8 +2207,8 @@ dict_items(PyDictObject *mp) goto again; } /* Nothing we do below makes any function calls. */ - ep = mp->ma_keys->dk_entries; - size = DK_SIZE(mp->ma_keys); + ep = DK_ENTRIES(mp->ma_keys); + size = mp->ma_keys->dk_nentries; if (mp->ma_values) { value_ptr = mp->ma_values; offset = sizeof(PyObject *); @@ -1970,7 +2252,8 @@ dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value) } static int -dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, char *methname) +dict_update_common(PyObject *self, PyObject *args, PyObject *kwds, + const char *methname) { PyObject *arg = NULL; int result = 0; @@ -2062,23 +2345,17 @@ PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override) /* Update/merge with this (key, value) pair. */ key = PySequence_Fast_GET_ITEM(fast, 0); value = PySequence_Fast_GET_ITEM(fast, 1); - Py_INCREF(key); - Py_INCREF(value); if (override || PyDict_GetItem(d, key) == NULL) { int status = PyDict_SetItem(d, key, value); - if (status < 0) { - Py_DECREF(key); - Py_DECREF(value); + if (status < 0) goto Fail; - } } - Py_DECREF(key); - Py_DECREF(value); Py_DECREF(fast); Py_DECREF(item); } i = 0; + assert(_PyDict_CheckConsistency((PyDictObject *)d)); goto Return; Fail: Py_XDECREF(item); @@ -2089,18 +2366,14 @@ Return: return Py_SAFE_DOWNCAST(i, Py_ssize_t, int); } -int -PyDict_Update(PyObject *a, PyObject *b) -{ - return PyDict_Merge(a, b, 1); -} - -int -PyDict_Merge(PyObject *a, PyObject *b, int override) +static int +dict_merge(PyObject *a, PyObject *b, int override) { PyDictObject *mp, *other; Py_ssize_t i, n; - PyDictKeyEntry *entry; + PyDictKeyEntry *entry, *ep0; + + assert(0 <= override && override <= 2); /* We accept for the argument either a concrete dictionary object, * or an abstract "mapping" object. For the former, we can do @@ -2127,13 +2400,16 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) * incrementally resizing as we insert new items. Expect * that there will be no (or few) overlapping keys. */ - if (mp->ma_keys->dk_usable * 3 < other->ma_used * 2) - if (dictresize(mp, (mp->ma_used + other->ma_used)*2) != 0) + if (USABLE_FRACTION(mp->ma_keys->dk_size) < other->ma_used) { + if (dictresize(mp, ESTIMATE_SIZE(mp->ma_used + other->ma_used))) { return -1; - for (i = 0, n = DK_SIZE(other->ma_keys); i < n; i++) { + } + } + ep0 = DK_ENTRIES(other->ma_keys); + for (i = 0, n = other->ma_keys->dk_nentries; i < n; i++) { PyObject *key, *value; Py_hash_t hash; - entry = &other->ma_keys->dk_entries[i]; + entry = &ep0[i]; key = entry->me_key; hash = entry->me_hash; if (other->ma_values) @@ -2145,14 +2421,28 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) int err = 0; Py_INCREF(key); Py_INCREF(value); - if (override || PyDict_GetItem(a, key) == NULL) + if (override == 1) err = insertdict(mp, key, hash, value); + else if (_PyDict_GetItem_KnownHash(a, key, hash) == NULL) { + if (PyErr_Occurred()) { + Py_DECREF(value); + Py_DECREF(key); + return -1; + } + err = insertdict(mp, key, hash, value); + } + else if (override != 0) { + _PyErr_SetKeyError(key); + Py_DECREF(value); + Py_DECREF(key); + return -1; + } Py_DECREF(value); Py_DECREF(key); if (err != 0) return -1; - if (n != DK_SIZE(other->ma_keys)) { + if (n != other->ma_keys->dk_nentries) { PyErr_SetString(PyExc_RuntimeError, "dict mutated during update"); return -1; @@ -2181,7 +2471,13 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) return -1; for (key = PyIter_Next(iter); key; key = PyIter_Next(iter)) { - if (!override && PyDict_GetItem(a, key) != NULL) { + if (override != 1 && PyDict_GetItem(a, key) != NULL) { + if (override != 0) { + _PyErr_SetKeyError(key); + Py_DECREF(key); + Py_DECREF(iter); + return -1; + } Py_DECREF(key); continue; } @@ -2204,9 +2500,29 @@ PyDict_Merge(PyObject *a, PyObject *b, int override) /* Iterator completed, via error */ return -1; } + assert(_PyDict_CheckConsistency((PyDictObject *)a)); return 0; } +int +PyDict_Update(PyObject *a, PyObject *b) +{ + return dict_merge(a, b, 1); +} + +int +PyDict_Merge(PyObject *a, PyObject *b, int override) +{ + /* XXX Deprecate override not in (0, 1). */ + return dict_merge(a, b, override != 0); +} + +int +_PyDict_MergeEx(PyObject *a, PyObject *b, int override) +{ + return dict_merge(a, b, override); +} + static PyObject * dict_copy(PyDictObject *mp) { @@ -2227,7 +2543,9 @@ PyDict_Copy(PyObject *o) mp = (PyDictObject *)o; if (_PyDict_HasSplitTable(mp)) { PyDictObject *split_copy; - PyObject **newvalues = new_values(DK_SIZE(mp->ma_keys)); + Py_ssize_t size = USABLE_FRACTION(DK_SIZE(mp->ma_keys)); + PyObject **newvalues; + newvalues = new_values(size); if (newvalues == NULL) return PyErr_NoMemory(); split_copy = PyObject_GC_New(PyDictObject, &PyDict_Type); @@ -2239,7 +2557,7 @@ PyDict_Copy(PyObject *o) split_copy->ma_keys = mp->ma_keys; split_copy->ma_used = mp->ma_used; DK_INCREF(mp->ma_keys); - for (i = 0, n = DK_SIZE(mp->ma_keys); i < n; i++) { + for (i = 0, n = size; i < n; i++) { PyObject *value = mp->ma_values[i]; Py_XINCREF(value); split_copy->ma_values[i] = value; @@ -2310,8 +2628,8 @@ dict_equal(PyDictObject *a, PyDictObject *b) /* can't be equal if # of entries differ */ return 0; /* Same # of entries -- check all of 'em. Exit early on any diff. */ - for (i = 0; i < DK_SIZE(a->ma_keys); i++) { - PyDictKeyEntry *ep = &a->ma_keys->dk_entries[i]; + for (i = 0; i < a->ma_keys->dk_nentries; i++) { + PyDictKeyEntry *ep = &DK_ENTRIES(a->ma_keys)[i]; PyObject *aval; if (a->ma_values) aval = a->ma_values[i]; @@ -2328,19 +2646,18 @@ dict_equal(PyDictObject *a, PyDictObject *b) /* ditto for key */ Py_INCREF(key); /* reuse the known hash value */ - if ((b->ma_keys->dk_lookup)(b, key, ep->me_hash, &vaddr) == NULL) + if ((b->ma_keys->dk_lookup)(b, key, ep->me_hash, &vaddr, NULL) < 0) bval = NULL; else bval = *vaddr; + Py_DECREF(key); if (bval == NULL) { - Py_DECREF(key); Py_DECREF(aval); if (PyErr_Occurred()) return -1; return 0; } cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); - Py_DECREF(key); Py_DECREF(aval); if (cmp <= 0) /* error or not equal */ return cmp; @@ -2387,7 +2704,7 @@ dict___contains__(PyDictObject *self, PyObject *key) { register PyDictObject *mp = self; Py_hash_t hash; - PyDictKeyEntry *ep; + Py_ssize_t ix; PyObject **value_addr; if (!PyUnicode_CheckExact(key) || @@ -2396,10 +2713,12 @@ dict___contains__(PyDictObject *self, PyObject *key) if (hash == -1) return NULL; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) return NULL; - return PyBool_FromLong(*value_addr != NULL); + if (ix == DKIX_EMPTY || *value_addr == NULL) + Py_RETURN_FALSE; + Py_RETURN_TRUE; } static PyObject * @@ -2409,7 +2728,7 @@ dict_get(PyDictObject *mp, PyObject *args) PyObject *failobj = Py_None; PyObject *val = NULL; Py_hash_t hash; - PyDictKeyEntry *ep; + Py_ssize_t ix; PyObject **value_addr; if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &failobj)) @@ -2421,12 +2740,13 @@ dict_get(PyDictObject *mp, PyObject *args) if (hash == -1) return NULL; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) return NULL; - val = *value_addr; - if (val == NULL) + if (ix == DKIX_EMPTY || *value_addr == NULL) val = failobj; + else + val = *value_addr; Py_INCREF(val); return val; } @@ -2435,43 +2755,88 @@ PyObject * PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj) { PyDictObject *mp = (PyDictObject *)d; - PyObject *val = NULL; + PyObject *value; Py_hash_t hash; - PyDictKeyEntry *ep; + Py_ssize_t hashpos, ix; PyObject **value_addr; if (!PyDict_Check(d)) { PyErr_BadInternalCall(); return NULL; } + if (!PyUnicode_CheckExact(key) || (hash = ((PyASCIIObject *) key)->hash) == -1) { hash = PyObject_Hash(key); if (hash == -1) return NULL; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - if (ep == NULL) + + if (mp->ma_values != NULL && !PyUnicode_CheckExact(key)) { + if (insertion_resize(mp) < 0) + return NULL; + } + + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, &hashpos); + if (ix == DKIX_ERROR) return NULL; - val = *value_addr; - if (val == NULL) { + + if (_PyDict_HasSplitTable(mp) && + ((ix >= 0 && *value_addr == NULL && mp->ma_used != ix) || + (ix == DKIX_EMPTY && mp->ma_used != mp->ma_keys->dk_nentries))) { + if (insertion_resize(mp) < 0) { + return NULL; + } + find_empty_slot(mp, key, hash, &value_addr, &hashpos); + ix = DKIX_EMPTY; + } + + if (ix == DKIX_EMPTY) { + PyDictKeyEntry *ep, *ep0; + value = defaultobj; if (mp->ma_keys->dk_usable <= 0) { - /* Need to resize. */ - if (insertion_resize(mp) < 0) + if (insertion_resize(mp) < 0) { return NULL; - ep = find_empty_slot(mp, key, hash, &value_addr); + } + find_empty_slot(mp, key, hash, &value_addr, &hashpos); } - Py_INCREF(defaultobj); + ep0 = DK_ENTRIES(mp->ma_keys); + ep = &ep0[mp->ma_keys->dk_nentries]; + dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); Py_INCREF(key); - MAINTAIN_TRACKING(mp, key, defaultobj); + Py_INCREF(value); + MAINTAIN_TRACKING(mp, key, value); ep->me_key = key; ep->me_hash = hash; - *value_addr = defaultobj; - val = defaultobj; + if (mp->ma_values) { + assert(mp->ma_values[mp->ma_keys->dk_nentries] == NULL); + mp->ma_values[mp->ma_keys->dk_nentries] = value; + } + else { + ep->me_value = value; + } + mp->ma_used++; + mp->ma_version_tag = DICT_NEXT_VERSION(); mp->ma_keys->dk_usable--; + mp->ma_keys->dk_nentries++; + assert(mp->ma_keys->dk_usable >= 0); + } + else if (*value_addr == NULL) { + value = defaultobj; + assert(_PyDict_HasSplitTable(mp)); + assert(ix == mp->ma_used); + Py_INCREF(value); + MAINTAIN_TRACKING(mp, key, value); + *value_addr = value; mp->ma_used++; + mp->ma_version_tag = DICT_NEXT_VERSION(); } - return val; + else { + value = *value_addr; + } + + assert(_PyDict_CheckConsistency(mp)); + return value; } static PyObject * @@ -2503,17 +2868,16 @@ dict_pop(PyDictObject *mp, PyObject *args) if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt)) return NULL; - return _PyDict_Pop(mp, key, deflt); + return _PyDict_Pop((PyObject*)mp, key, deflt); } static PyObject * dict_popitem(PyDictObject *mp) { - Py_hash_t i = 0; - PyDictKeyEntry *ep; + Py_ssize_t i, j; + PyDictKeyEntry *ep0, *ep; PyObject *res; - /* Allocate the result tuple before checking the size. Believe it * or not, this allocation could trigger a garbage collection which * could empty the dict, so if we checked the size first and that @@ -2534,68 +2898,64 @@ dict_popitem(PyDictObject *mp) } /* Convert split table to combined table */ if (mp->ma_keys->dk_lookup == lookdict_split) { - /* -1 is required since dictresize() uses key size > minused */ - if (dictresize(mp, DK_SIZE(mp->ma_keys) - 1)) { + if (dictresize(mp, DK_SIZE(mp->ma_keys))) { Py_DECREF(res); return NULL; } } ENSURE_ALLOWS_DELETIONS(mp); - /* Set ep to "the first" dict entry with a value. We abuse the hash - * field of slot 0 to hold a search finger: - * If slot 0 has a value, use slot 0. - * Else slot 0 is being used to hold a search finger, - * and we use its hash value as the first index to look. - */ - ep = &mp->ma_keys->dk_entries[0]; - if (ep->me_value == NULL) { - Py_ssize_t mask = DK_MASK(mp->ma_keys); - i = ep->me_hash; - /* The hash field may be a real hash value, or it may be a - * legit search finger, or it may be a once-legit search - * finger that's out of bounds now because it wrapped around - * or the table shrunk -- simply make sure it's in bounds now. - */ - if (i > mask || i < 1) - i = 1; /* skip slot 0 */ - while ((ep = &mp->ma_keys->dk_entries[i])->me_value == NULL) { - i++; - if (i > mask) - i = 1; - } + + /* Pop last item */ + ep0 = DK_ENTRIES(mp->ma_keys); + i = mp->ma_keys->dk_nentries - 1; + while (i >= 0 && ep0[i].me_value == NULL) { + i--; } + assert(i >= 0); + + ep = &ep0[i]; + j = lookdict_index(mp->ma_keys, ep->me_hash, i); + assert(j >= 0); + assert(dk_get_index(mp->ma_keys, j) == i); + dk_set_index(mp->ma_keys, j, DKIX_DUMMY); + PyTuple_SET_ITEM(res, 0, ep->me_key); PyTuple_SET_ITEM(res, 1, ep->me_value); - Py_INCREF(dummy); - ep->me_key = dummy; + ep->me_key = NULL; ep->me_value = NULL; + /* We can't dk_usable++ since there is DKIX_DUMMY in indices */ + mp->ma_keys->dk_nentries = i; mp->ma_used--; - assert(mp->ma_keys->dk_entries[0].me_value == NULL); - mp->ma_keys->dk_entries[0].me_hash = i + 1; /* next place to start */ + mp->ma_version_tag = DICT_NEXT_VERSION(); + assert(_PyDict_CheckConsistency(mp)); return res; } static int dict_traverse(PyObject *op, visitproc visit, void *arg) { - Py_ssize_t i, n; PyDictObject *mp = (PyDictObject *)op; - if (mp->ma_keys->dk_lookup == lookdict) { - for (i = 0; i < DK_SIZE(mp->ma_keys); i++) { - if (mp->ma_keys->dk_entries[i].me_value != NULL) { - Py_VISIT(mp->ma_keys->dk_entries[i].me_value); - Py_VISIT(mp->ma_keys->dk_entries[i].me_key); + PyDictKeysObject *keys = mp->ma_keys; + PyDictKeyEntry *entries = DK_ENTRIES(keys); + Py_ssize_t i, n = keys->dk_nentries; + + if (keys->dk_lookup == lookdict) { + for (i = 0; i < n; i++) { + if (entries[i].me_value != NULL) { + Py_VISIT(entries[i].me_value); + Py_VISIT(entries[i].me_key); } } - } else { + } + else { if (mp->ma_values != NULL) { - for (i = 0, n = DK_SIZE(mp->ma_keys); i < n; i++) { + for (i = 0; i < n; i++) { Py_VISIT(mp->ma_values[i]); } } else { - for (i = 0, n = DK_SIZE(mp->ma_keys); i < n; i++) { - Py_VISIT(mp->ma_keys->dk_entries[i].me_value); + for (i = 0; i < n; i++) { + Py_VISIT(entries[i].me_value); } } } @@ -2614,23 +2974,31 @@ static PyObject *dictiter_new(PyDictObject *, PyTypeObject *); Py_ssize_t _PyDict_SizeOf(PyDictObject *mp) { - Py_ssize_t size, res; + Py_ssize_t size, usable, res; size = DK_SIZE(mp->ma_keys); + usable = USABLE_FRACTION(size); + res = _PyObject_SIZE(Py_TYPE(mp)); if (mp->ma_values) - res += size * sizeof(PyObject*); + res += usable * sizeof(PyObject*); /* If the dictionary is split, the keys portion is accounted-for in the type object. */ if (mp->ma_keys->dk_refcnt == 1) - res += sizeof(PyDictKeysObject) + (size-1) * sizeof(PyDictKeyEntry); + res += (sizeof(PyDictKeysObject) + - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) + + DK_IXSIZE(mp->ma_keys) * size + + sizeof(PyDictKeyEntry) * usable); return res; } Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys) { - return sizeof(PyDictKeysObject) + (DK_SIZE(keys)-1) * sizeof(PyDictKeyEntry); + return (sizeof(PyDictKeysObject) + - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) + + DK_IXSIZE(keys) * DK_SIZE(keys) + + USABLE_FRACTION(DK_SIZE(keys)) * sizeof(PyDictKeyEntry)); } static PyObject * @@ -2717,8 +3085,8 @@ int PyDict_Contains(PyObject *op, PyObject *key) { Py_hash_t hash; + Py_ssize_t ix; PyDictObject *mp = (PyDictObject *)op; - PyDictKeyEntry *ep; PyObject **value_addr; if (!PyUnicode_CheckExact(key) || @@ -2727,8 +3095,10 @@ PyDict_Contains(PyObject *op, PyObject *key) if (hash == -1) return -1; } - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - return (ep == NULL) ? -1 : (*value_addr != NULL); + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) + return -1; + return (ix != DKIX_EMPTY && *value_addr != NULL); } /* Internal version of PyDict_Contains used when the hash value is already known */ @@ -2736,11 +3106,13 @@ int _PyDict_Contains(PyObject *op, PyObject *key, Py_hash_t hash) { PyDictObject *mp = (PyDictObject *)op; - PyDictKeyEntry *ep; PyObject **value_addr; + Py_ssize_t ix; - ep = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr); - return (ep == NULL) ? -1 : (*value_addr != NULL); + ix = (mp->ma_keys->dk_lookup)(mp, key, hash, &value_addr, NULL); + if (ix == DKIX_ERROR) + return -1; + return (ix != DKIX_EMPTY && *value_addr != NULL); } /* Hack to implement "key in dict" */ @@ -2774,11 +3146,13 @@ dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) _PyObject_GC_UNTRACK(d); d->ma_used = 0; - d->ma_keys = new_keys_object(PyDict_MINSIZE_COMBINED); + d->ma_version_tag = DICT_NEXT_VERSION(); + d->ma_keys = new_keys_object(PyDict_MINSIZE); if (d->ma_keys == NULL) { Py_DECREF(self); return NULL; } + assert(_PyDict_CheckConsistency(d)); return self; } @@ -2999,13 +3373,13 @@ static PyMethodDef dictiter_methods[] = { {NULL, NULL} /* sentinel */ }; -static PyObject *dictiter_iternextkey(dictiterobject *di) +static PyObject* +dictiter_iternextkey(dictiterobject *di) { PyObject *key; - Py_ssize_t i, mask, offset; + Py_ssize_t i, n; PyDictKeysObject *k; PyDictObject *d = di->di_dict; - PyObject **value_ptr; if (d == NULL) return NULL; @@ -3019,27 +3393,30 @@ static PyObject *dictiter_iternextkey(dictiterobject *di) } i = di->di_pos; - if (i < 0) - goto fail; k = d->ma_keys; + n = k->dk_nentries; if (d->ma_values) { - value_ptr = &d->ma_values[i]; - offset = sizeof(PyObject *); + PyObject **value_ptr = &d->ma_values[i]; + while (i < n && *value_ptr == NULL) { + value_ptr++; + i++; + } + if (i >= n) + goto fail; + key = DK_ENTRIES(k)[i].me_key; } else { - value_ptr = &k->dk_entries[i].me_value; - offset = sizeof(PyDictKeyEntry); - } - mask = DK_SIZE(k)-1; - while (i <= mask && *value_ptr == NULL) { - value_ptr = (PyObject **)(((char *)value_ptr) + offset); - i++; + PyDictKeyEntry *entry_ptr = &DK_ENTRIES(k)[i]; + while (i < n && entry_ptr->me_value == NULL) { + entry_ptr++; + i++; + } + if (i >= n) + goto fail; + key = entry_ptr->me_key; } di->di_pos = i+1; - if (i > mask) - goto fail; di->len--; - key = k->dk_entries[i].me_key; Py_INCREF(key); return key; @@ -3082,12 +3459,12 @@ PyTypeObject PyDictIterKey_Type = { 0, }; -static PyObject *dictiter_iternextvalue(dictiterobject *di) +static PyObject * +dictiter_iternextvalue(dictiterobject *di) { PyObject *value; - Py_ssize_t i, mask, offset; + Py_ssize_t i, n; PyDictObject *d = di->di_dict; - PyObject **value_ptr; if (d == NULL) return NULL; @@ -3101,26 +3478,29 @@ static PyObject *dictiter_iternextvalue(dictiterobject *di) } i = di->di_pos; - mask = DK_SIZE(d->ma_keys)-1; - if (i < 0 || i > mask) - goto fail; + n = d->ma_keys->dk_nentries; if (d->ma_values) { - value_ptr = &d->ma_values[i]; - offset = sizeof(PyObject *); + PyObject **value_ptr = &d->ma_values[i]; + while (i < n && *value_ptr == NULL) { + value_ptr++; + i++; + } + if (i >= n) + goto fail; + value = *value_ptr; } else { - value_ptr = &d->ma_keys->dk_entries[i].me_value; - offset = sizeof(PyDictKeyEntry); - } - while (i <= mask && *value_ptr == NULL) { - value_ptr = (PyObject **)(((char *)value_ptr) + offset); - i++; - if (i > mask) + PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i]; + while (i < n && entry_ptr->me_value == NULL) { + entry_ptr++; + i++; + } + if (i >= n) goto fail; + value = entry_ptr->me_value; } di->di_pos = i+1; di->len--; - value = *value_ptr; Py_INCREF(value); return value; @@ -3151,7 +3531,7 @@ PyTypeObject PyDictIterValue_Type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ 0, /* tp_doc */ (traverseproc)dictiter_traverse, /* tp_traverse */ 0, /* tp_clear */ @@ -3163,12 +3543,12 @@ PyTypeObject PyDictIterValue_Type = { 0, }; -static PyObject *dictiter_iternextitem(dictiterobject *di) +static PyObject * +dictiter_iternextitem(dictiterobject *di) { - PyObject *key, *value, *result; - Py_ssize_t i, mask, offset; + PyObject *key, *value, *result = di->di_result; + Py_ssize_t i, n; PyDictObject *d = di->di_dict; - PyObject **value_ptr; if (d == NULL) return NULL; @@ -3182,46 +3562,45 @@ static PyObject *dictiter_iternextitem(dictiterobject *di) } i = di->di_pos; - if (i < 0) - goto fail; - mask = DK_SIZE(d->ma_keys)-1; + n = d->ma_keys->dk_nentries; if (d->ma_values) { - value_ptr = &d->ma_values[i]; - offset = sizeof(PyObject *); + PyObject **value_ptr = &d->ma_values[i]; + while (i < n && *value_ptr == NULL) { + value_ptr++; + i++; + } + if (i >= n) + goto fail; + key = DK_ENTRIES(d->ma_keys)[i].me_key; + value = *value_ptr; } else { - value_ptr = &d->ma_keys->dk_entries[i].me_value; - offset = sizeof(PyDictKeyEntry); - } - while (i <= mask && *value_ptr == NULL) { - value_ptr = (PyObject **)(((char *)value_ptr) + offset); - i++; + PyDictKeyEntry *entry_ptr = &DK_ENTRIES(d->ma_keys)[i]; + while (i < n && entry_ptr->me_value == NULL) { + entry_ptr++; + i++; + } + if (i >= n) + goto fail; + key = entry_ptr->me_key; + value = entry_ptr->me_value; } di->di_pos = i+1; - if (i > mask) - goto fail; - di->len--; - key = d->ma_keys->dk_entries[i].me_key; - value = *value_ptr; - Py_INCREF(key); - Py_INCREF(value); - result = di->di_result; - if (Py_REFCNT(result) == 1) { - PyObject *oldkey = PyTuple_GET_ITEM(result, 0); - PyObject *oldvalue = PyTuple_GET_ITEM(result, 1); - PyTuple_SET_ITEM(result, 0, key); /* steals reference */ - PyTuple_SET_ITEM(result, 1, value); /* steals reference */ + if (result->ob_refcnt == 1) { Py_INCREF(result); - Py_DECREF(oldkey); - Py_DECREF(oldvalue); - } else { + Py_DECREF(PyTuple_GET_ITEM(result, 0)); + Py_DECREF(PyTuple_GET_ITEM(result, 1)); + } + else { result = PyTuple_New(2); if (result == NULL) return NULL; - PyTuple_SET_ITEM(result, 0, key); /* steals reference */ - PyTuple_SET_ITEM(result, 1, value); /* steals reference */ } + Py_INCREF(key); + Py_INCREF(value); + PyTuple_SET_ITEM(result, 0, key); /* steals reference */ + PyTuple_SET_ITEM(result, 1, value); /* steals reference */ return result; fail: @@ -3714,7 +4093,6 @@ dictitems_iter(_PyDictViewObject *dv) static int dictitems_contains(_PyDictViewObject *dv, PyObject *obj) { - int result; PyObject *key, *value, *found; if (dv->dv_dict == NULL) return 0; @@ -3728,10 +4106,7 @@ dictitems_contains(_PyDictViewObject *dv, PyObject *obj) return -1; return 0; } - Py_INCREF(found); - result = PyObject_RichCompareBool(value, found, Py_EQ); - Py_DECREF(found); - return result; + return PyObject_RichCompareBool(value, found, Py_EQ); } static PySequenceMethods dictitems_as_sequence = { @@ -3860,7 +4235,7 @@ dictvalues_new(PyObject *dict) PyDictKeysObject * _PyDict_NewKeysForClass(void) { - PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE_SPLIT); + PyDictKeysObject *keys = new_keys_object(PyDict_MINSIZE); if (keys == NULL) PyErr_Clear(); else @@ -3896,7 +4271,7 @@ PyObject_GenericGetDict(PyObject *obj, void *context) int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, - PyObject *key, PyObject *value) + PyObject *key, PyObject *value) { PyObject *dict; int res; @@ -3915,21 +4290,33 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, } if (value == NULL) { res = PyDict_DelItem(dict, key); + if (cached != ((PyDictObject *)dict)->ma_keys) { + CACHED_KEYS(tp) = NULL; + DK_DECREF(cached); + } } else { - int was_shared = (cached == ((PyDictObject *)dict)->ma_keys); + int was_shared = cached == ((PyDictObject *)dict)->ma_keys; res = PyDict_SetItem(dict, key, value); - /* PyDict_SetItem() may call dictresize() and convert split table - * into combined table. In such case, convert it to split - * table again and update type's shared key only when this is - * the only dict sharing key with the type. - */ - if (was_shared && - (cached = CACHED_KEYS(tp)) != NULL && - cached != ((PyDictObject *)dict)->ma_keys) { + if (was_shared && cached != ((PyDictObject *)dict)->ma_keys) { + /* PyDict_SetItem() may call dictresize and convert split table + * into combined table. In such case, convert it to split + * table again and update type's shared key only when this is + * the only dict sharing key with the type. + * + * This is to allow using shared key in class like this: + * + * class C: + * def __init__(self): + * # one dict resize happens + * self.a, self.b, self.c = 1, 2, 3 + * self.d, self.e, self.f = 4, 5, 6 + * a = C() + */ if (cached->dk_refcnt == 1) { CACHED_KEYS(tp) = make_keys_shared(dict); - } else { + } + else { CACHED_KEYS(tp) = NULL; } DK_DECREF(cached); @@ -3959,50 +4346,3 @@ _PyDictKeys_DecRef(PyDictKeysObject *keys) { DK_DECREF(keys); } - - -/* ARGSUSED */ -static PyObject * -dummy_repr(PyObject *op) -{ - return PyUnicode_FromString(""); -} - -/* ARGUSED */ -static void -dummy_dealloc(PyObject* ignore) -{ - /* This should never get called, but we also don't want to SEGV if - * we accidentally decref dummy-key out of existence. - */ - Py_FatalError("deallocating "); -} - -static PyTypeObject PyDictDummy_Type = { - PyVarObject_HEAD_INIT(&PyType_Type, 0) - " type", - 0, - 0, - dummy_dealloc, /*tp_dealloc*/ /*never called*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_reserved*/ - dummy_repr, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call */ - 0, /*tp_str */ - 0, /*tp_getattro */ - 0, /*tp_setattro */ - 0, /*tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /*tp_flags */ -}; - -static PyObject _dummy_struct = { - _PyObject_EXTRA_INIT - 2, &PyDictDummy_Type -}; - diff --git a/Objects/enumobject.c b/Objects/enumobject.c index c458cfe..dae166d 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -250,6 +250,13 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; reversed_meth = _PyObject_LookupSpecial(seq, &PyId___reversed__); + if (reversed_meth == Py_None) { + Py_DECREF(reversed_meth); + PyErr_Format(PyExc_TypeError, + "'%.200s' object is not reversible", + Py_TYPE(seq)->tp_name); + return NULL; + } if (reversed_meth != NULL) { PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL); Py_DECREF(reversed_meth); @@ -259,8 +266,9 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; if (!PySequence_Check(seq)) { - PyErr_SetString(PyExc_TypeError, - "argument to reversed() must be a sequence"); + PyErr_Format(PyExc_TypeError, + "'%.200s' object is not reversible", + Py_TYPE(seq)->tp_name); return NULL; } diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 345a0fe..f63f06a 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -59,15 +59,11 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds) static int BaseException_init(PyBaseExceptionObject *self, PyObject *args, PyObject *kwds) { - PyObject *tmp; - if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds)) return -1; - tmp = self->args; - self->args = args; - Py_INCREF(self->args); - Py_XDECREF(tmp); + Py_INCREF(args); + Py_XSETREF(self->args, args); return 0; } @@ -234,7 +230,7 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb) return -1; } - Py_XINCREF(tb); + Py_INCREF(tb); Py_XSETREF(self->traceback, tb); return 0; } @@ -328,11 +324,10 @@ PyException_GetCause(PyObject *self) { /* Steals a reference to cause */ void -PyException_SetCause(PyObject *self, PyObject *cause) { - PyObject *old_cause = ((PyBaseExceptionObject *)self)->cause; - ((PyBaseExceptionObject *)self)->cause = cause; +PyException_SetCause(PyObject *self, PyObject *cause) +{ ((PyBaseExceptionObject *)self)->suppress_context = 1; - Py_XDECREF(old_cause); + Py_XSETREF(((PyBaseExceptionObject *)self)->cause, cause); } PyObject * @@ -344,10 +339,9 @@ PyException_GetContext(PyObject *self) { /* Steals a reference to context */ void -PyException_SetContext(PyObject *self, PyObject *context) { - PyObject *old_context = ((PyBaseExceptionObject *)self)->context; - ((PyBaseExceptionObject *)self)->context = context; - Py_XDECREF(old_context); +PyException_SetContext(PyObject *self, PyObject *context) +{ + Py_XSETREF(((PyBaseExceptionObject *)self)->context, context); } @@ -692,53 +686,6 @@ ImportError_str(PyImportErrorObject *self) } } -static PyObject * -ImportError_getstate(PyImportErrorObject *self) -{ - PyObject *dict = ((PyBaseExceptionObject *)self)->dict; - if (self->name || self->path) { - _Py_IDENTIFIER(name); - _Py_IDENTIFIER(path); - dict = dict ? PyDict_Copy(dict) : PyDict_New(); - if (dict == NULL) - return NULL; - if (self->name && _PyDict_SetItemId(dict, &PyId_name, self->name) < 0) { - Py_DECREF(dict); - return NULL; - } - if (self->path && _PyDict_SetItemId(dict, &PyId_path, self->path) < 0) { - Py_DECREF(dict); - return NULL; - } - return dict; - } - else if (dict) { - Py_INCREF(dict); - return dict; - } - else { - Py_RETURN_NONE; - } -} - -/* Pickling support */ -static PyObject * -ImportError_reduce(PyImportErrorObject *self) -{ - PyObject *res; - PyObject *args; - PyObject *state = ImportError_getstate(self); - if (state == NULL) - return NULL; - args = ((PyBaseExceptionObject *)self)->args; - if (state == Py_None) - res = PyTuple_Pack(2, Py_TYPE(self), args); - else - res = PyTuple_Pack(3, Py_TYPE(self), args, state); - Py_DECREF(state); - return res; -} - static PyMemberDef ImportError_members[] = { {"msg", T_OBJECT, offsetof(PyImportErrorObject, msg), 0, PyDoc_STR("exception message")}, @@ -750,7 +697,6 @@ static PyMemberDef ImportError_members[] = { }; static PyMethodDef ImportError_methods[] = { - {"__reduce__", (PyCFunction)ImportError_reduce, METH_NOARGS}, {NULL} }; @@ -762,6 +708,13 @@ ComplexExtendsException(PyExc_Exception, ImportError, "module."); /* + * ModuleNotFoundError extends ImportError + */ + +MiddlingExtendsException(PyExc_ImportError, ModuleNotFoundError, ImportError, + "Module not found."); + +/* * OSError extends Exception */ @@ -1041,7 +994,7 @@ OSError_init(PyOSErrorObject *self, PyObject *args, PyObject *kwds) return 0; error: - Py_XDECREF(args); + Py_DECREF(args); return -1; } @@ -1121,8 +1074,7 @@ OSError_str(PyOSErrorObject *self) } if (self->myerrno && self->strerror) return PyUnicode_FromFormat("[Errno %S] %S", - self->myerrno ? self->myerrno: Py_None, - self->strerror ? self->strerror: Py_None); + self->myerrno, self->strerror); return BaseException_str((PyBaseExceptionObject *)self); } @@ -2526,6 +2478,7 @@ _PyExc_Init(PyObject *bltinmod) PRE_INIT(SystemExit) PRE_INIT(KeyboardInterrupt) PRE_INIT(ImportError) + PRE_INIT(ModuleNotFoundError) PRE_INIT(OSError) PRE_INIT(EOFError) PRE_INIT(RuntimeError) @@ -2598,6 +2551,7 @@ _PyExc_Init(PyObject *bltinmod) POST_INIT(SystemExit) POST_INIT(KeyboardInterrupt) POST_INIT(ImportError) + POST_INIT(ModuleNotFoundError) POST_INIT(OSError) INIT_ALIAS(EnvironmentError, OSError) INIT_ALIAS(IOError, OSError) @@ -2660,7 +2614,9 @@ _PyExc_Init(PyObject *bltinmod) ADD_ERRNO(BlockingIOError, EWOULDBLOCK); POST_INIT(BrokenPipeError); ADD_ERRNO(BrokenPipeError, EPIPE); +#ifdef ESHUTDOWN ADD_ERRNO(BrokenPipeError, ESHUTDOWN); +#endif POST_INIT(ChildProcessError); ADD_ERRNO(ChildProcessError, ECHILD); POST_INIT(ConnectionAbortedError); diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 234d07e..f442418 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -127,7 +127,7 @@ PyFile_GetLine(PyObject *f, int n) int PyFile_WriteObject(PyObject *v, PyObject *f, int flags) { - PyObject *writer, *value, *args, *result; + PyObject *writer, *value, *result; _Py_IDENTIFIER(write); if (f == NULL) { @@ -146,14 +146,7 @@ PyFile_WriteObject(PyObject *v, PyObject *f, int flags) Py_DECREF(writer); return -1; } - args = PyTuple_Pack(1, value); - if (args == NULL) { - Py_DECREF(value); - Py_DECREF(writer); - return -1; - } - result = PyEval_CallObject(writer, args); - Py_DECREF(args); + result = _PyObject_CallArg1(writer, value); Py_DECREF(value); Py_DECREF(writer); if (result == NULL) diff --git a/Objects/floatobject.c b/Objects/floatobject.c index d92bec3..80bf71e 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -124,11 +124,43 @@ PyFloat_FromDouble(double fval) return (PyObject *) op; } +static PyObject * +float_from_string_inner(const char *s, Py_ssize_t len, void *obj) +{ + double x; + const char *end; + const char *last = s + len; + /* strip space */ + while (s < last && Py_ISSPACE(*s)) { + s++; + } + + while (s < last - 1 && Py_ISSPACE(last[-1])) { + last--; + } + + /* We don't care about overflow or underflow. If the platform + * supports them, infinities and signed zeroes (on underflow) are + * fine. */ + x = PyOS_string_to_double(s, (char **)&end, NULL); + if (end != last) { + PyErr_Format(PyExc_ValueError, + "could not convert string to float: " + "%R", obj); + return NULL; + } + else if (x == -1.0 && PyErr_Occurred()) { + return NULL; + } + else { + return PyFloat_FromDouble(x); + } +} + PyObject * PyFloat_FromString(PyObject *v) { - const char *s, *last, *end; - double x; + const char *s; PyObject *s_buffer = NULL; Py_ssize_t len; Py_buffer view = {NULL, NULL}; @@ -169,27 +201,8 @@ PyFloat_FromString(PyObject *v) Py_TYPE(v)->tp_name); return NULL; } - last = s + len; - /* strip space */ - while (s < last && Py_ISSPACE(*s)) - s++; - while (s < last - 1 && Py_ISSPACE(last[-1])) - last--; - /* We don't care about overflow or underflow. If the platform - * supports them, infinities and signed zeroes (on underflow) are - * fine. */ - x = PyOS_string_to_double(s, (char **)&end, NULL); - if (end != last) { - PyErr_Format(PyExc_ValueError, - "could not convert string to float: " - "%R", v); - result = NULL; - } - else if (x == -1.0 && PyErr_Occurred()) - result = NULL; - else - result = PyFloat_FromDouble(x); - + result = _Py_string_to_number_with_underscores(s, len, "float", v, v, + float_from_string_inner); PyBuffer_Release(&view); Py_XDECREF(s_buffer); return result; @@ -215,35 +228,49 @@ double PyFloat_AsDouble(PyObject *op) { PyNumberMethods *nb; - PyFloatObject *fo; + PyObject *res; double val; - if (op && PyFloat_Check(op)) - return PyFloat_AS_DOUBLE((PyFloatObject*) op); - if (op == NULL) { PyErr_BadArgument(); return -1; } - if ((nb = Py_TYPE(op)->tp_as_number) == NULL || nb->nb_float == NULL) { - PyErr_SetString(PyExc_TypeError, "a float is required"); - return -1; + if (PyFloat_Check(op)) { + return PyFloat_AS_DOUBLE(op); } - fo = (PyFloatObject*) (*nb->nb_float) (op); - if (fo == NULL) - return -1; - if (!PyFloat_Check(fo)) { - Py_DECREF(fo); - PyErr_SetString(PyExc_TypeError, - "nb_float should return float object"); + nb = Py_TYPE(op)->tp_as_number; + if (nb == NULL || nb->nb_float == NULL) { + PyErr_Format(PyExc_TypeError, "must be real number, not %.50s", + op->ob_type->tp_name); return -1; } - val = PyFloat_AS_DOUBLE(fo); - Py_DECREF(fo); + res = (*nb->nb_float) (op); + if (res == NULL) { + return -1; + } + if (!PyFloat_CheckExact(res)) { + if (!PyFloat_Check(res)) { + PyErr_Format(PyExc_TypeError, + "%.50s.__float__ returned non-float (type %.50s)", + op->ob_type->tp_name, res->ob_type->tp_name); + Py_DECREF(res); + return -1; + } + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "%.50s.__float__ returned non-float (type %.50s). " + "The ability to return an instance of a strict subclass of float " + "is deprecated, and may be removed in a future version of Python.", + op->ob_type->tp_name, res->ob_type->tp_name)) { + Py_DECREF(res); + return -1; + } + } + val = PyFloat_AS_DOUBLE(res); + Py_DECREF(res); return val; } @@ -1195,7 +1222,7 @@ Return a hexadecimal representation of a floating-point number.\n\ static PyObject * float_fromhex(PyObject *cls, PyObject *arg) { - PyObject *result_as_float, *result; + PyObject *result; double x; long exp, top_exp, lsb, key_digit; char *s, *coeff_start, *s_store, *coeff_end, *exp_start, *s_end; @@ -1247,7 +1274,7 @@ float_fromhex(PyObject *cls, PyObject *arg) * exp+4*ndigits and exp-4*ndigits are within the range of a long. */ - s = _PyUnicode_AsStringAndSize(arg, &length); + s = PyUnicode_AsUTF8AndSize(arg, &length); if (s == NULL) return NULL; s_end = s + length; @@ -1410,11 +1437,10 @@ float_fromhex(PyObject *cls, PyObject *arg) s++; if (s != s_end) goto parse_error; - result_as_float = Py_BuildValue("(d)", negate ? -x : x); - if (result_as_float == NULL) - return NULL; - result = PyObject_CallObject(cls, result_as_float); - Py_DECREF(result_as_float); + result = PyFloat_FromDouble(negate ? -x : x); + if (cls != (PyObject *)&PyFloat_Type && result != NULL) { + Py_SETREF(result, PyObject_CallFunctionObjArgs(cls, result, NULL)); + } return result; overflow_error: @@ -1451,29 +1477,23 @@ float_as_integer_ratio(PyObject *v, PyObject *unused) int exponent; int i; - PyObject *prev; PyObject *py_exponent = NULL; PyObject *numerator = NULL; PyObject *denominator = NULL; PyObject *result_pair = NULL; PyNumberMethods *long_methods = PyLong_Type.tp_as_number; -#define INPLACE_UPDATE(obj, call) \ - prev = obj; \ - obj = call; \ - Py_DECREF(prev); \ - CONVERT_TO_DOUBLE(v, self); if (Py_IS_INFINITY(self)) { - PyErr_SetString(PyExc_OverflowError, - "Cannot pass infinity to float.as_integer_ratio."); - return NULL; + PyErr_SetString(PyExc_OverflowError, + "cannot convert Infinity to integer ratio"); + return NULL; } if (Py_IS_NAN(self)) { - PyErr_SetString(PyExc_ValueError, - "Cannot pass NaN to float.as_integer_ratio."); - return NULL; + PyErr_SetString(PyExc_ValueError, + "cannot convert NaN to integer ratio"); + return NULL; } PyFPE_START_PROTECT("as_integer_ratio", goto error); @@ -1489,29 +1509,31 @@ float_as_integer_ratio(PyObject *v, PyObject *unused) to be truncated by PyLong_FromDouble(). */ numerator = PyLong_FromDouble(float_part); - if (numerator == NULL) goto error; + if (numerator == NULL) + goto error; + denominator = PyLong_FromLong(1); + if (denominator == NULL) + goto error; + py_exponent = PyLong_FromLong(Py_ABS(exponent)); + if (py_exponent == NULL) + goto error; /* fold in 2**exponent */ - denominator = PyLong_FromLong(1); - py_exponent = PyLong_FromLong(labs((long)exponent)); - if (py_exponent == NULL) goto error; - INPLACE_UPDATE(py_exponent, - long_methods->nb_lshift(denominator, py_exponent)); - if (py_exponent == NULL) goto error; if (exponent > 0) { - INPLACE_UPDATE(numerator, - long_methods->nb_multiply(numerator, py_exponent)); - if (numerator == NULL) goto error; + Py_SETREF(numerator, + long_methods->nb_lshift(numerator, py_exponent)); + if (numerator == NULL) + goto error; } else { - Py_DECREF(denominator); - denominator = py_exponent; - py_exponent = NULL; + Py_SETREF(denominator, + long_methods->nb_lshift(denominator, py_exponent)); + if (denominator == NULL) + goto error; } result_pair = PyTuple_Pack(2, numerator, denominator); -#undef INPLACE_UPDATE error: Py_XDECREF(py_exponent); Py_XDECREF(denominator); @@ -1606,7 +1628,7 @@ float_getformat(PyTypeObject *v, PyObject* arg) Py_TYPE(arg)->tp_name); return NULL; } - s = _PyUnicode_AsString(arg); + s = PyUnicode_AsUTF8(arg); if (s == NULL) return NULL; if (strcmp(s, "double") == 0) { @@ -1966,8 +1988,120 @@ _PyFloat_DebugMallocStats(FILE *out) /*---------------------------------------------------------------------------- - * _PyFloat_{Pack,Unpack}{4,8}. See floatobject.h. + * _PyFloat_{Pack,Unpack}{2,4,8}. See floatobject.h. + * To match the NPY_HALF_ROUND_TIES_TO_EVEN behavior in: + * https://github.com/numpy/numpy/blob/master/numpy/core/src/npymath/halffloat.c + * We use: + * bits = (unsigned short)f; Note the truncation + * if ((f - bits > 0.5) || (f - bits == 0.5 && bits % 2)) { + * bits++; + * } */ + +int +_PyFloat_Pack2(double x, unsigned char *p, int le) +{ + unsigned char sign; + int e; + double f; + unsigned short bits; + int incr = 1; + + if (x == 0.0) { + sign = (copysign(1.0, x) == -1.0); + e = 0; + bits = 0; + } + else if (Py_IS_INFINITY(x)) { + sign = (x < 0.0); + e = 0x1f; + bits = 0; + } + else if (Py_IS_NAN(x)) { + /* There are 2046 distinct half-precision NaNs (1022 signaling and + 1024 quiet), but there are only two quiet NaNs that don't arise by + quieting a signaling NaN; we get those by setting the topmost bit + of the fraction field and clearing all other fraction bits. We + choose the one with the appropriate sign. */ + sign = (copysign(1.0, x) == -1.0); + e = 0x1f; + bits = 512; + } + else { + sign = (x < 0.0); + if (sign) { + x = -x; + } + + f = frexp(x, &e); + if (f < 0.5 || f >= 1.0) { + PyErr_SetString(PyExc_SystemError, + "frexp() result out of range"); + return -1; + } + + /* Normalize f to be in the range [1.0, 2.0) */ + f *= 2.0; + e--; + + if (e >= 16) { + goto Overflow; + } + else if (e < -25) { + /* |x| < 2**-25. Underflow to zero. */ + f = 0.0; + e = 0; + } + else if (e < -14) { + /* |x| < 2**-14. Gradual underflow */ + f = ldexp(f, 14 + e); + e = 0; + } + else /* if (!(e == 0 && f == 0.0)) */ { + e += 15; + f -= 1.0; /* Get rid of leading 1 */ + } + + f *= 1024.0; /* 2**10 */ + /* Round to even */ + bits = (unsigned short)f; /* Note the truncation */ + assert(bits < 1024); + assert(e < 31); + if ((f - bits > 0.5) || ((f - bits == 0.5) && (bits % 2 == 1))) { + ++bits; + if (bits == 1024) { + /* The carry propagated out of a string of 10 1 bits. */ + bits = 0; + ++e; + if (e == 31) + goto Overflow; + } + } + } + + bits |= (e << 10) | (sign << 15); + + /* Write out result. */ + if (le) { + p += 1; + incr = -1; + } + + /* First byte */ + *p = (unsigned char)((bits >> 8) & 0xFF); + p += incr; + + /* Second byte */ + *p = (unsigned char)(bits & 0xFF); + + return 0; + + Overflow: + PyErr_SetString(PyExc_OverflowError, + "float too large to pack with e format"); + return -1; +} + int _PyFloat_Pack4(double x, unsigned char *p, int le) { @@ -2203,6 +2337,76 @@ _PyFloat_Pack8(double x, unsigned char *p, int le) } double +_PyFloat_Unpack2(const unsigned char *p, int le) +{ + unsigned char sign; + int e; + unsigned int f; + double x; + int incr = 1; + + if (le) { + p += 1; + incr = -1; + } + + /* First byte */ + sign = (*p >> 7) & 1; + e = (*p & 0x7C) >> 2; + f = (*p & 0x03) << 8; + p += incr; + + /* Second byte */ + f |= *p; + + if (e == 0x1f) { +#ifdef PY_NO_SHORT_FLOAT_REPR + if (f == 0) { + /* Infinity */ + return sign ? -Py_HUGE_VAL : Py_HUGE_VAL; + } + else { + /* NaN */ +#ifdef Py_NAN + return sign ? -Py_NAN : Py_NAN; +#else + PyErr_SetString( + PyExc_ValueError, + "can't unpack IEEE 754 NaN " + "on platform that does not support NaNs"); + return -1; +#endif /* #ifdef Py_NAN */ + } +#else + if (f == 0) { + /* Infinity */ + return _Py_dg_infinity(sign); + } + else { + /* NaN */ + return _Py_dg_stdnan(sign); + } +#endif /* #ifdef PY_NO_SHORT_FLOAT_REPR */ + } + + x = (double)f / 1024.0; + + if (e == 0) { + e = -14; + } + else { + x += 1.0; + e -= 15; + } + x = ldexp(x, e); + + if (sign) + x = -x; + + return x; +} + +double _PyFloat_Unpack4(const unsigned char *p, int le) { if (float_format == unknown_format) { diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 9aadd61..62f9f34 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -137,7 +137,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) new_lasti = -1; for (offset = 0; offset < lnotab_len; offset += 2) { addr += lnotab[offset]; - line += lnotab[offset+1]; + line += (signed char)lnotab[offset+1]; if (line >= new_lineno) { new_lasti = addr; new_lineno = line; @@ -189,7 +189,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) memset(blockstack, '\0', sizeof(blockstack)); memset(in_finally, '\0', sizeof(in_finally)); blockstack_top = 0; - for (addr = 0; addr < code_len; addr++) { + for (addr = 0; addr < code_len; addr += sizeof(_Py_CODEUNIT)) { unsigned char op = code[addr]; switch (op) { case SETUP_LOOP: @@ -251,10 +251,6 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) } } } - - if (op >= HAVE_ARGUMENT) { - addr += 2; - } } /* Verify that the blockstack tracking code didn't get lost. */ @@ -277,7 +273,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) * can tell whether the jump goes into any blocks without coming out * again - in that case we raise an exception below. */ delta_iblock = 0; - for (addr = min_addr; addr < max_addr; addr++) { + for (addr = min_addr; addr < max_addr; addr += sizeof(_Py_CODEUNIT)) { unsigned char op = code[addr]; switch (op) { case SETUP_LOOP: @@ -294,10 +290,6 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) } min_delta_iblock = Py_MIN(min_delta_iblock, delta_iblock); - - if (op >= HAVE_ARGUMENT) { - addr += 2; - } } /* Derive the absolute iblock values from the deltas. */ diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 4cd6590..69cd973 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -249,7 +249,6 @@ func_get_code(PyFunctionObject *op) static int func_set_code(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; Py_ssize_t nfree, nclosure; /* Not legal to del f.func_code or to set it to anything @@ -270,10 +269,8 @@ func_set_code(PyFunctionObject *op, PyObject *value) nclosure, nfree); return -1; } - tmp = op->func_code; Py_INCREF(value); - op->func_code = value; - Py_DECREF(tmp); + Py_XSETREF(op->func_code, value); return 0; } @@ -287,8 +284,6 @@ func_get_name(PyFunctionObject *op) static int func_set_name(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; - /* Not legal to del f.func_name or to set it to anything * other than a string object. */ if (value == NULL || !PyUnicode_Check(value)) { @@ -296,10 +291,8 @@ func_set_name(PyFunctionObject *op, PyObject *value) "__name__ must be set to a string object"); return -1; } - tmp = op->func_name; Py_INCREF(value); - op->func_name = value; - Py_DECREF(tmp); + Py_XSETREF(op->func_name, value); return 0; } @@ -313,8 +306,6 @@ func_get_qualname(PyFunctionObject *op) static int func_set_qualname(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; - /* Not legal to del f.__qualname__ or to set it to anything * other than a string object. */ if (value == NULL || !PyUnicode_Check(value)) { @@ -322,10 +313,8 @@ func_set_qualname(PyFunctionObject *op, PyObject *value) "__qualname__ must be set to a string object"); return -1; } - tmp = op->func_qualname; Py_INCREF(value); - op->func_qualname = value; - Py_DECREF(tmp); + Py_XSETREF(op->func_qualname, value); return 0; } @@ -343,8 +332,6 @@ func_get_defaults(PyFunctionObject *op) static int func_set_defaults(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; - /* Legal to del f.func_defaults. * Can only set func_defaults to NULL or a tuple. */ if (value == Py_None) @@ -354,10 +341,8 @@ func_set_defaults(PyFunctionObject *op, PyObject *value) "__defaults__ must be set to a tuple object"); return -1; } - tmp = op->func_defaults; Py_XINCREF(value); - op->func_defaults = value; - Py_XDECREF(tmp); + Py_XSETREF(op->func_defaults, value); return 0; } @@ -375,8 +360,6 @@ func_get_kwdefaults(PyFunctionObject *op) static int func_set_kwdefaults(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; - if (value == Py_None) value = NULL; /* Legal to del f.func_kwdefaults. @@ -386,10 +369,8 @@ func_set_kwdefaults(PyFunctionObject *op, PyObject *value) "__kwdefaults__ must be set to a dict object"); return -1; } - tmp = op->func_kwdefaults; Py_XINCREF(value); - op->func_kwdefaults = value; - Py_XDECREF(tmp); + Py_XSETREF(op->func_kwdefaults, value); return 0; } @@ -408,8 +389,6 @@ func_get_annotations(PyFunctionObject *op) static int func_set_annotations(PyFunctionObject *op, PyObject *value) { - PyObject *tmp; - if (value == Py_None) value = NULL; /* Legal to del f.func_annotations. @@ -420,10 +399,8 @@ func_set_annotations(PyFunctionObject *op, PyObject *value) "__annotations__ must be set to a dict object"); return -1; } - tmp = op->func_annotations; Py_XINCREF(value); - op->func_annotations = value; - Py_XDECREF(tmp); + Py_XSETREF(op->func_annotations, value); return 0; } diff --git a/Objects/genobject.c b/Objects/genobject.c index 0de5408..2680ab0 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -5,7 +5,15 @@ #include "structmember.h" #include "opcode.h" -static PyObject *gen_close(PyGenObject *gen, PyObject *args); +static PyObject *gen_close(PyGenObject *, PyObject *); +static PyObject *async_gen_asend_new(PyAsyncGenObject *, PyObject *); +static PyObject *async_gen_athrow_new(PyAsyncGenObject *, PyObject *); + +static char *NON_INIT_CORO_MSG = "can't send non-None value to a " + "just-started coroutine"; + +static char *ASYNC_GEN_IGNORED_EXIT_MSG = + "async generator ignored GeneratorExit"; static int gen_traverse(PyGenObject *gen, visitproc visit, void *arg) @@ -28,6 +36,26 @@ _PyGen_Finalize(PyObject *self) /* Generator isn't paused, so no need to close */ return; + if (PyAsyncGen_CheckExact(self)) { + PyAsyncGenObject *agen = (PyAsyncGenObject*)self; + PyObject *finalizer = agen->ag_finalizer; + if (finalizer && !agen->ag_closed) { + /* Save the current exception, if any. */ + PyErr_Fetch(&error_type, &error_value, &error_traceback); + + res = PyObject_CallFunctionObjArgs(finalizer, self, NULL); + + if (res == NULL) { + PyErr_WriteUnraisable(self); + } else { + Py_DECREF(res); + } + /* Restore the saved exception. */ + PyErr_Restore(error_type, error_value, error_traceback); + return; + } + } + /* Save the current exception, if any. */ PyErr_Fetch(&error_type, &error_value, &error_traceback); @@ -74,6 +102,12 @@ gen_dealloc(PyGenObject *gen) return; /* resurrected. :( */ _PyObject_GC_UNTRACK(self); + if (PyAsyncGen_CheckExact(gen)) { + /* We have to handle this case for asynchronous generators + right here, because this code has to be between UNTRACK + and GC_Del. */ + Py_CLEAR(((PyAsyncGenObject*)gen)->ag_finalizer); + } if (gen->gi_frame != NULL) { gen->gi_frame->f_gen = NULL; Py_CLEAR(gen->gi_frame); @@ -93,8 +127,12 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) if (gen->gi_running) { char *msg = "generator already executing"; - if (PyCoro_CheckExact(gen)) + if (PyCoro_CheckExact(gen)) { msg = "coroutine already executing"; + } + else if (PyAsyncGen_CheckExact(gen)) { + msg = "async generator already executing"; + } PyErr_SetString(PyExc_ValueError, msg); return NULL; } @@ -106,10 +144,16 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) PyErr_SetString( PyExc_RuntimeError, "cannot reuse already awaited coroutine"); - } else if (arg && !exc) { + } + else if (arg && !exc) { /* `gen` is an exhausted generator: only set exception if called from send(). */ - PyErr_SetNone(PyExc_StopIteration); + if (PyAsyncGen_CheckExact(gen)) { + PyErr_SetNone(PyExc_StopAsyncIteration); + } + else { + PyErr_SetNone(PyExc_StopIteration); + } } return NULL; } @@ -118,9 +162,13 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) if (arg && arg != Py_None) { char *msg = "can't send non-None value to a " "just-started generator"; - if (PyCoro_CheckExact(gen)) + if (PyCoro_CheckExact(gen)) { + msg = NON_INIT_CORO_MSG; + } + else if (PyAsyncGen_CheckExact(gen)) { msg = "can't send non-None value to a " - "just-started coroutine"; + "just-started async generator"; + } PyErr_SetString(PyExc_TypeError, msg); return NULL; } @@ -152,8 +200,16 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) if (result && f->f_stacktop == NULL) { if (result == Py_None) { /* Delay exception instantiation if we can */ - PyErr_SetNone(PyExc_StopIteration); - } else { + if (PyAsyncGen_CheckExact(gen)) { + PyErr_SetNone(PyExc_StopAsyncIteration); + } + else { + PyErr_SetNone(PyExc_StopIteration); + } + } + else { + /* Async generators cannot return anything but None */ + assert(!PyAsyncGen_CheckExact(gen)); _PyGen_SetStopIterationValue(result); } Py_CLEAR(result); @@ -162,34 +218,43 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) /* Check for __future__ generator_stop and conditionally turn * a leaking StopIteration into RuntimeError (with its cause * set appropriately). */ - if (((PyCodeObject *)gen->gi_code)->co_flags & - (CO_FUTURE_GENERATOR_STOP | CO_COROUTINE | CO_ITERABLE_COROUTINE)) + + const int check_stop_iter_error_flags = CO_FUTURE_GENERATOR_STOP | + CO_COROUTINE | + CO_ITERABLE_COROUTINE | + CO_ASYNC_GENERATOR; + + if (gen->gi_code != NULL && + ((PyCodeObject *)gen->gi_code)->co_flags & + check_stop_iter_error_flags) { - PyObject *exc, *val, *val2, *tb; - char *msg = "generator raised StopIteration"; - if (PyCoro_CheckExact(gen)) + /* `gen` is either: + * a generator with CO_FUTURE_GENERATOR_STOP flag; + * a coroutine; + * a generator with CO_ITERABLE_COROUTINE flag + (decorated with types.coroutine decorator); + * an async generator. + */ + const char *msg = "generator raised StopIteration"; + if (PyCoro_CheckExact(gen)) { msg = "coroutine raised StopIteration"; - PyErr_Fetch(&exc, &val, &tb); - PyErr_NormalizeException(&exc, &val, &tb); - if (tb != NULL) - PyException_SetTraceback(val, tb); - Py_DECREF(exc); - Py_XDECREF(tb); - PyErr_SetString(PyExc_RuntimeError, msg); - PyErr_Fetch(&exc, &val2, &tb); - PyErr_NormalizeException(&exc, &val2, &tb); - Py_INCREF(val); - PyException_SetCause(val2, val); - PyException_SetContext(val2, val); - PyErr_Restore(exc, val2, tb); + } + else if PyAsyncGen_CheckExact(gen) { + msg = "async generator raised StopIteration"; + } + _PyErr_FormatFromCause(PyExc_RuntimeError, "%s", msg); } else { + /* `gen` is an ordinary generator without + CO_FUTURE_GENERATOR_STOP flag. + */ + PyObject *exc, *val, *tb; /* Pop the exception before issuing a warning. */ PyErr_Fetch(&exc, &val, &tb); - if (PyErr_WarnFormat(PyExc_PendingDeprecationWarning, 1, + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, "generator '%.50S' raised StopIteration", gen->gi_qualname)) { /* Warning was converted to an error. */ @@ -202,6 +267,15 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc, int closing) } } } + else if (PyAsyncGen_CheckExact(gen) && !result && + PyErr_ExceptionMatches(PyExc_StopAsyncIteration)) + { + /* code in `gen` raised a StopAsyncIteration error: + raise a RuntimeError. + */ + const char *msg = "async generator raised StopAsyncIteration"; + _PyErr_FormatFromCause(PyExc_RuntimeError, "%s", msg); + } if (!result || f->f_stacktop == NULL) { /* generator can't be rerun, so release the frame */ @@ -248,18 +322,20 @@ gen_close_iter(PyObject *yf) PyObject *retval = NULL; _Py_IDENTIFIER(close); - if (PyGen_CheckExact(yf)) { + if (PyGen_CheckExact(yf) || PyCoro_CheckExact(yf)) { retval = gen_close((PyGenObject *)yf, NULL); if (retval == NULL) return -1; - } else { + } + else { PyObject *meth = _PyObject_GetAttrId(yf, &PyId_close); if (meth == NULL) { if (!PyErr_ExceptionMatches(PyExc_AttributeError)) PyErr_WriteUnraisable(yf); PyErr_Clear(); - } else { - retval = PyObject_CallFunction(meth, ""); + } + else { + retval = _PyObject_CallNoArg(meth); Py_DECREF(meth); if (retval == NULL) return -1; @@ -279,7 +355,15 @@ _PyGen_yf(PyGenObject *gen) PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); - if (code[f->f_lasti + 1] != YIELD_FROM) + if (f->f_lasti < 0) { + /* Return immediately if the frame didn't start yet. YIELD_FROM + always come after LOAD_CONST: a code object should not start + with YIELD_FROM */ + assert(code[0] != YIELD_FROM); + return NULL; + } + + if (code[f->f_lasti + sizeof(_Py_CODEUNIT)] != YIELD_FROM) return NULL; yf = f->f_stacktop[-1]; Py_INCREF(yf); @@ -306,8 +390,11 @@ gen_close(PyGenObject *gen, PyObject *args) retval = gen_send_ex(gen, Py_None, 1, 1); if (retval) { char *msg = "generator ignored GeneratorExit"; - if (PyCoro_CheckExact(gen)) + if (PyCoro_CheckExact(gen)) { msg = "coroutine ignored GeneratorExit"; + } else if (PyAsyncGen_CheckExact(gen)) { + msg = ASYNC_GEN_IGNORED_EXIT_MSG; + } Py_DECREF(retval); PyErr_SetString(PyExc_RuntimeError, msg); return NULL; @@ -327,21 +414,22 @@ PyDoc_STRVAR(throw_doc, return next yielded value or raise StopIteration."); static PyObject * -gen_throw(PyGenObject *gen, PyObject *args) +_gen_throw(PyGenObject *gen, int close_on_genexit, + PyObject *typ, PyObject *val, PyObject *tb) { - PyObject *typ; - PyObject *tb = NULL; - PyObject *val = NULL; PyObject *yf = _PyGen_yf(gen); _Py_IDENTIFIER(throw); - if (!PyArg_UnpackTuple(args, "throw", 1, 3, &typ, &val, &tb)) - return NULL; - if (yf) { PyObject *ret; int err; - if (PyErr_GivenExceptionMatches(typ, PyExc_GeneratorExit)) { + if (PyErr_GivenExceptionMatches(typ, PyExc_GeneratorExit) && + close_on_genexit + ) { + /* Asynchronous generators *should not* be closed right away. + We have to allow some awaits to work it through, hence the + `close_on_genexit` parameter here. + */ gen->gi_running = 1; err = gen_close_iter(yf); gen->gi_running = 0; @@ -350,11 +438,16 @@ gen_throw(PyGenObject *gen, PyObject *args) return gen_send_ex(gen, Py_None, 1, 0); goto throw_here; } - if (PyGen_CheckExact(yf)) { + if (PyGen_CheckExact(yf) || PyCoro_CheckExact(yf)) { + /* `yf` is a generator or a coroutine. */ gen->gi_running = 1; - ret = gen_throw((PyGenObject *)yf, args); + /* Close the generator that we are currently iterating with + 'yield from' or awaiting on with 'await'. */ + ret = _gen_throw((PyGenObject *)yf, close_on_genexit, + typ, val, tb); gen->gi_running = 0; } else { + /* `yf` is an iterator or a coroutine-like object. */ PyObject *meth = _PyObject_GetAttrId(yf, &PyId_throw); if (meth == NULL) { if (!PyErr_ExceptionMatches(PyExc_AttributeError)) { @@ -366,7 +459,7 @@ gen_throw(PyGenObject *gen, PyObject *args) goto throw_here; } gen->gi_running = 1; - ret = PyObject_CallObject(meth, args); + ret = PyObject_CallFunctionObjArgs(meth, typ, val, tb, NULL); gen->gi_running = 0; Py_DECREF(meth); } @@ -378,7 +471,8 @@ gen_throw(PyGenObject *gen, PyObject *args) assert(ret == yf); Py_DECREF(ret); /* Termination repetition of YIELD_FROM */ - gen->gi_frame->f_lasti++; + assert(gen->gi_frame->f_lasti >= 0); + gen->gi_frame->f_lasti += sizeof(_Py_CODEUNIT); if (_PyGen_FetchStopIterationValue(&val) == 0) { ret = gen_send_ex(gen, val, 0, 0); Py_DECREF(val); @@ -449,6 +543,21 @@ failed_throw: static PyObject * +gen_throw(PyGenObject *gen, PyObject *args) +{ + PyObject *typ; + PyObject *tb = NULL; + PyObject *val = NULL; + + if (!PyArg_UnpackTuple(args, "throw", 1, 3, &typ, &val, &tb)) { + return NULL; + } + + return _gen_throw(gen, 1, typ, val, tb); +} + + +static PyObject * gen_iternext(PyGenObject *gen) { return gen_send_ex(gen, NULL, 0, 0); @@ -466,7 +575,8 @@ _PyGen_SetStopIterationValue(PyObject *value) PyObject *e; if (value == NULL || - (!PyTuple_Check(value) && !PyExceptionInstance_Check(value))) + (!PyTuple_Check(value) && + !PyObject_TypeCheck(value, (PyTypeObject *) PyExc_StopIteration))) { /* Delay exception instantiation if we can */ PyErr_SetObject(PyExc_StopIteration, value); @@ -565,8 +675,6 @@ gen_get_name(PyGenObject *op) static int gen_set_name(PyGenObject *op, PyObject *value) { - PyObject *tmp; - /* Not legal to del gen.gi_name or to set it to anything * other than a string object. */ if (value == NULL || !PyUnicode_Check(value)) { @@ -574,10 +682,8 @@ gen_set_name(PyGenObject *op, PyObject *value) "__name__ must be set to a string object"); return -1; } - tmp = op->gi_name; Py_INCREF(value); - op->gi_name = value; - Py_DECREF(tmp); + Py_XSETREF(op->gi_name, value); return 0; } @@ -591,8 +697,6 @@ gen_get_qualname(PyGenObject *op) static int gen_set_qualname(PyGenObject *op, PyObject *value) { - PyObject *tmp; - /* Not legal to del gen.__qualname__ or to set it to anything * other than a string object. */ if (value == NULL || !PyUnicode_Check(value)) { @@ -600,10 +704,8 @@ gen_set_qualname(PyGenObject *op, PyObject *value) "__qualname__ must be set to a string object"); return -1; } - tmp = op->gi_qualname; Py_INCREF(value); - op->gi_qualname = value; - Py_DECREF(tmp); + Py_XSETREF(op->gi_qualname, value); return 0; } @@ -1044,21 +1146,21 @@ PyCoro_New(PyFrameObject *f, PyObject *name, PyObject *qualname) typedef struct { PyObject_HEAD - PyObject *aw_aiter; + PyObject *ags_aiter; } PyAIterWrapper; static PyObject * aiter_wrapper_iternext(PyAIterWrapper *aw) { - _PyGen_SetStopIterationValue(aw->aw_aiter); + _PyGen_SetStopIterationValue(aw->ags_aiter); return NULL; } static int aiter_wrapper_traverse(PyAIterWrapper *aw, visitproc visit, void *arg) { - Py_VISIT((PyObject *)aw->aw_aiter); + Py_VISIT((PyObject *)aw->ags_aiter); return 0; } @@ -1066,7 +1168,7 @@ static void aiter_wrapper_dealloc(PyAIterWrapper *aw) { _PyObject_GC_UNTRACK((PyObject *)aw); - Py_CLEAR(aw->aw_aiter); + Py_CLEAR(aw->ags_aiter); PyObject_GC_Del(aw); } @@ -1128,7 +1230,851 @@ _PyAIterWrapper_New(PyObject *aiter) return NULL; } Py_INCREF(aiter); - aw->aw_aiter = aiter; + aw->ags_aiter = aiter; _PyObject_GC_TRACK(aw); return (PyObject *)aw; } + + +/* ========= Asynchronous Generators ========= */ + + +typedef enum { + AWAITABLE_STATE_INIT, /* new awaitable, has not yet been iterated */ + AWAITABLE_STATE_ITER, /* being iterated */ + AWAITABLE_STATE_CLOSED, /* closed */ +} AwaitableState; + + +typedef struct { + PyObject_HEAD + PyAsyncGenObject *ags_gen; + + /* Can be NULL, when in the __anext__() mode + (equivalent of "asend(None)") */ + PyObject *ags_sendval; + + AwaitableState ags_state; +} PyAsyncGenASend; + + +typedef struct { + PyObject_HEAD + PyAsyncGenObject *agt_gen; + + /* Can be NULL, when in the "aclose()" mode + (equivalent of "athrow(GeneratorExit)") */ + PyObject *agt_args; + + AwaitableState agt_state; +} PyAsyncGenAThrow; + + +typedef struct { + PyObject_HEAD + PyObject *agw_val; +} _PyAsyncGenWrappedValue; + + +#ifndef _PyAsyncGen_MAXFREELIST +#define _PyAsyncGen_MAXFREELIST 80 +#endif + +/* Freelists boost performance 6-10%; they also reduce memory + fragmentation, as _PyAsyncGenWrappedValue and PyAsyncGenASend + are short-living objects that are instantiated for every + __anext__ call. +*/ + +static _PyAsyncGenWrappedValue *ag_value_freelist[_PyAsyncGen_MAXFREELIST]; +static int ag_value_freelist_free = 0; + +static PyAsyncGenASend *ag_asend_freelist[_PyAsyncGen_MAXFREELIST]; +static int ag_asend_freelist_free = 0; + +#define _PyAsyncGenWrappedValue_CheckExact(o) \ + (Py_TYPE(o) == &_PyAsyncGenWrappedValue_Type) + +#define PyAsyncGenASend_CheckExact(o) \ + (Py_TYPE(o) == &_PyAsyncGenASend_Type) + + +static int +async_gen_traverse(PyAsyncGenObject *gen, visitproc visit, void *arg) +{ + Py_VISIT(gen->ag_finalizer); + return gen_traverse((PyGenObject*)gen, visit, arg); +} + + +static PyObject * +async_gen_repr(PyAsyncGenObject *o) +{ + return PyUnicode_FromFormat("", + o->ag_qualname, o); +} + + +static int +async_gen_init_hooks(PyAsyncGenObject *o) +{ + PyThreadState *tstate; + PyObject *finalizer; + PyObject *firstiter; + + if (o->ag_hooks_inited) { + return 0; + } + + o->ag_hooks_inited = 1; + + tstate = PyThreadState_GET(); + + finalizer = tstate->async_gen_finalizer; + if (finalizer) { + Py_INCREF(finalizer); + o->ag_finalizer = finalizer; + } + + firstiter = tstate->async_gen_firstiter; + if (firstiter) { + PyObject *res; + + Py_INCREF(firstiter); + res = PyObject_CallFunction(firstiter, "O", o); + Py_DECREF(firstiter); + if (res == NULL) { + return 1; + } + Py_DECREF(res); + } + + return 0; +} + + +static PyObject * +async_gen_anext(PyAsyncGenObject *o) +{ + if (async_gen_init_hooks(o)) { + return NULL; + } + return async_gen_asend_new(o, NULL); +} + + +static PyObject * +async_gen_asend(PyAsyncGenObject *o, PyObject *arg) +{ + if (async_gen_init_hooks(o)) { + return NULL; + } + return async_gen_asend_new(o, arg); +} + + +static PyObject * +async_gen_aclose(PyAsyncGenObject *o, PyObject *arg) +{ + if (async_gen_init_hooks(o)) { + return NULL; + } + return async_gen_athrow_new(o, NULL); +} + +static PyObject * +async_gen_athrow(PyAsyncGenObject *o, PyObject *args) +{ + if (async_gen_init_hooks(o)) { + return NULL; + } + return async_gen_athrow_new(o, args); +} + + +static PyGetSetDef async_gen_getsetlist[] = { + {"__name__", (getter)gen_get_name, (setter)gen_set_name, + PyDoc_STR("name of the async generator")}, + {"__qualname__", (getter)gen_get_qualname, (setter)gen_set_qualname, + PyDoc_STR("qualified name of the async generator")}, + {"ag_await", (getter)coro_get_cr_await, NULL, + PyDoc_STR("object being awaited on, or None")}, + {NULL} /* Sentinel */ +}; + +static PyMemberDef async_gen_memberlist[] = { + {"ag_frame", T_OBJECT, offsetof(PyAsyncGenObject, ag_frame), READONLY}, + {"ag_running", T_BOOL, offsetof(PyAsyncGenObject, ag_running), READONLY}, + {"ag_code", T_OBJECT, offsetof(PyAsyncGenObject, ag_code), READONLY}, + {NULL} /* Sentinel */ +}; + +PyDoc_STRVAR(async_aclose_doc, +"aclose() -> raise GeneratorExit inside generator."); + +PyDoc_STRVAR(async_asend_doc, +"asend(v) -> send 'v' in generator."); + +PyDoc_STRVAR(async_athrow_doc, +"athrow(typ[,val[,tb]]) -> raise exception in generator."); + +static PyMethodDef async_gen_methods[] = { + {"asend", (PyCFunction)async_gen_asend, METH_O, async_asend_doc}, + {"athrow",(PyCFunction)async_gen_athrow, METH_VARARGS, async_athrow_doc}, + {"aclose", (PyCFunction)async_gen_aclose, METH_NOARGS, async_aclose_doc}, + {NULL, NULL} /* Sentinel */ +}; + + +static PyAsyncMethods async_gen_as_async = { + 0, /* am_await */ + PyObject_SelfIter, /* am_aiter */ + (unaryfunc)async_gen_anext /* am_anext */ +}; + + +PyTypeObject PyAsyncGen_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "async_generator", /* tp_name */ + sizeof(PyAsyncGenObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)gen_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + &async_gen_as_async, /* tp_as_async */ + (reprfunc)async_gen_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */ + 0, /* tp_doc */ + (traverseproc)async_gen_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + offsetof(PyAsyncGenObject, ag_weakreflist), /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + async_gen_methods, /* tp_methods */ + async_gen_memberlist, /* tp_members */ + async_gen_getsetlist, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ + 0, /* tp_del */ + 0, /* tp_version_tag */ + _PyGen_Finalize, /* tp_finalize */ +}; + + +PyObject * +PyAsyncGen_New(PyFrameObject *f, PyObject *name, PyObject *qualname) +{ + PyAsyncGenObject *o; + o = (PyAsyncGenObject *)gen_new_with_qualname( + &PyAsyncGen_Type, f, name, qualname); + if (o == NULL) { + return NULL; + } + o->ag_finalizer = NULL; + o->ag_closed = 0; + o->ag_hooks_inited = 0; + return (PyObject*)o; +} + + +int +PyAsyncGen_ClearFreeLists(void) +{ + int ret = ag_value_freelist_free + ag_asend_freelist_free; + + while (ag_value_freelist_free) { + _PyAsyncGenWrappedValue *o; + o = ag_value_freelist[--ag_value_freelist_free]; + assert(_PyAsyncGenWrappedValue_CheckExact(o)); + PyObject_GC_Del(o); + } + + while (ag_asend_freelist_free) { + PyAsyncGenASend *o; + o = ag_asend_freelist[--ag_asend_freelist_free]; + assert(Py_TYPE(o) == &_PyAsyncGenASend_Type); + PyObject_GC_Del(o); + } + + return ret; +} + +void +PyAsyncGen_Fini(void) +{ + PyAsyncGen_ClearFreeLists(); +} + + +static PyObject * +async_gen_unwrap_value(PyAsyncGenObject *gen, PyObject *result) +{ + if (result == NULL) { + if (!PyErr_Occurred()) { + PyErr_SetNone(PyExc_StopAsyncIteration); + } + + if (PyErr_ExceptionMatches(PyExc_StopAsyncIteration) + || PyErr_ExceptionMatches(PyExc_GeneratorExit) + ) { + gen->ag_closed = 1; + } + + return NULL; + } + + if (_PyAsyncGenWrappedValue_CheckExact(result)) { + /* async yield */ + _PyGen_SetStopIterationValue(((_PyAsyncGenWrappedValue*)result)->agw_val); + Py_DECREF(result); + return NULL; + } + + return result; +} + + +/* ---------- Async Generator ASend Awaitable ------------ */ + + +static void +async_gen_asend_dealloc(PyAsyncGenASend *o) +{ + _PyObject_GC_UNTRACK((PyObject *)o); + Py_CLEAR(o->ags_gen); + Py_CLEAR(o->ags_sendval); + if (ag_asend_freelist_free < _PyAsyncGen_MAXFREELIST) { + assert(PyAsyncGenASend_CheckExact(o)); + ag_asend_freelist[ag_asend_freelist_free++] = o; + } else { + PyObject_GC_Del(o); + } +} + +static int +async_gen_asend_traverse(PyAsyncGenASend *o, visitproc visit, void *arg) +{ + Py_VISIT(o->ags_gen); + Py_VISIT(o->ags_sendval); + return 0; +} + + +static PyObject * +async_gen_asend_send(PyAsyncGenASend *o, PyObject *arg) +{ + PyObject *result; + + if (o->ags_state == AWAITABLE_STATE_CLOSED) { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } + + if (o->ags_state == AWAITABLE_STATE_INIT) { + if (arg == NULL || arg == Py_None) { + arg = o->ags_sendval; + } + o->ags_state = AWAITABLE_STATE_ITER; + } + + result = gen_send_ex((PyGenObject*)o->ags_gen, arg, 0, 0); + result = async_gen_unwrap_value(o->ags_gen, result); + + if (result == NULL) { + o->ags_state = AWAITABLE_STATE_CLOSED; + } + + return result; +} + + +static PyObject * +async_gen_asend_iternext(PyAsyncGenASend *o) +{ + return async_gen_asend_send(o, NULL); +} + + +static PyObject * +async_gen_asend_throw(PyAsyncGenASend *o, PyObject *args) +{ + PyObject *result; + + if (o->ags_state == AWAITABLE_STATE_CLOSED) { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } + + result = gen_throw((PyGenObject*)o->ags_gen, args); + result = async_gen_unwrap_value(o->ags_gen, result); + + if (result == NULL) { + o->ags_state = AWAITABLE_STATE_CLOSED; + } + + return result; +} + + +static PyObject * +async_gen_asend_close(PyAsyncGenASend *o, PyObject *args) +{ + o->ags_state = AWAITABLE_STATE_CLOSED; + Py_RETURN_NONE; +} + + +static PyMethodDef async_gen_asend_methods[] = { + {"send", (PyCFunction)async_gen_asend_send, METH_O, send_doc}, + {"throw", (PyCFunction)async_gen_asend_throw, METH_VARARGS, throw_doc}, + {"close", (PyCFunction)async_gen_asend_close, METH_NOARGS, close_doc}, + {NULL, NULL} /* Sentinel */ +}; + + +static PyAsyncMethods async_gen_asend_as_async = { + PyObject_SelfIter, /* am_await */ + 0, /* am_aiter */ + 0 /* am_anext */ +}; + + +PyTypeObject _PyAsyncGenASend_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "async_generator_asend", /* tp_name */ + sizeof(PyAsyncGenASend), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)async_gen_asend_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + &async_gen_asend_as_async, /* tp_as_async */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ + 0, /* tp_doc */ + (traverseproc)async_gen_asend_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + PyObject_SelfIter, /* tp_iter */ + (iternextfunc)async_gen_asend_iternext, /* tp_iternext */ + async_gen_asend_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + + +static PyObject * +async_gen_asend_new(PyAsyncGenObject *gen, PyObject *sendval) +{ + PyAsyncGenASend *o; + if (ag_asend_freelist_free) { + ag_asend_freelist_free--; + o = ag_asend_freelist[ag_asend_freelist_free]; + _Py_NewReference((PyObject *)o); + } else { + o = PyObject_GC_New(PyAsyncGenASend, &_PyAsyncGenASend_Type); + if (o == NULL) { + return NULL; + } + } + + Py_INCREF(gen); + o->ags_gen = gen; + + Py_XINCREF(sendval); + o->ags_sendval = sendval; + + o->ags_state = AWAITABLE_STATE_INIT; + + _PyObject_GC_TRACK((PyObject*)o); + return (PyObject*)o; +} + + +/* ---------- Async Generator Value Wrapper ------------ */ + + +static void +async_gen_wrapped_val_dealloc(_PyAsyncGenWrappedValue *o) +{ + _PyObject_GC_UNTRACK((PyObject *)o); + Py_CLEAR(o->agw_val); + if (ag_value_freelist_free < _PyAsyncGen_MAXFREELIST) { + assert(_PyAsyncGenWrappedValue_CheckExact(o)); + ag_value_freelist[ag_value_freelist_free++] = o; + } else { + PyObject_GC_Del(o); + } +} + + +static int +async_gen_wrapped_val_traverse(_PyAsyncGenWrappedValue *o, + visitproc visit, void *arg) +{ + Py_VISIT(o->agw_val); + return 0; +} + + +PyTypeObject _PyAsyncGenWrappedValue_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "async_generator_wrapped_value", /* tp_name */ + sizeof(_PyAsyncGenWrappedValue), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)async_gen_wrapped_val_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_as_async */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ + 0, /* tp_doc */ + (traverseproc)async_gen_wrapped_val_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + + +PyObject * +_PyAsyncGenValueWrapperNew(PyObject *val) +{ + _PyAsyncGenWrappedValue *o; + assert(val); + + if (ag_value_freelist_free) { + ag_value_freelist_free--; + o = ag_value_freelist[ag_value_freelist_free]; + assert(_PyAsyncGenWrappedValue_CheckExact(o)); + _Py_NewReference((PyObject*)o); + } else { + o = PyObject_GC_New(_PyAsyncGenWrappedValue, + &_PyAsyncGenWrappedValue_Type); + if (o == NULL) { + return NULL; + } + } + o->agw_val = val; + Py_INCREF(val); + _PyObject_GC_TRACK((PyObject*)o); + return (PyObject*)o; +} + + +/* ---------- Async Generator AThrow awaitable ------------ */ + + +static void +async_gen_athrow_dealloc(PyAsyncGenAThrow *o) +{ + _PyObject_GC_UNTRACK((PyObject *)o); + Py_CLEAR(o->agt_gen); + Py_CLEAR(o->agt_args); + PyObject_GC_Del(o); +} + + +static int +async_gen_athrow_traverse(PyAsyncGenAThrow *o, visitproc visit, void *arg) +{ + Py_VISIT(o->agt_gen); + Py_VISIT(o->agt_args); + return 0; +} + + +static PyObject * +async_gen_athrow_send(PyAsyncGenAThrow *o, PyObject *arg) +{ + PyGenObject *gen = (PyGenObject*)o->agt_gen; + PyFrameObject *f = gen->gi_frame; + PyObject *retval; + + if (f == NULL || f->f_stacktop == NULL || + o->agt_state == AWAITABLE_STATE_CLOSED) { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } + + if (o->agt_state == AWAITABLE_STATE_INIT) { + if (o->agt_gen->ag_closed) { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } + + if (arg != Py_None) { + PyErr_SetString(PyExc_RuntimeError, NON_INIT_CORO_MSG); + return NULL; + } + + o->agt_state = AWAITABLE_STATE_ITER; + + if (o->agt_args == NULL) { + /* aclose() mode */ + o->agt_gen->ag_closed = 1; + + retval = _gen_throw((PyGenObject *)gen, + 0, /* Do not close generator when + PyExc_GeneratorExit is passed */ + PyExc_GeneratorExit, NULL, NULL); + + if (retval && _PyAsyncGenWrappedValue_CheckExact(retval)) { + Py_DECREF(retval); + goto yield_close; + } + } else { + PyObject *typ; + PyObject *tb = NULL; + PyObject *val = NULL; + + if (!PyArg_UnpackTuple(o->agt_args, "athrow", 1, 3, + &typ, &val, &tb)) { + return NULL; + } + + retval = _gen_throw((PyGenObject *)gen, + 0, /* Do not close generator when + PyExc_GeneratorExit is passed */ + typ, val, tb); + retval = async_gen_unwrap_value(o->agt_gen, retval); + } + if (retval == NULL) { + goto check_error; + } + return retval; + } + + assert(o->agt_state == AWAITABLE_STATE_ITER); + + retval = gen_send_ex((PyGenObject *)gen, arg, 0, 0); + if (o->agt_args) { + return async_gen_unwrap_value(o->agt_gen, retval); + } else { + /* aclose() mode */ + if (retval) { + if (_PyAsyncGenWrappedValue_CheckExact(retval)) { + Py_DECREF(retval); + goto yield_close; + } + else { + return retval; + } + } + else { + goto check_error; + } + } + +yield_close: + PyErr_SetString( + PyExc_RuntimeError, ASYNC_GEN_IGNORED_EXIT_MSG); + return NULL; + +check_error: + if (PyErr_ExceptionMatches(PyExc_StopAsyncIteration)) { + o->agt_state = AWAITABLE_STATE_CLOSED; + if (o->agt_args == NULL) { + /* when aclose() is called we don't want to propagate + StopAsyncIteration; just raise StopIteration, signalling + that 'aclose()' is done. */ + PyErr_Clear(); + PyErr_SetNone(PyExc_StopIteration); + } + } + else if (PyErr_ExceptionMatches(PyExc_GeneratorExit)) { + o->agt_state = AWAITABLE_STATE_CLOSED; + PyErr_Clear(); /* ignore these errors */ + PyErr_SetNone(PyExc_StopIteration); + } + return NULL; +} + + +static PyObject * +async_gen_athrow_throw(PyAsyncGenAThrow *o, PyObject *args) +{ + PyObject *retval; + + if (o->agt_state == AWAITABLE_STATE_INIT) { + PyErr_SetString(PyExc_RuntimeError, NON_INIT_CORO_MSG); + return NULL; + } + + if (o->agt_state == AWAITABLE_STATE_CLOSED) { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } + + retval = gen_throw((PyGenObject*)o->agt_gen, args); + if (o->agt_args) { + return async_gen_unwrap_value(o->agt_gen, retval); + } else { + /* aclose() mode */ + if (retval && _PyAsyncGenWrappedValue_CheckExact(retval)) { + Py_DECREF(retval); + PyErr_SetString(PyExc_RuntimeError, ASYNC_GEN_IGNORED_EXIT_MSG); + return NULL; + } + return retval; + } +} + + +static PyObject * +async_gen_athrow_iternext(PyAsyncGenAThrow *o) +{ + return async_gen_athrow_send(o, Py_None); +} + + +static PyObject * +async_gen_athrow_close(PyAsyncGenAThrow *o, PyObject *args) +{ + o->agt_state = AWAITABLE_STATE_CLOSED; + Py_RETURN_NONE; +} + + +static PyMethodDef async_gen_athrow_methods[] = { + {"send", (PyCFunction)async_gen_athrow_send, METH_O, send_doc}, + {"throw", (PyCFunction)async_gen_athrow_throw, METH_VARARGS, throw_doc}, + {"close", (PyCFunction)async_gen_athrow_close, METH_NOARGS, close_doc}, + {NULL, NULL} /* Sentinel */ +}; + + +static PyAsyncMethods async_gen_athrow_as_async = { + PyObject_SelfIter, /* am_await */ + 0, /* am_aiter */ + 0 /* am_anext */ +}; + + +PyTypeObject _PyAsyncGenAThrow_Type = { + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "async_generator_athrow", /* tp_name */ + sizeof(PyAsyncGenAThrow), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)async_gen_athrow_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + &async_gen_athrow_as_async, /* tp_as_async */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ + 0, /* tp_doc */ + (traverseproc)async_gen_athrow_traverse, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + PyObject_SelfIter, /* tp_iter */ + (iternextfunc)async_gen_athrow_iternext, /* tp_iternext */ + async_gen_athrow_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + + +static PyObject * +async_gen_athrow_new(PyAsyncGenObject *gen, PyObject *args) +{ + PyAsyncGenAThrow *o; + o = PyObject_GC_New(PyAsyncGenAThrow, &_PyAsyncGenAThrow_Type); + if (o == NULL) { + return NULL; + } + o->agt_gen = gen; + o->agt_args = args; + o->agt_state = AWAITABLE_STATE_INIT; + Py_INCREF(gen); + Py_XINCREF(args); + _PyObject_GC_TRACK((PyObject*)o); + return (PyObject*)o; +} diff --git a/Objects/iterobject.c b/Objects/iterobject.c index ab29ff8..75b2fcb 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -208,30 +208,32 @@ calliter_traverse(calliterobject *it, visitproc visit, void *arg) static PyObject * calliter_iternext(calliterobject *it) { - if (it->it_callable != NULL) { - PyObject *args = PyTuple_New(0); - PyObject *result; - if (args == NULL) - return NULL; - result = PyObject_Call(it->it_callable, args, NULL); - Py_DECREF(args); - if (result != NULL) { - int ok; - ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ); - if (ok == 0) - return result; /* Common case, fast path */ - Py_DECREF(result); - if (ok > 0) { - Py_CLEAR(it->it_callable); - Py_CLEAR(it->it_sentinel); - } + PyObject *result; + + if (it->it_callable == NULL) { + return NULL; + } + + result = _PyObject_CallNoArg(it->it_callable); + if (result != NULL) { + int ok; + + ok = PyObject_RichCompareBool(it->it_sentinel, result, Py_EQ); + if (ok == 0) { + return result; /* Common case, fast path */ } - else if (PyErr_ExceptionMatches(PyExc_StopIteration)) { - PyErr_Clear(); + + Py_DECREF(result); + if (ok > 0) { Py_CLEAR(it->it_callable); Py_CLEAR(it->it_sentinel); } } + else if (PyErr_ExceptionMatches(PyExc_StopIteration)) { + PyErr_Clear(); + Py_CLEAR(it->it_callable); + Py_CLEAR(it->it_sentinel); + } return NULL; } diff --git a/Objects/listobject.c b/Objects/listobject.c index 8100048..dcd7b5e 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -49,7 +49,7 @@ list_resize(PyListObject *self, Py_ssize_t newsize) new_allocated = (newsize >> 3) + (newsize < 9 ? 3 : 6); /* check for integer overflow */ - if (new_allocated > PY_SIZE_MAX - newsize) { + if (new_allocated > SIZE_MAX - newsize) { PyErr_NoMemory(); return -1; } else { @@ -59,7 +59,7 @@ list_resize(PyListObject *self, Py_ssize_t newsize) if (newsize == 0) new_allocated = 0; items = self->ob_item; - if (new_allocated <= (PY_SIZE_MAX / sizeof(PyObject *))) + if (new_allocated <= (SIZE_MAX / sizeof(PyObject *))) PyMem_RESIZE(items, PyObject *, new_allocated); else items = NULL; @@ -82,6 +82,16 @@ static size_t count_reuse = 0; static void show_alloc(void) { + PyObject *xoptions, *value; + _Py_IDENTIFIER(showalloccount); + + xoptions = PySys_GetXOptions(); + if (xoptions == NULL) + return; + value = _PyDict_GetItemId(xoptions, &PyId_showalloccount); + if (value != Py_True) + return; + fprintf(stderr, "List allocations: %" PY_FORMAT_SIZE_T "d\n", count_alloc); fprintf(stderr, "List reuse through freelist: %" PY_FORMAT_SIZE_T @@ -130,7 +140,6 @@ PyObject * PyList_New(Py_ssize_t size) { PyListObject *op; - size_t nbytes; #ifdef SHOW_ALLOC_COUNT static int initialized = 0; if (!initialized) { @@ -143,11 +152,6 @@ PyList_New(Py_ssize_t size) PyErr_BadInternalCall(); return NULL; } - /* Check for overflow without an actual overflow, - * which can cause compiler to optimise out */ - if ((size_t)size > PY_SIZE_MAX / sizeof(PyObject *)) - return PyErr_NoMemory(); - nbytes = size * sizeof(PyObject *); if (numfree) { numfree--; op = free_list[numfree]; @@ -166,12 +170,11 @@ PyList_New(Py_ssize_t size) if (size <= 0) op->ob_item = NULL; else { - op->ob_item = (PyObject **) PyMem_MALLOC(nbytes); + op->ob_item = (PyObject **) PyMem_Calloc(size, sizeof(PyObject *)); if (op->ob_item == NULL) { Py_DECREF(op); return PyErr_NoMemory(); } - memset(op->ob_item, 0, nbytes); } Py_SIZE(op) = size; op->allocated = size; @@ -216,7 +219,6 @@ int PyList_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem) { - PyObject *olditem; PyObject **p; if (!PyList_Check(op)) { Py_XDECREF(newitem); @@ -230,9 +232,7 @@ PyList_SetItem(PyObject *op, Py_ssize_t i, return -1; } p = ((PyListObject *)op) -> ob_item + i; - olditem = *p; - *p = newitem; - Py_XDECREF(olditem); + Py_XSETREF(*p, newitem); return 0; } @@ -251,7 +251,7 @@ ins1(PyListObject *self, Py_ssize_t where, PyObject *v) return -1; } - if (list_resize(self, n+1) == -1) + if (list_resize(self, n+1) < 0) return -1; if (where < 0) { @@ -291,7 +291,7 @@ app1(PyListObject *self, PyObject *v) return -1; } - if (list_resize(self, n+1) == -1) + if (list_resize(self, n+1) < 0) return -1; Py_INCREF(v); @@ -481,9 +481,9 @@ list_concat(PyListObject *a, PyObject *bb) return NULL; } #define b ((PyListObject *)bb) - size = Py_SIZE(a) + Py_SIZE(b); - if (size < 0) + if (Py_SIZE(a) > PY_SSIZE_T_MAX - Py_SIZE(b)) return PyErr_NoMemory(); + size = Py_SIZE(a) + Py_SIZE(b); np = (PyListObject *) PyList_New(size); if (np == NULL) { return NULL; @@ -714,7 +714,7 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n) return PyErr_NoMemory(); } - if (list_resize(self, size*n) == -1) + if (list_resize(self, size*n) < 0) return NULL; p = size; @@ -733,7 +733,6 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n) static int list_ass_item(PyListObject *a, Py_ssize_t i, PyObject *v) { - PyObject *old_value; if (i < 0 || i >= Py_SIZE(a)) { PyErr_SetString(PyExc_IndexError, "list assignment index out of range"); @@ -742,9 +741,7 @@ list_ass_item(PyListObject *a, Py_ssize_t i, PyObject *v) if (v == NULL) return list_ass_slice(a, i, i+1, v); Py_INCREF(v); - old_value = a->ob_item[i]; - a->ob_item[i] = v; - Py_DECREF(old_value); + Py_SETREF(a->ob_item[i], v); return 0; } @@ -807,7 +804,7 @@ listextend(PyListObject *self, PyObject *b) Py_RETURN_NONE; } m = Py_SIZE(self); - if (list_resize(self, m + n) == -1) { + if (list_resize(self, m + n) < 0) { Py_DECREF(b); return NULL; } @@ -835,23 +832,25 @@ listextend(PyListObject *self, PyObject *b) /* Guess a result list size. */ n = PyObject_LengthHint(b, 8); - if (n == -1) { + if (n < 0) { Py_DECREF(it); return NULL; } m = Py_SIZE(self); - mn = m + n; - if (mn >= m) { + if (m > PY_SSIZE_T_MAX - n) { + /* m + n overflowed; on the chance that n lied, and there really + * is enough room, ignore it. If n was telling the truth, we'll + * eventually run out of memory during the loop. + */ + } + else { + mn = m + n; /* Make room. */ - if (list_resize(self, mn) == -1) + if (list_resize(self, mn) < 0) goto error; /* Make the list sane again. */ Py_SIZE(self) = m; } - /* Else m + n overflowed; on the chance that n lied, and there really - * is enough room, ignore it. If n was telling the truth, we'll - * eventually run out of memory during the loop. - */ /* Run iterator to exhaustion. */ for (;;) { @@ -2154,8 +2153,8 @@ listindex(PyListObject *self, PyObject *args) PyObject *v; if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, - _PyEval_SliceIndexNotNone, &start, - _PyEval_SliceIndexNotNone, &stop)) + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) return NULL; if (start < 0) { start += Py_SIZE(self); @@ -2421,11 +2420,10 @@ list_subscript(PyListObject* self, PyObject* item) PyObject* it; PyObject **src, **dest; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, Py_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop, - step); if (slicelength <= 0) { return PyList_New(0); @@ -2471,11 +2469,10 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value) else if (PySlice_Check(item)) { Py_ssize_t start, stop, step, slicelength; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, Py_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return -1; } - slicelength = PySlice_AdjustIndices(Py_SIZE(self), &start, &stop, - step); if (step == 1) return list_ass_slice(self, start, stop, value); @@ -2502,9 +2499,6 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value) step = -step; } - assert((size_t)slicelength <= - PY_SIZE_MAX / sizeof(PyObject*)); - garbage = (PyObject**) PyMem_MALLOC(slicelength*sizeof(PyObject*)); if (!garbage) { diff --git a/Objects/listsort.txt b/Objects/listsort.txt index 152a270..17d2797 100644 --- a/Objects/listsort.txt +++ b/Objects/listsort.txt @@ -486,7 +486,7 @@ sub-run, yet finding such very efficiently when they exist. I first learned about the galloping strategy in a related context; see: "Adaptive Set Intersections, Unions, and Differences" (2000) - Erik D. Demaine, Alejandro López-Ortiz, J. Ian Munro + Erik D. Demaine, Alejandro López-Ortiz, J. Ian Munro and its followup(s). An earlier paper called the same strategy "exponential search": diff --git a/Objects/lnotab_notes.txt b/Objects/lnotab_notes.txt index d247edd..5153757 100644 --- a/Objects/lnotab_notes.txt +++ b/Objects/lnotab_notes.txt @@ -12,42 +12,47 @@ pairs. The details are important and delicate, best illustrated by example: 0 1 6 2 50 7 - 350 307 - 361 308 + 350 207 + 361 208 Instead of storing these numbers literally, we compress the list by storing only -the increments from one row to the next. Conceptually, the stored list might +the difference from one row to the next. Conceptually, the stored list might look like: - 0, 1, 6, 1, 44, 5, 300, 300, 11, 1 + 0, 1, 6, 1, 44, 5, 300, 200, 11, 1 -The above doesn't really work, but it's a start. Note that an unsigned byte -can't hold negative values, or values larger than 255, and the above example -contains two such values. So we make two tweaks: +The above doesn't really work, but it's a start. An unsigned byte (byte code +offset) can't hold negative values, or values larger than 255, a signed byte +(line number) can't hold values larger than 127 or less than -128, and the +above example contains two such values. So we make two tweaks: - (a) there's a deep assumption that byte code offsets and their corresponding - line #s both increase monotonically, and - (b) if at least one column jumps by more than 255 from one row to the next, - more than one pair is written to the table. In case #b, there's no way to know - from looking at the table later how many were written. That's the delicate - part. A user of co_lnotab desiring to find the source line number - corresponding to a bytecode address A should do something like this + (a) there's a deep assumption that byte code offsets increase monotonically, + and + (b) if byte code offset jumps by more than 255 from one row to the next, or if + source code line number jumps by more than 127 or less than -128 from one row + to the next, more than one pair is written to the table. In case #b, + there's no way to know from looking at the table later how many were written. + That's the delicate part. A user of co_lnotab desiring to find the source + line number corresponding to a bytecode address A should do something like + this: lineno = addr = 0 for addr_incr, line_incr in co_lnotab: addr += addr_incr if addr > A: return lineno + if line_incr >= 0x80: + line_incr -= 0x100 lineno += line_incr (In C, this is implemented by PyCode_Addr2Line().) In order for this to work, when the addr field increments by more than 255, the line # increment in each pair generated must be 0 until the remaining addr increment is < 256. So, in the example above, assemble_lnotab in compile.c should not (as was actually done -until 2.2) expand 300, 300 to +until 2.2) expand 300, 200 to 255, 255, 45, 45, but to - 255, 0, 45, 255, 0, 45. + 255, 0, 45, 128, 0, 72. The above is sufficient to reconstruct line numbers for tracebacks, but not for line tracing. Tracing is handled by PyCode_CheckLineNumber() in codeobject.c @@ -90,16 +95,16 @@ which compiles to this: 6 POP_JUMP_IF_FALSE 17 3 9 LOAD_CONST 1 (1) - 12 PRINT_ITEM + 12 PRINT_ITEM - 4 13 BREAK_LOOP + 4 13 BREAK_LOOP 14 JUMP_ABSOLUTE 3 - >> 17 POP_BLOCK + >> 17 POP_BLOCK 6 18 LOAD_CONST 2 (2) - 21 PRINT_ITEM + 21 PRINT_ITEM >> 22 LOAD_CONST 0 (None) - 25 RETURN_VALUE + 25 RETURN_VALUE If 'a' is false, execution will jump to the POP_BLOCK instruction at offset 17 and the co_lnotab will claim that execution has moved to line 4, which is wrong. diff --git a/Objects/longobject.c b/Objects/longobject.c index 8510e90..ad239ce 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -722,7 +722,7 @@ _PyLong_NumBits(PyObject *vv) assert(ndigits == 0 || v->ob_digit[ndigits - 1] != 0); if (ndigits > 0) { digit msd = v->ob_digit[ndigits - 1]; - if ((size_t)(ndigits - 1) > PY_SIZE_MAX / (size_t)PyLong_SHIFT) + if ((size_t)(ndigits - 1) > SIZE_MAX / (size_t)PyLong_SHIFT) goto Overflow; result = (size_t)(ndigits - 1) * (size_t)PyLong_SHIFT; do { @@ -990,16 +990,13 @@ PyObject * PyLong_FromVoidPtr(void *p) { #if SIZEOF_VOID_P <= SIZEOF_LONG - return PyLong_FromUnsignedLong((unsigned long)(Py_uintptr_t)p); + return PyLong_FromUnsignedLong((unsigned long)(uintptr_t)p); #else -#ifndef HAVE_LONG_LONG -# error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long" -#endif #if SIZEOF_LONG_LONG < SIZEOF_VOID_P -# error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" +# error "PyLong_FromVoidPtr: sizeof(long long) < sizeof(void*)" #endif - return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)(Py_uintptr_t)p); + return PyLong_FromUnsignedLongLong((unsigned long long)(uintptr_t)p); #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */ } @@ -1018,13 +1015,10 @@ PyLong_AsVoidPtr(PyObject *vv) x = PyLong_AsUnsignedLong(vv); #else -#ifndef HAVE_LONG_LONG -# error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long" -#endif #if SIZEOF_LONG_LONG < SIZEOF_VOID_P -# error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)" +# error "PyLong_AsVoidPtr: sizeof(long long) < sizeof(void*)" #endif - PY_LONG_LONG x; + long long x; if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0) x = PyLong_AsLongLong(vv); @@ -1038,22 +1032,20 @@ PyLong_AsVoidPtr(PyObject *vv) return (void *)x; } -#ifdef HAVE_LONG_LONG - -/* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later +/* Initial long long support by Chris Herborth (chrish@qnx.com), later * rewritten to use the newer PyLong_{As,From}ByteArray API. */ -#define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) +#define PY_ABS_LLONG_MIN (0-(unsigned long long)PY_LLONG_MIN) -/* Create a new int object from a C PY_LONG_LONG int. */ +/* Create a new int object from a C long long int. */ PyObject * -PyLong_FromLongLong(PY_LONG_LONG ival) +PyLong_FromLongLong(long long ival) { PyLongObject *v; - unsigned PY_LONG_LONG abs_ival; - unsigned PY_LONG_LONG t; /* unsigned so >> doesn't propagate sign bit */ + unsigned long long abs_ival; + unsigned long long t; /* unsigned so >> doesn't propagate sign bit */ int ndigits = 0; int negative = 0; @@ -1061,11 +1053,11 @@ PyLong_FromLongLong(PY_LONG_LONG ival) if (ival < 0) { /* avoid signed overflow on negation; see comments in PyLong_FromLong above. */ - abs_ival = (unsigned PY_LONG_LONG)(-1-ival) + 1; + abs_ival = (unsigned long long)(-1-ival) + 1; negative = 1; } else { - abs_ival = (unsigned PY_LONG_LONG)ival; + abs_ival = (unsigned long long)ival; } /* Count the number of Python digits. @@ -1090,19 +1082,19 @@ PyLong_FromLongLong(PY_LONG_LONG ival) return (PyObject *)v; } -/* Create a new int object from a C unsigned PY_LONG_LONG int. */ +/* Create a new int object from a C unsigned long long int. */ PyObject * -PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG ival) +PyLong_FromUnsignedLongLong(unsigned long long ival) { PyLongObject *v; - unsigned PY_LONG_LONG t; + unsigned long long t; int ndigits = 0; if (ival < PyLong_BASE) return PyLong_FromLong((long)ival); /* Count the number of Python digits. */ - t = (unsigned PY_LONG_LONG)ival; + t = (unsigned long long)ival; while (t) { ++ndigits; t >>= PyLong_SHIFT; @@ -1191,11 +1183,11 @@ PyLong_FromSize_t(size_t ival) /* Get a C long long int from an int object or any object that has an __int__ method. Return -1 and set an error if overflow occurs. */ -PY_LONG_LONG +long long PyLong_AsLongLong(PyObject *vv) { PyLongObject *v; - PY_LONG_LONG bytes; + long long bytes; int res; int do_decref = 0; /* if nb_int was called */ @@ -1233,30 +1225,30 @@ PyLong_AsLongLong(PyObject *vv) Py_DECREF(v); } - /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ + /* Plan 9 can't handle long long in ? : expressions */ if (res < 0) - return (PY_LONG_LONG)-1; + return (long long)-1; else return bytes; } -/* Get a C unsigned PY_LONG_LONG int from an int object. +/* Get a C unsigned long long int from an int object. Return -1 and set an error if overflow occurs. */ -unsigned PY_LONG_LONG +unsigned long long PyLong_AsUnsignedLongLong(PyObject *vv) { PyLongObject *v; - unsigned PY_LONG_LONG bytes; + unsigned long long bytes; int res; if (vv == NULL) { PyErr_BadInternalCall(); - return (unsigned PY_LONG_LONG)-1; + return (unsigned long long)-1; } if (!PyLong_Check(vv)) { PyErr_SetString(PyExc_TypeError, "an integer is required"); - return (unsigned PY_LONG_LONG)-1; + return (unsigned long long)-1; } v = (PyLongObject*)vv; @@ -1268,9 +1260,9 @@ PyLong_AsUnsignedLongLong(PyObject *vv) res = _PyLong_AsByteArray((PyLongObject *)vv, (unsigned char *)&bytes, SIZEOF_LONG_LONG, PY_LITTLE_ENDIAN, 0); - /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */ + /* Plan 9 can't handle long long in ? : expressions */ if (res < 0) - return (unsigned PY_LONG_LONG)res; + return (unsigned long long)res; else return bytes; } @@ -1278,11 +1270,11 @@ PyLong_AsUnsignedLongLong(PyObject *vv) /* Get a C unsigned long int from an int object, ignoring the high bits. Returns -1 and sets an error condition if an error occurs. */ -static unsigned PY_LONG_LONG +static unsigned long long _PyLong_AsUnsignedLongLongMask(PyObject *vv) { PyLongObject *v; - unsigned PY_LONG_LONG x; + unsigned long long x; Py_ssize_t i; int sign; @@ -1308,11 +1300,11 @@ _PyLong_AsUnsignedLongLongMask(PyObject *vv) return x * sign; } -unsigned PY_LONG_LONG +unsigned long long PyLong_AsUnsignedLongLongMask(PyObject *op) { PyLongObject *lo; - unsigned PY_LONG_LONG val; + unsigned long long val; if (op == NULL) { PyErr_BadInternalCall(); @@ -1325,7 +1317,7 @@ PyLong_AsUnsignedLongLongMask(PyObject *op) lo = _PyLong_FromNbInt(op); if (lo == NULL) - return (unsigned PY_LONG_LONG)-1; + return (unsigned long long)-1; val = _PyLong_AsUnsignedLongLongMask((PyObject *)lo); Py_DECREF(lo); @@ -1342,13 +1334,13 @@ PyLong_AsUnsignedLongLongMask(PyObject *op) In this case *overflow will be 0. */ -PY_LONG_LONG +long long PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) { /* This version by Tim Peters */ PyLongObject *v; - unsigned PY_LONG_LONG x, prev; - PY_LONG_LONG res; + unsigned long long x, prev; + long long res; Py_ssize_t i; int sign; int do_decref = 0; /* if nb_int was called */ @@ -1400,8 +1392,8 @@ PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) /* Haven't lost any bits, but casting to long requires extra * care (see comment above). */ - if (x <= (unsigned PY_LONG_LONG)PY_LLONG_MAX) { - res = (PY_LONG_LONG)x * sign; + if (x <= (unsigned long long)PY_LLONG_MAX) { + res = (long long)x * sign; } else if (sign < 0 && x == PY_ABS_LLONG_MIN) { res = PY_LLONG_MIN; @@ -1418,8 +1410,6 @@ PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) return res; } -#endif /* HAVE_LONG_LONG */ - #define CHECK_BINOP(v,w) \ do { \ if (!PyLong_Check(v) || !PyLong_Check(w)) \ @@ -1583,13 +1573,16 @@ divrem1(PyLongObject *a, digit n, digit *prem) static int long_to_decimal_string_internal(PyObject *aa, PyObject **p_output, - _PyUnicodeWriter *writer) + _PyUnicodeWriter *writer, + _PyBytesWriter *bytes_writer, + char **bytes_str) { PyLongObject *scratch, *a; - PyObject *str; + PyObject *str = NULL; Py_ssize_t size, strlen, size_a, i, j; digit *pout, *pin, rem, tenpow; int negative; + int d; enum PyUnicode_Kind kind; a = (PyLongObject *)aa; @@ -1607,15 +1600,17 @@ long_to_decimal_string_internal(PyObject *aa, But log2(a) < size_a * PyLong_SHIFT, and log2(_PyLong_DECIMAL_BASE) = log2(10) * _PyLong_DECIMAL_SHIFT - > 3 * _PyLong_DECIMAL_SHIFT + > 3.3 * _PyLong_DECIMAL_SHIFT + + size_a * PyLong_SHIFT / (3.3 * _PyLong_DECIMAL_SHIFT) = + size_a + size_a / d < size_a + size_a / floor(d), + where d = (3.3 * _PyLong_DECIMAL_SHIFT) / + (PyLong_SHIFT - 3.3 * _PyLong_DECIMAL_SHIFT) */ - if (size_a > PY_SSIZE_T_MAX / PyLong_SHIFT) { - PyErr_SetString(PyExc_OverflowError, - "int too large to format"); - return -1; - } - /* the expression size_a * PyLong_SHIFT is now safe from overflow */ - size = 1 + size_a * PyLong_SHIFT / (3 * _PyLong_DECIMAL_SHIFT); + d = (33 * _PyLong_DECIMAL_SHIFT) / + (10 * PyLong_SHIFT - 33 * _PyLong_DECIMAL_SHIFT); + assert(size_a < PY_SSIZE_T_MAX/2); + size = 1 + size_a + size_a / d; scratch = _PyLong_New(size); if (scratch == NULL) return -1; @@ -1663,7 +1658,13 @@ long_to_decimal_string_internal(PyObject *aa, return -1; } kind = writer->kind; - str = NULL; + } + else if (bytes_writer) { + *bytes_str = _PyBytesWriter_Prepare(bytes_writer, *bytes_str, strlen); + if (*bytes_str == NULL) { + Py_DECREF(scratch); + return -1; + } } else { str = PyUnicode_New(strlen, '9'); @@ -1674,13 +1675,8 @@ long_to_decimal_string_internal(PyObject *aa, kind = PyUnicode_KIND(str); } -#define WRITE_DIGITS(TYPE) \ +#define WRITE_DIGITS(p) \ do { \ - if (writer) \ - p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + strlen; \ - else \ - p = (TYPE*)PyUnicode_DATA(str) + strlen; \ - \ /* pout[0] through pout[size-2] contribute exactly \ _PyLong_DECIMAL_SHIFT digits each */ \ for (i=0; i < size - 1; i++) { \ @@ -1700,6 +1696,16 @@ long_to_decimal_string_internal(PyObject *aa, /* and sign */ \ if (negative) \ *--p = '-'; \ + } while (0) + +#define WRITE_UNICODE_DIGITS(TYPE) \ + do { \ + if (writer) \ + p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + strlen; \ + else \ + p = (TYPE*)PyUnicode_DATA(str) + strlen; \ + \ + WRITE_DIGITS(p); \ \ /* check we've counted correctly */ \ if (writer) \ @@ -1709,25 +1715,34 @@ long_to_decimal_string_internal(PyObject *aa, } while (0) /* fill the string right-to-left */ - if (kind == PyUnicode_1BYTE_KIND) { + if (bytes_writer) { + char *p = *bytes_str + strlen; + WRITE_DIGITS(p); + assert(p == *bytes_str); + } + else if (kind == PyUnicode_1BYTE_KIND) { Py_UCS1 *p; - WRITE_DIGITS(Py_UCS1); + WRITE_UNICODE_DIGITS(Py_UCS1); } else if (kind == PyUnicode_2BYTE_KIND) { Py_UCS2 *p; - WRITE_DIGITS(Py_UCS2); + WRITE_UNICODE_DIGITS(Py_UCS2); } else { Py_UCS4 *p; assert (kind == PyUnicode_4BYTE_KIND); - WRITE_DIGITS(Py_UCS4); + WRITE_UNICODE_DIGITS(Py_UCS4); } #undef WRITE_DIGITS +#undef WRITE_UNICODE_DIGITS Py_DECREF(scratch); if (writer) { writer->pos += strlen; } + else if (bytes_writer) { + (*bytes_str) += strlen; + } else { assert(_PyUnicode_CheckConsistency(str, 1)); *p_output = (PyObject *)str; @@ -1739,7 +1754,7 @@ static PyObject * long_to_decimal_string(PyObject *aa) { PyObject *v; - if (long_to_decimal_string_internal(aa, &v, NULL) == -1) + if (long_to_decimal_string_internal(aa, &v, NULL, NULL, NULL) == -1) return NULL; return v; } @@ -1751,10 +1766,11 @@ long_to_decimal_string(PyObject *aa) static int long_format_binary(PyObject *aa, int base, int alternate, - PyObject **p_output, _PyUnicodeWriter *writer) + PyObject **p_output, _PyUnicodeWriter *writer, + _PyBytesWriter *bytes_writer, char **bytes_str) { PyLongObject *a = (PyLongObject *)aa; - PyObject *v; + PyObject *v = NULL; Py_ssize_t sz; Py_ssize_t size_a; enum PyUnicode_Kind kind; @@ -1811,7 +1827,11 @@ long_format_binary(PyObject *aa, int base, int alternate, if (_PyUnicodeWriter_Prepare(writer, sz, 'x') == -1) return -1; kind = writer->kind; - v = NULL; + } + else if (bytes_writer) { + *bytes_str = _PyBytesWriter_Prepare(bytes_writer, *bytes_str, sz); + if (*bytes_str == NULL) + return -1; } else { v = PyUnicode_New(sz, 'x'); @@ -1820,13 +1840,8 @@ long_format_binary(PyObject *aa, int base, int alternate, kind = PyUnicode_KIND(v); } -#define WRITE_DIGITS(TYPE) \ +#define WRITE_DIGITS(p) \ do { \ - if (writer) \ - p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + sz; \ - else \ - p = (TYPE*)PyUnicode_DATA(v) + sz; \ - \ if (size_a == 0) { \ *--p = '0'; \ } \ @@ -1861,30 +1876,50 @@ long_format_binary(PyObject *aa, int base, int alternate, } \ if (negative) \ *--p = '-'; \ + } while (0) + +#define WRITE_UNICODE_DIGITS(TYPE) \ + do { \ + if (writer) \ + p = (TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos + sz; \ + else \ + p = (TYPE*)PyUnicode_DATA(v) + sz; \ + \ + WRITE_DIGITS(p); \ + \ if (writer) \ assert(p == ((TYPE*)PyUnicode_DATA(writer->buffer) + writer->pos)); \ else \ assert(p == (TYPE*)PyUnicode_DATA(v)); \ } while (0) - if (kind == PyUnicode_1BYTE_KIND) { + if (bytes_writer) { + char *p = *bytes_str + sz; + WRITE_DIGITS(p); + assert(p == *bytes_str); + } + else if (kind == PyUnicode_1BYTE_KIND) { Py_UCS1 *p; - WRITE_DIGITS(Py_UCS1); + WRITE_UNICODE_DIGITS(Py_UCS1); } else if (kind == PyUnicode_2BYTE_KIND) { Py_UCS2 *p; - WRITE_DIGITS(Py_UCS2); + WRITE_UNICODE_DIGITS(Py_UCS2); } else { Py_UCS4 *p; assert (kind == PyUnicode_4BYTE_KIND); - WRITE_DIGITS(Py_UCS4); + WRITE_UNICODE_DIGITS(Py_UCS4); } #undef WRITE_DIGITS +#undef WRITE_UNICODE_DIGITS if (writer) { writer->pos += sz; } + else if (bytes_writer) { + (*bytes_str) += sz; + } else { assert(_PyUnicode_CheckConsistency(v, 1)); *p_output = v; @@ -1898,9 +1933,9 @@ _PyLong_Format(PyObject *obj, int base) PyObject *str; int err; if (base == 10) - err = long_to_decimal_string_internal(obj, &str, NULL); + err = long_to_decimal_string_internal(obj, &str, NULL, NULL, NULL); else - err = long_format_binary(obj, base, 1, &str, NULL); + err = long_format_binary(obj, base, 1, &str, NULL, NULL, NULL); if (err == -1) return NULL; return str; @@ -1912,9 +1947,31 @@ _PyLong_FormatWriter(_PyUnicodeWriter *writer, int base, int alternate) { if (base == 10) - return long_to_decimal_string_internal(obj, NULL, writer); + return long_to_decimal_string_internal(obj, NULL, writer, + NULL, NULL); + else + return long_format_binary(obj, base, alternate, NULL, writer, + NULL, NULL); +} + +char* +_PyLong_FormatBytesWriter(_PyBytesWriter *writer, char *str, + PyObject *obj, + int base, int alternate) +{ + char *str2; + int res; + str2 = str; + if (base == 10) + res = long_to_decimal_string_internal(obj, NULL, NULL, + writer, &str2); else - return long_format_binary(obj, base, alternate, NULL, writer); + res = long_format_binary(obj, base, alternate, NULL, NULL, + writer, &str2); + if (res < 0) + return NULL; + assert(str2 != NULL); + return str2; } /* Table of digit values for 8-bit string -> integer conversion. @@ -1948,12 +2005,18 @@ unsigned char _PyLong_DigitValue[256] = { * non-digit (which may be *str!). A normalized int is returned. * The point to this routine is that it takes time linear in the number of * string characters. + * + * Return values: + * -1 on syntax error (exception needs to be set, *res is untouched) + * 0 else (exception may be set, in that case *res is set to NULL) */ -static PyLongObject * -long_from_binary_base(const char **str, int base) +static int +long_from_binary_base(const char **str, int base, PyLongObject **res) { const char *p = *str; const char *start = p; + char prev = 0; + int digits = 0; int bits_per_char; Py_ssize_t n; PyLongObject *z; @@ -1963,23 +2026,43 @@ long_from_binary_base(const char **str, int base) assert(base >= 2 && base <= 32 && (base & (base - 1)) == 0); n = base; - for (bits_per_char = -1; n; ++bits_per_char) + for (bits_per_char = -1; n; ++bits_per_char) { n >>= 1; - /* n <- total # of bits needed, while setting p to end-of-string */ - while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base) + } + /* count digits and set p to end-of-string */ + while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base || *p == '_') { + if (*p == '_') { + if (prev == '_') { + *str = p - 1; + return -1; + } + } else { + ++digits; + } + prev = *p; ++p; + } + if (prev == '_') { + /* Trailing underscore not allowed. */ + *str = p - 1; + return -1; + } + *str = p; /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */ - n = (p - start) * bits_per_char + PyLong_SHIFT - 1; + n = digits * bits_per_char + PyLong_SHIFT - 1; if (n / bits_per_char < p - start) { PyErr_SetString(PyExc_ValueError, "int string too large to convert"); - return NULL; + *res = NULL; + return 0; } n = n / PyLong_SHIFT; z = _PyLong_New(n); - if (z == NULL) - return NULL; + if (z == NULL) { + *res = NULL; + return 0; + } /* Read string from right, and fill in int from left; i.e., * from least to most significant in both. */ @@ -1987,7 +2070,11 @@ long_from_binary_base(const char **str, int base) bits_in_accum = 0; pdigit = z->ob_digit; while (--p >= start) { - int k = (int)_PyLong_DigitValue[Py_CHARMASK(*p)]; + int k; + if (*p == '_') { + continue; + } + k = (int)_PyLong_DigitValue[Py_CHARMASK(*p)]; assert(k >= 0 && k < base); accum |= (twodigits)k << bits_in_accum; bits_in_accum += bits_per_char; @@ -2006,7 +2093,8 @@ long_from_binary_base(const char **str, int base) } while (pdigit - z->ob_digit < n) *pdigit++ = 0; - return long_normalize(z); + *res = long_normalize(z); + return 0; } /* Parses an int from a bytestring. Leading and trailing whitespace will be @@ -2031,23 +2119,29 @@ PyLong_FromString(const char *str, char **pend, int base) "int() arg 2 must be >= 2 and <= 36"); return NULL; } - while (*str != '\0' && Py_ISSPACE(Py_CHARMASK(*str))) + while (*str != '\0' && Py_ISSPACE(Py_CHARMASK(*str))) { str++; - if (*str == '+') + } + if (*str == '+') { ++str; + } else if (*str == '-') { ++str; sign = -1; } if (base == 0) { - if (str[0] != '0') + if (str[0] != '0') { base = 10; - else if (str[1] == 'x' || str[1] == 'X') + } + else if (str[1] == 'x' || str[1] == 'X') { base = 16; - else if (str[1] == 'o' || str[1] == 'O') + } + else if (str[1] == 'o' || str[1] == 'O') { base = 8; - else if (str[1] == 'b' || str[1] == 'B') + } + else if (str[1] == 'b' || str[1] == 'B') { base = 2; + } else { /* "old" (C-style) octal literal, now invalid. it might still be zero though */ @@ -2058,12 +2152,26 @@ PyLong_FromString(const char *str, char **pend, int base) if (str[0] == '0' && ((base == 16 && (str[1] == 'x' || str[1] == 'X')) || (base == 8 && (str[1] == 'o' || str[1] == 'O')) || - (base == 2 && (str[1] == 'b' || str[1] == 'B')))) + (base == 2 && (str[1] == 'b' || str[1] == 'B')))) { str += 2; + /* One underscore allowed here. */ + if (*str == '_') { + ++str; + } + } + if (str[0] == '_') { + /* May not start with underscores. */ + goto onError; + } start = str; - if ((base & (base - 1)) == 0) - z = long_from_binary_base(&str, base); + if ((base & (base - 1)) == 0) { + int res = long_from_binary_base(&str, base, &z); + if (res < 0) { + /* Syntax error. */ + goto onError; + } + } else { /*** Binary bases can be converted in time linear in the number of digits, because @@ -2152,11 +2260,13 @@ digit beyond the first. ***/ twodigits c; /* current input character */ Py_ssize_t size_z; + int digits = 0; int i; int convwidth; twodigits convmultmax, convmult; digit *pz, *pzstop; - const char* scan; + const char *scan, *lastdigit; + char prev = 0; static double log_base_BASE[37] = {0.0e0,}; static int convwidth_base[37] = {0,}; @@ -2170,8 +2280,9 @@ digit beyond the first. log((double)PyLong_BASE)); for (;;) { twodigits next = convmax * base; - if (next > PyLong_BASE) + if (next > PyLong_BASE) { break; + } convmax = next; ++i; } @@ -2182,21 +2293,43 @@ digit beyond the first. /* Find length of the string of numeric characters. */ scan = str; - while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base) + lastdigit = str; + + while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base || *scan == '_') { + if (*scan == '_') { + if (prev == '_') { + /* Only one underscore allowed. */ + str = lastdigit + 1; + goto onError; + } + } + else { + ++digits; + lastdigit = scan; + } + prev = *scan; ++scan; + } + if (prev == '_') { + /* Trailing underscore not allowed. */ + /* Set error pointer to first underscore. */ + str = lastdigit + 1; + goto onError; + } /* Create an int object that can contain the largest possible * integer with this base and length. Note that there's no * need to initialize z->ob_digit -- no slot is read up before * being stored into. */ - size_z = (Py_ssize_t)((scan - str) * log_base_BASE[base]) + 1; + size_z = (Py_ssize_t)(digits * log_base_BASE[base]) + 1; /* Uncomment next line to test exceedingly rare copy code */ /* size_z = 1; */ assert(size_z > 0); z = _PyLong_New(size_z); - if (z == NULL) + if (z == NULL) { return NULL; + } Py_SIZE(z) = 0; /* `convwidth` consecutive input digits are treated as a single @@ -2207,9 +2340,17 @@ digit beyond the first. /* Work ;-) */ while (str < scan) { + if (*str == '_') { + str++; + continue; + } /* grab up to convwidth digits from the input string */ c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)]; - for (i = 1; i < convwidth && str != scan; ++i, ++str) { + for (i = 1; i < convwidth && str != scan; ++str) { + if (*str == '_') { + continue; + } + i++; c = (twodigits)(c * base + (int)_PyLong_DigitValue[Py_CHARMASK(*str)]); assert(c < PyLong_BASE); @@ -2221,8 +2362,9 @@ digit beyond the first. */ if (i != convwidth) { convmult = base; - for ( ; i > 1; --i) + for ( ; i > 1; --i) { convmult *= base; + } } /* Multiply z by convmult, and add c. */ @@ -2260,41 +2402,51 @@ digit beyond the first. } } } - if (z == NULL) + if (z == NULL) { return NULL; + } if (error_if_nonzero) { /* reset the base to 0, else the exception message doesn't make too much sense */ base = 0; - if (Py_SIZE(z) != 0) + if (Py_SIZE(z) != 0) { goto onError; + } /* there might still be other problems, therefore base remains zero here for the same reason */ } - if (str == start) + if (str == start) { goto onError; - if (sign < 0) + } + if (sign < 0) { Py_SIZE(z) = -(Py_SIZE(z)); - while (*str && Py_ISSPACE(Py_CHARMASK(*str))) + } + while (*str && Py_ISSPACE(Py_CHARMASK(*str))) { str++; - if (*str != '\0') + } + if (*str != '\0') { goto onError; + } long_normalize(z); z = maybe_small_long(z); - if (z == NULL) + if (z == NULL) { return NULL; - if (pend != NULL) + } + if (pend != NULL) { *pend = (char *)str; + } return (PyObject *) z; onError: - if (pend != NULL) + if (pend != NULL) { *pend = (char *)str; + } Py_XDECREF(z); slen = strlen(orig_str) < 200 ? strlen(orig_str) : 200; strobj = PyUnicode_FromStringAndSize(orig_str, slen); - if (strobj == NULL) + if (strobj == NULL) { return NULL; + } PyErr_Format(PyExc_ValueError, "invalid literal for int() with base %d: %.200R", base, strobj); @@ -2395,8 +2547,11 @@ long_divrem(PyLongObject *a, PyLongObject *b, *pdiv = (PyLongObject*)PyLong_FromLong(0); if (*pdiv == NULL) return -1; - Py_INCREF(a); - *prem = (PyLongObject *) a; + *prem = (PyLongObject *)long_long((PyObject *)a); + if (*prem == NULL) { + Py_CLEAR(*pdiv); + return -1; + } return 0; } if (size_b == 1) { @@ -2706,6 +2861,13 @@ PyLong_AsDouble(PyObject *v) PyErr_SetString(PyExc_TypeError, "an integer is required"); return -1.0; } + if (Py_ABS(Py_SIZE(v)) <= 1) { + /* Fast path; single digit long (31 bits) will cast safely + to double. This improves performance of FP/long operations + by 20%. + */ + return (double)MEDIUM_VALUE((PyLongObject *)v); + } x = _PyLong_Frexp((PyLongObject *)v, &exponent); if ((x == -1.0 && PyErr_Occurred()) || exponent > DBL_MAX_EXP) { PyErr_SetString(PyExc_OverflowError, @@ -2930,9 +3092,7 @@ x_sub(PyLongObject *a, PyLongObject *b) } assert(borrow == 0); if (sign < 0) { - _PyLong_Negate(&z); - if (z == NULL) - return NULL; + Py_SIZE(z) = -Py_SIZE(z); } return long_normalize(z); } @@ -2952,8 +3112,14 @@ long_add(PyLongObject *a, PyLongObject *b) if (Py_SIZE(a) < 0) { if (Py_SIZE(b) < 0) { z = x_add(a, b); - if (z != NULL && Py_SIZE(z) != 0) + if (z != NULL) { + /* x_add received at least one multiple-digit int, + and thus z must be a multiple-digit int. + That also means z is not an element of + small_ints, so negating it in-place is safe. */ + assert(Py_REFCNT(z) == 1); Py_SIZE(z) = -(Py_SIZE(z)); + } } else z = x_sub(b, a); @@ -2984,8 +3150,10 @@ long_sub(PyLongObject *a, PyLongObject *b) z = x_sub(a, b); else z = x_add(a, b); - if (z != NULL && Py_SIZE(z) != 0) + if (z != NULL) { + assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1); Py_SIZE(z) = -(Py_SIZE(z)); + } } else { if (Py_SIZE(b) < 0) @@ -3409,17 +3577,7 @@ long_mul(PyLongObject *a, PyLongObject *b) /* fast path for single-digit multiplication */ if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) { stwodigits v = (stwodigits)(MEDIUM_VALUE(a)) * MEDIUM_VALUE(b); -#ifdef HAVE_LONG_LONG - return PyLong_FromLongLong((PY_LONG_LONG)v); -#else - /* if we don't have long long then we're almost certainly - using 15-bit digits, so v will fit in a long. In the - unlikely event that we're using 30-bit digits on a platform - without long long, a large v will just cause us to fall - through to the general multiplication code below. */ - if (v >= LONG_MIN && v <= LONG_MAX) - return PyLong_FromLong((long)v); -#endif + return PyLong_FromLongLong((long long)v); } z = k_mul(a, b); @@ -3432,6 +3590,52 @@ long_mul(PyLongObject *a, PyLongObject *b) return (PyObject *)z; } +/* Fast modulo division for single-digit longs. */ +static PyObject * +fast_mod(PyLongObject *a, PyLongObject *b) +{ + sdigit left = a->ob_digit[0]; + sdigit right = b->ob_digit[0]; + sdigit mod; + + assert(Py_ABS(Py_SIZE(a)) == 1); + assert(Py_ABS(Py_SIZE(b)) == 1); + + if (Py_SIZE(a) == Py_SIZE(b)) { + /* 'a' and 'b' have the same sign. */ + mod = left % right; + } + else { + /* Either 'a' or 'b' is negative. */ + mod = right - 1 - (left - 1) % right; + } + + return PyLong_FromLong(mod * (sdigit)Py_SIZE(b)); +} + +/* Fast floor division for single-digit longs. */ +static PyObject * +fast_floor_div(PyLongObject *a, PyLongObject *b) +{ + sdigit left = a->ob_digit[0]; + sdigit right = b->ob_digit[0]; + sdigit div; + + assert(Py_ABS(Py_SIZE(a)) == 1); + assert(Py_ABS(Py_SIZE(b)) == 1); + + if (Py_SIZE(a) == Py_SIZE(b)) { + /* 'a' and 'b' have the same sign. */ + div = left / right; + } + else { + /* Either 'a' or 'b' is negative. */ + div = -1 - (left - 1) / right; + } + + return PyLong_FromLong(div); +} + /* The / and % operators are now defined in terms of divmod(). The expression a mod b has the value a - b*floor(a/b). The long_divrem function gives the remainder after division of @@ -3459,6 +3663,30 @@ l_divmod(PyLongObject *v, PyLongObject *w, { PyLongObject *div, *mod; + if (Py_ABS(Py_SIZE(v)) == 1 && Py_ABS(Py_SIZE(w)) == 1) { + /* Fast path for single-digit longs */ + div = NULL; + if (pdiv != NULL) { + div = (PyLongObject *)fast_floor_div(v, w); + if (div == NULL) { + return -1; + } + } + if (pmod != NULL) { + mod = (PyLongObject *)fast_mod(v, w); + if (mod == NULL) { + Py_XDECREF(div); + return -1; + } + *pmod = mod; + } + if (pdiv != NULL) { + /* We only want to set `*pdiv` when `*pmod` is + set successfully. */ + *pdiv = div; + } + return 0; + } if (long_divrem(v, w, &div, &mod) < 0) return -1; if ((Py_SIZE(mod) < 0 && Py_SIZE(w) > 0) || @@ -3503,6 +3731,11 @@ long_div(PyObject *a, PyObject *b) PyLongObject *div; CHECK_BINOP(a, b); + + if (Py_ABS(Py_SIZE(a)) == 1 && Py_ABS(Py_SIZE(b)) == 1) { + return fast_floor_div((PyLongObject*)a, (PyLongObject*)b); + } + if (l_divmod((PyLongObject*)a, (PyLongObject*)b, &div, NULL) < 0) div = NULL; return (PyObject *)div; @@ -3742,9 +3975,9 @@ long_true_divide(PyObject *v, PyObject *w) /* Round by directly modifying the low digit of x. */ mask = (digit)1 << (extra_bits - 1); low = x->ob_digit[0] | inexact; - if (low & mask && low & (3*mask-1)) + if ((low & mask) && (low & (3U*mask-1U))) low += mask; - x->ob_digit[0] = low & ~(mask-1U); + x->ob_digit[0] = low & ~(2U*mask-1U); /* Convert x to a double dx; the conversion is exact. */ dx = x->ob_digit[--x_size]; @@ -3778,6 +4011,10 @@ long_mod(PyObject *a, PyObject *b) CHECK_BINOP(a, b); + if (Py_ABS(Py_SIZE(a)) == 1 && Py_ABS(Py_SIZE(b)) == 1) { + return fast_mod((PyLongObject*)a, (PyLongObject*)b); + } + if (l_divmod((PyLongObject*)a, (PyLongObject*)b, NULL, &mod) < 0) mod = NULL; return (PyObject *)mod; @@ -4012,8 +4249,10 @@ long_invert(PyLongObject *v) Py_DECREF(w); if (x == NULL) return NULL; - Py_SIZE(x) = -(Py_SIZE(x)); - return (PyObject *)maybe_small_long(x); + _PyLong_Negate(&x); + /* No need for maybe_small_long here, since any small + longs will have been caught in the Py_SIZE <= 1 fast path. */ + return (PyObject *)x; } static PyObject * @@ -4118,6 +4357,11 @@ long_lshift(PyObject *v, PyObject *w) PyErr_SetString(PyExc_ValueError, "negative shift count"); return NULL; } + + if (Py_SIZE(a) == 0) { + return PyLong_FromLong(0); + } + /* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */ wordshift = shiftby / PyLong_SHIFT; remshift = shiftby - wordshift * PyLong_SHIFT; @@ -4502,7 +4746,7 @@ simple: /* a fits into a long, so b must too */ x = PyLong_AsLong((PyObject *)a); y = PyLong_AsLong((PyObject *)b); -#elif defined(PY_LONG_LONG) && PY_LLONG_MAX >> PyLong_SHIFT >> PyLong_SHIFT +#elif PY_LLONG_MAX >> PyLong_SHIFT >> PyLong_SHIFT x = PyLong_AsLongLong((PyObject *)a); y = PyLong_AsLongLong((PyObject *)b); #else @@ -4521,7 +4765,7 @@ simple: } #if LONG_MAX >> PyLong_SHIFT >> PyLong_SHIFT return PyLong_FromLong(x); -#elif defined(PY_LONG_LONG) && PY_LLONG_MAX >> PyLong_SHIFT >> PyLong_SHIFT +#elif PY_LLONG_MAX >> PyLong_SHIFT >> PyLong_SHIFT return PyLong_FromLongLong(x); #else # error "_PyLong_GCD" diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 45849be..428d83c 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -57,7 +57,7 @@ } -Py_LOCAL_INLINE(_PyManagedBufferObject *) +static inline _PyManagedBufferObject * mbuf_alloc(void) { _PyManagedBufferObject *mbuf; @@ -221,7 +221,7 @@ PyTypeObject _PyManagedBuffer_Type = { PyDoc_STRVAR(memory_doc, -"memoryview(object)\n--\n\ +"memoryview($module, object)\n--\n\ \n\ Create a new memoryview object which references the given object."); @@ -243,7 +243,7 @@ Create a new memoryview object which references the given object."); #define HAVE_SUBOFFSETS_IN_LAST_DIM(view) \ (view->suboffsets && view->suboffsets[dest->ndim-1] >= 0) -Py_LOCAL_INLINE(int) +static inline int last_dim_is_contiguous(const Py_buffer *dest, const Py_buffer *src) { assert(dest->ndim > 0 && src->ndim > 0); @@ -259,7 +259,7 @@ last_dim_is_contiguous(const Py_buffer *dest, const Py_buffer *src) assignments, where the lvalue is already known to have a single character format. This is a performance hack that could be rewritten (if properly benchmarked). */ -Py_LOCAL_INLINE(int) +static inline int equiv_format(const Py_buffer *dest, const Py_buffer *src) { const char *dfmt, *sfmt; @@ -279,7 +279,7 @@ equiv_format(const Py_buffer *dest, const Py_buffer *src) /* Two shapes are equivalent if they are either equal or identical up to a zero element at the same position. For example, in NumPy arrays the shapes [1, 0, 5] and [1, 0, 7] are equivalent. */ -Py_LOCAL_INLINE(int) +static inline int equiv_shape(const Py_buffer *dest, const Py_buffer *src) { int i; @@ -438,7 +438,7 @@ copy_buffer(Py_buffer *dest, Py_buffer *src) } /* Initialize strides for a C-contiguous array. */ -Py_LOCAL_INLINE(void) +static inline void init_strides_from_shape(Py_buffer *view) { Py_ssize_t i; @@ -451,7 +451,7 @@ init_strides_from_shape(Py_buffer *view) } /* Initialize strides for a Fortran-contiguous array. */ -Py_LOCAL_INLINE(void) +static inline void init_fortran_strides_from_shape(Py_buffer *view) { Py_ssize_t i; @@ -513,7 +513,7 @@ buffer_to_contiguous(char *mem, Py_buffer *src, char order) /****************************************************************************/ /* Initialize values that are shared with the managed buffer. */ -Py_LOCAL_INLINE(void) +static inline void init_shared_values(Py_buffer *dest, const Py_buffer *src) { dest->obj = src->obj; @@ -553,7 +553,7 @@ init_shape_strides(Py_buffer *dest, const Py_buffer *src) } } -Py_LOCAL_INLINE(void) +static inline void init_suboffsets(Py_buffer *dest, const Py_buffer *src) { Py_ssize_t i; @@ -567,7 +567,7 @@ init_suboffsets(Py_buffer *dest, const Py_buffer *src) } /* len = product(shape) * itemsize */ -Py_LOCAL_INLINE(void) +static inline void init_len(Py_buffer *view) { Py_ssize_t i, len; @@ -614,7 +614,7 @@ init_flags(PyMemoryViewObject *mv) /* Allocate a new memoryview and perform basic initialization. New memoryviews are exclusively created through the mbuf_add functions. */ -Py_LOCAL_INLINE(PyMemoryViewObject *) +static inline PyMemoryViewObject * memory_alloc(int ndim) { PyMemoryViewObject *mv; @@ -1099,7 +1099,7 @@ memory_exit(PyObject *self, PyObject *args) #define IS_BYTE_FORMAT(f) (f == 'b' || f == 'B' || f == 'c') -Py_LOCAL_INLINE(Py_ssize_t) +static inline Py_ssize_t get_native_fmtchar(char *result, const char *fmt) { Py_ssize_t size = -1; @@ -1111,17 +1111,11 @@ get_native_fmtchar(char *result, const char *fmt) case 'h': case 'H': size = sizeof(short); break; case 'i': case 'I': size = sizeof(int); break; case 'l': case 'L': size = sizeof(long); break; - #ifdef HAVE_LONG_LONG - case 'q': case 'Q': size = sizeof(PY_LONG_LONG); break; - #endif + case 'q': case 'Q': size = sizeof(long long); break; case 'n': case 'N': size = sizeof(Py_ssize_t); break; case 'f': size = sizeof(float); break; case 'd': size = sizeof(double); break; - #ifdef HAVE_C99_BOOL case '?': size = sizeof(_Bool); break; - #else - case '?': size = sizeof(char); break; - #endif case 'P': size = sizeof(void *); break; } @@ -1133,7 +1127,7 @@ get_native_fmtchar(char *result, const char *fmt) return -1; } -Py_LOCAL_INLINE(char *) +static inline const char * get_native_fmtstr(const char *fmt) { int at = 0; @@ -1158,19 +1152,13 @@ get_native_fmtstr(const char *fmt) case 'I': RETURN("I"); case 'l': RETURN("l"); case 'L': RETURN("L"); - #ifdef HAVE_LONG_LONG case 'q': RETURN("q"); case 'Q': RETURN("Q"); - #endif case 'n': RETURN("n"); case 'N': RETURN("N"); case 'f': RETURN("f"); case 'd': RETURN("d"); - #ifdef HAVE_C99_BOOL case '?': RETURN("?"); - #else - case '?': RETURN("?"); - #endif case 'P': RETURN("P"); } @@ -1221,7 +1209,7 @@ cast_to_1D(PyMemoryViewObject *mv, PyObject *format) goto out; } - view->format = get_native_fmtstr(PyBytes_AS_STRING(asciifmt)); + view->format = (char *)get_native_fmtstr(PyBytes_AS_STRING(asciifmt)); if (view->format == NULL) { /* NOT_REACHED: get_native_fmtchar() already validates the format. */ PyErr_SetString(PyExc_RuntimeError, @@ -1581,12 +1569,11 @@ pylong_as_lu(PyObject *item) return lu; } -#ifdef HAVE_LONG_LONG -static PY_LONG_LONG +static long long pylong_as_lld(PyObject *item) { PyObject *tmp; - PY_LONG_LONG lld; + long long lld; tmp = PyNumber_Index(item); if (tmp == NULL) @@ -1597,21 +1584,20 @@ pylong_as_lld(PyObject *item) return lld; } -static unsigned PY_LONG_LONG +static unsigned long long pylong_as_llu(PyObject *item) { PyObject *tmp; - unsigned PY_LONG_LONG llu; + unsigned long long llu; tmp = PyNumber_Index(item); if (tmp == NULL) - return (unsigned PY_LONG_LONG)-1; + return (unsigned long long)-1; llu = PyLong_AsUnsignedLongLong(tmp); Py_DECREF(tmp); return llu; } -#endif static Py_ssize_t pylong_as_zd(PyObject *item) @@ -1656,13 +1642,13 @@ pylong_as_zu(PyObject *item) /* Unpack a single item. 'fmt' can be any native format character in struct module syntax. This function is very sensitive to small changes. With this layout gcc automatically generates a fast jump table. */ -Py_LOCAL_INLINE(PyObject *) +static inline PyObject * unpack_single(const char *ptr, const char *fmt) { - unsigned PY_LONG_LONG llu; + unsigned long long llu; unsigned long lu; size_t zu; - PY_LONG_LONG lld; + long long lld; long ld; Py_ssize_t zd; double d; @@ -1679,11 +1665,7 @@ unpack_single(const char *ptr, const char *fmt) case 'l': UNPACK_SINGLE(ld, ptr, long); goto convert_ld; /* boolean */ - #ifdef HAVE_C99_BOOL case '?': UNPACK_SINGLE(ld, ptr, _Bool); goto convert_bool; - #else - case '?': UNPACK_SINGLE(ld, ptr, char); goto convert_bool; - #endif /* unsigned integers */ case 'H': UNPACK_SINGLE(lu, ptr, unsigned short); goto convert_lu; @@ -1691,10 +1673,8 @@ unpack_single(const char *ptr, const char *fmt) case 'L': UNPACK_SINGLE(lu, ptr, unsigned long); goto convert_lu; /* native 64-bit */ - #ifdef HAVE_LONG_LONG - case 'q': UNPACK_SINGLE(lld, ptr, PY_LONG_LONG); goto convert_lld; - case 'Q': UNPACK_SINGLE(llu, ptr, unsigned PY_LONG_LONG); goto convert_llu; - #endif + case 'q': UNPACK_SINGLE(lld, ptr, long long); goto convert_lld; + case 'Q': UNPACK_SINGLE(llu, ptr, unsigned long long); goto convert_llu; /* ssize_t and size_t */ case 'n': UNPACK_SINGLE(zd, ptr, Py_ssize_t); goto convert_zd; @@ -1755,10 +1735,10 @@ err_format: static int pack_single(char *ptr, PyObject *item, const char *fmt) { - unsigned PY_LONG_LONG llu; + unsigned long long llu; unsigned long lu; size_t zu; - PY_LONG_LONG lld; + long long lld; long ld; Py_ssize_t zd; double d; @@ -1806,20 +1786,18 @@ pack_single(char *ptr, PyObject *item, const char *fmt) break; /* native 64-bit */ - #ifdef HAVE_LONG_LONG case 'q': lld = pylong_as_lld(item); if (lld == -1 && PyErr_Occurred()) goto err_occurred; - PACK_SINGLE(ptr, lld, PY_LONG_LONG); + PACK_SINGLE(ptr, lld, long long); break; case 'Q': llu = pylong_as_llu(item); - if (llu == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) + if (llu == (unsigned long long)-1 && PyErr_Occurred()) goto err_occurred; - PACK_SINGLE(ptr, llu, unsigned PY_LONG_LONG); + PACK_SINGLE(ptr, llu, unsigned long long); break; - #endif /* ssize_t and size_t */ case 'n': @@ -1853,11 +1831,7 @@ pack_single(char *ptr, PyObject *item, const char *fmt) ld = PyObject_IsTrue(item); if (ld < 0) return -1; /* preserve original error */ - #ifdef HAVE_C99_BOOL PACK_SINGLE(ptr, ld, _Bool); - #else - PACK_SINGLE(ptr, ld, char); - #endif break; /* bytes object */ @@ -2024,7 +1998,7 @@ struct_unpack_single(const char *ptr, struct unpacker *x) /****************************************************************************/ /* allow explicit form of native format */ -Py_LOCAL_INLINE(const char *) +static inline const char * adjust_fmt(const Py_buffer *view) { const char *fmt; @@ -2306,15 +2280,15 @@ memory_item_multi(PyMemoryViewObject *self, PyObject *tup) return unpack_single(ptr, fmt); } -Py_LOCAL_INLINE(int) +static inline int init_slice(Py_buffer *base, PyObject *key, int dim) { Py_ssize_t start, stop, step, slicelength; - if (PySlice_Unpack(key, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(key, base->shape[dim], + &start, &stop, &step, &slicelength) < 0) { return -1; } - slicelength = PySlice_AdjustIndices(base->shape[dim], &start, &stop, step); if (base->suboffsets == NULL || dim == 0) { @@ -2628,7 +2602,7 @@ struct_unpack_cmp(const char *p, const char *q, equal = (x == y); \ } while (0) -Py_LOCAL_INLINE(int) +static inline int unpack_cmp(const char *p, const char *q, char fmt, struct unpacker *unpack_p, struct unpacker *unpack_q) { @@ -2644,11 +2618,7 @@ unpack_cmp(const char *p, const char *q, char fmt, case 'l': CMP_SINGLE(p, q, long); return equal; /* boolean */ - #ifdef HAVE_C99_BOOL case '?': CMP_SINGLE(p, q, _Bool); return equal; - #else - case '?': CMP_SINGLE(p, q, char); return equal; - #endif /* unsigned integers */ case 'H': CMP_SINGLE(p, q, unsigned short); return equal; @@ -2656,10 +2626,8 @@ unpack_cmp(const char *p, const char *q, char fmt, case 'L': CMP_SINGLE(p, q, unsigned long); return equal; /* native 64-bit */ - #ifdef HAVE_LONG_LONG - case 'q': CMP_SINGLE(p, q, PY_LONG_LONG); return equal; - case 'Q': CMP_SINGLE(p, q, unsigned PY_LONG_LONG); return equal; - #endif + case 'q': CMP_SINGLE(p, q, long long); return equal; + case 'Q': CMP_SINGLE(p, q, unsigned long long); return equal; /* ssize_t and size_t */ case 'n': CMP_SINGLE(p, q, Py_ssize_t); return equal; diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 946357f..c2001f0 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -97,6 +97,11 @@ PyCFunction_Call(PyObject *func, PyObject *args, PyObject *kwds) if (flags == (METH_VARARGS | METH_KEYWORDS)) { res = (*(PyCFunctionWithKeywords)meth)(self, args, kwds); } + else if (flags == METH_FASTCALL) { + PyObject **stack = &PyTuple_GET_ITEM(args, 0); + Py_ssize_t nargs = PyTuple_GET_SIZE(args); + res = _PyCFunction_FastCallDict(func, stack, nargs, kwds); + } else { if (kwds != NULL && PyDict_Size(kwds) != 0) { PyErr_Format(PyExc_TypeError, "%.200s() takes no keyword arguments", @@ -145,6 +150,153 @@ PyCFunction_Call(PyObject *func, PyObject *args, PyObject *kwds) return _Py_CheckFunctionResult(func, res, NULL); } +PyObject * +_PyCFunction_FastCallDict(PyObject *func_obj, PyObject **args, Py_ssize_t nargs, + PyObject *kwargs) +{ + PyCFunctionObject *func = (PyCFunctionObject*)func_obj; + PyCFunction meth = PyCFunction_GET_FUNCTION(func); + PyObject *self = PyCFunction_GET_SELF(func); + PyObject *result; + int flags; + + assert(PyCFunction_Check(func)); + assert(func != NULL); + assert(nargs >= 0); + assert(nargs == 0 || args != NULL); + assert(kwargs == NULL || PyDict_Check(kwargs)); + + /* _PyCFunction_FastCallDict() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller loses its exception */ + assert(!PyErr_Occurred()); + + flags = PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST); + + switch (flags) + { + case METH_NOARGS: + if (kwargs != NULL && PyDict_Size(kwargs) != 0) { + PyErr_Format(PyExc_TypeError, "%.200s() takes no keyword arguments", + func->m_ml->ml_name); + return NULL; + } + + if (nargs != 0) { + PyErr_Format(PyExc_TypeError, + "%.200s() takes no arguments (%zd given)", + func->m_ml->ml_name, nargs); + return NULL; + } + + result = (*meth) (self, NULL); + break; + + case METH_O: + if (kwargs != NULL && PyDict_Size(kwargs) != 0) { + PyErr_Format(PyExc_TypeError, "%.200s() takes no keyword arguments", + func->m_ml->ml_name); + return NULL; + } + + if (nargs != 1) { + PyErr_Format(PyExc_TypeError, + "%.200s() takes exactly one argument (%zd given)", + func->m_ml->ml_name, nargs); + return NULL; + } + + result = (*meth) (self, args[0]); + break; + + case METH_VARARGS: + case METH_VARARGS | METH_KEYWORDS: + { + /* Slow-path: create a temporary tuple */ + PyObject *tuple; + + if (!(flags & METH_KEYWORDS) && kwargs != NULL && PyDict_Size(kwargs) != 0) { + PyErr_Format(PyExc_TypeError, + "%.200s() takes no keyword arguments", + func->m_ml->ml_name); + return NULL; + } + + tuple = _PyStack_AsTuple(args, nargs); + if (tuple == NULL) { + return NULL; + } + + if (flags & METH_KEYWORDS) { + result = (*(PyCFunctionWithKeywords)meth) (self, tuple, kwargs); + } + else { + result = (*meth) (self, tuple); + } + Py_DECREF(tuple); + break; + } + + case METH_FASTCALL: + { + PyObject **stack; + PyObject *kwnames; + _PyCFunctionFast fastmeth = (_PyCFunctionFast)meth; + + stack = _PyStack_UnpackDict(args, nargs, kwargs, &kwnames, func_obj); + if (stack == NULL) { + return NULL; + } + + result = (*fastmeth) (self, stack, nargs, kwnames); + if (stack != args) { + PyMem_Free(stack); + } + Py_XDECREF(kwnames); + break; + } + + default: + PyErr_SetString(PyExc_SystemError, + "Bad call flags in PyCFunction_Call. " + "METH_OLDARGS is no longer supported!"); + return NULL; + } + + result = _Py_CheckFunctionResult(func_obj, result, NULL); + + return result; +} + +PyObject * +_PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack, + Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *kwdict, *result; + Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); + + assert(PyCFunction_Check(func)); + assert(nargs >= 0); + assert(kwnames == NULL || PyTuple_CheckExact(kwnames)); + assert((nargs == 0 && nkwargs == 0) || stack != NULL); + /* kwnames must only contains str strings, no subclass, and all keys must + be unique */ + + if (nkwargs > 0) { + kwdict = _PyStack_AsDict(stack + nargs, kwnames); + if (kwdict == NULL) { + return NULL; + } + } + else { + kwdict = NULL; + } + + result = _PyCFunction_FastCallDict(func, stack, nargs, kwdict); + Py_XDECREF(kwdict); + return result; +} + /* Methods (the standard built-in methods, that is) */ static void diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index ae72da6..79be51a 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -380,7 +380,7 @@ PyModule_ExecDef(PyObject *module, PyModuleDef *def) for (cur_slot = def->m_slots; cur_slot && cur_slot->slot; cur_slot++) { switch (cur_slot->slot) { case Py_mod_create: - /* handled in PyModule_CreateFromSlots */ + /* handled in PyModule_FromDefAndSpec2 */ break; case Py_mod_exec: ret = ((int (*)(PyObject *))cur_slot->value)(module); @@ -450,8 +450,7 @@ PyModule_GetDict(PyObject *m) return NULL; } d = ((PyModuleObject *)m) -> md_dict; - if (d == NULL) - ((PyModuleObject *)m) -> md_dict = d = PyDict_New(); + assert(d != NULL); return d; } @@ -484,7 +483,7 @@ PyModule_GetName(PyObject *m) if (name == NULL) return NULL; Py_DECREF(name); /* module dict has still a reference */ - return _PyUnicode_AsString(name); + return PyUnicode_AsUTF8(name); } PyObject* @@ -517,7 +516,7 @@ PyModule_GetFilename(PyObject *m) fileobj = PyModule_GetFilenameObject(m); if (fileobj == NULL) return NULL; - utf8 = _PyUnicode_AsString(fileobj); + utf8 = PyUnicode_AsUTF8(fileobj); Py_DECREF(fileobj); /* module dict has still a reference */ return utf8; } @@ -570,7 +569,7 @@ _PyModule_ClearDict(PyObject *d) if (PyUnicode_READ_CHAR(key, 0) == '_' && PyUnicode_READ_CHAR(key, 1) != '_') { if (Py_VerboseFlag > 1) { - const char *s = _PyUnicode_AsString(key); + const char *s = PyUnicode_AsUTF8(key); if (s != NULL) PySys_WriteStderr("# clear[1] %s\n", s); else @@ -590,7 +589,7 @@ _PyModule_ClearDict(PyObject *d) !_PyUnicode_EqualToASCIIString(key, "__builtins__")) { if (Py_VerboseFlag > 1) { - const char *s = _PyUnicode_AsString(key); + const char *s = PyUnicode_AsUTF8(key); if (s != NULL) PySys_WriteStderr("# clear[2] %s\n", s); else diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c index 3d27a95..0bb3063 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -1,4 +1,4 @@ -/* namespace object implementation */ +// namespace object implementation #include "Python.h" #include "structmember.h" @@ -16,7 +16,7 @@ static PyMemberDef namespace_members[] = { }; -/* Methods */ +// Methods static PyObject * namespace_new(PyTypeObject *type, PyObject *args, PyObject *kwds) @@ -40,7 +40,7 @@ namespace_new(PyTypeObject *type, PyObject *args, PyObject *kwds) static int namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds) { - /* ignore args if it's NULL or empty */ + // ignore args if it's NULL or empty if (args != NULL) { Py_ssize_t argcount = PyObject_Size(args); if (argcount < 0) @@ -191,7 +191,7 @@ namespace_reduce(_PyNamespaceObject *ns) static PyMethodDef namespace_methods[] = { {"__reduce__", (PyCFunction)namespace_reduce, METH_NOARGS, namespace_reduce__doc__}, - {NULL, NULL} /* sentinel */ + {NULL, NULL} // sentinel }; diff --git a/Objects/object.c b/Objects/object.c index d21fd90..d88ae3b 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -22,12 +22,6 @@ _Py_GetRefTotal(void) { PyObject *o; Py_ssize_t total = _Py_RefTotal; - /* ignore the references to the dummy object of the dicts and sets - because they are not reliable and not useful (now that the - hash table code is well-tested) */ - o = _PyDict_Dummy(); - if (o != NULL) - total -= o->ob_refcnt; o = _PySet_Dummy; if (o != NULL) total -= o->ob_refcnt; @@ -109,6 +103,15 @@ void dump_counts(FILE* f) { PyTypeObject *tp; + PyObject *xoptions, *value; + _Py_IDENTIFIER(showalloccount); + + xoptions = PySys_GetXOptions(); + if (xoptions == NULL) + return; + value = _PyDict_GetItemId(xoptions, &PyId_showalloccount); + if (value != Py_True) + return; for (tp = type_list; tp; tp = tp->tp_next) fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, " @@ -644,7 +647,7 @@ PyObject_Bytes(PyObject *v) /* Map rich comparison operators to their swapped version, e.g. LT <--> GT */ int _Py_SwappedOp[] = {Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE}; -static char *opstrings[] = {"<", "<=", "==", "!=", ">", ">="}; +static const char * const opstrings[] = {"<", "<=", "==", "!=", ">", ">="}; /* Perform a rich comparison, raising TypeError when the requested comparison operator is not supported. */ @@ -686,11 +689,10 @@ do_richcompare(PyObject *v, PyObject *w, int op) res = (v != w) ? Py_True : Py_False; break; default: - /* XXX Special-case None so it doesn't show as NoneType() */ PyErr_Format(PyExc_TypeError, - "unorderable types: %.100s() %s %.100s()", - v->ob_type->tp_name, + "'%s' not supported between instances of '%.100s' and '%.100s'", opstrings[op], + v->ob_type->tp_name, w->ob_type->tp_name); return NULL; } @@ -888,7 +890,7 @@ PyObject_GetAttr(PyObject *v, PyObject *name) if (tp->tp_getattro != NULL) return (*tp->tp_getattro)(v, name); if (tp->tp_getattr != NULL) { - char *name_str = _PyUnicode_AsString(name); + char *name_str = PyUnicode_AsUTF8(name); if (name_str == NULL) return NULL; return (*tp->tp_getattr)(v, name_str); @@ -932,7 +934,7 @@ PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value) return err; } if (tp->tp_setattr != NULL) { - char *name_str = _PyUnicode_AsString(name); + char *name_str = PyUnicode_AsUTF8(name); if (name_str == NULL) return -1; err = (*tp->tp_setattr)(v, name_str, value); @@ -1041,8 +1043,7 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name, PyObject *dict) name->ob_type->tp_name); return NULL; } - else - Py_INCREF(name); + Py_INCREF(name); if (tp->tp_dict == NULL) { if (PyType_Ready(tp) < 0) @@ -1050,10 +1051,10 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name, PyObject *dict) } descr = _PyType_Lookup(tp, name); - Py_XINCREF(descr); f = NULL; if (descr != NULL) { + Py_INCREF(descr); f = descr->ob_type->tp_descr_get; if (f != NULL && PyDescr_IsData(descr)) { res = f(descr, obj, (PyObject *)obj->ob_type); @@ -1073,8 +1074,9 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name, PyObject *dict) if (tsize < 0) tsize = -tsize; size = _PyObject_VAR_SIZE(tp, tsize); + assert(size <= PY_SSIZE_T_MAX); - dictoffset += (long)size; + dictoffset += (Py_ssize_t)size; assert(dictoffset > 0); assert(dictoffset % SIZEOF_VOID_P == 0); } @@ -1142,12 +1144,11 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name, Py_INCREF(name); descr = _PyType_Lookup(tp, name); - Py_XINCREF(descr); - f = NULL; if (descr != NULL) { + Py_INCREF(descr); f = descr->ob_type->tp_descr_set; - if (f != NULL && PyDescr_IsData(descr)) { + if (f != NULL) { res = f(descr, obj, value); goto done; } @@ -1155,40 +1156,32 @@ _PyObject_GenericSetAttrWithDict(PyObject *obj, PyObject *name, if (dict == NULL) { dictptr = _PyObject_GetDictPtr(obj); - if (dictptr != NULL) { - res = _PyObjectDict_SetItem(Py_TYPE(obj), dictptr, name, value); - if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError)) - PyErr_SetObject(PyExc_AttributeError, name); + if (dictptr == NULL) { + if (descr == NULL) { + PyErr_Format(PyExc_AttributeError, + "'%.100s' object has no attribute '%U'", + tp->tp_name, name); + } + else { + PyErr_Format(PyExc_AttributeError, + "'%.50s' object attribute '%U' is read-only", + tp->tp_name, name); + } goto done; } + res = _PyObjectDict_SetItem(tp, dictptr, name, value); } - if (dict != NULL) { + else { Py_INCREF(dict); if (value == NULL) res = PyDict_DelItem(dict, name); else res = PyDict_SetItem(dict, name, value); Py_DECREF(dict); - if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError)) - PyErr_SetObject(PyExc_AttributeError, name); - goto done; - } - - if (f != NULL) { - res = f(descr, obj, value); - goto done; } + if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError)) + PyErr_SetObject(PyExc_AttributeError, name); - if (descr == NULL) { - PyErr_Format(PyExc_AttributeError, - "'%.100s' object has no attribute '%U'", - tp->tp_name, name); - goto done; - } - - PyErr_Format(PyExc_AttributeError, - "'%.50s' object attribute '%U' is read-only", - tp->tp_name, name); done: Py_XDECREF(descr); Py_DECREF(name); @@ -1204,7 +1197,7 @@ PyObject_GenericSetAttr(PyObject *obj, PyObject *name, PyObject *value) int PyObject_GenericSetDict(PyObject *obj, PyObject *value, void *context) { - PyObject *dict, **dictptr = _PyObject_GetDictPtr(obj); + PyObject **dictptr = _PyObject_GetDictPtr(obj); if (dictptr == NULL) { PyErr_SetString(PyExc_AttributeError, "This object has no __dict__"); @@ -1220,10 +1213,8 @@ PyObject_GenericSetDict(PyObject *obj, PyObject *value, void *context) "not a '%.200s'", Py_TYPE(value)->tp_name); return -1; } - dict = *dictptr; - Py_XINCREF(value); - *dictptr = value; - Py_XDECREF(dict); + Py_INCREF(value); + Py_XSETREF(*dictptr, value); return 0; } diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 9dd8421..a1142f3 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1,31 +1,42 @@ #include "Python.h" +#include + + +/* Defined in tracemalloc.c */ +extern void _PyMem_DumpTraceback(int fd, const void *ptr); + + /* Python's malloc wrappers (see pymem.h) */ -#ifdef PYMALLOC_DEBUG /* WITH_PYMALLOC && PYMALLOC_DEBUG */ +#undef uint +#define uint unsigned int /* assuming >= 16 bits */ + /* Forward declaration */ +static void* _PyMem_DebugRawMalloc(void *ctx, size_t size); +static void* _PyMem_DebugRawCalloc(void *ctx, size_t nelem, size_t elsize); +static void* _PyMem_DebugRawRealloc(void *ctx, void *ptr, size_t size); +static void _PyMem_DebugRawFree(void *ctx, void *p); + static void* _PyMem_DebugMalloc(void *ctx, size_t size); static void* _PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize); -static void _PyMem_DebugFree(void *ctx, void *p); static void* _PyMem_DebugRealloc(void *ctx, void *ptr, size_t size); +static void _PyMem_DebugFree(void *ctx, void *p); static void _PyObject_DebugDumpAddress(const void *p); static void _PyMem_DebugCheckAddress(char api_id, const void *p); -#endif #if defined(__has_feature) /* Clang */ #if __has_feature(address_sanitizer) /* is ASAN enabled? */ #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ - __attribute__((no_address_safety_analysis)) \ - __attribute__ ((noinline)) + __attribute__((no_address_safety_analysis)) #else #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS #endif #else #if defined(__SANITIZE_ADDRESS__) /* GCC 4.8.x, is ASAN enabled? */ #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ - __attribute__((no_address_safety_analysis)) \ - __attribute__ ((noinline)) + __attribute__((no_address_safety_analysis)) #else #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS #endif @@ -145,9 +156,8 @@ _PyObject_ArenaFree(void *ctx, void *ptr, size_t size) #else # define PYOBJ_FUNCS PYRAW_FUNCS #endif -#define PYMEM_FUNCS PYRAW_FUNCS +#define PYMEM_FUNCS PYOBJ_FUNCS -#ifdef PYMALLOC_DEBUG typedef struct { /* We tag each block with an API ID in order to tag API violations */ char api_id; @@ -163,19 +173,21 @@ static struct { {'o', {NULL, PYOBJ_FUNCS}} }; -#define PYDBG_FUNCS _PyMem_DebugMalloc, _PyMem_DebugCalloc, _PyMem_DebugRealloc, _PyMem_DebugFree -#endif +#define PYRAWDBG_FUNCS \ + _PyMem_DebugRawMalloc, _PyMem_DebugRawCalloc, _PyMem_DebugRawRealloc, _PyMem_DebugRawFree +#define PYDBG_FUNCS \ + _PyMem_DebugMalloc, _PyMem_DebugCalloc, _PyMem_DebugRealloc, _PyMem_DebugFree static PyMemAllocatorEx _PyMem_Raw = { -#ifdef PYMALLOC_DEBUG - &_PyMem_Debug.raw, PYDBG_FUNCS +#ifdef Py_DEBUG + &_PyMem_Debug.raw, PYRAWDBG_FUNCS #else NULL, PYRAW_FUNCS #endif }; static PyMemAllocatorEx _PyMem = { -#ifdef PYMALLOC_DEBUG +#ifdef Py_DEBUG &_PyMem_Debug.mem, PYDBG_FUNCS #else NULL, PYMEM_FUNCS @@ -183,16 +195,76 @@ static PyMemAllocatorEx _PyMem = { }; static PyMemAllocatorEx _PyObject = { -#ifdef PYMALLOC_DEBUG +#ifdef Py_DEBUG &_PyMem_Debug.obj, PYDBG_FUNCS #else NULL, PYOBJ_FUNCS #endif }; +int +_PyMem_SetupAllocators(const char *opt) +{ + if (opt == NULL || *opt == '\0') { + /* PYTHONMALLOC is empty or is not set or ignored (-E/-I command line + options): use default allocators */ +#ifdef Py_DEBUG +# ifdef WITH_PYMALLOC + opt = "pymalloc_debug"; +# else + opt = "malloc_debug"; +# endif +#else + /* !Py_DEBUG */ +# ifdef WITH_PYMALLOC + opt = "pymalloc"; +# else + opt = "malloc"; +# endif +#endif + } + + if (strcmp(opt, "debug") == 0) { + PyMem_SetupDebugHooks(); + } + else if (strcmp(opt, "malloc") == 0 || strcmp(opt, "malloc_debug") == 0) + { + PyMemAllocatorEx alloc = {NULL, PYRAW_FUNCS}; + + PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &alloc); + PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &alloc); + PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &alloc); + + if (strcmp(opt, "malloc_debug") == 0) + PyMem_SetupDebugHooks(); + } +#ifdef WITH_PYMALLOC + else if (strcmp(opt, "pymalloc") == 0 + || strcmp(opt, "pymalloc_debug") == 0) + { + PyMemAllocatorEx raw_alloc = {NULL, PYRAW_FUNCS}; + PyMemAllocatorEx mem_alloc = {NULL, PYMEM_FUNCS}; + PyMemAllocatorEx obj_alloc = {NULL, PYOBJ_FUNCS}; + + PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &raw_alloc); + PyMem_SetAllocator(PYMEM_DOMAIN_MEM, &mem_alloc); + PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &obj_alloc); + + if (strcmp(opt, "pymalloc_debug") == 0) + PyMem_SetupDebugHooks(); + } +#endif + else { + /* unknown allocator */ + return -1; + } + return 0; +} + #undef PYRAW_FUNCS #undef PYMEM_FUNCS #undef PYOBJ_FUNCS +#undef PYRAWDBG_FUNCS #undef PYDBG_FUNCS static PyObjectArenaAllocator _PyObject_Arena = {NULL, @@ -205,23 +277,46 @@ static PyObjectArenaAllocator _PyObject_Arena = {NULL, #endif }; +#ifdef WITH_PYMALLOC +static int +_PyMem_DebugEnabled(void) +{ + return (_PyObject.malloc == _PyMem_DebugMalloc); +} + +int +_PyMem_PymallocEnabled(void) +{ + if (_PyMem_DebugEnabled()) { + return (_PyMem_Debug.obj.alloc.malloc == _PyObject_Malloc); + } + else { + return (_PyObject.malloc == _PyObject_Malloc); + } +} +#endif + void PyMem_SetupDebugHooks(void) { -#ifdef PYMALLOC_DEBUG PyMemAllocatorEx alloc; - alloc.malloc = _PyMem_DebugMalloc; - alloc.calloc = _PyMem_DebugCalloc; - alloc.realloc = _PyMem_DebugRealloc; - alloc.free = _PyMem_DebugFree; + alloc.malloc = _PyMem_DebugRawMalloc; + alloc.calloc = _PyMem_DebugRawCalloc; + alloc.realloc = _PyMem_DebugRawRealloc; + alloc.free = _PyMem_DebugRawFree; - if (_PyMem_Raw.malloc != _PyMem_DebugMalloc) { + if (_PyMem_Raw.malloc != _PyMem_DebugRawMalloc) { alloc.ctx = &_PyMem_Debug.raw; PyMem_GetAllocator(PYMEM_DOMAIN_RAW, &_PyMem_Debug.raw.alloc); PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &alloc); } + alloc.malloc = _PyMem_DebugMalloc; + alloc.calloc = _PyMem_DebugCalloc; + alloc.realloc = _PyMem_DebugRealloc; + alloc.free = _PyMem_DebugFree; + if (_PyMem.malloc != _PyMem_DebugMalloc) { alloc.ctx = &_PyMem_Debug.mem; PyMem_GetAllocator(PYMEM_DOMAIN_MEM, &_PyMem_Debug.mem.alloc); @@ -233,7 +328,6 @@ PyMem_SetupDebugHooks(void) PyMem_GetAllocator(PYMEM_DOMAIN_OBJ, &_PyMem_Debug.obj.alloc); PyMem_SetAllocator(PYMEM_DOMAIN_OBJ, &alloc); } -#endif } void @@ -264,7 +358,6 @@ PyMem_SetAllocator(PyMemAllocatorDomain domain, PyMemAllocatorEx *allocator) case PYMEM_DOMAIN_OBJ: _PyObject = *allocator; break; /* ignore unknown domain */ } - } void @@ -642,24 +735,8 @@ static int running_on_valgrind = -1; #define SIMPLELOCK_LOCK(lock) /* acquire released lock */ #define SIMPLELOCK_UNLOCK(lock) /* release acquired lock */ -/* - * Basic types - * I don't care if these are defined in or elsewhere. Axiom. - */ -#undef uchar -#define uchar unsigned char /* assuming == 8 bits */ - -#undef uint -#define uint unsigned int /* assuming >= 16 bits */ - -#undef ulong -#define ulong unsigned long /* assuming >= 32 bits */ - -#undef uptr -#define uptr Py_uintptr_t - /* When you say memory, my mind reasons in terms of (pointers to) blocks */ -typedef uchar block; +typedef uint8_t block; /* Pool for small blocks. */ struct pool_header { @@ -683,7 +760,7 @@ struct arena_object { * here to mark an arena_object that doesn't correspond to an * allocated arena. */ - uptr address; + uintptr_t address; /* Pool-aligned pointer to the next pool to be carved off. */ block* pool_address; @@ -834,7 +911,7 @@ on that C doesn't insert any padding anywhere in a pool_header at or before the prevpool member. **************************************************************************** */ -#define PTA(x) ((poolp )((uchar *)&(usedpools[2*(x)]) - 2*sizeof(block *))) +#define PTA(x) ((poolp )((uint8_t *)&(usedpools[2*(x)]) - 2*sizeof(block *))) #define PT(x) PTA(x), PTA(x) static poolp usedpools[2 * ((NB_SMALL_SIZE_CLASSES + 7) / 8) * 8] = { @@ -949,11 +1026,15 @@ new_arena(void) struct arena_object* arenaobj; uint excess; /* number of bytes above pool alignment */ void *address; + static int debug_stats = -1; -#ifdef PYMALLOC_DEBUG - if (Py_GETENV("PYTHONMALLOCSTATS")) + if (debug_stats == -1) { + char *opt = Py_GETENV("PYTHONMALLOCSTATS"); + debug_stats = (opt != NULL && *opt != '\0'); + } + if (debug_stats) _PyObject_DebugMallocStats(stderr); -#endif + if (unused_arena_objects == NULL) { uint i; uint numarenas; @@ -966,7 +1047,7 @@ new_arena(void) if (numarenas <= maxarenas) return NULL; /* overflow */ #if SIZEOF_SIZE_T <= SIZEOF_INT - if (numarenas > PY_SIZE_MAX / sizeof(*arenas)) + if (numarenas > SIZE_MAX / sizeof(*arenas)) return NULL; /* overflow */ #endif nbytes = numarenas * sizeof(*arenas); @@ -1010,7 +1091,7 @@ new_arena(void) unused_arena_objects = arenaobj; return NULL; } - arenaobj->address = (uptr)address; + arenaobj->address = (uintptr_t)address; ++narenas_currently_allocated; ++ntimes_arena_allocated; @@ -1033,13 +1114,13 @@ new_arena(void) } /* -Py_ADDRESS_IN_RANGE(P, POOL) +address_in_range(P, POOL) Return true if and only if P is an address that was allocated by pymalloc. POOL must be the pool address associated with P, i.e., POOL = POOL_ADDR(P) (the caller is asked to compute this because the macro expands POOL more than once, and for efficiency it's best for the caller to assign POOL_ADDR(P) to a -variable and pass the latter to the macro; because Py_ADDRESS_IN_RANGE is +variable and pass the latter to the macro; because address_in_range is called on every alloc/realloc/free, micro-efficiency is important here). Tricky: Let B be the arena base address associated with the pool, B = @@ -1064,7 +1145,7 @@ arenas[(POOL)->arenaindex]. Suppose obmalloc controls P. Then (barring wild stores, etc), POOL is the correct address of P's pool, AO.address is the correct base address of the pool's arena, and P must be within ARENA_SIZE of AO.address. In addition, AO.address is not 0 (no arena can start at address 0 -(NULL)). Therefore Py_ADDRESS_IN_RANGE correctly reports that obmalloc +(NULL)). Therefore address_in_range correctly reports that obmalloc controls P. Now suppose obmalloc does not control P (e.g., P was obtained via a direct @@ -1105,51 +1186,21 @@ that this test determines whether an arbitrary address is controlled by obmalloc in a small constant time, independent of the number of arenas obmalloc controls. Since this test is needed at every entry point, it's extremely desirable that it be this fast. - -Since Py_ADDRESS_IN_RANGE may be reading from memory which was not allocated -by Python, it is important that (POOL)->arenaindex is read only once, as -another thread may be concurrently modifying the value without holding the -GIL. To accomplish this, the arenaindex_temp variable is used to store -(POOL)->arenaindex for the duration of the Py_ADDRESS_IN_RANGE macro's -execution. The caller of the macro is responsible for declaring this -variable. */ -#define Py_ADDRESS_IN_RANGE(P, POOL) \ - ((arenaindex_temp = (POOL)->arenaindex) < maxarenas && \ - (uptr)(P) - arenas[arenaindex_temp].address < (uptr)ARENA_SIZE && \ - arenas[arenaindex_temp].address != 0) - - -/* This is only useful when running memory debuggers such as - * Purify or Valgrind. Uncomment to use. - * -#define Py_USING_MEMORY_DEBUGGER - */ - -#ifdef Py_USING_MEMORY_DEBUGGER -/* Py_ADDRESS_IN_RANGE may access uninitialized memory by design - * This leads to thousands of spurious warnings when using - * Purify or Valgrind. By making a function, we can easily - * suppress the uninitialized memory reads in this one function. - * So we won't ignore real errors elsewhere. - * - * Disable the macro and use a function. - */ - -#undef Py_ADDRESS_IN_RANGE - -#if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \ - (__GNUC__ >= 4)) -#define Py_NO_INLINE __attribute__((__noinline__)) -#else -#define Py_NO_INLINE -#endif - -/* Don't make static, to try to ensure this isn't inlined. */ -int Py_ADDRESS_IN_RANGE(void *P, poolp pool) Py_NO_INLINE; -#undef Py_NO_INLINE -#endif +static bool ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS +address_in_range(void *p, poolp pool) +{ + // Since address_in_range may be reading from memory which was not allocated + // by Python, it is important that pool->arenaindex is read only once, as + // another thread may be concurrently modifying the value without holding + // the GIL. The following dance forces the compiler to read pool->arenaindex + // only once. + uint arenaindex = *((volatile uint *)&pool->arenaindex); + return arenaindex < maxarenas && + (uintptr_t)p - arenas[arenaindex].address < ARENA_SIZE && + arenas[arenaindex].address != 0; +} /*==========================================================================*/ @@ -1176,7 +1227,7 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) _Py_AllocatedBlocks++; - assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize); + assert(nelem <= PY_SSIZE_T_MAX / elsize); nbytes = nelem * elsize; #ifdef WITH_VALGRIND @@ -1394,7 +1445,6 @@ _PyObject_Calloc(void *ctx, size_t nelem, size_t elsize) /* free */ -ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS static void _PyObject_Free(void *ctx, void *p) { @@ -1402,9 +1452,6 @@ _PyObject_Free(void *ctx, void *p) block *lastfree; poolp next, prev; uint size; -#ifndef Py_USING_MEMORY_DEBUGGER - uint arenaindex_temp; -#endif if (p == NULL) /* free(NULL) has no effect */ return; @@ -1417,7 +1464,7 @@ _PyObject_Free(void *ctx, void *p) #endif pool = POOL_ADDR(p); - if (Py_ADDRESS_IN_RANGE(p, pool)) { + if (address_in_range(p, pool)) { /* We allocated this address. */ LOCK(); /* Link p to the start of the pool's freeblock list. Since @@ -1623,16 +1670,12 @@ redirect: * return a non-NULL result. */ -ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS static void * _PyObject_Realloc(void *ctx, void *p, size_t nbytes) { void *bp; poolp pool; size_t size; -#ifndef Py_USING_MEMORY_DEBUGGER - uint arenaindex_temp; -#endif if (p == NULL) return _PyObject_Alloc(0, ctx, 1, nbytes); @@ -1644,7 +1687,7 @@ _PyObject_Realloc(void *ctx, void *p, size_t nbytes) #endif pool = POOL_ADDR(p); - if (Py_ADDRESS_IN_RANGE(p, pool)) { + if (address_in_range(p, pool)) { /* We're in charge of this block */ size = INDEX2SIZE(pool->szidx); if (nbytes <= size) { @@ -1709,7 +1752,7 @@ _Py_GetAllocatedBlocks(void) #endif /* WITH_PYMALLOC */ -#ifdef PYMALLOC_DEBUG + /*==========================================================================*/ /* A x-platform debugging allocator. This doesn't manage memory directly, * it wraps a real allocator, adding extra debugging info to the memory blocks. @@ -1743,7 +1786,7 @@ bumpserialno(void) static size_t read_size_t(const void *p) { - const uchar *q = (const uchar *)p; + const uint8_t *q = (const uint8_t *)p; size_t result = *q++; int i; @@ -1758,40 +1801,15 @@ read_size_t(const void *p) static void write_size_t(void *p, size_t n) { - uchar *q = (uchar *)p + SST - 1; + uint8_t *q = (uint8_t *)p + SST - 1; int i; for (i = SST; --i >= 0; --q) { - *q = (uchar)(n & 0xff); + *q = (uint8_t)(n & 0xff); n >>= 8; } } -#ifdef Py_DEBUG -/* Is target in the list? The list is traversed via the nextpool pointers. - * The list may be NULL-terminated, or circular. Return 1 if target is in - * list, else 0. - */ -static int -pool_is_in_list(const poolp target, poolp list) -{ - poolp origlist = list; - assert(target != NULL); - if (list == NULL) - return 0; - do { - if (target == list) - return 1; - list = list->nextpool; - } while (list != NULL && list != origlist); - return 0; -} - -#else -#define pool_is_in_list(X, Y) 1 - -#endif /* Py_DEBUG */ - /* Let S = sizeof(size_t). The debug malloc asks for 4*S extra bytes and fills them with useful stuff, here calling the underlying malloc's result p: @@ -1819,11 +1837,11 @@ p[2*S+n+S: 2*S+n+2*S] */ static void * -_PyMem_DebugAlloc(int use_calloc, void *ctx, size_t nbytes) +_PyMem_DebugRawAlloc(int use_calloc, void *ctx, size_t nbytes) { debug_alloc_api_t *api = (debug_alloc_api_t *)ctx; - uchar *p; /* base address of malloc'ed block */ - uchar *tail; /* p + 2*SST + nbytes == pointer to tail pad bytes */ + uint8_t *p; /* base address of malloc'ed block */ + uint8_t *tail; /* p + 2*SST + nbytes == pointer to tail pad bytes */ size_t total; /* nbytes + 4*SST */ bumpserialno(); @@ -1833,15 +1851,15 @@ _PyMem_DebugAlloc(int use_calloc, void *ctx, size_t nbytes) return NULL; if (use_calloc) - p = (uchar *)api->alloc.calloc(api->alloc.ctx, 1, total); + p = (uint8_t *)api->alloc.calloc(api->alloc.ctx, 1, total); else - p = (uchar *)api->alloc.malloc(api->alloc.ctx, total); + p = (uint8_t *)api->alloc.malloc(api->alloc.ctx, total); if (p == NULL) return NULL; /* at p, write size (SST bytes), id (1 byte), pad (SST-1 bytes) */ write_size_t(p, nbytes); - p[SST] = (uchar)api->api_id; + p[SST] = (uint8_t)api->api_id; memset(p + SST + 1, FORBIDDENBYTE, SST-1); if (nbytes > 0 && !use_calloc) @@ -1856,18 +1874,18 @@ _PyMem_DebugAlloc(int use_calloc, void *ctx, size_t nbytes) } static void * -_PyMem_DebugMalloc(void *ctx, size_t nbytes) +_PyMem_DebugRawMalloc(void *ctx, size_t nbytes) { - return _PyMem_DebugAlloc(0, ctx, nbytes); + return _PyMem_DebugRawAlloc(0, ctx, nbytes); } static void * -_PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize) +_PyMem_DebugRawCalloc(void *ctx, size_t nelem, size_t elsize) { size_t nbytes; assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize); nbytes = nelem * elsize; - return _PyMem_DebugAlloc(1, ctx, nbytes); + return _PyMem_DebugRawAlloc(1, ctx, nbytes); } /* The debug free first checks the 2*SST bytes on each end for sanity (in @@ -1876,10 +1894,10 @@ _PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize) Then calls the underlying free. */ static void -_PyMem_DebugFree(void *ctx, void *p) +_PyMem_DebugRawFree(void *ctx, void *p) { debug_alloc_api_t *api = (debug_alloc_api_t *)ctx; - uchar *q = (uchar *)p - 2*SST; /* address returned from malloc */ + uint8_t *q = (uint8_t *)p - 2*SST; /* address returned from malloc */ size_t nbytes; if (p == NULL) @@ -1893,17 +1911,17 @@ _PyMem_DebugFree(void *ctx, void *p) } static void * -_PyMem_DebugRealloc(void *ctx, void *p, size_t nbytes) +_PyMem_DebugRawRealloc(void *ctx, void *p, size_t nbytes) { debug_alloc_api_t *api = (debug_alloc_api_t *)ctx; - uchar *q = (uchar *)p, *oldq; - uchar *tail; + uint8_t *q = (uint8_t *)p, *oldq; + uint8_t *tail; size_t total; /* nbytes + 4*SST */ size_t original_nbytes; int i; if (p == NULL) - return _PyMem_DebugAlloc(0, ctx, nbytes); + return _PyMem_DebugRawAlloc(0, ctx, nbytes); _PyMem_DebugCheckAddress(api->api_id, p); bumpserialno(); @@ -1918,7 +1936,7 @@ _PyMem_DebugRealloc(void *ctx, void *p, size_t nbytes) * but we live with that. */ oldq = q; - q = (uchar *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total); + q = (uint8_t *)api->alloc.realloc(api->alloc.ctx, q - 2*SST, total); if (q == NULL) return NULL; @@ -1928,7 +1946,7 @@ _PyMem_DebugRealloc(void *ctx, void *p, size_t nbytes) } write_size_t(q, nbytes); - assert(q[SST] == (uchar)api->api_id); + assert(q[SST] == (uint8_t)api->api_id); for (i = 1; i < SST; ++i) assert(q[SST + i] == FORBIDDENBYTE); q += 2*SST; @@ -1946,6 +1964,44 @@ _PyMem_DebugRealloc(void *ctx, void *p, size_t nbytes) return q; } +static void +_PyMem_DebugCheckGIL(void) +{ +#ifdef WITH_THREAD + if (!PyGILState_Check()) + Py_FatalError("Python memory allocator called " + "without holding the GIL"); +#endif +} + +static void * +_PyMem_DebugMalloc(void *ctx, size_t nbytes) +{ + _PyMem_DebugCheckGIL(); + return _PyMem_DebugRawMalloc(ctx, nbytes); +} + +static void * +_PyMem_DebugCalloc(void *ctx, size_t nelem, size_t elsize) +{ + _PyMem_DebugCheckGIL(); + return _PyMem_DebugRawCalloc(ctx, nelem, elsize); +} + +static void +_PyMem_DebugFree(void *ctx, void *ptr) +{ + _PyMem_DebugCheckGIL(); + _PyMem_DebugRawFree(ctx, ptr); +} + +static void * +_PyMem_DebugRealloc(void *ctx, void *ptr, size_t nbytes) +{ + _PyMem_DebugCheckGIL(); + return _PyMem_DebugRawRealloc(ctx, ptr, nbytes); +} + /* Check the forbidden bytes on both ends of the memory allocated for p. * If anything is wrong, print info to stderr via _PyObject_DebugDumpAddress, * and call Py_FatalError to kill the program. @@ -1954,11 +2010,11 @@ _PyMem_DebugRealloc(void *ctx, void *p, size_t nbytes) static void _PyMem_DebugCheckAddress(char api, const void *p) { - const uchar *q = (const uchar *)p; + const uint8_t *q = (const uint8_t *)p; char msgbuf[64]; char *msg; size_t nbytes; - const uchar *tail; + const uint8_t *tail; int i; char id; @@ -2007,8 +2063,8 @@ error: static void _PyObject_DebugDumpAddress(const void *p) { - const uchar *q = (const uchar *)p; - const uchar *tail; + const uint8_t *q = (const uint8_t *)p; + const uint8_t *tail; size_t nbytes, serial; int i; int ok; @@ -2041,7 +2097,7 @@ _PyObject_DebugDumpAddress(const void *p) fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n", FORBIDDENBYTE); for (i = SST-1; i >= 1; --i) { - const uchar byte = *(q-i); + const uint8_t byte = *(q-i); fprintf(stderr, " at p-%d: 0x%02x", i, byte); if (byte != FORBIDDENBYTE) fputs(" *** OUCH", stderr); @@ -2069,7 +2125,7 @@ _PyObject_DebugDumpAddress(const void *p) fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n", FORBIDDENBYTE); for (i = 0; i < SST; ++i) { - const uchar byte = tail[i]; + const uint8_t byte = tail[i]; fprintf(stderr, " at tail+%d: 0x%02x", i, byte); if (byte != FORBIDDENBYTE) @@ -2104,9 +2160,12 @@ _PyObject_DebugDumpAddress(const void *p) } fputc('\n', stderr); } + fputc('\n', stderr); + + fflush(stderr); + _PyMem_DumpTraceback(fileno(stderr), p); } -#endif /* PYMALLOC_DEBUG */ static size_t printone(FILE *out, const char* msg, size_t value) @@ -2158,8 +2217,30 @@ _PyDebugAllocatorStats(FILE *out, (void)printone(out, buf2, num_blocks * sizeof_block); } + #ifdef WITH_PYMALLOC +#ifdef Py_DEBUG +/* Is target in the list? The list is traversed via the nextpool pointers. + * The list may be NULL-terminated, or circular. Return 1 if target is in + * list, else 0. + */ +static int +pool_is_in_list(const poolp target, poolp list) +{ + poolp origlist = list; + assert(target != NULL); + if (list == NULL) + return 0; + do { + if (target == list) + return 1; + list = list->nextpool; + } while (list != NULL && list != origlist); + return 0; +} +#endif + /* Print summary info to "out" about the state of pymalloc's structures. * In Py_DEBUG mode, also perform some expensive internal consistency * checks. @@ -2206,27 +2287,26 @@ _PyObject_DebugMallocStats(FILE *out) */ for (i = 0; i < maxarenas; ++i) { uint j; - uptr base = arenas[i].address; + uintptr_t base = arenas[i].address; /* Skip arenas which are not allocated. */ - if (arenas[i].address == (uptr)NULL) + if (arenas[i].address == (uintptr_t)NULL) continue; narenas += 1; numfreepools += arenas[i].nfreepools; /* round up to pool alignment */ - if (base & (uptr)POOL_SIZE_MASK) { + if (base & (uintptr_t)POOL_SIZE_MASK) { arena_alignment += POOL_SIZE; - base &= ~(uptr)POOL_SIZE_MASK; + base &= ~(uintptr_t)POOL_SIZE_MASK; base += POOL_SIZE; } /* visit every pool in the arena */ - assert(base <= (uptr) arenas[i].pool_address); - for (j = 0; - base < (uptr) arenas[i].pool_address; - ++j, base += POOL_SIZE) { + assert(base <= (uintptr_t) arenas[i].pool_address); + for (j = 0; base < (uintptr_t) arenas[i].pool_address; + ++j, base += POOL_SIZE) { poolp p = (poolp)base; const uint sz = p->szidx; uint freeblocks; @@ -2275,9 +2355,8 @@ _PyObject_DebugMallocStats(FILE *out) quantization += p * ((POOL_SIZE - POOL_OVERHEAD) % size); } fputc('\n', out); -#ifdef PYMALLOC_DEBUG - (void)printone(out, "# times object malloc called", serialno); -#endif + if (_PyMem_DebugEnabled()) + (void)printone(out, "# times object malloc called", serialno); (void)printone(out, "# arenas allocated total", ntimes_arena_allocated); (void)printone(out, "# arenas reclaimed", ntimes_arena_allocated - narenas); (void)printone(out, "# arenas highwater mark", narenas_highwater); @@ -2304,18 +2383,3 @@ _PyObject_DebugMallocStats(FILE *out) } #endif /* #ifdef WITH_PYMALLOC */ - -#ifdef Py_USING_MEMORY_DEBUGGER -/* Make this function last so gcc won't inline it since the definition is - * after the reference. - */ -int -Py_ADDRESS_IN_RANGE(void *P, poolp pool) -{ - uint arenaindex_temp = pool->arenaindex; - - return arenaindex_temp < maxarenas && - (uptr)P - arenas[arenaindex_temp].address < (uptr)ARENA_SIZE && - arenas[arenaindex_temp].address != 0; -} -#endif diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 73deedf..22b1f1d 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -39,7 +39,7 @@ we've considered: __getitem__(), get(), etc. accordingly. The approach with the least performance impact (time and space) is #2, -mirroring the key order of dict's dk_enties with an array of node pointers. +mirroring the key order of dict's dk_entries with an array of node pointers. While lookdict() and friends (dk_lookup) don't give us the index into the array, we make use of pointer arithmetic to get that index. An alternative would be to refactor lookdict() to provide the index, explicitly exposing @@ -536,14 +536,17 @@ static Py_ssize_t _odict_get_index_raw(PyODictObject *od, PyObject *key, Py_hash_t hash) { PyObject **value_addr = NULL; - PyDictKeyEntry *ep; PyDictKeysObject *keys = ((PyDictObject *)od)->ma_keys; + Py_ssize_t ix; - ep = (keys->dk_lookup)((PyDictObject *)od, key, hash, &value_addr); - if (ep == NULL) + ix = (keys->dk_lookup)((PyDictObject *)od, key, hash, &value_addr, NULL); + if (ix == DKIX_EMPTY) { + return keys->dk_nentries; /* index of new entry */ + } + if (ix < 0) return -1; /* We use pointer arithmetic to get the entry's index into the table. */ - return ep - keys->dk_entries; + return ix; } /* Replace od->od_fast_nodes with a new table matching the size of dict's. */ @@ -565,7 +568,7 @@ _odict_resize(PyODictObject *od) { /* Copy the current nodes into the table. */ _odict_FOREACH(od, node) { i = _odict_get_index_raw(od, _odictnode_KEY(node), - _odictnode_HASH(node)); + _odictnode_HASH(node)); if (i < 0) { PyMem_FREE(fast_nodes); return -1; @@ -1424,14 +1427,13 @@ static PyMethodDef odict_methods[] = { * OrderedDict members */ -/* tp_members */ +/* tp_getset */ -static PyMemberDef odict_members[] = { - {"__dict__", T_OBJECT, offsetof(PyODictObject, od_inst_dict), READONLY}, - {0} +static PyGetSetDef odict_getset[] = { + {"__dict__", PyObject_GenericGetDict, PyObject_GenericSetDict}, + {NULL} }; - /* ---------------------------------------------- * OrderedDict type slot methods */ @@ -1463,7 +1465,7 @@ odict_dealloc(PyODictObject *self) ++tstate->trash_delete_nesting; Py_TRASHCAN_SAFE_END(self) -}; +} /* tp_repr */ @@ -1540,7 +1542,7 @@ Done: Py_XDECREF(pieces); Py_ReprLeave((PyObject *)self); return result; -}; +} /* tp_doc */ @@ -1612,7 +1614,7 @@ odict_richcompare(PyObject *v, PyObject *w, int op) } else { Py_RETURN_NOTIMPLEMENTED; } -}; +} /* tp_iter */ @@ -1620,7 +1622,7 @@ static PyObject * odict_iter(PyODictObject *od) { return odictiter_new(od, _odict_ITER_KEYS); -}; +} /* tp_init */ @@ -1646,27 +1648,19 @@ odict_init(PyObject *self, PyObject *args, PyObject *kwds) Py_DECREF(res); return 0; } -}; +} /* tp_new */ static PyObject * odict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - PyObject *dict; PyODictObject *od; - dict = PyDict_New(); - if (dict == NULL) - return NULL; - od = (PyODictObject *)PyDict_Type.tp_new(type, args, kwds); - if (od == NULL) { - Py_DECREF(dict); + if (od == NULL) return NULL; - } - od->od_inst_dict = dict; /* type constructor fills the memory with zeros (see PyType_GenericAlloc()), there is no need to set them to zero again */ if (_odict_resize(od) < 0) { @@ -1708,8 +1702,8 @@ PyTypeObject PyODict_Type = { (getiterfunc)odict_iter, /* tp_iter */ 0, /* tp_iternext */ odict_methods, /* tp_methods */ - odict_members, /* tp_members */ - 0, /* tp_getset */ + 0, /* tp_members */ + odict_getset, /* tp_getset */ &PyDict_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ @@ -1729,7 +1723,7 @@ PyTypeObject PyODict_Type = { PyObject * PyODict_New(void) { return odict_new(&PyODict_Type, NULL, NULL); -}; +} static int _PyODict_SetItem_KnownHash(PyObject *od, PyObject *key, PyObject *value, @@ -1747,7 +1741,7 @@ _PyODict_SetItem_KnownHash(PyObject *od, PyObject *key, PyObject *value, } } return res; -}; +} int PyODict_SetItem(PyObject *od, PyObject *key, PyObject *value) @@ -1756,7 +1750,7 @@ PyODict_SetItem(PyObject *od, PyObject *key, PyObject *value) if (hash == -1) return -1; return _PyODict_SetItem_KnownHash(od, key, value, hash); -}; +} int PyODict_DelItem(PyObject *od, PyObject *key) @@ -1769,7 +1763,7 @@ PyODict_DelItem(PyObject *od, PyObject *key) if (res < 0) return -1; return _PyDict_DelItem_KnownHash(od, key, hash); -}; +} /* ------------------------------------------- @@ -2237,7 +2231,7 @@ odictvalues_new(PyObject *od) /* ---------------------------------------------- - MutableMapping implementations + MutableMappping implementations Mapping: @@ -2362,8 +2356,7 @@ mutablemapping_update(PyObject *self, PyObject *args, PyObject *kwargs) PyObject *other = PyTuple_GET_ITEM(args, 0); /* borrowed reference */ assert(other != NULL); Py_INCREF(other); - if (PyDict_CheckExact(other) || - _PyObject_HasAttrId(other, &PyId_items)) { /* never fails */ + if PyDict_CheckExact(other) { PyObject *items; if (PyDict_CheckExact(other)) items = PyDict_Items(other); @@ -2406,6 +2399,20 @@ mutablemapping_update(PyObject *self, PyObject *args, PyObject *kwargs) if (res != 0 || PyErr_Occurred()) return NULL; } + else if (_PyObject_HasAttrId(other, &PyId_items)) { /* never fails */ + PyObject *items; + if (PyDict_CheckExact(other)) + items = PyDict_Items(other); + else + items = _PyObject_CallMethodId(other, &PyId_items, NULL); + Py_DECREF(other); + if (items == NULL) + return NULL; + res = mutablemapping_add_pairs(self, items); + Py_DECREF(items); + if (res == -1) + return NULL; + } else { res = mutablemapping_add_pairs(self, other); Py_DECREF(other); diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index f221fde..8449fc7 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -6,7 +6,7 @@ /* Support objects whose length is > PY_SSIZE_T_MAX. This could be sped up for small PyLongs if they fit in a Py_ssize_t. - This only matters on Win64. Though we could use PY_LONG_LONG which + This only matters on Win64. Though we could use long long which would presumably help perf. */ @@ -29,17 +29,10 @@ validate_step(PyObject *step) return PyLong_FromLong(1); step = PyNumber_Index(step); - if (step) { - Py_ssize_t istep = PyNumber_AsSsize_t(step, NULL); - if (istep == -1 && PyErr_Occurred()) { - /* Ignore OverflowError, we know the value isn't 0. */ - PyErr_Clear(); - } - else if (istep == 0) { - PyErr_SetString(PyExc_ValueError, - "range() arg 3 must not be zero"); - Py_CLEAR(step); - } + if (step && _PyLong_Sign(step) == 0) { + PyErr_SetString(PyExc_ValueError, + "range() arg 3 must not be zero"); + Py_CLEAR(step); } return step; @@ -129,9 +122,9 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw) return (PyObject *) obj; /* Failed to create object, release attributes */ - Py_XDECREF(start); - Py_XDECREF(stop); - Py_XDECREF(step); + Py_DECREF(start); + Py_DECREF(stop); + Py_DECREF(step); return NULL; } @@ -196,7 +189,7 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step) /* if (lo >= hi), return length of 0. */ cmp_result = PyObject_RichCompareBool(lo, hi, Py_GE); if (cmp_result != 0) { - Py_XDECREF(step); + Py_DECREF(step); if (cmp_result < 0) return NULL; return PyLong_FromLong(0); @@ -225,9 +218,9 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step) return result; Fail: + Py_DECREF(step); Py_XDECREF(tmp2); Py_XDECREF(diff); - Py_XDECREF(step); Py_XDECREF(tmp1); Py_XDECREF(one); return NULL; @@ -675,25 +668,6 @@ static PyMappingMethods range_as_mapping = { (objobjargproc)0, /* mp_ass_subscript */ }; -static int -range_bool(rangeobject* self) -{ - return PyObject_IsTrue(self->length); -} - -static PyNumberMethods range_as_number = { - 0, /* nb_add */ - 0, /* nb_subtract */ - 0, /* nb_multiply */ - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ - 0, /* nb_negative */ - 0, /* nb_positive */ - 0, /* nb_absolute */ - (inquiry)range_bool, /* nb_bool */ -}; - static PyObject * range_iter(PyObject *seq); static PyObject * range_reverse(PyObject *seq); @@ -733,7 +707,7 @@ PyTypeObject PyRange_Type = { 0, /* tp_setattr */ 0, /* tp_reserved */ (reprfunc)range_repr, /* tp_repr */ - &range_as_number, /* tp_as_number */ + 0, /* tp_as_number */ &range_as_sequence, /* tp_as_sequence */ &range_as_mapping, /* tp_as_mapping */ (hashfunc)range_hash, /* tp_hash */ @@ -956,6 +930,13 @@ rangeiter_new(PyTypeObject *type, PyObject *args, PyObject *kw) { long start, stop, step; + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "range_iterator(): creating instances of range_iterator " + "by calling range_iterator type is deprecated", + 1)) { + return NULL; + } + if (!_PyArg_NoKeywords("range_iterator()", kw)) { return NULL; } diff --git a/Objects/setobject.c b/Objects/setobject.c index 3dbdb4e..fdb9d36 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -26,7 +26,6 @@ #include "Python.h" #include "structmember.h" -#include "stringlib/eq.h" /* Object used as dummy key to fill deleted entries */ static PyObject _dummy_struct; @@ -48,19 +47,20 @@ static PyObject _dummy_struct; static setentry * set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) { - setentry *table = so->table; - setentry *freeslot = NULL; + setentry *table; setentry *entry; - size_t perturb = hash; + size_t perturb; size_t mask = so->mask; size_t i = (size_t)hash & mask; /* Unsigned for defined overflow behavior */ size_t j; int cmp; - entry = &table[i]; + entry = &so->table[i]; if (entry->key == NULL) return entry; + perturb = hash; + while (1) { if (entry->hash == hash) { PyObject *startkey = entry->key; @@ -70,8 +70,9 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) return entry; if (PyUnicode_CheckExact(startkey) && PyUnicode_CheckExact(key) - && unicode_eq(startkey, key)) + && _PyUnicode_EQ(startkey, key)) return entry; + table = so->table; Py_INCREF(startkey); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Py_DECREF(startkey); @@ -83,14 +84,12 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) return entry; mask = so->mask; /* help avoid a register spill */ } - if (entry->hash == -1 && freeslot == NULL) - freeslot = entry; if (i + LINEAR_PROBES <= mask) { for (j = 0 ; j < LINEAR_PROBES ; j++) { entry++; - if (entry->key == NULL) - goto found_null; + if (entry->hash == 0 && entry->key == NULL) + return entry; if (entry->hash == hash) { PyObject *startkey = entry->key; assert(startkey != dummy); @@ -98,8 +97,9 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) return entry; if (PyUnicode_CheckExact(startkey) && PyUnicode_CheckExact(key) - && unicode_eq(startkey, key)) + && _PyUnicode_EQ(startkey, key)) return entry; + table = so->table; Py_INCREF(startkey); cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); Py_DECREF(startkey); @@ -111,7 +111,104 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) return entry; mask = so->mask; } - if (entry->hash == -1 && freeslot == NULL) + } + } + + perturb >>= PERTURB_SHIFT; + i = (i * 5 + 1 + perturb) & mask; + + entry = &so->table[i]; + if (entry->key == NULL) + return entry; + } +} + +static int set_table_resize(PySetObject *, Py_ssize_t); + +static int +set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash) +{ + setentry *table; + setentry *freeslot; + setentry *entry; + size_t perturb; + size_t mask; + size_t i; /* Unsigned for defined overflow behavior */ + size_t j; + int cmp; + + /* Pre-increment is necessary to prevent arbitrary code in the rich + comparison from deallocating the key just before the insertion. */ + Py_INCREF(key); + + restart: + + mask = so->mask; + i = (size_t)hash & mask; + + entry = &so->table[i]; + if (entry->key == NULL) + goto found_unused; + + freeslot = NULL; + perturb = hash; + + while (1) { + if (entry->hash == hash) { + PyObject *startkey = entry->key; + /* startkey cannot be a dummy because the dummy hash field is -1 */ + assert(startkey != dummy); + if (startkey == key) + goto found_active; + if (PyUnicode_CheckExact(startkey) + && PyUnicode_CheckExact(key) + && _PyUnicode_EQ(startkey, key)) + goto found_active; + table = so->table; + Py_INCREF(startkey); + cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); + Py_DECREF(startkey); + if (cmp > 0) /* likely */ + goto found_active; + if (cmp < 0) + goto comparison_error; + /* Continuing the search from the current entry only makes + sense if the table and entry are unchanged; otherwise, + we have to restart from the beginning */ + if (table != so->table || entry->key != startkey) + goto restart; + mask = so->mask; /* help avoid a register spill */ + } + else if (entry->hash == -1 && freeslot == NULL) + freeslot = entry; + + if (i + LINEAR_PROBES <= mask) { + for (j = 0 ; j < LINEAR_PROBES ; j++) { + entry++; + if (entry->hash == 0 && entry->key == NULL) + goto found_unused_or_dummy; + if (entry->hash == hash) { + PyObject *startkey = entry->key; + assert(startkey != dummy); + if (startkey == key) + goto found_active; + if (PyUnicode_CheckExact(startkey) + && PyUnicode_CheckExact(key) + && _PyUnicode_EQ(startkey, key)) + goto found_active; + table = so->table; + Py_INCREF(startkey); + cmp = PyObject_RichCompareBool(startkey, key, Py_EQ); + Py_DECREF(startkey); + if (cmp > 0) + goto found_active; + if (cmp < 0) + goto comparison_error; + if (table != so->table || entry->key != startkey) + goto restart; + mask = so->mask; + } + else if (entry->hash == -1 && freeslot == NULL) freeslot = entry; } } @@ -119,29 +216,51 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash) perturb >>= PERTURB_SHIFT; i = (i * 5 + 1 + perturb) & mask; - entry = &table[i]; + entry = &so->table[i]; if (entry->key == NULL) - goto found_null; + goto found_unused_or_dummy; } - found_null: - return freeslot == NULL ? entry : freeslot; + + found_unused_or_dummy: + if (freeslot == NULL) + goto found_unused; + so->used++; + freeslot->key = key; + freeslot->hash = hash; + return 0; + + found_unused: + so->fill++; + so->used++; + entry->key = key; + entry->hash = hash; + if ((size_t)so->fill*3 < mask*2) + return 0; + return set_table_resize(so, so->used); + + found_active: + Py_DECREF(key); + return 0; + + comparison_error: + Py_DECREF(key); + return -1; } /* Internal routine used by set_table_resize() to insert an item which is known to be absent from the set. This routine also assumes that the set contains no deleted entries. Besides the performance benefit, -using set_insert_clean() in set_table_resize() is dangerous (SF bug #1456209). -Note that no refcounts are changed by this routine; if needed, the caller -is responsible for incref'ing `key`. +there is also safety benefit since using set_add_entry() risks making +a callback in the middle of a set_table_resize(), see issue 1456209. +The caller is responsible for updating the key's reference count and +the setobject's fill and used fields. */ static void -set_insert_clean(PySetObject *so, PyObject *key, Py_hash_t hash) +set_insert_clean(setentry *table, size_t mask, PyObject *key, Py_hash_t hash) { - setentry *table = so->table; setentry *entry; size_t perturb = hash; - size_t mask = (size_t)so->mask; size_t i = (size_t)hash & mask; size_t j; @@ -162,45 +281,11 @@ set_insert_clean(PySetObject *so, PyObject *key, Py_hash_t hash) found_null: entry->key = key; entry->hash = hash; - so->fill++; - so->used++; } /* ======== End logic for probing the hash table ========================== */ /* ======================================================================== */ - -/* -Internal routine to insert a new key into the table. -Used by the public insert routine. -Eats a reference to key. -*/ -static int -set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash) -{ - setentry *entry; - - entry = set_lookkey(so, key, hash); - if (entry == NULL) - return -1; - if (entry->key == NULL) { - /* UNUSED */ - entry->key = key; - entry->hash = hash; - so->fill++; - so->used++; - } else if (entry->key == dummy) { - /* DUMMY */ - entry->key = key; - entry->hash = hash; - so->used++; - } else { - /* ACTIVE */ - Py_DECREF(key); - } - return 0; -} - /* Restructure the table by allocating a new table and reinserting all keys again. When entries have been deleted, the new table may @@ -213,10 +298,13 @@ set_table_resize(PySetObject *so, Py_ssize_t minused) setentry *oldtable, *newtable, *entry; Py_ssize_t oldfill = so->fill; Py_ssize_t oldused = so->used; + Py_ssize_t oldmask = so->mask; + size_t newmask; int is_oldtable_malloced; setentry small_copy[PySet_MINSIZE]; assert(minused >= 0); + minused = (minused > 50000) ? minused * 2 : minused * 4; /* Find the smallest table size > minused. */ /* XXX speed-up with intrinsics */ @@ -264,25 +352,24 @@ set_table_resize(PySetObject *so, Py_ssize_t minused) /* Make the set empty, using the new table. */ assert(newtable != oldtable); memset(newtable, 0, sizeof(setentry) * newsize); - so->fill = 0; - so->used = 0; + so->fill = oldused; + so->used = oldused; so->mask = newsize - 1; so->table = newtable; /* Copy the data over; this is refcount-neutral for active entries; dummy entries aren't copied over, of course */ + newmask = (size_t)so->mask; if (oldfill == oldused) { - for (entry = oldtable; oldused > 0; entry++) { + for (entry = oldtable; entry <= oldtable + oldmask; entry++) { if (entry->key != NULL) { - oldused--; - set_insert_clean(so, entry->key, entry->hash); + set_insert_clean(newtable, newmask, entry->key, entry->hash); } } } else { - for (entry = oldtable; oldused > 0; entry++) { + for (entry = oldtable; entry <= oldtable + oldmask; entry++) { if (entry->key != NULL && entry->key != dummy) { - oldused--; - set_insert_clean(so, entry->key, entry->hash); + set_insert_clean(newtable, newmask, entry->key, entry->hash); } } } @@ -292,31 +379,42 @@ set_table_resize(PySetObject *so, Py_ssize_t minused) return 0; } -/* CAUTION: set_add_key/entry() must guarantee it won't resize the table */ +static int +set_contains_entry(PySetObject *so, PyObject *key, Py_hash_t hash) +{ + setentry *entry; + + entry = set_lookkey(so, key, hash); + if (entry != NULL) + return entry->key != NULL; + return -1; +} + +#define DISCARD_NOTFOUND 0 +#define DISCARD_FOUND 1 static int -set_add_entry(PySetObject *so, setentry *entry) +set_discard_entry(PySetObject *so, PyObject *key, Py_hash_t hash) { - Py_ssize_t n_used; - PyObject *key = entry->key; - Py_hash_t hash = entry->hash; + setentry *entry; + PyObject *old_key; - assert(so->fill <= so->mask); /* at least one empty slot */ - n_used = so->used; - Py_INCREF(key); - if (set_insert_key(so, key, hash)) { - Py_DECREF(key); + entry = set_lookkey(so, key, hash); + if (entry == NULL) return -1; - } - if (!(so->used > n_used && so->fill*3 >= (so->mask+1)*2)) - return 0; - return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4); + if (entry->key == NULL) + return DISCARD_NOTFOUND; + old_key = entry->key; + entry->key = dummy; + entry->hash = -1; + so->used--; + Py_DECREF(old_key); + return DISCARD_FOUND; } static int set_add_key(PySetObject *so, PyObject *key) { - setentry entry; Py_hash_t hash; if (!PyUnicode_CheckExact(key) || @@ -325,50 +423,35 @@ set_add_key(PySetObject *so, PyObject *key) if (hash == -1) return -1; } - entry.key = key; - entry.hash = hash; - return set_add_entry(so, &entry); + return set_add_entry(so, key, hash); } -#define DISCARD_NOTFOUND 0 -#define DISCARD_FOUND 1 - static int -set_discard_entry(PySetObject *so, setentry *oldentry) +set_contains_key(PySetObject *so, PyObject *key) { - setentry *entry; - PyObject *old_key; + Py_hash_t hash; - entry = set_lookkey(so, oldentry->key, oldentry->hash); - if (entry == NULL) - return -1; - if (entry->key == NULL || entry->key == dummy) - return DISCARD_NOTFOUND; - old_key = entry->key; - entry->key = dummy; - entry->hash = -1; - so->used--; - Py_DECREF(old_key); - return DISCARD_FOUND; + if (!PyUnicode_CheckExact(key) || + (hash = ((PyASCIIObject *) key)->hash) == -1) { + hash = PyObject_Hash(key); + if (hash == -1) + return -1; + } + return set_contains_entry(so, key, hash); } static int set_discard_key(PySetObject *so, PyObject *key) { - setentry entry; Py_hash_t hash; - assert (PyAnySet_Check(so)); - if (!PyUnicode_CheckExact(key) || (hash = ((PyASCIIObject *) key)->hash) == -1) { hash = PyObject_Hash(key); if (hash == -1) return -1; } - entry.key = key; - entry.hash = hash; - return set_discard_entry(so, &entry); + return set_discard_entry(so, key, hash); } static void @@ -449,20 +532,22 @@ set_next(PySetObject *so, Py_ssize_t *pos_ptr, setentry **entry_ptr) { Py_ssize_t i; Py_ssize_t mask; - setentry *table; + setentry *entry; assert (PyAnySet_Check(so)); i = *pos_ptr; assert(i >= 0); - table = so->table; mask = so->mask; - while (i <= mask && (table[i].key == NULL || table[i].key == dummy)) + entry = &so->table[i]; + while (i <= mask && (entry->key == NULL || entry->key == dummy)) { i++; + entry++; + } *pos_ptr = i+1; if (i > mask) return 0; - assert(table[i].key != NULL); - *entry_ptr = &table[i]; + assert(entry != NULL); + *entry_ptr = entry; return 1; } @@ -560,8 +645,8 @@ set_merge(PySetObject *so, PyObject *otherset) * incrementally resizing as we insert new keys. Expect * that there will be no (or few) overlapping keys. */ - if ((so->fill + other->used)*3 >= (so->mask+1)*2) { - if (set_table_resize(so, (so->used + other->used)*2) != 0) + if ((so->fill + other->used)*3 >= so->mask*2) { + if (set_table_resize(so, so->used + other->used) != 0) return -1; } so_entry = so->table; @@ -586,11 +671,15 @@ set_merge(PySetObject *so, PyObject *otherset) /* If our table is empty, we can use set_insert_clean() */ if (so->fill == 0) { - for (i = 0; i <= other->mask; i++, other_entry++) { + setentry *newtable = so->table; + size_t newmask = (size_t)so->mask; + so->fill = other->used; + so->used = other->used; + for (i = other->mask + 1; i > 0 ; i--, other_entry++) { key = other_entry->key; if (key != NULL && key != dummy) { Py_INCREF(key); - set_insert_clean(so, key, other_entry->hash); + set_insert_clean(newtable, newmask, key, other_entry->hash); } } return 0; @@ -601,46 +690,13 @@ set_merge(PySetObject *so, PyObject *otherset) other_entry = &other->table[i]; key = other_entry->key; if (key != NULL && key != dummy) { - Py_INCREF(key); - if (set_insert_key(so, key, other_entry->hash)) { - Py_DECREF(key); + if (set_add_entry(so, key, other_entry->hash)) return -1; - } } } return 0; } -static int -set_contains_entry(PySetObject *so, setentry *entry) -{ - PyObject *key; - setentry *lu_entry; - - lu_entry = set_lookkey(so, entry->key, entry->hash); - if (lu_entry == NULL) - return -1; - key = lu_entry->key; - return key != NULL && key != dummy; -} - -static int -set_contains_key(PySetObject *so, PyObject *key) -{ - setentry entry; - Py_hash_t hash; - - if (!PyUnicode_CheckExact(key) || - (hash = ((PyASCIIObject *) key)->hash) == -1) { - hash = PyObject_Hash(key); - if (hash == -1) - return -1; - } - entry.key = key; - entry.hash = hash; - return set_contains_entry(so, &entry); -} - static PyObject * set_pop(PySetObject *so) { @@ -682,43 +738,64 @@ set_traverse(PySetObject *so, visitproc visit, void *arg) return 0; } -static Py_hash_t -frozenset_hash(PyObject *self) +/* Work to increase the bit dispersion for closely spaced hash values. + This is important because some use cases have many combinations of a + small number of elements with nearby hashes so that many distinct + combinations collapse to only a handful of distinct hash values. */ + +static Py_uhash_t +_shuffle_bits(Py_uhash_t h) { - /* Most of the constants in this hash algorithm are randomly choosen - large primes with "interesting bit patterns" and that passed - tests for good collision statistics on a variety of problematic - datasets such as: + return ((h ^ 89869747UL) ^ (h << 16)) * 3644798167UL; +} - ps = [] - for r in range(21): - ps += itertools.combinations(range(20), r) - num_distinct_hashes = len({hash(frozenset(s)) for s in ps}) +/* Most of the constants in this hash algorithm are randomly chosen + large primes with "interesting bit patterns" and that passed tests + for good collision statistics on a variety of problematic datasets + including powersets and graph structures (such as David Eppstein's + graph recipes in Lib/test/test_set.py) */ - */ +static Py_hash_t +frozenset_hash(PyObject *self) +{ PySetObject *so = (PySetObject *)self; - Py_uhash_t h, hash = 1927868237UL; + Py_uhash_t hash = 0; setentry *entry; - Py_ssize_t pos = 0; if (so->hash != -1) return so->hash; - hash *= (Py_uhash_t)PySet_GET_SIZE(self) + 1; - while (set_next(so, &pos, &entry)) { - /* Work to increase the bit dispersion for closely spaced hash - values. This is important because some use cases have many - combinations of a small number of elements with nearby - hashes so that many distinct combinations collapse to only - a handful of distinct hash values. */ - h = entry->hash; - hash ^= ((h ^ 89869747UL) ^ (h << 16)) * 3644798167UL; - } - /* Make the final result spread-out in a different pattern - than the algorithm for tuples or other python objects. */ + /* Xor-in shuffled bits from every entry's hash field because xor is + commutative and a frozenset hash should be independent of order. + + For speed, include null entries and dummy entries and then + subtract out their effect afterwards so that the final hash + depends only on active entries. This allows the code to be + vectorized by the compiler and it saves the unpredictable + branches that would arise when trying to exclude null and dummy + entries on every iteration. */ + + for (entry = so->table; entry <= &so->table[so->mask]; entry++) + hash ^= _shuffle_bits(entry->hash); + + /* Remove the effect of an odd number of NULL entries */ + if ((so->mask + 1 - so->fill) & 1) + hash ^= _shuffle_bits(0); + + /* Remove the effect of an odd number of dummy entries */ + if ((so->fill - so->used) & 1) + hash ^= _shuffle_bits(-1); + + /* Factor in the number of active entries */ + hash ^= ((Py_uhash_t)PySet_GET_SIZE(self) + 1) * 1927868237UL; + + /* Disperse patterns arising in nested frozensets */ hash = hash * 69069U + 907133923UL; + + /* -1 is reserved as an error code */ if (hash == (Py_uhash_t)-1) hash = 590923713UL; + so->hash = hash; return hash; } @@ -865,7 +942,7 @@ PyTypeObject PySetIter_Type = { PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ 0, /* tp_doc */ (traverseproc)setiter_traverse, /* tp_traverse */ 0, /* tp_clear */ @@ -910,18 +987,14 @@ set_update_internal(PySetObject *so, PyObject *other) * incrementally resizing as we insert new keys. Expect * that there will be no (or few) overlapping keys. */ - if (dictsize == -1) + if (dictsize < 0) return -1; - if ((so->fill + dictsize)*3 >= (so->mask+1)*2) { - if (set_table_resize(so, (so->used + dictsize)*2) != 0) + if ((so->fill + dictsize)*3 >= so->mask*2) { + if (set_table_resize(so, so->used + dictsize) != 0) return -1; } while (_PyDict_Next(other, &pos, &key, &value, &hash)) { - setentry an_entry; - - an_entry.hash = hash; - an_entry.key = key; - if (set_add_entry(so, &an_entry)) + if (set_add_entry(so, key, hash)) return -1; } return 0; @@ -970,9 +1043,8 @@ PyDoc_STRVAR(update_doc, static PyObject * make_new_set(PyTypeObject *type, PyObject *iterable) { - PySetObject *so = NULL; + PySetObject *so; - /* create PySetObject structure */ so = (PySetObject *)type->tp_alloc(type, 0); if (so == NULL) return NULL; @@ -1015,7 +1087,8 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { PyObject *iterable = NULL, *result; - if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds)) + if (kwds != NULL && type == &PyFrozenSet_Type + && !_PyArg_NoKeywords("frozenset()", kwds)) return NULL; if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable)) @@ -1042,24 +1115,9 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return emptyfrozenset; } -int -PySet_ClearFreeList(void) -{ - return 0; -} - -void -PySet_Fini(void) -{ - Py_CLEAR(emptyfrozenset); -} - static PyObject * set_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - if (type == &PySet_Type && !_PyArg_NoKeywords("set()", kwds)) - return NULL; - return make_new_set(type, NULL); } @@ -1201,6 +1259,8 @@ set_intersection(PySetObject *so, PyObject *other) { PySetObject *result; PyObject *key, *it, *tmp; + Py_hash_t hash; + int rv; if ((PyObject *)so == other) return set_copy(so); @@ -1220,13 +1280,15 @@ set_intersection(PySetObject *so, PyObject *other) } while (set_next((PySetObject *)other, &pos, &entry)) { - int rv = set_contains_entry(so, entry); - if (rv == -1) { + key = entry->key; + hash = entry->hash; + rv = set_contains_entry(so, key, hash); + if (rv < 0) { Py_DECREF(result); return NULL; } if (rv) { - if (set_add_entry(result, entry)) { + if (set_add_entry(result, key, hash)) { Py_DECREF(result); return NULL; } @@ -1242,32 +1304,15 @@ set_intersection(PySetObject *so, PyObject *other) } while ((key = PyIter_Next(it)) != NULL) { - int rv; - setentry entry; - Py_hash_t hash = PyObject_Hash(key); - - if (hash == -1) { - Py_DECREF(it); - Py_DECREF(result); - Py_DECREF(key); - return NULL; - } - entry.hash = hash; - entry.key = key; - rv = set_contains_entry(so, &entry); - if (rv == -1) { - Py_DECREF(it); - Py_DECREF(result); - Py_DECREF(key); - return NULL; - } + hash = PyObject_Hash(key); + if (hash == -1) + goto error; + rv = set_contains_entry(so, key, hash); + if (rv < 0) + goto error; if (rv) { - if (set_add_entry(result, &entry)) { - Py_DECREF(it); - Py_DECREF(result); - Py_DECREF(key); - return NULL; - } + if (set_add_entry(result, key, hash)) + goto error; } Py_DECREF(key); } @@ -1277,6 +1322,11 @@ set_intersection(PySetObject *so, PyObject *other) return NULL; } return (PyObject *)result; + error: + Py_DECREF(it); + Py_DECREF(result); + Py_DECREF(key); + return NULL; } static PyObject * @@ -1363,6 +1413,7 @@ static PyObject * set_isdisjoint(PySetObject *so, PyObject *other) { PyObject *key, *it, *tmp; + int rv; if ((PyObject *)so == other) { if (PySet_GET_SIZE(so) == 0) @@ -1381,8 +1432,8 @@ set_isdisjoint(PySetObject *so, PyObject *other) other = tmp; } while (set_next((PySetObject *)other, &pos, &entry)) { - int rv = set_contains_entry(so, entry); - if (rv == -1) + rv = set_contains_entry(so, entry->key, entry->hash); + if (rv < 0) return NULL; if (rv) Py_RETURN_FALSE; @@ -1395,8 +1446,6 @@ set_isdisjoint(PySetObject *so, PyObject *other) return NULL; while ((key = PyIter_Next(it)) != NULL) { - int rv; - setentry entry; Py_hash_t hash = PyObject_Hash(key); if (hash == -1) { @@ -1404,11 +1453,9 @@ set_isdisjoint(PySetObject *so, PyObject *other) Py_DECREF(it); return NULL; } - entry.hash = hash; - entry.key = key; - rv = set_contains_entry(so, &entry); + rv = set_contains_entry(so, key, hash); Py_DECREF(key); - if (rv == -1) { + if (rv < 0) { Py_DECREF(it); return NULL; } @@ -1429,6 +1476,10 @@ PyDoc_STRVAR(isdisjoint_doc, static int set_difference_update_internal(PySetObject *so, PyObject *other) { + if (PySet_GET_SIZE(so) == 0) { + return 0; + } + if ((PyObject *)so == other) return set_clear_internal(so); @@ -1437,7 +1488,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other) Py_ssize_t pos = 0; while (set_next((PySetObject *)other, &pos, &entry)) - if (set_discard_entry(so, entry) == -1) + if (set_discard_entry(so, entry->key, entry->hash) < 0) return -1; } else { PyObject *key, *it; @@ -1446,7 +1497,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other) return -1; while ((key = PyIter_Next(it)) != NULL) { - if (set_discard_key(so, key) == -1) { + if (set_discard_key(so, key) < 0) { Py_DECREF(it); Py_DECREF(key); return -1; @@ -1457,10 +1508,10 @@ set_difference_update_internal(PySetObject *so, PyObject *other) if (PyErr_Occurred()) return -1; } - /* If more than 1/5 are dummies, then resize them away. */ - if ((so->fill - so->used) * 5 < so->mask) + /* If more than 1/4th are dummies, then resize them away. */ + if ((size_t)(so->fill - so->used) <= (size_t)so->mask / 4) return 0; - return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4); + return set_table_resize(so, so->used); } static PyObject * @@ -1487,7 +1538,7 @@ set_copy_and_difference(PySetObject *so, PyObject *other) result = set_copy(so); if (result == NULL) return NULL; - if (set_difference_update_internal((PySetObject *) result, other) != -1) + if (set_difference_update_internal((PySetObject *) result, other) == 0) return result; Py_DECREF(result); return NULL; @@ -1497,22 +1548,23 @@ static PyObject * set_difference(PySetObject *so, PyObject *other) { PyObject *result; + PyObject *key; + Py_hash_t hash; setentry *entry; - Py_ssize_t pos = 0, other_size; + Py_ssize_t pos = 0; + int rv; - if (PyAnySet_Check(other)) { - other_size = PySet_GET_SIZE(other); - } - else if (PyDict_CheckExact(other)) { - other_size = PyDict_Size(other); + if (PySet_GET_SIZE(so) == 0) { + return set_copy(so); } - else { + + if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) { return set_copy_and_difference(so, other); } /* If len(so) much more than len(other), it's more efficient to simply copy * so and then iterate other looking for common elements. */ - if ((PySet_GET_SIZE(so) >> 2) > other_size) { + if ((PySet_GET_SIZE(so) >> 2) > PyObject_Size(other)) { return set_copy_and_difference(so, other); } @@ -1522,17 +1574,15 @@ set_difference(PySetObject *so, PyObject *other) if (PyDict_CheckExact(other)) { while (set_next(so, &pos, &entry)) { - setentry entrycopy; - int rv; - entrycopy.hash = entry->hash; - entrycopy.key = entry->key; - rv = _PyDict_Contains(other, entry->key, entry->hash); + key = entry->key; + hash = entry->hash; + rv = _PyDict_Contains(other, key, hash); if (rv < 0) { Py_DECREF(result); return NULL; } if (!rv) { - if (set_add_entry((PySetObject *)result, &entrycopy)) { + if (set_add_entry((PySetObject *)result, key, hash)) { Py_DECREF(result); return NULL; } @@ -1543,13 +1593,15 @@ set_difference(PySetObject *so, PyObject *other) /* Iterate over so, checking for common elements in other. */ while (set_next(so, &pos, &entry)) { - int rv = set_contains_entry((PySetObject *)other, entry); - if (rv == -1) { + key = entry->key; + hash = entry->hash; + rv = set_contains_entry((PySetObject *)other, key, hash); + if (rv < 0) { Py_DECREF(result); return NULL; } if (!rv) { - if (set_add_entry((PySetObject *)result, entry)) { + if (set_add_entry((PySetObject *)result, key, hash)) { Py_DECREF(result); return NULL; } @@ -1611,29 +1663,24 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other) PySetObject *otherset; PyObject *key; Py_ssize_t pos = 0; + Py_hash_t hash; setentry *entry; + int rv; if ((PyObject *)so == other) return set_clear(so); if (PyDict_CheckExact(other)) { PyObject *value; - int rv; - Py_hash_t hash; while (_PyDict_Next(other, &pos, &key, &value, &hash)) { - setentry an_entry; - Py_INCREF(key); - an_entry.hash = hash; - an_entry.key = key; - - rv = set_discard_entry(so, &an_entry); - if (rv == -1) { + rv = set_discard_entry(so, key, hash); + if (rv < 0) { Py_DECREF(key); return NULL; } if (rv == DISCARD_NOTFOUND) { - if (set_add_entry(so, &an_entry)) { + if (set_add_entry(so, key, hash)) { Py_DECREF(key); return NULL; } @@ -1653,13 +1700,15 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other) } while (set_next(otherset, &pos, &entry)) { - int rv = set_discard_entry(so, entry); - if (rv == -1) { + key = entry->key; + hash = entry->hash; + rv = set_discard_entry(so, key, hash); + if (rv < 0) { Py_DECREF(otherset); return NULL; } if (rv == DISCARD_NOTFOUND) { - if (set_add_entry(so, entry)) { + if (set_add_entry(so, key, hash)) { Py_DECREF(otherset); return NULL; } @@ -1721,6 +1770,7 @@ set_issubset(PySetObject *so, PyObject *other) { setentry *entry; Py_ssize_t pos = 0; + int rv; if (!PyAnySet_Check(other)) { PyObject *tmp, *result; @@ -1735,8 +1785,8 @@ set_issubset(PySetObject *so, PyObject *other) Py_RETURN_FALSE; while (set_next(so, &pos, &entry)) { - int rv = set_contains_entry((PySetObject *)other, entry); - if (rv == -1) + rv = set_contains_entry((PySetObject *)other, entry->key, entry->hash); + if (rv < 0) return NULL; if (!rv) Py_RETURN_FALSE; @@ -1827,7 +1877,7 @@ set_contains(PySetObject *so, PyObject *key) int rv; rv = set_contains_key(so, key); - if (rv == -1) { + if (rv < 0) { if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return -1; PyErr_Clear(); @@ -1846,7 +1896,7 @@ set_direct_contains(PySetObject *so, PyObject *key) long result; result = set_contains(so, key); - if (result == -1) + if (result < 0) return NULL; return PyBool_FromLong(result); } @@ -1860,7 +1910,7 @@ set_remove(PySetObject *so, PyObject *key) int rv; rv = set_discard_key(so, key); - if (rv == -1) { + if (rv < 0) { if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return NULL; PyErr_Clear(); @@ -1869,7 +1919,7 @@ set_remove(PySetObject *so, PyObject *key) return NULL; rv = set_discard_key(so, tmpkey); Py_DECREF(tmpkey); - if (rv == -1) + if (rv < 0) return NULL; } @@ -1892,7 +1942,7 @@ set_discard(PySetObject *so, PyObject *key) int rv; rv = set_discard_key(so, key); - if (rv == -1) { + if (rv < 0) { if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError)) return NULL; PyErr_Clear(); @@ -1901,7 +1951,7 @@ set_discard(PySetObject *so, PyObject *key) return NULL; rv = set_discard_key(so, tmpkey); Py_DECREF(tmpkey); - if (rv == -1) + if (rv < 0) return NULL; } Py_RETURN_NONE; @@ -1955,13 +2005,12 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds) { PyObject *iterable = NULL; - if (!PyAnySet_Check(self)) - return -1; - if (PySet_Check(self) && !_PyArg_NoKeywords("set()", kwds)) + if (kwds != NULL && !_PyArg_NoKeywords("set()", kwds)) return -1; if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable)) return -1; - set_clear_internal(self); + if (self->fill) + set_clear_internal(self); self->hash = -1; if (iterable == NULL) return 0; @@ -2128,7 +2177,7 @@ static PyMethodDef frozenset_methods[] = { copy_doc}, {"difference", (PyCFunction)set_difference_multi, METH_VARARGS, difference_doc}, - {"intersection",(PyCFunction)set_intersection_multi, METH_VARARGS, + {"intersection", (PyCFunction)set_intersection_multi, METH_VARARGS, intersection_doc}, {"isdisjoint", (PyCFunction)set_isdisjoint, METH_O, isdisjoint_doc}, @@ -2199,7 +2248,7 @@ PyTypeObject PyFrozenSet_Type = { (traverseproc)set_traverse, /* tp_traverse */ (inquiry)set_clear_internal, /* tp_clear */ (richcmpfunc)set_richcompare, /* tp_richcompare */ - offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */ + offsetof(PySetObject, weakreflist), /* tp_weaklistoffset */ (getiterfunc)set_iter, /* tp_iter */ 0, /* tp_iternext */ frozenset_methods, /* tp_methods */ @@ -2283,6 +2332,18 @@ PySet_Add(PyObject *anyset, PyObject *key) } int +PySet_ClearFreeList(void) +{ + return 0; +} + +void +PySet_Fini(void) +{ + Py_CLEAR(emptyfrozenset); +} + +int _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash) { setentry *entry; @@ -2405,7 +2466,7 @@ test_c_api(PySetObject *so) /* Exercise direct iteration */ i = 0, count = 0; while (_PySet_NextEntry((PyObject *)dup, &i, &x, &hash)) { - s = _PyUnicode_AsString(x); + s = PyUnicode_AsUTF8(x); assert(s && (s[0] == 'a' || s[0] == 'b' || s[0] == 'c')); count++; } diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index 3259947..2f32355 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -191,13 +191,14 @@ PySlice_GetIndices(PyObject *_r, Py_ssize_t length, } int -PySlice_Unpack(PyObject *_r, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) +PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) { PySliceObject *r = (PySliceObject*)_r; /* this is harder to get right than you might think */ - assert(PY_SSIZE_T_MIN + 1 <= -PY_SSIZE_T_MAX); + Py_ssize_t defstart, defstop; if (r->step == Py_None) { *step = 1; @@ -218,75 +219,42 @@ PySlice_Unpack(PyObject *_r, *step = -PY_SSIZE_T_MAX; } + defstart = *step < 0 ? length-1 : 0; + defstop = *step < 0 ? -1 : length; + if (r->start == Py_None) { - *start = *step < 0 ? PY_SSIZE_T_MAX : 0; + *start = defstart; } else { if (!_PyEval_SliceIndex(r->start, start)) return -1; + if (*start < 0) *start += length; + if (*start < 0) *start = (*step < 0) ? -1 : 0; + if (*start >= length) + *start = (*step < 0) ? length - 1 : length; } if (r->stop == Py_None) { - *stop = *step < 0 ? PY_SSIZE_T_MIN : PY_SSIZE_T_MAX; + *stop = defstop; } else { if (!_PyEval_SliceIndex(r->stop, stop)) return -1; + if (*stop < 0) *stop += length; + if (*stop < 0) *stop = (*step < 0) ? -1 : 0; + if (*stop >= length) + *stop = (*step < 0) ? length - 1 : length; } - return 0; -} - -Py_ssize_t -PySlice_AdjustIndices(Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step) -{ - /* this is harder to get right than you might think */ - - assert(step != 0); - assert(step >= -PY_SSIZE_T_MAX); - - if (*start < 0) { - *start += length; - if (*start < 0) { - *start = (step < 0) ? -1 : 0; - } - } - else if (*start >= length) { - *start = (step < 0) ? length - 1 : length; - } - - if (*stop < 0) { - *stop += length; - if (*stop < 0) { - *stop = (step < 0) ? -1 : 0; - } - } - else if (*stop >= length) { - *stop = (step < 0) ? length - 1 : length; + if ((*step < 0 && *stop >= *start) + || (*step > 0 && *start >= *stop)) { + *slicelength = 0; } - - if (step < 0) { - if (*stop < *start) { - return (*start - *stop - 1) / (-step) + 1; - } + else if (*step < 0) { + *slicelength = (*stop-*start+1)/(*step)+1; } else { - if (*start < *stop) { - return (*stop - *start - 1) / step + 1; - } + *slicelength = (*stop-*start-1)/(*step)+1; } - return 0; -} - -#undef PySlice_GetIndicesEx -int -PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, - Py_ssize_t *slicelength) -{ - if (PySlice_Unpack(_r, start, stop, step) < 0) - return -1; - *slicelength = PySlice_AdjustIndices(length, start, stop, *step); return 0; } diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h index 0fc6b58..43f2f32 100644 --- a/Objects/stringlib/codecs.h +++ b/Objects/stringlib/codecs.h @@ -1,6 +1,8 @@ /* stringlib: codec implementations */ -#if STRINGLIB_IS_UNICODE +#if !STRINGLIB_IS_UNICODE +# error "codecs.h is specific to Unicode" +#endif /* Mask to quickly check whether a C 'long' contains a non-ASCII, UTF8-encoded char. */ @@ -260,53 +262,35 @@ STRINGLIB(utf8_encoder)(PyObject *unicode, Py_ssize_t size, const char *errors) { -#define MAX_SHORT_UNICHARS 300 /* largest size we'll do on the stack */ - - Py_ssize_t i; /* index into s of next input byte */ - PyObject *result; /* result string object */ + Py_ssize_t i; /* index into data of next input character */ char *p; /* next free byte in output buffer */ - Py_ssize_t nallocated; /* number of result bytes allocated */ - Py_ssize_t nneeded; /* number of result bytes needed */ #if STRINGLIB_SIZEOF_CHAR > 1 - PyObject *errorHandler = NULL; + PyObject *error_handler_obj = NULL; PyObject *exc = NULL; PyObject *rep = NULL; + _Py_error_handler error_handler = _Py_ERROR_UNKNOWN; #endif #if STRINGLIB_SIZEOF_CHAR == 1 const Py_ssize_t max_char_size = 2; - char stackbuf[MAX_SHORT_UNICHARS * 2]; #elif STRINGLIB_SIZEOF_CHAR == 2 const Py_ssize_t max_char_size = 3; - char stackbuf[MAX_SHORT_UNICHARS * 3]; #else /* STRINGLIB_SIZEOF_CHAR == 4 */ const Py_ssize_t max_char_size = 4; - char stackbuf[MAX_SHORT_UNICHARS * 4]; #endif + _PyBytesWriter writer; assert(size >= 0); + _PyBytesWriter_Init(&writer); - if (size <= MAX_SHORT_UNICHARS) { - /* Write into the stack buffer; nallocated can't overflow. - * At the end, we'll allocate exactly as much heap space as it - * turns out we need. - */ - nallocated = Py_SAFE_DOWNCAST(sizeof(stackbuf), size_t, int); - result = NULL; /* will allocate after we're done */ - p = stackbuf; - } - else { - if (size > PY_SSIZE_T_MAX / max_char_size) { - /* integer overflow */ - return PyErr_NoMemory(); - } - /* Overallocate on the heap, and give the excess back at the end. */ - nallocated = size * max_char_size; - result = PyBytes_FromStringAndSize(NULL, nallocated); - if (result == NULL) - return NULL; - p = PyBytes_AS_STRING(result); + if (size > PY_SSIZE_T_MAX / max_char_size) { + /* integer overflow */ + return PyErr_NoMemory(); } + p = _PyBytesWriter_Alloc(&writer, size * max_char_size); + if (p == NULL) + return NULL; + for (i = 0; i < size;) { Py_UCS4 ch = data[i++]; @@ -326,72 +310,117 @@ STRINGLIB(utf8_encoder)(PyObject *unicode, } #if STRINGLIB_SIZEOF_CHAR > 1 else if (Py_UNICODE_IS_SURROGATE(ch)) { - Py_ssize_t newpos; - Py_ssize_t repsize, k, startpos; + Py_ssize_t startpos, endpos, newpos; + Py_ssize_t k; + if (error_handler == _Py_ERROR_UNKNOWN) { + error_handler = get_error_handler(errors); + } + startpos = i-1; - rep = unicode_encode_call_errorhandler( - errors, &errorHandler, "utf-8", "surrogates not allowed", - unicode, &exc, startpos, startpos+1, &newpos); - if (!rep) - goto error; - - if (PyBytes_Check(rep)) - repsize = PyBytes_GET_SIZE(rep); - else - repsize = PyUnicode_GET_LENGTH(rep); + endpos = startpos+1; + + while ((endpos < size) && Py_UNICODE_IS_SURROGATE(data[endpos])) + endpos++; + + /* Only overallocate the buffer if it's not the last write */ + writer.overallocate = (endpos < size); + + switch (error_handler) + { + case _Py_ERROR_REPLACE: + memset(p, '?', endpos - startpos); + p += (endpos - startpos); + /* fall through the ignore handler */ + case _Py_ERROR_IGNORE: + i += (endpos - startpos - 1); + break; - if (repsize > max_char_size) { - Py_ssize_t offset; + case _Py_ERROR_SURROGATEPASS: + for (k=startpos; k> 12)); + *p++ = (char)(0x80 | ((ch >> 6) & 0x3f)); + *p++ = (char)(0x80 | (ch & 0x3f)); + } + i += (endpos - startpos - 1); + break; - if (result == NULL) - offset = p - stackbuf; - else - offset = p - PyBytes_AS_STRING(result); + case _Py_ERROR_BACKSLASHREPLACE: + /* subtract preallocated bytes */ + writer.min_size -= max_char_size * (endpos - startpos); + p = backslashreplace(&writer, p, + unicode, startpos, endpos); + if (p == NULL) + goto error; + i += (endpos - startpos - 1); + break; - if (nallocated > PY_SSIZE_T_MAX - repsize + max_char_size) { - /* integer overflow */ - PyErr_NoMemory(); + case _Py_ERROR_XMLCHARREFREPLACE: + /* subtract preallocated bytes */ + writer.min_size -= max_char_size * (endpos - startpos); + p = xmlcharrefreplace(&writer, p, + unicode, startpos, endpos); + if (p == NULL) goto error; + i += (endpos - startpos - 1); + break; + + case _Py_ERROR_SURROGATEESCAPE: + for (k=startpos; k= endpos) { + i += (endpos - startpos - 1); + break; } - p = PyBytes_AS_STRING(result) + offset; - } + startpos = k; + assert(startpos < endpos); + /* fall through the default handler */ + default: + rep = unicode_encode_call_errorhandler( + errors, &error_handler_obj, "utf-8", "surrogates not allowed", + unicode, &exc, startpos, endpos, &newpos); + if (!rep) + goto error; - if (PyBytes_Check(rep)) { - char *prep = PyBytes_AS_STRING(rep); - for(k = repsize; k > 0; k--) - *p++ = *prep++; - } else /* rep is unicode */ { - enum PyUnicode_Kind repkind; - void *repdata; + /* subtract preallocated bytes */ + writer.min_size -= max_char_size * (newpos - startpos); - if (PyUnicode_READY(rep) < 0) - goto error; - repkind = PyUnicode_KIND(rep); - repdata = PyUnicode_DATA(rep); - - for(k=0; k 2 @@ -416,35 +445,20 @@ STRINGLIB(utf8_encoder)(PyObject *unicode, #endif /* STRINGLIB_SIZEOF_CHAR > 1 */ } - if (result == NULL) { - /* This was stack allocated. */ - nneeded = p - stackbuf; - assert(nneeded <= nallocated); - result = PyBytes_FromStringAndSize(stackbuf, nneeded); - } - else { - /* Cut back to size actually needed. */ - nneeded = p - PyBytes_AS_STRING(result); - assert(nneeded <= nallocated); - _PyBytes_Resize(&result, nneeded); - } - #if STRINGLIB_SIZEOF_CHAR > 1 - Py_XDECREF(errorHandler); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); #endif - return result; + return _PyBytesWriter_Finish(&writer, p); #if STRINGLIB_SIZEOF_CHAR > 1 error: Py_XDECREF(rep); - Py_XDECREF(errorHandler); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); - Py_XDECREF(result); + _PyBytesWriter_Dealloc(&writer); return NULL; #endif - -#undef MAX_SHORT_UNICHARS } /* The pattern for constructing UCS2-repeated masks. */ @@ -806,5 +820,3 @@ STRINGLIB(utf32_encode)(const STRINGLIB_CHAR *in, #undef SWAB4 #endif - -#endif /* STRINGLIB_IS_UNICODE */ diff --git a/Objects/stringlib/ctype.h b/Objects/stringlib/ctype.h index 739cf3d..f054625 100644 --- a/Objects/stringlib/ctype.h +++ b/Objects/stringlib/ctype.h @@ -1,5 +1,6 @@ -/* NOTE: this API is -ONLY- for use with single byte character strings. */ -/* Do not use it with Unicode. */ +#if STRINGLIB_IS_UNICODE +# error "ctype.h only compatible with byte-wise strings" +#endif #include "bytes_methods.h" diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index cda68e7..98165ad 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -32,52 +32,98 @@ #define STRINGLIB_BLOOM(mask, ch) \ ((mask & (1UL << ((ch) & (STRINGLIB_BLOOM_WIDTH -1))))) - Py_LOCAL_INLINE(Py_ssize_t) -STRINGLIB(fastsearch_memchr_1char)(const STRINGLIB_CHAR* s, Py_ssize_t n, - STRINGLIB_CHAR ch, unsigned char needle, - int mode) +STRINGLIB(find_char)(const STRINGLIB_CHAR* s, Py_ssize_t n, STRINGLIB_CHAR ch) { - if (mode == FAST_SEARCH) { - const STRINGLIB_CHAR *ptr = s; - const STRINGLIB_CHAR *e = s + n; - while (ptr < e) { - void *candidate = memchr((const void *) ptr, needle, (e - ptr) * sizeof(STRINGLIB_CHAR)); - if (candidate == NULL) - return -1; - ptr = (const STRINGLIB_CHAR *) _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); - if (sizeof(STRINGLIB_CHAR) == 1 || *ptr == ch) - return (ptr - s); - /* False positive */ - ptr++; - } + const STRINGLIB_CHAR *p, *e; + + p = s; + e = s + n; + if (n > 10) { +#if STRINGLIB_SIZEOF_CHAR == 1 + p = memchr(s, ch, n); + if (p != NULL) + return (p - s); return -1; +#else + /* use memchr if we can choose a needle without two many likely + false positives */ + unsigned char needle = ch & 0xff; + /* If looking for a multiple of 256, we'd have too + many false positives looking for the '\0' byte in UCS2 + and UCS4 representations. */ + if (needle != 0) { + while (p < e) { + void *candidate = memchr(p, needle, + (e - p) * sizeof(STRINGLIB_CHAR)); + if (candidate == NULL) + return -1; + p = (const STRINGLIB_CHAR *) + _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); + if (*p == ch) + return (p - s); + /* False positive */ + p++; + } + return -1; + } +#endif } + while (p < e) { + if (*p == ch) + return (p - s); + p++; + } + return -1; +} + +Py_LOCAL_INLINE(Py_ssize_t) +STRINGLIB(rfind_char)(const STRINGLIB_CHAR* s, Py_ssize_t n, STRINGLIB_CHAR ch) +{ + const STRINGLIB_CHAR *p; #ifdef HAVE_MEMRCHR /* memrchr() is a GNU extension, available since glibc 2.1.91. it doesn't seem as optimized as memchr(), but is still quite - faster than our hand-written loop in FASTSEARCH below */ - else if (mode == FAST_RSEARCH) { - while (n > 0) { - const STRINGLIB_CHAR *found; - void *candidate = memrchr((const void *) s, needle, n * sizeof(STRINGLIB_CHAR)); - if (candidate == NULL) - return -1; - found = (const STRINGLIB_CHAR *) _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); - n = found - s; - if (sizeof(STRINGLIB_CHAR) == 1 || *found == ch) - return n; - /* False positive */ - } + faster than our hand-written loop below */ + + if (n > 10) { +#if STRINGLIB_SIZEOF_CHAR == 1 + p = memrchr(s, ch, n); + if (p != NULL) + return (p - s); return -1; - } +#else + /* use memrchr if we can choose a needle without two many likely + false positives */ + unsigned char needle = ch & 0xff; + /* If looking for a multiple of 256, we'd have too + many false positives looking for the '\0' byte in UCS2 + and UCS4 representations. */ + if (needle != 0) { + while (n > 0) { + void *candidate = memrchr(s, needle, + n * sizeof(STRINGLIB_CHAR)); + if (candidate == NULL) + return -1; + p = (const STRINGLIB_CHAR *) + _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); + n = p - s; + if (*p == ch) + return n; + /* False positive */ + } + return -1; + } #endif - else { - assert(0); /* Should never get here */ - return 0; } - -#undef DO_MEMCHR +#endif /* HAVE_MEMRCHR */ + p = s + n; + while (p > s) { + p--; + if (*p == ch) + return (p - s); + } + return -1; } Py_LOCAL_INLINE(Py_ssize_t) @@ -99,25 +145,11 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n, if (m <= 0) return -1; /* use special case for 1-character strings */ - if (n > 10 && (mode == FAST_SEARCH -#ifdef HAVE_MEMRCHR - || mode == FAST_RSEARCH -#endif - )) { - /* use memchr if we can choose a needle without two many likely - false positives */ - unsigned char needle; - needle = p[0] & 0xff; -#if STRINGLIB_SIZEOF_CHAR > 1 - /* If looking for a multiple of 256, we'd have too - many false positives looking for the '\0' byte in UCS2 - and UCS4 representations. */ - if (needle != 0) -#endif - return STRINGLIB(fastsearch_memchr_1char) - (s, n, p[0], needle, mode); - } - if (mode == FAST_COUNT) { + if (mode == FAST_SEARCH) + return STRINGLIB(find_char)(s, n, p[0]); + else if (mode == FAST_RSEARCH) + return STRINGLIB(rfind_char)(s, n, p[0]); + else { /* FAST_COUNT */ for (i = 0; i < n; i++) if (s[i] == p[0]) { count++; @@ -125,14 +157,6 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n, return maxcount; } return count; - } else if (mode == FAST_SEARCH) { - for (i = 0; i < n; i++) - if (s[i] == p[0]) - return i; - } else { /* FAST_RSEARCH */ - for (i = n - 1; i > -1; i--) - if (s[i] == p[0]) - return i; } return -1; } diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h index 14815f6..509b929 100644 --- a/Objects/stringlib/find.h +++ b/Objects/stringlib/find.h @@ -117,85 +117,3 @@ STRINGLIB(parse_args_finds)(const char * function_name, PyObject *args, } #undef FORMAT_BUFFER_SIZE - -#if STRINGLIB_IS_UNICODE - -/* -Wraps stringlib_parse_args_finds() and additionally ensures that the -first argument is a unicode object. - -Note that we receive a pointer to the pointer of the substring object, -so when we create that object in this function we don't DECREF it, -because it continues living in the caller functions (those functions, -after finishing using the substring, must DECREF it). -*/ - -Py_LOCAL_INLINE(int) -STRINGLIB(parse_args_finds_unicode)(const char * function_name, PyObject *args, - PyObject **substring, - Py_ssize_t *start, Py_ssize_t *end) -{ - PyObject *tmp_substring; - - if(STRINGLIB(parse_args_finds)(function_name, args, &tmp_substring, - start, end)) { - tmp_substring = PyUnicode_FromObject(tmp_substring); - if (!tmp_substring) - return 0; - *substring = tmp_substring; - return 1; - } - return 0; -} - -#else /* !STRINGLIB_IS_UNICODE */ - -/* -Wraps stringlib_parse_args_finds() and additionally checks whether the -first argument is an integer in range(0, 256). - -If this is the case, writes the integer value to the byte parameter -and sets subobj to NULL. Otherwise, sets the first argument to subobj -and doesn't touch byte. The other parameters are similar to those of -stringlib_parse_args_finds(). -*/ - -Py_LOCAL_INLINE(int) -STRINGLIB(parse_args_finds_byte)(const char *function_name, PyObject *args, - PyObject **subobj, char *byte, - Py_ssize_t *start, Py_ssize_t *end) -{ - PyObject *tmp_subobj; - Py_ssize_t ival; - PyObject *err; - - if(!STRINGLIB(parse_args_finds)(function_name, args, &tmp_subobj, - start, end)) - return 0; - - if (!PyNumber_Check(tmp_subobj)) { - *subobj = tmp_subobj; - return 1; - } - - ival = PyNumber_AsSsize_t(tmp_subobj, PyExc_OverflowError); - if (ival == -1) { - err = PyErr_Occurred(); - if (err && !PyErr_GivenExceptionMatches(err, PyExc_OverflowError)) { - PyErr_Clear(); - *subobj = tmp_subobj; - return 1; - } - } - - if (ival < 0 || ival > 255) { - PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)"); - return 0; - } - - *subobj = NULL; - *byte = (char)ival; - return 1; -} - -#endif /* STRINGLIB_IS_UNICODE */ diff --git a/Objects/stringlib/find_max_char.h b/Objects/stringlib/find_max_char.h index eb3fe88..8ccbc30 100644 --- a/Objects/stringlib/find_max_char.h +++ b/Objects/stringlib/find_max_char.h @@ -1,6 +1,8 @@ /* Finding the optimal width of unicode characters in a buffer */ -#if STRINGLIB_IS_UNICODE +#if !STRINGLIB_IS_UNICODE +# error "find_max_char.h is specific to Unicode" +#endif /* Mask to quickly check whether a C 'long' contains a non-ASCII, UTF8-encoded char. */ @@ -129,5 +131,4 @@ STRINGLIB(find_max_char)(const STRINGLIB_CHAR *begin, const STRINGLIB_CHAR *end) #undef MAX_CHAR_UCS4 #endif /* STRINGLIB_SIZEOF_CHAR == 1 */ -#endif /* STRINGLIB_IS_UNICODE */ diff --git a/Objects/stringlib/join.h b/Objects/stringlib/join.h index cbf81be..6f314e1 100644 --- a/Objects/stringlib/join.h +++ b/Objects/stringlib/join.h @@ -1,6 +1,6 @@ /* stringlib: bytes joining implementation */ -#if STRINGLIB_SIZEOF_CHAR != 1 +#if STRINGLIB_IS_UNICODE #error join.h only compatible with byte-wise strings #endif @@ -107,7 +107,7 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable) for (i = 0; i < nbufs; i++) { Py_ssize_t n = buffers[i].len; char *q = buffers[i].buf; - Py_MEMCPY(p, q, n); + memcpy(p, q, n); p += n; } goto done; @@ -116,12 +116,12 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable) Py_ssize_t n; char *q; if (i) { - Py_MEMCPY(p, sepstr, seplen); + memcpy(p, sepstr, seplen); p += seplen; } n = buffers[i].len; q = buffers[i].buf; - Py_MEMCPY(p, q, n); + memcpy(p, q, n); p += n; } goto done; diff --git a/Objects/stringlib/localeutil.h b/Objects/stringlib/localeutil.h index 6e2f073..df501ed 100644 --- a/Objects/stringlib/localeutil.h +++ b/Objects/stringlib/localeutil.h @@ -2,8 +2,8 @@ #include -#ifndef STRINGLIB_IS_UNICODE -# error "localeutil is specific to Unicode" +#if !STRINGLIB_IS_UNICODE +# error "localeutil.h is specific to Unicode" #endif typedef struct { diff --git a/Objects/stringlib/transmogrify.h b/Objects/stringlib/transmogrify.h index b559b53..a314572 100644 --- a/Objects/stringlib/transmogrify.h +++ b/Objects/stringlib/transmogrify.h @@ -1,14 +1,21 @@ -/* NOTE: this API is -ONLY- for use with single byte character strings. */ -/* Do not use it with Unicode. */ +#if STRINGLIB_IS_UNICODE +# error "transmogrify.h only compatible with byte-wise strings" +#endif /* the more complicated methods. parts of these should be pulled out into the shared code in bytes_methods.c to cut down on duplicate code bloat. */ -PyDoc_STRVAR(expandtabs__doc__, -"B.expandtabs(tabsize=8) -> copy of B\n\ -\n\ -Return a copy of B where all tab characters are expanded using spaces.\n\ -If tabsize is not given, a tab size of 8 characters is assumed."); +static inline PyObject * +return_self(PyObject *self) +{ +#if !STRINGLIB_MUTABLE + if (STRINGLIB_CHECK_EXACT(self)) { + Py_INCREF(self); + return self; + } +#endif + return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); +} static PyObject* stringlib_expandtabs(PyObject *self, PyObject *args, PyObject *kwds) @@ -83,7 +90,7 @@ stringlib_expandtabs(PyObject *self, PyObject *args, PyObject *kwds) return NULL; } -Py_LOCAL_INLINE(PyObject *) +static inline PyObject * pad(PyObject *self, Py_ssize_t left, Py_ssize_t right, char fill) { PyObject *u; @@ -93,39 +100,25 @@ pad(PyObject *self, Py_ssize_t left, Py_ssize_t right, char fill) if (right < 0) right = 0; - if (left == 0 && right == 0 && STRINGLIB_CHECK_EXACT(self)) { -#if STRINGLIB_MUTABLE - /* We're defined as returning a copy; If the object is mutable - * that means we must make an identical copy. */ - return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); -#else - Py_INCREF(self); - return (PyObject *)self; -#endif /* STRINGLIB_MUTABLE */ + if (left == 0 && right == 0) { + return return_self(self); } - u = STRINGLIB_NEW(NULL, - left + STRINGLIB_LEN(self) + right); + u = STRINGLIB_NEW(NULL, left + STRINGLIB_LEN(self) + right); if (u) { if (left) memset(STRINGLIB_STR(u), fill, left); - Py_MEMCPY(STRINGLIB_STR(u) + left, - STRINGLIB_STR(self), - STRINGLIB_LEN(self)); + memcpy(STRINGLIB_STR(u) + left, + STRINGLIB_STR(self), + STRINGLIB_LEN(self)); if (right) memset(STRINGLIB_STR(u) + left + STRINGLIB_LEN(self), - fill, right); + fill, right); } return u; } -PyDoc_STRVAR(ljust__doc__, -"B.ljust(width[, fillchar]) -> copy of B\n" -"\n" -"Return B left justified in a string of length width. Padding is\n" -"done using the specified fill character (default is a space)."); - static PyObject * stringlib_ljust(PyObject *self, PyObject *args) { @@ -135,27 +128,14 @@ stringlib_ljust(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "n|c:ljust", &width, &fillchar)) return NULL; - if (STRINGLIB_LEN(self) >= width && STRINGLIB_CHECK_EXACT(self)) { -#if STRINGLIB_MUTABLE - /* We're defined as returning a copy; If the object is mutable - * that means we must make an identical copy. */ - return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); -#else - Py_INCREF(self); - return (PyObject*) self; -#endif + if (STRINGLIB_LEN(self) >= width) { + return return_self(self); } return pad(self, 0, width - STRINGLIB_LEN(self), fillchar); } -PyDoc_STRVAR(rjust__doc__, -"B.rjust(width[, fillchar]) -> copy of B\n" -"\n" -"Return B right justified in a string of length width. Padding is\n" -"done using the specified fill character (default is a space)"); - static PyObject * stringlib_rjust(PyObject *self, PyObject *args) { @@ -165,27 +145,14 @@ stringlib_rjust(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "n|c:rjust", &width, &fillchar)) return NULL; - if (STRINGLIB_LEN(self) >= width && STRINGLIB_CHECK_EXACT(self)) { -#if STRINGLIB_MUTABLE - /* We're defined as returning a copy; If the object is mutable - * that means we must make an identical copy. */ - return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); -#else - Py_INCREF(self); - return (PyObject*) self; -#endif + if (STRINGLIB_LEN(self) >= width) { + return return_self(self); } return pad(self, width - STRINGLIB_LEN(self), 0, fillchar); } -PyDoc_STRVAR(center__doc__, -"B.center(width[, fillchar]) -> copy of B\n" -"\n" -"Return B centered in a string of length width. Padding is\n" -"done using the specified fill character (default is a space)."); - static PyObject * stringlib_center(PyObject *self, PyObject *args) { @@ -196,15 +163,8 @@ stringlib_center(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "n|c:center", &width, &fillchar)) return NULL; - if (STRINGLIB_LEN(self) >= width && STRINGLIB_CHECK_EXACT(self)) { -#if STRINGLIB_MUTABLE - /* We're defined as returning a copy; If the object is mutable - * that means we must make an identical copy. */ - return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); -#else - Py_INCREF(self); - return (PyObject*) self; -#endif + if (STRINGLIB_LEN(self) >= width) { + return return_self(self); } marg = width - STRINGLIB_LEN(self); @@ -213,12 +173,6 @@ stringlib_center(PyObject *self, PyObject *args) return pad(self, left, marg - left, fillchar); } -PyDoc_STRVAR(zfill__doc__, -"B.zfill(width) -> copy of B\n" -"\n" -"Pad a numeric string B with zeros on the left, to fill a field\n" -"of the specified width. B is never truncated."); - static PyObject * stringlib_zfill(PyObject *self, PyObject *args) { @@ -231,21 +185,7 @@ stringlib_zfill(PyObject *self, PyObject *args) return NULL; if (STRINGLIB_LEN(self) >= width) { - if (STRINGLIB_CHECK_EXACT(self)) { -#if STRINGLIB_MUTABLE - /* We're defined as returning a copy; If the object is mutable - * that means we must make an identical copy. */ - return STRINGLIB_NEW(STRINGLIB_STR(self), STRINGLIB_LEN(self)); -#else - Py_INCREF(self); - return (PyObject*) self; -#endif - } - else - return STRINGLIB_NEW( - STRINGLIB_STR(self), - STRINGLIB_LEN(self) - ); + return return_self(self); } fill = width - STRINGLIB_LEN(self); @@ -262,5 +202,500 @@ stringlib_zfill(PyObject *self, PyObject *args) p[fill] = '0'; } - return (PyObject*) s; + return s; +} + + +/* find and count characters and substrings */ + +#define findchar(target, target_len, c) \ + ((char *)memchr((const void *)(target), c, target_len)) + + +static Py_ssize_t +countchar(const char *target, Py_ssize_t target_len, char c, + Py_ssize_t maxcount) +{ + Py_ssize_t count = 0; + const char *start = target; + const char *end = target + target_len; + + while ((start = findchar(start, end - start, c)) != NULL) { + count++; + if (count >= maxcount) + break; + start += 1; + } + return count; +} + + +/* Algorithms for different cases of string replacement */ + +/* len(self)>=1, from="", len(to)>=1, maxcount>=1 */ +static PyObject * +stringlib_replace_interleave(PyObject *self, + const char *to_s, Py_ssize_t to_len, + Py_ssize_t maxcount) +{ + const char *self_s; + char *result_s; + Py_ssize_t self_len, result_len; + Py_ssize_t count, i; + PyObject *result; + + self_len = STRINGLIB_LEN(self); + + /* 1 at the end plus 1 after every character; + count = min(maxcount, self_len + 1) */ + if (maxcount <= self_len) { + count = maxcount; + } + else { + /* Can't overflow: self_len + 1 <= maxcount <= PY_SSIZE_T_MAX. */ + count = self_len + 1; + } + + /* Check for overflow */ + /* result_len = count * to_len + self_len; */ + assert(count > 0); + if (to_len > (PY_SSIZE_T_MAX - self_len) / count) { + PyErr_SetString(PyExc_OverflowError, + "replace bytes are too long"); + return NULL; + } + result_len = count * to_len + self_len; + result = STRINGLIB_NEW(NULL, result_len); + if (result == NULL) { + return NULL; + } + + self_s = STRINGLIB_STR(self); + result_s = STRINGLIB_STR(result); + + if (to_len > 1) { + /* Lay the first one down (guaranteed this will occur) */ + memcpy(result_s, to_s, to_len); + result_s += to_len; + count -= 1; + + for (i = 0; i < count; i++) { + *result_s++ = *self_s++; + memcpy(result_s, to_s, to_len); + result_s += to_len; + } + } + else { + result_s[0] = to_s[0]; + result_s += to_len; + count -= 1; + for (i = 0; i < count; i++) { + *result_s++ = *self_s++; + result_s[0] = to_s[0]; + result_s += to_len; + } + } + + /* Copy the rest of the original string */ + memcpy(result_s, self_s, self_len - i); + + return result; +} + +/* Special case for deleting a single character */ +/* len(self)>=1, len(from)==1, to="", maxcount>=1 */ +static PyObject * +stringlib_replace_delete_single_character(PyObject *self, + char from_c, Py_ssize_t maxcount) +{ + const char *self_s, *start, *next, *end; + char *result_s; + Py_ssize_t self_len, result_len; + Py_ssize_t count; + PyObject *result; + + self_len = STRINGLIB_LEN(self); + self_s = STRINGLIB_STR(self); + + count = countchar(self_s, self_len, from_c, maxcount); + if (count == 0) { + return return_self(self); + } + + result_len = self_len - count; /* from_len == 1 */ + assert(result_len>=0); + + result = STRINGLIB_NEW(NULL, result_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + + start = self_s; + end = self_s + self_len; + while (count-- > 0) { + next = findchar(start, end - start, from_c); + if (next == NULL) + break; + memcpy(result_s, start, next - start); + result_s += (next - start); + start = next + 1; + } + memcpy(result_s, start, end - start); + + return result; +} + +/* len(self)>=1, len(from)>=2, to="", maxcount>=1 */ + +static PyObject * +stringlib_replace_delete_substring(PyObject *self, + const char *from_s, Py_ssize_t from_len, + Py_ssize_t maxcount) +{ + const char *self_s, *start, *next, *end; + char *result_s; + Py_ssize_t self_len, result_len; + Py_ssize_t count, offset; + PyObject *result; + + self_len = STRINGLIB_LEN(self); + self_s = STRINGLIB_STR(self); + + count = stringlib_count(self_s, self_len, + from_s, from_len, + maxcount); + + if (count == 0) { + /* no matches */ + return return_self(self); + } + + result_len = self_len - (count * from_len); + assert (result_len>=0); + + result = STRINGLIB_NEW(NULL, result_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + + start = self_s; + end = self_s + self_len; + while (count-- > 0) { + offset = stringlib_find(start, end - start, + from_s, from_len, + 0); + if (offset == -1) + break; + next = start + offset; + + memcpy(result_s, start, next - start); + + result_s += (next - start); + start = next + from_len; + } + memcpy(result_s, start, end - start); + return result; +} + +/* len(self)>=1, len(from)==len(to)==1, maxcount>=1 */ +static PyObject * +stringlib_replace_single_character_in_place(PyObject *self, + char from_c, char to_c, + Py_ssize_t maxcount) +{ + const char *self_s, *end; + char *result_s, *start, *next; + Py_ssize_t self_len; + PyObject *result; + + /* The result string will be the same size */ + self_s = STRINGLIB_STR(self); + self_len = STRINGLIB_LEN(self); + + next = findchar(self_s, self_len, from_c); + + if (next == NULL) { + /* No matches; return the original bytes */ + return return_self(self); + } + + /* Need to make a new bytes */ + result = STRINGLIB_NEW(NULL, self_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + memcpy(result_s, self_s, self_len); + + /* change everything in-place, starting with this one */ + start = result_s + (next - self_s); + *start = to_c; + start++; + end = result_s + self_len; + + while (--maxcount > 0) { + next = findchar(start, end - start, from_c); + if (next == NULL) + break; + *next = to_c; + start = next + 1; + } + + return result; } + +/* len(self)>=1, len(from)==len(to)>=2, maxcount>=1 */ +static PyObject * +stringlib_replace_substring_in_place(PyObject *self, + const char *from_s, Py_ssize_t from_len, + const char *to_s, Py_ssize_t to_len, + Py_ssize_t maxcount) +{ + const char *self_s, *end; + char *result_s, *start; + Py_ssize_t self_len, offset; + PyObject *result; + + /* The result bytes will be the same size */ + + self_s = STRINGLIB_STR(self); + self_len = STRINGLIB_LEN(self); + + offset = stringlib_find(self_s, self_len, + from_s, from_len, + 0); + if (offset == -1) { + /* No matches; return the original bytes */ + return return_self(self); + } + + /* Need to make a new bytes */ + result = STRINGLIB_NEW(NULL, self_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + memcpy(result_s, self_s, self_len); + + /* change everything in-place, starting with this one */ + start = result_s + offset; + memcpy(start, to_s, from_len); + start += from_len; + end = result_s + self_len; + + while ( --maxcount > 0) { + offset = stringlib_find(start, end - start, + from_s, from_len, + 0); + if (offset == -1) + break; + memcpy(start + offset, to_s, from_len); + start += offset + from_len; + } + + return result; +} + +/* len(self)>=1, len(from)==1, len(to)>=2, maxcount>=1 */ +static PyObject * +stringlib_replace_single_character(PyObject *self, + char from_c, + const char *to_s, Py_ssize_t to_len, + Py_ssize_t maxcount) +{ + const char *self_s, *start, *next, *end; + char *result_s; + Py_ssize_t self_len, result_len; + Py_ssize_t count; + PyObject *result; + + self_s = STRINGLIB_STR(self); + self_len = STRINGLIB_LEN(self); + + count = countchar(self_s, self_len, from_c, maxcount); + if (count == 0) { + /* no matches, return unchanged */ + return return_self(self); + } + + /* use the difference between current and new, hence the "-1" */ + /* result_len = self_len + count * (to_len-1) */ + assert(count > 0); + if (to_len - 1 > (PY_SSIZE_T_MAX - self_len) / count) { + PyErr_SetString(PyExc_OverflowError, "replace bytes is too long"); + return NULL; + } + result_len = self_len + count * (to_len - 1); + + result = STRINGLIB_NEW(NULL, result_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + + start = self_s; + end = self_s + self_len; + while (count-- > 0) { + next = findchar(start, end - start, from_c); + if (next == NULL) + break; + + if (next == start) { + /* replace with the 'to' */ + memcpy(result_s, to_s, to_len); + result_s += to_len; + start += 1; + } else { + /* copy the unchanged old then the 'to' */ + memcpy(result_s, start, next - start); + result_s += (next - start); + memcpy(result_s, to_s, to_len); + result_s += to_len; + start = next + 1; + } + } + /* Copy the remainder of the remaining bytes */ + memcpy(result_s, start, end - start); + + return result; +} + +/* len(self)>=1, len(from)>=2, len(to)>=2, maxcount>=1 */ +static PyObject * +stringlib_replace_substring(PyObject *self, + const char *from_s, Py_ssize_t from_len, + const char *to_s, Py_ssize_t to_len, + Py_ssize_t maxcount) +{ + const char *self_s, *start, *next, *end; + char *result_s; + Py_ssize_t self_len, result_len; + Py_ssize_t count, offset; + PyObject *result; + + self_s = STRINGLIB_STR(self); + self_len = STRINGLIB_LEN(self); + + count = stringlib_count(self_s, self_len, + from_s, from_len, + maxcount); + + if (count == 0) { + /* no matches, return unchanged */ + return return_self(self); + } + + /* Check for overflow */ + /* result_len = self_len + count * (to_len-from_len) */ + assert(count > 0); + if (to_len - from_len > (PY_SSIZE_T_MAX - self_len) / count) { + PyErr_SetString(PyExc_OverflowError, "replace bytes is too long"); + return NULL; + } + result_len = self_len + count * (to_len - from_len); + + result = STRINGLIB_NEW(NULL, result_len); + if (result == NULL) { + return NULL; + } + result_s = STRINGLIB_STR(result); + + start = self_s; + end = self_s + self_len; + while (count-- > 0) { + offset = stringlib_find(start, end - start, + from_s, from_len, + 0); + if (offset == -1) + break; + next = start + offset; + if (next == start) { + /* replace with the 'to' */ + memcpy(result_s, to_s, to_len); + result_s += to_len; + start += from_len; + } else { + /* copy the unchanged old then the 'to' */ + memcpy(result_s, start, next - start); + result_s += (next - start); + memcpy(result_s, to_s, to_len); + result_s += to_len; + start = next + from_len; + } + } + /* Copy the remainder of the remaining bytes */ + memcpy(result_s, start, end - start); + + return result; +} + + +static PyObject * +stringlib_replace(PyObject *self, + const char *from_s, Py_ssize_t from_len, + const char *to_s, Py_ssize_t to_len, + Py_ssize_t maxcount) +{ + if (maxcount < 0) { + maxcount = PY_SSIZE_T_MAX; + } else if (maxcount == 0 || STRINGLIB_LEN(self) == 0) { + /* nothing to do; return the original bytes */ + return return_self(self); + } + + /* Handle zero-length special cases */ + if (from_len == 0) { + if (to_len == 0) { + /* nothing to do; return the original bytes */ + return return_self(self); + } + /* insert the 'to' bytes everywhere. */ + /* >>> b"Python".replace(b"", b".") */ + /* b'.P.y.t.h.o.n.' */ + return stringlib_replace_interleave(self, to_s, to_len, maxcount); + } + + /* Except for b"".replace(b"", b"A") == b"A" there is no way beyond this */ + /* point for an empty self bytes to generate a non-empty bytes */ + /* Special case so the remaining code always gets a non-empty bytes */ + if (STRINGLIB_LEN(self) == 0) { + return return_self(self); + } + + if (to_len == 0) { + /* delete all occurrences of 'from' bytes */ + if (from_len == 1) { + return stringlib_replace_delete_single_character( + self, from_s[0], maxcount); + } else { + return stringlib_replace_delete_substring( + self, from_s, from_len, maxcount); + } + } + + /* Handle special case where both bytes have the same length */ + + if (from_len == to_len) { + if (from_len == 1) { + return stringlib_replace_single_character_in_place( + self, from_s[0], to_s[0], maxcount); + } else { + return stringlib_replace_substring_in_place( + self, from_s, from_len, to_s, to_len, maxcount); + } + } + + /* Otherwise use the more generic algorithms */ + if (from_len == 1) { + return stringlib_replace_single_character( + self, from_s[0], to_s, to_len, maxcount); + } else { + /* len('from')>=2, len('to')>=1 */ + return stringlib_replace_substring( + self, from_s, from_len, to_s, to_len, maxcount); + } +} + +#undef findchar diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index be09b5f..14fa28e 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -67,7 +67,7 @@ SubString_new_object(SubString *str) return PyUnicode_Substring(str->str, str->start, str->end); } -/* return a new string. if str->str is NULL, return None */ +/* return a new string. if str->str is NULL, return a new empty string */ Py_LOCAL_INLINE(PyObject *) SubString_new_object_or_empty(SubString *str) { diff --git a/Objects/structseq.c b/Objects/structseq.c index 664344b..5489aef 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -4,9 +4,9 @@ #include "Python.h" #include "structmember.h" -static char visible_length_key[] = "n_sequence_fields"; -static char real_length_key[] = "n_fields"; -static char unnamed_fields_key[] = "n_unnamed_fields"; +static const char visible_length_key[] = "n_sequence_fields"; +static const char real_length_key[] = "n_fields"; +static const char unnamed_fields_key[] = "n_unnamed_fields"; /* Fields with this name have only a field index, not a field name. They are only allowed for indices < n_visible_fields. */ @@ -16,14 +16,14 @@ _Py_IDENTIFIER(n_fields); _Py_IDENTIFIER(n_unnamed_fields); #define VISIBLE_SIZE(op) Py_SIZE(op) -#define VISIBLE_SIZE_TP(tp) PyLong_AsLong( \ +#define VISIBLE_SIZE_TP(tp) PyLong_AsSsize_t( \ _PyDict_GetItemId((tp)->tp_dict, &PyId_n_sequence_fields)) -#define REAL_SIZE_TP(tp) PyLong_AsLong( \ +#define REAL_SIZE_TP(tp) PyLong_AsSsize_t( \ _PyDict_GetItemId((tp)->tp_dict, &PyId_n_fields)) #define REAL_SIZE(op) REAL_SIZE_TP(Py_TYPE(op)) -#define UNNAMED_FIELDS_TP(tp) PyLong_AsLong( \ +#define UNNAMED_FIELDS_TP(tp) PyLong_AsSsize_t( \ _PyDict_GetItemId((tp)->tp_dict, &PyId_n_unnamed_fields)) #define UNNAMED_FIELDS(op) UNNAMED_FIELDS_TP(Py_TYPE(op)) @@ -164,7 +164,8 @@ structseq_repr(PyStructSequence *obj) #define TYPE_MAXSIZE 100 PyTypeObject *typ = Py_TYPE(obj); - int i, removelast = 0; + Py_ssize_t i; + int removelast = 0; Py_ssize_t len; char buf[REPR_BUFFER_SIZE]; char *endofbuf, *pbuf = buf; @@ -193,7 +194,7 @@ structseq_repr(PyStructSequence *obj) repr = PyObject_Repr(val); if (repr == NULL) return NULL; - crepr = _PyUnicode_AsString(repr); + crepr = PyUnicode_AsUTF8(repr); if (crepr == NULL) { Py_DECREF(repr); return NULL; @@ -236,8 +237,7 @@ structseq_reduce(PyStructSequence* self) PyObject* tup = NULL; PyObject* dict = NULL; PyObject* result; - Py_ssize_t n_fields, n_visible_fields, n_unnamed_fields; - int i; + Py_ssize_t n_fields, n_visible_fields, n_unnamed_fields, i; n_fields = REAL_SIZE(self); n_visible_fields = VISIBLE_SIZE(self); @@ -325,7 +325,7 @@ PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc) { PyObject *dict; PyMemberDef* members; - int n_members, n_unnamed_members, i, k; + Py_ssize_t n_members, n_unnamed_members, i, k; PyObject *v; #ifdef Py_TRACE_REFS @@ -373,9 +373,9 @@ PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc) Py_INCREF(type); dict = type->tp_dict; -#define SET_DICT_FROM_INT(key, value) \ +#define SET_DICT_FROM_SIZE(key, value) \ do { \ - v = PyLong_FromLong((long) value); \ + v = PyLong_FromSsize_t(value); \ if (v == NULL) \ return -1; \ if (PyDict_SetItemString(dict, key, v) < 0) { \ @@ -385,9 +385,9 @@ PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc) Py_DECREF(v); \ } while (0) - SET_DICT_FROM_INT(visible_length_key, desc->n_in_sequence); - SET_DICT_FROM_INT(real_length_key, n_members); - SET_DICT_FROM_INT(unnamed_fields_key, n_unnamed_members); + SET_DICT_FROM_SIZE(visible_length_key, desc->n_in_sequence); + SET_DICT_FROM_SIZE(real_length_key, n_members); + SET_DICT_FROM_SIZE(unnamed_fields_key, n_unnamed_members); return 0; } diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 19a6fed..c0ff499 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -36,6 +36,16 @@ static Py_ssize_t count_tracked = 0; static void show_track(void) { + PyObject *xoptions, *value; + _Py_IDENTIFIER(showalloccount); + + xoptions = PySys_GetXOptions(); + if (xoptions == NULL) + return; + value = _PyDict_GetItemId(xoptions, &PyId_showalloccount); + if (value != Py_True) + return; + fprintf(stderr, "Tuples created: %" PY_FORMAT_SIZE_T "d\n", count_tracked + count_untracked); fprintf(stderr, "Tuples tracked by the GC: %" PY_FORMAT_SIZE_T @@ -149,7 +159,6 @@ PyTuple_GetItem(PyObject *op, Py_ssize_t i) int PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem) { - PyObject *olditem; PyObject **p; if (!PyTuple_Check(op) || op->ob_refcnt != 1) { Py_XDECREF(newitem); @@ -163,9 +172,7 @@ PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem) return -1; } p = ((PyTupleObject *)op) -> ob_item + i; - olditem = *p; - *p = newitem; - Py_XDECREF(olditem); + Py_XSETREF(*p, newitem); return 0; } @@ -446,9 +453,9 @@ tupleconcat(PyTupleObject *a, PyObject *bb) return NULL; } #define b ((PyTupleObject *)bb) - size = Py_SIZE(a) + Py_SIZE(b); - if (size < 0) + if (Py_SIZE(a) > PY_SSIZE_T_MAX - Py_SIZE(b)) return PyErr_NoMemory(); + size = Py_SIZE(a) + Py_SIZE(b); np = (PyTupleObject *) PyTuple_New(size); if (np == NULL) { return NULL; @@ -515,8 +522,8 @@ tupleindex(PyTupleObject *self, PyObject *args) PyObject *v; if (!PyArg_ParseTuple(args, "O|O&O&:index", &v, - _PyEval_SliceIndexNotNone, &start, - _PyEval_SliceIndexNotNone, &stop)) + _PyEval_SliceIndex, &start, + _PyEval_SliceIndex, &stop)) return NULL; if (start < 0) { start += Py_SIZE(self); @@ -713,11 +720,11 @@ tuplesubscript(PyTupleObject* self, PyObject* item) PyObject* it; PyObject **src, **dest; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, + PyTuple_GET_SIZE(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(PyTuple_GET_SIZE(self), &start, - &stop, step); if (slicelength <= 0) { return PyTuple_New(0); diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 3f526b4..329261b 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -53,10 +53,12 @@ _Py_IDENTIFIER(__doc__); _Py_IDENTIFIER(__getattribute__); _Py_IDENTIFIER(__getitem__); _Py_IDENTIFIER(__hash__); +_Py_IDENTIFIER(__init_subclass__); _Py_IDENTIFIER(__len__); _Py_IDENTIFIER(__module__); _Py_IDENTIFIER(__name__); _Py_IDENTIFIER(__new__); +_Py_IDENTIFIER(__set_name__); _Py_IDENTIFIER(__setitem__); _Py_IDENTIFIER(builtins); @@ -452,27 +454,30 @@ type_set_qualname(PyTypeObject *type, PyObject *value, void *context) static PyObject * type_module(PyTypeObject *type, void *context) { - char *s; + PyObject *mod; if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) { - PyObject *mod = _PyDict_GetItemId(type->tp_dict, &PyId___module__); - if (!mod) { + mod = _PyDict_GetItemId(type->tp_dict, &PyId___module__); + if (mod == NULL) { PyErr_Format(PyExc_AttributeError, "__module__"); - return 0; + return NULL; } - Py_XINCREF(mod); - return mod; + Py_INCREF(mod); } else { - PyObject *name; - s = strrchr(type->tp_name, '.'); - if (s != NULL) - return PyUnicode_FromStringAndSize( + const char *s = strrchr(type->tp_name, '.'); + if (s != NULL) { + mod = PyUnicode_FromStringAndSize( type->tp_name, (Py_ssize_t)(s - type->tp_name)); - name = _PyUnicode_FromId(&PyId_builtins); - Py_XINCREF(name); - return name; + if (mod != NULL) + PyUnicode_InternInPlace(&mod); + } + else { + mod = _PyUnicode_FromId(&PyId_builtins); + Py_XINCREF(mod); + } } + return mod; } static int @@ -500,7 +505,7 @@ type_abstractmethods(PyTypeObject *type, void *context) PyErr_SetObject(PyExc_AttributeError, message); return NULL; } - Py_XINCREF(mod); + Py_INCREF(mod); return mod; } @@ -547,8 +552,8 @@ type_get_bases(PyTypeObject *type, void *context) static PyTypeObject *best_base(PyObject *); static int mro_internal(PyTypeObject *, PyObject **); -Py_LOCAL_INLINE(int) type_is_subtype_base_chain(PyTypeObject *, PyTypeObject *); -static int compatible_for_assignment(PyTypeObject *, PyTypeObject *, char *); +static int type_is_subtype_base_chain(PyTypeObject *, PyTypeObject *); +static int compatible_for_assignment(PyTypeObject *, PyTypeObject *, const char *); static int add_subclass(PyTypeObject*, PyTypeObject*); static int add_all_subclasses(PyTypeObject *type, PyObject *bases); static void remove_subclass(PyTypeObject *, PyTypeObject *); @@ -888,25 +893,33 @@ type_call(PyTypeObject *type, PyObject *args, PyObject *kwds) #endif obj = type->tp_new(type, args, kwds); - if (obj != NULL) { - /* Ugly exception: when the call was type(something), - don't call tp_init on the result. */ - if (type == &PyType_Type && - PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1 && - (kwds == NULL || - (PyDict_Check(kwds) && PyDict_Size(kwds) == 0))) - return obj; - /* If the returned object is not an instance of type, - it won't be initialized. */ - if (!PyType_IsSubtype(Py_TYPE(obj), type)) - return obj; - type = Py_TYPE(obj); - if (type->tp_init != NULL) { - int res = type->tp_init(obj, args, kwds); - if (res < 0) { - Py_DECREF(obj); - obj = NULL; - } + obj = _Py_CheckFunctionResult((PyObject*)type, obj, NULL); + if (obj == NULL) + return NULL; + + /* Ugly exception: when the call was type(something), + don't call tp_init on the result. */ + if (type == &PyType_Type && + PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1 && + (kwds == NULL || + (PyDict_Check(kwds) && PyDict_Size(kwds) == 0))) + return obj; + + /* If the returned object is not an instance of type, + it won't be initialized. */ + if (!PyType_IsSubtype(Py_TYPE(obj), type)) + return obj; + + type = Py_TYPE(obj); + if (type->tp_init != NULL) { + int res = type->tp_init(obj, args, kwds); + if (res < 0) { + assert(PyErr_Occurred()); + Py_DECREF(obj); + obj = NULL; + } + else { + assert(!PyErr_Occurred()); } } return obj; @@ -1324,7 +1337,7 @@ static PyTypeObject *solid_base(PyTypeObject *type); /* type test with subclassing support */ -Py_LOCAL_INLINE(int) +static int type_is_subtype_base_chain(PyTypeObject *a, PyTypeObject *b) { do { @@ -1412,36 +1425,38 @@ _PyObject_LookupSpecial(PyObject *self, _Py_Identifier *attrid) as lookup_method to cache the interned name string object. */ static PyObject * -call_method(PyObject *o, _Py_Identifier *nameid, char *format, ...) +call_method(PyObject *o, _Py_Identifier *nameid, const char *format, ...) { va_list va; - PyObject *args, *func = 0, *retval; - va_start(va, format); + PyObject *func = NULL, *retval; func = lookup_maybe(o, nameid); if (func == NULL) { - va_end(va); if (!PyErr_Occurred()) PyErr_SetObject(PyExc_AttributeError, nameid->object); return NULL; } - if (format && *format) + if (format && *format) { + PyObject *args; + + va_start(va, format); args = Py_VaBuildValue(format, va); - else - args = PyTuple_New(0); + va_end(va); - va_end(va); + if (args == NULL) { + Py_DECREF(func); + return NULL; + } + assert(PyTuple_Check(args)); - if (args == NULL) { - Py_DECREF(func); - return NULL; + retval = PyObject_Call(func, args, NULL); + Py_DECREF(args); + } + else { + retval = _PyObject_CallNoArg(func); } - assert(PyTuple_Check(args)); - retval = PyObject_Call(func, args, NULL); - - Py_DECREF(args); Py_DECREF(func); return retval; @@ -1450,36 +1465,38 @@ call_method(PyObject *o, _Py_Identifier *nameid, char *format, ...) /* Clone of call_method() that returns NotImplemented when the lookup fails. */ static PyObject * -call_maybe(PyObject *o, _Py_Identifier *nameid, char *format, ...) +call_maybe(PyObject *o, _Py_Identifier *nameid, const char *format, ...) { va_list va; - PyObject *args, *func = 0, *retval; - va_start(va, format); + PyObject *func = NULL, *retval; func = lookup_maybe(o, nameid); if (func == NULL) { - va_end(va); if (!PyErr_Occurred()) Py_RETURN_NOTIMPLEMENTED; return NULL; } - if (format && *format) + if (format && *format) { + PyObject *args; + + va_start(va, format); args = Py_VaBuildValue(format, va); - else - args = PyTuple_New(0); + va_end(va); - va_end(va); + if (args == NULL) { + Py_DECREF(func); + return NULL; + } + assert(PyTuple_Check(args)); - if (args == NULL) { - Py_DECREF(func); - return NULL; + retval = PyObject_Call(func, args, NULL); + Py_DECREF(args); + } + else { + retval = _PyObject_CallNoArg(func); } - assert(PyTuple_Check(args)); - retval = PyObject_Call(func, args, NULL); - - Py_DECREF(args); Py_DECREF(func); return retval; @@ -1531,7 +1548,6 @@ class_name(PyObject *cls) PyObject *name = _PyObject_GetAttrId(cls, &PyId___name__); if (name == NULL) { PyErr_Clear(); - Py_XDECREF(name); name = PyObject_Repr(cls); } if (name == NULL) @@ -1610,7 +1626,7 @@ consistent method resolution\norder (MRO) for bases"); PyObject *name = class_name(k); char *name_str; if (name != NULL) { - name_str = _PyUnicode_AsString(name); + name_str = PyUnicode_AsUTF8(name); if (name_str == NULL) name_str = "?"; } else @@ -2025,6 +2041,8 @@ static void object_dealloc(PyObject *); static int object_init(PyObject *, PyObject *, PyObject *); static int update_slot(PyTypeObject *, PyObject *); static void fixup_slot_dispatchers(PyTypeObject *); +static int set_names(PyTypeObject *); +static int init_subclass(PyTypeObject *, PyObject *); /* * Helpers for __dict__ descriptor. We don't want to expose the dicts @@ -2089,7 +2107,7 @@ subtype_dict(PyObject *obj, void *context) static int subtype_setdict(PyObject *obj, PyObject *value, void *context) { - PyObject *dict, **dictptr; + PyObject **dictptr; PyTypeObject *base; base = get_builtin_base_with_dict(Py_TYPE(obj)); @@ -2120,10 +2138,8 @@ subtype_setdict(PyObject *obj, PyObject *value, void *context) "not a '%.200s'", Py_TYPE(value)->tp_name); return -1; } - dict = *dictptr; Py_XINCREF(value); - *dictptr = value; - Py_XDECREF(dict); + Py_XSETREF(*dictptr, value); return 0; } @@ -2202,7 +2218,8 @@ type_init(PyObject *cls, PyObject *args, PyObject *kwds) assert(args != NULL && PyTuple_Check(args)); assert(kwds == NULL || PyDict_Check(kwds)); - if (kwds != NULL && PyDict_Check(kwds) && PyDict_Size(kwds) != 0) { + if (kwds != NULL && PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1 && + PyDict_Check(kwds) && PyDict_Size(kwds) != 0) { PyErr_SetString(PyExc_TypeError, "type.__init__() takes no keyword arguments"); return -1; @@ -2269,8 +2286,7 @@ static PyObject * type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) { PyObject *name, *bases = NULL, *orig_dict, *dict = NULL; - static char *kwlist[] = {"name", "bases", "dict", 0}; - PyObject *qualname, *slots = NULL, *tmp, *newslots; + PyObject *qualname, *slots = NULL, *tmp, *newslots, *cell; PyTypeObject *type = NULL, *base, *tmptype, *winner; PyHeapTypeObject *et; PyMemberDef *mp; @@ -2278,16 +2294,19 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) int j, may_add_dict, may_add_weak, add_dict, add_weak; _Py_IDENTIFIER(__qualname__); _Py_IDENTIFIER(__slots__); + _Py_IDENTIFIER(__classcell__); assert(args != NULL && PyTuple_Check(args)); assert(kwds == NULL || PyDict_Check(kwds)); /* Special case: type(x) should return x->ob_type */ - { + /* We only want type itself to accept the one-argument form (#27157) + Note: We don't call PyType_CheckExact as that also allows subclasses */ + if (metatype == &PyType_Type) { const Py_ssize_t nargs = PyTuple_GET_SIZE(args); const Py_ssize_t nkwds = kwds == NULL ? 0 : PyDict_Size(kwds); - if (PyType_CheckExact(metatype) && nargs == 1 && nkwds == 0) { + if (nargs == 1 && nkwds == 0) { PyObject *x = PyTuple_GET_ITEM(args, 0); Py_INCREF(Py_TYPE(x)); return (PyObject *) Py_TYPE(x); @@ -2296,7 +2315,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) /* SF bug 475327 -- if that didn't trigger, we need 3 arguments. but PyArg_ParseTupleAndKeywords below may give a msg saying type() needs exactly 3. */ - if (nargs + nkwds != 3) { + if (nargs != 3) { PyErr_SetString(PyExc_TypeError, "type() takes 1 or 3 arguments"); return NULL; @@ -2304,10 +2323,8 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) } /* Check arguments: (name, bases, dict) */ - if (!PyArg_ParseTupleAndKeywords(args, kwds, "UO!O!:type", kwlist, - &name, - &PyTuple_Type, &bases, - &PyDict_Type, &orig_dict)) + if (!PyArg_ParseTuple(args, "UO!O!:type.__new__", &name, &PyTuple_Type, + &bases, &PyDict_Type, &orig_dict)) return NULL; /* Determine the proper metatype to deal with this: */ @@ -2544,7 +2561,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) } et->ht_qualname = qualname ? qualname : et->ht_name; Py_INCREF(et->ht_qualname); - if (qualname != NULL && PyDict_DelItem(dict, PyId___qualname__.object) < 0) + if (qualname != NULL && _PyDict_DelItemId(dict, &PyId___qualname__) < 0) goto error; /* Set tp_doc to a copy of dict['__doc__'], if the latter is there @@ -2558,7 +2575,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) char *doc_str; char *tp_doc; - doc_str = _PyUnicode_AsString(doc); + doc_str = PyUnicode_AsUTF8(doc); if (doc_str == NULL) goto error; /* Silently truncate the docstring if it contains null bytes. */ @@ -2587,12 +2604,26 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) Py_DECREF(tmp); } + /* Special-case __init_subclass__: if it's a plain function, + make it a classmethod */ + tmp = _PyDict_GetItemId(dict, &PyId___init_subclass__); + if (tmp != NULL && PyFunction_Check(tmp)) { + tmp = PyClassMethod_New(tmp); + if (tmp == NULL) + goto error; + if (_PyDict_SetItemId(dict, &PyId___init_subclass__, tmp) < 0) { + Py_DECREF(tmp); + goto error; + } + Py_DECREF(tmp); + } + /* Add descriptors for custom slots from __slots__, or for __dict__ */ mp = PyHeapType_GET_MEMBERS(et); slotoffset = base->tp_basicsize; if (et->ht_slots != NULL) { for (i = 0; i < nslots; i++, mp++) { - mp->name = _PyUnicode_AsString( + mp->name = PyUnicode_AsUTF8( PyTuple_GET_ITEM(et->ht_slots, i)); if (mp->name == NULL) goto error; @@ -2656,6 +2687,21 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) else type->tp_free = PyObject_Del; + /* store type in class' cell if one is supplied */ + cell = _PyDict_GetItemId(dict, &PyId___classcell__); + if (cell != NULL) { + /* At least one method requires a reference to its defining class */ + if (!PyCell_Check(cell)) { + PyErr_Format(PyExc_TypeError, + "__classcell__ must be a nonlocal cell, not %.200R", + Py_TYPE(cell)); + goto error; + } + PyCell_Set(cell, (PyObject *) type); + _PyDict_DelItemId(dict, &PyId___classcell__); + PyErr_Clear(); + } + /* Initialize the rest */ if (PyType_Ready(type) < 0) goto error; @@ -2667,6 +2713,12 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) et->ht_cached_keys = _PyDict_NewKeysForClass(); } + if (set_names(type) < 0) + goto error; + + if (init_subclass(type, kwds) < 0) + goto error; + Py_DECREF(dict); return (PyObject *)type; @@ -2678,7 +2730,7 @@ error: return NULL; } -static short slotoffsets[] = { +static const short slotoffsets[] = { -1, /* invalid slot */ #include "typeslots.inc" }; @@ -2803,13 +2855,16 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases) /* Set type.__module__ */ s = strrchr(spec->name, '.'); if (s != NULL) { + int err; modname = PyUnicode_FromStringAndSize( spec->name, (Py_ssize_t)(s - spec->name)); if (modname == NULL) { goto fail; } - _PyDict_SetItemId(type->tp_dict, &PyId___module__, modname); + err = _PyDict_SetItemId(type->tp_dict, &PyId___module__, modname); Py_DECREF(modname); + if (err != 0) + goto fail; } else { if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, "builtin type %.200s has no __module__ attribute", @@ -3020,7 +3075,6 @@ type_getattro(PyTypeObject *type, PyObject *name) static int type_setattro(PyTypeObject *type, PyObject *name, PyObject *value) { - int res; if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { PyErr_Format( PyExc_TypeError, @@ -3028,35 +3082,9 @@ type_setattro(PyTypeObject *type, PyObject *name, PyObject *value) type->tp_name); return -1; } - if (PyUnicode_Check(name)) { - if (PyUnicode_CheckExact(name)) { - if (PyUnicode_READY(name) == -1) - return -1; - Py_INCREF(name); - } - else { - name = _PyUnicode_Copy(name); - if (name == NULL) - return -1; - } - PyUnicode_InternInPlace(&name); - if (!PyUnicode_CHECK_INTERNED(name)) { - PyErr_SetString(PyExc_MemoryError, - "Out of memory interning an attribute name"); - Py_DECREF(name); - return -1; - } - } - else { - /* Will fail in _PyObject_GenericSetAttrWithDict. */ - Py_INCREF(name); - } - res = PyObject_GenericSetAttr((PyObject *)type, name, value); - if (res == 0) { - res = update_slot(type, name); - } - Py_DECREF(name); - return res; + if (PyObject_GenericSetAttr((PyObject *)type, name, value) < 0) + return -1; + return update_slot(type, name); } extern void @@ -3638,7 +3666,7 @@ same_slots_added(PyTypeObject *a, PyTypeObject *b) } static int -compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, char* attr) +compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, const char* attr) { PyTypeObject *newbase, *oldbase; @@ -3814,7 +3842,7 @@ import_copyreg(void) return PyImport_Import(copyreg_str); } -Py_LOCAL(PyObject *) +static PyObject * _PyType_GetSlotNames(PyTypeObject *cls) { PyObject *copyreg; @@ -3867,7 +3895,7 @@ _PyType_GetSlotNames(PyTypeObject *cls) return slotnames; } -Py_LOCAL(PyObject *) +static PyObject * _PyObject_GetState(PyObject *obj, int required) { PyObject *state; @@ -3914,6 +3942,24 @@ _PyObject_GetState(PyObject *obj, int required) } assert(slotnames == Py_None || PyList_Check(slotnames)); + if (required) { + Py_ssize_t basicsize = PyBaseObject_Type.tp_basicsize; + if (obj->ob_type->tp_dictoffset) + basicsize += sizeof(PyObject *); + if (obj->ob_type->tp_weaklistoffset) + basicsize += sizeof(PyObject *); + if (slotnames != Py_None) + basicsize += sizeof(PyObject *) * Py_SIZE(slotnames); + if (obj->ob_type->tp_basicsize > basicsize) { + Py_DECREF(slotnames); + Py_DECREF(state); + PyErr_Format(PyExc_TypeError, + "can't pickle %.200s objects", + Py_TYPE(obj)->tp_name); + return NULL; + } + } + if (slotnames != Py_None && Py_SIZE(slotnames) > 0) { PyObject *slots; Py_ssize_t slotnames_size, i; @@ -3968,7 +4014,7 @@ _PyObject_GetState(PyObject *obj, int required) } /* If we found some slot attributes, pack them in a tuple along - the orginal attribute dictionary. */ + the original attribute dictionary. */ if (PyDict_Size(slots) > 0) { PyObject *state2; @@ -3995,7 +4041,7 @@ _PyObject_GetState(PyObject *obj, int required) return state; } -Py_LOCAL(int) +static int _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs) { PyObject *getnewargs, *getnewargs_ex; @@ -4091,7 +4137,7 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs) return 0; } -Py_LOCAL(int) +static int _PyObject_GetItemsIter(PyObject *obj, PyObject **listitems, PyObject **dictitems) { @@ -4137,7 +4183,7 @@ _PyObject_GetItemsIter(PyObject *obj, PyObject **listitems, } static PyObject * -reduce_newobj(PyObject *obj, int proto) +reduce_newobj(PyObject *obj) { PyObject *args = NULL, *kwargs = NULL; PyObject *copyreg; @@ -4190,7 +4236,7 @@ reduce_newobj(PyObject *obj, int proto) } Py_XDECREF(args); } - else if (proto >= 4) { + else if (args != NULL) { _Py_IDENTIFIER(__newobj_ex__); newobj = _PyObject_GetAttrId(copyreg, &PyId___newobj_ex__); @@ -4209,13 +4255,9 @@ reduce_newobj(PyObject *obj, int proto) } } else { - PyErr_SetString(PyExc_ValueError, - "must use protocol 4 or greater to copy this " - "object; since __getnewargs_ex__ returned " - "keyword arguments."); - Py_DECREF(args); + /* args == NULL */ Py_DECREF(kwargs); - Py_DECREF(copyreg); + PyErr_BadInternalCall(); return NULL; } @@ -4263,7 +4305,7 @@ _common_reduce(PyObject *self, int proto) PyObject *copyreg, *res; if (proto >= 2) - return reduce_newobj(self, proto); + return reduce_newobj(self); copyreg = import_copyreg(); if (!copyreg) @@ -4346,6 +4388,18 @@ PyDoc_STRVAR(object_subclasshook_doc, "overrides the normal algorithm (and the outcome is cached).\n"); static PyObject * +object_init_subclass(PyObject *cls, PyObject *arg) +{ + Py_RETURN_NONE; +} + +PyDoc_STRVAR(object_init_subclass_doc, +"This method is called when a class is subclassed.\n" +"\n" +"The default implementation does nothing. It may be\n" +"overridden to extend subclasses.\n"); + +static PyObject * object_format(PyObject *self, PyObject *args) { PyObject *format_spec; @@ -4439,6 +4493,8 @@ static PyMethodDef object_methods[] = { PyDoc_STR("helper for pickle")}, {"__subclasshook__", object_subclasshook, METH_CLASS | METH_VARARGS, object_subclasshook_doc}, + {"__init_subclass__", object_init_subclass, METH_CLASS | METH_NOARGS, + object_init_subclass_doc}, {"__format__", object_format, METH_VARARGS, PyDoc_STR("default object formatter")}, {"__sizeof__", object_sizeof, METH_NOARGS, @@ -5390,7 +5446,7 @@ wrap_delitem(PyObject *self, PyObject *args, void *wrapped) /* Helper to check for object.__setattr__ or __delattr__ applied to a type. This is called the Carlo Verre hack after its discoverer. */ static int -hackcheck(PyObject *self, setattrofunc func, char *what) +hackcheck(PyObject *self, setattrofunc func, const char *what) { PyTypeObject *type = Py_TYPE(self); while (type && type->tp_flags & Py_TPFLAGS_HEAPTYPE) @@ -5677,7 +5733,7 @@ static PyObject * \ FUNCNAME(PyObject *self) \ { \ _Py_static_string(id, OPSTR); \ - return call_method(self, &id, "()"); \ + return call_method(self, &id, NULL); \ } #define SLOT1(FUNCNAME, OPSTR, ARG1TYPE, ARGCODES) \ @@ -5770,7 +5826,7 @@ FUNCNAME(PyObject *self, ARG1TYPE arg1, ARG2TYPE arg2) \ static Py_ssize_t slot_sq_length(PyObject *self) { - PyObject *res = call_method(self, &PyId___len__, "()"); + PyObject *res = call_method(self, &PyId___len__, NULL); Py_ssize_t len; if (res == NULL) @@ -5791,38 +5847,39 @@ slot_sq_length(PyObject *self) static PyObject * slot_sq_item(PyObject *self, Py_ssize_t i) { - PyObject *func, *args = NULL, *ival = NULL, *retval = NULL; + PyObject *func, *ival = NULL, *retval = NULL; descrgetfunc f; func = _PyType_LookupId(Py_TYPE(self), &PyId___getitem__); - if (func != NULL) { - if ((f = Py_TYPE(func)->tp_descr_get) == NULL) - Py_INCREF(func); - else { - func = f(func, self, (PyObject *)(Py_TYPE(self))); - if (func == NULL) { - return NULL; - } - } - ival = PyLong_FromSsize_t(i); - if (ival != NULL) { - args = PyTuple_New(1); - if (args != NULL) { - PyTuple_SET_ITEM(args, 0, ival); - retval = PyObject_Call(func, args, NULL); - Py_XDECREF(args); - Py_XDECREF(func); - return retval; - } - } - } - else { + if (func == NULL) { PyObject *getitem_str = _PyUnicode_FromId(&PyId___getitem__); PyErr_SetObject(PyExc_AttributeError, getitem_str); + return NULL; } - Py_XDECREF(args); - Py_XDECREF(ival); - Py_XDECREF(func); + + f = Py_TYPE(func)->tp_descr_get; + if (f == NULL) { + Py_INCREF(func); + } + else { + func = f(func, self, (PyObject *)(Py_TYPE(self))); + if (func == NULL) { + return NULL; + } + } + + ival = PyLong_FromSsize_t(i); + if (ival == NULL) { + goto error; + } + + retval = _PyObject_CallArg1(func, ival); + Py_DECREF(func); + Py_DECREF(ival); + return retval; + +error: + Py_DECREF(func); return NULL; } @@ -5844,19 +5901,20 @@ slot_sq_ass_item(PyObject *self, Py_ssize_t index, PyObject *value) static int slot_sq_contains(PyObject *self, PyObject *value) { - PyObject *func, *res, *args; + PyObject *func, *res; int result = -1; _Py_IDENTIFIER(__contains__); func = lookup_maybe(self, &PyId___contains__); + if (func == Py_None) { + Py_DECREF(func); + PyErr_Format(PyExc_TypeError, + "'%.200s' object is not a container", + Py_TYPE(self)->tp_name); + return -1; + } if (func != NULL) { - args = PyTuple_Pack(1, value); - if (args == NULL) - res = NULL; - else { - res = PyObject_Call(func, args, NULL); - Py_DECREF(args); - } + res = _PyObject_CallArg1(func, value); Py_DECREF(func); if (res != NULL) { result = PyObject_IsTrue(res); @@ -5927,44 +5985,54 @@ SLOT0(slot_nb_absolute, "__abs__") static int slot_nb_bool(PyObject *self) { - PyObject *func, *args; - int result = -1; + PyObject *func, *value; + int result; int using_len = 0; _Py_IDENTIFIER(__bool__); func = lookup_maybe(self, &PyId___bool__); if (func == NULL) { - if (PyErr_Occurred()) + if (PyErr_Occurred()) { return -1; + } + func = lookup_maybe(self, &PyId___len__); - if (func == NULL) - return PyErr_Occurred() ? -1 : 1; - using_len = 1; - } - args = PyTuple_New(0); - if (args != NULL) { - PyObject *temp = PyObject_Call(func, args, NULL); - Py_DECREF(args); - if (temp != NULL) { - if (using_len) { - /* enforced by slot_nb_len */ - result = PyObject_IsTrue(temp); - } - else if (PyBool_Check(temp)) { - result = PyObject_IsTrue(temp); - } - else { - PyErr_Format(PyExc_TypeError, - "__bool__ should return " - "bool, returned %s", - Py_TYPE(temp)->tp_name); - result = -1; + if (func == NULL) { + if (PyErr_Occurred()) { + return -1; } - Py_DECREF(temp); + return 1; } + using_len = 1; + } + + value = _PyObject_CallNoArg(func); + if (value == NULL) { + goto error; } + + if (using_len) { + /* bool type enforced by slot_nb_len */ + result = PyObject_IsTrue(value); + } + else if (PyBool_Check(value)) { + result = PyObject_IsTrue(value); + } + else { + PyErr_Format(PyExc_TypeError, + "__bool__ should return " + "bool, returned %s", + Py_TYPE(value)->tp_name); + result = -1; + } + + Py_DECREF(value); Py_DECREF(func); return result; + +error: + Py_DECREF(func); + return -1; } @@ -5972,7 +6040,7 @@ static PyObject * slot_nb_index(PyObject *self) { _Py_IDENTIFIER(__index__); - return call_method(self, &PyId___index__, "()"); + return call_method(self, &PyId___index__, NULL); } @@ -6209,20 +6277,14 @@ static _Py_Identifier name_op[] = { static PyObject * slot_tp_richcompare(PyObject *self, PyObject *other, int op) { - PyObject *func, *args, *res; + PyObject *func, *res; func = lookup_method(self, &name_op[op]); if (func == NULL) { PyErr_Clear(); Py_RETURN_NOTIMPLEMENTED; } - args = PyTuple_Pack(1, other); - if (args == NULL) - res = NULL; - else { - res = PyObject_Call(func, args, NULL); - Py_DECREF(args); - } + res = _PyObject_CallArg1(func, other); Py_DECREF(func); return res; } @@ -6234,16 +6296,20 @@ slot_tp_iter(PyObject *self) _Py_IDENTIFIER(__iter__); func = lookup_method(self, &PyId___iter__); + if (func == Py_None) { + Py_DECREF(func); + PyErr_Format(PyExc_TypeError, + "'%.200s' object is not iterable", + Py_TYPE(self)->tp_name); + return NULL; + } + if (func != NULL) { - PyObject *args; - args = res = PyTuple_New(0); - if (args != NULL) { - res = PyObject_Call(func, args, NULL); - Py_DECREF(args); - } + res = _PyObject_CallNoArg(func); Py_DECREF(func); return res; } + PyErr_Clear(); func = lookup_method(self, &PyId___getitem__); if (func == NULL) { @@ -6260,7 +6326,7 @@ static PyObject * slot_tp_iternext(PyObject *self) { _Py_IDENTIFIER(__next__); - return call_method(self, &PyId___next__, "()"); + return call_method(self, &PyId___next__, NULL); } static PyObject * @@ -6329,29 +6395,16 @@ slot_tp_init(PyObject *self, PyObject *args, PyObject *kwds) static PyObject * slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - PyObject *func; - PyObject *newargs, *x; - Py_ssize_t i, n; + PyObject *func, *result; func = _PyObject_GetAttrId((PyObject *)type, &PyId___new__); - if (func == NULL) - return NULL; - assert(PyTuple_Check(args)); - n = PyTuple_GET_SIZE(args); - newargs = PyTuple_New(n+1); - if (newargs == NULL) + if (func == NULL) { return NULL; - Py_INCREF(type); - PyTuple_SET_ITEM(newargs, 0, (PyObject *)type); - for (i = 0; i < n; i++) { - x = PyTuple_GET_ITEM(args, i); - Py_INCREF(x); - PyTuple_SET_ITEM(newargs, i+1, x); } - x = PyObject_Call(func, newargs, kwds); - Py_DECREF(newargs); + + result = _PyObject_Call_Prepend(func, (PyObject *)type, args, kwds); Py_DECREF(func); - return x; + return result; } static void @@ -6876,7 +6929,7 @@ init_slotdefs(void) /* Slots must be ordered by their offset in the PyHeapTypeObject. */ assert(!p[1].name || p->offset <= p[1].offset); p->name_strobj = PyUnicode_InternFromString(p->name); - if (!p->name_strobj || !PyUnicode_CHECK_INTERNED(p->name_strobj)) + if (!p->name_strobj) Py_FatalError("Out of memory interning slotdef names"); } slotdefs_initialized = 1; @@ -6901,9 +6954,6 @@ update_slot(PyTypeObject *type, PyObject *name) slotdef **pp; int offset; - assert(PyUnicode_CheckExact(name)); - assert(PyUnicode_CHECK_INTERNED(name)); - /* Clear the VALID_VERSION flag of 'type' and all its subclasses. This could possibly be unified with the update_subclasses() recursion below, but carefully: @@ -6914,6 +6964,7 @@ update_slot(PyTypeObject *type, PyObject *name) init_slotdefs(); pp = ptrs; for (p = slotdefs; p->name; p++) { + /* XXX assume name is interned! */ if (p->name_strobj == name) *pp++ = p; } @@ -6956,6 +7007,72 @@ update_all_slots(PyTypeObject* type) } } +/* Call __set_name__ on all descriptors in a newly generated type */ +static int +set_names(PyTypeObject *type) +{ + PyObject *names_to_set, *key, *value, *set_name, *tmp; + Py_ssize_t i = 0; + + names_to_set = PyDict_Copy(type->tp_dict); + if (names_to_set == NULL) + return -1; + + while (PyDict_Next(names_to_set, &i, &key, &value)) { + set_name = lookup_maybe(value, &PyId___set_name__); + if (set_name != NULL) { + tmp = PyObject_CallFunctionObjArgs(set_name, type, key, NULL); + Py_DECREF(set_name); + if (tmp == NULL) { + _PyErr_FormatFromCause(PyExc_RuntimeError, + "Error calling __set_name__ on '%.100s' instance %R " + "in '%.100s'", + value->ob_type->tp_name, key, type->tp_name); + Py_DECREF(names_to_set); + return -1; + } + else + Py_DECREF(tmp); + } + else if (PyErr_Occurred()) { + Py_DECREF(names_to_set); + return -1; + } + } + + Py_DECREF(names_to_set); + return 0; +} + +/* Call __init_subclass__ on the parent of a newly generated type */ +static int +init_subclass(PyTypeObject *type, PyObject *kwds) +{ + PyObject *super, *func, *result; + PyObject *args[2] = {(PyObject *)type, (PyObject *)type}; + + super = _PyObject_FastCall((PyObject *)&PySuper_Type, args, 2); + if (super == NULL) { + return -1; + } + + func = _PyObject_GetAttrId(super, &PyId___init_subclass__); + Py_DECREF(super); + if (func == NULL) { + return -1; + } + + + result = _PyObject_FastCallDict(func, NULL, 0, kwds); + Py_DECREF(func); + if (result == NULL) { + return -1; + } + + Py_DECREF(result); + return 0; +} + /* recurse_down_subclasses() and update_subclasses() are mutually recursive functions to call a callback for all subclasses, but refraining from recursing into subclasses that define 'name'. */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 571cd77..9c998f7 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -42,6 +42,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "Python.h" #include "ucnhash.h" #include "bytes_methods.h" +#include "stringlib/eq.h" #ifdef MS_WINDOWS #include @@ -162,6 +163,14 @@ extern "C" { *_to++ = (to_type) *_iter++; \ } while (0) +#ifdef MS_WINDOWS + /* On Windows, overallocate by 50% is the best factor */ +# define OVERALLOCATE_FACTOR 2 +#else + /* On Linux, overallocate by 25% is the best factor */ +# define OVERALLOCATE_FACTOR 4 +#endif + /* This dictionary holds all interned unicode strings. Note that references to strings in this dictionary are *not* counted in the string's ob_refcnt. When the interned string reaches a refcnt of 0 the string deallocation @@ -195,7 +204,7 @@ static PyObject *unicode_empty = NULL; } while (0) /* Forward declaration */ -Py_LOCAL_INLINE(int) +static inline int _PyUnicodeWriter_WriteCharInline(_PyUnicodeWriter *writer, Py_UCS4 ch); /* List of static strings. */ @@ -263,7 +272,7 @@ raise_encode_exception(PyObject **exceptionObject, const char *reason); /* Same for linebreaks */ -static unsigned char ascii_linebreak[] = { +static const unsigned char ascii_linebreak[] = { 0, 0, 0, 0, 0, 0, 0, 0, /* 0x000A, * LINE FEED */ /* 0x000B, * LINE TABULATION */ @@ -292,6 +301,45 @@ static unsigned char ascii_linebreak[] = { #include "clinic/unicodeobject.c.h" +typedef enum { + _Py_ERROR_UNKNOWN=0, + _Py_ERROR_STRICT, + _Py_ERROR_SURROGATEESCAPE, + _Py_ERROR_REPLACE, + _Py_ERROR_IGNORE, + _Py_ERROR_BACKSLASHREPLACE, + _Py_ERROR_SURROGATEPASS, + _Py_ERROR_XMLCHARREFREPLACE, + _Py_ERROR_OTHER +} _Py_error_handler; + +static _Py_error_handler +get_error_handler(const char *errors) +{ + if (errors == NULL || strcmp(errors, "strict") == 0) { + return _Py_ERROR_STRICT; + } + if (strcmp(errors, "surrogateescape") == 0) { + return _Py_ERROR_SURROGATEESCAPE; + } + if (strcmp(errors, "replace") == 0) { + return _Py_ERROR_REPLACE; + } + if (strcmp(errors, "ignore") == 0) { + return _Py_ERROR_IGNORE; + } + if (strcmp(errors, "backslashreplace") == 0) { + return _Py_ERROR_BACKSLASHREPLACE; + } + if (strcmp(errors, "surrogatepass") == 0) { + return _Py_ERROR_SURROGATEPASS; + } + if (strcmp(errors, "xmlcharrefreplace") == 0) { + return _Py_ERROR_XMLCHARREFREPLACE; + } + return _Py_ERROR_OTHER; +} + /* The max unicode value is always 0x10FFFF while using the PEP-393 API. This function is kept for backward compatibility with the old API. */ Py_UNICODE @@ -521,6 +569,129 @@ unicode_result_unchanged(PyObject *unicode) return _PyUnicode_Copy(unicode); } +/* Implementation of the "backslashreplace" error handler for 8-bit encodings: + ASCII, Latin1, UTF-8, etc. */ +static char* +backslashreplace(_PyBytesWriter *writer, char *str, + PyObject *unicode, Py_ssize_t collstart, Py_ssize_t collend) +{ + Py_ssize_t size, i; + Py_UCS4 ch; + enum PyUnicode_Kind kind; + void *data; + + assert(PyUnicode_IS_READY(unicode)); + kind = PyUnicode_KIND(unicode); + data = PyUnicode_DATA(unicode); + + size = 0; + /* determine replacement size */ + for (i = collstart; i < collend; ++i) { + Py_ssize_t incr; + + ch = PyUnicode_READ(kind, data, i); + if (ch < 0x100) + incr = 2+2; + else if (ch < 0x10000) + incr = 2+4; + else { + assert(ch <= MAX_UNICODE); + incr = 2+8; + } + if (size > PY_SSIZE_T_MAX - incr) { + PyErr_SetString(PyExc_OverflowError, + "encoded result is too long for a Python string"); + return NULL; + } + size += incr; + } + + str = _PyBytesWriter_Prepare(writer, str, size); + if (str == NULL) + return NULL; + + /* generate replacement */ + for (i = collstart; i < collend; ++i) { + ch = PyUnicode_READ(kind, data, i); + *str++ = '\\'; + if (ch >= 0x00010000) { + *str++ = 'U'; + *str++ = Py_hexdigits[(ch>>28)&0xf]; + *str++ = Py_hexdigits[(ch>>24)&0xf]; + *str++ = Py_hexdigits[(ch>>20)&0xf]; + *str++ = Py_hexdigits[(ch>>16)&0xf]; + *str++ = Py_hexdigits[(ch>>12)&0xf]; + *str++ = Py_hexdigits[(ch>>8)&0xf]; + } + else if (ch >= 0x100) { + *str++ = 'u'; + *str++ = Py_hexdigits[(ch>>12)&0xf]; + *str++ = Py_hexdigits[(ch>>8)&0xf]; + } + else + *str++ = 'x'; + *str++ = Py_hexdigits[(ch>>4)&0xf]; + *str++ = Py_hexdigits[ch&0xf]; + } + return str; +} + +/* Implementation of the "xmlcharrefreplace" error handler for 8-bit encodings: + ASCII, Latin1, UTF-8, etc. */ +static char* +xmlcharrefreplace(_PyBytesWriter *writer, char *str, + PyObject *unicode, Py_ssize_t collstart, Py_ssize_t collend) +{ + Py_ssize_t size, i; + Py_UCS4 ch; + enum PyUnicode_Kind kind; + void *data; + + assert(PyUnicode_IS_READY(unicode)); + kind = PyUnicode_KIND(unicode); + data = PyUnicode_DATA(unicode); + + size = 0; + /* determine replacement size */ + for (i = collstart; i < collend; ++i) { + Py_ssize_t incr; + + ch = PyUnicode_READ(kind, data, i); + if (ch < 10) + incr = 2+1+1; + else if (ch < 100) + incr = 2+2+1; + else if (ch < 1000) + incr = 2+3+1; + else if (ch < 10000) + incr = 2+4+1; + else if (ch < 100000) + incr = 2+5+1; + else if (ch < 1000000) + incr = 2+6+1; + else { + assert(ch <= MAX_UNICODE); + incr = 2+7+1; + } + if (size > PY_SSIZE_T_MAX - incr) { + PyErr_SetString(PyExc_OverflowError, + "encoded result is too long for a Python string"); + return NULL; + } + size += incr; + } + + str = _PyBytesWriter_Prepare(writer, str, size); + if (str == NULL) + return NULL; + + /* generate replacement */ + for (i = collstart; i < collend; ++i) { + str += sprintf(str, "&#%d;", PyUnicode_READ(kind, data, i)); + } + return str; +} + /* --- Bloom Filters ----------------------------------------------------- */ /* stuff to implement simple "bloom filters" for Unicode characters. @@ -549,7 +720,7 @@ static BLOOM_MASK bloom_linebreak = ~(BLOOM_MASK)0; ((ch) < 128U ? ascii_linebreak[(ch)] : \ (BLOOM(bloom_linebreak, (ch)) && Py_UNICODE_ISLINEBREAK(ch))) -Py_LOCAL_INLINE(BLOOM_MASK) +static inline BLOOM_MASK make_bloom_mask(int kind, void* ptr, Py_ssize_t len) { #define BLOOM_UPDATE(TYPE, MASK, PTR, LEN) \ @@ -587,6 +758,18 @@ make_bloom_mask(int kind, void* ptr, Py_ssize_t len) #undef BLOOM_UPDATE } +static int +ensure_unicode(PyObject *obj) +{ + if (!PyUnicode_Check(obj)) { + PyErr_Format(PyExc_TypeError, + "must be str, not %.100s", + Py_TYPE(obj)->tp_name); + return -1; + } + return PyUnicode_READY(obj); +} + /* Compilation of templated routines */ #include "stringlib/asciilib.h" @@ -643,31 +826,31 @@ make_bloom_mask(int kind, void* ptr, Py_ssize_t len) static PyObject * fixup(PyObject *self, Py_UCS4 (*fixfct)(PyObject *s)); -Py_LOCAL_INLINE(Py_ssize_t) findchar(const void *s, int kind, - Py_ssize_t size, Py_UCS4 ch, - int direction) +static inline Py_ssize_t +findchar(const void *s, int kind, + Py_ssize_t size, Py_UCS4 ch, + int direction) { - int mode = (direction == 1) ? FAST_SEARCH : FAST_RSEARCH; - switch (kind) { case PyUnicode_1BYTE_KIND: - { - Py_UCS1 ch1 = (Py_UCS1) ch; - if (ch1 == ch) - return ucs1lib_fastsearch((Py_UCS1 *) s, size, &ch1, 1, 0, mode); - else - return -1; - } + if ((Py_UCS1) ch != ch) + return -1; + if (direction > 0) + return ucs1lib_find_char((Py_UCS1 *) s, size, (Py_UCS1) ch); + else + return ucs1lib_rfind_char((Py_UCS1 *) s, size, (Py_UCS1) ch); case PyUnicode_2BYTE_KIND: - { - Py_UCS2 ch2 = (Py_UCS2) ch; - if (ch2 == ch) - return ucs2lib_fastsearch((Py_UCS2 *) s, size, &ch2, 1, 0, mode); - else - return -1; - } + if ((Py_UCS2) ch != ch) + return -1; + if (direction > 0) + return ucs2lib_find_char((Py_UCS2 *) s, size, (Py_UCS2) ch); + else + return ucs2lib_rfind_char((Py_UCS2 *) s, size, (Py_UCS2) ch); case PyUnicode_4BYTE_KIND: - return ucs4lib_fastsearch((Py_UCS4 *) s, size, &ch, 1, 0, mode); + if (direction > 0) + return ucs4lib_find_char((Py_UCS4 *) s, size, ch); + else + return ucs4lib_rfind_char((Py_UCS4 *) s, size, ch); default: assert(0); return -1; @@ -865,7 +1048,7 @@ resize_copy(PyObject *unicode, Py_ssize_t length) return NULL; copy_length = _PyUnicode_WSTR_LENGTH(unicode); copy_length = Py_MIN(copy_length, length); - Py_MEMCPY(_PyUnicode_WSTR(w), _PyUnicode_WSTR(unicode), + memcpy(_PyUnicode_WSTR(w), _PyUnicode_WSTR(unicode), copy_length * sizeof(wchar_t)); return w; } @@ -1252,7 +1435,7 @@ _copy_characters(PyObject *to, Py_ssize_t to_start, if (max_char >= 128) return -1; } - Py_MEMCPY((char*)to_data + to_kind * to_start, + memcpy((char*)to_data + to_kind * to_start, (char*)from_data + from_kind * from_start, to_kind * how_many); } @@ -1845,7 +2028,7 @@ PyUnicode_FromUnicode(const Py_UNICODE *u, Py_ssize_t size) break; case PyUnicode_2BYTE_KIND: #if Py_UNICODE_SIZE == 2 - Py_MEMCPY(PyUnicode_2BYTE_DATA(unicode), u, size * 2); + memcpy(PyUnicode_2BYTE_DATA(unicode), u, size * 2); #else _PyUnicode_CONVERT_BYTES(Py_UNICODE, Py_UCS2, u, u + size, PyUnicode_2BYTE_DATA(unicode)); @@ -1858,7 +2041,7 @@ PyUnicode_FromUnicode(const Py_UNICODE *u, Py_ssize_t size) unicode_convert_wchar_to_ucs4(u, u + size, unicode); #else assert(num_surrogates == 0); - Py_MEMCPY(PyUnicode_4BYTE_DATA(unicode), u, size * 4); + memcpy(PyUnicode_4BYTE_DATA(unicode), u, size * 4); #endif break; default: @@ -1960,7 +2143,7 @@ kind_maxchar_limit(unsigned int kind) } } -Py_LOCAL_INLINE(Py_UCS4) +static inline Py_UCS4 align_maxchar(Py_UCS4 maxchar) { if (maxchar <= 127) @@ -2169,7 +2352,7 @@ _PyUnicode_Copy(PyObject *unicode) return NULL; assert(PyUnicode_KIND(copy) == PyUnicode_KIND(unicode)); - Py_MEMCPY(PyUnicode_DATA(copy), PyUnicode_DATA(unicode), + memcpy(PyUnicode_DATA(copy), PyUnicode_DATA(unicode), length * PyUnicode_KIND(unicode)); assert(_PyUnicode_CheckConsistency(copy, 1)); return copy; @@ -2275,7 +2458,7 @@ as_ucs4(PyObject *string, Py_UCS4 *target, Py_ssize_t targetsize, } else { assert(kind == PyUnicode_4BYTE_KIND); - Py_MEMCPY(target, data, len * sizeof(Py_UCS4)); + memcpy(target, data, len * sizeof(Py_UCS4)); } if (copy_null) target[len] = 0; @@ -2458,13 +2641,11 @@ unicode_fromformat_arg(_PyUnicodeWriter *writer, longflag = 1; ++f; } -#ifdef HAVE_LONG_LONG else if (f[1] == 'l' && (f[2] == 'd' || f[2] == 'u' || f[2] == 'i')) { longlongflag = 1; f += 2; } -#endif } /* handle the size_t flag. */ else if (*f == 'z' && (f[1] == 'd' || f[1] == 'u' || f[1] == 'i')) { @@ -2502,11 +2683,9 @@ unicode_fromformat_arg(_PyUnicodeWriter *writer, if (longflag) len = sprintf(buffer, "%lu", va_arg(*vargs, unsigned long)); -#ifdef HAVE_LONG_LONG else if (longlongflag) - len = sprintf(buffer, "%" PY_FORMAT_LONG_LONG "u", - va_arg(*vargs, unsigned PY_LONG_LONG)); -#endif + len = sprintf(buffer, "%llu", + va_arg(*vargs, unsigned long long)); else if (size_tflag) len = sprintf(buffer, "%" PY_FORMAT_SIZE_T "u", va_arg(*vargs, size_t)); @@ -2521,11 +2700,9 @@ unicode_fromformat_arg(_PyUnicodeWriter *writer, if (longflag) len = sprintf(buffer, "%li", va_arg(*vargs, long)); -#ifdef HAVE_LONG_LONG else if (longlongflag) - len = sprintf(buffer, "%" PY_FORMAT_LONG_LONG "i", - va_arg(*vargs, PY_LONG_LONG)); -#endif + len = sprintf(buffer, "%lli", + va_arg(*vargs, long long)); else if (size_tflag) len = sprintf(buffer, "%" PY_FORMAT_SIZE_T "i", va_arg(*vargs, Py_ssize_t)); @@ -2701,9 +2878,8 @@ PyUnicode_FromFormatV(const char *format, va_list vargs) writer.min_length = strlen(format) + 100; writer.overallocate = 1; - /* va_list may be an array (of 1 item) on some platforms (ex: AMD64). - Copy it to be able to pass a reference to a subfunction. */ - Py_VA_COPY(vargs2, vargs); + // Copy varags to be able to pass a reference to a subfunction. + va_copy(vargs2, vargs); for (f = format; *f; ) { if (*f == '%') { @@ -2739,9 +2915,11 @@ PyUnicode_FromFormatV(const char *format, va_list vargs) f = p; } } + va_end(vargs2); return _PyUnicodeWriter_Finish(&writer); fail: + va_end(vargs2); _PyUnicodeWriter_Dealloc(&writer); return NULL; } @@ -2790,7 +2968,7 @@ unicode_aswidechar(PyObject *unicode, size = res + 1; else res = size; - Py_MEMCPY(w, wstr, size * sizeof(wchar_t)); + memcpy(w, wstr, size * sizeof(wchar_t)); return res; } else @@ -2839,37 +3017,6 @@ PyUnicode_AsWideCharString(PyObject *unicode, return buffer; } -wchar_t* -_PyUnicode_AsWideCharString(PyObject *unicode) -{ - const wchar_t *wstr; - wchar_t *buffer; - Py_ssize_t buflen; - - if (unicode == NULL) { - PyErr_BadInternalCall(); - return NULL; - } - - wstr = PyUnicode_AsUnicodeAndSize(unicode, &buflen); - if (wstr == NULL) { - return NULL; - } - if (wcslen(wstr) != (size_t)buflen) { - PyErr_SetString(PyExc_ValueError, - "embedded null character"); - return NULL; - } - - buffer = PyMem_NEW(wchar_t, buflen + 1); - if (buffer == NULL) { - PyErr_NoMemory(); - return NULL; - } - memcpy(buffer, wstr, (buflen + 1) * sizeof(wchar_t)); - return buffer; -} - #endif /* HAVE_WCHAR_H */ PyObject * @@ -2938,7 +3085,7 @@ PyUnicode_FromEncodedObject(PyObject *obj, /* Retrieve a bytes buffer view through the PEP 3118 buffer interface */ if (PyObject_GetBuffer(obj, &buffer, PyBUF_SIMPLE) < 0) { PyErr_Format(PyExc_TypeError, - "coercing to str: need a bytes-like object, %.80s found", + "decoding to str: need a bytes-like object, %.80s found", Py_TYPE(obj)->tp_name); return NULL; } @@ -2953,9 +3100,9 @@ PyUnicode_FromEncodedObject(PyObject *obj, return v; } -/* Convert encoding to lower case and replace '_' with '-' in order to - catch e.g. UTF_8. Return 0 on error (encoding is longer than lower_len-1), - 1 on success. */ +/* Normalize an encoding name: similar to encodings.normalize_encoding(), but + also convert to lowercase. Return 1 on success, or 0 on error (encoding is + longer than lower_len-1). */ int _Py_normalize_encoding(const char *encoding, char *lower, @@ -2964,30 +3111,39 @@ _Py_normalize_encoding(const char *encoding, const char *e; char *l; char *l_end; + int punct; + + assert(encoding != NULL); - if (encoding == NULL) { - /* 6 == strlen("utf-8") + 1 */ - if (lower_len < 6) - return 0; - strcpy(lower, "utf-8"); - return 1; - } e = encoding; l = lower; l_end = &lower[lower_len - 1]; - while (*e) { - if (l == l_end) - return 0; - if (Py_ISUPPER(*e)) { - *l++ = Py_TOLOWER(*e++); + punct = 0; + while (1) { + char c = *e; + if (c == 0) { + break; } - else if (*e == '_') { - *l++ = '-'; - e++; + + if (Py_ISALNUM(c) || c == '.') { + if (punct && l != lower) { + if (l == l_end) { + return 0; + } + *l++ = '_'; + } + punct = 0; + + if (l == l_end) { + return 0; + } + *l++ = Py_TOLOWER(c); } else { - *l++ = *e++; + punct = 1; } + + e++; } *l = '\0'; return 1; @@ -3001,28 +3157,51 @@ PyUnicode_Decode(const char *s, { PyObject *buffer = NULL, *unicode; Py_buffer info; - char lower[11]; /* Enough for any encoding shortcut */ + char buflower[11]; /* strlen("iso-8859-1\0") == 11, longest shortcut */ + + if (encoding == NULL) { + return PyUnicode_DecodeUTF8Stateful(s, size, errors, NULL); + } /* Shortcuts for common default encodings */ - if (_Py_normalize_encoding(encoding, lower, sizeof(lower))) { - if ((strcmp(lower, "utf-8") == 0) || - (strcmp(lower, "utf8") == 0)) - return PyUnicode_DecodeUTF8Stateful(s, size, errors, NULL); - else if ((strcmp(lower, "latin-1") == 0) || - (strcmp(lower, "latin1") == 0) || - (strcmp(lower, "iso-8859-1") == 0) || - (strcmp(lower, "iso8859-1") == 0)) - return PyUnicode_DecodeLatin1(s, size, errors); -#ifdef HAVE_MBCS - else if (strcmp(lower, "mbcs") == 0) - return PyUnicode_DecodeMBCS(s, size, errors); -#endif - else if (strcmp(lower, "ascii") == 0) - return PyUnicode_DecodeASCII(s, size, errors); - else if (strcmp(lower, "utf-16") == 0) - return PyUnicode_DecodeUTF16(s, size, errors, 0); - else if (strcmp(lower, "utf-32") == 0) - return PyUnicode_DecodeUTF32(s, size, errors, 0); + if (_Py_normalize_encoding(encoding, buflower, sizeof(buflower))) { + char *lower = buflower; + + /* Fast paths */ + if (lower[0] == 'u' && lower[1] == 't' && lower[2] == 'f') { + lower += 3; + if (*lower == '_') { + /* Match "utf8" and "utf_8" */ + lower++; + } + + if (lower[0] == '8' && lower[1] == 0) { + return PyUnicode_DecodeUTF8Stateful(s, size, errors, NULL); + } + else if (lower[0] == '1' && lower[1] == '6' && lower[2] == 0) { + return PyUnicode_DecodeUTF16(s, size, errors, 0); + } + else if (lower[0] == '3' && lower[1] == '2' && lower[2] == 0) { + return PyUnicode_DecodeUTF32(s, size, errors, 0); + } + } + else { + if (strcmp(lower, "ascii") == 0 + || strcmp(lower, "us_ascii") == 0) { + return PyUnicode_DecodeASCII(s, size, errors); + } + #ifdef MS_WINDOWS + else if (strcmp(lower, "mbcs") == 0) { + return PyUnicode_DecodeMBCS(s, size, errors); + } + #endif + else if (strcmp(lower, "latin1") == 0 + || strcmp(lower, "latin_1") == 0 + || strcmp(lower, "iso_8859_1") == 0 + || strcmp(lower, "iso8859_1") == 0) { + return PyUnicode_DecodeLatin1(s, size, errors); + } + } } /* Decode via the codec registry */ @@ -3062,6 +3241,11 @@ PyUnicode_AsDecodedObject(PyObject *unicode, return NULL; } + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "PyUnicode_AsDecodedObject() is deprecated; " + "use PyCodec_Decode() to decode from str", 1) < 0) + return NULL; + if (encoding == NULL) encoding = PyUnicode_GetDefaultEncoding(); @@ -3081,6 +3265,11 @@ PyUnicode_AsDecodedUnicode(PyObject *unicode, goto onError; } + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "PyUnicode_AsDecodedUnicode() is deprecated; " + "use PyCodec_Decode() to decode from str to str", 1) < 0) + return NULL; + if (encoding == NULL) encoding = PyUnicode_GetDefaultEncoding(); @@ -3131,6 +3320,12 @@ PyUnicode_AsEncodedObject(PyObject *unicode, goto onError; } + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "PyUnicode_AsEncodedObject() is deprecated; " + "use PyUnicode_AsEncodedString() to encode from str to bytes " + "or PyCodec_Encode() for generic encoding", 1) < 0) + return NULL; + if (encoding == NULL) encoding = PyUnicode_GetDefaultEncoding(); @@ -3194,24 +3389,22 @@ wcstombs_errorpos(const wchar_t *wstr) static int locale_error_handler(const char *errors, int *surrogateescape) { - if (errors == NULL) { - *surrogateescape = 0; - return 0; - } - - if (strcmp(errors, "strict") == 0) { + _Py_error_handler error_handler = get_error_handler(errors); + switch (error_handler) + { + case _Py_ERROR_STRICT: *surrogateescape = 0; return 0; - } - if (strcmp(errors, "surrogateescape") == 0) { + case _Py_ERROR_SURROGATEESCAPE: *surrogateescape = 1; return 0; + default: + PyErr_Format(PyExc_ValueError, + "only 'strict' and 'surrogateescape' error handlers " + "are supported, not '%s'", + errors); + return -1; } - PyErr_Format(PyExc_ValueError, - "only 'strict' and 'surrogateescape' error handlers " - "are supported, not '%s'", - errors); - return -1; } PyObject * @@ -3327,10 +3520,8 @@ encode_error: PyObject * PyUnicode_EncodeFSDefault(PyObject *unicode) { -#ifdef HAVE_MBCS - return PyUnicode_EncodeCodePage(CP_ACP, unicode, NULL); -#elif defined(__APPLE__) - return _PyUnicode_AsUTF8String(unicode, "surrogateescape"); +#if defined(__APPLE__) + return _PyUnicode_AsUTF8String(unicode, Py_FileSystemDefaultEncodeErrors); #else PyInterpreterState *interp = PyThreadState_GET()->interp; /* Bootstrap check: if the filesystem codec is implemented in Python, we @@ -3345,10 +3536,10 @@ PyUnicode_EncodeFSDefault(PyObject *unicode) if (Py_FileSystemDefaultEncoding && interp->fscodec_initialized) { return PyUnicode_AsEncodedString(unicode, Py_FileSystemDefaultEncoding, - "surrogateescape"); + Py_FileSystemDefaultEncodeErrors); } else { - return PyUnicode_EncodeLocale(unicode, "surrogateescape"); + return PyUnicode_EncodeLocale(unicode, Py_FileSystemDefaultEncodeErrors); } #endif } @@ -3359,34 +3550,56 @@ PyUnicode_AsEncodedString(PyObject *unicode, const char *errors) { PyObject *v; - char lower[11]; /* Enough for any encoding shortcut */ + char buflower[11]; /* strlen("iso_8859_1\0") == 11, longest shortcut */ if (!PyUnicode_Check(unicode)) { PyErr_BadArgument(); return NULL; } + if (encoding == NULL) { + return _PyUnicode_AsUTF8String(unicode, errors); + } + /* Shortcuts for common default encodings */ - if (_Py_normalize_encoding(encoding, lower, sizeof(lower))) { - if ((strcmp(lower, "utf-8") == 0) || - (strcmp(lower, "utf8") == 0)) - { - if (errors == NULL || strcmp(errors, "strict") == 0) - return _PyUnicode_AsUTF8String(unicode, NULL); - else + if (_Py_normalize_encoding(encoding, buflower, sizeof(buflower))) { + char *lower = buflower; + + /* Fast paths */ + if (lower[0] == 'u' && lower[1] == 't' && lower[2] == 'f') { + lower += 3; + if (*lower == '_') { + /* Match "utf8" and "utf_8" */ + lower++; + } + + if (lower[0] == '8' && lower[1] == 0) { return _PyUnicode_AsUTF8String(unicode, errors); + } + else if (lower[0] == '1' && lower[1] == '6' && lower[2] == 0) { + return _PyUnicode_EncodeUTF16(unicode, errors, 0); + } + else if (lower[0] == '3' && lower[1] == '2' && lower[2] == 0) { + return _PyUnicode_EncodeUTF32(unicode, errors, 0); + } } - else if ((strcmp(lower, "latin-1") == 0) || - (strcmp(lower, "latin1") == 0) || - (strcmp(lower, "iso-8859-1") == 0) || - (strcmp(lower, "iso8859-1") == 0)) - return _PyUnicode_AsLatin1String(unicode, errors); -#ifdef HAVE_MBCS - else if (strcmp(lower, "mbcs") == 0) - return PyUnicode_EncodeCodePage(CP_ACP, unicode, errors); + else { + if (strcmp(lower, "ascii") == 0 + || strcmp(lower, "us_ascii") == 0) { + return _PyUnicode_AsASCIIString(unicode, errors); + } +#ifdef MS_WINDOWS + else if (strcmp(lower, "mbcs") == 0) { + return PyUnicode_EncodeCodePage(CP_ACP, unicode, errors); + } #endif - else if (strcmp(lower, "ascii") == 0) - return _PyUnicode_AsASCIIString(unicode, errors); + else if (strcmp(lower, "latin1") == 0 || + strcmp(lower, "latin_1") == 0 || + strcmp(lower, "iso_8859_1") == 0 || + strcmp(lower, "iso8859_1") == 0) { + return _PyUnicode_AsLatin1String(unicode, errors); + } + } } /* Encode via the codec registry */ @@ -3438,6 +3651,11 @@ PyUnicode_AsEncodedUnicode(PyObject *unicode, goto onError; } + if (PyErr_WarnEx(PyExc_DeprecationWarning, + "PyUnicode_AsEncodedUnicode() is deprecated; " + "use PyCodec_Encode() to encode from str to str", 1) < 0) + return NULL; + if (encoding == NULL) encoding = PyUnicode_GetDefaultEncoding(); @@ -3611,10 +3829,8 @@ PyUnicode_DecodeFSDefault(const char *s) { PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) { -#ifdef HAVE_MBCS - return PyUnicode_DecodeMBCS(s, size, NULL); -#elif defined(__APPLE__) - return PyUnicode_DecodeUTF8Stateful(s, size, "surrogateescape", NULL); +#if defined(__APPLE__) + return PyUnicode_DecodeUTF8Stateful(s, size, Py_FileSystemDefaultEncodeErrors, NULL); #else PyInterpreterState *interp = PyThreadState_GET()->interp; /* Bootstrap check: if the filesystem codec is implemented in Python, we @@ -3629,10 +3845,10 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) if (Py_FileSystemDefaultEncoding && interp->fscodec_initialized) { return PyUnicode_Decode(s, size, Py_FileSystemDefaultEncoding, - "surrogateescape"); + Py_FileSystemDefaultEncodeErrors); } else { - return PyUnicode_DecodeLocaleAndSize(s, size, "surrogateescape"); + return PyUnicode_DecodeLocaleAndSize(s, size, Py_FileSystemDefaultEncodeErrors); } #endif } @@ -3641,6 +3857,7 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) int PyUnicode_FSConverter(PyObject* arg, void* addr) { + PyObject *path = NULL; PyObject *output = NULL; Py_ssize_t size; void *data; @@ -3649,24 +3866,22 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) *(PyObject**)addr = NULL; return 1; } - if (PyBytes_Check(arg)) { - output = arg; - Py_INCREF(output); + path = PyOS_FSPath(arg); + if (path == NULL) { + return 0; + } + if (PyBytes_Check(path)) { + output = path; } - else { - arg = PyUnicode_FromObject(arg); - if (!arg) - return 0; - output = PyUnicode_EncodeFSDefault(arg); - Py_DECREF(arg); - if (!output) - return 0; - if (!PyBytes_Check(output)) { - Py_DECREF(output); - PyErr_SetString(PyExc_TypeError, "encoder failed to return bytes"); + else { // PyOS_FSPath() guarantees its returned value is bytes or str. + output = PyUnicode_EncodeFSDefault(path); + Py_DECREF(path); + if (!output) { return 0; } + assert(PyBytes_Check(output)); } + size = PyBytes_GET_SIZE(output); data = PyBytes_AS_STRING(output); if ((size_t)size != strlen(data)) { @@ -3682,37 +3897,60 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) int PyUnicode_FSDecoder(PyObject* arg, void* addr) { + int is_buffer = 0; + PyObject *path = NULL; PyObject *output = NULL; if (arg == NULL) { Py_DECREF(*(PyObject**)addr); - *(PyObject**)addr = NULL; return 1; } - if (PyUnicode_Check(arg)) { - if (PyUnicode_READY(arg) == -1) + + is_buffer = PyObject_CheckBuffer(arg); + if (!is_buffer) { + path = PyOS_FSPath(arg); + if (path == NULL) { + return 0; + } + } + else { + path = arg; + Py_INCREF(arg); + } + + if (PyUnicode_Check(path)) { + if (PyUnicode_READY(path) == -1) { + Py_DECREF(path); return 0; - output = arg; - Py_INCREF(output); + } + output = path; } - else if (PyObject_CheckBuffer(arg)) { - arg = PyBytes_FromObject(arg); - if (!arg) + else if (PyBytes_Check(path) || is_buffer) { + PyObject *path_bytes = NULL; + + if (!PyBytes_Check(path) && + PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "path should be string, bytes, or os.PathLike, not %.200s", + Py_TYPE(arg)->tp_name)) { + Py_DECREF(path); return 0; - output = PyUnicode_DecodeFSDefaultAndSize(PyBytes_AS_STRING(arg), - PyBytes_GET_SIZE(arg)); - Py_DECREF(arg); - if (!output) + } + path_bytes = PyBytes_FromObject(path); + Py_DECREF(path); + if (!path_bytes) { return 0; - if (!PyUnicode_Check(output)) { - Py_DECREF(output); - PyErr_SetString(PyExc_TypeError, "decoder failed to return unicode"); + } + output = PyUnicode_DecodeFSDefaultAndSize(PyBytes_AS_STRING(path_bytes), + PyBytes_GET_SIZE(path_bytes)); + Py_DECREF(path_bytes); + if (!output) { return 0; } } else { PyErr_Format(PyExc_TypeError, - "path should be string or bytes, not %.200s", + "path should be string, bytes, or os.PathLike, not %.200s", Py_TYPE(arg)->tp_name); + Py_DECREF(path); return 0; } if (PyUnicode_READY(output) == -1) { @@ -3744,7 +3982,7 @@ PyUnicode_AsUTF8AndSize(PyObject *unicode, Py_ssize_t *psize) if (PyUnicode_UTF8(unicode) == NULL) { assert(!PyUnicode_IS_COMPACT_ASCII(unicode)); - bytes = _PyUnicode_AsUTF8String(unicode, "strict"); + bytes = _PyUnicode_AsUTF8String(unicode, NULL); if (bytes == NULL) return NULL; _PyUnicode_UTF8(unicode) = PyObject_MALLOC(PyBytes_GET_SIZE(bytes) + 1); @@ -3754,7 +3992,7 @@ PyUnicode_AsUTF8AndSize(PyObject *unicode, Py_ssize_t *psize) return NULL; } _PyUnicode_UTF8_LENGTH(unicode) = PyBytes_GET_SIZE(bytes); - Py_MEMCPY(_PyUnicode_UTF8(unicode), + memcpy(_PyUnicode_UTF8(unicode), PyBytes_AS_STRING(bytes), _PyUnicode_UTF8_LENGTH(unicode) + 1); Py_DECREF(bytes); @@ -3894,20 +4132,6 @@ PyUnicode_AsUnicode(PyObject *unicode) return PyUnicode_AsUnicodeAndSize(unicode, NULL); } -const Py_UNICODE * -_PyUnicode_AsUnicode(PyObject *unicode) -{ - Py_ssize_t size; - const Py_UNICODE *wstr; - - wstr = PyUnicode_AsUnicodeAndSize(unicode, &size); - if (wstr && wcslen(wstr) != (size_t)size) { - PyErr_SetString(PyExc_ValueError, "embedded null character"); - return NULL; - } - return wstr; -} - Py_ssize_t PyUnicode_GetSize(PyObject *unicode) @@ -4008,7 +4232,7 @@ onError: Py_CLEAR(*exceptionObject); } -#ifdef HAVE_MBCS +#ifdef MS_WINDOWS /* error handling callback helper: build arguments, call the callback and check the arguments, if no exception occurred, copy the replacement to the output @@ -4024,7 +4248,7 @@ unicode_decode_call_errorhandler_wchar( Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr, PyObject **output, Py_ssize_t *outpos) { - static char *argparse = "O!n;decoding error handler must return (str, int) tuple"; + static const char *argparse = "O!n;decoding error handler must return (str, int) tuple"; PyObject *restuple = NULL; PyObject *repunicode = NULL; @@ -4122,7 +4346,7 @@ unicode_decode_call_errorhandler_wchar( Py_XDECREF(restuple); return -1; } -#endif /* HAVE_MBCS */ +#endif /* MS_WINDOWS */ static int unicode_decode_call_errorhandler_writer( @@ -4132,7 +4356,7 @@ unicode_decode_call_errorhandler_writer( Py_ssize_t *endinpos, PyObject **exceptionObject, const char **inptr, _PyUnicodeWriter *writer /* PyObject **output, Py_ssize_t *outpos */) { - static char *argparse = "O!n;decoding error handler must return (str, int) tuple"; + static const char *argparse = "O!n;decoding error handler must return (str, int) tuple"; PyObject *restuple = NULL; PyObject *repunicode = NULL; @@ -4738,8 +4962,9 @@ PyUnicode_DecodeUTF8Stateful(const char *s, Py_ssize_t startinpos; Py_ssize_t endinpos; const char *errmsg = ""; - PyObject *errorHandler = NULL; + PyObject *error_handler_obj = NULL; PyObject *exc = NULL; + _Py_error_handler error_handler = _Py_ERROR_UNKNOWN; if (size == 0) { if (consumed) @@ -4764,6 +4989,7 @@ PyUnicode_DecodeUTF8Stateful(const char *s, while (s < end) { Py_UCS4 ch; int kind = writer.kind; + if (kind == PyUnicode_1BYTE_KIND) { if (PyUnicode_IS_ASCII(writer.buffer)) ch = asciilib_utf8_decode(&s, end, writer.data, &writer.pos); @@ -4802,24 +5028,56 @@ PyUnicode_DecodeUTF8Stateful(const char *s, continue; } - if (unicode_decode_call_errorhandler_writer( - errors, &errorHandler, - "utf-8", errmsg, - &starts, &end, &startinpos, &endinpos, &exc, &s, - &writer)) - goto onError; + if (error_handler == _Py_ERROR_UNKNOWN) + error_handler = get_error_handler(errors); + + switch (error_handler) { + case _Py_ERROR_IGNORE: + s += (endinpos - startinpos); + break; + + case _Py_ERROR_REPLACE: + if (_PyUnicodeWriter_WriteCharInline(&writer, 0xfffd) < 0) + goto onError; + s += (endinpos - startinpos); + break; + + case _Py_ERROR_SURROGATEESCAPE: + { + Py_ssize_t i; + + if (_PyUnicodeWriter_PrepareKind(&writer, PyUnicode_2BYTE_KIND) < 0) + goto onError; + for (i=startinpos; i 1) { - Py_ssize_t outpos = out - (PY_UINT32_T*) PyBytes_AS_STRING(v); - if (moreunits >= (PY_SSIZE_T_MAX - PyBytes_GET_SIZE(v)) / 4) { + Py_ssize_t outpos = out - (uint32_t*) PyBytes_AS_STRING(v); + Py_ssize_t morebytes = 4 * (moreunits - 1); + if (PyBytes_GET_SIZE(v) > PY_SSIZE_T_MAX - morebytes) { /* integer overflow */ PyErr_NoMemory(); goto error; } - if (_PyBytes_Resize(&v, PyBytes_GET_SIZE(v) + 4 * (moreunits - 1)) < 0) + if (_PyBytes_Resize(&v, PyBytes_GET_SIZE(v) + morebytes) < 0) goto error; - out = (PY_UINT32_T*) PyBytes_AS_STRING(v) + outpos; + out = (uint32_t*) PyBytes_AS_STRING(v) + outpos; } if (PyBytes_Check(rep)) { - Py_MEMCPY(out, PyBytes_AS_STRING(rep), repsize); + memcpy(out, PyBytes_AS_STRING(rep), repsize); out += moreunits; } else /* rep is unicode */ { assert(PyUnicode_KIND(rep) == PyUnicode_1BYTE_KIND); @@ -5471,36 +5730,45 @@ _PyUnicode_EncodeUTF16(PyObject *str, if (kind == PyUnicode_4BYTE_KIND) { const Py_UCS4 *in = (const Py_UCS4 *)data; const Py_UCS4 *end = in + len; - while (in < end) - if (*in++ >= 0x10000) + while (in < end) { + if (*in++ >= 0x10000) { pairs++; + } + } } - if (len > PY_SSIZE_T_MAX / 2 - pairs - (byteorder == 0)) + if (len > PY_SSIZE_T_MAX / 2 - pairs - (byteorder == 0)) { return PyErr_NoMemory(); + } nsize = len + pairs + (byteorder == 0); v = PyBytes_FromStringAndSize(NULL, nsize * 2); - if (v == NULL) + if (v == NULL) { return NULL; + } /* output buffer is 2-bytes aligned */ assert(_Py_IS_ALIGNED(PyBytes_AS_STRING(v), 2)); out = (unsigned short *)PyBytes_AS_STRING(v); - if (byteorder == 0) + if (byteorder == 0) { *out++ = 0xFEFF; - if (len == 0) + } + if (len == 0) { goto done; + } if (kind == PyUnicode_1BYTE_KIND) { ucs1lib_utf16_encode((const Py_UCS1 *)data, len, &out, native_ordering); goto done; } - if (byteorder < 0) + if (byteorder < 0) { encoding = "utf-16-le"; - else if (byteorder > 0) + } + else if (byteorder > 0) { encoding = "utf-16-be"; - else + } + else { encoding = "utf-16"; + } pos = 0; while (pos < len) { @@ -5551,18 +5819,19 @@ _PyUnicode_EncodeUTF16(PyObject *str, /* two bytes are reserved for each surrogate */ if (moreunits > 1) { Py_ssize_t outpos = out - (unsigned short*) PyBytes_AS_STRING(v); - if (moreunits >= (PY_SSIZE_T_MAX - PyBytes_GET_SIZE(v)) / 2) { + Py_ssize_t morebytes = 2 * (moreunits - 1); + if (PyBytes_GET_SIZE(v) > PY_SSIZE_T_MAX - morebytes) { /* integer overflow */ PyErr_NoMemory(); goto error; } - if (_PyBytes_Resize(&v, PyBytes_GET_SIZE(v) + 2 * (moreunits - 1)) < 0) + if (_PyBytes_Resize(&v, PyBytes_GET_SIZE(v) + morebytes) < 0) goto error; out = (unsigned short*) PyBytes_AS_STRING(v) + outpos; } if (PyBytes_Check(rep)) { - Py_MEMCPY(out, PyBytes_AS_STRING(rep), repsize); + memcpy(out, PyBytes_AS_STRING(rep), repsize); out += moreunits; } else /* rep is unicode */ { assert(PyUnicode_KIND(rep) == PyUnicode_1BYTE_KIND); @@ -5615,281 +5884,228 @@ PyUnicode_AsUTF16String(PyObject *unicode) /* --- Unicode Escape Codec ----------------------------------------------- */ -/* Helper function for PyUnicode_DecodeUnicodeEscape, determines - if all the escapes in the string make it still a valid ASCII string. - Returns -1 if any escapes were found which cause the string to - pop out of ASCII range. Otherwise returns the length of the - required buffer to hold the string. - */ -static Py_ssize_t -length_of_escaped_ascii_string(const char *s, Py_ssize_t size) -{ - const unsigned char *p = (const unsigned char *)s; - const unsigned char *end = p + size; - Py_ssize_t length = 0; - - if (size < 0) - return -1; - - for (; p < end; ++p) { - if (*p > 127) { - /* Non-ASCII */ - return -1; - } - else if (*p != '\\') { - /* Normal character */ - ++length; - } - else { - /* Backslash-escape, check next char */ - ++p; - /* Escape sequence reaches till end of string or - non-ASCII follow-up. */ - if (p >= end || *p > 127) - return -1; - switch (*p) { - case '\n': - /* backslash + \n result in zero characters */ - break; - case '\\': case '\'': case '\"': - case 'b': case 'f': case 't': - case 'n': case 'r': case 'v': case 'a': - ++length; - break; - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - case 'x': case 'u': case 'U': case 'N': - /* these do not guarantee ASCII characters */ - return -1; - default: - /* count the backslash + the other character */ - length += 2; - } - } - } - return length; -} - static _PyUnicode_Name_CAPI *ucnhash_CAPI = NULL; PyObject * -PyUnicode_DecodeUnicodeEscape(const char *s, - Py_ssize_t size, - const char *errors) +_PyUnicode_DecodeUnicodeEscape(const char *s, + Py_ssize_t size, + const char *errors, + const char **first_invalid_escape) { const char *starts = s; - Py_ssize_t startinpos; - Py_ssize_t endinpos; _PyUnicodeWriter writer; const char *end; - char* message; - Py_UCS4 chr = 0xffffffff; /* in case 'getcode' messes up */ PyObject *errorHandler = NULL; PyObject *exc = NULL; - Py_ssize_t len; - len = length_of_escaped_ascii_string(s, size); - if (len == 0) - _Py_RETURN_UNICODE_EMPTY(); + // so we can remember if we've seen an invalid escape char or not + *first_invalid_escape = NULL; - /* After length_of_escaped_ascii_string() there are two alternatives, - either the string is pure ASCII with named escapes like \n, etc. - and we determined it's exact size (common case) - or it contains \x, \u, ... escape sequences. then we create a - legacy wchar string and resize it at the end of this function. */ - _PyUnicodeWriter_Init(&writer); - if (len > 0) { - writer.min_length = len; + if (size == 0) { + _Py_RETURN_UNICODE_EMPTY(); } - else { - /* Escaped strings will always be longer than the resulting - Unicode string, so we start with size here and then reduce the - length after conversion to the true value. - (but if the error callback returns a long replacement string - we'll have to allocate more space) */ - writer.min_length = size; + /* Escaped strings will always be longer than the resulting + Unicode string, so we start with size here and then reduce the + length after conversion to the true value. + (but if the error callback returns a long replacement string + we'll have to allocate more space) */ + _PyUnicodeWriter_Init(&writer); + writer.min_length = size; + if (_PyUnicodeWriter_Prepare(&writer, size, 127) < 0) { + goto onError; } - if (size == 0) - return _PyUnicodeWriter_Finish(&writer); end = s + size; - while (s < end) { - unsigned char c; - Py_UCS4 x; - int digits; + unsigned char c = (unsigned char) *s++; + Py_UCS4 ch; + int count; + Py_ssize_t startinpos; + Py_ssize_t endinpos; + const char *message; + +#define WRITE_ASCII_CHAR(ch) \ + do { \ + assert(ch <= 127); \ + assert(writer.pos < writer.size); \ + PyUnicode_WRITE(writer.kind, writer.data, writer.pos++, ch); \ + } while(0) + +#define WRITE_CHAR(ch) \ + do { \ + if (ch <= writer.maxchar) { \ + assert(writer.pos < writer.size); \ + PyUnicode_WRITE(writer.kind, writer.data, writer.pos++, ch); \ + } \ + else if (_PyUnicodeWriter_WriteCharInline(&writer, ch) < 0) { \ + goto onError; \ + } \ + } while(0) /* Non-escape characters are interpreted as Unicode ordinals */ - if (*s != '\\') { - x = (unsigned char)*s; - s++; - if (_PyUnicodeWriter_WriteCharInline(&writer, x) < 0) - goto onError; + if (c != '\\') { + WRITE_CHAR(c); continue; } - startinpos = s-starts; + startinpos = s - starts - 1; /* \ - Escapes */ - s++; - c = *s++; - if (s > end) - c = '\0'; /* Invalid after \ */ + if (s >= end) { + message = "\\ at end of string"; + goto error; + } + c = (unsigned char) *s++; + assert(writer.pos < writer.size); switch (c) { /* \x escapes */ -#define WRITECHAR(ch) \ - do { \ - if (_PyUnicodeWriter_WriteCharInline(&writer, (ch)) < 0) \ - goto onError; \ - } while(0) - - case '\n': break; - case '\\': WRITECHAR('\\'); break; - case '\'': WRITECHAR('\''); break; - case '\"': WRITECHAR('\"'); break; - case 'b': WRITECHAR('\b'); break; + case '\n': continue; + case '\\': WRITE_ASCII_CHAR('\\'); continue; + case '\'': WRITE_ASCII_CHAR('\''); continue; + case '\"': WRITE_ASCII_CHAR('\"'); continue; + case 'b': WRITE_ASCII_CHAR('\b'); continue; /* FF */ - case 'f': WRITECHAR('\014'); break; - case 't': WRITECHAR('\t'); break; - case 'n': WRITECHAR('\n'); break; - case 'r': WRITECHAR('\r'); break; + case 'f': WRITE_ASCII_CHAR('\014'); continue; + case 't': WRITE_ASCII_CHAR('\t'); continue; + case 'n': WRITE_ASCII_CHAR('\n'); continue; + case 'r': WRITE_ASCII_CHAR('\r'); continue; /* VT */ - case 'v': WRITECHAR('\013'); break; + case 'v': WRITE_ASCII_CHAR('\013'); continue; /* BEL, not classic C */ - case 'a': WRITECHAR('\007'); break; + case 'a': WRITE_ASCII_CHAR('\007'); continue; /* \OOO (octal) escapes */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': - x = s[-1] - '0'; + ch = c - '0'; if (s < end && '0' <= *s && *s <= '7') { - x = (x<<3) + *s++ - '0'; - if (s < end && '0' <= *s && *s <= '7') - x = (x<<3) + *s++ - '0'; + ch = (ch<<3) + *s++ - '0'; + if (s < end && '0' <= *s && *s <= '7') { + ch = (ch<<3) + *s++ - '0'; + } } - WRITECHAR(x); - break; + WRITE_CHAR(ch); + continue; /* hex escapes */ /* \xXX */ case 'x': - digits = 2; + count = 2; message = "truncated \\xXX escape"; goto hexescape; /* \uXXXX */ case 'u': - digits = 4; + count = 4; message = "truncated \\uXXXX escape"; goto hexescape; /* \UXXXXXXXX */ case 'U': - digits = 8; + count = 8; message = "truncated \\UXXXXXXXX escape"; hexescape: - chr = 0; - if (end - s < digits) { - /* count only hex digits */ - for (; s < end; ++s) { - c = (unsigned char)*s; - if (!Py_ISXDIGIT(c)) - goto error; + for (ch = 0; count && s < end; ++s, --count) { + c = (unsigned char)*s; + ch <<= 4; + if (c >= '0' && c <= '9') { + ch += c - '0'; + } + else if (c >= 'a' && c <= 'f') { + ch += c - ('a' - 10); + } + else if (c >= 'A' && c <= 'F') { + ch += c - ('A' - 10); + } + else { + break; } - goto error; } - for (; digits--; ++s) { - c = (unsigned char)*s; - if (!Py_ISXDIGIT(c)) - goto error; - chr = (chr<<4) & ~0xF; - if (c >= '0' && c <= '9') - chr += c - '0'; - else if (c >= 'a' && c <= 'f') - chr += 10 + c - 'a'; - else - chr += 10 + c - 'A'; + if (count) { + goto error; } - if (chr == 0xffffffff && PyErr_Occurred()) - /* _decoding_error will have already written into the - target buffer. */ - break; - store: - /* when we get here, chr is a 32-bit unicode character */ - message = "illegal Unicode character"; - if (chr > MAX_UNICODE) + + /* when we get here, ch is a 32-bit unicode character */ + if (ch > MAX_UNICODE) { + message = "illegal Unicode character"; goto error; - WRITECHAR(chr); - break; + } + + WRITE_CHAR(ch); + continue; /* \N{name} */ case 'N': - message = "malformed \\N character escape"; if (ucnhash_CAPI == NULL) { /* load the unicode data module */ ucnhash_CAPI = (_PyUnicode_Name_CAPI *)PyCapsule_Import( PyUnicodeData_CAPSULE_NAME, 1); - if (ucnhash_CAPI == NULL) - goto ucnhashError; + if (ucnhash_CAPI == NULL) { + PyErr_SetString( + PyExc_UnicodeError, + "\\N escapes not supported (can't load unicodedata module)" + ); + goto onError; + } } + + message = "malformed \\N character escape"; if (*s == '{') { - const char *start = s+1; + const char *start = ++s; + size_t namelen; /* look for the closing brace */ - while (*s != '}' && s < end) + while (s < end && *s != '}') s++; - if (s > start && s < end && *s == '}') { + namelen = s - start; + if (namelen && s < end) { /* found a name. look it up in the unicode database */ - message = "unknown Unicode character name"; s++; - if (s - start - 1 <= INT_MAX && - ucnhash_CAPI->getcode(NULL, start, (int)(s-start-1), - &chr, 0)) - goto store; + ch = 0xffffffff; /* in case 'getcode' messes up */ + if (namelen <= INT_MAX && + ucnhash_CAPI->getcode(NULL, start, (int)namelen, + &ch, 0)) { + assert(ch <= MAX_UNICODE); + WRITE_CHAR(ch); + continue; + } + message = "unknown Unicode character name"; } } goto error; default: - if (s > end) { - message = "\\ at end of string"; - s--; - goto error; - } - else { - WRITECHAR('\\'); - WRITECHAR((unsigned char)s[-1]); + if (*first_invalid_escape == NULL) { + *first_invalid_escape = s-1; /* Back up one char, since we've + already incremented s. */ } - break; + WRITE_ASCII_CHAR('\\'); + WRITE_CHAR(c); + continue; } - continue; error: endinpos = s-starts; + writer.min_length = end - s + writer.pos; if (unicode_decode_call_errorhandler_writer( errors, &errorHandler, "unicodeescape", message, &starts, &end, &startinpos, &endinpos, &exc, &s, - &writer)) + &writer)) { goto onError; - continue; + } + if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { + goto onError; + } + +#undef WRITE_ASCII_CHAR +#undef WRITE_CHAR } -#undef WRITECHAR Py_XDECREF(errorHandler); Py_XDECREF(exc); return _PyUnicodeWriter_Finish(&writer); - ucnhashError: - PyErr_SetString( - PyExc_UnicodeError, - "\\N escapes not supported (can't load unicodedata module)" - ); - _PyUnicodeWriter_Dealloc(&writer); - Py_XDECREF(errorHandler); - Py_XDECREF(exc); - return NULL; - onError: _PyUnicodeWriter_Dealloc(&writer); Py_XDECREF(errorHandler); @@ -5897,12 +6113,28 @@ PyUnicode_DecodeUnicodeEscape(const char *s, return NULL; } -/* Return a Unicode-Escape string version of the Unicode object. - - If quotes is true, the string is enclosed in u"" or u'' quotes as - appropriate. +PyObject * +PyUnicode_DecodeUnicodeEscape(const char *s, + Py_ssize_t size, + const char *errors) +{ + const char *first_invalid_escape; + PyObject *result = _PyUnicode_DecodeUnicodeEscape(s, size, errors, + &first_invalid_escape); + if (result == NULL) + return NULL; + if (first_invalid_escape != NULL) { + if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, + "invalid escape sequence '\\%c'", + *first_invalid_escape) < 0) { + Py_DECREF(result); + return NULL; + } + } + return result; +} -*/ +/* Return a Unicode-Escape string version of the Unicode object. */ PyObject * PyUnicode_AsUnicodeEscapeString(PyObject *unicode) @@ -5910,9 +6142,9 @@ PyUnicode_AsUnicodeEscapeString(PyObject *unicode) Py_ssize_t i, len; PyObject *repr; char *p; - int kind; + enum PyUnicode_Kind kind; void *data; - Py_ssize_t expandsize = 0; + Py_ssize_t expandsize; /* Initial allocation is based on the longest-possible character escape. @@ -5926,60 +6158,70 @@ PyUnicode_AsUnicodeEscapeString(PyObject *unicode) PyErr_BadArgument(); return NULL; } - if (PyUnicode_READY(unicode) == -1) + if (PyUnicode_READY(unicode) == -1) { return NULL; - len = PyUnicode_GET_LENGTH(unicode); - kind = PyUnicode_KIND(unicode); - data = PyUnicode_DATA(unicode); - switch (kind) { - case PyUnicode_1BYTE_KIND: expandsize = 4; break; - case PyUnicode_2BYTE_KIND: expandsize = 6; break; - case PyUnicode_4BYTE_KIND: expandsize = 10; break; } - if (len == 0) + len = PyUnicode_GET_LENGTH(unicode); + if (len == 0) { return PyBytes_FromStringAndSize(NULL, 0); + } - if (len > (PY_SSIZE_T_MAX - 2 - 1) / expandsize) + kind = PyUnicode_KIND(unicode); + data = PyUnicode_DATA(unicode); + /* 4 byte characters can take up 10 bytes, 2 byte characters can take up 6 + bytes, and 1 byte characters 4. */ + expandsize = kind * 2 + 2; + if (len > PY_SSIZE_T_MAX / expandsize) { return PyErr_NoMemory(); - - repr = PyBytes_FromStringAndSize(NULL, - 2 - + expandsize*len - + 1); - if (repr == NULL) + } + repr = PyBytes_FromStringAndSize(NULL, expandsize * len); + if (repr == NULL) { return NULL; + } p = PyBytes_AS_STRING(repr); - for (i = 0; i < len; i++) { Py_UCS4 ch = PyUnicode_READ(kind, data, i); - /* Escape backslashes */ - if (ch == '\\') { - *p++ = '\\'; - *p++ = (char) ch; - continue; - } + /* U+0000-U+00ff range */ + if (ch < 0x100) { + if (ch >= ' ' && ch < 127) { + if (ch != '\\') { + /* Copy printable US ASCII as-is */ + *p++ = (char) ch; + } + /* Escape backslashes */ + else { + *p++ = '\\'; + *p++ = '\\'; + } + } - /* Map 21-bit characters to '\U00xxxxxx' */ - else if (ch >= 0x10000) { - assert(ch <= MAX_UNICODE); - *p++ = '\\'; - *p++ = 'U'; - *p++ = Py_hexdigits[(ch >> 28) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 24) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 20) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 16) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 12) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 8) & 0x0000000F]; - *p++ = Py_hexdigits[(ch >> 4) & 0x0000000F]; - *p++ = Py_hexdigits[ch & 0x0000000F]; - continue; - } + /* Map special whitespace to '\t', \n', '\r' */ + else if (ch == '\t') { + *p++ = '\\'; + *p++ = 't'; + } + else if (ch == '\n') { + *p++ = '\\'; + *p++ = 'n'; + } + else if (ch == '\r') { + *p++ = '\\'; + *p++ = 'r'; + } - /* Map 16-bit characters to '\uxxxx' */ - if (ch >= 256) { + /* Map non-printable US ASCII and 8-bit characters to '\xHH' */ + else { + *p++ = '\\'; + *p++ = 'x'; + *p++ = Py_hexdigits[(ch >> 4) & 0x000F]; + *p++ = Py_hexdigits[ch & 0x000F]; + } + } + /* U+0100-U+ffff range: Map 16-bit characters to '\uHHHH' */ + else if (ch < 0x10000) { *p++ = '\\'; *p++ = 'u'; *p++ = Py_hexdigits[(ch >> 12) & 0x000F]; @@ -5987,37 +6229,28 @@ PyUnicode_AsUnicodeEscapeString(PyObject *unicode) *p++ = Py_hexdigits[(ch >> 4) & 0x000F]; *p++ = Py_hexdigits[ch & 0x000F]; } + /* U+010000-U+10ffff range: Map 21-bit characters to '\U00HHHHHH' */ + else { - /* Map special whitespace to '\t', \n', '\r' */ - else if (ch == '\t') { - *p++ = '\\'; - *p++ = 't'; - } - else if (ch == '\n') { - *p++ = '\\'; - *p++ = 'n'; - } - else if (ch == '\r') { - *p++ = '\\'; - *p++ = 'r'; - } - - /* Map non-printable US ASCII to '\xhh' */ - else if (ch < ' ' || ch >= 0x7F) { + /* Make sure that the first two digits are zero */ + assert(ch <= MAX_UNICODE && MAX_UNICODE <= 0x10ffff); *p++ = '\\'; - *p++ = 'x'; - *p++ = Py_hexdigits[(ch >> 4) & 0x000F]; - *p++ = Py_hexdigits[ch & 0x000F]; + *p++ = 'U'; + *p++ = '0'; + *p++ = '0'; + *p++ = Py_hexdigits[(ch >> 20) & 0x0000000F]; + *p++ = Py_hexdigits[(ch >> 16) & 0x0000000F]; + *p++ = Py_hexdigits[(ch >> 12) & 0x0000000F]; + *p++ = Py_hexdigits[(ch >> 8) & 0x0000000F]; + *p++ = Py_hexdigits[(ch >> 4) & 0x0000000F]; + *p++ = Py_hexdigits[ch & 0x0000000F]; } - - /* Copy everything else as-is */ - else - *p++ = (char) ch; } assert(p - PyBytes_AS_STRING(repr) > 0); - if (_PyBytes_Resize(&repr, p - PyBytes_AS_STRING(repr)) < 0) + if (_PyBytes_Resize(&repr, p - PyBytes_AS_STRING(repr)) < 0) { return NULL; + } return repr; } @@ -6027,8 +6260,10 @@ PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, { PyObject *result; PyObject *tmp = PyUnicode_FromUnicode(s, size); - if (tmp == NULL) + if (tmp == NULL) { return NULL; + } + result = PyUnicode_AsUnicodeEscapeString(tmp); Py_DECREF(tmp); return result; @@ -6042,95 +6277,107 @@ PyUnicode_DecodeRawUnicodeEscape(const char *s, const char *errors) { const char *starts = s; - Py_ssize_t startinpos; - Py_ssize_t endinpos; _PyUnicodeWriter writer; const char *end; - const char *bs; PyObject *errorHandler = NULL; PyObject *exc = NULL; - if (size == 0) + if (size == 0) { _Py_RETURN_UNICODE_EMPTY(); + } /* Escaped strings will always be longer than the resulting Unicode string, so we start with size here and then reduce the length after conversion to the true value. (But decoding error handler might have to resize the string) */ _PyUnicodeWriter_Init(&writer); - writer.min_length = size; + writer.min_length = size; + if (_PyUnicodeWriter_Prepare(&writer, size, 127) < 0) { + goto onError; + } end = s + size; while (s < end) { - unsigned char c; - Py_UCS4 x; - int i; + unsigned char c = (unsigned char) *s++; + Py_UCS4 ch; int count; + Py_ssize_t startinpos; + Py_ssize_t endinpos; + const char *message; + +#define WRITE_CHAR(ch) \ + do { \ + if (ch <= writer.maxchar) { \ + assert(writer.pos < writer.size); \ + PyUnicode_WRITE(writer.kind, writer.data, writer.pos++, ch); \ + } \ + else if (_PyUnicodeWriter_WriteCharInline(&writer, ch) < 0) { \ + goto onError; \ + } \ + } while(0) /* Non-escape characters are interpreted as Unicode ordinals */ - if (*s != '\\') { - x = (unsigned char)*s++; - if (_PyUnicodeWriter_WriteCharInline(&writer, x) < 0) - goto onError; + if (c != '\\' || s >= end) { + WRITE_CHAR(c); continue; } - startinpos = s-starts; - /* \u-escapes are only interpreted iff the number of leading - backslashes if odd */ - bs = s; - for (;s < end;) { - if (*s != '\\') - break; - x = (unsigned char)*s++; - if (_PyUnicodeWriter_WriteCharInline(&writer, x) < 0) - goto onError; + c = (unsigned char) *s++; + if (c == 'u') { + count = 4; + message = "truncated \\uXXXX escape"; + } + else if (c == 'U') { + count = 8; + message = "truncated \\UXXXXXXXX escape"; } - if (((s - bs) & 1) == 0 || - s >= end || - (*s != 'u' && *s != 'U')) { + else { + assert(writer.pos < writer.size); + PyUnicode_WRITE(writer.kind, writer.data, writer.pos++, '\\'); + WRITE_CHAR(c); continue; } - writer.pos--; - count = *s=='u' ? 4 : 8; - s++; + startinpos = s - starts - 2; - /* \uXXXX with 4 hex digits, \Uxxxxxxxx with 8 */ - for (x = 0, i = 0; i < count; ++i, ++s) { + /* \uHHHH with 4 hex digits, \U00HHHHHH with 8 */ + for (ch = 0; count && s < end; ++s, --count) { c = (unsigned char)*s; - if (!Py_ISXDIGIT(c)) { - endinpos = s-starts; - if (unicode_decode_call_errorhandler_writer( - errors, &errorHandler, - "rawunicodeescape", "truncated \\uXXXX", - &starts, &end, &startinpos, &endinpos, &exc, &s, - &writer)) - goto onError; - goto nextByte; + ch <<= 4; + if (c >= '0' && c <= '9') { + ch += c - '0'; + } + else if (c >= 'a' && c <= 'f') { + ch += c - ('a' - 10); + } + else if (c >= 'A' && c <= 'F') { + ch += c - ('A' - 10); + } + else { + break; } - x = (x<<4) & ~0xF; - if (c >= '0' && c <= '9') - x += c - '0'; - else if (c >= 'a' && c <= 'f') - x += 10 + c - 'a'; - else - x += 10 + c - 'A'; } - if (x <= MAX_UNICODE) { - if (_PyUnicodeWriter_WriteCharInline(&writer, x) < 0) - goto onError; + if (!count) { + if (ch <= MAX_UNICODE) { + WRITE_CHAR(ch); + continue; + } + message = "\\Uxxxxxxxx out of range"; } - else { - endinpos = s-starts; - if (unicode_decode_call_errorhandler_writer( - errors, &errorHandler, - "rawunicodeescape", "\\Uxxxxxxxx out of range", - &starts, &end, &startinpos, &endinpos, &exc, &s, - &writer)) - goto onError; + + endinpos = s-starts; + writer.min_length = end - s + writer.pos; + if (unicode_decode_call_errorhandler_writer( + errors, &errorHandler, + "rawunicodeescape", message, + &starts, &end, &startinpos, &endinpos, &exc, &s, + &writer)) { + goto onError; + } + if (_PyUnicodeWriter_Prepare(&writer, writer.min_length, 127) < 0) { + goto onError; } - nextByte: - ; + +#undef WRITE_CHAR } Py_XDECREF(errorHandler); Py_XDECREF(exc); @@ -6141,6 +6388,7 @@ PyUnicode_DecodeRawUnicodeEscape(const char *s, Py_XDECREF(errorHandler); Py_XDECREF(exc); return NULL; + } @@ -6149,7 +6397,6 @@ PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode) { PyObject *repr; char *p; - char *q; Py_ssize_t expandsize, pos; int kind; void *data; @@ -6159,58 +6406,68 @@ PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode) PyErr_BadArgument(); return NULL; } - if (PyUnicode_READY(unicode) == -1) + if (PyUnicode_READY(unicode) == -1) { return NULL; + } kind = PyUnicode_KIND(unicode); data = PyUnicode_DATA(unicode); len = PyUnicode_GET_LENGTH(unicode); + if (kind == PyUnicode_1BYTE_KIND) { + return PyBytes_FromStringAndSize(data, len); + } + /* 4 byte characters can take up 10 bytes, 2 byte characters can take up 6 bytes, and 1 byte characters 4. */ expandsize = kind * 2 + 2; - if (len > PY_SSIZE_T_MAX / expandsize) + if (len > PY_SSIZE_T_MAX / expandsize) { return PyErr_NoMemory(); - + } repr = PyBytes_FromStringAndSize(NULL, expandsize * len); - if (repr == NULL) + if (repr == NULL) { return NULL; - if (len == 0) + } + if (len == 0) { return repr; + } - p = q = PyBytes_AS_STRING(repr); + p = PyBytes_AS_STRING(repr); for (pos = 0; pos < len; pos++) { Py_UCS4 ch = PyUnicode_READ(kind, data, pos); - /* Map 32-bit characters to '\Uxxxxxxxx' */ - if (ch >= 0x10000) { - assert(ch <= MAX_UNICODE); + + /* U+0000-U+00ff range: Copy 8-bit characters as-is */ + if (ch < 0x100) { + *p++ = (char) ch; + } + /* U+0000-U+00ff range: Map 16-bit characters to '\uHHHH' */ + else if (ch < 0x10000) { *p++ = '\\'; - *p++ = 'U'; - *p++ = Py_hexdigits[(ch >> 28) & 0xf]; - *p++ = Py_hexdigits[(ch >> 24) & 0xf]; - *p++ = Py_hexdigits[(ch >> 20) & 0xf]; - *p++ = Py_hexdigits[(ch >> 16) & 0xf]; + *p++ = 'u'; *p++ = Py_hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[ch & 15]; } - /* Map 16-bit characters to '\uxxxx' */ - else if (ch >= 256) { + /* U+010000-U+10ffff range: Map 32-bit characters to '\U00HHHHHH' */ + else { + assert(ch <= MAX_UNICODE && MAX_UNICODE <= 0x10ffff); *p++ = '\\'; - *p++ = 'u'; + *p++ = 'U'; + *p++ = '0'; + *p++ = '0'; + *p++ = Py_hexdigits[(ch >> 20) & 0xf]; + *p++ = Py_hexdigits[(ch >> 16) & 0xf]; *p++ = Py_hexdigits[(ch >> 12) & 0xf]; *p++ = Py_hexdigits[(ch >> 8) & 0xf]; *p++ = Py_hexdigits[(ch >> 4) & 0xf]; *p++ = Py_hexdigits[ch & 15]; } - /* Copy everything else as-is */ - else - *p++ = (char) ch; } - assert(p > q); - if (_PyBytes_Resize(&repr, p - q) < 0) + assert(p > PyBytes_AS_STRING(repr)); + if (_PyBytes_Resize(&repr, p - PyBytes_AS_STRING(repr)) < 0) { return NULL; + } return repr; } @@ -6248,10 +6505,6 @@ _PyUnicode_DecodeUnicodeInternal(const char *s, 1)) return NULL; - if (size < 0) { - PyErr_BadInternalCall(); - return NULL; - } if (size == 0) _Py_RETURN_UNICODE_EMPTY(); @@ -6392,7 +6645,7 @@ unicode_encode_call_errorhandler(const char *errors, Py_ssize_t startpos, Py_ssize_t endpos, Py_ssize_t *newpos) { - static char *argparse = "On;encoding error handler must return (str/bytes, int) tuple"; + static const char *argparse = "On;encoding error handler must return (str/bytes, int) tuple"; Py_ssize_t len; PyObject *restuple; PyObject *resunicode; @@ -6446,25 +6699,22 @@ unicode_encode_call_errorhandler(const char *errors, static PyObject * unicode_encode_ucs1(PyObject *unicode, const char *errors, - unsigned int limit) + const Py_UCS4 limit) { /* input state */ Py_ssize_t pos=0, size; int kind; void *data; - /* output object */ - PyObject *res; /* pointer into the output */ char *str; - /* current output position */ - Py_ssize_t ressize; const char *encoding = (limit == 256) ? "latin-1" : "ascii"; const char *reason = (limit == 256) ? "ordinal not in range(256)" : "ordinal not in range(128)"; - PyObject *errorHandler = NULL; + PyObject *error_handler_obj = NULL; PyObject *exc = NULL; - /* the following variable is used for caching string comparisons - * -1=not initialized, 0=unknown, 1=strict, 2=replace, 3=ignore, 4=xmlcharrefreplace */ - int known_errorHandler = -1; + _Py_error_handler error_handler = _Py_ERROR_UNKNOWN; + PyObject *rep = NULL; + /* output object */ + _PyBytesWriter writer; if (PyUnicode_READY(unicode) == -1) return NULL; @@ -6475,186 +6725,157 @@ unicode_encode_ucs1(PyObject *unicode, replacements, if we need more, we'll resize */ if (size == 0) return PyBytes_FromStringAndSize(NULL, 0); - res = PyBytes_FromStringAndSize(NULL, size); - if (res == NULL) + + _PyBytesWriter_Init(&writer); + str = _PyBytesWriter_Alloc(&writer, size); + if (str == NULL) return NULL; - str = PyBytes_AS_STRING(res); - ressize = size; while (pos < size) { - Py_UCS4 c = PyUnicode_READ(kind, data, pos); + Py_UCS4 ch = PyUnicode_READ(kind, data, pos); /* can we encode this? */ - if (c= limit)) ++collend; + + /* Only overallocate the buffer if it's not the last write */ + writer.overallocate = (collend < size); + /* cache callback name lookup (if not done yet, i.e. it's the first error) */ - if (known_errorHandler==-1) { - if ((errors==NULL) || (!strcmp(errors, "strict"))) - known_errorHandler = 1; - else if (!strcmp(errors, "replace")) - known_errorHandler = 2; - else if (!strcmp(errors, "ignore")) - known_errorHandler = 3; - else if (!strcmp(errors, "xmlcharrefreplace")) - known_errorHandler = 4; - else - known_errorHandler = 0; - } - switch (known_errorHandler) { - case 1: /* strict */ + if (error_handler == _Py_ERROR_UNKNOWN) + error_handler = get_error_handler(errors); + + switch (error_handler) { + case _Py_ERROR_STRICT: raise_encode_exception(&exc, encoding, unicode, collstart, collend, reason); goto onError; - case 2: /* replace */ - while (collstart++ < collend) - *str++ = '?'; /* fall through */ - case 3: /* ignore */ + + case _Py_ERROR_REPLACE: + memset(str, '?', collend - collstart); + str += (collend - collstart); + /* fall through ignore error handler */ + case _Py_ERROR_IGNORE: + pos = collend; + break; + + case _Py_ERROR_BACKSLASHREPLACE: + /* subtract preallocated bytes */ + writer.min_size -= (collend - collstart); + str = backslashreplace(&writer, str, + unicode, collstart, collend); + if (str == NULL) + goto onError; pos = collend; break; - case 4: /* xmlcharrefreplace */ - respos = str - PyBytes_AS_STRING(res); - requiredsize = respos; - /* determine replacement size */ + + case _Py_ERROR_XMLCHARREFREPLACE: + /* subtract preallocated bytes */ + writer.min_size -= (collend - collstart); + str = xmlcharrefreplace(&writer, str, + unicode, collstart, collend); + if (str == NULL) + goto onError; + pos = collend; + break; + + case _Py_ERROR_SURROGATEESCAPE: for (i = collstart; i < collend; ++i) { - Py_UCS4 ch = PyUnicode_READ(kind, data, i); - Py_ssize_t incr; - if (ch < 10) - incr = 2+1+1; - else if (ch < 100) - incr = 2+2+1; - else if (ch < 1000) - incr = 2+3+1; - else if (ch < 10000) - incr = 2+4+1; - else if (ch < 100000) - incr = 2+5+1; - else if (ch < 1000000) - incr = 2+6+1; - else { - assert(ch <= MAX_UNICODE); - incr = 2+7+1; + ch = PyUnicode_READ(kind, data, i); + if (ch < 0xdc80 || 0xdcff < ch) { + /* Not a UTF-8b surrogate */ + break; } - if (requiredsize > PY_SSIZE_T_MAX - incr) - goto overflow; - requiredsize += incr; - } - if (requiredsize > PY_SSIZE_T_MAX - (size - collend)) - goto overflow; - requiredsize += size - collend; - if (requiredsize > ressize) { - if (ressize <= PY_SSIZE_T_MAX/2 && requiredsize < 2*ressize) - requiredsize = 2*ressize; - if (_PyBytes_Resize(&res, requiredsize)) - goto onError; - str = PyBytes_AS_STRING(res) + respos; - ressize = requiredsize; + *str++ = (char)(ch - 0xdc00); + ++pos; } - /* generate replacement */ - for (i = collstart; i < collend; ++i) { - str += sprintf(str, "&#%d;", PyUnicode_READ(kind, data, i)); - } - pos = collend; - break; + if (i >= collend) + break; + collstart = pos; + assert(collstart != collend); + /* fallback to general error handling */ + default: - repunicode = unicode_encode_call_errorhandler(errors, &errorHandler, - encoding, reason, unicode, &exc, - collstart, collend, &newpos); - if (repunicode == NULL || (PyUnicode_Check(repunicode) && - PyUnicode_READY(repunicode) == -1)) + rep = unicode_encode_call_errorhandler(errors, &error_handler_obj, + encoding, reason, unicode, &exc, + collstart, collend, &newpos); + if (rep == NULL) goto onError; - if (PyBytes_Check(repunicode)) { + + /* subtract preallocated bytes */ + writer.min_size -= 1; + + if (PyBytes_Check(rep)) { /* Directly copy bytes result to output. */ - repsize = PyBytes_Size(repunicode); - if (repsize > 1) { - /* Make room for all additional bytes. */ - respos = str - PyBytes_AS_STRING(res); - if (ressize > PY_SSIZE_T_MAX - repsize - 1) { - Py_DECREF(repunicode); - goto overflow; - } - if (_PyBytes_Resize(&res, ressize+repsize-1)) { - Py_DECREF(repunicode); - goto onError; - } - str = PyBytes_AS_STRING(res) + respos; - ressize += repsize-1; - } - memcpy(str, PyBytes_AsString(repunicode), repsize); - str += repsize; - pos = newpos; - Py_DECREF(repunicode); - break; - } - /* need more space? (at least enough for what we - have+the replacement+the rest of the string, so - we won't have to check space for encodable characters) */ - respos = str - PyBytes_AS_STRING(res); - repsize = PyUnicode_GET_LENGTH(repunicode); - requiredsize = respos; - if (requiredsize > PY_SSIZE_T_MAX - repsize) - goto overflow; - requiredsize += repsize; - if (requiredsize > PY_SSIZE_T_MAX - (size - collend)) - goto overflow; - requiredsize += size - collend; - if (requiredsize > ressize) { - if (ressize <= PY_SSIZE_T_MAX/2 && requiredsize < 2*ressize) - requiredsize = 2*ressize; - if (_PyBytes_Resize(&res, requiredsize)) { - Py_DECREF(repunicode); + str = _PyBytesWriter_WriteBytes(&writer, str, + PyBytes_AS_STRING(rep), + PyBytes_GET_SIZE(rep)); + if (str == NULL) goto onError; - } - str = PyBytes_AS_STRING(res) + respos; - ressize = requiredsize; } - /* check if there is anything unencodable in the replacement - and copy it to the output */ - for (i = 0; repsize-->0; ++i, ++str) { - c = PyUnicode_READ_CHAR(repunicode, i); - if (c >= limit) { - raise_encode_exception(&exc, encoding, unicode, - pos, pos+1, reason); - Py_DECREF(repunicode); + else { + assert(PyUnicode_Check(rep)); + + if (PyUnicode_READY(rep) < 0) goto onError; + + if (PyUnicode_IS_ASCII(rep)) { + /* Fast path: all characters are smaller than limit */ + assert(limit >= 128); + assert(PyUnicode_KIND(rep) == PyUnicode_1BYTE_KIND); + str = _PyBytesWriter_WriteBytes(&writer, str, + PyUnicode_DATA(rep), + PyUnicode_GET_LENGTH(rep)); + } + else { + Py_ssize_t repsize = PyUnicode_GET_LENGTH(rep); + + str = _PyBytesWriter_Prepare(&writer, str, repsize); + if (str == NULL) + goto onError; + + /* check if there is anything unencodable in the + replacement and copy it to the output */ + for (i = 0; repsize-->0; ++i, ++str) { + ch = PyUnicode_READ_CHAR(rep, i); + if (ch >= limit) { + raise_encode_exception(&exc, encoding, unicode, + pos, pos+1, reason); + goto onError; + } + *str = (char)ch; + } } - *str = (char)c; } pos = newpos; - Py_DECREF(repunicode); + Py_CLEAR(rep); } + + /* If overallocation was disabled, ensure that it was the last + write. Otherwise, we missed an optimization */ + assert(writer.overallocate || pos == size); } } - /* Resize if we allocated to much */ - size = str - PyBytes_AS_STRING(res); - if (size < ressize) { /* If this falls res will be NULL */ - assert(size >= 0); - if (_PyBytes_Resize(&res, size) < 0) - goto onError; - } - Py_XDECREF(errorHandler); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); - return res; - - overflow: - PyErr_SetString(PyExc_OverflowError, - "encoded result is too long for a Python string"); + return _PyBytesWriter_Finish(&writer, str); onError: - Py_XDECREF(res); - Py_XDECREF(errorHandler); + Py_XDECREF(rep); + _PyBytesWriter_Dealloc(&writer); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); return NULL; } @@ -6714,8 +6935,9 @@ PyUnicode_DecodeASCII(const char *s, Py_ssize_t endinpos; Py_ssize_t outpos; const char *e; - PyObject *errorHandler = NULL; + PyObject *error_handler_obj = NULL; PyObject *exc = NULL; + _Py_error_handler error_handler = _Py_ERROR_UNKNOWN; if (size == 0) _Py_RETURN_UNICODE_EMPTY(); @@ -6744,12 +6966,42 @@ PyUnicode_DecodeASCII(const char *s, PyUnicode_WRITE(kind, data, writer.pos, c); writer.pos++; ++s; + continue; } - else { + + /* byte outsize range 0x00..0x7f: call the error handler */ + + if (error_handler == _Py_ERROR_UNKNOWN) + error_handler = get_error_handler(errors); + + switch (error_handler) + { + case _Py_ERROR_REPLACE: + case _Py_ERROR_SURROGATEESCAPE: + /* Fast-path: the error handler only writes one character, + but we may switch to UCS2 at the first write */ + if (_PyUnicodeWriter_PrepareKind(&writer, PyUnicode_2BYTE_KIND) < 0) + goto onError; + kind = writer.kind; + data = writer.data; + + if (error_handler == _Py_ERROR_REPLACE) + PyUnicode_WRITE(kind, data, writer.pos, 0xfffd); + else + PyUnicode_WRITE(kind, data, writer.pos, c + 0xdc00); + writer.pos++; + ++s; + break; + + case _Py_ERROR_IGNORE: + ++s; + break; + + default: startinpos = s-starts; endinpos = startinpos + 1; if (unicode_decode_call_errorhandler_writer( - errors, &errorHandler, + errors, &error_handler_obj, "ascii", "ordinal not in range(128)", &starts, &e, &startinpos, &endinpos, &exc, &s, &writer)) @@ -6758,13 +7010,13 @@ PyUnicode_DecodeASCII(const char *s, data = writer.data; } } - Py_XDECREF(errorHandler); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); return _PyUnicodeWriter_Finish(&writer); onError: _PyUnicodeWriter_Dealloc(&writer); - Py_XDECREF(errorHandler); + Py_XDECREF(error_handler_obj); Py_XDECREF(exc); return NULL; } @@ -6807,7 +7059,7 @@ PyUnicode_AsASCIIString(PyObject *unicode) return _PyUnicode_AsASCIIString(unicode, NULL); } -#ifdef HAVE_MBCS +#ifdef MS_WINDOWS /* --- MBCS codecs for Windows -------------------------------------------- */ @@ -6819,7 +7071,7 @@ PyUnicode_AsASCIIString(PyObject *unicode) # define WC_ERR_INVALID_CHARS 0x0080 #endif -static char* +static const char* code_page_name(UINT code_page, PyObject **obj) { *obj = NULL; @@ -6927,7 +7179,7 @@ decode_code_page_errors(UINT code_page, PyObject *errorHandler = NULL; PyObject *exc = NULL; PyObject *encoding_obj = NULL; - char *encoding; + const char *encoding; DWORD err; int ret = -1; @@ -7054,10 +7306,6 @@ decode_code_page_stateful(int code_page, PyErr_SetString(PyExc_ValueError, "invalid code page number"); return NULL; } - if (size < 0) { - PyErr_BadInternalCall(); - return NULL; - } if (consumed) *consumed = 0; @@ -7167,7 +7415,6 @@ encode_code_page_strict(UINT code_page, PyObject **outbytes, BOOL usedDefaultChar = FALSE; BOOL *pusedDefaultChar = &usedDefaultChar; int outsize; - PyObject *exc = NULL; wchar_t *p; Py_ssize_t size; const DWORD flags = encode_code_page_flags(code_page, NULL); @@ -7276,7 +7523,7 @@ encode_code_page_errors(UINT code_page, PyObject **outbytes, PyObject *errorHandler = NULL; PyObject *exc = NULL; PyObject *encoding_obj = NULL; - char *encoding; + const char *encoding; Py_ssize_t newpos, newoutsize; PyObject *rep; int ret = -1; @@ -7531,7 +7778,7 @@ PyUnicode_AsMBCSString(PyObject *unicode) #undef NEED_RETRY -#endif /* HAVE_MBCS */ +#endif /* MS_WINDOWS */ /* --- Character Mapping Codec -------------------------------------------- */ @@ -8134,7 +8381,7 @@ static int charmap_encoding_error( PyObject *unicode, Py_ssize_t *inpos, PyObject *mapping, PyObject **exceptionObject, - int *known_errorHandler, PyObject **errorHandler, const char *errors, + _Py_error_handler *error_handler, PyObject **error_handler_obj, const char *errors, PyObject **res, Py_ssize_t *respos) { PyObject *repunicode = NULL; /* initialize to prevent gcc warning */ @@ -8181,23 +8428,15 @@ charmap_encoding_error( } /* cache callback name lookup * (if not done yet, i.e. it's the first error) */ - if (*known_errorHandler==-1) { - if ((errors==NULL) || (!strcmp(errors, "strict"))) - *known_errorHandler = 1; - else if (!strcmp(errors, "replace")) - *known_errorHandler = 2; - else if (!strcmp(errors, "ignore")) - *known_errorHandler = 3; - else if (!strcmp(errors, "xmlcharrefreplace")) - *known_errorHandler = 4; - else - *known_errorHandler = 0; - } - switch (*known_errorHandler) { - case 1: /* strict */ + if (*error_handler == _Py_ERROR_UNKNOWN) + *error_handler = get_error_handler(errors); + + switch (*error_handler) { + case _Py_ERROR_STRICT: raise_encode_exception(exceptionObject, encoding, unicode, collstartpos, collendpos, reason); return -1; - case 2: /* replace */ + + case _Py_ERROR_REPLACE: for (collpos = collstartpos; collpos (size_t)(PY_SSIZE_T_MAX - sz)) { + if (i != 0) + sz += seplen; + if (sz < old_sz || sz > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "join() result is too long for a Python string"); goto onError; } - sz += add_sz; if (use_memcpy && last_obj != NULL) { if (PyUnicode_KIND(last_obj) != PyUnicode_KIND(item)) use_memcpy = 0; @@ -9856,7 +10038,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq) /* Copy item, and maybe the separator. */ if (i && seplen != 0) { - Py_MEMCPY(res_data, + memcpy(res_data, sep_data, kind * seplen); res_data += kind * seplen; @@ -9864,7 +10046,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq) itemlen = PyUnicode_GET_LENGTH(item); if (itemlen != 0) { - Py_MEMCPY(res_data, + memcpy(res_data, PyUnicode_DATA(item), kind * itemlen); res_data += kind * itemlen; @@ -9893,13 +10075,11 @@ PyUnicode_Join(PyObject *separator, PyObject *seq) assert(res_offset == PyUnicode_GET_LENGTH(res)); } - Py_DECREF(fseq); Py_XDECREF(sep); assert(_PyUnicode_CheckConsistency(res, 1)); return res; onError: - Py_DECREF(fseq); Py_XDECREF(sep); Py_XDECREF(res); return NULL; @@ -10024,13 +10204,8 @@ PyUnicode_Splitlines(PyObject *string, int keepends) { PyObject *list; - string = PyUnicode_FromObject(string); - if (string == NULL) - return NULL; - if (PyUnicode_READY(string) == -1) { - Py_DECREF(string); + if (ensure_unicode(string) < 0) return NULL; - } switch (PyUnicode_KIND(string)) { case PyUnicode_1BYTE_KIND: @@ -10057,7 +10232,6 @@ PyUnicode_Splitlines(PyObject *string, int keepends) assert(0); list = 0; } - Py_DECREF(string); return list; } @@ -10472,7 +10646,7 @@ replace(PyObject *self, PyObject *str1, u = unicode_empty; goto done; } - if (new_size > (PY_SSIZE_T_MAX / rkind)) { + if (new_size > (PY_SSIZE_T_MAX >> (rkind-1))) { PyErr_SetString(PyExc_OverflowError, "replace string is too long"); goto error; @@ -10618,28 +10792,27 @@ unicode_casefold(PyObject *self) } -/* Argument converter. Coerces to a single unicode character */ +/* Argument converter. Accepts a single Unicode character. */ static int convert_uc(PyObject *obj, void *addr) { Py_UCS4 *fillcharloc = (Py_UCS4 *)addr; - PyObject *uniobj; - uniobj = PyUnicode_FromObject(obj); - if (uniobj == NULL) { - PyErr_SetString(PyExc_TypeError, - "The fill character cannot be converted to Unicode"); + if (!PyUnicode_Check(obj)) { + PyErr_Format(PyExc_TypeError, + "The fill character must be a unicode character, " + "not %.100s", Py_TYPE(obj)->tp_name); return 0; } - if (PyUnicode_GET_LENGTH(uniobj) != 1) { + if (PyUnicode_READY(obj) < 0) + return 0; + if (PyUnicode_GET_LENGTH(obj) != 1) { PyErr_SetString(PyExc_TypeError, "The fill character must be exactly one character long"); - Py_DECREF(uniobj); return 0; } - *fillcharloc = PyUnicode_READ_CHAR(uniobj, 0); - Py_DECREF(uniobj); + *fillcharloc = PyUnicode_READ_CHAR(obj, 0); return 1; } @@ -10789,7 +10962,7 @@ unicode_compare(PyObject *str1, PyObject *str2) #undef COMPARE } -Py_LOCAL(int) +static int unicode_compare_eq(PyObject *str1, PyObject *str2) { int kind; @@ -10833,15 +11006,6 @@ PyUnicode_Compare(PyObject *left, PyObject *right) } int -_PyUnicode_CompareWithId(PyObject *left, _Py_Identifier *right) -{ - PyObject *right_str = _PyUnicode_FromId(right); /* borrowed */ - if (right_str == NULL) - return -1; - return PyUnicode_Compare(left, right_str); -} - -int PyUnicode_CompareWithASCIIString(PyObject* uni, const char* str) { Py_ssize_t i; @@ -10925,6 +11089,12 @@ _PyUnicode_EqualToASCIIString(PyObject *unicode, const char *str) { size_t len; assert(_PyUnicode_CHECK(unicode)); + assert(str); +#ifndef NDEBUG + for (const char *p = str; *p; p++) { + assert((unsigned char)*p < 128); + } +#endif if (PyUnicode_READY(unicode) == -1) { /* Memory error or bad data */ PyErr_Clear(); @@ -10945,6 +11115,11 @@ _PyUnicode_EqualToASCIIId(PyObject *left, _Py_Identifier *right) assert(_PyUnicode_CHECK(left)); assert(right->string); +#ifndef NDEBUG + for (const char *p = right->string; *p; p++) { + assert((unsigned char)*p < 128); + } +#endif if (PyUnicode_READY(left) == -1) { /* memory error or bad data */ @@ -11042,59 +11217,49 @@ PyUnicode_RichCompare(PyObject *left, PyObject *right, int op) } int -PyUnicode_Contains(PyObject *container, PyObject *element) +_PyUnicode_EQ(PyObject *aa, PyObject *bb) +{ + return unicode_eq(aa, bb); +} + +int +PyUnicode_Contains(PyObject *str, PyObject *substr) { - PyObject *str, *sub; int kind1, kind2; void *buf1, *buf2; Py_ssize_t len1, len2; int result; - /* Coerce the two arguments */ - sub = PyUnicode_FromObject(element); - if (!sub) { + if (!PyUnicode_Check(substr)) { PyErr_Format(PyExc_TypeError, - "'in ' requires string as left operand, not %s", - element->ob_type->tp_name); + "'in ' requires string as left operand, not %.100s", + Py_TYPE(substr)->tp_name); return -1; } - - str = PyUnicode_FromObject(container); - if (!str) { - Py_DECREF(sub); + if (PyUnicode_READY(substr) == -1) + return -1; + if (ensure_unicode(str) < 0) return -1; - } kind1 = PyUnicode_KIND(str); - kind2 = PyUnicode_KIND(sub); - if (kind1 < kind2) { - Py_DECREF(sub); - Py_DECREF(str); + kind2 = PyUnicode_KIND(substr); + if (kind1 < kind2) return 0; - } len1 = PyUnicode_GET_LENGTH(str); - len2 = PyUnicode_GET_LENGTH(sub); - if (len1 < len2) { - Py_DECREF(sub); - Py_DECREF(str); + len2 = PyUnicode_GET_LENGTH(substr); + if (len1 < len2) return 0; - } buf1 = PyUnicode_DATA(str); - buf2 = PyUnicode_DATA(sub); + buf2 = PyUnicode_DATA(substr); if (len2 == 1) { Py_UCS4 ch = PyUnicode_READ(kind2, buf2, 0); result = findchar((const char *)buf1, kind1, len1, ch, 1) != -1; - Py_DECREF(sub); - Py_DECREF(str); return result; } if (kind2 != kind1) { - buf2 = _PyUnicode_AsKind(sub, kind1); - if (!buf2) { - Py_DECREF(sub); - Py_DECREF(str); + buf2 = _PyUnicode_AsKind(substr, kind1); + if (!buf2) return -1; - } } switch (kind1) { @@ -11112,9 +11277,6 @@ PyUnicode_Contains(PyObject *container, PyObject *element) assert(0); } - Py_DECREF(str); - Py_DECREF(sub); - if (kind2 != kind1) PyMem_Free(buf2); @@ -11126,56 +11288,40 @@ PyUnicode_Contains(PyObject *container, PyObject *element) PyObject * PyUnicode_Concat(PyObject *left, PyObject *right) { - PyObject *u = NULL, *v = NULL, *w; + PyObject *result; Py_UCS4 maxchar, maxchar2; - Py_ssize_t u_len, v_len, new_len; + Py_ssize_t left_len, right_len, new_len; - /* Coerce the two arguments */ - u = PyUnicode_FromObject(left); - if (u == NULL) - goto onError; - v = PyUnicode_FromObject(right); - if (v == NULL) - goto onError; + if (ensure_unicode(left) < 0 || ensure_unicode(right) < 0) + return NULL; /* Shortcuts */ - if (v == unicode_empty) { - Py_DECREF(v); - return u; - } - if (u == unicode_empty) { - Py_DECREF(u); - return v; - } + if (left == unicode_empty) + return PyUnicode_FromObject(right); + if (right == unicode_empty) + return PyUnicode_FromObject(left); - u_len = PyUnicode_GET_LENGTH(u); - v_len = PyUnicode_GET_LENGTH(v); - if (u_len > PY_SSIZE_T_MAX - v_len) { + left_len = PyUnicode_GET_LENGTH(left); + right_len = PyUnicode_GET_LENGTH(right); + if (left_len > PY_SSIZE_T_MAX - right_len) { PyErr_SetString(PyExc_OverflowError, "strings are too large to concat"); - goto onError; + return NULL; } - new_len = u_len + v_len; + new_len = left_len + right_len; - maxchar = PyUnicode_MAX_CHAR_VALUE(u); - maxchar2 = PyUnicode_MAX_CHAR_VALUE(v); + maxchar = PyUnicode_MAX_CHAR_VALUE(left); + maxchar2 = PyUnicode_MAX_CHAR_VALUE(right); maxchar = Py_MAX(maxchar, maxchar2); /* Concat the two Unicode strings */ - w = PyUnicode_New(new_len, maxchar); - if (w == NULL) - goto onError; - _PyUnicode_FastCopyCharacters(w, 0, u, 0, u_len); - _PyUnicode_FastCopyCharacters(w, u_len, v, 0, v_len); - Py_DECREF(u); - Py_DECREF(v); - assert(_PyUnicode_CheckConsistency(w, 1)); - return w; - - onError: - Py_XDECREF(u); - Py_XDECREF(v); - return NULL; + result = PyUnicode_New(new_len, maxchar); + if (result == NULL) + return NULL; + _PyUnicode_FastCopyCharacters(result, 0, left, 0, left_len); + _PyUnicode_FastCopyCharacters(result, left_len, right, 0, right_len); + assert(_PyUnicode_CheckConsistency(result, 1)); + return result; } void @@ -11266,6 +11412,25 @@ PyUnicode_AppendAndDel(PyObject **pleft, PyObject *right) Py_XDECREF(right); } +/* +Wraps stringlib_parse_args_finds() and additionally ensures that the +first argument is a unicode object. +*/ + +static inline int +parse_args_finds_unicode(const char * function_name, PyObject *args, + PyObject **substring, + Py_ssize_t *start, Py_ssize_t *end) +{ + if(stringlib_parse_args_finds(function_name, args, substring, + start, end)) { + if (ensure_unicode(*substring) < 0) + return 0; + return 1; + } + return 0; +} + PyDoc_STRVAR(count__doc__, "S.count(sub[, start[, end]]) -> int\n\ \n\ @@ -11284,31 +11449,26 @@ unicode_count(PyObject *self, PyObject *args) void *buf1, *buf2; Py_ssize_t len1, len2, iresult; - if (!stringlib_parse_args_finds_unicode("count", args, &substring, - &start, &end)) + if (!parse_args_finds_unicode("count", args, &substring, &start, &end)) return NULL; kind1 = PyUnicode_KIND(self); kind2 = PyUnicode_KIND(substring); - if (kind1 < kind2) { - Py_DECREF(substring); + if (kind1 < kind2) return PyLong_FromLong(0); - } + len1 = PyUnicode_GET_LENGTH(self); len2 = PyUnicode_GET_LENGTH(substring); ADJUST_INDICES(start, end, len1); - if (end - start < len2) { - Py_DECREF(substring); + if (end - start < len2) return PyLong_FromLong(0); - } + buf1 = PyUnicode_DATA(self); buf2 = PyUnicode_DATA(substring); if (kind2 != kind1) { buf2 = _PyUnicode_AsKind(substring, kind1); - if (!buf2) { - Py_DECREF(substring); + if (!buf2) return NULL; - } } switch (kind1) { case PyUnicode_1BYTE_KIND: @@ -11338,8 +11498,6 @@ unicode_count(PyObject *self, PyObject *args) if (kind2 != kind1) PyMem_Free(buf2); - Py_DECREF(substring); - return result; } @@ -11473,22 +11631,13 @@ unicode_find(PyObject *self, PyObject *args) Py_ssize_t end = 0; Py_ssize_t result; - if (!stringlib_parse_args_finds_unicode("find", args, &substring, - &start, &end)) + if (!parse_args_finds_unicode("find", args, &substring, &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) { - Py_DECREF(substring); - return NULL; - } - if (PyUnicode_READY(substring) == -1) { - Py_DECREF(substring); + if (PyUnicode_READY(self) == -1) return NULL; - } - - result = any_find_slice(1, self, substring, start, end); - Py_DECREF(substring); + result = any_find_slice(self, substring, start, end, 1); if (result == -2) return NULL; @@ -11561,22 +11710,13 @@ unicode_index(PyObject *self, PyObject *args) Py_ssize_t start = 0; Py_ssize_t end = 0; - if (!stringlib_parse_args_finds_unicode("index", args, &substring, - &start, &end)) + if (!parse_args_finds_unicode("index", args, &substring, &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) { - Py_DECREF(substring); - return NULL; - } - if (PyUnicode_READY(substring) == -1) { - Py_DECREF(substring); + if (PyUnicode_READY(self) == -1) return NULL; - } - - result = any_find_slice(1, self, substring, start, end); - Py_DECREF(substring); + result = any_find_slice(self, substring, start, end, 1); if (result == -2) return NULL; @@ -12090,7 +12230,7 @@ unicode_lower(PyObject *self) #define BOTHSTRIP 2 /* Arrays indexed by above */ -static const char *stripformat[] = {"|O:lstrip", "|O:rstrip", "|O:strip"}; +static const char * const stripformat[] = {"|O:lstrip", "|O:rstrip", "|O:strip"}; #define STRIPNAME(i) (stripformat[i]+3) @@ -12371,11 +12511,11 @@ unicode_repeat(PyObject *str, Py_ssize_t len) Py_ssize_t done = PyUnicode_GET_LENGTH(str); const Py_ssize_t char_size = PyUnicode_KIND(str); char *to = (char *) PyUnicode_DATA(u); - Py_MEMCPY(to, PyUnicode_DATA(str), + memcpy(to, PyUnicode_DATA(str), PyUnicode_GET_LENGTH(str) * char_size); while (done < nchars) { n = (done <= nchars-done) ? done : nchars-done; - Py_MEMCPY(to + (done * char_size), to, n * char_size); + memcpy(to + (done * char_size), to, n * char_size); done += n; } } @@ -12385,40 +12525,15 @@ unicode_repeat(PyObject *str, Py_ssize_t len) } PyObject * -PyUnicode_Replace(PyObject *obj, - PyObject *subobj, - PyObject *replobj, +PyUnicode_Replace(PyObject *str, + PyObject *substr, + PyObject *replstr, Py_ssize_t maxcount) { - PyObject *self; - PyObject *str1; - PyObject *str2; - PyObject *result; - - self = PyUnicode_FromObject(obj); - if (self == NULL) - return NULL; - str1 = PyUnicode_FromObject(subobj); - if (str1 == NULL) { - Py_DECREF(self); - return NULL; - } - str2 = PyUnicode_FromObject(replobj); - if (str2 == NULL) { - Py_DECREF(self); - Py_DECREF(str1); + if (ensure_unicode(str) < 0 || ensure_unicode(substr) < 0 || + ensure_unicode(replstr) < 0) return NULL; - } - if (PyUnicode_READY(self) == -1 || - PyUnicode_READY(str1) == -1 || - PyUnicode_READY(str2) == -1) - result = NULL; - else - result = replace(self, str1, str2, maxcount); - Py_DECREF(self); - Py_DECREF(str1); - Py_DECREF(str2); - return result; + return replace(str, substr, replstr, maxcount); } PyDoc_STRVAR(replace__doc__, @@ -12434,28 +12549,12 @@ unicode_replace(PyObject *self, PyObject *args) PyObject *str1; PyObject *str2; Py_ssize_t maxcount = -1; - PyObject *result; - if (!PyArg_ParseTuple(args, "OO|n:replace", &str1, &str2, &maxcount)) + if (!PyArg_ParseTuple(args, "UU|n:replace", &str1, &str2, &maxcount)) return NULL; if (PyUnicode_READY(self) == -1) return NULL; - str1 = PyUnicode_FromObject(str1); - if (str1 == NULL) - return NULL; - str2 = PyUnicode_FromObject(str2); - if (str2 == NULL) { - Py_DECREF(str1); - return NULL; - } - if (PyUnicode_READY(str1) == -1 || PyUnicode_READY(str2) == -1) - result = NULL; - else - result = replace(self, str1, str2, maxcount); - - Py_DECREF(str1); - Py_DECREF(str2); - return result; + return replace(self, str1, str2, maxcount); } static PyObject * @@ -12640,22 +12739,13 @@ unicode_rfind(PyObject *self, PyObject *args) Py_ssize_t end = 0; Py_ssize_t result; - if (!stringlib_parse_args_finds_unicode("rfind", args, &substring, - &start, &end)) + if (!parse_args_finds_unicode("rfind", args, &substring, &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) { - Py_DECREF(substring); - return NULL; - } - if (PyUnicode_READY(substring) == -1) { - Py_DECREF(substring); + if (PyUnicode_READY(self) == -1) return NULL; - } - result = any_find_slice(-1, self, substring, start, end); - - Py_DECREF(substring); + result = any_find_slice(self, substring, start, end, -1); if (result == -2) return NULL; @@ -12677,22 +12767,13 @@ unicode_rindex(PyObject *self, PyObject *args) Py_ssize_t end = 0; Py_ssize_t result; - if (!stringlib_parse_args_finds_unicode("rindex", args, &substring, - &start, &end)) + if (!parse_args_finds_unicode("rindex", args, &substring, &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) { - Py_DECREF(substring); - return NULL; - } - if (PyUnicode_READY(substring) == -1) { - Py_DECREF(substring); + if (PyUnicode_READY(self) == -1) return NULL; - } - result = any_find_slice(-1, self, substring, start, end); - - Py_DECREF(substring); + result = any_find_slice(self, substring, start, end, -1); if (result == -2) return NULL; @@ -12732,24 +12813,10 @@ unicode_rjust(PyObject *self, PyObject *args) PyObject * PyUnicode_Split(PyObject *s, PyObject *sep, Py_ssize_t maxsplit) { - PyObject *result; - - s = PyUnicode_FromObject(s); - if (s == NULL) + if (ensure_unicode(s) < 0 || (sep != NULL && ensure_unicode(sep) < 0)) return NULL; - if (sep != NULL) { - sep = PyUnicode_FromObject(sep); - if (sep == NULL) { - Py_DECREF(s); - return NULL; - } - } - - result = split(s, sep, maxsplit); - Py_DECREF(s); - Py_XDECREF(sep); - return result; + return split(s, sep, maxsplit); } PyDoc_STRVAR(split__doc__, @@ -12774,35 +12841,26 @@ unicode_split(PyObject *self, PyObject *args, PyObject *kwds) if (substring == Py_None) return split(self, NULL, maxcount); - else if (PyUnicode_Check(substring)) + + if (PyUnicode_Check(substring)) return split(self, substring, maxcount); - else - return PyUnicode_Split(self, substring, maxcount); + + PyErr_Format(PyExc_TypeError, + "must be str or None, not %.100s", + Py_TYPE(substring)->tp_name); + return NULL; } PyObject * -PyUnicode_Partition(PyObject *str_in, PyObject *sep_in) +PyUnicode_Partition(PyObject *str_obj, PyObject *sep_obj) { - PyObject* str_obj; - PyObject* sep_obj; PyObject* out; int kind1, kind2; void *buf1, *buf2; Py_ssize_t len1, len2; - str_obj = PyUnicode_FromObject(str_in); - if (!str_obj) - return NULL; - sep_obj = PyUnicode_FromObject(sep_in); - if (!sep_obj) { - Py_DECREF(str_obj); + if (ensure_unicode(str_obj) < 0 || ensure_unicode(sep_obj) < 0) return NULL; - } - if (PyUnicode_READY(sep_obj) == -1 || PyUnicode_READY(str_obj) == -1) { - Py_DECREF(sep_obj); - Py_DECREF(str_obj); - return NULL; - } kind1 = PyUnicode_KIND(str_obj); kind2 = PyUnicode_KIND(sep_obj); @@ -12816,8 +12874,6 @@ PyUnicode_Partition(PyObject *str_in, PyObject *sep_in) out = PyTuple_Pack(3, str_obj, unicode_empty, unicode_empty); Py_DECREF(unicode_empty); } - Py_DECREF(sep_obj); - Py_DECREF(str_obj); return out; } buf1 = PyUnicode_DATA(str_obj); @@ -12825,7 +12881,7 @@ PyUnicode_Partition(PyObject *str_in, PyObject *sep_in) if (kind2 != kind1) { buf2 = _PyUnicode_AsKind(sep_obj, kind1); if (!buf2) - goto onError; + return NULL; } switch (kind1) { @@ -12846,39 +12902,23 @@ PyUnicode_Partition(PyObject *str_in, PyObject *sep_in) out = 0; } - Py_DECREF(sep_obj); - Py_DECREF(str_obj); if (kind2 != kind1) PyMem_Free(buf2); return out; - onError: - Py_DECREF(sep_obj); - Py_DECREF(str_obj); - if (kind2 != kind1 && buf2) - PyMem_Free(buf2); - return NULL; } PyObject * -PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in) +PyUnicode_RPartition(PyObject *str_obj, PyObject *sep_obj) { - PyObject* str_obj; - PyObject* sep_obj; PyObject* out; int kind1, kind2; void *buf1, *buf2; Py_ssize_t len1, len2; - str_obj = PyUnicode_FromObject(str_in); - if (!str_obj) - return NULL; - sep_obj = PyUnicode_FromObject(sep_in); - if (!sep_obj) { - Py_DECREF(str_obj); + if (ensure_unicode(str_obj) < 0 || ensure_unicode(sep_obj) < 0) return NULL; - } kind1 = PyUnicode_KIND(str_obj); kind2 = PyUnicode_KIND(sep_obj); @@ -12892,8 +12932,6 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in) out = PyTuple_Pack(3, unicode_empty, unicode_empty, str_obj); Py_DECREF(unicode_empty); } - Py_DECREF(sep_obj); - Py_DECREF(str_obj); return out; } buf1 = PyUnicode_DATA(str_obj); @@ -12901,7 +12939,7 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in) if (kind2 != kind1) { buf2 = _PyUnicode_AsKind(sep_obj, kind1); if (!buf2) - goto onError; + return NULL; } switch (kind1) { @@ -12922,18 +12960,10 @@ PyUnicode_RPartition(PyObject *str_in, PyObject *sep_in) out = 0; } - Py_DECREF(sep_obj); - Py_DECREF(str_obj); if (kind2 != kind1) PyMem_Free(buf2); return out; - onError: - Py_DECREF(sep_obj); - Py_DECREF(str_obj); - if (kind2 != kind1 && buf2) - PyMem_Free(buf2); - return NULL; } PyDoc_STRVAR(partition__doc__, @@ -12965,24 +12995,10 @@ unicode_rpartition(PyObject *self, PyObject *separator) PyObject * PyUnicode_RSplit(PyObject *s, PyObject *sep, Py_ssize_t maxsplit) { - PyObject *result; - - s = PyUnicode_FromObject(s); - if (s == NULL) + if (ensure_unicode(s) < 0 || (sep != NULL && ensure_unicode(sep) < 0)) return NULL; - if (sep != NULL) { - sep = PyUnicode_FromObject(sep); - if (sep == NULL) { - Py_DECREF(s); - return NULL; - } - } - - result = rsplit(s, sep, maxsplit); - Py_DECREF(s); - Py_XDECREF(sep); - return result; + return rsplit(s, sep, maxsplit); } PyDoc_STRVAR(rsplit__doc__, @@ -13007,10 +13023,14 @@ unicode_rsplit(PyObject *self, PyObject *args, PyObject *kwds) if (substring == Py_None) return rsplit(self, NULL, maxcount); - else if (PyUnicode_Check(substring)) + + if (PyUnicode_Check(substring)) return rsplit(self, substring, maxcount); - else - return PyUnicode_RSplit(self, substring, maxcount); + + PyErr_Format(PyExc_TypeError, + "must be str or None, not %.100s", + Py_TYPE(substring)->tp_name); + return NULL; } PyDoc_STRVAR(splitlines__doc__, @@ -13291,11 +13311,15 @@ unicode_startswith(PyObject *self, if (PyTuple_Check(subobj)) { Py_ssize_t i; for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - substring = PyUnicode_FromObject(PyTuple_GET_ITEM(subobj, i)); - if (substring == NULL) + substring = PyTuple_GET_ITEM(subobj, i); + if (!PyUnicode_Check(substring)) { + PyErr_Format(PyExc_TypeError, + "tuple for startswith must only contain str, " + "not %.100s", + Py_TYPE(substring)->tp_name); return NULL; + } result = tailmatch(self, substring, start, end, -1); - Py_DECREF(substring); if (result == -1) return NULL; if (result) { @@ -13305,15 +13329,13 @@ unicode_startswith(PyObject *self, /* nothing matched */ Py_RETURN_FALSE; } - substring = PyUnicode_FromObject(subobj); - if (substring == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "startswith first arg must be str or " - "a tuple of str, not %s", Py_TYPE(subobj)->tp_name); + if (!PyUnicode_Check(subobj)) { + PyErr_Format(PyExc_TypeError, + "startswith first arg must be str or " + "a tuple of str, not %.100s", Py_TYPE(subobj)->tp_name); return NULL; } - result = tailmatch(self, substring, start, end, -1); - Py_DECREF(substring); + result = tailmatch(self, subobj, start, end, -1); if (result == -1) return NULL; return PyBool_FromLong(result); @@ -13343,12 +13365,15 @@ unicode_endswith(PyObject *self, if (PyTuple_Check(subobj)) { Py_ssize_t i; for (i = 0; i < PyTuple_GET_SIZE(subobj); i++) { - substring = PyUnicode_FromObject( - PyTuple_GET_ITEM(subobj, i)); - if (substring == NULL) + substring = PyTuple_GET_ITEM(subobj, i); + if (!PyUnicode_Check(substring)) { + PyErr_Format(PyExc_TypeError, + "tuple for endswith must only contain str, " + "not %.100s", + Py_TYPE(substring)->tp_name); return NULL; + } result = tailmatch(self, substring, start, end, +1); - Py_DECREF(substring); if (result == -1) return NULL; if (result) { @@ -13357,61 +13382,67 @@ unicode_endswith(PyObject *self, } Py_RETURN_FALSE; } - substring = PyUnicode_FromObject(subobj); - if (substring == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_Format(PyExc_TypeError, "endswith first arg must be str or " - "a tuple of str, not %s", Py_TYPE(subobj)->tp_name); + if (!PyUnicode_Check(subobj)) { + PyErr_Format(PyExc_TypeError, + "endswith first arg must be str or " + "a tuple of str, not %.100s", Py_TYPE(subobj)->tp_name); return NULL; } - result = tailmatch(self, substring, start, end, +1); - Py_DECREF(substring); + result = tailmatch(self, subobj, start, end, +1); if (result == -1) return NULL; return PyBool_FromLong(result); } -Py_LOCAL_INLINE(void) +static inline void _PyUnicodeWriter_Update(_PyUnicodeWriter *writer) { - if (!writer->readonly) + writer->maxchar = PyUnicode_MAX_CHAR_VALUE(writer->buffer); + writer->data = PyUnicode_DATA(writer->buffer); + + if (!writer->readonly) { + writer->kind = PyUnicode_KIND(writer->buffer); writer->size = PyUnicode_GET_LENGTH(writer->buffer); + } else { + /* use a value smaller than PyUnicode_1BYTE_KIND() so + _PyUnicodeWriter_PrepareKind() will copy the buffer. */ + writer->kind = PyUnicode_WCHAR_KIND; + assert(writer->kind <= PyUnicode_1BYTE_KIND); + /* Copy-on-write mode: set buffer size to 0 so * _PyUnicodeWriter_Prepare() will copy (and enlarge) the buffer on * next write. */ writer->size = 0; } - writer->maxchar = PyUnicode_MAX_CHAR_VALUE(writer->buffer); - writer->data = PyUnicode_DATA(writer->buffer); - writer->kind = PyUnicode_KIND(writer->buffer); } void _PyUnicodeWriter_Init(_PyUnicodeWriter *writer) { memset(writer, 0, sizeof(*writer)); -#ifdef Py_DEBUG - writer->kind = 5; /* invalid kind */ -#endif + + /* ASCII is the bare minimum */ writer->min_char = 127; + + /* use a value smaller than PyUnicode_1BYTE_KIND() so + _PyUnicodeWriter_PrepareKind() will copy the buffer. */ + writer->kind = PyUnicode_WCHAR_KIND; + assert(writer->kind <= PyUnicode_1BYTE_KIND); } int _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer, Py_ssize_t length, Py_UCS4 maxchar) { -#ifdef MS_WINDOWS - /* On Windows, overallocate by 50% is the best factor */ -# define OVERALLOCATE_FACTOR 2 -#else - /* On Linux, overallocate by 25% is the best factor */ -# define OVERALLOCATE_FACTOR 4 -#endif Py_ssize_t newlen; PyObject *newbuffer; - assert(length > 0); + assert(maxchar <= MAX_UNICODE); + + /* ensure that the _PyUnicodeWriter_Prepare macro was used */ + assert((maxchar > writer->maxchar && length >= 0) + || length > 0); if (length > PY_SSIZE_T_MAX - writer->pos) { PyErr_NoMemory(); @@ -13477,9 +13508,32 @@ _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer, #undef OVERALLOCATE_FACTOR } -Py_LOCAL_INLINE(int) +int +_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer, + enum PyUnicode_Kind kind) +{ + Py_UCS4 maxchar; + + /* ensure that the _PyUnicodeWriter_PrepareKind macro was used */ + assert(writer->kind < kind); + + switch (kind) + { + case PyUnicode_1BYTE_KIND: maxchar = 0xff; break; + case PyUnicode_2BYTE_KIND: maxchar = 0xffff; break; + case PyUnicode_4BYTE_KIND: maxchar = 0x10ffff; break; + default: + assert(0 && "invalid kind"); + return -1; + } + + return _PyUnicodeWriter_PrepareInternal(writer, 0, maxchar); +} + +static inline int _PyUnicodeWriter_WriteCharInline(_PyUnicodeWriter *writer, Py_UCS4 ch) { + assert(ch <= MAX_UNICODE); if (_PyUnicodeWriter_Prepare(writer, 1, ch) < 0) return -1; PyUnicode_WRITE(writer->kind, writer->data, writer->pos, ch); @@ -13592,7 +13646,7 @@ _PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer, const Py_UCS1 *str = (const Py_UCS1 *)ascii; Py_UCS1 *data = writer->data; - Py_MEMCPY(data + writer->pos, str, len); + memcpy(data + writer->pos, str, len); break; } case PyUnicode_2BYTE_KIND: @@ -13637,27 +13691,30 @@ PyObject * _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer) { PyObject *str; + if (writer->pos == 0) { Py_CLEAR(writer->buffer); _Py_RETURN_UNICODE_EMPTY(); } + + str = writer->buffer; + writer->buffer = NULL; + if (writer->readonly) { - str = writer->buffer; - writer->buffer = NULL; assert(PyUnicode_GET_LENGTH(str) == writer->pos); return str; } - if (PyUnicode_GET_LENGTH(writer->buffer) != writer->pos) { - PyObject *newbuffer; - newbuffer = resize_compact(writer->buffer, writer->pos); - if (newbuffer == NULL) { - Py_CLEAR(writer->buffer); + + if (PyUnicode_GET_LENGTH(str) != writer->pos) { + PyObject *str2; + str2 = resize_compact(str, writer->pos); + if (str2 == NULL) { + Py_DECREF(str); return NULL; } - writer->buffer = newbuffer; + str = str2; } - str = writer->buffer; - writer->buffer = NULL; + assert(_PyUnicode_CheckConsistency(str, 1)); return unicode_result_ready(str); } @@ -13856,11 +13913,10 @@ unicode_subscript(PyObject* self, PyObject* item) int src_kind, dest_kind; Py_UCS4 ch, max_char, kind_limit; - if (PySlice_Unpack(item, &start, &stop, &step) < 0) { + if (PySlice_GetIndicesEx(item, PyUnicode_GET_LENGTH(self), + &start, &stop, &step, &slicelength) < 0) { return NULL; } - slicelength = PySlice_AdjustIndices(PyUnicode_GET_LENGTH(self), - &start, &stop, step); if (slicelength <= 0) { _Py_RETURN_UNICODE_EMPTY(); @@ -14268,12 +14324,11 @@ formatchar(PyObject *v) if (iobj == NULL) { goto onError; } - x = PyLong_AsLong(iobj); + v = iobj; Py_DECREF(iobj); } - else { - x = PyLong_AsLong(v); - } + /* Integer input truncated to a character */ + x = PyLong_AsLong(v); if (x == -1 && PyErr_Occurred()) goto onError; @@ -14800,13 +14855,10 @@ PyUnicode_Format(PyObject *format, PyObject *args) return NULL; } - ctx.fmtstr = PyUnicode_FromObject(format); - if (ctx.fmtstr == NULL) - return NULL; - if (PyUnicode_READY(ctx.fmtstr) == -1) { - Py_DECREF(ctx.fmtstr); + if (ensure_unicode(format) < 0) return NULL; - } + + ctx.fmtstr = format; ctx.fmtdata = PyUnicode_DATA(ctx.fmtstr); ctx.fmtkind = PyUnicode_KIND(ctx.fmtstr); ctx.fmtcnt = PyUnicode_GET_LENGTH(ctx.fmtstr); @@ -14866,11 +14918,9 @@ PyUnicode_Format(PyObject *format, PyObject *args) if (ctx.args_owned) { Py_DECREF(ctx.args); } - Py_DECREF(ctx.fmtstr); return _PyUnicodeWriter_Finish(&ctx.writer); onError: - Py_DECREF(ctx.fmtstr); _PyUnicodeWriter_Dealloc(&ctx.writer); if (ctx.args_owned) { Py_DECREF(ctx.args); @@ -14987,7 +15037,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) _PyUnicode_WSTR(self) = (wchar_t *)data; } - Py_MEMCPY(data, PyUnicode_DATA(unicode), + memcpy(data, PyUnicode_DATA(unicode), kind * (length + 1)); assert(_PyUnicode_CheckConsistency(self, 1)); #ifdef Py_DEBUG @@ -15148,26 +15198,18 @@ PyUnicode_InternInPlace(PyObject **p) return; } } - /* It might be that the GetItem call fails even - though the key is present in the dictionary, - namely when this happens during a stack overflow. */ Py_ALLOW_RECURSION - t = PyDict_GetItem(interned, s); + t = PyDict_SetDefault(interned, s, s); Py_END_ALLOW_RECURSION - - if (t) { - Py_INCREF(t); - Py_SETREF(*p, t); + if (t == NULL) { + PyErr_Clear(); return; } - - PyThreadState_GET()->recursion_critical = 1; - if (PyDict_SetItem(interned, s, s) < 0) { - PyErr_Clear(); - PyThreadState_GET()->recursion_critical = 0; + if (t != s) { + Py_INCREF(t); + Py_SETREF(*p, t); return; } - PyThreadState_GET()->recursion_critical = 0; /* The two references in interned are not counted by refcnt. The deallocator will take care of this */ Py_REFCNT(s) -= 2; diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h index 7c780b6..39af920 100644 --- a/Objects/unicodetype_db.h +++ b/Objects/unicodetype_db.h @@ -244,109 +244,119 @@ const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = { {16777562, 17826136, 16777562, 0, 0, 26377}, {16777565, 17826139, 16777565, 0, 0, 26377}, {0, 0, 0, 0, 0, 3840}, + {0, 0, 0, 0, 0, 5888}, + {16777568, 17826142, 16777568, 0, 0, 26377}, + {16777571, 17826145, 16777571, 0, 0, 26377}, + {16777574, 17826148, 16777574, 0, 0, 26377}, + {16777577, 17826151, 16777577, 0, 0, 26377}, + {16777580, 17826154, 16777580, 0, 0, 26377}, + {16777583, 17826157, 16777583, 0, 0, 26377}, + {16777586, 17826160, 16777586, 0, 0, 26377}, + {16777589, 17826163, 16777589, 0, 0, 26377}, + {16777592, 17826166, 16777592, 0, 0, 26377}, {35332, 0, 35332, 0, 0, 9993}, {3814, 0, 3814, 0, 0, 9993}, - {33554785, 18874718, 33554785, 0, 0, 26377}, - {33554790, 18874723, 33554790, 0, 0, 26377}, - {33554795, 18874728, 33554795, 0, 0, 26377}, - {33554800, 18874733, 33554800, 0, 0, 26377}, - {33554805, 18874738, 33554805, 0, 0, 26377}, - {16777593, 17826167, 16777593, 0, 0, 26377}, - {16777597, 18874746, 16777597, 0, 0, 26497}, + {33554812, 18874745, 33554812, 0, 0, 26377}, + {33554817, 18874750, 33554817, 0, 0, 26377}, + {33554822, 18874755, 33554822, 0, 0, 26377}, + {33554827, 18874760, 33554827, 0, 0, 26377}, + {33554832, 18874765, 33554832, 0, 0, 26377}, + {16777620, 17826194, 16777620, 0, 0, 26377}, + {16777624, 18874773, 16777624, 0, 0, 26497}, {8, 0, 8, 0, 0, 9993}, {0, -8, 0, 0, 0, 10113}, - {33554817, 18874750, 33554817, 0, 0, 26377}, - {50332039, 19923331, 50332039, 0, 0, 26377}, - {50332046, 19923338, 50332046, 0, 0, 26377}, - {50332053, 19923345, 50332053, 0, 0, 26377}, + {33554844, 18874777, 33554844, 0, 0, 26377}, + {50332066, 19923358, 50332066, 0, 0, 26377}, + {50332073, 19923365, 50332073, 0, 0, 26377}, + {50332080, 19923372, 50332080, 0, 0, 26377}, {74, 0, 74, 0, 0, 9993}, {86, 0, 86, 0, 0, 9993}, {100, 0, 100, 0, 0, 9993}, {128, 0, 128, 0, 0, 9993}, {112, 0, 112, 0, 0, 9993}, {126, 0, 126, 0, 0, 9993}, - {33554843, 18874776, 16777629, 0, 0, 26377}, - {33554849, 18874782, 16777635, 0, 0, 26377}, - {33554855, 18874788, 16777641, 0, 0, 26377}, - {33554861, 18874794, 16777647, 0, 0, 26377}, - {33554867, 18874800, 16777653, 0, 0, 26377}, - {33554873, 18874806, 16777659, 0, 0, 26377}, - {33554879, 18874812, 16777665, 0, 0, 26377}, - {33554885, 18874818, 16777671, 0, 0, 26377}, - {33554891, 18874824, 16777677, 0, 0, 26433}, - {33554897, 18874830, 16777683, 0, 0, 26433}, - {33554903, 18874836, 16777689, 0, 0, 26433}, - {33554909, 18874842, 16777695, 0, 0, 26433}, - {33554915, 18874848, 16777701, 0, 0, 26433}, - {33554921, 18874854, 16777707, 0, 0, 26433}, - {33554927, 18874860, 16777713, 0, 0, 26433}, - {33554933, 18874866, 16777719, 0, 0, 26433}, - {33554939, 18874872, 16777725, 0, 0, 26377}, - {33554945, 18874878, 16777731, 0, 0, 26377}, - {33554951, 18874884, 16777737, 0, 0, 26377}, - {33554957, 18874890, 16777743, 0, 0, 26377}, - {33554963, 18874896, 16777749, 0, 0, 26377}, - {33554969, 18874902, 16777755, 0, 0, 26377}, - {33554975, 18874908, 16777761, 0, 0, 26377}, - {33554981, 18874914, 16777767, 0, 0, 26377}, - {33554987, 18874920, 16777773, 0, 0, 26433}, - {33554993, 18874926, 16777779, 0, 0, 26433}, - {33554999, 18874932, 16777785, 0, 0, 26433}, - {33555005, 18874938, 16777791, 0, 0, 26433}, - {33555011, 18874944, 16777797, 0, 0, 26433}, - {33555017, 18874950, 16777803, 0, 0, 26433}, - {33555023, 18874956, 16777809, 0, 0, 26433}, - {33555029, 18874962, 16777815, 0, 0, 26433}, - {33555035, 18874968, 16777821, 0, 0, 26377}, - {33555041, 18874974, 16777827, 0, 0, 26377}, - {33555047, 18874980, 16777833, 0, 0, 26377}, - {33555053, 18874986, 16777839, 0, 0, 26377}, - {33555059, 18874992, 16777845, 0, 0, 26377}, - {33555065, 18874998, 16777851, 0, 0, 26377}, - {33555071, 18875004, 16777857, 0, 0, 26377}, - {33555077, 18875010, 16777863, 0, 0, 26377}, - {33555083, 18875016, 16777869, 0, 0, 26433}, - {33555089, 18875022, 16777875, 0, 0, 26433}, - {33555095, 18875028, 16777881, 0, 0, 26433}, - {33555101, 18875034, 16777887, 0, 0, 26433}, - {33555107, 18875040, 16777893, 0, 0, 26433}, - {33555113, 18875046, 16777899, 0, 0, 26433}, - {33555119, 18875052, 16777905, 0, 0, 26433}, - {33555125, 18875058, 16777911, 0, 0, 26433}, - {33555131, 18875064, 33555133, 0, 0, 26377}, - {33555138, 18875071, 16777924, 0, 0, 26377}, - {33555144, 18875077, 33555146, 0, 0, 26377}, - {33555151, 18875084, 33555151, 0, 0, 26377}, - {50332373, 19923665, 50332376, 0, 0, 26377}, + {33554870, 18874803, 16777656, 0, 0, 26377}, + {33554876, 18874809, 16777662, 0, 0, 26377}, + {33554882, 18874815, 16777668, 0, 0, 26377}, + {33554888, 18874821, 16777674, 0, 0, 26377}, + {33554894, 18874827, 16777680, 0, 0, 26377}, + {33554900, 18874833, 16777686, 0, 0, 26377}, + {33554906, 18874839, 16777692, 0, 0, 26377}, + {33554912, 18874845, 16777698, 0, 0, 26377}, + {33554918, 18874851, 16777704, 0, 0, 26433}, + {33554924, 18874857, 16777710, 0, 0, 26433}, + {33554930, 18874863, 16777716, 0, 0, 26433}, + {33554936, 18874869, 16777722, 0, 0, 26433}, + {33554942, 18874875, 16777728, 0, 0, 26433}, + {33554948, 18874881, 16777734, 0, 0, 26433}, + {33554954, 18874887, 16777740, 0, 0, 26433}, + {33554960, 18874893, 16777746, 0, 0, 26433}, + {33554966, 18874899, 16777752, 0, 0, 26377}, + {33554972, 18874905, 16777758, 0, 0, 26377}, + {33554978, 18874911, 16777764, 0, 0, 26377}, + {33554984, 18874917, 16777770, 0, 0, 26377}, + {33554990, 18874923, 16777776, 0, 0, 26377}, + {33554996, 18874929, 16777782, 0, 0, 26377}, + {33555002, 18874935, 16777788, 0, 0, 26377}, + {33555008, 18874941, 16777794, 0, 0, 26377}, + {33555014, 18874947, 16777800, 0, 0, 26433}, + {33555020, 18874953, 16777806, 0, 0, 26433}, + {33555026, 18874959, 16777812, 0, 0, 26433}, + {33555032, 18874965, 16777818, 0, 0, 26433}, + {33555038, 18874971, 16777824, 0, 0, 26433}, + {33555044, 18874977, 16777830, 0, 0, 26433}, + {33555050, 18874983, 16777836, 0, 0, 26433}, + {33555056, 18874989, 16777842, 0, 0, 26433}, + {33555062, 18874995, 16777848, 0, 0, 26377}, + {33555068, 18875001, 16777854, 0, 0, 26377}, + {33555074, 18875007, 16777860, 0, 0, 26377}, + {33555080, 18875013, 16777866, 0, 0, 26377}, + {33555086, 18875019, 16777872, 0, 0, 26377}, + {33555092, 18875025, 16777878, 0, 0, 26377}, + {33555098, 18875031, 16777884, 0, 0, 26377}, + {33555104, 18875037, 16777890, 0, 0, 26377}, + {33555110, 18875043, 16777896, 0, 0, 26433}, + {33555116, 18875049, 16777902, 0, 0, 26433}, + {33555122, 18875055, 16777908, 0, 0, 26433}, + {33555128, 18875061, 16777914, 0, 0, 26433}, + {33555134, 18875067, 16777920, 0, 0, 26433}, + {33555140, 18875073, 16777926, 0, 0, 26433}, + {33555146, 18875079, 16777932, 0, 0, 26433}, + {33555152, 18875085, 16777938, 0, 0, 26433}, + {33555158, 18875091, 33555160, 0, 0, 26377}, + {33555165, 18875098, 16777951, 0, 0, 26377}, + {33555171, 18875104, 33555173, 0, 0, 26377}, + {33555178, 18875111, 33555178, 0, 0, 26377}, + {50332400, 19923692, 50332403, 0, 0, 26377}, {0, -74, 0, 0, 0, 10113}, - {33555166, 18875099, 16777952, 0, 0, 26433}, - {16777955, 17826529, 16777955, 0, 0, 26377}, - {33555175, 18875108, 33555177, 0, 0, 26377}, - {33555182, 18875115, 16777968, 0, 0, 26377}, - {33555188, 18875121, 33555190, 0, 0, 26377}, - {33555195, 18875128, 33555195, 0, 0, 26377}, - {50332417, 19923709, 50332420, 0, 0, 26377}, + {33555193, 18875126, 16777979, 0, 0, 26433}, + {16777982, 17826556, 16777982, 0, 0, 26377}, + {33555202, 18875135, 33555204, 0, 0, 26377}, + {33555209, 18875142, 16777995, 0, 0, 26377}, + {33555215, 18875148, 33555217, 0, 0, 26377}, + {33555222, 18875155, 33555222, 0, 0, 26377}, + {50332444, 19923736, 50332447, 0, 0, 26377}, {0, -86, 0, 0, 0, 10113}, - {33555210, 18875143, 16777996, 0, 0, 26433}, - {50332433, 19923725, 50332433, 0, 0, 26377}, - {50332440, 19923732, 50332440, 0, 0, 26377}, - {33555230, 18875163, 33555230, 0, 0, 26377}, - {50332452, 19923744, 50332452, 0, 0, 26377}, + {33555237, 18875170, 16778023, 0, 0, 26433}, + {50332460, 19923752, 50332460, 0, 0, 26377}, + {50332467, 19923759, 50332467, 0, 0, 26377}, + {33555257, 18875190, 33555257, 0, 0, 26377}, + {50332479, 19923771, 50332479, 0, 0, 26377}, {0, -100, 0, 0, 0, 10113}, - {50332459, 19923751, 50332459, 0, 0, 26377}, - {50332466, 19923758, 50332466, 0, 0, 26377}, - {33555256, 18875189, 33555256, 0, 0, 26377}, - {33555261, 18875194, 33555261, 0, 0, 26377}, - {50332483, 19923775, 50332483, 0, 0, 26377}, + {50332486, 19923778, 50332486, 0, 0, 26377}, + {50332493, 19923785, 50332493, 0, 0, 26377}, + {33555283, 18875216, 33555283, 0, 0, 26377}, + {33555288, 18875221, 33555288, 0, 0, 26377}, + {50332510, 19923802, 50332510, 0, 0, 26377}, {0, -112, 0, 0, 0, 10113}, - {33555273, 18875206, 33555275, 0, 0, 26377}, - {33555280, 18875213, 16778066, 0, 0, 26377}, - {33555286, 18875219, 33555288, 0, 0, 26377}, - {33555293, 18875226, 33555293, 0, 0, 26377}, - {50332515, 19923807, 50332518, 0, 0, 26377}, + {33555300, 18875233, 33555302, 0, 0, 26377}, + {33555307, 18875240, 16778093, 0, 0, 26377}, + {33555313, 18875246, 33555315, 0, 0, 26377}, + {33555320, 18875253, 33555320, 0, 0, 26377}, + {50332542, 19923834, 50332545, 0, 0, 26377}, {0, -128, 0, 0, 0, 10113}, {0, -126, 0, 0, 0, 10113}, - {33555308, 18875241, 16778094, 0, 0, 26433}, + {33555335, 18875268, 16778121, 0, 0, 26433}, {0, 0, 0, 0, 0, 3076}, {0, 0, 0, 0, 4, 3076}, {0, 0, 0, 0, 5, 3076}, @@ -388,15 +398,6 @@ const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = { {0, -42261, 0, 0, 0, 10113}, {0, 928, 0, 0, 0, 10113}, {-928, 0, -928, 0, 0, 9993}, - {16778097, 17826671, 16778097, 0, 0, 26377}, - {16778100, 17826674, 16778100, 0, 0, 26377}, - {16778103, 17826677, 16778103, 0, 0, 26377}, - {16778106, 17826680, 16778106, 0, 0, 26377}, - {16778109, 17826683, 16778109, 0, 0, 26377}, - {16778112, 17826686, 16778112, 0, 0, 26377}, - {16778115, 17826689, 16778115, 0, 0, 26377}, - {16778118, 17826692, 16778118, 0, 0, 26377}, - {16778121, 17826695, 16778121, 0, 0, 26377}, {16778124, 17826698, 16778124, 0, 0, 26377}, {16778127, 17826701, 16778127, 0, 0, 26377}, {16778130, 17826704, 16778130, 0, 0, 26377}, @@ -468,22 +469,33 @@ const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = { {16778328, 17826902, 16778328, 0, 0, 26377}, {16778331, 17826905, 16778331, 0, 0, 26377}, {16778334, 17826908, 16778334, 0, 0, 26377}, - {33555554, 18875487, 33555556, 0, 0, 26377}, - {33555561, 18875494, 33555563, 0, 0, 26377}, - {33555568, 18875501, 33555570, 0, 0, 26377}, - {50332792, 19924084, 50332795, 0, 0, 26377}, - {50332802, 19924094, 50332805, 0, 0, 26377}, + {16778337, 17826911, 16778337, 0, 0, 26377}, + {16778340, 17826914, 16778340, 0, 0, 26377}, + {16778343, 17826917, 16778343, 0, 0, 26377}, + {16778346, 17826920, 16778346, 0, 0, 26377}, + {16778349, 17826923, 16778349, 0, 0, 26377}, + {16778352, 17826926, 16778352, 0, 0, 26377}, + {16778355, 17826929, 16778355, 0, 0, 26377}, + {16778358, 17826932, 16778358, 0, 0, 26377}, + {16778361, 17826935, 16778361, 0, 0, 26377}, + {33555581, 18875514, 33555583, 0, 0, 26377}, + {33555588, 18875521, 33555590, 0, 0, 26377}, {33555595, 18875528, 33555597, 0, 0, 26377}, - {33555602, 18875535, 33555604, 0, 0, 26377}, - {33555609, 18875542, 33555611, 0, 0, 26377}, - {33555616, 18875549, 33555618, 0, 0, 26377}, - {33555623, 18875556, 33555625, 0, 0, 26377}, - {33555630, 18875563, 33555632, 0, 0, 26377}, - {33555637, 18875570, 33555639, 0, 0, 26377}, + {50332819, 19924111, 50332822, 0, 0, 26377}, + {50332829, 19924121, 50332832, 0, 0, 26377}, + {33555622, 18875555, 33555624, 0, 0, 26377}, + {33555629, 18875562, 33555631, 0, 0, 26377}, + {33555636, 18875569, 33555638, 0, 0, 26377}, + {33555643, 18875576, 33555645, 0, 0, 26377}, + {33555650, 18875583, 33555652, 0, 0, 26377}, + {33555657, 18875590, 33555659, 0, 0, 26377}, + {33555664, 18875597, 33555666, 0, 0, 26377}, {0, 0, 0, 0, 0, 1025}, {0, 0, 0, 0, 0, 5633}, {0, 40, 0, 0, 0, 10113}, {-40, 0, -40, 0, 0, 9993}, + {0, 34, 0, 0, 0, 10113}, + {-34, 0, -34, 0, 0, 9993}, {0, 0, 0, 0, 0, 9344}, }; @@ -840,6 +852,33 @@ const Py_UCS4 _PyUnicode_ExtendedCase[] = { 5117, 5109, 5109, + 7296, + 1074, + 1042, + 7297, + 1076, + 1044, + 7298, + 1086, + 1054, + 7299, + 1089, + 1057, + 7300, + 1090, + 1058, + 7301, + 1090, + 1058, + 7302, + 1098, + 1066, + 7303, + 1123, + 1122, + 7304, + 42571, + 42570, 7830, 104, 817, @@ -1736,69 +1775,68 @@ static unsigned char index1[] = { 131, 132, 133, 134, 34, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 145, 34, 34, 152, 145, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 145, 145, 163, 145, 145, 145, 164, - 165, 166, 167, 168, 169, 170, 145, 145, 171, 145, 172, 173, 174, 175, - 145, 145, 176, 145, 145, 145, 177, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 34, 34, 34, 34, 34, 34, 34, 178, 179, 34, 180, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 34, 34, 34, 34, 34, 34, 34, 34, 181, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 165, 166, 167, 168, 169, 170, 145, 171, 172, 145, 173, 174, 175, 176, + 145, 145, 177, 145, 145, 145, 178, 145, 145, 179, 180, 145, 145, 145, + 145, 145, 145, 34, 34, 34, 34, 34, 34, 34, 181, 182, 34, 183, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 34, 34, 34, 34, 182, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 34, 34, 34, 34, 34, 34, 34, 34, 184, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 34, 34, 34, 34, 183, 184, 185, 186, 145, 145, 145, 145, 145, - 145, 187, 188, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 34, 34, 34, 34, 185, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 34, 34, 34, 34, 186, 187, 188, 189, 145, 145, 145, 145, 145, + 145, 190, 191, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 192, 34, 34, + 34, 34, 34, 193, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 189, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 194, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 190, 191, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 195, 196, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 64, 192, - 193, 194, 195, 145, 196, 145, 197, 198, 199, 200, 201, 202, 203, 204, 64, - 64, 64, 64, 205, 206, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 34, 207, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 208, - 209, 145, 145, 210, 211, 212, 213, 214, 145, 64, 215, 64, 64, 216, 217, - 64, 218, 219, 220, 221, 222, 223, 224, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 225, 226, 227, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 87, 228, 34, 229, 230, 34, 34, 34, 34, 34, + 145, 64, 197, 198, 199, 200, 145, 201, 145, 202, 203, 204, 205, 206, 207, + 208, 209, 64, 64, 64, 64, 210, 211, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 212, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 34, 213, 214, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 215, 216, 145, 145, 217, 218, 219, 220, 221, 145, 64, 222, 64, + 64, 64, 64, 64, 223, 224, 225, 226, 227, 228, 229, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 230, 231, 232, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 87, 233, 34, 234, 235, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 231, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 232, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 236, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 237, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 233, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 238, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 234, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 239, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 235, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 236, 34, 237, 34, + 34, 34, 34, 240, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 241, 34, 242, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 238, 145, 145, 145, 145, 145, 145, 145, 145, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 243, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 34, 231, 34, 34, 239, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 34, 236, 34, 34, 244, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, @@ -2201,7 +2239,8 @@ static unsigned char index1[] = { 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 240, 145, 241, 242, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 245, 145, + 246, 247, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, @@ -2237,8 +2276,7 @@ static unsigned char index1[] = { 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 145, 145, 145, 145, 145, 145, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, @@ -2274,7 +2312,7 @@ static unsigned char index1[] = { 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 243, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 248, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, @@ -2311,7 +2349,7 @@ static unsigned char index1[] = { 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 243, + 127, 127, 127, 127, 127, 127, 127, 248, }; static unsigned short index2[] = { @@ -2347,7 +2385,7 @@ static unsigned short index2[] = { 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 20, 20, 20, 20, 20, 20, 65, 30, 31, 66, 67, 68, 68, 30, 31, 69, 70, 71, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 72, 73, 74, 75, 76, 20, 77, 77, 20, 78, 20, 79, 80, 20, 20, - 20, 77, 81, 20, 82, 20, 83, 84, 20, 85, 86, 20, 87, 88, 20, 20, 86, 20, + 20, 77, 81, 20, 82, 20, 83, 84, 20, 85, 86, 84, 87, 88, 20, 20, 86, 20, 89, 90, 20, 20, 91, 20, 20, 20, 20, 20, 20, 20, 92, 20, 20, 93, 20, 20, 93, 20, 20, 20, 94, 93, 95, 96, 96, 97, 20, 20, 20, 20, 20, 98, 20, 55, 20, 20, 20, 20, 20, 20, 20, 20, 99, 100, 20, 20, 20, 20, 20, 20, 20, 20, @@ -2435,152 +2473,156 @@ static unsigned short index2[] = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 21, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, + 18, 25, 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 18, 18, + 25, 18, 18, 55, 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 25, 25, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 102, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 18, + 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 0, 0, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 0, 0, 0, 55, 55, 55, 55, 0, 0, 25, + 55, 18, 18, 18, 25, 25, 25, 25, 0, 0, 18, 18, 0, 0, 18, 18, 25, 55, 0, 0, + 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 55, 55, 0, 55, 55, 55, 25, 25, 0, 0, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 55, 5, 5, 27, 27, 27, 27, 27, 27, + 5, 5, 0, 0, 0, 0, 0, 25, 25, 18, 0, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, + 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, + 55, 55, 0, 55, 55, 0, 0, 25, 0, 18, 18, 18, 25, 25, 0, 0, 0, 0, 25, 25, + 0, 0, 25, 25, 25, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 0, + 55, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 25, 25, 55, + 55, 55, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 18, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, + 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, 55, 0, 0, 25, 55, 18, 18, + 18, 25, 25, 25, 25, 25, 0, 25, 25, 18, 0, 18, 18, 25, 0, 0, 55, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 5, 5, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, + 0, 25, 18, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 0, 0, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, + 55, 0, 0, 25, 55, 18, 25, 18, 25, 25, 25, 25, 0, 0, 18, 18, 0, 0, 18, 18, + 25, 0, 0, 0, 0, 0, 0, 0, 0, 25, 18, 0, 0, 0, 0, 55, 55, 0, 55, 55, 55, + 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 55, 27, 27, 27, 27, + 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 55, 0, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 55, 55, 55, 0, 55, 55, 55, 55, 0, 0, 0, 55, 55, 0, 55, 0, 55, + 55, 0, 0, 0, 55, 55, 0, 0, 0, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 18, 18, 25, 18, 18, 0, 0, 0, 18, + 18, 18, 0, 18, 18, 18, 25, 0, 0, 55, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, 27, + 27, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 25, 18, 18, 18, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 55, 25, 25, + 25, 18, 18, 18, 18, 0, 25, 25, 25, 0, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, + 0, 25, 25, 0, 55, 55, 55, 0, 0, 0, 0, 0, 55, 55, 25, 25, 0, 0, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 27, 27, 27, 27, 27, + 27, 27, 5, 55, 25, 18, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, + 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, + 55, 55, 55, 55, 55, 0, 0, 25, 55, 18, 25, 18, 18, 18, 18, 18, 0, 25, 18, + 18, 0, 18, 18, 25, 25, 0, 0, 0, 0, 0, 0, 0, 18, 18, 0, 0, 0, 0, 0, 0, 0, + 55, 0, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 55, + 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 18, 18, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 18, 18, + 18, 25, 25, 25, 25, 0, 18, 18, 18, 0, 18, 18, 18, 25, 55, 5, 0, 0, 0, 0, + 55, 55, 55, 18, 27, 27, 27, 27, 27, 27, 27, 55, 55, 55, 25, 25, 0, 0, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 5, + 55, 55, 55, 55, 55, 55, 0, 0, 18, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 0, 0, 55, 55, 55, 55, 55, + 55, 55, 0, 0, 0, 25, 0, 0, 0, 0, 18, 18, 18, 25, 25, 25, 0, 25, 0, 18, + 18, 18, 18, 18, 18, 18, 18, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 0, 0, 18, 18, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 55, 138, 25, 25, 25, 25, 25, + 25, 25, 0, 0, 0, 0, 5, 55, 55, 55, 55, 55, 55, 102, 25, 25, 25, 25, 25, + 25, 25, 25, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, + 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 0, 55, 0, 0, 55, 55, 0, 55, 0, 0, 55, 0, + 0, 0, 0, 0, 0, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, + 55, 0, 55, 0, 55, 0, 0, 55, 55, 0, 55, 55, 55, 55, 25, 55, 138, 25, 25, + 25, 25, 25, 25, 0, 25, 25, 55, 0, 0, 55, 55, 55, 55, 55, 0, 102, 0, 25, + 25, 25, 25, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 55, + 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, 25, 5, 5, 5, 5, 5, 5, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 5, + 25, 5, 25, 5, 25, 5, 5, 5, 5, 18, 18, 55, 55, 55, 55, 55, 55, 55, 55, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, + 25, 25, 25, 25, 25, 5, 25, 25, 55, 55, 55, 55, 55, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 25, 55, 18, 18, 18, - 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 18, 18, 25, 18, 18, 55, 25, 25, - 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 5, 5, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 102, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 18, 0, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 0, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, - 55, 0, 55, 0, 0, 0, 55, 55, 55, 55, 0, 0, 25, 55, 18, 18, 18, 25, 25, 25, - 25, 0, 0, 18, 18, 0, 0, 18, 18, 25, 55, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, - 0, 0, 55, 55, 0, 55, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 55, 55, 5, 5, 27, 27, 27, 27, 27, 27, 5, 5, 0, 0, 0, 0, 0, 25, - 25, 18, 0, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 55, 55, 0, 0, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 0, 55, 55, 0, 0, - 25, 0, 18, 18, 18, 25, 25, 0, 0, 0, 0, 25, 25, 0, 0, 25, 25, 25, 0, 0, 0, - 25, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 0, 55, 0, 0, 0, 0, 0, 0, 0, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 25, 25, 55, 55, 55, 25, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 25, 25, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, - 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, - 0, 55, 55, 55, 55, 55, 0, 0, 25, 55, 18, 18, 18, 25, 25, 25, 25, 25, 0, - 25, 25, 18, 0, 18, 18, 25, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 5, - 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 25, 18, 18, 0, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 0, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, - 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, 55, 0, 0, 25, 55, 18, 25, - 18, 25, 25, 25, 25, 0, 0, 18, 18, 0, 0, 18, 18, 25, 0, 0, 0, 0, 0, 0, 0, - 0, 25, 18, 0, 0, 0, 0, 55, 55, 0, 55, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 5, 55, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 25, 55, 0, 55, 55, 55, 55, 55, 55, 0, 0, 0, 55, 55, 55, 0, - 55, 55, 55, 55, 0, 0, 0, 55, 55, 0, 55, 0, 55, 55, 0, 0, 0, 55, 55, 0, 0, - 0, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 0, 0, 0, 0, 18, 18, 25, 18, 18, 0, 0, 0, 18, 18, 18, 0, 18, 18, 18, 25, - 0, 0, 55, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, 27, 27, 5, 5, 5, 5, 5, 5, 5, 5, - 0, 0, 0, 0, 0, 25, 18, 18, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, - 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 55, 25, 25, 25, 18, 18, 18, 18, 0, - 25, 25, 25, 0, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 25, 25, 0, 55, 55, - 55, 0, 0, 0, 0, 0, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 0, 0, 0, 0, 0, 0, 0, 0, 27, 27, 27, 27, 27, 27, 27, 5, 0, 25, 18, 18, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 0, 0, - 25, 55, 18, 25, 18, 18, 18, 18, 18, 0, 25, 18, 18, 0, 18, 18, 25, 25, 0, - 0, 0, 0, 0, 0, 0, 18, 18, 0, 0, 0, 0, 0, 0, 0, 55, 0, 55, 55, 25, 25, 0, - 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 55, 55, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 25, 18, 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, - 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 25, 25, 25, 25, 25, 25, 25, 0, 5, 5, 5, 5, 5, 5, 5, 5, 25, 5, 5, 5, 5, 5, + 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 18, 18, 18, 25, 25, 25, 25, - 0, 18, 18, 18, 0, 18, 18, 18, 25, 55, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, - 0, 0, 0, 0, 0, 55, 55, 55, 25, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 27, 27, 27, 27, 27, 27, 0, 0, 0, 5, 55, 55, 55, 55, 55, 55, 0, 0, 18, - 18, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 25, 0, 0, 0, 0, - 18, 18, 18, 25, 25, 25, 0, 25, 0, 18, 18, 18, 18, 18, 18, 18, 18, 0, 0, - 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 18, 18, 5, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 25, 25, 25, 25, 18, 25, + 25, 25, 25, 25, 25, 18, 25, 25, 18, 18, 25, 25, 55, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 18, 18, 25, 25, + 55, 55, 55, 55, 25, 25, 25, 55, 18, 18, 18, 55, 55, 18, 18, 18, 18, 18, + 18, 18, 55, 55, 55, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 25, 18, 18, 25, 25, 18, 18, 18, 18, 18, 18, 25, 55, 18, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 18, 18, 25, 5, 5, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 0, 139, 0, 0, 0, 0, 0, 139, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 25, 55, 138, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 5, 55, 55, 55, - 55, 55, 55, 102, 25, 25, 25, 25, 25, 25, 25, 25, 5, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 0, - 55, 0, 0, 55, 55, 0, 55, 0, 0, 55, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 0, - 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 0, 55, 0, 0, 55, 55, 0, - 55, 55, 55, 55, 25, 55, 138, 25, 25, 25, 25, 25, 25, 0, 25, 25, 55, 0, 0, - 55, 55, 55, 55, 55, 0, 102, 0, 25, 25, 25, 25, 25, 25, 0, 0, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 0, 0, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, - 25, 5, 5, 5, 5, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 5, 25, 5, 25, 5, 25, 5, 5, 5, 5, 18, 18, 55, - 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 5, 102, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 18, 25, 25, 25, 25, 25, 5, 25, 25, 55, 55, - 55, 55, 55, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 5, 5, 5, - 5, 5, 5, 5, 5, 25, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 18, 18, 25, 25, 25, 25, 18, 25, 25, 25, 25, 25, 25, 18, 25, 25, 18, 18, - 25, 25, 55, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 5, 5, 5, 5, 5, 55, - 55, 55, 55, 55, 55, 18, 18, 25, 25, 55, 55, 55, 55, 25, 25, 25, 55, 18, - 18, 18, 55, 55, 18, 18, 18, 18, 18, 18, 18, 55, 55, 55, 25, 25, 25, 25, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 18, 25, 25, - 18, 18, 18, 18, 18, 18, 25, 55, 18, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 18, 18, 18, 25, 5, 5, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 0, - 139, 0, 0, 0, 0, 0, 139, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 102, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, + 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, + 55, 55, 0, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, - 0, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, - 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, - 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 25, 25, 25, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 140, 141, 142, 143, 144, 145, 146, 147, 148, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, + 0, 0, 0, 0, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 231, 232, 233, 234, 0, 0, 235, 236, 237, 238, 239, 240, 0, 0, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 0, 0, 235, 236, - 237, 238, 239, 240, 0, 0, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2590,112 +2632,109 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 2, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 2, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 5, + 241, 241, 241, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 25, + 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 25, 5, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 0, 25, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 5, 5, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 25, 25, 18, 25, 25, 25, 25, 25, 25, 25, 18, 18, 18, 18, + 18, 18, 18, 18, 25, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 5, 5, 5, 102, 5, 5, 5, 5, 55, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 0, 0, 0, 0, 0, 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, + 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, 25, 25, 21, 0, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 102, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 5, 5, 5, 241, 241, 241, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 55, 55, 55, 55, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 25, 25, 25, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, - 55, 55, 55, 0, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 18, 25, 25, - 25, 25, 25, 25, 25, 18, 18, 18, 18, 18, 18, 18, 18, 25, 18, 18, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 102, 5, 5, 5, 5, 55, 25, 0, - 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 25, 25, 25, 21, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 102, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, + 55, 242, 242, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 25, 55, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 55, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 25, 25, - 25, 18, 18, 18, 18, 25, 25, 18, 18, 18, 0, 0, 0, 0, 18, 18, 25, 18, 18, - 18, 18, 18, 18, 25, 25, 25, 0, 0, 0, 0, 5, 0, 0, 0, 5, 5, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 25, 25, 25, 18, 18, 18, 18, 25, 25, 18, + 18, 18, 0, 0, 0, 0, 18, 18, 25, 18, 18, 18, 18, 18, 18, 25, 25, 25, 0, 0, + 0, 0, 5, 0, 0, 0, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 0, 0, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, - 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 140, 0, 0, 0, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 18, 18, 25, 0, 0, 5, 5, 55, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 140, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 25, 25, 18, 18, 25, 0, 0, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 25, - 18, 25, 25, 25, 25, 25, 25, 25, 0, 25, 18, 25, 18, 18, 25, 25, 25, 25, - 25, 25, 25, 25, 18, 18, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 0, 0, 25, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, - 5, 102, 5, 5, 5, 5, 5, 5, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 18, 25, 18, 25, 25, 25, 25, 25, 25, 25, 0, + 25, 18, 25, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 18, 18, 18, + 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 25, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 102, 5, 5, 5, 5, 5, 5, 0, 0, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, - 25, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 25, - 25, 25, 25, 25, 18, 25, 18, 18, 18, 18, 18, 25, 18, 18, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 18, 25, 25, 25, 25, 18, 18, 25, 25, 18, 25, - 25, 25, 55, 55, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 25, 18, 25, 25, 25, 25, 25, 18, 25, 18, 18, + 18, 18, 18, 25, 18, 18, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 25, 25, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, + 0, 0, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 25, + 25, 25, 25, 18, 18, 25, 25, 18, 25, 25, 25, 55, 55, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 25, 25, 18, 18, + 18, 25, 18, 25, 25, 25, 18, 18, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 25, 18, 25, 25, 18, 18, 18, 25, 18, 25, 25, 25, 18, 18, 0, 0, - 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, + 18, 18, 18, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 25, + 25, 0, 0, 0, 5, 5, 5, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, + 55, 55, 55, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 18, 18, 18, 18, 18, 25, 25, 25, - 25, 25, 25, 25, 25, 18, 18, 25, 25, 0, 0, 0, 5, 5, 5, 5, 5, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 0, 0, 0, 55, 55, 55, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 102, 102, 102, - 102, 102, 102, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 102, 102, 102, 102, 102, 102, 5, 5, 243, 244, + 245, 246, 247, 248, 249, 250, 251, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 5, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, 25, 25, 25, 25, 25, 25, 25, - 55, 55, 55, 55, 25, 55, 55, 55, 55, 18, 18, 25, 55, 55, 0, 25, 25, 0, 0, - 0, 0, 0, 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, + 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 5, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 18, 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, + 25, 55, 55, 55, 55, 18, 18, 25, 55, 55, 0, 25, 25, 0, 0, 0, 0, 0, 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 101, 242, 20, - 20, 20, 243, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 101, 101, 101, + 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 101, 252, 20, 20, 20, 253, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 101, 101, 101, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 30, 31, 30, + 25, 25, 25, 25, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, @@ -2704,49 +2743,49 @@ static unsigned short index2[] = { 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, - 31, 30, 31, 244, 245, 246, 247, 248, 249, 20, 20, 250, 20, 30, 31, 30, + 31, 254, 255, 256, 257, 258, 259, 20, 20, 260, 20, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, - 31, 30, 31, 251, 251, 251, 251, 251, 251, 251, 251, 252, 252, 252, 252, - 252, 252, 252, 252, 251, 251, 251, 251, 251, 251, 0, 0, 252, 252, 252, - 252, 252, 252, 0, 0, 251, 251, 251, 251, 251, 251, 251, 251, 252, 252, - 252, 252, 252, 252, 252, 252, 251, 251, 251, 251, 251, 251, 251, 251, - 252, 252, 252, 252, 252, 252, 252, 252, 251, 251, 251, 251, 251, 251, 0, - 0, 252, 252, 252, 252, 252, 252, 0, 0, 253, 251, 254, 251, 255, 251, 256, - 251, 0, 252, 0, 252, 0, 252, 0, 252, 251, 251, 251, 251, 251, 251, 251, - 251, 252, 252, 252, 252, 252, 252, 252, 252, 257, 257, 258, 258, 258, - 258, 259, 259, 260, 260, 261, 261, 262, 262, 0, 0, 263, 264, 265, 266, - 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, - 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, - 309, 310, 251, 251, 311, 312, 313, 0, 314, 315, 252, 252, 316, 316, 317, - 6, 318, 6, 6, 6, 319, 320, 321, 0, 322, 323, 324, 324, 324, 324, 325, 6, - 6, 6, 251, 251, 326, 327, 0, 0, 328, 329, 252, 252, 330, 330, 0, 6, 6, 6, - 251, 251, 331, 332, 333, 126, 334, 335, 252, 252, 336, 336, 130, 6, 6, 6, - 0, 0, 337, 338, 339, 0, 340, 341, 342, 342, 343, 343, 344, 6, 6, 0, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 21, 21, 21, 21, 21, 5, 5, 5, 5, 5, 5, 5, 5, 6, - 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 5, 6, 3, 3, 21, 21, 21, 21, 21, 2, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 18, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2, - 21, 21, 21, 21, 21, 0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 345, 101, - 0, 0, 346, 347, 348, 349, 350, 351, 5, 5, 5, 5, 5, 101, 345, 26, 22, 23, - 346, 347, 348, 349, 350, 351, 5, 5, 5, 5, 5, 0, 101, 101, 101, 101, 101, + 31, 261, 261, 261, 261, 261, 261, 261, 261, 262, 262, 262, 262, 262, 262, + 262, 262, 261, 261, 261, 261, 261, 261, 0, 0, 262, 262, 262, 262, 262, + 262, 0, 0, 261, 261, 261, 261, 261, 261, 261, 261, 262, 262, 262, 262, + 262, 262, 262, 262, 261, 261, 261, 261, 261, 261, 261, 261, 262, 262, + 262, 262, 262, 262, 262, 262, 261, 261, 261, 261, 261, 261, 0, 0, 262, + 262, 262, 262, 262, 262, 0, 0, 263, 261, 264, 261, 265, 261, 266, 261, 0, + 262, 0, 262, 0, 262, 0, 262, 261, 261, 261, 261, 261, 261, 261, 261, 262, + 262, 262, 262, 262, 262, 262, 262, 267, 267, 268, 268, 268, 268, 269, + 269, 270, 270, 271, 271, 272, 272, 0, 0, 273, 274, 275, 276, 277, 278, + 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, + 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, + 261, 261, 321, 322, 323, 0, 324, 325, 262, 262, 326, 326, 327, 6, 328, 6, + 6, 6, 329, 330, 331, 0, 332, 333, 334, 334, 334, 334, 335, 6, 6, 6, 261, + 261, 336, 337, 0, 0, 338, 339, 262, 262, 340, 340, 0, 6, 6, 6, 261, 261, + 341, 342, 343, 126, 344, 345, 262, 262, 346, 346, 130, 6, 6, 6, 0, 0, + 347, 348, 349, 0, 350, 351, 352, 352, 353, 353, 354, 6, 6, 0, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 21, 21, 21, 21, 21, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 5, 6, 3, 3, 21, 21, 21, 21, 21, 2, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2, 21, + 21, 21, 21, 21, 0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 355, 101, 0, + 0, 356, 357, 358, 359, 360, 361, 5, 5, 5, 5, 5, 101, 355, 26, 22, 23, + 356, 357, 358, 359, 360, 361, 5, 5, 5, 5, 5, 0, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 6, 6, 6, 6, 25, 6, 6, 6, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 120, 5, 5, 5, 5, 120, 5, 5, 20, 120, 120, 120, 20, 20, 120, 120, - 120, 20, 5, 120, 5, 5, 352, 120, 120, 120, 120, 120, 5, 5, 5, 5, 5, 5, - 120, 5, 353, 5, 120, 5, 354, 355, 120, 120, 352, 20, 120, 120, 356, 120, + 120, 20, 5, 120, 5, 5, 362, 120, 120, 120, 120, 120, 5, 5, 5, 5, 5, 5, + 120, 5, 363, 5, 120, 5, 364, 365, 120, 120, 362, 20, 120, 120, 366, 120, 20, 55, 55, 55, 55, 20, 5, 5, 20, 20, 120, 120, 5, 5, 5, 5, 5, 120, 20, - 20, 20, 20, 5, 5, 5, 5, 357, 5, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, - 358, 358, 358, 358, 358, 358, 359, 359, 359, 359, 359, 359, 359, 359, - 359, 359, 359, 359, 359, 359, 359, 359, 241, 241, 241, 30, 31, 241, 241, + 20, 20, 20, 5, 5, 5, 5, 367, 5, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 369, 369, 369, 369, 369, 369, 369, 369, + 369, 369, 369, 369, 369, 369, 369, 369, 241, 241, 241, 30, 31, 241, 241, 241, 241, 27, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -2762,28 +2801,28 @@ static unsigned short index2[] = { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 22, 23, 346, - 347, 348, 349, 350, 351, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 26, - 22, 23, 346, 347, 348, 349, 350, 351, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 26, 22, 23, 346, 347, 348, 349, 350, 351, 27, 27, 27, 27, 27, 27, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 22, 23, 356, + 357, 358, 359, 360, 361, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 26, + 22, 23, 356, 357, 358, 359, 360, 361, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 26, 22, 23, 356, 357, 358, 359, 360, 361, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, - 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, - 345, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 26, 22, 23, 346, 347, 348, - 349, 350, 351, 27, 345, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, + 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, + 355, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 26, 22, 23, 356, 357, 358, + 359, 360, 361, 27, 355, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 26, 22, 23, 346, 347, 348, 349, 350, 351, 27, 26, 22, - 23, 346, 347, 348, 349, 350, 351, 27, 26, 22, 23, 346, 347, 348, 349, - 350, 351, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 26, 22, 23, 356, 357, 358, 359, 360, 361, 27, 26, 22, + 23, 356, 357, 358, 359, 360, 361, 27, 26, 22, 23, 356, 357, 358, 359, + 360, 361, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -2805,18 +2844,18 @@ static unsigned short index2[] = { 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, 0, - 30, 31, 362, 363, 364, 365, 366, 30, 31, 30, 31, 30, 31, 367, 368, 369, - 370, 20, 30, 31, 20, 30, 31, 20, 20, 20, 20, 20, 101, 101, 371, 371, 30, + 30, 31, 372, 373, 374, 375, 376, 30, 31, 30, 31, 30, 31, 377, 378, 379, + 380, 20, 30, 31, 20, 30, 31, 20, 20, 20, 20, 20, 101, 101, 381, 381, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 20, 5, 5, 5, 5, 5, 5, 30, 31, 30, 31, - 25, 25, 25, 30, 31, 0, 0, 0, 0, 0, 5, 5, 5, 5, 27, 5, 5, 372, 372, 372, - 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, - 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, - 372, 372, 372, 372, 372, 372, 372, 0, 372, 0, 0, 0, 0, 0, 372, 0, 0, 55, + 25, 25, 25, 30, 31, 0, 0, 0, 0, 0, 5, 5, 5, 5, 27, 5, 5, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 0, 382, 0, 0, 0, 0, 0, 382, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2829,8 +2868,8 @@ static unsigned short index2[] = { 55, 55, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 373, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 383, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -2882,14 +2921,14 @@ static unsigned short index2[] = { 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 0, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, + 5, 5, 5, 5, 5, 5, 5, 5, 0, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2898,7 +2937,7 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2908,7 +2947,7 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2916,47 +2955,47 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 374, - 55, 55, 374, 55, 55, 55, 374, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 384, + 55, 55, 384, 55, 55, 55, 384, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, + 55, 55, 55, 55, 384, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 374, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, + 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 55, 374, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 384, 55, 384, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 374, 55, 374, 374, 374, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, + 55, 55, 384, 55, 384, 384, 384, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 374, 374, 374, 374, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 384, 384, 384, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2964,7 +3003,7 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2973,14 +3012,14 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -2988,8 +3027,8 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 374, 374, 374, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 384, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 384, 384, 384, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3002,11 +3041,11 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3014,10 +3053,10 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3025,7 +3064,7 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3033,40 +3072,40 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, - 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, + 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3106,26 +3145,26 @@ static unsigned short index2[] = { 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, - 31, 30, 31, 101, 20, 20, 20, 20, 20, 20, 20, 20, 30, 31, 30, 31, 375, 30, - 31, 30, 31, 30, 31, 30, 31, 30, 31, 102, 6, 6, 30, 31, 376, 20, 55, 30, + 31, 30, 31, 101, 20, 20, 20, 20, 20, 20, 20, 20, 30, 31, 30, 31, 385, 30, + 31, 30, 31, 30, 31, 30, 31, 30, 31, 102, 6, 6, 30, 31, 386, 20, 55, 30, 31, 30, 31, 20, 20, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, - 31, 30, 31, 30, 31, 30, 31, 377, 378, 379, 380, 0, 0, 381, 382, 383, 384, - 30, 31, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 31, 30, 31, 30, 31, 30, 31, 387, 388, 389, 390, 387, 0, 391, 392, 393, + 394, 30, 31, 30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 101, 101, - 20, 55, 55, 55, 55, 55, 55, 55, 25, 55, 55, 55, 25, 55, 55, 55, 55, 25, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, + 101, 101, 20, 55, 55, 55, 55, 55, 55, 55, 25, 55, 55, 55, 25, 55, 55, 55, + 55, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 18, 18, 25, 25, 18, 5, 5, 5, 5, 0, 0, 0, 0, + 27, 27, 27, 27, 27, 27, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 18, 18, 25, 25, 18, 5, 5, 5, 5, 0, 0, 0, 0, 27, 27, - 27, 27, 27, 27, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 18, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, - 18, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, - 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 25, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, - 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, + 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 25, 25, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, + 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 5, 5, 5, 55, 5, 55, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 25, @@ -3158,14 +3197,14 @@ static unsigned short index2[] = { 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 385, 20, 20, 20, 20, 20, 20, 20, 6, 101, 101, 101, 101, 20, 20, - 20, 20, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 386, 387, 388, 389, 390, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, - 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, - 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, - 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 461, 462, 463, 464, 465, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 20, 20, 395, 20, 20, 20, 20, 20, 20, 20, 6, 101, 101, 101, 101, 20, 20, + 20, 20, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 396, 397, 398, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, + 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, + 471, 472, 473, 474, 475, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 25, 18, 18, 25, 18, 18, 5, 18, 25, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, @@ -3186,15 +3225,15 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, - 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, + 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 374, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3208,9 +3247,9 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 466, 467, 468, 469, - 470, 471, 472, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 473, 474, 475, 476, - 477, 0, 0, 0, 0, 0, 55, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 476, 477, 478, 479, + 480, 481, 482, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 483, 484, 485, 486, + 487, 0, 0, 0, 0, 0, 55, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 0, 55, 0, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3227,7 +3266,7 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 478, 478, 478, 478, 478, 478, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 488, 488, 488, 488, 488, 488, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3242,13 +3281,13 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 478, 478, 5, 5, 0, 0, 25, 25, 25, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 488, 488, 5, 5, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 18, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 18, 18, 5, 5, 6, 0, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 0, 0, 0, 0, - 478, 55, 478, 55, 478, 0, 478, 55, 478, 55, 478, 55, 478, 55, 478, 55, + 488, 55, 488, 55, 488, 0, 488, 55, 488, 55, 488, 55, 488, 55, 488, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3264,7 +3303,7 @@ static unsigned short index2[] = { 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 102, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 479, 479, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 489, 489, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 55, 0, 0, 0, 5, 5, 5, 6, 5, 5, 5, 0, 5, @@ -3290,7 +3329,7 @@ static unsigned short index2[] = { 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 27, 27, 27, 27, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 27, 27, 5, 0, 0, 0, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 27, 27, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -3320,202 +3359,223 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 5, 241, 241, 241, 241, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 480, 480, - 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, - 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, - 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, 481, 481, 481, 481, - 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 481, 481, 481, 481, 481, 481, 481, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 0, 0, 0, 0, 491, 491, 491, 491, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, 0, + 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 55, 55, 55, 55, 55, 55, 0, 0, 55, 0, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, + 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 0, 0, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 0, 55, 55, 0, 0, 0, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 5, 27, 27, 27, 27, - 27, 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 27, 27, 27, 27, 27, 27, 27, 55, + 55, 55, 0, 55, 55, 0, 0, 0, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 5, 27, 27, 27, + 27, 27, 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 5, 5, 27, 27, 27, 27, 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, + 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 0, 0, 0, 0, 27, 27, - 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 27, 27, 27, 27, 27, 27, 0, 0, 0, 5, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 0, 0, 0, 0, 27, + 27, 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 27, 27, 27, 27, 27, 27, 0, 0, 0, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 27, 27, 55, 55, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 27, 27, 27, 27, 27, 27, + 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 27, 27, 55, 55, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 55, 25, 25, 25, 0, 25, 25, 0, 0, 0, 0, 0, 25, 25, 25, 25, - 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, - 0, 0, 25, 25, 25, 0, 0, 0, 0, 25, 26, 22, 23, 346, 27, 27, 27, 27, 0, 0, - 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 55, 55, + 27, 27, 27, 27, 27, 55, 25, 25, 25, 0, 25, 25, 0, 0, 0, 0, 0, 25, 25, 25, + 25, 55, 55, 55, 55, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 27, 27, 5, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 25, 25, 25, 0, 0, 0, 0, 25, 26, 22, 23, 356, 27, 27, 27, 27, + 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, - 55, 55, 55, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 0, 0, 0, - 0, 27, 27, 27, 27, 27, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 27, 27, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, + 55, 55, 55, 55, 55, 55, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, + 25, 0, 0, 0, 0, 27, 27, 27, 27, 27, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 27, 27, 27, 27, 27, 27, - 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 0, 0, 0, 27, 27, 27, 27, 27, 27, 27, 27, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, - 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 27, 27, 27, - 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 27, 27, 27, + 27, 27, 27, 27, 27, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 27, 27, 27, 27, 27, 27, 27, 27, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, + 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 108, 108, 108, 108, 108, 108, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 115, 0, 0, 0, 0, 0, 0, 0, 27, 27, - 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 0, 0, 0, 0, 0, 0, + 0, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 26, 22, 23, 346, 347, 348, 349, 350, 351, 27, 27, 27, 27, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 22, 23, 356, 357, 358, 359, 360, 361, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 0, 18, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 27, 27, 27, 0, 18, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 26, 22, 23, 346, 347, 348, 349, 350, - 351, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 18, + 55, 55, 55, 55, 55, 55, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 26, 22, 23, 356, 357, 358, + 359, 360, 361, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, + 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, + 25, 18, 18, 25, 25, 5, 5, 21, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 25, 18, 18, - 25, 25, 5, 5, 21, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 25, 25, 25, + 18, 25, 25, 25, 25, 25, 25, 25, 25, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 0, 0, 0, 0, 0, 0, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 5, 5, 55, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 25, 25, 25, 18, 25, 25, - 25, 25, 25, 25, 25, 25, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 5, 5, 5, - 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 5, 5, 55, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 25, 25, 18, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 55, 55, 55, + 55, 5, 5, 5, 5, 5, 25, 25, 25, 5, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 55, 5, 55, 5, 5, 5, 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 18, 18, 25, 18, 25, + 25, 5, 5, 5, 5, 5, 5, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 5, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, - 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 55, 55, 55, 55, 5, 5, 5, - 5, 5, 25, 25, 25, 5, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 55, 5, - 55, 5, 5, 5, 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 18, 18, 25, 18, 25, 25, 5, 5, 5, - 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 25, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, + 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 25, 25, 18, 18, + 0, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 0, 0, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, 55, 0, 0, + 25, 55, 18, 18, 25, 18, 18, 18, 18, 0, 0, 18, 18, 0, 0, 18, 18, 18, 0, 0, + 55, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 18, 18, 0, + 0, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 25, + 25, 25, 18, 25, 55, 55, 55, 55, 5, 5, 5, 5, 5, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 0, 5, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 18, 25, + 18, 18, 18, 18, 25, 25, 18, 25, 25, 55, 55, 5, 55, 0, 0, 0, 0, 0, 0, 0, + 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, - 55, 55, 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 5, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 25, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 25, 25, 18, 18, 0, 55, 55, - 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, - 55, 55, 55, 55, 55, 0, 55, 55, 0, 55, 55, 55, 55, 55, 0, 0, 25, 55, 18, - 18, 25, 18, 18, 18, 18, 0, 0, 18, 18, 0, 0, 18, 18, 18, 0, 0, 55, 0, 0, - 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 18, 18, 0, 0, 25, 25, - 25, 25, 25, 25, 25, 0, 0, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, - 25, 25, 25, 25, 25, 18, 25, 18, 18, 18, 18, 25, 25, 18, 25, 25, 55, 55, - 5, 55, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, + 25, 25, 0, 0, 18, 18, 18, 18, 25, 25, 18, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 55, 55, 55, 55, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 18, 18, 18, 25, 25, 25, 25, 0, 0, 18, 18, 18, 18, 25, 25, 18, 25, - 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 55, 55, 55, 55, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, 18, 18, 25, 18, 25, 25, + 5, 5, 5, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25, - 18, 18, 25, 18, 25, 25, 5, 5, 5, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 25, 18, 25, 18, 18, 25, 25, 25, 25, 25, 25, 18, 25, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 25, 18, 25, 18, 18, 25, 25, 25, 25, 25, - 25, 18, 25, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 25, 25, 25, 18, 18, 25, 25, 25, 25, 18, + 25, 25, 25, 25, 25, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, + 27, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 25, 25, 25, 18, - 18, 25, 25, 25, 25, 18, 25, 25, 25, 25, 25, 0, 0, 0, 0, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 27, 27, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17, 17, 17, 17, 17, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 18, 25, 25, 25, 25, 25, 25, 25, 0, 25, 25, 25, 25, 25, 25, 18, 25, 55, 5, + 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 0, 0, 0, 5, 5, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 0, 18, 25, 25, 25, 25, 25, 25, 25, 18, 25, 25, + 18, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 241, 241, 241, 241, 241, 241, 241, 241, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, @@ -3523,94 +3583,108 @@ static unsigned short index2[] = { 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, 0, 5, 5, 5, + 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 5, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 25, 25, 25, 25, 25, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 25, 25, 25, 25, 25, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 25, 25, 25, 25, 25, 25, - 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 102, 102, 102, 102, 5, 5, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 27, 27, 27, 27, - 27, 27, 27, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 102, 102, + 102, 102, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 0, 27, 27, 27, 27, 27, 27, 27, 0, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 18, 18, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 18, 18, 18, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, - 25, 25, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 102, 102, 102, 102, 102, 102, 102, 102, + 102, 102, 102, 102, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, - 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 5, 25, 25, 5, 21, - 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, + 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 5, 25, 25, 5, + 21, 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, - 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 18, 25, 25, 25, 5, 5, 5, 18, - 18, 18, 18, 18, 18, 21, 21, 21, 21, 21, 21, 21, 21, 25, 25, 25, 25, 25, - 25, 25, 25, 5, 5, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, 25, + 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 18, 18, 25, 25, 25, 5, 5, 5, + 18, 18, 18, 18, 18, 18, 21, 21, 21, 21, 21, 21, 21, 21, 25, 25, 25, 25, + 25, 25, 25, 25, 5, 5, 25, 25, 25, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3700,131 +3774,134 @@ static unsigned short index2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 0, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 25, 25, 25, 25, 25, + 25, 25, 0, 25, 25, 0, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 0, 0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 25, 25, 25, 25, 25, 25, - 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, 55, 0, 0, 55, 0, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 55, 0, 55, 0, - 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 55, 0, 55, 0, 55, 0, 55, 55, 55, 0, 55, - 55, 0, 55, 0, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 55, 0, 55, 0, 0, - 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 55, - 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, + 27, 27, 27, 27, 27, 27, 27, 27, 27, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 492, 492, 492, 492, 492, 492, + 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, + 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, 492, + 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, + 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, + 493, 493, 493, 493, 493, 493, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 0, + 55, 0, 0, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 55, 55, 55, + 55, 0, 55, 0, 55, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 55, 0, 55, 0, 55, 0, + 55, 55, 55, 0, 55, 55, 0, 55, 0, 0, 55, 0, 55, 0, 55, 0, 55, 0, 55, 0, + 55, 55, 0, 55, 0, 0, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 0, + 55, 55, 55, 55, 0, 55, 55, 55, 55, 0, 55, 0, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 0, 0, 0, 0, 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, - 0, 55, 55, 55, 0, 55, 55, 55, 55, 55, 0, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, + 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 345, 345, 26, 22, 23, 346, 347, 348, 349, 350, 351, 27, 27, 0, 0, 0, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 355, 355, 26, 22, 23, 356, 357, 358, 359, 360, + 361, 27, 27, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 494, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 5, 5, 5, 5, 5, 5, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 494, 5, 5, 0, 0, 0, 0, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, + 494, 494, 494, 494, 494, 494, 494, 494, 494, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 0, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 5, 5, 5, 5, 5, 5, 482, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 482, 5, 5, 0, 0, 0, 0, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, - 482, 482, 482, 482, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 5, 5, 5, + 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 374, 55, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, + 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3835,32 +3912,32 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 374, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -3871,47 +3948,47 @@ static unsigned short index2[] = { 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 374, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 384, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, + 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 0, 0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 25, 25, 25, 25, 25, 25, 25, + 21, 21, 21, 21, 21, 21, 21, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, @@ -3924,13 +4001,13 @@ static unsigned short index2[] = { 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, }; /* Returns the numeric value as double for Unicode characters @@ -3996,11 +4073,13 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x11136: case 0x111D0: case 0x112F0: + case 0x11450: case 0x114D0: case 0x11650: case 0x116C0: case 0x11730: case 0x118E0: + case 0x11C50: case 0x16A60: case 0x16B50: case 0x1D7CE: @@ -4008,6 +4087,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7E2: case 0x1D7EC: case 0x1D7F6: + case 0x1E950: case 0x1F100: case 0x1F101: case 0x1F10B: @@ -4108,11 +4188,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D1: case 0x111E1: case 0x112F1: + case 0x11451: case 0x114D1: case 0x11651: case 0x116C1: case 0x11731: case 0x118E1: + case 0x11C51: + case 0x11C5A: case 0x12415: case 0x1241E: case 0x1242C: @@ -4128,17 +4211,22 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7ED: case 0x1D7F7: case 0x1E8C7: + case 0x1E951: case 0x1F102: case 0x2092A: return (double) 1.0; + case 0x0D5C: case 0x2152: return (double) 1.0/10.0; case 0x109F6: return (double) 1.0/12.0; case 0x09F4: case 0x0B75: + case 0x0D76: case 0xA833: return (double) 1.0/16.0; + case 0x0D58: + return (double) 1.0/160.0; case 0x00BD: case 0x0B73: case 0x0D74: @@ -4152,6 +4240,8 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x10E7B: case 0x12464: return (double) 1.0/2.0; + case 0x0D5B: + return (double) 1.0/20.0; case 0x2153: case 0x10E7D: case 0x1245A: @@ -4170,6 +4260,9 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x12462: case 0x12463: return (double) 1.0/4.0; + case 0x0D59: + return (double) 1.0/40.0; + case 0x0D5E: case 0x2155: return (double) 1.0/5.0; case 0x2159: @@ -4179,6 +4272,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) return (double) 1.0/7.0; case 0x09F5: case 0x0B76: + case 0x0D77: case 0x215B: case 0xA834: case 0x1245F: @@ -4236,6 +4330,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111EA: case 0x1173A: case 0x118EA: + case 0x11C63: case 0x16B5B: case 0x1D369: return (double) 10.0; @@ -4269,6 +4364,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x10E72: case 0x11064: case 0x111F3: + case 0x11C6C: case 0x16B5C: return (double) 100.0; case 0x0BF2: @@ -4470,11 +4566,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D2: case 0x111E2: case 0x112F2: + case 0x11452: case 0x114D2: case 0x11652: case 0x116C2: case 0x11732: case 0x118E2: + case 0x11C52: + case 0x11C5B: case 0x12400: case 0x12416: case 0x1241F: @@ -4494,6 +4593,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7EE: case 0x1D7F8: case 0x1E8C8: + case 0x1E952: case 0x1F103: case 0x22390: return (double) 2.0; @@ -4537,6 +4637,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111EB: case 0x1173B: case 0x118EB: + case 0x11C64: case 0x1D36A: return (double) 20.0; case 0x1011A: @@ -4657,11 +4758,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D3: case 0x111E3: case 0x112F3: + case 0x11453: case 0x114D3: case 0x11653: case 0x116C3: case 0x11733: case 0x118E3: + case 0x11C53: + case 0x11C5C: case 0x12401: case 0x12408: case 0x12417: @@ -4686,6 +4790,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7EF: case 0x1D7F9: case 0x1E8C9: + case 0x1E953: case 0x1F104: case 0x20AFD: case 0x20B19: @@ -4696,10 +4801,13 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) return (double) 3.0/12.0; case 0x09F6: case 0x0B77: + case 0x0D78: case 0xA835: return (double) 3.0/16.0; case 0x0F2B: return (double) 3.0/2.0; + case 0x0D5D: + return (double) 3.0/20.0; case 0x00BE: case 0x09F8: case 0x0B74: @@ -4711,6 +4819,8 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) return (double) 3.0/5.0; case 0x215C: return (double) 3.0/8.0; + case 0x0D5A: + return (double) 3.0/80.0; case 0x1374: case 0x303A: case 0x324A: @@ -4724,6 +4834,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1105D: case 0x111EC: case 0x118EC: + case 0x11C65: case 0x1D36B: case 0x20983: return (double) 30.0; @@ -4836,11 +4947,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D4: case 0x111E4: case 0x112F4: + case 0x11454: case 0x114D4: case 0x11654: case 0x116C4: case 0x11734: case 0x118E4: + case 0x11C54: + case 0x11C5D: case 0x12402: case 0x12409: case 0x1240F: @@ -4866,6 +4980,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F0: case 0x1D7FA: case 0x1E8CA: + case 0x1E954: case 0x1F105: case 0x20064: case 0x200E2: @@ -4886,6 +5001,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1105E: case 0x111ED: case 0x118ED: + case 0x11C66: case 0x12467: case 0x1D36C: case 0x2098C: @@ -5005,11 +5121,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D5: case 0x111E5: case 0x112F5: + case 0x11455: case 0x114D5: case 0x11655: case 0x116C5: case 0x11735: case 0x118E5: + case 0x11C55: + case 0x11C5E: case 0x12403: case 0x1240A: case 0x12410: @@ -5031,6 +5150,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F1: case 0x1D7FB: case 0x1E8CB: + case 0x1E955: case 0x1F106: case 0x20121: return (double) 5.0; @@ -5067,6 +5187,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1105F: case 0x111EE: case 0x118EE: + case 0x11C67: case 0x12468: case 0x1D36D: return (double) 50.0; @@ -5172,11 +5293,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D6: case 0x111E6: case 0x112F6: + case 0x11456: case 0x114D6: case 0x11656: case 0x116C6: case 0x11736: case 0x118E6: + case 0x11C56: + case 0x11C5F: case 0x12404: case 0x1240B: case 0x12411: @@ -5194,6 +5318,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F2: case 0x1D7FC: case 0x1E8CC: + case 0x1E956: case 0x1F107: case 0x20AEA: return (double) 6.0; @@ -5208,6 +5333,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x11060: case 0x111EF: case 0x118EF: + case 0x11C68: case 0x1D36E: return (double) 60.0; case 0x1011E: @@ -5293,11 +5419,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D7: case 0x111E7: case 0x112F7: + case 0x11457: case 0x114D7: case 0x11657: case 0x116C7: case 0x11737: case 0x118E7: + case 0x11C57: + case 0x11C60: case 0x12405: case 0x1240C: case 0x12412: @@ -5316,6 +5445,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F3: case 0x1D7FD: case 0x1E8CD: + case 0x1E957: case 0x1F108: case 0x20001: return (double) 7.0; @@ -5334,6 +5464,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x11061: case 0x111F0: case 0x118F0: + case 0x11C69: case 0x1D36F: return (double) 70.0; case 0x1011F: @@ -5417,11 +5548,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D8: case 0x111E8: case 0x112F8: + case 0x11458: case 0x114D8: case 0x11658: case 0x116C8: case 0x11738: case 0x118E8: + case 0x11C58: + case 0x11C61: case 0x12406: case 0x1240D: case 0x12413: @@ -5439,6 +5573,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F4: case 0x1D7FE: case 0x1E8CE: + case 0x1E958: case 0x1F109: return (double) 8.0; case 0x109FD: @@ -5451,6 +5586,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x11062: case 0x111F1: case 0x118F1: + case 0x11C6A: case 0x1D370: return (double) 80.0; case 0x10120: @@ -5535,11 +5671,14 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x111D9: case 0x111E9: case 0x112F9: + case 0x11459: case 0x114D9: case 0x11659: case 0x116C9: case 0x11739: case 0x118E9: + case 0x11C59: + case 0x11C62: case 0x12407: case 0x1240E: case 0x12414: @@ -5559,6 +5698,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x1D7F5: case 0x1D7FF: case 0x1E8CF: + case 0x1E959: case 0x1F10A: case 0x2F890: return (double) 9.0; @@ -5574,6 +5714,7 @@ double _PyUnicode_ToNumeric(Py_UCS4 ch) case 0x11063: case 0x111F2: case 0x118F2: + case 0x11C6B: case 0x1D371: return (double) 90.0; case 0x10121: diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 892798a..ab6b235 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -24,8 +24,6 @@ init_weakref(PyWeakReference *self, PyObject *ob, PyObject *callback) { self->hash = -1; self->wr_object = ob; - self->wr_prev = NULL; - self->wr_next = NULL; Py_XINCREF(callback); self->wr_callback = callback; } @@ -267,7 +265,7 @@ insert_head(PyWeakReference *newref, PyWeakReference **list) } static int -parse_weakref_init_args(char *funcname, PyObject *args, PyObject *kwargs, +parse_weakref_init_args(const char *funcname, PyObject *args, PyObject *kwargs, PyObject **obp, PyObject **callbackp) { return PyArg_UnpackTuple(args, funcname, 1, 2, obp, callbackp); @@ -455,7 +453,7 @@ proxy_checkref(PyWeakReference *proxy) method(PyObject *proxy) { \ _Py_IDENTIFIER(special); \ UNWRAP(proxy); \ - return _PyObject_CallMethodId(proxy, &PyId_##special, ""); \ + return _PyObject_CallMethodId(proxy, &PyId_##special, NULL); \ } diff --git a/PC/_msi.c b/PC/_msi.c index 967b7fa..789b04f 100644 --- a/PC/_msi.c +++ b/PC/_msi.c @@ -600,12 +600,8 @@ summary_setproperty(msiobj* si, PyObject *args) return NULL; if (PyUnicode_Check(data)) { - const WCHAR *value = _PyUnicode_AsUnicode(data); - if (value == NULL) { - return NULL; - } status = MsiSummaryInfoSetPropertyW(si->h, field, VT_LPSTR, - 0, NULL, value); + 0, NULL, PyUnicode_AsUnicode(data)); } else if (PyLong_CheckExact(data)) { long value = PyLong_AsLong(data); if (value == -1 && PyErr_Occurred()) { @@ -1050,12 +1046,12 @@ PyInit__msi(void) if (m == NULL) return NULL; - PyModule_AddIntConstant(m, "MSIDBOPEN_CREATEDIRECT", (int)MSIDBOPEN_CREATEDIRECT); - PyModule_AddIntConstant(m, "MSIDBOPEN_CREATE", (int)MSIDBOPEN_CREATE); - PyModule_AddIntConstant(m, "MSIDBOPEN_DIRECT", (int)MSIDBOPEN_DIRECT); - PyModule_AddIntConstant(m, "MSIDBOPEN_READONLY", (int)MSIDBOPEN_READONLY); - PyModule_AddIntConstant(m, "MSIDBOPEN_TRANSACT", (int)MSIDBOPEN_TRANSACT); - PyModule_AddIntConstant(m, "MSIDBOPEN_PATCHFILE", (int)MSIDBOPEN_PATCHFILE); + PyModule_AddIntConstant(m, "MSIDBOPEN_CREATEDIRECT", (long)MSIDBOPEN_CREATEDIRECT); + PyModule_AddIntConstant(m, "MSIDBOPEN_CREATE", (long)MSIDBOPEN_CREATE); + PyModule_AddIntConstant(m, "MSIDBOPEN_DIRECT", (long)MSIDBOPEN_DIRECT); + PyModule_AddIntConstant(m, "MSIDBOPEN_READONLY", (long)MSIDBOPEN_READONLY); + PyModule_AddIntConstant(m, "MSIDBOPEN_TRANSACT", (long)MSIDBOPEN_TRANSACT); + PyModule_AddIntConstant(m, "MSIDBOPEN_PATCHFILE", (long)MSIDBOPEN_PATCHFILE); PyModule_AddIntMacro(m, MSICOLINFO_NAMES); PyModule_AddIntMacro(m, MSICOLINFO_TYPES); diff --git a/PC/_testconsole.c b/PC/_testconsole.c new file mode 100644 index 0000000..1c93679 --- /dev/null +++ b/PC/_testconsole.c @@ -0,0 +1,131 @@ + +/* Testing module for multi-phase initialization of extension modules (PEP 489) + */ + +#include "Python.h" + +#ifdef MS_WINDOWS + +#include "..\modules\_io\_iomodule.h" + +#define WIN32_LEAN_AND_MEAN +#include +#include + + /* The full definition is in iomodule. We reproduce + enough here to get the handle, which is all we want. */ +typedef struct { + PyObject_HEAD + HANDLE handle; +} winconsoleio; + + +static int execfunc(PyObject *m) +{ + return 0; +} + +PyModuleDef_Slot testconsole_slots[] = { + {Py_mod_exec, execfunc}, + {0, NULL}, +}; + +/*[clinic input] +module _testconsole + +_testconsole.write_input + file: object + s: PyBytesObject + +Writes UTF-16-LE encoded bytes to the console as if typed by a user. +[clinic start generated code]*/ + +static PyObject * +_testconsole_write_input_impl(PyObject *module, PyObject *file, + PyBytesObject *s) +/*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/ +{ + INPUT_RECORD *rec = NULL; + + if (!PyWindowsConsoleIO_Check(file)) { + PyErr_SetString(PyExc_TypeError, "expected raw console object"); + return NULL; + } + + const wchar_t *p = (const wchar_t *)PyBytes_AS_STRING(s); + DWORD size = (DWORD)PyBytes_GET_SIZE(s) / sizeof(wchar_t); + + rec = (INPUT_RECORD*)PyMem_Malloc(sizeof(INPUT_RECORD) * size); + if (!rec) + goto error; + memset(rec, 0, sizeof(INPUT_RECORD) * size); + + INPUT_RECORD *prec = rec; + for (DWORD i = 0; i < size; ++i, ++p, ++prec) { + prec->EventType = KEY_EVENT; + prec->Event.KeyEvent.bKeyDown = TRUE; + prec->Event.KeyEvent.wRepeatCount = 10; + prec->Event.KeyEvent.uChar.UnicodeChar = *p; + } + + HANDLE hInput = ((winconsoleio*)file)->handle; + DWORD total = 0; + while (total < size) { + DWORD wrote; + if (!WriteConsoleInputW(hInput, &rec[total], (size - total), &wrote)) { + PyErr_SetFromWindowsErr(0); + goto error; + } + total += wrote; + } + + PyMem_Free((void*)rec); + + Py_RETURN_NONE; +error: + if (rec) + PyMem_Free((void*)rec); + return NULL; +} + +/*[clinic input] +_testconsole.read_output + file: object + +Reads a str from the console as written to stdout. +[clinic start generated code]*/ + +static PyObject * +_testconsole_read_output_impl(PyObject *module, PyObject *file) +/*[clinic end generated code: output=876310d81a73e6d2 input=b3521f64b1b558e3]*/ +{ + Py_RETURN_NONE; +} + +#include "clinic\_testconsole.c.h" + +PyMethodDef testconsole_methods[] = { + _TESTCONSOLE_WRITE_INPUT_METHODDEF + _TESTCONSOLE_READ_OUTPUT_METHODDEF + {NULL, NULL} +}; + +static PyModuleDef testconsole_def = { + PyModuleDef_HEAD_INIT, /* m_base */ + "_testconsole", /* m_name */ + PyDoc_STR("Test module for the Windows console"), /* m_doc */ + 0, /* m_size */ + testconsole_methods, /* m_methods */ + testconsole_slots, /* m_slots */ + NULL, /* m_traverse */ + NULL, /* m_clear */ + NULL, /* m_free */ +}; + +PyMODINIT_FUNC +PyInit__testconsole(PyObject *spec) +{ + return PyModuleDef_Init(&testconsole_def); +} + +#endif /* MS_WINDOWS */ diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj b/PC/bdist_wininst/bdist_wininst.vcxproj index 16213fb..4dc5009 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj +++ b/PC/bdist_wininst/bdist_wininst.vcxproj @@ -1,108 +1,104 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C} - wininst - false - - - - - Application - false - NotSet - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PySourcePath)lib\distutils\command\ - false - wininst-$(VisualStudioVersion) - wininst-14.0 - wininst-12.0 - wininst-11.0 - wininst-10.0 - $(TargetName)-amd64 - .exe - - - - $(OutDir)wininst.tlb - - - MinSpace - $(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDebug - MultiThreaded - - - $(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories) - - - comctl32.lib;imagehlp.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C} + wininst + false + + + + + Application + false + NotSet + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PySourcePath)lib\distutils\command\ + false + wininst-$(VisualStudioVersion) + $(TargetName)-amd64 + .exe + + + + $(OutDir)wininst.tlb + + + MinSpace + $(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + MultiThreaded + + + $(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories) + + + comctl32.lib;imagehlp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj.filters b/PC/bdist_wininst/bdist_wininst.vcxproj.filters index a47ac86..b4b6a4d 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj.filters +++ b/PC/bdist_wininst/bdist_wininst.vcxproj.filters @@ -1,61 +1,61 @@ - - - - - {293b1092-03ad-4b7c-acb9-c4ab62e52f55} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {0edc0406-282f-4dbc-b60e-a867c34a2a31} - - - {ea0c0f0e-3b73-474e-a999-e9689d032ccc} - h;hpp;hxx;hm;inl - - - {0c77c1cf-3f87-4f87-bd86-b425211c2181} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - Source Files\zlib - - - - - Header Files - - - - - Resource Files - - - - - Resource Files - - + + + + + {293b1092-03ad-4b7c-acb9-c4ab62e52f55} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {0edc0406-282f-4dbc-b60e-a867c34a2a31} + + + {ea0c0f0e-3b73-474e-a999-e9689d032ccc} + h;hpp;hxx;hm;inl + + + {0c77c1cf-3f87-4f87-bd86-b425211c2181} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + Source Files\zlib + + + + + Header Files + + + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/PC/bdist_wininst/build.bat b/PC/bdist_wininst/build.bat index 744267f..25f565c 100644 --- a/PC/bdist_wininst/build.bat +++ b/PC/bdist_wininst/build.bat @@ -7,13 +7,16 @@ set PCBUILD=%~dp0..\..\PCBuild\ echo Building Lib\distutils\command\wininst-xx.0.exe -call "%PCBUILD%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) +call "%PCBUILD%env.bat" x86 +if errorlevel 1 goto :eof -%MSBUILD% "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32 +msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32 if errorlevel 1 goto :eof echo Building Lib\distutils\command\wininst-xx.0-amd64.exe -%MSBUILD% "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64 +call "%PCBUILD%env.bat" x86_amd64 +if errorlevel 1 goto :eof + +msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64 diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index adbb733..fd977f5 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -154,7 +154,7 @@ HANDLE hBitmap; char *bitmap_bytes; static const char *REGISTRY_SUFFIX_6432 = -#ifdef _WIN64 +#ifdef MS_WIN64 ""; #else "-32"; @@ -718,7 +718,7 @@ static int prepare_script_environment(HINSTANCE hPython) * 1 if the Python-dll does not export the functions we need * 2 if no install-script is specified in pathname * 3 if the install-script file could not be opened - * the return value of PyRun_SimpleString() otherwise, + * the return value of PyRun_SimpleString() or Py_FinalizeEx() otherwise, * which is 0 if everything is ok, -1 if an exception had occurred * in the install-script. */ @@ -731,7 +731,7 @@ do_run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv) DECLPROC(hPython, void, Py_Initialize, (void)); DECLPROC(hPython, int, PySys_SetArgv, (int, wchar_t **)); DECLPROC(hPython, int, PyRun_SimpleString, (char *)); - DECLPROC(hPython, void, Py_Finalize, (void)); + DECLPROC(hPython, int, Py_FinalizeEx, (void)); DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...)); DECLPROC(hPython, PyObject *, PyCFunction_New, (PyMethodDef *, PyObject *)); @@ -739,7 +739,7 @@ do_run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv) DECLPROC(hPython, PyObject *, PyErr_Format, (PyObject *, char *)); if (!Py_Initialize || !PySys_SetArgv - || !PyRun_SimpleString || !Py_Finalize) + || !PyRun_SimpleString || !Py_FinalizeEx) return 1; if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format) @@ -786,7 +786,9 @@ do_run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv) } } } - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + result = -1; + } close(fh); return result; @@ -848,11 +850,11 @@ static int do_run_simple_script(HINSTANCE hPython, char *script) int rc; DECLPROC(hPython, void, Py_Initialize, (void)); DECLPROC(hPython, void, Py_SetProgramName, (wchar_t *)); - DECLPROC(hPython, void, Py_Finalize, (void)); + DECLPROC(hPython, int, Py_FinalizeEx, (void)); DECLPROC(hPython, int, PyRun_SimpleString, (char *)); DECLPROC(hPython, void, PyErr_Print, (void)); - if (!Py_Initialize || !Py_SetProgramName || !Py_Finalize || + if (!Py_Initialize || !Py_SetProgramName || !Py_FinalizeEx || !PyRun_SimpleString || !PyErr_Print) return -1; @@ -862,7 +864,9 @@ static int do_run_simple_script(HINSTANCE hPython, char *script) rc = PyRun_SimpleString(script); if (rc) PyErr_Print(); - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + rc = -1; + } return rc; } diff --git a/PC/clinic/_testconsole.c.h b/PC/clinic/_testconsole.c.h new file mode 100644 index 0000000..93860cf --- /dev/null +++ b/PC/clinic/_testconsole.c.h @@ -0,0 +1,82 @@ +/*[clinic input] +preserve +[clinic start generated code]*/ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_testconsole_write_input__doc__, +"write_input($module, /, file, s)\n" +"--\n" +"\n" +"Writes UTF-16-LE encoded bytes to the console as if typed by a user."); + +#define _TESTCONSOLE_WRITE_INPUT_METHODDEF \ + {"write_input", (PyCFunction)_testconsole_write_input, METH_FASTCALL, _testconsole_write_input__doc__}, + +static PyObject * +_testconsole_write_input_impl(PyObject *module, PyObject *file, + PyBytesObject *s); + +static PyObject * +_testconsole_write_input(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"file", "s", NULL}; + static _PyArg_Parser _parser = {"OS:write_input", _keywords, 0}; + PyObject *file; + PyBytesObject *s; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &file, &s)) { + goto exit; + } + return_value = _testconsole_write_input_impl(module, file, s); + +exit: + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#if defined(MS_WINDOWS) + +PyDoc_STRVAR(_testconsole_read_output__doc__, +"read_output($module, /, file)\n" +"--\n" +"\n" +"Reads a str from the console as written to stdout."); + +#define _TESTCONSOLE_READ_OUTPUT_METHODDEF \ + {"read_output", (PyCFunction)_testconsole_read_output, METH_FASTCALL, _testconsole_read_output__doc__}, + +static PyObject * +_testconsole_read_output_impl(PyObject *module, PyObject *file); + +static PyObject * +_testconsole_read_output(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"file", NULL}; + static _PyArg_Parser _parser = {"O:read_output", _keywords, 0}; + PyObject *file; + + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &file)) { + goto exit; + } + return_value = _testconsole_read_output_impl(module, file); + +exit: + return return_value; +} + +#endif /* defined(MS_WINDOWS) */ + +#ifndef _TESTCONSOLE_WRITE_INPUT_METHODDEF + #define _TESTCONSOLE_WRITE_INPUT_METHODDEF +#endif /* !defined(_TESTCONSOLE_WRITE_INPUT_METHODDEF) */ + +#ifndef _TESTCONSOLE_READ_OUTPUT_METHODDEF + #define _TESTCONSOLE_READ_OUTPUT_METHODDEF +#endif /* !defined(_TESTCONSOLE_READ_OUTPUT_METHODDEF) */ +/*[clinic end generated code: output=3a8dc0c421807c41 input=a9049054013a1b77]*/ diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h index e7a72c4..6935cad 100644 --- a/PC/clinic/msvcrtmodule.c.h +++ b/PC/clinic/msvcrtmodule.c.h @@ -51,8 +51,9 @@ msvcrt_locking(PyObject *module, PyObject *args) long nbytes; if (!PyArg_ParseTuple(args, "iil:locking", - &fd, &mode, &nbytes)) + &fd, &mode, &nbytes)) { goto exit; + } return_value = msvcrt_locking_impl(module, fd, mode, nbytes); exit: @@ -85,11 +86,13 @@ msvcrt_setmode(PyObject *module, PyObject *args) long _return_value; if (!PyArg_ParseTuple(args, "ii:setmode", - &fd, &flags)) + &fd, &flags)) { goto exit; + } _return_value = msvcrt_setmode_impl(module, fd, flags); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -110,22 +113,24 @@ PyDoc_STRVAR(msvcrt_open_osfhandle__doc__, {"open_osfhandle", (PyCFunction)msvcrt_open_osfhandle, METH_VARARGS, msvcrt_open_osfhandle__doc__}, static long -msvcrt_open_osfhandle_impl(PyObject *module, Py_intptr_t handle, int flags); +msvcrt_open_osfhandle_impl(PyObject *module, intptr_t handle, int flags); static PyObject * msvcrt_open_osfhandle(PyObject *module, PyObject *args) { PyObject *return_value = NULL; - Py_intptr_t handle; + intptr_t handle; int flags; long _return_value; if (!PyArg_ParseTuple(args, ""_Py_PARSE_INTPTR"i:open_osfhandle", - &handle, &flags)) + &handle, &flags)) { goto exit; + } _return_value = msvcrt_open_osfhandle_impl(module, handle, flags); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -143,7 +148,7 @@ PyDoc_STRVAR(msvcrt_get_osfhandle__doc__, #define MSVCRT_GET_OSFHANDLE_METHODDEF \ {"get_osfhandle", (PyCFunction)msvcrt_get_osfhandle, METH_O, msvcrt_get_osfhandle__doc__}, -static Py_intptr_t +static intptr_t msvcrt_get_osfhandle_impl(PyObject *module, int fd); static PyObject * @@ -151,13 +156,15 @@ msvcrt_get_osfhandle(PyObject *module, PyObject *arg) { PyObject *return_value = NULL; int fd; - Py_intptr_t _return_value; + intptr_t _return_value; - if (!PyArg_Parse(arg, "i:get_osfhandle", &fd)) + if (!PyArg_Parse(arg, "i:get_osfhandle", &fd)) { goto exit; + } _return_value = msvcrt_get_osfhandle_impl(module, fd); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromVoidPtr((void *)_return_value); exit: @@ -183,8 +190,9 @@ msvcrt_kbhit(PyObject *module, PyObject *Py_UNUSED(ignored)) long _return_value; _return_value = msvcrt_kbhit_impl(module); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -311,8 +319,9 @@ msvcrt_putch(PyObject *module, PyObject *arg) PyObject *return_value = NULL; char char_value; - if (!PyArg_Parse(arg, "c:putch", &char_value)) + if (!PyArg_Parse(arg, "c:putch", &char_value)) { goto exit; + } return_value = msvcrt_putch_impl(module, char_value); exit: @@ -337,8 +346,9 @@ msvcrt_putwch(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int unicode_char; - if (!PyArg_Parse(arg, "C:putwch", &unicode_char)) + if (!PyArg_Parse(arg, "C:putwch", &unicode_char)) { goto exit; + } return_value = msvcrt_putwch_impl(module, unicode_char); exit: @@ -367,8 +377,9 @@ msvcrt_ungetch(PyObject *module, PyObject *arg) PyObject *return_value = NULL; char char_value; - if (!PyArg_Parse(arg, "c:ungetch", &char_value)) + if (!PyArg_Parse(arg, "c:ungetch", &char_value)) { goto exit; + } return_value = msvcrt_ungetch_impl(module, char_value); exit: @@ -393,8 +404,9 @@ msvcrt_ungetwch(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int unicode_char; - if (!PyArg_Parse(arg, "C:ungetwch", &unicode_char)) + if (!PyArg_Parse(arg, "C:ungetwch", &unicode_char)) { goto exit; + } return_value = msvcrt_ungetwch_impl(module, unicode_char); exit: @@ -426,11 +438,13 @@ msvcrt_CrtSetReportFile(PyObject *module, PyObject *args) long _return_value; if (!PyArg_ParseTuple(args, "ii:CrtSetReportFile", - &type, &file)) + &type, &file)) { goto exit; + } _return_value = msvcrt_CrtSetReportFile_impl(module, type, file); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -464,11 +478,13 @@ msvcrt_CrtSetReportMode(PyObject *module, PyObject *args) long _return_value; if (!PyArg_ParseTuple(args, "ii:CrtSetReportMode", - &type, &mode)) + &type, &mode)) { goto exit; + } _return_value = msvcrt_CrtSetReportMode_impl(module, type, mode); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -500,11 +516,13 @@ msvcrt_set_error_mode(PyObject *module, PyObject *arg) int mode; long _return_value; - if (!PyArg_Parse(arg, "i:set_error_mode", &mode)) + if (!PyArg_Parse(arg, "i:set_error_mode", &mode)) { goto exit; + } _return_value = msvcrt_set_error_mode_impl(module, mode); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong(_return_value); exit: @@ -531,8 +549,9 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg) PyObject *return_value = NULL; unsigned int mode; - if (!PyArg_Parse(arg, "I:SetErrorMode", &mode)) + if (!PyArg_Parse(arg, "I:SetErrorMode", &mode)) { goto exit; + } return_value = msvcrt_SetErrorMode_impl(module, mode); exit: @@ -550,4 +569,4 @@ exit: #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF #define MSVCRT_SET_ERROR_MODE_METHODDEF #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */ -/*[clinic end generated code: output=2a794c520d6ae887 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ae04e2b50eef8b63 input=a9049054013a1b77]*/ diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h index f6ae2c0..c7d5b9e 100644 --- a/PC/clinic/winreg.c.h +++ b/PC/clinic/winreg.c.h @@ -77,24 +77,26 @@ PyDoc_STRVAR(winreg_HKEYType___exit____doc__, "\n"); #define WINREG_HKEYTYPE___EXIT___METHODDEF \ - {"__exit__", (PyCFunction)winreg_HKEYType___exit__, METH_VARARGS|METH_KEYWORDS, winreg_HKEYType___exit____doc__}, + {"__exit__", (PyCFunction)winreg_HKEYType___exit__, METH_FASTCALL, winreg_HKEYType___exit____doc__}, static PyObject * winreg_HKEYType___exit___impl(PyHKEYObject *self, PyObject *exc_type, PyObject *exc_value, PyObject *traceback); static PyObject * -winreg_HKEYType___exit__(PyHKEYObject *self, PyObject *args, PyObject *kwargs) +winreg_HKEYType___exit__(PyHKEYObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"exc_type", "exc_value", "traceback", NULL}; + static const char * const _keywords[] = {"exc_type", "exc_value", "traceback", NULL}; + static _PyArg_Parser _parser = {"OOO:__exit__", _keywords, 0}; PyObject *exc_type; PyObject *exc_value; PyObject *traceback; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OOO:__exit__", _keywords, - &exc_type, &exc_value, &traceback)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &exc_type, &exc_value, &traceback)) { goto exit; + } return_value = winreg_HKEYType___exit___impl(self, exc_type, exc_value, traceback); exit: @@ -147,11 +149,13 @@ winreg_ConnectRegistry(PyObject *module, PyObject *args) HKEY _return_value; if (!PyArg_ParseTuple(args, "ZO&:ConnectRegistry", - &computer_name, clinic_HKEY_converter, &key)) + &computer_name, clinic_HKEY_converter, &key)) { goto exit; + } _return_value = winreg_ConnectRegistry_impl(module, computer_name, key); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyHKEY_FromHKEY(_return_value); exit: @@ -192,11 +196,13 @@ winreg_CreateKey(PyObject *module, PyObject *args) HKEY _return_value; if (!PyArg_ParseTuple(args, "O&Z:CreateKey", - clinic_HKEY_converter, &key, &sub_key)) + clinic_HKEY_converter, &key, &sub_key)) { goto exit; + } _return_value = winreg_CreateKey_impl(module, key, sub_key); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyHKEY_FromHKEY(_return_value); exit: @@ -229,29 +235,32 @@ PyDoc_STRVAR(winreg_CreateKeyEx__doc__, "If the function fails, an OSError exception is raised."); #define WINREG_CREATEKEYEX_METHODDEF \ - {"CreateKeyEx", (PyCFunction)winreg_CreateKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_CreateKeyEx__doc__}, + {"CreateKeyEx", (PyCFunction)winreg_CreateKeyEx, METH_FASTCALL, winreg_CreateKeyEx__doc__}, static HKEY winreg_CreateKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access); static PyObject * -winreg_CreateKeyEx(PyObject *module, PyObject *args, PyObject *kwargs) +winreg_CreateKeyEx(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static _PyArg_Parser _parser = {"O&Z|ii:CreateKeyEx", _keywords, 0}; HKEY key; Py_UNICODE *sub_key; int reserved = 0; REGSAM access = KEY_WRITE; HKEY _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:CreateKeyEx", _keywords, - clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) { goto exit; + } _return_value = winreg_CreateKeyEx_impl(module, key, sub_key, reserved, access); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyHKEY_FromHKEY(_return_value); exit: @@ -290,8 +299,9 @@ winreg_DeleteKey(PyObject *module, PyObject *args) Py_UNICODE *sub_key; if (!PyArg_ParseTuple(args, "O&u:DeleteKey", - clinic_HKEY_converter, &key, &sub_key)) + clinic_HKEY_converter, &key, &sub_key)) { goto exit; + } return_value = winreg_DeleteKey_impl(module, key, sub_key); exit: @@ -324,25 +334,27 @@ PyDoc_STRVAR(winreg_DeleteKeyEx__doc__, "On unsupported Windows versions, NotImplementedError is raised."); #define WINREG_DELETEKEYEX_METHODDEF \ - {"DeleteKeyEx", (PyCFunction)winreg_DeleteKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_DeleteKeyEx__doc__}, + {"DeleteKeyEx", (PyCFunction)winreg_DeleteKeyEx, METH_FASTCALL, winreg_DeleteKeyEx__doc__}, static PyObject * winreg_DeleteKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, REGSAM access, int reserved); static PyObject * -winreg_DeleteKeyEx(PyObject *module, PyObject *args, PyObject *kwargs) +winreg_DeleteKeyEx(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"key", "sub_key", "access", "reserved", NULL}; + static const char * const _keywords[] = {"key", "sub_key", "access", "reserved", NULL}; + static _PyArg_Parser _parser = {"O&u|ii:DeleteKeyEx", _keywords, 0}; HKEY key; Py_UNICODE *sub_key; REGSAM access = KEY_WOW64_64KEY; int reserved = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&u|ii:DeleteKeyEx", _keywords, - clinic_HKEY_converter, &key, &sub_key, &access, &reserved)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + clinic_HKEY_converter, &key, &sub_key, &access, &reserved)) { goto exit; + } return_value = winreg_DeleteKeyEx_impl(module, key, sub_key, access, reserved); exit: @@ -374,8 +386,9 @@ winreg_DeleteValue(PyObject *module, PyObject *args) Py_UNICODE *value; if (!PyArg_ParseTuple(args, "O&Z:DeleteValue", - clinic_HKEY_converter, &key, &value)) + clinic_HKEY_converter, &key, &value)) { goto exit; + } return_value = winreg_DeleteValue_impl(module, key, value); exit: @@ -411,8 +424,9 @@ winreg_EnumKey(PyObject *module, PyObject *args) int index; if (!PyArg_ParseTuple(args, "O&i:EnumKey", - clinic_HKEY_converter, &key, &index)) + clinic_HKEY_converter, &key, &index)) { goto exit; + } return_value = winreg_EnumKey_impl(module, key, index); exit: @@ -457,8 +471,9 @@ winreg_EnumValue(PyObject *module, PyObject *args) int index; if (!PyArg_ParseTuple(args, "O&i:EnumValue", - clinic_HKEY_converter, &key, &index)) + clinic_HKEY_converter, &key, &index)) { goto exit; + } return_value = winreg_EnumValue_impl(module, key, index); exit: @@ -483,8 +498,9 @@ winreg_ExpandEnvironmentStrings(PyObject *module, PyObject *arg) PyObject *return_value = NULL; Py_UNICODE *string; - if (!PyArg_Parse(arg, "u:ExpandEnvironmentStrings", &string)) + if (!PyArg_Parse(arg, "u:ExpandEnvironmentStrings", &string)) { goto exit; + } return_value = winreg_ExpandEnvironmentStrings_impl(module, string); exit: @@ -522,8 +538,9 @@ winreg_FlushKey(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HKEY key; - if (!PyArg_Parse(arg, "O&:FlushKey", clinic_HKEY_converter, &key)) + if (!PyArg_Parse(arg, "O&:FlushKey", clinic_HKEY_converter, &key)) { goto exit; + } return_value = winreg_FlushKey_impl(module, key); exit: @@ -574,8 +591,9 @@ winreg_LoadKey(PyObject *module, PyObject *args) Py_UNICODE *file_name; if (!PyArg_ParseTuple(args, "O&uu:LoadKey", - clinic_HKEY_converter, &key, &sub_key, &file_name)) + clinic_HKEY_converter, &key, &sub_key, &file_name)) { goto exit; + } return_value = winreg_LoadKey_impl(module, key, sub_key, file_name); exit: @@ -602,29 +620,32 @@ PyDoc_STRVAR(winreg_OpenKey__doc__, "If the function fails, an OSError exception is raised."); #define WINREG_OPENKEY_METHODDEF \ - {"OpenKey", (PyCFunction)winreg_OpenKey, METH_VARARGS|METH_KEYWORDS, winreg_OpenKey__doc__}, + {"OpenKey", (PyCFunction)winreg_OpenKey, METH_FASTCALL, winreg_OpenKey__doc__}, static HKEY winreg_OpenKey_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access); static PyObject * -winreg_OpenKey(PyObject *module, PyObject *args, PyObject *kwargs) +winreg_OpenKey(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static _PyArg_Parser _parser = {"O&Z|ii:OpenKey", _keywords, 0}; HKEY key; Py_UNICODE *sub_key; int reserved = 0; REGSAM access = KEY_READ; HKEY _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:OpenKey", _keywords, - clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) { goto exit; + } _return_value = winreg_OpenKey_impl(module, key, sub_key, reserved, access); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyHKEY_FromHKEY(_return_value); exit: @@ -651,29 +672,32 @@ PyDoc_STRVAR(winreg_OpenKeyEx__doc__, "If the function fails, an OSError exception is raised."); #define WINREG_OPENKEYEX_METHODDEF \ - {"OpenKeyEx", (PyCFunction)winreg_OpenKeyEx, METH_VARARGS|METH_KEYWORDS, winreg_OpenKeyEx__doc__}, + {"OpenKeyEx", (PyCFunction)winreg_OpenKeyEx, METH_FASTCALL, winreg_OpenKeyEx__doc__}, static HKEY winreg_OpenKeyEx_impl(PyObject *module, HKEY key, Py_UNICODE *sub_key, int reserved, REGSAM access); static PyObject * -winreg_OpenKeyEx(PyObject *module, PyObject *args, PyObject *kwargs) +winreg_OpenKeyEx(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL}; + static _PyArg_Parser _parser = {"O&Z|ii:OpenKeyEx", _keywords, 0}; HKEY key; Py_UNICODE *sub_key; int reserved = 0; REGSAM access = KEY_READ; HKEY _return_value; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&Z|ii:OpenKeyEx", _keywords, - clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + clinic_HKEY_converter, &key, &sub_key, &reserved, &access)) { goto exit; + } _return_value = winreg_OpenKeyEx_impl(module, key, sub_key, reserved, access); - if (_return_value == NULL) + if (_return_value == NULL) { goto exit; + } return_value = PyHKEY_FromHKEY(_return_value); exit: @@ -707,8 +731,9 @@ winreg_QueryInfoKey(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HKEY key; - if (!PyArg_Parse(arg, "O&:QueryInfoKey", clinic_HKEY_converter, &key)) + if (!PyArg_Parse(arg, "O&:QueryInfoKey", clinic_HKEY_converter, &key)) { goto exit; + } return_value = winreg_QueryInfoKey_impl(module, key); exit: @@ -749,8 +774,9 @@ winreg_QueryValue(PyObject *module, PyObject *args) Py_UNICODE *sub_key; if (!PyArg_ParseTuple(args, "O&Z:QueryValue", - clinic_HKEY_converter, &key, &sub_key)) + clinic_HKEY_converter, &key, &sub_key)) { goto exit; + } return_value = winreg_QueryValue_impl(module, key, sub_key); exit: @@ -787,8 +813,9 @@ winreg_QueryValueEx(PyObject *module, PyObject *args) Py_UNICODE *name; if (!PyArg_ParseTuple(args, "O&Z:QueryValueEx", - clinic_HKEY_converter, &key, &name)) + clinic_HKEY_converter, &key, &name)) { goto exit; + } return_value = winreg_QueryValueEx_impl(module, key, name); exit: @@ -830,8 +857,9 @@ winreg_SaveKey(PyObject *module, PyObject *args) Py_UNICODE *file_name; if (!PyArg_ParseTuple(args, "O&u:SaveKey", - clinic_HKEY_converter, &key, &file_name)) + clinic_HKEY_converter, &key, &file_name)) { goto exit; + } return_value = winreg_SaveKey_impl(module, key, file_name); exit: @@ -883,8 +911,9 @@ winreg_SetValue(PyObject *module, PyObject *args) Py_ssize_clean_t value_length; if (!PyArg_ParseTuple(args, "O&Zku#:SetValue", - clinic_HKEY_converter, &key, &sub_key, &type, &value, &value_length)) + clinic_HKEY_converter, &key, &sub_key, &type, &value, &value_length)) { goto exit; + } return_value = winreg_SetValue_impl(module, key, sub_key, type, value, value_length); exit: @@ -907,7 +936,7 @@ PyDoc_STRVAR(winreg_SetValueEx__doc__, " An integer that specifies the type of the data, one of:\n" " REG_BINARY -- Binary data in any form.\n" " REG_DWORD -- A 32-bit number.\n" -" REG_DWORD_LITTLE_ENDIAN -- A 32-bit number in little-endian format.\n" +" REG_DWORD_LITTLE_ENDIAN -- A 32-bit number in little-endian format. Equivalent to REG_DWORD\n" " REG_DWORD_BIG_ENDIAN -- A 32-bit number in big-endian format.\n" " REG_EXPAND_SZ -- A null-terminated string that contains unexpanded\n" " references to environment variables (for example,\n" @@ -917,6 +946,8 @@ PyDoc_STRVAR(winreg_SetValueEx__doc__, " by two null characters. Note that Python handles\n" " this termination automatically.\n" " REG_NONE -- No defined value type.\n" +" REG_QWORD -- A 64-bit number.\n" +" REG_QWORD_LITTLE_ENDIAN -- A 64-bit number in little-endian format. Equivalent to REG_QWORD.\n" " REG_RESOURCE_LIST -- A device-driver resource list.\n" " REG_SZ -- A null-terminated string.\n" " value\n" @@ -950,8 +981,9 @@ winreg_SetValueEx(PyObject *module, PyObject *args) PyObject *value; if (!PyArg_ParseTuple(args, "O&ZOkO:SetValueEx", - clinic_HKEY_converter, &key, &value_name, &reserved, &type, &value)) + clinic_HKEY_converter, &key, &value_name, &reserved, &type, &value)) { goto exit; + } return_value = winreg_SetValueEx_impl(module, key, value_name, reserved, type, value); exit: @@ -985,8 +1017,9 @@ winreg_DisableReflectionKey(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HKEY key; - if (!PyArg_Parse(arg, "O&:DisableReflectionKey", clinic_HKEY_converter, &key)) + if (!PyArg_Parse(arg, "O&:DisableReflectionKey", clinic_HKEY_converter, &key)) { goto exit; + } return_value = winreg_DisableReflectionKey_impl(module, key); exit: @@ -1018,8 +1051,9 @@ winreg_EnableReflectionKey(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HKEY key; - if (!PyArg_Parse(arg, "O&:EnableReflectionKey", clinic_HKEY_converter, &key)) + if (!PyArg_Parse(arg, "O&:EnableReflectionKey", clinic_HKEY_converter, &key)) { goto exit; + } return_value = winreg_EnableReflectionKey_impl(module, key); exit: @@ -1049,11 +1083,12 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg) PyObject *return_value = NULL; HKEY key; - if (!PyArg_Parse(arg, "O&:QueryReflectionKey", clinic_HKEY_converter, &key)) + if (!PyArg_Parse(arg, "O&:QueryReflectionKey", clinic_HKEY_converter, &key)) { goto exit; + } return_value = winreg_QueryReflectionKey_impl(module, key); exit: return return_value; } -/*[clinic end generated code: output=7b8940a23f605ddc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=16dd06be6e14b86e input=a9049054013a1b77]*/ diff --git a/PC/clinic/winsound.c.h b/PC/clinic/winsound.c.h index b00b442..52d25b2 100644 --- a/PC/clinic/winsound.c.h +++ b/PC/clinic/winsound.c.h @@ -3,7 +3,7 @@ preserve [clinic start generated code]*/ PyDoc_STRVAR(winsound_PlaySound__doc__, -"PlaySound($module, sound, flags, /)\n" +"PlaySound($module, /, sound, flags)\n" "--\n" "\n" "A wrapper around the Windows PlaySound API.\n" @@ -14,21 +14,24 @@ PyDoc_STRVAR(winsound_PlaySound__doc__, " Flag values, ored together. See module documentation."); #define WINSOUND_PLAYSOUND_METHODDEF \ - {"PlaySound", (PyCFunction)winsound_PlaySound, METH_VARARGS, winsound_PlaySound__doc__}, + {"PlaySound", (PyCFunction)winsound_PlaySound, METH_FASTCALL, winsound_PlaySound__doc__}, static PyObject * -winsound_PlaySound_impl(PyObject *module, Py_UNICODE *sound, int flags); +winsound_PlaySound_impl(PyObject *module, PyObject *sound, int flags); static PyObject * -winsound_PlaySound(PyObject *module, PyObject *args) +winsound_PlaySound(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - Py_UNICODE *sound; + static const char * const _keywords[] = {"sound", "flags", NULL}; + static _PyArg_Parser _parser = {"Oi:PlaySound", _keywords, 0}; + PyObject *sound; int flags; - if (!PyArg_ParseTuple(args, "Zi:PlaySound", - &sound, &flags)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &sound, &flags)) { goto exit; + } return_value = winsound_PlaySound_impl(module, sound, flags); exit: @@ -36,7 +39,7 @@ exit: } PyDoc_STRVAR(winsound_Beep__doc__, -"Beep($module, frequency, duration, /)\n" +"Beep($module, /, frequency, duration)\n" "--\n" "\n" "A wrapper around the Windows Beep API.\n" @@ -48,21 +51,24 @@ PyDoc_STRVAR(winsound_Beep__doc__, " How long the sound should play, in milliseconds."); #define WINSOUND_BEEP_METHODDEF \ - {"Beep", (PyCFunction)winsound_Beep, METH_VARARGS, winsound_Beep__doc__}, + {"Beep", (PyCFunction)winsound_Beep, METH_FASTCALL, winsound_Beep__doc__}, static PyObject * winsound_Beep_impl(PyObject *module, int frequency, int duration); static PyObject * -winsound_Beep(PyObject *module, PyObject *args) +winsound_Beep(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; + static const char * const _keywords[] = {"frequency", "duration", NULL}; + static _PyArg_Parser _parser = {"ii:Beep", _keywords, 0}; int frequency; int duration; - if (!PyArg_ParseTuple(args, "ii:Beep", - &frequency, &duration)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &frequency, &duration)) { goto exit; + } return_value = winsound_Beep_impl(module, frequency, duration); exit: @@ -70,7 +76,7 @@ exit: } PyDoc_STRVAR(winsound_MessageBeep__doc__, -"MessageBeep($module, x=MB_OK, /)\n" +"MessageBeep($module, /, type=MB_OK)\n" "--\n" "\n" "Call Windows MessageBeep(x).\n" @@ -78,23 +84,26 @@ PyDoc_STRVAR(winsound_MessageBeep__doc__, "x defaults to MB_OK."); #define WINSOUND_MESSAGEBEEP_METHODDEF \ - {"MessageBeep", (PyCFunction)winsound_MessageBeep, METH_VARARGS, winsound_MessageBeep__doc__}, + {"MessageBeep", (PyCFunction)winsound_MessageBeep, METH_FASTCALL, winsound_MessageBeep__doc__}, static PyObject * -winsound_MessageBeep_impl(PyObject *module, int x); +winsound_MessageBeep_impl(PyObject *module, int type); static PyObject * -winsound_MessageBeep(PyObject *module, PyObject *args) +winsound_MessageBeep(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - int x = MB_OK; + static const char * const _keywords[] = {"type", NULL}; + static _PyArg_Parser _parser = {"|i:MessageBeep", _keywords, 0}; + int type = MB_OK; - if (!PyArg_ParseTuple(args, "|i:MessageBeep", - &x)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &type)) { goto exit; - return_value = winsound_MessageBeep_impl(module, x); + } + return_value = winsound_MessageBeep_impl(module, type); exit: return return_value; } -/*[clinic end generated code: output=c0b290daf2330dc9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=bfe16b2b8b490cb1 input=a9049054013a1b77]*/ diff --git a/PC/config.c b/PC/config.c index 66bf458..43d9e20 100644 --- a/PC/config.c +++ b/PC/config.c @@ -23,6 +23,8 @@ extern PyObject* PyInit__signal(void); extern PyObject* PyInit__sha1(void); extern PyObject* PyInit__sha256(void); extern PyObject* PyInit__sha512(void); +extern PyObject* PyInit__sha3(void); +extern PyObject* PyInit__blake2(void); extern PyObject* PyInit_time(void); extern PyObject* PyInit__thread(void); #ifdef WIN32 @@ -96,6 +98,8 @@ struct _inittab _PyImport_Inittab[] = { {"_sha1", PyInit__sha1}, {"_sha256", PyInit__sha256}, {"_sha512", PyInit__sha512}, + {"_sha3", PyInit__sha3}, + {"_blake2", PyInit__blake2}, {"time", PyInit_time}, #ifdef WITH_THREAD {"_thread", PyInit__thread}, diff --git a/PC/getpathp.c b/PC/getpathp.c index 47a571e..0b0ae49 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -6,7 +6,9 @@ PATH RULES FOR WINDOWS: This describes how sys.path is formed on Windows. It describes the functionality, not the implementation (ie, the order in which these - are actually fetched is different) + are actually fetched is different). The presence of a python._pth or + pythonXY._pth file alongside the program overrides these rules - see + below. * Python always adds an empty entry at the start, which corresponds to the current directory. @@ -23,9 +25,9 @@ * We attempt to locate the "Python Home" - if the PYTHONHOME env var is set, we believe it. Otherwise, we use the path of our host .EXE's - to try and locate our "landmark" (lib\\os.py) and deduce our home. + to try and locate one of our "landmarks" and deduce our home. - If we DO have a Python Home: The relevant sub-directories (Lib, - plat-win, etc) are based on the Python Home + DLLs, etc) are based on the Python Home - If we DO NOT have a Python Home, the core Python Path is loaded from the registry. This is the main PythonPath key, and both HKLM and HKCU are combined to form the path) @@ -33,7 +35,23 @@ * Iff - we can not locate the Python Home, have not had a PYTHONPATH specified, and can't locate any Registry entries (ie, we have _nothing_ we can assume is a good path), a default path with relative entries is - used (eg. .\Lib;.\plat-win, etc) + used (eg. .\Lib;.\DLLs, etc) + + + If a '._pth' file exists adjacent to the executable with the same base name + (e.g. python._pth adjacent to python.exe) or adjacent to the shared library + (e.g. python36._pth adjacent to python36.dll), it is used in preference to + the above process. The shared library file takes precedence over the + executable. The path file must contain a list of paths to add to sys.path, + one per line. Each path is relative to the directory containing the file. + Blank lines and comments beginning with '#' are permitted. + + In the presence of this ._pth file, no other paths are added to the search + path, the registry finder is not enabled, site.py is not imported and + isolated mode is enabled. The site package can be enabled by including a + line reading "import site"; no other imports are recognized. Any invalid + entry (other than directories that do not exist) will result in immediate + termination of the program. The end result of all this is: @@ -52,7 +70,11 @@ some default, but relative, paths. * An embedding application can use Py_SetPath() to override all of - these authomatic path computations. + these automatic path computations. + + * An install of Python can fully specify the contents of sys.path using + either a 'EXENAME._pth' or 'DLLNAME._pth' file, optionally including + "import site" to enable the site module. ---------------------------------------------------------------- */ @@ -61,10 +83,13 @@ #include "osdefs.h" #include -#ifdef MS_WINDOWS -#include +#ifndef MS_WINDOWS +#error getpathp.c should only be built on Windows #endif +#include +#include + #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ @@ -122,6 +147,33 @@ reduce(wchar_t *dir) dir[i] = '\0'; } +static int +change_ext(wchar_t *dest, const wchar_t *src, const wchar_t *ext) +{ + size_t src_len = wcsnlen_s(src, MAXPATHLEN+1); + size_t i = src_len; + if (i >= MAXPATHLEN+1) + Py_FatalError("buffer overflow in getpathp.c's reduce()"); + + while (i > 0 && src[i] != '.' && !is_sep(src[i])) + --i; + + if (i == 0) { + dest[0] = '\0'; + return -1; + } + + if (is_sep(src[i])) + i = src_len; + + if (wcsncpy_s(dest, MAXPATHLEN+1, src, i) || + wcscat_s(dest, MAXPATHLEN+1, ext)) { + dest[0] = '\0'; + return -1; + } + + return 0; +} static int exists(wchar_t *filename) @@ -133,9 +185,9 @@ exists(wchar_t *filename) may extend 'filename' by one character. */ static int -ismodule(wchar_t *filename, int update_filename) /* Is module -- check for .pyc too */ +ismodule(wchar_t *filename, int update_filename) /* Is module -- check for .pyc/.pyo too */ { - int n; + size_t n; if (exists(filename)) return 1; @@ -144,7 +196,7 @@ ismodule(wchar_t *filename, int update_filename) /* Is module -- check for .pyc n = wcsnlen_s(filename, MAXPATHLEN+1); if (n < MAXPATHLEN) { int exist = 0; - filename[n] = L'c'; + filename[n] = Py_OptimizeFlag ? L'o' : L'c'; filename[n + 1] = L'\0'; exist = exists(filename); if (!update_filename) @@ -163,24 +215,30 @@ ismodule(wchar_t *filename, int update_filename) /* Is module -- check for .pyc than MAXPATHLEN characters at exit. If stuff is too long, only as much of stuff as fits will be appended. */ + +static int _PathCchCombineEx_Initialized = 0; +typedef HRESULT(__stdcall *PPathCchCombineEx)(PWSTR pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, PCWSTR pszMore, unsigned long dwFlags); +static PPathCchCombineEx _PathCchCombineEx; + static void join(wchar_t *buffer, const wchar_t *stuff) { - size_t n; - if (is_sep(stuff[0]) || - (wcsnlen_s(stuff, 4) >= 3 && stuff[1] == ':' && is_sep(stuff[2]))) { - if (wcscpy_s(buffer, MAXPATHLEN+1, stuff) != 0) - Py_FatalError("buffer overflow in getpathp.c's join()"); - return; + if (_PathCchCombineEx_Initialized == 0) { + HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll"); + if (pathapi) + _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx"); + else + _PathCchCombineEx = NULL; + _PathCchCombineEx_Initialized = 1; } - n = wcsnlen_s(buffer, MAXPATHLEN+1); - if (n > 0 && !is_sep(buffer[n - 1]) && n < MAXPATHLEN) { - buffer[n] = SEP; - buffer[n + 1] = '\0'; + if (_PathCchCombineEx) { + if (FAILED(_PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) + Py_FatalError("buffer overflow in getpathp.c's join()"); + } else { + if (!PathCombineW(buffer, buffer, stuff)) + Py_FatalError("buffer overflow in getpathp.c's join()"); } - if (wcscat_s(buffer, MAXPATHLEN+1, stuff) != 0) - Py_FatalError("buffer overflow in getpathp.c's join()"); } /* gotlandmark only called by search_for_prefix, which ensures @@ -188,7 +246,7 @@ join(wchar_t *buffer, const wchar_t *stuff) 'landmark' can not overflow prefix if too long. */ static int -gotlandmark(wchar_t *landmark) +gotlandmark(const wchar_t *landmark) { int ok; Py_ssize_t n = wcsnlen_s(prefix, MAXPATHLEN); @@ -202,7 +260,7 @@ gotlandmark(wchar_t *landmark) /* assumes argv0_path is MAXPATHLEN+1 bytes long, already \0 term'd. assumption provided by only caller, calculate_path() */ static int -search_for_prefix(wchar_t *argv0_path, wchar_t *landmark) +search_for_prefix(wchar_t *argv0_path, const wchar_t *landmark) { /* Search from argv0_path, until landmark is found */ wcscpy_s(prefix, MAXPATHLEN + 1, argv0_path); @@ -214,7 +272,6 @@ search_for_prefix(wchar_t *argv0_path, wchar_t *landmark) return 0; } -#ifdef MS_WINDOWS #ifdef Py_ENABLE_SHARED /* a string loaded from the DLL at startup.*/ @@ -369,7 +426,6 @@ done: return retval; } #endif /* Py_ENABLE_SHARED */ -#endif /* MS_WINDOWS */ static void get_progpath(void) @@ -378,7 +434,6 @@ get_progpath(void) wchar_t *path = _wgetenv(L"PATH"); wchar_t *prog = Py_GetProgramName(); -#ifdef MS_WINDOWS #ifdef Py_ENABLE_SHARED extern HANDLE PyWin_DLLhModule; /* static init of progpath ensures final char remains \0 */ @@ -390,7 +445,6 @@ get_progpath(void) #endif if (GetModuleFileNameW(NULL, progpath, MAXPATHLEN)) return; -#endif if (prog == NULL || *prog == '\0') prog = L"python"; @@ -483,6 +537,92 @@ find_env_config_value(FILE * env_file, const wchar_t * key, wchar_t * value) return result; } +static int +read_pth_file(const wchar_t *path, wchar_t *prefix, int *isolated, int *nosite) +{ + FILE *sp_file = _Py_wfopen(path, L"r"); + if (sp_file == NULL) + return -1; + + wcscpy_s(prefix, MAXPATHLEN+1, path); + reduce(prefix); + *isolated = 1; + *nosite = 1; + + size_t bufsiz = MAXPATHLEN; + size_t prefixlen = wcslen(prefix); + + wchar_t *buf = (wchar_t*)PyMem_RawMalloc(bufsiz * sizeof(wchar_t)); + buf[0] = '\0'; + + while (!feof(sp_file)) { + char line[MAXPATHLEN + 1]; + char *p = fgets(line, MAXPATHLEN + 1, sp_file); + if (!p) + break; + if (*p == '\0' || *p == '#') + continue; + while (*++p) { + if (*p == '\r' || *p == '\n') { + *p = '\0'; + break; + } + } + + if (strcmp(line, "import site") == 0) { + *nosite = 0; + continue; + } else if (strncmp(line, "import ", 7) == 0) { + Py_FatalError("only 'import site' is supported in ._pth file"); + } + + DWORD wn = MultiByteToWideChar(CP_UTF8, 0, line, -1, NULL, 0); + wchar_t *wline = (wchar_t*)PyMem_RawMalloc((wn + 1) * sizeof(wchar_t)); + wn = MultiByteToWideChar(CP_UTF8, 0, line, -1, wline, wn + 1); + wline[wn] = '\0'; + + size_t usedsiz = wcslen(buf); + while (usedsiz + wn + prefixlen + 4 > bufsiz) { + bufsiz += MAXPATHLEN; + buf = (wchar_t*)PyMem_RawRealloc(buf, (bufsiz + 1) * sizeof(wchar_t)); + if (!buf) { + PyMem_RawFree(wline); + goto error; + } + } + + if (usedsiz) { + wcscat_s(buf, bufsiz, L";"); + usedsiz += 1; + } + + errno_t result; + _Py_BEGIN_SUPPRESS_IPH + result = wcscat_s(buf, bufsiz, prefix); + _Py_END_SUPPRESS_IPH + if (result == EINVAL) { + Py_FatalError("invalid argument during ._pth processing"); + } else if (result == ERANGE) { + Py_FatalError("buffer overflow during ._pth processing"); + } + wchar_t *b = &buf[usedsiz]; + join(b, wline); + + PyMem_RawFree(wline); + } + + module_search_path = buf; + + fclose(sp_file); + return 0; + +error: + PyMem_RawFree(buf); + fclose(sp_file); + return -1; +} + + static void calculate_path(void) { @@ -492,32 +632,33 @@ calculate_path(void) wchar_t *pythonhome = Py_GetPythonHome(); wchar_t *envpath = NULL; -#ifdef MS_WINDOWS int skiphome, skipdefault; wchar_t *machinepath = NULL; wchar_t *userpath = NULL; wchar_t zip_path[MAXPATHLEN+1]; - int applocal = 0; if (!Py_IgnoreEnvironmentFlag) { envpath = _wgetenv(L"PYTHONPATH"); } -#else - char *_envpath = Py_GETENV("PYTHONPATH"); - wchar_t wenvpath[MAXPATHLEN+1]; - if (_envpath) { - size_t r = mbstowcs(wenvpath, _envpath, MAXPATHLEN+1); - envpath = wenvpath; - if (r == (size_t)-1 || r >= MAXPATHLEN) - envpath = NULL; - } -#endif get_progpath(); /* progpath guaranteed \0 terminated in MAXPATH+1 bytes. */ wcscpy_s(argv0_path, MAXPATHLEN+1, progpath); reduce(argv0_path); + /* Search for a sys.path file */ + { + wchar_t spbuffer[MAXPATHLEN+1]; + + if ((dllpath[0] && !change_ext(spbuffer, dllpath, L"._pth") && exists(spbuffer)) || + (progpath[0] && !change_ext(spbuffer, progpath, L"._pth") && exists(spbuffer))) { + + if (!read_pth_file(spbuffer, prefix, &Py_IsolatedFlag, &Py_NoSiteFlag)) { + return; + } + } + } + /* Search for an environment configuration file, first in the executable's directory and then in the parent directory. If found, open it for use when searching for prefixes. @@ -543,17 +684,6 @@ calculate_path(void) } } if (env_file != NULL) { - /* Look for an 'applocal' variable and, if true, ignore all registry - * keys and environment variables, but retain the default paths - * (DLLs, Lib) and the zip file. Setting pythonhome here suppresses - * the search for LANDMARK below and overrides %PYTHONHOME%. - */ - if (find_env_config_value(env_file, L"applocal", tmpbuffer) && - (applocal = (wcsicmp(tmpbuffer, L"true") == 0))) { - envpath = NULL; - pythonhome = argv0_path; - } - /* Look for a 'home' variable and set argv0_path to it, if found */ if (find_env_config_value(env_file, L"home", tmpbuffer)) { wcscpy_s(argv0_path, MAXPATHLEN+1, tmpbuffer); @@ -563,8 +693,15 @@ calculate_path(void) } } + /* Calculate zip archive path from DLL or exe path */ + change_ext(zip_path, dllpath[0] ? dllpath : progpath, L".zip"); + if (pythonhome == NULL || *pythonhome == '\0') { - if (search_for_prefix(argv0_path, LANDMARK)) + if (zip_path[0] && exists(zip_path)) { + wcscpy_s(prefix, MAXPATHLEN+1, zip_path); + reduce(prefix); + pythonhome = prefix; + } else if (search_for_prefix(argv0_path, LANDMARK)) pythonhome = prefix; else pythonhome = NULL; @@ -576,30 +713,15 @@ calculate_path(void) envpath = NULL; -#ifdef MS_WINDOWS - /* Calculate zip archive path from DLL or exe path */ - if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath)) - /* exceeded buffer length - ignore zip_path */ - zip_path[0] = '\0'; - else { - wchar_t *dot = wcsrchr(zip_path, '.'); - if (!dot || wcscpy_s(dot, MAXPATHLEN+1 - (dot - zip_path), L".zip")) - /* exceeded buffer length - ignore zip_path */ - zip_path[0] = L'\0'; - } - skiphome = pythonhome==NULL ? 0 : 1; #ifdef Py_ENABLE_SHARED - if (!applocal) { - machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome); - userpath = getpythonregpath(HKEY_CURRENT_USER, skiphome); - } + machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome); + userpath = getpythonregpath(HKEY_CURRENT_USER, skiphome); #endif /* We only use the default relative PYTHONPATH if we havent anything better to use! */ skipdefault = envpath!=NULL || pythonhome!=NULL || \ machinepath!=NULL || userpath!=NULL; -#endif /* We need to construct a path from the following parts. (1) the PYTHONPATH environment variable, if set; @@ -612,7 +734,6 @@ calculate_path(void) Extra rules: - If PYTHONHOME is set (in any way) item (3) is ignored. - If registry values are used, (4) and (5) are ignored. - - If applocal is set, (1), (3), and registry values are ignored */ /* Calculate size of return buffer */ @@ -629,13 +750,11 @@ calculate_path(void) bufsz = 0; bufsz += wcslen(PYTHONPATH) + 1; bufsz += wcslen(argv0_path) + 1; -#ifdef MS_WINDOWS - if (!applocal && userpath) + if (userpath) bufsz += wcslen(userpath) + 1; - if (!applocal && machinepath) + if (machinepath) bufsz += wcslen(machinepath) + 1; bufsz += wcslen(zip_path) + 1; -#endif if (envpath != NULL) bufsz += wcslen(envpath) + 1; @@ -651,10 +770,8 @@ calculate_path(void) fprintf(stderr, "Using default static path.\n"); module_search_path = PYTHONPATH; } -#ifdef MS_WINDOWS PyMem_RawFree(machinepath); PyMem_RawFree(userpath); -#endif /* MS_WINDOWS */ return; } @@ -664,7 +781,6 @@ calculate_path(void) buf = wcschr(buf, L'\0'); *buf++ = DELIM; } -#ifdef MS_WINDOWS if (zip_path[0]) { if (wcscpy_s(buf, bufsz - (buf - module_search_path), zip_path)) Py_FatalError("buffer overflow in getpathp.c's calculate_path()"); @@ -692,15 +808,7 @@ calculate_path(void) buf = wcschr(buf, L'\0'); *buf++ = DELIM; } - } -#else - if (pythonhome == NULL) { - wcscpy(buf, PYTHONPATH); - buf = wcschr(buf, L'\0'); - *buf++ = DELIM; - } -#endif /* MS_WINDOWS */ - else { + } else { wchar_t *p = PYTHONPATH; wchar_t *q; size_t n; diff --git a/PC/icons/launcher.icns b/PC/icons/launcher.icns new file mode 100644 index 0000000..59a917f Binary files /dev/null and b/PC/icons/launcher.icns differ diff --git a/PC/icons/launcher.ico b/PC/icons/launcher.ico new file mode 100644 index 0000000..c4e3c69 Binary files /dev/null and b/PC/icons/launcher.ico differ diff --git a/PC/icons/launcher.svg b/PC/icons/launcher.svg new file mode 100644 index 0000000..0590b0d --- /dev/null +++ b/PC/icons/launcher.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/py.icns b/PC/icons/py.icns new file mode 100644 index 0000000..2dc4e29 Binary files /dev/null and b/PC/icons/py.icns differ diff --git a/PC/icons/py.ico b/PC/icons/py.ico new file mode 100644 index 0000000..1d8a79b Binary files /dev/null and b/PC/icons/py.ico differ diff --git a/PC/icons/py.svg b/PC/icons/py.svg new file mode 100644 index 0000000..0924e83 --- /dev/null +++ b/PC/icons/py.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pyc.icns b/PC/icons/pyc.icns new file mode 100644 index 0000000..50da9a1 Binary files /dev/null and b/PC/icons/pyc.icns differ diff --git a/PC/icons/pyc.ico b/PC/icons/pyc.ico new file mode 100644 index 0000000..74dde81 Binary files /dev/null and b/PC/icons/pyc.ico differ diff --git a/PC/icons/pyc.svg b/PC/icons/pyc.svg new file mode 100644 index 0000000..5c3e9e7 --- /dev/null +++ b/PC/icons/pyc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pyd.icns b/PC/icons/pyd.icns new file mode 100644 index 0000000..5d3d24e Binary files /dev/null and b/PC/icons/pyd.icns differ diff --git a/PC/icons/pyd.ico b/PC/icons/pyd.ico new file mode 100644 index 0000000..9f6cb60 Binary files /dev/null and b/PC/icons/pyd.ico differ diff --git a/PC/icons/pyd.svg b/PC/icons/pyd.svg new file mode 100644 index 0000000..17eff6a --- /dev/null +++ b/PC/icons/pyd.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/python.icns b/PC/icons/python.icns new file mode 100644 index 0000000..fc53e02 Binary files /dev/null and b/PC/icons/python.icns differ diff --git a/PC/icons/python.ico b/PC/icons/python.ico new file mode 100644 index 0000000..b8a38ef Binary files /dev/null and b/PC/icons/python.ico differ diff --git a/PC/icons/python.svg b/PC/icons/python.svg new file mode 100644 index 0000000..e23e5a3 --- /dev/null +++ b/PC/icons/python.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pythonw.icns b/PC/icons/pythonw.icns new file mode 100644 index 0000000..9354cf8 Binary files /dev/null and b/PC/icons/pythonw.icns differ diff --git a/PC/icons/pythonw.ico b/PC/icons/pythonw.ico new file mode 100644 index 0000000..6195d43 Binary files /dev/null and b/PC/icons/pythonw.ico differ diff --git a/PC/icons/pythonw.svg b/PC/icons/pythonw.svg new file mode 100644 index 0000000..7cb2607 --- /dev/null +++ b/PC/icons/pythonw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/setup.icns b/PC/icons/setup.icns new file mode 100644 index 0000000..6f0e6b0 Binary files /dev/null and b/PC/icons/setup.icns differ diff --git a/PC/icons/setup.ico b/PC/icons/setup.ico new file mode 100644 index 0000000..e54364b Binary files /dev/null and b/PC/icons/setup.ico differ diff --git a/PC/icons/setup.svg b/PC/icons/setup.svg new file mode 100644 index 0000000..0613856 --- /dev/null +++ b/PC/icons/setup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/launcher.c b/PC/launcher.c index 40d4cb5..d11df43 100644 --- a/PC/launcher.c +++ b/PC/launcher.c @@ -98,7 +98,7 @@ error(int rc, wchar_t * format, ... ) MessageBox(NULL, message, TEXT("Python Launcher is sorry to say ..."), MB_OK); #endif - ExitProcess(rc); + exit(rc); } /* @@ -465,7 +465,7 @@ get_configured_value(wchar_t * key) } static INSTALLED_PYTHON * -locate_python(wchar_t * wanted_ver) +locate_python(wchar_t * wanted_ver, BOOL from_shebang) { static wchar_t config_key [] = { L"pythonX" }; static wchar_t * last_char = &config_key[sizeof(config_key) / @@ -497,10 +497,17 @@ locate_python(wchar_t * wanted_ver) configured_value = get_configured_value(config_key); if (configured_value) result = find_python_by_version(configured_value); + /* Not found a value yet - try by major version. + * If we're looking for an interpreter specified in a shebang line, + * we want to try Python 2 first, then Python 3 (for Unix and backward + * compatibility). If we're being called interactively, assume the user + * wants the latest version available, so try Python 3 first, then + * Python 2. + */ if (result == NULL) - result = find_python_by_version(L"2"); + result = find_python_by_version(from_shebang ? L"2" : L"3"); if (result == NULL) - result = find_python_by_version(L"3"); + result = find_python_by_version(from_shebang ? L"3" : L"2"); debug(L"search for default Python found "); if (result) { debug(L"version %ls at '%ls'\n", @@ -655,7 +662,7 @@ run_child(wchar_t * cmdline) if (!ok) error(RC_CREATE_PROCESS, L"Failed to get exit code of process"); debug(L"child process exit code: %d\n", rc); - ExitProcess(rc); + exit(rc); } static void @@ -1082,7 +1089,7 @@ static PYC_MAGIC magic_values[] = { { 3190, 3230, L"3.3" }, { 3250, 3310, L"3.4" }, { 3320, 3351, L"3.5" }, - { 3360, 3361, L"3.6" }, + { 3360, 3379, L"3.6" }, { 0 } }; @@ -1094,7 +1101,7 @@ find_by_magic(unsigned short magic) for (mp = magic_values; mp->min; mp++) { if ((magic >= mp->min) && (magic <= mp->max)) { - result = locate_python(mp->version); + result = locate_python(mp->version, FALSE); if (result != NULL) break; } @@ -1114,7 +1121,7 @@ maybe_handle_shebang(wchar_t ** argv, wchar_t * cmdline) */ FILE * fp; errno_t rc = _wfopen_s(&fp, *argv, L"rb"); - unsigned char buffer[BUFSIZE]; + char buffer[BUFSIZE]; wchar_t shebang_line[BUFSIZE + 1]; size_t read; char *p; @@ -1136,7 +1143,8 @@ maybe_handle_shebang(wchar_t ** argv, wchar_t * cmdline) fclose(fp); if ((read >= 4) && (buffer[3] == '\n') && (buffer[2] == '\r')) { - ip = find_by_magic((buffer[1] << 8 | buffer[0]) & 0xFFFF); + ip = find_by_magic((((unsigned char)buffer[1]) << 8 | + (unsigned char)buffer[0]) & 0xFFFF); if (ip != NULL) { debug(L"script file is compiled against Python %ls\n", ip->version); @@ -1278,7 +1286,7 @@ specification: '%ls'.\nIn the first line of the script, 'python' needs to be \ followed by a valid version specifier.\nPlease check the documentation.", command); /* TODO could call validate_version(command) */ - ip = locate_python(command); + ip = locate_python(command, TRUE); if (ip == NULL) { error(RC_NO_PYTHON, L"Requested Python version \ (%ls) is not installed", command); @@ -1362,6 +1370,7 @@ process(int argc, wchar_t ** argv) wchar_t * av[2]; #endif + setvbuf(stderr, (char *)NULL, _IONBF, 0); wp = get_env(L"PYLAUNCH_DEBUG"); if ((wp != NULL) && (*wp != L'\0')) log_fp = stderr; @@ -1483,7 +1492,7 @@ process(int argc, wchar_t ** argv) plen = wcslen(p); valid = (*p == L'-') && validate_version(&p[1]); if (valid) { - ip = locate_python(&p[1]); + ip = locate_python(&p[1], FALSE); if (ip == NULL) error(RC_NO_PYTHON, L"Requested Python version (%ls) not \ installed", &p[1]); @@ -1510,7 +1519,7 @@ installed", &p[1]); /* If we didn't find one, look for the default Python */ if (executable == NULL) { - ip = locate_python(L""); + ip = locate_python(L"", FALSE); if (ip == NULL) error(RC_NO_PYTHON, L"Can't find a default Python."); executable = ip->executable; diff --git a/PC/launcher.ico b/PC/launcher.ico deleted file mode 100644 index dad7d57..0000000 Binary files a/PC/launcher.ico and /dev/null differ diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 423afea..c9d1e6c 100644 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -33,12 +33,12 @@ #endif /*[python input] -class Py_intptr_t_converter(CConverter): - type = 'Py_intptr_t' +class intptr_t_converter(CConverter): + type = 'intptr_t' format_unit = '"_Py_PARSE_INTPTR"' class handle_return_converter(long_return_converter): - type = 'Py_intptr_t' + type = 'intptr_t' cast = '(void *)' conversion_fn = 'PyLong_FromVoidPtr' @@ -59,7 +59,7 @@ class wchar_t_return_converter(CReturnConverter): data.return_conversion.append( 'return_value = PyUnicode_FromOrdinal(_return_value);\n') [python start generated code]*/ -/*[python end generated code: output=da39a3ee5e6b4b0d input=6a54fc4e73d0b367]*/ +/*[python end generated code: output=da39a3ee5e6b4b0d input=b59f1663dba11997]*/ /*[clinic input] module msvcrt @@ -111,9 +111,7 @@ msvcrt_locking_impl(PyObject *module, int fd, int mode, long nbytes) int err; Py_BEGIN_ALLOW_THREADS - _Py_BEGIN_SUPPRESS_IPH err = _locking(fd, mode, nbytes); - _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS if (err != 0) return PyErr_SetFromErrno(PyExc_IOError); @@ -140,9 +138,7 @@ static long msvcrt_setmode_impl(PyObject *module, int fd, int flags) /*[clinic end generated code: output=24a9be5ea07ccb9b input=76e7c01f6b137f75]*/ { - _Py_BEGIN_SUPPRESS_IPH flags = _setmode(fd, flags); - _Py_END_SUPPRESS_IPH if (flags == -1) PyErr_SetFromErrno(PyExc_IOError); @@ -152,7 +148,7 @@ msvcrt_setmode_impl(PyObject *module, int fd, int flags) /*[clinic input] msvcrt.open_osfhandle -> long - handle: Py_intptr_t + handle: intptr_t flags: int / @@ -164,14 +160,12 @@ to os.fdopen() to create a file object. [clinic start generated code]*/ static long -msvcrt_open_osfhandle_impl(PyObject *module, Py_intptr_t handle, int flags) -/*[clinic end generated code: output=bf65e422243a39f9 input=4d8516ed32db8f65]*/ +msvcrt_open_osfhandle_impl(PyObject *module, intptr_t handle, int flags) +/*[clinic end generated code: output=cede871bf939d6e3 input=cb2108bbea84514e]*/ { int fd; - _Py_BEGIN_SUPPRESS_IPH fd = _open_osfhandle(handle, flags); - _Py_END_SUPPRESS_IPH if (fd == -1) PyErr_SetFromErrno(PyExc_IOError); @@ -189,11 +183,11 @@ Return the file handle for the file descriptor fd. Raises IOError if fd is not recognized. [clinic start generated code]*/ -static Py_intptr_t +static intptr_t msvcrt_get_osfhandle_impl(PyObject *module, int fd) -/*[clinic end generated code: output=eac47643338c0baa input=c7d18d02c8017ec1]*/ +/*[clinic end generated code: output=7ce761dd0de2b503 input=c7d18d02c8017ec1]*/ { - Py_intptr_t handle = -1; + intptr_t handle = -1; _Py_BEGIN_SUPPRESS_IPH handle = _get_osfhandle(fd); @@ -309,9 +303,7 @@ static PyObject * msvcrt_putch_impl(PyObject *module, char char_value) /*[clinic end generated code: output=92ec9b81012d8f60 input=ec078dd10cb054d6]*/ { - _Py_BEGIN_SUPPRESS_IPH _putch(char_value); - _Py_END_SUPPRESS_IPH Py_RETURN_NONE; } @@ -328,9 +320,7 @@ static PyObject * msvcrt_putwch_impl(PyObject *module, int unicode_char) /*[clinic end generated code: output=a3bd1a8951d28eee input=996ccd0bbcbac4c3]*/ { - _Py_BEGIN_SUPPRESS_IPH _putwch(unicode_char); - _Py_END_SUPPRESS_IPH Py_RETURN_NONE; } @@ -352,13 +342,7 @@ static PyObject * msvcrt_ungetch_impl(PyObject *module, char char_value) /*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/ { - int res; - - _Py_BEGIN_SUPPRESS_IPH - res = _ungetch(char_value); - _Py_END_SUPPRESS_IPH - - if (res == EOF) + if (_ungetch(char_value) == EOF) return PyErr_SetFromErrno(PyExc_IOError); Py_RETURN_NONE; } @@ -376,13 +360,7 @@ static PyObject * msvcrt_ungetwch_impl(PyObject *module, int unicode_char) /*[clinic end generated code: output=e63af05438b8ba3d input=83ec0492be04d564]*/ { - int res; - - _Py_BEGIN_SUPPRESS_IPH - res = _ungetwch(unicode_char); - _Py_END_SUPPRESS_IPH - - if (res == WEOF) + if (_ungetwch(unicode_char) == WEOF) return PyErr_SetFromErrno(PyExc_IOError); Py_RETURN_NONE; } @@ -404,13 +382,7 @@ static long msvcrt_CrtSetReportFile_impl(PyObject *module, int type, int file) /*[clinic end generated code: output=df291c7fe032eb68 input=bb8f721a604fcc45]*/ { - long res; - - _Py_BEGIN_SUPPRESS_IPH - res = (long)_CrtSetReportFile(type, (_HFILE)file); - _Py_END_SUPPRESS_IPH - - return res; + return (long)_CrtSetReportFile(type, (_HFILE)file); } /*[clinic input] @@ -431,9 +403,7 @@ msvcrt_CrtSetReportMode_impl(PyObject *module, int type, int mode) { int res; - _Py_BEGIN_SUPPRESS_IPH res = _CrtSetReportMode(type, mode); - _Py_END_SUPPRESS_IPH if (res == -1) PyErr_SetFromErrno(PyExc_IOError); return res; @@ -454,13 +424,7 @@ static long msvcrt_set_error_mode_impl(PyObject *module, int mode) /*[clinic end generated code: output=ac4a09040d8ac4e3 input=046fca59c0f20872]*/ { - long res; - - _Py_BEGIN_SUPPRESS_IPH - res = _set_error_mode(mode); - _Py_END_SUPPRESS_IPH - - return res; + return _set_error_mode(mode); } #endif /* _DEBUG */ @@ -479,10 +443,7 @@ msvcrt_SetErrorMode_impl(PyObject *module, unsigned int mode) { unsigned int res; - _Py_BEGIN_SUPPRESS_IPH res = SetErrorMode(mode); - _Py_END_SUPPRESS_IPH - return PyLong_FromUnsignedLong(res); } @@ -574,7 +535,6 @@ PyInit_msvcrt(void) #endif /* constants for the crt versions */ - (void)st; #ifdef _VC_ASSEMBLY_PUBLICKEYTOKEN st = PyModule_AddStringConstant(m, "VC_ASSEMBLY_PUBLICKEYTOKEN", _VC_ASSEMBLY_PUBLICKEYTOKEN); @@ -600,6 +560,8 @@ PyInit_msvcrt(void) st = PyModule_AddObject(m, "CRT_ASSEMBLY_VERSION", version); if (st < 0) return NULL; #endif + /* make compiler warning quiet if st is unused */ + (void)st; return m; } diff --git a/PC/py.ico b/PC/py.ico deleted file mode 100644 index 3357aef..0000000 Binary files a/PC/py.ico and /dev/null differ diff --git a/PC/pyc.ico b/PC/pyc.ico deleted file mode 100644 index f7bd2b1..0000000 Binary files a/PC/pyc.ico and /dev/null differ diff --git a/PC/pycon.ico b/PC/pycon.ico deleted file mode 100644 index 1ab629e..0000000 Binary files a/PC/pycon.ico and /dev/null differ diff --git a/PC/pyconfig.h b/PC/pyconfig.h index ac4f8f2..64e7aec 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -14,7 +14,6 @@ the following #defines MS_WIN64 - Code specific to the MS Win64 API MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs) MS_WINDOWS - Code specific to Windows, but all versions. -MS_WINCE - Code specific to Windows CE Py_ENABLE_SHARED - Code if the Python core is built as a DLL. Also note that neither "_M_IX86" or "_MSC_VER" should be used for @@ -30,10 +29,6 @@ WIN32 is still required for the locale module. */ -#ifdef _WIN32_WCE -#define MS_WINCE -#endif - /* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ #ifdef USE_DL_EXPORT # define Py_BUILD_CORE @@ -53,8 +48,6 @@ WIN32 is still required for the locale module. #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* Windows CE does not have these */ -#ifndef MS_WINCE #define HAVE_IO_H #define HAVE_SYS_UTIME_H #define HAVE_TEMPNAM @@ -62,11 +55,8 @@ WIN32 is still required for the locale module. #define HAVE_TMPNAM #define HAVE_CLOCK #define HAVE_STRERROR -#endif -#ifdef HAVE_IO_H #include -#endif #define HAVE_HYPOT #define HAVE_STRFTIME @@ -86,17 +76,6 @@ WIN32 is still required for the locale module. #define USE_SOCKET #endif -/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */ -#if defined(MS_WINCE) -# include -# define strdup _strdup -#endif - -#ifdef MS_WINCE -/* Windows CE does not support environment variables */ -#define getenv(v) (NULL) -#define environ (NULL) -#endif /* Compiler specific defines */ @@ -286,7 +265,6 @@ typedef int pid_t; #endif /* 64 bit ints are usually spelt __int64 unless compiler has overridden */ -#define HAVE_LONG_LONG 1 #ifndef PY_LONG_LONG # define PY_LONG_LONG __int64 # define PY_LLONG_MAX _I64_MAX @@ -312,11 +290,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ their Makefile (other compilers are generally taken care of by distutils.) */ # if defined(_DEBUG) -# pragma comment(lib,"python35_d.lib") +# pragma comment(lib,"python36_d.lib") # elif defined(Py_LIMITED_API) # pragma comment(lib,"python3.lib") # else -# pragma comment(lib,"python35.lib") +# pragma comment(lib,"python36.lib") # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -387,39 +365,10 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* define signed and unsigned exact-width 32-bit and 64-bit types, used in the implementation of Python integers. */ -#ifndef PY_UINT32_T -#if SIZEOF_INT == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned int -#elif SIZEOF_LONG == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned long -#endif -#endif - -#ifndef PY_UINT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_UINT64_T 1 -#define PY_UINT64_T unsigned PY_LONG_LONG -#endif -#endif - -#ifndef PY_INT32_T -#if SIZEOF_INT == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T int -#elif SIZEOF_LONG == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T long -#endif -#endif - -#ifndef PY_INT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_INT64_T 1 -#define PY_INT64_T PY_LONG_LONG -#endif -#endif +#define PY_UINT32_T uint32_t +#define PY_UINT64_T uint64_t +#define PY_INT32_T int32_t +#define PY_INT64_T int64_t /* Fairly standard from here! */ @@ -448,14 +397,10 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #define const */ /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_CONIO_H 1 -#endif /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_DIRECT_H 1 -#endif /* Define if you have dirent.h. */ /* #define DIRENT 1 */ @@ -528,9 +473,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #define HAVE_ALTZONE */ /* Define if you have the putenv function. */ -#ifndef MS_WINCE #define HAVE_PUTENV -#endif /* Define if your compiler supports function prototypes */ #define HAVE_PROTOTYPES @@ -558,9 +501,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ #define HAVE_DYNAMIC_LOADING /* Define if you have ftime. */ -#ifndef MS_WINCE #define HAVE_FTIME -#endif /* Define if you have getpeername. */ #define HAVE_GETPEERNAME @@ -569,9 +510,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #undef HAVE_GETPGRP */ /* Define if you have getpid. */ -#ifndef MS_WINCE #define HAVE_GETPID -#endif /* Define if you have gettimeofday. */ /* #undef HAVE_GETTIMEOFDAY */ @@ -633,14 +572,10 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ #endif /* Define to 1 if you have the `wcscoll' function. */ -#ifndef MS_WINCE #define HAVE_WCSCOLL 1 -#endif /* Define to 1 if you have the `wcsxfrm' function. */ -#ifndef MS_WINCE #define HAVE_WCSXFRM 1 -#endif /* Define if the zlib library has inflateCopy */ #define HAVE_ZLIB_COPY 1 @@ -649,24 +584,16 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #undef HAVE_DLFCN_H */ /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_ERRNO_H 1 -#endif /* Define if you have the header file. */ -#ifndef MS_WINCE #define HAVE_FCNTL_H 1 -#endif /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_PROCESS_H 1 -#endif /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_SIGNAL_H 1 -#endif /* Define if you have the prototypes. */ #define HAVE_STDARG_PROTOTYPES @@ -684,9 +611,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #define HAVE_SYS_SELECT_H 1 */ /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_SYS_STAT_H 1 -#endif /* Define if you have the header file. */ /* #define HAVE_SYS_TIME_H 1 */ @@ -695,9 +620,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #define HAVE_SYS_TIMES_H 1 */ /* Define to 1 if you have the header file. */ -#ifndef MS_WINCE #define HAVE_SYS_TYPES_H 1 -#endif /* Define if you have the header file. */ /* #define HAVE_SYS_UN_H 1 */ @@ -720,6 +643,9 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* The size of `wchar_t', as computed by sizeof. */ #define SIZEOF_WCHAR_T 2 +/* The size of `_Bool', as computed by sizeof. */ +#define SIZEOF__BOOL 1 + /* The size of `pid_t', as computed by sizeof. */ #define SIZEOF_PID_T SIZEOF_INT diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index a8db0a8..3da3445 100644 --- a/PC/pylauncher.rc +++ b/PC/pylauncher.rc @@ -7,9 +7,13 @@ #include 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "launcher.ico" -2 ICON DISCARDABLE "py.ico" -3 ICON DISCARDABLE "pyc.ico" +1 ICON DISCARDABLE "icons\launcher.ico" +2 ICON DISCARDABLE "icons\py.ico" +3 ICON DISCARDABLE "icons\pyc.ico" +4 ICON DISCARDABLE "icons\pyd.ico" +5 ICON DISCARDABLE "icons\python.ico" +6 ICON DISCARDABLE "icons\pythonw.ico" +7 ICON DISCARDABLE "icons\setup.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/PC/python.manifest b/PC/python.manifest index d6e4bba..4e73d60 100644 --- a/PC/python.manifest +++ b/PC/python.manifest @@ -16,10 +16,15 @@ + + + true + + - \ No newline at end of file + diff --git a/PC/python3.def b/PC/python3.def index 200d6bb..e8d2d8c 100644 --- a/PC/python3.def +++ b/PC/python3.def @@ -2,783 +2,713 @@ ; It is used when building python3dll.vcxproj LIBRARY "python3" EXPORTS - PyArg_Parse=python35.PyArg_Parse - PyArg_ParseTuple=python35.PyArg_ParseTuple - PyArg_ParseTupleAndKeywords=python35.PyArg_ParseTupleAndKeywords - PyArg_UnpackTuple=python35.PyArg_UnpackTuple - PyArg_VaParse=python35.PyArg_VaParse - PyArg_VaParseTupleAndKeywords=python35.PyArg_VaParseTupleAndKeywords - PyArg_ValidateKeywordArguments=python35.PyArg_ValidateKeywordArguments - PyBaseObject_Type=python35.PyBaseObject_Type DATA - PyBool_FromLong=python35.PyBool_FromLong - PyBool_Type=python35.PyBool_Type DATA - PyByteArrayIter_Type=python35.PyByteArrayIter_Type DATA - PyByteArray_AsString=python35.PyByteArray_AsString - PyByteArray_Concat=python35.PyByteArray_Concat - PyByteArray_FromObject=python35.PyByteArray_FromObject - PyByteArray_FromStringAndSize=python35.PyByteArray_FromStringAndSize - PyByteArray_Resize=python35.PyByteArray_Resize - PyByteArray_Size=python35.PyByteArray_Size - PyByteArray_Type=python35.PyByteArray_Type DATA - PyBytesIter_Type=python35.PyBytesIter_Type DATA - PyBytes_AsString=python35.PyBytes_AsString - PyBytes_AsStringAndSize=python35.PyBytes_AsStringAndSize - PyBytes_Concat=python35.PyBytes_Concat - PyBytes_ConcatAndDel=python35.PyBytes_ConcatAndDel - PyBytes_DecodeEscape=python35.PyBytes_DecodeEscape - PyBytes_FromFormat=python35.PyBytes_FromFormat - PyBytes_FromFormatV=python35.PyBytes_FromFormatV - PyBytes_FromObject=python35.PyBytes_FromObject - PyBytes_FromString=python35.PyBytes_FromString - PyBytes_FromStringAndSize=python35.PyBytes_FromStringAndSize - PyBytes_Repr=python35.PyBytes_Repr - PyBytes_Size=python35.PyBytes_Size - PyBytes_Type=python35.PyBytes_Type DATA - PyCFunction_Call=python35.PyCFunction_Call - PyCFunction_ClearFreeList=python35.PyCFunction_ClearFreeList - PyCFunction_GetFlags=python35.PyCFunction_GetFlags - PyCFunction_GetFunction=python35.PyCFunction_GetFunction - PyCFunction_GetSelf=python35.PyCFunction_GetSelf - PyCFunction_New=python35.PyCFunction_New - PyCFunction_NewEx=python35.PyCFunction_NewEx - PyCFunction_Type=python35.PyCFunction_Type DATA - PyCallIter_New=python35.PyCallIter_New - PyCallIter_Type=python35.PyCallIter_Type DATA - PyCallable_Check=python35.PyCallable_Check - PyCapsule_GetContext=python35.PyCapsule_GetContext - PyCapsule_GetDestructor=python35.PyCapsule_GetDestructor - PyCapsule_GetName=python35.PyCapsule_GetName - PyCapsule_GetPointer=python35.PyCapsule_GetPointer - PyCapsule_Import=python35.PyCapsule_Import - PyCapsule_IsValid=python35.PyCapsule_IsValid - PyCapsule_New=python35.PyCapsule_New - PyCapsule_SetContext=python35.PyCapsule_SetContext - PyCapsule_SetDestructor=python35.PyCapsule_SetDestructor - PyCapsule_SetName=python35.PyCapsule_SetName - PyCapsule_SetPointer=python35.PyCapsule_SetPointer - PyCapsule_Type=python35.PyCapsule_Type DATA - PyClassMethodDescr_Type=python35.PyClassMethodDescr_Type DATA - PyCodec_BackslashReplaceErrors=python35.PyCodec_BackslashReplaceErrors - PyCodec_Decode=python35.PyCodec_Decode - PyCodec_Decoder=python35.PyCodec_Decoder - PyCodec_Encode=python35.PyCodec_Encode - PyCodec_Encoder=python35.PyCodec_Encoder - PyCodec_IgnoreErrors=python35.PyCodec_IgnoreErrors - PyCodec_IncrementalDecoder=python35.PyCodec_IncrementalDecoder - PyCodec_IncrementalEncoder=python35.PyCodec_IncrementalEncoder - PyCodec_KnownEncoding=python35.PyCodec_KnownEncoding - PyCodec_LookupError=python35.PyCodec_LookupError - PyCodec_NameReplaceErrors=python35.PyCodec_NameReplaceErrors - PyCodec_Register=python35.PyCodec_Register - PyCodec_RegisterError=python35.PyCodec_RegisterError - PyCodec_ReplaceErrors=python35.PyCodec_ReplaceErrors - PyCodec_StreamReader=python35.PyCodec_StreamReader - PyCodec_StreamWriter=python35.PyCodec_StreamWriter - PyCodec_StrictErrors=python35.PyCodec_StrictErrors - PyCodec_XMLCharRefReplaceErrors=python35.PyCodec_XMLCharRefReplaceErrors - PyComplex_FromDoubles=python35.PyComplex_FromDoubles - PyComplex_ImagAsDouble=python35.PyComplex_ImagAsDouble - PyComplex_RealAsDouble=python35.PyComplex_RealAsDouble - PyComplex_Type=python35.PyComplex_Type DATA - PyDescr_NewClassMethod=python35.PyDescr_NewClassMethod - PyDescr_NewGetSet=python35.PyDescr_NewGetSet - PyDescr_NewMember=python35.PyDescr_NewMember - PyDescr_NewMethod=python35.PyDescr_NewMethod - PyDictItems_Type=python35.PyDictItems_Type DATA - PyDictIterItem_Type=python35.PyDictIterItem_Type DATA - PyDictIterKey_Type=python35.PyDictIterKey_Type DATA - PyDictIterValue_Type=python35.PyDictIterValue_Type DATA - PyDictKeys_Type=python35.PyDictKeys_Type DATA - PyDictProxy_New=python35.PyDictProxy_New - PyDictProxy_Type=python35.PyDictProxy_Type DATA - PyDictValues_Type=python35.PyDictValues_Type DATA - PyDict_Clear=python35.PyDict_Clear - PyDict_Contains=python35.PyDict_Contains - PyDict_Copy=python35.PyDict_Copy - PyDict_DelItem=python35.PyDict_DelItem - PyDict_DelItemString=python35.PyDict_DelItemString - PyDict_GetItem=python35.PyDict_GetItem - PyDict_GetItemString=python35.PyDict_GetItemString - PyDict_GetItemWithError=python35.PyDict_GetItemWithError - PyDict_Items=python35.PyDict_Items - PyDict_Keys=python35.PyDict_Keys - PyDict_Merge=python35.PyDict_Merge - PyDict_MergeFromSeq2=python35.PyDict_MergeFromSeq2 - PyDict_New=python35.PyDict_New - PyDict_Next=python35.PyDict_Next - PyDict_SetItem=python35.PyDict_SetItem - PyDict_SetItemString=python35.PyDict_SetItemString - PyDict_Size=python35.PyDict_Size - PyDict_Type=python35.PyDict_Type DATA - PyDict_Update=python35.PyDict_Update - PyDict_Values=python35.PyDict_Values - PyEllipsis_Type=python35.PyEllipsis_Type DATA - PyEnum_Type=python35.PyEnum_Type DATA - PyErr_BadArgument=python35.PyErr_BadArgument - PyErr_BadInternalCall=python35.PyErr_BadInternalCall - PyErr_CheckSignals=python35.PyErr_CheckSignals - PyErr_Clear=python35.PyErr_Clear - PyErr_Display=python35.PyErr_Display - PyErr_ExceptionMatches=python35.PyErr_ExceptionMatches - PyErr_Fetch=python35.PyErr_Fetch - PyErr_Format=python35.PyErr_Format - PyErr_FormatV=python35.PyErr_FormatV - PyErr_GetExcInfo=python35.PyErr_GetExcInfo - PyErr_GivenExceptionMatches=python35.PyErr_GivenExceptionMatches - PyErr_NewException=python35.PyErr_NewException - PyErr_NewExceptionWithDoc=python35.PyErr_NewExceptionWithDoc - PyErr_NoMemory=python35.PyErr_NoMemory - PyErr_NormalizeException=python35.PyErr_NormalizeException - PyErr_Occurred=python35.PyErr_Occurred - PyErr_Print=python35.PyErr_Print - PyErr_PrintEx=python35.PyErr_PrintEx - PyErr_ProgramText=python35.PyErr_ProgramText - PyErr_Restore=python35.PyErr_Restore - PyErr_SetExcFromWindowsErr=python35.PyErr_SetExcFromWindowsErr - PyErr_SetExcFromWindowsErrWithFilename=python35.PyErr_SetExcFromWindowsErrWithFilename - PyErr_SetExcFromWindowsErrWithFilenameObject=python35.PyErr_SetExcFromWindowsErrWithFilenameObject - PyErr_SetExcFromWindowsErrWithFilenameObjects=python35.PyErr_SetExcFromWindowsErrWithFilenameObjects - PyErr_SetExcInfo=python35.PyErr_SetExcInfo - PyErr_SetFromErrno=python35.PyErr_SetFromErrno - PyErr_SetFromErrnoWithFilename=python35.PyErr_SetFromErrnoWithFilename - PyErr_SetFromErrnoWithFilenameObject=python35.PyErr_SetFromErrnoWithFilenameObject - PyErr_SetFromErrnoWithFilenameObjects=python35.PyErr_SetFromErrnoWithFilenameObjects - PyErr_SetFromWindowsErr=python35.PyErr_SetFromWindowsErr - PyErr_SetFromWindowsErrWithFilename=python35.PyErr_SetFromWindowsErrWithFilename - PyErr_SetImportError=python35.PyErr_SetImportError - PyErr_SetInterrupt=python35.PyErr_SetInterrupt - PyErr_SetNone=python35.PyErr_SetNone - PyErr_SetObject=python35.PyErr_SetObject - PyErr_SetString=python35.PyErr_SetString - PyErr_SyntaxLocation=python35.PyErr_SyntaxLocation - PyErr_SyntaxLocationEx=python35.PyErr_SyntaxLocationEx - PyErr_WarnEx=python35.PyErr_WarnEx - PyErr_WarnExplicit=python35.PyErr_WarnExplicit - PyErr_WarnFormat=python35.PyErr_WarnFormat - PyErr_WriteUnraisable=python35.PyErr_WriteUnraisable - PyEval_AcquireLock=python35.PyEval_AcquireLock - PyEval_AcquireThread=python35.PyEval_AcquireThread - PyEval_CallFunction=python35.PyEval_CallFunction - PyEval_CallMethod=python35.PyEval_CallMethod - PyEval_CallObjectWithKeywords=python35.PyEval_CallObjectWithKeywords - PyEval_EvalCode=python35.PyEval_EvalCode - PyEval_EvalCodeEx=python35.PyEval_EvalCodeEx - PyEval_EvalFrame=python35.PyEval_EvalFrame - PyEval_EvalFrameEx=python35.PyEval_EvalFrameEx - PyEval_GetBuiltins=python35.PyEval_GetBuiltins - PyEval_GetCallStats=python35.PyEval_GetCallStats - PyEval_GetFrame=python35.PyEval_GetFrame - PyEval_GetFuncDesc=python35.PyEval_GetFuncDesc - PyEval_GetFuncName=python35.PyEval_GetFuncName - PyEval_GetGlobals=python35.PyEval_GetGlobals - PyEval_GetLocals=python35.PyEval_GetLocals - PyEval_InitThreads=python35.PyEval_InitThreads - PyEval_ReInitThreads=python35.PyEval_ReInitThreads - PyEval_ReleaseLock=python35.PyEval_ReleaseLock - PyEval_ReleaseThread=python35.PyEval_ReleaseThread - PyEval_RestoreThread=python35.PyEval_RestoreThread - PyEval_SaveThread=python35.PyEval_SaveThread - PyEval_ThreadsInitialized=python35.PyEval_ThreadsInitialized - PyExc_ArithmeticError=python35.PyExc_ArithmeticError DATA - PyExc_AssertionError=python35.PyExc_AssertionError DATA - PyExc_AttributeError=python35.PyExc_AttributeError DATA - PyExc_BaseException=python35.PyExc_BaseException DATA - PyExc_BlockingIOError=python35.PyExc_BlockingIOError DATA - PyExc_BrokenPipeError=python35.PyExc_BrokenPipeError DATA - PyExc_BufferError=python35.PyExc_BufferError DATA - PyExc_BytesWarning=python35.PyExc_BytesWarning DATA - PyExc_ChildProcessError=python35.PyExc_ChildProcessError DATA - PyExc_ConnectionAbortedError=python35.PyExc_ConnectionAbortedError DATA - PyExc_ConnectionError=python35.PyExc_ConnectionError DATA - PyExc_ConnectionRefusedError=python35.PyExc_ConnectionRefusedError DATA - PyExc_ConnectionResetError=python35.PyExc_ConnectionResetError DATA - PyExc_DeprecationWarning=python35.PyExc_DeprecationWarning DATA - PyExc_EOFError=python35.PyExc_EOFError DATA - PyExc_EnvironmentError=python35.PyExc_EnvironmentError DATA - PyExc_Exception=python35.PyExc_Exception DATA - PyExc_FileExistsError=python35.PyExc_FileExistsError DATA - PyExc_FileNotFoundError=python35.PyExc_FileNotFoundError DATA - PyExc_FloatingPointError=python35.PyExc_FloatingPointError DATA - PyExc_FutureWarning=python35.PyExc_FutureWarning DATA - PyExc_GeneratorExit=python35.PyExc_GeneratorExit DATA - PyExc_IOError=python35.PyExc_IOError DATA - PyExc_ImportError=python35.PyExc_ImportError DATA - PyExc_ImportWarning=python35.PyExc_ImportWarning DATA - PyExc_IndentationError=python35.PyExc_IndentationError DATA - PyExc_IndexError=python35.PyExc_IndexError DATA - PyExc_InterruptedError=python35.PyExc_InterruptedError DATA - PyExc_IsADirectoryError=python35.PyExc_IsADirectoryError DATA - PyExc_KeyError=python35.PyExc_KeyError DATA - PyExc_KeyboardInterrupt=python35.PyExc_KeyboardInterrupt DATA - PyExc_LookupError=python35.PyExc_LookupError DATA - PyExc_MemoryError=python35.PyExc_MemoryError DATA - PyExc_NameError=python35.PyExc_NameError DATA - PyExc_NotADirectoryError=python35.PyExc_NotADirectoryError DATA - PyExc_NotImplementedError=python35.PyExc_NotImplementedError DATA - PyExc_OSError=python35.PyExc_OSError DATA - PyExc_OverflowError=python35.PyExc_OverflowError DATA - PyExc_PendingDeprecationWarning=python35.PyExc_PendingDeprecationWarning DATA - PyExc_PermissionError=python35.PyExc_PermissionError DATA - PyExc_ProcessLookupError=python35.PyExc_ProcessLookupError DATA - PyExc_RecursionError=python35.PyExc_RecursionError DATA - PyExc_RecursionErrorInst=python35.PyExc_RecursionErrorInst DATA - PyExc_ReferenceError=python35.PyExc_ReferenceError DATA - PyExc_ResourceWarning=python35.PyExc_ResourceWarning DATA - PyExc_RuntimeError=python35.PyExc_RuntimeError DATA - PyExc_RuntimeWarning=python35.PyExc_RuntimeWarning DATA - PyExc_StopAsyncIteration=python35.PyExc_StopAsyncIteration DATA - PyExc_StopIteration=python35.PyExc_StopIteration DATA - PyExc_SyntaxError=python35.PyExc_SyntaxError DATA - PyExc_SyntaxWarning=python35.PyExc_SyntaxWarning DATA - PyExc_SystemError=python35.PyExc_SystemError DATA - PyExc_SystemExit=python35.PyExc_SystemExit DATA - PyExc_TabError=python35.PyExc_TabError DATA - PyExc_TimeoutError=python35.PyExc_TimeoutError DATA - PyExc_TypeError=python35.PyExc_TypeError DATA - PyExc_UnboundLocalError=python35.PyExc_UnboundLocalError DATA - PyExc_UnicodeDecodeError=python35.PyExc_UnicodeDecodeError DATA - PyExc_UnicodeEncodeError=python35.PyExc_UnicodeEncodeError DATA - PyExc_UnicodeError=python35.PyExc_UnicodeError DATA - PyExc_UnicodeTranslateError=python35.PyExc_UnicodeTranslateError DATA - PyExc_UnicodeWarning=python35.PyExc_UnicodeWarning DATA - PyExc_UserWarning=python35.PyExc_UserWarning DATA - PyExc_ValueError=python35.PyExc_ValueError DATA - PyExc_Warning=python35.PyExc_Warning DATA - PyExc_WindowsError=python35.PyExc_WindowsError DATA - PyExc_ZeroDivisionError=python35.PyExc_ZeroDivisionError DATA - PyException_GetCause=python35.PyException_GetCause - PyException_GetContext=python35.PyException_GetContext - PyException_GetTraceback=python35.PyException_GetTraceback - PyException_SetCause=python35.PyException_SetCause - PyException_SetContext=python35.PyException_SetContext - PyException_SetTraceback=python35.PyException_SetTraceback - PyFile_FromFd=python35.PyFile_FromFd - PyFile_GetLine=python35.PyFile_GetLine - PyFile_WriteObject=python35.PyFile_WriteObject - PyFile_WriteString=python35.PyFile_WriteString - PyFilter_Type=python35.PyFilter_Type DATA - PyFloat_AsDouble=python35.PyFloat_AsDouble - PyFloat_FromDouble=python35.PyFloat_FromDouble - PyFloat_FromString=python35.PyFloat_FromString - PyFloat_GetInfo=python35.PyFloat_GetInfo - PyFloat_GetMax=python35.PyFloat_GetMax - PyFloat_GetMin=python35.PyFloat_GetMin - PyFloat_Type=python35.PyFloat_Type DATA - PyFrozenSet_New=python35.PyFrozenSet_New - PyFrozenSet_Type=python35.PyFrozenSet_Type DATA - PyGC_Collect=python35.PyGC_Collect - PyGILState_Ensure=python35.PyGILState_Ensure - PyGILState_GetThisThreadState=python35.PyGILState_GetThisThreadState - PyGILState_Release=python35.PyGILState_Release - PyGetSetDescr_Type=python35.PyGetSetDescr_Type DATA - PyImport_AddModule=python35.PyImport_AddModule - PyImport_AddModuleObject=python35.PyImport_AddModuleObject - PyImport_AppendInittab=python35.PyImport_AppendInittab - PyImport_Cleanup=python35.PyImport_Cleanup - PyImport_ExecCodeModule=python35.PyImport_ExecCodeModule - PyImport_ExecCodeModuleEx=python35.PyImport_ExecCodeModuleEx - PyImport_ExecCodeModuleObject=python35.PyImport_ExecCodeModuleObject - PyImport_ExecCodeModuleWithPathnames=python35.PyImport_ExecCodeModuleWithPathnames - PyImport_GetImporter=python35.PyImport_GetImporter - PyImport_GetMagicNumber=python35.PyImport_GetMagicNumber - PyImport_GetMagicTag=python35.PyImport_GetMagicTag - PyImport_GetModuleDict=python35.PyImport_GetModuleDict - PyImport_Import=python35.PyImport_Import - PyImport_ImportFrozenModule=python35.PyImport_ImportFrozenModule - PyImport_ImportFrozenModuleObject=python35.PyImport_ImportFrozenModuleObject - PyImport_ImportModule=python35.PyImport_ImportModule - PyImport_ImportModuleLevel=python35.PyImport_ImportModuleLevel - PyImport_ImportModuleLevelObject=python35.PyImport_ImportModuleLevelObject - PyImport_ImportModuleNoBlock=python35.PyImport_ImportModuleNoBlock - PyImport_ReloadModule=python35.PyImport_ReloadModule - PyInterpreterState_Clear=python35.PyInterpreterState_Clear - PyInterpreterState_Delete=python35.PyInterpreterState_Delete - PyInterpreterState_New=python35.PyInterpreterState_New - PyIter_Next=python35.PyIter_Next - PyListIter_Type=python35.PyListIter_Type DATA - PyListRevIter_Type=python35.PyListRevIter_Type DATA - PyList_Append=python35.PyList_Append - PyList_AsTuple=python35.PyList_AsTuple - PyList_GetItem=python35.PyList_GetItem - PyList_GetSlice=python35.PyList_GetSlice - PyList_Insert=python35.PyList_Insert - PyList_New=python35.PyList_New - PyList_Reverse=python35.PyList_Reverse - PyList_SetItem=python35.PyList_SetItem - PyList_SetSlice=python35.PyList_SetSlice - PyList_Size=python35.PyList_Size - PyList_Sort=python35.PyList_Sort - PyList_Type=python35.PyList_Type DATA - PyLongRangeIter_Type=python35.PyLongRangeIter_Type DATA - PyLong_AsDouble=python35.PyLong_AsDouble - PyLong_AsLong=python35.PyLong_AsLong - PyLong_AsLongAndOverflow=python35.PyLong_AsLongAndOverflow - PyLong_AsLongLong=python35.PyLong_AsLongLong - PyLong_AsLongLongAndOverflow=python35.PyLong_AsLongLongAndOverflow - PyLong_AsSize_t=python35.PyLong_AsSize_t - PyLong_AsSsize_t=python35.PyLong_AsSsize_t - PyLong_AsUnsignedLong=python35.PyLong_AsUnsignedLong - PyLong_AsUnsignedLongLong=python35.PyLong_AsUnsignedLongLong - PyLong_AsUnsignedLongLongMask=python35.PyLong_AsUnsignedLongLongMask - PyLong_AsUnsignedLongMask=python35.PyLong_AsUnsignedLongMask - PyLong_AsVoidPtr=python35.PyLong_AsVoidPtr - PyLong_FromDouble=python35.PyLong_FromDouble - PyLong_FromLong=python35.PyLong_FromLong - PyLong_FromLongLong=python35.PyLong_FromLongLong - PyLong_FromSize_t=python35.PyLong_FromSize_t - PyLong_FromSsize_t=python35.PyLong_FromSsize_t - PyLong_FromString=python35.PyLong_FromString - PyLong_FromUnsignedLong=python35.PyLong_FromUnsignedLong - PyLong_FromUnsignedLongLong=python35.PyLong_FromUnsignedLongLong - PyLong_FromVoidPtr=python35.PyLong_FromVoidPtr - PyLong_GetInfo=python35.PyLong_GetInfo - PyLong_Type=python35.PyLong_Type DATA - PyMap_Type=python35.PyMap_Type DATA - PyMapping_Check=python35.PyMapping_Check - PyMapping_GetItemString=python35.PyMapping_GetItemString - PyMapping_HasKey=python35.PyMapping_HasKey - PyMapping_HasKeyString=python35.PyMapping_HasKeyString - PyMapping_Items=python35.PyMapping_Items - PyMapping_Keys=python35.PyMapping_Keys - PyMapping_Length=python35.PyMapping_Length - PyMapping_SetItemString=python35.PyMapping_SetItemString - PyMapping_Size=python35.PyMapping_Size - PyMapping_Values=python35.PyMapping_Values - PyMem_Calloc=python35.PyMem_Calloc - PyMem_Free=python35.PyMem_Free - PyMem_Malloc=python35.PyMem_Malloc - PyMem_Realloc=python35.PyMem_Realloc - PyMemberDescr_Type=python35.PyMemberDescr_Type DATA - PyMemoryView_FromMemory=python35.PyMemoryView_FromMemory - PyMemoryView_FromObject=python35.PyMemoryView_FromObject - PyMemoryView_GetContiguous=python35.PyMemoryView_GetContiguous - PyMemoryView_Type=python35.PyMemoryView_Type DATA - PyMethodDescr_Type=python35.PyMethodDescr_Type DATA - PyModuleDef_Init=python35.PyModuleDef_Init - PyModuleDef_Type=python35.PyModuleDef_Type DATA - PyModule_AddFunctions=python35.PyModule_AddFunctions - PyModule_AddIntConstant=python35.PyModule_AddIntConstant - PyModule_AddObject=python35.PyModule_AddObject - PyModule_AddStringConstant=python35.PyModule_AddStringConstant - PyModule_Create2=python35.PyModule_Create2 - PyModule_ExecDef=python35.PyModule_ExecDef - PyModule_FromDefAndSpec2=python35.PyModule_FromDefAndSpec2 - PyModule_GetDef=python35.PyModule_GetDef - PyModule_GetDict=python35.PyModule_GetDict - PyModule_GetFilename=python35.PyModule_GetFilename - PyModule_GetFilenameObject=python35.PyModule_GetFilenameObject - PyModule_GetName=python35.PyModule_GetName - PyModule_GetNameObject=python35.PyModule_GetNameObject - PyModule_GetState=python35.PyModule_GetState - PyModule_New=python35.PyModule_New - PyModule_NewObject=python35.PyModule_NewObject - PyModule_SetDocString=python35.PyModule_SetDocString - PyModule_Type=python35.PyModule_Type DATA - PyNullImporter_Type=python35.PyNullImporter_Type DATA - PyNumber_Absolute=python35.PyNumber_Absolute - PyNumber_Add=python35.PyNumber_Add - PyNumber_And=python35.PyNumber_And - PyNumber_AsSsize_t=python35.PyNumber_AsSsize_t - PyNumber_Check=python35.PyNumber_Check - PyNumber_Divmod=python35.PyNumber_Divmod - PyNumber_Float=python35.PyNumber_Float - PyNumber_FloorDivide=python35.PyNumber_FloorDivide - PyNumber_InPlaceAdd=python35.PyNumber_InPlaceAdd - PyNumber_InPlaceAnd=python35.PyNumber_InPlaceAnd - PyNumber_InPlaceFloorDivide=python35.PyNumber_InPlaceFloorDivide - PyNumber_InPlaceLshift=python35.PyNumber_InPlaceLshift - PyNumber_InPlaceMatrixMultiply=python35.PyNumber_InPlaceMatrixMultiply - PyNumber_InPlaceMultiply=python35.PyNumber_InPlaceMultiply - PyNumber_InPlaceOr=python35.PyNumber_InPlaceOr - PyNumber_InPlacePower=python35.PyNumber_InPlacePower - PyNumber_InPlaceRemainder=python35.PyNumber_InPlaceRemainder - PyNumber_InPlaceRshift=python35.PyNumber_InPlaceRshift - PyNumber_InPlaceSubtract=python35.PyNumber_InPlaceSubtract - PyNumber_InPlaceTrueDivide=python35.PyNumber_InPlaceTrueDivide - PyNumber_InPlaceXor=python35.PyNumber_InPlaceXor - PyNumber_Index=python35.PyNumber_Index - PyNumber_Invert=python35.PyNumber_Invert - PyNumber_Long=python35.PyNumber_Long - PyNumber_Lshift=python35.PyNumber_Lshift - PyNumber_MatrixMultiply=python35.PyNumber_MatrixMultiply - PyNumber_Multiply=python35.PyNumber_Multiply - PyNumber_Negative=python35.PyNumber_Negative - PyNumber_Or=python35.PyNumber_Or - PyNumber_Positive=python35.PyNumber_Positive - PyNumber_Power=python35.PyNumber_Power - PyNumber_Remainder=python35.PyNumber_Remainder - PyNumber_Rshift=python35.PyNumber_Rshift - PyNumber_Subtract=python35.PyNumber_Subtract - PyNumber_ToBase=python35.PyNumber_ToBase - PyNumber_TrueDivide=python35.PyNumber_TrueDivide - PyNumber_Xor=python35.PyNumber_Xor - PyODictItems_Type=python35.PyODictItems_Type DATA - PyODictIter_Type=python35.PyODictIter_Type DATA - PyODictKeys_Type=python35.PyODictKeys_Type DATA - PyODictValues_Type=python35.PyODictValues_Type DATA - PyODict_DelItem=python35.PyODict_DelItem - PyODict_New=python35.PyODict_New - PyODict_SetItem=python35.PyODict_SetItem - PyODict_Type=python35.PyODict_Type DATA - PyOS_AfterFork=python35.PyOS_AfterFork - PyOS_CheckStack=python35.PyOS_CheckStack - PyOS_InitInterrupts=python35.PyOS_InitInterrupts - PyOS_InputHook=python35.PyOS_InputHook DATA - PyOS_InterruptOccurred=python35.PyOS_InterruptOccurred - PyOS_ReadlineFunctionPointer=python35.PyOS_ReadlineFunctionPointer DATA - PyOS_double_to_string=python35.PyOS_double_to_string - PyOS_getsig=python35.PyOS_getsig - PyOS_mystricmp=python35.PyOS_mystricmp - PyOS_mystrnicmp=python35.PyOS_mystrnicmp - PyOS_setsig=python35.PyOS_setsig - PyOS_snprintf=python35.PyOS_snprintf - PyOS_string_to_double=python35.PyOS_string_to_double - PyOS_strtol=python35.PyOS_strtol - PyOS_strtoul=python35.PyOS_strtoul - PyOS_vsnprintf=python35.PyOS_vsnprintf - PyObject_ASCII=python35.PyObject_ASCII - PyObject_AsCharBuffer=python35.PyObject_AsCharBuffer - PyObject_AsFileDescriptor=python35.PyObject_AsFileDescriptor - PyObject_AsReadBuffer=python35.PyObject_AsReadBuffer - PyObject_AsWriteBuffer=python35.PyObject_AsWriteBuffer - PyObject_Bytes=python35.PyObject_Bytes - PyObject_Call=python35.PyObject_Call - PyObject_CallFunction=python35.PyObject_CallFunction - PyObject_CallFunctionObjArgs=python35.PyObject_CallFunctionObjArgs - PyObject_CallMethod=python35.PyObject_CallMethod - PyObject_CallMethodObjArgs=python35.PyObject_CallMethodObjArgs - PyObject_CallObject=python35.PyObject_CallObject - PyObject_Calloc=python35.PyObject_Calloc - PyObject_CheckReadBuffer=python35.PyObject_CheckReadBuffer - PyObject_ClearWeakRefs=python35.PyObject_ClearWeakRefs - PyObject_DelItem=python35.PyObject_DelItem - PyObject_DelItemString=python35.PyObject_DelItemString - PyObject_Dir=python35.PyObject_Dir - PyObject_Format=python35.PyObject_Format - PyObject_Free=python35.PyObject_Free - PyObject_GC_Del=python35.PyObject_GC_Del - PyObject_GC_Track=python35.PyObject_GC_Track - PyObject_GC_UnTrack=python35.PyObject_GC_UnTrack - PyObject_GenericGetAttr=python35.PyObject_GenericGetAttr - PyObject_GenericSetAttr=python35.PyObject_GenericSetAttr - PyObject_GenericSetDict=python35.PyObject_GenericSetDict - PyObject_GetAttr=python35.PyObject_GetAttr - PyObject_GetAttrString=python35.PyObject_GetAttrString - PyObject_GetItem=python35.PyObject_GetItem - PyObject_GetIter=python35.PyObject_GetIter - PyObject_HasAttr=python35.PyObject_HasAttr - PyObject_HasAttrString=python35.PyObject_HasAttrString - PyObject_Hash=python35.PyObject_Hash - PyObject_HashNotImplemented=python35.PyObject_HashNotImplemented - PyObject_Init=python35.PyObject_Init - PyObject_InitVar=python35.PyObject_InitVar - PyObject_IsInstance=python35.PyObject_IsInstance - PyObject_IsSubclass=python35.PyObject_IsSubclass - PyObject_IsTrue=python35.PyObject_IsTrue - PyObject_Length=python35.PyObject_Length - PyObject_Malloc=python35.PyObject_Malloc - PyObject_Not=python35.PyObject_Not - PyObject_Realloc=python35.PyObject_Realloc - PyObject_Repr=python35.PyObject_Repr - PyObject_RichCompare=python35.PyObject_RichCompare - PyObject_RichCompareBool=python35.PyObject_RichCompareBool - PyObject_SelfIter=python35.PyObject_SelfIter - PyObject_SetAttr=python35.PyObject_SetAttr - PyObject_SetAttrString=python35.PyObject_SetAttrString - PyObject_SetItem=python35.PyObject_SetItem - PyObject_Size=python35.PyObject_Size - PyObject_Str=python35.PyObject_Str - PyObject_Type=python35.PyObject_Type - PyParser_SimpleParseFileFlags=python35.PyParser_SimpleParseFileFlags - PyParser_SimpleParseStringFlags=python35.PyParser_SimpleParseStringFlags - PyParser_SimpleParseStringFlagsFilename=python35.PyParser_SimpleParseStringFlagsFilename - PyProperty_Type=python35.PyProperty_Type DATA - PyRangeIter_Type=python35.PyRangeIter_Type DATA - PyRange_Type=python35.PyRange_Type DATA - PyReversed_Type=python35.PyReversed_Type DATA - PySeqIter_New=python35.PySeqIter_New - PySeqIter_Type=python35.PySeqIter_Type DATA - PySequence_Check=python35.PySequence_Check - PySequence_Concat=python35.PySequence_Concat - PySequence_Contains=python35.PySequence_Contains - PySequence_Count=python35.PySequence_Count - PySequence_DelItem=python35.PySequence_DelItem - PySequence_DelSlice=python35.PySequence_DelSlice - PySequence_Fast=python35.PySequence_Fast - PySequence_GetItem=python35.PySequence_GetItem - PySequence_GetSlice=python35.PySequence_GetSlice - PySequence_In=python35.PySequence_In - PySequence_InPlaceConcat=python35.PySequence_InPlaceConcat - PySequence_InPlaceRepeat=python35.PySequence_InPlaceRepeat - PySequence_Index=python35.PySequence_Index - PySequence_Length=python35.PySequence_Length - PySequence_List=python35.PySequence_List - PySequence_Repeat=python35.PySequence_Repeat - PySequence_SetItem=python35.PySequence_SetItem - PySequence_SetSlice=python35.PySequence_SetSlice - PySequence_Size=python35.PySequence_Size - PySequence_Tuple=python35.PySequence_Tuple - PySetIter_Type=python35.PySetIter_Type DATA - PySet_Add=python35.PySet_Add - PySet_Clear=python35.PySet_Clear - PySet_Contains=python35.PySet_Contains - PySet_Discard=python35.PySet_Discard - PySet_New=python35.PySet_New - PySet_Pop=python35.PySet_Pop - PySet_Size=python35.PySet_Size - PySet_Type=python35.PySet_Type DATA - PySlice_AdjustIndices=python35.PySlice_AdjustIndices - PySlice_GetIndices=python35.PySlice_GetIndices - PySlice_GetIndicesEx=python35.PySlice_GetIndicesEx - PySlice_New=python35.PySlice_New - PySlice_Type=python35.PySlice_Type DATA - PySlice_Unpack=python35.PySlice_Unpack - PySortWrapper_Type=python35.PySortWrapper_Type DATA - PyState_AddModule=python35.PyState_AddModule - PyState_FindModule=python35.PyState_FindModule - PyState_RemoveModule=python35.PyState_RemoveModule - PyStructSequence_GetItem=python35.PyStructSequence_GetItem - PyStructSequence_New=python35.PyStructSequence_New - PyStructSequence_NewType=python35.PyStructSequence_NewType - PyStructSequence_SetItem=python35.PyStructSequence_SetItem - PySuper_Type=python35.PySuper_Type DATA - PySys_AddWarnOption=python35.PySys_AddWarnOption - PySys_AddWarnOptionUnicode=python35.PySys_AddWarnOptionUnicode - PySys_AddXOption=python35.PySys_AddXOption - PySys_FormatStderr=python35.PySys_FormatStderr - PySys_FormatStdout=python35.PySys_FormatStdout - PySys_GetObject=python35.PySys_GetObject - PySys_GetXOptions=python35.PySys_GetXOptions - PySys_HasWarnOptions=python35.PySys_HasWarnOptions - PySys_ResetWarnOptions=python35.PySys_ResetWarnOptions - PySys_SetArgv=python35.PySys_SetArgv - PySys_SetArgvEx=python35.PySys_SetArgvEx - PySys_SetObject=python35.PySys_SetObject - PySys_SetPath=python35.PySys_SetPath - PySys_WriteStderr=python35.PySys_WriteStderr - PySys_WriteStdout=python35.PySys_WriteStdout - PyThreadState_Clear=python35.PyThreadState_Clear - PyThreadState_Delete=python35.PyThreadState_Delete - PyThreadState_DeleteCurrent=python35.PyThreadState_DeleteCurrent - PyThreadState_Get=python35.PyThreadState_Get - PyThreadState_GetDict=python35.PyThreadState_GetDict - PyThreadState_New=python35.PyThreadState_New - PyThreadState_SetAsyncExc=python35.PyThreadState_SetAsyncExc - PyThreadState_Swap=python35.PyThreadState_Swap - PyTraceBack_Here=python35.PyTraceBack_Here - PyTraceBack_Print=python35.PyTraceBack_Print - PyTraceBack_Type=python35.PyTraceBack_Type DATA - PyTupleIter_Type=python35.PyTupleIter_Type DATA - PyTuple_ClearFreeList=python35.PyTuple_ClearFreeList - PyTuple_GetItem=python35.PyTuple_GetItem - PyTuple_GetSlice=python35.PyTuple_GetSlice - PyTuple_New=python35.PyTuple_New - PyTuple_Pack=python35.PyTuple_Pack - PyTuple_SetItem=python35.PyTuple_SetItem - PyTuple_Size=python35.PyTuple_Size - PyTuple_Type=python35.PyTuple_Type DATA - PyType_ClearCache=python35.PyType_ClearCache - PyType_FromSpec=python35.PyType_FromSpec - PyType_FromSpecWithBases=python35.PyType_FromSpecWithBases - PyType_GenericAlloc=python35.PyType_GenericAlloc - PyType_GenericNew=python35.PyType_GenericNew - PyType_GetFlags=python35.PyType_GetFlags - PyType_GetSlot=python35.PyType_GetSlot - PyType_IsSubtype=python35.PyType_IsSubtype - PyType_Modified=python35.PyType_Modified - PyType_Ready=python35.PyType_Ready - PyType_Type=python35.PyType_Type DATA - PyUnicodeDecodeError_Create=python35.PyUnicodeDecodeError_Create - PyUnicodeDecodeError_GetEncoding=python35.PyUnicodeDecodeError_GetEncoding - PyUnicodeDecodeError_GetEnd=python35.PyUnicodeDecodeError_GetEnd - PyUnicodeDecodeError_GetObject=python35.PyUnicodeDecodeError_GetObject - PyUnicodeDecodeError_GetReason=python35.PyUnicodeDecodeError_GetReason - PyUnicodeDecodeError_GetStart=python35.PyUnicodeDecodeError_GetStart - PyUnicodeDecodeError_SetEnd=python35.PyUnicodeDecodeError_SetEnd - PyUnicodeDecodeError_SetReason=python35.PyUnicodeDecodeError_SetReason - PyUnicodeDecodeError_SetStart=python35.PyUnicodeDecodeError_SetStart - PyUnicodeEncodeError_GetEncoding=python35.PyUnicodeEncodeError_GetEncoding - PyUnicodeEncodeError_GetEnd=python35.PyUnicodeEncodeError_GetEnd - PyUnicodeEncodeError_GetObject=python35.PyUnicodeEncodeError_GetObject - PyUnicodeEncodeError_GetReason=python35.PyUnicodeEncodeError_GetReason - PyUnicodeEncodeError_GetStart=python35.PyUnicodeEncodeError_GetStart - PyUnicodeEncodeError_SetEnd=python35.PyUnicodeEncodeError_SetEnd - PyUnicodeEncodeError_SetReason=python35.PyUnicodeEncodeError_SetReason - PyUnicodeEncodeError_SetStart=python35.PyUnicodeEncodeError_SetStart - PyUnicodeIter_Type=python35.PyUnicodeIter_Type DATA - PyUnicodeTranslateError_GetEnd=python35.PyUnicodeTranslateError_GetEnd - PyUnicodeTranslateError_GetObject=python35.PyUnicodeTranslateError_GetObject - PyUnicodeTranslateError_GetReason=python35.PyUnicodeTranslateError_GetReason - PyUnicodeTranslateError_GetStart=python35.PyUnicodeTranslateError_GetStart - PyUnicodeTranslateError_SetEnd=python35.PyUnicodeTranslateError_SetEnd - PyUnicodeTranslateError_SetReason=python35.PyUnicodeTranslateError_SetReason - PyUnicodeTranslateError_SetStart=python35.PyUnicodeTranslateError_SetStart - PyUnicode_Append=python35.PyUnicode_Append - PyUnicode_AppendAndDel=python35.PyUnicode_AppendAndDel - PyUnicode_AsASCIIString=python35.PyUnicode_AsASCIIString - PyUnicode_AsCharmapString=python35.PyUnicode_AsCharmapString - PyUnicode_AsDecodedObject=python35.PyUnicode_AsDecodedObject - PyUnicode_AsDecodedUnicode=python35.PyUnicode_AsDecodedUnicode - PyUnicode_AsEncodedObject=python35.PyUnicode_AsEncodedObject - PyUnicode_AsEncodedString=python35.PyUnicode_AsEncodedString - PyUnicode_AsEncodedUnicode=python35.PyUnicode_AsEncodedUnicode - PyUnicode_AsLatin1String=python35.PyUnicode_AsLatin1String - PyUnicode_AsMBCSString=python35.PyUnicode_AsMBCSString - PyUnicode_AsRawUnicodeEscapeString=python35.PyUnicode_AsRawUnicodeEscapeString - PyUnicode_AsUCS4=python35.PyUnicode_AsUCS4 - PyUnicode_AsUCS4Copy=python35.PyUnicode_AsUCS4Copy - PyUnicode_AsUTF16String=python35.PyUnicode_AsUTF16String - PyUnicode_AsUTF32String=python35.PyUnicode_AsUTF32String - PyUnicode_AsUTF8String=python35.PyUnicode_AsUTF8String - PyUnicode_AsUnicodeEscapeString=python35.PyUnicode_AsUnicodeEscapeString - PyUnicode_AsWideChar=python35.PyUnicode_AsWideChar - PyUnicode_AsWideCharString=python35.PyUnicode_AsWideCharString - PyUnicode_BuildEncodingMap=python35.PyUnicode_BuildEncodingMap - PyUnicode_ClearFreeList=python35.PyUnicode_ClearFreeList - PyUnicode_Compare=python35.PyUnicode_Compare - PyUnicode_CompareWithASCIIString=python35.PyUnicode_CompareWithASCIIString - PyUnicode_Concat=python35.PyUnicode_Concat - PyUnicode_Contains=python35.PyUnicode_Contains - PyUnicode_Count=python35.PyUnicode_Count - PyUnicode_Decode=python35.PyUnicode_Decode - PyUnicode_DecodeASCII=python35.PyUnicode_DecodeASCII - PyUnicode_DecodeCharmap=python35.PyUnicode_DecodeCharmap - PyUnicode_DecodeCodePageStateful=python35.PyUnicode_DecodeCodePageStateful - PyUnicode_DecodeFSDefault=python35.PyUnicode_DecodeFSDefault - PyUnicode_DecodeFSDefaultAndSize=python35.PyUnicode_DecodeFSDefaultAndSize - PyUnicode_DecodeLatin1=python35.PyUnicode_DecodeLatin1 - PyUnicode_DecodeLocale=python35.PyUnicode_DecodeLocale - PyUnicode_DecodeLocaleAndSize=python35.PyUnicode_DecodeLocaleAndSize - PyUnicode_DecodeMBCS=python35.PyUnicode_DecodeMBCS - PyUnicode_DecodeMBCSStateful=python35.PyUnicode_DecodeMBCSStateful - PyUnicode_DecodeRawUnicodeEscape=python35.PyUnicode_DecodeRawUnicodeEscape - PyUnicode_DecodeUTF16=python35.PyUnicode_DecodeUTF16 - PyUnicode_DecodeUTF16Stateful=python35.PyUnicode_DecodeUTF16Stateful - PyUnicode_DecodeUTF32=python35.PyUnicode_DecodeUTF32 - PyUnicode_DecodeUTF32Stateful=python35.PyUnicode_DecodeUTF32Stateful - PyUnicode_DecodeUTF7=python35.PyUnicode_DecodeUTF7 - PyUnicode_DecodeUTF7Stateful=python35.PyUnicode_DecodeUTF7Stateful - PyUnicode_DecodeUTF8=python35.PyUnicode_DecodeUTF8 - PyUnicode_DecodeUTF8Stateful=python35.PyUnicode_DecodeUTF8Stateful - PyUnicode_DecodeUnicodeEscape=python35.PyUnicode_DecodeUnicodeEscape - PyUnicode_EncodeCodePage=python35.PyUnicode_EncodeCodePage - PyUnicode_EncodeFSDefault=python35.PyUnicode_EncodeFSDefault - PyUnicode_EncodeLocale=python35.PyUnicode_EncodeLocale - PyUnicode_FSConverter=python35.PyUnicode_FSConverter - PyUnicode_FSDecoder=python35.PyUnicode_FSDecoder - PyUnicode_Find=python35.PyUnicode_Find - PyUnicode_FindChar=python35.PyUnicode_FindChar - PyUnicode_Format=python35.PyUnicode_Format - PyUnicode_FromEncodedObject=python35.PyUnicode_FromEncodedObject - PyUnicode_FromFormat=python35.PyUnicode_FromFormat - PyUnicode_FromFormatV=python35.PyUnicode_FromFormatV - PyUnicode_FromObject=python35.PyUnicode_FromObject - PyUnicode_FromOrdinal=python35.PyUnicode_FromOrdinal - PyUnicode_FromString=python35.PyUnicode_FromString - PyUnicode_FromStringAndSize=python35.PyUnicode_FromStringAndSize - PyUnicode_FromWideChar=python35.PyUnicode_FromWideChar - PyUnicode_GetDefaultEncoding=python35.PyUnicode_GetDefaultEncoding - PyUnicode_GetLength=python35.PyUnicode_GetLength - PyUnicode_GetSize=python35.PyUnicode_GetSize - PyUnicode_InternFromString=python35.PyUnicode_InternFromString - PyUnicode_InternImmortal=python35.PyUnicode_InternImmortal - PyUnicode_InternInPlace=python35.PyUnicode_InternInPlace - PyUnicode_IsIdentifier=python35.PyUnicode_IsIdentifier - PyUnicode_Join=python35.PyUnicode_Join - PyUnicode_Partition=python35.PyUnicode_Partition - PyUnicode_RPartition=python35.PyUnicode_RPartition - PyUnicode_RSplit=python35.PyUnicode_RSplit - PyUnicode_ReadChar=python35.PyUnicode_ReadChar - PyUnicode_Replace=python35.PyUnicode_Replace - PyUnicode_Resize=python35.PyUnicode_Resize - PyUnicode_RichCompare=python35.PyUnicode_RichCompare - PyUnicode_Split=python35.PyUnicode_Split - PyUnicode_Splitlines=python35.PyUnicode_Splitlines - PyUnicode_Substring=python35.PyUnicode_Substring - PyUnicode_Tailmatch=python35.PyUnicode_Tailmatch - PyUnicode_Translate=python35.PyUnicode_Translate - PyUnicode_Type=python35.PyUnicode_Type DATA - PyUnicode_WriteChar=python35.PyUnicode_WriteChar - PyWeakref_GetObject=python35.PyWeakref_GetObject - PyWeakref_NewProxy=python35.PyWeakref_NewProxy - PyWeakref_NewRef=python35.PyWeakref_NewRef - PyWrapperDescr_Type=python35.PyWrapperDescr_Type DATA - PyWrapper_New=python35.PyWrapper_New - PyZip_Type=python35.PyZip_Type DATA - Py_AddPendingCall=python35.Py_AddPendingCall - Py_AtExit=python35.Py_AtExit - Py_BuildValue=python35.Py_BuildValue - Py_CompileString=python35.Py_CompileString - Py_DecRef=python35.Py_DecRef - Py_DecodeLocale=python35.Py_DecodeLocale - Py_EncodeLocale=python35.Py_EncodeLocale - Py_EndInterpreter=python35.Py_EndInterpreter - Py_Exit=python35.Py_Exit - Py_FatalError=python35.Py_FatalError - Py_FileSystemDefaultEncoding=python35.Py_FileSystemDefaultEncoding DATA - Py_Finalize=python35.Py_Finalize - Py_GetBuildInfo=python35.Py_GetBuildInfo - Py_GetCompiler=python35.Py_GetCompiler - Py_GetCopyright=python35.Py_GetCopyright - Py_GetExecPrefix=python35.Py_GetExecPrefix - Py_GetPath=python35.Py_GetPath - Py_GetPlatform=python35.Py_GetPlatform - Py_GetPrefix=python35.Py_GetPrefix - Py_GetProgramFullPath=python35.Py_GetProgramFullPath - Py_GetProgramName=python35.Py_GetProgramName - Py_GetPythonHome=python35.Py_GetPythonHome - Py_GetRecursionLimit=python35.Py_GetRecursionLimit - Py_GetVersion=python35.Py_GetVersion - Py_HasFileSystemDefaultEncoding=python35.Py_HasFileSystemDefaultEncoding DATA - Py_IncRef=python35.Py_IncRef - Py_Initialize=python35.Py_Initialize - Py_InitializeEx=python35.Py_InitializeEx - Py_IsInitialized=python35.Py_IsInitialized - Py_Main=python35.Py_Main - Py_MakePendingCalls=python35.Py_MakePendingCalls - Py_NewInterpreter=python35.Py_NewInterpreter - Py_ReprEnter=python35.Py_ReprEnter - Py_ReprLeave=python35.Py_ReprLeave - Py_SetPath=python35.Py_SetPath - Py_SetProgramName=python35.Py_SetProgramName - Py_SetPythonHome=python35.Py_SetPythonHome - Py_SetRecursionLimit=python35.Py_SetRecursionLimit - Py_SymtableString=python35.Py_SymtableString - Py_VaBuildValue=python35.Py_VaBuildValue - _PyArg_ParseTupleAndKeywords_SizeT=python35._PyArg_ParseTupleAndKeywords_SizeT - _PyArg_ParseTuple_SizeT=python35._PyArg_ParseTuple_SizeT - _PyArg_Parse_SizeT=python35._PyArg_Parse_SizeT - _PyArg_VaParseTupleAndKeywords_SizeT=python35._PyArg_VaParseTupleAndKeywords_SizeT - _PyArg_VaParse_SizeT=python35._PyArg_VaParse_SizeT - _PyErr_BadInternalCall=python35._PyErr_BadInternalCall - _PyObject_CallFunction_SizeT=python35._PyObject_CallFunction_SizeT - _PyObject_CallMethod_SizeT=python35._PyObject_CallMethod_SizeT - _PyObject_GC_Malloc=python35._PyObject_GC_Malloc - _PyObject_GC_New=python35._PyObject_GC_New - _PyObject_GC_NewVar=python35._PyObject_GC_NewVar - _PyObject_GC_Resize=python35._PyObject_GC_Resize - _PyObject_New=python35._PyObject_New - _PyObject_NewVar=python35._PyObject_NewVar - _PyState_AddModule=python35._PyState_AddModule - _PyThreadState_Init=python35._PyThreadState_Init - _PyThreadState_Prealloc=python35._PyThreadState_Prealloc - _PyTrash_delete_later=python35._PyTrash_delete_later DATA - _PyTrash_delete_nesting=python35._PyTrash_delete_nesting DATA - _PyTrash_deposit_object=python35._PyTrash_deposit_object - _PyTrash_destroy_chain=python35._PyTrash_destroy_chain - _PyTrash_thread_deposit_object=python35._PyTrash_thread_deposit_object - _PyTrash_thread_destroy_chain=python35._PyTrash_thread_destroy_chain - _PyWeakref_CallableProxyType=python35._PyWeakref_CallableProxyType DATA - _PyWeakref_ProxyType=python35._PyWeakref_ProxyType DATA - _PyWeakref_RefType=python35._PyWeakref_RefType DATA - _Py_BuildValue_SizeT=python35._Py_BuildValue_SizeT - _Py_CheckRecursionLimit=python35._Py_CheckRecursionLimit DATA - _Py_CheckRecursiveCall=python35._Py_CheckRecursiveCall - _Py_Dealloc=python35._Py_Dealloc - _Py_EllipsisObject=python35._Py_EllipsisObject DATA - _Py_FalseStruct=python35._Py_FalseStruct DATA - _Py_NoneStruct=python35._Py_NoneStruct DATA - _Py_NotImplementedStruct=python35._Py_NotImplementedStruct DATA - _Py_SwappedOp=python35._Py_SwappedOp DATA - _Py_TrueStruct=python35._Py_TrueStruct DATA - _Py_VaBuildValue_SizeT=python35._Py_VaBuildValue_SizeT + PyArg_Parse=python36.PyArg_Parse + PyArg_ParseTuple=python36.PyArg_ParseTuple + PyArg_ParseTupleAndKeywords=python36.PyArg_ParseTupleAndKeywords + PyArg_UnpackTuple=python36.PyArg_UnpackTuple + PyArg_VaParse=python36.PyArg_VaParse + PyArg_VaParseTupleAndKeywords=python36.PyArg_VaParseTupleAndKeywords + PyArg_ValidateKeywordArguments=python36.PyArg_ValidateKeywordArguments + PyBaseObject_Type=python36.PyBaseObject_Type DATA + PyBool_FromLong=python36.PyBool_FromLong + PyBool_Type=python36.PyBool_Type DATA + PyByteArrayIter_Type=python36.PyByteArrayIter_Type DATA + PyByteArray_AsString=python36.PyByteArray_AsString + PyByteArray_Concat=python36.PyByteArray_Concat + PyByteArray_FromObject=python36.PyByteArray_FromObject + PyByteArray_FromStringAndSize=python36.PyByteArray_FromStringAndSize + PyByteArray_Resize=python36.PyByteArray_Resize + PyByteArray_Size=python36.PyByteArray_Size + PyByteArray_Type=python36.PyByteArray_Type DATA + PyBytesIter_Type=python36.PyBytesIter_Type DATA + PyBytes_AsString=python36.PyBytes_AsString + PyBytes_AsStringAndSize=python36.PyBytes_AsStringAndSize + PyBytes_Concat=python36.PyBytes_Concat + PyBytes_ConcatAndDel=python36.PyBytes_ConcatAndDel + PyBytes_DecodeEscape=python36.PyBytes_DecodeEscape + PyBytes_FromFormat=python36.PyBytes_FromFormat + PyBytes_FromFormatV=python36.PyBytes_FromFormatV + PyBytes_FromObject=python36.PyBytes_FromObject + PyBytes_FromString=python36.PyBytes_FromString + PyBytes_FromStringAndSize=python36.PyBytes_FromStringAndSize + PyBytes_Repr=python36.PyBytes_Repr + PyBytes_Size=python36.PyBytes_Size + PyBytes_Type=python36.PyBytes_Type DATA + PyCFunction_Call=python36.PyCFunction_Call + PyCFunction_ClearFreeList=python36.PyCFunction_ClearFreeList + PyCFunction_GetFlags=python36.PyCFunction_GetFlags + PyCFunction_GetFunction=python36.PyCFunction_GetFunction + PyCFunction_GetSelf=python36.PyCFunction_GetSelf + PyCFunction_New=python36.PyCFunction_New + PyCFunction_NewEx=python36.PyCFunction_NewEx + PyCFunction_Type=python36.PyCFunction_Type DATA + PyCallIter_New=python36.PyCallIter_New + PyCallIter_Type=python36.PyCallIter_Type DATA + PyCallable_Check=python36.PyCallable_Check + PyCapsule_GetContext=python36.PyCapsule_GetContext + PyCapsule_GetDestructor=python36.PyCapsule_GetDestructor + PyCapsule_GetName=python36.PyCapsule_GetName + PyCapsule_GetPointer=python36.PyCapsule_GetPointer + PyCapsule_Import=python36.PyCapsule_Import + PyCapsule_IsValid=python36.PyCapsule_IsValid + PyCapsule_New=python36.PyCapsule_New + PyCapsule_SetContext=python36.PyCapsule_SetContext + PyCapsule_SetDestructor=python36.PyCapsule_SetDestructor + PyCapsule_SetName=python36.PyCapsule_SetName + PyCapsule_SetPointer=python36.PyCapsule_SetPointer + PyCapsule_Type=python36.PyCapsule_Type DATA + PyClassMethodDescr_Type=python36.PyClassMethodDescr_Type DATA + PyCodec_BackslashReplaceErrors=python36.PyCodec_BackslashReplaceErrors + PyCodec_Decode=python36.PyCodec_Decode + PyCodec_Decoder=python36.PyCodec_Decoder + PyCodec_Encode=python36.PyCodec_Encode + PyCodec_Encoder=python36.PyCodec_Encoder + PyCodec_IgnoreErrors=python36.PyCodec_IgnoreErrors + PyCodec_IncrementalDecoder=python36.PyCodec_IncrementalDecoder + PyCodec_IncrementalEncoder=python36.PyCodec_IncrementalEncoder + PyCodec_KnownEncoding=python36.PyCodec_KnownEncoding + PyCodec_LookupError=python36.PyCodec_LookupError + PyCodec_Register=python36.PyCodec_Register + PyCodec_RegisterError=python36.PyCodec_RegisterError + PyCodec_ReplaceErrors=python36.PyCodec_ReplaceErrors + PyCodec_StreamReader=python36.PyCodec_StreamReader + PyCodec_StreamWriter=python36.PyCodec_StreamWriter + PyCodec_StrictErrors=python36.PyCodec_StrictErrors + PyCodec_XMLCharRefReplaceErrors=python36.PyCodec_XMLCharRefReplaceErrors + PyComplex_FromDoubles=python36.PyComplex_FromDoubles + PyComplex_ImagAsDouble=python36.PyComplex_ImagAsDouble + PyComplex_RealAsDouble=python36.PyComplex_RealAsDouble + PyComplex_Type=python36.PyComplex_Type DATA + PyDescr_NewClassMethod=python36.PyDescr_NewClassMethod + PyDescr_NewGetSet=python36.PyDescr_NewGetSet + PyDescr_NewMember=python36.PyDescr_NewMember + PyDescr_NewMethod=python36.PyDescr_NewMethod + PyDictItems_Type=python36.PyDictItems_Type DATA + PyDictIterItem_Type=python36.PyDictIterItem_Type DATA + PyDictIterKey_Type=python36.PyDictIterKey_Type DATA + PyDictIterValue_Type=python36.PyDictIterValue_Type DATA + PyDictKeys_Type=python36.PyDictKeys_Type DATA + PyDictProxy_New=python36.PyDictProxy_New + PyDictProxy_Type=python36.PyDictProxy_Type DATA + PyDictValues_Type=python36.PyDictValues_Type DATA + PyDict_Clear=python36.PyDict_Clear + PyDict_Contains=python36.PyDict_Contains + PyDict_Copy=python36.PyDict_Copy + PyDict_DelItem=python36.PyDict_DelItem + PyDict_DelItemString=python36.PyDict_DelItemString + PyDict_GetItem=python36.PyDict_GetItem + PyDict_GetItemString=python36.PyDict_GetItemString + PyDict_GetItemWithError=python36.PyDict_GetItemWithError + PyDict_Items=python36.PyDict_Items + PyDict_Keys=python36.PyDict_Keys + PyDict_Merge=python36.PyDict_Merge + PyDict_MergeFromSeq2=python36.PyDict_MergeFromSeq2 + PyDict_New=python36.PyDict_New + PyDict_Next=python36.PyDict_Next + PyDict_SetItem=python36.PyDict_SetItem + PyDict_SetItemString=python36.PyDict_SetItemString + PyDict_Size=python36.PyDict_Size + PyDict_Type=python36.PyDict_Type DATA + PyDict_Update=python36.PyDict_Update + PyDict_Values=python36.PyDict_Values + PyEllipsis_Type=python36.PyEllipsis_Type DATA + PyEnum_Type=python36.PyEnum_Type DATA + PyErr_BadArgument=python36.PyErr_BadArgument + PyErr_BadInternalCall=python36.PyErr_BadInternalCall + PyErr_CheckSignals=python36.PyErr_CheckSignals + PyErr_Clear=python36.PyErr_Clear + PyErr_Display=python36.PyErr_Display + PyErr_ExceptionMatches=python36.PyErr_ExceptionMatches + PyErr_Fetch=python36.PyErr_Fetch + PyErr_Format=python36.PyErr_Format + PyErr_FormatV=python36.PyErr_FormatV + PyErr_GivenExceptionMatches=python36.PyErr_GivenExceptionMatches + PyErr_NewException=python36.PyErr_NewException + PyErr_NewExceptionWithDoc=python36.PyErr_NewExceptionWithDoc + PyErr_NoMemory=python36.PyErr_NoMemory + PyErr_NormalizeException=python36.PyErr_NormalizeException + PyErr_Occurred=python36.PyErr_Occurred + PyErr_Print=python36.PyErr_Print + PyErr_PrintEx=python36.PyErr_PrintEx + PyErr_ProgramText=python36.PyErr_ProgramText + PyErr_Restore=python36.PyErr_Restore + PyErr_SetFromErrno=python36.PyErr_SetFromErrno + PyErr_SetFromErrnoWithFilename=python36.PyErr_SetFromErrnoWithFilename + PyErr_SetFromErrnoWithFilenameObject=python36.PyErr_SetFromErrnoWithFilenameObject + PyErr_SetInterrupt=python36.PyErr_SetInterrupt + PyErr_SetNone=python36.PyErr_SetNone + PyErr_SetObject=python36.PyErr_SetObject + PyErr_SetString=python36.PyErr_SetString + PyErr_SyntaxLocation=python36.PyErr_SyntaxLocation + PyErr_WarnEx=python36.PyErr_WarnEx + PyErr_WarnExplicit=python36.PyErr_WarnExplicit + PyErr_WarnFormat=python36.PyErr_WarnFormat + PyErr_WriteUnraisable=python36.PyErr_WriteUnraisable + PyEval_AcquireLock=python36.PyEval_AcquireLock + PyEval_AcquireThread=python36.PyEval_AcquireThread + PyEval_CallFunction=python36.PyEval_CallFunction + PyEval_CallMethod=python36.PyEval_CallMethod + PyEval_CallObjectWithKeywords=python36.PyEval_CallObjectWithKeywords + PyEval_EvalCode=python36.PyEval_EvalCode + PyEval_EvalCodeEx=python36.PyEval_EvalCodeEx + PyEval_EvalFrame=python36.PyEval_EvalFrame + PyEval_EvalFrameEx=python36.PyEval_EvalFrameEx + PyEval_GetBuiltins=python36.PyEval_GetBuiltins + PyEval_GetCallStats=python36.PyEval_GetCallStats + PyEval_GetFrame=python36.PyEval_GetFrame + PyEval_GetFuncDesc=python36.PyEval_GetFuncDesc + PyEval_GetFuncName=python36.PyEval_GetFuncName + PyEval_GetGlobals=python36.PyEval_GetGlobals + PyEval_GetLocals=python36.PyEval_GetLocals + PyEval_InitThreads=python36.PyEval_InitThreads + PyEval_ReInitThreads=python36.PyEval_ReInitThreads + PyEval_ReleaseLock=python36.PyEval_ReleaseLock + PyEval_ReleaseThread=python36.PyEval_ReleaseThread + PyEval_RestoreThread=python36.PyEval_RestoreThread + PyEval_SaveThread=python36.PyEval_SaveThread + PyEval_ThreadsInitialized=python36.PyEval_ThreadsInitialized + PyExc_ArithmeticError=python36.PyExc_ArithmeticError DATA + PyExc_AssertionError=python36.PyExc_AssertionError DATA + PyExc_AttributeError=python36.PyExc_AttributeError DATA + PyExc_BaseException=python36.PyExc_BaseException DATA + PyExc_BufferError=python36.PyExc_BufferError DATA + PyExc_BytesWarning=python36.PyExc_BytesWarning DATA + PyExc_DeprecationWarning=python36.PyExc_DeprecationWarning DATA + PyExc_EOFError=python36.PyExc_EOFError DATA + PyExc_EnvironmentError=python36.PyExc_EnvironmentError DATA + PyExc_Exception=python36.PyExc_Exception DATA + PyExc_FloatingPointError=python36.PyExc_FloatingPointError DATA + PyExc_FutureWarning=python36.PyExc_FutureWarning DATA + PyExc_GeneratorExit=python36.PyExc_GeneratorExit DATA + PyExc_IOError=python36.PyExc_IOError DATA + PyExc_ImportError=python36.PyExc_ImportError DATA + PyExc_ImportWarning=python36.PyExc_ImportWarning DATA + PyExc_IndentationError=python36.PyExc_IndentationError DATA + PyExc_IndexError=python36.PyExc_IndexError DATA + PyExc_KeyError=python36.PyExc_KeyError DATA + PyExc_KeyboardInterrupt=python36.PyExc_KeyboardInterrupt DATA + PyExc_LookupError=python36.PyExc_LookupError DATA + PyExc_MemoryError=python36.PyExc_MemoryError DATA + PyExc_MemoryErrorInst=python36.PyExc_MemoryErrorInst DATA + PyExc_NameError=python36.PyExc_NameError DATA + PyExc_NotImplementedError=python36.PyExc_NotImplementedError DATA + PyExc_OSError=python36.PyExc_OSError DATA + PyExc_OverflowError=python36.PyExc_OverflowError DATA + PyExc_PendingDeprecationWarning=python36.PyExc_PendingDeprecationWarning DATA + PyExc_RecursionErrorInst=python36.PyExc_RecursionErrorInst DATA + PyExc_ReferenceError=python36.PyExc_ReferenceError DATA + PyExc_RuntimeError=python36.PyExc_RuntimeError DATA + PyExc_RuntimeWarning=python36.PyExc_RuntimeWarning DATA + PyExc_StopIteration=python36.PyExc_StopIteration DATA + PyExc_SyntaxError=python36.PyExc_SyntaxError DATA + PyExc_SyntaxWarning=python36.PyExc_SyntaxWarning DATA + PyExc_SystemError=python36.PyExc_SystemError DATA + PyExc_SystemExit=python36.PyExc_SystemExit DATA + PyExc_TabError=python36.PyExc_TabError DATA + PyExc_TypeError=python36.PyExc_TypeError DATA + PyExc_UnboundLocalError=python36.PyExc_UnboundLocalError DATA + PyExc_UnicodeDecodeError=python36.PyExc_UnicodeDecodeError DATA + PyExc_UnicodeEncodeError=python36.PyExc_UnicodeEncodeError DATA + PyExc_UnicodeError=python36.PyExc_UnicodeError DATA + PyExc_UnicodeTranslateError=python36.PyExc_UnicodeTranslateError DATA + PyExc_UnicodeWarning=python36.PyExc_UnicodeWarning DATA + PyExc_UserWarning=python36.PyExc_UserWarning DATA + PyExc_ValueError=python36.PyExc_ValueError DATA + PyExc_Warning=python36.PyExc_Warning DATA + PyExc_ZeroDivisionError=python36.PyExc_ZeroDivisionError DATA + PyException_GetCause=python36.PyException_GetCause + PyException_GetContext=python36.PyException_GetContext + PyException_GetTraceback=python36.PyException_GetTraceback + PyException_SetCause=python36.PyException_SetCause + PyException_SetContext=python36.PyException_SetContext + PyException_SetTraceback=python36.PyException_SetTraceback + PyFile_FromFd=python36.PyFile_FromFd + PyFile_GetLine=python36.PyFile_GetLine + PyFile_WriteObject=python36.PyFile_WriteObject + PyFile_WriteString=python36.PyFile_WriteString + PyFilter_Type=python36.PyFilter_Type DATA + PyFloat_AsDouble=python36.PyFloat_AsDouble + PyFloat_FromDouble=python36.PyFloat_FromDouble + PyFloat_FromString=python36.PyFloat_FromString + PyFloat_GetInfo=python36.PyFloat_GetInfo + PyFloat_GetMax=python36.PyFloat_GetMax + PyFloat_GetMin=python36.PyFloat_GetMin + PyFloat_Type=python36.PyFloat_Type DATA + PyFrozenSet_New=python36.PyFrozenSet_New + PyFrozenSet_Type=python36.PyFrozenSet_Type DATA + PyGC_Collect=python36.PyGC_Collect + PyGILState_Ensure=python36.PyGILState_Ensure + PyGILState_GetThisThreadState=python36.PyGILState_GetThisThreadState + PyGILState_Release=python36.PyGILState_Release + PyGetSetDescr_Type=python36.PyGetSetDescr_Type DATA + PyImport_AddModule=python36.PyImport_AddModule + PyImport_AppendInittab=python36.PyImport_AppendInittab + PyImport_Cleanup=python36.PyImport_Cleanup + PyImport_ExecCodeModule=python36.PyImport_ExecCodeModule + PyImport_ExecCodeModuleEx=python36.PyImport_ExecCodeModuleEx + PyImport_ExecCodeModuleWithPathnames=python36.PyImport_ExecCodeModuleWithPathnames + PyImport_GetImporter=python36.PyImport_GetImporter + PyImport_GetMagicNumber=python36.PyImport_GetMagicNumber + PyImport_GetMagicTag=python36.PyImport_GetMagicTag + PyImport_GetModuleDict=python36.PyImport_GetModuleDict + PyImport_Import=python36.PyImport_Import + PyImport_ImportFrozenModule=python36.PyImport_ImportFrozenModule + PyImport_ImportModule=python36.PyImport_ImportModule + PyImport_ImportModuleLevel=python36.PyImport_ImportModuleLevel + PyImport_ImportModuleNoBlock=python36.PyImport_ImportModuleNoBlock + PyImport_ReloadModule=python36.PyImport_ReloadModule + PyInterpreterState_Clear=python36.PyInterpreterState_Clear + PyInterpreterState_Delete=python36.PyInterpreterState_Delete + PyInterpreterState_New=python36.PyInterpreterState_New + PyIter_Next=python36.PyIter_Next + PyListIter_Type=python36.PyListIter_Type DATA + PyListRevIter_Type=python36.PyListRevIter_Type DATA + PyList_Append=python36.PyList_Append + PyList_AsTuple=python36.PyList_AsTuple + PyList_GetItem=python36.PyList_GetItem + PyList_GetSlice=python36.PyList_GetSlice + PyList_Insert=python36.PyList_Insert + PyList_New=python36.PyList_New + PyList_Reverse=python36.PyList_Reverse + PyList_SetItem=python36.PyList_SetItem + PyList_SetSlice=python36.PyList_SetSlice + PyList_Size=python36.PyList_Size + PyList_Sort=python36.PyList_Sort + PyList_Type=python36.PyList_Type DATA + PyLongRangeIter_Type=python36.PyLongRangeIter_Type DATA + PyLong_AsDouble=python36.PyLong_AsDouble + PyLong_AsLong=python36.PyLong_AsLong + PyLong_AsLongAndOverflow=python36.PyLong_AsLongAndOverflow + PyLong_AsLongLong=python36.PyLong_AsLongLong + PyLong_AsLongLongAndOverflow=python36.PyLong_AsLongLongAndOverflow + PyLong_AsSize_t=python36.PyLong_AsSize_t + PyLong_AsSsize_t=python36.PyLong_AsSsize_t + PyLong_AsUnsignedLong=python36.PyLong_AsUnsignedLong + PyLong_AsUnsignedLongLong=python36.PyLong_AsUnsignedLongLong + PyLong_AsUnsignedLongLongMask=python36.PyLong_AsUnsignedLongLongMask + PyLong_AsUnsignedLongMask=python36.PyLong_AsUnsignedLongMask + PyLong_AsVoidPtr=python36.PyLong_AsVoidPtr + PyLong_FromDouble=python36.PyLong_FromDouble + PyLong_FromLong=python36.PyLong_FromLong + PyLong_FromLongLong=python36.PyLong_FromLongLong + PyLong_FromSize_t=python36.PyLong_FromSize_t + PyLong_FromSsize_t=python36.PyLong_FromSsize_t + PyLong_FromString=python36.PyLong_FromString + PyLong_FromUnsignedLong=python36.PyLong_FromUnsignedLong + PyLong_FromUnsignedLongLong=python36.PyLong_FromUnsignedLongLong + PyLong_FromVoidPtr=python36.PyLong_FromVoidPtr + PyLong_GetInfo=python36.PyLong_GetInfo + PyLong_Type=python36.PyLong_Type DATA + PyMap_Type=python36.PyMap_Type DATA + PyMapping_Check=python36.PyMapping_Check + PyMapping_GetItemString=python36.PyMapping_GetItemString + PyMapping_HasKey=python36.PyMapping_HasKey + PyMapping_HasKeyString=python36.PyMapping_HasKeyString + PyMapping_Items=python36.PyMapping_Items + PyMapping_Keys=python36.PyMapping_Keys + PyMapping_Length=python36.PyMapping_Length + PyMapping_SetItemString=python36.PyMapping_SetItemString + PyMapping_Size=python36.PyMapping_Size + PyMapping_Values=python36.PyMapping_Values + PyMem_Free=python36.PyMem_Free + PyMem_Malloc=python36.PyMem_Malloc + PyMem_Realloc=python36.PyMem_Realloc + PyMemberDescr_Type=python36.PyMemberDescr_Type DATA + PyMemoryView_FromObject=python36.PyMemoryView_FromObject + PyMemoryView_GetContiguous=python36.PyMemoryView_GetContiguous + PyMemoryView_Type=python36.PyMemoryView_Type DATA + PyMethodDescr_Type=python36.PyMethodDescr_Type DATA + PyModule_AddIntConstant=python36.PyModule_AddIntConstant + PyModule_AddObject=python36.PyModule_AddObject + PyModule_AddStringConstant=python36.PyModule_AddStringConstant + PyModule_Create2=python36.PyModule_Create2 + PyModule_GetDef=python36.PyModule_GetDef + PyModule_GetDict=python36.PyModule_GetDict + PyModule_GetFilename=python36.PyModule_GetFilename + PyModule_GetFilenameObject=python36.PyModule_GetFilenameObject + PyModule_GetName=python36.PyModule_GetName + PyModule_GetState=python36.PyModule_GetState + PyModule_New=python36.PyModule_New + PyModule_Type=python36.PyModule_Type DATA + PyModuleDef_Init=python36.PyModuleDef_Init + PyModuleDef_Type=python36.PyModuleDef_Type DATA + PyNullImporter_Type=python36.PyNullImporter_Type DATA + PyNumber_Absolute=python36.PyNumber_Absolute + PyNumber_Add=python36.PyNumber_Add + PyNumber_And=python36.PyNumber_And + PyNumber_AsSsize_t=python36.PyNumber_AsSsize_t + PyNumber_Check=python36.PyNumber_Check + PyNumber_Divmod=python36.PyNumber_Divmod + PyNumber_Float=python36.PyNumber_Float + PyNumber_FloorDivide=python36.PyNumber_FloorDivide + PyNumber_InPlaceAdd=python36.PyNumber_InPlaceAdd + PyNumber_InPlaceAnd=python36.PyNumber_InPlaceAnd + PyNumber_InPlaceFloorDivide=python36.PyNumber_InPlaceFloorDivide + PyNumber_InPlaceLshift=python36.PyNumber_InPlaceLshift + PyNumber_InPlaceMultiply=python36.PyNumber_InPlaceMultiply + PyNumber_InPlaceOr=python36.PyNumber_InPlaceOr + PyNumber_InPlacePower=python36.PyNumber_InPlacePower + PyNumber_InPlaceRemainder=python36.PyNumber_InPlaceRemainder + PyNumber_InPlaceRshift=python36.PyNumber_InPlaceRshift + PyNumber_InPlaceSubtract=python36.PyNumber_InPlaceSubtract + PyNumber_InPlaceTrueDivide=python36.PyNumber_InPlaceTrueDivide + PyNumber_InPlaceXor=python36.PyNumber_InPlaceXor + PyNumber_Index=python36.PyNumber_Index + PyNumber_Invert=python36.PyNumber_Invert + PyNumber_Long=python36.PyNumber_Long + PyNumber_Lshift=python36.PyNumber_Lshift + PyNumber_Multiply=python36.PyNumber_Multiply + PyNumber_Negative=python36.PyNumber_Negative + PyNumber_Or=python36.PyNumber_Or + PyNumber_Positive=python36.PyNumber_Positive + PyNumber_Power=python36.PyNumber_Power + PyNumber_Remainder=python36.PyNumber_Remainder + PyNumber_Rshift=python36.PyNumber_Rshift + PyNumber_Subtract=python36.PyNumber_Subtract + PyNumber_ToBase=python36.PyNumber_ToBase + PyNumber_TrueDivide=python36.PyNumber_TrueDivide + PyNumber_Xor=python36.PyNumber_Xor + PyOS_AfterFork=python36.PyOS_AfterFork + PyOS_InitInterrupts=python36.PyOS_InitInterrupts + PyOS_InputHook=python36.PyOS_InputHook DATA + PyOS_InterruptOccurred=python36.PyOS_InterruptOccurred + PyOS_ReadlineFunctionPointer=python36.PyOS_ReadlineFunctionPointer DATA + PyOS_double_to_string=python36.PyOS_double_to_string + PyOS_getsig=python36.PyOS_getsig + PyOS_mystricmp=python36.PyOS_mystricmp + PyOS_mystrnicmp=python36.PyOS_mystrnicmp + PyOS_setsig=python36.PyOS_setsig + PyOS_snprintf=python36.PyOS_snprintf + PyOS_string_to_double=python36.PyOS_string_to_double + PyOS_strtol=python36.PyOS_strtol + PyOS_strtoul=python36.PyOS_strtoul + PyOS_vsnprintf=python36.PyOS_vsnprintf + PyObject_ASCII=python36.PyObject_ASCII + PyObject_AsCharBuffer=python36.PyObject_AsCharBuffer + PyObject_AsFileDescriptor=python36.PyObject_AsFileDescriptor + PyObject_AsReadBuffer=python36.PyObject_AsReadBuffer + PyObject_AsWriteBuffer=python36.PyObject_AsWriteBuffer + PyObject_Bytes=python36.PyObject_Bytes + PyObject_Call=python36.PyObject_Call + PyObject_CallFunction=python36.PyObject_CallFunction + PyObject_CallFunctionObjArgs=python36.PyObject_CallFunctionObjArgs + PyObject_CallMethod=python36.PyObject_CallMethod + PyObject_CallMethodObjArgs=python36.PyObject_CallMethodObjArgs + PyObject_CallObject=python36.PyObject_CallObject + PyObject_CheckReadBuffer=python36.PyObject_CheckReadBuffer + PyObject_ClearWeakRefs=python36.PyObject_ClearWeakRefs + PyObject_DelItem=python36.PyObject_DelItem + PyObject_DelItemString=python36.PyObject_DelItemString + PyObject_Dir=python36.PyObject_Dir + PyObject_Format=python36.PyObject_Format + PyObject_Free=python36.PyObject_Free + PyObject_GC_Del=python36.PyObject_GC_Del + PyObject_GC_Track=python36.PyObject_GC_Track + PyObject_GC_UnTrack=python36.PyObject_GC_UnTrack + PyObject_GenericGetAttr=python36.PyObject_GenericGetAttr + PyObject_GenericSetAttr=python36.PyObject_GenericSetAttr + PyObject_GetAttr=python36.PyObject_GetAttr + PyObject_GetAttrString=python36.PyObject_GetAttrString + PyObject_GetItem=python36.PyObject_GetItem + PyObject_GetIter=python36.PyObject_GetIter + PyObject_HasAttr=python36.PyObject_HasAttr + PyObject_HasAttrString=python36.PyObject_HasAttrString + PyObject_Hash=python36.PyObject_Hash + PyObject_HashNotImplemented=python36.PyObject_HashNotImplemented + PyObject_Init=python36.PyObject_Init + PyObject_InitVar=python36.PyObject_InitVar + PyObject_IsInstance=python36.PyObject_IsInstance + PyObject_IsSubclass=python36.PyObject_IsSubclass + PyObject_IsTrue=python36.PyObject_IsTrue + PyObject_Length=python36.PyObject_Length + PyObject_Malloc=python36.PyObject_Malloc + PyObject_Not=python36.PyObject_Not + PyObject_Realloc=python36.PyObject_Realloc + PyObject_Repr=python36.PyObject_Repr + PyObject_RichCompare=python36.PyObject_RichCompare + PyObject_RichCompareBool=python36.PyObject_RichCompareBool + PyObject_SelfIter=python36.PyObject_SelfIter + PyObject_SetAttr=python36.PyObject_SetAttr + PyObject_SetAttrString=python36.PyObject_SetAttrString + PyObject_SetItem=python36.PyObject_SetItem + PyObject_Size=python36.PyObject_Size + PyObject_Str=python36.PyObject_Str + PyObject_Type=python36.PyObject_Type DATA + PyODict_DelItem=python36.PyODict_DelItem + PyODict_New=python36.PyODict_New + PyODict_SetItem=python36.PyODict_SetItem + PyODict_Type=python36.PyODict_Type DATA + PyODictItems_Type=python36.PyODictItems_Type DATA + PyODictIter_Type=python36.PyODictIter_Type DATA + PyODictKeys_Type=python36.PyODictKeys_Type DATA + PyODictValues_Type=python36.PyODictValues_Type DATA + PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags + PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags + PyProperty_Type=python36.PyProperty_Type DATA + PyRangeIter_Type=python36.PyRangeIter_Type DATA + PyRange_Type=python36.PyRange_Type DATA + PyReversed_Type=python36.PyReversed_Type DATA + PySeqIter_New=python36.PySeqIter_New + PySeqIter_Type=python36.PySeqIter_Type DATA + PySequence_Check=python36.PySequence_Check + PySequence_Concat=python36.PySequence_Concat + PySequence_Contains=python36.PySequence_Contains + PySequence_Count=python36.PySequence_Count + PySequence_DelItem=python36.PySequence_DelItem + PySequence_DelSlice=python36.PySequence_DelSlice + PySequence_Fast=python36.PySequence_Fast + PySequence_GetItem=python36.PySequence_GetItem + PySequence_GetSlice=python36.PySequence_GetSlice + PySequence_In=python36.PySequence_In + PySequence_InPlaceConcat=python36.PySequence_InPlaceConcat + PySequence_InPlaceRepeat=python36.PySequence_InPlaceRepeat + PySequence_Index=python36.PySequence_Index + PySequence_Length=python36.PySequence_Length + PySequence_List=python36.PySequence_List + PySequence_Repeat=python36.PySequence_Repeat + PySequence_SetItem=python36.PySequence_SetItem + PySequence_SetSlice=python36.PySequence_SetSlice + PySequence_Size=python36.PySequence_Size + PySequence_Tuple=python36.PySequence_Tuple + PySetIter_Type=python36.PySetIter_Type DATA + PySet_Add=python36.PySet_Add + PySet_Clear=python36.PySet_Clear + PySet_Contains=python36.PySet_Contains + PySet_Discard=python36.PySet_Discard + PySet_New=python36.PySet_New + PySet_Pop=python36.PySet_Pop + PySet_Size=python36.PySet_Size + PySet_Type=python36.PySet_Type DATA + PySlice_GetIndices=python36.PySlice_GetIndices + PySlice_GetIndicesEx=python36.PySlice_GetIndicesEx + PySlice_New=python36.PySlice_New + PySlice_Type=python36.PySlice_Type DATA + PySortWrapper_Type=python36.PySortWrapper_Type DATA + PyState_FindModule=python36.PyState_FindModule + PyState_AddModule=python36.PyState_AddModule + PyState_RemoveModule=python36.PyState_RemoveModule + PyStructSequence_GetItem=python36.PyStructSequence_GetItem + PyStructSequence_New=python36.PyStructSequence_New + PyStructSequence_NewType=python36.PyStructSequence_NewType + PyStructSequence_SetItem=python36.PyStructSequence_SetItem + PySuper_Type=python36.PySuper_Type DATA + PySys_AddWarnOption=python36.PySys_AddWarnOption + PySys_AddWarnOptionUnicode=python36.PySys_AddWarnOptionUnicode + PySys_FormatStderr=python36.PySys_FormatStderr + PySys_FormatStdout=python36.PySys_FormatStdout + PySys_GetObject=python36.PySys_GetObject + PySys_HasWarnOptions=python36.PySys_HasWarnOptions + PySys_ResetWarnOptions=python36.PySys_ResetWarnOptions + PySys_SetArgv=python36.PySys_SetArgv + PySys_SetArgvEx=python36.PySys_SetArgvEx + PySys_SetObject=python36.PySys_SetObject + PySys_SetPath=python36.PySys_SetPath + PySys_WriteStderr=python36.PySys_WriteStderr + PySys_WriteStdout=python36.PySys_WriteStdout + PyThreadState_Clear=python36.PyThreadState_Clear + PyThreadState_Delete=python36.PyThreadState_Delete + PyThreadState_DeleteCurrent=python36.PyThreadState_DeleteCurrent + PyThreadState_Get=python36.PyThreadState_Get + PyThreadState_GetDict=python36.PyThreadState_GetDict + PyThreadState_New=python36.PyThreadState_New + PyThreadState_SetAsyncExc=python36.PyThreadState_SetAsyncExc + PyThreadState_Swap=python36.PyThreadState_Swap + PyTraceBack_Here=python36.PyTraceBack_Here + PyTraceBack_Print=python36.PyTraceBack_Print + PyTraceBack_Type=python36.PyTraceBack_Type DATA + PyTupleIter_Type=python36.PyTupleIter_Type DATA + PyTuple_ClearFreeList=python36.PyTuple_ClearFreeList + PyTuple_GetItem=python36.PyTuple_GetItem + PyTuple_GetSlice=python36.PyTuple_GetSlice + PyTuple_New=python36.PyTuple_New + PyTuple_Pack=python36.PyTuple_Pack + PyTuple_SetItem=python36.PyTuple_SetItem + PyTuple_Size=python36.PyTuple_Size + PyTuple_Type=python36.PyTuple_Type DATA + PyType_ClearCache=python36.PyType_ClearCache + PyType_FromSpec=python36.PyType_FromSpec + PyType_FromSpecWithBases=python36.PyType_FromSpecWithBases + PyType_GenericAlloc=python36.PyType_GenericAlloc + PyType_GenericNew=python36.PyType_GenericNew + PyType_GetFlags=python36.PyType_GetFlags + PyType_GetSlot=python36.PyType_GetSlot + PyType_IsSubtype=python36.PyType_IsSubtype + PyType_Modified=python36.PyType_Modified + PyType_Ready=python36.PyType_Ready + PyType_Type=python36.PyType_Type DATA + PyUnicodeDecodeError_Create=python36.PyUnicodeDecodeError_Create + PyUnicodeDecodeError_GetEncoding=python36.PyUnicodeDecodeError_GetEncoding + PyUnicodeDecodeError_GetEnd=python36.PyUnicodeDecodeError_GetEnd + PyUnicodeDecodeError_GetObject=python36.PyUnicodeDecodeError_GetObject + PyUnicodeDecodeError_GetReason=python36.PyUnicodeDecodeError_GetReason + PyUnicodeDecodeError_GetStart=python36.PyUnicodeDecodeError_GetStart + PyUnicodeDecodeError_SetEnd=python36.PyUnicodeDecodeError_SetEnd + PyUnicodeDecodeError_SetReason=python36.PyUnicodeDecodeError_SetReason + PyUnicodeDecodeError_SetStart=python36.PyUnicodeDecodeError_SetStart + PyUnicodeEncodeError_GetEncoding=python36.PyUnicodeEncodeError_GetEncoding + PyUnicodeEncodeError_GetEnd=python36.PyUnicodeEncodeError_GetEnd + PyUnicodeEncodeError_GetObject=python36.PyUnicodeEncodeError_GetObject + PyUnicodeEncodeError_GetReason=python36.PyUnicodeEncodeError_GetReason + PyUnicodeEncodeError_GetStart=python36.PyUnicodeEncodeError_GetStart + PyUnicodeEncodeError_SetEnd=python36.PyUnicodeEncodeError_SetEnd + PyUnicodeEncodeError_SetReason=python36.PyUnicodeEncodeError_SetReason + PyUnicodeEncodeError_SetStart=python36.PyUnicodeEncodeError_SetStart + PyUnicodeIter_Type=python36.PyUnicodeIter_Type DATA + PyUnicodeTranslateError_GetEnd=python36.PyUnicodeTranslateError_GetEnd + PyUnicodeTranslateError_GetObject=python36.PyUnicodeTranslateError_GetObject + PyUnicodeTranslateError_GetReason=python36.PyUnicodeTranslateError_GetReason + PyUnicodeTranslateError_GetStart=python36.PyUnicodeTranslateError_GetStart + PyUnicodeTranslateError_SetEnd=python36.PyUnicodeTranslateError_SetEnd + PyUnicodeTranslateError_SetReason=python36.PyUnicodeTranslateError_SetReason + PyUnicodeTranslateError_SetStart=python36.PyUnicodeTranslateError_SetStart + PyUnicode_Append=python36.PyUnicode_Append + PyUnicode_AppendAndDel=python36.PyUnicode_AppendAndDel + PyUnicode_AsASCIIString=python36.PyUnicode_AsASCIIString + PyUnicode_AsCharmapString=python36.PyUnicode_AsCharmapString + PyUnicode_AsDecodedObject=python36.PyUnicode_AsDecodedObject + PyUnicode_AsDecodedUnicode=python36.PyUnicode_AsDecodedUnicode + PyUnicode_AsEncodedObject=python36.PyUnicode_AsEncodedObject + PyUnicode_AsEncodedString=python36.PyUnicode_AsEncodedString + PyUnicode_AsEncodedUnicode=python36.PyUnicode_AsEncodedUnicode + PyUnicode_AsLatin1String=python36.PyUnicode_AsLatin1String + PyUnicode_AsRawUnicodeEscapeString=python36.PyUnicode_AsRawUnicodeEscapeString + PyUnicode_AsUTF16String=python36.PyUnicode_AsUTF16String + PyUnicode_AsUTF32String=python36.PyUnicode_AsUTF32String + PyUnicode_AsUTF8String=python36.PyUnicode_AsUTF8String + PyUnicode_AsUnicodeEscapeString=python36.PyUnicode_AsUnicodeEscapeString + PyUnicode_AsWideChar=python36.PyUnicode_AsWideChar + PyUnicode_ClearFreelist=python36.PyUnicode_ClearFreelist + PyUnicode_Compare=python36.PyUnicode_Compare + PyUnicode_Concat=python36.PyUnicode_Concat + PyUnicode_Contains=python36.PyUnicode_Contains + PyUnicode_Count=python36.PyUnicode_Count + PyUnicode_Decode=python36.PyUnicode_Decode + PyUnicode_DecodeASCII=python36.PyUnicode_DecodeASCII + PyUnicode_DecodeCharmap=python36.PyUnicode_DecodeCharmap + PyUnicode_DecodeFSDefault=python36.PyUnicode_DecodeFSDefault + PyUnicode_DecodeFSDefaultAndSize=python36.PyUnicode_DecodeFSDefaultAndSize + PyUnicode_DecodeLatin1=python36.PyUnicode_DecodeLatin1 + PyUnicode_DecodeRawUnicodeEscape=python36.PyUnicode_DecodeRawUnicodeEscape + PyUnicode_DecodeUTF16=python36.PyUnicode_DecodeUTF16 + PyUnicode_DecodeUTF16Stateful=python36.PyUnicode_DecodeUTF16Stateful + PyUnicode_DecodeUTF32=python36.PyUnicode_DecodeUTF32 + PyUnicode_DecodeUTF32Stateful=python36.PyUnicode_DecodeUTF32Stateful + PyUnicode_DecodeUTF8=python36.PyUnicode_DecodeUTF8 + PyUnicode_DecodeUTF8Stateful=python36.PyUnicode_DecodeUTF8Stateful + PyUnicode_DecodeUnicodeEscape=python36.PyUnicode_DecodeUnicodeEscape + PyUnicode_FSConverter=python36.PyUnicode_FSConverter + PyUnicode_FSDecoder=python36.PyUnicode_FSDecoder + PyUnicode_Find=python36.PyUnicode_Find + PyUnicode_Format=python36.PyUnicode_Format + PyUnicode_FromEncodedObject=python36.PyUnicode_FromEncodedObject + PyUnicode_FromFormat=python36.PyUnicode_FromFormat + PyUnicode_FromFormatV=python36.PyUnicode_FromFormatV + PyUnicode_FromObject=python36.PyUnicode_FromObject + PyUnicode_FromOrdinal=python36.PyUnicode_FromOrdinal + PyUnicode_FromString=python36.PyUnicode_FromString + PyUnicode_FromStringAndSize=python36.PyUnicode_FromStringAndSize + PyUnicode_FromWideChar=python36.PyUnicode_FromWideChar + PyUnicode_GetDefaultEncoding=python36.PyUnicode_GetDefaultEncoding + PyUnicode_GetSize=python36.PyUnicode_GetSize + PyUnicode_IsIdentifier=python36.PyUnicode_IsIdentifier + PyUnicode_Join=python36.PyUnicode_Join + PyUnicode_Partition=python36.PyUnicode_Partition + PyUnicode_RPartition=python36.PyUnicode_RPartition + PyUnicode_RSplit=python36.PyUnicode_RSplit + PyUnicode_Replace=python36.PyUnicode_Replace + PyUnicode_Resize=python36.PyUnicode_Resize + PyUnicode_RichCompare=python36.PyUnicode_RichCompare + PyUnicode_SetDefaultEncoding=python36.PyUnicode_SetDefaultEncoding + PyUnicode_Split=python36.PyUnicode_Split + PyUnicode_Splitlines=python36.PyUnicode_Splitlines + PyUnicode_Tailmatch=python36.PyUnicode_Tailmatch + PyUnicode_Translate=python36.PyUnicode_Translate + PyUnicode_BuildEncodingMap=python36.PyUnicode_BuildEncodingMap + PyUnicode_CompareWithASCIIString=python36.PyUnicode_CompareWithASCIIString + PyUnicode_DecodeUTF7=python36.PyUnicode_DecodeUTF7 + PyUnicode_DecodeUTF7Stateful=python36.PyUnicode_DecodeUTF7Stateful + PyUnicode_EncodeFSDefault=python36.PyUnicode_EncodeFSDefault + PyUnicode_InternFromString=python36.PyUnicode_InternFromString + PyUnicode_InternImmortal=python36.PyUnicode_InternImmortal + PyUnicode_InternInPlace=python36.PyUnicode_InternInPlace + PyUnicode_Type=python36.PyUnicode_Type DATA + PyWeakref_GetObject=python36.PyWeakref_GetObject DATA + PyWeakref_NewProxy=python36.PyWeakref_NewProxy + PyWeakref_NewRef=python36.PyWeakref_NewRef + PyWrapperDescr_Type=python36.PyWrapperDescr_Type DATA + PyWrapper_New=python36.PyWrapper_New + PyZip_Type=python36.PyZip_Type DATA + Py_AddPendingCall=python36.Py_AddPendingCall + Py_AtExit=python36.Py_AtExit + Py_BuildValue=python36.Py_BuildValue + Py_CompileString=python36.Py_CompileString + Py_DecRef=python36.Py_DecRef + Py_EndInterpreter=python36.Py_EndInterpreter + Py_Exit=python36.Py_Exit + Py_FatalError=python36.Py_FatalError + Py_FileSystemDefaultEncoding=python36.Py_FileSystemDefaultEncoding DATA + Py_Finalize=python36.Py_Finalize + Py_FinalizeEx=python36.Py_FinalizeEx + Py_GetBuildInfo=python36.Py_GetBuildInfo + Py_GetCompiler=python36.Py_GetCompiler + Py_GetCopyright=python36.Py_GetCopyright + Py_GetExecPrefix=python36.Py_GetExecPrefix + Py_GetPath=python36.Py_GetPath + Py_GetPlatform=python36.Py_GetPlatform + Py_GetPrefix=python36.Py_GetPrefix + Py_GetProgramFullPath=python36.Py_GetProgramFullPath + Py_GetProgramName=python36.Py_GetProgramName + Py_GetPythonHome=python36.Py_GetPythonHome + Py_GetRecursionLimit=python36.Py_GetRecursionLimit + Py_GetVersion=python36.Py_GetVersion + Py_HasFileSystemDefaultEncoding=python36.Py_HasFileSystemDefaultEncoding DATA + Py_IncRef=python36.Py_IncRef + Py_Initialize=python36.Py_Initialize + Py_InitializeEx=python36.Py_InitializeEx + Py_IsInitialized=python36.Py_IsInitialized + Py_Main=python36.Py_Main + Py_MakePendingCalls=python36.Py_MakePendingCalls + Py_NewInterpreter=python36.Py_NewInterpreter + Py_ReprEnter=python36.Py_ReprEnter + Py_ReprLeave=python36.Py_ReprLeave + Py_SetProgramName=python36.Py_SetProgramName + Py_SetPythonHome=python36.Py_SetPythonHome + Py_SetRecursionLimit=python36.Py_SetRecursionLimit + Py_SymtableString=python36.Py_SymtableString + Py_VaBuildValue=python36.Py_VaBuildValue + _PyErr_BadInternalCall=python36._PyErr_BadInternalCall + _PyObject_CallFunction_SizeT=python36._PyObject_CallFunction_SizeT + _PyObject_CallMethod_SizeT=python36._PyObject_CallMethod_SizeT + _PyObject_GC_Malloc=python36._PyObject_GC_Malloc + _PyObject_GC_New=python36._PyObject_GC_New + _PyObject_GC_NewVar=python36._PyObject_GC_NewVar + _PyObject_GC_Resize=python36._PyObject_GC_Resize + _PyObject_New=python36._PyObject_New + _PyObject_NewVar=python36._PyObject_NewVar + _PyState_AddModule=python36._PyState_AddModule + _PyThreadState_Init=python36._PyThreadState_Init + _PyThreadState_Prealloc=python36._PyThreadState_Prealloc + _PyTrash_delete_later=python36._PyTrash_delete_later DATA + _PyTrash_delete_nesting=python36._PyTrash_delete_nesting DATA + _PyTrash_deposit_object=python36._PyTrash_deposit_object + _PyTrash_destroy_chain=python36._PyTrash_destroy_chain + _PyWeakref_CallableProxyType=python36._PyWeakref_CallableProxyType DATA + _PyWeakref_ProxyType=python36._PyWeakref_ProxyType DATA + _PyWeakref_RefType=python36._PyWeakref_RefType DATA + _Py_BuildValue_SizeT=python36._Py_BuildValue_SizeT + _Py_CheckRecursionLimit=python36._Py_CheckRecursionLimit DATA + _Py_CheckRecursiveCall=python36._Py_CheckRecursiveCall + _Py_Dealloc=python36._Py_Dealloc + _Py_EllipsisObject=python36._Py_EllipsisObject DATA + _Py_FalseStruct=python36._Py_FalseStruct DATA + _Py_NoneStruct=python36._Py_NoneStruct DATA + _Py_NotImplementedStruct=python36._Py_NotImplementedStruct DATA + _Py_SwappedOp=python36._Py_SwappedOp DATA + _Py_TrueStruct=python36._Py_TrueStruct DATA + _Py_VaBuildValue_SizeT=python36._Py_VaBuildValue_SizeT + _PyArg_Parse_SizeT=python36._PyArg_Parse_SizeT + _PyArg_ParseTuple_SizeT=python36._PyArg_ParseTuple_SizeT + _PyArg_ParseTupleAndKeywords_SizeT=python36._PyArg_ParseTupleAndKeywords_SizeT + _PyArg_VaParse_SizeT=python36._PyArg_VaParse_SizeT + _PyArg_VaParseTupleAndKeywords_SizeT=python36._PyArg_VaParseTupleAndKeywords_SizeT + _Py_BuildValue_SizeT=python36._Py_BuildValue_SizeT diff --git a/PC/python_exe.rc b/PC/python_exe.rc index 91785a1..ae0b029 100644 --- a/PC/python_exe.rc +++ b/PC/python_exe.rc @@ -7,7 +7,7 @@ #include 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "pycon.ico" +1 ICON DISCARDABLE "icons\python.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc new file mode 100644 index 0000000..88bf359 --- /dev/null +++ b/PC/pythonw_exe.rc @@ -0,0 +1,49 @@ +// Resource script for Python console EXEs. + +#include "python_ver_rc.h" + +// Include the manifest file that indicates we support all +// current versions of Windows. +#include +1 RT_MANIFEST "python.manifest" + +1 ICON DISCARDABLE "icons\pythonw.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PYVERSION64 + PRODUCTVERSION PYVERSION64 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", PYTHON_COMPANY "\0" + VALUE "FileDescription", "Python\0" + VALUE "FileVersion", PYTHON_VERSION + VALUE "InternalName", "Python Application\0" + VALUE "LegalCopyright", PYTHON_COPYRIGHT "\0" + VALUE "OriginalFilename", "pythonw" PYTHON_DEBUG_EXT ".exe\0" + VALUE "ProductName", "Python\0" + VALUE "ProductVersion", PYTHON_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/PC/readme.txt b/PC/readme.txt index b796901..0a96d26 100644 --- a/PC/readme.txt +++ b/PC/readme.txt @@ -1,81 +1,81 @@ -Welcome to the "PC" subdirectory of the Python distribution -*********************************************************** - -This "PC" subdirectory contains complete project files to make -several older PC ports of Python, as well as all the PC-specific -Python source files. It should be located in the root of the -Python distribution, and there should be directories "Modules", -"Objects", "Python", etc. in the parent directory of this "PC" -subdirectory. Be sure to read the documentation in the Python -distribution. - -Python requires library files such as string.py to be available in -one or more library directories. The search path of libraries is -set up when Python starts. To see the current Python library search -path, start Python and enter "import sys" and "print sys.path". - -All PC ports use this scheme to try to set up a module search path: - - 1) The script location; the current directory without script. - 2) The PYTHONPATH variable, if set. - 3) For Win32 platforms (NT/95), paths specified in the Registry. - 4) Default directories lib, lib/win, lib/test, lib/tkinter; - these are searched relative to the environment variable - PYTHONHOME, if set, or relative to the executable and its - ancestors, if a landmark file (Lib/string.py) is found , - or the current directory (not useful). - 5) The directory containing the executable. - -The best installation strategy is to put the Python executable (and -DLL, for Win32 platforms) in some convenient directory such as -C:/python, and copy all library files and subdirectories (using XCOPY) -to C:/python/lib. Then you don't need to set PYTHONPATH. Otherwise, -set the environment variable PYTHONPATH to your Python search path. -For example, - set PYTHONPATH=.;d:\python\lib;d:\python\lib\win;d:\python\lib\dos-8x3 - -There are several add-in modules to build Python programs which use -the native Windows operating environment. The ports here just make -"QuickWin" and DOS Python versions which support a character-mode -(console) environment. Look in www.python.org for Tkinter, PythonWin, -WPY and wxPython. - -To make a Python port, start the Integrated Development Environment -(IDE) of your compiler, and read in the native "project file" -(or makefile) provided. This will enable you to change any source -files or build settings so you can make custom builds. - -pyconfig.h An important configuration file specific to PC's. - -config.c The list of C modules to include in the Python PC - version. Manually edit this file to add or - remove Python modules. - -testpy.py A Python test program. Run this to test your - Python port. It should produce copious output, - ending in a report on how many tests were OK, how many - failed, and how many were skipped. Don't worry about - skipped tests (these test unavailable optional features). - - -Additional files and subdirectories for 32-bit Windows -====================================================== - -python_nt.rc Resource compiler input for python15.dll. - -dl_nt.c - Additional sources used for 32-bit Windows features. - -getpathp.c Default sys.path calculations (for all PC platforms). - -dllbase_nt.txt A (manually maintained) list of base addresses for - various DLLs, to avoid run-time relocation. - - -Note for Windows 3.x and DOS users -================================== - -Neither Windows 3.x nor DOS is supported any more. The last Python -version that supported these was Python 1.5.2; the support files were -present in Python 2.0 but weren't updated, and it is not our intention -to support these platforms for Python 2.x. +Welcome to the "PC" subdirectory of the Python distribution +*********************************************************** + +This "PC" subdirectory contains complete project files to make +several older PC ports of Python, as well as all the PC-specific +Python source files. It should be located in the root of the +Python distribution, and there should be directories "Modules", +"Objects", "Python", etc. in the parent directory of this "PC" +subdirectory. Be sure to read the documentation in the Python +distribution. + +Python requires library files such as string.py to be available in +one or more library directories. The search path of libraries is +set up when Python starts. To see the current Python library search +path, start Python and enter "import sys" and "print sys.path". + +All PC ports use this scheme to try to set up a module search path: + + 1) The script location; the current directory without script. + 2) The PYTHONPATH variable, if set. + 3) For Win32 platforms (NT/95), paths specified in the Registry. + 4) Default directories lib, lib/win, lib/test, lib/tkinter; + these are searched relative to the environment variable + PYTHONHOME, if set, or relative to the executable and its + ancestors, if a landmark file (Lib/string.py) is found , + or the current directory (not useful). + 5) The directory containing the executable. + +The best installation strategy is to put the Python executable (and +DLL, for Win32 platforms) in some convenient directory such as +C:/python, and copy all library files and subdirectories (using XCOPY) +to C:/python/lib. Then you don't need to set PYTHONPATH. Otherwise, +set the environment variable PYTHONPATH to your Python search path. +For example, + set PYTHONPATH=.;d:\python\lib;d:\python\lib\win;d:\python\lib\dos-8x3 + +There are several add-in modules to build Python programs which use +the native Windows operating environment. The ports here just make +"QuickWin" and DOS Python versions which support a character-mode +(console) environment. Look in www.python.org for Tkinter, PythonWin, +WPY and wxPython. + +To make a Python port, start the Integrated Development Environment +(IDE) of your compiler, and read in the native "project file" +(or makefile) provided. This will enable you to change any source +files or build settings so you can make custom builds. + +pyconfig.h An important configuration file specific to PC's. + +config.c The list of C modules to include in the Python PC + version. Manually edit this file to add or + remove Python modules. + +testpy.py A Python test program. Run this to test your + Python port. It should produce copious output, + ending in a report on how many tests were OK, how many + failed, and how many were skipped. Don't worry about + skipped tests (these test unavailable optional features). + + +Additional files and subdirectories for 32-bit Windows +====================================================== + +python_nt.rc Resource compiler input for python15.dll. + +dl_nt.c + Additional sources used for 32-bit Windows features. + +getpathp.c Default sys.path calculations (for all PC platforms). + +dllbase_nt.txt A (manually maintained) list of base addresses for + various DLLs, to avoid run-time relocation. + + +Note for Windows 3.x and DOS users +================================== + +Neither Windows 3.x nor DOS is supported any more. The last Python +version that supported these was Python 1.5.2; the support files were +present in Python 2.0 but weren't updated, and it is not our intention +to support these platforms for Python 2.x. diff --git a/PC/testpy.py b/PC/testpy.py index 4ef3d4f..709f35c 100644 --- a/PC/testpy.py +++ b/PC/testpy.py @@ -26,5 +26,5 @@ for dir in sys.path: # Add the "test" directory to PYTHONPATH. sys.path = sys.path + [test] -import regrtest # Standard Python tester. -regrtest.main() +import libregrtest # Standard Python tester. +libregrtest.main() diff --git a/PC/winreg.c b/PC/winreg.c index f08d9a4..9524838 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -549,7 +549,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) if (value != Py_None && !PyLong_Check(value)) return FALSE; *retDataBuf = (BYTE *)PyMem_NEW(DWORD, 1); - if (*retDataBuf==NULL){ + if (*retDataBuf == NULL){ PyErr_NoMemory(); return FALSE; } @@ -563,6 +563,24 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) memcpy(*retDataBuf, &d, sizeof(DWORD)); } break; + case REG_QWORD: + if (value != Py_None && !PyLong_Check(value)) + return FALSE; + *retDataBuf = (BYTE *)PyMem_NEW(DWORD64, 1); + if (*retDataBuf == NULL){ + PyErr_NoMemory(); + return FALSE; + } + *retDataSize = sizeof(DWORD64); + if (value == Py_None) { + DWORD64 zero = 0; + memcpy(*retDataBuf, &zero, sizeof(DWORD64)); + } + else { + DWORD64 d = PyLong_AsUnsignedLongLong(value); + memcpy(*retDataBuf, &d, sizeof(DWORD64)); + } + break; case REG_SZ: case REG_EXPAND_SZ: { @@ -619,7 +637,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) *retDataSize = size + 2; *retDataBuf = (BYTE *)PyMem_NEW(char, *retDataSize); - if (*retDataBuf==NULL){ + if (*retDataBuf == NULL){ PyErr_NoMemory(); return FALSE; } @@ -665,7 +683,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) return FALSE; *retDataBuf = (BYTE *)PyMem_NEW(char, view.len); - if (*retDataBuf==NULL){ + if (*retDataBuf == NULL){ PyBuffer_Release(&view); PyErr_NoMemory(); return FALSE; @@ -690,7 +708,13 @@ Reg2Py(BYTE *retDataBuf, DWORD retDataSize, DWORD typ) if (retDataSize == 0) obData = PyLong_FromUnsignedLong(0); else - obData = PyLong_FromUnsignedLong(*(int *)retDataBuf); + obData = PyLong_FromUnsignedLong(*(DWORD *)retDataBuf); + break; + case REG_QWORD: + if (retDataSize == 0) + obData = PyLong_FromUnsignedLongLong(0); + else + obData = PyLong_FromUnsignedLongLong(*(DWORD64 *)retDataBuf); break; case REG_SZ: case REG_EXPAND_SZ: @@ -1599,7 +1623,7 @@ winreg.SetValueEx An integer that specifies the type of the data, one of: REG_BINARY -- Binary data in any form. REG_DWORD -- A 32-bit number. - REG_DWORD_LITTLE_ENDIAN -- A 32-bit number in little-endian format. + REG_DWORD_LITTLE_ENDIAN -- A 32-bit number in little-endian format. Equivalent to REG_DWORD REG_DWORD_BIG_ENDIAN -- A 32-bit number in big-endian format. REG_EXPAND_SZ -- A null-terminated string that contains unexpanded references to environment variables (for example, @@ -1609,6 +1633,8 @@ winreg.SetValueEx by two null characters. Note that Python handles this termination automatically. REG_NONE -- No defined value type. + REG_QWORD -- A 64-bit number. + REG_QWORD_LITTLE_ENDIAN -- A 64-bit number in little-endian format. Equivalent to REG_QWORD. REG_RESOURCE_LIST -- A device-driver resource list. REG_SZ -- A null-terminated string. value: object @@ -1631,7 +1657,7 @@ the configuration registry to help the registry perform efficiently. static PyObject * winreg_SetValueEx_impl(PyObject *module, HKEY key, Py_UNICODE *value_name, PyObject *reserved, DWORD type, PyObject *value) -/*[clinic end generated code: output=c88c8426b6c00ec7 input=f1b16cbcc3ed4101]*/ +/*[clinic end generated code: output=c88c8426b6c00ec7 input=900a9e3990bfb196]*/ { BYTE *data; DWORD len; @@ -1918,6 +1944,8 @@ PyMODINIT_FUNC PyInit_winreg(void) ADD_INT(REG_DWORD); ADD_INT(REG_DWORD_LITTLE_ENDIAN); ADD_INT(REG_DWORD_BIG_ENDIAN); + ADD_INT(REG_QWORD); + ADD_INT(REG_QWORD_LITTLE_ENDIAN); ADD_INT(REG_LINK); ADD_INT(REG_MULTI_SZ); ADD_INT(REG_RESOURCE_LIST); diff --git a/PC/winsound.c b/PC/winsound.c index 6b79d23..7feebcb 100644 --- a/PC/winsound.c +++ b/PC/winsound.c @@ -52,7 +52,7 @@ PyDoc_STRVAR(sound_module_doc, "SND_NOWAIT - Return immediately if the sound driver is busy\n" // Without any errors "\n" "Beep(frequency, duration) - Make a beep through the PC speaker.\n" -"MessageBeep(x) - Call Windows MessageBeep."); +"MessageBeep(type) - Call Windows MessageBeep."); /*[clinic input] module winsound @@ -64,32 +64,58 @@ module winsound /*[clinic input] winsound.PlaySound - sound: Py_UNICODE(accept={str, NoneType}) + sound: object The sound to play; a filename, data, or None. flags: int Flag values, ored together. See module documentation. - / A wrapper around the Windows PlaySound API. [clinic start generated code]*/ static PyObject * -winsound_PlaySound_impl(PyObject *module, Py_UNICODE *sound, int flags) -/*[clinic end generated code: output=ec24b3a2b4368378 input=3411b1b7c1f36d93]*/ +winsound_PlaySound_impl(PyObject *module, PyObject *sound, int flags) +/*[clinic end generated code: output=49a0fd16a372ebeb input=c63e1f2d848da2f2]*/ { int ok; - - if (flags & SND_ASYNC && flags & SND_MEMORY) { - /* Sidestep reference counting headache; unfortunately this also - prevent SND_LOOP from memory. */ - PyErr_SetString(PyExc_RuntimeError, - "Cannot play asynchronously from memory"); - return NULL; + wchar_t *wsound; + Py_buffer view = {NULL, NULL}; + + if (sound == Py_None) { + wsound = NULL; + } else if (flags & SND_MEMORY) { + if (flags & SND_ASYNC) { + /* Sidestep reference counting headache; unfortunately this also + prevent SND_LOOP from memory. */ + PyErr_SetString(PyExc_RuntimeError, + "Cannot play asynchronously from memory"); + return NULL; + } + if (PyObject_GetBuffer(sound, &view, PyBUF_SIMPLE) < 0) { + return NULL; + } + wsound = (wchar_t *)view.buf; + } else { + if (!PyUnicode_Check(sound)) { + PyErr_Format(PyExc_TypeError, + "'sound' must be str or None, not '%s'", + Py_TYPE(sound)->tp_name); + return NULL; + } + wsound = PyUnicode_AsWideCharString(sound, NULL); + if (wsound == NULL) { + return NULL; + } } + Py_BEGIN_ALLOW_THREADS - ok = PlaySoundW(sound, NULL, flags); + ok = PlaySoundW(wsound, NULL, flags); Py_END_ALLOW_THREADS + if (view.obj) { + PyBuffer_Release(&view); + } else if (sound != Py_None) { + PyMem_Free(wsound); + } if (!ok) { PyErr_SetString(PyExc_RuntimeError, "Failed to play sound"); return NULL; @@ -105,14 +131,13 @@ winsound.Beep Must be in the range 37 through 32,767. duration: int How long the sound should play, in milliseconds. - / A wrapper around the Windows Beep API. [clinic start generated code]*/ static PyObject * winsound_Beep_impl(PyObject *module, int frequency, int duration) -/*[clinic end generated code: output=f32382e52ee9b2fb input=628a99d2ddf73798]*/ +/*[clinic end generated code: output=f32382e52ee9b2fb input=40e360cfa00a5cf0]*/ { BOOL ok; @@ -136,8 +161,7 @@ winsound_Beep_impl(PyObject *module, int frequency, int duration) /*[clinic input] winsound.MessageBeep - x: int(c_default="MB_OK") = MB_OK - / + type: int(c_default="MB_OK") = MB_OK Call Windows MessageBeep(x). @@ -145,10 +169,20 @@ x defaults to MB_OK. [clinic start generated code]*/ static PyObject * -winsound_MessageBeep_impl(PyObject *module, int x) -/*[clinic end generated code: output=1ad89e4d8d30a957 input=a776c8a85c9853f6]*/ +winsound_MessageBeep_impl(PyObject *module, int type) +/*[clinic end generated code: output=120875455121121f input=db185f741ae21401]*/ { - MessageBeep(x); + BOOL ok; + + Py_BEGIN_ALLOW_THREADS + ok = MessageBeep(type); + Py_END_ALLOW_THREADS + + if (!ok) { + PyErr_SetExcFromWindowsErr(PyExc_RuntimeError, 0); + return NULL; + } + Py_RETURN_NONE; } diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj new file mode 100644 index 0000000..3cca000 --- /dev/null +++ b/PCbuild/_asyncio.vcxproj @@ -0,0 +1,77 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {384C224A-7474-476E-A01B-750EA7DE918C} + _asyncio + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + + diff --git a/PCbuild/_asyncio.vcxproj.filters b/PCbuild/_asyncio.vcxproj.filters new file mode 100644 index 0000000..10a186c --- /dev/null +++ b/PCbuild/_asyncio.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + + + + {2422278e-eeeb-4241-8182-433e2bc5a7fc} + + + + + Source Files + + + \ No newline at end of file diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj index f53634a..9efb0d9 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -1,98 +1,98 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {73FCD2BD-F133-46B7-8EC1-144CD82A59D5} - bz2 - Win32Proj - - - - - DynamicLibrary - NotSet - - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(bz2Dir);%(AdditionalIncludeDirectories) - WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - - - 0x1D170000 - - - - - - - - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5} + bz2 + Win32Proj + + + + + DynamicLibrary + NotSet + + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(bz2Dir);%(AdditionalIncludeDirectories) + WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + + + 0x1D170000 + + + + + + + + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters index 382f6b6..eac64dd 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -1,48 +1,48 @@ - - - - - {f53a859d-dad2-4d5b-ae41-f28d8b571f5a} - - - {7e0bed05-ae33-43b7-8797-656455bbb7f3} - - - {ed574b89-6983-4cdf-9f98-fe7048d9e89c} - - - - - Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - bzip2 1.0.6 Source Files - - - - - bzip2 1.0.6 Header Files - - - bzip2 1.0.6 Header Files - - - + + + + + {f53a859d-dad2-4d5b-ae41-f28d8b571f5a} + + + {7e0bed05-ae33-43b7-8797-656455bbb7f3} + + + {ed574b89-6983-4cdf-9f98-fe7048d9e89c} + + + + + Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + bzip2 1.0.6 Source Files + + + + + bzip2 1.0.6 Header Files + + + bzip2 1.0.6 Header Files + + + diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj index 0b2c00e..70bea45 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -1,110 +1,110 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {0E9791DB-593A-465F-98BC-681011311618} - _ctypes - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - - - - ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) - - - 0x1D1A0000 - /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - true - - - - - true - ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)" - $(IntDir)win64.obj;%(Outputs) - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {0E9791DB-593A-465F-98BC-681011311618} + _ctypes + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + + + + ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) + + + 0x1D1A0000 + /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + true + + + + + true + ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)" + $(IntDir)win64.obj;%(Outputs) + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + + + + \ No newline at end of file diff --git a/PCbuild/_ctypes.vcxproj.filters b/PCbuild/_ctypes.vcxproj.filters index 0a2c4bf..83d7a7b 100644 --- a/PCbuild/_ctypes.vcxproj.filters +++ b/PCbuild/_ctypes.vcxproj.filters @@ -1,65 +1,65 @@ - - - - - {806081ee-2af0-48d0-a83e-ee02a74baa0f} - - - {dbdea1f2-ad8b-44ca-b782-fcf65d91559b} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - + + + + + {806081ee-2af0-48d0-a83e-ee02a74baa0f} + + + {dbdea1f2-ad8b-44ca-b782-fcf65d91559b} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj index 06a9301..b62407f 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -1,80 +1,80 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {9EC7190A-249F-4180-A900-548FDCF3055F} - _ctypes_test - Win32Proj - false - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {9EC7190A-249F-4180-A900-548FDCF3055F} + _ctypes_test + Win32Proj + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + + + + \ No newline at end of file diff --git a/PCbuild/_ctypes_test.vcxproj.filters b/PCbuild/_ctypes_test.vcxproj.filters index 1a5a82b..c1e94ce 100644 --- a/PCbuild/_ctypes_test.vcxproj.filters +++ b/PCbuild/_ctypes_test.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {8fd70119-5481-4e5d-b187-d0b14eb27e38} - - - {38abc486-e143-49dc-8cf0-8aefab0e0d3d} - - - - - Header Files - - - - - Source Files - - + + + + + {8fd70119-5481-4e5d-b187-d0b14eb27e38} + + + {38abc486-e143-49dc-8cf0-8aefab0e0d3d} + + + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj index d2868c8..9c9c19a 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -1,127 +1,127 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {0E9791DB-593A-465F-98BC-681011311617} - _decimal - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - - - - _CRT_SECURE_NO_WARNINGS;MASM;%(PreprocessorDefinitions) - CONFIG_32;PPRO;%(PreprocessorDefinitions) - CONFIG_64;%(PreprocessorDefinitions) - ..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories) - - - 0x1D1A0000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - ml64 /nologo /c /Zi /Fo "$(IntDir)vcdiv64.obj" "%(FullPath)" - $(IntDir)vcdiv64.obj;%(Outputs) - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {0E9791DB-593A-465F-98BC-681011311617} + _decimal + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + + + + _CRT_SECURE_NO_WARNINGS;MASM;%(PreprocessorDefinitions) + CONFIG_32;PPRO;%(PreprocessorDefinitions) + CONFIG_64;%(PreprocessorDefinitions) + ..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories) + + + 0x1D1A0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + ml64 /nologo /c /Zi /Fo "$(IntDir)vcdiv64.obj" "%(FullPath)" + $(IntDir)vcdiv64.obj;%(Outputs) + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + + + + \ No newline at end of file diff --git a/PCbuild/_decimal.vcxproj.filters b/PCbuild/_decimal.vcxproj.filters index 6f1d520..7e19aa2 100644 --- a/PCbuild/_decimal.vcxproj.filters +++ b/PCbuild/_decimal.vcxproj.filters @@ -1,116 +1,116 @@ - - - - - {f35a78a6-3ef0-4e36-bd8b-afaef22fbb7c} - - - {138089f8-faba-494f-b6ed-051f31fbaf2d} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - + + + + + {f35a78a6-3ef0-4e36-bd8b-afaef22fbb7c} + + + {138089f8-faba-494f-b6ed-051f31fbaf2d} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index e7cdf57..725b5a9 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -1,106 +1,106 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {17E1E049-C309-4D79-843F-AE483C264AEA} - _elementtree - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - ..\Modules\expat;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions) - - - 0x1D100000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {17E1E049-C309-4D79-843F-AE483C264AEA} + _elementtree + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ..\Modules\expat;%(AdditionalIncludeDirectories) + XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) + + + 0x1D100000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + + \ No newline at end of file diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters index acb722d..ee78295 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -1,72 +1,72 @@ - - - - - {643d8607-d024-40fe-8583-1823c96430f0} - - - {7b5335ad-059f-486f-85e4-f4757e26a9bf} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {643d8607-d024-40fe-8583-1823c96430f0} + + + {7b5335ad-059f-486f-85e4-f4757e26a9bf} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj index 5affff0..f7714c0 100644 --- a/PCbuild/_freeze_importlib.vcxproj +++ b/PCbuild/_freeze_importlib.vcxproj @@ -1,106 +1,106 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {19C0C13F-47CA-4432-AFF3-799A296A4DDC} - Win32Proj - _freeze_importlib - false - - - - - Application - Unicode - - - - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - - - Console - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - true - true - false - true - false - - - - - - - - - - - - - <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h').Replace(` `, ` `)) - <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h').Replace(` `, ` `)) - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {19C0C13F-47CA-4432-AFF3-799A296A4DDC} + Win32Proj + _freeze_importlib + false + + + + + Application + Unicode + + + + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + true + true + false + true + false + + + + + + + + + + + + + <_OldContent Condition="Exists('$(PySourcePath)Python\importlib.h')">$([System.IO.File]::ReadAllText('$(PySourcePath)Python\importlib.h').Replace(` `, ` `)) + <_NewContent Condition="Exists('$(IntDir)importlib.g.h')">$([System.IO.File]::ReadAllText('$(IntDir)importlib.g.h').Replace(` `, ` `)) + + + + + + + + + + + + + diff --git a/PCbuild/_freeze_importlib.vcxproj.filters b/PCbuild/_freeze_importlib.vcxproj.filters index 80b7fa9..ccad053 100644 --- a/PCbuild/_freeze_importlib.vcxproj.filters +++ b/PCbuild/_freeze_importlib.vcxproj.filters @@ -1,27 +1,27 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Source Files - - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Source Files + + + diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index 76862ea..b1300cb 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -1,93 +1,93 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {447F05A8-F581-4CAC-A466-5AC7936E207E} - _hashlib - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(opensslIncludeDir);%(AdditionalIncludeDirectories) - - - ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - {10615b24-73bf-4efa-93aa-236916321317} - false - - - {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} - false - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {447F05A8-F581-4CAC-A466-5AC7936E207E} + _hashlib + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(opensslIncludeDir);%(AdditionalIncludeDirectories) + + + ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + {10615b24-73bf-4efa-93aa-236916321317} + false + + + {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} + false + + + + + + diff --git a/PCbuild/_hashlib.vcxproj.filters b/PCbuild/_hashlib.vcxproj.filters index 0f26370..a9d993e 100644 --- a/PCbuild/_hashlib.vcxproj.filters +++ b/PCbuild/_hashlib.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {cc45963d-bd25-4eb8-bdba-a5507090bca4} - - - - - Source Files - - + + + + + {cc45963d-bd25-4eb8-bdba-a5507090bca4} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj index 88c60df..7ec2692 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -1,88 +1,90 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {F9D71780-F393-11E0-BE50-0800200C9A66} - lzma - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(lzmaDir)include;%(AdditionalIncludeDirectories) - WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) - - - $(lzmaDir)\bin_i486\liblzma.a;%(AdditionalDependencies) - $(lzmaDir)\bin_x86-64\liblzma.a;%(AdditionalDependencies) - false - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {F9D71780-F393-11E0-BE50-0800200C9A66} + lzma + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories) + WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) + + + $(OutDir)/liblzma$(PyDebugExt).lib + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + {12728250-16eC-4dc6-94d7-e21dd88947f8} + false + + + + + + diff --git a/PCbuild/_lzma.vcxproj.filters b/PCbuild/_lzma.vcxproj.filters index bb0ae1f..0c5ed74 100644 --- a/PCbuild/_lzma.vcxproj.filters +++ b/PCbuild/_lzma.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {53e68eda-39fc-4336-a658-dc5f5d598760} - - - - - Source Files - - + + + + + {53e68eda-39fc-4336-a658-dc5f5d598760} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj index b61a528..3895d45 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {31FFC478-7B4A-43E8-9954-8D03E2187E9C} - _msi - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) - 0x1D160000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {31FFC478-7B4A-43E8-9954-8D03E2187E9C} + _msi + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) + 0x1D160000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_msi.vcxproj.filters b/PCbuild/_msi.vcxproj.filters index a40f405..7dec52d 100644 --- a/PCbuild/_msi.vcxproj.filters +++ b/PCbuild/_msi.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {bdef7710-e433-4ac0-84e0-14f34454bd3e} - - - - - Source Files - - + + + + + {bdef7710-e433-4ac0-84e0-14f34454bd3e} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj index 0673f26..bb2bb41 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -1,87 +1,87 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {9E48B300-37D1-11DD-8C41-005056C00008} - _multiprocessing - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - ws2_32.lib;%(AdditionalDependencies) - 0x1e1D0000 - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {9E48B300-37D1-11DD-8C41-005056C00008} + _multiprocessing + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ws2_32.lib;%(AdditionalDependencies) + 0x1e1D0000 + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_multiprocessing.vcxproj.filters b/PCbuild/_multiprocessing.vcxproj.filters index 0b5291d..78133ec 100644 --- a/PCbuild/_multiprocessing.vcxproj.filters +++ b/PCbuild/_multiprocessing.vcxproj.filters @@ -1,24 +1,24 @@ - - - - - {623c956c-1893-43d9-a7dc-96e4fef20f93} - - - {34615a62-f999-4659-83f5-19d17a644530} - - - - - Header Files - - - - - Source Files - - - Source Files - - + + + + + {623c956c-1893-43d9-a7dc-96e4fef20f93} + + + {34615a62-f999-4659-83f5-19d17a644530} + + + + + Header Files + + + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj index ce946a5..8cf8a86 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {EB6E69DD-04BF-4543-9B92-49FAABCEAC2E} - _overlapped - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - ws2_32.lib;%(AdditionalDependencies) - 0x1D110000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {EB6E69DD-04BF-4543-9B92-49FAABCEAC2E} + _overlapped + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ws2_32.lib;%(AdditionalDependencies) + 0x1D110000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_overlapped.vcxproj.filters b/PCbuild/_overlapped.vcxproj.filters index 5ed9a09..78de895 100644 --- a/PCbuild/_overlapped.vcxproj.filters +++ b/PCbuild/_overlapped.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {6f67c8db-7de7-4714-a967-2b0d4bc71f2e} - - - - - Source Files - - + + + + + {6f67c8db-7de7-4714-a967-2b0d4bc71f2e} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index 0c1d05a..d5c4d1b 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -1,86 +1,86 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {86937F53-C189-40EF-8CE8-8759D8E7D480} - _socket - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - ws2_32.lib;%(AdditionalDependencies) - 0x1e1D0000 - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {86937F53-C189-40EF-8CE8-8759D8E7D480} + _socket + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ws2_32.lib;%(AdditionalDependencies) + 0x1e1D0000 + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_socket.vcxproj.filters b/PCbuild/_socket.vcxproj.filters index 8fe3e6b..790ffa8 100644 --- a/PCbuild/_socket.vcxproj.filters +++ b/PCbuild/_socket.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {1452207f-707c-4e84-b532-307193a0fd85} - - - {1edfe0d0-7b9d-4dc8-a335-b21fef7cc77a} - - - - - Header Files - - - - - Source Files - - + + + + + {1452207f-707c-4e84-b532-307193a0fd85} + + + {1edfe0d0-7b9d-4dc8-a335-b21fef7cc77a} + + + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index 39f7de8..5456bb5 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -1,109 +1,109 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {13CECB97-4119-4316-9D42-8534019A5A44} - _sqlite3 - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(sqlite3Dir);%(AdditionalIncludeDirectories) - MODULE_NAME="sqlite3";%(PreprocessorDefinitions) - - - 0x1e180000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - {a1a295e5-463c-437f-81ca-1f32367685da} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {13CECB97-4119-4316-9D42-8534019A5A44} + _sqlite3 + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(sqlite3Dir);%(AdditionalIncludeDirectories) + MODULE_NAME="sqlite3";%(PreprocessorDefinitions) + + + 0x1e180000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + {a1a295e5-463c-437f-81ca-1f32367685da} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_sqlite3.vcxproj.filters b/PCbuild/_sqlite3.vcxproj.filters index 269a798..dce77c9 100644 --- a/PCbuild/_sqlite3.vcxproj.filters +++ b/PCbuild/_sqlite3.vcxproj.filters @@ -1,69 +1,69 @@ - - - - - {dac8ab3b-ce16-4bef-bef9-76463a01f5c4} - - - {814b187d-44ad-4f2b-baa7-18ca8a8a6a77} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {dac8ab3b-ce16-4bef-bef9-76463a01f5c4} + + + {814b187d-44ad-4f2b-baa7-18ca8a8a6a77} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index 02f9812..d75ebd6 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -1,97 +1,97 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {C6E20F84-3247-4AD6-B051-B073268F73BA} - _ssl - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(opensslIncludeDir);%(AdditionalIncludeDirectories) - - - ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} - false - - - {10615b24-73bf-4efa-93aa-236916321317} - false - - - {86937f53-c189-40ef-8ce8-8759d8e7d480} - false - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {C6E20F84-3247-4AD6-B051-B073268F73BA} + _ssl + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(opensslIncludeDir);%(AdditionalIncludeDirectories) + + + ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} + false + + + {10615b24-73bf-4efa-93aa-236916321317} + false + + + {86937f53-c189-40ef-8ce8-8759d8e7d480} + false + + + + + + diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters index 7cd1b5d..78b1459 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {695348f7-e9f6-4fe1-bc03-5f08ffc8095b} - - - - - Source Files - - + + + + + {695348f7-e9f6-4fe1-bc03-5f08ffc8095b} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index cdc4a9b..1f45b29 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -1,82 +1,82 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {A2697BD3-28C1-4AEC-9106-8B748639FD16} - _testbuffer - Win32Proj - false - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - - - - 0x1e1F0000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {A2697BD3-28C1-4AEC-9106-8B748639FD16} + _testbuffer + Win32Proj + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + + + + 0x1e1F0000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + + + + \ No newline at end of file diff --git a/PCbuild/_testbuffer.vcxproj.filters b/PCbuild/_testbuffer.vcxproj.filters index e3ff428..eadf282 100644 --- a/PCbuild/_testbuffer.vcxproj.filters +++ b/PCbuild/_testbuffer.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {8d232240-921a-4bc2-87c3-93ffd3462f0a} - - - - - Source Files - - + + + + + {8d232240-921a-4bc2-87c3-93ffd3462f0a} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj index 8d3d321..365b07c 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {6901D91C-6E48-4BB7-9FEC-700C8131DF1D} - _testcapi - Win32Proj - false - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - 0x1e1F0000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D} + _testcapi + Win32Proj + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + 0x1e1F0000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_testcapi.vcxproj.filters b/PCbuild/_testcapi.vcxproj.filters index 04735f7..7a6ad1a 100644 --- a/PCbuild/_testcapi.vcxproj.filters +++ b/PCbuild/_testcapi.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {a76a90d8-8e8b-4c36-8f58-8bd46abe9f5e} - - - - - Source Files - - + + + + + {a76a90d8-8e8b-4c36-8f58-8bd46abe9f5e} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj new file mode 100644 index 0000000..d351ced --- /dev/null +++ b/PCbuild/_testconsole.vcxproj @@ -0,0 +1,83 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {B244E787-C445-441C-BDF4-5A4F1A3A1E51} + Win32Proj + _testconsole + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + + \ No newline at end of file diff --git a/PCbuild/_testconsole.vcxproj.filters b/PCbuild/_testconsole.vcxproj.filters new file mode 100644 index 0000000..0c25101 --- /dev/null +++ b/PCbuild/_testconsole.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj index 5f6fd6e..14a926e 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -1,80 +1,80 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {6DAC66D9-E703-4624-BE03-49112AB5AA62} - Win32Proj - _testembed - false - - - - - Application - Unicode - - - - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - - - Console - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {6DAC66D9-E703-4624-BE03-49112AB5AA62} + Win32Proj + _testembed + false + + + + + Application + Unicode + + + + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_testembed.vcxproj.filters b/PCbuild/_testembed.vcxproj.filters index 5a1b9f4..f7f9abe 100644 --- a/PCbuild/_testembed.vcxproj.filters +++ b/PCbuild/_testembed.vcxproj.filters @@ -1,22 +1,22 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj index 531868a..37c1a64 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {36D0C52C-DF4E-45D0-8BC7-E294C3ABC781} - _testimportmultiple - Win32Proj - false - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - 0x1e1F0000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {36D0C52C-DF4E-45D0-8BC7-E294C3ABC781} + _testimportmultiple + Win32Proj + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + 0x1e1F0000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + + diff --git a/PCbuild/_testimportmultiple.vcxproj.filters b/PCbuild/_testimportmultiple.vcxproj.filters index 42fa8cf..db0d0a6 100644 --- a/PCbuild/_testimportmultiple.vcxproj.filters +++ b/PCbuild/_testimportmultiple.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {1ec38ad9-1abf-4b80-8628-ac43ccba324b} - - - - - Source Files - - - + + + + + {1ec38ad9-1abf-4b80-8628-ac43ccba324b} + + + + + Source Files + + + diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj index 0245a72..106927c 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {16BFE6F0-22EF-40B5-B831-7E937119EF10} - Win32Proj - _testmultiphase - false - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - - - Console - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {16BFE6F0-22EF-40B5-B831-7E937119EF10} + Win32Proj + _testmultiphase + false + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/_testmultiphase.vcxproj.filters b/PCbuild/_testmultiphase.vcxproj.filters index f78f3ce..0c25101 100644 --- a/PCbuild/_testmultiphase.vcxproj.filters +++ b/PCbuild/_testmultiphase.vcxproj.filters @@ -1,22 +1,22 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index 9766115..6793106 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -1,94 +1,94 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {4946ECAC-2E69-4BF8-A90A-F5136F5094DF} - _tkinter - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(tcltkDir)include;%(AdditionalIncludeDirectories) - WITH_APPINIT;%(PreprocessorDefinitions) - Py_TCLTK_DIR="$(tcltkDir.TrimEnd('\').Replace('\', '\\'))";%(PreprocessorDefinitions) - - - $(tcltkLib);%(AdditionalDependencies) - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - {b5fd6f1d-129e-4bff-9340-03606fac7283} - - - {7e85eccf-a72c-4da4-9e52-884508e80ba1} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF} + _tkinter + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(tcltkDir)include;%(AdditionalIncludeDirectories) + WITH_APPINIT;%(PreprocessorDefinitions) + Py_TCLTK_DIR="$(tcltkDir.TrimEnd('\').Replace('\', '\\'))";%(PreprocessorDefinitions) + + + $(tcltkLib);%(AdditionalDependencies) + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + {b5fd6f1d-129e-4bff-9340-03606fac7283} + + + {7e85eccf-a72c-4da4-9e52-884508e80ba1} + + + + + \ No newline at end of file diff --git a/PCbuild/_tkinter.vcxproj.filters b/PCbuild/_tkinter.vcxproj.filters index c63b5fe..4e5cd47 100644 --- a/PCbuild/_tkinter.vcxproj.filters +++ b/PCbuild/_tkinter.vcxproj.filters @@ -1,16 +1,16 @@ - - - - - {b9ce64dd-cb95-472d-bbe8-5583b2cd375b} - - - - - Source Files - - - Source Files - - + + + + + {b9ce64dd-cb95-472d-bbe8-5583b2cd375b} + + + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/build.bat b/PCbuild/build.bat index bc3cf6c..1ad58f8 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -48,6 +48,7 @@ exit /b 127 :Run setlocal set platf=Win32 +set vs_platf=x86 set conf=Release set target=Build set dir=%~dp0 @@ -56,6 +57,10 @@ set verbose=/nologo /v:m set kill= set do_pgo= set pgo_job=-m test --pgo +set on_64_bit=true + +rem This may not be 100% accurate, but close enough. +if "%ProgramFiles(x86)%"=="" (set on_64_bit=false) :CheckOpts if "%~1"=="-h" goto Usage @@ -85,22 +90,26 @@ if "%IncludeTkinter%"=="" set IncludeTkinter=true if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" -if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( - if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( - echo.ERROR: Cannot cross-compile with PGO - echo. 32bit operating system detected. Ensure your PROCESSOR_ARCHITECTURE - echo. and PROCESSOR_ARCHITEW6432 environment variables are correct. - exit /b 1 +if "%platf%"=="x64" ( + if "%on_64_bit%"=="true" ( + rem This ought to always be correct these days... + set vs_platf=amd64 + ) else ( + if "%do_pgo%"=="true" ( + echo.ERROR: Cannot cross-compile with PGO + echo. 32bit operating system detected, if this is incorrect, + echo. make sure the ProgramFiles(x86^) environment variable is set + exit /b 1 + ) + set vs_platf=x86_amd64 ) ) -if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc" -if exist "%GIT%" set GITProperty=/p:GIT="%GIT%" -if not exist "%GIT%" echo Cannot find Git on PATH & set GITProperty= +if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc" +if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1 rem Setup the environment -call "%dir%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) +call "%dir%env.bat" %vs_platf% >nul if "%kill%"=="true" call :Kill @@ -114,12 +123,12 @@ if "%do_pgo%"=="true" ( @echo off call :Kill set conf=PGUpdate + set target=Build ) goto Build - :Kill echo on -%MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^ +msbuild "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^ /p:Configuration=%conf% /p:Platform=%platf%^ /p:KillPython=true @@ -131,11 +140,12 @@ rem Call on MSBuild to do the work, echo the command. rem Passing %1-9 is not the preferred option, but argument parsing in rem batch is, shall we say, "lackluster" echo on -%MSBUILD% "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ +msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ /p:Configuration=%conf% /p:Platform=%platf%^ /p:IncludeExternals=%IncludeExternals%^ /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^ - /p:UseTestMarker=%UseTestMarker% %GITProperty%^ + /p:UseTestMarker=%UseTestMarker%^ + /p:HG="%HG%"^ %1 %2 %3 %4 %5 %6 %7 %8 %9 @echo off @@ -143,4 +153,4 @@ goto :eof :Version rem Display the current build version information -%MSBUILD% "%dir%python.props" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9 +msbuild "%dir%python.props" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/PCbuild/build_pgo.bat b/PCbuild/build_pgo.bat deleted file mode 100644 index 872c382..0000000 --- a/PCbuild/build_pgo.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -echo.DeprecationWarning: -echo. This script is deprecated, use `build.bat --pgo` instead. -echo. - -call "%~dp0build.bat" --pgo %* diff --git a/PCbuild/find_msbuild.bat b/PCbuild/find_msbuild.bat deleted file mode 100644 index 1a8bfa8..0000000 --- a/PCbuild/find_msbuild.bat +++ /dev/null @@ -1,51 +0,0 @@ -@rem -@rem Searches for MSBuild.exe. This is the only tool we need to initiate -@rem a build, so we no longer search for the full VC toolset. -@rem -@rem This file is supposed to modify the state of the caller (specifically -@rem the MSBUILD variable), so we do not use setlocal or echo, and avoid -@rem changing any other persistent state. -@rem - -@rem No arguments provided means do full search -@if '%1' EQU '' goto :begin_search - -@rem One argument may be the full path. Use a goto so we don't try to -@rem parse the next if statement - incorrect quoting in the multi-arg -@rem case can cause us to break immediately. -@if '%2' EQU '' goto :one_arg - -@rem Entire command line may represent the full path if quoting failed. -@if exist "%*" (set MSBUILD="%*") & (set _Py_MSBuild_Source=environment) & goto :found -@goto :begin_search - -:one_arg -@if exist "%~1" (set MSBUILD="%~1") & (set _Py_MSBuild_Source=environment) & goto :found - -:begin_search -@set MSBUILD= - -@rem If msbuild.exe is on the PATH, assume that the user wants that one. -@where msbuild > "%TEMP%\msbuild.loc" 2> nul && set /P MSBUILD= < "%TEMP%\msbuild.loc" & del "%TEMP%\msbuild.loc" -@if exist "%MSBUILD%" set MSBUILD="%MSBUILD%" & (set _Py_MSBuild_Source=PATH) & goto :found - -@rem VS 2017 sets exactly one install as the "main" install, so we may find MSBuild in there. -@reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v 15.0 /reg:32 >nul 2>nul -@if NOT ERRORLEVEL 1 @for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v 15.0 /reg:32') DO @( - @if "%%i"=="15.0" @if exist "%%k\MSBuild\15.0\Bin\msbuild.exe" @(set MSBUILD="%%k\MSBuild\15.0\Bin\msbuild.exe") -) -@if exist %MSBUILD% (set _Py_MSBuild_Source=Visual Studio 2017 registry) & goto :found - -@rem VS 2015 and earlier register MSBuild separately, so we can find it. -@reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32 >nul 2>nul -@if NOT ERRORLEVEL 1 @for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32') DO @( - @if "%%i"=="MSBuildToolsPath" @if exist "%%k\msbuild.exe" @(set MSBUILD="%%k\msbuild.exe") -) -@if exist %MSBUILD% (set _Py_MSBuild_Source=registry) & goto :found - - -@exit /b 1 - -:found -@echo Using %MSBUILD% (found in the %_Py_MSBuild_Source%) -@set _Py_MSBuild_Source= diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 9cd1306..a5185be 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,19 +54,19 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k -set libraries=%libraries% sqlite-3.8.11.0 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j +set libraries=%libraries% sqlite-3.14.2.0 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6 -set libraries=%libraries% xz-5.0.5 +set libraries=%libraries% xz-5.2.2 for %%e in (%libraries%) do ( if exist %%e ( echo.%%e already exists, skipping. ) else ( echo.Fetching %%e... - svn export -q %SVNROOT%%%e + svn export %SVNROOT%%%e ) ) diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj index cd59401..9662cd4 100644 --- a/PCbuild/libeay.vcxproj +++ b/PCbuild/libeay.vcxproj @@ -1,907 +1,907 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Debug - x64 - - - Release - x64 - - - - {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0} - libeay - - - - - - - StaticLibrary - - - - - - - - <_DATEValue>#define DATE "$([System.DateTime]::Now.ToString(`ddd MMM dd HH':'mm':'ss yyyy`))" - <_CFLAGSValue>#define CFLAGS "cl /MD /Ox -W3 -Gs0 -Gy -nologo @(PreprocessorDefinitions->'-D%(Identity)',' ')" - <_PLATFORMValue Condition="$(Platform)=='Win32'">#define PLATFORM "VC-WIN32" - <_PLATFORMValue Condition="$(Platform)=='x64'">#define PLATFORM "VC-WIN64A" - - - - - - - - - - - - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0} + libeay + + + + + + + StaticLibrary + + + + + + + + <_DATEValue>#define DATE "$([System.DateTime]::Now.ToString(`ddd MMM dd HH':'mm':'ss yyyy`))" + <_CFLAGSValue>#define CFLAGS "cl /MD /Ox -W3 -Gs0 -Gy -nologo @(PreprocessorDefinitions->'-D%(Identity)',' ')" + <_PLATFORMValue Condition="$(Platform)=='Win32'">#define PLATFORM "VC-WIN32" + <_PLATFORMValue Condition="$(Platform)=='x64'">#define PLATFORM "VC-WIN64A" + + + + + + + + + + + + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj new file mode 100644 index 0000000..711f9bd --- /dev/null +++ b/PCbuild/liblzma.vcxproj @@ -0,0 +1,216 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {12728250-16EC-4DC6-94D7-E21DD88947F8} + liblzma + true + + + + + + + StaticLibrary + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + WIN32;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 66545ba..0de4e43 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -1,76 +1,76 @@ - - - - $(opensslDir)tmp\ - - - - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_PreprocessorDefinitionList>@(PreprocessorDefinitions) - - - - - - 4244;4267 - $(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes - $(_PreprocessorDefinitionList);%(PreprocessorDefinitions) - - - - - - nasm.exe -f win32 - nasm.exe -f win64 -DNEAR -Ox -g - - - - - - - - - - - + + + + $(opensslDir)tmp\ + + + + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_PreprocessorDefinitionList>@(PreprocessorDefinitions) + + + + + + 4244;4267 + $(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes + $(_PreprocessorDefinitionList);%(PreprocessorDefinitions) + + + + + + nasm.exe -f win32 + nasm.exe -f win64 -DNEAR -Ox -g + + + + + + + + + + + diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index 2d24d46..e0e6e93 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -1,122 +1,122 @@ - - - - {CC9B93A2-439D-4058-9D29-6DCF43774405} - Win32 - Release - true - true - true - true - true - - - - - $(Platform) - $(Configuration) - - Build - Clean - CleanAll - true - - - $(Platform) - $(Configuration) - - Build - Clean - CleanAll - true - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - false - - - - - - - - - - - - - - - - - - - - + + + + {CC9B93A2-439D-4058-9D29-6DCF43774405} + Win32 + Release + true + true + true + true + true + + + + + $(Platform) + $(Configuration) + + Build + Clean + CleanAll + true + + + $(Platform) + $(Configuration) + + Build + Clean + CleanAll + true + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + false + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 42a4d2b..0e65811 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -92,6 +92,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay", "ssleay.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testconsole", "_testconsole.vcxproj", "{B244E787-C445-441C-BDF4-5A4F1A3A1E51}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_asyncio", "_asyncio.vcxproj", "{384C224A-7474-476E-A01B-750EA7DE918C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -708,6 +712,22 @@ Global {0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}.Release|Win32.Build.0 = Release|Win32 {0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}.Release|x64.ActiveCfg = Release|x64 {0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}.Release|x64.Build.0 = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Debug|Win32.ActiveCfg = Debug|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Debug|Win32.Build.0 = Debug|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Debug|x64.ActiveCfg = Debug|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Debug|x64.Build.0 = Debug|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGInstrument|Win32.Build.0 = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGInstrument|x64.ActiveCfg = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGInstrument|x64.Build.0 = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGUpdate|Win32.Build.0 = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGUpdate|x64.ActiveCfg = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.PGUpdate|x64.Build.0 = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Release|Win32.ActiveCfg = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Release|Win32.Build.0 = Release|Win32 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Release|x64.ActiveCfg = Release|x64 + {B244E787-C445-441C-BDF4-5A4F1A3A1E51}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PCbuild/prepare_ssl.bat b/PCbuild/prepare_ssl.bat index 1be73e6..2f41ae8 100644 --- a/PCbuild/prepare_ssl.bat +++ b/PCbuild/prepare_ssl.bat @@ -3,10 +3,10 @@ if not defined HOST_PYTHON ( if "%1" EQU "Debug" ( shift set HOST_PYTHON=python_d.exe - if not exist python35_d.dll exit 1 + if not exist python36_d.dll exit 1 ) ELSE ( set HOST_PYTHON=python.exe - if not exist python35.dll exit 1 + if not exist python36.dll exit 1 ) ) %HOST_PYTHON% "%~dp0prepare_ssl.py" %1 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index 5e28748..99c7286 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -1,87 +1,87 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - <_ProjectFileVersion>10.0.30319.1 - {D06B6426-4762-44CC-8BAD-D79052507F2F} - pyexpat - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - - $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + <_ProjectFileVersion>10.0.30319.1 + {D06B6426-4762-44CC-8BAD-D79052507F2F} + pyexpat + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + + $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) + PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters index bfa04d5..abf362f 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -1,33 +1,33 @@ - - - - - {ddae77a6-7ca0-4a1b-b71c-deea5f4025de} - - - {5af9d40c-fc46-4640-ad84-3d1dd34a71d7} - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {ddae77a6-7ca0-4a1b-b71c-deea5f4025de} + + + {5af9d40c-fc46-4640-ad84-3d1dd34a71d7} + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj index 298be3f..2d4b5f6 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -1,82 +1,82 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {7B2727B5-5A3F-40EE-A866-43A13CD31446} - pylauncher - py - false - - - - - Application - MultiByte - - - - - - ClCompile - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - version.lib;%(AdditionalDependencies) - Console - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {7B2727B5-5A3F-40EE-A866-43A13CD31446} + pylauncher + py + false + + + + + Application + MultiByte + + + + + + ClCompile + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + version.lib;%(AdditionalDependencies) + Console + + + + + + + + + + + + + + + diff --git a/PCbuild/pylauncher.vcxproj.filters b/PCbuild/pylauncher.vcxproj.filters index 05a93d0..e4b23d2 100644 --- a/PCbuild/pylauncher.vcxproj.filters +++ b/PCbuild/pylauncher.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Resource Files - - - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 3dc6490..7012170 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -1,162 +1,163 @@ - - - - <_ProjectFileVersion>10.0.30319.1 - 10.0 - $(BuildPath) - $(OutDir)\ - $(MSBuildThisFileDirectory)obj\ - $(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\ - $(Py_IntDir)\$(ArchName)_PGO\$(ProjectName)\ - $(ProjectName) - $(TargetName)$(PyDebugExt) - false - false - true - true - false - false - - - - <_DebugPreprocessorDefinition>NDEBUG; - <_DebugPreprocessorDefinition Condition="$(Configuration) == 'Debug'">_DEBUG; - <_PlatformPreprocessorDefinition>_WIN32; - <_PlatformPreprocessorDefinition Condition="$(Platform) == 'x64'">_WIN64;_M_X64; - <_PydPreprocessorDefinition Condition="$(TargetExt) == '.pyd'">Py_BUILD_CORE_MODULE; - - - - $(PySourcePath)Include;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories) - WIN32;$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions) - - MaxSpeed - true - true - - MultiThreadedDLL - true - Level3 - ProgramDatabase - Default - true - true - NoExtensions - - - Disabled - false - MultiThreadedDebugDLL - - - Strict - - - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)$(TargetName).pdb - Windows - true - true - true - LIBC;%(IgnoreSpecificDefaultLibraries) - MachineX86 - MachineX64 - $(OutDir)$(TargetName).pgd - UseLinkTimeCodeGeneration - PGInstrument - PGUpdate - - - true - true - true - - - $(PySourcePath)PC;$(PySourcePath)Include;$(IntDir);%(AdditionalIncludeDirectories) - $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions) - 0x0409 - - - $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions) - true - true - Win32 - X64 - $(IntDir) - $(MSBuildProjectName)_i.c - $(MSBuildProjectName)_p.c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86\signtool.exe - $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86\signtool.exe - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\signtool.exe - <_SignCommand Condition="Exists($(SignToolPath))">"$(SignToolPath)" sign /q /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)" - - - - - - + + + + <_ProjectFileVersion>10.0.30319.1 + 10.0 + $(BuildPath) + $(OutDir)\ + $(MSBuildThisFileDirectory)obj\ + $(Py_IntDir)\$(ArchName)_$(Configuration)\$(ProjectName)\ + $(ProjectName) + $(TargetName)$(PyDebugExt) + false + false + true + true + false + false + + + + <_DebugPreprocessorDefinition>NDEBUG; + <_DebugPreprocessorDefinition Condition="$(Configuration) == 'Debug'">_DEBUG; + <_PlatformPreprocessorDefinition>_WIN32; + <_PlatformPreprocessorDefinition Condition="$(Platform) == 'x64'">_WIN64;_M_X64; + <_PydPreprocessorDefinition Condition="$(TargetExt) == '.pyd'">Py_BUILD_CORE_MODULE; + + + + $(PySourcePath)Include;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories) + WIN32;$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions) + + MaxSpeed + true + true + + MultiThreadedDLL + true + Level3 + ProgramDatabase + Default + true + true + NoExtensions + + + Disabled + false + MultiThreadedDebugDLL + + + Strict + + + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + Windows + true + true + true + LIBC;%(IgnoreSpecificDefaultLibraries) + MachineX86 + MachineX64 + $(OutDir)$(TargetName).pgd + UseLinkTimeCodeGeneration + PGInstrument + PGUpdate + + + true + true + true + + + $(PySourcePath)PC;$(PySourcePath)Include;$(IntDir);%(AdditionalIncludeDirectories) + $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions) + 0x0409 + + + $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions) + true + true + Win32 + X64 + $(IntDir) + $(MSBuildProjectName)_i.c + $(MSBuildProjectName)_p.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot10)\bin\x86 + $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86 + $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86 + $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\ + <_SignCommand Condition="Exists($(SdkBinPath)) and '$(SigningCertificate)' != '' and $(SupportSigning)">"$(SdkBinPath)\signtool.exe" sign /q /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)" + <_MakeCatCommand Condition="Exists($(SdkBinPath))">"$(SdkBinPath)\makecat.exe" + + + + + + \ No newline at end of file diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj index b5b0d13..0293935 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -1,87 +1,87 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782} - pyshellext - pyshellext - false - - - - - DynamicLibrary - Unicode - - - - - - ClCompile - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - - - version.lib;shlwapi.lib;%(AdditionalDependencies) - Console - ..\PC\pyshellext$(PyDebugExt).def - - - true - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782} + pyshellext + pyshellext + false + + + + + DynamicLibrary + Unicode + + + + + + ClCompile + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + + + version.lib;shlwapi.lib;%(AdditionalDependencies) + Console + ..\PC\pyshellext$(PyDebugExt).def + + + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/pyshellext.vcxproj.filters b/PCbuild/pyshellext.vcxproj.filters index d07e249..648e499 100644 --- a/PCbuild/pyshellext.vcxproj.filters +++ b/PCbuild/pyshellext.vcxproj.filters @@ -1,40 +1,40 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Source Files - - - - - Resource Files - - - - - Source Files - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Source Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/python.props b/PCbuild/python.props index 1b42ad8..dde94f7 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -1,173 +1,172 @@ - - - - Win32 - Release - - v140 - v120 - v110 - v100 - - $(BasePlatformToolset) - false - true - - - amd64 - win32 - $(ArchName)-pgo - - - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\)) - $(PySourcePath)\ - - - $(PySourcePath)PCBuild\win32\ - $(Py_OutDir)\win32\ - $(PySourcePath)PCBuild\amd64\ - $(Py_OutDir)\amd64\ - $(BuildPath32) - $(BuildPath64) - $(PySourcePath)PCBuild\$(ArchName)\ - $(BuildPath)\ - - - $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`)) - $(ExternalsDir)sqlite-3.8.11.0\ - $(ExternalsDir)bzip2-1.0.6\ - $(ExternalsDir)xz-5.0.5\ - $(ExternalsDir)openssl-1.0.2k\ - $(opensslDir)include32 - $(opensslDir)include64 - $(ExternalsDir)\nasm-2.11.06\ - - - _d - - - -test - - - -32 - - - $(BuildPath)python$(PyDebugExt).exe - - - - - <_PatchLevelContent>$([System.IO.File]::ReadAllText(`$(PySourcePath)Include\patchlevel.h`)) - $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MAJOR_VERSION\s+(\d+)`).Groups[1].Value) - $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MINOR_VERSION\s+(\d+)`).Groups[1].Value) - $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MICRO_VERSION\s+(\d+)`).Groups[1].Value) - <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_LEVEL\s+PY_RELEASE_LEVEL_(\w+)`).Groups[1].Value) - $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_SERIAL\s+(\d+)`).Groups[1].Value) - 15 - 10 - 11 - 12 - a$(ReleaseSerial) - b$(ReleaseSerial) - rc$(ReleaseSerial) - - - - - $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[1].Value) - $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[2].Value) - $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[3].Value) - $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[4].Value) - <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[5].Value) - $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[6].Value) - 0 - 15 - 10 - 11 - 12 - - - - $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) - $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)$(ReleaseLevelName) - $([msbuild]::BitwiseOr( - $([msbuild]::Multiply($(MajorVersionNumber), 16777216)), - $([msbuild]::BitwiseOr( - $([msbuild]::Multiply($(MinorVersionNumber), 65536)), - $([msbuild]::BitwiseOr( - $([msbuild]::Multiply($(MicroVersionNumber), 256)), - $([msbuild]::BitwiseOr( - $([msbuild]::Multiply($(ReleaseLevelNumber), 16)), - $(ReleaseSerial) - )) - )) - )) - )) - $([msbuild]::Add( - $(ReleaseSerial), - $([msbuild]::Add( - $([msbuild]::Multiply($(ReleaseLevelNumber), 10)), - $([msbuild]::Multiply($(MicroVersionNumber), 1000)) - )) - )) - $([msbuild]::Add($(Field3Value), 9000)) - - - python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt) - - - .cp$(MajorVersionNumber)$(MinorVersionNumber)-win32 - .cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64 - - - $(MajorVersionNumber).$(MinorVersionNumber)$(PyArchExt)$(PyTestExt) - - - - - - - - - - - - + + + + Win32 + Release + + v140 + v120 + v110 + v100 + + $(BasePlatformToolset) + false + true + + + amd64 + win32 + + + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\)) + $(PySourcePath)\ + + + $(PySourcePath)PCBuild\win32\ + $(Py_OutDir)\win32\ + $(PySourcePath)PCBuild\amd64\ + $(Py_OutDir)\amd64\ + $(BuildPath32) + $(BuildPath64) + $(PySourcePath)PCBuild\$(ArchName)\ + $(BuildPath)\ + + + $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`)) + $(ExternalsDir)sqlite-3.14.2.0\ + $(ExternalsDir)bzip2-1.0.6\ + $(ExternalsDir)xz-5.2.2\ + $(ExternalsDir)openssl-1.0.2j\ + $(opensslDir)include32 + $(opensslDir)include64 + $(ExternalsDir)\nasm-2.11.06\ + + + _d + + + -test + + + -32 + + + $(BuildPath)python$(PyDebugExt).exe + + + + + <_PatchLevelContent>$([System.IO.File]::ReadAllText(`$(PySourcePath)Include\patchlevel.h`)) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MAJOR_VERSION\s+(\d+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MINOR_VERSION\s+(\d+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MICRO_VERSION\s+(\d+)`).Groups[1].Value) + <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_LEVEL\s+PY_RELEASE_LEVEL_(\w+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_SERIAL\s+(\d+)`).Groups[1].Value) + 15 + 10 + 11 + 12 + a$(ReleaseSerial) + b$(ReleaseSerial) + rc$(ReleaseSerial) + + + + + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[2].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[3].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[4].Value) + <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[5].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[6].Value) + 0 + 15 + 10 + 11 + 12 + + + + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)$(ReleaseLevelName) + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MajorVersionNumber), 16777216)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MinorVersionNumber), 65536)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MicroVersionNumber), 256)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(ReleaseLevelNumber), 16)), + $(ReleaseSerial) + )) + )) + )) + )) + $([msbuild]::Add( + $(ReleaseSerial), + $([msbuild]::Add( + $([msbuild]::Multiply($(ReleaseLevelNumber), 10)), + $([msbuild]::Multiply($(MicroVersionNumber), 1000)) + )) + )) + $([msbuild]::Add($(Field3Value), 9000)) + + + python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt) + + + .cp$(MajorVersionNumber)$(MinorVersionNumber)-win32 + .cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64 + + + $(MajorVersionNumber).$(MinorVersionNumber)$(PyArchExt)$(PyTestExt) + + + + + + + + + + + + diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index edbc3c5..807213f 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -1,115 +1,112 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} - - - - - Application - false - MultiByte - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - _CONSOLE;%(PreprocessorDefinitions) - - - Console - 2000000 - 0x1d000000 - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - - - - ucrtbase - ucrtbased - - - - - - <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'Win32'">@set PATH=%PATH%%3B$(VCInstallDir)bin - <_PGOPath Condition="$(Configuration) == 'PGInstrument' and $(Platform) == 'x64'">@set PATH=%PATH%%3B$(VCInstallDir)bin\amd64 - <_Content>@rem This script invokes the most recently built Python with all arguments -@rem passed through to the interpreter. This file is generated by the -@rem build process and any changes *will* be thrown away by the next -@rem rebuild. -@rem This is only meant as a convenience for developing CPython -@rem and using it outside of that context is ill-advised. -@echo Running $(Configuration)^|$(Platform) interpreter... -@setlocal -@set PYTHONHOME=$(PySourcePath) -$(_PGOPath) -@"$(OutDir)python$(PyDebugExt).exe" %* - - <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat')) - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} + + + + + Application + false + MultiByte + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + _CONSOLE;%(PreprocessorDefinitions) + + + Console + 2000000 + 0x1d000000 + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + + + + ucrtbase + ucrtbased + + + + + + <_Content>@rem This script invokes the most recently built Python with all arguments +@rem passed through to the interpreter. This file is generated by the +@rem build process and any changes *will* be thrown away by the next +@rem rebuild. +@rem This is only meant as a convenience for developing CPython +@rem and using it outside of that context is ill-advised. +@echo Running $(Configuration)^|$(Platform) interpreter... +@setlocal +@set PYTHONHOME=$(PySourcePath) +@"$(OutDir)python$(PyDebugExt).exe" %* + + <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat')) + + + \ No newline at end of file diff --git a/PCbuild/python.vcxproj.filters b/PCbuild/python.vcxproj.filters index 958eee0..0662a4e 100644 --- a/PCbuild/python.vcxproj.filters +++ b/PCbuild/python.vcxproj.filters @@ -1,26 +1,26 @@ - - - - - {2d690795-de83-4a33-8235-3c5dafe45efa} - - - {8b010a19-5b29-45f1-a8a0-f672e2bbb11a} - - - - - Resource Files - - - - - Resource Files - - - - - Source Files - - - + + + + + {2d690795-de83-4a33-8235-3c5dafe45efa} + + + {8b010a19-5b29-45f1-a8a0-f672e2bbb11a} + + + + + Resource Files + + + + + Resource Files + + + + + Source Files + + + diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj index 125e071..c66c8ef 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -1,137 +1,137 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {885D4898-D08D-4091-9C40-C700CFE3FC5A} - python3dll - Win32Proj - python3 - false - - - - - DynamicLibrary - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - <_Machine>X86 - <_Machine Condition="$(Platform) == 'x64'">X64 - $(ExtensionsToDeleteOnClean);$(IntDir)python3_d.def;$(IntDir)python3stub.def - - - - false - - - $(OutDir)$(TargetName)stub.lib - $(PySourcePath)PC\python3.def - $(IntDir)python3_d.def - DllMain - - - lib /nologo /def:"$(IntDir)python3stub.def" /out:"$(OutDir)$(TargetName)stub.lib" /MACHINE:$(_Machine) - Rebuilding $(TargetName)stub.lib - $(OutDir)$(TargetName)stub.lib - - - - - - - - - - - - - - - - - - <_DefLines Remove="@(_DefLines)" /> - <_Lines Remove="@(_Lines)" /> - - - - - - <_Pattern1>(=python$(MajorVersionNumber)$(MinorVersionNumber))\. - <_Sub1>$1_d. - <_Pattern2>"python3" - <_Sub2>"python3_d" - - - <_Lines Include="@(_DefLines)"> - $([System.Text.RegularExpressions.Regex]::Replace($([System.Text.RegularExpressions.Regex]::Replace(`%(Identity)`, `$(_Pattern1)`, `$(_Sub1)`)), `$(_Pattern2)`, `$(_Sub2)`)) - - - - - - - - - <_DefLines Remove="@(_DefLines)" /> - <_Lines Remove="@(_Lines)" /> - - - - - - <_Pattern>^[\w.]+=.+?\.([^ ]+).*$ - <_Sub>$1 - - - <_Lines Include="EXPORTS" /> - <_Symbols Include="@(_DefLines)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(`%(Identity)`, `$(_Pattern)`))"> - $([System.Text.RegularExpressions.Regex]::Replace(`%(Identity)`, `$(_Pattern)`, `$(_Sub)`)) - - <_Lines Include="@(_Symbols->'%(Symbol)')" /> - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {885D4898-D08D-4091-9C40-C700CFE3FC5A} + python3dll + Win32Proj + python3 + false + + + + + DynamicLibrary + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_Machine>X86 + <_Machine Condition="$(Platform) == 'x64'">X64 + $(ExtensionsToDeleteOnClean);$(IntDir)python3_d.def;$(IntDir)python3stub.def + + + + false + + + $(OutDir)$(TargetName)stub.lib + $(PySourcePath)PC\python3.def + $(IntDir)python3_d.def + DllMain + + + lib /nologo /def:"$(IntDir)python3stub.def" /out:"$(OutDir)$(TargetName)stub.lib" /MACHINE:$(_Machine) + Rebuilding $(TargetName)stub.lib + $(OutDir)$(TargetName)stub.lib + + + + + + + + + + + + + + + + + + <_DefLines Remove="@(_DefLines)" /> + <_Lines Remove="@(_Lines)" /> + + + + + + <_Pattern1>(=python$(MajorVersionNumber)$(MinorVersionNumber))\. + <_Sub1>$1_d. + <_Pattern2>"python3" + <_Sub2>"python3_d" + + + <_Lines Include="@(_DefLines)"> + $([System.Text.RegularExpressions.Regex]::Replace($([System.Text.RegularExpressions.Regex]::Replace(`%(Identity)`, `$(_Pattern1)`, `$(_Sub1)`)), `$(_Pattern2)`, `$(_Sub2)`)) + + + + + + + + + <_DefLines Remove="@(_DefLines)" /> + <_Lines Remove="@(_Lines)" /> + + + + + + <_Pattern>^[\w.]+=.+?\.([^ ]+).*$ + <_Sub>$1 + + + <_Lines Include="EXPORTS" /> + <_Symbols Include="@(_DefLines)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(`%(Identity)`, `$(_Pattern)`))"> + $([System.Text.RegularExpressions.Regex]::Replace(`%(Identity)`, `$(_Pattern)`, `$(_Sub)`)) + + <_Lines Include="@(_Symbols->'%(Symbol)')" /> + + + + \ No newline at end of file diff --git a/PCbuild/python3dll.vcxproj.filters b/PCbuild/python3dll.vcxproj.filters index ff48bea..d250c45 100644 --- a/PCbuild/python3dll.vcxproj.filters +++ b/PCbuild/python3dll.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - - - Source Files - - - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Source Files + + + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index ba26076..6b23d8e 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -1,427 +1,434 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - pythoncore - - - - - DynamicLibrary - false - - - - - - true - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PyDllName) - - - Link - - - - /Zm200 %(AdditionalOptions) - $(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) - _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) - - - version.lib;ws2_32.lib;%(AdditionalDependencies) - 0x1e000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - git - <_GIT>$(GIT) - <_GIT Condition="$(GIT.Contains(` `))">"$(GIT)" - - - - - - - - $([System.IO.File]::ReadAllText('$(IntDir)gitbranch.txt').Trim()) - $([System.IO.File]::ReadAllText('$(IntDir)gitversion.txt').Trim()) - $([System.IO.File]::ReadAllText('$(IntDir)gittag.txt').Trim()) - - - - - GITVERSION="$(GitVersion)";GITTAG="$(GitTag)";GITBRANCH="$(GitBranch)";%(PreprocessorDefinitions) - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + pythoncore + + + + + DynamicLibrary + false + + + + + + true + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PyDllName) + + + Link + + + + /Zm200 %(AdditionalOptions) + $(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) + _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) + + + version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies) + 0x1e000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + hg + <_HG>$(HG) + <_HG Condition="$(HG.Contains(` `))">"$(HG)" + + + + + + + + $([System.IO.File]::ReadAllText('$(IntDir)hgbranch.txt').Trim()) + $([System.IO.File]::ReadAllText('$(IntDir)hgversion.txt').Trim()) + $([System.IO.File]::ReadAllText('$(IntDir)hgtag.txt').Trim()) + + + + + HGVERSION="$(HgVersion)";HGTAG="$(HgTag)";HGBRANCH="$(HgBranch)";%(PreprocessorDefinitions) + + + + + + + diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 478e354..762210d 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -1,983 +1,1007 @@ - - - - - {086b0afb-270c-4603-a02a-63d46f0b2b92} - - - {8e81609f-13ca-4eae-9fdb-f8af20c710c7} - - - {8787c5bb-bab6-4586-a42e-4a27c7b3ffb6} - - - {5d6d2d6c-9e61-4a1d-b0b2-5cc2f446d69e} - - - {9f12c4b1-322e-431e-abf1-e02550f50032} - - - {ab29a558-143d-4fe7-a039-b431fb429856} - - - {97349fee-0abf-48b0-a8f5-771bf39b8aee} - - - {ea21fc98-de89-4746-a979-c5616964329a} - - - {f2696406-14bc-48bd-90c5-e93ab82a21ac} - - - {c3e03a5c-56c7-45fd-8543-e5d2326b907d} - - - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules\_io - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Parser - - - Parser - - - PC - - - PC - - - Python - - - Python - - - Python - - - Python - - - Include - - - Include - - - Modules - - - Include - - - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules - - - Modules\_io - - - Modules\_io - - - Modules\_io - - - Modules\_io - - - Modules\_io - - - Modules\_io - - - Modules\_io - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\zlib - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Modules\cjkcodecs - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Objects - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - Parser - - - PC - - - PC - - - PC - - - PC - - - PC - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - Python - - - PC - - - Modules - - - Python - - - Objects - - - Modules - - - Modules - - - Modules - - - PC - - - Objects - - - - - Resource Files - - - \ No newline at end of file + + + + + {086b0afb-270c-4603-a02a-63d46f0b2b92} + + + {8e81609f-13ca-4eae-9fdb-f8af20c710c7} + + + {8787c5bb-bab6-4586-a42e-4a27c7b3ffb6} + + + {5d6d2d6c-9e61-4a1d-b0b2-5cc2f446d69e} + + + {9f12c4b1-322e-431e-abf1-e02550f50032} + + + {ab29a558-143d-4fe7-a039-b431fb429856} + + + {97349fee-0abf-48b0-a8f5-771bf39b8aee} + + + {ea21fc98-de89-4746-a979-c5616964329a} + + + {f2696406-14bc-48bd-90c5-e93ab82a21ac} + + + {c3e03a5c-56c7-45fd-8543-e5d2326b907d} + + + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Include + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules\_io + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Parser + + + Parser + + + PC + + + PC + + + Python + + + Python + + + Python + + + Python + + + Python + + + Include + + + Include + + + Modules + + + Include + + + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\_io + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\zlib + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Modules\cjkcodecs + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Objects + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + Parser + + + PC + + + PC + + + PC + + + PC + + + PC + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + Python + + + PC + + + Modules + + + Python + + + Objects + + + Modules + + + Modules + + + Modules + + + PC + + + Objects + + + + + Resource Files + + + diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj index 11f7654..e40f66c 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -1,79 +1,79 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {F4229CC3-873C-49AE-9729-DD308ED4CD4A} - false - - - - - Application - false - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - 2000000 - 0x1d000000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {F4229CC3-873C-49AE-9729-DD308ED4CD4A} + false + + + + + Application + false + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + 2000000 + 0x1d000000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/pythonw.vcxproj.filters b/PCbuild/pythonw.vcxproj.filters index 6032117..259866f 100644 --- a/PCbuild/pythonw.vcxproj.filters +++ b/PCbuild/pythonw.vcxproj.filters @@ -1,21 +1,21 @@ - - - - - {0434cf11-a311-4a92-8a6c-4164aa79a7f2} - - - {e1d8ea6b-c65d-42f4-9eed-6010846ed378} - - - - - Resource Files - - - - - Source Files - - + + + + + {0434cf11-a311-4a92-8a6c-4164aa79a7f2} + + + {e1d8ea6b-c65d-42f4-9eed-6010846ed378} + + + + + Resource Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj index e836ccc..eabf883 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -1,82 +1,82 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6} - pywlauncher - pyw - false - - - - - Application - Unicode - - - - - - ClCompile - - - - - - - - - _WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - - - version.lib;%(AdditionalDependencies) - Windows - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {1D4B18D3-7C12-4ECB-9179-8531FF876CE6} + pywlauncher + pyw + false + + + + + Application + Unicode + + + + + + ClCompile + + + + + + + + + _WINDOWS;%(PreprocessorDefinitions) + MultiThreaded + + + version.lib;%(AdditionalDependencies) + Windows + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/pywlauncher.vcxproj.filters b/PCbuild/pywlauncher.vcxproj.filters index 05a93d0..e4b23d2 100644 --- a/PCbuild/pywlauncher.vcxproj.filters +++ b/PCbuild/pywlauncher.vcxproj.filters @@ -1,32 +1,32 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Resource Files - - - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 6857925..c04ba4e 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -48,7 +48,7 @@ Debug Used to build Python with extra debugging capabilities, equivalent to using ./configure --with-pydebug on UNIX. All binaries built using this configuration have "_d" added to their name: - python35_d.dll, python_d.exe, parser_d.pyd, and so on. Both the + python36_d.dll, python_d.exe, parser_d.pyd, and so on. Both the build and rt (run test) batch files in this directory accept a -d option for debug builds. If you are building Python to help with development of CPython, you will most likely use this configuration. @@ -169,7 +169,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.0.2k of the OpenSSL secure sockets + Python wrapper for version 1.0.2j of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/ @@ -204,11 +204,11 @@ _ssl functionality to _ssl or _hashlib. They will not clean up their output with the normal Clean target; CleanAll should be used instead. _sqlite3 - Wraps SQLite 3.8.11.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.14.2.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter - Wraps version 8.6.4 of the Tk windowing system. + Wraps version 8.6.6 of the Tk windowing system. Homepage: http://www.tcl.tk/ diff --git a/PCbuild/rmpyc.py b/PCbuild/rmpyc.py index 0b58f68..a1e75bb 100644 --- a/PCbuild/rmpyc.py +++ b/PCbuild/rmpyc.py @@ -1,19 +1,25 @@ -# Remove all the .pyc files under ../Lib. +# Remove all the .pyc and .pyo files under ../Lib. def deltree(root): import os from os.path import join - npyc = 0 + npyc = npyo = 0 for root, dirs, files in os.walk(root): for name in files: - # to be thorough - if name.endswith(('.pyc', '.pyo')): + delete = False + if name.endswith('.pyc'): + delete = True npyc += 1 + elif name.endswith('.pyo'): + delete = True + npyo += 1 + + if delete: os.remove(join(root, name)) - return npyc + return npyc, npyo -npyc = deltree("../Lib") -print(npyc, ".pyc deleted") +npyc, npyo = deltree("../Lib") +print(npyc, ".pyc deleted,", npyo, ".pyo deleted") diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 2056854..3582672 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -4,8 +4,8 @@ rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args rem -d Run Debug build (python_d.exe). Else release build. rem -O Run python.exe or python_d.exe (see -d) with -O. rem -q "quick" -- normally the tests are run twice, the first time -rem after deleting all the .pyc files reachable from Lib/. -rem -q runs the tests just once, and without deleting .pyc files. +rem after deleting all the .py[co] files reachable from Lib/. +rem -q runs the tests just once, and without deleting .py[co] files. rem -x64 Run the 64-bit build of python (or python_d if -d was specified) rem from the 'amd64' dir instead of the 32-bit build in this dir. rem All leading instances of these switches are shifted off, and @@ -42,17 +42,20 @@ if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts set exe=%prefix%python%suffix%.exe -set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %regrtestargs% +set cmd="%exe%" %dashO% -Wd -E -bb -m test %regrtestargs% if defined qmode goto Qmode -echo Deleting .pyc files ... +echo Deleting .pyc/.pyo files ... "%exe%" "%pcbuild%rmpyc.py" +echo Cleaning _pth files ... +if exist %prefix%*._pth del %prefix%*._pth + echo on %cmd% @echo off -echo About to run again without deleting .pyc first: +echo About to run again without deleting .pyc/.pyo first: pause :Qmode diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj index 8ac16b7..d6112ab 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -1,82 +1,82 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {18CAE28C-B454-46C1-87A0-493D91D97F03} - select - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - ws2_32.lib;%(AdditionalDependencies) - 0x1D110000 - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {18CAE28C-B454-46C1-87A0-493D91D97F03} + select + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ws2_32.lib;%(AdditionalDependencies) + 0x1D110000 + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/select.vcxproj.filters b/PCbuild/select.vcxproj.filters index 9a994e6..55a2fc8 100644 --- a/PCbuild/select.vcxproj.filters +++ b/PCbuild/select.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {98346077-900c-4c7a-852f-a23470e37b40} - - - - - Source Files - - + + + + + {98346077-900c-4c7a-852f-a23470e37b40} + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index d251367..4f5b196 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -1,89 +1,89 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {A1A295E5-463C-437F-81CA-1F32367685DA} - sqlite3 - .pyd - false - - - - - DynamicLibrary - NotSet - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - <_SqliteVersion>$([System.Text.RegularExpressions.Regex]::Match(`$(sqlite3Dir)`, `((\d+)\.(\d+)\.(\d+)\.(\d+))\\?$`).Groups) - $(_SqliteVersion.Split(`;`)[1]) - $(_SqliteVersion.Split(`;`)[2]) - $(_SqliteVersion.Split(`;`)[3]) - $(_SqliteVersion.Split(`;`)[4]) - $(_SqliteVersion.Split(`;`)[5]) - - - - $(sqlite3Dir);%(AdditionalIncludeDirectories) - SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) - Level1 - - - SQLITE_VERSION=$(SqliteVersion);SQLITE_MAJOR_VERSION=$(SqliteMajorVersion);SQLITE_MINOR_VERSION=$(SqliteMinorVersion);SQLITE_MICRO_VERSION=$(SqliteMicroVersion);SQLITE_PATCH_VERSION=$(SqlitePatchVersion);%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {A1A295E5-463C-437F-81CA-1F32367685DA} + sqlite3 + .pyd + false + + + + + DynamicLibrary + NotSet + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_SqliteVersion>$([System.Text.RegularExpressions.Regex]::Match(`$(sqlite3Dir)`, `((\d+)\.(\d+)\.(\d+)\.(\d+))\\?$`).Groups) + $(_SqliteVersion.Split(`;`)[1]) + $(_SqliteVersion.Split(`;`)[2]) + $(_SqliteVersion.Split(`;`)[3]) + $(_SqliteVersion.Split(`;`)[4]) + $(_SqliteVersion.Split(`;`)[5]) + + + + $(sqlite3Dir);%(AdditionalIncludeDirectories) + SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) + Level1 + + + SQLITE_VERSION=$(SqliteVersion);SQLITE_MAJOR_VERSION=$(SqliteMajorVersion);SQLITE_MINOR_VERSION=$(SqliteMinorVersion);SQLITE_MICRO_VERSION=$(SqliteMicroVersion);SQLITE_PATCH_VERSION=$(SqlitePatchVersion);%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + diff --git a/PCbuild/sqlite3.vcxproj.filters b/PCbuild/sqlite3.vcxproj.filters index 8d79004..86680c1 100644 --- a/PCbuild/sqlite3.vcxproj.filters +++ b/PCbuild/sqlite3.vcxproj.filters @@ -1,24 +1,24 @@ - - - - - {ce5b649d-a6f7-4459-9425-c883795d79df} - - - {0e842fe2-176b-4e83-9d1f-0ad13a859efd} - - - - - Header Files - - - Header Files - - - - - Source Files - - + + + + + {ce5b649d-a6f7-4459-9425-c883795d79df} + + + {0e842fe2-176b-4e83-9d1f-0ad13a859efd} + + + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/ssleay.vcxproj b/PCbuild/ssleay.vcxproj index 1499fbd..439e3ac 100644 --- a/PCbuild/ssleay.vcxproj +++ b/PCbuild/ssleay.vcxproj @@ -1,119 +1,119 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Debug - x64 - - - Release - x64 - - - - {10615B24-73BF-4EFA-93AA-236916321317} - ssleay - - - - - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {10615B24-73BF-4EFA-93AA-236916321317} + ssleay + + + + + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj index 69d98be..3dfd155 100644 --- a/PCbuild/tcl.vcxproj +++ b/PCbuild/tcl.vcxproj @@ -1,93 +1,93 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Debug - x64 - - - Release - x64 - - - - {B5FD6F1D-129E-4BFF-9340-03606FAC7283} - - - - - - - - Makefile - $(tcltkDir) - $(OutDir)bin\$(tclDLLName) - - - - - - - - - - msvcrt - symbols,msvcrt - INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" - DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" - setlocal -@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' -') -goto :eof -:build -set VCINSTALLDIR=$(VCInstallDir) -cd /D "$(tclDir)win" -nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) core shell dlls -nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) install-binaries install-libraries - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {B5FD6F1D-129E-4BFF-9340-03606FAC7283} + + + + + + + + Makefile + $(tcltkDir) + $(OutDir)bin\$(tclDLLName) + + + + + + + + + + msvcrt + symbols,msvcrt + INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" + DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" + setlocal +@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' +') +goto :eof +:build +set VCINSTALLDIR=$(VCInstallDir) +cd /D "$(tclDir)win" +nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) core shell dlls +nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) install-binaries install-libraries + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 960c85a..57bb98a 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -1,45 +1,45 @@ - - - - - 8 - 6 - 4 - 2 - $(TclMajorVersion) - $(TclMinorVersion) - $(TclPatchLevel) - $(TclRevision) - 8 - 4 - 3 - 6 - $(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\ - $(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\ - $(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\ - $(ExternalsDir)tcltk\ - $(ExternalsDir)tcltk64\ - g - tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).dll - tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib - tclsh$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).exe - tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).dll - tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib - tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll - $(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName) - $(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib - IX86 - AMD64 - TCL_MAJOR_VERSION=$(TclMajorVersion) TCL_MINOR_VERSION=$(TclMinorVersion) TCL_PATCH_LEVEL=$(TclPatchLevel) - TCL_MAJOR=$(TclMajorVersion) TCL_MINOR=$(TclMinorVersion) TCL_PATCH=$(TclPatchLevel) - TK_MAJOR_VERSION=$(TkMajorVersion) TK_MINOR_VERSION=$(TkMinorVersion) TK_PATCH_LEVEL=$(TkPatchLevel) - - Release - Debug - $(BuildDirTop)_$(TclMachine) - $(BuildDirTop)_VC13 - $(BuildDirTop)_VC12 - $(BuildDirTop)_VC11 - $(BuildDirTop)_VC10 - - \ No newline at end of file + + + + + 8 + 6 + 6 + 0 + $(TclMajorVersion) + $(TclMinorVersion) + $(TclPatchLevel) + $(TclRevision) + 8 + 4 + 3 + 6 + $(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\ + $(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\ + $(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\ + $(ExternalsDir)tcltk\ + $(ExternalsDir)tcltk64\ + g + tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).dll + tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib + tclsh$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).exe + tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).dll + tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib + tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll + $(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName) + $(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib + IX86 + AMD64 + TCL_MAJOR_VERSION=$(TclMajorVersion) TCL_MINOR_VERSION=$(TclMinorVersion) TCL_PATCH_LEVEL=$(TclPatchLevel) + TCL_MAJOR=$(TclMajorVersion) TCL_MINOR=$(TclMinorVersion) TCL_PATCH=$(TclPatchLevel) + TK_MAJOR_VERSION=$(TkMajorVersion) TK_MINOR_VERSION=$(TkMinorVersion) TK_PATCH_LEVEL=$(TkPatchLevel) + + Release + Debug + $(BuildDirTop)_$(TclMachine) + $(BuildDirTop)_VC13 + $(BuildDirTop)_VC12 + $(BuildDirTop)_VC11 + $(BuildDirTop)_VC10 + + diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index 407acdd..d1bc0ab 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -1,94 +1,94 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Debug - x64 - - - Release - x64 - - - - {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555} - tix - - - - - - - - Makefile - $(tcltkDir) - $(tixDLLPath) - - - - - - - - - - BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" - DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g - DEBUG=0 NODEBUG=1 - setlocal -@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' -') -goto :eof -:build -set VCINSTALLDIR=$(VCInstallDir) -cd /D "$(tixDir)win" -nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install - - rmdir /q/s "$(OutDir.TrimEnd(`\`))" - - - - - {b5fd6f1d-129e-4bff-9340-03606fac7283} - false - - - {7e85eccf-a72c-4da4-9e52-884508e80ba1} - false - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555} + tix + + + + + + + + Makefile + $(tcltkDir) + $(tixDLLPath) + + + + + + + + + + BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))" + DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g + DEBUG=0 NODEBUG=1 + setlocal +@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' +') +goto :eof +:build +set VCINSTALLDIR=$(VCInstallDir) +cd /D "$(tixDir)win" +nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install + + rmdir /q/s "$(OutDir.TrimEnd(`\`))" + + + + + {b5fd6f1d-129e-4bff-9340-03606fac7283} + false + + + {7e85eccf-a72c-4da4-9e52-884508e80ba1} + false + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj index 8d1aacb..a26318b 100644 --- a/PCbuild/tk.vcxproj +++ b/PCbuild/tk.vcxproj @@ -1,97 +1,97 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Debug - x64 - - - Release - x64 - - - - {7E85ECCF-A72C-4DA4-9E52-884508E80BA1} - tk - - - - - - - - Makefile - $(tcltkDir) - $(OutDir)bin\$(tkDLLName) - - - - - - - - - - msvcrt - symbols,msvcrt - TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))" - DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" - setlocal -@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' -') -goto :eof -:build -set VCINSTALLDIR=$(VCInstallDir) -cd /D "$(tkDir)win" -nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) all -nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) install-binaries install-libraries - - - - - {b5fd6f1d-129e-4bff-9340-03606fac7283} - false - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Debug + x64 + + + Release + x64 + + + + {7E85ECCF-A72C-4DA4-9E52-884508E80BA1} + tk + + + + + + + + Makefile + $(tcltkDir) + $(OutDir)bin\$(tkDLLName) + + + + + + + + + + msvcrt + symbols,msvcrt + TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))" + DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996" + setlocal +@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' +') +goto :eof +:build +set VCINSTALLDIR=$(VCInstallDir) +cd /D "$(tkDir)win" +nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) all +nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) install-binaries install-libraries + + + + + {b5fd6f1d-129e-4bff-9340-03606fac7283} + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj index cf99b95..317c1a8 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -1,86 +1,86 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {ECC7CEAC-A5E5-458E-BB9E-2413CC847881} - unicodedata - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - 0x1D120000 - - - - - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881} + unicodedata + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + 0x1D120000 + + + + + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/unicodedata.vcxproj.filters b/PCbuild/unicodedata.vcxproj.filters index 74f35f6..20e640e 100644 --- a/PCbuild/unicodedata.vcxproj.filters +++ b/PCbuild/unicodedata.vcxproj.filters @@ -1,24 +1,24 @@ - - - - - {b939a8f1-ccd7-420a-974a-243606dccd74} - - - {e2c055bb-ec62-4bbc-aa1c-d88da4d4ad1c} - - - - - Header Files - - - Header Files - - - - - Source Files - - + + + + + {b939a8f1-ccd7-420a-974a-243606dccd74} + + + {e2c055bb-ec62-4bbc-aa1c-d88da4d4ad1c} + + + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj index 2720cfa..12913ef 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -1,82 +1,82 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {28B5D777-DDF2-4B6B-B34F-31D938813856} - winsound - Win32Proj - - - - - DynamicLibrary - NotSet - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - winmm.lib;%(AdditionalDependencies) - - - - - - - - - - - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {28B5D777-DDF2-4B6B-B34F-31D938813856} + winsound + Win32Proj + + + + + DynamicLibrary + NotSet + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + winmm.lib;%(AdditionalDependencies) + + + + + + + + + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + + + + + \ No newline at end of file diff --git a/PCbuild/winsound.vcxproj.filters b/PCbuild/winsound.vcxproj.filters index d91fdbf..7d08931 100644 --- a/PCbuild/winsound.vcxproj.filters +++ b/PCbuild/winsound.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + \ No newline at end of file diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj index 770bc3e..9dbdc77 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -1,83 +1,83 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - PGInstrument - Win32 - - - PGInstrument - x64 - - - PGUpdate - Win32 - - - PGUpdate - x64 - - - Release - Win32 - - - Release - x64 - - - - {F749B822-B489-4CA5-A3AD-CE078F5F338A} - xxlimited - Win32Proj - - - - - DynamicLibrary - NotSet - false - - - - .pyd - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - %(PreprocessorDefinitions);Py_LIMITED_API=0x03050000 - - - wsock32.lib;%(AdditionalDependencies) - 0x1D110000 - - - - - - - - {885d4898-d08d-4091-9c40-c700cfe3fc5a} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + PGInstrument + Win32 + + + PGInstrument + x64 + + + PGUpdate + Win32 + + + PGUpdate + x64 + + + Release + Win32 + + + Release + x64 + + + + {F749B822-B489-4CA5-A3AD-CE078F5F338A} + xxlimited + Win32Proj + + + + + DynamicLibrary + NotSet + false + + + + .pyd + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + %(PreprocessorDefinitions);Py_LIMITED_API=0x03060000 + + + wsock32.lib;%(AdditionalDependencies) + 0x1D110000 + + + + + + + + {885d4898-d08d-4091-9c40-c700cfe3fc5a} + + + + + \ No newline at end of file diff --git a/PCbuild/xxlimited.vcxproj.filters b/PCbuild/xxlimited.vcxproj.filters index 807279a..21db468 100644 --- a/PCbuild/xxlimited.vcxproj.filters +++ b/PCbuild/xxlimited.vcxproj.filters @@ -1,13 +1,13 @@ - - - - - {eb5eebc7-3787-4f8f-b282-204db2962cc3} - - - - - Source Files - - + + + + + {eb5eebc7-3787-4f8f-b282-204db2962cc3} + + + + + Source Files + + \ No newline at end of file diff --git a/Parser/Python.asdl b/Parser/Python.asdl index cd0832d..f470ad1 100644 --- a/Parser/Python.asdl +++ b/Parser/Python.asdl @@ -1,4 +1,8 @@ --- ASDL's six builtin types are identifier, int, string, bytes, object, singleton +-- ASDL's 7 builtin types are: +-- identifier, int, string, bytes, object, singleton, constant +-- +-- singleton: None, True or False +-- constant can be None, whereas None means "no value" for object. module Python { @@ -24,6 +28,8 @@ module Python | Delete(expr* targets) | Assign(expr* targets, expr value) | AugAssign(expr target, operator op, expr value) + -- 'simple' indicates that we annotate simple name without parens + | AnnAssign(expr target, expr annotation, expr? value, int simple) -- use 'orelse' because else is a keyword in target languages | For(expr target, expr iter, stmt* body, stmt* orelse) @@ -71,9 +77,12 @@ module Python | Call(expr func, expr* args, keyword* keywords) | Num(object n) -- a number as a PyObject. | Str(string s) -- need to specify raw, unicode, etc? + | FormattedValue(expr value, int? conversion, expr? format_spec) + | JoinedStr(expr* values) | Bytes(bytes s) | NameConstant(singleton value) | Ellipsis + | Constant(constant value) -- the following expression can appear in assignment context | Attribute(expr value, identifier attr, expr_context ctx) @@ -101,7 +110,7 @@ module Python cmpop = Eq | NotEq | Lt | LtE | Gt | GtE | Is | IsNot | In | NotIn - comprehension = (expr target, expr iter, expr* ifs) + comprehension = (expr target, expr iter, expr* ifs, int is_async) excepthandler = ExceptHandler(expr? type, identifier? name, stmt* body) attributes (int lineno, int col_offset) diff --git a/Parser/asdl.py b/Parser/asdl.py index 121cdab..62f5c19 100644 --- a/Parser/asdl.py +++ b/Parser/asdl.py @@ -33,7 +33,8 @@ __all__ = [ # See the EBNF at the top of the file to understand the logical connection # between the various node types. -builtin_types = {'identifier', 'string', 'bytes', 'int', 'object', 'singleton'} +builtin_types = {'identifier', 'string', 'bytes', 'int', 'object', 'singleton', + 'constant'} class AST: def __repr__(self): diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py old mode 100755 new mode 100644 index ac9d2b6..725d73b --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -841,6 +841,7 @@ static PyObject* ast2obj_object(void *o) return (PyObject*)o; } #define ast2obj_singleton ast2obj_object +#define ast2obj_constant ast2obj_object #define ast2obj_identifier ast2obj_object #define ast2obj_string ast2obj_object #define ast2obj_bytes ast2obj_object @@ -878,6 +879,19 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena) return 0; } +static int obj2ast_constant(PyObject* obj, PyObject** out, PyArena* arena) +{ + if (obj) { + if (PyArena_AddPyObject(arena, obj) < 0) { + *out = NULL; + return -1; + } + Py_INCREF(obj); + } + *out = obj; + return 0; +} + static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena) { if (!PyUnicode_CheckExact(obj) && obj != Py_None) { @@ -913,7 +927,7 @@ static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) return 1; } - i = (int)PyLong_AsLong(obj); + i = _PyLong_AsInt(obj); if (i == -1 && PyErr_Occurred()) return 1; *out = i; diff --git a/Parser/grammar.c b/Parser/grammar.c index b598294..75fd5b9 100644 --- a/Parser/grammar.c +++ b/Parser/grammar.c @@ -28,6 +28,23 @@ newgrammar(int start) return g; } +void +freegrammar(grammar *g) +{ + int i; + for (i = 0; i < g->g_ndfas; i++) { + free(g->g_dfa[i].d_name); + for (int j = 0; j < g->g_dfa[i].d_nstates; j++) + PyObject_FREE(g->g_dfa[i].d_state[j].s_arc); + PyObject_FREE(g->g_dfa[i].d_state); + } + PyObject_FREE(g->g_dfa); + for (i = 0; i < g->g_ll.ll_nlabels; i++) + free(g->g_ll.ll_label[i].lb_str); + PyObject_FREE(g->g_ll.ll_label); + PyObject_FREE(g); +} + dfa * adddfa(grammar *g, int type, const char *name) { @@ -63,7 +80,7 @@ addstate(dfa *d) s->s_upper = 0; s->s_accel = NULL; s->s_accept = 0; - return Py_SAFE_DOWNCAST(s - d->d_state, Py_intptr_t, int); + return Py_SAFE_DOWNCAST(s - d->d_state, intptr_t, int); } void @@ -105,7 +122,7 @@ addlabel(labellist *ll, int type, const char *str) if (Py_DebugFlag) printf("Label @ %8p, %d: %s\n", ll, ll->ll_nlabels, PyGrammar_LabelRepr(lb)); - return Py_SAFE_DOWNCAST(lb - ll->ll_label, Py_intptr_t, int); + return Py_SAFE_DOWNCAST(lb - ll->ll_label, intptr_t, int); } /* Same, but rather dies than adds */ @@ -122,7 +139,13 @@ findlabel(labellist *ll, int type, const char *str) } fprintf(stderr, "Label %d/'%s' not found\n", type, str); Py_FatalError("grammar.c:findlabel()"); + + /* Py_FatalError() is declared with __attribute__((__noreturn__)). + GCC emits a warning without "return 0;" (compiler bug!), but Clang is + smarter and emits a warning on the return... */ +#ifndef __clang__ return 0; /* Make gcc -Wall happy */ +#endif } /* Forward */ diff --git a/Parser/myreadline.c b/Parser/myreadline.c index 28c7b6d..9f3c2e3 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -41,10 +41,7 @@ my_fgets(char *buf, int len, FILE *fp) (void)(PyOS_InputHook)(); errno = 0; clearerr(fp); - if (_PyVerify_fd(fileno(fp))) - p = fgets(buf, len, fp); - else - p = NULL; + p = fgets(buf, len, fp); if (p != NULL) return 0; /* No error */ err = errno; @@ -101,6 +98,100 @@ my_fgets(char *buf, int len, FILE *fp) /* NOTREACHED */ } +#ifdef MS_WINDOWS +/* Readline implementation using ReadConsoleW */ + +extern char _get_console_type(HANDLE handle); + +char * +_PyOS_WindowsConsoleReadline(HANDLE hStdIn) +{ + static wchar_t wbuf_local[1024 * 16]; + const DWORD chunk_size = 1024; + + DWORD n_read, total_read, wbuflen, u8len; + wchar_t *wbuf; + char *buf = NULL; + int err = 0; + + n_read = 0; + total_read = 0; + wbuf = wbuf_local; + wbuflen = sizeof(wbuf_local) / sizeof(wbuf_local[0]) - 1; + while (1) { + if (!ReadConsoleW(hStdIn, &wbuf[total_read], wbuflen - total_read, &n_read, NULL)) { + err = GetLastError(); + goto exit; + } + if (n_read == 0) { + int s; + err = GetLastError(); + if (err != ERROR_OPERATION_ABORTED) + goto exit; + err = 0; + HANDLE hInterruptEvent = _PyOS_SigintEvent(); + if (WaitForSingleObjectEx(hInterruptEvent, 100, FALSE) + == WAIT_OBJECT_0) { + ResetEvent(hInterruptEvent); +#ifdef WITH_THREAD + PyEval_RestoreThread(_PyOS_ReadlineTState); +#endif + s = PyErr_CheckSignals(); +#ifdef WITH_THREAD + PyEval_SaveThread(); +#endif + if (s < 0) + goto exit; + } + break; + } + + total_read += n_read; + if (total_read == 0 || wbuf[total_read - 1] == L'\n') { + break; + } + wbuflen += chunk_size; + if (wbuf == wbuf_local) { + wbuf[total_read] = '\0'; + wbuf = (wchar_t*)PyMem_RawMalloc(wbuflen * sizeof(wchar_t)); + if (wbuf) + wcscpy_s(wbuf, wbuflen, wbuf_local); + } + else + wbuf = (wchar_t*)PyMem_RawRealloc(wbuf, wbuflen * sizeof(wchar_t)); + } + + if (wbuf[0] == '\x1a') { + buf = PyMem_RawMalloc(1); + if (buf) + buf[0] = '\0'; + goto exit; + } + + u8len = WideCharToMultiByte(CP_UTF8, 0, wbuf, total_read, NULL, 0, NULL, NULL); + buf = PyMem_RawMalloc(u8len + 1); + u8len = WideCharToMultiByte(CP_UTF8, 0, wbuf, total_read, buf, u8len, NULL, NULL); + buf[u8len] = '\0'; + +exit: + if (wbuf != wbuf_local) + PyMem_RawFree(wbuf); + + if (err) { +#ifdef WITH_THREAD + PyEval_RestoreThread(_PyOS_ReadlineTState); +#endif + PyErr_SetFromWindowsErr(err); +#ifdef WITH_THREAD + PyEval_SaveThread(); +#endif + } + + return buf; +} + +#endif + /* Readline implementation using fgets() */ @@ -110,6 +201,46 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt) size_t n; char *p, *pr; +#ifdef MS_WINDOWS + if (!Py_LegacyWindowsStdioFlag && sys_stdin == stdin) { + HANDLE hStdIn, hStdErr; + + _Py_BEGIN_SUPPRESS_IPH + hStdIn = (HANDLE)_get_osfhandle(fileno(sys_stdin)); + hStdErr = (HANDLE)_get_osfhandle(fileno(stderr)); + _Py_END_SUPPRESS_IPH + + if (_get_console_type(hStdIn) == 'r') { + fflush(sys_stdout); + if (prompt) { + if (_get_console_type(hStdErr) == 'w') { + wchar_t *wbuf; + int wlen; + wlen = MultiByteToWideChar(CP_UTF8, 0, prompt, -1, + NULL, 0); + if (wlen && + (wbuf = PyMem_RawMalloc(wlen * sizeof(wchar_t)))) { + wlen = MultiByteToWideChar(CP_UTF8, 0, prompt, -1, + wbuf, wlen); + if (wlen) { + DWORD n; + fflush(stderr); + /* wlen includes null terminator, so subtract 1 */ + WriteConsoleW(hStdErr, wbuf, wlen - 1, &n, NULL); + } + PyMem_RawFree(wbuf); + } + } else { + fprintf(stderr, "%s", prompt); + fflush(stderr); + } + } + clearerr(sys_stdin); + return _PyOS_WindowsConsoleReadline(hStdIn); + } + } +#endif + n = 100; p = (char *)PyMem_RawMalloc(n); if (p == NULL) diff --git a/Parser/node.c b/Parser/node.c index 0010324..240d290 100644 --- a/Parser/node.c +++ b/Parser/node.c @@ -91,7 +91,7 @@ PyNode_AddChild(node *n1, int type, char *str, int lineno, int col_offset) if (current_capacity < 0 || required_capacity < 0) return E_OVERFLOW; if (current_capacity < required_capacity) { - if ((size_t)required_capacity > PY_SIZE_MAX / sizeof(node)) { + if ((size_t)required_capacity > SIZE_MAX / sizeof(node)) { return E_NOMEM; } n = n1->n_child; diff --git a/Parser/parser.c b/Parser/parser.c index 56ec514..41072c4 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -140,21 +140,20 @@ classify(parser_state *ps, int type, const char *str) int n = g->g_ll.ll_nlabels; if (type == NAME) { - const char *s = str; label *l = g->g_ll.ll_label; int i; for (i = n; i > 0; i--, l++) { if (l->lb_type != NAME || l->lb_str == NULL || - l->lb_str[0] != s[0] || - strcmp(l->lb_str, s) != 0) + l->lb_str[0] != str[0] || + strcmp(l->lb_str, str) != 0) continue; #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD #if 0 /* Leaving this in as an example */ if (!(ps->p_flags & CO_FUTURE_WITH_STATEMENT)) { - if (s[0] == 'w' && strcmp(s, "with") == 0) + if (str[0] == 'w' && strcmp(str, "with") == 0) break; /* not a keyword yet */ - else if (s[0] == 'a' && strcmp(s, "as") == 0) + else if (str[0] == 'a' && strcmp(str, "as") == 0) break; /* not a keyword yet */ } #endif diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 629dee5..1f467d6 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -161,10 +161,10 @@ PyParser_ParseFileFlagsEx(FILE *fp, const char *filename, #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD #if 0 -static char with_msg[] = +static const char with_msg[] = "%s:%d: Warning: 'with' will become a reserved keyword in Python 2.6\n"; -static char as_msg[] = +static const char as_msg[] = "%s:%d: Warning: 'as' will become a reserved keyword in Python 2.6\n"; static void @@ -255,7 +255,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, #endif if (a >= tok->line_start) col_offset = Py_SAFE_DOWNCAST(a - tok->line_start, - Py_intptr_t, int); + intptr_t, int); else col_offset = -1; diff --git a/Parser/pgen.c b/Parser/pgen.c index f3031ae..6451a1d 100644 --- a/Parser/pgen.c +++ b/Parser/pgen.c @@ -117,6 +117,16 @@ newnfagrammar(void) return gr; } +static void +freenfagrammar(nfagrammar *gr) +{ + for (int i = 0; i < gr->gr_nnfas; i++) { + PyObject_FREE(gr->gr_nfa[i]->nf_state); + } + PyObject_FREE(gr->gr_nfa); + PyObject_FREE(gr); +} + static nfa * addnfa(nfagrammar *gr, char *name) { @@ -134,7 +144,7 @@ addnfa(nfagrammar *gr, char *name) #ifdef Py_DEBUG -static char REQNFMT[] = "metacompile: less than %d children\n"; +static const char REQNFMT[] = "metacompile: less than %d children\n"; #define REQN(i, count) do { \ if (i < count) { \ @@ -379,7 +389,7 @@ typedef struct _ss_dfa { /* Forward */ static void printssdfa(int xx_nstates, ss_state *xx_state, int nbits, - labellist *ll, char *msg); + labellist *ll, const char *msg); static void simplify(int xx_nstates, ss_state *xx_state); static void convert(dfa *d, int xx_nstates, ss_state *xx_state); @@ -488,13 +498,17 @@ makedfa(nfagrammar *gr, nfa *nf, dfa *d) convert(d, xx_nstates, xx_state); - /* XXX cleanup */ + for (int i = 0; i < xx_nstates; i++) { + for (int j = 0; j < xx_state[i].ss_narcs; j++) + delbitset(xx_state[i].ss_arc[j].sa_bitset); + PyObject_FREE(xx_state[i].ss_arc); + } PyObject_FREE(xx_state); } static void printssdfa(int xx_nstates, ss_state *xx_state, int nbits, - labellist *ll, char *msg) + labellist *ll, const char *msg) { int i, ibit, iarc; ss_state *yy; @@ -669,7 +683,7 @@ pgen(node *n) g = maketables(gr); translatelabels(g); addfirstsets(g); - PyObject_FREE(gr); + freenfagrammar(gr); return g; } diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c index 0f055d6..e386248 100644 --- a/Parser/pgenmain.c +++ b/Parser/pgenmain.c @@ -27,7 +27,7 @@ int Py_VerboseFlag; int Py_IgnoreEnvironmentFlag; /* Forward */ -grammar *getgrammar(char *filename); +grammar *getgrammar(const char *filename); void Py_Exit(int) _Py_NO_RETURN; @@ -37,6 +37,15 @@ Py_Exit(int sts) exit(sts); } +#ifdef WITH_THREAD +/* Needed by obmalloc.c */ +int PyGILState_Check(void) +{ return 1; } +#endif + +void _PyMem_DumpTraceback(int fd, const void *ptr) +{} + int main(int argc, char **argv) { @@ -71,12 +80,13 @@ main(int argc, char **argv) printf("Writing %s ...\n", graminit_h); printnonterminals(g, fp); fclose(fp); + freegrammar(g); Py_Exit(0); return 0; /* Make gcc -Wall happy */ } grammar * -getgrammar(char *filename) +getgrammar(const char *filename) { FILE *fp; node *n; diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 612cb23..0fa3aeb 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -202,8 +202,8 @@ error_ret(struct tok_state *tok) /* XXX */ } -static char * -get_normal_name(char *s) /* for utf-8 and latin-1 */ +static const char * +get_normal_name(const char *s) /* for utf-8 and latin-1 */ { char buf[13]; int i; @@ -264,7 +264,7 @@ get_coding_spec(const char *s, char **spec, Py_ssize_t size, struct tok_state *t if (begin < t) { char* r = new_string(begin, t - begin, tok); - char* q; + const char* q; if (!r) return 0; q = get_normal_name(r); @@ -446,7 +446,7 @@ fp_readl(char *s, int size, struct tok_state *tok) } if (PyUnicode_CheckExact(bufobj)) { - buf = _PyUnicode_AsStringAndSize(bufobj, &buflen); + buf = PyUnicode_AsUTF8AndSize(bufobj, &buflen); if (buf == NULL) { goto error; } @@ -1335,6 +1335,28 @@ verify_identifier(struct tok_state *tok) } #endif +static int +tok_decimal_tail(struct tok_state *tok) +{ + int c; + + while (1) { + do { + c = tok_nextc(tok); + } while (isdigit(c)); + if (c != '_') { + break; + } + c = tok_nextc(tok); + if (!isdigit(c)) { + tok->done = E_TOKEN; + tok_backup(tok, c); + return 0; + } + } + return c; +} + /* Get next token, after space stripping etc. */ static int @@ -1355,17 +1377,20 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) tok->atbol = 0; for (;;) { c = tok_nextc(tok); - if (c == ' ') + if (c == ' ') { col++, altcol++; + } else if (c == '\t') { col = (col/tok->tabsize + 1) * tok->tabsize; altcol = (altcol/tok->alttabsize + 1) * tok->alttabsize; } - else if (c == '\014') /* Control-L (formfeed) */ + else if (c == '\014') {/* Control-L (formfeed) */ col = altcol = 0; /* For Emacs users */ - else + } + else { break; + } } tok_backup(tok, c); if (c == '#' || c == '\n') { @@ -1374,10 +1399,12 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) not passed to the parser as NEWLINE tokens, except *totally* empty lines in interactive mode, which signal the end of a command group. */ - if (col == 0 && c == '\n' && tok->prompt != NULL) + if (col == 0 && c == '\n' && tok->prompt != NULL) { blankline = 0; /* Let it through */ - else + } + else { blankline = 1; /* Ignore completely */ + } /* We can't jump back right here since we still may need to skip to the end of a comment */ } @@ -1385,8 +1412,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) if (col == tok->indstack[tok->indent]) { /* No change */ if (altcol != tok->altindstack[tok->indent]) { - if (indenterror(tok)) + if (indenterror(tok)) { return ERRORTOKEN; + } } } else if (col > tok->indstack[tok->indent]) { @@ -1397,8 +1425,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) return ERRORTOKEN; } if (altcol <= tok->altindstack[tok->indent]) { - if (indenterror(tok)) + if (indenterror(tok)) { return ERRORTOKEN; + } } tok->pendin++; tok->indstack[++tok->indent] = col; @@ -1417,8 +1446,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) return ERRORTOKEN; } if (altcol != tok->altindstack[tok->indent]) { - if (indenterror(tok)) + if (indenterror(tok)) { return ERRORTOKEN; + } } } } @@ -1464,9 +1494,11 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) tok->start = tok->cur - 1; /* Skip comment */ - if (c == '#') - while (c != EOF && c != '\n') + if (c == '#') { + while (c != EOF && c != '\n') { c = tok_nextc(tok); + } + } /* Check for EOF and errors now */ if (c == EOF) { @@ -1477,31 +1509,41 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) nonascii = 0; if (is_potential_identifier_start(c)) { /* Process b"", r"", u"", br"" and rb"" */ - int saw_b = 0, saw_r = 0, saw_u = 0; + int saw_b = 0, saw_r = 0, saw_u = 0, saw_f = 0; while (1) { - if (!(saw_b || saw_u) && (c == 'b' || c == 'B')) + if (!(saw_b || saw_u || saw_f) && (c == 'b' || c == 'B')) saw_b = 1; /* Since this is a backwards compatibility support literal we don't want to support it in arbitrary order like byte literals. */ - else if (!(saw_b || saw_u || saw_r) && (c == 'u' || c == 'U')) + else if (!(saw_b || saw_u || saw_r || saw_f) + && (c == 'u'|| c == 'U')) { saw_u = 1; + } /* ur"" and ru"" are not supported */ - else if (!(saw_r || saw_u) && (c == 'r' || c == 'R')) + else if (!(saw_r || saw_u) && (c == 'r' || c == 'R')) { saw_r = 1; - else + } + else if (!(saw_f || saw_b || saw_u) && (c == 'f' || c == 'F')) { + saw_f = 1; + } + else { break; + } c = tok_nextc(tok); - if (c == '"' || c == '\'') + if (c == '"' || c == '\'') { goto letter_quote; + } } while (is_potential_identifier_char(c)) { - if (c >= 128) + if (c >= 128) { nonascii = 1; + } c = tok_nextc(tok); } tok_backup(tok, c); - if (nonascii && !verify_identifier(tok)) + if (nonascii && !verify_identifier(tok)) { return ERRORTOKEN; + } *p_start = tok->start; *p_end = tok->cur; @@ -1510,10 +1552,12 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) /* Current token length is 5. */ if (tok->async_def) { /* We're inside an 'async def' function. */ - if (memcmp(tok->start, "async", 5) == 0) + if (memcmp(tok->start, "async", 5) == 0) { return ASYNC; - if (memcmp(tok->start, "await", 5) == 0) + } + if (memcmp(tok->start, "await", 5) == 0) { return AWAIT; + } } else if (memcmp(tok->start, "async", 5) == 0) { /* The current token is 'async'. @@ -1546,8 +1590,9 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) /* Newline */ if (c == '\n') { tok->atbol = 1; - if (blankline || tok->level > 0) + if (blankline || tok->level > 0) { goto nextline; + } *p_start = tok->start; *p_end = tok->cur - 1; /* Leave '\n' out of the string */ tok->cont_line = 0; @@ -1570,11 +1615,13 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) *p_start = tok->start; *p_end = tok->cur; return ELLIPSIS; - } else { + } + else { tok_backup(tok, c); } tok_backup(tok, '.'); - } else { + } + else { tok_backup(tok, c); } *p_start = tok->start; @@ -1587,64 +1634,94 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) if (c == '0') { /* Hex, octal or binary -- maybe. */ c = tok_nextc(tok); - if (c == '.') - goto fraction; - if (c == 'j' || c == 'J') - goto imaginary; if (c == 'x' || c == 'X') { - /* Hex */ c = tok_nextc(tok); - if (!isxdigit(c)) { - tok->done = E_TOKEN; - tok_backup(tok, c); - return ERRORTOKEN; - } do { - c = tok_nextc(tok); - } while (isxdigit(c)); + if (c == '_') { + c = tok_nextc(tok); + } + if (!isxdigit(c)) { + tok->done = E_TOKEN; + tok_backup(tok, c); + return ERRORTOKEN; + } + do { + c = tok_nextc(tok); + } while (isxdigit(c)); + } while (c == '_'); } else if (c == 'o' || c == 'O') { /* Octal */ c = tok_nextc(tok); - if (c < '0' || c >= '8') { - tok->done = E_TOKEN; - tok_backup(tok, c); - return ERRORTOKEN; - } do { - c = tok_nextc(tok); - } while ('0' <= c && c < '8'); + if (c == '_') { + c = tok_nextc(tok); + } + if (c < '0' || c >= '8') { + tok->done = E_TOKEN; + tok_backup(tok, c); + return ERRORTOKEN; + } + do { + c = tok_nextc(tok); + } while ('0' <= c && c < '8'); + } while (c == '_'); } else if (c == 'b' || c == 'B') { /* Binary */ c = tok_nextc(tok); - if (c != '0' && c != '1') { - tok->done = E_TOKEN; - tok_backup(tok, c); - return ERRORTOKEN; - } do { - c = tok_nextc(tok); - } while (c == '0' || c == '1'); + if (c == '_') { + c = tok_nextc(tok); + } + if (c != '0' && c != '1') { + tok->done = E_TOKEN; + tok_backup(tok, c); + return ERRORTOKEN; + } + do { + c = tok_nextc(tok); + } while (c == '0' || c == '1'); + } while (c == '_'); } else { int nonzero = 0; /* maybe old-style octal; c is first char of it */ /* in any case, allow '0' as a literal */ - while (c == '0') + while (1) { + if (c == '_') { + c = tok_nextc(tok); + if (!isdigit(c)) { + tok->done = E_TOKEN; + tok_backup(tok, c); + return ERRORTOKEN; + } + } + if (c != '0') { + break; + } c = tok_nextc(tok); - while (isdigit(c)) { + } + if (isdigit(c)) { nonzero = 1; - c = tok_nextc(tok); + c = tok_decimal_tail(tok); + if (c == 0) { + return ERRORTOKEN; + } } - if (c == '.') + if (c == '.') { + c = tok_nextc(tok); goto fraction; - else if (c == 'e' || c == 'E') + } + else if (c == 'e' || c == 'E') { goto exponent; - else if (c == 'j' || c == 'J') + } + else if (c == 'j' || c == 'J') { goto imaginary; + } else if (nonzero) { + /* Old-style octal: now disallowed. */ tok->done = E_TOKEN; tok_backup(tok, c); return ERRORTOKEN; @@ -1653,17 +1730,22 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) } else { /* Decimal */ - do { - c = tok_nextc(tok); - } while (isdigit(c)); + c = tok_decimal_tail(tok); + if (c == 0) { + return ERRORTOKEN; + } { /* Accept floating point numbers. */ if (c == '.') { + c = tok_nextc(tok); fraction: /* Fraction */ - do { - c = tok_nextc(tok); - } while (isdigit(c)); + if (isdigit(c)) { + c = tok_decimal_tail(tok); + if (c == 0) { + return ERRORTOKEN; + } + } } if (c == 'e' || c == 'E') { int e; @@ -1685,14 +1767,16 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) *p_end = tok->cur; return NUMBER; } - do { - c = tok_nextc(tok); - } while (isdigit(c)); + c = tok_decimal_tail(tok); + if (c == 0) { + return ERRORTOKEN; + } } - if (c == 'j' || c == 'J') + if (c == 'j' || c == 'J') { /* Imaginary part */ imaginary: c = tok_nextc(tok); + } } } tok_backup(tok, c); @@ -1712,22 +1796,27 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) c = tok_nextc(tok); if (c == quote) { c = tok_nextc(tok); - if (c == quote) + if (c == quote) { quote_size = 3; - else + } + else { end_quote_size = 1; /* empty string found */ + } } - if (c != quote) + if (c != quote) { tok_backup(tok, c); + } /* Get rest of string */ while (end_quote_size != quote_size) { c = tok_nextc(tok); if (c == EOF) { - if (quote_size == 3) + if (quote_size == 3) { tok->done = E_EOFS; - else + } + else { tok->done = E_EOLS; + } tok->cur = tok->inp; return ERRORTOKEN; } @@ -1736,12 +1825,14 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) tok->cur = tok->inp; return ERRORTOKEN; } - if (c == quote) + if (c == quote) { end_quote_size += 1; + } else { end_quote_size = 0; - if (c == '\\') - c = tok_nextc(tok); /* skip escaped char */ + if (c == '\\') { + tok_nextc(tok); /* skip escaped char */ + } } } @@ -1771,7 +1862,8 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) int token3 = PyToken_ThreeChars(c, c2, c3); if (token3 != OP) { token = token3; - } else { + } + else { tok_backup(tok, c3); } *p_start = tok->start; diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c index 0793984..1069966 100644 --- a/Programs/_freeze_importlib.c +++ b/Programs/_freeze_importlib.c @@ -58,7 +58,7 @@ main(int argc, char *argv[]) fprintf(stderr, "cannot fstat '%s'\n", inpath); goto error; } - text_size = status.st_size; + text_size = (size_t)status.st_size; text = (char *) malloc(text_size + 1); if (text == NULL) { fprintf(stderr, "could not allocate %ld bytes\n", (long) text_size); diff --git a/Programs/_testembed.c b/Programs/_testembed.c index ab6a8c7..3968399 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -41,7 +41,7 @@ static void test_repeated_init_and_subinterpreters(void) #endif int i, j; - for (i=0; i<3; i++) { + for (i=0; i<15; i++) { printf("--- Pass %d ---\n", i); _testembed_Py_Initialize(); mainstate = PyThreadState_Get(); diff --git a/Programs/python.c b/Programs/python.c index 37b10b8..a7afbc7 100644 --- a/Programs/python.c +++ b/Programs/python.c @@ -24,6 +24,9 @@ main(int argc, char **argv) int i, res; char *oldloc; + /* Force malloc() allocator to bootstrap Python */ + (void)_PyMem_SetupAllocators("malloc"); + argv_copy = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); argv_copy2 = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); if (!argv_copy || !argv_copy2) { @@ -62,7 +65,13 @@ main(int argc, char **argv) setlocale(LC_ALL, oldloc); PyMem_RawFree(oldloc); + res = Py_Main(argc, argv_copy); + + /* Force again malloc() allocator to release memory blocks allocated + before Py_Main() */ + (void)_PyMem_SetupAllocators("malloc"); + for (i = 0; i < argc; i++) { PyMem_RawFree(argv_copy2[i]); } diff --git a/Python/Python-ast.c b/Python/Python-ast.c index ad53ba3..e0607ba 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -86,6 +86,15 @@ static char *AugAssign_fields[]={ "op", "value", }; +static PyTypeObject *AnnAssign_type; +_Py_IDENTIFIER(annotation); +_Py_IDENTIFIER(simple); +static char *AnnAssign_fields[]={ + "target", + "annotation", + "value", + "simple", +}; static PyTypeObject *For_type; _Py_IDENTIFIER(iter); _Py_IDENTIFIER(orelse); @@ -285,6 +294,18 @@ _Py_IDENTIFIER(s); static char *Str_fields[]={ "s", }; +static PyTypeObject *FormattedValue_type; +_Py_IDENTIFIER(conversion); +_Py_IDENTIFIER(format_spec); +static char *FormattedValue_fields[]={ + "value", + "conversion", + "format_spec", +}; +static PyTypeObject *JoinedStr_type; +static char *JoinedStr_fields[]={ + "values", +}; static PyTypeObject *Bytes_type; static char *Bytes_fields[]={ "s", @@ -294,6 +315,10 @@ static char *NameConstant_fields[]={ "value", }; static PyTypeObject *Ellipsis_type; +static PyTypeObject *Constant_type; +static char *Constant_fields[]={ + "value", +}; static PyTypeObject *Attribute_type; _Py_IDENTIFIER(attr); _Py_IDENTIFIER(ctx); @@ -410,10 +435,12 @@ static PyTypeObject *NotIn_type; static PyTypeObject *comprehension_type; static PyObject* ast2obj_comprehension(void*); _Py_IDENTIFIER(ifs); +_Py_IDENTIFIER(is_async); static char *comprehension_fields[]={ "target", "iter", "ifs", + "is_async", }; static PyTypeObject *excepthandler_type; static char *excepthandler_attributes[] = { @@ -450,7 +477,6 @@ static char *arg_attributes[] = { "col_offset", }; _Py_IDENTIFIER(arg); -_Py_IDENTIFIER(annotation); static char *arg_fields[]={ "arg", "annotation", @@ -697,6 +723,7 @@ static PyObject* ast2obj_object(void *o) return (PyObject*)o; } #define ast2obj_singleton ast2obj_object +#define ast2obj_constant ast2obj_object #define ast2obj_identifier ast2obj_object #define ast2obj_string ast2obj_object #define ast2obj_bytes ast2obj_object @@ -734,6 +761,19 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena) return 0; } +static int obj2ast_constant(PyObject* obj, PyObject** out, PyArena* arena) +{ + if (obj) { + if (PyArena_AddPyObject(arena, obj) < 0) { + *out = NULL; + return -1; + } + Py_INCREF(obj); + } + *out = obj; + return 0; +} + static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena) { if (!PyUnicode_CheckExact(obj) && obj != Py_None) { @@ -769,7 +809,7 @@ static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) return 1; } - i = (int)PyLong_AsLong(obj); + i = _PyLong_AsInt(obj); if (i == -1 && PyErr_Occurred()) return 1; *out = i; @@ -843,6 +883,8 @@ static int init_types(void) if (!Assign_type) return 0; AugAssign_type = make_type("AugAssign", stmt_type, AugAssign_fields, 3); if (!AugAssign_type) return 0; + AnnAssign_type = make_type("AnnAssign", stmt_type, AnnAssign_fields, 4); + if (!AnnAssign_type) return 0; For_type = make_type("For", stmt_type, For_fields, 4); if (!For_type) return 0; AsyncFor_type = make_type("AsyncFor", stmt_type, AsyncFor_fields, 4); @@ -917,6 +959,11 @@ static int init_types(void) if (!Num_type) return 0; Str_type = make_type("Str", expr_type, Str_fields, 1); if (!Str_type) return 0; + FormattedValue_type = make_type("FormattedValue", expr_type, + FormattedValue_fields, 3); + if (!FormattedValue_type) return 0; + JoinedStr_type = make_type("JoinedStr", expr_type, JoinedStr_fields, 1); + if (!JoinedStr_type) return 0; Bytes_type = make_type("Bytes", expr_type, Bytes_fields, 1); if (!Bytes_type) return 0; NameConstant_type = make_type("NameConstant", expr_type, @@ -924,6 +971,8 @@ static int init_types(void) if (!NameConstant_type) return 0; Ellipsis_type = make_type("Ellipsis", expr_type, NULL, 0); if (!Ellipsis_type) return 0; + Constant_type = make_type("Constant", expr_type, Constant_fields, 1); + if (!Constant_type) return 0; Attribute_type = make_type("Attribute", expr_type, Attribute_fields, 3); if (!Attribute_type) return 0; Subscript_type = make_type("Subscript", expr_type, Subscript_fields, 3); @@ -1101,7 +1150,7 @@ static int init_types(void) NotIn_singleton = PyType_GenericNew(NotIn_type, NULL, NULL); if (!NotIn_singleton) return 0; comprehension_type = make_type("comprehension", &AST_type, - comprehension_fields, 3); + comprehension_fields, 4); if (!comprehension_type) return 0; if (!add_attributes(comprehension_type, NULL, 0)) return 0; excepthandler_type = make_type("excepthandler", &AST_type, NULL, 0); @@ -1370,6 +1419,34 @@ AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int } stmt_ty +AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int simple, int + lineno, int col_offset, PyArena *arena) +{ + stmt_ty p; + if (!target) { + PyErr_SetString(PyExc_ValueError, + "field target is required for AnnAssign"); + return NULL; + } + if (!annotation) { + PyErr_SetString(PyExc_ValueError, + "field annotation is required for AnnAssign"); + return NULL; + } + p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p)); + if (!p) + return NULL; + p->kind = AnnAssign_kind; + p->v.AnnAssign.target = target; + p->v.AnnAssign.annotation = annotation; + p->v.AnnAssign.value = value; + p->v.AnnAssign.simple = simple; + p->lineno = lineno; + p->col_offset = col_offset; + return p; +} + +stmt_ty For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int lineno, int col_offset, PyArena *arena) { @@ -2063,6 +2140,42 @@ Str(string s, int lineno, int col_offset, PyArena *arena) } expr_ty +FormattedValue(expr_ty value, int conversion, expr_ty format_spec, int lineno, + int col_offset, PyArena *arena) +{ + expr_ty p; + if (!value) { + PyErr_SetString(PyExc_ValueError, + "field value is required for FormattedValue"); + return NULL; + } + p = (expr_ty)PyArena_Malloc(arena, sizeof(*p)); + if (!p) + return NULL; + p->kind = FormattedValue_kind; + p->v.FormattedValue.value = value; + p->v.FormattedValue.conversion = conversion; + p->v.FormattedValue.format_spec = format_spec; + p->lineno = lineno; + p->col_offset = col_offset; + return p; +} + +expr_ty +JoinedStr(asdl_seq * values, int lineno, int col_offset, PyArena *arena) +{ + expr_ty p; + p = (expr_ty)PyArena_Malloc(arena, sizeof(*p)); + if (!p) + return NULL; + p->kind = JoinedStr_kind; + p->v.JoinedStr.values = values; + p->lineno = lineno; + p->col_offset = col_offset; + return p; +} + +expr_ty Bytes(bytes s, int lineno, int col_offset, PyArena *arena) { expr_ty p; @@ -2114,6 +2227,25 @@ Ellipsis(int lineno, int col_offset, PyArena *arena) } expr_ty +Constant(constant value, int lineno, int col_offset, PyArena *arena) +{ + expr_ty p; + if (!value) { + PyErr_SetString(PyExc_ValueError, + "field value is required for Constant"); + return NULL; + } + p = (expr_ty)PyArena_Malloc(arena, sizeof(*p)); + if (!p) + return NULL; + p->kind = Constant_kind; + p->v.Constant.value = value; + p->lineno = lineno; + p->col_offset = col_offset; + return p; +} + +expr_ty Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int lineno, int col_offset, PyArena *arena) { @@ -2315,7 +2447,8 @@ Index(expr_ty value, PyArena *arena) } comprehension_ty -comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, PyArena *arena) +comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, int is_async, + PyArena *arena) { comprehension_ty p; if (!target) { @@ -2334,6 +2467,7 @@ comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, PyArena *arena) p->target = target; p->iter = iter; p->ifs = ifs; + p->is_async = is_async; return p; } @@ -2648,6 +2782,30 @@ ast2obj_stmt(void* _o) goto failed; Py_DECREF(value); break; + case AnnAssign_kind: + result = PyType_GenericNew(AnnAssign_type, NULL, NULL); + if (!result) goto failed; + value = ast2obj_expr(o->v.AnnAssign.target); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_target, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_expr(o->v.AnnAssign.annotation); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_annotation, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_expr(o->v.AnnAssign.value); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_value, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->v.AnnAssign.simple); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_simple, value) == -1) + goto failed; + Py_DECREF(value); + break; case For_kind: result = PyType_GenericNew(For_type, NULL, NULL); if (!result) goto failed; @@ -3164,6 +3322,34 @@ ast2obj_expr(void* _o) goto failed; Py_DECREF(value); break; + case FormattedValue_kind: + result = PyType_GenericNew(FormattedValue_type, NULL, NULL); + if (!result) goto failed; + value = ast2obj_expr(o->v.FormattedValue.value); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_value, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->v.FormattedValue.conversion); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_conversion, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_expr(o->v.FormattedValue.format_spec); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_format_spec, value) == -1) + goto failed; + Py_DECREF(value); + break; + case JoinedStr_kind: + result = PyType_GenericNew(JoinedStr_type, NULL, NULL); + if (!result) goto failed; + value = ast2obj_list(o->v.JoinedStr.values, ast2obj_expr); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_values, value) == -1) + goto failed; + Py_DECREF(value); + break; case Bytes_kind: result = PyType_GenericNew(Bytes_type, NULL, NULL); if (!result) goto failed; @@ -3186,6 +3372,15 @@ ast2obj_expr(void* _o) result = PyType_GenericNew(Ellipsis_type, NULL, NULL); if (!result) goto failed; break; + case Constant_kind: + result = PyType_GenericNew(Constant_type, NULL, NULL); + if (!result) goto failed; + value = ast2obj_constant(o->v.Constant.value); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_value, value) == -1) + goto failed; + Py_DECREF(value); + break; case Attribute_kind: result = PyType_GenericNew(Attribute_type, NULL, NULL); if (!result) goto failed; @@ -3531,6 +3726,11 @@ ast2obj_comprehension(void* _o) if (_PyObject_SetAttrId(result, &PyId_ifs, value) == -1) goto failed; Py_DECREF(value); + value = ast2obj_int(o->is_async); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_is_async, value) == -1) + goto failed; + Py_DECREF(value); return result; failed: Py_XDECREF(value); @@ -4458,6 +4658,64 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) if (*out == NULL) goto failed; return 0; } + isinstance = PyObject_IsInstance(obj, (PyObject*)AnnAssign_type); + if (isinstance == -1) { + return 1; + } + if (isinstance) { + expr_ty target; + expr_ty annotation; + expr_ty value; + int simple; + + if (_PyObject_HasAttrId(obj, &PyId_target)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_target); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &target, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AnnAssign"); + return 1; + } + if (_PyObject_HasAttrId(obj, &PyId_annotation)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_annotation); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &annotation, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"annotation\" missing from AnnAssign"); + return 1; + } + if (exists_not_none(obj, &PyId_value)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_value); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &value, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + value = NULL; + } + if (_PyObject_HasAttrId(obj, &PyId_simple)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_simple); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &simple, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"simple\" missing from AnnAssign"); + return 1; + } + *out = AnnAssign(target, annotation, value, simple, lineno, col_offset, + arena); + if (*out == NULL) goto failed; + return 0; + } isinstance = PyObject_IsInstance(obj, (PyObject*)For_type); if (isinstance == -1) { return 1; @@ -6205,6 +6463,90 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) if (*out == NULL) goto failed; return 0; } + isinstance = PyObject_IsInstance(obj, (PyObject*)FormattedValue_type); + if (isinstance == -1) { + return 1; + } + if (isinstance) { + expr_ty value; + int conversion; + expr_ty format_spec; + + if (_PyObject_HasAttrId(obj, &PyId_value)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_value); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &value, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from FormattedValue"); + return 1; + } + if (exists_not_none(obj, &PyId_conversion)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_conversion); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &conversion, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + conversion = 0; + } + if (exists_not_none(obj, &PyId_format_spec)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_format_spec); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &format_spec, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + format_spec = NULL; + } + *out = FormattedValue(value, conversion, format_spec, lineno, + col_offset, arena); + if (*out == NULL) goto failed; + return 0; + } + isinstance = PyObject_IsInstance(obj, (PyObject*)JoinedStr_type); + if (isinstance == -1) { + return 1; + } + if (isinstance) { + asdl_seq* values; + + if (_PyObject_HasAttrId(obj, &PyId_values)) { + int res; + Py_ssize_t len; + Py_ssize_t i; + tmp = _PyObject_GetAttrId(obj, &PyId_values); + if (tmp == NULL) goto failed; + if (!PyList_Check(tmp)) { + PyErr_Format(PyExc_TypeError, "JoinedStr field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name); + goto failed; + } + len = PyList_GET_SIZE(tmp); + values = _Py_asdl_seq_new(len, arena); + if (values == NULL) goto failed; + for (i = 0; i < len; i++) { + expr_ty value; + res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena); + if (res != 0) goto failed; + if (len != PyList_GET_SIZE(tmp)) { + PyErr_SetString(PyExc_RuntimeError, "JoinedStr field \"values\" changed size during iteration"); + goto failed; + } + asdl_seq_SET(values, i, value); + } + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from JoinedStr"); + return 1; + } + *out = JoinedStr(values, lineno, col_offset, arena); + if (*out == NULL) goto failed; + return 0; + } isinstance = PyObject_IsInstance(obj, (PyObject*)Bytes_type); if (isinstance == -1) { return 1; @@ -6259,6 +6601,28 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) if (*out == NULL) goto failed; return 0; } + isinstance = PyObject_IsInstance(obj, (PyObject*)Constant_type); + if (isinstance == -1) { + return 1; + } + if (isinstance) { + constant value; + + if (_PyObject_HasAttrId(obj, &PyId_value)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_value); + if (tmp == NULL) goto failed; + res = obj2ast_constant(tmp, &value, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Constant"); + return 1; + } + *out = Constant(value, lineno, col_offset, arena); + if (*out == NULL) goto failed; + return 0; + } isinstance = PyObject_IsInstance(obj, (PyObject*)Attribute_type); if (isinstance == -1) { return 1; @@ -6987,6 +7351,7 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena) expr_ty target; expr_ty iter; asdl_seq* ifs; + int is_async; if (_PyObject_HasAttrId(obj, &PyId_target)) { int res; @@ -7038,7 +7403,18 @@ obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena) PyErr_SetString(PyExc_TypeError, "required field \"ifs\" missing from comprehension"); return 1; } - *out = comprehension(target, iter, ifs, arena); + if (_PyObject_HasAttrId(obj, &PyId_is_async)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_is_async); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &is_async, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + PyErr_SetString(PyExc_TypeError, "required field \"is_async\" missing from comprehension"); + return 1; + } + *out = comprehension(target, iter, ifs, is_async, arena); return 0; failed: Py_XDECREF(tmp); @@ -7502,6 +7878,8 @@ PyInit__ast(void) NULL; if (PyDict_SetItemString(d, "AugAssign", (PyObject*)AugAssign_type) < 0) return NULL; + if (PyDict_SetItemString(d, "AnnAssign", (PyObject*)AnnAssign_type) < 0) + return NULL; if (PyDict_SetItemString(d, "For", (PyObject*)For_type) < 0) return NULL; if (PyDict_SetItemString(d, "AsyncFor", (PyObject*)AsyncFor_type) < 0) return NULL; @@ -7562,12 +7940,18 @@ PyInit__ast(void) if (PyDict_SetItemString(d, "Call", (PyObject*)Call_type) < 0) return NULL; if (PyDict_SetItemString(d, "Num", (PyObject*)Num_type) < 0) return NULL; if (PyDict_SetItemString(d, "Str", (PyObject*)Str_type) < 0) return NULL; + if (PyDict_SetItemString(d, "FormattedValue", + (PyObject*)FormattedValue_type) < 0) return NULL; + if (PyDict_SetItemString(d, "JoinedStr", (PyObject*)JoinedStr_type) < 0) + return NULL; if (PyDict_SetItemString(d, "Bytes", (PyObject*)Bytes_type) < 0) return NULL; if (PyDict_SetItemString(d, "NameConstant", (PyObject*)NameConstant_type) < 0) return NULL; if (PyDict_SetItemString(d, "Ellipsis", (PyObject*)Ellipsis_type) < 0) return NULL; + if (PyDict_SetItemString(d, "Constant", (PyObject*)Constant_type) < 0) + return NULL; if (PyDict_SetItemString(d, "Attribute", (PyObject*)Attribute_type) < 0) return NULL; if (PyDict_SetItemString(d, "Subscript", (PyObject*)Subscript_type) < 0) diff --git a/Python/_warnings.c b/Python/_warnings.c index 3928153..6cfae77 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -40,12 +40,11 @@ check_matched(PyObject *obj, PyObject *arg) A NULL return value can mean false or an error. */ static PyObject * -get_warnings_attr(const char *attr) +get_warnings_attr(const char *attr, int try_import) { static PyObject *warnings_str = NULL; PyObject *all_modules; - PyObject *warnings_module; - int result; + PyObject *warnings_module, *obj; if (warnings_str == NULL) { warnings_str = PyUnicode_InternFromString("warnings"); @@ -53,15 +52,34 @@ get_warnings_attr(const char *attr) return NULL; } - all_modules = PyImport_GetModuleDict(); - result = PyDict_Contains(all_modules, warnings_str); - if (result == -1 || result == 0) - return NULL; + /* don't try to import after the start of the Python finallization */ + if (try_import && _Py_Finalizing == NULL) { + warnings_module = PyImport_Import(warnings_str); + if (warnings_module == NULL) { + /* Fallback to the C implementation if we cannot get + the Python implementation */ + PyErr_Clear(); + return NULL; + } + } + else { + all_modules = PyImport_GetModuleDict(); - warnings_module = PyDict_GetItem(all_modules, warnings_str); - if (!PyObject_HasAttrString(warnings_module, attr)) + warnings_module = PyDict_GetItem(all_modules, warnings_str); + if (warnings_module == NULL) return NULL; - return PyObject_GetAttrString(warnings_module, attr); + + Py_INCREF(warnings_module); + } + + if (!PyObject_HasAttrString(warnings_module, attr)) { + Py_DECREF(warnings_module); + return NULL; + } + + obj = PyObject_GetAttrString(warnings_module, attr); + Py_DECREF(warnings_module); + return obj; } @@ -70,7 +88,7 @@ get_once_registry(void) { PyObject *registry; - registry = get_warnings_attr("onceregistry"); + registry = get_warnings_attr("onceregistry", 0); if (registry == NULL) { if (PyErr_Occurred()) return NULL; @@ -87,7 +105,7 @@ get_default_action(void) { PyObject *default_action; - default_action = get_warnings_attr("defaultaction"); + default_action = get_warnings_attr("defaultaction", 0); if (default_action == NULL) { if (PyErr_Occurred()) { return NULL; @@ -110,7 +128,7 @@ get_filter(PyObject *category, PyObject *text, Py_ssize_t lineno, Py_ssize_t i; PyObject *warnings_filters; - warnings_filters = get_warnings_attr("filters"); + warnings_filters = get_warnings_attr("filters", 0); if (warnings_filters == NULL) { if (PyErr_Occurred()) return NULL; @@ -287,8 +305,8 @@ update_registry(PyObject *registry, PyObject *text, PyObject *category, } static void -show_warning(PyObject *filename, int lineno, PyObject *text, PyObject - *category, PyObject *sourceline) +show_warning(PyObject *filename, int lineno, PyObject *text, + PyObject *category, PyObject *sourceline) { PyObject *f_stderr; PyObject *name; @@ -359,10 +377,64 @@ error: PyErr_Clear(); } +static int +call_show_warning(PyObject *category, PyObject *text, PyObject *message, + PyObject *filename, int lineno, PyObject *lineno_obj, + PyObject *sourceline, PyObject *source) +{ + PyObject *show_fn, *msg, *res, *warnmsg_cls = NULL; + + /* If the source parameter is set, try to get the Python implementation. + The Python implementation is able to log the traceback where the source + was allocated, whereas the C implementation doesnt. */ + show_fn = get_warnings_attr("_showwarnmsg", source != NULL); + if (show_fn == NULL) { + if (PyErr_Occurred()) + return -1; + show_warning(filename, lineno, text, category, sourceline); + return 0; + } + + if (!PyCallable_Check(show_fn)) { + PyErr_SetString(PyExc_TypeError, + "warnings._showwarnmsg() must be set to a callable"); + goto error; + } + + warnmsg_cls = get_warnings_attr("WarningMessage", 0); + if (warnmsg_cls == NULL) { + PyErr_SetString(PyExc_RuntimeError, + "unable to get warnings.WarningMessage"); + goto error; + } + + msg = PyObject_CallFunctionObjArgs(warnmsg_cls, message, category, + filename, lineno_obj, Py_None, Py_None, source, + NULL); + Py_DECREF(warnmsg_cls); + if (msg == NULL) + goto error; + + res = PyObject_CallFunctionObjArgs(show_fn, msg, NULL); + Py_DECREF(show_fn); + Py_DECREF(msg); + + if (res == NULL) + return -1; + + Py_DECREF(res); + return 0; + +error: + Py_XDECREF(show_fn); + return -1; +} + static PyObject * warn_explicit(PyObject *category, PyObject *message, PyObject *filename, int lineno, - PyObject *module, PyObject *registry, PyObject *sourceline) + PyObject *module, PyObject *registry, PyObject *sourceline, + PyObject *source) { PyObject *key = NULL, *text = NULL, *result = NULL, *lineno_obj = NULL; PyObject *item = NULL; @@ -470,31 +542,9 @@ warn_explicit(PyObject *category, PyObject *message, if (rc == 1) /* Already warned for this module. */ goto return_none; if (rc == 0) { - PyObject *show_fxn = get_warnings_attr("showwarning"); - if (show_fxn == NULL) { - if (PyErr_Occurred()) - goto cleanup; - show_warning(filename, lineno, text, category, sourceline); - } - else { - PyObject *res; - - if (!PyCallable_Check(show_fxn)) { - PyErr_SetString(PyExc_TypeError, - "warnings.showwarning() must be set to a " - "callable"); - Py_DECREF(show_fxn); - goto cleanup; - } - - res = PyObject_CallFunctionObjArgs(show_fxn, message, category, - filename, lineno_obj, - NULL); - Py_DECREF(show_fxn); - Py_XDECREF(res); - if (res == NULL) - goto cleanup; - } + if (call_show_warning(category, text, message, filename, lineno, + lineno_obj, sourceline, source) < 0) + goto cleanup; } else /* if (rc == -1) */ goto cleanup; @@ -738,7 +788,8 @@ get_category(PyObject *message, PyObject *category) } static PyObject * -do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level) +do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level, + PyObject *source) { PyObject *filename, *module, *registry, *res; int lineno; @@ -747,7 +798,7 @@ do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level) return NULL; res = warn_explicit(category, message, filename, lineno, module, registry, - NULL); + NULL, source); Py_DECREF(filename); Py_DECREF(registry); Py_DECREF(module); @@ -757,25 +808,27 @@ do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level) static PyObject * warnings_warn(PyObject *self, PyObject *args, PyObject *kwds) { - static char *kw_list[] = { "message", "category", "stacklevel", 0 }; - PyObject *message, *category = NULL; + static char *kw_list[] = {"message", "category", "stacklevel", + "source", NULL}; + PyObject *message, *category = NULL, *source = NULL; Py_ssize_t stack_level = 1; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|On:warn", kw_list, - &message, &category, &stack_level)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OnO:warn", kw_list, + &message, &category, &stack_level, &source)) return NULL; category = get_category(message, category); if (category == NULL) return NULL; - return do_warn(message, category, stack_level); + return do_warn(message, category, stack_level, source); } static PyObject * warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds) { static char *kwd_list[] = {"message", "category", "filename", "lineno", - "module", "registry", "module_globals", 0}; + "module", "registry", "module_globals", + "source", 0}; PyObject *message; PyObject *category; PyObject *filename; @@ -783,10 +836,11 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds) PyObject *module = NULL; PyObject *registry = NULL; PyObject *module_globals = NULL; + PyObject *sourceobj = NULL; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOUi|OOO:warn_explicit", + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOUi|OOOO:warn_explicit", kwd_list, &message, &category, &filename, &lineno, &module, - ®istry, &module_globals)) + ®istry, &module_globals, &sourceobj)) return NULL; if (module_globals) { @@ -842,14 +896,14 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds) /* Handle the warning. */ returned = warn_explicit(category, message, filename, lineno, module, - registry, source_line); + registry, source_line, sourceobj); Py_DECREF(source_list); return returned; } standard_call: return warn_explicit(category, message, filename, lineno, module, - registry, NULL); + registry, NULL, sourceobj); } static PyObject * @@ -864,14 +918,14 @@ warnings_filters_mutated(PyObject *self, PyObject *args) static int warn_unicode(PyObject *category, PyObject *message, - Py_ssize_t stack_level) + Py_ssize_t stack_level, PyObject *source) { PyObject *res; if (category == NULL) category = PyExc_RuntimeWarning; - res = do_warn(message, category, stack_level); + res = do_warn(message, category, stack_level, source); if (res == NULL) return -1; Py_DECREF(res); @@ -879,12 +933,28 @@ warn_unicode(PyObject *category, PyObject *message, return 0; } +static int +_PyErr_WarnFormatV(PyObject *source, + PyObject *category, Py_ssize_t stack_level, + const char *format, va_list vargs) +{ + PyObject *message; + int res; + + message = PyUnicode_FromFormatV(format, vargs); + if (message == NULL) + return -1; + + res = warn_unicode(category, message, stack_level, source); + Py_DECREF(message); + return res; +} + int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...) { - int ret; - PyObject *message; + int res; va_list vargs; #ifdef HAVE_STDARG_PROTOTYPES @@ -892,25 +962,38 @@ PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, #else va_start(vargs); #endif - message = PyUnicode_FromFormatV(format, vargs); - if (message != NULL) { - ret = warn_unicode(category, message, stack_level); - Py_DECREF(message); - } - else - ret = -1; + res = _PyErr_WarnFormatV(NULL, category, stack_level, format, vargs); va_end(vargs); - return ret; + return res; } int +PyErr_ResourceWarning(PyObject *source, Py_ssize_t stack_level, + const char *format, ...) +{ + int res; + va_list vargs; + +#ifdef HAVE_STDARG_PROTOTYPES + va_start(vargs, format); +#else + va_start(vargs); +#endif + res = _PyErr_WarnFormatV(source, PyExc_ResourceWarning, + stack_level, format, vargs); + va_end(vargs); + return res; +} + + +int PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level) { int ret; PyObject *message = PyUnicode_FromString(text); if (message == NULL) return -1; - ret = warn_unicode(category, message, stack_level); + ret = warn_unicode(category, message, stack_level, NULL); Py_DECREF(message); return ret; } @@ -921,7 +1004,7 @@ PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level) #undef PyErr_Warn PyAPI_FUNC(int) -PyErr_Warn(PyObject *category, char *text) +PyErr_Warn(PyObject *category, const char *text) { return PyErr_WarnEx(category, text, 1); } @@ -936,7 +1019,7 @@ PyErr_WarnExplicitObject(PyObject *category, PyObject *message, if (category == NULL) category = PyExc_RuntimeWarning; res = warn_explicit(category, message, filename, lineno, - module, registry, NULL); + module, registry, NULL, NULL); if (res == NULL) return -1; Py_DECREF(res); @@ -1000,7 +1083,7 @@ PyErr_WarnExplicitFormat(PyObject *category, if (message != NULL) { PyObject *res; res = warn_explicit(category, message, filename, lineno, - module, registry, NULL); + module, registry, NULL, NULL); Py_DECREF(message); if (res != NULL) { Py_DECREF(res); diff --git a/Python/asdl.c b/Python/asdl.c index df387b2..c211078 100644 --- a/Python/asdl.c +++ b/Python/asdl.c @@ -9,14 +9,14 @@ _Py_asdl_seq_new(Py_ssize_t size, PyArena *arena) /* check size is sane */ if (size < 0 || - (size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) { + (size && (((size_t)size - 1) > (SIZE_MAX / sizeof(void *))))) { PyErr_NoMemory(); return NULL; } n = (size ? (sizeof(void *) * (size - 1)) : 0); /* check if size can be added safely */ - if (n > PY_SIZE_MAX - sizeof(asdl_seq)) { + if (n > SIZE_MAX - sizeof(asdl_seq)) { PyErr_NoMemory(); return NULL; } @@ -40,14 +40,14 @@ _Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena) /* check size is sane */ if (size < 0 || - (size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) { + (size && (((size_t)size - 1) > (SIZE_MAX / sizeof(void *))))) { PyErr_NoMemory(); return NULL; } n = (size ? (sizeof(void *) * (size - 1)) : 0); /* check if size can be added safely */ - if (n > PY_SIZE_MAX - sizeof(asdl_seq)) { + if (n > SIZE_MAX - sizeof(asdl_seq)) { PyErr_NoMemory(); return NULL; } diff --git a/Python/ast.c b/Python/ast.c index d36a9b7..82f4529 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -132,6 +132,52 @@ validate_arguments(arguments_ty args) } static int +validate_constant(PyObject *value) +{ + if (value == Py_None || value == Py_Ellipsis) + return 1; + + if (PyLong_CheckExact(value) + || PyFloat_CheckExact(value) + || PyComplex_CheckExact(value) + || PyBool_Check(value) + || PyUnicode_CheckExact(value) + || PyBytes_CheckExact(value)) + return 1; + + if (PyTuple_CheckExact(value) || PyFrozenSet_CheckExact(value)) { + PyObject *it; + + it = PyObject_GetIter(value); + if (it == NULL) + return 0; + + while (1) { + PyObject *item = PyIter_Next(it); + if (item == NULL) { + if (PyErr_Occurred()) { + Py_DECREF(it); + return 0; + } + break; + } + + if (!validate_constant(item)) { + Py_DECREF(it); + Py_DECREF(item); + return 0; + } + Py_DECREF(item); + } + + Py_DECREF(it); + return 1; + } + + return 0; +} + +static int validate_expr(expr_ty exp, expr_context_ty ctx) { int check_ctx = 1; @@ -240,6 +286,14 @@ validate_expr(expr_ty exp, expr_context_ty ctx) return validate_expr(exp->v.Call.func, Load) && validate_exprs(exp->v.Call.args, Load, 0) && validate_keywords(exp->v.Call.keywords); + case Constant_kind: + if (!validate_constant(exp->v.Constant.value)) { + PyErr_Format(PyExc_TypeError, + "got an invalid type in Constant: %s", + Py_TYPE(exp->v.Constant.value)->tp_name); + return 0; + } + return 1; case Num_kind: { PyObject *n = exp->v.Num.n; if (!PyLong_CheckExact(n) && !PyFloat_CheckExact(n) && @@ -257,6 +311,14 @@ validate_expr(expr_ty exp, expr_context_ty ctx) } return 1; } + case JoinedStr_kind: + return validate_exprs(exp->v.JoinedStr.values, Load, 0); + case FormattedValue_kind: + if (validate_expr(exp->v.FormattedValue.value, Load) == 0) + return 0; + if (exp->v.FormattedValue.format_spec) + return validate_expr(exp->v.FormattedValue.format_spec, Load); + return 1; case Bytes_kind: { PyObject *b = exp->v.Bytes.s; if (!PyBytes_CheckExact(b)) { @@ -335,6 +397,17 @@ validate_stmt(stmt_ty stmt) case AugAssign_kind: return validate_expr(stmt->v.AugAssign.target, Store) && validate_expr(stmt->v.AugAssign.value, Load); + case AnnAssign_kind: + if (stmt->v.AnnAssign.target->kind != Name_kind && + stmt->v.AnnAssign.simple) { + PyErr_SetString(PyExc_TypeError, + "AnnAssign with simple non-Name target"); + return 0; + } + return validate_expr(stmt->v.AnnAssign.target, Store) && + (!stmt->v.AnnAssign.value || + validate_expr(stmt->v.AnnAssign.value, Load)) && + validate_expr(stmt->v.AnnAssign.annotation, Load); case For_kind: return validate_expr(stmt->v.For.target, Store) && validate_expr(stmt->v.For.iter, Load) && @@ -413,8 +486,8 @@ validate_stmt(stmt_ty stmt) case Import_kind: return validate_nonempty_seq(stmt->v.Import.names, "names", "Import"); case ImportFrom_kind: - if (stmt->v.ImportFrom.level < -1) { - PyErr_SetString(PyExc_ValueError, "ImportFrom level less than -1"); + if (stmt->v.ImportFrom.level < 0) { + PyErr_SetString(PyExc_ValueError, "Negative ImportFrom level"); return 0; } return validate_nonempty_seq(stmt->v.ImportFrom.names, "names", "ImportFrom"); @@ -512,8 +585,7 @@ PyAST_Validate(mod_ty mod) /* Data structure used internally */ struct compiling { - char *c_encoding; /* source encoding */ - PyArena *c_arena; /* arena for allocating memeory */ + PyArena *c_arena; /* Arena for allocating memory. */ PyObject *c_filename; /* filename */ PyObject *c_normalize; /* Normalization function from unicodedata. */ PyObject *c_normalize_args; /* Normalization argument tuple. */ @@ -535,9 +607,7 @@ static stmt_ty ast_for_for_stmt(struct compiling *, const node *, int); static expr_ty ast_for_call(struct compiling *, const node *, expr_ty); static PyObject *parsenumber(struct compiling *, const char *); -static PyObject *parsestr(struct compiling *, const node *n, int *bytesmode); -static PyObject *parsestrplus(struct compiling *, const node *n, - int *bytesmode); +static expr_ty parsestrplus(struct compiling *, const node *n); #define COMP_GENEXP 0 #define COMP_LISTCOMP 1 @@ -701,23 +771,11 @@ PyAST_FromNodeObject(const node *n, PyCompilerFlags *flags, c.c_arena = arena; /* borrowed reference */ c.c_filename = filename; - c.c_normalize = c.c_normalize_args = NULL; - if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) { - c.c_encoding = "utf-8"; - if (TYPE(n) == encoding_decl) { -#if 0 - ast_error(c, n, "encoding declaration in Unicode string"); - goto out; -#endif - n = CHILD(n, 0); - } - } else if (TYPE(n) == encoding_decl) { - c.c_encoding = STR(n); + c.c_normalize = NULL; + c.c_normalize_args = NULL; + + if (TYPE(n) == encoding_decl) n = CHILD(n, 0); - } else { - /* PEP 3120 */ - c.c_encoding = "utf-8"; - } k = 0; switch (TYPE(n)) { @@ -864,7 +922,7 @@ get_operator(const node *n) } } -static const char* FORBIDDEN[] = { +static const char * const FORBIDDEN[] = { "None", "True", "False", @@ -880,8 +938,30 @@ forbidden_name(struct compiling *c, identifier name, const node *n, ast_error(c, n, "assignment to keyword"); return 1; } + if (_PyUnicode_EqualToASCIIString(name, "async") || + _PyUnicode_EqualToASCIIString(name, "await")) + { + PyObject *message = PyUnicode_FromString( + "'async' and 'await' will become reserved keywords" + " in Python 3.7"); + int ret; + if (message == NULL) { + return 1; + } + ret = PyErr_WarnExplicitObject( + PyExc_DeprecationWarning, + message, + c->c_filename, + LINENO(n), + NULL, + NULL); + Py_DECREF(message); + if (ret < 0) { + return 1; + } + } if (full_checks) { - const char **p; + const char * const *p; for (p = FORBIDDEN; *p; p++) { if (_PyUnicode_EqualToASCIIString(name, *p)) { ast_error(c, n, "assignment to keyword"); @@ -943,13 +1023,8 @@ set_context(struct compiling *c, expr_ty e, expr_context_ty ctx, const node *n) s = e->v.List.elts; break; case Tuple_kind: - if (asdl_seq_LEN(e->v.Tuple.elts)) { - e->v.Tuple.ctx = ctx; - s = e->v.Tuple.elts; - } - else { - expr_name = "()"; - } + e->v.Tuple.ctx = ctx; + s = e->v.Tuple.elts; break; case Lambda_kind: expr_name = "lambda"; @@ -986,6 +1061,8 @@ set_context(struct compiling *c, expr_ty e, expr_context_ty ctx, const node *n) case Num_kind: case Str_kind: case Bytes_kind: + case JoinedStr_kind: + case FormattedValue_kind: expr_name = "literal"; break; case NameConstant_kind: @@ -1259,16 +1336,20 @@ ast_for_arguments(struct compiling *c, const node *n) and varargslist (lambda definition). parameters: '(' [typedargslist] ')' - typedargslist: ((tfpdef ['=' test] ',')* - ('*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] - | '**' tfpdef) - | tfpdef ['=' test] (',' tfpdef ['=' test])* [',']) + typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [',' [ + '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]] + | '**' tfpdef [',']]] + | '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]] + | '**' tfpdef [',']) tfpdef: NAME [':' test] - varargslist: ((vfpdef ['=' test] ',')* - ('*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] - | '**' vfpdef) - | vfpdef ['=' test] (',' vfpdef ['=' test])* [',']) + varargslist: (vfpdef ['=' test] (',' vfpdef ['=' test])* [',' [ + '*' [vfpdef] (',' vfpdef ['=' test])* [',' ['**' vfpdef [',']]] + | '**' vfpdef [',']]] + | '*' [vfpdef] (',' vfpdef ['=' test])* [',' ['**' vfpdef [',']]] + | '**' vfpdef [','] + ) vfpdef: NAME + */ int i, j, k, nposargs = 0, nkwonlyargs = 0; int nposdefaults = 0, found_default = 0; @@ -1370,7 +1451,8 @@ ast_for_arguments(struct compiling *c, const node *n) i += 2; /* the name and the comma */ break; case STAR: - if (i+1 >= NCH(n)) { + if (i+1 >= NCH(n) || + (i+2 == NCH(n) && TYPE(CHILD(n, i+1)) == COMMA)) { ast_error(c, CHILD(n, i), "named arguments must follow bare *"); return NULL; @@ -1687,14 +1769,21 @@ static int count_comp_fors(struct compiling *c, const node *n) { int n_fors = 0; + int is_async; count_comp_for: + is_async = 0; n_fors++; REQ(n, comp_for); - if (NCH(n) == 5) - n = CHILD(n, 4); - else + if (TYPE(CHILD(n, 0)) == ASYNC) { + is_async = 1; + } + if (NCH(n) == (5 + is_async)) { + n = CHILD(n, 4 + is_async); + } + else { return n_fors; + } count_comp_iter: REQ(n, comp_iter); n = CHILD(n, 0); @@ -1757,14 +1846,19 @@ ast_for_comprehension(struct compiling *c, const node *n) asdl_seq *t; expr_ty expression, first; node *for_ch; + int is_async = 0; REQ(n, comp_for); - for_ch = CHILD(n, 1); + if (TYPE(CHILD(n, 0)) == ASYNC) { + is_async = 1; + } + + for_ch = CHILD(n, 1 + is_async); t = ast_for_exprlist(c, for_ch, Store); if (!t) return NULL; - expression = ast_for_expr(c, CHILD(n, 3)); + expression = ast_for_expr(c, CHILD(n, 3 + is_async)); if (!expression) return NULL; @@ -1772,19 +1866,20 @@ ast_for_comprehension(struct compiling *c, const node *n) (x for x, in ...) has 1 element in t, but still requires a Tuple. */ first = (expr_ty)asdl_seq_GET(t, 0); if (NCH(for_ch) == 1) - comp = comprehension(first, expression, NULL, c->c_arena); + comp = comprehension(first, expression, NULL, + is_async, c->c_arena); else - comp = comprehension(Tuple(t, Store, first->lineno, first->col_offset, - c->c_arena), - expression, NULL, c->c_arena); + comp = comprehension(Tuple(t, Store, first->lineno, + first->col_offset, c->c_arena), + expression, NULL, is_async, c->c_arena); if (!comp) return NULL; - if (NCH(n) == 5) { + if (NCH(n) == (5 + is_async)) { int j, n_ifs; asdl_seq *ifs; - n = CHILD(n, 4); + n = CHILD(n, 4 + is_async); n_ifs = count_comp_ifs(c, n); if (n_ifs == -1) return NULL; @@ -1993,7 +2088,6 @@ ast_for_atom(struct compiling *c, const node *n) | '...' | 'None' | 'True' | 'False' */ node *ch = CHILD(n, 0); - int bytesmode = 0; switch (TYPE(ch)) { case NAME: { @@ -2015,7 +2109,7 @@ ast_for_atom(struct compiling *c, const node *n) return Name(name, Load, LINENO(n), n->n_col_offset, c->c_arena); } case STRING: { - PyObject *str = parsestrplus(c, n, &bytesmode); + expr_ty str = parsestrplus(c, n); if (!str) { const char *errtype = NULL; if (PyErr_ExceptionMatches(PyExc_UnicodeError)) @@ -2033,6 +2127,7 @@ ast_for_atom(struct compiling *c, const node *n) if (s) { PyOS_snprintf(buf, sizeof(buf), "(%s) %s", errtype, s); } else { + PyErr_Clear(); PyOS_snprintf(buf, sizeof(buf), "(%s) unknown error", errtype); } Py_XDECREF(errstr); @@ -2043,14 +2138,7 @@ ast_for_atom(struct compiling *c, const node *n) } return NULL; } - if (PyArena_AddPyObject(c->c_arena, str) < 0) { - Py_DECREF(str); - return NULL; - } - if (bytesmode) - return Bytes(str, LINENO(n), n->n_col_offset, c->c_arena); - else - return Str(str, LINENO(n), n->n_col_offset, c->c_arena); + return str; } case NUMBER: { PyObject *pynum = parsenumber(c, STR(ch)); @@ -2807,8 +2895,9 @@ static stmt_ty ast_for_expr_stmt(struct compiling *c, const node *n) { REQ(n, expr_stmt); - /* expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) - | ('=' (yield_expr|testlist))*) + /* expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | + ('=' (yield_expr|testlist_star_expr))*) + annassign: ':' test ['=' test] testlist_star_expr: (test|star_expr) (',' test|star_expr)* [','] augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=' @@ -2860,6 +2949,76 @@ ast_for_expr_stmt(struct compiling *c, const node *n) return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset, c->c_arena); } + else if (TYPE(CHILD(n, 1)) == annassign) { + expr_ty expr1, expr2, expr3; + node *ch = CHILD(n, 0); + node *deep, *ann = CHILD(n, 1); + int simple = 1; + + /* we keep track of parens to qualify (x) as expression not name */ + deep = ch; + while (NCH(deep) == 1) { + deep = CHILD(deep, 0); + } + if (NCH(deep) > 0 && TYPE(CHILD(deep, 0)) == LPAR) { + simple = 0; + } + expr1 = ast_for_testlist(c, ch); + if (!expr1) { + return NULL; + } + switch (expr1->kind) { + case Name_kind: + if (forbidden_name(c, expr1->v.Name.id, n, 0)) { + return NULL; + } + expr1->v.Name.ctx = Store; + break; + case Attribute_kind: + if (forbidden_name(c, expr1->v.Attribute.attr, n, 1)) { + return NULL; + } + expr1->v.Attribute.ctx = Store; + break; + case Subscript_kind: + expr1->v.Subscript.ctx = Store; + break; + case List_kind: + ast_error(c, ch, + "only single target (not list) can be annotated"); + return NULL; + case Tuple_kind: + ast_error(c, ch, + "only single target (not tuple) can be annotated"); + return NULL; + default: + ast_error(c, ch, + "illegal target for annotation"); + return NULL; + } + + if (expr1->kind != Name_kind) { + simple = 0; + } + ch = CHILD(ann, 1); + expr2 = ast_for_expr(c, ch); + if (!expr2) { + return NULL; + } + if (NCH(ann) == 2) { + return AnnAssign(expr1, expr2, NULL, simple, + LINENO(n), n->n_col_offset, c->c_arena); + } + else { + ch = CHILD(ann, 3); + expr3 = ast_for_expr(c, ch); + if (!expr3) { + return NULL; + } + return AnnAssign(expr1, expr2, expr3, simple, + LINENO(n), n->n_col_offset, c->c_arena); + } + } else { int i; asdl_seq *targets; @@ -2994,9 +3153,6 @@ ast_for_flow_stmt(struct compiling *c, const node *n) "unexpected flow_stmt: %d", TYPE(ch)); return NULL; } - - PyErr_SetString(PyExc_SystemError, "unhandled flow statement"); - return NULL; } static alias_ty @@ -3210,14 +3366,14 @@ ast_for_import_stmt(struct compiling *c, const node *n) alias_ty import_alias = alias_for_import_name(c, n, 1); if (!import_alias) return NULL; - asdl_seq_SET(aliases, 0, import_alias); + asdl_seq_SET(aliases, 0, import_alias); } else { for (i = 0; i < NCH(n); i += 2) { alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1); if (!import_alias) return NULL; - asdl_seq_SET(aliases, i / 2, import_alias); + asdl_seq_SET(aliases, i / 2, import_alias); } } if (mod != NULL) @@ -3883,7 +4039,7 @@ ast_for_stmt(struct compiling *c, const node *n) } static PyObject * -parsenumber(struct compiling *c, const char *s) +parsenumber_raw(struct compiling *c, const char *s) { const char *end; long x; @@ -3926,6 +4082,31 @@ parsenumber(struct compiling *c, const char *s) } static PyObject * +parsenumber(struct compiling *c, const char *s) +{ + char *dup, *end; + PyObject *res = NULL; + + assert(s != NULL); + + if (strchr(s, '_') == NULL) { + return parsenumber_raw(c, s); + } + /* Create a duplicate without underscores. */ + dup = PyMem_Malloc(strlen(s) + 1); + end = dup; + for (; *s; s++) { + if (*s != '_') { + *end++ = *s; + } + } + *end = '\0'; + res = parsenumber_raw(c, dup); + PyMem_Free(dup); + return res; +} + +static PyObject * decode_utf8(struct compiling *c, const char **sPtr, const char *end) { const char *s, *t; @@ -3936,85 +4117,925 @@ decode_utf8(struct compiling *c, const char **sPtr, const char *end) return PyUnicode_DecodeUTF8(t, s - t, NULL); } +static int +warn_invalid_escape_sequence(struct compiling *c, const node *n, + char first_invalid_escape_char) +{ + PyObject *msg = PyUnicode_FromFormat("invalid escape sequence \\%c", + first_invalid_escape_char); + if (msg == NULL) { + return -1; + } + if (PyErr_WarnExplicitObject(PyExc_DeprecationWarning, msg, + c->c_filename, LINENO(n), + NULL, NULL) < 0 && + PyErr_ExceptionMatches(PyExc_DeprecationWarning)) + { + const char *s; + + /* Replace the DeprecationWarning exception with a SyntaxError + to get a more accurate error report */ + PyErr_Clear(); + + s = PyUnicode_AsUTF8(msg); + if (s != NULL) { + ast_error(c, n, s); + } + Py_DECREF(msg); + return -1; + } + Py_DECREF(msg); + return 0; +} + static PyObject * -decode_unicode(struct compiling *c, const char *s, size_t len, int rawmode, const char *encoding) +decode_unicode_with_escapes(struct compiling *c, const node *n, const char *s, + size_t len) { PyObject *v, *u; char *buf; char *p; const char *end; - if (encoding == NULL) { - u = NULL; - } else { - /* check for integer overflow */ - if (len > PY_SIZE_MAX / 6) + /* check for integer overflow */ + if (len > SIZE_MAX / 6) + return NULL; + /* "ä" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5 + "\ä" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */ + u = PyBytes_FromStringAndSize((char *)NULL, len * 6); + if (u == NULL) + return NULL; + p = buf = PyBytes_AsString(u); + end = s + len; + while (s < end) { + if (*s == '\\') { + *p++ = *s++; + if (*s & 0x80) { + strcpy(p, "u005c"); + p += 5; + } + } + if (*s & 0x80) { /* XXX inefficient */ + PyObject *w; + int kind; + void *data; + Py_ssize_t len, i; + w = decode_utf8(c, &s, end); + if (w == NULL) { + Py_DECREF(u); + return NULL; + } + kind = PyUnicode_KIND(w); + data = PyUnicode_DATA(w); + len = PyUnicode_GET_LENGTH(w); + for (i = 0; i < len; i++) { + Py_UCS4 chr = PyUnicode_READ(kind, data, i); + sprintf(p, "\\U%08x", chr); + p += 10; + } + /* Should be impossible to overflow */ + assert(p - buf <= Py_SIZE(u)); + Py_DECREF(w); + } else { + *p++ = *s++; + } + } + len = p - buf; + s = buf; + + const char *first_invalid_escape; + v = _PyUnicode_DecodeUnicodeEscape(s, len, NULL, &first_invalid_escape); + + if (v != NULL && first_invalid_escape != NULL) { + if (warn_invalid_escape_sequence(c, n, *first_invalid_escape) < 0) { + /* We have not decref u before because first_invalid_escape points + inside u. */ + Py_XDECREF(u); + Py_DECREF(v); return NULL; - /* "ä" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5 - "\ä" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */ - u = PyBytes_FromStringAndSize((char *)NULL, len * 6); - if (u == NULL) + } + } + Py_XDECREF(u); + return v; +} + +static PyObject * +decode_bytes_with_escapes(struct compiling *c, const node *n, const char *s, + size_t len) +{ + const char *first_invalid_escape; + PyObject *result = _PyBytes_DecodeEscape(s, len, NULL, 0, NULL, + &first_invalid_escape); + if (result == NULL) + return NULL; + + if (first_invalid_escape != NULL) { + if (warn_invalid_escape_sequence(c, n, *first_invalid_escape) < 0) { + Py_DECREF(result); return NULL; - p = buf = PyBytes_AsString(u); - end = s + len; - while (s < end) { - if (*s == '\\') { - *p++ = *s++; - if (*s & 0x80) { - strcpy(p, "u005c"); - p += 5; + } + } + return result; +} + +/* Compile this expression in to an expr_ty. Add parens around the + expression, in order to allow leading spaces in the expression. */ +static expr_ty +fstring_compile_expr(const char *expr_start, const char *expr_end, + struct compiling *c, const node *n) + +{ + int all_whitespace = 1; + int kind; + void *data; + PyCompilerFlags cf; + mod_ty mod; + char *str; + PyObject *o; + Py_ssize_t len; + Py_ssize_t i; + + assert(expr_end >= expr_start); + assert(*(expr_start-1) == '{'); + assert(*expr_end == '}' || *expr_end == '!' || *expr_end == ':'); + + /* We know there are no escapes here, because backslashes are not allowed, + and we know it's utf-8 encoded (per PEP 263). But, in order to check + that each char is not whitespace, we need to decode it to unicode. + Which is unfortunate, but such is life. */ + + /* If the substring is all whitespace, it's an error. We need to catch + this here, and not when we call PyParser_ASTFromString, because turning + the expression '' in to '()' would go from being invalid to valid. */ + /* Note that this code says an empty string is all whitespace. That's + important. There's a test for it: f'{}'. */ + o = PyUnicode_DecodeUTF8(expr_start, expr_end-expr_start, NULL); + if (o == NULL) + return NULL; + len = PyUnicode_GET_LENGTH(o); + kind = PyUnicode_KIND(o); + data = PyUnicode_DATA(o); + for (i = 0; i < len; i++) { + if (!Py_UNICODE_ISSPACE(PyUnicode_READ(kind, data, i))) { + all_whitespace = 0; + break; + } + } + Py_DECREF(o); + if (all_whitespace) { + ast_error(c, n, "f-string: empty expression not allowed"); + return NULL; + } + + /* Reuse len to be the length of the utf-8 input string. */ + len = expr_end - expr_start; + /* Allocate 3 extra bytes: open paren, close paren, null byte. */ + str = PyMem_RawMalloc(len + 3); + if (str == NULL) + return NULL; + + str[0] = '('; + memcpy(str+1, expr_start, len); + str[len+1] = ')'; + str[len+2] = 0; + + cf.cf_flags = PyCF_ONLY_AST; + mod = PyParser_ASTFromString(str, "", + Py_eval_input, &cf, c->c_arena); + PyMem_RawFree(str); + if (!mod) + return NULL; + return mod->v.Expression.body; +} + +/* Return -1 on error. + + Return 0 if we reached the end of the literal. + + Return 1 if we haven't reached the end of the literal, but we want + the caller to process the literal up to this point. Used for + doubled braces. +*/ +static int +fstring_find_literal(const char **str, const char *end, int raw, + PyObject **literal, int recurse_lvl, + struct compiling *c, const node *n) +{ + /* Get any literal string. It ends when we hit an un-doubled left + brace (which isn't part of a unicode name escape such as + "\N{EULER CONSTANT}"), or the end of the string. */ + + const char *literal_start = *str; + const char *literal_end; + int in_named_escape = 0; + int result = 0; + + assert(*literal == NULL); + for (; *str < end; (*str)++) { + char ch = **str; + if (!in_named_escape && ch == '{' && (*str)-literal_start >= 2 && + *(*str-2) == '\\' && *(*str-1) == 'N') { + in_named_escape = 1; + } else if (in_named_escape && ch == '}') { + in_named_escape = 0; + } else if (ch == '{' || ch == '}') { + /* Check for doubled braces, but only at the top level. If + we checked at every level, then f'{0:{3}}' would fail + with the two closing braces. */ + if (recurse_lvl == 0) { + if (*str+1 < end && *(*str+1) == ch) { + /* We're going to tell the caller that the literal ends + here, but that they should continue scanning. But also + skip over the second brace when we resume scanning. */ + literal_end = *str+1; + *str += 2; + result = 1; + goto done; } - } - if (*s & 0x80) { /* XXX inefficient */ - PyObject *w; - int kind; - void *data; - Py_ssize_t len, i; - w = decode_utf8(c, &s, end); - if (w == NULL) { - Py_DECREF(u); - return NULL; + + /* Where a single '{' is the start of a new expression, a + single '}' is not allowed. */ + if (ch == '}') { + ast_error(c, n, "f-string: single '}' is not allowed"); + return -1; } - kind = PyUnicode_KIND(w); - data = PyUnicode_DATA(w); - len = PyUnicode_GET_LENGTH(w); - for (i = 0; i < len; i++) { - Py_UCS4 chr = PyUnicode_READ(kind, data, i); - sprintf(p, "\\U%08x", chr); - p += 10; + } + /* We're either at a '{', which means we're starting another + expression; or a '}', which means we're at the end of this + f-string (for a nested format_spec). */ + break; + } + } + literal_end = *str; + assert(*str <= end); + assert(*str == end || **str == '{' || **str == '}'); +done: + if (literal_start != literal_end) { + if (raw) + *literal = PyUnicode_DecodeUTF8Stateful(literal_start, + literal_end-literal_start, + NULL, NULL); + else + *literal = decode_unicode_with_escapes(c, n, literal_start, + literal_end-literal_start); + if (!*literal) + return -1; + } + return result; +} + +/* Forward declaration because parsing is recursive. */ +static expr_ty +fstring_parse(const char **str, const char *end, int raw, int recurse_lvl, + struct compiling *c, const node *n); + +/* Parse the f-string at *str, ending at end. We know *str starts an + expression (so it must be a '{'). Returns the FormattedValue node, + which includes the expression, conversion character, and + format_spec expression. + + Note that I don't do a perfect job here: I don't make sure that a + closing brace doesn't match an opening paren, for example. It + doesn't need to error on all invalid expressions, just correctly + find the end of all valid ones. Any errors inside the expression + will be caught when we parse it later. */ +static int +fstring_find_expr(const char **str, const char *end, int raw, int recurse_lvl, + expr_ty *expression, struct compiling *c, const node *n) +{ + /* Return -1 on error, else 0. */ + + const char *expr_start; + const char *expr_end; + expr_ty simple_expression; + expr_ty format_spec = NULL; /* Optional format specifier. */ + int conversion = -1; /* The conversion char. -1 if not specified. */ + + /* 0 if we're not in a string, else the quote char we're trying to + match (single or double quote). */ + char quote_char = 0; + + /* If we're inside a string, 1=normal, 3=triple-quoted. */ + int string_type = 0; + + /* Keep track of nesting level for braces/parens/brackets in + expressions. */ + Py_ssize_t nested_depth = 0; + + /* Can only nest one level deep. */ + if (recurse_lvl >= 2) { + ast_error(c, n, "f-string: expressions nested too deeply"); + return -1; + } + + /* The first char must be a left brace, or we wouldn't have gotten + here. Skip over it. */ + assert(**str == '{'); + *str += 1; + + expr_start = *str; + for (; *str < end; (*str)++) { + char ch; + + /* Loop invariants. */ + assert(nested_depth >= 0); + assert(*str >= expr_start && *str < end); + if (quote_char) + assert(string_type == 1 || string_type == 3); + else + assert(string_type == 0); + + ch = **str; + /* Nowhere inside an expression is a backslash allowed. */ + if (ch == '\\') { + /* Error: can't include a backslash character, inside + parens or strings or not. */ + ast_error(c, n, "f-string expression part " + "cannot include a backslash"); + return -1; + } + if (quote_char) { + /* We're inside a string. See if we're at the end. */ + /* This code needs to implement the same non-error logic + as tok_get from tokenizer.c, at the letter_quote + label. To actually share that code would be a + nightmare. But, it's unlikely to change and is small, + so duplicate it here. Note we don't need to catch all + of the errors, since they'll be caught when parsing the + expression. We just need to match the non-error + cases. Thus we can ignore \n in single-quoted strings, + for example. Or non-terminated strings. */ + if (ch == quote_char) { + /* Does this match the string_type (single or triple + quoted)? */ + if (string_type == 3) { + if (*str+2 < end && *(*str+1) == ch && *(*str+2) == ch) { + /* We're at the end of a triple quoted string. */ + *str += 2; + string_type = 0; + quote_char = 0; + continue; + } + } else { + /* We're at the end of a normal string. */ + quote_char = 0; + string_type = 0; + continue; } - /* Should be impossible to overflow */ - assert(p - buf <= Py_SIZE(u)); - Py_DECREF(w); + } + } else if (ch == '\'' || ch == '"') { + /* Is this a triple quoted string? */ + if (*str+2 < end && *(*str+1) == ch && *(*str+2) == ch) { + string_type = 3; + *str += 2; } else { - *p++ = *s++; + /* Start of a normal string. */ + string_type = 1; } + /* Start looking for the end of the string. */ + quote_char = ch; + } else if (ch == '[' || ch == '{' || ch == '(') { + nested_depth++; + } else if (nested_depth != 0 && + (ch == ']' || ch == '}' || ch == ')')) { + nested_depth--; + } else if (ch == '#') { + /* Error: can't include a comment character, inside parens + or not. */ + ast_error(c, n, "f-string expression part cannot include '#'"); + return -1; + } else if (nested_depth == 0 && + (ch == '!' || ch == ':' || ch == '}')) { + /* First, test for the special case of "!=". Since '=' is + not an allowed conversion character, nothing is lost in + this test. */ + if (ch == '!' && *str+1 < end && *(*str+1) == '=') { + /* This isn't a conversion character, just continue. */ + continue; + } + /* Normal way out of this loop. */ + break; + } else { + /* Just consume this char and loop around. */ } - len = p - buf; - s = buf; } - if (rawmode) - v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL); - else - v = PyUnicode_DecodeUnicodeEscape(s, len, NULL); - Py_XDECREF(u); - return v; + expr_end = *str; + /* If we leave this loop in a string or with mismatched parens, we + don't care. We'll get a syntax error when compiling the + expression. But, we can produce a better error message, so + let's just do that.*/ + if (quote_char) { + ast_error(c, n, "f-string: unterminated string"); + return -1; + } + if (nested_depth) { + ast_error(c, n, "f-string: mismatched '(', '{', or '['"); + return -1; + } + + if (*str >= end) + goto unexpected_end_of_string; + + /* Compile the expression as soon as possible, so we show errors + related to the expression before errors related to the + conversion or format_spec. */ + simple_expression = fstring_compile_expr(expr_start, expr_end, c, n); + if (!simple_expression) + return -1; + + /* Check for a conversion char, if present. */ + if (**str == '!') { + *str += 1; + if (*str >= end) + goto unexpected_end_of_string; + + conversion = **str; + *str += 1; + + /* Validate the conversion. */ + if (!(conversion == 's' || conversion == 'r' + || conversion == 'a')) { + ast_error(c, n, "f-string: invalid conversion character: " + "expected 's', 'r', or 'a'"); + return -1; + } + } + + /* Check for the format spec, if present. */ + if (*str >= end) + goto unexpected_end_of_string; + if (**str == ':') { + *str += 1; + if (*str >= end) + goto unexpected_end_of_string; + + /* Parse the format spec. */ + format_spec = fstring_parse(str, end, raw, recurse_lvl+1, c, n); + if (!format_spec) + return -1; + } + + if (*str >= end || **str != '}') + goto unexpected_end_of_string; + + /* We're at a right brace. Consume it. */ + assert(*str < end); + assert(**str == '}'); + *str += 1; + + /* And now create the FormattedValue node that represents this + entire expression with the conversion and format spec. */ + *expression = FormattedValue(simple_expression, conversion, + format_spec, LINENO(n), n->n_col_offset, + c->c_arena); + if (!*expression) + return -1; + + return 0; + +unexpected_end_of_string: + ast_error(c, n, "f-string: expecting '}'"); + return -1; } -/* s is a Python string literal, including the bracketing quote characters, - * and r &/or b prefixes (if any), and embedded escape sequences (if any). - * parsestr parses it, and returns the decoded Python string object. - */ -static PyObject * -parsestr(struct compiling *c, const node *n, int *bytesmode) +/* Return -1 on error. + + Return 0 if we have a literal (possible zero length) and an + expression (zero length if at the end of the string. + + Return 1 if we have a literal, but no expression, and we want the + caller to call us again. This is used to deal with doubled + braces. + + When called multiple times on the string 'a{{b{0}c', this function + will return: + + 1. the literal 'a{' with no expression, and a return value + of 1. Despite the fact that there's no expression, the return + value of 1 means we're not finished yet. + + 2. the literal 'b' and the expression '0', with a return value of + 0. The fact that there's an expression means we're not finished. + + 3. literal 'c' with no expression and a return value of 0. The + combination of the return value of 0 with no expression means + we're finished. +*/ +static int +fstring_find_literal_and_expr(const char **str, const char *end, int raw, + int recurse_lvl, PyObject **literal, + expr_ty *expression, + struct compiling *c, const node *n) +{ + int result; + + assert(*literal == NULL && *expression == NULL); + + /* Get any literal string. */ + result = fstring_find_literal(str, end, raw, literal, recurse_lvl, c, n); + if (result < 0) + goto error; + + assert(result == 0 || result == 1); + + if (result == 1) + /* We have a literal, but don't look at the expression. */ + return 1; + + if (*str >= end || **str == '}') + /* We're at the end of the string or the end of a nested + f-string: no expression. The top-level error case where we + expect to be at the end of the string but we're at a '}' is + handled later. */ + return 0; + + /* We must now be the start of an expression, on a '{'. */ + assert(**str == '{'); + + if (fstring_find_expr(str, end, raw, recurse_lvl, expression, c, n) < 0) + goto error; + + return 0; + +error: + Py_CLEAR(*literal); + return -1; +} + +#define EXPRLIST_N_CACHED 64 + +typedef struct { + /* Incrementally build an array of expr_ty, so be used in an + asdl_seq. Cache some small but reasonably sized number of + expr_ty's, and then after that start dynamically allocating, + doubling the number allocated each time. Note that the f-string + f'{0}a{1}' contains 3 expr_ty's: 2 FormattedValue's, and one + Str for the literal 'a'. So you add expr_ty's about twice as + fast as you add exressions in an f-string. */ + + Py_ssize_t allocated; /* Number we've allocated. */ + Py_ssize_t size; /* Number we've used. */ + expr_ty *p; /* Pointer to the memory we're actually + using. Will point to 'data' until we + start dynamically allocating. */ + expr_ty data[EXPRLIST_N_CACHED]; +} ExprList; + +#ifdef NDEBUG +#define ExprList_check_invariants(l) +#else +static void +ExprList_check_invariants(ExprList *l) +{ + /* Check our invariants. Make sure this object is "live", and + hasn't been deallocated. */ + assert(l->size >= 0); + assert(l->p != NULL); + if (l->size <= EXPRLIST_N_CACHED) + assert(l->data == l->p); +} +#endif + +static void +ExprList_Init(ExprList *l) +{ + l->allocated = EXPRLIST_N_CACHED; + l->size = 0; + + /* Until we start allocating dynamically, p points to data. */ + l->p = l->data; + + ExprList_check_invariants(l); +} + +static int +ExprList_Append(ExprList *l, expr_ty exp) +{ + ExprList_check_invariants(l); + if (l->size >= l->allocated) { + /* We need to alloc (or realloc) the memory. */ + Py_ssize_t new_size = l->allocated * 2; + + /* See if we've ever allocated anything dynamically. */ + if (l->p == l->data) { + Py_ssize_t i; + /* We're still using the cached data. Switch to + alloc-ing. */ + l->p = PyMem_RawMalloc(sizeof(expr_ty) * new_size); + if (!l->p) + return -1; + /* Copy the cached data into the new buffer. */ + for (i = 0; i < l->size; i++) + l->p[i] = l->data[i]; + } else { + /* Just realloc. */ + expr_ty *tmp = PyMem_RawRealloc(l->p, sizeof(expr_ty) * new_size); + if (!tmp) { + PyMem_RawFree(l->p); + l->p = NULL; + return -1; + } + l->p = tmp; + } + + l->allocated = new_size; + assert(l->allocated == 2 * l->size); + } + + l->p[l->size++] = exp; + + ExprList_check_invariants(l); + return 0; +} + +static void +ExprList_Dealloc(ExprList *l) +{ + ExprList_check_invariants(l); + + /* If there's been an error, or we've never dynamically allocated, + do nothing. */ + if (!l->p || l->p == l->data) { + /* Do nothing. */ + } else { + /* We have dynamically allocated. Free the memory. */ + PyMem_RawFree(l->p); + } + l->p = NULL; + l->size = -1; +} + +static asdl_seq * +ExprList_Finish(ExprList *l, PyArena *arena) +{ + asdl_seq *seq; + + ExprList_check_invariants(l); + + /* Allocate the asdl_seq and copy the expressions in to it. */ + seq = _Py_asdl_seq_new(l->size, arena); + if (seq) { + Py_ssize_t i; + for (i = 0; i < l->size; i++) + asdl_seq_SET(seq, i, l->p[i]); + } + ExprList_Dealloc(l); + return seq; +} + +/* The FstringParser is designed to add a mix of strings and + f-strings, and concat them together as needed. Ultimately, it + generates an expr_ty. */ +typedef struct { + PyObject *last_str; + ExprList expr_list; +} FstringParser; + +#ifdef NDEBUG +#define FstringParser_check_invariants(state) +#else +static void +FstringParser_check_invariants(FstringParser *state) +{ + if (state->last_str) + assert(PyUnicode_CheckExact(state->last_str)); + ExprList_check_invariants(&state->expr_list); +} +#endif + +static void +FstringParser_Init(FstringParser *state) +{ + state->last_str = NULL; + ExprList_Init(&state->expr_list); + FstringParser_check_invariants(state); +} + +static void +FstringParser_Dealloc(FstringParser *state) +{ + FstringParser_check_invariants(state); + + Py_XDECREF(state->last_str); + ExprList_Dealloc(&state->expr_list); +} + +/* Make a Str node, but decref the PyUnicode object being added. */ +static expr_ty +make_str_node_and_del(PyObject **str, struct compiling *c, const node* n) +{ + PyObject *s = *str; + *str = NULL; + assert(PyUnicode_CheckExact(s)); + if (PyArena_AddPyObject(c->c_arena, s) < 0) { + Py_DECREF(s); + return NULL; + } + return Str(s, LINENO(n), n->n_col_offset, c->c_arena); +} + +/* Add a non-f-string (that is, a regular literal string). str is + decref'd. */ +static int +FstringParser_ConcatAndDel(FstringParser *state, PyObject *str) +{ + FstringParser_check_invariants(state); + + assert(PyUnicode_CheckExact(str)); + + if (PyUnicode_GET_LENGTH(str) == 0) { + Py_DECREF(str); + return 0; + } + + if (!state->last_str) { + /* We didn't have a string before, so just remember this one. */ + state->last_str = str; + } else { + /* Concatenate this with the previous string. */ + PyUnicode_AppendAndDel(&state->last_str, str); + if (!state->last_str) + return -1; + } + FstringParser_check_invariants(state); + return 0; +} + +/* Parse an f-string. The f-string is in *str to end, with no + 'f' or quotes. */ +static int +FstringParser_ConcatFstring(FstringParser *state, const char **str, + const char *end, int raw, int recurse_lvl, + struct compiling *c, const node *n) +{ + FstringParser_check_invariants(state); + + /* Parse the f-string. */ + while (1) { + PyObject *literal = NULL; + expr_ty expression = NULL; + + /* If there's a zero length literal in front of the + expression, literal will be NULL. If we're at the end of + the f-string, expression will be NULL (unless result == 1, + see below). */ + int result = fstring_find_literal_and_expr(str, end, raw, recurse_lvl, + &literal, &expression, + c, n); + if (result < 0) + return -1; + + /* Add the literal, if any. */ + if (!literal) { + /* Do nothing. Just leave last_str alone (and possibly + NULL). */ + } else if (!state->last_str) { + state->last_str = literal; + literal = NULL; + } else { + /* We have a literal, concatenate it. */ + assert(PyUnicode_GET_LENGTH(literal) != 0); + if (FstringParser_ConcatAndDel(state, literal) < 0) + return -1; + literal = NULL; + } + assert(!state->last_str || + PyUnicode_GET_LENGTH(state->last_str) != 0); + + /* We've dealt with the literal now. It can't be leaked on further + errors. */ + assert(literal == NULL); + + /* See if we should just loop around to get the next literal + and expression, while ignoring the expression this + time. This is used for un-doubling braces, as an + optimization. */ + if (result == 1) + continue; + + if (!expression) + /* We're done with this f-string. */ + break; + + /* We know we have an expression. Convert any existing string + to a Str node. */ + if (!state->last_str) { + /* Do nothing. No previous literal. */ + } else { + /* Convert the existing last_str literal to a Str node. */ + expr_ty str = make_str_node_and_del(&state->last_str, c, n); + if (!str || ExprList_Append(&state->expr_list, str) < 0) + return -1; + } + + if (ExprList_Append(&state->expr_list, expression) < 0) + return -1; + } + + /* If recurse_lvl is zero, then we must be at the end of the + string. Otherwise, we must be at a right brace. */ + + if (recurse_lvl == 0 && *str < end-1) { + ast_error(c, n, "f-string: unexpected end of string"); + return -1; + } + if (recurse_lvl != 0 && **str != '}') { + ast_error(c, n, "f-string: expecting '}'"); + return -1; + } + + FstringParser_check_invariants(state); + return 0; +} + +/* Convert the partial state reflected in last_str and expr_list to an + expr_ty. The expr_ty can be a Str, or a JoinedStr. */ +static expr_ty +FstringParser_Finish(FstringParser *state, struct compiling *c, + const node *n) +{ + asdl_seq *seq; + + FstringParser_check_invariants(state); + + /* If we're just a constant string with no expressions, return + that. */ + if(state->expr_list.size == 0) { + if (!state->last_str) { + /* Create a zero length string. */ + state->last_str = PyUnicode_FromStringAndSize(NULL, 0); + if (!state->last_str) + goto error; + } + return make_str_node_and_del(&state->last_str, c, n); + } + + /* Create a Str node out of last_str, if needed. It will be the + last node in our expression list. */ + if (state->last_str) { + expr_ty str = make_str_node_and_del(&state->last_str, c, n); + if (!str || ExprList_Append(&state->expr_list, str) < 0) + goto error; + } + /* This has already been freed. */ + assert(state->last_str == NULL); + + seq = ExprList_Finish(&state->expr_list, c->c_arena); + if (!seq) + goto error; + + /* If there's only one expression, return it. Otherwise, we need + to join them together. */ + if (seq->size == 1) + return seq->elements[0]; + + return JoinedStr(seq, LINENO(n), n->n_col_offset, c->c_arena); + +error: + FstringParser_Dealloc(state); + return NULL; +} + +/* Given an f-string (with no 'f' or quotes) that's in *str and ends + at end, parse it into an expr_ty. Return NULL on error. Adjust + str to point past the parsed portion. */ +static expr_ty +fstring_parse(const char **str, const char *end, int raw, int recurse_lvl, + struct compiling *c, const node *n) +{ + FstringParser state; + + FstringParser_Init(&state); + if (FstringParser_ConcatFstring(&state, str, end, raw, recurse_lvl, + c, n) < 0) { + FstringParser_Dealloc(&state); + return NULL; + } + + return FstringParser_Finish(&state, c, n); +} + +/* n is a Python string literal, including the bracketing quote + characters, and r, b, u, &/or f prefixes (if any), and embedded + escape sequences (if any). parsestr parses it, and sets *result to + decoded Python string object. If the string is an f-string, set + *fstr and *fstrlen to the unparsed string object. Return 0 if no + errors occurred. +*/ +static int +parsestr(struct compiling *c, const node *n, int *bytesmode, int *rawmode, + PyObject **result, const char **fstr, Py_ssize_t *fstrlen) { size_t len; const char *s = STR(n); int quote = Py_CHARMASK(*s); - int rawmode = 0; - int need_encoding; + int fmode = 0; + *bytesmode = 0; + *rawmode = 0; + *result = NULL; + *fstr = NULL; if (Py_ISALPHA(quote)) { - while (!*bytesmode || !rawmode) { + while (!*bytesmode || !*rawmode) { if (quote == 'b' || quote == 'B') { quote = *++s; *bytesmode = 1; @@ -4024,114 +5045,170 @@ parsestr(struct compiling *c, const node *n, int *bytesmode) } else if (quote == 'r' || quote == 'R') { quote = *++s; - rawmode = 1; + *rawmode = 1; + } + else if (quote == 'f' || quote == 'F') { + quote = *++s; + fmode = 1; } else { break; } } } + if (fmode && *bytesmode) { + PyErr_BadInternalCall(); + return -1; + } if (quote != '\'' && quote != '\"') { PyErr_BadInternalCall(); - return NULL; + return -1; } + /* Skip the leading quote char. */ s++; len = strlen(s); if (len > INT_MAX) { PyErr_SetString(PyExc_OverflowError, "string to parse is too long"); - return NULL; + return -1; } if (s[--len] != quote) { + /* Last quote char must match the first. */ PyErr_BadInternalCall(); - return NULL; + return -1; } if (len >= 4 && s[0] == quote && s[1] == quote) { + /* A triple quoted string. We've already skipped one quote at + the start and one at the end of the string. Now skip the + two at the start. */ s += 2; len -= 2; + /* And check that the last two match. */ if (s[--len] != quote || s[--len] != quote) { PyErr_BadInternalCall(); - return NULL; + return -1; } } - if (!*bytesmode && !rawmode) { - return decode_unicode(c, s, len, rawmode, c->c_encoding); + + if (fmode) { + /* Just return the bytes. The caller will parse the resulting + string. */ + *fstr = s; + *fstrlen = len; + return 0; } + + /* Not an f-string. */ + /* Avoid invoking escape decoding routines if possible. */ + *rawmode = *rawmode || strchr(s, '\\') == NULL; if (*bytesmode) { - /* Disallow non-ascii characters (but not escapes) */ + /* Disallow non-ASCII characters. */ const char *ch; for (ch = s; *ch; ch++) { if (Py_CHARMASK(*ch) >= 0x80) { ast_error(c, n, "bytes can only contain ASCII " "literal characters."); - return NULL; + return -1; } } + if (*rawmode) + *result = PyBytes_FromStringAndSize(s, len); + else + *result = decode_bytes_with_escapes(c, n, s, len); + } else { + if (*rawmode) + *result = PyUnicode_DecodeUTF8Stateful(s, len, NULL, NULL); + else + *result = decode_unicode_with_escapes(c, n, s, len); } - need_encoding = (!*bytesmode && c->c_encoding != NULL && - strcmp(c->c_encoding, "utf-8") != 0); - if (rawmode || strchr(s, '\\') == NULL) { - if (need_encoding) { - PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL); - if (u == NULL || !*bytesmode) - return u; - v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL); - Py_DECREF(u); - return v; - } else if (*bytesmode) { - return PyBytes_FromStringAndSize(s, len); - } else if (strcmp(c->c_encoding, "utf-8") == 0) { - return PyUnicode_FromStringAndSize(s, len); - } else { - return PyUnicode_DecodeLatin1(s, len, NULL); - } - } - return PyBytes_DecodeEscape(s, len, NULL, 1, - need_encoding ? c->c_encoding : NULL); + return *result == NULL ? -1 : 0; } -/* Build a Python string object out of a STRING+ atom. This takes care of - * compile-time literal catenation, calling parsestr() on each piece, and - * pasting the intermediate results together. - */ -static PyObject * -parsestrplus(struct compiling *c, const node *n, int *bytesmode) +/* Accepts a STRING+ atom, and produces an expr_ty node. Run through + each STRING atom, and process it as needed. For bytes, just + concatenate them together, and the result will be a Bytes node. For + normal strings and f-strings, concatenate them together. The result + will be a Str node if there were no f-strings; a FormattedValue + node if there's just an f-string (with no leading or trailing + literals), or a JoinedStr node if there are multiple f-strings or + any literals involved. */ +static expr_ty +parsestrplus(struct compiling *c, const node *n) { - PyObject *v; + int bytesmode = 0; + PyObject *bytes_str = NULL; int i; - REQ(CHILD(n, 0), STRING); - v = parsestr(c, CHILD(n, 0), bytesmode); - if (v != NULL) { - /* String literal concatenation */ - for (i = 1; i < NCH(n); i++) { - PyObject *s; - int subbm = 0; - s = parsestr(c, CHILD(n, i), &subbm); - if (s == NULL) - goto onError; - if (*bytesmode != subbm) { - ast_error(c, n, "cannot mix bytes and nonbytes literals"); - Py_DECREF(s); - goto onError; - } - if (PyBytes_Check(v) && PyBytes_Check(s)) { - PyBytes_ConcatAndDel(&v, s); - if (v == NULL) - goto onError; - } - else { - PyObject *temp = PyUnicode_Concat(v, s); - Py_DECREF(s); - Py_DECREF(v); - v = temp; - if (v == NULL) - goto onError; + + FstringParser state; + FstringParser_Init(&state); + + for (i = 0; i < NCH(n); i++) { + int this_bytesmode; + int this_rawmode; + PyObject *s; + const char *fstr; + Py_ssize_t fstrlen = -1; /* Silence a compiler warning. */ + + REQ(CHILD(n, i), STRING); + if (parsestr(c, CHILD(n, i), &this_bytesmode, &this_rawmode, &s, + &fstr, &fstrlen) != 0) + goto error; + + /* Check that we're not mixing bytes with unicode. */ + if (i != 0 && bytesmode != this_bytesmode) { + ast_error(c, n, "cannot mix bytes and nonbytes literals"); + /* s is NULL if the current string part is an f-string. */ + Py_XDECREF(s); + goto error; + } + bytesmode = this_bytesmode; + + if (fstr != NULL) { + int result; + assert(s == NULL && !bytesmode); + /* This is an f-string. Parse and concatenate it. */ + result = FstringParser_ConcatFstring(&state, &fstr, fstr+fstrlen, + this_rawmode, 0, c, n); + if (result < 0) + goto error; + } else { + /* A string or byte string. */ + assert(s != NULL && fstr == NULL); + + assert(bytesmode ? PyBytes_CheckExact(s) : + PyUnicode_CheckExact(s)); + + if (bytesmode) { + /* For bytes, concat as we go. */ + if (i == 0) { + /* First time, just remember this value. */ + bytes_str = s; + } else { + PyBytes_ConcatAndDel(&bytes_str, s); + if (!bytes_str) + goto error; + } + } else { + /* This is a regular string. Concatenate it. */ + if (FstringParser_ConcatAndDel(&state, s) < 0) + goto error; } } } - return v; + if (bytesmode) { + /* Just return the bytes object and we're done. */ + if (PyArena_AddPyObject(c->c_arena, bytes_str) < 0) + goto error; + return Bytes(bytes_str, LINENO(n), n->n_col_offset, c->c_arena); + } + + /* We're not a bytes string, bytes_str should never have been set. */ + assert(bytes_str == NULL); + + return FstringParser_Finish(&state, c, n); - onError: - Py_XDECREF(v); +error: + Py_XDECREF(bytes_str); + FstringParser_Dealloc(&state); return NULL; } diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 17c074a..69e5f08 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -21,16 +21,18 @@ Don't forget to modify PyUnicode_DecodeFSDefault() if you touch any of the values for Py_FileSystemDefaultEncoding! */ -#ifdef HAVE_MBCS -const char *Py_FileSystemDefaultEncoding = "mbcs"; +#if defined(__APPLE__) +const char *Py_FileSystemDefaultEncoding = "utf-8"; int Py_HasFileSystemDefaultEncoding = 1; -#elif defined(__APPLE__) +#elif defined(MS_WINDOWS) +/* may be changed by initfsencoding(), but should never be free()d */ const char *Py_FileSystemDefaultEncoding = "utf-8"; int Py_HasFileSystemDefaultEncoding = 1; #else const char *Py_FileSystemDefaultEncoding = NULL; /* set by initfsencoding() */ int Py_HasFileSystemDefaultEncoding = 0; #endif +const char *Py_FileSystemDefaultEncodeErrors = "surrogateescape"; _Py_IDENTIFIER(__builtins__); _Py_IDENTIFIER(__dict__); @@ -52,8 +54,8 @@ _Py_IDENTIFIER(stderr); static PyObject * builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds) { - PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *cell; - PyObject *cls = NULL; + PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns; + PyObject *cls = NULL, *cell = NULL; Py_ssize_t nargs; int isclass = 0; /* initialize to prevent gcc warning */ @@ -155,16 +157,8 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds) } } else { - PyObject *pargs = PyTuple_Pack(2, name, bases); - if (pargs == NULL) { - Py_DECREF(prep); - Py_DECREF(meta); - Py_XDECREF(mkw); - Py_DECREF(bases); - return NULL; - } - ns = PyEval_CallObjectWithKeywords(prep, pargs, mkw); - Py_DECREF(pargs); + PyObject *pargs[2] = {name, bases}; + ns = _PyObject_FastCallDict(prep, pargs, 2, mkw); Py_DECREF(prep); } if (ns == NULL) { @@ -177,16 +171,40 @@ builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds) NULL, 0, NULL, 0, NULL, 0, NULL, PyFunction_GET_CLOSURE(func)); if (cell != NULL) { - PyObject *margs; - margs = PyTuple_Pack(3, name, bases, ns); - if (margs != NULL) { - cls = PyEval_CallObjectWithKeywords(meta, margs, mkw); - Py_DECREF(margs); + PyObject *margs[3] = {name, bases, ns}; + cls = _PyObject_FastCallDict(meta, margs, 3, mkw); + if (cls != NULL && PyType_Check(cls) && PyCell_Check(cell)) { + PyObject *cell_cls = PyCell_GET(cell); + if (cell_cls != cls) { + /* TODO: In 3.7, DeprecationWarning will become RuntimeError. + * At that point, cell_error won't be needed. + */ + int cell_error; + if (cell_cls == NULL) { + const char *msg = + "__class__ not set defining %.200R as %.200R. " + "Was __classcell__ propagated to type.__new__?"; + cell_error = PyErr_WarnFormat( + PyExc_DeprecationWarning, 1, msg, name, cls); + } else { + const char *msg = + "__class__ set to %.200R defining %.200R as %.200R"; + PyErr_Format(PyExc_TypeError, msg, cell_cls, name, cls); + cell_error = 1; + } + if (cell_error) { + Py_DECREF(cls); + cls = NULL; + goto error; + } else { + /* Fill in the cell, since type.__new__ didn't do it */ + PyCell_Set(cell, cls); + } + } } - if (cls != NULL && PyCell_Check(cell)) - PyCell_Set(cell, cls); - Py_DECREF(cell); } +error: + Py_XDECREF(cell); Py_DECREF(ns); Py_DECREF(meta); Py_XDECREF(mkw); @@ -331,7 +349,7 @@ builtin_any(PyObject *module, PyObject *iterable) Py_DECREF(it); return NULL; } - if (cmp == 1) { + if (cmp > 0) { Py_DECREF(it); Py_RETURN_TRUE; } @@ -469,6 +487,7 @@ filter_next(filterobject *lz) PyObject *it = lz->it; long ok; PyObject *(*iternext)(PyObject *); + int checktrue = lz->func == Py_None || lz->func == (PyObject *)&PyBool_Type; iternext = *Py_TYPE(it)->tp_iternext; for (;;) { @@ -476,12 +495,11 @@ filter_next(filterobject *lz) if (item == NULL) return NULL; - if (lz->func == Py_None || lz->func == (PyObject *)&PyBool_Type) { + if (checktrue) { ok = PyObject_IsTrue(item); } else { PyObject *good; - good = PyObject_CallFunctionObjArgs(lz->func, - item, NULL); + good = PyObject_CallFunctionObjArgs(lz->func, item, NULL); if (good == NULL) { Py_DECREF(item); return NULL; @@ -1168,26 +1186,43 @@ map_traverse(mapobject *lz, visitproc visit, void *arg) static PyObject * map_next(mapobject *lz) { - PyObject *val; - PyObject *argtuple; - PyObject *result; - Py_ssize_t numargs, i; + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t niters, nargs, i; + PyObject *result = NULL; - numargs = PyTuple_Size(lz->iters); - argtuple = PyTuple_New(numargs); - if (argtuple == NULL) - return NULL; + niters = PyTuple_GET_SIZE(lz->iters); + if (niters <= (Py_ssize_t)Py_ARRAY_LENGTH(small_stack)) { + stack = small_stack; + } + else { + stack = PyMem_Malloc(niters * sizeof(stack[0])); + if (stack == NULL) { + PyErr_NoMemory(); + return NULL; + } + } - for (i=0 ; iiters, i)); + nargs = 0; + for (i=0; i < niters; i++) { + PyObject *it = PyTuple_GET_ITEM(lz->iters, i); + PyObject *val = Py_TYPE(it)->tp_iternext(it); if (val == NULL) { - Py_DECREF(argtuple); - return NULL; + goto exit; } - PyTuple_SET_ITEM(argtuple, i, val); + stack[i] = val; + nargs++; + } + + result = _PyObject_FastCall(lz->func, stack, nargs); + +exit: + for (i=0; i < nargs; i++) { + Py_DECREF(stack[i]); + } + if (stack != small_stack) { + PyMem_Free(stack); } - result = PyObject_Call(lz->func, argtuple, NULL); - Py_DECREF(argtuple); return result; } @@ -1779,7 +1814,7 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds) if (do_flush == -1) return NULL; else if (do_flush) { - tmp = _PyObject_CallMethodId(file, &PyId_flush, ""); + tmp = _PyObject_CallMethodId(file, &PyId_flush, NULL); if (tmp == NULL) return NULL; else @@ -1845,7 +1880,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) } /* First of all, flush stderr */ - tmp = _PyObject_CallMethodId(ferr, &PyId_flush, ""); + tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL); if (tmp == NULL) PyErr_Clear(); else @@ -1854,7 +1889,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) /* We should only use (GNU) readline if Python's sys.stdin and sys.stdout are the same as C's stdin and stdout, because we need to pass it those. */ - tmp = _PyObject_CallMethodId(fin, &PyId_fileno, ""); + tmp = _PyObject_CallMethodId(fin, &PyId_fileno, NULL); if (tmp == NULL) { PyErr_Clear(); tty = 0; @@ -1867,7 +1902,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) tty = fd == fileno(stdin) && isatty(fd); } if (tty) { - tmp = _PyObject_CallMethodId(fout, &PyId_fileno, ""); + tmp = _PyObject_CallMethodId(fout, &PyId_fileno, NULL); if (tmp == NULL) { PyErr_Clear(); tty = 0; @@ -1892,20 +1927,17 @@ builtin_input_impl(PyObject *module, PyObject *prompt) PyObject *result; size_t len; - /* stdin is a text stream, so it must have an encoding. */ stdin_encoding = _PyObject_GetAttrId(fin, &PyId_encoding); stdin_errors = _PyObject_GetAttrId(fin, &PyId_errors); - if (!stdin_encoding || !stdin_errors || - !PyUnicode_Check(stdin_encoding) || - !PyUnicode_Check(stdin_errors)) { - tty = 0; + if (!stdin_encoding || !stdin_errors) + /* stdin is a text stream, so it must have an + encoding. */ goto _readline_errors; - } - stdin_encoding_str = _PyUnicode_AsString(stdin_encoding); - stdin_errors_str = _PyUnicode_AsString(stdin_errors); + stdin_encoding_str = PyUnicode_AsUTF8(stdin_encoding); + stdin_errors_str = PyUnicode_AsUTF8(stdin_errors); if (!stdin_encoding_str || !stdin_errors_str) goto _readline_errors; - tmp = _PyObject_CallMethodId(fout, &PyId_flush, ""); + tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL); if (tmp == NULL) PyErr_Clear(); else @@ -1916,14 +1948,10 @@ builtin_input_impl(PyObject *module, PyObject *prompt) PyObject *stringpo; stdout_encoding = _PyObject_GetAttrId(fout, &PyId_encoding); stdout_errors = _PyObject_GetAttrId(fout, &PyId_errors); - if (!stdout_encoding || !stdout_errors || - !PyUnicode_Check(stdout_encoding) || - !PyUnicode_Check(stdout_errors)) { - tty = 0; + if (!stdout_encoding || !stdout_errors) goto _readline_errors; - } - stdout_encoding_str = _PyUnicode_AsString(stdout_encoding); - stdout_errors_str = _PyUnicode_AsString(stdout_errors); + stdout_encoding_str = PyUnicode_AsUTF8(stdout_encoding); + stdout_errors_str = PyUnicode_AsUTF8(stdout_errors); if (!stdout_encoding_str || !stdout_errors_str) goto _readline_errors; stringpo = PyObject_Str(prompt); @@ -1936,9 +1964,8 @@ builtin_input_impl(PyObject *module, PyObject *prompt) Py_CLEAR(stringpo); if (po == NULL) goto _readline_errors; - promptstr = PyBytes_AsString(po); - if (promptstr == NULL) - goto _readline_errors; + assert(PyBytes_Check(po)); + promptstr = PyBytes_AS_STRING(po); } else { po = NULL; @@ -1976,17 +2003,13 @@ builtin_input_impl(PyObject *module, PyObject *prompt) Py_XDECREF(po); PyMem_FREE(s); return result; - _readline_errors: Py_XDECREF(stdin_encoding); Py_XDECREF(stdout_encoding); Py_XDECREF(stdin_errors); Py_XDECREF(stdout_errors); Py_XDECREF(po); - if (tty) - return NULL; - - PyErr_Clear(); + return NULL; } /* Fallback if we're not interactive */ @@ -1994,7 +2017,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) if (PyFile_WriteObject(prompt, fout, Py_PRINT_RAW) != 0) return NULL; } - tmp = _PyObject_CallMethodId(fout, &PyId_flush, ""); + tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL); if (tmp == NULL) PyErr_Clear(); else @@ -2084,7 +2107,7 @@ reverse flag can be set to request the result in descending order. [end disabled clinic input]*/ PyDoc_STRVAR(builtin_sorted__doc__, -"sorted($module, iterable, /, *, key=None, reverse=False)\n" +"sorted($module, iterable, key=None, reverse=False)\n" "--\n" "\n" "Return a new list containing all items from the iterable in ascending order.\n" @@ -2098,10 +2121,11 @@ PyDoc_STRVAR(builtin_sorted__doc__, static PyObject * builtin_sorted(PyObject *self, PyObject *args, PyObject *kwds) { - PyObject *newlist, *v, *seq, *keyfunc=NULL, *newargs; + PyObject *newlist, *v, *seq, *keyfunc=NULL, **newargs; PyObject *callable; static char *kwlist[] = {"iterable", "key", "reverse", 0}; int reverse; + Py_ssize_t nargs; /* args 1-3 should match listsort in Objects/listobject.c */ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|Oi:sorted", @@ -2118,15 +2142,9 @@ builtin_sorted(PyObject *self, PyObject *args, PyObject *kwds) return NULL; } - newargs = PyTuple_GetSlice(args, 1, 4); - if (newargs == NULL) { - Py_DECREF(newlist); - Py_DECREF(callable); - return NULL; - } - - v = PyObject_Call(callable, newargs, kwds); - Py_DECREF(newargs); + newargs = &PyTuple_GET_ITEM(args, 1); + nargs = PyTuple_GET_SIZE(args) - 1; + v = _PyObject_FastCallDict(callable, newargs, nargs, kwds); Py_DECREF(callable); if (v == NULL) { Py_DECREF(newlist); @@ -2721,10 +2739,10 @@ _PyBuiltin_Init(void) SETBUILTIN("zip", &PyZip_Type); debug = PyBool_FromLong(Py_OptimizeFlag == 0); if (PyDict_SetItemString(dict, "__debug__", debug) < 0) { - Py_XDECREF(debug); + Py_DECREF(debug); return NULL; } - Py_XDECREF(debug); + Py_DECREF(debug); return mod; #undef ADD_TO_ALL diff --git a/Python/ceval.c b/Python/ceval.c index 47c5eff..d5172b9 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -15,87 +15,12 @@ #include "dictobject.h" #include "frameobject.h" #include "opcode.h" +#include "pydtrace.h" #include "setobject.h" #include "structmember.h" #include -#ifndef WITH_TSC - -#define READ_TIMESTAMP(var) - -#else - -typedef unsigned long long uint64; - -/* PowerPC support. - "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas - "__powerpc__" appears to be the correct one for Linux with GCC -*/ -#if defined(__ppc__) || defined (__powerpc__) - -#define READ_TIMESTAMP(var) ppc_getcounter(&var) - -static void -ppc_getcounter(uint64 *v) -{ - unsigned long tbu, tb, tbu2; - - loop: - asm volatile ("mftbu %0" : "=r" (tbu) ); - asm volatile ("mftb %0" : "=r" (tb) ); - asm volatile ("mftbu %0" : "=r" (tbu2)); - if (__builtin_expect(tbu != tbu2, 0)) goto loop; - - /* The slightly peculiar way of writing the next lines is - compiled better by GCC than any other way I tried. */ - ((long*)(v))[0] = tbu; - ((long*)(v))[1] = tb; -} - -#elif defined(__i386__) - -/* this is for linux/x86 (and probably any other GCC/x86 combo) */ - -#define READ_TIMESTAMP(val) \ - __asm__ __volatile__("rdtsc" : "=A" (val)) - -#elif defined(__x86_64__) - -/* for gcc/x86_64, the "A" constraint in DI mode means *either* rax *or* rdx; - not edx:eax as it does for i386. Since rdtsc puts its result in edx:eax - even in 64-bit mode, we need to use "a" and "d" for the lower and upper - 32-bit pieces of the result. */ - -#define READ_TIMESTAMP(val) do { \ - unsigned int h, l; \ - __asm__ __volatile__("rdtsc" : "=a" (l), "=d" (h)); \ - (val) = ((uint64)l) | (((uint64)h) << 32); \ - } while(0) - - -#else - -#error "Don't know how to implement timestamp counter for this architecture" - -#endif - -void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1, - uint64 loop0, uint64 loop1, uint64 intr0, uint64 intr1) -{ - uint64 intr, inst, loop; - PyThreadState *tstate = PyThreadState_Get(); - if (!tstate->interp->tscdump) - return; - intr = intr1 - intr0; - inst = inst1 - inst0 - intr; - loop = loop1 - loop0 - intr; - fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n", - opcode, ticked, inst, loop); -} - -#endif - /* Turn this on if your compiler chokes on the big switch: */ /* #define CASE_TOO_BIG 1 */ @@ -108,24 +33,13 @@ void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1, typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *); /* Forward declarations */ -#ifdef WITH_TSC -static PyObject * call_function(PyObject ***, int, uint64*, uint64*); -#else -static PyObject * call_function(PyObject ***, int); -#endif -static PyObject * fast_function(PyObject *, PyObject ***, int, int, int); -static PyObject * do_call(PyObject *, PyObject ***, int, int); -static PyObject * ext_do_call(PyObject *, PyObject ***, int, int, int); -static PyObject * update_keyword_args(PyObject *, int, PyObject ***, - PyObject *); -static PyObject * update_star_args(int, int, PyObject *, PyObject ***); -static PyObject * load_args(PyObject ***, int); -#define CALL_FLAG_VAR 1 -#define CALL_FLAG_KW 2 +static PyObject * call_function(PyObject ***, Py_ssize_t, PyObject *); +static PyObject * fast_function(PyObject *, PyObject **, Py_ssize_t, PyObject *); +static PyObject * do_call_core(PyObject *, PyObject *, PyObject *); #ifdef LLTRACE static int lltrace; -static int prtrace(PyObject *, char *); +static int prtrace(PyObject *, const char *); #endif static int call_trace(Py_tracefunc, PyObject *, PyThreadState *, PyFrameObject *, @@ -137,14 +51,18 @@ static void call_exc_trace(Py_tracefunc, PyObject *, PyThreadState *, PyFrameObject *); static int maybe_call_line_trace(Py_tracefunc, PyObject *, PyThreadState *, PyFrameObject *, int *, int *, int *); +static void maybe_dtrace_line(PyFrameObject *, int *, int *, int *); +static void dtrace_function_entry(PyFrameObject *); +static void dtrace_function_return(PyFrameObject *); static PyObject * cmp_outcome(int, PyObject *, PyObject *); +static PyObject * import_name(PyFrameObject *, PyObject *, PyObject *, PyObject *); static PyObject * import_from(PyObject *, PyObject *); static int import_all_from(PyObject *, PyObject *); static void format_exc_check_arg(PyObject *, const char *, PyObject *); static void format_exc_unbound(PyCodeObject *co, int oparg); static PyObject * unicode_concatenate(PyObject *, PyObject *, - PyFrameObject *, unsigned char *); + PyFrameObject *, const _Py_CODEUNIT *); static PyObject * special_lookup(PyObject *, _Py_Identifier *); #define NAME_ERROR_MSG \ @@ -796,11 +714,18 @@ PyEval_EvalFrame(PyFrameObject *f) { PyObject * PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) { + PyThreadState *tstate = PyThreadState_GET(); + return tstate->interp->eval_frame(f, throwflag); +} + +PyObject * +_PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) +{ #ifdef DXPAIRS int lastopcode = 0; #endif PyObject **stack_pointer; /* Next free slot in value stack */ - unsigned char *next_instr; + const _Py_CODEUNIT *next_instr; int opcode; /* Current opcode */ int oparg; /* Current opcode argument, if any */ enum why_code why; /* Reason for block stack unwind */ @@ -818,7 +743,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) time it is tested. */ int instr_ub = -1, instr_lb = 0, instr_prev = -1; - unsigned char *first_instr; + const _Py_CODEUNIT *first_instr; PyObject *names; PyObject *consts; @@ -886,24 +811,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) /* Import the static jump table */ #include "opcode_targets.h" -/* This macro is used when several opcodes defer to the same implementation - (e.g. SETUP_LOOP, SETUP_FINALLY) */ -#define TARGET_WITH_IMPL(op, impl) \ - TARGET_##op: \ - opcode = op; \ - if (HAS_ARG(op)) \ - oparg = NEXTARG(); \ - case op: \ - goto impl; \ - #define TARGET(op) \ TARGET_##op: \ - opcode = op; \ - if (HAS_ARG(op)) \ - oparg = NEXTARG(); \ case op: - #define DISPATCH() \ { \ if (!_Py_atomic_load_relaxed(&eval_breaker)) { \ @@ -915,18 +826,20 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #ifdef LLTRACE #define FAST_DISPATCH() \ { \ - if (!lltrace && !_Py_TracingPossible) { \ + if (!lltrace && !_Py_TracingPossible && !PyDTrace_LINE_ENABLED()) { \ f->f_lasti = INSTR_OFFSET(); \ - goto *opcode_targets[*next_instr++]; \ + NEXTOPARG(); \ + goto *opcode_targets[opcode]; \ } \ goto fast_next_opcode; \ } #else #define FAST_DISPATCH() \ { \ - if (!_Py_TracingPossible) { \ + if (!_Py_TracingPossible && !PyDTrace_LINE_ENABLED()) { \ f->f_lasti = INSTR_OFFSET(); \ - goto *opcode_targets[*next_instr++]; \ + NEXTOPARG(); \ + goto *opcode_targets[opcode]; \ } \ goto fast_next_opcode; \ } @@ -935,10 +848,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #else #define TARGET(op) \ case op: -#define TARGET_WITH_IMPL(op, impl) \ - /* silence compiler warnings about `impl` unused */ \ - if (0) goto impl; \ - case op: + #define DISPATCH() continue #define FAST_DISPATCH() goto fast_next_opcode #endif @@ -952,70 +862,33 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #define GETITEM(v, i) PyTuple_GetItem((v), (i)) #endif -#ifdef WITH_TSC -/* Use Pentium timestamp counter to mark certain events: - inst0 -- beginning of switch statement for opcode dispatch - inst1 -- end of switch statement (may be skipped) - loop0 -- the top of the mainloop - loop1 -- place where control returns again to top of mainloop - (may be skipped) - intr1 -- beginning of long interruption - intr2 -- end of long interruption - - Many opcodes call out to helper C functions. In some cases, the - time in those functions should be counted towards the time for the - opcode, but not in all cases. For example, a CALL_FUNCTION opcode - calls another Python function; there's no point in charge all the - bytecode executed by the called function to the caller. - - It's hard to make a useful judgement statically. In the presence - of operator overloading, it's impossible to tell if a call will - execute new Python code or not. - - It's a case-by-case judgement. I'll use intr1 for the following - cases: - - IMPORT_STAR - IMPORT_FROM - CALL_FUNCTION (and friends) - - */ - uint64 inst0, inst1, loop0, loop1, intr0 = 0, intr1 = 0; - int ticked = 0; - - READ_TIMESTAMP(inst0); - READ_TIMESTAMP(inst1); - READ_TIMESTAMP(loop0); - READ_TIMESTAMP(loop1); - - /* shut up the compiler */ - opcode = 0; -#endif - /* Code access macros */ -#define INSTR_OFFSET() ((int)(next_instr - first_instr)) -#define NEXTOP() (*next_instr++) -#define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2]) -#define PEEKARG() ((next_instr[2]<<8) + next_instr[1]) -#define JUMPTO(x) (next_instr = first_instr + (x)) -#define JUMPBY(x) (next_instr += (x)) +/* The integer overflow is checked by an assertion below. */ +#define INSTR_OFFSET() (sizeof(_Py_CODEUNIT) * (int)(next_instr - first_instr)) +#define NEXTOPARG() do { \ + _Py_CODEUNIT word = *next_instr; \ + opcode = _Py_OPCODE(word); \ + oparg = _Py_OPARG(word); \ + next_instr++; \ + } while (0) +#define JUMPTO(x) (next_instr = first_instr + (x) / sizeof(_Py_CODEUNIT)) +#define JUMPBY(x) (next_instr += (x) / sizeof(_Py_CODEUNIT)) /* OpCode prediction macros Some opcodes tend to come in pairs thus making it possible to predict the second code when the first is run. For example, - COMPARE_OP is often followed by JUMP_IF_FALSE or JUMP_IF_TRUE. And, - those opcodes are often followed by a POP_TOP. + COMPARE_OP is often followed by POP_JUMP_IF_FALSE or POP_JUMP_IF_TRUE. Verifying the prediction costs a single high-speed test of a register variable against a constant. If the pairing was good, then the processor's own internal branch predication has a high likelihood of success, resulting in a nearly zero-overhead transition to the next opcode. A successful prediction saves a trip through the eval-loop - including its two unpredictable branches, the HAS_ARG test and the - switch-case. Combined with the processor's internal branch prediction, - a successful PREDICT has the effect of making the two opcodes run as if - they were a single new opcode with the bodies combined. + including its unpredictable switch-case branch. Combined with the + processor's internal branch prediction, a successful PREDICT has the + effect of making the two opcodes run as if they were a single new opcode + with the bodies combined. If collecting opcode statistics, your choices are to either keep the predictions turned-on and interpret the results as if some opcodes @@ -1030,13 +903,19 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #if defined(DYNAMIC_EXECUTION_PROFILE) || USE_COMPUTED_GOTOS #define PREDICT(op) if (0) goto PRED_##op -#define PREDICTED(op) PRED_##op: -#define PREDICTED_WITH_ARG(op) PRED_##op: #else -#define PREDICT(op) if (*next_instr == op) goto PRED_##op -#define PREDICTED(op) PRED_##op: next_instr++ -#define PREDICTED_WITH_ARG(op) PRED_##op: oparg = PEEKARG(); next_instr += 3 +#define PREDICT(op) \ + do{ \ + _Py_CODEUNIT word = *next_instr; \ + opcode = _Py_OPCODE(word); \ + if (opcode == op){ \ + oparg = _Py_OPARG(word); \ + next_instr++; \ + goto PRED_##op; \ + } \ + } while(0) #endif +#define PREDICTED(op) PRED_##op: /* Stack manipulation macros */ @@ -1100,7 +979,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } #define UNWIND_EXCEPT_HANDLER(b) \ - { \ + do { \ PyObject *type, *value, *traceback; \ assert(STACK_LEVEL() >= (b)->b_level + 3); \ while (STACK_LEVEL() > (b)->b_level + 3) { \ @@ -1116,7 +995,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_XDECREF(type); \ Py_XDECREF(value); \ Py_XDECREF(traceback); \ - } + } while(0) /* Start of code */ @@ -1160,21 +1039,24 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } } + if (PyDTrace_FUNCTION_ENTRY_ENABLED()) + dtrace_function_entry(f); + co = f->f_code; names = co->co_names; consts = co->co_consts; fastlocals = f->f_localsplus; freevars = f->f_localsplus + co->co_nlocals; - first_instr = (unsigned char*) PyBytes_AS_STRING(co->co_code); - /* An explanation is in order for the next line. - - f->f_lasti now refers to the index of the last instruction - executed. You might think this was obvious from the name, but - this wasn't always true before 2.3! PyFrame_New now sets - f->f_lasti to -1 (i.e. the index *before* the first instruction) - and YIELD_VALUE doesn't fiddle with f_lasti any more. So this - does work. Promise. - YIELD_FROM sets f_lasti to itself, in order to repeated yield + assert(PyBytes_Check(co->co_code)); + assert(PyBytes_GET_SIZE(co->co_code) <= INT_MAX); + assert(PyBytes_GET_SIZE(co->co_code) % sizeof(_Py_CODEUNIT) == 0); + assert(_Py_IS_ALIGNED(PyBytes_AS_STRING(co->co_code), sizeof(_Py_CODEUNIT))); + first_instr = (_Py_CODEUNIT *) PyBytes_AS_STRING(co->co_code); + /* + f->f_lasti refers to the index of the last instruction, + unless it's -1 in which case next_instr should be first_instr. + + YIELD_FROM sets f_lasti to itself, in order to repeatedly yield multiple values. When the PREDICT() macros are enabled, some opcode pairs follow in @@ -1183,15 +1065,20 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) were a single new opcode; accordingly,f->f_lasti will point to the first code in the pair (for instance, GET_ITER followed by FOR_ITER is effectively a single opcode and f->f_lasti will point - at to the beginning of the combined pair.) + to the beginning of the combined pair.) */ - next_instr = first_instr + f->f_lasti + 1; + assert(f->f_lasti >= -1); + next_instr = first_instr; + if (f->f_lasti >= 0) { + assert(f->f_lasti % sizeof(_Py_CODEUNIT) == 0); + next_instr += f->f_lasti / sizeof(_Py_CODEUNIT) + 1; + } stack_pointer = f->f_stacktop; assert(stack_pointer != NULL); f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */ f->f_executing = 1; - if (co->co_flags & (CO_GENERATOR | CO_COROUTINE)) { + if (co->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR)) { if (!throwflag && f->f_exc_type != NULL && f->f_exc_type != Py_None) { /* We were in an except handler when we left, restore the exception state which was put aside @@ -1219,23 +1106,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #endif for (;;) { -#ifdef WITH_TSC - if (inst1 == 0) { - /* Almost surely, the opcode executed a break - or a continue, preventing inst1 from being set - on the way out of the loop. - */ - READ_TIMESTAMP(inst1); - loop1 = inst1; - } - dump_tsc(opcode, ticked, inst0, inst1, loop0, loop1, - intr0, intr1); - ticked = 0; - inst1 = 0; - intr0 = 0; - intr1 = 0; - READ_TIMESTAMP(loop0); -#endif assert(stack_pointer >= f->f_valuestack); /* else underflow */ assert(STACK_LEVEL() <= co->co_stacksize); /* else overflow */ assert(!PyErr_Occurred()); @@ -1249,14 +1119,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_MakePendingCalls() above. */ if (_Py_atomic_load_relaxed(&eval_breaker)) { - if (*next_instr == SETUP_FINALLY) { + if (_Py_OPCODE(*next_instr) == SETUP_FINALLY) { /* Make the last opcode before a try: finally: block uninterruptible. */ goto fast_next_opcode; } -#ifdef WITH_TSC - ticked = 1; -#endif if (_Py_atomic_load_relaxed(&pendingcalls_to_do)) { if (Py_MakePendingCalls() < 0) goto error; @@ -1296,6 +1163,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) fast_next_opcode: f->f_lasti = INSTR_OFFSET(); + if (PyDTrace_LINE_ENABLED()) + maybe_dtrace_line(f, &instr_lb, &instr_ub, &instr_prev); + /* line-by-line tracing support */ if (_Py_TracingPossible && @@ -1322,11 +1192,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) /* Extract opcode and argument */ - opcode = NEXTOP(); - oparg = 0; /* allows oparg to be stored in a register because - it doesn't have to be remembered across a full loop */ - if (HAS_ARG(opcode)) - oparg = NEXTARG(); + NEXTOPARG(); dispatch_opcode: #ifdef DYNAMIC_EXECUTION_PROFILE #ifdef DXPAIRS @@ -1351,9 +1217,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } #endif - /* Main switch on opcode */ - READ_TIMESTAMP(inst0); - switch (opcode) { /* BEWARE! @@ -1377,6 +1240,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) FAST_DISPATCH(); } + PREDICTED(LOAD_CONST); TARGET(LOAD_CONST) { PyObject *value = GETITEM(consts, oparg); Py_INCREF(value); @@ -1384,7 +1248,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) FAST_DISPATCH(); } - PREDICTED_WITH_ARG(STORE_FAST); + PREDICTED(STORE_FAST); TARGET(STORE_FAST) { PyObject *value = POP(); SETLOCAL(oparg, value); @@ -1545,15 +1409,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) TARGET(BINARY_MODULO) { PyObject *divisor = POP(); PyObject *dividend = TOP(); - PyObject *res; - if (PyUnicode_CheckExact(dividend) && ( - !PyUnicode_Check(divisor) || PyUnicode_CheckExact(divisor))) { - /* fast path; string formatting, but not if the RHS is a str subclass - (see issue28598) */ - res = PyUnicode_Format(dividend, divisor); - } else { - res = PyNumber_Remainder(dividend, divisor); - } + PyObject *res = PyUnicode_CheckExact(dividend) ? + PyUnicode_Format(dividend, divisor) : + PyNumber_Remainder(dividend, divisor); Py_DECREF(divisor); Py_DECREF(dividend); SET_TOP(res); @@ -1869,6 +1727,61 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + TARGET(STORE_ANNOTATION) { + _Py_IDENTIFIER(__annotations__); + PyObject *ann_dict; + PyObject *ann = POP(); + PyObject *name = GETITEM(names, oparg); + int err; + if (f->f_locals == NULL) { + PyErr_Format(PyExc_SystemError, + "no locals found when storing annotation"); + Py_DECREF(ann); + goto error; + } + /* first try to get __annotations__ from locals... */ + if (PyDict_CheckExact(f->f_locals)) { + ann_dict = _PyDict_GetItemId(f->f_locals, + &PyId___annotations__); + if (ann_dict == NULL) { + PyErr_SetString(PyExc_NameError, + "__annotations__ not found"); + Py_DECREF(ann); + goto error; + } + Py_INCREF(ann_dict); + } + else { + PyObject *ann_str = _PyUnicode_FromId(&PyId___annotations__); + if (ann_str == NULL) { + Py_DECREF(ann); + goto error; + } + ann_dict = PyObject_GetItem(f->f_locals, ann_str); + if (ann_dict == NULL) { + if (PyErr_ExceptionMatches(PyExc_KeyError)) { + PyErr_SetString(PyExc_NameError, + "__annotations__ not found"); + } + Py_DECREF(ann); + goto error; + } + } + /* ...if succeeded, __annotations__[name] = ann */ + if (PyDict_CheckExact(ann_dict)) { + err = PyDict_SetItem(ann_dict, name, ann); + } + else { + err = PyObject_SetItem(ann_dict, name, ann); + } + Py_DECREF(ann_dict); + Py_DECREF(ann); + if (err != 0) { + goto error; + } + DISPATCH(); + } + TARGET(DELETE_SUBSCR) { PyObject *sub = TOP(); PyObject *container = SECOND(); @@ -1998,7 +1911,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_DECREF(iter); if (PyErr_WarnFormat( - PyExc_PendingDeprecationWarning, 1, + PyExc_DeprecationWarning, 1, "'%.100s' implements legacy __aiter__ protocol; " "__aiter__ should return an asynchronous " "iterator, not awaitable", @@ -2012,6 +1925,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } SET_TOP(awaitable); + PREDICT(LOAD_CONST); DISPATCH(); } @@ -2022,41 +1936,52 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PyObject *aiter = TOP(); PyTypeObject *type = Py_TYPE(aiter); - if (type->tp_as_async != NULL) - getter = type->tp_as_async->am_anext; + if (PyAsyncGen_CheckExact(aiter)) { + awaitable = type->tp_as_async->am_anext(aiter); + if (awaitable == NULL) { + goto error; + } + } else { + if (type->tp_as_async != NULL){ + getter = type->tp_as_async->am_anext; + } - if (getter != NULL) { - next_iter = (*getter)(aiter); - if (next_iter == NULL) { + if (getter != NULL) { + next_iter = (*getter)(aiter); + if (next_iter == NULL) { + goto error; + } + } + else { + PyErr_Format( + PyExc_TypeError, + "'async for' requires an iterator with " + "__anext__ method, got %.100s", + type->tp_name); goto error; } - } - else { - PyErr_Format( - PyExc_TypeError, - "'async for' requires an iterator with " - "__anext__ method, got %.100s", - type->tp_name); - goto error; - } - awaitable = _PyCoro_GetAwaitableIter(next_iter); - if (awaitable == NULL) { - PyErr_Format( - PyExc_TypeError, - "'async for' received an invalid object " - "from __anext__: %.100s", - Py_TYPE(next_iter)->tp_name); + awaitable = _PyCoro_GetAwaitableIter(next_iter); + if (awaitable == NULL) { + PyErr_Format( + PyExc_TypeError, + "'async for' received an invalid object " + "from __anext__: %.100s", + Py_TYPE(next_iter)->tp_name); - Py_DECREF(next_iter); - goto error; - } else - Py_DECREF(next_iter); + Py_DECREF(next_iter); + goto error; + } else { + Py_DECREF(next_iter); + } + } PUSH(awaitable); + PREDICT(LOAD_CONST); DISPATCH(); } + PREDICTED(GET_AWAITABLE); TARGET(GET_AWAITABLE) { PyObject *iterable = TOP(); PyObject *iter = _PyCoro_GetAwaitableIter(iterable); @@ -2084,21 +2009,22 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) goto error; } + PREDICT(LOAD_CONST); DISPATCH(); } TARGET(YIELD_FROM) { PyObject *v = POP(); - PyObject *reciever = TOP(); + PyObject *receiver = TOP(); int err; - if (PyGen_CheckExact(reciever) || PyCoro_CheckExact(reciever)) { - retval = _PyGen_Send((PyGenObject *)reciever, v); + if (PyGen_CheckExact(receiver) || PyCoro_CheckExact(receiver)) { + retval = _PyGen_Send((PyGenObject *)receiver, v); } else { _Py_IDENTIFIER(send); if (v == Py_None) - retval = Py_TYPE(reciever)->tp_iternext(reciever); + retval = Py_TYPE(receiver)->tp_iternext(receiver); else - retval = _PyObject_CallMethodIdObjArgs(reciever, &PyId_send, v, NULL); + retval = _PyObject_CallMethodIdObjArgs(receiver, &PyId_send, v, NULL); } Py_DECREF(v); if (retval == NULL) { @@ -2109,7 +2035,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) err = _PyGen_FetchStopIterationValue(&val); if (err < 0) goto error; - Py_DECREF(reciever); + Py_DECREF(receiver); SET_TOP(val); DISPATCH(); } @@ -2117,12 +2043,24 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) f->f_stacktop = stack_pointer; why = WHY_YIELD; /* and repeat... */ - f->f_lasti--; + assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT)); + f->f_lasti -= sizeof(_Py_CODEUNIT); goto fast_yield; } TARGET(YIELD_VALUE) { retval = POP(); + + if (co->co_flags & CO_ASYNC_GENERATOR) { + PyObject *w = _PyAsyncGenValueWrapperNew(retval); + Py_DECREF(retval); + if (w == NULL) { + retval = NULL; + goto error; + } + retval = w; + } + f->f_stacktop = stack_pointer; why = WHY_YIELD; goto fast_yield; @@ -2139,6 +2077,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + PREDICTED(POP_BLOCK); TARGET(POP_BLOCK) { PyTryBlock *b = PyFrame_BlockPop(f); UNWIND_BLOCK(b); @@ -2255,7 +2194,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } - PREDICTED_WITH_ARG(UNPACK_SEQUENCE); + PREDICTED(UNPACK_SEQUENCE); TARGET(UNPACK_SEQUENCE) { PyObject *seq = POP(), *item, **items; if (PyTuple_CheckExact(seq) && @@ -2364,7 +2303,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } else { v = PyObject_GetItem(locals, name); - if (v == NULL && _PyErr_OCCURRED()) { + if (v == NULL) { if (!PyErr_ExceptionMatches(PyExc_KeyError)) goto error; PyErr_Clear(); @@ -2404,26 +2343,33 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PyObject *name = GETITEM(names, oparg); PyObject *v; if (PyDict_CheckExact(f->f_globals) - && PyDict_CheckExact(f->f_builtins)) { + && PyDict_CheckExact(f->f_builtins)) + { v = _PyDict_LoadGlobal((PyDictObject *)f->f_globals, (PyDictObject *)f->f_builtins, name); if (v == NULL) { - if (!_PyErr_OCCURRED()) + if (!_PyErr_OCCURRED()) { + /* _PyDict_LoadGlobal() returns NULL without raising + * an exception if the key doesn't exist */ format_exc_check_arg(PyExc_NameError, NAME_ERROR_MSG, name); + } goto error; } Py_INCREF(v); } else { /* Slow-path if globals or builtins is not a dict */ + + /* namespace 1: globals */ v = PyObject_GetItem(f->f_globals, name); if (v == NULL) { if (!PyErr_ExceptionMatches(PyExc_KeyError)) goto error; PyErr_Clear(); + /* namespace 2: builtins */ v = PyObject_GetItem(f->f_builtins, name); if (v == NULL) { if (PyErr_ExceptionMatches(PyExc_KeyError)) @@ -2483,7 +2429,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } else { value = PyObject_GetItem(locals, name); - if (value == NULL && PyErr_Occurred()) { + if (value == NULL) { if (!PyErr_ExceptionMatches(PyExc_KeyError)) goto error; PyErr_Clear(); @@ -2517,8 +2463,27 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) TARGET(STORE_DEREF) { PyObject *v = POP(); PyObject *cell = freevars[oparg]; - PyCell_Set(cell, v); - Py_DECREF(v); + PyObject *oldobj = PyCell_GET(cell); + PyCell_SET(cell, v); + Py_XDECREF(oldobj); + DISPATCH(); + } + + TARGET(BUILD_STRING) { + PyObject *str; + PyObject *empty = PyUnicode_New(0, 0); + if (empty == NULL) { + goto error; + } + str = _PyUnicode_JoinArray(empty, stack_pointer - oparg, oparg); + Py_DECREF(empty); + if (str == NULL) + goto error; + while (--oparg >= 0) { + PyObject *item = POP(); + Py_DECREF(item); + } + PUSH(str); DISPATCH(); } @@ -2546,13 +2511,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } - TARGET_WITH_IMPL(BUILD_TUPLE_UNPACK, _build_list_unpack) - TARGET(BUILD_LIST_UNPACK) - _build_list_unpack: { - int convert_to_tuple = opcode == BUILD_TUPLE_UNPACK; - int i; + TARGET(BUILD_TUPLE_UNPACK_WITH_CALL) + TARGET(BUILD_TUPLE_UNPACK) + TARGET(BUILD_LIST_UNPACK) { + int convert_to_tuple = opcode != BUILD_LIST_UNPACK; + Py_ssize_t i; PyObject *sum = PyList_New(0); PyObject *return_value; + if (sum == NULL) goto error; @@ -2561,6 +2527,16 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) none_val = _PyList_Extend((PyListObject *)sum, PEEK(i)); if (none_val == NULL) { + if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL && + PyErr_ExceptionMatches(PyExc_TypeError)) { + PyObject *func = PEEK(1 + oparg); + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after * " + "must be an iterable, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + PEEK(i)->ob_type->tp_name); + } Py_DECREF(sum); goto error; } @@ -2605,7 +2581,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } TARGET(BUILD_SET_UNPACK) { - int i; + Py_ssize_t i; PyObject *sum = PySet_New(NULL); if (sum == NULL) goto error; @@ -2624,7 +2600,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } TARGET(BUILD_MAP) { - int i; + Py_ssize_t i; PyObject *map = _PyDict_NewPresized((Py_ssize_t)oparg); if (map == NULL) goto error; @@ -2647,60 +2623,143 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } - TARGET_WITH_IMPL(BUILD_MAP_UNPACK_WITH_CALL, _build_map_unpack) - TARGET(BUILD_MAP_UNPACK) - _build_map_unpack: { - int with_call = opcode == BUILD_MAP_UNPACK_WITH_CALL; - int num_maps; - int i; - PyObject *sum = PyDict_New(); - if (sum == NULL) + TARGET(SETUP_ANNOTATIONS) { + _Py_IDENTIFIER(__annotations__); + int err; + PyObject *ann_dict; + if (f->f_locals == NULL) { + PyErr_Format(PyExc_SystemError, + "no locals found when setting up annotations"); goto error; - if (with_call) { - num_maps = oparg & 0xff; + } + /* check if __annotations__ in locals()... */ + if (PyDict_CheckExact(f->f_locals)) { + ann_dict = _PyDict_GetItemId(f->f_locals, + &PyId___annotations__); + if (ann_dict == NULL) { + /* ...if not, create a new one */ + ann_dict = PyDict_New(); + if (ann_dict == NULL) { + goto error; + } + err = _PyDict_SetItemId(f->f_locals, + &PyId___annotations__, ann_dict); + Py_DECREF(ann_dict); + if (err != 0) { + goto error; + } + } } else { - num_maps = oparg; + /* do the same if locals() is not a dict */ + PyObject *ann_str = _PyUnicode_FromId(&PyId___annotations__); + if (ann_str == NULL) { + goto error; + } + ann_dict = PyObject_GetItem(f->f_locals, ann_str); + if (ann_dict == NULL) { + if (!PyErr_ExceptionMatches(PyExc_KeyError)) { + goto error; + } + PyErr_Clear(); + ann_dict = PyDict_New(); + if (ann_dict == NULL) { + goto error; + } + err = PyObject_SetItem(f->f_locals, ann_str, ann_dict); + Py_DECREF(ann_dict); + if (err != 0) { + goto error; + } + } + else { + Py_DECREF(ann_dict); + } + } + DISPATCH(); + } + + TARGET(BUILD_CONST_KEY_MAP) { + Py_ssize_t i; + PyObject *map; + PyObject *keys = TOP(); + if (!PyTuple_CheckExact(keys) || + PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) { + PyErr_SetString(PyExc_SystemError, + "bad BUILD_CONST_KEY_MAP keys argument"); + goto error; + } + map = _PyDict_NewPresized((Py_ssize_t)oparg); + if (map == NULL) { + goto error; + } + for (i = oparg; i > 0; i--) { + int err; + PyObject *key = PyTuple_GET_ITEM(keys, oparg - i); + PyObject *value = PEEK(i + 1); + err = PyDict_SetItem(map, key, value); + if (err != 0) { + Py_DECREF(map); + goto error; + } + } + + Py_DECREF(POP()); + while (oparg--) { + Py_DECREF(POP()); } + PUSH(map); + DISPATCH(); + } + + TARGET(BUILD_MAP_UNPACK) { + Py_ssize_t i; + PyObject *sum = PyDict_New(); + if (sum == NULL) + goto error; - for (i = num_maps; i > 0; i--) { + for (i = oparg; i > 0; i--) { PyObject *arg = PEEK(i); - if (with_call) { - PyObject *intersection = _PyDictView_Intersect(sum, arg); - - if (intersection == NULL) { - if (PyErr_ExceptionMatches(PyExc_AttributeError) || - !PyMapping_Check(arg)) { - int function_location = (oparg>>8) & 0xff; - if (function_location == 1) { - PyObject *func = ( - PEEK(function_location + num_maps)); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - arg->ob_type->tp_name); - } - else { - PyErr_Format(PyExc_TypeError, - "argument after ** " - "must be a mapping, not %.200s", - arg->ob_type->tp_name); - } - } - Py_DECREF(sum); - goto error; + if (PyDict_Update(sum, arg) < 0) { + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + PyErr_Format(PyExc_TypeError, + "'%.200s' object is not a mapping", + arg->ob_type->tp_name); } + Py_DECREF(sum); + goto error; + } + } + + while (oparg--) + Py_DECREF(POP()); + PUSH(sum); + DISPATCH(); + } + + TARGET(BUILD_MAP_UNPACK_WITH_CALL) { + Py_ssize_t i; + PyObject *sum = PyDict_New(); + if (sum == NULL) + goto error; - if (PySet_GET_SIZE(intersection)) { - Py_ssize_t idx = 0; - PyObject *key; - int function_location = (oparg>>8) & 0xff; - Py_hash_t hash; - _PySet_NextEntry(intersection, &idx, &key, &hash); - if (function_location == 1) { - PyObject *func = PEEK(function_location + num_maps); + for (i = oparg; i > 0; i--) { + PyObject *arg = PEEK(i); + if (_PyDict_MergeEx(sum, arg, 2) < 0) { + PyObject *func = PEEK(2 + oparg); + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after ** " + "must be a mapping, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + arg->ob_type->tp_name); + } + else if (PyErr_ExceptionMatches(PyExc_KeyError)) { + PyObject *exc, *val, *tb; + PyErr_Fetch(&exc, &val, &tb); + if (val && PyTuple_Check(val) && PyTuple_GET_SIZE(val) == 1) { + PyObject *key = PyTuple_GET_ITEM(val, 0); if (!PyUnicode_Check(key)) { PyErr_Format(PyExc_TypeError, "%.200s%.200s keywords must be strings", @@ -2714,49 +2773,12 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PyEval_GetFuncDesc(func), key); } + Py_XDECREF(exc); + Py_XDECREF(val); + Py_XDECREF(tb); } else { - if (!PyUnicode_Check(key)) { - PyErr_SetString(PyExc_TypeError, - "keywords must be strings"); - } else { - PyErr_Format(PyExc_TypeError, - "function got multiple " - "values for keyword argument '%U'", - key); - } - } - Py_DECREF(intersection); - Py_DECREF(sum); - goto error; - } - Py_DECREF(intersection); - } - - if (PyDict_Update(sum, arg) < 0) { - if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - if (with_call) { - int function_location = (oparg>>8) & 0xff; - if (function_location == 1) { - PyObject *func = PEEK(function_location + num_maps); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - arg->ob_type->tp_name); - } - else { - PyErr_Format(PyExc_TypeError, - "argument after ** " - "must be a mapping, not %.200s", - arg->ob_type->tp_name); - } - } - else { - PyErr_Format(PyExc_TypeError, - "'%.200s' object is not a mapping", - arg->ob_type->tp_name); + PyErr_Restore(exc, val, tb); } } Py_DECREF(sum); @@ -2764,7 +2786,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } } - while (num_maps--) + while (oparg--) Py_DECREF(POP()); PUSH(sum); DISPATCH(); @@ -2813,45 +2835,13 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } TARGET(IMPORT_NAME) { - _Py_IDENTIFIER(__import__); PyObject *name = GETITEM(names, oparg); - PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__); - PyObject *from, *level, *args, *res; - if (func == NULL) { - PyErr_SetString(PyExc_ImportError, - "__import__ not found"); - goto error; - } - Py_INCREF(func); - from = POP(); - level = TOP(); - if (PyLong_AsLong(level) != -1 || PyErr_Occurred()) - args = PyTuple_Pack(5, - name, - f->f_globals, - f->f_locals == NULL ? - Py_None : f->f_locals, - from, - level); - else - args = PyTuple_Pack(4, - name, - f->f_globals, - f->f_locals == NULL ? - Py_None : f->f_locals, - from); + PyObject *fromlist = POP(); + PyObject *level = TOP(); + PyObject *res; + res = import_name(f, name, fromlist, level); Py_DECREF(level); - Py_DECREF(from); - if (args == NULL) { - Py_DECREF(func); - STACKADJ(-1); - goto error; - } - READ_TIMESTAMP(intr0); - res = PyEval_CallObject(func, args); - READ_TIMESTAMP(intr1); - Py_DECREF(args); - Py_DECREF(func); + Py_DECREF(fromlist); SET_TOP(res); if (res == NULL) goto error; @@ -2861,21 +2851,16 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) TARGET(IMPORT_STAR) { PyObject *from = POP(), *locals; int err; - if (PyFrame_FastToLocalsWithError(f) < 0) { - Py_DECREF(from); + if (PyFrame_FastToLocalsWithError(f) < 0) goto error; - } locals = f->f_locals; if (locals == NULL) { PyErr_SetString(PyExc_SystemError, "no locals found during 'import *'"); - Py_DECREF(from); goto error; } - READ_TIMESTAMP(intr0); err = import_all_from(locals, from); - READ_TIMESTAMP(intr1); PyFrame_LocalsToFast(f, 0); Py_DECREF(from); if (err != 0) @@ -2887,9 +2872,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PyObject *name = GETITEM(names, oparg); PyObject *from = TOP(); PyObject *res; - READ_TIMESTAMP(intr0); res = import_from(from, name); - READ_TIMESTAMP(intr1); PUSH(res); if (res == NULL) goto error; @@ -2901,7 +2884,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) FAST_DISPATCH(); } - PREDICTED_WITH_ARG(POP_JUMP_IF_FALSE); + PREDICTED(POP_JUMP_IF_FALSE); TARGET(POP_JUMP_IF_FALSE) { PyObject *cond = POP(); int err; @@ -2925,7 +2908,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } - PREDICTED_WITH_ARG(POP_JUMP_IF_TRUE); + PREDICTED(POP_JUMP_IF_TRUE); TARGET(POP_JUMP_IF_TRUE) { PyObject *cond = POP(); int err; @@ -3002,7 +2985,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } - PREDICTED_WITH_ARG(JUMP_ABSOLUTE); + PREDICTED(JUMP_ABSOLUTE); TARGET(JUMP_ABSOLUTE) { JUMPTO(oparg); #if FAST_LOOPS @@ -3028,6 +3011,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) if (iter == NULL) goto error; PREDICT(FOR_ITER); + PREDICT(CALL_FUNCTION); DISPATCH(); } @@ -3056,10 +3040,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) if (iter == NULL) goto error; } + PREDICT(LOAD_CONST); DISPATCH(); } - PREDICTED_WITH_ARG(FOR_ITER); + PREDICTED(FOR_ITER); TARGET(FOR_ITER) { /* before: [iter]; after: [iter, iter()] *or* [] */ PyObject *iter = TOP(); @@ -3081,6 +3066,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) STACKADJ(-1); Py_DECREF(iter); JUMPBY(oparg); + PREDICT(POP_BLOCK); DISPATCH(); } @@ -3097,10 +3083,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) goto fast_block_end; } - TARGET_WITH_IMPL(SETUP_LOOP, _setup_finally) - TARGET_WITH_IMPL(SETUP_EXCEPT, _setup_finally) - TARGET(SETUP_FINALLY) - _setup_finally: { + TARGET(SETUP_LOOP) + TARGET(SETUP_EXCEPT) + TARGET(SETUP_FINALLY) { /* NOTE: If you add any new block-setup opcodes that are not try/except/finally handlers, you may need to update the PyGen_NeedsFinalizing() function. @@ -3131,6 +3116,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) if (res == NULL) goto error; PUSH(res); + PREDICT(GET_AWAITABLE); DISPATCH(); } @@ -3148,15 +3134,17 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) _Py_IDENTIFIER(__exit__); _Py_IDENTIFIER(__enter__); PyObject *mgr = TOP(); - PyObject *exit = special_lookup(mgr, &PyId___exit__), *enter; + PyObject *enter = special_lookup(mgr, &PyId___enter__), *exit; PyObject *res; - if (exit == NULL) + if (enter == NULL) + goto error; + exit = special_lookup(mgr, &PyId___exit__); + if (exit == NULL) { + Py_DECREF(enter); goto error; + } SET_TOP(exit); - enter = special_lookup(mgr, &PyId___enter__); Py_DECREF(mgr); - if (enter == NULL) - goto error; res = PyObject_CallFunctionObjArgs(enter, NULL); Py_DECREF(enter); if (res == NULL) @@ -3279,178 +3267,135 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + PREDICTED(CALL_FUNCTION); TARGET(CALL_FUNCTION) { PyObject **sp, *res; PCALL(PCALL_ALL); sp = stack_pointer; -#ifdef WITH_TSC - res = call_function(&sp, oparg, &intr0, &intr1); -#else - res = call_function(&sp, oparg); -#endif + res = call_function(&sp, oparg, NULL); stack_pointer = sp; PUSH(res); - if (res == NULL) + if (res == NULL) { goto error; + } DISPATCH(); } - TARGET_WITH_IMPL(CALL_FUNCTION_VAR, _call_function_var_kw) - TARGET_WITH_IMPL(CALL_FUNCTION_KW, _call_function_var_kw) - TARGET(CALL_FUNCTION_VAR_KW) - _call_function_var_kw: { - int na = oparg & 0xff; - int nk = (oparg>>8) & 0xff; - int flags = (opcode - CALL_FUNCTION) & 3; - int n = na + 2 * nk; - PyObject **pfunc, *func, **sp, *res; + TARGET(CALL_FUNCTION_KW) { + PyObject **sp, *res, *names; + + names = POP(); + assert(PyTuple_CheckExact(names) && PyTuple_GET_SIZE(names) <= oparg); PCALL(PCALL_ALL); - if (flags & CALL_FLAG_VAR) - n++; - if (flags & CALL_FLAG_KW) - n++; - pfunc = stack_pointer - n - 1; - func = *pfunc; - - if (PyMethod_Check(func) - && PyMethod_GET_SELF(func) != NULL) { - PyObject *self = PyMethod_GET_SELF(func); - Py_INCREF(self); - func = PyMethod_GET_FUNCTION(func); - Py_INCREF(func); - Py_SETREF(*pfunc, self); - na++; - /* n++; */ - } else - Py_INCREF(func); sp = stack_pointer; - READ_TIMESTAMP(intr0); - res = ext_do_call(func, &sp, flags, na, nk); - READ_TIMESTAMP(intr1); + res = call_function(&sp, oparg, names); stack_pointer = sp; - Py_DECREF(func); - - while (stack_pointer > pfunc) { - PyObject *o = POP(); - Py_DECREF(o); - } PUSH(res); - if (res == NULL) - goto error; - DISPATCH(); - } + Py_DECREF(names); - TARGET_WITH_IMPL(MAKE_CLOSURE, _make_function) - TARGET(MAKE_FUNCTION) - _make_function: { - int posdefaults = oparg & 0xff; - int kwdefaults = (oparg>>8) & 0xff; - int num_annotations = (oparg >> 16) & 0x7fff; - - PyObject *qualname = POP(); /* qualname */ - PyObject *code = POP(); /* code object */ - PyObject *func = PyFunction_NewWithQualName(code, f->f_globals, qualname); - Py_DECREF(code); - Py_DECREF(qualname); - - if (func == NULL) + if (res == NULL) { goto error; - - if (opcode == MAKE_CLOSURE) { - PyObject *closure = POP(); - if (PyFunction_SetClosure(func, closure) != 0) { - /* Can't happen unless bytecode is corrupt. */ - Py_DECREF(func); - Py_DECREF(closure); - goto error; - } - Py_DECREF(closure); } + DISPATCH(); + } - if (num_annotations > 0) { - Py_ssize_t name_ix; - PyObject *names = POP(); /* names of args with annotations */ - PyObject *anns = PyDict_New(); - if (anns == NULL) { - Py_DECREF(func); - Py_DECREF(names); - goto error; - } - name_ix = PyTuple_Size(names); - assert(num_annotations == name_ix+1); - while (name_ix > 0) { - PyObject *name, *value; - int err; - --name_ix; - name = PyTuple_GET_ITEM(names, name_ix); - value = POP(); - err = PyDict_SetItem(anns, name, value); - Py_DECREF(value); - if (err != 0) { - Py_DECREF(anns); - Py_DECREF(func); - Py_DECREF(names); + TARGET(CALL_FUNCTION_EX) { + PyObject *func, *callargs, *kwargs = NULL, *result; + PCALL(PCALL_ALL); + if (oparg & 0x01) { + kwargs = POP(); + if (!PyDict_CheckExact(kwargs)) { + PyObject *d = PyDict_New(); + if (d == NULL) goto error; - } - } - Py_DECREF(names); - - if (PyFunction_SetAnnotations(func, anns) != 0) { - /* Can't happen unless - PyFunction_SetAnnotations changes. */ - Py_DECREF(anns); - Py_DECREF(func); - goto error; - } - Py_DECREF(anns); - } - - /* XXX Maybe this should be a separate opcode? */ - if (kwdefaults > 0) { - PyObject *defs = PyDict_New(); - if (defs == NULL) { - Py_DECREF(func); - goto error; - } - while (--kwdefaults >= 0) { - PyObject *v = POP(); /* default value */ - PyObject *key = POP(); /* kw only arg name */ - int err = PyDict_SetItem(defs, key, v); - Py_DECREF(v); - Py_DECREF(key); - if (err != 0) { - Py_DECREF(defs); - Py_DECREF(func); + if (PyDict_Update(d, kwargs) != 0) { + Py_DECREF(d); + /* PyDict_Update raises attribute + * error (percolated from an attempt + * to get 'keys' attribute) instead of + * a type error if its second argument + * is not a mapping. + */ + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + func = SECOND(); + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after ** " + "must be a mapping, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + kwargs->ob_type->tp_name); + } + Py_DECREF(kwargs); goto error; } + Py_DECREF(kwargs); + kwargs = d; } - if (PyFunction_SetKwDefaults(func, defs) != 0) { - /* Can't happen unless - PyFunction_SetKwDefaults changes. */ - Py_DECREF(func); - Py_DECREF(defs); - goto error; - } - Py_DECREF(defs); + assert(PyDict_CheckExact(kwargs)); } - if (posdefaults > 0) { - PyObject *defs = PyTuple_New(posdefaults); - if (defs == NULL) { - Py_DECREF(func); + callargs = POP(); + func = TOP(); + if (!PyTuple_CheckExact(callargs)) { + if (Py_TYPE(callargs)->tp_iter == NULL && + !PySequence_Check(callargs)) { + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after * " + "must be an iterable, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + callargs->ob_type->tp_name); + Py_DECREF(callargs); goto error; } - while (--posdefaults >= 0) - PyTuple_SET_ITEM(defs, posdefaults, POP()); - if (PyFunction_SetDefaults(func, defs) != 0) { - /* Can't happen unless - PyFunction_SetDefaults changes. */ - Py_DECREF(defs); - Py_DECREF(func); + Py_SETREF(callargs, PySequence_Tuple(callargs)); + if (callargs == NULL) { goto error; } - Py_DECREF(defs); } - PUSH(func); + assert(PyTuple_CheckExact(callargs)); + + result = do_call_core(func, callargs, kwargs); + Py_DECREF(func); + Py_DECREF(callargs); + Py_XDECREF(kwargs); + + SET_TOP(result); + if (result == NULL) { + goto error; + } + DISPATCH(); + } + + TARGET(MAKE_FUNCTION) { + PyObject *qualname = POP(); + PyObject *codeobj = POP(); + PyFunctionObject *func = (PyFunctionObject *) + PyFunction_NewWithQualName(codeobj, f->f_globals, qualname); + + Py_DECREF(codeobj); + Py_DECREF(qualname); + if (func == NULL) { + goto error; + } + + if (oparg & 0x08) { + assert(PyTuple_CheckExact(TOP())); + func ->func_closure = POP(); + } + if (oparg & 0x04) { + assert(PyDict_CheckExact(TOP())); + func->func_annotations = POP(); + } + if (oparg & 0x02) { + assert(PyDict_CheckExact(TOP())); + func->func_kwdefaults = POP(); + } + if (oparg & 0x01) { + assert(PyTuple_CheckExact(TOP())); + func->func_defaults = POP(); + } + + PUSH((PyObject *)func); DISPATCH(); } @@ -3472,9 +3417,68 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + TARGET(FORMAT_VALUE) { + /* Handles f-string value formatting. */ + PyObject *result; + PyObject *fmt_spec; + PyObject *value; + PyObject *(*conv_fn)(PyObject *); + int which_conversion = oparg & FVC_MASK; + int have_fmt_spec = (oparg & FVS_MASK) == FVS_HAVE_SPEC; + + fmt_spec = have_fmt_spec ? POP() : NULL; + value = POP(); + + /* See if any conversion is specified. */ + switch (which_conversion) { + case FVC_STR: conv_fn = PyObject_Str; break; + case FVC_REPR: conv_fn = PyObject_Repr; break; + case FVC_ASCII: conv_fn = PyObject_ASCII; break; + + /* Must be 0 (meaning no conversion), since only four + values are allowed by (oparg & FVC_MASK). */ + default: conv_fn = NULL; break; + } + + /* If there's a conversion function, call it and replace + value with that result. Otherwise, just use value, + without conversion. */ + if (conv_fn != NULL) { + result = conv_fn(value); + Py_DECREF(value); + if (result == NULL) { + Py_XDECREF(fmt_spec); + goto error; + } + value = result; + } + + /* If value is a unicode object, and there's no fmt_spec, + then we know the result of format(value) is value + itself. In that case, skip calling format(). I plan to + move this optimization in to PyObject_Format() + itself. */ + if (PyUnicode_CheckExact(value) && fmt_spec == NULL) { + /* Do nothing, just transfer ownership to result. */ + result = value; + } else { + /* Actually call format(). */ + result = PyObject_Format(value, fmt_spec); + Py_DECREF(value); + Py_XDECREF(fmt_spec); + if (result == NULL) { + goto error; + } + } + + PUSH(result); + DISPATCH(); + } + TARGET(EXTENDED_ARG) { - opcode = NEXTOP(); - oparg = oparg<<16 | NEXTARG(); + int oldoparg = oparg; + NEXTOPARG(); + oparg |= oldoparg << 8; goto dispatch_opcode; } @@ -3501,7 +3505,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) assert(0); error: - READ_TIMESTAMP(inst1); assert(why == WHY_NOT); why = WHY_EXCEPTION; @@ -3605,7 +3608,6 @@ fast_block_end: if (why != WHY_NOT) break; - READ_TIMESTAMP(loop1); assert(!PyErr_Occurred()); @@ -3624,7 +3626,7 @@ fast_block_end: assert((retval != NULL) ^ (PyErr_Occurred() != NULL)); fast_yield: - if (co->co_flags & (CO_GENERATOR | CO_COROUTINE)) { + if (co->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR)) { /* The purpose of this block is to put aside the generator's exception state and restore that of the calling frame. If the current @@ -3635,9 +3637,11 @@ fast_yield: state came into existence in this frame. (An uncaught exception would have why == WHY_EXCEPTION, and we wouldn't be here). */ int i; - for (i = 0; i < f->f_iblock; i++) - if (f->f_blockstack[i].b_type == EXCEPT_HANDLER) + for (i = 0; i < f->f_iblock; i++) { + if (f->f_blockstack[i].b_type == EXCEPT_HANDLER) { break; + } + } if (i == f->f_iblock) /* We did not create this exception. */ restore_and_clear_exc_state(tstate, f); @@ -3678,6 +3682,8 @@ fast_yield: /* pop frame */ exit_eval_frame: + if (PyDTrace_FUNCTION_RETURN_ENABLED()) + dtrace_function_return(f); Py_LeaveRecursiveCall(); f->f_executing = 0; tstate->frame = f->f_back; @@ -3748,12 +3754,12 @@ format_missing(const char *kind, PyCodeObject *co, PyObject *names) } static void -missing_arguments(PyCodeObject *co, int missing, int defcount, +missing_arguments(PyCodeObject *co, Py_ssize_t missing, Py_ssize_t defcount, PyObject **fastlocals) { - int i, j = 0; - int start, end; - int positional = defcount != -1; + Py_ssize_t i, j = 0; + Py_ssize_t start, end; + int positional = (defcount != -1); const char *kind = positional ? "positional" : "keyword-only"; PyObject *missing_names; @@ -3786,33 +3792,39 @@ missing_arguments(PyCodeObject *co, int missing, int defcount, } static void -too_many_positional(PyCodeObject *co, int given, int defcount, PyObject **fastlocals) +too_many_positional(PyCodeObject *co, Py_ssize_t given, Py_ssize_t defcount, + PyObject **fastlocals) { int plural; - int kwonly_given = 0; - int i; + Py_ssize_t kwonly_given = 0; + Py_ssize_t i; PyObject *sig, *kwonly_sig; + Py_ssize_t co_argcount = co->co_argcount; assert((co->co_flags & CO_VARARGS) == 0); /* Count missing keyword-only args. */ - for (i = co->co_argcount; i < co->co_argcount + co->co_kwonlyargcount; i++) - if (GETLOCAL(i) != NULL) + for (i = co_argcount; i < co_argcount + co->co_kwonlyargcount; i++) { + if (GETLOCAL(i) != NULL) { kwonly_given++; + } + } if (defcount) { - int atleast = co->co_argcount - defcount; + Py_ssize_t atleast = co_argcount - defcount; plural = 1; - sig = PyUnicode_FromFormat("from %d to %d", atleast, co->co_argcount); + sig = PyUnicode_FromFormat("from %zd to %zd", atleast, co_argcount); } else { - plural = co->co_argcount != 1; - sig = PyUnicode_FromFormat("%d", co->co_argcount); + plural = (co_argcount != 1); + sig = PyUnicode_FromFormat("%zd", co_argcount); } if (sig == NULL) return; if (kwonly_given) { - const char *format = " positional argument%s (and %d keyword-only argument%s)"; - kwonly_sig = PyUnicode_FromFormat(format, given != 1 ? "s" : "", kwonly_given, - kwonly_given != 1 ? "s" : ""); + const char *format = " positional argument%s (and %zd keyword-only argument%s)"; + kwonly_sig = PyUnicode_FromFormat(format, + given != 1 ? "s" : "", + kwonly_given, + kwonly_given != 1 ? "s" : ""); if (kwonly_sig == NULL) { Py_DECREF(sig); return; @@ -3824,7 +3836,7 @@ too_many_positional(PyCodeObject *co, int given, int defcount, PyObject **fastlo assert(kwonly_sig != NULL); } PyErr_Format(PyExc_TypeError, - "%U() takes %U positional argument%s but %d%U %s given", + "%U() takes %U positional argument%s but %zd%U %s given", co->co_name, sig, plural ? "s" : "", @@ -3841,20 +3853,22 @@ too_many_positional(PyCodeObject *co, int given, int defcount, PyObject **fastlo static PyObject * _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, - PyObject **args, int argcount, PyObject **kws, int kwcount, - PyObject **defs, int defcount, PyObject *kwdefs, PyObject *closure, + PyObject **args, Py_ssize_t argcount, + PyObject **kwnames, PyObject **kwargs, + Py_ssize_t kwcount, int kwstep, + PyObject **defs, Py_ssize_t defcount, + PyObject *kwdefs, PyObject *closure, PyObject *name, PyObject *qualname) { PyCodeObject* co = (PyCodeObject*)_co; PyFrameObject *f; PyObject *retval = NULL; PyObject **fastlocals, **freevars; - PyThreadState *tstate = PyThreadState_GET(); + PyThreadState *tstate; PyObject *x, *u; - int total_args = co->co_argcount + co->co_kwonlyargcount; - int i; - int n = argcount; - PyObject *kwdict = NULL; + const Py_ssize_t total_args = co->co_argcount + co->co_kwonlyargcount; + Py_ssize_t i, n; + PyObject *kwdict; if (globals == NULL) { PyErr_SetString(PyExc_SystemError, @@ -3862,36 +3876,50 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, return NULL; } + /* Create the frame */ + tstate = PyThreadState_GET(); assert(tstate != NULL); - assert(globals != NULL); f = PyFrame_New(tstate, co, globals, locals); - if (f == NULL) + if (f == NULL) { return NULL; - + } fastlocals = f->f_localsplus; freevars = f->f_localsplus + co->co_nlocals; - /* Parse arguments. */ + /* Create a dictionary for keyword parameters (**kwags) */ if (co->co_flags & CO_VARKEYWORDS) { kwdict = PyDict_New(); if (kwdict == NULL) goto fail; i = total_args; - if (co->co_flags & CO_VARARGS) + if (co->co_flags & CO_VARARGS) { i++; + } SETLOCAL(i, kwdict); } - if (argcount > co->co_argcount) + else { + kwdict = NULL; + } + + /* Copy positional arguments into local variables */ + if (argcount > co->co_argcount) { n = co->co_argcount; + } + else { + n = argcount; + } for (i = 0; i < n; i++) { x = args[i]; Py_INCREF(x); SETLOCAL(i, x); } + + /* Pack other positional arguments into the *args argument */ if (co->co_flags & CO_VARARGS) { u = PyTuple_New(argcount - n); - if (u == NULL) + if (u == NULL) { goto fail; + } SETLOCAL(total_args, u); for (i = n; i < argcount; i++) { x = args[i]; @@ -3899,69 +3927,82 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, PyTuple_SET_ITEM(u, i-n, x); } } - for (i = 0; i < kwcount; i++) { + + /* Handle keyword arguments passed as two strided arrays */ + kwcount *= kwstep; + for (i = 0; i < kwcount; i += kwstep) { PyObject **co_varnames; - PyObject *keyword = kws[2*i]; - PyObject *value = kws[2*i + 1]; - int j; + PyObject *keyword = kwnames[i]; + PyObject *value = kwargs[i]; + Py_ssize_t j; + if (keyword == NULL || !PyUnicode_Check(keyword)) { PyErr_Format(PyExc_TypeError, "%U() keywords must be strings", co->co_name); goto fail; } + /* Speed hack: do raw pointer compares. As names are normally interned this should almost always hit. */ co_varnames = ((PyTupleObject *)(co->co_varnames))->ob_item; for (j = 0; j < total_args; j++) { - PyObject *nm = co_varnames[j]; - if (nm == keyword) + PyObject *name = co_varnames[j]; + if (name == keyword) { goto kw_found; + } } + /* Slow fallback, just in case */ for (j = 0; j < total_args; j++) { - PyObject *nm = co_varnames[j]; - int cmp = PyObject_RichCompareBool( - keyword, nm, Py_EQ); - if (cmp > 0) + PyObject *name = co_varnames[j]; + int cmp = PyObject_RichCompareBool( keyword, name, Py_EQ); + if (cmp > 0) { goto kw_found; - else if (cmp < 0) + } + else if (cmp < 0) { goto fail; + } } + if (j >= total_args && kwdict == NULL) { PyErr_Format(PyExc_TypeError, - "%U() got an unexpected " - "keyword argument '%S'", - co->co_name, - keyword); + "%U() got an unexpected keyword argument '%S'", + co->co_name, keyword); goto fail; } + if (PyDict_SetItem(kwdict, keyword, value) == -1) { goto fail; } continue; + kw_found: if (GETLOCAL(j) != NULL) { PyErr_Format(PyExc_TypeError, - "%U() got multiple " - "values for argument '%S'", - co->co_name, - keyword); + "%U() got multiple values for argument '%S'", + co->co_name, keyword); goto fail; } Py_INCREF(value); SETLOCAL(j, value); } + + /* Check the number of positional arguments */ if (argcount > co->co_argcount && !(co->co_flags & CO_VARARGS)) { too_many_positional(co, argcount, defcount, fastlocals); goto fail; } + + /* Add missing positional arguments (copy default values from defs) */ if (argcount < co->co_argcount) { - int m = co->co_argcount - defcount; - int missing = 0; - for (i = argcount; i < m; i++) - if (GETLOCAL(i) == NULL) + Py_ssize_t m = co->co_argcount - defcount; + Py_ssize_t missing = 0; + for (i = argcount; i < m; i++) { + if (GETLOCAL(i) == NULL) { missing++; + } + } if (missing) { missing_arguments(co, missing, defcount, fastlocals); goto fail; @@ -3978,8 +4019,10 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, } } } + + /* Add missing keyword arguments (copy default values from kwdefs) */ if (co->co_kwonlyargcount > 0) { - int missing = 0; + Py_ssize_t missing = 0; for (i = co->co_argcount; i < total_args; i++) { PyObject *name; if (GETLOCAL(i) != NULL) @@ -4020,13 +4063,16 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, goto fail; SETLOCAL(co->co_nlocals + i, c); } + + /* Copy closure variables to free variables */ for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) { PyObject *o = PyTuple_GET_ITEM(closure, i); Py_INCREF(o); freevars[PyTuple_GET_SIZE(co->co_cellvars) + i] = o; } - if (co->co_flags & (CO_GENERATOR | CO_COROUTINE)) { + /* Handle generator/coroutine/asynchronous generator */ + if (co->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR)) { PyObject *gen; PyObject *coro_wrapper = tstate->coroutine_wrapper; int is_coro = co->co_flags & CO_COROUTINE; @@ -4051,6 +4097,8 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals, * and return that as the value. */ if (is_coro) { gen = PyCoro_New(f, name, qualname); + } else if (co->co_flags & CO_ASYNC_GENERATOR) { + gen = PyAsyncGen_New(f, name, qualname); } else { gen = PyGen_NewWithQualName(f, name, qualname); } @@ -4090,8 +4138,10 @@ PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals, PyObject **defs, int defcount, PyObject *kwdefs, PyObject *closure) { return _PyEval_EvalCodeWithName(_co, globals, locals, - args, argcount, kws, kwcount, - defs, defcount, kwdefs, closure, + args, argcount, + kws, kws + 1, kwcount, 2, + defs, defcount, + kwdefs, closure, NULL, NULL); } @@ -4350,7 +4400,7 @@ Error: #ifdef LLTRACE static int -prtrace(PyObject *v, char *str) +prtrace(PyObject *v, const char *str) { printf("%s ", str); if (PyObject_Print(v, stdout, 0) != 0) @@ -4527,6 +4577,38 @@ _PyEval_GetCoroutineWrapper(void) return tstate->coroutine_wrapper; } +void +_PyEval_SetAsyncGenFirstiter(PyObject *firstiter) +{ + PyThreadState *tstate = PyThreadState_GET(); + + Py_XINCREF(firstiter); + Py_XSETREF(tstate->async_gen_firstiter, firstiter); +} + +PyObject * +_PyEval_GetAsyncGenFirstiter(void) +{ + PyThreadState *tstate = PyThreadState_GET(); + return tstate->async_gen_firstiter; +} + +void +_PyEval_SetAsyncGenFinalizer(PyObject *finalizer) +{ + PyThreadState *tstate = PyThreadState_GET(); + + Py_XINCREF(finalizer); + Py_XSETREF(tstate->async_gen_finalizer, finalizer); +} + +PyObject * +_PyEval_GetAsyncGenFinalizer(void) +{ + PyThreadState *tstate = PyThreadState_GET(); + return tstate->async_gen_finalizer; +} + PyObject * PyEval_GetBuiltins(void) { @@ -4599,10 +4681,8 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf) The arg must be a tuple or NULL. The kw must be a dict or NULL. */ PyObject * -PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw) +PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs) { - PyObject *result; - #ifdef Py_DEBUG /* PyEval_CallObjectWithKeywords() must not be called with an exception set. It raises a new exception if parameters are invalid or if @@ -4610,30 +4690,23 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw) assert(!PyErr_Occurred()); #endif - if (arg == NULL) { - arg = PyTuple_New(0); - if (arg == NULL) - return NULL; + if (args == NULL) { + return _PyObject_FastCallDict(func, NULL, 0, kwargs); } - else if (!PyTuple_Check(arg)) { + + if (!PyTuple_Check(args)) { PyErr_SetString(PyExc_TypeError, "argument list must be a tuple"); return NULL; } - else - Py_INCREF(arg); - if (kw != NULL && !PyDict_Check(kw)) { + if (kwargs != NULL && !PyDict_Check(kwargs)) { PyErr_SetString(PyExc_TypeError, "keyword list must be a dictionary"); - Py_DECREF(arg); return NULL; } - result = PyObject_Call(func, arg, kw); - Py_DECREF(arg); - - return result; + return PyObject_Call(func, args, kwargs); } const char * @@ -4642,7 +4715,7 @@ PyEval_GetFuncName(PyObject *func) if (PyMethod_Check(func)) return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func)); else if (PyFunction_Check(func)) - return _PyUnicode_AsString(((PyFunctionObject*)func)->func_name); + return PyUnicode_AsUTF8(((PyFunctionObject*)func)->func_name); else if (PyCFunction_Check(func)) return ((PyCFunctionObject*)func)->m_ml->ml_name; else @@ -4662,21 +4735,6 @@ PyEval_GetFuncDesc(PyObject *func) return " object"; } -static void -err_args(PyObject *func, int flags, int nargs) -{ - if (flags & METH_NOARGS) - PyErr_Format(PyExc_TypeError, - "%.200s() takes no arguments (%d given)", - ((PyCFunctionObject *)func)->m_ml->ml_name, - nargs); - else - PyErr_Format(PyExc_TypeError, - "%.200s() takes exactly one argument (%d given)", - ((PyCFunctionObject *)func)->m_ml->ml_name, - nargs); -} - #define C_TRACE(x, call) \ if (tstate->use_tracing && tstate->c_profilefunc) { \ if (call_trace(tstate->c_profilefunc, tstate->c_profileobj, \ @@ -4709,60 +4767,25 @@ if (tstate->use_tracing && tstate->c_profilefunc) { \ } static PyObject * -call_function(PyObject ***pp_stack, int oparg -#ifdef WITH_TSC - , uint64* pintr0, uint64* pintr1 -#endif - ) +call_function(PyObject ***pp_stack, Py_ssize_t oparg, PyObject *kwnames) { - int na = oparg & 0xff; - int nk = (oparg>>8) & 0xff; - int n = na + 2 * nk; - PyObject **pfunc = (*pp_stack) - n - 1; + PyObject **pfunc = (*pp_stack) - oparg - 1; PyObject *func = *pfunc; PyObject *x, *w; + Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); + Py_ssize_t nargs = oparg - nkwargs; + PyObject **stack; /* Always dispatch PyCFunction first, because these are presumed to be the most frequent callable object. */ - if (PyCFunction_Check(func) && nk == 0) { - int flags = PyCFunction_GET_FLAGS(func); + if (PyCFunction_Check(func)) { PyThreadState *tstate = PyThreadState_GET(); PCALL(PCALL_CFUNCTION); - if (flags & (METH_NOARGS | METH_O)) { - PyCFunction meth = PyCFunction_GET_FUNCTION(func); - PyObject *self = PyCFunction_GET_SELF(func); - if (flags & METH_NOARGS && na == 0) { - C_TRACE(x, (*meth)(self,NULL)); - - x = _Py_CheckFunctionResult(func, x, NULL); - } - else if (flags & METH_O && na == 1) { - PyObject *arg = EXT_POP(*pp_stack); - C_TRACE(x, (*meth)(self,arg)); - Py_DECREF(arg); - x = _Py_CheckFunctionResult(func, x, NULL); - } - else { - err_args(func, flags, na); - x = NULL; - } - } - else { - PyObject *callargs; - callargs = load_args(pp_stack, na); - if (callargs != NULL) { - READ_TIMESTAMP(*pintr0); - C_TRACE(x, PyCFunction_Call(func,callargs,NULL)); - READ_TIMESTAMP(*pintr1); - Py_XDECREF(callargs); - } - else { - x = NULL; - } - } + stack = (*pp_stack) - nargs - nkwargs; + C_TRACE(x, _PyCFunction_FastCallKeywords(func, stack, nargs, kwnames)); } else { if (PyMethod_Check(func) && PyMethod_GET_SELF(func) != NULL) { @@ -4774,21 +4797,26 @@ call_function(PyObject ***pp_stack, int oparg func = PyMethod_GET_FUNCTION(func); Py_INCREF(func); Py_SETREF(*pfunc, self); - na++; - n++; - } else + nargs++; + } + else { Py_INCREF(func); - READ_TIMESTAMP(*pintr0); - if (PyFunction_Check(func)) - x = fast_function(func, pp_stack, n, na, nk); - else - x = do_call(func, pp_stack, na, nk); - READ_TIMESTAMP(*pintr1); - Py_DECREF(func); + } + + stack = (*pp_stack) - nargs - nkwargs; + + if (PyFunction_Check(func)) { + x = fast_function(func, stack, nargs, kwnames); + } + else { + x = _PyObject_FastCallKeywords(func, stack, nargs, kwnames); + } - assert((x != NULL) ^ (PyErr_Occurred() != NULL)); + Py_DECREF(func); } + assert((x != NULL) ^ (PyErr_Occurred() != NULL)); + /* Clear the stack of the function object. Also removes the arguments in case they weren't consumed already (fast_function() and err_args() leave them on the stack). @@ -4799,7 +4827,6 @@ call_function(PyObject ***pp_stack, int oparg PCALL(PCALL_POP); } - assert((x != NULL) ^ (PyErr_Occurred() != NULL)); return x; } @@ -4812,257 +4839,197 @@ call_function(PyObject ***pp_stack, int oparg done before evaluating the frame. */ +static PyObject* +_PyFunction_FastCall(PyCodeObject *co, PyObject **args, Py_ssize_t nargs, + PyObject *globals) +{ + PyFrameObject *f; + PyThreadState *tstate = PyThreadState_GET(); + PyObject **fastlocals; + Py_ssize_t i; + PyObject *result; + + PCALL(PCALL_FASTER_FUNCTION); + assert(globals != NULL); + /* XXX Perhaps we should create a specialized + PyFrame_New() that doesn't take locals, but does + take builtins without sanity checking them. + */ + assert(tstate != NULL); + f = PyFrame_New(tstate, co, globals, NULL); + if (f == NULL) { + return NULL; + } + + fastlocals = f->f_localsplus; + + for (i = 0; i < nargs; i++) { + Py_INCREF(*args); + fastlocals[i] = *args++; + } + result = PyEval_EvalFrameEx(f,0); + + ++tstate->recursion_depth; + Py_DECREF(f); + --tstate->recursion_depth; + + return result; +} + static PyObject * -fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk) +fast_function(PyObject *func, PyObject **stack, + Py_ssize_t nargs, PyObject *kwnames) { PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func); PyObject *globals = PyFunction_GET_GLOBALS(func); PyObject *argdefs = PyFunction_GET_DEFAULTS(func); - PyObject *kwdefs = PyFunction_GET_KW_DEFAULTS(func); - PyObject *name = ((PyFunctionObject *)func) -> func_name; - PyObject *qualname = ((PyFunctionObject *)func) -> func_qualname; - PyObject **d = NULL; - int nd = 0; + PyObject *kwdefs, *closure, *name, *qualname; + PyObject **d; + Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); + Py_ssize_t nd; + + assert(PyFunction_Check(func)); + assert(nargs >= 0); + assert(kwnames == NULL || PyTuple_CheckExact(kwnames)); + assert((nargs == 0 && nkwargs == 0) || stack != NULL); + /* kwnames must only contains str strings, no subclass, and all keys must + be unique */ PCALL(PCALL_FUNCTION); PCALL(PCALL_FAST_FUNCTION); - if (argdefs == NULL && co->co_argcount == n && - co->co_kwonlyargcount == 0 && nk==0 && - co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) { - PyFrameObject *f; - PyObject *retval = NULL; - PyThreadState *tstate = PyThreadState_GET(); - PyObject **fastlocals, **stack; - int i; - - PCALL(PCALL_FASTER_FUNCTION); - assert(globals != NULL); - /* XXX Perhaps we should create a specialized - PyFrame_New() that doesn't take locals, but does - take builtins without sanity checking them. - */ - assert(tstate != NULL); - f = PyFrame_New(tstate, co, globals, NULL); - if (f == NULL) - return NULL; - fastlocals = f->f_localsplus; - stack = (*pp_stack) - n; - - for (i = 0; i < n; i++) { - Py_INCREF(*stack); - fastlocals[i] = *stack++; + if (co->co_kwonlyargcount == 0 && nkwargs == 0 && + co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) + { + if (argdefs == NULL && co->co_argcount == nargs) { + return _PyFunction_FastCall(co, stack, nargs, globals); + } + else if (nargs == 0 && argdefs != NULL + && co->co_argcount == Py_SIZE(argdefs)) { + /* function called with no arguments, but all parameters have + a default value: use default values as arguments .*/ + stack = &PyTuple_GET_ITEM(argdefs, 0); + return _PyFunction_FastCall(co, stack, Py_SIZE(argdefs), globals); } - retval = PyEval_EvalFrameEx(f,0); - ++tstate->recursion_depth; - Py_DECREF(f); - --tstate->recursion_depth; - return retval; } + + kwdefs = PyFunction_GET_KW_DEFAULTS(func); + closure = PyFunction_GET_CLOSURE(func); + name = ((PyFunctionObject *)func) -> func_name; + qualname = ((PyFunctionObject *)func) -> func_qualname; + if (argdefs != NULL) { d = &PyTuple_GET_ITEM(argdefs, 0); nd = Py_SIZE(argdefs); } - return _PyEval_EvalCodeWithName((PyObject*)co, globals, - (PyObject *)NULL, (*pp_stack)-n, na, - (*pp_stack)-2*nk, nk, d, nd, kwdefs, - PyFunction_GET_CLOSURE(func), - name, qualname); + else { + d = NULL; + nd = 0; + } + return _PyEval_EvalCodeWithName((PyObject*)co, globals, (PyObject *)NULL, + stack, nargs, + nkwargs ? &PyTuple_GET_ITEM(kwnames, 0) : NULL, + stack + nargs, + nkwargs, 1, + d, (int)nd, kwdefs, + closure, name, qualname); } -static PyObject * -update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack, - PyObject *func) +PyObject * +_PyFunction_FastCallKeywords(PyObject *func, PyObject **stack, + Py_ssize_t nargs, PyObject *kwnames) { - PyObject *kwdict = NULL; - if (orig_kwdict == NULL) - kwdict = PyDict_New(); - else { - kwdict = PyDict_Copy(orig_kwdict); - Py_DECREF(orig_kwdict); - } - if (kwdict == NULL) - return NULL; - while (--nk >= 0) { - int err; - PyObject *value = EXT_POP(*pp_stack); - PyObject *key = EXT_POP(*pp_stack); - if (PyDict_GetItem(kwdict, key) != NULL) { - PyErr_Format(PyExc_TypeError, - "%.200s%s got multiple values " - "for keyword argument '%U'", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - key); - Py_DECREF(key); - Py_DECREF(value); - Py_DECREF(kwdict); - return NULL; - } - err = PyDict_SetItem(kwdict, key, value); - Py_DECREF(key); - Py_DECREF(value); - if (err) { - Py_DECREF(kwdict); - return NULL; - } - } - return kwdict; + return fast_function(func, stack, nargs, kwnames); } -static PyObject * -update_star_args(int nstack, int nstar, PyObject *stararg, - PyObject ***pp_stack) +PyObject * +_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, + PyObject *kwargs) { - PyObject *callargs, *w; + PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func); + PyObject *globals = PyFunction_GET_GLOBALS(func); + PyObject *argdefs = PyFunction_GET_DEFAULTS(func); + PyObject *kwdefs, *closure, *name, *qualname; + PyObject *kwtuple, **k; + PyObject **d; + Py_ssize_t nd, nk; + PyObject *result; - callargs = PyTuple_New(nstack + nstar); - if (callargs == NULL) { - return NULL; - } - if (nstar) { - int i; - for (i = 0; i < nstar; i++) { - PyObject *a = PyTuple_GET_ITEM(stararg, i); - Py_INCREF(a); - PyTuple_SET_ITEM(callargs, nstack + i, a); + assert(func != NULL); + assert(nargs >= 0); + assert(nargs == 0 || args != NULL); + assert(kwargs == NULL || PyDict_Check(kwargs)); + + PCALL(PCALL_FUNCTION); + PCALL(PCALL_FAST_FUNCTION); + + if (co->co_kwonlyargcount == 0 && + (kwargs == NULL || PyDict_Size(kwargs) == 0) && + co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) + { + /* Fast paths */ + if (argdefs == NULL && co->co_argcount == nargs) { + return _PyFunction_FastCall(co, args, nargs, globals); + } + else if (nargs == 0 && argdefs != NULL + && co->co_argcount == Py_SIZE(argdefs)) { + /* function called with no arguments, but all parameters have + a default value: use default values as arguments .*/ + args = &PyTuple_GET_ITEM(argdefs, 0); + return _PyFunction_FastCall(co, args, Py_SIZE(argdefs), globals); } } - while (--nstack >= 0) { - w = EXT_POP(*pp_stack); - PyTuple_SET_ITEM(callargs, nstack, w); - } - return callargs; -} -static PyObject * -load_args(PyObject ***pp_stack, int na) -{ - PyObject *args = PyTuple_New(na); - PyObject *w; + if (kwargs != NULL) { + Py_ssize_t pos, i; + nk = PyDict_Size(kwargs); - if (args == NULL) - return NULL; - while (--na >= 0) { - w = EXT_POP(*pp_stack); - PyTuple_SET_ITEM(args, na, w); + kwtuple = PyTuple_New(2 * nk); + if (kwtuple == NULL) { + return NULL; + } + + k = &PyTuple_GET_ITEM(kwtuple, 0); + pos = i = 0; + while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) { + Py_INCREF(k[i]); + Py_INCREF(k[i+1]); + i += 2; + } + nk = i / 2; + } + else { + kwtuple = NULL; + k = NULL; + nk = 0; } - return args; -} -static PyObject * -do_call(PyObject *func, PyObject ***pp_stack, int na, int nk) -{ - PyObject *callargs = NULL; - PyObject *kwdict = NULL; - PyObject *result = NULL; + kwdefs = PyFunction_GET_KW_DEFAULTS(func); + closure = PyFunction_GET_CLOSURE(func); + name = ((PyFunctionObject *)func) -> func_name; + qualname = ((PyFunctionObject *)func) -> func_qualname; - if (nk > 0) { - kwdict = update_keyword_args(NULL, nk, pp_stack, func); - if (kwdict == NULL) - goto call_fail; + if (argdefs != NULL) { + d = &PyTuple_GET_ITEM(argdefs, 0); + nd = Py_SIZE(argdefs); } - callargs = load_args(pp_stack, na); - if (callargs == NULL) - goto call_fail; -#ifdef CALL_PROFILE - /* At this point, we have to look at the type of func to - update the call stats properly. Do it here so as to avoid - exposing the call stats machinery outside ceval.c - */ - if (PyFunction_Check(func)) - PCALL(PCALL_FUNCTION); - else if (PyMethod_Check(func)) - PCALL(PCALL_METHOD); - else if (PyType_Check(func)) - PCALL(PCALL_TYPE); - else if (PyCFunction_Check(func)) - PCALL(PCALL_CFUNCTION); - else - PCALL(PCALL_OTHER); -#endif - if (PyCFunction_Check(func)) { - PyThreadState *tstate = PyThreadState_GET(); - C_TRACE(result, PyCFunction_Call(func, callargs, kwdict)); + else { + d = NULL; + nd = 0; } - else - result = PyObject_Call(func, callargs, kwdict); -call_fail: - Py_XDECREF(callargs); - Py_XDECREF(kwdict); + + result = _PyEval_EvalCodeWithName((PyObject*)co, globals, (PyObject *)NULL, + args, nargs, + k, k + 1, nk, 2, + d, nd, kwdefs, + closure, name, qualname); + Py_XDECREF(kwtuple); return result; } static PyObject * -ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk) +do_call_core(PyObject *func, PyObject *callargs, PyObject *kwdict) { - int nstar = 0; - PyObject *callargs = NULL; - PyObject *stararg = NULL; - PyObject *kwdict = NULL; - PyObject *result = NULL; - - if (flags & CALL_FLAG_KW) { - kwdict = EXT_POP(*pp_stack); - if (!PyDict_Check(kwdict)) { - PyObject *d; - d = PyDict_New(); - if (d == NULL) - goto ext_call_fail; - if (PyDict_Update(d, kwdict) != 0) { - Py_DECREF(d); - /* PyDict_Update raises attribute - * error (percolated from an attempt - * to get 'keys' attribute) instead of - * a type error if its second argument - * is not a mapping. - */ - if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - kwdict->ob_type->tp_name); - } - goto ext_call_fail; - } - Py_DECREF(kwdict); - kwdict = d; - } - } - if (nk > 0) { - kwdict = update_keyword_args(kwdict, nk, pp_stack, func); - if (kwdict == NULL) - goto ext_call_fail; - } - - if (flags & CALL_FLAG_VAR) { - stararg = EXT_POP(*pp_stack); - if (!PyTuple_Check(stararg)) { - PyObject *t = NULL; - if (Py_TYPE(stararg)->tp_iter == NULL && - !PySequence_Check(stararg)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after * " - "must be an iterable, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - stararg->ob_type->tp_name); - goto ext_call_fail; - } - t = PySequence_Tuple(stararg); - if (t == NULL) { - goto ext_call_fail; - } - Py_DECREF(stararg); - stararg = t; - } - nstar = PyTuple_GET_SIZE(stararg); - } - callargs = update_star_args(na, nstar, stararg, pp_stack); - if (callargs == NULL) - goto ext_call_fail; #ifdef CALL_PROFILE /* At this point, we have to look at the type of func to update the call stats properly. Do it here so as to avoid @@ -5079,29 +5046,32 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk) else PCALL(PCALL_OTHER); #endif + if (PyCFunction_Check(func)) { + PyObject *result; PyThreadState *tstate = PyThreadState_GET(); C_TRACE(result, PyCFunction_Call(func, callargs, kwdict)); + return result; + } + else { + return PyObject_Call(func, callargs, kwdict); } - else - result = PyObject_Call(func, callargs, kwdict); -ext_call_fail: - Py_XDECREF(callargs); - Py_XDECREF(kwdict); - Py_XDECREF(stararg); - return result; } /* Extract a slice index from a PyLong or an object with the nb_index slot defined, and store in *pi. Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX, - and silently boost values less than PY_SSIZE_T_MIN to PY_SSIZE_T_MIN. + and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1. Return 0 on error, 1 on success. */ +/* Note: If v is NULL, return success without storing into *pi. This + is because_PyEval_SliceIndex() is called by apply_slice(), which can be + called by the SLICE opcode with v and/or w equal to NULL. +*/ int _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi) { - if (v != Py_None) { + if (v != NULL) { Py_ssize_t x; if (PyIndex_Check(v)) { x = PyNumber_AsSsize_t(v, NULL); @@ -5119,26 +5089,6 @@ _PyEval_SliceIndex(PyObject *v, Py_ssize_t *pi) return 1; } -int -_PyEval_SliceIndexNotNone(PyObject *v, Py_ssize_t *pi) -{ - Py_ssize_t x; - if (PyIndex_Check(v)) { - x = PyNumber_AsSsize_t(v, NULL); - if (x == -1 && PyErr_Occurred()) - return 0; - } - else { - PyErr_SetString(PyExc_TypeError, - "slice indices must be integers or " - "have an __index__ method"); - return 0; - } - *pi = x; - return 1; -} - - #define CANNOT_CATCH_MSG "catching classes that do not inherit from "\ "BaseException is not allowed" @@ -5195,6 +5145,46 @@ cmp_outcome(int op, PyObject *v, PyObject *w) } static PyObject * +import_name(PyFrameObject *f, PyObject *name, PyObject *fromlist, PyObject *level) +{ + _Py_IDENTIFIER(__import__); + PyObject *import_func, *res; + PyObject* stack[5]; + + import_func = _PyDict_GetItemId(f->f_builtins, &PyId___import__); + if (import_func == NULL) { + PyErr_SetString(PyExc_ImportError, "__import__ not found"); + return NULL; + } + + /* Fast path for not overloaded __import__. */ + if (import_func == PyThreadState_GET()->interp->import_func) { + int ilevel = _PyLong_AsInt(level); + if (ilevel == -1 && PyErr_Occurred()) { + return NULL; + } + res = PyImport_ImportModuleLevelObject( + name, + f->f_globals, + f->f_locals == NULL ? Py_None : f->f_locals, + fromlist, + ilevel); + return res; + } + + Py_INCREF(import_func); + + stack[0] = name; + stack[1] = f->f_globals; + stack[2] = f->f_locals == NULL ? Py_None : f->f_locals; + stack[3] = fromlist; + stack[4] = level; + res = _PyObject_FastCall(import_func, stack, 5); + Py_DECREF(import_func); + return res; +} + +static PyObject * import_from(PyObject *v, PyObject *name) { PyObject *x; @@ -5299,7 +5289,7 @@ format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj) if (!obj) return; - obj_str = _PyUnicode_AsString(obj); + obj_str = PyUnicode_AsUTF8(obj); if (!obj_str) return; @@ -5330,7 +5320,7 @@ format_exc_unbound(PyCodeObject *co, int oparg) static PyObject * unicode_concatenate(PyObject *v, PyObject *w, - PyFrameObject *f, unsigned char *next_instr) + PyFrameObject *f, const _Py_CODEUNIT *next_instr) { PyObject *res; if (Py_REFCNT(v) == 2) { @@ -5340,10 +5330,11 @@ unicode_concatenate(PyObject *v, PyObject *w, * 'variable'. We try to delete the variable now to reduce * the refcnt to 1. */ - switch (*next_instr) { + int opcode, oparg; + NEXTOPARG(); + switch (opcode) { case STORE_FAST: { - int oparg = PEEKARG(); PyObject **fastlocals = f->f_localsplus; if (GETLOCAL(oparg) == v) SETLOCAL(oparg, NULL); @@ -5353,7 +5344,7 @@ unicode_concatenate(PyObject *v, PyObject *w, { PyObject **freevars = (f->f_localsplus + f->f_code->co_nlocals); - PyObject *c = freevars[PEEKARG()]; + PyObject *c = freevars[oparg]; if (PyCell_GET(c) == v) PyCell_Set(c, NULL); break; @@ -5361,7 +5352,7 @@ unicode_concatenate(PyObject *v, PyObject *w, case STORE_NAME: { PyObject *names = f->f_code->co_names; - PyObject *name = GETITEM(names, PEEKARG()); + PyObject *name = GETITEM(names, oparg); PyObject *locals = f->f_locals; if (PyDict_CheckExact(locals) && PyDict_GetItem(locals, name) == v) { @@ -5421,3 +5412,79 @@ _Py_GetDXProfile(PyObject *self, PyObject *args) } #endif + +Py_ssize_t +_PyEval_RequestCodeExtraIndex(freefunc free) +{ + PyThreadState *tstate = PyThreadState_Get(); + Py_ssize_t new_index; + + if (tstate->co_extra_user_count == MAX_CO_EXTRA_USERS - 1) { + return -1; + } + new_index = tstate->co_extra_user_count++; + tstate->co_extra_freefuncs[new_index] = free; + return new_index; +} + +static void +dtrace_function_entry(PyFrameObject *f) +{ + char* filename; + char* funcname; + int lineno; + + filename = PyUnicode_AsUTF8(f->f_code->co_filename); + funcname = PyUnicode_AsUTF8(f->f_code->co_name); + lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); + + PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno); +} + +static void +dtrace_function_return(PyFrameObject *f) +{ + char* filename; + char* funcname; + int lineno; + + filename = PyUnicode_AsUTF8(f->f_code->co_filename); + funcname = PyUnicode_AsUTF8(f->f_code->co_name); + lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); + + PyDTrace_FUNCTION_RETURN(filename, funcname, lineno); +} + +/* DTrace equivalent of maybe_call_line_trace. */ +static void +maybe_dtrace_line(PyFrameObject *frame, + int *instr_lb, int *instr_ub, int *instr_prev) +{ + int line = frame->f_lineno; + char *co_filename, *co_name; + + /* If the last instruction executed isn't in the current + instruction window, reset the window. + */ + if (frame->f_lasti < *instr_lb || frame->f_lasti >= *instr_ub) { + PyAddrPair bounds; + line = _PyCode_CheckLineNumber(frame->f_code, frame->f_lasti, + &bounds); + *instr_lb = bounds.ap_lower; + *instr_ub = bounds.ap_upper; + } + /* If the last instruction falls at the start of a line or if + it represents a jump backwards, update the frame's line + number and call the trace function. */ + if (frame->f_lasti == *instr_lb || frame->f_lasti < *instr_prev) { + frame->f_lineno = line; + co_filename = PyUnicode_AsUTF8(frame->f_code->co_filename); + if (!co_filename) + co_filename = "?"; + co_name = PyUnicode_AsUTF8(frame->f_code->co_name); + if (!co_name) + co_name = "?"; + PyDTrace_LINE(co_filename, co_name, line); + } + *instr_prev = frame->f_lasti; +} diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h index 8d38ee9..a3b450b 100644 --- a/Python/ceval_gil.h +++ b/Python/ceval_gil.h @@ -178,7 +178,7 @@ static void drop_gil(PyThreadState *tstate) /* Sub-interpreter support: threads might have been switched under our feet using PyThreadState_Swap(). Fix the GIL last holder variable so that our heuristics work. */ - _Py_atomic_store_relaxed(&gil_last_holder, (Py_uintptr_t)tstate); + _Py_atomic_store_relaxed(&gil_last_holder, (uintptr_t)tstate); } MUTEX_LOCK(gil_mutex); @@ -240,7 +240,7 @@ _ready: _Py_ANNOTATE_RWLOCK_ACQUIRED(&gil_locked, /*is_write=*/1); if (tstate != (PyThreadState*)_Py_atomic_load_relaxed(&gil_last_holder)) { - _Py_atomic_store_relaxed(&gil_last_holder, (Py_uintptr_t)tstate); + _Py_atomic_store_relaxed(&gil_last_holder, (uintptr_t)tstate); ++gil_switch_number; } diff --git a/Python/clinic/bltinmodule.c.h b/Python/clinic/bltinmodule.c.h index 4e2b1f1..c88deef 100644 --- a/Python/clinic/bltinmodule.c.h +++ b/Python/clinic/bltinmodule.c.h @@ -93,8 +93,9 @@ builtin_format(PyObject *module, PyObject *args) PyObject *format_spec = NULL; if (!PyArg_ParseTuple(args, "O|U:format", - &value, &format_spec)) + &value, &format_spec)) { goto exit; + } return_value = builtin_format_impl(module, value, format_spec); exit: @@ -119,8 +120,9 @@ builtin_chr(PyObject *module, PyObject *arg) PyObject *return_value = NULL; int i; - if (!PyArg_Parse(arg, "i:chr", &i)) + if (!PyArg_Parse(arg, "i:chr", &i)) { goto exit; + } return_value = builtin_chr_impl(module, i); exit: @@ -146,7 +148,7 @@ PyDoc_STRVAR(builtin_compile__doc__, "in addition to any features explicitly specified."); #define BUILTIN_COMPILE_METHODDEF \ - {"compile", (PyCFunction)builtin_compile, METH_VARARGS|METH_KEYWORDS, builtin_compile__doc__}, + {"compile", (PyCFunction)builtin_compile, METH_FASTCALL, builtin_compile__doc__}, static PyObject * builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename, @@ -154,10 +156,11 @@ builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename, int optimize); static PyObject * -builtin_compile(PyObject *module, PyObject *args, PyObject *kwargs) +builtin_compile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static char *_keywords[] = {"source", "filename", "mode", "flags", "dont_inherit", "optimize", NULL}; + static const char * const _keywords[] = {"source", "filename", "mode", "flags", "dont_inherit", "optimize", NULL}; + static _PyArg_Parser _parser = {"OO&s|iii:compile", _keywords, 0}; PyObject *source; PyObject *filename; const char *mode; @@ -165,9 +168,10 @@ builtin_compile(PyObject *module, PyObject *args, PyObject *kwargs) int dont_inherit = 0; int optimize = -1; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO&s|iii:compile", _keywords, - &source, PyUnicode_FSDecoder, &filename, &mode, &flags, &dont_inherit, &optimize)) + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + &source, PyUnicode_FSDecoder, &filename, &mode, &flags, &dont_inherit, &optimize)) { goto exit; + } return_value = builtin_compile_impl(module, source, filename, mode, flags, dont_inherit, optimize); exit: @@ -195,8 +199,9 @@ builtin_divmod(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "divmod", 2, 2, - &x, &y)) + &x, &y)) { goto exit; + } return_value = builtin_divmod_impl(module, x, y); exit: @@ -232,8 +237,9 @@ builtin_eval(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "eval", 1, 3, - &source, &globals, &locals)) + &source, &globals, &locals)) { goto exit; + } return_value = builtin_eval_impl(module, source, globals, locals); exit: @@ -269,8 +275,9 @@ builtin_exec(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "exec", 1, 3, - &source, &globals, &locals)) + &source, &globals, &locals)) { goto exit; + } return_value = builtin_exec_impl(module, source, globals, locals); exit: @@ -321,8 +328,9 @@ builtin_hasattr(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "hasattr", 2, 2, - &obj, &name)) + &obj, &name)) { goto exit; + } return_value = builtin_hasattr_impl(module, obj, name); exit: @@ -366,8 +374,9 @@ builtin_setattr(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "setattr", 3, 3, - &obj, &name, &value)) + &obj, &name, &value)) { goto exit; + } return_value = builtin_setattr_impl(module, obj, name, value); exit: @@ -397,8 +406,9 @@ builtin_delattr(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "delattr", 2, 2, - &obj, &name)) + &obj, &name)) { goto exit; + } return_value = builtin_delattr_impl(module, obj, name); exit: @@ -506,8 +516,9 @@ builtin_pow(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "pow", 2, 3, - &x, &y, &z)) + &x, &y, &z)) { goto exit; + } return_value = builtin_pow_impl(module, x, y, z); exit: @@ -540,8 +551,9 @@ builtin_input(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "input", 0, 1, - &prompt)) + &prompt)) { goto exit; + } return_value = builtin_input_impl(module, prompt); exit: @@ -584,8 +596,9 @@ builtin_sum(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "sum", 1, 2, - &iterable, &start)) + &iterable, &start)) { goto exit; + } return_value = builtin_sum_impl(module, iterable, start); exit: @@ -618,8 +631,9 @@ builtin_isinstance(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "isinstance", 2, 2, - &obj, &class_or_tuple)) + &obj, &class_or_tuple)) { goto exit; + } return_value = builtin_isinstance_impl(module, obj, class_or_tuple); exit: @@ -652,11 +666,12 @@ builtin_issubclass(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "issubclass", 2, 2, - &cls, &class_or_tuple)) + &cls, &class_or_tuple)) { goto exit; + } return_value = builtin_issubclass_impl(module, cls, class_or_tuple); exit: return return_value; } -/*[clinic end generated code: output=9031270b64c794b8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=63483deb75805f7c input=a9049054013a1b77]*/ diff --git a/Python/clinic/import.c.h b/Python/clinic/import.c.h index 05d79ac..b3460b0 100644 --- a/Python/clinic/import.c.h +++ b/Python/clinic/import.c.h @@ -89,8 +89,9 @@ _imp__fix_co_filename(PyObject *module, PyObject *args) PyObject *path; if (!PyArg_ParseTuple(args, "O!U:_fix_co_filename", - &PyCode_Type, &code, &path)) + &PyCode_Type, &code, &path)) { goto exit; + } return_value = _imp__fix_co_filename_impl(module, code, path); exit: @@ -142,8 +143,9 @@ _imp_init_frozen(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name; - if (!PyArg_Parse(arg, "U:init_frozen", &name)) + if (!PyArg_Parse(arg, "U:init_frozen", &name)) { goto exit; + } return_value = _imp_init_frozen_impl(module, name); exit: @@ -168,8 +170,9 @@ _imp_get_frozen_object(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name; - if (!PyArg_Parse(arg, "U:get_frozen_object", &name)) + if (!PyArg_Parse(arg, "U:get_frozen_object", &name)) { goto exit; + } return_value = _imp_get_frozen_object_impl(module, name); exit: @@ -194,8 +197,9 @@ _imp_is_frozen_package(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name; - if (!PyArg_Parse(arg, "U:is_frozen_package", &name)) + if (!PyArg_Parse(arg, "U:is_frozen_package", &name)) { goto exit; + } return_value = _imp_is_frozen_package_impl(module, name); exit: @@ -220,8 +224,9 @@ _imp_is_builtin(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name; - if (!PyArg_Parse(arg, "U:is_builtin", &name)) + if (!PyArg_Parse(arg, "U:is_builtin", &name)) { goto exit; + } return_value = _imp_is_builtin_impl(module, name); exit: @@ -246,8 +251,9 @@ _imp_is_frozen(PyObject *module, PyObject *arg) PyObject *return_value = NULL; PyObject *name; - if (!PyArg_Parse(arg, "U:is_frozen", &name)) + if (!PyArg_Parse(arg, "U:is_frozen", &name)) { goto exit; + } return_value = _imp_is_frozen_impl(module, name); exit: @@ -277,8 +283,9 @@ _imp_create_dynamic(PyObject *module, PyObject *args) if (!PyArg_UnpackTuple(args, "create_dynamic", 1, 2, - &spec, &file)) + &spec, &file)) { goto exit; + } return_value = _imp_create_dynamic_impl(module, spec, file); exit: @@ -308,8 +315,9 @@ _imp_exec_dynamic(PyObject *module, PyObject *mod) int _return_value; _return_value = _imp_exec_dynamic_impl(module, mod); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -337,8 +345,9 @@ _imp_exec_builtin(PyObject *module, PyObject *mod) int _return_value; _return_value = _imp_exec_builtin_impl(module, mod); - if ((_return_value == -1) && PyErr_Occurred()) + if ((_return_value == -1) && PyErr_Occurred()) { goto exit; + } return_value = PyLong_FromLong((long)_return_value); exit: @@ -352,4 +361,4 @@ exit: #ifndef _IMP_EXEC_DYNAMIC_METHODDEF #define _IMP_EXEC_DYNAMIC_METHODDEF #endif /* !defined(_IMP_EXEC_DYNAMIC_METHODDEF) */ -/*[clinic end generated code: output=90ad6e5833e6170d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d24d7f73702a907f input=a9049054013a1b77]*/ diff --git a/Python/compile.c b/Python/compile.c index adc33ac..35151cd 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -29,6 +29,7 @@ #include "code.h" #include "symtable.h" #include "opcode.h" +#include "wordcode_helpers.h" #define DEFAULT_BLOCK_SIZE 16 #define DEFAULT_BLOCKS 8 @@ -43,7 +44,6 @@ struct instr { unsigned i_jabs : 1; unsigned i_jrel : 1; - unsigned i_hasarg : 1; unsigned char i_opcode; int i_oparg; struct basicblock_ *i_target; /* target block (if jump instruction) */ @@ -171,7 +171,6 @@ static int compiler_addop(struct compiler *, int); static int compiler_addop_o(struct compiler *, int, PyObject *, PyObject *); static int compiler_addop_i(struct compiler *, int, Py_ssize_t); static int compiler_addop_j(struct compiler *, int, basicblock *, int); -static basicblock *compiler_use_new_block(struct compiler *); static int compiler_error(struct compiler *, const char *); static int compiler_nameop(struct compiler *, identifier, expr_context_ty); @@ -180,6 +179,7 @@ static int compiler_visit_stmt(struct compiler *, stmt_ty); static int compiler_visit_keyword(struct compiler *, keyword_ty); static int compiler_visit_expr(struct compiler *, expr_ty); static int compiler_augassign(struct compiler *, stmt_ty); +static int compiler_annassign(struct compiler *, stmt_ty); static int compiler_visit_slice(struct compiler *, slice_ty, expr_context_ty); @@ -196,12 +196,22 @@ static int expr_constant(struct compiler *, expr_ty); static int compiler_with(struct compiler *, stmt_ty, int); static int compiler_async_with(struct compiler *, stmt_ty, int); static int compiler_async_for(struct compiler *, stmt_ty); -static int compiler_call_helper(struct compiler *c, Py_ssize_t n, +static int compiler_call_helper(struct compiler *c, int n, asdl_seq *args, asdl_seq *keywords); static int compiler_try_except(struct compiler *, stmt_ty); static int compiler_set_qualname(struct compiler *); +static int compiler_sync_comprehension_generator( + struct compiler *c, + asdl_seq *generators, int gen_index, + expr_ty elt, expr_ty val, int type); + +static int compiler_async_comprehension_generator( + struct compiler *c, + asdl_seq *generators, int gen_index, + expr_ty elt, expr_ty val, int type); + static PyCodeObject *assemble(struct compiler *, int addNone); static PyObject *__doc__; @@ -477,9 +487,9 @@ compiler_unit_check(struct compiler_unit *u) { basicblock *block; for (block = u->u_blocks; block != NULL; block = block->b_list) { - assert((void *)block != (void *)0xcbcbcbcb); - assert((void *)block != (void *)0xfbfbfbfb); - assert((void *)block != (void *)0xdbdbdbdb); + assert((uintptr_t)block != 0xcbcbcbcbU); + assert((uintptr_t)block != 0xfbfbfbfbU); + assert((uintptr_t)block != 0xdbdbdbdbU); if (block->b_instr != NULL) { assert(block->b_ialloc > 0); assert(block->b_iused > 0); @@ -523,6 +533,7 @@ compiler_enter_scope(struct compiler *c, identifier name, int scope_type, void *key, int lineno) { struct compiler_unit *u; + basicblock *block; u = (struct compiler_unit *)PyObject_Malloc(sizeof( struct compiler_unit)); @@ -620,8 +631,11 @@ compiler_enter_scope(struct compiler *c, identifier name, c->u = u; c->c_nestlevel++; - if (compiler_use_new_block(c) == NULL) + + block = compiler_new_block(c); + if (block == NULL) return 0; + c->u->u_curblock = block; if (u->u_scope_type != COMPILER_SCOPE_MODULE) { if (!compiler_set_qualname(c)) @@ -731,6 +745,7 @@ compiler_set_qualname(struct compiler *c) return 1; } + /* Allocate a new block and return a pointer to it. Returns NULL on error. */ @@ -755,16 +770,6 @@ compiler_new_block(struct compiler *c) } static basicblock * -compiler_use_new_block(struct compiler *c) -{ - basicblock *block = compiler_new_block(c); - if (block == NULL) - return NULL; - c->u->u_curblock = block; - return block; -} - -static basicblock * compiler_next_block(struct compiler *c) { basicblock *block = compiler_new_block(c); @@ -810,7 +815,7 @@ compiler_next_instr(struct compiler *c, basicblock *b) oldsize = b->b_ialloc * sizeof(struct instr); newsize = oldsize << 1; - if (oldsize > (PY_SIZE_MAX >> 1)) { + if (oldsize > (SIZE_MAX >> 1)) { PyErr_NoMemory(); return -1; } @@ -939,6 +944,8 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) return -1; case IMPORT_STAR: return -1; + case SETUP_ANNOTATIONS: + return 0; case YIELD_VALUE: return 0; case YIELD_FROM: @@ -976,16 +983,19 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case BUILD_TUPLE: case BUILD_LIST: case BUILD_SET: + case BUILD_STRING: return 1-oparg; case BUILD_LIST_UNPACK: case BUILD_TUPLE_UNPACK: + case BUILD_TUPLE_UNPACK_WITH_CALL: case BUILD_SET_UNPACK: case BUILD_MAP_UNPACK: - return 1 - oparg; case BUILD_MAP_UNPACK_WITH_CALL: - return 1 - (oparg & 0xFF); + return 1 - oparg; case BUILD_MAP: return 1 - 2*oparg; + case BUILD_CONST_KEY_MAP: + return -oparg; case LOAD_ATTR: return 0; case COMPARE_OP: @@ -1023,22 +1033,20 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) return -1; case DELETE_FAST: return 0; + case STORE_ANNOTATION: + return -1; case RAISE_VARARGS: return -oparg; -#define NARGS(o) (((o) % 256) + 2*(((o) / 256) % 256)) case CALL_FUNCTION: - return -NARGS(oparg); - case CALL_FUNCTION_VAR: + return -oparg; case CALL_FUNCTION_KW: - return -NARGS(oparg)-1; - case CALL_FUNCTION_VAR_KW: - return -NARGS(oparg)-2; + return -oparg-1; + case CALL_FUNCTION_EX: + return - ((oparg & 0x01) != 0) - ((oparg & 0x02) != 0); case MAKE_FUNCTION: - return -1 -NARGS(oparg) - ((oparg >> 16) & 0xffff); - case MAKE_CLOSURE: - return -2 - NARGS(oparg) - ((oparg >> 16) & 0xffff); -#undef NARGS + return -1 - ((oparg & 0x01) != 0) - ((oparg & 0x02) != 0) - + ((oparg & 0x04) != 0) - ((oparg & 0x08) != 0); case BUILD_SLICE: if (oparg == 3) return -2; @@ -1066,6 +1074,10 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) return 1; case GET_YIELD_FROM_ITER: return 0; + case FORMAT_VALUE: + /* If there's a fmt_spec on the stack, we go from 2->1, + else 1->1. */ + return (oparg & FVS_MASK) == FVS_HAVE_SPEC ? -1 : 0; default: return PY_INVALID_STACK_EFFECT; } @@ -1082,13 +1094,14 @@ compiler_addop(struct compiler *c, int opcode) basicblock *b; struct instr *i; int off; + assert(!HAS_ARG(opcode)); off = compiler_next_instr(c, c->u->u_curblock); if (off < 0) return 0; b = c->u->u_curblock; i = &b->b_instr[off]; i->i_opcode = opcode; - i->i_hasarg = 0; + i->i_oparg = 0; if (opcode == RETURN_VALUE) b->b_return = 1; compiler_set_lineno(c, off); @@ -1165,10 +1178,15 @@ compiler_addop_i(struct compiler *c, int opcode, Py_ssize_t oparg) struct instr *i; int off; - /* Integer arguments are limit to 16-bit. There is an extension for 32-bit - integer arguments. */ - assert((-2147483647-1) <= oparg); - assert(oparg <= 2147483647); + /* oparg value is unsigned, but a signed C int is usually used to store + it in the C code (like Python/ceval.c). + + Limit to 32-bit signed C int (rather than INT_MAX) for portability. + + The argument of a concrete bytecode instruction is limited to 8-bit. + EXTENDED_ARG is used for 16, 24, and 32-bit arguments. */ + assert(HAS_ARG(opcode)); + assert(0 <= oparg && oparg <= 2147483647); off = compiler_next_instr(c, c->u->u_curblock); if (off < 0) @@ -1176,7 +1194,6 @@ compiler_addop_i(struct compiler *c, int opcode, Py_ssize_t oparg) i = &c->u->u_curblock->b_instr[off]; i->i_opcode = opcode; i->i_oparg = Py_SAFE_DOWNCAST(oparg, Py_ssize_t, int); - i->i_hasarg = 1; compiler_set_lineno(c, off); return 1; } @@ -1187,6 +1204,7 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute) struct instr *i; int off; + assert(HAS_ARG(opcode)); assert(b != NULL); off = compiler_next_instr(c, c->u->u_curblock); if (off < 0) @@ -1194,7 +1212,6 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute) i = &c->u->u_curblock->b_instr[off]; i->i_opcode = opcode; i->i_target = b; - i->i_hasarg = 1; if (absolute) i->i_jabs = 1; else @@ -1203,22 +1220,12 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute) return 1; } -/* The distinction between NEW_BLOCK and NEXT_BLOCK is subtle. (I'd - like to find better names.) NEW_BLOCK() creates a new block and sets - it as the current block. NEXT_BLOCK() also creates an implicit jump - from the current block to the new block. -*/ +/* NEXT_BLOCK() creates an implicit jump from the current block + to the new block. -/* The returns inside these macros make it impossible to decref objects - created in the local function. Local objects should use the arena. + The returns inside this macro make it impossible to decref objects + created in the local function. Local objects should use the arena. */ - - -#define NEW_BLOCK(C) { \ - if (compiler_use_new_block((C)) == NULL) \ - return 0; \ -} - #define NEXT_BLOCK(C) { \ if (compiler_next_block((C)) == NULL) \ return 0; \ @@ -1241,6 +1248,15 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute) return 0; \ } +/* Same as ADDOP_O, but steals a reference. */ +#define ADDOP_N(C, OP, O, TYPE) { \ + if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) { \ + Py_DECREF((O)); \ + return 0; \ + } \ + Py_DECREF((O)); \ +} + #define ADDOP_NAME(C, OP, O, TYPE) { \ if (!compiler_addop_name((C), (OP), (C)->u->u_ ## TYPE, (O))) \ return 0; \ @@ -1309,10 +1325,110 @@ compiler_isdocstring(stmt_ty s) { if (s->kind != Expr_kind) return 0; - return s->v.Expr.value->kind == Str_kind; + if (s->v.Expr.value->kind == Str_kind) + return 1; + if (s->v.Expr.value->kind == Constant_kind) + return PyUnicode_CheckExact(s->v.Expr.value->v.Constant.value); + return 0; +} + +static int +is_const(expr_ty e) +{ + switch (e->kind) { + case Constant_kind: + case Num_kind: + case Str_kind: + case Bytes_kind: + case Ellipsis_kind: + case NameConstant_kind: + return 1; + default: + return 0; + } +} + +static PyObject * +get_const_value(expr_ty e) +{ + switch (e->kind) { + case Constant_kind: + return e->v.Constant.value; + case Num_kind: + return e->v.Num.n; + case Str_kind: + return e->v.Str.s; + case Bytes_kind: + return e->v.Bytes.s; + case Ellipsis_kind: + return Py_Ellipsis; + case NameConstant_kind: + return e->v.NameConstant.value; + default: + assert(!is_const(e)); + return NULL; + } } -/* Compile a sequence of statements, checking for a docstring. */ +/* Search if variable annotations are present statically in a block. */ + +static int +find_ann(asdl_seq *stmts) +{ + int i, j, res = 0; + stmt_ty st; + + for (i = 0; i < asdl_seq_LEN(stmts); i++) { + st = (stmt_ty)asdl_seq_GET(stmts, i); + switch (st->kind) { + case AnnAssign_kind: + return 1; + case For_kind: + res = find_ann(st->v.For.body) || + find_ann(st->v.For.orelse); + break; + case AsyncFor_kind: + res = find_ann(st->v.AsyncFor.body) || + find_ann(st->v.AsyncFor.orelse); + break; + case While_kind: + res = find_ann(st->v.While.body) || + find_ann(st->v.While.orelse); + break; + case If_kind: + res = find_ann(st->v.If.body) || + find_ann(st->v.If.orelse); + break; + case With_kind: + res = find_ann(st->v.With.body); + break; + case AsyncWith_kind: + res = find_ann(st->v.AsyncWith.body); + break; + case Try_kind: + for (j = 0; j < asdl_seq_LEN(st->v.Try.handlers); j++) { + excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET( + st->v.Try.handlers, j); + if (find_ann(handler->v.ExceptHandler.body)) { + return 1; + } + } + res = find_ann(st->v.Try.body) || + find_ann(st->v.Try.finalbody) || + find_ann(st->v.Try.orelse); + break; + default: + res = 0; + } + if (res) { + break; + } + } + return res; +} + +/* Compile a sequence of statements, checking for a docstring + and for annotations. */ static int compiler_body(struct compiler *c, asdl_seq *stmts) @@ -1320,6 +1436,19 @@ compiler_body(struct compiler *c, asdl_seq *stmts) int i = 0; stmt_ty st; + /* Set current line number to the line number of first statement. + This way line number for SETUP_ANNOTATIONS will always + coincide with the line number of first "real" statement in module. + If body is empy, then lineno will be set later in assemble. */ + if (c->u->u_scope_type == COMPILER_SCOPE_MODULE && + !c->u->u_lineno && asdl_seq_LEN(stmts)) { + st = (stmt_ty)asdl_seq_GET(stmts, 0); + c->u->u_lineno = st->lineno; + } + /* Every annotated class and module should have __annotations__. */ + if (find_ann(stmts)) { + ADDOP(c, SETUP_ANNOTATIONS); + } if (!asdl_seq_LEN(stmts)) return 1; st = (stmt_ty)asdl_seq_GET(stmts, 0); @@ -1357,6 +1486,9 @@ compiler_mod(struct compiler *c, mod_ty mod) } break; case Interactive_kind: + if (find_ann(mod->v.Interactive.body)) { + ADDOP(c, SETUP_ANNOTATIONS); + } c->c_interactive = 1; VISIT_SEQ_IN_SCOPE(c, stmt, mod->v.Interactive.body); @@ -1426,53 +1558,50 @@ compiler_lookup_arg(PyObject *dict, PyObject *name) } static int -compiler_make_closure(struct compiler *c, PyCodeObject *co, Py_ssize_t args, PyObject *qualname) +compiler_make_closure(struct compiler *c, PyCodeObject *co, Py_ssize_t flags, PyObject *qualname) { Py_ssize_t i, free = PyCode_GetNumFree(co); if (qualname == NULL) qualname = co->co_name; - if (free == 0) { - ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts); - ADDOP_O(c, LOAD_CONST, qualname, consts); - ADDOP_I(c, MAKE_FUNCTION, args); - return 1; - } - for (i = 0; i < free; ++i) { - /* Bypass com_addop_varname because it will generate - LOAD_DEREF but LOAD_CLOSURE is needed. - */ - PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i); - int arg, reftype; - - /* Special case: If a class contains a method with a - free variable that has the same name as a method, - the name will be considered free *and* local in the - class. It should be handled by the closure, as - well as by the normal name loookup logic. - */ - reftype = get_ref_type(c, name); - if (reftype == CELL) - arg = compiler_lookup_arg(c->u->u_cellvars, name); - else /* (reftype == FREE) */ - arg = compiler_lookup_arg(c->u->u_freevars, name); - if (arg == -1) { - fprintf(stderr, - "lookup %s in %s %d %d\n" - "freevars of %s: %s\n", - PyUnicode_AsUTF8(PyObject_Repr(name)), - PyUnicode_AsUTF8(c->u->u_name), - reftype, arg, - PyUnicode_AsUTF8(co->co_name), - PyUnicode_AsUTF8(PyObject_Repr(co->co_freevars))); - Py_FatalError("compiler_make_closure()"); + if (free) { + for (i = 0; i < free; ++i) { + /* Bypass com_addop_varname because it will generate + LOAD_DEREF but LOAD_CLOSURE is needed. + */ + PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i); + int arg, reftype; + + /* Special case: If a class contains a method with a + free variable that has the same name as a method, + the name will be considered free *and* local in the + class. It should be handled by the closure, as + well as by the normal name loookup logic. + */ + reftype = get_ref_type(c, name); + if (reftype == CELL) + arg = compiler_lookup_arg(c->u->u_cellvars, name); + else /* (reftype == FREE) */ + arg = compiler_lookup_arg(c->u->u_freevars, name); + if (arg == -1) { + fprintf(stderr, + "lookup %s in %s %d %d\n" + "freevars of %s: %s\n", + PyUnicode_AsUTF8(PyObject_Repr(name)), + PyUnicode_AsUTF8(c->u->u_name), + reftype, arg, + PyUnicode_AsUTF8(co->co_name), + PyUnicode_AsUTF8(PyObject_Repr(co->co_freevars))); + Py_FatalError("compiler_make_closure()"); + } + ADDOP_I(c, LOAD_CLOSURE, arg); } - ADDOP_I(c, LOAD_CLOSURE, arg); + flags |= 0x08; + ADDOP_I(c, BUILD_TUPLE, free); } - ADDOP_I(c, BUILD_TUPLE, free); ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts); ADDOP_O(c, LOAD_CONST, qualname, consts); - ADDOP_I(c, MAKE_CLOSURE, args); + ADDOP_I(c, MAKE_FUNCTION, flags); return 1; } @@ -1494,26 +1623,60 @@ static int compiler_visit_kwonlydefaults(struct compiler *c, asdl_seq *kwonlyargs, asdl_seq *kw_defaults) { - /* Return the number of defaults + 1. - Returns 0 on error. - */ - int i, default_count = 0; + /* Push a dict of keyword-only default values. + + Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed. + */ + int i; + PyObject *keys = NULL; + for (i = 0; i < asdl_seq_LEN(kwonlyargs); i++) { arg_ty arg = asdl_seq_GET(kwonlyargs, i); expr_ty default_ = asdl_seq_GET(kw_defaults, i); if (default_) { PyObject *mangled = _Py_Mangle(c->u->u_private, arg->arg); - if (!mangled) - return 0; - ADDOP_O(c, LOAD_CONST, mangled, consts); - Py_DECREF(mangled); + if (!mangled) { + goto error; + } + if (keys == NULL) { + keys = PyList_New(1); + if (keys == NULL) { + Py_DECREF(mangled); + return 0; + } + PyList_SET_ITEM(keys, 0, mangled); + } + else { + int res = PyList_Append(keys, mangled); + Py_DECREF(mangled); + if (res == -1) { + goto error; + } + } if (!compiler_visit_expr(c, default_)) { - return 0; + goto error; } - default_count++; } } - return default_count + 1; + if (keys != NULL) { + Py_ssize_t default_count = PyList_GET_SIZE(keys); + PyObject *keys_tuple = PyList_AsTuple(keys); + Py_DECREF(keys); + if (keys_tuple == NULL) { + return 0; + } + ADDOP_N(c, LOAD_CONST, keys_tuple, consts); + ADDOP_I(c, BUILD_CONST_KEY_MAP, default_count); + assert(default_count > 0); + return 1; + } + else { + return -1; + } + +error: + Py_XDECREF(keys); + return 0; } static int @@ -1556,11 +1719,10 @@ static int compiler_visit_annotations(struct compiler *c, arguments_ty args, expr_ty returns) { - /* Push arg annotations and a list of the argument names. Return the # - of items pushed + 1. The expressions are evaluated out-of-order wrt the - source code. + /* Push arg annotation dict. + The expressions are evaluated out-of-order wrt the source code. - More than 2^16-1 annotations is a SyntaxError. Returns 0 on error. + Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed. */ static identifier return_str; PyObject *names; @@ -1592,32 +1754,20 @@ compiler_visit_annotations(struct compiler *c, arguments_ty args, } len = PyList_GET_SIZE(names); - if (len > 65534) { - /* len must fit in 16 bits, and len is incremented below */ - PyErr_SetString(PyExc_SyntaxError, - "too many annotations"); - goto error; - } if (len) { - /* convert names to a tuple and place on stack */ - PyObject *elt; - Py_ssize_t i; - PyObject *s = PyTuple_New(len); - if (!s) - goto error; - for (i = 0; i < len; i++) { - elt = PyList_GET_ITEM(names, i); - Py_INCREF(elt); - PyTuple_SET_ITEM(s, i, elt); + PyObject *keytuple = PyList_AsTuple(names); + Py_DECREF(names); + if (keytuple == NULL) { + return 0; } - ADDOP_O(c, LOAD_CONST, s, consts); - Py_DECREF(s); - len++; /* include the just-pushed tuple */ + ADDOP_N(c, LOAD_CONST, keytuple, consts); + ADDOP_I(c, BUILD_CONST_KEY_MAP, len); + return 1; + } + else { + Py_DECREF(names); + return -1; } - Py_DECREF(names); - - /* We just checked that len <= 65535, see above */ - return Py_SAFE_DOWNCAST(len + 1, Py_ssize_t, int); error: Py_DECREF(names); @@ -1625,6 +1775,36 @@ error: } static int +compiler_visit_defaults(struct compiler *c, arguments_ty args) +{ + VISIT_SEQ(c, expr, args->defaults); + ADDOP_I(c, BUILD_TUPLE, asdl_seq_LEN(args->defaults)); + return 1; +} + +static Py_ssize_t +compiler_default_arguments(struct compiler *c, arguments_ty args) +{ + Py_ssize_t funcflags = 0; + if (args->defaults && asdl_seq_LEN(args->defaults) > 0) { + if (!compiler_visit_defaults(c, args)) + return -1; + funcflags |= 0x01; + } + if (args->kwonlyargs) { + int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs, + args->kw_defaults); + if (res == 0) { + return -1; + } + else if (res > 0) { + funcflags |= 0x02; + } + } + return funcflags; +} + +static int compiler_function(struct compiler *c, stmt_ty s, int is_async) { PyCodeObject *co; @@ -1635,12 +1815,11 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async) asdl_seq* decos; asdl_seq *body; stmt_ty st; - Py_ssize_t i, n, arglength; - int docstring, kw_default_count = 0; - int num_annotations; + Py_ssize_t i, n, funcflags; + int docstring; + int annotations; int scope_type; - if (is_async) { assert(s->kind == AsyncFunctionDef_kind); @@ -1665,30 +1844,32 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async) if (!compiler_decorators(c, decos)) return 0; - if (args->defaults) - VISIT_SEQ(c, expr, args->defaults); - if (args->kwonlyargs) { - int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs, - args->kw_defaults); - if (res == 0) - return 0; - kw_default_count = res - 1; + + funcflags = compiler_default_arguments(c, args); + if (funcflags == -1) { + return 0; } - num_annotations = compiler_visit_annotations(c, args, returns); - if (num_annotations == 0) + + annotations = compiler_visit_annotations(c, args, returns); + if (annotations == 0) { return 0; - num_annotations--; - assert((num_annotations & 0xFFFF) == num_annotations); + } + else if (annotations > 0) { + funcflags |= 0x04; + } - if (!compiler_enter_scope(c, name, - scope_type, (void *)s, - s->lineno)) + if (!compiler_enter_scope(c, name, scope_type, (void *)s, s->lineno)) { return 0; + } st = (stmt_ty)asdl_seq_GET(body, 0); docstring = compiler_isdocstring(st); - if (docstring && c->c_optimize < 2) - first_const = st->v.Expr.value->v.Str.s; + if (docstring && c->c_optimize < 2) { + if (st->v.Expr.value->kind == Constant_kind) + first_const = st->v.Expr.value->v.Constant.value; + else + first_const = st->v.Expr.value->v.Str.s; + } if (compiler_add_o(c, c->u->u_consts, first_const) < 0) { compiler_exit_scope(c); return 0; @@ -1712,12 +1893,7 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async) return 0; } - arglength = asdl_seq_LEN(args->defaults); - arglength |= kw_default_count << 8; - arglength |= num_annotations << 16; - if (is_async) - co->co_flags |= CO_COROUTINE; - compiler_make_closure(c, co, arglength, qualname); + compiler_make_closure(c, co, funcflags, qualname); Py_DECREF(qualname); Py_DECREF(co); @@ -1791,8 +1967,9 @@ compiler_class(struct compiler *c, stmt_ty s) compiler_exit_scope(c); return 0; } + /* Return __classcell__ if it is referenced, otherwise return None */ if (c->u->u_ste->ste_needs_class_closure) { - /* return the (empty) __class__ cell */ + /* Store __classcell__ into class namespace & return it */ str = PyUnicode_InternFromString("__class__"); if (str == NULL) { compiler_exit_scope(c); @@ -1805,12 +1982,20 @@ compiler_class(struct compiler *c, stmt_ty s) return 0; } assert(i == 0); - /* Return the cell where to store __class__ */ + ADDOP_I(c, LOAD_CLOSURE, i); + ADDOP(c, DUP_TOP); + str = PyUnicode_InternFromString("__classcell__"); + if (!str || !compiler_nameop(c, str, Store)) { + Py_XDECREF(str); + compiler_exit_scope(c); + return 0; + } + Py_DECREF(str); } else { + /* No methods referenced __class__, so just return None */ assert(PyDict_Size(c->u->u_cellvars) == 0); - /* This happens when nobody references the cell. Return None. */ ADDOP_O(c, LOAD_CONST, Py_None, consts); } ADDOP_IN_SCOPE(c, RETURN_VALUE); @@ -1877,8 +2062,7 @@ compiler_lambda(struct compiler *c, expr_ty e) PyCodeObject *co; PyObject *qualname; static identifier name; - int kw_default_count = 0; - Py_ssize_t arglength; + Py_ssize_t funcflags; arguments_ty args = e->v.Lambda.args; assert(e->kind == Lambda_kind); @@ -1888,14 +2072,11 @@ compiler_lambda(struct compiler *c, expr_ty e) return 0; } - if (args->defaults) - VISIT_SEQ(c, expr, args->defaults); - if (args->kwonlyargs) { - int res = compiler_visit_kwonlydefaults(c, args->kwonlyargs, - args->kw_defaults); - if (res == 0) return 0; - kw_default_count = res - 1; + funcflags = compiler_default_arguments(c, args); + if (funcflags == -1) { + return 0; } + if (!compiler_enter_scope(c, name, COMPILER_SCOPE_LAMBDA, (void *)e, e->lineno)) return 0; @@ -1921,9 +2102,7 @@ compiler_lambda(struct compiler *c, expr_ty e) if (co == NULL) return 0; - arglength = asdl_seq_LEN(args->defaults); - arglength |= kw_default_count << 8; - compiler_make_closure(c, co, arglength, qualname); + compiler_make_closure(c, co, funcflags, qualname); Py_DECREF(qualname); Py_DECREF(co); @@ -2002,14 +2181,14 @@ compiler_for(struct compiler *c, stmt_ty s) static int compiler_async_for(struct compiler *c, stmt_ty s) { - static PyObject *stopiter_error = NULL; + _Py_IDENTIFIER(StopAsyncIteration); + basicblock *try, *except, *end, *after_try, *try_cleanup, *after_loop, *after_loop_else; - if (stopiter_error == NULL) { - stopiter_error = PyUnicode_InternFromString("StopAsyncIteration"); - if (stopiter_error == NULL) - return 0; + PyObject *stop_aiter_error = _PyUnicode_FromId(&PyId_StopAsyncIteration); + if (stop_aiter_error == NULL) { + return 0; } try = compiler_new_block(c); @@ -2051,7 +2230,7 @@ compiler_async_for(struct compiler *c, stmt_ty s) compiler_use_next_block(c, except); ADDOP(c, DUP_TOP); - ADDOP_O(c, LOAD_GLOBAL, stopiter_error, names); + ADDOP_O(c, LOAD_GLOBAL, stop_aiter_error, names); ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH); ADDOP_JABS(c, POP_JUMP_IF_FALSE, try_cleanup); @@ -2599,6 +2778,25 @@ compiler_assert(struct compiler *c, stmt_ty s) } static int +compiler_visit_stmt_expr(struct compiler *c, expr_ty value) +{ + if (c->c_interactive && c->c_nestlevel <= 1) { + VISIT(c, expr, value); + ADDOP(c, PRINT_EXPR); + return 1; + } + + if (is_const(value)) { + /* ignore constant statement */ + return 1; + } + + VISIT(c, expr, value); + ADDOP(c, POP_TOP); + return 1; +} + +static int compiler_visit_stmt(struct compiler *c, stmt_ty s) { Py_ssize_t i, n; @@ -2617,6 +2815,9 @@ compiler_visit_stmt(struct compiler *c, stmt_ty s) if (c->u->u_ste->ste_type != FunctionBlock) return compiler_error(c, "'return' outside function"); if (s->v.Return.value) { + if (c->u->u_ste->ste_coroutine && c->u->u_ste->ste_generator) + return compiler_error( + c, "'return' with value in async generator"); VISIT(c, expr, s->v.Return.value); } else @@ -2638,6 +2839,8 @@ compiler_visit_stmt(struct compiler *c, stmt_ty s) break; case AugAssign_kind: return compiler_augassign(c, s); + case AnnAssign_kind: + return compiler_annassign(c, s); case For_kind: return compiler_for(c, s); case While_kind: @@ -2668,16 +2871,7 @@ compiler_visit_stmt(struct compiler *c, stmt_ty s) case Nonlocal_kind: break; case Expr_kind: - if (c->c_interactive && c->c_nestlevel <= 1) { - VISIT(c, expr, s->v.Expr.value); - ADDOP(c, PRINT_EXPR); - } - else if (s->v.Expr.value->kind != Str_kind && - s->v.Expr.value->kind != Num_kind) { - VISIT(c, expr, s->v.Expr.value); - ADDOP(c, POP_TOP); - } - break; + return compiler_visit_stmt_expr(c, s->v.Expr.value); case Pass_kind: break; case Break_kind: @@ -3079,9 +3273,53 @@ compiler_set(struct compiler *c, expr_ty e) } static int +are_all_items_const(asdl_seq *seq, Py_ssize_t begin, Py_ssize_t end) +{ + Py_ssize_t i; + for (i = begin; i < end; i++) { + expr_ty key = (expr_ty)asdl_seq_GET(seq, i); + if (key == NULL || !is_const(key)) + return 0; + } + return 1; +} + +static int +compiler_subdict(struct compiler *c, expr_ty e, Py_ssize_t begin, Py_ssize_t end) +{ + Py_ssize_t i, n = end - begin; + PyObject *keys, *key; + if (n > 1 && are_all_items_const(e->v.Dict.keys, begin, end)) { + for (i = begin; i < end; i++) { + VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i)); + } + keys = PyTuple_New(n); + if (keys == NULL) { + return 0; + } + for (i = begin; i < end; i++) { + key = get_const_value((expr_ty)asdl_seq_GET(e->v.Dict.keys, i)); + Py_INCREF(key); + PyTuple_SET_ITEM(keys, i - begin, key); + } + ADDOP_N(c, LOAD_CONST, keys, consts); + ADDOP_I(c, BUILD_CONST_KEY_MAP, n); + } + else { + for (i = begin; i < end; i++) { + VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i)); + VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i)); + } + ADDOP_I(c, BUILD_MAP, n); + } + return 1; +} + +static int compiler_dict(struct compiler *c, expr_ty e) { - Py_ssize_t i, n, containers, elements; + Py_ssize_t i, n, elements; + int containers; int is_unpacking = 0; n = asdl_seq_LEN(e->v.Dict.values); containers = 0; @@ -3089,7 +3327,8 @@ compiler_dict(struct compiler *c, expr_ty e) for (i = 0; i < n; i++) { is_unpacking = (expr_ty)asdl_seq_GET(e->v.Dict.keys, i) == NULL; if (elements == 0xFFFF || (elements && is_unpacking)) { - ADDOP_I(c, BUILD_MAP, elements); + if (!compiler_subdict(c, e, i - elements, i)) + return 0; containers++; elements = 0; } @@ -3098,13 +3337,12 @@ compiler_dict(struct compiler *c, expr_ty e) containers++; } else { - VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i)); - VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i)); elements++; } } if (elements || containers == 0) { - ADDOP_I(c, BUILD_MAP, elements); + if (!compiler_subdict(c, e, n - elements, n)) + return 0; containers++; } /* If there is more than one dict, they need to be merged into a new @@ -3173,122 +3411,204 @@ compiler_call(struct compiler *c, expr_ty e) e->v.Call.keywords); } -/* shared code between compiler_call and compiler_class */ static int -compiler_call_helper(struct compiler *c, - Py_ssize_t n, /* Args already pushed */ - asdl_seq *args, - asdl_seq *keywords) +compiler_joined_str(struct compiler *c, expr_ty e) { - int code = 0; - Py_ssize_t nelts, i, nseen, nkw; + VISIT_SEQ(c, expr, e->v.JoinedStr.values); + ADDOP_I(c, BUILD_STRING, asdl_seq_LEN(e->v.JoinedStr.values)); + return 1; +} - /* the number of tuples and dictionaries on the stack */ - Py_ssize_t nsubargs = 0, nsubkwargs = 0; +/* Used to implement f-strings. Format a single value. */ +static int +compiler_formatted_value(struct compiler *c, expr_ty e) +{ + /* Our oparg encodes 2 pieces of information: the conversion + character, and whether or not a format_spec was provided. + + Convert the conversion char to 2 bits: + None: 000 0x0 FVC_NONE + !s : 001 0x1 FVC_STR + !r : 010 0x2 FVC_REPR + !a : 011 0x3 FVC_ASCII + + next bit is whether or not we have a format spec: + yes : 100 0x4 + no : 000 0x0 + */ - nkw = 0; - nseen = 0; /* the number of positional arguments on the stack */ - nelts = asdl_seq_LEN(args); - for (i = 0; i < nelts; i++) { - expr_ty elt = asdl_seq_GET(args, i); - if (elt->kind == Starred_kind) { - /* A star-arg. If we've seen positional arguments, - pack the positional arguments into a - tuple. */ - if (nseen) { - ADDOP_I(c, BUILD_TUPLE, nseen); - nseen = 0; - nsubargs++; - } - VISIT(c, expr, elt->v.Starred.value); - nsubargs++; - } - else if (nsubargs) { - /* We've seen star-args already, so we - count towards items-to-pack-into-tuple. */ - VISIT(c, expr, elt); - nseen++; - } - else { - /* Positional arguments before star-arguments - are left on the stack. */ - VISIT(c, expr, elt); - n++; - } - } - if (nseen) { - /* Pack up any trailing positional arguments. */ - ADDOP_I(c, BUILD_TUPLE, nseen); - nsubargs++; + int oparg; + + /* Evaluate the expression to be formatted. */ + VISIT(c, expr, e->v.FormattedValue.value); + + switch (e->v.FormattedValue.conversion) { + case 's': oparg = FVC_STR; break; + case 'r': oparg = FVC_REPR; break; + case 'a': oparg = FVC_ASCII; break; + case -1: oparg = FVC_NONE; break; + default: + PyErr_SetString(PyExc_SystemError, + "Unrecognized conversion character"); + return 0; } - if (nsubargs) { - code |= 1; - if (nsubargs > 1) { - /* If we ended up with more than one stararg, we need - to concatenate them into a single sequence. */ - ADDOP_I(c, BUILD_LIST_UNPACK, nsubargs); + if (e->v.FormattedValue.format_spec) { + /* Evaluate the format spec, and update our opcode arg. */ + VISIT(c, expr, e->v.FormattedValue.format_spec); + oparg |= FVS_HAVE_SPEC; + } + + /* And push our opcode and oparg */ + ADDOP_I(c, FORMAT_VALUE, oparg); + return 1; +} + +static int +compiler_subkwargs(struct compiler *c, asdl_seq *keywords, Py_ssize_t begin, Py_ssize_t end) +{ + Py_ssize_t i, n = end - begin; + keyword_ty kw; + PyObject *keys, *key; + assert(n > 0); + if (n > 1) { + for (i = begin; i < end; i++) { + kw = asdl_seq_GET(keywords, i); + VISIT(c, expr, kw->value); + } + keys = PyTuple_New(n); + if (keys == NULL) { + return 0; + } + for (i = begin; i < end; i++) { + key = ((keyword_ty) asdl_seq_GET(keywords, i))->arg; + Py_INCREF(key); + PyTuple_SET_ITEM(keys, i - begin, key); + } + ADDOP_N(c, LOAD_CONST, keys, consts); + ADDOP_I(c, BUILD_CONST_KEY_MAP, n); + } + else { + /* a for loop only executes once */ + for (i = begin; i < end; i++) { + kw = asdl_seq_GET(keywords, i); + ADDOP_O(c, LOAD_CONST, kw->arg, consts); + VISIT(c, expr, kw->value); } + ADDOP_I(c, BUILD_MAP, n); } + return 1; +} - /* Same dance again for keyword arguments */ - nseen = 0; /* the number of keyword arguments on the stack following */ - nelts = asdl_seq_LEN(keywords); - for (i = 0; i < nelts; i++) { +/* shared code between compiler_call and compiler_class */ +static int +compiler_call_helper(struct compiler *c, + int n, /* Args already pushed */ + asdl_seq *args, + asdl_seq *keywords) +{ + Py_ssize_t i, nseen, nelts, nkwelts; + int mustdictunpack = 0; + + /* the number of tuples and dictionaries on the stack */ + Py_ssize_t nsubargs = 0, nsubkwargs = 0; + + nelts = asdl_seq_LEN(args); + nkwelts = asdl_seq_LEN(keywords); + + for (i = 0; i < nkwelts; i++) { keyword_ty kw = asdl_seq_GET(keywords, i); if (kw->arg == NULL) { - /* A keyword argument unpacking. */ + mustdictunpack = 1; + break; + } + } + + nseen = n; /* the number of positional arguments on the stack */ + for (i = 0; i < nelts; i++) { + expr_ty elt = asdl_seq_GET(args, i); + if (elt->kind == Starred_kind) { + /* A star-arg. If we've seen positional arguments, + pack the positional arguments into a tuple. */ if (nseen) { - ADDOP_I(c, BUILD_MAP, nseen); + ADDOP_I(c, BUILD_TUPLE, nseen); nseen = 0; - nsubkwargs++; + nsubargs++; } - VISIT(c, expr, kw->value); - nsubkwargs++; - } - else if (nsubkwargs) { - /* A keyword argument and we already have a dict. */ - ADDOP_O(c, LOAD_CONST, kw->arg, consts); - VISIT(c, expr, kw->value); - nseen++; + VISIT(c, expr, elt->v.Starred.value); + nsubargs++; } else { - /* keyword argument */ - VISIT(c, keyword, kw) - nkw++; + VISIT(c, expr, elt); + nseen++; } } - if (nseen) { - /* Pack up any trailing keyword arguments. */ - ADDOP_I(c, BUILD_MAP, nseen); - nsubkwargs++; - } - if (nsubkwargs) { - code |= 2; + + /* Same dance again for keyword arguments */ + if (nsubargs || mustdictunpack) { + if (nseen) { + /* Pack up any trailing positional arguments. */ + ADDOP_I(c, BUILD_TUPLE, nseen); + nsubargs++; + } + if (nsubargs > 1) { + /* If we ended up with more than one stararg, we need + to concatenate them into a single sequence. */ + ADDOP_I(c, BUILD_TUPLE_UNPACK_WITH_CALL, nsubargs); + } + else if (nsubargs == 0) { + ADDOP_I(c, BUILD_TUPLE, 0); + } + nseen = 0; /* the number of keyword arguments on the stack following */ + for (i = 0; i < nkwelts; i++) { + keyword_ty kw = asdl_seq_GET(keywords, i); + if (kw->arg == NULL) { + /* A keyword argument unpacking. */ + if (nseen) { + if (!compiler_subkwargs(c, keywords, i - nseen, i)) + return 0; + nsubkwargs++; + nseen = 0; + } + VISIT(c, expr, kw->value); + nsubkwargs++; + } + else { + nseen++; + } + } + if (nseen) { + /* Pack up any trailing keyword arguments. */ + if (!compiler_subkwargs(c, keywords, nkwelts - nseen, nkwelts)) + return 0; + nsubkwargs++; + } if (nsubkwargs > 1) { /* Pack it all up */ - int function_pos = n + (code & 1) + 2 * nkw + 1; - ADDOP_I(c, BUILD_MAP_UNPACK_WITH_CALL, nsubkwargs | (function_pos << 8)); + ADDOP_I(c, BUILD_MAP_UNPACK_WITH_CALL, nsubkwargs); } + ADDOP_I(c, CALL_FUNCTION_EX, nsubkwargs > 0); + return 1; } - assert(n < 1<<8); - assert(nkw < 1<<24); - n |= nkw << 8; - - switch (code) { - case 0: - ADDOP_I(c, CALL_FUNCTION, n); - break; - case 1: - ADDOP_I(c, CALL_FUNCTION_VAR, n); - break; - case 2: - ADDOP_I(c, CALL_FUNCTION_KW, n); - break; - case 3: - ADDOP_I(c, CALL_FUNCTION_VAR_KW, n); - break; + else if (nkwelts) { + PyObject *names; + VISIT_SEQ(c, keyword, keywords); + names = PyTuple_New(nkwelts); + if (names == NULL) { + return 0; + } + for (i = 0; i < nkwelts; i++) { + keyword_ty kw = asdl_seq_GET(keywords, i); + Py_INCREF(kw->arg); + PyTuple_SET_ITEM(names, i, kw->arg); + } + ADDOP_N(c, LOAD_CONST, names, consts); + ADDOP_I(c, CALL_FUNCTION_KW, n + nelts + nkwelts); + return 1; + } + else { + ADDOP_I(c, CALL_FUNCTION, n + nelts); + return 1; } - return 1; } @@ -3307,11 +3627,28 @@ compiler_call_helper(struct compiler *c, - iterate over the generator sequence instead of using recursion */ + static int compiler_comprehension_generator(struct compiler *c, asdl_seq *generators, int gen_index, expr_ty elt, expr_ty val, int type) { + comprehension_ty gen; + gen = (comprehension_ty)asdl_seq_GET(generators, gen_index); + if (gen->is_async) { + return compiler_async_comprehension_generator( + c, generators, gen_index, elt, val, type); + } else { + return compiler_sync_comprehension_generator( + c, generators, gen_index, elt, val, type); + } +} + +static int +compiler_sync_comprehension_generator(struct compiler *c, + asdl_seq *generators, int gen_index, + expr_ty elt, expr_ty val, int type) +{ /* generate code for the iterator, then each of the ifs, and then write to the element */ @@ -3398,20 +3735,167 @@ compiler_comprehension_generator(struct compiler *c, } static int +compiler_async_comprehension_generator(struct compiler *c, + asdl_seq *generators, int gen_index, + expr_ty elt, expr_ty val, int type) +{ + _Py_IDENTIFIER(StopAsyncIteration); + + comprehension_ty gen; + basicblock *anchor, *skip, *if_cleanup, *try, + *after_try, *except, *try_cleanup; + Py_ssize_t i, n; + + PyObject *stop_aiter_error = _PyUnicode_FromId(&PyId_StopAsyncIteration); + if (stop_aiter_error == NULL) { + return 0; + } + + try = compiler_new_block(c); + after_try = compiler_new_block(c); + try_cleanup = compiler_new_block(c); + except = compiler_new_block(c); + skip = compiler_new_block(c); + if_cleanup = compiler_new_block(c); + anchor = compiler_new_block(c); + + if (skip == NULL || if_cleanup == NULL || anchor == NULL || + try == NULL || after_try == NULL || + except == NULL || after_try == NULL) { + return 0; + } + + gen = (comprehension_ty)asdl_seq_GET(generators, gen_index); + + if (gen_index == 0) { + /* Receive outermost iter as an implicit argument */ + c->u->u_argcount = 1; + ADDOP_I(c, LOAD_FAST, 0); + } + else { + /* Sub-iter - calculate on the fly */ + VISIT(c, expr, gen->iter); + ADDOP(c, GET_AITER); + ADDOP_O(c, LOAD_CONST, Py_None, consts); + ADDOP(c, YIELD_FROM); + } + + compiler_use_next_block(c, try); + + + ADDOP_JREL(c, SETUP_EXCEPT, except); + if (!compiler_push_fblock(c, EXCEPT, try)) + return 0; + + ADDOP(c, GET_ANEXT); + ADDOP_O(c, LOAD_CONST, Py_None, consts); + ADDOP(c, YIELD_FROM); + VISIT(c, expr, gen->target); + ADDOP(c, POP_BLOCK); + compiler_pop_fblock(c, EXCEPT, try); + ADDOP_JREL(c, JUMP_FORWARD, after_try); + + + compiler_use_next_block(c, except); + ADDOP(c, DUP_TOP); + ADDOP_O(c, LOAD_GLOBAL, stop_aiter_error, names); + ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH); + ADDOP_JABS(c, POP_JUMP_IF_FALSE, try_cleanup); + + ADDOP(c, POP_TOP); + ADDOP(c, POP_TOP); + ADDOP(c, POP_TOP); + ADDOP(c, POP_EXCEPT); /* for SETUP_EXCEPT */ + ADDOP_JABS(c, JUMP_ABSOLUTE, anchor); + + + compiler_use_next_block(c, try_cleanup); + ADDOP(c, END_FINALLY); + + compiler_use_next_block(c, after_try); + + n = asdl_seq_LEN(gen->ifs); + for (i = 0; i < n; i++) { + expr_ty e = (expr_ty)asdl_seq_GET(gen->ifs, i); + VISIT(c, expr, e); + ADDOP_JABS(c, POP_JUMP_IF_FALSE, if_cleanup); + NEXT_BLOCK(c); + } + + if (++gen_index < asdl_seq_LEN(generators)) + if (!compiler_comprehension_generator(c, + generators, gen_index, + elt, val, type)) + return 0; + + /* only append after the last for generator */ + if (gen_index >= asdl_seq_LEN(generators)) { + /* comprehension specific code */ + switch (type) { + case COMP_GENEXP: + VISIT(c, expr, elt); + ADDOP(c, YIELD_VALUE); + ADDOP(c, POP_TOP); + break; + case COMP_LISTCOMP: + VISIT(c, expr, elt); + ADDOP_I(c, LIST_APPEND, gen_index + 1); + break; + case COMP_SETCOMP: + VISIT(c, expr, elt); + ADDOP_I(c, SET_ADD, gen_index + 1); + break; + case COMP_DICTCOMP: + /* With 'd[k] = v', v is evaluated before k, so we do + the same. */ + VISIT(c, expr, val); + VISIT(c, expr, elt); + ADDOP_I(c, MAP_ADD, gen_index + 1); + break; + default: + return 0; + } + + compiler_use_next_block(c, skip); + } + compiler_use_next_block(c, if_cleanup); + ADDOP_JABS(c, JUMP_ABSOLUTE, try); + compiler_use_next_block(c, anchor); + ADDOP(c, POP_TOP); + + return 1; +} + +static int compiler_comprehension(struct compiler *c, expr_ty e, int type, identifier name, asdl_seq *generators, expr_ty elt, expr_ty val) { PyCodeObject *co = NULL; - expr_ty outermost_iter; + comprehension_ty outermost; PyObject *qualname = NULL; + int is_async_function = c->u->u_ste->ste_coroutine; + int is_async_generator = 0; - outermost_iter = ((comprehension_ty) - asdl_seq_GET(generators, 0))->iter; + outermost = (comprehension_ty) asdl_seq_GET(generators, 0); if (!compiler_enter_scope(c, name, COMPILER_SCOPE_COMPREHENSION, (void *)e, e->lineno)) + { goto error; + } + + is_async_generator = c->u->u_ste->ste_coroutine; + + if (is_async_generator && !is_async_function) { + if (e->lineno > c->u->u_lineno) { + c->u->u_lineno = e->lineno; + c->u->u_lineno_set = 0; + } + compiler_error(c, "asynchronous comprehension outside of " + "an asynchronous function"); + goto error_in_scope; + } if (type != COMP_GENEXP) { int op; @@ -3454,9 +3938,24 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type, Py_DECREF(qualname); Py_DECREF(co); - VISIT(c, expr, outermost_iter); - ADDOP(c, GET_ITER); + VISIT(c, expr, outermost->iter); + + if (outermost->is_async) { + ADDOP(c, GET_AITER); + ADDOP_O(c, LOAD_CONST, Py_None, consts); + ADDOP(c, YIELD_FROM); + } else { + ADDOP(c, GET_ITER); + } + ADDOP_I(c, CALL_FUNCTION, 1); + + if (is_async_generator && type != COMP_GENEXP) { + ADDOP(c, GET_AWAITABLE); + ADDOP_O(c, LOAD_CONST, Py_None, consts); + ADDOP(c, YIELD_FROM); + } + return 1; error_in_scope: compiler_exit_scope(c); @@ -3531,7 +4030,6 @@ compiler_dictcomp(struct compiler *c, expr_ty e) static int compiler_visit_keyword(struct compiler *c, keyword_ty k) { - ADDOP_O(c, LOAD_CONST, k->arg, consts); VISIT(c, expr, k->value); return 1; } @@ -3549,6 +4047,8 @@ expr_constant(struct compiler *c, expr_ty e) switch (e->kind) { case Ellipsis_kind: return 1; + case Constant_kind: + return PyObject_IsTrue(e->v.Constant.value); case Num_kind: return PyObject_IsTrue(e->v.Num.n); case Str_kind: @@ -3592,9 +4092,9 @@ expr_constant(struct compiler *c, expr_ty e) BLOCK finally: if an exception was raised: - exc = copy of (exception, instance, traceback) + exc = copy of (exception, instance, traceback) else: - exc = (None, None, None) + exc = (None, None, None) if not (await exit(*exc)): raise */ @@ -3794,8 +4294,6 @@ compiler_visit_expr(struct compiler *c, expr_ty e) case Yield_kind: if (c->u->u_ste->ste_type != FunctionBlock) return compiler_error(c, "'yield' outside function"); - if (c->u->u_scope_type == COMPILER_SCOPE_ASYNC_FUNCTION) - return compiler_error(c, "'yield' inside async function"); if (e->v.Yield.value) { VISIT(c, expr, e->v.Yield.value); } @@ -3820,11 +4318,8 @@ compiler_visit_expr(struct compiler *c, expr_ty e) if (c->u->u_ste->ste_type != FunctionBlock) return compiler_error(c, "'await' outside function"); - if (c->u->u_scope_type == COMPILER_SCOPE_COMPREHENSION) - return compiler_error( - c, "'await' expressions in comprehensions are not supported"); - - if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) + if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION && + c->u->u_scope_type != COMPILER_SCOPE_COMPREHENSION) return compiler_error(c, "'await' outside async function"); VISIT(c, expr, e->v.Await.value); @@ -3836,12 +4331,19 @@ compiler_visit_expr(struct compiler *c, expr_ty e) return compiler_compare(c, e); case Call_kind: return compiler_call(c, e); + case Constant_kind: + ADDOP_O(c, LOAD_CONST, e->v.Constant.value, consts); + break; case Num_kind: ADDOP_O(c, LOAD_CONST, e->v.Num.n, consts); break; case Str_kind: ADDOP_O(c, LOAD_CONST, e->v.Str.s, consts); break; + case JoinedStr_kind: + return compiler_joined_str(c, e); + case FormattedValue_kind: + return compiler_formatted_value(c, e); case Bytes_kind: ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts); break; @@ -3976,6 +4478,144 @@ compiler_augassign(struct compiler *c, stmt_ty s) } static int +check_ann_expr(struct compiler *c, expr_ty e) +{ + VISIT(c, expr, e); + ADDOP(c, POP_TOP); + return 1; +} + +static int +check_annotation(struct compiler *c, stmt_ty s) +{ + /* Annotations are only evaluated in a module or class. */ + if (c->u->u_scope_type == COMPILER_SCOPE_MODULE || + c->u->u_scope_type == COMPILER_SCOPE_CLASS) { + return check_ann_expr(c, s->v.AnnAssign.annotation); + } + return 1; +} + +static int +check_ann_slice(struct compiler *c, slice_ty sl) +{ + switch(sl->kind) { + case Index_kind: + return check_ann_expr(c, sl->v.Index.value); + case Slice_kind: + if (sl->v.Slice.lower && !check_ann_expr(c, sl->v.Slice.lower)) { + return 0; + } + if (sl->v.Slice.upper && !check_ann_expr(c, sl->v.Slice.upper)) { + return 0; + } + if (sl->v.Slice.step && !check_ann_expr(c, sl->v.Slice.step)) { + return 0; + } + break; + default: + PyErr_SetString(PyExc_SystemError, + "unexpected slice kind"); + return 0; + } + return 1; +} + +static int +check_ann_subscr(struct compiler *c, slice_ty sl) +{ + /* We check that everything in a subscript is defined at runtime. */ + Py_ssize_t i, n; + + switch (sl->kind) { + case Index_kind: + case Slice_kind: + if (!check_ann_slice(c, sl)) { + return 0; + } + break; + case ExtSlice_kind: + n = asdl_seq_LEN(sl->v.ExtSlice.dims); + for (i = 0; i < n; i++) { + slice_ty subsl = (slice_ty)asdl_seq_GET(sl->v.ExtSlice.dims, i); + switch (subsl->kind) { + case Index_kind: + case Slice_kind: + if (!check_ann_slice(c, subsl)) { + return 0; + } + break; + case ExtSlice_kind: + default: + PyErr_SetString(PyExc_SystemError, + "extended slice invalid in nested slice"); + return 0; + } + } + break; + default: + PyErr_Format(PyExc_SystemError, + "invalid subscript kind %d", sl->kind); + return 0; + } + return 1; +} + +static int +compiler_annassign(struct compiler *c, stmt_ty s) +{ + expr_ty targ = s->v.AnnAssign.target; + PyObject* mangled; + + assert(s->kind == AnnAssign_kind); + + /* We perform the actual assignment first. */ + if (s->v.AnnAssign.value) { + VISIT(c, expr, s->v.AnnAssign.value); + VISIT(c, expr, targ); + } + switch (targ->kind) { + case Name_kind: + /* If we have a simple name in a module or class, store annotation. */ + if (s->v.AnnAssign.simple && + (c->u->u_scope_type == COMPILER_SCOPE_MODULE || + c->u->u_scope_type == COMPILER_SCOPE_CLASS)) { + mangled = _Py_Mangle(c->u->u_private, targ->v.Name.id); + if (!mangled) { + return 0; + } + VISIT(c, expr, s->v.AnnAssign.annotation); + /* ADDOP_N decrefs its argument */ + ADDOP_N(c, STORE_ANNOTATION, mangled, names); + } + break; + case Attribute_kind: + if (!s->v.AnnAssign.value && + !check_ann_expr(c, targ->v.Attribute.value)) { + return 0; + } + break; + case Subscript_kind: + if (!s->v.AnnAssign.value && + (!check_ann_expr(c, targ->v.Subscript.value) || + !check_ann_subscr(c, targ->v.Subscript.slice))) { + return 0; + } + break; + default: + PyErr_Format(PyExc_SystemError, + "invalid node type (%d) for annotated assignment", + targ->kind); + return 0; + } + /* Annotation is evaluated last. */ + if (!s->v.AnnAssign.simple && !check_annotation(c, s)) { + return 0; + } + return 1; +} + +static int compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b) { struct fblockinfo *f; @@ -4273,7 +4913,7 @@ assemble_init(struct assembler *a, int nblocks, int firstlineno) a->a_lnotab = PyBytes_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE); if (!a->a_lnotab) return 0; - if ((size_t)nblocks > PY_SIZE_MAX / sizeof(basicblock *)) { + if ((size_t)nblocks > SIZE_MAX / sizeof(basicblock *)) { PyErr_NoMemory(); return 0; } @@ -4295,18 +4935,6 @@ assemble_free(struct assembler *a) PyObject_Free(a->a_postorder); } -/* Return the size of a basic block in bytes. */ - -static int -instrsize(struct instr *instr) -{ - if (!instr->i_hasarg) - return 1; /* 1 byte for the opcode*/ - if (instr->i_oparg > 0xffff) - return 6; /* 1 (opcode) + 1 (EXTENDED_ARG opcode) + 2 (oparg) + 2(oparg extended) */ - return 3; /* 1 (opcode) + 2 (oparg) */ -} - static int blocksize(basicblock *b) { @@ -4314,7 +4942,7 @@ blocksize(basicblock *b) int size = 0; for (i = 0; i < b->b_iused; i++) - size += instrsize(&b->b_instr[i]); + size += instrsize(b->b_instr[i].i_oparg); return size; } @@ -4329,11 +4957,10 @@ assemble_lnotab(struct assembler *a, struct instr *i) Py_ssize_t len; unsigned char *lnotab; - d_bytecode = a->a_offset - a->a_lineno_off; + d_bytecode = (a->a_offset - a->a_lineno_off) * sizeof(_Py_CODEUNIT); d_lineno = i->i_lineno - a->a_lineno; assert(d_bytecode >= 0); - assert(d_lineno >= 0); if(d_bytecode == 0 && d_lineno == 0) return 1; @@ -4363,9 +4990,21 @@ assemble_lnotab(struct assembler *a, struct instr *i) d_bytecode -= ncodes * 255; a->a_lnotab_off += ncodes * 2; } - assert(d_bytecode <= 255); - if (d_lineno > 255) { - int j, nbytes, ncodes = d_lineno / 255; + assert(0 <= d_bytecode && d_bytecode <= 255); + + if (d_lineno < -128 || 127 < d_lineno) { + int j, nbytes, ncodes, k; + if (d_lineno < 0) { + k = -128; + /* use division on positive numbers */ + ncodes = (-d_lineno) / 128; + } + else { + k = 127; + ncodes = d_lineno / 127; + } + d_lineno -= ncodes * k; + assert(ncodes >= 1); nbytes = a->a_lnotab_off + 2 * ncodes; len = PyBytes_GET_SIZE(a->a_lnotab); if (nbytes >= len) { @@ -4383,15 +5022,15 @@ assemble_lnotab(struct assembler *a, struct instr *i) lnotab = (unsigned char *) PyBytes_AS_STRING(a->a_lnotab) + a->a_lnotab_off; *lnotab++ = d_bytecode; - *lnotab++ = 255; + *lnotab++ = k; d_bytecode = 0; for (j = 1; j < ncodes; j++) { *lnotab++ = 0; - *lnotab++ = 255; + *lnotab++ = k; } - d_lineno -= ncodes * 255; a->a_lnotab_off += ncodes * 2; } + assert(-128 <= d_lineno && d_lineno <= 127); len = PyBytes_GET_SIZE(a->a_lnotab); if (a->a_lnotab_off + 2 >= len) { @@ -4423,38 +5062,23 @@ assemble_lnotab(struct assembler *a, struct instr *i) static int assemble_emit(struct assembler *a, struct instr *i) { - int size, arg = 0, ext = 0; + int size, arg = 0; Py_ssize_t len = PyBytes_GET_SIZE(a->a_bytecode); - char *code; + _Py_CODEUNIT *code; - size = instrsize(i); - if (i->i_hasarg) { - arg = i->i_oparg; - ext = arg >> 16; - } + arg = i->i_oparg; + size = instrsize(arg); if (i->i_lineno && !assemble_lnotab(a, i)) return 0; - if (a->a_offset + size >= len) { + if (a->a_offset + size >= len / (int)sizeof(_Py_CODEUNIT)) { if (len > PY_SSIZE_T_MAX / 2) return 0; if (_PyBytes_Resize(&a->a_bytecode, len * 2) < 0) return 0; } - code = PyBytes_AS_STRING(a->a_bytecode) + a->a_offset; + code = (_Py_CODEUNIT *)PyBytes_AS_STRING(a->a_bytecode) + a->a_offset; a->a_offset += size; - if (size == 6) { - assert(i->i_hasarg); - *code++ = (char)EXTENDED_ARG; - *code++ = ext & 0xff; - *code++ = ext >> 8; - arg &= 0xffff; - } - *code++ = i->i_opcode; - if (i->i_hasarg) { - assert(size == 3 || size == 6); - *code++ = arg & 0xff; - *code++ = arg >> 8; - } + write_op_arg(code, i->i_opcode, arg, size); return 1; } @@ -4462,7 +5086,7 @@ static void assemble_jump_offsets(struct assembler *a, struct compiler *c) { basicblock *b; - int bsize, totsize, extended_arg_count = 0, last_extended_arg_count; + int bsize, totsize, extended_arg_recompile; int i; /* Compute the size of each block and fixup jump args. @@ -4475,27 +5099,27 @@ assemble_jump_offsets(struct assembler *a, struct compiler *c) b->b_offset = totsize; totsize += bsize; } - last_extended_arg_count = extended_arg_count; - extended_arg_count = 0; + extended_arg_recompile = 0; for (b = c->u->u_blocks; b != NULL; b = b->b_list) { bsize = b->b_offset; for (i = 0; i < b->b_iused; i++) { struct instr *instr = &b->b_instr[i]; + int isize = instrsize(instr->i_oparg); /* Relative jumps are computed relative to the instruction pointer after fetching the jump instruction. */ - bsize += instrsize(instr); - if (instr->i_jabs) + bsize += isize; + if (instr->i_jabs || instr->i_jrel) { instr->i_oparg = instr->i_target->b_offset; - else if (instr->i_jrel) { - int delta = instr->i_target->b_offset - bsize; - instr->i_oparg = delta; + if (instr->i_jrel) { + instr->i_oparg -= bsize; + } + instr->i_oparg *= sizeof(_Py_CODEUNIT); + if (instrsize(instr->i_oparg) != isize) { + extended_arg_recompile = 1; + } } - else - continue; - if (instr->i_oparg > 0xffff) - extended_arg_count++; } } @@ -4505,7 +5129,7 @@ assemble_jump_offsets(struct assembler *a, struct compiler *c) The issue is that in the first loop blocksize() is called which calls instrsize() which requires i_oparg be set - appropriately. There is a bootstrap problem because + appropriately. There is a bootstrap problem because i_oparg is calculated in the second loop above. So we loop until we stop seeing new EXTENDED_ARGs. @@ -4513,7 +5137,7 @@ assemble_jump_offsets(struct assembler *a, struct compiler *c) ones in jump instructions. So this should converge fairly quickly. */ - } while (last_extended_arg_count != extended_arg_count); + } while (extended_arg_recompile); } static PyObject * @@ -4549,8 +5173,12 @@ compute_code_flags(struct compiler *c) flags |= CO_NEWLOCALS | CO_OPTIMIZED; if (ste->ste_nested) flags |= CO_NESTED; - if (ste->ste_generator) + if (ste->ste_generator && !ste->ste_coroutine) flags |= CO_GENERATOR; + if (!ste->ste_generator && ste->ste_coroutine) + flags |= CO_COROUTINE; + if (ste->ste_generator && ste->ste_coroutine) + flags |= CO_ASYNC_GENERATOR; if (ste->ste_varargs) flags |= CO_VARARGS; if (ste->ste_varkeywords) @@ -4659,9 +5287,9 @@ dump_instr(const struct instr *i) char arg[128]; *arg = '\0'; - if (i->i_hasarg) + if (HAS_ARG(i->i_opcode)) { sprintf(arg, "arg: %d ", i->i_oparg); - + } fprintf(stderr, "line: %d, opcode: %d %s%s%s\n", i->i_lineno, i->i_opcode, arg, jabs, jrel); } @@ -4711,7 +5339,7 @@ assemble(struct compiler *c, int addNone) /* Set firstlineno if it wasn't explicitly set. */ if (!c->u->u_firstlineno) { - if (entryblock && entryblock->b_instr) + if (entryblock && entryblock->b_instr && entryblock->b_instr->i_lineno) c->u->u_firstlineno = entryblock->b_instr->i_lineno; else c->u->u_firstlineno = 1; @@ -4733,7 +5361,7 @@ assemble(struct compiler *c, int addNone) if (_PyBytes_Resize(&a.a_lnotab, a.a_lnotab_off) < 0) goto error; - if (_PyBytes_Resize(&a.a_bytecode, a.a_offset) < 0) + if (_PyBytes_Resize(&a.a_bytecode, a.a_offset * sizeof(_Py_CODEUNIT)) < 0) goto error; co = makecode(c, &a); @@ -4749,4 +5377,3 @@ PyAST_Compile(mod_ty mod, const char *filename, PyCompilerFlags *flags, { return PyAST_CompileEx(mod, filename, flags, -1, arena); } - diff --git a/Python/condvar.h b/Python/condvar.h index ced910f..9a71b17 100644 --- a/Python/condvar.h +++ b/Python/condvar.h @@ -89,7 +89,7 @@ do { /* TODO: add overflow and truncation checks */ \ /* return 0 for success, 1 on timeout, -1 on error */ Py_LOCAL_INLINE(int) -PyCOND_TIMEDWAIT(PyCOND_T *cond, PyMUTEX_T *mut, PY_LONG_LONG us) +PyCOND_TIMEDWAIT(PyCOND_T *cond, PyMUTEX_T *mut, long long us) { int r; struct timespec ts; @@ -270,7 +270,7 @@ PyCOND_WAIT(PyCOND_T *cv, PyMUTEX_T *cs) } Py_LOCAL_INLINE(int) -PyCOND_TIMEDWAIT(PyCOND_T *cv, PyMUTEX_T *cs, PY_LONG_LONG us) +PyCOND_TIMEDWAIT(PyCOND_T *cv, PyMUTEX_T *cs, long long us) { return _PyCOND_WAIT_MS(cv, cs, (DWORD)(us/1000)); } @@ -363,7 +363,7 @@ PyCOND_WAIT(PyCOND_T *cv, PyMUTEX_T *cs) * 2 to indicate that we don't know. */ Py_LOCAL_INLINE(int) -PyCOND_TIMEDWAIT(PyCOND_T *cv, PyMUTEX_T *cs, PY_LONG_LONG us) +PyCOND_TIMEDWAIT(PyCOND_T *cv, PyMUTEX_T *cs, long long us) { return SleepConditionVariableSRW(cv, cs, (DWORD)(us/1000), 0) ? 2 : -1; } diff --git a/Python/dtoa.c b/Python/dtoa.c index 3da546e..efcadc3 100644 --- a/Python/dtoa.c +++ b/Python/dtoa.c @@ -151,18 +151,9 @@ #endif -#if defined(HAVE_UINT32_T) && defined(HAVE_INT32_T) -typedef PY_UINT32_T ULong; -typedef PY_INT32_T Long; -#else -#error "Failed to find an exact-width 32-bit integer type" -#endif - -#if defined(HAVE_UINT64_T) -#define ULLong PY_UINT64_T -#else -#undef ULLong -#endif +typedef uint32_t ULong; +typedef int32_t Long; +typedef uint64_t ULLong; #undef DEBUG #ifdef Py_DEBUG @@ -457,13 +448,8 @@ static Bigint * multadd(Bigint *b, int m, int a) /* multiply by m and add a */ { int i, wds; -#ifdef ULLong ULong *x; ULLong carry, y; -#else - ULong carry, *x, y; - ULong xi, z; -#endif Bigint *b1; wds = b->wds; @@ -471,17 +457,9 @@ multadd(Bigint *b, int m, int a) /* multiply by m and add a */ i = 0; carry = a; do { -#ifdef ULLong y = *x * (ULLong)m + carry; carry = y >> 32; *x++ = (ULong)(y & FFFFFFFF); -#else - xi = *x; - y = (xi & 0xffff) * m + carry; - z = (xi >> 16) * m + (y >> 16); - carry = z >> 16; - *x++ = (z << 16) + (y & 0xffff); -#endif } while(++i < wds); if (carry) { @@ -642,12 +620,7 @@ mult(Bigint *a, Bigint *b) int k, wa, wb, wc; ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0; ULong y; -#ifdef ULLong ULLong carry, z; -#else - ULong carry, z; - ULong z2; -#endif if ((!a->x[0] && a->wds == 1) || (!b->x[0] && b->wds == 1)) { c = Balloc(0); @@ -679,7 +652,6 @@ mult(Bigint *a, Bigint *b) xb = b->x; xbe = xb + wb; xc0 = c->x; -#ifdef ULLong for(; xb < xbe; xc0++) { if ((y = *xb++)) { x = xa; @@ -694,39 +666,6 @@ mult(Bigint *a, Bigint *b) *xc = (ULong)carry; } } -#else - for(; xb < xbe; xb++, xc0++) { - if (y = *xb & 0xffff) { - x = xa; - xc = xc0; - carry = 0; - do { - z = (*x & 0xffff) * y + (*xc & 0xffff) + carry; - carry = z >> 16; - z2 = (*x++ >> 16) * y + (*xc >> 16) + carry; - carry = z2 >> 16; - Storeinc(xc, z2, z); - } - while(x < xae); - *xc = carry; - } - if (y = *xb >> 16) { - x = xa; - xc = xc0; - carry = 0; - z2 = *xc; - do { - z = (*x & 0xffff) * y + (*xc >> 16) + carry; - carry = z >> 16; - Storeinc(xc, z, z2); - z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry; - carry = z2 >> 16; - } - while(x < xae); - *xc = z2; - } - } -#endif for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ; c->wds = wc; return c; @@ -747,7 +686,7 @@ pow5mult(Bigint *b, int k) { Bigint *b1, *p5, *p51; int i; - static int p05[3] = { 5, 25, 125 }; + static const int p05[3] = { 5, 25, 125 }; if ((i = k & 3)) { b = multadd(b, p05[i-1], 0); @@ -803,7 +742,7 @@ pow5mult(Bigint *b, int k) { Bigint *b1, *p5, *p51; int i; - static int p05[3] = { 5, 25, 125 }; + static const int p05[3] = { 5, 25, 125 }; if ((i = k & 3)) { b = multadd(b, p05[i-1], 0); @@ -935,12 +874,7 @@ diff(Bigint *a, Bigint *b) Bigint *c; int i, wa, wb; ULong *xa, *xae, *xb, *xbe, *xc; -#ifdef ULLong ULLong borrow, y; -#else - ULong borrow, y; - ULong z; -#endif i = cmp(a,b); if (!i) { @@ -971,7 +905,6 @@ diff(Bigint *a, Bigint *b) xbe = xb + wb; xc = c->x; borrow = 0; -#ifdef ULLong do { y = (ULLong)*xa++ - *xb++ - borrow; borrow = y >> 32 & (ULong)1; @@ -983,23 +916,6 @@ diff(Bigint *a, Bigint *b) borrow = y >> 32 & (ULong)1; *xc++ = (ULong)(y & FFFFFFFF); } -#else - do { - y = (*xa & 0xffff) - (*xb & 0xffff) - borrow; - borrow = (y & 0x10000) >> 16; - z = (*xa++ >> 16) - (*xb++ >> 16) - borrow; - borrow = (z & 0x10000) >> 16; - Storeinc(xc, z, y); - } - while(xb < xbe); - while(xa < xae) { - y = (*xa & 0xffff) - borrow; - borrow = (y & 0x10000) >> 16; - z = (*xa++ >> 16) - borrow; - borrow = (z & 0x10000) >> 16; - Storeinc(xc, z, y); - } -#endif while(!*--xc) wa--; c->wds = wa; @@ -1244,12 +1160,7 @@ quorem(Bigint *b, Bigint *S) { int n; ULong *bx, *bxe, q, *sx, *sxe; -#ifdef ULLong ULLong borrow, carry, y, ys; -#else - ULong borrow, carry, y, ys; - ULong si, z, zs; -#endif n = S->wds; #ifdef DEBUG @@ -1271,23 +1182,11 @@ quorem(Bigint *b, Bigint *S) borrow = 0; carry = 0; do { -#ifdef ULLong ys = *sx++ * (ULLong)q + carry; carry = ys >> 32; y = *bx - (ys & FFFFFFFF) - borrow; borrow = y >> 32 & (ULong)1; *bx++ = (ULong)(y & FFFFFFFF); -#else - si = *sx++; - ys = (si & 0xffff) * q + carry; - zs = (si >> 16) * q + (ys >> 16); - carry = zs >> 16; - y = (*bx & 0xffff) - (ys & 0xffff) - borrow; - borrow = (y & 0x10000) >> 16; - z = (*bx >> 16) - (zs & 0xffff) - borrow; - borrow = (z & 0x10000) >> 16; - Storeinc(bx, z, y); -#endif } while(sx <= sxe); if (!*bxe) { @@ -1304,23 +1203,11 @@ quorem(Bigint *b, Bigint *S) bx = b->x; sx = S->x; do { -#ifdef ULLong ys = *sx++ + carry; carry = ys >> 32; y = *bx - (ys & FFFFFFFF) - borrow; borrow = y >> 32 & (ULong)1; *bx++ = (ULong)(y & FFFFFFFF); -#else - si = *sx++; - ys = (si & 0xffff) + carry; - zs = (si >> 16) + (ys >> 16); - carry = zs >> 16; - y = (*bx & 0xffff) - (ys & 0xffff) - borrow; - borrow = (y & 0x10000) >> 16; - z = (*bx >> 16) - (zs & 0xffff) - borrow; - borrow = (z & 0x10000) >> 16; - Storeinc(bx, z, y); -#endif } while(sx <= sxe); bx = b->x; @@ -2315,7 +2202,7 @@ rv_alloc(int i) } static char * -nrv_alloc(char *s, char **rve, int n) +nrv_alloc(const char *s, char **rve, int n) { char *rv, *t; diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 3f533d1..05050cf 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -24,12 +24,10 @@ void _Py_DeactivateActCtx(ULONG_PTR cookie); #define PYD_DEBUG_SUFFIX "" #endif -#define STRINGIZE2(x) #x -#define STRINGIZE(x) STRINGIZE2(x) #ifdef PYD_PLATFORM_TAG -#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" STRINGIZE(PY_MAJOR_VERSION) STRINGIZE(PY_MINOR_VERSION) "-" PYD_PLATFORM_TAG ".pyd" +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) "-" PYD_PLATFORM_TAG ".pyd" #else -#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" STRINGIZE(PY_MAJOR_VERSION) STRINGIZE(PY_MINOR_VERSION) ".pyd" +#define PYD_TAGGED_SUFFIX PYD_DEBUG_SUFFIX ".cp" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) ".pyd" #endif #define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd" @@ -43,7 +41,7 @@ const char *_PyImport_DynLoadFiletab[] = { /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ -static int strcasecmp (char *string1, char *string2) +static int strcasecmp (const char *string1, const char *string2) { int first, second; @@ -192,13 +190,13 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, { dl_funcptr p; char funcname[258], *import_python; - const wchar_t *wpathname; + wchar_t *wpathname; #ifndef _DEBUG _Py_CheckPython3(); #endif - wpathname = _PyUnicode_AsUnicode(pathname); + wpathname = PyUnicode_AsUnicode(pathname); if (wpathname == NULL) return NULL; diff --git a/Python/errors.c b/Python/errors.c index b820722..7b25a22 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -52,6 +52,20 @@ PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback) Py_XDECREF(oldtraceback); } +static PyObject* +_PyErr_CreateException(PyObject *exception, PyObject *value) +{ + if (value == NULL || value == Py_None) { + return _PyObject_CallNoArg(exception); + } + else if (PyTuple_Check(value)) { + return PyObject_Call(exception, value, NULL); + } + else { + return _PyObject_CallArg1(exception, value); + } +} + void PyErr_SetObject(PyObject *exception, PyObject *value) { @@ -66,6 +80,7 @@ PyErr_SetObject(PyObject *exception, PyObject *value) exception); return; } + Py_XINCREF(value); exc_value = tstate->exc_value; if (exc_value != NULL && exc_value != Py_None) { @@ -73,28 +88,21 @@ PyErr_SetObject(PyObject *exception, PyObject *value) Py_INCREF(exc_value); if (value == NULL || !PyExceptionInstance_Check(value)) { /* We must normalize the value right now */ - PyObject *args, *fixed_value; + PyObject *fixed_value; - /* Issue #23571: PyEval_CallObject() must not be called with an + /* Issue #23571: functions must not be called with an exception set */ PyErr_Clear(); - if (value == NULL || value == Py_None) - args = PyTuple_New(0); - else if (PyTuple_Check(value)) { - Py_INCREF(value); - args = value; - } - else - args = PyTuple_Pack(1, value); - fixed_value = args ? - PyEval_CallObject(exception, args) : NULL; - Py_XDECREF(args); + fixed_value = _PyErr_CreateException(exception, value); Py_XDECREF(value); - if (fixed_value == NULL) + if (fixed_value == NULL) { return; + } + value = fixed_value; } + /* Avoid reference cycles through the context chain. This is O(chain length) but context chains are usually very short. Sensitive readers may try @@ -110,7 +118,8 @@ PyErr_SetObject(PyObject *exception, PyObject *value) o = context; } PyException_SetContext(value, exc_value); - } else { + } + else { Py_DECREF(exc_value); } } @@ -258,25 +267,15 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) class. */ if (!inclass || !is_subclass) { - PyObject *args, *res; + PyObject *fixed_value; - if (value == Py_None) - args = PyTuple_New(0); - else if (PyTuple_Check(value)) { - Py_INCREF(value); - args = value; + fixed_value = _PyErr_CreateException(type, value); + if (fixed_value == NULL) { + goto finally; } - else - args = PyTuple_Pack(1, value); - if (args == NULL) - goto finally; - res = PyEval_CallObject(type, args); - Py_DECREF(args); - if (res == NULL) - goto finally; Py_DECREF(value); - value = res; + value = fixed_value; } /* if the class of the instance doesn't exactly match the class of the type, believe the instance @@ -402,6 +401,47 @@ _PyErr_ChainExceptions(PyObject *exc, PyObject *val, PyObject *tb) } } +static PyObject * +_PyErr_FormatVFromCause(PyObject *exception, const char *format, va_list vargs) +{ + PyObject *exc, *val, *val2, *tb; + + assert(PyErr_Occurred()); + PyErr_Fetch(&exc, &val, &tb); + PyErr_NormalizeException(&exc, &val, &tb); + if (tb != NULL) { + PyException_SetTraceback(val, tb); + Py_DECREF(tb); + } + Py_DECREF(exc); + assert(!PyErr_Occurred()); + + PyErr_FormatV(exception, format, vargs); + + PyErr_Fetch(&exc, &val2, &tb); + PyErr_NormalizeException(&exc, &val2, &tb); + Py_INCREF(val); + PyException_SetCause(val2, val); + PyException_SetContext(val2, val); + PyErr_Restore(exc, val2, tb); + + return NULL; +} + +PyObject * +_PyErr_FormatFromCause(PyObject *exception, const char *format, ...) +{ + va_list vargs; +#ifdef HAVE_STDARG_PROTOTYPES + va_start(vargs, format); +#else + va_start(vargs); +#endif + _PyErr_FormatVFromCause(exception, format, vargs); + va_end(vargs); + return NULL; +} + /* Convenience functions to set a type error exception and return 0 */ int @@ -701,51 +741,61 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( #endif /* MS_WINDOWS */ PyObject * -PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path) +PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, + PyObject *name, PyObject *path) { - PyObject *args, *kwargs, *error; + int issubclass; + PyObject *kwargs, *error; - if (msg == NULL) + issubclass = PyObject_IsSubclass(exception, PyExc_ImportError); + if (issubclass < 0) { return NULL; - - args = PyTuple_New(1); - if (args == NULL) + } + else if (!issubclass) { + PyErr_SetString(PyExc_TypeError, "expected a subclass of ImportError"); return NULL; + } - kwargs = PyDict_New(); - if (kwargs == NULL) { - Py_DECREF(args); + if (msg == NULL) { + PyErr_SetString(PyExc_TypeError, "expected a message argument"); return NULL; } if (name == NULL) { name = Py_None; } - if (path == NULL) { path = Py_None; } - Py_INCREF(msg); - PyTuple_SET_ITEM(args, 0, msg); - - if (PyDict_SetItemString(kwargs, "name", name) < 0) + kwargs = PyDict_New(); + if (kwargs == NULL) { + return NULL; + } + if (PyDict_SetItemString(kwargs, "name", name) < 0) { goto done; - if (PyDict_SetItemString(kwargs, "path", path) < 0) + } + if (PyDict_SetItemString(kwargs, "path", path) < 0) { goto done; + } - error = PyObject_Call(PyExc_ImportError, args, kwargs); + error = _PyObject_FastCallDict(exception, &msg, 1, kwargs); if (error != NULL) { PyErr_SetObject((PyObject *)Py_TYPE(error), error); Py_DECREF(error); } done: - Py_DECREF(args); Py_DECREF(kwargs); return NULL; } +PyObject * +PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path) +{ + return PyErr_SetImportErrorSubclass(PyExc_ImportError, msg, name, path); +} + void _PyErr_BadInternalCall(const char *filename, int lineno) { @@ -1009,15 +1059,16 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset) PyErr_Clear(); Py_DECREF(tmp); } - tmp = NULL; if (col_offset >= 0) { tmp = PyLong_FromLong(col_offset); if (tmp == NULL) PyErr_Clear(); + else { + if (_PyObject_SetAttrId(v, &PyId_offset, tmp)) + PyErr_Clear(); + Py_DECREF(tmp); + } } - if (_PyObject_SetAttrId(v, &PyId_offset, tmp ? tmp : Py_None)) - PyErr_Clear(); - Py_XDECREF(tmp); if (filename != NULL) { if (_PyObject_SetAttrId(v, &PyId_filename, filename)) PyErr_Clear(); @@ -1029,6 +1080,9 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset) Py_DECREF(tmp); } } + if (_PyObject_SetAttrId(v, &PyId_offset, Py_None)) { + PyErr_Clear(); + } if (exc != PyExc_SyntaxError) { if (!_PyObject_HasAttrId(v, &PyId_msg)) { tmp = PyObject_Str(v); @@ -1094,8 +1148,11 @@ err_programtext(FILE *fp, int lineno) } fclose(fp); if (i == lineno) { + char *p = linebuf; PyObject *res; - res = PyUnicode_FromString(linebuf); + while (*p == ' ' || *p == '\t' || *p == '\014') + p++; + res = PyUnicode_FromString(p); if (res == NULL) PyErr_Clear(); return res; diff --git a/Python/fileutils.c b/Python/fileutils.c index 5072118..6a32c42 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -44,7 +44,7 @@ _Py_device_encoding(int fd) #endif int valid; _Py_BEGIN_SUPPRESS_IPH - valid = _PyVerify_fd(fd) && isatty(fd); + valid = isatty(fd); _Py_END_SUPPRESS_IPH if (!valid) Py_RETURN_NONE; @@ -104,23 +104,24 @@ check_force_ascii(void) char *loc; #if defined(HAVE_LANGINFO_H) && defined(CODESET) char *codeset, **alias; - char encoding[100]; + char encoding[20]; /* longest name: "iso_646.irv_1991\0" */ int is_ascii; unsigned int i; char* ascii_aliases[] = { "ascii", + /* Aliases from Lib/encodings/aliases.py */ "646", - "ansi-x3.4-1968", - "ansi-x3-4-1968", - "ansi-x3.4-1986", + "ansi_x3.4_1968", + "ansi_x3.4_1986", + "ansi_x3_4_1968", "cp367", "csascii", "ibm367", - "iso646-us", - "iso-646.irv-1991", - "iso-ir-6", + "iso646_us", + "iso_646.irv_1991", + "iso_ir_6", "us", - "us-ascii", + "us_ascii", NULL }; #endif @@ -613,13 +614,9 @@ _Py_fstat_noraise(int fd, struct _Py_stat_struct *status) HANDLE h; int type; - if (!_PyVerify_fd(fd)) - h = INVALID_HANDLE_VALUE; - else { - _Py_BEGIN_SUPPRESS_IPH - h = (HANDLE)_get_osfhandle(fd); - _Py_END_SUPPRESS_IPH - } + _Py_BEGIN_SUPPRESS_IPH + h = (HANDLE)_get_osfhandle(fd); + _Py_END_SUPPRESS_IPH if (h == INVALID_HANDLE_VALUE) { /* errno is already set by _get_osfhandle, but we also set @@ -683,6 +680,10 @@ _Py_fstat(int fd, struct _Py_stat_struct *status) { int res; +#ifdef WITH_THREAD + assert(PyGILState_Check()); +#endif + Py_BEGIN_ALLOW_THREADS res = _Py_fstat_noraise(fd, status); Py_END_ALLOW_THREADS @@ -710,32 +711,21 @@ _Py_stat(PyObject *path, struct stat *statbuf) #ifdef MS_WINDOWS int err; struct _stat wstatbuf; - const wchar_t *wpath; + wchar_t *wpath; - wpath = _PyUnicode_AsUnicode(path); + wpath = PyUnicode_AsUnicode(path); if (wpath == NULL) return -2; - err = _wstat(wpath, &wstatbuf); if (!err) statbuf->st_mode = wstatbuf.st_mode; return err; #else int ret; - PyObject *bytes; - char *cpath; - - bytes = PyUnicode_EncodeFSDefault(path); + PyObject *bytes = PyUnicode_EncodeFSDefault(path); if (bytes == NULL) return -2; - - /* check for embedded null bytes */ - if (PyBytes_AsStringAndSize(bytes, &cpath, NULL) == -1) { - Py_DECREF(bytes); - return -2; - } - - ret = stat(cpath, statbuf); + ret = stat(PyBytes_AS_STRING(bytes), statbuf); Py_DECREF(bytes); return ret; #endif @@ -749,12 +739,6 @@ get_inheritable(int fd, int raise) HANDLE handle; DWORD flags; - if (!_PyVerify_fd(fd)) { - if (raise) - PyErr_SetFromErrno(PyExc_OSError); - return -1; - } - _Py_BEGIN_SUPPRESS_IPH handle = (HANDLE)_get_osfhandle(fd); _Py_END_SUPPRESS_IPH @@ -805,7 +789,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) int request; int err; #endif - int flags; + int flags, new_flags; int res; #endif @@ -826,12 +810,6 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) } #ifdef MS_WINDOWS - if (!_PyVerify_fd(fd)) { - if (raise) - PyErr_SetFromErrno(PyExc_OSError); - return -1; - } - _Py_BEGIN_SUPPRESS_IPH handle = (HANDLE)_get_osfhandle(fd); _Py_END_SUPPRESS_IPH @@ -896,11 +874,19 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) return -1; } - if (inheritable) - flags &= ~FD_CLOEXEC; - else - flags |= FD_CLOEXEC; - res = fcntl(fd, F_SETFD, flags); + if (inheritable) { + new_flags = flags & ~FD_CLOEXEC; + } + else { + new_flags = flags | FD_CLOEXEC; + } + + if (new_flags == flags) { + /* FD_CLOEXEC flag already set/cleared: nothing to do */ + return 0; + } + + res = fcntl(fd, F_SETFD, new_flags); if (res < 0) { if (raise) PyErr_SetFromErrno(PyExc_OSError); @@ -1094,7 +1080,7 @@ _Py_fopen_obj(PyObject *path, const char *mode) FILE *f; int async_err = 0; #ifdef MS_WINDOWS - const wchar_t *wpath; + wchar_t *wpath; wchar_t wmode[10]; int usize; @@ -1108,7 +1094,7 @@ _Py_fopen_obj(PyObject *path, const char *mode) Py_TYPE(path)); return NULL; } - wpath = _PyUnicode_AsUnicode(path); + wpath = PyUnicode_AsUnicode(path); if (wpath == NULL) return NULL; @@ -1180,19 +1166,15 @@ _Py_read(int fd, void *buf, size_t count) int err; int async_err = 0; +#ifdef WITH_THREAD + assert(PyGILState_Check()); +#endif + /* _Py_read() must not be called with an exception set, otherwise the * caller may think that read() was interrupted by a signal and the signal * handler raised an exception. */ assert(!PyErr_Occurred()); - if (!_PyVerify_fd(fd)) { - /* save/restore errno because PyErr_SetFromErrno() can modify it */ - err = errno; - PyErr_SetFromErrno(PyExc_OSError); - errno = err; - return -1; - } - #ifdef MS_WINDOWS if (count > INT_MAX) { /* On Windows, the count parameter of read() is an int */ @@ -1246,16 +1228,6 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) int err; int async_err = 0; - if (!_PyVerify_fd(fd)) { - if (gil_held) { - /* save/restore errno because PyErr_SetFromErrno() can modify it */ - err = errno; - PyErr_SetFromErrno(PyExc_OSError); - errno = err; - } - return -1; - } - _Py_BEGIN_SUPPRESS_IPH #ifdef MS_WINDOWS if (count > 32767 && isatty(fd)) { @@ -1335,6 +1307,10 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) Py_ssize_t _Py_write(int fd, const void *buf, size_t count) { +#ifdef WITH_THREAD + assert(PyGILState_Check()); +#endif + /* _Py_write() must not be called with an exception set, otherwise the * caller may think that write() was interrupted by a signal and the signal * handler raised an exception. */ @@ -1484,10 +1460,9 @@ _Py_dup(int fd) DWORD ftype; #endif - if (!_PyVerify_fd(fd)) { - PyErr_SetFromErrno(PyExc_OSError); - return -1; - } +#ifdef WITH_THREAD + assert(PyGILState_Check()); +#endif #ifdef MS_WINDOWS _Py_BEGIN_SUPPRESS_IPH @@ -1611,84 +1586,3 @@ error: return -1; } #endif - -#if defined _MSC_VER && _MSC_VER >= 1400 && _MSC_VER < 1900 -/* Legacy implementation of _PyVerify_fd while transitioning to - * MSVC 14.0. This should eventually be removed. (issue23524) - */ - -/* Microsoft CRT in VS2005 and higher will verify that a filehandle is - * valid and raise an assertion if it isn't. - * Normally, an invalid fd is likely to be a C program error and therefore - * an assertion can be useful, but it does contradict the POSIX standard - * which for write(2) states: - * "Otherwise, -1 shall be returned and errno set to indicate the error." - * "[EBADF] The fildes argument is not a valid file descriptor open for - * writing." - * Furthermore, python allows the user to enter any old integer - * as a fd and should merely raise a python exception on error. - * The Microsoft CRT doesn't provide an official way to check for the - * validity of a file descriptor, but we can emulate its internal behaviour - * by using the exported __pinfo data member and knowledge of the - * internal structures involved. - * The structures below must be updated for each version of visual studio - * according to the file internal.h in the CRT source, until MS comes - * up with a less hacky way to do this. - * (all of this is to avoid globally modifying the CRT behaviour using - * _set_invalid_parameter_handler() and _CrtSetReportMode()) - */ -/* The actual size of the structure is determined at runtime. - * Only the first items must be present. - */ -typedef struct { - intptr_t osfhnd; - char osfile; -} my_ioinfo; - -extern __declspec(dllimport) char * __pioinfo[]; -#define IOINFO_L2E 5 -#define IOINFO_ARRAYS 64 -#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) -#define _NHANDLE_ (IOINFO_ARRAYS * IOINFO_ARRAY_ELTS) -#define FOPEN 0x01 -#define _NO_CONSOLE_FILENO (intptr_t)-2 - -/* This function emulates what the windows CRT does to validate file handles */ -int -_PyVerify_fd(int fd) -{ - const int i1 = fd >> IOINFO_L2E; - const int i2 = fd & ((1 << IOINFO_L2E) - 1); - - static size_t sizeof_ioinfo = 0; - - /* Determine the actual size of the ioinfo structure, - * as used by the CRT loaded in memory - */ - if (sizeof_ioinfo == 0 && __pioinfo[0] != NULL) { - sizeof_ioinfo = _msize(__pioinfo[0]) / IOINFO_ARRAY_ELTS; - } - if (sizeof_ioinfo == 0) { - /* This should not happen... */ - goto fail; - } - - /* See that it isn't a special CLEAR fileno */ - if (fd != _NO_CONSOLE_FILENO) { - /* Microsoft CRT would check that 0<=fd<_nhandle but we can't do that. Instead - * we check pointer validity and other info - */ - if (0 <= i1 && i1 < IOINFO_ARRAYS && __pioinfo[i1] != NULL) { - /* finally, check that the file is open */ - my_ioinfo* info = (my_ioinfo*)(__pioinfo[i1] + i2 * sizeof_ioinfo); - if (info->osfile & FOPEN) { - return 1; - } - } - } - fail: - errno = EBADF; - return 0; -} - -#endif /* defined _MSC_VER && _MSC_VER >= 1400 && _MSC_VER < 1900 */ diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index 617d58b..a2c2b36 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -32,14 +32,20 @@ invalid_comma_type(Py_UCS4 presentation_type) { if (presentation_type > 32 && presentation_type < 128) PyErr_Format(PyExc_ValueError, - "Cannot specify ',' with '%c'.", + "Cannot specify ',' or '_' with '%c'.", (char)presentation_type); else PyErr_Format(PyExc_ValueError, - "Cannot specify ',' with '\\x%x'.", + "Cannot specify ',' or '_' with '\\x%x'.", (unsigned int)presentation_type); } +static void +invalid_comma_and_underscore(void) +{ + PyErr_Format(PyExc_ValueError, "Cannot specify both ',' and '_'."); +} + /* get_integer consumes 0 or more decimal digit characters from an input string, updates *result with the corresponding positive @@ -48,16 +54,17 @@ invalid_comma_type(Py_UCS4 presentation_type) returns -1 on error. */ static int -get_integer(PyObject *str, Py_ssize_t *pos, Py_ssize_t end, +get_integer(PyObject *str, Py_ssize_t *ppos, Py_ssize_t end, Py_ssize_t *result) { - Py_ssize_t accumulator, digitval; + Py_ssize_t accumulator, digitval, pos = *ppos; int numdigits; + int kind = PyUnicode_KIND(str); + void *data = PyUnicode_DATA(str); + accumulator = numdigits = 0; - for (;;(*pos)++, numdigits++) { - if (*pos >= end) - break; - digitval = Py_UNICODE_TODECIMAL(PyUnicode_READ_CHAR(str, *pos)); + for (; pos < end; pos++, numdigits++) { + digitval = Py_UNICODE_TODECIMAL(PyUnicode_READ(kind, data, pos)); if (digitval < 0) break; /* @@ -69,10 +76,12 @@ get_integer(PyObject *str, Py_ssize_t *pos, Py_ssize_t end, if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); + *ppos = pos; return -1; } accumulator = accumulator * 10 + digitval; } + *ppos = pos; *result = accumulator; return numdigits; } @@ -105,6 +114,14 @@ is_sign_element(Py_UCS4 c) } } +/* Locale type codes. LT_NO_LOCALE must be zero. */ +enum LocaleType { + LT_NO_LOCALE = 0, + LT_DEFAULT_LOCALE, + LT_UNDERSCORE_LOCALE, + LT_UNDER_FOUR_LOCALE, + LT_CURRENT_LOCALE +}; typedef struct { Py_UCS4 fill_char; @@ -112,7 +129,7 @@ typedef struct { int alternate; Py_UCS4 sign; Py_ssize_t width; - int thousands_separators; + enum LocaleType thousands_separators; Py_ssize_t precision; Py_UCS4 type; } InternalFormatSpec; @@ -150,9 +167,11 @@ parse_internal_render_format_spec(PyObject *format_spec, char default_align) { Py_ssize_t pos = start; + int kind = PyUnicode_KIND(format_spec); + void *data = PyUnicode_DATA(format_spec); /* end-pos is used throughout this code to specify the length of the input string */ -#define READ_spec(index) PyUnicode_READ_CHAR(format_spec, index) +#define READ_spec(index) PyUnicode_READ(kind, data, index) Py_ssize_t consumed; int align_specified = 0; @@ -163,7 +182,7 @@ parse_internal_render_format_spec(PyObject *format_spec, format->alternate = 0; format->sign = '\0'; format->width = -1; - format->thousands_separators = 0; + format->thousands_separators = LT_NO_LOCALE; format->precision = -1; format->type = default_type; @@ -218,9 +237,22 @@ parse_internal_render_format_spec(PyObject *format_spec, /* Comma signifies add thousands separators */ if (end-pos && READ_spec(pos) == ',') { - format->thousands_separators = 1; + format->thousands_separators = LT_DEFAULT_LOCALE; + ++pos; + } + /* Underscore signifies add thousands separators */ + if (end-pos && READ_spec(pos) == '_') { + if (format->thousands_separators != LT_NO_LOCALE) { + invalid_comma_and_underscore(); + return 0; + } + format->thousands_separators = LT_UNDERSCORE_LOCALE; ++pos; } + if (end-pos && READ_spec(pos) == ',') { + invalid_comma_and_underscore(); + return 0; + } /* Parse field precision */ if (end-pos && READ_spec(pos) == '.') { @@ -270,6 +302,16 @@ parse_internal_render_format_spec(PyObject *format_spec, case '\0': /* These are allowed. See PEP 378.*/ break; + case 'b': + case 'o': + case 'x': + case 'X': + /* Underscores are allowed in bin/oct/hex. See PEP 515. */ + if (format->thousands_separators == LT_UNDERSCORE_LOCALE) { + /* Every four digits, not every three, in bin/oct/hex. */ + format->thousands_separators = LT_UNDER_FOUR_LOCALE; + break; + } default: invalid_comma_type(format->type); return 0; @@ -346,13 +388,6 @@ fill_padding(_PyUnicodeWriter *writer, /*********** common routines for numeric formatting *********************/ /************************************************************************/ -/* Locale type codes. */ -enum LocaleType { - LT_CURRENT_LOCALE, - LT_DEFAULT_LOCALE, - LT_NO_LOCALE -}; - /* Locale info needed for formatting integers and the part of floats before and including the decimal. Note that locales only support 8-bit chars, not unicode. */ @@ -404,13 +439,15 @@ parse_number(PyObject *s, Py_ssize_t pos, Py_ssize_t end, Py_ssize_t *n_remainder, int *has_decimal) { Py_ssize_t remainder; + int kind = PyUnicode_KIND(s); + void *data = PyUnicode_DATA(s); - while (posdecimal_point = PyUnicode_FromOrdinal('.'); - locale_info->thousands_sep = PyUnicode_FromOrdinal(','); + locale_info->thousands_sep = PyUnicode_FromOrdinal( + type == LT_DEFAULT_LOCALE ? ',' : '_'); if (!locale_info->decimal_point || !locale_info->thousands_sep) return -1; - locale_info->grouping = "\3"; /* Group every 3 characters. The + if (type != LT_UNDER_FOUR_LOCALE) + locale_info->grouping = "\3"; /* Group every 3 characters. The (implicit) trailing 0 means repeat infinitely. */ + else + locale_info->grouping = "\4"; /* Bin/oct/hex group every four. */ break; case LT_NO_LOCALE: locale_info->decimal_point = PyUnicode_FromOrdinal('.'); @@ -937,9 +980,7 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format, /* Determine the grouping, separator, and decimal point, if any. */ if (get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE : - (format->thousands_separators ? - LT_DEFAULT_LOCALE : - LT_NO_LOCALE), + format->thousands_separators, &locale) == -1) goto done; @@ -1084,9 +1125,7 @@ format_float_internal(PyObject *value, /* Determine the grouping, separator, and decimal point, if any. */ if (get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE : - (format->thousands_separators ? - LT_DEFAULT_LOCALE : - LT_NO_LOCALE), + format->thousands_separators, &locale) == -1) goto done; @@ -1262,9 +1301,7 @@ format_complex_internal(PyObject *value, /* Determine the grouping, separator, and decimal point, if any. */ if (get_locale_info(format->type == 'n' ? LT_CURRENT_LOCALE : - (format->thousands_separators ? - LT_DEFAULT_LOCALE : - LT_NO_LOCALE), + format->thousands_separators, &locale) == -1) goto done; diff --git a/Python/frozen.c b/Python/frozen.c index 676f395..7e04f3c 100644 --- a/Python/frozen.c +++ b/Python/frozen.c @@ -14,17 +14,15 @@ the appropriate bytes from M___main__.c. */ static unsigned char M___hello__[] = { - 99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0, - 0,64,0,0,0,115,20,0,0,0,100,2,0,90,1,0, - 101,2,0,100,0,0,131,1,0,1,100,1,0,83,40,3, - 0,0,0,117,12,0,0,0,72,101,108,108,111,32,119,111, - 114,108,100,33,78,84,40,3,0,0,0,117,4,0,0,0, - 84,114,117,101,117,11,0,0,0,105,110,105,116,105,97,108, - 105,122,101,100,117,5,0,0,0,112,114,105,110,116,40,0, - 0,0,0,40,0,0,0,0,40,0,0,0,0,117,7,0, - 0,0,102,108,97,103,46,112,121,117,8,0,0,0,60,109, - 111,100,117,108,101,62,1,0,0,0,115,2,0,0,0,6, - 1, + 227,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0, + 0,64,0,0,0,115,16,0,0,0,100,0,90,0,101,1, + 100,1,131,1,1,0,100,2,83,0,41,3,84,122,12,72, + 101,108,108,111,32,119,111,114,108,100,33,78,41,2,218,11, + 105,110,105,116,105,97,108,105,122,101,100,218,5,112,114,105, + 110,116,169,0,114,3,0,0,0,114,3,0,0,0,250,22, + 46,47,84,111,111,108,115,47,102,114,101,101,122,101,47,102, + 108,97,103,46,112,121,218,8,60,109,111,100,117,108,101,62, + 1,0,0,0,115,2,0,0,0,4,1, }; #define SIZE (int)sizeof(M___hello__) diff --git a/Python/frozenmain.c b/Python/frozenmain.c index de8bd35..769b33d 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -99,7 +99,9 @@ Py_FrozenMain(int argc, char **argv) #ifdef MS_WINDOWS PyWinFreeze_ExeTerm(); #endif - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + sts = 120; + } error: PyMem_RawFree(argv_copy); diff --git a/Python/future.c b/Python/future.c index 4de801b..9c1f430 100644 --- a/Python/future.c +++ b/Python/future.c @@ -21,7 +21,7 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, PyObject *filename) names = s->v.ImportFrom.names; for (i = 0; i < asdl_seq_LEN(names); i++) { alias_ty name = (alias_ty)asdl_seq_GET(names, i); - const char *feature = _PyUnicode_AsString(name->name); + const char *feature = PyUnicode_AsUTF8(name->name); if (!feature) return 0; if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) { @@ -79,7 +79,10 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename) i = 0; first = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i); - if (first->kind == Expr_kind && first->v.Expr.value->kind == Str_kind) + if (first->kind == Expr_kind + && (first->v.Expr.value->kind == Str_kind + || (first->v.Expr.value->kind == Constant_kind + && PyUnicode_CheckExact(first->v.Expr.value->v.Constant.value)))) i++; diff --git a/Python/getargs.c b/Python/getargs.c index b10e776..616c6eb 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -18,16 +18,28 @@ int PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, int PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, const char *, char **, va_list); +int _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, ...); +int _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, va_list); + #ifdef HAVE_DECLSPEC_DLL /* Export functions */ -PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, char *, ...); -PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, char *, ...); +PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, const char *, ...); +PyAPI_FUNC(int) _PyArg_ParseStack_SizeT(PyObject **args, Py_ssize_t nargs, PyObject *kwnames, + struct _PyArg_Parser *parser, ...); +PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, const char *, ...); PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywords_SizeT(PyObject *, PyObject *, const char *, char **, ...); PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); -PyAPI_FUNC(int) _PyArg_VaParse_SizeT(PyObject *, char *, va_list); +PyAPI_FUNC(int) _PyArg_VaParse_SizeT(PyObject *, const char *, va_list); PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *, PyObject *, const char *, char **, va_list); + +PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast_SizeT(PyObject *, PyObject *, + struct _PyArg_Parser *, ...); +PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *, PyObject *, + struct _PyArg_Parser *, va_list); #endif #define FLAG_COMPAT 1 @@ -56,18 +68,24 @@ typedef struct { /* Forward */ static int vgetargs1(PyObject *, const char *, va_list *, int); static void seterror(Py_ssize_t, const char *, int *, const char *, const char *); -static char *convertitem(PyObject *, const char **, va_list *, int, int *, - char *, size_t, freelist_t *); -static char *converttuple(PyObject *, const char **, va_list *, int, - int *, char *, size_t, int, freelist_t *); -static char *convertsimple(PyObject *, const char **, va_list *, int, char *, - size_t, freelist_t *); -static Py_ssize_t convertbuffer(PyObject *, void **p, char **); -static int getbuffer(PyObject *, Py_buffer *, char**); +static const char *convertitem(PyObject *, const char **, va_list *, int, int *, + char *, size_t, freelist_t *); +static const char *converttuple(PyObject *, const char **, va_list *, int, + int *, char *, size_t, int, freelist_t *); +static const char *convertsimple(PyObject *, const char **, va_list *, int, + char *, size_t, freelist_t *); +static Py_ssize_t convertbuffer(PyObject *, void **p, const char **); +static int getbuffer(PyObject *, Py_buffer *, const char**); static int vgetargskeywords(PyObject *, PyObject *, const char *, char **, va_list *, int); -static char *skipitem(const char **, va_list *, int); +static int vgetargskeywordsfast(PyObject *, PyObject *, + struct _PyArg_Parser *, va_list *, int); +static int vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs, + PyObject *keywords, PyObject *kwnames, + struct _PyArg_Parser *parser, + va_list *p_va, int flags); +static const char *skipitem(const char **, va_list *, int); int PyArg_Parse(PyObject *args, const char *format, ...) @@ -82,7 +100,7 @@ PyArg_Parse(PyObject *args, const char *format, ...) } int -_PyArg_Parse_SizeT(PyObject *args, char *format, ...) +_PyArg_Parse_SizeT(PyObject *args, const char *format, ...) { int retval; va_list va; @@ -107,7 +125,7 @@ PyArg_ParseTuple(PyObject *args, const char *format, ...) } int -_PyArg_ParseTuple_SizeT(PyObject *args, char *format, ...) +_PyArg_ParseTuple_SizeT(PyObject *args, const char *format, ...) { int retval; va_list va; @@ -123,20 +141,26 @@ int PyArg_VaParse(PyObject *args, const char *format, va_list va) { va_list lva; + int retval; - Py_VA_COPY(lva, va); + va_copy(lva, va); - return vgetargs1(args, format, &lva, 0); + retval = vgetargs1(args, format, &lva, 0); + va_end(lva); + return retval; } int -_PyArg_VaParse_SizeT(PyObject *args, char *format, va_list va) +_PyArg_VaParse_SizeT(PyObject *args, const char *format, va_list va) { va_list lva; + int retval; - Py_VA_COPY(lva, va); + va_copy(lva, va); - return vgetargs1(args, format, &lva, FLAG_SIZE_T); + retval = vgetargs1(args, format, &lva, FLAG_SIZE_T); + va_end(lva); + return retval; } @@ -208,7 +232,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags) int endfmt = 0; const char *formatsave = format; Py_ssize_t i, len; - char *msg; + const char *msg; int compat = flags & FLAG_COMPAT; freelistentry_t static_entries[STATIC_FREELIST_ENTRIES]; freelist_t freelist; @@ -394,7 +418,12 @@ seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname, PyOS_snprintf(p, sizeof(buf) - (p - buf), " %.256s", msg); message = buf; } - PyErr_SetString(PyExc_TypeError, message); + if (msg[0] == '(') { + PyErr_SetString(PyExc_SystemError, message); + } + else { + PyErr_SetString(PyExc_TypeError, message); + } } @@ -416,7 +445,7 @@ seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname, and msgbuf is returned. */ -static char * +static const char * converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags, int *levels, char *msgbuf, size_t bufsize, int toplevel, freelist_t *freelist) @@ -474,7 +503,7 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags, format = *p_format; for (i = 0; i < n; i++) { - char *msg; + const char *msg; PyObject *item; item = PySequence_GetItem(arg, i); if (item == NULL) { @@ -501,11 +530,11 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags, /* Convert a single item. */ -static char * +static const char * convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags, int *levels, char *msgbuf, size_t bufsize, freelist_t *freelist) { - char *msg; + const char *msg; const char *format = *p_format; if (*format == '(' /* ')' */) { @@ -530,7 +559,7 @@ convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags, /* Format an error message generated by convertsimple(). */ -static char * +static const char * converterr(const char *expected, PyObject *arg, char *msgbuf, size_t bufsize) { assert(expected != NULL); @@ -572,7 +601,7 @@ float_argument_error(PyObject *arg) When you add new format codes, please don't forget poor skipitem() below. */ -static char * +static const char * convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, char *msgbuf, size_t bufsize, freelist_t *freelist) { @@ -752,14 +781,13 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, break; } -#ifdef HAVE_LONG_LONG - case 'L': {/* PY_LONG_LONG */ - PY_LONG_LONG *p = va_arg( *p_va, PY_LONG_LONG * ); - PY_LONG_LONG ival; + case 'L': {/* long long */ + long long *p = va_arg( *p_va, long long * ); + long long ival; if (float_argument_error(arg)) RETURN_ERR_OCCURRED; ival = PyLong_AsLongLong(arg); - if (ival == (PY_LONG_LONG)-1 && PyErr_Occurred()) + if (ival == (long long)-1 && PyErr_Occurred()) RETURN_ERR_OCCURRED; else *p = ival; @@ -767,8 +795,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } case 'K': { /* long long sized bitfield */ - unsigned PY_LONG_LONG *p = va_arg(*p_va, unsigned PY_LONG_LONG *); - unsigned PY_LONG_LONG ival; + unsigned long long *p = va_arg(*p_va, unsigned long long *); + unsigned long long ival; if (PyLong_Check(arg)) ival = PyLong_AsUnsignedLongLongMask(arg); else @@ -776,7 +804,6 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, *p = ival; break; } -#endif case 'f': {/* float */ float *p = va_arg(*p_va, float *); @@ -857,7 +884,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, case 'y': {/* any bytes-like object */ void **p = (void **)va_arg(*p_va, char **); - char *buf; + const char *buf; Py_ssize_t count; if (*format == '*') { if (getbuffer(arg, (Py_buffer*)p, &buf) < 0) @@ -904,7 +931,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, PyBuffer_FillInfo(p, arg, sarg, len, 1, 0); } else { /* any bytes-like object */ - char *buf; + const char *buf; if (getbuffer(arg, p, &buf) < 0) return converterr(buf, arg, msgbuf, bufsize); } @@ -934,7 +961,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } else { /* read-only bytes-like object */ /* XXX Really? */ - char *buf; + const char *buf; Py_ssize_t count = convertbuffer(arg, p, &buf); if (count < 0) return converterr(buf, arg, msgbuf, bufsize); @@ -1051,35 +1078,25 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, return converterr("(AsCharBuffer failed)", arg, msgbuf, bufsize); } - else { - PyObject *u; - - /* Convert object to Unicode */ - u = PyUnicode_FromObject(arg); - if (u == NULL) - return converterr( - "string or unicode or text buffer", - arg, msgbuf, bufsize); - + else if (PyUnicode_Check(arg)) { /* Encode object; use default error handling */ - s = PyUnicode_AsEncodedString(u, + s = PyUnicode_AsEncodedString(arg, encoding, NULL); - Py_DECREF(u); if (s == NULL) return converterr("(encoding failed)", arg, msgbuf, bufsize); - if (!PyBytes_Check(s)) { - Py_DECREF(s); - return converterr( - "(encoder failed to return bytes)", - arg, msgbuf, bufsize); - } + assert(PyBytes_Check(s)); size = PyBytes_GET_SIZE(s); ptr = PyBytes_AS_STRING(s); if (ptr == NULL) ptr = ""; } + else { + return converterr( + recode_strings ? "str" : "str, bytes or bytearray", + arg, msgbuf, bufsize); + } /* Write output; output is guaranteed to be 0-terminated */ if (*format == '#') { @@ -1129,7 +1146,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } else { if (size + 1 > BUFFER_LEN) { Py_DECREF(s); - PyErr_Format(PyExc_TypeError, + PyErr_Format(PyExc_ValueError, "encoded string too long " "(%zd, maximum length %zd)", (Py_ssize_t)size, (Py_ssize_t)(BUFFER_LEN-1)); @@ -1283,7 +1300,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } static Py_ssize_t -convertbuffer(PyObject *arg, void **p, char **errmsg) +convertbuffer(PyObject *arg, void **p, const char **errmsg) { PyBufferProcs *pb = Py_TYPE(arg)->tp_as_buffer; Py_ssize_t count; @@ -1305,7 +1322,7 @@ convertbuffer(PyObject *arg, void **p, char **errmsg) } static int -getbuffer(PyObject *arg, Py_buffer *view, char **errmsg) +getbuffer(PyObject *arg, Py_buffer *view, const char **errmsg) { if (PyObject_GetBuffer(arg, view, PyBUF_SIMPLE) != 0) { *errmsg = "bytes-like object"; @@ -1391,9 +1408,10 @@ PyArg_VaParseTupleAndKeywords(PyObject *args, return 0; } - Py_VA_COPY(lva, va); + va_copy(lva, va); retval = vgetargskeywords(args, keywords, format, kwlist, &lva, 0); + va_end(lva); return retval; } @@ -1415,10 +1433,138 @@ _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args, return 0; } - Py_VA_COPY(lva, va); + va_copy(lva, va); retval = vgetargskeywords(args, keywords, format, kwlist, &lva, FLAG_SIZE_T); + va_end(lva); + return retval; +} + +int +_PyArg_ParseTupleAndKeywordsFast(PyObject *args, PyObject *keywords, + struct _PyArg_Parser *parser, ...) +{ + int retval; + va_list va; + + if ((args == NULL || !PyTuple_Check(args)) || + (keywords != NULL && !PyDict_Check(keywords)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_start(va, parser); + retval = vgetargskeywordsfast(args, keywords, parser, &va, 0); + va_end(va); + return retval; +} + +int +_PyArg_ParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords, + struct _PyArg_Parser *parser, ...) +{ + int retval; + va_list va; + + if ((args == NULL || !PyTuple_Check(args)) || + (keywords != NULL && !PyDict_Check(keywords)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_start(va, parser); + retval = vgetargskeywordsfast(args, keywords, parser, &va, FLAG_SIZE_T); + va_end(va); + return retval; +} + +int +_PyArg_ParseStack(PyObject **args, Py_ssize_t nargs, PyObject *kwnames, + struct _PyArg_Parser *parser, ...) +{ + int retval; + va_list va; + + if ((kwnames != NULL && !PyTuple_Check(kwnames)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_start(va, parser); + retval = vgetargskeywordsfast_impl(args, nargs, NULL, kwnames, parser, &va, 0); + va_end(va); + return retval; +} + +int +_PyArg_ParseStack_SizeT(PyObject **args, Py_ssize_t nargs, PyObject *kwnames, + struct _PyArg_Parser *parser, ...) +{ + int retval; + va_list va; + + if ((kwnames != NULL && !PyTuple_Check(kwnames)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_start(va, parser); + retval = vgetargskeywordsfast_impl(args, nargs, NULL, kwnames, parser, &va, FLAG_SIZE_T); + va_end(va); + return retval; +} + + +int +_PyArg_VaParseTupleAndKeywordsFast(PyObject *args, PyObject *keywords, + struct _PyArg_Parser *parser, va_list va) +{ + int retval; + va_list lva; + + if ((args == NULL || !PyTuple_Check(args)) || + (keywords != NULL && !PyDict_Check(keywords)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_copy(lva, va); + + retval = vgetargskeywordsfast(args, keywords, parser, &lva, 0); + va_end(lva); + return retval; +} + +int +_PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords, + struct _PyArg_Parser *parser, va_list va) +{ + int retval; + va_list lva; + + if ((args == NULL || !PyTuple_Check(args)) || + (keywords != NULL && !PyDict_Check(keywords)) || + parser == NULL) + { + PyErr_BadInternalCall(); + return 0; + } + + va_copy(lva, va); + + retval = vgetargskeywordsfast(args, keywords, parser, &lva, FLAG_SIZE_T); + va_end(lva); return retval; } @@ -1448,7 +1594,8 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, const char *fname, *msg, *custom_msg, *keyword; int min = INT_MAX; int max = INT_MAX; - int i, len; + int i, pos, len; + int skip = 0; Py_ssize_t nargs, nkeywords; PyObject *current_arg; freelistentry_t static_entries[STATIC_FREELIST_ENTRIES]; @@ -1476,9 +1623,17 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, custom_msg++; } + /* scan kwlist and count the number of positional-only parameters */ + for (pos = 0; kwlist[pos] && !*kwlist[pos]; pos++) { + } /* scan kwlist and get greatest possible nbr of args */ - for (len=0; kwlist[len]; len++) - continue; + for (len = pos; kwlist[len]; len++) { + if (!*kwlist[len]) { + PyErr_SetString(PyExc_SystemError, + "Empty keyword parameter name"); + return cleanreturn(0, &freelist); + } + } if (len > STATIC_FREELIST_ENTRIES) { freelist.entries = PyMem_NEW(freelistentry_t, len); @@ -1507,7 +1662,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, keyword = kwlist[i]; if (*format == '|') { if (min != INT_MAX) { - PyErr_SetString(PyExc_RuntimeError, + PyErr_SetString(PyExc_SystemError, "Invalid format string (| specified twice)"); return cleanreturn(0, &freelist); } @@ -1516,14 +1671,14 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, format++; if (max != INT_MAX) { - PyErr_SetString(PyExc_RuntimeError, + PyErr_SetString(PyExc_SystemError, "Invalid format string ($ before |)"); return cleanreturn(0, &freelist); } } if (*format == '$') { if (max != INT_MAX) { - PyErr_SetString(PyExc_RuntimeError, + PyErr_SetString(PyExc_SystemError, "Invalid format string ($ specified twice)"); return cleanreturn(0, &freelist); } @@ -1531,6 +1686,17 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, max = i; format++; + if (max < pos) { + PyErr_SetString(PyExc_SystemError, + "Empty parameter name after $"); + return cleanreturn(0, &freelist); + } + if (skip) { + /* Now we know the minimal and the maximal numbers of + * positional arguments and can raise an exception with + * informative message (see below). */ + break; + } if (max < nargs) { PyErr_Format(PyExc_TypeError, "Function takes %s %d positional arguments" @@ -1541,66 +1707,90 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, } } if (IS_END_OF_FORMAT(*format)) { - PyErr_Format(PyExc_RuntimeError, + PyErr_Format(PyExc_SystemError, "More keyword list entries (%d) than " "format specifiers (%d)", len, i); return cleanreturn(0, &freelist); } - current_arg = NULL; - if (nkeywords) { - current_arg = PyDict_GetItemString(keywords, keyword); - } - if (current_arg) { - --nkeywords; - if (i < nargs) { - /* arg present in tuple and in dict */ - PyErr_Format(PyExc_TypeError, - "Argument given by name ('%s') " - "and position (%d)", - keyword, i+1); - return cleanreturn(0, &freelist); + if (!skip) { + current_arg = NULL; + if (nkeywords && i >= pos) { + current_arg = PyDict_GetItemString(keywords, keyword); + if (!current_arg && PyErr_Occurred()) { + return cleanreturn(0, &freelist); + } } - } - else if (nkeywords && PyErr_Occurred()) - return cleanreturn(0, &freelist); - else if (i < nargs) - current_arg = PyTuple_GET_ITEM(args, i); - - if (current_arg) { - msg = convertitem(current_arg, &format, p_va, flags, - levels, msgbuf, sizeof(msgbuf), &freelist); - if (msg) { - seterror(i+1, msg, levels, fname, custom_msg); - return cleanreturn(0, &freelist); + if (current_arg) { + --nkeywords; + if (i < nargs) { + /* arg present in tuple and in dict */ + PyErr_Format(PyExc_TypeError, + "Argument given by name ('%s') " + "and position (%d)", + keyword, i+1); + return cleanreturn(0, &freelist); + } + } + else if (i < nargs) + current_arg = PyTuple_GET_ITEM(args, i); + + if (current_arg) { + msg = convertitem(current_arg, &format, p_va, flags, + levels, msgbuf, sizeof(msgbuf), &freelist); + if (msg) { + seterror(i+1, msg, levels, fname, custom_msg); + return cleanreturn(0, &freelist); + } + continue; } - continue; - } - if (i < min) { - PyErr_Format(PyExc_TypeError, "Required argument " - "'%s' (pos %d) not found", - keyword, i+1); - return cleanreturn(0, &freelist); + if (i < min) { + if (i < pos) { + assert (min == INT_MAX); + assert (max == INT_MAX); + skip = 1; + /* At that moment we still don't know the minimal and + * the maximal numbers of positional arguments. Raising + * an exception is deferred until we encounter | and $ + * or the end of the format. */ + } + else { + PyErr_Format(PyExc_TypeError, "Required argument " + "'%s' (pos %d) not found", + keyword, i+1); + return cleanreturn(0, &freelist); + } + } + /* current code reports success when all required args + * fulfilled and no keyword args left, with no further + * validation. XXX Maybe skip this in debug build ? + */ + if (!nkeywords && !skip) { + return cleanreturn(1, &freelist); + } } - /* current code reports success when all required args - * fulfilled and no keyword args left, with no further - * validation. XXX Maybe skip this in debug build ? - */ - if (!nkeywords) - return cleanreturn(1, &freelist); /* We are into optional args, skip thru to any remaining * keyword args */ msg = skipitem(&format, p_va, flags); if (msg) { - PyErr_Format(PyExc_RuntimeError, "%s: '%s'", msg, + PyErr_Format(PyExc_SystemError, "%s: '%s'", msg, format); return cleanreturn(0, &freelist); } } + if (skip) { + PyErr_Format(PyExc_TypeError, + "Function takes %s %d positional arguments" + " (%d given)", + (Py_MIN(pos, min) < i) ? "at least" : "exactly", + Py_MIN(pos, min), nargs); + return cleanreturn(0, &freelist); + } + if (!IS_END_OF_FORMAT(*format) && (*format != '|') && (*format != '$')) { - PyErr_Format(PyExc_RuntimeError, + PyErr_Format(PyExc_SystemError, "more argument specifiers than keyword list entries " "(remaining format:'%s')", format); return cleanreturn(0, &freelist); @@ -1618,7 +1808,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, return cleanreturn(0, &freelist); } for (i = 0; i < len; i++) { - if (_PyUnicode_EqualToASCIIString(key, kwlist[i])) { + if (*kwlist[i] && _PyUnicode_EqualToASCIIString(key, kwlist[i])) { match = 1; break; } @@ -1637,7 +1827,388 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format, } -static char * +/* List of static parsers. */ +static struct _PyArg_Parser *static_arg_parsers = NULL; + +static int +parser_init(struct _PyArg_Parser *parser) +{ + const char * const *keywords; + const char *format, *msg; + int i, len, min, max, nkw; + PyObject *kwtuple; + + assert(parser->format != NULL); + assert(parser->keywords != NULL); + if (parser->kwtuple != NULL) { + return 1; + } + + /* grab the function name or custom error msg first (mutually exclusive) */ + parser->fname = strchr(parser->format, ':'); + if (parser->fname) { + parser->fname++; + parser->custom_msg = NULL; + } + else { + parser->custom_msg = strchr(parser->format,';'); + if (parser->custom_msg) + parser->custom_msg++; + } + + keywords = parser->keywords; + /* scan keywords and count the number of positional-only parameters */ + for (i = 0; keywords[i] && !*keywords[i]; i++) { + } + parser->pos = i; + /* scan keywords and get greatest possible nbr of args */ + for (; keywords[i]; i++) { + if (!*keywords[i]) { + PyErr_SetString(PyExc_SystemError, + "Empty keyword parameter name"); + return 0; + } + } + len = i; + + min = max = INT_MAX; + format = parser->format; + for (i = 0; i < len; i++) { + if (*format == '|') { + if (min != INT_MAX) { + PyErr_SetString(PyExc_SystemError, + "Invalid format string (| specified twice)"); + return 0; + } + if (max != INT_MAX) { + PyErr_SetString(PyExc_SystemError, + "Invalid format string ($ before |)"); + return 0; + } + min = i; + format++; + } + if (*format == '$') { + if (max != INT_MAX) { + PyErr_SetString(PyExc_SystemError, + "Invalid format string ($ specified twice)"); + return 0; + } + if (i < parser->pos) { + PyErr_SetString(PyExc_SystemError, + "Empty parameter name after $"); + return 0; + } + max = i; + format++; + } + if (IS_END_OF_FORMAT(*format)) { + PyErr_Format(PyExc_SystemError, + "More keyword list entries (%d) than " + "format specifiers (%d)", len, i); + return 0; + } + + msg = skipitem(&format, NULL, 0); + if (msg) { + PyErr_Format(PyExc_SystemError, "%s: '%s'", msg, + format); + return 0; + } + } + parser->min = Py_MIN(min, len); + parser->max = Py_MIN(max, len); + + if (!IS_END_OF_FORMAT(*format) && (*format != '|') && (*format != '$')) { + PyErr_Format(PyExc_SystemError, + "more argument specifiers than keyword list entries " + "(remaining format:'%s')", format); + return 0; + } + + nkw = len - parser->pos; + kwtuple = PyTuple_New(nkw); + if (kwtuple == NULL) { + return 0; + } + keywords = parser->keywords + parser->pos; + for (i = 0; i < nkw; i++) { + PyObject *str = PyUnicode_FromString(keywords[i]); + if (str == NULL) { + Py_DECREF(kwtuple); + return 0; + } + PyUnicode_InternInPlace(&str); + PyTuple_SET_ITEM(kwtuple, i, str); + } + parser->kwtuple = kwtuple; + + assert(parser->next == NULL); + parser->next = static_arg_parsers; + static_arg_parsers = parser; + return 1; +} + +static void +parser_clear(struct _PyArg_Parser *parser) +{ + Py_CLEAR(parser->kwtuple); +} + +static PyObject* +find_keyword(PyObject *kwnames, PyObject **kwstack, PyObject *key) +{ + Py_ssize_t i, nkwargs; + + nkwargs = PyTuple_GET_SIZE(kwnames); + for (i=0; i < nkwargs; i++) { + PyObject *kwname = PyTuple_GET_ITEM(kwnames, i); + + /* ptr==ptr should match in most cases since keyword keys + should be interned strings */ + if (kwname == key) { + return kwstack[i]; + } + if (!PyUnicode_Check(kwname)) { + /* ignore non-string keyword keys: + an error will be raised above */ + continue; + } + if (_PyUnicode_EQ(kwname, key)) { + return kwstack[i]; + } + } + return NULL; +} + +static int +vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs, + PyObject *keywords, PyObject *kwnames, + struct _PyArg_Parser *parser, + va_list *p_va, int flags) +{ + PyObject *kwtuple; + char msgbuf[512]; + int levels[32]; + const char *format; + const char *msg; + PyObject *keyword; + int i, pos, len; + Py_ssize_t nkeywords; + PyObject *current_arg; + freelistentry_t static_entries[STATIC_FREELIST_ENTRIES]; + freelist_t freelist; + PyObject **kwstack = NULL; + + freelist.entries = static_entries; + freelist.first_available = 0; + freelist.entries_malloced = 0; + + assert(keywords == NULL || PyDict_Check(keywords)); + assert(kwnames == NULL || PyTuple_Check(kwnames)); + assert((keywords != NULL || kwnames != NULL) + || (keywords == NULL && kwnames == NULL)); + assert(parser != NULL); + assert(p_va != NULL); + + if (!parser_init(parser)) { + return 0; + } + + kwtuple = parser->kwtuple; + pos = parser->pos; + len = pos + PyTuple_GET_SIZE(kwtuple); + + if (len > STATIC_FREELIST_ENTRIES) { + freelist.entries = PyMem_NEW(freelistentry_t, len); + if (freelist.entries == NULL) { + PyErr_NoMemory(); + return 0; + } + freelist.entries_malloced = 1; + } + + if (keywords != NULL) { + nkeywords = PyDict_Size(keywords); + } + else if (kwnames != NULL) { + nkeywords = PyTuple_GET_SIZE(kwnames); + kwstack = args + nargs; + } + else { + nkeywords = 0; + } + if (nargs + nkeywords > len) { + PyErr_Format(PyExc_TypeError, + "%s%s takes at most %d argument%s (%zd given)", + (parser->fname == NULL) ? "function" : parser->fname, + (parser->fname == NULL) ? "" : "()", + len, + (len == 1) ? "" : "s", + nargs + nkeywords); + return cleanreturn(0, &freelist); + } + if (parser->max < nargs) { + PyErr_Format(PyExc_TypeError, + "Function takes %s %d positional arguments (%d given)", + (parser->min != INT_MAX) ? "at most" : "exactly", + parser->max, nargs); + return cleanreturn(0, &freelist); + } + + format = parser->format; + /* convert tuple args and keyword args in same loop, using kwtuple to drive process */ + for (i = 0; i < len; i++) { + keyword = (i >= pos) ? PyTuple_GET_ITEM(kwtuple, i - pos) : NULL; + if (*format == '|') { + format++; + } + if (*format == '$') { + format++; + } + assert(!IS_END_OF_FORMAT(*format)); + + current_arg = NULL; + if (nkeywords && i >= pos) { + if (keywords != NULL) { + current_arg = PyDict_GetItem(keywords, keyword); + if (!current_arg && PyErr_Occurred()) { + return cleanreturn(0, &freelist); + } + } + else { + current_arg = find_keyword(kwnames, kwstack, keyword); + } + } + if (current_arg) { + --nkeywords; + if (i < nargs) { + /* arg present in tuple and in dict */ + PyErr_Format(PyExc_TypeError, + "Argument given by name ('%U') " + "and position (%d)", + keyword, i+1); + return cleanreturn(0, &freelist); + } + } + else if (i < nargs) { + current_arg = args[i]; + } + + if (current_arg) { + msg = convertitem(current_arg, &format, p_va, flags, + levels, msgbuf, sizeof(msgbuf), &freelist); + if (msg) { + seterror(i+1, msg, levels, parser->fname, parser->custom_msg); + return cleanreturn(0, &freelist); + } + continue; + } + + if (i < parser->min) { + /* Less arguments than required */ + if (i < pos) { + PyErr_Format(PyExc_TypeError, + "Function takes %s %d positional arguments" + " (%d given)", + (Py_MIN(pos, parser->min) < parser->max) ? "at least" : "exactly", + Py_MIN(pos, parser->min), nargs); + } + else { + PyErr_Format(PyExc_TypeError, "Required argument " + "'%U' (pos %d) not found", + keyword, i+1); + } + return cleanreturn(0, &freelist); + } + /* current code reports success when all required args + * fulfilled and no keyword args left, with no further + * validation. XXX Maybe skip this in debug build ? + */ + if (!nkeywords) { + return cleanreturn(1, &freelist); + } + + /* We are into optional args, skip thru to any remaining + * keyword args */ + msg = skipitem(&format, p_va, flags); + assert(msg == NULL); + } + + assert(IS_END_OF_FORMAT(*format) || (*format == '|') || (*format == '$')); + + /* make sure there are no extraneous keyword arguments */ + if (nkeywords > 0) { + if (keywords != NULL) { + PyObject *key, *value; + Py_ssize_t pos = 0; + while (PyDict_Next(keywords, &pos, &key, &value)) { + int match; + if (!PyUnicode_Check(key)) { + PyErr_SetString(PyExc_TypeError, + "keywords must be strings"); + return cleanreturn(0, &freelist); + } + match = PySequence_Contains(kwtuple, key); + if (match <= 0) { + if (!match) { + PyErr_Format(PyExc_TypeError, + "'%U' is an invalid keyword " + "argument for this function", + key); + } + return cleanreturn(0, &freelist); + } + } + } + else { + Py_ssize_t j, nkwargs; + + nkwargs = PyTuple_GET_SIZE(kwnames); + for (j=0; j < nkwargs; j++) { + PyObject *key = PyTuple_GET_ITEM(kwnames, j); + int match; + + if (!PyUnicode_Check(key)) { + PyErr_SetString(PyExc_TypeError, + "keywords must be strings"); + return cleanreturn(0, &freelist); + } + + match = PySequence_Contains(kwtuple, key); + if (match <= 0) { + if (!match) { + PyErr_Format(PyExc_TypeError, + "'%U' is an invalid keyword " + "argument for this function", + key); + } + return cleanreturn(0, &freelist); + } + } + } + } + + return cleanreturn(1, &freelist); +} + +static int +vgetargskeywordsfast(PyObject *args, PyObject *keywords, + struct _PyArg_Parser *parser, va_list *p_va, int flags) +{ + PyObject **stack; + Py_ssize_t nargs; + + assert(args != NULL && PyTuple_Check(args)); + + stack = &PyTuple_GET_ITEM(args, 0); + nargs = PyTuple_GET_SIZE(args); + return vgetargskeywordsfast_impl(stack, nargs, keywords, NULL, + parser, p_va, flags); +} + + +static const char * skipitem(const char **p_format, va_list *p_va, int flags) { const char *format = *p_format; @@ -1658,10 +2229,8 @@ skipitem(const char **p_format, va_list *p_va, int flags) case 'I': /* int sized bitfield */ case 'l': /* long int */ case 'k': /* long int sized bitfield */ -#ifdef HAVE_LONG_LONG - case 'L': /* PY_LONG_LONG */ - case 'K': /* PY_LONG_LONG sized bitfield */ -#endif + case 'L': /* long long */ + case 'K': /* long long sized bitfield */ case 'n': /* Py_ssize_t */ case 'f': /* float */ case 'd': /* double */ @@ -1673,7 +2242,9 @@ skipitem(const char **p_format, va_list *p_va, int flags) case 'Y': /* string object */ case 'U': /* unicode string object */ { - (void) va_arg(*p_va, void *); + if (p_va != NULL) { + (void) va_arg(*p_va, void *); + } break; } @@ -1681,7 +2252,9 @@ skipitem(const char **p_format, va_list *p_va, int flags) case 'e': /* string with encoding */ { - (void) va_arg(*p_va, const char *); + if (p_va != NULL) { + (void) va_arg(*p_va, const char *); + } if (!(*format == 's' || *format == 't')) /* after 'e', only 's' and 't' is allowed */ goto err; @@ -1696,12 +2269,16 @@ skipitem(const char **p_format, va_list *p_va, int flags) case 'Z': /* unicode string or None */ case 'w': /* buffer, read-write */ { - (void) va_arg(*p_va, char **); + if (p_va != NULL) { + (void) va_arg(*p_va, char **); + } if (*format == '#') { - if (flags & FLAG_SIZE_T) - (void) va_arg(*p_va, Py_ssize_t *); - else - (void) va_arg(*p_va, int *); + if (p_va != NULL) { + if (flags & FLAG_SIZE_T) + (void) va_arg(*p_va, Py_ssize_t *); + else + (void) va_arg(*p_va, int *); + } format++; } else if ((c == 's' || c == 'z' || c == 'y') && *format == '*') { format++; @@ -1713,24 +2290,30 @@ skipitem(const char **p_format, va_list *p_va, int flags) { if (*format == '!') { format++; - (void) va_arg(*p_va, PyTypeObject*); - (void) va_arg(*p_va, PyObject **); + if (p_va != NULL) { + (void) va_arg(*p_va, PyTypeObject*); + (void) va_arg(*p_va, PyObject **); + } } else if (*format == '&') { typedef int (*converter)(PyObject *, void *); - (void) va_arg(*p_va, converter); - (void) va_arg(*p_va, void *); + if (p_va != NULL) { + (void) va_arg(*p_va, converter); + (void) va_arg(*p_va, void *); + } format++; } else { - (void) va_arg(*p_va, PyObject **); + if (p_va != NULL) { + (void) va_arg(*p_va, PyObject **); + } } break; } case '(': /* bypass tuple, not handled at all previously */ { - char *msg; + const char *msg; for (;;) { if (*format==')') break; @@ -1766,16 +2349,9 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m PyObject **o; va_list vargs; -#ifdef HAVE_STDARG_PROTOTYPES - va_start(vargs, max); -#else - va_start(vargs); -#endif - assert(min >= 0); assert(min <= max); if (!PyTuple_Check(args)) { - va_end(vargs); PyErr_SetString(PyExc_SystemError, "PyArg_UnpackTuple() argument list is not a tuple"); return 0; @@ -1793,9 +2369,10 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m "unpacked tuple should have %s%zd elements," " but has %zd", (min == max ? "" : "at least "), min, l); - va_end(vargs); return 0; } + if (l == 0) + return 1; if (l > max) { if (name != NULL) PyErr_Format( @@ -1808,9 +2385,14 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m "unpacked tuple should have %s%zd elements," " but has %zd", (min == max ? "" : "at most "), max, l); - va_end(vargs); return 0; } + +#ifdef HAVE_STDARG_PROTOTYPES + va_start(vargs, max); +#else + va_start(vargs); +#endif for (i = 0; i < l; i++) { o = va_arg(vargs, PyObject **); *o = PyTuple_GET_ITEM(args, i); @@ -1860,6 +2442,19 @@ _PyArg_NoPositional(const char *funcname, PyObject *args) return 0; } +void +_PyArg_Fini(void) +{ + struct _PyArg_Parser *tmp, *s = static_arg_parsers; + while (s) { + tmp = s->next; + s->next = NULL; + parser_clear(s); + s = tmp; + } + static_arg_parsers = NULL; +} + #ifdef __cplusplus }; #endif diff --git a/Python/getcopyright.c b/Python/getcopyright.c index cac647c..c3f1e89 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2017 Python Software Foundation.\n\ +Copyright (c) 2001-2016 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ diff --git a/Python/graminit.c b/Python/graminit.c index 8212b2a..f2584e0 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -204,11 +204,13 @@ static arc arcs_9_6[2] = { {32, 7}, {0, 6}, }; -static arc arcs_9_7[2] = { +static arc arcs_9_7[3] = { {30, 12}, {34, 3}, + {0, 7}, }; -static arc arcs_9_8[1] = { +static arc arcs_9_8[2] = { + {32, 13}, {0, 8}, }; static arc arcs_9_9[2] = { @@ -221,35 +223,39 @@ static arc arcs_9_10[3] = { {0, 10}, }; static arc arcs_9_11[3] = { - {30, 13}, - {32, 14}, + {30, 14}, + {32, 15}, {0, 11}, }; static arc arcs_9_12[3] = { {32, 7}, - {31, 15}, + {31, 16}, {0, 12}, }; -static arc arcs_9_13[2] = { - {32, 14}, +static arc arcs_9_13[1] = { {0, 13}, }; static arc arcs_9_14[2] = { - {30, 16}, + {32, 15}, + {0, 14}, +}; +static arc arcs_9_15[3] = { + {30, 17}, {34, 3}, + {0, 15}, }; -static arc arcs_9_15[1] = { +static arc arcs_9_16[1] = { {26, 6}, }; -static arc arcs_9_16[3] = { - {32, 14}, - {31, 17}, - {0, 16}, +static arc arcs_9_17[3] = { + {32, 15}, + {31, 18}, + {0, 17}, }; -static arc arcs_9_17[1] = { - {26, 13}, +static arc arcs_9_18[1] = { + {26, 14}, }; -static state states_9[18] = { +static state states_9[19] = { {3, arcs_9_0}, {3, arcs_9_1}, {3, arcs_9_2}, @@ -257,17 +263,18 @@ static state states_9[18] = { {1, arcs_9_4}, {4, arcs_9_5}, {2, arcs_9_6}, - {2, arcs_9_7}, - {1, arcs_9_8}, + {3, arcs_9_7}, + {2, arcs_9_8}, {2, arcs_9_9}, {3, arcs_9_10}, {3, arcs_9_11}, {3, arcs_9_12}, - {2, arcs_9_13}, + {1, arcs_9_13}, {2, arcs_9_14}, - {1, arcs_9_15}, - {3, arcs_9_16}, - {1, arcs_9_17}, + {3, arcs_9_15}, + {1, arcs_9_16}, + {3, arcs_9_17}, + {1, arcs_9_18}, }; static arc arcs_10_0[1] = { {23, 1}, @@ -319,11 +326,13 @@ static arc arcs_11_6[2] = { {32, 7}, {0, 6}, }; -static arc arcs_11_7[2] = { +static arc arcs_11_7[3] = { {36, 12}, {34, 3}, + {0, 7}, }; -static arc arcs_11_8[1] = { +static arc arcs_11_8[2] = { + {32, 13}, {0, 8}, }; static arc arcs_11_9[2] = { @@ -336,35 +345,39 @@ static arc arcs_11_10[3] = { {0, 10}, }; static arc arcs_11_11[3] = { - {36, 13}, - {32, 14}, + {36, 14}, + {32, 15}, {0, 11}, }; static arc arcs_11_12[3] = { {32, 7}, - {31, 15}, + {31, 16}, {0, 12}, }; -static arc arcs_11_13[2] = { - {32, 14}, +static arc arcs_11_13[1] = { {0, 13}, }; static arc arcs_11_14[2] = { - {36, 16}, + {32, 15}, + {0, 14}, +}; +static arc arcs_11_15[3] = { + {36, 17}, {34, 3}, + {0, 15}, }; -static arc arcs_11_15[1] = { +static arc arcs_11_16[1] = { {26, 6}, }; -static arc arcs_11_16[3] = { - {32, 14}, - {31, 17}, - {0, 16}, +static arc arcs_11_17[3] = { + {32, 15}, + {31, 18}, + {0, 17}, }; -static arc arcs_11_17[1] = { - {26, 13}, +static arc arcs_11_18[1] = { + {26, 14}, }; -static state states_11[18] = { +static state states_11[19] = { {3, arcs_11_0}, {3, arcs_11_1}, {3, arcs_11_2}, @@ -372,17 +385,18 @@ static state states_11[18] = { {1, arcs_11_4}, {4, arcs_11_5}, {2, arcs_11_6}, - {2, arcs_11_7}, - {1, arcs_11_8}, + {3, arcs_11_7}, + {2, arcs_11_8}, {2, arcs_11_9}, {3, arcs_11_10}, {3, arcs_11_11}, {3, arcs_11_12}, - {2, arcs_11_13}, + {1, arcs_11_13}, {2, arcs_11_14}, - {1, arcs_11_15}, - {3, arcs_11_16}, - {1, arcs_11_17}, + {3, arcs_11_15}, + {1, arcs_11_16}, + {3, arcs_11_17}, + {1, arcs_11_18}, }; static arc arcs_12_0[1] = { {23, 1}, @@ -445,54 +459,77 @@ static state states_15[2] = { static arc arcs_16_0[1] = { {47, 1}, }; -static arc arcs_16_1[3] = { +static arc arcs_16_1[4] = { {48, 2}, - {31, 3}, + {49, 3}, + {31, 4}, {0, 1}, }; -static arc arcs_16_2[2] = { - {49, 4}, - {9, 4}, +static arc arcs_16_2[1] = { + {0, 2}, }; static arc arcs_16_3[2] = { - {49, 5}, - {47, 5}, + {50, 2}, + {9, 2}, }; -static arc arcs_16_4[1] = { - {0, 4}, +static arc arcs_16_4[2] = { + {50, 5}, + {47, 5}, }; static arc arcs_16_5[2] = { - {31, 3}, + {31, 4}, {0, 5}, }; static state states_16[6] = { {1, arcs_16_0}, - {3, arcs_16_1}, - {2, arcs_16_2}, + {4, arcs_16_1}, + {1, arcs_16_2}, {2, arcs_16_3}, - {1, arcs_16_4}, + {2, arcs_16_4}, {2, arcs_16_5}, }; -static arc arcs_17_0[2] = { +static arc arcs_17_0[1] = { + {27, 1}, +}; +static arc arcs_17_1[1] = { + {26, 2}, +}; +static arc arcs_17_2[2] = { + {31, 3}, + {0, 2}, +}; +static arc arcs_17_3[1] = { + {26, 4}, +}; +static arc arcs_17_4[1] = { + {0, 4}, +}; +static state states_17[5] = { + {1, arcs_17_0}, + {1, arcs_17_1}, + {2, arcs_17_2}, + {1, arcs_17_3}, + {1, arcs_17_4}, +}; +static arc arcs_18_0[2] = { {26, 1}, - {50, 1}, + {51, 1}, }; -static arc arcs_17_1[2] = { +static arc arcs_18_1[2] = { {32, 2}, {0, 1}, }; -static arc arcs_17_2[3] = { +static arc arcs_18_2[3] = { {26, 1}, - {50, 1}, + {51, 1}, {0, 2}, }; -static state states_17[3] = { - {2, arcs_17_0}, - {2, arcs_17_1}, - {3, arcs_17_2}, +static state states_18[3] = { + {2, arcs_18_0}, + {2, arcs_18_1}, + {3, arcs_18_2}, }; -static arc arcs_18_0[13] = { - {51, 1}, +static arc arcs_19_0[13] = { {52, 1}, {53, 1}, {54, 1}, @@ -505,60 +542,51 @@ static arc arcs_18_0[13] = { {61, 1}, {62, 1}, {63, 1}, -}; -static arc arcs_18_1[1] = { - {0, 1}, -}; -static state states_18[2] = { - {13, arcs_18_0}, - {1, arcs_18_1}, -}; -static arc arcs_19_0[1] = { {64, 1}, }; static arc arcs_19_1[1] = { - {65, 2}, -}; -static arc arcs_19_2[1] = { - {0, 2}, + {0, 1}, }; -static state states_19[3] = { - {1, arcs_19_0}, +static state states_19[2] = { + {13, arcs_19_0}, {1, arcs_19_1}, - {1, arcs_19_2}, }; static arc arcs_20_0[1] = { - {66, 1}, + {65, 1}, }; static arc arcs_20_1[1] = { - {0, 1}, + {66, 2}, +}; +static arc arcs_20_2[1] = { + {0, 2}, }; -static state states_20[2] = { +static state states_20[3] = { {1, arcs_20_0}, {1, arcs_20_1}, + {1, arcs_20_2}, }; -static arc arcs_21_0[5] = { +static arc arcs_21_0[1] = { {67, 1}, - {68, 1}, - {69, 1}, - {70, 1}, - {71, 1}, }; static arc arcs_21_1[1] = { {0, 1}, }; static state states_21[2] = { - {5, arcs_21_0}, + {1, arcs_21_0}, {1, arcs_21_1}, }; -static arc arcs_22_0[1] = { +static arc arcs_22_0[5] = { + {68, 1}, + {69, 1}, + {70, 1}, + {71, 1}, {72, 1}, }; static arc arcs_22_1[1] = { {0, 1}, }; static state states_22[2] = { - {1, arcs_22_0}, + {5, arcs_22_0}, {1, arcs_22_1}, }; static arc arcs_23_0[1] = { @@ -574,142 +602,133 @@ static state states_23[2] = { static arc arcs_24_0[1] = { {74, 1}, }; -static arc arcs_24_1[2] = { - {9, 2}, +static arc arcs_24_1[1] = { {0, 1}, }; -static arc arcs_24_2[1] = { - {0, 2}, -}; -static state states_24[3] = { +static state states_24[2] = { {1, arcs_24_0}, - {2, arcs_24_1}, - {1, arcs_24_2}, + {1, arcs_24_1}, }; static arc arcs_25_0[1] = { - {49, 1}, + {75, 1}, }; -static arc arcs_25_1[1] = { +static arc arcs_25_1[2] = { + {9, 2}, {0, 1}, }; -static state states_25[2] = { +static arc arcs_25_2[1] = { + {0, 2}, +}; +static state states_25[3] = { {1, arcs_25_0}, - {1, arcs_25_1}, + {2, arcs_25_1}, + {1, arcs_25_2}, }; static arc arcs_26_0[1] = { - {75, 1}, + {50, 1}, +}; +static arc arcs_26_1[1] = { + {0, 1}, +}; +static state states_26[2] = { + {1, arcs_26_0}, + {1, arcs_26_1}, }; -static arc arcs_26_1[2] = { +static arc arcs_27_0[1] = { + {76, 1}, +}; +static arc arcs_27_1[2] = { {26, 2}, {0, 1}, }; -static arc arcs_26_2[2] = { - {76, 3}, +static arc arcs_27_2[2] = { + {77, 3}, {0, 2}, }; -static arc arcs_26_3[1] = { +static arc arcs_27_3[1] = { {26, 4}, }; -static arc arcs_26_4[1] = { +static arc arcs_27_4[1] = { {0, 4}, }; -static state states_26[5] = { - {1, arcs_26_0}, - {2, arcs_26_1}, - {2, arcs_26_2}, - {1, arcs_26_3}, - {1, arcs_26_4}, +static state states_27[5] = { + {1, arcs_27_0}, + {2, arcs_27_1}, + {2, arcs_27_2}, + {1, arcs_27_3}, + {1, arcs_27_4}, }; -static arc arcs_27_0[2] = { - {77, 1}, +static arc arcs_28_0[2] = { {78, 1}, + {79, 1}, }; -static arc arcs_27_1[1] = { +static arc arcs_28_1[1] = { {0, 1}, }; -static state states_27[2] = { - {2, arcs_27_0}, - {1, arcs_27_1}, +static state states_28[2] = { + {2, arcs_28_0}, + {1, arcs_28_1}, }; -static arc arcs_28_0[1] = { - {79, 1}, +static arc arcs_29_0[1] = { + {80, 1}, }; -static arc arcs_28_1[1] = { - {80, 2}, +static arc arcs_29_1[1] = { + {81, 2}, }; -static arc arcs_28_2[1] = { +static arc arcs_29_2[1] = { {0, 2}, }; -static state states_28[3] = { - {1, arcs_28_0}, - {1, arcs_28_1}, - {1, arcs_28_2}, +static state states_29[3] = { + {1, arcs_29_0}, + {1, arcs_29_1}, + {1, arcs_29_2}, }; -static arc arcs_29_0[1] = { - {76, 1}, +static arc arcs_30_0[1] = { + {77, 1}, }; -static arc arcs_29_1[3] = { - {81, 2}, +static arc arcs_30_1[3] = { {82, 2}, + {83, 2}, {12, 3}, }; -static arc arcs_29_2[4] = { - {81, 2}, +static arc arcs_30_2[4] = { {82, 2}, + {83, 2}, {12, 3}, - {79, 4}, + {80, 4}, }; -static arc arcs_29_3[1] = { - {79, 4}, +static arc arcs_30_3[1] = { + {80, 4}, }; -static arc arcs_29_4[3] = { +static arc arcs_30_4[3] = { {33, 5}, {13, 6}, - {83, 5}, + {84, 5}, }; -static arc arcs_29_5[1] = { +static arc arcs_30_5[1] = { {0, 5}, }; -static arc arcs_29_6[1] = { - {83, 7}, +static arc arcs_30_6[1] = { + {84, 7}, }; -static arc arcs_29_7[1] = { +static arc arcs_30_7[1] = { {15, 5}, }; -static state states_29[8] = { - {1, arcs_29_0}, - {3, arcs_29_1}, - {4, arcs_29_2}, - {1, arcs_29_3}, - {3, arcs_29_4}, - {1, arcs_29_5}, - {1, arcs_29_6}, - {1, arcs_29_7}, -}; -static arc arcs_30_0[1] = { - {23, 1}, -}; -static arc arcs_30_1[2] = { - {85, 2}, - {0, 1}, -}; -static arc arcs_30_2[1] = { - {23, 3}, -}; -static arc arcs_30_3[1] = { - {0, 3}, -}; -static state states_30[4] = { +static state states_30[8] = { {1, arcs_30_0}, - {2, arcs_30_1}, - {1, arcs_30_2}, + {3, arcs_30_1}, + {4, arcs_30_2}, {1, arcs_30_3}, + {3, arcs_30_4}, + {1, arcs_30_5}, + {1, arcs_30_6}, + {1, arcs_30_7}, }; static arc arcs_31_0[1] = { - {12, 1}, + {23, 1}, }; static arc arcs_31_1[2] = { - {85, 2}, + {86, 2}, {0, 1}, }; static arc arcs_31_2[1] = { @@ -725,37 +744,45 @@ static state states_31[4] = { {1, arcs_31_3}, }; static arc arcs_32_0[1] = { - {84, 1}, + {12, 1}, }; static arc arcs_32_1[2] = { - {32, 2}, + {86, 2}, {0, 1}, }; -static arc arcs_32_2[2] = { - {84, 1}, - {0, 2}, +static arc arcs_32_2[1] = { + {23, 3}, +}; +static arc arcs_32_3[1] = { + {0, 3}, }; -static state states_32[3] = { +static state states_32[4] = { {1, arcs_32_0}, {2, arcs_32_1}, - {2, arcs_32_2}, + {1, arcs_32_2}, + {1, arcs_32_3}, }; static arc arcs_33_0[1] = { - {86, 1}, + {85, 1}, }; static arc arcs_33_1[2] = { - {32, 0}, + {32, 2}, {0, 1}, }; -static state states_33[2] = { +static arc arcs_33_2[2] = { + {85, 1}, + {0, 2}, +}; +static state states_33[3] = { {1, arcs_33_0}, {2, arcs_33_1}, + {2, arcs_33_2}, }; static arc arcs_34_0[1] = { - {23, 1}, + {87, 1}, }; static arc arcs_34_1[2] = { - {81, 0}, + {32, 0}, {0, 1}, }; static state states_34[2] = { @@ -763,19 +790,15 @@ static state states_34[2] = { {2, arcs_34_1}, }; static arc arcs_35_0[1] = { - {87, 1}, -}; -static arc arcs_35_1[1] = { - {23, 2}, + {23, 1}, }; -static arc arcs_35_2[2] = { - {32, 1}, - {0, 2}, +static arc arcs_35_1[2] = { + {82, 0}, + {0, 1}, }; -static state states_35[3] = { +static state states_35[2] = { {1, arcs_35_0}, - {1, arcs_35_1}, - {2, arcs_35_2}, + {2, arcs_35_1}, }; static arc arcs_36_0[1] = { {88, 1}, @@ -796,97 +819,76 @@ static arc arcs_37_0[1] = { {89, 1}, }; static arc arcs_37_1[1] = { - {26, 2}, + {23, 2}, }; static arc arcs_37_2[2] = { + {32, 1}, + {0, 2}, +}; +static state states_37[3] = { + {1, arcs_37_0}, + {1, arcs_37_1}, + {2, arcs_37_2}, +}; +static arc arcs_38_0[1] = { + {90, 1}, +}; +static arc arcs_38_1[1] = { + {26, 2}, +}; +static arc arcs_38_2[2] = { {32, 3}, {0, 2}, }; -static arc arcs_37_3[1] = { +static arc arcs_38_3[1] = { {26, 4}, }; -static arc arcs_37_4[1] = { +static arc arcs_38_4[1] = { {0, 4}, }; -static state states_37[5] = { - {1, arcs_37_0}, - {1, arcs_37_1}, - {2, arcs_37_2}, - {1, arcs_37_3}, - {1, arcs_37_4}, +static state states_38[5] = { + {1, arcs_38_0}, + {1, arcs_38_1}, + {2, arcs_38_2}, + {1, arcs_38_3}, + {1, arcs_38_4}, }; -static arc arcs_38_0[9] = { - {90, 1}, +static arc arcs_39_0[9] = { {91, 1}, {92, 1}, {93, 1}, {94, 1}, + {95, 1}, {19, 1}, {18, 1}, {17, 1}, - {95, 1}, + {96, 1}, }; -static arc arcs_38_1[1] = { +static arc arcs_39_1[1] = { {0, 1}, }; -static state states_38[2] = { - {9, arcs_38_0}, - {1, arcs_38_1}, +static state states_39[2] = { + {9, arcs_39_0}, + {1, arcs_39_1}, }; -static arc arcs_39_0[1] = { +static arc arcs_40_0[1] = { {21, 1}, }; -static arc arcs_39_1[3] = { +static arc arcs_40_1[3] = { {19, 2}, - {94, 2}, - {92, 2}, -}; -static arc arcs_39_2[1] = { - {0, 2}, -}; -static state states_39[3] = { - {1, arcs_39_0}, - {3, arcs_39_1}, - {1, arcs_39_2}, -}; -static arc arcs_40_0[1] = { - {96, 1}, -}; -static arc arcs_40_1[1] = { - {26, 2}, + {95, 2}, + {93, 2}, }; static arc arcs_40_2[1] = { - {27, 3}, -}; -static arc arcs_40_3[1] = { - {28, 4}, -}; -static arc arcs_40_4[3] = { - {97, 1}, - {98, 5}, - {0, 4}, -}; -static arc arcs_40_5[1] = { - {27, 6}, -}; -static arc arcs_40_6[1] = { - {28, 7}, -}; -static arc arcs_40_7[1] = { - {0, 7}, + {0, 2}, }; -static state states_40[8] = { +static state states_40[3] = { {1, arcs_40_0}, - {1, arcs_40_1}, + {3, arcs_40_1}, {1, arcs_40_2}, - {1, arcs_40_3}, - {3, arcs_40_4}, - {1, arcs_40_5}, - {1, arcs_40_6}, - {1, arcs_40_7}, }; static arc arcs_41_0[1] = { - {99, 1}, + {97, 1}, }; static arc arcs_41_1[1] = { {26, 2}, @@ -897,8 +899,9 @@ static arc arcs_41_2[1] = { static arc arcs_41_3[1] = { {28, 4}, }; -static arc arcs_41_4[2] = { - {98, 5}, +static arc arcs_41_4[3] = { + {98, 1}, + {99, 5}, {0, 4}, }; static arc arcs_41_5[1] = { @@ -915,7 +918,7 @@ static state states_41[8] = { {1, arcs_41_1}, {1, arcs_41_2}, {1, arcs_41_3}, - {2, arcs_41_4}, + {3, arcs_41_4}, {1, arcs_41_5}, {1, arcs_41_6}, {1, arcs_41_7}, @@ -924,258 +927,270 @@ static arc arcs_42_0[1] = { {100, 1}, }; static arc arcs_42_1[1] = { - {65, 2}, + {26, 2}, }; static arc arcs_42_2[1] = { - {101, 3}, + {27, 3}, }; static arc arcs_42_3[1] = { - {9, 4}, + {28, 4}, }; -static arc arcs_42_4[1] = { - {27, 5}, +static arc arcs_42_4[2] = { + {99, 5}, + {0, 4}, }; static arc arcs_42_5[1] = { - {28, 6}, + {27, 6}, }; -static arc arcs_42_6[2] = { - {98, 7}, - {0, 6}, +static arc arcs_42_6[1] = { + {28, 7}, }; static arc arcs_42_7[1] = { - {27, 8}, -}; -static arc arcs_42_8[1] = { - {28, 9}, -}; -static arc arcs_42_9[1] = { - {0, 9}, + {0, 7}, }; -static state states_42[10] = { +static state states_42[8] = { {1, arcs_42_0}, {1, arcs_42_1}, {1, arcs_42_2}, {1, arcs_42_3}, - {1, arcs_42_4}, + {2, arcs_42_4}, {1, arcs_42_5}, - {2, arcs_42_6}, + {1, arcs_42_6}, {1, arcs_42_7}, - {1, arcs_42_8}, - {1, arcs_42_9}, }; static arc arcs_43_0[1] = { - {102, 1}, + {101, 1}, }; static arc arcs_43_1[1] = { - {27, 2}, + {66, 2}, }; static arc arcs_43_2[1] = { - {28, 3}, + {102, 3}, }; -static arc arcs_43_3[2] = { - {103, 4}, - {104, 5}, +static arc arcs_43_3[1] = { + {9, 4}, }; static arc arcs_43_4[1] = { - {27, 6}, + {27, 5}, }; static arc arcs_43_5[1] = { - {27, 7}, + {28, 6}, }; -static arc arcs_43_6[1] = { - {28, 8}, +static arc arcs_43_6[2] = { + {99, 7}, + {0, 6}, }; static arc arcs_43_7[1] = { - {28, 9}, + {27, 8}, }; -static arc arcs_43_8[4] = { - {103, 4}, - {98, 10}, - {104, 5}, - {0, 8}, +static arc arcs_43_8[1] = { + {28, 9}, }; static arc arcs_43_9[1] = { {0, 9}, }; -static arc arcs_43_10[1] = { - {27, 11}, -}; -static arc arcs_43_11[1] = { - {28, 12}, -}; -static arc arcs_43_12[2] = { - {104, 5}, - {0, 12}, -}; -static state states_43[13] = { +static state states_43[10] = { {1, arcs_43_0}, {1, arcs_43_1}, {1, arcs_43_2}, - {2, arcs_43_3}, + {1, arcs_43_3}, {1, arcs_43_4}, {1, arcs_43_5}, - {1, arcs_43_6}, + {2, arcs_43_6}, {1, arcs_43_7}, - {4, arcs_43_8}, + {1, arcs_43_8}, {1, arcs_43_9}, - {1, arcs_43_10}, - {1, arcs_43_11}, - {2, arcs_43_12}, }; static arc arcs_44_0[1] = { - {105, 1}, + {103, 1}, }; static arc arcs_44_1[1] = { - {106, 2}, + {27, 2}, }; -static arc arcs_44_2[2] = { - {32, 1}, - {27, 3}, +static arc arcs_44_2[1] = { + {28, 3}, }; -static arc arcs_44_3[1] = { - {28, 4}, +static arc arcs_44_3[2] = { + {104, 4}, + {105, 5}, }; static arc arcs_44_4[1] = { - {0, 4}, + {27, 6}, +}; +static arc arcs_44_5[1] = { + {27, 7}, +}; +static arc arcs_44_6[1] = { + {28, 8}, +}; +static arc arcs_44_7[1] = { + {28, 9}, +}; +static arc arcs_44_8[4] = { + {104, 4}, + {99, 10}, + {105, 5}, + {0, 8}, +}; +static arc arcs_44_9[1] = { + {0, 9}, +}; +static arc arcs_44_10[1] = { + {27, 11}, +}; +static arc arcs_44_11[1] = { + {28, 12}, +}; +static arc arcs_44_12[2] = { + {105, 5}, + {0, 12}, }; -static state states_44[5] = { +static state states_44[13] = { {1, arcs_44_0}, {1, arcs_44_1}, - {2, arcs_44_2}, - {1, arcs_44_3}, + {1, arcs_44_2}, + {2, arcs_44_3}, {1, arcs_44_4}, + {1, arcs_44_5}, + {1, arcs_44_6}, + {1, arcs_44_7}, + {4, arcs_44_8}, + {1, arcs_44_9}, + {1, arcs_44_10}, + {1, arcs_44_11}, + {2, arcs_44_12}, }; static arc arcs_45_0[1] = { - {26, 1}, + {106, 1}, }; -static arc arcs_45_1[2] = { - {85, 2}, - {0, 1}, +static arc arcs_45_1[1] = { + {107, 2}, }; -static arc arcs_45_2[1] = { - {107, 3}, +static arc arcs_45_2[2] = { + {32, 1}, + {27, 3}, }; static arc arcs_45_3[1] = { - {0, 3}, + {28, 4}, }; -static state states_45[4] = { +static arc arcs_45_4[1] = { + {0, 4}, +}; +static state states_45[5] = { {1, arcs_45_0}, - {2, arcs_45_1}, - {1, arcs_45_2}, + {1, arcs_45_1}, + {2, arcs_45_2}, {1, arcs_45_3}, + {1, arcs_45_4}, }; static arc arcs_46_0[1] = { - {108, 1}, + {26, 1}, }; static arc arcs_46_1[2] = { - {26, 2}, + {86, 2}, {0, 1}, }; -static arc arcs_46_2[2] = { - {85, 3}, - {0, 2}, +static arc arcs_46_2[1] = { + {108, 3}, }; static arc arcs_46_3[1] = { - {23, 4}, -}; -static arc arcs_46_4[1] = { - {0, 4}, + {0, 3}, }; -static state states_46[5] = { +static state states_46[4] = { {1, arcs_46_0}, {2, arcs_46_1}, - {2, arcs_46_2}, + {1, arcs_46_2}, {1, arcs_46_3}, - {1, arcs_46_4}, }; -static arc arcs_47_0[2] = { - {3, 1}, - {2, 2}, +static arc arcs_47_0[1] = { + {109, 1}, }; -static arc arcs_47_1[1] = { +static arc arcs_47_1[2] = { + {26, 2}, {0, 1}, }; -static arc arcs_47_2[1] = { - {109, 3}, +static arc arcs_47_2[2] = { + {86, 3}, + {0, 2}, }; static arc arcs_47_3[1] = { - {6, 4}, + {23, 4}, }; -static arc arcs_47_4[2] = { - {6, 4}, - {110, 1}, +static arc arcs_47_4[1] = { + {0, 4}, }; static state states_47[5] = { - {2, arcs_47_0}, - {1, arcs_47_1}, - {1, arcs_47_2}, + {1, arcs_47_0}, + {2, arcs_47_1}, + {2, arcs_47_2}, {1, arcs_47_3}, - {2, arcs_47_4}, + {1, arcs_47_4}, }; static arc arcs_48_0[2] = { - {111, 1}, - {112, 2}, + {3, 1}, + {2, 2}, }; -static arc arcs_48_1[2] = { - {96, 3}, +static arc arcs_48_1[1] = { {0, 1}, }; static arc arcs_48_2[1] = { - {0, 2}, + {110, 3}, }; static arc arcs_48_3[1] = { - {111, 4}, -}; -static arc arcs_48_4[1] = { - {98, 5}, + {6, 4}, }; -static arc arcs_48_5[1] = { - {26, 2}, +static arc arcs_48_4[2] = { + {6, 4}, + {111, 1}, }; -static state states_48[6] = { +static state states_48[5] = { {2, arcs_48_0}, - {2, arcs_48_1}, + {1, arcs_48_1}, {1, arcs_48_2}, {1, arcs_48_3}, - {1, arcs_48_4}, - {1, arcs_48_5}, + {2, arcs_48_4}, }; static arc arcs_49_0[2] = { - {111, 1}, - {114, 1}, + {112, 1}, + {113, 2}, }; -static arc arcs_49_1[1] = { +static arc arcs_49_1[2] = { + {97, 3}, {0, 1}, }; -static state states_49[2] = { - {2, arcs_49_0}, - {1, arcs_49_1}, +static arc arcs_49_2[1] = { + {0, 2}, }; -static arc arcs_50_0[1] = { - {115, 1}, +static arc arcs_49_3[1] = { + {112, 4}, }; -static arc arcs_50_1[2] = { - {35, 2}, - {27, 3}, +static arc arcs_49_4[1] = { + {99, 5}, }; -static arc arcs_50_2[1] = { - {27, 3}, +static arc arcs_49_5[1] = { + {26, 2}, }; -static arc arcs_50_3[1] = { - {26, 4}, +static state states_49[6] = { + {2, arcs_49_0}, + {2, arcs_49_1}, + {1, arcs_49_2}, + {1, arcs_49_3}, + {1, arcs_49_4}, + {1, arcs_49_5}, +}; +static arc arcs_50_0[2] = { + {112, 1}, + {115, 1}, }; -static arc arcs_50_4[1] = { - {0, 4}, +static arc arcs_50_1[1] = { + {0, 1}, }; -static state states_50[5] = { - {1, arcs_50_0}, - {2, arcs_50_1}, - {1, arcs_50_2}, - {1, arcs_50_3}, - {1, arcs_50_4}, +static state states_50[2] = { + {2, arcs_50_0}, + {1, arcs_50_1}, }; static arc arcs_51_0[1] = { - {115, 1}, + {116, 1}, }; static arc arcs_51_1[2] = { {35, 2}, @@ -1185,7 +1200,7 @@ static arc arcs_51_2[1] = { {27, 3}, }; static arc arcs_51_3[1] = { - {113, 4}, + {26, 4}, }; static arc arcs_51_4[1] = { {0, 4}, @@ -1201,108 +1216,120 @@ static arc arcs_52_0[1] = { {116, 1}, }; static arc arcs_52_1[2] = { - {117, 0}, - {0, 1}, + {35, 2}, + {27, 3}, +}; +static arc arcs_52_2[1] = { + {27, 3}, +}; +static arc arcs_52_3[1] = { + {114, 4}, +}; +static arc arcs_52_4[1] = { + {0, 4}, }; -static state states_52[2] = { +static state states_52[5] = { {1, arcs_52_0}, {2, arcs_52_1}, + {1, arcs_52_2}, + {1, arcs_52_3}, + {1, arcs_52_4}, }; static arc arcs_53_0[1] = { - {118, 1}, + {117, 1}, }; static arc arcs_53_1[2] = { - {119, 0}, + {118, 0}, {0, 1}, }; static state states_53[2] = { {1, arcs_53_0}, {2, arcs_53_1}, }; -static arc arcs_54_0[2] = { - {120, 1}, - {121, 2}, +static arc arcs_54_0[1] = { + {119, 1}, +}; +static arc arcs_54_1[2] = { + {120, 0}, + {0, 1}, +}; +static state states_54[2] = { + {1, arcs_54_0}, + {2, arcs_54_1}, }; -static arc arcs_54_1[1] = { - {118, 2}, +static arc arcs_55_0[2] = { + {121, 1}, + {122, 2}, }; -static arc arcs_54_2[1] = { +static arc arcs_55_1[1] = { + {119, 2}, +}; +static arc arcs_55_2[1] = { {0, 2}, }; -static state states_54[3] = { - {2, arcs_54_0}, - {1, arcs_54_1}, - {1, arcs_54_2}, +static state states_55[3] = { + {2, arcs_55_0}, + {1, arcs_55_1}, + {1, arcs_55_2}, }; -static arc arcs_55_0[1] = { - {107, 1}, +static arc arcs_56_0[1] = { + {108, 1}, }; -static arc arcs_55_1[2] = { - {122, 0}, +static arc arcs_56_1[2] = { + {123, 0}, {0, 1}, }; -static state states_55[2] = { - {1, arcs_55_0}, - {2, arcs_55_1}, +static state states_56[2] = { + {1, arcs_56_0}, + {2, arcs_56_1}, }; -static arc arcs_56_0[10] = { - {123, 1}, +static arc arcs_57_0[10] = { {124, 1}, {125, 1}, {126, 1}, {127, 1}, {128, 1}, {129, 1}, - {101, 1}, - {120, 2}, - {130, 3}, + {130, 1}, + {102, 1}, + {121, 2}, + {131, 3}, }; -static arc arcs_56_1[1] = { +static arc arcs_57_1[1] = { {0, 1}, }; -static arc arcs_56_2[1] = { - {101, 1}, +static arc arcs_57_2[1] = { + {102, 1}, }; -static arc arcs_56_3[2] = { - {120, 1}, +static arc arcs_57_3[2] = { + {121, 1}, {0, 3}, }; -static state states_56[4] = { - {10, arcs_56_0}, - {1, arcs_56_1}, - {1, arcs_56_2}, - {2, arcs_56_3}, -}; -static arc arcs_57_0[1] = { - {33, 1}, -}; -static arc arcs_57_1[1] = { - {107, 2}, -}; -static arc arcs_57_2[1] = { - {0, 2}, -}; -static state states_57[3] = { - {1, arcs_57_0}, +static state states_57[4] = { + {10, arcs_57_0}, {1, arcs_57_1}, {1, arcs_57_2}, + {2, arcs_57_3}, }; static arc arcs_58_0[1] = { - {131, 1}, + {33, 1}, }; -static arc arcs_58_1[2] = { - {132, 0}, - {0, 1}, +static arc arcs_58_1[1] = { + {108, 2}, +}; +static arc arcs_58_2[1] = { + {0, 2}, }; -static state states_58[2] = { +static state states_58[3] = { {1, arcs_58_0}, - {2, arcs_58_1}, + {1, arcs_58_1}, + {1, arcs_58_2}, }; static arc arcs_59_0[1] = { - {133, 1}, + {132, 1}, }; static arc arcs_59_1[2] = { - {134, 0}, + {133, 0}, {0, 1}, }; static state states_59[2] = { @@ -1310,10 +1337,10 @@ static state states_59[2] = { {2, arcs_59_1}, }; static arc arcs_60_0[1] = { - {135, 1}, + {134, 1}, }; static arc arcs_60_1[2] = { - {136, 0}, + {135, 0}, {0, 1}, }; static state states_60[2] = { @@ -1321,23 +1348,22 @@ static state states_60[2] = { {2, arcs_60_1}, }; static arc arcs_61_0[1] = { - {137, 1}, + {136, 1}, }; -static arc arcs_61_1[3] = { - {138, 0}, - {139, 0}, +static arc arcs_61_1[2] = { + {137, 0}, {0, 1}, }; static state states_61[2] = { {1, arcs_61_0}, - {3, arcs_61_1}, + {2, arcs_61_1}, }; static arc arcs_62_0[1] = { - {140, 1}, + {138, 1}, }; static arc arcs_62_1[3] = { - {141, 0}, - {142, 0}, + {139, 0}, + {140, 0}, {0, 1}, }; static state states_62[2] = { @@ -1345,528 +1371,545 @@ static state states_62[2] = { {3, arcs_62_1}, }; static arc arcs_63_0[1] = { - {143, 1}, + {141, 1}, }; -static arc arcs_63_1[6] = { +static arc arcs_63_1[3] = { + {142, 0}, + {143, 0}, + {0, 1}, +}; +static state states_63[2] = { + {1, arcs_63_0}, + {3, arcs_63_1}, +}; +static arc arcs_64_0[1] = { + {144, 1}, +}; +static arc arcs_64_1[6] = { {33, 0}, {11, 0}, - {144, 0}, {145, 0}, {146, 0}, + {147, 0}, {0, 1}, }; -static state states_63[2] = { - {1, arcs_63_0}, - {6, arcs_63_1}, +static state states_64[2] = { + {1, arcs_64_0}, + {6, arcs_64_1}, }; -static arc arcs_64_0[4] = { - {141, 1}, +static arc arcs_65_0[4] = { {142, 1}, - {147, 1}, - {148, 2}, + {143, 1}, + {148, 1}, + {149, 2}, }; -static arc arcs_64_1[1] = { - {143, 2}, +static arc arcs_65_1[1] = { + {144, 2}, }; -static arc arcs_64_2[1] = { +static arc arcs_65_2[1] = { {0, 2}, }; -static state states_64[3] = { - {4, arcs_64_0}, - {1, arcs_64_1}, - {1, arcs_64_2}, +static state states_65[3] = { + {4, arcs_65_0}, + {1, arcs_65_1}, + {1, arcs_65_2}, }; -static arc arcs_65_0[1] = { - {149, 1}, +static arc arcs_66_0[1] = { + {150, 1}, }; -static arc arcs_65_1[2] = { +static arc arcs_66_1[2] = { {34, 2}, {0, 1}, }; -static arc arcs_65_2[1] = { - {143, 3}, +static arc arcs_66_2[1] = { + {144, 3}, }; -static arc arcs_65_3[1] = { +static arc arcs_66_3[1] = { {0, 3}, }; -static state states_65[4] = { - {1, arcs_65_0}, - {2, arcs_65_1}, - {1, arcs_65_2}, - {1, arcs_65_3}, +static state states_66[4] = { + {1, arcs_66_0}, + {2, arcs_66_1}, + {1, arcs_66_2}, + {1, arcs_66_3}, }; -static arc arcs_66_0[2] = { - {150, 1}, - {151, 2}, -}; -static arc arcs_66_1[1] = { - {151, 2}, +static arc arcs_67_0[2] = { + {151, 1}, + {152, 2}, }; -static arc arcs_66_2[2] = { +static arc arcs_67_1[1] = { {152, 2}, +}; +static arc arcs_67_2[2] = { + {153, 2}, {0, 2}, }; -static state states_66[3] = { - {2, arcs_66_0}, - {1, arcs_66_1}, - {2, arcs_66_2}, +static state states_67[3] = { + {2, arcs_67_0}, + {1, arcs_67_1}, + {2, arcs_67_2}, }; -static arc arcs_67_0[10] = { +static arc arcs_68_0[10] = { {13, 1}, - {154, 2}, - {156, 3}, + {155, 2}, + {157, 3}, {23, 4}, - {159, 4}, - {160, 5}, - {82, 4}, - {161, 4}, + {160, 4}, + {161, 5}, + {83, 4}, {162, 4}, {163, 4}, + {164, 4}, }; -static arc arcs_67_1[3] = { - {49, 6}, - {153, 6}, +static arc arcs_68_1[3] = { + {50, 6}, + {154, 6}, {15, 4}, }; -static arc arcs_67_2[2] = { - {153, 7}, - {155, 4}, +static arc arcs_68_2[2] = { + {154, 7}, + {156, 4}, }; -static arc arcs_67_3[2] = { - {157, 8}, - {158, 4}, +static arc arcs_68_3[2] = { + {158, 8}, + {159, 4}, }; -static arc arcs_67_4[1] = { +static arc arcs_68_4[1] = { {0, 4}, }; -static arc arcs_67_5[2] = { - {160, 5}, +static arc arcs_68_5[2] = { + {161, 5}, {0, 5}, }; -static arc arcs_67_6[1] = { +static arc arcs_68_6[1] = { {15, 4}, }; -static arc arcs_67_7[1] = { - {155, 4}, +static arc arcs_68_7[1] = { + {156, 4}, }; -static arc arcs_67_8[1] = { - {158, 4}, +static arc arcs_68_8[1] = { + {159, 4}, }; -static state states_67[9] = { - {10, arcs_67_0}, - {3, arcs_67_1}, - {2, arcs_67_2}, - {2, arcs_67_3}, - {1, arcs_67_4}, - {2, arcs_67_5}, - {1, arcs_67_6}, - {1, arcs_67_7}, - {1, arcs_67_8}, -}; -static arc arcs_68_0[2] = { +static state states_68[9] = { + {10, arcs_68_0}, + {3, arcs_68_1}, + {2, arcs_68_2}, + {2, arcs_68_3}, + {1, arcs_68_4}, + {2, arcs_68_5}, + {1, arcs_68_6}, + {1, arcs_68_7}, + {1, arcs_68_8}, +}; +static arc arcs_69_0[2] = { {26, 1}, - {50, 1}, + {51, 1}, }; -static arc arcs_68_1[3] = { - {164, 2}, +static arc arcs_69_1[3] = { + {165, 2}, {32, 3}, {0, 1}, }; -static arc arcs_68_2[1] = { +static arc arcs_69_2[1] = { {0, 2}, }; -static arc arcs_68_3[3] = { +static arc arcs_69_3[3] = { {26, 4}, - {50, 4}, + {51, 4}, {0, 3}, }; -static arc arcs_68_4[2] = { +static arc arcs_69_4[2] = { {32, 3}, {0, 4}, }; -static state states_68[5] = { - {2, arcs_68_0}, - {3, arcs_68_1}, - {1, arcs_68_2}, - {3, arcs_68_3}, - {2, arcs_68_4}, +static state states_69[5] = { + {2, arcs_69_0}, + {3, arcs_69_1}, + {1, arcs_69_2}, + {3, arcs_69_3}, + {2, arcs_69_4}, }; -static arc arcs_69_0[3] = { +static arc arcs_70_0[3] = { {13, 1}, - {154, 2}, - {81, 3}, + {155, 2}, + {82, 3}, }; -static arc arcs_69_1[2] = { +static arc arcs_70_1[2] = { {14, 4}, {15, 5}, }; -static arc arcs_69_2[1] = { - {165, 6}, +static arc arcs_70_2[1] = { + {166, 6}, }; -static arc arcs_69_3[1] = { +static arc arcs_70_3[1] = { {23, 5}, }; -static arc arcs_69_4[1] = { +static arc arcs_70_4[1] = { {15, 5}, }; -static arc arcs_69_5[1] = { +static arc arcs_70_5[1] = { {0, 5}, }; -static arc arcs_69_6[1] = { - {155, 5}, +static arc arcs_70_6[1] = { + {156, 5}, }; -static state states_69[7] = { - {3, arcs_69_0}, - {2, arcs_69_1}, - {1, arcs_69_2}, - {1, arcs_69_3}, - {1, arcs_69_4}, - {1, arcs_69_5}, - {1, arcs_69_6}, +static state states_70[7] = { + {3, arcs_70_0}, + {2, arcs_70_1}, + {1, arcs_70_2}, + {1, arcs_70_3}, + {1, arcs_70_4}, + {1, arcs_70_5}, + {1, arcs_70_6}, }; -static arc arcs_70_0[1] = { - {166, 1}, +static arc arcs_71_0[1] = { + {167, 1}, }; -static arc arcs_70_1[2] = { +static arc arcs_71_1[2] = { {32, 2}, {0, 1}, }; -static arc arcs_70_2[2] = { - {166, 1}, +static arc arcs_71_2[2] = { + {167, 1}, {0, 2}, }; -static state states_70[3] = { - {1, arcs_70_0}, - {2, arcs_70_1}, - {2, arcs_70_2}, +static state states_71[3] = { + {1, arcs_71_0}, + {2, arcs_71_1}, + {2, arcs_71_2}, }; -static arc arcs_71_0[2] = { +static arc arcs_72_0[2] = { {26, 1}, {27, 2}, }; -static arc arcs_71_1[2] = { +static arc arcs_72_1[2] = { {27, 2}, {0, 1}, }; -static arc arcs_71_2[3] = { +static arc arcs_72_2[3] = { {26, 3}, - {167, 4}, + {168, 4}, {0, 2}, }; -static arc arcs_71_3[2] = { - {167, 4}, +static arc arcs_72_3[2] = { + {168, 4}, {0, 3}, }; -static arc arcs_71_4[1] = { +static arc arcs_72_4[1] = { {0, 4}, }; -static state states_71[5] = { - {2, arcs_71_0}, - {2, arcs_71_1}, - {3, arcs_71_2}, - {2, arcs_71_3}, - {1, arcs_71_4}, +static state states_72[5] = { + {2, arcs_72_0}, + {2, arcs_72_1}, + {3, arcs_72_2}, + {2, arcs_72_3}, + {1, arcs_72_4}, }; -static arc arcs_72_0[1] = { +static arc arcs_73_0[1] = { {27, 1}, }; -static arc arcs_72_1[2] = { +static arc arcs_73_1[2] = { {26, 2}, {0, 1}, }; -static arc arcs_72_2[1] = { +static arc arcs_73_2[1] = { {0, 2}, }; -static state states_72[3] = { - {1, arcs_72_0}, - {2, arcs_72_1}, - {1, arcs_72_2}, +static state states_73[3] = { + {1, arcs_73_0}, + {2, arcs_73_1}, + {1, arcs_73_2}, }; -static arc arcs_73_0[2] = { - {107, 1}, - {50, 1}, +static arc arcs_74_0[2] = { + {108, 1}, + {51, 1}, }; -static arc arcs_73_1[2] = { +static arc arcs_74_1[2] = { {32, 2}, {0, 1}, }; -static arc arcs_73_2[3] = { - {107, 1}, - {50, 1}, +static arc arcs_74_2[3] = { + {108, 1}, + {51, 1}, {0, 2}, }; -static state states_73[3] = { - {2, arcs_73_0}, - {2, arcs_73_1}, - {3, arcs_73_2}, +static state states_74[3] = { + {2, arcs_74_0}, + {2, arcs_74_1}, + {3, arcs_74_2}, }; -static arc arcs_74_0[1] = { +static arc arcs_75_0[1] = { {26, 1}, }; -static arc arcs_74_1[2] = { +static arc arcs_75_1[2] = { {32, 2}, {0, 1}, }; -static arc arcs_74_2[2] = { +static arc arcs_75_2[2] = { {26, 1}, {0, 2}, }; -static state states_74[3] = { - {1, arcs_74_0}, - {2, arcs_74_1}, - {2, arcs_74_2}, +static state states_75[3] = { + {1, arcs_75_0}, + {2, arcs_75_1}, + {2, arcs_75_2}, }; -static arc arcs_75_0[3] = { +static arc arcs_76_0[3] = { {26, 1}, {34, 2}, - {50, 3}, + {51, 3}, }; -static arc arcs_75_1[4] = { +static arc arcs_76_1[4] = { {27, 4}, - {164, 5}, + {165, 5}, {32, 6}, {0, 1}, }; -static arc arcs_75_2[1] = { - {107, 7}, +static arc arcs_76_2[1] = { + {108, 7}, }; -static arc arcs_75_3[3] = { - {164, 5}, +static arc arcs_76_3[3] = { + {165, 5}, {32, 6}, {0, 3}, }; -static arc arcs_75_4[1] = { +static arc arcs_76_4[1] = { {26, 7}, }; -static arc arcs_75_5[1] = { +static arc arcs_76_5[1] = { {0, 5}, }; -static arc arcs_75_6[3] = { +static arc arcs_76_6[3] = { {26, 8}, - {50, 8}, + {51, 8}, {0, 6}, }; -static arc arcs_75_7[3] = { - {164, 5}, +static arc arcs_76_7[3] = { + {165, 5}, {32, 9}, {0, 7}, }; -static arc arcs_75_8[2] = { +static arc arcs_76_8[2] = { {32, 6}, {0, 8}, }; -static arc arcs_75_9[3] = { +static arc arcs_76_9[3] = { {26, 10}, {34, 11}, {0, 9}, }; -static arc arcs_75_10[1] = { +static arc arcs_76_10[1] = { {27, 12}, }; -static arc arcs_75_11[1] = { - {107, 13}, +static arc arcs_76_11[1] = { + {108, 13}, }; -static arc arcs_75_12[1] = { +static arc arcs_76_12[1] = { {26, 13}, }; -static arc arcs_75_13[2] = { +static arc arcs_76_13[2] = { {32, 9}, {0, 13}, }; -static state states_75[14] = { - {3, arcs_75_0}, - {4, arcs_75_1}, - {1, arcs_75_2}, - {3, arcs_75_3}, - {1, arcs_75_4}, - {1, arcs_75_5}, - {3, arcs_75_6}, - {3, arcs_75_7}, - {2, arcs_75_8}, - {3, arcs_75_9}, - {1, arcs_75_10}, - {1, arcs_75_11}, - {1, arcs_75_12}, - {2, arcs_75_13}, -}; -static arc arcs_76_0[1] = { - {168, 1}, -}; -static arc arcs_76_1[1] = { +static state states_76[14] = { + {3, arcs_76_0}, + {4, arcs_76_1}, + {1, arcs_76_2}, + {3, arcs_76_3}, + {1, arcs_76_4}, + {1, arcs_76_5}, + {3, arcs_76_6}, + {3, arcs_76_7}, + {2, arcs_76_8}, + {3, arcs_76_9}, + {1, arcs_76_10}, + {1, arcs_76_11}, + {1, arcs_76_12}, + {2, arcs_76_13}, +}; +static arc arcs_77_0[1] = { + {169, 1}, +}; +static arc arcs_77_1[1] = { {23, 2}, }; -static arc arcs_76_2[2] = { +static arc arcs_77_2[2] = { {13, 3}, {27, 4}, }; -static arc arcs_76_3[2] = { +static arc arcs_77_3[2] = { {14, 5}, {15, 6}, }; -static arc arcs_76_4[1] = { +static arc arcs_77_4[1] = { {28, 7}, }; -static arc arcs_76_5[1] = { +static arc arcs_77_5[1] = { {15, 6}, }; -static arc arcs_76_6[1] = { +static arc arcs_77_6[1] = { {27, 4}, }; -static arc arcs_76_7[1] = { +static arc arcs_77_7[1] = { {0, 7}, }; -static state states_76[8] = { - {1, arcs_76_0}, - {1, arcs_76_1}, - {2, arcs_76_2}, - {2, arcs_76_3}, - {1, arcs_76_4}, - {1, arcs_76_5}, - {1, arcs_76_6}, - {1, arcs_76_7}, +static state states_77[8] = { + {1, arcs_77_0}, + {1, arcs_77_1}, + {2, arcs_77_2}, + {2, arcs_77_3}, + {1, arcs_77_4}, + {1, arcs_77_5}, + {1, arcs_77_6}, + {1, arcs_77_7}, }; -static arc arcs_77_0[1] = { - {169, 1}, +static arc arcs_78_0[1] = { + {170, 1}, }; -static arc arcs_77_1[2] = { +static arc arcs_78_1[2] = { {32, 2}, {0, 1}, }; -static arc arcs_77_2[2] = { - {169, 1}, +static arc arcs_78_2[2] = { + {170, 1}, {0, 2}, }; -static state states_77[3] = { - {1, arcs_77_0}, - {2, arcs_77_1}, - {2, arcs_77_2}, +static state states_78[3] = { + {1, arcs_78_0}, + {2, arcs_78_1}, + {2, arcs_78_2}, }; -static arc arcs_78_0[3] = { +static arc arcs_79_0[3] = { {26, 1}, {34, 2}, {33, 2}, }; -static arc arcs_78_1[3] = { - {164, 3}, +static arc arcs_79_1[3] = { + {165, 3}, {31, 2}, {0, 1}, }; -static arc arcs_78_2[1] = { +static arc arcs_79_2[1] = { {26, 3}, }; -static arc arcs_78_3[1] = { +static arc arcs_79_3[1] = { {0, 3}, }; -static state states_78[4] = { - {3, arcs_78_0}, - {3, arcs_78_1}, - {1, arcs_78_2}, - {1, arcs_78_3}, +static state states_79[4] = { + {3, arcs_79_0}, + {3, arcs_79_1}, + {1, arcs_79_2}, + {1, arcs_79_3}, }; -static arc arcs_79_0[2] = { - {164, 1}, - {171, 1}, +static arc arcs_80_0[2] = { + {165, 1}, + {172, 1}, }; -static arc arcs_79_1[1] = { +static arc arcs_80_1[1] = { {0, 1}, }; -static state states_79[2] = { - {2, arcs_79_0}, - {1, arcs_79_1}, +static state states_80[2] = { + {2, arcs_80_0}, + {1, arcs_80_1}, }; -static arc arcs_80_0[1] = { - {100, 1}, +static arc arcs_81_0[2] = { + {21, 1}, + {101, 2}, }; -static arc arcs_80_1[1] = { - {65, 2}, +static arc arcs_81_1[1] = { + {101, 2}, }; -static arc arcs_80_2[1] = { - {101, 3}, +static arc arcs_81_2[1] = { + {66, 3}, }; -static arc arcs_80_3[1] = { - {111, 4}, +static arc arcs_81_3[1] = { + {102, 4}, }; -static arc arcs_80_4[2] = { - {170, 5}, - {0, 4}, +static arc arcs_81_4[1] = { + {112, 5}, }; -static arc arcs_80_5[1] = { +static arc arcs_81_5[2] = { + {171, 6}, {0, 5}, }; -static state states_80[6] = { - {1, arcs_80_0}, - {1, arcs_80_1}, - {1, arcs_80_2}, - {1, arcs_80_3}, - {2, arcs_80_4}, - {1, arcs_80_5}, +static arc arcs_81_6[1] = { + {0, 6}, }; -static arc arcs_81_0[1] = { - {96, 1}, +static state states_81[7] = { + {2, arcs_81_0}, + {1, arcs_81_1}, + {1, arcs_81_2}, + {1, arcs_81_3}, + {1, arcs_81_4}, + {2, arcs_81_5}, + {1, arcs_81_6}, }; -static arc arcs_81_1[1] = { - {113, 2}, +static arc arcs_82_0[1] = { + {97, 1}, }; -static arc arcs_81_2[2] = { - {170, 3}, +static arc arcs_82_1[1] = { + {114, 2}, +}; +static arc arcs_82_2[2] = { + {171, 3}, {0, 2}, }; -static arc arcs_81_3[1] = { +static arc arcs_82_3[1] = { {0, 3}, }; -static state states_81[4] = { - {1, arcs_81_0}, - {1, arcs_81_1}, - {2, arcs_81_2}, - {1, arcs_81_3}, +static state states_82[4] = { + {1, arcs_82_0}, + {1, arcs_82_1}, + {2, arcs_82_2}, + {1, arcs_82_3}, }; -static arc arcs_82_0[1] = { +static arc arcs_83_0[1] = { {23, 1}, }; -static arc arcs_82_1[1] = { +static arc arcs_83_1[1] = { {0, 1}, }; -static state states_82[2] = { - {1, arcs_82_0}, - {1, arcs_82_1}, +static state states_83[2] = { + {1, arcs_83_0}, + {1, arcs_83_1}, }; -static arc arcs_83_0[1] = { - {173, 1}, +static arc arcs_84_0[1] = { + {174, 1}, }; -static arc arcs_83_1[2] = { - {174, 2}, +static arc arcs_84_1[2] = { + {175, 2}, {0, 1}, }; -static arc arcs_83_2[1] = { +static arc arcs_84_2[1] = { {0, 2}, }; -static state states_83[3] = { - {1, arcs_83_0}, - {2, arcs_83_1}, - {1, arcs_83_2}, +static state states_84[3] = { + {1, arcs_84_0}, + {2, arcs_84_1}, + {1, arcs_84_2}, }; -static arc arcs_84_0[2] = { - {76, 1}, +static arc arcs_85_0[2] = { + {77, 1}, {9, 2}, }; -static arc arcs_84_1[1] = { +static arc arcs_85_1[1] = { {26, 2}, }; -static arc arcs_84_2[1] = { +static arc arcs_85_2[1] = { {0, 2}, }; -static state states_84[3] = { - {2, arcs_84_0}, - {1, arcs_84_1}, - {1, arcs_84_2}, +static state states_85[3] = { + {2, arcs_85_0}, + {1, arcs_85_1}, + {1, arcs_85_2}, }; -static dfa dfas[85] = { +static dfa dfas[86] = { {256, "single_input", 0, 3, states_0, - "\004\050\340\000\002\000\000\000\005\237\204\003\131\002\010\001\000\140\110\224\017\041"}, + "\004\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"}, {257, "file_input", 0, 2, states_1, - "\204\050\340\000\002\000\000\000\005\237\204\003\131\002\010\001\000\140\110\224\017\041"}, + "\204\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"}, {258, "eval_input", 0, 3, states_2, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, {259, "decorator", 0, 7, states_3, "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {260, "decorators", 0, 2, states_4, @@ -1879,179 +1922,181 @@ static dfa dfas[85] = { "\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {264, "parameters", 0, 4, states_8, "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {265, "typedargslist", 0, 18, states_9, + {265, "typedargslist", 0, 19, states_9, "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {266, "tfpdef", 0, 4, states_10, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {267, "varargslist", 0, 18, states_11, + {267, "varargslist", 0, 19, states_11, "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {268, "vfpdef", 0, 2, states_12, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {269, "stmt", 0, 2, states_13, - "\000\050\340\000\002\000\000\000\005\237\204\003\131\002\010\001\000\140\110\224\017\041"}, + "\000\050\340\000\002\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102"}, {270, "simple_stmt", 0, 4, states_14, - "\000\040\200\000\002\000\000\000\005\237\204\003\000\000\010\001\000\140\110\224\017\040"}, + "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"}, {271, "small_stmt", 0, 2, states_15, - "\000\040\200\000\002\000\000\000\005\237\204\003\000\000\010\001\000\140\110\224\017\040"}, + "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"}, {272, "expr_stmt", 0, 6, states_16, - "\000\040\200\000\002\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {273, "testlist_star_expr", 0, 3, states_17, - "\000\040\200\000\002\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {274, "augassign", 0, 2, states_18, - "\000\000\000\000\000\000\370\377\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {275, "del_stmt", 0, 3, states_19, - "\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {276, "pass_stmt", 0, 2, states_20, - "\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {277, "flow_stmt", 0, 2, states_21, - "\000\000\000\000\000\000\000\000\000\017\000\000\000\000\000\000\000\000\000\000\000\040"}, - {278, "break_stmt", 0, 2, states_22, - "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"}, - {279, "continue_stmt", 0, 2, states_23, + "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {273, "annassign", 0, 5, states_17, + "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + {274, "testlist_star_expr", 0, 3, states_18, + "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {275, "augassign", 0, 2, states_19, + "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + {276, "del_stmt", 0, 3, states_20, + "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + {277, "pass_stmt", 0, 2, states_21, + "\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + {278, "flow_stmt", 0, 2, states_22, + "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\100"}, + {279, "break_stmt", 0, 2, states_23, "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"}, - {280, "return_stmt", 0, 3, states_24, + {280, "continue_stmt", 0, 2, states_24, "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"}, - {281, "yield_stmt", 0, 2, states_25, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040"}, - {282, "raise_stmt", 0, 5, states_26, + {281, "return_stmt", 0, 3, states_25, "\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000"}, - {283, "import_stmt", 0, 2, states_27, - "\000\000\000\000\000\000\000\000\000\220\000\000\000\000\000\000\000\000\000\000\000\000"}, - {284, "import_name", 0, 3, states_28, - "\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000"}, - {285, "import_from", 0, 8, states_29, + {282, "yield_stmt", 0, 2, states_26, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"}, + {283, "raise_stmt", 0, 5, states_27, "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"}, - {286, "import_as_name", 0, 4, states_30, + {284, "import_stmt", 0, 2, states_28, + "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000"}, + {285, "import_name", 0, 3, states_29, + "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"}, + {286, "import_from", 0, 8, states_30, + "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"}, + {287, "import_as_name", 0, 4, states_31, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {287, "dotted_as_name", 0, 4, states_31, + {288, "dotted_as_name", 0, 4, states_32, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {288, "import_as_names", 0, 3, states_32, + {289, "import_as_names", 0, 3, states_33, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {289, "dotted_as_names", 0, 2, states_33, + {290, "dotted_as_names", 0, 2, states_34, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {290, "dotted_name", 0, 2, states_34, + {291, "dotted_name", 0, 2, states_35, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {291, "global_stmt", 0, 3, states_35, - "\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000"}, - {292, "nonlocal_stmt", 0, 3, states_36, + {292, "global_stmt", 0, 3, states_36, "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000"}, - {293, "assert_stmt", 0, 5, states_37, + {293, "nonlocal_stmt", 0, 3, states_37, "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"}, - {294, "compound_stmt", 0, 2, states_38, - "\000\010\140\000\000\000\000\000\000\000\000\000\131\002\000\000\000\000\000\000\000\001"}, - {295, "async_stmt", 0, 3, states_39, + {294, "assert_stmt", 0, 5, states_38, + "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"}, + {295, "compound_stmt", 0, 2, states_39, + "\000\010\140\000\000\000\000\000\000\000\000\000\262\004\000\000\000\000\000\000\000\002"}, + {296, "async_stmt", 0, 3, states_40, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {296, "if_stmt", 0, 8, states_40, - "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"}, - {297, "while_stmt", 0, 8, states_41, - "\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"}, - {298, "for_stmt", 0, 10, states_42, + {297, "if_stmt", 0, 8, states_41, + "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"}, + {298, "while_stmt", 0, 8, states_42, "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"}, - {299, "try_stmt", 0, 13, states_43, - "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"}, - {300, "with_stmt", 0, 5, states_44, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"}, - {301, "with_item", 0, 4, states_45, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {302, "except_clause", 0, 5, states_46, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"}, - {303, "suite", 0, 5, states_47, - "\004\040\200\000\002\000\000\000\005\237\204\003\000\000\010\001\000\140\110\224\017\040"}, - {304, "test", 0, 6, states_48, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {305, "test_nocond", 0, 2, states_49, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {306, "lambdef", 0, 5, states_50, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"}, - {307, "lambdef_nocond", 0, 5, states_51, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"}, - {308, "or_test", 0, 2, states_52, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\001\000\140\110\224\017\000"}, - {309, "and_test", 0, 2, states_53, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\001\000\140\110\224\017\000"}, - {310, "not_test", 0, 3, states_54, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\001\000\140\110\224\017\000"}, - {311, "comparison", 0, 2, states_55, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {312, "comp_op", 0, 4, states_56, - "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\371\007\000\000\000\000\000"}, - {313, "star_expr", 0, 3, states_57, + {299, "for_stmt", 0, 10, states_43, + "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"}, + {300, "try_stmt", 0, 13, states_44, + "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"}, + {301, "with_stmt", 0, 5, states_45, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000"}, + {302, "with_item", 0, 4, states_46, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {303, "except_clause", 0, 5, states_47, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"}, + {304, "suite", 0, 5, states_48, + "\004\040\200\000\002\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100"}, + {305, "test", 0, 6, states_49, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {306, "test_nocond", 0, 2, states_50, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {307, "lambdef", 0, 5, states_51, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"}, + {308, "lambdef_nocond", 0, 5, states_52, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"}, + {309, "or_test", 0, 2, states_53, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"}, + {310, "and_test", 0, 2, states_54, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"}, + {311, "not_test", 0, 3, states_55, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000"}, + {312, "comparison", 0, 2, states_56, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {313, "comp_op", 0, 4, states_57, + "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\362\017\000\000\000\000\000"}, + {314, "star_expr", 0, 3, states_58, "\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {314, "expr", 0, 2, states_58, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {315, "xor_expr", 0, 2, states_59, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {316, "and_expr", 0, 2, states_60, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {317, "shift_expr", 0, 2, states_61, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {318, "arith_expr", 0, 2, states_62, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {319, "term", 0, 2, states_63, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {320, "factor", 0, 3, states_64, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {321, "power", 0, 4, states_65, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\100\224\017\000"}, - {322, "atom_expr", 0, 3, states_66, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\100\224\017\000"}, - {323, "atom", 0, 9, states_67, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\224\017\000"}, - {324, "testlist_comp", 0, 5, states_68, - "\000\040\200\000\002\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {325, "trailer", 0, 7, states_69, - "\000\040\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\004\000\000"}, - {326, "subscriptlist", 0, 3, states_70, - "\000\040\200\010\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {327, "subscript", 0, 5, states_71, - "\000\040\200\010\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {328, "sliceop", 0, 3, states_72, + {315, "expr", 0, 2, states_59, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {316, "xor_expr", 0, 2, states_60, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {317, "and_expr", 0, 2, states_61, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {318, "shift_expr", 0, 2, states_62, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {319, "arith_expr", 0, 2, states_63, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {320, "term", 0, 2, states_64, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {321, "factor", 0, 3, states_65, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {322, "power", 0, 4, states_66, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000"}, + {323, "atom_expr", 0, 3, states_67, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000"}, + {324, "atom", 0, 9, states_68, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\050\037\000"}, + {325, "testlist_comp", 0, 5, states_69, + "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {326, "trailer", 0, 7, states_70, + "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\010\000\000"}, + {327, "subscriptlist", 0, 3, states_71, + "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {328, "subscript", 0, 5, states_72, + "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {329, "sliceop", 0, 3, states_73, "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {329, "exprlist", 0, 3, states_73, - "\000\040\200\000\002\000\000\000\000\000\004\000\000\000\000\000\000\140\110\224\017\000"}, - {330, "testlist", 0, 3, states_74, - "\000\040\200\000\000\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {331, "dictorsetmaker", 0, 14, states_75, - "\000\040\200\000\006\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {332, "classdef", 0, 8, states_76, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"}, - {333, "arglist", 0, 3, states_77, - "\000\040\200\000\006\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {334, "argument", 0, 4, states_78, - "\000\040\200\000\006\000\000\000\000\000\004\000\000\000\010\001\000\140\110\224\017\000"}, - {335, "comp_iter", 0, 2, states_79, - "\000\000\000\000\000\000\000\000\000\000\000\000\021\000\000\000\000\000\000\000\000\000"}, - {336, "comp_for", 0, 6, states_80, - "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"}, - {337, "comp_if", 0, 4, states_81, - "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"}, - {338, "encoding_decl", 0, 2, states_82, + {330, "exprlist", 0, 3, states_74, + "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000"}, + {331, "testlist", 0, 3, states_75, + "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {332, "dictorsetmaker", 0, 14, states_76, + "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {333, "classdef", 0, 8, states_77, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"}, + {334, "arglist", 0, 3, states_78, + "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {335, "argument", 0, 4, states_79, + "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000"}, + {336, "comp_iter", 0, 2, states_80, + "\000\000\040\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000"}, + {337, "comp_for", 0, 7, states_81, + "\000\000\040\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"}, + {338, "comp_if", 0, 4, states_82, + "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"}, + {339, "encoding_decl", 0, 2, states_83, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {339, "yield_expr", 0, 3, states_83, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040"}, - {340, "yield_arg", 0, 3, states_84, - "\000\040\200\000\000\000\000\000\000\020\004\000\000\000\010\001\000\140\110\224\017\000"}, + {340, "yield_expr", 0, 3, states_84, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"}, + {341, "yield_arg", 0, 3, states_85, + "\000\040\200\000\000\000\000\000\000\040\010\000\000\000\020\002\000\300\220\050\037\000"}, }; -static label labels[175] = { +static label labels[176] = { {0, "EMPTY"}, {256, 0}, {4, 0}, {270, 0}, - {294, 0}, + {295, 0}, {257, 0}, {269, 0}, {0, 0}, {258, 0}, - {330, 0}, + {331, 0}, {259, 0}, {49, 0}, - {290, 0}, + {291, 0}, {7, 0}, - {333, 0}, + {334, 0}, {8, 0}, {260, 0}, {261, 0}, - {332, 0}, + {333, 0}, {263, 0}, {262, 0}, {55, 0}, @@ -2059,9 +2104,9 @@ static label labels[175] = { {1, 0}, {264, 0}, {51, 0}, - {304, 0}, + {305, 0}, {11, 0}, - {303, 0}, + {304, 0}, {265, 0}, {266, 0}, {22, 0}, @@ -2073,17 +2118,18 @@ static label labels[175] = { {271, 0}, {13, 0}, {272, 0}, - {275, 0}, {276, 0}, {277, 0}, - {283, 0}, - {291, 0}, + {278, 0}, + {284, 0}, {292, 0}, {293, 0}, - {273, 0}, + {294, 0}, {274, 0}, - {339, 0}, - {313, 0}, + {273, 0}, + {275, 0}, + {340, 0}, + {314, 0}, {36, 0}, {37, 0}, {38, 0}, @@ -2098,37 +2144,37 @@ static label labels[175] = { {46, 0}, {48, 0}, {1, "del"}, - {329, 0}, + {330, 0}, {1, "pass"}, - {278, 0}, {279, 0}, {280, 0}, - {282, 0}, {281, 0}, + {283, 0}, + {282, 0}, {1, "break"}, {1, "continue"}, {1, "return"}, {1, "raise"}, {1, "from"}, - {284, 0}, {285, 0}, + {286, 0}, {1, "import"}, - {289, 0}, + {290, 0}, {23, 0}, {52, 0}, - {288, 0}, - {286, 0}, - {1, "as"}, + {289, 0}, {287, 0}, + {1, "as"}, + {288, 0}, {1, "global"}, {1, "nonlocal"}, {1, "assert"}, - {296, 0}, {297, 0}, {298, 0}, {299, 0}, {300, 0}, - {295, 0}, + {301, 0}, + {296, 0}, {1, "if"}, {1, "elif"}, {1, "else"}, @@ -2136,26 +2182,26 @@ static label labels[175] = { {1, "for"}, {1, "in"}, {1, "try"}, - {302, 0}, + {303, 0}, {1, "finally"}, {1, "with"}, - {301, 0}, - {314, 0}, + {302, 0}, + {315, 0}, {1, "except"}, {5, 0}, {6, 0}, - {308, 0}, - {306, 0}, - {305, 0}, + {309, 0}, {307, 0}, + {306, 0}, + {308, 0}, {1, "lambda"}, - {309, 0}, - {1, "or"}, {310, 0}, + {1, "or"}, + {311, 0}, {1, "and"}, {1, "not"}, - {311, 0}, {312, 0}, + {313, 0}, {20, 0}, {21, 0}, {27, 0}, @@ -2164,54 +2210,54 @@ static label labels[175] = { {28, 0}, {28, 0}, {1, "is"}, - {315, 0}, - {18, 0}, {316, 0}, - {32, 0}, + {18, 0}, {317, 0}, - {19, 0}, + {32, 0}, {318, 0}, + {19, 0}, + {319, 0}, {33, 0}, {34, 0}, - {319, 0}, + {320, 0}, {14, 0}, {15, 0}, - {320, 0}, + {321, 0}, {17, 0}, {24, 0}, {47, 0}, {31, 0}, - {321, 0}, {322, 0}, - {54, 0}, {323, 0}, - {325, 0}, + {54, 0}, {324, 0}, + {326, 0}, + {325, 0}, {9, 0}, {10, 0}, {25, 0}, - {331, 0}, + {332, 0}, {26, 0}, {2, 0}, {3, 0}, {1, "None"}, {1, "True"}, {1, "False"}, - {336, 0}, - {326, 0}, + {337, 0}, {327, 0}, {328, 0}, + {329, 0}, {1, "class"}, - {334, 0}, {335, 0}, - {337, 0}, + {336, 0}, {338, 0}, + {339, 0}, {1, "yield"}, - {340, 0}, + {341, 0}, }; grammar _PyParser_Grammar = { - 85, + 86, dfas, - {175, labels}, + {176, labels}, 256 }; diff --git a/Python/import.c b/Python/import.c index 9d54d59..cd865a5 100644 --- a/Python/import.c +++ b/Python/import.c @@ -38,14 +38,6 @@ module _imp #include "clinic/import.c.h" -/*[python input] -class fs_unicode_converter(CConverter): - type = 'PyObject *' - converter = 'PyUnicode_FSDecoder' - -[python start generated code]*/ -/*[python end generated code: output=da39a3ee5e6b4b0d input=9d6786230166006e]*/ - /* Initialize things */ void @@ -320,7 +312,7 @@ PyImport_GetModuleDict(void) /* List of names to clear in sys */ -static char* sys_deletes[] = { +static const char * const sys_deletes[] = { "path", "argv", "ps1", "ps2", "last_type", "last_value", "last_traceback", "path_hooks", "path_importer_cache", "meta_path", @@ -330,7 +322,7 @@ static char* sys_deletes[] = { NULL }; -static char* sys_files[] = { +static const char * const sys_files[] = { "stdin", "__stdin__", "stdout", "__stdout__", "stderr", "__stderr__", @@ -347,7 +339,7 @@ PyImport_Cleanup(void) PyInterpreterState *interp = PyThreadState_GET()->interp; PyObject *modules = interp->modules; PyObject *weaklist = NULL; - char **p; + const char * const *p; if (modules == NULL) return; /* Already done */ @@ -483,17 +475,9 @@ PyImport_Cleanup(void) #undef STORE_MODULE_WEAKREF } -/* Issue #29537: handle issue27286 bytecode incompatibility - * - * In order to avoid forcing recompilation of all extension modules, we export - * the legacy 3.5.0 magic number here rather than putting it in a header file. - * - * See Lib/importlib/_bootstrap_external.py for general discussion - */ -PY_UINT32_T _Py_BACKCOMPAT_MAGIC_NUMBER = 168627478; -PY_UINT32_T _Py_BACKCOMPAT_HALF_MAGIC = 3350; /* Helper for pythonrun.c -- return magic number and tag. */ + long PyImport_GetMagicNumber(void) { @@ -891,10 +875,8 @@ update_code_filenames(PyCodeObject *co, PyObject *oldname, PyObject *newname) if (PyUnicode_Compare(co->co_filename, oldname)) return; - tmp = co->co_filename; - co->co_filename = newname; - Py_INCREF(co->co_filename); - Py_DECREF(tmp); + Py_INCREF(newname); + Py_XSETREF(co->co_filename, newname); constants = co->co_consts; n = PyTuple_GET_SIZE(constants); @@ -1094,6 +1076,10 @@ _imp_create_builtin(PyObject *module, PyObject *spec) } else { /* Remember pointer to module init function. */ def = PyModule_GetDef(mod); + if (def == NULL) { + Py_DECREF(name); + return NULL; + } def->m_base.m_init = p->initfunc; if (_PyImport_FixupExtensionObject(mod, name, name) < 0) { Py_DECREF(name); @@ -1334,10 +1320,8 @@ remove_importlib_frames(void) if (in_importlib && (always_trim || _PyUnicode_EqualToASCIIString(code->co_name, remove_frames))) { - PyObject *tmp = *outer_link; - *outer_link = next; Py_XINCREF(next); - Py_DECREF(tmp); + Py_XSETREF(*outer_link, next); prev_link = outer_link; } else { @@ -1350,61 +1334,170 @@ done: } -PyObject * -PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, - PyObject *locals, PyObject *given_fromlist, - int level) +static PyObject * +resolve_name(PyObject *name, PyObject *globals, int level) { - _Py_IDENTIFIER(__import__); _Py_IDENTIFIER(__spec__); - _Py_IDENTIFIER(_initializing); _Py_IDENTIFIER(__package__); _Py_IDENTIFIER(__path__); _Py_IDENTIFIER(__name__); - _Py_IDENTIFIER(_find_and_load); - _Py_IDENTIFIER(_handle_fromlist); - _Py_IDENTIFIER(_lock_unlock_module); - _Py_static_string(single_dot, "."); - PyObject *abs_name = NULL; - PyObject *builtins_import = NULL; - PyObject *final_mod = NULL; - PyObject *mod = NULL; + _Py_IDENTIFIER(parent); + PyObject *abs_name; PyObject *package = NULL; - PyObject *globals = NULL; - PyObject *fromlist = NULL; + PyObject *spec; PyInterpreterState *interp = PyThreadState_GET()->interp; - int has_from; + Py_ssize_t last_dot; + PyObject *base; + int level_up; + + if (globals == NULL) { + PyErr_SetString(PyExc_KeyError, "'__name__' not in globals"); + goto error; + } + if (!PyDict_Check(globals)) { + PyErr_SetString(PyExc_TypeError, "globals must be a dict"); + goto error; + } + package = _PyDict_GetItemId(globals, &PyId___package__); + if (package == Py_None) { + package = NULL; + } + spec = _PyDict_GetItemId(globals, &PyId___spec__); - /* Make sure to use default values so as to not have - PyObject_CallMethodObjArgs() truncate the parameter list because of a - NULL argument. */ - if (given_globals == NULL) { - globals = PyDict_New(); - if (globals == NULL) { + if (package != NULL) { + Py_INCREF(package); + if (!PyUnicode_Check(package)) { + PyErr_SetString(PyExc_TypeError, "package must be a string"); + goto error; + } + else if (spec != NULL && spec != Py_None) { + int equal; + PyObject *parent = _PyObject_GetAttrId(spec, &PyId_parent); + if (parent == NULL) { + goto error; + } + + equal = PyObject_RichCompareBool(package, parent, Py_EQ); + Py_DECREF(parent); + if (equal < 0) { + goto error; + } + else if (equal == 0) { + if (PyErr_WarnEx(PyExc_ImportWarning, + "__package__ != __spec__.parent", 1) < 0) { + goto error; + } + } + } + } + else if (spec != NULL && spec != Py_None) { + package = _PyObject_GetAttrId(spec, &PyId_parent); + if (package == NULL) { + goto error; + } + else if (!PyUnicode_Check(package)) { + PyErr_SetString(PyExc_TypeError, + "__spec__.parent must be a string"); goto error; } } else { - /* Only have to care what given_globals is if it will be used - for something. */ - if (level > 0 && !PyDict_Check(given_globals)) { - PyErr_SetString(PyExc_TypeError, "globals must be a dict"); + if (PyErr_WarnEx(PyExc_ImportWarning, + "can't resolve package from __spec__ or __package__, " + "falling back on __name__ and __path__", 1) < 0) { goto error; } - globals = given_globals; - Py_INCREF(globals); + + package = _PyDict_GetItemId(globals, &PyId___name__); + if (package == NULL) { + PyErr_SetString(PyExc_KeyError, "'__name__' not in globals"); + goto error; + } + + Py_INCREF(package); + if (!PyUnicode_Check(package)) { + PyErr_SetString(PyExc_TypeError, "__name__ must be a string"); + goto error; + } + + if (_PyDict_GetItemId(globals, &PyId___path__) == NULL) { + Py_ssize_t dot; + + if (PyUnicode_READY(package) < 0) { + goto error; + } + + dot = PyUnicode_FindChar(package, '.', + 0, PyUnicode_GET_LENGTH(package), -1); + if (dot == -2) { + goto error; + } + + if (dot >= 0) { + PyObject *substr = PyUnicode_Substring(package, 0, dot); + if (substr == NULL) { + goto error; + } + Py_SETREF(package, substr); + } + } } - if (given_fromlist == NULL) { - fromlist = PyList_New(0); - if (fromlist == NULL) { + last_dot = PyUnicode_GET_LENGTH(package); + if (last_dot == 0) { + PyErr_SetString(PyExc_ImportError, + "attempted relative import with no known parent package"); + goto error; + } + else if (PyDict_GetItem(interp->modules, package) == NULL) { + PyErr_Format(PyExc_SystemError, + "Parent module %R not loaded, cannot perform relative " + "import", package); + goto error; + } + + for (level_up = 1; level_up < level; level_up += 1) { + last_dot = PyUnicode_FindChar(package, '.', 0, last_dot, -1); + if (last_dot == -2) { + goto error; + } + else if (last_dot == -1) { + PyErr_SetString(PyExc_ValueError, + "attempted relative import beyond top-level " + "package"); goto error; } } - else { - fromlist = given_fromlist; - Py_INCREF(fromlist); + + base = PyUnicode_Substring(package, 0, last_dot); + Py_DECREF(package); + if (base == NULL || PyUnicode_GET_LENGTH(name) == 0) { + return base; } + + abs_name = PyUnicode_FromFormat("%U.%U", base, name); + Py_DECREF(base); + return abs_name; + + error: + Py_XDECREF(package); + return NULL; +} + +PyObject * +PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals, + PyObject *locals, PyObject *fromlist, + int level) +{ + _Py_IDENTIFIER(_find_and_load); + _Py_IDENTIFIER(_handle_fromlist); + PyObject *abs_name = NULL; + PyObject *final_mod = NULL; + PyObject *mod = NULL; + PyObject *package = NULL; + PyInterpreterState *interp = PyThreadState_GET()->interp; + int has_from; + if (name == NULL) { PyErr_SetString(PyExc_ValueError, "Empty module name"); goto error; @@ -1417,138 +1510,44 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, PyErr_SetString(PyExc_TypeError, "module name must be a string"); goto error; } - else if (PyUnicode_READY(name) < 0) { + if (PyUnicode_READY(name) < 0) { goto error; } if (level < 0) { PyErr_SetString(PyExc_ValueError, "level must be >= 0"); goto error; } - else if (level > 0) { - package = _PyDict_GetItemId(globals, &PyId___package__); - if (package != NULL && package != Py_None) { - Py_INCREF(package); - if (!PyUnicode_Check(package)) { - PyErr_SetString(PyExc_TypeError, "package must be a string"); - goto error; - } - } - else { - package = _PyDict_GetItemId(globals, &PyId___name__); - if (package == NULL) { - PyErr_SetString(PyExc_KeyError, "'__name__' not in globals"); - goto error; - } - else if (!PyUnicode_Check(package)) { - PyErr_SetString(PyExc_TypeError, "__name__ must be a string"); - goto error; - } - Py_INCREF(package); - if (_PyDict_GetItemId(globals, &PyId___path__) == NULL) { - PyObject *partition = NULL; - PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot); - if (borrowed_dot == NULL) { - goto error; - } - partition = PyUnicode_RPartition(package, borrowed_dot); - Py_DECREF(package); - if (partition == NULL) { - goto error; - } - package = PyTuple_GET_ITEM(partition, 0); - Py_INCREF(package); - Py_DECREF(partition); - } - } - if (PyUnicode_GET_LENGTH(package) == 0) { - PyErr_SetString(PyExc_ImportError, - "attempted relative import with no known parent package"); + if (level > 0) { + abs_name = resolve_name(name, globals, level); + if (abs_name == NULL) goto error; - } } else { /* level == 0 */ if (PyUnicode_GET_LENGTH(name) == 0) { PyErr_SetString(PyExc_ValueError, "Empty module name"); goto error; } - package = Py_None; - Py_INCREF(package); - } - - if (level > 0) { - Py_ssize_t last_dot = PyUnicode_GET_LENGTH(package); - PyObject *base = NULL; - int level_up = 1; - - for (level_up = 1; level_up < level; level_up += 1) { - last_dot = PyUnicode_FindChar(package, '.', 0, last_dot, -1); - if (last_dot == -2) { - goto error; - } - else if (last_dot == -1) { - PyErr_SetString(PyExc_ValueError, - "attempted relative import beyond top-level " - "package"); - goto error; - } - } - - base = PyUnicode_Substring(package, 0, last_dot); - if (base == NULL) - goto error; - - if (PyUnicode_GET_LENGTH(name) > 0) { - PyObject *borrowed_dot, *seq = NULL; - - borrowed_dot = _PyUnicode_FromId(&single_dot); - seq = PyTuple_Pack(2, base, name); - Py_DECREF(base); - if (borrowed_dot == NULL || seq == NULL) { - goto error; - } - - abs_name = PyUnicode_Join(borrowed_dot, seq); - Py_DECREF(seq); - if (abs_name == NULL) { - goto error; - } - } - else { - abs_name = base; - } - } - else { abs_name = name; Py_INCREF(abs_name); } -#ifdef WITH_THREAD - _PyImport_AcquireLock(); -#endif - /* From this point forward, goto error_with_unlock! */ - /* XXX interp->builtins_copy is NULL in subinterpreter! */ - builtins_import = _PyDict_GetItemId(interp->builtins_copy ? - interp->builtins_copy : - interp->builtins, &PyId___import__); - if (builtins_import == NULL) { - PyErr_SetString(PyExc_ImportError, "__import__ not found"); - goto error_with_unlock; - } - Py_INCREF(builtins_import); - mod = PyDict_GetItem(interp->modules, abs_name); if (mod == Py_None) { PyObject *msg = PyUnicode_FromFormat("import of %R halted; " "None in sys.modules", abs_name); if (msg != NULL) { - PyErr_SetImportError(msg, abs_name, NULL); + PyErr_SetImportErrorSubclass(PyExc_ModuleNotFoundError, msg, + abs_name, NULL); Py_DECREF(msg); } mod = NULL; - goto error_with_unlock; + goto error; } else if (mod != NULL) { + _Py_IDENTIFIER(__spec__); + _Py_IDENTIFIER(_initializing); + _Py_IDENTIFIER(_lock_unlock_module); PyObject *value = NULL; PyObject *spec; int initializing = 0; @@ -1571,91 +1570,83 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, Py_DECREF(value); if (initializing == -1) PyErr_Clear(); - } - if (initializing > 0) { - /* _bootstrap._lock_unlock_module() releases the import lock */ - value = _PyObject_CallMethodIdObjArgs(interp->importlib, - &PyId__lock_unlock_module, abs_name, - NULL); - if (value == NULL) - goto error; - Py_DECREF(value); - } - else { + if (initializing > 0) { #ifdef WITH_THREAD - if (_PyImport_ReleaseLock() < 0) { - PyErr_SetString(PyExc_RuntimeError, "not holding the import lock"); - goto error; - } + _PyImport_AcquireLock(); #endif + /* _bootstrap._lock_unlock_module() releases the import lock */ + value = _PyObject_CallMethodIdObjArgs(interp->importlib, + &PyId__lock_unlock_module, abs_name, + NULL); + if (value == NULL) + goto error; + Py_DECREF(value); + } } } else { +#ifdef WITH_THREAD + _PyImport_AcquireLock(); +#endif /* _bootstrap._find_and_load() releases the import lock */ mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__find_and_load, abs_name, - builtins_import, NULL); + interp->import_func, NULL); if (mod == NULL) { goto error; } } - /* From now on we don't hold the import lock anymore. */ - has_from = PyObject_IsTrue(fromlist); - if (has_from < 0) - goto error; + has_from = 0; + if (fromlist != NULL && fromlist != Py_None) { + has_from = PyObject_IsTrue(fromlist); + if (has_from < 0) + goto error; + } if (!has_from) { - if (level == 0 || PyUnicode_GET_LENGTH(name) > 0) { - PyObject *front = NULL; - PyObject *partition = NULL; - PyObject *borrowed_dot = _PyUnicode_FromId(&single_dot); + Py_ssize_t len = PyUnicode_GET_LENGTH(name); + if (level == 0 || len > 0) { + Py_ssize_t dot; - if (borrowed_dot == NULL) { + dot = PyUnicode_FindChar(name, '.', 0, len, 1); + if (dot == -2) { goto error; } - partition = PyUnicode_Partition(name, borrowed_dot); - if (partition == NULL) { - goto error; - } - - if (PyUnicode_GET_LENGTH(PyTuple_GET_ITEM(partition, 1)) == 0) { + if (dot == -1) { /* No dot in module name, simple exit */ - Py_DECREF(partition); final_mod = mod; Py_INCREF(mod); goto error; } - front = PyTuple_GET_ITEM(partition, 0); - Py_INCREF(front); - Py_DECREF(partition); - if (level == 0) { - final_mod = PyObject_CallFunctionObjArgs(builtins_import, front, NULL); + PyObject *front = PyUnicode_Substring(name, 0, dot); + if (front == NULL) { + goto error; + } + + final_mod = PyImport_ImportModuleLevelObject(front, NULL, NULL, NULL, 0); Py_DECREF(front); } else { - Py_ssize_t cut_off = PyUnicode_GET_LENGTH(name) - - PyUnicode_GET_LENGTH(front); + Py_ssize_t cut_off = len - dot; Py_ssize_t abs_name_len = PyUnicode_GET_LENGTH(abs_name); PyObject *to_return = PyUnicode_Substring(abs_name, 0, abs_name_len - cut_off); - Py_DECREF(front); if (to_return == NULL) { goto error; } final_mod = PyDict_GetItem(interp->modules, to_return); + Py_DECREF(to_return); if (final_mod == NULL) { PyErr_Format(PyExc_KeyError, "%R not in sys.modules as expected", to_return); + goto error; } - else { - Py_INCREF(final_mod); - } - Py_DECREF(to_return); + Py_INCREF(final_mod); } } else { @@ -1666,24 +1657,14 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, else { final_mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__handle_fromlist, mod, - fromlist, builtins_import, + fromlist, interp->import_func, NULL); } - goto error; - error_with_unlock: -#ifdef WITH_THREAD - if (_PyImport_ReleaseLock() < 0) { - PyErr_SetString(PyExc_RuntimeError, "not holding the import lock"); - } -#endif error: Py_XDECREF(abs_name); - Py_XDECREF(builtins_import); Py_XDECREF(mod); Py_XDECREF(package); - Py_XDECREF(globals); - Py_XDECREF(fromlist); if (final_mod == NULL) remove_importlib_frames(); return final_mod; @@ -1804,13 +1785,9 @@ PyImport_Import(PyObject *module_name) Py_DECREF(r); modules = PyImport_GetModuleDict(); - r = PyDict_GetItemWithError(modules, module_name); - if (r != NULL) { + r = PyDict_GetItem(modules, module_name); + if (r != NULL) Py_INCREF(r); - } - else if (!PyErr_Occurred()) { - PyErr_SetObject(PyExc_KeyError, module_name); - } err: Py_XDECREF(globals); @@ -1963,19 +1940,15 @@ exec_builtin_or_dynamic(PyObject *mod) { def = PyModule_GetDef(mod); if (def == NULL) { - if (PyErr_Occurred()) { - return -1; - } return 0; } + state = PyModule_GetState(mod); - if (PyErr_Occurred()) { - return -1; - } if (state) { /* Already initialized; skip reload */ return 0; } + return PyModule_ExecDef(mod, def); } diff --git a/Python/importdl.c b/Python/importdl.c index ea4f0e7..f56fa94 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -23,8 +23,8 @@ extern dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix, const char *pathname, FILE *fp); #endif -static const char *ascii_only_prefix = "PyInit"; -static const char *nonascii_prefix = "PyInitU"; +static const char * const ascii_only_prefix = "PyInit"; +static const char * const nonascii_prefix = "PyInitU"; /* Get the variable part of a module's export symbol name. * Returns a bytes instance. For non-ASCII-named modules, the name is diff --git a/Python/importlib.h b/Python/importlib.h index aba15fd..195fbfd 100644 --- a/Python/importlib.h +++ b/Python/importlib.h @@ -1,1226 +1,1219 @@ /* Auto-generated by Programs/_freeze_importlib.c */ const unsigned char _Py_M__importlib[] = { - 99,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0, - 0,64,0,0,0,115,169,2,0,0,100,0,0,90,0,0, - 100,1,0,97,1,0,100,2,0,100,3,0,132,0,0,90, - 2,0,100,4,0,100,5,0,132,0,0,90,3,0,71,100, - 6,0,100,7,0,132,0,0,100,7,0,131,2,0,90,4, - 0,105,0,0,90,5,0,105,0,0,90,6,0,71,100,8, - 0,100,9,0,132,0,0,100,9,0,101,7,0,131,3,0, - 90,8,0,71,100,10,0,100,11,0,132,0,0,100,11,0, - 131,2,0,90,9,0,71,100,12,0,100,13,0,132,0,0, - 100,13,0,131,2,0,90,10,0,71,100,14,0,100,15,0, - 132,0,0,100,15,0,131,2,0,90,11,0,100,16,0,100, - 17,0,132,0,0,90,12,0,100,18,0,100,19,0,132,0, - 0,90,13,0,100,20,0,100,21,0,132,0,0,90,14,0, - 100,22,0,100,23,0,100,24,0,100,25,0,132,0,1,90, - 15,0,100,26,0,100,27,0,132,0,0,90,16,0,100,28, - 0,100,29,0,132,0,0,90,17,0,100,30,0,100,31,0, - 132,0,0,90,18,0,100,32,0,100,33,0,132,0,0,90, - 19,0,71,100,34,0,100,35,0,132,0,0,100,35,0,131, - 2,0,90,20,0,71,100,36,0,100,37,0,132,0,0,100, - 37,0,131,2,0,90,21,0,100,38,0,100,1,0,100,39, - 0,100,1,0,100,40,0,100,41,0,132,0,2,90,22,0, - 101,23,0,131,0,0,90,24,0,100,1,0,100,1,0,100, - 42,0,100,43,0,132,2,0,90,25,0,100,44,0,100,45, - 0,100,46,0,100,47,0,132,0,1,90,26,0,100,48,0, - 100,49,0,132,0,0,90,27,0,100,50,0,100,51,0,132, - 0,0,90,28,0,100,52,0,100,53,0,132,0,0,90,29, - 0,100,54,0,100,55,0,132,0,0,90,30,0,100,56,0, - 100,57,0,132,0,0,90,31,0,100,58,0,100,59,0,132, - 0,0,90,32,0,71,100,60,0,100,61,0,132,0,0,100, - 61,0,131,2,0,90,33,0,71,100,62,0,100,63,0,132, - 0,0,100,63,0,131,2,0,90,34,0,71,100,64,0,100, - 65,0,132,0,0,100,65,0,131,2,0,90,35,0,100,66, - 0,100,67,0,132,0,0,90,36,0,100,68,0,100,69,0, - 132,0,0,90,37,0,100,1,0,100,70,0,100,71,0,132, - 1,0,90,38,0,100,72,0,100,73,0,132,0,0,90,39, - 0,100,74,0,90,40,0,101,40,0,100,75,0,23,90,41, - 0,100,76,0,100,77,0,132,0,0,90,42,0,100,78,0, - 100,79,0,132,0,0,90,43,0,100,1,0,100,80,0,100, - 81,0,100,82,0,132,2,0,90,44,0,100,83,0,100,84, - 0,132,0,0,90,45,0,100,85,0,100,86,0,132,0,0, - 90,46,0,100,1,0,100,1,0,102,0,0,100,80,0,100, - 87,0,100,88,0,132,4,0,90,47,0,100,89,0,100,90, - 0,132,0,0,90,48,0,100,91,0,100,92,0,132,0,0, - 90,49,0,100,93,0,100,94,0,132,0,0,90,50,0,100, - 1,0,83,41,95,97,83,1,0,0,67,111,114,101,32,105, - 109,112,108,101,109,101,110,116,97,116,105,111,110,32,111,102, - 32,105,109,112,111,114,116,46,10,10,84,104,105,115,32,109, - 111,100,117,108,101,32,105,115,32,78,79,84,32,109,101,97, - 110,116,32,116,111,32,98,101,32,100,105,114,101,99,116,108, - 121,32,105,109,112,111,114,116,101,100,33,32,73,116,32,104, - 97,115,32,98,101,101,110,32,100,101,115,105,103,110,101,100, - 32,115,117,99,104,10,116,104,97,116,32,105,116,32,99,97, - 110,32,98,101,32,98,111,111,116,115,116,114,97,112,112,101, - 100,32,105,110,116,111,32,80,121,116,104,111,110,32,97,115, - 32,116,104,101,32,105,109,112,108,101,109,101,110,116,97,116, - 105,111,110,32,111,102,32,105,109,112,111,114,116,46,32,65, - 115,10,115,117,99,104,32,105,116,32,114,101,113,117,105,114, - 101,115,32,116,104,101,32,105,110,106,101,99,116,105,111,110, - 32,111,102,32,115,112,101,99,105,102,105,99,32,109,111,100, - 117,108,101,115,32,97,110,100,32,97,116,116,114,105,98,117, - 116,101,115,32,105,110,32,111,114,100,101,114,32,116,111,10, - 119,111,114,107,46,32,79,110,101,32,115,104,111,117,108,100, - 32,117,115,101,32,105,109,112,111,114,116,108,105,98,32,97, - 115,32,116,104,101,32,112,117,98,108,105,99,45,102,97,99, - 105,110,103,32,118,101,114,115,105,111,110,32,111,102,32,116, - 104,105,115,32,109,111,100,117,108,101,46,10,10,78,99,2, - 0,0,0,0,0,0,0,3,0,0,0,7,0,0,0,67, - 0,0,0,115,92,0,0,0,120,66,0,100,1,0,100,2, - 0,100,3,0,100,4,0,103,4,0,68,93,46,0,125,2, - 0,116,0,0,124,1,0,124,2,0,131,2,0,114,19,0, - 116,1,0,124,0,0,124,2,0,116,2,0,124,1,0,124, - 2,0,131,2,0,131,3,0,1,113,19,0,87,124,0,0, - 106,3,0,106,4,0,124,1,0,106,3,0,131,1,0,1, - 100,5,0,83,41,6,122,47,83,105,109,112,108,101,32,115, - 117,98,115,116,105,116,117,116,101,32,102,111,114,32,102,117, - 110,99,116,111,111,108,115,46,117,112,100,97,116,101,95,119, - 114,97,112,112,101,114,46,218,10,95,95,109,111,100,117,108, - 101,95,95,218,8,95,95,110,97,109,101,95,95,218,12,95, - 95,113,117,97,108,110,97,109,101,95,95,218,7,95,95,100, - 111,99,95,95,78,41,5,218,7,104,97,115,97,116,116,114, - 218,7,115,101,116,97,116,116,114,218,7,103,101,116,97,116, - 116,114,218,8,95,95,100,105,99,116,95,95,218,6,117,112, - 100,97,116,101,41,3,90,3,110,101,119,90,3,111,108,100, - 218,7,114,101,112,108,97,99,101,169,0,114,10,0,0,0, - 250,29,60,102,114,111,122,101,110,32,105,109,112,111,114,116, - 108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,218, - 5,95,119,114,97,112,27,0,0,0,115,8,0,0,0,0, - 2,25,1,15,1,29,1,114,12,0,0,0,99,1,0,0, - 0,0,0,0,0,1,0,0,0,2,0,0,0,67,0,0, - 0,115,16,0,0,0,116,0,0,116,1,0,131,1,0,124, - 0,0,131,1,0,83,41,1,78,41,2,218,4,116,121,112, - 101,218,3,115,121,115,41,1,218,4,110,97,109,101,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,11,95, - 110,101,119,95,109,111,100,117,108,101,35,0,0,0,115,2, - 0,0,0,0,1,114,16,0,0,0,99,0,0,0,0,0, - 0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,115, - 58,0,0,0,101,0,0,90,1,0,100,0,0,90,2,0, - 100,1,0,90,3,0,100,2,0,100,3,0,132,0,0,90, - 4,0,100,4,0,100,5,0,132,0,0,90,5,0,100,6, - 0,100,7,0,132,0,0,90,6,0,100,8,0,83,41,9, - 218,13,95,77,97,110,97,103,101,82,101,108,111,97,100,122, - 63,77,97,110,97,103,101,115,32,116,104,101,32,112,111,115, - 115,105,98,108,101,32,99,108,101,97,110,45,117,112,32,111, - 102,32,115,121,115,46,109,111,100,117,108,101,115,32,102,111, - 114,32,108,111,97,100,95,109,111,100,117,108,101,40,41,46, - 99,2,0,0,0,0,0,0,0,2,0,0,0,2,0,0, - 0,67,0,0,0,115,13,0,0,0,124,1,0,124,0,0, - 95,0,0,100,0,0,83,41,1,78,41,1,218,5,95,110, - 97,109,101,41,2,218,4,115,101,108,102,114,15,0,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218, - 8,95,95,105,110,105,116,95,95,43,0,0,0,115,2,0, - 0,0,0,1,122,22,95,77,97,110,97,103,101,82,101,108, - 111,97,100,46,95,95,105,110,105,116,95,95,99,1,0,0, - 0,0,0,0,0,1,0,0,0,2,0,0,0,67,0,0, - 0,115,25,0,0,0,124,0,0,106,0,0,116,1,0,106, - 2,0,107,6,0,124,0,0,95,3,0,100,0,0,83,41, - 1,78,41,4,114,18,0,0,0,114,14,0,0,0,218,7, - 109,111,100,117,108,101,115,218,10,95,105,115,95,114,101,108, - 111,97,100,41,1,114,19,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,218,9,95,95,101,110,116, - 101,114,95,95,46,0,0,0,115,2,0,0,0,0,1,122, - 23,95,77,97,110,97,103,101,82,101,108,111,97,100,46,95, - 95,101,110,116,101,114,95,95,99,1,0,0,0,0,0,0, - 0,2,0,0,0,11,0,0,0,71,0,0,0,115,77,0, - 0,0,116,0,0,100,1,0,100,2,0,132,0,0,124,1, - 0,68,131,1,0,131,1,0,114,73,0,124,0,0,106,1, - 0,12,114,73,0,121,17,0,116,2,0,106,3,0,124,0, - 0,106,4,0,61,87,110,18,0,4,116,5,0,107,10,0, - 114,72,0,1,1,1,89,110,1,0,88,100,0,0,83,41, - 3,78,99,1,0,0,0,0,0,0,0,2,0,0,0,3, - 0,0,0,115,0,0,0,115,27,0,0,0,124,0,0,93, - 17,0,125,1,0,124,1,0,100,0,0,107,9,0,86,1, - 113,3,0,100,0,0,83,41,1,78,114,10,0,0,0,41, - 2,218,2,46,48,218,3,97,114,103,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,250,9,60,103,101,110,101, - 120,112,114,62,50,0,0,0,115,2,0,0,0,6,0,122, - 41,95,77,97,110,97,103,101,82,101,108,111,97,100,46,95, - 95,101,120,105,116,95,95,46,60,108,111,99,97,108,115,62, - 46,60,103,101,110,101,120,112,114,62,41,6,218,3,97,110, - 121,114,22,0,0,0,114,14,0,0,0,114,21,0,0,0, - 114,18,0,0,0,218,8,75,101,121,69,114,114,111,114,41, - 2,114,19,0,0,0,218,4,97,114,103,115,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,218,8,95,95,101, - 120,105,116,95,95,49,0,0,0,115,10,0,0,0,0,1, - 35,1,3,1,17,1,13,1,122,22,95,77,97,110,97,103, - 101,82,101,108,111,97,100,46,95,95,101,120,105,116,95,95, - 78,41,7,114,1,0,0,0,114,0,0,0,0,114,2,0, - 0,0,114,3,0,0,0,114,20,0,0,0,114,23,0,0, - 0,114,30,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,17,0,0,0,39, - 0,0,0,115,8,0,0,0,12,2,6,2,12,3,12,3, - 114,17,0,0,0,99,0,0,0,0,0,0,0,0,0,0, - 0,0,1,0,0,0,64,0,0,0,115,16,0,0,0,101, - 0,0,90,1,0,100,0,0,90,2,0,100,1,0,83,41, - 2,218,14,95,68,101,97,100,108,111,99,107,69,114,114,111, - 114,78,41,3,114,1,0,0,0,114,0,0,0,0,114,2, - 0,0,0,114,10,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,114,31,0,0,0,64,0,0,0, - 115,2,0,0,0,12,1,114,31,0,0,0,99,0,0,0, - 0,0,0,0,0,0,0,0,0,2,0,0,0,64,0,0, - 0,115,82,0,0,0,101,0,0,90,1,0,100,0,0,90, - 2,0,100,1,0,90,3,0,100,2,0,100,3,0,132,0, - 0,90,4,0,100,4,0,100,5,0,132,0,0,90,5,0, - 100,6,0,100,7,0,132,0,0,90,6,0,100,8,0,100, - 9,0,132,0,0,90,7,0,100,10,0,100,11,0,132,0, - 0,90,8,0,100,12,0,83,41,13,218,11,95,77,111,100, - 117,108,101,76,111,99,107,122,169,65,32,114,101,99,117,114, - 115,105,118,101,32,108,111,99,107,32,105,109,112,108,101,109, - 101,110,116,97,116,105,111,110,32,119,104,105,99,104,32,105, - 115,32,97,98,108,101,32,116,111,32,100,101,116,101,99,116, - 32,100,101,97,100,108,111,99,107,115,10,32,32,32,32,40, - 101,46,103,46,32,116,104,114,101,97,100,32,49,32,116,114, - 121,105,110,103,32,116,111,32,116,97,107,101,32,108,111,99, - 107,115,32,65,32,116,104,101,110,32,66,44,32,97,110,100, - 32,116,104,114,101,97,100,32,50,32,116,114,121,105,110,103, - 32,116,111,10,32,32,32,32,116,97,107,101,32,108,111,99, - 107,115,32,66,32,116,104,101,110,32,65,41,46,10,32,32, - 32,32,99,2,0,0,0,0,0,0,0,2,0,0,0,2, - 0,0,0,67,0,0,0,115,70,0,0,0,116,0,0,106, - 1,0,131,0,0,124,0,0,95,2,0,116,0,0,106,1, - 0,131,0,0,124,0,0,95,3,0,124,1,0,124,0,0, - 95,4,0,100,0,0,124,0,0,95,5,0,100,1,0,124, - 0,0,95,6,0,100,1,0,124,0,0,95,7,0,100,0, - 0,83,41,2,78,233,0,0,0,0,41,8,218,7,95,116, - 104,114,101,97,100,90,13,97,108,108,111,99,97,116,101,95, - 108,111,99,107,218,4,108,111,99,107,218,6,119,97,107,101, - 117,112,114,15,0,0,0,218,5,111,119,110,101,114,218,5, - 99,111,117,110,116,218,7,119,97,105,116,101,114,115,41,2, - 114,19,0,0,0,114,15,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,20,0,0,0,74,0, - 0,0,115,12,0,0,0,0,1,15,1,15,1,9,1,9, - 1,9,1,122,20,95,77,111,100,117,108,101,76,111,99,107, - 46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0, - 0,0,4,0,0,0,2,0,0,0,67,0,0,0,115,88, - 0,0,0,116,0,0,106,1,0,131,0,0,125,1,0,124, - 0,0,106,2,0,125,2,0,120,60,0,116,3,0,106,4, - 0,124,2,0,131,1,0,125,3,0,124,3,0,100,0,0, - 107,8,0,114,55,0,100,1,0,83,124,3,0,106,2,0, - 125,2,0,124,2,0,124,1,0,107,2,0,114,24,0,100, - 2,0,83,113,24,0,87,100,0,0,83,41,3,78,70,84, - 41,5,114,34,0,0,0,218,9,103,101,116,95,105,100,101, - 110,116,114,37,0,0,0,218,12,95,98,108,111,99,107,105, - 110,103,95,111,110,218,3,103,101,116,41,4,114,19,0,0, - 0,90,2,109,101,218,3,116,105,100,114,35,0,0,0,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,12, - 104,97,115,95,100,101,97,100,108,111,99,107,82,0,0,0, - 115,18,0,0,0,0,2,12,1,9,1,3,1,15,1,12, - 1,4,1,9,1,12,1,122,24,95,77,111,100,117,108,101, - 76,111,99,107,46,104,97,115,95,100,101,97,100,108,111,99, - 107,99,1,0,0,0,0,0,0,0,2,0,0,0,16,0, - 0,0,67,0,0,0,115,210,0,0,0,116,0,0,106,1, - 0,131,0,0,125,1,0,124,0,0,116,2,0,124,1,0, - 60,122,173,0,120,166,0,124,0,0,106,3,0,143,124,0, - 1,124,0,0,106,4,0,100,1,0,107,2,0,115,68,0, - 124,0,0,106,5,0,124,1,0,107,2,0,114,96,0,124, - 1,0,124,0,0,95,5,0,124,0,0,4,106,4,0,100, - 2,0,55,2,95,4,0,100,3,0,83,124,0,0,106,6, - 0,131,0,0,114,124,0,116,7,0,100,4,0,124,0,0, - 22,131,1,0,130,1,0,124,0,0,106,8,0,106,9,0, - 100,5,0,131,1,0,114,157,0,124,0,0,4,106,10,0, - 100,2,0,55,2,95,10,0,87,100,6,0,81,82,88,124, - 0,0,106,8,0,106,9,0,131,0,0,1,124,0,0,106, - 8,0,106,11,0,131,0,0,1,113,28,0,87,87,100,6, - 0,116,2,0,124,1,0,61,88,100,6,0,83,41,7,122, - 185,10,32,32,32,32,32,32,32,32,65,99,113,117,105,114, - 101,32,116,104,101,32,109,111,100,117,108,101,32,108,111,99, - 107,46,32,32,73,102,32,97,32,112,111,116,101,110,116,105, - 97,108,32,100,101,97,100,108,111,99,107,32,105,115,32,100, - 101,116,101,99,116,101,100,44,10,32,32,32,32,32,32,32, - 32,97,32,95,68,101,97,100,108,111,99,107,69,114,114,111, - 114,32,105,115,32,114,97,105,115,101,100,46,10,32,32,32, - 32,32,32,32,32,79,116,104,101,114,119,105,115,101,44,32, - 116,104,101,32,108,111,99,107,32,105,115,32,97,108,119,97, - 121,115,32,97,99,113,117,105,114,101,100,32,97,110,100,32, - 84,114,117,101,32,105,115,32,114,101,116,117,114,110,101,100, - 46,10,32,32,32,32,32,32,32,32,114,33,0,0,0,233, - 1,0,0,0,84,122,23,100,101,97,100,108,111,99,107,32, - 100,101,116,101,99,116,101,100,32,98,121,32,37,114,70,78, - 41,12,114,34,0,0,0,114,40,0,0,0,114,41,0,0, - 0,114,35,0,0,0,114,38,0,0,0,114,37,0,0,0, - 114,44,0,0,0,114,31,0,0,0,114,36,0,0,0,218, - 7,97,99,113,117,105,114,101,114,39,0,0,0,218,7,114, - 101,108,101,97,115,101,41,2,114,19,0,0,0,114,43,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,114,46,0,0,0,94,0,0,0,115,32,0,0,0,0, - 6,12,1,10,1,3,1,3,1,10,1,30,1,9,1,15, - 1,4,1,12,1,16,1,18,1,22,2,13,1,21,2,122, - 19,95,77,111,100,117,108,101,76,111,99,107,46,97,99,113, - 117,105,114,101,99,1,0,0,0,0,0,0,0,2,0,0, - 0,10,0,0,0,67,0,0,0,115,157,0,0,0,116,0, - 0,106,1,0,131,0,0,125,1,0,124,0,0,106,2,0, - 143,129,0,1,124,0,0,106,3,0,124,1,0,107,3,0, - 114,49,0,116,4,0,100,1,0,131,1,0,130,1,0,124, - 0,0,106,5,0,100,2,0,107,4,0,115,70,0,116,6, - 0,130,1,0,124,0,0,4,106,5,0,100,3,0,56,2, - 95,5,0,124,0,0,106,5,0,100,2,0,107,2,0,114, - 146,0,100,0,0,124,0,0,95,3,0,124,0,0,106,7, - 0,114,146,0,124,0,0,4,106,7,0,100,3,0,56,2, - 95,7,0,124,0,0,106,8,0,106,9,0,131,0,0,1, - 87,100,0,0,81,82,88,100,0,0,83,41,4,78,122,31, - 99,97,110,110,111,116,32,114,101,108,101,97,115,101,32,117, - 110,45,97,99,113,117,105,114,101,100,32,108,111,99,107,114, - 33,0,0,0,114,45,0,0,0,41,10,114,34,0,0,0, - 114,40,0,0,0,114,35,0,0,0,114,37,0,0,0,218, - 12,82,117,110,116,105,109,101,69,114,114,111,114,114,38,0, - 0,0,218,14,65,115,115,101,114,116,105,111,110,69,114,114, - 111,114,114,39,0,0,0,114,36,0,0,0,114,47,0,0, - 0,41,2,114,19,0,0,0,114,43,0,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,114,47,0,0, - 0,119,0,0,0,115,22,0,0,0,0,1,12,1,10,1, - 15,1,12,1,21,1,15,1,15,1,9,1,9,1,15,1, - 122,19,95,77,111,100,117,108,101,76,111,99,107,46,114,101, - 108,101,97,115,101,99,1,0,0,0,0,0,0,0,1,0, - 0,0,4,0,0,0,67,0,0,0,115,25,0,0,0,100, - 1,0,106,0,0,124,0,0,106,1,0,116,2,0,124,0, - 0,131,1,0,131,2,0,83,41,2,78,122,23,95,77,111, - 100,117,108,101,76,111,99,107,40,123,33,114,125,41,32,97, - 116,32,123,125,41,3,218,6,102,111,114,109,97,116,114,15, - 0,0,0,218,2,105,100,41,1,114,19,0,0,0,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,8,95, - 95,114,101,112,114,95,95,132,0,0,0,115,2,0,0,0, - 0,1,122,20,95,77,111,100,117,108,101,76,111,99,107,46, - 95,95,114,101,112,114,95,95,78,41,9,114,1,0,0,0, - 114,0,0,0,0,114,2,0,0,0,114,3,0,0,0,114, - 20,0,0,0,114,44,0,0,0,114,46,0,0,0,114,47, - 0,0,0,114,52,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,114,32,0,0, - 0,68,0,0,0,115,12,0,0,0,12,4,6,2,12,8, - 12,12,12,25,12,13,114,32,0,0,0,99,0,0,0,0, - 0,0,0,0,0,0,0,0,2,0,0,0,64,0,0,0, - 115,70,0,0,0,101,0,0,90,1,0,100,0,0,90,2, - 0,100,1,0,90,3,0,100,2,0,100,3,0,132,0,0, - 90,4,0,100,4,0,100,5,0,132,0,0,90,5,0,100, - 6,0,100,7,0,132,0,0,90,6,0,100,8,0,100,9, - 0,132,0,0,90,7,0,100,10,0,83,41,11,218,16,95, - 68,117,109,109,121,77,111,100,117,108,101,76,111,99,107,122, - 86,65,32,115,105,109,112,108,101,32,95,77,111,100,117,108, - 101,76,111,99,107,32,101,113,117,105,118,97,108,101,110,116, - 32,102,111,114,32,80,121,116,104,111,110,32,98,117,105,108, - 100,115,32,119,105,116,104,111,117,116,10,32,32,32,32,109, - 117,108,116,105,45,116,104,114,101,97,100,105,110,103,32,115, - 117,112,112,111,114,116,46,99,2,0,0,0,0,0,0,0, - 2,0,0,0,2,0,0,0,67,0,0,0,115,22,0,0, - 0,124,1,0,124,0,0,95,0,0,100,1,0,124,0,0, - 95,1,0,100,0,0,83,41,2,78,114,33,0,0,0,41, - 2,114,15,0,0,0,114,38,0,0,0,41,2,114,19,0, - 0,0,114,15,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,114,20,0,0,0,140,0,0,0,115, - 4,0,0,0,0,1,9,1,122,25,95,68,117,109,109,121, + 99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0, + 0,64,0,0,0,115,202,1,0,0,100,0,90,0,100,1, + 97,1,100,2,100,3,132,0,90,2,100,4,100,5,132,0, + 90,3,105,0,90,4,105,0,90,5,71,0,100,6,100,7, + 132,0,100,7,101,6,131,3,90,7,71,0,100,8,100,9, + 132,0,100,9,131,2,90,8,71,0,100,10,100,11,132,0, + 100,11,131,2,90,9,71,0,100,12,100,13,132,0,100,13, + 131,2,90,10,100,14,100,15,132,0,90,11,100,16,100,17, + 132,0,90,12,100,18,100,19,132,0,90,13,100,20,100,21, + 156,1,100,22,100,23,132,2,90,14,100,24,100,25,132,0, + 90,15,100,26,100,27,132,0,90,16,100,28,100,29,132,0, + 90,17,100,30,100,31,132,0,90,18,71,0,100,32,100,33, + 132,0,100,33,131,2,90,19,71,0,100,34,100,35,132,0, + 100,35,131,2,90,20,100,1,100,1,100,36,156,2,100,37, + 100,38,132,2,90,21,101,22,131,0,90,23,100,92,100,39, + 100,40,132,1,90,24,100,41,100,42,156,1,100,43,100,44, + 132,2,90,25,100,45,100,46,132,0,90,26,100,47,100,48, + 132,0,90,27,100,49,100,50,132,0,90,28,100,51,100,52, + 132,0,90,29,100,53,100,54,132,0,90,30,100,55,100,56, + 132,0,90,31,71,0,100,57,100,58,132,0,100,58,131,2, + 90,32,71,0,100,59,100,60,132,0,100,60,131,2,90,33, + 71,0,100,61,100,62,132,0,100,62,131,2,90,34,100,63, + 100,64,132,0,90,35,100,65,100,66,132,0,90,36,100,93, + 100,67,100,68,132,1,90,37,100,69,100,70,132,0,90,38, + 100,71,90,39,101,39,100,72,23,0,90,40,100,73,100,74, + 132,0,90,41,100,75,100,76,132,0,90,42,100,94,100,78, + 100,79,132,1,90,43,100,80,100,81,132,0,90,44,100,82, + 100,83,132,0,90,45,100,1,100,1,102,0,100,77,102,4, + 100,84,100,85,132,1,90,46,100,86,100,87,132,0,90,47, + 100,88,100,89,132,0,90,48,100,90,100,91,132,0,90,49, + 100,1,83,0,41,95,97,83,1,0,0,67,111,114,101,32, + 105,109,112,108,101,109,101,110,116,97,116,105,111,110,32,111, + 102,32,105,109,112,111,114,116,46,10,10,84,104,105,115,32, + 109,111,100,117,108,101,32,105,115,32,78,79,84,32,109,101, + 97,110,116,32,116,111,32,98,101,32,100,105,114,101,99,116, + 108,121,32,105,109,112,111,114,116,101,100,33,32,73,116,32, + 104,97,115,32,98,101,101,110,32,100,101,115,105,103,110,101, + 100,32,115,117,99,104,10,116,104,97,116,32,105,116,32,99, + 97,110,32,98,101,32,98,111,111,116,115,116,114,97,112,112, + 101,100,32,105,110,116,111,32,80,121,116,104,111,110,32,97, + 115,32,116,104,101,32,105,109,112,108,101,109,101,110,116,97, + 116,105,111,110,32,111,102,32,105,109,112,111,114,116,46,32, + 65,115,10,115,117,99,104,32,105,116,32,114,101,113,117,105, + 114,101,115,32,116,104,101,32,105,110,106,101,99,116,105,111, + 110,32,111,102,32,115,112,101,99,105,102,105,99,32,109,111, + 100,117,108,101,115,32,97,110,100,32,97,116,116,114,105,98, + 117,116,101,115,32,105,110,32,111,114,100,101,114,32,116,111, + 10,119,111,114,107,46,32,79,110,101,32,115,104,111,117,108, + 100,32,117,115,101,32,105,109,112,111,114,116,108,105,98,32, + 97,115,32,116,104,101,32,112,117,98,108,105,99,45,102,97, + 99,105,110,103,32,118,101,114,115,105,111,110,32,111,102,32, + 116,104,105,115,32,109,111,100,117,108,101,46,10,10,78,99, + 2,0,0,0,0,0,0,0,3,0,0,0,7,0,0,0, + 67,0,0,0,115,60,0,0,0,120,40,100,6,68,0,93, + 32,125,2,116,0,124,1,124,2,131,2,114,6,116,1,124, + 0,124,2,116,2,124,1,124,2,131,2,131,3,1,0,113, + 6,87,0,124,0,106,3,106,4,124,1,106,3,131,1,1, + 0,100,5,83,0,41,7,122,47,83,105,109,112,108,101,32, + 115,117,98,115,116,105,116,117,116,101,32,102,111,114,32,102, + 117,110,99,116,111,111,108,115,46,117,112,100,97,116,101,95, + 119,114,97,112,112,101,114,46,218,10,95,95,109,111,100,117, + 108,101,95,95,218,8,95,95,110,97,109,101,95,95,218,12, + 95,95,113,117,97,108,110,97,109,101,95,95,218,7,95,95, + 100,111,99,95,95,78,41,4,114,0,0,0,0,114,1,0, + 0,0,114,2,0,0,0,114,3,0,0,0,41,5,218,7, + 104,97,115,97,116,116,114,218,7,115,101,116,97,116,116,114, + 218,7,103,101,116,97,116,116,114,218,8,95,95,100,105,99, + 116,95,95,218,6,117,112,100,97,116,101,41,3,90,3,110, + 101,119,90,3,111,108,100,218,7,114,101,112,108,97,99,101, + 169,0,114,10,0,0,0,250,29,60,102,114,111,122,101,110, + 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, + 115,116,114,97,112,62,218,5,95,119,114,97,112,27,0,0, + 0,115,8,0,0,0,0,2,10,1,10,1,22,1,114,12, + 0,0,0,99,1,0,0,0,0,0,0,0,1,0,0,0, + 2,0,0,0,67,0,0,0,115,12,0,0,0,116,0,116, + 1,131,1,124,0,131,1,83,0,41,1,78,41,2,218,4, + 116,121,112,101,218,3,115,121,115,41,1,218,4,110,97,109, + 101,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 218,11,95,110,101,119,95,109,111,100,117,108,101,35,0,0, + 0,115,2,0,0,0,0,1,114,16,0,0,0,99,0,0, + 0,0,0,0,0,0,0,0,0,0,1,0,0,0,64,0, + 0,0,115,12,0,0,0,101,0,90,1,100,0,90,2,100, + 1,83,0,41,2,218,14,95,68,101,97,100,108,111,99,107, + 69,114,114,111,114,78,41,3,114,1,0,0,0,114,0,0, + 0,0,114,2,0,0,0,114,10,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,114,17,0,0,0, + 47,0,0,0,115,2,0,0,0,8,1,114,17,0,0,0, + 99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0, + 0,64,0,0,0,115,56,0,0,0,101,0,90,1,100,0, + 90,2,100,1,90,3,100,2,100,3,132,0,90,4,100,4, + 100,5,132,0,90,5,100,6,100,7,132,0,90,6,100,8, + 100,9,132,0,90,7,100,10,100,11,132,0,90,8,100,12, + 83,0,41,13,218,11,95,77,111,100,117,108,101,76,111,99, + 107,122,169,65,32,114,101,99,117,114,115,105,118,101,32,108, + 111,99,107,32,105,109,112,108,101,109,101,110,116,97,116,105, + 111,110,32,119,104,105,99,104,32,105,115,32,97,98,108,101, + 32,116,111,32,100,101,116,101,99,116,32,100,101,97,100,108, + 111,99,107,115,10,32,32,32,32,40,101,46,103,46,32,116, + 104,114,101,97,100,32,49,32,116,114,121,105,110,103,32,116, + 111,32,116,97,107,101,32,108,111,99,107,115,32,65,32,116, + 104,101,110,32,66,44,32,97,110,100,32,116,104,114,101,97, + 100,32,50,32,116,114,121,105,110,103,32,116,111,10,32,32, + 32,32,116,97,107,101,32,108,111,99,107,115,32,66,32,116, + 104,101,110,32,65,41,46,10,32,32,32,32,99,2,0,0, + 0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0, + 0,115,48,0,0,0,116,0,106,1,131,0,124,0,95,2, + 116,0,106,1,131,0,124,0,95,3,124,1,124,0,95,4, + 100,0,124,0,95,5,100,1,124,0,95,6,100,1,124,0, + 95,7,100,0,83,0,41,2,78,233,0,0,0,0,41,8, + 218,7,95,116,104,114,101,97,100,90,13,97,108,108,111,99, + 97,116,101,95,108,111,99,107,218,4,108,111,99,107,218,6, + 119,97,107,101,117,112,114,15,0,0,0,218,5,111,119,110, + 101,114,218,5,99,111,117,110,116,218,7,119,97,105,116,101, + 114,115,41,2,218,4,115,101,108,102,114,15,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,8, + 95,95,105,110,105,116,95,95,57,0,0,0,115,12,0,0, + 0,0,1,10,1,10,1,6,1,6,1,6,1,122,20,95, 77,111,100,117,108,101,76,111,99,107,46,95,95,105,110,105, - 116,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0, - 3,0,0,0,67,0,0,0,115,19,0,0,0,124,0,0, - 4,106,0,0,100,1,0,55,2,95,0,0,100,2,0,83, - 41,3,78,114,45,0,0,0,84,41,1,114,38,0,0,0, - 41,1,114,19,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,114,46,0,0,0,144,0,0,0,115, - 4,0,0,0,0,1,15,1,122,24,95,68,117,109,109,121, - 77,111,100,117,108,101,76,111,99,107,46,97,99,113,117,105, - 114,101,99,1,0,0,0,0,0,0,0,1,0,0,0,3, - 0,0,0,67,0,0,0,115,46,0,0,0,124,0,0,106, - 0,0,100,1,0,107,2,0,114,27,0,116,1,0,100,2, - 0,131,1,0,130,1,0,124,0,0,4,106,0,0,100,3, - 0,56,2,95,0,0,100,0,0,83,41,4,78,114,33,0, - 0,0,122,31,99,97,110,110,111,116,32,114,101,108,101,97, - 115,101,32,117,110,45,97,99,113,117,105,114,101,100,32,108, - 111,99,107,114,45,0,0,0,41,2,114,38,0,0,0,114, - 48,0,0,0,41,1,114,19,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,47,0,0,0,148, - 0,0,0,115,6,0,0,0,0,1,15,1,12,1,122,24, - 95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,107, - 46,114,101,108,101,97,115,101,99,1,0,0,0,0,0,0, - 0,1,0,0,0,4,0,0,0,67,0,0,0,115,25,0, - 0,0,100,1,0,106,0,0,124,0,0,106,1,0,116,2, - 0,124,0,0,131,1,0,131,2,0,83,41,2,78,122,28, + 116,95,95,99,1,0,0,0,0,0,0,0,4,0,0,0, + 2,0,0,0,67,0,0,0,115,64,0,0,0,116,0,106, + 1,131,0,125,1,124,0,106,2,125,2,120,44,116,3,106, + 4,124,2,131,1,125,3,124,3,100,0,107,8,114,38,100, + 1,83,0,124,3,106,2,125,2,124,2,124,1,107,2,114, + 16,100,2,83,0,113,16,87,0,100,0,83,0,41,3,78, + 70,84,41,5,114,20,0,0,0,218,9,103,101,116,95,105, + 100,101,110,116,114,23,0,0,0,218,12,95,98,108,111,99, + 107,105,110,103,95,111,110,218,3,103,101,116,41,4,114,26, + 0,0,0,90,2,109,101,218,3,116,105,100,114,21,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 218,12,104,97,115,95,100,101,97,100,108,111,99,107,65,0, + 0,0,115,18,0,0,0,0,2,8,1,6,1,2,1,10, + 1,8,1,4,1,6,1,8,1,122,24,95,77,111,100,117, + 108,101,76,111,99,107,46,104,97,115,95,100,101,97,100,108, + 111,99,107,99,1,0,0,0,0,0,0,0,2,0,0,0, + 16,0,0,0,67,0,0,0,115,168,0,0,0,116,0,106, + 1,131,0,125,1,124,0,116,2,124,1,60,0,122,138,120, + 132,124,0,106,3,143,96,1,0,124,0,106,4,100,1,107, + 2,115,48,124,0,106,5,124,1,107,2,114,72,124,1,124, + 0,95,5,124,0,4,0,106,4,100,2,55,0,2,0,95, + 4,100,3,83,0,124,0,106,6,131,0,114,92,116,7,100, + 4,124,0,22,0,131,1,130,1,124,0,106,8,106,9,100, + 5,131,1,114,118,124,0,4,0,106,10,100,2,55,0,2, + 0,95,10,87,0,100,6,81,0,82,0,88,0,124,0,106, + 8,106,9,131,0,1,0,124,0,106,8,106,11,131,0,1, + 0,113,20,87,0,87,0,100,6,116,2,124,1,61,0,88, + 0,100,6,83,0,41,7,122,185,10,32,32,32,32,32,32, + 32,32,65,99,113,117,105,114,101,32,116,104,101,32,109,111, + 100,117,108,101,32,108,111,99,107,46,32,32,73,102,32,97, + 32,112,111,116,101,110,116,105,97,108,32,100,101,97,100,108, + 111,99,107,32,105,115,32,100,101,116,101,99,116,101,100,44, + 10,32,32,32,32,32,32,32,32,97,32,95,68,101,97,100, + 108,111,99,107,69,114,114,111,114,32,105,115,32,114,97,105, + 115,101,100,46,10,32,32,32,32,32,32,32,32,79,116,104, + 101,114,119,105,115,101,44,32,116,104,101,32,108,111,99,107, + 32,105,115,32,97,108,119,97,121,115,32,97,99,113,117,105, + 114,101,100,32,97,110,100,32,84,114,117,101,32,105,115,32, + 114,101,116,117,114,110,101,100,46,10,32,32,32,32,32,32, + 32,32,114,19,0,0,0,233,1,0,0,0,84,122,23,100, + 101,97,100,108,111,99,107,32,100,101,116,101,99,116,101,100, + 32,98,121,32,37,114,70,78,41,12,114,20,0,0,0,114, + 28,0,0,0,114,29,0,0,0,114,21,0,0,0,114,24, + 0,0,0,114,23,0,0,0,114,32,0,0,0,114,17,0, + 0,0,114,22,0,0,0,218,7,97,99,113,117,105,114,101, + 114,25,0,0,0,218,7,114,101,108,101,97,115,101,41,2, + 114,26,0,0,0,114,31,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,114,34,0,0,0,77,0, + 0,0,115,32,0,0,0,0,6,8,1,8,1,2,1,2, + 1,8,1,20,1,6,1,14,1,4,1,8,1,12,1,12, + 1,24,2,10,1,18,2,122,19,95,77,111,100,117,108,101, + 76,111,99,107,46,97,99,113,117,105,114,101,99,1,0,0, + 0,0,0,0,0,2,0,0,0,10,0,0,0,67,0,0, + 0,115,122,0,0,0,116,0,106,1,131,0,125,1,124,0, + 106,2,143,98,1,0,124,0,106,3,124,1,107,3,114,34, + 116,4,100,1,131,1,130,1,124,0,106,5,100,2,107,4, + 115,48,116,6,130,1,124,0,4,0,106,5,100,3,56,0, + 2,0,95,5,124,0,106,5,100,2,107,2,114,108,100,0, + 124,0,95,3,124,0,106,7,114,108,124,0,4,0,106,7, + 100,3,56,0,2,0,95,7,124,0,106,8,106,9,131,0, + 1,0,87,0,100,0,81,0,82,0,88,0,100,0,83,0, + 41,4,78,122,31,99,97,110,110,111,116,32,114,101,108,101, + 97,115,101,32,117,110,45,97,99,113,117,105,114,101,100,32, + 108,111,99,107,114,19,0,0,0,114,33,0,0,0,41,10, + 114,20,0,0,0,114,28,0,0,0,114,21,0,0,0,114, + 23,0,0,0,218,12,82,117,110,116,105,109,101,69,114,114, + 111,114,114,24,0,0,0,218,14,65,115,115,101,114,116,105, + 111,110,69,114,114,111,114,114,25,0,0,0,114,22,0,0, + 0,114,35,0,0,0,41,2,114,26,0,0,0,114,31,0, + 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,114,35,0,0,0,102,0,0,0,115,22,0,0,0,0, + 1,8,1,8,1,10,1,8,1,14,1,14,1,10,1,6, + 1,6,1,14,1,122,19,95,77,111,100,117,108,101,76,111, + 99,107,46,114,101,108,101,97,115,101,99,1,0,0,0,0, + 0,0,0,1,0,0,0,4,0,0,0,67,0,0,0,115, + 18,0,0,0,100,1,106,0,124,0,106,1,116,2,124,0, + 131,1,131,2,83,0,41,2,78,122,23,95,77,111,100,117, + 108,101,76,111,99,107,40,123,33,114,125,41,32,97,116,32, + 123,125,41,3,218,6,102,111,114,109,97,116,114,15,0,0, + 0,218,2,105,100,41,1,114,26,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,218,8,95,95,114, + 101,112,114,95,95,115,0,0,0,115,2,0,0,0,0,1, + 122,20,95,77,111,100,117,108,101,76,111,99,107,46,95,95, + 114,101,112,114,95,95,78,41,9,114,1,0,0,0,114,0, + 0,0,0,114,2,0,0,0,114,3,0,0,0,114,27,0, + 0,0,114,32,0,0,0,114,34,0,0,0,114,35,0,0, + 0,114,40,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,114,18,0,0,0,51, + 0,0,0,115,12,0,0,0,8,4,4,2,8,8,8,12, + 8,25,8,13,114,18,0,0,0,99,0,0,0,0,0,0, + 0,0,0,0,0,0,2,0,0,0,64,0,0,0,115,48, + 0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,100, + 2,100,3,132,0,90,4,100,4,100,5,132,0,90,5,100, + 6,100,7,132,0,90,6,100,8,100,9,132,0,90,7,100, + 10,83,0,41,11,218,16,95,68,117,109,109,121,77,111,100, + 117,108,101,76,111,99,107,122,86,65,32,115,105,109,112,108, + 101,32,95,77,111,100,117,108,101,76,111,99,107,32,101,113, + 117,105,118,97,108,101,110,116,32,102,111,114,32,80,121,116, + 104,111,110,32,98,117,105,108,100,115,32,119,105,116,104,111, + 117,116,10,32,32,32,32,109,117,108,116,105,45,116,104,114, + 101,97,100,105,110,103,32,115,117,112,112,111,114,116,46,99, + 2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0, + 67,0,0,0,115,16,0,0,0,124,1,124,0,95,0,100, + 1,124,0,95,1,100,0,83,0,41,2,78,114,19,0,0, + 0,41,2,114,15,0,0,0,114,24,0,0,0,41,2,114, + 26,0,0,0,114,15,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,27,0,0,0,123,0,0, + 0,115,4,0,0,0,0,1,6,1,122,25,95,68,117,109, + 109,121,77,111,100,117,108,101,76,111,99,107,46,95,95,105, + 110,105,116,95,95,99,1,0,0,0,0,0,0,0,1,0, + 0,0,3,0,0,0,67,0,0,0,115,18,0,0,0,124, + 0,4,0,106,0,100,1,55,0,2,0,95,0,100,2,83, + 0,41,3,78,114,33,0,0,0,84,41,1,114,24,0,0, + 0,41,1,114,26,0,0,0,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,114,34,0,0,0,127,0,0,0, + 115,4,0,0,0,0,1,14,1,122,24,95,68,117,109,109, + 121,77,111,100,117,108,101,76,111,99,107,46,97,99,113,117, + 105,114,101,99,1,0,0,0,0,0,0,0,1,0,0,0, + 3,0,0,0,67,0,0,0,115,36,0,0,0,124,0,106, + 0,100,1,107,2,114,18,116,1,100,2,131,1,130,1,124, + 0,4,0,106,0,100,3,56,0,2,0,95,0,100,0,83, + 0,41,4,78,114,19,0,0,0,122,31,99,97,110,110,111, + 116,32,114,101,108,101,97,115,101,32,117,110,45,97,99,113, + 117,105,114,101,100,32,108,111,99,107,114,33,0,0,0,41, + 2,114,24,0,0,0,114,36,0,0,0,41,1,114,26,0, + 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,114,35,0,0,0,131,0,0,0,115,6,0,0,0,0, + 1,10,1,8,1,122,24,95,68,117,109,109,121,77,111,100, + 117,108,101,76,111,99,107,46,114,101,108,101,97,115,101,99, + 1,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0, + 67,0,0,0,115,18,0,0,0,100,1,106,0,124,0,106, + 1,116,2,124,0,131,1,131,2,83,0,41,2,78,122,28, 95,68,117,109,109,121,77,111,100,117,108,101,76,111,99,107, - 40,123,33,114,125,41,32,97,116,32,123,125,41,3,114,50, - 0,0,0,114,15,0,0,0,114,51,0,0,0,41,1,114, - 19,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, - 0,0,0,114,52,0,0,0,153,0,0,0,115,2,0,0, + 40,123,33,114,125,41,32,97,116,32,123,125,41,3,114,38, + 0,0,0,114,15,0,0,0,114,39,0,0,0,41,1,114, + 26,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,114,40,0,0,0,136,0,0,0,115,2,0,0, 0,0,1,122,25,95,68,117,109,109,121,77,111,100,117,108, 101,76,111,99,107,46,95,95,114,101,112,114,95,95,78,41, 8,114,1,0,0,0,114,0,0,0,0,114,2,0,0,0, - 114,3,0,0,0,114,20,0,0,0,114,46,0,0,0,114, - 47,0,0,0,114,52,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,114,53,0, - 0,0,136,0,0,0,115,10,0,0,0,12,2,6,2,12, - 4,12,4,12,5,114,53,0,0,0,99,0,0,0,0,0, + 114,3,0,0,0,114,27,0,0,0,114,34,0,0,0,114, + 35,0,0,0,114,40,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,10,0,0,0,114,11,0,0,0,114,41,0, + 0,0,119,0,0,0,115,10,0,0,0,8,2,4,2,8, + 4,8,4,8,5,114,41,0,0,0,99,0,0,0,0,0, 0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,115, - 52,0,0,0,101,0,0,90,1,0,100,0,0,90,2,0, - 100,1,0,100,2,0,132,0,0,90,3,0,100,3,0,100, - 4,0,132,0,0,90,4,0,100,5,0,100,6,0,132,0, - 0,90,5,0,100,7,0,83,41,8,218,18,95,77,111,100, + 36,0,0,0,101,0,90,1,100,0,90,2,100,1,100,2, + 132,0,90,3,100,3,100,4,132,0,90,4,100,5,100,6, + 132,0,90,5,100,7,83,0,41,8,218,18,95,77,111,100, 117,108,101,76,111,99,107,77,97,110,97,103,101,114,99,2, 0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,67, - 0,0,0,115,22,0,0,0,124,1,0,124,0,0,95,0, - 0,100,0,0,124,0,0,95,1,0,100,0,0,83,41,1, - 78,41,2,114,18,0,0,0,218,5,95,108,111,99,107,41, - 2,114,19,0,0,0,114,15,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,20,0,0,0,159, - 0,0,0,115,4,0,0,0,0,1,9,1,122,27,95,77, - 111,100,117,108,101,76,111,99,107,77,97,110,97,103,101,114, - 46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0, - 0,0,1,0,0,0,10,0,0,0,67,0,0,0,115,53, - 0,0,0,122,22,0,116,0,0,124,0,0,106,1,0,131, - 1,0,124,0,0,95,2,0,87,100,0,0,116,3,0,106, - 4,0,131,0,0,1,88,124,0,0,106,2,0,106,5,0, - 131,0,0,1,100,0,0,83,41,1,78,41,6,218,16,95, - 103,101,116,95,109,111,100,117,108,101,95,108,111,99,107,114, - 18,0,0,0,114,55,0,0,0,218,4,95,105,109,112,218, - 12,114,101,108,101,97,115,101,95,108,111,99,107,114,46,0, - 0,0,41,1,114,19,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,114,23,0,0,0,163,0,0, - 0,115,8,0,0,0,0,1,3,1,22,2,11,1,122,28, - 95,77,111,100,117,108,101,76,111,99,107,77,97,110,97,103, - 101,114,46,95,95,101,110,116,101,114,95,95,99,1,0,0, - 0,0,0,0,0,3,0,0,0,1,0,0,0,79,0,0, - 0,115,17,0,0,0,124,0,0,106,0,0,106,1,0,131, - 0,0,1,100,0,0,83,41,1,78,41,2,114,55,0,0, - 0,114,47,0,0,0,41,3,114,19,0,0,0,114,29,0, - 0,0,90,6,107,119,97,114,103,115,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,30,0,0,0,170,0, - 0,0,115,2,0,0,0,0,1,122,27,95,77,111,100,117, - 108,101,76,111,99,107,77,97,110,97,103,101,114,46,95,95, - 101,120,105,116,95,95,78,41,6,114,1,0,0,0,114,0, - 0,0,0,114,2,0,0,0,114,20,0,0,0,114,23,0, - 0,0,114,30,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,114,54,0,0,0, - 157,0,0,0,115,6,0,0,0,12,2,12,4,12,7,114, - 54,0,0,0,99,1,0,0,0,0,0,0,0,3,0,0, - 0,11,0,0,0,3,0,0,0,115,139,0,0,0,100,1, - 0,125,1,0,121,17,0,116,0,0,136,0,0,25,131,0, - 0,125,1,0,87,110,18,0,4,116,1,0,107,10,0,114, - 43,0,1,1,1,89,110,1,0,88,124,1,0,100,1,0, - 107,8,0,114,135,0,116,2,0,100,1,0,107,8,0,114, - 83,0,116,3,0,136,0,0,131,1,0,125,1,0,110,12, - 0,116,4,0,136,0,0,131,1,0,125,1,0,135,0,0, - 102,1,0,100,2,0,100,3,0,134,0,0,125,2,0,116, - 5,0,106,6,0,124,1,0,124,2,0,131,2,0,116,0, - 0,136,0,0,60,124,1,0,83,41,4,122,109,71,101,116, - 32,111,114,32,99,114,101,97,116,101,32,116,104,101,32,109, - 111,100,117,108,101,32,108,111,99,107,32,102,111,114,32,97, - 32,103,105,118,101,110,32,109,111,100,117,108,101,32,110,97, - 109,101,46,10,10,32,32,32,32,83,104,111,117,108,100,32, - 111,110,108,121,32,98,101,32,99,97,108,108,101,100,32,119, - 105,116,104,32,116,104,101,32,105,109,112,111,114,116,32,108, - 111,99,107,32,116,97,107,101,110,46,78,99,1,0,0,0, - 0,0,0,0,1,0,0,0,2,0,0,0,19,0,0,0, - 115,11,0,0,0,116,0,0,136,0,0,61,100,0,0,83, - 41,1,78,41,1,218,13,95,109,111,100,117,108,101,95,108, - 111,99,107,115,41,1,218,1,95,41,1,114,15,0,0,0, - 114,10,0,0,0,114,11,0,0,0,218,2,99,98,190,0, - 0,0,115,2,0,0,0,0,1,122,28,95,103,101,116,95, - 109,111,100,117,108,101,95,108,111,99,107,46,60,108,111,99, - 97,108,115,62,46,99,98,41,7,114,59,0,0,0,114,28, - 0,0,0,114,34,0,0,0,114,53,0,0,0,114,32,0, - 0,0,218,8,95,119,101,97,107,114,101,102,90,3,114,101, - 102,41,3,114,15,0,0,0,114,35,0,0,0,114,61,0, - 0,0,114,10,0,0,0,41,1,114,15,0,0,0,114,11, - 0,0,0,114,56,0,0,0,176,0,0,0,115,24,0,0, - 0,0,4,6,1,3,1,17,1,13,1,5,1,12,1,12, - 1,15,2,12,1,18,2,22,1,114,56,0,0,0,99,1, - 0,0,0,0,0,0,0,2,0,0,0,11,0,0,0,67, - 0,0,0,115,71,0,0,0,116,0,0,124,0,0,131,1, - 0,125,1,0,116,1,0,106,2,0,131,0,0,1,121,14, - 0,124,1,0,106,3,0,131,0,0,1,87,110,18,0,4, - 116,4,0,107,10,0,114,56,0,1,1,1,89,110,11,0, - 88,124,1,0,106,5,0,131,0,0,1,100,1,0,83,41, - 2,97,21,1,0,0,82,101,108,101,97,115,101,32,116,104, - 101,32,103,108,111,98,97,108,32,105,109,112,111,114,116,32, - 108,111,99,107,44,32,97,110,100,32,97,99,113,117,105,114, - 101,115,32,116,104,101,110,32,114,101,108,101,97,115,101,32, - 116,104,101,10,32,32,32,32,109,111,100,117,108,101,32,108, + 0,0,0,115,16,0,0,0,124,1,124,0,95,0,100,0, + 124,0,95,1,100,0,83,0,41,1,78,41,2,218,5,95, + 110,97,109,101,218,5,95,108,111,99,107,41,2,114,26,0, + 0,0,114,15,0,0,0,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,114,27,0,0,0,142,0,0,0,115, + 4,0,0,0,0,1,6,1,122,27,95,77,111,100,117,108, + 101,76,111,99,107,77,97,110,97,103,101,114,46,95,95,105, + 110,105,116,95,95,99,1,0,0,0,0,0,0,0,1,0, + 0,0,10,0,0,0,67,0,0,0,115,42,0,0,0,122, + 16,116,0,124,0,106,1,131,1,124,0,95,2,87,0,100, + 0,116,3,106,4,131,0,1,0,88,0,124,0,106,2,106, + 5,131,0,1,0,100,0,83,0,41,1,78,41,6,218,16, + 95,103,101,116,95,109,111,100,117,108,101,95,108,111,99,107, + 114,43,0,0,0,114,44,0,0,0,218,4,95,105,109,112, + 218,12,114,101,108,101,97,115,101,95,108,111,99,107,114,34, + 0,0,0,41,1,114,26,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,218,9,95,95,101,110,116, + 101,114,95,95,146,0,0,0,115,8,0,0,0,0,1,2, + 1,16,2,10,1,122,28,95,77,111,100,117,108,101,76,111, + 99,107,77,97,110,97,103,101,114,46,95,95,101,110,116,101, + 114,95,95,99,1,0,0,0,0,0,0,0,3,0,0,0, + 1,0,0,0,79,0,0,0,115,14,0,0,0,124,0,106, + 0,106,1,131,0,1,0,100,0,83,0,41,1,78,41,2, + 114,44,0,0,0,114,35,0,0,0,41,3,114,26,0,0, + 0,218,4,97,114,103,115,90,6,107,119,97,114,103,115,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,8, + 95,95,101,120,105,116,95,95,153,0,0,0,115,2,0,0, + 0,0,1,122,27,95,77,111,100,117,108,101,76,111,99,107, + 77,97,110,97,103,101,114,46,95,95,101,120,105,116,95,95, + 78,41,6,114,1,0,0,0,114,0,0,0,0,114,2,0, + 0,0,114,27,0,0,0,114,48,0,0,0,114,50,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,114,42,0,0,0,140,0,0,0,115,6, + 0,0,0,8,2,8,4,8,7,114,42,0,0,0,99,1, + 0,0,0,0,0,0,0,3,0,0,0,11,0,0,0,3, + 0,0,0,115,106,0,0,0,100,1,125,1,121,14,116,0, + 136,0,25,0,131,0,125,1,87,0,110,20,4,0,116,1, + 107,10,114,38,1,0,1,0,1,0,89,0,110,2,88,0, + 124,1,100,1,107,8,114,102,116,2,100,1,107,8,114,66, + 116,3,136,0,131,1,125,1,110,8,116,4,136,0,131,1, + 125,1,135,0,102,1,100,2,100,3,132,8,125,2,116,5, + 106,6,124,1,124,2,131,2,116,0,136,0,60,0,124,1, + 83,0,41,4,122,109,71,101,116,32,111,114,32,99,114,101, + 97,116,101,32,116,104,101,32,109,111,100,117,108,101,32,108, 111,99,107,32,102,111,114,32,97,32,103,105,118,101,110,32, - 109,111,100,117,108,101,32,110,97,109,101,46,10,32,32,32, - 32,84,104,105,115,32,105,115,32,117,115,101,100,32,116,111, - 32,101,110,115,117,114,101,32,97,32,109,111,100,117,108,101, - 32,105,115,32,99,111,109,112,108,101,116,101,108,121,32,105, - 110,105,116,105,97,108,105,122,101,100,44,32,105,110,32,116, - 104,101,10,32,32,32,32,101,118,101,110,116,32,105,116,32, - 105,115,32,98,101,105,110,103,32,105,109,112,111,114,116,101, - 100,32,98,121,32,97,110,111,116,104,101,114,32,116,104,114, - 101,97,100,46,10,10,32,32,32,32,83,104,111,117,108,100, - 32,111,110,108,121,32,98,101,32,99,97,108,108,101,100,32, - 119,105,116,104,32,116,104,101,32,105,109,112,111,114,116,32, - 108,111,99,107,32,116,97,107,101,110,46,78,41,6,114,56, - 0,0,0,114,57,0,0,0,114,58,0,0,0,114,46,0, - 0,0,114,31,0,0,0,114,47,0,0,0,41,2,114,15, - 0,0,0,114,35,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,218,19,95,108,111,99,107,95,117, - 110,108,111,99,107,95,109,111,100,117,108,101,195,0,0,0, - 115,14,0,0,0,0,7,12,1,10,1,3,1,14,1,13, - 3,5,2,114,63,0,0,0,99,1,0,0,0,0,0,0, - 0,3,0,0,0,3,0,0,0,79,0,0,0,115,13,0, - 0,0,124,0,0,124,1,0,124,2,0,142,0,0,83,41, - 1,97,46,1,0,0,114,101,109,111,118,101,95,105,109,112, - 111,114,116,108,105,98,95,102,114,97,109,101,115,32,105,110, - 32,105,109,112,111,114,116,46,99,32,119,105,108,108,32,97, - 108,119,97,121,115,32,114,101,109,111,118,101,32,115,101,113, - 117,101,110,99,101,115,10,32,32,32,32,111,102,32,105,109, - 112,111,114,116,108,105,98,32,102,114,97,109,101,115,32,116, - 104,97,116,32,101,110,100,32,119,105,116,104,32,97,32,99, - 97,108,108,32,116,111,32,116,104,105,115,32,102,117,110,99, - 116,105,111,110,10,10,32,32,32,32,85,115,101,32,105,116, - 32,105,110,115,116,101,97,100,32,111,102,32,97,32,110,111, - 114,109,97,108,32,99,97,108,108,32,105,110,32,112,108,97, - 99,101,115,32,119,104,101,114,101,32,105,110,99,108,117,100, - 105,110,103,32,116,104,101,32,105,109,112,111,114,116,108,105, - 98,10,32,32,32,32,102,114,97,109,101,115,32,105,110,116, - 114,111,100,117,99,101,115,32,117,110,119,97,110,116,101,100, - 32,110,111,105,115,101,32,105,110,116,111,32,116,104,101,32, - 116,114,97,99,101,98,97,99,107,32,40,101,46,103,46,32, - 119,104,101,110,32,101,120,101,99,117,116,105,110,103,10,32, - 32,32,32,109,111,100,117,108,101,32,99,111,100,101,41,10, - 32,32,32,32,114,10,0,0,0,41,3,218,1,102,114,29, - 0,0,0,90,4,107,119,100,115,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,218,25,95,99,97,108,108,95, - 119,105,116,104,95,102,114,97,109,101,115,95,114,101,109,111, - 118,101,100,214,0,0,0,115,2,0,0,0,0,8,114,65, - 0,0,0,218,9,118,101,114,98,111,115,105,116,121,114,45, - 0,0,0,99,1,0,0,0,1,0,0,0,3,0,0,0, - 4,0,0,0,71,0,0,0,115,75,0,0,0,116,0,0, - 106,1,0,106,2,0,124,1,0,107,5,0,114,71,0,124, - 0,0,106,3,0,100,6,0,131,1,0,115,43,0,100,3, - 0,124,0,0,23,125,0,0,116,4,0,124,0,0,106,5, - 0,124,2,0,140,0,0,100,4,0,116,0,0,106,6,0, - 131,1,1,1,100,5,0,83,41,7,122,61,80,114,105,110, - 116,32,116,104,101,32,109,101,115,115,97,103,101,32,116,111, - 32,115,116,100,101,114,114,32,105,102,32,45,118,47,80,89, - 84,72,79,78,86,69,82,66,79,83,69,32,105,115,32,116, - 117,114,110,101,100,32,111,110,46,250,1,35,250,7,105,109, - 112,111,114,116,32,122,2,35,32,90,4,102,105,108,101,78, - 41,2,114,67,0,0,0,114,68,0,0,0,41,7,114,14, + 109,111,100,117,108,101,32,110,97,109,101,46,10,10,32,32, + 32,32,83,104,111,117,108,100,32,111,110,108,121,32,98,101, + 32,99,97,108,108,101,100,32,119,105,116,104,32,116,104,101, + 32,105,109,112,111,114,116,32,108,111,99,107,32,116,97,107, + 101,110,46,78,99,1,0,0,0,0,0,0,0,1,0,0, + 0,2,0,0,0,19,0,0,0,115,10,0,0,0,116,0, + 136,0,61,0,100,0,83,0,41,1,78,41,1,218,13,95, + 109,111,100,117,108,101,95,108,111,99,107,115,41,1,218,1, + 95,41,1,114,15,0,0,0,114,10,0,0,0,114,11,0, + 0,0,218,2,99,98,173,0,0,0,115,2,0,0,0,0, + 1,122,28,95,103,101,116,95,109,111,100,117,108,101,95,108, + 111,99,107,46,60,108,111,99,97,108,115,62,46,99,98,41, + 7,114,51,0,0,0,218,8,75,101,121,69,114,114,111,114, + 114,20,0,0,0,114,41,0,0,0,114,18,0,0,0,218, + 8,95,119,101,97,107,114,101,102,90,3,114,101,102,41,3, + 114,15,0,0,0,114,21,0,0,0,114,53,0,0,0,114, + 10,0,0,0,41,1,114,15,0,0,0,114,11,0,0,0, + 114,45,0,0,0,159,0,0,0,115,24,0,0,0,0,4, + 4,1,2,1,14,1,14,1,6,1,8,1,8,1,10,2, + 8,1,12,2,16,1,114,45,0,0,0,99,1,0,0,0, + 0,0,0,0,2,0,0,0,11,0,0,0,67,0,0,0, + 115,62,0,0,0,116,0,124,0,131,1,125,1,116,1,106, + 2,131,0,1,0,121,12,124,1,106,3,131,0,1,0,87, + 0,110,20,4,0,116,4,107,10,114,48,1,0,1,0,1, + 0,89,0,110,10,88,0,124,1,106,5,131,0,1,0,100, + 1,83,0,41,2,97,21,1,0,0,82,101,108,101,97,115, + 101,32,116,104,101,32,103,108,111,98,97,108,32,105,109,112, + 111,114,116,32,108,111,99,107,44,32,97,110,100,32,97,99, + 113,117,105,114,101,115,32,116,104,101,110,32,114,101,108,101, + 97,115,101,32,116,104,101,10,32,32,32,32,109,111,100,117, + 108,101,32,108,111,99,107,32,102,111,114,32,97,32,103,105, + 118,101,110,32,109,111,100,117,108,101,32,110,97,109,101,46, + 10,32,32,32,32,84,104,105,115,32,105,115,32,117,115,101, + 100,32,116,111,32,101,110,115,117,114,101,32,97,32,109,111, + 100,117,108,101,32,105,115,32,99,111,109,112,108,101,116,101, + 108,121,32,105,110,105,116,105,97,108,105,122,101,100,44,32, + 105,110,32,116,104,101,10,32,32,32,32,101,118,101,110,116, + 32,105,116,32,105,115,32,98,101,105,110,103,32,105,109,112, + 111,114,116,101,100,32,98,121,32,97,110,111,116,104,101,114, + 32,116,104,114,101,97,100,46,10,10,32,32,32,32,83,104, + 111,117,108,100,32,111,110,108,121,32,98,101,32,99,97,108, + 108,101,100,32,119,105,116,104,32,116,104,101,32,105,109,112, + 111,114,116,32,108,111,99,107,32,116,97,107,101,110,46,78, + 41,6,114,45,0,0,0,114,46,0,0,0,114,47,0,0, + 0,114,34,0,0,0,114,17,0,0,0,114,35,0,0,0, + 41,2,114,15,0,0,0,114,21,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,218,19,95,108,111, + 99,107,95,117,110,108,111,99,107,95,109,111,100,117,108,101, + 178,0,0,0,115,14,0,0,0,0,7,8,1,8,1,2, + 1,12,1,14,3,6,2,114,56,0,0,0,99,1,0,0, + 0,0,0,0,0,3,0,0,0,3,0,0,0,79,0,0, + 0,115,10,0,0,0,124,0,124,1,124,2,142,1,83,0, + 41,1,97,46,1,0,0,114,101,109,111,118,101,95,105,109, + 112,111,114,116,108,105,98,95,102,114,97,109,101,115,32,105, + 110,32,105,109,112,111,114,116,46,99,32,119,105,108,108,32, + 97,108,119,97,121,115,32,114,101,109,111,118,101,32,115,101, + 113,117,101,110,99,101,115,10,32,32,32,32,111,102,32,105, + 109,112,111,114,116,108,105,98,32,102,114,97,109,101,115,32, + 116,104,97,116,32,101,110,100,32,119,105,116,104,32,97,32, + 99,97,108,108,32,116,111,32,116,104,105,115,32,102,117,110, + 99,116,105,111,110,10,10,32,32,32,32,85,115,101,32,105, + 116,32,105,110,115,116,101,97,100,32,111,102,32,97,32,110, + 111,114,109,97,108,32,99,97,108,108,32,105,110,32,112,108, + 97,99,101,115,32,119,104,101,114,101,32,105,110,99,108,117, + 100,105,110,103,32,116,104,101,32,105,109,112,111,114,116,108, + 105,98,10,32,32,32,32,102,114,97,109,101,115,32,105,110, + 116,114,111,100,117,99,101,115,32,117,110,119,97,110,116,101, + 100,32,110,111,105,115,101,32,105,110,116,111,32,116,104,101, + 32,116,114,97,99,101,98,97,99,107,32,40,101,46,103,46, + 32,119,104,101,110,32,101,120,101,99,117,116,105,110,103,10, + 32,32,32,32,109,111,100,117,108,101,32,99,111,100,101,41, + 10,32,32,32,32,114,10,0,0,0,41,3,218,1,102,114, + 49,0,0,0,90,4,107,119,100,115,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,218,25,95,99,97,108,108, + 95,119,105,116,104,95,102,114,97,109,101,115,95,114,101,109, + 111,118,101,100,197,0,0,0,115,2,0,0,0,0,8,114, + 58,0,0,0,114,33,0,0,0,41,1,218,9,118,101,114, + 98,111,115,105,116,121,99,1,0,0,0,1,0,0,0,3, + 0,0,0,5,0,0,0,71,0,0,0,115,54,0,0,0, + 116,0,106,1,106,2,124,1,107,5,114,50,124,0,106,3, + 100,6,131,1,115,30,100,3,124,0,23,0,125,0,116,4, + 124,0,106,5,124,2,142,0,116,0,106,6,100,4,141,2, + 1,0,100,5,83,0,41,7,122,61,80,114,105,110,116,32, + 116,104,101,32,109,101,115,115,97,103,101,32,116,111,32,115, + 116,100,101,114,114,32,105,102,32,45,118,47,80,89,84,72, + 79,78,86,69,82,66,79,83,69,32,105,115,32,116,117,114, + 110,101,100,32,111,110,46,250,1,35,250,7,105,109,112,111, + 114,116,32,122,2,35,32,41,1,90,4,102,105,108,101,78, + 41,2,114,60,0,0,0,114,61,0,0,0,41,7,114,14, 0,0,0,218,5,102,108,97,103,115,218,7,118,101,114,98, 111,115,101,218,10,115,116,97,114,116,115,119,105,116,104,218, - 5,112,114,105,110,116,114,50,0,0,0,218,6,115,116,100, - 101,114,114,41,3,218,7,109,101,115,115,97,103,101,114,66, - 0,0,0,114,29,0,0,0,114,10,0,0,0,114,10,0, + 5,112,114,105,110,116,114,38,0,0,0,218,6,115,116,100, + 101,114,114,41,3,218,7,109,101,115,115,97,103,101,114,59, + 0,0,0,114,49,0,0,0,114,10,0,0,0,114,10,0, 0,0,114,11,0,0,0,218,16,95,118,101,114,98,111,115, - 101,95,109,101,115,115,97,103,101,225,0,0,0,115,8,0, - 0,0,0,2,18,1,15,1,10,1,114,75,0,0,0,99, + 101,95,109,101,115,115,97,103,101,208,0,0,0,115,8,0, + 0,0,0,2,12,1,10,1,8,1,114,68,0,0,0,99, + 1,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0, + 3,0,0,0,115,26,0,0,0,135,0,102,1,100,1,100, + 2,132,8,125,1,116,0,124,1,136,0,131,2,1,0,124, + 1,83,0,41,3,122,49,68,101,99,111,114,97,116,111,114, + 32,116,111,32,118,101,114,105,102,121,32,116,104,101,32,110, + 97,109,101,100,32,109,111,100,117,108,101,32,105,115,32,98, + 117,105,108,116,45,105,110,46,99,2,0,0,0,0,0,0, + 0,2,0,0,0,4,0,0,0,19,0,0,0,115,38,0, + 0,0,124,1,116,0,106,1,107,7,114,28,116,2,100,1, + 106,3,124,1,131,1,124,1,100,2,141,2,130,1,136,0, + 124,0,124,1,131,2,83,0,41,3,78,122,29,123,33,114, + 125,32,105,115,32,110,111,116,32,97,32,98,117,105,108,116, + 45,105,110,32,109,111,100,117,108,101,41,1,114,15,0,0, + 0,41,4,114,14,0,0,0,218,20,98,117,105,108,116,105, + 110,95,109,111,100,117,108,101,95,110,97,109,101,115,218,11, + 73,109,112,111,114,116,69,114,114,111,114,114,38,0,0,0, + 41,2,114,26,0,0,0,218,8,102,117,108,108,110,97,109, + 101,41,1,218,3,102,120,110,114,10,0,0,0,114,11,0, + 0,0,218,25,95,114,101,113,117,105,114,101,115,95,98,117, + 105,108,116,105,110,95,119,114,97,112,112,101,114,218,0,0, + 0,115,8,0,0,0,0,1,10,1,10,1,8,1,122,52, + 95,114,101,113,117,105,114,101,115,95,98,117,105,108,116,105, + 110,46,60,108,111,99,97,108,115,62,46,95,114,101,113,117, + 105,114,101,115,95,98,117,105,108,116,105,110,95,119,114,97, + 112,112,101,114,41,1,114,12,0,0,0,41,2,114,72,0, + 0,0,114,73,0,0,0,114,10,0,0,0,41,1,114,72, + 0,0,0,114,11,0,0,0,218,17,95,114,101,113,117,105, + 114,101,115,95,98,117,105,108,116,105,110,216,0,0,0,115, + 6,0,0,0,0,2,12,5,10,1,114,74,0,0,0,99, 1,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0, - 3,0,0,0,115,35,0,0,0,135,0,0,102,1,0,100, - 1,0,100,2,0,134,0,0,125,1,0,116,0,0,124,1, - 0,136,0,0,131,2,0,1,124,1,0,83,41,3,122,49, - 68,101,99,111,114,97,116,111,114,32,116,111,32,118,101,114, - 105,102,121,32,116,104,101,32,110,97,109,101,100,32,109,111, - 100,117,108,101,32,105,115,32,98,117,105,108,116,45,105,110, - 46,99,2,0,0,0,0,0,0,0,2,0,0,0,4,0, - 0,0,19,0,0,0,115,55,0,0,0,124,1,0,116,0, - 0,106,1,0,107,7,0,114,42,0,116,2,0,100,1,0, - 106,3,0,124,1,0,131,1,0,100,2,0,124,1,0,131, - 1,1,130,1,0,136,0,0,124,0,0,124,1,0,131,2, - 0,83,41,3,78,122,29,123,33,114,125,32,105,115,32,110, - 111,116,32,97,32,98,117,105,108,116,45,105,110,32,109,111, - 100,117,108,101,114,15,0,0,0,41,4,114,14,0,0,0, - 218,20,98,117,105,108,116,105,110,95,109,111,100,117,108,101, - 95,110,97,109,101,115,218,11,73,109,112,111,114,116,69,114, - 114,111,114,114,50,0,0,0,41,2,114,19,0,0,0,218, - 8,102,117,108,108,110,97,109,101,41,1,218,3,102,120,110, - 114,10,0,0,0,114,11,0,0,0,218,25,95,114,101,113, - 117,105,114,101,115,95,98,117,105,108,116,105,110,95,119,114, - 97,112,112,101,114,235,0,0,0,115,8,0,0,0,0,1, - 15,1,18,1,9,1,122,52,95,114,101,113,117,105,114,101, - 115,95,98,117,105,108,116,105,110,46,60,108,111,99,97,108, - 115,62,46,95,114,101,113,117,105,114,101,115,95,98,117,105, - 108,116,105,110,95,119,114,97,112,112,101,114,41,1,114,12, - 0,0,0,41,2,114,79,0,0,0,114,80,0,0,0,114, - 10,0,0,0,41,1,114,79,0,0,0,114,11,0,0,0, - 218,17,95,114,101,113,117,105,114,101,115,95,98,117,105,108, - 116,105,110,233,0,0,0,115,6,0,0,0,0,2,18,5, - 13,1,114,81,0,0,0,99,1,0,0,0,0,0,0,0, - 2,0,0,0,3,0,0,0,3,0,0,0,115,35,0,0, - 0,135,0,0,102,1,0,100,1,0,100,2,0,134,0,0, - 125,1,0,116,0,0,124,1,0,136,0,0,131,2,0,1, - 124,1,0,83,41,3,122,47,68,101,99,111,114,97,116,111, - 114,32,116,111,32,118,101,114,105,102,121,32,116,104,101,32, - 110,97,109,101,100,32,109,111,100,117,108,101,32,105,115,32, - 102,114,111,122,101,110,46,99,2,0,0,0,0,0,0,0, - 2,0,0,0,4,0,0,0,19,0,0,0,115,55,0,0, - 0,116,0,0,106,1,0,124,1,0,131,1,0,115,42,0, - 116,2,0,100,1,0,106,3,0,124,1,0,131,1,0,100, - 2,0,124,1,0,131,1,1,130,1,0,136,0,0,124,0, - 0,124,1,0,131,2,0,83,41,3,78,122,27,123,33,114, - 125,32,105,115,32,110,111,116,32,97,32,102,114,111,122,101, - 110,32,109,111,100,117,108,101,114,15,0,0,0,41,4,114, - 57,0,0,0,218,9,105,115,95,102,114,111,122,101,110,114, - 77,0,0,0,114,50,0,0,0,41,2,114,19,0,0,0, - 114,78,0,0,0,41,1,114,79,0,0,0,114,10,0,0, + 3,0,0,0,115,26,0,0,0,135,0,102,1,100,1,100, + 2,132,8,125,1,116,0,124,1,136,0,131,2,1,0,124, + 1,83,0,41,3,122,47,68,101,99,111,114,97,116,111,114, + 32,116,111,32,118,101,114,105,102,121,32,116,104,101,32,110, + 97,109,101,100,32,109,111,100,117,108,101,32,105,115,32,102, + 114,111,122,101,110,46,99,2,0,0,0,0,0,0,0,2, + 0,0,0,4,0,0,0,19,0,0,0,115,38,0,0,0, + 116,0,106,1,124,1,131,1,115,28,116,2,100,1,106,3, + 124,1,131,1,124,1,100,2,141,2,130,1,136,0,124,0, + 124,1,131,2,83,0,41,3,78,122,27,123,33,114,125,32, + 105,115,32,110,111,116,32,97,32,102,114,111,122,101,110,32, + 109,111,100,117,108,101,41,1,114,15,0,0,0,41,4,114, + 46,0,0,0,218,9,105,115,95,102,114,111,122,101,110,114, + 70,0,0,0,114,38,0,0,0,41,2,114,26,0,0,0, + 114,71,0,0,0,41,1,114,72,0,0,0,114,10,0,0, 0,114,11,0,0,0,218,24,95,114,101,113,117,105,114,101, 115,95,102,114,111,122,101,110,95,119,114,97,112,112,101,114, - 246,0,0,0,115,8,0,0,0,0,1,15,1,18,1,9, + 229,0,0,0,115,8,0,0,0,0,1,10,1,10,1,8, 1,122,50,95,114,101,113,117,105,114,101,115,95,102,114,111, 122,101,110,46,60,108,111,99,97,108,115,62,46,95,114,101, 113,117,105,114,101,115,95,102,114,111,122,101,110,95,119,114, - 97,112,112,101,114,41,1,114,12,0,0,0,41,2,114,79, - 0,0,0,114,83,0,0,0,114,10,0,0,0,41,1,114, - 79,0,0,0,114,11,0,0,0,218,16,95,114,101,113,117, - 105,114,101,115,95,102,114,111,122,101,110,244,0,0,0,115, - 6,0,0,0,0,2,18,5,13,1,114,84,0,0,0,99, + 97,112,112,101,114,41,1,114,12,0,0,0,41,2,114,72, + 0,0,0,114,76,0,0,0,114,10,0,0,0,41,1,114, + 72,0,0,0,114,11,0,0,0,218,16,95,114,101,113,117, + 105,114,101,115,95,102,114,111,122,101,110,227,0,0,0,115, + 6,0,0,0,0,2,12,5,10,1,114,77,0,0,0,99, 2,0,0,0,0,0,0,0,4,0,0,0,3,0,0,0, - 67,0,0,0,115,81,0,0,0,116,0,0,124,1,0,124, - 0,0,131,2,0,125,2,0,124,1,0,116,1,0,106,2, - 0,107,6,0,114,67,0,116,1,0,106,2,0,124,1,0, - 25,125,3,0,116,3,0,124,2,0,124,3,0,131,2,0, - 1,116,1,0,106,2,0,124,1,0,25,83,116,4,0,124, - 2,0,131,1,0,83,100,1,0,83,41,2,122,128,76,111, - 97,100,32,116,104,101,32,115,112,101,99,105,102,105,101,100, - 32,109,111,100,117,108,101,32,105,110,116,111,32,115,121,115, - 46,109,111,100,117,108,101,115,32,97,110,100,32,114,101,116, - 117,114,110,32,105,116,46,10,10,32,32,32,32,84,104,105, - 115,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, - 101,99,97,116,101,100,46,32,32,85,115,101,32,108,111,97, - 100,101,114,46,101,120,101,99,95,109,111,100,117,108,101,32, - 105,110,115,116,101,97,100,46,10,10,32,32,32,32,78,41, - 5,218,16,115,112,101,99,95,102,114,111,109,95,108,111,97, - 100,101,114,114,14,0,0,0,114,21,0,0,0,218,5,95, - 101,120,101,99,218,5,95,108,111,97,100,41,4,114,19,0, - 0,0,114,78,0,0,0,218,4,115,112,101,99,218,6,109, - 111,100,117,108,101,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,17,95,108,111,97,100,95,109,111,100,117, - 108,101,95,115,104,105,109,0,1,0,0,115,12,0,0,0, - 0,6,15,1,15,1,13,1,13,1,11,2,114,90,0,0, - 0,99,1,0,0,0,0,0,0,0,5,0,0,0,35,0, - 0,0,67,0,0,0,115,6,1,0,0,116,0,0,124,0, - 0,100,1,0,100,0,0,131,3,0,125,1,0,116,1,0, - 124,1,0,100,2,0,131,2,0,114,71,0,121,17,0,124, - 1,0,106,2,0,124,0,0,131,1,0,83,87,110,18,0, - 4,116,3,0,107,10,0,114,70,0,1,1,1,89,110,1, - 0,88,121,13,0,124,0,0,106,4,0,125,2,0,87,110, - 18,0,4,116,5,0,107,10,0,114,104,0,1,1,1,89, - 110,23,0,88,124,2,0,100,0,0,107,9,0,114,127,0, - 116,6,0,124,2,0,131,1,0,83,121,13,0,124,0,0, - 106,7,0,125,3,0,87,110,24,0,4,116,5,0,107,10, - 0,114,166,0,1,1,1,100,3,0,125,3,0,89,110,1, - 0,88,121,13,0,124,0,0,106,8,0,125,4,0,87,110, - 59,0,4,116,5,0,107,10,0,114,241,0,1,1,1,124, - 1,0,100,0,0,107,8,0,114,221,0,100,4,0,106,9, - 0,124,3,0,131,1,0,83,100,5,0,106,9,0,124,3, - 0,124,1,0,131,2,0,83,89,110,17,0,88,100,6,0, - 106,9,0,124,3,0,124,4,0,131,2,0,83,100,0,0, - 83,41,7,78,218,10,95,95,108,111,97,100,101,114,95,95, - 218,11,109,111,100,117,108,101,95,114,101,112,114,250,1,63, - 122,13,60,109,111,100,117,108,101,32,123,33,114,125,62,122, - 20,60,109,111,100,117,108,101,32,123,33,114,125,32,40,123, - 33,114,125,41,62,122,23,60,109,111,100,117,108,101,32,123, - 33,114,125,32,102,114,111,109,32,123,33,114,125,62,41,10, - 114,6,0,0,0,114,4,0,0,0,114,92,0,0,0,218, - 9,69,120,99,101,112,116,105,111,110,218,8,95,95,115,112, - 101,99,95,95,218,14,65,116,116,114,105,98,117,116,101,69, - 114,114,111,114,218,22,95,109,111,100,117,108,101,95,114,101, - 112,114,95,102,114,111,109,95,115,112,101,99,114,1,0,0, - 0,218,8,95,95,102,105,108,101,95,95,114,50,0,0,0, - 41,5,114,89,0,0,0,218,6,108,111,97,100,101,114,114, - 88,0,0,0,114,15,0,0,0,218,8,102,105,108,101,110, - 97,109,101,114,10,0,0,0,114,10,0,0,0,114,11,0, - 0,0,218,12,95,109,111,100,117,108,101,95,114,101,112,114, - 16,1,0,0,115,46,0,0,0,0,2,18,1,15,4,3, - 1,17,1,13,1,5,1,3,1,13,1,13,1,5,2,12, - 1,10,4,3,1,13,1,13,1,11,1,3,1,13,1,13, - 1,12,1,13,2,21,2,114,101,0,0,0,99,0,0,0, - 0,0,0,0,0,0,0,0,0,2,0,0,0,64,0,0, - 0,115,52,0,0,0,101,0,0,90,1,0,100,0,0,90, - 2,0,100,1,0,100,2,0,132,0,0,90,3,0,100,3, - 0,100,4,0,132,0,0,90,4,0,100,5,0,100,6,0, - 132,0,0,90,5,0,100,7,0,83,41,8,218,17,95,105, - 110,115,116,97,108,108,101,100,95,115,97,102,101,108,121,99, - 2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0, - 67,0,0,0,115,25,0,0,0,124,1,0,124,0,0,95, - 0,0,124,1,0,106,1,0,124,0,0,95,2,0,100,0, - 0,83,41,1,78,41,3,218,7,95,109,111,100,117,108,101, - 114,95,0,0,0,218,5,95,115,112,101,99,41,2,114,19, - 0,0,0,114,89,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,114,20,0,0,0,54,1,0,0, - 115,4,0,0,0,0,1,9,1,122,26,95,105,110,115,116, - 97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,105, - 110,105,116,95,95,99,1,0,0,0,0,0,0,0,1,0, - 0,0,3,0,0,0,67,0,0,0,115,38,0,0,0,100, - 1,0,124,0,0,106,0,0,95,1,0,124,0,0,106,2, - 0,116,3,0,106,4,0,124,0,0,106,0,0,106,5,0, - 60,100,0,0,83,41,2,78,84,41,6,114,104,0,0,0, - 218,13,95,105,110,105,116,105,97,108,105,122,105,110,103,114, - 103,0,0,0,114,14,0,0,0,114,21,0,0,0,114,15, - 0,0,0,41,1,114,19,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,23,0,0,0,58,1, - 0,0,115,4,0,0,0,0,4,12,1,122,27,95,105,110, - 115,116,97,108,108,101,100,95,115,97,102,101,108,121,46,95, - 95,101,110,116,101,114,95,95,99,1,0,0,0,0,0,0, - 0,3,0,0,0,17,0,0,0,71,0,0,0,115,121,0, - 0,0,122,101,0,124,0,0,106,0,0,125,2,0,116,1, - 0,100,1,0,100,2,0,132,0,0,124,1,0,68,131,1, - 0,131,1,0,114,78,0,121,17,0,116,2,0,106,3,0, - 124,2,0,106,4,0,61,87,113,100,0,4,116,5,0,107, - 10,0,114,74,0,1,1,1,89,113,100,0,88,110,22,0, - 116,6,0,100,3,0,124,2,0,106,4,0,124,2,0,106, - 7,0,131,3,0,1,87,100,0,0,100,4,0,124,0,0, - 106,0,0,95,8,0,88,100,0,0,83,41,5,78,99,1, - 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,115, - 0,0,0,115,27,0,0,0,124,0,0,93,17,0,125,1, - 0,124,1,0,100,0,0,107,9,0,86,1,113,3,0,100, - 0,0,83,41,1,78,114,10,0,0,0,41,2,114,24,0, - 0,0,114,25,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,114,26,0,0,0,68,1,0,0,115, - 2,0,0,0,6,0,122,45,95,105,110,115,116,97,108,108, - 101,100,95,115,97,102,101,108,121,46,95,95,101,120,105,116, - 95,95,46,60,108,111,99,97,108,115,62,46,60,103,101,110, - 101,120,112,114,62,122,18,105,109,112,111,114,116,32,123,33, - 114,125,32,35,32,123,33,114,125,70,41,9,114,104,0,0, - 0,114,27,0,0,0,114,14,0,0,0,114,21,0,0,0, - 114,15,0,0,0,114,28,0,0,0,114,75,0,0,0,114, - 99,0,0,0,114,105,0,0,0,41,3,114,19,0,0,0, - 114,29,0,0,0,114,88,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,30,0,0,0,65,1, - 0,0,115,18,0,0,0,0,1,3,1,9,1,25,1,3, - 1,17,1,13,1,8,2,26,2,122,26,95,105,110,115,116, - 97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,101, - 120,105,116,95,95,78,41,6,114,1,0,0,0,114,0,0, - 0,0,114,2,0,0,0,114,20,0,0,0,114,23,0,0, - 0,114,30,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,102,0,0,0,52, - 1,0,0,115,6,0,0,0,12,2,12,4,12,7,114,102, - 0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0, - 8,0,0,0,64,0,0,0,115,172,0,0,0,101,0,0, - 90,1,0,100,0,0,90,2,0,100,1,0,90,3,0,100, - 2,0,100,3,0,100,4,0,100,3,0,100,5,0,100,3, - 0,100,6,0,100,7,0,132,0,3,90,4,0,100,8,0, - 100,9,0,132,0,0,90,5,0,100,10,0,100,11,0,132, - 0,0,90,6,0,101,7,0,100,12,0,100,13,0,132,0, - 0,131,1,0,90,8,0,101,8,0,106,9,0,100,14,0, - 100,13,0,132,0,0,131,1,0,90,8,0,101,7,0,100, - 15,0,100,16,0,132,0,0,131,1,0,90,10,0,101,7, - 0,100,17,0,100,18,0,132,0,0,131,1,0,90,11,0, - 101,11,0,106,9,0,100,19,0,100,18,0,132,0,0,131, - 1,0,90,11,0,100,3,0,83,41,20,218,10,77,111,100, - 117,108,101,83,112,101,99,97,208,5,0,0,84,104,101,32, - 115,112,101,99,105,102,105,99,97,116,105,111,110,32,102,111, - 114,32,97,32,109,111,100,117,108,101,44,32,117,115,101,100, - 32,102,111,114,32,108,111,97,100,105,110,103,46,10,10,32, - 32,32,32,65,32,109,111,100,117,108,101,39,115,32,115,112, - 101,99,32,105,115,32,116,104,101,32,115,111,117,114,99,101, - 32,102,111,114,32,105,110,102,111,114,109,97,116,105,111,110, - 32,97,98,111,117,116,32,116,104,101,32,109,111,100,117,108, - 101,46,32,32,70,111,114,10,32,32,32,32,100,97,116,97, - 32,97,115,115,111,99,105,97,116,101,100,32,119,105,116,104, - 32,116,104,101,32,109,111,100,117,108,101,44,32,105,110,99, - 108,117,100,105,110,103,32,115,111,117,114,99,101,44,32,117, - 115,101,32,116,104,101,32,115,112,101,99,39,115,10,32,32, - 32,32,108,111,97,100,101,114,46,10,10,32,32,32,32,96, - 110,97,109,101,96,32,105,115,32,116,104,101,32,97,98,115, - 111,108,117,116,101,32,110,97,109,101,32,111,102,32,116,104, - 101,32,109,111,100,117,108,101,46,32,32,96,108,111,97,100, - 101,114,96,32,105,115,32,116,104,101,32,108,111,97,100,101, - 114,10,32,32,32,32,116,111,32,117,115,101,32,119,104,101, - 110,32,108,111,97,100,105,110,103,32,116,104,101,32,109,111, - 100,117,108,101,46,32,32,96,112,97,114,101,110,116,96,32, - 105,115,32,116,104,101,32,110,97,109,101,32,111,102,32,116, - 104,101,10,32,32,32,32,112,97,99,107,97,103,101,32,116, - 104,101,32,109,111,100,117,108,101,32,105,115,32,105,110,46, - 32,32,84,104,101,32,112,97,114,101,110,116,32,105,115,32, - 100,101,114,105,118,101,100,32,102,114,111,109,32,116,104,101, - 32,110,97,109,101,46,10,10,32,32,32,32,96,105,115,95, - 112,97,99,107,97,103,101,96,32,100,101,116,101,114,109,105, - 110,101,115,32,105,102,32,116,104,101,32,109,111,100,117,108, - 101,32,105,115,32,99,111,110,115,105,100,101,114,101,100,32, - 97,32,112,97,99,107,97,103,101,32,111,114,10,32,32,32, - 32,110,111,116,46,32,32,79,110,32,109,111,100,117,108,101, - 115,32,116,104,105,115,32,105,115,32,114,101,102,108,101,99, - 116,101,100,32,98,121,32,116,104,101,32,96,95,95,112,97, - 116,104,95,95,96,32,97,116,116,114,105,98,117,116,101,46, - 10,10,32,32,32,32,96,111,114,105,103,105,110,96,32,105, - 115,32,116,104,101,32,115,112,101,99,105,102,105,99,32,108, - 111,99,97,116,105,111,110,32,117,115,101,100,32,98,121,32, - 116,104,101,32,108,111,97,100,101,114,32,102,114,111,109,32, - 119,104,105,99,104,32,116,111,10,32,32,32,32,108,111,97, - 100,32,116,104,101,32,109,111,100,117,108,101,44,32,105,102, - 32,116,104,97,116,32,105,110,102,111,114,109,97,116,105,111, - 110,32,105,115,32,97,118,97,105,108,97,98,108,101,46,32, - 32,87,104,101,110,32,102,105,108,101,110,97,109,101,32,105, - 115,10,32,32,32,32,115,101,116,44,32,111,114,105,103,105, - 110,32,119,105,108,108,32,109,97,116,99,104,46,10,10,32, - 32,32,32,96,104,97,115,95,108,111,99,97,116,105,111,110, - 96,32,105,110,100,105,99,97,116,101,115,32,116,104,97,116, - 32,97,32,115,112,101,99,39,115,32,34,111,114,105,103,105, - 110,34,32,114,101,102,108,101,99,116,115,32,97,32,108,111, - 99,97,116,105,111,110,46,10,32,32,32,32,87,104,101,110, - 32,116,104,105,115,32,105,115,32,84,114,117,101,44,32,96, - 95,95,102,105,108,101,95,95,96,32,97,116,116,114,105,98, - 117,116,101,32,111,102,32,116,104,101,32,109,111,100,117,108, - 101,32,105,115,32,115,101,116,46,10,10,32,32,32,32,96, - 99,97,99,104,101,100,96,32,105,115,32,116,104,101,32,108, - 111,99,97,116,105,111,110,32,111,102,32,116,104,101,32,99, - 97,99,104,101,100,32,98,121,116,101,99,111,100,101,32,102, - 105,108,101,44,32,105,102,32,97,110,121,46,32,32,73,116, - 10,32,32,32,32,99,111,114,114,101,115,112,111,110,100,115, - 32,116,111,32,116,104,101,32,96,95,95,99,97,99,104,101, - 100,95,95,96,32,97,116,116,114,105,98,117,116,101,46,10, - 10,32,32,32,32,96,115,117,98,109,111,100,117,108,101,95, - 115,101,97,114,99,104,95,108,111,99,97,116,105,111,110,115, - 96,32,105,115,32,116,104,101,32,115,101,113,117,101,110,99, - 101,32,111,102,32,112,97,116,104,32,101,110,116,114,105,101, - 115,32,116,111,10,32,32,32,32,115,101,97,114,99,104,32, - 119,104,101,110,32,105,109,112,111,114,116,105,110,103,32,115, - 117,98,109,111,100,117,108,101,115,46,32,32,73,102,32,115, - 101,116,44,32,105,115,95,112,97,99,107,97,103,101,32,115, - 104,111,117,108,100,32,98,101,10,32,32,32,32,84,114,117, - 101,45,45,97,110,100,32,70,97,108,115,101,32,111,116,104, - 101,114,119,105,115,101,46,10,10,32,32,32,32,80,97,99, - 107,97,103,101,115,32,97,114,101,32,115,105,109,112,108,121, - 32,109,111,100,117,108,101,115,32,116,104,97,116,32,40,109, - 97,121,41,32,104,97,118,101,32,115,117,98,109,111,100,117, - 108,101,115,46,32,32,73,102,32,97,32,115,112,101,99,10, - 32,32,32,32,104,97,115,32,97,32,110,111,110,45,78,111, - 110,101,32,118,97,108,117,101,32,105,110,32,96,115,117,98, - 109,111,100,117,108,101,95,115,101,97,114,99,104,95,108,111, - 99,97,116,105,111,110,115,96,44,32,116,104,101,32,105,109, - 112,111,114,116,10,32,32,32,32,115,121,115,116,101,109,32, - 119,105,108,108,32,99,111,110,115,105,100,101,114,32,109,111, - 100,117,108,101,115,32,108,111,97,100,101,100,32,102,114,111, - 109,32,116,104,101,32,115,112,101,99,32,97,115,32,112,97, - 99,107,97,103,101,115,46,10,10,32,32,32,32,79,110,108, - 121,32,102,105,110,100,101,114,115,32,40,115,101,101,32,105, - 109,112,111,114,116,108,105,98,46,97,98,99,46,77,101,116, - 97,80,97,116,104,70,105,110,100,101,114,32,97,110,100,10, - 32,32,32,32,105,109,112,111,114,116,108,105,98,46,97,98, - 99,46,80,97,116,104,69,110,116,114,121,70,105,110,100,101, - 114,41,32,115,104,111,117,108,100,32,109,111,100,105,102,121, - 32,77,111,100,117,108,101,83,112,101,99,32,105,110,115,116, - 97,110,99,101,115,46,10,10,32,32,32,32,218,6,111,114, - 105,103,105,110,78,218,12,108,111,97,100,101,114,95,115,116, - 97,116,101,218,10,105,115,95,112,97,99,107,97,103,101,99, - 3,0,0,0,3,0,0,0,6,0,0,0,2,0,0,0, - 67,0,0,0,115,79,0,0,0,124,1,0,124,0,0,95, - 0,0,124,2,0,124,0,0,95,1,0,124,3,0,124,0, - 0,95,2,0,124,4,0,124,0,0,95,3,0,124,5,0, - 114,48,0,103,0,0,110,3,0,100,0,0,124,0,0,95, - 4,0,100,1,0,124,0,0,95,5,0,100,0,0,124,0, - 0,95,6,0,100,0,0,83,41,2,78,70,41,7,114,15, - 0,0,0,114,99,0,0,0,114,107,0,0,0,114,108,0, - 0,0,218,26,115,117,98,109,111,100,117,108,101,95,115,101, - 97,114,99,104,95,108,111,99,97,116,105,111,110,115,218,13, - 95,115,101,116,95,102,105,108,101,97,116,116,114,218,7,95, - 99,97,99,104,101,100,41,6,114,19,0,0,0,114,15,0, - 0,0,114,99,0,0,0,114,107,0,0,0,114,108,0,0, - 0,114,109,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,11,0,0,0,114,20,0,0,0,116,1,0,0,115,14, - 0,0,0,0,2,9,1,9,1,9,1,9,1,21,3,9, - 1,122,19,77,111,100,117,108,101,83,112,101,99,46,95,95, - 105,110,105,116,95,95,99,1,0,0,0,0,0,0,0,2, - 0,0,0,4,0,0,0,67,0,0,0,115,147,0,0,0, - 100,1,0,106,0,0,124,0,0,106,1,0,131,1,0,100, - 2,0,106,0,0,124,0,0,106,2,0,131,1,0,103,2, - 0,125,1,0,124,0,0,106,3,0,100,0,0,107,9,0, - 114,76,0,124,1,0,106,4,0,100,3,0,106,0,0,124, - 0,0,106,3,0,131,1,0,131,1,0,1,124,0,0,106, - 5,0,100,0,0,107,9,0,114,116,0,124,1,0,106,4, - 0,100,4,0,106,0,0,124,0,0,106,5,0,131,1,0, - 131,1,0,1,100,5,0,106,0,0,124,0,0,106,6,0, - 106,7,0,100,6,0,106,8,0,124,1,0,131,1,0,131, - 2,0,83,41,7,78,122,9,110,97,109,101,61,123,33,114, - 125,122,11,108,111,97,100,101,114,61,123,33,114,125,122,11, - 111,114,105,103,105,110,61,123,33,114,125,122,29,115,117,98, - 109,111,100,117,108,101,95,115,101,97,114,99,104,95,108,111, - 99,97,116,105,111,110,115,61,123,125,122,6,123,125,40,123, - 125,41,122,2,44,32,41,9,114,50,0,0,0,114,15,0, - 0,0,114,99,0,0,0,114,107,0,0,0,218,6,97,112, - 112,101,110,100,114,110,0,0,0,218,9,95,95,99,108,97, - 115,115,95,95,114,1,0,0,0,218,4,106,111,105,110,41, - 2,114,19,0,0,0,114,29,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,114,52,0,0,0,128, - 1,0,0,115,16,0,0,0,0,1,15,1,21,1,15,1, - 25,1,15,1,12,1,13,1,122,19,77,111,100,117,108,101, - 83,112,101,99,46,95,95,114,101,112,114,95,95,99,2,0, - 0,0,0,0,0,0,3,0,0,0,11,0,0,0,67,0, - 0,0,115,145,0,0,0,124,0,0,106,0,0,125,2,0, - 121,107,0,124,0,0,106,1,0,124,1,0,106,1,0,107, - 2,0,111,114,0,124,0,0,106,2,0,124,1,0,106,2, - 0,107,2,0,111,114,0,124,0,0,106,3,0,124,1,0, - 106,3,0,107,2,0,111,114,0,124,2,0,124,1,0,106, - 0,0,107,2,0,111,114,0,124,0,0,106,4,0,124,1, - 0,106,4,0,107,2,0,111,114,0,124,0,0,106,5,0, - 124,1,0,106,5,0,107,2,0,83,87,110,22,0,4,116, - 6,0,107,10,0,114,140,0,1,1,1,100,1,0,83,89, - 110,1,0,88,100,0,0,83,41,2,78,70,41,7,114,110, - 0,0,0,114,15,0,0,0,114,99,0,0,0,114,107,0, - 0,0,218,6,99,97,99,104,101,100,218,12,104,97,115,95, - 108,111,99,97,116,105,111,110,114,96,0,0,0,41,3,114, - 19,0,0,0,90,5,111,116,104,101,114,90,4,115,109,115, - 108,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, - 218,6,95,95,101,113,95,95,138,1,0,0,115,20,0,0, - 0,0,1,9,1,3,1,18,1,18,1,18,1,15,1,18, - 1,20,1,13,1,122,17,77,111,100,117,108,101,83,112,101, - 99,46,95,95,101,113,95,95,99,1,0,0,0,0,0,0, - 0,1,0,0,0,2,0,0,0,67,0,0,0,115,85,0, - 0,0,124,0,0,106,0,0,100,0,0,107,8,0,114,78, - 0,124,0,0,106,1,0,100,0,0,107,9,0,114,78,0, - 124,0,0,106,2,0,114,78,0,116,3,0,100,0,0,107, - 8,0,114,57,0,116,4,0,130,1,0,116,3,0,106,5, - 0,124,0,0,106,1,0,131,1,0,124,0,0,95,0,0, - 124,0,0,106,0,0,83,41,1,78,41,6,114,112,0,0, - 0,114,107,0,0,0,114,111,0,0,0,218,19,95,98,111, - 111,116,115,116,114,97,112,95,101,120,116,101,114,110,97,108, - 218,19,78,111,116,73,109,112,108,101,109,101,110,116,101,100, - 69,114,114,111,114,90,11,95,103,101,116,95,99,97,99,104, - 101,100,41,1,114,19,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,114,116,0,0,0,150,1,0, - 0,115,12,0,0,0,0,2,15,1,24,1,12,1,6,1, - 21,1,122,17,77,111,100,117,108,101,83,112,101,99,46,99, - 97,99,104,101,100,99,2,0,0,0,0,0,0,0,2,0, - 0,0,2,0,0,0,67,0,0,0,115,13,0,0,0,124, - 1,0,124,0,0,95,0,0,100,0,0,83,41,1,78,41, - 1,114,112,0,0,0,41,2,114,19,0,0,0,114,116,0, + 67,0,0,0,115,62,0,0,0,116,0,124,1,124,0,131, + 2,125,2,124,1,116,1,106,2,107,6,114,50,116,1,106, + 2,124,1,25,0,125,3,116,3,124,2,124,3,131,2,1, + 0,116,1,106,2,124,1,25,0,83,0,116,4,124,2,131, + 1,83,0,100,1,83,0,41,2,122,128,76,111,97,100,32, + 116,104,101,32,115,112,101,99,105,102,105,101,100,32,109,111, + 100,117,108,101,32,105,110,116,111,32,115,121,115,46,109,111, + 100,117,108,101,115,32,97,110,100,32,114,101,116,117,114,110, + 32,105,116,46,10,10,32,32,32,32,84,104,105,115,32,109, + 101,116,104,111,100,32,105,115,32,100,101,112,114,101,99,97, + 116,101,100,46,32,32,85,115,101,32,108,111,97,100,101,114, + 46,101,120,101,99,95,109,111,100,117,108,101,32,105,110,115, + 116,101,97,100,46,10,10,32,32,32,32,78,41,5,218,16, + 115,112,101,99,95,102,114,111,109,95,108,111,97,100,101,114, + 114,14,0,0,0,218,7,109,111,100,117,108,101,115,218,5, + 95,101,120,101,99,218,5,95,108,111,97,100,41,4,114,26, + 0,0,0,114,71,0,0,0,218,4,115,112,101,99,218,6, + 109,111,100,117,108,101,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,17,95,108,111,97,100,95,109,111,100, + 117,108,101,95,115,104,105,109,239,0,0,0,115,12,0,0, + 0,0,6,10,1,10,1,10,1,10,1,10,2,114,84,0, + 0,0,99,1,0,0,0,0,0,0,0,5,0,0,0,35, + 0,0,0,67,0,0,0,115,216,0,0,0,116,0,124,0, + 100,1,100,0,131,3,125,1,116,1,124,1,100,2,131,2, + 114,54,121,10,124,1,106,2,124,0,131,1,83,0,4,0, + 116,3,107,10,114,52,1,0,1,0,1,0,89,0,110,2, + 88,0,121,10,124,0,106,4,125,2,87,0,110,20,4,0, + 116,5,107,10,114,84,1,0,1,0,1,0,89,0,110,18, + 88,0,124,2,100,0,107,9,114,102,116,6,124,2,131,1, + 83,0,121,10,124,0,106,7,125,3,87,0,110,24,4,0, + 116,5,107,10,114,136,1,0,1,0,1,0,100,3,125,3, + 89,0,110,2,88,0,121,10,124,0,106,8,125,4,87,0, + 110,50,4,0,116,5,107,10,114,198,1,0,1,0,1,0, + 124,1,100,0,107,8,114,182,100,4,106,9,124,3,131,1, + 83,0,100,5,106,9,124,3,124,1,131,2,83,0,89,0, + 110,14,88,0,100,6,106,9,124,3,124,4,131,2,83,0, + 100,0,83,0,41,7,78,218,10,95,95,108,111,97,100,101, + 114,95,95,218,11,109,111,100,117,108,101,95,114,101,112,114, + 250,1,63,122,13,60,109,111,100,117,108,101,32,123,33,114, + 125,62,122,20,60,109,111,100,117,108,101,32,123,33,114,125, + 32,40,123,33,114,125,41,62,122,23,60,109,111,100,117,108, + 101,32,123,33,114,125,32,102,114,111,109,32,123,33,114,125, + 62,41,10,114,6,0,0,0,114,4,0,0,0,114,86,0, + 0,0,218,9,69,120,99,101,112,116,105,111,110,218,8,95, + 95,115,112,101,99,95,95,218,14,65,116,116,114,105,98,117, + 116,101,69,114,114,111,114,218,22,95,109,111,100,117,108,101, + 95,114,101,112,114,95,102,114,111,109,95,115,112,101,99,114, + 1,0,0,0,218,8,95,95,102,105,108,101,95,95,114,38, + 0,0,0,41,5,114,83,0,0,0,218,6,108,111,97,100, + 101,114,114,82,0,0,0,114,15,0,0,0,218,8,102,105, + 108,101,110,97,109,101,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,12,95,109,111,100,117,108,101,95,114, + 101,112,114,255,0,0,0,115,46,0,0,0,0,2,12,1, + 10,4,2,1,10,1,14,1,6,1,2,1,10,1,14,1, + 6,2,8,1,8,4,2,1,10,1,14,1,10,1,2,1, + 10,1,14,1,8,1,10,2,18,2,114,95,0,0,0,99, + 0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0, + 64,0,0,0,115,36,0,0,0,101,0,90,1,100,0,90, + 2,100,1,100,2,132,0,90,3,100,3,100,4,132,0,90, + 4,100,5,100,6,132,0,90,5,100,7,83,0,41,8,218, + 17,95,105,110,115,116,97,108,108,101,100,95,115,97,102,101, + 108,121,99,2,0,0,0,0,0,0,0,2,0,0,0,2, + 0,0,0,67,0,0,0,115,18,0,0,0,124,1,124,0, + 95,0,124,1,106,1,124,0,95,2,100,0,83,0,41,1, + 78,41,3,218,7,95,109,111,100,117,108,101,114,89,0,0, + 0,218,5,95,115,112,101,99,41,2,114,26,0,0,0,114, + 83,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,114,27,0,0,0,37,1,0,0,115,4,0,0, + 0,0,1,6,1,122,26,95,105,110,115,116,97,108,108,101, + 100,95,115,97,102,101,108,121,46,95,95,105,110,105,116,95, + 95,99,1,0,0,0,0,0,0,0,1,0,0,0,3,0, + 0,0,67,0,0,0,115,28,0,0,0,100,1,124,0,106, + 0,95,1,124,0,106,2,116,3,106,4,124,0,106,0,106, + 5,60,0,100,0,83,0,41,2,78,84,41,6,114,98,0, + 0,0,218,13,95,105,110,105,116,105,97,108,105,122,105,110, + 103,114,97,0,0,0,114,14,0,0,0,114,79,0,0,0, + 114,15,0,0,0,41,1,114,26,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,114,48,0,0,0, + 41,1,0,0,115,4,0,0,0,0,4,8,1,122,27,95, + 105,110,115,116,97,108,108,101,100,95,115,97,102,101,108,121, + 46,95,95,101,110,116,101,114,95,95,99,1,0,0,0,0, + 0,0,0,3,0,0,0,17,0,0,0,71,0,0,0,115, + 98,0,0,0,122,82,124,0,106,0,125,2,116,1,100,1, + 100,2,132,0,124,1,68,0,131,1,131,1,114,64,121,14, + 116,2,106,3,124,2,106,4,61,0,87,0,113,80,4,0, + 116,5,107,10,114,60,1,0,1,0,1,0,89,0,113,80, + 88,0,110,16,116,6,100,3,124,2,106,4,124,2,106,7, + 131,3,1,0,87,0,100,0,100,4,124,0,106,0,95,8, + 88,0,100,0,83,0,41,5,78,99,1,0,0,0,0,0, + 0,0,2,0,0,0,3,0,0,0,115,0,0,0,115,22, + 0,0,0,124,0,93,14,125,1,124,1,100,0,107,9,86, + 0,1,0,113,2,100,0,83,0,41,1,78,114,10,0,0, + 0,41,2,90,2,46,48,90,3,97,114,103,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,250,9,60,103,101, + 110,101,120,112,114,62,51,1,0,0,115,2,0,0,0,4, + 0,122,45,95,105,110,115,116,97,108,108,101,100,95,115,97, + 102,101,108,121,46,95,95,101,120,105,116,95,95,46,60,108, + 111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,62, + 122,18,105,109,112,111,114,116,32,123,33,114,125,32,35,32, + 123,33,114,125,70,41,9,114,98,0,0,0,218,3,97,110, + 121,114,14,0,0,0,114,79,0,0,0,114,15,0,0,0, + 114,54,0,0,0,114,68,0,0,0,114,93,0,0,0,114, + 99,0,0,0,41,3,114,26,0,0,0,114,49,0,0,0, + 114,82,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,114,50,0,0,0,48,1,0,0,115,18,0, + 0,0,0,1,2,1,6,1,18,1,2,1,14,1,14,1, + 8,2,20,2,122,26,95,105,110,115,116,97,108,108,101,100, + 95,115,97,102,101,108,121,46,95,95,101,120,105,116,95,95, + 78,41,6,114,1,0,0,0,114,0,0,0,0,114,2,0, + 0,0,114,27,0,0,0,114,48,0,0,0,114,50,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,114,96,0,0,0,35,1,0,0,115,6, + 0,0,0,8,2,8,4,8,7,114,96,0,0,0,99,0, + 0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,64, + 0,0,0,115,114,0,0,0,101,0,90,1,100,0,90,2, + 100,1,90,3,100,2,100,2,100,2,100,3,156,3,100,4, + 100,5,132,2,90,4,100,6,100,7,132,0,90,5,100,8, + 100,9,132,0,90,6,101,7,100,10,100,11,132,0,131,1, + 90,8,101,8,106,9,100,12,100,11,132,0,131,1,90,8, + 101,7,100,13,100,14,132,0,131,1,90,10,101,7,100,15, + 100,16,132,0,131,1,90,11,101,11,106,9,100,17,100,16, + 132,0,131,1,90,11,100,2,83,0,41,18,218,10,77,111, + 100,117,108,101,83,112,101,99,97,208,5,0,0,84,104,101, + 32,115,112,101,99,105,102,105,99,97,116,105,111,110,32,102, + 111,114,32,97,32,109,111,100,117,108,101,44,32,117,115,101, + 100,32,102,111,114,32,108,111,97,100,105,110,103,46,10,10, + 32,32,32,32,65,32,109,111,100,117,108,101,39,115,32,115, + 112,101,99,32,105,115,32,116,104,101,32,115,111,117,114,99, + 101,32,102,111,114,32,105,110,102,111,114,109,97,116,105,111, + 110,32,97,98,111,117,116,32,116,104,101,32,109,111,100,117, + 108,101,46,32,32,70,111,114,10,32,32,32,32,100,97,116, + 97,32,97,115,115,111,99,105,97,116,101,100,32,119,105,116, + 104,32,116,104,101,32,109,111,100,117,108,101,44,32,105,110, + 99,108,117,100,105,110,103,32,115,111,117,114,99,101,44,32, + 117,115,101,32,116,104,101,32,115,112,101,99,39,115,10,32, + 32,32,32,108,111,97,100,101,114,46,10,10,32,32,32,32, + 96,110,97,109,101,96,32,105,115,32,116,104,101,32,97,98, + 115,111,108,117,116,101,32,110,97,109,101,32,111,102,32,116, + 104,101,32,109,111,100,117,108,101,46,32,32,96,108,111,97, + 100,101,114,96,32,105,115,32,116,104,101,32,108,111,97,100, + 101,114,10,32,32,32,32,116,111,32,117,115,101,32,119,104, + 101,110,32,108,111,97,100,105,110,103,32,116,104,101,32,109, + 111,100,117,108,101,46,32,32,96,112,97,114,101,110,116,96, + 32,105,115,32,116,104,101,32,110,97,109,101,32,111,102,32, + 116,104,101,10,32,32,32,32,112,97,99,107,97,103,101,32, + 116,104,101,32,109,111,100,117,108,101,32,105,115,32,105,110, + 46,32,32,84,104,101,32,112,97,114,101,110,116,32,105,115, + 32,100,101,114,105,118,101,100,32,102,114,111,109,32,116,104, + 101,32,110,97,109,101,46,10,10,32,32,32,32,96,105,115, + 95,112,97,99,107,97,103,101,96,32,100,101,116,101,114,109, + 105,110,101,115,32,105,102,32,116,104,101,32,109,111,100,117, + 108,101,32,105,115,32,99,111,110,115,105,100,101,114,101,100, + 32,97,32,112,97,99,107,97,103,101,32,111,114,10,32,32, + 32,32,110,111,116,46,32,32,79,110,32,109,111,100,117,108, + 101,115,32,116,104,105,115,32,105,115,32,114,101,102,108,101, + 99,116,101,100,32,98,121,32,116,104,101,32,96,95,95,112, + 97,116,104,95,95,96,32,97,116,116,114,105,98,117,116,101, + 46,10,10,32,32,32,32,96,111,114,105,103,105,110,96,32, + 105,115,32,116,104,101,32,115,112,101,99,105,102,105,99,32, + 108,111,99,97,116,105,111,110,32,117,115,101,100,32,98,121, + 32,116,104,101,32,108,111,97,100,101,114,32,102,114,111,109, + 32,119,104,105,99,104,32,116,111,10,32,32,32,32,108,111, + 97,100,32,116,104,101,32,109,111,100,117,108,101,44,32,105, + 102,32,116,104,97,116,32,105,110,102,111,114,109,97,116,105, + 111,110,32,105,115,32,97,118,97,105,108,97,98,108,101,46, + 32,32,87,104,101,110,32,102,105,108,101,110,97,109,101,32, + 105,115,10,32,32,32,32,115,101,116,44,32,111,114,105,103, + 105,110,32,119,105,108,108,32,109,97,116,99,104,46,10,10, + 32,32,32,32,96,104,97,115,95,108,111,99,97,116,105,111, + 110,96,32,105,110,100,105,99,97,116,101,115,32,116,104,97, + 116,32,97,32,115,112,101,99,39,115,32,34,111,114,105,103, + 105,110,34,32,114,101,102,108,101,99,116,115,32,97,32,108, + 111,99,97,116,105,111,110,46,10,32,32,32,32,87,104,101, + 110,32,116,104,105,115,32,105,115,32,84,114,117,101,44,32, + 96,95,95,102,105,108,101,95,95,96,32,97,116,116,114,105, + 98,117,116,101,32,111,102,32,116,104,101,32,109,111,100,117, + 108,101,32,105,115,32,115,101,116,46,10,10,32,32,32,32, + 96,99,97,99,104,101,100,96,32,105,115,32,116,104,101,32, + 108,111,99,97,116,105,111,110,32,111,102,32,116,104,101,32, + 99,97,99,104,101,100,32,98,121,116,101,99,111,100,101,32, + 102,105,108,101,44,32,105,102,32,97,110,121,46,32,32,73, + 116,10,32,32,32,32,99,111,114,114,101,115,112,111,110,100, + 115,32,116,111,32,116,104,101,32,96,95,95,99,97,99,104, + 101,100,95,95,96,32,97,116,116,114,105,98,117,116,101,46, + 10,10,32,32,32,32,96,115,117,98,109,111,100,117,108,101, + 95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,110, + 115,96,32,105,115,32,116,104,101,32,115,101,113,117,101,110, + 99,101,32,111,102,32,112,97,116,104,32,101,110,116,114,105, + 101,115,32,116,111,10,32,32,32,32,115,101,97,114,99,104, + 32,119,104,101,110,32,105,109,112,111,114,116,105,110,103,32, + 115,117,98,109,111,100,117,108,101,115,46,32,32,73,102,32, + 115,101,116,44,32,105,115,95,112,97,99,107,97,103,101,32, + 115,104,111,117,108,100,32,98,101,10,32,32,32,32,84,114, + 117,101,45,45,97,110,100,32,70,97,108,115,101,32,111,116, + 104,101,114,119,105,115,101,46,10,10,32,32,32,32,80,97, + 99,107,97,103,101,115,32,97,114,101,32,115,105,109,112,108, + 121,32,109,111,100,117,108,101,115,32,116,104,97,116,32,40, + 109,97,121,41,32,104,97,118,101,32,115,117,98,109,111,100, + 117,108,101,115,46,32,32,73,102,32,97,32,115,112,101,99, + 10,32,32,32,32,104,97,115,32,97,32,110,111,110,45,78, + 111,110,101,32,118,97,108,117,101,32,105,110,32,96,115,117, + 98,109,111,100,117,108,101,95,115,101,97,114,99,104,95,108, + 111,99,97,116,105,111,110,115,96,44,32,116,104,101,32,105, + 109,112,111,114,116,10,32,32,32,32,115,121,115,116,101,109, + 32,119,105,108,108,32,99,111,110,115,105,100,101,114,32,109, + 111,100,117,108,101,115,32,108,111,97,100,101,100,32,102,114, + 111,109,32,116,104,101,32,115,112,101,99,32,97,115,32,112, + 97,99,107,97,103,101,115,46,10,10,32,32,32,32,79,110, + 108,121,32,102,105,110,100,101,114,115,32,40,115,101,101,32, + 105,109,112,111,114,116,108,105,98,46,97,98,99,46,77,101, + 116,97,80,97,116,104,70,105,110,100,101,114,32,97,110,100, + 10,32,32,32,32,105,109,112,111,114,116,108,105,98,46,97, + 98,99,46,80,97,116,104,69,110,116,114,121,70,105,110,100, + 101,114,41,32,115,104,111,117,108,100,32,109,111,100,105,102, + 121,32,77,111,100,117,108,101,83,112,101,99,32,105,110,115, + 116,97,110,99,101,115,46,10,10,32,32,32,32,78,41,3, + 218,6,111,114,105,103,105,110,218,12,108,111,97,100,101,114, + 95,115,116,97,116,101,218,10,105,115,95,112,97,99,107,97, + 103,101,99,3,0,0,0,3,0,0,0,6,0,0,0,2, + 0,0,0,67,0,0,0,115,54,0,0,0,124,1,124,0, + 95,0,124,2,124,0,95,1,124,3,124,0,95,2,124,4, + 124,0,95,3,124,5,114,32,103,0,110,2,100,0,124,0, + 95,4,100,1,124,0,95,5,100,0,124,0,95,6,100,0, + 83,0,41,2,78,70,41,7,114,15,0,0,0,114,93,0, + 0,0,114,103,0,0,0,114,104,0,0,0,218,26,115,117, + 98,109,111,100,117,108,101,95,115,101,97,114,99,104,95,108, + 111,99,97,116,105,111,110,115,218,13,95,115,101,116,95,102, + 105,108,101,97,116,116,114,218,7,95,99,97,99,104,101,100, + 41,6,114,26,0,0,0,114,15,0,0,0,114,93,0,0, + 0,114,103,0,0,0,114,104,0,0,0,114,105,0,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, + 27,0,0,0,99,1,0,0,115,14,0,0,0,0,2,6, + 1,6,1,6,1,6,1,14,3,6,1,122,19,77,111,100, + 117,108,101,83,112,101,99,46,95,95,105,110,105,116,95,95, + 99,1,0,0,0,0,0,0,0,2,0,0,0,4,0,0, + 0,67,0,0,0,115,102,0,0,0,100,1,106,0,124,0, + 106,1,131,1,100,2,106,0,124,0,106,2,131,1,103,2, + 125,1,124,0,106,3,100,0,107,9,114,52,124,1,106,4, + 100,3,106,0,124,0,106,3,131,1,131,1,1,0,124,0, + 106,5,100,0,107,9,114,80,124,1,106,4,100,4,106,0, + 124,0,106,5,131,1,131,1,1,0,100,5,106,0,124,0, + 106,6,106,7,100,6,106,8,124,1,131,1,131,2,83,0, + 41,7,78,122,9,110,97,109,101,61,123,33,114,125,122,11, + 108,111,97,100,101,114,61,123,33,114,125,122,11,111,114,105, + 103,105,110,61,123,33,114,125,122,29,115,117,98,109,111,100, + 117,108,101,95,115,101,97,114,99,104,95,108,111,99,97,116, + 105,111,110,115,61,123,125,122,6,123,125,40,123,125,41,122, + 2,44,32,41,9,114,38,0,0,0,114,15,0,0,0,114, + 93,0,0,0,114,103,0,0,0,218,6,97,112,112,101,110, + 100,114,106,0,0,0,218,9,95,95,99,108,97,115,115,95, + 95,114,1,0,0,0,218,4,106,111,105,110,41,2,114,26, + 0,0,0,114,49,0,0,0,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,114,40,0,0,0,111,1,0,0, + 115,16,0,0,0,0,1,10,1,14,1,10,1,18,1,10, + 1,8,1,10,1,122,19,77,111,100,117,108,101,83,112,101, + 99,46,95,95,114,101,112,114,95,95,99,2,0,0,0,0, + 0,0,0,3,0,0,0,11,0,0,0,67,0,0,0,115, + 102,0,0,0,124,0,106,0,125,2,121,70,124,0,106,1, + 124,1,106,1,107,2,111,76,124,0,106,2,124,1,106,2, + 107,2,111,76,124,0,106,3,124,1,106,3,107,2,111,76, + 124,2,124,1,106,0,107,2,111,76,124,0,106,4,124,1, + 106,4,107,2,111,76,124,0,106,5,124,1,106,5,107,2, + 83,0,4,0,116,6,107,10,114,96,1,0,1,0,1,0, + 100,1,83,0,88,0,100,0,83,0,41,2,78,70,41,7, + 114,106,0,0,0,114,15,0,0,0,114,93,0,0,0,114, + 103,0,0,0,218,6,99,97,99,104,101,100,218,12,104,97, + 115,95,108,111,99,97,116,105,111,110,114,90,0,0,0,41, + 3,114,26,0,0,0,90,5,111,116,104,101,114,90,4,115, + 109,115,108,114,10,0,0,0,114,10,0,0,0,114,11,0, + 0,0,218,6,95,95,101,113,95,95,121,1,0,0,115,20, + 0,0,0,0,1,6,1,2,1,12,1,12,1,12,1,10, + 1,12,1,12,1,14,1,122,17,77,111,100,117,108,101,83, + 112,101,99,46,95,95,101,113,95,95,99,1,0,0,0,0, + 0,0,0,1,0,0,0,2,0,0,0,67,0,0,0,115, + 58,0,0,0,124,0,106,0,100,0,107,8,114,52,124,0, + 106,1,100,0,107,9,114,52,124,0,106,2,114,52,116,3, + 100,0,107,8,114,38,116,4,130,1,116,3,106,5,124,0, + 106,1,131,1,124,0,95,0,124,0,106,0,83,0,41,1, + 78,41,6,114,108,0,0,0,114,103,0,0,0,114,107,0, + 0,0,218,19,95,98,111,111,116,115,116,114,97,112,95,101, + 120,116,101,114,110,97,108,218,19,78,111,116,73,109,112,108, + 101,109,101,110,116,101,100,69,114,114,111,114,90,11,95,103, + 101,116,95,99,97,99,104,101,100,41,1,114,26,0,0,0, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, + 112,0,0,0,133,1,0,0,115,12,0,0,0,0,2,10, + 1,16,1,8,1,4,1,14,1,122,17,77,111,100,117,108, + 101,83,112,101,99,46,99,97,99,104,101,100,99,2,0,0, + 0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0, + 0,115,10,0,0,0,124,1,124,0,95,0,100,0,83,0, + 41,1,78,41,1,114,108,0,0,0,41,2,114,26,0,0, + 0,114,112,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,114,112,0,0,0,142,1,0,0,115,2, + 0,0,0,0,2,99,1,0,0,0,0,0,0,0,1,0, + 0,0,2,0,0,0,67,0,0,0,115,36,0,0,0,124, + 0,106,0,100,1,107,8,114,26,124,0,106,1,106,2,100, + 2,131,1,100,3,25,0,83,0,124,0,106,1,83,0,100, + 1,83,0,41,4,122,32,84,104,101,32,110,97,109,101,32, + 111,102,32,116,104,101,32,109,111,100,117,108,101,39,115,32, + 112,97,114,101,110,116,46,78,218,1,46,114,19,0,0,0, + 41,3,114,106,0,0,0,114,15,0,0,0,218,10,114,112, + 97,114,116,105,116,105,111,110,41,1,114,26,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,6, + 112,97,114,101,110,116,146,1,0,0,115,6,0,0,0,0, + 3,10,1,16,2,122,17,77,111,100,117,108,101,83,112,101, + 99,46,112,97,114,101,110,116,99,1,0,0,0,0,0,0, + 0,1,0,0,0,1,0,0,0,67,0,0,0,115,6,0, + 0,0,124,0,106,0,83,0,41,1,78,41,1,114,107,0, + 0,0,41,1,114,26,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,113,0,0,0,154,1,0, + 0,115,2,0,0,0,0,2,122,23,77,111,100,117,108,101, + 83,112,101,99,46,104,97,115,95,108,111,99,97,116,105,111, + 110,99,2,0,0,0,0,0,0,0,2,0,0,0,2,0, + 0,0,67,0,0,0,115,14,0,0,0,116,0,124,1,131, + 1,124,0,95,1,100,0,83,0,41,1,78,41,2,218,4, + 98,111,111,108,114,107,0,0,0,41,2,114,26,0,0,0, + 218,5,118,97,108,117,101,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,114,113,0,0,0,158,1,0,0,115, + 2,0,0,0,0,2,41,12,114,1,0,0,0,114,0,0, + 0,0,114,2,0,0,0,114,3,0,0,0,114,27,0,0, + 0,114,40,0,0,0,114,114,0,0,0,218,8,112,114,111, + 112,101,114,116,121,114,112,0,0,0,218,6,115,101,116,116, + 101,114,114,119,0,0,0,114,113,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 114,102,0,0,0,62,1,0,0,115,20,0,0,0,8,35, + 4,2,4,1,14,11,8,10,8,12,12,9,14,4,12,8, + 12,4,114,102,0,0,0,41,2,114,103,0,0,0,114,105, + 0,0,0,99,2,0,0,0,2,0,0,0,6,0,0,0, + 14,0,0,0,67,0,0,0,115,154,0,0,0,116,0,124, + 1,100,1,131,2,114,74,116,1,100,2,107,8,114,22,116, + 2,130,1,116,1,106,3,125,4,124,3,100,2,107,8,114, + 48,124,4,124,0,124,1,100,3,141,2,83,0,124,3,114, + 56,103,0,110,2,100,2,125,5,124,4,124,0,124,1,124, + 5,100,4,141,3,83,0,124,3,100,2,107,8,114,138,116, + 0,124,1,100,5,131,2,114,134,121,14,124,1,106,4,124, + 0,131,1,125,3,87,0,113,138,4,0,116,5,107,10,114, + 130,1,0,1,0,1,0,100,2,125,3,89,0,113,138,88, + 0,110,4,100,6,125,3,116,6,124,0,124,1,124,2,124, + 3,100,7,141,4,83,0,41,8,122,53,82,101,116,117,114, + 110,32,97,32,109,111,100,117,108,101,32,115,112,101,99,32, + 98,97,115,101,100,32,111,110,32,118,97,114,105,111,117,115, + 32,108,111,97,100,101,114,32,109,101,116,104,111,100,115,46, + 90,12,103,101,116,95,102,105,108,101,110,97,109,101,78,41, + 1,114,93,0,0,0,41,2,114,93,0,0,0,114,106,0, + 0,0,114,105,0,0,0,70,41,2,114,103,0,0,0,114, + 105,0,0,0,41,7,114,4,0,0,0,114,115,0,0,0, + 114,116,0,0,0,218,23,115,112,101,99,95,102,114,111,109, + 95,102,105,108,101,95,108,111,99,97,116,105,111,110,114,105, + 0,0,0,114,70,0,0,0,114,102,0,0,0,41,6,114, + 15,0,0,0,114,93,0,0,0,114,103,0,0,0,114,105, + 0,0,0,114,124,0,0,0,90,6,115,101,97,114,99,104, + 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, + 78,0,0,0,163,1,0,0,115,34,0,0,0,0,2,10, + 1,8,1,4,1,6,2,8,1,12,1,12,1,6,1,8, + 2,8,1,10,1,2,1,14,1,14,1,12,3,4,2,114, + 78,0,0,0,99,3,0,0,0,0,0,0,0,8,0,0, + 0,53,0,0,0,67,0,0,0,115,56,1,0,0,121,10, + 124,0,106,0,125,3,87,0,110,20,4,0,116,1,107,10, + 114,30,1,0,1,0,1,0,89,0,110,14,88,0,124,3, + 100,0,107,9,114,44,124,3,83,0,124,0,106,2,125,4, + 124,1,100,0,107,8,114,90,121,10,124,0,106,3,125,1, + 87,0,110,20,4,0,116,1,107,10,114,88,1,0,1,0, + 1,0,89,0,110,2,88,0,121,10,124,0,106,4,125,5, + 87,0,110,24,4,0,116,1,107,10,114,124,1,0,1,0, + 1,0,100,0,125,5,89,0,110,2,88,0,124,2,100,0, + 107,8,114,184,124,5,100,0,107,8,114,180,121,10,124,1, + 106,5,125,2,87,0,113,184,4,0,116,1,107,10,114,176, + 1,0,1,0,1,0,100,0,125,2,89,0,113,184,88,0, + 110,4,124,5,125,2,121,10,124,0,106,6,125,6,87,0, + 110,24,4,0,116,1,107,10,114,218,1,0,1,0,1,0, + 100,0,125,6,89,0,110,2,88,0,121,14,116,7,124,0, + 106,8,131,1,125,7,87,0,110,26,4,0,116,1,107,10, + 144,1,114,4,1,0,1,0,1,0,100,0,125,7,89,0, + 110,2,88,0,116,9,124,4,124,1,124,2,100,1,141,3, + 125,3,124,5,100,0,107,8,144,1,114,34,100,2,110,2, + 100,3,124,3,95,10,124,6,124,3,95,11,124,7,124,3, + 95,12,124,3,83,0,41,4,78,41,1,114,103,0,0,0, + 70,84,41,13,114,89,0,0,0,114,90,0,0,0,114,1, + 0,0,0,114,85,0,0,0,114,92,0,0,0,90,7,95, + 79,82,73,71,73,78,218,10,95,95,99,97,99,104,101,100, + 95,95,218,4,108,105,115,116,218,8,95,95,112,97,116,104, + 95,95,114,102,0,0,0,114,107,0,0,0,114,112,0,0, + 0,114,106,0,0,0,41,8,114,83,0,0,0,114,93,0, + 0,0,114,103,0,0,0,114,82,0,0,0,114,15,0,0, + 0,90,8,108,111,99,97,116,105,111,110,114,112,0,0,0, + 114,106,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,218,17,95,115,112,101,99,95,102,114,111,109, + 95,109,111,100,117,108,101,192,1,0,0,115,72,0,0,0, + 0,2,2,1,10,1,14,1,6,2,8,1,4,2,6,1, + 8,1,2,1,10,1,14,2,6,1,2,1,10,1,14,1, + 10,1,8,1,8,1,2,1,10,1,14,1,12,2,4,1, + 2,1,10,1,14,1,10,1,2,1,14,1,16,1,10,2, + 14,1,20,1,6,1,6,1,114,128,0,0,0,70,41,1, + 218,8,111,118,101,114,114,105,100,101,99,2,0,0,0,1, + 0,0,0,5,0,0,0,59,0,0,0,67,0,0,0,115, + 212,1,0,0,124,2,115,20,116,0,124,1,100,1,100,0, + 131,3,100,0,107,8,114,54,121,12,124,0,106,1,124,1, + 95,2,87,0,110,20,4,0,116,3,107,10,114,52,1,0, + 1,0,1,0,89,0,110,2,88,0,124,2,115,74,116,0, + 124,1,100,2,100,0,131,3,100,0,107,8,114,166,124,0, + 106,4,125,3,124,3,100,0,107,8,114,134,124,0,106,5, + 100,0,107,9,114,134,116,6,100,0,107,8,114,110,116,7, + 130,1,116,6,106,8,125,4,124,4,106,9,124,4,131,1, + 125,3,124,0,106,5,124,3,95,10,121,10,124,3,124,1, + 95,11,87,0,110,20,4,0,116,3,107,10,114,164,1,0, + 1,0,1,0,89,0,110,2,88,0,124,2,115,186,116,0, + 124,1,100,3,100,0,131,3,100,0,107,8,114,220,121,12, + 124,0,106,12,124,1,95,13,87,0,110,20,4,0,116,3, + 107,10,114,218,1,0,1,0,1,0,89,0,110,2,88,0, + 121,10,124,0,124,1,95,14,87,0,110,20,4,0,116,3, + 107,10,114,250,1,0,1,0,1,0,89,0,110,2,88,0, + 124,2,144,1,115,20,116,0,124,1,100,4,100,0,131,3, + 100,0,107,8,144,1,114,68,124,0,106,5,100,0,107,9, + 144,1,114,68,121,12,124,0,106,5,124,1,95,15,87,0, + 110,22,4,0,116,3,107,10,144,1,114,66,1,0,1,0, + 1,0,89,0,110,2,88,0,124,0,106,16,144,1,114,208, + 124,2,144,1,115,100,116,0,124,1,100,5,100,0,131,3, + 100,0,107,8,144,1,114,136,121,12,124,0,106,17,124,1, + 95,18,87,0,110,22,4,0,116,3,107,10,144,1,114,134, + 1,0,1,0,1,0,89,0,110,2,88,0,124,2,144,1, + 115,160,116,0,124,1,100,6,100,0,131,3,100,0,107,8, + 144,1,114,208,124,0,106,19,100,0,107,9,144,1,114,208, + 121,12,124,0,106,19,124,1,95,20,87,0,110,22,4,0, + 116,3,107,10,144,1,114,206,1,0,1,0,1,0,89,0, + 110,2,88,0,124,1,83,0,41,7,78,114,1,0,0,0, + 114,85,0,0,0,218,11,95,95,112,97,99,107,97,103,101, + 95,95,114,127,0,0,0,114,92,0,0,0,114,125,0,0, + 0,41,21,114,6,0,0,0,114,15,0,0,0,114,1,0, + 0,0,114,90,0,0,0,114,93,0,0,0,114,106,0,0, + 0,114,115,0,0,0,114,116,0,0,0,218,16,95,78,97, + 109,101,115,112,97,99,101,76,111,97,100,101,114,218,7,95, + 95,110,101,119,95,95,90,5,95,112,97,116,104,114,85,0, + 0,0,114,119,0,0,0,114,130,0,0,0,114,89,0,0, + 0,114,127,0,0,0,114,113,0,0,0,114,103,0,0,0, + 114,92,0,0,0,114,112,0,0,0,114,125,0,0,0,41, + 5,114,82,0,0,0,114,83,0,0,0,114,129,0,0,0, + 114,93,0,0,0,114,131,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,218,18,95,105,110,105,116, + 95,109,111,100,117,108,101,95,97,116,116,114,115,237,1,0, + 0,115,92,0,0,0,0,4,20,1,2,1,12,1,14,1, + 6,2,20,1,6,1,8,2,10,1,8,1,4,1,6,2, + 10,1,8,1,2,1,10,1,14,1,6,2,20,1,2,1, + 12,1,14,1,6,2,2,1,10,1,14,1,6,2,24,1, + 12,1,2,1,12,1,16,1,6,2,8,1,24,1,2,1, + 12,1,16,1,6,2,24,1,12,1,2,1,12,1,16,1, + 6,1,114,133,0,0,0,99,1,0,0,0,0,0,0,0, + 2,0,0,0,3,0,0,0,67,0,0,0,115,82,0,0, + 0,100,1,125,1,116,0,124,0,106,1,100,2,131,2,114, + 30,124,0,106,1,106,2,124,0,131,1,125,1,110,20,116, + 0,124,0,106,1,100,3,131,2,114,50,116,3,100,4,131, + 1,130,1,124,1,100,1,107,8,114,68,116,4,124,0,106, + 5,131,1,125,1,116,6,124,0,124,1,131,2,1,0,124, + 1,83,0,41,5,122,43,67,114,101,97,116,101,32,97,32, + 109,111,100,117,108,101,32,98,97,115,101,100,32,111,110,32, + 116,104,101,32,112,114,111,118,105,100,101,100,32,115,112,101, + 99,46,78,218,13,99,114,101,97,116,101,95,109,111,100,117, + 108,101,218,11,101,120,101,99,95,109,111,100,117,108,101,122, + 66,108,111,97,100,101,114,115,32,116,104,97,116,32,100,101, + 102,105,110,101,32,101,120,101,99,95,109,111,100,117,108,101, + 40,41,32,109,117,115,116,32,97,108,115,111,32,100,101,102, + 105,110,101,32,99,114,101,97,116,101,95,109,111,100,117,108, + 101,40,41,41,7,114,4,0,0,0,114,93,0,0,0,114, + 134,0,0,0,114,70,0,0,0,114,16,0,0,0,114,15, + 0,0,0,114,133,0,0,0,41,2,114,82,0,0,0,114, + 83,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,218,16,109,111,100,117,108,101,95,102,114,111,109, + 95,115,112,101,99,41,2,0,0,115,18,0,0,0,0,3, + 4,1,12,3,14,1,12,1,8,2,8,1,10,1,10,1, + 114,136,0,0,0,99,1,0,0,0,0,0,0,0,2,0, + 0,0,3,0,0,0,67,0,0,0,115,106,0,0,0,124, + 0,106,0,100,1,107,8,114,14,100,2,110,4,124,0,106, + 0,125,1,124,0,106,1,100,1,107,8,114,66,124,0,106, + 2,100,1,107,8,114,50,100,3,106,3,124,1,131,1,83, + 0,100,4,106,3,124,1,124,0,106,2,131,2,83,0,110, + 36,124,0,106,4,114,86,100,5,106,3,124,1,124,0,106, + 1,131,2,83,0,100,6,106,3,124,0,106,0,124,0,106, + 1,131,2,83,0,100,1,83,0,41,7,122,38,82,101,116, + 117,114,110,32,116,104,101,32,114,101,112,114,32,116,111,32, + 117,115,101,32,102,111,114,32,116,104,101,32,109,111,100,117, + 108,101,46,78,114,87,0,0,0,122,13,60,109,111,100,117, + 108,101,32,123,33,114,125,62,122,20,60,109,111,100,117,108, + 101,32,123,33,114,125,32,40,123,33,114,125,41,62,122,23, + 60,109,111,100,117,108,101,32,123,33,114,125,32,102,114,111, + 109,32,123,33,114,125,62,122,18,60,109,111,100,117,108,101, + 32,123,33,114,125,32,40,123,125,41,62,41,5,114,15,0, + 0,0,114,103,0,0,0,114,93,0,0,0,114,38,0,0, + 0,114,113,0,0,0,41,2,114,82,0,0,0,114,15,0, 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,114,116,0,0,0,159,1,0,0,115,2,0,0,0,0, - 2,99,1,0,0,0,0,0,0,0,1,0,0,0,2,0, - 0,0,67,0,0,0,115,46,0,0,0,124,0,0,106,0, - 0,100,1,0,107,8,0,114,35,0,124,0,0,106,1,0, - 106,2,0,100,2,0,131,1,0,100,3,0,25,83,124,0, - 0,106,1,0,83,100,1,0,83,41,4,122,32,84,104,101, - 32,110,97,109,101,32,111,102,32,116,104,101,32,109,111,100, - 117,108,101,39,115,32,112,97,114,101,110,116,46,78,218,1, - 46,114,33,0,0,0,41,3,114,110,0,0,0,114,15,0, - 0,0,218,10,114,112,97,114,116,105,116,105,111,110,41,1, - 114,19,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,6,112,97,114,101,110,116,163,1,0,0, - 115,6,0,0,0,0,3,15,1,20,2,122,17,77,111,100, - 117,108,101,83,112,101,99,46,112,97,114,101,110,116,99,1, - 0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,67, - 0,0,0,115,7,0,0,0,124,0,0,106,0,0,83,41, - 1,78,41,1,114,111,0,0,0,41,1,114,19,0,0,0, + 0,114,91,0,0,0,58,2,0,0,115,16,0,0,0,0, + 3,20,1,10,1,10,1,10,2,16,2,6,1,14,2,114, + 91,0,0,0,99,2,0,0,0,0,0,0,0,4,0,0, + 0,12,0,0,0,67,0,0,0,115,186,0,0,0,124,0, + 106,0,125,2,116,1,106,2,131,0,1,0,116,3,124,2, + 131,1,143,148,1,0,116,4,106,5,106,6,124,2,131,1, + 124,1,107,9,114,62,100,1,106,7,124,2,131,1,125,3, + 116,8,124,3,124,2,100,2,141,2,130,1,124,0,106,9, + 100,3,107,8,114,114,124,0,106,10,100,3,107,8,114,96, + 116,8,100,4,124,0,106,0,100,2,141,2,130,1,116,11, + 124,0,124,1,100,5,100,6,141,3,1,0,124,1,83,0, + 116,11,124,0,124,1,100,5,100,6,141,3,1,0,116,12, + 124,0,106,9,100,7,131,2,115,154,124,0,106,9,106,13, + 124,2,131,1,1,0,110,12,124,0,106,9,106,14,124,1, + 131,1,1,0,87,0,100,3,81,0,82,0,88,0,116,4, + 106,5,124,2,25,0,83,0,41,8,122,70,69,120,101,99, + 117,116,101,32,116,104,101,32,115,112,101,99,39,115,32,115, + 112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,32, + 105,110,32,97,110,32,101,120,105,115,116,105,110,103,32,109, + 111,100,117,108,101,39,115,32,110,97,109,101,115,112,97,99, + 101,46,122,30,109,111,100,117,108,101,32,123,33,114,125,32, + 110,111,116,32,105,110,32,115,121,115,46,109,111,100,117,108, + 101,115,41,1,114,15,0,0,0,78,122,14,109,105,115,115, + 105,110,103,32,108,111,97,100,101,114,84,41,1,114,129,0, + 0,0,114,135,0,0,0,41,15,114,15,0,0,0,114,46, + 0,0,0,218,12,97,99,113,117,105,114,101,95,108,111,99, + 107,114,42,0,0,0,114,14,0,0,0,114,79,0,0,0, + 114,30,0,0,0,114,38,0,0,0,114,70,0,0,0,114, + 93,0,0,0,114,106,0,0,0,114,133,0,0,0,114,4, + 0,0,0,218,11,108,111,97,100,95,109,111,100,117,108,101, + 114,135,0,0,0,41,4,114,82,0,0,0,114,83,0,0, + 0,114,15,0,0,0,218,3,109,115,103,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,114,80,0,0,0,75, + 2,0,0,115,32,0,0,0,0,2,6,1,8,1,10,1, + 16,1,10,1,12,1,10,1,10,1,14,2,14,1,4,1, + 14,1,12,4,14,2,22,1,114,80,0,0,0,99,1,0, + 0,0,0,0,0,0,2,0,0,0,27,0,0,0,67,0, + 0,0,115,206,0,0,0,124,0,106,0,106,1,124,0,106, + 2,131,1,1,0,116,3,106,4,124,0,106,2,25,0,125, + 1,116,5,124,1,100,1,100,0,131,3,100,0,107,8,114, + 76,121,12,124,0,106,0,124,1,95,6,87,0,110,20,4, + 0,116,7,107,10,114,74,1,0,1,0,1,0,89,0,110, + 2,88,0,116,5,124,1,100,2,100,0,131,3,100,0,107, + 8,114,154,121,40,124,1,106,8,124,1,95,9,116,10,124, + 1,100,3,131,2,115,130,124,0,106,2,106,11,100,4,131, + 1,100,5,25,0,124,1,95,9,87,0,110,20,4,0,116, + 7,107,10,114,152,1,0,1,0,1,0,89,0,110,2,88, + 0,116,5,124,1,100,6,100,0,131,3,100,0,107,8,114, + 202,121,10,124,0,124,1,95,12,87,0,110,20,4,0,116, + 7,107,10,114,200,1,0,1,0,1,0,89,0,110,2,88, + 0,124,1,83,0,41,7,78,114,85,0,0,0,114,130,0, + 0,0,114,127,0,0,0,114,117,0,0,0,114,19,0,0, + 0,114,89,0,0,0,41,13,114,93,0,0,0,114,138,0, + 0,0,114,15,0,0,0,114,14,0,0,0,114,79,0,0, + 0,114,6,0,0,0,114,85,0,0,0,114,90,0,0,0, + 114,1,0,0,0,114,130,0,0,0,114,4,0,0,0,114, + 118,0,0,0,114,89,0,0,0,41,2,114,82,0,0,0, + 114,83,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,218,25,95,108,111,97,100,95,98,97,99,107, + 119,97,114,100,95,99,111,109,112,97,116,105,98,108,101,100, + 2,0,0,115,40,0,0,0,0,4,14,2,12,1,16,1, + 2,1,12,1,14,1,6,1,16,1,2,4,8,1,10,1, + 22,1,14,1,6,1,16,1,2,1,10,1,14,1,6,1, + 114,140,0,0,0,99,1,0,0,0,0,0,0,0,2,0, + 0,0,11,0,0,0,67,0,0,0,115,118,0,0,0,124, + 0,106,0,100,0,107,9,114,30,116,1,124,0,106,0,100, + 1,131,2,115,30,116,2,124,0,131,1,83,0,116,3,124, + 0,131,1,125,1,116,4,124,1,131,1,143,54,1,0,124, + 0,106,0,100,0,107,8,114,84,124,0,106,5,100,0,107, + 8,114,96,116,6,100,2,124,0,106,7,100,3,141,2,130, + 1,110,12,124,0,106,0,106,8,124,1,131,1,1,0,87, + 0,100,0,81,0,82,0,88,0,116,9,106,10,124,0,106, + 7,25,0,83,0,41,4,78,114,135,0,0,0,122,14,109, + 105,115,115,105,110,103,32,108,111,97,100,101,114,41,1,114, + 15,0,0,0,41,11,114,93,0,0,0,114,4,0,0,0, + 114,140,0,0,0,114,136,0,0,0,114,96,0,0,0,114, + 106,0,0,0,114,70,0,0,0,114,15,0,0,0,114,135, + 0,0,0,114,14,0,0,0,114,79,0,0,0,41,2,114, + 82,0,0,0,114,83,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,218,14,95,108,111,97,100,95, + 117,110,108,111,99,107,101,100,129,2,0,0,115,20,0,0, + 0,0,2,10,2,12,1,8,2,8,1,10,1,10,1,10, + 1,16,3,22,5,114,141,0,0,0,99,1,0,0,0,0, + 0,0,0,1,0,0,0,9,0,0,0,67,0,0,0,115, + 38,0,0,0,116,0,106,1,131,0,1,0,116,2,124,0, + 106,3,131,1,143,10,1,0,116,4,124,0,131,1,83,0, + 81,0,82,0,88,0,100,1,83,0,41,2,122,191,82,101, + 116,117,114,110,32,97,32,110,101,119,32,109,111,100,117,108, + 101,32,111,98,106,101,99,116,44,32,108,111,97,100,101,100, + 32,98,121,32,116,104,101,32,115,112,101,99,39,115,32,108, + 111,97,100,101,114,46,10,10,32,32,32,32,84,104,101,32, + 109,111,100,117,108,101,32,105,115,32,110,111,116,32,97,100, + 100,101,100,32,116,111,32,105,116,115,32,112,97,114,101,110, + 116,46,10,10,32,32,32,32,73,102,32,97,32,109,111,100, + 117,108,101,32,105,115,32,97,108,114,101,97,100,121,32,105, + 110,32,115,121,115,46,109,111,100,117,108,101,115,44,32,116, + 104,97,116,32,101,120,105,115,116,105,110,103,32,109,111,100, + 117,108,101,32,103,101,116,115,10,32,32,32,32,99,108,111, + 98,98,101,114,101,100,46,10,10,32,32,32,32,78,41,5, + 114,46,0,0,0,114,137,0,0,0,114,42,0,0,0,114, + 15,0,0,0,114,141,0,0,0,41,1,114,82,0,0,0, 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,114, - 117,0,0,0,171,1,0,0,115,2,0,0,0,0,2,122, - 23,77,111,100,117,108,101,83,112,101,99,46,104,97,115,95, - 108,111,99,97,116,105,111,110,99,2,0,0,0,0,0,0, - 0,2,0,0,0,2,0,0,0,67,0,0,0,115,19,0, - 0,0,116,0,0,124,1,0,131,1,0,124,0,0,95,1, - 0,100,0,0,83,41,1,78,41,2,218,4,98,111,111,108, - 114,111,0,0,0,41,2,114,19,0,0,0,218,5,118,97, - 108,117,101,114,10,0,0,0,114,10,0,0,0,114,11,0, - 0,0,114,117,0,0,0,175,1,0,0,115,2,0,0,0, - 0,2,41,12,114,1,0,0,0,114,0,0,0,0,114,2, - 0,0,0,114,3,0,0,0,114,20,0,0,0,114,52,0, - 0,0,114,118,0,0,0,218,8,112,114,111,112,101,114,116, - 121,114,116,0,0,0,218,6,115,101,116,116,101,114,114,123, - 0,0,0,114,117,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,114,106,0,0, - 0,79,1,0,0,115,20,0,0,0,12,35,6,2,15,1, - 15,11,12,10,12,12,18,9,21,4,18,8,18,4,114,106, - 0,0,0,114,107,0,0,0,114,109,0,0,0,99,2,0, - 0,0,2,0,0,0,6,0,0,0,15,0,0,0,67,0, - 0,0,115,217,0,0,0,116,0,0,124,1,0,100,1,0, - 131,2,0,114,110,0,116,1,0,100,2,0,107,8,0,114, - 33,0,116,2,0,130,1,0,116,1,0,106,3,0,125,4, - 0,124,3,0,100,2,0,107,8,0,114,70,0,124,4,0, - 124,0,0,100,3,0,124,1,0,131,1,1,83,124,3,0, - 114,82,0,103,0,0,110,3,0,100,2,0,125,5,0,124, - 4,0,124,0,0,100,3,0,124,1,0,100,4,0,124,5, - 0,131,1,2,83,124,3,0,100,2,0,107,8,0,114,192, - 0,116,0,0,124,1,0,100,5,0,131,2,0,114,186,0, - 121,19,0,124,1,0,106,4,0,124,0,0,131,1,0,125, - 3,0,87,113,192,0,4,116,5,0,107,10,0,114,182,0, - 1,1,1,100,2,0,125,3,0,89,113,192,0,88,110,6, - 0,100,6,0,125,3,0,116,6,0,124,0,0,124,1,0, - 100,7,0,124,2,0,100,5,0,124,3,0,131,2,2,83, - 41,8,122,53,82,101,116,117,114,110,32,97,32,109,111,100, - 117,108,101,32,115,112,101,99,32,98,97,115,101,100,32,111, - 110,32,118,97,114,105,111,117,115,32,108,111,97,100,101,114, - 32,109,101,116,104,111,100,115,46,90,12,103,101,116,95,102, - 105,108,101,110,97,109,101,78,114,99,0,0,0,114,110,0, - 0,0,114,109,0,0,0,70,114,107,0,0,0,41,7,114, - 4,0,0,0,114,119,0,0,0,114,120,0,0,0,218,23, - 115,112,101,99,95,102,114,111,109,95,102,105,108,101,95,108, - 111,99,97,116,105,111,110,114,109,0,0,0,114,77,0,0, - 0,114,106,0,0,0,41,6,114,15,0,0,0,114,99,0, - 0,0,114,107,0,0,0,114,109,0,0,0,114,128,0,0, - 0,90,6,115,101,97,114,99,104,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,114,85,0,0,0,180,1,0, - 0,115,34,0,0,0,0,2,15,1,12,1,6,1,9,2, - 12,1,16,1,18,1,15,1,7,2,12,1,15,1,3,1, - 19,1,13,1,14,3,6,2,114,85,0,0,0,99,3,0, - 0,0,0,0,0,0,8,0,0,0,53,0,0,0,67,0, - 0,0,115,118,1,0,0,121,13,0,124,0,0,106,0,0, - 125,3,0,87,110,18,0,4,116,1,0,107,10,0,114,33, - 0,1,1,1,89,110,17,0,88,124,3,0,100,0,0,107, - 9,0,114,50,0,124,3,0,83,124,0,0,106,2,0,125, - 4,0,124,1,0,100,0,0,107,8,0,114,105,0,121,13, - 0,124,0,0,106,3,0,125,1,0,87,110,18,0,4,116, - 1,0,107,10,0,114,104,0,1,1,1,89,110,1,0,88, - 121,13,0,124,0,0,106,4,0,125,5,0,87,110,24,0, - 4,116,1,0,107,10,0,114,144,0,1,1,1,100,0,0, - 125,5,0,89,110,1,0,88,124,2,0,100,0,0,107,8, - 0,114,218,0,124,5,0,100,0,0,107,8,0,114,212,0, - 121,13,0,124,1,0,106,5,0,125,2,0,87,113,218,0, - 4,116,1,0,107,10,0,114,208,0,1,1,1,100,0,0, - 125,2,0,89,113,218,0,88,110,6,0,124,5,0,125,2, - 0,121,13,0,124,0,0,106,6,0,125,6,0,87,110,24, - 0,4,116,1,0,107,10,0,114,1,1,1,1,1,100,0, - 0,125,6,0,89,110,1,0,88,121,19,0,116,7,0,124, - 0,0,106,8,0,131,1,0,125,7,0,87,110,24,0,4, - 116,1,0,107,10,0,114,47,1,1,1,1,100,0,0,125, - 7,0,89,110,1,0,88,116,9,0,124,4,0,124,1,0, - 100,1,0,124,2,0,131,2,1,125,3,0,124,5,0,100, - 0,0,107,8,0,114,87,1,100,2,0,110,3,0,100,3, - 0,124,3,0,95,10,0,124,6,0,124,3,0,95,11,0, - 124,7,0,124,3,0,95,12,0,124,3,0,83,41,4,78, - 114,107,0,0,0,70,84,41,13,114,95,0,0,0,114,96, - 0,0,0,114,1,0,0,0,114,91,0,0,0,114,98,0, - 0,0,90,7,95,79,82,73,71,73,78,218,10,95,95,99, - 97,99,104,101,100,95,95,218,4,108,105,115,116,218,8,95, - 95,112,97,116,104,95,95,114,106,0,0,0,114,111,0,0, - 0,114,116,0,0,0,114,110,0,0,0,41,8,114,89,0, - 0,0,114,99,0,0,0,114,107,0,0,0,114,88,0,0, - 0,114,15,0,0,0,90,8,108,111,99,97,116,105,111,110, - 114,116,0,0,0,114,110,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,218,17,95,115,112,101,99, - 95,102,114,111,109,95,109,111,100,117,108,101,209,1,0,0, - 115,72,0,0,0,0,2,3,1,13,1,13,1,5,2,12, - 1,4,2,9,1,12,1,3,1,13,1,13,2,5,1,3, - 1,13,1,13,1,11,1,12,1,12,1,3,1,13,1,13, - 1,14,2,6,1,3,1,13,1,13,1,11,1,3,1,19, - 1,13,1,11,2,21,1,27,1,9,1,9,1,114,132,0, - 0,0,218,8,111,118,101,114,114,105,100,101,70,99,2,0, - 0,0,1,0,0,0,5,0,0,0,59,0,0,0,67,0, - 0,0,115,54,2,0,0,124,2,0,115,30,0,116,0,0, - 124,1,0,100,1,0,100,0,0,131,3,0,100,0,0,107, - 8,0,114,67,0,121,16,0,124,0,0,106,1,0,124,1, - 0,95,2,0,87,110,18,0,4,116,3,0,107,10,0,114, - 66,0,1,1,1,89,110,1,0,88,124,2,0,115,97,0, - 116,0,0,124,1,0,100,2,0,100,0,0,131,3,0,100, - 0,0,107,8,0,114,221,0,124,0,0,106,4,0,125,3, - 0,124,3,0,100,0,0,107,8,0,114,187,0,124,0,0, - 106,5,0,100,0,0,107,9,0,114,187,0,116,6,0,100, - 0,0,107,8,0,114,151,0,116,7,0,130,1,0,116,6, - 0,106,8,0,125,4,0,124,4,0,106,9,0,124,4,0, - 131,1,0,125,3,0,124,0,0,106,5,0,124,3,0,95, - 10,0,121,13,0,124,3,0,124,1,0,95,11,0,87,110, - 18,0,4,116,3,0,107,10,0,114,220,0,1,1,1,89, - 110,1,0,88,124,2,0,115,251,0,116,0,0,124,1,0, - 100,3,0,100,0,0,131,3,0,100,0,0,107,8,0,114, - 32,1,121,16,0,124,0,0,106,12,0,124,1,0,95,13, - 0,87,110,18,0,4,116,3,0,107,10,0,114,31,1,1, - 1,1,89,110,1,0,88,121,13,0,124,0,0,124,1,0, - 95,14,0,87,110,18,0,4,116,3,0,107,10,0,114,65, - 1,1,1,1,89,110,1,0,88,124,2,0,115,96,1,116, - 0,0,124,1,0,100,4,0,100,0,0,131,3,0,100,0, - 0,107,8,0,114,148,1,124,0,0,106,5,0,100,0,0, - 107,9,0,114,148,1,121,16,0,124,0,0,106,5,0,124, - 1,0,95,15,0,87,110,18,0,4,116,3,0,107,10,0, - 114,147,1,1,1,1,89,110,1,0,88,124,0,0,106,16, - 0,114,50,2,124,2,0,115,187,1,116,0,0,124,1,0, - 100,5,0,100,0,0,131,3,0,100,0,0,107,8,0,114, - 224,1,121,16,0,124,0,0,106,17,0,124,1,0,95,18, - 0,87,110,18,0,4,116,3,0,107,10,0,114,223,1,1, - 1,1,89,110,1,0,88,124,2,0,115,254,1,116,0,0, - 124,1,0,100,6,0,100,0,0,131,3,0,100,0,0,107, - 8,0,114,50,2,124,0,0,106,19,0,100,0,0,107,9, - 0,114,50,2,121,16,0,124,0,0,106,19,0,124,1,0, - 95,20,0,87,110,18,0,4,116,3,0,107,10,0,114,49, - 2,1,1,1,89,110,1,0,88,124,1,0,83,41,7,78, - 114,1,0,0,0,114,91,0,0,0,218,11,95,95,112,97, - 99,107,97,103,101,95,95,114,131,0,0,0,114,98,0,0, - 0,114,129,0,0,0,41,21,114,6,0,0,0,114,15,0, - 0,0,114,1,0,0,0,114,96,0,0,0,114,99,0,0, - 0,114,110,0,0,0,114,119,0,0,0,114,120,0,0,0, - 218,16,95,78,97,109,101,115,112,97,99,101,76,111,97,100, - 101,114,218,7,95,95,110,101,119,95,95,90,5,95,112,97, - 116,104,114,91,0,0,0,114,123,0,0,0,114,134,0,0, - 0,114,95,0,0,0,114,131,0,0,0,114,117,0,0,0, - 114,107,0,0,0,114,98,0,0,0,114,116,0,0,0,114, - 129,0,0,0,41,5,114,88,0,0,0,114,89,0,0,0, - 114,133,0,0,0,114,99,0,0,0,114,135,0,0,0,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,18, - 95,105,110,105,116,95,109,111,100,117,108,101,95,97,116,116, - 114,115,254,1,0,0,115,92,0,0,0,0,4,30,1,3, - 1,16,1,13,1,5,2,30,1,9,1,12,2,15,1,12, - 1,6,1,9,2,15,1,12,1,3,1,13,1,13,1,5, - 2,30,1,3,1,16,1,13,1,5,2,3,1,13,1,13, - 1,5,2,30,1,15,1,3,1,16,1,13,1,5,2,9, - 1,30,1,3,1,16,1,13,1,5,2,30,1,15,1,3, - 1,16,1,13,1,5,1,114,137,0,0,0,99,1,0,0, - 0,0,0,0,0,2,0,0,0,5,0,0,0,67,0,0, - 0,115,129,0,0,0,100,1,0,125,1,0,116,0,0,124, - 0,0,106,1,0,100,2,0,131,2,0,114,45,0,124,0, - 0,106,1,0,106,2,0,124,0,0,131,1,0,125,1,0, - 110,40,0,116,0,0,124,0,0,106,1,0,100,3,0,131, - 2,0,114,85,0,116,3,0,106,4,0,100,4,0,116,5, - 0,100,5,0,100,6,0,131,2,1,1,124,1,0,100,1, - 0,107,8,0,114,112,0,116,6,0,124,0,0,106,7,0, - 131,1,0,125,1,0,116,8,0,124,0,0,124,1,0,131, - 2,0,1,124,1,0,83,41,7,122,43,67,114,101,97,116, - 101,32,97,32,109,111,100,117,108,101,32,98,97,115,101,100, - 32,111,110,32,116,104,101,32,112,114,111,118,105,100,101,100, - 32,115,112,101,99,46,78,218,13,99,114,101,97,116,101,95, - 109,111,100,117,108,101,218,11,101,120,101,99,95,109,111,100, - 117,108,101,122,87,115,116,97,114,116,105,110,103,32,105,110, - 32,80,121,116,104,111,110,32,51,46,54,44,32,108,111,97, - 100,101,114,115,32,100,101,102,105,110,105,110,103,32,101,120, - 101,99,95,109,111,100,117,108,101,40,41,32,109,117,115,116, - 32,97,108,115,111,32,100,101,102,105,110,101,32,99,114,101, - 97,116,101,95,109,111,100,117,108,101,40,41,90,10,115,116, - 97,99,107,108,101,118,101,108,233,2,0,0,0,41,9,114, - 4,0,0,0,114,99,0,0,0,114,138,0,0,0,218,9, - 95,119,97,114,110,105,110,103,115,218,4,119,97,114,110,218, - 18,68,101,112,114,101,99,97,116,105,111,110,87,97,114,110, - 105,110,103,114,16,0,0,0,114,15,0,0,0,114,137,0, - 0,0,41,2,114,88,0,0,0,114,89,0,0,0,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,16,109, - 111,100,117,108,101,95,102,114,111,109,95,115,112,101,99,58, - 2,0,0,115,20,0,0,0,0,3,6,1,18,3,21,1, - 18,1,9,2,13,1,12,1,15,1,13,1,114,144,0,0, - 0,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0, - 0,0,67,0,0,0,115,149,0,0,0,124,0,0,106,0, - 0,100,1,0,107,8,0,114,21,0,100,2,0,110,6,0, - 124,0,0,106,0,0,125,1,0,124,0,0,106,1,0,100, - 1,0,107,8,0,114,95,0,124,0,0,106,2,0,100,1, - 0,107,8,0,114,73,0,100,3,0,106,3,0,124,1,0, - 131,1,0,83,100,4,0,106,3,0,124,1,0,124,0,0, - 106,2,0,131,2,0,83,110,50,0,124,0,0,106,4,0, - 114,123,0,100,5,0,106,3,0,124,1,0,124,0,0,106, - 1,0,131,2,0,83,100,6,0,106,3,0,124,0,0,106, - 0,0,124,0,0,106,1,0,131,2,0,83,100,1,0,83, - 41,7,122,38,82,101,116,117,114,110,32,116,104,101,32,114, - 101,112,114,32,116,111,32,117,115,101,32,102,111,114,32,116, - 104,101,32,109,111,100,117,108,101,46,78,114,93,0,0,0, - 122,13,60,109,111,100,117,108,101,32,123,33,114,125,62,122, - 20,60,109,111,100,117,108,101,32,123,33,114,125,32,40,123, - 33,114,125,41,62,122,23,60,109,111,100,117,108,101,32,123, - 33,114,125,32,102,114,111,109,32,123,33,114,125,62,122,18, - 60,109,111,100,117,108,101,32,123,33,114,125,32,40,123,125, - 41,62,41,5,114,15,0,0,0,114,107,0,0,0,114,99, - 0,0,0,114,50,0,0,0,114,117,0,0,0,41,2,114, - 88,0,0,0,114,15,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,114,97,0,0,0,76,2,0, - 0,115,16,0,0,0,0,3,30,1,15,1,15,1,13,2, - 22,2,9,1,19,2,114,97,0,0,0,99,2,0,0,0, - 0,0,0,0,4,0,0,0,12,0,0,0,67,0,0,0, - 115,253,0,0,0,124,0,0,106,0,0,125,2,0,116,1, - 0,106,2,0,131,0,0,1,116,3,0,124,2,0,131,1, - 0,143,208,0,1,116,4,0,106,5,0,106,6,0,124,2, - 0,131,1,0,124,1,0,107,9,0,114,89,0,100,1,0, - 106,7,0,124,2,0,131,1,0,125,3,0,116,8,0,124, - 3,0,100,2,0,124,2,0,131,1,1,130,1,0,124,0, - 0,106,9,0,100,3,0,107,8,0,114,163,0,124,0,0, - 106,10,0,100,3,0,107,8,0,114,140,0,116,8,0,100, - 4,0,100,2,0,124,0,0,106,0,0,131,1,1,130,1, - 0,116,11,0,124,0,0,124,1,0,100,5,0,100,6,0, - 131,2,1,1,124,1,0,83,116,11,0,124,0,0,124,1, - 0,100,5,0,100,6,0,131,2,1,1,116,12,0,124,0, - 0,106,9,0,100,7,0,131,2,0,115,219,0,124,0,0, - 106,9,0,106,13,0,124,2,0,131,1,0,1,110,16,0, - 124,0,0,106,9,0,106,14,0,124,1,0,131,1,0,1, - 87,100,3,0,81,82,88,116,4,0,106,5,0,124,2,0, - 25,83,41,8,122,51,69,120,101,99,117,116,101,32,116,104, - 101,32,115,112,101,99,32,105,110,32,97,110,32,101,120,105, - 115,116,105,110,103,32,109,111,100,117,108,101,39,115,32,110, - 97,109,101,115,112,97,99,101,46,122,30,109,111,100,117,108, - 101,32,123,33,114,125,32,110,111,116,32,105,110,32,115,121, - 115,46,109,111,100,117,108,101,115,114,15,0,0,0,78,122, - 14,109,105,115,115,105,110,103,32,108,111,97,100,101,114,114, - 133,0,0,0,84,114,139,0,0,0,41,15,114,15,0,0, - 0,114,57,0,0,0,218,12,97,99,113,117,105,114,101,95, - 108,111,99,107,114,54,0,0,0,114,14,0,0,0,114,21, - 0,0,0,114,42,0,0,0,114,50,0,0,0,114,77,0, - 0,0,114,99,0,0,0,114,110,0,0,0,114,137,0,0, - 0,114,4,0,0,0,218,11,108,111,97,100,95,109,111,100, - 117,108,101,114,139,0,0,0,41,4,114,88,0,0,0,114, - 89,0,0,0,114,15,0,0,0,218,3,109,115,103,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,114,86,0, - 0,0,93,2,0,0,115,32,0,0,0,0,2,9,1,10, - 1,13,1,24,1,15,1,18,1,15,1,15,1,21,2,19, - 1,4,1,19,1,18,4,19,2,23,1,114,86,0,0,0, - 99,1,0,0,0,0,0,0,0,2,0,0,0,27,0,0, - 0,67,0,0,0,115,3,1,0,0,124,0,0,106,0,0, - 106,1,0,124,0,0,106,2,0,131,1,0,1,116,3,0, - 106,4,0,124,0,0,106,2,0,25,125,1,0,116,5,0, - 124,1,0,100,1,0,100,0,0,131,3,0,100,0,0,107, - 8,0,114,96,0,121,16,0,124,0,0,106,0,0,124,1, - 0,95,6,0,87,110,18,0,4,116,7,0,107,10,0,114, - 95,0,1,1,1,89,110,1,0,88,116,5,0,124,1,0, - 100,2,0,100,0,0,131,3,0,100,0,0,107,8,0,114, - 197,0,121,56,0,124,1,0,106,8,0,124,1,0,95,9, - 0,116,10,0,124,1,0,100,3,0,131,2,0,115,175,0, - 124,0,0,106,2,0,106,11,0,100,4,0,131,1,0,100, - 5,0,25,124,1,0,95,9,0,87,110,18,0,4,116,7, - 0,107,10,0,114,196,0,1,1,1,89,110,1,0,88,116, - 5,0,124,1,0,100,6,0,100,0,0,131,3,0,100,0, - 0,107,8,0,114,255,0,121,13,0,124,0,0,124,1,0, - 95,12,0,87,110,18,0,4,116,7,0,107,10,0,114,254, - 0,1,1,1,89,110,1,0,88,124,1,0,83,41,7,78, - 114,91,0,0,0,114,134,0,0,0,114,131,0,0,0,114, - 121,0,0,0,114,33,0,0,0,114,95,0,0,0,41,13, - 114,99,0,0,0,114,146,0,0,0,114,15,0,0,0,114, - 14,0,0,0,114,21,0,0,0,114,6,0,0,0,114,91, - 0,0,0,114,96,0,0,0,114,1,0,0,0,114,134,0, - 0,0,114,4,0,0,0,114,122,0,0,0,114,95,0,0, - 0,41,2,114,88,0,0,0,114,89,0,0,0,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,218,25,95,108, - 111,97,100,95,98,97,99,107,119,97,114,100,95,99,111,109, - 112,97,116,105,98,108,101,118,2,0,0,115,40,0,0,0, - 0,4,19,2,16,1,24,1,3,1,16,1,13,1,5,1, - 24,1,3,4,12,1,15,1,29,1,13,1,5,1,24,1, - 3,1,13,1,13,1,5,1,114,148,0,0,0,99,1,0, - 0,0,0,0,0,0,2,0,0,0,11,0,0,0,67,0, - 0,0,115,159,0,0,0,124,0,0,106,0,0,100,0,0, - 107,9,0,114,43,0,116,1,0,124,0,0,106,0,0,100, - 1,0,131,2,0,115,43,0,116,2,0,124,0,0,131,1, - 0,83,116,3,0,124,0,0,131,1,0,125,1,0,116,4, - 0,124,1,0,131,1,0,143,75,0,1,124,0,0,106,0, - 0,100,0,0,107,8,0,114,122,0,124,0,0,106,5,0, - 100,0,0,107,8,0,114,138,0,116,6,0,100,2,0,100, - 3,0,124,0,0,106,7,0,131,1,1,130,1,0,110,16, - 0,124,0,0,106,0,0,106,8,0,124,1,0,131,1,0, - 1,87,100,0,0,81,82,88,116,9,0,106,10,0,124,0, - 0,106,7,0,25,83,41,4,78,114,139,0,0,0,122,14, - 109,105,115,115,105,110,103,32,108,111,97,100,101,114,114,15, - 0,0,0,41,11,114,99,0,0,0,114,4,0,0,0,114, - 148,0,0,0,114,144,0,0,0,114,102,0,0,0,114,110, - 0,0,0,114,77,0,0,0,114,15,0,0,0,114,139,0, - 0,0,114,14,0,0,0,114,21,0,0,0,41,2,114,88, - 0,0,0,114,89,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,218,14,95,108,111,97,100,95,117, - 110,108,111,99,107,101,100,147,2,0,0,115,20,0,0,0, - 0,2,15,2,18,1,10,2,12,1,13,1,15,1,15,1, - 24,3,23,5,114,149,0,0,0,99,1,0,0,0,0,0, - 0,0,1,0,0,0,9,0,0,0,67,0,0,0,115,47, - 0,0,0,116,0,0,106,1,0,131,0,0,1,116,2,0, - 124,0,0,106,3,0,131,1,0,143,15,0,1,116,4,0, - 124,0,0,131,1,0,83,87,100,1,0,81,82,88,100,1, - 0,83,41,2,122,191,82,101,116,117,114,110,32,97,32,110, - 101,119,32,109,111,100,117,108,101,32,111,98,106,101,99,116, - 44,32,108,111,97,100,101,100,32,98,121,32,116,104,101,32, - 115,112,101,99,39,115,32,108,111,97,100,101,114,46,10,10, - 32,32,32,32,84,104,101,32,109,111,100,117,108,101,32,105, - 115,32,110,111,116,32,97,100,100,101,100,32,116,111,32,105, - 116,115,32,112,97,114,101,110,116,46,10,10,32,32,32,32, - 73,102,32,97,32,109,111,100,117,108,101,32,105,115,32,97, - 108,114,101,97,100,121,32,105,110,32,115,121,115,46,109,111, - 100,117,108,101,115,44,32,116,104,97,116,32,101,120,105,115, - 116,105,110,103,32,109,111,100,117,108,101,32,103,101,116,115, - 10,32,32,32,32,99,108,111,98,98,101,114,101,100,46,10, - 10,32,32,32,32,78,41,5,114,57,0,0,0,114,145,0, - 0,0,114,54,0,0,0,114,15,0,0,0,114,149,0,0, - 0,41,1,114,88,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,114,87,0,0,0,170,2,0,0, - 115,6,0,0,0,0,9,10,1,16,1,114,87,0,0,0, - 99,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0, - 0,64,0,0,0,115,205,0,0,0,101,0,0,90,1,0, - 100,0,0,90,2,0,100,1,0,90,3,0,101,4,0,100, - 2,0,100,3,0,132,0,0,131,1,0,90,5,0,101,6, - 0,100,4,0,100,4,0,100,5,0,100,6,0,132,2,0, - 131,1,0,90,7,0,101,6,0,100,4,0,100,7,0,100, - 8,0,132,1,0,131,1,0,90,8,0,101,6,0,100,9, - 0,100,10,0,132,0,0,131,1,0,90,9,0,101,6,0, - 100,11,0,100,12,0,132,0,0,131,1,0,90,10,0,101, - 6,0,101,11,0,100,13,0,100,14,0,132,0,0,131,1, - 0,131,1,0,90,12,0,101,6,0,101,11,0,100,15,0, - 100,16,0,132,0,0,131,1,0,131,1,0,90,13,0,101, - 6,0,101,11,0,100,17,0,100,18,0,132,0,0,131,1, - 0,131,1,0,90,14,0,101,6,0,101,15,0,131,1,0, - 90,16,0,100,4,0,83,41,19,218,15,66,117,105,108,116, - 105,110,73,109,112,111,114,116,101,114,122,144,77,101,116,97, - 32,112,97,116,104,32,105,109,112,111,114,116,32,102,111,114, - 32,98,117,105,108,116,45,105,110,32,109,111,100,117,108,101, + 81,0,0,0,152,2,0,0,115,6,0,0,0,0,9,8, + 1,12,1,114,81,0,0,0,99,0,0,0,0,0,0,0, + 0,0,0,0,0,4,0,0,0,64,0,0,0,115,136,0, + 0,0,101,0,90,1,100,0,90,2,100,1,90,3,101,4, + 100,2,100,3,132,0,131,1,90,5,101,6,100,19,100,5, + 100,6,132,1,131,1,90,7,101,6,100,20,100,7,100,8, + 132,1,131,1,90,8,101,6,100,9,100,10,132,0,131,1, + 90,9,101,6,100,11,100,12,132,0,131,1,90,10,101,6, + 101,11,100,13,100,14,132,0,131,1,131,1,90,12,101,6, + 101,11,100,15,100,16,132,0,131,1,131,1,90,13,101,6, + 101,11,100,17,100,18,132,0,131,1,131,1,90,14,101,6, + 101,15,131,1,90,16,100,4,83,0,41,21,218,15,66,117, + 105,108,116,105,110,73,109,112,111,114,116,101,114,122,144,77, + 101,116,97,32,112,97,116,104,32,105,109,112,111,114,116,32, + 102,111,114,32,98,117,105,108,116,45,105,110,32,109,111,100, + 117,108,101,115,46,10,10,32,32,32,32,65,108,108,32,109, + 101,116,104,111,100,115,32,97,114,101,32,101,105,116,104,101, + 114,32,99,108,97,115,115,32,111,114,32,115,116,97,116,105, + 99,32,109,101,116,104,111,100,115,32,116,111,32,97,118,111, + 105,100,32,116,104,101,32,110,101,101,100,32,116,111,10,32, + 32,32,32,105,110,115,116,97,110,116,105,97,116,101,32,116, + 104,101,32,99,108,97,115,115,46,10,10,32,32,32,32,99, + 1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0, + 67,0,0,0,115,12,0,0,0,100,1,106,0,124,0,106, + 1,131,1,83,0,41,2,122,115,82,101,116,117,114,110,32, + 114,101,112,114,32,102,111,114,32,116,104,101,32,109,111,100, + 117,108,101,46,10,10,32,32,32,32,32,32,32,32,84,104, + 101,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, + 101,99,97,116,101,100,46,32,32,84,104,101,32,105,109,112, + 111,114,116,32,109,97,99,104,105,110,101,114,121,32,100,111, + 101,115,32,116,104,101,32,106,111,98,32,105,116,115,101,108, + 102,46,10,10,32,32,32,32,32,32,32,32,122,24,60,109, + 111,100,117,108,101,32,123,33,114,125,32,40,98,117,105,108, + 116,45,105,110,41,62,41,2,114,38,0,0,0,114,1,0, + 0,0,41,1,114,83,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,86,0,0,0,177,2,0, + 0,115,2,0,0,0,0,7,122,27,66,117,105,108,116,105, + 110,73,109,112,111,114,116,101,114,46,109,111,100,117,108,101, + 95,114,101,112,114,78,99,4,0,0,0,0,0,0,0,4, + 0,0,0,5,0,0,0,67,0,0,0,115,44,0,0,0, + 124,2,100,0,107,9,114,12,100,0,83,0,116,0,106,1, + 124,1,131,1,114,36,116,2,124,1,124,0,100,1,100,2, + 141,3,83,0,100,0,83,0,100,0,83,0,41,3,78,122, + 8,98,117,105,108,116,45,105,110,41,1,114,103,0,0,0, + 41,3,114,46,0,0,0,90,10,105,115,95,98,117,105,108, + 116,105,110,114,78,0,0,0,41,4,218,3,99,108,115,114, + 71,0,0,0,218,4,112,97,116,104,218,6,116,97,114,103, + 101,116,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,218,9,102,105,110,100,95,115,112,101,99,186,2,0,0, + 115,10,0,0,0,0,2,8,1,4,1,10,1,14,2,122, + 25,66,117,105,108,116,105,110,73,109,112,111,114,116,101,114, + 46,102,105,110,100,95,115,112,101,99,99,3,0,0,0,0, + 0,0,0,4,0,0,0,3,0,0,0,67,0,0,0,115, + 30,0,0,0,124,0,106,0,124,1,124,2,131,2,125,3, + 124,3,100,1,107,9,114,26,124,3,106,1,83,0,100,1, + 83,0,41,2,122,175,70,105,110,100,32,116,104,101,32,98, + 117,105,108,116,45,105,110,32,109,111,100,117,108,101,46,10, + 10,32,32,32,32,32,32,32,32,73,102,32,39,112,97,116, + 104,39,32,105,115,32,101,118,101,114,32,115,112,101,99,105, + 102,105,101,100,32,116,104,101,110,32,116,104,101,32,115,101, + 97,114,99,104,32,105,115,32,99,111,110,115,105,100,101,114, + 101,100,32,97,32,102,97,105,108,117,114,101,46,10,10,32, + 32,32,32,32,32,32,32,84,104,105,115,32,109,101,116,104, + 111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,100, + 46,32,32,85,115,101,32,102,105,110,100,95,115,112,101,99, + 40,41,32,105,110,115,116,101,97,100,46,10,10,32,32,32, + 32,32,32,32,32,78,41,2,114,146,0,0,0,114,93,0, + 0,0,41,4,114,143,0,0,0,114,71,0,0,0,114,144, + 0,0,0,114,82,0,0,0,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,218,11,102,105,110,100,95,109,111, + 100,117,108,101,195,2,0,0,115,4,0,0,0,0,9,12, + 1,122,27,66,117,105,108,116,105,110,73,109,112,111,114,116, + 101,114,46,102,105,110,100,95,109,111,100,117,108,101,99,2, + 0,0,0,0,0,0,0,2,0,0,0,4,0,0,0,67, + 0,0,0,115,46,0,0,0,124,1,106,0,116,1,106,2, + 107,7,114,34,116,3,100,1,106,4,124,1,106,0,131,1, + 124,1,106,0,100,2,141,2,130,1,116,5,116,6,106,7, + 124,1,131,2,83,0,41,3,122,24,67,114,101,97,116,101, + 32,97,32,98,117,105,108,116,45,105,110,32,109,111,100,117, + 108,101,122,29,123,33,114,125,32,105,115,32,110,111,116,32, + 97,32,98,117,105,108,116,45,105,110,32,109,111,100,117,108, + 101,41,1,114,15,0,0,0,41,8,114,15,0,0,0,114, + 14,0,0,0,114,69,0,0,0,114,70,0,0,0,114,38, + 0,0,0,114,58,0,0,0,114,46,0,0,0,90,14,99, + 114,101,97,116,101,95,98,117,105,108,116,105,110,41,2,114, + 26,0,0,0,114,82,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,134,0,0,0,207,2,0, + 0,115,8,0,0,0,0,3,12,1,12,1,10,1,122,29, + 66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,46, + 99,114,101,97,116,101,95,109,111,100,117,108,101,99,2,0, + 0,0,0,0,0,0,2,0,0,0,3,0,0,0,67,0, + 0,0,115,16,0,0,0,116,0,116,1,106,2,124,1,131, + 2,1,0,100,1,83,0,41,2,122,22,69,120,101,99,32, + 97,32,98,117,105,108,116,45,105,110,32,109,111,100,117,108, + 101,78,41,3,114,58,0,0,0,114,46,0,0,0,90,12, + 101,120,101,99,95,98,117,105,108,116,105,110,41,2,114,26, + 0,0,0,114,83,0,0,0,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,114,135,0,0,0,215,2,0,0, + 115,2,0,0,0,0,3,122,27,66,117,105,108,116,105,110, + 73,109,112,111,114,116,101,114,46,101,120,101,99,95,109,111, + 100,117,108,101,99,2,0,0,0,0,0,0,0,2,0,0, + 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,1, + 83,0,41,2,122,57,82,101,116,117,114,110,32,78,111,110, + 101,32,97,115,32,98,117,105,108,116,45,105,110,32,109,111, + 100,117,108,101,115,32,100,111,32,110,111,116,32,104,97,118, + 101,32,99,111,100,101,32,111,98,106,101,99,116,115,46,78, + 114,10,0,0,0,41,2,114,143,0,0,0,114,71,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 218,8,103,101,116,95,99,111,100,101,220,2,0,0,115,2, + 0,0,0,0,4,122,24,66,117,105,108,116,105,110,73,109, + 112,111,114,116,101,114,46,103,101,116,95,99,111,100,101,99, + 2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0, + 67,0,0,0,115,4,0,0,0,100,1,83,0,41,2,122, + 56,82,101,116,117,114,110,32,78,111,110,101,32,97,115,32, + 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115, + 32,100,111,32,110,111,116,32,104,97,118,101,32,115,111,117, + 114,99,101,32,99,111,100,101,46,78,114,10,0,0,0,41, + 2,114,143,0,0,0,114,71,0,0,0,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,218,10,103,101,116,95, + 115,111,117,114,99,101,226,2,0,0,115,2,0,0,0,0, + 4,122,26,66,117,105,108,116,105,110,73,109,112,111,114,116, + 101,114,46,103,101,116,95,115,111,117,114,99,101,99,2,0, + 0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0, + 0,0,115,4,0,0,0,100,1,83,0,41,2,122,52,82, + 101,116,117,114,110,32,70,97,108,115,101,32,97,115,32,98, + 117,105,108,116,45,105,110,32,109,111,100,117,108,101,115,32, + 97,114,101,32,110,101,118,101,114,32,112,97,99,107,97,103, + 101,115,46,70,114,10,0,0,0,41,2,114,143,0,0,0, + 114,71,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,114,105,0,0,0,232,2,0,0,115,2,0, + 0,0,0,4,122,26,66,117,105,108,116,105,110,73,109,112, + 111,114,116,101,114,46,105,115,95,112,97,99,107,97,103,101, + 41,2,78,78,41,1,78,41,17,114,1,0,0,0,114,0, + 0,0,0,114,2,0,0,0,114,3,0,0,0,218,12,115, + 116,97,116,105,99,109,101,116,104,111,100,114,86,0,0,0, + 218,11,99,108,97,115,115,109,101,116,104,111,100,114,146,0, + 0,0,114,147,0,0,0,114,134,0,0,0,114,135,0,0, + 0,114,74,0,0,0,114,148,0,0,0,114,149,0,0,0, + 114,105,0,0,0,114,84,0,0,0,114,138,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, + 0,0,0,114,142,0,0,0,168,2,0,0,115,30,0,0, + 0,8,7,4,2,12,9,2,1,12,8,2,1,12,11,12, + 8,12,5,2,1,14,5,2,1,14,5,2,1,14,5,114, + 142,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0, + 0,4,0,0,0,64,0,0,0,115,140,0,0,0,101,0, + 90,1,100,0,90,2,100,1,90,3,101,4,100,2,100,3, + 132,0,131,1,90,5,101,6,100,21,100,5,100,6,132,1, + 131,1,90,7,101,6,100,22,100,7,100,8,132,1,131,1, + 90,8,101,6,100,9,100,10,132,0,131,1,90,9,101,4, + 100,11,100,12,132,0,131,1,90,10,101,6,100,13,100,14, + 132,0,131,1,90,11,101,6,101,12,100,15,100,16,132,0, + 131,1,131,1,90,13,101,6,101,12,100,17,100,18,132,0, + 131,1,131,1,90,14,101,6,101,12,100,19,100,20,132,0, + 131,1,131,1,90,15,100,4,83,0,41,23,218,14,70,114, + 111,122,101,110,73,109,112,111,114,116,101,114,122,142,77,101, + 116,97,32,112,97,116,104,32,105,109,112,111,114,116,32,102, + 111,114,32,102,114,111,122,101,110,32,109,111,100,117,108,101, 115,46,10,10,32,32,32,32,65,108,108,32,109,101,116,104, 111,100,115,32,97,114,101,32,101,105,116,104,101,114,32,99, 108,97,115,115,32,111,114,32,115,116,97,116,105,99,32,109, @@ -1229,757 +1222,601 @@ const unsigned char _Py_M__importlib[] = { 105,110,115,116,97,110,116,105,97,116,101,32,116,104,101,32, 99,108,97,115,115,46,10,10,32,32,32,32,99,1,0,0, 0,0,0,0,0,1,0,0,0,2,0,0,0,67,0,0, - 0,115,16,0,0,0,100,1,0,106,0,0,124,0,0,106, - 1,0,131,1,0,83,41,2,122,115,82,101,116,117,114,110, - 32,114,101,112,114,32,102,111,114,32,116,104,101,32,109,111, - 100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,84, - 104,101,32,109,101,116,104,111,100,32,105,115,32,100,101,112, - 114,101,99,97,116,101,100,46,32,32,84,104,101,32,105,109, - 112,111,114,116,32,109,97,99,104,105,110,101,114,121,32,100, - 111,101,115,32,116,104,101,32,106,111,98,32,105,116,115,101, - 108,102,46,10,10,32,32,32,32,32,32,32,32,122,24,60, - 109,111,100,117,108,101,32,123,33,114,125,32,40,98,117,105, - 108,116,45,105,110,41,62,41,2,114,50,0,0,0,114,1, - 0,0,0,41,1,114,89,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,92,0,0,0,195,2, - 0,0,115,2,0,0,0,0,7,122,27,66,117,105,108,116, - 105,110,73,109,112,111,114,116,101,114,46,109,111,100,117,108, - 101,95,114,101,112,114,78,99,4,0,0,0,0,0,0,0, - 4,0,0,0,5,0,0,0,67,0,0,0,115,58,0,0, - 0,124,2,0,100,0,0,107,9,0,114,16,0,100,0,0, - 83,116,0,0,106,1,0,124,1,0,131,1,0,114,50,0, - 116,2,0,124,1,0,124,0,0,100,1,0,100,2,0,131, - 2,1,83,100,0,0,83,100,0,0,83,41,3,78,114,107, - 0,0,0,122,8,98,117,105,108,116,45,105,110,41,3,114, - 57,0,0,0,90,10,105,115,95,98,117,105,108,116,105,110, - 114,85,0,0,0,41,4,218,3,99,108,115,114,78,0,0, - 0,218,4,112,97,116,104,218,6,116,97,114,103,101,116,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,9, - 102,105,110,100,95,115,112,101,99,204,2,0,0,115,10,0, - 0,0,0,2,12,1,4,1,15,1,19,2,122,25,66,117, - 105,108,116,105,110,73,109,112,111,114,116,101,114,46,102,105, - 110,100,95,115,112,101,99,99,3,0,0,0,0,0,0,0, - 4,0,0,0,3,0,0,0,67,0,0,0,115,41,0,0, - 0,124,0,0,106,0,0,124,1,0,124,2,0,131,2,0, - 125,3,0,124,3,0,100,1,0,107,9,0,114,37,0,124, - 3,0,106,1,0,83,100,1,0,83,41,2,122,175,70,105, - 110,100,32,116,104,101,32,98,117,105,108,116,45,105,110,32, - 109,111,100,117,108,101,46,10,10,32,32,32,32,32,32,32, - 32,73,102,32,39,112,97,116,104,39,32,105,115,32,101,118, - 101,114,32,115,112,101,99,105,102,105,101,100,32,116,104,101, - 110,32,116,104,101,32,115,101,97,114,99,104,32,105,115,32, - 99,111,110,115,105,100,101,114,101,100,32,97,32,102,97,105, - 108,117,114,101,46,10,10,32,32,32,32,32,32,32,32,84, - 104,105,115,32,109,101,116,104,111,100,32,105,115,32,100,101, - 112,114,101,99,97,116,101,100,46,32,32,85,115,101,32,102, - 105,110,100,95,115,112,101,99,40,41,32,105,110,115,116,101, - 97,100,46,10,10,32,32,32,32,32,32,32,32,78,41,2, - 114,154,0,0,0,114,99,0,0,0,41,4,114,151,0,0, - 0,114,78,0,0,0,114,152,0,0,0,114,88,0,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218, - 11,102,105,110,100,95,109,111,100,117,108,101,213,2,0,0, - 115,4,0,0,0,0,9,18,1,122,27,66,117,105,108,116, - 105,110,73,109,112,111,114,116,101,114,46,102,105,110,100,95, - 109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,2, - 0,0,0,4,0,0,0,67,0,0,0,115,67,0,0,0, - 124,1,0,106,0,0,116,1,0,106,2,0,107,7,0,114, - 51,0,116,3,0,100,1,0,106,4,0,124,1,0,106,0, - 0,131,1,0,100,2,0,124,1,0,106,0,0,131,1,1, - 130,1,0,116,5,0,116,6,0,106,7,0,124,1,0,131, - 2,0,83,41,3,122,24,67,114,101,97,116,101,32,97,32, - 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,122, - 29,123,33,114,125,32,105,115,32,110,111,116,32,97,32,98, - 117,105,108,116,45,105,110,32,109,111,100,117,108,101,114,15, - 0,0,0,41,8,114,15,0,0,0,114,14,0,0,0,114, - 76,0,0,0,114,77,0,0,0,114,50,0,0,0,114,65, - 0,0,0,114,57,0,0,0,90,14,99,114,101,97,116,101, - 95,98,117,105,108,116,105,110,41,2,114,19,0,0,0,114, - 88,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, - 0,0,0,114,138,0,0,0,225,2,0,0,115,8,0,0, - 0,0,3,18,1,21,1,12,1,122,29,66,117,105,108,116, - 105,110,73,109,112,111,114,116,101,114,46,99,114,101,97,116, - 101,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0, - 0,2,0,0,0,3,0,0,0,67,0,0,0,115,20,0, - 0,0,116,0,0,116,1,0,106,2,0,124,1,0,131,2, - 0,1,100,1,0,83,41,2,122,22,69,120,101,99,32,97, - 32,98,117,105,108,116,45,105,110,32,109,111,100,117,108,101, - 78,41,3,114,65,0,0,0,114,57,0,0,0,90,12,101, - 120,101,99,95,98,117,105,108,116,105,110,41,2,114,19,0, - 0,0,114,89,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,114,139,0,0,0,233,2,0,0,115, - 2,0,0,0,0,3,122,27,66,117,105,108,116,105,110,73, - 109,112,111,114,116,101,114,46,101,120,101,99,95,109,111,100, - 117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0, - 1,0,0,0,67,0,0,0,115,4,0,0,0,100,1,0, - 83,41,2,122,57,82,101,116,117,114,110,32,78,111,110,101, - 32,97,115,32,98,117,105,108,116,45,105,110,32,109,111,100, - 117,108,101,115,32,100,111,32,110,111,116,32,104,97,118,101, - 32,99,111,100,101,32,111,98,106,101,99,116,115,46,78,114, - 10,0,0,0,41,2,114,151,0,0,0,114,78,0,0,0, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218, - 8,103,101,116,95,99,111,100,101,238,2,0,0,115,2,0, - 0,0,0,4,122,24,66,117,105,108,116,105,110,73,109,112, - 111,114,116,101,114,46,103,101,116,95,99,111,100,101,99,2, - 0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,67, - 0,0,0,115,4,0,0,0,100,1,0,83,41,2,122,56, - 82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,98, - 117,105,108,116,45,105,110,32,109,111,100,117,108,101,115,32, - 100,111,32,110,111,116,32,104,97,118,101,32,115,111,117,114, - 99,101,32,99,111,100,101,46,78,114,10,0,0,0,41,2, - 114,151,0,0,0,114,78,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,218,10,103,101,116,95,115, - 111,117,114,99,101,244,2,0,0,115,2,0,0,0,0,4, - 122,26,66,117,105,108,116,105,110,73,109,112,111,114,116,101, - 114,46,103,101,116,95,115,111,117,114,99,101,99,2,0,0, - 0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,0, - 0,115,4,0,0,0,100,1,0,83,41,2,122,52,82,101, - 116,117,114,110,32,70,97,108,115,101,32,97,115,32,98,117, - 105,108,116,45,105,110,32,109,111,100,117,108,101,115,32,97, - 114,101,32,110,101,118,101,114,32,112,97,99,107,97,103,101, - 115,46,70,114,10,0,0,0,41,2,114,151,0,0,0,114, - 78,0,0,0,114,10,0,0,0,114,10,0,0,0,114,11, - 0,0,0,114,109,0,0,0,250,2,0,0,115,2,0,0, - 0,0,4,122,26,66,117,105,108,116,105,110,73,109,112,111, - 114,116,101,114,46,105,115,95,112,97,99,107,97,103,101,41, - 17,114,1,0,0,0,114,0,0,0,0,114,2,0,0,0, - 114,3,0,0,0,218,12,115,116,97,116,105,99,109,101,116, - 104,111,100,114,92,0,0,0,218,11,99,108,97,115,115,109, - 101,116,104,111,100,114,154,0,0,0,114,155,0,0,0,114, - 138,0,0,0,114,139,0,0,0,114,81,0,0,0,114,156, - 0,0,0,114,157,0,0,0,114,109,0,0,0,114,90,0, - 0,0,114,146,0,0,0,114,10,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,114,150,0,0,0, - 186,2,0,0,115,30,0,0,0,12,7,6,2,18,9,3, - 1,21,8,3,1,18,11,18,8,18,5,3,1,21,5,3, - 1,21,5,3,1,21,5,114,150,0,0,0,99,0,0,0, - 0,0,0,0,0,0,0,0,0,5,0,0,0,64,0,0, - 0,115,211,0,0,0,101,0,0,90,1,0,100,0,0,90, - 2,0,100,1,0,90,3,0,101,4,0,100,2,0,100,3, - 0,132,0,0,131,1,0,90,5,0,101,6,0,100,4,0, - 100,4,0,100,5,0,100,6,0,132,2,0,131,1,0,90, - 7,0,101,6,0,100,4,0,100,7,0,100,8,0,132,1, - 0,131,1,0,90,8,0,101,6,0,100,9,0,100,10,0, - 132,0,0,131,1,0,90,9,0,101,4,0,100,11,0,100, - 12,0,132,0,0,131,1,0,90,10,0,101,6,0,100,13, - 0,100,14,0,132,0,0,131,1,0,90,11,0,101,6,0, - 101,12,0,100,15,0,100,16,0,132,0,0,131,1,0,131, - 1,0,90,13,0,101,6,0,101,12,0,100,17,0,100,18, - 0,132,0,0,131,1,0,131,1,0,90,14,0,101,6,0, - 101,12,0,100,19,0,100,20,0,132,0,0,131,1,0,131, - 1,0,90,15,0,100,4,0,83,41,21,218,14,70,114,111, - 122,101,110,73,109,112,111,114,116,101,114,122,142,77,101,116, - 97,32,112,97,116,104,32,105,109,112,111,114,116,32,102,111, - 114,32,102,114,111,122,101,110,32,109,111,100,117,108,101,115, - 46,10,10,32,32,32,32,65,108,108,32,109,101,116,104,111, - 100,115,32,97,114,101,32,101,105,116,104,101,114,32,99,108, - 97,115,115,32,111,114,32,115,116,97,116,105,99,32,109,101, - 116,104,111,100,115,32,116,111,32,97,118,111,105,100,32,116, - 104,101,32,110,101,101,100,32,116,111,10,32,32,32,32,105, - 110,115,116,97,110,116,105,97,116,101,32,116,104,101,32,99, - 108,97,115,115,46,10,10,32,32,32,32,99,1,0,0,0, - 0,0,0,0,1,0,0,0,2,0,0,0,67,0,0,0, - 115,16,0,0,0,100,1,0,106,0,0,124,0,0,106,1, - 0,131,1,0,83,41,2,122,115,82,101,116,117,114,110,32, - 114,101,112,114,32,102,111,114,32,116,104,101,32,109,111,100, - 117,108,101,46,10,10,32,32,32,32,32,32,32,32,84,104, - 101,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, - 101,99,97,116,101,100,46,32,32,84,104,101,32,105,109,112, - 111,114,116,32,109,97,99,104,105,110,101,114,121,32,100,111, - 101,115,32,116,104,101,32,106,111,98,32,105,116,115,101,108, - 102,46,10,10,32,32,32,32,32,32,32,32,122,22,60,109, - 111,100,117,108,101,32,123,33,114,125,32,40,102,114,111,122, - 101,110,41,62,41,2,114,50,0,0,0,114,1,0,0,0, - 41,1,218,1,109,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,114,92,0,0,0,12,3,0,0,115,2,0, - 0,0,0,7,122,26,70,114,111,122,101,110,73,109,112,111, - 114,116,101,114,46,109,111,100,117,108,101,95,114,101,112,114, - 78,99,4,0,0,0,0,0,0,0,4,0,0,0,5,0, - 0,0,67,0,0,0,115,42,0,0,0,116,0,0,106,1, - 0,124,1,0,131,1,0,114,34,0,116,2,0,124,1,0, - 124,0,0,100,1,0,100,2,0,131,2,1,83,100,0,0, - 83,100,0,0,83,41,3,78,114,107,0,0,0,90,6,102, - 114,111,122,101,110,41,3,114,57,0,0,0,114,82,0,0, - 0,114,85,0,0,0,41,4,114,151,0,0,0,114,78,0, - 0,0,114,152,0,0,0,114,153,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,114,154,0,0,0, - 21,3,0,0,115,6,0,0,0,0,2,15,1,19,2,122, - 24,70,114,111,122,101,110,73,109,112,111,114,116,101,114,46, - 102,105,110,100,95,115,112,101,99,99,3,0,0,0,0,0, - 0,0,3,0,0,0,2,0,0,0,67,0,0,0,115,23, - 0,0,0,116,0,0,106,1,0,124,1,0,131,1,0,114, - 19,0,124,0,0,83,100,1,0,83,41,2,122,93,70,105, + 0,115,12,0,0,0,100,1,106,0,124,0,106,1,131,1, + 83,0,41,2,122,115,82,101,116,117,114,110,32,114,101,112, + 114,32,102,111,114,32,116,104,101,32,109,111,100,117,108,101, + 46,10,10,32,32,32,32,32,32,32,32,84,104,101,32,109, + 101,116,104,111,100,32,105,115,32,100,101,112,114,101,99,97, + 116,101,100,46,32,32,84,104,101,32,105,109,112,111,114,116, + 32,109,97,99,104,105,110,101,114,121,32,100,111,101,115,32, + 116,104,101,32,106,111,98,32,105,116,115,101,108,102,46,10, + 10,32,32,32,32,32,32,32,32,122,22,60,109,111,100,117, + 108,101,32,123,33,114,125,32,40,102,114,111,122,101,110,41, + 62,41,2,114,38,0,0,0,114,1,0,0,0,41,1,218, + 1,109,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,114,86,0,0,0,250,2,0,0,115,2,0,0,0,0, + 7,122,26,70,114,111,122,101,110,73,109,112,111,114,116,101, + 114,46,109,111,100,117,108,101,95,114,101,112,114,78,99,4, + 0,0,0,0,0,0,0,4,0,0,0,5,0,0,0,67, + 0,0,0,115,32,0,0,0,116,0,106,1,124,1,131,1, + 114,24,116,2,124,1,124,0,100,1,100,2,141,3,83,0, + 100,0,83,0,100,0,83,0,41,3,78,90,6,102,114,111, + 122,101,110,41,1,114,103,0,0,0,41,3,114,46,0,0, + 0,114,75,0,0,0,114,78,0,0,0,41,4,114,143,0, + 0,0,114,71,0,0,0,114,144,0,0,0,114,145,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 114,146,0,0,0,3,3,0,0,115,6,0,0,0,0,2, + 10,1,14,2,122,24,70,114,111,122,101,110,73,109,112,111, + 114,116,101,114,46,102,105,110,100,95,115,112,101,99,99,3, + 0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,67, + 0,0,0,115,18,0,0,0,116,0,106,1,124,1,131,1, + 114,14,124,0,83,0,100,1,83,0,41,2,122,93,70,105, 110,100,32,97,32,102,114,111,122,101,110,32,109,111,100,117, 108,101,46,10,10,32,32,32,32,32,32,32,32,84,104,105, 115,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, 101,99,97,116,101,100,46,32,32,85,115,101,32,102,105,110, 100,95,115,112,101,99,40,41,32,105,110,115,116,101,97,100, - 46,10,10,32,32,32,32,32,32,32,32,78,41,2,114,57, - 0,0,0,114,82,0,0,0,41,3,114,151,0,0,0,114, - 78,0,0,0,114,152,0,0,0,114,10,0,0,0,114,10, - 0,0,0,114,11,0,0,0,114,155,0,0,0,28,3,0, + 46,10,10,32,32,32,32,32,32,32,32,78,41,2,114,46, + 0,0,0,114,75,0,0,0,41,3,114,143,0,0,0,114, + 71,0,0,0,114,144,0,0,0,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,114,147,0,0,0,10,3,0, 0,115,2,0,0,0,0,7,122,26,70,114,111,122,101,110, 73,109,112,111,114,116,101,114,46,102,105,110,100,95,109,111, 100,117,108,101,99,2,0,0,0,0,0,0,0,2,0,0, 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,1, - 0,83,41,2,122,42,85,115,101,32,100,101,102,97,117,108, + 83,0,41,2,122,42,85,115,101,32,100,101,102,97,117,108, 116,32,115,101,109,97,110,116,105,99,115,32,102,111,114,32, 109,111,100,117,108,101,32,99,114,101,97,116,105,111,110,46, - 78,114,10,0,0,0,41,2,114,151,0,0,0,114,88,0, + 78,114,10,0,0,0,41,2,114,143,0,0,0,114,82,0, 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,114,138,0,0,0,37,3,0,0,115,0,0,0,0,122, + 0,114,134,0,0,0,19,3,0,0,115,0,0,0,0,122, 28,70,114,111,122,101,110,73,109,112,111,114,116,101,114,46, 99,114,101,97,116,101,95,109,111,100,117,108,101,99,1,0, 0,0,0,0,0,0,3,0,0,0,4,0,0,0,67,0, - 0,0,115,92,0,0,0,124,0,0,106,0,0,106,1,0, - 125,1,0,116,2,0,106,3,0,124,1,0,131,1,0,115, - 54,0,116,4,0,100,1,0,106,5,0,124,1,0,131,1, - 0,100,2,0,124,1,0,131,1,1,130,1,0,116,6,0, - 116,2,0,106,7,0,124,1,0,131,2,0,125,2,0,116, - 8,0,124,2,0,124,0,0,106,9,0,131,2,0,1,100, - 0,0,83,41,3,78,122,27,123,33,114,125,32,105,115,32, - 110,111,116,32,97,32,102,114,111,122,101,110,32,109,111,100, - 117,108,101,114,15,0,0,0,41,10,114,95,0,0,0,114, - 15,0,0,0,114,57,0,0,0,114,82,0,0,0,114,77, - 0,0,0,114,50,0,0,0,114,65,0,0,0,218,17,103, - 101,116,95,102,114,111,122,101,110,95,111,98,106,101,99,116, - 218,4,101,120,101,99,114,7,0,0,0,41,3,114,89,0, - 0,0,114,15,0,0,0,218,4,99,111,100,101,114,10,0, - 0,0,114,10,0,0,0,114,11,0,0,0,114,139,0,0, - 0,41,3,0,0,115,12,0,0,0,0,2,12,1,15,1, - 18,1,9,1,18,1,122,26,70,114,111,122,101,110,73,109, - 112,111,114,116,101,114,46,101,120,101,99,95,109,111,100,117, - 108,101,99,2,0,0,0,0,0,0,0,2,0,0,0,3, - 0,0,0,67,0,0,0,115,13,0,0,0,116,0,0,124, - 0,0,124,1,0,131,2,0,83,41,1,122,95,76,111,97, - 100,32,97,32,102,114,111,122,101,110,32,109,111,100,117,108, - 101,46,10,10,32,32,32,32,32,32,32,32,84,104,105,115, - 32,109,101,116,104,111,100,32,105,115,32,100,101,112,114,101, - 99,97,116,101,100,46,32,32,85,115,101,32,101,120,101,99, - 95,109,111,100,117,108,101,40,41,32,105,110,115,116,101,97, - 100,46,10,10,32,32,32,32,32,32,32,32,41,1,114,90, - 0,0,0,41,2,114,151,0,0,0,114,78,0,0,0,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,146, - 0,0,0,50,3,0,0,115,2,0,0,0,0,7,122,26, - 70,114,111,122,101,110,73,109,112,111,114,116,101,114,46,108, - 111,97,100,95,109,111,100,117,108,101,99,2,0,0,0,0, - 0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115, - 13,0,0,0,116,0,0,106,1,0,124,1,0,131,1,0, - 83,41,1,122,45,82,101,116,117,114,110,32,116,104,101,32, + 0,0,115,64,0,0,0,124,0,106,0,106,1,125,1,116, + 2,106,3,124,1,131,1,115,36,116,4,100,1,106,5,124, + 1,131,1,124,1,100,2,141,2,130,1,116,6,116,2,106, + 7,124,1,131,2,125,2,116,8,124,2,124,0,106,9,131, + 2,1,0,100,0,83,0,41,3,78,122,27,123,33,114,125, + 32,105,115,32,110,111,116,32,97,32,102,114,111,122,101,110, + 32,109,111,100,117,108,101,41,1,114,15,0,0,0,41,10, + 114,89,0,0,0,114,15,0,0,0,114,46,0,0,0,114, + 75,0,0,0,114,70,0,0,0,114,38,0,0,0,114,58, + 0,0,0,218,17,103,101,116,95,102,114,111,122,101,110,95, + 111,98,106,101,99,116,218,4,101,120,101,99,114,7,0,0, + 0,41,3,114,83,0,0,0,114,15,0,0,0,218,4,99, + 111,100,101,114,10,0,0,0,114,10,0,0,0,114,11,0, + 0,0,114,135,0,0,0,23,3,0,0,115,12,0,0,0, + 0,2,8,1,10,1,10,1,8,1,12,1,122,26,70,114, + 111,122,101,110,73,109,112,111,114,116,101,114,46,101,120,101, + 99,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0, + 0,2,0,0,0,3,0,0,0,67,0,0,0,115,10,0, + 0,0,116,0,124,0,124,1,131,2,83,0,41,1,122,95, + 76,111,97,100,32,97,32,102,114,111,122,101,110,32,109,111, + 100,117,108,101,46,10,10,32,32,32,32,32,32,32,32,84, + 104,105,115,32,109,101,116,104,111,100,32,105,115,32,100,101, + 112,114,101,99,97,116,101,100,46,32,32,85,115,101,32,101, + 120,101,99,95,109,111,100,117,108,101,40,41,32,105,110,115, + 116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,41, + 1,114,84,0,0,0,41,2,114,143,0,0,0,114,71,0, + 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,114,138,0,0,0,32,3,0,0,115,2,0,0,0,0, + 7,122,26,70,114,111,122,101,110,73,109,112,111,114,116,101, + 114,46,108,111,97,100,95,109,111,100,117,108,101,99,2,0, + 0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,0, + 0,0,115,10,0,0,0,116,0,106,1,124,1,131,1,83, + 0,41,1,122,45,82,101,116,117,114,110,32,116,104,101,32, 99,111,100,101,32,111,98,106,101,99,116,32,102,111,114,32, 116,104,101,32,102,114,111,122,101,110,32,109,111,100,117,108, - 101,46,41,2,114,57,0,0,0,114,162,0,0,0,41,2, - 114,151,0,0,0,114,78,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,114,156,0,0,0,59,3, + 101,46,41,2,114,46,0,0,0,114,154,0,0,0,41,2, + 114,143,0,0,0,114,71,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,114,148,0,0,0,41,3, 0,0,115,2,0,0,0,0,4,122,23,70,114,111,122,101, 110,73,109,112,111,114,116,101,114,46,103,101,116,95,99,111, 100,101,99,2,0,0,0,0,0,0,0,2,0,0,0,1, - 0,0,0,67,0,0,0,115,4,0,0,0,100,1,0,83, + 0,0,0,67,0,0,0,115,4,0,0,0,100,1,83,0, 41,2,122,54,82,101,116,117,114,110,32,78,111,110,101,32, 97,115,32,102,114,111,122,101,110,32,109,111,100,117,108,101, 115,32,100,111,32,110,111,116,32,104,97,118,101,32,115,111, 117,114,99,101,32,99,111,100,101,46,78,114,10,0,0,0, - 41,2,114,151,0,0,0,114,78,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,114,157,0,0,0, - 65,3,0,0,115,2,0,0,0,0,4,122,25,70,114,111, + 41,2,114,143,0,0,0,114,71,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,114,149,0,0,0, + 47,3,0,0,115,2,0,0,0,0,4,122,25,70,114,111, 122,101,110,73,109,112,111,114,116,101,114,46,103,101,116,95, 115,111,117,114,99,101,99,2,0,0,0,0,0,0,0,2, - 0,0,0,2,0,0,0,67,0,0,0,115,13,0,0,0, - 116,0,0,106,1,0,124,1,0,131,1,0,83,41,1,122, - 46,82,101,116,117,114,110,32,84,114,117,101,32,105,102,32, - 116,104,101,32,102,114,111,122,101,110,32,109,111,100,117,108, - 101,32,105,115,32,97,32,112,97,99,107,97,103,101,46,41, - 2,114,57,0,0,0,90,17,105,115,95,102,114,111,122,101, - 110,95,112,97,99,107,97,103,101,41,2,114,151,0,0,0, - 114,78,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,114,109,0,0,0,71,3,0,0,115,2,0, - 0,0,0,4,122,25,70,114,111,122,101,110,73,109,112,111, - 114,116,101,114,46,105,115,95,112,97,99,107,97,103,101,41, - 16,114,1,0,0,0,114,0,0,0,0,114,2,0,0,0, - 114,3,0,0,0,114,158,0,0,0,114,92,0,0,0,114, - 159,0,0,0,114,154,0,0,0,114,155,0,0,0,114,138, - 0,0,0,114,139,0,0,0,114,146,0,0,0,114,84,0, - 0,0,114,156,0,0,0,114,157,0,0,0,114,109,0,0, - 0,114,10,0,0,0,114,10,0,0,0,114,10,0,0,0, - 114,11,0,0,0,114,160,0,0,0,3,3,0,0,115,30, - 0,0,0,12,7,6,2,18,9,3,1,21,6,3,1,18, - 8,18,4,18,9,18,9,3,1,21,5,3,1,21,5,3, - 1,114,160,0,0,0,99,0,0,0,0,0,0,0,0,0, - 0,0,0,2,0,0,0,64,0,0,0,115,46,0,0,0, - 101,0,0,90,1,0,100,0,0,90,2,0,100,1,0,90, - 3,0,100,2,0,100,3,0,132,0,0,90,4,0,100,4, - 0,100,5,0,132,0,0,90,5,0,100,6,0,83,41,7, - 218,18,95,73,109,112,111,114,116,76,111,99,107,67,111,110, - 116,101,120,116,122,36,67,111,110,116,101,120,116,32,109,97, - 110,97,103,101,114,32,102,111,114,32,116,104,101,32,105,109, - 112,111,114,116,32,108,111,99,107,46,99,1,0,0,0,0, - 0,0,0,1,0,0,0,1,0,0,0,67,0,0,0,115, - 14,0,0,0,116,0,0,106,1,0,131,0,0,1,100,1, - 0,83,41,2,122,24,65,99,113,117,105,114,101,32,116,104, - 101,32,105,109,112,111,114,116,32,108,111,99,107,46,78,41, - 2,114,57,0,0,0,114,145,0,0,0,41,1,114,19,0, + 0,0,0,2,0,0,0,67,0,0,0,115,10,0,0,0, + 116,0,106,1,124,1,131,1,83,0,41,1,122,46,82,101, + 116,117,114,110,32,84,114,117,101,32,105,102,32,116,104,101, + 32,102,114,111,122,101,110,32,109,111,100,117,108,101,32,105, + 115,32,97,32,112,97,99,107,97,103,101,46,41,2,114,46, + 0,0,0,90,17,105,115,95,102,114,111,122,101,110,95,112, + 97,99,107,97,103,101,41,2,114,143,0,0,0,114,71,0, 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,114,23,0,0,0,84,3,0,0,115,2,0,0,0,0, - 2,122,28,95,73,109,112,111,114,116,76,111,99,107,67,111, - 110,116,101,120,116,46,95,95,101,110,116,101,114,95,95,99, - 4,0,0,0,0,0,0,0,4,0,0,0,1,0,0,0, - 67,0,0,0,115,14,0,0,0,116,0,0,106,1,0,131, - 0,0,1,100,1,0,83,41,2,122,60,82,101,108,101,97, - 115,101,32,116,104,101,32,105,109,112,111,114,116,32,108,111, - 99,107,32,114,101,103,97,114,100,108,101,115,115,32,111,102, - 32,97,110,121,32,114,97,105,115,101,100,32,101,120,99,101, - 112,116,105,111,110,115,46,78,41,2,114,57,0,0,0,114, - 58,0,0,0,41,4,114,19,0,0,0,90,8,101,120,99, - 95,116,121,112,101,90,9,101,120,99,95,118,97,108,117,101, - 90,13,101,120,99,95,116,114,97,99,101,98,97,99,107,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,30, - 0,0,0,88,3,0,0,115,2,0,0,0,0,2,122,27, - 95,73,109,112,111,114,116,76,111,99,107,67,111,110,116,101, - 120,116,46,95,95,101,120,105,116,95,95,78,41,6,114,1, - 0,0,0,114,0,0,0,0,114,2,0,0,0,114,3,0, - 0,0,114,23,0,0,0,114,30,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, - 114,165,0,0,0,80,3,0,0,115,6,0,0,0,12,2, - 6,2,12,4,114,165,0,0,0,99,3,0,0,0,0,0, - 0,0,5,0,0,0,4,0,0,0,67,0,0,0,115,88, - 0,0,0,124,1,0,106,0,0,100,1,0,124,2,0,100, - 2,0,24,131,2,0,125,3,0,116,1,0,124,3,0,131, - 1,0,124,2,0,107,0,0,114,52,0,116,2,0,100,3, - 0,131,1,0,130,1,0,124,3,0,100,4,0,25,125,4, - 0,124,0,0,114,84,0,100,5,0,106,3,0,124,4,0, - 124,0,0,131,2,0,83,124,4,0,83,41,6,122,50,82, - 101,115,111,108,118,101,32,97,32,114,101,108,97,116,105,118, - 101,32,109,111,100,117,108,101,32,110,97,109,101,32,116,111, - 32,97,110,32,97,98,115,111,108,117,116,101,32,111,110,101, - 46,114,121,0,0,0,114,45,0,0,0,122,50,97,116,116, - 101,109,112,116,101,100,32,114,101,108,97,116,105,118,101,32, - 105,109,112,111,114,116,32,98,101,121,111,110,100,32,116,111, - 112,45,108,101,118,101,108,32,112,97,99,107,97,103,101,114, - 33,0,0,0,122,5,123,125,46,123,125,41,4,218,6,114, - 115,112,108,105,116,218,3,108,101,110,218,10,86,97,108,117, - 101,69,114,114,111,114,114,50,0,0,0,41,5,114,15,0, - 0,0,218,7,112,97,99,107,97,103,101,218,5,108,101,118, - 101,108,90,4,98,105,116,115,90,4,98,97,115,101,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,13,95, - 114,101,115,111,108,118,101,95,110,97,109,101,93,3,0,0, - 115,10,0,0,0,0,2,22,1,18,1,12,1,10,1,114, - 171,0,0,0,99,3,0,0,0,0,0,0,0,4,0,0, - 0,3,0,0,0,67,0,0,0,115,47,0,0,0,124,0, - 0,106,0,0,124,1,0,124,2,0,131,2,0,125,3,0, - 124,3,0,100,0,0,107,8,0,114,34,0,100,0,0,83, - 116,1,0,124,1,0,124,3,0,131,2,0,83,41,1,78, - 41,2,114,155,0,0,0,114,85,0,0,0,41,4,218,6, - 102,105,110,100,101,114,114,15,0,0,0,114,152,0,0,0, - 114,99,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,17,95,102,105,110,100,95,115,112,101,99, - 95,108,101,103,97,99,121,102,3,0,0,115,8,0,0,0, - 0,3,18,1,12,1,4,1,114,173,0,0,0,99,3,0, - 0,0,0,0,0,0,9,0,0,0,27,0,0,0,67,0, - 0,0,115,42,1,0,0,116,0,0,106,1,0,100,1,0, - 107,9,0,114,41,0,116,0,0,106,1,0,12,114,41,0, - 116,2,0,106,3,0,100,2,0,116,4,0,131,2,0,1, - 124,0,0,116,0,0,106,5,0,107,6,0,125,3,0,120, - 235,0,116,0,0,106,1,0,68,93,220,0,125,4,0,116, - 6,0,131,0,0,143,90,0,1,121,13,0,124,4,0,106, - 7,0,125,5,0,87,110,51,0,4,116,8,0,107,10,0, - 114,148,0,1,1,1,116,9,0,124,4,0,124,0,0,124, - 1,0,131,3,0,125,6,0,124,6,0,100,1,0,107,8, - 0,114,144,0,119,66,0,89,110,19,0,88,124,5,0,124, - 0,0,124,1,0,124,2,0,131,3,0,125,6,0,87,100, - 1,0,81,82,88,124,6,0,100,1,0,107,9,0,114,66, - 0,124,3,0,12,114,26,1,124,0,0,116,0,0,106,5, - 0,107,6,0,114,26,1,116,0,0,106,5,0,124,0,0, - 25,125,7,0,121,13,0,124,7,0,106,10,0,125,8,0, - 87,110,22,0,4,116,8,0,107,10,0,114,2,1,1,1, - 1,124,6,0,83,89,113,30,1,88,124,8,0,100,1,0, - 107,8,0,114,19,1,124,6,0,83,124,8,0,83,113,66, - 0,124,6,0,83,113,66,0,87,100,1,0,83,100,1,0, - 83,41,3,122,23,70,105,110,100,32,97,32,109,111,100,117, - 108,101,39,115,32,108,111,97,100,101,114,46,78,122,22,115, - 121,115,46,109,101,116,97,95,112,97,116,104,32,105,115,32, - 101,109,112,116,121,41,11,114,14,0,0,0,218,9,109,101, - 116,97,95,112,97,116,104,114,141,0,0,0,114,142,0,0, - 0,218,13,73,109,112,111,114,116,87,97,114,110,105,110,103, - 114,21,0,0,0,114,165,0,0,0,114,154,0,0,0,114, - 96,0,0,0,114,173,0,0,0,114,95,0,0,0,41,9, - 114,15,0,0,0,114,152,0,0,0,114,153,0,0,0,90, - 9,105,115,95,114,101,108,111,97,100,114,172,0,0,0,114, - 154,0,0,0,114,88,0,0,0,114,89,0,0,0,114,95, + 0,114,105,0,0,0,53,3,0,0,115,2,0,0,0,0, + 4,122,25,70,114,111,122,101,110,73,109,112,111,114,116,101, + 114,46,105,115,95,112,97,99,107,97,103,101,41,2,78,78, + 41,1,78,41,16,114,1,0,0,0,114,0,0,0,0,114, + 2,0,0,0,114,3,0,0,0,114,150,0,0,0,114,86, + 0,0,0,114,151,0,0,0,114,146,0,0,0,114,147,0, + 0,0,114,134,0,0,0,114,135,0,0,0,114,138,0,0, + 0,114,77,0,0,0,114,148,0,0,0,114,149,0,0,0, + 114,105,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,114,152,0,0,0,241,2, + 0,0,115,30,0,0,0,8,7,4,2,12,9,2,1,12, + 6,2,1,12,8,12,4,12,9,12,9,2,1,14,5,2, + 1,14,5,2,1,114,152,0,0,0,99,0,0,0,0,0, + 0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,115, + 32,0,0,0,101,0,90,1,100,0,90,2,100,1,90,3, + 100,2,100,3,132,0,90,4,100,4,100,5,132,0,90,5, + 100,6,83,0,41,7,218,18,95,73,109,112,111,114,116,76, + 111,99,107,67,111,110,116,101,120,116,122,36,67,111,110,116, + 101,120,116,32,109,97,110,97,103,101,114,32,102,111,114,32, + 116,104,101,32,105,109,112,111,114,116,32,108,111,99,107,46, + 99,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0, + 0,67,0,0,0,115,12,0,0,0,116,0,106,1,131,0, + 1,0,100,1,83,0,41,2,122,24,65,99,113,117,105,114, + 101,32,116,104,101,32,105,109,112,111,114,116,32,108,111,99, + 107,46,78,41,2,114,46,0,0,0,114,137,0,0,0,41, + 1,114,26,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,114,48,0,0,0,66,3,0,0,115,2, + 0,0,0,0,2,122,28,95,73,109,112,111,114,116,76,111, + 99,107,67,111,110,116,101,120,116,46,95,95,101,110,116,101, + 114,95,95,99,4,0,0,0,0,0,0,0,4,0,0,0, + 1,0,0,0,67,0,0,0,115,12,0,0,0,116,0,106, + 1,131,0,1,0,100,1,83,0,41,2,122,60,82,101,108, + 101,97,115,101,32,116,104,101,32,105,109,112,111,114,116,32, + 108,111,99,107,32,114,101,103,97,114,100,108,101,115,115,32, + 111,102,32,97,110,121,32,114,97,105,115,101,100,32,101,120, + 99,101,112,116,105,111,110,115,46,78,41,2,114,46,0,0, + 0,114,47,0,0,0,41,4,114,26,0,0,0,90,8,101, + 120,99,95,116,121,112,101,90,9,101,120,99,95,118,97,108, + 117,101,90,13,101,120,99,95,116,114,97,99,101,98,97,99, + 107,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 114,50,0,0,0,70,3,0,0,115,2,0,0,0,0,2, + 122,27,95,73,109,112,111,114,116,76,111,99,107,67,111,110, + 116,101,120,116,46,95,95,101,120,105,116,95,95,78,41,6, + 114,1,0,0,0,114,0,0,0,0,114,2,0,0,0,114, + 3,0,0,0,114,48,0,0,0,114,50,0,0,0,114,10, 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, - 0,0,218,10,95,102,105,110,100,95,115,112,101,99,111,3, - 0,0,115,48,0,0,0,0,2,25,1,16,4,15,1,16, - 1,10,1,3,1,13,1,13,1,18,1,12,1,8,2,25, - 1,12,2,22,1,13,1,3,1,13,1,13,4,9,2,12, - 1,4,2,7,2,8,2,114,176,0,0,0,99,3,0,0, - 0,0,0,0,0,3,0,0,0,4,0,0,0,67,0,0, - 0,115,161,0,0,0,116,0,0,124,0,0,116,1,0,131, - 2,0,115,42,0,116,2,0,100,1,0,106,3,0,116,4, - 0,124,0,0,131,1,0,131,1,0,131,1,0,130,1,0, - 124,2,0,100,2,0,107,0,0,114,66,0,116,5,0,100, - 3,0,131,1,0,130,1,0,124,2,0,100,2,0,107,4, - 0,114,126,0,116,0,0,124,1,0,116,1,0,131,2,0, - 115,108,0,116,2,0,100,4,0,131,1,0,130,1,0,110, - 18,0,124,1,0,115,126,0,116,6,0,100,5,0,131,1, - 0,130,1,0,124,0,0,12,114,157,0,124,2,0,100,2, - 0,107,2,0,114,157,0,116,5,0,100,6,0,131,1,0, - 130,1,0,100,7,0,83,41,8,122,28,86,101,114,105,102, - 121,32,97,114,103,117,109,101,110,116,115,32,97,114,101,32, - 34,115,97,110,101,34,46,122,31,109,111,100,117,108,101,32, - 110,97,109,101,32,109,117,115,116,32,98,101,32,115,116,114, - 44,32,110,111,116,32,123,125,114,33,0,0,0,122,18,108, - 101,118,101,108,32,109,117,115,116,32,98,101,32,62,61,32, - 48,122,31,95,95,112,97,99,107,97,103,101,95,95,32,110, - 111,116,32,115,101,116,32,116,111,32,97,32,115,116,114,105, - 110,103,122,54,97,116,116,101,109,112,116,101,100,32,114,101, - 108,97,116,105,118,101,32,105,109,112,111,114,116,32,119,105, - 116,104,32,110,111,32,107,110,111,119,110,32,112,97,114,101, - 110,116,32,112,97,99,107,97,103,101,122,17,69,109,112,116, - 121,32,109,111,100,117,108,101,32,110,97,109,101,78,41,7, - 218,10,105,115,105,110,115,116,97,110,99,101,218,3,115,116, - 114,218,9,84,121,112,101,69,114,114,111,114,114,50,0,0, - 0,114,13,0,0,0,114,168,0,0,0,114,77,0,0,0, - 41,3,114,15,0,0,0,114,169,0,0,0,114,170,0,0, - 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, - 218,13,95,115,97,110,105,116,121,95,99,104,101,99,107,151, - 3,0,0,115,22,0,0,0,0,2,15,1,27,1,12,1, - 12,1,12,1,15,1,15,1,6,1,12,2,19,1,114,180, - 0,0,0,122,16,78,111,32,109,111,100,117,108,101,32,110, - 97,109,101,100,32,122,4,123,33,114,125,99,2,0,0,0, - 0,0,0,0,8,0,0,0,12,0,0,0,67,0,0,0, - 115,40,1,0,0,100,0,0,125,2,0,124,0,0,106,0, - 0,100,1,0,131,1,0,100,2,0,25,125,3,0,124,3, - 0,114,175,0,124,3,0,116,1,0,106,2,0,107,7,0, - 114,59,0,116,3,0,124,1,0,124,3,0,131,2,0,1, - 124,0,0,116,1,0,106,2,0,107,6,0,114,85,0,116, - 1,0,106,2,0,124,0,0,25,83,116,1,0,106,2,0, - 124,3,0,25,125,4,0,121,13,0,124,4,0,106,4,0, - 125,2,0,87,110,61,0,4,116,5,0,107,10,0,114,174, - 0,1,1,1,116,6,0,100,3,0,23,106,7,0,124,0, - 0,124,3,0,131,2,0,125,5,0,116,8,0,124,5,0, - 100,4,0,124,0,0,131,1,1,100,0,0,130,2,0,89, - 110,1,0,88,116,9,0,124,0,0,124,2,0,131,2,0, - 125,6,0,124,6,0,100,0,0,107,8,0,114,232,0,116, - 8,0,116,6,0,106,7,0,124,0,0,131,1,0,100,4, - 0,124,0,0,131,1,1,130,1,0,110,12,0,116,10,0, - 124,6,0,131,1,0,125,7,0,124,3,0,114,36,1,116, - 1,0,106,2,0,124,3,0,25,125,4,0,116,11,0,124, - 4,0,124,0,0,106,0,0,100,1,0,131,1,0,100,5, - 0,25,124,7,0,131,3,0,1,124,7,0,83,41,6,78, - 114,121,0,0,0,114,33,0,0,0,122,23,59,32,123,33, - 114,125,32,105,115,32,110,111,116,32,97,32,112,97,99,107, - 97,103,101,114,15,0,0,0,114,140,0,0,0,41,12,114, - 122,0,0,0,114,14,0,0,0,114,21,0,0,0,114,65, - 0,0,0,114,131,0,0,0,114,96,0,0,0,218,8,95, - 69,82,82,95,77,83,71,114,50,0,0,0,114,77,0,0, - 0,114,176,0,0,0,114,149,0,0,0,114,5,0,0,0, - 41,8,114,15,0,0,0,218,7,105,109,112,111,114,116,95, - 114,152,0,0,0,114,123,0,0,0,90,13,112,97,114,101, - 110,116,95,109,111,100,117,108,101,114,147,0,0,0,114,88, - 0,0,0,114,89,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,218,23,95,102,105,110,100,95,97, - 110,100,95,108,111,97,100,95,117,110,108,111,99,107,101,100, - 170,3,0,0,115,42,0,0,0,0,1,6,1,19,1,6, - 1,15,1,13,2,15,1,11,1,13,1,3,1,13,1,13, - 1,22,1,26,1,15,1,12,1,30,2,12,1,6,2,13, - 1,29,1,114,183,0,0,0,99,2,0,0,0,0,0,0, - 0,2,0,0,0,10,0,0,0,67,0,0,0,115,37,0, - 0,0,116,0,0,124,0,0,131,1,0,143,18,0,1,116, - 1,0,124,0,0,124,1,0,131,2,0,83,87,100,1,0, - 81,82,88,100,1,0,83,41,2,122,54,70,105,110,100,32, - 97,110,100,32,108,111,97,100,32,116,104,101,32,109,111,100, - 117,108,101,44,32,97,110,100,32,114,101,108,101,97,115,101, - 32,116,104,101,32,105,109,112,111,114,116,32,108,111,99,107, - 46,78,41,2,114,54,0,0,0,114,183,0,0,0,41,2, - 114,15,0,0,0,114,182,0,0,0,114,10,0,0,0,114, - 10,0,0,0,114,11,0,0,0,218,14,95,102,105,110,100, - 95,97,110,100,95,108,111,97,100,197,3,0,0,115,4,0, - 0,0,0,2,13,1,114,184,0,0,0,114,33,0,0,0, - 99,3,0,0,0,0,0,0,0,5,0,0,0,4,0,0, - 0,67,0,0,0,115,166,0,0,0,116,0,0,124,0,0, - 124,1,0,124,2,0,131,3,0,1,124,2,0,100,1,0, - 107,4,0,114,46,0,116,1,0,124,0,0,124,1,0,124, - 2,0,131,3,0,125,0,0,116,2,0,106,3,0,131,0, - 0,1,124,0,0,116,4,0,106,5,0,107,7,0,114,84, - 0,116,6,0,124,0,0,116,7,0,131,2,0,83,116,4, - 0,106,5,0,124,0,0,25,125,3,0,124,3,0,100,2, - 0,107,8,0,114,152,0,116,2,0,106,8,0,131,0,0, - 1,100,3,0,106,9,0,124,0,0,131,1,0,125,4,0, - 116,10,0,124,4,0,100,4,0,124,0,0,131,1,1,130, - 1,0,116,11,0,124,0,0,131,1,0,1,124,3,0,83, - 41,5,97,50,1,0,0,73,109,112,111,114,116,32,97,110, - 100,32,114,101,116,117,114,110,32,116,104,101,32,109,111,100, - 117,108,101,32,98,97,115,101,100,32,111,110,32,105,116,115, - 32,110,97,109,101,44,32,116,104,101,32,112,97,99,107,97, - 103,101,32,116,104,101,32,99,97,108,108,32,105,115,10,32, - 32,32,32,98,101,105,110,103,32,109,97,100,101,32,102,114, - 111,109,44,32,97,110,100,32,116,104,101,32,108,101,118,101, - 108,32,97,100,106,117,115,116,109,101,110,116,46,10,10,32, - 32,32,32,84,104,105,115,32,102,117,110,99,116,105,111,110, - 32,114,101,112,114,101,115,101,110,116,115,32,116,104,101,32, - 103,114,101,97,116,101,115,116,32,99,111,109,109,111,110,32, - 100,101,110,111,109,105,110,97,116,111,114,32,111,102,32,102, - 117,110,99,116,105,111,110,97,108,105,116,121,10,32,32,32, - 32,98,101,116,119,101,101,110,32,105,109,112,111,114,116,95, - 109,111,100,117,108,101,32,97,110,100,32,95,95,105,109,112, - 111,114,116,95,95,46,32,84,104,105,115,32,105,110,99,108, - 117,100,101,115,32,115,101,116,116,105,110,103,32,95,95,112, - 97,99,107,97,103,101,95,95,32,105,102,10,32,32,32,32, - 116,104,101,32,108,111,97,100,101,114,32,100,105,100,32,110, - 111,116,46,10,10,32,32,32,32,114,33,0,0,0,78,122, - 40,105,109,112,111,114,116,32,111,102,32,123,125,32,104,97, - 108,116,101,100,59,32,78,111,110,101,32,105,110,32,115,121, - 115,46,109,111,100,117,108,101,115,114,15,0,0,0,41,12, - 114,180,0,0,0,114,171,0,0,0,114,57,0,0,0,114, - 145,0,0,0,114,14,0,0,0,114,21,0,0,0,114,184, + 0,0,114,157,0,0,0,62,3,0,0,115,6,0,0,0, + 8,2,4,2,8,4,114,157,0,0,0,99,3,0,0,0, + 0,0,0,0,5,0,0,0,4,0,0,0,67,0,0,0, + 115,64,0,0,0,124,1,106,0,100,1,124,2,100,2,24, + 0,131,2,125,3,116,1,124,3,131,1,124,2,107,0,114, + 36,116,2,100,3,131,1,130,1,124,3,100,4,25,0,125, + 4,124,0,114,60,100,5,106,3,124,4,124,0,131,2,83, + 0,124,4,83,0,41,6,122,50,82,101,115,111,108,118,101, + 32,97,32,114,101,108,97,116,105,118,101,32,109,111,100,117, + 108,101,32,110,97,109,101,32,116,111,32,97,110,32,97,98, + 115,111,108,117,116,101,32,111,110,101,46,114,117,0,0,0, + 114,33,0,0,0,122,50,97,116,116,101,109,112,116,101,100, + 32,114,101,108,97,116,105,118,101,32,105,109,112,111,114,116, + 32,98,101,121,111,110,100,32,116,111,112,45,108,101,118,101, + 108,32,112,97,99,107,97,103,101,114,19,0,0,0,122,5, + 123,125,46,123,125,41,4,218,6,114,115,112,108,105,116,218, + 3,108,101,110,218,10,86,97,108,117,101,69,114,114,111,114, + 114,38,0,0,0,41,5,114,15,0,0,0,218,7,112,97, + 99,107,97,103,101,218,5,108,101,118,101,108,90,4,98,105, + 116,115,90,4,98,97,115,101,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,218,13,95,114,101,115,111,108,118, + 101,95,110,97,109,101,75,3,0,0,115,10,0,0,0,0, + 2,16,1,12,1,8,1,8,1,114,163,0,0,0,99,3, + 0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,67, + 0,0,0,115,34,0,0,0,124,0,106,0,124,1,124,2, + 131,2,125,3,124,3,100,0,107,8,114,24,100,0,83,0, + 116,1,124,1,124,3,131,2,83,0,41,1,78,41,2,114, + 147,0,0,0,114,78,0,0,0,41,4,218,6,102,105,110, + 100,101,114,114,15,0,0,0,114,144,0,0,0,114,93,0, + 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, + 0,218,17,95,102,105,110,100,95,115,112,101,99,95,108,101, + 103,97,99,121,84,3,0,0,115,8,0,0,0,0,3,12, + 1,8,1,4,1,114,165,0,0,0,99,3,0,0,0,0, + 0,0,0,10,0,0,0,27,0,0,0,67,0,0,0,115, + 242,0,0,0,116,0,106,1,125,3,124,3,100,1,107,8, + 114,22,116,2,100,2,131,1,130,1,124,3,115,38,116,3, + 106,4,100,3,116,5,131,2,1,0,124,0,116,0,106,6, + 107,6,125,4,120,188,124,3,68,0,93,176,125,5,116,7, + 131,0,143,72,1,0,121,10,124,5,106,8,125,6,87,0, + 110,42,4,0,116,9,107,10,114,118,1,0,1,0,1,0, + 116,10,124,5,124,0,124,1,131,3,125,7,124,7,100,1, + 107,8,114,114,119,54,89,0,110,14,88,0,124,6,124,0, + 124,1,124,2,131,3,125,7,87,0,100,1,81,0,82,0, + 88,0,124,7,100,1,107,9,114,54,124,4,12,0,114,226, + 124,0,116,0,106,6,107,6,114,226,116,0,106,6,124,0, + 25,0,125,8,121,10,124,8,106,11,125,9,87,0,110,20, + 4,0,116,9,107,10,114,206,1,0,1,0,1,0,124,7, + 83,0,88,0,124,9,100,1,107,8,114,220,124,7,83,0, + 124,9,83,0,113,54,124,7,83,0,113,54,87,0,100,1, + 83,0,100,1,83,0,41,4,122,21,70,105,110,100,32,97, + 32,109,111,100,117,108,101,39,115,32,115,112,101,99,46,78, + 122,53,115,121,115,46,109,101,116,97,95,112,97,116,104,32, + 105,115,32,78,111,110,101,44,32,80,121,116,104,111,110,32, + 105,115,32,108,105,107,101,108,121,32,115,104,117,116,116,105, + 110,103,32,100,111,119,110,122,22,115,121,115,46,109,101,116, + 97,95,112,97,116,104,32,105,115,32,101,109,112,116,121,41, + 12,114,14,0,0,0,218,9,109,101,116,97,95,112,97,116, + 104,114,70,0,0,0,218,9,95,119,97,114,110,105,110,103, + 115,218,4,119,97,114,110,218,13,73,109,112,111,114,116,87, + 97,114,110,105,110,103,114,79,0,0,0,114,157,0,0,0, + 114,146,0,0,0,114,90,0,0,0,114,165,0,0,0,114, + 89,0,0,0,41,10,114,15,0,0,0,114,144,0,0,0, + 114,145,0,0,0,114,166,0,0,0,90,9,105,115,95,114, + 101,108,111,97,100,114,164,0,0,0,114,146,0,0,0,114, + 82,0,0,0,114,83,0,0,0,114,89,0,0,0,114,10, + 0,0,0,114,10,0,0,0,114,11,0,0,0,218,10,95, + 102,105,110,100,95,115,112,101,99,93,3,0,0,115,54,0, + 0,0,0,2,6,1,8,2,8,3,4,1,12,5,10,1, + 10,1,8,1,2,1,10,1,14,1,12,1,8,1,8,2, + 22,1,8,2,16,1,10,1,2,1,10,1,14,4,6,2, + 8,1,4,2,6,2,8,2,114,170,0,0,0,99,3,0, + 0,0,0,0,0,0,4,0,0,0,4,0,0,0,67,0, + 0,0,115,140,0,0,0,116,0,124,0,116,1,131,2,115, + 28,116,2,100,1,106,3,116,4,124,0,131,1,131,1,131, + 1,130,1,124,2,100,2,107,0,114,44,116,5,100,3,131, + 1,130,1,124,2,100,2,107,4,114,114,116,0,124,1,116, + 1,131,2,115,72,116,2,100,4,131,1,130,1,110,42,124, + 1,115,86,116,6,100,5,131,1,130,1,110,28,124,1,116, + 7,106,8,107,7,114,114,100,6,125,3,116,9,124,3,106, + 3,124,1,131,1,131,1,130,1,124,0,12,0,114,136,124, + 2,100,2,107,2,114,136,116,5,100,7,131,1,130,1,100, + 8,83,0,41,9,122,28,86,101,114,105,102,121,32,97,114, + 103,117,109,101,110,116,115,32,97,114,101,32,34,115,97,110, + 101,34,46,122,31,109,111,100,117,108,101,32,110,97,109,101, + 32,109,117,115,116,32,98,101,32,115,116,114,44,32,110,111, + 116,32,123,125,114,19,0,0,0,122,18,108,101,118,101,108, + 32,109,117,115,116,32,98,101,32,62,61,32,48,122,31,95, + 95,112,97,99,107,97,103,101,95,95,32,110,111,116,32,115, + 101,116,32,116,111,32,97,32,115,116,114,105,110,103,122,54, + 97,116,116,101,109,112,116,101,100,32,114,101,108,97,116,105, + 118,101,32,105,109,112,111,114,116,32,119,105,116,104,32,110, + 111,32,107,110,111,119,110,32,112,97,114,101,110,116,32,112, + 97,99,107,97,103,101,122,61,80,97,114,101,110,116,32,109, + 111,100,117,108,101,32,123,33,114,125,32,110,111,116,32,108, + 111,97,100,101,100,44,32,99,97,110,110,111,116,32,112,101, + 114,102,111,114,109,32,114,101,108,97,116,105,118,101,32,105, + 109,112,111,114,116,122,17,69,109,112,116,121,32,109,111,100, + 117,108,101,32,110,97,109,101,78,41,10,218,10,105,115,105, + 110,115,116,97,110,99,101,218,3,115,116,114,218,9,84,121, + 112,101,69,114,114,111,114,114,38,0,0,0,114,13,0,0, + 0,114,160,0,0,0,114,70,0,0,0,114,14,0,0,0, + 114,79,0,0,0,218,11,83,121,115,116,101,109,69,114,114, + 111,114,41,4,114,15,0,0,0,114,161,0,0,0,114,162, + 0,0,0,114,139,0,0,0,114,10,0,0,0,114,10,0, + 0,0,114,11,0,0,0,218,13,95,115,97,110,105,116,121, + 95,99,104,101,99,107,140,3,0,0,115,28,0,0,0,0, + 2,10,1,18,1,8,1,8,1,8,1,10,1,10,1,4, + 1,10,2,10,1,4,2,14,1,14,1,114,175,0,0,0, + 122,16,78,111,32,109,111,100,117,108,101,32,110,97,109,101, + 100,32,122,4,123,33,114,125,99,2,0,0,0,0,0,0, + 0,8,0,0,0,12,0,0,0,67,0,0,0,115,220,0, + 0,0,100,0,125,2,124,0,106,0,100,1,131,1,100,2, + 25,0,125,3,124,3,114,134,124,3,116,1,106,2,107,7, + 114,42,116,3,124,1,124,3,131,2,1,0,124,0,116,1, + 106,2,107,6,114,62,116,1,106,2,124,0,25,0,83,0, + 116,1,106,2,124,3,25,0,125,4,121,10,124,4,106,4, + 125,2,87,0,110,50,4,0,116,5,107,10,114,132,1,0, + 1,0,1,0,116,6,100,3,23,0,106,7,124,0,124,3, + 131,2,125,5,116,8,124,5,124,0,100,4,141,2,100,0, + 130,2,89,0,110,2,88,0,116,9,124,0,124,2,131,2, + 125,6,124,6,100,0,107,8,114,172,116,8,116,6,106,7, + 124,0,131,1,124,0,100,4,141,2,130,1,110,8,116,10, + 124,6,131,1,125,7,124,3,114,216,116,1,106,2,124,3, + 25,0,125,4,116,11,124,4,124,0,106,0,100,1,131,1, + 100,5,25,0,124,7,131,3,1,0,124,7,83,0,41,6, + 78,114,117,0,0,0,114,19,0,0,0,122,23,59,32,123, + 33,114,125,32,105,115,32,110,111,116,32,97,32,112,97,99, + 107,97,103,101,41,1,114,15,0,0,0,233,2,0,0,0, + 41,12,114,118,0,0,0,114,14,0,0,0,114,79,0,0, + 0,114,58,0,0,0,114,127,0,0,0,114,90,0,0,0, + 218,8,95,69,82,82,95,77,83,71,114,38,0,0,0,218, + 19,77,111,100,117,108,101,78,111,116,70,111,117,110,100,69, + 114,114,111,114,114,170,0,0,0,114,141,0,0,0,114,5, + 0,0,0,41,8,114,15,0,0,0,218,7,105,109,112,111, + 114,116,95,114,144,0,0,0,114,119,0,0,0,90,13,112, + 97,114,101,110,116,95,109,111,100,117,108,101,114,139,0,0, + 0,114,82,0,0,0,114,83,0,0,0,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,218,23,95,102,105,110, + 100,95,97,110,100,95,108,111,97,100,95,117,110,108,111,99, + 107,101,100,163,3,0,0,115,42,0,0,0,0,1,4,1, + 14,1,4,1,10,1,10,2,10,1,10,1,10,1,2,1, + 10,1,14,1,16,1,20,1,10,1,8,1,20,2,8,1, + 4,2,10,1,22,1,114,180,0,0,0,99,2,0,0,0, + 0,0,0,0,2,0,0,0,10,0,0,0,67,0,0,0, + 115,30,0,0,0,116,0,124,0,131,1,143,12,1,0,116, + 1,124,0,124,1,131,2,83,0,81,0,82,0,88,0,100, + 1,83,0,41,2,122,54,70,105,110,100,32,97,110,100,32, + 108,111,97,100,32,116,104,101,32,109,111,100,117,108,101,44, + 32,97,110,100,32,114,101,108,101,97,115,101,32,116,104,101, + 32,105,109,112,111,114,116,32,108,111,99,107,46,78,41,2, + 114,42,0,0,0,114,180,0,0,0,41,2,114,15,0,0, + 0,114,179,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,11,0,0,0,218,14,95,102,105,110,100,95,97,110,100, + 95,108,111,97,100,190,3,0,0,115,4,0,0,0,0,2, + 10,1,114,181,0,0,0,114,19,0,0,0,99,3,0,0, + 0,0,0,0,0,5,0,0,0,4,0,0,0,67,0,0, + 0,115,120,0,0,0,116,0,124,0,124,1,124,2,131,3, + 1,0,124,2,100,1,107,4,114,32,116,1,124,0,124,1, + 124,2,131,3,125,0,116,2,106,3,131,0,1,0,124,0, + 116,4,106,5,107,7,114,60,116,6,124,0,116,7,131,2, + 83,0,116,4,106,5,124,0,25,0,125,3,124,3,100,2, + 107,8,114,108,116,2,106,8,131,0,1,0,100,3,106,9, + 124,0,131,1,125,4,116,10,124,4,124,0,100,4,141,2, + 130,1,116,11,124,0,131,1,1,0,124,3,83,0,41,5, + 97,50,1,0,0,73,109,112,111,114,116,32,97,110,100,32, + 114,101,116,117,114,110,32,116,104,101,32,109,111,100,117,108, + 101,32,98,97,115,101,100,32,111,110,32,105,116,115,32,110, + 97,109,101,44,32,116,104,101,32,112,97,99,107,97,103,101, + 32,116,104,101,32,99,97,108,108,32,105,115,10,32,32,32, + 32,98,101,105,110,103,32,109,97,100,101,32,102,114,111,109, + 44,32,97,110,100,32,116,104,101,32,108,101,118,101,108,32, + 97,100,106,117,115,116,109,101,110,116,46,10,10,32,32,32, + 32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,114, + 101,112,114,101,115,101,110,116,115,32,116,104,101,32,103,114, + 101,97,116,101,115,116,32,99,111,109,109,111,110,32,100,101, + 110,111,109,105,110,97,116,111,114,32,111,102,32,102,117,110, + 99,116,105,111,110,97,108,105,116,121,10,32,32,32,32,98, + 101,116,119,101,101,110,32,105,109,112,111,114,116,95,109,111, + 100,117,108,101,32,97,110,100,32,95,95,105,109,112,111,114, + 116,95,95,46,32,84,104,105,115,32,105,110,99,108,117,100, + 101,115,32,115,101,116,116,105,110,103,32,95,95,112,97,99, + 107,97,103,101,95,95,32,105,102,10,32,32,32,32,116,104, + 101,32,108,111,97,100,101,114,32,100,105,100,32,110,111,116, + 46,10,10,32,32,32,32,114,19,0,0,0,78,122,40,105, + 109,112,111,114,116,32,111,102,32,123,125,32,104,97,108,116, + 101,100,59,32,78,111,110,101,32,105,110,32,115,121,115,46, + 109,111,100,117,108,101,115,41,1,114,15,0,0,0,41,12, + 114,175,0,0,0,114,163,0,0,0,114,46,0,0,0,114, + 137,0,0,0,114,14,0,0,0,114,79,0,0,0,114,181, 0,0,0,218,11,95,103,99,100,95,105,109,112,111,114,116, - 114,58,0,0,0,114,50,0,0,0,114,77,0,0,0,114, - 63,0,0,0,41,5,114,15,0,0,0,114,169,0,0,0, - 114,170,0,0,0,114,89,0,0,0,114,74,0,0,0,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,185, - 0,0,0,203,3,0,0,115,28,0,0,0,0,9,16,1, - 12,1,18,1,10,1,15,1,13,1,13,1,12,1,10,1, - 6,1,9,1,18,1,10,1,114,185,0,0,0,99,3,0, + 114,47,0,0,0,114,38,0,0,0,114,178,0,0,0,114, + 56,0,0,0,41,5,114,15,0,0,0,114,161,0,0,0, + 114,162,0,0,0,114,83,0,0,0,114,67,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,182, + 0,0,0,196,3,0,0,115,28,0,0,0,0,9,12,1, + 8,1,12,1,8,1,10,1,10,1,10,1,8,1,8,1, + 4,1,6,1,12,1,8,1,114,182,0,0,0,99,3,0, 0,0,0,0,0,0,6,0,0,0,17,0,0,0,67,0, - 0,0,115,239,0,0,0,116,0,0,124,0,0,100,1,0, - 131,2,0,114,235,0,100,2,0,124,1,0,107,6,0,114, - 83,0,116,1,0,124,1,0,131,1,0,125,1,0,124,1, - 0,106,2,0,100,2,0,131,1,0,1,116,0,0,124,0, - 0,100,3,0,131,2,0,114,83,0,124,1,0,106,3,0, - 124,0,0,106,4,0,131,1,0,1,120,149,0,124,1,0, - 68,93,141,0,125,3,0,116,0,0,124,0,0,124,3,0, - 131,2,0,115,90,0,100,4,0,106,5,0,124,0,0,106, - 6,0,124,3,0,131,2,0,125,4,0,121,17,0,116,7, - 0,124,2,0,124,4,0,131,2,0,1,87,113,90,0,4, - 116,8,0,107,10,0,114,230,0,1,125,5,0,1,122,47, - 0,116,9,0,124,5,0,131,1,0,106,10,0,116,11,0, - 131,1,0,114,209,0,124,5,0,106,12,0,124,4,0,107, - 2,0,114,209,0,119,90,0,130,0,0,87,89,100,5,0, - 100,5,0,125,5,0,126,5,0,88,113,90,0,88,113,90, - 0,87,124,0,0,83,41,6,122,238,70,105,103,117,114,101, - 32,111,117,116,32,119,104,97,116,32,95,95,105,109,112,111, - 114,116,95,95,32,115,104,111,117,108,100,32,114,101,116,117, - 114,110,46,10,10,32,32,32,32,84,104,101,32,105,109,112, - 111,114,116,95,32,112,97,114,97,109,101,116,101,114,32,105, - 115,32,97,32,99,97,108,108,97,98,108,101,32,119,104,105, - 99,104,32,116,97,107,101,115,32,116,104,101,32,110,97,109, - 101,32,111,102,32,109,111,100,117,108,101,32,116,111,10,32, - 32,32,32,105,109,112,111,114,116,46,32,73,116,32,105,115, - 32,114,101,113,117,105,114,101,100,32,116,111,32,100,101,99, - 111,117,112,108,101,32,116,104,101,32,102,117,110,99,116,105, - 111,110,32,102,114,111,109,32,97,115,115,117,109,105,110,103, - 32,105,109,112,111,114,116,108,105,98,39,115,10,32,32,32, - 32,105,109,112,111,114,116,32,105,109,112,108,101,109,101,110, - 116,97,116,105,111,110,32,105,115,32,100,101,115,105,114,101, - 100,46,10,10,32,32,32,32,114,131,0,0,0,250,1,42, - 218,7,95,95,97,108,108,95,95,122,5,123,125,46,123,125, - 78,41,13,114,4,0,0,0,114,130,0,0,0,218,6,114, - 101,109,111,118,101,218,6,101,120,116,101,110,100,114,187,0, - 0,0,114,50,0,0,0,114,1,0,0,0,114,65,0,0, - 0,114,77,0,0,0,114,178,0,0,0,114,71,0,0,0, - 218,15,95,69,82,82,95,77,83,71,95,80,82,69,70,73, - 88,114,15,0,0,0,41,6,114,89,0,0,0,218,8,102, - 114,111,109,108,105,115,116,114,182,0,0,0,218,1,120,90, - 9,102,114,111,109,95,110,97,109,101,90,3,101,120,99,114, - 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,16, - 95,104,97,110,100,108,101,95,102,114,111,109,108,105,115,116, - 227,3,0,0,115,34,0,0,0,0,10,15,1,12,1,12, - 1,13,1,15,1,16,1,13,1,15,1,21,1,3,1,17, - 1,18,4,21,1,15,1,3,1,26,1,114,193,0,0,0, - 99,1,0,0,0,0,0,0,0,2,0,0,0,2,0,0, - 0,67,0,0,0,115,72,0,0,0,124,0,0,106,0,0, - 100,1,0,131,1,0,125,1,0,124,1,0,100,2,0,107, - 8,0,114,68,0,124,0,0,100,3,0,25,125,1,0,100, - 4,0,124,0,0,107,7,0,114,68,0,124,1,0,106,1, - 0,100,5,0,131,1,0,100,6,0,25,125,1,0,124,1, - 0,83,41,7,122,167,67,97,108,99,117,108,97,116,101,32, - 119,104,97,116,32,95,95,112,97,99,107,97,103,101,95,95, - 32,115,104,111,117,108,100,32,98,101,46,10,10,32,32,32, - 32,95,95,112,97,99,107,97,103,101,95,95,32,105,115,32, - 110,111,116,32,103,117,97,114,97,110,116,101,101,100,32,116, - 111,32,98,101,32,100,101,102,105,110,101,100,32,111,114,32, - 99,111,117,108,100,32,98,101,32,115,101,116,32,116,111,32, - 78,111,110,101,10,32,32,32,32,116,111,32,114,101,112,114, - 101,115,101,110,116,32,116,104,97,116,32,105,116,115,32,112, - 114,111,112,101,114,32,118,97,108,117,101,32,105,115,32,117, - 110,107,110,111,119,110,46,10,10,32,32,32,32,114,134,0, - 0,0,78,114,1,0,0,0,114,131,0,0,0,114,121,0, - 0,0,114,33,0,0,0,41,2,114,42,0,0,0,114,122, - 0,0,0,41,2,218,7,103,108,111,98,97,108,115,114,169, - 0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0, - 0,0,218,17,95,99,97,108,99,95,95,95,112,97,99,107, - 97,103,101,95,95,3,4,0,0,115,12,0,0,0,0,7, - 15,1,12,1,10,1,12,1,19,1,114,195,0,0,0,99, - 5,0,0,0,0,0,0,0,9,0,0,0,5,0,0,0, - 67,0,0,0,115,227,0,0,0,124,4,0,100,1,0,107, - 2,0,114,27,0,116,0,0,124,0,0,131,1,0,125,5, - 0,110,54,0,124,1,0,100,2,0,107,9,0,114,45,0, - 124,1,0,110,3,0,105,0,0,125,6,0,116,1,0,124, - 6,0,131,1,0,125,7,0,116,0,0,124,0,0,124,7, - 0,124,4,0,131,3,0,125,5,0,124,3,0,115,207,0, - 124,4,0,100,1,0,107,2,0,114,122,0,116,0,0,124, - 0,0,106,2,0,100,3,0,131,1,0,100,1,0,25,131, - 1,0,83,124,0,0,115,132,0,124,5,0,83,116,3,0, - 124,0,0,131,1,0,116,3,0,124,0,0,106,2,0,100, - 3,0,131,1,0,100,1,0,25,131,1,0,24,125,8,0, - 116,4,0,106,5,0,124,5,0,106,6,0,100,2,0,116, - 3,0,124,5,0,106,6,0,131,1,0,124,8,0,24,133, - 2,0,25,25,83,110,16,0,116,7,0,124,5,0,124,3, - 0,116,0,0,131,3,0,83,100,2,0,83,41,4,97,215, - 1,0,0,73,109,112,111,114,116,32,97,32,109,111,100,117, - 108,101,46,10,10,32,32,32,32,84,104,101,32,39,103,108, - 111,98,97,108,115,39,32,97,114,103,117,109,101,110,116,32, - 105,115,32,117,115,101,100,32,116,111,32,105,110,102,101,114, - 32,119,104,101,114,101,32,116,104,101,32,105,109,112,111,114, - 116,32,105,115,32,111,99,99,117,114,114,105,110,103,32,102, - 114,111,109,10,32,32,32,32,116,111,32,104,97,110,100,108, - 101,32,114,101,108,97,116,105,118,101,32,105,109,112,111,114, - 116,115,46,32,84,104,101,32,39,108,111,99,97,108,115,39, - 32,97,114,103,117,109,101,110,116,32,105,115,32,105,103,110, - 111,114,101,100,46,32,84,104,101,10,32,32,32,32,39,102, - 114,111,109,108,105,115,116,39,32,97,114,103,117,109,101,110, - 116,32,115,112,101,99,105,102,105,101,115,32,119,104,97,116, - 32,115,104,111,117,108,100,32,101,120,105,115,116,32,97,115, - 32,97,116,116,114,105,98,117,116,101,115,32,111,110,32,116, - 104,101,32,109,111,100,117,108,101,10,32,32,32,32,98,101, - 105,110,103,32,105,109,112,111,114,116,101,100,32,40,101,46, - 103,46,32,96,96,102,114,111,109,32,109,111,100,117,108,101, - 32,105,109,112,111,114,116,32,60,102,114,111,109,108,105,115, - 116,62,96,96,41,46,32,32,84,104,101,32,39,108,101,118, - 101,108,39,10,32,32,32,32,97,114,103,117,109,101,110,116, - 32,114,101,112,114,101,115,101,110,116,115,32,116,104,101,32, - 112,97,99,107,97,103,101,32,108,111,99,97,116,105,111,110, - 32,116,111,32,105,109,112,111,114,116,32,102,114,111,109,32, - 105,110,32,97,32,114,101,108,97,116,105,118,101,10,32,32, - 32,32,105,109,112,111,114,116,32,40,101,46,103,46,32,96, - 96,102,114,111,109,32,46,46,112,107,103,32,105,109,112,111, - 114,116,32,109,111,100,96,96,32,119,111,117,108,100,32,104, - 97,118,101,32,97,32,39,108,101,118,101,108,39,32,111,102, - 32,50,41,46,10,10,32,32,32,32,114,33,0,0,0,78, - 114,121,0,0,0,41,8,114,185,0,0,0,114,195,0,0, - 0,218,9,112,97,114,116,105,116,105,111,110,114,167,0,0, - 0,114,14,0,0,0,114,21,0,0,0,114,1,0,0,0, - 114,193,0,0,0,41,9,114,15,0,0,0,114,194,0,0, - 0,218,6,108,111,99,97,108,115,114,191,0,0,0,114,170, - 0,0,0,114,89,0,0,0,90,8,103,108,111,98,97,108, - 115,95,114,169,0,0,0,90,7,99,117,116,95,111,102,102, - 114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,218, - 10,95,95,105,109,112,111,114,116,95,95,18,4,0,0,115, - 26,0,0,0,0,11,12,1,15,2,24,1,12,1,18,1, - 6,3,12,1,23,1,6,1,4,4,35,3,40,2,114,198, - 0,0,0,99,1,0,0,0,0,0,0,0,2,0,0,0, - 3,0,0,0,67,0,0,0,115,53,0,0,0,116,0,0, - 106,1,0,124,0,0,131,1,0,125,1,0,124,1,0,100, - 0,0,107,8,0,114,43,0,116,2,0,100,1,0,124,0, - 0,23,131,1,0,130,1,0,116,3,0,124,1,0,131,1, - 0,83,41,2,78,122,25,110,111,32,98,117,105,108,116,45, - 105,110,32,109,111,100,117,108,101,32,110,97,109,101,100,32, - 41,4,114,150,0,0,0,114,154,0,0,0,114,77,0,0, - 0,114,149,0,0,0,41,2,114,15,0,0,0,114,88,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,218,18,95,98,117,105,108,116,105,110,95,102,114,111,109, - 95,110,97,109,101,53,4,0,0,115,8,0,0,0,0,1, - 15,1,12,1,16,1,114,199,0,0,0,99,2,0,0,0, - 0,0,0,0,12,0,0,0,12,0,0,0,67,0,0,0, - 115,74,1,0,0,124,1,0,97,0,0,124,0,0,97,1, - 0,116,2,0,116,1,0,131,1,0,125,2,0,120,123,0, - 116,1,0,106,3,0,106,4,0,131,0,0,68,93,106,0, - 92,2,0,125,3,0,125,4,0,116,5,0,124,4,0,124, - 2,0,131,2,0,114,40,0,124,3,0,116,1,0,106,6, - 0,107,6,0,114,91,0,116,7,0,125,5,0,110,27,0, - 116,0,0,106,8,0,124,3,0,131,1,0,114,40,0,116, - 9,0,125,5,0,110,3,0,113,40,0,116,10,0,124,4, - 0,124,5,0,131,2,0,125,6,0,116,11,0,124,6,0, - 124,4,0,131,2,0,1,113,40,0,87,116,1,0,106,3, - 0,116,12,0,25,125,7,0,120,73,0,100,5,0,68,93, - 65,0,125,8,0,124,8,0,116,1,0,106,3,0,107,7, - 0,114,206,0,116,13,0,124,8,0,131,1,0,125,9,0, - 110,13,0,116,1,0,106,3,0,124,8,0,25,125,9,0, - 116,14,0,124,7,0,124,8,0,124,9,0,131,3,0,1, - 113,170,0,87,121,16,0,116,13,0,100,2,0,131,1,0, - 125,10,0,87,110,24,0,4,116,15,0,107,10,0,114,25, - 1,1,1,1,100,3,0,125,10,0,89,110,1,0,88,116, - 14,0,124,7,0,100,2,0,124,10,0,131,3,0,1,116, - 13,0,100,4,0,131,1,0,125,11,0,116,14,0,124,7, - 0,100,4,0,124,11,0,131,3,0,1,100,3,0,83,41, - 6,122,250,83,101,116,117,112,32,105,109,112,111,114,116,108, - 105,98,32,98,121,32,105,109,112,111,114,116,105,110,103,32, - 110,101,101,100,101,100,32,98,117,105,108,116,45,105,110,32, - 109,111,100,117,108,101,115,32,97,110,100,32,105,110,106,101, - 99,116,105,110,103,32,116,104,101,109,10,32,32,32,32,105, - 110,116,111,32,116,104,101,32,103,108,111,98,97,108,32,110, - 97,109,101,115,112,97,99,101,46,10,10,32,32,32,32,65, - 115,32,115,121,115,32,105,115,32,110,101,101,100,101,100,32, - 102,111,114,32,115,121,115,46,109,111,100,117,108,101,115,32, - 97,99,99,101,115,115,32,97,110,100,32,95,105,109,112,32, - 105,115,32,110,101,101,100,101,100,32,116,111,32,108,111,97, - 100,32,98,117,105,108,116,45,105,110,10,32,32,32,32,109, - 111,100,117,108,101,115,44,32,116,104,111,115,101,32,116,119, - 111,32,109,111,100,117,108,101,115,32,109,117,115,116,32,98, - 101,32,101,120,112,108,105,99,105,116,108,121,32,112,97,115, - 115,101,100,32,105,110,46,10,10,32,32,32,32,114,141,0, - 0,0,114,34,0,0,0,78,114,62,0,0,0,41,1,114, - 141,0,0,0,41,16,114,57,0,0,0,114,14,0,0,0, - 114,13,0,0,0,114,21,0,0,0,218,5,105,116,101,109, - 115,114,177,0,0,0,114,76,0,0,0,114,150,0,0,0, - 114,82,0,0,0,114,160,0,0,0,114,132,0,0,0,114, - 137,0,0,0,114,1,0,0,0,114,199,0,0,0,114,5, - 0,0,0,114,77,0,0,0,41,12,218,10,115,121,115,95, - 109,111,100,117,108,101,218,11,95,105,109,112,95,109,111,100, - 117,108,101,90,11,109,111,100,117,108,101,95,116,121,112,101, - 114,15,0,0,0,114,89,0,0,0,114,99,0,0,0,114, - 88,0,0,0,90,11,115,101,108,102,95,109,111,100,117,108, - 101,90,12,98,117,105,108,116,105,110,95,110,97,109,101,90, - 14,98,117,105,108,116,105,110,95,109,111,100,117,108,101,90, - 13,116,104,114,101,97,100,95,109,111,100,117,108,101,90,14, - 119,101,97,107,114,101,102,95,109,111,100,117,108,101,114,10, - 0,0,0,114,10,0,0,0,114,11,0,0,0,218,6,95, - 115,101,116,117,112,60,4,0,0,115,50,0,0,0,0,9, - 6,1,6,3,12,1,28,1,15,1,15,1,9,1,15,1, - 9,2,3,1,15,1,17,3,13,1,13,1,15,1,15,2, - 13,1,20,3,3,1,16,1,13,2,11,1,16,3,12,1, - 114,203,0,0,0,99,2,0,0,0,0,0,0,0,3,0, - 0,0,3,0,0,0,67,0,0,0,115,87,0,0,0,116, - 0,0,124,0,0,124,1,0,131,2,0,1,116,1,0,106, - 2,0,106,3,0,116,4,0,131,1,0,1,116,1,0,106, - 2,0,106,3,0,116,5,0,131,1,0,1,100,1,0,100, - 2,0,108,6,0,125,2,0,124,2,0,97,7,0,124,2, - 0,106,8,0,116,1,0,106,9,0,116,10,0,25,131,1, - 0,1,100,2,0,83,41,3,122,50,73,110,115,116,97,108, - 108,32,105,109,112,111,114,116,108,105,98,32,97,115,32,116, - 104,101,32,105,109,112,108,101,109,101,110,116,97,116,105,111, - 110,32,111,102,32,105,109,112,111,114,116,46,114,33,0,0, - 0,78,41,11,114,203,0,0,0,114,14,0,0,0,114,174, - 0,0,0,114,113,0,0,0,114,150,0,0,0,114,160,0, - 0,0,218,26,95,102,114,111,122,101,110,95,105,109,112,111, - 114,116,108,105,98,95,101,120,116,101,114,110,97,108,114,119, - 0,0,0,218,8,95,105,110,115,116,97,108,108,114,21,0, - 0,0,114,1,0,0,0,41,3,114,201,0,0,0,114,202, - 0,0,0,114,204,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,114,205,0,0,0,107,4,0,0, - 115,12,0,0,0,0,2,13,2,16,1,16,3,12,1,6, - 1,114,205,0,0,0,41,51,114,3,0,0,0,114,119,0, - 0,0,114,12,0,0,0,114,16,0,0,0,114,17,0,0, - 0,114,59,0,0,0,114,41,0,0,0,114,48,0,0,0, - 114,31,0,0,0,114,32,0,0,0,114,53,0,0,0,114, - 54,0,0,0,114,56,0,0,0,114,63,0,0,0,114,65, - 0,0,0,114,75,0,0,0,114,81,0,0,0,114,84,0, - 0,0,114,90,0,0,0,114,101,0,0,0,114,102,0,0, - 0,114,106,0,0,0,114,85,0,0,0,218,6,111,98,106, - 101,99,116,90,9,95,80,79,80,85,76,65,84,69,114,132, - 0,0,0,114,137,0,0,0,114,144,0,0,0,114,97,0, - 0,0,114,86,0,0,0,114,148,0,0,0,114,149,0,0, - 0,114,87,0,0,0,114,150,0,0,0,114,160,0,0,0, - 114,165,0,0,0,114,171,0,0,0,114,173,0,0,0,114, - 176,0,0,0,114,180,0,0,0,114,190,0,0,0,114,181, - 0,0,0,114,183,0,0,0,114,184,0,0,0,114,185,0, - 0,0,114,193,0,0,0,114,195,0,0,0,114,198,0,0, - 0,114,199,0,0,0,114,203,0,0,0,114,205,0,0,0, - 114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114, - 11,0,0,0,218,8,60,109,111,100,117,108,101,62,8,0, - 0,0,115,96,0,0,0,6,17,6,2,12,8,12,4,19, - 20,6,2,6,3,22,4,19,68,19,21,19,19,12,19,12, - 19,12,11,18,8,12,11,12,12,12,16,12,36,19,27,19, - 101,24,26,9,3,18,45,18,60,12,18,12,17,12,25,12, - 29,12,23,12,16,19,73,19,77,19,13,12,9,12,9,15, - 40,12,16,6,1,10,2,12,27,12,6,18,24,12,32,12, - 15,24,35,12,7,12,47, + 0,0,115,164,0,0,0,116,0,124,0,100,1,131,2,114, + 160,100,2,124,1,107,6,114,58,116,1,124,1,131,1,125, + 1,124,1,106,2,100,2,131,1,1,0,116,0,124,0,100, + 3,131,2,114,58,124,1,106,3,124,0,106,4,131,1,1, + 0,120,100,124,1,68,0,93,92,125,3,116,0,124,0,124, + 3,131,2,115,64,100,4,106,5,124,0,106,6,124,3,131, + 2,125,4,121,14,116,7,124,2,124,4,131,2,1,0,87, + 0,113,64,4,0,116,8,107,10,114,154,1,0,125,5,1, + 0,122,20,124,5,106,9,124,4,107,2,114,136,119,64,130, + 0,87,0,89,0,100,5,100,5,125,5,126,5,88,0,113, + 64,88,0,113,64,87,0,124,0,83,0,41,6,122,238,70, + 105,103,117,114,101,32,111,117,116,32,119,104,97,116,32,95, + 95,105,109,112,111,114,116,95,95,32,115,104,111,117,108,100, + 32,114,101,116,117,114,110,46,10,10,32,32,32,32,84,104, + 101,32,105,109,112,111,114,116,95,32,112,97,114,97,109,101, + 116,101,114,32,105,115,32,97,32,99,97,108,108,97,98,108, + 101,32,119,104,105,99,104,32,116,97,107,101,115,32,116,104, + 101,32,110,97,109,101,32,111,102,32,109,111,100,117,108,101, + 32,116,111,10,32,32,32,32,105,109,112,111,114,116,46,32, + 73,116,32,105,115,32,114,101,113,117,105,114,101,100,32,116, + 111,32,100,101,99,111,117,112,108,101,32,116,104,101,32,102, + 117,110,99,116,105,111,110,32,102,114,111,109,32,97,115,115, + 117,109,105,110,103,32,105,109,112,111,114,116,108,105,98,39, + 115,10,32,32,32,32,105,109,112,111,114,116,32,105,109,112, + 108,101,109,101,110,116,97,116,105,111,110,32,105,115,32,100, + 101,115,105,114,101,100,46,10,10,32,32,32,32,114,127,0, + 0,0,250,1,42,218,7,95,95,97,108,108,95,95,122,5, + 123,125,46,123,125,78,41,10,114,4,0,0,0,114,126,0, + 0,0,218,6,114,101,109,111,118,101,218,6,101,120,116,101, + 110,100,114,184,0,0,0,114,38,0,0,0,114,1,0,0, + 0,114,58,0,0,0,114,178,0,0,0,114,15,0,0,0, + 41,6,114,83,0,0,0,218,8,102,114,111,109,108,105,115, + 116,114,179,0,0,0,218,1,120,90,9,102,114,111,109,95, + 110,97,109,101,90,3,101,120,99,114,10,0,0,0,114,10, + 0,0,0,114,11,0,0,0,218,16,95,104,97,110,100,108, + 101,95,102,114,111,109,108,105,115,116,221,3,0,0,115,32, + 0,0,0,0,10,10,1,8,1,8,1,10,1,10,1,12, + 1,10,1,10,1,14,1,2,1,14,1,16,4,10,1,2, + 1,24,1,114,189,0,0,0,99,1,0,0,0,0,0,0, + 0,3,0,0,0,6,0,0,0,67,0,0,0,115,146,0, + 0,0,124,0,106,0,100,1,131,1,125,1,124,0,106,0, + 100,2,131,1,125,2,124,1,100,3,107,9,114,82,124,2, + 100,3,107,9,114,78,124,1,124,2,106,1,107,3,114,78, + 116,2,106,3,100,4,124,1,155,2,100,5,124,2,106,1, + 155,2,100,6,157,5,116,4,100,7,100,8,141,3,1,0, + 124,1,83,0,124,2,100,3,107,9,114,96,124,2,106,1, + 83,0,116,2,106,3,100,9,116,4,100,7,100,8,141,3, + 1,0,124,0,100,10,25,0,125,1,100,11,124,0,107,7, + 114,142,124,1,106,5,100,12,131,1,100,13,25,0,125,1, + 124,1,83,0,41,14,122,167,67,97,108,99,117,108,97,116, + 101,32,119,104,97,116,32,95,95,112,97,99,107,97,103,101, + 95,95,32,115,104,111,117,108,100,32,98,101,46,10,10,32, + 32,32,32,95,95,112,97,99,107,97,103,101,95,95,32,105, + 115,32,110,111,116,32,103,117,97,114,97,110,116,101,101,100, + 32,116,111,32,98,101,32,100,101,102,105,110,101,100,32,111, + 114,32,99,111,117,108,100,32,98,101,32,115,101,116,32,116, + 111,32,78,111,110,101,10,32,32,32,32,116,111,32,114,101, + 112,114,101,115,101,110,116,32,116,104,97,116,32,105,116,115, + 32,112,114,111,112,101,114,32,118,97,108,117,101,32,105,115, + 32,117,110,107,110,111,119,110,46,10,10,32,32,32,32,114, + 130,0,0,0,114,89,0,0,0,78,122,32,95,95,112,97, + 99,107,97,103,101,95,95,32,33,61,32,95,95,115,112,101, + 99,95,95,46,112,97,114,101,110,116,32,40,122,4,32,33, + 61,32,250,1,41,233,3,0,0,0,41,1,90,10,115,116, + 97,99,107,108,101,118,101,108,122,89,99,97,110,39,116,32, + 114,101,115,111,108,118,101,32,112,97,99,107,97,103,101,32, + 102,114,111,109,32,95,95,115,112,101,99,95,95,32,111,114, + 32,95,95,112,97,99,107,97,103,101,95,95,44,32,102,97, + 108,108,105,110,103,32,98,97,99,107,32,111,110,32,95,95, + 110,97,109,101,95,95,32,97,110,100,32,95,95,112,97,116, + 104,95,95,114,1,0,0,0,114,127,0,0,0,114,117,0, + 0,0,114,19,0,0,0,41,6,114,30,0,0,0,114,119, + 0,0,0,114,167,0,0,0,114,168,0,0,0,114,169,0, + 0,0,114,118,0,0,0,41,3,218,7,103,108,111,98,97, + 108,115,114,161,0,0,0,114,82,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,218,17,95,99,97, + 108,99,95,95,95,112,97,99,107,97,103,101,95,95,252,3, + 0,0,115,30,0,0,0,0,7,10,1,10,1,8,1,18, + 1,22,2,10,1,4,1,8,1,6,2,6,2,10,1,8, + 1,8,1,14,1,114,193,0,0,0,99,5,0,0,0,0, + 0,0,0,9,0,0,0,5,0,0,0,67,0,0,0,115, + 166,0,0,0,124,4,100,1,107,2,114,18,116,0,124,0, + 131,1,125,5,110,36,124,1,100,2,107,9,114,30,124,1, + 110,2,105,0,125,6,116,1,124,6,131,1,125,7,116,0, + 124,0,124,7,124,4,131,3,125,5,124,3,115,150,124,4, + 100,1,107,2,114,84,116,0,124,0,106,2,100,3,131,1, + 100,1,25,0,131,1,83,0,124,0,115,92,124,5,83,0, + 116,3,124,0,131,1,116,3,124,0,106,2,100,3,131,1, + 100,1,25,0,131,1,24,0,125,8,116,4,106,5,124,5, + 106,6,100,2,116,3,124,5,106,6,131,1,124,8,24,0, + 133,2,25,0,25,0,83,0,110,12,116,7,124,5,124,3, + 116,0,131,3,83,0,100,2,83,0,41,4,97,215,1,0, + 0,73,109,112,111,114,116,32,97,32,109,111,100,117,108,101, + 46,10,10,32,32,32,32,84,104,101,32,39,103,108,111,98, + 97,108,115,39,32,97,114,103,117,109,101,110,116,32,105,115, + 32,117,115,101,100,32,116,111,32,105,110,102,101,114,32,119, + 104,101,114,101,32,116,104,101,32,105,109,112,111,114,116,32, + 105,115,32,111,99,99,117,114,114,105,110,103,32,102,114,111, + 109,10,32,32,32,32,116,111,32,104,97,110,100,108,101,32, + 114,101,108,97,116,105,118,101,32,105,109,112,111,114,116,115, + 46,32,84,104,101,32,39,108,111,99,97,108,115,39,32,97, + 114,103,117,109,101,110,116,32,105,115,32,105,103,110,111,114, + 101,100,46,32,84,104,101,10,32,32,32,32,39,102,114,111, + 109,108,105,115,116,39,32,97,114,103,117,109,101,110,116,32, + 115,112,101,99,105,102,105,101,115,32,119,104,97,116,32,115, + 104,111,117,108,100,32,101,120,105,115,116,32,97,115,32,97, + 116,116,114,105,98,117,116,101,115,32,111,110,32,116,104,101, + 32,109,111,100,117,108,101,10,32,32,32,32,98,101,105,110, + 103,32,105,109,112,111,114,116,101,100,32,40,101,46,103,46, + 32,96,96,102,114,111,109,32,109,111,100,117,108,101,32,105, + 109,112,111,114,116,32,60,102,114,111,109,108,105,115,116,62, + 96,96,41,46,32,32,84,104,101,32,39,108,101,118,101,108, + 39,10,32,32,32,32,97,114,103,117,109,101,110,116,32,114, + 101,112,114,101,115,101,110,116,115,32,116,104,101,32,112,97, + 99,107,97,103,101,32,108,111,99,97,116,105,111,110,32,116, + 111,32,105,109,112,111,114,116,32,102,114,111,109,32,105,110, + 32,97,32,114,101,108,97,116,105,118,101,10,32,32,32,32, + 105,109,112,111,114,116,32,40,101,46,103,46,32,96,96,102, + 114,111,109,32,46,46,112,107,103,32,105,109,112,111,114,116, + 32,109,111,100,96,96,32,119,111,117,108,100,32,104,97,118, + 101,32,97,32,39,108,101,118,101,108,39,32,111,102,32,50, + 41,46,10,10,32,32,32,32,114,19,0,0,0,78,114,117, + 0,0,0,41,8,114,182,0,0,0,114,193,0,0,0,218, + 9,112,97,114,116,105,116,105,111,110,114,159,0,0,0,114, + 14,0,0,0,114,79,0,0,0,114,1,0,0,0,114,189, + 0,0,0,41,9,114,15,0,0,0,114,192,0,0,0,218, + 6,108,111,99,97,108,115,114,187,0,0,0,114,162,0,0, + 0,114,83,0,0,0,90,8,103,108,111,98,97,108,115,95, + 114,161,0,0,0,90,7,99,117,116,95,111,102,102,114,10, + 0,0,0,114,10,0,0,0,114,11,0,0,0,218,10,95, + 95,105,109,112,111,114,116,95,95,23,4,0,0,115,26,0, + 0,0,0,11,8,1,10,2,16,1,8,1,12,1,4,3, + 8,1,18,1,4,1,4,4,26,3,32,2,114,196,0,0, + 0,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0, + 0,0,67,0,0,0,115,38,0,0,0,116,0,106,1,124, + 0,131,1,125,1,124,1,100,0,107,8,114,30,116,2,100, + 1,124,0,23,0,131,1,130,1,116,3,124,1,131,1,83, + 0,41,2,78,122,25,110,111,32,98,117,105,108,116,45,105, + 110,32,109,111,100,117,108,101,32,110,97,109,101,100,32,41, + 4,114,142,0,0,0,114,146,0,0,0,114,70,0,0,0, + 114,141,0,0,0,41,2,114,15,0,0,0,114,82,0,0, + 0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0, + 218,18,95,98,117,105,108,116,105,110,95,102,114,111,109,95, + 110,97,109,101,58,4,0,0,115,8,0,0,0,0,1,10, + 1,8,1,12,1,114,197,0,0,0,99,2,0,0,0,0, + 0,0,0,12,0,0,0,12,0,0,0,67,0,0,0,115, + 244,0,0,0,124,1,97,0,124,0,97,1,116,2,116,1, + 131,1,125,2,120,86,116,1,106,3,106,4,131,0,68,0, + 93,72,92,2,125,3,125,4,116,5,124,4,124,2,131,2, + 114,28,124,3,116,1,106,6,107,6,114,62,116,7,125,5, + 110,18,116,0,106,8,124,3,131,1,114,28,116,9,125,5, + 110,2,113,28,116,10,124,4,124,5,131,2,125,6,116,11, + 124,6,124,4,131,2,1,0,113,28,87,0,116,1,106,3, + 116,12,25,0,125,7,120,54,100,5,68,0,93,46,125,8, + 124,8,116,1,106,3,107,7,114,144,116,13,124,8,131,1, + 125,9,110,10,116,1,106,3,124,8,25,0,125,9,116,14, + 124,7,124,8,124,9,131,3,1,0,113,120,87,0,121,12, + 116,13,100,2,131,1,125,10,87,0,110,24,4,0,116,15, + 107,10,114,206,1,0,1,0,1,0,100,3,125,10,89,0, + 110,2,88,0,116,14,124,7,100,2,124,10,131,3,1,0, + 116,13,100,4,131,1,125,11,116,14,124,7,100,4,124,11, + 131,3,1,0,100,3,83,0,41,6,122,250,83,101,116,117, + 112,32,105,109,112,111,114,116,108,105,98,32,98,121,32,105, + 109,112,111,114,116,105,110,103,32,110,101,101,100,101,100,32, + 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115, + 32,97,110,100,32,105,110,106,101,99,116,105,110,103,32,116, + 104,101,109,10,32,32,32,32,105,110,116,111,32,116,104,101, + 32,103,108,111,98,97,108,32,110,97,109,101,115,112,97,99, + 101,46,10,10,32,32,32,32,65,115,32,115,121,115,32,105, + 115,32,110,101,101,100,101,100,32,102,111,114,32,115,121,115, + 46,109,111,100,117,108,101,115,32,97,99,99,101,115,115,32, + 97,110,100,32,95,105,109,112,32,105,115,32,110,101,101,100, + 101,100,32,116,111,32,108,111,97,100,32,98,117,105,108,116, + 45,105,110,10,32,32,32,32,109,111,100,117,108,101,115,44, + 32,116,104,111,115,101,32,116,119,111,32,109,111,100,117,108, + 101,115,32,109,117,115,116,32,98,101,32,101,120,112,108,105, + 99,105,116,108,121,32,112,97,115,115,101,100,32,105,110,46, + 10,10,32,32,32,32,114,167,0,0,0,114,20,0,0,0, + 78,114,55,0,0,0,41,1,114,167,0,0,0,41,16,114, + 46,0,0,0,114,14,0,0,0,114,13,0,0,0,114,79, + 0,0,0,218,5,105,116,101,109,115,114,171,0,0,0,114, + 69,0,0,0,114,142,0,0,0,114,75,0,0,0,114,152, + 0,0,0,114,128,0,0,0,114,133,0,0,0,114,1,0, + 0,0,114,197,0,0,0,114,5,0,0,0,114,70,0,0, + 0,41,12,218,10,115,121,115,95,109,111,100,117,108,101,218, + 11,95,105,109,112,95,109,111,100,117,108,101,90,11,109,111, + 100,117,108,101,95,116,121,112,101,114,15,0,0,0,114,83, + 0,0,0,114,93,0,0,0,114,82,0,0,0,90,11,115, + 101,108,102,95,109,111,100,117,108,101,90,12,98,117,105,108, + 116,105,110,95,110,97,109,101,90,14,98,117,105,108,116,105, + 110,95,109,111,100,117,108,101,90,13,116,104,114,101,97,100, + 95,109,111,100,117,108,101,90,14,119,101,97,107,114,101,102, + 95,109,111,100,117,108,101,114,10,0,0,0,114,10,0,0, + 0,114,11,0,0,0,218,6,95,115,101,116,117,112,65,4, + 0,0,115,50,0,0,0,0,9,4,1,4,3,8,1,20, + 1,10,1,10,1,6,1,10,1,6,2,2,1,10,1,14, + 3,10,1,10,1,10,1,10,2,10,1,16,3,2,1,12, + 1,14,2,10,1,12,3,8,1,114,201,0,0,0,99,2, + 0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67, + 0,0,0,115,66,0,0,0,116,0,124,0,124,1,131,2, + 1,0,116,1,106,2,106,3,116,4,131,1,1,0,116,1, + 106,2,106,3,116,5,131,1,1,0,100,1,100,2,108,6, + 125,2,124,2,97,7,124,2,106,8,116,1,106,9,116,10, + 25,0,131,1,1,0,100,2,83,0,41,3,122,50,73,110, + 115,116,97,108,108,32,105,109,112,111,114,116,108,105,98,32, + 97,115,32,116,104,101,32,105,109,112,108,101,109,101,110,116, + 97,116,105,111,110,32,111,102,32,105,109,112,111,114,116,46, + 114,19,0,0,0,78,41,11,114,201,0,0,0,114,14,0, + 0,0,114,166,0,0,0,114,109,0,0,0,114,142,0,0, + 0,114,152,0,0,0,218,26,95,102,114,111,122,101,110,95, + 105,109,112,111,114,116,108,105,98,95,101,120,116,101,114,110, + 97,108,114,115,0,0,0,218,8,95,105,110,115,116,97,108, + 108,114,79,0,0,0,114,1,0,0,0,41,3,114,199,0, + 0,0,114,200,0,0,0,114,202,0,0,0,114,10,0,0, + 0,114,10,0,0,0,114,11,0,0,0,114,203,0,0,0, + 112,4,0,0,115,12,0,0,0,0,2,10,2,12,1,12, + 3,8,1,4,1,114,203,0,0,0,41,2,78,78,41,1, + 78,41,2,78,114,19,0,0,0,41,50,114,3,0,0,0, + 114,115,0,0,0,114,12,0,0,0,114,16,0,0,0,114, + 51,0,0,0,114,29,0,0,0,114,36,0,0,0,114,17, + 0,0,0,114,18,0,0,0,114,41,0,0,0,114,42,0, + 0,0,114,45,0,0,0,114,56,0,0,0,114,58,0,0, + 0,114,68,0,0,0,114,74,0,0,0,114,77,0,0,0, + 114,84,0,0,0,114,95,0,0,0,114,96,0,0,0,114, + 102,0,0,0,114,78,0,0,0,218,6,111,98,106,101,99, + 116,90,9,95,80,79,80,85,76,65,84,69,114,128,0,0, + 0,114,133,0,0,0,114,136,0,0,0,114,91,0,0,0, + 114,80,0,0,0,114,140,0,0,0,114,141,0,0,0,114, + 81,0,0,0,114,142,0,0,0,114,152,0,0,0,114,157, + 0,0,0,114,163,0,0,0,114,165,0,0,0,114,170,0, + 0,0,114,175,0,0,0,90,15,95,69,82,82,95,77,83, + 71,95,80,82,69,70,73,88,114,177,0,0,0,114,180,0, + 0,0,114,181,0,0,0,114,182,0,0,0,114,189,0,0, + 0,114,193,0,0,0,114,196,0,0,0,114,197,0,0,0, + 114,201,0,0,0,114,203,0,0,0,114,10,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,8, + 60,109,111,100,117,108,101,62,8,0,0,0,115,94,0,0, + 0,4,17,4,2,8,8,8,7,4,2,4,3,16,4,14, + 68,14,21,14,19,8,19,8,19,8,11,14,8,8,11,8, + 12,8,16,8,36,14,27,14,101,16,26,6,3,10,45,14, + 60,8,17,8,17,8,25,8,29,8,23,8,16,14,73,14, + 77,14,13,8,9,8,9,10,47,8,20,4,1,8,2,8, + 27,8,6,10,25,8,31,8,27,18,35,8,7,8,47, }; diff --git a/Python/importlib_external.h b/Python/importlib_external.h index f337c8b..1b767c5 100644 --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -1,58 +1,39 @@ /* Auto-generated by Programs/_freeze_importlib.c */ const unsigned char _Py_M__importlib_external[] = { - 99,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0, - 0,64,0,0,0,115,40,3,0,0,100,0,0,90,0,0, - 100,99,0,90,1,0,100,100,0,90,2,0,101,2,0,101, - 1,0,23,90,3,0,100,4,0,100,5,0,132,0,0,90, - 4,0,100,6,0,100,7,0,132,0,0,90,5,0,100,8, - 0,100,9,0,132,0,0,90,6,0,100,10,0,100,11,0, - 132,0,0,90,7,0,100,12,0,100,13,0,132,0,0,90, - 8,0,100,14,0,100,15,0,132,0,0,90,9,0,100,16, - 0,100,17,0,132,0,0,90,10,0,100,18,0,100,19,0, - 132,0,0,90,11,0,100,20,0,100,21,0,132,0,0,90, - 12,0,100,22,0,100,23,0,100,24,0,132,1,0,90,13, - 0,101,14,0,101,13,0,106,15,0,131,1,0,90,16,0, - 100,25,0,106,17,0,100,26,0,100,27,0,131,2,0,100, - 28,0,23,90,18,0,101,19,0,106,20,0,101,18,0,100, - 27,0,131,2,0,90,21,0,101,21,0,100,29,0,107,3, - 0,114,236,0,100,30,0,90,22,0,101,23,0,101,22,0, - 131,1,0,130,1,0,100,31,0,106,17,0,100,26,0,100, - 27,0,131,2,0,100,28,0,23,90,24,0,100,32,0,90, - 25,0,100,33,0,90,26,0,100,34,0,103,1,0,90,27, - 0,100,35,0,103,1,0,90,28,0,101,28,0,4,90,29, - 0,90,30,0,100,36,0,100,37,0,100,36,0,100,38,0, - 100,39,0,132,1,1,90,31,0,100,40,0,100,41,0,132, - 0,0,90,32,0,100,42,0,100,43,0,132,0,0,90,33, - 0,100,44,0,100,45,0,132,0,0,90,34,0,100,46,0, - 100,47,0,132,0,0,90,35,0,100,48,0,100,49,0,100, - 50,0,100,51,0,132,0,1,90,36,0,100,52,0,100,53, - 0,132,0,0,90,37,0,100,54,0,100,55,0,132,0,0, - 90,38,0,100,36,0,100,36,0,100,36,0,100,56,0,100, - 57,0,132,3,0,90,39,0,100,36,0,100,36,0,100,36, - 0,100,58,0,100,59,0,132,3,0,90,40,0,100,60,0, - 100,60,0,100,61,0,100,62,0,132,2,0,90,41,0,100, - 63,0,100,64,0,132,0,0,90,42,0,101,43,0,131,0, - 0,90,44,0,100,36,0,100,65,0,100,36,0,100,66,0, - 101,44,0,100,67,0,100,68,0,132,1,2,90,45,0,71, - 100,69,0,100,70,0,132,0,0,100,70,0,131,2,0,90, - 46,0,71,100,71,0,100,72,0,132,0,0,100,72,0,131, - 2,0,90,47,0,71,100,73,0,100,74,0,132,0,0,100, - 74,0,101,47,0,131,3,0,90,48,0,71,100,75,0,100, - 76,0,132,0,0,100,76,0,131,2,0,90,49,0,71,100, - 77,0,100,78,0,132,0,0,100,78,0,101,49,0,101,48, - 0,131,4,0,90,50,0,71,100,79,0,100,80,0,132,0, - 0,100,80,0,101,49,0,101,47,0,131,4,0,90,51,0, - 103,0,0,90,52,0,71,100,81,0,100,82,0,132,0,0, - 100,82,0,101,49,0,101,47,0,131,4,0,90,53,0,71, - 100,83,0,100,84,0,132,0,0,100,84,0,131,2,0,90, - 54,0,71,100,85,0,100,86,0,132,0,0,100,86,0,131, - 2,0,90,55,0,71,100,87,0,100,88,0,132,0,0,100, - 88,0,131,2,0,90,56,0,71,100,89,0,100,90,0,132, - 0,0,100,90,0,131,2,0,90,57,0,100,36,0,100,91, - 0,100,92,0,132,1,0,90,58,0,100,93,0,100,94,0, - 132,0,0,90,59,0,100,95,0,100,96,0,132,0,0,90, - 60,0,100,97,0,100,98,0,132,0,0,90,61,0,100,36, - 0,83,41,101,97,94,1,0,0,67,111,114,101,32,105,109, + 99,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0, + 0,64,0,0,0,115,248,1,0,0,100,0,90,0,100,91, + 90,1,100,92,90,2,101,2,101,1,23,0,90,3,100,4, + 100,5,132,0,90,4,100,6,100,7,132,0,90,5,100,8, + 100,9,132,0,90,6,100,10,100,11,132,0,90,7,100,12, + 100,13,132,0,90,8,100,14,100,15,132,0,90,9,100,16, + 100,17,132,0,90,10,100,18,100,19,132,0,90,11,100,20, + 100,21,132,0,90,12,100,93,100,23,100,24,132,1,90,13, + 101,14,101,13,106,15,131,1,90,16,100,25,106,17,100,26, + 100,27,131,2,100,28,23,0,90,18,101,19,106,20,101,18, + 100,27,131,2,90,21,100,29,90,22,100,30,90,23,100,31, + 103,1,90,24,100,32,103,1,90,25,101,25,4,0,90,26, + 90,27,100,94,100,33,100,34,156,1,100,35,100,36,132,3, + 90,28,100,37,100,38,132,0,90,29,100,39,100,40,132,0, + 90,30,100,41,100,42,132,0,90,31,100,43,100,44,132,0, + 90,32,100,45,100,46,132,0,90,33,100,47,100,48,132,0, + 90,34,100,95,100,49,100,50,132,1,90,35,100,96,100,51, + 100,52,132,1,90,36,100,97,100,54,100,55,132,1,90,37, + 100,56,100,57,132,0,90,38,101,39,131,0,90,40,100,98, + 100,33,101,40,100,58,156,2,100,59,100,60,132,3,90,41, + 71,0,100,61,100,62,132,0,100,62,131,2,90,42,71,0, + 100,63,100,64,132,0,100,64,131,2,90,43,71,0,100,65, + 100,66,132,0,100,66,101,43,131,3,90,44,71,0,100,67, + 100,68,132,0,100,68,131,2,90,45,71,0,100,69,100,70, + 132,0,100,70,101,45,101,44,131,4,90,46,71,0,100,71, + 100,72,132,0,100,72,101,45,101,43,131,4,90,47,103,0, + 90,48,71,0,100,73,100,74,132,0,100,74,101,45,101,43, + 131,4,90,49,71,0,100,75,100,76,132,0,100,76,131,2, + 90,50,71,0,100,77,100,78,132,0,100,78,131,2,90,51, + 71,0,100,79,100,80,132,0,100,80,131,2,90,52,71,0, + 100,81,100,82,132,0,100,82,131,2,90,53,100,99,100,83, + 100,84,132,1,90,54,100,85,100,86,132,0,90,55,100,87, + 100,88,132,0,90,56,100,89,100,90,132,0,90,57,100,33, + 83,0,41,100,97,94,1,0,0,67,111,114,101,32,105,109, 112,108,101,109,101,110,116,97,116,105,111,110,32,111,102,32, 112,97,116,104,45,98,97,115,101,100,32,105,109,112,111,114, 116,46,10,10,84,104,105,115,32,109,111,100,117,108,101,32, @@ -77,490 +58,440 @@ const unsigned char _Py_M__importlib_external[] = { 100,117,108,101,46,10,10,218,3,119,105,110,218,6,99,121, 103,119,105,110,218,6,100,97,114,119,105,110,99,0,0,0, 0,0,0,0,0,1,0,0,0,3,0,0,0,3,0,0, - 0,115,88,0,0,0,116,0,0,106,1,0,106,2,0,116, - 3,0,131,1,0,114,72,0,116,0,0,106,1,0,106,2, - 0,116,4,0,131,1,0,114,45,0,100,1,0,137,0,0, - 110,6,0,100,2,0,137,0,0,135,0,0,102,1,0,100, - 3,0,100,4,0,134,0,0,125,0,0,110,12,0,100,5, - 0,100,4,0,132,0,0,125,0,0,124,0,0,83,41,6, - 78,90,12,80,89,84,72,79,78,67,65,83,69,79,75,115, - 12,0,0,0,80,89,84,72,79,78,67,65,83,69,79,75, - 99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0, - 0,19,0,0,0,115,13,0,0,0,136,0,0,116,0,0, - 106,1,0,107,6,0,83,41,1,122,53,84,114,117,101,32, - 105,102,32,102,105,108,101,110,97,109,101,115,32,109,117,115, - 116,32,98,101,32,99,104,101,99,107,101,100,32,99,97,115, - 101,45,105,110,115,101,110,115,105,116,105,118,101,108,121,46, - 41,2,218,3,95,111,115,90,7,101,110,118,105,114,111,110, - 169,0,41,1,218,3,107,101,121,114,4,0,0,0,250,38, - 60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,105, - 98,46,95,98,111,111,116,115,116,114,97,112,95,101,120,116, - 101,114,110,97,108,62,218,11,95,114,101,108,97,120,95,99, - 97,115,101,37,0,0,0,115,2,0,0,0,0,2,122,37, + 0,115,60,0,0,0,116,0,106,1,106,2,116,3,131,1, + 114,48,116,0,106,1,106,2,116,4,131,1,114,30,100,1, + 137,0,110,4,100,2,137,0,135,0,102,1,100,3,100,4, + 132,8,125,0,110,8,100,5,100,4,132,0,125,0,124,0, + 83,0,41,6,78,90,12,80,89,84,72,79,78,67,65,83, + 69,79,75,115,12,0,0,0,80,89,84,72,79,78,67,65, + 83,69,79,75,99,0,0,0,0,0,0,0,0,0,0,0, + 0,2,0,0,0,19,0,0,0,115,10,0,0,0,136,0, + 116,0,106,1,107,6,83,0,41,1,122,53,84,114,117,101, + 32,105,102,32,102,105,108,101,110,97,109,101,115,32,109,117, + 115,116,32,98,101,32,99,104,101,99,107,101,100,32,99,97, + 115,101,45,105,110,115,101,110,115,105,116,105,118,101,108,121, + 46,41,2,218,3,95,111,115,90,7,101,110,118,105,114,111, + 110,169,0,41,1,218,3,107,101,121,114,4,0,0,0,250, + 38,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108, + 105,98,46,95,98,111,111,116,115,116,114,97,112,95,101,120, + 116,101,114,110,97,108,62,218,11,95,114,101,108,97,120,95, + 99,97,115,101,37,0,0,0,115,2,0,0,0,0,2,122, + 37,95,109,97,107,101,95,114,101,108,97,120,95,99,97,115, + 101,46,60,108,111,99,97,108,115,62,46,95,114,101,108,97, + 120,95,99,97,115,101,99,0,0,0,0,0,0,0,0,0, + 0,0,0,1,0,0,0,83,0,0,0,115,4,0,0,0, + 100,1,83,0,41,2,122,53,84,114,117,101,32,105,102,32, + 102,105,108,101,110,97,109,101,115,32,109,117,115,116,32,98, + 101,32,99,104,101,99,107,101,100,32,99,97,115,101,45,105, + 110,115,101,110,115,105,116,105,118,101,108,121,46,70,114,4, + 0,0,0,114,4,0,0,0,114,4,0,0,0,114,4,0, + 0,0,114,6,0,0,0,114,7,0,0,0,41,0,0,0, + 115,2,0,0,0,0,2,41,5,218,3,115,121,115,218,8, + 112,108,97,116,102,111,114,109,218,10,115,116,97,114,116,115, + 119,105,116,104,218,27,95,67,65,83,69,95,73,78,83,69, + 78,83,73,84,73,86,69,95,80,76,65,84,70,79,82,77, + 83,218,35,95,67,65,83,69,95,73,78,83,69,78,83,73, + 84,73,86,69,95,80,76,65,84,70,79,82,77,83,95,83, + 84,82,95,75,69,89,41,1,114,7,0,0,0,114,4,0, + 0,0,41,1,114,5,0,0,0,114,6,0,0,0,218,16, 95,109,97,107,101,95,114,101,108,97,120,95,99,97,115,101, - 46,60,108,111,99,97,108,115,62,46,95,114,101,108,97,120, - 95,99,97,115,101,99,0,0,0,0,0,0,0,0,0,0, - 0,0,1,0,0,0,83,0,0,0,115,4,0,0,0,100, - 1,0,83,41,2,122,53,84,114,117,101,32,105,102,32,102, - 105,108,101,110,97,109,101,115,32,109,117,115,116,32,98,101, - 32,99,104,101,99,107,101,100,32,99,97,115,101,45,105,110, - 115,101,110,115,105,116,105,118,101,108,121,46,70,114,4,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,7,0,0,0,41,0,0,0,115, - 2,0,0,0,0,2,41,5,218,3,115,121,115,218,8,112, - 108,97,116,102,111,114,109,218,10,115,116,97,114,116,115,119, - 105,116,104,218,27,95,67,65,83,69,95,73,78,83,69,78, - 83,73,84,73,86,69,95,80,76,65,84,70,79,82,77,83, - 218,35,95,67,65,83,69,95,73,78,83,69,78,83,73,84, - 73,86,69,95,80,76,65,84,70,79,82,77,83,95,83,84, - 82,95,75,69,89,41,1,114,7,0,0,0,114,4,0,0, - 0,41,1,114,5,0,0,0,114,6,0,0,0,218,16,95, - 109,97,107,101,95,114,101,108,97,120,95,99,97,115,101,30, - 0,0,0,115,14,0,0,0,0,1,18,1,18,1,9,2, - 6,2,21,4,12,3,114,13,0,0,0,99,1,0,0,0, - 0,0,0,0,1,0,0,0,3,0,0,0,67,0,0,0, - 115,26,0,0,0,116,0,0,124,0,0,131,1,0,100,1, - 0,64,106,1,0,100,2,0,100,3,0,131,2,0,83,41, - 4,122,42,67,111,110,118,101,114,116,32,97,32,51,50,45, - 98,105,116,32,105,110,116,101,103,101,114,32,116,111,32,108, - 105,116,116,108,101,45,101,110,100,105,97,110,46,108,3,0, - 0,0,255,127,255,127,3,0,233,4,0,0,0,218,6,108, - 105,116,116,108,101,41,2,218,3,105,110,116,218,8,116,111, - 95,98,121,116,101,115,41,1,218,1,120,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,218,7,95,119,95,108, - 111,110,103,47,0,0,0,115,2,0,0,0,0,2,114,19, - 0,0,0,99,1,0,0,0,0,0,0,0,1,0,0,0, - 3,0,0,0,67,0,0,0,115,16,0,0,0,116,0,0, - 106,1,0,124,0,0,100,1,0,131,2,0,83,41,2,122, - 47,67,111,110,118,101,114,116,32,52,32,98,121,116,101,115, - 32,105,110,32,108,105,116,116,108,101,45,101,110,100,105,97, - 110,32,116,111,32,97,110,32,105,110,116,101,103,101,114,46, - 114,15,0,0,0,41,2,114,16,0,0,0,218,10,102,114, - 111,109,95,98,121,116,101,115,41,1,90,9,105,110,116,95, - 98,121,116,101,115,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,7,95,114,95,108,111,110,103,52,0,0, - 0,115,2,0,0,0,0,2,114,21,0,0,0,99,0,0, - 0,0,0,0,0,0,1,0,0,0,3,0,0,0,71,0, - 0,0,115,26,0,0,0,116,0,0,106,1,0,100,1,0, - 100,2,0,132,0,0,124,0,0,68,131,1,0,131,1,0, - 83,41,3,122,31,82,101,112,108,97,99,101,109,101,110,116, - 32,102,111,114,32,111,115,46,112,97,116,104,46,106,111,105, - 110,40,41,46,99,1,0,0,0,0,0,0,0,2,0,0, - 0,4,0,0,0,83,0,0,0,115,37,0,0,0,103,0, - 0,124,0,0,93,27,0,125,1,0,124,1,0,114,6,0, - 124,1,0,106,0,0,116,1,0,131,1,0,145,2,0,113, - 6,0,83,114,4,0,0,0,41,2,218,6,114,115,116,114, - 105,112,218,15,112,97,116,104,95,115,101,112,97,114,97,116, - 111,114,115,41,2,218,2,46,48,218,4,112,97,114,116,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,250,10, - 60,108,105,115,116,99,111,109,112,62,59,0,0,0,115,2, - 0,0,0,9,1,122,30,95,112,97,116,104,95,106,111,105, - 110,46,60,108,111,99,97,108,115,62,46,60,108,105,115,116, - 99,111,109,112,62,41,2,218,8,112,97,116,104,95,115,101, - 112,218,4,106,111,105,110,41,1,218,10,112,97,116,104,95, - 112,97,114,116,115,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,10,95,112,97,116,104,95,106,111,105,110, - 57,0,0,0,115,4,0,0,0,0,2,15,1,114,30,0, - 0,0,99,1,0,0,0,0,0,0,0,5,0,0,0,5, - 0,0,0,67,0,0,0,115,134,0,0,0,116,0,0,116, - 1,0,131,1,0,100,1,0,107,2,0,114,52,0,124,0, - 0,106,2,0,116,3,0,131,1,0,92,3,0,125,1,0, - 125,2,0,125,3,0,124,1,0,124,3,0,102,2,0,83, - 120,69,0,116,4,0,124,0,0,131,1,0,68,93,55,0, - 125,4,0,124,4,0,116,1,0,107,6,0,114,65,0,124, - 0,0,106,5,0,124,4,0,100,2,0,100,1,0,131,1, - 1,92,2,0,125,1,0,125,3,0,124,1,0,124,3,0, - 102,2,0,83,113,65,0,87,100,3,0,124,0,0,102,2, - 0,83,41,4,122,32,82,101,112,108,97,99,101,109,101,110, + 30,0,0,0,115,14,0,0,0,0,1,12,1,12,1,6, + 2,4,2,14,4,8,3,114,13,0,0,0,99,1,0,0, + 0,0,0,0,0,1,0,0,0,3,0,0,0,67,0,0, + 0,115,20,0,0,0,116,0,124,0,131,1,100,1,64,0, + 106,1,100,2,100,3,131,2,83,0,41,4,122,42,67,111, + 110,118,101,114,116,32,97,32,51,50,45,98,105,116,32,105, + 110,116,101,103,101,114,32,116,111,32,108,105,116,116,108,101, + 45,101,110,100,105,97,110,46,108,3,0,0,0,255,127,255, + 127,3,0,233,4,0,0,0,218,6,108,105,116,116,108,101, + 41,2,218,3,105,110,116,218,8,116,111,95,98,121,116,101, + 115,41,1,218,1,120,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,218,7,95,119,95,108,111,110,103,47,0, + 0,0,115,2,0,0,0,0,2,114,19,0,0,0,99,1, + 0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,67, + 0,0,0,115,12,0,0,0,116,0,106,1,124,0,100,1, + 131,2,83,0,41,2,122,47,67,111,110,118,101,114,116,32, + 52,32,98,121,116,101,115,32,105,110,32,108,105,116,116,108, + 101,45,101,110,100,105,97,110,32,116,111,32,97,110,32,105, + 110,116,101,103,101,114,46,114,15,0,0,0,41,2,114,16, + 0,0,0,218,10,102,114,111,109,95,98,121,116,101,115,41, + 1,90,9,105,110,116,95,98,121,116,101,115,114,4,0,0, + 0,114,4,0,0,0,114,6,0,0,0,218,7,95,114,95, + 108,111,110,103,52,0,0,0,115,2,0,0,0,0,2,114, + 21,0,0,0,99,0,0,0,0,0,0,0,0,1,0,0, + 0,3,0,0,0,71,0,0,0,115,20,0,0,0,116,0, + 106,1,100,1,100,2,132,0,124,0,68,0,131,1,131,1, + 83,0,41,3,122,31,82,101,112,108,97,99,101,109,101,110, + 116,32,102,111,114,32,111,115,46,112,97,116,104,46,106,111, + 105,110,40,41,46,99,1,0,0,0,0,0,0,0,2,0, + 0,0,4,0,0,0,83,0,0,0,115,26,0,0,0,103, + 0,124,0,93,18,125,1,124,1,114,4,124,1,106,0,116, + 1,131,1,145,2,113,4,83,0,114,4,0,0,0,41,2, + 218,6,114,115,116,114,105,112,218,15,112,97,116,104,95,115, + 101,112,97,114,97,116,111,114,115,41,2,218,2,46,48,218, + 4,112,97,114,116,114,4,0,0,0,114,4,0,0,0,114, + 6,0,0,0,250,10,60,108,105,115,116,99,111,109,112,62, + 59,0,0,0,115,2,0,0,0,6,1,122,30,95,112,97, + 116,104,95,106,111,105,110,46,60,108,111,99,97,108,115,62, + 46,60,108,105,115,116,99,111,109,112,62,41,2,218,8,112, + 97,116,104,95,115,101,112,218,4,106,111,105,110,41,1,218, + 10,112,97,116,104,95,112,97,114,116,115,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,218,10,95,112,97,116, + 104,95,106,111,105,110,57,0,0,0,115,4,0,0,0,0, + 2,10,1,114,30,0,0,0,99,1,0,0,0,0,0,0, + 0,5,0,0,0,5,0,0,0,67,0,0,0,115,96,0, + 0,0,116,0,116,1,131,1,100,1,107,2,114,36,124,0, + 106,2,116,3,131,1,92,3,125,1,125,2,125,3,124,1, + 124,3,102,2,83,0,120,50,116,4,124,0,131,1,68,0, + 93,38,125,4,124,4,116,1,107,6,114,46,124,0,106,5, + 124,4,100,1,100,2,141,2,92,2,125,1,125,3,124,1, + 124,3,102,2,83,0,113,46,87,0,100,3,124,0,102,2, + 83,0,41,4,122,32,82,101,112,108,97,99,101,109,101,110, 116,32,102,111,114,32,111,115,46,112,97,116,104,46,115,112, - 108,105,116,40,41,46,233,1,0,0,0,90,8,109,97,120, - 115,112,108,105,116,218,0,41,6,218,3,108,101,110,114,23, - 0,0,0,218,10,114,112,97,114,116,105,116,105,111,110,114, - 27,0,0,0,218,8,114,101,118,101,114,115,101,100,218,6, - 114,115,112,108,105,116,41,5,218,4,112,97,116,104,90,5, - 102,114,111,110,116,218,1,95,218,4,116,97,105,108,114,18, - 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,11,95,112,97,116,104,95,115,112,108,105,116,63, - 0,0,0,115,16,0,0,0,0,2,18,1,24,1,10,1, - 19,1,12,1,27,1,14,1,114,40,0,0,0,99,1,0, - 0,0,0,0,0,0,1,0,0,0,2,0,0,0,67,0, - 0,0,115,13,0,0,0,116,0,0,106,1,0,124,0,0, - 131,1,0,83,41,1,122,126,83,116,97,116,32,116,104,101, - 32,112,97,116,104,46,10,10,32,32,32,32,77,97,100,101, - 32,97,32,115,101,112,97,114,97,116,101,32,102,117,110,99, - 116,105,111,110,32,116,111,32,109,97,107,101,32,105,116,32, - 101,97,115,105,101,114,32,116,111,32,111,118,101,114,114,105, - 100,101,32,105,110,32,101,120,112,101,114,105,109,101,110,116, - 115,10,32,32,32,32,40,101,46,103,46,32,99,97,99,104, - 101,32,115,116,97,116,32,114,101,115,117,108,116,115,41,46, - 10,10,32,32,32,32,41,2,114,3,0,0,0,90,4,115, - 116,97,116,41,1,114,37,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,218,10,95,112,97,116,104, - 95,115,116,97,116,75,0,0,0,115,2,0,0,0,0,7, - 114,41,0,0,0,99,2,0,0,0,0,0,0,0,3,0, - 0,0,11,0,0,0,67,0,0,0,115,58,0,0,0,121, - 16,0,116,0,0,124,0,0,131,1,0,125,2,0,87,110, - 22,0,4,116,1,0,107,10,0,114,40,0,1,1,1,100, - 1,0,83,89,110,1,0,88,124,2,0,106,2,0,100,2, - 0,64,124,1,0,107,2,0,83,41,3,122,49,84,101,115, - 116,32,119,104,101,116,104,101,114,32,116,104,101,32,112,97, - 116,104,32,105,115,32,116,104,101,32,115,112,101,99,105,102, - 105,101,100,32,109,111,100,101,32,116,121,112,101,46,70,105, - 0,240,0,0,41,3,114,41,0,0,0,218,7,79,83,69, - 114,114,111,114,218,7,115,116,95,109,111,100,101,41,3,114, - 37,0,0,0,218,4,109,111,100,101,90,9,115,116,97,116, - 95,105,110,102,111,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,18,95,112,97,116,104,95,105,115,95,109, - 111,100,101,95,116,121,112,101,85,0,0,0,115,10,0,0, - 0,0,2,3,1,16,1,13,1,9,1,114,45,0,0,0, - 99,1,0,0,0,0,0,0,0,1,0,0,0,3,0,0, - 0,67,0,0,0,115,13,0,0,0,116,0,0,124,0,0, - 100,1,0,131,2,0,83,41,2,122,31,82,101,112,108,97, - 99,101,109,101,110,116,32,102,111,114,32,111,115,46,112,97, - 116,104,46,105,115,102,105,108,101,46,105,0,128,0,0,41, - 1,114,45,0,0,0,41,1,114,37,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,218,12,95,112, - 97,116,104,95,105,115,102,105,108,101,94,0,0,0,115,2, - 0,0,0,0,2,114,46,0,0,0,99,1,0,0,0,0, - 0,0,0,1,0,0,0,3,0,0,0,67,0,0,0,115, - 31,0,0,0,124,0,0,115,18,0,116,0,0,106,1,0, - 131,0,0,125,0,0,116,2,0,124,0,0,100,1,0,131, - 2,0,83,41,2,122,30,82,101,112,108,97,99,101,109,101, - 110,116,32,102,111,114,32,111,115,46,112,97,116,104,46,105, - 115,100,105,114,46,105,0,64,0,0,41,3,114,3,0,0, - 0,218,6,103,101,116,99,119,100,114,45,0,0,0,41,1, - 114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,11,95,112,97,116,104,95,105,115,100,105, - 114,99,0,0,0,115,6,0,0,0,0,2,6,1,12,1, - 114,48,0,0,0,105,182,1,0,0,99,3,0,0,0,0, - 0,0,0,6,0,0,0,17,0,0,0,67,0,0,0,115, - 193,0,0,0,100,1,0,106,0,0,124,0,0,116,1,0, - 124,0,0,131,1,0,131,2,0,125,3,0,116,2,0,106, - 3,0,124,3,0,116,2,0,106,4,0,116,2,0,106,5, - 0,66,116,2,0,106,6,0,66,124,2,0,100,2,0,64, - 131,3,0,125,4,0,121,61,0,116,7,0,106,8,0,124, - 4,0,100,3,0,131,2,0,143,20,0,125,5,0,124,5, - 0,106,9,0,124,1,0,131,1,0,1,87,100,4,0,81, - 82,88,116,2,0,106,10,0,124,3,0,124,0,0,131,2, - 0,1,87,110,59,0,4,116,11,0,107,10,0,114,188,0, - 1,1,1,121,17,0,116,2,0,106,12,0,124,3,0,131, - 1,0,1,87,110,18,0,4,116,11,0,107,10,0,114,180, - 0,1,1,1,89,110,1,0,88,130,0,0,89,110,1,0, - 88,100,4,0,83,41,5,122,162,66,101,115,116,45,101,102, - 102,111,114,116,32,102,117,110,99,116,105,111,110,32,116,111, - 32,119,114,105,116,101,32,100,97,116,97,32,116,111,32,97, - 32,112,97,116,104,32,97,116,111,109,105,99,97,108,108,121, - 46,10,32,32,32,32,66,101,32,112,114,101,112,97,114,101, - 100,32,116,111,32,104,97,110,100,108,101,32,97,32,70,105, - 108,101,69,120,105,115,116,115,69,114,114,111,114,32,105,102, - 32,99,111,110,99,117,114,114,101,110,116,32,119,114,105,116, - 105,110,103,32,111,102,32,116,104,101,10,32,32,32,32,116, - 101,109,112,111,114,97,114,121,32,102,105,108,101,32,105,115, - 32,97,116,116,101,109,112,116,101,100,46,122,5,123,125,46, - 123,125,105,182,1,0,0,90,2,119,98,78,41,13,218,6, - 102,111,114,109,97,116,218,2,105,100,114,3,0,0,0,90, - 4,111,112,101,110,90,6,79,95,69,88,67,76,90,7,79, - 95,67,82,69,65,84,90,8,79,95,87,82,79,78,76,89, - 218,3,95,105,111,218,6,70,105,108,101,73,79,218,5,119, - 114,105,116,101,218,7,114,101,112,108,97,99,101,114,42,0, - 0,0,90,6,117,110,108,105,110,107,41,6,114,37,0,0, - 0,218,4,100,97,116,97,114,44,0,0,0,90,8,112,97, - 116,104,95,116,109,112,90,2,102,100,218,4,102,105,108,101, - 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218, - 13,95,119,114,105,116,101,95,97,116,111,109,105,99,106,0, - 0,0,115,26,0,0,0,0,5,24,1,9,1,33,1,3, - 3,21,1,20,1,20,1,13,1,3,1,17,1,13,1,5, - 1,114,57,0,0,0,105,23,13,0,0,233,2,0,0,0, - 114,15,0,0,0,115,2,0,0,0,13,10,105,23,13,13, - 10,122,65,77,97,103,105,99,32,110,117,109,98,101,114,32, - 109,105,115,109,97,116,99,104,32,40,116,104,101,32,105,115, - 115,117,101,50,55,50,56,54,32,119,111,114,107,97,114,111, - 117,110,100,32,105,115,32,102,111,114,32,51,46,53,32,111, - 110,108,121,41,105,22,13,0,0,90,11,95,95,112,121,99, - 97,99,104,101,95,95,122,4,111,112,116,45,122,3,46,112, - 121,122,4,46,112,121,99,78,218,12,111,112,116,105,109,105, - 122,97,116,105,111,110,99,2,0,0,0,1,0,0,0,11, - 0,0,0,6,0,0,0,67,0,0,0,115,87,1,0,0, - 124,1,0,100,1,0,107,9,0,114,76,0,116,0,0,106, - 1,0,100,2,0,116,2,0,131,2,0,1,124,2,0,100, - 1,0,107,9,0,114,58,0,100,3,0,125,3,0,116,3, - 0,124,3,0,131,1,0,130,1,0,124,1,0,114,70,0, - 100,4,0,110,3,0,100,5,0,125,2,0,116,4,0,124, - 0,0,131,1,0,92,2,0,125,4,0,125,5,0,124,5, - 0,106,5,0,100,6,0,131,1,0,92,3,0,125,6,0, - 125,7,0,125,8,0,116,6,0,106,7,0,106,8,0,125, - 9,0,124,9,0,100,1,0,107,8,0,114,154,0,116,9, - 0,100,7,0,131,1,0,130,1,0,100,4,0,106,10,0, - 124,6,0,114,172,0,124,6,0,110,3,0,124,8,0,124, - 7,0,124,9,0,103,3,0,131,1,0,125,10,0,124,2, - 0,100,1,0,107,8,0,114,241,0,116,6,0,106,11,0, - 106,12,0,100,8,0,107,2,0,114,229,0,100,4,0,125, - 2,0,110,12,0,116,6,0,106,11,0,106,12,0,125,2, - 0,116,13,0,124,2,0,131,1,0,125,2,0,124,2,0, - 100,4,0,107,3,0,114,63,1,124,2,0,106,14,0,131, - 0,0,115,42,1,116,15,0,100,9,0,106,16,0,124,2, - 0,131,1,0,131,1,0,130,1,0,100,10,0,106,16,0, - 124,10,0,116,17,0,124,2,0,131,3,0,125,10,0,116, - 18,0,124,4,0,116,19,0,124,10,0,116,20,0,100,8, - 0,25,23,131,3,0,83,41,11,97,254,2,0,0,71,105, - 118,101,110,32,116,104,101,32,112,97,116,104,32,116,111,32, - 97,32,46,112,121,32,102,105,108,101,44,32,114,101,116,117, - 114,110,32,116,104,101,32,112,97,116,104,32,116,111,32,105, - 116,115,32,46,112,121,99,32,102,105,108,101,46,10,10,32, - 32,32,32,84,104,101,32,46,112,121,32,102,105,108,101,32, - 100,111,101,115,32,110,111,116,32,110,101,101,100,32,116,111, - 32,101,120,105,115,116,59,32,116,104,105,115,32,115,105,109, - 112,108,121,32,114,101,116,117,114,110,115,32,116,104,101,32, - 112,97,116,104,32,116,111,32,116,104,101,10,32,32,32,32, - 46,112,121,99,32,102,105,108,101,32,99,97,108,99,117,108, - 97,116,101,100,32,97,115,32,105,102,32,116,104,101,32,46, - 112,121,32,102,105,108,101,32,119,101,114,101,32,105,109,112, - 111,114,116,101,100,46,10,10,32,32,32,32,84,104,101,32, - 39,111,112,116,105,109,105,122,97,116,105,111,110,39,32,112, - 97,114,97,109,101,116,101,114,32,99,111,110,116,114,111,108, - 115,32,116,104,101,32,112,114,101,115,117,109,101,100,32,111, - 112,116,105,109,105,122,97,116,105,111,110,32,108,101,118,101, - 108,32,111,102,10,32,32,32,32,116,104,101,32,98,121,116, - 101,99,111,100,101,32,102,105,108,101,46,32,73,102,32,39, - 111,112,116,105,109,105,122,97,116,105,111,110,39,32,105,115, - 32,110,111,116,32,78,111,110,101,44,32,116,104,101,32,115, - 116,114,105,110,103,32,114,101,112,114,101,115,101,110,116,97, - 116,105,111,110,10,32,32,32,32,111,102,32,116,104,101,32, - 97,114,103,117,109,101,110,116,32,105,115,32,116,97,107,101, - 110,32,97,110,100,32,118,101,114,105,102,105,101,100,32,116, - 111,32,98,101,32,97,108,112,104,97,110,117,109,101,114,105, - 99,32,40,101,108,115,101,32,86,97,108,117,101,69,114,114, - 111,114,10,32,32,32,32,105,115,32,114,97,105,115,101,100, - 41,46,10,10,32,32,32,32,84,104,101,32,100,101,98,117, - 103,95,111,118,101,114,114,105,100,101,32,112,97,114,97,109, - 101,116,101,114,32,105,115,32,100,101,112,114,101,99,97,116, - 101,100,46,32,73,102,32,100,101,98,117,103,95,111,118,101, - 114,114,105,100,101,32,105,115,32,110,111,116,32,78,111,110, - 101,44,10,32,32,32,32,97,32,84,114,117,101,32,118,97, - 108,117,101,32,105,115,32,116,104,101,32,115,97,109,101,32, - 97,115,32,115,101,116,116,105,110,103,32,39,111,112,116,105, - 109,105,122,97,116,105,111,110,39,32,116,111,32,116,104,101, - 32,101,109,112,116,121,32,115,116,114,105,110,103,10,32,32, - 32,32,119,104,105,108,101,32,97,32,70,97,108,115,101,32, - 118,97,108,117,101,32,105,115,32,101,113,117,105,118,97,108, - 101,110,116,32,116,111,32,115,101,116,116,105,110,103,32,39, - 111,112,116,105,109,105,122,97,116,105,111,110,39,32,116,111, - 32,39,49,39,46,10,10,32,32,32,32,73,102,32,115,121, - 115,46,105,109,112,108,101,109,101,110,116,97,116,105,111,110, - 46,99,97,99,104,101,95,116,97,103,32,105,115,32,78,111, - 110,101,32,116,104,101,110,32,78,111,116,73,109,112,108,101, - 109,101,110,116,101,100,69,114,114,111,114,32,105,115,32,114, - 97,105,115,101,100,46,10,10,32,32,32,32,78,122,70,116, - 104,101,32,100,101,98,117,103,95,111,118,101,114,114,105,100, - 101,32,112,97,114,97,109,101,116,101,114,32,105,115,32,100, - 101,112,114,101,99,97,116,101,100,59,32,117,115,101,32,39, - 111,112,116,105,109,105,122,97,116,105,111,110,39,32,105,110, - 115,116,101,97,100,122,50,100,101,98,117,103,95,111,118,101, - 114,114,105,100,101,32,111,114,32,111,112,116,105,109,105,122, - 97,116,105,111,110,32,109,117,115,116,32,98,101,32,115,101, - 116,32,116,111,32,78,111,110,101,114,32,0,0,0,114,31, - 0,0,0,218,1,46,122,36,115,121,115,46,105,109,112,108, - 101,109,101,110,116,97,116,105,111,110,46,99,97,99,104,101, - 95,116,97,103,32,105,115,32,78,111,110,101,233,0,0,0, - 0,122,24,123,33,114,125,32,105,115,32,110,111,116,32,97, - 108,112,104,97,110,117,109,101,114,105,99,122,7,123,125,46, - 123,125,123,125,41,21,218,9,95,119,97,114,110,105,110,103, - 115,218,4,119,97,114,110,218,18,68,101,112,114,101,99,97, - 116,105,111,110,87,97,114,110,105,110,103,218,9,84,121,112, - 101,69,114,114,111,114,114,40,0,0,0,114,34,0,0,0, - 114,8,0,0,0,218,14,105,109,112,108,101,109,101,110,116, - 97,116,105,111,110,218,9,99,97,99,104,101,95,116,97,103, - 218,19,78,111,116,73,109,112,108,101,109,101,110,116,101,100, - 69,114,114,111,114,114,28,0,0,0,218,5,102,108,97,103, - 115,218,8,111,112,116,105,109,105,122,101,218,3,115,116,114, - 218,7,105,115,97,108,110,117,109,218,10,86,97,108,117,101, - 69,114,114,111,114,114,49,0,0,0,218,4,95,79,80,84, - 114,30,0,0,0,218,8,95,80,89,67,65,67,72,69,218, - 17,66,89,84,69,67,79,68,69,95,83,85,70,70,73,88, - 69,83,41,11,114,37,0,0,0,90,14,100,101,98,117,103, - 95,111,118,101,114,114,105,100,101,114,59,0,0,0,218,7, - 109,101,115,115,97,103,101,218,4,104,101,97,100,114,39,0, - 0,0,90,4,98,97,115,101,218,3,115,101,112,218,4,114, - 101,115,116,90,3,116,97,103,90,15,97,108,109,111,115,116, - 95,102,105,108,101,110,97,109,101,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,218,17,99,97,99,104,101,95, - 102,114,111,109,95,115,111,117,114,99,101,20,1,0,0,115, - 46,0,0,0,0,18,12,1,9,1,7,1,12,1,6,1, - 12,1,18,1,18,1,24,1,12,1,12,1,12,1,36,1, - 12,1,18,1,9,2,12,1,12,1,12,1,12,1,21,1, - 21,1,114,81,0,0,0,99,1,0,0,0,0,0,0,0, - 8,0,0,0,5,0,0,0,67,0,0,0,115,62,1,0, - 0,116,0,0,106,1,0,106,2,0,100,1,0,107,8,0, - 114,30,0,116,3,0,100,2,0,131,1,0,130,1,0,116, - 4,0,124,0,0,131,1,0,92,2,0,125,1,0,125,2, - 0,116,4,0,124,1,0,131,1,0,92,2,0,125,1,0, - 125,3,0,124,3,0,116,5,0,107,3,0,114,102,0,116, - 6,0,100,3,0,106,7,0,116,5,0,124,0,0,131,2, - 0,131,1,0,130,1,0,124,2,0,106,8,0,100,4,0, - 131,1,0,125,4,0,124,4,0,100,11,0,107,7,0,114, - 153,0,116,6,0,100,7,0,106,7,0,124,2,0,131,1, - 0,131,1,0,130,1,0,110,125,0,124,4,0,100,6,0, - 107,2,0,114,22,1,124,2,0,106,9,0,100,4,0,100, - 5,0,131,2,0,100,12,0,25,125,5,0,124,5,0,106, - 10,0,116,11,0,131,1,0,115,223,0,116,6,0,100,8, - 0,106,7,0,116,11,0,131,1,0,131,1,0,130,1,0, - 124,5,0,116,12,0,116,11,0,131,1,0,100,1,0,133, - 2,0,25,125,6,0,124,6,0,106,13,0,131,0,0,115, - 22,1,116,6,0,100,9,0,106,7,0,124,5,0,131,1, - 0,131,1,0,130,1,0,124,2,0,106,14,0,100,4,0, - 131,1,0,100,10,0,25,125,7,0,116,15,0,124,1,0, - 124,7,0,116,16,0,100,10,0,25,23,131,2,0,83,41, - 13,97,110,1,0,0,71,105,118,101,110,32,116,104,101,32, - 112,97,116,104,32,116,111,32,97,32,46,112,121,99,46,32, - 102,105,108,101,44,32,114,101,116,117,114,110,32,116,104,101, - 32,112,97,116,104,32,116,111,32,105,116,115,32,46,112,121, - 32,102,105,108,101,46,10,10,32,32,32,32,84,104,101,32, - 46,112,121,99,32,102,105,108,101,32,100,111,101,115,32,110, - 111,116,32,110,101,101,100,32,116,111,32,101,120,105,115,116, - 59,32,116,104,105,115,32,115,105,109,112,108,121,32,114,101, - 116,117,114,110,115,32,116,104,101,32,112,97,116,104,32,116, - 111,10,32,32,32,32,116,104,101,32,46,112,121,32,102,105, - 108,101,32,99,97,108,99,117,108,97,116,101,100,32,116,111, - 32,99,111,114,114,101,115,112,111,110,100,32,116,111,32,116, - 104,101,32,46,112,121,99,32,102,105,108,101,46,32,32,73, - 102,32,112,97,116,104,32,100,111,101,115,10,32,32,32,32, - 110,111,116,32,99,111,110,102,111,114,109,32,116,111,32,80, - 69,80,32,51,49,52,55,47,52,56,56,32,102,111,114,109, - 97,116,44,32,86,97,108,117,101,69,114,114,111,114,32,119, - 105,108,108,32,98,101,32,114,97,105,115,101,100,46,32,73, - 102,10,32,32,32,32,115,121,115,46,105,109,112,108,101,109, - 101,110,116,97,116,105,111,110,46,99,97,99,104,101,95,116, - 97,103,32,105,115,32,78,111,110,101,32,116,104,101,110,32, - 78,111,116,73,109,112,108,101,109,101,110,116,101,100,69,114, - 114,111,114,32,105,115,32,114,97,105,115,101,100,46,10,10, - 32,32,32,32,78,122,36,115,121,115,46,105,109,112,108,101, - 109,101,110,116,97,116,105,111,110,46,99,97,99,104,101,95, - 116,97,103,32,105,115,32,78,111,110,101,122,37,123,125,32, - 110,111,116,32,98,111,116,116,111,109,45,108,101,118,101,108, - 32,100,105,114,101,99,116,111,114,121,32,105,110,32,123,33, - 114,125,114,60,0,0,0,114,58,0,0,0,233,3,0,0, - 0,122,33,101,120,112,101,99,116,101,100,32,111,110,108,121, - 32,50,32,111,114,32,51,32,100,111,116,115,32,105,110,32, - 123,33,114,125,122,57,111,112,116,105,109,105,122,97,116,105, - 111,110,32,112,111,114,116,105,111,110,32,111,102,32,102,105, - 108,101,110,97,109,101,32,100,111,101,115,32,110,111,116,32, - 115,116,97,114,116,32,119,105,116,104,32,123,33,114,125,122, - 52,111,112,116,105,109,105,122,97,116,105,111,110,32,108,101, - 118,101,108,32,123,33,114,125,32,105,115,32,110,111,116,32, - 97,110,32,97,108,112,104,97,110,117,109,101,114,105,99,32, - 118,97,108,117,101,114,61,0,0,0,62,2,0,0,0,114, - 58,0,0,0,114,82,0,0,0,233,254,255,255,255,41,17, - 114,8,0,0,0,114,66,0,0,0,114,67,0,0,0,114, - 68,0,0,0,114,40,0,0,0,114,75,0,0,0,114,73, - 0,0,0,114,49,0,0,0,218,5,99,111,117,110,116,114, - 36,0,0,0,114,10,0,0,0,114,74,0,0,0,114,33, - 0,0,0,114,72,0,0,0,218,9,112,97,114,116,105,116, - 105,111,110,114,30,0,0,0,218,15,83,79,85,82,67,69, - 95,83,85,70,70,73,88,69,83,41,8,114,37,0,0,0, - 114,78,0,0,0,90,16,112,121,99,97,99,104,101,95,102, - 105,108,101,110,97,109,101,90,7,112,121,99,97,99,104,101, - 90,9,100,111,116,95,99,111,117,110,116,114,59,0,0,0, - 90,9,111,112,116,95,108,101,118,101,108,90,13,98,97,115, - 101,95,102,105,108,101,110,97,109,101,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,218,17,115,111,117,114,99, - 101,95,102,114,111,109,95,99,97,99,104,101,64,1,0,0, - 115,44,0,0,0,0,9,18,1,12,1,18,1,18,1,12, - 1,9,1,15,1,15,1,12,1,9,1,15,1,12,1,22, - 1,15,1,9,1,12,1,22,1,12,1,9,1,12,1,19, - 1,114,87,0,0,0,99,1,0,0,0,0,0,0,0,5, - 0,0,0,12,0,0,0,67,0,0,0,115,164,0,0,0, - 116,0,0,124,0,0,131,1,0,100,1,0,107,2,0,114, - 22,0,100,2,0,83,124,0,0,106,1,0,100,3,0,131, - 1,0,92,3,0,125,1,0,125,2,0,125,3,0,124,1, - 0,12,115,81,0,124,3,0,106,2,0,131,0,0,100,7, - 0,100,8,0,133,2,0,25,100,6,0,107,3,0,114,85, - 0,124,0,0,83,121,16,0,116,3,0,124,0,0,131,1, - 0,125,4,0,87,110,40,0,4,116,4,0,116,5,0,102, - 2,0,107,10,0,114,143,0,1,1,1,124,0,0,100,2, - 0,100,9,0,133,2,0,25,125,4,0,89,110,1,0,88, - 116,6,0,124,4,0,131,1,0,114,160,0,124,4,0,83, - 124,0,0,83,41,10,122,188,67,111,110,118,101,114,116,32, - 97,32,98,121,116,101,99,111,100,101,32,102,105,108,101,32, - 112,97,116,104,32,116,111,32,97,32,115,111,117,114,99,101, - 32,112,97,116,104,32,40,105,102,32,112,111,115,115,105,98, - 108,101,41,46,10,10,32,32,32,32,84,104,105,115,32,102, - 117,110,99,116,105,111,110,32,101,120,105,115,116,115,32,112, - 117,114,101,108,121,32,102,111,114,32,98,97,99,107,119,97, - 114,100,115,45,99,111,109,112,97,116,105,98,105,108,105,116, - 121,32,102,111,114,10,32,32,32,32,80,121,73,109,112,111, - 114,116,95,69,120,101,99,67,111,100,101,77,111,100,117,108, - 101,87,105,116,104,70,105,108,101,110,97,109,101,115,40,41, - 32,105,110,32,116,104,101,32,67,32,65,80,73,46,10,10, - 32,32,32,32,114,61,0,0,0,78,114,60,0,0,0,114, - 82,0,0,0,114,31,0,0,0,90,2,112,121,233,253,255, - 255,255,233,255,255,255,255,114,89,0,0,0,41,7,114,33, - 0,0,0,114,34,0,0,0,218,5,108,111,119,101,114,114, - 87,0,0,0,114,68,0,0,0,114,73,0,0,0,114,46, - 0,0,0,41,5,218,13,98,121,116,101,99,111,100,101,95, - 112,97,116,104,114,80,0,0,0,114,38,0,0,0,90,9, - 101,120,116,101,110,115,105,111,110,218,11,115,111,117,114,99, - 101,95,112,97,116,104,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,218,15,95,103,101,116,95,115,111,117,114, - 99,101,102,105,108,101,97,1,0,0,115,20,0,0,0,0, - 7,18,1,4,1,24,1,35,1,4,1,3,1,16,1,19, - 1,21,1,114,93,0,0,0,99,1,0,0,0,0,0,0, - 0,1,0,0,0,11,0,0,0,67,0,0,0,115,92,0, - 0,0,124,0,0,106,0,0,116,1,0,116,2,0,131,1, - 0,131,1,0,114,59,0,121,14,0,116,3,0,124,0,0, - 131,1,0,83,87,113,88,0,4,116,4,0,107,10,0,114, - 55,0,1,1,1,89,113,88,0,88,110,29,0,124,0,0, - 106,0,0,116,1,0,116,5,0,131,1,0,131,1,0,114, - 84,0,124,0,0,83,100,0,0,83,100,0,0,83,41,1, - 78,41,6,218,8,101,110,100,115,119,105,116,104,218,5,116, - 117,112,108,101,114,86,0,0,0,114,81,0,0,0,114,68, - 0,0,0,114,76,0,0,0,41,1,218,8,102,105,108,101, - 110,97,109,101,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,218,11,95,103,101,116,95,99,97,99,104,101,100, - 116,1,0,0,115,16,0,0,0,0,1,21,1,3,1,14, - 1,13,1,8,1,21,1,4,2,114,97,0,0,0,99,1, - 0,0,0,0,0,0,0,2,0,0,0,11,0,0,0,67, - 0,0,0,115,60,0,0,0,121,19,0,116,0,0,124,0, - 0,131,1,0,106,1,0,125,1,0,87,110,24,0,4,116, - 2,0,107,10,0,114,45,0,1,1,1,100,1,0,125,1, - 0,89,110,1,0,88,124,1,0,100,2,0,79,125,1,0, - 124,1,0,83,41,3,122,51,67,97,108,99,117,108,97,116, - 101,32,116,104,101,32,109,111,100,101,32,112,101,114,109,105, - 115,115,105,111,110,115,32,102,111,114,32,97,32,98,121,116, - 101,99,111,100,101,32,102,105,108,101,46,105,182,1,0,0, - 233,128,0,0,0,41,3,114,41,0,0,0,114,43,0,0, - 0,114,42,0,0,0,41,2,114,37,0,0,0,114,44,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,10,95,99,97,108,99,95,109,111,100,101,128,1,0, - 0,115,12,0,0,0,0,2,3,1,19,1,13,1,11,3, - 10,1,114,99,0,0,0,218,9,118,101,114,98,111,115,105, - 116,121,114,31,0,0,0,99,1,0,0,0,1,0,0,0, - 3,0,0,0,4,0,0,0,71,0,0,0,115,75,0,0, - 0,116,0,0,106,1,0,106,2,0,124,1,0,107,5,0, - 114,71,0,124,0,0,106,3,0,100,6,0,131,1,0,115, - 43,0,100,3,0,124,0,0,23,125,0,0,116,4,0,124, - 0,0,106,5,0,124,2,0,140,0,0,100,4,0,116,0, - 0,106,6,0,131,1,1,1,100,5,0,83,41,7,122,61, - 80,114,105,110,116,32,116,104,101,32,109,101,115,115,97,103, - 101,32,116,111,32,115,116,100,101,114,114,32,105,102,32,45, - 118,47,80,89,84,72,79,78,86,69,82,66,79,83,69,32, - 105,115,32,116,117,114,110,101,100,32,111,110,46,250,1,35, - 250,7,105,109,112,111,114,116,32,122,2,35,32,114,56,0, - 0,0,78,41,2,114,101,0,0,0,114,102,0,0,0,41, - 7,114,8,0,0,0,114,69,0,0,0,218,7,118,101,114, - 98,111,115,101,114,10,0,0,0,218,5,112,114,105,110,116, - 114,49,0,0,0,218,6,115,116,100,101,114,114,41,3,114, - 77,0,0,0,114,100,0,0,0,218,4,97,114,103,115,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,16, - 95,118,101,114,98,111,115,101,95,109,101,115,115,97,103,101, - 140,1,0,0,115,8,0,0,0,0,2,18,1,15,1,10, - 1,114,107,0,0,0,99,1,0,0,0,0,0,0,0,3, - 0,0,0,11,0,0,0,3,0,0,0,115,84,0,0,0, - 100,1,0,135,0,0,102,1,0,100,2,0,100,3,0,134, - 1,0,125,1,0,121,13,0,116,0,0,106,1,0,125,2, - 0,87,110,30,0,4,116,2,0,107,10,0,114,66,0,1, - 1,1,100,4,0,100,5,0,132,0,0,125,2,0,89,110, - 1,0,88,124,2,0,124,1,0,136,0,0,131,2,0,1, - 124,1,0,83,41,6,122,252,68,101,99,111,114,97,116,111, + 108,105,116,40,41,46,233,1,0,0,0,41,1,90,8,109, + 97,120,115,112,108,105,116,218,0,41,6,218,3,108,101,110, + 114,23,0,0,0,218,10,114,112,97,114,116,105,116,105,111, + 110,114,27,0,0,0,218,8,114,101,118,101,114,115,101,100, + 218,6,114,115,112,108,105,116,41,5,218,4,112,97,116,104, + 90,5,102,114,111,110,116,218,1,95,218,4,116,97,105,108, + 114,18,0,0,0,114,4,0,0,0,114,4,0,0,0,114, + 6,0,0,0,218,11,95,112,97,116,104,95,115,112,108,105, + 116,63,0,0,0,115,16,0,0,0,0,2,12,1,16,1, + 8,1,14,1,8,1,18,1,12,1,114,40,0,0,0,99, + 1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0, + 67,0,0,0,115,10,0,0,0,116,0,106,1,124,0,131, + 1,83,0,41,1,122,126,83,116,97,116,32,116,104,101,32, + 112,97,116,104,46,10,10,32,32,32,32,77,97,100,101,32, + 97,32,115,101,112,97,114,97,116,101,32,102,117,110,99,116, + 105,111,110,32,116,111,32,109,97,107,101,32,105,116,32,101, + 97,115,105,101,114,32,116,111,32,111,118,101,114,114,105,100, + 101,32,105,110,32,101,120,112,101,114,105,109,101,110,116,115, + 10,32,32,32,32,40,101,46,103,46,32,99,97,99,104,101, + 32,115,116,97,116,32,114,101,115,117,108,116,115,41,46,10, + 10,32,32,32,32,41,2,114,3,0,0,0,90,4,115,116, + 97,116,41,1,114,37,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,6,0,0,0,218,10,95,112,97,116,104,95, + 115,116,97,116,75,0,0,0,115,2,0,0,0,0,7,114, + 41,0,0,0,99,2,0,0,0,0,0,0,0,3,0,0, + 0,11,0,0,0,67,0,0,0,115,48,0,0,0,121,12, + 116,0,124,0,131,1,125,2,87,0,110,20,4,0,116,1, + 107,10,114,32,1,0,1,0,1,0,100,1,83,0,88,0, + 124,2,106,2,100,2,64,0,124,1,107,2,83,0,41,3, + 122,49,84,101,115,116,32,119,104,101,116,104,101,114,32,116, + 104,101,32,112,97,116,104,32,105,115,32,116,104,101,32,115, + 112,101,99,105,102,105,101,100,32,109,111,100,101,32,116,121, + 112,101,46,70,105,0,240,0,0,41,3,114,41,0,0,0, + 218,7,79,83,69,114,114,111,114,218,7,115,116,95,109,111, + 100,101,41,3,114,37,0,0,0,218,4,109,111,100,101,90, + 9,115,116,97,116,95,105,110,102,111,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,218,18,95,112,97,116,104, + 95,105,115,95,109,111,100,101,95,116,121,112,101,85,0,0, + 0,115,10,0,0,0,0,2,2,1,12,1,14,1,6,1, + 114,45,0,0,0,99,1,0,0,0,0,0,0,0,1,0, + 0,0,3,0,0,0,67,0,0,0,115,10,0,0,0,116, + 0,124,0,100,1,131,2,83,0,41,2,122,31,82,101,112, + 108,97,99,101,109,101,110,116,32,102,111,114,32,111,115,46, + 112,97,116,104,46,105,115,102,105,108,101,46,105,0,128,0, + 0,41,1,114,45,0,0,0,41,1,114,37,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,12, + 95,112,97,116,104,95,105,115,102,105,108,101,94,0,0,0, + 115,2,0,0,0,0,2,114,46,0,0,0,99,1,0,0, + 0,0,0,0,0,1,0,0,0,3,0,0,0,67,0,0, + 0,115,22,0,0,0,124,0,115,12,116,0,106,1,131,0, + 125,0,116,2,124,0,100,1,131,2,83,0,41,2,122,30, + 82,101,112,108,97,99,101,109,101,110,116,32,102,111,114,32, + 111,115,46,112,97,116,104,46,105,115,100,105,114,46,105,0, + 64,0,0,41,3,114,3,0,0,0,218,6,103,101,116,99, + 119,100,114,45,0,0,0,41,1,114,37,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,218,11,95, + 112,97,116,104,95,105,115,100,105,114,99,0,0,0,115,6, + 0,0,0,0,2,4,1,8,1,114,48,0,0,0,233,182, + 1,0,0,99,3,0,0,0,0,0,0,0,6,0,0,0, + 17,0,0,0,67,0,0,0,115,162,0,0,0,100,1,106, + 0,124,0,116,1,124,0,131,1,131,2,125,3,116,2,106, + 3,124,3,116,2,106,4,116,2,106,5,66,0,116,2,106, + 6,66,0,124,2,100,2,64,0,131,3,125,4,121,50,116, + 7,106,8,124,4,100,3,131,2,143,16,125,5,124,5,106, + 9,124,1,131,1,1,0,87,0,100,4,81,0,82,0,88, + 0,116,2,106,10,124,3,124,0,131,2,1,0,87,0,110, + 58,4,0,116,11,107,10,114,156,1,0,1,0,1,0,121, + 14,116,2,106,12,124,3,131,1,1,0,87,0,110,20,4, + 0,116,11,107,10,114,148,1,0,1,0,1,0,89,0,110, + 2,88,0,130,0,89,0,110,2,88,0,100,4,83,0,41, + 5,122,162,66,101,115,116,45,101,102,102,111,114,116,32,102, + 117,110,99,116,105,111,110,32,116,111,32,119,114,105,116,101, + 32,100,97,116,97,32,116,111,32,97,32,112,97,116,104,32, + 97,116,111,109,105,99,97,108,108,121,46,10,32,32,32,32, + 66,101,32,112,114,101,112,97,114,101,100,32,116,111,32,104, + 97,110,100,108,101,32,97,32,70,105,108,101,69,120,105,115, + 116,115,69,114,114,111,114,32,105,102,32,99,111,110,99,117, + 114,114,101,110,116,32,119,114,105,116,105,110,103,32,111,102, + 32,116,104,101,10,32,32,32,32,116,101,109,112,111,114,97, + 114,121,32,102,105,108,101,32,105,115,32,97,116,116,101,109, + 112,116,101,100,46,122,5,123,125,46,123,125,105,182,1,0, + 0,90,2,119,98,78,41,13,218,6,102,111,114,109,97,116, + 218,2,105,100,114,3,0,0,0,90,4,111,112,101,110,90, + 6,79,95,69,88,67,76,90,7,79,95,67,82,69,65,84, + 90,8,79,95,87,82,79,78,76,89,218,3,95,105,111,218, + 6,70,105,108,101,73,79,218,5,119,114,105,116,101,218,7, + 114,101,112,108,97,99,101,114,42,0,0,0,90,6,117,110, + 108,105,110,107,41,6,114,37,0,0,0,218,4,100,97,116, + 97,114,44,0,0,0,90,8,112,97,116,104,95,116,109,112, + 90,2,102,100,218,4,102,105,108,101,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,218,13,95,119,114,105,116, + 101,95,97,116,111,109,105,99,106,0,0,0,115,26,0,0, + 0,0,5,16,1,6,1,26,1,2,3,14,1,20,1,16, + 1,14,1,2,1,14,1,14,1,6,1,114,58,0,0,0, + 105,51,13,0,0,233,2,0,0,0,114,15,0,0,0,115, + 2,0,0,0,13,10,90,11,95,95,112,121,99,97,99,104, + 101,95,95,122,4,111,112,116,45,122,3,46,112,121,122,4, + 46,112,121,99,78,41,1,218,12,111,112,116,105,109,105,122, + 97,116,105,111,110,99,2,0,0,0,1,0,0,0,11,0, + 0,0,6,0,0,0,67,0,0,0,115,244,0,0,0,124, + 1,100,1,107,9,114,52,116,0,106,1,100,2,116,2,131, + 2,1,0,124,2,100,1,107,9,114,40,100,3,125,3,116, + 3,124,3,131,1,130,1,124,1,114,48,100,4,110,2,100, + 5,125,2,116,4,106,5,124,0,131,1,125,0,116,6,124, + 0,131,1,92,2,125,4,125,5,124,5,106,7,100,6,131, + 1,92,3,125,6,125,7,125,8,116,8,106,9,106,10,125, + 9,124,9,100,1,107,8,114,114,116,11,100,7,131,1,130, + 1,100,4,106,12,124,6,114,126,124,6,110,2,124,8,124, + 7,124,9,103,3,131,1,125,10,124,2,100,1,107,8,114, + 172,116,8,106,13,106,14,100,8,107,2,114,164,100,4,125, + 2,110,8,116,8,106,13,106,14,125,2,116,15,124,2,131, + 1,125,2,124,2,100,4,107,3,114,224,124,2,106,16,131, + 0,115,210,116,17,100,9,106,18,124,2,131,1,131,1,130, + 1,100,10,106,18,124,10,116,19,124,2,131,3,125,10,116, + 20,124,4,116,21,124,10,116,22,100,8,25,0,23,0,131, + 3,83,0,41,11,97,254,2,0,0,71,105,118,101,110,32, + 116,104,101,32,112,97,116,104,32,116,111,32,97,32,46,112, + 121,32,102,105,108,101,44,32,114,101,116,117,114,110,32,116, + 104,101,32,112,97,116,104,32,116,111,32,105,116,115,32,46, + 112,121,99,32,102,105,108,101,46,10,10,32,32,32,32,84, + 104,101,32,46,112,121,32,102,105,108,101,32,100,111,101,115, + 32,110,111,116,32,110,101,101,100,32,116,111,32,101,120,105, + 115,116,59,32,116,104,105,115,32,115,105,109,112,108,121,32, + 114,101,116,117,114,110,115,32,116,104,101,32,112,97,116,104, + 32,116,111,32,116,104,101,10,32,32,32,32,46,112,121,99, + 32,102,105,108,101,32,99,97,108,99,117,108,97,116,101,100, + 32,97,115,32,105,102,32,116,104,101,32,46,112,121,32,102, + 105,108,101,32,119,101,114,101,32,105,109,112,111,114,116,101, + 100,46,10,10,32,32,32,32,84,104,101,32,39,111,112,116, + 105,109,105,122,97,116,105,111,110,39,32,112,97,114,97,109, + 101,116,101,114,32,99,111,110,116,114,111,108,115,32,116,104, + 101,32,112,114,101,115,117,109,101,100,32,111,112,116,105,109, + 105,122,97,116,105,111,110,32,108,101,118,101,108,32,111,102, + 10,32,32,32,32,116,104,101,32,98,121,116,101,99,111,100, + 101,32,102,105,108,101,46,32,73,102,32,39,111,112,116,105, + 109,105,122,97,116,105,111,110,39,32,105,115,32,110,111,116, + 32,78,111,110,101,44,32,116,104,101,32,115,116,114,105,110, + 103,32,114,101,112,114,101,115,101,110,116,97,116,105,111,110, + 10,32,32,32,32,111,102,32,116,104,101,32,97,114,103,117, + 109,101,110,116,32,105,115,32,116,97,107,101,110,32,97,110, + 100,32,118,101,114,105,102,105,101,100,32,116,111,32,98,101, + 32,97,108,112,104,97,110,117,109,101,114,105,99,32,40,101, + 108,115,101,32,86,97,108,117,101,69,114,114,111,114,10,32, + 32,32,32,105,115,32,114,97,105,115,101,100,41,46,10,10, + 32,32,32,32,84,104,101,32,100,101,98,117,103,95,111,118, + 101,114,114,105,100,101,32,112,97,114,97,109,101,116,101,114, + 32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,32, + 73,102,32,100,101,98,117,103,95,111,118,101,114,114,105,100, + 101,32,105,115,32,110,111,116,32,78,111,110,101,44,10,32, + 32,32,32,97,32,84,114,117,101,32,118,97,108,117,101,32, + 105,115,32,116,104,101,32,115,97,109,101,32,97,115,32,115, + 101,116,116,105,110,103,32,39,111,112,116,105,109,105,122,97, + 116,105,111,110,39,32,116,111,32,116,104,101,32,101,109,112, + 116,121,32,115,116,114,105,110,103,10,32,32,32,32,119,104, + 105,108,101,32,97,32,70,97,108,115,101,32,118,97,108,117, + 101,32,105,115,32,101,113,117,105,118,97,108,101,110,116,32, + 116,111,32,115,101,116,116,105,110,103,32,39,111,112,116,105, + 109,105,122,97,116,105,111,110,39,32,116,111,32,39,49,39, + 46,10,10,32,32,32,32,73,102,32,115,121,115,46,105,109, + 112,108,101,109,101,110,116,97,116,105,111,110,46,99,97,99, + 104,101,95,116,97,103,32,105,115,32,78,111,110,101,32,116, + 104,101,110,32,78,111,116,73,109,112,108,101,109,101,110,116, + 101,100,69,114,114,111,114,32,105,115,32,114,97,105,115,101, + 100,46,10,10,32,32,32,32,78,122,70,116,104,101,32,100, + 101,98,117,103,95,111,118,101,114,114,105,100,101,32,112,97, + 114,97,109,101,116,101,114,32,105,115,32,100,101,112,114,101, + 99,97,116,101,100,59,32,117,115,101,32,39,111,112,116,105, + 109,105,122,97,116,105,111,110,39,32,105,110,115,116,101,97, + 100,122,50,100,101,98,117,103,95,111,118,101,114,114,105,100, + 101,32,111,114,32,111,112,116,105,109,105,122,97,116,105,111, + 110,32,109,117,115,116,32,98,101,32,115,101,116,32,116,111, + 32,78,111,110,101,114,32,0,0,0,114,31,0,0,0,218, + 1,46,122,36,115,121,115,46,105,109,112,108,101,109,101,110, + 116,97,116,105,111,110,46,99,97,99,104,101,95,116,97,103, + 32,105,115,32,78,111,110,101,233,0,0,0,0,122,24,123, + 33,114,125,32,105,115,32,110,111,116,32,97,108,112,104,97, + 110,117,109,101,114,105,99,122,7,123,125,46,123,125,123,125, + 41,23,218,9,95,119,97,114,110,105,110,103,115,218,4,119, + 97,114,110,218,18,68,101,112,114,101,99,97,116,105,111,110, + 87,97,114,110,105,110,103,218,9,84,121,112,101,69,114,114, + 111,114,114,3,0,0,0,218,6,102,115,112,97,116,104,114, + 40,0,0,0,114,34,0,0,0,114,8,0,0,0,218,14, + 105,109,112,108,101,109,101,110,116,97,116,105,111,110,218,9, + 99,97,99,104,101,95,116,97,103,218,19,78,111,116,73,109, + 112,108,101,109,101,110,116,101,100,69,114,114,111,114,114,28, + 0,0,0,218,5,102,108,97,103,115,218,8,111,112,116,105, + 109,105,122,101,218,3,115,116,114,218,7,105,115,97,108,110, + 117,109,218,10,86,97,108,117,101,69,114,114,111,114,114,50, + 0,0,0,218,4,95,79,80,84,114,30,0,0,0,218,8, + 95,80,89,67,65,67,72,69,218,17,66,89,84,69,67,79, + 68,69,95,83,85,70,70,73,88,69,83,41,11,114,37,0, + 0,0,90,14,100,101,98,117,103,95,111,118,101,114,114,105, + 100,101,114,60,0,0,0,218,7,109,101,115,115,97,103,101, + 218,4,104,101,97,100,114,39,0,0,0,90,4,98,97,115, + 101,218,3,115,101,112,218,4,114,101,115,116,90,3,116,97, + 103,90,15,97,108,109,111,115,116,95,102,105,108,101,110,97, + 109,101,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,218,17,99,97,99,104,101,95,102,114,111,109,95,115,111, + 117,114,99,101,7,1,0,0,115,48,0,0,0,0,18,8, + 1,6,1,6,1,8,1,4,1,8,1,12,1,10,1,12, + 1,16,1,8,1,8,1,8,1,24,1,8,1,12,1,6, + 2,8,1,8,1,8,1,8,1,14,1,14,1,114,83,0, + 0,0,99,1,0,0,0,0,0,0,0,8,0,0,0,5, + 0,0,0,67,0,0,0,115,230,0,0,0,116,0,106,1, + 106,2,100,1,107,8,114,20,116,3,100,2,131,1,130,1, + 116,4,106,5,124,0,131,1,125,0,116,6,124,0,131,1, + 92,2,125,1,125,2,116,6,124,1,131,1,92,2,125,1, + 125,3,124,3,116,7,107,3,114,78,116,8,100,3,106,9, + 116,7,124,0,131,2,131,1,130,1,124,2,106,10,100,4, + 131,1,125,4,124,4,100,11,107,7,114,112,116,8,100,7, + 106,9,124,2,131,1,131,1,130,1,110,86,124,4,100,6, + 107,2,114,198,124,2,106,11,100,4,100,5,131,2,100,12, + 25,0,125,5,124,5,106,12,116,13,131,1,115,160,116,8, + 100,8,106,9,116,13,131,1,131,1,130,1,124,5,116,14, + 116,13,131,1,100,1,133,2,25,0,125,6,124,6,106,15, + 131,0,115,198,116,8,100,9,106,9,124,5,131,1,131,1, + 130,1,124,2,106,16,100,4,131,1,100,10,25,0,125,7, + 116,17,124,1,124,7,116,18,100,10,25,0,23,0,131,2, + 83,0,41,13,97,110,1,0,0,71,105,118,101,110,32,116, + 104,101,32,112,97,116,104,32,116,111,32,97,32,46,112,121, + 99,46,32,102,105,108,101,44,32,114,101,116,117,114,110,32, + 116,104,101,32,112,97,116,104,32,116,111,32,105,116,115,32, + 46,112,121,32,102,105,108,101,46,10,10,32,32,32,32,84, + 104,101,32,46,112,121,99,32,102,105,108,101,32,100,111,101, + 115,32,110,111,116,32,110,101,101,100,32,116,111,32,101,120, + 105,115,116,59,32,116,104,105,115,32,115,105,109,112,108,121, + 32,114,101,116,117,114,110,115,32,116,104,101,32,112,97,116, + 104,32,116,111,10,32,32,32,32,116,104,101,32,46,112,121, + 32,102,105,108,101,32,99,97,108,99,117,108,97,116,101,100, + 32,116,111,32,99,111,114,114,101,115,112,111,110,100,32,116, + 111,32,116,104,101,32,46,112,121,99,32,102,105,108,101,46, + 32,32,73,102,32,112,97,116,104,32,100,111,101,115,10,32, + 32,32,32,110,111,116,32,99,111,110,102,111,114,109,32,116, + 111,32,80,69,80,32,51,49,52,55,47,52,56,56,32,102, + 111,114,109,97,116,44,32,86,97,108,117,101,69,114,114,111, + 114,32,119,105,108,108,32,98,101,32,114,97,105,115,101,100, + 46,32,73,102,10,32,32,32,32,115,121,115,46,105,109,112, + 108,101,109,101,110,116,97,116,105,111,110,46,99,97,99,104, + 101,95,116,97,103,32,105,115,32,78,111,110,101,32,116,104, + 101,110,32,78,111,116,73,109,112,108,101,109,101,110,116,101, + 100,69,114,114,111,114,32,105,115,32,114,97,105,115,101,100, + 46,10,10,32,32,32,32,78,122,36,115,121,115,46,105,109, + 112,108,101,109,101,110,116,97,116,105,111,110,46,99,97,99, + 104,101,95,116,97,103,32,105,115,32,78,111,110,101,122,37, + 123,125,32,110,111,116,32,98,111,116,116,111,109,45,108,101, + 118,101,108,32,100,105,114,101,99,116,111,114,121,32,105,110, + 32,123,33,114,125,114,61,0,0,0,114,59,0,0,0,233, + 3,0,0,0,122,33,101,120,112,101,99,116,101,100,32,111, + 110,108,121,32,50,32,111,114,32,51,32,100,111,116,115,32, + 105,110,32,123,33,114,125,122,57,111,112,116,105,109,105,122, + 97,116,105,111,110,32,112,111,114,116,105,111,110,32,111,102, + 32,102,105,108,101,110,97,109,101,32,100,111,101,115,32,110, + 111,116,32,115,116,97,114,116,32,119,105,116,104,32,123,33, + 114,125,122,52,111,112,116,105,109,105,122,97,116,105,111,110, + 32,108,101,118,101,108,32,123,33,114,125,32,105,115,32,110, + 111,116,32,97,110,32,97,108,112,104,97,110,117,109,101,114, + 105,99,32,118,97,108,117,101,114,62,0,0,0,62,2,0, + 0,0,114,59,0,0,0,114,84,0,0,0,233,254,255,255, + 255,41,19,114,8,0,0,0,114,68,0,0,0,114,69,0, + 0,0,114,70,0,0,0,114,3,0,0,0,114,67,0,0, + 0,114,40,0,0,0,114,77,0,0,0,114,75,0,0,0, + 114,50,0,0,0,218,5,99,111,117,110,116,114,36,0,0, + 0,114,10,0,0,0,114,76,0,0,0,114,33,0,0,0, + 114,74,0,0,0,218,9,112,97,114,116,105,116,105,111,110, + 114,30,0,0,0,218,15,83,79,85,82,67,69,95,83,85, + 70,70,73,88,69,83,41,8,114,37,0,0,0,114,80,0, + 0,0,90,16,112,121,99,97,99,104,101,95,102,105,108,101, + 110,97,109,101,90,7,112,121,99,97,99,104,101,90,9,100, + 111,116,95,99,111,117,110,116,114,60,0,0,0,90,9,111, + 112,116,95,108,101,118,101,108,90,13,98,97,115,101,95,102, + 105,108,101,110,97,109,101,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,218,17,115,111,117,114,99,101,95,102, + 114,111,109,95,99,97,99,104,101,52,1,0,0,115,46,0, + 0,0,0,9,12,1,8,1,10,1,12,1,12,1,8,1, + 6,1,10,1,10,1,8,1,6,1,10,1,8,1,16,1, + 10,1,6,1,8,1,16,1,8,1,6,1,8,1,14,1, + 114,89,0,0,0,99,1,0,0,0,0,0,0,0,5,0, + 0,0,12,0,0,0,67,0,0,0,115,128,0,0,0,116, + 0,124,0,131,1,100,1,107,2,114,16,100,2,83,0,124, + 0,106,1,100,3,131,1,92,3,125,1,125,2,125,3,124, + 1,12,0,115,58,124,3,106,2,131,0,100,7,100,8,133, + 2,25,0,100,6,107,3,114,62,124,0,83,0,121,12,116, + 3,124,0,131,1,125,4,87,0,110,36,4,0,116,4,116, + 5,102,2,107,10,114,110,1,0,1,0,1,0,124,0,100, + 2,100,9,133,2,25,0,125,4,89,0,110,2,88,0,116, + 6,124,4,131,1,114,124,124,4,83,0,124,0,83,0,41, + 10,122,188,67,111,110,118,101,114,116,32,97,32,98,121,116, + 101,99,111,100,101,32,102,105,108,101,32,112,97,116,104,32, + 116,111,32,97,32,115,111,117,114,99,101,32,112,97,116,104, + 32,40,105,102,32,112,111,115,115,105,98,108,101,41,46,10, + 10,32,32,32,32,84,104,105,115,32,102,117,110,99,116,105, + 111,110,32,101,120,105,115,116,115,32,112,117,114,101,108,121, + 32,102,111,114,32,98,97,99,107,119,97,114,100,115,45,99, + 111,109,112,97,116,105,98,105,108,105,116,121,32,102,111,114, + 10,32,32,32,32,80,121,73,109,112,111,114,116,95,69,120, + 101,99,67,111,100,101,77,111,100,117,108,101,87,105,116,104, + 70,105,108,101,110,97,109,101,115,40,41,32,105,110,32,116, + 104,101,32,67,32,65,80,73,46,10,10,32,32,32,32,114, + 62,0,0,0,78,114,61,0,0,0,114,84,0,0,0,114, + 31,0,0,0,90,2,112,121,233,253,255,255,255,233,255,255, + 255,255,114,91,0,0,0,41,7,114,33,0,0,0,114,34, + 0,0,0,218,5,108,111,119,101,114,114,89,0,0,0,114, + 70,0,0,0,114,75,0,0,0,114,46,0,0,0,41,5, + 218,13,98,121,116,101,99,111,100,101,95,112,97,116,104,114, + 82,0,0,0,114,38,0,0,0,90,9,101,120,116,101,110, + 115,105,111,110,218,11,115,111,117,114,99,101,95,112,97,116, + 104,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 218,15,95,103,101,116,95,115,111,117,114,99,101,102,105,108, + 101,86,1,0,0,115,20,0,0,0,0,7,12,1,4,1, + 16,1,26,1,4,1,2,1,12,1,18,1,18,1,114,95, + 0,0,0,99,1,0,0,0,0,0,0,0,1,0,0,0, + 11,0,0,0,67,0,0,0,115,72,0,0,0,124,0,106, + 0,116,1,116,2,131,1,131,1,114,46,121,8,116,3,124, + 0,131,1,83,0,4,0,116,4,107,10,114,42,1,0,1, + 0,1,0,89,0,113,68,88,0,110,22,124,0,106,0,116, + 1,116,5,131,1,131,1,114,64,124,0,83,0,100,0,83, + 0,100,0,83,0,41,1,78,41,6,218,8,101,110,100,115, + 119,105,116,104,218,5,116,117,112,108,101,114,88,0,0,0, + 114,83,0,0,0,114,70,0,0,0,114,78,0,0,0,41, + 1,218,8,102,105,108,101,110,97,109,101,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,218,11,95,103,101,116, + 95,99,97,99,104,101,100,105,1,0,0,115,16,0,0,0, + 0,1,14,1,2,1,8,1,14,1,8,1,14,1,4,2, + 114,99,0,0,0,99,1,0,0,0,0,0,0,0,2,0, + 0,0,11,0,0,0,67,0,0,0,115,52,0,0,0,121, + 14,116,0,124,0,131,1,106,1,125,1,87,0,110,24,4, + 0,116,2,107,10,114,38,1,0,1,0,1,0,100,1,125, + 1,89,0,110,2,88,0,124,1,100,2,79,0,125,1,124, + 1,83,0,41,3,122,51,67,97,108,99,117,108,97,116,101, + 32,116,104,101,32,109,111,100,101,32,112,101,114,109,105,115, + 115,105,111,110,115,32,102,111,114,32,97,32,98,121,116,101, + 99,111,100,101,32,102,105,108,101,46,105,182,1,0,0,233, + 128,0,0,0,41,3,114,41,0,0,0,114,43,0,0,0, + 114,42,0,0,0,41,2,114,37,0,0,0,114,44,0,0, + 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 218,10,95,99,97,108,99,95,109,111,100,101,117,1,0,0, + 115,12,0,0,0,0,2,2,1,14,1,14,1,10,3,8, + 1,114,101,0,0,0,99,1,0,0,0,0,0,0,0,3, + 0,0,0,11,0,0,0,3,0,0,0,115,68,0,0,0, + 100,6,135,0,102,1,100,2,100,3,132,9,125,1,121,10, + 116,0,106,1,125,2,87,0,110,28,4,0,116,2,107,10, + 114,52,1,0,1,0,1,0,100,4,100,5,132,0,125,2, + 89,0,110,2,88,0,124,2,124,1,136,0,131,2,1,0, + 124,1,83,0,41,7,122,252,68,101,99,111,114,97,116,111, 114,32,116,111,32,118,101,114,105,102,121,32,116,104,97,116, 32,116,104,101,32,109,111,100,117,108,101,32,98,101,105,110, 103,32,114,101,113,117,101,115,116,101,100,32,109,97,116,99, @@ -577,1420 +508,1351 @@ const unsigned char _Py_M__importlib_external[] = { 108,115,32,116,104,101,110,32,73,109,112,111,114,116,69,114, 114,111,114,32,105,115,32,114,97,105,115,101,100,46,10,10, 32,32,32,32,78,99,2,0,0,0,0,0,0,0,4,0, - 0,0,5,0,0,0,31,0,0,0,115,89,0,0,0,124, - 1,0,100,0,0,107,8,0,114,24,0,124,0,0,106,0, - 0,125,1,0,110,46,0,124,0,0,106,0,0,124,1,0, - 107,3,0,114,70,0,116,1,0,100,1,0,124,0,0,106, - 0,0,124,1,0,102,2,0,22,100,2,0,124,1,0,131, - 1,1,130,1,0,136,0,0,124,0,0,124,1,0,124,2, - 0,124,3,0,142,2,0,83,41,3,78,122,30,108,111,97, - 100,101,114,32,102,111,114,32,37,115,32,99,97,110,110,111, - 116,32,104,97,110,100,108,101,32,37,115,218,4,110,97,109, - 101,41,2,114,108,0,0,0,218,11,73,109,112,111,114,116, - 69,114,114,111,114,41,4,218,4,115,101,108,102,114,108,0, - 0,0,114,106,0,0,0,90,6,107,119,97,114,103,115,41, - 1,218,6,109,101,116,104,111,100,114,4,0,0,0,114,6, - 0,0,0,218,19,95,99,104,101,99,107,95,110,97,109,101, - 95,119,114,97,112,112,101,114,156,1,0,0,115,12,0,0, - 0,0,1,12,1,12,1,15,1,6,1,25,1,122,40,95, - 99,104,101,99,107,95,110,97,109,101,46,60,108,111,99,97, - 108,115,62,46,95,99,104,101,99,107,95,110,97,109,101,95, - 119,114,97,112,112,101,114,99,2,0,0,0,0,0,0,0, - 3,0,0,0,7,0,0,0,83,0,0,0,115,92,0,0, - 0,120,66,0,100,1,0,100,2,0,100,3,0,100,4,0, - 103,4,0,68,93,46,0,125,2,0,116,0,0,124,1,0, - 124,2,0,131,2,0,114,19,0,116,1,0,124,0,0,124, - 2,0,116,2,0,124,1,0,124,2,0,131,2,0,131,3, - 0,1,113,19,0,87,124,0,0,106,3,0,106,4,0,124, - 1,0,106,3,0,131,1,0,1,100,0,0,83,41,5,78, - 218,10,95,95,109,111,100,117,108,101,95,95,218,8,95,95, - 110,97,109,101,95,95,218,12,95,95,113,117,97,108,110,97, - 109,101,95,95,218,7,95,95,100,111,99,95,95,41,5,218, - 7,104,97,115,97,116,116,114,218,7,115,101,116,97,116,116, - 114,218,7,103,101,116,97,116,116,114,218,8,95,95,100,105, - 99,116,95,95,218,6,117,112,100,97,116,101,41,3,90,3, - 110,101,119,90,3,111,108,100,114,54,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,218,5,95,119, - 114,97,112,167,1,0,0,115,8,0,0,0,0,1,25,1, - 15,1,29,1,122,26,95,99,104,101,99,107,95,110,97,109, - 101,46,60,108,111,99,97,108,115,62,46,95,119,114,97,112, - 41,3,218,10,95,98,111,111,116,115,116,114,97,112,114,122, - 0,0,0,218,9,78,97,109,101,69,114,114,111,114,41,3, - 114,111,0,0,0,114,112,0,0,0,114,122,0,0,0,114, - 4,0,0,0,41,1,114,111,0,0,0,114,6,0,0,0, - 218,11,95,99,104,101,99,107,95,110,97,109,101,148,1,0, - 0,115,14,0,0,0,0,8,21,7,3,1,13,1,13,2, - 17,5,13,1,114,125,0,0,0,99,2,0,0,0,0,0, - 0,0,5,0,0,0,4,0,0,0,67,0,0,0,115,84, - 0,0,0,124,0,0,106,0,0,124,1,0,131,1,0,92, - 2,0,125,2,0,125,3,0,124,2,0,100,1,0,107,8, - 0,114,80,0,116,1,0,124,3,0,131,1,0,114,80,0, - 100,2,0,125,4,0,116,2,0,106,3,0,124,4,0,106, - 4,0,124,3,0,100,3,0,25,131,1,0,116,5,0,131, - 2,0,1,124,2,0,83,41,4,122,155,84,114,121,32,116, - 111,32,102,105,110,100,32,97,32,108,111,97,100,101,114,32, - 102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,101, - 100,32,109,111,100,117,108,101,32,98,121,32,100,101,108,101, - 103,97,116,105,110,103,32,116,111,10,32,32,32,32,115,101, - 108,102,46,102,105,110,100,95,108,111,97,100,101,114,40,41, - 46,10,10,32,32,32,32,84,104,105,115,32,109,101,116,104, - 111,100,32,105,115,32,100,101,112,114,101,99,97,116,101,100, - 32,105,110,32,102,97,118,111,114,32,111,102,32,102,105,110, - 100,101,114,46,102,105,110,100,95,115,112,101,99,40,41,46, - 10,10,32,32,32,32,78,122,44,78,111,116,32,105,109,112, - 111,114,116,105,110,103,32,100,105,114,101,99,116,111,114,121, - 32,123,125,58,32,109,105,115,115,105,110,103,32,95,95,105, - 110,105,116,95,95,114,61,0,0,0,41,6,218,11,102,105, - 110,100,95,108,111,97,100,101,114,114,33,0,0,0,114,62, - 0,0,0,114,63,0,0,0,114,49,0,0,0,218,13,73, - 109,112,111,114,116,87,97,114,110,105,110,103,41,5,114,110, - 0,0,0,218,8,102,117,108,108,110,97,109,101,218,6,108, - 111,97,100,101,114,218,8,112,111,114,116,105,111,110,115,218, - 3,109,115,103,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,218,17,95,102,105,110,100,95,109,111,100,117,108, - 101,95,115,104,105,109,176,1,0,0,115,10,0,0,0,0, - 10,21,1,24,1,6,1,29,1,114,132,0,0,0,99,4, - 0,0,0,0,0,0,0,11,0,0,0,19,0,0,0,67, - 0,0,0,115,252,1,0,0,105,0,0,125,4,0,124,2, - 0,100,1,0,107,9,0,114,31,0,124,2,0,124,4,0, - 100,2,0,60,110,6,0,100,3,0,125,2,0,124,3,0, - 100,1,0,107,9,0,114,59,0,124,3,0,124,4,0,100, - 4,0,60,124,0,0,100,1,0,100,5,0,133,2,0,25, - 125,5,0,124,0,0,100,5,0,100,6,0,133,2,0,25, - 125,6,0,124,0,0,100,6,0,100,7,0,133,2,0,25, - 125,7,0,124,5,0,116,0,0,107,3,0,114,180,0,124, - 5,0,116,1,0,107,3,0,114,180,0,100,8,0,106,2, - 0,124,2,0,124,5,0,131,2,0,125,8,0,116,3,0, - 100,9,0,124,8,0,131,2,0,1,116,4,0,124,8,0, - 124,4,0,141,1,0,130,1,0,110,119,0,116,5,0,124, - 6,0,131,1,0,100,5,0,107,3,0,114,241,0,100,10, - 0,106,2,0,124,2,0,131,1,0,125,8,0,116,3,0, - 100,9,0,124,8,0,131,2,0,1,116,6,0,124,8,0, - 131,1,0,130,1,0,110,58,0,116,5,0,124,7,0,131, - 1,0,100,5,0,107,3,0,114,43,1,100,11,0,106,2, - 0,124,2,0,131,1,0,125,8,0,116,3,0,100,9,0, - 124,8,0,131,2,0,1,116,6,0,124,8,0,131,1,0, - 130,1,0,124,1,0,100,1,0,107,9,0,114,238,1,121, - 20,0,116,7,0,124,1,0,100,12,0,25,131,1,0,125, - 9,0,87,110,18,0,4,116,8,0,107,10,0,114,95,1, - 1,1,1,89,110,62,0,88,116,9,0,124,6,0,131,1, - 0,124,9,0,107,3,0,114,157,1,100,13,0,106,2,0, - 124,2,0,131,1,0,125,8,0,116,3,0,100,9,0,124, - 8,0,131,2,0,1,116,4,0,124,8,0,124,4,0,141, - 1,0,130,1,0,121,18,0,124,1,0,100,14,0,25,100, - 15,0,64,125,10,0,87,110,18,0,4,116,8,0,107,10, - 0,114,195,1,1,1,1,89,110,43,0,88,116,9,0,124, - 7,0,131,1,0,124,10,0,107,3,0,114,238,1,116,4, - 0,100,13,0,106,2,0,124,2,0,131,1,0,124,4,0, - 141,1,0,130,1,0,124,0,0,100,7,0,100,1,0,133, - 2,0,25,83,41,16,97,122,1,0,0,86,97,108,105,100, - 97,116,101,32,116,104,101,32,104,101,97,100,101,114,32,111, - 102,32,116,104,101,32,112,97,115,115,101,100,45,105,110,32, - 98,121,116,101,99,111,100,101,32,97,103,97,105,110,115,116, - 32,115,111,117,114,99,101,95,115,116,97,116,115,32,40,105, - 102,10,32,32,32,32,103,105,118,101,110,41,32,97,110,100, - 32,114,101,116,117,114,110,105,110,103,32,116,104,101,32,98, - 121,116,101,99,111,100,101,32,116,104,97,116,32,99,97,110, - 32,98,101,32,99,111,109,112,105,108,101,100,32,98,121,32, - 99,111,109,112,105,108,101,40,41,46,10,10,32,32,32,32, - 65,108,108,32,111,116,104,101,114,32,97,114,103,117,109,101, - 110,116,115,32,97,114,101,32,117,115,101,100,32,116,111,32, - 101,110,104,97,110,99,101,32,101,114,114,111,114,32,114,101, - 112,111,114,116,105,110,103,46,10,10,32,32,32,32,73,109, - 112,111,114,116,69,114,114,111,114,32,105,115,32,114,97,105, - 115,101,100,32,119,104,101,110,32,116,104,101,32,109,97,103, - 105,99,32,110,117,109,98,101,114,32,105,115,32,105,110,99, - 111,114,114,101,99,116,32,111,114,32,116,104,101,32,98,121, - 116,101,99,111,100,101,32,105,115,10,32,32,32,32,102,111, - 117,110,100,32,116,111,32,98,101,32,115,116,97,108,101,46, - 32,69,79,70,69,114,114,111,114,32,105,115,32,114,97,105, - 115,101,100,32,119,104,101,110,32,116,104,101,32,100,97,116, - 97,32,105,115,32,102,111,117,110,100,32,116,111,32,98,101, - 10,32,32,32,32,116,114,117,110,99,97,116,101,100,46,10, - 10,32,32,32,32,78,114,108,0,0,0,122,10,60,98,121, - 116,101,99,111,100,101,62,114,37,0,0,0,114,14,0,0, - 0,233,8,0,0,0,233,12,0,0,0,122,30,98,97,100, - 32,109,97,103,105,99,32,110,117,109,98,101,114,32,105,110, - 32,123,33,114,125,58,32,123,33,114,125,122,2,123,125,122, - 43,114,101,97,99,104,101,100,32,69,79,70,32,119,104,105, - 108,101,32,114,101,97,100,105,110,103,32,116,105,109,101,115, - 116,97,109,112,32,105,110,32,123,33,114,125,122,48,114,101, - 97,99,104,101,100,32,69,79,70,32,119,104,105,108,101,32, - 114,101,97,100,105,110,103,32,115,105,122,101,32,111,102,32, - 115,111,117,114,99,101,32,105,110,32,123,33,114,125,218,5, - 109,116,105,109,101,122,26,98,121,116,101,99,111,100,101,32, - 105,115,32,115,116,97,108,101,32,102,111,114,32,123,33,114, - 125,218,4,115,105,122,101,108,3,0,0,0,255,127,255,127, - 3,0,41,10,218,12,77,65,71,73,67,95,78,85,77,66, - 69,82,218,24,95,66,65,67,75,67,79,77,80,65,84,95, - 77,65,71,73,67,95,78,85,77,66,69,82,114,49,0,0, - 0,114,107,0,0,0,114,109,0,0,0,114,33,0,0,0, - 218,8,69,79,70,69,114,114,111,114,114,16,0,0,0,218, - 8,75,101,121,69,114,114,111,114,114,21,0,0,0,41,11, - 114,55,0,0,0,218,12,115,111,117,114,99,101,95,115,116, - 97,116,115,114,108,0,0,0,114,37,0,0,0,90,11,101, - 120,99,95,100,101,116,97,105,108,115,90,5,109,97,103,105, - 99,90,13,114,97,119,95,116,105,109,101,115,116,97,109,112, - 90,8,114,97,119,95,115,105,122,101,114,77,0,0,0,218, - 12,115,111,117,114,99,101,95,109,116,105,109,101,218,11,115, - 111,117,114,99,101,95,115,105,122,101,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,218,25,95,118,97,108,105, - 100,97,116,101,95,98,121,116,101,99,111,100,101,95,104,101, - 97,100,101,114,193,1,0,0,115,78,0,0,0,0,11,6, - 1,12,1,13,3,6,1,12,1,10,1,16,1,16,1,16, - 1,12,2,12,1,18,1,13,1,18,1,18,1,15,1,13, - 1,15,1,18,1,15,1,13,1,12,1,12,1,3,1,20, - 1,13,1,5,2,18,1,15,1,13,1,15,1,3,1,18, - 1,13,1,5,2,18,1,15,1,9,1,114,144,0,0,0, - 99,4,0,0,0,0,0,0,0,5,0,0,0,6,0,0, - 0,67,0,0,0,115,112,0,0,0,116,0,0,106,1,0, - 124,0,0,131,1,0,125,4,0,116,2,0,124,4,0,116, - 3,0,131,2,0,114,75,0,116,4,0,100,1,0,124,2, - 0,131,2,0,1,124,3,0,100,2,0,107,9,0,114,71, - 0,116,5,0,106,6,0,124,4,0,124,3,0,131,2,0, - 1,124,4,0,83,116,7,0,100,3,0,106,8,0,124,2, - 0,131,1,0,100,4,0,124,1,0,100,5,0,124,2,0, - 131,1,2,130,1,0,100,2,0,83,41,6,122,60,67,111, - 109,112,105,108,101,32,98,121,116,101,99,111,100,101,32,97, - 115,32,114,101,116,117,114,110,101,100,32,98,121,32,95,118, - 97,108,105,100,97,116,101,95,98,121,116,101,99,111,100,101, - 95,104,101,97,100,101,114,40,41,46,122,21,99,111,100,101, - 32,111,98,106,101,99,116,32,102,114,111,109,32,123,33,114, - 125,78,122,23,78,111,110,45,99,111,100,101,32,111,98,106, - 101,99,116,32,105,110,32,123,33,114,125,114,108,0,0,0, - 114,37,0,0,0,41,9,218,7,109,97,114,115,104,97,108, - 90,5,108,111,97,100,115,218,10,105,115,105,110,115,116,97, - 110,99,101,218,10,95,99,111,100,101,95,116,121,112,101,114, - 107,0,0,0,218,4,95,105,109,112,90,16,95,102,105,120, - 95,99,111,95,102,105,108,101,110,97,109,101,114,109,0,0, - 0,114,49,0,0,0,41,5,114,55,0,0,0,114,108,0, - 0,0,114,91,0,0,0,114,92,0,0,0,218,4,99,111, - 100,101,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,17,95,99,111,109,112,105,108,101,95,98,121,116,101, - 99,111,100,101,250,1,0,0,115,16,0,0,0,0,2,15, - 1,15,1,13,1,12,1,16,1,4,2,18,1,114,150,0, - 0,0,114,61,0,0,0,99,3,0,0,0,0,0,0,0, - 4,0,0,0,3,0,0,0,67,0,0,0,115,76,0,0, - 0,116,0,0,116,1,0,131,1,0,125,3,0,124,3,0, - 106,2,0,116,3,0,124,1,0,131,1,0,131,1,0,1, - 124,3,0,106,2,0,116,3,0,124,2,0,131,1,0,131, - 1,0,1,124,3,0,106,2,0,116,4,0,106,5,0,124, - 0,0,131,1,0,131,1,0,1,124,3,0,83,41,1,122, - 80,67,111,109,112,105,108,101,32,97,32,99,111,100,101,32, - 111,98,106,101,99,116,32,105,110,116,111,32,98,121,116,101, - 99,111,100,101,32,102,111,114,32,119,114,105,116,105,110,103, - 32,111,117,116,32,116,111,32,97,32,98,121,116,101,45,99, - 111,109,112,105,108,101,100,10,32,32,32,32,102,105,108,101, - 46,41,6,218,9,98,121,116,101,97,114,114,97,121,114,137, - 0,0,0,218,6,101,120,116,101,110,100,114,19,0,0,0, - 114,145,0,0,0,90,5,100,117,109,112,115,41,4,114,149, - 0,0,0,114,135,0,0,0,114,143,0,0,0,114,55,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,17,95,99,111,100,101,95,116,111,95,98,121,116,101, - 99,111,100,101,6,2,0,0,115,10,0,0,0,0,3,12, - 1,19,1,19,1,22,1,114,153,0,0,0,99,1,0,0, - 0,0,0,0,0,5,0,0,0,4,0,0,0,67,0,0, - 0,115,89,0,0,0,100,1,0,100,2,0,108,0,0,125, - 1,0,116,1,0,106,2,0,124,0,0,131,1,0,106,3, - 0,125,2,0,124,1,0,106,4,0,124,2,0,131,1,0, - 125,3,0,116,1,0,106,5,0,100,2,0,100,3,0,131, - 2,0,125,4,0,124,4,0,106,6,0,124,0,0,106,6, - 0,124,3,0,100,1,0,25,131,1,0,131,1,0,83,41, - 4,122,121,68,101,99,111,100,101,32,98,121,116,101,115,32, - 114,101,112,114,101,115,101,110,116,105,110,103,32,115,111,117, - 114,99,101,32,99,111,100,101,32,97,110,100,32,114,101,116, - 117,114,110,32,116,104,101,32,115,116,114,105,110,103,46,10, - 10,32,32,32,32,85,110,105,118,101,114,115,97,108,32,110, - 101,119,108,105,110,101,32,115,117,112,112,111,114,116,32,105, - 115,32,117,115,101,100,32,105,110,32,116,104,101,32,100,101, - 99,111,100,105,110,103,46,10,32,32,32,32,114,61,0,0, - 0,78,84,41,7,218,8,116,111,107,101,110,105,122,101,114, - 51,0,0,0,90,7,66,121,116,101,115,73,79,90,8,114, - 101,97,100,108,105,110,101,90,15,100,101,116,101,99,116,95, - 101,110,99,111,100,105,110,103,90,25,73,110,99,114,101,109, - 101,110,116,97,108,78,101,119,108,105,110,101,68,101,99,111, - 100,101,114,218,6,100,101,99,111,100,101,41,5,218,12,115, - 111,117,114,99,101,95,98,121,116,101,115,114,154,0,0,0, - 90,21,115,111,117,114,99,101,95,98,121,116,101,115,95,114, - 101,97,100,108,105,110,101,218,8,101,110,99,111,100,105,110, - 103,90,15,110,101,119,108,105,110,101,95,100,101,99,111,100, - 101,114,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,13,100,101,99,111,100,101,95,115,111,117,114,99,101, - 16,2,0,0,115,10,0,0,0,0,5,12,1,18,1,15, - 1,18,1,114,158,0,0,0,114,129,0,0,0,218,26,115, - 117,98,109,111,100,117,108,101,95,115,101,97,114,99,104,95, - 108,111,99,97,116,105,111,110,115,99,2,0,0,0,2,0, - 0,0,9,0,0,0,19,0,0,0,67,0,0,0,115,89, - 1,0,0,124,1,0,100,1,0,107,8,0,114,73,0,100, - 2,0,125,1,0,116,0,0,124,2,0,100,3,0,131,2, - 0,114,73,0,121,19,0,124,2,0,106,1,0,124,0,0, - 131,1,0,125,1,0,87,110,18,0,4,116,2,0,107,10, - 0,114,72,0,1,1,1,89,110,1,0,88,116,3,0,106, - 4,0,124,0,0,124,2,0,100,4,0,124,1,0,131,2, - 1,125,4,0,100,5,0,124,4,0,95,5,0,124,2,0, - 100,1,0,107,8,0,114,194,0,120,73,0,116,6,0,131, - 0,0,68,93,58,0,92,2,0,125,5,0,125,6,0,124, - 1,0,106,7,0,116,8,0,124,6,0,131,1,0,131,1, - 0,114,128,0,124,5,0,124,0,0,124,1,0,131,2,0, - 125,2,0,124,2,0,124,4,0,95,9,0,80,113,128,0, - 87,100,1,0,83,124,3,0,116,10,0,107,8,0,114,23, - 1,116,0,0,124,2,0,100,6,0,131,2,0,114,32,1, - 121,19,0,124,2,0,106,11,0,124,0,0,131,1,0,125, - 7,0,87,110,18,0,4,116,2,0,107,10,0,114,4,1, - 1,1,1,89,113,32,1,88,124,7,0,114,32,1,103,0, - 0,124,4,0,95,12,0,110,9,0,124,3,0,124,4,0, - 95,12,0,124,4,0,106,12,0,103,0,0,107,2,0,114, - 85,1,124,1,0,114,85,1,116,13,0,124,1,0,131,1, - 0,100,7,0,25,125,8,0,124,4,0,106,12,0,106,14, - 0,124,8,0,131,1,0,1,124,4,0,83,41,8,97,61, - 1,0,0,82,101,116,117,114,110,32,97,32,109,111,100,117, - 108,101,32,115,112,101,99,32,98,97,115,101,100,32,111,110, - 32,97,32,102,105,108,101,32,108,111,99,97,116,105,111,110, - 46,10,10,32,32,32,32,84,111,32,105,110,100,105,99,97, - 116,101,32,116,104,97,116,32,116,104,101,32,109,111,100,117, - 108,101,32,105,115,32,97,32,112,97,99,107,97,103,101,44, - 32,115,101,116,10,32,32,32,32,115,117,98,109,111,100,117, - 108,101,95,115,101,97,114,99,104,95,108,111,99,97,116,105, - 111,110,115,32,116,111,32,97,32,108,105,115,116,32,111,102, - 32,100,105,114,101,99,116,111,114,121,32,112,97,116,104,115, - 46,32,32,65,110,10,32,32,32,32,101,109,112,116,121,32, - 108,105,115,116,32,105,115,32,115,117,102,102,105,99,105,101, - 110,116,44,32,116,104,111,117,103,104,32,105,116,115,32,110, - 111,116,32,111,116,104,101,114,119,105,115,101,32,117,115,101, - 102,117,108,32,116,111,32,116,104,101,10,32,32,32,32,105, - 109,112,111,114,116,32,115,121,115,116,101,109,46,10,10,32, - 32,32,32,84,104,101,32,108,111,97,100,101,114,32,109,117, - 115,116,32,116,97,107,101,32,97,32,115,112,101,99,32,97, - 115,32,105,116,115,32,111,110,108,121,32,95,95,105,110,105, - 116,95,95,40,41,32,97,114,103,46,10,10,32,32,32,32, - 78,122,9,60,117,110,107,110,111,119,110,62,218,12,103,101, - 116,95,102,105,108,101,110,97,109,101,218,6,111,114,105,103, - 105,110,84,218,10,105,115,95,112,97,99,107,97,103,101,114, - 61,0,0,0,41,15,114,117,0,0,0,114,160,0,0,0, - 114,109,0,0,0,114,123,0,0,0,218,10,77,111,100,117, - 108,101,83,112,101,99,90,13,95,115,101,116,95,102,105,108, - 101,97,116,116,114,218,27,95,103,101,116,95,115,117,112,112, - 111,114,116,101,100,95,102,105,108,101,95,108,111,97,100,101, - 114,115,114,94,0,0,0,114,95,0,0,0,114,129,0,0, - 0,218,9,95,80,79,80,85,76,65,84,69,114,162,0,0, - 0,114,159,0,0,0,114,40,0,0,0,218,6,97,112,112, - 101,110,100,41,9,114,108,0,0,0,90,8,108,111,99,97, - 116,105,111,110,114,129,0,0,0,114,159,0,0,0,218,4, - 115,112,101,99,218,12,108,111,97,100,101,114,95,99,108,97, - 115,115,218,8,115,117,102,102,105,120,101,115,114,162,0,0, - 0,90,7,100,105,114,110,97,109,101,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,218,23,115,112,101,99,95, - 102,114,111,109,95,102,105,108,101,95,108,111,99,97,116,105, - 111,110,33,2,0,0,115,60,0,0,0,0,12,12,4,6, - 1,15,2,3,1,19,1,13,1,5,8,24,1,9,3,12, - 1,22,1,21,1,15,1,9,1,5,2,4,3,12,2,15, - 1,3,1,19,1,13,1,5,2,6,1,12,2,9,1,15, - 1,6,1,16,1,16,2,114,170,0,0,0,99,0,0,0, - 0,0,0,0,0,0,0,0,0,5,0,0,0,64,0,0, - 0,115,121,0,0,0,101,0,0,90,1,0,100,0,0,90, - 2,0,100,1,0,90,3,0,100,2,0,90,4,0,100,3, - 0,90,5,0,100,4,0,90,6,0,101,7,0,100,5,0, - 100,6,0,132,0,0,131,1,0,90,8,0,101,7,0,100, - 7,0,100,8,0,132,0,0,131,1,0,90,9,0,101,7, - 0,100,9,0,100,9,0,100,10,0,100,11,0,132,2,0, - 131,1,0,90,10,0,101,7,0,100,9,0,100,12,0,100, - 13,0,132,1,0,131,1,0,90,11,0,100,9,0,83,41, - 14,218,21,87,105,110,100,111,119,115,82,101,103,105,115,116, - 114,121,70,105,110,100,101,114,122,62,77,101,116,97,32,112, - 97,116,104,32,102,105,110,100,101,114,32,102,111,114,32,109, - 111,100,117,108,101,115,32,100,101,99,108,97,114,101,100,32, - 105,110,32,116,104,101,32,87,105,110,100,111,119,115,32,114, - 101,103,105,115,116,114,121,46,122,59,83,111,102,116,119,97, - 114,101,92,80,121,116,104,111,110,92,80,121,116,104,111,110, - 67,111,114,101,92,123,115,121,115,95,118,101,114,115,105,111, - 110,125,92,77,111,100,117,108,101,115,92,123,102,117,108,108, - 110,97,109,101,125,122,65,83,111,102,116,119,97,114,101,92, - 80,121,116,104,111,110,92,80,121,116,104,111,110,67,111,114, - 101,92,123,115,121,115,95,118,101,114,115,105,111,110,125,92, - 77,111,100,117,108,101,115,92,123,102,117,108,108,110,97,109, - 101,125,92,68,101,98,117,103,70,99,2,0,0,0,0,0, - 0,0,2,0,0,0,11,0,0,0,67,0,0,0,115,67, - 0,0,0,121,23,0,116,0,0,106,1,0,116,0,0,106, - 2,0,124,1,0,131,2,0,83,87,110,37,0,4,116,3, - 0,107,10,0,114,62,0,1,1,1,116,0,0,106,1,0, - 116,0,0,106,4,0,124,1,0,131,2,0,83,89,110,1, - 0,88,100,0,0,83,41,1,78,41,5,218,7,95,119,105, - 110,114,101,103,90,7,79,112,101,110,75,101,121,90,17,72, - 75,69,89,95,67,85,82,82,69,78,84,95,85,83,69,82, - 114,42,0,0,0,90,18,72,75,69,89,95,76,79,67,65, - 76,95,77,65,67,72,73,78,69,41,2,218,3,99,108,115, - 114,5,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,14,95,111,112,101,110,95,114,101,103,105, - 115,116,114,121,111,2,0,0,115,8,0,0,0,0,2,3, - 1,23,1,13,1,122,36,87,105,110,100,111,119,115,82,101, - 103,105,115,116,114,121,70,105,110,100,101,114,46,95,111,112, - 101,110,95,114,101,103,105,115,116,114,121,99,2,0,0,0, - 0,0,0,0,6,0,0,0,16,0,0,0,67,0,0,0, - 115,143,0,0,0,124,0,0,106,0,0,114,21,0,124,0, - 0,106,1,0,125,2,0,110,9,0,124,0,0,106,2,0, - 125,2,0,124,2,0,106,3,0,100,1,0,124,1,0,100, - 2,0,116,4,0,106,5,0,100,0,0,100,3,0,133,2, - 0,25,131,0,2,125,3,0,121,47,0,124,0,0,106,6, - 0,124,3,0,131,1,0,143,25,0,125,4,0,116,7,0, - 106,8,0,124,4,0,100,4,0,131,2,0,125,5,0,87, - 100,0,0,81,82,88,87,110,22,0,4,116,9,0,107,10, - 0,114,138,0,1,1,1,100,0,0,83,89,110,1,0,88, - 124,5,0,83,41,5,78,114,128,0,0,0,90,11,115,121, - 115,95,118,101,114,115,105,111,110,114,82,0,0,0,114,32, + 0,0,4,0,0,0,31,0,0,0,115,66,0,0,0,124, + 1,100,0,107,8,114,16,124,0,106,0,125,1,110,32,124, + 0,106,0,124,1,107,3,114,48,116,1,100,1,124,0,106, + 0,124,1,102,2,22,0,124,1,100,2,141,2,130,1,136, + 0,124,0,124,1,102,2,124,2,158,2,124,3,142,1,83, + 0,41,3,78,122,30,108,111,97,100,101,114,32,102,111,114, + 32,37,115,32,99,97,110,110,111,116,32,104,97,110,100,108, + 101,32,37,115,41,1,218,4,110,97,109,101,41,2,114,102, + 0,0,0,218,11,73,109,112,111,114,116,69,114,114,111,114, + 41,4,218,4,115,101,108,102,114,102,0,0,0,218,4,97, + 114,103,115,90,6,107,119,97,114,103,115,41,1,218,6,109, + 101,116,104,111,100,114,4,0,0,0,114,6,0,0,0,218, + 19,95,99,104,101,99,107,95,110,97,109,101,95,119,114,97, + 112,112,101,114,137,1,0,0,115,12,0,0,0,0,1,8, + 1,8,1,10,1,4,1,18,1,122,40,95,99,104,101,99, + 107,95,110,97,109,101,46,60,108,111,99,97,108,115,62,46, + 95,99,104,101,99,107,95,110,97,109,101,95,119,114,97,112, + 112,101,114,99,2,0,0,0,0,0,0,0,3,0,0,0, + 7,0,0,0,83,0,0,0,115,60,0,0,0,120,40,100, + 5,68,0,93,32,125,2,116,0,124,1,124,2,131,2,114, + 6,116,1,124,0,124,2,116,2,124,1,124,2,131,2,131, + 3,1,0,113,6,87,0,124,0,106,3,106,4,124,1,106, + 3,131,1,1,0,100,0,83,0,41,6,78,218,10,95,95, + 109,111,100,117,108,101,95,95,218,8,95,95,110,97,109,101, + 95,95,218,12,95,95,113,117,97,108,110,97,109,101,95,95, + 218,7,95,95,100,111,99,95,95,41,4,114,108,0,0,0, + 114,109,0,0,0,114,110,0,0,0,114,111,0,0,0,41, + 5,218,7,104,97,115,97,116,116,114,218,7,115,101,116,97, + 116,116,114,218,7,103,101,116,97,116,116,114,218,8,95,95, + 100,105,99,116,95,95,218,6,117,112,100,97,116,101,41,3, + 90,3,110,101,119,90,3,111,108,100,114,55,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,5, + 95,119,114,97,112,148,1,0,0,115,8,0,0,0,0,1, + 10,1,10,1,22,1,122,26,95,99,104,101,99,107,95,110, + 97,109,101,46,60,108,111,99,97,108,115,62,46,95,119,114, + 97,112,41,1,78,41,3,218,10,95,98,111,111,116,115,116, + 114,97,112,114,117,0,0,0,218,9,78,97,109,101,69,114, + 114,111,114,41,3,114,106,0,0,0,114,107,0,0,0,114, + 117,0,0,0,114,4,0,0,0,41,1,114,106,0,0,0, + 114,6,0,0,0,218,11,95,99,104,101,99,107,95,110,97, + 109,101,129,1,0,0,115,14,0,0,0,0,8,14,7,2, + 1,10,1,14,2,14,5,10,1,114,120,0,0,0,99,2, + 0,0,0,0,0,0,0,5,0,0,0,4,0,0,0,67, + 0,0,0,115,60,0,0,0,124,0,106,0,124,1,131,1, + 92,2,125,2,125,3,124,2,100,1,107,8,114,56,116,1, + 124,3,131,1,114,56,100,2,125,4,116,2,106,3,124,4, + 106,4,124,3,100,3,25,0,131,1,116,5,131,2,1,0, + 124,2,83,0,41,4,122,155,84,114,121,32,116,111,32,102, + 105,110,100,32,97,32,108,111,97,100,101,114,32,102,111,114, + 32,116,104,101,32,115,112,101,99,105,102,105,101,100,32,109, + 111,100,117,108,101,32,98,121,32,100,101,108,101,103,97,116, + 105,110,103,32,116,111,10,32,32,32,32,115,101,108,102,46, + 102,105,110,100,95,108,111,97,100,101,114,40,41,46,10,10, + 32,32,32,32,84,104,105,115,32,109,101,116,104,111,100,32, + 105,115,32,100,101,112,114,101,99,97,116,101,100,32,105,110, + 32,102,97,118,111,114,32,111,102,32,102,105,110,100,101,114, + 46,102,105,110,100,95,115,112,101,99,40,41,46,10,10,32, + 32,32,32,78,122,44,78,111,116,32,105,109,112,111,114,116, + 105,110,103,32,100,105,114,101,99,116,111,114,121,32,123,125, + 58,32,109,105,115,115,105,110,103,32,95,95,105,110,105,116, + 95,95,114,62,0,0,0,41,6,218,11,102,105,110,100,95, + 108,111,97,100,101,114,114,33,0,0,0,114,63,0,0,0, + 114,64,0,0,0,114,50,0,0,0,218,13,73,109,112,111, + 114,116,87,97,114,110,105,110,103,41,5,114,104,0,0,0, + 218,8,102,117,108,108,110,97,109,101,218,6,108,111,97,100, + 101,114,218,8,112,111,114,116,105,111,110,115,218,3,109,115, + 103,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 218,17,95,102,105,110,100,95,109,111,100,117,108,101,95,115, + 104,105,109,157,1,0,0,115,10,0,0,0,0,10,14,1, + 16,1,4,1,22,1,114,127,0,0,0,99,4,0,0,0, + 0,0,0,0,11,0,0,0,22,0,0,0,67,0,0,0, + 115,136,1,0,0,105,0,125,4,124,2,100,1,107,9,114, + 22,124,2,124,4,100,2,60,0,110,4,100,3,125,2,124, + 3,100,1,107,9,114,42,124,3,124,4,100,4,60,0,124, + 0,100,1,100,5,133,2,25,0,125,5,124,0,100,5,100, + 6,133,2,25,0,125,6,124,0,100,6,100,7,133,2,25, + 0,125,7,124,5,116,0,107,3,114,124,100,8,106,1,124, + 2,124,5,131,2,125,8,116,2,106,3,100,9,124,8,131, + 2,1,0,116,4,124,8,102,1,124,4,142,1,130,1,110, + 86,116,5,124,6,131,1,100,5,107,3,114,168,100,10,106, + 1,124,2,131,1,125,8,116,2,106,3,100,9,124,8,131, + 2,1,0,116,6,124,8,131,1,130,1,110,42,116,5,124, + 7,131,1,100,5,107,3,114,210,100,11,106,1,124,2,131, + 1,125,8,116,2,106,3,100,9,124,8,131,2,1,0,116, + 6,124,8,131,1,130,1,124,1,100,1,107,9,144,1,114, + 124,121,16,116,7,124,1,100,12,25,0,131,1,125,9,87, + 0,110,22,4,0,116,8,107,10,144,1,114,2,1,0,1, + 0,1,0,89,0,110,50,88,0,116,9,124,6,131,1,124, + 9,107,3,144,1,114,52,100,13,106,1,124,2,131,1,125, + 8,116,2,106,3,100,9,124,8,131,2,1,0,116,4,124, + 8,102,1,124,4,142,1,130,1,121,16,124,1,100,14,25, + 0,100,15,64,0,125,10,87,0,110,22,4,0,116,8,107, + 10,144,1,114,90,1,0,1,0,1,0,89,0,110,34,88, + 0,116,9,124,7,131,1,124,10,107,3,144,1,114,124,116, + 4,100,13,106,1,124,2,131,1,102,1,124,4,142,1,130, + 1,124,0,100,7,100,1,133,2,25,0,83,0,41,16,97, + 122,1,0,0,86,97,108,105,100,97,116,101,32,116,104,101, + 32,104,101,97,100,101,114,32,111,102,32,116,104,101,32,112, + 97,115,115,101,100,45,105,110,32,98,121,116,101,99,111,100, + 101,32,97,103,97,105,110,115,116,32,115,111,117,114,99,101, + 95,115,116,97,116,115,32,40,105,102,10,32,32,32,32,103, + 105,118,101,110,41,32,97,110,100,32,114,101,116,117,114,110, + 105,110,103,32,116,104,101,32,98,121,116,101,99,111,100,101, + 32,116,104,97,116,32,99,97,110,32,98,101,32,99,111,109, + 112,105,108,101,100,32,98,121,32,99,111,109,112,105,108,101, + 40,41,46,10,10,32,32,32,32,65,108,108,32,111,116,104, + 101,114,32,97,114,103,117,109,101,110,116,115,32,97,114,101, + 32,117,115,101,100,32,116,111,32,101,110,104,97,110,99,101, + 32,101,114,114,111,114,32,114,101,112,111,114,116,105,110,103, + 46,10,10,32,32,32,32,73,109,112,111,114,116,69,114,114, + 111,114,32,105,115,32,114,97,105,115,101,100,32,119,104,101, + 110,32,116,104,101,32,109,97,103,105,99,32,110,117,109,98, + 101,114,32,105,115,32,105,110,99,111,114,114,101,99,116,32, + 111,114,32,116,104,101,32,98,121,116,101,99,111,100,101,32, + 105,115,10,32,32,32,32,102,111,117,110,100,32,116,111,32, + 98,101,32,115,116,97,108,101,46,32,69,79,70,69,114,114, + 111,114,32,105,115,32,114,97,105,115,101,100,32,119,104,101, + 110,32,116,104,101,32,100,97,116,97,32,105,115,32,102,111, + 117,110,100,32,116,111,32,98,101,10,32,32,32,32,116,114, + 117,110,99,97,116,101,100,46,10,10,32,32,32,32,78,114, + 102,0,0,0,122,10,60,98,121,116,101,99,111,100,101,62, + 114,37,0,0,0,114,14,0,0,0,233,8,0,0,0,233, + 12,0,0,0,122,30,98,97,100,32,109,97,103,105,99,32, + 110,117,109,98,101,114,32,105,110,32,123,33,114,125,58,32, + 123,33,114,125,122,2,123,125,122,43,114,101,97,99,104,101, + 100,32,69,79,70,32,119,104,105,108,101,32,114,101,97,100, + 105,110,103,32,116,105,109,101,115,116,97,109,112,32,105,110, + 32,123,33,114,125,122,48,114,101,97,99,104,101,100,32,69, + 79,70,32,119,104,105,108,101,32,114,101,97,100,105,110,103, + 32,115,105,122,101,32,111,102,32,115,111,117,114,99,101,32, + 105,110,32,123,33,114,125,218,5,109,116,105,109,101,122,26, + 98,121,116,101,99,111,100,101,32,105,115,32,115,116,97,108, + 101,32,102,111,114,32,123,33,114,125,218,4,115,105,122,101, + 108,3,0,0,0,255,127,255,127,3,0,41,10,218,12,77, + 65,71,73,67,95,78,85,77,66,69,82,114,50,0,0,0, + 114,118,0,0,0,218,16,95,118,101,114,98,111,115,101,95, + 109,101,115,115,97,103,101,114,103,0,0,0,114,33,0,0, + 0,218,8,69,79,70,69,114,114,111,114,114,16,0,0,0, + 218,8,75,101,121,69,114,114,111,114,114,21,0,0,0,41, + 11,114,56,0,0,0,218,12,115,111,117,114,99,101,95,115, + 116,97,116,115,114,102,0,0,0,114,37,0,0,0,90,11, + 101,120,99,95,100,101,116,97,105,108,115,90,5,109,97,103, + 105,99,90,13,114,97,119,95,116,105,109,101,115,116,97,109, + 112,90,8,114,97,119,95,115,105,122,101,114,79,0,0,0, + 218,12,115,111,117,114,99,101,95,109,116,105,109,101,218,11, + 115,111,117,114,99,101,95,115,105,122,101,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,218,25,95,118,97,108, + 105,100,97,116,101,95,98,121,116,101,99,111,100,101,95,104, + 101,97,100,101,114,174,1,0,0,115,76,0,0,0,0,11, + 4,1,8,1,10,3,4,1,8,1,8,1,12,1,12,1, + 12,1,8,1,12,1,12,1,14,1,12,1,10,1,12,1, + 10,1,12,1,10,1,12,1,8,1,10,1,2,1,16,1, + 16,1,6,2,14,1,10,1,12,1,12,1,2,1,16,1, + 16,1,6,2,14,1,12,1,6,1,114,139,0,0,0,99, + 4,0,0,0,0,0,0,0,5,0,0,0,5,0,0,0, + 67,0,0,0,115,80,0,0,0,116,0,106,1,124,0,131, + 1,125,4,116,2,124,4,116,3,131,2,114,56,116,4,106, + 5,100,1,124,2,131,2,1,0,124,3,100,2,107,9,114, + 52,116,6,106,7,124,4,124,3,131,2,1,0,124,4,83, + 0,116,8,100,3,106,9,124,2,131,1,124,1,124,2,100, + 4,141,3,130,1,100,2,83,0,41,5,122,60,67,111,109, + 112,105,108,101,32,98,121,116,101,99,111,100,101,32,97,115, + 32,114,101,116,117,114,110,101,100,32,98,121,32,95,118,97, + 108,105,100,97,116,101,95,98,121,116,101,99,111,100,101,95, + 104,101,97,100,101,114,40,41,46,122,21,99,111,100,101,32, + 111,98,106,101,99,116,32,102,114,111,109,32,123,33,114,125, + 78,122,23,78,111,110,45,99,111,100,101,32,111,98,106,101, + 99,116,32,105,110,32,123,33,114,125,41,2,114,102,0,0, + 0,114,37,0,0,0,41,10,218,7,109,97,114,115,104,97, + 108,90,5,108,111,97,100,115,218,10,105,115,105,110,115,116, + 97,110,99,101,218,10,95,99,111,100,101,95,116,121,112,101, + 114,118,0,0,0,114,133,0,0,0,218,4,95,105,109,112, + 90,16,95,102,105,120,95,99,111,95,102,105,108,101,110,97, + 109,101,114,103,0,0,0,114,50,0,0,0,41,5,114,56, + 0,0,0,114,102,0,0,0,114,93,0,0,0,114,94,0, + 0,0,218,4,99,111,100,101,114,4,0,0,0,114,4,0, + 0,0,114,6,0,0,0,218,17,95,99,111,109,112,105,108, + 101,95,98,121,116,101,99,111,100,101,229,1,0,0,115,16, + 0,0,0,0,2,10,1,10,1,12,1,8,1,12,1,4, + 2,10,1,114,145,0,0,0,114,62,0,0,0,99,3,0, + 0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,0, + 0,0,115,56,0,0,0,116,0,116,1,131,1,125,3,124, + 3,106,2,116,3,124,1,131,1,131,1,1,0,124,3,106, + 2,116,3,124,2,131,1,131,1,1,0,124,3,106,2,116, + 4,106,5,124,0,131,1,131,1,1,0,124,3,83,0,41, + 1,122,80,67,111,109,112,105,108,101,32,97,32,99,111,100, + 101,32,111,98,106,101,99,116,32,105,110,116,111,32,98,121, + 116,101,99,111,100,101,32,102,111,114,32,119,114,105,116,105, + 110,103,32,111,117,116,32,116,111,32,97,32,98,121,116,101, + 45,99,111,109,112,105,108,101,100,10,32,32,32,32,102,105, + 108,101,46,41,6,218,9,98,121,116,101,97,114,114,97,121, + 114,132,0,0,0,218,6,101,120,116,101,110,100,114,19,0, + 0,0,114,140,0,0,0,90,5,100,117,109,112,115,41,4, + 114,144,0,0,0,114,130,0,0,0,114,138,0,0,0,114, + 56,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, + 0,0,0,218,17,95,99,111,100,101,95,116,111,95,98,121, + 116,101,99,111,100,101,241,1,0,0,115,10,0,0,0,0, + 3,8,1,14,1,14,1,16,1,114,148,0,0,0,99,1, + 0,0,0,0,0,0,0,5,0,0,0,4,0,0,0,67, + 0,0,0,115,62,0,0,0,100,1,100,2,108,0,125,1, + 116,1,106,2,124,0,131,1,106,3,125,2,124,1,106,4, + 124,2,131,1,125,3,116,1,106,5,100,2,100,3,131,2, + 125,4,124,4,106,6,124,0,106,6,124,3,100,1,25,0, + 131,1,131,1,83,0,41,4,122,121,68,101,99,111,100,101, + 32,98,121,116,101,115,32,114,101,112,114,101,115,101,110,116, + 105,110,103,32,115,111,117,114,99,101,32,99,111,100,101,32, + 97,110,100,32,114,101,116,117,114,110,32,116,104,101,32,115, + 116,114,105,110,103,46,10,10,32,32,32,32,85,110,105,118, + 101,114,115,97,108,32,110,101,119,108,105,110,101,32,115,117, + 112,112,111,114,116,32,105,115,32,117,115,101,100,32,105,110, + 32,116,104,101,32,100,101,99,111,100,105,110,103,46,10,32, + 32,32,32,114,62,0,0,0,78,84,41,7,218,8,116,111, + 107,101,110,105,122,101,114,52,0,0,0,90,7,66,121,116, + 101,115,73,79,90,8,114,101,97,100,108,105,110,101,90,15, + 100,101,116,101,99,116,95,101,110,99,111,100,105,110,103,90, + 25,73,110,99,114,101,109,101,110,116,97,108,78,101,119,108, + 105,110,101,68,101,99,111,100,101,114,218,6,100,101,99,111, + 100,101,41,5,218,12,115,111,117,114,99,101,95,98,121,116, + 101,115,114,149,0,0,0,90,21,115,111,117,114,99,101,95, + 98,121,116,101,115,95,114,101,97,100,108,105,110,101,218,8, + 101,110,99,111,100,105,110,103,90,15,110,101,119,108,105,110, + 101,95,100,101,99,111,100,101,114,114,4,0,0,0,114,4, + 0,0,0,114,6,0,0,0,218,13,100,101,99,111,100,101, + 95,115,111,117,114,99,101,251,1,0,0,115,10,0,0,0, + 0,5,8,1,12,1,10,1,12,1,114,153,0,0,0,41, + 2,114,124,0,0,0,218,26,115,117,98,109,111,100,117,108, + 101,95,115,101,97,114,99,104,95,108,111,99,97,116,105,111, + 110,115,99,2,0,0,0,2,0,0,0,9,0,0,0,19, + 0,0,0,67,0,0,0,115,18,1,0,0,124,1,100,1, + 107,8,114,60,100,2,125,1,116,0,124,2,100,3,131,2, + 114,70,121,14,124,2,106,1,124,0,131,1,125,1,87,0, + 113,70,4,0,116,2,107,10,114,56,1,0,1,0,1,0, + 89,0,113,70,88,0,110,10,116,3,106,4,124,1,131,1, + 125,1,116,5,106,6,124,0,124,2,124,1,100,4,141,3, + 125,4,100,5,124,4,95,7,124,2,100,1,107,8,114,156, + 120,54,116,8,131,0,68,0,93,40,92,2,125,5,125,6, + 124,1,106,9,116,10,124,6,131,1,131,1,114,108,124,5, + 124,0,124,1,131,2,125,2,124,2,124,4,95,11,80,0, + 113,108,87,0,100,1,83,0,124,3,116,12,107,8,114,222, + 116,0,124,2,100,6,131,2,114,228,121,14,124,2,106,13, + 124,0,131,1,125,7,87,0,110,20,4,0,116,2,107,10, + 114,208,1,0,1,0,1,0,89,0,113,228,88,0,124,7, + 114,228,103,0,124,4,95,14,110,6,124,3,124,4,95,14, + 124,4,106,14,103,0,107,2,144,1,114,14,124,1,144,1, + 114,14,116,15,124,1,131,1,100,7,25,0,125,8,124,4, + 106,14,106,16,124,8,131,1,1,0,124,4,83,0,41,8, + 97,61,1,0,0,82,101,116,117,114,110,32,97,32,109,111, + 100,117,108,101,32,115,112,101,99,32,98,97,115,101,100,32, + 111,110,32,97,32,102,105,108,101,32,108,111,99,97,116,105, + 111,110,46,10,10,32,32,32,32,84,111,32,105,110,100,105, + 99,97,116,101,32,116,104,97,116,32,116,104,101,32,109,111, + 100,117,108,101,32,105,115,32,97,32,112,97,99,107,97,103, + 101,44,32,115,101,116,10,32,32,32,32,115,117,98,109,111, + 100,117,108,101,95,115,101,97,114,99,104,95,108,111,99,97, + 116,105,111,110,115,32,116,111,32,97,32,108,105,115,116,32, + 111,102,32,100,105,114,101,99,116,111,114,121,32,112,97,116, + 104,115,46,32,32,65,110,10,32,32,32,32,101,109,112,116, + 121,32,108,105,115,116,32,105,115,32,115,117,102,102,105,99, + 105,101,110,116,44,32,116,104,111,117,103,104,32,105,116,115, + 32,110,111,116,32,111,116,104,101,114,119,105,115,101,32,117, + 115,101,102,117,108,32,116,111,32,116,104,101,10,32,32,32, + 32,105,109,112,111,114,116,32,115,121,115,116,101,109,46,10, + 10,32,32,32,32,84,104,101,32,108,111,97,100,101,114,32, + 109,117,115,116,32,116,97,107,101,32,97,32,115,112,101,99, + 32,97,115,32,105,116,115,32,111,110,108,121,32,95,95,105, + 110,105,116,95,95,40,41,32,97,114,103,46,10,10,32,32, + 32,32,78,122,9,60,117,110,107,110,111,119,110,62,218,12, + 103,101,116,95,102,105,108,101,110,97,109,101,41,1,218,6, + 111,114,105,103,105,110,84,218,10,105,115,95,112,97,99,107, + 97,103,101,114,62,0,0,0,41,17,114,112,0,0,0,114, + 155,0,0,0,114,103,0,0,0,114,3,0,0,0,114,67, + 0,0,0,114,118,0,0,0,218,10,77,111,100,117,108,101, + 83,112,101,99,90,13,95,115,101,116,95,102,105,108,101,97, + 116,116,114,218,27,95,103,101,116,95,115,117,112,112,111,114, + 116,101,100,95,102,105,108,101,95,108,111,97,100,101,114,115, + 114,96,0,0,0,114,97,0,0,0,114,124,0,0,0,218, + 9,95,80,79,80,85,76,65,84,69,114,157,0,0,0,114, + 154,0,0,0,114,40,0,0,0,218,6,97,112,112,101,110, + 100,41,9,114,102,0,0,0,90,8,108,111,99,97,116,105, + 111,110,114,124,0,0,0,114,154,0,0,0,218,4,115,112, + 101,99,218,12,108,111,97,100,101,114,95,99,108,97,115,115, + 218,8,115,117,102,102,105,120,101,115,114,157,0,0,0,90, + 7,100,105,114,110,97,109,101,114,4,0,0,0,114,4,0, + 0,0,114,6,0,0,0,218,23,115,112,101,99,95,102,114, + 111,109,95,102,105,108,101,95,108,111,99,97,116,105,111,110, + 12,2,0,0,115,62,0,0,0,0,12,8,4,4,1,10, + 2,2,1,14,1,14,1,8,2,10,8,16,1,6,3,8, + 1,16,1,14,1,10,1,6,1,6,2,4,3,8,2,10, + 1,2,1,14,1,14,1,6,2,4,1,8,2,6,1,12, + 1,6,1,12,1,12,2,114,165,0,0,0,99,0,0,0, + 0,0,0,0,0,0,0,0,0,4,0,0,0,64,0,0, + 0,115,80,0,0,0,101,0,90,1,100,0,90,2,100,1, + 90,3,100,2,90,4,100,3,90,5,100,4,90,6,101,7, + 100,5,100,6,132,0,131,1,90,8,101,7,100,7,100,8, + 132,0,131,1,90,9,101,7,100,14,100,10,100,11,132,1, + 131,1,90,10,101,7,100,15,100,12,100,13,132,1,131,1, + 90,11,100,9,83,0,41,16,218,21,87,105,110,100,111,119, + 115,82,101,103,105,115,116,114,121,70,105,110,100,101,114,122, + 62,77,101,116,97,32,112,97,116,104,32,102,105,110,100,101, + 114,32,102,111,114,32,109,111,100,117,108,101,115,32,100,101, + 99,108,97,114,101,100,32,105,110,32,116,104,101,32,87,105, + 110,100,111,119,115,32,114,101,103,105,115,116,114,121,46,122, + 59,83,111,102,116,119,97,114,101,92,80,121,116,104,111,110, + 92,80,121,116,104,111,110,67,111,114,101,92,123,115,121,115, + 95,118,101,114,115,105,111,110,125,92,77,111,100,117,108,101, + 115,92,123,102,117,108,108,110,97,109,101,125,122,65,83,111, + 102,116,119,97,114,101,92,80,121,116,104,111,110,92,80,121, + 116,104,111,110,67,111,114,101,92,123,115,121,115,95,118,101, + 114,115,105,111,110,125,92,77,111,100,117,108,101,115,92,123, + 102,117,108,108,110,97,109,101,125,92,68,101,98,117,103,70, + 99,2,0,0,0,0,0,0,0,2,0,0,0,11,0,0, + 0,67,0,0,0,115,50,0,0,0,121,14,116,0,106,1, + 116,0,106,2,124,1,131,2,83,0,4,0,116,3,107,10, + 114,44,1,0,1,0,1,0,116,0,106,1,116,0,106,4, + 124,1,131,2,83,0,88,0,100,0,83,0,41,1,78,41, + 5,218,7,95,119,105,110,114,101,103,90,7,79,112,101,110, + 75,101,121,90,17,72,75,69,89,95,67,85,82,82,69,78, + 84,95,85,83,69,82,114,42,0,0,0,90,18,72,75,69, + 89,95,76,79,67,65,76,95,77,65,67,72,73,78,69,41, + 2,218,3,99,108,115,114,5,0,0,0,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,218,14,95,111,112,101, + 110,95,114,101,103,105,115,116,114,121,92,2,0,0,115,8, + 0,0,0,0,2,2,1,14,1,14,1,122,36,87,105,110, + 100,111,119,115,82,101,103,105,115,116,114,121,70,105,110,100, + 101,114,46,95,111,112,101,110,95,114,101,103,105,115,116,114, + 121,99,2,0,0,0,0,0,0,0,6,0,0,0,16,0, + 0,0,67,0,0,0,115,112,0,0,0,124,0,106,0,114, + 14,124,0,106,1,125,2,110,6,124,0,106,2,125,2,124, + 2,106,3,124,1,100,1,116,4,106,5,100,0,100,2,133, + 2,25,0,22,0,100,3,141,2,125,3,121,38,124,0,106, + 6,124,3,131,1,143,18,125,4,116,7,106,8,124,4,100, + 4,131,2,125,5,87,0,100,0,81,0,82,0,88,0,87, + 0,110,20,4,0,116,9,107,10,114,106,1,0,1,0,1, + 0,100,0,83,0,88,0,124,5,83,0,41,5,78,122,5, + 37,100,46,37,100,114,59,0,0,0,41,2,114,123,0,0, + 0,90,11,115,121,115,95,118,101,114,115,105,111,110,114,32, 0,0,0,41,10,218,11,68,69,66,85,71,95,66,85,73, 76,68,218,18,82,69,71,73,83,84,82,89,95,75,69,89, 95,68,69,66,85,71,218,12,82,69,71,73,83,84,82,89, - 95,75,69,89,114,49,0,0,0,114,8,0,0,0,218,7, - 118,101,114,115,105,111,110,114,174,0,0,0,114,172,0,0, - 0,90,10,81,117,101,114,121,86,97,108,117,101,114,42,0, - 0,0,41,6,114,173,0,0,0,114,128,0,0,0,90,12, - 114,101,103,105,115,116,114,121,95,107,101,121,114,5,0,0, - 0,90,4,104,107,101,121,218,8,102,105,108,101,112,97,116, - 104,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 218,16,95,115,101,97,114,99,104,95,114,101,103,105,115,116, - 114,121,118,2,0,0,115,22,0,0,0,0,2,9,1,12, - 2,9,1,15,1,22,1,3,1,18,1,29,1,13,1,9, - 1,122,38,87,105,110,100,111,119,115,82,101,103,105,115,116, - 114,121,70,105,110,100,101,114,46,95,115,101,97,114,99,104, - 95,114,101,103,105,115,116,114,121,78,99,4,0,0,0,0, - 0,0,0,8,0,0,0,14,0,0,0,67,0,0,0,115, - 158,0,0,0,124,0,0,106,0,0,124,1,0,131,1,0, - 125,4,0,124,4,0,100,0,0,107,8,0,114,31,0,100, - 0,0,83,121,14,0,116,1,0,124,4,0,131,1,0,1, - 87,110,22,0,4,116,2,0,107,10,0,114,69,0,1,1, - 1,100,0,0,83,89,110,1,0,88,120,81,0,116,3,0, - 131,0,0,68,93,70,0,92,2,0,125,5,0,125,6,0, - 124,4,0,106,4,0,116,5,0,124,6,0,131,1,0,131, - 1,0,114,80,0,116,6,0,106,7,0,124,1,0,124,5, - 0,124,1,0,124,4,0,131,2,0,100,1,0,124,4,0, - 131,2,1,125,7,0,124,7,0,83,113,80,0,87,100,0, - 0,83,41,2,78,114,161,0,0,0,41,8,114,180,0,0, - 0,114,41,0,0,0,114,42,0,0,0,114,164,0,0,0, - 114,94,0,0,0,114,95,0,0,0,114,123,0,0,0,218, - 16,115,112,101,99,95,102,114,111,109,95,108,111,97,100,101, - 114,41,8,114,173,0,0,0,114,128,0,0,0,114,37,0, - 0,0,218,6,116,97,114,103,101,116,114,179,0,0,0,114, - 129,0,0,0,114,169,0,0,0,114,167,0,0,0,114,4, - 0,0,0,114,4,0,0,0,114,6,0,0,0,218,9,102, - 105,110,100,95,115,112,101,99,133,2,0,0,115,26,0,0, - 0,0,2,15,1,12,1,4,1,3,1,14,1,13,1,9, - 1,22,1,21,1,9,1,15,1,9,1,122,31,87,105,110, - 100,111,119,115,82,101,103,105,115,116,114,121,70,105,110,100, - 101,114,46,102,105,110,100,95,115,112,101,99,99,3,0,0, - 0,0,0,0,0,4,0,0,0,3,0,0,0,67,0,0, - 0,115,45,0,0,0,124,0,0,106,0,0,124,1,0,124, - 2,0,131,2,0,125,3,0,124,3,0,100,1,0,107,9, - 0,114,37,0,124,3,0,106,1,0,83,100,1,0,83,100, - 1,0,83,41,2,122,108,70,105,110,100,32,109,111,100,117, - 108,101,32,110,97,109,101,100,32,105,110,32,116,104,101,32, - 114,101,103,105,115,116,114,121,46,10,10,32,32,32,32,32, - 32,32,32,84,104,105,115,32,109,101,116,104,111,100,32,105, - 115,32,100,101,112,114,101,99,97,116,101,100,46,32,32,85, - 115,101,32,101,120,101,99,95,109,111,100,117,108,101,40,41, - 32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,32, - 32,32,32,78,41,2,114,183,0,0,0,114,129,0,0,0, - 41,4,114,173,0,0,0,114,128,0,0,0,114,37,0,0, - 0,114,167,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,218,11,102,105,110,100,95,109,111,100,117, - 108,101,149,2,0,0,115,8,0,0,0,0,7,18,1,12, - 1,7,2,122,33,87,105,110,100,111,119,115,82,101,103,105, - 115,116,114,121,70,105,110,100,101,114,46,102,105,110,100,95, - 109,111,100,117,108,101,41,12,114,114,0,0,0,114,113,0, - 0,0,114,115,0,0,0,114,116,0,0,0,114,177,0,0, - 0,114,176,0,0,0,114,175,0,0,0,218,11,99,108,97, - 115,115,109,101,116,104,111,100,114,174,0,0,0,114,180,0, - 0,0,114,183,0,0,0,114,184,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,171,0,0,0,99,2,0,0,115,20,0,0,0,12,2, - 6,3,6,3,6,2,6,2,18,7,18,15,3,1,21,15, - 3,1,114,171,0,0,0,99,0,0,0,0,0,0,0,0, - 0,0,0,0,2,0,0,0,64,0,0,0,115,70,0,0, - 0,101,0,0,90,1,0,100,0,0,90,2,0,100,1,0, - 90,3,0,100,2,0,100,3,0,132,0,0,90,4,0,100, - 4,0,100,5,0,132,0,0,90,5,0,100,6,0,100,7, - 0,132,0,0,90,6,0,100,8,0,100,9,0,132,0,0, - 90,7,0,100,10,0,83,41,11,218,13,95,76,111,97,100, - 101,114,66,97,115,105,99,115,122,83,66,97,115,101,32,99, - 108,97,115,115,32,111,102,32,99,111,109,109,111,110,32,99, - 111,100,101,32,110,101,101,100,101,100,32,98,121,32,98,111, - 116,104,32,83,111,117,114,99,101,76,111,97,100,101,114,32, - 97,110,100,10,32,32,32,32,83,111,117,114,99,101,108,101, - 115,115,70,105,108,101,76,111,97,100,101,114,46,99,2,0, - 0,0,0,0,0,0,5,0,0,0,3,0,0,0,67,0, - 0,0,115,88,0,0,0,116,0,0,124,0,0,106,1,0, - 124,1,0,131,1,0,131,1,0,100,1,0,25,125,2,0, - 124,2,0,106,2,0,100,2,0,100,1,0,131,2,0,100, - 3,0,25,125,3,0,124,1,0,106,3,0,100,2,0,131, - 1,0,100,4,0,25,125,4,0,124,3,0,100,5,0,107, - 2,0,111,87,0,124,4,0,100,5,0,107,3,0,83,41, - 6,122,141,67,111,110,99,114,101,116,101,32,105,109,112,108, - 101,109,101,110,116,97,116,105,111,110,32,111,102,32,73,110, - 115,112,101,99,116,76,111,97,100,101,114,46,105,115,95,112, - 97,99,107,97,103,101,32,98,121,32,99,104,101,99,107,105, - 110,103,32,105,102,10,32,32,32,32,32,32,32,32,116,104, - 101,32,112,97,116,104,32,114,101,116,117,114,110,101,100,32, - 98,121,32,103,101,116,95,102,105,108,101,110,97,109,101,32, - 104,97,115,32,97,32,102,105,108,101,110,97,109,101,32,111, - 102,32,39,95,95,105,110,105,116,95,95,46,112,121,39,46, - 114,31,0,0,0,114,60,0,0,0,114,61,0,0,0,114, - 58,0,0,0,218,8,95,95,105,110,105,116,95,95,41,4, - 114,40,0,0,0,114,160,0,0,0,114,36,0,0,0,114, - 34,0,0,0,41,5,114,110,0,0,0,114,128,0,0,0, - 114,96,0,0,0,90,13,102,105,108,101,110,97,109,101,95, - 98,97,115,101,90,9,116,97,105,108,95,110,97,109,101,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,162, - 0,0,0,168,2,0,0,115,8,0,0,0,0,3,25,1, - 22,1,19,1,122,24,95,76,111,97,100,101,114,66,97,115, - 105,99,115,46,105,115,95,112,97,99,107,97,103,101,99,2, - 0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,67, - 0,0,0,115,4,0,0,0,100,1,0,83,41,2,122,42, - 85,115,101,32,100,101,102,97,117,108,116,32,115,101,109,97, - 110,116,105,99,115,32,102,111,114,32,109,111,100,117,108,101, - 32,99,114,101,97,116,105,111,110,46,78,114,4,0,0,0, - 41,2,114,110,0,0,0,114,167,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,218,13,99,114,101, - 97,116,101,95,109,111,100,117,108,101,176,2,0,0,115,0, - 0,0,0,122,27,95,76,111,97,100,101,114,66,97,115,105, - 99,115,46,99,114,101,97,116,101,95,109,111,100,117,108,101, - 99,2,0,0,0,0,0,0,0,3,0,0,0,4,0,0, - 0,67,0,0,0,115,80,0,0,0,124,0,0,106,0,0, - 124,1,0,106,1,0,131,1,0,125,2,0,124,2,0,100, - 1,0,107,8,0,114,54,0,116,2,0,100,2,0,106,3, - 0,124,1,0,106,1,0,131,1,0,131,1,0,130,1,0, - 116,4,0,106,5,0,116,6,0,124,2,0,124,1,0,106, - 7,0,131,3,0,1,100,1,0,83,41,3,122,19,69,120, - 101,99,117,116,101,32,116,104,101,32,109,111,100,117,108,101, - 46,78,122,52,99,97,110,110,111,116,32,108,111,97,100,32, - 109,111,100,117,108,101,32,123,33,114,125,32,119,104,101,110, - 32,103,101,116,95,99,111,100,101,40,41,32,114,101,116,117, - 114,110,115,32,78,111,110,101,41,8,218,8,103,101,116,95, - 99,111,100,101,114,114,0,0,0,114,109,0,0,0,114,49, - 0,0,0,114,123,0,0,0,218,25,95,99,97,108,108,95, - 119,105,116,104,95,102,114,97,109,101,115,95,114,101,109,111, - 118,101,100,218,4,101,120,101,99,114,120,0,0,0,41,3, - 114,110,0,0,0,218,6,109,111,100,117,108,101,114,149,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,11,101,120,101,99,95,109,111,100,117,108,101,179,2, - 0,0,115,10,0,0,0,0,2,18,1,12,1,9,1,15, - 1,122,25,95,76,111,97,100,101,114,66,97,115,105,99,115, - 46,101,120,101,99,95,109,111,100,117,108,101,99,2,0,0, - 0,0,0,0,0,2,0,0,0,3,0,0,0,67,0,0, - 0,115,16,0,0,0,116,0,0,106,1,0,124,0,0,124, - 1,0,131,2,0,83,41,1,78,41,2,114,123,0,0,0, - 218,17,95,108,111,97,100,95,109,111,100,117,108,101,95,115, - 104,105,109,41,2,114,110,0,0,0,114,128,0,0,0,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,11, - 108,111,97,100,95,109,111,100,117,108,101,187,2,0,0,115, - 2,0,0,0,0,1,122,25,95,76,111,97,100,101,114,66, - 97,115,105,99,115,46,108,111,97,100,95,109,111,100,117,108, - 101,78,41,8,114,114,0,0,0,114,113,0,0,0,114,115, - 0,0,0,114,116,0,0,0,114,162,0,0,0,114,188,0, - 0,0,114,193,0,0,0,114,195,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,186,0,0,0,163,2,0,0,115,10,0,0,0,12,3, - 6,2,12,8,12,3,12,8,114,186,0,0,0,99,0,0, - 0,0,0,0,0,0,0,0,0,0,4,0,0,0,64,0, - 0,0,115,106,0,0,0,101,0,0,90,1,0,100,0,0, - 90,2,0,100,1,0,100,2,0,132,0,0,90,3,0,100, - 3,0,100,4,0,132,0,0,90,4,0,100,5,0,100,6, - 0,132,0,0,90,5,0,100,7,0,100,8,0,132,0,0, - 90,6,0,100,9,0,100,10,0,132,0,0,90,7,0,100, - 11,0,100,18,0,100,13,0,100,14,0,132,0,1,90,8, - 0,100,15,0,100,16,0,132,0,0,90,9,0,100,17,0, - 83,41,19,218,12,83,111,117,114,99,101,76,111,97,100,101, - 114,99,2,0,0,0,0,0,0,0,2,0,0,0,1,0, - 0,0,67,0,0,0,115,10,0,0,0,116,0,0,130,1, - 0,100,1,0,83,41,2,122,178,79,112,116,105,111,110,97, - 108,32,109,101,116,104,111,100,32,116,104,97,116,32,114,101, - 116,117,114,110,115,32,116,104,101,32,109,111,100,105,102,105, - 99,97,116,105,111,110,32,116,105,109,101,32,40,97,110,32, - 105,110,116,41,32,102,111,114,32,116,104,101,10,32,32,32, - 32,32,32,32,32,115,112,101,99,105,102,105,101,100,32,112, - 97,116,104,44,32,119,104,101,114,101,32,112,97,116,104,32, - 105,115,32,97,32,115,116,114,46,10,10,32,32,32,32,32, - 32,32,32,82,97,105,115,101,115,32,73,79,69,114,114,111, - 114,32,119,104,101,110,32,116,104,101,32,112,97,116,104,32, - 99,97,110,110,111,116,32,98,101,32,104,97,110,100,108,101, - 100,46,10,32,32,32,32,32,32,32,32,78,41,1,218,7, - 73,79,69,114,114,111,114,41,2,114,110,0,0,0,114,37, - 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,10,112,97,116,104,95,109,116,105,109,101,193,2, - 0,0,115,2,0,0,0,0,6,122,23,83,111,117,114,99, - 101,76,111,97,100,101,114,46,112,97,116,104,95,109,116,105, - 109,101,99,2,0,0,0,0,0,0,0,2,0,0,0,3, - 0,0,0,67,0,0,0,115,19,0,0,0,100,1,0,124, - 0,0,106,0,0,124,1,0,131,1,0,105,1,0,83,41, - 2,97,170,1,0,0,79,112,116,105,111,110,97,108,32,109, - 101,116,104,111,100,32,114,101,116,117,114,110,105,110,103,32, - 97,32,109,101,116,97,100,97,116,97,32,100,105,99,116,32, - 102,111,114,32,116,104,101,32,115,112,101,99,105,102,105,101, - 100,32,112,97,116,104,10,32,32,32,32,32,32,32,32,116, - 111,32,98,121,32,116,104,101,32,112,97,116,104,32,40,115, - 116,114,41,46,10,32,32,32,32,32,32,32,32,80,111,115, - 115,105,98,108,101,32,107,101,121,115,58,10,32,32,32,32, - 32,32,32,32,45,32,39,109,116,105,109,101,39,32,40,109, - 97,110,100,97,116,111,114,121,41,32,105,115,32,116,104,101, - 32,110,117,109,101,114,105,99,32,116,105,109,101,115,116,97, - 109,112,32,111,102,32,108,97,115,116,32,115,111,117,114,99, - 101,10,32,32,32,32,32,32,32,32,32,32,99,111,100,101, - 32,109,111,100,105,102,105,99,97,116,105,111,110,59,10,32, - 32,32,32,32,32,32,32,45,32,39,115,105,122,101,39,32, - 40,111,112,116,105,111,110,97,108,41,32,105,115,32,116,104, - 101,32,115,105,122,101,32,105,110,32,98,121,116,101,115,32, - 111,102,32,116,104,101,32,115,111,117,114,99,101,32,99,111, - 100,101,46,10,10,32,32,32,32,32,32,32,32,73,109,112, - 108,101,109,101,110,116,105,110,103,32,116,104,105,115,32,109, - 101,116,104,111,100,32,97,108,108,111,119,115,32,116,104,101, - 32,108,111,97,100,101,114,32,116,111,32,114,101,97,100,32, - 98,121,116,101,99,111,100,101,32,102,105,108,101,115,46,10, - 32,32,32,32,32,32,32,32,82,97,105,115,101,115,32,73, - 79,69,114,114,111,114,32,119,104,101,110,32,116,104,101,32, - 112,97,116,104,32,99,97,110,110,111,116,32,98,101,32,104, - 97,110,100,108,101,100,46,10,32,32,32,32,32,32,32,32, - 114,135,0,0,0,41,1,114,198,0,0,0,41,2,114,110, - 0,0,0,114,37,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,218,10,112,97,116,104,95,115,116, - 97,116,115,201,2,0,0,115,2,0,0,0,0,11,122,23, - 83,111,117,114,99,101,76,111,97,100,101,114,46,112,97,116, - 104,95,115,116,97,116,115,99,4,0,0,0,0,0,0,0, - 4,0,0,0,3,0,0,0,67,0,0,0,115,16,0,0, - 0,124,0,0,106,0,0,124,2,0,124,3,0,131,2,0, - 83,41,1,122,228,79,112,116,105,111,110,97,108,32,109,101, - 116,104,111,100,32,119,104,105,99,104,32,119,114,105,116,101, - 115,32,100,97,116,97,32,40,98,121,116,101,115,41,32,116, - 111,32,97,32,102,105,108,101,32,112,97,116,104,32,40,97, - 32,115,116,114,41,46,10,10,32,32,32,32,32,32,32,32, - 73,109,112,108,101,109,101,110,116,105,110,103,32,116,104,105, - 115,32,109,101,116,104,111,100,32,97,108,108,111,119,115,32, - 102,111,114,32,116,104,101,32,119,114,105,116,105,110,103,32, - 111,102,32,98,121,116,101,99,111,100,101,32,102,105,108,101, - 115,46,10,10,32,32,32,32,32,32,32,32,84,104,101,32, - 115,111,117,114,99,101,32,112,97,116,104,32,105,115,32,110, - 101,101,100,101,100,32,105,110,32,111,114,100,101,114,32,116, - 111,32,99,111,114,114,101,99,116,108,121,32,116,114,97,110, - 115,102,101,114,32,112,101,114,109,105,115,115,105,111,110,115, - 10,32,32,32,32,32,32,32,32,41,1,218,8,115,101,116, - 95,100,97,116,97,41,4,114,110,0,0,0,114,92,0,0, - 0,90,10,99,97,99,104,101,95,112,97,116,104,114,55,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,15,95,99,97,99,104,101,95,98,121,116,101,99,111, - 100,101,214,2,0,0,115,2,0,0,0,0,8,122,28,83, - 111,117,114,99,101,76,111,97,100,101,114,46,95,99,97,99, - 104,101,95,98,121,116,101,99,111,100,101,99,3,0,0,0, - 0,0,0,0,3,0,0,0,1,0,0,0,67,0,0,0, - 115,4,0,0,0,100,1,0,83,41,2,122,150,79,112,116, - 105,111,110,97,108,32,109,101,116,104,111,100,32,119,104,105, - 99,104,32,119,114,105,116,101,115,32,100,97,116,97,32,40, - 98,121,116,101,115,41,32,116,111,32,97,32,102,105,108,101, - 32,112,97,116,104,32,40,97,32,115,116,114,41,46,10,10, - 32,32,32,32,32,32,32,32,73,109,112,108,101,109,101,110, - 116,105,110,103,32,116,104,105,115,32,109,101,116,104,111,100, - 32,97,108,108,111,119,115,32,102,111,114,32,116,104,101,32, - 119,114,105,116,105,110,103,32,111,102,32,98,121,116,101,99, - 111,100,101,32,102,105,108,101,115,46,10,32,32,32,32,32, - 32,32,32,78,114,4,0,0,0,41,3,114,110,0,0,0, - 114,37,0,0,0,114,55,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,200,0,0,0,224,2, - 0,0,115,0,0,0,0,122,21,83,111,117,114,99,101,76, - 111,97,100,101,114,46,115,101,116,95,100,97,116,97,99,2, - 0,0,0,0,0,0,0,5,0,0,0,16,0,0,0,67, - 0,0,0,115,105,0,0,0,124,0,0,106,0,0,124,1, - 0,131,1,0,125,2,0,121,19,0,124,0,0,106,1,0, - 124,2,0,131,1,0,125,3,0,87,110,58,0,4,116,2, - 0,107,10,0,114,94,0,1,125,4,0,1,122,26,0,116, - 3,0,100,1,0,100,2,0,124,1,0,131,1,1,124,4, - 0,130,2,0,87,89,100,3,0,100,3,0,125,4,0,126, - 4,0,88,110,1,0,88,116,4,0,124,3,0,131,1,0, - 83,41,4,122,52,67,111,110,99,114,101,116,101,32,105,109, - 112,108,101,109,101,110,116,97,116,105,111,110,32,111,102,32, - 73,110,115,112,101,99,116,76,111,97,100,101,114,46,103,101, - 116,95,115,111,117,114,99,101,46,122,39,115,111,117,114,99, - 101,32,110,111,116,32,97,118,97,105,108,97,98,108,101,32, - 116,104,114,111,117,103,104,32,103,101,116,95,100,97,116,97, - 40,41,114,108,0,0,0,78,41,5,114,160,0,0,0,218, - 8,103,101,116,95,100,97,116,97,114,42,0,0,0,114,109, - 0,0,0,114,158,0,0,0,41,5,114,110,0,0,0,114, - 128,0,0,0,114,37,0,0,0,114,156,0,0,0,218,3, - 101,120,99,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,10,103,101,116,95,115,111,117,114,99,101,231,2, - 0,0,115,14,0,0,0,0,2,15,1,3,1,19,1,18, - 1,9,1,31,1,122,23,83,111,117,114,99,101,76,111,97, - 100,101,114,46,103,101,116,95,115,111,117,114,99,101,218,9, - 95,111,112,116,105,109,105,122,101,114,31,0,0,0,99,3, - 0,0,0,1,0,0,0,4,0,0,0,9,0,0,0,67, - 0,0,0,115,34,0,0,0,116,0,0,106,1,0,116,2, - 0,124,1,0,124,2,0,100,1,0,100,2,0,100,3,0, - 100,4,0,124,3,0,131,4,2,83,41,5,122,130,82,101, - 116,117,114,110,32,116,104,101,32,99,111,100,101,32,111,98, - 106,101,99,116,32,99,111,109,112,105,108,101,100,32,102,114, - 111,109,32,115,111,117,114,99,101,46,10,10,32,32,32,32, - 32,32,32,32,84,104,101,32,39,100,97,116,97,39,32,97, - 114,103,117,109,101,110,116,32,99,97,110,32,98,101,32,97, - 110,121,32,111,98,106,101,99,116,32,116,121,112,101,32,116, - 104,97,116,32,99,111,109,112,105,108,101,40,41,32,115,117, - 112,112,111,114,116,115,46,10,32,32,32,32,32,32,32,32, - 114,191,0,0,0,218,12,100,111,110,116,95,105,110,104,101, - 114,105,116,84,114,70,0,0,0,41,3,114,123,0,0,0, - 114,190,0,0,0,218,7,99,111,109,112,105,108,101,41,4, - 114,110,0,0,0,114,55,0,0,0,114,37,0,0,0,114, - 205,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,218,14,115,111,117,114,99,101,95,116,111,95,99, - 111,100,101,241,2,0,0,115,4,0,0,0,0,5,21,1, - 122,27,83,111,117,114,99,101,76,111,97,100,101,114,46,115, - 111,117,114,99,101,95,116,111,95,99,111,100,101,99,2,0, - 0,0,0,0,0,0,10,0,0,0,43,0,0,0,67,0, - 0,0,115,174,1,0,0,124,0,0,106,0,0,124,1,0, - 131,1,0,125,2,0,100,1,0,125,3,0,121,16,0,116, - 1,0,124,2,0,131,1,0,125,4,0,87,110,24,0,4, - 116,2,0,107,10,0,114,63,0,1,1,1,100,1,0,125, - 4,0,89,110,202,0,88,121,19,0,124,0,0,106,3,0, - 124,2,0,131,1,0,125,5,0,87,110,18,0,4,116,4, - 0,107,10,0,114,103,0,1,1,1,89,110,162,0,88,116, - 5,0,124,5,0,100,2,0,25,131,1,0,125,3,0,121, - 19,0,124,0,0,106,6,0,124,4,0,131,1,0,125,6, - 0,87,110,18,0,4,116,7,0,107,10,0,114,159,0,1, - 1,1,89,110,106,0,88,121,34,0,116,8,0,124,6,0, - 100,3,0,124,5,0,100,4,0,124,1,0,100,5,0,124, - 4,0,131,1,3,125,7,0,87,110,24,0,4,116,9,0, - 116,10,0,102,2,0,107,10,0,114,220,0,1,1,1,89, - 110,45,0,88,116,11,0,100,6,0,124,4,0,124,2,0, - 131,3,0,1,116,12,0,124,7,0,100,4,0,124,1,0, - 100,7,0,124,4,0,100,8,0,124,2,0,131,1,3,83, - 124,0,0,106,6,0,124,2,0,131,1,0,125,8,0,124, - 0,0,106,13,0,124,8,0,124,2,0,131,2,0,125,9, - 0,116,11,0,100,9,0,124,2,0,131,2,0,1,116,14, - 0,106,15,0,12,114,170,1,124,4,0,100,1,0,107,9, - 0,114,170,1,124,3,0,100,1,0,107,9,0,114,170,1, - 116,16,0,124,9,0,124,3,0,116,17,0,124,8,0,131, - 1,0,131,3,0,125,6,0,121,36,0,124,0,0,106,18, - 0,124,2,0,124,4,0,124,6,0,131,3,0,1,116,11, - 0,100,10,0,124,4,0,131,2,0,1,87,110,18,0,4, - 116,2,0,107,10,0,114,169,1,1,1,1,89,110,1,0, - 88,124,9,0,83,41,11,122,190,67,111,110,99,114,101,116, - 101,32,105,109,112,108,101,109,101,110,116,97,116,105,111,110, - 32,111,102,32,73,110,115,112,101,99,116,76,111,97,100,101, - 114,46,103,101,116,95,99,111,100,101,46,10,10,32,32,32, - 32,32,32,32,32,82,101,97,100,105,110,103,32,111,102,32, - 98,121,116,101,99,111,100,101,32,114,101,113,117,105,114,101, - 115,32,112,97,116,104,95,115,116,97,116,115,32,116,111,32, - 98,101,32,105,109,112,108,101,109,101,110,116,101,100,46,32, - 84,111,32,119,114,105,116,101,10,32,32,32,32,32,32,32, - 32,98,121,116,101,99,111,100,101,44,32,115,101,116,95,100, - 97,116,97,32,109,117,115,116,32,97,108,115,111,32,98,101, - 32,105,109,112,108,101,109,101,110,116,101,100,46,10,10,32, - 32,32,32,32,32,32,32,78,114,135,0,0,0,114,141,0, - 0,0,114,108,0,0,0,114,37,0,0,0,122,13,123,125, - 32,109,97,116,99,104,101,115,32,123,125,114,91,0,0,0, - 114,92,0,0,0,122,19,99,111,100,101,32,111,98,106,101, - 99,116,32,102,114,111,109,32,123,125,122,10,119,114,111,116, - 101,32,123,33,114,125,41,19,114,160,0,0,0,114,81,0, - 0,0,114,68,0,0,0,114,199,0,0,0,114,197,0,0, - 0,114,16,0,0,0,114,202,0,0,0,114,42,0,0,0, - 114,144,0,0,0,114,109,0,0,0,114,139,0,0,0,114, - 107,0,0,0,114,150,0,0,0,114,208,0,0,0,114,8, - 0,0,0,218,19,100,111,110,116,95,119,114,105,116,101,95, - 98,121,116,101,99,111,100,101,114,153,0,0,0,114,33,0, - 0,0,114,201,0,0,0,41,10,114,110,0,0,0,114,128, - 0,0,0,114,92,0,0,0,114,142,0,0,0,114,91,0, - 0,0,218,2,115,116,114,55,0,0,0,218,10,98,121,116, - 101,115,95,100,97,116,97,114,156,0,0,0,90,11,99,111, - 100,101,95,111,98,106,101,99,116,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,189,0,0,0,249,2,0, - 0,115,78,0,0,0,0,7,15,1,6,1,3,1,16,1, - 13,1,11,2,3,1,19,1,13,1,5,2,16,1,3,1, - 19,1,13,1,5,2,3,1,9,1,12,1,13,1,19,1, - 5,2,9,1,7,1,15,1,6,1,7,1,15,1,18,1, - 13,1,22,1,12,1,9,1,15,1,3,1,19,1,17,1, - 13,1,5,1,122,21,83,111,117,114,99,101,76,111,97,100, - 101,114,46,103,101,116,95,99,111,100,101,78,114,89,0,0, - 0,41,10,114,114,0,0,0,114,113,0,0,0,114,115,0, - 0,0,114,198,0,0,0,114,199,0,0,0,114,201,0,0, - 0,114,200,0,0,0,114,204,0,0,0,114,208,0,0,0, - 114,189,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,196,0,0,0,191,2, - 0,0,115,14,0,0,0,12,2,12,8,12,13,12,10,12, - 7,12,10,18,8,114,196,0,0,0,99,0,0,0,0,0, - 0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,115, - 112,0,0,0,101,0,0,90,1,0,100,0,0,90,2,0, - 100,1,0,90,3,0,100,2,0,100,3,0,132,0,0,90, - 4,0,100,4,0,100,5,0,132,0,0,90,5,0,100,6, - 0,100,7,0,132,0,0,90,6,0,101,7,0,135,0,0, - 102,1,0,100,8,0,100,9,0,134,0,0,131,1,0,90, - 8,0,101,7,0,100,10,0,100,11,0,132,0,0,131,1, - 0,90,9,0,100,12,0,100,13,0,132,0,0,90,10,0, - 135,0,0,83,41,14,218,10,70,105,108,101,76,111,97,100, - 101,114,122,103,66,97,115,101,32,102,105,108,101,32,108,111, - 97,100,101,114,32,99,108,97,115,115,32,119,104,105,99,104, - 32,105,109,112,108,101,109,101,110,116,115,32,116,104,101,32, - 108,111,97,100,101,114,32,112,114,111,116,111,99,111,108,32, - 109,101,116,104,111,100,115,32,116,104,97,116,10,32,32,32, - 32,114,101,113,117,105,114,101,32,102,105,108,101,32,115,121, - 115,116,101,109,32,117,115,97,103,101,46,99,3,0,0,0, - 0,0,0,0,3,0,0,0,2,0,0,0,67,0,0,0, - 115,22,0,0,0,124,1,0,124,0,0,95,0,0,124,2, - 0,124,0,0,95,1,0,100,1,0,83,41,2,122,75,67, - 97,99,104,101,32,116,104,101,32,109,111,100,117,108,101,32, - 110,97,109,101,32,97,110,100,32,116,104,101,32,112,97,116, - 104,32,116,111,32,116,104,101,32,102,105,108,101,32,102,111, - 117,110,100,32,98,121,32,116,104,101,10,32,32,32,32,32, - 32,32,32,102,105,110,100,101,114,46,78,41,2,114,108,0, - 0,0,114,37,0,0,0,41,3,114,110,0,0,0,114,128, - 0,0,0,114,37,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,187,0,0,0,50,3,0,0, - 115,4,0,0,0,0,3,9,1,122,19,70,105,108,101,76, - 111,97,100,101,114,46,95,95,105,110,105,116,95,95,99,2, - 0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,67, - 0,0,0,115,34,0,0,0,124,0,0,106,0,0,124,1, - 0,106,0,0,107,2,0,111,33,0,124,0,0,106,1,0, - 124,1,0,106,1,0,107,2,0,83,41,1,78,41,2,218, - 9,95,95,99,108,97,115,115,95,95,114,120,0,0,0,41, - 2,114,110,0,0,0,218,5,111,116,104,101,114,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,218,6,95,95, - 101,113,95,95,56,3,0,0,115,4,0,0,0,0,1,18, - 1,122,17,70,105,108,101,76,111,97,100,101,114,46,95,95, - 101,113,95,95,99,1,0,0,0,0,0,0,0,1,0,0, - 0,3,0,0,0,67,0,0,0,115,26,0,0,0,116,0, - 0,124,0,0,106,1,0,131,1,0,116,0,0,124,0,0, - 106,2,0,131,1,0,65,83,41,1,78,41,3,218,4,104, - 97,115,104,114,108,0,0,0,114,37,0,0,0,41,1,114, - 110,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,218,8,95,95,104,97,115,104,95,95,60,3,0, - 0,115,2,0,0,0,0,1,122,19,70,105,108,101,76,111, - 97,100,101,114,46,95,95,104,97,115,104,95,95,99,2,0, - 0,0,0,0,0,0,2,0,0,0,3,0,0,0,3,0, - 0,0,115,22,0,0,0,116,0,0,116,1,0,124,0,0, - 131,2,0,106,2,0,124,1,0,131,1,0,83,41,1,122, - 100,76,111,97,100,32,97,32,109,111,100,117,108,101,32,102, - 114,111,109,32,97,32,102,105,108,101,46,10,10,32,32,32, - 32,32,32,32,32,84,104,105,115,32,109,101,116,104,111,100, - 32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,32, - 32,85,115,101,32,101,120,101,99,95,109,111,100,117,108,101, - 40,41,32,105,110,115,116,101,97,100,46,10,10,32,32,32, - 32,32,32,32,32,41,3,218,5,115,117,112,101,114,114,212, - 0,0,0,114,195,0,0,0,41,2,114,110,0,0,0,114, - 128,0,0,0,41,1,114,213,0,0,0,114,4,0,0,0, - 114,6,0,0,0,114,195,0,0,0,63,3,0,0,115,2, - 0,0,0,0,10,122,22,70,105,108,101,76,111,97,100,101, - 114,46,108,111,97,100,95,109,111,100,117,108,101,99,2,0, + 95,75,69,89,114,50,0,0,0,114,8,0,0,0,218,12, + 118,101,114,115,105,111,110,95,105,110,102,111,114,169,0,0, + 0,114,167,0,0,0,90,10,81,117,101,114,121,86,97,108, + 117,101,114,42,0,0,0,41,6,114,168,0,0,0,114,123, + 0,0,0,90,12,114,101,103,105,115,116,114,121,95,107,101, + 121,114,5,0,0,0,90,4,104,107,101,121,218,8,102,105, + 108,101,112,97,116,104,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,218,16,95,115,101,97,114,99,104,95,114, + 101,103,105,115,116,114,121,99,2,0,0,115,22,0,0,0, + 0,2,6,1,8,2,6,1,6,1,22,1,2,1,12,1, + 26,1,14,1,6,1,122,38,87,105,110,100,111,119,115,82, + 101,103,105,115,116,114,121,70,105,110,100,101,114,46,95,115, + 101,97,114,99,104,95,114,101,103,105,115,116,114,121,78,99, + 4,0,0,0,0,0,0,0,8,0,0,0,14,0,0,0, + 67,0,0,0,115,120,0,0,0,124,0,106,0,124,1,131, + 1,125,4,124,4,100,0,107,8,114,22,100,0,83,0,121, + 12,116,1,124,4,131,1,1,0,87,0,110,20,4,0,116, + 2,107,10,114,54,1,0,1,0,1,0,100,0,83,0,88, + 0,120,58,116,3,131,0,68,0,93,48,92,2,125,5,125, + 6,124,4,106,4,116,5,124,6,131,1,131,1,114,64,116, + 6,106,7,124,1,124,5,124,1,124,4,131,2,124,4,100, + 1,141,3,125,7,124,7,83,0,113,64,87,0,100,0,83, + 0,41,2,78,41,1,114,156,0,0,0,41,8,114,175,0, + 0,0,114,41,0,0,0,114,42,0,0,0,114,159,0,0, + 0,114,96,0,0,0,114,97,0,0,0,114,118,0,0,0, + 218,16,115,112,101,99,95,102,114,111,109,95,108,111,97,100, + 101,114,41,8,114,168,0,0,0,114,123,0,0,0,114,37, + 0,0,0,218,6,116,97,114,103,101,116,114,174,0,0,0, + 114,124,0,0,0,114,164,0,0,0,114,162,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,9, + 102,105,110,100,95,115,112,101,99,114,2,0,0,115,26,0, + 0,0,0,2,10,1,8,1,4,1,2,1,12,1,14,1, + 6,1,16,1,14,1,6,1,8,1,8,1,122,31,87,105, + 110,100,111,119,115,82,101,103,105,115,116,114,121,70,105,110, + 100,101,114,46,102,105,110,100,95,115,112,101,99,99,3,0, + 0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,0, + 0,0,115,34,0,0,0,124,0,106,0,124,1,124,2,131, + 2,125,3,124,3,100,1,107,9,114,26,124,3,106,1,83, + 0,100,1,83,0,100,1,83,0,41,2,122,108,70,105,110, + 100,32,109,111,100,117,108,101,32,110,97,109,101,100,32,105, + 110,32,116,104,101,32,114,101,103,105,115,116,114,121,46,10, + 10,32,32,32,32,32,32,32,32,84,104,105,115,32,109,101, + 116,104,111,100,32,105,115,32,100,101,112,114,101,99,97,116, + 101,100,46,32,32,85,115,101,32,101,120,101,99,95,109,111, + 100,117,108,101,40,41,32,105,110,115,116,101,97,100,46,10, + 10,32,32,32,32,32,32,32,32,78,41,2,114,178,0,0, + 0,114,124,0,0,0,41,4,114,168,0,0,0,114,123,0, + 0,0,114,37,0,0,0,114,162,0,0,0,114,4,0,0, + 0,114,4,0,0,0,114,6,0,0,0,218,11,102,105,110, + 100,95,109,111,100,117,108,101,130,2,0,0,115,8,0,0, + 0,0,7,12,1,8,1,6,2,122,33,87,105,110,100,111, + 119,115,82,101,103,105,115,116,114,121,70,105,110,100,101,114, + 46,102,105,110,100,95,109,111,100,117,108,101,41,2,78,78, + 41,1,78,41,12,114,109,0,0,0,114,108,0,0,0,114, + 110,0,0,0,114,111,0,0,0,114,172,0,0,0,114,171, + 0,0,0,114,170,0,0,0,218,11,99,108,97,115,115,109, + 101,116,104,111,100,114,169,0,0,0,114,175,0,0,0,114, + 178,0,0,0,114,179,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,166,0, + 0,0,80,2,0,0,115,20,0,0,0,8,2,4,3,4, + 3,4,2,4,2,12,7,12,15,2,1,12,15,2,1,114, + 166,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0, + 0,2,0,0,0,64,0,0,0,115,48,0,0,0,101,0, + 90,1,100,0,90,2,100,1,90,3,100,2,100,3,132,0, + 90,4,100,4,100,5,132,0,90,5,100,6,100,7,132,0, + 90,6,100,8,100,9,132,0,90,7,100,10,83,0,41,11, + 218,13,95,76,111,97,100,101,114,66,97,115,105,99,115,122, + 83,66,97,115,101,32,99,108,97,115,115,32,111,102,32,99, + 111,109,109,111,110,32,99,111,100,101,32,110,101,101,100,101, + 100,32,98,121,32,98,111,116,104,32,83,111,117,114,99,101, + 76,111,97,100,101,114,32,97,110,100,10,32,32,32,32,83, + 111,117,114,99,101,108,101,115,115,70,105,108,101,76,111,97, + 100,101,114,46,99,2,0,0,0,0,0,0,0,5,0,0, + 0,3,0,0,0,67,0,0,0,115,64,0,0,0,116,0, + 124,0,106,1,124,1,131,1,131,1,100,1,25,0,125,2, + 124,2,106,2,100,2,100,1,131,2,100,3,25,0,125,3, + 124,1,106,3,100,2,131,1,100,4,25,0,125,4,124,3, + 100,5,107,2,111,62,124,4,100,5,107,3,83,0,41,6, + 122,141,67,111,110,99,114,101,116,101,32,105,109,112,108,101, + 109,101,110,116,97,116,105,111,110,32,111,102,32,73,110,115, + 112,101,99,116,76,111,97,100,101,114,46,105,115,95,112,97, + 99,107,97,103,101,32,98,121,32,99,104,101,99,107,105,110, + 103,32,105,102,10,32,32,32,32,32,32,32,32,116,104,101, + 32,112,97,116,104,32,114,101,116,117,114,110,101,100,32,98, + 121,32,103,101,116,95,102,105,108,101,110,97,109,101,32,104, + 97,115,32,97,32,102,105,108,101,110,97,109,101,32,111,102, + 32,39,95,95,105,110,105,116,95,95,46,112,121,39,46,114, + 31,0,0,0,114,61,0,0,0,114,62,0,0,0,114,59, + 0,0,0,218,8,95,95,105,110,105,116,95,95,41,4,114, + 40,0,0,0,114,155,0,0,0,114,36,0,0,0,114,34, + 0,0,0,41,5,114,104,0,0,0,114,123,0,0,0,114, + 98,0,0,0,90,13,102,105,108,101,110,97,109,101,95,98, + 97,115,101,90,9,116,97,105,108,95,110,97,109,101,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,157,0, + 0,0,149,2,0,0,115,8,0,0,0,0,3,18,1,16, + 1,14,1,122,24,95,76,111,97,100,101,114,66,97,115,105, + 99,115,46,105,115,95,112,97,99,107,97,103,101,99,2,0, 0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0, - 0,0,115,7,0,0,0,124,0,0,106,0,0,83,41,1, - 122,58,82,101,116,117,114,110,32,116,104,101,32,112,97,116, - 104,32,116,111,32,116,104,101,32,115,111,117,114,99,101,32, - 102,105,108,101,32,97,115,32,102,111,117,110,100,32,98,121, - 32,116,104,101,32,102,105,110,100,101,114,46,41,1,114,37, - 0,0,0,41,2,114,110,0,0,0,114,128,0,0,0,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,160, - 0,0,0,75,3,0,0,115,2,0,0,0,0,3,122,23, - 70,105,108,101,76,111,97,100,101,114,46,103,101,116,95,102, - 105,108,101,110,97,109,101,99,2,0,0,0,0,0,0,0, - 3,0,0,0,9,0,0,0,67,0,0,0,115,42,0,0, - 0,116,0,0,106,1,0,124,1,0,100,1,0,131,2,0, - 143,17,0,125,2,0,124,2,0,106,2,0,131,0,0,83, - 87,100,2,0,81,82,88,100,2,0,83,41,3,122,39,82, - 101,116,117,114,110,32,116,104,101,32,100,97,116,97,32,102, - 114,111,109,32,112,97,116,104,32,97,115,32,114,97,119,32, - 98,121,116,101,115,46,218,1,114,78,41,3,114,51,0,0, - 0,114,52,0,0,0,90,4,114,101,97,100,41,3,114,110, + 0,0,115,4,0,0,0,100,1,83,0,41,2,122,42,85, + 115,101,32,100,101,102,97,117,108,116,32,115,101,109,97,110, + 116,105,99,115,32,102,111,114,32,109,111,100,117,108,101,32, + 99,114,101,97,116,105,111,110,46,78,114,4,0,0,0,41, + 2,114,104,0,0,0,114,162,0,0,0,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,218,13,99,114,101,97, + 116,101,95,109,111,100,117,108,101,157,2,0,0,115,0,0, + 0,0,122,27,95,76,111,97,100,101,114,66,97,115,105,99, + 115,46,99,114,101,97,116,101,95,109,111,100,117,108,101,99, + 2,0,0,0,0,0,0,0,3,0,0,0,4,0,0,0, + 67,0,0,0,115,56,0,0,0,124,0,106,0,124,1,106, + 1,131,1,125,2,124,2,100,1,107,8,114,36,116,2,100, + 2,106,3,124,1,106,1,131,1,131,1,130,1,116,4,106, + 5,116,6,124,2,124,1,106,7,131,3,1,0,100,1,83, + 0,41,3,122,19,69,120,101,99,117,116,101,32,116,104,101, + 32,109,111,100,117,108,101,46,78,122,52,99,97,110,110,111, + 116,32,108,111,97,100,32,109,111,100,117,108,101,32,123,33, + 114,125,32,119,104,101,110,32,103,101,116,95,99,111,100,101, + 40,41,32,114,101,116,117,114,110,115,32,78,111,110,101,41, + 8,218,8,103,101,116,95,99,111,100,101,114,109,0,0,0, + 114,103,0,0,0,114,50,0,0,0,114,118,0,0,0,218, + 25,95,99,97,108,108,95,119,105,116,104,95,102,114,97,109, + 101,115,95,114,101,109,111,118,101,100,218,4,101,120,101,99, + 114,115,0,0,0,41,3,114,104,0,0,0,218,6,109,111, + 100,117,108,101,114,144,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,6,0,0,0,218,11,101,120,101,99,95,109, + 111,100,117,108,101,160,2,0,0,115,10,0,0,0,0,2, + 12,1,8,1,6,1,10,1,122,25,95,76,111,97,100,101, + 114,66,97,115,105,99,115,46,101,120,101,99,95,109,111,100, + 117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0, + 3,0,0,0,67,0,0,0,115,12,0,0,0,116,0,106, + 1,124,0,124,1,131,2,83,0,41,1,122,26,84,104,105, + 115,32,109,111,100,117,108,101,32,105,115,32,100,101,112,114, + 101,99,97,116,101,100,46,41,2,114,118,0,0,0,218,17, + 95,108,111,97,100,95,109,111,100,117,108,101,95,115,104,105, + 109,41,2,114,104,0,0,0,114,123,0,0,0,114,4,0, + 0,0,114,4,0,0,0,114,6,0,0,0,218,11,108,111, + 97,100,95,109,111,100,117,108,101,168,2,0,0,115,2,0, + 0,0,0,2,122,25,95,76,111,97,100,101,114,66,97,115, + 105,99,115,46,108,111,97,100,95,109,111,100,117,108,101,78, + 41,8,114,109,0,0,0,114,108,0,0,0,114,110,0,0, + 0,114,111,0,0,0,114,157,0,0,0,114,183,0,0,0, + 114,188,0,0,0,114,190,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,181, + 0,0,0,144,2,0,0,115,10,0,0,0,8,3,4,2, + 8,8,8,3,8,8,114,181,0,0,0,99,0,0,0,0, + 0,0,0,0,0,0,0,0,3,0,0,0,64,0,0,0, + 115,74,0,0,0,101,0,90,1,100,0,90,2,100,1,100, + 2,132,0,90,3,100,3,100,4,132,0,90,4,100,5,100, + 6,132,0,90,5,100,7,100,8,132,0,90,6,100,9,100, + 10,132,0,90,7,100,18,100,12,156,1,100,13,100,14,132, + 2,90,8,100,15,100,16,132,0,90,9,100,17,83,0,41, + 19,218,12,83,111,117,114,99,101,76,111,97,100,101,114,99, + 2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0, + 67,0,0,0,115,8,0,0,0,116,0,130,1,100,1,83, + 0,41,2,122,178,79,112,116,105,111,110,97,108,32,109,101, + 116,104,111,100,32,116,104,97,116,32,114,101,116,117,114,110, + 115,32,116,104,101,32,109,111,100,105,102,105,99,97,116,105, + 111,110,32,116,105,109,101,32,40,97,110,32,105,110,116,41, + 32,102,111,114,32,116,104,101,10,32,32,32,32,32,32,32, + 32,115,112,101,99,105,102,105,101,100,32,112,97,116,104,44, + 32,119,104,101,114,101,32,112,97,116,104,32,105,115,32,97, + 32,115,116,114,46,10,10,32,32,32,32,32,32,32,32,82, + 97,105,115,101,115,32,73,79,69,114,114,111,114,32,119,104, + 101,110,32,116,104,101,32,112,97,116,104,32,99,97,110,110, + 111,116,32,98,101,32,104,97,110,100,108,101,100,46,10,32, + 32,32,32,32,32,32,32,78,41,1,218,7,73,79,69,114, + 114,111,114,41,2,114,104,0,0,0,114,37,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,10, + 112,97,116,104,95,109,116,105,109,101,175,2,0,0,115,2, + 0,0,0,0,6,122,23,83,111,117,114,99,101,76,111,97, + 100,101,114,46,112,97,116,104,95,109,116,105,109,101,99,2, + 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,67, + 0,0,0,115,14,0,0,0,100,1,124,0,106,0,124,1, + 131,1,105,1,83,0,41,2,97,170,1,0,0,79,112,116, + 105,111,110,97,108,32,109,101,116,104,111,100,32,114,101,116, + 117,114,110,105,110,103,32,97,32,109,101,116,97,100,97,116, + 97,32,100,105,99,116,32,102,111,114,32,116,104,101,32,115, + 112,101,99,105,102,105,101,100,32,112,97,116,104,10,32,32, + 32,32,32,32,32,32,116,111,32,98,121,32,116,104,101,32, + 112,97,116,104,32,40,115,116,114,41,46,10,32,32,32,32, + 32,32,32,32,80,111,115,115,105,98,108,101,32,107,101,121, + 115,58,10,32,32,32,32,32,32,32,32,45,32,39,109,116, + 105,109,101,39,32,40,109,97,110,100,97,116,111,114,121,41, + 32,105,115,32,116,104,101,32,110,117,109,101,114,105,99,32, + 116,105,109,101,115,116,97,109,112,32,111,102,32,108,97,115, + 116,32,115,111,117,114,99,101,10,32,32,32,32,32,32,32, + 32,32,32,99,111,100,101,32,109,111,100,105,102,105,99,97, + 116,105,111,110,59,10,32,32,32,32,32,32,32,32,45,32, + 39,115,105,122,101,39,32,40,111,112,116,105,111,110,97,108, + 41,32,105,115,32,116,104,101,32,115,105,122,101,32,105,110, + 32,98,121,116,101,115,32,111,102,32,116,104,101,32,115,111, + 117,114,99,101,32,99,111,100,101,46,10,10,32,32,32,32, + 32,32,32,32,73,109,112,108,101,109,101,110,116,105,110,103, + 32,116,104,105,115,32,109,101,116,104,111,100,32,97,108,108, + 111,119,115,32,116,104,101,32,108,111,97,100,101,114,32,116, + 111,32,114,101,97,100,32,98,121,116,101,99,111,100,101,32, + 102,105,108,101,115,46,10,32,32,32,32,32,32,32,32,82, + 97,105,115,101,115,32,73,79,69,114,114,111,114,32,119,104, + 101,110,32,116,104,101,32,112,97,116,104,32,99,97,110,110, + 111,116,32,98,101,32,104,97,110,100,108,101,100,46,10,32, + 32,32,32,32,32,32,32,114,130,0,0,0,41,1,114,193, + 0,0,0,41,2,114,104,0,0,0,114,37,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,10, + 112,97,116,104,95,115,116,97,116,115,183,2,0,0,115,2, + 0,0,0,0,11,122,23,83,111,117,114,99,101,76,111,97, + 100,101,114,46,112,97,116,104,95,115,116,97,116,115,99,4, + 0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,67, + 0,0,0,115,12,0,0,0,124,0,106,0,124,2,124,3, + 131,2,83,0,41,1,122,228,79,112,116,105,111,110,97,108, + 32,109,101,116,104,111,100,32,119,104,105,99,104,32,119,114, + 105,116,101,115,32,100,97,116,97,32,40,98,121,116,101,115, + 41,32,116,111,32,97,32,102,105,108,101,32,112,97,116,104, + 32,40,97,32,115,116,114,41,46,10,10,32,32,32,32,32, + 32,32,32,73,109,112,108,101,109,101,110,116,105,110,103,32, + 116,104,105,115,32,109,101,116,104,111,100,32,97,108,108,111, + 119,115,32,102,111,114,32,116,104,101,32,119,114,105,116,105, + 110,103,32,111,102,32,98,121,116,101,99,111,100,101,32,102, + 105,108,101,115,46,10,10,32,32,32,32,32,32,32,32,84, + 104,101,32,115,111,117,114,99,101,32,112,97,116,104,32,105, + 115,32,110,101,101,100,101,100,32,105,110,32,111,114,100,101, + 114,32,116,111,32,99,111,114,114,101,99,116,108,121,32,116, + 114,97,110,115,102,101,114,32,112,101,114,109,105,115,115,105, + 111,110,115,10,32,32,32,32,32,32,32,32,41,1,218,8, + 115,101,116,95,100,97,116,97,41,4,114,104,0,0,0,114, + 94,0,0,0,90,10,99,97,99,104,101,95,112,97,116,104, + 114,56,0,0,0,114,4,0,0,0,114,4,0,0,0,114, + 6,0,0,0,218,15,95,99,97,99,104,101,95,98,121,116, + 101,99,111,100,101,196,2,0,0,115,2,0,0,0,0,8, + 122,28,83,111,117,114,99,101,76,111,97,100,101,114,46,95, + 99,97,99,104,101,95,98,121,116,101,99,111,100,101,99,3, + 0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,67, + 0,0,0,115,4,0,0,0,100,1,83,0,41,2,122,150, + 79,112,116,105,111,110,97,108,32,109,101,116,104,111,100,32, + 119,104,105,99,104,32,119,114,105,116,101,115,32,100,97,116, + 97,32,40,98,121,116,101,115,41,32,116,111,32,97,32,102, + 105,108,101,32,112,97,116,104,32,40,97,32,115,116,114,41, + 46,10,10,32,32,32,32,32,32,32,32,73,109,112,108,101, + 109,101,110,116,105,110,103,32,116,104,105,115,32,109,101,116, + 104,111,100,32,97,108,108,111,119,115,32,102,111,114,32,116, + 104,101,32,119,114,105,116,105,110,103,32,111,102,32,98,121, + 116,101,99,111,100,101,32,102,105,108,101,115,46,10,32,32, + 32,32,32,32,32,32,78,114,4,0,0,0,41,3,114,104, 0,0,0,114,37,0,0,0,114,56,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,114,202,0,0, - 0,80,3,0,0,115,4,0,0,0,0,2,21,1,122,19, - 70,105,108,101,76,111,97,100,101,114,46,103,101,116,95,100, - 97,116,97,41,11,114,114,0,0,0,114,113,0,0,0,114, - 115,0,0,0,114,116,0,0,0,114,187,0,0,0,114,215, - 0,0,0,114,217,0,0,0,114,125,0,0,0,114,195,0, - 0,0,114,160,0,0,0,114,202,0,0,0,114,4,0,0, - 0,114,4,0,0,0,41,1,114,213,0,0,0,114,6,0, - 0,0,114,212,0,0,0,45,3,0,0,115,14,0,0,0, - 12,3,6,2,12,6,12,4,12,3,24,12,18,5,114,212, - 0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0, - 4,0,0,0,64,0,0,0,115,64,0,0,0,101,0,0, - 90,1,0,100,0,0,90,2,0,100,1,0,90,3,0,100, - 2,0,100,3,0,132,0,0,90,4,0,100,4,0,100,5, - 0,132,0,0,90,5,0,100,6,0,100,7,0,100,8,0, - 100,9,0,132,0,1,90,6,0,100,10,0,83,41,11,218, - 16,83,111,117,114,99,101,70,105,108,101,76,111,97,100,101, - 114,122,62,67,111,110,99,114,101,116,101,32,105,109,112,108, - 101,109,101,110,116,97,116,105,111,110,32,111,102,32,83,111, - 117,114,99,101,76,111,97,100,101,114,32,117,115,105,110,103, - 32,116,104,101,32,102,105,108,101,32,115,121,115,116,101,109, - 46,99,2,0,0,0,0,0,0,0,3,0,0,0,4,0, - 0,0,67,0,0,0,115,34,0,0,0,116,0,0,124,1, - 0,131,1,0,125,2,0,100,1,0,124,2,0,106,1,0, - 100,2,0,124,2,0,106,2,0,105,2,0,83,41,3,122, - 33,82,101,116,117,114,110,32,116,104,101,32,109,101,116,97, - 100,97,116,97,32,102,111,114,32,116,104,101,32,112,97,116, - 104,46,114,135,0,0,0,114,136,0,0,0,41,3,114,41, + 0,0,114,4,0,0,0,114,6,0,0,0,114,195,0,0, + 0,206,2,0,0,115,0,0,0,0,122,21,83,111,117,114, + 99,101,76,111,97,100,101,114,46,115,101,116,95,100,97,116, + 97,99,2,0,0,0,0,0,0,0,5,0,0,0,16,0, + 0,0,67,0,0,0,115,82,0,0,0,124,0,106,0,124, + 1,131,1,125,2,121,14,124,0,106,1,124,2,131,1,125, + 3,87,0,110,48,4,0,116,2,107,10,114,72,1,0,125, + 4,1,0,122,20,116,3,100,1,124,1,100,2,141,2,124, + 4,130,2,87,0,89,0,100,3,100,3,125,4,126,4,88, + 0,110,2,88,0,116,4,124,3,131,1,83,0,41,4,122, + 52,67,111,110,99,114,101,116,101,32,105,109,112,108,101,109, + 101,110,116,97,116,105,111,110,32,111,102,32,73,110,115,112, + 101,99,116,76,111,97,100,101,114,46,103,101,116,95,115,111, + 117,114,99,101,46,122,39,115,111,117,114,99,101,32,110,111, + 116,32,97,118,97,105,108,97,98,108,101,32,116,104,114,111, + 117,103,104,32,103,101,116,95,100,97,116,97,40,41,41,1, + 114,102,0,0,0,78,41,5,114,155,0,0,0,218,8,103, + 101,116,95,100,97,116,97,114,42,0,0,0,114,103,0,0, + 0,114,153,0,0,0,41,5,114,104,0,0,0,114,123,0, + 0,0,114,37,0,0,0,114,151,0,0,0,218,3,101,120, + 99,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 218,10,103,101,116,95,115,111,117,114,99,101,213,2,0,0, + 115,14,0,0,0,0,2,10,1,2,1,14,1,16,1,4, + 1,28,1,122,23,83,111,117,114,99,101,76,111,97,100,101, + 114,46,103,101,116,95,115,111,117,114,99,101,114,31,0,0, + 0,41,1,218,9,95,111,112,116,105,109,105,122,101,99,3, + 0,0,0,1,0,0,0,4,0,0,0,8,0,0,0,67, + 0,0,0,115,22,0,0,0,116,0,106,1,116,2,124,1, + 124,2,100,1,100,2,124,3,100,3,141,6,83,0,41,4, + 122,130,82,101,116,117,114,110,32,116,104,101,32,99,111,100, + 101,32,111,98,106,101,99,116,32,99,111,109,112,105,108,101, + 100,32,102,114,111,109,32,115,111,117,114,99,101,46,10,10, + 32,32,32,32,32,32,32,32,84,104,101,32,39,100,97,116, + 97,39,32,97,114,103,117,109,101,110,116,32,99,97,110,32, + 98,101,32,97,110,121,32,111,98,106,101,99,116,32,116,121, + 112,101,32,116,104,97,116,32,99,111,109,112,105,108,101,40, + 41,32,115,117,112,112,111,114,116,115,46,10,32,32,32,32, + 32,32,32,32,114,186,0,0,0,84,41,2,218,12,100,111, + 110,116,95,105,110,104,101,114,105,116,114,72,0,0,0,41, + 3,114,118,0,0,0,114,185,0,0,0,218,7,99,111,109, + 112,105,108,101,41,4,114,104,0,0,0,114,56,0,0,0, + 114,37,0,0,0,114,200,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,218,14,115,111,117,114,99, + 101,95,116,111,95,99,111,100,101,223,2,0,0,115,4,0, + 0,0,0,5,12,1,122,27,83,111,117,114,99,101,76,111, + 97,100,101,114,46,115,111,117,114,99,101,95,116,111,95,99, + 111,100,101,99,2,0,0,0,0,0,0,0,10,0,0,0, + 43,0,0,0,67,0,0,0,115,94,1,0,0,124,0,106, + 0,124,1,131,1,125,2,100,1,125,3,121,12,116,1,124, + 2,131,1,125,4,87,0,110,24,4,0,116,2,107,10,114, + 50,1,0,1,0,1,0,100,1,125,4,89,0,110,162,88, + 0,121,14,124,0,106,3,124,2,131,1,125,5,87,0,110, + 20,4,0,116,4,107,10,114,86,1,0,1,0,1,0,89, + 0,110,126,88,0,116,5,124,5,100,2,25,0,131,1,125, + 3,121,14,124,0,106,6,124,4,131,1,125,6,87,0,110, + 20,4,0,116,7,107,10,114,134,1,0,1,0,1,0,89, + 0,110,78,88,0,121,20,116,8,124,6,124,5,124,1,124, + 4,100,3,141,4,125,7,87,0,110,24,4,0,116,9,116, + 10,102,2,107,10,114,180,1,0,1,0,1,0,89,0,110, + 32,88,0,116,11,106,12,100,4,124,4,124,2,131,3,1, + 0,116,13,124,7,124,1,124,4,124,2,100,5,141,4,83, + 0,124,0,106,6,124,2,131,1,125,8,124,0,106,14,124, + 8,124,2,131,2,125,9,116,11,106,12,100,6,124,2,131, + 2,1,0,116,15,106,16,12,0,144,1,114,90,124,4,100, + 1,107,9,144,1,114,90,124,3,100,1,107,9,144,1,114, + 90,116,17,124,9,124,3,116,18,124,8,131,1,131,3,125, + 6,121,30,124,0,106,19,124,2,124,4,124,6,131,3,1, + 0,116,11,106,12,100,7,124,4,131,2,1,0,87,0,110, + 22,4,0,116,2,107,10,144,1,114,88,1,0,1,0,1, + 0,89,0,110,2,88,0,124,9,83,0,41,8,122,190,67, + 111,110,99,114,101,116,101,32,105,109,112,108,101,109,101,110, + 116,97,116,105,111,110,32,111,102,32,73,110,115,112,101,99, + 116,76,111,97,100,101,114,46,103,101,116,95,99,111,100,101, + 46,10,10,32,32,32,32,32,32,32,32,82,101,97,100,105, + 110,103,32,111,102,32,98,121,116,101,99,111,100,101,32,114, + 101,113,117,105,114,101,115,32,112,97,116,104,95,115,116,97, + 116,115,32,116,111,32,98,101,32,105,109,112,108,101,109,101, + 110,116,101,100,46,32,84,111,32,119,114,105,116,101,10,32, + 32,32,32,32,32,32,32,98,121,116,101,99,111,100,101,44, + 32,115,101,116,95,100,97,116,97,32,109,117,115,116,32,97, + 108,115,111,32,98,101,32,105,109,112,108,101,109,101,110,116, + 101,100,46,10,10,32,32,32,32,32,32,32,32,78,114,130, + 0,0,0,41,3,114,136,0,0,0,114,102,0,0,0,114, + 37,0,0,0,122,13,123,125,32,109,97,116,99,104,101,115, + 32,123,125,41,3,114,102,0,0,0,114,93,0,0,0,114, + 94,0,0,0,122,19,99,111,100,101,32,111,98,106,101,99, + 116,32,102,114,111,109,32,123,125,122,10,119,114,111,116,101, + 32,123,33,114,125,41,20,114,155,0,0,0,114,83,0,0, + 0,114,70,0,0,0,114,194,0,0,0,114,192,0,0,0, + 114,16,0,0,0,114,197,0,0,0,114,42,0,0,0,114, + 139,0,0,0,114,103,0,0,0,114,134,0,0,0,114,118, + 0,0,0,114,133,0,0,0,114,145,0,0,0,114,203,0, + 0,0,114,8,0,0,0,218,19,100,111,110,116,95,119,114, + 105,116,101,95,98,121,116,101,99,111,100,101,114,148,0,0, + 0,114,33,0,0,0,114,196,0,0,0,41,10,114,104,0, + 0,0,114,123,0,0,0,114,94,0,0,0,114,137,0,0, + 0,114,93,0,0,0,218,2,115,116,114,56,0,0,0,218, + 10,98,121,116,101,115,95,100,97,116,97,114,151,0,0,0, + 90,11,99,111,100,101,95,111,98,106,101,99,116,114,4,0, + 0,0,114,4,0,0,0,114,6,0,0,0,114,184,0,0, + 0,231,2,0,0,115,78,0,0,0,0,7,10,1,4,1, + 2,1,12,1,14,1,10,2,2,1,14,1,14,1,6,2, + 12,1,2,1,14,1,14,1,6,2,2,1,4,1,4,1, + 12,1,18,1,6,2,8,1,6,1,6,1,2,1,8,1, + 10,1,12,1,12,1,20,1,10,1,6,1,10,1,2,1, + 14,1,16,1,16,1,6,1,122,21,83,111,117,114,99,101, + 76,111,97,100,101,114,46,103,101,116,95,99,111,100,101,78, + 114,91,0,0,0,41,10,114,109,0,0,0,114,108,0,0, + 0,114,110,0,0,0,114,193,0,0,0,114,194,0,0,0, + 114,196,0,0,0,114,195,0,0,0,114,199,0,0,0,114, + 203,0,0,0,114,184,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,191,0, + 0,0,173,2,0,0,115,14,0,0,0,8,2,8,8,8, + 13,8,10,8,7,8,10,14,8,114,191,0,0,0,99,0, + 0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0, + 0,0,0,115,80,0,0,0,101,0,90,1,100,0,90,2, + 100,1,90,3,100,2,100,3,132,0,90,4,100,4,100,5, + 132,0,90,5,100,6,100,7,132,0,90,6,101,7,135,0, + 102,1,100,8,100,9,132,8,131,1,90,8,101,7,100,10, + 100,11,132,0,131,1,90,9,100,12,100,13,132,0,90,10, + 135,0,4,0,90,11,83,0,41,14,218,10,70,105,108,101, + 76,111,97,100,101,114,122,103,66,97,115,101,32,102,105,108, + 101,32,108,111,97,100,101,114,32,99,108,97,115,115,32,119, + 104,105,99,104,32,105,109,112,108,101,109,101,110,116,115,32, + 116,104,101,32,108,111,97,100,101,114,32,112,114,111,116,111, + 99,111,108,32,109,101,116,104,111,100,115,32,116,104,97,116, + 10,32,32,32,32,114,101,113,117,105,114,101,32,102,105,108, + 101,32,115,121,115,116,101,109,32,117,115,97,103,101,46,99, + 3,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0, + 67,0,0,0,115,16,0,0,0,124,1,124,0,95,0,124, + 2,124,0,95,1,100,1,83,0,41,2,122,75,67,97,99, + 104,101,32,116,104,101,32,109,111,100,117,108,101,32,110,97, + 109,101,32,97,110,100,32,116,104,101,32,112,97,116,104,32, + 116,111,32,116,104,101,32,102,105,108,101,32,102,111,117,110, + 100,32,98,121,32,116,104,101,10,32,32,32,32,32,32,32, + 32,102,105,110,100,101,114,46,78,41,2,114,102,0,0,0, + 114,37,0,0,0,41,3,114,104,0,0,0,114,123,0,0, + 0,114,37,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,182,0,0,0,32,3,0,0,115,4, + 0,0,0,0,3,6,1,122,19,70,105,108,101,76,111,97, + 100,101,114,46,95,95,105,110,105,116,95,95,99,2,0,0, + 0,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0, + 0,115,24,0,0,0,124,0,106,0,124,1,106,0,107,2, + 111,22,124,0,106,1,124,1,106,1,107,2,83,0,41,1, + 78,41,2,218,9,95,95,99,108,97,115,115,95,95,114,115, + 0,0,0,41,2,114,104,0,0,0,218,5,111,116,104,101, + 114,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 218,6,95,95,101,113,95,95,38,3,0,0,115,4,0,0, + 0,0,1,12,1,122,17,70,105,108,101,76,111,97,100,101, + 114,46,95,95,101,113,95,95,99,1,0,0,0,0,0,0, + 0,1,0,0,0,3,0,0,0,67,0,0,0,115,20,0, + 0,0,116,0,124,0,106,1,131,1,116,0,124,0,106,2, + 131,1,65,0,83,0,41,1,78,41,3,218,4,104,97,115, + 104,114,102,0,0,0,114,37,0,0,0,41,1,114,104,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,218,8,95,95,104,97,115,104,95,95,42,3,0,0,115, + 2,0,0,0,0,1,122,19,70,105,108,101,76,111,97,100, + 101,114,46,95,95,104,97,115,104,95,95,99,2,0,0,0, + 0,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0, + 115,16,0,0,0,116,0,116,1,124,0,131,2,106,2,124, + 1,131,1,83,0,41,1,122,100,76,111,97,100,32,97,32, + 109,111,100,117,108,101,32,102,114,111,109,32,97,32,102,105, + 108,101,46,10,10,32,32,32,32,32,32,32,32,84,104,105, + 115,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, + 101,99,97,116,101,100,46,32,32,85,115,101,32,101,120,101, + 99,95,109,111,100,117,108,101,40,41,32,105,110,115,116,101, + 97,100,46,10,10,32,32,32,32,32,32,32,32,41,3,218, + 5,115,117,112,101,114,114,207,0,0,0,114,190,0,0,0, + 41,2,114,104,0,0,0,114,123,0,0,0,41,1,114,208, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,190,0, + 0,0,45,3,0,0,115,2,0,0,0,0,10,122,22,70, + 105,108,101,76,111,97,100,101,114,46,108,111,97,100,95,109, + 111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,0, + 0,0,1,0,0,0,67,0,0,0,115,6,0,0,0,124, + 0,106,0,83,0,41,1,122,58,82,101,116,117,114,110,32, + 116,104,101,32,112,97,116,104,32,116,111,32,116,104,101,32, + 115,111,117,114,99,101,32,102,105,108,101,32,97,115,32,102, + 111,117,110,100,32,98,121,32,116,104,101,32,102,105,110,100, + 101,114,46,41,1,114,37,0,0,0,41,2,114,104,0,0, + 0,114,123,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,155,0,0,0,57,3,0,0,115,2, + 0,0,0,0,3,122,23,70,105,108,101,76,111,97,100,101, + 114,46,103,101,116,95,102,105,108,101,110,97,109,101,99,2, + 0,0,0,0,0,0,0,3,0,0,0,9,0,0,0,67, + 0,0,0,115,32,0,0,0,116,0,106,1,124,1,100,1, + 131,2,143,10,125,2,124,2,106,2,131,0,83,0,81,0, + 82,0,88,0,100,2,83,0,41,3,122,39,82,101,116,117, + 114,110,32,116,104,101,32,100,97,116,97,32,102,114,111,109, + 32,112,97,116,104,32,97,115,32,114,97,119,32,98,121,116, + 101,115,46,218,1,114,78,41,3,114,52,0,0,0,114,53, + 0,0,0,90,4,114,101,97,100,41,3,114,104,0,0,0, + 114,37,0,0,0,114,57,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,114,197,0,0,0,62,3, + 0,0,115,4,0,0,0,0,2,14,1,122,19,70,105,108, + 101,76,111,97,100,101,114,46,103,101,116,95,100,97,116,97, + 41,12,114,109,0,0,0,114,108,0,0,0,114,110,0,0, + 0,114,111,0,0,0,114,182,0,0,0,114,210,0,0,0, + 114,212,0,0,0,114,120,0,0,0,114,190,0,0,0,114, + 155,0,0,0,114,197,0,0,0,90,13,95,95,99,108,97, + 115,115,99,101,108,108,95,95,114,4,0,0,0,114,4,0, + 0,0,41,1,114,208,0,0,0,114,6,0,0,0,114,207, + 0,0,0,27,3,0,0,115,14,0,0,0,8,3,4,2, + 8,6,8,4,8,3,16,12,12,5,114,207,0,0,0,99, + 0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0, + 64,0,0,0,115,46,0,0,0,101,0,90,1,100,0,90, + 2,100,1,90,3,100,2,100,3,132,0,90,4,100,4,100, + 5,132,0,90,5,100,6,100,7,156,1,100,8,100,9,132, + 2,90,6,100,10,83,0,41,11,218,16,83,111,117,114,99, + 101,70,105,108,101,76,111,97,100,101,114,122,62,67,111,110, + 99,114,101,116,101,32,105,109,112,108,101,109,101,110,116,97, + 116,105,111,110,32,111,102,32,83,111,117,114,99,101,76,111, + 97,100,101,114,32,117,115,105,110,103,32,116,104,101,32,102, + 105,108,101,32,115,121,115,116,101,109,46,99,2,0,0,0, + 0,0,0,0,3,0,0,0,3,0,0,0,67,0,0,0, + 115,22,0,0,0,116,0,124,1,131,1,125,2,124,2,106, + 1,124,2,106,2,100,1,156,2,83,0,41,2,122,33,82, + 101,116,117,114,110,32,116,104,101,32,109,101,116,97,100,97, + 116,97,32,102,111,114,32,116,104,101,32,112,97,116,104,46, + 41,2,114,130,0,0,0,114,131,0,0,0,41,3,114,41, 0,0,0,218,8,115,116,95,109,116,105,109,101,90,7,115, - 116,95,115,105,122,101,41,3,114,110,0,0,0,114,37,0, - 0,0,114,210,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,199,0,0,0,90,3,0,0,115, - 4,0,0,0,0,2,12,1,122,27,83,111,117,114,99,101, + 116,95,115,105,122,101,41,3,114,104,0,0,0,114,37,0, + 0,0,114,205,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,114,194,0,0,0,72,3,0,0,115, + 4,0,0,0,0,2,8,1,122,27,83,111,117,114,99,101, 70,105,108,101,76,111,97,100,101,114,46,112,97,116,104,95, 115,116,97,116,115,99,4,0,0,0,0,0,0,0,5,0, - 0,0,5,0,0,0,67,0,0,0,115,34,0,0,0,116, - 0,0,124,1,0,131,1,0,125,4,0,124,0,0,106,1, - 0,124,2,0,124,3,0,100,1,0,124,4,0,131,2,1, - 83,41,2,78,218,5,95,109,111,100,101,41,2,114,99,0, - 0,0,114,200,0,0,0,41,5,114,110,0,0,0,114,92, - 0,0,0,114,91,0,0,0,114,55,0,0,0,114,44,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,201,0,0,0,95,3,0,0,115,4,0,0,0,0, - 2,12,1,122,32,83,111,117,114,99,101,70,105,108,101,76, - 111,97,100,101,114,46,95,99,97,99,104,101,95,98,121,116, - 101,99,111,100,101,114,222,0,0,0,105,182,1,0,0,99, - 3,0,0,0,1,0,0,0,9,0,0,0,17,0,0,0, - 67,0,0,0,115,53,1,0,0,116,0,0,124,1,0,131, - 1,0,92,2,0,125,4,0,125,5,0,103,0,0,125,6, - 0,120,54,0,124,4,0,114,80,0,116,1,0,124,4,0, - 131,1,0,12,114,80,0,116,0,0,124,4,0,131,1,0, - 92,2,0,125,4,0,125,7,0,124,6,0,106,2,0,124, - 7,0,131,1,0,1,113,27,0,87,120,132,0,116,3,0, - 124,6,0,131,1,0,68,93,118,0,125,7,0,116,4,0, - 124,4,0,124,7,0,131,2,0,125,4,0,121,17,0,116, - 5,0,106,6,0,124,4,0,131,1,0,1,87,113,94,0, - 4,116,7,0,107,10,0,114,155,0,1,1,1,119,94,0, - 89,113,94,0,4,116,8,0,107,10,0,114,211,0,1,125, - 8,0,1,122,25,0,116,9,0,100,1,0,124,4,0,124, - 8,0,131,3,0,1,100,2,0,83,87,89,100,2,0,100, - 2,0,125,8,0,126,8,0,88,113,94,0,88,113,94,0, - 87,121,33,0,116,10,0,124,1,0,124,2,0,124,3,0, - 131,3,0,1,116,9,0,100,3,0,124,1,0,131,2,0, - 1,87,110,53,0,4,116,8,0,107,10,0,114,48,1,1, - 125,8,0,1,122,21,0,116,9,0,100,1,0,124,1,0, - 124,8,0,131,3,0,1,87,89,100,2,0,100,2,0,125, - 8,0,126,8,0,88,110,1,0,88,100,2,0,83,41,4, - 122,27,87,114,105,116,101,32,98,121,116,101,115,32,100,97, - 116,97,32,116,111,32,97,32,102,105,108,101,46,122,27,99, - 111,117,108,100,32,110,111,116,32,99,114,101,97,116,101,32, - 123,33,114,125,58,32,123,33,114,125,78,122,12,99,114,101, - 97,116,101,100,32,123,33,114,125,41,11,114,40,0,0,0, - 114,48,0,0,0,114,166,0,0,0,114,35,0,0,0,114, - 30,0,0,0,114,3,0,0,0,90,5,109,107,100,105,114, - 218,15,70,105,108,101,69,120,105,115,116,115,69,114,114,111, - 114,114,42,0,0,0,114,107,0,0,0,114,57,0,0,0, - 41,9,114,110,0,0,0,114,37,0,0,0,114,55,0,0, - 0,114,222,0,0,0,218,6,112,97,114,101,110,116,114,96, - 0,0,0,114,29,0,0,0,114,25,0,0,0,114,203,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,200,0,0,0,100,3,0,0,115,38,0,0,0,0, - 2,18,1,6,2,22,1,18,1,17,2,19,1,15,1,3, - 1,17,1,13,2,7,1,18,3,16,1,27,1,3,1,16, - 1,17,1,18,2,122,25,83,111,117,114,99,101,70,105,108, - 101,76,111,97,100,101,114,46,115,101,116,95,100,97,116,97, - 78,41,7,114,114,0,0,0,114,113,0,0,0,114,115,0, - 0,0,114,116,0,0,0,114,199,0,0,0,114,201,0,0, - 0,114,200,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,220,0,0,0,86, - 3,0,0,115,8,0,0,0,12,2,6,2,12,5,12,5, - 114,220,0,0,0,99,0,0,0,0,0,0,0,0,0,0, - 0,0,2,0,0,0,64,0,0,0,115,46,0,0,0,101, - 0,0,90,1,0,100,0,0,90,2,0,100,1,0,90,3, - 0,100,2,0,100,3,0,132,0,0,90,4,0,100,4,0, - 100,5,0,132,0,0,90,5,0,100,6,0,83,41,7,218, - 20,83,111,117,114,99,101,108,101,115,115,70,105,108,101,76, - 111,97,100,101,114,122,45,76,111,97,100,101,114,32,119,104, - 105,99,104,32,104,97,110,100,108,101,115,32,115,111,117,114, - 99,101,108,101,115,115,32,102,105,108,101,32,105,109,112,111, - 114,116,115,46,99,2,0,0,0,0,0,0,0,5,0,0, - 0,6,0,0,0,67,0,0,0,115,76,0,0,0,124,0, - 0,106,0,0,124,1,0,131,1,0,125,2,0,124,0,0, - 106,1,0,124,2,0,131,1,0,125,3,0,116,2,0,124, - 3,0,100,1,0,124,1,0,100,2,0,124,2,0,131,1, - 2,125,4,0,116,3,0,124,4,0,100,1,0,124,1,0, - 100,3,0,124,2,0,131,1,2,83,41,4,78,114,108,0, - 0,0,114,37,0,0,0,114,91,0,0,0,41,4,114,160, - 0,0,0,114,202,0,0,0,114,144,0,0,0,114,150,0, - 0,0,41,5,114,110,0,0,0,114,128,0,0,0,114,37, - 0,0,0,114,55,0,0,0,114,211,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,114,189,0,0, - 0,133,3,0,0,115,8,0,0,0,0,1,15,1,15,1, - 24,1,122,29,83,111,117,114,99,101,108,101,115,115,70,105, - 108,101,76,111,97,100,101,114,46,103,101,116,95,99,111,100, - 101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,0, - 0,0,67,0,0,0,115,4,0,0,0,100,1,0,83,41, - 2,122,39,82,101,116,117,114,110,32,78,111,110,101,32,97, - 115,32,116,104,101,114,101,32,105,115,32,110,111,32,115,111, - 117,114,99,101,32,99,111,100,101,46,78,114,4,0,0,0, - 41,2,114,110,0,0,0,114,128,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,114,204,0,0,0, - 139,3,0,0,115,2,0,0,0,0,2,122,31,83,111,117, - 114,99,101,108,101,115,115,70,105,108,101,76,111,97,100,101, - 114,46,103,101,116,95,115,111,117,114,99,101,78,41,6,114, - 114,0,0,0,114,113,0,0,0,114,115,0,0,0,114,116, - 0,0,0,114,189,0,0,0,114,204,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,225,0,0,0,129,3,0,0,115,6,0,0,0,12, - 2,6,2,12,6,114,225,0,0,0,99,0,0,0,0,0, - 0,0,0,0,0,0,0,3,0,0,0,64,0,0,0,115, - 136,0,0,0,101,0,0,90,1,0,100,0,0,90,2,0, - 100,1,0,90,3,0,100,2,0,100,3,0,132,0,0,90, - 4,0,100,4,0,100,5,0,132,0,0,90,5,0,100,6, - 0,100,7,0,132,0,0,90,6,0,100,8,0,100,9,0, - 132,0,0,90,7,0,100,10,0,100,11,0,132,0,0,90, - 8,0,100,12,0,100,13,0,132,0,0,90,9,0,100,14, - 0,100,15,0,132,0,0,90,10,0,100,16,0,100,17,0, - 132,0,0,90,11,0,101,12,0,100,18,0,100,19,0,132, - 0,0,131,1,0,90,13,0,100,20,0,83,41,21,218,19, - 69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,97, - 100,101,114,122,93,76,111,97,100,101,114,32,102,111,114,32, - 101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,101, - 115,46,10,10,32,32,32,32,84,104,101,32,99,111,110,115, - 116,114,117,99,116,111,114,32,105,115,32,100,101,115,105,103, - 110,101,100,32,116,111,32,119,111,114,107,32,119,105,116,104, - 32,70,105,108,101,70,105,110,100,101,114,46,10,10,32,32, - 32,32,99,3,0,0,0,0,0,0,0,3,0,0,0,2, - 0,0,0,67,0,0,0,115,22,0,0,0,124,1,0,124, - 0,0,95,0,0,124,2,0,124,0,0,95,1,0,100,0, - 0,83,41,1,78,41,2,114,108,0,0,0,114,37,0,0, - 0,41,3,114,110,0,0,0,114,108,0,0,0,114,37,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,187,0,0,0,156,3,0,0,115,4,0,0,0,0, - 1,9,1,122,28,69,120,116,101,110,115,105,111,110,70,105, - 108,101,76,111,97,100,101,114,46,95,95,105,110,105,116,95, - 95,99,2,0,0,0,0,0,0,0,2,0,0,0,2,0, - 0,0,67,0,0,0,115,34,0,0,0,124,0,0,106,0, - 0,124,1,0,106,0,0,107,2,0,111,33,0,124,0,0, - 106,1,0,124,1,0,106,1,0,107,2,0,83,41,1,78, - 41,2,114,213,0,0,0,114,120,0,0,0,41,2,114,110, - 0,0,0,114,214,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,215,0,0,0,160,3,0,0, - 115,4,0,0,0,0,1,18,1,122,26,69,120,116,101,110, - 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,95, - 95,101,113,95,95,99,1,0,0,0,0,0,0,0,1,0, - 0,0,3,0,0,0,67,0,0,0,115,26,0,0,0,116, - 0,0,124,0,0,106,1,0,131,1,0,116,0,0,124,0, - 0,106,2,0,131,1,0,65,83,41,1,78,41,3,114,216, - 0,0,0,114,108,0,0,0,114,37,0,0,0,41,1,114, - 110,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,217,0,0,0,164,3,0,0,115,2,0,0, - 0,0,1,122,28,69,120,116,101,110,115,105,111,110,70,105, - 108,101,76,111,97,100,101,114,46,95,95,104,97,115,104,95, - 95,99,2,0,0,0,0,0,0,0,3,0,0,0,4,0, - 0,0,67,0,0,0,115,47,0,0,0,116,0,0,106,1, - 0,116,2,0,106,3,0,124,1,0,131,2,0,125,2,0, - 116,4,0,100,1,0,124,1,0,106,5,0,124,0,0,106, - 6,0,131,3,0,1,124,2,0,83,41,2,122,38,67,114, - 101,97,116,101,32,97,110,32,117,110,105,116,105,97,108,105, - 122,101,100,32,101,120,116,101,110,115,105,111,110,32,109,111, - 100,117,108,101,122,38,101,120,116,101,110,115,105,111,110,32, - 109,111,100,117,108,101,32,123,33,114,125,32,108,111,97,100, - 101,100,32,102,114,111,109,32,123,33,114,125,41,7,114,123, - 0,0,0,114,190,0,0,0,114,148,0,0,0,90,14,99, - 114,101,97,116,101,95,100,121,110,97,109,105,99,114,107,0, - 0,0,114,108,0,0,0,114,37,0,0,0,41,3,114,110, - 0,0,0,114,167,0,0,0,114,192,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,114,188,0,0, - 0,167,3,0,0,115,10,0,0,0,0,2,6,1,15,1, - 6,1,16,1,122,33,69,120,116,101,110,115,105,111,110,70, - 105,108,101,76,111,97,100,101,114,46,99,114,101,97,116,101, - 95,109,111,100,117,108,101,99,2,0,0,0,0,0,0,0, - 2,0,0,0,4,0,0,0,67,0,0,0,115,45,0,0, - 0,116,0,0,106,1,0,116,2,0,106,3,0,124,1,0, - 131,2,0,1,116,4,0,100,1,0,124,0,0,106,5,0, - 124,0,0,106,6,0,131,3,0,1,100,2,0,83,41,3, - 122,30,73,110,105,116,105,97,108,105,122,101,32,97,110,32, + 0,0,5,0,0,0,67,0,0,0,115,24,0,0,0,116, + 0,124,1,131,1,125,4,124,0,106,1,124,2,124,3,124, + 4,100,1,141,3,83,0,41,2,78,41,1,218,5,95,109, + 111,100,101,41,2,114,101,0,0,0,114,195,0,0,0,41, + 5,114,104,0,0,0,114,94,0,0,0,114,93,0,0,0, + 114,56,0,0,0,114,44,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,114,196,0,0,0,77,3, + 0,0,115,4,0,0,0,0,2,8,1,122,32,83,111,117, + 114,99,101,70,105,108,101,76,111,97,100,101,114,46,95,99, + 97,99,104,101,95,98,121,116,101,99,111,100,101,105,182,1, + 0,0,41,1,114,217,0,0,0,99,3,0,0,0,1,0, + 0,0,9,0,0,0,17,0,0,0,67,0,0,0,115,250, + 0,0,0,116,0,124,1,131,1,92,2,125,4,125,5,103, + 0,125,6,120,40,124,4,114,56,116,1,124,4,131,1,12, + 0,114,56,116,0,124,4,131,1,92,2,125,4,125,7,124, + 6,106,2,124,7,131,1,1,0,113,18,87,0,120,108,116, + 3,124,6,131,1,68,0,93,96,125,7,116,4,124,4,124, + 7,131,2,125,4,121,14,116,5,106,6,124,4,131,1,1, + 0,87,0,113,68,4,0,116,7,107,10,114,118,1,0,1, + 0,1,0,119,68,89,0,113,68,4,0,116,8,107,10,114, + 162,1,0,125,8,1,0,122,18,116,9,106,10,100,1,124, + 4,124,8,131,3,1,0,100,2,83,0,100,2,125,8,126, + 8,88,0,113,68,88,0,113,68,87,0,121,28,116,11,124, + 1,124,2,124,3,131,3,1,0,116,9,106,10,100,3,124, + 1,131,2,1,0,87,0,110,48,4,0,116,8,107,10,114, + 244,1,0,125,8,1,0,122,20,116,9,106,10,100,1,124, + 1,124,8,131,3,1,0,87,0,89,0,100,2,100,2,125, + 8,126,8,88,0,110,2,88,0,100,2,83,0,41,4,122, + 27,87,114,105,116,101,32,98,121,116,101,115,32,100,97,116, + 97,32,116,111,32,97,32,102,105,108,101,46,122,27,99,111, + 117,108,100,32,110,111,116,32,99,114,101,97,116,101,32,123, + 33,114,125,58,32,123,33,114,125,78,122,12,99,114,101,97, + 116,101,100,32,123,33,114,125,41,12,114,40,0,0,0,114, + 48,0,0,0,114,161,0,0,0,114,35,0,0,0,114,30, + 0,0,0,114,3,0,0,0,90,5,109,107,100,105,114,218, + 15,70,105,108,101,69,120,105,115,116,115,69,114,114,111,114, + 114,42,0,0,0,114,118,0,0,0,114,133,0,0,0,114, + 58,0,0,0,41,9,114,104,0,0,0,114,37,0,0,0, + 114,56,0,0,0,114,217,0,0,0,218,6,112,97,114,101, + 110,116,114,98,0,0,0,114,29,0,0,0,114,25,0,0, + 0,114,198,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,195,0,0,0,82,3,0,0,115,42, + 0,0,0,0,2,12,1,4,2,16,1,12,1,14,2,14, + 1,10,1,2,1,14,1,14,2,6,1,16,3,6,1,8, + 1,20,1,2,1,12,1,16,1,16,2,8,1,122,25,83, + 111,117,114,99,101,70,105,108,101,76,111,97,100,101,114,46, + 115,101,116,95,100,97,116,97,78,41,7,114,109,0,0,0, + 114,108,0,0,0,114,110,0,0,0,114,111,0,0,0,114, + 194,0,0,0,114,196,0,0,0,114,195,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, + 0,0,114,215,0,0,0,68,3,0,0,115,8,0,0,0, + 8,2,4,2,8,5,8,5,114,215,0,0,0,99,0,0, + 0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,0, + 0,0,115,32,0,0,0,101,0,90,1,100,0,90,2,100, + 1,90,3,100,2,100,3,132,0,90,4,100,4,100,5,132, + 0,90,5,100,6,83,0,41,7,218,20,83,111,117,114,99, + 101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,122, + 45,76,111,97,100,101,114,32,119,104,105,99,104,32,104,97, + 110,100,108,101,115,32,115,111,117,114,99,101,108,101,115,115, + 32,102,105,108,101,32,105,109,112,111,114,116,115,46,99,2, + 0,0,0,0,0,0,0,5,0,0,0,5,0,0,0,67, + 0,0,0,115,48,0,0,0,124,0,106,0,124,1,131,1, + 125,2,124,0,106,1,124,2,131,1,125,3,116,2,124,3, + 124,1,124,2,100,1,141,3,125,4,116,3,124,4,124,1, + 124,2,100,2,141,3,83,0,41,3,78,41,2,114,102,0, + 0,0,114,37,0,0,0,41,2,114,102,0,0,0,114,93, + 0,0,0,41,4,114,155,0,0,0,114,197,0,0,0,114, + 139,0,0,0,114,145,0,0,0,41,5,114,104,0,0,0, + 114,123,0,0,0,114,37,0,0,0,114,56,0,0,0,114, + 206,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, + 0,0,0,114,184,0,0,0,117,3,0,0,115,8,0,0, + 0,0,1,10,1,10,1,14,1,122,29,83,111,117,114,99, + 101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,46, + 103,101,116,95,99,111,100,101,99,2,0,0,0,0,0,0, + 0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0, + 0,0,100,1,83,0,41,2,122,39,82,101,116,117,114,110, + 32,78,111,110,101,32,97,115,32,116,104,101,114,101,32,105, + 115,32,110,111,32,115,111,117,114,99,101,32,99,111,100,101, + 46,78,114,4,0,0,0,41,2,114,104,0,0,0,114,123, + 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, + 0,0,114,199,0,0,0,123,3,0,0,115,2,0,0,0, + 0,2,122,31,83,111,117,114,99,101,108,101,115,115,70,105, + 108,101,76,111,97,100,101,114,46,103,101,116,95,115,111,117, + 114,99,101,78,41,6,114,109,0,0,0,114,108,0,0,0, + 114,110,0,0,0,114,111,0,0,0,114,184,0,0,0,114, + 199,0,0,0,114,4,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,6,0,0,0,114,220,0,0,0,113,3,0, + 0,115,6,0,0,0,8,2,4,2,8,6,114,220,0,0, + 0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,0, + 0,0,64,0,0,0,115,92,0,0,0,101,0,90,1,100, + 0,90,2,100,1,90,3,100,2,100,3,132,0,90,4,100, + 4,100,5,132,0,90,5,100,6,100,7,132,0,90,6,100, + 8,100,9,132,0,90,7,100,10,100,11,132,0,90,8,100, + 12,100,13,132,0,90,9,100,14,100,15,132,0,90,10,100, + 16,100,17,132,0,90,11,101,12,100,18,100,19,132,0,131, + 1,90,13,100,20,83,0,41,21,218,19,69,120,116,101,110, + 115,105,111,110,70,105,108,101,76,111,97,100,101,114,122,93, + 76,111,97,100,101,114,32,102,111,114,32,101,120,116,101,110, + 115,105,111,110,32,109,111,100,117,108,101,115,46,10,10,32, + 32,32,32,84,104,101,32,99,111,110,115,116,114,117,99,116, + 111,114,32,105,115,32,100,101,115,105,103,110,101,100,32,116, + 111,32,119,111,114,107,32,119,105,116,104,32,70,105,108,101, + 70,105,110,100,101,114,46,10,10,32,32,32,32,99,3,0, + 0,0,0,0,0,0,3,0,0,0,2,0,0,0,67,0, + 0,0,115,16,0,0,0,124,1,124,0,95,0,124,2,124, + 0,95,1,100,0,83,0,41,1,78,41,2,114,102,0,0, + 0,114,37,0,0,0,41,3,114,104,0,0,0,114,102,0, + 0,0,114,37,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,114,182,0,0,0,140,3,0,0,115, + 4,0,0,0,0,1,6,1,122,28,69,120,116,101,110,115, + 105,111,110,70,105,108,101,76,111,97,100,101,114,46,95,95, + 105,110,105,116,95,95,99,2,0,0,0,0,0,0,0,2, + 0,0,0,2,0,0,0,67,0,0,0,115,24,0,0,0, + 124,0,106,0,124,1,106,0,107,2,111,22,124,0,106,1, + 124,1,106,1,107,2,83,0,41,1,78,41,2,114,208,0, + 0,0,114,115,0,0,0,41,2,114,104,0,0,0,114,209, + 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, + 0,0,114,210,0,0,0,144,3,0,0,115,4,0,0,0, + 0,1,12,1,122,26,69,120,116,101,110,115,105,111,110,70, + 105,108,101,76,111,97,100,101,114,46,95,95,101,113,95,95, + 99,1,0,0,0,0,0,0,0,1,0,0,0,3,0,0, + 0,67,0,0,0,115,20,0,0,0,116,0,124,0,106,1, + 131,1,116,0,124,0,106,2,131,1,65,0,83,0,41,1, + 78,41,3,114,211,0,0,0,114,102,0,0,0,114,37,0, + 0,0,41,1,114,104,0,0,0,114,4,0,0,0,114,4, + 0,0,0,114,6,0,0,0,114,212,0,0,0,148,3,0, + 0,115,2,0,0,0,0,1,122,28,69,120,116,101,110,115, + 105,111,110,70,105,108,101,76,111,97,100,101,114,46,95,95, + 104,97,115,104,95,95,99,2,0,0,0,0,0,0,0,3, + 0,0,0,4,0,0,0,67,0,0,0,115,36,0,0,0, + 116,0,106,1,116,2,106,3,124,1,131,2,125,2,116,0, + 106,4,100,1,124,1,106,5,124,0,106,6,131,3,1,0, + 124,2,83,0,41,2,122,38,67,114,101,97,116,101,32,97, + 110,32,117,110,105,116,105,97,108,105,122,101,100,32,101,120, + 116,101,110,115,105,111,110,32,109,111,100,117,108,101,122,38, 101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,101, - 122,40,101,120,116,101,110,115,105,111,110,32,109,111,100,117, - 108,101,32,123,33,114,125,32,101,120,101,99,117,116,101,100, - 32,102,114,111,109,32,123,33,114,125,78,41,7,114,123,0, - 0,0,114,190,0,0,0,114,148,0,0,0,90,12,101,120, - 101,99,95,100,121,110,97,109,105,99,114,107,0,0,0,114, - 108,0,0,0,114,37,0,0,0,41,2,114,110,0,0,0, - 114,192,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,193,0,0,0,175,3,0,0,115,6,0, - 0,0,0,2,19,1,6,1,122,31,69,120,116,101,110,115, - 105,111,110,70,105,108,101,76,111,97,100,101,114,46,101,120, - 101,99,95,109,111,100,117,108,101,99,2,0,0,0,0,0, - 0,0,2,0,0,0,4,0,0,0,3,0,0,0,115,48, - 0,0,0,116,0,0,124,0,0,106,1,0,131,1,0,100, - 1,0,25,137,0,0,116,2,0,135,0,0,102,1,0,100, - 2,0,100,3,0,134,0,0,116,3,0,68,131,1,0,131, - 1,0,83,41,4,122,49,82,101,116,117,114,110,32,84,114, - 117,101,32,105,102,32,116,104,101,32,101,120,116,101,110,115, - 105,111,110,32,109,111,100,117,108,101,32,105,115,32,97,32, - 112,97,99,107,97,103,101,46,114,31,0,0,0,99,1,0, - 0,0,0,0,0,0,2,0,0,0,4,0,0,0,51,0, - 0,0,115,31,0,0,0,124,0,0,93,21,0,125,1,0, - 136,0,0,100,0,0,124,1,0,23,107,2,0,86,1,113, - 3,0,100,1,0,83,41,2,114,187,0,0,0,78,114,4, + 32,123,33,114,125,32,108,111,97,100,101,100,32,102,114,111, + 109,32,123,33,114,125,41,7,114,118,0,0,0,114,185,0, + 0,0,114,143,0,0,0,90,14,99,114,101,97,116,101,95, + 100,121,110,97,109,105,99,114,133,0,0,0,114,102,0,0, + 0,114,37,0,0,0,41,3,114,104,0,0,0,114,162,0, + 0,0,114,187,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,114,183,0,0,0,151,3,0,0,115, + 10,0,0,0,0,2,4,1,10,1,6,1,12,1,122,33, + 69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,97, + 100,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108, + 101,99,2,0,0,0,0,0,0,0,2,0,0,0,4,0, + 0,0,67,0,0,0,115,36,0,0,0,116,0,106,1,116, + 2,106,3,124,1,131,2,1,0,116,0,106,4,100,1,124, + 0,106,5,124,0,106,6,131,3,1,0,100,2,83,0,41, + 3,122,30,73,110,105,116,105,97,108,105,122,101,32,97,110, + 32,101,120,116,101,110,115,105,111,110,32,109,111,100,117,108, + 101,122,40,101,120,116,101,110,115,105,111,110,32,109,111,100, + 117,108,101,32,123,33,114,125,32,101,120,101,99,117,116,101, + 100,32,102,114,111,109,32,123,33,114,125,78,41,7,114,118, + 0,0,0,114,185,0,0,0,114,143,0,0,0,90,12,101, + 120,101,99,95,100,121,110,97,109,105,99,114,133,0,0,0, + 114,102,0,0,0,114,37,0,0,0,41,2,114,104,0,0, + 0,114,187,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,188,0,0,0,159,3,0,0,115,6, + 0,0,0,0,2,14,1,6,1,122,31,69,120,116,101,110, + 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,101, + 120,101,99,95,109,111,100,117,108,101,99,2,0,0,0,0, + 0,0,0,2,0,0,0,4,0,0,0,3,0,0,0,115, + 36,0,0,0,116,0,124,0,106,1,131,1,100,1,25,0, + 137,0,116,2,135,0,102,1,100,2,100,3,132,8,116,3, + 68,0,131,1,131,1,83,0,41,4,122,49,82,101,116,117, + 114,110,32,84,114,117,101,32,105,102,32,116,104,101,32,101, + 120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,32, + 105,115,32,97,32,112,97,99,107,97,103,101,46,114,31,0, + 0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,4, + 0,0,0,51,0,0,0,115,26,0,0,0,124,0,93,18, + 125,1,136,0,100,0,124,1,23,0,107,2,86,0,1,0, + 113,2,100,1,83,0,41,2,114,182,0,0,0,78,114,4, 0,0,0,41,2,114,24,0,0,0,218,6,115,117,102,102, 105,120,41,1,218,9,102,105,108,101,95,110,97,109,101,114, 4,0,0,0,114,6,0,0,0,250,9,60,103,101,110,101, - 120,112,114,62,184,3,0,0,115,2,0,0,0,6,1,122, + 120,112,114,62,168,3,0,0,115,2,0,0,0,4,1,122, 49,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111, 97,100,101,114,46,105,115,95,112,97,99,107,97,103,101,46, 60,108,111,99,97,108,115,62,46,60,103,101,110,101,120,112, 114,62,41,4,114,40,0,0,0,114,37,0,0,0,218,3, 97,110,121,218,18,69,88,84,69,78,83,73,79,78,95,83, - 85,70,70,73,88,69,83,41,2,114,110,0,0,0,114,128, - 0,0,0,114,4,0,0,0,41,1,114,228,0,0,0,114, - 6,0,0,0,114,162,0,0,0,181,3,0,0,115,6,0, - 0,0,0,2,19,1,18,1,122,30,69,120,116,101,110,115, + 85,70,70,73,88,69,83,41,2,114,104,0,0,0,114,123, + 0,0,0,114,4,0,0,0,41,1,114,223,0,0,0,114, + 6,0,0,0,114,157,0,0,0,165,3,0,0,115,6,0, + 0,0,0,2,14,1,12,1,122,30,69,120,116,101,110,115, 105,111,110,70,105,108,101,76,111,97,100,101,114,46,105,115, 95,112,97,99,107,97,103,101,99,2,0,0,0,0,0,0, 0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0, - 0,0,100,1,0,83,41,2,122,63,82,101,116,117,114,110, + 0,0,100,1,83,0,41,2,122,63,82,101,116,117,114,110, 32,78,111,110,101,32,97,115,32,97,110,32,101,120,116,101, 110,115,105,111,110,32,109,111,100,117,108,101,32,99,97,110, 110,111,116,32,99,114,101,97,116,101,32,97,32,99,111,100, 101,32,111,98,106,101,99,116,46,78,114,4,0,0,0,41, - 2,114,110,0,0,0,114,128,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,189,0,0,0,187, + 2,114,104,0,0,0,114,123,0,0,0,114,4,0,0,0, + 114,4,0,0,0,114,6,0,0,0,114,184,0,0,0,171, 3,0,0,115,2,0,0,0,0,2,122,28,69,120,116,101, 110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,46, 103,101,116,95,99,111,100,101,99,2,0,0,0,0,0,0, 0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0, - 0,0,100,1,0,83,41,2,122,53,82,101,116,117,114,110, + 0,0,100,1,83,0,41,2,122,53,82,101,116,117,114,110, 32,78,111,110,101,32,97,115,32,101,120,116,101,110,115,105, 111,110,32,109,111,100,117,108,101,115,32,104,97,118,101,32, 110,111,32,115,111,117,114,99,101,32,99,111,100,101,46,78, - 114,4,0,0,0,41,2,114,110,0,0,0,114,128,0,0, + 114,4,0,0,0,41,2,114,104,0,0,0,114,123,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,204,0,0,0,191,3,0,0,115,2,0,0,0,0,2, + 114,199,0,0,0,175,3,0,0,115,2,0,0,0,0,2, 122,30,69,120,116,101,110,115,105,111,110,70,105,108,101,76, 111,97,100,101,114,46,103,101,116,95,115,111,117,114,99,101, 99,2,0,0,0,0,0,0,0,2,0,0,0,1,0,0, - 0,67,0,0,0,115,7,0,0,0,124,0,0,106,0,0, - 83,41,1,122,58,82,101,116,117,114,110,32,116,104,101,32, - 112,97,116,104,32,116,111,32,116,104,101,32,115,111,117,114, - 99,101,32,102,105,108,101,32,97,115,32,102,111,117,110,100, - 32,98,121,32,116,104,101,32,102,105,110,100,101,114,46,41, - 1,114,37,0,0,0,41,2,114,110,0,0,0,114,128,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,160,0,0,0,195,3,0,0,115,2,0,0,0,0, - 3,122,32,69,120,116,101,110,115,105,111,110,70,105,108,101, - 76,111,97,100,101,114,46,103,101,116,95,102,105,108,101,110, - 97,109,101,78,41,14,114,114,0,0,0,114,113,0,0,0, - 114,115,0,0,0,114,116,0,0,0,114,187,0,0,0,114, - 215,0,0,0,114,217,0,0,0,114,188,0,0,0,114,193, - 0,0,0,114,162,0,0,0,114,189,0,0,0,114,204,0, - 0,0,114,125,0,0,0,114,160,0,0,0,114,4,0,0, + 0,67,0,0,0,115,6,0,0,0,124,0,106,0,83,0, + 41,1,122,58,82,101,116,117,114,110,32,116,104,101,32,112, + 97,116,104,32,116,111,32,116,104,101,32,115,111,117,114,99, + 101,32,102,105,108,101,32,97,115,32,102,111,117,110,100,32, + 98,121,32,116,104,101,32,102,105,110,100,101,114,46,41,1, + 114,37,0,0,0,41,2,114,104,0,0,0,114,123,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,226,0,0,0,148,3,0,0,115,20,0,0,0,12,6, - 6,2,12,4,12,4,12,3,12,8,12,6,12,6,12,4, - 12,4,114,226,0,0,0,99,0,0,0,0,0,0,0,0, - 0,0,0,0,2,0,0,0,64,0,0,0,115,130,0,0, - 0,101,0,0,90,1,0,100,0,0,90,2,0,100,1,0, - 90,3,0,100,2,0,100,3,0,132,0,0,90,4,0,100, - 4,0,100,5,0,132,0,0,90,5,0,100,6,0,100,7, - 0,132,0,0,90,6,0,100,8,0,100,9,0,132,0,0, - 90,7,0,100,10,0,100,11,0,132,0,0,90,8,0,100, - 12,0,100,13,0,132,0,0,90,9,0,100,14,0,100,15, - 0,132,0,0,90,10,0,100,16,0,100,17,0,132,0,0, - 90,11,0,100,18,0,100,19,0,132,0,0,90,12,0,100, - 20,0,83,41,21,218,14,95,78,97,109,101,115,112,97,99, - 101,80,97,116,104,97,38,1,0,0,82,101,112,114,101,115, - 101,110,116,115,32,97,32,110,97,109,101,115,112,97,99,101, - 32,112,97,99,107,97,103,101,39,115,32,112,97,116,104,46, - 32,32,73,116,32,117,115,101,115,32,116,104,101,32,109,111, - 100,117,108,101,32,110,97,109,101,10,32,32,32,32,116,111, - 32,102,105,110,100,32,105,116,115,32,112,97,114,101,110,116, - 32,109,111,100,117,108,101,44,32,97,110,100,32,102,114,111, - 109,32,116,104,101,114,101,32,105,116,32,108,111,111,107,115, - 32,117,112,32,116,104,101,32,112,97,114,101,110,116,39,115, - 10,32,32,32,32,95,95,112,97,116,104,95,95,46,32,32, - 87,104,101,110,32,116,104,105,115,32,99,104,97,110,103,101, - 115,44,32,116,104,101,32,109,111,100,117,108,101,39,115,32, - 111,119,110,32,112,97,116,104,32,105,115,32,114,101,99,111, - 109,112,117,116,101,100,44,10,32,32,32,32,117,115,105,110, - 103,32,112,97,116,104,95,102,105,110,100,101,114,46,32,32, - 70,111,114,32,116,111,112,45,108,101,118,101,108,32,109,111, - 100,117,108,101,115,44,32,116,104,101,32,112,97,114,101,110, - 116,32,109,111,100,117,108,101,39,115,32,112,97,116,104,10, - 32,32,32,32,105,115,32,115,121,115,46,112,97,116,104,46, - 99,4,0,0,0,0,0,0,0,4,0,0,0,2,0,0, - 0,67,0,0,0,115,52,0,0,0,124,1,0,124,0,0, - 95,0,0,124,2,0,124,0,0,95,1,0,116,2,0,124, - 0,0,106,3,0,131,0,0,131,1,0,124,0,0,95,4, - 0,124,3,0,124,0,0,95,5,0,100,0,0,83,41,1, - 78,41,6,218,5,95,110,97,109,101,218,5,95,112,97,116, - 104,114,95,0,0,0,218,16,95,103,101,116,95,112,97,114, - 101,110,116,95,112,97,116,104,218,17,95,108,97,115,116,95, - 112,97,114,101,110,116,95,112,97,116,104,218,12,95,112,97, - 116,104,95,102,105,110,100,101,114,41,4,114,110,0,0,0, - 114,108,0,0,0,114,37,0,0,0,218,11,112,97,116,104, - 95,102,105,110,100,101,114,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,187,0,0,0,208,3,0,0,115, - 8,0,0,0,0,1,9,1,9,1,21,1,122,23,95,78, - 97,109,101,115,112,97,99,101,80,97,116,104,46,95,95,105, - 110,105,116,95,95,99,1,0,0,0,0,0,0,0,4,0, - 0,0,3,0,0,0,67,0,0,0,115,53,0,0,0,124, - 0,0,106,0,0,106,1,0,100,1,0,131,1,0,92,3, - 0,125,1,0,125,2,0,125,3,0,124,2,0,100,2,0, - 107,2,0,114,43,0,100,6,0,83,124,1,0,100,5,0, - 102,2,0,83,41,7,122,62,82,101,116,117,114,110,115,32, - 97,32,116,117,112,108,101,32,111,102,32,40,112,97,114,101, - 110,116,45,109,111,100,117,108,101,45,110,97,109,101,44,32, - 112,97,114,101,110,116,45,112,97,116,104,45,97,116,116,114, - 45,110,97,109,101,41,114,60,0,0,0,114,32,0,0,0, - 114,8,0,0,0,114,37,0,0,0,90,8,95,95,112,97, - 116,104,95,95,41,2,114,8,0,0,0,114,37,0,0,0, - 41,2,114,233,0,0,0,114,34,0,0,0,41,4,114,110, - 0,0,0,114,224,0,0,0,218,3,100,111,116,90,2,109, - 101,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 218,23,95,102,105,110,100,95,112,97,114,101,110,116,95,112, - 97,116,104,95,110,97,109,101,115,214,3,0,0,115,8,0, - 0,0,0,2,27,1,12,2,4,3,122,38,95,78,97,109, - 101,115,112,97,99,101,80,97,116,104,46,95,102,105,110,100, - 95,112,97,114,101,110,116,95,112,97,116,104,95,110,97,109, - 101,115,99,1,0,0,0,0,0,0,0,3,0,0,0,3, - 0,0,0,67,0,0,0,115,38,0,0,0,124,0,0,106, - 0,0,131,0,0,92,2,0,125,1,0,125,2,0,116,1, - 0,116,2,0,106,3,0,124,1,0,25,124,2,0,131,2, - 0,83,41,1,78,41,4,114,240,0,0,0,114,119,0,0, - 0,114,8,0,0,0,218,7,109,111,100,117,108,101,115,41, - 3,114,110,0,0,0,90,18,112,97,114,101,110,116,95,109, - 111,100,117,108,101,95,110,97,109,101,90,14,112,97,116,104, - 95,97,116,116,114,95,110,97,109,101,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,235,0,0,0,224,3, - 0,0,115,4,0,0,0,0,1,18,1,122,31,95,78,97, - 109,101,115,112,97,99,101,80,97,116,104,46,95,103,101,116, - 95,112,97,114,101,110,116,95,112,97,116,104,99,1,0,0, - 0,0,0,0,0,3,0,0,0,3,0,0,0,67,0,0, - 0,115,118,0,0,0,116,0,0,124,0,0,106,1,0,131, - 0,0,131,1,0,125,1,0,124,1,0,124,0,0,106,2, - 0,107,3,0,114,111,0,124,0,0,106,3,0,124,0,0, - 106,4,0,124,1,0,131,2,0,125,2,0,124,2,0,100, - 0,0,107,9,0,114,102,0,124,2,0,106,5,0,100,0, - 0,107,8,0,114,102,0,124,2,0,106,6,0,114,102,0, - 124,2,0,106,6,0,124,0,0,95,7,0,124,1,0,124, - 0,0,95,2,0,124,0,0,106,7,0,83,41,1,78,41, - 8,114,95,0,0,0,114,235,0,0,0,114,236,0,0,0, - 114,237,0,0,0,114,233,0,0,0,114,129,0,0,0,114, - 159,0,0,0,114,234,0,0,0,41,3,114,110,0,0,0, - 90,11,112,97,114,101,110,116,95,112,97,116,104,114,167,0, - 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,12,95,114,101,99,97,108,99,117,108,97,116,101,228, - 3,0,0,115,16,0,0,0,0,2,18,1,15,1,21,3, - 27,1,9,1,12,1,9,1,122,27,95,78,97,109,101,115, - 112,97,99,101,80,97,116,104,46,95,114,101,99,97,108,99, - 117,108,97,116,101,99,1,0,0,0,0,0,0,0,1,0, - 0,0,2,0,0,0,67,0,0,0,115,16,0,0,0,116, - 0,0,124,0,0,106,1,0,131,0,0,131,1,0,83,41, - 1,78,41,2,218,4,105,116,101,114,114,242,0,0,0,41, - 1,114,110,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,218,8,95,95,105,116,101,114,95,95,241, - 3,0,0,115,2,0,0,0,0,1,122,23,95,78,97,109, - 101,115,112,97,99,101,80,97,116,104,46,95,95,105,116,101, - 114,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0, - 2,0,0,0,67,0,0,0,115,16,0,0,0,116,0,0, - 124,0,0,106,1,0,131,0,0,131,1,0,83,41,1,78, - 41,2,114,33,0,0,0,114,242,0,0,0,41,1,114,110, - 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,7,95,95,108,101,110,95,95,244,3,0,0,115, - 2,0,0,0,0,1,122,22,95,78,97,109,101,115,112,97, - 99,101,80,97,116,104,46,95,95,108,101,110,95,95,99,1, - 0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,67, - 0,0,0,115,16,0,0,0,100,1,0,106,0,0,124,0, - 0,106,1,0,131,1,0,83,41,2,78,122,20,95,78,97, - 109,101,115,112,97,99,101,80,97,116,104,40,123,33,114,125, - 41,41,2,114,49,0,0,0,114,234,0,0,0,41,1,114, - 110,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,218,8,95,95,114,101,112,114,95,95,247,3,0, - 0,115,2,0,0,0,0,1,122,23,95,78,97,109,101,115, - 112,97,99,101,80,97,116,104,46,95,95,114,101,112,114,95, - 95,99,2,0,0,0,0,0,0,0,2,0,0,0,2,0, - 0,0,67,0,0,0,115,16,0,0,0,124,1,0,124,0, - 0,106,0,0,131,0,0,107,6,0,83,41,1,78,41,1, - 114,242,0,0,0,41,2,114,110,0,0,0,218,4,105,116, - 101,109,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,12,95,95,99,111,110,116,97,105,110,115,95,95,250, - 3,0,0,115,2,0,0,0,0,1,122,27,95,78,97,109, - 101,115,112,97,99,101,80,97,116,104,46,95,95,99,111,110, - 116,97,105,110,115,95,95,99,2,0,0,0,0,0,0,0, - 2,0,0,0,2,0,0,0,67,0,0,0,115,20,0,0, - 0,124,0,0,106,0,0,106,1,0,124,1,0,131,1,0, - 1,100,0,0,83,41,1,78,41,2,114,234,0,0,0,114, - 166,0,0,0,41,2,114,110,0,0,0,114,247,0,0,0, + 114,155,0,0,0,179,3,0,0,115,2,0,0,0,0,3, + 122,32,69,120,116,101,110,115,105,111,110,70,105,108,101,76, + 111,97,100,101,114,46,103,101,116,95,102,105,108,101,110,97, + 109,101,78,41,14,114,109,0,0,0,114,108,0,0,0,114, + 110,0,0,0,114,111,0,0,0,114,182,0,0,0,114,210, + 0,0,0,114,212,0,0,0,114,183,0,0,0,114,188,0, + 0,0,114,157,0,0,0,114,184,0,0,0,114,199,0,0, + 0,114,120,0,0,0,114,155,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, - 166,0,0,0,253,3,0,0,115,2,0,0,0,0,1,122, - 21,95,78,97,109,101,115,112,97,99,101,80,97,116,104,46, - 97,112,112,101,110,100,78,41,13,114,114,0,0,0,114,113, - 0,0,0,114,115,0,0,0,114,116,0,0,0,114,187,0, - 0,0,114,240,0,0,0,114,235,0,0,0,114,242,0,0, - 0,114,244,0,0,0,114,245,0,0,0,114,246,0,0,0, - 114,248,0,0,0,114,166,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,232, - 0,0,0,201,3,0,0,115,20,0,0,0,12,5,6,2, - 12,6,12,10,12,4,12,13,12,3,12,3,12,3,12,3, - 114,232,0,0,0,99,0,0,0,0,0,0,0,0,0,0, - 0,0,3,0,0,0,64,0,0,0,115,118,0,0,0,101, - 0,0,90,1,0,100,0,0,90,2,0,100,1,0,100,2, - 0,132,0,0,90,3,0,101,4,0,100,3,0,100,4,0, - 132,0,0,131,1,0,90,5,0,100,5,0,100,6,0,132, - 0,0,90,6,0,100,7,0,100,8,0,132,0,0,90,7, - 0,100,9,0,100,10,0,132,0,0,90,8,0,100,11,0, - 100,12,0,132,0,0,90,9,0,100,13,0,100,14,0,132, - 0,0,90,10,0,100,15,0,100,16,0,132,0,0,90,11, - 0,100,17,0,83,41,18,218,16,95,78,97,109,101,115,112, - 97,99,101,76,111,97,100,101,114,99,4,0,0,0,0,0, - 0,0,4,0,0,0,4,0,0,0,67,0,0,0,115,25, - 0,0,0,116,0,0,124,1,0,124,2,0,124,3,0,131, - 3,0,124,0,0,95,1,0,100,0,0,83,41,1,78,41, - 2,114,232,0,0,0,114,234,0,0,0,41,4,114,110,0, - 0,0,114,108,0,0,0,114,37,0,0,0,114,238,0,0, + 221,0,0,0,132,3,0,0,115,20,0,0,0,8,6,4, + 2,8,4,8,4,8,3,8,8,8,6,8,6,8,4,8, + 4,114,221,0,0,0,99,0,0,0,0,0,0,0,0,0, + 0,0,0,2,0,0,0,64,0,0,0,115,96,0,0,0, + 101,0,90,1,100,0,90,2,100,1,90,3,100,2,100,3, + 132,0,90,4,100,4,100,5,132,0,90,5,100,6,100,7, + 132,0,90,6,100,8,100,9,132,0,90,7,100,10,100,11, + 132,0,90,8,100,12,100,13,132,0,90,9,100,14,100,15, + 132,0,90,10,100,16,100,17,132,0,90,11,100,18,100,19, + 132,0,90,12,100,20,100,21,132,0,90,13,100,22,83,0, + 41,23,218,14,95,78,97,109,101,115,112,97,99,101,80,97, + 116,104,97,38,1,0,0,82,101,112,114,101,115,101,110,116, + 115,32,97,32,110,97,109,101,115,112,97,99,101,32,112,97, + 99,107,97,103,101,39,115,32,112,97,116,104,46,32,32,73, + 116,32,117,115,101,115,32,116,104,101,32,109,111,100,117,108, + 101,32,110,97,109,101,10,32,32,32,32,116,111,32,102,105, + 110,100,32,105,116,115,32,112,97,114,101,110,116,32,109,111, + 100,117,108,101,44,32,97,110,100,32,102,114,111,109,32,116, + 104,101,114,101,32,105,116,32,108,111,111,107,115,32,117,112, + 32,116,104,101,32,112,97,114,101,110,116,39,115,10,32,32, + 32,32,95,95,112,97,116,104,95,95,46,32,32,87,104,101, + 110,32,116,104,105,115,32,99,104,97,110,103,101,115,44,32, + 116,104,101,32,109,111,100,117,108,101,39,115,32,111,119,110, + 32,112,97,116,104,32,105,115,32,114,101,99,111,109,112,117, + 116,101,100,44,10,32,32,32,32,117,115,105,110,103,32,112, + 97,116,104,95,102,105,110,100,101,114,46,32,32,70,111,114, + 32,116,111,112,45,108,101,118,101,108,32,109,111,100,117,108, + 101,115,44,32,116,104,101,32,112,97,114,101,110,116,32,109, + 111,100,117,108,101,39,115,32,112,97,116,104,10,32,32,32, + 32,105,115,32,115,121,115,46,112,97,116,104,46,99,4,0, + 0,0,0,0,0,0,4,0,0,0,2,0,0,0,67,0, + 0,0,115,36,0,0,0,124,1,124,0,95,0,124,2,124, + 0,95,1,116,2,124,0,106,3,131,0,131,1,124,0,95, + 4,124,3,124,0,95,5,100,0,83,0,41,1,78,41,6, + 218,5,95,110,97,109,101,218,5,95,112,97,116,104,114,97, + 0,0,0,218,16,95,103,101,116,95,112,97,114,101,110,116, + 95,112,97,116,104,218,17,95,108,97,115,116,95,112,97,114, + 101,110,116,95,112,97,116,104,218,12,95,112,97,116,104,95, + 102,105,110,100,101,114,41,4,114,104,0,0,0,114,102,0, + 0,0,114,37,0,0,0,218,11,112,97,116,104,95,102,105, + 110,100,101,114,114,4,0,0,0,114,4,0,0,0,114,6, + 0,0,0,114,182,0,0,0,192,3,0,0,115,8,0,0, + 0,0,1,6,1,6,1,14,1,122,23,95,78,97,109,101, + 115,112,97,99,101,80,97,116,104,46,95,95,105,110,105,116, + 95,95,99,1,0,0,0,0,0,0,0,4,0,0,0,3, + 0,0,0,67,0,0,0,115,38,0,0,0,124,0,106,0, + 106,1,100,1,131,1,92,3,125,1,125,2,125,3,124,2, + 100,2,107,2,114,30,100,6,83,0,124,1,100,5,102,2, + 83,0,41,7,122,62,82,101,116,117,114,110,115,32,97,32, + 116,117,112,108,101,32,111,102,32,40,112,97,114,101,110,116, + 45,109,111,100,117,108,101,45,110,97,109,101,44,32,112,97, + 114,101,110,116,45,112,97,116,104,45,97,116,116,114,45,110, + 97,109,101,41,114,61,0,0,0,114,32,0,0,0,114,8, + 0,0,0,114,37,0,0,0,90,8,95,95,112,97,116,104, + 95,95,41,2,114,8,0,0,0,114,37,0,0,0,41,2, + 114,228,0,0,0,114,34,0,0,0,41,4,114,104,0,0, + 0,114,219,0,0,0,218,3,100,111,116,90,2,109,101,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,23, + 95,102,105,110,100,95,112,97,114,101,110,116,95,112,97,116, + 104,95,110,97,109,101,115,198,3,0,0,115,8,0,0,0, + 0,2,18,1,8,2,4,3,122,38,95,78,97,109,101,115, + 112,97,99,101,80,97,116,104,46,95,102,105,110,100,95,112, + 97,114,101,110,116,95,112,97,116,104,95,110,97,109,101,115, + 99,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0, + 0,67,0,0,0,115,28,0,0,0,124,0,106,0,131,0, + 92,2,125,1,125,2,116,1,116,2,106,3,124,1,25,0, + 124,2,131,2,83,0,41,1,78,41,4,114,235,0,0,0, + 114,114,0,0,0,114,8,0,0,0,218,7,109,111,100,117, + 108,101,115,41,3,114,104,0,0,0,90,18,112,97,114,101, + 110,116,95,109,111,100,117,108,101,95,110,97,109,101,90,14, + 112,97,116,104,95,97,116,116,114,95,110,97,109,101,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,230,0, + 0,0,208,3,0,0,115,4,0,0,0,0,1,12,1,122, + 31,95,78,97,109,101,115,112,97,99,101,80,97,116,104,46, + 95,103,101,116,95,112,97,114,101,110,116,95,112,97,116,104, + 99,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0, + 0,67,0,0,0,115,80,0,0,0,116,0,124,0,106,1, + 131,0,131,1,125,1,124,1,124,0,106,2,107,3,114,74, + 124,0,106,3,124,0,106,4,124,1,131,2,125,2,124,2, + 100,0,107,9,114,68,124,2,106,5,100,0,107,8,114,68, + 124,2,106,6,114,68,124,2,106,6,124,0,95,7,124,1, + 124,0,95,2,124,0,106,7,83,0,41,1,78,41,8,114, + 97,0,0,0,114,230,0,0,0,114,231,0,0,0,114,232, + 0,0,0,114,228,0,0,0,114,124,0,0,0,114,154,0, + 0,0,114,229,0,0,0,41,3,114,104,0,0,0,90,11, + 112,97,114,101,110,116,95,112,97,116,104,114,162,0,0,0, + 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218, + 12,95,114,101,99,97,108,99,117,108,97,116,101,212,3,0, + 0,115,16,0,0,0,0,2,12,1,10,1,14,3,18,1, + 6,1,8,1,6,1,122,27,95,78,97,109,101,115,112,97, + 99,101,80,97,116,104,46,95,114,101,99,97,108,99,117,108, + 97,116,101,99,1,0,0,0,0,0,0,0,1,0,0,0, + 2,0,0,0,67,0,0,0,115,12,0,0,0,116,0,124, + 0,106,1,131,0,131,1,83,0,41,1,78,41,2,218,4, + 105,116,101,114,114,237,0,0,0,41,1,114,104,0,0,0, + 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218, + 8,95,95,105,116,101,114,95,95,225,3,0,0,115,2,0, + 0,0,0,1,122,23,95,78,97,109,101,115,112,97,99,101, + 80,97,116,104,46,95,95,105,116,101,114,95,95,99,3,0, + 0,0,0,0,0,0,3,0,0,0,3,0,0,0,67,0, + 0,0,115,14,0,0,0,124,2,124,0,106,0,124,1,60, + 0,100,0,83,0,41,1,78,41,1,114,229,0,0,0,41, + 3,114,104,0,0,0,218,5,105,110,100,101,120,114,37,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,218,11,95,95,115,101,116,105,116,101,109,95,95,228,3, + 0,0,115,2,0,0,0,0,1,122,26,95,78,97,109,101, + 115,112,97,99,101,80,97,116,104,46,95,95,115,101,116,105, + 116,101,109,95,95,99,1,0,0,0,0,0,0,0,1,0, + 0,0,2,0,0,0,67,0,0,0,115,12,0,0,0,116, + 0,124,0,106,1,131,0,131,1,83,0,41,1,78,41,2, + 114,33,0,0,0,114,237,0,0,0,41,1,114,104,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,187,0,0,0,3,4,0,0,115,2,0,0,0,0,1, - 122,25,95,78,97,109,101,115,112,97,99,101,76,111,97,100, - 101,114,46,95,95,105,110,105,116,95,95,99,2,0,0,0, + 218,7,95,95,108,101,110,95,95,231,3,0,0,115,2,0, + 0,0,0,1,122,22,95,78,97,109,101,115,112,97,99,101, + 80,97,116,104,46,95,95,108,101,110,95,95,99,1,0,0, + 0,0,0,0,0,1,0,0,0,2,0,0,0,67,0,0, + 0,115,12,0,0,0,100,1,106,0,124,0,106,1,131,1, + 83,0,41,2,78,122,20,95,78,97,109,101,115,112,97,99, + 101,80,97,116,104,40,123,33,114,125,41,41,2,114,50,0, + 0,0,114,229,0,0,0,41,1,114,104,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,218,8,95, + 95,114,101,112,114,95,95,234,3,0,0,115,2,0,0,0, + 0,1,122,23,95,78,97,109,101,115,112,97,99,101,80,97, + 116,104,46,95,95,114,101,112,114,95,95,99,2,0,0,0, 0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,0, - 115,16,0,0,0,100,1,0,106,0,0,124,1,0,106,1, - 0,131,1,0,83,41,2,122,115,82,101,116,117,114,110,32, - 114,101,112,114,32,102,111,114,32,116,104,101,32,109,111,100, - 117,108,101,46,10,10,32,32,32,32,32,32,32,32,84,104, - 101,32,109,101,116,104,111,100,32,105,115,32,100,101,112,114, - 101,99,97,116,101,100,46,32,32,84,104,101,32,105,109,112, - 111,114,116,32,109,97,99,104,105,110,101,114,121,32,100,111, - 101,115,32,116,104,101,32,106,111,98,32,105,116,115,101,108, - 102,46,10,10,32,32,32,32,32,32,32,32,122,25,60,109, - 111,100,117,108,101,32,123,33,114,125,32,40,110,97,109,101, - 115,112,97,99,101,41,62,41,2,114,49,0,0,0,114,114, - 0,0,0,41,2,114,173,0,0,0,114,192,0,0,0,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,11, - 109,111,100,117,108,101,95,114,101,112,114,6,4,0,0,115, - 2,0,0,0,0,7,122,28,95,78,97,109,101,115,112,97, - 99,101,76,111,97,100,101,114,46,109,111,100,117,108,101,95, - 114,101,112,114,99,2,0,0,0,0,0,0,0,2,0,0, - 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,1, - 0,83,41,2,78,84,114,4,0,0,0,41,2,114,110,0, - 0,0,114,128,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,162,0,0,0,15,4,0,0,115, - 2,0,0,0,0,1,122,27,95,78,97,109,101,115,112,97, - 99,101,76,111,97,100,101,114,46,105,115,95,112,97,99,107, - 97,103,101,99,2,0,0,0,0,0,0,0,2,0,0,0, - 1,0,0,0,67,0,0,0,115,4,0,0,0,100,1,0, - 83,41,2,78,114,32,0,0,0,114,4,0,0,0,41,2, - 114,110,0,0,0,114,128,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,204,0,0,0,18,4, - 0,0,115,2,0,0,0,0,1,122,27,95,78,97,109,101, - 115,112,97,99,101,76,111,97,100,101,114,46,103,101,116,95, - 115,111,117,114,99,101,99,2,0,0,0,0,0,0,0,2, - 0,0,0,6,0,0,0,67,0,0,0,115,22,0,0,0, - 116,0,0,100,1,0,100,2,0,100,3,0,100,4,0,100, - 5,0,131,3,1,83,41,6,78,114,32,0,0,0,122,8, - 60,115,116,114,105,110,103,62,114,191,0,0,0,114,206,0, - 0,0,84,41,1,114,207,0,0,0,41,2,114,110,0,0, - 0,114,128,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,114,189,0,0,0,21,4,0,0,115,2, - 0,0,0,0,1,122,25,95,78,97,109,101,115,112,97,99, - 101,76,111,97,100,101,114,46,103,101,116,95,99,111,100,101, - 99,2,0,0,0,0,0,0,0,2,0,0,0,1,0,0, - 0,67,0,0,0,115,4,0,0,0,100,1,0,83,41,2, - 122,42,85,115,101,32,100,101,102,97,117,108,116,32,115,101, - 109,97,110,116,105,99,115,32,102,111,114,32,109,111,100,117, - 108,101,32,99,114,101,97,116,105,111,110,46,78,114,4,0, - 0,0,41,2,114,110,0,0,0,114,167,0,0,0,114,4, - 0,0,0,114,4,0,0,0,114,6,0,0,0,114,188,0, - 0,0,24,4,0,0,115,0,0,0,0,122,30,95,78,97, - 109,101,115,112,97,99,101,76,111,97,100,101,114,46,99,114, - 101,97,116,101,95,109,111,100,117,108,101,99,2,0,0,0, + 115,12,0,0,0,124,1,124,0,106,0,131,0,107,6,83, + 0,41,1,78,41,1,114,237,0,0,0,41,2,114,104,0, + 0,0,218,4,105,116,101,109,114,4,0,0,0,114,4,0, + 0,0,114,6,0,0,0,218,12,95,95,99,111,110,116,97, + 105,110,115,95,95,237,3,0,0,115,2,0,0,0,0,1, + 122,27,95,78,97,109,101,115,112,97,99,101,80,97,116,104, + 46,95,95,99,111,110,116,97,105,110,115,95,95,99,2,0, + 0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,0, + 0,0,115,16,0,0,0,124,0,106,0,106,1,124,1,131, + 1,1,0,100,0,83,0,41,1,78,41,2,114,229,0,0, + 0,114,161,0,0,0,41,2,114,104,0,0,0,114,244,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,114,161,0,0,0,240,3,0,0,115,2,0,0,0,0, + 1,122,21,95,78,97,109,101,115,112,97,99,101,80,97,116, + 104,46,97,112,112,101,110,100,78,41,14,114,109,0,0,0, + 114,108,0,0,0,114,110,0,0,0,114,111,0,0,0,114, + 182,0,0,0,114,235,0,0,0,114,230,0,0,0,114,237, + 0,0,0,114,239,0,0,0,114,241,0,0,0,114,242,0, + 0,0,114,243,0,0,0,114,245,0,0,0,114,161,0,0, + 0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,227,0,0,0,185,3,0,0,115,22, + 0,0,0,8,5,4,2,8,6,8,10,8,4,8,13,8, + 3,8,3,8,3,8,3,8,3,114,227,0,0,0,99,0, + 0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64, + 0,0,0,115,80,0,0,0,101,0,90,1,100,0,90,2, + 100,1,100,2,132,0,90,3,101,4,100,3,100,4,132,0, + 131,1,90,5,100,5,100,6,132,0,90,6,100,7,100,8, + 132,0,90,7,100,9,100,10,132,0,90,8,100,11,100,12, + 132,0,90,9,100,13,100,14,132,0,90,10,100,15,100,16, + 132,0,90,11,100,17,83,0,41,18,218,16,95,78,97,109, + 101,115,112,97,99,101,76,111,97,100,101,114,99,4,0,0, + 0,0,0,0,0,4,0,0,0,4,0,0,0,67,0,0, + 0,115,18,0,0,0,116,0,124,1,124,2,124,3,131,3, + 124,0,95,1,100,0,83,0,41,1,78,41,2,114,227,0, + 0,0,114,229,0,0,0,41,4,114,104,0,0,0,114,102, + 0,0,0,114,37,0,0,0,114,233,0,0,0,114,4,0, + 0,0,114,4,0,0,0,114,6,0,0,0,114,182,0,0, + 0,246,3,0,0,115,2,0,0,0,0,1,122,25,95,78, + 97,109,101,115,112,97,99,101,76,111,97,100,101,114,46,95, + 95,105,110,105,116,95,95,99,2,0,0,0,0,0,0,0, + 2,0,0,0,2,0,0,0,67,0,0,0,115,12,0,0, + 0,100,1,106,0,124,1,106,1,131,1,83,0,41,2,122, + 115,82,101,116,117,114,110,32,114,101,112,114,32,102,111,114, + 32,116,104,101,32,109,111,100,117,108,101,46,10,10,32,32, + 32,32,32,32,32,32,84,104,101,32,109,101,116,104,111,100, + 32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,32, + 32,84,104,101,32,105,109,112,111,114,116,32,109,97,99,104, + 105,110,101,114,121,32,100,111,101,115,32,116,104,101,32,106, + 111,98,32,105,116,115,101,108,102,46,10,10,32,32,32,32, + 32,32,32,32,122,25,60,109,111,100,117,108,101,32,123,33, + 114,125,32,40,110,97,109,101,115,112,97,99,101,41,62,41, + 2,114,50,0,0,0,114,109,0,0,0,41,2,114,168,0, + 0,0,114,187,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,218,11,109,111,100,117,108,101,95,114, + 101,112,114,249,3,0,0,115,2,0,0,0,0,7,122,28, + 95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,114, + 46,109,111,100,117,108,101,95,114,101,112,114,99,2,0,0, + 0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,0, + 0,115,4,0,0,0,100,1,83,0,41,2,78,84,114,4, + 0,0,0,41,2,114,104,0,0,0,114,123,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,157, + 0,0,0,2,4,0,0,115,2,0,0,0,0,1,122,27, + 95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,114, + 46,105,115,95,112,97,99,107,97,103,101,99,2,0,0,0, 0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0, - 115,4,0,0,0,100,0,0,83,41,1,78,114,4,0,0, - 0,41,2,114,110,0,0,0,114,192,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,114,193,0,0, - 0,27,4,0,0,115,2,0,0,0,0,1,122,28,95,78, - 97,109,101,115,112,97,99,101,76,111,97,100,101,114,46,101, - 120,101,99,95,109,111,100,117,108,101,99,2,0,0,0,0, - 0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115, - 32,0,0,0,116,0,0,100,1,0,124,0,0,106,1,0, - 131,2,0,1,116,2,0,106,3,0,124,0,0,124,1,0, - 131,2,0,83,41,2,122,98,76,111,97,100,32,97,32,110, - 97,109,101,115,112,97,99,101,32,109,111,100,117,108,101,46, - 10,10,32,32,32,32,32,32,32,32,84,104,105,115,32,109, - 101,116,104,111,100,32,105,115,32,100,101,112,114,101,99,97, - 116,101,100,46,32,32,85,115,101,32,101,120,101,99,95,109, - 111,100,117,108,101,40,41,32,105,110,115,116,101,97,100,46, - 10,10,32,32,32,32,32,32,32,32,122,38,110,97,109,101, - 115,112,97,99,101,32,109,111,100,117,108,101,32,108,111,97, - 100,101,100,32,119,105,116,104,32,112,97,116,104,32,123,33, - 114,125,41,4,114,107,0,0,0,114,234,0,0,0,114,123, - 0,0,0,114,194,0,0,0,41,2,114,110,0,0,0,114, - 128,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,195,0,0,0,30,4,0,0,115,4,0,0, - 0,0,7,16,1,122,28,95,78,97,109,101,115,112,97,99, + 115,4,0,0,0,100,1,83,0,41,2,78,114,32,0,0, + 0,114,4,0,0,0,41,2,114,104,0,0,0,114,123,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,114,199,0,0,0,5,4,0,0,115,2,0,0,0,0, + 1,122,27,95,78,97,109,101,115,112,97,99,101,76,111,97, + 100,101,114,46,103,101,116,95,115,111,117,114,99,101,99,2, + 0,0,0,0,0,0,0,2,0,0,0,6,0,0,0,67, + 0,0,0,115,16,0,0,0,116,0,100,1,100,2,100,3, + 100,4,100,5,141,4,83,0,41,6,78,114,32,0,0,0, + 122,8,60,115,116,114,105,110,103,62,114,186,0,0,0,84, + 41,1,114,201,0,0,0,41,1,114,202,0,0,0,41,2, + 114,104,0,0,0,114,123,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,114,184,0,0,0,8,4, + 0,0,115,2,0,0,0,0,1,122,25,95,78,97,109,101, + 115,112,97,99,101,76,111,97,100,101,114,46,103,101,116,95, + 99,111,100,101,99,2,0,0,0,0,0,0,0,2,0,0, + 0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,1, + 83,0,41,2,122,42,85,115,101,32,100,101,102,97,117,108, + 116,32,115,101,109,97,110,116,105,99,115,32,102,111,114,32, + 109,111,100,117,108,101,32,99,114,101,97,116,105,111,110,46, + 78,114,4,0,0,0,41,2,114,104,0,0,0,114,162,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,114,183,0,0,0,11,4,0,0,115,0,0,0,0,122, + 30,95,78,97,109,101,115,112,97,99,101,76,111,97,100,101, + 114,46,99,114,101,97,116,101,95,109,111,100,117,108,101,99, + 2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0, + 67,0,0,0,115,4,0,0,0,100,0,83,0,41,1,78, + 114,4,0,0,0,41,2,114,104,0,0,0,114,187,0,0, + 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 114,188,0,0,0,14,4,0,0,115,2,0,0,0,0,1, + 122,28,95,78,97,109,101,115,112,97,99,101,76,111,97,100, + 101,114,46,101,120,101,99,95,109,111,100,117,108,101,99,2, + 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,67, + 0,0,0,115,26,0,0,0,116,0,106,1,100,1,124,0, + 106,2,131,2,1,0,116,0,106,3,124,0,124,1,131,2, + 83,0,41,2,122,98,76,111,97,100,32,97,32,110,97,109, + 101,115,112,97,99,101,32,109,111,100,117,108,101,46,10,10, + 32,32,32,32,32,32,32,32,84,104,105,115,32,109,101,116, + 104,111,100,32,105,115,32,100,101,112,114,101,99,97,116,101, + 100,46,32,32,85,115,101,32,101,120,101,99,95,109,111,100, + 117,108,101,40,41,32,105,110,115,116,101,97,100,46,10,10, + 32,32,32,32,32,32,32,32,122,38,110,97,109,101,115,112, + 97,99,101,32,109,111,100,117,108,101,32,108,111,97,100,101, + 100,32,119,105,116,104,32,112,97,116,104,32,123,33,114,125, + 41,4,114,118,0,0,0,114,133,0,0,0,114,229,0,0, + 0,114,189,0,0,0,41,2,114,104,0,0,0,114,123,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,114,190,0,0,0,17,4,0,0,115,6,0,0,0,0, + 7,6,1,8,1,122,28,95,78,97,109,101,115,112,97,99, 101,76,111,97,100,101,114,46,108,111,97,100,95,109,111,100, - 117,108,101,78,41,12,114,114,0,0,0,114,113,0,0,0, - 114,115,0,0,0,114,187,0,0,0,114,185,0,0,0,114, - 250,0,0,0,114,162,0,0,0,114,204,0,0,0,114,189, - 0,0,0,114,188,0,0,0,114,193,0,0,0,114,195,0, + 117,108,101,78,41,12,114,109,0,0,0,114,108,0,0,0, + 114,110,0,0,0,114,182,0,0,0,114,180,0,0,0,114, + 247,0,0,0,114,157,0,0,0,114,199,0,0,0,114,184, + 0,0,0,114,183,0,0,0,114,188,0,0,0,114,190,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,249,0,0,0,2,4,0,0,115, - 16,0,0,0,12,1,12,3,18,9,12,3,12,3,12,3, - 12,3,12,3,114,249,0,0,0,99,0,0,0,0,0,0, - 0,0,0,0,0,0,5,0,0,0,64,0,0,0,115,160, - 0,0,0,101,0,0,90,1,0,100,0,0,90,2,0,100, - 1,0,90,3,0,101,4,0,100,2,0,100,3,0,132,0, - 0,131,1,0,90,5,0,101,4,0,100,4,0,100,5,0, - 132,0,0,131,1,0,90,6,0,101,4,0,100,6,0,100, - 7,0,132,0,0,131,1,0,90,7,0,101,4,0,100,8, - 0,100,9,0,132,0,0,131,1,0,90,8,0,101,4,0, - 100,10,0,100,11,0,100,12,0,132,1,0,131,1,0,90, - 9,0,101,4,0,100,10,0,100,10,0,100,13,0,100,14, - 0,132,2,0,131,1,0,90,10,0,101,4,0,100,10,0, - 100,15,0,100,16,0,132,1,0,131,1,0,90,11,0,100, - 10,0,83,41,17,218,10,80,97,116,104,70,105,110,100,101, - 114,122,62,77,101,116,97,32,112,97,116,104,32,102,105,110, - 100,101,114,32,102,111,114,32,115,121,115,46,112,97,116,104, - 32,97,110,100,32,112,97,99,107,97,103,101,32,95,95,112, - 97,116,104,95,95,32,97,116,116,114,105,98,117,116,101,115, - 46,99,1,0,0,0,0,0,0,0,2,0,0,0,4,0, - 0,0,67,0,0,0,115,55,0,0,0,120,48,0,116,0, - 0,106,1,0,106,2,0,131,0,0,68,93,31,0,125,1, - 0,116,3,0,124,1,0,100,1,0,131,2,0,114,16,0, - 124,1,0,106,4,0,131,0,0,1,113,16,0,87,100,2, - 0,83,41,3,122,125,67,97,108,108,32,116,104,101,32,105, - 110,118,97,108,105,100,97,116,101,95,99,97,99,104,101,115, - 40,41,32,109,101,116,104,111,100,32,111,110,32,97,108,108, - 32,112,97,116,104,32,101,110,116,114,121,32,102,105,110,100, - 101,114,115,10,32,32,32,32,32,32,32,32,115,116,111,114, - 101,100,32,105,110,32,115,121,115,46,112,97,116,104,95,105, - 109,112,111,114,116,101,114,95,99,97,99,104,101,115,32,40, - 119,104,101,114,101,32,105,109,112,108,101,109,101,110,116,101, - 100,41,46,218,17,105,110,118,97,108,105,100,97,116,101,95, - 99,97,99,104,101,115,78,41,5,114,8,0,0,0,218,19, - 112,97,116,104,95,105,109,112,111,114,116,101,114,95,99,97, - 99,104,101,218,6,118,97,108,117,101,115,114,117,0,0,0, - 114,252,0,0,0,41,2,114,173,0,0,0,218,6,102,105, - 110,100,101,114,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,252,0,0,0,47,4,0,0,115,6,0,0, - 0,0,4,22,1,15,1,122,28,80,97,116,104,70,105,110, - 100,101,114,46,105,110,118,97,108,105,100,97,116,101,95,99, - 97,99,104,101,115,99,2,0,0,0,0,0,0,0,3,0, - 0,0,12,0,0,0,67,0,0,0,115,107,0,0,0,116, - 0,0,106,1,0,100,1,0,107,9,0,114,41,0,116,0, - 0,106,1,0,12,114,41,0,116,2,0,106,3,0,100,2, - 0,116,4,0,131,2,0,1,120,59,0,116,0,0,106,1, - 0,68,93,44,0,125,2,0,121,14,0,124,2,0,124,1, - 0,131,1,0,83,87,113,51,0,4,116,5,0,107,10,0, - 114,94,0,1,1,1,119,51,0,89,113,51,0,88,113,51, - 0,87,100,1,0,83,100,1,0,83,41,3,122,113,83,101, - 97,114,99,104,32,115,101,113,117,101,110,99,101,32,111,102, - 32,104,111,111,107,115,32,102,111,114,32,97,32,102,105,110, - 100,101,114,32,102,111,114,32,39,112,97,116,104,39,46,10, - 10,32,32,32,32,32,32,32,32,73,102,32,39,104,111,111, - 107,115,39,32,105,115,32,102,97,108,115,101,32,116,104,101, - 110,32,117,115,101,32,115,121,115,46,112,97,116,104,95,104, - 111,111,107,115,46,10,10,32,32,32,32,32,32,32,32,78, - 122,23,115,121,115,46,112,97,116,104,95,104,111,111,107,115, - 32,105,115,32,101,109,112,116,121,41,6,114,8,0,0,0, - 218,10,112,97,116,104,95,104,111,111,107,115,114,62,0,0, - 0,114,63,0,0,0,114,127,0,0,0,114,109,0,0,0, - 41,3,114,173,0,0,0,114,37,0,0,0,90,4,104,111, - 111,107,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,11,95,112,97,116,104,95,104,111,111,107,115,55,4, - 0,0,115,16,0,0,0,0,7,25,1,16,1,16,1,3, - 1,14,1,13,1,12,2,122,22,80,97,116,104,70,105,110, - 100,101,114,46,95,112,97,116,104,95,104,111,111,107,115,99, - 2,0,0,0,0,0,0,0,3,0,0,0,19,0,0,0, - 67,0,0,0,115,123,0,0,0,124,1,0,100,1,0,107, - 2,0,114,53,0,121,16,0,116,0,0,106,1,0,131,0, - 0,125,1,0,87,110,22,0,4,116,2,0,107,10,0,114, - 52,0,1,1,1,100,2,0,83,89,110,1,0,88,121,17, - 0,116,3,0,106,4,0,124,1,0,25,125,2,0,87,110, - 46,0,4,116,5,0,107,10,0,114,118,0,1,1,1,124, - 0,0,106,6,0,124,1,0,131,1,0,125,2,0,124,2, - 0,116,3,0,106,4,0,124,1,0,60,89,110,1,0,88, - 124,2,0,83,41,3,122,210,71,101,116,32,116,104,101,32, + 0,114,6,0,0,0,114,246,0,0,0,245,3,0,0,115, + 16,0,0,0,8,1,8,3,12,9,8,3,8,3,8,3, + 8,3,8,3,114,246,0,0,0,99,0,0,0,0,0,0, + 0,0,0,0,0,0,4,0,0,0,64,0,0,0,115,106, + 0,0,0,101,0,90,1,100,0,90,2,100,1,90,3,101, + 4,100,2,100,3,132,0,131,1,90,5,101,4,100,4,100, + 5,132,0,131,1,90,6,101,4,100,6,100,7,132,0,131, + 1,90,7,101,4,100,8,100,9,132,0,131,1,90,8,101, + 4,100,17,100,11,100,12,132,1,131,1,90,9,101,4,100, + 18,100,13,100,14,132,1,131,1,90,10,101,4,100,19,100, + 15,100,16,132,1,131,1,90,11,100,10,83,0,41,20,218, + 10,80,97,116,104,70,105,110,100,101,114,122,62,77,101,116, + 97,32,112,97,116,104,32,102,105,110,100,101,114,32,102,111, + 114,32,115,121,115,46,112,97,116,104,32,97,110,100,32,112, + 97,99,107,97,103,101,32,95,95,112,97,116,104,95,95,32, + 97,116,116,114,105,98,117,116,101,115,46,99,1,0,0,0, + 0,0,0,0,2,0,0,0,4,0,0,0,67,0,0,0, + 115,42,0,0,0,120,36,116,0,106,1,106,2,131,0,68, + 0,93,22,125,1,116,3,124,1,100,1,131,2,114,12,124, + 1,106,4,131,0,1,0,113,12,87,0,100,2,83,0,41, + 3,122,125,67,97,108,108,32,116,104,101,32,105,110,118,97, + 108,105,100,97,116,101,95,99,97,99,104,101,115,40,41,32, + 109,101,116,104,111,100,32,111,110,32,97,108,108,32,112,97, + 116,104,32,101,110,116,114,121,32,102,105,110,100,101,114,115, + 10,32,32,32,32,32,32,32,32,115,116,111,114,101,100,32, + 105,110,32,115,121,115,46,112,97,116,104,95,105,109,112,111, + 114,116,101,114,95,99,97,99,104,101,115,32,40,119,104,101, + 114,101,32,105,109,112,108,101,109,101,110,116,101,100,41,46, + 218,17,105,110,118,97,108,105,100,97,116,101,95,99,97,99, + 104,101,115,78,41,5,114,8,0,0,0,218,19,112,97,116, + 104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101, + 218,6,118,97,108,117,101,115,114,112,0,0,0,114,249,0, + 0,0,41,2,114,168,0,0,0,218,6,102,105,110,100,101, + 114,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, + 114,249,0,0,0,35,4,0,0,115,6,0,0,0,0,4, + 16,1,10,1,122,28,80,97,116,104,70,105,110,100,101,114, + 46,105,110,118,97,108,105,100,97,116,101,95,99,97,99,104, + 101,115,99,2,0,0,0,0,0,0,0,3,0,0,0,12, + 0,0,0,67,0,0,0,115,86,0,0,0,116,0,106,1, + 100,1,107,9,114,30,116,0,106,1,12,0,114,30,116,2, + 106,3,100,2,116,4,131,2,1,0,120,50,116,0,106,1, + 68,0,93,36,125,2,121,8,124,2,124,1,131,1,83,0, + 4,0,116,5,107,10,114,72,1,0,1,0,1,0,119,38, + 89,0,113,38,88,0,113,38,87,0,100,1,83,0,100,1, + 83,0,41,3,122,46,83,101,97,114,99,104,32,115,121,115, + 46,112,97,116,104,95,104,111,111,107,115,32,102,111,114,32, + 97,32,102,105,110,100,101,114,32,102,111,114,32,39,112,97, + 116,104,39,46,78,122,23,115,121,115,46,112,97,116,104,95, + 104,111,111,107,115,32,105,115,32,101,109,112,116,121,41,6, + 114,8,0,0,0,218,10,112,97,116,104,95,104,111,111,107, + 115,114,63,0,0,0,114,64,0,0,0,114,122,0,0,0, + 114,103,0,0,0,41,3,114,168,0,0,0,114,37,0,0, + 0,90,4,104,111,111,107,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,218,11,95,112,97,116,104,95,104,111, + 111,107,115,43,4,0,0,115,16,0,0,0,0,3,18,1, + 12,1,12,1,2,1,8,1,14,1,12,2,122,22,80,97, + 116,104,70,105,110,100,101,114,46,95,112,97,116,104,95,104, + 111,111,107,115,99,2,0,0,0,0,0,0,0,3,0,0, + 0,19,0,0,0,67,0,0,0,115,102,0,0,0,124,1, + 100,1,107,2,114,42,121,12,116,0,106,1,131,0,125,1, + 87,0,110,20,4,0,116,2,107,10,114,40,1,0,1,0, + 1,0,100,2,83,0,88,0,121,14,116,3,106,4,124,1, + 25,0,125,2,87,0,110,40,4,0,116,5,107,10,114,96, + 1,0,1,0,1,0,124,0,106,6,124,1,131,1,125,2, + 124,2,116,3,106,4,124,1,60,0,89,0,110,2,88,0, + 124,2,83,0,41,3,122,210,71,101,116,32,116,104,101,32, 102,105,110,100,101,114,32,102,111,114,32,116,104,101,32,112, 97,116,104,32,101,110,116,114,121,32,102,114,111,109,32,115, 121,115,46,112,97,116,104,95,105,109,112,111,114,116,101,114, @@ -2006,355 +1868,328 @@ const unsigned char _Py_M__importlib_external[] = { 10,10,32,32,32,32,32,32,32,32,114,32,0,0,0,78, 41,7,114,3,0,0,0,114,47,0,0,0,218,17,70,105, 108,101,78,111,116,70,111,117,110,100,69,114,114,111,114,114, - 8,0,0,0,114,253,0,0,0,114,140,0,0,0,114,1, - 1,0,0,41,3,114,173,0,0,0,114,37,0,0,0,114, - 255,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, + 8,0,0,0,114,250,0,0,0,114,135,0,0,0,114,254, + 0,0,0,41,3,114,168,0,0,0,114,37,0,0,0,114, + 252,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, 0,0,0,218,20,95,112,97,116,104,95,105,109,112,111,114, - 116,101,114,95,99,97,99,104,101,72,4,0,0,115,22,0, - 0,0,0,8,12,1,3,1,16,1,13,3,9,1,3,1, - 17,1,13,1,15,1,18,1,122,31,80,97,116,104,70,105, + 116,101,114,95,99,97,99,104,101,56,4,0,0,115,22,0, + 0,0,0,8,8,1,2,1,12,1,14,3,6,1,2,1, + 14,1,14,1,10,1,16,1,122,31,80,97,116,104,70,105, 110,100,101,114,46,95,112,97,116,104,95,105,109,112,111,114, 116,101,114,95,99,97,99,104,101,99,3,0,0,0,0,0, - 0,0,6,0,0,0,3,0,0,0,67,0,0,0,115,119, - 0,0,0,116,0,0,124,2,0,100,1,0,131,2,0,114, - 39,0,124,2,0,106,1,0,124,1,0,131,1,0,92,2, - 0,125,3,0,125,4,0,110,21,0,124,2,0,106,2,0, - 124,1,0,131,1,0,125,3,0,103,0,0,125,4,0,124, - 3,0,100,0,0,107,9,0,114,88,0,116,3,0,106,4, - 0,124,1,0,124,3,0,131,2,0,83,116,3,0,106,5, - 0,124,1,0,100,0,0,131,2,0,125,5,0,124,4,0, - 124,5,0,95,6,0,124,5,0,83,41,2,78,114,126,0, - 0,0,41,7,114,117,0,0,0,114,126,0,0,0,114,184, - 0,0,0,114,123,0,0,0,114,181,0,0,0,114,163,0, - 0,0,114,159,0,0,0,41,6,114,173,0,0,0,114,128, - 0,0,0,114,255,0,0,0,114,129,0,0,0,114,130,0, - 0,0,114,167,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,218,16,95,108,101,103,97,99,121,95, - 103,101,116,95,115,112,101,99,94,4,0,0,115,18,0,0, - 0,0,4,15,1,24,2,15,1,6,1,12,1,16,1,18, - 1,9,1,122,27,80,97,116,104,70,105,110,100,101,114,46, - 95,108,101,103,97,99,121,95,103,101,116,95,115,112,101,99, - 78,99,4,0,0,0,0,0,0,0,9,0,0,0,5,0, - 0,0,67,0,0,0,115,243,0,0,0,103,0,0,125,4, - 0,120,230,0,124,2,0,68,93,191,0,125,5,0,116,0, - 0,124,5,0,116,1,0,116,2,0,102,2,0,131,2,0, - 115,43,0,113,13,0,124,0,0,106,3,0,124,5,0,131, - 1,0,125,6,0,124,6,0,100,1,0,107,9,0,114,13, - 0,116,4,0,124,6,0,100,2,0,131,2,0,114,106,0, - 124,6,0,106,5,0,124,1,0,124,3,0,131,2,0,125, - 7,0,110,18,0,124,0,0,106,6,0,124,1,0,124,6, - 0,131,2,0,125,7,0,124,7,0,100,1,0,107,8,0, - 114,139,0,113,13,0,124,7,0,106,7,0,100,1,0,107, - 9,0,114,158,0,124,7,0,83,124,7,0,106,8,0,125, - 8,0,124,8,0,100,1,0,107,8,0,114,191,0,116,9, - 0,100,3,0,131,1,0,130,1,0,124,4,0,106,10,0, - 124,8,0,131,1,0,1,113,13,0,87,116,11,0,106,12, - 0,124,1,0,100,1,0,131,2,0,125,7,0,124,4,0, - 124,7,0,95,8,0,124,7,0,83,100,1,0,83,41,4, - 122,63,70,105,110,100,32,116,104,101,32,108,111,97,100,101, - 114,32,111,114,32,110,97,109,101,115,112,97,99,101,95,112, - 97,116,104,32,102,111,114,32,116,104,105,115,32,109,111,100, - 117,108,101,47,112,97,99,107,97,103,101,32,110,97,109,101, - 46,78,114,183,0,0,0,122,19,115,112,101,99,32,109,105, - 115,115,105,110,103,32,108,111,97,100,101,114,41,13,114,146, - 0,0,0,114,71,0,0,0,218,5,98,121,116,101,115,114, - 3,1,0,0,114,117,0,0,0,114,183,0,0,0,114,4, - 1,0,0,114,129,0,0,0,114,159,0,0,0,114,109,0, - 0,0,114,152,0,0,0,114,123,0,0,0,114,163,0,0, - 0,41,9,114,173,0,0,0,114,128,0,0,0,114,37,0, - 0,0,114,182,0,0,0,218,14,110,97,109,101,115,112,97, - 99,101,95,112,97,116,104,90,5,101,110,116,114,121,114,255, - 0,0,0,114,167,0,0,0,114,130,0,0,0,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,218,9,95,103, - 101,116,95,115,112,101,99,109,4,0,0,115,40,0,0,0, - 0,5,6,1,13,1,21,1,3,1,15,1,12,1,15,1, - 21,2,18,1,12,1,3,1,15,1,4,1,9,1,12,1, - 12,5,17,2,18,1,9,1,122,20,80,97,116,104,70,105, - 110,100,101,114,46,95,103,101,116,95,115,112,101,99,99,4, - 0,0,0,0,0,0,0,6,0,0,0,4,0,0,0,67, - 0,0,0,115,140,0,0,0,124,2,0,100,1,0,107,8, - 0,114,21,0,116,0,0,106,1,0,125,2,0,124,0,0, - 106,2,0,124,1,0,124,2,0,124,3,0,131,3,0,125, - 4,0,124,4,0,100,1,0,107,8,0,114,58,0,100,1, - 0,83,124,4,0,106,3,0,100,1,0,107,8,0,114,132, - 0,124,4,0,106,4,0,125,5,0,124,5,0,114,125,0, - 100,2,0,124,4,0,95,5,0,116,6,0,124,1,0,124, - 5,0,124,0,0,106,2,0,131,3,0,124,4,0,95,4, - 0,124,4,0,83,100,1,0,83,110,4,0,124,4,0,83, - 100,1,0,83,41,3,122,98,102,105,110,100,32,116,104,101, - 32,109,111,100,117,108,101,32,111,110,32,115,121,115,46,112, - 97,116,104,32,111,114,32,39,112,97,116,104,39,32,98,97, - 115,101,100,32,111,110,32,115,121,115,46,112,97,116,104,95, - 104,111,111,107,115,32,97,110,100,10,32,32,32,32,32,32, - 32,32,115,121,115,46,112,97,116,104,95,105,109,112,111,114, - 116,101,114,95,99,97,99,104,101,46,78,90,9,110,97,109, - 101,115,112,97,99,101,41,7,114,8,0,0,0,114,37,0, - 0,0,114,7,1,0,0,114,129,0,0,0,114,159,0,0, - 0,114,161,0,0,0,114,232,0,0,0,41,6,114,173,0, - 0,0,114,128,0,0,0,114,37,0,0,0,114,182,0,0, - 0,114,167,0,0,0,114,6,1,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,183,0,0,0,141, - 4,0,0,115,26,0,0,0,0,4,12,1,9,1,21,1, - 12,1,4,1,15,1,9,1,6,3,9,1,24,1,4,2, - 7,2,122,20,80,97,116,104,70,105,110,100,101,114,46,102, - 105,110,100,95,115,112,101,99,99,3,0,0,0,0,0,0, - 0,4,0,0,0,3,0,0,0,67,0,0,0,115,41,0, - 0,0,124,0,0,106,0,0,124,1,0,124,2,0,131,2, - 0,125,3,0,124,3,0,100,1,0,107,8,0,114,34,0, - 100,1,0,83,124,3,0,106,1,0,83,41,2,122,170,102, - 105,110,100,32,116,104,101,32,109,111,100,117,108,101,32,111, - 110,32,115,121,115,46,112,97,116,104,32,111,114,32,39,112, - 97,116,104,39,32,98,97,115,101,100,32,111,110,32,115,121, - 115,46,112,97,116,104,95,104,111,111,107,115,32,97,110,100, - 10,32,32,32,32,32,32,32,32,115,121,115,46,112,97,116, - 104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101, - 46,10,10,32,32,32,32,32,32,32,32,84,104,105,115,32, - 109,101,116,104,111,100,32,105,115,32,100,101,112,114,101,99, - 97,116,101,100,46,32,32,85,115,101,32,102,105,110,100,95, - 115,112,101,99,40,41,32,105,110,115,116,101,97,100,46,10, - 10,32,32,32,32,32,32,32,32,78,41,2,114,183,0,0, - 0,114,129,0,0,0,41,4,114,173,0,0,0,114,128,0, - 0,0,114,37,0,0,0,114,167,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,114,184,0,0,0, - 163,4,0,0,115,8,0,0,0,0,8,18,1,12,1,4, - 1,122,22,80,97,116,104,70,105,110,100,101,114,46,102,105, - 110,100,95,109,111,100,117,108,101,41,12,114,114,0,0,0, - 114,113,0,0,0,114,115,0,0,0,114,116,0,0,0,114, - 185,0,0,0,114,252,0,0,0,114,1,1,0,0,114,3, - 1,0,0,114,4,1,0,0,114,7,1,0,0,114,183,0, - 0,0,114,184,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,114,251,0,0,0, - 43,4,0,0,115,22,0,0,0,12,2,6,2,18,8,18, - 17,18,22,18,15,3,1,18,31,3,1,21,21,3,1,114, - 251,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0, - 0,3,0,0,0,64,0,0,0,115,133,0,0,0,101,0, - 0,90,1,0,100,0,0,90,2,0,100,1,0,90,3,0, - 100,2,0,100,3,0,132,0,0,90,4,0,100,4,0,100, - 5,0,132,0,0,90,5,0,101,6,0,90,7,0,100,6, - 0,100,7,0,132,0,0,90,8,0,100,8,0,100,9,0, - 132,0,0,90,9,0,100,10,0,100,11,0,100,12,0,132, - 1,0,90,10,0,100,13,0,100,14,0,132,0,0,90,11, - 0,101,12,0,100,15,0,100,16,0,132,0,0,131,1,0, - 90,13,0,100,17,0,100,18,0,132,0,0,90,14,0,100, - 10,0,83,41,19,218,10,70,105,108,101,70,105,110,100,101, - 114,122,172,70,105,108,101,45,98,97,115,101,100,32,102,105, - 110,100,101,114,46,10,10,32,32,32,32,73,110,116,101,114, - 97,99,116,105,111,110,115,32,119,105,116,104,32,116,104,101, - 32,102,105,108,101,32,115,121,115,116,101,109,32,97,114,101, - 32,99,97,99,104,101,100,32,102,111,114,32,112,101,114,102, - 111,114,109,97,110,99,101,44,32,98,101,105,110,103,10,32, - 32,32,32,114,101,102,114,101,115,104,101,100,32,119,104,101, - 110,32,116,104,101,32,100,105,114,101,99,116,111,114,121,32, - 116,104,101,32,102,105,110,100,101,114,32,105,115,32,104,97, - 110,100,108,105,110,103,32,104,97,115,32,98,101,101,110,32, - 109,111,100,105,102,105,101,100,46,10,10,32,32,32,32,99, - 2,0,0,0,0,0,0,0,5,0,0,0,5,0,0,0, - 7,0,0,0,115,122,0,0,0,103,0,0,125,3,0,120, - 52,0,124,2,0,68,93,44,0,92,2,0,137,0,0,125, - 4,0,124,3,0,106,0,0,135,0,0,102,1,0,100,1, - 0,100,2,0,134,0,0,124,4,0,68,131,1,0,131,1, - 0,1,113,13,0,87,124,3,0,124,0,0,95,1,0,124, - 1,0,112,79,0,100,3,0,124,0,0,95,2,0,100,6, - 0,124,0,0,95,3,0,116,4,0,131,0,0,124,0,0, - 95,5,0,116,4,0,131,0,0,124,0,0,95,6,0,100, - 5,0,83,41,7,122,154,73,110,105,116,105,97,108,105,122, - 101,32,119,105,116,104,32,116,104,101,32,112,97,116,104,32, - 116,111,32,115,101,97,114,99,104,32,111,110,32,97,110,100, - 32,97,32,118,97,114,105,97,98,108,101,32,110,117,109,98, - 101,114,32,111,102,10,32,32,32,32,32,32,32,32,50,45, - 116,117,112,108,101,115,32,99,111,110,116,97,105,110,105,110, - 103,32,116,104,101,32,108,111,97,100,101,114,32,97,110,100, - 32,116,104,101,32,102,105,108,101,32,115,117,102,102,105,120, - 101,115,32,116,104,101,32,108,111,97,100,101,114,10,32,32, - 32,32,32,32,32,32,114,101,99,111,103,110,105,122,101,115, - 46,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0, - 0,0,51,0,0,0,115,27,0,0,0,124,0,0,93,17, - 0,125,1,0,124,1,0,136,0,0,102,2,0,86,1,113, - 3,0,100,0,0,83,41,1,78,114,4,0,0,0,41,2, - 114,24,0,0,0,114,227,0,0,0,41,1,114,129,0,0, - 0,114,4,0,0,0,114,6,0,0,0,114,229,0,0,0, - 192,4,0,0,115,2,0,0,0,6,0,122,38,70,105,108, - 101,70,105,110,100,101,114,46,95,95,105,110,105,116,95,95, - 46,60,108,111,99,97,108,115,62,46,60,103,101,110,101,120, - 112,114,62,114,60,0,0,0,114,31,0,0,0,78,114,89, - 0,0,0,41,7,114,152,0,0,0,218,8,95,108,111,97, - 100,101,114,115,114,37,0,0,0,218,11,95,112,97,116,104, - 95,109,116,105,109,101,218,3,115,101,116,218,11,95,112,97, - 116,104,95,99,97,99,104,101,218,19,95,114,101,108,97,120, - 101,100,95,112,97,116,104,95,99,97,99,104,101,41,5,114, - 110,0,0,0,114,37,0,0,0,218,14,108,111,97,100,101, - 114,95,100,101,116,97,105,108,115,90,7,108,111,97,100,101, - 114,115,114,169,0,0,0,114,4,0,0,0,41,1,114,129, - 0,0,0,114,6,0,0,0,114,187,0,0,0,186,4,0, - 0,115,16,0,0,0,0,4,6,1,19,1,36,1,9,2, - 15,1,9,1,12,1,122,19,70,105,108,101,70,105,110,100, - 101,114,46,95,95,105,110,105,116,95,95,99,1,0,0,0, - 0,0,0,0,1,0,0,0,2,0,0,0,67,0,0,0, - 115,13,0,0,0,100,3,0,124,0,0,95,0,0,100,2, - 0,83,41,4,122,31,73,110,118,97,108,105,100,97,116,101, - 32,116,104,101,32,100,105,114,101,99,116,111,114,121,32,109, - 116,105,109,101,46,114,31,0,0,0,78,114,89,0,0,0, - 41,1,114,10,1,0,0,41,1,114,110,0,0,0,114,4, - 0,0,0,114,4,0,0,0,114,6,0,0,0,114,252,0, - 0,0,200,4,0,0,115,2,0,0,0,0,2,122,28,70, - 105,108,101,70,105,110,100,101,114,46,105,110,118,97,108,105, - 100,97,116,101,95,99,97,99,104,101,115,99,2,0,0,0, - 0,0,0,0,3,0,0,0,2,0,0,0,67,0,0,0, - 115,59,0,0,0,124,0,0,106,0,0,124,1,0,131,1, - 0,125,2,0,124,2,0,100,1,0,107,8,0,114,37,0, - 100,1,0,103,0,0,102,2,0,83,124,2,0,106,1,0, - 124,2,0,106,2,0,112,55,0,103,0,0,102,2,0,83, - 41,2,122,197,84,114,121,32,116,111,32,102,105,110,100,32, - 97,32,108,111,97,100,101,114,32,102,111,114,32,116,104,101, - 32,115,112,101,99,105,102,105,101,100,32,109,111,100,117,108, - 101,44,32,111,114,32,116,104,101,32,110,97,109,101,115,112, - 97,99,101,10,32,32,32,32,32,32,32,32,112,97,99,107, - 97,103,101,32,112,111,114,116,105,111,110,115,46,32,82,101, - 116,117,114,110,115,32,40,108,111,97,100,101,114,44,32,108, - 105,115,116,45,111,102,45,112,111,114,116,105,111,110,115,41, - 46,10,10,32,32,32,32,32,32,32,32,84,104,105,115,32, - 109,101,116,104,111,100,32,105,115,32,100,101,112,114,101,99, - 97,116,101,100,46,32,32,85,115,101,32,102,105,110,100,95, - 115,112,101,99,40,41,32,105,110,115,116,101,97,100,46,10, - 10,32,32,32,32,32,32,32,32,78,41,3,114,183,0,0, - 0,114,129,0,0,0,114,159,0,0,0,41,3,114,110,0, - 0,0,114,128,0,0,0,114,167,0,0,0,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,114,126,0,0,0, - 206,4,0,0,115,8,0,0,0,0,7,15,1,12,1,10, - 1,122,22,70,105,108,101,70,105,110,100,101,114,46,102,105, - 110,100,95,108,111,97,100,101,114,99,6,0,0,0,0,0, - 0,0,7,0,0,0,7,0,0,0,67,0,0,0,115,40, - 0,0,0,124,1,0,124,2,0,124,3,0,131,2,0,125, - 6,0,116,0,0,124,2,0,124,3,0,100,1,0,124,6, - 0,100,2,0,124,4,0,131,2,2,83,41,3,78,114,129, - 0,0,0,114,159,0,0,0,41,1,114,170,0,0,0,41, - 7,114,110,0,0,0,114,168,0,0,0,114,128,0,0,0, - 114,37,0,0,0,90,4,115,109,115,108,114,182,0,0,0, - 114,129,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,7,1,0,0,218,4,0,0,115,6,0, - 0,0,0,1,15,1,18,1,122,20,70,105,108,101,70,105, - 110,100,101,114,46,95,103,101,116,95,115,112,101,99,78,99, - 3,0,0,0,0,0,0,0,14,0,0,0,15,0,0,0, - 67,0,0,0,115,234,1,0,0,100,1,0,125,3,0,124, - 1,0,106,0,0,100,2,0,131,1,0,100,3,0,25,125, - 4,0,121,34,0,116,1,0,124,0,0,106,2,0,112,49, - 0,116,3,0,106,4,0,131,0,0,131,1,0,106,5,0, - 125,5,0,87,110,24,0,4,116,6,0,107,10,0,114,85, - 0,1,1,1,100,10,0,125,5,0,89,110,1,0,88,124, - 5,0,124,0,0,106,7,0,107,3,0,114,120,0,124,0, - 0,106,8,0,131,0,0,1,124,5,0,124,0,0,95,7, - 0,116,9,0,131,0,0,114,153,0,124,0,0,106,10,0, - 125,6,0,124,4,0,106,11,0,131,0,0,125,7,0,110, - 15,0,124,0,0,106,12,0,125,6,0,124,4,0,125,7, - 0,124,7,0,124,6,0,107,6,0,114,45,1,116,13,0, - 124,0,0,106,2,0,124,4,0,131,2,0,125,8,0,120, - 100,0,124,0,0,106,14,0,68,93,77,0,92,2,0,125, - 9,0,125,10,0,100,5,0,124,9,0,23,125,11,0,116, - 13,0,124,8,0,124,11,0,131,2,0,125,12,0,116,15, - 0,124,12,0,131,1,0,114,208,0,124,0,0,106,16,0, - 124,10,0,124,1,0,124,12,0,124,8,0,103,1,0,124, - 2,0,131,5,0,83,113,208,0,87,116,17,0,124,8,0, - 131,1,0,125,3,0,120,123,0,124,0,0,106,14,0,68, - 93,112,0,92,2,0,125,9,0,125,10,0,116,13,0,124, - 0,0,106,2,0,124,4,0,124,9,0,23,131,2,0,125, - 12,0,116,18,0,100,6,0,106,19,0,124,12,0,131,1, - 0,100,7,0,100,3,0,131,1,1,1,124,7,0,124,9, - 0,23,124,6,0,107,6,0,114,55,1,116,15,0,124,12, - 0,131,1,0,114,55,1,124,0,0,106,16,0,124,10,0, - 124,1,0,124,12,0,100,8,0,124,2,0,131,5,0,83, - 113,55,1,87,124,3,0,114,230,1,116,18,0,100,9,0, - 106,19,0,124,8,0,131,1,0,131,1,0,1,116,20,0, - 106,21,0,124,1,0,100,8,0,131,2,0,125,13,0,124, - 8,0,103,1,0,124,13,0,95,22,0,124,13,0,83,100, - 8,0,83,41,11,122,102,84,114,121,32,116,111,32,102,105, - 110,100,32,97,32,115,112,101,99,32,102,111,114,32,116,104, - 101,32,115,112,101,99,105,102,105,101,100,32,109,111,100,117, - 108,101,46,32,32,82,101,116,117,114,110,115,32,116,104,101, - 10,32,32,32,32,32,32,32,32,109,97,116,99,104,105,110, - 103,32,115,112,101,99,44,32,111,114,32,78,111,110,101,32, - 105,102,32,110,111,116,32,102,111,117,110,100,46,70,114,60, - 0,0,0,114,58,0,0,0,114,31,0,0,0,114,187,0, - 0,0,122,9,116,114,121,105,110,103,32,123,125,114,100,0, - 0,0,78,122,25,112,111,115,115,105,98,108,101,32,110,97, - 109,101,115,112,97,99,101,32,102,111,114,32,123,125,114,89, - 0,0,0,41,23,114,34,0,0,0,114,41,0,0,0,114, - 37,0,0,0,114,3,0,0,0,114,47,0,0,0,114,221, - 0,0,0,114,42,0,0,0,114,10,1,0,0,218,11,95, - 102,105,108,108,95,99,97,99,104,101,114,7,0,0,0,114, - 13,1,0,0,114,90,0,0,0,114,12,1,0,0,114,30, - 0,0,0,114,9,1,0,0,114,46,0,0,0,114,7,1, - 0,0,114,48,0,0,0,114,107,0,0,0,114,49,0,0, - 0,114,123,0,0,0,114,163,0,0,0,114,159,0,0,0, - 41,14,114,110,0,0,0,114,128,0,0,0,114,182,0,0, - 0,90,12,105,115,95,110,97,109,101,115,112,97,99,101,90, - 11,116,97,105,108,95,109,111,100,117,108,101,114,135,0,0, - 0,90,5,99,97,99,104,101,90,12,99,97,99,104,101,95, - 109,111,100,117,108,101,90,9,98,97,115,101,95,112,97,116, - 104,114,227,0,0,0,114,168,0,0,0,90,13,105,110,105, - 116,95,102,105,108,101,110,97,109,101,90,9,102,117,108,108, - 95,112,97,116,104,114,167,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,183,0,0,0,223,4, - 0,0,115,68,0,0,0,0,3,6,1,19,1,3,1,34, - 1,13,1,11,1,15,1,10,1,9,2,9,1,9,1,15, - 2,9,1,6,2,12,1,18,1,22,1,10,1,15,1,12, - 1,32,4,12,2,22,1,22,1,25,1,16,1,12,1,29, - 1,6,1,19,1,18,1,12,1,4,1,122,20,70,105,108, - 101,70,105,110,100,101,114,46,102,105,110,100,95,115,112,101, - 99,99,1,0,0,0,0,0,0,0,9,0,0,0,13,0, - 0,0,67,0,0,0,115,11,1,0,0,124,0,0,106,0, - 0,125,1,0,121,31,0,116,1,0,106,2,0,124,1,0, - 112,33,0,116,1,0,106,3,0,131,0,0,131,1,0,125, - 2,0,87,110,33,0,4,116,4,0,116,5,0,116,6,0, - 102,3,0,107,10,0,114,75,0,1,1,1,103,0,0,125, - 2,0,89,110,1,0,88,116,7,0,106,8,0,106,9,0, - 100,1,0,131,1,0,115,112,0,116,10,0,124,2,0,131, - 1,0,124,0,0,95,11,0,110,111,0,116,10,0,131,0, - 0,125,3,0,120,90,0,124,2,0,68,93,82,0,125,4, - 0,124,4,0,106,12,0,100,2,0,131,1,0,92,3,0, - 125,5,0,125,6,0,125,7,0,124,6,0,114,191,0,100, - 3,0,106,13,0,124,5,0,124,7,0,106,14,0,131,0, - 0,131,2,0,125,8,0,110,6,0,124,5,0,125,8,0, - 124,3,0,106,15,0,124,8,0,131,1,0,1,113,128,0, - 87,124,3,0,124,0,0,95,11,0,116,7,0,106,8,0, - 106,9,0,116,16,0,131,1,0,114,7,1,100,4,0,100, - 5,0,132,0,0,124,2,0,68,131,1,0,124,0,0,95, - 17,0,100,6,0,83,41,7,122,68,70,105,108,108,32,116, - 104,101,32,99,97,99,104,101,32,111,102,32,112,111,116,101, - 110,116,105,97,108,32,109,111,100,117,108,101,115,32,97,110, - 100,32,112,97,99,107,97,103,101,115,32,102,111,114,32,116, - 104,105,115,32,100,105,114,101,99,116,111,114,121,46,114,0, - 0,0,0,114,60,0,0,0,122,5,123,125,46,123,125,99, - 1,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0, - 83,0,0,0,115,28,0,0,0,104,0,0,124,0,0,93, - 18,0,125,1,0,124,1,0,106,0,0,131,0,0,146,2, - 0,113,6,0,83,114,4,0,0,0,41,1,114,90,0,0, - 0,41,2,114,24,0,0,0,90,2,102,110,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,250,9,60,115,101, - 116,99,111,109,112,62,41,5,0,0,115,2,0,0,0,9, - 0,122,41,70,105,108,101,70,105,110,100,101,114,46,95,102, - 105,108,108,95,99,97,99,104,101,46,60,108,111,99,97,108, - 115,62,46,60,115,101,116,99,111,109,112,62,78,41,18,114, - 37,0,0,0,114,3,0,0,0,90,7,108,105,115,116,100, - 105,114,114,47,0,0,0,114,2,1,0,0,218,15,80,101, - 114,109,105,115,115,105,111,110,69,114,114,111,114,218,18,78, - 111,116,65,68,105,114,101,99,116,111,114,121,69,114,114,111, - 114,114,8,0,0,0,114,9,0,0,0,114,10,0,0,0, - 114,11,1,0,0,114,12,1,0,0,114,85,0,0,0,114, - 49,0,0,0,114,90,0,0,0,218,3,97,100,100,114,11, - 0,0,0,114,13,1,0,0,41,9,114,110,0,0,0,114, - 37,0,0,0,90,8,99,111,110,116,101,110,116,115,90,21, - 108,111,119,101,114,95,115,117,102,102,105,120,95,99,111,110, - 116,101,110,116,115,114,247,0,0,0,114,108,0,0,0,114, - 239,0,0,0,114,227,0,0,0,90,8,110,101,119,95,110, - 97,109,101,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,114,15,1,0,0,12,5,0,0,115,34,0,0,0, - 0,2,9,1,3,1,31,1,22,3,11,3,18,1,18,7, - 9,1,13,1,24,1,6,1,27,2,6,1,17,1,9,1, - 18,1,122,22,70,105,108,101,70,105,110,100,101,114,46,95, - 102,105,108,108,95,99,97,99,104,101,99,1,0,0,0,0, - 0,0,0,3,0,0,0,3,0,0,0,7,0,0,0,115, - 25,0,0,0,135,0,0,135,1,0,102,2,0,100,1,0, - 100,2,0,134,0,0,125,2,0,124,2,0,83,41,3,97, + 0,0,6,0,0,0,3,0,0,0,67,0,0,0,115,82, + 0,0,0,116,0,124,2,100,1,131,2,114,26,124,2,106, + 1,124,1,131,1,92,2,125,3,125,4,110,14,124,2,106, + 2,124,1,131,1,125,3,103,0,125,4,124,3,100,0,107, + 9,114,60,116,3,106,4,124,1,124,3,131,2,83,0,116, + 3,106,5,124,1,100,0,131,2,125,5,124,4,124,5,95, + 6,124,5,83,0,41,2,78,114,121,0,0,0,41,7,114, + 112,0,0,0,114,121,0,0,0,114,179,0,0,0,114,118, + 0,0,0,114,176,0,0,0,114,158,0,0,0,114,154,0, + 0,0,41,6,114,168,0,0,0,114,123,0,0,0,114,252, + 0,0,0,114,124,0,0,0,114,125,0,0,0,114,162,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,218,16,95,108,101,103,97,99,121,95,103,101,116,95,115, + 112,101,99,78,4,0,0,115,18,0,0,0,0,4,10,1, + 16,2,10,1,4,1,8,1,12,1,12,1,6,1,122,27, + 80,97,116,104,70,105,110,100,101,114,46,95,108,101,103,97, + 99,121,95,103,101,116,95,115,112,101,99,78,99,4,0,0, + 0,0,0,0,0,9,0,0,0,5,0,0,0,67,0,0, + 0,115,170,0,0,0,103,0,125,4,120,160,124,2,68,0, + 93,130,125,5,116,0,124,5,116,1,116,2,102,2,131,2, + 115,30,113,10,124,0,106,3,124,5,131,1,125,6,124,6, + 100,1,107,9,114,10,116,4,124,6,100,2,131,2,114,72, + 124,6,106,5,124,1,124,3,131,2,125,7,110,12,124,0, + 106,6,124,1,124,6,131,2,125,7,124,7,100,1,107,8, + 114,94,113,10,124,7,106,7,100,1,107,9,114,108,124,7, + 83,0,124,7,106,8,125,8,124,8,100,1,107,8,114,130, + 116,9,100,3,131,1,130,1,124,4,106,10,124,8,131,1, + 1,0,113,10,87,0,116,11,106,12,124,1,100,1,131,2, + 125,7,124,4,124,7,95,8,124,7,83,0,100,1,83,0, + 41,4,122,63,70,105,110,100,32,116,104,101,32,108,111,97, + 100,101,114,32,111,114,32,110,97,109,101,115,112,97,99,101, + 95,112,97,116,104,32,102,111,114,32,116,104,105,115,32,109, + 111,100,117,108,101,47,112,97,99,107,97,103,101,32,110,97, + 109,101,46,78,114,178,0,0,0,122,19,115,112,101,99,32, + 109,105,115,115,105,110,103,32,108,111,97,100,101,114,41,13, + 114,141,0,0,0,114,73,0,0,0,218,5,98,121,116,101, + 115,114,0,1,0,0,114,112,0,0,0,114,178,0,0,0, + 114,1,1,0,0,114,124,0,0,0,114,154,0,0,0,114, + 103,0,0,0,114,147,0,0,0,114,118,0,0,0,114,158, + 0,0,0,41,9,114,168,0,0,0,114,123,0,0,0,114, + 37,0,0,0,114,177,0,0,0,218,14,110,97,109,101,115, + 112,97,99,101,95,112,97,116,104,90,5,101,110,116,114,121, + 114,252,0,0,0,114,162,0,0,0,114,125,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,9, + 95,103,101,116,95,115,112,101,99,93,4,0,0,115,40,0, + 0,0,0,5,4,1,10,1,14,1,2,1,10,1,8,1, + 10,1,14,2,12,1,8,1,2,1,10,1,4,1,6,1, + 8,1,8,5,14,2,12,1,6,1,122,20,80,97,116,104, + 70,105,110,100,101,114,46,95,103,101,116,95,115,112,101,99, + 99,4,0,0,0,0,0,0,0,6,0,0,0,4,0,0, + 0,67,0,0,0,115,100,0,0,0,124,2,100,1,107,8, + 114,14,116,0,106,1,125,2,124,0,106,2,124,1,124,2, + 124,3,131,3,125,4,124,4,100,1,107,8,114,40,100,1, + 83,0,124,4,106,3,100,1,107,8,114,92,124,4,106,4, + 125,5,124,5,114,86,100,2,124,4,95,5,116,6,124,1, + 124,5,124,0,106,2,131,3,124,4,95,4,124,4,83,0, + 100,1,83,0,110,4,124,4,83,0,100,1,83,0,41,3, + 122,141,84,114,121,32,116,111,32,102,105,110,100,32,97,32, + 115,112,101,99,32,102,111,114,32,39,102,117,108,108,110,97, + 109,101,39,32,111,110,32,115,121,115,46,112,97,116,104,32, + 111,114,32,39,112,97,116,104,39,46,10,10,32,32,32,32, + 32,32,32,32,84,104,101,32,115,101,97,114,99,104,32,105, + 115,32,98,97,115,101,100,32,111,110,32,115,121,115,46,112, + 97,116,104,95,104,111,111,107,115,32,97,110,100,32,115,121, + 115,46,112,97,116,104,95,105,109,112,111,114,116,101,114,95, + 99,97,99,104,101,46,10,32,32,32,32,32,32,32,32,78, + 90,9,110,97,109,101,115,112,97,99,101,41,7,114,8,0, + 0,0,114,37,0,0,0,114,4,1,0,0,114,124,0,0, + 0,114,154,0,0,0,114,156,0,0,0,114,227,0,0,0, + 41,6,114,168,0,0,0,114,123,0,0,0,114,37,0,0, + 0,114,177,0,0,0,114,162,0,0,0,114,3,1,0,0, + 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, + 178,0,0,0,125,4,0,0,115,26,0,0,0,0,6,8, + 1,6,1,14,1,8,1,4,1,10,1,6,1,4,3,6, + 1,16,1,4,2,6,2,122,20,80,97,116,104,70,105,110, + 100,101,114,46,102,105,110,100,95,115,112,101,99,99,3,0, + 0,0,0,0,0,0,4,0,0,0,3,0,0,0,67,0, + 0,0,115,30,0,0,0,124,0,106,0,124,1,124,2,131, + 2,125,3,124,3,100,1,107,8,114,24,100,1,83,0,124, + 3,106,1,83,0,41,2,122,170,102,105,110,100,32,116,104, + 101,32,109,111,100,117,108,101,32,111,110,32,115,121,115,46, + 112,97,116,104,32,111,114,32,39,112,97,116,104,39,32,98, + 97,115,101,100,32,111,110,32,115,121,115,46,112,97,116,104, + 95,104,111,111,107,115,32,97,110,100,10,32,32,32,32,32, + 32,32,32,115,121,115,46,112,97,116,104,95,105,109,112,111, + 114,116,101,114,95,99,97,99,104,101,46,10,10,32,32,32, + 32,32,32,32,32,84,104,105,115,32,109,101,116,104,111,100, + 32,105,115,32,100,101,112,114,101,99,97,116,101,100,46,32, + 32,85,115,101,32,102,105,110,100,95,115,112,101,99,40,41, + 32,105,110,115,116,101,97,100,46,10,10,32,32,32,32,32, + 32,32,32,78,41,2,114,178,0,0,0,114,124,0,0,0, + 41,4,114,168,0,0,0,114,123,0,0,0,114,37,0,0, + 0,114,162,0,0,0,114,4,0,0,0,114,4,0,0,0, + 114,6,0,0,0,114,179,0,0,0,149,4,0,0,115,8, + 0,0,0,0,8,12,1,8,1,4,1,122,22,80,97,116, + 104,70,105,110,100,101,114,46,102,105,110,100,95,109,111,100, + 117,108,101,41,1,78,41,2,78,78,41,1,78,41,12,114, + 109,0,0,0,114,108,0,0,0,114,110,0,0,0,114,111, + 0,0,0,114,180,0,0,0,114,249,0,0,0,114,254,0, + 0,0,114,0,1,0,0,114,1,1,0,0,114,4,1,0, + 0,114,178,0,0,0,114,179,0,0,0,114,4,0,0,0, + 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, + 248,0,0,0,31,4,0,0,115,22,0,0,0,8,2,4, + 2,12,8,12,13,12,22,12,15,2,1,12,31,2,1,12, + 23,2,1,114,248,0,0,0,99,0,0,0,0,0,0,0, + 0,0,0,0,0,3,0,0,0,64,0,0,0,115,90,0, + 0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2, + 100,3,132,0,90,4,100,4,100,5,132,0,90,5,101,6, + 90,7,100,6,100,7,132,0,90,8,100,8,100,9,132,0, + 90,9,100,19,100,11,100,12,132,1,90,10,100,13,100,14, + 132,0,90,11,101,12,100,15,100,16,132,0,131,1,90,13, + 100,17,100,18,132,0,90,14,100,10,83,0,41,20,218,10, + 70,105,108,101,70,105,110,100,101,114,122,172,70,105,108,101, + 45,98,97,115,101,100,32,102,105,110,100,101,114,46,10,10, + 32,32,32,32,73,110,116,101,114,97,99,116,105,111,110,115, + 32,119,105,116,104,32,116,104,101,32,102,105,108,101,32,115, + 121,115,116,101,109,32,97,114,101,32,99,97,99,104,101,100, + 32,102,111,114,32,112,101,114,102,111,114,109,97,110,99,101, + 44,32,98,101,105,110,103,10,32,32,32,32,114,101,102,114, + 101,115,104,101,100,32,119,104,101,110,32,116,104,101,32,100, + 105,114,101,99,116,111,114,121,32,116,104,101,32,102,105,110, + 100,101,114,32,105,115,32,104,97,110,100,108,105,110,103,32, + 104,97,115,32,98,101,101,110,32,109,111,100,105,102,105,101, + 100,46,10,10,32,32,32,32,99,2,0,0,0,0,0,0, + 0,5,0,0,0,5,0,0,0,7,0,0,0,115,88,0, + 0,0,103,0,125,3,120,40,124,2,68,0,93,32,92,2, + 137,0,125,4,124,3,106,0,135,0,102,1,100,1,100,2, + 132,8,124,4,68,0,131,1,131,1,1,0,113,10,87,0, + 124,3,124,0,95,1,124,1,112,58,100,3,124,0,95,2, + 100,6,124,0,95,3,116,4,131,0,124,0,95,5,116,4, + 131,0,124,0,95,6,100,5,83,0,41,7,122,154,73,110, + 105,116,105,97,108,105,122,101,32,119,105,116,104,32,116,104, + 101,32,112,97,116,104,32,116,111,32,115,101,97,114,99,104, + 32,111,110,32,97,110,100,32,97,32,118,97,114,105,97,98, + 108,101,32,110,117,109,98,101,114,32,111,102,10,32,32,32, + 32,32,32,32,32,50,45,116,117,112,108,101,115,32,99,111, + 110,116,97,105,110,105,110,103,32,116,104,101,32,108,111,97, + 100,101,114,32,97,110,100,32,116,104,101,32,102,105,108,101, + 32,115,117,102,102,105,120,101,115,32,116,104,101,32,108,111, + 97,100,101,114,10,32,32,32,32,32,32,32,32,114,101,99, + 111,103,110,105,122,101,115,46,99,1,0,0,0,0,0,0, + 0,2,0,0,0,3,0,0,0,51,0,0,0,115,22,0, + 0,0,124,0,93,14,125,1,124,1,136,0,102,2,86,0, + 1,0,113,2,100,0,83,0,41,1,78,114,4,0,0,0, + 41,2,114,24,0,0,0,114,222,0,0,0,41,1,114,124, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,224,0, + 0,0,178,4,0,0,115,2,0,0,0,4,0,122,38,70, + 105,108,101,70,105,110,100,101,114,46,95,95,105,110,105,116, + 95,95,46,60,108,111,99,97,108,115,62,46,60,103,101,110, + 101,120,112,114,62,114,61,0,0,0,114,31,0,0,0,78, + 114,91,0,0,0,41,7,114,147,0,0,0,218,8,95,108, + 111,97,100,101,114,115,114,37,0,0,0,218,11,95,112,97, + 116,104,95,109,116,105,109,101,218,3,115,101,116,218,11,95, + 112,97,116,104,95,99,97,99,104,101,218,19,95,114,101,108, + 97,120,101,100,95,112,97,116,104,95,99,97,99,104,101,41, + 5,114,104,0,0,0,114,37,0,0,0,218,14,108,111,97, + 100,101,114,95,100,101,116,97,105,108,115,90,7,108,111,97, + 100,101,114,115,114,164,0,0,0,114,4,0,0,0,41,1, + 114,124,0,0,0,114,6,0,0,0,114,182,0,0,0,172, + 4,0,0,115,16,0,0,0,0,4,4,1,14,1,28,1, + 6,2,10,1,6,1,8,1,122,19,70,105,108,101,70,105, + 110,100,101,114,46,95,95,105,110,105,116,95,95,99,1,0, + 0,0,0,0,0,0,1,0,0,0,2,0,0,0,67,0, + 0,0,115,10,0,0,0,100,3,124,0,95,0,100,2,83, + 0,41,4,122,31,73,110,118,97,108,105,100,97,116,101,32, + 116,104,101,32,100,105,114,101,99,116,111,114,121,32,109,116, + 105,109,101,46,114,31,0,0,0,78,114,91,0,0,0,41, + 1,114,7,1,0,0,41,1,114,104,0,0,0,114,4,0, + 0,0,114,4,0,0,0,114,6,0,0,0,114,249,0,0, + 0,186,4,0,0,115,2,0,0,0,0,2,122,28,70,105, + 108,101,70,105,110,100,101,114,46,105,110,118,97,108,105,100, + 97,116,101,95,99,97,99,104,101,115,99,2,0,0,0,0, + 0,0,0,3,0,0,0,2,0,0,0,67,0,0,0,115, + 42,0,0,0,124,0,106,0,124,1,131,1,125,2,124,2, + 100,1,107,8,114,26,100,1,103,0,102,2,83,0,124,2, + 106,1,124,2,106,2,112,38,103,0,102,2,83,0,41,2, + 122,197,84,114,121,32,116,111,32,102,105,110,100,32,97,32, + 108,111,97,100,101,114,32,102,111,114,32,116,104,101,32,115, + 112,101,99,105,102,105,101,100,32,109,111,100,117,108,101,44, + 32,111,114,32,116,104,101,32,110,97,109,101,115,112,97,99, + 101,10,32,32,32,32,32,32,32,32,112,97,99,107,97,103, + 101,32,112,111,114,116,105,111,110,115,46,32,82,101,116,117, + 114,110,115,32,40,108,111,97,100,101,114,44,32,108,105,115, + 116,45,111,102,45,112,111,114,116,105,111,110,115,41,46,10, + 10,32,32,32,32,32,32,32,32,84,104,105,115,32,109,101, + 116,104,111,100,32,105,115,32,100,101,112,114,101,99,97,116, + 101,100,46,32,32,85,115,101,32,102,105,110,100,95,115,112, + 101,99,40,41,32,105,110,115,116,101,97,100,46,10,10,32, + 32,32,32,32,32,32,32,78,41,3,114,178,0,0,0,114, + 124,0,0,0,114,154,0,0,0,41,3,114,104,0,0,0, + 114,123,0,0,0,114,162,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,114,121,0,0,0,192,4, + 0,0,115,8,0,0,0,0,7,10,1,8,1,8,1,122, + 22,70,105,108,101,70,105,110,100,101,114,46,102,105,110,100, + 95,108,111,97,100,101,114,99,6,0,0,0,0,0,0,0, + 7,0,0,0,6,0,0,0,67,0,0,0,115,26,0,0, + 0,124,1,124,2,124,3,131,2,125,6,116,0,124,2,124, + 3,124,6,124,4,100,1,141,4,83,0,41,2,78,41,2, + 114,124,0,0,0,114,154,0,0,0,41,1,114,165,0,0, + 0,41,7,114,104,0,0,0,114,163,0,0,0,114,123,0, + 0,0,114,37,0,0,0,90,4,115,109,115,108,114,177,0, + 0,0,114,124,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,114,4,1,0,0,204,4,0,0,115, + 6,0,0,0,0,1,10,1,8,1,122,20,70,105,108,101, + 70,105,110,100,101,114,46,95,103,101,116,95,115,112,101,99, + 78,99,3,0,0,0,0,0,0,0,14,0,0,0,15,0, + 0,0,67,0,0,0,115,98,1,0,0,100,1,125,3,124, + 1,106,0,100,2,131,1,100,3,25,0,125,4,121,24,116, + 1,124,0,106,2,112,34,116,3,106,4,131,0,131,1,106, + 5,125,5,87,0,110,24,4,0,116,6,107,10,114,66,1, + 0,1,0,1,0,100,10,125,5,89,0,110,2,88,0,124, + 5,124,0,106,7,107,3,114,92,124,0,106,8,131,0,1, + 0,124,5,124,0,95,7,116,9,131,0,114,114,124,0,106, + 10,125,6,124,4,106,11,131,0,125,7,110,10,124,0,106, + 12,125,6,124,4,125,7,124,7,124,6,107,6,114,218,116, + 13,124,0,106,2,124,4,131,2,125,8,120,72,124,0,106, + 14,68,0,93,54,92,2,125,9,125,10,100,5,124,9,23, + 0,125,11,116,13,124,8,124,11,131,2,125,12,116,15,124, + 12,131,1,114,152,124,0,106,16,124,10,124,1,124,12,124, + 8,103,1,124,2,131,5,83,0,113,152,87,0,116,17,124, + 8,131,1,125,3,120,88,124,0,106,14,68,0,93,78,92, + 2,125,9,125,10,116,13,124,0,106,2,124,4,124,9,23, + 0,131,2,125,12,116,18,106,19,100,6,124,12,100,3,100, + 7,141,3,1,0,124,7,124,9,23,0,124,6,107,6,114, + 226,116,15,124,12,131,1,114,226,124,0,106,16,124,10,124, + 1,124,12,100,8,124,2,131,5,83,0,113,226,87,0,124, + 3,144,1,114,94,116,18,106,19,100,9,124,8,131,2,1, + 0,116,18,106,20,124,1,100,8,131,2,125,13,124,8,103, + 1,124,13,95,21,124,13,83,0,100,8,83,0,41,11,122, + 111,84,114,121,32,116,111,32,102,105,110,100,32,97,32,115, + 112,101,99,32,102,111,114,32,116,104,101,32,115,112,101,99, + 105,102,105,101,100,32,109,111,100,117,108,101,46,10,10,32, + 32,32,32,32,32,32,32,82,101,116,117,114,110,115,32,116, + 104,101,32,109,97,116,99,104,105,110,103,32,115,112,101,99, + 44,32,111,114,32,78,111,110,101,32,105,102,32,110,111,116, + 32,102,111,117,110,100,46,10,32,32,32,32,32,32,32,32, + 70,114,61,0,0,0,114,59,0,0,0,114,31,0,0,0, + 114,182,0,0,0,122,9,116,114,121,105,110,103,32,123,125, + 41,1,90,9,118,101,114,98,111,115,105,116,121,78,122,25, + 112,111,115,115,105,98,108,101,32,110,97,109,101,115,112,97, + 99,101,32,102,111,114,32,123,125,114,91,0,0,0,41,22, + 114,34,0,0,0,114,41,0,0,0,114,37,0,0,0,114, + 3,0,0,0,114,47,0,0,0,114,216,0,0,0,114,42, + 0,0,0,114,7,1,0,0,218,11,95,102,105,108,108,95, + 99,97,99,104,101,114,7,0,0,0,114,10,1,0,0,114, + 92,0,0,0,114,9,1,0,0,114,30,0,0,0,114,6, + 1,0,0,114,46,0,0,0,114,4,1,0,0,114,48,0, + 0,0,114,118,0,0,0,114,133,0,0,0,114,158,0,0, + 0,114,154,0,0,0,41,14,114,104,0,0,0,114,123,0, + 0,0,114,177,0,0,0,90,12,105,115,95,110,97,109,101, + 115,112,97,99,101,90,11,116,97,105,108,95,109,111,100,117, + 108,101,114,130,0,0,0,90,5,99,97,99,104,101,90,12, + 99,97,99,104,101,95,109,111,100,117,108,101,90,9,98,97, + 115,101,95,112,97,116,104,114,222,0,0,0,114,163,0,0, + 0,90,13,105,110,105,116,95,102,105,108,101,110,97,109,101, + 90,9,102,117,108,108,95,112,97,116,104,114,162,0,0,0, + 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, + 178,0,0,0,209,4,0,0,115,70,0,0,0,0,5,4, + 1,14,1,2,1,24,1,14,1,10,1,10,1,8,1,6, + 2,6,1,6,1,10,2,6,1,4,2,8,1,12,1,16, + 1,8,1,10,1,8,1,24,4,8,2,16,1,16,1,16, + 1,12,1,8,1,10,1,12,1,6,1,12,1,12,1,8, + 1,4,1,122,20,70,105,108,101,70,105,110,100,101,114,46, + 102,105,110,100,95,115,112,101,99,99,1,0,0,0,0,0, + 0,0,9,0,0,0,13,0,0,0,67,0,0,0,115,194, + 0,0,0,124,0,106,0,125,1,121,22,116,1,106,2,124, + 1,112,22,116,1,106,3,131,0,131,1,125,2,87,0,110, + 30,4,0,116,4,116,5,116,6,102,3,107,10,114,58,1, + 0,1,0,1,0,103,0,125,2,89,0,110,2,88,0,116, + 7,106,8,106,9,100,1,131,1,115,84,116,10,124,2,131, + 1,124,0,95,11,110,78,116,10,131,0,125,3,120,64,124, + 2,68,0,93,56,125,4,124,4,106,12,100,2,131,1,92, + 3,125,5,125,6,125,7,124,6,114,138,100,3,106,13,124, + 5,124,7,106,14,131,0,131,2,125,8,110,4,124,5,125, + 8,124,3,106,15,124,8,131,1,1,0,113,96,87,0,124, + 3,124,0,95,11,116,7,106,8,106,9,116,16,131,1,114, + 190,100,4,100,5,132,0,124,2,68,0,131,1,124,0,95, + 17,100,6,83,0,41,7,122,68,70,105,108,108,32,116,104, + 101,32,99,97,99,104,101,32,111,102,32,112,111,116,101,110, + 116,105,97,108,32,109,111,100,117,108,101,115,32,97,110,100, + 32,112,97,99,107,97,103,101,115,32,102,111,114,32,116,104, + 105,115,32,100,105,114,101,99,116,111,114,121,46,114,0,0, + 0,0,114,61,0,0,0,122,5,123,125,46,123,125,99,1, + 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,83, + 0,0,0,115,20,0,0,0,104,0,124,0,93,12,125,1, + 124,1,106,0,131,0,146,2,113,4,83,0,114,4,0,0, + 0,41,1,114,92,0,0,0,41,2,114,24,0,0,0,90, + 2,102,110,114,4,0,0,0,114,4,0,0,0,114,6,0, + 0,0,250,9,60,115,101,116,99,111,109,112,62,30,5,0, + 0,115,2,0,0,0,6,0,122,41,70,105,108,101,70,105, + 110,100,101,114,46,95,102,105,108,108,95,99,97,99,104,101, + 46,60,108,111,99,97,108,115,62,46,60,115,101,116,99,111, + 109,112,62,78,41,18,114,37,0,0,0,114,3,0,0,0, + 90,7,108,105,115,116,100,105,114,114,47,0,0,0,114,255, + 0,0,0,218,15,80,101,114,109,105,115,115,105,111,110,69, + 114,114,111,114,218,18,78,111,116,65,68,105,114,101,99,116, + 111,114,121,69,114,114,111,114,114,8,0,0,0,114,9,0, + 0,0,114,10,0,0,0,114,8,1,0,0,114,9,1,0, + 0,114,87,0,0,0,114,50,0,0,0,114,92,0,0,0, + 218,3,97,100,100,114,11,0,0,0,114,10,1,0,0,41, + 9,114,104,0,0,0,114,37,0,0,0,90,8,99,111,110, + 116,101,110,116,115,90,21,108,111,119,101,114,95,115,117,102, + 102,105,120,95,99,111,110,116,101,110,116,115,114,244,0,0, + 0,114,102,0,0,0,114,234,0,0,0,114,222,0,0,0, + 90,8,110,101,119,95,110,97,109,101,114,4,0,0,0,114, + 4,0,0,0,114,6,0,0,0,114,12,1,0,0,1,5, + 0,0,115,34,0,0,0,0,2,6,1,2,1,22,1,20, + 3,10,3,12,1,12,7,6,1,10,1,16,1,4,1,18, + 2,4,1,14,1,6,1,12,1,122,22,70,105,108,101,70, + 105,110,100,101,114,46,95,102,105,108,108,95,99,97,99,104, + 101,99,1,0,0,0,0,0,0,0,3,0,0,0,3,0, + 0,0,7,0,0,0,115,18,0,0,0,135,0,135,1,102, + 2,100,1,100,2,132,8,125,2,124,2,83,0,41,3,97, 20,1,0,0,65,32,99,108,97,115,115,32,109,101,116,104, 111,100,32,119,104,105,99,104,32,114,101,116,117,114,110,115, 32,97,32,99,108,111,115,117,114,101,32,116,111,32,117,115, @@ -2373,246 +2208,229 @@ const unsigned char _Py_M__importlib_external[] = { 73,109,112,111,114,116,69,114,114,111,114,32,105,115,10,32, 32,32,32,32,32,32,32,114,97,105,115,101,100,46,10,10, 32,32,32,32,32,32,32,32,99,1,0,0,0,0,0,0, - 0,1,0,0,0,4,0,0,0,19,0,0,0,115,43,0, - 0,0,116,0,0,124,0,0,131,1,0,115,30,0,116,1, - 0,100,1,0,100,2,0,124,0,0,131,1,1,130,1,0, - 136,0,0,124,0,0,136,1,0,140,1,0,83,41,3,122, - 45,80,97,116,104,32,104,111,111,107,32,102,111,114,32,105, - 109,112,111,114,116,108,105,98,46,109,97,99,104,105,110,101, - 114,121,46,70,105,108,101,70,105,110,100,101,114,46,122,30, - 111,110,108,121,32,100,105,114,101,99,116,111,114,105,101,115, - 32,97,114,101,32,115,117,112,112,111,114,116,101,100,114,37, - 0,0,0,41,2,114,48,0,0,0,114,109,0,0,0,41, - 1,114,37,0,0,0,41,2,114,173,0,0,0,114,14,1, - 0,0,114,4,0,0,0,114,6,0,0,0,218,24,112,97, + 0,1,0,0,0,4,0,0,0,19,0,0,0,115,34,0, + 0,0,116,0,124,0,131,1,115,20,116,1,100,1,124,0, + 100,2,141,2,130,1,136,0,124,0,102,1,136,1,158,2, + 142,0,83,0,41,3,122,45,80,97,116,104,32,104,111,111, + 107,32,102,111,114,32,105,109,112,111,114,116,108,105,98,46, + 109,97,99,104,105,110,101,114,121,46,70,105,108,101,70,105, + 110,100,101,114,46,122,30,111,110,108,121,32,100,105,114,101, + 99,116,111,114,105,101,115,32,97,114,101,32,115,117,112,112, + 111,114,116,101,100,41,1,114,37,0,0,0,41,2,114,48, + 0,0,0,114,103,0,0,0,41,1,114,37,0,0,0,41, + 2,114,168,0,0,0,114,11,1,0,0,114,4,0,0,0, + 114,6,0,0,0,218,24,112,97,116,104,95,104,111,111,107, + 95,102,111,114,95,70,105,108,101,70,105,110,100,101,114,42, + 5,0,0,115,6,0,0,0,0,2,8,1,12,1,122,54, + 70,105,108,101,70,105,110,100,101,114,46,112,97,116,104,95, + 104,111,111,107,46,60,108,111,99,97,108,115,62,46,112,97, 116,104,95,104,111,111,107,95,102,111,114,95,70,105,108,101, - 70,105,110,100,101,114,53,5,0,0,115,6,0,0,0,0, - 2,12,1,18,1,122,54,70,105,108,101,70,105,110,100,101, - 114,46,112,97,116,104,95,104,111,111,107,46,60,108,111,99, - 97,108,115,62,46,112,97,116,104,95,104,111,111,107,95,102, - 111,114,95,70,105,108,101,70,105,110,100,101,114,114,4,0, - 0,0,41,3,114,173,0,0,0,114,14,1,0,0,114,20, - 1,0,0,114,4,0,0,0,41,2,114,173,0,0,0,114, - 14,1,0,0,114,6,0,0,0,218,9,112,97,116,104,95, - 104,111,111,107,43,5,0,0,115,4,0,0,0,0,10,21, - 6,122,20,70,105,108,101,70,105,110,100,101,114,46,112,97, - 116,104,95,104,111,111,107,99,1,0,0,0,0,0,0,0, - 1,0,0,0,2,0,0,0,67,0,0,0,115,16,0,0, - 0,100,1,0,106,0,0,124,0,0,106,1,0,131,1,0, - 83,41,2,78,122,16,70,105,108,101,70,105,110,100,101,114, - 40,123,33,114,125,41,41,2,114,49,0,0,0,114,37,0, - 0,0,41,1,114,110,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,246,0,0,0,61,5,0, - 0,115,2,0,0,0,0,1,122,19,70,105,108,101,70,105, - 110,100,101,114,46,95,95,114,101,112,114,95,95,41,15,114, - 114,0,0,0,114,113,0,0,0,114,115,0,0,0,114,116, - 0,0,0,114,187,0,0,0,114,252,0,0,0,114,132,0, - 0,0,114,184,0,0,0,114,126,0,0,0,114,7,1,0, - 0,114,183,0,0,0,114,15,1,0,0,114,185,0,0,0, - 114,21,1,0,0,114,246,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,8, - 1,0,0,177,4,0,0,115,20,0,0,0,12,7,6,2, - 12,14,12,4,6,2,12,12,12,5,15,45,12,31,18,18, - 114,8,1,0,0,99,4,0,0,0,0,0,0,0,6,0, - 0,0,11,0,0,0,67,0,0,0,115,195,0,0,0,124, - 0,0,106,0,0,100,1,0,131,1,0,125,4,0,124,0, - 0,106,0,0,100,2,0,131,1,0,125,5,0,124,4,0, - 115,99,0,124,5,0,114,54,0,124,5,0,106,1,0,125, - 4,0,110,45,0,124,2,0,124,3,0,107,2,0,114,84, - 0,116,2,0,124,1,0,124,2,0,131,2,0,125,4,0, - 110,15,0,116,3,0,124,1,0,124,2,0,131,2,0,125, - 4,0,124,5,0,115,126,0,116,4,0,124,1,0,124,2, - 0,100,3,0,124,4,0,131,2,1,125,5,0,121,44,0, - 124,5,0,124,0,0,100,2,0,60,124,4,0,124,0,0, - 100,1,0,60,124,2,0,124,0,0,100,4,0,60,124,3, - 0,124,0,0,100,5,0,60,87,110,18,0,4,116,5,0, - 107,10,0,114,190,0,1,1,1,89,110,1,0,88,100,0, - 0,83,41,6,78,218,10,95,95,108,111,97,100,101,114,95, - 95,218,8,95,95,115,112,101,99,95,95,114,129,0,0,0, - 90,8,95,95,102,105,108,101,95,95,90,10,95,95,99,97, - 99,104,101,100,95,95,41,6,218,3,103,101,116,114,129,0, - 0,0,114,225,0,0,0,114,220,0,0,0,114,170,0,0, - 0,218,9,69,120,99,101,112,116,105,111,110,41,6,90,2, - 110,115,114,108,0,0,0,90,8,112,97,116,104,110,97,109, - 101,90,9,99,112,97,116,104,110,97,109,101,114,129,0,0, - 0,114,167,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,218,14,95,102,105,120,95,117,112,95,109, - 111,100,117,108,101,67,5,0,0,115,34,0,0,0,0,2, - 15,1,15,1,6,1,6,1,12,1,12,1,18,2,15,1, - 6,1,21,1,3,1,10,1,10,1,10,1,14,1,13,2, - 114,26,1,0,0,99,0,0,0,0,0,0,0,0,3,0, - 0,0,3,0,0,0,67,0,0,0,115,55,0,0,0,116, - 0,0,116,1,0,106,2,0,131,0,0,102,2,0,125,0, - 0,116,3,0,116,4,0,102,2,0,125,1,0,116,5,0, - 116,6,0,102,2,0,125,2,0,124,0,0,124,1,0,124, - 2,0,103,3,0,83,41,1,122,95,82,101,116,117,114,110, - 115,32,97,32,108,105,115,116,32,111,102,32,102,105,108,101, - 45,98,97,115,101,100,32,109,111,100,117,108,101,32,108,111, - 97,100,101,114,115,46,10,10,32,32,32,32,69,97,99,104, - 32,105,116,101,109,32,105,115,32,97,32,116,117,112,108,101, - 32,40,108,111,97,100,101,114,44,32,115,117,102,102,105,120, - 101,115,41,46,10,32,32,32,32,41,7,114,226,0,0,0, - 114,148,0,0,0,218,18,101,120,116,101,110,115,105,111,110, - 95,115,117,102,102,105,120,101,115,114,220,0,0,0,114,86, - 0,0,0,114,225,0,0,0,114,76,0,0,0,41,3,90, - 10,101,120,116,101,110,115,105,111,110,115,90,6,115,111,117, - 114,99,101,90,8,98,121,116,101,99,111,100,101,114,4,0, - 0,0,114,4,0,0,0,114,6,0,0,0,114,164,0,0, - 0,90,5,0,0,115,8,0,0,0,0,5,18,1,12,1, - 12,1,114,164,0,0,0,99,1,0,0,0,0,0,0,0, - 12,0,0,0,12,0,0,0,67,0,0,0,115,70,2,0, - 0,124,0,0,97,0,0,116,0,0,106,1,0,97,1,0, - 116,0,0,106,2,0,97,2,0,116,1,0,106,3,0,116, - 4,0,25,125,1,0,120,76,0,100,26,0,68,93,68,0, - 125,2,0,124,2,0,116,1,0,106,3,0,107,7,0,114, - 83,0,116,0,0,106,5,0,124,2,0,131,1,0,125,3, - 0,110,13,0,116,1,0,106,3,0,124,2,0,25,125,3, - 0,116,6,0,124,1,0,124,2,0,124,3,0,131,3,0, - 1,113,44,0,87,100,5,0,100,6,0,103,1,0,102,2, - 0,100,7,0,100,8,0,100,6,0,103,2,0,102,2,0, - 102,2,0,125,4,0,120,149,0,124,4,0,68,93,129,0, - 92,2,0,125,5,0,125,6,0,116,7,0,100,9,0,100, - 10,0,132,0,0,124,6,0,68,131,1,0,131,1,0,115, - 199,0,116,8,0,130,1,0,124,6,0,100,11,0,25,125, - 7,0,124,5,0,116,1,0,106,3,0,107,6,0,114,241, - 0,116,1,0,106,3,0,124,5,0,25,125,8,0,80,113, - 156,0,121,20,0,116,0,0,106,5,0,124,5,0,131,1, - 0,125,8,0,80,87,113,156,0,4,116,9,0,107,10,0, - 114,28,1,1,1,1,119,156,0,89,113,156,0,88,113,156, - 0,87,116,9,0,100,12,0,131,1,0,130,1,0,116,6, - 0,124,1,0,100,13,0,124,8,0,131,3,0,1,116,6, - 0,124,1,0,100,14,0,124,7,0,131,3,0,1,116,6, - 0,124,1,0,100,15,0,100,16,0,106,10,0,124,6,0, - 131,1,0,131,3,0,1,121,19,0,116,0,0,106,5,0, - 100,17,0,131,1,0,125,9,0,87,110,24,0,4,116,9, - 0,107,10,0,114,147,1,1,1,1,100,18,0,125,9,0, - 89,110,1,0,88,116,6,0,124,1,0,100,17,0,124,9, - 0,131,3,0,1,116,0,0,106,5,0,100,19,0,131,1, - 0,125,10,0,116,6,0,124,1,0,100,19,0,124,10,0, - 131,3,0,1,124,5,0,100,7,0,107,2,0,114,238,1, - 116,0,0,106,5,0,100,20,0,131,1,0,125,11,0,116, - 6,0,124,1,0,100,21,0,124,11,0,131,3,0,1,116, - 6,0,124,1,0,100,22,0,116,11,0,131,0,0,131,3, - 0,1,116,12,0,106,13,0,116,2,0,106,14,0,131,0, - 0,131,1,0,1,124,5,0,100,7,0,107,2,0,114,66, - 2,116,15,0,106,16,0,100,23,0,131,1,0,1,100,24, - 0,116,12,0,107,6,0,114,66,2,100,25,0,116,17,0, - 95,18,0,100,18,0,83,41,27,122,205,83,101,116,117,112, - 32,116,104,101,32,112,97,116,104,45,98,97,115,101,100,32, - 105,109,112,111,114,116,101,114,115,32,102,111,114,32,105,109, - 112,111,114,116,108,105,98,32,98,121,32,105,109,112,111,114, - 116,105,110,103,32,110,101,101,100,101,100,10,32,32,32,32, - 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115, - 32,97,110,100,32,105,110,106,101,99,116,105,110,103,32,116, - 104,101,109,32,105,110,116,111,32,116,104,101,32,103,108,111, - 98,97,108,32,110,97,109,101,115,112,97,99,101,46,10,10, - 32,32,32,32,79,116,104,101,114,32,99,111,109,112,111,110, - 101,110,116,115,32,97,114,101,32,101,120,116,114,97,99,116, - 101,100,32,102,114,111,109,32,116,104,101,32,99,111,114,101, - 32,98,111,111,116,115,116,114,97,112,32,109,111,100,117,108, - 101,46,10,10,32,32,32,32,114,51,0,0,0,114,62,0, - 0,0,218,8,98,117,105,108,116,105,110,115,114,145,0,0, - 0,90,5,112,111,115,105,120,250,1,47,218,2,110,116,250, - 1,92,99,1,0,0,0,0,0,0,0,2,0,0,0,3, - 0,0,0,115,0,0,0,115,33,0,0,0,124,0,0,93, - 23,0,125,1,0,116,0,0,124,1,0,131,1,0,100,0, - 0,107,2,0,86,1,113,3,0,100,1,0,83,41,2,114, - 31,0,0,0,78,41,1,114,33,0,0,0,41,2,114,24, - 0,0,0,114,79,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,229,0,0,0,126,5,0,0, - 115,2,0,0,0,6,0,122,25,95,115,101,116,117,112,46, - 60,108,111,99,97,108,115,62,46,60,103,101,110,101,120,112, - 114,62,114,61,0,0,0,122,30,105,109,112,111,114,116,108, - 105,98,32,114,101,113,117,105,114,101,115,32,112,111,115,105, - 120,32,111,114,32,110,116,114,3,0,0,0,114,27,0,0, - 0,114,23,0,0,0,114,32,0,0,0,90,7,95,116,104, - 114,101,97,100,78,90,8,95,119,101,97,107,114,101,102,90, - 6,119,105,110,114,101,103,114,172,0,0,0,114,7,0,0, - 0,122,4,46,112,121,119,122,6,95,100,46,112,121,100,84, - 41,4,114,51,0,0,0,114,62,0,0,0,114,28,1,0, - 0,114,145,0,0,0,41,19,114,123,0,0,0,114,8,0, - 0,0,114,148,0,0,0,114,241,0,0,0,114,114,0,0, - 0,90,18,95,98,117,105,108,116,105,110,95,102,114,111,109, - 95,110,97,109,101,114,118,0,0,0,218,3,97,108,108,218, - 14,65,115,115,101,114,116,105,111,110,69,114,114,111,114,114, - 109,0,0,0,114,28,0,0,0,114,13,0,0,0,114,231, - 0,0,0,114,152,0,0,0,114,27,1,0,0,114,86,0, - 0,0,114,166,0,0,0,114,171,0,0,0,114,175,0,0, - 0,41,12,218,17,95,98,111,111,116,115,116,114,97,112,95, - 109,111,100,117,108,101,90,11,115,101,108,102,95,109,111,100, - 117,108,101,90,12,98,117,105,108,116,105,110,95,110,97,109, - 101,90,14,98,117,105,108,116,105,110,95,109,111,100,117,108, - 101,90,10,111,115,95,100,101,116,97,105,108,115,90,10,98, - 117,105,108,116,105,110,95,111,115,114,23,0,0,0,114,27, - 0,0,0,90,9,111,115,95,109,111,100,117,108,101,90,13, - 116,104,114,101,97,100,95,109,111,100,117,108,101,90,14,119, - 101,97,107,114,101,102,95,109,111,100,117,108,101,90,13,119, - 105,110,114,101,103,95,109,111,100,117,108,101,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,218,6,95,115,101, - 116,117,112,101,5,0,0,115,82,0,0,0,0,8,6,1, - 9,1,9,3,13,1,13,1,15,1,18,2,13,1,20,3, - 33,1,19,2,31,1,10,1,15,1,13,1,4,2,3,1, - 15,1,5,1,13,1,12,2,12,1,16,1,16,1,25,3, - 3,1,19,1,13,2,11,1,16,3,15,1,16,3,12,1, - 15,1,16,3,19,1,19,1,12,1,13,1,12,1,114,35, - 1,0,0,99,1,0,0,0,0,0,0,0,2,0,0,0, - 3,0,0,0,67,0,0,0,115,116,0,0,0,116,0,0, - 124,0,0,131,1,0,1,116,1,0,131,0,0,125,1,0, - 116,2,0,106,3,0,106,4,0,116,5,0,106,6,0,124, - 1,0,140,0,0,103,1,0,131,1,0,1,116,7,0,106, - 8,0,100,1,0,107,2,0,114,78,0,116,2,0,106,9, - 0,106,10,0,116,11,0,131,1,0,1,116,2,0,106,9, - 0,106,10,0,116,12,0,131,1,0,1,116,5,0,124,0, - 0,95,5,0,116,13,0,124,0,0,95,13,0,100,2,0, - 83,41,3,122,41,73,110,115,116,97,108,108,32,116,104,101, - 32,112,97,116,104,45,98,97,115,101,100,32,105,109,112,111, - 114,116,32,99,111,109,112,111,110,101,110,116,115,46,114,30, - 1,0,0,78,41,14,114,35,1,0,0,114,164,0,0,0, - 114,8,0,0,0,114,0,1,0,0,114,152,0,0,0,114, - 8,1,0,0,114,21,1,0,0,114,3,0,0,0,114,114, - 0,0,0,218,9,109,101,116,97,95,112,97,116,104,114,166, - 0,0,0,114,171,0,0,0,114,251,0,0,0,114,220,0, - 0,0,41,2,114,34,1,0,0,90,17,115,117,112,112,111, - 114,116,101,100,95,108,111,97,100,101,114,115,114,4,0,0, - 0,114,4,0,0,0,114,6,0,0,0,218,8,95,105,110, - 115,116,97,108,108,169,5,0,0,115,16,0,0,0,0,2, - 10,1,9,1,28,1,15,1,16,1,16,4,9,1,114,37, - 1,0,0,41,1,114,0,0,0,0,41,2,114,1,0,0, - 0,114,2,0,0,0,41,62,114,116,0,0,0,114,12,0, - 0,0,90,37,95,67,65,83,69,95,73,78,83,69,78,83, - 73,84,73,86,69,95,80,76,65,84,70,79,82,77,83,95, - 66,89,84,69,83,95,75,69,89,114,11,0,0,0,114,13, - 0,0,0,114,19,0,0,0,114,21,0,0,0,114,30,0, - 0,0,114,40,0,0,0,114,41,0,0,0,114,45,0,0, - 0,114,46,0,0,0,114,48,0,0,0,114,57,0,0,0, - 218,4,116,121,112,101,218,8,95,95,99,111,100,101,95,95, - 114,147,0,0,0,114,17,0,0,0,114,137,0,0,0,114, - 16,0,0,0,114,20,0,0,0,90,17,95,82,65,87,95, - 77,65,71,73,67,95,78,85,77,66,69,82,90,4,95,109, - 115,103,218,11,83,121,115,116,101,109,69,114,114,111,114,114, - 138,0,0,0,114,75,0,0,0,114,74,0,0,0,114,86, - 0,0,0,114,76,0,0,0,90,23,68,69,66,85,71,95, + 70,105,110,100,101,114,114,4,0,0,0,41,3,114,168,0, + 0,0,114,11,1,0,0,114,17,1,0,0,114,4,0,0, + 0,41,2,114,168,0,0,0,114,11,1,0,0,114,6,0, + 0,0,218,9,112,97,116,104,95,104,111,111,107,32,5,0, + 0,115,4,0,0,0,0,10,14,6,122,20,70,105,108,101, + 70,105,110,100,101,114,46,112,97,116,104,95,104,111,111,107, + 99,1,0,0,0,0,0,0,0,1,0,0,0,2,0,0, + 0,67,0,0,0,115,12,0,0,0,100,1,106,0,124,0, + 106,1,131,1,83,0,41,2,78,122,16,70,105,108,101,70, + 105,110,100,101,114,40,123,33,114,125,41,41,2,114,50,0, + 0,0,114,37,0,0,0,41,1,114,104,0,0,0,114,4, + 0,0,0,114,4,0,0,0,114,6,0,0,0,114,243,0, + 0,0,50,5,0,0,115,2,0,0,0,0,1,122,19,70, + 105,108,101,70,105,110,100,101,114,46,95,95,114,101,112,114, + 95,95,41,1,78,41,15,114,109,0,0,0,114,108,0,0, + 0,114,110,0,0,0,114,111,0,0,0,114,182,0,0,0, + 114,249,0,0,0,114,127,0,0,0,114,179,0,0,0,114, + 121,0,0,0,114,4,1,0,0,114,178,0,0,0,114,12, + 1,0,0,114,180,0,0,0,114,18,1,0,0,114,243,0, + 0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0, + 0,114,6,0,0,0,114,5,1,0,0,163,4,0,0,115, + 20,0,0,0,8,7,4,2,8,14,8,4,4,2,8,12, + 8,5,10,48,8,31,12,18,114,5,1,0,0,99,4,0, + 0,0,0,0,0,0,6,0,0,0,11,0,0,0,67,0, + 0,0,115,146,0,0,0,124,0,106,0,100,1,131,1,125, + 4,124,0,106,0,100,2,131,1,125,5,124,4,115,66,124, + 5,114,36,124,5,106,1,125,4,110,30,124,2,124,3,107, + 2,114,56,116,2,124,1,124,2,131,2,125,4,110,10,116, + 3,124,1,124,2,131,2,125,4,124,5,115,84,116,4,124, + 1,124,2,124,4,100,3,141,3,125,5,121,36,124,5,124, + 0,100,2,60,0,124,4,124,0,100,1,60,0,124,2,124, + 0,100,4,60,0,124,3,124,0,100,5,60,0,87,0,110, + 20,4,0,116,5,107,10,114,140,1,0,1,0,1,0,89, + 0,110,2,88,0,100,0,83,0,41,6,78,218,10,95,95, + 108,111,97,100,101,114,95,95,218,8,95,95,115,112,101,99, + 95,95,41,1,114,124,0,0,0,90,8,95,95,102,105,108, + 101,95,95,90,10,95,95,99,97,99,104,101,100,95,95,41, + 6,218,3,103,101,116,114,124,0,0,0,114,220,0,0,0, + 114,215,0,0,0,114,165,0,0,0,218,9,69,120,99,101, + 112,116,105,111,110,41,6,90,2,110,115,114,102,0,0,0, + 90,8,112,97,116,104,110,97,109,101,90,9,99,112,97,116, + 104,110,97,109,101,114,124,0,0,0,114,162,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,14, + 95,102,105,120,95,117,112,95,109,111,100,117,108,101,56,5, + 0,0,115,34,0,0,0,0,2,10,1,10,1,4,1,4, + 1,8,1,8,1,12,2,10,1,4,1,14,1,2,1,8, + 1,8,1,8,1,12,1,14,2,114,23,1,0,0,99,0, + 0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67, + 0,0,0,115,38,0,0,0,116,0,116,1,106,2,131,0, + 102,2,125,0,116,3,116,4,102,2,125,1,116,5,116,6, + 102,2,125,2,124,0,124,1,124,2,103,3,83,0,41,1, + 122,95,82,101,116,117,114,110,115,32,97,32,108,105,115,116, + 32,111,102,32,102,105,108,101,45,98,97,115,101,100,32,109, + 111,100,117,108,101,32,108,111,97,100,101,114,115,46,10,10, + 32,32,32,32,69,97,99,104,32,105,116,101,109,32,105,115, + 32,97,32,116,117,112,108,101,32,40,108,111,97,100,101,114, + 44,32,115,117,102,102,105,120,101,115,41,46,10,32,32,32, + 32,41,7,114,221,0,0,0,114,143,0,0,0,218,18,101, + 120,116,101,110,115,105,111,110,95,115,117,102,102,105,120,101, + 115,114,215,0,0,0,114,88,0,0,0,114,220,0,0,0, + 114,78,0,0,0,41,3,90,10,101,120,116,101,110,115,105, + 111,110,115,90,6,115,111,117,114,99,101,90,8,98,121,116, + 101,99,111,100,101,114,4,0,0,0,114,4,0,0,0,114, + 6,0,0,0,114,159,0,0,0,79,5,0,0,115,8,0, + 0,0,0,5,12,1,8,1,8,1,114,159,0,0,0,99, + 1,0,0,0,0,0,0,0,12,0,0,0,12,0,0,0, + 67,0,0,0,115,188,1,0,0,124,0,97,0,116,0,106, + 1,97,1,116,0,106,2,97,2,116,1,106,3,116,4,25, + 0,125,1,120,56,100,26,68,0,93,48,125,2,124,2,116, + 1,106,3,107,7,114,58,116,0,106,5,124,2,131,1,125, + 3,110,10,116,1,106,3,124,2,25,0,125,3,116,6,124, + 1,124,2,124,3,131,3,1,0,113,32,87,0,100,5,100, + 6,103,1,102,2,100,7,100,8,100,6,103,2,102,2,102, + 2,125,4,120,118,124,4,68,0,93,102,92,2,125,5,125, + 6,116,7,100,9,100,10,132,0,124,6,68,0,131,1,131, + 1,115,142,116,8,130,1,124,6,100,11,25,0,125,7,124, + 5,116,1,106,3,107,6,114,174,116,1,106,3,124,5,25, + 0,125,8,80,0,113,112,121,16,116,0,106,5,124,5,131, + 1,125,8,80,0,87,0,113,112,4,0,116,9,107,10,114, + 212,1,0,1,0,1,0,119,112,89,0,113,112,88,0,113, + 112,87,0,116,9,100,12,131,1,130,1,116,6,124,1,100, + 13,124,8,131,3,1,0,116,6,124,1,100,14,124,7,131, + 3,1,0,116,6,124,1,100,15,100,16,106,10,124,6,131, + 1,131,3,1,0,121,14,116,0,106,5,100,17,131,1,125, + 9,87,0,110,26,4,0,116,9,107,10,144,1,114,52,1, + 0,1,0,1,0,100,18,125,9,89,0,110,2,88,0,116, + 6,124,1,100,17,124,9,131,3,1,0,116,0,106,5,100, + 19,131,1,125,10,116,6,124,1,100,19,124,10,131,3,1, + 0,124,5,100,7,107,2,144,1,114,120,116,0,106,5,100, + 20,131,1,125,11,116,6,124,1,100,21,124,11,131,3,1, + 0,116,6,124,1,100,22,116,11,131,0,131,3,1,0,116, + 12,106,13,116,2,106,14,131,0,131,1,1,0,124,5,100, + 7,107,2,144,1,114,184,116,15,106,16,100,23,131,1,1, + 0,100,24,116,12,107,6,144,1,114,184,100,25,116,17,95, + 18,100,18,83,0,41,27,122,205,83,101,116,117,112,32,116, + 104,101,32,112,97,116,104,45,98,97,115,101,100,32,105,109, + 112,111,114,116,101,114,115,32,102,111,114,32,105,109,112,111, + 114,116,108,105,98,32,98,121,32,105,109,112,111,114,116,105, + 110,103,32,110,101,101,100,101,100,10,32,32,32,32,98,117, + 105,108,116,45,105,110,32,109,111,100,117,108,101,115,32,97, + 110,100,32,105,110,106,101,99,116,105,110,103,32,116,104,101, + 109,32,105,110,116,111,32,116,104,101,32,103,108,111,98,97, + 108,32,110,97,109,101,115,112,97,99,101,46,10,10,32,32, + 32,32,79,116,104,101,114,32,99,111,109,112,111,110,101,110, + 116,115,32,97,114,101,32,101,120,116,114,97,99,116,101,100, + 32,102,114,111,109,32,116,104,101,32,99,111,114,101,32,98, + 111,111,116,115,116,114,97,112,32,109,111,100,117,108,101,46, + 10,10,32,32,32,32,114,52,0,0,0,114,63,0,0,0, + 218,8,98,117,105,108,116,105,110,115,114,140,0,0,0,90, + 5,112,111,115,105,120,250,1,47,218,2,110,116,250,1,92, + 99,1,0,0,0,0,0,0,0,2,0,0,0,3,0,0, + 0,115,0,0,0,115,26,0,0,0,124,0,93,18,125,1, + 116,0,124,1,131,1,100,0,107,2,86,0,1,0,113,2, + 100,1,83,0,41,2,114,31,0,0,0,78,41,1,114,33, + 0,0,0,41,2,114,24,0,0,0,114,81,0,0,0,114, + 4,0,0,0,114,4,0,0,0,114,6,0,0,0,114,224, + 0,0,0,115,5,0,0,115,2,0,0,0,4,0,122,25, + 95,115,101,116,117,112,46,60,108,111,99,97,108,115,62,46, + 60,103,101,110,101,120,112,114,62,114,62,0,0,0,122,30, + 105,109,112,111,114,116,108,105,98,32,114,101,113,117,105,114, + 101,115,32,112,111,115,105,120,32,111,114,32,110,116,114,3, + 0,0,0,114,27,0,0,0,114,23,0,0,0,114,32,0, + 0,0,90,7,95,116,104,114,101,97,100,78,90,8,95,119, + 101,97,107,114,101,102,90,6,119,105,110,114,101,103,114,167, + 0,0,0,114,7,0,0,0,122,4,46,112,121,119,122,6, + 95,100,46,112,121,100,84,41,4,114,52,0,0,0,114,63, + 0,0,0,114,25,1,0,0,114,140,0,0,0,41,19,114, + 118,0,0,0,114,8,0,0,0,114,143,0,0,0,114,236, + 0,0,0,114,109,0,0,0,90,18,95,98,117,105,108,116, + 105,110,95,102,114,111,109,95,110,97,109,101,114,113,0,0, + 0,218,3,97,108,108,218,14,65,115,115,101,114,116,105,111, + 110,69,114,114,111,114,114,103,0,0,0,114,28,0,0,0, + 114,13,0,0,0,114,226,0,0,0,114,147,0,0,0,114, + 24,1,0,0,114,88,0,0,0,114,161,0,0,0,114,166, + 0,0,0,114,170,0,0,0,41,12,218,17,95,98,111,111, + 116,115,116,114,97,112,95,109,111,100,117,108,101,90,11,115, + 101,108,102,95,109,111,100,117,108,101,90,12,98,117,105,108, + 116,105,110,95,110,97,109,101,90,14,98,117,105,108,116,105, + 110,95,109,111,100,117,108,101,90,10,111,115,95,100,101,116, + 97,105,108,115,90,10,98,117,105,108,116,105,110,95,111,115, + 114,23,0,0,0,114,27,0,0,0,90,9,111,115,95,109, + 111,100,117,108,101,90,13,116,104,114,101,97,100,95,109,111, + 100,117,108,101,90,14,119,101,97,107,114,101,102,95,109,111, + 100,117,108,101,90,13,119,105,110,114,101,103,95,109,111,100, + 117,108,101,114,4,0,0,0,114,4,0,0,0,114,6,0, + 0,0,218,6,95,115,101,116,117,112,90,5,0,0,115,82, + 0,0,0,0,8,4,1,6,1,6,3,10,1,10,1,10, + 1,12,2,10,1,16,3,22,1,14,2,22,1,8,1,10, + 1,10,1,4,2,2,1,10,1,6,1,14,1,12,2,8, + 1,12,1,12,1,18,3,2,1,14,1,16,2,10,1,12, + 3,10,1,12,3,10,1,10,1,12,3,14,1,14,1,10, + 1,10,1,10,1,114,32,1,0,0,99,1,0,0,0,0, + 0,0,0,2,0,0,0,3,0,0,0,67,0,0,0,115, + 72,0,0,0,116,0,124,0,131,1,1,0,116,1,131,0, + 125,1,116,2,106,3,106,4,116,5,106,6,124,1,142,0, + 103,1,131,1,1,0,116,7,106,8,100,1,107,2,114,56, + 116,2,106,9,106,10,116,11,131,1,1,0,116,2,106,9, + 106,10,116,12,131,1,1,0,100,2,83,0,41,3,122,41, + 73,110,115,116,97,108,108,32,116,104,101,32,112,97,116,104, + 45,98,97,115,101,100,32,105,109,112,111,114,116,32,99,111, + 109,112,111,110,101,110,116,115,46,114,27,1,0,0,78,41, + 13,114,32,1,0,0,114,159,0,0,0,114,8,0,0,0, + 114,253,0,0,0,114,147,0,0,0,114,5,1,0,0,114, + 18,1,0,0,114,3,0,0,0,114,109,0,0,0,218,9, + 109,101,116,97,95,112,97,116,104,114,161,0,0,0,114,166, + 0,0,0,114,248,0,0,0,41,2,114,31,1,0,0,90, + 17,115,117,112,112,111,114,116,101,100,95,108,111,97,100,101, + 114,115,114,4,0,0,0,114,4,0,0,0,114,6,0,0, + 0,218,8,95,105,110,115,116,97,108,108,158,5,0,0,115, + 12,0,0,0,0,2,8,1,6,1,20,1,10,1,12,1, + 114,34,1,0,0,41,1,114,0,0,0,0,41,2,114,1, + 0,0,0,114,2,0,0,0,41,1,114,49,0,0,0,41, + 1,78,41,3,78,78,78,41,3,78,78,78,41,2,114,62, + 0,0,0,114,62,0,0,0,41,1,78,41,1,78,41,58, + 114,111,0,0,0,114,12,0,0,0,90,37,95,67,65,83, + 69,95,73,78,83,69,78,83,73,84,73,86,69,95,80,76, + 65,84,70,79,82,77,83,95,66,89,84,69,83,95,75,69, + 89,114,11,0,0,0,114,13,0,0,0,114,19,0,0,0, + 114,21,0,0,0,114,30,0,0,0,114,40,0,0,0,114, + 41,0,0,0,114,45,0,0,0,114,46,0,0,0,114,48, + 0,0,0,114,58,0,0,0,218,4,116,121,112,101,218,8, + 95,95,99,111,100,101,95,95,114,142,0,0,0,114,17,0, + 0,0,114,132,0,0,0,114,16,0,0,0,114,20,0,0, + 0,90,17,95,82,65,87,95,77,65,71,73,67,95,78,85, + 77,66,69,82,114,77,0,0,0,114,76,0,0,0,114,88, + 0,0,0,114,78,0,0,0,90,23,68,69,66,85,71,95, 66,89,84,69,67,79,68,69,95,83,85,70,70,73,88,69, 83,90,27,79,80,84,73,77,73,90,69,68,95,66,89,84, - 69,67,79,68,69,95,83,85,70,70,73,88,69,83,114,81, - 0,0,0,114,87,0,0,0,114,93,0,0,0,114,97,0, - 0,0,114,99,0,0,0,114,107,0,0,0,114,125,0,0, - 0,114,132,0,0,0,114,144,0,0,0,114,150,0,0,0, - 114,153,0,0,0,114,158,0,0,0,218,6,111,98,106,101, - 99,116,114,165,0,0,0,114,170,0,0,0,114,171,0,0, - 0,114,186,0,0,0,114,196,0,0,0,114,212,0,0,0, - 114,220,0,0,0,114,225,0,0,0,114,231,0,0,0,114, - 226,0,0,0,114,232,0,0,0,114,249,0,0,0,114,251, - 0,0,0,114,8,1,0,0,114,26,1,0,0,114,164,0, - 0,0,114,35,1,0,0,114,37,1,0,0,114,4,0,0, - 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 218,8,60,109,111,100,117,108,101,62,8,0,0,0,115,114, - 0,0,0,6,16,6,1,6,1,3,1,7,3,12,17,12, - 5,12,5,12,6,12,12,12,10,12,9,12,5,12,7,15, - 22,15,114,22,1,18,19,12,1,6,1,12,1,22,2,6, - 1,6,2,9,2,9,2,10,2,21,44,12,33,12,19,12, - 12,12,12,18,8,12,28,12,17,21,57,21,12,18,10,12, - 14,9,3,12,1,15,65,19,64,19,28,22,110,19,41,25, - 43,25,16,6,3,25,53,19,57,19,41,19,134,19,146,15, - 23,12,11,12,68, + 69,67,79,68,69,95,83,85,70,70,73,88,69,83,114,83, + 0,0,0,114,89,0,0,0,114,95,0,0,0,114,99,0, + 0,0,114,101,0,0,0,114,120,0,0,0,114,127,0,0, + 0,114,139,0,0,0,114,145,0,0,0,114,148,0,0,0, + 114,153,0,0,0,218,6,111,98,106,101,99,116,114,160,0, + 0,0,114,165,0,0,0,114,166,0,0,0,114,181,0,0, + 0,114,191,0,0,0,114,207,0,0,0,114,215,0,0,0, + 114,220,0,0,0,114,226,0,0,0,114,221,0,0,0,114, + 227,0,0,0,114,246,0,0,0,114,248,0,0,0,114,5, + 1,0,0,114,23,1,0,0,114,159,0,0,0,114,32,1, + 0,0,114,34,1,0,0,114,4,0,0,0,114,4,0,0, + 0,114,4,0,0,0,114,6,0,0,0,218,8,60,109,111, + 100,117,108,101,62,8,0,0,0,115,108,0,0,0,4,16, + 4,1,4,1,2,1,6,3,8,17,8,5,8,5,8,6, + 8,12,8,10,8,9,8,5,8,7,10,22,10,123,16,1, + 12,2,4,1,4,2,6,2,6,2,8,2,16,45,8,34, + 8,19,8,12,8,12,8,28,8,17,10,55,10,12,10,10, + 8,14,6,3,4,1,14,67,14,64,14,29,16,110,14,41, + 18,45,18,16,4,3,18,53,14,60,14,42,14,127,0,5, + 14,127,0,22,10,23,8,11,8,68, }; diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py index d9a0855..023c9e6 100755 --- a/Python/makeopcodetargets.py +++ b/Python/makeopcodetargets.py @@ -3,24 +3,34 @@ (for compilers supporting computed gotos or "labels-as-values", such as gcc). """ -# This code should stay compatible with Python 2.3, at least while -# some of the buildbots have Python 2.3 as their system Python. - -import imp import os +import sys -def find_module(modname): - """Finds and returns a module in the local dist/checkout. - """ - modpath = os.path.join( - os.path.dirname(os.path.dirname(__file__)), "Lib") - return imp.load_module(modname, *imp.find_module(modname, [modpath])) +try: + from importlib.machinery import SourceFileLoader +except ImportError: + import imp + + def find_module(modname): + """Finds and returns a module in the local dist/checkout. + """ + modpath = os.path.join( + os.path.dirname(os.path.dirname(__file__)), "Lib") + return imp.load_module(modname, *imp.find_module(modname, [modpath])) +else: + def find_module(modname): + """Finds and returns a module in the local dist/checkout. + """ + modpath = os.path.join( + os.path.dirname(os.path.dirname(__file__)), "Lib", modname + ".py") + return SourceFileLoader(modname, modpath).load_module() + def write_contents(f): """Write C code contents to the target file object. """ - opcode = find_module("opcode") + opcode = find_module('opcode') targets = ['_unknown_opcode'] * 256 for opname, op in opcode.opmap.items(): targets[op] = "TARGET_%s" % opname @@ -29,15 +39,17 @@ def write_contents(f): f.write("\n};\n") -if __name__ == "__main__": - import sys - assert len(sys.argv) < 3, "Too many arguments" +def main(): + if len(sys.argv) >= 3: + sys.exit("Too many arguments") if len(sys.argv) == 2: target = sys.argv[1] else: target = "Python/opcode_targets.h" - f = open(target, "w") - try: + with open(target, "w") as f: write_contents(f) - finally: - f.close() + print("Jump table written into %s" % target) + + +if __name__ == "__main__": + main() diff --git a/Python/marshal.c b/Python/marshal.c index 67e32c8..87a4b24 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -130,7 +130,7 @@ w_string(const char *s, Py_ssize_t n, WFILE *p) m = p->end - p->ptr; if (p->fp != NULL) { if (n <= m) { - Py_MEMCPY(p->ptr, s, n); + memcpy(p->ptr, s, n); p->ptr += n; } else { @@ -140,7 +140,7 @@ w_string(const char *s, Py_ssize_t n, WFILE *p) } else { if (n <= m || w_reserve(p, n - m)) { - Py_MEMCPY(p->ptr, s, n); + memcpy(p->ptr, s, n); p->ptr += n; } } @@ -263,10 +263,10 @@ w_ref(PyObject *v, char *flag, WFILE *p) if (Py_REFCNT(v) == 1) return 0; - entry = _Py_hashtable_get_entry(p->hashtable, v); + entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v); if (entry != NULL) { /* write the reference index to the stream */ - _Py_HASHTABLE_ENTRY_READ_DATA(p->hashtable, &w, sizeof(w), entry); + _Py_HASHTABLE_ENTRY_READ_DATA(p->hashtable, entry, w); /* we don't store "long" indices in the dict */ assert(0 <= w && w <= 0x7fffffff); w_byte(TYPE_REF, p); @@ -549,7 +549,7 @@ w_complex_object(PyObject *v, char flag, WFILE *p) w_object(co->co_lnotab, p); } else if (PyObject_CheckBuffer(v)) { - /* Write unknown bytes-like objects as a bytes object */ + /* Write unknown bytes-like objects as a byte string */ Py_buffer view; if (PyObject_GetBuffer(v, &view, PyBUF_SIMPLE) != 0) { w_byte(TYPE_UNKNOWN, p); @@ -571,7 +571,8 @@ static int w_init_refs(WFILE *wf, int version) { if (version >= 3) { - wf->hashtable = _Py_hashtable_new(sizeof(int), _Py_hashtable_hash_ptr, + wf->hashtable = _Py_hashtable_new(sizeof(PyObject *), sizeof(int), + _Py_hashtable_hash_ptr, _Py_hashtable_compare_direct); if (wf->hashtable == NULL) { PyErr_NoMemory(); @@ -582,9 +583,13 @@ w_init_refs(WFILE *wf, int version) } static int -w_decref_entry(_Py_hashtable_entry_t *entry, void *Py_UNUSED(data)) +w_decref_entry(_Py_hashtable_t *ht, _Py_hashtable_entry_t *entry, + void *Py_UNUSED(data)) { - Py_XDECREF(entry->key); + PyObject *entry_key; + + _Py_HASHTABLE_ENTRY_READ_KEY(ht, entry, entry_key); + Py_XDECREF(entry_key); return 0; } @@ -643,7 +648,7 @@ typedef struct { PyObject *refs; /* a list */ } RFILE; -static char * +static const char * r_string(Py_ssize_t n, RFILE *p) { Py_ssize_t read = -1; @@ -729,7 +734,7 @@ r_byte(RFILE *p) c = getc(p->fp); } else { - char *ptr = r_string(1, p); + const char *ptr = r_string(1, p); if (ptr != NULL) c = *(unsigned char *) ptr; } @@ -740,9 +745,9 @@ static int r_short(RFILE *p) { short x = -1; - unsigned char *buffer; + const unsigned char *buffer; - buffer = (unsigned char *) r_string(2, p); + buffer = (const unsigned char *) r_string(2, p); if (buffer != NULL) { x = buffer[0]; x |= buffer[1] << 8; @@ -756,9 +761,9 @@ static long r_long(RFILE *p) { long x = -1; - unsigned char *buffer; + const unsigned char *buffer; - buffer = (unsigned char *) r_string(4, p); + buffer = (const unsigned char *) r_string(4, p); if (buffer != NULL) { x = buffer[0]; x |= (long)buffer[1] << 8; @@ -978,7 +983,8 @@ r_object(RFILE *p) case TYPE_FLOAT: { - char buf[256], *ptr; + char buf[256]; + const char *ptr; double dx; n = r_byte(p); if (n == EOF) { @@ -1001,9 +1007,9 @@ r_object(RFILE *p) case TYPE_BINARY_FLOAT: { - unsigned char *buf; + const unsigned char *buf; double x; - buf = (unsigned char *) r_string(8, p); + buf = (const unsigned char *) r_string(8, p); if (buf == NULL) break; x = _PyFloat_Unpack8(buf, 1); @@ -1016,7 +1022,8 @@ r_object(RFILE *p) case TYPE_COMPLEX: { - char buf[256], *ptr; + char buf[256]; + const char *ptr; Py_complex c; n = r_byte(p); if (n == EOF) { @@ -1053,15 +1060,15 @@ r_object(RFILE *p) case TYPE_BINARY_COMPLEX: { - unsigned char *buf; + const unsigned char *buf; Py_complex c; - buf = (unsigned char *) r_string(8, p); + buf = (const unsigned char *) r_string(8, p); if (buf == NULL) break; c.real = _PyFloat_Unpack8(buf, 1); if (c.real == -1.0 && PyErr_Occurred()) break; - buf = (unsigned char *) r_string(8, p); + buf = (const unsigned char *) r_string(8, p); if (buf == NULL) break; c.imag = _PyFloat_Unpack8(buf, 1); @@ -1074,12 +1081,12 @@ r_object(RFILE *p) case TYPE_STRING: { - char *ptr; + const char *ptr; n = r_long(p); if (PyErr_Occurred()) break; if (n < 0 || n > SIZE32_MAX) { - PyErr_SetString(PyExc_ValueError, "bad marshal data (bytes object size out of range)"); + PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)"); break; } v = PyBytes_FromStringAndSize((char *)NULL, n); @@ -1103,7 +1110,7 @@ r_object(RFILE *p) if (PyErr_Occurred()) break; if (n < 0 || n > SIZE32_MAX) { - PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)"); + PyErr_SetString(PyExc_ValueError, "bad marshal data (unicode size out of range)"); break; } goto _read_ascii; @@ -1119,7 +1126,7 @@ r_object(RFILE *p) } _read_ascii: { - char *ptr; + const char *ptr; ptr = r_string(n, p); if (ptr == NULL) break; @@ -1137,13 +1144,13 @@ r_object(RFILE *p) is_interned = 1; case TYPE_UNICODE: { - char *buffer; + const char *buffer; n = r_long(p); if (PyErr_Occurred()) break; if (n < 0 || n > SIZE32_MAX) { - PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)"); + PyErr_SetString(PyExc_ValueError, "bad marshal data (unicode size out of range)"); break; } if (n != 0) { @@ -1264,41 +1271,52 @@ r_object(RFILE *p) PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)"); break; } - v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL); - if (type == TYPE_SET) { - R_REF(v); - } else { - /* must use delayed registration of frozensets because they must - * be init with a refcount of 1 - */ - idx = r_ref_reserve(flag, p); - if (idx < 0) - Py_CLEAR(v); /* signal error */ - } - if (v == NULL) - break; - for (i = 0; i < n; i++) { - v2 = r_object(p); - if ( v2 == NULL ) { - if (!PyErr_Occurred()) - PyErr_SetString(PyExc_TypeError, - "NULL object in marshal data for set"); - Py_DECREF(v); - v = NULL; + if (n == 0 && type == TYPE_FROZENSET) { + /* call frozenset() to get the empty frozenset singleton */ + v = PyObject_CallFunction((PyObject*)&PyFrozenSet_Type, NULL); + if (v == NULL) break; + R_REF(v); + retval = v; + } + else { + v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL); + if (type == TYPE_SET) { + R_REF(v); + } else { + /* must use delayed registration of frozensets because they must + * be init with a refcount of 1 + */ + idx = r_ref_reserve(flag, p); + if (idx < 0) + Py_CLEAR(v); /* signal error */ } - if (PySet_Add(v, v2) == -1) { - Py_DECREF(v); - Py_DECREF(v2); - v = NULL; + if (v == NULL) break; + + for (i = 0; i < n; i++) { + v2 = r_object(p); + if ( v2 == NULL ) { + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_TypeError, + "NULL object in marshal data for set"); + Py_DECREF(v); + v = NULL; + break; + } + if (PySet_Add(v, v2) == -1) { + Py_DECREF(v); + Py_DECREF(v2); + v = NULL; + break; + } + Py_DECREF(v2); } - Py_DECREF(v2); + if (type != TYPE_SET) + v = r_ref_insert(v, idx, flag, p); + retval = v; } - if (type != TYPE_SET) - v = r_ref_insert(v, idx, flag, p); - retval = v; break; case TYPE_CODE: @@ -1594,7 +1612,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version) if (wf.ptr - base > PY_SSIZE_T_MAX) { Py_DECREF(wf.str); PyErr_SetString(PyExc_OverflowError, - "too much marshal data for a bytes object"); + "too much marshal data for a string"); return NULL; } if (_PyBytes_Resize(&wf.str, (Py_ssize_t)(wf.ptr - base)) < 0) @@ -1640,7 +1658,8 @@ PyDoc_STRVAR(dump_doc, "dump(value, file[, version])\n\ \n\ Write the value on the open file. The value must be a supported type.\n\ -The file must be a writeable binary file.\n\ +The file must be an open file object such as sys.stdout or returned by\n\ +open() or os.popen(). It must be opened in binary mode ('wb' or 'w+b').\n\ \n\ If the value has (or contains an object that has) an unsupported type, a\n\ ValueError exception is raised - but garbage data will also be written\n\ @@ -1696,7 +1715,8 @@ PyDoc_STRVAR(load_doc, Read one value from the open file and return it. If no valid value is\n\ read (e.g. because the data has a different Python version's\n\ incompatible marshal format), raise EOFError, ValueError or TypeError.\n\ -The file must be a readable binary file.\n\ +The file must be an open file object opened in binary mode ('rb' or\n\ +'r+b').\n\ \n\ Note: If an object containing an unsupported type was marshalled with\n\ dump(), load() will substitute None for the unmarshallable type."); @@ -1715,7 +1735,7 @@ marshal_dumps(PyObject *self, PyObject *args) PyDoc_STRVAR(dumps_doc, "dumps(value[, version])\n\ \n\ -Return the bytes object that would be written to a file by dump(value, file).\n\ +Return the string that would be written to a file by dump(value, file).\n\ The value must be a supported type. Raise a ValueError exception if\n\ value has (or contains an object that has) an unsupported type.\n\ \n\ @@ -1751,8 +1771,8 @@ marshal_loads(PyObject *self, PyObject *args) PyDoc_STRVAR(loads_doc, "loads(bytes)\n\ \n\ -Convert the bytes-like object to a value. If no valid value is found,\n\ -raise EOFError, ValueError or TypeError. Extra bytes in the input are\n\ +Convert the bytes object to a value. If no valid value is found, raise\n\ +EOFError, ValueError or TypeError. Extra characters in the input are\n\ ignored."); static PyMethodDef marshal_methods[] = { @@ -1790,8 +1810,8 @@ Functions:\n\ \n\ dump() -- write value to a file\n\ load() -- read value from a file\n\ -dumps() -- marshal value as a bytes object\n\ -loads() -- read value from a bytes-like object"); +dumps() -- write value to a string\n\ +loads() -- read value from a string"); diff --git a/Python/modsupport.c b/Python/modsupport.c index 0d09371..aabee8f 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -260,13 +260,12 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) return PyLong_FromUnsignedLong(n); } -#ifdef HAVE_LONG_LONG case 'L': - return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG)); + return PyLong_FromLongLong((long long)va_arg(*p_va, long long)); case 'K': - return PyLong_FromUnsignedLongLong((PY_LONG_LONG)va_arg(*p_va, unsigned PY_LONG_LONG)); -#endif + return PyLong_FromUnsignedLongLong((long long)va_arg(*p_va, unsigned long long)); + case 'u': { PyObject *v; @@ -318,7 +317,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) case 'U': /* XXX deprecated alias */ { PyObject *v; - char *str = va_arg(*p_va, char *); + const char *str = va_arg(*p_va, const char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; @@ -351,7 +350,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) case 'y': { PyObject *v; - char *str = va_arg(*p_va, char *); + const char *str = va_arg(*p_va, const char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; @@ -468,8 +467,7 @@ va_build_value(const char *format, va_list va, int flags) const char *f = format; int n = countformat(f, '\0'); va_list lva; - - Py_VA_COPY(lva, va); + PyObject *retval; if (n < 0) return NULL; @@ -477,9 +475,14 @@ va_build_value(const char *format, va_list va, int flags) Py_INCREF(Py_None); return Py_None; } - if (n == 1) - return do_mkvalue(&f, &lva, flags); - return do_mktuple(&f, &lva, '\0', n, flags); + va_copy(lva, va); + if (n == 1) { + retval = do_mkvalue(&f, &lva, flags); + } else { + retval = do_mktuple(&f, &lva, '\0', n, flags); + } + va_end(lva); + return retval; } diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c index 98429d4..a85790e 100644 --- a/Python/mystrtoul.c +++ b/Python/mystrtoul.c @@ -17,7 +17,7 @@ * smallmax[base] is the largest unsigned long i such that * i * base doesn't overflow unsigned long. */ -static unsigned long smallmax[] = { +static const unsigned long smallmax[] = { 0, /* bases 0 and 1 are invalid */ 0, ULONG_MAX / 2, @@ -62,14 +62,14 @@ static unsigned long smallmax[] = { * Note that this is pessimistic if sizeof(long) > 4. */ #if SIZEOF_LONG == 4 -static int digitlimit[] = { +static const int digitlimit[] = { 0, 0, 32, 20, 16, 13, 12, 11, 10, 10, /* 0 - 9 */ 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, /* 10 - 19 */ 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, /* 20 - 29 */ 6, 6, 6, 6, 6, 6, 6}; /* 30 - 36 */ #elif SIZEOF_LONG == 8 /* [int(math.floor(math.log(2**64, i))) for i in range(2, 37)] */ -static int digitlimit[] = { +static const int digitlimit[] = { 0, 0, 64, 40, 32, 27, 24, 22, 21, 20, /* 0 - 9 */ 19, 18, 17, 17, 16, 16, 16, 15, 15, 15, /* 10 - 19 */ 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, /* 20 - 29 */ diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 19259e1..72d2408 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -84,7 +84,7 @@ static void *opcode_targets[256] = { &&TARGET_WITH_CLEANUP_FINISH, &&TARGET_RETURN_VALUE, &&TARGET_IMPORT_STAR, - &&_unknown_opcode, + &&TARGET_SETUP_ANNOTATIONS, &&TARGET_YIELD_VALUE, &&TARGET_POP_BLOCK, &&TARGET_END_FINALLY, @@ -126,22 +126,22 @@ static void *opcode_targets[256] = { &&TARGET_LOAD_FAST, &&TARGET_STORE_FAST, &&TARGET_DELETE_FAST, - &&_unknown_opcode, + &&TARGET_STORE_ANNOTATION, &&_unknown_opcode, &&_unknown_opcode, &&TARGET_RAISE_VARARGS, &&TARGET_CALL_FUNCTION, &&TARGET_MAKE_FUNCTION, &&TARGET_BUILD_SLICE, - &&TARGET_MAKE_CLOSURE, + &&_unknown_opcode, &&TARGET_LOAD_CLOSURE, &&TARGET_LOAD_DEREF, &&TARGET_STORE_DEREF, &&TARGET_DELETE_DEREF, &&_unknown_opcode, - &&TARGET_CALL_FUNCTION_VAR, + &&_unknown_opcode, &&TARGET_CALL_FUNCTION_KW, - &&TARGET_CALL_FUNCTION_VAR_KW, + &&TARGET_CALL_FUNCTION_EX, &&TARGET_SETUP_WITH, &&TARGET_EXTENDED_ARG, &&TARGET_LIST_APPEND, @@ -154,10 +154,10 @@ static void *opcode_targets[256] = { &&TARGET_BUILD_TUPLE_UNPACK, &&TARGET_BUILD_SET_UNPACK, &&TARGET_SETUP_ASYNC_WITH, - &&_unknown_opcode, - &&_unknown_opcode, - &&_unknown_opcode, - &&_unknown_opcode, + &&TARGET_FORMAT_VALUE, + &&TARGET_BUILD_CONST_KEY_MAP, + &&TARGET_BUILD_STRING, + &&TARGET_BUILD_TUPLE_UNPACK_WITH_CALL, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, diff --git a/Python/peephole.c b/Python/peephole.c index 4e657fa..dd8f3e4 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -8,8 +8,8 @@ #include "code.h" #include "symtable.h" #include "opcode.h" +#include "wordcode_helpers.h" -#define GETARG(arr, i) ((int)((arr[i+2]<<8) + arr[i+1])) #define UNCONDITIONAL_JUMP(op) (op==JUMP_ABSOLUTE || op==JUMP_FORWARD) #define CONDITIONAL_JUMP(op) (op==POP_JUMP_IF_FALSE || op==POP_JUMP_IF_TRUE \ || op==JUMP_IF_FALSE_OR_POP || op==JUMP_IF_TRUE_OR_POP) @@ -17,22 +17,16 @@ || op==POP_JUMP_IF_FALSE || op==POP_JUMP_IF_TRUE \ || op==JUMP_IF_FALSE_OR_POP || op==JUMP_IF_TRUE_OR_POP) #define JUMPS_ON_TRUE(op) (op==POP_JUMP_IF_TRUE || op==JUMP_IF_TRUE_OR_POP) -#define GETJUMPTGT(arr, i) (GETARG(arr,i) + (ABSOLUTE_JUMP(arr[i]) ? 0 : i+3)) -#define SETARG(arr, i, val) do { \ - assert(0 <= val && val <= 0xffff); \ - arr[i+2] = (unsigned char)(((unsigned int)val)>>8); \ - arr[i+1] = (unsigned char)(((unsigned int)val) & 255); \ -} while(0) -#define CODESIZE(op) (HAS_ARG(op) ? 3 : 1) -#define ISBASICBLOCK(blocks, start, bytes) \ - (blocks[start]==blocks[start+bytes-1]) +#define GETJUMPTGT(arr, i) (get_arg(arr, i) / sizeof(_Py_CODEUNIT) + \ + (ABSOLUTE_JUMP(_Py_OPCODE(arr[i])) ? 0 : i+1)) +#define ISBASICBLOCK(blocks, start, end) \ + (blocks[start]==blocks[end]) #define CONST_STACK_CREATE() { \ const_stack_size = 256; \ const_stack = PyMem_New(PyObject *, const_stack_size); \ - load_const_stack = PyMem_New(Py_ssize_t, const_stack_size); \ - if (!const_stack || !load_const_stack) { \ + if (!const_stack) { \ PyErr_NoMemory(); \ goto exitError; \ } \ @@ -41,27 +35,23 @@ #define CONST_STACK_DELETE() do { \ if (const_stack) \ PyMem_Free(const_stack); \ - if (load_const_stack) \ - PyMem_Free(load_const_stack); \ } while(0) -#define CONST_STACK_LEN() (const_stack_top + 1) +#define CONST_STACK_LEN() ((unsigned)(const_stack_top + 1)) #define CONST_STACK_PUSH_OP(i) do { \ PyObject *_x; \ - assert(codestr[i] == LOAD_CONST); \ - assert(PyList_GET_SIZE(consts) > GETARG(codestr, i)); \ - _x = PyList_GET_ITEM(consts, GETARG(codestr, i)); \ + assert(_Py_OPCODE(codestr[i]) == LOAD_CONST); \ + assert(PyList_GET_SIZE(consts) > (Py_ssize_t)get_arg(codestr, i)); \ + _x = PyList_GET_ITEM(consts, get_arg(codestr, i)); \ if (++const_stack_top >= const_stack_size) { \ const_stack_size *= 2; \ PyMem_Resize(const_stack, PyObject *, const_stack_size); \ - PyMem_Resize(load_const_stack, Py_ssize_t, const_stack_size); \ - if (!const_stack || !load_const_stack) { \ + if (!const_stack) { \ PyErr_NoMemory(); \ goto exitError; \ } \ } \ - load_const_stack[const_stack_top] = i; \ const_stack[const_stack_top] = _x; \ in_consts = 1; \ } while(0) @@ -70,22 +60,114 @@ const_stack_top = -1; \ } while(0) -#define CONST_STACK_TOP() \ - const_stack[const_stack_top] - #define CONST_STACK_LASTN(i) \ - &const_stack[const_stack_top - i + 1] + &const_stack[CONST_STACK_LEN() - i] #define CONST_STACK_POP(i) do { \ - assert(const_stack_top + 1 >= i); \ + assert(CONST_STACK_LEN() >= i); \ const_stack_top -= i; \ } while(0) -#define CONST_STACK_OP_LASTN(i) \ - ((const_stack_top >= i - 1) ? load_const_stack[const_stack_top - i + 1] : -1) +/* Scans back N consecutive LOAD_CONST instructions, skipping NOPs, + returns index of the Nth last's LOAD_CONST's EXTENDED_ARG prefix. + Callers are responsible to check CONST_STACK_LEN beforehand. +*/ +static Py_ssize_t +lastn_const_start(const _Py_CODEUNIT *codestr, Py_ssize_t i, Py_ssize_t n) +{ + assert(n > 0); + for (;;) { + i--; + assert(i >= 0); + if (_Py_OPCODE(codestr[i]) == LOAD_CONST) { + if (!--n) { + while (i > 0 && _Py_OPCODE(codestr[i-1]) == EXTENDED_ARG) { + i--; + } + return i; + } + } + else { + assert(_Py_OPCODE(codestr[i]) == NOP || + _Py_OPCODE(codestr[i]) == EXTENDED_ARG); + } + } +} + +/* Scans through EXTENDED ARGs, seeking the index of the effective opcode */ +static Py_ssize_t +find_op(const _Py_CODEUNIT *codestr, Py_ssize_t i) +{ + while (_Py_OPCODE(codestr[i]) == EXTENDED_ARG) { + i++; + } + return i; +} + +/* Given the index of the effective opcode, + scan back to construct the oparg with EXTENDED_ARG */ +static unsigned int +get_arg(const _Py_CODEUNIT *codestr, Py_ssize_t i) +{ + _Py_CODEUNIT word; + unsigned int oparg = _Py_OPARG(codestr[i]); + if (i >= 1 && _Py_OPCODE(word = codestr[i-1]) == EXTENDED_ARG) { + oparg |= _Py_OPARG(word) << 8; + if (i >= 2 && _Py_OPCODE(word = codestr[i-2]) == EXTENDED_ARG) { + oparg |= _Py_OPARG(word) << 16; + if (i >= 3 && _Py_OPCODE(word = codestr[i-3]) == EXTENDED_ARG) { + oparg |= _Py_OPARG(word) << 24; + } + } + } + return oparg; +} + +/* Fill the region with NOPs. */ +static void +fill_nops(_Py_CODEUNIT *codestr, Py_ssize_t start, Py_ssize_t end) +{ + memset(codestr + start, NOP, (end - start) * sizeof(_Py_CODEUNIT)); +} + +/* Given the index of the effective opcode, + attempt to replace the argument, taking into account EXTENDED_ARG. + Returns -1 on failure, or the new op index on success */ +static Py_ssize_t +set_arg(_Py_CODEUNIT *codestr, Py_ssize_t i, unsigned int oparg) +{ + unsigned int curarg = get_arg(codestr, i); + int curilen, newilen; + if (curarg == oparg) + return i; + curilen = instrsize(curarg); + newilen = instrsize(oparg); + if (curilen < newilen) { + return -1; + } + + write_op_arg(codestr + i + 1 - curilen, _Py_OPCODE(codestr[i]), oparg, newilen); + fill_nops(codestr, i + 1 - curilen + newilen, i + 1); + return i-curilen+newilen; +} +/* Attempt to write op/arg at end of specified region of memory. + Preceding memory in the region is overwritten with NOPs. + Returns -1 on failure, op index on success */ +static Py_ssize_t +copy_op_arg(_Py_CODEUNIT *codestr, Py_ssize_t i, unsigned char op, + unsigned int oparg, Py_ssize_t maxi) +{ + int ilen = instrsize(oparg); + if (i + ilen > maxi) { + return -1; + } + write_op_arg(codestr + maxi - ilen, op, oparg, ilen); + fill_nops(codestr, i, maxi - ilen); + return maxi - 1; +} -/* Replace LOAD_CONST c1. LOAD_CONST c2 ... LOAD_CONST cn BUILD_TUPLE n +/* Replace LOAD_CONST c1, LOAD_CONST c2 ... LOAD_CONST cn, BUILD_TUPLE n with LOAD_CONST (c1, c2, ... cn). The consts table must still be in list form so that the new constant (c1, c2, ... cn) can be appended. @@ -94,9 +176,10 @@ Also works for BUILD_LIST and BUILT_SET when followed by an "in" or "not in" test; for BUILD_SET it assembles a frozenset rather than a tuple. */ -static int -tuple_of_constants(unsigned char *codestr, Py_ssize_t n, - PyObject *consts, PyObject **objs) +static Py_ssize_t +fold_tuple_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start, + Py_ssize_t opcode_end, unsigned char opcode, + PyObject *consts, PyObject **objs, int n) { PyObject *newconst, *constant; Py_ssize_t i, len_consts; @@ -106,9 +189,9 @@ tuple_of_constants(unsigned char *codestr, Py_ssize_t n, /* Buildup new tuple of constants */ newconst = PyTuple_New(n); - if (newconst == NULL) - return 0; - len_consts = PyList_GET_SIZE(consts); + if (newconst == NULL) { + return -1; + } for (i=0 ; i 20) { Py_DECREF(newconst); - return 0; + return -1; } /* Append folded constant into consts table */ - len_consts = PyList_GET_SIZE(consts); if (PyList_Append(consts, newconst)) { Py_DECREF(newconst); - return 0; + return -1; } Py_DECREF(newconst); - /* Write NOP NOP NOP NOP LOAD_CONST newconst */ - codestr[-2] = LOAD_CONST; - SETARG(codestr, -2, len_consts); - return 1; + return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end); } -static int -fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts, PyObject *v) +static Py_ssize_t +fold_unaryops_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start, + Py_ssize_t opcode_end, unsigned char opcode, + PyObject *consts, PyObject *v) { PyObject *newconst; Py_ssize_t len_consts; - int opcode; /* Pre-conditions */ assert(PyList_CheckExact(consts)); - assert(codestr[0] == LOAD_CONST); + len_consts = PyList_GET_SIZE(consts); /* Create new constant */ - opcode = codestr[3]; switch (opcode) { case UNARY_NEGATIVE: newconst = PyNumber_Negative(v); @@ -267,35 +345,31 @@ fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts, PyObject *v PyErr_Format(PyExc_SystemError, "unexpected unary operation %d on a constant", opcode); - return 0; + return -1; } if (newconst == NULL) { - if(!PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) + if(!PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) { PyErr_Clear(); - return 0; + } + return -1; } /* Append folded constant into consts table */ - len_consts = PyList_GET_SIZE(consts); if (PyList_Append(consts, newconst)) { Py_DECREF(newconst); PyErr_Clear(); - return 0; + return -1; } Py_DECREF(newconst); - /* Write NOP LOAD_CONST newconst */ - codestr[0] = NOP; - codestr[1] = LOAD_CONST; - SETARG(codestr, 1, len_consts); - return 1; + return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end); } static unsigned int * -markblocks(unsigned char *code, Py_ssize_t len) +markblocks(_Py_CODEUNIT *code, Py_ssize_t len) { unsigned int *blocks = PyMem_New(unsigned int, len); - int i,j, opcode, blockcnt = 0; + int i, j, opcode, blockcnt = 0; if (blocks == NULL) { PyErr_NoMemory(); @@ -304,8 +378,8 @@ markblocks(unsigned char *code, Py_ssize_t len) memset(blocks, 0, len*sizeof(int)); /* Mark labels in the first pass */ - for (i=0 ; i= 255. EXTENDED_ARG can - appear before MAKE_FUNCTION; in this case both opcodes are skipped. - EXTENDED_ARG preceding any other opcode causes the optimizer to bail. + To keep the optimizer simple, it bails when the lineno table has complex + encoding for gaps >= 255. Optimizations are restricted to simple transformations occurring within a single basic block. All transformations keep the code size the same or smaller. For those that reduce size, the gaps are initially filled with NOPs. Later those NOPs are removed and the jump addresses retargeted in - a single pass. Line numbering is adjusted accordingly. */ + a single pass. */ PyObject * PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, - PyObject *lineno_obj) + PyObject *lnotab_obj) { - Py_ssize_t i, j, codelen; - int nops, h, adj; - int tgt, tgttgt, opcode; - unsigned char *codestr = NULL; - unsigned char *lineno; - int *addrmap = NULL; - int new_line, cum_orig_line, last_line; + Py_ssize_t h, i, nexti, op_start, codelen, tgt; + unsigned int j, nops; + unsigned char opcode, nextop; + _Py_CODEUNIT *codestr = NULL; + unsigned char *lnotab; + unsigned int cum_orig_offset, last_offset; Py_ssize_t tabsiz; PyObject **const_stack = NULL; - Py_ssize_t *load_const_stack = NULL; Py_ssize_t const_stack_top = -1; Py_ssize_t const_stack_size = 0; int in_consts = 0; /* whether we are in a LOAD_CONST sequence */ @@ -373,42 +442,30 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, if (PyErr_Occurred()) goto exitError; - /* Bypass optimization when the lineno table is too complex */ - assert(PyBytes_Check(lineno_obj)); - lineno = (unsigned char*)PyBytes_AS_STRING(lineno_obj); - tabsiz = PyBytes_GET_SIZE(lineno_obj); - if (memchr(lineno, 255, tabsiz) != NULL) + /* Bypass optimization when the lnotab table is too complex */ + assert(PyBytes_Check(lnotab_obj)); + lnotab = (unsigned char*)PyBytes_AS_STRING(lnotab_obj); + tabsiz = PyBytes_GET_SIZE(lnotab_obj); + assert(tabsiz == 0 || Py_REFCNT(lnotab_obj) == 1); + if (memchr(lnotab, 255, tabsiz) != NULL) { + /* 255 value are used for multibyte bytecode instructions */ goto exitUnchanged; + } + /* Note: -128 and 127 special values for line number delta are ok, + the peephole optimizer doesn't modify line numbers. */ - /* Avoid situations where jump retargeting could overflow */ assert(PyBytes_Check(code)); codelen = PyBytes_GET_SIZE(code); - if (codelen > 32700) - goto exitUnchanged; + assert(codelen % sizeof(_Py_CODEUNIT) == 0); /* Make a modifiable copy of the code string */ - codestr = (unsigned char *)PyMem_Malloc(codelen); + codestr = (_Py_CODEUNIT *)PyMem_Malloc(codelen); if (codestr == NULL) { PyErr_NoMemory(); goto exitError; } - codestr = (unsigned char *)memcpy(codestr, - PyBytes_AS_STRING(code), codelen); - - /* Verify that RETURN_VALUE terminates the codestring. This allows - the various transformation patterns to look ahead several - instructions without additional checks to make sure they are not - looking beyond the end of the code string. - */ - if (codestr[codelen-1] != RETURN_VALUE) - goto exitUnchanged; - - /* Mapping to new jump targets after NOPs are removed */ - addrmap = PyMem_New(int, codelen); - if (addrmap == NULL) { - PyErr_NoMemory(); - goto exitError; - } + memcpy(codestr, PyBytes_AS_STRING(code), codelen); + codelen /= sizeof(_Py_CODEUNIT); blocks = markblocks(codestr, codelen); if (blocks == NULL) @@ -417,9 +474,17 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, CONST_STACK_CREATE(); - for (i=0 ; i= 1 && _Py_OPCODE(codestr[op_start-1]) == EXTENDED_ARG) { + op_start--; + } + + nexti = i + 1; + while (nexti < codelen && _Py_OPCODE(codestr[nexti]) == EXTENDED_ARG) + nexti++; + nextop = nexti < codelen ? _Py_OPCODE(codestr[nexti]) : 0; if (!in_consts) { CONST_STACK_RESET(); @@ -430,14 +495,12 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, /* Replace UNARY_NOT POP_JUMP_IF_FALSE with POP_JUMP_IF_TRUE */ case UNARY_NOT: - if (codestr[i+1] != POP_JUMP_IF_FALSE - || !ISBASICBLOCK(blocks,i,4)) - continue; - j = GETARG(codestr, i+1); - codestr[i] = POP_JUMP_IF_TRUE; - SETARG(codestr, i, j); - codestr[i+3] = NOP; - goto reoptimize_current; + if (nextop != POP_JUMP_IF_FALSE + || !ISBASICBLOCK(blocks, op_start, i + 1)) + break; + fill_nops(codestr, op_start, i + 1); + codestr[nexti] = PACKOPARG(POP_JUMP_IF_TRUE, _Py_OPARG(codestr[nexti])); + break; /* not a is b --> a is not b not a in b --> a not in b @@ -445,78 +508,76 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, not a not in b --> a in b */ case COMPARE_OP: - j = GETARG(codestr, i); - if (j < 6 || j > 9 || - codestr[i+3] != UNARY_NOT || - !ISBASICBLOCK(blocks,i,4)) - continue; - SETARG(codestr, i, (j^1)); - codestr[i+3] = NOP; + j = get_arg(codestr, i); + if (j < 6 || j > 9 || + nextop != UNARY_NOT || + !ISBASICBLOCK(blocks, op_start, i + 1)) + break; + codestr[i] = PACKOPARG(opcode, j^1); + fill_nops(codestr, i + 1, nexti + 1); break; /* Skip over LOAD_CONST trueconst - POP_JUMP_IF_FALSE xx. This improves - "while 1" performance. */ + POP_JUMP_IF_FALSE xx. This improves + "while 1" performance. */ case LOAD_CONST: CONST_STACK_PUSH_OP(i); - j = GETARG(codestr, i); - if (codestr[i+3] != POP_JUMP_IF_FALSE || - !ISBASICBLOCK(blocks,i,6) || - !PyObject_IsTrue(PyList_GET_ITEM(consts, j))) - continue; - memset(codestr+i, NOP, 6); - CONST_STACK_RESET(); + if (nextop != POP_JUMP_IF_FALSE || + !ISBASICBLOCK(blocks, op_start, i + 1) || + !PyObject_IsTrue(PyList_GET_ITEM(consts, get_arg(codestr, i)))) + break; + fill_nops(codestr, op_start, nexti + 1); + CONST_STACK_POP(1); break; - /* Try to fold tuples of constants (includes a case for lists and sets - which are only used for "in" and "not in" tests). + /* Try to fold tuples of constants (includes a case for lists + and sets which are only used for "in" and "not in" tests). Skip over BUILD_SEQN 1 UNPACK_SEQN 1. Replace BUILD_SEQN 2 UNPACK_SEQN 2 with ROT2. Replace BUILD_SEQN 3 UNPACK_SEQN 3 with ROT3 ROT2. */ case BUILD_TUPLE: case BUILD_LIST: case BUILD_SET: - j = GETARG(codestr, i); - if (j == 0) - break; - h = CONST_STACK_OP_LASTN(j); - assert((h >= 0 || CONST_STACK_LEN() < j)); - if (h >= 0 && j > 0 && j <= CONST_STACK_LEN() && - ((opcode == BUILD_TUPLE && - ISBASICBLOCK(blocks, h, i-h+3)) || - ((opcode == BUILD_LIST || opcode == BUILD_SET) && - codestr[i+3]==COMPARE_OP && - ISBASICBLOCK(blocks, h, i-h+6) && - (GETARG(codestr,i+3)==6 || - GETARG(codestr,i+3)==7))) && - tuple_of_constants(&codestr[i], j, consts, CONST_STACK_LASTN(j))) { - assert(codestr[i] == LOAD_CONST); - memset(&codestr[h], NOP, i - h); - CONST_STACK_POP(j); - CONST_STACK_PUSH_OP(i); - break; + j = get_arg(codestr, i); + if (j > 0 && CONST_STACK_LEN() >= j) { + h = lastn_const_start(codestr, op_start, j); + if ((opcode == BUILD_TUPLE && + ISBASICBLOCK(blocks, h, op_start)) || + ((opcode == BUILD_LIST || opcode == BUILD_SET) && + ((nextop==COMPARE_OP && + (_Py_OPARG(codestr[nexti]) == PyCmp_IN || + _Py_OPARG(codestr[nexti]) == PyCmp_NOT_IN)) || + nextop == GET_ITER) && ISBASICBLOCK(blocks, h, i + 1))) { + h = fold_tuple_on_constants(codestr, h, i + 1, opcode, + consts, CONST_STACK_LASTN(j), j); + if (h >= 0) { + CONST_STACK_POP(j); + CONST_STACK_PUSH_OP(h); + } + break; + } } - if (codestr[i+3] != UNPACK_SEQUENCE || - !ISBASICBLOCK(blocks,i,6) || - j != GETARG(codestr, i+3) || + if (nextop != UNPACK_SEQUENCE || + !ISBASICBLOCK(blocks, op_start, i + 1) || + j != get_arg(codestr, nexti) || opcode == BUILD_SET) - continue; - if (j == 1) { - memset(codestr+i, NOP, 6); + break; + if (j < 2) { + fill_nops(codestr, op_start, nexti + 1); } else if (j == 2) { - codestr[i] = ROT_TWO; - memset(codestr+i+1, NOP, 5); + codestr[op_start] = PACKOPARG(ROT_TWO, 0); + fill_nops(codestr, op_start + 1, nexti + 1); CONST_STACK_RESET(); } else if (j == 3) { - codestr[i] = ROT_THREE; - codestr[i+1] = ROT_TWO; - memset(codestr+i+2, NOP, 4); + codestr[op_start] = PACKOPARG(ROT_THREE, 0); + codestr[op_start + 1] = PACKOPARG(ROT_TWO, 0); + fill_nops(codestr, op_start + 2, nexti + 1); CONST_STACK_RESET(); } break; /* Fold binary ops on constants. - LOAD_CONST c1 LOAD_CONST c2 BINOP --> LOAD_CONST binop(c1,c2) */ + LOAD_CONST c1 LOAD_CONST c2 BINOP --> LOAD_CONST binop(c1,c2) */ case BINARY_POWER: case BINARY_MULTIPLY: case BINARY_TRUE_DIVIDE: @@ -530,35 +591,34 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, case BINARY_AND: case BINARY_XOR: case BINARY_OR: - /* NOTE: LOAD_CONST is saved at `i-2` since it has an arg - while BINOP hasn't */ - h = CONST_STACK_OP_LASTN(2); - assert((h >= 0 || CONST_STACK_LEN() < 2)); - if (h >= 0 && - ISBASICBLOCK(blocks, h, i-h+1) && - fold_binops_on_constants(&codestr[i], consts, CONST_STACK_LASTN(2))) { - i -= 2; - memset(&codestr[h], NOP, i - h); - assert(codestr[i] == LOAD_CONST); - CONST_STACK_POP(2); - CONST_STACK_PUSH_OP(i); + if (CONST_STACK_LEN() < 2) + break; + h = lastn_const_start(codestr, op_start, 2); + if (ISBASICBLOCK(blocks, h, op_start)) { + h = fold_binops_on_constants(codestr, h, i + 1, opcode, + consts, CONST_STACK_LASTN(2)); + if (h >= 0) { + CONST_STACK_POP(2); + CONST_STACK_PUSH_OP(h); + } } break; /* Fold unary ops on constants. - LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */ + LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */ case UNARY_NEGATIVE: case UNARY_INVERT: case UNARY_POSITIVE: - h = CONST_STACK_OP_LASTN(1); - assert((h >= 0 || CONST_STACK_LEN() < 1)); - if (h >= 0 && - ISBASICBLOCK(blocks, h, i-h+1) && - fold_unaryops_on_constants(&codestr[i-3], consts, CONST_STACK_TOP())) { - i -= 2; - assert(codestr[i] == LOAD_CONST); - CONST_STACK_POP(1); - CONST_STACK_PUSH_OP(i); + if (CONST_STACK_LEN() < 1) + break; + h = lastn_const_start(codestr, op_start, 1); + if (ISBASICBLOCK(blocks, h, op_start)) { + h = fold_unaryops_on_constants(codestr, h, i + 1, opcode, + consts, *CONST_STACK_LASTN(1)); + if (h >= 0) { + CONST_STACK_POP(1); + CONST_STACK_PUSH_OP(h); + } } break; @@ -573,39 +633,36 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, x:JUMP_IF_FALSE_OR_POP y y:JUMP_IF_FALSE_OR_POP z --> x:JUMP_IF_FALSE_OR_POP z x:JUMP_IF_FALSE_OR_POP y y:JUMP_IF_TRUE_OR_POP z - --> x:POP_JUMP_IF_FALSE y+3 - where y+3 is the instruction following the second test. + --> x:POP_JUMP_IF_FALSE y+1 + where y+1 is the instruction following the second test. */ case JUMP_IF_FALSE_OR_POP: case JUMP_IF_TRUE_OR_POP: - tgt = GETJUMPTGT(codestr, i); - j = codestr[tgt]; + h = get_arg(codestr, i) / sizeof(_Py_CODEUNIT); + tgt = find_op(codestr, h); + + j = _Py_OPCODE(codestr[tgt]); if (CONDITIONAL_JUMP(j)) { - /* NOTE: all possible jumps here are - absolute! */ + /* NOTE: all possible jumps here are absolute. */ if (JUMPS_ON_TRUE(j) == JUMPS_ON_TRUE(opcode)) { - /* The second jump will be - taken iff the first is. */ - tgttgt = GETJUMPTGT(codestr, tgt); - /* The current opcode inherits - its target's stack behaviour */ - codestr[i] = j; - SETARG(codestr, i, tgttgt); - goto reoptimize_current; + /* The second jump will be taken iff the first is. + The current opcode inherits its target's + stack effect */ + h = set_arg(codestr, i, get_arg(codestr, tgt)); } else { - /* The second jump is not taken - if the first is (so jump past - it), and all conditional - jumps pop their argument when - they're not taken (so change - the first jump to pop its - argument when it's taken). */ - if (JUMPS_ON_TRUE(opcode)) - codestr[i] = POP_JUMP_IF_TRUE; - else - codestr[i] = POP_JUMP_IF_FALSE; - SETARG(codestr, i, (tgt + 3)); - goto reoptimize_current; + /* The second jump is not taken if the first is (so + jump past it), and all conditional jumps pop their + argument when they're not taken (so change the + first jump to pop its argument when it's taken). */ + h = set_arg(codestr, i, (tgt + 1) * sizeof(_Py_CODEUNIT)); + j = opcode == JUMP_IF_TRUE_OR_POP ? + POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE; + } + + if (h >= 0) { + nexti = h; + codestr[nexti] = PACKOPARG(j, _Py_OPARG(codestr[nexti])); + break; } } /* Intentional fallthrough */ @@ -622,73 +679,74 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, case SETUP_FINALLY: case SETUP_WITH: case SETUP_ASYNC_WITH: - tgt = GETJUMPTGT(codestr, i); + h = GETJUMPTGT(codestr, i); + tgt = find_op(codestr, h); /* Replace JUMP_* to a RETURN into just a RETURN */ if (UNCONDITIONAL_JUMP(opcode) && - codestr[tgt] == RETURN_VALUE) { - codestr[i] = RETURN_VALUE; - memset(codestr+i+1, NOP, 2); - continue; + _Py_OPCODE(codestr[tgt]) == RETURN_VALUE) { + codestr[op_start] = PACKOPARG(RETURN_VALUE, 0); + fill_nops(codestr, op_start + 1, i + 1); + } else if (UNCONDITIONAL_JUMP(_Py_OPCODE(codestr[tgt]))) { + j = GETJUMPTGT(codestr, tgt); + if (opcode == JUMP_FORWARD) { /* JMP_ABS can go backwards */ + opcode = JUMP_ABSOLUTE; + } else if (!ABSOLUTE_JUMP(opcode)) { + if ((Py_ssize_t)j < i + 1) { + break; /* No backward relative jumps */ + } + j -= i + 1; /* Calc relative jump addr */ + } + j *= sizeof(_Py_CODEUNIT); + copy_op_arg(codestr, op_start, opcode, j, i + 1); } - if (!UNCONDITIONAL_JUMP(codestr[tgt])) - continue; - tgttgt = GETJUMPTGT(codestr, tgt); - if (opcode == JUMP_FORWARD) /* JMP_ABS can go backwards */ - opcode = JUMP_ABSOLUTE; - if (!ABSOLUTE_JUMP(opcode)) - tgttgt -= i + 3; /* Calc relative jump addr */ - if (tgttgt < 0) /* No backward relative jumps */ - continue; - codestr[i] = opcode; - SETARG(codestr, i, tgttgt); - break; - - case EXTENDED_ARG: - if (codestr[i+3] != MAKE_FUNCTION) - goto exitUnchanged; - /* don't visit MAKE_FUNCTION as GETARG will be wrong */ - i += 3; break; - /* Replace RETURN LOAD_CONST None RETURN with just RETURN */ - /* Remove unreachable JUMPs after RETURN */ + /* Remove unreachable ops after RETURN */ case RETURN_VALUE: - if (i+4 >= codelen) - continue; - if (codestr[i+4] == RETURN_VALUE && - ISBASICBLOCK(blocks,i,5)) - memset(codestr+i+1, NOP, 4); - else if (UNCONDITIONAL_JUMP(codestr[i+1]) && - ISBASICBLOCK(blocks,i,4)) - memset(codestr+i+1, NOP, 3); + h = i + 1; + while (h < codelen && ISBASICBLOCK(blocks, i, h)) { + h++; + } + if (h > i + 1) { + fill_nops(codestr, i + 1, h); + nexti = find_op(codestr, h); + } break; } } - /* Fixup linenotab */ - for (i=0, nops=0 ; i new code offset */ + blocks[i] = i - nops; + if (_Py_OPCODE(codestr[i]) == NOP) nops++; } - cum_orig_line = 0; - last_line = 0; + cum_orig_offset = 0; + last_offset = 0; for (i=0 ; i < tabsiz ; i+=2) { - cum_orig_line += lineno[i]; - new_line = addrmap[cum_orig_line]; - assert (new_line - last_line < 255); - lineno[i] =((unsigned char)(new_line - last_line)); - last_line = new_line; + unsigned int offset_delta, new_offset; + cum_orig_offset += lnotab[i]; + assert(cum_orig_offset % sizeof(_Py_CODEUNIT) == 0); + new_offset = blocks[cum_orig_offset / sizeof(_Py_CODEUNIT)] * + sizeof(_Py_CODEUNIT); + offset_delta = new_offset - last_offset; + assert(offset_delta <= 255); + lnotab[i] = (unsigned char)offset_delta; + last_offset = new_offset; } /* Remove NOPs and fixup jump targets */ - for (i=0, h=0 ; i nexti) + goto exitUnchanged; + /* If instrsize(j) < nexti, we'll emit EXTENDED_ARG 0 */ + write_op_arg(codestr + h, opcode, j, nexti); + h += nexti; } - assert(h + nops == codelen); + assert(h + (Py_ssize_t)nops == codelen); - code = PyBytes_FromStringAndSize((char *)codestr, h); CONST_STACK_DELETE(); - PyMem_Free(addrmap); - PyMem_Free(codestr); PyMem_Free(blocks); + code = PyBytes_FromStringAndSize((char *)codestr, h * sizeof(_Py_CODEUNIT)); + PyMem_Free(codestr); return code; exitError: code = NULL; exitUnchanged: - CONST_STACK_DELETE(); - if (blocks != NULL) - PyMem_Free(blocks); - if (addrmap != NULL) - PyMem_Free(addrmap); - if (codestr != NULL) - PyMem_Free(codestr); Py_XINCREF(code); + CONST_STACK_DELETE(); + PyMem_Free(blocks); + PyMem_Free(codestr); return code; } diff --git a/Python/pyhash.c b/Python/pyhash.c index 97cb547..57a2da7 100644 --- a/Python/pyhash.c +++ b/Python/pyhash.c @@ -318,40 +318,37 @@ static PyHash_FuncDef PyHash_Func = {fnv, "fnv", 8 * SIZEOF_PY_HASH_T, Modified for Python by Christian Heimes: - C89 / MSVC compatibility - - PY_UINT64_T, PY_UINT32_T and PY_UINT8_T - _rotl64() on Windows - letoh64() fallback */ -typedef unsigned char PY_UINT8_T; - /* byte swap little endian to host endian * Endian conversion not only ensures that the hash function returns the same * value on all platforms. It is also required to for a good dispersion of * the hash values' least significant bits. */ #if PY_LITTLE_ENDIAN -# define _le64toh(x) ((PY_UINT64_T)(x)) +# define _le64toh(x) ((uint64_t)(x)) #elif defined(__APPLE__) # define _le64toh(x) OSSwapLittleToHostInt64(x) #elif defined(HAVE_LETOH64) # define _le64toh(x) le64toh(x) #else -# define _le64toh(x) (((PY_UINT64_T)(x) << 56) | \ - (((PY_UINT64_T)(x) << 40) & 0xff000000000000ULL) | \ - (((PY_UINT64_T)(x) << 24) & 0xff0000000000ULL) | \ - (((PY_UINT64_T)(x) << 8) & 0xff00000000ULL) | \ - (((PY_UINT64_T)(x) >> 8) & 0xff000000ULL) | \ - (((PY_UINT64_T)(x) >> 24) & 0xff0000ULL) | \ - (((PY_UINT64_T)(x) >> 40) & 0xff00ULL) | \ - ((PY_UINT64_T)(x) >> 56)) +# define _le64toh(x) (((uint64_t)(x) << 56) | \ + (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \ + (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \ + (((uint64_t)(x) << 8) & 0xff00000000ULL) | \ + (((uint64_t)(x) >> 8) & 0xff000000ULL) | \ + (((uint64_t)(x) >> 24) & 0xff0000ULL) | \ + (((uint64_t)(x) >> 40) & 0xff00ULL) | \ + ((uint64_t)(x) >> 56)) #endif #ifdef _MSC_VER # define ROTATE(x, b) _rotl64(x, b) #else -# define ROTATE(x, b) (PY_UINT64_T)( ((x) << (b)) | ( (x) >> (64 - (b))) ) +# define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) #endif #define HALF_ROUND(a,b,c,d,s,t) \ @@ -369,22 +366,22 @@ typedef unsigned char PY_UINT8_T; static Py_hash_t siphash24(const void *src, Py_ssize_t src_sz) { - PY_UINT64_T k0 = _le64toh(_Py_HashSecret.siphash.k0); - PY_UINT64_T k1 = _le64toh(_Py_HashSecret.siphash.k1); - PY_UINT64_T b = (PY_UINT64_T)src_sz << 56; - const PY_UINT64_T *in = (PY_UINT64_T*)src; + uint64_t k0 = _le64toh(_Py_HashSecret.siphash.k0); + uint64_t k1 = _le64toh(_Py_HashSecret.siphash.k1); + uint64_t b = (uint64_t)src_sz << 56; + const uint64_t *in = (uint64_t*)src; - PY_UINT64_T v0 = k0 ^ 0x736f6d6570736575ULL; - PY_UINT64_T v1 = k1 ^ 0x646f72616e646f6dULL; - PY_UINT64_T v2 = k0 ^ 0x6c7967656e657261ULL; - PY_UINT64_T v3 = k1 ^ 0x7465646279746573ULL; + uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; + uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; + uint64_t v2 = k0 ^ 0x6c7967656e657261ULL; + uint64_t v3 = k1 ^ 0x7465646279746573ULL; - PY_UINT64_T t; - PY_UINT8_T *pt; - PY_UINT8_T *m; + uint64_t t; + uint8_t *pt; + uint8_t *m; while (src_sz >= 8) { - PY_UINT64_T mi = _le64toh(*in); + uint64_t mi = _le64toh(*in); in += 1; src_sz -= 8; v3 ^= mi; @@ -393,13 +390,13 @@ siphash24(const void *src, Py_ssize_t src_sz) { } t = 0; - pt = (PY_UINT8_T *)&t; - m = (PY_UINT8_T *)in; + pt = (uint8_t *)&t; + m = (uint8_t *)in; switch (src_sz) { case 7: pt[6] = m[6]; case 6: pt[5] = m[5]; case 5: pt[4] = m[4]; - case 4: Py_MEMCPY(pt, m, sizeof(PY_UINT32_T)); break; + case 4: memcpy(pt, m, sizeof(uint32_t)); break; case 3: pt[2] = m[2]; case 2: pt[1] = m[1]; case 1: pt[0] = m[0]; diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 422454c..a4f7f82 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -31,6 +31,9 @@ #ifdef MS_WINDOWS #undef BYTE #include "windows.h" + +extern PyTypeObject PyWindowsConsoleIO_Type; +#define PyWindowsConsoleIO_Check(op) (PyObject_TypeCheck((op), &PyWindowsConsoleIO_Type)) #endif _Py_IDENTIFIER(flush); @@ -85,11 +88,15 @@ int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ int Py_FrozenFlag; /* Needed by getpath.c */ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ -int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.pyc) */ +int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */ int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */ int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ int Py_IsolatedFlag = 0; /* for -I, isolate from user's env */ +#ifdef MS_WINDOWS +int Py_LegacyWindowsFSEncodingFlag = 0; /* Uses mbcs instead of utf-8 */ +int Py_LegacyWindowsStdioFlag = 0; /* Uses FileIO instead of WindowsConsoleIO */ +#endif PyThreadState *_Py_Finalizing = NULL; @@ -151,11 +158,17 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors) return -3; } } +#ifdef MS_WINDOWS + if (_Py_StandardStreamEncoding) { + /* Overriding the stream encoding implies legacy streams */ + Py_LegacyWindowsStdioFlag = 1; + } +#endif return 0; } -/* Global initializations. Can be undone by Py_Finalize(). Don't - call this twice without an intervening Py_Finalize() call. When +/* Global initializations. Can be undone by Py_FinalizeEx(). Don't + call this twice without an intervening Py_FinalizeEx() call. When initializations fail, a fatal error is issued and the function does not return. On return, the first thread and interpreter state have been created. @@ -192,7 +205,7 @@ get_codec_name(const char *encoding) if (!name) goto error; - name_utf8 = _PyUnicode_AsString(name); + name_utf8 = PyUnicode_AsUTF8(name); if (name_utf8 == NULL) goto error; name_str = _PyMem_RawStrdup(name_utf8); @@ -223,6 +236,8 @@ get_locale_encoding(void) return NULL; } return get_codec_name(codeset); +#elif defined(__ANDROID__) + return get_codec_name("UTF-8"); #else PyErr_SetNone(PyExc_NotImplementedError); return NULL; @@ -252,6 +267,11 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) interp->importlib = importlib; Py_INCREF(interp->importlib); + interp->import_func = PyDict_GetItemString(interp->builtins, "__import__"); + if (interp->import_func == NULL) + Py_FatalError("Py_Initialize: __import__ not found"); + Py_INCREF(interp->import_func); + /* Import the _imp module */ impmod = PyInit_imp(); if (impmod == NULL) { @@ -295,7 +315,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) initialized = 1; _Py_Finalizing = NULL; -#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE) +#ifdef HAVE_SETLOCALE /* Set up the LC_CTYPE locale, so we can obtain the locale's charset without having to switch locales. */ @@ -314,6 +334,12 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) check its value further. */ if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0') Py_HashRandomizationFlag = add_flag(Py_HashRandomizationFlag, p); +#ifdef MS_WINDOWS + if ((p = Py_GETENV("PYTHONLEGACYWINDOWSFSENCODING")) && *p != '\0') + Py_LegacyWindowsFSEncodingFlag = add_flag(Py_LegacyWindowsFSEncodingFlag, p); + if ((p = Py_GETENV("PYTHONLEGACYWINDOWSSTDIO")) && *p != '\0') + Py_LegacyWindowsStdioFlag = add_flag(Py_LegacyWindowsStdioFlag, p); +#endif _PyRandom_Init(); @@ -327,11 +353,11 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) (void) PyThreadState_Swap(tstate); #ifdef WITH_THREAD - /* We can't call _PyEval_FiniThreads() in Py_Finalize because + /* We can't call _PyEval_FiniThreads() in Py_FinalizeEx because destroying the GIL might fail when it is being referenced from another running thread (see issue #9901). Instead we destroy the previously created GIL here, which ensures - that we can call Py_Initialize / Py_Finalize multiple times. */ + that we can call Py_Initialize / Py_FinalizeEx multiple times. */ _PyEval_FiniThreads(); /* Auto-thread-state API */ @@ -477,28 +503,35 @@ file_is_closed(PyObject *fobj) return r > 0; } -static void +static int flush_std_files(void) { PyObject *fout = _PySys_GetObjectId(&PyId_stdout); PyObject *ferr = _PySys_GetObjectId(&PyId_stderr); PyObject *tmp; + int status = 0; if (fout != NULL && fout != Py_None && !file_is_closed(fout)) { - tmp = _PyObject_CallMethodId(fout, &PyId_flush, ""); - if (tmp == NULL) + tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL); + if (tmp == NULL) { PyErr_WriteUnraisable(fout); + status = -1; + } else Py_DECREF(tmp); } if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) { - tmp = _PyObject_CallMethodId(ferr, &PyId_flush, ""); - if (tmp == NULL) + tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL); + if (tmp == NULL) { PyErr_Clear(); + status = -1; + } else Py_DECREF(tmp); } + + return status; } /* Undo the effect of Py_Initialize(). @@ -515,14 +548,15 @@ flush_std_files(void) */ -void -Py_Finalize(void) +int +Py_FinalizeEx(void) { PyInterpreterState *interp; PyThreadState *tstate; + int status = 0; if (!initialized) - return; + return status; wait_for_thread_shutdown(); @@ -547,7 +581,9 @@ Py_Finalize(void) initialized = 0; /* Flush sys.stdout and sys.stderr */ - flush_std_files(); + if (flush_std_files() < 0) { + status = -1; + } /* Disable signal handling */ PyOS_FiniInterrupts(); @@ -564,19 +600,21 @@ Py_Finalize(void) * XXX but I'm unclear on exactly how that one happens. In any case, * XXX I haven't seen a real-life report of either of these. */ - PyGC_Collect(); + _PyGC_CollectIfEnabled(); #ifdef COUNT_ALLOCS /* With COUNT_ALLOCS, it helps to run GC multiple times: each collection might release some types from the type list, so they become garbage. */ - while (PyGC_Collect() > 0) + while (_PyGC_CollectIfEnabled() > 0) /* nothing */; #endif /* Destroy all modules */ PyImport_Cleanup(); /* Flush sys.stdout and sys.stderr (again, in case more was printed) */ - flush_std_files(); + if (flush_std_files() < 0) { + status = -1; + } /* Collect final garbage. This disposes of cycles created by * class definitions, for example. @@ -594,7 +632,7 @@ Py_Finalize(void) * XXX Python code getting called. */ #if 0 - PyGC_Collect(); + _PyGC_CollectIfEnabled(); #endif /* Disable tracemalloc after all Python objects have been destroyed, @@ -612,7 +650,7 @@ Py_Finalize(void) /* Debugging stuff */ #ifdef COUNT_ALLOCS - dump_counts(stdout); + dump_counts(stderr); #endif /* dump hash stats */ _PyHash_Fini(); @@ -655,6 +693,8 @@ Py_Finalize(void) PySlice_Fini(); _PyGC_Fini(); _PyRandom_Fini(); + _PyArg_Fini(); + PyAsyncGen_Fini(); /* Cleanup Unicode implementation */ _PyUnicode_Fini(); @@ -680,6 +720,7 @@ Py_Finalize(void) /* Delete current thread. After this, many C API calls become crashy. */ PyThreadState_Swap(NULL); + PyInterpreterState_Delete(interp); #ifdef Py_TRACE_REFS @@ -690,12 +731,22 @@ Py_Finalize(void) if (Py_GETENV("PYTHONDUMPREFS")) _Py_PrintReferenceAddresses(stderr); #endif /* Py_TRACE_REFS */ -#ifdef PYMALLOC_DEBUG - if (Py_GETENV("PYTHONMALLOCSTATS")) - _PyObject_DebugMallocStats(stderr); +#ifdef WITH_PYMALLOC + if (_PyMem_PymallocEnabled()) { + char *opt = Py_GETENV("PYTHONMALLOCSTATS"); + if (opt != NULL && *opt != '\0') + _PyObject_DebugMallocStats(stderr); + } #endif call_ll_exitfuncs(); + return status; +} + +void +Py_Finalize(void) +{ + Py_FinalizeEx(); } /* Create and initialize a new interpreter and thread, and return the @@ -721,6 +772,12 @@ Py_NewInterpreter(void) if (!initialized) Py_FatalError("Py_NewInterpreter: call Py_Initialize first"); +#ifdef WITH_THREAD + /* Issue #10915, #15751: The GIL API doesn't work with multiple + interpreters: disable PyGILState_Check(). */ + _PyGILState_check_enabled = 0; +#endif + interp = PyInterpreterState_New(); if (interp == NULL) return NULL; @@ -777,7 +834,7 @@ Py_NewInterpreter(void) if (initstdio() < 0) Py_FatalError( - "Py_Initialize: can't initialize sys standard streams"); + "Py_Initialize: can't initialize sys standard streams"); initmain(interp); if (!Py_NoSiteFlag) initsite(); @@ -803,7 +860,7 @@ handle_error: frames, and that it is its interpreter's only remaining thread. It is a fatal error to violate these constraints. - (Py_Finalize() doesn't have these constraints -- it zaps + (Py_FinalizeEx() doesn't have these constraints -- it zaps everything, regardless.) Locking: as above. @@ -881,11 +938,17 @@ Py_GetPythonHome(void) static void initmain(PyInterpreterState *interp) { - PyObject *m, *d, *loader; + PyObject *m, *d, *loader, *ann_dict; m = PyImport_AddModule("__main__"); if (m == NULL) Py_FatalError("can't create __main__ module"); d = PyModule_GetDict(m); + ann_dict = PyDict_New(); + if ((ann_dict == NULL) || + (PyDict_SetItemString(d, "__annotations__", ann_dict) < 0)) { + Py_FatalError("Failed to initialize __main__.__annotations__"); + } + Py_DECREF(ann_dict); if (PyDict_GetItemString(d, "__builtins__") == NULL) { PyObject *bimod = PyImport_ImportModule("builtins"); if (bimod == NULL) { @@ -921,6 +984,18 @@ initfsencoding(PyInterpreterState *interp) { PyObject *codec; +#ifdef MS_WINDOWS + if (Py_LegacyWindowsFSEncodingFlag) + { + Py_FileSystemDefaultEncoding = "mbcs"; + Py_FileSystemDefaultEncodeErrors = "replace"; + } + else + { + Py_FileSystemDefaultEncoding = "utf-8"; + Py_FileSystemDefaultEncodeErrors = "surrogatepass"; + } +#else if (Py_FileSystemDefaultEncoding == NULL) { Py_FileSystemDefaultEncoding = get_locale_encoding(); @@ -931,6 +1006,7 @@ initfsencoding(PyInterpreterState *interp) interp->fscodec_initialized = 1; return 0; } +#endif /* the encoding is mbcs, utf-8 or ascii */ codec = _PyCodec_Lookup(Py_FileSystemDefaultEncoding); @@ -968,31 +1044,25 @@ initsite(void) static int is_valid_fd(int fd) { -#ifdef __APPLE__ - /* bpo-30225: On macOS Tiger, when stdout is redirected to a pipe - and the other side of the pipe is closed, dup(1) succeed, whereas - fstat(1, &st) fails with EBADF. Prefer fstat() over dup() to detect - such error. */ - struct stat st; - return (fstat(fd, &st) == 0); -#else int fd2; - if (fd < 0 || !_PyVerify_fd(fd)) + if (fd < 0) return 0; _Py_BEGIN_SUPPRESS_IPH + /* Prefer dup() over fstat(). fstat() can require input/output whereas + dup() doesn't, there is a low risk of EMFILE/ENFILE at Python + startup. */ fd2 = dup(fd); if (fd2 >= 0) close(fd2); _Py_END_SUPPRESS_IPH return fd2 >= 0; -#endif } /* returns Py_None if the fd is not valid */ static PyObject* create_stdio(PyObject* io, - int fd, int write_mode, char* name, - char* encoding, char* errors) + int fd, int write_mode, const char* name, + const char* encoding, const char* errors) { PyObject *buf = NULL, *stream = NULL, *text = NULL, *raw = NULL, *res; const char* mode; @@ -1022,7 +1092,8 @@ create_stdio(PyObject* io, mode = "rb"; buf = _PyObject_CallMethodId(io, &PyId_open, "isiOOOi", fd, mode, buffering, - Py_None, Py_None, Py_None, 0); + Py_None, Py_None, /* encoding, errors */ + Py_None, 0); /* newline, closefd */ if (buf == NULL) goto error; @@ -1037,10 +1108,16 @@ create_stdio(PyObject* io, Py_INCREF(raw); } +#ifdef MS_WINDOWS + /* Windows console IO is always UTF-8 encoded */ + if (PyWindowsConsoleIO_Check(raw)) + encoding = "utf-8"; +#endif + text = PyUnicode_FromString(name); if (text == NULL || _PyObject_SetAttrId(raw, &PyId_name, text) < 0) goto error; - res = _PyObject_CallMethodId(raw, &PyId_isatty, ""); + res = _PyObject_CallMethodId(raw, &PyId_isatty, NULL); if (res == NULL) goto error; isatty = PyObject_IsTrue(res); @@ -1208,7 +1285,7 @@ initstdio(void) encoding_attr = PyObject_GetAttrString(std, "encoding"); if (encoding_attr != NULL) { const char * std_encoding; - std_encoding = _PyUnicode_AsString(encoding_attr); + std_encoding = PyUnicode_AsUTF8(encoding_attr); if (std_encoding != NULL) { PyObject *codec_info = _PyCodec_Lookup(std_encoding); Py_XDECREF(codec_info); @@ -1252,25 +1329,11 @@ initstdio(void) static void _Py_FatalError_DumpTracebacks(int fd) { - PyThreadState *tstate; - -#ifdef WITH_THREAD - /* PyGILState_GetThisThreadState() works even if the GIL was released */ - tstate = PyGILState_GetThisThreadState(); -#else - tstate = PyThreadState_GET(); -#endif - if (tstate == NULL) { - /* _Py_DumpTracebackThreads() requires the thread state to display - * frames */ - return; - } - fputc('\n', stderr); fflush(stderr); /* display the current Python stack */ - _Py_DumpTracebackThreads(fd, tstate->interp, tstate); + _Py_DumpTracebackThreads(fd, NULL, NULL); } /* Print the current exception (if an exception is set) with its traceback, @@ -1325,7 +1388,7 @@ _Py_FatalError_PrintExc(int fd) Py_XDECREF(tb); /* sys.stderr may be buffered: call sys.stderr.flush() */ - res = _PyObject_CallMethodId(ferr, &PyId_flush, ""); + res = _PyObject_CallMethodId(ferr, &PyId_flush, NULL); if (res == NULL) PyErr_Clear(); else @@ -1397,7 +1460,7 @@ exit: /* Clean up and exit */ #ifdef WITH_THREAD -#include "pythread.h" +# include "pythread.h" #endif static void (*pyexitfunc)(void) = NULL; @@ -1435,7 +1498,7 @@ wait_for_thread_shutdown(void) PyErr_Clear(); return; } - result = _PyObject_CallMethodId(threading, &PyId__shutdown, ""); + result = _PyObject_CallMethodId(threading, &PyId__shutdown, NULL); if (result == NULL) { PyErr_WriteUnraisable(threading); } @@ -1471,7 +1534,9 @@ call_ll_exitfuncs(void) void Py_Exit(int sts) { - Py_Finalize(); + if (Py_FinalizeEx() < 0) { + sts = 120; + } exit(sts); } diff --git a/Python/pystate.c b/Python/pystate.c index 24e20c3..65c244e 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -6,7 +6,7 @@ #define GET_TSTATE() \ ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) #define SET_TSTATE(value) \ - _Py_atomic_store_relaxed(&_PyThreadState_Current, (Py_uintptr_t)(value)) + _Py_atomic_store_relaxed(&_PyThreadState_Current, (uintptr_t)(value)) #define GET_INTERP_STATE() \ (GET_TSTATE()->interp) @@ -25,7 +25,7 @@ to avoid the expense of doing their own locking). #ifdef HAVE_DLFCN_H #include #endif -#ifndef RTLD_LAZY +#if !HAVE_DECL_RTLD_LAZY #define RTLD_LAZY 1 #endif #endif @@ -34,6 +34,8 @@ to avoid the expense of doing their own locking). extern "C" { #endif +int _PyGILState_check_enabled = 1; + #ifdef WITH_THREAD #include "pythread.h" static PyThread_type_lock head_mutex = NULL; /* Protects interp->tstate_head */ @@ -45,7 +47,7 @@ static PyThread_type_lock head_mutex = NULL; /* Protects interp->tstate_head */ GILState implementation */ static PyInterpreterState *autoInterpreterState = NULL; -static int autoTLSkey = 0; +static int autoTLSkey = -1; #else #define HEAD_INIT() /* Nothing */ #define HEAD_LOCK() /* Nothing */ @@ -88,16 +90,15 @@ PyInterpreterState_New(void) interp->codecs_initialized = 0; interp->fscodec_initialized = 0; interp->importlib = NULL; + interp->import_func = NULL; + interp->eval_frame = _PyEval_EvalFrameDefault; #ifdef HAVE_DLOPEN -#ifdef RTLD_NOW +#if HAVE_DECL_RTLD_NOW interp->dlopenflags = RTLD_NOW; #else interp->dlopenflags = RTLD_LAZY; #endif #endif -#ifdef WITH_TSC - interp->tscdump = 0; -#endif HEAD_LOCK(); interp->next = interp_head; @@ -126,6 +127,7 @@ PyInterpreterState_Clear(PyInterpreterState *interp) Py_CLEAR(interp->builtins); Py_CLEAR(interp->builtins_copy); Py_CLEAR(interp->importlib); + Py_CLEAR(interp->import_func); } @@ -222,6 +224,10 @@ new_threadstate(PyInterpreterState *interp, int init) tstate->coroutine_wrapper = NULL; tstate->in_coroutine_wrapper = 0; + tstate->co_extra_user_count = 0; + + tstate->async_gen_firstiter = NULL; + tstate->async_gen_finalizer = NULL; if (init) _PyThreadState_Init(tstate); @@ -402,6 +408,8 @@ PyThreadState_Clear(PyThreadState *tstate) Py_CLEAR(tstate->c_traceobj); Py_CLEAR(tstate->coroutine_wrapper); + Py_CLEAR(tstate->async_gen_firstiter); + Py_CLEAR(tstate->async_gen_finalizer); } @@ -451,10 +459,10 @@ PyThreadState_DeleteCurrent() if (tstate == NULL) Py_FatalError( "PyThreadState_DeleteCurrent: no current tstate"); - SET_TSTATE(NULL); + tstate_delete_common(tstate); if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) PyThread_delete_key_value(autoTLSkey); - tstate_delete_common(tstate); + SET_TSTATE(NULL); PyEval_ReleaseLock(); } #endif /* WITH_THREAD */ @@ -698,7 +706,7 @@ PyThreadState_IsCurrent(PyThreadState *tstate) } /* Internal initialization/finalization functions called by - Py_Initialize/Py_Finalize + Py_Initialize/Py_FinalizeEx */ void _PyGILState_Init(PyInterpreterState *i, PyThreadState *t) @@ -714,10 +722,17 @@ _PyGILState_Init(PyInterpreterState *i, PyThreadState *t) _PyGILState_NoteThreadState(t); } +PyInterpreterState * +_PyGILState_GetInterpreterStateUnsafe(void) +{ + return autoInterpreterState; +} + void _PyGILState_Fini(void) { PyThread_delete_key(autoTLSkey); + autoTLSkey = -1; autoInterpreterState = NULL; } @@ -786,8 +801,19 @@ PyGILState_GetThisThreadState(void) int PyGILState_Check(void) { - PyThreadState *tstate = GET_TSTATE(); - return tstate && (tstate == PyGILState_GetThisThreadState()); + PyThreadState *tstate; + + if (!_PyGILState_check_enabled) + return 1; + + if (autoTLSkey == -1) + return 1; + + tstate = GET_TSTATE(); + if (tstate == NULL) + return 0; + + return (tstate == PyGILState_GetThisThreadState()); } PyGILState_STATE diff --git a/Python/pystrtod.c b/Python/pystrtod.c index 209c908..64d0c52 100644 --- a/Python/pystrtod.c +++ b/Python/pystrtod.c @@ -370,6 +370,72 @@ PyOS_string_to_double(const char *s, return result; } +/* Remove underscores that follow the underscore placement rule from + the string and then call the `innerfunc` function on the result. + It should return a new object or NULL on exception. + + `what` is used for the error message emitted when underscores are detected + that don't follow the rule. `arg` is an opaque pointer passed to the inner + function. + + This is used to implement underscore-agnostic conversion for floats + and complex numbers. +*/ +PyObject * +_Py_string_to_number_with_underscores( + const char *s, Py_ssize_t orig_len, const char *what, PyObject *obj, void *arg, + PyObject *(*innerfunc)(const char *, Py_ssize_t, void *)) +{ + char prev; + const char *p, *last; + char *dup, *end; + PyObject *result; + + if (strchr(s, '_') == NULL) { + return innerfunc(s, orig_len, arg); + } + + dup = PyMem_Malloc(orig_len + 1); + end = dup; + prev = '\0'; + last = s + orig_len; + for (p = s; *p; p++) { + if (*p == '_') { + /* Underscores are only allowed after digits. */ + if (!(prev >= '0' && prev <= '9')) { + goto error; + } + } + else { + *end++ = *p; + /* Underscores are only allowed before digits. */ + if (prev == '_' && !(*p >= '0' && *p <= '9')) { + goto error; + } + } + prev = *p; + } + /* Underscores are not allowed at the end. */ + if (prev == '_') { + goto error; + } + /* No embedded NULs allowed. */ + if (p != last) { + goto error; + } + *end = '\0'; + result = innerfunc(dup, end - dup, arg); + PyMem_Free(dup); + return result; + + error: + PyMem_Free(dup); + PyErr_Format(PyExc_ValueError, + "could not convert string to %s: " + "%R", what, obj); + return NULL; +} + #ifdef PY_NO_SHORT_FLOAT_REPR /* Given a string that may have a decimal point in the current @@ -881,12 +947,12 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val, #define OFS_E 2 /* The lengths of these are known to the code below, so don't change them */ -static char *lc_float_strings[] = { +static const char * const lc_float_strings[] = { "inf", "nan", "e", }; -static char *uc_float_strings[] = { +static const char * const uc_float_strings[] = { "INF", "NAN", "E", @@ -925,7 +991,8 @@ static char * format_float_short(double d, char format_code, int mode, int precision, int always_add_sign, int add_dot_0_if_integer, - int use_alt_formatting, char **float_strings, int *type) + int use_alt_formatting, const char * const *float_strings, + int *type) { char *buf = NULL; char *p = NULL; @@ -1176,7 +1243,7 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val, int flags, int *type) { - char **float_strings = lc_float_strings; + const char * const *float_strings = lc_float_strings; int mode; /* Validate format_code, and map upper and lower case. Compute the diff --git a/Python/pythonrun.c b/Python/pythonrun.c index dd41a3a..c881f90 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -171,7 +171,7 @@ PyRun_InteractiveOneObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags) if (v && v != Py_None) { oenc = _PyObject_GetAttrId(v, &PyId_encoding); if (oenc) - enc = _PyUnicode_AsString(oenc); + enc = PyUnicode_AsUTF8(oenc); if (!enc) PyErr_Clear(); } @@ -182,7 +182,7 @@ PyRun_InteractiveOneObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags) if (v == NULL) PyErr_Clear(); else if (PyUnicode_Check(v)) { - ps1 = _PyUnicode_AsString(v); + ps1 = PyUnicode_AsUTF8(v); if (ps1 == NULL) { PyErr_Clear(); ps1 = ""; @@ -195,7 +195,7 @@ PyRun_InteractiveOneObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags) if (w == NULL) PyErr_Clear(); else if (PyUnicode_Check(w)) { - ps2 = _PyUnicode_AsString(w); + ps2 = PyUnicode_AsUTF8(w); if (ps2 == NULL) { PyErr_Clear(); ps2 = ""; @@ -259,21 +259,6 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename_str, PyCompilerFlags *f } -/* Issue #29537: handle issue27286 bytecode incompatibility - * See Lib/importlib/_bootstrap_external.py for general discussion - */ -extern PY_UINT32_T _Py_BACKCOMPAT_HALF_MAGIC; -static int -_check_half_magic(unsigned int read_value, unsigned int halfmagic) { - return (read_value == halfmagic || read_value == _Py_BACKCOMPAT_HALF_MAGIC); -} - -extern PY_UINT32_T _Py_BACKCOMPAT_MAGIC_NUMBER; -static int -_check_magic(long read_value, long magic) { - return (read_value == magic || read_value == _Py_BACKCOMPAT_MAGIC_NUMBER); -} - /* Check whether a file maybe a pyc file: Look at the extension, the file type, and, if we may close it, at the first few bytes. */ @@ -305,7 +290,7 @@ maybe_pyc_file(FILE *fp, const char* filename, const char* ext, int closeit) int ispyc = 0; if (ftell(fp) == 0) { if (fread(buf, 1, 2, fp) == 2 && - _check_half_magic(((unsigned int)buf[1]<<8 | buf[0]), halfmagic)) + ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic) ispyc = 1; rewind(fp); } @@ -446,7 +431,7 @@ static int parse_syntax_error(PyObject *err, PyObject **message, PyObject **filename, int *lineno, int *offset, PyObject **text) { - long hold; + int hold; PyObject *v; _Py_IDENTIFIER(msg); _Py_IDENTIFIER(filename); @@ -479,11 +464,11 @@ parse_syntax_error(PyObject *err, PyObject **message, PyObject **filename, v = _PyObject_GetAttrId(err, &PyId_lineno); if (!v) goto finally; - hold = PyLong_AsLong(v); + hold = _PyLong_AsInt(v); Py_DECREF(v); if (hold < 0 && PyErr_Occurred()) goto finally; - *lineno = (int)hold; + *lineno = hold; v = _PyObject_GetAttrId(err, &PyId_offset); if (!v) @@ -492,11 +477,11 @@ parse_syntax_error(PyObject *err, PyObject **message, PyObject **filename, *offset = -1; Py_DECREF(v); } else { - hold = PyLong_AsLong(v); + hold = _PyLong_AsInt(v); Py_DECREF(v); if (hold < 0 && PyErr_Occurred()) goto finally; - *offset = (int)hold; + *offset = hold; } v = _PyObject_GetAttrId(err, &PyId_text); @@ -529,7 +514,7 @@ print_error_text(PyObject *f, int offset, PyObject *text_obj) char *text; char *nl; - text = _PyUnicode_AsString(text_obj); + text = PyUnicode_AsUTF8(text_obj); if (text == NULL) return; @@ -543,7 +528,7 @@ print_error_text(PyObject *f, int offset, PyObject *text_obj) offset -= (int)(nl+1-text); text = nl+1; } - while (*text == ' ' || *text == '\t' || *text == '\f') { + while (*text == ' ' || *text == '\t') { text++; offset--; } @@ -645,8 +630,13 @@ PyErr_PrintEx(int set_sys_last_vars) } hook = _PySys_GetObjectId(&PyId_excepthook); if (hook) { - PyObject *args = PyTuple_Pack(3, exception, v, tb); - PyObject *result = PyEval_CallObject(hook, args); + PyObject* stack[3]; + PyObject *result; + + stack[0] = exception; + stack[1] = v; + stack[2] = tb; + result = _PyObject_FastCall(hook, stack, 3); if (result == NULL) { PyObject *exception2, *v2, *tb2; if (PyErr_ExceptionMatches(PyExc_SystemExit)) { @@ -675,7 +665,6 @@ PyErr_PrintEx(int set_sys_last_vars) Py_XDECREF(tb2); } Py_XDECREF(result); - Py_XDECREF(args); } else { PySys_WriteStderr("sys.excepthook is missing\n"); PyErr_Display(exception, v, tb); @@ -806,11 +795,11 @@ print_exception(PyObject *f, PyObject *value) PyErr_Clear(); } -static const char *cause_message = +static const char cause_message[] = "\nThe above exception was the direct cause " "of the following exception:\n\n"; -static const char *context_message = +static const char context_message[] = "\nDuring handling of the above exception, " "another exception occurred:\n\n"; @@ -961,7 +950,7 @@ flush_io(void) f = _PySys_GetObjectId(&PyId_stderr); if (f != NULL) { - r = _PyObject_CallMethodId(f, &PyId_flush, ""); + r = _PyObject_CallMethodId(f, &PyId_flush, NULL); if (r) Py_DECREF(r); else @@ -969,7 +958,7 @@ flush_io(void) } f = _PySys_GetObjectId(&PyId_stdout); if (f != NULL) { - r = _PyObject_CallMethodId(f, &PyId_flush, ""); + r = _PyObject_CallMethodId(f, &PyId_flush, NULL); if (r) Py_DECREF(r); else @@ -1003,7 +992,7 @@ run_pyc_file(FILE *fp, const char *filename, PyObject *globals, long PyImport_GetMagicNumber(void); magic = PyMarshal_ReadLongFromFile(fp); - if (!_check_magic(magic, PyImport_GetMagicNumber())) { + if (magic != PyImport_GetMagicNumber()) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_RuntimeError, "Bad magic number in .pyc file"); @@ -1159,8 +1148,8 @@ PyParser_ASTFromString(const char *s, const char *filename_str, int start, mod_ty PyParser_ASTFromFileObject(FILE *fp, PyObject *filename, const char* enc, - int start, char *ps1, - char *ps2, PyCompilerFlags *flags, int *errcode, + int start, const char *ps1, + const char *ps2, PyCompilerFlags *flags, int *errcode, PyArena *arena) { mod_ty mod; @@ -1192,8 +1181,8 @@ PyParser_ASTFromFileObject(FILE *fp, PyObject *filename, const char* enc, mod_ty PyParser_ASTFromFile(FILE *fp, const char *filename_str, const char* enc, - int start, char *ps1, - char *ps2, PyCompilerFlags *flags, int *errcode, + int start, const char *ps1, + const char *ps2, PyCompilerFlags *flags, int *errcode, PyArena *arena) { mod_ty mod; diff --git a/Python/pytime.c b/Python/pytime.c index 7f65824..3015a6b 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -7,6 +7,11 @@ #include /* mach_absolute_time(), mach_timebase_info() */ #endif +#define _PyTime_check_mul_overflow(a, b) \ + (assert(b > 0), \ + (_PyTime_t)(a) < _PyTime_MIN / (_PyTime_t)(b) \ + || _PyTime_MAX / (_PyTime_t)(b) < (_PyTime_t)(a)) + /* To millisecond (10^-3) */ #define SEC_TO_MS 1000 @@ -33,12 +38,12 @@ error_time_t_overflow(void) time_t _PyLong_AsTime_t(PyObject *obj) { -#if defined(HAVE_LONG_LONG) && SIZEOF_TIME_T == SIZEOF_LONG_LONG - PY_LONG_LONG val; +#if SIZEOF_TIME_T == SIZEOF_LONG_LONG + long long val; val = PyLong_AsLongLong(obj); #else long val; - assert(sizeof(time_t) <= sizeof(long)); + Py_BUILD_ASSERT(sizeof(time_t) <= sizeof(long)); val = PyLong_AsLong(obj); #endif if (val == -1 && PyErr_Occurred()) { @@ -52,58 +57,91 @@ _PyLong_AsTime_t(PyObject *obj) PyObject * _PyLong_FromTime_t(time_t t) { -#if defined(HAVE_LONG_LONG) && SIZEOF_TIME_T == SIZEOF_LONG_LONG - return PyLong_FromLongLong((PY_LONG_LONG)t); +#if SIZEOF_TIME_T == SIZEOF_LONG_LONG + return PyLong_FromLongLong((long long)t); #else - assert(sizeof(time_t) <= sizeof(long)); + Py_BUILD_ASSERT(sizeof(time_t) <= sizeof(long)); return PyLong_FromLong((long)t); #endif } +/* Round to nearest with ties going to nearest even integer + (_PyTime_ROUND_HALF_EVEN) */ +static double +_PyTime_RoundHalfEven(double x) +{ + double rounded = round(x); + if (fabs(x-rounded) == 0.5) + /* halfway case: round to even */ + rounded = 2.0*round(x/2.0); + return rounded; +} + +static double +_PyTime_Round(double x, _PyTime_round_t round) +{ + /* volatile avoids optimization changing how numbers are rounded */ + volatile double d; + + d = x; + if (round == _PyTime_ROUND_HALF_EVEN) + d = _PyTime_RoundHalfEven(d); + else if (round == _PyTime_ROUND_CEILING) + d = ceil(d); + else + d = floor(d); + return d; +} + static int -_PyTime_ObjectToDenominator(PyObject *obj, time_t *sec, long *numerator, +_PyTime_DoubleToDenominator(double d, time_t *sec, long *numerator, double denominator, _PyTime_round_t round) { - assert(denominator <= LONG_MAX); - if (PyFloat_Check(obj)) { - double d, intpart, err; - /* volatile avoids unsafe optimization on float enabled by gcc -O3 */ - volatile double floatpart; + double intpart, err; + /* volatile avoids optimization changing how numbers are rounded */ + volatile double floatpart; - d = PyFloat_AsDouble(obj); - floatpart = modf(d, &intpart); - if (floatpart < 0) { - floatpart = 1.0 + floatpart; - intpart -= 1.0; - } + floatpart = modf(d, &intpart); - floatpart *= denominator; - if (round == _PyTime_ROUND_CEILING) { - floatpart = ceil(floatpart); - if (floatpart >= denominator) { - floatpart = 0.0; - intpart += 1.0; - } - } - else { - floatpart = floor(floatpart); - } + floatpart *= denominator; + floatpart = _PyTime_Round(floatpart, round); + if (floatpart >= denominator) { + floatpart -= denominator; + intpart += 1.0; + } + else if (floatpart < 0) { + floatpart += denominator; + intpart -= 1.0; + } + assert(0.0 <= floatpart && floatpart < denominator); - *sec = (time_t)intpart; - err = intpart - (double)*sec; - if (err <= -1.0 || err >= 1.0) { - error_time_t_overflow(); - return -1; - } + *sec = (time_t)intpart; + *numerator = (long)floatpart; - *numerator = (long)floatpart; - return 0; + err = intpart - (double)*sec; + if (err <= -1.0 || err >= 1.0) { + error_time_t_overflow(); + return -1; + } + return 0; +} + +static int +_PyTime_ObjectToDenominator(PyObject *obj, time_t *sec, long *numerator, + double denominator, _PyTime_round_t round) +{ + assert(denominator <= (double)LONG_MAX); + + if (PyFloat_Check(obj)) { + double d = PyFloat_AsDouble(obj); + return _PyTime_DoubleToDenominator(d, sec, numerator, + denominator, round); } else { *sec = _PyLong_AsTime_t(obj); + *numerator = 0; if (*sec == (time_t)-1 && PyErr_Occurred()) return -1; - *numerator = 0; return 0; } } @@ -112,13 +150,12 @@ int _PyTime_ObjectToTime_t(PyObject *obj, time_t *sec, _PyTime_round_t round) { if (PyFloat_Check(obj)) { - double d, intpart, err; + double intpart, err; + /* volatile avoids optimization changing how numbers are rounded */ + volatile double d; d = PyFloat_AsDouble(obj); - if (round == _PyTime_ROUND_CEILING) - d = ceil(d); - else - d = floor(d); + d = _PyTime_Round(d, round); (void)modf(d, &intpart); *sec = (time_t)intpart; @@ -141,14 +178,20 @@ int _PyTime_ObjectToTimespec(PyObject *obj, time_t *sec, long *nsec, _PyTime_round_t round) { - return _PyTime_ObjectToDenominator(obj, sec, nsec, 1e9, round); + int res; + res = _PyTime_ObjectToDenominator(obj, sec, nsec, 1e9, round); + assert(0 <= *nsec && *nsec < SEC_TO_NS); + return res; } int _PyTime_ObjectToTimeval(PyObject *obj, time_t *sec, long *usec, _PyTime_round_t round) { - return _PyTime_ObjectToDenominator(obj, sec, usec, 1e6, round); + int res; + res = _PyTime_ObjectToDenominator(obj, sec, usec, 1e6, round); + assert(0 <= *usec && *usec < SEC_TO_US); + return res; } static void @@ -162,21 +205,24 @@ _PyTime_t _PyTime_FromSeconds(int seconds) { _PyTime_t t; + t = (_PyTime_t)seconds; /* ensure that integer overflow cannot happen, int type should have 32 bits, whereas _PyTime_t type has at least 64 bits (SEC_TO_MS takes 30 bits). */ - assert((seconds >= 0 && seconds <= _PyTime_MAX / SEC_TO_NS) - || (seconds < 0 && seconds >= _PyTime_MIN / SEC_TO_NS)); - t = (_PyTime_t)seconds * SEC_TO_NS; + Py_BUILD_ASSERT(INT_MAX <= _PyTime_MAX / SEC_TO_NS); + Py_BUILD_ASSERT(INT_MIN >= _PyTime_MIN / SEC_TO_NS); + assert((t >= 0 && t <= _PyTime_MAX / SEC_TO_NS) + || (t < 0 && t >= _PyTime_MIN / SEC_TO_NS)); + t *= SEC_TO_NS; return t; } _PyTime_t -_PyTime_FromNanoseconds(PY_LONG_LONG ns) +_PyTime_FromNanoseconds(long long ns) { _PyTime_t t; - assert(sizeof(PY_LONG_LONG) <= sizeof(_PyTime_t)); - t = Py_SAFE_DOWNCAST(ns, PY_LONG_LONG, _PyTime_t); + Py_BUILD_ASSERT(sizeof(long long) <= sizeof(_PyTime_t)); + t = Py_SAFE_DOWNCAST(ns, long long, _PyTime_t); return t; } @@ -187,12 +233,15 @@ _PyTime_FromTimespec(_PyTime_t *tp, struct timespec *ts, int raise) _PyTime_t t; int res = 0; - t = (_PyTime_t)ts->tv_sec * SEC_TO_NS; - if (t / SEC_TO_NS != ts->tv_sec) { + Py_BUILD_ASSERT(sizeof(ts->tv_sec) <= sizeof(_PyTime_t)); + t = (_PyTime_t)ts->tv_sec; + + if (_PyTime_check_mul_overflow(t, SEC_TO_NS)) { if (raise) _PyTime_overflow(); res = -1; } + t = t * SEC_TO_NS; t += ts->tv_nsec; @@ -206,12 +255,15 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise) _PyTime_t t; int res = 0; - t = (_PyTime_t)tv->tv_sec * SEC_TO_NS; - if (t / SEC_TO_NS != tv->tv_sec) { + Py_BUILD_ASSERT(sizeof(tv->tv_sec) <= sizeof(_PyTime_t)); + t = (_PyTime_t)tv->tv_sec; + + if (_PyTime_check_mul_overflow(t, SEC_TO_NS)) { if (raise) _PyTime_overflow(); res = -1; } + t = t * SEC_TO_NS; t += (_PyTime_t)tv->tv_usec * US_TO_NS; @@ -221,50 +273,52 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise) #endif static int -_PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round, - long to_nanoseconds) +_PyTime_FromFloatObject(_PyTime_t *t, double value, _PyTime_round_t round, + long unit_to_ns) { - if (PyFloat_Check(obj)) { - /* volatile avoids unsafe optimization on float enabled by gcc -O3 */ - volatile double d, err; + double err; + /* volatile avoids optimization changing how numbers are rounded */ + volatile double d; - /* convert to a number of nanoseconds */ - d = PyFloat_AsDouble(obj); - d *= to_nanoseconds; + /* convert to a number of nanoseconds */ + d = value; + d *= (double)unit_to_ns; + d = _PyTime_Round(d, round); - if (round == _PyTime_ROUND_CEILING) - d = ceil(d); - else - d = floor(d); + *t = (_PyTime_t)d; + err = d - (double)*t; + if (fabs(err) >= 1.0) { + _PyTime_overflow(); + return -1; + } + return 0; +} - *t = (_PyTime_t)d; - err = d - (double)*t; - if (fabs(err) >= 1.0) { - _PyTime_overflow(); - return -1; - } - return 0; +static int +_PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round, + long unit_to_ns) +{ + if (PyFloat_Check(obj)) { + double d; + d = PyFloat_AsDouble(obj); + return _PyTime_FromFloatObject(t, d, round, unit_to_ns); } else { -#ifdef HAVE_LONG_LONG - PY_LONG_LONG sec; + long long sec; + Py_BUILD_ASSERT(sizeof(long long) <= sizeof(_PyTime_t)); + sec = PyLong_AsLongLong(obj); - assert(sizeof(PY_LONG_LONG) <= sizeof(_PyTime_t)); -#else - long sec; - sec = PyLong_AsLong(obj); - assert(sizeof(PY_LONG_LONG) <= sizeof(_PyTime_t)); -#endif if (sec == -1 && PyErr_Occurred()) { if (PyErr_ExceptionMatches(PyExc_OverflowError)) _PyTime_overflow(); return -1; } - *t = sec * to_nanoseconds; - if (*t / to_nanoseconds != sec) { + + if (_PyTime_check_mul_overflow(sec, unit_to_ns)) { _PyTime_overflow(); return -1; } + *t = sec * unit_to_ns; return 0; } } @@ -284,24 +338,28 @@ _PyTime_FromMillisecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t roun double _PyTime_AsSecondsDouble(_PyTime_t t) { - _PyTime_t sec, ns; - /* Divide using integers to avoid rounding issues on the integer part. - 1e-9 cannot be stored exactly in IEEE 64-bit. */ - sec = t / SEC_TO_NS; - ns = t % SEC_TO_NS; - return (double)sec + (double)ns * 1e-9; + /* volatile avoids optimization changing how numbers are rounded */ + volatile double d; + + if (t % SEC_TO_NS == 0) { + _PyTime_t secs; + /* Divide using integers to avoid rounding issues on the integer part. + 1e-9 cannot be stored exactly in IEEE 64-bit. */ + secs = t / SEC_TO_NS; + d = (double)secs; + } + else { + d = (double)t; + d /= 1e9; + } + return d; } PyObject * _PyTime_AsNanosecondsObject(_PyTime_t t) { -#ifdef HAVE_LONG_LONG - assert(sizeof(PY_LONG_LONG) >= sizeof(_PyTime_t)); - return PyLong_FromLongLong((PY_LONG_LONG)t); -#else - assert(sizeof(long) >= sizeof(_PyTime_t)); - return PyLong_FromLong((long)t); -#endif + Py_BUILD_ASSERT(sizeof(long long) >= sizeof(_PyTime_t)); + return PyLong_FromLongLong((long long)t); } static _PyTime_t @@ -309,7 +367,20 @@ _PyTime_Divide(const _PyTime_t t, const _PyTime_t k, const _PyTime_round_t round) { assert(k > 1); - if (round == _PyTime_ROUND_CEILING) { + if (round == _PyTime_ROUND_HALF_EVEN) { + _PyTime_t x, r, abs_r; + x = t / k; + r = t % k; + abs_r = Py_ABS(r); + if (abs_r > k / 2 || (abs_r == k / 2 && (Py_ABS(x) & 1))) { + if (t >= 0) + x++; + else + x--; + } + return x; + } + else if (round == _PyTime_ROUND_CEILING) { if (t >= 0) return (t + k - 1) / k; else @@ -373,7 +444,7 @@ static int _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, _PyTime_round_t round, int raise) { - _PyTime_t secs; + _PyTime_t secs, secs2; int us; int res; @@ -386,7 +457,8 @@ _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, #endif tv->tv_usec = us; - if (res < 0 || (_PyTime_t)tv->tv_sec != secs) { + secs2 = (_PyTime_t)tv->tv_sec; + if (res < 0 || secs2 != secs) { if (raise) error_time_t_overflow(); return -1; @@ -424,6 +496,7 @@ _PyTime_AsTimevalTime_t(_PyTime_t t, time_t *p_secs, int *us, return 0; } + #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE) int _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts) @@ -437,13 +510,13 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts) secs -= 1; } ts->tv_sec = (time_t)secs; + assert(0 <= nsec && nsec < SEC_TO_NS); + ts->tv_nsec = nsec; + if ((_PyTime_t)ts->tv_sec != secs) { - _PyTime_overflow(); + error_time_t_overflow(); return -1; } - ts->tv_nsec = nsec; - - assert(0 <= ts->tv_nsec && ts->tv_nsec <= 999999999); return 0; } #endif @@ -557,19 +630,20 @@ _PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info) return pygettimeofday(t, info, 1); } - static int pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise) { #if defined(MS_WINDOWS) - ULONGLONG result; + ULONGLONG ticks; + _PyTime_t t; assert(info == NULL || raise); - result = GetTickCount64(); + ticks = GetTickCount64(); + Py_BUILD_ASSERT(sizeof(ticks) <= sizeof(_PyTime_t)); + t = (_PyTime_t)ticks; - *tp = result * MS_TO_NS; - if (*tp / MS_TO_NS != result) { + if (_PyTime_check_mul_overflow(t, MS_TO_NS)) { if (raise) { _PyTime_overflow(); return -1; @@ -577,6 +651,7 @@ pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise) /* Hello, time traveler! */ assert(0); } + *tp = t * MS_TO_NS; if (info) { DWORD timeAdjustment, timeIncrement; @@ -689,8 +764,57 @@ _PyTime_Init(void) if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) < 0) return -1; - /* check that _PyTime_FromSeconds() cannot overflow */ - assert(INT_MAX <= _PyTime_MAX / SEC_TO_NS); - assert(INT_MIN >= _PyTime_MIN / SEC_TO_NS); return 0; } + +int +_PyTime_localtime(time_t t, struct tm *tm) +{ +#ifdef MS_WINDOWS + int error; + + error = localtime_s(tm, &t); + if (error != 0) { + errno = error; + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#else /* !MS_WINDOWS */ + if (localtime_r(&t, tm) == NULL) { +#ifdef EINVAL + if (errno == 0) + errno = EINVAL; +#endif + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#endif /* MS_WINDOWS */ +} + +int +_PyTime_gmtime(time_t t, struct tm *tm) +{ +#ifdef MS_WINDOWS + int error; + + error = gmtime_s(tm, &t); + if (error != 0) { + errno = error; + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#else /* !MS_WINDOWS */ + if (gmtime_r(&t, tm) == NULL) { +#ifdef EINVAL + if (errno == 0) + errno = EINVAL; +#endif + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + return 0; +#endif /* MS_WINDOWS */ +} diff --git a/Python/random.c b/Python/random.c index 31f61d0..46e3bb5 100644 --- a/Python/random.c +++ b/Python/random.c @@ -12,7 +12,7 @@ # ifdef HAVE_LINUX_RANDOM_H # include # endif -# if defined(HAVE_SYS_RANDOM_H) && (defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY)) +# if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY) # include # endif # if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL) @@ -77,37 +77,65 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) return 0; } -#else /* !MS_WINDOWS */ +/* Issue #25003: Don't use getentropy() on Solaris (available since + * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ +#elif defined(HAVE_GETENTROPY) && !defined(sun) +#define PY_GETENTROPY 1 + +/* Fill buffer with size pseudo-random bytes generated by getentropy(). + Return 0 on success, or raise an exception and return -1 on error. + + If raise is zero, don't raise an exception on error. */ +static int +py_getentropy(char *buffer, Py_ssize_t size, int raise) +{ + while (size > 0) { + Py_ssize_t len = Py_MIN(size, 256); + int res; + + if (raise) { + Py_BEGIN_ALLOW_THREADS + res = getentropy(buffer, len); + Py_END_ALLOW_THREADS + } + else { + res = getentropy(buffer, len); + } + + if (res < 0) { + if (raise) { + PyErr_SetFromErrno(PyExc_OSError); + } + return -1; + } + + buffer += len; + size -= len; + } + return 0; +} + +#else #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) #define PY_GETRANDOM 1 -/* Call getrandom() to get random bytes: - +/* Call getrandom() - Return 1 on success - - Return 0 if getrandom() is not available (failed with ENOSYS or EPERM), - or if getrandom(GRND_NONBLOCK) failed with EAGAIN (system urandom not - initialized yet). + - Return 0 if getrandom() syscall is not available (failed with ENOSYS or + EPERM) or if getrandom(GRND_NONBLOCK) failed with EAGAIN (system urandom + not initialized yet) and raise=0. - Raise an exception (if raise is non-zero) and return -1 on error: - if getrandom() failed with EINTR, raise is non-zero and the Python signal - handler raised an exception, or if getrandom() failed with a different - error. - - getrandom() is retried if it failed with EINTR: interrupted by a signal. */ + getrandom() failed with EINTR and the Python signal handler raised an + exception, or getrandom() failed with a different error. */ static int -py_getrandom(void *buffer, Py_ssize_t size, int raise) +py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise) { /* Is getrandom() supported by the running kernel? Set to 0 if getrandom() failed with ENOSYS or EPERM. Need Linux kernel 3.17 or newer, or Solaris 11.3 or newer */ static int getrandom_works = 1; - - /* getrandom() on Linux will block if called before the kernel has - * initialized the urandom entropy pool. This will cause Python - * to hang on startup if called very early in the boot process - - * see https://bugs.python.org/issue26839. To avoid this, use the - * GRND_NONBLOCK flag. */ - const int flags = GRND_NONBLOCK; + int flags; char *dest; long n; @@ -115,12 +143,12 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise) return 0; } + flags = blocking ? 0 : GRND_NONBLOCK; dest = buffer; while (0 < size) { #ifdef sun /* Issue #26735: On Solaris, getrandom() is limited to returning up - to 1024 bytes. Call it multiple times if more bytes are - requested. */ + to 1024 bytes */ n = Py_MIN(size, 1024); #else n = Py_MIN(size, LONG_MAX); @@ -151,23 +179,19 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise) #endif if (n < 0) { - /* ENOSYS: the syscall is not supported by the kernel. - EPERM: the syscall is blocked by a security policy (ex: SECCOMP) - or something else. */ + /* ENOSYS: getrandom() syscall not supported by the kernel (but + * maybe supported by the host which built Python). EPERM: + * getrandom() syscall blocked by SECCOMP or something else. */ if (errno == ENOSYS || errno == EPERM) { getrandom_works = 0; return 0; } - if (errno == EAGAIN) { - /* getrandom(GRND_NONBLOCK) fails with EAGAIN if the system - urandom is not initialiazed yet. In this case, fall back on - reading from /dev/urandom. - - Note: In this case the data read will not be random so - should not be used for cryptographic purposes. Retaining - the existing semantics for practical purposes. */ - getrandom_works = 0; + /* getrandom(GRND_NONBLOCK) fails with EAGAIN if the system urandom + is not initialiazed yet. For _PyRandom_Init(), we ignore their + error and fall back on reading /dev/urandom which never blocks, + even if the system urandom is not initialized yet. */ + if (errno == EAGAIN && !raise && !blocking) { return 0; } @@ -193,80 +217,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise) } return 1; } - -#elif defined(HAVE_GETENTROPY) -#define PY_GETENTROPY 1 - -/* Fill buffer with size pseudo-random bytes generated by getentropy(): - - - Return 1 on success - - Return 0 if getentropy() syscall is not available (failed with ENOSYS or - EPERM). - - Raise an exception (if raise is non-zero) and return -1 on error: - if getentropy() failed with EINTR, raise is non-zero and the Python signal - handler raised an exception, or if getentropy() failed with a different - error. - - getentropy() is retried if it failed with EINTR: interrupted by a signal. */ -static int -py_getentropy(char *buffer, Py_ssize_t size, int raise) -{ - /* Is getentropy() supported by the running kernel? Set to 0 if - getentropy() failed with ENOSYS or EPERM. */ - static int getentropy_works = 1; - - if (!getentropy_works) { - return 0; - } - - while (size > 0) { - /* getentropy() is limited to returning up to 256 bytes. Call it - multiple times if more bytes are requested. */ - Py_ssize_t len = Py_MIN(size, 256); - int res; - - if (raise) { - Py_BEGIN_ALLOW_THREADS - res = getentropy(buffer, len); - Py_END_ALLOW_THREADS - } - else { - res = getentropy(buffer, len); - } - - if (res < 0) { - /* ENOSYS: the syscall is not supported by the running kernel. - EPERM: the syscall is blocked by a security policy (ex: SECCOMP) - or something else. */ - if (errno == ENOSYS || errno == EPERM) { - getentropy_works = 0; - return 0; - } - - if (errno == EINTR) { - if (raise) { - if (PyErr_CheckSignals()) { - return -1; - } - } - - /* retry getentropy() if it was interrupted by a signal */ - continue; - } - - if (raise) { - PyErr_SetFromErrno(PyExc_OSError); - } - return -1; - } - - buffer += len; - size -= len; - } - return 1; -} -#endif /* defined(HAVE_GETENTROPY) && !defined(sun) */ - +#endif static struct { int fd; @@ -274,38 +225,35 @@ static struct { ino_t st_ino; } urandom_cache = { -1 }; -/* Read random bytes from the /dev/urandom device: - - - Return 0 on success - - Raise an exception (if raise is non-zero) and return -1 on error - Possible causes of errors: +/* Read 'size' random bytes from py_getrandom(). Fall back on reading from + /dev/urandom if getrandom() is not available. - - open() failed with ENOENT, ENXIO, ENODEV, EACCES: the /dev/urandom device - was not found. For example, it was removed manually or not exposed in a - chroot or container. - - open() failed with a different error - - fstat() failed - - read() failed or returned 0 - - read() is retried if it failed with EINTR: interrupted by a signal. - - The file descriptor of the device is kept open between calls to avoid using - many file descriptors when run in parallel from multiple threads: - see the issue #18756. - - st_dev and st_ino fields of the file descriptor (from fstat()) are cached to - check if the file descriptor was replaced by a different file (which is - likely a bug in the application): see the issue #21207. - - If the file descriptor was closed or replaced, open a new file descriptor - but don't close the old file descriptor: it probably points to something - important for some third-party code. */ + Return 0 on success. Raise an exception (if raise is non-zero) and return -1 + on error. */ static int -dev_urandom(char *buffer, Py_ssize_t size, int raise) +dev_urandom(char *buffer, Py_ssize_t size, int blocking, int raise) { int fd; Py_ssize_t n; +#ifdef PY_GETRANDOM + int res; +#endif + + assert(size > 0); + +#ifdef PY_GETRANDOM + res = py_getrandom(buffer, size, blocking, raise); + if (res < 0) { + return -1; + } + if (res == 1) { + return 0; + } + /* getrandom() failed with ENOSYS or EPERM, + fall back on reading /dev/urandom */ +#endif + if (raise) { struct _Py_stat_struct st; @@ -327,10 +275,9 @@ dev_urandom(char *buffer, Py_ssize_t size, int raise) fd = _Py_open("/dev/urandom", O_RDONLY); if (fd < 0) { if (errno == ENOENT || errno == ENXIO || - errno == ENODEV || errno == EACCES) { + errno == ENODEV || errno == EACCES) PyErr_SetString(PyExc_NotImplementedError, "/dev/urandom (or equivalent) not found"); - } /* otherwise, keep the OSError exception raised by _Py_open() */ return -1; } @@ -402,8 +349,8 @@ dev_urandom_close(void) urandom_cache.fd = -1; } } -#endif /* !MS_WINDOWS */ +#endif /* Fill buffer with pseudo-random bytes generated by a linear congruent generator (LCG): @@ -426,53 +373,14 @@ lcg_urandom(unsigned int x0, unsigned char *buffer, size_t size) } } -/* Read random bytes: - - - Return 0 on success - - Raise an exception (if raise is non-zero) and return -1 on error - - Used sources of entropy ordered by preference, preferred source first: - - - CryptGenRandom() on Windows - - getrandom() function (ex: Linux and Solaris): call py_getrandom() - - getentropy() function (ex: OpenBSD): call py_getentropy() - - /dev/urandom device - - Read from the /dev/urandom device if getrandom() or getentropy() function - is not available or does not work. - - Prefer getrandom() over getentropy() because getrandom() supports blocking - and non-blocking mode and Python requires non-blocking RNG at startup to - initialize its hash secret: see the PEP 524. - - Prefer getrandom() and getentropy() over reading directly /dev/urandom - because these functions don't need file descriptors and so avoid ENFILE or - EMFILE errors (too many open files): see the issue #18756. - - Only use RNG running in the kernel. They are more secure because it is - harder to get the internal state of a RNG running in the kernel land than a - RNG running in the user land. The kernel has a direct access to the hardware - and has access to hardware RNG, they are used as entropy sources. - - Note: the OpenSSL RAND_pseudo_bytes() function does not automatically reseed - its RNG on fork(), two child processes (with the same pid) generate the same - random numbers: see issue #18747. Kernel RNGs don't have this issue, - they have access to good quality entropy sources. - - If raise is zero: - - - Don't raise an exception on error - - Don't call the Python signal handler (don't call PyErr_CheckSignals()) if - a function fails with EINTR: retry directly the interrupted function - - Don't release the GIL to call functions. -*/ +/* If raise is zero: + - Don't raise exceptions on error + - Don't call PyErr_CheckSignals() on EINTR (retry directly the interrupted + syscall) + - Don't release the GIL to call syscalls. */ static int -pyurandom(void *buffer, Py_ssize_t size, int raise) +pyurandom(void *buffer, Py_ssize_t size, int blocking, int raise) { -#if defined(PY_GETRANDOM) || defined(PY_GETENTROPY) - int res; -#endif - if (size < 0) { if (raise) { PyErr_Format(PyExc_ValueError, @@ -487,25 +395,10 @@ pyurandom(void *buffer, Py_ssize_t size, int raise) #ifdef MS_WINDOWS return win32_urandom((unsigned char *)buffer, size, raise); +#elif defined(PY_GETENTROPY) + return py_getentropy(buffer, size, raise); #else - -#if defined(PY_GETRANDOM) || defined(PY_GETENTROPY) -#ifdef PY_GETRANDOM - res = py_getrandom(buffer, size, raise); -#else - res = py_getentropy(buffer, size, raise); -#endif - if (res < 0) { - return -1; - } - if (res == 1) { - return 0; - } - /* getrandom() or getentropy() function is not available: failed with - ENOSYS, EPERM or EAGAIN. Fall back on reading from /dev/urandom. */ -#endif - - return dev_urandom(buffer, size, raise); + return dev_urandom(buffer, size, blocking, raise); #endif } @@ -513,11 +406,29 @@ pyurandom(void *buffer, Py_ssize_t size, int raise) number generator (RNG). It is suitable for most cryptographic purposes except long living private keys for asymmetric encryption. + On Linux 3.17 and newer, the getrandom() syscall is used in blocking mode: + block until the system urandom entropy pool is initialized (128 bits are + collected by the kernel). + Return 0 on success. Raise an exception and return -1 on error. */ int _PyOS_URandom(void *buffer, Py_ssize_t size) { - return pyurandom(buffer, size, 1); + return pyurandom(buffer, size, 1, 1); +} + +/* Fill buffer with size pseudo-random bytes from the operating system random + number generator (RNG). It is not suitable for cryptographic purpose. + + On Linux 3.17 and newer (when getrandom() syscall is used), if the system + urandom is not initialized yet, the function returns "weak" entropy read + from /dev/urandom. + + Return 0 on success. Raise an exception and return -1 on error. */ +int +_PyOS_URandomNonblock(void *buffer, Py_ssize_t size) +{ + return pyurandom(buffer, size, 0, 1); } void @@ -526,7 +437,7 @@ _PyRandom_Init(void) char *env; unsigned char *secret = (unsigned char *)&_Py_HashSecret.uc; Py_ssize_t secret_size = sizeof(_Py_HashSecret_t); - assert(secret_size == sizeof(_Py_HashSecret.uc)); + Py_BUILD_ASSERT(sizeof(_Py_HashSecret_t) == sizeof(_Py_HashSecret.uc)); if (_Py_HashSecret_Initialized) return; @@ -561,8 +472,11 @@ _PyRandom_Init(void) int res; /* _PyRandom_Init() is called very early in the Python initialization - and so exceptions cannot be used (use raise=0). */ - res = pyurandom(secret, secret_size, 0); + and so exceptions cannot be used (use raise=0). + + _PyRandom_Init() must not block Python initialization: call + pyurandom() is non-blocking mode (blocking=0): see the PEP 524. */ + res = pyurandom(secret, secret_size, 0, 0); if (res < 0) { Py_FatalError("failed to get random numbers to initialize Python"); } @@ -577,6 +491,8 @@ _PyRandom_Fini(void) CryptReleaseContext(hCryptProv, 0); hCryptProv = 0; } +#elif defined(PY_GETENTROPY) + /* nothing to clean */ #else dev_urandom_close(); #endif diff --git a/Python/structmember.c b/Python/structmember.c index af0296d..be2737d 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -74,14 +74,12 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) PyErr_SetString(PyExc_AttributeError, l->name); Py_XINCREF(v); break; -#ifdef HAVE_LONG_LONG case T_LONGLONG: - v = PyLong_FromLongLong(*(PY_LONG_LONG *)addr); + v = PyLong_FromLongLong(*(long long *)addr); break; case T_ULONGLONG: - v = PyLong_FromUnsignedLongLong(*(unsigned PY_LONG_LONG *)addr); + v = PyLong_FromUnsignedLongLong(*(unsigned long long *)addr); break; -#endif /* HAVE_LONG_LONG */ case T_NONE: v = Py_None; Py_INCREF(v); @@ -254,7 +252,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) char *string; Py_ssize_t len; - string = _PyUnicode_AsStringAndSize(v, &len); + string = PyUnicode_AsUTF8AndSize(v, &len); if (string == NULL || len != 1) { PyErr_BadArgument(); return -1; @@ -266,27 +264,25 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) case T_STRING_INPLACE: PyErr_SetString(PyExc_TypeError, "readonly attribute"); return -1; -#ifdef HAVE_LONG_LONG case T_LONGLONG:{ - PY_LONG_LONG value; - *(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v); + long long value; + *(long long*)addr = value = PyLong_AsLongLong(v); if ((value == -1) && PyErr_Occurred()) return -1; break; } case T_ULONGLONG:{ - unsigned PY_LONG_LONG value; + unsigned long long value; /* ??? PyLong_AsLongLong accepts an int, but PyLong_AsUnsignedLongLong doesn't ??? */ if (PyLong_Check(v)) - *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v); + *(unsigned long long*)addr = value = PyLong_AsUnsignedLongLong(v); else - *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsLong(v); - if ((value == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred()) + *(unsigned long long*)addr = value = PyLong_AsLong(v); + if ((value == (unsigned long long)-1) && PyErr_Occurred()) return -1; break; } -#endif /* HAVE_LONG_LONG */ default: PyErr_Format(PyExc_SystemError, "bad memberdescr type for %s", l->name); diff --git a/Python/symtable.c b/Python/symtable.c index adca2da..6165cfe 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -6,16 +6,22 @@ /* error strings used for warnings */ #define GLOBAL_AFTER_ASSIGN \ -"name '%.400s' is assigned to before global declaration" +"name '%U' is assigned to before global declaration" #define NONLOCAL_AFTER_ASSIGN \ -"name '%.400s' is assigned to before nonlocal declaration" +"name '%U' is assigned to before nonlocal declaration" #define GLOBAL_AFTER_USE \ -"name '%.400s' is used prior to global declaration" +"name '%U' is used prior to global declaration" #define NONLOCAL_AFTER_USE \ -"name '%.400s' is used prior to nonlocal declaration" +"name '%U' is used prior to nonlocal declaration" + +#define GLOBAL_ANNOT \ +"annotated name '%U' can't be global" + +#define NONLOCAL_ANNOT \ +"annotated name '%U' can't be nonlocal" #define IMPORT_STAR_WARNING "import * only allowed at module level" @@ -63,6 +69,7 @@ ste_new(struct symtable *st, identifier name, _Py_block_ty block, ste->ste_nested = 1; ste->ste_child_free = 0; ste->ste_generator = 0; + ste->ste_coroutine = 0; ste->ste_returns_value = 0; ste->ste_needs_class_closure = 0; @@ -160,7 +167,6 @@ PyTypeObject PySTEntry_Type = { }; static int symtable_analyze(struct symtable *st); -static int symtable_warn(struct symtable *st, char *msg, int lineno); static int symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block, void *ast, int lineno, int col_offset); @@ -378,7 +384,7 @@ error_at_directive(PySTEntryObject *ste, PyObject *name) PyLong_AsLong(PyTuple_GET_ITEM(data, 2))); return 0; - } + } } PyErr_SetString(PyExc_RuntimeError, "BUG: internal directive bookkeeping broken"); @@ -652,7 +658,7 @@ update_symbols(PyObject *symbols, PyObject *scopes, continue; } /* Handle global symbol */ - if (!PySet_Contains(bound, name)) { + if (bound && !PySet_Contains(bound, name)) { Py_DECREF(name); continue; /* it's a global */ } @@ -906,27 +912,6 @@ symtable_analyze(struct symtable *st) return r; } - -static int -symtable_warn(struct symtable *st, char *msg, int lineno) -{ - PyObject *message = PyUnicode_FromString(msg); - if (message == NULL) - return 0; - if (PyErr_WarnExplicitObject(PyExc_SyntaxWarning, message, st->st_filename, - lineno, NULL, NULL) < 0) { - Py_DECREF(message); - if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) { - PyErr_SetString(PyExc_SyntaxError, msg); - PyErr_SyntaxLocationObject(st->st_filename, st->st_cur->ste_lineno, - st->st_cur->ste_col_offset); - } - return 0; - } - Py_DECREF(message); - return 1; -} - /* symtable_enter_block() gets a reference via ste_new. This reference is released when the block is exited, via the DECREF in symtable_exit_block(). @@ -1201,6 +1186,43 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) VISIT_SEQ(st, expr, s->v.Assign.targets); VISIT(st, expr, s->v.Assign.value); break; + case AnnAssign_kind: + if (s->v.AnnAssign.target->kind == Name_kind) { + expr_ty e_name = s->v.AnnAssign.target; + long cur = symtable_lookup(st, e_name->v.Name.id); + if (cur < 0) { + VISIT_QUIT(st, 0); + } + if ((cur & (DEF_GLOBAL | DEF_NONLOCAL)) + && s->v.AnnAssign.simple) { + PyErr_Format(PyExc_SyntaxError, + cur & DEF_GLOBAL ? GLOBAL_ANNOT : NONLOCAL_ANNOT, + e_name->v.Name.id); + PyErr_SyntaxLocationObject(st->st_filename, + s->lineno, + s->col_offset); + VISIT_QUIT(st, 0); + } + if (s->v.AnnAssign.simple && + !symtable_add_def(st, e_name->v.Name.id, + DEF_ANNOT | DEF_LOCAL)) { + VISIT_QUIT(st, 0); + } + else { + if (s->v.AnnAssign.value + && !symtable_add_def(st, e_name->v.Name.id, DEF_LOCAL)) { + VISIT_QUIT(st, 0); + } + } + } + else { + VISIT(st, expr, s->v.AnnAssign.target); + } + VISIT(st, expr, s->v.AnnAssign.annotation); + if (s->v.AnnAssign.value) { + VISIT(st, expr, s->v.AnnAssign.value); + } + break; case AugAssign_kind: VISIT(st, expr, s->v.AugAssign.target); VISIT(st, expr, s->v.AugAssign.value); @@ -1258,21 +1280,21 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) long cur = symtable_lookup(st, name); if (cur < 0) VISIT_QUIT(st, 0); - if (cur & (DEF_LOCAL | USE)) { - char buf[256]; - char *c_name = _PyUnicode_AsString(name); - if (!c_name) - return 0; - if (cur & DEF_LOCAL) - PyOS_snprintf(buf, sizeof(buf), - GLOBAL_AFTER_ASSIGN, - c_name); - else - PyOS_snprintf(buf, sizeof(buf), - GLOBAL_AFTER_USE, - c_name); - if (!symtable_warn(st, buf, s->lineno)) - VISIT_QUIT(st, 0); + if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { + char* msg; + if (cur & USE) { + msg = GLOBAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { + msg = GLOBAL_ANNOT; + } else { /* DEF_LOCAL */ + msg = GLOBAL_AFTER_ASSIGN; + } + PyErr_Format(PyExc_SyntaxError, + msg, name); + PyErr_SyntaxLocationObject(st->st_filename, + s->lineno, + s->col_offset); + VISIT_QUIT(st, 0); } if (!symtable_add_def(st, name, DEF_GLOBAL)) VISIT_QUIT(st, 0); @@ -1289,21 +1311,20 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) long cur = symtable_lookup(st, name); if (cur < 0) VISIT_QUIT(st, 0); - if (cur & (DEF_LOCAL | USE)) { - char buf[256]; - char *c_name = _PyUnicode_AsString(name); - if (!c_name) - return 0; - if (cur & DEF_LOCAL) - PyOS_snprintf(buf, sizeof(buf), - NONLOCAL_AFTER_ASSIGN, - c_name); - else - PyOS_snprintf(buf, sizeof(buf), - NONLOCAL_AFTER_USE, - c_name); - if (!symtable_warn(st, buf, s->lineno)) - VISIT_QUIT(st, 0); + if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { + char* msg; + if (cur & USE) { + msg = NONLOCAL_AFTER_USE; + } else if (cur & DEF_ANNOT) { + msg = NONLOCAL_ANNOT; + } else { /* DEF_LOCAL */ + msg = NONLOCAL_AFTER_ASSIGN; + } + PyErr_Format(PyExc_SyntaxError, msg, name); + PyErr_SyntaxLocationObject(st->st_filename, + s->lineno, + s->col_offset); + VISIT_QUIT(st, 0); } if (!symtable_add_def(st, name, DEF_NONLOCAL)) VISIT_QUIT(st, 0); @@ -1341,6 +1362,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) FunctionBlock, (void *)s, s->lineno, s->col_offset)) VISIT_QUIT(st, 0); + st->st_cur->ste_coroutine = 1; VISIT(st, arguments, s->v.AsyncFunctionDef.args); VISIT_SEQ(st, stmt, s->v.AsyncFunctionDef.body); if (!symtable_exit_block(st, s)) @@ -1436,7 +1458,7 @@ symtable_visit_expr(struct symtable *st, expr_ty e) break; case Await_kind: VISIT(st, expr, e->v.Await.value); - st->st_cur->ste_generator = 1; + st->st_cur->ste_coroutine = 1; break; case Compare_kind: VISIT(st, expr, e->v.Compare.left); @@ -1447,6 +1469,15 @@ symtable_visit_expr(struct symtable *st, expr_ty e) VISIT_SEQ(st, expr, e->v.Call.args); VISIT_SEQ_WITH_NULL(st, keyword, e->v.Call.keywords); break; + case FormattedValue_kind: + VISIT(st, expr, e->v.FormattedValue.value); + if (e->v.FormattedValue.format_spec) + VISIT(st, expr, e->v.FormattedValue.format_spec); + break; + case JoinedStr_kind: + VISIT_SEQ(st, expr, e->v.JoinedStr.values); + break; + case Constant_kind: case Num_kind: case Str_kind: case Bytes_kind: @@ -1647,6 +1678,9 @@ symtable_visit_comprehension(struct symtable *st, comprehension_ty lc) VISIT(st, expr, lc->target); VISIT(st, expr, lc->iter); VISIT_SEQ(st, expr, lc->ifs); + if (lc->is_async) { + st->st_cur->ste_coroutine = 1; + } return 1; } @@ -1699,6 +1733,9 @@ symtable_handle_comprehension(struct symtable *st, expr_ty e, return 0; } st->st_cur->ste_generator = is_generator; + if (outermost->is_async) { + st->st_cur->ste_coroutine = 1; + } /* Outermost iter is received as an argument */ if (!symtable_implicit_arg(st, 0)) { symtable_exit_block(st, (void *)e); diff --git a/Python/sysmodule.c b/Python/sysmodule.c index d62bbf1..52034ff 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -20,6 +20,7 @@ Data members: #include "pythread.h" #include "osdefs.h" +#include #ifdef MS_WINDOWS #define WIN32_LEAN_AND_MEAN @@ -33,7 +34,6 @@ extern const char *PyWin_DLLVersionString; #endif #ifdef HAVE_LANGINFO_H -#include #include #endif @@ -114,7 +114,7 @@ sys_displayhook_unencodable(PyObject *outf, PyObject *o) stdout_encoding = _PyObject_GetAttrId(outf, &PyId_encoding); if (stdout_encoding == NULL) goto error; - stdout_encoding_str = _PyUnicode_AsString(stdout_encoding); + stdout_encoding_str = PyUnicode_AsUTF8(stdout_encoding); if (stdout_encoding_str == NULL) goto error; @@ -311,6 +311,23 @@ operating system filenames." ); static PyObject * +sys_getfilesystemencodeerrors(PyObject *self) +{ + if (Py_FileSystemDefaultEncodeErrors) + return PyUnicode_FromString(Py_FileSystemDefaultEncodeErrors); + PyErr_SetString(PyExc_RuntimeError, + "filesystem encoding is not initialized"); + return NULL; +} + +PyDoc_STRVAR(getfilesystemencodeerrors_doc, + "getfilesystemencodeerrors() -> string\n\ +\n\ +Return the error mode used to convert Unicode filenames in\n\ +operating system filenames." +); + +static PyObject * sys_intern(PyObject *self, PyObject *args) { PyObject *s; @@ -346,8 +363,10 @@ static PyObject *whatstrings[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static int trace_init(void) { - static char *whatnames[7] = {"call", "exception", "line", "return", - "c_call", "c_exception", "c_return"}; + static const char * const whatnames[7] = { + "call", "exception", "line", "return", + "c_call", "c_exception", "c_return" + }; PyObject *name; int i; for (i = 0; i < 7; ++i) { @@ -366,34 +385,25 @@ static PyObject * call_trampoline(PyObject* callback, PyFrameObject *frame, int what, PyObject *arg) { - PyObject *args; - PyObject *whatstr; PyObject *result; + PyObject *stack[3]; - args = PyTuple_New(3); - if (args == NULL) - return NULL; - if (PyFrame_FastToLocalsWithError(frame) < 0) + if (PyFrame_FastToLocalsWithError(frame) < 0) { return NULL; + } - Py_INCREF(frame); - whatstr = whatstrings[what]; - Py_INCREF(whatstr); - if (arg == NULL) - arg = Py_None; - Py_INCREF(arg); - PyTuple_SET_ITEM(args, 0, (PyObject *)frame); - PyTuple_SET_ITEM(args, 1, whatstr); - PyTuple_SET_ITEM(args, 2, arg); + stack[0] = (PyObject *)frame; + stack[1] = whatstrings[what]; + stack[2] = (arg != NULL) ? arg : Py_None; /* call the Python-level function */ - result = PyEval_CallObject(callback, args); + result = _PyObject_FastCall(callback, stack, 3); + PyFrame_LocalsToFast(frame, 1); - if (result == NULL) + if (result == NULL) { PyTraceBack_Here(frame); + } - /* cleanup */ - Py_DECREF(args); return result; } @@ -434,10 +444,7 @@ trace_trampoline(PyObject *self, PyFrameObject *frame, return -1; } if (result != Py_None) { - PyObject *temp = frame->f_trace; - frame->f_trace = NULL; - Py_XDECREF(temp); - frame->f_trace = result; + Py_XSETREF(frame->f_trace, result); } else { Py_DECREF(result); @@ -602,33 +609,6 @@ PyDoc_STRVAR(getswitchinterval_doc, #endif /* WITH_THREAD */ -#ifdef WITH_TSC -static PyObject * -sys_settscdump(PyObject *self, PyObject *args) -{ - int bool; - PyThreadState *tstate = PyThreadState_Get(); - - if (!PyArg_ParseTuple(args, "i:settscdump", &bool)) - return NULL; - if (bool) - tstate->interp->tscdump = 1; - else - tstate->interp->tscdump = 0; - Py_INCREF(Py_None); - return Py_None; - -} - -PyDoc_STRVAR(settscdump_doc, -"settscdump(bool)\n\ -\n\ -If true, tell the Python interpreter to dump VM measurements to\n\ -stderr. If false, turn off dump. The measurements are based on the\n\ -processor's time-stamp counter." -); -#endif /* TSC */ - static PyObject * sys_setrecursionlimit(PyObject *self, PyObject *args) { @@ -710,6 +690,113 @@ Return the wrapper for coroutine objects set by sys.set_coroutine_wrapper." ); +static PyTypeObject AsyncGenHooksType; + +PyDoc_STRVAR(asyncgen_hooks_doc, +"asyncgen_hooks\n\ +\n\ +A struct sequence providing information about asynhronous\n\ +generators hooks. The attributes are read only."); + +static PyStructSequence_Field asyncgen_hooks_fields[] = { + {"firstiter", "Hook to intercept first iteration"}, + {"finalizer", "Hook to intercept finalization"}, + {0} +}; + +static PyStructSequence_Desc asyncgen_hooks_desc = { + "asyncgen_hooks", /* name */ + asyncgen_hooks_doc, /* doc */ + asyncgen_hooks_fields , /* fields */ + 2 +}; + + +static PyObject * +sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw) +{ + static char *keywords[] = {"firstiter", "finalizer", NULL}; + PyObject *firstiter = NULL; + PyObject *finalizer = NULL; + + if (!PyArg_ParseTupleAndKeywords( + args, kw, "|OO", keywords, + &firstiter, &finalizer)) { + return NULL; + } + + if (finalizer && finalizer != Py_None) { + if (!PyCallable_Check(finalizer)) { + PyErr_Format(PyExc_TypeError, + "callable finalizer expected, got %.50s", + Py_TYPE(finalizer)->tp_name); + return NULL; + } + _PyEval_SetAsyncGenFinalizer(finalizer); + } + else if (finalizer == Py_None) { + _PyEval_SetAsyncGenFinalizer(NULL); + } + + if (firstiter && firstiter != Py_None) { + if (!PyCallable_Check(firstiter)) { + PyErr_Format(PyExc_TypeError, + "callable firstiter expected, got %.50s", + Py_TYPE(firstiter)->tp_name); + return NULL; + } + _PyEval_SetAsyncGenFirstiter(firstiter); + } + else if (firstiter == Py_None) { + _PyEval_SetAsyncGenFirstiter(NULL); + } + + Py_RETURN_NONE; +} + +PyDoc_STRVAR(set_asyncgen_hooks_doc, +"set_asyncgen_hooks(*, firstiter=None, finalizer=None)\n\ +\n\ +Set a finalizer for async generators objects." +); + +static PyObject * +sys_get_asyncgen_hooks(PyObject *self, PyObject *args) +{ + PyObject *res; + PyObject *firstiter = _PyEval_GetAsyncGenFirstiter(); + PyObject *finalizer = _PyEval_GetAsyncGenFinalizer(); + + res = PyStructSequence_New(&AsyncGenHooksType); + if (res == NULL) { + return NULL; + } + + if (firstiter == NULL) { + firstiter = Py_None; + } + + if (finalizer == NULL) { + finalizer = Py_None; + } + + Py_INCREF(firstiter); + PyStructSequence_SET_ITEM(res, 0, firstiter); + + Py_INCREF(finalizer); + PyStructSequence_SET_ITEM(res, 1, finalizer); + + return res; +} + +PyDoc_STRVAR(get_asyncgen_hooks_doc, +"get_asyncgen_hooks()\n\ +\n\ +Return a namedtuple of installed asynchronous generators hooks \ +(firstiter, finalizer)." +); + + static PyTypeObject Hash_InfoType; PyDoc_STRVAR(hash_info_doc, @@ -807,10 +894,11 @@ Return information about the running version of Windows as a named tuple.\n\ The members are named: major, minor, build, platform, service_pack,\n\ service_pack_major, service_pack_minor, suite_mask, and product_type. For\n\ backward compatibility, only the first 5 items are available by indexing.\n\ -All elements are numbers, except service_pack which is a string. Platform\n\ -may be 0 for win32s, 1 for Windows 9x/ME, 2 for Windows NT/2000/XP/Vista/7,\n\ -3 for Windows CE. Product_type may be 1 for a workstation, 2 for a domain\n\ -controller, 3 for a server." +All elements are numbers, except service_pack and platform_type which are\n\ +strings, and platform_version which is a 3-tuple. Platform is always 2.\n\ +Product_type may be 1 for a workstation, 2 for a domain controller, 3 for a\n\ +server. Platform_version is a 3-tuple containing a version number that is\n\ +intended for identifying the OS rather than feature detection." ); static PyTypeObject WindowsVersionType = {0, 0, 0, 0, 0, 0}; @@ -825,7 +913,7 @@ static PyStructSequence_Field windows_version_fields[] = { {"service_pack_minor", "Service Pack minor version number"}, {"suite_mask", "Bit mask identifying available product suites"}, {"product_type", "System product type"}, - {"_platform_version", "Diagnostic version number"}, + {"platform_version", "Diagnostic version number"}, {0} }; @@ -897,10 +985,10 @@ sys_getwindowsversion(PyObject *self) } PyMem_RawFree(verblock); } - PyStructSequence_SET_ITEM(version, pos++, Py_BuildValue("(kkk)", - realMajor, - realMinor, - realBuild + PyStructSequence_SET_ITEM(version, pos++, PyTuple_Pack(3, + PyLong_FromLong(realMajor), + PyLong_FromLong(realMinor), + PyLong_FromLong(realBuild) )); if (PyErr_Occurred()) { @@ -913,6 +1001,24 @@ sys_getwindowsversion(PyObject *self) #pragma warning(pop) +PyDoc_STRVAR(enablelegacywindowsfsencoding_doc, +"_enablelegacywindowsfsencoding()\n\ +\n\ +Changes the default filesystem encoding to mbcs:replace for consistency\n\ +with earlier versions of Python. See PEP 529 for more information.\n\ +\n\ +This is equivalent to defining the PYTHONLEGACYWINDOWSFSENCODING \n\ +environment variable before launching Python." +); + +static PyObject * +sys_enablelegacywindowsfsencoding(PyObject *self) +{ + Py_FileSystemDefaultEncoding = "mbcs"; + Py_FileSystemDefaultEncodeErrors = "replace"; + Py_RETURN_NONE; +} + #endif /* MS_WINDOWS */ #ifdef HAVE_DLOPEN @@ -1189,8 +1295,10 @@ static PyObject * sys_debugmallocstats(PyObject *self, PyObject *args) { #ifdef WITH_PYMALLOC - _PyObject_DebugMallocStats(stderr); - fputc('\n', stderr); + if (_PyMem_PymallocEnabled()) { + _PyObject_DebugMallocStats(stderr); + fputc('\n', stderr); + } #endif _PyObject_DebugTypeStats(stderr); @@ -1270,6 +1378,8 @@ static PyMethodDef sys_methods[] = { #endif {"getfilesystemencoding", (PyCFunction)sys_getfilesystemencoding, METH_NOARGS, getfilesystemencoding_doc}, + { "getfilesystemencodeerrors", (PyCFunction)sys_getfilesystemencodeerrors, + METH_NOARGS, getfilesystemencodeerrors_doc }, #ifdef Py_TRACE_REFS {"getobjects", _Py_GetObjects, METH_VARARGS}, #endif @@ -1285,6 +1395,8 @@ static PyMethodDef sys_methods[] = { #ifdef MS_WINDOWS {"getwindowsversion", (PyCFunction)sys_getwindowsversion, METH_NOARGS, getwindowsversion_doc}, + {"_enablelegacywindowsfsencoding", (PyCFunction)sys_enablelegacywindowsfsencoding, + METH_NOARGS, enablelegacywindowsfsencoding_doc }, #endif /* MS_WINDOWS */ {"intern", sys_intern, METH_VARARGS, intern_doc}, {"is_finalizing", sys_is_finalizing, METH_NOARGS, is_finalizing_doc}, @@ -1309,9 +1421,6 @@ static PyMethodDef sys_methods[] = { {"getprofile", sys_getprofile, METH_NOARGS, getprofile_doc}, {"setrecursionlimit", sys_setrecursionlimit, METH_VARARGS, setrecursionlimit_doc}, -#ifdef WITH_TSC - {"settscdump", sys_settscdump, METH_VARARGS, settscdump_doc}, -#endif {"settrace", sys_settrace, METH_O, settrace_doc}, {"gettrace", sys_gettrace, METH_NOARGS, gettrace_doc}, {"call_tracing", sys_call_tracing, METH_VARARGS, call_tracing_doc}, @@ -1321,6 +1430,10 @@ static PyMethodDef sys_methods[] = { set_coroutine_wrapper_doc}, {"get_coroutine_wrapper", sys_get_coroutine_wrapper, METH_NOARGS, get_coroutine_wrapper_doc}, + {"set_asyncgen_hooks", (PyCFunction)sys_set_asyncgen_hooks, + METH_VARARGS | METH_KEYWORDS, set_asyncgen_hooks_doc}, + {"get_asyncgen_hooks", sys_get_asyncgen_hooks, METH_NOARGS, + get_asyncgen_hooks_doc}, {NULL, NULL} /* sentinel */ }; @@ -1501,14 +1614,21 @@ version -- the version of this interpreter as a string\n\ version_info -- version information as a named tuple\n\ " ) -#ifdef MS_WINDOWS +#ifdef MS_COREDLL /* concatenating string here */ PyDoc_STR( "dllhandle -- [Windows only] integer handle of the Python DLL\n\ winver -- [Windows only] version number of the Python DLL\n\ " ) -#endif /* MS_WINDOWS */ +#endif /* MS_COREDLL */ +#ifdef MS_WINDOWS +/* concatenating string here */ +PyDoc_STR( +"_enablelegacywindowsfsencoding -- [Windows only] \n\ +" +) +#endif PyDoc_STR( "__stdin__ -- the original stdin; don't touch!\n\ __stdout__ -- the original stdout; don't touch!\n\ @@ -1680,15 +1800,11 @@ make_version_info(void) /* sys.implementation values */ #define NAME "cpython" const char *_PySys_ImplName = NAME; -#define QUOTE(arg) #arg -#define STRIFY(name) QUOTE(name) -#define MAJOR STRIFY(PY_MAJOR_VERSION) -#define MINOR STRIFY(PY_MINOR_VERSION) +#define MAJOR Py_STRINGIFY(PY_MAJOR_VERSION) +#define MINOR Py_STRINGIFY(PY_MINOR_VERSION) #define TAG NAME "-" MAJOR MINOR const char *_PySys_ImplCacheTag = TAG; #undef NAME -#undef QUOTE -#undef STRIFY #undef MAJOR #undef MINOR #undef TAG @@ -1733,6 +1849,16 @@ make_impl_info(PyObject *version_info) if (res < 0) goto error; +#ifdef MULTIARCH + value = PyUnicode_FromString(MULTIARCH); + if (value == NULL) + goto error; + res = PyDict_SetItemString(impl_info, "_multiarch", value); + Py_DECREF(value); + if (res < 0) + goto error; +#endif + /* dict ready */ ns = _PyNamespace_New(impl_info); @@ -1816,9 +1942,9 @@ _PySys_Init(void) PyUnicode_FromString(Py_GetVersion())); SET_SYS_FROM_STRING("hexversion", PyLong_FromLong(PY_VERSION_HEX)); - SET_SYS_FROM_STRING("_git", - Py_BuildValue("(szz)", "CPython", _Py_gitidentifier(), - _Py_gitversion())); + SET_SYS_FROM_STRING("_mercurial", + Py_BuildValue("(szz)", "CPython", _Py_hgidentifier(), + _Py_hgversion())); SET_SYS_FROM_STRING("dont_write_bytecode", PyBool_FromLong(Py_DontWriteBytecodeFlag)); SET_SYS_FROM_STRING("api_version", @@ -1943,6 +2069,14 @@ _PySys_Init(void) SET_SYS_FROM_STRING("thread_info", PyThread_GetInfo()); #endif + /* initialize asyncgen_hooks */ + if (AsyncGenHooksType.tp_name == NULL) { + if (PyStructSequence_InitType2( + &AsyncGenHooksType, &asyncgen_hooks_desc) < 0) { + return NULL; + } + } + #undef SET_SYS_FROM_STRING #undef SET_SYS_FROM_STRING_BORROW if (PyErr_Occurred()) @@ -2039,7 +2173,7 @@ sys_update_path(int argc, wchar_t **argv) #endif #if defined(HAVE_REALPATH) wchar_t fullpath[MAXPATHLEN]; -#elif defined(MS_WINDOWS) && !defined(MS_WINCE) +#elif defined(MS_WINDOWS) wchar_t fullpath[MAX_PATH]; #endif @@ -2078,10 +2212,8 @@ sys_update_path(int argc, wchar_t **argv) #if SEP == '\\' /* Special case for MS filename syntax */ if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) { wchar_t *q; -#if defined(MS_WINDOWS) && !defined(MS_WINCE) - /* This code here replaces the first element in argv with the full - path that it represents. Under CE, there are no relative paths so - the argument must be the full path anyway. */ +#if defined(MS_WINDOWS) + /* Replace the first element in argv with the full path. */ wchar_t *ptemp; if (GetFullPathNameW(argv0, Py_ARRAY_LENGTH(fullpath), @@ -2151,7 +2283,7 @@ PySys_SetArgv(int argc, wchar_t **argv) static int sys_pyfile_write_unicode(PyObject *unicode, PyObject *file) { - PyObject *writer = NULL, *args = NULL, *result = NULL; + PyObject *writer = NULL, *result = NULL; int err; if (file == NULL) @@ -2161,11 +2293,7 @@ sys_pyfile_write_unicode(PyObject *unicode, PyObject *file) if (writer == NULL) goto error; - args = PyTuple_Pack(1, unicode); - if (args == NULL) - goto error; - - result = PyEval_CallObject(writer, args); + result = _PyObject_CallArg1(writer, unicode); if (result == NULL) { goto error; } else { @@ -2177,7 +2305,6 @@ error: err = -1; finally: Py_XDECREF(writer); - Py_XDECREF(args); Py_XDECREF(result); return err; } @@ -2284,7 +2411,7 @@ sys_format(_Py_Identifier *key, FILE *fp, const char *format, va_list va) if (message != NULL) { if (sys_pyfile_write_unicode(message, file) != 0) { PyErr_Clear(); - utf8 = _PyUnicode_AsString(message); + utf8 = PyUnicode_AsUTF8(message); if (utf8 != NULL) fputs(utf8, fp); } diff --git a/Python/thread_nt.h b/Python/thread_nt.h index b29b1b6..74a6ee8 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h @@ -77,7 +77,7 @@ EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds) /* wait at least until the target */ DWORD now, target = GetTickCount() + milliseconds; while (mutex->locked) { - if (PyCOND_TIMEDWAIT(&mutex->cv, &mutex->cs, (PY_LONG_LONG)milliseconds*1000) < 0) { + if (PyCOND_TIMEDWAIT(&mutex->cv, &mutex->cs, (long long)milliseconds*1000) < 0) { result = WAIT_FAILED; break; } @@ -161,11 +161,7 @@ typedef struct { /* thunker to call adapt between the function type used by the system's thread start function and the internally used one. */ -#if defined(MS_WINCE) -static DWORD WINAPI -#else static unsigned __stdcall -#endif bootstrap(void *call) { callobj *obj = (callobj*)call; @@ -193,32 +189,18 @@ PyThread_start_new_thread(void (*func)(void *), void *arg) return -1; obj->func = func; obj->arg = arg; -#if defined(MS_WINCE) - hThread = CreateThread(NULL, - Py_SAFE_DOWNCAST(_pythread_stacksize, Py_ssize_t, SIZE_T), - bootstrap, obj, 0, &threadID); -#else hThread = (HANDLE)_beginthreadex(0, Py_SAFE_DOWNCAST(_pythread_stacksize, Py_ssize_t, unsigned int), bootstrap, obj, 0, &threadID); -#endif if (hThread == 0) { -#if defined(MS_WINCE) - /* Save error in variable, to prevent PyThread_get_thread_ident - from clobbering it. */ - unsigned e = GetLastError(); - dprintf(("%ld: PyThread_start_new_thread failed, win32 error code %u\n", - PyThread_get_thread_ident(), e)); -#else /* I've seen errno == EAGAIN here, which means "there are * too many threads". */ int e = errno; dprintf(("%ld: PyThread_start_new_thread failed, errno %d\n", PyThread_get_thread_ident(), e)); -#endif threadID = (unsigned)-1; HeapFree(GetProcessHeap(), 0, obj); } @@ -249,11 +231,7 @@ PyThread_exit_thread(void) dprintf(("%ld: PyThread_exit_thread called\n", PyThread_get_thread_ident())); if (!initialized) exit(0); -#if defined(MS_WINCE) - ExitThread(0); -#else _endthreadex(0); -#endif } /* diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 8e42262..27e0dc8 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -464,66 +464,61 @@ PyLockStatus PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds, int intr_flag) { - PyLockStatus success = PY_LOCK_FAILURE; + PyLockStatus success; pthread_lock *thelock = (pthread_lock *)lock; int status, error = 0; dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) called\n", lock, microseconds, intr_flag)); - if (microseconds == 0) { - status = pthread_mutex_trylock( &thelock->mut ); - if (status != EBUSY) - CHECK_STATUS("pthread_mutex_trylock[1]"); - } - else { - status = pthread_mutex_lock( &thelock->mut ); - CHECK_STATUS("pthread_mutex_lock[1]"); - } - if (status == 0) { - if (thelock->locked == 0) { - success = PY_LOCK_ACQUIRED; - } - else if (microseconds != 0) { - struct timespec ts; - if (microseconds > 0) - MICROSECONDS_TO_TIMESPEC(microseconds, ts); - /* continue trying until we get the lock */ - - /* mut must be locked by me -- part of the condition - * protocol */ - while (success == PY_LOCK_FAILURE) { - if (microseconds > 0) { - status = pthread_cond_timedwait( - &thelock->lock_released, - &thelock->mut, &ts); - if (status == ETIMEDOUT) - break; - CHECK_STATUS("pthread_cond_timed_wait"); - } - else { - status = pthread_cond_wait( - &thelock->lock_released, - &thelock->mut); - CHECK_STATUS("pthread_cond_wait"); - } - - if (intr_flag && status == 0 && thelock->locked) { - /* We were woken up, but didn't get the lock. We probably received - * a signal. Return PY_LOCK_INTR to allow the caller to handle - * it and retry. */ - success = PY_LOCK_INTR; + status = pthread_mutex_lock( &thelock->mut ); + CHECK_STATUS("pthread_mutex_lock[1]"); + + if (thelock->locked == 0) { + success = PY_LOCK_ACQUIRED; + } else if (microseconds == 0) { + success = PY_LOCK_FAILURE; + } else { + struct timespec ts; + if (microseconds > 0) + MICROSECONDS_TO_TIMESPEC(microseconds, ts); + /* continue trying until we get the lock */ + + /* mut must be locked by me -- part of the condition + * protocol */ + success = PY_LOCK_FAILURE; + while (success == PY_LOCK_FAILURE) { + if (microseconds > 0) { + status = pthread_cond_timedwait( + &thelock->lock_released, + &thelock->mut, &ts); + if (status == ETIMEDOUT) break; - } - else if (status == 0 && !thelock->locked) { - success = PY_LOCK_ACQUIRED; - } + CHECK_STATUS("pthread_cond_timed_wait"); + } + else { + status = pthread_cond_wait( + &thelock->lock_released, + &thelock->mut); + CHECK_STATUS("pthread_cond_wait"); + } + + if (intr_flag && status == 0 && thelock->locked) { + /* We were woken up, but didn't get the lock. We probably received + * a signal. Return PY_LOCK_INTR to allow the caller to handle + * it and retry. */ + success = PY_LOCK_INTR; + break; + } else if (status == 0 && !thelock->locked) { + success = PY_LOCK_ACQUIRED; + } else { + success = PY_LOCK_FAILURE; } } - if (success == PY_LOCK_ACQUIRED) thelock->locked = 1; - status = pthread_mutex_unlock( &thelock->mut ); - CHECK_STATUS("pthread_mutex_unlock[1]"); } + if (success == PY_LOCK_ACQUIRED) thelock->locked = 1; + status = pthread_mutex_unlock( &thelock->mut ); + CHECK_STATUS("pthread_mutex_unlock[1]"); if (error) success = PY_LOCK_FAILURE; dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n", diff --git a/Python/traceback.c b/Python/traceback.c index 9e7fe3b..9f8c568 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -320,7 +320,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent) if (fob == NULL) { PyErr_Clear(); - res = _PyObject_CallMethodId(binary, &PyId_close, ""); + res = _PyObject_CallMethodId(binary, &PyId_close, NULL); Py_DECREF(binary); if (res) Py_DECREF(res); @@ -340,7 +340,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent) break; } } - res = _PyObject_CallMethodId(fob, &PyId_close, ""); + res = _PyObject_CallMethodId(fob, &PyId_close, NULL); if (res) Py_DECREF(res); else @@ -418,6 +418,11 @@ tb_printinternal(PyTracebackObject *tb, PyObject *f, long limit) { int err = 0; long depth = 0; + PyObject *last_file = NULL; + int last_line = -1; + PyObject *last_name = NULL; + long cnt = 0; + PyObject *line; PyTracebackObject *tb1 = tb; while (tb1 != NULL) { depth++; @@ -425,16 +430,41 @@ tb_printinternal(PyTracebackObject *tb, PyObject *f, long limit) } while (tb != NULL && err == 0) { if (depth <= limit) { - err = tb_displayline(f, - tb->tb_frame->f_code->co_filename, - tb->tb_lineno, - tb->tb_frame->f_code->co_name); + if (last_file != NULL && + tb->tb_frame->f_code->co_filename == last_file && + last_line != -1 && tb->tb_lineno == last_line && + last_name != NULL && + tb->tb_frame->f_code->co_name == last_name) { + cnt++; + } else { + if (cnt > 3) { + line = PyUnicode_FromFormat( + " [Previous line repeated %d more times]\n", cnt-3); + err = PyFile_WriteObject(line, f, Py_PRINT_RAW); + Py_DECREF(line); + } + last_file = tb->tb_frame->f_code->co_filename; + last_line = tb->tb_lineno; + last_name = tb->tb_frame->f_code->co_name; + cnt = 0; + } + if (cnt < 3) + err = tb_displayline(f, + tb->tb_frame->f_code->co_filename, + tb->tb_lineno, + tb->tb_frame->f_code->co_name); } depth--; tb = tb->tb_next; if (err == 0) err = PyErr_CheckSignals(); } + if (cnt > 3) { + line = PyUnicode_FromFormat( + " [Previous line repeated %d more times]\n", cnt-3); + err = PyFile_WriteObject(line, f, Py_PRINT_RAW); + Py_DECREF(line); + } return err; } @@ -485,40 +515,26 @@ PyTraceBack_Print(PyObject *v, PyObject *f) This function is signal safe. */ -static void -reverse_string(char *text, const size_t len) -{ - char tmp; - size_t i, j; - if (len == 0) - return; - for (i=0, j=len-1; i < j; i++, j--) { - tmp = text[i]; - text[i] = text[j]; - text[j] = tmp; - } -} - -/* Format an integer in range [0; 999999] to decimal, - and write it into the file fd. - - This function is signal safe. */ - -static void -dump_decimal(int fd, int value) +void +_Py_DumpDecimal(int fd, unsigned long value) { - char buffer[7]; - int len; - if (value < 0 || 999999 < value) - return; - len = 0; + /* maximum number of characters required for output of %lld or %p. + We need at most ceil(log10(256)*SIZEOF_LONG_LONG) digits, + plus 1 for the null byte. 53/22 is an upper bound for log10(256). */ + char buffer[1 + (sizeof(unsigned long)*53-1) / 22 + 1]; + char *ptr, *end; + + end = &buffer[Py_ARRAY_LENGTH(buffer) - 1]; + ptr = end; + *ptr = '\0'; do { - buffer[len] = '0' + (value % 10); + --ptr; + assert(ptr >= buffer); + *ptr = '0' + (value % 10); value /= 10; - len++; } while (value); - reverse_string(buffer, len); - _Py_write_noraise(fd, buffer, len); + + _Py_write_noraise(fd, ptr, end - ptr); } /* Format an integer in range [0; 0xffffffff] to hexadecimal of 'width' digits, @@ -526,27 +542,31 @@ dump_decimal(int fd, int value) This function is signal safe. */ -static void -dump_hexadecimal(int fd, unsigned long value, int width) +void +_Py_DumpHexadecimal(int fd, unsigned long value, Py_ssize_t width) { - int len; - char buffer[sizeof(unsigned long) * 2 + 1]; - len = 0; + char buffer[sizeof(unsigned long) * 2 + 1], *ptr, *end; + const Py_ssize_t size = Py_ARRAY_LENGTH(buffer) - 1; + + if (width > size) + width = size; + /* it's ok if width is negative */ + + end = &buffer[size]; + ptr = end; + *ptr = '\0'; do { - buffer[len] = Py_hexdigits[value & 15]; + --ptr; + assert(ptr >= buffer); + *ptr = Py_hexdigits[value & 15]; value >>= 4; - len++; - } while (len < width || value); - reverse_string(buffer, len); - _Py_write_noraise(fd, buffer, len); -} - -/* Write an unicode object into the file fd using ascii+backslashreplace. + } while ((end - ptr) < width || value); - This function is signal safe. */ + _Py_write_noraise(fd, ptr, end - ptr); +} -static void -dump_ascii(int fd, PyObject *text) +void +_Py_DumpASCII(int fd, PyObject *text) { PyASCIIObject *ascii = (PyASCIIObject *)text; Py_ssize_t i, size; @@ -556,32 +576,36 @@ dump_ascii(int fd, PyObject *text) wchar_t *wstr = NULL; Py_UCS4 ch; + if (!PyUnicode_Check(text)) + return; + size = ascii->length; kind = ascii->state.kind; - if (ascii->state.compact) { + if (kind == PyUnicode_WCHAR_KIND) { + wstr = ((PyASCIIObject *)text)->wstr; + if (wstr == NULL) + return; + size = ((PyCompactUnicodeObject *)text)->wstr_length; + } + else if (ascii->state.compact) { if (ascii->state.ascii) data = ((PyASCIIObject*)text) + 1; else data = ((PyCompactUnicodeObject*)text) + 1; } - else if (kind != PyUnicode_WCHAR_KIND) { + else { data = ((PyUnicodeObject *)text)->data.any; if (data == NULL) return; } - else { - wstr = ((PyASCIIObject *)text)->wstr; - if (wstr == NULL) - return; - size = ((PyCompactUnicodeObject *)text)->wstr_length; - } if (MAX_STRING_LENGTH < size) { size = MAX_STRING_LENGTH; truncated = 1; } - else + else { truncated = 0; + } for (i=0; i < size; i++) { if (kind != PyUnicode_WCHAR_KIND) @@ -595,19 +619,20 @@ dump_ascii(int fd, PyObject *text) } else if (ch <= 0xff) { PUTS(fd, "\\x"); - dump_hexadecimal(fd, ch, 2); + _Py_DumpHexadecimal(fd, ch, 2); } else if (ch <= 0xffff) { PUTS(fd, "\\u"); - dump_hexadecimal(fd, ch, 4); + _Py_DumpHexadecimal(fd, ch, 4); } else { PUTS(fd, "\\U"); - dump_hexadecimal(fd, ch, 8); + _Py_DumpHexadecimal(fd, ch, 8); } } - if (truncated) + if (truncated) { PUTS(fd, "..."); + } } /* Write a frame into the file fd: "File "xxx", line xxx in xxx". @@ -626,7 +651,7 @@ dump_frame(int fd, PyFrameObject *frame) && PyUnicode_Check(code->co_filename)) { PUTS(fd, "\""); - dump_ascii(fd, code->co_filename); + _Py_DumpASCII(fd, code->co_filename); PUTS(fd, "\""); } else { PUTS(fd, "???"); @@ -635,14 +660,21 @@ dump_frame(int fd, PyFrameObject *frame) /* PyFrame_GetLineNumber() was introduced in Python 2.7.0 and 3.2.0 */ lineno = PyCode_Addr2Line(code, frame->f_lasti); PUTS(fd, ", line "); - dump_decimal(fd, lineno); + if (lineno >= 0) { + _Py_DumpDecimal(fd, (unsigned long)lineno); + } + else { + PUTS(fd, "???"); + } PUTS(fd, " in "); if (code != NULL && code->co_name != NULL - && PyUnicode_Check(code->co_name)) - dump_ascii(fd, code->co_name); - else + && PyUnicode_Check(code->co_name)) { + _Py_DumpASCII(fd, code->co_name); + } + else { PUTS(fd, "???"); + } PUTS(fd, "\n"); } @@ -698,7 +730,9 @@ write_thread_id(int fd, PyThreadState *tstate, int is_current) PUTS(fd, "Current thread 0x"); else PUTS(fd, "Thread 0x"); - dump_hexadecimal(fd, (unsigned long)tstate->thread_id, sizeof(unsigned long)*2); + _Py_DumpHexadecimal(fd, + (unsigned long)tstate->thread_id, + sizeof(unsigned long) * 2); PUTS(fd, " (most recent call first):\n"); } @@ -710,11 +744,56 @@ write_thread_id(int fd, PyThreadState *tstate, int is_current) handlers if signals were received. */ const char* _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp, - PyThreadState *current_thread) + PyThreadState *current_tstate) { PyThreadState *tstate; unsigned int nthreads; +#ifdef WITH_THREAD + if (current_tstate == NULL) { + /* _Py_DumpTracebackThreads() is called from signal handlers by + faulthandler. + + SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL are synchronous signals + and are thus delivered to the thread that caused the fault. Get the + Python thread state of the current thread. + + PyThreadState_Get() doesn't give the state of the thread that caused + the fault if the thread released the GIL, and so this function + cannot be used. Read the thread local storage (TLS) instead: call + PyGILState_GetThisThreadState(). */ + current_tstate = PyGILState_GetThisThreadState(); + } + + if (interp == NULL) { + if (current_tstate == NULL) { + interp = _PyGILState_GetInterpreterStateUnsafe(); + if (interp == NULL) { + /* We need the interpreter state to get Python threads */ + return "unable to get the interpreter state"; + } + } + else { + interp = current_tstate->interp; + } + } +#else + if (current_tstate == NULL) { + /* Call _PyThreadState_UncheckedGet() instead of PyThreadState_Get() + to not fail with a fatal error if the thread state is NULL. */ + current_tstate = _PyThreadState_UncheckedGet(); + } + + if (interp == NULL) { + if (current_tstate == NULL) { + /* We need the interpreter state to get Python threads */ + return "unable to get the interpreter state"; + } + interp = current_tstate->interp; + } +#endif + assert(interp != NULL); + /* Get the current interpreter from the current thread */ tstate = PyInterpreterState_ThreadHead(interp); if (tstate == NULL) @@ -732,7 +811,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp, PUTS(fd, "...\n"); break; } - write_thread_id(fd, tstate, tstate == current_thread); + write_thread_id(fd, tstate, tstate == current_tstate); dump_traceback(fd, tstate, 0); tstate = PyThreadState_Next(tstate); nthreads++; diff --git a/Python/wordcode_helpers.h b/Python/wordcode_helpers.h new file mode 100644 index 0000000..b0e3a91 --- /dev/null +++ b/Python/wordcode_helpers.h @@ -0,0 +1,41 @@ +/* This file contains code shared by the compiler and the peephole + optimizer. + */ + +#ifdef WORDS_BIGENDIAN +# define PACKOPARG(opcode, oparg) ((_Py_CODEUNIT)(((opcode) << 8) | (oparg))) +#else +# define PACKOPARG(opcode, oparg) ((_Py_CODEUNIT)(((oparg) << 8) | (opcode))) +#endif + +/* Minimum number of code units necessary to encode instruction with + EXTENDED_ARGs */ +static int +instrsize(unsigned int oparg) +{ + return oparg <= 0xff ? 1 : + oparg <= 0xffff ? 2 : + oparg <= 0xffffff ? 3 : + 4; +} + +/* Spits out op/oparg pair using ilen bytes. codestr should be pointed at the + desired location of the first EXTENDED_ARG */ +static void +write_op_arg(_Py_CODEUNIT *codestr, unsigned char opcode, + unsigned int oparg, int ilen) +{ + switch (ilen) { + case 4: + *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 24) & 0xff); + case 3: + *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 16) & 0xff); + case 2: + *codestr++ = PACKOPARG(EXTENDED_ARG, (oparg >> 8) & 0xff); + case 1: + *codestr++ = PACKOPARG(opcode, oparg & 0xff); + break; + default: + assert(0); + } +} diff --git a/README b/README index d94f259..d52d86c 100644 --- a/README +++ b/README @@ -1,9 +1,8 @@ -This is Python version 3.5.4 +This is Python version 3.6.0 ============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation. All rights -reserved. +2012, 2013, 2014, 2015, 2016 Python Software Foundation. All rights reserved. Python 3.x is a new version of the language, which is incompatible with the 2.x line of releases. The language is mostly the same, but many details, @@ -11,14 +10,6 @@ especially how built-in objects like dictionaries and strings work, have changed considerably, and a lot of deprecated features have finally been removed. -Using Python ------------- - -Installable Python kits, and information about using Python, are available at -`python.org`_. - -.. _python.org: https://www.python.org/ - Build Instructions ------------------ @@ -37,9 +28,9 @@ find out more. On OSX and Cygwin, the executable is called python.exe; elsewhere it's just python. On Mac OS X, if you have configured Python with --enable-framework, you should -use "make frameworkinstall" to do the installation. Note that this installs -the Python executable in a place that is not normally on your PATH, you may -want to set up a symlink in /usr/local/bin. +use "make frameworkinstall" to do the installation. Note that this installs the +Python executable in a place that is not normally on your PATH, you may want to +set up a symlink in /usr/local/bin. On Windows, see PCbuild/readme.txt. @@ -98,9 +89,9 @@ What's New ---------- We have a comprehensive overview of the changes in the "What's New in -Python 3.5" document, found at +Python 3.6" document, found at - http://docs.python.org/3.5/whatsnew/3.5.html + https://docs.python.org/3.6/whatsnew/3.6.html For a more detailed change log, read Misc/NEWS (though this file, too, is incomplete, and also doesn't list anything merged in from the 2.7 @@ -113,9 +104,9 @@ entitled "Installing multiple versions". Documentation ------------- -Documentation for Python 3.5 is online, updated daily: +Documentation for Python 3.6 is online, updated daily: - http://docs.python.org/3.5/ + https://docs.python.org/3.6/ It can also be downloaded in many formats for faster access. The documentation is downloadable in HTML, PDF, and reStructuredText formats; the latter version @@ -125,7 +116,7 @@ formatting requirements. If you would like to contribute to the development of Python, relevant documentation is available at: - http://docs.python.org/devguide/ + https://docs.python.org/devguide/ For information about building Python's documentation, refer to Doc/README.txt. @@ -140,7 +131,7 @@ backported versions of certain key Python 3.x features. A source-to-source translation tool, "2to3", can take care of the mundane task of converting large amounts of source code. It is not a complete solution but is complemented by the deprecation warnings in 2.6. See -http://docs.python.org/3.5/library/2to3.html for more information. +https://docs.python.org/3.6/library/2to3.html for more information. Testing @@ -159,7 +150,7 @@ IMPORTANT: If the tests fail and you decide to mail a bug report, *don't* include the output of "make test". It is useless. Run the failing test manually, as follows: - ./python -m test -v test_whatever + ./python -m test -v test_whatever (substituting the top of the source tree for '.' if you built in a different directory). This runs the test in verbose mode. @@ -170,17 +161,17 @@ Installing multiple versions On Unix and Mac systems if you intend to install multiple versions of Python using the same installation prefix (--prefix argument to the configure script) -you must take care that your primary python executable is not overwritten by -the installation of a different version. All files and directories installed -using "make altinstall" contain the major and minor version and can thus live -side-by-side. "make install" also creates ${prefix}/bin/python3 which refers -to ${prefix}/bin/pythonX.Y. If you intend to install multiple versions using -the same prefix you must decide which version (if any) is your "primary" -version. Install that version using "make install". Install all other -versions using "make altinstall". - -For example, if you want to install Python 2.6, 2.7 and 3.5 with 2.7 being the -primary version, you would execute "make install" in your 2.7 build directory +you must take care that your primary python executable is not overwritten by the +installation of a different version. All files and directories installed using +"make altinstall" contain the major and minor version and can thus live +side-by-side. "make install" also creates ${prefix}/bin/python3 which refers to +${prefix}/bin/pythonX.Y. If you intend to install multiple versions using the +same prefix you must decide which version (if any) is your "primary" version. +Install that version using "make install". Install all other versions using +"make altinstall". + +For example, if you want to install Python 2.7, 3.5, and 3.6 with 3.6 being the +primary version, you would execute "make install" in your 3.6 build directory and "make altinstall" in the others. @@ -190,7 +181,7 @@ Issue Tracker and Mailing List We're soliciting bug reports about all aspects of the language. Fixes are also welcome, preferably in unified diff format. Please use the issue tracker: - http://bugs.python.org/ + https://bugs.python.org/ If you're not sure whether you're dealing with a bug or a feature, use the mailing list: @@ -199,32 +190,30 @@ mailing list: To subscribe to the list, use the mailman form: - http://mail.python.org/mailman/listinfo/python-dev/ + https://mail.python.org/mailman/listinfo/python-dev/ Proposals for enhancement ------------------------- If you have a proposal to change Python, you may want to send an email to the -comp.lang.python or `python-ideas`_ mailing lists for initial feedback. A Python +comp.lang.python or python-ideas mailing lists for initial feedback. A Python Enhancement Proposal (PEP) may be submitted if your idea gains ground. All current PEPs, as well as guidelines for submitting a new PEP, are listed at -http://www.python.org/dev/peps/. +https://www.python.org/dev/peps/. -.. _python-ideas: https://mail.python.org/mailman/listinfo/python-ideas/ Release Schedule ---------------- -See PEP 478 for release details: http://www.python.org/dev/peps/pep-0478/ +See PEP 494 for release details: https://www.python.org/dev/peps/pep-0494/ Copyright and License Information --------------------------------- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation. All rights -reserved. +2012, 2013, 2014, 2015, 2016 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. @@ -241,3 +230,4 @@ so it may be used in proprietary projects. There are interfaces to some GNU code but these are entirely optional. All trademarks referenced herein are property of their respective holders. + diff --git a/Tools/README b/Tools/README index edbf4fb..0d961de 100644 --- a/Tools/README +++ b/Tools/README @@ -45,4 +45,4 @@ unittestgui A Tkinter based GUI test runner for unittest, with test discovery. -(*) A generic benchmark suite is maintained separately at https://github.com/python/performance +(*) A generic benchmark suite is maintained separately at http://hg.python.org/benchmarks/ diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat deleted file mode 100644 index f77407b..0000000 --- a/Tools/buildbot/build-amd64.bat +++ /dev/null @@ -1,5 +0,0 @@ -@rem Formerly used by the buildbot "compile" step. -@echo This script is no longer used and may be removed in the future. -@echo To get the same effect as this script, use -@echo PCbuild\build.bat -d -e -k -p x64 -call "%~dp0build.bat" -p x64 %* diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat deleted file mode 100644 index b53c7c1..0000000 --- a/Tools/buildbot/clean-amd64.bat +++ /dev/null @@ -1,5 +0,0 @@ -@rem Formerly used by the buildbot "clean" step. -@echo This script is no longer used and may be removed in the future. -@echo To get the same effect as this script, use `clean.bat` from this -@echo directory and pass `-p x64` as two arguments. -call "%~dp0clean.bat" -p x64 %* diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat index 0fc68fd..13e6679 100644 --- a/Tools/buildbot/clean.bat +++ b/Tools/buildbot/clean.bat @@ -14,3 +14,4 @@ del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo" echo Deleting test leftovers ... rmdir /s /q "%root%\build" +del /s "%pcbuild%\python*.zip" diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat deleted file mode 100644 index bfaef05..0000000 --- a/Tools/buildbot/external-amd64.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo This script is no longer used and may be removed in the future. -@echo Please use PCbuild\get_externals.bat instead. -@"%~dp0..\..\PCbuild\get_externals.bat" %* diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat deleted file mode 100644 index bfaef05..0000000 --- a/Tools/buildbot/external.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo This script is no longer used and may be removed in the future. -@echo Please use PCbuild\get_externals.bat instead. -@"%~dp0..\..\PCbuild\get_externals.bat" %* diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat deleted file mode 100644 index e48329c..0000000 --- a/Tools/buildbot/test-amd64.bat +++ /dev/null @@ -1,6 +0,0 @@ -@rem Formerly used by the buildbot "test" step. -@echo This script is no longer used and may be removed in the future. -@echo To get the same effect as this script, use -@echo PCbuild\rt.bat -q -d -x64 -uall -rwW -@echo or use `test.bat` in this directory and pass `-x64` as an argument. -call "%~dp0test.bat" -x64 %* diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat index ff7d167..a32d38b 100644 --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -4,7 +4,7 @@ setlocal set here=%~dp0 set rt_opts=-q -d -set regrtest_args= +set regrtest_args=-j1 :CheckOpts if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts @@ -16,4 +16,4 @@ if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts echo on -call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --timeout=3600 %regrtest_args% +call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 %regrtest_args% diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index f615ed9..75ac673 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -644,7 +644,7 @@ class CLanguage(Language): default_return_converter = (not f.return_converter or f.return_converter.type == 'PyObject *') - positional = parameters and (parameters[-1].kind == inspect.Parameter.POSITIONAL_ONLY) + positional = parameters and parameters[-1].is_positional_only() all_boring_objects = False # yes, this will be false if there are 0 parameters, it's fine first_optional = len(parameters) for i, p in enumerate(parameters): @@ -661,7 +661,7 @@ class CLanguage(Language): new_or_init = f.kind in (METHOD_NEW, METHOD_INIT) meth_o = (len(parameters) == 1 and - parameters[0].kind == inspect.Parameter.POSITIONAL_ONLY and + parameters[0].is_positional_only() and not converters[0].is_optional() and not new_or_init) @@ -705,6 +705,11 @@ class CLanguage(Language): {c_basename}({self_type}{self_name}, PyObject *args, PyObject *kwargs) """) + parser_prototype_fastcall = normalize_snippet(""" + static PyObject * + {c_basename}({self_type}{self_name}, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) + """) + parser_prototype_varargs = normalize_snippet(""" static PyObject * {c_basename}({self_type}{self_name}, PyObject *args) @@ -743,7 +748,10 @@ class CLanguage(Language): return output() def insert_keywords(s): - return linear_format(s, declarations="static char *_keywords[] = {{{keywords}, NULL}};\n{declarations}") + return linear_format(s, declarations= + 'static const char * const _keywords[] = {{{keywords}, NULL}};\n' + 'static _PyArg_Parser _parser = {{"{format_units}:{name}", _keywords, 0}};\n' + '{declarations}') if not parameters: # no parameters, METH_NOARGS @@ -797,8 +805,9 @@ class CLanguage(Language): """ % argname) parser_definition = parser_body(parser_prototype, normalize_snippet(""" - if (!PyArg_Parse(%s, "{format_units}:{name}", {parse_arguments})) + if (!PyArg_Parse(%s, "{format_units}:{name}", {parse_arguments})) {{ goto exit; + }} """ % argname, indent=4)) elif has_option_groups: @@ -822,8 +831,9 @@ class CLanguage(Language): parser_definition = parser_body(parser_prototype, normalize_snippet(""" if (!PyArg_UnpackTuple(args, "{name}", {unpack_min}, {unpack_max}, - {parse_arguments})) + {parse_arguments})) {{ goto exit; + }} """, indent=4)) elif positional: @@ -835,10 +845,24 @@ class CLanguage(Language): parser_definition = parser_body(parser_prototype, normalize_snippet(""" if (!PyArg_ParseTuple(args, "{format_units}:{name}", - {parse_arguments})) + {parse_arguments})) {{ goto exit; + }} """, indent=4)) + elif not new_or_init: + flags = "METH_FASTCALL" + + parser_prototype = parser_prototype_fastcall + + body = normalize_snippet(""" + if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + {parse_arguments})) {{ + goto exit; + }} + """, indent=4) + parser_definition = parser_body(parser_prototype, body) + parser_definition = insert_keywords(parser_definition) else: # positional-or-keyword arguments flags = "METH_VARARGS|METH_KEYWORDS" @@ -846,15 +870,12 @@ class CLanguage(Language): parser_prototype = parser_prototype_keyword body = normalize_snippet(""" - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "{format_units}:{name}", _keywords, - {parse_arguments})) + if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser, + {parse_arguments})) {{ goto exit; - """, indent=4) - parser_definition = parser_body(parser_prototype, normalize_snippet(""" - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "{format_units}:{name}", _keywords, - {parse_arguments})) - goto exit; - """, indent=4)) + }} + """, indent=4) + parser_definition = parser_body(parser_prototype, body) parser_definition = insert_keywords(parser_definition) @@ -878,13 +899,15 @@ class CLanguage(Language): if not parses_keywords: fields.insert(0, normalize_snippet(""" - if ({self_type_check}!_PyArg_NoKeywords("{name}", kwargs)) + if ({self_type_check}!_PyArg_NoKeywords("{name}", kwargs)) {{ goto exit; + }} """, indent=4)) if not parses_positional: fields.insert(0, normalize_snippet(""" - if ({self_type_check}!_PyArg_NoPositional("{name}", args)) + if ({self_type_check}!_PyArg_NoPositional("{name}", args)) {{ goto exit; + }} """, indent=4)) parser_definition = parser_body(parser_prototype, *fields) @@ -1032,8 +1055,9 @@ class CLanguage(Language): s = """ case {count}: - if (!PyArg_ParseTuple(args, "{format_units}:{name}", {parse_arguments})) + if (!PyArg_ParseTuple(args, "{format_units}:{name}", {parse_arguments})) {{ goto exit; + }} {group_booleans} break; """[1:] @@ -1067,7 +1091,7 @@ class CLanguage(Language): last_group = 0 first_optional = len(selfless) - positional = selfless and selfless[-1].kind == inspect.Parameter.POSITIONAL_ONLY + positional = selfless and selfless[-1].is_positional_only() new_or_init = f.kind in (METHOD_NEW, METHOD_INIT) default_return_converter = (not f.return_converter or f.return_converter.type == 'PyObject *') @@ -1216,7 +1240,7 @@ def OverrideStdioWith(stdout): def create_regex(before, after, word=True, whole_line=True): """Create an re object for matching marker lines.""" - group_re = "\w+" if word else ".+" + group_re = r"\w+" if word else ".+" pattern = r'{}({}){}' if whole_line: pattern = '^' + pattern + '$' @@ -2359,7 +2383,10 @@ class CConverter(metaclass=CConverterAutoRegister): data.modifications.append('/* modifications for ' + name + ' */\n' + modifications.rstrip()) # keywords - data.keywords.append(parameter.name) + if parameter.is_positional_only(): + data.keywords.append('') + else: + data.keywords.append(parameter.name) # format_units if self.is_optional() and '|' not in data.format_units: @@ -2572,21 +2599,21 @@ class unsigned_long_converter(CConverter): if not bitwise: fail("Unsigned longs must be bitwise (for now).") -class PY_LONG_LONG_converter(CConverter): - type = 'PY_LONG_LONG' +class long_long_converter(CConverter): + type = 'long long' default_type = int format_unit = 'L' c_ignored_default = "0" -class unsigned_PY_LONG_LONG_converter(CConverter): - type = 'unsigned PY_LONG_LONG' +class unsigned_long_long_converter(CConverter): + type = 'unsigned long long' default_type = int format_unit = 'K' c_ignored_default = "0" def converter_init(self, *, bitwise=False): if not bitwise: - fail("Unsigned PY_LONG_LONGs must be bitwise (for now).") + fail("Unsigned long long must be bitwise (for now).") class Py_ssize_t_converter(CConverter): type = 'Py_ssize_t' @@ -2676,7 +2703,7 @@ class str_converter(CConverter): def cleanup(self): if self.encoding: name = ensure_legal_c_identifier(self.name) - return "".join(["if (", name, ")\n PyMem_FREE(", name, ");\n"]) + return "".join(["if (", name, ") {\n PyMem_FREE(", name, ");\n}\n"]) # # This is the fourth or fifth rewrite of registering all the @@ -2786,7 +2813,7 @@ class Py_buffer_converter(CConverter): def cleanup(self): name = ensure_legal_c_identifier(self.name) - return "".join(["if (", name, ".obj)\n PyBuffer_Release(&", name, ");\n"]) + return "".join(["if (", name, ".obj) {\n PyBuffer_Release(&", name, ");\n}\n"]) def correct_name_for_self(f): @@ -2959,10 +2986,10 @@ class CReturnConverter(metaclass=CReturnConverterAutoRegister): data.return_value = name def err_occurred_if(self, expr, data): - data.return_conversion.append('if (({}) && PyErr_Occurred())\n goto exit;\n'.format(expr)) + data.return_conversion.append('if (({}) && PyErr_Occurred()) {{\n goto exit;\n}}\n'.format(expr)) def err_occurred_if_null_pointer(self, variable, data): - data.return_conversion.append('if ({} == NULL)\n goto exit;\n'.format(variable)) + data.return_conversion.append('if ({} == NULL) {{\n goto exit;\n}}\n'.format(variable)) def render(self, function, data): """ @@ -2977,8 +3004,9 @@ class NoneType_return_converter(CReturnConverter): def render(self, function, data): self.declare(data) data.return_conversion.append(''' -if (_return_value != Py_None) +if (_return_value != Py_None) { goto exit; +} return_value = Py_None; Py_INCREF(Py_None); '''.strip()) @@ -3183,6 +3211,7 @@ class DSLParser: self.state = self.state_dsl_start self.parameter_indent = None self.keyword_only = False + self.positional_only = False self.group = 0 self.parameter_state = self.ps_start self.seen_positional_with_default = False @@ -3561,8 +3590,8 @@ class DSLParser: # "parameter_state". (Previously the code was a miasma of ifs and # separate boolean state variables.) The states are: # - # [ [ a, b, ] c, ] d, e, f=3, [ g, h, [ i ] ] / <- line - # 01 2 3 4 5 6 7 <- state transitions + # [ [ a, b, ] c, ] d, e, f=3, [ g, h, [ i ] ] <- line + # 01 2 3 4 5 6 <- state transitions # # 0: ps_start. before we've seen anything. legal transitions are to 1 or 3. # 1: ps_left_square_before. left square brackets before required parameters. @@ -3573,9 +3602,8 @@ class DSLParser: # now must have default values. # 5: ps_group_after. in a group, after required parameters. # 6: ps_right_square_after. right square brackets after required parameters. - # 7: ps_seen_slash. seen slash. ps_start, ps_left_square_before, ps_group_before, ps_required, \ - ps_optional, ps_group_after, ps_right_square_after, ps_seen_slash = range(8) + ps_optional, ps_group_after, ps_right_square_after = range(7) def state_parameters_start(self, line): if self.ignore_line(line): @@ -3854,9 +3882,6 @@ class DSLParser: return name, False, kwargs def parse_special_symbol(self, symbol): - if self.parameter_state == self.ps_seen_slash: - fail("Function " + self.function.name + " specifies " + symbol + " after /, which is unsupported.") - if symbol == '*': if self.keyword_only: fail("Function " + self.function.name + " uses '*' more than once.") @@ -3883,13 +3908,15 @@ class DSLParser: else: fail("Function " + self.function.name + " has an unsupported group configuration. (Unexpected state " + str(self.parameter_state) + ".c)") elif symbol == '/': + if self.positional_only: + fail("Function " + self.function.name + " uses '/' more than once.") + self.positional_only = True # ps_required and ps_optional are allowed here, that allows positional-only without option groups # to work (and have default values!) if (self.parameter_state not in (self.ps_required, self.ps_optional, self.ps_right_square_after, self.ps_group_before)) or self.group: fail("Function " + self.function.name + " has an unsupported group configuration. (Unexpected state " + str(self.parameter_state) + ".d)") if self.keyword_only: fail("Function " + self.function.name + " mixes keyword-only and positional-only parameters, which is unsupported.") - self.parameter_state = self.ps_seen_slash # fixup preceding parameters for p in self.function.parameters.values(): if (p.kind != inspect.Parameter.POSITIONAL_OR_KEYWORD and not isinstance(p.converter, self_converter)): @@ -3977,23 +4004,20 @@ class DSLParser: # populate "right_bracket_count" field for every parameter assert parameters, "We should always have a self parameter. " + repr(f) assert isinstance(parameters[0].converter, self_converter) + # self is always positional-only. + assert parameters[0].is_positional_only() parameters[0].right_bracket_count = 0 - parameters_after_self = parameters[1:] - if parameters_after_self: - # for now, the only way Clinic supports positional-only parameters - # is if all of them are positional-only... - # - # ... except for self! self is always positional-only. - - positional_only_parameters = [p.kind == inspect.Parameter.POSITIONAL_ONLY for p in parameters_after_self] - if parameters_after_self[0].kind == inspect.Parameter.POSITIONAL_ONLY: - assert all(positional_only_parameters) - for p in parameters: - p.right_bracket_count = abs(p.group) + positional_only = True + for p in parameters[1:]: + if not p.is_positional_only(): + positional_only = False + else: + assert positional_only + if positional_only: + p.right_bracket_count = abs(p.group) else: # don't put any right brackets around non-positional-only parameters, ever. - for p in parameters_after_self: - p.right_bracket_count = 0 + p.right_bracket_count = 0 right_bracket_count = 0 diff --git a/Tools/demo/ss1.py b/Tools/demo/ss1.py index c51f041..bf88820 100755 --- a/Tools/demo/ss1.py +++ b/Tools/demo/ss1.py @@ -413,7 +413,7 @@ class FormulaCell(BaseCell): def renumber(self, x1, y1, x2, y2, dx, dy): out = [] - for part in re.split('(\w+)', self.formula): + for part in re.split(r'(\w+)', self.formula): m = re.match('^([A-Z]+)([1-9][0-9]*)$', part) if m is not None: sx, sy = m.groups() diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index 44edd57..d602f58 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -124,9 +124,7 @@ def main(): # default the exclude list for each platform if win: exclude = exclude + [ - 'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix', - 'ce', - ] + 'dos', 'dospath', 'mac', 'macpath', 'macfs', 'MACFS', 'posix', ] fail_import = exclude[:] @@ -218,7 +216,7 @@ def main(): ishome = os.path.exists(os.path.join(prefix, 'Python', 'ceval.c')) # locations derived from options - version = sys.version[:3] + version = '%d.%d' % sys.version_info[:2] flagged_version = version + sys.abiflags if win: extensions_c = 'frozen_extensions.c' diff --git a/Tools/freeze/winmakemakefile.py b/Tools/freeze/winmakemakefile.py index 390d8ac..9bb3e6e 100644 --- a/Tools/freeze/winmakemakefile.py +++ b/Tools/freeze/winmakemakefile.py @@ -95,7 +95,7 @@ def realwork(vars, moddefns, target): print() print('$(temp_dir):') - print(' if not exist $(temp_dir)\. mkdir $(temp_dir)') + print(r' if not exist $(temp_dir)\. mkdir $(temp_dir)') print() objects = [] @@ -106,7 +106,7 @@ def realwork(vars, moddefns, target): base = os.path.basename(file) base, ext = os.path.splitext(base) objects.append(base + ".obj") - print('$(temp_dir)\%s.obj: "%s"' % (base, file)) + print(r'$(temp_dir)\%s.obj: "%s"' % (base, file)) print("\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE", end=' ') print('"-I$(pythonhome)/Include" "-I$(pythonhome)/PC" \\') print("\t\t$(cflags) $(cdebug) $(cinclude) \\") @@ -126,7 +126,7 @@ def realwork(vars, moddefns, target): print() ; print() print("OBJS=", end=' ') - for obj in objects: print('"$(temp_dir)\%s"' % (obj), end=' ') + for obj in objects: print(r'"$(temp_dir)\%s"' % (obj), end=' ') print() ; print() print("LIBS=", end=' ') diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index ed515c0..798b062 100755 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -44,7 +44,7 @@ The module also extends gdb with some python-specific commands. # NOTE: some gdbs are linked with Python 3, so this file should be dual-syntax # compatible (2.6+ and 3.0+). See #19308. -from __future__ import print_function, with_statement +from __future__ import print_function import gdb import os import locale @@ -666,8 +666,9 @@ class PyDictObjectPtr(PyObjectPtr): ''' keys = self.field('ma_keys') values = self.field('ma_values') - for i in safe_range(keys['dk_size']): - ep = keys['dk_entries'].address + i + entries, nentries = self._get_entries(keys) + for i in safe_range(nentries): + ep = entries[i] if long(values): pyop_value = PyObjectPtr.from_pyobject_ptr(values[i]) else: @@ -707,6 +708,33 @@ class PyDictObjectPtr(PyObjectPtr): pyop_value.write_repr(out, visited) out.write('}') + def _get_entries(self, keys): + dk_nentries = int(keys['dk_nentries']) + dk_size = int(keys['dk_size']) + try: + # <= Python 3.5 + return keys['dk_entries'], dk_size + except gdb.error: + # >= Python 3.6 + pass + + if dk_size <= 0xFF: + offset = dk_size + elif dk_size <= 0xFFFF: + offset = 2 * dk_size + elif dk_size <= 0xFFFFFFFF: + offset = 4 * dk_size + else: + offset = 8 * dk_size + + ent_addr = keys['dk_indices']['as_1'].address + ent_addr = ent_addr.cast(_type_unsigned_char_ptr()) + offset + ent_ptr_t = gdb.lookup_type('PyDictKeyEntry').pointer() + ent_addr = ent_addr.cast(ent_ptr_t) + + return ent_addr, dk_nentries + + class PyListObjectPtr(PyObjectPtr): _typename = 'PyListObject' @@ -1464,23 +1492,38 @@ class Frame(object): ''' if self.is_waiting_for_gil(): return 'Waiting for the GIL' - elif self.is_gc_collect(): + + if self.is_gc_collect(): return 'Garbage-collecting' - else: - # Detect invocations of PyCFunction instances: - older = self.older() - if older and older._gdbframe.name() == 'PyCFunction_Call': - # Within that frame: - # "func" is the local containing the PyObject* of the - # PyCFunctionObject instance - # "f" is the same value, but cast to (PyCFunctionObject*) - # "self" is the (PyObject*) of the 'self' - try: - # Use the prettyprinter for the func: - func = older._gdbframe.read_var('func') - return str(func) - except RuntimeError: - return 'PyCFunction invocation (unable to read "func")' + + # Detect invocations of PyCFunction instances: + older = self.older() + if not older: + return False + + caller = older._gdbframe.name() + if not caller: + return False + + if caller == 'PyCFunction_Call': + # Within that frame: + # "func" is the local containing the PyObject* of the + # PyCFunctionObject instance + # "f" is the same value, but cast to (PyCFunctionObject*) + # "self" is the (PyObject*) of the 'self' + try: + # Use the prettyprinter for the func: + func = older._gdbframe.read_var('func') + return str(func) + except RuntimeError: + return 'PyCFunction invocation (unable to read "func")' + + elif caller == '_PyCFunction_FastCallDict': + try: + func = older._gdbframe.read_var('func_obj') + return str(func) + except RuntimeError: + return 'PyCFunction invocation (unable to read "func_obj")' # This frame isn't worth reporting: return False @@ -1527,11 +1570,7 @@ class Frame(object): def get_selected_python_frame(cls): '''Try to obtain the Frame for the python-related code in the selected frame, or None''' - try: - frame = cls.get_selected_frame() - except gdb.error: - # No frame: Python didn't start yet - return None + frame = cls.get_selected_frame() while frame: if frame.is_python_frame(): @@ -1672,10 +1711,6 @@ PyList() def move_in_stack(move_up): '''Move up or down the stack (for the py-up/py-down command)''' frame = Frame.get_selected_python_frame() - if not frame: - print('Unable to locate python frame') - return - while frame: if move_up: iter_frame = frame.older() @@ -1738,10 +1773,6 @@ class PyBacktraceFull(gdb.Command): def invoke(self, args, from_tty): frame = Frame.get_selected_python_frame() - if not frame: - print('Unable to locate python frame') - return - while frame: if frame.is_python_frame(): frame.print_summary() @@ -1759,12 +1790,8 @@ class PyBacktrace(gdb.Command): def invoke(self, args, from_tty): - frame = Frame.get_selected_python_frame() - if not frame: - print('Unable to locate python frame') - return - sys.stdout.write('Traceback (most recent call first):\n') + frame = Frame.get_selected_python_frame() while frame: if frame.is_python_frame(): frame.print_traceback() diff --git a/Tools/hg/hgtouch.py b/Tools/hg/hgtouch.py new file mode 100644 index 0000000..fbca469 --- /dev/null +++ b/Tools/hg/hgtouch.py @@ -0,0 +1,129 @@ +"""Bring time stamps of generated checked-in files into the right order + +A versioned configuration file .hgtouch specifies generated files, in the +syntax of make rules. + + output: input1 input2 + +In addition to the dependency syntax, #-comments are supported. +""" +import errno +import os +import time + +def parse_config(repo): + try: + fp = repo.wfile(".hgtouch") + except IOError, e: + if e.errno != errno.ENOENT: + raise + return {} + result = {} + with fp: + for line in fp: + # strip comments + line = line.split('#')[0].strip() + if ':' not in line: + continue + outputs, inputs = line.split(':', 1) + outputs = outputs.split() + inputs = inputs.split() + for o in outputs: + try: + result[o].extend(inputs) + except KeyError: + result[o] = inputs + return result + +def check_rule(ui, repo, modified, basedir, output, inputs): + """Verify that the output is newer than any of the inputs. + Return (status, stamp), where status is True if the update succeeded, + and stamp is the newest time stamp assigned to any file (might be in + the future). + + If basedir is nonempty, it gives a directory in which the tree is to + be checked. + """ + f_output = repo.wjoin(os.path.join(basedir, output)) + try: + o_time = os.stat(f_output).st_mtime + except OSError: + ui.warn("Generated file %s does not exist\n" % output) + return False, 0 + youngest = 0 # youngest dependency + backdate = None + backdate_source = None + for i in inputs: + f_i = repo.wjoin(os.path.join(basedir, i)) + try: + i_time = os.stat(f_i).st_mtime + except OSError: + ui.warn(".hgtouch input file %s does not exist\n" % i) + return False, 0 + if i in modified: + # input is modified. Need to backdate at least to i_time + if backdate is None or backdate > i_time: + backdate = i_time + backdate_source = i + continue + youngest = max(i_time, youngest) + if backdate is not None: + ui.warn("Input %s for file %s locally modified\n" % (backdate_source, output)) + # set to 1s before oldest modified input + backdate -= 1 + os.utime(f_output, (backdate, backdate)) + return False, 0 + if youngest >= o_time: + ui.note("Touching %s\n" % output) + youngest += 1 + os.utime(f_output, (youngest, youngest)) + return True, youngest + else: + # Nothing to update + return True, 0 + +def do_touch(ui, repo, basedir): + if basedir: + if not os.path.isdir(repo.wjoin(basedir)): + ui.warn("Abort: basedir %r does not exist\n" % basedir) + return + modified = [] + else: + modified = repo.status()[0] + dependencies = parse_config(repo) + success = True + tstamp = 0 # newest time stamp assigned + # try processing all rules in topological order + hold_back = {} + while dependencies: + output, inputs = dependencies.popitem() + # check whether any of the inputs is generated + for i in inputs: + if i in dependencies: + hold_back[output] = inputs + continue + _success, _tstamp = check_rule(ui, repo, modified, basedir, output, inputs) + success = success and _success + tstamp = max(tstamp, _tstamp) + # put back held back rules + dependencies.update(hold_back) + hold_back = {} + now = time.time() + if tstamp > now: + # wait until real time has passed the newest time stamp, to + # avoid having files dated in the future + time.sleep(tstamp-now) + if hold_back: + ui.warn("Cyclic dependency involving %s\n" % (' '.join(hold_back.keys()))) + return False + return success + +def touch(ui, repo, basedir): + "touch generated files that are older than their sources after an update." + do_touch(ui, repo, basedir) + +cmdtable = { + "touch": (touch, + [('b', 'basedir', '', 'base dir of the tree to apply touching')], + "hg touch [-b BASEDIR]") +} diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py index da42438..8ef5ff8 100755 --- a/Tools/i18n/pygettext.py +++ b/Tools/i18n/pygettext.py @@ -156,7 +156,8 @@ If `inputfile' is -, standard input is read. """) import os -import imp +import importlib.machinery +import importlib.util import sys import glob import time @@ -263,8 +264,7 @@ def _visit_pyfiles(list, dirname, names): # get extension for python source files if '_py_ext' not in globals(): global _py_ext - _py_ext = [triple[0] for triple in imp.get_suffixes() - if triple[2] == imp.PY_SOURCE][0] + _py_ext = importlib.machinery.SOURCE_SUFFIXES[0] # don't recurse into CVS directories if 'CVS' in names: @@ -277,45 +277,6 @@ def _visit_pyfiles(list, dirname, names): ) -def _get_modpkg_path(dotted_name, pathlist=None): - """Get the filesystem path for a module or a package. - - Return the file system path to a file for a module, and to a directory for - a package. Return None if the name is not found, or is a builtin or - extension module. - """ - # split off top-most name - parts = dotted_name.split('.', 1) - - if len(parts) > 1: - # we have a dotted path, import top-level package - try: - file, pathname, description = imp.find_module(parts[0], pathlist) - if file: file.close() - except ImportError: - return None - - # check if it's indeed a package - if description[2] == imp.PKG_DIRECTORY: - # recursively handle the remaining name parts - pathname = _get_modpkg_path(parts[1], [pathname]) - else: - pathname = None - else: - # plain name - try: - file, pathname, description = imp.find_module( - dotted_name, pathlist) - if file: - file.close() - if description[2] not in [imp.PY_SOURCE, imp.PKG_DIRECTORY]: - pathname = None - except ImportError: - pathname = None - - return pathname - - def getFilesForName(name): """Get a list of module files for a filename, a module or package name, or a directory. @@ -330,7 +291,11 @@ def getFilesForName(name): return list # try to find module or package - name = _get_modpkg_path(name) + try: + spec = importlib.util.find_spec(name) + name = spec.origin + except ImportError: + name = None if not name: return [] diff --git a/Tools/importbench/README b/Tools/importbench/README index 6ba386c..81a5544 100644 --- a/Tools/importbench/README +++ b/Tools/importbench/README @@ -3,4 +3,4 @@ Importbench is a set of micro-benchmarks for various import scenarios. It should not be used as an overall benchmark of import performance, but rather an easy way to measure impact of possible code changes. For a real-world benchmark of import, use the normal_startup benchmark from -https://github.com/python/performance +hg.python.org/benchmarks. diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index fe5158d..69f00c0 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -22,8 +22,8 @@ if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) call "%D%get_externals.bat" -call "%PCBUILD%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) + +call "%PCBUILD%env.bat" x86 if defined BUILDX86 ( call "%PCBUILD%build.bat" -d -e %REBUILD% %BUILDTEST% @@ -44,7 +44,7 @@ if defined BUILDDOC ( ) rem Build the launcher MSI separately -%MSBUILD% "%D%launcher\launcher.wixproj" /p:Platform=x86 +msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 set BUILD_CMD="%D%bundle\snapshot.wixproj" if defined BUILDTEST ( @@ -58,11 +58,11 @@ if defined REBUILD ( ) if defined BUILDX86 ( - %MSBUILD% %BUILD_CMD% + msbuild %BUILD_CMD% if errorlevel 1 goto :eof ) if defined BUILDX64 ( - %MSBUILD% /p:Platform=x64 %BUILD_CMD% + msbuild /p:Platform=x64 %BUILD_CMD% if errorlevel 1 goto :eof ) diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index e8d2311..4659a32 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -35,7 +35,7 @@ set BUILDX86= set BUILDX64= set TARGET=Rebuild set TESTTARGETDIR= -set PGO= +set PGO=-m test -q --pgo set BUILDNUGET=1 set BUILDZIP=1 @@ -65,12 +65,10 @@ if "%1" NEQ "" echo Invalid option: "%1" && exit /B 1 if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) -if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc" -if not exist "%GIT%" echo Cannot find Git on PATH && exit /B 1 +if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc" +if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1 call "%D%get_externals.bat" -call "%PCBUILD%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) :builddoc if "%SKIPBUILD%" EQU "1" goto skipdoc @@ -85,7 +83,7 @@ if errorlevel 1 goto :eof where dlltool /q && goto skipdlltoolsearch set _DLLTOOL_PATH= -where /R "%EXTERNALS%\" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc" +where /R "%EXTERNALS%\" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc" if not exist "%_DLLTOOL_PATH%" echo Cannot find binutils on PATH or in external && exit /B 1 for %%f in (%_DLLTOOL_PATH%) do set PATH=%PATH%;%%~dpf set _DLLTOOL_PATH= @@ -167,27 +165,28 @@ if not "%SKIPBUILD%" EQU "1" ( @echo off ) +call "%PCBUILD%env.bat" if "%OUTDIR_PLAT%" EQU "win32" ( - %MSBUILD% "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% + msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% if errorlevel 1 exit /B ) else if not exist "%PCBUILD%win32\en-us\launcher.msi" ( - %MSBUILD% "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% + msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI% if errorlevel 1 exit /B ) set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI% -%MSBUILD% "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true +msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true if errorlevel 1 exit /B -%MSBUILD% "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false +msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false if errorlevel 1 exit /B if defined BUILDZIP ( - %MSBUILD% "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS% /p:OutputPath="%BUILD%en-us" + msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS% /p:OutputPath="%BUILD%en-us" if errorlevel 1 exit /B ) if defined BUILDNUGET ( - %MSBUILD% "%D%..\nuget\make_pkg.proj" /t:Build /p:Configuration=Release /p:Platform=%1 /p:OutputPath="%BUILD%en-us" + msbuild "%D%..\nuget\make_pkg.proj" /t:Build /p:Configuration=Release /p:Platform=%1 /p:OutputPath="%BUILD%en-us" if errorlevel 1 exit /B ) diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm index 4d9c97a..1c0bd08 100644 --- a/Tools/msi/bundle/Default.thm +++ b/Tools/msi/bundle/Default.thm @@ -116,10 +116,11 @@ #(loc.SuccessHeader) - + - #(loc.SuccessRestartText) - + + + #(loc.SuccessRestartText) diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl index ed79246..43506d6 100644 --- a/Tools/msi/bundle/Default.wxl +++ b/Tools/msi/bundle/Default.wxl @@ -142,4 +142,7 @@ Please <a href="https://www.bing.com/search?q=how%20to%20install%20windows%20 Windows Server 2008 SP2 or later is required to install and use [WixBundleName]. Visit <a href="https://www.python.org/">python.org</a> to download Python 3.4. + + Disable path length limit + Changes your machine configuration to allow programs, including Python, to bypass the 260 character "MAX_PATH" limitation. diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 6a67ee2..e88981f 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -11,10 +11,6 @@ #include "pch.h" static const LPCWSTR PYBA_WINDOW_CLASS = L"PythonBA"; -static const LPCWSTR PYBA_VARIABLE_LAUNCH_TARGET_PATH = L"LaunchTarget"; -static const LPCWSTR PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID = L"LaunchTargetElevatedId"; -static const LPCWSTR PYBA_VARIABLE_LAUNCH_ARGUMENTS = L"LaunchArguments"; -static const LPCWSTR PYBA_VARIABLE_LAUNCH_HIDDEN = L"LaunchHidden"; static const DWORD PYBA_ACQUIRE_PERCENTAGE = 30; static const LPCWSTR PYBA_VARIABLE_BUNDLE_FILE_VERSION = L"WixBundleFileVersion"; @@ -129,11 +125,11 @@ enum CONTROL_ID { ID_PROGRESS_CANCEL_BUTTON, // Success page - ID_LAUNCH_BUTTON, ID_SUCCESS_TEXT, ID_SUCCESS_RESTART_TEXT, ID_SUCCESS_RESTART_BUTTON, ID_SUCCESS_CANCEL_BUTTON, + ID_SUCCESS_MAX_PATH_BUTTON, // Failure page ID_FAILURE_LOGFILE_LINK, @@ -188,11 +184,11 @@ static THEME_ASSIGN_CONTROL_ID CONTROL_ID_NAMES[] = { { ID_OVERALL_PROGRESS_TEXT, L"OverallProgressText" }, { ID_PROGRESS_CANCEL_BUTTON, L"ProgressCancelButton" }, - { ID_LAUNCH_BUTTON, L"LaunchButton" }, { ID_SUCCESS_TEXT, L"SuccessText" }, { ID_SUCCESS_RESTART_TEXT, L"SuccessRestartText" }, { ID_SUCCESS_RESTART_BUTTON, L"SuccessRestartButton" }, { ID_SUCCESS_CANCEL_BUTTON, L"SuccessCancelButton" }, + { ID_SUCCESS_MAX_PATH_BUTTON, L"SuccessMaxPathButton" }, { ID_FAILURE_LOGFILE_LINK, L"FailureLogFileLink" }, { ID_FAILURE_MESSAGE_TEXT, L"FailureMessageText" }, @@ -436,6 +432,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { case ID_UNINSTALL_BUTTON: OnPlan(BOOTSTRAPPER_ACTION_UNINSTALL); break; + + case ID_SUCCESS_MAX_PATH_BUTTON: + EnableMaxPathSupport(); + ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE); + break; } LExit: @@ -533,9 +534,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { } void SuccessPage_Show() { - // on the "Success" page, check if the restart or launch button should be enabled. + // on the "Success" page, check if the restart button should be enabled. BOOL showRestartButton = FALSE; - BOOL launchTargetExists = FALSE; LOC_STRING *successText = nullptr; HRESULT hr = S_OK; @@ -543,8 +543,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { if (BOOTSTRAPPER_RESTART_PROMPT == _command.restart) { showRestartButton = TRUE; } - } else if (ThemeControlExists(_theme, ID_LAUNCH_BUTTON)) { - launchTargetExists = BalStringVariableExists(PYBA_VARIABLE_LAUNCH_TARGET_PATH); } switch (_plannedAction) { @@ -571,9 +569,41 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { } } - ThemeControlEnable(_theme, ID_LAUNCH_BUTTON, launchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < _plannedAction); ThemeControlEnable(_theme, ID_SUCCESS_RESTART_TEXT, showRestartButton); ThemeControlEnable(_theme, ID_SUCCESS_RESTART_BUTTON, showRestartButton); + + if (_command.action != BOOTSTRAPPER_ACTION_INSTALL || + !IsWindowsVersionOrGreater(10, 0, 0)) { + ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE); + } else { + DWORD dataType = 0, buffer = 0, bufferLen = sizeof(buffer); + HKEY hKey; + LRESULT res = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\FileSystem", + 0, + KEY_READ, + &hKey + ); + if (res == ERROR_SUCCESS) { + res = RegQueryValueExW(hKey, L"LongPathsEnabled", nullptr, &dataType, + (LPBYTE)&buffer, &bufferLen); + RegCloseKey(hKey); + } + else { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Failed to open SYSTEM\\CurrentControlSet\\Control\\FileSystem: error code %d", res); + } + if (res == ERROR_SUCCESS && dataType == REG_DWORD && buffer == 0) { + ThemeControlElevates(_theme, ID_SUCCESS_MAX_PATH_BUTTON, TRUE); + } + else { + if (res == ERROR_SUCCESS) + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Failed to read LongPathsEnabled value: error code %d", res); + else + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Hiding MAX_PATH button because it is already enabled"); + ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE); + } + } } void FailurePage_Show() { @@ -626,6 +656,34 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { ThemeControlEnable(_theme, ID_FAILURE_RESTART_BUTTON, showRestartButton); } + static void EnableMaxPathSupport() { + LPWSTR targetDir = nullptr, defaultDir = nullptr; + HRESULT hr = BalGetStringVariable(L"TargetDir", &targetDir); + if (FAILED(hr) || !targetDir || !targetDir[0]) { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to get TargetDir"); + return; + } + + LPWSTR pythonw = nullptr; + StrAllocFormatted(&pythonw, L"%ls\\pythonw.exe", targetDir); + if (!pythonw || !pythonw[0]) { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to construct pythonw.exe path"); + return; + } + + LPCWSTR arguments = L"-c \"import winreg; " + "winreg.SetValueEx(" + "winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, " + "r'SYSTEM\\CurrentControlSet\\Control\\FileSystem'), " + "'LongPathsEnabled', " + "None, " + "winreg.REG_DWORD, " + "1" + ")\""; + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Executing %ls %ls", pythonw, arguments); + HINSTANCE res = ShellExecuteW(0, L"runas", pythonw, arguments, NULL, SW_HIDE); + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "return code 0x%08x", res); + } public: // IBootstrapperApplication virtual STDMETHODIMP OnStartup() { @@ -1216,12 +1274,6 @@ public: // IBootstrapperApplication } virtual STDMETHODIMP_(void) OnLaunchApprovedExeComplete(__in HRESULT hrStatus, __in DWORD /*processId*/) { - if (HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) == hrStatus) { - //try with ShelExec next time - OnClickLaunchButton(); - } else { - ::PostMessageW(_hWnd, WM_CLOSE, 0, 0); - } } @@ -1867,10 +1919,6 @@ private: switch (LOWORD(wParam)) { // Customize commands // Success/failure commands - case ID_LAUNCH_BUTTON: - pBA->OnClickLaunchButton(); - return 0; - case ID_SUCCESS_RESTART_BUTTON: __fallthrough; case ID_FAILURE_RESTART_BUTTON: pBA->OnClickRestartButton(); @@ -2372,69 +2420,6 @@ private: } - // - // OnClickLaunchButton - launch the app from the success page. - // - void OnClickLaunchButton() { - HRESULT hr = S_OK; - LPWSTR sczUnformattedLaunchTarget = nullptr; - LPWSTR sczLaunchTarget = nullptr; - LPWSTR sczLaunchTargetElevatedId = nullptr; - LPWSTR sczUnformattedArguments = nullptr; - LPWSTR sczArguments = nullptr; - int nCmdShow = SW_SHOWNORMAL; - - hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_TARGET_PATH, &sczUnformattedLaunchTarget); - BalExitOnFailure1(hr, "Failed to get launch target variable '%ls'.", PYBA_VARIABLE_LAUNCH_TARGET_PATH); - - hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); - BalExitOnFailure1(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); - - if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) { - hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); - BalExitOnFailure1(hr, "Failed to get launch target elevated id '%ls'.", PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); - } - - if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_ARGUMENTS)) { - hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); - BalExitOnFailure1(hr, "Failed to get launch arguments '%ls'.", PYBA_VARIABLE_LAUNCH_ARGUMENTS); - } - - if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_HIDDEN)) { - nCmdShow = SW_HIDE; - } - - if (sczLaunchTargetElevatedId && !_triedToLaunchElevated) { - _triedToLaunchElevated = TRUE; - hr = _engine->LaunchApprovedExe(_hWnd, sczLaunchTargetElevatedId, sczUnformattedArguments, 0); - if (FAILED(hr)) { - BalLogError(hr, "Failed to launch elevated target: %ls", sczLaunchTargetElevatedId); - - //try with ShelExec next time - OnClickLaunchButton(); - } - } else { - if (sczUnformattedArguments) { - hr = BalFormatString(sczUnformattedArguments, &sczArguments); - BalExitOnFailure1(hr, "Failed to format launch arguments variable: %ls", sczUnformattedArguments); - } - - hr = ShelExec(sczLaunchTarget, sczArguments, L"open", nullptr, nCmdShow, _hWnd, nullptr); - BalExitOnFailure1(hr, "Failed to launch target: %ls", sczLaunchTarget); - - ::PostMessageW(_hWnd, WM_CLOSE, 0, 0); - } - - LExit: - StrSecureZeroFreeString(sczArguments); - ReleaseStr(sczUnformattedArguments); - ReleaseStr(sczLaunchTargetElevatedId); - StrSecureZeroFreeString(sczLaunchTarget); - ReleaseStr(sczUnformattedLaunchTarget); - - return; - } - // // OnClickRestartButton - allows the restart and closes the app. @@ -3157,7 +3142,6 @@ public: _taskbarButtonCreatedMessage = UINT_MAX; _taskbarButtonOK = FALSE; _showingInternalUIThisPackage = FALSE; - _triedToLaunchElevated = FALSE; _suppressPaint = FALSE; @@ -3242,7 +3226,6 @@ private: UINT _taskbarButtonCreatedMessage; BOOL _taskbarButtonOK; BOOL _showingInternalUIThisPackage; - BOOL _triedToLaunchElevated; BOOL _suppressPaint; diff --git a/Tools/msi/bundle/bootstrap/pythonba.sln b/Tools/msi/bundle/bootstrap/pythonba.sln index 4857180..bf43fed 100644 --- a/Tools/msi/bundle/bootstrap/pythonba.sln +++ b/Tools/msi/bundle/bootstrap/pythonba.sln @@ -1,22 +1,22 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonba", "pythonba.vcxproj", "{7A09B132-B3EE-499B-A700-A4B2157FEA3D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Debug|Win32.Build.0 = Debug|Win32 - {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Release|Win32.ActiveCfg = Release|Win32 - {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonba", "pythonba.vcxproj", "{7A09B132-B3EE-499B-A700-A4B2157FEA3D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Debug|Win32.ActiveCfg = Debug|Win32 + {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Debug|Win32.Build.0 = Debug|Win32 + {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Release|Win32.ActiveCfg = Release|Win32 + {7A09B132-B3EE-499B-A700-A4B2157FEA3D}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Tools/msi/bundle/bootstrap/pythonba.vcxproj b/Tools/msi/bundle/bootstrap/pythonba.vcxproj index 3b101d7..bcd3951 100644 --- a/Tools/msi/bundle/bootstrap/pythonba.vcxproj +++ b/Tools/msi/bundle/bootstrap/pythonba.vcxproj @@ -1,69 +1,69 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - - Release - Win32 - v140 - v120 - {7A09B132-B3EE-499B-A700-A4B2157FEA3D} - PythonBA - - - - - DynamicLibrary - Unicode - $(Py_IntDir)\$(Configuration)_$(Platform)_Setup\Bootstrap\ - $(IntDir) - - - - - _CRT_STDIO_LEGACY_WIDE_SPECIFIERS=1;%(PreprocessorDefinitions) - $(WixInstallPath)sdk\inc - Use - pch.h - MultiThreaded - - - comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies) - $(WixInstallPath)sdk\vs2015\lib\x86 - $(WixInstallPath)sdk\vs2013\lib\x86 - pythonba.def - true - - - - - - - Create - - - - - - - - - - + + + + + + Debug + Win32 + + + Release + Win32 + + + + Release + Win32 + v140 + v120 + {7A09B132-B3EE-499B-A700-A4B2157FEA3D} + PythonBA + + + + + DynamicLibrary + Unicode + $(Py_IntDir)\$(Configuration)_$(Platform)_Setup\Bootstrap\ + $(IntDir) + + + + + _CRT_STDIO_LEGACY_WIDE_SPECIFIERS=1;%(PreprocessorDefinitions) + $(WixInstallPath)sdk\inc + Use + pch.h + MultiThreaded + + + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies) + $(WixInstallPath)sdk\vs2015\lib\x86 + $(WixInstallPath)sdk\vs2013\lib\x86 + pythonba.def + true + + + + + + + Create + + + + + + + + + + \ No newline at end of file diff --git a/Tools/msi/bundle/bundle.ico b/Tools/msi/bundle/bundle.ico deleted file mode 100644 index 1ab629e..0000000 Binary files a/Tools/msi/bundle/bundle.ico and /dev/null differ diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index eda0884..02a456b 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -5,7 +5,7 @@ + + + + @@ -16,10 +20,12 @@ + + @@ -40,7 +46,7 @@ - + @@ -57,7 +63,9 @@ - + + + diff --git a/Tools/msi/common_en-US.wxl_template b/Tools/msi/common_en-US.wxl_template index 8d03526..c95c271 100644 --- a/Tools/msi/common_en-US.wxl_template +++ b/Tools/msi/common_en-US.wxl_template @@ -14,4 +14,5 @@ A newer version of !(loc.ProductName) is already installed. An incorrect version of a prerequisite package is installed. Please uninstall any other versions of !(loc.ProductName) and try installing this again. The TARGETDIR variable must be provided when invoking this installer. + http://www.python.org/ diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index d26a603..24df0f5 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -14,6 +14,7 @@ + diff --git a/Tools/msi/exe/exe.wxs b/Tools/msi/exe/exe.wxs index 154cee5..03d43c6 100644 --- a/Tools/msi/exe/exe.wxs +++ b/Tools/msi/exe/exe.wxs @@ -9,6 +9,7 @@ + @@ -24,7 +25,6 @@ WorkingDirectory="InstallDirectory" /> - diff --git a/Tools/msi/exe/exe_d.wixproj b/Tools/msi/exe/exe_d.wixproj index 27545ca..cf085be 100644 --- a/Tools/msi/exe/exe_d.wixproj +++ b/Tools/msi/exe/exe_d.wixproj @@ -10,6 +10,7 @@ + diff --git a/Tools/msi/exe/exe_en-US.wxl_template b/Tools/msi/exe/exe_en-US.wxl_template index 577fbe5..1f9e290 100644 --- a/Tools/msi/exe/exe_en-US.wxl_template +++ b/Tools/msi/exe/exe_en-US.wxl_template @@ -4,4 +4,5 @@ executable Python {{ShortVersion}} ({{Bitness}}) Launches the !(loc.ProductName) interpreter. + http://www.python.org/ diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 9e47b5d..0138587 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -28,6 +28,9 @@ + + + @@ -66,10 +69,13 @@ - + - + + + + diff --git a/Tools/msi/exe/exe_pdb.wixproj b/Tools/msi/exe/exe_pdb.wixproj index 4f4c869..bf1213e 100644 --- a/Tools/msi/exe/exe_pdb.wixproj +++ b/Tools/msi/exe/exe_pdb.wixproj @@ -10,6 +10,7 @@ + diff --git a/Tools/msi/exe/exe_reg.wxs b/Tools/msi/exe/exe_reg.wxs new file mode 100644 index 0000000..4443c21 --- /dev/null +++ b/Tools/msi/exe/exe_reg.wxs @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj index 01a9dcb..8935ce8 100644 --- a/Tools/msi/launcher/launcher.wixproj +++ b/Tools/msi/launcher/launcher.wixproj @@ -5,7 +5,7 @@ 2.0 launcher Package - UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;$(DefineConstants) + UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;SuppressUpgradeTable=1;$(DefineConstants) true ICE80 diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs index ebd875c..7de131a 100644 --- a/Tools/msi/launcher/launcher.wxs +++ b/Tools/msi/launcher/launcher.wxs @@ -5,7 +5,10 @@ - + + + + @@ -26,18 +29,21 @@ NOT Installed AND NOT ALLUSERS=1 NOT Installed AND ALLUSERS=1 - UPGRADE or REMOVE_350_LAUNCHER + UPGRADE or REMOVE_350_LAUNCHER or REMOVE_360A1_LAUNCHER + + + + + - - + - Installed OR NOT BLOCK_360A1_LAUNCHER diff --git a/Tools/msi/launcher/launcher_en-US.wxl b/Tools/msi/launcher/launcher_en-US.wxl index e4c1aaa..a7e3827 100644 --- a/Tools/msi/launcher/launcher_en-US.wxl +++ b/Tools/msi/launcher/launcher_en-US.wxl @@ -11,6 +11,7 @@ Python File Python File (no console) Compiled Python File + Python Extension Module Python Zip Application File Python Zip Application File (no console) diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs index 981961a..dace97e 100644 --- a/Tools/msi/launcher/launcher_reg.wxs +++ b/Tools/msi/launcher/launcher_reg.wxs @@ -27,14 +27,18 @@ - + + + + + - + diff --git a/Tools/msi/lib/lib.wixproj b/Tools/msi/lib/lib.wixproj index 64e5878..26311ea 100644 --- a/Tools/msi/lib/lib.wixproj +++ b/Tools/msi/lib/lib.wixproj @@ -27,6 +27,7 @@ $(PySourcePath)Lib Lib\ lib_py + true diff --git a/Tools/msi/lib/lib.wxs b/Tools/msi/lib/lib.wxs index 2b04bcb..2a3b9ec 100644 --- a/Tools/msi/lib/lib.wxs +++ b/Tools/msi/lib/lib.wxs @@ -11,6 +11,7 @@ + diff --git a/Tools/msi/lib/lib_files.wxs b/Tools/msi/lib/lib_files.wxs index a992784..a83f544 100644 --- a/Tools/msi/lib/lib_files.wxs +++ b/Tools/msi/lib/lib_files.wxs @@ -1,6 +1,6 @@  - + @@ -63,16 +63,17 @@ - - - - - - + + + + + + + diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index 379c51d..f78e6ff 100644 --- a/Tools/msi/make_zip.proj +++ b/Tools/msi/make_zip.proj @@ -1,38 +1,41 @@ - - - - {10487945-15D1-4092-A214-338395C4116B} - python - - false - - - - - - false - python-$(PythonVersion)-embed-$(ArchName) - .zip - $(OutputPath)\$(TargetName)$(TargetExt) - rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)" - "$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py" - $(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(BuildPath.TrimEnd('\'))" - set DOC_FILENAME=python$(PythonVersion).chm - $(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform) - - - - - - - - - - - - - - - - - + + + + {10487945-15D1-4092-A214-338395C4116B} + python + + false + + + + + + false + python-$(PythonVersion)-embed-$(ArchName) + .zip + $(OutputPath)\$(TargetName)$(TargetExt) + rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)" + "$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py" + $(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName) + set DOC_FILENAME=python$(PythonVersion).chm +set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT + + + + + + + + + + + + + + + + + diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index 6a03cbe..8dbe83e 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -20,6 +20,7 @@ DEBUG_FILES = { '_ctypes_test', '_testbuffer', '_testcapi', + '_testconsole', '_testimportmultiple', '_testmultiphase', 'xxlimited', @@ -28,15 +29,12 @@ DEBUG_FILES = { EXCLUDE_FROM_LIBRARY = { '__pycache__', + 'ensurepip', 'idlelib', 'pydoc_data', 'site-packages', 'tkinter', 'turtledemo', -} - -EXCLUDE_FROM_EMBEDDABLE_LIBRARY = { - 'ensurepip', 'venv', } @@ -45,11 +43,16 @@ EXCLUDE_FILE_FROM_LIBRARY = { } EXCLUDE_FILE_FROM_LIBS = { + 'liblzma', 'ssleay', 'libeay', 'python3stub', } +EXCLUDED_FILES = { + 'pyshellext', +} + def is_not_debug(p): if DEBUG_RE.search(p.name): return False @@ -57,7 +60,7 @@ def is_not_debug(p): if TKTCL_RE.search(p.name): return False - return p.stem.lower() not in DEBUG_FILES + return p.stem.lower() not in DEBUG_FILES and p.stem.lower() not in EXCLUDED_FILES def is_not_debug_or_python(p): return is_not_debug(p) and not PYTHON_DLL_RE.search(p.name) @@ -67,8 +70,6 @@ def include_in_lib(p): if p.is_dir(): if name in EXCLUDE_FROM_LIBRARY: return False - if name.startswith('plat-'): - return False if name == 'test' and p.parts[-2].lower() == 'lib': return False if name in {'test', 'tests'} and p.parts[-3].lower() == 'lib': @@ -81,12 +82,6 @@ def include_in_lib(p): suffix = p.suffix.lower() return suffix not in {'.pyc', '.pyo', '.exe'} -def include_in_embeddable_lib(p): - if p.is_dir() and p.name.lower() in EXCLUDE_FROM_EMBEDDABLE_LIBRARY: - return False - - return include_in_lib(p) - def include_in_libs(p): if not is_not_debug(p): return False @@ -99,25 +94,27 @@ def include_in_tools(p): return p.suffix.lower() in {'.py', '.pyw', '.txt'} +BASE_NAME = 'python{0.major}{0.minor}'.format(sys.version_info) + FULL_LAYOUT = [ - ('/', '$build', 'python.exe', is_not_debug), - ('/', '$build', 'pythonw.exe', is_not_debug), - ('/', '$build', 'python{0.major}.dll'.format(sys.version_info), is_not_debug), - ('/', '$build', 'python{0.major}{0.minor}.dll'.format(sys.version_info), is_not_debug), - ('DLLs/', '$build', '*.pyd', is_not_debug), - ('DLLs/', '$build', '*.dll', is_not_debug_or_python), + ('/', 'PCBuild/$arch', 'python.exe', is_not_debug), + ('/', 'PCBuild/$arch', 'pythonw.exe', is_not_debug), + ('/', 'PCBuild/$arch', 'python{}.dll'.format(sys.version_info.major), is_not_debug), + ('/', 'PCBuild/$arch', '{}.dll'.format(BASE_NAME), is_not_debug), + ('DLLs/', 'PCBuild/$arch', '*.pyd', is_not_debug), + ('DLLs/', 'PCBuild/$arch', '*.dll', is_not_debug_or_python), ('include/', 'include', '*.h', None), ('include/', 'PC', 'pyconfig.h', None), ('Lib/', 'Lib', '**/*', include_in_lib), - ('libs/', '$build', '*.lib', include_in_libs), + ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs), ('Tools/', 'Tools', '**/*', include_in_tools), ] EMBED_LAYOUT = [ - ('/', '$build', 'python*.exe', is_not_debug), - ('/', '$build', '*.pyd', is_not_debug), - ('/', '$build', '*.dll', is_not_debug), - ('python{0.major}{0.minor}.zip'.format(sys.version_info), 'Lib', '**/*', include_in_embeddable_lib), + ('/', 'PCBuild/$arch', 'python*.exe', is_not_debug), + ('/', 'PCBuild/$arch', '*.pyd', is_not_debug), + ('/', 'PCBuild/$arch', '*.dll', is_not_debug), + ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_lib), ] if os.getenv('DOC_FILENAME'): @@ -181,15 +178,15 @@ def main(): parser.add_argument('-o', '--out', metavar='file', help='The name of the output archive', type=Path, default=None) parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None) parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False) - parser.add_argument('-b', '--build', help='Specify the build directory', type=Path) + parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32") ns = parser.parse_args() source = ns.source or (Path(__file__).resolve().parent.parent.parent) out = ns.out - build = ns.build + arch = ns.arch assert isinstance(source, Path) assert not out or isinstance(out, Path) - assert isinstance(build, Path) + assert isinstance(arch, str) if ns.temp: temp = ns.temp @@ -212,10 +209,7 @@ def main(): try: for t, s, p, c in layout: - if s == '$build': - fs = build - else: - fs = source / s + fs = source / s.replace("$arch", arch) files = rglob(fs, p, c) extra_files = [] if s == 'Lib' and p == '**/*': @@ -226,8 +220,13 @@ def main(): copied = copy_to_layout(temp / t.rstrip('/'), chain(files, extra_files)) print('Copied {} files'.format(copied)) - with open(str(temp / 'pyvenv.cfg'), 'w') as f: - print('applocal = true', file=f) + if ns.embed: + with open(str(temp / (BASE_NAME + '._pth')), 'w') as f: + print(BASE_NAME + '.zip', file=f) + print('.', file=f) + print('', file=f) + print('# Uncomment to run site.main() automatically', file=f) + print('#import site', file=f) if out: total = copy_to_layout(out, rglob(temp, '**/*', None)) diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 18d0e52..60abba1 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -1,177 +1,188 @@ - - - - $(OutputName) - false - false - $(SuppressIces);ICE03;ICE57;ICE61 - 1026 - false - true - Release - x86 - perUser - - - - - - - - $(ComputerName)/$(ArchName)/ - $(ReleaseUri)/ - - - - - - - - WixUtilExtension - WixUtilExtension - - - - - $(Py_IntDir)\$(Configuration)_$(Platform)_Setup\$(OutputName) - $(IntermediateOutputPath)_$(OutputSuffix) - $(BuildPath) - $(OutputPath)\ - $(OutputPath) - true - $(ExternalsDir)\windows-installer\redist - - python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm - - $(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0 - - - - $([System.Math]::Floor($([System.DateTime]::Now.Subtract($([System.DateTime]::new(2001, 1, 1))).TotalDays))) - $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)dev$(RevisionNumber) - $(MajorVersionNumber).$(MinorVersionNumber).$(RevisionNumber).0 - - - - 32-bit - 64-bit - - $(DefineConstants); - Version=$(InstallerVersion); - ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber); - LongVersion=$(PythonVersion); - MajorVersionNumber=$(MajorVersionNumber); - MinorVersionNumber=$(MinorVersionNumber); - UpgradeMinimumVersion=$(MajorVersionNumber).$(MinorVersionNumber).0.0; - NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; - Bitness=$(Bitness); - PyDebugExt=$(PyDebugExt); - PyArchExt=$(PyArchExt); - PyTestExt=$(PyTestExt); - OptionalFeatureName=$(OutputName); - - - $(DefineConstants);CRTRedist=$(CRTRedist); - - - $(DefineConstants);Suffix32=-32; - - - $(DefineConstants);Suffix32=; - - - - - - generated_filelist - - - - - false - - - - - - - - - - - src - - - tcltk - - - redist - - - redist - - - build32 - - - build64 - - - - - - - - - <_Uuid Include="CoreUpgradeCode"> - upgradecode - - <_Uuid Include="UpgradeCode"> - upgradecode/$(OutputName) - - <_Uuid Include="InstallDirectoryGuidSeed"> - installdirectoryseed - - <_Uuid Include="PythonExeComponentGuid"> - python.exe - - <_Uuid Include="PythonwExeComponentGuid"> - pythonw.exe - - <_Uuid Include="RemoveLib2to3PickleComponentGuid"> - lib2to3/pickles - - - - - <_Uuids>@(_Uuid->'("%(Identity)", "$(MajorVersionNumber).$(MinorVersionNumber)/%(Uri)")',',') - <_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri.Replace(`{arch}`, `$(ArchName)`))' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))])) - - - - - - - - - - $(DefineConstants);@(_UuidValue,';'); - - + + + + $(OutputName) + false + false + $(SuppressIces);ICE03;ICE57;ICE61 + 1026 + false + true + Release + x86 + perUser + <_MakeCatCommand Condition="'$(_MakeCatCommand)' == ''">makecat + + + + + + + + $(ComputerName)/$(ArchName)/ + $(ReleaseUri)/ + + + + + + + + WixUtilExtension + WixUtilExtension + + + + + $(Py_IntDir)\$(Configuration)_$(Platform)_Setup\$(OutputName) + $(IntermediateOutputPath)_$(OutputSuffix) + $(BuildPath) + $(OutputPath)\ + $(OutputPath) + true + $(ExternalsDir)\windows-installer\redist + + python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm + + $(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0 + + + + $([System.Math]::Floor($([System.DateTime]::Now.Subtract($([System.DateTime]::new(2001, 1, 1))).TotalDays))) + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)dev$(RevisionNumber) + $(MajorVersionNumber).$(MinorVersionNumber).$(RevisionNumber).0 + + + + 32-bit + 64-bit + 32bit + 64bit + + $(DefineConstants); + Version=$(InstallerVersion); + ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber); + LongVersion=$(PythonVersion); + MajorVersionNumber=$(MajorVersionNumber); + MinorVersionNumber=$(MinorVersionNumber); + UpgradeMinimumVersion=$(MajorVersionNumber).$(MinorVersionNumber).0.0; + NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; + Bitness=$(Bitness); + PlatformArchitecture=$(PlatformArchitecture); + PyDebugExt=$(PyDebugExt); + PyArchExt=$(PyArchExt); + PyTestExt=$(PyTestExt); + OptionalFeatureName=$(OutputName); + + + $(DefineConstants);CRTRedist=$(CRTRedist); + + + $(DefineConstants);Suffix32=-32; + + + $(DefineConstants);Suffix32=; + + + + + + generated_filelist + + + false + + + false + + + + + + + + + + + src + + + tcltk + + + redist + + + redist + + + build32 + + + build64 + + + + + + + + + <_Uuid Include="CoreUpgradeCode"> + upgradecode + + <_Uuid Include="UpgradeCode"> + upgradecode/$(OutputName) + + <_Uuid Include="InstallDirectoryGuidSeed"> + installdirectoryseed + + <_Uuid Include="PythonExeComponentGuid"> + python.exe + + <_Uuid Include="PythonwExeComponentGuid"> + pythonw.exe + + <_Uuid Include="RemoveLib2to3PickleComponentGuid"> + lib2to3/pickles + + <_Uuid Include="CommonPythonRegComponentGuid"> + registry + + <_Uuid Include="PythonRegComponentGuid"> + registry/$(OutputName) + + + + + <_Uuids>@(_Uuid->'("%(Identity)", "$(MajorVersionNumber).$(MinorVersionNumber)/%(Uri)")',',') + <_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri.Replace(`{arch}`, `$(ArchName)`))' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))])) + + + + + + + + + + $(DefineConstants);@(_UuidValue,';'); + + \ No newline at end of file diff --git a/Tools/msi/msi.targets b/Tools/msi/msi.targets index 86be35b..9283a1e 100644 --- a/Tools/msi/msi.targets +++ b/Tools/msi/msi.targets @@ -12,8 +12,10 @@ <_Source>%(Source)$([msbuild]::MakeRelative(%(SourceBase), %(FullPath))) <_Target>%(Target_)$([msbuild]::MakeRelative(%(TargetBase), %(FullPath))) + + <_CatalogFiles Include="@(InstallFiles)" Condition="%(InstallFiles.IncludeInCat) and ''!=$([System.IO.File]::ReadAllText(%(InstallFiles.FullPath)))" /> - + @@ -24,6 +26,35 @@ + + + <_CatFileSourceTarget>$(IntermediateOutputPath)$(MSBuildProjectName).cdf + <_CatFileTarget>$(IntermediateOutputPath)python_$(MSBuildProjectName).cat + <_CatFile>[CatalogHeader] +Name=$([System.IO.Path]::GetFileName($(_CatFileTarget))) +ResultDir=$([System.IO.Path]::GetDirectoryName($(_CatFileTarget))) +PublicVersion=1 +CatalogVersion=2 +HashAlgorithms=SHA256 +PageHashes=false +EncodingType= + +[CatalogFiles] +@(_CatalogFiles->'<HASH>%(Filename)%(Extension)=%(FullPath)',' +') + + + + + + + + + + + + <_Content>$([System.IO.File]::ReadAllText(%(WxlTemplate.FullPath)).Replace(`{{ShortVersion}}`, `$(MajorVersionNumber).$(MinorVersionNumber)$(PyTestExt)`).Replace(`{{LongVersion}}`, `$(PythonVersion)$(PyTestExt)`).Replace(`{{Bitness}}`, `$(Bitness)`)) diff --git a/Tools/msi/test/test_files.wxs b/Tools/msi/test/test_files.wxs index e803aa0..82a9115 100644 --- a/Tools/msi/test/test_files.wxs +++ b/Tools/msi/test/test_files.wxs @@ -1,77 +1,42 @@  + - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + diff --git a/Tools/msi/tools/tools.wixproj b/Tools/msi/tools/tools.wixproj index f43cf33..b7fc41e 100644 --- a/Tools/msi/tools/tools.wixproj +++ b/Tools/msi/tools/tools.wixproj @@ -36,6 +36,7 @@ $(PySourcePath) tools_py + true diff --git a/Tools/msi/tools/tools.wxs b/Tools/msi/tools/tools.wxs index 8f8418a..7a805d0 100644 --- a/Tools/msi/tools/tools.wxs +++ b/Tools/msi/tools/tools.wxs @@ -9,6 +9,7 @@ + diff --git a/Tools/msi/tools/tools_files.wxs b/Tools/msi/tools/tools_files.wxs index 3ae0db2..9c76b1b 100644 --- a/Tools/msi/tools/tools_files.wxs +++ b/Tools/msi/tools/tools_files.wxs @@ -13,4 +13,11 @@ + + + + + + + diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat index 07b2573..4e319ce 100644 --- a/Tools/msi/uploadrelease.bat +++ b/Tools/msi/uploadrelease.bat @@ -9,8 +9,6 @@ set USER= set TARGET= set DRYRUN=false set NOGPG= -set PURGE_OPTION=/p:Purge=true -set NOTEST= :CheckOpts if "%1" EQU "-h" goto Help @@ -21,11 +19,7 @@ if "%1" EQU "--user" (set USER=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts -if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts -if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && godo CheckOpts -if "%1" EQU "--skip-test" (set NOTEST=true) && shift && godo CheckOpts -if "%1" EQU "-T" (set NOTEST=true) && shift && godo CheckOpts -if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1 +if "%1" EQU "--no-gpg" (set NOGPG=true) && shift && goto CheckOpts if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where /R "%ProgramFiles(x86)%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" @@ -41,7 +35,7 @@ echo Found pscp.exe at %PSCP% if defined NOGPG ( set GPG= - echo Skipping GPG signature generation because of --skip-gpg + echo Skipping GPG signature generation because of --no-gpg ) else ( if not defined GPG where gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc" if not defined GPG where /R "%PCBUILD%..\externals\windows-installer" gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc" @@ -49,29 +43,21 @@ if defined NOGPG ( echo Found gpg2.exe at %GPG% ) -call "%PCBUILD%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) +call "%PCBUILD%env.bat" > nul 2> nul pushd "%D%" -%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86 %PURGE_OPTION% -%MSBUILD% /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false %PURGE_OPTION% -if not defined NOTEST ( - %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x86 - %MSBUILD% /v:m /nologo uploadrelease.proj /t:Test /p:Platform=x64 -) -%MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86 -%MSBUILD% /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false +msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86 +msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false +msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86 +msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false popd exit /B 0 :Help echo uploadrelease.bat --host HOST --user USERNAME [--target TARGET] [--dry-run] [-h] echo. -echo --host (-o) Specify the upload host (required) -echo --user (-u) Specify the user on the host (required) -echo --target (-t) Specify the target directory on the host -echo --dry-run Display commands and filenames without executing them -echo --skip-gpg Does not generate GPG signatures before uploading -echo --skip-purge Does not perform CDN purge after uploading -echo --skip-test (-T) Does not perform post-upload tests -echo -h Display this help information +echo --host (-o) Specify the upload host (required) +echo --user (-u) Specify the user on the host (required) +echo --target (-t) Specify the target directory on the host +echo --dry-run Display commands and filenames without executing them +echo -h Display this help information echo. diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj index dd82ee0..0d472de 100644 --- a/Tools/msi/uploadrelease.proj +++ b/Tools/msi/uploadrelease.proj @@ -1,112 +1,80 @@ - - - - {2D69F2AB-D5D0-4344-84B5-EF6DB34A9BC9} - python - - - $(TARGET) - /srv/www.python.org/ftp/python - true - true - false - false - - - - - - - $(DownloadUrlBase.TrimEnd(`/`))/$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) - $(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, ``).TrimEnd(`/`)) - - - - - $(MSITarget) - - - $(EXETarget) - - - $(EXETarget) - - - - - - - - - - - - - - - - - %(File.CopyTo) - - - - - - - - - - - - - - - - - - - - - - $(TEMP)\%(Filename)_source - $(TEMP)\%(Filename)_source\%(Filename)%(Extension) - $(TEMP)\%(Filename)_layout - $(OutputPath)\%(Filename)_layoutlog - $(OutputPath)\%(Filename)_layoutlog\%(Filename).log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + {2D69F2AB-D5D0-4344-84B5-EF6DB34A9BC9} + python + + + $(TARGET) + /srv/www.python.org/ftp/python + true + false + + + + + + + $(DownloadUrlBase.TrimEnd(`/`))/$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) + $(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, ``).TrimEnd(`/`)) + + + + + $(MSITarget) + + + $(EXETarget) + + + $(EXETarget) + + + + + + + + + + + + + + + + + %(File.CopyTo) + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tools/msi/wix.props b/Tools/msi/wix.props index 18a304d..fbb2d10 100644 --- a/Tools/msi/wix.props +++ b/Tools/msi/wix.props @@ -1,12 +1,12 @@ - - - - - - $(MSBuildThisFileDirectory)\Wix\ - $(ExternalsDir)\windows-installer\wix\ - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot) - $(WixInstallPath)\Wix.targets - + + + + + + $(MSBuildThisFileDirectory)\Wix\ + $(ExternalsDir)\windows-installer\wix\ + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot) + $(WixInstallPath)\Wix.targets + \ No newline at end of file diff --git a/Tools/nuget/build.bat b/Tools/nuget/build.bat index b02e770..120b38c 100644 --- a/Tools/nuget/build.bat +++ b/Tools/nuget/build.bat @@ -21,8 +21,7 @@ if "%~1" EQU "-p" (set PACKAGES=%PACKAGES% %~2) && shift && shift && goto CheckO if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) call "%D%..\msi\get_externals.bat" -call "%PCBUILD%find_msbuild.bat" %MSBUILD% -if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) +call "%PCBUILD%env.bat" x86 if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%" @@ -31,7 +30,7 @@ if defined BUILDX86 ( ) else if not exist "%PCBUILD%win32\python.exe" call "%PCBUILD%build.bat" -e if errorlevel 1 goto :eof - %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% + msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% if errorlevel 1 goto :eof ) @@ -40,7 +39,7 @@ if defined BUILDX64 ( ) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e if errorlevel 1 goto :eof - %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% + msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% if errorlevel 1 goto :eof ) diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index 007827f..d7e932c 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -1,55 +1,57 @@ - - - - {10487945-15D1-4092-A214-338395C4116B} - python - $(OutputName)x86 - - false - true - - - - - - $(ExternalsDir)\windows-installer\nuget\nuget.exe - $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) - $(NuspecVersion)-$(ReleaseLevelName) - false - $(OutputName).$(NuspecVersion) - .nupkg - $(IntermediateOutputPath)\nuget_$(ArchName) - - rmdir /q/s "$(IntermediateOutputPath)" - - "$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py" - $(PythonArguments) -t "$(IntermediateOutputPath)" -b "$(BuildPath.TrimEnd('\'))" - - "$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()" - "$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages) - - "$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" - $(NugetArguments) -BasePath "$(IntermediateOutputPath)" - $(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))" - $(NugetArguments) -Version "$(NuspecVersion)" - $(NugetArguments) -NoPackageAnalysis -NonInteractive - - set DOC_FILENAME=python$(PythonVersion).chm - $(Environment)%0D%0Aset VCREDIST_PATH=$(CRTRedist)\$(Platform) - - - - - - - - - - - - - - - - - + + + + {10487945-15D1-4092-A214-338395C4116B} + python + $(OutputName)x86 + + false + true + + + + + + $(ExternalsDir)\windows-installer\nuget\nuget.exe + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) + $(NuspecVersion)-$(ReleaseLevelName) + false + $(OutputName).$(NuspecVersion) + .nupkg + $(IntermediateOutputPath)\nuget_$(ArchName) + + rmdir /q/s "$(IntermediateOutputPath)" + + "$(PythonExe)" "$(MSBuildThisFileDirectory)\..\msi\make_zip.py" + $(PythonArguments) -t "$(IntermediateOutputPath)" -a $(ArchName) + + "$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()" + "$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages) + + "$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" + $(NugetArguments) -BasePath "$(IntermediateOutputPath)" + $(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))" + $(NugetArguments) -Version "$(NuspecVersion)" + $(NugetArguments) -NoPackageAnalysis -NonInteractive + + setlocal +set DOC_FILENAME=python$(PythonVersion).chm +set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT + + + + + + + + + + + + + + + + + diff --git a/Tools/parser/unparse.py b/Tools/parser/unparse.py index 285030e..7e1cc4e 100644 --- a/Tools/parser/unparse.py +++ b/Tools/parser/unparse.py @@ -104,6 +104,19 @@ class Unparser: self.write(" "+self.binop[t.op.__class__.__name__]+"= ") self.dispatch(t.value) + def _AnnAssign(self, t): + self.fill() + if not t.simple and isinstance(t.target, ast.Name): + self.write('(') + self.dispatch(t.target) + if not t.simple and isinstance(t.target, ast.Name): + self.write(')') + self.write(": ") + self.dispatch(t.annotation) + if t.value: + self.write(" = ") + self.dispatch(t.value) + def _Return(self, t): self.fill("return") if t.value: @@ -322,9 +335,72 @@ class Unparser: def _Str(self, tree): self.write(repr(tree.s)) + def _JoinedStr(self, t): + self.write("f") + string = io.StringIO() + self._fstring_JoinedStr(t, string.write) + self.write(repr(string.getvalue())) + + def _FormattedValue(self, t): + self.write("f") + string = io.StringIO() + self._fstring_FormattedValue(t, string.write) + self.write(repr(string.getvalue())) + + def _fstring_JoinedStr(self, t, write): + for value in t.values: + meth = getattr(self, "_fstring_" + type(value).__name__) + meth(value, write) + + def _fstring_Str(self, t, write): + value = t.s.replace("{", "{{").replace("}", "}}") + write(value) + + def _fstring_Constant(self, t, write): + assert isinstance(t.value, str) + value = t.value.replace("{", "{{").replace("}", "}}") + write(value) + + def _fstring_FormattedValue(self, t, write): + write("{") + expr = io.StringIO() + Unparser(t.value, expr) + expr = expr.getvalue().rstrip("\n") + if expr.startswith("{"): + write(" ") # Separate pair of opening brackets as "{ {" + write(expr) + if t.conversion != -1: + conversion = chr(t.conversion) + assert conversion in "sra" + write(f"!{conversion}") + if t.format_spec: + write(":") + meth = getattr(self, "_fstring_" + type(t.format_spec).__name__) + meth(t.format_spec, write) + write("}") + def _Name(self, t): self.write(t.id) + def _write_constant(self, value): + if isinstance(value, (float, complex)): + self.write(repr(value).replace("inf", INFSTR)) + else: + self.write(repr(value)) + + def _Constant(self, t): + value = t.value + if isinstance(value, tuple): + self.write("(") + if len(value) == 1: + self._write_constant(value[0]) + self.write(",") + else: + interleave(lambda: self.write(", "), self._write_constant, value) + self.write(")") + else: + self._write_constant(t.value) + def _NameConstant(self, t): self.write(repr(t.value)) @@ -368,7 +444,10 @@ class Unparser: self.write("}") def _comprehension(self, t): - self.write(" for ") + if t.is_async: + self.write(" async for ") + else: + self.write(" for ") self.dispatch(t.target) self.write(" in ") self.dispatch(t.iter) @@ -413,7 +492,7 @@ class Unparser: def _Tuple(self, t): self.write("(") if len(t.elts) == 1: - (elt,) = t.elts + elt = t.elts[0] self.dispatch(elt) self.write(",") else: @@ -460,7 +539,8 @@ class Unparser: # Special case: 3.__abs__() is a syntax error, so if t.value # is an integer literal then we need to either parenthesize # it or add an extra space to get 3 .__abs__(). - if isinstance(t.value, ast.Num) and isinstance(t.value.n, int): + if ((isinstance(t.value, ast.Num) and isinstance(t.value.n, int)) + or (isinstance(t.value, ast.Constant) and isinstance(t.value.value, int))): self.write(" ") self.write(".") self.write(t.attr) diff --git a/Tools/pybench/CommandLine.py b/Tools/pybench/CommandLine.py index 073cca0..54a8ba7 100644 --- a/Tools/pybench/CommandLine.py +++ b/Tools/pybench/CommandLine.py @@ -99,8 +99,8 @@ def option_dict(options): # Alias getpasswd = invisible_input -_integerRE = re.compile('\s*(-?\d+)\s*$') -_integerRangeRE = re.compile('\s*(-?\d+)\s*-\s*(-?\d+)\s*$') +_integerRE = re.compile(r'\s*(-?\d+)\s*$') +_integerRangeRE = re.compile(r'\s*(-?\d+)\s*-\s*(-?\d+)\s*$') def srange(s, diff --git a/Tools/pybench/With.py b/Tools/pybench/With.py index 5f59e8c..30cd3c2 100644 --- a/Tools/pybench/With.py +++ b/Tools/pybench/With.py @@ -1,4 +1,3 @@ -from __future__ import with_statement from pybench import Test class WithFinally(Test): diff --git a/Tools/pynche/ColorDB.py b/Tools/pynche/ColorDB.py index 5ced0e7..0348148 100644 --- a/Tools/pynche/ColorDB.py +++ b/Tools/pynche/ColorDB.py @@ -134,17 +134,17 @@ class ColorDB: class RGBColorDB(ColorDB): _re = re.compile( - '\s*(?P\d+)\s+(?P\d+)\s+(?P\d+)\s+(?P.*)') + r'\s*(?P\d+)\s+(?P\d+)\s+(?P\d+)\s+(?P.*)') class HTML40DB(ColorDB): - _re = re.compile('(?P\S+)\s+(?P#[0-9a-fA-F]{6})') + _re = re.compile(r'(?P\S+)\s+(?P#[0-9a-fA-F]{6})') def _extractrgb(self, mo): return rrggbb_to_triplet(mo.group('hexrgb')) class LightlinkDB(HTML40DB): - _re = re.compile('(?P(.+))\s+(?P#[0-9a-fA-F]{6})') + _re = re.compile(r'(?P(.+))\s+(?P#[0-9a-fA-F]{6})') def _extractname(self, mo): return mo.group('name').strip() diff --git a/Tools/scripts/combinerefs.py b/Tools/scripts/combinerefs.py index e10e49a..7ca9526 100755 --- a/Tools/scripts/combinerefs.py +++ b/Tools/scripts/combinerefs.py @@ -6,7 +6,7 @@ combinerefs path A helper for analyzing PYTHONDUMPREFS output. When the PYTHONDUMPREFS envar is set in a debug build, at Python shutdown -time Py_Finalize() prints the list of all live objects twice: first it +time Py_FinalizeEx() prints the list of all live objects twice: first it prints the repr() of each object while the interpreter is still fully intact. After cleaning up everything it can, it prints all remaining live objects again, but the second time just prints their addresses, refcounts, and type @@ -41,7 +41,7 @@ CAUTION: If object is a container type, it may not actually contain all the objects shown in the repr: the repr was captured from the first output block, and some of the containees may have been released since then. For example, it's common for the line showing the dict of interned strings to display -strings that no longer exist at the end of Py_Finalize; this can be recognized +strings that no longer exist at the end of Py_FinalizeEx; this can be recognized (albeit painfully) because such containees don't have a line of their own. The objects are listed in allocation order, with most-recently allocated diff --git a/Tools/scripts/diff.py b/Tools/scripts/diff.py index 9720a43..96199b8 100755 --- a/Tools/scripts/diff.py +++ b/Tools/scripts/diff.py @@ -8,7 +8,7 @@ """ -import sys, os, time, difflib, argparse +import sys, os, difflib, argparse from datetime import datetime, timezone def file_mtime(path): diff --git a/Tools/scripts/fixdiv.py b/Tools/scripts/fixdiv.py index 20f3386..1213a4e 100755 --- a/Tools/scripts/fixdiv.py +++ b/Tools/scripts/fixdiv.py @@ -174,8 +174,8 @@ def usage(msg): sys.stderr.write("Usage: %s [-m] warnings\n" % sys.argv[0]) sys.stderr.write("Try `%s -h' for more information.\n" % sys.argv[0]) -PATTERN = ("^(.+?):(\d+): DeprecationWarning: " - "classic (int|long|float|complex) division$") +PATTERN = (r"^(.+?):(\d+): DeprecationWarning: " + r"classic (int|long|float|complex) division$") def readwarnings(warningsfile): prog = re.compile(PATTERN) diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py index c62f9a5..948b56f 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -1,7 +1,5 @@ # This script generates the opcode.h header file. -from __future__ import with_statement - import sys header = """/* Auto-generated by Tools/scripts/generate_opcode_h.py */ #ifndef Py_OPCODE_H diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py index 0967fc2..4363c0c 100755 --- a/Tools/scripts/h2py.py +++ b/Tools/scripts/h2py.py @@ -23,13 +23,13 @@ import sys, re, getopt, os -p_define = re.compile('^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+') +p_define = re.compile(r'^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+') p_macro = re.compile( - '^[\t ]*#[\t ]*define[\t ]+' - '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+') + r'^[\t ]*#[\t ]*define[\t ]+' + r'([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+') -p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>') +p_include = re.compile(r'^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>') p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?') p_cpp_comment = re.compile('//.*') diff --git a/Tools/scripts/highlight.py b/Tools/scripts/highlight.py index 66ad868..9272fee 100755 --- a/Tools/scripts/highlight.py +++ b/Tools/scripts/highlight.py @@ -147,14 +147,14 @@ def build_html_page(classified_text, title='python', #### LaTeX Output ########################################## default_latex_commands = { - 'comment': '{\color{red}#1}', - 'string': '{\color{ForestGreen}#1}', - 'docstring': '{\emph{\color{ForestGreen}#1}}', - 'keyword': '{\color{orange}#1}', - 'builtin': '{\color{purple}#1}', - 'definition': '{\color{orange}#1}', - 'defname': '{\color{blue}#1}', - 'operator': '{\color{brown}#1}', + 'comment': r'{\color{red}#1}', + 'string': r'{\color{ForestGreen}#1}', + 'docstring': r'{\emph{\color{ForestGreen}#1}}', + 'keyword': r'{\color{orange}#1}', + 'builtin': r'{\color{purple}#1}', + 'definition': r'{\color{orange}#1}', + 'defname': r'{\color{blue}#1}', + 'operator': r'{\color{brown}#1}', } default_latex_document = r''' diff --git a/Tools/scripts/idle3 b/Tools/scripts/idle3 index 8ee92c2..d7332bc 100755 --- a/Tools/scripts/idle3 +++ b/Tools/scripts/idle3 @@ -1,5 +1,5 @@ #! /usr/bin/env python3 -from idlelib.PyShell import main +from idlelib.pyshell import main if __name__ == '__main__': main() diff --git a/Tools/scripts/mailerdaemon.py b/Tools/scripts/mailerdaemon.py index aeb451e..635e548 100755 --- a/Tools/scripts/mailerdaemon.py +++ b/Tools/scripts/mailerdaemon.py @@ -88,7 +88,7 @@ del i # no more expressions are searched for. So, order is important. emparse_list_reason = [ r'^5\d{2} <>\.\.\. (?P.*)', - '<>\.\.\. (?P.*)', + r'<>\.\.\. (?P.*)', re.compile(r'^<<< 5\d{2} (?P.*)', re.MULTILINE), re.compile('===== stderr was =====\nrmail: (?P.*)'), re.compile('^Diagnostic-Code: (?P.*)', re.MULTILINE), diff --git a/Tools/scripts/nm2def.py b/Tools/scripts/nm2def.py index 8f07559..83bbcd7 100755 --- a/Tools/scripts/nm2def.py +++ b/Tools/scripts/nm2def.py @@ -36,8 +36,8 @@ option to produce this format (since it is the original v7 Unix format). """ import os, sys -PYTHONLIB = 'libpython'+sys.version[:3]+'.a' -PC_PYTHONLIB = 'Python'+sys.version[0]+sys.version[2]+'.dll' +PYTHONLIB = 'libpython%d.%d.a' % sys.version_info[:2] +PC_PYTHONLIB = 'Python%d%d.dll' % sys.version_info[:2] NM = 'nm -p -g %s' # For Linux, use "nm -g %s" def symbols(lib=PYTHONLIB,types=('T','C','D')): diff --git a/Tools/scripts/parseentities.py b/Tools/scripts/parseentities.py index a042d1c..c686b02 100755 --- a/Tools/scripts/parseentities.py +++ b/Tools/scripts/parseentities.py @@ -14,7 +14,7 @@ """ import re,sys -entityRE = re.compile('') +entityRE = re.compile(r'') def parse(text,pos=0,endpos=None): @@ -39,7 +39,7 @@ def writefile(f,defs): if charcode[:2] == '&#': code = int(charcode[2:-1]) if code < 256: - charcode = "'\%o'" % code + charcode = r"'\%o'" % code else: charcode = repr(charcode) else: diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index 0aacd9e..58b081a 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Check proposed changes for common issues.""" import re import sys import shutil @@ -13,6 +12,7 @@ import untabify SRCDIR = sysconfig.get_config_var('srcdir') + def n_files_str(count): """Return 'N file(s)' with the proper plurality on 'file'.""" return "{} file{}".format(count, "s" if count != 1 else "") @@ -46,76 +46,27 @@ def mq_patches_applied(): return st.returncode == 0 and bstdout -def get_git_branch(): - """Get the symbolic name for the current git branch""" - cmd = "git rev-parse --abbrev-ref HEAD".split() - try: - return subprocess.check_output(cmd, stderr=subprocess.DEVNULL) - except subprocess.CalledProcessError: - return None - - -def get_git_upstream_remote(): - """Get the remote name to use for upstream branches - - Uses "upstream" if it exists, "origin" otherwise - """ - cmd = "git remote get-url upstream".split() - try: - subprocess.check_output(cmd, stderr=subprocess.DEVNULL) - except subprocess.CalledProcessError: - return "origin" - return "upstream" - - -@status("Getting base branch for PR", - info=lambda x: x if x is not None else "not a PR branch") -def get_base_branch(): - if not os.path.exists(os.path.join(SRCDIR, '.git')): - # Not a git checkout, so there's no base branch - return None - version = sys.version_info - if version.releaselevel == 'alpha': - base_branch = "master" - else: - base_branch = "{0.major}.{0.minor}".format(version) - this_branch = get_git_branch() - if this_branch is None or this_branch == base_branch: - # Not on a git PR branch, so there's no base branch - return None - upstream_remote = get_git_upstream_remote() - return upstream_remote + "/" + base_branch - - @status("Getting the list of files that have been added/changed", info=lambda x: n_files_str(len(x))) -def changed_files(base_branch=None): +def changed_files(): """Get the list of changed or added files from Mercurial or git.""" if os.path.isdir(os.path.join(SRCDIR, '.hg')): - if base_branch is not None: - sys.exit('need a git checkout to check PR status') cmd = 'hg status --added --modified --no-status' if mq_patches_applied(): cmd += ' --rev qparent' with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st: return [x.decode().rstrip() for x in st.stdout] - elif os.path.exists(os.path.join(SRCDIR, '.git')): - # We just use an existence check here as: - # directory = normal git checkout/clone - # file = git worktree directory - if base_branch: - cmd = 'git diff --name-status ' + base_branch - else: - cmd = 'git status --porcelain' + elif os.path.isdir(os.path.join(SRCDIR, '.git')): + cmd = 'git status --porcelain' filenames = [] with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st: for line in st.stdout: line = line.decode().rstrip() - status_text, filename = line.split(maxsplit=1) - status = set(status_text) + status = set(line[:2]) # modified, added or unmerged files if not status.intersection('MAU'): continue + filename = line[3:] if ' -> ' in filename: # file is renamed filename = filename.split(' -> ', 2)[1].strip() @@ -136,7 +87,7 @@ def report_modified_files(file_paths): return "\n".join(lines) -@status("Fixing Python file whitespace", info=report_modified_files) +@status("Fixing whitespace", info=report_modified_files) def normalize_whitespace(file_paths): """Make sure that the whitespace for .py files have been normalized.""" reindent.makebackup = False # No need to create backups. @@ -213,30 +164,8 @@ def regenerated_pyconfig_h_in(file_paths): else: return "not needed" -def travis(pull_request): - if pull_request == 'false': - print('Not a pull request; skipping') - return - base_branch = get_base_branch() - file_paths = changed_files(base_branch) - python_files = [fn for fn in file_paths if fn.endswith('.py')] - c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))] - doc_files = [fn for fn in file_paths if fn.startswith('Doc') and - fn.endswith(('.rst', '.inc'))] - fixed = [] - fixed.extend(normalize_whitespace(python_files)) - fixed.extend(normalize_c_whitespace(c_files)) - fixed.extend(normalize_docs_whitespace(doc_files)) - if not fixed: - print('No whitespace issues found') - else: - print('Please fix the file(s) with whitespace issues') - print('(on UNIX you can run `make patchcheck` to make the fixes)') - sys.exit(1) - def main(): - base_branch = get_base_branch() - file_paths = changed_files(base_branch) + file_paths = changed_files() python_files = [fn for fn in file_paths if fn.endswith('.py')] c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))] doc_files = [fn for fn in file_paths if fn.startswith('Doc') and @@ -268,12 +197,4 @@ def main(): if __name__ == '__main__': - import argparse - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument('--travis', - help='Perform pass/fail checks') - args = parser.parse_args() - if args.travis: - travis(args.travis) - else: - main() + main() diff --git a/Tools/scripts/pathfix.py b/Tools/scripts/pathfix.py index 22432d1..562bbc7 100755 --- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -64,7 +64,7 @@ def main(): if fix(arg): bad = 1 sys.exit(bad) -ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$') +ispythonprog = re.compile(r'^[a-zA-Z0-9_]+\.py$') def ispython(name): return bool(ispythonprog.match(name)) diff --git a/Tools/scripts/ptags.py b/Tools/scripts/ptags.py index ca643b3..396cbd0 100755 --- a/Tools/scripts/ptags.py +++ b/Tools/scripts/ptags.py @@ -24,7 +24,7 @@ def main(): for s in tags: fp.write(s) -expr = '^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*[:\(]' +expr = r'^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*[:\(]' matcher = re.compile(expr) def treat_file(filename): diff --git a/Tools/scripts/pyvenv b/Tools/scripts/pyvenv index 978d691..1fb42c6 100755 --- a/Tools/scripts/pyvenv +++ b/Tools/scripts/pyvenv @@ -1,6 +1,12 @@ #!/usr/bin/env python3 if __name__ == '__main__': import sys + import pathlib + + executable = pathlib.Path(sys.executable or 'python3').name + print('WARNING: the pyenv script is deprecated in favour of ' + f'`{executable} -m venv`', file=sys.stderr) + rc = 1 try: import venv diff --git a/Tools/scripts/reindent.py b/Tools/scripts/reindent.py index f6dadaa..18424de 100755 --- a/Tools/scripts/reindent.py +++ b/Tools/scripts/reindent.py @@ -118,11 +118,7 @@ def check(file): if verbose: print("checking", file, "...", end=' ') with open(file, 'rb') as f: - try: - encoding, _ = tokenize.detect_encoding(f.readline) - except SyntaxError as se: - errprint("%s: SyntaxError: %s" % (file, str(se))) - return + encoding, _ = tokenize.detect_encoding(f.readline) try: with open(file, encoding=encoding) as f: r = Reindenter(f) diff --git a/Tools/scripts/svneol.py b/Tools/scripts/svneol.py index 8abdd01..6c70da9 100755 --- a/Tools/scripts/svneol.py +++ b/Tools/scripts/svneol.py @@ -1,6 +1,6 @@ #! /usr/bin/env python3 -""" +r""" SVN helper script. Try to set the svn:eol-style property to "native" on every .py, .txt, .c and diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py index 9983528..9c1e9fe 100755 --- a/Tools/scripts/texi2html.py +++ b/Tools/scripts/texi2html.py @@ -78,11 +78,11 @@ spprog = re.compile('[\n@{}&<>]') # Special characters in # running text # # menu item (Yuck!) -miprog = re.compile('^\* ([^:]*):(:|[ \t]*([^\t,\n.]+)([^ \t\n]*))[ \t\n]*') -# 0 1 1 2 3 34 42 0 -# ----- ---------- --------- -# -|----------------------------- -# ----------------------------------------------------- +miprog = re.compile(r'^\* ([^:]*):(:|[ \t]*([^\t,\n.]+)([^ \t\n]*))[ \t\n]*') +# 0 1 1 2 3 34 42 0 +# ----- ---------- --------- +# -|----------------------------- +# ----------------------------------------------------- diff --git a/Tools/ssl/sslspeed.vcxproj b/Tools/ssl/sslspeed.vcxproj index 5761399..8ec4106 100644 --- a/Tools/ssl/sslspeed.vcxproj +++ b/Tools/ssl/sslspeed.vcxproj @@ -1,70 +1,70 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - {F068BCCF-C0D6-478D-A2C5-26BA3237C992} - sslspeed - - - - - - - - $(OutDir) - $(MSBuildProjectDirectory)\$(ArchName)\ - $(MSBuildProjectDirectory)\$(ArchName)\obj\ - Application - MultiByte - - - - - - - - - - - - _CONSOLE;%(PreprocessorDefinitions) - $(opensslIncDir);%(AdditionalIncludeDirectories) - - - ws2_32.lib;crypt32.lib;libeay$(PyDebugExt).lib;ssleay$(PyDebugExt).lib;%(AdditionalDependencies) - $(OriginalOutDir);%(AdditionalLibraryDirectories) - Console - - - - - - {10615b24-73bf-4efa-93aa-236916321317} - false - - - {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} - false - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + {F068BCCF-C0D6-478D-A2C5-26BA3237C992} + sslspeed + + + + + + + + $(OutDir) + $(MSBuildProjectDirectory)\$(ArchName)\ + $(MSBuildProjectDirectory)\$(ArchName)\obj\ + Application + MultiByte + + + + + + + + + + + + _CONSOLE;%(PreprocessorDefinitions) + $(opensslIncDir);%(AdditionalIncludeDirectories) + + + ws2_32.lib;crypt32.lib;libeay$(PyDebugExt).lib;ssleay$(PyDebugExt).lib;%(AdditionalDependencies) + $(OriginalOutDir);%(AdditionalLibraryDirectories) + Console + + + + + + {10615b24-73bf-4efa-93aa-236916321317} + false + + + {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} + false + + + + \ No newline at end of file diff --git a/Tools/ssl/test_multiple_versions.py b/Tools/ssl/test_multiple_versions.py index dd57dcf..30d5fcf 100644 --- a/Tools/ssl/test_multiple_versions.py +++ b/Tools/ssl/test_multiple_versions.py @@ -105,11 +105,11 @@ class BuildSSL: def _subprocess_call(self, cmd, stdout=subprocess.DEVNULL, env=None, **kwargs): - log.debug("Call '{}'".format(" ".join(cmd))) + log.debug("Call '%s'", " ".join(cmd)) return subprocess.check_call(cmd, stdout=stdout, env=env, **kwargs) def _subprocess_output(self, cmd, env=None, **kwargs): - log.debug("Call '{}'".format(" ".join(cmd))) + log.debug("Call '%s'", " ".join(cmd)) out = subprocess.check_output(cmd, env=env) return out.strip().decode("utf-8") @@ -168,7 +168,7 @@ class BuildSSL: if not self.has_src: self._download_openssl() else: - log.debug("Already has src {}".format(self.src_file)) + log.debug("Already has src %s", self.src_file) self._unpack_openssl() self._build_openssl() self._install_openssl() diff --git a/Tools/tz/zdump.py b/Tools/tz/zdump.py new file mode 100644 index 0000000..f94b483 --- /dev/null +++ b/Tools/tz/zdump.py @@ -0,0 +1,81 @@ +import sys +import os +import struct +from array import array +from collections import namedtuple +from datetime import datetime, timedelta + +ttinfo = namedtuple('ttinfo', ['tt_gmtoff', 'tt_isdst', 'tt_abbrind']) + +class TZInfo: + def __init__(self, transitions, type_indices, ttis, abbrs): + self.transitions = transitions + self.type_indices = type_indices + self.ttis = ttis + self.abbrs = abbrs + + @classmethod + def fromfile(cls, fileobj): + if fileobj.read(4).decode() != "TZif": + raise ValueError("not a zoneinfo file") + fileobj.seek(20) + header = fileobj.read(24) + tzh = (tzh_ttisgmtcnt, tzh_ttisstdcnt, tzh_leapcnt, + tzh_timecnt, tzh_typecnt, tzh_charcnt) = struct.unpack(">6l", header) + transitions = array('i') + transitions.fromfile(fileobj, tzh_timecnt) + if sys.byteorder != 'big': + transitions.byteswap() + + type_indices = array('B') + type_indices.fromfile(fileobj, tzh_timecnt) + + ttis = [] + for i in range(tzh_typecnt): + ttis.append(ttinfo._make(struct.unpack(">lbb", fileobj.read(6)))) + + abbrs = fileobj.read(tzh_charcnt) + + self = cls(transitions, type_indices, ttis, abbrs) + self.tzh = tzh + + return self + + def dump(self, stream, start=None, end=None): + for j, (trans, i) in enumerate(zip(self.transitions, self.type_indices)): + utc = datetime.utcfromtimestamp(trans) + tti = self.ttis[i] + lmt = datetime.utcfromtimestamp(trans + tti.tt_gmtoff) + abbrind = tti.tt_abbrind + abbr = self.abbrs[abbrind:self.abbrs.find(0, abbrind)].decode() + if j > 0: + prev_tti = self.ttis[self.type_indices[j - 1]] + shift = " %+g" % ((tti.tt_gmtoff - prev_tti.tt_gmtoff) / 3600) + else: + shift = '' + print("%s UTC = %s %-5s isdst=%d" % (utc, lmt, abbr, tti[1]) + shift, file=stream) + + @classmethod + def zonelist(cls, zonedir='/usr/share/zoneinfo'): + zones = [] + for root, _, files in os.walk(zonedir): + for f in files: + p = os.path.join(root, f) + with open(p, 'rb') as o: + magic = o.read(4) + if magic == b'TZif': + zones.append(p[len(zonedir) + 1:]) + return zones + +if __name__ == '__main__': + if len(sys.argv) < 2: + zones = TZInfo.zonelist() + for z in zones: + print(z) + sys.exit() + filepath = sys.argv[1] + if not filepath.startswith('/'): + filepath = os.path.join('/usr/share/zoneinfo', filepath) + with open(filepath, 'rb') as fileobj: + tzi = TZInfo.fromfile(fileobj) + tzi.dump(sys.stdout) diff --git a/Tools/unicode/gencodec.py b/Tools/unicode/gencodec.py index 4c21469..31f0112 100644 --- a/Tools/unicode/gencodec.py +++ b/Tools/unicode/gencodec.py @@ -37,11 +37,11 @@ UNI_UNDEFINED = chr(0xFFFE) # Placeholder for a missing code point MISSING_CODE = -1 -mapRE = re.compile('((?:0x[0-9a-fA-F]+\+?)+)' - '\s+' - '((?:(?:0x[0-9a-fA-Z]+|<[A-Za-z]+>)\+?)*)' - '\s*' - '(#.+)?') +mapRE = re.compile(r'((?:0x[0-9a-fA-F]+\+?)+)' + r'\s+' + r'((?:(?:0x[0-9a-fA-Z]+|<[A-Za-z]+>)\+?)*)' + r'\s*' + r'(#.+)?') def parsecodes(codes, len=len, range=range): diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 713e175..5d8014a 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -42,7 +42,7 @@ VERSION = "3.2" # * Doc/library/stdtypes.rst, and # * Doc/library/unicodedata.rst # * Doc/reference/lexical_analysis.rst (two occurrences) -UNIDATA_VERSION = "8.0.0" +UNIDATA_VERSION = "9.0.0" UNICODE_DATA = "UnicodeData%s.txt" COMPOSITION_EXCLUSIONS = "CompositionExclusions%s.txt" EASTASIAN_WIDTH = "EastAsianWidth%s.txt" @@ -796,6 +796,7 @@ def merge_old_version(version, new, old): category_changes = [0xFF]*0x110000 decimal_changes = [0xFF]*0x110000 mirrored_changes = [0xFF]*0x110000 + east_asian_width_changes = [0xFF]*0x110000 # In numeric data, 0 means "no change", # -1 means "did not have a numeric value numeric_changes = [0] * 0x110000 @@ -862,6 +863,9 @@ def merge_old_version(version, new, old): elif k == 14: # change to simple titlecase mapping; ignore pass + elif k == 15: + # change to east asian width + east_asian_width_changes[i] = EASTASIANWIDTH_NAMES.index(value) elif k == 16: # derived property changes; not yet pass @@ -873,8 +877,9 @@ def merge_old_version(version, new, old): class Difference(Exception):pass raise Difference(hex(i), k, old.table[i], new.table[i]) new.changed.append((version, list(zip(bidir_changes, category_changes, - decimal_changes, mirrored_changes, - numeric_changes)), + decimal_changes, mirrored_changes, + east_asian_width_changes, + numeric_changes)), normalization_changes)) def open_data(template, version): diff --git a/aclocal.m4 b/aclocal.m4 index 2a745e5..9a9cc55 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) +dnl serial 11 (pkg-config-0.29) dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -55,7 +55,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ diff --git a/config.guess b/config.guess index 2193702..1f5c50c 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2017-05-27' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2017-05-27' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# Originally written by Per Bothner. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches to . +# Please send patches with a ChangeLog entry to config-patches@gnu.org. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,29 +168,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ - echo unknown)` + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown - ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently (or will in the future) and ABI. + # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - earm*) - os=netbsdelf - ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -207,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac - # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` - ;; - esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -224,13 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "${machine}-${os}${release}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -240,10 +223,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; - *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} - exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -256,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; - *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix - exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -275,42 +251,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "EV4.5 (21064)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "LCA4 (21066/21068)") - UNAME_MACHINE=alpha ;; + UNAME_MACHINE="alpha" ;; "EV5 (21164)") - UNAME_MACHINE=alphaev5 ;; + UNAME_MACHINE="alphaev5" ;; "EV5.6 (21164A)") - UNAME_MACHINE=alphaev56 ;; + UNAME_MACHINE="alphaev56" ;; "EV5.6 (21164PC)") - UNAME_MACHINE=alphapca56 ;; + UNAME_MACHINE="alphapca56" ;; "EV5.7 (21164PC)") - UNAME_MACHINE=alphapca57 ;; + UNAME_MACHINE="alphapca57" ;; "EV6 (21264)") - UNAME_MACHINE=alphaev6 ;; + UNAME_MACHINE="alphaev6" ;; "EV6.7 (21264A)") - UNAME_MACHINE=alphaev67 ;; + UNAME_MACHINE="alphaev67" ;; "EV6.8CB (21264C)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.8AL (21264B)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.8CX (21264D)") - UNAME_MACHINE=alphaev68 ;; + UNAME_MACHINE="alphaev68" ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE=alphaev69 ;; + UNAME_MACHINE="alphaev69" ;; "EV7 (21364)") - UNAME_MACHINE=alphaev7 ;; + UNAME_MACHINE="alphaev7" ;; "EV7.9 (21364A)") - UNAME_MACHINE=alphaev79 ;; + UNAME_MACHINE="alphaev79" ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -383,16 +359,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH=i386 + SUN_ARCH="i386" # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH=x86_64 + SUN_ARCH="x86_64" fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -417,7 +393,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -603,9 +579,8 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -642,13 +617,13 @@ EOF sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 - 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH=hppa2.0n ;; - 64) HP_ARCH=hppa2.0w ;; - '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac fi @@ -687,11 +662,11 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ ${HP_ARCH} = "hppa2.0w" ] then eval $set_cc_for_build @@ -704,12 +679,12 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH=hppa2.0w + HP_ARCH="hppa2.0w" else - HP_ARCH=hppa64 + HP_ARCH="hppa64" fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -814,14 +789,14 @@ EOF echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -837,11 +812,10 @@ EOF UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - UNAME_PROCESSOR=x86_64 ;; - i386) - UNAME_PROCESSOR=i586 ;; + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -904,7 +878,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -927,7 +901,7 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -958,9 +932,6 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; - e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -973,9 +944,6 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1001,9 +969,6 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1036,9 +1001,6 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1058,7 +1020,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1137,7 +1099,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configure will decide that + # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1286,9 +1248,6 @@ EOF SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; - SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1302,23 +1261,16 @@ EOF UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1333,7 +1285,7 @@ EOF exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = x86; then + if test "$UNAME_PROCESSOR" = "x86"; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1342,18 +1294,15 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-*:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-*:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; - NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} - exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1367,7 +1316,7 @@ EOF # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "$cputype" = "386"; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1409,7 +1358,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1420,25 +1369,23 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; - amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; esac cat >&2 < in order to provide the needed +information to handle your system. config.guess timestamp = $timestamp diff --git a/config.sub b/config.sub index 40ea5df..d654d03 100755 --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2017-04-02' +timestamp='2014-05-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ timestamp='2017-04-02' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ timestamp='2017-04-02' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,7 +53,8 @@ timestamp='2017-04-02' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS Canonicalize a configuration name. @@ -67,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -116,8 +117,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -254,16 +255,15 @@ case $basic_machine in | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ - | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ + | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,12 +301,10 @@ case $basic_machine in | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ | pyramid \ - | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,8 +312,6 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -330,9 +326,6 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -378,18 +371,17 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ - | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ + | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -430,15 +422,13 @@ case $basic_machine in | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ | pyramid-* \ - | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -446,8 +436,6 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ - | visium-* \ - | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -524,9 +512,6 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; - asmjs) - basic_machine=asmjs-unknown - ;; aux) basic_machine=m68k-apple os=-aux @@ -647,14 +632,6 @@ case $basic_machine in basic_machine=m68k-bull os=-sysv3 ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - os=$os"spe" - ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -796,9 +773,6 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -854,10 +828,6 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; msdos) basic_machine=i386-pc os=-msdos @@ -950,9 +920,6 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; - nsx-tandem) - basic_machine=nsx-tandem - ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1037,7 +1004,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle) + ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1047,7 +1014,7 @@ case $basic_machine in ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little) + ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1248,9 +1215,6 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1396,28 +1360,27 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1549,8 +1512,6 @@ case $os in ;; -nacl*) ;; - -ios) - ;; -none) ;; *) @@ -1646,9 +1607,6 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; - pru-*) - os=-elf - ;; *-be) os=-beos ;; diff --git a/configure b/configure index 5640c2d..cf95b27 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for python 3.5. +# Generated by GNU Autoconf 2.69 for python 3.6. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='python' PACKAGE_TARNAME='python' -PACKAGE_VERSION='3.5' -PACKAGE_STRING='python 3.5' +PACKAGE_VERSION='3.6' +PACKAGE_STRING='python 3.6' PACKAGE_BUGREPORT='https://bugs.python.org/' PACKAGE_URL='' @@ -642,11 +642,13 @@ TRUE MACHDEP_OBJS DYNLOADFILE DLINCLDIR +DTRACE_OBJS +DTRACE_HEADERS +DFLAGS +DTRACE THREADOBJ LDLAST USE_THREAD_MODULE -SIGNAL_OBJS -USE_SIGNAL_MODULE TCLTK_LIBS TCLTK_INCLUDES LIBFFI_INCLUDEDIR @@ -666,7 +668,6 @@ OTHER_LIBTOOL_OPT UNIVERSAL_ARCH_FLAGS CFLAGS_NODIST BASECFLAGS -CFLAGS_ALIASING OPT LLVM_PROF_FOUND target_os @@ -709,12 +710,13 @@ LIBRARY BUILDEXEEXT EGREP NO_AS_NEEDED +MULTIARCH_CPPFLAGS PLATFORM_TRIPLET -PLATDIR MULTIARCH ac_ct_CXX MAINCC CXX +SED GREP CPP OBJEXT @@ -747,8 +749,9 @@ UNIVERSALSDK CONFIG_ARGS SOVERSION VERSION +GENERATED_COMMENT PYTHON_FOR_BUILD -PYTHON_FOR_REGEN +PYTHON_FOR_GEN host_os host_vendor host_cpu @@ -757,10 +760,10 @@ build_os build_vendor build_cpu build -HAS_GIT -GITBRANCH -GITTAG -GITVERSION +HAS_HG +HGBRANCH +HGTAG +HGVERSION BASECPPFLAGS target_alias host_alias @@ -826,14 +829,13 @@ enable_loadable_sqlite_extensions with_tcltk_includes with_tcltk_libs with_dbmliborder -with_signal_module with_threads with_thread enable_ipv6 with_doc_strings -with_tsc with_pymalloc with_valgrind +with_dtrace with_fpectl with_libm with_libc @@ -1394,7 +1396,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures python 3.5 to adapt to many kinds of systems. +\`configure' configures python 3.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1460,7 +1462,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of python 3.5:";; + short | recursive ) echo "Configuration of python 3.6:";; esac cat <<\_ACEOF @@ -1474,8 +1476,8 @@ Optional Features: Build (MacOSX|Darwin) framework --enable-shared disable/enable building shared python library --enable-profiling enable C-level code profiling - --enable-optimizations Enable expensive, stable optimizations (PGO, etc). - Disabled by default. + --enable-optimizations Enable expensive optimizations (PGO, etc). Disabled + by default. --enable-loadable-sqlite-extensions support loadable extensions in _sqlite module --enable-ipv6 Enable ipv6 (with ipv4) support @@ -1519,15 +1521,14 @@ Optional Packages: order to check db backends for dbm. Valid value is a colon separated string with the backend names `ndbm', `gdbm' and `bdb'. - --with-signal-module disable/enable signal module --with(out)-threads[=DIRECTORY] disable/enable thread support --with(out)-thread[=DIRECTORY] deprecated; use --with(out)-threads --with(out)-doc-strings disable/enable documentation strings - --with(out)-tsc enable/disable timestamp counter profile --with(out)-pymalloc disable/enable specialized mallocs --with-valgrind Enable Valgrind support + --with(out)-dtrace disable/enable DTrace support --with-fpectl enable SIGFPE catching --with-libm=STRING math library --with-libc=STRING C library @@ -1619,7 +1620,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -python configure 3.5 +python configure 3.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1972,136 +1973,6 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_find_uintX_t LINENO BITS VAR -# ------------------------------------ -# Finds an unsigned integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_uintX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ - 'unsigned long long int' 'unsigned short int' 'unsigned char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - case $ac_type in #( - uint$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_find_uintX_t - -# ac_fn_c_find_intX_t LINENO BITS VAR -# ----------------------------------- -# Finds a signed integer type with width BITS, setting cache variable VAR -# accordingly. -ac_fn_c_find_intX_t () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -$as_echo_n "checking for int$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - # Order is important - never check a type that is potentially smaller - # than half of the expected target width. - for ac_type in int$2_t 'int' 'long int' \ - 'long long int' 'short int' 'signed char'; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default - enum { N = $2 / 2 - 1 }; -int -main () -{ -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - case $ac_type in #( - int$2_t) : - eval "$3=yes" ;; #( - *) : - eval "$3=\$ac_type" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : - -else - break -fi - done -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_find_intX_t - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2458,7 +2329,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by python $as_me 3.5, which was +It was created by python $as_me 3.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2827,17 +2698,17 @@ fi -if test -e $srcdir/.git +if test -e $srcdir/.hg/dirstate then -# Extract the first word of "git", so it can be a program name with args. -set dummy git; ac_word=$2 +# Extract the first word of "hg", so it can be a program name with args. +set dummy hg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAS_GIT+:} false; then : +if ${ac_cv_prog_HAS_HG+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$HAS_GIT"; then - ac_cv_prog_HAS_GIT="$HAS_GIT" # Let the user override the test. + if test -n "$HAS_HG"; then + ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2846,7 +2717,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAS_GIT="found" + ac_cv_prog_HAS_HG="found" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2854,13 +2725,13 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_HAS_GIT" && ac_cv_prog_HAS_GIT="not-found" + test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found" fi fi -HAS_GIT=$ac_cv_prog_HAS_GIT -if test -n "$HAS_GIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_GIT" >&5 -$as_echo "$HAS_GIT" >&6; } +HAS_HG=$ac_cv_prog_HAS_HG +if test -n "$HAS_HG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5 +$as_echo "$HAS_HG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -2868,17 +2739,17 @@ fi else -HAS_GIT=no-repository +HAS_HG=no-repository fi -if test $HAS_GIT = found +if test $HAS_HG = found then - GITVERSION="git -C \$(srcdir) rev-parse --short HEAD" - GITTAG="git -C \$(srcdir) describe --all --always --dirty" - GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD" + HGVERSION="hg id -i \$(srcdir)" + HGTAG="hg id -t \$(srcdir)" + HGBRANCH="hg id -b \$(srcdir)" else - GITVERSION="" - GITTAG="" - GITBRANCH="" + HGVERSION="" + HGTAG="" + HGBRANCH="" fi @@ -2997,11 +2868,11 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PYTHON_FOR_REGEN+:} false; then : +if ${ac_cv_prog_PYTHON_FOR_GEN+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$PYTHON_FOR_REGEN"; then - ac_cv_prog_PYTHON_FOR_REGEN="$PYTHON_FOR_REGEN" # Let the user override the test. + if test -n "$PYTHON_FOR_GEN"; then + ac_cv_prog_PYTHON_FOR_GEN="$PYTHON_FOR_GEN" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -3010,7 +2881,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PYTHON_FOR_REGEN="$ac_prog" + ac_cv_prog_PYTHON_FOR_GEN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3020,20 +2891,25 @@ IFS=$as_save_IFS fi fi -PYTHON_FOR_REGEN=$ac_cv_prog_PYTHON_FOR_REGEN -if test -n "$PYTHON_FOR_REGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_REGEN" >&5 -$as_echo "$PYTHON_FOR_REGEN" >&6; } +PYTHON_FOR_GEN=$ac_cv_prog_PYTHON_FOR_GEN +if test -n "$PYTHON_FOR_GEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_GEN" >&5 +$as_echo "$PYTHON_FOR_GEN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$PYTHON_FOR_REGEN" && break + test -n "$PYTHON_FOR_GEN" && break done -test -n "$PYTHON_FOR_REGEN" || PYTHON_FOR_REGEN="python3" +test -n "$PYTHON_FOR_GEN" || PYTHON_FOR_GEN="not-found" +if test "$PYTHON_FOR_GEN" = not-found; then + PYTHON_FOR_GEN='@echo "Cannot generate $@, python not found !" && \ + echo "To skip re-generation of $@ run or ." && \ + echo "Otherwise, set python in PATH and run configure or run ." && false &&' +fi if test "$cross_compiling" = yes; then @@ -3042,7 +2918,7 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } if test -z "$PYTHON_FOR_BUILD"; then for interp in python$PACKAGE_VERSION python3 python; do which $interp >/dev/null 2>&1 || continue - if $interp -c 'import sys;sys.exit(not sys.version_info[:2] >= (3,3))'; then + if $interp -c "import sys;sys.exit(not '.'.join(str(n) for n in sys.version_info[:2]) == '$PACKAGE_VERSION')"; then break fi interp= @@ -3052,16 +2928,20 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 $as_echo "$interp" >&6; } - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp fi + # Used to comment out stuff for rebuilding generated files + GENERATED_COMMENT='#' elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 else PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E' + GENERATED_COMMENT='' fi + if test "$prefix" != "/"; then prefix=`echo "$prefix" | sed -e 's/\/$//g'` fi @@ -3076,7 +2956,7 @@ rm confdefs.h mv confdefs.h.new confdefs.h -VERSION=3.5 +VERSION=3.6 # Version number of Python's own shared library file. @@ -4695,6 +4575,75 @@ $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + @@ -5268,7 +5217,31 @@ cat >> conftest.c <&5 @@ -5681,6 +5657,32 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5 +$as_echo_n "checking for the Android API level... " >&6; } +cat >> conftest.c < +__ANDROID_API__ +#else +#error not Android +#endif +EOF + +if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then + ANDROID_API_LEVEL=`grep -v '^#' conftest.out | grep -v '^ *$'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5 +$as_echo "$ANDROID_API_LEVEL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define ANDROID_API_LEVEL $ANDROID_API_LEVEL +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5 +$as_echo "not Android" >&6; } +fi +rm -f conftest.c conftest.out + # Check for unsupported systems case $ac_sys_system/$ac_sys_release in atheos*|Linux*/1*) @@ -6527,7 +6529,7 @@ $as_echo_n "checking for --enable-optimizations... " >&6; } # Check whether --enable-optimizations was given. if test "${enable_optimizations+set}" = set; then : enableval=$enable_optimizations; -if test "$enableval" != no +if test "$withval" != no then Py_OPT='true' { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -6545,7 +6547,7 @@ fi if test "$Py_OPT" = 'true' ; then # Intentionally not forcing Py_LTO='true' here. Too many toolchains do not # compile working code using it and both test_distutils and test_gdb are - # broken when you do managed to get a toolchain that works with it. People + # broken when you do manage to get a toolchain that works with it. People # who want LTO need to use --with-lto themselves. DEF_MAKE_ALL_RULE="profile-opt" REQUIRE_PGO="yes" @@ -6582,13 +6584,20 @@ fi if test "$Py_LTO" = 'true' ; then case $CC in *clang*) - # Any changes made here should be reflected in the GCC+Darwin case below - LTOFLAGS="-flto" + case $ac_sys_system in + Darwin*) + # Any changes made here should be reflected in the GCC+Darwin case below + LTOFLAGS="-flto -Wl,-export_dynamic" + ;; + *) + LTOFLAGS="-flto" + ;; + esac ;; *gcc*) case $ac_sys_system in Darwin*) - LTOFLAGS="-flto" + LTOFLAGS="-flto -Wl,-export_dynamic" ;; *) LTOFLAGS="-flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none" @@ -6838,7 +6847,6 @@ esac # tweak OPT based on compiler and platform, only if the user didn't set # it on the command line - if test "${OPT-unset}" = "unset" then case $GCC in @@ -6851,49 +6859,30 @@ then WRAP="-fwrapv" fi + # Clang also needs -fwrapv case $CC in - *clang*) - cc_is_clang=1 - ;; - *) - if $CC --version 2>&1 | grep -q clang - then - cc_is_clang=1 - else - cc_is_clang= - fi + *clang*) WRAP="-fwrapv" + ;; esac - if test -n "${cc_is_clang}" - then - # Clang also needs -fwrapv - WRAP="-fwrapv" - # bpo-30104: disable strict aliasing to compile correctly dtoa.c, - # see Makefile.pre.in for more information - CFLAGS_ALIASING="-fno-strict-aliasing" - fi - case $ac_cv_prog_cc_g in yes) if test "$Py_DEBUG" = 'true' ; then # Optimization messes up debuggers, so turn it off for # debug builds. if "$CC" -v --help 2>/dev/null |grep -- -Og > /dev/null; then - OPT="-g -Og -Wall" + OPT="-g -Og -Wall $STRICT_PROTO" else - OPT="-g -O0 -Wall" + OPT="-g -O0 -Wall $STRICT_PROTO" fi else - OPT="-g $WRAP -O3 -Wall" + OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" fi ;; *) - OPT="-O3 -Wall" + OPT="-O3 -Wall $STRICT_PROTO" ;; esac - - OPT="$OPT $STRICT_PROTO" - case $ac_sys_system in SCO_SV*) OPT="$OPT -m486 -DSCO5" ;; @@ -6916,6 +6905,49 @@ UNIVERSAL_ARCH_FLAGS= # tweak BASECFLAGS based on compiler and platform case $GCC in yes) + CFLAGS_NODIST="$CFLAGS_NODIST -std=c99" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5 +$as_echo_n "checking for -Wextra... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wextra -Werror" + if ${ac_cv_extra_warnings+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_extra_warnings=yes + +else + + ac_cv_extra_warnings=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + CC="$ac_save_cc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_extra_warnings" >&5 +$as_echo "$ac_cv_extra_warnings" >&6; } + + if test $ac_cv_extra_warnings = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wextra" + fi + # Python doesn't violate C99 aliasing rules, but older versions of # GCC produce warnings for legal Python code. Enable # -fno-strict-aliasing on versions of GCC that support but produce @@ -7036,14 +7068,14 @@ $as_echo "$ac_cv_disable_unused_result_warning" >&6; } if test $ac_cv_disable_unused_result_warning = yes then BASECFLAGS="$BASECFLAGS -Wno-unused-result" + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Werror=declaration-after-statement" >&5 -$as_echo_n "checking for -Werror=declaration-after-statement... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused parameter warning" >&5 +$as_echo_n "checking if we can turn off $CC unused parameter warning... " >&6; } ac_save_cc="$CC" - CC="$CC -Werror=declaration-after-statement" - save_CFLAGS="$CFLAGS" - if ${ac_cv_declaration_after_statement_warning+:} false; then : + CC="$CC -Wunused-parameter -Werror" + if ${ac_cv_disable_unused_parameter_warning+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7061,24 +7093,64 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_declaration_after_statement_warning=yes + ac_cv_disable_unused_parameter_warning=yes else - ac_cv_declaration_after_statement_warning=no + ac_cv_disable_unused_parameter_warning=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + CC="$ac_save_cc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5 +$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; } + + if test $ac_cv_disable_unused_parameter_warning = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-parameter" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC missing field initializers warning" >&5 +$as_echo_n "checking if we can turn off $CC missing field initializers warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wmissing-field-initializers -Werror" + if ${ac_cv_disable_missing_field_initializers+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_disable_missing_field_initializers=yes + +else + + ac_cv_disable_missing_field_initializers=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - CFLAGS="$save_CFLAGS" CC="$ac_save_cc" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_declaration_after_statement_warning" >&5 -$as_echo "$ac_cv_declaration_after_statement_warning" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers" >&5 +$as_echo "$ac_cv_disable_missing_field_initializers" >&6; } - if test $ac_cv_declaration_after_statement_warning = yes + if test $ac_cv_disable_missing_field_initializers = yes then - CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-missing-field-initializers" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5 @@ -7708,16 +7780,16 @@ fi for ac_header in asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \ -sched.h shadow.h signal.h stdint.h stropts.h termios.h \ +sched.h shadow.h signal.h stropts.h termios.h \ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ -bluetooth/bluetooth.h linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ +linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ sys/endian.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -7940,14 +8012,32 @@ fi fi -# On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. -for ac_header in net/if.h +# bluetooth/bluetooth.h has been known to not compile with -std=c99. +# http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 +SAVE_CFLAGS=$CFLAGS +CFLAGS="-std=c99 $CFLAGS" +for ac_header in bluetooth/bluetooth.h do : - ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include -#ifdef STDC_HEADERS -# include -# include -#else + ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" +if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BLUETOOTH_BLUETOOTH_H 1 +_ACEOF + +fi + +done + +CFLAGS=$SAVE_CFLAGS + +# On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include +#ifdef STDC_HEADERS +# include +# include +#else # ifdef HAVE_STDLIB_H # include # endif @@ -8145,6 +8235,11 @@ if test "$sol_lfs_bug" = "yes"; then use_lfs=no fi +# Don't use largefile support for GNU/Hurd +case $ac_sys_system in GNU*) + use_lfs=no +esac + if test "$use_lfs" = "yes"; then # Two defines needed to enable largefile support on various platforms # These may affect some typedefs @@ -8251,95 +8346,6 @@ $as_echo "#define gid_t int" >>confdefs.h fi -# There are two separate checks for each of the exact-width integer types we -# need. First we check whether the type is available using the usual -# AC_CHECK_TYPE macro with the default includes (which includes -# and where available). We then also use the special type checks of -# the form AC_TYPE_UINT32_T, which in the case that uint32_t is not available -# directly, #define's uint32_t to be a suitable type. - -ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" -if test "x$ac_cv_type_uint32_t" = xyes; then : - -$as_echo "#define HAVE_UINT32_T 1" >>confdefs.h - -fi - -ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t" -case $ac_cv_c_uint32_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT32_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF -;; - esac - - -ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default" -if test "x$ac_cv_type_uint64_t" = xyes; then : - -$as_echo "#define HAVE_UINT64_T 1" >>confdefs.h - -fi - -ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t" -case $ac_cv_c_uint64_t in #( - no|yes) ;; #( - *) - -$as_echo "#define _UINT64_T 1" >>confdefs.h - - -cat >>confdefs.h <<_ACEOF -#define uint64_t $ac_cv_c_uint64_t -_ACEOF -;; - esac - - -ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" -if test "x$ac_cv_type_int32_t" = xyes; then : - -$as_echo "#define HAVE_INT32_T 1" >>confdefs.h - -fi - -ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t" -case $ac_cv_c_int32_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int32_t $ac_cv_c_int32_t -_ACEOF -;; -esac - - -ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default" -if test "x$ac_cv_type_int64_t" = xyes; then : - -$as_echo "#define HAVE_INT64_T 1" >>confdefs.h - -fi - -ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t" -case $ac_cv_c_int64_t in #( - no|yes) ;; #( - *) - -cat >>confdefs.h <<_ACEOF -#define int64_t $ac_cv_c_int64_t -_ACEOF -;; -esac - - ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" if test "x$ac_cv_type_ssize_t" = xyes; then : @@ -8427,6 +8433,39 @@ _ACEOF # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if ${ac_cv_sizeof_long_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_long=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 $as_echo_n "checking size of void *... " >&6; } if ${ac_cv_sizeof_void_p+:} false; then : @@ -8654,67 +8693,39 @@ cat >>confdefs.h <<_ACEOF _ACEOF - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long support" >&5 -$as_echo_n "checking for long long support... " >&6; } -have_long_long=no -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -long long x; x = (long long)0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - -$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h - - have_long_long=yes - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_long_long" >&5 -$as_echo "$have_long_long" >&6; } -if test "$have_long_long" = yes ; then # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -$as_echo_n "checking size of long long... " >&6; } -if ${ac_cv_sizeof_long_long+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5 +$as_echo_n "checking size of uintptr_t... " >&6; } +if ${ac_cv_sizeof_uintptr_t+:} false; then : $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then : else - if test "$ac_cv_type_long_long" = yes; then + if test "$ac_cv_type_uintptr_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long long) +as_fn_error 77 "cannot compute sizeof (uintptr_t) See \`config.log' for more details" "$LINENO" 5; } else - ac_cv_sizeof_long_long=0 + ac_cv_sizeof_uintptr_t=0 fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -$as_echo "$ac_cv_sizeof_long_long" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5 +$as_echo "$ac_cv_sizeof_uintptr_t" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t _ACEOF -fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double support" >&5 $as_echo_n "checking for long double support... " >&6; } @@ -8777,33 +8788,6 @@ _ACEOF fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Bool support" >&5 -$as_echo_n "checking for _Bool support... " >&6; } -have_c99_bool=no -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -_Bool x; x = (_Bool)0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - -$as_echo "#define HAVE_C99_BOOL 1" >>confdefs.h - - have_c99_bool=yes - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_c99_bool" >&5 -$as_echo "$have_c99_bool" >&6; } -if test "$have_c99_bool" = yes ; then # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -8837,56 +8821,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi - -ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#ifdef HAVE_STDINT_H - #include - #endif - #ifdef HAVE_INTTYPES_H - #include - #endif -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_UINTPTR_T 1 -_ACEOF - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5 -$as_echo_n "checking size of uintptr_t... " >&6; } -if ${ac_cv_sizeof_uintptr_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_uintptr_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (uintptr_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_uintptr_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5 -$as_echo "$ac_cv_sizeof_uintptr_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t -_ACEOF - - -fi - # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -8929,8 +8863,6 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5 $as_echo_n "checking whether to enable large file support... " >&6; } -if test "$have_long_long" = yes -then if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then @@ -8942,10 +8874,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -10103,11 +10031,27 @@ $as_echo_n "checking for --with-system-ffi... " >&6; } # Check whether --with-system_ffi was given. if test "${with_system_ffi+set}" = set; then : withval=$with_system_ffi; -else - with_system_ffi="no" fi +case "$with_system_ffi" in + "") + case $ac_sys_system in + Darwin) + with_system_ffi="no" + ;; + *) + with_system_ffi="yes" + ;; + esac + ;; + yes|no) + ;; + *) + as_fn_error $? "--with-system-ffi accepts no arguments" "$LINENO" 5 + ;; +esac + if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`" else @@ -10210,32 +10154,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5 $as_echo "$with_dbmliborder" >&6; } -# Determine if signalmodule should be used. - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-signal-module" >&5 -$as_echo_n "checking for --with-signal-module... " >&6; } - -# Check whether --with-signal-module was given. -if test "${with_signal_module+set}" = set; then : - withval=$with_signal_module; -fi - - -if test -z "$with_signal_module" -then with_signal_module="yes" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_signal_module" >&5 -$as_echo "$with_signal_module" >&6; } - -if test "${with_signal_module}" = "yes"; then - USE_SIGNAL_MODULE="" - SIGNAL_OBJS="" -else - USE_SIGNAL_MODULE="#" - SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o" -fi - # This is used to generate Setup.config USE_THREAD_MODULE="" @@ -11052,37 +10970,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX 10.5 SDK or later" >&5 -$as_echo_n "checking for OSX 10.5 SDK or later... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -FSIORefNum fRef = 0 - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - -$as_echo "#define HAVE_OSX105_SDK 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Check for --with-doc-strings { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-doc-strings" >&5 $as_echo_n "checking for --with-doc-strings... " >&6; } @@ -11105,29 +10992,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5 $as_echo "$with_doc_strings" >&6; } -# Check if eval loop should use timestamp counter profiling -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tsc" >&5 -$as_echo_n "checking for --with-tsc... " >&6; } - -# Check whether --with-tsc was given. -if test "${with_tsc+set}" = set; then : - withval=$with_tsc; -if test "$withval" != no -then - -$as_echo "#define WITH_TSC 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Check for Python-specific malloc support { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 $as_echo_n "checking for --with-pymalloc... " >&6; } @@ -11156,28 +11020,124 @@ $as_echo "$with_pymalloc" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5 $as_echo_n "checking for --with-valgrind... " >&6; } -# Check whether --with-valgrind was given. -if test "${with_valgrind+set}" = set; then : - withval=$with_valgrind; +# Check whether --with-valgrind was given. +if test "${with_valgrind+set}" = set; then : + withval=$with_valgrind; +else + with_valgrind=no +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 +$as_echo "$with_valgrind" >&6; } +if test "$with_valgrind" != no; then + ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" +if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : + +$as_echo "#define WITH_VALGRIND 1" >>confdefs.h + +else + as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5 + +fi + + + OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" +fi + +# Check for DTrace support +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5 +$as_echo_n "checking for --with-dtrace... " >&6; } + +# Check whether --with-dtrace was given. +if test "${with_dtrace+set}" = set; then : + withval=$with_dtrace; +else + with_dtrace=no +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5 +$as_echo "$with_dtrace" >&6; } + + + + + +DTRACE= +DFLAGS= +DTRACE_HEADERS= +DTRACE_OBJS= + +if test "$with_dtrace" = "yes" +then + # Extract the first word of "dtrace", so it can be a program name with args. +set dummy dtrace; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DTRACE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DTRACE in + [\\/]* | ?:[\\/]*) + ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not found" + ;; +esac +fi +DTRACE=$ac_cv_path_DTRACE +if test -n "$DTRACE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 +$as_echo "$DTRACE" >&6; } else - with_valgrind=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 -$as_echo "$with_valgrind" >&6; } -if test "$with_valgrind" != no; then - ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" -if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : -$as_echo "#define WITH_VALGRIND 1" >>confdefs.h + if test "$DTRACE" = "not found"; then + as_fn_error $? "dtrace command not found on \$PATH" "$LINENO" 5 + fi -else - as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5 +$as_echo "#define WITH_DTRACE 1" >>confdefs.h -fi + DTRACE_HEADERS="Include/pydtrace_probes.h" + # On OS X, DTrace providers do not need to be explicitly compiled and + # linked into the binary. Correspondingly, dtrace(1) is missing the ELF + # generation flag '-G'. We check for presence of this flag, rather than + # hardcoding support by OS, in the interest of robustness. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5 +$as_echo_n "checking whether DTrace probes require linking... " >&6; } +if ${ac_cv_dtrace_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_dtrace_link=no + echo 'BEGIN' > conftest.d + "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ + ac_cv_dtrace_link=yes - OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dtrace_link" >&5 +$as_echo "$ac_cv_dtrace_link" >&6; } + if test "$ac_cv_dtrace_link" = "yes"; then + DTRACE_OBJS="Python/pydtrace.o" + fi fi # -I${DLINCLDIR} is added to the compile rule for importdl.o @@ -12610,6 +12570,64 @@ fi done +for ac_func in clock_settime +do : + ac_fn_c_check_func "$LINENO" "clock_settime" "ac_cv_func_clock_settime" +if test "x$ac_cv_func_clock_settime" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CLOCK_SETTIME 1 +_ACEOF + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_settime in -lrt" >&5 +$as_echo_n "checking for clock_settime in -lrt... " >&6; } +if ${ac_cv_lib_rt_clock_settime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_settime (); +int +main () +{ +return clock_settime (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_settime=yes +else + ac_cv_lib_rt_clock_settime=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_settime" >&5 +$as_echo "$ac_cv_lib_rt_clock_settime" >&6; } +if test "x$ac_cv_lib_rt_clock_settime" = xyes; then : + + $as_echo "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h + + +fi + + +fi +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for major" >&5 $as_echo_n "checking for major... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13027,6 +13045,33 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" " + #include + #include + +" +if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_PASSWD_PW_GECOS 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_passwd_pw_passwd" " + #include + #include + +" +if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_PASSWD_PW_PASSWD 1 +_ACEOF + + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 $as_echo_n "checking for time.h that defines altzone... " >&6; } @@ -13158,6 +13203,41 @@ $as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_alg" >&5 +$as_echo_n "checking for sockaddr_alg... " >&6; } +if ${ac_cv_struct_sockaddr_alg+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# include +# include +# include +int +main () +{ +struct sockaddr_alg s + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_sockaddr_alg=yes +else + ac_cv_struct_sockaddr_alg=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_alg" >&5 +$as_echo "$ac_cv_struct_sockaddr_alg" >&6; } +if test $ac_cv_struct_sockaddr_alg = yes; then + +$as_echo "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h + +fi + # checks for compiler characteristics { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 @@ -13446,40 +13526,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -va_list_is_array=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_list is an array" >&5 -$as_echo_n "checking whether va_list is an array... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef HAVE_STDARG_PROTOTYPES -#include -#else -#include -#endif - -int -main () -{ -va_list list1, list2; list1 = list2; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - - -$as_echo "#define VA_LIST_IS_ARRAY 1" >>confdefs.h - - va_list_is_array=yes - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $va_list_is_array" >&5 -$as_echo "$va_list_is_array" >&6; } - # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( @@ -14337,6 +14383,85 @@ $as_echo "#define HAVE_BROKEN_SEM_GETVALUE 1" >>confdefs.h fi +ac_fn_c_check_decl "$LINENO" "RTLD_LAZY" "ac_cv_have_decl_RTLD_LAZY" "#include +" +if test "x$ac_cv_have_decl_RTLD_LAZY" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_LAZY $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include +" +if test "x$ac_cv_have_decl_RTLD_NOW" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_NOW $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_GLOBAL" "ac_cv_have_decl_RTLD_GLOBAL" "#include +" +if test "x$ac_cv_have_decl_RTLD_GLOBAL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_GLOBAL $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_LOCAL" "ac_cv_have_decl_RTLD_LOCAL" "#include +" +if test "x$ac_cv_have_decl_RTLD_LOCAL" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_LOCAL $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_NODELETE" "ac_cv_have_decl_RTLD_NODELETE" "#include +" +if test "x$ac_cv_have_decl_RTLD_NODELETE" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_NODELETE $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_NOLOAD" "ac_cv_have_decl_RTLD_NOLOAD" "#include +" +if test "x$ac_cv_have_decl_RTLD_NOLOAD" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_NOLOAD $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "RTLD_DEEPBIND" "ac_cv_have_decl_RTLD_DEEPBIND" "#include +" +if test "x$ac_cv_have_decl_RTLD_DEEPBIND" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RTLD_DEEPBIND $ac_have_decl +_ACEOF + + # determine what size digit to use for Python's longs { $as_echo "$as_me:${as_lineno-$LINENO}: checking digit size for Python's longs" >&5 $as_echo_n "checking digit size for Python's longs... " >&6; } @@ -14770,7 +14895,11 @@ LDVERSION='$(VERSION)$(ABIFLAGS)' $as_echo "$LDVERSION" >&6; } -LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +if test x$PLATFORM_TRIPLET = x; then + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +else + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" +fi # Check whether right shifting a negative integer extends the sign bit @@ -15843,102 +15972,6 @@ $as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h fi -if test "$have_long_long" = yes -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %lld and %llu printf() format support" >&5 -$as_echo_n "checking for %lld and %llu printf() format support... " >&6; } - if ${ac_cv_have_long_long_format+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_have_long_long_format="cross -- assuming no" - if test x$GCC = xyes; then - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -Wformat" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - -int -main () -{ - - char *buffer; - sprintf(buffer, "%lld", (long long)123); - sprintf(buffer, "%lld", (long long)-123); - sprintf(buffer, "%llu", (unsigned long long)123); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_have_long_long_format=yes - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$save_CFLAGS - fi -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #include - - #ifdef HAVE_SYS_TYPES_H - #include - #endif - - int main() - { - char buffer[256]; - - if (sprintf(buffer, "%lld", (long long)123) < 0) - return 1; - if (strcmp(buffer, "123")) - return 1; - - if (sprintf(buffer, "%lld", (long long)-123) < 0) - return 1; - if (strcmp(buffer, "-123")) - return 1; - - if (sprintf(buffer, "%llu", (unsigned long long)123) < 0) - return 1; - if (strcmp(buffer, "123")) - return 1; - - return 0; - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_have_long_long_format=yes -else - ac_cv_have_long_long_format=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_long_long_format" >&5 -$as_echo "$ac_cv_have_long_long_format" >&6; } -fi - -if test "$ac_cv_have_long_long_format" = yes -then - -$as_echo "#define PY_FORMAT_LONG_LONG \"ll\"" >>confdefs.h - -fi - if test $ac_sys_system = Darwin then LIBS="$LIBS -framework CoreFoundation" @@ -17012,7 +17045,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by python $as_me 3.5, which was +This file was extended by python $as_me 3.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17074,7 +17107,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -python config.status 3.5 +python config.status 3.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17826,7 +17859,7 @@ mv config.c Modules if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then echo "" >&6 echo "" >&6 - echo "If you want a release build with all stable optimizations active (PGO, etc)," + echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&6 echo "please run ./configure --enable-optimizations" >&6 echo "" >&6 echo "" >&6 diff --git a/configure.ac b/configure.ac index c9b755f..1d63813 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl * Please run autoreconf to test your changes! * dnl *********************************************** # Set VERSION so we only need to edit in one place (i.e., here) -m4_define(PYTHON_VERSION, 3.5) +m4_define(PYTHON_VERSION, 3.6) AC_PREREQ(2.65) @@ -25,25 +25,25 @@ else BASECPPFLAGS="" fi -AC_SUBST(GITVERSION) -AC_SUBST(GITTAG) -AC_SUBST(GITBRANCH) +AC_SUBST(HGVERSION) +AC_SUBST(HGTAG) +AC_SUBST(HGBRANCH) -if test -e $srcdir/.git +if test -e $srcdir/.hg/dirstate then -AC_CHECK_PROG(HAS_GIT, git, found, not-found) +AC_CHECK_PROG(HAS_HG, hg, found, not-found) else -HAS_GIT=no-repository +HAS_HG=no-repository fi -if test $HAS_GIT = found +if test $HAS_HG = found then - GITVERSION="git -C \$(srcdir) rev-parse --short HEAD" - GITTAG="git -C \$(srcdir) describe --all --always --dirty" - GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD" + HGVERSION="hg id -i \$(srcdir)" + HGTAG="hg id -t \$(srcdir)" + HGBRANCH="hg id -b \$(srcdir)" else - GITVERSION="" - GITTAG="" - GITBRANCH="" + HGVERSION="" + HGTAG="" + HGBRANCH="" fi AC_CONFIG_SRCDIR([Include/object.h]) @@ -56,15 +56,20 @@ AC_SUBST(host) # pybuilddir.txt will be created by --generate-posix-vars in the Makefile rm -f pybuilddir.txt -AC_CHECK_PROGS(PYTHON_FOR_REGEN, python$PACKAGE_VERSION python3 python, python3) -AC_SUBST(PYTHON_FOR_REGEN) +AC_CHECK_PROGS(PYTHON_FOR_GEN, python$PACKAGE_VERSION python3 python, not-found) +if test "$PYTHON_FOR_GEN" = not-found; then + PYTHON_FOR_GEN='@echo "Cannot generate $@, python not found !" && \ + echo "To skip re-generation of $@ run or ." && \ + echo "Otherwise, set python in PATH and run configure or run ." && false &&' +fi +AC_SUBST(PYTHON_FOR_GEN) if test "$cross_compiling" = yes; then AC_MSG_CHECKING([for python interpreter for cross build]) if test -z "$PYTHON_FOR_BUILD"; then for interp in python$PACKAGE_VERSION python3 python; do which $interp >/dev/null 2>&1 || continue - if $interp -c 'import sys;sys.exit(not sys.version_info@<:@:2@:>@ >= (3,3))'; then + if $interp -c "import sys;sys.exit(not '.'.join(str(n) for n in sys.version_info@<:@:2@:>@) == '$PACKAGE_VERSION')"; then break fi interp= @@ -73,14 +78,18 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp fi + # Used to comment out stuff for rebuilding generated files + GENERATED_COMMENT='#' elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) else PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E' + GENERATED_COMMENT='' fi AC_SUBST(PYTHON_FOR_BUILD) +AC_SUBST(GENERATED_COMMENT) dnl Ensure that if prefix is specified, it does not end in a slash. If dnl it does, we get path names containing '//' which is both ugly and @@ -685,6 +694,7 @@ fi AC_PROG_CC AC_PROG_CPP AC_PROG_GREP +AC_PROG_SED AC_SUBST(CXX) AC_SUBST(MAINCC) @@ -759,7 +769,31 @@ cat >> conftest.c <> conftest.c < +__ANDROID_API__ +#else +#error not Android +#endif +EOF + +if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then + ANDROID_API_LEVEL=`grep -v '^#' conftest.out | grep -v '^ *$'` + AC_MSG_RESULT([$ANDROID_API_LEVEL]) + AC_DEFINE_UNQUOTED(ANDROID_API_LEVEL, $ANDROID_API_LEVEL, [The Android API level.]) +else + AC_MSG_RESULT([not Android]) +fi +rm -f conftest.c conftest.out + # Check for unsupported systems case $ac_sys_system/$ac_sys_release in atheos*|Linux*/1*) @@ -1226,9 +1282,9 @@ AC_SUBST(DEF_MAKE_ALL_RULE) AC_SUBST(DEF_MAKE_RULE) Py_OPT='false' AC_MSG_CHECKING(for --enable-optimizations) -AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive, stable optimizations (PGO, etc). Disabled by default.]), +AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]), [ -if test "$enableval" != no +if test "$withval" != no then Py_OPT='true' AC_MSG_RESULT(yes); @@ -1240,7 +1296,7 @@ fi], if test "$Py_OPT" = 'true' ; then # Intentionally not forcing Py_LTO='true' here. Too many toolchains do not # compile working code using it and both test_distutils and test_gdb are - # broken when you do managed to get a toolchain that works with it. People + # broken when you do manage to get a toolchain that works with it. People # who want LTO need to use --with-lto themselves. DEF_MAKE_ALL_RULE="profile-opt" REQUIRE_PGO="yes" @@ -1268,13 +1324,20 @@ fi], if test "$Py_LTO" = 'true' ; then case $CC in *clang*) - # Any changes made here should be reflected in the GCC+Darwin case below - LTOFLAGS="-flto" + case $ac_sys_system in + Darwin*) + # Any changes made here should be reflected in the GCC+Darwin case below + LTOFLAGS="-flto -Wl,-export_dynamic" + ;; + *) + LTOFLAGS="-flto" + ;; + esac ;; *gcc*) case $ac_sys_system in Darwin*) - LTOFLAGS="-flto" + LTOFLAGS="-flto -Wl,-export_dynamic" ;; *) LTOFLAGS="-flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none" @@ -1394,7 +1457,6 @@ esac # tweak OPT based on compiler and platform, only if the user didn't set # it on the command line AC_SUBST(OPT) -AC_SUBST(CFLAGS_ALIASING) if test "${OPT-unset}" = "unset" then case $GCC in @@ -1407,49 +1469,30 @@ then WRAP="-fwrapv" fi + # Clang also needs -fwrapv case $CC in - *clang*) - cc_is_clang=1 - ;; - *) - if $CC --version 2>&1 | grep -q clang - then - cc_is_clang=1 - else - cc_is_clang= - fi + *clang*) WRAP="-fwrapv" + ;; esac - if test -n "${cc_is_clang}" - then - # Clang also needs -fwrapv - WRAP="-fwrapv" - # bpo-30104: disable strict aliasing to compile correctly dtoa.c, - # see Makefile.pre.in for more information - CFLAGS_ALIASING="-fno-strict-aliasing" - fi - case $ac_cv_prog_cc_g in yes) if test "$Py_DEBUG" = 'true' ; then # Optimization messes up debuggers, so turn it off for # debug builds. if "$CC" -v --help 2>/dev/null |grep -- -Og > /dev/null; then - OPT="-g -Og -Wall" + OPT="-g -Og -Wall $STRICT_PROTO" else - OPT="-g -O0 -Wall" + OPT="-g -O0 -Wall $STRICT_PROTO" fi else - OPT="-g $WRAP -O3 -Wall" + OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" fi ;; *) - OPT="-O3 -Wall" + OPT="-O3 -Wall $STRICT_PROTO" ;; esac - - OPT="$OPT $STRICT_PROTO" - case $ac_sys_system in SCO_SV*) OPT="$OPT -m486 -DSCO5" ;; @@ -1472,6 +1515,28 @@ AC_SUBST(UNIVERSAL_ARCH_FLAGS) # tweak BASECFLAGS based on compiler and platform case $GCC in yes) + CFLAGS_NODIST="$CFLAGS_NODIST -std=c99" + + AC_MSG_CHECKING(for -Wextra) + ac_save_cc="$CC" + CC="$CC -Wextra -Werror" + AC_CACHE_VAL(ac_cv_extra_warnings, + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[]], [[]]) + ],[ + ac_cv_extra_warnings=yes + ],[ + ac_cv_extra_warnings=no + ])) + CC="$ac_save_cc" + AC_MSG_RESULT($ac_cv_extra_warnings) + + if test $ac_cv_extra_warnings = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wextra" + fi + # Python doesn't violate C99 aliasing rules, but older versions of # GCC produce warnings for legal Python code. Enable # -fno-strict-aliasing on versions of GCC that support but produce @@ -1536,28 +1601,47 @@ yes) if test $ac_cv_disable_unused_result_warning = yes then BASECFLAGS="$BASECFLAGS -Wno-unused-result" + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result" fi - AC_MSG_CHECKING(for -Werror=declaration-after-statement) + AC_MSG_CHECKING(if we can turn off $CC unused parameter warning) ac_save_cc="$CC" - CC="$CC -Werror=declaration-after-statement" - save_CFLAGS="$CFLAGS" - AC_CACHE_VAL(ac_cv_declaration_after_statement_warning, + CC="$CC -Wunused-parameter -Werror" + AC_CACHE_VAL(ac_cv_disable_unused_parameter_warning, AC_COMPILE_IFELSE( [ - AC_LANG_PROGRAM([[]], [[]]) - ],[ - ac_cv_declaration_after_statement_warning=yes - ],[ - ac_cv_declaration_after_statement_warning=no - ])) - CFLAGS="$save_CFLAGS" + AC_LANG_PROGRAM([[]], [[]]) + ],[ + ac_cv_disable_unused_parameter_warning=yes + ],[ + ac_cv_disable_unused_parameter_warning=no + ])) CC="$ac_save_cc" - AC_MSG_RESULT($ac_cv_declaration_after_statement_warning) + AC_MSG_RESULT($ac_cv_disable_unused_parameter_warning) - if test $ac_cv_declaration_after_statement_warning = yes + if test $ac_cv_disable_unused_parameter_warning = yes then - CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-parameter" + fi + + AC_MSG_CHECKING(if we can turn off $CC missing field initializers warning) + ac_save_cc="$CC" + CC="$CC -Wmissing-field-initializers -Werror" + AC_CACHE_VAL(ac_cv_disable_missing_field_initializers, + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[]], [[]]) + ],[ + ac_cv_disable_missing_field_initializers=yes + ],[ + ac_cv_disable_missing_field_initializers=no + ])) + CC="$ac_save_cc" + AC_MSG_RESULT($ac_cv_disable_missing_field_initializers) + + if test $ac_cv_disable_missing_field_initializers = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-missing-field-initializers" fi AC_MSG_CHECKING(if we can turn on $CC mixed sign comparison warning) @@ -1952,20 +2036,27 @@ AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \ -sched.h shadow.h signal.h stdint.h stropts.h termios.h \ +sched.h shadow.h signal.h stropts.h termios.h \ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ -bluetooth/bluetooth.h linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ +linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ sys/endian.h) AC_HEADER_DIRENT AC_HEADER_MAJOR +# bluetooth/bluetooth.h has been known to not compile with -std=c99. +# http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 +SAVE_CFLAGS=$CFLAGS +CFLAGS="-std=c99 $CFLAGS" +AC_CHECK_HEADERS(bluetooth/bluetooth.h) +CFLAGS=$SAVE_CFLAGS + # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. AC_CHECK_HEADERS([net/if.h], [], [], [#include @@ -2059,6 +2150,11 @@ if test "$sol_lfs_bug" = "yes"; then use_lfs=no fi +# Don't use largefile support for GNU/Hurd +case $ac_sys_system in GNU*) + use_lfs=no +esac + if test "$use_lfs" = "yes"; then # Two defines needed to enable largefile support on various platforms # These may affect some typedefs @@ -2089,29 +2185,6 @@ AC_DEFINE_UNQUOTED([RETSIGTYPE],[void],[assume C89 semantics that RETSIGTYPE is AC_TYPE_SIZE_T AC_TYPE_UID_T -# There are two separate checks for each of the exact-width integer types we -# need. First we check whether the type is available using the usual -# AC_CHECK_TYPE macro with the default includes (which includes -# and where available). We then also use the special type checks of -# the form AC_TYPE_UINT32_T, which in the case that uint32_t is not available -# directly, #define's uint32_t to be a suitable type. - -AC_CHECK_TYPE(uint32_t, - AC_DEFINE(HAVE_UINT32_T, 1, [Define if your compiler provides uint32_t.]),,) -AC_TYPE_UINT32_T - -AC_CHECK_TYPE(uint64_t, - AC_DEFINE(HAVE_UINT64_T, 1, [Define if your compiler provides uint64_t.]),,) -AC_TYPE_UINT64_T - -AC_CHECK_TYPE(int32_t, - AC_DEFINE(HAVE_INT32_T, 1, [Define if your compiler provides int32_t.]),,) -AC_TYPE_INT32_T - -AC_CHECK_TYPE(int64_t, - AC_DEFINE(HAVE_INT64_T, 1, [Define if your compiler provides int64_t.]),,) -AC_TYPE_INT64_T - AC_CHECK_TYPE(ssize_t, AC_DEFINE(HAVE_SSIZE_T, 1, [Define if your compiler provides ssize_t]),,) AC_CHECK_TYPE(__uint128_t, @@ -2121,6 +2194,7 @@ AC_CHECK_TYPE(__uint128_t, # ANSI C requires sizeof(char) == 1, so no need to check it AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(void *, 4) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(float, 4) @@ -2128,17 +2202,7 @@ AC_CHECK_SIZEOF(double, 8) AC_CHECK_SIZEOF(fpos_t, 4) AC_CHECK_SIZEOF(size_t, 4) AC_CHECK_SIZEOF(pid_t, 4) - -AC_MSG_CHECKING(for long long support) -have_long_long=no -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ - AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) - have_long_long=yes -],[]) -AC_MSG_RESULT($have_long_long) -if test "$have_long_long" = yes ; then -AC_CHECK_SIZEOF(long long, 8) -fi +AC_CHECK_SIZEOF(uintptr_t) AC_MSG_CHECKING(for long double support) have_long_double=no @@ -2151,26 +2215,7 @@ if test "$have_long_double" = yes ; then AC_CHECK_SIZEOF(long double, 16) fi - -AC_MSG_CHECKING(for _Bool support) -have_c99_bool=no -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[_Bool x; x = (_Bool)0;]])],[ - AC_DEFINE(HAVE_C99_BOOL, 1, [Define this if you have the type _Bool.]) - have_c99_bool=yes -],[]) -AC_MSG_RESULT($have_c99_bool) -if test "$have_c99_bool" = yes ; then AC_CHECK_SIZEOF(_Bool, 1) -fi - -AC_CHECK_TYPES(uintptr_t, - [AC_CHECK_SIZEOF(uintptr_t, 4)], - [], [#ifdef HAVE_STDINT_H - #include - #endif - #ifdef HAVE_INTTYPES_H - #include - #endif]) AC_CHECK_SIZEOF(off_t, [], [ #ifdef HAVE_SYS_TYPES_H @@ -2179,8 +2224,6 @@ AC_CHECK_SIZEOF(off_t, [], [ ]) AC_MSG_CHECKING(whether to enable large file support) -if test "$have_long_long" = yes -then if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, @@ -2192,9 +2235,6 @@ if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ else AC_MSG_RESULT(no) fi -else - AC_MSG_RESULT(no) -fi AC_CHECK_SIZEOF(time_t, [], [ #ifdef HAVE_SYS_TYPES_H @@ -2753,9 +2793,25 @@ AC_MSG_RESULT($with_system_expat) # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) AC_ARG_WITH(system_ffi, - AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]), - [], - [with_system_ffi="no"]) + AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]),,,) + +case "$with_system_ffi" in + "") + case $ac_sys_system in + Darwin) + with_system_ffi="no" + ;; + *) + with_system_ffi="yes" + ;; + esac + ;; + yes|no) + ;; + *) + AC_MSG_ERROR([--with-system-ffi accepts no arguments]) + ;; +esac if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`" @@ -2830,26 +2886,6 @@ else fi]) AC_MSG_RESULT($with_dbmliborder) -# Determine if signalmodule should be used. -AC_SUBST(USE_SIGNAL_MODULE) -AC_SUBST(SIGNAL_OBJS) -AC_MSG_CHECKING(for --with-signal-module) -AC_ARG_WITH(signal-module, - AS_HELP_STRING([--with-signal-module], [disable/enable signal module])) - -if test -z "$with_signal_module" -then with_signal_module="yes" -fi -AC_MSG_RESULT($with_signal_module) - -if test "${with_signal_module}" = "yes"; then - USE_SIGNAL_MODULE="" - SIGNAL_OBJS="" -else - USE_SIGNAL_MODULE="#" - SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o" -fi - # This is used to generate Setup.config AC_SUBST(USE_THREAD_MODULE) USE_THREAD_MODULE="" @@ -3219,16 +3255,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* CAN_RAW_FD_FRAMES available check */ AC_MSG_RESULT(no) ]) -AC_MSG_CHECKING(for OSX 10.5 SDK or later) -AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[#include ]], [[FSIORefNum fRef = 0]]) -],[ - AC_DEFINE(HAVE_OSX105_SDK, 1, [Define if compiling using MacOS X 10.5 SDK or later.]) - AC_MSG_RESULT(yes) -],[ - AC_MSG_RESULT(no) -]) - # Check for --with-doc-strings AC_MSG_CHECKING(for --with-doc-strings) AC_ARG_WITH(doc-strings, @@ -3244,19 +3270,6 @@ then fi AC_MSG_RESULT($with_doc_strings) -# Check if eval loop should use timestamp counter profiling -AC_MSG_CHECKING(for --with-tsc) -AC_ARG_WITH(tsc, - AS_HELP_STRING([--with(out)-tsc],[enable/disable timestamp counter profile]),[ -if test "$withval" != no -then - AC_DEFINE(WITH_TSC, 1, - [Define to profile with the Pentium timestamp counter]) - AC_MSG_RESULT(yes) -else AC_MSG_RESULT(no) -fi], -[AC_MSG_RESULT(no)]) - # Check for Python-specific malloc support AC_MSG_CHECKING(for --with-pymalloc) AC_ARG_WITH(pymalloc, @@ -3288,6 +3301,47 @@ if test "$with_valgrind" != no; then OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" fi +# Check for DTrace support +AC_MSG_CHECKING(for --with-dtrace) +AC_ARG_WITH(dtrace, + AC_HELP_STRING(--with(out)-dtrace, [disable/enable DTrace support]),, + with_dtrace=no) +AC_MSG_RESULT($with_dtrace) + +AC_SUBST(DTRACE) +AC_SUBST(DFLAGS) +AC_SUBST(DTRACE_HEADERS) +AC_SUBST(DTRACE_OBJS) +DTRACE= +DFLAGS= +DTRACE_HEADERS= +DTRACE_OBJS= + +if test "$with_dtrace" = "yes" +then + AC_PATH_PROG(DTRACE, [dtrace], [not found]) + if test "$DTRACE" = "not found"; then + AC_MSG_ERROR([dtrace command not found on \$PATH]) + fi + AC_DEFINE(WITH_DTRACE, 1, [Define if you want to compile in DTrace support]) + DTRACE_HEADERS="Include/pydtrace_probes.h" + + # On OS X, DTrace providers do not need to be explicitly compiled and + # linked into the binary. Correspondingly, dtrace(1) is missing the ELF + # generation flag '-G'. We check for presence of this flag, rather than + # hardcoding support by OS, in the interest of robustness. + AC_CACHE_CHECK([whether DTrace probes require linking], + [ac_cv_dtrace_link], [dnl + ac_cv_dtrace_link=no + echo 'BEGIN' > conftest.d + "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ + ac_cv_dtrace_link=yes + ]) + if test "$ac_cv_dtrace_link" = "yes"; then + DTRACE_OBJS="Python/pydtrace.o" + fi +fi + # -I${DLINCLDIR} is added to the compile rule for importdl.o AC_SUBST(DLINCLDIR) DLINCLDIR=. @@ -3680,6 +3734,12 @@ AC_CHECK_FUNCS(clock_getres, [], [ ]) ]) +AC_CHECK_FUNCS(clock_settime, [], [ + AC_CHECK_LIB(rt, clock_settime, [ + AC_DEFINE(HAVE_CLOCK_SETTIME, 1) + ]) +]) + AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #if defined(MAJOR_IN_MKDEV) @@ -3841,6 +3901,10 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) AC_CHECK_MEMBERS([struct stat.st_gen]) AC_CHECK_MEMBERS([struct stat.st_birthtime]) AC_CHECK_MEMBERS([struct stat.st_blocks]) +AC_CHECK_MEMBERS([struct passwd.pw_gecos, struct passwd.pw_passwd], [], [], [[ + #include + #include +]]) AC_MSG_CHECKING(for time.h that defines altzone) AC_CACHE_VAL(ac_cv_header_time_altzone,[ @@ -3889,6 +3953,19 @@ if test $ac_cv_struct_sockaddr_storage = yes; then AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) fi +AC_MSG_CHECKING(for sockaddr_alg) +AC_CACHE_VAL(ac_cv_struct_sockaddr_alg, +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +# include +# include +# include ]], [[struct sockaddr_alg s]])], + [ac_cv_struct_sockaddr_alg=yes], + [ac_cv_struct_sockaddr_alg=no])) +AC_MSG_RESULT($ac_cv_struct_sockaddr_alg) +if test $ac_cv_struct_sockaddr_alg = yes; then + AC_DEFINE(HAVE_SOCKADDR_ALG, 1, [struct sockaddr_alg (linux/if_alg.h)]) +fi + # checks for compiler characteristics AC_C_CHAR_UNSIGNED @@ -3961,20 +4038,6 @@ x.sa_len = 0;]])], [AC_MSG_RESULT(no)] ) -va_list_is_array=no -AC_MSG_CHECKING(whether va_list is an array) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#ifdef HAVE_STDARG_PROTOTYPES -#include -#else -#include -#endif -]], [[va_list list1, list2; list1 = list2;]])],[],[ - AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) - va_list_is_array=yes -]) -AC_MSG_RESULT($va_list_is_array) - # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( AH_TEMPLATE(HAVE_GETHOSTBYNAME_R, [Define this if you have some version of gethostbyname_r()]) @@ -4417,6 +4480,8 @@ then [define to 1 if your sem_getvalue is broken.]) fi +AC_CHECK_DECLS([RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL, RTLD_NODELETE, RTLD_NOLOAD, RTLD_DEEPBIND], [], [], [[#include ]]) + # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) AC_ARG_ENABLE(big-digits, @@ -4535,7 +4600,11 @@ AC_MSG_RESULT($LDVERSION) dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) -LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +if test x$PLATFORM_TRIPLET = x; then + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +else + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" +fi AC_SUBST(LIBPL) # Check whether right shifting a negative integer extends the sign bit @@ -4933,70 +5002,6 @@ if test "x$ac_cv_file__dev_ptc" = xyes; then [Define to 1 if you have the /dev/ptc device file.]) fi -if test "$have_long_long" = yes -then - AC_MSG_CHECKING(for %lld and %llu printf() format support) - AC_CACHE_VAL(ac_cv_have_long_long_format, - AC_RUN_IFELSE([AC_LANG_SOURCE([[[ - #include - #include - #include - - #ifdef HAVE_SYS_TYPES_H - #include - #endif - - int main() - { - char buffer[256]; - - if (sprintf(buffer, "%lld", (long long)123) < 0) - return 1; - if (strcmp(buffer, "123")) - return 1; - - if (sprintf(buffer, "%lld", (long long)-123) < 0) - return 1; - if (strcmp(buffer, "-123")) - return 1; - - if (sprintf(buffer, "%llu", (unsigned long long)123) < 0) - return 1; - if (strcmp(buffer, "123")) - return 1; - - return 0; - } - ]]])], - [ac_cv_have_long_long_format=yes], - [ac_cv_have_long_long_format=no], - [ac_cv_have_long_long_format="cross -- assuming no" - if test x$GCC = xyes; then - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -Wformat" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]], [[ - char *buffer; - sprintf(buffer, "%lld", (long long)123); - sprintf(buffer, "%lld", (long long)-123); - sprintf(buffer, "%llu", (unsigned long long)123); - ]])], - ac_cv_have_long_long_format=yes - ) - CFLAGS=$save_CFLAGS - fi]) - ) - AC_MSG_RESULT($ac_cv_have_long_long_format) -fi - -if test "$ac_cv_have_long_long_format" = yes -then - AC_DEFINE(PY_FORMAT_LONG_LONG, "ll", - [Define to printf format modifier for long long type]) -fi - if test $ac_sys_system = Darwin then LIBS="$LIBS -framework CoreFoundation" @@ -5389,7 +5394,7 @@ mv config.c Modules if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then echo "" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD - echo "If you want a release build with all stable optimizations active (PGO, etc)," + echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&AS_MESSAGE_FD echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD diff --git a/pyconfig.h.in b/pyconfig.h.in index 39ccf53..e7a836c 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -12,6 +12,9 @@ support for AIX C++ shared extension modules. */ #undef AIX_GENUINE_CPLUSPLUS +/* The Android API level. */ +#undef ANDROID_API_LEVEL + /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM mixed-endian order (byte order 45670123) */ #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 @@ -104,9 +107,6 @@ /* Has builtin atomics */ #undef HAVE_BUILTIN_ATOMIC -/* Define this if you have the type _Bool. */ -#undef HAVE_C99_BOOL - /* Define to 1 if you have the 'chflags' function. */ #undef HAVE_CHFLAGS @@ -125,6 +125,9 @@ /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME +/* Define to 1 if you have the `clock_settime' function. */ +#undef HAVE_CLOCK_SETTIME + /* Define if the C compiler supports computed gotos. */ #undef HAVE_COMPUTED_GOTOS @@ -167,6 +170,34 @@ */ #undef HAVE_DECL_ISNAN +/* Define to 1 if you have the declaration of `RTLD_DEEPBIND', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_DEEPBIND + +/* Define to 1 if you have the declaration of `RTLD_GLOBAL', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_GLOBAL + +/* Define to 1 if you have the declaration of `RTLD_LAZY', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_LAZY + +/* Define to 1 if you have the declaration of `RTLD_LOCAL', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_LOCAL + +/* Define to 1 if you have the declaration of `RTLD_NODELETE', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_NODELETE + +/* Define to 1 if you have the declaration of `RTLD_NOLOAD', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_NOLOAD + +/* Define to 1 if you have the declaration of `RTLD_NOW', and to 0 if you + don't. */ +#undef HAVE_DECL_RTLD_NOW + /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. */ #undef HAVE_DECL_TZNAME @@ -453,12 +484,6 @@ /* Define to 1 if you have the `initgroups' function. */ #undef HAVE_INITGROUPS -/* Define if your compiler provides int32_t. */ -#undef HAVE_INT32_T - -/* Define if your compiler provides int64_t. */ -#undef HAVE_INT64_T - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -561,9 +586,6 @@ /* Define this if you have the type long double. */ #undef HAVE_LONG_DOUBLE -/* Define this if you have the type long long. */ -#undef HAVE_LONG_LONG - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT @@ -630,9 +652,6 @@ /* Define to 1 if you have the `openpty' function. */ #undef HAVE_OPENPTY -/* Define if compiling using MacOS X 10.5 SDK or later. */ -#undef HAVE_OSX105_SDK - /* Define to 1 if you have the `pathconf' function. */ #undef HAVE_PATHCONF @@ -861,6 +880,9 @@ /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF +/* struct sockaddr_alg (linux/if_alg.h) */ +#undef HAVE_SOCKADDR_ALG + /* Define if sockaddr has sa_len member */ #undef HAVE_SOCKADDR_SA_LEN @@ -916,6 +938,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STROPTS_H +/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_GECOS + +/* Define to 1 if `pw_passwd' is a member of `struct passwd'. */ +#undef HAVE_STRUCT_PASSWD_PW_PASSWD + /* Define to 1 if `st_birthtime' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIME @@ -1005,9 +1033,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_POLL_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RANDOM_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H @@ -1106,15 +1131,6 @@ /* Define this if you have tcl and TCL_UTF_MAX==6 */ #undef HAVE_UCS4_TCL -/* Define if your compiler provides uint32_t. */ -#undef HAVE_UINT32_T - -/* Define if your compiler provides uint64_t. */ -#undef HAVE_UINT64_T - -/* Define to 1 if the system has the type `uintptr_t'. */ -#undef HAVE_UINTPTR_T - /* Define to 1 if you have the `uname' function. */ #undef HAVE_UNAME @@ -1225,9 +1241,6 @@ /* Define as the preferred size in bits of long digits */ #undef PYLONG_BITS_IN_DIGIT -/* Define to printf format modifier for long long type */ -#undef PY_FORMAT_LONG_LONG - /* Define to printf format modifier for Py_ssize_t */ #undef PY_FORMAT_SIZE_T @@ -1348,9 +1361,6 @@ #endif -/* Define if a va_list is an array of some kind */ -#undef VA_LIST_IS_ARRAY - /* Define if you want SIGFPE handled (see Include/pyfpe.h). */ #undef WANT_SIGFPE_HANDLER @@ -1360,6 +1370,9 @@ /* Define if you want documentation strings in extension modules */ #undef WITH_DOC_STRINGS +/* Define if you want to compile in DTrace support */ +#undef WITH_DTRACE + /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic linker (dyld) instead of the old-style (NextStep) dynamic linker (rld). Dyld is necessary to support frameworks. */ @@ -1378,9 +1391,6 @@ /* Define if you want to compile in rudimentary thread support */ #undef WITH_THREAD -/* Define to profile with the Pentium timestamp counter */ -#undef WITH_TSC - /* Define if you want pymalloc to be disabled when running under valgrind */ #undef WITH_VALGRIND @@ -1445,16 +1455,6 @@ /* Define to force use of thread-safe errno, h_errno, and other functions */ #undef _REENTRANT -/* Define for Solaris 2.5.1 so the uint32_t typedef from , - , or is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -#undef _UINT32_T - -/* Define for Solaris 2.5.1 so the uint64_t typedef from , - , or is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -#undef _UINT64_T - /* Define to the level of X/Open that your system supports */ #undef _XOPEN_SOURCE @@ -1484,14 +1484,6 @@ #undef inline #endif -/* Define to the type of a signed integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ -#undef int32_t - -/* Define to the type of a signed integer type of width exactly 64 bits if - such a type exists and the standard includes do not define it. */ -#undef int64_t - /* Define to `int' if does not define. */ #undef mode_t @@ -1513,14 +1505,6 @@ /* Define to `int' if doesn't define. */ #undef uid_t -/* Define to the type of an unsigned integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ -#undef uint32_t - -/* Define to the type of an unsigned integer type of width exactly 64 bits if - such a type exists and the standard includes do not define it. */ -#undef uint64_t - /* Define to empty if the keyword does not work. */ #undef volatile diff --git a/setup.py b/setup.py index 40f8bf2..af9a414 100644 --- a/setup.py +++ b/setup.py @@ -185,7 +185,7 @@ def find_module_file(module, dirlist): if not list: return module if len(list) > 1: - log.info("WARNING: multiple copies of %s found"%module) + log.info("WARNING: multiple copies of %s found", module) return os.path.join(list[0], module) class PyBuildExt(build_ext): @@ -651,9 +651,12 @@ class PyBuildExt(build_ext): # profiler (_lsprof is for cProfile.py) exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) ) # static Unicode character database - exts.append( Extension('unicodedata', ['unicodedata.c']) ) + exts.append( Extension('unicodedata', ['unicodedata.c'], + depends=['unicodedata_db.h', 'unicodename_db.h']) ) # _opcode module exts.append( Extension('_opcode', ['_opcode.c']) ) + # asyncio speedups + exts.append( Extension("_asyncio", ["_asynciomodule.c"]) ) # Modules with some UNIX dependencies -- on by default: # (If you have a really backward UNIX, select and socket may not be @@ -837,7 +840,7 @@ class PyBuildExt(build_ext): # find out which version of OpenSSL we have openssl_ver = 0 openssl_ver_re = re.compile( - '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' ) + r'^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' ) # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], @@ -888,6 +891,29 @@ class PyBuildExt(build_ext): exts.append( Extension('_sha1', ['sha1module.c'], depends=['hashlib.h']) ) + blake2_deps = glob(os.path.join(os.getcwd(), srcdir, + 'Modules/_blake2/impl/*')) + blake2_deps.append('hashlib.h') + + blake2_macros = [] + if not cross_compiling and os.uname().machine == "x86_64": + # Every x86_64 machine has at least SSE2. + blake2_macros.append(('BLAKE2_USE_SSE', '1')) + + exts.append( Extension('_blake2', + ['_blake2/blake2module.c', + '_blake2/blake2b_impl.c', + '_blake2/blake2s_impl.c'], + define_macros=blake2_macros, + depends=blake2_deps) ) + + sha3_deps = glob(os.path.join(os.getcwd(), srcdir, + 'Modules/_sha3/kcp/*')) + sha3_deps.append('hashlib.h') + exts.append( Extension('_sha3', + ['_sha3/sha3module.c'], + depends=sha3_deps)) + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -1700,7 +1726,7 @@ class PyBuildExt(build_ext): # All existing framework builds of Tcl/Tk don't support 64-bit # architectures. cflags = sysconfig.get_config_vars('CFLAGS')[0] - archs = re.findall('-arch\s+(\w+)', cflags) + archs = re.findall(r'-arch\s+(\w+)', cflags) tmpfile = os.path.join(self.build_temp, 'tk.arch') if not os.path.exists(self.build_temp): @@ -1887,6 +1913,9 @@ class PyBuildExt(build_ext): if host_platform == 'darwin': return self.configure_ctypes_darwin(ext) + print('warning: building with the bundled copy of libffi is' + ' deprecated on this platform. It will not be' + ' distributed with Python 3.7') srcdir = sysconfig.get_config_var('srcdir') ffi_builddir = os.path.join(self.build_temp, 'libffi') ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules', @@ -1983,13 +2012,14 @@ class PyBuildExt(build_ext): libraries=math_libs) self.extensions.extend([ext, ext_test]) - if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): - return - if host_platform == 'darwin': + if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"): + return # OS X 10.5 comes with libffi.dylib; the include files are # in /usr/include/ffi inc_dirs.append('/usr/include/ffi') + elif '--without-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): + return ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")] if not ffi_inc or ffi_inc[0] == '': @@ -2008,7 +2038,7 @@ class PyBuildExt(build_ext): 'ffi_wrapper_h'.format(ffi_h)) ffi_lib = None if ffi_inc is not None: - for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'): + for lib_name in ('ffi', 'ffi_pic'): if (self.compiler.find_library_file(lib_dirs, lib_name)): ffi_lib = lib_name break @@ -2061,7 +2091,7 @@ class PyBuildExt(build_ext): '_decimal/libmpdec/fnt.h', '_decimal/libmpdec/fourstep.h', '_decimal/libmpdec/io.h', - '_decimal/libmpdec/memory.h', + '_decimal/libmpdec/mpalloc.h', '_decimal/libmpdec/mpdecimal.h', '_decimal/libmpdec/numbertheory.h', '_decimal/libmpdec/sixstep.h', @@ -2127,15 +2157,6 @@ class PyBuildExt(build_ext): if not sysconfig.get_config_var('WITH_THREAD'): define_macros.append(('WITHOUT_THREADS', 1)) - # Increase warning level for gcc: - if 'gcc' in cc: - cmd = ("echo '' | %s -Wextra -Wno-missing-field-initializers -E - " - "> /dev/null 2>&1" % cc) - ret = os.system(cmd) - if ret >> 8 == 0: - extra_compile_args.extend(['-Wextra', - '-Wno-missing-field-initializers']) - # Uncomment for extra functionality: #define_macros.append(('EXTRA_FUNCTIONALITY', 1)) ext = Extension ( @@ -2214,7 +2235,7 @@ class PyBuildScripts(build_scripts): newfilename = filename + fullversion else: newfilename = filename + minoronly - log.info('renaming {} to {}'.format(filename, newfilename)) + log.info('renaming %s to %s', filename, newfilename) os.rename(filename, newfilename) newoutfiles.append(newfilename) if filename in updated_files: @@ -2256,7 +2277,7 @@ def main(): setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], - url = "http://www.python.org/%s" % sys.version[:3], + url = "http://www.python.org/%d.%d" % sys.version_info[:2], maintainer = "Guido van Rossum and the Python community", maintainer_email = "python-dev@python.org", description = "A high-level object-oriented programming language",